From 0ee7574732a06e8cace4e099a678f4bd5dbff679 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Fri, 13 Oct 2017 16:07:13 -0700 Subject: [PATCH 001/127] Removing instances of exec_ctx being passed around in functions in src/core. exec_ctx is now a thread_local pointer of type ExecCtx instead of grpc_exec_ctx which is initialized whenever ExecCtx is instantiated. ExecCtx also keeps track of the previous exec_ctx so that nesting of exec_ctx is allowed. This means that there is only one exec_ctx being used at any time. Also, grpc_exec_ctx_finish is called in the destructor of the object, and the previous exec_ctx is restored to avoid breaking current functionality. The code still explicitly calls grpc_exec_ctx_finish because removing all such instances causes the code to break. --- CMakeLists.txt | 34 +- Makefile | 40 +- build.yaml | 18 +- err | 37 + grpc.gyp | 34 +- grpc_c.32.ruby | Bin 0 -> 2033926 bytes grpc_c.64.ruby | Bin 0 -> 2190421 bytes include/grpc++/support/channel_arguments.h | 2 +- include/grpc/impl/codegen/grpc_types.h | 2 +- include/grpc/impl/codegen/slice.h | 2 +- include/grpc/slice_buffer.h | 3 +- memory_usage.csv | 1 + remove_exec_ctx.py | 49 + scenario_result.json | 1 + src/core/ext/census/grpc_filter.cc | 33 +- src/core/ext/census/grpc_plugin.cc | 3 +- .../client_channel/channel_connectivity.cc | 52 +- .../filters/client_channel/client_channel.cc | 400 +++--- .../filters/client_channel/client_channel.h | 8 +- .../client_channel/client_channel_factory.cc | 23 +- .../client_channel/client_channel_factory.h | 19 +- .../client_channel/client_channel_plugin.cc | 13 +- .../ext/filters/client_channel/connector.cc | 13 +- .../ext/filters/client_channel/connector.h | 14 +- .../client_channel/http_connect_handshaker.cc | 82 +- .../ext/filters/client_channel/http_proxy.cc | 16 +- .../ext/filters/client_channel/lb_policy.cc | 75 +- .../ext/filters/client_channel/lb_policy.h | 71 +- .../grpclb/client_load_reporting_filter.cc | 27 +- .../client_channel/lb_policy/grpclb/grpclb.cc | 399 +++--- .../lb_policy/grpclb/grpclb_channel.cc | 6 +- .../lb_policy/grpclb/grpclb_channel.h | 4 +- .../lb_policy/grpclb/grpclb_channel_secure.cc | 10 +- .../lb_policy/pick_first/pick_first.cc | 183 ++- .../lb_policy/round_robin/round_robin.cc | 162 ++- .../client_channel/lb_policy_factory.cc | 15 +- .../client_channel/lb_policy_factory.h | 11 +- .../client_channel/lb_policy_registry.cc | 4 +- .../client_channel/lb_policy_registry.h | 2 +- .../filters/client_channel/proxy_mapper.cc | 14 +- .../ext/filters/client_channel/proxy_mapper.h | 14 +- .../client_channel/proxy_mapper_registry.cc | 30 +- .../client_channel/proxy_mapper_registry.h | 6 +- .../ext/filters/client_channel/resolver.cc | 24 +- .../ext/filters/client_channel/resolver.h | 31 +- .../resolver/dns/c_ares/dns_resolver_ares.cc | 94 +- .../resolver/dns/c_ares/grpc_ares_ev_driver.h | 6 +- .../dns/c_ares/grpc_ares_ev_driver_posix.cc | 54 +- .../resolver/dns/c_ares/grpc_ares_wrapper.cc | 69 +- .../resolver/dns/c_ares/grpc_ares_wrapper.h | 12 +- .../dns/c_ares/grpc_ares_wrapper_fallback.cc | 20 +- .../resolver/dns/native/dns_resolver.cc | 90 +- .../resolver/fake/fake_resolver.cc | 52 +- .../resolver/fake/fake_resolver.h | 2 +- .../resolver/sockaddr/sockaddr_resolver.cc | 55 +- .../client_channel/resolver_factory.cc | 5 +- .../filters/client_channel/resolver_factory.h | 6 +- .../client_channel/resolver_registry.cc | 27 +- .../client_channel/resolver_registry.h | 7 +- .../ext/filters/client_channel/subchannel.cc | 245 ++-- .../ext/filters/client_channel/subchannel.h | 75 +- .../client_channel/subchannel_index.cc | 57 +- .../filters/client_channel/subchannel_index.h | 12 +- .../ext/filters/client_channel/uri_parser.cc | 28 +- .../ext/filters/client_channel/uri_parser.h | 3 +- .../ext/filters/deadline/deadline_filter.cc | 112 +- .../ext/filters/deadline/deadline_filter.h | 10 +- .../filters/http/client/http_client_filter.cc | 125 +- .../ext/filters/http/http_filters_plugin.cc | 6 +- .../message_compress_filter.cc | 126 +- .../filters/http/server/http_server_filter.cc | 125 +- .../server_load_reporting_filter.cc | 33 +- .../server_load_reporting_plugin.cc | 2 +- .../ext/filters/max_age/max_age_filter.cc | 105 +- .../message_size/message_size_filter.cc | 41 +- .../workaround_cronet_compression_filter.cc | 23 +- .../chttp2/client/chttp2_connector.cc | 63 +- .../chttp2/client/insecure/channel_create.cc | 32 +- .../client/insecure/channel_create_posix.cc | 14 +- .../client/secure/secure_channel_create.cc | 52 +- .../transport/chttp2/server/chttp2_server.cc | 80 +- .../transport/chttp2/server/chttp2_server.h | 3 +- .../chttp2/server/insecure/server_chttp2.cc | 6 +- .../server/insecure/server_chttp2_posix.cc | 17 +- .../server/secure/server_secure_chttp2.cc | 11 +- .../transport/chttp2/transport/bin_decoder.cc | 14 +- .../transport/chttp2/transport/bin_decoder.h | 5 +- .../transport/chttp2/transport/bin_encoder.h | 2 +- .../chttp2/transport/chttp2_transport.cc | 1098 +++++++---------- .../chttp2/transport/chttp2_transport.h | 6 +- .../chttp2/transport/flow_control.cc | 10 +- .../transport/chttp2/transport/frame_data.cc | 78 +- .../transport/chttp2/transport/frame_data.h | 7 +- .../chttp2/transport/frame_goaway.cc | 5 +- .../transport/chttp2/transport/frame_goaway.h | 3 +- .../transport/chttp2/transport/frame_ping.cc | 11 +- .../transport/chttp2/transport/frame_ping.h | 2 +- .../chttp2/transport/frame_rst_stream.cc | 5 +- .../chttp2/transport/frame_rst_stream.h | 3 +- .../chttp2/transport/frame_settings.cc | 3 +- .../chttp2/transport/frame_settings.h | 3 +- .../chttp2/transport/frame_window_update.cc | 16 +- .../chttp2/transport/frame_window_update.h | 8 +- .../chttp2/transport/hpack_encoder.cc | 123 +- .../chttp2/transport/hpack_encoder.h | 6 +- .../chttp2/transport/hpack_parser.cc | 552 ++++----- .../transport/chttp2/transport/hpack_parser.h | 17 +- .../transport/chttp2/transport/hpack_table.cc | 32 +- .../transport/chttp2/transport/hpack_table.h | 13 +- .../chttp2/transport/incoming_metadata.cc | 21 +- .../chttp2/transport/incoming_metadata.h | 9 +- .../ext/transport/chttp2/transport/internal.h | 106 +- .../ext/transport/chttp2/transport/parsing.cc | 200 ++- .../ext/transport/chttp2/transport/writing.cc | 121 +- .../client/secure/cronet_channel_create.cc | 5 +- .../cronet/transport/cronet_transport.cc | 209 ++-- .../ext/transport/inproc/inproc_transport.cc | 351 +++--- src/core/lib/backoff/backoff.cc | 10 +- src/core/lib/backoff/backoff.h | 4 +- src/core/lib/channel/channel_args.cc | 16 +- src/core/lib/channel/channel_args.h | 9 +- src/core/lib/channel/channel_stack.cc | 47 +- src/core/lib/channel/channel_stack.h | 64 +- src/core/lib/channel/channel_stack_builder.cc | 25 +- src/core/lib/channel/channel_stack_builder.h | 11 +- src/core/lib/channel/connected_channel.cc | 57 +- src/core/lib/channel/connected_channel.h | 3 +- src/core/lib/channel/handshaker.cc | 80 +- src/core/lib/channel/handshaker.h | 36 +- src/core/lib/channel/handshaker_factory.cc | 12 +- src/core/lib/channel/handshaker_factory.h | 12 +- src/core/lib/channel/handshaker_registry.cc | 22 +- src/core/lib/channel/handshaker_registry.h | 5 +- src/core/lib/compression/message_compress.cc | 42 +- src/core/lib/compression/message_compress.h | 6 +- .../compression/stream_compression_gzip.cc | 20 +- src/core/lib/debug/stats.cc | 6 +- src/core/lib/debug/stats.h | 18 +- src/core/lib/debug/stats_data.cc | 201 ++- src/core/lib/debug/stats_data.h | 540 ++++---- src/core/lib/http/httpcli.cc | 126 +- src/core/lib/http/httpcli.h | 27 +- .../lib/http/httpcli_security_connector.cc | 53 +- src/core/lib/iomgr/block_annotate.h | 14 +- src/core/lib/iomgr/call_combiner.cc | 31 +- src/core/lib/iomgr/call_combiner.h | 40 +- src/core/lib/iomgr/closure.cc | 19 +- src/core/lib/iomgr/closure.h | 34 +- src/core/lib/iomgr/combiner.cc | 90 +- src/core/lib/iomgr/combiner.h | 12 +- src/core/lib/iomgr/endpoint.cc | 31 +- src/core/lib/iomgr/endpoint.h | 35 +- src/core/lib/iomgr/endpoint_pair_posix.cc | 8 +- src/core/lib/iomgr/endpoint_pair_windows.cc | 10 +- src/core/lib/iomgr/error.cc | 6 +- src/core/lib/iomgr/ev_epoll1_linux.cc | 187 ++- src/core/lib/iomgr/ev_epollex_linux.cc | 254 ++-- src/core/lib/iomgr/ev_epollsig_linux.cc | 177 ++- src/core/lib/iomgr/ev_poll_posix.cc | 199 ++- src/core/lib/iomgr/ev_posix.cc | 78 +- src/core/lib/iomgr/ev_posix.h | 72 +- src/core/lib/iomgr/exec_ctx.cc | 76 +- src/core/lib/iomgr/exec_ctx.h | 76 +- src/core/lib/iomgr/executor.cc | 55 +- src/core/lib/iomgr/executor.h | 6 +- src/core/lib/iomgr/iocp_windows.cc | 31 +- src/core/lib/iomgr/iocp_windows.h | 3 +- src/core/lib/iomgr/iomgr.cc | 20 +- src/core/lib/iomgr/iomgr.h | 6 +- src/core/lib/iomgr/iomgr_uv.cc | 6 +- src/core/lib/iomgr/lockfree_event.cc | 18 +- src/core/lib/iomgr/lockfree_event.h | 10 +- src/core/lib/iomgr/polling_entity.cc | 16 +- src/core/lib/iomgr/polling_entity.h | 6 +- src/core/lib/iomgr/pollset.h | 9 +- src/core/lib/iomgr/pollset_set.h | 15 +- src/core/lib/iomgr/pollset_set_uv.cc | 15 +- src/core/lib/iomgr/pollset_set_windows.cc | 15 +- src/core/lib/iomgr/pollset_uv.cc | 15 +- src/core/lib/iomgr/pollset_windows.cc | 23 +- src/core/lib/iomgr/resolve_address.h | 3 +- src/core/lib/iomgr/resolve_address_posix.cc | 15 +- src/core/lib/iomgr/resolve_address_uv.cc | 15 +- src/core/lib/iomgr/resolve_address_windows.cc | 12 +- src/core/lib/iomgr/resource_quota.cc | 189 ++- src/core/lib/iomgr/resource_quota.h | 25 +- src/core/lib/iomgr/socket_factory_posix.cc | 2 +- src/core/lib/iomgr/socket_mutator.cc | 2 +- src/core/lib/iomgr/socket_windows.cc | 19 +- src/core/lib/iomgr/socket_windows.h | 9 +- src/core/lib/iomgr/tcp_client.h | 3 +- src/core/lib/iomgr/tcp_client_posix.cc | 63 +- src/core/lib/iomgr/tcp_client_posix.h | 3 +- src/core/lib/iomgr/tcp_client_uv.cc | 38 +- src/core/lib/iomgr/tcp_client_windows.cc | 45 +- src/core/lib/iomgr/tcp_posix.cc | 246 ++-- src/core/lib/iomgr/tcp_posix.h | 7 +- src/core/lib/iomgr/tcp_server.h | 15 +- src/core/lib/iomgr/tcp_server_posix.cc | 65 +- src/core/lib/iomgr/tcp_server_uv.cc | 49 +- src/core/lib/iomgr/tcp_server_windows.cc | 63 +- src/core/lib/iomgr/tcp_uv.cc | 94 +- src/core/lib/iomgr/tcp_windows.cc | 88 +- src/core/lib/iomgr/tcp_windows.h | 2 +- src/core/lib/iomgr/timer.h | 13 +- src/core/lib/iomgr/timer_generic.cc | 47 +- src/core/lib/iomgr/timer_manager.cc | 31 +- src/core/lib/iomgr/timer_uv.cc | 27 +- src/core/lib/iomgr/udp_server.cc | 60 +- src/core/lib/iomgr/udp_server.h | 17 +- .../lib/security/context/security_context.cc | 14 +- .../composite/composite_credentials.cc | 51 +- .../lib/security/credentials/credentials.cc | 76 +- .../lib/security/credentials/credentials.h | 59 +- .../credentials/credentials_metadata.cc | 4 +- .../credentials/fake/fake_credentials.cc | 36 +- .../google_default_credentials.cc | 58 +- .../credentials/iam/iam_credentials.cc | 22 +- .../credentials/jwt/jwt_credentials.cc | 34 +- .../credentials/jwt/jwt_credentials.h | 3 +- .../security/credentials/jwt/jwt_verifier.cc | 123 +- .../security/credentials/jwt/jwt_verifier.h | 14 +- .../credentials/oauth2/oauth2_credentials.cc | 104 +- .../credentials/oauth2/oauth2_credentials.h | 7 +- .../credentials/plugin/plugin_credentials.cc | 49 +- .../credentials/ssl/ssl_credentials.cc | 22 +- .../security/transport/client_auth_filter.cc | 97 +- .../lib/security/transport/lb_targets_info.cc | 4 +- .../lib/security/transport/secure_endpoint.cc | 114 +- .../security/transport/security_connector.cc | 141 +-- .../security/transport/security_connector.h | 55 +- .../security/transport/security_handshaker.cc | 179 ++- .../security/transport/security_handshaker.h | 3 +- .../security/transport/server_auth_filter.cc | 57 +- src/core/lib/slice/b64.cc | 11 +- src/core/lib/slice/b64.h | 7 +- src/core/lib/slice/slice.cc | 18 +- src/core/lib/slice/slice_buffer.cc | 29 +- src/core/lib/slice/slice_hash_table.cc | 12 +- src/core/lib/slice/slice_hash_table.h | 6 +- src/core/lib/slice/slice_intern.cc | 7 +- src/core/lib/slice/slice_internal.h | 8 +- src/core/lib/surface/alarm.cc | 27 +- src/core/lib/surface/byte_buffer.cc | 6 +- src/core/lib/surface/byte_buffer_reader.cc | 16 +- src/core/lib/surface/call.cc | 417 +++---- src/core/lib/surface/call.h | 24 +- src/core/lib/surface/call_details.cc | 8 +- src/core/lib/surface/channel.cc | 114 +- src/core/lib/surface/channel.h | 27 +- src/core/lib/surface/channel_init.cc | 5 +- src/core/lib/surface/channel_init.h | 6 +- src/core/lib/surface/channel_ping.cc | 15 +- src/core/lib/surface/completion_queue.cc | 222 ++-- src/core/lib/surface/completion_queue.h | 21 +- src/core/lib/surface/init.cc | 27 +- src/core/lib/surface/init_secure.cc | 4 +- src/core/lib/surface/lame_client.cc | 53 +- src/core/lib/surface/server.cc | 319 ++--- src/core/lib/surface/server.h | 15 +- src/core/lib/transport/bdp_estimator.cc | 4 +- src/core/lib/transport/bdp_estimator.h | 2 +- src/core/lib/transport/byte_stream.cc | 62 +- src/core/lib/transport/byte_stream.h | 27 +- src/core/lib/transport/connectivity_state.cc | 22 +- src/core/lib/transport/connectivity_state.h | 10 +- src/core/lib/transport/error_utils.cc | 9 +- src/core/lib/transport/error_utils.h | 5 +- src/core/lib/transport/metadata.cc | 40 +- src/core/lib/transport/metadata.h | 20 +- src/core/lib/transport/metadata_batch.cc | 79 +- src/core/lib/transport/metadata_batch.h | 42 +- src/core/lib/transport/service_config.cc | 15 +- src/core/lib/transport/service_config.h | 7 +- src/core/lib/transport/static_metadata.cc | 2 +- src/core/lib/transport/status_conversion.cc | 8 +- src/core/lib/transport/status_conversion.h | 3 +- src/core/lib/transport/transport.cc | 81 +- src/core/lib/transport/transport.h | 33 +- src/core/lib/transport/transport_impl.h | 27 +- src/core/tsi/fake_transport_security.cc | 17 +- src/core/tsi/transport_security.h | 2 +- src/core/tsi/transport_security_grpc.cc | 27 +- src/core/tsi/transport_security_grpc.h | 22 +- src/cpp/common/channel_arguments.cc | 12 +- src/cpp/common/channel_filter.cc | 29 +- src/cpp/common/channel_filter.h | 62 +- src/ruby/ext/grpc/rb_grpc_imports.generated.h | 2 +- test/core/backoff/backoff_test.c | 60 +- test/core/backoff/backoff_test.cc | 147 +++ .../{bad_client.c => bad_client.cc} | 51 +- test/core/bad_client/bad_client.h | 8 + test/core/bad_client/gen_build_yaml.py | 2 +- test/core/bad_client/generate_tests.bzl | 2 +- test/core/channel/channel_args_test.c | 30 +- .../core/channel/channel_stack_builder_test.c | 24 +- test/core/channel/channel_stack_test.c | 45 +- .../channel/minimal_stack_is_minimal_test.c | 17 +- test/core/client_channel/lb_policies_test.c | 16 +- test/core/client_channel/parse_address_test.c | 18 +- .../dns_resolver_connectivity_test.c | 64 +- .../resolvers/dns_resolver_test.c | 24 +- .../resolvers/fake_resolver_test.c | 54 +- .../resolvers/sockaddr_resolver_test.c | 30 +- test/core/client_channel/uri_fuzzer_test.c | 6 +- test/core/client_channel/uri_parser_test.c | 30 +- test/core/compression/algorithm_test.c | 14 +- test/core/compression/message_compress_test.c | 67 +- test/core/debug/stats_test.cc | 16 +- ...nse_test.c => bad_server_response_test.cc} | 35 +- test/core/end2end/connection_refused_test.c | 6 +- test/core/end2end/fixtures/h2_census.c | 12 +- test/core/end2end/fixtures/h2_compress.c | 20 +- test/core/end2end/fixtures/h2_fd.c | 8 +- .../end2end/fixtures/h2_full+workarounds.c | 6 +- .../core/end2end/fixtures/h2_load_reporting.c | 6 +- test/core/end2end/fixtures/h2_oauth2.c | 8 +- .../core/end2end/fixtures/h2_sockpair+trace.c | 40 +- test/core/end2end/fixtures/h2_sockpair.c | 36 +- .../core/end2end/fixtures/h2_sockpair_1byte.c | 36 +- test/core/end2end/fixtures/h2_ssl.c | 6 +- test/core/end2end/fixtures/h2_ssl_proxy.c | 12 +- ..._proxy_fixture.c => http_proxy_fixture.cc} | 183 ++- test/core/end2end/fuzzers/api_fuzzer.c | 86 +- test/core/end2end/fuzzers/client_fuzzer.c | 17 +- test/core/end2end/fuzzers/server_fuzzer.c | 17 +- test/core/end2end/goaway_server_test.c | 28 +- test/core/end2end/h2_ssl_cert_test.cc | 6 +- ..._after_accept.c => cancel_after_accept.cc} | 10 +- ...ound_trip.c => cancel_after_round_trip.cc} | 10 +- ...ressed_payload.c => compressed_payload.cc} | 22 +- ...init_fails.c => filter_call_init_fails.cc} | 19 +- ..._causes_close.c => filter_causes_close.cc} | 24 +- .../{filter_latency.c => filter_latency.cc} | 18 +- test/core/end2end/tests/keepalive_timeout.c | 2 +- ...eporting_hook.c => load_reporting_hook.cc} | 6 +- ...message_length.c => max_message_length.cc} | 102 +- ...est_with_flags.c => request_with_flags.cc} | 0 ... stream_compression_compressed_payload.cc} | 22 +- ...ayload.c => stream_compression_payload.cc} | 8 +- ...stream_compression_ping_pong_streaming.cc} | 8 +- ...ion.c => workaround_cronet_compression.cc} | 22 +- test/core/http/httpcli_test.c | 44 +- test/core/http/httpscli_test.c | 44 +- test/core/iomgr/combiner_test.c | 56 +- test/core/iomgr/endpoint_pair_test.c | 19 +- .../{endpoint_tests.c => endpoint_tests.cc} | 102 +- test/core/iomgr/ev_epollsig_linux_test.c | 94 +- test/core/iomgr/fd_conservation_posix_test.c | 10 +- test/core/iomgr/fd_posix_test.c | 140 +-- test/core/iomgr/pollset_set_test.c | 226 ++-- ...x_test.c => resolve_address_posix_test.cc} | 62 +- test/core/iomgr/resolve_address_test.c | 144 ++- test/core/iomgr/resource_quota_test.c | 372 +++--- test/core/iomgr/tcp_client_posix_test.c | 61 +- test/core/iomgr/tcp_client_uv_test.c | 63 +- test/core/iomgr/tcp_posix_test.c | 141 +-- test/core/iomgr/tcp_server_posix_test.c | 93 +- test/core/iomgr/tcp_server_uv_test.c | 95 +- test/core/iomgr/timer_list_test.c | 60 +- test/core/iomgr/udp_server_test.c | 78 +- test/core/security/credentials_test.c | 329 +++-- test/core/security/json_token_test.c | 14 +- test/core/security/jwt_verifier_test.c | 152 ++- .../{oauth2_utils.c => oauth2_utils.cc} | 30 +- .../print_google_default_creds_token.c | 22 +- test/core/security/secure_endpoint_test.c | 46 +- test/core/security/ssl_server_fuzzer.c | 33 +- .../security/{verify_jwt.c => verify_jwt.cc} | 23 +- test/core/slice/b64_test.c | 46 +- test/core/slice/slice_hash_table_test.c | 40 +- test/core/surface/byte_buffer_reader_test.c | 7 +- test/core/surface/channel_create_test.c | 4 +- test/core/surface/completion_queue_test.c | 25 +- ...t.c => completion_queue_threading_test.cc} | 22 +- .../surface/concurrent_connectivity_test.c | 36 +- test/core/surface/lame_client_test.c | 15 +- .../num_external_connectivity_watchers_test.c | 6 +- .../core/surface/secure_channel_create_test.c | 20 +- .../surface/sequential_connectivity_test.c | 6 +- test/core/transport/bdp_estimator_test.cc | 149 +-- test/core/transport/byte_stream_test.c | 115 +- test/core/transport/chttp2/bin_decoder_test.c | 102 +- .../core/transport/chttp2/bin_decoder_test.cc | 135 ++ .../transport/chttp2/hpack_encoder_test.c | 82 +- .../chttp2/hpack_parser_fuzzer_test.c | 14 +- .../core/transport/chttp2/hpack_parser_test.c | 42 +- test/core/transport/chttp2/hpack_table_test.c | 75 +- test/core/transport/connectivity_state_test.c | 50 +- test/core/transport/metadata_test.c | 138 +-- test/core/transport/status_conversion_test.c | 9 +- test/core/transport/stream_owned_slice_test.c | 2 +- .../{mock_endpoint.c => mock_endpoint.cc} | 33 +- test/core/util/mock_endpoint.h | 3 +- ...ssthru_endpoint.c => passthru_endpoint.cc} | 40 +- test/core/util/passthru_endpoint.h | 8 + test/core/util/{port.c => port.cc} | 0 ..._server_client.c => port_server_client.cc} | 78 +- test/core/util/port_server_client.h | 8 + test/core/util/reconnect_server.c | 6 +- .../{test_tcp_server.c => test_tcp_server.cc} | 41 +- ...trickle_endpoint.c => trickle_endpoint.cc} | 51 +- test/core/util/trickle_endpoint.h | 3 +- test/cpp/common/channel_filter_test.cc | 4 +- test/cpp/end2end/client_lb_end2end_test.cc | 14 +- test/cpp/end2end/filter_end2end_test.cc | 7 +- test/cpp/end2end/grpclb_end2end_test.cc | 12 +- test/cpp/grpclb/grpclb_test.cc | 18 +- test/cpp/microbenchmarks/bm_call_create.cc | 140 +-- test/cpp/microbenchmarks/bm_chttp2_hpack.cc | 99 +- .../microbenchmarks/bm_chttp2_transport.cc | 119 +- test/cpp/microbenchmarks/bm_closure.cc | 207 ++-- test/cpp/microbenchmarks/bm_cq.cc | 26 +- .../microbenchmarks/bm_cq_multiple_threads.cc | 22 +- test/cpp/microbenchmarks/bm_error.cc | 24 +- .../microbenchmarks/bm_fullstack_trickle.cc | 8 +- test/cpp/microbenchmarks/bm_metadata.cc | 119 +- test/cpp/microbenchmarks/bm_pollset.cc | 52 +- test/cpp/microbenchmarks/fullstack_fixtures.h | 23 +- test/cpp/naming/resolver_component_test.cc | 52 +- test/cpp/performance/writes_per_rpc_test.cc | 20 +- tools/codegen/core/gen_stats_data.py | 24 +- .../generated/sources_and_headers.json | 20 +- 423 files changed, 9742 insertions(+), 11592 deletions(-) create mode 100644 err create mode 100644 grpc_c.32.ruby create mode 100644 grpc_c.64.ruby create mode 100644 memory_usage.csv create mode 100644 remove_exec_ctx.py create mode 100644 scenario_result.json create mode 100644 test/core/backoff/backoff_test.cc rename test/core/bad_client/{bad_client.c => bad_client.cc} (80%) rename test/core/end2end/{bad_server_response_test.c => bad_server_response_test.cc} (91%) rename test/core/end2end/fixtures/{http_proxy_fixture.c => http_proxy_fixture.cc} (73%) rename test/core/end2end/tests/{cancel_after_accept.c => cancel_after_accept.cc} (97%) rename test/core/end2end/tests/{cancel_after_round_trip.c => cancel_after_round_trip.cc} (98%) rename test/core/end2end/tests/{compressed_payload.c => compressed_payload.cc} (97%) rename test/core/end2end/tests/{filter_call_init_fails.c => filter_call_init_fails.cc} (95%) rename test/core/end2end/tests/{filter_causes_close.c => filter_causes_close.cc} (90%) rename test/core/end2end/tests/{filter_latency.c => filter_latency.cc} (94%) rename test/core/end2end/tests/{load_reporting_hook.c => load_reporting_hook.cc} (98%) rename test/core/end2end/tests/{max_message_length.c => max_message_length.cc} (84%) rename test/core/end2end/tests/{request_with_flags.c => request_with_flags.cc} (100%) rename test/core/end2end/tests/{stream_compression_compressed_payload.c => stream_compression_compressed_payload.cc} (97%) rename test/core/end2end/tests/{stream_compression_payload.c => stream_compression_payload.cc} (98%) rename test/core/end2end/tests/{stream_compression_ping_pong_streaming.c => stream_compression_ping_pong_streaming.cc} (97%) rename test/core/end2end/tests/{workaround_cronet_compression.c => workaround_cronet_compression.cc} (95%) rename test/core/iomgr/{endpoint_tests.c => endpoint_tests.cc} (75%) rename test/core/iomgr/{resolve_address_posix_test.c => resolve_address_posix_test.cc} (70%) rename test/core/security/{oauth2_utils.c => oauth2_utils.cc} (76%) rename test/core/security/{verify_jwt.c => verify_jwt.cc} (81%) rename test/core/surface/{completion_queue_threading_test.c => completion_queue_threading_test.cc} (92%) create mode 100644 test/core/transport/chttp2/bin_decoder_test.cc rename test/core/util/{mock_endpoint.c => mock_endpoint.cc} (76%) rename test/core/util/{passthru_endpoint.c => passthru_endpoint.cc} (80%) rename test/core/util/{port.c => port.cc} (100%) rename test/core/util/{port_server_client.c => port_server_client.cc} (70%) rename test/core/util/{test_tcp_server.c => test_tcp_server.cc} (74%) rename test/core/util/{trickle_endpoint.c => trickle_endpoint.cc} (74%) diff --git a/CMakeLists.txt b/CMakeLists.txt index e8137ea73b3..103e8f858ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1610,22 +1610,22 @@ add_library(grpc_test_util test/core/end2end/data/server1_cert.c test/core/end2end/data/server1_key.c test/core/end2end/data/test_root_cert.c - test/core/security/oauth2_utils.c + test/core/security/oauth2_utils.cc src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc test/core/end2end/cq_verifier.c - test/core/end2end/fixtures/http_proxy_fixture.c + test/core/end2end/fixtures/http_proxy_fixture.cc test/core/end2end/fixtures/proxy.c - test/core/iomgr/endpoint_tests.c + test/core/iomgr/endpoint_tests.cc test/core/util/debugger_macros.cc test/core/util/grpc_profiler.c test/core/util/memory_counters.c - test/core/util/mock_endpoint.c + test/core/util/mock_endpoint.cc test/core/util/parse_hexstring.c - test/core/util/passthru_endpoint.c - test/core/util/port.c - test/core/util/port_server_client.c + test/core/util/passthru_endpoint.cc + test/core/util/port.cc + test/core/util/port_server_client.cc test/core/util/slice_splitter.c - test/core/util/trickle_endpoint.c + test/core/util/trickle_endpoint.cc src/core/lib/backoff/backoff.cc src/core/lib/channel/channel_args.cc src/core/lib/channel/channel_stack.cc @@ -1877,19 +1877,19 @@ if (gRPC_BUILD_TESTS) add_library(grpc_test_util_unsecure src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc test/core/end2end/cq_verifier.c - test/core/end2end/fixtures/http_proxy_fixture.c + test/core/end2end/fixtures/http_proxy_fixture.cc test/core/end2end/fixtures/proxy.c - test/core/iomgr/endpoint_tests.c + test/core/iomgr/endpoint_tests.cc test/core/util/debugger_macros.cc test/core/util/grpc_profiler.c test/core/util/memory_counters.c - test/core/util/mock_endpoint.c + test/core/util/mock_endpoint.cc test/core/util/parse_hexstring.c - test/core/util/passthru_endpoint.c - test/core/util/port.c - test/core/util/port_server_client.c + test/core/util/passthru_endpoint.cc + test/core/util/port.cc + test/core/util/port_server_client.cc test/core/util/slice_splitter.c - test/core/util/trickle_endpoint.c + test/core/util/trickle_endpoint.cc src/core/lib/backoff/backoff.cc src/core/lib/channel/channel_args.cc src/core/lib/channel/channel_stack.cc @@ -2500,7 +2500,7 @@ endif (gRPC_BUILD_TESTS) if (gRPC_BUILD_TESTS) add_library(test_tcp_server - test/core/util/test_tcp_server.c + test/core/util/test_tcp_server.cc ) if(WIN32 AND MSVC) @@ -4775,7 +4775,7 @@ endif (gRPC_BUILD_TESTS) if (gRPC_BUILD_TESTS) add_library(bad_client_test - test/core/bad_client/bad_client.c + test/core/bad_client/bad_client.cc ) if(WIN32 AND MSVC) diff --git a/Makefile b/Makefile index b42d710e2c1..cc0ef409948 100644 --- a/Makefile +++ b/Makefile @@ -3604,22 +3604,22 @@ LIBGRPC_TEST_UTIL_SRC = \ test/core/end2end/data/server1_cert.c \ test/core/end2end/data/server1_key.c \ test/core/end2end/data/test_root_cert.c \ - test/core/security/oauth2_utils.c \ + test/core/security/oauth2_utils.cc \ src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \ test/core/end2end/cq_verifier.c \ - test/core/end2end/fixtures/http_proxy_fixture.c \ + test/core/end2end/fixtures/http_proxy_fixture.cc \ test/core/end2end/fixtures/proxy.c \ - test/core/iomgr/endpoint_tests.c \ + test/core/iomgr/endpoint_tests.cc \ test/core/util/debugger_macros.cc \ test/core/util/grpc_profiler.c \ test/core/util/memory_counters.c \ - test/core/util/mock_endpoint.c \ + test/core/util/mock_endpoint.cc \ test/core/util/parse_hexstring.c \ - test/core/util/passthru_endpoint.c \ - test/core/util/port.c \ - test/core/util/port_server_client.c \ + test/core/util/passthru_endpoint.cc \ + test/core/util/port.cc \ + test/core/util/port_server_client.cc \ test/core/util/slice_splitter.c \ - test/core/util/trickle_endpoint.c \ + test/core/util/trickle_endpoint.cc \ src/core/lib/backoff/backoff.cc \ src/core/lib/channel/channel_args.cc \ src/core/lib/channel/channel_stack.cc \ @@ -3862,19 +3862,19 @@ endif LIBGRPC_TEST_UTIL_UNSECURE_SRC = \ src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \ test/core/end2end/cq_verifier.c \ - test/core/end2end/fixtures/http_proxy_fixture.c \ + test/core/end2end/fixtures/http_proxy_fixture.cc \ test/core/end2end/fixtures/proxy.c \ - test/core/iomgr/endpoint_tests.c \ + test/core/iomgr/endpoint_tests.cc \ test/core/util/debugger_macros.cc \ test/core/util/grpc_profiler.c \ test/core/util/memory_counters.c \ - test/core/util/mock_endpoint.c \ + test/core/util/mock_endpoint.cc \ test/core/util/parse_hexstring.c \ - test/core/util/passthru_endpoint.c \ - test/core/util/port.c \ - test/core/util/port_server_client.c \ + test/core/util/passthru_endpoint.cc \ + test/core/util/port.cc \ + test/core/util/port_server_client.cc \ test/core/util/slice_splitter.c \ - test/core/util/trickle_endpoint.c \ + test/core/util/trickle_endpoint.cc \ src/core/lib/backoff/backoff.cc \ src/core/lib/channel/channel_args.cc \ src/core/lib/channel/channel_stack.cc \ @@ -4445,7 +4445,7 @@ endif LIBTEST_TCP_SERVER_SRC = \ - test/core/util/test_tcp_server.c \ + test/core/util/test_tcp_server.cc \ PUBLIC_HEADERS_C += \ @@ -8445,7 +8445,7 @@ endif LIBBAD_CLIENT_TEST_SRC = \ - test/core/bad_client/bad_client.c \ + test/core/bad_client/bad_client.cc \ PUBLIC_HEADERS_C += \ @@ -20239,7 +20239,7 @@ src/cpp/server/secure_server_credentials.cc: $(OPENSSL_DEP) src/cpp/util/core_stats.cc: $(OPENSSL_DEP) src/cpp/util/error_details.cc: $(OPENSSL_DEP) src/csharp/ext/grpc_csharp_ext.c: $(OPENSSL_DEP) -test/core/bad_client/bad_client.c: $(OPENSSL_DEP) +test/core/bad_client/bad_client.cc: $(OPENSSL_DEP) test/core/bad_ssl/server_common.c: $(OPENSSL_DEP) test/core/end2end/data/client_certs.c: $(OPENSSL_DEP) test/core/end2end/data/server1_cert.c: $(OPENSSL_DEP) @@ -20247,9 +20247,9 @@ test/core/end2end/data/server1_key.c: $(OPENSSL_DEP) test/core/end2end/data/test_root_cert.c: $(OPENSSL_DEP) test/core/end2end/end2end_tests.c: $(OPENSSL_DEP) test/core/end2end/tests/call_creds.c: $(OPENSSL_DEP) -test/core/security/oauth2_utils.c: $(OPENSSL_DEP) +test/core/security/oauth2_utils.cc: $(OPENSSL_DEP) test/core/util/reconnect_server.c: $(OPENSSL_DEP) -test/core/util/test_tcp_server.c: $(OPENSSL_DEP) +test/core/util/test_tcp_server.cc: $(OPENSSL_DEP) test/cpp/end2end/test_service_impl.cc: $(OPENSSL_DEP) test/cpp/interop/client.cc: $(OPENSSL_DEP) test/cpp/interop/client_helper.cc: $(OPENSSL_DEP) diff --git a/build.yaml b/build.yaml index 4cb1b68cf30..d2bfa8dfcde 100644 --- a/build.yaml +++ b/build.yaml @@ -739,19 +739,19 @@ filegroups: src: - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc - test/core/end2end/cq_verifier.c - - test/core/end2end/fixtures/http_proxy_fixture.c + - test/core/end2end/fixtures/http_proxy_fixture.cc - test/core/end2end/fixtures/proxy.c - - test/core/iomgr/endpoint_tests.c + - test/core/iomgr/endpoint_tests.cc - test/core/util/debugger_macros.cc - test/core/util/grpc_profiler.c - test/core/util/memory_counters.c - - test/core/util/mock_endpoint.c + - test/core/util/mock_endpoint.cc - test/core/util/parse_hexstring.c - - test/core/util/passthru_endpoint.c - - test/core/util/port.c - - test/core/util/port_server_client.c + - test/core/util/passthru_endpoint.cc + - test/core/util/port.cc + - test/core/util/port_server_client.cc - test/core/util/slice_splitter.c - - test/core/util/trickle_endpoint.c + - test/core/util/trickle_endpoint.cc deps: - gpr_test_util - gpr @@ -1235,7 +1235,7 @@ libs: - test/core/end2end/data/server1_cert.c - test/core/end2end/data/server1_key.c - test/core/end2end/data/test_root_cert.c - - test/core/security/oauth2_utils.c + - test/core/security/oauth2_utils.cc deps: - gpr_test_util - gpr @@ -1304,7 +1304,7 @@ libs: headers: - test/core/util/test_tcp_server.h src: - - test/core/util/test_tcp_server.c + - test/core/util/test_tcp_server.cc deps: - grpc_test_util - grpc diff --git a/err b/err new file mode 100644 index 00000000000..3c68c4f300e --- /dev/null +++ b/err @@ -0,0 +1,37 @@ +src/core/ext/transport/inproc/inproc_transport.cc: In function ‘void grpc_inproc_transport_init()’: +src/core/ext/transport/inproc/inproc_transport.cc:1092:17: error: unused variable ‘exec_ctx’ [-Werror=unused-variable] + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ^ +src/core/ext/transport/inproc/inproc_transport.cc: In function ‘grpc_channel* grpc_inproc_channel_create(grpc_server*, grpc_channel_args*, void*)’: +src/core/ext/transport/inproc/inproc_transport.cc:1158:17: error: unused variable ‘exec_ctx’ [-Werror=unused-variable] + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ^ +src/core/ext/transport/inproc/inproc_transport.cc: In function ‘void grpc_inproc_transport_shutdown()’: +src/core/ext/transport/inproc/inproc_transport.cc:1192:17: error: unused variable ‘exec_ctx’ [-Werror=unused-variable] + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ^ +cc1plus: all warnings being treated as errors +make: *** [/usr/local/google/home/yashkt/grpc-projects/grpc-c-fork/grpc/objs/opt/src/core/ext/transport/inproc/inproc_transport.o] Error 1 +src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc: In function ‘void grpc_ares_request_unref(grpc_ares_request*)’: +src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc:111:21: error: unused variable ‘new_exec_ctx’ [-Werror=unused-variable] + grpc_exec_ctx new_exec_ctx = GRPC_EXEC_CTX_INIT; + ^ +src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc: In function ‘void on_srv_query_done_cb(void*, int, int, unsigned char*, int)’: +src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc:229:17: error: unused variable ‘exec_ctx’ [-Werror=unused-variable] + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ^ +cc1plus: all warnings being treated as errors +make: *** [/usr/local/google/home/yashkt/grpc-projects/grpc-c-fork/grpc/objs/opt/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.o] Error 1 +src/cpp/common/channel_arguments.cc: In destructor ‘grpc::ChannelArguments::~ChannelArguments()’: +src/cpp/common/channel_arguments.cc:70:17: error: unused variable ‘exec_ctx’ [-Werror=unused-variable] + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ^ +src/cpp/common/channel_arguments.cc: In member function ‘void grpc::ChannelArguments::SetSocketMutator(grpc_socket_mutator*)’: +src/cpp/common/channel_arguments.cc:99:17: error: unused variable ‘exec_ctx’ [-Werror=unused-variable] + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ^ +cc1plus: all warnings being treated as errors +make: *** [/usr/local/google/home/yashkt/grpc-projects/grpc-c-fork/grpc/objs/opt/src/cpp/common/channel_arguments.o] Error 1 +src/proto/grpc/testing/services.proto: warning: Import src/proto/grpc/testing/stats.proto but not used. +src/proto/grpc/testing/services.proto: warning: Import src/proto/grpc/testing/stats.proto but not used. +make: Target `all' not remade because of errors. diff --git a/grpc.gyp b/grpc.gyp index d5a20fa5558..9cc549fafc2 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -509,22 +509,22 @@ 'test/core/end2end/data/server1_cert.c', 'test/core/end2end/data/server1_key.c', 'test/core/end2end/data/test_root_cert.c', - 'test/core/security/oauth2_utils.c', + 'test/core/security/oauth2_utils.cc', 'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc', 'test/core/end2end/cq_verifier.c', - 'test/core/end2end/fixtures/http_proxy_fixture.c', + 'test/core/end2end/fixtures/http_proxy_fixture.cc', 'test/core/end2end/fixtures/proxy.c', - 'test/core/iomgr/endpoint_tests.c', + 'test/core/iomgr/endpoint_tests.cc', 'test/core/util/debugger_macros.cc', 'test/core/util/grpc_profiler.c', 'test/core/util/memory_counters.c', - 'test/core/util/mock_endpoint.c', + 'test/core/util/mock_endpoint.cc', 'test/core/util/parse_hexstring.c', - 'test/core/util/passthru_endpoint.c', - 'test/core/util/port.c', - 'test/core/util/port_server_client.c', + 'test/core/util/passthru_endpoint.cc', + 'test/core/util/port.cc', + 'test/core/util/port_server_client.cc', 'test/core/util/slice_splitter.c', - 'test/core/util/trickle_endpoint.c', + 'test/core/util/trickle_endpoint.cc', 'src/core/lib/backoff/backoff.cc', 'src/core/lib/channel/channel_args.cc', 'src/core/lib/channel/channel_stack.cc', @@ -719,19 +719,19 @@ 'sources': [ 'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc', 'test/core/end2end/cq_verifier.c', - 'test/core/end2end/fixtures/http_proxy_fixture.c', + 'test/core/end2end/fixtures/http_proxy_fixture.cc', 'test/core/end2end/fixtures/proxy.c', - 'test/core/iomgr/endpoint_tests.c', + 'test/core/iomgr/endpoint_tests.cc', 'test/core/util/debugger_macros.cc', 'test/core/util/grpc_profiler.c', 'test/core/util/memory_counters.c', - 'test/core/util/mock_endpoint.c', + 'test/core/util/mock_endpoint.cc', 'test/core/util/parse_hexstring.c', - 'test/core/util/passthru_endpoint.c', - 'test/core/util/port.c', - 'test/core/util/port_server_client.c', + 'test/core/util/passthru_endpoint.cc', + 'test/core/util/port.cc', + 'test/core/util/port_server_client.cc', 'test/core/util/slice_splitter.c', - 'test/core/util/trickle_endpoint.c', + 'test/core/util/trickle_endpoint.cc', 'src/core/lib/backoff/backoff.cc', 'src/core/lib/channel/channel_args.cc', 'src/core/lib/channel/channel_stack.cc', @@ -1179,7 +1179,7 @@ 'gpr', ], 'sources': [ - 'test/core/util/test_tcp_server.c', + 'test/core/util/test_tcp_server.cc', ], }, { @@ -2355,7 +2355,7 @@ 'gpr', ], 'sources': [ - 'test/core/bad_client/bad_client.c', + 'test/core/bad_client/bad_client.cc', ], }, { diff --git a/grpc_c.32.ruby b/grpc_c.32.ruby new file mode 100644 index 0000000000000000000000000000000000000000..5b14ce6a6ea3e1022fd2e5054a2c46a9b5834961 GIT binary patch literal 2033926 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 z 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�WacJutHkMVuV|ItI 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

xr``({9iYR)+pC z0L~|TbUjSpRs-k(=%~B3G)`qZ^8vEuMF=n|2ez_ ztd8}9BIb{W9?Z8x1FQ(MU|*O^z&(hw8w_Dt{lT9J{}X%+@4|I>^~nxkeii1IFq&! zV7Y~3=?yEvilA|{M)ot0b=_eFI2aCs1K|)j3>L$o&;w>c8#F-&%!f`$Lp!vZ2?^L2WXdCVNeUZz^<@4 zYyn%sM3@AVVJp}gwt*=y0{TM<^nqT`8&-sEAr33S>d+VZ!AKYdtHByD6-r?**c0}K zt+=jZAPr@33GOej6wZf>-~zZ9E`+TKGZY>p&wT|0m_Hr=4f9{a{^XVYpboz;)7g-K zr&zZc?1#Ua@V79pzlE$D!L$V0n12EPH)v(Plj-Gzy#oFTAHm1)3A_XE!h7&9cppB1 z4`EZbt%D!f{zBqi3I{<~e@%qB1k?|?jOnp#e*zrM^2ID)3c3A{t5`mc^(VqHgt?sM zE8!YYzvDWl$FuGvi25AY;?&>RlLOcr_JVz&KYU5Jf5VUP3w#5=!&mS<`~<(kx9|si z4L`uo@Ed#wG2$+4!$)oO6Igu_`)`G#U_+JP_ist;8M&Sc8}LA@8%d8+GF zuN^@=qnK}Ds(S1uxCKD?bvmftQhlYmO!e1APze{qA)xwj zHq-xYouIlv<-Y1|)!C}2_k{*f9ie-t40NyQ9@G7$drS9KR6i7!yV3or`%?F$?nm8= z_YlVwp!-bs;7OqSMt`?({89g=FUxnpouGT*ZNh8>8^Q@t3~g{9%!P$;2AoJ7pR%8J z=HG`8;NNf~aqI!=E6-rsj2j65xAv27<``GuSnuW-&u0EI&Z#@gyEC6=I-KcQtUC@C zGk-Xg!Z0`o>R~2y5cWUyYmX<4`nGem4bz+9f7>TLn{5u}I2JJdpY}w(I__#y$5WeR{*bkbu2l7VHhzliodGK)W z6z6`Frd+cVncp101#Ah^S?-4ajCu8WYv3*B--HX8e~0PQ@Hwc@yA@&8pS_KBL*NkH zkMJ}61RulE_@iJ691GXLF>o};a16Xl81;A0Wquy>r@;i4C&DhUJxqb|Fd24$U7-q& zgGq1|+b(0fH$eU4PnfD-+{U{9(>^Xy{;&JFr?AguZ1`vW-N78&f9vxeMjX@F_k6;h zMO?qLT-g6rU$(ISn%j3}lmF}ct&2HG^;?f++Q{)925IK!an9Xg1vnTEf&<|YI1CoU zq0keGpd0jnSfw@o*4X__HLJ|_NFU*D%%z-*s zAI8A;uqLbwJHTjI3)Y4KPzD2G71#jALOE;*JHk3J69z#wYzMo+444iTPzlAb5o`?O zU_4BKO<+^l460yVSQU1Honbu~48vgv)W9?t3d5ilc7a`CbJzm5go!W-Cc{>+HEaV@ zU>xg4Llf^n;Nw3RZ(PU@DZtKCnCN0eiuour~}PKRiZ$P@na1 zI2~7uD?f>D=Npu zI$P>ea~fMxb+PtzqAuMSn_5#=T#@KV6xXDZoxC=@XxrkdmgJyV+uUUO&sG*!?^<3H zn^aL6YpyG0I*jSC*wpf&vGydS6O}E&XTTa;TNFjyA!qPXGK@UnPWeS0d^%zNlDrD$dO*jQaE z9Zw}^2g~K-!sX-~FO%Y0pPbFB_X=N88HTS*Ma#si2chtS5?KJuztg6fd{3Tr;68mTpJ{na=ae=PMt4 zup=LD?nw>FT`?rHM!QjH?It*IiQvFxbhnI(rJ56sO=Wd;?WuH{J1yPO-kI#^Y){n% zS3b!nT}bR{i`r7LW{KI9#G{Nv#vzTf zD@bEfFxnzYXKkUBwI32(=O}vxYq-EAy4oetHtXl1GXgF3OR~keU1a@4Gz9fh#OwIfhQu>A|)RG>XNT+Js zo3aTlQ7qGvo|>9Z!J})F7b2@2t~`-dc_GWoinD7nk+!53P!#3vb80GZndqup`Hak> zydXpsS_i60H`P#*rrLvCow@imH4~{rrAsDAB*K)bNzLm_QHJKM&&g?- zwPb*q(Ji?!xE&ko;%t@foV_0fJLOna9eW|ur`m%Oeg2T*nsA*y>r$Mvc5Z4>t!}$0 zm{x~^PuA$OJcwYqI@R9T%HWtP2%_TyI$9e<7pyOK03SnHQ&_e~;iKK-Q|;Wwe1IxU zlSaP2E!Cb09)+(8bn$Y*XD8B)$#U+`j`jqfc}hp&$taCU?%C{$WP8)(&gR+K6eyoM zvDhY=P1WE!Hc}w?#BxfD@EU7fqO+qxA0S#pYUCuIHz|wO7AEf4aluuZJtw$EEUDmT zN#(ZIal>mJw=_$-%URM5KB=Ny?TBQln+jg?ZLC&BeCS{`EHu&mH*|2YBh>-SsyZ4! zIaW^^hc$T3WU>aSPFdPWrQ4WjO7olQO%;u#qKZTAsp{4sH8a;&iIuyavDM3P~G;uf*!r@4Z z&?#|37gQ}#(?>0vaz&}Oj|woAJUNA0iCSWzq&XJPD;eXZK}i`UDqH6leX*%k)s>Sf zN`{ltjcuvsI?d_yyYNvYQ_I8CY)^(KspYV;9_GrL^_)tuo|Dshotl<)VtY)i8XMcc zsd08O?XNb~nM%H>B8zUtD60lF4;5VYCX7|@S~Zg@I6k*c*Mx#cc{4U`VomXk)azmZq^}lRkKt7qC1~#f1S|>rypgy&NlNzBpP4DtX#}9TYw~;L5maeaeW8>7X93 z=}0uUQK!dLsTXIKnkf|P_^cmg%cRC+duzINP6zGny2km9b)AVO?&+L8g@GwFbHWBi zXnT?jxLjCHoa4<2JFUGl-BCP|jGsC9=5)>Y@|++pu*Xxn)fJZq-`fytPFId&uqAtZ zt|19AuCa-eS(NTbHB(6`s!ZA5RZMlMrj7(RS9A?4v|OyaO{dHiX>E_OG&Pk-laNuF z#OlxlXUI)FpB8u>Y^Cwl`^# zP9@t@fk-Fjq^MuiUZtHy^+7h!H>C~yRQ#z`X8EzaUW7yA>i!P*!*1|9< zkaNQX7kl}v5#x9+LcX-?P2=WC2PFBpBScu-{o{kHf>9*q5`^`l1o$@=g<`19?(p6xTy zCp+Q{a-?X1pGAG3<3Z!66YGPt`swsP9tZ8oIbN7jsx(U>7jP2yD^AS#<4VUM+ zY~*bBxpQ|zFC@|C;x6c~<*tm*H`~d`T}x3mJ<-$|+=yXb<>0uN=`he~?+6Y&Cp)py z@l8$5Nwo*vpWNsWRKk?4)$OS{Ir&3r5jIA0OV`{jgPpskR+#*qW|}0^TIZ%(@=`_F zmbk-QRh5&|bt0^zan{_}p^jXTG+k}ml4_sm?&_bc)>y=HtAejO;EDuUak;flC$*m# zbZge*ljXwXBnIi3f66-cY!|r8)k)GRxO(X>;%?7$!5t(wwS#*-oz%evZM!bESL8Hq z{^Ri{+LH}*T(Z&R?n4(mC`y*gl6CWw={W!7q(@VIyt1ZZ!UD!Og4RhkqMS8UR{5JK z=z{h{TfQaO@=~$q2P>ac)AjbOST2fWUA(C-cSjV;LH0^h`*V+Hqt095dOveEG`WMV z+S*%N=S-P1rMsq z4m|?ztI*~|!QJZ^=DBsJA)NN;D79t5itNUTXc#ltB8sOYDi(AQ9j(dMpn6b5t;uv| zZ@N*UEt1V`rGt4MFuRd&8)7IR8Ps57qotsg#1ErzJJY*SyEm3d#uJ@%JSyovb}Z6j zN20wx)uC=(BBA=Cy_La*^z8b!cw?JJV#m@no*N44-qx1Z=GM+M{UrtqLQCtLA)%a6 zl@1zwZof9RQQcLx)VY6ERm~HbVwR&0SFnCsXG;rJVYt!@!3wp6t%F%rxv}W{$q&gy zH3>xpp)ylxf>Q~jx+c-st}-S_Dm0Z)7nUA6H5P-}HH(^?%fieV#7o#(GG<5c6*i8U zYMaVU<)1~)SJ6zVs)+W)_*rJ)B&Yt@q2;X!TMmwDZg|AOci5<{9G*+Q4RQd{P>5^T zyse>~u~mnR?glR4oW}NMTdEr^%}6wMs5rJ|9IT#UhDqUYy<~f;zPy7TO*k91f^4-m zQ^Q71tuWHU{oQO7DgnZ8?g`3gtZpbaXN@jcz%41ct4$wu6QaCAs!0NiJeQo5vnOX(yxJd^!<~w1jOF$#hU8Pj1!V zvA3l8+t{X|ojjYUtIPDHf>YPlWN!_0r0S}tR7acF(eo{IP3;Ln&{1u1k3bu9`$soW zv>4`bEvd;cHw*;Fz3s zbzJJ+wRI$%Fs&_g5!)GCNi;>RZf;bia%#$)v5oDFmJzX3TT>!g=<0)1jzajc=#)9- zbe#96bJ`GAQ`$PSZfYv6s~uhzYAMRkOx|a#EIQ|4P0&jXOF{})jzgA*UG3E9^@YBk zf-}fs3PhxCF68-Kxa7uTITg*EIpI1N7{zu}33}iiw9Of6 z3pUp{9j-W%)IYk;b*lF|)8W8_hFQbFp`>*~7q~4!e&La3x?^fUcdjk5x>mh}F^OuPU2d7HdqjB(ht^Dx&B4 zvF7^bj@TsD)`w5AY0)q=uezJoSY_^lAMZrpfu@13pkEoIiVbJdEzNE7OJg;YCsi|< z#E5Q;cv9_bnWkc_%$cuC@@-@c{>JK(Q^J`Fo{YCL3f#izZ20YRUXE1+n*BAgL5e({ zY0Pv46>g1J6lWgR22TfhV$qc1oAPugX%ybgMh%*=sPdh{N`uc7#k7AGE>iCG!zkTk z9_5LiLrE130Qr97Ue%t{vEZI+3m*PaFBU#<3Ok34$7a`rO`)8aqw(9a^5SWkW>QNl zU9htGN=^^&PHxS8Fd3{$a2v!Z<{RUT5)Chnl})axDrTsNS(2aOA0F-TtX5?MH3646 zO=TMISkUSfoJ%Sh)}*TTf^AAhl~NjHW*w94kkFP685IT4tOIB^3NUOq0fMhxjH_D} zK3U=351wvjN5?fr7N|1DeHpe5o`EEIQ$X{2&=YwLB}QH&labdmk;v=0NaXeGB=UM} z7Wh%&3lV{5J`+FlnfRH{#Ls*te&#drD|{5c!aIJxi8XWlnvdewd=$Utqxdx+#jp7& z{vf>L55g0F1C5p{WguRPAn)o?M{EL)mUl*mL;eLJDMY&n8Q6l5<-95p4rF!_GwVFc zS$HT@Q^Ebb+`-tZRTATuw_=^irdV5J6NO*!Z|0s2I_UW-tdYWSVJT7GL_;(b<5io{ z9w{5fQwwfg2j-bys;a)FwLMi;uqKGxg-tNe^JhIWp&HTKN|ZLqPL+Gy#xxe9C5n0t zakq~vA6Z&T&m_@Ao0-6qYg{aah1S$m6AgkoM<0#!mxr%G@otK~`ZOvhbB|$4&Pz|> zdFioY(2wg_6byVd`JJO$YQIh@BU*6k?@)em?dzsYjb2{S1GHHCoFs>-l6Q9NLZ13C z6gej`zg5L^s)AIS8=RaUyS6pZ=?mfvleM9hvGeAjDrnD~f7pl!-V2D5WLo&R*2y(p z@7a)y(b}?L$UL(cRFPWWK#y@6B{h3(N%;tk^VC*0m#)^)ci`+4(wN4K(>Vkem zt{6)vk|7Db!;_y|lz~b|#F}S%Z3`o*L9q0cGS4L^mrbhlJQ=B#M}S;3U&yQoN+KO^ zH7SzFyo?kz1H=J=$J)ng!V*h(7miw?va04*Th;Ta*gApc=spM>xa& zOKf&$W0P9AK^%28Wx=Binto|qQ)*(0_uMk7b9P62Dm94*_|2Wog*LG;*G8w7ZFkgF zO`DnuU;E?9NL^!V=86WDM4GQ$)q|_Sypu=EJ13Wf&l(!ivEVt;qzN^#$iy2`2_1Vn zYj^;nyNk-FA+<2x#+}7O*|=Zqiga^lQ%9rLWmeFtPPGRezTmWi+)2m3v#zyeQP9p$ zr#ixBNvgO~tp*-z^0LRYY(Iz*hZHSbH6VCfEOc`0z1JzQ+S6r|gZ6Z0DeUlO7N@i{aZQ7u^z>D9dR0|s zCeLc2mdao6JvzjMDHT;MZJixn)NM&Kndgx8dU+>|E|l}>Z2gHZ2+vc$;6Qn=D03XV z9zwi%M-!hmwkBGizb@S2yzF`(R##$X&Oruy%?65&BWJIX$_6S+&MQx}*Qtt}l-6@u zC4Baba{>lQLn`E+MJ8Z68<2gFR9!4bhZ+RPjU^CD--3;-^0q5D0ERp3@;A(g%w~bf z+h1S`c9`q(H!av@wR*qoGbdTCauQ)|q9fT*R@dCvk{>eH=N*!+K~lDAV%q^f0JUiwwGx3{)uH>$3xU>H>e9+k}4$|%29MYmDb zWio9PD3fWI7g72uh%;>zD4RpOFq!T0GHu~8gcmm2JU5GW>Bjn`qI??#$}C5F4FqYP z7a)IUK@h9F&6J07wu~}qCaR3cY!#U0wkgHagXILx zWT$A`tjO#*xG!?zVFW@0&cQpv)C<{MRj?v2Cyy9U4W%RMq>OjHn(zWA|k4iziXY;7-eFgJgVg zzIn$I-ju5Lqd;L_hy0y=p@miIm&BD56fRis-WkGKq;5hnU+T}Bz>A6tk0=P7x0}GQ z8}`B5A9{Orxs8HkrsF-Wfj3aKOWsJS3r7qx2N1*=ubec!z>FPStsZ{HhI@*aPoGq% zrUlnN=Wybbf0;nzoeS$3&vy$eRge?Ib1S9u!N`tBdy9iyRh*4_T4^xw(xK*%MqreG zmk-oBx2n9H7E6ptacg^VhaRdIs|gc4ugx44`MDxBKRiyxnNr1dsbK6aFJwGuT*a%( zrj^A(8(UTIIUR;(vZ9Rq$zy~T#!J0h8?FB>E(&b~Pw+&=EPP#)y)pEWL7i< zE1J`_)su5p(~hSENK+7ynOb-bz+B#l3?m&SxkD)>nX#1Yns5*#T;tJ;a2pR_cpJua z*k)vIY$J1H^O`WWaE)UN*EqJ3Van^c^qB^RUrHh~GBRP9=+hEmKz+6*8#-DSZW65< z$%mBaJaP92lcO|q zqwFrVl#N|W*@);Ea#o};gTcA?M%eq}U7I+=`mqI+wh&)HfSH*s&CU+->lic}#W12Yh=It43?3RqHe{FvXMoK){ftR3+FmYN`~aj z1@U#1M8_A**$p2O#?ry%h_+zPYe!`qbD=985^cepw;;hBOXz8^s7sz&(9x9s6FsEs&_lb{!@AbPyVfJR)+4*tqq^25ga5?;$q8|% zQ*gOS;<87jmrdAOoRnzO3;UVEDO_2c(G+cs{8SO!Xy6^ z5_ut_#}j#b2|tVy9S4zypHqpB1CbX(k>-Vv$P1yp=;1=%Ui5?^|6KAy=v;C`1m}_) zA~=`a5Z(*LL|&4qCN11gZkTXKIbpn~oG{*1P8jcN&| z!f0Q5q>^`9dajapR{0^=QC+Na5D@Yfgr^+2*RH&Q}tK~L2!Zo{A@hoAk+Oaj2l@&pTOQ)zamC*vD zj2;+e@WAMV1EUiS!$d||YXYA=2tLXcyuhLltOthLIs8OI=AD-4bGB5esX8{I*A#y6 zws^Kou@nVp#e^_Gf{#Nt@{3-n_yq1;o5KBzlu0cSnS8|N*v^#Xp0wyCX^*8s!u2imrt<3yEA<7xg*9Wu0}BtB|r_&hf< zgX6pxSP~mQg`atyT0CUvpdd`K_EwxD9qhlwHA>$Vk+Yfh*F{_eYp$DB&p|O)5L~-Z z-i!`VQ3RPaJe=qVW7@j#(0!E4M?6@ONRJ#9?yq!Y$d%(%9B4A7|qel}d~# zM3Cd#+ULZzy4`75c+kbwQ-ka{o-j)1@IZKHIOpU-R~)`boDDc?Xkjpt3>Ca{t6NDXoWuH$;qp@?b1#Q!SFrE@ zoGQV~?zzQ9JTaC|Z{A6h31%;Ea)M>@ax&@iIWqp-EA>Qi<{qf0)EPCDph4-S5?A># z8!}V&<_FPfo+_TBqg2oR_9SG*OZSN17?iUA%`0 zrk`^yrsT?rN7YwQg~#*~MH8j9O1A8XUSNZda;Ncg7|m>;NTx{>H6zDa>C?hW#_&~E zT33vo|`6H5HQ`E$@2srW>zN)I}i~D&)flep@{H0CncQ{OG7BrTE|{ZP7?;y1w?EezYhA#gbMQLglw`7#kJ#xcLaMBZPk!nZo~UsgzI&5x zx5tuYIYWop52W(?pFbI<&!Ojb0SedfVff(dXFU3-x78V_=Ydg@ms4}DC@s6-^B%dQ zlXZF}kYUM2J>m(j7vF8eyB*VxzPhHmvb<_sRb@r2ttQiTr9Q1|sG&G$3cfOnPo&gU zObB}S{El@zoowK3@jnftk>G5ouH)gV{MRs?z<&+HN&H!uWGht%Lj+wMc-}GPhs!_s z!gDMLn|BibIc)yP{O7QRC#B?%bDCTe1~tO73YKS<4jWc7ipc)M-^3ke)lG%MAba7G zP{ay-*J$j6Fw6nCLxHbW48BKw1^Wwd7Xe?x7<{jKKl{sYS3wW^HSDj$-3UGH2io6? z6WV8Q*v$T6+*8oYevth;xQ}5)`w{lP;d+k-`!V(#;I@W7_Eq*f<0@b!yv}*5{Vbg5 zi_wy0DGwlz>Ee3suzQXTme-iFg7+}AT{pGkTLEodV@Co}n zarc0}PhY;y{w3T$U^Sf5y59Z`oLC*FG@5JwE>5h0QyQi1Kf{SN?GLp74JX#JKhl1c z9XUo=+x|rRK{&CF{aN-q=)t= z1^s@4{QdSv<4y+szJmNC_GjakLb3gm_E+L=gpKgIe|O;?hK-TRE6+Oo)40FGCb@x` ze;fA^Y+B&I!u<%F;dQ>RIiA=~jc%qyQXc)wfV216N6 z=hbXK4mTObI{bY5-Ej#hw?Du>jXNAF9M7Tl=io%8{W11Sao52($8)Ovy|^b}yu+Vm z{|4>@m|(xu{s&yIvRQRi_E*_&h${ho*SOB>Ci{uF-CZb130x*7IA*>8m# z0yFJ@wXekOF6{rX@5CJsd)RmTD7@dV#oY}04IZUWPy4%Y55iu!+`lJq&%xfglKEF~ zZ^1qV{(amhFbl8xvA^U00`~*#Yrm>}_X^qwkih5ut%6%0X6H)gx4>-;N#>QFYdW5x zxDilizmEORIFYhn-=4)T|0WQ2U#MrT;@{BW55XM^4LIGu8{40O6O9hPh5f}iq3_35 zJX_mei4$|}jUl+Ft%)_bt9BaQFZY1z^A$fmgxQU<-!73f99DXKlFVI5>#WUG{KRM`h_*#1w zyZk$tu*bs!)~ao~hr?fhy9^fMf^ysbI^3*Eemy0Ztr()A7%@-vlQP#VLIbwBHIh6b{4bybiaYirX6& z+aG6t0PZL_-2OEC({Y!=5%%ZV--de_j6k9z`+$0|#k6Qqz*#B;SBJO-R)qcf~!}9Z9+|zKH z{i^n#<9>(J?bo+ow~F!#&amIyz7i+S#4BG7wx5U-XW8#yzb{UlZ9mSw0VmF}-_5=i zC(gCs%YG3~oM&Hee+*8XkJoi+w?7jnF0enq{vw>X5U=z+!v02__>29C_7CF3Qv0** zpTvoa@Y?Ui_RrzO#rD_Ozk(B&;B~*;V*fAP=Wwb0J@(ypp+1Gn>>sg@<3_^e_}ss8 z++?@{spEOt;b-IK!Ik!Zw_k!g1Fo`v+x}|Y?QpgINA}O)UV&@yO1H1%QpzNth1@;KX0;SFm3nC$7h8Yes`R> z$$mroeQ*tMv;7wKY1|=ji~V-?$Ky_hTk*Mnr{k8wZO9@R;qW)$ZWlP6?@0T<;hu*( zaJsK|uzv;j2Hc5Lc{|4bL!7t^r}G+T{~1o)Z9m!m8{Cg@4_?=Oy8RzGaW78SYnFZA ziHudiefEv^YvaWI_G$Y~apD2{gX~Li;z9eP?03Y8hwM+W-vuWgwm;8)22MPJS9x-o zeFIKBYJY?MBAj^4{%-qYapH0N$LyEl#1r-}*gt?1Pujm}{|-+4&Hf|%*d+2VJZ1ll z{f0R4wEb`PLvZ35`xQS8^Zx{#c-DS3`+afZIr|OlJ8pJc#)%i~huSa2i5Km6 zw!a4_Ub5fC{xzI<*}m5PJDm8t{l517Co^^huh`GE-x??WVL#t~EKa;?f0+HAIPseO z@%9UG;&uD8?9arBH|#IAzXm7Xw7<^&37mM#{to*OaN=$IhwWoixIXYt`)BPp#EEz8 zU$fs4C*HMx-+m@eyl4NVeFskb%l>Ek({bW``<~0fd~!2Rd|*Go{#l&((0)Dp&v4=+ z`_1hKR8!u<$Mz-mgK^>$`_cAOaN<+@@%BwPvCMv|{Ruennf>1O*W$$I_6_#Wx_`&`a`v-C2NBei}U&M)@>_4+#h7&*A|6sr3RNA-ji+#7x!hEtN zPW)=$&wc_<{ARzleG^XnZoi5B@i_5^{UG}ra6*-x%I8t`FW~+TMR?Uy751;;L^r(Z z@rm{y;Dmn1Prk-}8BX-D-^2cEoY3zCDtyBJC!EmlFUmLA$7(o6=w;t(-%Acww4ZO^ z4=3~+g^K4O`_*xxkNpw$>*0ick5J){v)>pe`r4mrzZFjC_YIXk=h*Lr6Z*YF`HSpp za6-R@D1ViG15OOEztR36oLI&FPWxkUVpaPG?N7&v)$E_NzZxf2w|~L@0i0OF{x$oj zaAHmSckSQDiM8xMvHuMx*0%rJezj>F3#?=RlYJZ~*0nGCJj~~#aAH0C-u9I^vA+E( z_S0~)VW9mw_VaLJ1N)8a55@`ouCCI5EBh00qS(H~{#=~c$bOXlWjL|1eVP4jII)R+ zmHpE=v8nxT_V3|@ey>c&v%CH0xL-lP(fj{z?1IaAK(a3-&wU#4!8U?5E(waQk=dQ#dig z{uBEHaAKtW*Y+plgnr9Z>Hm}cc{ripF_ka+BFz7n@7h0&6VvTKv400AX4rpi{~b=uwExMz_wLla zu)BTHmtj8N5GVGq?`=OCC-$^o#eND->}9`>{cN1r+kPW^vR;>e^9d_vIs8@*e*{kK zYhPl&6ekk)qwMd(iP`pL_Alc^(!R?6Q=HI?6v2IA-)#@tP>{0U-F{`9m}8%?Uk@kh z?Hlb&aiYO~p8bwE(P+QOej-lnXMdReEL9Q)gF z_dtvN#rBWmo`F{TYwTaceGYB*x7hdElXQT2_V?Nk#BBrZ_K(@`jGGMlO<5h!bM{Gv zg%0~y?T^BVPWyN5Pr!-!_Mh6HiaQ?`*new(1x_r)_h7%j+TVy1i|`s3ihUL4|NC&y z!~Xbg=$`gp;l6_d@cbX^W&b1YS2)n&SG14qMcWw;!fQOLk9{B9>Tob#$J5V#1KcK{ z-)xp&#eNWO2RPJz4f_eWYB#>R z&sO$l;4XwEcwNUq_E+GphNJKr?;2r$7w$ng+P=)5AYJ}FLD+ZUSi&pac6IolapE|< z(r2=LkG*O8!|`|>&s6)3aN-2K?(046;9_!b+|j>V*7XPAH}@@m)L)5{}%2OxYYhz z`+wt#X3>|h|JA-9ZXLMXzUS9rxv?3p1g@~}Z@(k13a+$Y%f1$ufUE3_?VE9n;A;D= z?2p8q0@v7=+FyXX3a+)^!TwgyKEKj2o{m+^nR(z)7xBis&f zgZ&KqnYb3X(S9HMB{*>tp8sPh`{QupW~BBz$NnUoxW(}_+Mk9Kx8jvQ+w9N5iQDkH z?hEa&#fjVP53_#|C+@I6*8WADxYPbL`?qo8F1*UI^XA*aqBVe}nz% zIB~E2UG~K|ai9Go_FLk_{r1n=m*B($_OIFx$B75+-?Oj8iHGbzv#-U8hwZ<&pM?{T z*vGyJ^D`ed)dx)L9<}dde>hG&X1}`q**NjI{RZ||*8T&o#|GPP}M;y!{}Yc**`u`{6k8vi(x~DxCPc{nhp}aN-sFTkPv`;ve?++0Vy`SM8s$ zKME&avwzY4Je+vl{!RPKaN-U75AAQli8t-PvVRyS-m?GM{zaU4+rG!QVSalZC;n;Q z-~LOSc*lNi`yX-QUHgsgi;|Sv@Sgp)_ABAUzwC$GuZ0uu+mEr|5+^>e-^G3ePJC!T z&AtjJKC<7(eg;l_Y~Nttj1!;Ox7#nqiBIhhv_BIkmf0_{zXm5hvp?DX4xISh{#^TK zaN-O5OYL9Bi7)N{YX1RFd}V)!{f{{Dwf#f({p+}o;2Zm=?Kj1VZ|z^PAC42>*}r2y z7AO8~|Ec{1ocP}UJNrFw;s?Cym*4GMaSP!`yxLJk--Y?@Fr4@aujjuj*q??IKil`U zzXT_K!K;2;)&4G=_|<+L`S= zKOZMnwBO188l32DKi2+Eoakde&i*l+Sjm1D`{!_?ul;2EH*un${Z#v}aiYKdboI*T>A=~D7L@Qei}|}WPh=J3MV$UzubO4PHbX-wf!+Tv8nxE z?JvNI&FpWozY!-kx4+H)A)MI4{x18MabipR`|Ll&iLLA(vi}(;wzhxFe&q)8CTwH> zH~UR-Vq5!X?ML85-2O%TDx4T(|B8JAC$_VH-F^{H47PvU{v@0zv47A0GMp&2|Iq$U zoET#Nsr^$pG1UGG`!{i7nEf~QU*N=W`|s_$HB#om2>YMySHX#q_P^V2ffJ+byZt+? z7k0pj?d?~vpNJDX*!QvD8z)BF_qT7wi5=}%wO@=AJK3*ke>zU=Y`?Dk6*w`*egpga zaiYwAWBZqIVyyk<_8;Lyx&7Amzv4uN{UH0k`%$JsrG2UWK%5w7Kioc!6XWf-w;zKO z6YO`gpN11v_G9hqabg$yarO&wVpscJ?2pBXiT0E2&%=pH_EYVz$BD`I)9oL@i7EDb z*uRPs)%N??e~A;j+0V9LVJ>weOtqh5zb;PH*zae*4Ngq6Z?WGICu;56?I+{Jbo=@C z^*AxZet-MJabl+Z!S?6lu7%z07u(;Ddj|HfUt<3OPV8xato`>mv6uac_C1@T)&z=_%Rm)q};6G{84?N7!DePB}U zmcQCxj1wvQo9u7Ii8=PS**}C6_4aq!zkw4C_V?L;ixZ9Z581EKO#XrW>>smV8z<)4 z|IK~~PBhs+Yd;284bAp1+BeHVi~TG1hu}_xR{PiOFUE;ByxPxi+uw{6^X&g+{~%7Z z+kb5T5>BM;Kezt`CpzrEvHuk(I_-b3@83e(4d&bbYQGU~7%af6Jzw;FSe{qmX23%G zUiOW+17VSUKl>ALOJRTe)$DJ_JqZWcuVeo%P8^6={@Kv}JDfPkeiQqit+c7(VEZlX zH^hlU?6`|4zqU3QG$7Ex705C_G)8*d)jE8SXbY8n5xR$@XiuQ4YW{_A~8w#!ZA{3*z4$ zHwTU@@M+wkaD0J30e3E(P~fk?-2x{T_y=*%!bt`G4cz;1a)JLG_dT3a;Qzq&o5%Qn zfnN`|6`WS!N8omX)A8!Z&2~CW#ECQPQ}#1(;!M2yp$+!?;F{npysmGn{jsCU6|Q?bb*jT3YrisXT{s`F{Bx>(DQ-u&!2Ue@THL;H zq5Y-y3vq|TU+k~5KM!{?EVaMQ{wmxJaFPA}_P68igNyB-uzwWyG+bi;g8fT4aVcK; z_I3MZIB^+X>F|dAk2rBTp8sQS+y9CaS2+AT_C3Xn&3UmN@Z{{SEe|IPtLkt@fjF;t~71?8o86qxSdPSL4KE z_K(=_ffJA0KWSfw6HnMbYu|zsPujm^zYr(>X8)@FVw`x&{w@3CapGzF_w3KaiD&FT zvR{f5&)R=xe>F}#XaBYREjaPK{rC3w;lvB}zt}&46EE7wehlx&7v64L zee6HPiND*gZ2uKbykft){m(e@5BqiOdvsF%z^nEf*!RbY*X%d3UmGW0x8Kr!W1M)y zK5oA)PP}PfYCjw&-m)KIKL#h>wjXW33r_sgzRW&>6YtoMvtNi4@7nKbe-ci-XJ2i9 zIZph`zSjO;oOs`U5BryK;sg6x_RDbML;E`WZu1#`fRF4O?bpSLkL_FROL5{8`?UQo zxM}byUhT<+_H%HZune#I=s^49aTma6_J`Qtj(Ze7$LIb%je8xwDDdy%zJV|Cde3~Z zP!;19u_0>2daOK`Ws zuLb^b+-vY#fnTPu@H<}V^U{xD`Ot3>QP$CblM_N&@Y#MMGy`*rR2!8JfX`;G0}aZ8{-UhS@}?a#qo z0V~@Nv3~$31~{J4_AlYyfmQ4)?7zT?Rq?uyCffHtfOCb_>}S|-gcGadbv(1}2jj#V z_H*rb#)&oUJM1Up#9Dau3l6eR;l$eZN7(O=6YJo0U5>Lq9w*kdKh6F^oLJBPJo_7P zVtxBd>>t93f%ezfKZ_F^*xzjb7EWwvf4BW-I8ki>u>CJMv61~#_I(Z{@4&`*rRPib z>*B;F_HWv6jT4*VmCrx0ABq#3;nnV1X1^0oY;OOR{RCVSY~gtRZGSrM4%pKE7yGwx zAHi1kML&o6{|DSk2XRdHz3ex@Z2{ZZ_p={`8w1CxMnf(p8N1()h8~fLA%b?W0#6ET~=LbXZ%AX_bx5SB|_B+{6z=>h@ zmG%udG2DKl{joSP!oJ4-N}L#JzlZ(vI5EmTVgDmeY;WISUwjC85O%O{wV!|!qwVM0 zFT{x*?GLiQ5+`=DKf?Y6oY>j^IQy?~VvPN%_G=%?Jq=~{=h%{mRDG9Jd;KWx7xPE4@>n|(D-RN22^zYr&Ov47Qm zDNgKa|4;j;ablwVhxXscLA?N?mPal&N#@9YQS#1#8q?6<>-YWr@#g!gF$ZYJ!8 zSNYl7ei3dlOtoLd{#@K;P-DN2{R6mZl z+`or$&%sQ*%EM6({}Jw6*d4D;#@hEff-)8MKSxjQucH0f5VA6_AT}+A4%H*>h0&*Z;BHQ_8s=4aiY}S8feG^X1wLi!{ zjT24whuSZ~iDvu5?U&$0i~SP&6LF%|{uul7aH7rrc>8N`VxIj;_IKh$yZx#5FW^Ml z{tWwNIMHE$wtZ{~_Zf8BpJ%^1PRzHz(0)stSYUsV{q{Jq(Ed{U@i?)_{tEjUII+L| z)%J67;sE>W><__-1MP3HKME%f!mAy4v;A4P^Wk88?%zeY>){Z*?$i4m{%+ipaH##` z_J7BT!|b28{}}f@EVh5mzS~i>Vc~H5_w3ili6iWn*>8v25stL~&b|sa1D4qTW}n1~ zqwH7sH7qCR;}*lw_}sq}ap%G@1^#l}O>k_1zYiyl!z(>kcKk2m#PRm)+JA@>C)jUh z|1+-t(d2c!`qzW)H^XfWC*hU;L+!W2Z4W2g?`U6vtA9 z?ccKB3n#9^tKadV{h>H$mVe9fK3s+xN3?!igK~SF=AGCvLP~$NoW_xCx*8_cTu2T;SitiCYSMwC&bQCM@}( zU-)lPIO*2S)1Kk9dk?QJa)6>DhbStFR`rZl_3U0-+oQHe_u3vS)b{9A+hfJr9(`(i ztW>*VX5(Ittyi>3uPC-&-J?}ew7q-?MZH$=swhbJqHX$j@3w;e>8*cy>7P}$S)r&$ z(P5)|Wsb0WH~Cfd&&pv8-Gh)TI=bG`G&-2x(ZTeN_S8E%nBLLB^o|aucXTejGx7D_ zcgcjJB|nb!q{!3YFxK_XihAmJ`sts(Ry|jWX8KC67i}JGU(_u!-J_Wv(M+#sX2ocx zZ#2`-Gu?XD4y+y6zjoltwF3v#4qT;n;HtF)SF0VkdhNjC+JTz{$#zz4QMcL^yQiS8 zw#U}BJ-Ce9)DGNG$HV39S=*y;ZI2+Qe1A}{v3+#Bn$a0NJF-W21sfR77j3g?_ip;9 zdz4YSXVPat_Z4dgZpIFK_Usk@+uf5QPrG><`5sj#Ur{Et&y2q({p{u4&mB9 z-L;*<_30j^P>-V8f$P-{T%&g2+S{a9=cMkN$&!7e<1Ff16kYbdnY`V%D7x@{i=r#v zw@-HCKH07NWH;}V-M&vYf9*2869@dK2Dr&MUJJYcmLWRTh;a$6h`8>274)5jHc1G>Af|_!2i#V z4E~AslR4J#2#b0T$jrntb5Wq)12P9ZAWHP!1EQ#U4~P=I_kif=dk=_ZH;!euj%7EG zWw(!IBZ%e1khx_C#Il((b1{1l$XrZjv+-swCN>*y_F@hw%EnuijkjC&c%xF4MCq1| zw_Emj{~yxM0w9X5Z{xeLzygARVgb6gq6iq+3IZyMfP^9jwUnfQB6fEtc6SGMcXwfT zcemf~?9PJMSMR;=`wc$xKj+MunKN@{e)G(_Gpm=kT)n*Z>g6q0@2BPFa?3(bb0&T; z6U)^>grp8EBy|T4$=pu2(BV+bme)&qmbu-eXO)*MkeAFoYAy6~k6R19LU|Pm=Ov5e zC5z@IbrfX9HhHDCc}YPLu1T~^KX3Qx=XJM!-tNo2G*LHi_vz>DKK;DimwVoGXyq-} zAaA*bd8LLwmFBI@Ft4)=^VVi4txZn?l}tJvwLvO0(B=%aK{|5<(ZHawHi%P`oT)bC z(*~Jz=E~Ush+7+FP|<-_47&fope!}&q>!GPP+bZ()EXvu0Nb~{o$nR4=3H> z=%hOyopcAJlU&+kPI6OWS%h$>l`4rH%|9X0CeaQ}8;D|(*#DY?R3RT;r(dw~xN<|s zzpkv77uBT{WodoR`kG4+L6GM} zea(gAM16g!RBNO}UeHKHfg%wFheQ+*5>fE(M185H{c2ij3}lqPLY|w@I7v~WagrjT z@kt_KE$pI56w)OM>k>tDiHf>}y)IEnm#7?MC+L5ombUe^G?zSb`o`=eX+P<9moCb6 z34L8cp-Y(P68gDC`Ubi(MPB{fsfxU*hPm~Oa#Nxenod)g=ce-KrYv()R=KGHxv7G= zDeK%+AzezIyAg7|+_K#E$#dH$&uyPPw|(;5_Q{pG^X9fxp1Tj^rnyt|<)+MXQ@L9t z&)p(> zaq^Rviu8gMm4g&+G4?U`vKV`LjJWt?WZN`%ljPle7Qi>^nL8&Vc=EB*b(h_OTIljHqKo z9V7O!5%r9yXT&}>Vjml^kM*gqPknvr>r;q8Vw*#RPqpq_5AS^tn&f z1p`gmfV7g7lAW$Bg-Ro4Q!ky#mkY7A&UwmpW?rtd@^YP#mzzt()zd*;PX~299n^87mHH}TD#cV1 zu2x)Ev{w#dZh`hvLy2@z(cE2e5z*XQiKr`=E;gDwDp4+7Y-HMtjlSkaN|cMc5)s87 z5m9V{h?>s`h++doUfhO=C~j0m6gMCuin|XH#jS^k;=V(~f@}&7mywYe*@}^!7#WL^ zQjCg=Q3)|piBU;0G7+OvVpLj;6k=o`Muo(vuo%h3NKcINi%}6VDk?_B#K=aB^u@?R zj4Z{dj2M*_qjF+Yo*k@^i;=z}-SV z?Ckp&8!^>GJH}9Gau^D2G?b#&u<@~-=D1X9Z;QnTKANLYB%~u&Az4kQyjvo9-tDPe z^HG-Y6b3q*P*j(2&~&dtdl)LT2b)4VJQbQ7KAenna4K}Sdb)dK-QBRBv@YF!u%4;3 zczxZ;p|4lrq@lj7ru{&D90?<1O-f%gR%piB5))0jfM#4!Gq%=@3u(rMHRA})I8rk< zmurJe6N*bgTUbJyD(wivU1tgHN=q1M<||>S4Mv)v($1&S&Y;rHpwiBu(#}v) zyUdc>DkZg5N^9pUt({g{JFT>KS{d!MGTLbcrJ$`+P+O&-W(~%2?t#S)k{f7>iBdVe zped&pG*NSZAOL5n7i1@WcBBM#e3+C!NMRAAunJNX2vQUbQdkEm3I!<&2PujKDT)Ru ziUlcbf)utv3cDah@gPNsAcZPOQ8GwTDo9Z}NKqz8Q8q|XE=W;6NKqk3;TWWF3Q{-+ zDXIo3ss$;k2PtXl$QAGV5P%TRYnX+8@TC7RDdMWUE)Qtp9ht1GFZOE~Hh zPPwNYhoA0bWZQF-3O>BleUz2^IgdQ|3ZMaE1MO#@dYn6&4?#sjPkb6G68gG?LYFYm zB@A^5BV9tNOBm}CCc1>FE|E`{Fw-S;AM$X^)7QXaP}7DQz{yQz@Jh}Nm>3J>$xT6< zwt`@s++0(^TvNeZQ^8zcmL40Ist!#FPfgEsj7U!9H!suD5*#B_GgH!&9aEwbg+f!} zYgLJqdHT5fxA6<~^icWvd$n>4^i(zXY$N+Q&3`)l{qo`?(`q@U)Cf(9i0V?6MgBv5 zexKAaA|WnGO|z)|x6AHY!>P7ocxacX)VSzO&7%KJeciA3YG=^>r^!$8pVvtvLsQby zSc0m8mrpA9hDT59$QD{)K%tO{ime{^82j` z{I+)ExTplRW^yCozoO~>skh=x4L>k;A zDk-lZjfQC3Axqb;RJ@i32AzHL8>L5D>ouvP@dSznnKcRdhZ-{+`0GVMioH$pQkr zRqhFK{B*V^84#7qQ7H>>Y~j_yQx%m+kH~x@Iz~mNs{-O;#BXK$x(E2F__6Jj@h=@%f7uzo$@q8%2DrQVd4>k~HTPn=uK)YU!^Bs5 zG=tc`D)MP5@!^rOw78hiaB&=q6h9^2IW4mAqu^~S0UdJJ zFP8c95G;-kPHIt>yKjD3zbpBqJ+pZokM=3n1*s2Q|GUZ)HUsw;-4G(%Op*+>y%BC(Q*-Jye6k@ zKj6=6XdT^_ut~ByY>mm!6Z1Ar^v~E}wZ*t#wJS;}z#PSPAU(h(P#oRTR^Oz!fZ zr&W-2u-IPu^YQbN{q8#bug6cTe>vaHDSw?$UxLyCb*MSW&+ETP{`|Ci@? zL|l5BIK%(6Pky&(O_^rrkP^KAW2HG9^GG*cWt_JyO{BvAW`0+bFttZqOk8?+g60aW zy@si^CE}8-E$~TBQu#-vbXLc4T~AH|>`6aon@44;Jd+~hQlMC(xYmQ)zvMl_)5HH- zLruwFs)%K{#iT~@d-B=^u#GOl^$4vHWr2P$kkt%7d8Ekyuu78O(K;sCe>f)Y24u+* z9fkdn1toP(i&D!lPr@Vd6Dq=cxyiVRVJulLQkrEDfAU={Mbu_X)-SF+`@urE?G@ zRF-*o`qz=U1^77E5taVsc?qhbb3K4`eW)yvs=lnUN-C1cTo-bEM87sb{QjdDynl0k zrmXtU`l9Zxd|~RKq_h+cwdgqdgsXmTS{(82Smo5@#JIF5%|V@)b9eiBn!DRi72Tqv z;}WzdqRKrs9EXQ1$}7_q1$0h{O67oHDo#U}bdO3))11R9-)NOD#o7}(QdjI7omcqt zdDk>KK`o2SI}tT`|0r=GR5fM`RGfz#dLl2fBIlPH*M&Q-m?%|iZr{|Y;TcJ?6kS_zr zoQaK)I4Avy5lDQuF@-n)iT8_4CN4n#bX-zZGyKcrFsf^MeCNNpK6nNPdir>HdW7Bw{%y?K8<}t-Q3+h10=H~ z+Va)nujj;O@_ZTt+7g6)PZJIJ`5bx5^fH!VYVC4DJv;;4{k{AGy?ogr;uH~|@q{t` z=lg04@`+LDvB_##LNZ1~n4rHKT&e%_c_`N3gtCOcxi=8MBOvOX`el25UQfz8?pLyZ zf1IzO;{RuU@!Y={e(Ry1`>S7W`u%#fbID{Qq{N@**VX$|4E}%4|NG-h^BHdEwDjb} zP{*B zY7G}nsjN={?R9e-QFQfLqVQjjh~hfeyc_`~q$`7tqSKFW=c z3e_6mzgfs1mMx0^&GNN&`uEHK^ZaSmbjLtUa=I!#GbKt@R$W<@5uTJDrPk$T?%rOW zK7pbBZayBqEo4nR1649V-vGu5J=2a)7f*hhCg|8-ORoSf|K?W0Pz^^&je{B{^&B`S=E^{5=DLTDUdx7W?Gy=ZokZ9UYbW`<~No;NQ>B=kQ5s z+(M*?b2Pxel|TLE6DZRjaH{CIq`0(LVU;zXFX!cd+L!JA%i*V4HA$EMa`<)rKW|^U zb13(@Y!^4is;I6hY^k_FX%L71SMmQ7dEeGYe#+&oVs^M3;ONgZ`|>`lgolyJ6-3^?EB{8 zmmYU&_nYSUV{r9R?jHNDKRO!NeL~fRdrH@T?mf}8(dWHB$|`fBE98_}+okPXuf*Y} z%cg#OuO1YeRp{LOcE{RBZ5Wr3($w$Uv(1+~ST}CHXyl9mV=gU|jo5b9u}*ds_YY0p7-7D&$PSyYtr|2xa3)hV^~$dAU5|&nEpcsewIN0ao!3}dv?<@` zX=qr>-b;#RH#2j%*KOAL!_!~PzFD`$O8a-K4?WphuYbUl@WPc8y|!drD0eHaU}R9q zd_7zGEqdE4Aj+-S-uZ>=OzKd+?$P*VC0=>XSiUUybMx`~cT_>2omRY0>@s9*mt*hB zdh7Xqy?Af`#iRD+`gqjH9z8GOx>v}WvN1MWJhRLnx4*UP`(C}yj(x3OdXJnpxpDk~ zPiOTXgpRhJIDOpCC*2Y!UT))m&Y}N~;Ik#uy(-4t9OZH7aOaLg_q^?zIciFLgW&Sl zI&I#u!S~k7!YhUxj$W?nxxUVc$Rf>d-0SCDY;st&mJy!41J>NkP;VWuGXA^m?7p8S zR8pn{$2J{Z^qc2|!3o#>H-7BCtn}Hm)Z2Q^@3bCWBHDgg&|0GkPaO64WDlC!egD}7 z%9>8E2UjS)cEL`)Egkirwd+@CSS8z&i^i?beDm_Pk zeP398MnILhvxD9kRJ}E9e&;9eO=~~x@4ECwSO>#dowm2MNNVtDSjkEC4X<5WY0#iW zle0hpxf=_D5w=X};^S7!suzvCLD_zRh zb}&)r@AYMPmx}I3uO2A9A@=LDO_8teUOaNuxsk=d$O5jVCJ#_q z9vIlOOtUi|>u+6YS@qMw#5oo1nmf+C`o?Lk*;D^P8K>^-u9Q${-I6JrQ!GC>ozSF| z`qAQjBficq*6?MkOO<<;dNHQj;DbJ1IlE8S8u5MZkt`R}a|=)QeYc>(^=_BTjoR37 z{>~MZ@6M>>XEv^D$7#nx10x#udcUW@$T1H$U8>UIL+yU=R_&d&qfh&|9^+3XFL5}3 za-CJ#Lv^Ptw^-D($it+_=~udMt$WJy&j8>K0B`~TT>!u_ z0H6l|?g0RM08j$}L;!#_0ALFMcnko(0{}+=;0*v81AwytU^D<22LKWQfIk4(0RYkg zz)b*f7y#@60HXjvFaX#L0B!+*Apk%H08Rja8vvjf0B8vS0sw#-0K@};z5qZ80Ga{- zPXKTo0CWccX#k)(04M2 z0LTIW+W~+p0LTFV4*|eX08kVF90CA606-%EFaQ9E^S=)Os008k0YC@8vtMo0EPpA z4FI4x0C)ueIs{>`0Qd?3UIKug0H7KG@B#p}0KgFda1H>x z0|4Csz(xSD0szzj09^q=70N^|TC<_3V1Arm`U^)P( z3joRifHnYNDgf{W022Yg4*;+Y09XTn2LK=$0L%gas{z1#0MHNsEC2v=0e}wx=m!AC z0DwgRKmh=r0)XQHU@QP=0RUbAfTaLn5&$?206GGI$^ak=0CWHVBLKi)0ALCLVgSGu z0AK+CE&zaw0ALOP_y_^ltfIa~D3;+@VKo;VAX0e}(!3=d0Kggmd;tKD0DwCHm(E0RU`YNfUW?b2msg!0Hy+fBmi(90GtE>4*|e50N?@ui~&Fo z0I(JSlm-A306;VV*aiTO0Dw~f;1U4H0sxl*fFA&O4*)IzfYkt?1prV0fNTIT1OSu( z04)K)V*pSC0Hgx|HvnJ<0L}n_Rsf(000;*F`2avc08kGAlm`HZ0l+-~um%9!003zK z-~<4u2>^}*fTaK+830@X0B-=mJ^)Z10Js8xy#Syr0Pq3;69Ir60IUN5cLBg|05AXm zYybf506=R1fcjUt<3cWB+?%|0A*g_ptwyvHua+|25eEt=RwX*#A%1{}k;1 zXzc$4?7u(ue;M{a75je&`yY+{UyJ>B#QqP${-4GEJ7NDzWB>KA|Ie`h!?6F0u>Wtc z|329NDD1x>_Wv~Ye;@Y0I`)4q_TK>eKOg&Viv4%R{&&FsZ^!;O!2VCd{$IoXx4{07 z#r}7~{wuKmVc7qo*#8UI|Do9b80`OQ?7tEA{{i+t6Z=00``-im|52R(*neZ}e^u;% zaqNEr_Wv99KR@=rKK9=Q`)`8%kH!8^!~U1S{^!H~kH`M6$Nt-3|NCJ7!?FJ%*neB> z|84C5F6@6j?7tQE-yHk@8vE~n{V$09Z;kz5h5dhy{hx>Z|A75(hyC}!{

c56Au= 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

c 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%0D% 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

$b>Xfo0FjKtbR%c?>dTg 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 literal 0 HcmV?d00001 diff --git a/grpc_c.64.ruby b/grpc_c.64.ruby new file mode 100644 index 0000000000000000000000000000000000000000..9a3875dccc53a384a8fd8b854caaaaec6f8dd955 GIT binary patch literal 2190421 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≻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 z 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

Hr;`ns*kRr4`8H#II-Ju;`q)%k( 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 z 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

}9p6NrxMYCBu8 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�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Μ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¸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

?A!mDg`rUf)5?cI7Q!QTbpR_UG24~5*nD|z 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

Z!?N`w^tI{0n%1|HO*8bFrVq#8 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%0Aj}Fw;zh12YS6|jFD!T-?oG*XRJ(Xs%=^3+wO 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

  • kF+y3X*?n4xogHfHJq-;IJU^Kx|Q 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 b) return 1; diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h index 65463bb33b6..f65346701fd 100644 --- a/include/grpc/impl/codegen/grpc_types.h +++ b/include/grpc/impl/codegen/grpc_types.h @@ -85,7 +85,7 @@ typedef enum { typedef struct grpc_arg_pointer_vtable { void *(*copy)(void *p); - void (*destroy)(grpc_exec_ctx *exec_ctx, void *p); + void (*destroy)(void *p); int (*cmp)(void *p, void *q); } grpc_arg_pointer_vtable; diff --git a/include/grpc/impl/codegen/slice.h b/include/grpc/impl/codegen/slice.h index 128fa8e1216..9bb6fa4b8fc 100644 --- a/include/grpc/impl/codegen/slice.h +++ b/include/grpc/impl/codegen/slice.h @@ -43,7 +43,7 @@ typedef struct grpc_slice grpc_slice; typedef struct grpc_slice_refcount_vtable { void (*ref)(void *); - void (*unref)(grpc_exec_ctx *exec_ctx, void *); + void (*unref)(void *); int (*eq)(grpc_slice a, grpc_slice b); uint32_t (*hash)(grpc_slice slice); } grpc_slice_refcount_vtable; diff --git a/include/grpc/slice_buffer.h b/include/grpc/slice_buffer.h index de4b86f777d..772f6c89558 100644 --- a/include/grpc/slice_buffer.h +++ b/include/grpc/slice_buffer.h @@ -67,8 +67,7 @@ GPRAPI void grpc_slice_buffer_move_first_no_ref(grpc_slice_buffer *src, size_t n, grpc_slice_buffer *dst); /** move the first n bytes of src into dst (copying them) */ -GPRAPI void grpc_slice_buffer_move_first_into_buffer(grpc_exec_ctx *exec_ctx, - grpc_slice_buffer *src, +GPRAPI void grpc_slice_buffer_move_first_into_buffer(grpc_slice_buffer *src, size_t n, void *dst); /** take the first slice in the slice buffer */ GPRAPI grpc_slice grpc_slice_buffer_take_first(grpc_slice_buffer *src); diff --git a/memory_usage.csv b/memory_usage.csv new file mode 100644 index 00000000000..4f2c2fb879f --- /dev/null +++ b/memory_usage.csv @@ -0,0 +1 @@ +8771.168889,165387,4457938,8698.928889,210284,, diff --git a/remove_exec_ctx.py b/remove_exec_ctx.py new file mode 100644 index 00000000000..fe530e424ee --- /dev/null +++ b/remove_exec_ctx.py @@ -0,0 +1,49 @@ +import os +import sys +import re + +def repl_fn(m): + ret = '' + ret = ret + m.groups()[0] + '(' + for i in range(1, len(m.groups())): + if(m.groups()[i] != None): + ret = ret + m.groups()[i] + else: + break + ret = ret + ')' + print '\n' + m.group() + '\nwith\n' + ret + '\n' + return ret + +def work_on(fname): + with open(fname) as f: + p = re.compile(r'((?:\b[^\s\(\),]+)|(?:\(\*[^\s\(\),]+\)))\s*' + # function name or function pointer + r'\(\s*' + # open brackets + r'(?:(?:exec_ctx)|(?:grpc_exec_ctx\s*\*\s*exec_ctx)|(?:&\s*exec_ctx))' + # first exec_ctx paramenter + r'\s*,?' + # comma after exec_ctx + r'(\s*[^\),]+)?' + # all but first argument + r'(\s*,\s*[^\),]+)?' + # all but first argument + r'(\s*,\s*[^\),]+)?' + # all but first argument + r'(\s*,\s*[^\),]+)?' + # all but first argument + r'(\s*,\s*[^\),]+)?' + # all but first argument + r'(\s*,\s*[^\),]+)?' + # all but first argument + r'(\s*,\s*[^\),]+)?' + # all but first argument + r'(\s*,\s*[^\),]+)?' + # all but first argument + r'(\s*,\s*[^\),]+)?' + # all but first argument + r'(\s*,\s*[^\),]+)?' + # all but first argument + r'(\s*,\s*[^\),]+)?' + # all but first argument + r'\s*\)') # close brackets + res = p.sub(repl_fn, f.read()) + + f = open(fname, 'w') + f.write(res) + f.close() + #print res + +def main(): + file_list = [] + for line in sys.stdin: + work_on(line.strip()) + + +if __name__ == '__main__': + main() diff --git a/scenario_result.json b/scenario_result.json new file mode 100644 index 00000000000..00a7c1b7470 --- /dev/null +++ b/scenario_result.json @@ -0,0 +1 @@ +{"scenario":{"name":"cpp_protobuf_async_unary_1channel_100rpcs_1MB","clientConfig":{"clientType":"ASYNC_CLIENT","outstandingRpcsPerChannel":100,"clientChannels":1,"loadParams":{"closedLoop":{}},"payloadConfig":{"simpleParams":{"reqSize":1048576,"respSize":1048576}},"histogramParams":{"resolution":0.01,"maxPossible":60000000000},"channelArgs":[{"name":"grpc.optimization_target","strValue":"throughput"}]},"numClients":1,"serverConfig":{"serverType":"ASYNC_SERVER","channelArgs":[{"name":"grpc.optimization_target","strValue":"throughput"}]},"numServers":1,"warmupSeconds":5,"benchmarkSeconds":30},"latencies":{"bucket":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"minSeen":60000000000},"serverStats":[{"timeElapsed":30.000293970108032,"timeUser":6.916,"timeSystem":10.652,"totalCpuTime":"35087","idleCpuTime":"31013","cqPollCount":"3","coreStats":{"metrics":[{"name":"client_calls_created","count":"0"},{"name":"server_calls_created","count":"1"},{"name":"cqs_created","count":"19"},{"name":"client_channels_created","count":"0"},{"name":"client_subchannels_created","count":"0"},{"name":"server_channels_created","count":"2"},{"name":"syscall_poll","count":"22"},{"name":"syscall_wait","count":"0"},{"name":"pollset_kick","count":"7"},{"name":"pollset_kicked_without_poller","count":"3"},{"name":"pollset_kicked_again","count":"0"},{"name":"pollset_kick_wakeup_fd","count":"0"},{"name":"pollset_kick_wakeup_cv","count":"16"},{"name":"pollset_kick_own_thread","count":"3"},{"name":"histogram_slow_lookups","count":"1"},{"name":"syscall_write","count":"8"},{"name":"syscall_read","count":"19"},{"name":"tcp_backup_pollers_created","count":"0"},{"name":"tcp_backup_poller_polls","count":"0"},{"name":"http2_op_batches","count":"7"},{"name":"http2_op_cancel","count":"0"},{"name":"http2_op_send_initial_metadata","count":"1"},{"name":"http2_op_send_message","count":"2"},{"name":"http2_op_send_trailing_metadata","count":"0"},{"name":"http2_op_recv_initial_metadata","count":"1"},{"name":"http2_op_recv_message","count":"3"},{"name":"http2_op_recv_trailing_metadata","count":"1"},{"name":"http2_settings_writes","count":"2"},{"name":"http2_pings_sent","count":"3"},{"name":"http2_writes_begun","count":"7"},{"name":"http2_writes_offloaded","count":"2"},{"name":"http2_writes_continued","count":"0"},{"name":"http2_partial_writes","count":"0"},{"name":"http2_initiate_write_due_to_initial_write","count":"0"},{"name":"http2_initiate_write_due_to_start_new_stream","count":"0"},{"name":"http2_initiate_write_due_to_send_message","count":"1"},{"name":"http2_initiate_write_due_to_send_initial_metadata","count":"1"},{"name":"http2_initiate_write_due_to_send_trailing_metadata","count":"0"},{"name":"http2_initiate_write_due_to_retry_send_ping","count":"0"},{"name":"http2_initiate_write_due_to_continue_pings","count":"0"},{"name":"http2_initiate_write_due_to_goaway_sent","count":"0"},{"name":"http2_initiate_write_due_to_rst_stream","count":"0"},{"name":"http2_initiate_write_due_to_close_from_api","count":"0"},{"name":"http2_initiate_write_due_to_stream_flow_control","count":"0"},{"name":"http2_initiate_write_due_to_transport_flow_control","count":"2"},{"name":"http2_initiate_write_due_to_send_settings","count":"0"},{"name":"http2_initiate_write_due_to_bdp_estimator_ping","count":"0"},{"name":"http2_initiate_write_due_to_flow_control_unstalled_by_setting","count":"0"},{"name":"http2_initiate_write_due_to_flow_control_unstalled_by_update","count":"0"},{"name":"http2_initiate_write_due_to_application_ping","count":"0"},{"name":"http2_initiate_write_due_to_keepalive_ping","count":"0"},{"name":"http2_initiate_write_due_to_transport_flow_control_unstalled","count":"0"},{"name":"http2_initiate_write_due_to_ping_response","count":"3"},{"name":"http2_initiate_write_due_to_force_rst_stream","count":"0"},{"name":"http2_spurious_writes_begun","count":"0"},{"name":"hpack_recv_indexed","count":"0"},{"name":"hpack_recv_lithdr_incidx","count":"0"},{"name":"hpack_recv_lithdr_incidx_v","count":"9"},{"name":"hpack_recv_lithdr_notidx","count":"0"},{"name":"hpack_recv_lithdr_notidx_v","count":"0"},{"name":"hpack_recv_lithdr_nvridx","count":"0"},{"name":"hpack_recv_lithdr_nvridx_v","count":"0"},{"name":"hpack_recv_uncompressed","count":"18"},{"name":"hpack_recv_huffman","count":"0"},{"name":"hpack_recv_binary","count":"0"},{"name":"hpack_recv_binary_base64","count":"0"},{"name":"hpack_send_indexed","count":"0"},{"name":"hpack_send_lithdr_incidx","count":"0"},{"name":"hpack_send_lithdr_incidx_v","count":"4"},{"name":"hpack_send_lithdr_notidx","count":"0"},{"name":"hpack_send_lithdr_notidx_v","count":"0"},{"name":"hpack_send_lithdr_nvridx","count":"0"},{"name":"hpack_send_lithdr_nvridx_v","count":"0"},{"name":"hpack_send_uncompressed","count":"8"},{"name":"hpack_send_huffman","count":"0"},{"name":"hpack_send_binary","count":"0"},{"name":"hpack_send_binary_base64","count":"0"},{"name":"combiner_locks_initiated","count":"34"},{"name":"combiner_locks_scheduled_items","count":"58"},{"name":"combiner_locks_scheduled_final_items","count":"17"},{"name":"combiner_locks_offloaded","count":"0"},{"name":"executor_scheduled_short_items","count":"5"},{"name":"executor_scheduled_long_items","count":"0"},{"name":"executor_scheduled_to_self","count":"0"},{"name":"executor_wakeup_initiated","count":"5"},{"name":"executor_queue_drained","count":"5"},{"name":"executor_push_retries","count":"0"},{"name":"server_requested_calls","count":"240018"},{"name":"server_slowpath_requests_queued","count":"0"},{"name":"cq_ev_queue_trylock_failures","count":"0"},{"name":"cq_ev_queue_trylock_successes","count":"10497179"},{"name":"cq_ev_queue_transient_pop_failures","count":"0"},{"name":"call_initial_size","histogram":{"buckets":[{},{"start":1},{"start":2},{"start":3},{"start":4},{"start":5},{"start":7},{"start":9},{"start":11},{"start":14},{"start":17},{"start":21},{"start":26},{"start":32},{"start":39},{"start":47},{"start":57},{"start":68},{"start":82},{"start":98},{"start":117},{"start":140},{"start":167},{"start":199},{"start":238},{"start":284},{"start":339},{"start":404},{"start":482},{"start":575},{"start":685},{"start":816},{"start":972},{"start":1158},{"start":1380},{"start":1644},{"start":1959},{"start":2334},{"start":2780},{"start":3312},{"start":3945},{"start":4699},{"start":5597,"count":"1"},{"start":6667},{"start":7941},{"start":9459},{"start":11267},{"start":13420},{"start":15984},{"start":19038},{"start":22676},{"start":27009},{"start":32169},{"start":38315},{"start":45635},{"start":54353},{"start":64737},{"start":77104},{"start":91834},{"start":109378},{"start":130273},{"start":155159},{"start":184799},{"start":220100}]}},{"name":"poll_events_returned","histogram":{"buckets":[{},{"start":1,"count":"21"},{"start":2},{"start":3},{"start":4},{"start":5},{"start":6},{"start":7},{"start":8},{"start":9},{"start":10},{"start":11},{"start":12},{"start":13},{"start":14},{"start":15},{"start":16},{"start":17},{"start":18},{"start":19},{"start":20},{"start":21},{"start":22},{"start":23},{"start":24},{"start":25},{"start":26},{"start":27},{"start":28},{"start":30},{"start":32},{"start":34},{"start":36},{"start":38},{"start":40},{"start":42},{"start":44},{"start":46},{"start":48},{"start":50},{"start":52},{"start":54},{"start":56},{"start":58},{"start":60},{"start":63},{"start":66},{"start":69},{"start":72},{"start":75},{"start":78},{"start":81},{"start":84},{"start":87},{"start":90},{"start":94},{"start":98},{"start":102},{"start":106},{"start":110},{"start":114},{"start":118},{"start":122},{"start":126},{"start":131},{"start":136},{"start":141},{"start":146},{"start":151},{"start":156},{"start":162},{"start":168},{"start":174},{"start":180},{"start":186},{"start":192},{"start":199},{"start":206},{"start":213},{"start":220},{"start":228},{"start":236},{"start":244},{"start":252},{"start":260},{"start":269},{"start":278},{"start":287},{"start":297},{"start":307},{"start":317},{"start":327},{"start":338},{"start":349},{"start":360},{"start":372},{"start":384},{"start":396},{"start":409},{"start":422},{"start":436},{"start":450},{"start":464},{"start":479},{"start":494},{"start":510},{"start":526},{"start":543},{"start":560},{"start":578},{"start":596},{"start":615},{"start":634},{"start":654},{"start":674},{"start":695},{"start":717},{"start":739},{"start":762},{"start":785},{"start":809},{"start":834},{"start":859},{"start":885},{"start":912},{"start":939},{"start":967},{"start":996}]}},{"name":"tcp_write_size","histogram":{"buckets":[{},{"start":1},{"start":2},{"start":3},{"start":4},{"start":6},{"start":8},{"start":11},{"start":15},{"start":20},{"start":26,"count":"1"},{"start":34,"count":"1"},{"start":44},{"start":57,"count":"3"},{"start":73,"count":"1"},{"start":94},{"start":121},{"start":155,"count":"1"},{"start":199},{"start":255},{"start":327},{"start":419},{"start":537},{"start":688},{"start":881},{"start":1128},{"start":1444},{"start":1848},{"start":2365},{"start":3026},{"start":3872},{"start":4954},{"start":6338},{"start":8108},{"start":10373,"count":"1"},{"start":13270},{"start":16976},{"start":21717},{"start":27782},{"start":35541},{"start":45467},{"start":58165},{"start":74409},{"start":95189},{"start":121772},{"start":155778},{"start":199281},{"start":254933},{"start":326126},{"start":417200},{"start":533707},{"start":682750},{"start":873414},{"start":1117323},{"start":1429345},{"start":1828502},{"start":2339127},{"start":2992348},{"start":3827987},{"start":4896985},{"start":6264509},{"start":8013925},{"start":10251880},{"start":13114801}]}},{"name":"tcp_write_iov_size","histogram":{"buckets":[{},{"start":1,"count":"1"},{"start":2,"count":"3"},{"start":3,"count":"3"},{"start":4},{"start":5},{"start":6},{"start":7},{"start":8},{"start":9},{"start":10},{"start":11},{"start":12},{"start":14},{"start":16},{"start":18,"count":"1"},{"start":20},{"start":22},{"start":24},{"start":27},{"start":30},{"start":33},{"start":36},{"start":39},{"start":43},{"start":47},{"start":51},{"start":56},{"start":61},{"start":66},{"start":72},{"start":78},{"start":85},{"start":92},{"start":100},{"start":109},{"start":118},{"start":128},{"start":139},{"start":151},{"start":164},{"start":178},{"start":193},{"start":209},{"start":226},{"start":244},{"start":264},{"start":285},{"start":308},{"start":333},{"start":359},{"start":387},{"start":418},{"start":451},{"start":486},{"start":524},{"start":565},{"start":609},{"start":656},{"start":707},{"start":762},{"start":821},{"start":884},{"start":952}]}},{"name":"tcp_read_size","histogram":{"buckets":[{},{"start":1},{"start":2,"count":"1"},{"start":3},{"start":4,"count":"1"},{"start":6},{"start":8},{"start":11},{"start":15},{"start":20},{"start":26,"count":"1"},{"start":34,"count":"1"},{"start":44,"count":"2"},{"start":57},{"start":73,"count":"1"},{"start":94,"count":"1"},{"start":121},{"start":155},{"start":199},{"start":255},{"start":327},{"start":419,"count":"1"},{"start":537},{"start":688},{"start":881},{"start":1128},{"start":1444},{"start":1848},{"start":2365},{"start":3026},{"start":3872},{"start":4954},{"start":6338},{"start":8108},{"start":10373},{"start":13270},{"start":16976},{"start":21717},{"start":27782},{"start":35541},{"start":45467},{"start":58165},{"start":74409},{"start":95189},{"start":121772},{"start":155778},{"start":199281},{"start":254933},{"start":326126},{"start":417200},{"start":533707},{"start":682750},{"start":873414},{"start":1117323},{"start":1429345},{"start":1828502},{"start":2339127},{"start":2992348},{"start":3827987},{"start":4896985},{"start":6264509},{"start":8013925},{"start":10251880},{"start":13114801}]}},{"name":"tcp_read_offer","histogram":{"buckets":[{},{"start":1},{"start":2},{"start":3},{"start":4},{"start":6},{"start":8},{"start":11},{"start":15},{"start":20},{"start":26},{"start":34},{"start":44},{"start":57},{"start":73},{"start":94},{"start":121},{"start":155},{"start":199},{"start":255},{"start":327},{"start":419},{"start":537},{"start":688},{"start":881},{"start":1128},{"start":1444},{"start":1848},{"start":2365},{"start":3026},{"start":3872},{"start":4954},{"start":6338},{"start":8108,"count":"3"},{"start":10373},{"start":13270,"count":"16"},{"start":16976},{"start":21717},{"start":27782},{"start":35541},{"start":45467},{"start":58165},{"start":74409},{"start":95189},{"start":121772},{"start":155778},{"start":199281},{"start":254933},{"start":326126},{"start":417200},{"start":533707},{"start":682750},{"start":873414},{"start":1117323},{"start":1429345},{"start":1828502},{"start":2339127},{"start":2992348},{"start":3827987},{"start":4896985},{"start":6264509},{"start":8013925},{"start":10251880},{"start":13114801}]}},{"name":"tcp_read_offer_iov_size","histogram":{"buckets":[{},{"start":1,"count":"3"},{"start":2,"count":"16"},{"start":3},{"start":4},{"start":5},{"start":6},{"start":7},{"start":8},{"start":9},{"start":10},{"start":11},{"start":12},{"start":14},{"start":16},{"start":18},{"start":20},{"start":22},{"start":24},{"start":27},{"start":30},{"start":33},{"start":36},{"start":39},{"start":43},{"start":47},{"start":51},{"start":56},{"start":61},{"start":66},{"start":72},{"start":78},{"start":85},{"start":92},{"start":100},{"start":109},{"start":118},{"start":128},{"start":139},{"start":151},{"start":164},{"start":178},{"start":193},{"start":209},{"start":226},{"start":244},{"start":264},{"start":285},{"start":308},{"start":333},{"start":359},{"start":387},{"start":418},{"start":451},{"start":486},{"start":524},{"start":565},{"start":609},{"start":656},{"start":707},{"start":762},{"start":821},{"start":884},{"start":952}]}},{"name":"http2_send_message_size","histogram":{"buckets":[{},{"start":1},{"start":2},{"start":3},{"start":4,"count":"1"},{"start":6},{"start":8},{"start":11},{"start":15},{"start":20},{"start":26},{"start":34},{"start":44},{"start":57},{"start":73},{"start":94},{"start":121},{"start":155},{"start":199},{"start":255},{"start":327},{"start":419},{"start":537},{"start":688},{"start":881},{"start":1128},{"start":1444},{"start":1848},{"start":2365},{"start":3026},{"start":3872},{"start":4954},{"start":6338},{"start":8108},{"start":10373,"count":"1"},{"start":13270},{"start":16976},{"start":21717},{"start":27782},{"start":35541},{"start":45467},{"start":58165},{"start":74409},{"start":95189},{"start":121772},{"start":155778},{"start":199281},{"start":254933},{"start":326126},{"start":417200},{"start":533707},{"start":682750},{"start":873414},{"start":1117323},{"start":1429345},{"start":1828502},{"start":2339127},{"start":2992348},{"start":3827987},{"start":4896985},{"start":6264509},{"start":8013925},{"start":10251880},{"start":13114801}]}},{"name":"http2_send_initial_metadata_per_write","histogram":{"buckets":[{},{"start":1},{"start":2},{"start":3},{"start":4},{"start":5},{"start":6},{"start":7},{"start":8},{"start":9},{"start":10},{"start":11},{"start":12},{"start":14},{"start":16},{"start":18},{"start":20},{"start":22},{"start":24},{"start":27},{"start":30},{"start":33},{"start":36},{"start":39},{"start":43},{"start":47},{"start":51},{"start":56},{"start":61},{"start":66},{"start":72},{"start":78},{"start":85},{"start":92},{"start":100},{"start":109},{"start":118},{"start":128},{"start":139},{"start":151},{"start":164},{"start":178},{"start":193},{"start":209},{"start":226},{"start":244},{"start":264},{"start":285},{"start":308},{"start":333},{"start":359},{"start":387},{"start":418},{"start":451},{"start":486},{"start":524},{"start":565},{"start":609},{"start":656},{"start":707},{"start":762},{"start":821},{"start":884},{"start":952}]}},{"name":"http2_send_message_per_write","histogram":{"buckets":[{},{"start":1},{"start":2},{"start":3},{"start":4},{"start":5},{"start":6},{"start":7},{"start":8},{"start":9},{"start":10},{"start":11},{"start":12},{"start":14},{"start":16},{"start":18},{"start":20},{"start":22},{"start":24},{"start":27},{"start":30},{"start":33},{"start":36},{"start":39},{"start":43},{"start":47},{"start":51},{"start":56},{"start":61},{"start":66},{"start":72},{"start":78},{"start":85},{"start":92},{"start":100},{"start":109},{"start":118},{"start":128},{"start":139},{"start":151},{"start":164},{"start":178},{"start":193},{"start":209},{"start":226},{"start":244},{"start":264},{"start":285},{"start":308},{"start":333},{"start":359},{"start":387},{"start":418},{"start":451},{"start":486},{"start":524},{"start":565},{"start":609},{"start":656},{"start":707},{"start":762},{"start":821},{"start":884},{"start":952}]}},{"name":"http2_send_trailing_metadata_per_write","histogram":{"buckets":[{},{"start":1},{"start":2},{"start":3},{"start":4},{"start":5},{"start":6},{"start":7},{"start":8},{"start":9},{"start":10},{"start":11},{"start":12},{"start":14},{"start":16},{"start":18},{"start":20},{"start":22},{"start":24},{"start":27},{"start":30},{"start":33},{"start":36},{"start":39},{"start":43},{"start":47},{"start":51},{"start":56},{"start":61},{"start":66},{"start":72},{"start":78},{"start":85},{"start":92},{"start":100},{"start":109},{"start":118},{"start":128},{"start":139},{"start":151},{"start":164},{"start":178},{"start":193},{"start":209},{"start":226},{"start":244},{"start":264},{"start":285},{"start":308},{"start":333},{"start":359},{"start":387},{"start":418},{"start":451},{"start":486},{"start":524},{"start":565},{"start":609},{"start":656},{"start":707},{"start":762},{"start":821},{"start":884},{"start":952}]}},{"name":"http2_send_flowctl_per_write","histogram":{"buckets":[{},{"start":1},{"start":2},{"start":3},{"start":4},{"start":5},{"start":6},{"start":7},{"start":8},{"start":9},{"start":10},{"start":11},{"start":12},{"start":14},{"start":16},{"start":18},{"start":20},{"start":22},{"start":24},{"start":27},{"start":30},{"start":33},{"start":36},{"start":39},{"start":43},{"start":47},{"start":51},{"start":56},{"start":61},{"start":66},{"start":72},{"start":78},{"start":85},{"start":92},{"start":100},{"start":109},{"start":118},{"start":128},{"start":139},{"start":151},{"start":164},{"start":178},{"start":193},{"start":209},{"start":226},{"start":244},{"start":264},{"start":285},{"start":308},{"start":333},{"start":359},{"start":387},{"start":418},{"start":451},{"start":486},{"start":524},{"start":565},{"start":609},{"start":656},{"start":707},{"start":762},{"start":821},{"start":884},{"start":952}]}},{"name":"server_cqs_checked","histogram":{"buckets":[{"count":"1"},{"start":1},{"start":2},{"start":4},{"start":7},{"start":13},{"start":23},{"start":39}]}}]}}],"serverCores":[12],"summary":{"qps":"NaN","qpsPerServerCore":"NaN","serverSystemTime":35.506318740121465,"serverUserTime":23.053107435850553,"clientSystemTime":"NaN","clientUserTime":"NaN","serverCpuUsage":11.611138028329577,"clientPollsPerRequest":"NaN","serverPollsPerRequest":"Infinity","clientQueriesPerCpuSec":"NaN"},"clientSuccess":[false],"serverSuccess":[true]} \ No newline at end of file diff --git a/src/core/ext/census/grpc_filter.cc b/src/core/ext/census/grpc_filter.cc index b37ab903893..85f774b7d41 100644 --- a/src/core/ext/census/grpc_filter.cc +++ b/src/core/ext/census/grpc_filter.cc @@ -68,15 +68,13 @@ static void client_mutate_op(grpc_call_element *elem, } } -static void client_start_transport_op(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static void client_start_transport_op(grpc_call_element *elem, grpc_transport_stream_op_batch *op) { client_mutate_op(elem, op); - grpc_call_next_op(exec_ctx, elem, op); + grpc_call_next_op(elem, op); } -static void server_on_done_recv(grpc_exec_ctx *exec_ctx, void *ptr, - grpc_error *error) { +static void server_on_done_recv(void *ptr, grpc_error *error) { GPR_TIMER_BEGIN("census-server:server_on_done_recv", 0); grpc_call_element *elem = (grpc_call_element *)ptr; call_data *calld = (call_data *)elem->call_data; @@ -84,7 +82,7 @@ static void server_on_done_recv(grpc_exec_ctx *exec_ctx, void *ptr, if (error == GRPC_ERROR_NONE) { extract_and_annotate_method_tag(calld->recv_initial_metadata, calld, chand); } - calld->on_done_recv->cb(exec_ctx, calld->on_done_recv->cb_arg, error); + calld->on_done_recv->cb(calld->on_done_recv->cb_arg, error); GPR_TIMER_END("census-server:server_on_done_recv", 0); } @@ -102,8 +100,7 @@ static void server_mutate_op(grpc_call_element *elem, } } -static void server_start_transport_op(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static void server_start_transport_op(grpc_call_element *elem, grpc_transport_stream_op_batch *op) { /* TODO(ctiller): this code fails. I don't know why. I expect it's incomplete, and someone should look at it soon. @@ -111,11 +108,10 @@ static void server_start_transport_op(grpc_exec_ctx *exec_ctx, call_data *calld = elem->call_data; GPR_ASSERT((calld->op_id.upper != 0) || (calld->op_id.lower != 0)); */ server_mutate_op(elem, op); - grpc_call_next_op(exec_ctx, elem, op); + grpc_call_next_op(elem, op); } -static grpc_error *client_init_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *client_init_call_elem(grpc_call_element *elem, const grpc_call_element_args *args) { call_data *d = (call_data *)elem->call_data; GPR_ASSERT(d != NULL); @@ -124,8 +120,7 @@ static grpc_error *client_init_call_elem(grpc_exec_ctx *exec_ctx, return GRPC_ERROR_NONE; } -static void client_destroy_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static void client_destroy_call_elem(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *ignored) { call_data *d = (call_data *)elem->call_data; @@ -133,8 +128,7 @@ static void client_destroy_call_elem(grpc_exec_ctx *exec_ctx, /* TODO(hongyu): record rpc client stats and census_rpc_end_op here */ } -static grpc_error *server_init_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *server_init_call_elem(grpc_call_element *elem, const grpc_call_element_args *args) { call_data *d = (call_data *)elem->call_data; GPR_ASSERT(d != NULL); @@ -146,8 +140,7 @@ static grpc_error *server_init_call_elem(grpc_exec_ctx *exec_ctx, return GRPC_ERROR_NONE; } -static void server_destroy_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static void server_destroy_call_elem(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *ignored) { call_data *d = (call_data *)elem->call_data; @@ -155,16 +148,14 @@ static void server_destroy_call_elem(grpc_exec_ctx *exec_ctx, /* TODO(hongyu): record rpc server stats and census_tracing_end_op here */ } -static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static grpc_error *init_channel_elem(grpc_channel_element *elem, grpc_channel_element_args *args) { channel_data *chand = (channel_data *)elem->channel_data; GPR_ASSERT(chand != NULL); return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem) { +static void destroy_channel_elem(grpc_channel_element *elem) { channel_data *chand = (channel_data *)elem->channel_data; GPR_ASSERT(chand != NULL); } diff --git a/src/core/ext/census/grpc_plugin.cc b/src/core/ext/census/grpc_plugin.cc index 22b16c6c63d..48fa43780b5 100644 --- a/src/core/ext/census/grpc_plugin.cc +++ b/src/core/ext/census/grpc_plugin.cc @@ -38,8 +38,7 @@ static bool is_census_enabled(const grpc_channel_args *a) { return census_enabled() && !grpc_channel_args_want_minimal_stack(a); } -static bool maybe_add_census_filter(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder, +static bool maybe_add_census_filter(grpc_channel_stack_builder *builder, void *arg) { const grpc_channel_args *args = grpc_channel_stack_builder_get_channel_arguments(builder); diff --git a/src/core/ext/filters/client_channel/channel_connectivity.cc b/src/core/ext/filters/client_channel/channel_connectivity.cc index 31a8fc39ce6..13521127314 100644 --- a/src/core/ext/filters/client_channel/channel_connectivity.cc +++ b/src/core/ext/filters/client_channel/channel_connectivity.cc @@ -33,22 +33,22 @@ grpc_connectivity_state grpc_channel_check_connectivity_state( /* forward through to the underlying client channel */ grpc_channel_element *client_channel_elem = grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_connectivity_state state; GRPC_API_TRACE( "grpc_channel_check_connectivity_state(channel=%p, try_to_connect=%d)", 2, (channel, try_to_connect)); if (client_channel_elem->filter == &grpc_client_channel_filter) { - state = grpc_client_channel_check_connectivity_state( - &exec_ctx, client_channel_elem, try_to_connect); - grpc_exec_ctx_finish(&exec_ctx); + state = grpc_client_channel_check_connectivity_state(client_channel_elem, + try_to_connect); + grpc_exec_ctx_finish(); return state; } gpr_log(GPR_ERROR, "grpc_channel_check_connectivity_state called on something that is " "not a client channel, but '%s'", client_channel_elem->filter->name); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return GRPC_CHANNEL_SHUTDOWN; } @@ -73,12 +73,11 @@ typedef struct { void *tag; } state_watcher; -static void delete_state_watcher(grpc_exec_ctx *exec_ctx, state_watcher *w) { +static void delete_state_watcher(state_watcher *w) { grpc_channel_element *client_channel_elem = grpc_channel_stack_last_element( grpc_channel_get_channel_stack(w->channel)); if (client_channel_elem->filter == &grpc_client_channel_filter) { - GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, w->channel, - "watch_channel_connectivity"); + GRPC_CHANNEL_INTERNAL_UNREF(w->channel, "watch_channel_connectivity"); } else { abort(); } @@ -86,8 +85,7 @@ static void delete_state_watcher(grpc_exec_ctx *exec_ctx, state_watcher *w) { gpr_free(w); } -static void finished_completion(grpc_exec_ctx *exec_ctx, void *pw, - grpc_cq_completion *ignored) { +static void finished_completion(void *pw, grpc_cq_completion *ignored) { bool should_delete = false; state_watcher *w = (state_watcher *)pw; gpr_mu_lock(&w->mu); @@ -102,19 +100,19 @@ static void finished_completion(grpc_exec_ctx *exec_ctx, void *pw, gpr_mu_unlock(&w->mu); if (should_delete) { - delete_state_watcher(exec_ctx, w); + delete_state_watcher(w); } } -static void partly_done(grpc_exec_ctx *exec_ctx, state_watcher *w, - bool due_to_completion, grpc_error *error) { +static void partly_done(state_watcher *w, bool due_to_completion, + grpc_error *error) { if (due_to_completion) { - grpc_timer_cancel(exec_ctx, &w->alarm); + grpc_timer_cancel(&w->alarm); } else { grpc_channel_element *client_channel_elem = grpc_channel_stack_last_element( grpc_channel_get_channel_stack(w->channel)); grpc_client_channel_watch_connectivity_state( - exec_ctx, client_channel_elem, + client_channel_elem, grpc_polling_entity_create_from_pollset(grpc_cq_pollset(w->cq)), NULL, &w->on_complete, NULL); } @@ -149,7 +147,7 @@ static void partly_done(grpc_exec_ctx *exec_ctx, state_watcher *w, w->error = error; } w->phase = CALLING_BACK_AND_FINISHED; - grpc_cq_end_op(exec_ctx, w->cq, w->tag, w->error, finished_completion, w, + grpc_cq_end_op(w->cq, w->tag, w->error, finished_completion, w, &w->completion_storage); break; case CALLING_BACK_AND_FINISHED: @@ -161,14 +159,12 @@ static void partly_done(grpc_exec_ctx *exec_ctx, state_watcher *w, GRPC_ERROR_UNREF(error); } -static void watch_complete(grpc_exec_ctx *exec_ctx, void *pw, - grpc_error *error) { - partly_done(exec_ctx, (state_watcher *)pw, true, GRPC_ERROR_REF(error)); +static void watch_complete(void *pw, grpc_error *error) { + partly_done((state_watcher *)pw, true, GRPC_ERROR_REF(error)); } -static void timeout_complete(grpc_exec_ctx *exec_ctx, void *pw, - grpc_error *error) { - partly_done(exec_ctx, (state_watcher *)pw, false, GRPC_ERROR_REF(error)); +static void timeout_complete(void *pw, grpc_error *error) { + partly_done((state_watcher *)pw, false, GRPC_ERROR_REF(error)); } int grpc_channel_num_external_connectivity_watchers(grpc_channel *channel) { @@ -183,12 +179,10 @@ typedef struct watcher_timer_init_arg { gpr_timespec deadline; } watcher_timer_init_arg; -static void watcher_timer_init(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error_ignored) { +static void watcher_timer_init(void *arg, grpc_error *error_ignored) { watcher_timer_init_arg *wa = (watcher_timer_init_arg *)arg; - grpc_timer_init(exec_ctx, &wa->w->alarm, - grpc_timespec_to_millis_round_up(wa->deadline), + grpc_timer_init(&wa->w->alarm, grpc_timespec_to_millis_round_up(wa->deadline), &wa->w->on_timeout); gpr_free(wa); } @@ -204,7 +198,7 @@ void grpc_channel_watch_connectivity_state( gpr_timespec deadline, grpc_completion_queue *cq, void *tag) { grpc_channel_element *client_channel_elem = grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; state_watcher *w = (state_watcher *)gpr_malloc(sizeof(*w)); GRPC_API_TRACE( @@ -240,12 +234,12 @@ void grpc_channel_watch_connectivity_state( if (client_channel_elem->filter == &grpc_client_channel_filter) { GRPC_CHANNEL_INTERNAL_REF(channel, "watch_channel_connectivity"); grpc_client_channel_watch_connectivity_state( - &exec_ctx, client_channel_elem, + client_channel_elem, grpc_polling_entity_create_from_pollset(grpc_cq_pollset(cq)), &w->state, &w->on_complete, &w->watcher_timer_init); } else { abort(); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index 22c2bc88804..973cc5f703f 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.cc @@ -87,7 +87,7 @@ static void method_parameters_unref(method_parameters *method_params) { } } -static void method_parameters_free(grpc_exec_ctx *exec_ctx, void *value) { +static void method_parameters_free(void *value) { method_parameters_unref((method_parameters *)value); } @@ -223,12 +223,11 @@ typedef struct { grpc_lb_policy *lb_policy; } lb_policy_connectivity_watcher; -static void watch_lb_policy_locked(grpc_exec_ctx *exec_ctx, channel_data *chand, +static void watch_lb_policy_locked(channel_data *chand, grpc_lb_policy *lb_policy, grpc_connectivity_state current_state); -static void set_channel_connectivity_state_locked(grpc_exec_ctx *exec_ctx, - channel_data *chand, +static void set_channel_connectivity_state_locked(channel_data *chand, grpc_connectivity_state state, grpc_error *error, const char *reason) { @@ -240,12 +239,12 @@ static void set_channel_connectivity_state_locked(grpc_exec_ctx *exec_ctx, if (state == GRPC_CHANNEL_TRANSIENT_FAILURE) { /* cancel picks with wait_for_ready=false */ grpc_lb_policy_cancel_picks_locked( - exec_ctx, chand->lb_policy, + chand->lb_policy, /* mask= */ GRPC_INITIAL_METADATA_WAIT_FOR_READY, /* check= */ 0, GRPC_ERROR_REF(error)); } else if (state == GRPC_CHANNEL_SHUTDOWN) { /* cancel all picks */ - grpc_lb_policy_cancel_picks_locked(exec_ctx, chand->lb_policy, + grpc_lb_policy_cancel_picks_locked(chand->lb_policy, /* mask= */ 0, /* check= */ 0, GRPC_ERROR_REF(error)); } @@ -254,12 +253,10 @@ static void set_channel_connectivity_state_locked(grpc_exec_ctx *exec_ctx, gpr_log(GPR_DEBUG, "chand=%p: setting connectivity state to %s", chand, grpc_connectivity_state_name(state)); } - grpc_connectivity_state_set(exec_ctx, &chand->state_tracker, state, error, - reason); + grpc_connectivity_state_set(&chand->state_tracker, state, error, reason); } -static void on_lb_policy_state_changed_locked(grpc_exec_ctx *exec_ctx, - void *arg, grpc_error *error) { +static void on_lb_policy_state_changed_locked(void *arg, grpc_error *error) { lb_policy_connectivity_watcher *w = (lb_policy_connectivity_watcher *)arg; grpc_connectivity_state publish_state = w->state; /* check if the notification is for the latest policy */ @@ -270,21 +267,21 @@ static void on_lb_policy_state_changed_locked(grpc_exec_ctx *exec_ctx, } if (publish_state == GRPC_CHANNEL_SHUTDOWN && w->chand->resolver != NULL) { publish_state = GRPC_CHANNEL_TRANSIENT_FAILURE; - grpc_resolver_channel_saw_error_locked(exec_ctx, w->chand->resolver); - GRPC_LB_POLICY_UNREF(exec_ctx, w->chand->lb_policy, "channel"); + grpc_resolver_channel_saw_error_locked(w->chand->resolver); + GRPC_LB_POLICY_UNREF(w->chand->lb_policy, "channel"); w->chand->lb_policy = NULL; } - set_channel_connectivity_state_locked(exec_ctx, w->chand, publish_state, + set_channel_connectivity_state_locked(w->chand, publish_state, GRPC_ERROR_REF(error), "lb_changed"); if (w->state != GRPC_CHANNEL_SHUTDOWN) { - watch_lb_policy_locked(exec_ctx, w->chand, w->lb_policy, w->state); + watch_lb_policy_locked(w->chand, w->lb_policy, w->state); } } - GRPC_CHANNEL_STACK_UNREF(exec_ctx, w->chand->owning_stack, "watch_lb_policy"); + GRPC_CHANNEL_STACK_UNREF(w->chand->owning_stack, "watch_lb_policy"); gpr_free(w); } -static void watch_lb_policy_locked(grpc_exec_ctx *exec_ctx, channel_data *chand, +static void watch_lb_policy_locked(channel_data *chand, grpc_lb_policy *lb_policy, grpc_connectivity_state current_state) { lb_policy_connectivity_watcher *w = @@ -295,19 +292,18 @@ static void watch_lb_policy_locked(grpc_exec_ctx *exec_ctx, channel_data *chand, grpc_combiner_scheduler(chand->combiner)); w->state = current_state; w->lb_policy = lb_policy; - grpc_lb_policy_notify_on_state_change_locked(exec_ctx, lb_policy, &w->state, + grpc_lb_policy_notify_on_state_change_locked(lb_policy, &w->state, &w->on_changed); } -static void start_resolving_locked(grpc_exec_ctx *exec_ctx, - channel_data *chand) { +static void start_resolving_locked(channel_data *chand) { if (GRPC_TRACER_ON(grpc_client_channel_trace)) { gpr_log(GPR_DEBUG, "chand=%p: starting name resolution", chand); } GPR_ASSERT(!chand->started_resolving); chand->started_resolving = true; GRPC_CHANNEL_STACK_REF(chand->owning_stack, "resolver"); - grpc_resolver_next_locked(exec_ctx, chand->resolver, &chand->resolver_result, + grpc_resolver_next_locked(chand->resolver, &chand->resolver_result, &chand->on_resolver_result_changed); } @@ -371,8 +367,7 @@ static void parse_retry_throttle_params(const grpc_json *field, void *arg) { } } -static void on_resolver_result_changed_locked(grpc_exec_ctx *exec_ctx, - void *arg, grpc_error *error) { +static void on_resolver_result_changed_locked(void *arg, grpc_error *error) { channel_data *chand = (channel_data *)arg; if (GRPC_TRACER_ON(grpc_client_channel_trace)) { gpr_log(GPR_DEBUG, "chand=%p: got resolver result: error=%s", chand, @@ -437,11 +432,10 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx *exec_ctx, if (chand->lb_policy != NULL && !lb_policy_name_changed) { // Continue using the same LB policy. Update with new addresses. lb_policy_updated = true; - grpc_lb_policy_update_locked(exec_ctx, chand->lb_policy, &lb_policy_args); + grpc_lb_policy_update_locked(chand->lb_policy, &lb_policy_args); } else { // Instantiate new LB policy. - new_lb_policy = - grpc_lb_policy_create(exec_ctx, lb_policy_name, &lb_policy_args); + new_lb_policy = grpc_lb_policy_create(lb_policy_name, &lb_policy_args); if (new_lb_policy == NULL) { gpr_log(GPR_ERROR, "could not create LB policy \"%s\"", lb_policy_name); } @@ -459,8 +453,7 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx *exec_ctx, grpc_channel_args_find(chand->resolver_result, GRPC_ARG_SERVER_URI); GPR_ASSERT(channel_arg != NULL); GPR_ASSERT(channel_arg->type == GRPC_ARG_STRING); - grpc_uri *uri = - grpc_uri_parse(exec_ctx, channel_arg->value.string, true); + grpc_uri *uri = grpc_uri_parse(channel_arg->value.string, true); GPR_ASSERT(uri->path[0] != '\0'); service_config_parsing_state parsing_state; memset(&parsing_state, 0, sizeof(parsing_state)); @@ -471,7 +464,7 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx *exec_ctx, grpc_uri_destroy(uri); retry_throttle_data = parsing_state.retry_throttle_data; method_params_table = grpc_service_config_create_method_config_table( - exec_ctx, service_config, method_parameters_create_from_json, + service_config, method_parameters_create_from_json, method_parameters_free); grpc_service_config_destroy(service_config); } @@ -480,7 +473,7 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx *exec_ctx, // be pointing to data inside chand->resolver_result. // The copy will be saved in chand->lb_policy_name below. lb_policy_name_dup = gpr_strdup(lb_policy_name); - grpc_channel_args_destroy(exec_ctx, chand->resolver_result); + grpc_channel_args_destroy(chand->resolver_result); chand->resolver_result = NULL; } if (GRPC_TRACER_ON(grpc_client_channel_trace)) { @@ -512,7 +505,7 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx *exec_ctx, chand->retry_throttle_data = retry_throttle_data; // Swap out the method params table. if (chand->method_params_table != NULL) { - grpc_slice_hash_table_unref(exec_ctx, chand->method_params_table); + grpc_slice_hash_table_unref(chand->method_params_table); } chand->method_params_table = method_params_table; // If we have a new LB policy or are shutting down (in which case @@ -528,10 +521,9 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx *exec_ctx, gpr_log(GPR_DEBUG, "chand=%p: unreffing lb_policy=%p", chand, chand->lb_policy); } - grpc_pollset_set_del_pollset_set(exec_ctx, - chand->lb_policy->interested_parties, + grpc_pollset_set_del_pollset_set(chand->lb_policy->interested_parties, chand->interested_parties); - GRPC_LB_POLICY_UNREF(exec_ctx, chand->lb_policy, "channel"); + GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel"); } chand->lb_policy = new_lb_policy; } @@ -545,21 +537,20 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx *exec_ctx, if (GRPC_TRACER_ON(grpc_client_channel_trace)) { gpr_log(GPR_DEBUG, "chand=%p: shutting down resolver", chand); } - grpc_resolver_shutdown_locked(exec_ctx, chand->resolver); - GRPC_RESOLVER_UNREF(exec_ctx, chand->resolver, "channel"); + grpc_resolver_shutdown_locked(chand->resolver); + GRPC_RESOLVER_UNREF(chand->resolver, "channel"); chand->resolver = NULL; } set_channel_connectivity_state_locked( - exec_ctx, chand, GRPC_CHANNEL_SHUTDOWN, + chand, GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Got resolver result after disconnection", &error, 1), "resolver_gone"); - GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->owning_stack, "resolver"); + GRPC_CHANNEL_STACK_UNREF(chand->owning_stack, "resolver"); grpc_closure_list_fail_all(&chand->waiting_for_resolver_result_closures, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Channel disconnected", &error, 1)); - GRPC_CLOSURE_LIST_SCHED(exec_ctx, - &chand->waiting_for_resolver_result_closures); + GRPC_CLOSURE_LIST_SCHED(&chand->waiting_for_resolver_result_closures); } else { // Not shutting down. grpc_connectivity_state state = GRPC_CHANNEL_TRANSIENT_FAILURE; grpc_error *state_error = @@ -569,33 +560,28 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx *exec_ctx, gpr_log(GPR_DEBUG, "chand=%p: initializing new LB policy", chand); } GRPC_ERROR_UNREF(state_error); - state = grpc_lb_policy_check_connectivity_locked(exec_ctx, new_lb_policy, - &state_error); - grpc_pollset_set_add_pollset_set(exec_ctx, - new_lb_policy->interested_parties, + state = + grpc_lb_policy_check_connectivity_locked(new_lb_policy, &state_error); + grpc_pollset_set_add_pollset_set(new_lb_policy->interested_parties, chand->interested_parties); - GRPC_CLOSURE_LIST_SCHED(exec_ctx, - &chand->waiting_for_resolver_result_closures); + GRPC_CLOSURE_LIST_SCHED(&chand->waiting_for_resolver_result_closures); if (chand->exit_idle_when_lb_policy_arrives) { - grpc_lb_policy_exit_idle_locked(exec_ctx, new_lb_policy); + grpc_lb_policy_exit_idle_locked(new_lb_policy); chand->exit_idle_when_lb_policy_arrives = false; } - watch_lb_policy_locked(exec_ctx, chand, new_lb_policy, state); + watch_lb_policy_locked(chand, new_lb_policy, state); } if (!lb_policy_updated) { - set_channel_connectivity_state_locked(exec_ctx, chand, state, - GRPC_ERROR_REF(state_error), - "new_lb+resolver"); + set_channel_connectivity_state_locked( + chand, state, GRPC_ERROR_REF(state_error), "new_lb+resolver"); } - grpc_resolver_next_locked(exec_ctx, chand->resolver, - &chand->resolver_result, + grpc_resolver_next_locked(chand->resolver, &chand->resolver_result, &chand->on_resolver_result_changed); GRPC_ERROR_UNREF(state_error); } } -static void start_transport_op_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error_ignored) { +static void start_transport_op_locked(void *arg, grpc_error *error_ignored) { grpc_transport_op *op = (grpc_transport_op *)arg; grpc_channel_element *elem = (grpc_channel_element *)op->handler_private.extra_arg; @@ -603,7 +589,7 @@ static void start_transport_op_locked(grpc_exec_ctx *exec_ctx, void *arg, if (op->on_connectivity_state_change != NULL) { grpc_connectivity_state_notify_on_state_change( - exec_ctx, &chand->state_tracker, op->connectivity_state, + &chand->state_tracker, op->connectivity_state, op->on_connectivity_state_change); op->on_connectivity_state_change = NULL; op->connectivity_state = NULL; @@ -611,11 +597,10 @@ static void start_transport_op_locked(grpc_exec_ctx *exec_ctx, void *arg, if (op->send_ping != NULL) { if (chand->lb_policy == NULL) { - GRPC_CLOSURE_SCHED( - exec_ctx, op->send_ping, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Ping with no load balancing")); + GRPC_CLOSURE_SCHED(op->send_ping, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Ping with no load balancing")); } else { - grpc_lb_policy_ping_one_locked(exec_ctx, chand->lb_policy, op->send_ping); + grpc_lb_policy_ping_one_locked(chand->lb_policy, op->send_ping); op->bind_pollset = NULL; } op->send_ping = NULL; @@ -624,54 +609,48 @@ static void start_transport_op_locked(grpc_exec_ctx *exec_ctx, void *arg, if (op->disconnect_with_error != GRPC_ERROR_NONE) { if (chand->resolver != NULL) { set_channel_connectivity_state_locked( - exec_ctx, chand, GRPC_CHANNEL_SHUTDOWN, + chand, GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_REF(op->disconnect_with_error), "disconnect"); - grpc_resolver_shutdown_locked(exec_ctx, chand->resolver); - GRPC_RESOLVER_UNREF(exec_ctx, chand->resolver, "channel"); + grpc_resolver_shutdown_locked(chand->resolver); + GRPC_RESOLVER_UNREF(chand->resolver, "channel"); chand->resolver = NULL; if (!chand->started_resolving) { grpc_closure_list_fail_all(&chand->waiting_for_resolver_result_closures, GRPC_ERROR_REF(op->disconnect_with_error)); - GRPC_CLOSURE_LIST_SCHED(exec_ctx, - &chand->waiting_for_resolver_result_closures); + GRPC_CLOSURE_LIST_SCHED(&chand->waiting_for_resolver_result_closures); } if (chand->lb_policy != NULL) { - grpc_pollset_set_del_pollset_set(exec_ctx, - chand->lb_policy->interested_parties, + grpc_pollset_set_del_pollset_set(chand->lb_policy->interested_parties, chand->interested_parties); - GRPC_LB_POLICY_UNREF(exec_ctx, chand->lb_policy, "channel"); + GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel"); chand->lb_policy = NULL; } } GRPC_ERROR_UNREF(op->disconnect_with_error); } - GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->owning_stack, "start_transport_op"); + GRPC_CHANNEL_STACK_UNREF(chand->owning_stack, "start_transport_op"); - GRPC_CLOSURE_SCHED(exec_ctx, op->on_consumed, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(op->on_consumed, GRPC_ERROR_NONE); } -static void cc_start_transport_op(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static void cc_start_transport_op(grpc_channel_element *elem, grpc_transport_op *op) { channel_data *chand = (channel_data *)elem->channel_data; GPR_ASSERT(op->set_accept_stream == false); if (op->bind_pollset != NULL) { - grpc_pollset_set_add_pollset(exec_ctx, chand->interested_parties, - op->bind_pollset); + grpc_pollset_set_add_pollset(chand->interested_parties, op->bind_pollset); } op->handler_private.extra_arg = elem; GRPC_CHANNEL_STACK_REF(chand->owning_stack, "start_transport_op"); GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_INIT(&op->handler_private.closure, start_transport_op_locked, op, grpc_combiner_scheduler(chand->combiner)), GRPC_ERROR_NONE); } -static void cc_get_channel_info(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static void cc_get_channel_info(grpc_channel_element *elem, const grpc_channel_info *info) { channel_data *chand = (channel_data *)elem->channel_data; gpr_mu_lock(&chand->info_mu); @@ -690,8 +669,7 @@ static void cc_get_channel_info(grpc_exec_ctx *exec_ctx, } /* Constructor for channel_data */ -static grpc_error *cc_init_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static grpc_error *cc_init_channel_elem(grpc_channel_element *elem, grpc_channel_element_args *args) { channel_data *chand = (channel_data *)elem->channel_data; GPR_ASSERT(args->is_last); @@ -739,15 +717,15 @@ static grpc_error *cc_init_channel_elem(grpc_exec_ctx *exec_ctx, } char *proxy_name = NULL; grpc_channel_args *new_args = NULL; - grpc_proxy_mappers_map_name(exec_ctx, arg->value.string, args->channel_args, + grpc_proxy_mappers_map_name(arg->value.string, args->channel_args, &proxy_name, &new_args); // Instantiate resolver. - chand->resolver = grpc_resolver_create( - exec_ctx, proxy_name != NULL ? proxy_name : arg->value.string, - new_args != NULL ? new_args : args->channel_args, - chand->interested_parties, chand->combiner); + chand->resolver = + grpc_resolver_create(proxy_name != NULL ? proxy_name : arg->value.string, + new_args != NULL ? new_args : args->channel_args, + chand->interested_parties, chand->combiner); if (proxy_name != NULL) gpr_free(proxy_name); - if (new_args != NULL) grpc_channel_args_destroy(exec_ctx, new_args); + if (new_args != NULL) grpc_channel_args_destroy(new_args); if (chand->resolver == NULL) { return GRPC_ERROR_CREATE_FROM_STATIC_STRING("resolver creation failed"); } @@ -756,31 +734,28 @@ static grpc_error *cc_init_channel_elem(grpc_exec_ctx *exec_ctx, return GRPC_ERROR_NONE; } -static void shutdown_resolver_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void shutdown_resolver_locked(void *arg, grpc_error *error) { grpc_resolver *resolver = (grpc_resolver *)arg; - grpc_resolver_shutdown_locked(exec_ctx, resolver); - GRPC_RESOLVER_UNREF(exec_ctx, resolver, "channel"); + grpc_resolver_shutdown_locked(resolver); + GRPC_RESOLVER_UNREF(resolver, "channel"); } /* Destructor for channel_data */ -static void cc_destroy_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem) { +static void cc_destroy_channel_elem(grpc_channel_element *elem) { channel_data *chand = (channel_data *)elem->channel_data; if (chand->resolver != NULL) { GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_CREATE(shutdown_resolver_locked, chand->resolver, - grpc_combiner_scheduler(chand->combiner)), + GRPC_CLOSURE_CREATE(shutdown_resolver_locked, chand->resolver, + grpc_combiner_scheduler(chand->combiner)), GRPC_ERROR_NONE); } if (chand->client_channel_factory != NULL) { - grpc_client_channel_factory_unref(exec_ctx, chand->client_channel_factory); + grpc_client_channel_factory_unref(chand->client_channel_factory); } if (chand->lb_policy != NULL) { - grpc_pollset_set_del_pollset_set(exec_ctx, - chand->lb_policy->interested_parties, + grpc_pollset_set_del_pollset_set(chand->lb_policy->interested_parties, chand->interested_parties); - GRPC_LB_POLICY_UNREF(exec_ctx, chand->lb_policy, "channel"); + GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel"); } gpr_free(chand->info_lb_policy_name); gpr_free(chand->info_service_config_json); @@ -788,11 +763,11 @@ static void cc_destroy_channel_elem(grpc_exec_ctx *exec_ctx, grpc_server_retry_throttle_data_unref(chand->retry_throttle_data); } if (chand->method_params_table != NULL) { - grpc_slice_hash_table_unref(exec_ctx, chand->method_params_table); + grpc_slice_hash_table_unref(chand->method_params_table); } - grpc_connectivity_state_destroy(exec_ctx, &chand->state_tracker); - grpc_pollset_set_destroy(exec_ctx, chand->interested_parties); - GRPC_COMBINER_UNREF(exec_ctx, chand->combiner, "client_channel"); + grpc_connectivity_state_destroy(&chand->state_tracker); + grpc_pollset_set_destroy(chand->interested_parties); + GRPC_COMBINER_UNREF(chand->combiner, "client_channel"); gpr_mu_destroy(&chand->info_mu); gpr_mu_destroy(&chand->external_connectivity_watcher_list_mu); } @@ -879,21 +854,18 @@ static void waiting_for_pick_batches_add( } // This is called via the call combiner, so access to calld is synchronized. -static void fail_pending_batch_in_call_combiner(grpc_exec_ctx *exec_ctx, - void *arg, grpc_error *error) { +static void fail_pending_batch_in_call_combiner(void *arg, grpc_error *error) { call_data *calld = (call_data *)arg; if (calld->waiting_for_pick_batches_count > 0) { --calld->waiting_for_pick_batches_count; grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, calld->waiting_for_pick_batches[calld->waiting_for_pick_batches_count], GRPC_ERROR_REF(error), calld->call_combiner); } } // This is called via the call combiner, so access to calld is synchronized. -static void waiting_for_pick_batches_fail(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static void waiting_for_pick_batches_fail(grpc_call_element *elem, grpc_error *error) { call_data *calld = (call_data *)elem->call_data; if (GRPC_TRACER_ON(grpc_client_channel_trace)) { @@ -906,37 +878,34 @@ static void waiting_for_pick_batches_fail(grpc_exec_ctx *exec_ctx, GRPC_CLOSURE_INIT(&calld->handle_pending_batch_in_call_combiner[i], fail_pending_batch_in_call_combiner, calld, grpc_schedule_on_exec_ctx); - GRPC_CALL_COMBINER_START(exec_ctx, calld->call_combiner, - &calld->handle_pending_batch_in_call_combiner[i], - GRPC_ERROR_REF(error), - "waiting_for_pick_batches_fail"); + GRPC_CALL_COMBINER_START( + calld->call_combiner, &calld->handle_pending_batch_in_call_combiner[i], + GRPC_ERROR_REF(error), "waiting_for_pick_batches_fail"); } if (calld->initial_metadata_batch != NULL) { grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, calld->initial_metadata_batch, GRPC_ERROR_REF(error), + calld->initial_metadata_batch, GRPC_ERROR_REF(error), calld->call_combiner); } else { - GRPC_CALL_COMBINER_STOP(exec_ctx, calld->call_combiner, + GRPC_CALL_COMBINER_STOP(calld->call_combiner, "waiting_for_pick_batches_fail"); } GRPC_ERROR_UNREF(error); } // This is called via the call combiner, so access to calld is synchronized. -static void run_pending_batch_in_call_combiner(grpc_exec_ctx *exec_ctx, - void *arg, grpc_error *ignored) { +static void run_pending_batch_in_call_combiner(void *arg, grpc_error *ignored) { call_data *calld = (call_data *)arg; if (calld->waiting_for_pick_batches_count > 0) { --calld->waiting_for_pick_batches_count; grpc_subchannel_call_process_op( - exec_ctx, calld->subchannel_call, + calld->subchannel_call, calld->waiting_for_pick_batches[calld->waiting_for_pick_batches_count]); } } // This is called via the call combiner, so access to calld is synchronized. -static void waiting_for_pick_batches_resume(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem) { +static void waiting_for_pick_batches_resume(grpc_call_element *elem) { channel_data *chand = (channel_data *)elem->channel_data; call_data *calld = (call_data *)elem->call_data; if (GRPC_TRACER_ON(grpc_client_channel_trace)) { @@ -949,20 +918,18 @@ static void waiting_for_pick_batches_resume(grpc_exec_ctx *exec_ctx, GRPC_CLOSURE_INIT(&calld->handle_pending_batch_in_call_combiner[i], run_pending_batch_in_call_combiner, calld, grpc_schedule_on_exec_ctx); - GRPC_CALL_COMBINER_START(exec_ctx, calld->call_combiner, - &calld->handle_pending_batch_in_call_combiner[i], - GRPC_ERROR_NONE, - "waiting_for_pick_batches_resume"); + GRPC_CALL_COMBINER_START( + calld->call_combiner, &calld->handle_pending_batch_in_call_combiner[i], + GRPC_ERROR_NONE, "waiting_for_pick_batches_resume"); } GPR_ASSERT(calld->initial_metadata_batch != NULL); - grpc_subchannel_call_process_op(exec_ctx, calld->subchannel_call, + grpc_subchannel_call_process_op(calld->subchannel_call, calld->initial_metadata_batch); } // Applies service config to the call. Must be invoked once we know // that the resolver has returned results to the channel. -static void apply_service_config_to_call_locked(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem) { +static void apply_service_config_to_call_locked(grpc_call_element *elem) { channel_data *chand = (channel_data *)elem->channel_data; call_data *calld = (call_data *)elem->call_data; if (GRPC_TRACER_ON(grpc_client_channel_trace)) { @@ -975,7 +942,7 @@ static void apply_service_config_to_call_locked(grpc_exec_ctx *exec_ctx, } if (chand->method_params_table != NULL) { calld->method_params = (method_parameters *)grpc_method_config_table_get( - exec_ctx, chand->method_params_table, calld->path); + chand->method_params_table, calld->path); if (calld->method_params != NULL) { method_parameters_ref(calld->method_params); // If the deadline from the service config is shorter than the one @@ -987,15 +954,14 @@ static void apply_service_config_to_call_locked(grpc_exec_ctx *exec_ctx, calld->method_params->timeout; if (per_method_deadline < calld->deadline) { calld->deadline = per_method_deadline; - grpc_deadline_state_reset(exec_ctx, elem, calld->deadline); + grpc_deadline_state_reset(elem, calld->deadline); } } } } } -static void create_subchannel_call_locked(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static void create_subchannel_call_locked(grpc_call_element *elem, grpc_error *error) { channel_data *chand = (channel_data *)elem->channel_data; call_data *calld = (call_data *)elem->call_data; @@ -1009,24 +975,22 @@ static void create_subchannel_call_locked(grpc_exec_ctx *exec_ctx, calld->call_combiner // call_combiner }; grpc_error *new_error = grpc_connected_subchannel_create_call( - exec_ctx, calld->connected_subchannel, &call_args, - &calld->subchannel_call); + calld->connected_subchannel, &call_args, &calld->subchannel_call); if (GRPC_TRACER_ON(grpc_client_channel_trace)) { gpr_log(GPR_DEBUG, "chand=%p calld=%p: create subchannel_call=%p: error=%s", chand, calld, calld->subchannel_call, grpc_error_string(new_error)); } if (new_error != GRPC_ERROR_NONE) { new_error = grpc_error_add_child(new_error, error); - waiting_for_pick_batches_fail(exec_ctx, elem, new_error); + waiting_for_pick_batches_fail(elem, new_error); } else { - waiting_for_pick_batches_resume(exec_ctx, elem); + waiting_for_pick_batches_resume(elem); } GRPC_ERROR_UNREF(error); } // Invoked when a pick is completed, on both success or failure. -static void pick_done_locked(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - grpc_error *error) { +static void pick_done_locked(grpc_call_element *elem, grpc_error *error) { call_data *calld = (call_data *)elem->call_data; channel_data *chand = (channel_data *)elem->channel_data; if (calld->connected_subchannel == NULL) { @@ -1042,10 +1006,10 @@ static void pick_done_locked(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, "chand=%p calld=%p: failed to create subchannel: error=%s", chand, calld, grpc_error_string(calld->error)); } - waiting_for_pick_batches_fail(exec_ctx, elem, GRPC_ERROR_REF(calld->error)); + waiting_for_pick_batches_fail(elem, GRPC_ERROR_REF(calld->error)); } else { /* Create call on subchannel. */ - create_subchannel_call_locked(exec_ctx, elem, GRPC_ERROR_REF(error)); + create_subchannel_call_locked(elem, GRPC_ERROR_REF(error)); } GRPC_ERROR_UNREF(error); } @@ -1054,19 +1018,17 @@ static void pick_done_locked(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, // either (a) the pick was deferred pending a resolver result or (b) the // pick was done asynchronously. Removes the call's polling entity from // chand->interested_parties before invoking pick_done_locked(). -static void async_pick_done_locked(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, grpc_error *error) { +static void async_pick_done_locked(grpc_call_element *elem, grpc_error *error) { channel_data *chand = (channel_data *)elem->channel_data; call_data *calld = (call_data *)elem->call_data; - grpc_polling_entity_del_from_pollset_set(exec_ctx, calld->pollent, + grpc_polling_entity_del_from_pollset_set(calld->pollent, chand->interested_parties); - pick_done_locked(exec_ctx, elem, error); + pick_done_locked(elem, error); } // Note: This runs under the client_channel combiner, but will NOT be // holding the call combiner. -static void pick_callback_cancel_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void pick_callback_cancel_locked(void *arg, grpc_error *error) { grpc_call_element *elem = (grpc_call_element *)arg; channel_data *chand = (channel_data *)elem->channel_data; call_data *calld = (call_data *)elem->call_data; @@ -1075,17 +1037,15 @@ static void pick_callback_cancel_locked(grpc_exec_ctx *exec_ctx, void *arg, gpr_log(GPR_DEBUG, "chand=%p calld=%p: cancelling pick from LB policy %p", chand, calld, calld->lb_policy); } - grpc_lb_policy_cancel_pick_locked(exec_ctx, calld->lb_policy, - &calld->connected_subchannel, - GRPC_ERROR_REF(error)); + grpc_lb_policy_cancel_pick_locked( + calld->lb_policy, &calld->connected_subchannel, GRPC_ERROR_REF(error)); } - GRPC_CALL_STACK_UNREF(exec_ctx, calld->owning_call, "pick_callback_cancel"); + GRPC_CALL_STACK_UNREF(calld->owning_call, "pick_callback_cancel"); } // Callback invoked by grpc_lb_policy_pick_locked() for async picks. // Unrefs the LB policy and invokes async_pick_done_locked(). -static void pick_callback_done_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void pick_callback_done_locked(void *arg, grpc_error *error) { grpc_call_element *elem = (grpc_call_element *)arg; channel_data *chand = (channel_data *)elem->channel_data; call_data *calld = (call_data *)elem->call_data; @@ -1094,23 +1054,22 @@ static void pick_callback_done_locked(grpc_exec_ctx *exec_ctx, void *arg, chand, calld); } GPR_ASSERT(calld->lb_policy != NULL); - GRPC_LB_POLICY_UNREF(exec_ctx, calld->lb_policy, "pick_subchannel"); + GRPC_LB_POLICY_UNREF(calld->lb_policy, "pick_subchannel"); calld->lb_policy = NULL; - async_pick_done_locked(exec_ctx, elem, GRPC_ERROR_REF(error)); + async_pick_done_locked(elem, GRPC_ERROR_REF(error)); } // Takes a ref to chand->lb_policy and calls grpc_lb_policy_pick_locked(). // If the pick was completed synchronously, unrefs the LB policy and // returns true. -static bool pick_callback_start_locked(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem) { +static bool pick_callback_start_locked(grpc_call_element *elem) { channel_data *chand = (channel_data *)elem->channel_data; call_data *calld = (call_data *)elem->call_data; if (GRPC_TRACER_ON(grpc_client_channel_trace)) { gpr_log(GPR_DEBUG, "chand=%p calld=%p: starting pick on lb_policy=%p", chand, calld, chand->lb_policy); } - apply_service_config_to_call_locked(exec_ctx, elem); + apply_service_config_to_call_locked(elem); // If the application explicitly set wait_for_ready, use that. // Otherwise, if the service config specified a value for this // method, use that. @@ -1140,7 +1099,7 @@ static bool pick_callback_start_locked(grpc_exec_ctx *exec_ctx, GRPC_CLOSURE_INIT(&calld->lb_pick_closure, pick_callback_done_locked, elem, grpc_combiner_scheduler(chand->combiner)); const bool pick_done = grpc_lb_policy_pick_locked( - exec_ctx, chand->lb_policy, &inputs, &calld->connected_subchannel, + chand->lb_policy, &inputs, &calld->connected_subchannel, calld->subchannel_call_context, NULL, &calld->lb_pick_closure); if (pick_done) { /* synchronous grpc_lb_policy_pick call. Unref the LB policy. */ @@ -1148,12 +1107,12 @@ static bool pick_callback_start_locked(grpc_exec_ctx *exec_ctx, gpr_log(GPR_DEBUG, "chand=%p calld=%p: pick completed synchronously", chand, calld); } - GRPC_LB_POLICY_UNREF(exec_ctx, calld->lb_policy, "pick_subchannel"); + GRPC_LB_POLICY_UNREF(calld->lb_policy, "pick_subchannel"); calld->lb_policy = NULL; } else { GRPC_CALL_STACK_REF(calld->owning_call, "pick_callback_cancel"); grpc_call_combiner_set_notify_on_cancel( - exec_ctx, calld->call_combiner, + calld->call_combiner, GRPC_CLOSURE_INIT(&calld->lb_pick_cancel_closure, pick_callback_cancel_locked, elem, grpc_combiner_scheduler(chand->combiner))); @@ -1170,8 +1129,7 @@ typedef struct { // Note: This runs under the client_channel combiner, but will NOT be // holding the call combiner. -static void pick_after_resolver_result_cancel_locked(grpc_exec_ctx *exec_ctx, - void *arg, +static void pick_after_resolver_result_cancel_locked(void *arg, grpc_error *error) { pick_after_resolver_result_args *args = (pick_after_resolver_result_args *)arg; @@ -1200,13 +1158,11 @@ static void pick_after_resolver_result_cancel_locked(grpc_exec_ctx *exec_ctx, // it's safe to call async_pick_done_locked() here -- we are // essentially calling it here instead of calling it in // pick_after_resolver_result_done_locked(). - async_pick_done_locked(exec_ctx, elem, - GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Pick cancelled", &error, 1)); + async_pick_done_locked(elem, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Pick cancelled", &error, 1)); } -static void pick_after_resolver_result_done_locked(grpc_exec_ctx *exec_ctx, - void *arg, +static void pick_after_resolver_result_done_locked(void *arg, grpc_error *error) { pick_after_resolver_result_args *args = (pick_after_resolver_result_args *)arg; @@ -1227,25 +1183,24 @@ static void pick_after_resolver_result_done_locked(grpc_exec_ctx *exec_ctx, gpr_log(GPR_DEBUG, "chand=%p calld=%p: resolver failed to return data", chand, calld); } - async_pick_done_locked(exec_ctx, elem, GRPC_ERROR_REF(error)); + async_pick_done_locked(elem, GRPC_ERROR_REF(error)); } else { if (GRPC_TRACER_ON(grpc_client_channel_trace)) { gpr_log(GPR_DEBUG, "chand=%p calld=%p: resolver returned, doing pick", chand, calld); } - if (pick_callback_start_locked(exec_ctx, elem)) { + if (pick_callback_start_locked(elem)) { // Even if the LB policy returns a result synchronously, we have // already added our polling entity to chand->interested_parties // in order to wait for the resolver result, so we need to // remove it here. Therefore, we call async_pick_done_locked() // instead of pick_done_locked(). - async_pick_done_locked(exec_ctx, elem, GRPC_ERROR_NONE); + async_pick_done_locked(elem, GRPC_ERROR_NONE); } } } -static void pick_after_resolver_result_start_locked(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem) { +static void pick_after_resolver_result_start_locked(grpc_call_element *elem) { channel_data *chand = (channel_data *)elem->channel_data; call_data *calld = (call_data *)elem->call_data; if (GRPC_TRACER_ON(grpc_client_channel_trace)) { @@ -1261,47 +1216,46 @@ static void pick_after_resolver_result_start_locked(grpc_exec_ctx *exec_ctx, grpc_closure_list_append(&chand->waiting_for_resolver_result_closures, &args->closure, GRPC_ERROR_NONE); grpc_call_combiner_set_notify_on_cancel( - exec_ctx, calld->call_combiner, + calld->call_combiner, GRPC_CLOSURE_INIT(&args->cancel_closure, pick_after_resolver_result_cancel_locked, args, grpc_combiner_scheduler(chand->combiner))); } -static void start_pick_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *ignored) { +static void start_pick_locked(void *arg, grpc_error *ignored) { grpc_call_element *elem = (grpc_call_element *)arg; call_data *calld = (call_data *)elem->call_data; channel_data *chand = (channel_data *)elem->channel_data; GPR_ASSERT(calld->connected_subchannel == NULL); if (chand->lb_policy != NULL) { // We already have an LB policy, so ask it for a pick. - if (pick_callback_start_locked(exec_ctx, elem)) { + if (pick_callback_start_locked(elem)) { // Pick completed synchronously. - pick_done_locked(exec_ctx, elem, GRPC_ERROR_NONE); + pick_done_locked(elem, GRPC_ERROR_NONE); return; } } else { // We do not yet have an LB policy, so wait for a resolver result. if (chand->resolver == NULL) { - pick_done_locked(exec_ctx, elem, + pick_done_locked(elem, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Disconnected")); return; } if (!chand->started_resolving) { - start_resolving_locked(exec_ctx, chand); + start_resolving_locked(chand); } - pick_after_resolver_result_start_locked(exec_ctx, elem); + pick_after_resolver_result_start_locked(elem); } // We need to wait for either a resolver result or for an async result // from the LB policy. Add the polling entity from call_data to the // channel_data's interested_parties, so that the I/O of the LB policy // and resolver can be done under it. The polling entity will be // removed in async_pick_done_locked(). - grpc_polling_entity_add_to_pollset_set(exec_ctx, calld->pollent, + grpc_polling_entity_add_to_pollset_set(calld->pollent, chand->interested_parties); } -static void on_complete(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void on_complete(void *arg, grpc_error *error) { grpc_call_element *elem = (grpc_call_element *)arg; call_data *calld = (call_data *)elem->call_data; if (calld->retry_throttle_data != NULL) { @@ -1317,18 +1271,15 @@ static void on_complete(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { calld->retry_throttle_data); } } - GRPC_CLOSURE_RUN(exec_ctx, calld->original_on_complete, - GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(calld->original_on_complete, GRPC_ERROR_REF(error)); } static void cc_start_transport_stream_op_batch( - grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - grpc_transport_stream_op_batch *batch) { + grpc_call_element *elem, grpc_transport_stream_op_batch *batch) { call_data *calld = (call_data *)elem->call_data; channel_data *chand = (channel_data *)elem->channel_data; if (chand->deadline_checking_enabled) { - grpc_deadline_state_client_start_transport_stream_op_batch(exec_ctx, elem, - batch); + grpc_deadline_state_client_start_transport_stream_op_batch(elem, batch); } GPR_TIMER_BEGIN("cc_start_transport_stream_op_batch", 0); // If we've previously been cancelled, immediately fail any new batches. @@ -1338,7 +1289,7 @@ static void cc_start_transport_stream_op_batch( chand, calld, grpc_error_string(calld->error)); } grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, batch, GRPC_ERROR_REF(calld->error), calld->call_combiner); + batch, GRPC_ERROR_REF(calld->error), calld->call_combiner); goto done; } if (batch->cancel_stream) { @@ -1356,11 +1307,10 @@ static void cc_start_transport_stream_op_batch( // If we have a subchannel call, send the cancellation batch down. // Otherwise, fail all pending batches. if (calld->subchannel_call != NULL) { - grpc_subchannel_call_process_op(exec_ctx, calld->subchannel_call, batch); + grpc_subchannel_call_process_op(calld->subchannel_call, batch); } else { waiting_for_pick_batches_add(calld, batch); - waiting_for_pick_batches_fail(exec_ctx, elem, - GRPC_ERROR_REF(calld->error)); + waiting_for_pick_batches_fail(elem, GRPC_ERROR_REF(calld->error)); } goto done; } @@ -1383,7 +1333,7 @@ static void cc_start_transport_stream_op_batch( "chand=%p calld=%p: sending batch to subchannel_call=%p", chand, calld, calld->subchannel_call); } - grpc_subchannel_call_process_op(exec_ctx, calld->subchannel_call, batch); + grpc_subchannel_call_process_op(calld->subchannel_call, batch); goto done; } // We do not yet have a subchannel call. @@ -1397,7 +1347,6 @@ static void cc_start_transport_stream_op_batch( chand, calld); } GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_INIT(&batch->handler_private.closure, start_pick_locked, elem, grpc_combiner_scheduler(chand->combiner)), GRPC_ERROR_NONE); @@ -1408,7 +1357,7 @@ static void cc_start_transport_stream_op_batch( "chand=%p calld=%p: saved batch, yeilding call combiner", chand, calld); } - GRPC_CALL_COMBINER_STOP(exec_ctx, calld->call_combiner, + GRPC_CALL_COMBINER_STOP(calld->call_combiner, "batch does not include send_initial_metadata"); } done: @@ -1416,8 +1365,7 @@ done: } /* Constructor for call_data */ -static grpc_error *cc_init_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *cc_init_call_elem(grpc_call_element *elem, const grpc_call_element_args *args) { call_data *calld = (call_data *)elem->call_data; channel_data *chand = (channel_data *)elem->channel_data; @@ -1429,23 +1377,22 @@ static grpc_error *cc_init_call_elem(grpc_exec_ctx *exec_ctx, calld->owning_call = args->call_stack; calld->call_combiner = args->call_combiner; if (chand->deadline_checking_enabled) { - grpc_deadline_state_init(exec_ctx, elem, args->call_stack, - args->call_combiner, calld->deadline); + grpc_deadline_state_init(elem, args->call_stack, args->call_combiner, + calld->deadline); } return GRPC_ERROR_NONE; } /* Destructor for call_data */ -static void cc_destroy_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static void cc_destroy_call_elem(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *then_schedule_closure) { call_data *calld = (call_data *)elem->call_data; channel_data *chand = (channel_data *)elem->channel_data; if (chand->deadline_checking_enabled) { - grpc_deadline_state_destroy(exec_ctx, elem); + grpc_deadline_state_destroy(elem); } - grpc_slice_unref_internal(exec_ctx, calld->path); + grpc_slice_unref_internal(calld->path); if (calld->method_params != NULL) { method_parameters_unref(calld->method_params); } @@ -1454,14 +1401,13 @@ static void cc_destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_subchannel_call_set_cleanup_closure(calld->subchannel_call, then_schedule_closure); then_schedule_closure = NULL; - GRPC_SUBCHANNEL_CALL_UNREF(exec_ctx, calld->subchannel_call, + GRPC_SUBCHANNEL_CALL_UNREF(calld->subchannel_call, "client_channel_destroy_call"); } GPR_ASSERT(calld->lb_policy == NULL); GPR_ASSERT(calld->waiting_for_pick_batches_count == 0); if (calld->connected_subchannel != NULL) { - GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, calld->connected_subchannel, - "picked"); + GRPC_CONNECTED_SUBCHANNEL_UNREF(calld->connected_subchannel, "picked"); } for (size_t i = 0; i < GRPC_CONTEXT_COUNT; ++i) { if (calld->subchannel_call_context[i].value != NULL) { @@ -1469,11 +1415,10 @@ static void cc_destroy_call_elem(grpc_exec_ctx *exec_ctx, calld->subchannel_call_context[i].value); } } - GRPC_CLOSURE_SCHED(exec_ctx, then_schedule_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(then_schedule_closure, GRPC_ERROR_NONE); } -static void cc_set_pollset_or_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static void cc_set_pollset_or_pollset_set(grpc_call_element *elem, grpc_polling_entity *pollent) { call_data *calld = (call_data *)elem->call_data; calld->pollent = pollent; @@ -1497,30 +1442,29 @@ const grpc_channel_filter grpc_client_channel_filter = { "client-channel", }; -static void try_to_connect_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error_ignored) { +static void try_to_connect_locked(void *arg, grpc_error *error_ignored) { channel_data *chand = (channel_data *)arg; if (chand->lb_policy != NULL) { - grpc_lb_policy_exit_idle_locked(exec_ctx, chand->lb_policy); + grpc_lb_policy_exit_idle_locked(chand->lb_policy); } else { chand->exit_idle_when_lb_policy_arrives = true; if (!chand->started_resolving && chand->resolver != NULL) { - start_resolving_locked(exec_ctx, chand); + start_resolving_locked(chand); } } - GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->owning_stack, "try_to_connect"); + GRPC_CHANNEL_STACK_UNREF(chand->owning_stack, "try_to_connect"); } grpc_connectivity_state grpc_client_channel_check_connectivity_state( - grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, int try_to_connect) { + grpc_channel_element *elem, int try_to_connect) { channel_data *chand = (channel_data *)elem->channel_data; grpc_connectivity_state out = grpc_connectivity_state_check(&chand->state_tracker); if (out == GRPC_CHANNEL_IDLE && try_to_connect) { GRPC_CHANNEL_STACK_REF(chand->owning_stack, "try_to_connect"); GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_CREATE(try_to_connect_locked, chand, - grpc_combiner_scheduler(chand->combiner)), + GRPC_CLOSURE_CREATE(try_to_connect_locked, chand, + grpc_combiner_scheduler(chand->combiner)), GRPC_ERROR_NONE); } return out; @@ -1599,50 +1543,49 @@ int grpc_client_channel_num_external_connectivity_watchers( return count; } -static void on_external_watch_complete(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void on_external_watch_complete(void *arg, grpc_error *error) { external_connectivity_watcher *w = (external_connectivity_watcher *)arg; grpc_closure *follow_up = w->on_complete; - grpc_polling_entity_del_from_pollset_set(exec_ctx, &w->pollent, + grpc_polling_entity_del_from_pollset_set(&w->pollent, w->chand->interested_parties); - GRPC_CHANNEL_STACK_UNREF(exec_ctx, w->chand->owning_stack, + GRPC_CHANNEL_STACK_UNREF(w->chand->owning_stack, "external_connectivity_watcher"); external_connectivity_watcher_list_remove(w->chand, w); gpr_free(w); - GRPC_CLOSURE_RUN(exec_ctx, follow_up, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(follow_up, GRPC_ERROR_REF(error)); } -static void watch_connectivity_state_locked(grpc_exec_ctx *exec_ctx, void *arg, +static void watch_connectivity_state_locked(void *arg, grpc_error *error_ignored) { external_connectivity_watcher *w = (external_connectivity_watcher *)arg; external_connectivity_watcher *found = NULL; if (w->state != NULL) { external_connectivity_watcher_list_append(w->chand, w); - GRPC_CLOSURE_RUN(exec_ctx, w->watcher_timer_init, GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN(w->watcher_timer_init, GRPC_ERROR_NONE); GRPC_CLOSURE_INIT(&w->my_closure, on_external_watch_complete, w, grpc_schedule_on_exec_ctx); - grpc_connectivity_state_notify_on_state_change( - exec_ctx, &w->chand->state_tracker, w->state, &w->my_closure); + grpc_connectivity_state_notify_on_state_change(&w->chand->state_tracker, + w->state, &w->my_closure); } else { GPR_ASSERT(w->watcher_timer_init == NULL); found = lookup_external_connectivity_watcher(w->chand, w->on_complete); if (found) { GPR_ASSERT(found->on_complete == w->on_complete); grpc_connectivity_state_notify_on_state_change( - exec_ctx, &found->chand->state_tracker, NULL, &found->my_closure); + &found->chand->state_tracker, NULL, &found->my_closure); } - grpc_polling_entity_del_from_pollset_set(exec_ctx, &w->pollent, + grpc_polling_entity_del_from_pollset_set(&w->pollent, w->chand->interested_parties); - GRPC_CHANNEL_STACK_UNREF(exec_ctx, w->chand->owning_stack, + GRPC_CHANNEL_STACK_UNREF(w->chand->owning_stack, "external_connectivity_watcher"); gpr_free(w); } } void grpc_client_channel_watch_connectivity_state( - grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, - grpc_polling_entity pollent, grpc_connectivity_state *state, - grpc_closure *closure, grpc_closure *watcher_timer_init) { + grpc_channel_element *elem, grpc_polling_entity pollent, + grpc_connectivity_state *state, grpc_closure *closure, + grpc_closure *watcher_timer_init) { channel_data *chand = (channel_data *)elem->channel_data; external_connectivity_watcher *w = (external_connectivity_watcher *)gpr_zalloc(sizeof(*w)); @@ -1651,12 +1594,11 @@ void grpc_client_channel_watch_connectivity_state( w->on_complete = closure; w->state = state; w->watcher_timer_init = watcher_timer_init; - grpc_polling_entity_add_to_pollset_set(exec_ctx, &w->pollent, + grpc_polling_entity_add_to_pollset_set(&w->pollent, chand->interested_parties); GRPC_CHANNEL_STACK_REF(w->chand->owning_stack, "external_connectivity_watcher"); GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_INIT(&w->my_closure, watch_connectivity_state_locked, w, grpc_combiner_scheduler(chand->combiner)), GRPC_ERROR_NONE); diff --git a/src/core/ext/filters/client_channel/client_channel.h b/src/core/ext/filters/client_channel/client_channel.h index 152fe2365af..62e36039980 100644 --- a/src/core/ext/filters/client_channel/client_channel.h +++ b/src/core/ext/filters/client_channel/client_channel.h @@ -42,15 +42,15 @@ extern "C" { extern const grpc_channel_filter grpc_client_channel_filter; grpc_connectivity_state grpc_client_channel_check_connectivity_state( - grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, int try_to_connect); + grpc_channel_element *elem, int try_to_connect); int grpc_client_channel_num_external_connectivity_watchers( grpc_channel_element *elem); void grpc_client_channel_watch_connectivity_state( - grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, - grpc_polling_entity pollent, grpc_connectivity_state *state, - grpc_closure *on_complete, grpc_closure *watcher_timer_init); + grpc_channel_element *elem, grpc_polling_entity pollent, + grpc_connectivity_state *state, grpc_closure *on_complete, + grpc_closure *watcher_timer_init); /* Debug helper: pull the subchannel call from a call stack element */ grpc_subchannel_call *grpc_client_channel_get_subchannel_call( diff --git a/src/core/ext/filters/client_channel/client_channel_factory.cc b/src/core/ext/filters/client_channel/client_channel_factory.cc index 57eac8f8757..60c95d7dc90 100644 --- a/src/core/ext/filters/client_channel/client_channel_factory.cc +++ b/src/core/ext/filters/client_channel/client_channel_factory.cc @@ -23,23 +23,19 @@ void grpc_client_channel_factory_ref(grpc_client_channel_factory* factory) { factory->vtable->ref(factory); } -void grpc_client_channel_factory_unref(grpc_exec_ctx* exec_ctx, - grpc_client_channel_factory* factory) { - factory->vtable->unref(exec_ctx, factory); +void grpc_client_channel_factory_unref(grpc_client_channel_factory* factory) { + factory->vtable->unref(factory); } grpc_subchannel* grpc_client_channel_factory_create_subchannel( - grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* factory, - const grpc_subchannel_args* args) { - return factory->vtable->create_subchannel(exec_ctx, factory, args); + grpc_client_channel_factory* factory, const grpc_subchannel_args* args) { + return factory->vtable->create_subchannel(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, - const grpc_channel_args* args) { - return factory->vtable->create_client_channel(exec_ctx, factory, target, type, - args); + grpc_client_channel_factory* factory, const char* target, + grpc_client_channel_type type, const grpc_channel_args* args) { + return factory->vtable->create_client_channel(factory, target, type, args); } static void* factory_arg_copy(void* factory) { @@ -47,9 +43,8 @@ static void* factory_arg_copy(void* factory) { return factory; } -static void factory_arg_destroy(grpc_exec_ctx* exec_ctx, void* factory) { - grpc_client_channel_factory_unref(exec_ctx, - (grpc_client_channel_factory*)factory); +static void factory_arg_destroy(void* factory) { + grpc_client_channel_factory_unref((grpc_client_channel_factory*)factory); } static int factory_arg_cmp(void* factory1, void* factory2) { diff --git a/src/core/ext/filters/client_channel/client_channel_factory.h b/src/core/ext/filters/client_channel/client_channel_factory.h index 4273c900583..82efc6e083a 100644 --- a/src/core/ext/filters/client_channel/client_channel_factory.h +++ b/src/core/ext/filters/client_channel/client_channel_factory.h @@ -49,31 +49,26 @@ struct grpc_client_channel_factory { struct grpc_client_channel_factory_vtable { void (*ref)(grpc_client_channel_factory *factory); - 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, + void (*unref)(grpc_client_channel_factory *factory); + grpc_subchannel *(*create_subchannel)(grpc_client_channel_factory *factory, const grpc_subchannel_args *args); - grpc_channel *(*create_client_channel)(grpc_exec_ctx *exec_ctx, - grpc_client_channel_factory *factory, + grpc_channel *(*create_client_channel)(grpc_client_channel_factory *factory, const char *target, grpc_client_channel_type type, const grpc_channel_args *args); }; void grpc_client_channel_factory_ref(grpc_client_channel_factory *factory); -void grpc_client_channel_factory_unref(grpc_exec_ctx *exec_ctx, - grpc_client_channel_factory *factory); +void grpc_client_channel_factory_unref(grpc_client_channel_factory *factory); /** Create a new grpc_subchannel */ grpc_subchannel *grpc_client_channel_factory_create_subchannel( - grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *factory, - const grpc_subchannel_args *args); + grpc_client_channel_factory *factory, 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, - const grpc_channel_args *args); + grpc_client_channel_factory *factory, const char *target, + grpc_client_channel_type type, const grpc_channel_args *args); grpc_arg grpc_client_channel_factory_create_channel_arg( grpc_client_channel_factory *factory); diff --git a/src/core/ext/filters/client_channel/client_channel_plugin.cc b/src/core/ext/filters/client_channel/client_channel_plugin.cc index 4431d115198..a466244a7b2 100644 --- a/src/core/ext/filters/client_channel/client_channel_plugin.cc +++ b/src/core/ext/filters/client_channel/client_channel_plugin.cc @@ -34,14 +34,12 @@ #include "src/core/ext/filters/client_channel/subchannel_index.h" #include "src/core/lib/surface/channel_init.h" -static bool append_filter(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder, void *arg) { +static bool append_filter(grpc_channel_stack_builder *builder, void *arg) { return grpc_channel_stack_builder_append_filter( builder, (const grpc_channel_filter *)arg, NULL, NULL); } -static bool set_default_host_if_unset(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder, +static bool set_default_host_if_unset(grpc_channel_stack_builder *builder, void *unused) { const grpc_channel_args *args = grpc_channel_stack_builder_get_channel_arguments(builder); @@ -52,15 +50,14 @@ static bool set_default_host_if_unset(grpc_exec_ctx *exec_ctx, } } char *default_authority = grpc_get_default_authority( - exec_ctx, grpc_channel_stack_builder_get_target(builder)); + grpc_channel_stack_builder_get_target(builder)); if (default_authority != NULL) { grpc_arg arg = grpc_channel_arg_string_create( (char *)GRPC_ARG_DEFAULT_AUTHORITY, default_authority); grpc_channel_args *new_args = grpc_channel_args_copy_and_add(args, &arg, 1); - grpc_channel_stack_builder_set_channel_arguments(exec_ctx, builder, - new_args); + grpc_channel_stack_builder_set_channel_arguments(builder, new_args); gpr_free(default_authority); - grpc_channel_args_destroy(exec_ctx, new_args); + grpc_channel_args_destroy(new_args); } return true; } diff --git a/src/core/ext/filters/client_channel/connector.cc b/src/core/ext/filters/client_channel/connector.cc index c258468e589..c8bf2f3e1c0 100644 --- a/src/core/ext/filters/client_channel/connector.cc +++ b/src/core/ext/filters/client_channel/connector.cc @@ -23,18 +23,17 @@ grpc_connector* grpc_connector_ref(grpc_connector* connector) { return connector; } -void grpc_connector_unref(grpc_exec_ctx* exec_ctx, grpc_connector* connector) { - connector->vtable->unref(exec_ctx, connector); +void grpc_connector_unref(grpc_connector* connector) { + connector->vtable->unref(connector); } -void grpc_connector_connect(grpc_exec_ctx* exec_ctx, grpc_connector* connector, +void grpc_connector_connect(grpc_connector* connector, const grpc_connect_in_args* in_args, grpc_connect_out_args* out_args, grpc_closure* notify) { - connector->vtable->connect(exec_ctx, connector, in_args, out_args, notify); + connector->vtable->connect(connector, in_args, out_args, notify); } -void grpc_connector_shutdown(grpc_exec_ctx* exec_ctx, grpc_connector* connector, - grpc_error* why) { - connector->vtable->shutdown(exec_ctx, connector, why); +void grpc_connector_shutdown(grpc_connector* connector, grpc_error* why) { + connector->vtable->shutdown(connector, why); } diff --git a/src/core/ext/filters/client_channel/connector.h b/src/core/ext/filters/client_channel/connector.h index b71e0aab004..af6ed2a546b 100644 --- a/src/core/ext/filters/client_channel/connector.h +++ b/src/core/ext/filters/client_channel/connector.h @@ -53,26 +53,24 @@ typedef struct { struct grpc_connector_vtable { void (*ref)(grpc_connector *connector); - void (*unref)(grpc_exec_ctx *exec_ctx, grpc_connector *connector); + void (*unref)(grpc_connector *connector); /** Implementation of grpc_connector_shutdown */ - void (*shutdown)(grpc_exec_ctx *exec_ctx, grpc_connector *connector, - grpc_error *why); + void (*shutdown)(grpc_connector *connector, grpc_error *why); /** Implementation of grpc_connector_connect */ - void (*connect)(grpc_exec_ctx *exec_ctx, grpc_connector *connector, + void (*connect)(grpc_connector *connector, const grpc_connect_in_args *in_args, grpc_connect_out_args *out_args, grpc_closure *notify); }; grpc_connector *grpc_connector_ref(grpc_connector *connector); -void grpc_connector_unref(grpc_exec_ctx *exec_ctx, grpc_connector *connector); +void grpc_connector_unref(grpc_connector *connector); /** Connect using the connector: max one outstanding call at a time */ -void grpc_connector_connect(grpc_exec_ctx *exec_ctx, grpc_connector *connector, +void grpc_connector_connect(grpc_connector *connector, const grpc_connect_in_args *in_args, grpc_connect_out_args *out_args, grpc_closure *notify); /** Cancel any pending connection */ -void grpc_connector_shutdown(grpc_exec_ctx *exec_ctx, grpc_connector *connector, - grpc_error *why); +void grpc_connector_shutdown(grpc_connector *connector, grpc_error *why); #ifdef __cplusplus } diff --git a/src/core/ext/filters/client_channel/http_connect_handshaker.cc b/src/core/ext/filters/client_channel/http_connect_handshaker.cc index 418bb41ef6a..14b3836b90a 100644 --- a/src/core/ext/filters/client_channel/http_connect_handshaker.cc +++ b/src/core/ext/filters/client_channel/http_connect_handshaker.cc @@ -61,19 +61,17 @@ typedef struct http_connect_handshaker { } http_connect_handshaker; // Unref and clean up handshaker. -static void http_connect_handshaker_unref(grpc_exec_ctx* exec_ctx, - http_connect_handshaker* handshaker) { +static void http_connect_handshaker_unref(http_connect_handshaker* handshaker) { if (gpr_unref(&handshaker->refcount)) { gpr_mu_destroy(&handshaker->mu); if (handshaker->endpoint_to_destroy != NULL) { - grpc_endpoint_destroy(exec_ctx, handshaker->endpoint_to_destroy); + grpc_endpoint_destroy(handshaker->endpoint_to_destroy); } if (handshaker->read_buffer_to_destroy != NULL) { - grpc_slice_buffer_destroy_internal(exec_ctx, - handshaker->read_buffer_to_destroy); + grpc_slice_buffer_destroy_internal(handshaker->read_buffer_to_destroy); gpr_free(handshaker->read_buffer_to_destroy); } - grpc_slice_buffer_destroy_internal(exec_ctx, &handshaker->write_buffer); + grpc_slice_buffer_destroy_internal(&handshaker->write_buffer); grpc_http_parser_destroy(&handshaker->http_parser); grpc_http_response_destroy(&handshaker->http_response); gpr_free(handshaker); @@ -83,19 +81,18 @@ static void http_connect_handshaker_unref(grpc_exec_ctx* exec_ctx, // Set args fields to NULL, saving the endpoint and read buffer for // later destruction. static void cleanup_args_for_failure_locked( - grpc_exec_ctx* exec_ctx, http_connect_handshaker* handshaker) { + http_connect_handshaker* handshaker) { handshaker->endpoint_to_destroy = handshaker->args->endpoint; handshaker->args->endpoint = NULL; handshaker->read_buffer_to_destroy = handshaker->args->read_buffer; handshaker->args->read_buffer = NULL; - grpc_channel_args_destroy(exec_ctx, handshaker->args->args); + grpc_channel_args_destroy(handshaker->args->args); handshaker->args->args = NULL; } // If the handshake failed or we're shutting down, clean up and invoke the // callback with the error. -static void handshake_failed_locked(grpc_exec_ctx* exec_ctx, - http_connect_handshaker* handshaker, +static void handshake_failed_locked(http_connect_handshaker* handshaker, grpc_error* error) { if (error == GRPC_ERROR_NONE) { // If we were shut down after an endpoint operation succeeded but @@ -108,34 +105,32 @@ static void handshake_failed_locked(grpc_exec_ctx* exec_ctx, // before destroying them, even if we know that there are no // pending read/write callbacks. This should be fixed, at which // point this can be removed. - grpc_endpoint_shutdown(exec_ctx, handshaker->args->endpoint, - GRPC_ERROR_REF(error)); + grpc_endpoint_shutdown(handshaker->args->endpoint, GRPC_ERROR_REF(error)); // Not shutting down, so the handshake failed. Clean up before // invoking the callback. - cleanup_args_for_failure_locked(exec_ctx, handshaker); + cleanup_args_for_failure_locked(handshaker); // Set shutdown to true so that subsequent calls to // http_connect_handshaker_shutdown() do nothing. handshaker->shutdown = true; } // Invoke callback. - GRPC_CLOSURE_SCHED(exec_ctx, handshaker->on_handshake_done, error); + GRPC_CLOSURE_SCHED(handshaker->on_handshake_done, error); } // Callback invoked when finished writing HTTP CONNECT request. -static void on_write_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_write_done(void* arg, grpc_error* error) { http_connect_handshaker* handshaker = (http_connect_handshaker*)arg; gpr_mu_lock(&handshaker->mu); if (error != GRPC_ERROR_NONE || handshaker->shutdown) { // If the write failed or we're shutting down, clean up and invoke the // callback with the error. - handshake_failed_locked(exec_ctx, handshaker, GRPC_ERROR_REF(error)); + handshake_failed_locked(handshaker, GRPC_ERROR_REF(error)); gpr_mu_unlock(&handshaker->mu); - http_connect_handshaker_unref(exec_ctx, handshaker); + http_connect_handshaker_unref(handshaker); } else { // Otherwise, read the response. // The read callback inherits our ref to the handshaker. - grpc_endpoint_read(exec_ctx, handshaker->args->endpoint, + grpc_endpoint_read(handshaker->args->endpoint, handshaker->args->read_buffer, &handshaker->response_read_closure); gpr_mu_unlock(&handshaker->mu); @@ -143,14 +138,13 @@ static void on_write_done(grpc_exec_ctx* exec_ctx, void* arg, } // Callback invoked for reading HTTP CONNECT response. -static void on_read_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_read_done(void* arg, grpc_error* error) { http_connect_handshaker* handshaker = (http_connect_handshaker*)arg; gpr_mu_lock(&handshaker->mu); if (error != GRPC_ERROR_NONE || handshaker->shutdown) { // If the read failed or we're shutting down, clean up and invoke the // callback with the error. - handshake_failed_locked(exec_ctx, handshaker, GRPC_ERROR_REF(error)); + handshake_failed_locked(handshaker, GRPC_ERROR_REF(error)); goto done; } // Add buffer to parser. @@ -161,7 +155,7 @@ static void on_read_done(grpc_exec_ctx* exec_ctx, void* arg, handshaker->args->read_buffer->slices[i], &body_start_offset); if (error != GRPC_ERROR_NONE) { - handshake_failed_locked(exec_ctx, handshaker, error); + handshake_failed_locked(handshaker, error); goto done; } if (handshaker->http_parser.state == GRPC_HTTP_BODY) { @@ -180,7 +174,7 @@ static void on_read_done(grpc_exec_ctx* exec_ctx, void* arg, &handshaker->args->read_buffer->slices[i + 1], handshaker->args->read_buffer->count - i - 1); grpc_slice_buffer_swap(handshaker->args->read_buffer, &tmp_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &tmp_buffer); + grpc_slice_buffer_destroy_internal(&tmp_buffer); break; } } @@ -197,9 +191,8 @@ static void on_read_done(grpc_exec_ctx* exec_ctx, void* arg, // complete (e.g., handling chunked transfer encoding or looking // at the Content-Length: header). if (handshaker->http_parser.state != GRPC_HTTP_BODY) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, - handshaker->args->read_buffer); - grpc_endpoint_read(exec_ctx, handshaker->args->endpoint, + grpc_slice_buffer_reset_and_unref_internal(handshaker->args->read_buffer); + grpc_endpoint_read(handshaker->args->endpoint, handshaker->args->read_buffer, &handshaker->response_read_closure); gpr_mu_unlock(&handshaker->mu); @@ -213,48 +206,44 @@ static void on_read_done(grpc_exec_ctx* exec_ctx, void* arg, handshaker->http_response.status); error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - handshake_failed_locked(exec_ctx, handshaker, error); + handshake_failed_locked(handshaker, error); goto done; } // Success. Invoke handshake-done callback. - GRPC_CLOSURE_SCHED(exec_ctx, handshaker->on_handshake_done, error); + GRPC_CLOSURE_SCHED(handshaker->on_handshake_done, error); done: // Set shutdown to true so that subsequent calls to // http_connect_handshaker_shutdown() do nothing. handshaker->shutdown = true; gpr_mu_unlock(&handshaker->mu); - http_connect_handshaker_unref(exec_ctx, handshaker); + http_connect_handshaker_unref(handshaker); } // // Public handshaker methods // -static void http_connect_handshaker_destroy(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker_in) { +static void http_connect_handshaker_destroy(grpc_handshaker* handshaker_in) { http_connect_handshaker* handshaker = (http_connect_handshaker*)handshaker_in; - http_connect_handshaker_unref(exec_ctx, handshaker); + http_connect_handshaker_unref(handshaker); } -static void http_connect_handshaker_shutdown(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker_in, +static void http_connect_handshaker_shutdown(grpc_handshaker* handshaker_in, grpc_error* why) { http_connect_handshaker* handshaker = (http_connect_handshaker*)handshaker_in; gpr_mu_lock(&handshaker->mu); if (!handshaker->shutdown) { handshaker->shutdown = true; - grpc_endpoint_shutdown(exec_ctx, handshaker->args->endpoint, - GRPC_ERROR_REF(why)); - cleanup_args_for_failure_locked(exec_ctx, handshaker); + grpc_endpoint_shutdown(handshaker->args->endpoint, GRPC_ERROR_REF(why)); + cleanup_args_for_failure_locked(handshaker); } gpr_mu_unlock(&handshaker->mu); GRPC_ERROR_UNREF(why); } static void http_connect_handshaker_do_handshake( - grpc_exec_ctx* exec_ctx, grpc_handshaker* handshaker_in, - grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, - grpc_handshaker_args* args) { + grpc_handshaker* handshaker_in, grpc_tcp_server_acceptor* acceptor, + grpc_closure* on_handshake_done, grpc_handshaker_args* args) { http_connect_handshaker* handshaker = (http_connect_handshaker*)handshaker_in; // Check for HTTP CONNECT channel arg. // If not found, invoke on_handshake_done without doing anything. @@ -266,7 +255,7 @@ static void http_connect_handshaker_do_handshake( gpr_mu_lock(&handshaker->mu); handshaker->shutdown = true; gpr_mu_unlock(&handshaker->mu); - GRPC_CLOSURE_SCHED(exec_ctx, on_handshake_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_handshake_done, GRPC_ERROR_NONE); return; } GPR_ASSERT(arg->type == GRPC_ARG_STRING); @@ -324,7 +313,7 @@ static void http_connect_handshaker_do_handshake( gpr_free(header_strings); // Take a new ref to be held by the write callback. gpr_ref(&handshaker->refcount); - grpc_endpoint_write(exec_ctx, args->endpoint, &handshaker->write_buffer, + grpc_endpoint_write(args->endpoint, &handshaker->write_buffer, &handshaker->request_done_closure); gpr_mu_unlock(&handshaker->mu); } @@ -355,14 +344,13 @@ static grpc_handshaker* grpc_http_connect_handshaker_create() { // static void handshaker_factory_add_handshakers( - grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* factory, - const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr) { + grpc_handshaker_factory* factory, const grpc_channel_args* args, + grpc_handshake_manager* handshake_mgr) { grpc_handshake_manager_add(handshake_mgr, grpc_http_connect_handshaker_create()); } -static void handshaker_factory_destroy(grpc_exec_ctx* exec_ctx, - grpc_handshaker_factory* factory) {} +static void handshaker_factory_destroy(grpc_handshaker_factory* factory) {} static const grpc_handshaker_factory_vtable handshaker_factory_vtable = { handshaker_factory_add_handshakers, handshaker_factory_destroy}; diff --git a/src/core/ext/filters/client_channel/http_proxy.cc b/src/core/ext/filters/client_channel/http_proxy.cc index a16b44d3dc3..567d5fe2e4b 100644 --- a/src/core/ext/filters/client_channel/http_proxy.cc +++ b/src/core/ext/filters/client_channel/http_proxy.cc @@ -40,15 +40,14 @@ * 'http_proxy' env var, otherwise leaves it unchanged. It is caller's * responsibility to gpr_free user_cred. */ -static char* get_http_proxy_server(grpc_exec_ctx* exec_ctx, char** user_cred) { +static char* get_http_proxy_server(char** user_cred) { GPR_ASSERT(user_cred != NULL); char* proxy_name = NULL; char* uri_str = gpr_getenv("http_proxy"); char** authority_strs = NULL; size_t authority_nstrs; if (uri_str == NULL) return NULL; - grpc_uri* uri = - grpc_uri_parse(exec_ctx, uri_str, false /* suppress_errors */); + grpc_uri* uri = grpc_uri_parse(uri_str, false /* suppress_errors */); if (uri == NULL || uri->authority == NULL) { gpr_log(GPR_ERROR, "cannot parse value of 'http_proxy' env var"); goto done; @@ -82,18 +81,16 @@ done: return proxy_name; } -static bool proxy_mapper_map_name(grpc_exec_ctx* exec_ctx, - grpc_proxy_mapper* mapper, +static bool proxy_mapper_map_name(grpc_proxy_mapper* mapper, const char* server_uri, const grpc_channel_args* args, char** name_to_resolve, grpc_channel_args** new_args) { char* user_cred = NULL; - *name_to_resolve = get_http_proxy_server(exec_ctx, &user_cred); + *name_to_resolve = get_http_proxy_server(&user_cred); if (*name_to_resolve == NULL) return false; char* no_proxy_str = NULL; - grpc_uri* uri = - grpc_uri_parse(exec_ctx, server_uri, false /* suppress_errors */); + grpc_uri* uri = grpc_uri_parse(server_uri, false /* suppress_errors */); if (uri == NULL || uri->path[0] == '\0') { gpr_log(GPR_ERROR, "'http_proxy' environment variable set, but cannot " @@ -174,8 +171,7 @@ no_use_proxy: return false; } -static bool proxy_mapper_map_address(grpc_exec_ctx* exec_ctx, - grpc_proxy_mapper* mapper, +static bool proxy_mapper_map_address(grpc_proxy_mapper* mapper, const grpc_resolved_address* address, const grpc_channel_args* args, grpc_resolved_address** new_address, diff --git a/src/core/ext/filters/client_channel/lb_policy.cc b/src/core/ext/filters/client_channel/lb_policy.cc index 8e6673d737e..be3c2176bf2 100644 --- a/src/core/ext/filters/client_channel/lb_policy.cc +++ b/src/core/ext/filters/client_channel/lb_policy.cc @@ -65,28 +65,25 @@ void grpc_lb_policy_ref(grpc_lb_policy *policy REF_FUNC_EXTRA_ARGS) { ref_mutate(policy, 1 << WEAK_REF_BITS, 0 REF_MUTATE_PASS_ARGS("STRONG_REF")); } -static void shutdown_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void shutdown_locked(void *arg, grpc_error *error) { grpc_lb_policy *policy = (grpc_lb_policy *)arg; - policy->vtable->shutdown_locked(exec_ctx, policy); - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, policy, "strong-unref"); + policy->vtable->shutdown_locked(policy); + GRPC_LB_POLICY_WEAK_UNREF(policy, "strong-unref"); } -void grpc_lb_policy_unref(grpc_exec_ctx *exec_ctx, - grpc_lb_policy *policy REF_FUNC_EXTRA_ARGS) { +void grpc_lb_policy_unref(grpc_lb_policy *policy REF_FUNC_EXTRA_ARGS) { gpr_atm old_val = ref_mutate(policy, (gpr_atm)1 - (gpr_atm)(1 << WEAK_REF_BITS), 1 REF_MUTATE_PASS_ARGS("STRONG_UNREF")); gpr_atm mask = ~(gpr_atm)((1 << WEAK_REF_BITS) - 1); gpr_atm check = 1 << WEAK_REF_BITS; if ((old_val & mask) == check) { - GRPC_CLOSURE_SCHED(exec_ctx, GRPC_CLOSURE_CREATE( - shutdown_locked, policy, - grpc_combiner_scheduler(policy->combiner)), - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED( + GRPC_CLOSURE_CREATE(shutdown_locked, policy, + grpc_combiner_scheduler(policy->combiner)), + GRPC_ERROR_NONE); } else { - grpc_lb_policy_weak_unref(exec_ctx, - policy REF_FUNC_PASS_ARGS("strong-unref")); + grpc_lb_policy_weak_unref(policy REF_FUNC_PASS_ARGS("strong-unref")); } } @@ -94,71 +91,61 @@ void grpc_lb_policy_weak_ref(grpc_lb_policy *policy REF_FUNC_EXTRA_ARGS) { ref_mutate(policy, 1, 0 REF_MUTATE_PASS_ARGS("WEAK_REF")); } -void grpc_lb_policy_weak_unref(grpc_exec_ctx *exec_ctx, - grpc_lb_policy *policy REF_FUNC_EXTRA_ARGS) { +void grpc_lb_policy_weak_unref(grpc_lb_policy *policy REF_FUNC_EXTRA_ARGS) { gpr_atm old_val = ref_mutate(policy, -(gpr_atm)1, 1 REF_MUTATE_PASS_ARGS("WEAK_UNREF")); if (old_val == 1) { - grpc_pollset_set_destroy(exec_ctx, policy->interested_parties); + grpc_pollset_set_destroy(policy->interested_parties); grpc_combiner *combiner = policy->combiner; - policy->vtable->destroy(exec_ctx, policy); - GRPC_COMBINER_UNREF(exec_ctx, combiner, "lb_policy"); + policy->vtable->destroy(policy); + GRPC_COMBINER_UNREF(combiner, "lb_policy"); } } -int grpc_lb_policy_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, +int grpc_lb_policy_pick_locked(grpc_lb_policy *policy, const grpc_lb_policy_pick_args *pick_args, grpc_connected_subchannel **target, grpc_call_context_element *context, void **user_data, grpc_closure *on_complete) { - return policy->vtable->pick_locked(exec_ctx, policy, pick_args, target, - context, user_data, on_complete); + return policy->vtable->pick_locked(policy, pick_args, target, context, + user_data, on_complete); } -void grpc_lb_policy_cancel_pick_locked(grpc_exec_ctx *exec_ctx, - grpc_lb_policy *policy, +void grpc_lb_policy_cancel_pick_locked(grpc_lb_policy *policy, grpc_connected_subchannel **target, grpc_error *error) { - policy->vtable->cancel_pick_locked(exec_ctx, policy, target, error); + policy->vtable->cancel_pick_locked(policy, target, error); } -void grpc_lb_policy_cancel_picks_locked(grpc_exec_ctx *exec_ctx, - grpc_lb_policy *policy, +void grpc_lb_policy_cancel_picks_locked(grpc_lb_policy *policy, uint32_t initial_metadata_flags_mask, uint32_t initial_metadata_flags_eq, grpc_error *error) { - policy->vtable->cancel_picks_locked(exec_ctx, policy, - initial_metadata_flags_mask, + policy->vtable->cancel_picks_locked(policy, initial_metadata_flags_mask, initial_metadata_flags_eq, error); } -void grpc_lb_policy_exit_idle_locked(grpc_exec_ctx *exec_ctx, - grpc_lb_policy *policy) { - policy->vtable->exit_idle_locked(exec_ctx, policy); +void grpc_lb_policy_exit_idle_locked(grpc_lb_policy *policy) { + policy->vtable->exit_idle_locked(policy); } -void grpc_lb_policy_ping_one_locked(grpc_exec_ctx *exec_ctx, - grpc_lb_policy *policy, +void grpc_lb_policy_ping_one_locked(grpc_lb_policy *policy, grpc_closure *closure) { - policy->vtable->ping_one_locked(exec_ctx, policy, closure); + policy->vtable->ping_one_locked(policy, closure); } void grpc_lb_policy_notify_on_state_change_locked( - grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, - grpc_connectivity_state *state, grpc_closure *closure) { - policy->vtable->notify_on_state_change_locked(exec_ctx, policy, state, - closure); + grpc_lb_policy *policy, grpc_connectivity_state *state, + grpc_closure *closure) { + policy->vtable->notify_on_state_change_locked(policy, state, closure); } grpc_connectivity_state grpc_lb_policy_check_connectivity_locked( - grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, - grpc_error **connectivity_error) { - return policy->vtable->check_connectivity_locked(exec_ctx, policy, - connectivity_error); + grpc_lb_policy *policy, grpc_error **connectivity_error) { + return policy->vtable->check_connectivity_locked(policy, connectivity_error); } -void grpc_lb_policy_update_locked(grpc_exec_ctx *exec_ctx, - grpc_lb_policy *policy, +void grpc_lb_policy_update_locked(grpc_lb_policy *policy, const grpc_lb_policy_args *lb_policy_args) { - policy->vtable->update_locked(exec_ctx, policy, lb_policy_args); + policy->vtable->update_locked(policy, lb_policy_args); } diff --git a/src/core/ext/filters/client_channel/lb_policy.h b/src/core/ext/filters/client_channel/lb_policy.h index 010299c2f4c..090e0214851 100644 --- a/src/core/ext/filters/client_channel/lb_policy.h +++ b/src/core/ext/filters/client_channel/lb_policy.h @@ -59,48 +59,45 @@ typedef struct grpc_lb_policy_pick_args { } grpc_lb_policy_pick_args; struct grpc_lb_policy_vtable { - void (*destroy)(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy); - void (*shutdown_locked)(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy); + void (*destroy)(grpc_lb_policy *policy); + void (*shutdown_locked)(grpc_lb_policy *policy); /** \see grpc_lb_policy_pick */ - int (*pick_locked)(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, + int (*pick_locked)(grpc_lb_policy *policy, const grpc_lb_policy_pick_args *pick_args, grpc_connected_subchannel **target, grpc_call_context_element *context, void **user_data, grpc_closure *on_complete); /** \see grpc_lb_policy_cancel_pick */ - void (*cancel_pick_locked)(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, + void (*cancel_pick_locked)(grpc_lb_policy *policy, grpc_connected_subchannel **target, grpc_error *error); /** \see grpc_lb_policy_cancel_picks */ - void (*cancel_picks_locked)(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, + void (*cancel_picks_locked)(grpc_lb_policy *policy, uint32_t initial_metadata_flags_mask, uint32_t initial_metadata_flags_eq, grpc_error *error); /** \see grpc_lb_policy_ping_one */ - void (*ping_one_locked)(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, - grpc_closure *closure); + void (*ping_one_locked)(grpc_lb_policy *policy, grpc_closure *closure); /** Try to enter a READY connectivity state */ - void (*exit_idle_locked)(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy); + void (*exit_idle_locked)(grpc_lb_policy *policy); /** check the current connectivity of the lb_policy */ grpc_connectivity_state (*check_connectivity_locked)( - grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, - grpc_error **connectivity_error); + grpc_lb_policy *policy, grpc_error **connectivity_error); /** call notify when the connectivity state of a channel changes from *state. Updates *state with the new state of the policy. Calling with a NULL \a state cancels the subscription. */ - void (*notify_on_state_change_locked)(grpc_exec_ctx *exec_ctx, - grpc_lb_policy *policy, + void (*notify_on_state_change_locked)(grpc_lb_policy *policy, grpc_connectivity_state *state, grpc_closure *closure); - void (*update_locked)(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, + void (*update_locked)(grpc_lb_policy *policy, const grpc_lb_policy_args *args); }; @@ -109,33 +106,33 @@ struct grpc_lb_policy_vtable { /* Strong references: the policy will shutdown when they reach zero */ #define GRPC_LB_POLICY_REF(p, r) \ grpc_lb_policy_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_LB_POLICY_UNREF(exec_ctx, p, r) \ - grpc_lb_policy_unref((exec_ctx), (p), __FILE__, __LINE__, (r)) +#define GRPC_LB_POLICY_UNREF(p, r) \ + grpc_lb_policy_unref((p), __FILE__, __LINE__, (r)) /* Weak references: they don't prevent the shutdown of the LB policy. When no * strong references are left but there are still weak ones, shutdown is called. * Once the weak reference also reaches zero, the LB policy is destroyed. */ #define GRPC_LB_POLICY_WEAK_REF(p, r) \ grpc_lb_policy_weak_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, p, r) \ - grpc_lb_policy_weak_unref((exec_ctx), (p), __FILE__, __LINE__, (r)) +#define GRPC_LB_POLICY_WEAK_UNREF(p, r) \ + grpc_lb_policy_weak_unref((p), __FILE__, __LINE__, (r)) void grpc_lb_policy_ref(grpc_lb_policy *policy, const char *file, int line, const char *reason); -void grpc_lb_policy_unref(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, - const char *file, int line, const char *reason); +void grpc_lb_policy_unref(grpc_lb_policy *policy, const char *file, int line, + const char *reason); void grpc_lb_policy_weak_ref(grpc_lb_policy *policy, const char *file, int line, const char *reason); -void grpc_lb_policy_weak_unref(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, - const char *file, int line, const char *reason); +void grpc_lb_policy_weak_unref(grpc_lb_policy *policy, const char *file, + int line, const char *reason); #else #define GRPC_LB_POLICY_REF(p, r) grpc_lb_policy_ref((p)) -#define GRPC_LB_POLICY_UNREF(cl, p, r) grpc_lb_policy_unref((cl), (p)) +#define GRPC_LB_POLICY_UNREF(p, r) grpc_lb_policy_unref((p)) #define GRPC_LB_POLICY_WEAK_REF(p, r) grpc_lb_policy_weak_ref((p)) -#define GRPC_LB_POLICY_WEAK_UNREF(cl, p, r) grpc_lb_policy_weak_unref((cl), (p)) +#define GRPC_LB_POLICY_WEAK_UNREF(p, r) grpc_lb_policy_weak_unref((p)) void grpc_lb_policy_ref(grpc_lb_policy *policy); -void grpc_lb_policy_unref(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy); +void grpc_lb_policy_unref(grpc_lb_policy *policy); void grpc_lb_policy_weak_ref(grpc_lb_policy *policy); -void grpc_lb_policy_weak_unref(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy); +void grpc_lb_policy_weak_unref(grpc_lb_policy *policy); #endif /** called by concrete implementations to initialize the base struct */ @@ -160,7 +157,7 @@ void grpc_lb_policy_init(grpc_lb_policy *policy, Any IO should be done under the \a interested_parties \a grpc_pollset_set in the \a grpc_lb_policy struct. */ -int grpc_lb_policy_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, +int grpc_lb_policy_pick_locked(grpc_lb_policy *policy, const grpc_lb_policy_pick_args *pick_args, grpc_connected_subchannel **target, grpc_call_context_element *context, @@ -168,44 +165,38 @@ int grpc_lb_policy_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, /** Perform a connected subchannel ping (see \a grpc_connected_subchannel_ping) against one of the connected subchannels managed by \a policy. */ -void grpc_lb_policy_ping_one_locked(grpc_exec_ctx *exec_ctx, - grpc_lb_policy *policy, +void grpc_lb_policy_ping_one_locked(grpc_lb_policy *policy, grpc_closure *closure); /** Cancel picks for \a target. The \a on_complete callback of the pending picks will be invoked with \a *target set to NULL. */ -void grpc_lb_policy_cancel_pick_locked(grpc_exec_ctx *exec_ctx, - grpc_lb_policy *policy, +void grpc_lb_policy_cancel_pick_locked(grpc_lb_policy *policy, grpc_connected_subchannel **target, grpc_error *error); /** Cancel all pending picks for which their \a initial_metadata_flags (as given in the call to \a grpc_lb_policy_pick) matches \a initial_metadata_flags_eq when AND'd with \a initial_metadata_flags_mask */ -void grpc_lb_policy_cancel_picks_locked(grpc_exec_ctx *exec_ctx, - grpc_lb_policy *policy, +void grpc_lb_policy_cancel_picks_locked(grpc_lb_policy *policy, uint32_t initial_metadata_flags_mask, uint32_t initial_metadata_flags_eq, grpc_error *error); /** Try to enter a READY connectivity state */ -void grpc_lb_policy_exit_idle_locked(grpc_exec_ctx *exec_ctx, - grpc_lb_policy *policy); +void grpc_lb_policy_exit_idle_locked(grpc_lb_policy *policy); /* Call notify when the connectivity state of a channel changes from \a *state. * Updates \a *state with the new state of the policy */ void grpc_lb_policy_notify_on_state_change_locked( - grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, - grpc_connectivity_state *state, grpc_closure *closure); + grpc_lb_policy *policy, grpc_connectivity_state *state, + grpc_closure *closure); grpc_connectivity_state grpc_lb_policy_check_connectivity_locked( - grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, - grpc_error **connectivity_error); + grpc_lb_policy *policy, grpc_error **connectivity_error); /** Update \a policy with \a lb_policy_args. */ -void grpc_lb_policy_update_locked(grpc_exec_ctx *exec_ctx, - grpc_lb_policy *policy, +void grpc_lb_policy_update_locked(grpc_lb_policy *policy, const grpc_lb_policy_args *lb_policy_args); #ifdef __cplusplus diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc index 7ad322902bd..f56d3bc0512 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc @@ -25,14 +25,12 @@ #include "src/core/lib/iomgr/error.h" #include "src/core/lib/profiling/timers.h" -static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static grpc_error *init_channel_elem(grpc_channel_element *elem, grpc_channel_element_args *args) { return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem) {} +static void destroy_channel_elem(grpc_channel_element *elem) {} typedef struct { // Stats object to update. @@ -47,28 +45,24 @@ typedef struct { bool recv_initial_metadata_succeeded; } call_data; -static void on_complete_for_send(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void on_complete_for_send(void *arg, grpc_error *error) { call_data *calld = (call_data *)arg; if (error == GRPC_ERROR_NONE) { calld->send_initial_metadata_succeeded = true; } - GRPC_CLOSURE_RUN(exec_ctx, calld->original_on_complete_for_send, - GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(calld->original_on_complete_for_send, GRPC_ERROR_REF(error)); } -static void recv_initial_metadata_ready(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void recv_initial_metadata_ready(void *arg, grpc_error *error) { call_data *calld = (call_data *)arg; if (error == GRPC_ERROR_NONE) { calld->recv_initial_metadata_succeeded = true; } - GRPC_CLOSURE_RUN(exec_ctx, calld->original_recv_initial_metadata_ready, + GRPC_CLOSURE_RUN(calld->original_recv_initial_metadata_ready, GRPC_ERROR_REF(error)); } -static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *init_call_elem(grpc_call_element *elem, const grpc_call_element_args *args) { call_data *calld = (call_data *)elem->call_data; // Get stats object from context and take a ref. @@ -82,7 +76,7 @@ static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, return GRPC_ERROR_NONE; } -static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, +static void destroy_call_elem(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *ignored) { call_data *calld = (call_data *)elem->call_data; @@ -97,8 +91,7 @@ static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, } static void start_transport_stream_op_batch( - grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - grpc_transport_stream_op_batch *batch) { + grpc_call_element *elem, grpc_transport_stream_op_batch *batch) { call_data *calld = (call_data *)elem->call_data; GPR_TIMER_BEGIN("clr_start_transport_stream_op_batch", 0); // Intercept send_initial_metadata. @@ -119,7 +112,7 @@ static void start_transport_stream_op_batch( &calld->recv_initial_metadata_ready; } // Chain to next filter. - grpc_call_next_op(exec_ctx, elem, batch); + grpc_call_next_op(elem, batch); GPR_TIMER_END("clr_start_transport_stream_op_batch", 0); } diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index ffd58129c6e..aa4beb359f0 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -131,12 +131,12 @@ grpc_tracer_flag grpc_lb_glb_trace = GRPC_TRACER_INITIALIZER(false, "glb"); /* add lb_token of selected subchannel (address) to the call's initial * metadata */ static grpc_error *initial_metadata_add_lb_token( - grpc_exec_ctx *exec_ctx, grpc_metadata_batch *initial_metadata, + grpc_metadata_batch *initial_metadata, grpc_linked_mdelem *lb_token_mdelem_storage, grpc_mdelem lb_token) { GPR_ASSERT(lb_token_mdelem_storage != NULL); GPR_ASSERT(!GRPC_MDISNULL(lb_token)); - return grpc_metadata_batch_add_tail(exec_ctx, initial_metadata, - lb_token_mdelem_storage, lb_token); + return grpc_metadata_batch_add_tail(initial_metadata, lb_token_mdelem_storage, + lb_token); } static void destroy_client_stats(void *arg) { @@ -182,12 +182,11 @@ typedef struct wrapped_rr_closure_arg { /* The \a on_complete closure passed as part of the pick requires keeping a * reference to its associated round robin instance. We wrap this closure in * order to unref the round robin instance upon its invocation */ -static void wrapped_rr_closure(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void wrapped_rr_closure(void *arg, grpc_error *error) { wrapped_rr_closure_arg *wc_arg = (wrapped_rr_closure_arg *)arg; GPR_ASSERT(wc_arg->wrapped_closure != NULL); - GRPC_CLOSURE_SCHED(exec_ctx, wc_arg->wrapped_closure, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(wc_arg->wrapped_closure, GRPC_ERROR_REF(error)); if (wc_arg->rr_policy != NULL) { /* if *target is NULL, no pick has been made by the RR policy (eg, all @@ -195,7 +194,7 @@ static void wrapped_rr_closure(grpc_exec_ctx *exec_ctx, void *arg, * available */ if (*wc_arg->target != NULL) { if (!GRPC_MDISNULL(wc_arg->lb_token)) { - initial_metadata_add_lb_token(exec_ctx, wc_arg->initial_metadata, + initial_metadata_add_lb_token(wc_arg->initial_metadata, wc_arg->lb_token_mdelem_storage, GRPC_MDELEM_REF(wc_arg->lb_token)); } else { @@ -215,7 +214,7 @@ static void wrapped_rr_closure(grpc_exec_ctx *exec_ctx, void *arg, if (GRPC_TRACER_ON(grpc_lb_glb_trace)) { gpr_log(GPR_INFO, "Unreffing RR %p", (void *)wc_arg->rr_policy); } - GRPC_LB_POLICY_UNREF(exec_ctx, wc_arg->rr_policy, "wrapped_rr_closure"); + GRPC_LB_POLICY_UNREF(wc_arg->rr_policy, "wrapped_rr_closure"); } GPR_ASSERT(wc_arg->free_when_done != NULL); gpr_free(wc_arg->free_when_done); @@ -453,9 +452,9 @@ static void *lb_token_copy(void *token) { ? NULL : (void *)GRPC_MDELEM_REF(grpc_mdelem{(uintptr_t)token}).payload; } -static void lb_token_destroy(grpc_exec_ctx *exec_ctx, void *token) { +static void lb_token_destroy(void *token) { if (token != NULL) { - GRPC_MDELEM_UNREF(exec_ctx, grpc_mdelem{(uintptr_t)token}); + GRPC_MDELEM_UNREF(grpc_mdelem{(uintptr_t)token}); } } static int lb_token_cmp(void *token1, void *token2) { @@ -491,7 +490,7 @@ static void parse_server(const grpc_grpclb_server *server, /* Returns addresses extracted from \a serverlist. */ static grpc_lb_addresses *process_serverlist_locked( - grpc_exec_ctx *exec_ctx, const grpc_grpclb_serverlist *serverlist) { + const grpc_grpclb_serverlist *serverlist) { size_t num_valid = 0; /* first pass: count how many are valid in order to allocate the necessary * memory in a single block */ @@ -522,9 +521,9 @@ static grpc_lb_addresses *process_serverlist_locked( strnlen(server->load_balance_token, lb_token_max_length); grpc_slice lb_token_mdstr = grpc_slice_from_copied_buffer( server->load_balance_token, lb_token_length); - user_data = (void *)grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_LB_TOKEN, - lb_token_mdstr) - .payload; + user_data = + (void *)grpc_mdelem_from_slices(GRPC_MDSTR_LB_TOKEN, lb_token_mdstr) + .payload; } else { char *uri = grpc_sockaddr_to_uri(&addr); gpr_log(GPR_INFO, @@ -546,7 +545,7 @@ static grpc_lb_addresses *process_serverlist_locked( /* Returns the backend addresses extracted from the given addresses */ static grpc_lb_addresses *extract_backend_addresses_locked( - grpc_exec_ctx *exec_ctx, const grpc_lb_addresses *addresses) { + const grpc_lb_addresses *addresses) { /* first pass: count the number of backend addresses */ size_t num_backends = 0; for (size_t i = 0; i < addresses->num_addresses; ++i) { @@ -571,8 +570,8 @@ static grpc_lb_addresses *extract_backend_addresses_locked( } static void update_lb_connectivity_status_locked( - grpc_exec_ctx *exec_ctx, glb_lb_policy *glb_policy, - grpc_connectivity_state rr_state, grpc_error *rr_state_error) { + glb_lb_policy *glb_policy, grpc_connectivity_state rr_state, + grpc_error *rr_state_error) { const grpc_connectivity_state curr_glb_state = grpc_connectivity_state_check(&glb_policy->state_tracker); @@ -623,7 +622,7 @@ static void update_lb_connectivity_status_locked( GPR_INFO, "Setting grpclb's state to %s from new RR policy %p state.", grpc_connectivity_state_name(rr_state), (void *)glb_policy->rr_policy); } - grpc_connectivity_state_set(exec_ctx, &glb_policy->state_tracker, rr_state, + grpc_connectivity_state_set(&glb_policy->state_tracker, rr_state, rr_state_error, "update_lb_connectivity_status_locked"); } @@ -634,9 +633,9 @@ static void update_lb_connectivity_status_locked( * If \a force_async is true, then we will manually schedule the * completion callback even if the pick is available immediately. */ static bool pick_from_internal_rr_locked( - grpc_exec_ctx *exec_ctx, glb_lb_policy *glb_policy, - const grpc_lb_policy_pick_args *pick_args, bool force_async, - grpc_connected_subchannel **target, wrapped_rr_closure_arg *wc_arg) { + glb_lb_policy *glb_policy, const grpc_lb_policy_pick_args *pick_args, + bool force_async, grpc_connected_subchannel **target, + wrapped_rr_closure_arg *wc_arg) { // Check for drops if we are not using fallback backend addresses. if (glb_policy->serverlist != NULL) { // Look at the index into the serverlist to see if we should drop this call. @@ -651,7 +650,7 @@ static bool pick_from_internal_rr_locked( gpr_log(GPR_INFO, "Unreffing RR for drop (0x%" PRIxPTR ")", (intptr_t)wc_arg->rr_policy); } - GRPC_LB_POLICY_UNREF(exec_ctx, wc_arg->rr_policy, "glb_pick_sync"); + GRPC_LB_POLICY_UNREF(wc_arg->rr_policy, "glb_pick_sync"); // Update client load reporting stats to indicate the number of // dropped calls. Note that we have to do this here instead of in // the client_load_reporting filter, because we do not create a @@ -662,7 +661,7 @@ static bool pick_from_internal_rr_locked( grpc_grpclb_client_stats_unref(wc_arg->client_stats); if (force_async) { GPR_ASSERT(wc_arg->wrapped_closure != NULL); - GRPC_CLOSURE_SCHED(exec_ctx, wc_arg->wrapped_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(wc_arg->wrapped_closure, GRPC_ERROR_NONE); gpr_free(wc_arg->free_when_done); return false; } @@ -672,7 +671,7 @@ static bool pick_from_internal_rr_locked( } // Pick via the RR policy. const bool pick_done = grpc_lb_policy_pick_locked( - exec_ctx, wc_arg->rr_policy, pick_args, target, wc_arg->context, + wc_arg->rr_policy, pick_args, target, wc_arg->context, (void **)&wc_arg->lb_token, &wc_arg->wrapper_closure); if (pick_done) { /* synchronous grpc_lb_policy_pick call. Unref the RR policy. */ @@ -680,9 +679,9 @@ static bool pick_from_internal_rr_locked( gpr_log(GPR_INFO, "Unreffing RR (0x%" PRIxPTR ")", (intptr_t)wc_arg->rr_policy); } - GRPC_LB_POLICY_UNREF(exec_ctx, wc_arg->rr_policy, "glb_pick_sync"); + GRPC_LB_POLICY_UNREF(wc_arg->rr_policy, "glb_pick_sync"); /* add the load reporting initial metadata */ - initial_metadata_add_lb_token(exec_ctx, pick_args->initial_metadata, + initial_metadata_add_lb_token(pick_args->initial_metadata, pick_args->lb_token_mdelem_storage, GRPC_MDELEM_REF(wc_arg->lb_token)); // Pass on client stats via context. Passes ownership of the reference. @@ -691,7 +690,7 @@ static bool pick_from_internal_rr_locked( wc_arg->context[GRPC_GRPCLB_CLIENT_STATS].destroy = destroy_client_stats; if (force_async) { GPR_ASSERT(wc_arg->wrapped_closure != NULL); - GRPC_CLOSURE_SCHED(exec_ctx, wc_arg->wrapped_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(wc_arg->wrapped_closure, GRPC_ERROR_NONE); gpr_free(wc_arg->free_when_done); return false; } @@ -704,12 +703,11 @@ static bool pick_from_internal_rr_locked( return pick_done; } -static grpc_lb_policy_args *lb_policy_args_create(grpc_exec_ctx *exec_ctx, - glb_lb_policy *glb_policy) { +static grpc_lb_policy_args *lb_policy_args_create(glb_lb_policy *glb_policy) { grpc_lb_addresses *addresses; if (glb_policy->serverlist != NULL) { GPR_ASSERT(glb_policy->serverlist->num_servers > 0); - addresses = process_serverlist_locked(exec_ctx, glb_policy->serverlist); + addresses = process_serverlist_locked(glb_policy->serverlist); } else { // If rr_handover_locked() is invoked when we haven't received any // serverlist from the balancer, we use the fallback backends returned by @@ -729,24 +727,21 @@ static grpc_lb_policy_args *lb_policy_args_create(grpc_exec_ctx *exec_ctx, args->args = grpc_channel_args_copy_and_add_and_remove( glb_policy->args, keys_to_remove, GPR_ARRAY_SIZE(keys_to_remove), &arg, 1); - grpc_lb_addresses_destroy(exec_ctx, addresses); + grpc_lb_addresses_destroy(addresses); return args; } -static void lb_policy_args_destroy(grpc_exec_ctx *exec_ctx, - grpc_lb_policy_args *args) { - grpc_channel_args_destroy(exec_ctx, args->args); +static void lb_policy_args_destroy(grpc_lb_policy_args *args) { + grpc_channel_args_destroy(args->args); gpr_free(args); } -static void glb_rr_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, - void *arg, grpc_error *error); -static void create_rr_locked(grpc_exec_ctx *exec_ctx, glb_lb_policy *glb_policy, +static void glb_rr_connectivity_changed_locked(void *arg, grpc_error *error); +static void create_rr_locked(glb_lb_policy *glb_policy, grpc_lb_policy_args *args) { GPR_ASSERT(glb_policy->rr_policy == NULL); - grpc_lb_policy *new_rr_policy = - grpc_lb_policy_create(exec_ctx, "round_robin", args); + grpc_lb_policy *new_rr_policy = grpc_lb_policy_create("round_robin", args); if (new_rr_policy == NULL) { gpr_log(GPR_ERROR, "Failure creating a RoundRobin policy for serverlist update with " @@ -760,16 +755,14 @@ static void create_rr_locked(grpc_exec_ctx *exec_ctx, glb_lb_policy *glb_policy, glb_policy->rr_policy = new_rr_policy; grpc_error *rr_state_error = NULL; const grpc_connectivity_state rr_state = - grpc_lb_policy_check_connectivity_locked(exec_ctx, glb_policy->rr_policy, + grpc_lb_policy_check_connectivity_locked(glb_policy->rr_policy, &rr_state_error); /* Connectivity state is a function of the RR policy updated/created */ - update_lb_connectivity_status_locked(exec_ctx, glb_policy, rr_state, - rr_state_error); + update_lb_connectivity_status_locked(glb_policy, rr_state, rr_state_error); /* Add the gRPC LB's interested_parties pollset_set to that of the newly * created RR policy. This will make the RR policy progress upon activity on * gRPC LB, which in turn is tied to the application's call */ - grpc_pollset_set_add_pollset_set(exec_ctx, - glb_policy->rr_policy->interested_parties, + grpc_pollset_set_add_pollset_set(glb_policy->rr_policy->interested_parties, glb_policy->base.interested_parties); /* Allocate the data for the tracking of the new RR policy's connectivity. @@ -784,10 +777,10 @@ static void create_rr_locked(grpc_exec_ctx *exec_ctx, glb_lb_policy *glb_policy, /* Subscribe to changes to the connectivity of the new RR */ GRPC_LB_POLICY_WEAK_REF(&glb_policy->base, "glb_rr_connectivity_cb"); - grpc_lb_policy_notify_on_state_change_locked(exec_ctx, glb_policy->rr_policy, + grpc_lb_policy_notify_on_state_change_locked(glb_policy->rr_policy, &rr_connectivity->state, &rr_connectivity->on_change); - grpc_lb_policy_exit_idle_locked(exec_ctx, glb_policy->rr_policy); + grpc_lb_policy_exit_idle_locked(glb_policy->rr_policy); /* Update picks and pings in wait */ pending_pick *pp; @@ -801,7 +794,7 @@ static void create_rr_locked(grpc_exec_ctx *exec_ctx, glb_lb_policy *glb_policy, gpr_log(GPR_INFO, "Pending pick about to (async) PICK from %p", (void *)glb_policy->rr_policy); } - pick_from_internal_rr_locked(exec_ctx, glb_policy, &pp->pick_args, + pick_from_internal_rr_locked(glb_policy, &pp->pick_args, true /* force_async */, pp->target, &pp->wrapped_on_complete_arg); } @@ -815,40 +808,37 @@ static void create_rr_locked(grpc_exec_ctx *exec_ctx, glb_lb_policy *glb_policy, gpr_log(GPR_INFO, "Pending ping about to PING from 0x%" PRIxPTR "", (intptr_t)glb_policy->rr_policy); } - grpc_lb_policy_ping_one_locked(exec_ctx, glb_policy->rr_policy, + grpc_lb_policy_ping_one_locked(glb_policy->rr_policy, &pping->wrapped_notify_arg.wrapper_closure); } } /* glb_policy->rr_policy may be NULL (initial handover) */ -static void rr_handover_locked(grpc_exec_ctx *exec_ctx, - glb_lb_policy *glb_policy) { +static void rr_handover_locked(glb_lb_policy *glb_policy) { if (glb_policy->shutting_down) return; - grpc_lb_policy_args *args = lb_policy_args_create(exec_ctx, glb_policy); + grpc_lb_policy_args *args = lb_policy_args_create(glb_policy); GPR_ASSERT(args != NULL); if (glb_policy->rr_policy != NULL) { if (GRPC_TRACER_ON(grpc_lb_glb_trace)) { gpr_log(GPR_DEBUG, "Updating Round Robin policy (%p)", (void *)glb_policy->rr_policy); } - grpc_lb_policy_update_locked(exec_ctx, glb_policy->rr_policy, args); + grpc_lb_policy_update_locked(glb_policy->rr_policy, args); } else { - create_rr_locked(exec_ctx, glb_policy, args); + create_rr_locked(glb_policy, args); if (GRPC_TRACER_ON(grpc_lb_glb_trace)) { gpr_log(GPR_DEBUG, "Created new Round Robin policy (%p)", (void *)glb_policy->rr_policy); } } - lb_policy_args_destroy(exec_ctx, args); + lb_policy_args_destroy(args); } -static void glb_rr_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, - void *arg, grpc_error *error) { +static void glb_rr_connectivity_changed_locked(void *arg, grpc_error *error) { rr_connectivity_data *rr_connectivity = (rr_connectivity_data *)arg; glb_lb_policy *glb_policy = rr_connectivity->glb_policy; if (glb_policy->shutting_down) { - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, - "glb_rr_connectivity_cb"); + GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "glb_rr_connectivity_cb"); gpr_free(rr_connectivity); return; } @@ -856,25 +846,22 @@ static void glb_rr_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, /* An RR policy that has transitioned into the SHUTDOWN connectivity state * should not be considered for picks or updates: the SHUTDOWN state is a * sink, policies can't transition back from it. .*/ - GRPC_LB_POLICY_UNREF(exec_ctx, glb_policy->rr_policy, - "rr_connectivity_shutdown"); + GRPC_LB_POLICY_UNREF(glb_policy->rr_policy, "rr_connectivity_shutdown"); glb_policy->rr_policy = NULL; - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, - "glb_rr_connectivity_cb"); + GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "glb_rr_connectivity_cb"); gpr_free(rr_connectivity); return; } /* rr state != SHUTDOWN && !glb_policy->shutting down: biz as usual */ - update_lb_connectivity_status_locked( - exec_ctx, glb_policy, rr_connectivity->state, GRPC_ERROR_REF(error)); + update_lb_connectivity_status_locked(glb_policy, rr_connectivity->state, + GRPC_ERROR_REF(error)); /* Resubscribe. Reuse the "glb_rr_connectivity_cb" weak ref. */ - grpc_lb_policy_notify_on_state_change_locked(exec_ctx, glb_policy->rr_policy, + grpc_lb_policy_notify_on_state_change_locked(glb_policy->rr_policy, &rr_connectivity->state, &rr_connectivity->on_change); } -static void destroy_balancer_name(grpc_exec_ctx *exec_ctx, - void *balancer_name) { +static void destroy_balancer_name(void *balancer_name) { gpr_free(balancer_name); } @@ -901,7 +888,7 @@ static int balancer_name_cmp_fn(void *a, void *b) { * above the grpclb policy. * - \a args: other args inherited from the grpclb policy. */ static grpc_channel_args *build_lb_channel_args( - grpc_exec_ctx *exec_ctx, const grpc_lb_addresses *addresses, + const grpc_lb_addresses *addresses, grpc_fake_resolver_response_generator *response_generator, const grpc_channel_args *args) { size_t num_grpclb_addrs = 0; @@ -944,7 +931,7 @@ static grpc_channel_args *build_lb_channel_args( gpr_free(targets_info_entries); grpc_channel_args *lb_channel_args = - grpc_lb_policy_grpclb_build_lb_channel_args(exec_ctx, targets_info, + grpc_lb_policy_grpclb_build_lb_channel_args(targets_info, response_generator, args); grpc_arg lb_channel_addresses_arg = @@ -952,34 +939,34 @@ static grpc_channel_args *build_lb_channel_args( grpc_channel_args *result = grpc_channel_args_copy_and_add( lb_channel_args, &lb_channel_addresses_arg, 1); - grpc_slice_hash_table_unref(exec_ctx, targets_info); - grpc_channel_args_destroy(exec_ctx, lb_channel_args); - grpc_lb_addresses_destroy(exec_ctx, lb_addresses); + grpc_slice_hash_table_unref(targets_info); + grpc_channel_args_destroy(lb_channel_args); + grpc_lb_addresses_destroy(lb_addresses); return result; } -static void glb_destroy(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { +static void glb_destroy(grpc_lb_policy *pol) { glb_lb_policy *glb_policy = (glb_lb_policy *)pol; GPR_ASSERT(glb_policy->pending_picks == NULL); GPR_ASSERT(glb_policy->pending_pings == NULL); gpr_free((void *)glb_policy->server_name); - grpc_channel_args_destroy(exec_ctx, glb_policy->args); + grpc_channel_args_destroy(glb_policy->args); if (glb_policy->client_stats != NULL) { grpc_grpclb_client_stats_unref(glb_policy->client_stats); } - grpc_connectivity_state_destroy(exec_ctx, &glb_policy->state_tracker); + grpc_connectivity_state_destroy(&glb_policy->state_tracker); if (glb_policy->serverlist != NULL) { grpc_grpclb_destroy_serverlist(glb_policy->serverlist); } if (glb_policy->fallback_backend_addresses != NULL) { - grpc_lb_addresses_destroy(exec_ctx, glb_policy->fallback_backend_addresses); + grpc_lb_addresses_destroy(glb_policy->fallback_backend_addresses); } grpc_fake_resolver_response_generator_unref(glb_policy->response_generator); grpc_subchannel_index_unref(); gpr_free(glb_policy); } -static void glb_shutdown_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { +static void glb_shutdown_locked(grpc_lb_policy *pol) { glb_lb_policy *glb_policy = (glb_lb_policy *)pol; glb_policy->shutting_down = true; @@ -997,11 +984,11 @@ static void glb_shutdown_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { /* lb_on_server_status_received will pick up the cancel and clean up */ } if (glb_policy->retry_timer_active) { - grpc_timer_cancel(exec_ctx, &glb_policy->lb_call_retry_timer); + grpc_timer_cancel(&glb_policy->lb_call_retry_timer); glb_policy->retry_timer_active = false; } if (glb_policy->fallback_timer_active) { - grpc_timer_cancel(exec_ctx, &glb_policy->lb_fallback_timer); + grpc_timer_cancel(&glb_policy->lb_fallback_timer); glb_policy->fallback_timer_active = false; } @@ -1010,7 +997,7 @@ static void glb_shutdown_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { pending_ping *pping = glb_policy->pending_pings; glb_policy->pending_pings = NULL; if (glb_policy->rr_policy != NULL) { - GRPC_LB_POLICY_UNREF(exec_ctx, glb_policy->rr_policy, "glb_shutdown"); + GRPC_LB_POLICY_UNREF(glb_policy->rr_policy, "glb_shutdown"); } // We destroy the LB channel here because // glb_lb_channel_on_connectivity_changed_cb needs a valid glb_policy @@ -1021,20 +1008,20 @@ static void glb_shutdown_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { glb_policy->lb_channel = NULL; } grpc_connectivity_state_set( - exec_ctx, &glb_policy->state_tracker, GRPC_CHANNEL_SHUTDOWN, + &glb_policy->state_tracker, GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Channel Shutdown"), "glb_shutdown"); while (pp != NULL) { pending_pick *next = pp->next; *pp->target = NULL; - GRPC_CLOSURE_SCHED(exec_ctx, &pp->wrapped_on_complete_arg.wrapper_closure, + GRPC_CLOSURE_SCHED(&pp->wrapped_on_complete_arg.wrapper_closure, GRPC_ERROR_NONE); pp = next; } while (pping != NULL) { pending_ping *next = pping->next; - GRPC_CLOSURE_SCHED(exec_ctx, &pping->wrapped_notify_arg.wrapper_closure, + GRPC_CLOSURE_SCHED(&pping->wrapped_notify_arg.wrapper_closure, GRPC_ERROR_NONE); pping = next; } @@ -1050,7 +1037,7 @@ static void glb_shutdown_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { // - Otherwise, without an RR instance, picks stay pending at this policy's // level (grpclb), inside the glb_policy->pending_picks list. To cancel these, // we invoke the completion closure and set *target to NULL right here. -static void glb_cancel_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, +static void glb_cancel_pick_locked(grpc_lb_policy *pol, grpc_connected_subchannel **target, grpc_error *error) { glb_lb_policy *glb_policy = (glb_lb_policy *)pol; @@ -1060,7 +1047,7 @@ static void glb_cancel_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, pending_pick *next = pp->next; if (pp->target == target) { *target = NULL; - GRPC_CLOSURE_SCHED(exec_ctx, &pp->wrapped_on_complete_arg.wrapper_closure, + GRPC_CLOSURE_SCHED(&pp->wrapped_on_complete_arg.wrapper_closure, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Pick Cancelled", &error, 1)); } else { @@ -1070,7 +1057,7 @@ static void glb_cancel_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, pp = next; } if (glb_policy->rr_policy != NULL) { - grpc_lb_policy_cancel_pick_locked(exec_ctx, glb_policy->rr_policy, target, + grpc_lb_policy_cancel_pick_locked(glb_policy->rr_policy, target, GRPC_ERROR_REF(error)); } GRPC_ERROR_UNREF(error); @@ -1086,8 +1073,7 @@ static void glb_cancel_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, // - Otherwise, without an RR instance, picks stay pending at this policy's // level (grpclb), inside the glb_policy->pending_picks list. To cancel these, // we invoke the completion closure and set *target to NULL right here. -static void glb_cancel_picks_locked(grpc_exec_ctx *exec_ctx, - grpc_lb_policy *pol, +static void glb_cancel_picks_locked(grpc_lb_policy *pol, uint32_t initial_metadata_flags_mask, uint32_t initial_metadata_flags_eq, grpc_error *error) { @@ -1098,7 +1084,7 @@ static void glb_cancel_picks_locked(grpc_exec_ctx *exec_ctx, pending_pick *next = pp->next; if ((pp->pick_args.initial_metadata_flags & initial_metadata_flags_mask) == initial_metadata_flags_eq) { - GRPC_CLOSURE_SCHED(exec_ctx, &pp->wrapped_on_complete_arg.wrapper_closure, + GRPC_CLOSURE_SCHED(&pp->wrapped_on_complete_arg.wrapper_closure, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Pick Cancelled", &error, 1)); } else { @@ -1109,52 +1095,49 @@ static void glb_cancel_picks_locked(grpc_exec_ctx *exec_ctx, } if (glb_policy->rr_policy != NULL) { grpc_lb_policy_cancel_picks_locked( - exec_ctx, glb_policy->rr_policy, initial_metadata_flags_mask, + glb_policy->rr_policy, initial_metadata_flags_mask, initial_metadata_flags_eq, GRPC_ERROR_REF(error)); } GRPC_ERROR_UNREF(error); } -static void lb_on_fallback_timer_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error); -static void query_for_backends_locked(grpc_exec_ctx *exec_ctx, - glb_lb_policy *glb_policy); -static void start_picking_locked(grpc_exec_ctx *exec_ctx, - glb_lb_policy *glb_policy) { +static void lb_on_fallback_timer_locked(void *arg, grpc_error *error); +static void query_for_backends_locked(glb_lb_policy *glb_policy); +static void start_picking_locked(glb_lb_policy *glb_policy) { /* start a timer to fall back */ if (glb_policy->lb_fallback_timeout_ms > 0 && glb_policy->serverlist == NULL && !glb_policy->fallback_timer_active) { grpc_millis deadline = - grpc_exec_ctx_now(exec_ctx) + glb_policy->lb_fallback_timeout_ms; + grpc_exec_ctx_now() + glb_policy->lb_fallback_timeout_ms; GRPC_LB_POLICY_WEAK_REF(&glb_policy->base, "grpclb_fallback_timer"); GRPC_CLOSURE_INIT(&glb_policy->lb_on_fallback, lb_on_fallback_timer_locked, glb_policy, grpc_combiner_scheduler(glb_policy->base.combiner)); glb_policy->fallback_timer_active = true; - grpc_timer_init(exec_ctx, &glb_policy->lb_fallback_timer, deadline, + grpc_timer_init(&glb_policy->lb_fallback_timer, deadline, &glb_policy->lb_on_fallback); } glb_policy->started_picking = true; grpc_backoff_reset(&glb_policy->lb_call_backoff_state); - query_for_backends_locked(exec_ctx, glb_policy); + query_for_backends_locked(glb_policy); } -static void glb_exit_idle_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { +static void glb_exit_idle_locked(grpc_lb_policy *pol) { glb_lb_policy *glb_policy = (glb_lb_policy *)pol; if (!glb_policy->started_picking) { - start_picking_locked(exec_ctx, glb_policy); + start_picking_locked(glb_policy); } } -static int glb_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, +static int glb_pick_locked(grpc_lb_policy *pol, const grpc_lb_policy_pick_args *pick_args, grpc_connected_subchannel **target, grpc_call_context_element *context, void **user_data, grpc_closure *on_complete) { if (pick_args->lb_token_mdelem_storage == NULL) { *target = NULL; - GRPC_CLOSURE_SCHED(exec_ctx, on_complete, + GRPC_CLOSURE_SCHED(on_complete, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "No mdelem storage for the LB token. Load reporting " "won't work without it. Failing")); @@ -1186,9 +1169,8 @@ static int glb_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, wc_arg->lb_token_mdelem_storage = pick_args->lb_token_mdelem_storage; wc_arg->initial_metadata = pick_args->initial_metadata; wc_arg->free_when_done = wc_arg; - pick_done = - pick_from_internal_rr_locked(exec_ctx, glb_policy, pick_args, - false /* force_async */, target, wc_arg); + pick_done = pick_from_internal_rr_locked( + glb_policy, pick_args, false /* force_async */, target, wc_arg); } else { if (GRPC_TRACER_ON(grpc_lb_glb_trace)) { gpr_log(GPR_DEBUG, @@ -1200,7 +1182,7 @@ static int glb_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, on_complete); if (!glb_policy->started_picking) { - start_picking_locked(exec_ctx, glb_policy); + start_picking_locked(glb_policy); } pick_done = false; } @@ -1208,37 +1190,33 @@ static int glb_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, } static grpc_connectivity_state glb_check_connectivity_locked( - grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, - grpc_error **connectivity_error) { + grpc_lb_policy *pol, grpc_error **connectivity_error) { glb_lb_policy *glb_policy = (glb_lb_policy *)pol; return grpc_connectivity_state_get(&glb_policy->state_tracker, connectivity_error); } -static void glb_ping_one_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, - grpc_closure *closure) { +static void glb_ping_one_locked(grpc_lb_policy *pol, grpc_closure *closure) { glb_lb_policy *glb_policy = (glb_lb_policy *)pol; if (glb_policy->rr_policy) { - grpc_lb_policy_ping_one_locked(exec_ctx, glb_policy->rr_policy, closure); + grpc_lb_policy_ping_one_locked(glb_policy->rr_policy, closure); } else { add_pending_ping(&glb_policy->pending_pings, closure); if (!glb_policy->started_picking) { - start_picking_locked(exec_ctx, glb_policy); + start_picking_locked(glb_policy); } } } -static void glb_notify_on_state_change_locked(grpc_exec_ctx *exec_ctx, - grpc_lb_policy *pol, +static void glb_notify_on_state_change_locked(grpc_lb_policy *pol, grpc_connectivity_state *current, grpc_closure *notify) { glb_lb_policy *glb_policy = (glb_lb_policy *)pol; - grpc_connectivity_state_notify_on_state_change( - exec_ctx, &glb_policy->state_tracker, current, notify); + grpc_connectivity_state_notify_on_state_change(&glb_policy->state_tracker, + current, notify); } -static void lb_call_on_retry_timer_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void lb_call_on_retry_timer_locked(void *arg, grpc_error *error) { glb_lb_policy *glb_policy = (glb_lb_policy *)arg; glb_policy->retry_timer_active = false; if (!glb_policy->shutting_down && error == GRPC_ERROR_NONE) { @@ -1247,27 +1225,26 @@ static void lb_call_on_retry_timer_locked(grpc_exec_ctx *exec_ctx, void *arg, (void *)glb_policy); } GPR_ASSERT(glb_policy->lb_call == NULL); - query_for_backends_locked(exec_ctx, glb_policy); + query_for_backends_locked(glb_policy); } - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, "grpclb_retry_timer"); + GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "grpclb_retry_timer"); } -static void maybe_restart_lb_call(grpc_exec_ctx *exec_ctx, - glb_lb_policy *glb_policy) { +static void maybe_restart_lb_call(glb_lb_policy *glb_policy) { if (glb_policy->started_picking && glb_policy->updating_lb_call) { if (glb_policy->retry_timer_active) { - grpc_timer_cancel(exec_ctx, &glb_policy->lb_call_retry_timer); + grpc_timer_cancel(&glb_policy->lb_call_retry_timer); } - if (!glb_policy->shutting_down) start_picking_locked(exec_ctx, glb_policy); + if (!glb_policy->shutting_down) start_picking_locked(glb_policy); glb_policy->updating_lb_call = false; } else if (!glb_policy->shutting_down) { /* if we aren't shutting down, restart the LB client call after some time */ grpc_millis next_try = - grpc_backoff_step(exec_ctx, &glb_policy->lb_call_backoff_state); + grpc_backoff_step(&glb_policy->lb_call_backoff_state); if (GRPC_TRACER_ON(grpc_lb_glb_trace)) { gpr_log(GPR_DEBUG, "Connection to LB server lost (grpclb: %p)...", (void *)glb_policy); - grpc_millis timeout = next_try - grpc_exec_ctx_now(exec_ctx); + grpc_millis timeout = next_try - grpc_exec_ctx_now(); if (timeout > 0) { gpr_log(GPR_DEBUG, "... retry_timer_active in %" PRIdPTR "ms.", timeout); @@ -1280,40 +1257,36 @@ static void maybe_restart_lb_call(grpc_exec_ctx *exec_ctx, lb_call_on_retry_timer_locked, glb_policy, grpc_combiner_scheduler(glb_policy->base.combiner)); glb_policy->retry_timer_active = true; - grpc_timer_init(exec_ctx, &glb_policy->lb_call_retry_timer, next_try, + grpc_timer_init(&glb_policy->lb_call_retry_timer, next_try, &glb_policy->lb_on_call_retry); } - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, + GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "lb_on_server_status_received_locked"); } -static void send_client_load_report_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error); +static void send_client_load_report_locked(void *arg, grpc_error *error); -static void schedule_next_client_load_report(grpc_exec_ctx *exec_ctx, - glb_lb_policy *glb_policy) { +static void schedule_next_client_load_report(glb_lb_policy *glb_policy) { const grpc_millis next_client_load_report_time = - grpc_exec_ctx_now(exec_ctx) + glb_policy->client_stats_report_interval; + grpc_exec_ctx_now() + glb_policy->client_stats_report_interval; GRPC_CLOSURE_INIT(&glb_policy->client_load_report_closure, send_client_load_report_locked, glb_policy, grpc_combiner_scheduler(glb_policy->base.combiner)); - grpc_timer_init(exec_ctx, &glb_policy->client_load_report_timer, + grpc_timer_init(&glb_policy->client_load_report_timer, next_client_load_report_time, &glb_policy->client_load_report_closure); } -static void client_load_report_done_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void client_load_report_done_locked(void *arg, grpc_error *error) { glb_lb_policy *glb_policy = (glb_lb_policy *)arg; grpc_byte_buffer_destroy(glb_policy->client_load_report_payload); glb_policy->client_load_report_payload = NULL; if (error != GRPC_ERROR_NONE || glb_policy->lb_call == NULL) { glb_policy->client_load_report_timer_pending = false; - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, - "client_load_report"); + GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "client_load_report"); return; } - schedule_next_client_load_report(exec_ctx, glb_policy); + schedule_next_client_load_report(glb_policy); } static bool load_report_counters_are_zero(grpc_grpclb_request *request) { @@ -1328,15 +1301,13 @@ static bool load_report_counters_are_zero(grpc_grpclb_request *request) { (drop_entries == NULL || drop_entries->num_entries == 0); } -static void send_client_load_report_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void send_client_load_report_locked(void *arg, grpc_error *error) { glb_lb_policy *glb_policy = (glb_lb_policy *)arg; if (error == GRPC_ERROR_CANCELLED || glb_policy->lb_call == NULL) { glb_policy->client_load_report_timer_pending = false; - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, - "client_load_report"); + GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "client_load_report"); if (glb_policy->lb_call == NULL) { - maybe_restart_lb_call(exec_ctx, glb_policy); + maybe_restart_lb_call(glb_policy); } return; } @@ -1349,7 +1320,7 @@ static void send_client_load_report_locked(grpc_exec_ctx *exec_ctx, void *arg, if (load_report_counters_are_zero(request)) { if (glb_policy->last_client_load_report_counters_were_zero) { grpc_grpclb_request_destroy(request); - schedule_next_client_load_report(exec_ctx, glb_policy); + schedule_next_client_load_report(glb_policy); return; } glb_policy->last_client_load_report_counters_were_zero = true; @@ -1359,7 +1330,7 @@ static void send_client_load_report_locked(grpc_exec_ctx *exec_ctx, void *arg, grpc_slice request_payload_slice = grpc_grpclb_request_encode(request); glb_policy->client_load_report_payload = grpc_raw_byte_buffer_create(&request_payload_slice, 1); - grpc_slice_unref_internal(exec_ctx, request_payload_slice); + grpc_slice_unref_internal(request_payload_slice); grpc_grpclb_request_destroy(request); // Send load report message. grpc_op op; @@ -1370,20 +1341,16 @@ static void send_client_load_report_locked(grpc_exec_ctx *exec_ctx, void *arg, client_load_report_done_locked, glb_policy, grpc_combiner_scheduler(glb_policy->base.combiner)); grpc_call_error call_error = grpc_call_start_batch_and_execute( - exec_ctx, glb_policy->lb_call, &op, 1, - &glb_policy->client_load_report_closure); + glb_policy->lb_call, &op, 1, &glb_policy->client_load_report_closure); if (call_error != GRPC_CALL_OK) { gpr_log(GPR_ERROR, "call_error=%d", call_error); GPR_ASSERT(GRPC_CALL_OK == call_error); } } -static void lb_on_server_status_received_locked(grpc_exec_ctx *exec_ctx, - void *arg, grpc_error *error); -static void lb_on_response_received_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error); -static void lb_call_init_locked(grpc_exec_ctx *exec_ctx, - glb_lb_policy *glb_policy) { +static void lb_on_server_status_received_locked(void *arg, grpc_error *error); +static void lb_on_response_received_locked(void *arg, grpc_error *error); +static void lb_call_init_locked(glb_lb_policy *glb_policy) { GPR_ASSERT(glb_policy->server_name != NULL); GPR_ASSERT(glb_policy->server_name[0] != '\0'); GPR_ASSERT(glb_policy->lb_call == NULL); @@ -1396,13 +1363,13 @@ static void lb_call_init_locked(grpc_exec_ctx *exec_ctx, grpc_millis deadline = glb_policy->lb_call_timeout_ms == 0 ? GRPC_MILLIS_INF_FUTURE - : grpc_exec_ctx_now(exec_ctx) + glb_policy->lb_call_timeout_ms; + : grpc_exec_ctx_now() + glb_policy->lb_call_timeout_ms; glb_policy->lb_call = grpc_channel_create_pollset_set_call( - exec_ctx, glb_policy->lb_channel, NULL, GRPC_PROPAGATE_DEFAULTS, + glb_policy->lb_channel, NULL, GRPC_PROPAGATE_DEFAULTS, glb_policy->base.interested_parties, GRPC_MDSTR_SLASH_GRPC_DOT_LB_DOT_V1_DOT_LOADBALANCER_SLASH_BALANCELOAD, &host, deadline, NULL); - grpc_slice_unref_internal(exec_ctx, host); + grpc_slice_unref_internal(host); if (glb_policy->client_stats != NULL) { grpc_grpclb_client_stats_unref(glb_policy->client_stats); @@ -1417,7 +1384,7 @@ static void lb_call_init_locked(grpc_exec_ctx *exec_ctx, grpc_slice request_payload_slice = grpc_grpclb_request_encode(request); glb_policy->lb_request_payload = grpc_raw_byte_buffer_create(&request_payload_slice, 1); - grpc_slice_unref_internal(exec_ctx, request_payload_slice); + grpc_slice_unref_internal(request_payload_slice); grpc_grpclb_request_destroy(request); GRPC_CLOSURE_INIT(&glb_policy->lb_on_server_status_received, @@ -1438,8 +1405,7 @@ static void lb_call_init_locked(grpc_exec_ctx *exec_ctx, glb_policy->last_client_load_report_counters_were_zero = false; } -static void lb_call_destroy_locked(grpc_exec_ctx *exec_ctx, - glb_lb_policy *glb_policy) { +static void lb_call_destroy_locked(glb_lb_policy *glb_policy) { GPR_ASSERT(glb_policy->lb_call != NULL); grpc_call_unref(glb_policy->lb_call); glb_policy->lb_call = NULL; @@ -1448,22 +1414,21 @@ static void lb_call_destroy_locked(grpc_exec_ctx *exec_ctx, grpc_metadata_array_destroy(&glb_policy->lb_trailing_metadata_recv); grpc_byte_buffer_destroy(glb_policy->lb_request_payload); - grpc_slice_unref_internal(exec_ctx, glb_policy->lb_call_status_details); + grpc_slice_unref_internal(glb_policy->lb_call_status_details); if (glb_policy->client_load_report_timer_pending) { - grpc_timer_cancel(exec_ctx, &glb_policy->client_load_report_timer); + grpc_timer_cancel(&glb_policy->client_load_report_timer); } } /* * Auxiliary functions and LB client callbacks. */ -static void query_for_backends_locked(grpc_exec_ctx *exec_ctx, - glb_lb_policy *glb_policy) { +static void query_for_backends_locked(glb_lb_policy *glb_policy) { GPR_ASSERT(glb_policy->lb_channel != NULL); if (glb_policy->shutting_down) return; - lb_call_init_locked(exec_ctx, glb_policy); + lb_call_init_locked(glb_policy); if (GRPC_TRACER_ON(grpc_lb_glb_trace)) { gpr_log(GPR_INFO, @@ -1495,8 +1460,8 @@ static void query_for_backends_locked(grpc_exec_ctx *exec_ctx, op->flags = 0; op->reserved = NULL; op++; - call_error = grpc_call_start_batch_and_execute(exec_ctx, glb_policy->lb_call, - ops, (size_t)(op - ops), NULL); + call_error = grpc_call_start_batch_and_execute(glb_policy->lb_call, ops, + (size_t)(op - ops), NULL); GPR_ASSERT(GRPC_CALL_OK == call_error); op = ops; @@ -1514,7 +1479,7 @@ static void query_for_backends_locked(grpc_exec_ctx *exec_ctx, GRPC_LB_POLICY_WEAK_REF(&glb_policy->base, "lb_on_server_status_received_locked"); call_error = grpc_call_start_batch_and_execute( - exec_ctx, glb_policy->lb_call, ops, (size_t)(op - ops), + glb_policy->lb_call, ops, (size_t)(op - ops), &glb_policy->lb_on_server_status_received); GPR_ASSERT(GRPC_CALL_OK == call_error); @@ -1528,13 +1493,12 @@ static void query_for_backends_locked(grpc_exec_ctx *exec_ctx, * lb_on_response_received_locked */ GRPC_LB_POLICY_WEAK_REF(&glb_policy->base, "lb_on_response_received_locked"); call_error = grpc_call_start_batch_and_execute( - exec_ctx, glb_policy->lb_call, ops, (size_t)(op - ops), + glb_policy->lb_call, ops, (size_t)(op - ops), &glb_policy->lb_on_response_received); GPR_ASSERT(GRPC_CALL_OK == call_error); } -static void lb_on_response_received_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void lb_on_response_received_locked(void *arg, grpc_error *error) { glb_lb_policy *glb_policy = (glb_lb_policy *)arg; grpc_op ops[2]; memset(ops, 0, sizeof(ops)); @@ -1568,7 +1532,7 @@ static void lb_on_response_received_locked(grpc_exec_ctx *exec_ctx, void *arg, * send_client_load_report_locked() */ glb_policy->client_load_report_timer_pending = true; GRPC_LB_POLICY_WEAK_REF(&glb_policy->base, "client_load_report"); - schedule_next_client_load_report(exec_ctx, glb_policy); + schedule_next_client_load_report(glb_policy); } else if (GRPC_TRACER_ON(grpc_lb_glb_trace)) { gpr_log(GPR_INFO, "received initial LB response message; " @@ -1608,11 +1572,10 @@ static void lb_on_response_received_locked(grpc_exec_ctx *exec_ctx, void *arg, grpc_grpclb_destroy_serverlist(glb_policy->serverlist); } else { /* or dispose of the fallback */ - grpc_lb_addresses_destroy(exec_ctx, - glb_policy->fallback_backend_addresses); + grpc_lb_addresses_destroy(glb_policy->fallback_backend_addresses); glb_policy->fallback_backend_addresses = NULL; if (glb_policy->fallback_timer_active) { - grpc_timer_cancel(exec_ctx, &glb_policy->lb_fallback_timer); + grpc_timer_cancel(&glb_policy->lb_fallback_timer); glb_policy->fallback_timer_active = false; } } @@ -1621,7 +1584,7 @@ static void lb_on_response_received_locked(grpc_exec_ctx *exec_ctx, void *arg, * update or in glb_destroy() */ glb_policy->serverlist = serverlist; glb_policy->serverlist_index = 0; - rr_handover_locked(exec_ctx, glb_policy); + rr_handover_locked(glb_policy); } } else { if (GRPC_TRACER_ON(grpc_lb_glb_trace)) { @@ -1634,7 +1597,7 @@ static void lb_on_response_received_locked(grpc_exec_ctx *exec_ctx, void *arg, grpc_dump_slice(response_slice, GPR_DUMP_ASCII | GPR_DUMP_HEX)); } } - grpc_slice_unref_internal(exec_ctx, response_slice); + grpc_slice_unref_internal(response_slice); if (!glb_policy->shutting_down) { /* keep listening for serverlist updates */ op->op = GRPC_OP_RECV_MESSAGE; @@ -1645,23 +1608,22 @@ static void lb_on_response_received_locked(grpc_exec_ctx *exec_ctx, void *arg, /* reuse the "lb_on_response_received_locked" weak ref taken in * query_for_backends_locked() */ const grpc_call_error call_error = grpc_call_start_batch_and_execute( - exec_ctx, glb_policy->lb_call, ops, (size_t)(op - ops), + glb_policy->lb_call, ops, (size_t)(op - ops), &glb_policy->lb_on_response_received); /* loop */ GPR_ASSERT(GRPC_CALL_OK == call_error); } else { - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, + GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "lb_on_response_received_locked_shutdown"); } } else { /* empty payload: call cancelled. */ /* dispose of the "lb_on_response_received_locked" weak ref taken in * query_for_backends_locked() and reused in every reception loop */ - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, + GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "lb_on_response_received_locked_empty_payload"); } } -static void lb_on_fallback_timer_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void lb_on_fallback_timer_locked(void *arg, grpc_error *error) { glb_lb_policy *glb_policy = (glb_lb_policy *)arg; glb_policy->fallback_timer_active = false; /* If we receive a serverlist after the timer fires but before this callback @@ -1674,15 +1636,13 @@ static void lb_on_fallback_timer_locked(grpc_exec_ctx *exec_ctx, void *arg, (void *)glb_policy); } GPR_ASSERT(glb_policy->fallback_backend_addresses != NULL); - rr_handover_locked(exec_ctx, glb_policy); + rr_handover_locked(glb_policy); } } - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, - "grpclb_fallback_timer"); + GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "grpclb_fallback_timer"); } -static void lb_on_server_status_received_locked(grpc_exec_ctx *exec_ctx, - void *arg, grpc_error *error) { +static void lb_on_server_status_received_locked(void *arg, grpc_error *error) { glb_lb_policy *glb_policy = (glb_lb_policy *)arg; GPR_ASSERT(glb_policy->lb_call != NULL); if (GRPC_TRACER_ON(grpc_lb_glb_trace)) { @@ -1696,29 +1656,28 @@ static void lb_on_server_status_received_locked(grpc_exec_ctx *exec_ctx, gpr_free(status_details); } /* We need to perform cleanups no matter what. */ - lb_call_destroy_locked(exec_ctx, glb_policy); + lb_call_destroy_locked(glb_policy); // If the load report timer is still pending, we wait for it to be // called before restarting the call. Otherwise, we restart the call // here. if (!glb_policy->client_load_report_timer_pending) { - maybe_restart_lb_call(exec_ctx, glb_policy); + maybe_restart_lb_call(glb_policy); } } -static void fallback_update_locked(grpc_exec_ctx *exec_ctx, - glb_lb_policy *glb_policy, +static void fallback_update_locked(glb_lb_policy *glb_policy, const grpc_lb_addresses *addresses) { GPR_ASSERT(glb_policy->fallback_backend_addresses != NULL); - grpc_lb_addresses_destroy(exec_ctx, glb_policy->fallback_backend_addresses); + grpc_lb_addresses_destroy(glb_policy->fallback_backend_addresses); glb_policy->fallback_backend_addresses = - extract_backend_addresses_locked(exec_ctx, addresses); + extract_backend_addresses_locked(addresses); if (glb_policy->lb_fallback_timeout_ms > 0 && !glb_policy->fallback_timer_active) { - rr_handover_locked(exec_ctx, glb_policy); + rr_handover_locked(glb_policy); } } -static void glb_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, +static void glb_update_locked(grpc_lb_policy *policy, const grpc_lb_policy_args *args) { glb_lb_policy *glb_policy = (glb_lb_policy *)policy; const grpc_arg *arg = @@ -1728,7 +1687,7 @@ static void glb_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, // If we don't have a current channel to the LB, go into TRANSIENT // FAILURE. grpc_connectivity_state_set( - exec_ctx, &glb_policy->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + &glb_policy->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Missing update in args"), "glb_update_missing"); } else { @@ -1745,16 +1704,16 @@ static void glb_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, // If a non-empty serverlist hasn't been received from the balancer, // propagate the update to fallback_backend_addresses. if (glb_policy->serverlist == NULL) { - fallback_update_locked(exec_ctx, glb_policy, addresses); + fallback_update_locked(glb_policy, addresses); } GPR_ASSERT(glb_policy->lb_channel != NULL); // Propagate updates to the LB channel (pick_first) through the fake // resolver. grpc_channel_args *lb_channel_args = build_lb_channel_args( - exec_ctx, addresses, glb_policy->response_generator, args->args); + addresses, glb_policy->response_generator, args->args); grpc_fake_resolver_response_generator_set_response( - exec_ctx, glb_policy->response_generator, lb_channel_args); - grpc_channel_args_destroy(exec_ctx, lb_channel_args); + glb_policy->response_generator, lb_channel_args); + grpc_channel_args_destroy(lb_channel_args); // Start watching the LB channel connectivity for connection, if not // already doing so. if (!glb_policy->watching_lb_channel) { @@ -1766,9 +1725,8 @@ static void glb_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, glb_policy->watching_lb_channel = true; GRPC_LB_POLICY_WEAK_REF(&glb_policy->base, "watch_lb_channel_connectivity"); grpc_client_channel_watch_connectivity_state( - exec_ctx, client_channel_elem, - grpc_polling_entity_create_from_pollset_set( - glb_policy->base.interested_parties), + client_channel_elem, grpc_polling_entity_create_from_pollset_set( + glb_policy->base.interested_parties), &glb_policy->lb_channel_connectivity, &glb_policy->lb_channel_on_connectivity_changed, NULL); } @@ -1777,8 +1735,7 @@ static void glb_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, // Invoked as part of the update process. It continues watching the LB channel // until it shuts down or becomes READY. It's invoked even if the LB channel // stayed READY throughout the update (for example if the update is identical). -static void glb_lb_channel_on_connectivity_changed_cb(grpc_exec_ctx *exec_ctx, - void *arg, +static void glb_lb_channel_on_connectivity_changed_cb(void *arg, grpc_error *error) { glb_lb_policy *glb_policy = (glb_lb_policy *)arg; if (glb_policy->shutting_down) goto done; @@ -1795,9 +1752,8 @@ static void glb_lb_channel_on_connectivity_changed_cb(grpc_exec_ctx *exec_ctx, grpc_channel_get_channel_stack(glb_policy->lb_channel)); GPR_ASSERT(client_channel_elem->filter == &grpc_client_channel_filter); grpc_client_channel_watch_connectivity_state( - exec_ctx, client_channel_elem, - grpc_polling_entity_create_from_pollset_set( - glb_policy->base.interested_parties), + client_channel_elem, grpc_polling_entity_create_from_pollset_set( + glb_policy->base.interested_parties), &glb_policy->lb_channel_connectivity, &glb_policy->lb_channel_on_connectivity_changed, NULL); break; @@ -1815,16 +1771,16 @@ static void glb_lb_channel_on_connectivity_changed_cb(grpc_exec_ctx *exec_ctx, // lb_call. } else if (glb_policy->started_picking && !glb_policy->shutting_down) { if (glb_policy->retry_timer_active) { - grpc_timer_cancel(exec_ctx, &glb_policy->lb_call_retry_timer); + grpc_timer_cancel(&glb_policy->lb_call_retry_timer); glb_policy->retry_timer_active = false; } - start_picking_locked(exec_ctx, glb_policy); + start_picking_locked(glb_policy); } /* fallthrough */ case GRPC_CHANNEL_SHUTDOWN: done: glb_policy->watching_lb_channel = false; - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, + GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "watch_lb_channel_connectivity_cb_shutdown"); break; } @@ -1843,8 +1799,7 @@ static const grpc_lb_policy_vtable glb_lb_policy_vtable = { glb_notify_on_state_change_locked, glb_update_locked}; -static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx, - grpc_lb_policy_factory *factory, +static grpc_lb_policy *glb_create(grpc_lb_policy_factory *factory, grpc_lb_policy_args *args) { /* Count the number of gRPC-LB addresses. There must be at least one. */ const grpc_arg *arg = @@ -1865,7 +1820,7 @@ static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx, arg = grpc_channel_args_find(args->args, GRPC_ARG_SERVER_URI); GPR_ASSERT(arg != NULL); GPR_ASSERT(arg->type == GRPC_ARG_STRING); - grpc_uri *uri = grpc_uri_parse(exec_ctx, arg->value.string, true); + grpc_uri *uri = grpc_uri_parse(arg->value.string, true); GPR_ASSERT(uri->path[0] != '\0'); glb_policy->server_name = gpr_strdup(uri->path[0] == '/' ? uri->path + 1 : uri->path); @@ -1897,26 +1852,26 @@ static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx, /* Extract the backend addresses (may be empty) from the resolver for * fallback. */ glb_policy->fallback_backend_addresses = - extract_backend_addresses_locked(exec_ctx, addresses); + extract_backend_addresses_locked(addresses); /* Create a client channel over them to communicate with a LB service */ glb_policy->response_generator = grpc_fake_resolver_response_generator_create(); grpc_channel_args *lb_channel_args = build_lb_channel_args( - exec_ctx, addresses, glb_policy->response_generator, args->args); + addresses, glb_policy->response_generator, args->args); char *uri_str; gpr_asprintf(&uri_str, "fake:///%s", glb_policy->server_name); glb_policy->lb_channel = grpc_lb_policy_grpclb_create_lb_channel( - exec_ctx, uri_str, args->client_channel_factory, lb_channel_args); + uri_str, args->client_channel_factory, lb_channel_args); /* Propagate initial resolution */ grpc_fake_resolver_response_generator_set_response( - exec_ctx, glb_policy->response_generator, lb_channel_args); - grpc_channel_args_destroy(exec_ctx, lb_channel_args); + glb_policy->response_generator, lb_channel_args); + grpc_channel_args_destroy(lb_channel_args); gpr_free(uri_str); if (glb_policy->lb_channel == NULL) { gpr_free((void *)glb_policy->server_name); - grpc_channel_args_destroy(exec_ctx, glb_policy->args); + grpc_channel_args_destroy(glb_policy->args); gpr_free(glb_policy); return NULL; } @@ -1947,7 +1902,7 @@ grpc_lb_policy_factory *grpc_glb_lb_factory_create() { // Only add client_load_reporting filter if the grpclb LB policy is used. static bool maybe_add_client_load_reporting_filter( - grpc_exec_ctx *exec_ctx, grpc_channel_stack_builder *builder, void *arg) { + grpc_channel_stack_builder *builder, void *arg) { const grpc_channel_args *args = grpc_channel_stack_builder_get_channel_arguments(builder); const grpc_arg *channel_arg = diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc index f2967182e2d..8871f10d14b 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc @@ -26,17 +26,17 @@ #include "src/core/lib/support/string.h" grpc_channel *grpc_lb_policy_grpclb_create_lb_channel( - grpc_exec_ctx *exec_ctx, const char *lb_service_target_addresses, + const char *lb_service_target_addresses, grpc_client_channel_factory *client_channel_factory, grpc_channel_args *args) { grpc_channel *lb_channel = grpc_client_channel_factory_create_channel( - exec_ctx, client_channel_factory, lb_service_target_addresses, + client_channel_factory, lb_service_target_addresses, GRPC_CLIENT_CHANNEL_TYPE_LOAD_BALANCING, args); return lb_channel; } grpc_channel_args *grpc_lb_policy_grpclb_build_lb_channel_args( - grpc_exec_ctx *exec_ctx, grpc_slice_hash_table *targets_info, + grpc_slice_hash_table *targets_info, grpc_fake_resolver_response_generator *response_generator, const grpc_channel_args *args) { const grpc_arg to_add[] = { diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h index e8599d1f51c..c3d2de82228 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h @@ -35,12 +35,12 @@ extern "C" { * \a client_channel_factory will be used for the creation of the LB channel, * alongside the channel args passed in \a args. */ grpc_channel *grpc_lb_policy_grpclb_create_lb_channel( - grpc_exec_ctx *exec_ctx, const char *lb_service_target_addresses, + const char *lb_service_target_addresses, grpc_client_channel_factory *client_channel_factory, grpc_channel_args *args); grpc_channel_args *grpc_lb_policy_grpclb_build_lb_channel_args( - grpc_exec_ctx *exec_ctx, grpc_slice_hash_table *targets_info, + grpc_slice_hash_table *targets_info, grpc_fake_resolver_response_generator *response_generator, const grpc_channel_args *args); diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc index 2681b2a079c..b5a6e650b1c 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc @@ -29,7 +29,7 @@ #include "src/core/lib/support/string.h" grpc_channel *grpc_lb_policy_grpclb_create_lb_channel( - grpc_exec_ctx *exec_ctx, const char *lb_service_target_addresses, + const char *lb_service_target_addresses, grpc_client_channel_factory *client_channel_factory, grpc_channel_args *args) { grpc_channel_args *new_args = args; @@ -50,19 +50,19 @@ grpc_channel *grpc_lb_policy_grpclb_create_lb_channel( new_args = grpc_channel_args_copy_and_add_and_remove( args, keys_to_remove, GPR_ARRAY_SIZE(keys_to_remove), args_to_add, GPR_ARRAY_SIZE(args_to_add)); - grpc_channel_credentials_unref(exec_ctx, creds_sans_call_creds); + grpc_channel_credentials_unref(creds_sans_call_creds); } grpc_channel *lb_channel = grpc_client_channel_factory_create_channel( - exec_ctx, client_channel_factory, lb_service_target_addresses, + client_channel_factory, lb_service_target_addresses, GRPC_CLIENT_CHANNEL_TYPE_LOAD_BALANCING, new_args); if (channel_credentials != NULL) { - grpc_channel_args_destroy(exec_ctx, new_args); + grpc_channel_args_destroy(new_args); } return lb_channel; } grpc_channel_args *grpc_lb_policy_grpclb_build_lb_channel_args( - grpc_exec_ctx *exec_ctx, grpc_slice_hash_table *targets_info, + grpc_slice_hash_table *targets_info, grpc_fake_resolver_response_generator *response_generator, const grpc_channel_args *args) { const grpc_arg to_add[] = { diff --git a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc index b07fc3b720b..5e638d9c86c 100644 --- a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +++ b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc @@ -78,20 +78,19 @@ typedef struct { grpc_connectivity_state_tracker state_tracker; } pick_first_lb_policy; -static void pf_destroy(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { +static void pf_destroy(grpc_lb_policy *pol) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; GPR_ASSERT(p->pending_picks == NULL); for (size_t i = 0; i < p->num_subchannels; i++) { - GRPC_SUBCHANNEL_UNREF(exec_ctx, p->subchannels[i], "pick_first_destroy"); + GRPC_SUBCHANNEL_UNREF(p->subchannels[i], "pick_first_destroy"); } if (p->selected != NULL) { - GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, p->selected, - "picked_first_destroy"); + GRPC_CONNECTED_SUBCHANNEL_UNREF(p->selected, "picked_first_destroy"); } - grpc_connectivity_state_destroy(exec_ctx, &p->state_tracker); + grpc_connectivity_state_destroy(&p->state_tracker); grpc_subchannel_index_unref(); if (p->pending_update_args != NULL) { - grpc_channel_args_destroy(exec_ctx, p->pending_update_args->args); + grpc_channel_args_destroy(p->pending_update_args->args); gpr_free(p->pending_update_args); } gpr_free(p->subchannels); @@ -102,34 +101,34 @@ static void pf_destroy(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { } } -static void pf_shutdown_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { +static void pf_shutdown_locked(grpc_lb_policy *pol) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; pending_pick *pp; p->shutdown = true; pp = p->pending_picks; p->pending_picks = NULL; grpc_connectivity_state_set( - exec_ctx, &p->state_tracker, GRPC_CHANNEL_SHUTDOWN, + &p->state_tracker, GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Channel shutdown"), "shutdown"); /* cancel subscription */ if (p->selected != NULL) { - grpc_connected_subchannel_notify_on_state_change( - exec_ctx, p->selected, NULL, NULL, &p->connectivity_changed); + grpc_connected_subchannel_notify_on_state_change(p->selected, NULL, NULL, + &p->connectivity_changed); } else if (p->num_subchannels > 0 && p->started_picking) { grpc_subchannel_notify_on_state_change( - exec_ctx, p->subchannels[p->checking_subchannel], NULL, NULL, + p->subchannels[p->checking_subchannel], NULL, NULL, &p->connectivity_changed); } while (pp != NULL) { pending_pick *next = pp->next; *pp->target = NULL; - GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_NONE); gpr_free(pp); pp = next; } } -static void pf_cancel_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, +static void pf_cancel_pick_locked(grpc_lb_policy *pol, grpc_connected_subchannel **target, grpc_error *error) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; @@ -140,7 +139,7 @@ static void pf_cancel_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, pending_pick *next = pp->next; if (pp->target == target) { *target = NULL; - GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, + GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Pick Cancelled", &error, 1)); gpr_free(pp); @@ -153,7 +152,7 @@ static void pf_cancel_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, GRPC_ERROR_UNREF(error); } -static void pf_cancel_picks_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, +static void pf_cancel_picks_locked(grpc_lb_policy *pol, uint32_t initial_metadata_flags_mask, uint32_t initial_metadata_flags_eq, grpc_error *error) { @@ -165,7 +164,7 @@ static void pf_cancel_picks_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, pending_pick *next = pp->next; if ((pp->initial_metadata_flags & initial_metadata_flags_mask) == initial_metadata_flags_eq) { - GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, + GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Pick Cancelled", &error, 1)); gpr_free(pp); @@ -178,8 +177,7 @@ static void pf_cancel_picks_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, GRPC_ERROR_UNREF(error); } -static void start_picking_locked(grpc_exec_ctx *exec_ctx, - pick_first_lb_policy *p) { +static void start_picking_locked(pick_first_lb_policy *p) { p->started_picking = true; if (p->subchannels != NULL) { GPR_ASSERT(p->num_subchannels > 0); @@ -187,20 +185,19 @@ static void start_picking_locked(grpc_exec_ctx *exec_ctx, p->checking_connectivity = GRPC_CHANNEL_IDLE; GRPC_LB_POLICY_WEAK_REF(&p->base, "pick_first_connectivity"); grpc_subchannel_notify_on_state_change( - exec_ctx, p->subchannels[p->checking_subchannel], - p->base.interested_parties, &p->checking_connectivity, - &p->connectivity_changed); + p->subchannels[p->checking_subchannel], p->base.interested_parties, + &p->checking_connectivity, &p->connectivity_changed); } } -static void pf_exit_idle_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { +static void pf_exit_idle_locked(grpc_lb_policy *pol) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; if (!p->started_picking) { - start_picking_locked(exec_ctx, p); + start_picking_locked(p); } } -static int pf_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, +static int pf_pick_locked(grpc_lb_policy *pol, const grpc_lb_policy_pick_args *pick_args, grpc_connected_subchannel **target, grpc_call_context_element *context, void **user_data, @@ -216,7 +213,7 @@ static int pf_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, /* No subchannel selected yet, so try again */ if (!p->started_picking) { - start_picking_locked(exec_ctx, p); + start_picking_locked(p); } pp = (pending_pick *)gpr_malloc(sizeof(*pp)); pp->next = p->pending_picks; @@ -227,50 +224,46 @@ static int pf_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, return 0; } -static void destroy_subchannels_locked(grpc_exec_ctx *exec_ctx, - pick_first_lb_policy *p) { +static void destroy_subchannels_locked(pick_first_lb_policy *p) { size_t num_subchannels = p->num_subchannels; grpc_subchannel **subchannels = p->subchannels; p->num_subchannels = 0; p->subchannels = NULL; - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &p->base, "destroy_subchannels"); + GRPC_LB_POLICY_WEAK_UNREF(&p->base, "destroy_subchannels"); for (size_t i = 0; i < num_subchannels; i++) { - GRPC_SUBCHANNEL_UNREF(exec_ctx, subchannels[i], "pick_first"); + GRPC_SUBCHANNEL_UNREF(subchannels[i], "pick_first"); } gpr_free(subchannels); } static grpc_connectivity_state pf_check_connectivity_locked( - grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, grpc_error **error) { + grpc_lb_policy *pol, grpc_error **error) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; return grpc_connectivity_state_get(&p->state_tracker, error); } -static void pf_notify_on_state_change_locked(grpc_exec_ctx *exec_ctx, - grpc_lb_policy *pol, +static void pf_notify_on_state_change_locked(grpc_lb_policy *pol, grpc_connectivity_state *current, grpc_closure *notify) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; - grpc_connectivity_state_notify_on_state_change(exec_ctx, &p->state_tracker, - current, notify); + grpc_connectivity_state_notify_on_state_change(&p->state_tracker, current, + notify); } -static void pf_ping_one_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, - grpc_closure *closure) { +static void pf_ping_one_locked(grpc_lb_policy *pol, grpc_closure *closure) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; if (p->selected) { - grpc_connected_subchannel_ping(exec_ctx, p->selected, closure); + grpc_connected_subchannel_ping(p->selected, closure); } else { - GRPC_CLOSURE_SCHED(exec_ctx, closure, + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Not connected")); } } /* unsubscribe all subchannels */ -static void stop_connectivity_watchers(grpc_exec_ctx *exec_ctx, - pick_first_lb_policy *p) { +static void stop_connectivity_watchers(pick_first_lb_policy *p) { if (p->num_subchannels > 0) { GPR_ASSERT(p->selected == NULL); if (GRPC_TRACER_ON(grpc_lb_pick_first_trace)) { @@ -278,7 +271,7 @@ static void stop_connectivity_watchers(grpc_exec_ctx *exec_ctx, (void *)p, (void *)p->subchannels[p->checking_subchannel]); } grpc_subchannel_notify_on_state_change( - exec_ctx, p->subchannels[p->checking_subchannel], NULL, NULL, + p->subchannels[p->checking_subchannel], NULL, NULL, &p->connectivity_changed); p->updating_subchannels = true; } else if (p->selected != NULL) { @@ -287,14 +280,14 @@ static void stop_connectivity_watchers(grpc_exec_ctx *exec_ctx, "Pick First %p unsubscribing from selected subchannel %p", (void *)p, (void *)p->selected); } - grpc_connected_subchannel_notify_on_state_change( - exec_ctx, p->selected, NULL, NULL, &p->connectivity_changed); + grpc_connected_subchannel_notify_on_state_change(p->selected, NULL, NULL, + &p->connectivity_changed); p->updating_selected = true; } } /* true upon success */ -static void pf_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, +static void pf_update_locked(grpc_lb_policy *policy, const grpc_lb_policy_args *args) { pick_first_lb_policy *p = (pick_first_lb_policy *)policy; const grpc_arg *arg = @@ -303,7 +296,7 @@ static void pf_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, if (p->subchannels == NULL) { // If we don't have a current subchannel list, go into TRANSIENT FAILURE. grpc_connectivity_state_set( - exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Missing update in args"), "pf_update_missing"); } else { @@ -321,10 +314,10 @@ static void pf_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, // Empty update. Unsubscribe from all current subchannels and put the // channel in TRANSIENT_FAILURE. grpc_connectivity_state_set( - exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Empty update"), "pf_update_empty"); - stop_connectivity_watchers(exec_ctx, p); + stop_connectivity_watchers(p); return; } if (GRPC_TRACER_ON(grpc_lb_pick_first_trace)) { @@ -363,7 +356,7 @@ static void pf_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, grpc_subchannel_key *ith_sc_key = grpc_subchannel_key_create(&sc_args[i]); const bool found_selected = grpc_subchannel_key_compare(p->selected_key, ith_sc_key) == 0; - grpc_subchannel_key_destroy(exec_ctx, ith_sc_key); + grpc_subchannel_key_destroy(ith_sc_key); if (found_selected) { // The currently selected subchannel is in the update: we are done. if (GRPC_TRACER_ON(grpc_lb_pick_first_trace)) { @@ -373,8 +366,7 @@ static void pf_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, (void *)p, (void *)p->selected); } for (size_t j = 0; j < sc_args_count; j++) { - grpc_channel_args_destroy(exec_ctx, - (grpc_channel_args *)sc_args[j].args); + grpc_channel_args_destroy((grpc_channel_args *)sc_args[j].args); } gpr_free(sc_args); return; @@ -391,7 +383,7 @@ static void pf_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, (void *)p); } if (p->pending_update_args != NULL) { - grpc_channel_args_destroy(exec_ctx, p->pending_update_args->args); + grpc_channel_args_destroy(p->pending_update_args->args); gpr_free(p->pending_update_args); } p->pending_update_args = @@ -408,7 +400,7 @@ static void pf_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, size_t num_new_subchannels = 0; for (size_t i = 0; i < sc_args_count; i++) { grpc_subchannel *subchannel = grpc_client_channel_factory_create_subchannel( - exec_ctx, args->client_channel_factory, &sc_args[i]); + args->client_channel_factory, &sc_args[i]); if (GRPC_TRACER_ON(grpc_lb_pick_first_trace)) { char *address_uri = grpc_sockaddr_to_uri(&addresses->addresses[i].address); @@ -417,7 +409,7 @@ static void pf_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, (void *)p, (void *)subchannel, address_uri); gpr_free(address_uri); } - grpc_channel_args_destroy(exec_ctx, (grpc_channel_args *)sc_args[i].args); + grpc_channel_args_destroy((grpc_channel_args *)sc_args[i].args); if (subchannel != NULL) new_subchannels[num_new_subchannels++] = subchannel; } gpr_free(sc_args); @@ -426,15 +418,15 @@ static void pf_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, // Empty update. Unsubscribe from all current subchannels and put the // channel in TRANSIENT_FAILURE. grpc_connectivity_state_set( - exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_CREATE_FROM_STATIC_STRING("No valid addresses in update"), "pf_update_no_valid_addresses"); - stop_connectivity_watchers(exec_ctx, p); + stop_connectivity_watchers(p); return; } /* Destroy the current subchannels. Repurpose pf_shutdown/destroy. */ - stop_connectivity_watchers(exec_ctx, p); + stop_connectivity_watchers(p); /* Save new subchannels. The switch over will happen in * pf_connectivity_changed_locked */ @@ -450,15 +442,13 @@ static void pf_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, p->checking_subchannel = 0; p->checking_connectivity = GRPC_CHANNEL_IDLE; grpc_subchannel_notify_on_state_change( - exec_ctx, p->subchannels[p->checking_subchannel], - p->base.interested_parties, &p->checking_connectivity, - &p->connectivity_changed); + p->subchannels[p->checking_subchannel], p->base.interested_parties, + &p->checking_connectivity, &p->connectivity_changed); } } } -static void pf_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void pf_connectivity_changed_locked(void *arg, grpc_error *error) { pick_first_lb_policy *p = (pick_first_lb_policy *)arg; grpc_subchannel *selected_subchannel; pending_pick *pp; @@ -476,8 +466,7 @@ static void pf_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, void *arg, if (p->updating_selected && error != GRPC_ERROR_NONE) { /* Captured the unsubscription for p->selected */ GPR_ASSERT(p->selected != NULL); - GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, p->selected, - "pf_update_connectivity"); + GRPC_CONNECTED_SUBCHANNEL_UNREF(p->selected, "pf_update_connectivity"); if (GRPC_TRACER_ON(grpc_lb_pick_first_trace)) { gpr_log(GPR_DEBUG, "Pick First %p unreffing selected subchannel %p", (void *)p, (void *)p->selected); @@ -493,8 +482,7 @@ static void pf_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, void *arg, /* Captured the unsubscription for the checking subchannel */ GPR_ASSERT(p->selected == NULL); for (size_t i = 0; i < p->num_subchannels; i++) { - GRPC_SUBCHANNEL_UNREF(exec_ctx, p->subchannels[i], - "pf_update_connectivity"); + GRPC_SUBCHANNEL_UNREF(p->subchannels[i], "pf_update_connectivity"); if (GRPC_TRACER_ON(grpc_lb_pick_first_trace)) { gpr_log(GPR_DEBUG, "Pick First %p unreffing subchannel %p", (void *)p, (void *)p->subchannels[i]); @@ -523,20 +511,19 @@ static void pf_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, void *arg, p->checking_connectivity = GRPC_CHANNEL_IDLE; /* reuses the weak ref from start_picking_locked */ grpc_subchannel_notify_on_state_change( - exec_ctx, p->subchannels[p->checking_subchannel], - p->base.interested_parties, &p->checking_connectivity, - &p->connectivity_changed); + p->subchannels[p->checking_subchannel], p->base.interested_parties, + &p->checking_connectivity, &p->connectivity_changed); } if (p->pending_update_args != NULL) { const grpc_lb_policy_args *args = p->pending_update_args; p->pending_update_args = NULL; - pf_update_locked(exec_ctx, &p->base, args); + pf_update_locked(&p->base, args); } return; } GRPC_ERROR_REF(error); if (p->shutdown) { - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &p->base, "pick_first_connectivity"); + GRPC_LB_POLICY_WEAK_UNREF(&p->base, "pick_first_connectivity"); GRPC_ERROR_UNREF(error); return; } else if (p->selected != NULL) { @@ -544,15 +531,14 @@ static void pf_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, void *arg, /* if the selected channel goes bad, we're done */ p->checking_connectivity = GRPC_CHANNEL_SHUTDOWN; } - grpc_connectivity_state_set(exec_ctx, &p->state_tracker, - p->checking_connectivity, GRPC_ERROR_REF(error), - "selected_changed"); + grpc_connectivity_state_set(&p->state_tracker, p->checking_connectivity, + GRPC_ERROR_REF(error), "selected_changed"); if (p->checking_connectivity != GRPC_CHANNEL_SHUTDOWN) { grpc_connected_subchannel_notify_on_state_change( - exec_ctx, p->selected, p->base.interested_parties, - &p->checking_connectivity, &p->connectivity_changed); + p->selected, p->base.interested_parties, &p->checking_connectivity, + &p->connectivity_changed); } else { - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &p->base, "pick_first_connectivity"); + GRPC_LB_POLICY_WEAK_UNREF(&p->base, "pick_first_connectivity"); } } else { loop: @@ -560,9 +546,8 @@ static void pf_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, void *arg, case GRPC_CHANNEL_INIT: GPR_UNREACHABLE_CODE(return ); case GRPC_CHANNEL_READY: - grpc_connectivity_state_set(exec_ctx, &p->state_tracker, - GRPC_CHANNEL_READY, GRPC_ERROR_NONE, - "connecting_ready"); + grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_READY, + GRPC_ERROR_NONE, "connecting_ready"); selected_subchannel = p->subchannels[p->checking_subchannel]; p->selected = GRPC_CONNECTED_SUBCHANNEL_REF( grpc_subchannel_get_connected_subchannel(selected_subchannel), @@ -576,7 +561,7 @@ static void pf_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, void *arg, p->selected_key = grpc_subchannel_get_key(selected_subchannel); /* drop the pick list: we are connected now */ GRPC_LB_POLICY_WEAK_REF(&p->base, "destroy_subchannels"); - destroy_subchannels_locked(exec_ctx, p); + destroy_subchannels_locked(p); /* update any calls that were waiting for a pick */ while ((pp = p->pending_picks)) { p->pending_picks = pp->next; @@ -586,12 +571,12 @@ static void pf_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, void *arg, "Servicing pending pick with selected subchannel %p", (void *)p->selected); } - GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_NONE); gpr_free(pp); } grpc_connected_subchannel_notify_on_state_change( - exec_ctx, p->selected, p->base.interested_parties, - &p->checking_connectivity, &p->connectivity_changed); + p->selected, p->base.interested_parties, &p->checking_connectivity, + &p->connectivity_changed); break; case GRPC_CHANNEL_TRANSIENT_FAILURE: p->checking_subchannel = @@ -600,7 +585,7 @@ static void pf_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, void *arg, /* only trigger transient failure when we've tried all alternatives */ grpc_connectivity_state_set( - exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_REF(error), "connecting_transient_failure"); } GRPC_ERROR_UNREF(error); @@ -608,7 +593,7 @@ static void pf_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, void *arg, p->subchannels[p->checking_subchannel], &error); if (p->checking_connectivity == GRPC_CHANNEL_TRANSIENT_FAILURE) { grpc_subchannel_notify_on_state_change( - exec_ctx, p->subchannels[p->checking_subchannel], + p->subchannels[p->checking_subchannel], p->base.interested_parties, &p->checking_connectivity, &p->connectivity_changed); } else { @@ -617,37 +602,34 @@ static void pf_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, void *arg, break; case GRPC_CHANNEL_CONNECTING: case GRPC_CHANNEL_IDLE: - grpc_connectivity_state_set( - exec_ctx, &p->state_tracker, GRPC_CHANNEL_CONNECTING, - GRPC_ERROR_REF(error), "connecting_changed"); + grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_CONNECTING, + GRPC_ERROR_REF(error), + "connecting_changed"); grpc_subchannel_notify_on_state_change( - exec_ctx, p->subchannels[p->checking_subchannel], - p->base.interested_parties, &p->checking_connectivity, - &p->connectivity_changed); + p->subchannels[p->checking_subchannel], p->base.interested_parties, + &p->checking_connectivity, &p->connectivity_changed); break; case GRPC_CHANNEL_SHUTDOWN: p->num_subchannels--; GPR_SWAP(grpc_subchannel *, p->subchannels[p->checking_subchannel], p->subchannels[p->num_subchannels]); - GRPC_SUBCHANNEL_UNREF(exec_ctx, p->subchannels[p->num_subchannels], - "pick_first"); + GRPC_SUBCHANNEL_UNREF(p->subchannels[p->num_subchannels], "pick_first"); if (p->num_subchannels == 0) { grpc_connectivity_state_set( - exec_ctx, &p->state_tracker, GRPC_CHANNEL_SHUTDOWN, + &p->state_tracker, GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Pick first exhausted channels", &error, 1), "no_more_channels"); while ((pp = p->pending_picks)) { p->pending_picks = pp->next; *pp->target = NULL; - GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_NONE); gpr_free(pp); } - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &p->base, - "pick_first_connectivity"); + GRPC_LB_POLICY_WEAK_UNREF(&p->base, "pick_first_connectivity"); } else { grpc_connectivity_state_set( - exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_REF(error), "subchannel_failed"); p->checking_subchannel %= p->num_subchannels; GRPC_ERROR_UNREF(error); @@ -677,15 +659,14 @@ static void pick_first_factory_ref(grpc_lb_policy_factory *factory) {} 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, +static grpc_lb_policy *create_pick_first(grpc_lb_policy_factory *factory, grpc_lb_policy_args *args) { GPR_ASSERT(args->client_channel_factory != NULL); pick_first_lb_policy *p = (pick_first_lb_policy *)gpr_zalloc(sizeof(*p)); if (GRPC_TRACER_ON(grpc_lb_pick_first_trace)) { gpr_log(GPR_DEBUG, "Pick First %p created.", (void *)p); } - pf_update_locked(exec_ctx, &p->base, args); + pf_update_locked(&p->base, args); grpc_lb_policy_init(&p->base, &pick_first_lb_policy_vtable, args->combiner); grpc_subchannel_index_ref(); GRPC_CLOSURE_INIT(&p->connectivity_changed, pf_connectivity_changed_locked, p, diff --git a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc index 6812bb50cd9..5c985120859 100644 --- a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +++ b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc @@ -159,8 +159,7 @@ static rr_subchannel_list *rr_subchannel_list_create(round_robin_lb_policy *p, return subchannel_list; } -static void rr_subchannel_list_destroy(grpc_exec_ctx *exec_ctx, - rr_subchannel_list *subchannel_list) { +static void rr_subchannel_list_destroy(rr_subchannel_list *subchannel_list) { GPR_ASSERT(subchannel_list->shutting_down); if (GRPC_TRACER_ON(grpc_lb_round_robin_trace)) { gpr_log(GPR_INFO, "[RR %p] Destroying subchannel_list %p", @@ -169,13 +168,12 @@ static void rr_subchannel_list_destroy(grpc_exec_ctx *exec_ctx, for (size_t i = 0; i < subchannel_list->num_subchannels; i++) { subchannel_data *sd = &subchannel_list->subchannels[i]; if (sd->subchannel != NULL) { - GRPC_SUBCHANNEL_UNREF(exec_ctx, sd->subchannel, - "rr_subchannel_list_destroy"); + GRPC_SUBCHANNEL_UNREF(sd->subchannel, "rr_subchannel_list_destroy"); } sd->subchannel = NULL; if (sd->user_data != NULL) { GPR_ASSERT(sd->user_data_vtable != NULL); - sd->user_data_vtable->destroy(exec_ctx, sd->user_data); + sd->user_data_vtable->destroy(sd->user_data); sd->user_data = NULL; } } @@ -194,8 +192,7 @@ static void rr_subchannel_list_ref(rr_subchannel_list *subchannel_list, } } -static void rr_subchannel_list_unref(grpc_exec_ctx *exec_ctx, - rr_subchannel_list *subchannel_list, +static void rr_subchannel_list_unref(rr_subchannel_list *subchannel_list, const char *reason) { const bool done = gpr_unref(&subchannel_list->refcount); if (GRPC_TRACER_ON(grpc_lb_round_robin_trace)) { @@ -205,15 +202,14 @@ static void rr_subchannel_list_unref(grpc_exec_ctx *exec_ctx, (unsigned long)(count + 1), (unsigned long)count, reason); } if (done) { - rr_subchannel_list_destroy(exec_ctx, subchannel_list); + rr_subchannel_list_destroy(subchannel_list); } } /** Mark \a subchannel_list as discarded. Unsubscribes all its subchannels. The * watcher's callback will ultimately unref \a subchannel_list. */ static void rr_subchannel_list_shutdown_and_unref( - grpc_exec_ctx *exec_ctx, rr_subchannel_list *subchannel_list, - const char *reason) { + rr_subchannel_list *subchannel_list, const char *reason) { GPR_ASSERT(!subchannel_list->shutting_down); if (GRPC_TRACER_ON(grpc_lb_round_robin_trace)) { gpr_log(GPR_DEBUG, "[RR %p] Shutting down subchannel_list %p (%s)", @@ -232,12 +228,11 @@ static void rr_subchannel_list_shutdown_and_unref( (void *)subchannel_list->policy, (void *)sd->subchannel, (void *)subchannel_list); } - grpc_subchannel_notify_on_state_change(exec_ctx, sd->subchannel, NULL, - NULL, + grpc_subchannel_notify_on_state_change(sd->subchannel, NULL, NULL, &sd->connectivity_changed_closure); } } - rr_subchannel_list_unref(exec_ctx, subchannel_list, reason); + rr_subchannel_list_unref(subchannel_list, reason); } /** Returns the index into p->subchannel_list->subchannels of the next @@ -304,18 +299,18 @@ static void update_last_ready_subchannel_index_locked(round_robin_lb_policy *p, } } -static void rr_destroy(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { +static void rr_destroy(grpc_lb_policy *pol) { round_robin_lb_policy *p = (round_robin_lb_policy *)pol; if (GRPC_TRACER_ON(grpc_lb_round_robin_trace)) { gpr_log(GPR_DEBUG, "[RR %p] Destroying Round Robin policy at %p", (void *)pol, (void *)pol); } - grpc_connectivity_state_destroy(exec_ctx, &p->state_tracker); + grpc_connectivity_state_destroy(&p->state_tracker); grpc_subchannel_index_unref(); gpr_free(p); } -static void rr_shutdown_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { +static void rr_shutdown_locked(grpc_lb_policy *pol) { round_robin_lb_policy *p = (round_robin_lb_policy *)pol; if (GRPC_TRACER_ON(grpc_lb_round_robin_trace)) { gpr_log(GPR_DEBUG, "[RR %p] Shutting down Round Robin policy at %p", @@ -326,29 +321,27 @@ static void rr_shutdown_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { while ((pp = p->pending_picks)) { p->pending_picks = pp->next; *pp->target = NULL; - GRPC_CLOSURE_SCHED( - exec_ctx, pp->on_complete, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Channel Shutdown")); + GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Channel Shutdown")); gpr_free(pp); } grpc_connectivity_state_set( - exec_ctx, &p->state_tracker, GRPC_CHANNEL_SHUTDOWN, + &p->state_tracker, GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Channel Shutdown"), "rr_shutdown"); const bool latest_is_current = p->subchannel_list == p->latest_pending_subchannel_list; - rr_subchannel_list_shutdown_and_unref(exec_ctx, p->subchannel_list, + rr_subchannel_list_shutdown_and_unref(p->subchannel_list, "sl_shutdown_rr_shutdown"); p->subchannel_list = NULL; if (!latest_is_current && p->latest_pending_subchannel_list != NULL && !p->latest_pending_subchannel_list->shutting_down) { - rr_subchannel_list_shutdown_and_unref(exec_ctx, - p->latest_pending_subchannel_list, + rr_subchannel_list_shutdown_and_unref(p->latest_pending_subchannel_list, "sl_shutdown_pending_rr_shutdown"); p->latest_pending_subchannel_list = NULL; } } -static void rr_cancel_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, +static void rr_cancel_pick_locked(grpc_lb_policy *pol, grpc_connected_subchannel **target, grpc_error *error) { round_robin_lb_policy *p = (round_robin_lb_policy *)pol; @@ -358,7 +351,7 @@ static void rr_cancel_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, pending_pick *next = pp->next; if (pp->target == target) { *target = NULL; - GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, + GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Pick cancelled", &error, 1)); gpr_free(pp); @@ -371,7 +364,7 @@ static void rr_cancel_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, GRPC_ERROR_UNREF(error); } -static void rr_cancel_picks_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, +static void rr_cancel_picks_locked(grpc_lb_policy *pol, uint32_t initial_metadata_flags_mask, uint32_t initial_metadata_flags_eq, grpc_error *error) { @@ -383,7 +376,7 @@ static void rr_cancel_picks_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, if ((pp->initial_metadata_flags & initial_metadata_flags_mask) == initial_metadata_flags_eq) { *pp->target = NULL; - GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, + GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Pick cancelled", &error, 1)); gpr_free(pp); @@ -396,28 +389,27 @@ static void rr_cancel_picks_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, GRPC_ERROR_UNREF(error); } -static void start_picking_locked(grpc_exec_ctx *exec_ctx, - round_robin_lb_policy *p) { +static void start_picking_locked(round_robin_lb_policy *p) { p->started_picking = true; for (size_t i = 0; i < p->subchannel_list->num_subchannels; i++) { subchannel_data *sd = &p->subchannel_list->subchannels[i]; GRPC_LB_POLICY_WEAK_REF(&p->base, "start_picking_locked"); rr_subchannel_list_ref(sd->subchannel_list, "started_picking"); grpc_subchannel_notify_on_state_change( - exec_ctx, sd->subchannel, p->base.interested_parties, + sd->subchannel, p->base.interested_parties, &sd->pending_connectivity_state_unsafe, &sd->connectivity_changed_closure); } } -static void rr_exit_idle_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { +static void rr_exit_idle_locked(grpc_lb_policy *pol) { round_robin_lb_policy *p = (round_robin_lb_policy *)pol; if (!p->started_picking) { - start_picking_locked(exec_ctx, p); + start_picking_locked(p); } } -static int rr_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, +static int rr_pick_locked(grpc_lb_policy *pol, const grpc_lb_policy_pick_args *pick_args, grpc_connected_subchannel **target, grpc_call_context_element *context, void **user_data, @@ -453,7 +445,7 @@ static int rr_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, } /* no pick currently available. Save for later in list of pending picks */ if (!p->started_picking) { - start_picking_locked(exec_ctx, p); + start_picking_locked(p); } pending_pick *pp = (pending_pick *)gpr_malloc(sizeof(*pp)); pp->next = p->pending_picks; @@ -497,7 +489,7 @@ static void update_state_counters_locked(subchannel_data *sd) { * used upon policy transition to TRANSIENT_FAILURE or SHUTDOWN. Returns the * connectivity status set. */ static grpc_connectivity_state update_lb_connectivity_status_locked( - grpc_exec_ctx *exec_ctx, subchannel_data *sd, grpc_error *error) { + subchannel_data *sd, grpc_error *error) { /* In priority order. The first rule to match terminates the search (ie, if we * are on rule n, all previous rules were unfulfilled). * @@ -522,31 +514,29 @@ static grpc_connectivity_state update_lb_connectivity_status_locked( rr_subchannel_list *subchannel_list = sd->subchannel_list; round_robin_lb_policy *p = subchannel_list->policy; if (subchannel_list->num_ready > 0) { /* 1) READY */ - grpc_connectivity_state_set(exec_ctx, &p->state_tracker, GRPC_CHANNEL_READY, + grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_READY, GRPC_ERROR_NONE, "rr_ready"); new_state = GRPC_CHANNEL_READY; } else if (sd->curr_connectivity_state == GRPC_CHANNEL_CONNECTING) { /* 2) CONNECTING */ - grpc_connectivity_state_set(exec_ctx, &p->state_tracker, - GRPC_CHANNEL_CONNECTING, GRPC_ERROR_NONE, - "rr_connecting"); + grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_CONNECTING, + GRPC_ERROR_NONE, "rr_connecting"); new_state = GRPC_CHANNEL_CONNECTING; } else if (p->subchannel_list->num_shutdown == p->subchannel_list->num_subchannels) { /* 3) SHUTDOWN */ - grpc_connectivity_state_set(exec_ctx, &p->state_tracker, - GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_REF(error), - "rr_shutdown"); + grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_SHUTDOWN, + GRPC_ERROR_REF(error), "rr_shutdown"); p->shutdown = true; new_state = GRPC_CHANNEL_SHUTDOWN; } else if (subchannel_list->num_transient_failures == p->subchannel_list->num_subchannels) { /* 4) TRANSIENT_FAILURE */ - grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_REF(error), "rr_transient_failure"); new_state = GRPC_CHANNEL_TRANSIENT_FAILURE; } else if (subchannel_list->num_idle == p->subchannel_list->num_subchannels) { /* 5) IDLE */ - grpc_connectivity_state_set(exec_ctx, &p->state_tracker, GRPC_CHANNEL_IDLE, + grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_IDLE, GRPC_ERROR_NONE, "rr_idle"); new_state = GRPC_CHANNEL_IDLE; } @@ -554,8 +544,7 @@ static grpc_connectivity_state update_lb_connectivity_status_locked( return new_state; } -static void rr_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void rr_connectivity_changed_locked(void *arg, grpc_error *error) { subchannel_data *sd = (subchannel_data *)arg; round_robin_lb_policy *p = sd->subchannel_list->policy; if (GRPC_TRACER_ON(grpc_lb_round_robin_trace)) { @@ -572,18 +561,18 @@ static void rr_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, void *arg, } // If the policy is shutting down, unref and return. if (p->shutdown) { - rr_subchannel_list_unref(exec_ctx, sd->subchannel_list, + rr_subchannel_list_unref(sd->subchannel_list, "pol_shutdown+started_picking"); - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &p->base, "pol_shutdown"); + GRPC_LB_POLICY_WEAK_UNREF(&p->base, "pol_shutdown"); return; } if (sd->subchannel_list->shutting_down && error == GRPC_ERROR_CANCELLED) { // the subchannel list associated with sd has been discarded. This callback // corresponds to the unsubscription. The unrefs correspond to the picking // ref (start_picking_locked or update_started_picking). - rr_subchannel_list_unref(exec_ctx, sd->subchannel_list, + rr_subchannel_list_unref(sd->subchannel_list, "sl_shutdown+started_picking"); - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &p->base, "sl_shutdown+picking"); + GRPC_LB_POLICY_WEAK_UNREF(&p->base, "sl_shutdown+picking"); return; } // Dispose of outdated subchannel lists. @@ -592,13 +581,12 @@ static void rr_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, void *arg, const char *reason = NULL; if (sd->subchannel_list->shutting_down) { reason = "sl_outdated_straggler"; - rr_subchannel_list_unref(exec_ctx, sd->subchannel_list, reason); + rr_subchannel_list_unref(sd->subchannel_list, reason); } else { reason = "sl_outdated"; - rr_subchannel_list_shutdown_and_unref(exec_ctx, sd->subchannel_list, - reason); + rr_subchannel_list_shutdown_and_unref(sd->subchannel_list, reason); } - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &p->base, reason); + GRPC_LB_POLICY_WEAK_UNREF(&p->base, reason); return; } // Now that we're inside the combiner, copy the pending connectivity @@ -609,15 +597,15 @@ static void rr_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, void *arg, update_state_counters_locked(sd); sd->prev_connectivity_state = sd->curr_connectivity_state; const grpc_connectivity_state new_policy_connectivity_state = - update_lb_connectivity_status_locked(exec_ctx, sd, GRPC_ERROR_REF(error)); + update_lb_connectivity_status_locked(sd, GRPC_ERROR_REF(error)); // If the sd's new state is SHUTDOWN, unref the subchannel, and if the new // policy's state is SHUTDOWN, clean up. if (sd->curr_connectivity_state == GRPC_CHANNEL_SHUTDOWN) { - GRPC_SUBCHANNEL_UNREF(exec_ctx, sd->subchannel, "rr_subchannel_shutdown"); + GRPC_SUBCHANNEL_UNREF(sd->subchannel, "rr_subchannel_shutdown"); sd->subchannel = NULL; if (sd->user_data != NULL) { GPR_ASSERT(sd->user_data_vtable != NULL); - sd->user_data_vtable->destroy(exec_ctx, sd->user_data); + sd->user_data_vtable->destroy(sd->user_data); sd->user_data = NULL; } if (new_policy_connectivity_state == GRPC_CHANNEL_SHUTDOWN) { @@ -626,15 +614,14 @@ static void rr_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, void *arg, while ((pp = p->pending_picks)) { p->pending_picks = pp->next; *pp->target = NULL; - GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_NONE); gpr_free(pp); } } - rr_subchannel_list_unref(exec_ctx, sd->subchannel_list, + rr_subchannel_list_unref(sd->subchannel_list, "sd_shutdown+started_picking"); // unref the "rr_connectivity_update" weak ref from start_picking. - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &p->base, - "rr_connectivity_sd_shutdown"); + GRPC_LB_POLICY_WEAK_UNREF(&p->base, "rr_connectivity_sd_shutdown"); } else { // sd not in SHUTDOWN if (sd->curr_connectivity_state == GRPC_CHANNEL_READY) { if (sd->subchannel_list != p->subchannel_list) { @@ -657,7 +644,7 @@ static void rr_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, void *arg, } if (p->subchannel_list != NULL) { // dispose of the current subchannel_list - rr_subchannel_list_shutdown_and_unref(exec_ctx, p->subchannel_list, + rr_subchannel_list_shutdown_and_unref(p->subchannel_list, "sl_phase_out_shutdown"); } p->subchannel_list = p->latest_pending_subchannel_list; @@ -691,36 +678,34 @@ static void rr_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, void *arg, (void *)p, (void *)selected->subchannel, (void *)p->subchannel_list, (unsigned long)next_ready_index); } - GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_NONE); gpr_free(pp); } } /* renew notification: reuses the "rr_connectivity_update" weak ref on the * policy as well as the sd->subchannel_list ref. */ grpc_subchannel_notify_on_state_change( - exec_ctx, sd->subchannel, p->base.interested_parties, + sd->subchannel, p->base.interested_parties, &sd->pending_connectivity_state_unsafe, &sd->connectivity_changed_closure); } } static grpc_connectivity_state rr_check_connectivity_locked( - grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, grpc_error **error) { + grpc_lb_policy *pol, grpc_error **error) { round_robin_lb_policy *p = (round_robin_lb_policy *)pol; return grpc_connectivity_state_get(&p->state_tracker, error); } -static void rr_notify_on_state_change_locked(grpc_exec_ctx *exec_ctx, - grpc_lb_policy *pol, +static void rr_notify_on_state_change_locked(grpc_lb_policy *pol, grpc_connectivity_state *current, grpc_closure *notify) { round_robin_lb_policy *p = (round_robin_lb_policy *)pol; - grpc_connectivity_state_notify_on_state_change(exec_ctx, &p->state_tracker, - current, notify); + grpc_connectivity_state_notify_on_state_change(&p->state_tracker, current, + notify); } -static void rr_ping_one_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, - grpc_closure *closure) { +static void rr_ping_one_locked(grpc_lb_policy *pol, grpc_closure *closure) { round_robin_lb_policy *p = (round_robin_lb_policy *)pol; const size_t next_ready_index = get_next_ready_subchannel_index_locked(p); if (next_ready_index < p->subchannel_list->num_subchannels) { @@ -729,15 +714,15 @@ static void rr_ping_one_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, grpc_connected_subchannel *target = GRPC_CONNECTED_SUBCHANNEL_REF( grpc_subchannel_get_connected_subchannel(selected->subchannel), "rr_picked"); - grpc_connected_subchannel_ping(exec_ctx, target, closure); - GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, target, "rr_picked"); + grpc_connected_subchannel_ping(target, closure); + GRPC_CONNECTED_SUBCHANNEL_UNREF(target, "rr_picked"); } else { - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Round Robin not connected")); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Round Robin not connected")); } } -static void rr_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, +static void rr_update_locked(grpc_lb_policy *policy, const grpc_lb_policy_args *args) { round_robin_lb_policy *p = (round_robin_lb_policy *)policy; const grpc_arg *arg = @@ -746,7 +731,7 @@ static void rr_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, if (p->subchannel_list == NULL) { // If we don't have a current subchannel list, go into TRANSIENT FAILURE. grpc_connectivity_state_set( - exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Missing update in args"), "rr_update_missing"); } else { @@ -762,11 +747,11 @@ static void rr_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, rr_subchannel_list_create(p, addresses->num_addresses); if (addresses->num_addresses == 0) { grpc_connectivity_state_set( - exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Empty update"), "rr_update_empty"); if (p->subchannel_list != NULL) { - rr_subchannel_list_shutdown_and_unref(exec_ctx, p->subchannel_list, + rr_subchannel_list_shutdown_and_unref(p->subchannel_list, "sl_shutdown_empty_update"); } p->subchannel_list = subchannel_list; // empty list @@ -781,8 +766,8 @@ static void rr_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, (void *)p, (void *)p->latest_pending_subchannel_list, (void *)subchannel_list); } - rr_subchannel_list_shutdown_and_unref( - exec_ctx, p->latest_pending_subchannel_list, "sl_outdated_dont_smash"); + rr_subchannel_list_shutdown_and_unref(p->latest_pending_subchannel_list, + "sl_outdated_dont_smash"); } p->latest_pending_subchannel_list = subchannel_list; grpc_subchannel_args sc_args; @@ -803,8 +788,8 @@ static void rr_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, gpr_free(addr_arg.value.string); sc_args.args = new_args; grpc_subchannel *subchannel = grpc_client_channel_factory_create_subchannel( - exec_ctx, args->client_channel_factory, &sc_args); - grpc_channel_args_destroy(exec_ctx, new_args); + args->client_channel_factory, &sc_args); + grpc_channel_args_destroy(new_args); grpc_error *error; // Get the connectivity state of the subchannel. Already existing ones may // be in a state other than INIT. @@ -812,7 +797,7 @@ static void rr_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, grpc_subchannel_check_connectivity(subchannel, &error); if (error != GRPC_ERROR_NONE) { // The subchannel is in error (e.g. shutting down). Ignore it. - GRPC_SUBCHANNEL_UNREF(exec_ctx, subchannel, "new_sc_connectivity_error"); + GRPC_SUBCHANNEL_UNREF(subchannel, "new_sc_connectivity_error"); GRPC_ERROR_UNREF(error); continue; } @@ -853,7 +838,7 @@ static void rr_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, * p->subchannel_list for sd->subchannel_list, provided the subchannel * list is still valid (ie, isn't shutting down) */ grpc_subchannel_notify_on_state_change( - exec_ctx, sd->subchannel, p->base.interested_parties, + sd->subchannel, p->base.interested_parties, &sd->pending_connectivity_state_unsafe, &sd->connectivity_changed_closure); } @@ -862,7 +847,7 @@ static void rr_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy, // The policy isn't picking yet. Save the update for later, disposing of // previous version if any. if (p->subchannel_list != NULL) { - rr_subchannel_list_shutdown_and_unref(exec_ctx, p->subchannel_list, + rr_subchannel_list_shutdown_and_unref(p->subchannel_list, "rr_update_before_started_picking"); } p->subchannel_list = subchannel_list; @@ -886,8 +871,7 @@ static void round_robin_factory_ref(grpc_lb_policy_factory *factory) {} 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, +static grpc_lb_policy *round_robin_create(grpc_lb_policy_factory *factory, grpc_lb_policy_args *args) { GPR_ASSERT(args->client_channel_factory != NULL); round_robin_lb_policy *p = (round_robin_lb_policy *)gpr_zalloc(sizeof(*p)); @@ -895,7 +879,7 @@ static grpc_lb_policy *round_robin_create(grpc_exec_ctx *exec_ctx, grpc_subchannel_index_ref(); grpc_connectivity_state_init(&p->state_tracker, GRPC_CHANNEL_IDLE, "round_robin"); - rr_update_locked(exec_ctx, &p->base, args); + rr_update_locked(&p->base, args); if (GRPC_TRACER_ON(grpc_lb_round_robin_trace)) { gpr_log(GPR_DEBUG, "[RR %p] Created with %lu subchannels", (void *)p, (unsigned long)p->subchannel_list->num_subchannels); diff --git a/src/core/ext/filters/client_channel/lb_policy_factory.cc b/src/core/ext/filters/client_channel/lb_policy_factory.cc index 05ab43d0b69..493d06008f3 100644 --- a/src/core/ext/filters/client_channel/lb_policy_factory.cc +++ b/src/core/ext/filters/client_channel/lb_policy_factory.cc @@ -112,13 +112,11 @@ int grpc_lb_addresses_cmp(const grpc_lb_addresses* addresses1, return 0; } -void grpc_lb_addresses_destroy(grpc_exec_ctx* exec_ctx, - grpc_lb_addresses* addresses) { +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 (addresses->addresses[i].user_data != NULL) { - addresses->user_data_vtable->destroy(exec_ctx, - addresses->addresses[i].user_data); + addresses->user_data_vtable->destroy(addresses->addresses[i].user_data); } } gpr_free(addresses->addresses); @@ -128,8 +126,8 @@ void grpc_lb_addresses_destroy(grpc_exec_ctx* exec_ctx, static void* lb_addresses_copy(void* addresses) { return grpc_lb_addresses_copy((grpc_lb_addresses*)addresses); } -static void lb_addresses_destroy(grpc_exec_ctx* exec_ctx, void* addresses) { - grpc_lb_addresses_destroy(exec_ctx, (grpc_lb_addresses*)addresses); +static void lb_addresses_destroy(void* addresses) { + grpc_lb_addresses_destroy((grpc_lb_addresses*)addresses); } static int lb_addresses_cmp(void* addresses1, void* addresses2) { return grpc_lb_addresses_cmp((grpc_lb_addresses*)addresses1, @@ -162,8 +160,7 @@ void grpc_lb_policy_factory_unref(grpc_lb_policy_factory* factory) { } grpc_lb_policy* grpc_lb_policy_factory_create_lb_policy( - grpc_exec_ctx* exec_ctx, grpc_lb_policy_factory* factory, - grpc_lb_policy_args* args) { + grpc_lb_policy_factory* factory, grpc_lb_policy_args* args) { if (factory == NULL) return NULL; - return factory->vtable->create_lb_policy(exec_ctx, factory, args); + return factory->vtable->create_lb_policy(factory, args); } diff --git a/src/core/ext/filters/client_channel/lb_policy_factory.h b/src/core/ext/filters/client_channel/lb_policy_factory.h index 8790ffdda31..6b48d094fe8 100644 --- a/src/core/ext/filters/client_channel/lb_policy_factory.h +++ b/src/core/ext/filters/client_channel/lb_policy_factory.h @@ -54,7 +54,7 @@ typedef struct grpc_lb_address { typedef struct grpc_lb_user_data_vtable { void *(*copy)(void *); - void (*destroy)(grpc_exec_ctx *exec_ctx, void *); + void (*destroy)(void *); int (*cmp)(void *, void *); } grpc_lb_user_data_vtable; @@ -95,8 +95,7 @@ int grpc_lb_addresses_cmp(const grpc_lb_addresses *addresses1, const grpc_lb_addresses *addresses2); /** Destroys \a addresses. */ -void grpc_lb_addresses_destroy(grpc_exec_ctx *exec_ctx, - grpc_lb_addresses *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( @@ -118,8 +117,7 @@ struct grpc_lb_policy_factory_vtable { void (*unref)(grpc_lb_policy_factory *factory); /** Implementation of grpc_lb_policy_factory_create_lb_policy */ - grpc_lb_policy *(*create_lb_policy)(grpc_exec_ctx *exec_ctx, - grpc_lb_policy_factory *factory, + grpc_lb_policy *(*create_lb_policy)(grpc_lb_policy_factory *factory, grpc_lb_policy_args *args); /** Name for the LB policy this factory implements */ @@ -131,8 +129,7 @@ void grpc_lb_policy_factory_unref(grpc_lb_policy_factory *factory); /** Create a lb_policy instance. */ grpc_lb_policy *grpc_lb_policy_factory_create_lb_policy( - grpc_exec_ctx *exec_ctx, grpc_lb_policy_factory *factory, - grpc_lb_policy_args *args); + grpc_lb_policy_factory *factory, grpc_lb_policy_args *args); #ifdef __cplusplus } diff --git a/src/core/ext/filters/client_channel/lb_policy_registry.cc b/src/core/ext/filters/client_channel/lb_policy_registry.cc index f2460f83045..b059e6fadc2 100644 --- a/src/core/ext/filters/client_channel/lb_policy_registry.cc +++ b/src/core/ext/filters/client_channel/lb_policy_registry.cc @@ -61,10 +61,10 @@ static grpc_lb_policy_factory *lookup_factory(const char *name) { return NULL; } -grpc_lb_policy *grpc_lb_policy_create(grpc_exec_ctx *exec_ctx, const char *name, +grpc_lb_policy *grpc_lb_policy_create(const char *name, grpc_lb_policy_args *args) { grpc_lb_policy_factory *factory = lookup_factory(name); grpc_lb_policy *lb_policy = - grpc_lb_policy_factory_create_lb_policy(exec_ctx, factory, args); + grpc_lb_policy_factory_create_lb_policy(factory, args); return lb_policy; } diff --git a/src/core/ext/filters/client_channel/lb_policy_registry.h b/src/core/ext/filters/client_channel/lb_policy_registry.h index 55154cb02a1..6ddd892fe2a 100644 --- a/src/core/ext/filters/client_channel/lb_policy_registry.h +++ b/src/core/ext/filters/client_channel/lb_policy_registry.h @@ -38,7 +38,7 @@ void grpc_register_lb_policy(grpc_lb_policy_factory *factory); * * If \a name is NULL, the default factory from \a grpc_lb_policy_registry_init * will be returned. */ -grpc_lb_policy *grpc_lb_policy_create(grpc_exec_ctx *exec_ctx, const char *name, +grpc_lb_policy *grpc_lb_policy_create(const char *name, grpc_lb_policy_args *args); #ifdef __cplusplus diff --git a/src/core/ext/filters/client_channel/proxy_mapper.cc b/src/core/ext/filters/client_channel/proxy_mapper.cc index c6ea5fc680b..be85cfcced9 100644 --- a/src/core/ext/filters/client_channel/proxy_mapper.cc +++ b/src/core/ext/filters/client_channel/proxy_mapper.cc @@ -23,24 +23,22 @@ void grpc_proxy_mapper_init(const grpc_proxy_mapper_vtable* vtable, mapper->vtable = vtable; } -bool grpc_proxy_mapper_map_name(grpc_exec_ctx* exec_ctx, - grpc_proxy_mapper* mapper, +bool grpc_proxy_mapper_map_name(grpc_proxy_mapper* mapper, const char* server_uri, const grpc_channel_args* args, char** name_to_resolve, grpc_channel_args** new_args) { - return mapper->vtable->map_name(exec_ctx, mapper, server_uri, args, - name_to_resolve, new_args); + return mapper->vtable->map_name(mapper, server_uri, args, name_to_resolve, + new_args); } -bool grpc_proxy_mapper_map_address(grpc_exec_ctx* exec_ctx, - grpc_proxy_mapper* mapper, +bool grpc_proxy_mapper_map_address(grpc_proxy_mapper* mapper, const grpc_resolved_address* address, const grpc_channel_args* args, grpc_resolved_address** new_address, grpc_channel_args** new_args) { - return mapper->vtable->map_address(exec_ctx, mapper, address, args, - new_address, new_args); + return mapper->vtable->map_address(mapper, address, args, new_address, + new_args); } void grpc_proxy_mapper_destroy(grpc_proxy_mapper* mapper) { diff --git a/src/core/ext/filters/client_channel/proxy_mapper.h b/src/core/ext/filters/client_channel/proxy_mapper.h index bb8259f8545..d4a3793e8a2 100644 --- a/src/core/ext/filters/client_channel/proxy_mapper.h +++ b/src/core/ext/filters/client_channel/proxy_mapper.h @@ -36,14 +36,14 @@ typedef struct { /// If no proxy is needed, returns false. /// Otherwise, sets \a name_to_resolve, optionally sets \a new_args, /// and returns true. - bool (*map_name)(grpc_exec_ctx* exec_ctx, grpc_proxy_mapper* mapper, - const char* server_uri, const grpc_channel_args* args, - char** name_to_resolve, grpc_channel_args** new_args); + bool (*map_name)(grpc_proxy_mapper* mapper, const char* server_uri, + const grpc_channel_args* args, char** name_to_resolve, + grpc_channel_args** new_args); /// Determines the proxy address to use to contact \a address. /// If no proxy is needed, returns false. /// Otherwise, sets \a new_address, optionally sets \a new_args, and /// returns true. - bool (*map_address)(grpc_exec_ctx* exec_ctx, grpc_proxy_mapper* mapper, + bool (*map_address)(grpc_proxy_mapper* mapper, const grpc_resolved_address* address, const grpc_channel_args* args, grpc_resolved_address** new_address, @@ -59,15 +59,13 @@ struct grpc_proxy_mapper { void grpc_proxy_mapper_init(const grpc_proxy_mapper_vtable* vtable, grpc_proxy_mapper* mapper); -bool grpc_proxy_mapper_map_name(grpc_exec_ctx* exec_ctx, - grpc_proxy_mapper* mapper, +bool grpc_proxy_mapper_map_name(grpc_proxy_mapper* mapper, const char* server_uri, const grpc_channel_args* args, char** name_to_resolve, grpc_channel_args** new_args); -bool grpc_proxy_mapper_map_address(grpc_exec_ctx* exec_ctx, - grpc_proxy_mapper* mapper, +bool grpc_proxy_mapper_map_address(grpc_proxy_mapper* mapper, const grpc_resolved_address* address, const grpc_channel_args* args, grpc_resolved_address** new_address, diff --git a/src/core/ext/filters/client_channel/proxy_mapper_registry.cc b/src/core/ext/filters/client_channel/proxy_mapper_registry.cc index 09967eea3c0..51778a20cc5 100644 --- a/src/core/ext/filters/client_channel/proxy_mapper_registry.cc +++ b/src/core/ext/filters/client_channel/proxy_mapper_registry.cc @@ -46,14 +46,13 @@ static void grpc_proxy_mapper_list_register(grpc_proxy_mapper_list* list, ++list->num_mappers; } -static bool grpc_proxy_mapper_list_map_name(grpc_exec_ctx* exec_ctx, - grpc_proxy_mapper_list* list, +static bool grpc_proxy_mapper_list_map_name(grpc_proxy_mapper_list* list, const char* server_uri, const grpc_channel_args* args, char** name_to_resolve, grpc_channel_args** new_args) { for (size_t i = 0; i < list->num_mappers; ++i) { - if (grpc_proxy_mapper_map_name(exec_ctx, list->list[i], server_uri, args, + if (grpc_proxy_mapper_map_name(list->list[i], server_uri, args, name_to_resolve, new_args)) { return true; } @@ -62,12 +61,12 @@ static bool grpc_proxy_mapper_list_map_name(grpc_exec_ctx* exec_ctx, } static bool grpc_proxy_mapper_list_map_address( - grpc_exec_ctx* exec_ctx, grpc_proxy_mapper_list* list, - const grpc_resolved_address* address, const grpc_channel_args* args, - grpc_resolved_address** new_address, grpc_channel_args** new_args) { + grpc_proxy_mapper_list* list, const grpc_resolved_address* address, + const grpc_channel_args* args, grpc_resolved_address** new_address, + grpc_channel_args** new_args) { for (size_t i = 0; i < list->num_mappers; ++i) { - if (grpc_proxy_mapper_map_address(exec_ctx, list->list[i], address, args, - new_address, new_args)) { + if (grpc_proxy_mapper_map_address(list->list[i], address, args, new_address, + new_args)) { return true; } } @@ -105,20 +104,17 @@ void grpc_proxy_mapper_register(bool at_start, grpc_proxy_mapper* mapper) { grpc_proxy_mapper_list_register(&g_proxy_mapper_list, at_start, mapper); } -bool grpc_proxy_mappers_map_name(grpc_exec_ctx* exec_ctx, - const char* server_uri, +bool grpc_proxy_mappers_map_name(const char* server_uri, const grpc_channel_args* args, char** name_to_resolve, grpc_channel_args** new_args) { - return grpc_proxy_mapper_list_map_name(exec_ctx, &g_proxy_mapper_list, - server_uri, args, name_to_resolve, - new_args); + return grpc_proxy_mapper_list_map_name(&g_proxy_mapper_list, server_uri, args, + name_to_resolve, new_args); } -bool grpc_proxy_mappers_map_address(grpc_exec_ctx* exec_ctx, - const grpc_resolved_address* address, +bool grpc_proxy_mappers_map_address(const grpc_resolved_address* address, const grpc_channel_args* args, grpc_resolved_address** new_address, grpc_channel_args** new_args) { - return grpc_proxy_mapper_list_map_address( - exec_ctx, &g_proxy_mapper_list, address, args, new_address, new_args); + return grpc_proxy_mapper_list_map_address(&g_proxy_mapper_list, address, args, + new_address, new_args); } diff --git a/src/core/ext/filters/client_channel/proxy_mapper_registry.h b/src/core/ext/filters/client_channel/proxy_mapper_registry.h index 39c607cefcf..efe1df48a67 100644 --- a/src/core/ext/filters/client_channel/proxy_mapper_registry.h +++ b/src/core/ext/filters/client_channel/proxy_mapper_registry.h @@ -33,14 +33,12 @@ void grpc_proxy_mapper_registry_shutdown(); /// the list. Otherwise, it will be added to the end. void grpc_proxy_mapper_register(bool at_start, grpc_proxy_mapper* mapper); -bool grpc_proxy_mappers_map_name(grpc_exec_ctx* exec_ctx, - const char* server_uri, +bool grpc_proxy_mappers_map_name(const char* server_uri, const grpc_channel_args* args, char** name_to_resolve, grpc_channel_args** new_args); -bool grpc_proxy_mappers_map_address(grpc_exec_ctx* exec_ctx, - const grpc_resolved_address* address, +bool grpc_proxy_mappers_map_address(const grpc_resolved_address* address, const grpc_channel_args* args, grpc_resolved_address** new_address, grpc_channel_args** new_args); diff --git a/src/core/ext/filters/client_channel/resolver.cc b/src/core/ext/filters/client_channel/resolver.cc index 8401504fcf6..5936125163b 100644 --- a/src/core/ext/filters/client_channel/resolver.cc +++ b/src/core/ext/filters/client_channel/resolver.cc @@ -48,8 +48,8 @@ void grpc_resolver_ref(grpc_resolver *resolver) { } #ifndef NDEBUG -void grpc_resolver_unref(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver, - const char *file, int line, const char *reason) { +void grpc_resolver_unref(grpc_resolver *resolver, const char *file, int line, + const char *reason) { if (GRPC_TRACER_ON(grpc_trace_resolver_refcount)) { gpr_atm old_refs = gpr_atm_no_barrier_load(&resolver->refs.count); gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, @@ -57,27 +57,25 @@ void grpc_resolver_unref(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver, old_refs, old_refs - 1, reason); } #else -void grpc_resolver_unref(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver) { +void grpc_resolver_unref(grpc_resolver *resolver) { #endif if (gpr_unref(&resolver->refs)) { grpc_combiner *combiner = resolver->combiner; - resolver->vtable->destroy(exec_ctx, resolver); - GRPC_COMBINER_UNREF(exec_ctx, combiner, "resolver"); + resolver->vtable->destroy(resolver); + GRPC_COMBINER_UNREF(combiner, "resolver"); } } -void grpc_resolver_shutdown_locked(grpc_exec_ctx *exec_ctx, - grpc_resolver *resolver) { - resolver->vtable->shutdown_locked(exec_ctx, resolver); +void grpc_resolver_shutdown_locked(grpc_resolver *resolver) { + resolver->vtable->shutdown_locked(resolver); } -void grpc_resolver_channel_saw_error_locked(grpc_exec_ctx *exec_ctx, - grpc_resolver *resolver) { - resolver->vtable->channel_saw_error_locked(exec_ctx, resolver); +void grpc_resolver_channel_saw_error_locked(grpc_resolver *resolver) { + resolver->vtable->channel_saw_error_locked(resolver); } -void grpc_resolver_next_locked(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver, +void grpc_resolver_next_locked(grpc_resolver *resolver, grpc_channel_args **result, grpc_closure *on_complete) { - resolver->vtable->next_locked(exec_ctx, resolver, result, on_complete); + resolver->vtable->next_locked(resolver, result, on_complete); } diff --git a/src/core/ext/filters/client_channel/resolver.h b/src/core/ext/filters/client_channel/resolver.h index 73fbbbbc3b1..4adf60d1b00 100644 --- a/src/core/ext/filters/client_channel/resolver.h +++ b/src/core/ext/filters/client_channel/resolver.h @@ -41,43 +41,40 @@ struct grpc_resolver { }; struct grpc_resolver_vtable { - void (*destroy)(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver); - void (*shutdown_locked)(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver); - void (*channel_saw_error_locked)(grpc_exec_ctx *exec_ctx, - grpc_resolver *resolver); - void (*next_locked)(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver, - grpc_channel_args **result, grpc_closure *on_complete); + void (*destroy)(grpc_resolver *resolver); + void (*shutdown_locked)(grpc_resolver *resolver); + void (*channel_saw_error_locked)(grpc_resolver *resolver); + void (*next_locked)(grpc_resolver *resolver, grpc_channel_args **result, + grpc_closure *on_complete); }; #ifndef NDEBUG #define GRPC_RESOLVER_REF(p, r) grpc_resolver_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_RESOLVER_UNREF(e, p, r) \ - grpc_resolver_unref((e), (p), __FILE__, __LINE__, (r)) +#define GRPC_RESOLVER_UNREF(p, r) \ + grpc_resolver_unref((p), __FILE__, __LINE__, (r)) void grpc_resolver_ref(grpc_resolver *policy, const char *file, int line, const char *reason); -void grpc_resolver_unref(grpc_exec_ctx *exec_ctx, grpc_resolver *policy, - const char *file, int line, const char *reason); +void grpc_resolver_unref(grpc_resolver *policy, const char *file, int line, + const char *reason); #else #define GRPC_RESOLVER_REF(p, r) grpc_resolver_ref((p)) -#define GRPC_RESOLVER_UNREF(e, p, r) grpc_resolver_unref((e), (p)) +#define GRPC_RESOLVER_UNREF(p, r) grpc_resolver_unref((p)) void grpc_resolver_ref(grpc_resolver *policy); -void grpc_resolver_unref(grpc_exec_ctx *exec_ctx, grpc_resolver *policy); +void grpc_resolver_unref(grpc_resolver *policy); #endif void grpc_resolver_init(grpc_resolver *resolver, const grpc_resolver_vtable *vtable, grpc_combiner *combiner); -void grpc_resolver_shutdown_locked(grpc_exec_ctx *exec_ctx, - grpc_resolver *resolver); +void grpc_resolver_shutdown_locked(grpc_resolver *resolver); /** Notification that the channel has seen an error on some address. Can be used as a hint that re-resolution is desirable soon. Must be called from the combiner passed as a resolver_arg at construction time.*/ -void grpc_resolver_channel_saw_error_locked(grpc_exec_ctx *exec_ctx, - grpc_resolver *resolver); +void grpc_resolver_channel_saw_error_locked(grpc_resolver *resolver); /** Get the next result from the resolver. Expected to set \a *result with new channel args and then schedule \a on_complete for execution. @@ -87,7 +84,7 @@ void grpc_resolver_channel_saw_error_locked(grpc_exec_ctx *exec_ctx, Must be called from the combiner passed as a resolver_arg at construction time.*/ -void grpc_resolver_next_locked(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver, +void grpc_resolver_next_locked(grpc_resolver *resolver, grpc_channel_args **result, grpc_closure *on_complete); diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc index 5f7ab987cbd..ea193ade368 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc @@ -97,17 +97,14 @@ typedef struct { char *service_config_json; } ares_dns_resolver; -static void dns_ares_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *r); +static void dns_ares_destroy(grpc_resolver *r); -static void dns_ares_start_resolving_locked(grpc_exec_ctx *exec_ctx, - ares_dns_resolver *r); -static void dns_ares_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx, - ares_dns_resolver *r); +static void dns_ares_start_resolving_locked(ares_dns_resolver *r); +static void dns_ares_maybe_finish_next_locked(ares_dns_resolver *r); -static void dns_ares_shutdown_locked(grpc_exec_ctx *exec_ctx, grpc_resolver *r); -static void dns_ares_channel_saw_error_locked(grpc_exec_ctx *exec_ctx, - grpc_resolver *r); -static void dns_ares_next_locked(grpc_exec_ctx *exec_ctx, grpc_resolver *r, +static void dns_ares_shutdown_locked(grpc_resolver *r); +static void dns_ares_channel_saw_error_locked(grpc_resolver *r); +static void dns_ares_next_locked(grpc_resolver *r, grpc_channel_args **target_result, grpc_closure *on_complete); @@ -115,43 +112,39 @@ static const grpc_resolver_vtable dns_ares_resolver_vtable = { dns_ares_destroy, dns_ares_shutdown_locked, dns_ares_channel_saw_error_locked, dns_ares_next_locked}; -static void dns_ares_shutdown_locked(grpc_exec_ctx *exec_ctx, - grpc_resolver *resolver) { +static void dns_ares_shutdown_locked(grpc_resolver *resolver) { ares_dns_resolver *r = (ares_dns_resolver *)resolver; if (r->have_retry_timer) { - grpc_timer_cancel(exec_ctx, &r->retry_timer); + grpc_timer_cancel(&r->retry_timer); } if (r->pending_request != NULL) { - grpc_cancel_ares_request(exec_ctx, r->pending_request); + grpc_cancel_ares_request(r->pending_request); } if (r->next_completion != NULL) { *r->target_result = NULL; - GRPC_CLOSURE_SCHED( - exec_ctx, r->next_completion, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resolver Shutdown")); + GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Resolver Shutdown")); r->next_completion = NULL; } } -static void dns_ares_channel_saw_error_locked(grpc_exec_ctx *exec_ctx, - grpc_resolver *resolver) { +static void dns_ares_channel_saw_error_locked(grpc_resolver *resolver) { ares_dns_resolver *r = (ares_dns_resolver *)resolver; if (!r->resolving) { grpc_backoff_reset(&r->backoff_state); - dns_ares_start_resolving_locked(exec_ctx, r); + dns_ares_start_resolving_locked(r); } } -static void dns_ares_on_retry_timer_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void dns_ares_on_retry_timer_locked(void *arg, grpc_error *error) { ares_dns_resolver *r = (ares_dns_resolver *)arg; r->have_retry_timer = false; if (error == GRPC_ERROR_NONE) { if (!r->resolving) { - dns_ares_start_resolving_locked(exec_ctx, r); + dns_ares_start_resolving_locked(r); } } - GRPC_RESOLVER_UNREF(exec_ctx, &r->base, "retry-timer"); + GRPC_RESOLVER_UNREF(&r->base, "retry-timer"); } static bool value_in_json_array(grpc_json *array, const char *value) { @@ -225,8 +218,7 @@ static char *choose_service_config(char *service_config_choice_json) { return service_config; } -static void dns_ares_on_resolved_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void dns_ares_on_resolved_locked(void *arg, grpc_error *error) { ares_dns_resolver *r = (ares_dns_resolver *)arg; grpc_channel_args *result = NULL; GPR_ASSERT(r->resolving); @@ -267,12 +259,12 @@ static void dns_ares_on_resolved_locked(grpc_exec_ctx *exec_ctx, void *arg, num_args_to_add); if (service_config != NULL) grpc_service_config_destroy(service_config); gpr_free(service_config_string); - grpc_lb_addresses_destroy(exec_ctx, r->lb_addresses); + grpc_lb_addresses_destroy(r->lb_addresses); } else { const char *msg = grpc_error_string(error); gpr_log(GPR_DEBUG, "dns resolution failed: %s", msg); - grpc_millis next_try = grpc_backoff_step(exec_ctx, &r->backoff_state); - grpc_millis timeout = next_try - grpc_exec_ctx_now(exec_ctx); + grpc_millis next_try = grpc_backoff_step(&r->backoff_state); + grpc_millis timeout = next_try - grpc_exec_ctx_now(); gpr_log(GPR_INFO, "dns resolution failed (will retry): %s", grpc_error_string(error)); GPR_ASSERT(!r->have_retry_timer); @@ -283,20 +275,19 @@ static void dns_ares_on_resolved_locked(grpc_exec_ctx *exec_ctx, void *arg, } else { gpr_log(GPR_DEBUG, "retrying immediately"); } - grpc_timer_init(exec_ctx, &r->retry_timer, next_try, + grpc_timer_init(&r->retry_timer, next_try, &r->dns_ares_on_retry_timer_locked); } if (r->resolved_result != NULL) { - grpc_channel_args_destroy(exec_ctx, r->resolved_result); + grpc_channel_args_destroy(r->resolved_result); } r->resolved_result = result; r->resolved_version++; - dns_ares_maybe_finish_next_locked(exec_ctx, r); - GRPC_RESOLVER_UNREF(exec_ctx, &r->base, "dns-resolving"); + dns_ares_maybe_finish_next_locked(r); + GRPC_RESOLVER_UNREF(&r->base, "dns-resolving"); } -static void dns_ares_next_locked(grpc_exec_ctx *exec_ctx, - grpc_resolver *resolver, +static void dns_ares_next_locked(grpc_resolver *resolver, grpc_channel_args **target_result, grpc_closure *on_complete) { gpr_log(GPR_DEBUG, "dns_ares_next is called."); @@ -306,56 +297,53 @@ static void dns_ares_next_locked(grpc_exec_ctx *exec_ctx, r->target_result = target_result; if (r->resolved_version == 0 && !r->resolving) { grpc_backoff_reset(&r->backoff_state); - dns_ares_start_resolving_locked(exec_ctx, r); + dns_ares_start_resolving_locked(r); } else { - dns_ares_maybe_finish_next_locked(exec_ctx, r); + dns_ares_maybe_finish_next_locked(r); } } -static void dns_ares_start_resolving_locked(grpc_exec_ctx *exec_ctx, - ares_dns_resolver *r) { +static void dns_ares_start_resolving_locked(ares_dns_resolver *r) { GRPC_RESOLVER_REF(&r->base, "dns-resolving"); GPR_ASSERT(!r->resolving); r->resolving = true; r->lb_addresses = NULL; r->service_config_json = NULL; r->pending_request = grpc_dns_lookup_ares( - exec_ctx, r->dns_server, r->name_to_resolve, r->default_port, - r->interested_parties, &r->dns_ares_on_resolved_locked, &r->lb_addresses, + r->dns_server, r->name_to_resolve, r->default_port, r->interested_parties, + &r->dns_ares_on_resolved_locked, &r->lb_addresses, true /* check_grpclb */, r->request_service_config ? &r->service_config_json : NULL); } -static void dns_ares_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx, - ares_dns_resolver *r) { +static void dns_ares_maybe_finish_next_locked(ares_dns_resolver *r) { if (r->next_completion != NULL && r->resolved_version != r->published_version) { *r->target_result = r->resolved_result == NULL ? NULL : grpc_channel_args_copy(r->resolved_result); gpr_log(GPR_DEBUG, "dns_ares_maybe_finish_next_locked"); - GRPC_CLOSURE_SCHED(exec_ctx, r->next_completion, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_NONE); r->next_completion = NULL; r->published_version = r->resolved_version; } } -static void dns_ares_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) { +static void dns_ares_destroy(grpc_resolver *gr) { gpr_log(GPR_DEBUG, "dns_ares_destroy"); ares_dns_resolver *r = (ares_dns_resolver *)gr; if (r->resolved_result != NULL) { - grpc_channel_args_destroy(exec_ctx, r->resolved_result); + grpc_channel_args_destroy(r->resolved_result); } - grpc_pollset_set_destroy(exec_ctx, r->interested_parties); + grpc_pollset_set_destroy(r->interested_parties); gpr_free(r->dns_server); gpr_free(r->name_to_resolve); gpr_free(r->default_port); - grpc_channel_args_destroy(exec_ctx, r->channel_args); + grpc_channel_args_destroy(r->channel_args); gpr_free(r); } -static grpc_resolver *dns_ares_create(grpc_exec_ctx *exec_ctx, - grpc_resolver_args *args, +static grpc_resolver *dns_ares_create(grpc_resolver_args *args, const char *default_port) { /* Get name from args. */ const char *path = args->uri->path; @@ -376,8 +364,7 @@ static grpc_resolver *dns_ares_create(grpc_exec_ctx *exec_ctx, arg, (grpc_integer_options){false, false, true}); r->interested_parties = grpc_pollset_set_create(); if (args->pollset_set != NULL) { - grpc_pollset_set_add_pollset_set(exec_ctx, r->interested_parties, - args->pollset_set); + grpc_pollset_set_add_pollset_set(r->interested_parties, args->pollset_set); } grpc_backoff_init(&r->backoff_state, GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS, GRPC_DNS_RECONNECT_BACKOFF_MULTIPLIER, @@ -402,9 +389,8 @@ static void dns_ares_factory_ref(grpc_resolver_factory *factory) {} static void dns_ares_factory_unref(grpc_resolver_factory *factory) {} static grpc_resolver *dns_factory_create_resolver( - grpc_exec_ctx *exec_ctx, grpc_resolver_factory *factory, - grpc_resolver_args *args) { - return dns_ares_create(exec_ctx, args, "https"); + grpc_resolver_factory *factory, grpc_resolver_args *args) { + return dns_ares_create(args, "https"); } static char *dns_ares_factory_get_default_host_name( diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h index 3d4309f2fa3..d26077006e2 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h @@ -31,8 +31,7 @@ typedef struct grpc_ares_ev_driver grpc_ares_ev_driver; /* Start \a ev_driver. It will keep working until all IO on its ares_channel is done, or grpc_ares_ev_driver_destroy() is called. It may notify the callbacks bound to its ares_channel when necessary. */ -void grpc_ares_ev_driver_start(grpc_exec_ctx *exec_ctx, - grpc_ares_ev_driver *ev_driver); +void grpc_ares_ev_driver_start(grpc_ares_ev_driver *ev_driver); /* Returns the ares_channel owned by \a ev_driver. To bind a c-ares query to \a ev_driver, use the ares_channel owned by \a ev_driver as the arg of the @@ -50,8 +49,7 @@ grpc_error *grpc_ares_ev_driver_create(grpc_ares_ev_driver **ev_driver, void grpc_ares_ev_driver_destroy(grpc_ares_ev_driver *ev_driver); /* Shutdown all the grpc_fds used by \a ev_driver */ -void grpc_ares_ev_driver_shutdown(grpc_exec_ctx *exec_ctx, - grpc_ares_ev_driver *ev_driver); +void grpc_ares_ev_driver_shutdown(grpc_ares_ev_driver *ev_driver); #ifdef __cplusplus } diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc index c30cc93b6ff..d9d0791a277 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc @@ -77,8 +77,7 @@ struct grpc_ares_ev_driver { bool shutting_down; }; -static void grpc_ares_notify_on_event_locked(grpc_exec_ctx *exec_ctx, - grpc_ares_ev_driver *ev_driver); +static void grpc_ares_notify_on_event_locked(grpc_ares_ev_driver *ev_driver); static grpc_ares_ev_driver *grpc_ares_ev_driver_ref( grpc_ares_ev_driver *ev_driver) { @@ -98,7 +97,7 @@ static void grpc_ares_ev_driver_unref(grpc_ares_ev_driver *ev_driver) { } } -static void fd_node_destroy(grpc_exec_ctx *exec_ctx, fd_node *fdn) { +static void fd_node_destroy(fd_node *fdn) { gpr_log(GPR_DEBUG, "delete fd: %d", grpc_fd_wrapped_fd(fdn->fd)); GPR_ASSERT(!fdn->readable_registered); GPR_ASSERT(!fdn->writable_registered); @@ -106,20 +105,20 @@ static void fd_node_destroy(grpc_exec_ctx *exec_ctx, fd_node *fdn) { /* c-ares library has closed the fd inside grpc_fd. This fd may be picked up immediately by another thread, and should not be closed by the following grpc_fd_orphan. */ - grpc_fd_orphan(exec_ctx, fdn->fd, NULL, NULL, true /* already_closed */, + grpc_fd_orphan(fdn->fd, NULL, NULL, true /* already_closed */, "c-ares query finished"); gpr_free(fdn); } -static void fd_node_shutdown(grpc_exec_ctx *exec_ctx, fd_node *fdn) { +static void fd_node_shutdown(fd_node *fdn) { gpr_mu_lock(&fdn->mu); fdn->shutting_down = true; if (!fdn->readable_registered && !fdn->writable_registered) { gpr_mu_unlock(&fdn->mu); - fd_node_destroy(exec_ctx, fdn); + fd_node_destroy(fdn); } else { - grpc_fd_shutdown(exec_ctx, fdn->fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "c-ares fd shutdown")); + grpc_fd_shutdown( + fdn->fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("c-ares fd shutdown")); gpr_mu_unlock(&fdn->mu); } } @@ -149,7 +148,7 @@ grpc_error *grpc_ares_ev_driver_create(grpc_ares_ev_driver **ev_driver, void grpc_ares_ev_driver_destroy(grpc_ares_ev_driver *ev_driver) { // It's not safe to shut down remaining fds here directly, becauses - // ares_host_callback does not provide an exec_ctx. We mark the event driver + // ares_host_callback does not provide an exec_ctx-> We mark the event driver // as being shut down. If the event driver is working, // grpc_ares_notify_on_event_locked will shut down the fds; if it's not // working, there are no fds to shut down. @@ -159,14 +158,13 @@ void grpc_ares_ev_driver_destroy(grpc_ares_ev_driver *ev_driver) { grpc_ares_ev_driver_unref(ev_driver); } -void grpc_ares_ev_driver_shutdown(grpc_exec_ctx *exec_ctx, - grpc_ares_ev_driver *ev_driver) { +void grpc_ares_ev_driver_shutdown(grpc_ares_ev_driver *ev_driver) { gpr_mu_lock(&ev_driver->mu); ev_driver->shutting_down = true; fd_node *fn = ev_driver->fds; while (fn != NULL) { - grpc_fd_shutdown(exec_ctx, fn->fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "grpc_ares_ev_driver_shutdown")); + grpc_fd_shutdown(fn->fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "grpc_ares_ev_driver_shutdown")); fn = fn->next; } gpr_mu_unlock(&ev_driver->mu); @@ -197,8 +195,7 @@ static bool grpc_ares_is_fd_still_readable(grpc_ares_ev_driver *ev_driver, return ioctl(fd, FIONREAD, &bytes_available) == 0 && bytes_available > 0; } -static void on_readable_cb(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void on_readable_cb(void *arg, grpc_error *error) { fd_node *fdn = (fd_node *)arg; grpc_ares_ev_driver *ev_driver = fdn->ev_driver; gpr_mu_lock(&fdn->mu); @@ -206,7 +203,7 @@ static void on_readable_cb(grpc_exec_ctx *exec_ctx, void *arg, fdn->readable_registered = false; if (fdn->shutting_down && !fdn->writable_registered) { gpr_mu_unlock(&fdn->mu); - fd_node_destroy(exec_ctx, fdn); + fd_node_destroy(fdn); grpc_ares_ev_driver_unref(ev_driver); return; } @@ -227,13 +224,12 @@ static void on_readable_cb(grpc_exec_ctx *exec_ctx, void *arg, ares_cancel(ev_driver->channel); } gpr_mu_lock(&ev_driver->mu); - grpc_ares_notify_on_event_locked(exec_ctx, ev_driver); + grpc_ares_notify_on_event_locked(ev_driver); gpr_mu_unlock(&ev_driver->mu); grpc_ares_ev_driver_unref(ev_driver); } -static void on_writable_cb(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void on_writable_cb(void *arg, grpc_error *error) { fd_node *fdn = (fd_node *)arg; grpc_ares_ev_driver *ev_driver = fdn->ev_driver; gpr_mu_lock(&fdn->mu); @@ -241,7 +237,7 @@ static void on_writable_cb(grpc_exec_ctx *exec_ctx, void *arg, fdn->writable_registered = false; if (fdn->shutting_down && !fdn->readable_registered) { gpr_mu_unlock(&fdn->mu); - fd_node_destroy(exec_ctx, fdn); + fd_node_destroy(fdn); grpc_ares_ev_driver_unref(ev_driver); return; } @@ -260,7 +256,7 @@ static void on_writable_cb(grpc_exec_ctx *exec_ctx, void *arg, ares_cancel(ev_driver->channel); } gpr_mu_lock(&ev_driver->mu); - grpc_ares_notify_on_event_locked(exec_ctx, ev_driver); + grpc_ares_notify_on_event_locked(ev_driver); gpr_mu_unlock(&ev_driver->mu); grpc_ares_ev_driver_unref(ev_driver); } @@ -271,8 +267,7 @@ ares_channel *grpc_ares_ev_driver_get_channel(grpc_ares_ev_driver *ev_driver) { // Get the file descriptors used by the ev_driver's ares channel, register // driver_closure with these filedescriptors. -static void grpc_ares_notify_on_event_locked(grpc_exec_ctx *exec_ctx, - grpc_ares_ev_driver *ev_driver) { +static void grpc_ares_notify_on_event_locked(grpc_ares_ev_driver *ev_driver) { fd_node *new_list = NULL; if (!ev_driver->shutting_down) { ares_socket_t socks[ARES_GETSOCK_MAXNUM]; @@ -298,7 +293,7 @@ static void grpc_ares_notify_on_event_locked(grpc_exec_ctx *exec_ctx, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&fdn->write_closure, on_writable_cb, fdn, grpc_schedule_on_exec_ctx); - grpc_pollset_set_add_fd(exec_ctx, ev_driver->pollset_set, fdn->fd); + grpc_pollset_set_add_fd(ev_driver->pollset_set, fdn->fd); gpr_free(fd_name); } fdn->next = new_list; @@ -310,7 +305,7 @@ static void grpc_ares_notify_on_event_locked(grpc_exec_ctx *exec_ctx, !fdn->readable_registered) { grpc_ares_ev_driver_ref(ev_driver); gpr_log(GPR_DEBUG, "notify read on: %d", grpc_fd_wrapped_fd(fdn->fd)); - grpc_fd_notify_on_read(exec_ctx, fdn->fd, &fdn->read_closure); + grpc_fd_notify_on_read(fdn->fd, &fdn->read_closure); fdn->readable_registered = true; } // Register write_closure if the socket is writable and write_closure @@ -320,7 +315,7 @@ static void grpc_ares_notify_on_event_locked(grpc_exec_ctx *exec_ctx, gpr_log(GPR_DEBUG, "notify write on: %d", grpc_fd_wrapped_fd(fdn->fd)); grpc_ares_ev_driver_ref(ev_driver); - grpc_fd_notify_on_write(exec_ctx, fdn->fd, &fdn->write_closure); + grpc_fd_notify_on_write(fdn->fd, &fdn->write_closure); fdn->writable_registered = true; } gpr_mu_unlock(&fdn->mu); @@ -333,7 +328,7 @@ static void grpc_ares_notify_on_event_locked(grpc_exec_ctx *exec_ctx, while (ev_driver->fds != NULL) { fd_node *cur = ev_driver->fds; ev_driver->fds = ev_driver->fds->next; - fd_node_shutdown(exec_ctx, cur); + fd_node_shutdown(cur); } ev_driver->fds = new_list; // If the ev driver has no working fd, all the tasks are done. @@ -343,12 +338,11 @@ static void grpc_ares_notify_on_event_locked(grpc_exec_ctx *exec_ctx, } } -void grpc_ares_ev_driver_start(grpc_exec_ctx *exec_ctx, - grpc_ares_ev_driver *ev_driver) { +void grpc_ares_ev_driver_start(grpc_ares_ev_driver *ev_driver) { gpr_mu_lock(&ev_driver->mu); if (!ev_driver->working) { ev_driver->working = true; - grpc_ares_notify_on_event_locked(exec_ctx, ev_driver); + grpc_ares_notify_on_event_locked(ev_driver); } gpr_mu_unlock(&ev_driver->mu); } diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc index 04379975e1c..fecf2bfebc6 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -96,23 +96,23 @@ static void grpc_ares_request_ref(grpc_ares_request *r) { gpr_ref(&r->pending_queries); } -static void grpc_ares_request_unref(grpc_exec_ctx *exec_ctx, - grpc_ares_request *r) { +static void grpc_ares_request_unref(grpc_ares_request *r) { /* If there are no pending queries, invoke on_done callback and destroy the request */ if (gpr_unref(&r->pending_queries)) { /* TODO(zyc): Sort results with RFC6724 before invoking on_done. */ - if (exec_ctx == NULL) { + if (/*might be dangerous */ exec_ctx == NULL) { /* A new exec_ctx is created here, as the c-ares interface does not provide one in ares_host_callback. It's safe to schedule on_done with the newly created exec_ctx, since the caller has been warned not to acquire locks in on_done. ares_dns_resolver is using combiner to protect resources needed by on_done. */ - grpc_exec_ctx new_exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_CLOSURE_SCHED(&new_exec_ctx, r->on_done, r->error); - grpc_exec_ctx_finish(&new_exec_ctx); + ExecCtx _local_exec_ctx; + GRPC_CLOSURE_SCHED(/* might be dangerous &new_exec_ctx, */ r->on_done, + r->error); + grpc_exec_ctx_finish(/*&new_exec_ctx*/); } else { - GRPC_CLOSURE_SCHED(exec_ctx, r->on_done, r->error); + GRPC_CLOSURE_SCHED(r->on_done, r->error); } gpr_mu_destroy(&r->mu); grpc_ares_ev_driver_destroy(r->ev_driver); @@ -133,9 +133,8 @@ static grpc_ares_hostbyname_request *create_hostbyname_request( return hr; } -static void destroy_hostbyname_request(grpc_exec_ctx *exec_ctx, - grpc_ares_hostbyname_request *hr) { - grpc_ares_request_unref(exec_ctx, hr->parent_request); +static void destroy_hostbyname_request(grpc_ares_hostbyname_request *hr) { + grpc_ares_request_unref(hr->parent_request); gpr_free(hr->host); gpr_free(hr); } @@ -220,13 +219,13 @@ static void on_hostbyname_done_cb(void *arg, int status, int timeouts, } } gpr_mu_unlock(&r->mu); - destroy_hostbyname_request(NULL, hr); + destroy_hostbyname_request(/* might be dangerous */ hr); } static void on_srv_query_done_cb(void *arg, int status, int timeouts, unsigned char *abuf, int alen) { grpc_ares_request *r = (grpc_ares_request *)arg; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; gpr_log(GPR_DEBUG, "on_query_srv_done_cb"); if (status == ARES_SUCCESS) { gpr_log(GPR_DEBUG, "on_query_srv_done_cb ARES_SUCCESS"); @@ -246,7 +245,7 @@ static void on_srv_query_done_cb(void *arg, int status, int timeouts, r, srv_it->host, htons(srv_it->port), true /* is_balancer */); ares_gethostbyname(*channel, hr->host, AF_INET, on_hostbyname_done_cb, hr); - grpc_ares_ev_driver_start(&exec_ctx, r->ev_driver); + grpc_ares_ev_driver_start(r->ev_driver); } } if (reply != NULL) { @@ -264,8 +263,8 @@ static void on_srv_query_done_cb(void *arg, int status, int timeouts, r->error = grpc_error_add_child(error, r->error); } } - grpc_ares_request_unref(&exec_ctx, r); - grpc_exec_ctx_finish(&exec_ctx); + grpc_ares_request_unref(r); + grpc_exec_ctx_finish(); } static const char g_service_config_attribute_prefix[] = "grpc_config="; @@ -323,14 +322,13 @@ fail: } done: gpr_mu_unlock(&r->mu); - grpc_ares_request_unref(NULL, r); + grpc_ares_request_unref(r); } static grpc_ares_request *grpc_dns_lookup_ares_impl( - grpc_exec_ctx *exec_ctx, const char *dns_server, const char *name, - const char *default_port, grpc_pollset_set *interested_parties, - grpc_closure *on_done, grpc_lb_addresses **addrs, bool check_grpclb, - char **service_config_json) { + const char *dns_server, const char *name, const char *default_port, + grpc_pollset_set *interested_parties, grpc_closure *on_done, + grpc_lb_addresses **addrs, bool check_grpclb, char **service_config_json) { grpc_error *error = GRPC_ERROR_NONE; grpc_ares_hostbyname_request *hr = NULL; grpc_ares_request *r = NULL; @@ -434,28 +432,28 @@ static grpc_ares_request *grpc_dns_lookup_ares_impl( ares_search(*channel, hr->host, ns_c_in, ns_t_txt, on_txt_done_cb, r); } /* TODO(zyc): Handle CNAME records here. */ - grpc_ares_ev_driver_start(exec_ctx, r->ev_driver); - grpc_ares_request_unref(exec_ctx, r); + grpc_ares_ev_driver_start(r->ev_driver); + grpc_ares_request_unref(r); gpr_free(host); gpr_free(port); return r; error_cleanup: - GRPC_CLOSURE_SCHED(exec_ctx, on_done, error); + GRPC_CLOSURE_SCHED(on_done, error); gpr_free(host); gpr_free(port); return NULL; } grpc_ares_request *(*grpc_dns_lookup_ares)( - grpc_exec_ctx *exec_ctx, const char *dns_server, const char *name, - const char *default_port, grpc_pollset_set *interested_parties, - grpc_closure *on_done, grpc_lb_addresses **addrs, bool check_grpclb, + const char *dns_server, const char *name, const char *default_port, + grpc_pollset_set *interested_parties, grpc_closure *on_done, + grpc_lb_addresses **addrs, bool check_grpclb, char **service_config_json) = grpc_dns_lookup_ares_impl; -void grpc_cancel_ares_request(grpc_exec_ctx *exec_ctx, grpc_ares_request *r) { +void grpc_cancel_ares_request(grpc_ares_request *r) { if (grpc_dns_lookup_ares == grpc_dns_lookup_ares_impl) { - grpc_ares_ev_driver_shutdown(exec_ctx, r->ev_driver); + grpc_ares_ev_driver_shutdown(r->ev_driver); } } @@ -498,8 +496,7 @@ typedef struct grpc_resolve_address_ares_request { grpc_closure on_dns_lookup_done; } grpc_resolve_address_ares_request; -static void on_dns_lookup_done_cb(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void on_dns_lookup_done_cb(void *arg, grpc_error *error) { grpc_resolve_address_ares_request *r = (grpc_resolve_address_ares_request *)arg; grpc_resolved_addresses **resolved_addresses = r->addrs_out; @@ -517,14 +514,12 @@ static void on_dns_lookup_done_cb(grpc_exec_ctx *exec_ctx, void *arg, &r->lb_addrs->addresses[i].address, sizeof(grpc_resolved_address)); } } - GRPC_CLOSURE_SCHED(exec_ctx, r->on_resolve_address_done, - GRPC_ERROR_REF(error)); - grpc_lb_addresses_destroy(exec_ctx, r->lb_addrs); + GRPC_CLOSURE_SCHED(r->on_resolve_address_done, GRPC_ERROR_REF(error)); + grpc_lb_addresses_destroy(r->lb_addrs); gpr_free(r); } -static void grpc_resolve_address_ares_impl(grpc_exec_ctx *exec_ctx, - const char *name, +static void grpc_resolve_address_ares_impl(const char *name, const char *default_port, grpc_pollset_set *interested_parties, grpc_closure *on_done, @@ -536,14 +531,14 @@ static void grpc_resolve_address_ares_impl(grpc_exec_ctx *exec_ctx, r->on_resolve_address_done = on_done; GRPC_CLOSURE_INIT(&r->on_dns_lookup_done, on_dns_lookup_done_cb, r, grpc_schedule_on_exec_ctx); - grpc_dns_lookup_ares(exec_ctx, NULL /* dns_server */, name, default_port, + grpc_dns_lookup_ares(NULL /* dns_server */, name, default_port, interested_parties, &r->on_dns_lookup_done, &r->lb_addrs, false /* check_grpclb */, NULL /* service_config_json */); } void (*grpc_resolve_address_ares)( - grpc_exec_ctx *exec_ctx, const char *name, const char *default_port, + const char *name, const char *default_port, grpc_pollset_set *interested_parties, grpc_closure *on_done, grpc_resolved_addresses **addrs) = grpc_resolve_address_ares_impl; diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h index 38fbea9aac8..b042d2ed7a1 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h @@ -36,8 +36,7 @@ typedef struct grpc_ares_request grpc_ares_request; must be called at least once before this function. \a on_done may be called directly in this function without being scheduled with \a exec_ctx, so it must not try to acquire locks that are being held by the caller. */ -extern void (*grpc_resolve_address_ares)(grpc_exec_ctx *exec_ctx, - const char *name, +extern void (*grpc_resolve_address_ares)(const char *name, const char *default_port, grpc_pollset_set *interested_parties, grpc_closure *on_done, @@ -51,14 +50,13 @@ extern void (*grpc_resolve_address_ares)(grpc_exec_ctx *exec_ctx, scheduled with \a exec_ctx, so it must not try to acquire locks that are being held by the caller. */ extern grpc_ares_request *(*grpc_dns_lookup_ares)( - grpc_exec_ctx *exec_ctx, const char *dns_server, const char *name, - const char *default_port, grpc_pollset_set *interested_parties, - grpc_closure *on_done, grpc_lb_addresses **addresses, bool check_grpclb, + const char *dns_server, const char *name, const char *default_port, + grpc_pollset_set *interested_parties, grpc_closure *on_done, + grpc_lb_addresses **addresses, bool check_grpclb, char **service_config_json); /* Cancel the pending grpc_ares_request \a request */ -void grpc_cancel_ares_request(grpc_exec_ctx *exec_ctx, - grpc_ares_request *request); +void grpc_cancel_ares_request(grpc_ares_request *request); /* Initialize gRPC ares wrapper. Must be called at least once before grpc_resolve_address_ares(). */ diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc index f2587c4520f..11396678de5 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc @@ -26,34 +26,32 @@ struct grpc_ares_request { }; static grpc_ares_request *grpc_dns_lookup_ares_impl( - grpc_exec_ctx *exec_ctx, const char *dns_server, const char *name, - const char *default_port, grpc_pollset_set *interested_parties, - grpc_closure *on_done, grpc_lb_addresses **addrs, bool check_grpclb, - char **service_config_json) { + const char *dns_server, const char *name, const char *default_port, + grpc_pollset_set *interested_parties, grpc_closure *on_done, + grpc_lb_addresses **addrs, bool check_grpclb, char **service_config_json) { return NULL; } grpc_ares_request *(*grpc_dns_lookup_ares)( - grpc_exec_ctx *exec_ctx, const char *dns_server, const char *name, - const char *default_port, grpc_pollset_set *interested_parties, - grpc_closure *on_done, grpc_lb_addresses **addrs, bool check_grpclb, + const char *dns_server, const char *name, const char *default_port, + grpc_pollset_set *interested_parties, grpc_closure *on_done, + grpc_lb_addresses **addrs, bool check_grpclb, char **service_config_json) = grpc_dns_lookup_ares_impl; -void grpc_cancel_ares_request(grpc_exec_ctx *exec_ctx, grpc_ares_request *r) {} +void grpc_cancel_ares_request(grpc_ares_request *r) {} grpc_error *grpc_ares_init(void) { return GRPC_ERROR_NONE; } void grpc_ares_cleanup(void) {} -static void grpc_resolve_address_ares_impl(grpc_exec_ctx *exec_ctx, - const char *name, +static void grpc_resolve_address_ares_impl(const char *name, const char *default_port, grpc_pollset_set *interested_parties, grpc_closure *on_done, grpc_resolved_addresses **addrs) {} void (*grpc_resolve_address_ares)( - grpc_exec_ctx *exec_ctx, const char *name, const char *default_port, + const char *name, const char *default_port, grpc_pollset_set *interested_parties, grpc_closure *on_done, grpc_resolved_addresses **addrs) = grpc_resolve_address_ares_impl; diff --git a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc index e669b6dfc7d..dd19f34d564 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc @@ -76,49 +76,42 @@ typedef struct { grpc_resolved_addresses *addresses; } dns_resolver; -static void dns_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *r); +static void dns_destroy(grpc_resolver *r); -static void dns_start_resolving_locked(grpc_exec_ctx *exec_ctx, - dns_resolver *r); -static void dns_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx, - dns_resolver *r); +static void dns_start_resolving_locked(dns_resolver *r); +static void dns_maybe_finish_next_locked(dns_resolver *r); -static void dns_shutdown_locked(grpc_exec_ctx *exec_ctx, grpc_resolver *r); -static void dns_channel_saw_error_locked(grpc_exec_ctx *exec_ctx, - grpc_resolver *r); -static void dns_next_locked(grpc_exec_ctx *exec_ctx, grpc_resolver *r, - grpc_channel_args **target_result, +static void dns_shutdown_locked(grpc_resolver *r); +static void dns_channel_saw_error_locked(grpc_resolver *r); +static void dns_next_locked(grpc_resolver *r, grpc_channel_args **target_result, grpc_closure *on_complete); static const grpc_resolver_vtable dns_resolver_vtable = { dns_destroy, dns_shutdown_locked, dns_channel_saw_error_locked, dns_next_locked}; -static void dns_shutdown_locked(grpc_exec_ctx *exec_ctx, - grpc_resolver *resolver) { +static void dns_shutdown_locked(grpc_resolver *resolver) { dns_resolver *r = (dns_resolver *)resolver; if (r->have_retry_timer) { - grpc_timer_cancel(exec_ctx, &r->retry_timer); + grpc_timer_cancel(&r->retry_timer); } if (r->next_completion != NULL) { *r->target_result = NULL; - GRPC_CLOSURE_SCHED( - exec_ctx, r->next_completion, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resolver Shutdown")); + GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Resolver Shutdown")); r->next_completion = NULL; } } -static void dns_channel_saw_error_locked(grpc_exec_ctx *exec_ctx, - grpc_resolver *resolver) { +static void dns_channel_saw_error_locked(grpc_resolver *resolver) { dns_resolver *r = (dns_resolver *)resolver; if (!r->resolving) { grpc_backoff_reset(&r->backoff_state); - dns_start_resolving_locked(exec_ctx, r); + dns_start_resolving_locked(r); } } -static void dns_next_locked(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver, +static void dns_next_locked(grpc_resolver *resolver, grpc_channel_args **target_result, grpc_closure *on_complete) { dns_resolver *r = (dns_resolver *)resolver; @@ -127,28 +120,26 @@ static void dns_next_locked(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver, r->target_result = target_result; if (r->resolved_version == 0 && !r->resolving) { grpc_backoff_reset(&r->backoff_state); - dns_start_resolving_locked(exec_ctx, r); + dns_start_resolving_locked(r); } else { - dns_maybe_finish_next_locked(exec_ctx, r); + dns_maybe_finish_next_locked(r); } } -static void dns_on_retry_timer_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void dns_on_retry_timer_locked(void *arg, grpc_error *error) { dns_resolver *r = (dns_resolver *)arg; r->have_retry_timer = false; if (error == GRPC_ERROR_NONE) { if (!r->resolving) { - dns_start_resolving_locked(exec_ctx, r); + dns_start_resolving_locked(r); } } - GRPC_RESOLVER_UNREF(exec_ctx, &r->base, "retry-timer"); + GRPC_RESOLVER_UNREF(&r->base, "retry-timer"); } -static void dns_on_resolved_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void dns_on_resolved_locked(void *arg, grpc_error *error) { dns_resolver *r = (dns_resolver *)arg; grpc_channel_args *result = NULL; GPR_ASSERT(r->resolving); @@ -168,10 +159,10 @@ static void dns_on_resolved_locked(grpc_exec_ctx *exec_ctx, void *arg, 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); - grpc_lb_addresses_destroy(exec_ctx, addresses); + grpc_lb_addresses_destroy(addresses); } else { - grpc_millis next_try = grpc_backoff_step(exec_ctx, &r->backoff_state); - grpc_millis timeout = next_try - grpc_exec_ctx_now(exec_ctx); + grpc_millis next_try = grpc_backoff_step(&r->backoff_state); + grpc_millis timeout = next_try - grpc_exec_ctx_now(); gpr_log(GPR_INFO, "dns resolution failed (will retry): %s", grpc_error_string(error)); GPR_ASSERT(!r->have_retry_timer); @@ -184,59 +175,56 @@ static void dns_on_resolved_locked(grpc_exec_ctx *exec_ctx, void *arg, } GRPC_CLOSURE_INIT(&r->on_retry, dns_on_retry_timer_locked, r, grpc_combiner_scheduler(r->base.combiner)); - grpc_timer_init(exec_ctx, &r->retry_timer, next_try, &r->on_retry); + grpc_timer_init(&r->retry_timer, next_try, &r->on_retry); } if (r->resolved_result != NULL) { - grpc_channel_args_destroy(exec_ctx, r->resolved_result); + grpc_channel_args_destroy(r->resolved_result); } r->resolved_result = result; r->resolved_version++; - dns_maybe_finish_next_locked(exec_ctx, r); + dns_maybe_finish_next_locked(r); GRPC_ERROR_UNREF(error); - GRPC_RESOLVER_UNREF(exec_ctx, &r->base, "dns-resolving"); + GRPC_RESOLVER_UNREF(&r->base, "dns-resolving"); } -static void dns_start_resolving_locked(grpc_exec_ctx *exec_ctx, - dns_resolver *r) { +static void dns_start_resolving_locked(dns_resolver *r) { GRPC_RESOLVER_REF(&r->base, "dns-resolving"); GPR_ASSERT(!r->resolving); r->resolving = true; r->addresses = NULL; grpc_resolve_address( - exec_ctx, r->name_to_resolve, r->default_port, r->interested_parties, + r->name_to_resolve, r->default_port, r->interested_parties, GRPC_CLOSURE_CREATE(dns_on_resolved_locked, r, grpc_combiner_scheduler(r->base.combiner)), &r->addresses); } -static void dns_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx, - dns_resolver *r) { +static void dns_maybe_finish_next_locked(dns_resolver *r) { if (r->next_completion != NULL && r->resolved_version != r->published_version) { *r->target_result = r->resolved_result == NULL ? NULL : grpc_channel_args_copy(r->resolved_result); - GRPC_CLOSURE_SCHED(exec_ctx, r->next_completion, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_NONE); r->next_completion = NULL; r->published_version = r->resolved_version; } } -static void dns_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) { +static void dns_destroy(grpc_resolver *gr) { dns_resolver *r = (dns_resolver *)gr; if (r->resolved_result != NULL) { - grpc_channel_args_destroy(exec_ctx, r->resolved_result); + grpc_channel_args_destroy(r->resolved_result); } - grpc_pollset_set_destroy(exec_ctx, r->interested_parties); + grpc_pollset_set_destroy(r->interested_parties); gpr_free(r->name_to_resolve); gpr_free(r->default_port); - grpc_channel_args_destroy(exec_ctx, r->channel_args); + grpc_channel_args_destroy(r->channel_args); gpr_free(r); } -static grpc_resolver *dns_create(grpc_exec_ctx *exec_ctx, - grpc_resolver_args *args, +static grpc_resolver *dns_create(grpc_resolver_args *args, const char *default_port) { if (0 != strcmp(args->uri->authority, "")) { gpr_log(GPR_ERROR, "authority based dns uri's not supported"); @@ -253,8 +241,7 @@ static grpc_resolver *dns_create(grpc_exec_ctx *exec_ctx, r->channel_args = grpc_channel_args_copy(args->args); r->interested_parties = grpc_pollset_set_create(); if (args->pollset_set != NULL) { - grpc_pollset_set_add_pollset_set(exec_ctx, r->interested_parties, - args->pollset_set); + grpc_pollset_set_add_pollset_set(r->interested_parties, args->pollset_set); } grpc_backoff_init(&r->backoff_state, GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS, GRPC_DNS_RECONNECT_BACKOFF_MULTIPLIER, @@ -273,9 +260,8 @@ static void dns_factory_ref(grpc_resolver_factory *factory) {} static void dns_factory_unref(grpc_resolver_factory *factory) {} static grpc_resolver *dns_factory_create_resolver( - grpc_exec_ctx *exec_ctx, grpc_resolver_factory *factory, - grpc_resolver_args *args) { - return dns_create(exec_ctx, args, "https"); + grpc_resolver_factory *factory, grpc_resolver_args *args) { + return dns_create(args, "https"); } static char *dns_factory_get_default_host_name(grpc_resolver_factory *factory, diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc index ed5b1011fbb..a35e232719e 100644 --- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc @@ -67,57 +67,52 @@ typedef struct { grpc_channel_args** target_result; } fake_resolver; -static void fake_resolver_destroy(grpc_exec_ctx* exec_ctx, grpc_resolver* gr) { +static void fake_resolver_destroy(grpc_resolver* gr) { fake_resolver* r = (fake_resolver*)gr; - grpc_channel_args_destroy(exec_ctx, r->next_results); - grpc_channel_args_destroy(exec_ctx, r->results_upon_error); - grpc_channel_args_destroy(exec_ctx, r->channel_args); + grpc_channel_args_destroy(r->next_results); + grpc_channel_args_destroy(r->results_upon_error); + grpc_channel_args_destroy(r->channel_args); gpr_free(r); } -static void fake_resolver_shutdown_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* resolver) { +static void fake_resolver_shutdown_locked(grpc_resolver* resolver) { fake_resolver* r = (fake_resolver*)resolver; if (r->next_completion != NULL) { *r->target_result = NULL; - GRPC_CLOSURE_SCHED( - exec_ctx, r->next_completion, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resolver Shutdown")); + GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Resolver Shutdown")); r->next_completion = NULL; } } -static void fake_resolver_maybe_finish_next_locked(grpc_exec_ctx* exec_ctx, - fake_resolver* r) { +static void fake_resolver_maybe_finish_next_locked(fake_resolver* r) { if (r->next_completion != NULL && r->next_results != NULL) { *r->target_result = grpc_channel_args_union(r->next_results, r->channel_args); - grpc_channel_args_destroy(exec_ctx, r->next_results); + grpc_channel_args_destroy(r->next_results); r->next_results = NULL; - GRPC_CLOSURE_SCHED(exec_ctx, r->next_completion, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_NONE); r->next_completion = NULL; } } -static void fake_resolver_channel_saw_error_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* resolver) { +static void fake_resolver_channel_saw_error_locked(grpc_resolver* resolver) { fake_resolver* r = (fake_resolver*)resolver; if (r->next_results == NULL && r->results_upon_error != NULL) { // Pretend we re-resolved. r->next_results = grpc_channel_args_copy(r->results_upon_error); } - fake_resolver_maybe_finish_next_locked(exec_ctx, r); + fake_resolver_maybe_finish_next_locked(r); } -static void fake_resolver_next_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* resolver, +static void fake_resolver_next_locked(grpc_resolver* resolver, grpc_channel_args** target_result, grpc_closure* on_complete) { fake_resolver* r = (fake_resolver*)resolver; GPR_ASSERT(!r->next_completion); r->next_completion = on_complete; r->target_result = target_result; - fake_resolver_maybe_finish_next_locked(exec_ctx, r); + fake_resolver_maybe_finish_next_locked(r); } static const grpc_resolver_vtable fake_resolver_vtable = { @@ -157,33 +152,31 @@ typedef struct set_response_closure_arg { grpc_channel_args* next_response; } set_response_closure_arg; -static void set_response_closure_fn(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void set_response_closure_fn(void* arg, grpc_error* error) { set_response_closure_arg* closure_arg = (set_response_closure_arg*)arg; grpc_fake_resolver_response_generator* generator = closure_arg->generator; fake_resolver* r = generator->resolver; if (r->next_results != NULL) { - grpc_channel_args_destroy(exec_ctx, r->next_results); + grpc_channel_args_destroy(r->next_results); } r->next_results = closure_arg->next_response; if (r->results_upon_error != NULL) { - grpc_channel_args_destroy(exec_ctx, r->results_upon_error); + grpc_channel_args_destroy(r->results_upon_error); } r->results_upon_error = grpc_channel_args_copy(closure_arg->next_response); gpr_free(closure_arg); - fake_resolver_maybe_finish_next_locked(exec_ctx, r); + fake_resolver_maybe_finish_next_locked(r); } void grpc_fake_resolver_response_generator_set_response( - grpc_exec_ctx* exec_ctx, grpc_fake_resolver_response_generator* generator, + grpc_fake_resolver_response_generator* generator, grpc_channel_args* next_response) { GPR_ASSERT(generator->resolver != NULL); set_response_closure_arg* closure_arg = (set_response_closure_arg*)gpr_zalloc(sizeof(*closure_arg)); closure_arg->generator = generator; closure_arg->next_response = grpc_channel_args_copy(next_response); - GRPC_CLOSURE_SCHED(exec_ctx, - GRPC_CLOSURE_INIT(&closure_arg->set_response_closure, + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_INIT(&closure_arg->set_response_closure, set_response_closure_fn, closure_arg, grpc_combiner_scheduler( generator->resolver->base.combiner)), @@ -195,7 +188,7 @@ static void* response_generator_arg_copy(void* p) { (grpc_fake_resolver_response_generator*)p); } -static void response_generator_arg_destroy(grpc_exec_ctx* exec_ctx, void* p) { +static void response_generator_arg_destroy(void* p) { grpc_fake_resolver_response_generator_unref( (grpc_fake_resolver_response_generator*)p); } @@ -232,8 +225,7 @@ static void fake_resolver_factory_ref(grpc_resolver_factory* factory) {} static void fake_resolver_factory_unref(grpc_resolver_factory* factory) {} -static grpc_resolver* fake_resolver_create(grpc_exec_ctx* exec_ctx, - grpc_resolver_factory* factory, +static grpc_resolver* fake_resolver_create(grpc_resolver_factory* factory, grpc_resolver_args* args) { fake_resolver* r = (fake_resolver*)gpr_zalloc(sizeof(*r)); r->channel_args = grpc_channel_args_copy(args->args); diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h index 95c3bafed82..85100f307b1 100644 --- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h +++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h @@ -43,7 +43,7 @@ grpc_fake_resolver_response_generator_create(); // Instruct the fake resolver associated with the \a response_generator instance // to trigger a new resolution for \a uri and \a args. void grpc_fake_resolver_response_generator_set_response( - grpc_exec_ctx* exec_ctx, grpc_fake_resolver_response_generator* generator, + grpc_fake_resolver_response_generator* generator, grpc_channel_args* next_response); // Return a \a grpc_arg for a \a grpc_fake_resolver_response_generator instance. diff --git a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc b/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc index dda9542325d..5519ed72d94 100644 --- a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc @@ -52,15 +52,13 @@ typedef struct { grpc_channel_args **target_result; } sockaddr_resolver; -static void sockaddr_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *r); +static void sockaddr_destroy(grpc_resolver *r); -static void sockaddr_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx, - sockaddr_resolver *r); +static void sockaddr_maybe_finish_next_locked(sockaddr_resolver *r); -static void sockaddr_shutdown_locked(grpc_exec_ctx *exec_ctx, grpc_resolver *r); -static void sockaddr_channel_saw_error_locked(grpc_exec_ctx *exec_ctx, - grpc_resolver *r); -static void sockaddr_next_locked(grpc_exec_ctx *exec_ctx, grpc_resolver *r, +static void sockaddr_shutdown_locked(grpc_resolver *r); +static void sockaddr_channel_saw_error_locked(grpc_resolver *r); +static void sockaddr_next_locked(grpc_resolver *r, grpc_channel_args **target_result, grpc_closure *on_complete); @@ -68,52 +66,47 @@ static const grpc_resolver_vtable sockaddr_resolver_vtable = { sockaddr_destroy, sockaddr_shutdown_locked, sockaddr_channel_saw_error_locked, sockaddr_next_locked}; -static void sockaddr_shutdown_locked(grpc_exec_ctx *exec_ctx, - grpc_resolver *resolver) { +static void sockaddr_shutdown_locked(grpc_resolver *resolver) { sockaddr_resolver *r = (sockaddr_resolver *)resolver; if (r->next_completion != NULL) { *r->target_result = NULL; - GRPC_CLOSURE_SCHED( - exec_ctx, r->next_completion, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resolver Shutdown")); + GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Resolver Shutdown")); r->next_completion = NULL; } } -static void sockaddr_channel_saw_error_locked(grpc_exec_ctx *exec_ctx, - grpc_resolver *resolver) { +static void sockaddr_channel_saw_error_locked(grpc_resolver *resolver) { sockaddr_resolver *r = (sockaddr_resolver *)resolver; r->published = false; - sockaddr_maybe_finish_next_locked(exec_ctx, r); + sockaddr_maybe_finish_next_locked(r); } -static void sockaddr_next_locked(grpc_exec_ctx *exec_ctx, - grpc_resolver *resolver, +static void sockaddr_next_locked(grpc_resolver *resolver, grpc_channel_args **target_result, grpc_closure *on_complete) { sockaddr_resolver *r = (sockaddr_resolver *)resolver; GPR_ASSERT(!r->next_completion); r->next_completion = on_complete; r->target_result = target_result; - sockaddr_maybe_finish_next_locked(exec_ctx, r); + sockaddr_maybe_finish_next_locked(r); } -static void sockaddr_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx, - sockaddr_resolver *r) { +static void sockaddr_maybe_finish_next_locked(sockaddr_resolver *r) { if (r->next_completion != NULL && !r->published) { r->published = true; grpc_arg arg = grpc_lb_addresses_create_channel_arg(r->addresses); *r->target_result = grpc_channel_args_copy_and_add(r->channel_args, &arg, 1); - GRPC_CLOSURE_SCHED(exec_ctx, r->next_completion, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_NONE); r->next_completion = NULL; } } -static void sockaddr_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) { +static void sockaddr_destroy(grpc_resolver *gr) { sockaddr_resolver *r = (sockaddr_resolver *)gr; - grpc_lb_addresses_destroy(exec_ctx, r->addresses); - grpc_channel_args_destroy(exec_ctx, r->channel_args); + grpc_lb_addresses_destroy(r->addresses); + grpc_channel_args_destroy(r->channel_args); gpr_free(r); } @@ -142,8 +135,7 @@ char *unix_get_default_authority(grpc_resolver_factory *factory, static void do_nothing(void *ignored) {} -static grpc_resolver *sockaddr_create(grpc_exec_ctx *exec_ctx, - grpc_resolver_args *args, +static grpc_resolver *sockaddr_create(grpc_resolver_args *args, bool parse(const grpc_uri *uri, grpc_resolved_address *dst)) { if (0 != strcmp(args->uri->authority, "")) { @@ -170,10 +162,10 @@ static grpc_resolver *sockaddr_create(grpc_exec_ctx *exec_ctx, gpr_free(part_str); if (errors_found) break; } - grpc_slice_buffer_destroy_internal(exec_ctx, &path_parts); - grpc_slice_unref_internal(exec_ctx, path_slice); + grpc_slice_buffer_destroy_internal(&path_parts); + grpc_slice_unref_internal(path_slice); if (errors_found) { - grpc_lb_addresses_destroy(exec_ctx, addresses); + grpc_lb_addresses_destroy(addresses); return NULL; } /* Instantiate resolver. */ @@ -195,9 +187,8 @@ static void sockaddr_factory_unref(grpc_resolver_factory *factory) {} #define DECL_FACTORY(name) \ static grpc_resolver *name##_factory_create_resolver( \ - grpc_exec_ctx *exec_ctx, grpc_resolver_factory *factory, \ - grpc_resolver_args *args) { \ - return sockaddr_create(exec_ctx, args, grpc_parse_##name); \ + grpc_resolver_factory *factory, grpc_resolver_args *args) { \ + return sockaddr_create(args, grpc_parse_##name); \ } \ static const grpc_resolver_factory_vtable name##_factory_vtable = { \ sockaddr_factory_ref, sockaddr_factory_unref, \ diff --git a/src/core/ext/filters/client_channel/resolver_factory.cc b/src/core/ext/filters/client_channel/resolver_factory.cc index 6f0a7c1e362..5b8ff8db5c0 100644 --- a/src/core/ext/filters/client_channel/resolver_factory.cc +++ b/src/core/ext/filters/client_channel/resolver_factory.cc @@ -28,10 +28,9 @@ void grpc_resolver_factory_unref(grpc_resolver_factory* factory) { /** Create a resolver instance for a name */ grpc_resolver* grpc_resolver_factory_create_resolver( - grpc_exec_ctx* exec_ctx, grpc_resolver_factory* factory, - grpc_resolver_args* args) { + grpc_resolver_factory* factory, grpc_resolver_args* args) { if (factory == NULL) return NULL; - return factory->vtable->create_resolver(exec_ctx, factory, args); + return factory->vtable->create_resolver(factory, args); } char* grpc_resolver_factory_get_default_authority( diff --git a/src/core/ext/filters/client_channel/resolver_factory.h b/src/core/ext/filters/client_channel/resolver_factory.h index c8b2c58db3e..37ab9087e7e 100644 --- a/src/core/ext/filters/client_channel/resolver_factory.h +++ b/src/core/ext/filters/client_channel/resolver_factory.h @@ -47,8 +47,7 @@ struct grpc_resolver_factory_vtable { void (*unref)(grpc_resolver_factory *factory); /** Implementation of grpc_resolver_factory_create_resolver */ - grpc_resolver *(*create_resolver)(grpc_exec_ctx *exec_ctx, - grpc_resolver_factory *factory, + grpc_resolver *(*create_resolver)(grpc_resolver_factory *factory, grpc_resolver_args *args); /** Implementation of grpc_resolver_factory_get_default_authority */ @@ -63,8 +62,7 @@ void grpc_resolver_factory_unref(grpc_resolver_factory *resolver); /** Create a resolver instance for a name */ grpc_resolver *grpc_resolver_factory_create_resolver( - grpc_exec_ctx *exec_ctx, grpc_resolver_factory *factory, - grpc_resolver_args *args); + grpc_resolver_factory *factory, grpc_resolver_args *args); /** Return a (freshly allocated with gpr_malloc) string representing the default authority to use for this scheme. */ diff --git a/src/core/ext/filters/client_channel/resolver_registry.cc b/src/core/ext/filters/client_channel/resolver_registry.cc index 1a0fb0bc3cf..05e88abd418 100644 --- a/src/core/ext/filters/client_channel/resolver_registry.cc +++ b/src/core/ext/filters/client_channel/resolver_registry.cc @@ -92,23 +92,22 @@ static grpc_resolver_factory *lookup_factory_by_uri(grpc_uri *uri) { return lookup_factory(uri->scheme); } -static grpc_resolver_factory *resolve_factory(grpc_exec_ctx *exec_ctx, - const char *target, +static grpc_resolver_factory *resolve_factory(const char *target, grpc_uri **uri, char **canonical_target) { grpc_resolver_factory *factory = NULL; GPR_ASSERT(uri != NULL); - *uri = grpc_uri_parse(exec_ctx, target, 1); + *uri = grpc_uri_parse(target, 1); factory = lookup_factory_by_uri(*uri); if (factory == NULL) { grpc_uri_destroy(*uri); gpr_asprintf(canonical_target, "%s%s", g_default_resolver_prefix, target); - *uri = grpc_uri_parse(exec_ctx, *canonical_target, 1); + *uri = grpc_uri_parse(*canonical_target, 1); factory = lookup_factory_by_uri(*uri); if (factory == NULL) { - grpc_uri_destroy(grpc_uri_parse(exec_ctx, target, 0)); - grpc_uri_destroy(grpc_uri_parse(exec_ctx, *canonical_target, 0)); + grpc_uri_destroy(grpc_uri_parse(target, 0)); + grpc_uri_destroy(grpc_uri_parse(*canonical_target, 0)); gpr_log(GPR_ERROR, "don't know how to resolve '%s' or '%s'", target, *canonical_target); } @@ -116,14 +115,14 @@ static grpc_resolver_factory *resolve_factory(grpc_exec_ctx *exec_ctx, return factory; } -grpc_resolver *grpc_resolver_create(grpc_exec_ctx *exec_ctx, const char *target, +grpc_resolver *grpc_resolver_create(const char *target, const grpc_channel_args *args, grpc_pollset_set *pollset_set, grpc_combiner *combiner) { grpc_uri *uri = NULL; char *canonical_target = NULL; grpc_resolver_factory *factory = - resolve_factory(exec_ctx, target, &uri, &canonical_target); + resolve_factory(target, &uri, &canonical_target); grpc_resolver *resolver; grpc_resolver_args resolver_args; memset(&resolver_args, 0, sizeof(resolver_args)); @@ -131,29 +130,27 @@ grpc_resolver *grpc_resolver_create(grpc_exec_ctx *exec_ctx, const char *target, resolver_args.args = args; resolver_args.pollset_set = pollset_set; resolver_args.combiner = combiner; - resolver = - grpc_resolver_factory_create_resolver(exec_ctx, factory, &resolver_args); + resolver = grpc_resolver_factory_create_resolver(factory, &resolver_args); grpc_uri_destroy(uri); gpr_free(canonical_target); return resolver; } -char *grpc_get_default_authority(grpc_exec_ctx *exec_ctx, const char *target) { +char *grpc_get_default_authority(const char *target) { grpc_uri *uri = NULL; char *canonical_target = NULL; grpc_resolver_factory *factory = - resolve_factory(exec_ctx, target, &uri, &canonical_target); + resolve_factory(target, &uri, &canonical_target); char *authority = grpc_resolver_factory_get_default_authority(factory, uri); grpc_uri_destroy(uri); gpr_free(canonical_target); return authority; } -char *grpc_resolver_factory_add_default_prefix_if_needed( - grpc_exec_ctx *exec_ctx, const char *target) { +char *grpc_resolver_factory_add_default_prefix_if_needed(const char *target) { grpc_uri *uri = NULL; char *canonical_target = NULL; - resolve_factory(exec_ctx, target, &uri, &canonical_target); + resolve_factory(target, &uri, &canonical_target); grpc_uri_destroy(uri); return canonical_target == NULL ? gpr_strdup(target) : canonical_target; } diff --git a/src/core/ext/filters/client_channel/resolver_registry.h b/src/core/ext/filters/client_channel/resolver_registry.h index 06d0b99a355..80283498611 100644 --- a/src/core/ext/filters/client_channel/resolver_registry.h +++ b/src/core/ext/filters/client_channel/resolver_registry.h @@ -52,7 +52,7 @@ void grpc_register_resolver_type(grpc_resolver_factory *factory); (typically the set of arguments passed in from the client API). \a pollset_set is used to drive IO in the name resolution process, it should not be NULL. */ -grpc_resolver *grpc_resolver_create(grpc_exec_ctx *exec_ctx, const char *target, +grpc_resolver *grpc_resolver_create(const char *target, const grpc_channel_args *args, grpc_pollset_set *pollset_set, grpc_combiner *combiner); @@ -63,12 +63,11 @@ grpc_resolver_factory *grpc_resolver_factory_lookup(const char *name); /** Given a target, return a (freshly allocated with gpr_malloc) string representing the default authority to pass from a client. */ -char *grpc_get_default_authority(grpc_exec_ctx *exec_ctx, const char *target); +char *grpc_get_default_authority(const char *target); /** Returns a newly allocated string containing \a target, adding the default prefix if needed. */ -char *grpc_resolver_factory_add_default_prefix_if_needed( - grpc_exec_ctx *exec_ctx, const char *target); +char *grpc_resolver_factory_add_default_prefix_if_needed(const char *target); #ifdef __cplusplus } diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc index 5710a221784..34ac7133ac2 100644 --- a/src/core/ext/filters/client_channel/subchannel.cc +++ b/src/core/ext/filters/client_channel/subchannel.cc @@ -139,8 +139,7 @@ struct grpc_subchannel_call { #define CALLSTACK_TO_SUBCHANNEL_CALL(callstack) \ (((grpc_subchannel_call *)(callstack)) - 1) -static void subchannel_connected(grpc_exec_ctx *exec_ctx, void *subchannel, - grpc_error *error); +static void subchannel_connected(void *subchannel, grpc_error *error); #ifndef NDEBUG #define REF_REASON reason @@ -157,10 +156,9 @@ static void subchannel_connected(grpc_exec_ctx *exec_ctx, void *subchannel, * connection implementation */ -static void connection_destroy(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void connection_destroy(void *arg, grpc_error *error) { grpc_connected_subchannel *c = (grpc_connected_subchannel *)arg; - grpc_channel_stack_destroy(exec_ctx, CHANNEL_STACK_FROM_CONNECTION(c)); + grpc_channel_stack_destroy(CHANNEL_STACK_FROM_CONNECTION(c)); gpr_free(c); } @@ -170,26 +168,23 @@ grpc_connected_subchannel *grpc_connected_subchannel_ref( return c; } -void grpc_connected_subchannel_unref(grpc_exec_ctx *exec_ctx, - grpc_connected_subchannel *c - GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { - GRPC_CHANNEL_STACK_UNREF(exec_ctx, CHANNEL_STACK_FROM_CONNECTION(c), - REF_REASON); +void grpc_connected_subchannel_unref( + grpc_connected_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { + GRPC_CHANNEL_STACK_UNREF(CHANNEL_STACK_FROM_CONNECTION(c), REF_REASON); } /* * grpc_subchannel implementation */ -static void subchannel_destroy(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void subchannel_destroy(void *arg, grpc_error *error) { grpc_subchannel *c = (grpc_subchannel *)arg; gpr_free((void *)c->filters); - grpc_channel_args_destroy(exec_ctx, c->args); - grpc_connectivity_state_destroy(exec_ctx, &c->state_tracker); - grpc_connector_unref(exec_ctx, c->connector); - grpc_pollset_set_destroy(exec_ctx, c->pollset_set); - grpc_subchannel_key_destroy(exec_ctx, c->key); + grpc_channel_args_destroy(c->args); + grpc_connectivity_state_destroy(&c->state_tracker); + grpc_connector_unref(c->connector); + grpc_pollset_set_destroy(c->pollset_set); + grpc_subchannel_key_destroy(c->key); gpr_mu_destroy(&c->mu); gpr_free(c); } @@ -241,58 +236,54 @@ grpc_subchannel *grpc_subchannel_ref_from_weak_ref( } } -static void disconnect(grpc_exec_ctx *exec_ctx, grpc_subchannel *c) { +static void disconnect(grpc_subchannel *c) { grpc_connected_subchannel *con; - grpc_subchannel_index_unregister(exec_ctx, c->key, c); + grpc_subchannel_index_unregister(c->key, c); gpr_mu_lock(&c->mu); GPR_ASSERT(!c->disconnected); c->disconnected = true; - grpc_connector_shutdown( - exec_ctx, c->connector, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Subchannel disconnected")); + grpc_connector_shutdown(c->connector, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Subchannel disconnected")); con = GET_CONNECTED_SUBCHANNEL(c, no_barrier); if (con != NULL) { - GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, con, "connection"); + GRPC_CONNECTED_SUBCHANNEL_UNREF(con, "connection"); gpr_atm_no_barrier_store(&c->connected_subchannel, (gpr_atm)0xdeadbeef); } gpr_mu_unlock(&c->mu); } -void grpc_subchannel_unref(grpc_exec_ctx *exec_ctx, - grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { +void grpc_subchannel_unref(grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { gpr_atm old_refs; // add a weak ref and subtract a strong ref (atomically) old_refs = ref_mutate(c, (gpr_atm)1 - (gpr_atm)(1 << INTERNAL_REF_BITS), 1 REF_MUTATE_PURPOSE("STRONG_UNREF")); if ((old_refs & STRONG_REF_MASK) == (1 << INTERNAL_REF_BITS)) { - disconnect(exec_ctx, c); + disconnect(c); } - GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "strong-unref"); + GRPC_SUBCHANNEL_WEAK_UNREF(c, "strong-unref"); } -void grpc_subchannel_weak_unref(grpc_exec_ctx *exec_ctx, - grpc_subchannel *c - GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { +void grpc_subchannel_weak_unref( + grpc_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { gpr_atm old_refs; old_refs = ref_mutate(c, -(gpr_atm)1, 1 REF_MUTATE_PURPOSE("WEAK_UNREF")); if (old_refs == 1) { - GRPC_CLOSURE_SCHED(exec_ctx, GRPC_CLOSURE_CREATE(subchannel_destroy, c, - grpc_schedule_on_exec_ctx), - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED( + GRPC_CLOSURE_CREATE(subchannel_destroy, c, grpc_schedule_on_exec_ctx), + GRPC_ERROR_NONE); } } -grpc_subchannel *grpc_subchannel_create(grpc_exec_ctx *exec_ctx, - grpc_connector *connector, +grpc_subchannel *grpc_subchannel_create(grpc_connector *connector, const grpc_subchannel_args *args) { grpc_subchannel_key *key = grpc_subchannel_key_create(args); - grpc_subchannel *c = grpc_subchannel_index_find(exec_ctx, key); + grpc_subchannel *c = grpc_subchannel_index_find(key); if (c) { - grpc_subchannel_key_destroy(exec_ctx, key); + grpc_subchannel_key_destroy(key); return c; } - GRPC_STATS_INC_CLIENT_SUBCHANNELS_CREATED(exec_ctx); + GRPC_STATS_INC_CLIENT_SUBCHANNELS_CREATED(); c = (grpc_subchannel *)gpr_zalloc(sizeof(*c)); c->key = key; gpr_atm_no_barrier_store(&c->ref_pair, 1 << INTERNAL_REF_BITS); @@ -310,10 +301,10 @@ grpc_subchannel *grpc_subchannel_create(grpc_exec_ctx *exec_ctx, c->pollset_set = grpc_pollset_set_create(); grpc_resolved_address *addr = (grpc_resolved_address *)gpr_malloc(sizeof(*addr)); - grpc_get_subchannel_address_arg(exec_ctx, args->args, addr); + grpc_get_subchannel_address_arg(args->args, addr); grpc_resolved_address *new_address = NULL; grpc_channel_args *new_args = NULL; - if (grpc_proxy_mappers_map_address(exec_ctx, addr, args->args, &new_address, + if (grpc_proxy_mappers_map_address(addr, args->args, &new_address, &new_args)) { GPR_ASSERT(new_address != NULL); gpr_free(addr); @@ -326,7 +317,7 @@ grpc_subchannel *grpc_subchannel_create(grpc_exec_ctx *exec_ctx, new_args != NULL ? new_args : args->args, keys_to_remove, GPR_ARRAY_SIZE(keys_to_remove), &new_arg, 1); gpr_free(new_arg.value.string); - if (new_args != NULL) grpc_channel_args_destroy(exec_ctx, new_args); + if (new_args != NULL) grpc_channel_args_destroy(new_args); c->root_external_state_watcher.next = c->root_external_state_watcher.prev = &c->root_external_state_watcher; GRPC_CLOSURE_INIT(&c->connected, subchannel_connected, c, @@ -372,21 +363,19 @@ grpc_subchannel *grpc_subchannel_create(grpc_exec_ctx *exec_ctx, min_backoff_ms, max_backoff_ms); gpr_mu_init(&c->mu); - return grpc_subchannel_index_register(exec_ctx, key, c); + return grpc_subchannel_index_register(key, c); } -static void continue_connect_locked(grpc_exec_ctx *exec_ctx, - grpc_subchannel *c) { +static void continue_connect_locked(grpc_subchannel *c) { grpc_connect_in_args args; args.interested_parties = c->pollset_set; args.deadline = c->next_attempt; args.channel_args = c->args; - grpc_connectivity_state_set(exec_ctx, &c->state_tracker, - GRPC_CHANNEL_CONNECTING, GRPC_ERROR_NONE, - "state_change"); - grpc_connector_connect(exec_ctx, c->connector, &args, &c->connecting_result, + grpc_connectivity_state_set(&c->state_tracker, GRPC_CHANNEL_CONNECTING, + GRPC_ERROR_NONE, "state_change"); + grpc_connector_connect(c->connector, &args, &c->connecting_result, &c->connected); } @@ -399,24 +388,23 @@ grpc_connectivity_state grpc_subchannel_check_connectivity(grpc_subchannel *c, return state; } -static void on_external_state_watcher_done(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void on_external_state_watcher_done(void *arg, grpc_error *error) { external_state_watcher *w = (external_state_watcher *)arg; grpc_closure *follow_up = w->notify; if (w->pollset_set != NULL) { - grpc_pollset_set_del_pollset_set(exec_ctx, w->subchannel->pollset_set, + grpc_pollset_set_del_pollset_set(w->subchannel->pollset_set, w->pollset_set); } gpr_mu_lock(&w->subchannel->mu); w->next->prev = w->prev; w->prev->next = w->next; gpr_mu_unlock(&w->subchannel->mu); - GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, w->subchannel, "external_state_watcher"); + GRPC_SUBCHANNEL_WEAK_UNREF(w->subchannel, "external_state_watcher"); gpr_free(w); - GRPC_CLOSURE_RUN(exec_ctx, follow_up, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(follow_up, GRPC_ERROR_REF(error)); } -static void on_alarm(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void on_alarm(void *arg, grpc_error *error) { grpc_subchannel *c = (grpc_subchannel *)arg; gpr_mu_lock(&c->mu); c->have_alarm = false; @@ -428,18 +416,17 @@ static void on_alarm(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { } if (error == GRPC_ERROR_NONE) { gpr_log(GPR_INFO, "Failed to connect to channel, retrying"); - c->next_attempt = grpc_backoff_step(exec_ctx, &c->backoff_state); - continue_connect_locked(exec_ctx, c); + c->next_attempt = grpc_backoff_step(&c->backoff_state); + continue_connect_locked(c); gpr_mu_unlock(&c->mu); } else { gpr_mu_unlock(&c->mu); - GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "connecting"); + GRPC_SUBCHANNEL_WEAK_UNREF(c, "connecting"); } GRPC_ERROR_UNREF(error); } -static void maybe_start_connecting_locked(grpc_exec_ctx *exec_ctx, - grpc_subchannel *c) { +static void maybe_start_connecting_locked(grpc_subchannel *c) { if (c->disconnected) { /* Don't try to connect if we're already disconnected */ return; @@ -465,27 +452,25 @@ static void maybe_start_connecting_locked(grpc_exec_ctx *exec_ctx, if (!c->backoff_begun) { c->backoff_begun = true; - c->next_attempt = grpc_backoff_begin(exec_ctx, &c->backoff_state); - continue_connect_locked(exec_ctx, c); + c->next_attempt = grpc_backoff_begin(&c->backoff_state); + continue_connect_locked(c); } else { GPR_ASSERT(!c->have_alarm); c->have_alarm = true; - const grpc_millis time_til_next = - c->next_attempt - grpc_exec_ctx_now(exec_ctx); + const grpc_millis time_til_next = c->next_attempt - grpc_exec_ctx_now(); if (time_til_next <= 0) { gpr_log(GPR_INFO, "Retry immediately"); } else { gpr_log(GPR_INFO, "Retry in %" PRIdPTR " milliseconds", time_til_next); } GRPC_CLOSURE_INIT(&c->on_alarm, on_alarm, c, grpc_schedule_on_exec_ctx); - grpc_timer_init(exec_ctx, &c->alarm, c->next_attempt, &c->on_alarm); + grpc_timer_init(&c->alarm, c->next_attempt, &c->on_alarm); } } void grpc_subchannel_notify_on_state_change( - grpc_exec_ctx *exec_ctx, grpc_subchannel *c, - grpc_pollset_set *interested_parties, grpc_connectivity_state *state, - grpc_closure *notify) { + grpc_subchannel *c, grpc_pollset_set *interested_parties, + grpc_connectivity_state *state, grpc_closure *notify) { external_state_watcher *w; if (state == NULL) { @@ -493,8 +478,8 @@ void grpc_subchannel_notify_on_state_change( for (w = c->root_external_state_watcher.next; w != &c->root_external_state_watcher; w = w->next) { if (w->notify == notify) { - grpc_connectivity_state_notify_on_state_change( - exec_ctx, &c->state_tracker, NULL, &w->closure); + grpc_connectivity_state_notify_on_state_change(&c->state_tracker, NULL, + &w->closure); } } gpr_mu_unlock(&c->mu); @@ -506,31 +491,28 @@ void grpc_subchannel_notify_on_state_change( GRPC_CLOSURE_INIT(&w->closure, on_external_state_watcher_done, w, grpc_schedule_on_exec_ctx); if (interested_parties != NULL) { - grpc_pollset_set_add_pollset_set(exec_ctx, c->pollset_set, - interested_parties); + grpc_pollset_set_add_pollset_set(c->pollset_set, interested_parties); } GRPC_SUBCHANNEL_WEAK_REF(c, "external_state_watcher"); gpr_mu_lock(&c->mu); w->next = &c->root_external_state_watcher; w->prev = w->next->prev; w->next->prev = w->prev->next = w; - grpc_connectivity_state_notify_on_state_change(exec_ctx, &c->state_tracker, - state, &w->closure); - maybe_start_connecting_locked(exec_ctx, c); + grpc_connectivity_state_notify_on_state_change(&c->state_tracker, state, + &w->closure); + maybe_start_connecting_locked(c); gpr_mu_unlock(&c->mu); } } void grpc_connected_subchannel_process_transport_op( - grpc_exec_ctx *exec_ctx, grpc_connected_subchannel *con, - grpc_transport_op *op) { + grpc_connected_subchannel *con, grpc_transport_op *op) { grpc_channel_stack *channel_stack = CHANNEL_STACK_FROM_CONNECTION(con); grpc_channel_element *top_elem = grpc_channel_stack_element(channel_stack, 0); - top_elem->filter->start_transport_op(exec_ctx, top_elem, op); + top_elem->filter->start_transport_op(top_elem, op); } -static void subchannel_on_child_state_changed(grpc_exec_ctx *exec_ctx, void *p, - grpc_error *error) { +static void subchannel_on_child_state_changed(void *p, grpc_error *error) { state_watcher *sw = (state_watcher *)p; grpc_subchannel *c = sw->subchannel; gpr_mu *mu = &c->mu; @@ -542,24 +524,22 @@ static void subchannel_on_child_state_changed(grpc_exec_ctx *exec_ctx, void *p, /* any errors on a subchannel ==> we're done, create a new one */ sw->connectivity_state = GRPC_CHANNEL_SHUTDOWN; } - grpc_connectivity_state_set(exec_ctx, &c->state_tracker, - sw->connectivity_state, GRPC_ERROR_REF(error), - "reflect_child"); + grpc_connectivity_state_set(&c->state_tracker, sw->connectivity_state, + GRPC_ERROR_REF(error), "reflect_child"); if (sw->connectivity_state != GRPC_CHANNEL_SHUTDOWN) { grpc_connected_subchannel_notify_on_state_change( - exec_ctx, GET_CONNECTED_SUBCHANNEL(c, no_barrier), NULL, - &sw->connectivity_state, &sw->closure); + GET_CONNECTED_SUBCHANNEL(c, no_barrier), NULL, &sw->connectivity_state, + &sw->closure); GRPC_SUBCHANNEL_WEAK_REF(c, "state_watcher"); sw = NULL; } gpr_mu_unlock(mu); - GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "state_watcher"); + GRPC_SUBCHANNEL_WEAK_UNREF(c, "state_watcher"); gpr_free(sw); } -static void connected_subchannel_state_op(grpc_exec_ctx *exec_ctx, - grpc_connected_subchannel *con, +static void connected_subchannel_state_op(grpc_connected_subchannel *con, grpc_pollset_set *interested_parties, grpc_connectivity_state *state, grpc_closure *closure) { @@ -569,29 +549,25 @@ static void connected_subchannel_state_op(grpc_exec_ctx *exec_ctx, op->on_connectivity_state_change = closure; op->bind_pollset_set = interested_parties; elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CONNECTION(con), 0); - elem->filter->start_transport_op(exec_ctx, elem, op); + elem->filter->start_transport_op(elem, op); } void grpc_connected_subchannel_notify_on_state_change( - grpc_exec_ctx *exec_ctx, grpc_connected_subchannel *con, - grpc_pollset_set *interested_parties, grpc_connectivity_state *state, - grpc_closure *closure) { - connected_subchannel_state_op(exec_ctx, con, interested_parties, state, - closure); + grpc_connected_subchannel *con, grpc_pollset_set *interested_parties, + grpc_connectivity_state *state, grpc_closure *closure) { + connected_subchannel_state_op(con, interested_parties, state, closure); } -void grpc_connected_subchannel_ping(grpc_exec_ctx *exec_ctx, - grpc_connected_subchannel *con, +void grpc_connected_subchannel_ping(grpc_connected_subchannel *con, grpc_closure *closure) { grpc_transport_op *op = grpc_make_transport_op(NULL); grpc_channel_element *elem; op->send_ping = closure; elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CONNECTION(con), 0); - elem->filter->start_transport_op(exec_ctx, elem, op); + elem->filter->start_transport_op(elem, op); } -static bool publish_transport_locked(grpc_exec_ctx *exec_ctx, - grpc_subchannel *c) { +static bool publish_transport_locked(grpc_subchannel *c) { grpc_connected_subchannel *con; grpc_channel_stack *stk; state_watcher *sw_subchannel; @@ -599,19 +575,18 @@ static bool publish_transport_locked(grpc_exec_ctx *exec_ctx, /* construct channel stack */ grpc_channel_stack_builder *builder = grpc_channel_stack_builder_create(); grpc_channel_stack_builder_set_channel_arguments( - exec_ctx, builder, c->connecting_result.channel_args); + builder, c->connecting_result.channel_args); grpc_channel_stack_builder_set_transport(builder, c->connecting_result.transport); - if (!grpc_channel_init_create_stack(exec_ctx, builder, - GRPC_CLIENT_SUBCHANNEL)) { - grpc_channel_stack_builder_destroy(exec_ctx, builder); + if (!grpc_channel_init_create_stack(builder, GRPC_CLIENT_SUBCHANNEL)) { + grpc_channel_stack_builder_destroy(builder); return false; } grpc_error *error = grpc_channel_stack_builder_finish( - exec_ctx, builder, 0, 1, connection_destroy, NULL, (void **)&con); + builder, 0, 1, connection_destroy, NULL, (void **)&con); if (error != GRPC_ERROR_NONE) { - grpc_transport_destroy(exec_ctx, c->connecting_result.transport); + grpc_transport_destroy(c->connecting_result.transport); gpr_log(GPR_ERROR, "error initializing subchannel stack: %s", grpc_error_string(error)); GRPC_ERROR_UNREF(error); @@ -629,7 +604,7 @@ static bool publish_transport_locked(grpc_exec_ctx *exec_ctx, if (c->disconnected) { gpr_free(sw_subchannel); - grpc_channel_stack_destroy(exec_ctx, stk); + grpc_channel_stack_destroy(stk); gpr_free(con); return false; } @@ -645,33 +620,31 @@ static bool publish_transport_locked(grpc_exec_ctx *exec_ctx, /* setup subchannel watching connected subchannel for changes; subchannel ref for connecting is donated to the state watcher */ GRPC_SUBCHANNEL_WEAK_REF(c, "state_watcher"); - GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "connecting"); + GRPC_SUBCHANNEL_WEAK_UNREF(c, "connecting"); grpc_connected_subchannel_notify_on_state_change( - exec_ctx, con, c->pollset_set, &sw_subchannel->connectivity_state, + con, c->pollset_set, &sw_subchannel->connectivity_state, &sw_subchannel->closure); /* signal completion */ - grpc_connectivity_state_set(exec_ctx, &c->state_tracker, GRPC_CHANNEL_READY, + grpc_connectivity_state_set(&c->state_tracker, GRPC_CHANNEL_READY, GRPC_ERROR_NONE, "connected"); return true; } -static void subchannel_connected(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void subchannel_connected(void *arg, grpc_error *error) { grpc_subchannel *c = (grpc_subchannel *)arg; grpc_channel_args *delete_channel_args = c->connecting_result.channel_args; GRPC_SUBCHANNEL_WEAK_REF(c, "connected"); gpr_mu_lock(&c->mu); c->connecting = false; - if (c->connecting_result.transport != NULL && - publish_transport_locked(exec_ctx, c)) { + if (c->connecting_result.transport != NULL && publish_transport_locked(c)) { /* do nothing, transport was published */ } else if (c->disconnected) { - GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "connecting"); + GRPC_SUBCHANNEL_WEAK_UNREF(c, "connecting"); } else { grpc_connectivity_state_set( - exec_ctx, &c->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + &c->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, grpc_error_set_int(GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Connect Failed", &error, 1), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE), @@ -680,27 +653,26 @@ static void subchannel_connected(grpc_exec_ctx *exec_ctx, void *arg, const char *errmsg = grpc_error_string(error); gpr_log(GPR_INFO, "Connect failed: %s", errmsg); - maybe_start_connecting_locked(exec_ctx, c); - GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "connecting"); + maybe_start_connecting_locked(c); + GRPC_SUBCHANNEL_WEAK_UNREF(c, "connecting"); } gpr_mu_unlock(&c->mu); - GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "connected"); - grpc_channel_args_destroy(exec_ctx, delete_channel_args); + GRPC_SUBCHANNEL_WEAK_UNREF(c, "connected"); + grpc_channel_args_destroy(delete_channel_args); } /* * grpc_subchannel_call implementation */ -static void subchannel_call_destroy(grpc_exec_ctx *exec_ctx, void *call, - grpc_error *error) { +static void subchannel_call_destroy(void *call, grpc_error *error) { grpc_subchannel_call *c = (grpc_subchannel_call *)call; GPR_ASSERT(c->schedule_closure_after_destroy != NULL); GPR_TIMER_BEGIN("grpc_subchannel_call_unref.destroy", 0); grpc_connected_subchannel *connection = c->connection; - grpc_call_stack_destroy(exec_ctx, SUBCHANNEL_CALL_TO_CALL_STACK(c), NULL, + grpc_call_stack_destroy(SUBCHANNEL_CALL_TO_CALL_STACK(c), NULL, c->schedule_closure_after_destroy); - GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, connection, "subchannel_call"); + GRPC_CONNECTED_SUBCHANNEL_UNREF(connection, "subchannel_call"); GPR_TIMER_END("grpc_subchannel_call_unref.destroy", 0); } @@ -716,20 +688,18 @@ void grpc_subchannel_call_ref( GRPC_CALL_STACK_REF(SUBCHANNEL_CALL_TO_CALL_STACK(c), REF_REASON); } -void grpc_subchannel_call_unref(grpc_exec_ctx *exec_ctx, - grpc_subchannel_call *c - GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { - GRPC_CALL_STACK_UNREF(exec_ctx, SUBCHANNEL_CALL_TO_CALL_STACK(c), REF_REASON); +void grpc_subchannel_call_unref( + grpc_subchannel_call *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { + GRPC_CALL_STACK_UNREF(SUBCHANNEL_CALL_TO_CALL_STACK(c), REF_REASON); } -void grpc_subchannel_call_process_op(grpc_exec_ctx *exec_ctx, - grpc_subchannel_call *call, +void grpc_subchannel_call_process_op(grpc_subchannel_call *call, grpc_transport_stream_op_batch *batch) { GPR_TIMER_BEGIN("grpc_subchannel_call_process_op", 0); grpc_call_stack *call_stack = SUBCHANNEL_CALL_TO_CALL_STACK(call); grpc_call_element *top_elem = grpc_call_stack_element(call_stack, 0); GRPC_CALL_LOG_OP(GPR_INFO, top_elem, batch); - top_elem->filter->start_transport_stream_op_batch(exec_ctx, top_elem, batch); + top_elem->filter->start_transport_stream_op_batch(top_elem, batch); GPR_TIMER_END("grpc_subchannel_call_process_op", 0); } @@ -744,7 +714,7 @@ const grpc_subchannel_key *grpc_subchannel_get_key( } grpc_error *grpc_connected_subchannel_create_call( - grpc_exec_ctx *exec_ctx, grpc_connected_subchannel *con, + grpc_connected_subchannel *con, const grpc_connected_subchannel_call_args *args, grpc_subchannel_call **call) { grpc_channel_stack *chanstk = CHANNEL_STACK_FROM_CONNECTION(con); @@ -762,14 +732,14 @@ grpc_error *grpc_connected_subchannel_create_call( args->arena, /* arena */ args->call_combiner /* call_combiner */ }; - grpc_error *error = grpc_call_stack_init( - exec_ctx, chanstk, 1, subchannel_call_destroy, *call, &call_args); + grpc_error *error = grpc_call_stack_init(chanstk, 1, subchannel_call_destroy, + *call, &call_args); if (error != GRPC_ERROR_NONE) { const char *error_string = grpc_error_string(error); gpr_log(GPR_ERROR, "error: %s", error_string); return error; } - grpc_call_stack_set_pollset_or_pollset_set(exec_ctx, callstk, args->pollent); + grpc_call_stack_set_pollset_or_pollset_set(callstk, args->pollent); return GRPC_ERROR_NONE; } @@ -778,21 +748,20 @@ grpc_call_stack *grpc_subchannel_call_get_call_stack( return SUBCHANNEL_CALL_TO_CALL_STACK(subchannel_call); } -static void grpc_uri_to_sockaddr(grpc_exec_ctx *exec_ctx, const char *uri_str, +static void grpc_uri_to_sockaddr(const char *uri_str, grpc_resolved_address *addr) { - grpc_uri *uri = grpc_uri_parse(exec_ctx, uri_str, 0 /* suppress_errors */); + grpc_uri *uri = grpc_uri_parse(uri_str, 0 /* suppress_errors */); GPR_ASSERT(uri != NULL); if (!grpc_parse_uri(uri, addr)) memset(addr, 0, sizeof(*addr)); grpc_uri_destroy(uri); } -void grpc_get_subchannel_address_arg(grpc_exec_ctx *exec_ctx, - const grpc_channel_args *args, +void grpc_get_subchannel_address_arg(const grpc_channel_args *args, grpc_resolved_address *addr) { const char *addr_uri_str = grpc_get_subchannel_address_uri_arg(args); memset(addr, 0, sizeof(*addr)); if (*addr_uri_str != '\0') { - grpc_uri_to_sockaddr(exec_ctx, addr_uri_str, addr); + grpc_uri_to_sockaddr(addr_uri_str, addr); } } diff --git a/src/core/ext/filters/client_channel/subchannel.h b/src/core/ext/filters/client_channel/subchannel.h index 46b29f1fe02..63d3353b7dd 100644 --- a/src/core/ext/filters/client_channel/subchannel.h +++ b/src/core/ext/filters/client_channel/subchannel.h @@ -46,36 +46,34 @@ typedef struct grpc_subchannel_key grpc_subchannel_key; grpc_subchannel_ref((p), __FILE__, __LINE__, (r)) #define GRPC_SUBCHANNEL_REF_FROM_WEAK_REF(p, r) \ grpc_subchannel_ref_from_weak_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_SUBCHANNEL_UNREF(cl, p, r) \ - grpc_subchannel_unref((cl), (p), __FILE__, __LINE__, (r)) +#define GRPC_SUBCHANNEL_UNREF(p, r) \ + grpc_subchannel_unref((p), __FILE__, __LINE__, (r)) #define GRPC_SUBCHANNEL_WEAK_REF(p, r) \ grpc_subchannel_weak_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_SUBCHANNEL_WEAK_UNREF(cl, p, r) \ - grpc_subchannel_weak_unref((cl), (p), __FILE__, __LINE__, (r)) +#define GRPC_SUBCHANNEL_WEAK_UNREF(p, r) \ + grpc_subchannel_weak_unref((p), __FILE__, __LINE__, (r)) #define GRPC_CONNECTED_SUBCHANNEL_REF(p, r) \ grpc_connected_subchannel_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_CONNECTED_SUBCHANNEL_UNREF(cl, p, r) \ - grpc_connected_subchannel_unref((cl), (p), __FILE__, __LINE__, (r)) +#define GRPC_CONNECTED_SUBCHANNEL_UNREF(p, r) \ + grpc_connected_subchannel_unref((p), __FILE__, __LINE__, (r)) #define GRPC_SUBCHANNEL_CALL_REF(p, r) \ grpc_subchannel_call_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_SUBCHANNEL_CALL_UNREF(cl, p, r) \ - grpc_subchannel_call_unref((cl), (p), __FILE__, __LINE__, (r)) +#define GRPC_SUBCHANNEL_CALL_UNREF(p, r) \ + grpc_subchannel_call_unref((p), __FILE__, __LINE__, (r)) #define GRPC_SUBCHANNEL_REF_EXTRA_ARGS \ , const char *file, int line, const char *reason #else #define GRPC_SUBCHANNEL_REF(p, r) grpc_subchannel_ref((p)) #define GRPC_SUBCHANNEL_REF_FROM_WEAK_REF(p, r) \ grpc_subchannel_ref_from_weak_ref((p)) -#define GRPC_SUBCHANNEL_UNREF(cl, p, r) grpc_subchannel_unref((cl), (p)) +#define GRPC_SUBCHANNEL_UNREF(p, r) grpc_subchannel_unref((p)) #define GRPC_SUBCHANNEL_WEAK_REF(p, r) grpc_subchannel_weak_ref((p)) -#define GRPC_SUBCHANNEL_WEAK_UNREF(cl, p, r) \ - grpc_subchannel_weak_unref((cl), (p)) +#define GRPC_SUBCHANNEL_WEAK_UNREF(p, r) grpc_subchannel_weak_unref((p)) #define GRPC_CONNECTED_SUBCHANNEL_REF(p, r) grpc_connected_subchannel_ref((p)) -#define GRPC_CONNECTED_SUBCHANNEL_UNREF(cl, p, r) \ - grpc_connected_subchannel_unref((cl), (p)) +#define GRPC_CONNECTED_SUBCHANNEL_UNREF(p, r) \ + grpc_connected_subchannel_unref((p)) #define GRPC_SUBCHANNEL_CALL_REF(p, r) grpc_subchannel_call_ref((p)) -#define GRPC_SUBCHANNEL_CALL_UNREF(cl, p, r) \ - grpc_subchannel_call_unref((cl), (p)) +#define GRPC_SUBCHANNEL_CALL_UNREF(p, r) grpc_subchannel_call_unref((p)) #define GRPC_SUBCHANNEL_REF_EXTRA_ARGS #endif @@ -83,24 +81,20 @@ grpc_subchannel *grpc_subchannel_ref( grpc_subchannel *channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); grpc_subchannel *grpc_subchannel_ref_from_weak_ref( grpc_subchannel *channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); -void grpc_subchannel_unref(grpc_exec_ctx *exec_ctx, - grpc_subchannel *channel - GRPC_SUBCHANNEL_REF_EXTRA_ARGS); +void grpc_subchannel_unref( + grpc_subchannel *channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); grpc_subchannel *grpc_subchannel_weak_ref( grpc_subchannel *channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); -void grpc_subchannel_weak_unref(grpc_exec_ctx *exec_ctx, - grpc_subchannel *channel - GRPC_SUBCHANNEL_REF_EXTRA_ARGS); +void grpc_subchannel_weak_unref( + grpc_subchannel *channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); 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 - GRPC_SUBCHANNEL_REF_EXTRA_ARGS); +void grpc_connected_subchannel_unref( + grpc_connected_subchannel *channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); void grpc_subchannel_call_ref( grpc_subchannel_call *call GRPC_SUBCHANNEL_REF_EXTRA_ARGS); -void grpc_subchannel_call_unref(grpc_exec_ctx *exec_ctx, - grpc_subchannel_call *call - GRPC_SUBCHANNEL_REF_EXTRA_ARGS); +void grpc_subchannel_call_unref( + grpc_subchannel_call *call GRPC_SUBCHANNEL_REF_EXTRA_ARGS); /** construct a subchannel call */ typedef struct { @@ -114,14 +108,13 @@ typedef struct { } grpc_connected_subchannel_call_args; grpc_error *grpc_connected_subchannel_create_call( - grpc_exec_ctx *exec_ctx, grpc_connected_subchannel *connected_subchannel, + grpc_connected_subchannel *connected_subchannel, const grpc_connected_subchannel_call_args *args, grpc_subchannel_call **subchannel_call); /** process a transport level op */ void grpc_connected_subchannel_process_transport_op( - grpc_exec_ctx *exec_ctx, grpc_connected_subchannel *subchannel, - grpc_transport_op *op); + grpc_connected_subchannel *subchannel, grpc_transport_op *op); /** poll the current connectivity state of a channel */ grpc_connectivity_state grpc_subchannel_check_connectivity( @@ -130,15 +123,12 @@ grpc_connectivity_state grpc_subchannel_check_connectivity( /** call notify when the connectivity state of a channel changes from *state. Updates *state with the new state of the channel */ void grpc_subchannel_notify_on_state_change( - grpc_exec_ctx *exec_ctx, grpc_subchannel *channel, - grpc_pollset_set *interested_parties, grpc_connectivity_state *state, - grpc_closure *notify); + grpc_subchannel *channel, grpc_pollset_set *interested_parties, + grpc_connectivity_state *state, grpc_closure *notify); void grpc_connected_subchannel_notify_on_state_change( - grpc_exec_ctx *exec_ctx, grpc_connected_subchannel *channel, - grpc_pollset_set *interested_parties, grpc_connectivity_state *state, - grpc_closure *notify); -void grpc_connected_subchannel_ping(grpc_exec_ctx *exec_ctx, - grpc_connected_subchannel *channel, + grpc_connected_subchannel *channel, grpc_pollset_set *interested_parties, + grpc_connectivity_state *state, grpc_closure *notify); +void grpc_connected_subchannel_ping(grpc_connected_subchannel *channel, grpc_closure *notify); /** retrieve the grpc_connected_subchannel - or NULL if called before @@ -151,8 +141,7 @@ const grpc_subchannel_key *grpc_subchannel_get_key( const grpc_subchannel *subchannel); /** continue processing a transport op */ -void grpc_subchannel_call_process_op(grpc_exec_ctx *exec_ctx, - grpc_subchannel_call *subchannel_call, +void grpc_subchannel_call_process_op(grpc_subchannel_call *subchannel_call, grpc_transport_stream_op_batch *op); /** Must be called once per call. Sets the 'then_schedule_closure' argument for @@ -176,13 +165,11 @@ struct grpc_subchannel_args { }; /** create a subchannel given a connector */ -grpc_subchannel *grpc_subchannel_create(grpc_exec_ctx *exec_ctx, - grpc_connector *connector, +grpc_subchannel *grpc_subchannel_create(grpc_connector *connector, const grpc_subchannel_args *args); /// Sets \a addr from \a args. -void grpc_get_subchannel_address_arg(grpc_exec_ctx *exec_ctx, - const grpc_channel_args *args, +void grpc_get_subchannel_address_arg(const grpc_channel_args *args, grpc_resolved_address *addr); /// Returns the URI string for the address to connect to. diff --git a/src/core/ext/filters/client_channel/subchannel_index.cc b/src/core/ext/filters/client_channel/subchannel_index.cc index 1f466ec0b8f..f7e0725767f 100644 --- a/src/core/ext/filters/client_channel/subchannel_index.cc +++ b/src/core/ext/filters/client_channel/subchannel_index.cc @@ -81,16 +81,14 @@ int grpc_subchannel_key_compare(const grpc_subchannel_key *a, return grpc_channel_args_compare(a->args.args, b->args.args); } -void grpc_subchannel_key_destroy(grpc_exec_ctx *exec_ctx, - grpc_subchannel_key *k) { +void grpc_subchannel_key_destroy(grpc_subchannel_key *k) { gpr_free((grpc_channel_args *)k->args.filters); - grpc_channel_args_destroy(exec_ctx, (grpc_channel_args *)k->args.args); + grpc_channel_args_destroy((grpc_channel_args *)k->args.args); gpr_free(k); } static void sck_avl_destroy(void *p, void *user_data) { - grpc_exec_ctx *exec_ctx = (grpc_exec_ctx *)user_data; - grpc_subchannel_key_destroy(exec_ctx, (grpc_subchannel_key *)p); + grpc_subchannel_key_destroy((grpc_subchannel_key *)p); } static void *sck_avl_copy(void *p, void *unused) { @@ -103,9 +101,7 @@ static long sck_avl_compare(void *a, void *b, void *unused) { } static void scv_avl_destroy(void *p, void *user_data) { - grpc_exec_ctx *exec_ctx = (grpc_exec_ctx *)user_data; - GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, (grpc_subchannel *)p, - "subchannel_index"); + GRPC_SUBCHANNEL_WEAK_UNREF((grpc_subchannel *)p, "subchannel_index"); } static void *scv_avl_copy(void *p, void *unused) { @@ -136,32 +132,30 @@ void grpc_subchannel_index_shutdown(void) { void grpc_subchannel_index_unref(void) { if (gpr_unref(&g_refcount)) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; gpr_mu_destroy(&g_mu); gpr_avl_unref(g_subchannel_index, &exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } } void grpc_subchannel_index_ref(void) { gpr_ref_non_zero(&g_refcount); } -grpc_subchannel *grpc_subchannel_index_find(grpc_exec_ctx *exec_ctx, - grpc_subchannel_key *key) { +grpc_subchannel *grpc_subchannel_index_find(grpc_subchannel_key *key) { // Lock, and take a reference to the subchannel index. // We don't need to do the search under a lock as avl's are immutable. gpr_mu_lock(&g_mu); - gpr_avl index = gpr_avl_ref(g_subchannel_index, exec_ctx); + gpr_avl index = gpr_avl_ref(g_subchannel_index, &exec_ctx); gpr_mu_unlock(&g_mu); grpc_subchannel *c = GRPC_SUBCHANNEL_REF_FROM_WEAK_REF( - (grpc_subchannel *)gpr_avl_get(index, key, exec_ctx), "index_find"); - gpr_avl_unref(index, exec_ctx); + (grpc_subchannel *)gpr_avl_get(index, key, &exec_ctx), "index_find"); + gpr_avl_unref(index, &exec_ctx); return c; } -grpc_subchannel *grpc_subchannel_index_register(grpc_exec_ctx *exec_ctx, - grpc_subchannel_key *key, +grpc_subchannel *grpc_subchannel_index_register(grpc_subchannel_key *key, grpc_subchannel *constructed) { grpc_subchannel *c = NULL; bool need_to_unref_constructed; @@ -172,11 +166,11 @@ grpc_subchannel *grpc_subchannel_index_register(grpc_exec_ctx *exec_ctx, // Compare and swap loop: // - take a reference to the current index gpr_mu_lock(&g_mu); - gpr_avl index = gpr_avl_ref(g_subchannel_index, exec_ctx); + gpr_avl index = gpr_avl_ref(g_subchannel_index, &exec_ctx); gpr_mu_unlock(&g_mu); // - Check to see if a subchannel already exists - c = (grpc_subchannel *)gpr_avl_get(index, key, exec_ctx); + c = (grpc_subchannel *)gpr_avl_get(index, key, &exec_ctx); if (c != NULL) { c = GRPC_SUBCHANNEL_REF_FROM_WEAK_REF(c, "index_register"); } @@ -186,8 +180,8 @@ grpc_subchannel *grpc_subchannel_index_register(grpc_exec_ctx *exec_ctx, } else { // no -> update the avl and compare/swap gpr_avl updated = gpr_avl_add( - gpr_avl_ref(index, exec_ctx), subchannel_key_copy(key), - GRPC_SUBCHANNEL_WEAK_REF(constructed, "index_register"), exec_ctx); + gpr_avl_ref(index, &exec_ctx), subchannel_key_copy(key), + GRPC_SUBCHANNEL_WEAK_REF(constructed, "index_register"), &exec_ctx); // it may happen (but it's expected to be unlikely) // that some other thread has changed the index: @@ -199,41 +193,40 @@ grpc_subchannel *grpc_subchannel_index_register(grpc_exec_ctx *exec_ctx, } gpr_mu_unlock(&g_mu); - gpr_avl_unref(updated, exec_ctx); + gpr_avl_unref(updated, &exec_ctx); } - gpr_avl_unref(index, exec_ctx); + gpr_avl_unref(index, &exec_ctx); } if (need_to_unref_constructed) { - GRPC_SUBCHANNEL_UNREF(exec_ctx, constructed, "index_register"); + GRPC_SUBCHANNEL_UNREF(constructed, "index_register"); } return c; } -void grpc_subchannel_index_unregister(grpc_exec_ctx *exec_ctx, - grpc_subchannel_key *key, +void grpc_subchannel_index_unregister(grpc_subchannel_key *key, grpc_subchannel *constructed) { bool done = false; while (!done) { // Compare and swap loop: // - take a reference to the current index gpr_mu_lock(&g_mu); - gpr_avl index = gpr_avl_ref(g_subchannel_index, exec_ctx); + gpr_avl index = gpr_avl_ref(g_subchannel_index, &exec_ctx); gpr_mu_unlock(&g_mu); // Check to see if this key still refers to the previously // registered subchannel - grpc_subchannel *c = (grpc_subchannel *)gpr_avl_get(index, key, exec_ctx); + grpc_subchannel *c = (grpc_subchannel *)gpr_avl_get(index, key, &exec_ctx); if (c != constructed) { - gpr_avl_unref(index, exec_ctx); + gpr_avl_unref(index, &exec_ctx); break; } // compare and swap the update (some other thread may have // mutated the index behind us) gpr_avl updated = - gpr_avl_remove(gpr_avl_ref(index, exec_ctx), key, exec_ctx); + gpr_avl_remove(gpr_avl_ref(index, &exec_ctx), key, &exec_ctx); gpr_mu_lock(&g_mu); if (index.root == g_subchannel_index.root) { @@ -242,8 +235,8 @@ void grpc_subchannel_index_unregister(grpc_exec_ctx *exec_ctx, } gpr_mu_unlock(&g_mu); - gpr_avl_unref(updated, exec_ctx); - gpr_avl_unref(index, exec_ctx); + gpr_avl_unref(updated, &exec_ctx); + gpr_avl_unref(index, &exec_ctx); } } diff --git a/src/core/ext/filters/client_channel/subchannel_index.h b/src/core/ext/filters/client_channel/subchannel_index.h index 05c3878379f..9be618e44fc 100644 --- a/src/core/ext/filters/client_channel/subchannel_index.h +++ b/src/core/ext/filters/client_channel/subchannel_index.h @@ -33,26 +33,22 @@ grpc_subchannel_key *grpc_subchannel_key_create( const grpc_subchannel_args *args); /** Destroy a subchannel key */ -void grpc_subchannel_key_destroy(grpc_exec_ctx *exec_ctx, - grpc_subchannel_key *key); +void grpc_subchannel_key_destroy(grpc_subchannel_key *key); /** Given a subchannel key, find the subchannel registered for it. Returns NULL if no such channel exists. Thread-safe. */ -grpc_subchannel *grpc_subchannel_index_find(grpc_exec_ctx *exec_ctx, - grpc_subchannel_key *key); +grpc_subchannel *grpc_subchannel_index_find(grpc_subchannel_key *key); /** Register a subchannel against a key. Takes ownership of \a constructed. Returns the registered subchannel. This may be different from \a constructed in the case of a registration race. */ -grpc_subchannel *grpc_subchannel_index_register(grpc_exec_ctx *exec_ctx, - grpc_subchannel_key *key, +grpc_subchannel *grpc_subchannel_index_register(grpc_subchannel_key *key, grpc_subchannel *constructed); /** Remove \a constructed as the registered subchannel for \a key. */ -void grpc_subchannel_index_unregister(grpc_exec_ctx *exec_ctx, - grpc_subchannel_key *key, +void grpc_subchannel_index_unregister(grpc_subchannel_key *key, grpc_subchannel *constructed); int grpc_subchannel_key_compare(const grpc_subchannel_key *a, diff --git a/src/core/ext/filters/client_channel/uri_parser.cc b/src/core/ext/filters/client_channel/uri_parser.cc index fb4fb8e694c..4a5f25a7f3d 100644 --- a/src/core/ext/filters/client_channel/uri_parser.cc +++ b/src/core/ext/filters/client_channel/uri_parser.cc @@ -56,15 +56,15 @@ static grpc_uri *bad_uri(const char *uri_text, size_t pos, const char *section, } /** Returns a copy of percent decoded \a src[begin, end) */ -static char *decode_and_copy_component(grpc_exec_ctx *exec_ctx, const char *src, - size_t begin, size_t end) { +static char *decode_and_copy_component(const char *src, size_t begin, + size_t end) { grpc_slice component = grpc_slice_from_copied_buffer(src + begin, end - begin); grpc_slice decoded_component = grpc_permissive_percent_decode_slice(component); char *out = grpc_dump_slice(decoded_component, GPR_DUMP_ASCII); - grpc_slice_unref_internal(exec_ctx, component); - grpc_slice_unref_internal(exec_ctx, decoded_component); + grpc_slice_unref_internal(component); + grpc_slice_unref_internal(decoded_component); return out; } @@ -182,8 +182,7 @@ static void parse_query_parts(grpc_uri *uri) { } } -grpc_uri *grpc_uri_parse(grpc_exec_ctx *exec_ctx, const char *uri_text, - bool suppress_errors) { +grpc_uri *grpc_uri_parse(const char *uri_text, bool suppress_errors) { grpc_uri *uri; size_t scheme_begin = 0; size_t scheme_end = NOT_SET; @@ -271,16 +270,13 @@ grpc_uri *grpc_uri_parse(grpc_exec_ctx *exec_ctx, const char *uri_text, } uri = (grpc_uri *)gpr_zalloc(sizeof(*uri)); - uri->scheme = - decode_and_copy_component(exec_ctx, uri_text, scheme_begin, scheme_end); - uri->authority = decode_and_copy_component(exec_ctx, uri_text, - authority_begin, authority_end); - uri->path = - decode_and_copy_component(exec_ctx, uri_text, path_begin, path_end); - uri->query = - decode_and_copy_component(exec_ctx, uri_text, query_begin, query_end); - uri->fragment = decode_and_copy_component(exec_ctx, uri_text, fragment_begin, - fragment_end); + uri->scheme = decode_and_copy_component(uri_text, scheme_begin, scheme_end); + uri->authority = + decode_and_copy_component(uri_text, authority_begin, authority_end); + uri->path = decode_and_copy_component(uri_text, path_begin, path_end); + uri->query = decode_and_copy_component(uri_text, query_begin, query_end); + uri->fragment = + decode_and_copy_component(uri_text, fragment_begin, fragment_end); parse_query_parts(uri); return uri; diff --git a/src/core/ext/filters/client_channel/uri_parser.h b/src/core/ext/filters/client_channel/uri_parser.h index e78da5928b6..4ef6997c77f 100644 --- a/src/core/ext/filters/client_channel/uri_parser.h +++ b/src/core/ext/filters/client_channel/uri_parser.h @@ -41,8 +41,7 @@ typedef struct { } grpc_uri; /** parse a uri, return NULL on failure */ -grpc_uri *grpc_uri_parse(grpc_exec_ctx *exec_ctx, const char *uri_text, - bool suppress_errors); +grpc_uri *grpc_uri_parse(const char *uri_text, bool suppress_errors); /** return the part of a query string after the '=' in "?key=xxx&...", or NULL * if key is not present */ diff --git a/src/core/ext/filters/deadline/deadline_filter.cc b/src/core/ext/filters/deadline/deadline_filter.cc index dc194ec0684..3333800188e 100644 --- a/src/core/ext/filters/deadline/deadline_filter.cc +++ b/src/core/ext/filters/deadline/deadline_filter.cc @@ -36,18 +36,16 @@ // The on_complete callback used when sending a cancel_error batch down the // filter stack. Yields the call combiner when the batch returns. -static void yield_call_combiner(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* ignored) { +static void yield_call_combiner(void* arg, grpc_error* ignored) { grpc_deadline_state* deadline_state = (grpc_deadline_state*)arg; - GRPC_CALL_COMBINER_STOP(exec_ctx, deadline_state->call_combiner, + GRPC_CALL_COMBINER_STOP(deadline_state->call_combiner, "got on_complete from cancel_stream batch"); - GRPC_CALL_STACK_UNREF(exec_ctx, deadline_state->call_stack, "deadline_timer"); + GRPC_CALL_STACK_UNREF(deadline_state->call_stack, "deadline_timer"); } // This is called via the call combiner, so access to deadline_state is // synchronized. -static void send_cancel_op_in_call_combiner(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void send_cancel_op_in_call_combiner(void* arg, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; grpc_deadline_state* deadline_state = (grpc_deadline_state*)elem->call_data; grpc_transport_stream_op_batch* batch = grpc_make_transport_stream_op( @@ -55,37 +53,34 @@ static void send_cancel_op_in_call_combiner(grpc_exec_ctx* exec_ctx, void* arg, deadline_state, grpc_schedule_on_exec_ctx)); batch->cancel_stream = true; batch->payload->cancel_stream.cancel_error = GRPC_ERROR_REF(error); - elem->filter->start_transport_stream_op_batch(exec_ctx, elem, batch); + elem->filter->start_transport_stream_op_batch(elem, batch); } // Timer callback. -static void timer_callback(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void timer_callback(void* arg, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; grpc_deadline_state* deadline_state = (grpc_deadline_state*)elem->call_data; if (error != GRPC_ERROR_CANCELLED) { error = grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Deadline Exceeded"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_DEADLINE_EXCEEDED); - grpc_call_combiner_cancel(exec_ctx, deadline_state->call_combiner, + grpc_call_combiner_cancel(deadline_state->call_combiner, GRPC_ERROR_REF(error)); GRPC_CLOSURE_INIT(&deadline_state->timer_callback, send_cancel_op_in_call_combiner, elem, grpc_schedule_on_exec_ctx); - GRPC_CALL_COMBINER_START(exec_ctx, deadline_state->call_combiner, + GRPC_CALL_COMBINER_START(deadline_state->call_combiner, &deadline_state->timer_callback, error, "deadline exceeded -- sending cancel_stream op"); } else { - GRPC_CALL_STACK_UNREF(exec_ctx, deadline_state->call_stack, - "deadline_timer"); + GRPC_CALL_STACK_UNREF(deadline_state->call_stack, "deadline_timer"); } } // Starts the deadline timer. // This is called via the call combiner, so access to deadline_state is // synchronized. -static void start_timer_if_needed(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static void start_timer_if_needed(grpc_call_element* elem, grpc_millis deadline) { if (deadline == GRPC_MILLIS_INF_FUTURE) { return; @@ -113,17 +108,16 @@ static void start_timer_if_needed(grpc_exec_ctx* exec_ctx, } GPR_ASSERT(closure != NULL); GRPC_CALL_STACK_REF(deadline_state->call_stack, "deadline_timer"); - grpc_timer_init(exec_ctx, &deadline_state->timer, deadline, closure); + grpc_timer_init(&deadline_state->timer, deadline, closure); } // Cancels the deadline timer. // This is called via the call combiner, so access to deadline_state is // synchronized. -static void cancel_timer_if_needed(grpc_exec_ctx* exec_ctx, - grpc_deadline_state* deadline_state) { +static void cancel_timer_if_needed(grpc_deadline_state* deadline_state) { if (deadline_state->timer_state == GRPC_DEADLINE_STATE_PENDING) { deadline_state->timer_state = GRPC_DEADLINE_STATE_FINISHED; - grpc_timer_cancel(exec_ctx, &deadline_state->timer); + grpc_timer_cancel(&deadline_state->timer); } else { // timer was either in STATE_INITAL (nothing to cancel) // OR in STATE_FINISHED (again nothing to cancel) @@ -131,12 +125,11 @@ static void cancel_timer_if_needed(grpc_exec_ctx* exec_ctx, } // Callback run when the call is complete. -static void on_complete(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void on_complete(void* arg, grpc_error* error) { grpc_deadline_state* deadline_state = (grpc_deadline_state*)arg; - cancel_timer_if_needed(exec_ctx, deadline_state); + cancel_timer_if_needed(deadline_state); // Invoke the next callback. - GRPC_CLOSURE_RUN(exec_ctx, deadline_state->next_on_complete, - GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(deadline_state->next_on_complete, GRPC_ERROR_REF(error)); } // Inject our own on_complete callback into op. @@ -156,8 +149,7 @@ struct start_timer_after_init_state { grpc_millis deadline; grpc_closure closure; }; -static void start_timer_after_init(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void start_timer_after_init(void* arg, grpc_error* error) { struct start_timer_after_init_state* state = (struct start_timer_after_init_state*)arg; grpc_deadline_state* deadline_state = @@ -166,18 +158,18 @@ static void start_timer_after_init(grpc_exec_ctx* exec_ctx, void* arg, // We are initially called without holding the call combiner, so we // need to bounce ourselves into it. state->in_call_combiner = true; - GRPC_CALL_COMBINER_START(exec_ctx, deadline_state->call_combiner, - &state->closure, GRPC_ERROR_REF(error), + GRPC_CALL_COMBINER_START(deadline_state->call_combiner, &state->closure, + GRPC_ERROR_REF(error), "scheduling deadline timer"); return; } - start_timer_if_needed(exec_ctx, state->elem, state->deadline); + start_timer_if_needed(state->elem, state->deadline); gpr_free(state); - GRPC_CALL_COMBINER_STOP(exec_ctx, deadline_state->call_combiner, + GRPC_CALL_COMBINER_STOP(deadline_state->call_combiner, "done scheduling deadline timer"); } -void grpc_deadline_state_init(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +void grpc_deadline_state_init(grpc_call_element* elem, grpc_call_stack* call_stack, grpc_call_combiner* call_combiner, grpc_millis deadline) { @@ -200,29 +192,27 @@ void grpc_deadline_state_init(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, state->deadline = deadline; GRPC_CLOSURE_INIT(&state->closure, start_timer_after_init, state, grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(exec_ctx, &state->closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&state->closure, GRPC_ERROR_NONE); } } -void grpc_deadline_state_destroy(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem) { +void grpc_deadline_state_destroy(grpc_call_element* elem) { grpc_deadline_state* deadline_state = (grpc_deadline_state*)elem->call_data; - cancel_timer_if_needed(exec_ctx, deadline_state); + cancel_timer_if_needed(deadline_state); } -void grpc_deadline_state_reset(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +void grpc_deadline_state_reset(grpc_call_element* elem, grpc_millis new_deadline) { grpc_deadline_state* deadline_state = (grpc_deadline_state*)elem->call_data; - cancel_timer_if_needed(exec_ctx, deadline_state); - start_timer_if_needed(exec_ctx, elem, new_deadline); + cancel_timer_if_needed(deadline_state); + start_timer_if_needed(elem, new_deadline); } void grpc_deadline_state_client_start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* op) { + grpc_call_element* elem, grpc_transport_stream_op_batch* op) { grpc_deadline_state* deadline_state = (grpc_deadline_state*)elem->call_data; if (op->cancel_stream) { - cancel_timer_if_needed(exec_ctx, deadline_state); + cancel_timer_if_needed(deadline_state); } else { // Make sure we know when the call is complete, so that we can cancel // the timer. @@ -237,16 +227,14 @@ void grpc_deadline_state_client_start_transport_stream_op_batch( // // Constructor for channel_data. Used for both client and server filters. -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { GPR_ASSERT(!args->is_last); return GRPC_ERROR_NONE; } // Destructor for channel_data. Used for both client and server filters. -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_channel_element* elem) {} // Call data used for both client and server filter. typedef struct base_call_data { @@ -266,50 +254,45 @@ typedef struct server_call_data { } server_call_data; // Constructor for call_data. Used for both client and server filters. -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { - grpc_deadline_state_init(exec_ctx, elem, args->call_stack, - args->call_combiner, args->deadline); + grpc_deadline_state_init(elem, args->call_stack, args->call_combiner, + args->deadline); return GRPC_ERROR_NONE; } // Destructor for call_data. Used for both client and server filters. -static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { - grpc_deadline_state_destroy(exec_ctx, elem); + grpc_deadline_state_destroy(elem); } // Method for starting a call op for client filter. static void client_start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* op) { - grpc_deadline_state_client_start_transport_stream_op_batch(exec_ctx, elem, - op); + grpc_call_element* elem, grpc_transport_stream_op_batch* op) { + grpc_deadline_state_client_start_transport_stream_op_batch(elem, op); // Chain to next filter. - grpc_call_next_op(exec_ctx, elem, op); + grpc_call_next_op(elem, op); } // Callback for receiving initial metadata on the server. -static void recv_initial_metadata_ready(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void recv_initial_metadata_ready(void* arg, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; server_call_data* calld = (server_call_data*)elem->call_data; // Get deadline from metadata and start the timer if needed. - start_timer_if_needed(exec_ctx, elem, calld->recv_initial_metadata->deadline); + start_timer_if_needed(elem, calld->recv_initial_metadata->deadline); // Invoke the next callback. calld->next_recv_initial_metadata_ready->cb( - exec_ctx, calld->next_recv_initial_metadata_ready->cb_arg, error); + calld->next_recv_initial_metadata_ready->cb_arg, error); } // Method for starting a call op for server filter. static void server_start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* op) { + grpc_call_element* elem, grpc_transport_stream_op_batch* op) { server_call_data* calld = (server_call_data*)elem->call_data; if (op->cancel_stream) { - cancel_timer_if_needed(exec_ctx, &calld->base.deadline_state); + cancel_timer_if_needed(&calld->base.deadline_state); } else { // If we're receiving initial metadata, we need to get the deadline // from the recv_initial_metadata_ready callback. So we inject our @@ -335,7 +318,7 @@ static void server_start_transport_stream_op_batch( } } // Chain to next filter. - grpc_call_next_op(exec_ctx, elem, op); + grpc_call_next_op(elem, op); } const grpc_channel_filter grpc_client_deadline_filter = { @@ -372,8 +355,7 @@ bool grpc_deadline_checking_enabled(const grpc_channel_args* channel_args) { !grpc_channel_args_want_minimal_stack(channel_args)); } -static bool maybe_add_deadline_filter(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, +static bool maybe_add_deadline_filter(grpc_channel_stack_builder* builder, void* arg) { return grpc_deadline_checking_enabled( grpc_channel_stack_builder_get_channel_arguments(builder)) diff --git a/src/core/ext/filters/deadline/deadline_filter.h b/src/core/ext/filters/deadline/deadline_filter.h index e665dc53ee3..0998614db37 100644 --- a/src/core/ext/filters/deadline/deadline_filter.h +++ b/src/core/ext/filters/deadline/deadline_filter.h @@ -53,13 +53,12 @@ typedef struct grpc_deadline_state { // // assumes elem->call_data is zero'd -void grpc_deadline_state_init(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +void grpc_deadline_state_init(grpc_call_element* elem, grpc_call_stack* call_stack, grpc_call_combiner* call_combiner, grpc_millis deadline); -void grpc_deadline_state_destroy(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem); +void grpc_deadline_state_destroy(grpc_call_element* elem); // Cancels the existing timer and starts a new one with new_deadline. // @@ -70,7 +69,7 @@ void grpc_deadline_state_destroy(grpc_exec_ctx* exec_ctx, // deadline may result in the timer being called twice. // // Note: Must be called while holding the call combiner. -void grpc_deadline_state_reset(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +void grpc_deadline_state_reset(grpc_call_element* elem, grpc_millis new_deadline); // To be called from the client-side filter's start_transport_stream_op_batch() @@ -82,8 +81,7 @@ void grpc_deadline_state_reset(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, // // Note: Must be called while holding the call combiner. void grpc_deadline_state_client_start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* op); + grpc_call_element* elem, grpc_transport_stream_op_batch* op); // Should deadline checking be performed (according to channel args) bool grpc_deadline_checking_enabled(const grpc_channel_args* args); diff --git a/src/core/ext/filters/http/client/http_client_filter.cc b/src/core/ext/filters/http/client/http_client_filter.cc index 6208089f2ec..5f57eb8e99e 100644 --- a/src/core/ext/filters/http/client/http_client_filter.cc +++ b/src/core/ext/filters/http/client/http_client_filter.cc @@ -68,12 +68,11 @@ typedef struct channel_data { size_t max_payload_size_for_get; } channel_data; -static grpc_error *client_filter_incoming_metadata(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *client_filter_incoming_metadata(grpc_call_element *elem, grpc_metadata_batch *b) { if (b->idx.named.status != NULL) { if (grpc_mdelem_eq(b->idx.named.status->md, GRPC_MDELEM_STATUS_200)) { - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.status); + grpc_metadata_batch_remove(b, b->idx.named.status); } else { char *val = grpc_dump_slice(GRPC_MDVALUE(b->idx.named.status->md), GPR_DUMP_ASCII); @@ -98,10 +97,9 @@ static grpc_error *client_filter_incoming_metadata(grpc_exec_ctx *exec_ctx, GRPC_MDVALUE(b->idx.named.grpc_message->md)); if (grpc_slice_is_equivalent(pct_decoded_msg, GRPC_MDVALUE(b->idx.named.grpc_message->md))) { - grpc_slice_unref_internal(exec_ctx, pct_decoded_msg); + grpc_slice_unref_internal(pct_decoded_msg); } else { - grpc_metadata_batch_set_value(exec_ctx, b->idx.named.grpc_message, - pct_decoded_msg); + grpc_metadata_batch_set_value(b->idx.named.grpc_message, pct_decoded_msg); } } @@ -131,60 +129,53 @@ static grpc_error *client_filter_incoming_metadata(grpc_exec_ctx *exec_ctx, gpr_free(val); } } - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.content_type); + grpc_metadata_batch_remove(b, b->idx.named.content_type); } return GRPC_ERROR_NONE; } -static void recv_initial_metadata_ready(grpc_exec_ctx *exec_ctx, - void *user_data, grpc_error *error) { +static void recv_initial_metadata_ready(void *user_data, grpc_error *error) { grpc_call_element *elem = (grpc_call_element *)user_data; call_data *calld = (call_data *)elem->call_data; if (error == GRPC_ERROR_NONE) { - error = client_filter_incoming_metadata(exec_ctx, elem, - calld->recv_initial_metadata); + error = client_filter_incoming_metadata(elem, calld->recv_initial_metadata); } else { GRPC_ERROR_REF(error); } - GRPC_CLOSURE_RUN(exec_ctx, calld->original_recv_initial_metadata_ready, - error); + GRPC_CLOSURE_RUN(calld->original_recv_initial_metadata_ready, error); } -static void recv_trailing_metadata_on_complete(grpc_exec_ctx *exec_ctx, - void *user_data, +static void recv_trailing_metadata_on_complete(void *user_data, grpc_error *error) { grpc_call_element *elem = (grpc_call_element *)user_data; call_data *calld = (call_data *)elem->call_data; if (error == GRPC_ERROR_NONE) { - error = client_filter_incoming_metadata(exec_ctx, elem, - calld->recv_trailing_metadata); + error = + client_filter_incoming_metadata(elem, calld->recv_trailing_metadata); } else { GRPC_ERROR_REF(error); } - GRPC_CLOSURE_RUN(exec_ctx, calld->original_recv_trailing_metadata_on_complete, - error); + GRPC_CLOSURE_RUN(calld->original_recv_trailing_metadata_on_complete, error); } -static void send_message_on_complete(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void send_message_on_complete(void *arg, grpc_error *error) { grpc_call_element *elem = (grpc_call_element *)arg; call_data *calld = (call_data *)elem->call_data; - grpc_byte_stream_cache_destroy(exec_ctx, &calld->send_message_cache); - GRPC_CLOSURE_RUN(exec_ctx, calld->original_send_message_on_complete, + grpc_byte_stream_cache_destroy(&calld->send_message_cache); + GRPC_CLOSURE_RUN(calld->original_send_message_on_complete, GRPC_ERROR_REF(error)); } // Pulls a slice from the send_message byte stream, updating // calld->send_message_bytes_read. -static grpc_error *pull_slice_from_send_message(grpc_exec_ctx *exec_ctx, - call_data *calld) { +static grpc_error *pull_slice_from_send_message(call_data *calld) { grpc_slice incoming_slice; grpc_error *error = grpc_byte_stream_pull( - exec_ctx, &calld->send_message_caching_stream.base, &incoming_slice); + &calld->send_message_caching_stream.base, &incoming_slice); if (error == GRPC_ERROR_NONE) { calld->send_message_bytes_read += GRPC_SLICE_LENGTH(incoming_slice); - grpc_slice_unref_internal(exec_ctx, incoming_slice); + grpc_slice_unref_internal(incoming_slice); } return error; } @@ -194,12 +185,10 @@ static grpc_error *pull_slice_from_send_message(grpc_exec_ctx *exec_ctx, // calld->send_message_caching_stream.base.length, then we have completed // reading from the byte stream; otherwise, an async read has been dispatched // and on_send_message_next_done() will be invoked when it is complete. -static grpc_error *read_all_available_send_message_data(grpc_exec_ctx *exec_ctx, - call_data *calld) { - while (grpc_byte_stream_next(exec_ctx, - &calld->send_message_caching_stream.base, +static grpc_error *read_all_available_send_message_data(call_data *calld) { + while (grpc_byte_stream_next(&calld->send_message_caching_stream.base, ~(size_t)0, &calld->on_send_message_next_done)) { - grpc_error *error = pull_slice_from_send_message(exec_ctx, calld); + grpc_error *error = pull_slice_from_send_message(calld); if (error != GRPC_ERROR_NONE) return error; if (calld->send_message_bytes_read == calld->send_message_caching_stream.base.length) { @@ -210,19 +199,18 @@ static grpc_error *read_all_available_send_message_data(grpc_exec_ctx *exec_ctx, } // Async callback for grpc_byte_stream_next(). -static void on_send_message_next_done(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void on_send_message_next_done(void *arg, grpc_error *error) { grpc_call_element *elem = (grpc_call_element *)arg; call_data *calld = (call_data *)elem->call_data; if (error != GRPC_ERROR_NONE) { grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, calld->send_message_batch, error, calld->call_combiner); + calld->send_message_batch, error, calld->call_combiner); return; } - error = pull_slice_from_send_message(exec_ctx, calld); + error = pull_slice_from_send_message(calld); if (error != GRPC_ERROR_NONE) { grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, calld->send_message_batch, error, calld->call_combiner); + calld->send_message_batch, error, calld->call_combiner); return; } // There may or may not be more to read, but we don't care. If we got @@ -230,7 +218,7 @@ static void on_send_message_next_done(grpc_exec_ctx *exec_ctx, void *arg, // synchronously, so we were not able to do a cached call. Instead, // we just reset the byte stream and then send down the batch as-is. grpc_caching_byte_stream_reset(&calld->send_message_caching_stream); - grpc_call_next_op(exec_ctx, elem, calld->send_message_batch); + grpc_call_next_op(elem, calld->send_message_batch); } static char *slice_buffer_to_string(grpc_slice_buffer *slice_buffer) { @@ -248,8 +236,7 @@ static char *slice_buffer_to_string(grpc_slice_buffer *slice_buffer) { // Modifies the path entry in the batch's send_initial_metadata to // append the base64-encoded query for a GET request. -static grpc_error *update_path_for_get(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *update_path_for_get(grpc_call_element *elem, grpc_transport_stream_op_batch *batch) { call_data *calld = (call_data *)elem->call_data; grpc_slice path_slice = @@ -282,24 +269,22 @@ static grpc_error *update_path_for_get(grpc_exec_ctx *exec_ctx, grpc_slice_sub_no_ref(path_with_query_slice, 0, strlen(t)); /* substitute previous path with the new path+query */ grpc_mdelem mdelem_path_and_query = - grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_PATH, path_with_query_slice); + grpc_mdelem_from_slices(GRPC_MDSTR_PATH, path_with_query_slice); grpc_metadata_batch *b = batch->payload->send_initial_metadata.send_initial_metadata; - return grpc_metadata_batch_substitute(exec_ctx, b, b->idx.named.path, + return grpc_metadata_batch_substitute(b, b->idx.named.path, mdelem_path_and_query); } -static void remove_if_present(grpc_exec_ctx *exec_ctx, - grpc_metadata_batch *batch, +static void remove_if_present(grpc_metadata_batch *batch, grpc_metadata_batch_callouts_index idx) { if (batch->idx.array[idx] != NULL) { - grpc_metadata_batch_remove(exec_ctx, batch, batch->idx.array[idx]); + grpc_metadata_batch_remove(batch, batch->idx.array[idx]); } } static void hc_start_transport_stream_op_batch( - grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - grpc_transport_stream_op_batch *batch) { + grpc_call_element *elem, grpc_transport_stream_op_batch *batch) { call_data *calld = (call_data *)elem->call_data; channel_data *channeld = (channel_data *)elem->channel_data; GPR_TIMER_BEGIN("hc_start_transport_stream_op_batch", 0); @@ -345,17 +330,16 @@ static void hc_start_transport_stream_op_batch( calld->original_send_message_on_complete = batch->on_complete; batch->on_complete = &calld->send_message_on_complete; calld->send_message_batch = batch; - error = read_all_available_send_message_data(exec_ctx, calld); + error = read_all_available_send_message_data(calld); if (error != GRPC_ERROR_NONE) goto done; // If all the data has been read, then we can use GET. if (calld->send_message_bytes_read == calld->send_message_caching_stream.base.length) { method = GRPC_MDELEM_METHOD_GET; - error = update_path_for_get(exec_ctx, elem, batch); + error = update_path_for_get(elem, batch); if (error != GRPC_ERROR_NONE) goto done; batch->send_message = false; - grpc_byte_stream_destroy(exec_ctx, - &calld->send_message_caching_stream.base); + grpc_byte_stream_destroy(&calld->send_message_caching_stream.base); } else { // Not all data is available. The batch will be sent down // asynchronously in on_send_message_next_done(). @@ -372,41 +356,41 @@ static void hc_start_transport_stream_op_batch( } remove_if_present( - exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, + batch->payload->send_initial_metadata.send_initial_metadata, GRPC_BATCH_METHOD); remove_if_present( - exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, + batch->payload->send_initial_metadata.send_initial_metadata, GRPC_BATCH_SCHEME); remove_if_present( - exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, + batch->payload->send_initial_metadata.send_initial_metadata, GRPC_BATCH_TE); remove_if_present( - exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, + batch->payload->send_initial_metadata.send_initial_metadata, GRPC_BATCH_CONTENT_TYPE); remove_if_present( - exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, + batch->payload->send_initial_metadata.send_initial_metadata, GRPC_BATCH_USER_AGENT); /* Send : prefixed headers, which have to be before any application layer headers. */ error = grpc_metadata_batch_add_head( - exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, + batch->payload->send_initial_metadata.send_initial_metadata, &calld->method, method); if (error != GRPC_ERROR_NONE) goto done; error = grpc_metadata_batch_add_head( - exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, + batch->payload->send_initial_metadata.send_initial_metadata, &calld->scheme, channeld->static_scheme); if (error != GRPC_ERROR_NONE) goto done; error = grpc_metadata_batch_add_tail( - exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, + batch->payload->send_initial_metadata.send_initial_metadata, &calld->te_trailers, GRPC_MDELEM_TE_TRAILERS); if (error != GRPC_ERROR_NONE) goto done; error = grpc_metadata_batch_add_tail( - exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, + batch->payload->send_initial_metadata.send_initial_metadata, &calld->content_type, GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC); if (error != GRPC_ERROR_NONE) goto done; error = grpc_metadata_batch_add_tail( - exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, + batch->payload->send_initial_metadata.send_initial_metadata, &calld->user_agent, GRPC_MDELEM_REF(channeld->user_agent)); if (error != GRPC_ERROR_NONE) goto done; } @@ -414,16 +398,15 @@ static void hc_start_transport_stream_op_batch( done: if (error != GRPC_ERROR_NONE) { grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, calld->send_message_batch, error, calld->call_combiner); + calld->send_message_batch, error, calld->call_combiner); } else if (!batch_will_be_handled_asynchronously) { - grpc_call_next_op(exec_ctx, elem, batch); + grpc_call_next_op(elem, batch); } GPR_TIMER_END("hc_start_transport_stream_op_batch", 0); } /* Constructor for call_data */ -static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *init_call_elem(grpc_call_element *elem, const grpc_call_element_args *args) { call_data *calld = (call_data *)elem->call_data; calld->call_combiner = args->call_combiner; @@ -441,7 +424,7 @@ static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, } /* Destructor for call_data */ -static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, +static void destroy_call_elem(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *ignored) {} @@ -533,8 +516,7 @@ static grpc_slice user_agent_from_args(const grpc_channel_args *args, } /* Constructor for channel_data */ -static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static grpc_error *init_channel_elem(grpc_channel_element *elem, grpc_channel_element_args *args) { channel_data *chand = (channel_data *)elem->channel_data; GPR_ASSERT(!args->is_last); @@ -543,17 +525,16 @@ static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, chand->max_payload_size_for_get = max_payload_size_from_args(args->channel_args); chand->user_agent = grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_USER_AGENT, + GRPC_MDSTR_USER_AGENT, user_agent_from_args(args->channel_args, args->optional_transport->vtable->name)); return GRPC_ERROR_NONE; } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem) { +static void destroy_channel_elem(grpc_channel_element *elem) { channel_data *chand = (channel_data *)elem->channel_data; - GRPC_MDELEM_UNREF(exec_ctx, chand->user_agent); + GRPC_MDELEM_UNREF(chand->user_agent); } const grpc_channel_filter grpc_http_client_filter = { diff --git a/src/core/ext/filters/http/http_filters_plugin.cc b/src/core/ext/filters/http/http_filters_plugin.cc index 8f5b8563172..3af96da17bc 100644 --- a/src/core/ext/filters/http/http_filters_plugin.cc +++ b/src/core/ext/filters/http/http_filters_plugin.cc @@ -40,8 +40,7 @@ static bool is_building_http_like_transport( return t != NULL && strstr(t->vtable->name, "http"); } -static bool maybe_add_optional_filter(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder, +static bool maybe_add_optional_filter(grpc_channel_stack_builder *builder, void *arg) { if (!is_building_http_like_transport(builder)) return true; optional_filter *filtarg = (optional_filter *)arg; @@ -55,8 +54,7 @@ static bool maybe_add_optional_filter(grpc_exec_ctx *exec_ctx, : true; } -static bool maybe_add_required_filter(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder, +static bool maybe_add_required_filter(grpc_channel_stack_builder *builder, void *arg) { return is_building_http_like_transport(builder) ? grpc_channel_stack_builder_prepend_filter( diff --git a/src/core/ext/filters/http/message_compress/message_compress_filter.cc b/src/core/ext/filters/http/message_compress/message_compress_filter.cc index f785e1355d3..bacadb04b35 100644 --- a/src/core/ext/filters/http/message_compress/message_compress_filter.cc +++ b/src/core/ext/filters/http/message_compress/message_compress_filter.cc @@ -100,12 +100,11 @@ static bool skip_compression(grpc_call_element *elem, uint32_t flags, /** Filter initial metadata */ static grpc_error *process_send_initial_metadata( - grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - grpc_metadata_batch *initial_metadata, + grpc_call_element *elem, grpc_metadata_batch *initial_metadata, bool *has_compression_algorithm) GRPC_MUST_USE_RESULT; static grpc_error *process_send_initial_metadata( - grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - grpc_metadata_batch *initial_metadata, bool *has_compression_algorithm) { + grpc_call_element *elem, grpc_metadata_batch *initial_metadata, + bool *has_compression_algorithm) { call_data *calld = (call_data *)elem->call_data; channel_data *channeld = (channel_data *)elem->channel_data; *has_compression_algorithm = false; @@ -137,13 +136,13 @@ static grpc_error *process_send_initial_metadata( } *has_compression_algorithm = true; grpc_metadata_batch_remove( - exec_ctx, initial_metadata, + initial_metadata, initial_metadata->idx.named.grpc_internal_stream_encoding_request); /* Disable message-wise compression */ calld->compression_algorithm = GRPC_COMPRESS_NONE; if (initial_metadata->idx.named.grpc_internal_encoding_request != NULL) { grpc_metadata_batch_remove( - exec_ctx, initial_metadata, + initial_metadata, initial_metadata->idx.named.grpc_internal_encoding_request); } } else if (initial_metadata->idx.named.grpc_internal_encoding_request != @@ -160,7 +159,7 @@ static grpc_error *process_send_initial_metadata( } *has_compression_algorithm = true; grpc_metadata_batch_remove( - exec_ctx, initial_metadata, + initial_metadata, initial_metadata->idx.named.grpc_internal_encoding_request); } else { /* If no algorithm was found in the metadata and we aren't @@ -181,12 +180,11 @@ static grpc_error *process_send_initial_metadata( /* hint compression algorithm */ if (stream_compression_algorithm != GRPC_STREAM_COMPRESS_NONE) { error = grpc_metadata_batch_add_tail( - exec_ctx, initial_metadata, - &calld->stream_compression_algorithm_storage, + initial_metadata, &calld->stream_compression_algorithm_storage, grpc_stream_compression_encoding_mdelem(stream_compression_algorithm)); } else if (calld->compression_algorithm != GRPC_COMPRESS_NONE) { error = grpc_metadata_batch_add_tail( - exec_ctx, initial_metadata, &calld->compression_algorithm_storage, + initial_metadata, &calld->compression_algorithm_storage, grpc_compression_encoding_mdelem(calld->compression_algorithm)); } @@ -194,7 +192,7 @@ static grpc_error *process_send_initial_metadata( /* convey supported compression algorithms */ error = grpc_metadata_batch_add_tail( - exec_ctx, initial_metadata, &calld->accept_encoding_storage, + initial_metadata, &calld->accept_encoding_storage, GRPC_MDELEM_ACCEPT_ENCODING_FOR_ALGORITHMS( channeld->supported_compression_algorithms)); @@ -203,7 +201,7 @@ static grpc_error *process_send_initial_metadata( /* Do not overwrite accept-encoding header if it already presents. */ if (!initial_metadata->idx.named.accept_encoding) { error = grpc_metadata_batch_add_tail( - exec_ctx, initial_metadata, &calld->accept_stream_encoding_storage, + initial_metadata, &calld->accept_stream_encoding_storage, GRPC_MDELEM_ACCEPT_STREAM_ENCODING_FOR_ALGORITHMS( channeld->supported_stream_compression_algorithms)); } @@ -211,17 +209,15 @@ static grpc_error *process_send_initial_metadata( return error; } -static void send_message_on_complete(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void send_message_on_complete(void *arg, grpc_error *error) { grpc_call_element *elem = (grpc_call_element *)arg; call_data *calld = (call_data *)elem->call_data; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &calld->slices); - GRPC_CLOSURE_RUN(exec_ctx, calld->original_send_message_on_complete, + grpc_slice_buffer_reset_and_unref_internal(&calld->slices); + GRPC_CLOSURE_RUN(calld->original_send_message_on_complete, GRPC_ERROR_REF(error)); } -static void send_message_batch_continue(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem) { +static void send_message_batch_continue(grpc_call_element *elem) { call_data *calld = (call_data *)elem->call_data; // Note: The call to grpc_call_next_op() results in yielding the // call combiner, so we need to clear calld->send_message_batch @@ -229,19 +225,18 @@ static void send_message_batch_continue(grpc_exec_ctx *exec_ctx, grpc_transport_stream_op_batch *send_message_batch = calld->send_message_batch; calld->send_message_batch = NULL; - grpc_call_next_op(exec_ctx, elem, send_message_batch); + grpc_call_next_op(elem, send_message_batch); } -static void finish_send_message(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem) { +static void finish_send_message(grpc_call_element *elem) { call_data *calld = (call_data *)elem->call_data; // Compress the data if appropriate. grpc_slice_buffer tmp; grpc_slice_buffer_init(&tmp); uint32_t send_flags = calld->send_message_batch->payload->send_message.send_message->flags; - bool did_compress = grpc_msg_compress(exec_ctx, calld->compression_algorithm, - &calld->slices, &tmp); + bool did_compress = + grpc_msg_compress(calld->compression_algorithm, &calld->slices, &tmp); if (did_compress) { if (GRPC_TRACER_ON(grpc_compression_trace)) { const char *algo_name; @@ -267,11 +262,11 @@ static void finish_send_message(grpc_exec_ctx *exec_ctx, algo_name, calld->slices.length); } } - grpc_slice_buffer_destroy_internal(exec_ctx, &tmp); + grpc_slice_buffer_destroy_internal(&tmp); // Swap out the original byte stream with our new one and send the // batch down. grpc_byte_stream_destroy( - exec_ctx, calld->send_message_batch->payload->send_message.send_message); + calld->send_message_batch->payload->send_message.send_message); grpc_slice_buffer_stream_init(&calld->replacement_stream, &calld->slices, send_flags); calld->send_message_batch->payload->send_message.send_message = @@ -279,27 +274,24 @@ static void finish_send_message(grpc_exec_ctx *exec_ctx, calld->original_send_message_on_complete = calld->send_message_batch->on_complete; calld->send_message_batch->on_complete = &calld->send_message_on_complete; - send_message_batch_continue(exec_ctx, elem); + send_message_batch_continue(elem); } -static void fail_send_message_batch_in_call_combiner(grpc_exec_ctx *exec_ctx, - void *arg, +static void fail_send_message_batch_in_call_combiner(void *arg, grpc_error *error) { call_data *calld = (call_data *)arg; if (calld->send_message_batch != NULL) { grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, calld->send_message_batch, GRPC_ERROR_REF(error), - calld->call_combiner); + calld->send_message_batch, GRPC_ERROR_REF(error), calld->call_combiner); calld->send_message_batch = NULL; } } // Pulls a slice from the send_message byte stream and adds it to calld->slices. -static grpc_error *pull_slice_from_send_message(grpc_exec_ctx *exec_ctx, - call_data *calld) { +static grpc_error *pull_slice_from_send_message(call_data *calld) { grpc_slice incoming_slice; grpc_error *error = grpc_byte_stream_pull( - exec_ctx, calld->send_message_batch->payload->send_message.send_message, + calld->send_message_batch->payload->send_message.send_message, &incoming_slice); if (error == GRPC_ERROR_NONE) { grpc_slice_buffer_add(&calld->slices, incoming_slice); @@ -311,69 +303,65 @@ static grpc_error *pull_slice_from_send_message(grpc_exec_ctx *exec_ctx, // If all data has been read, invokes finish_send_message(). Otherwise, // an async call to grpc_byte_stream_next() has been started, which will // eventually result in calling on_send_message_next_done(). -static void continue_reading_send_message(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem) { +static void continue_reading_send_message(grpc_call_element *elem) { call_data *calld = (call_data *)elem->call_data; while (grpc_byte_stream_next( - exec_ctx, calld->send_message_batch->payload->send_message.send_message, - ~(size_t)0, &calld->on_send_message_next_done)) { - grpc_error *error = pull_slice_from_send_message(exec_ctx, calld); + calld->send_message_batch->payload->send_message.send_message, ~(size_t)0, + &calld->on_send_message_next_done)) { + grpc_error *error = pull_slice_from_send_message(calld); if (error != GRPC_ERROR_NONE) { // Closure callback; does not take ownership of error. - fail_send_message_batch_in_call_combiner(exec_ctx, calld, error); + fail_send_message_batch_in_call_combiner(calld, error); GRPC_ERROR_UNREF(error); return; } if (calld->slices.length == calld->send_message_batch->payload->send_message.send_message->length) { - finish_send_message(exec_ctx, elem); + finish_send_message(elem); break; } } } // Async callback for grpc_byte_stream_next(). -static void on_send_message_next_done(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void on_send_message_next_done(void *arg, grpc_error *error) { grpc_call_element *elem = (grpc_call_element *)arg; call_data *calld = (call_data *)elem->call_data; if (error != GRPC_ERROR_NONE) { // Closure callback; does not take ownership of error. - fail_send_message_batch_in_call_combiner(exec_ctx, calld, error); + fail_send_message_batch_in_call_combiner(calld, error); return; } - error = pull_slice_from_send_message(exec_ctx, calld); + error = pull_slice_from_send_message(calld); if (error != GRPC_ERROR_NONE) { // Closure callback; does not take ownership of error. - fail_send_message_batch_in_call_combiner(exec_ctx, calld, error); + fail_send_message_batch_in_call_combiner(calld, error); GRPC_ERROR_UNREF(error); return; } if (calld->slices.length == calld->send_message_batch->payload->send_message.send_message->length) { - finish_send_message(exec_ctx, elem); + finish_send_message(elem); } else { - continue_reading_send_message(exec_ctx, elem); + continue_reading_send_message(elem); } } -static void start_send_message_batch(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *unused) { +static void start_send_message_batch(void *arg, grpc_error *unused) { grpc_call_element *elem = (grpc_call_element *)arg; call_data *calld = (call_data *)elem->call_data; if (skip_compression( elem, calld->send_message_batch->payload->send_message.send_message->flags, calld->send_initial_metadata_state == HAS_COMPRESSION_ALGORITHM)) { - send_message_batch_continue(exec_ctx, elem); + send_message_batch_continue(elem); } else { - continue_reading_send_message(exec_ctx, elem); + continue_reading_send_message(elem); } } static void compress_start_transport_stream_op_batch( - grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - grpc_transport_stream_op_batch *batch) { + grpc_call_element *elem, grpc_transport_stream_op_batch *batch) { call_data *calld = (call_data *)elem->call_data; GPR_TIMER_BEGIN("compress_start_transport_stream_op_batch", 0); // Handle cancel_stream. @@ -384,21 +372,19 @@ static void compress_start_transport_stream_op_batch( if (calld->send_message_batch != NULL) { if (calld->send_initial_metadata_state == INITIAL_METADATA_UNSEEN) { GRPC_CALL_COMBINER_START( - exec_ctx, calld->call_combiner, + calld->call_combiner, GRPC_CLOSURE_CREATE(fail_send_message_batch_in_call_combiner, calld, grpc_schedule_on_exec_ctx), GRPC_ERROR_REF(calld->cancel_error), "failing send_message op"); } else { grpc_byte_stream_shutdown( - exec_ctx, calld->send_message_batch->payload->send_message.send_message, GRPC_ERROR_REF(calld->cancel_error)); } } } else if (calld->cancel_error != GRPC_ERROR_NONE) { grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, batch, GRPC_ERROR_REF(calld->cancel_error), - calld->call_combiner); + batch, GRPC_ERROR_REF(calld->cancel_error), calld->call_combiner); goto done; } // Handle send_initial_metadata. @@ -406,11 +392,10 @@ static void compress_start_transport_stream_op_batch( GPR_ASSERT(calld->send_initial_metadata_state == INITIAL_METADATA_UNSEEN); bool has_compression_algorithm; grpc_error *error = process_send_initial_metadata( - exec_ctx, elem, - batch->payload->send_initial_metadata.send_initial_metadata, + elem, batch->payload->send_initial_metadata.send_initial_metadata, &has_compression_algorithm); if (error != GRPC_ERROR_NONE) { - grpc_transport_stream_op_batch_finish_with_failure(exec_ctx, batch, error, + grpc_transport_stream_op_batch_finish_with_failure(batch, error, calld->call_combiner); goto done; } @@ -424,7 +409,7 @@ static void compress_start_transport_stream_op_batch( // the call stack) will release the call combiner for each batch it sees. if (calld->send_message_batch != NULL) { GRPC_CALL_COMBINER_START( - exec_ctx, calld->call_combiner, + calld->call_combiner, &calld->start_send_message_batch_in_call_combiner, GRPC_ERROR_NONE, "starting send_message after send_initial_metadata"); } @@ -439,22 +424,21 @@ static void compress_start_transport_stream_op_batch( // send_initial_metadata. if (calld->send_initial_metadata_state == INITIAL_METADATA_UNSEEN) { GRPC_CALL_COMBINER_STOP( - exec_ctx, calld->call_combiner, + calld->call_combiner, "send_message batch pending send_initial_metadata"); goto done; } - start_send_message_batch(exec_ctx, elem, GRPC_ERROR_NONE); + start_send_message_batch(elem, GRPC_ERROR_NONE); } else { // Pass control down the stack. - grpc_call_next_op(exec_ctx, elem, batch); + grpc_call_next_op(elem, batch); } done: GPR_TIMER_END("compress_start_transport_stream_op_batch", 0); } /* Constructor for call_data */ -static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *init_call_elem(grpc_call_element *elem, const grpc_call_element_args *args) { call_data *calld = (call_data *)elem->call_data; calld->call_combiner = args->call_combiner; @@ -470,17 +454,16 @@ static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, } /* Destructor for call_data */ -static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, +static void destroy_call_elem(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *ignored) { call_data *calld = (call_data *)elem->call_data; - grpc_slice_buffer_destroy_internal(exec_ctx, &calld->slices); + grpc_slice_buffer_destroy_internal(&calld->slices); GRPC_ERROR_UNREF(calld->cancel_error); } /* Constructor for channel_data */ -static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static grpc_error *init_channel_elem(grpc_channel_element *elem, grpc_channel_element_args *args) { channel_data *channeld = (channel_data *)elem->channel_data; @@ -530,8 +513,7 @@ static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem) {} +static void destroy_channel_elem(grpc_channel_element *elem) {} const grpc_channel_filter grpc_message_compress_filter = { compress_start_transport_stream_op_batch, diff --git a/src/core/ext/filters/http/server/http_server_filter.cc b/src/core/ext/filters/http/server/http_server_filter.cc index 03958136b44..7a15b2f787d 100644 --- a/src/core/ext/filters/http/server/http_server_filter.cc +++ b/src/core/ext/filters/http/server/http_server_filter.cc @@ -64,8 +64,7 @@ typedef struct call_data { typedef struct channel_data { uint8_t unused; } channel_data; -static grpc_error *server_filter_outgoing_metadata(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *server_filter_outgoing_metadata(grpc_call_element *elem, grpc_metadata_batch *b) { if (b->idx.named.grpc_message != NULL) { grpc_slice pct_encoded_msg = grpc_percent_encode_slice( @@ -73,10 +72,9 @@ static grpc_error *server_filter_outgoing_metadata(grpc_exec_ctx *exec_ctx, grpc_compatible_percent_encoding_unreserved_bytes); if (grpc_slice_is_equivalent(pct_encoded_msg, GRPC_MDVALUE(b->idx.named.grpc_message->md))) { - grpc_slice_unref_internal(exec_ctx, pct_encoded_msg); + grpc_slice_unref_internal(pct_encoded_msg); } else { - grpc_metadata_batch_set_value(exec_ctx, b->idx.named.grpc_message, - pct_encoded_msg); + grpc_metadata_batch_set_value(b->idx.named.grpc_message, pct_encoded_msg); } } return GRPC_ERROR_NONE; @@ -91,8 +89,7 @@ static void add_error(const char *error_name, grpc_error **cumulative, *cumulative = grpc_error_add_child(*cumulative, new_err); } -static grpc_error *server_filter_incoming_metadata(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *server_filter_incoming_metadata(grpc_call_element *elem, grpc_metadata_batch *b) { call_data *calld = (call_data *)elem->call_data; grpc_error *error = GRPC_ERROR_NONE; @@ -121,7 +118,7 @@ static grpc_error *server_filter_incoming_metadata(grpc_exec_ctx *exec_ctx, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Bad header"), b->idx.named.method->md)); } - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.method); + grpc_metadata_batch_remove(b, b->idx.named.method); } else { add_error( error_name, &error, @@ -137,7 +134,7 @@ static grpc_error *server_filter_incoming_metadata(grpc_exec_ctx *exec_ctx, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Bad header"), b->idx.named.te->md)); } - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.te); + grpc_metadata_batch_remove(b, b->idx.named.te); } else { add_error(error_name, &error, grpc_error_set_str( @@ -154,7 +151,7 @@ static grpc_error *server_filter_incoming_metadata(grpc_exec_ctx *exec_ctx, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Bad header"), b->idx.named.scheme->md)); } - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.scheme); + grpc_metadata_batch_remove(b, b->idx.named.scheme); } else { add_error( error_name, &error, @@ -189,7 +186,7 @@ static grpc_error *server_filter_incoming_metadata(grpc_exec_ctx *exec_ctx, gpr_free(val); } } - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.content_type); + grpc_metadata_batch_remove(b, b->idx.named.content_type); } if (b->idx.named.path == NULL) { @@ -216,22 +213,21 @@ static grpc_error *server_filter_incoming_metadata(grpc_exec_ctx *exec_ctx, /* substitute path metadata with just the path (not query) */ grpc_mdelem mdelem_path_without_query = grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_PATH, grpc_slice_sub(path_slice, 0, offset)); + GRPC_MDSTR_PATH, grpc_slice_sub(path_slice, 0, offset)); - grpc_metadata_batch_substitute(exec_ctx, b, b->idx.named.path, + grpc_metadata_batch_substitute(b, b->idx.named.path, mdelem_path_without_query); /* decode payload from query and add to the slice buffer to be returned */ const int k_url_safe = 1; - grpc_slice_buffer_add( - &calld->read_slice_buffer, - grpc_base64_decode_with_len( - exec_ctx, (const char *)GRPC_SLICE_START_PTR(query_slice), - GRPC_SLICE_LENGTH(query_slice), k_url_safe)); + grpc_slice_buffer_add(&calld->read_slice_buffer, + grpc_base64_decode_with_len( + (const char *)GRPC_SLICE_START_PTR(query_slice), + GRPC_SLICE_LENGTH(query_slice), k_url_safe)); grpc_slice_buffer_stream_init(&calld->read_stream, &calld->read_slice_buffer, 0); calld->seen_path_with_query = true; - grpc_slice_unref_internal(exec_ctx, query_slice); + grpc_slice_unref_internal(query_slice); } else { gpr_log(GPR_ERROR, "GET request without QUERY"); } @@ -240,14 +236,13 @@ static grpc_error *server_filter_incoming_metadata(grpc_exec_ctx *exec_ctx, if (b->idx.named.host != NULL && b->idx.named.authority == NULL) { grpc_linked_mdelem *el = b->idx.named.host; grpc_mdelem md = GRPC_MDELEM_REF(el->md); - grpc_metadata_batch_remove(exec_ctx, b, el); - add_error( - error_name, &error, - grpc_metadata_batch_add_head( - exec_ctx, b, el, grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_AUTHORITY, - grpc_slice_ref_internal(GRPC_MDVALUE(md))))); - GRPC_MDELEM_UNREF(exec_ctx, md); + grpc_metadata_batch_remove(b, el); + add_error(error_name, &error, + grpc_metadata_batch_add_head( + b, el, grpc_mdelem_from_slices( + GRPC_MDSTR_AUTHORITY, + grpc_slice_ref_internal(GRPC_MDVALUE(md))))); + GRPC_MDELEM_UNREF(md); } if (b->idx.named.authority == NULL) { @@ -261,21 +256,18 @@ static grpc_error *server_filter_incoming_metadata(grpc_exec_ctx *exec_ctx, return error; } -static void hs_on_recv(grpc_exec_ctx *exec_ctx, void *user_data, - grpc_error *err) { +static void hs_on_recv(void *user_data, grpc_error *err) { grpc_call_element *elem = (grpc_call_element *)user_data; call_data *calld = (call_data *)elem->call_data; if (err == GRPC_ERROR_NONE) { - err = server_filter_incoming_metadata(exec_ctx, elem, - calld->recv_initial_metadata); + err = server_filter_incoming_metadata(elem, calld->recv_initial_metadata); } else { GRPC_ERROR_REF(err); } - GRPC_CLOSURE_RUN(exec_ctx, calld->on_done_recv, err); + GRPC_CLOSURE_RUN(calld->on_done_recv, err); } -static void hs_on_complete(grpc_exec_ctx *exec_ctx, void *user_data, - grpc_error *err) { +static void hs_on_complete(void *user_data, grpc_error *err) { grpc_call_element *elem = (grpc_call_element *)user_data; call_data *calld = (call_data *)elem->call_data; /* Call recv_message_ready if we got the payload via the path field */ @@ -285,17 +277,16 @@ static void hs_on_complete(grpc_exec_ctx *exec_ctx, void *user_data, : (grpc_byte_stream *)&calld->read_stream; // Re-enter call combiner for recv_message_ready, since the surface // code will release the call combiner for each callback it receives. - GRPC_CALL_COMBINER_START(exec_ctx, calld->call_combiner, - calld->recv_message_ready, GRPC_ERROR_REF(err), + GRPC_CALL_COMBINER_START(calld->call_combiner, calld->recv_message_ready, + GRPC_ERROR_REF(err), "resuming recv_message_ready from on_complete"); calld->recv_message_ready = NULL; calld->payload_bin_delivered = true; } - GRPC_CLOSURE_RUN(exec_ctx, calld->on_complete, GRPC_ERROR_REF(err)); + GRPC_CLOSURE_RUN(calld->on_complete, GRPC_ERROR_REF(err)); } -static void hs_recv_message_ready(grpc_exec_ctx *exec_ctx, void *user_data, - grpc_error *err) { +static void hs_recv_message_ready(void *user_data, grpc_error *err) { grpc_call_element *elem = (grpc_call_element *)user_data; call_data *calld = (call_data *)elem->call_data; if (calld->seen_path_with_query) { @@ -303,15 +294,14 @@ static void hs_recv_message_ready(grpc_exec_ctx *exec_ctx, void *user_data, // returned in hs_on_complete callback. // Note that we release the call combiner here, so that other // callbacks can run. - GRPC_CALL_COMBINER_STOP(exec_ctx, calld->call_combiner, + GRPC_CALL_COMBINER_STOP(calld->call_combiner, "pausing recv_message_ready until on_complete"); } else { - GRPC_CLOSURE_RUN(exec_ctx, calld->recv_message_ready, GRPC_ERROR_REF(err)); + GRPC_CLOSURE_RUN(calld->recv_message_ready, GRPC_ERROR_REF(err)); } } -static grpc_error *hs_mutate_op(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *hs_mutate_op(grpc_call_element *elem, grpc_transport_stream_op_batch *op) { /* grab pointers to our data from the call element */ call_data *calld = (call_data *)elem->call_data; @@ -319,21 +309,19 @@ static grpc_error *hs_mutate_op(grpc_exec_ctx *exec_ctx, if (op->send_initial_metadata) { grpc_error *error = GRPC_ERROR_NONE; static const char *error_name = "Failed sending initial metadata"; + add_error(error_name, &error, + grpc_metadata_batch_add_head( + op->payload->send_initial_metadata.send_initial_metadata, + &calld->status, GRPC_MDELEM_STATUS_200)); + add_error(error_name, &error, + grpc_metadata_batch_add_tail( + op->payload->send_initial_metadata.send_initial_metadata, + &calld->content_type, + GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC)); add_error( error_name, &error, - grpc_metadata_batch_add_head( - exec_ctx, op->payload->send_initial_metadata.send_initial_metadata, - &calld->status, GRPC_MDELEM_STATUS_200)); - add_error( - error_name, &error, - grpc_metadata_batch_add_tail( - exec_ctx, op->payload->send_initial_metadata.send_initial_metadata, - &calld->content_type, - GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC)); - add_error(error_name, &error, - server_filter_outgoing_metadata( - exec_ctx, elem, - op->payload->send_initial_metadata.send_initial_metadata)); + server_filter_outgoing_metadata( + elem, op->payload->send_initial_metadata.send_initial_metadata)); if (error != GRPC_ERROR_NONE) return error; } @@ -365,8 +353,7 @@ static grpc_error *hs_mutate_op(grpc_exec_ctx *exec_ctx, if (op->send_trailing_metadata) { grpc_error *error = server_filter_outgoing_metadata( - exec_ctx, elem, - op->payload->send_trailing_metadata.send_trailing_metadata); + elem, op->payload->send_trailing_metadata.send_trailing_metadata); if (error != GRPC_ERROR_NONE) return error; } @@ -374,23 +361,21 @@ static grpc_error *hs_mutate_op(grpc_exec_ctx *exec_ctx, } static void hs_start_transport_stream_op_batch( - grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - grpc_transport_stream_op_batch *op) { + grpc_call_element *elem, grpc_transport_stream_op_batch *op) { call_data *calld = (call_data *)elem->call_data; GPR_TIMER_BEGIN("hs_start_transport_stream_op_batch", 0); - grpc_error *error = hs_mutate_op(exec_ctx, elem, op); + grpc_error *error = hs_mutate_op(elem, op); if (error != GRPC_ERROR_NONE) { - grpc_transport_stream_op_batch_finish_with_failure(exec_ctx, op, error, + grpc_transport_stream_op_batch_finish_with_failure(op, error, calld->call_combiner); } else { - grpc_call_next_op(exec_ctx, elem, op); + grpc_call_next_op(elem, op); } GPR_TIMER_END("hs_start_transport_stream_op_batch", 0); } /* Constructor for call_data */ -static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *init_call_elem(grpc_call_element *elem, const grpc_call_element_args *args) { /* grab pointers to our data from the call element */ call_data *calld = (call_data *)elem->call_data; @@ -407,24 +392,22 @@ static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, } /* Destructor for call_data */ -static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, +static void destroy_call_elem(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *ignored) { call_data *calld = (call_data *)elem->call_data; - grpc_slice_buffer_destroy_internal(exec_ctx, &calld->read_slice_buffer); + grpc_slice_buffer_destroy_internal(&calld->read_slice_buffer); } /* Constructor for channel_data */ -static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static grpc_error *init_channel_elem(grpc_channel_element *elem, grpc_channel_element_args *args) { GPR_ASSERT(!args->is_last); return GRPC_ERROR_NONE; } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem) {} +static void destroy_channel_elem(grpc_channel_element *elem) {} const grpc_channel_filter grpc_http_server_filter = { hs_start_transport_stream_op_batch, diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc index ca8a3b2a134..6c93d0e8214 100644 --- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc +++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc @@ -54,8 +54,7 @@ typedef struct channel_data { intptr_t id; /**< an id unique to the channel */ } channel_data; -static void on_initial_md_ready(grpc_exec_ctx *exec_ctx, void *user_data, - grpc_error *err) { +static void on_initial_md_ready(void *user_data, grpc_error *err) { grpc_call_element *elem = (grpc_call_element *)user_data; call_data *calld = (call_data *)elem->call_data; @@ -73,20 +72,19 @@ static void on_initial_md_ready(grpc_exec_ctx *exec_ctx, void *user_data, GRPC_MDVALUE(calld->recv_initial_metadata->idx.named.lb_token->md)); calld->have_initial_md_string = true; grpc_metadata_batch_remove( - exec_ctx, calld->recv_initial_metadata, + calld->recv_initial_metadata, calld->recv_initial_metadata->idx.named.lb_token); } } else { GRPC_ERROR_REF(err); } calld->ops_recv_initial_metadata_ready->cb( - exec_ctx, calld->ops_recv_initial_metadata_ready->cb_arg, err); + calld->ops_recv_initial_metadata_ready->cb_arg, err); GRPC_ERROR_UNREF(err); } /* Constructor for call_data */ -static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *init_call_elem(grpc_call_element *elem, const grpc_call_element_args *args) { call_data *calld = (call_data *)elem->call_data; calld->id = (intptr_t)args->call_stack; @@ -108,7 +106,7 @@ static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, } /* Destructor for call_data */ -static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, +static void destroy_call_elem(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *ignored) { call_data *calld = (call_data *)elem->call_data; @@ -125,19 +123,18 @@ static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, */ if (calld->have_initial_md_string) { - grpc_slice_unref_internal(exec_ctx, calld->initial_md_string); + grpc_slice_unref_internal(calld->initial_md_string); } if (calld->have_trailing_md_string) { - grpc_slice_unref_internal(exec_ctx, calld->trailing_md_string); + grpc_slice_unref_internal(calld->trailing_md_string); } if (calld->have_service_method) { - grpc_slice_unref_internal(exec_ctx, calld->service_method); + grpc_slice_unref_internal(calld->service_method); } } /* Constructor for channel_data */ -static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static grpc_error *init_channel_elem(grpc_channel_element *elem, grpc_channel_element_args *args) { GPR_ASSERT(!args->is_last); @@ -158,8 +155,7 @@ static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem) { +static void destroy_channel_elem(grpc_channel_element *elem) { /* TODO(dgq): do something with the data channel_data *chand = elem->channel_data; grpc_load_reporting_call_data lr_call_data = { @@ -173,8 +169,7 @@ static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, */ } -static grpc_filtered_mdelem lr_trailing_md_filter(grpc_exec_ctx *exec_ctx, - void *user_data, +static grpc_filtered_mdelem lr_trailing_md_filter(void *user_data, grpc_mdelem md) { grpc_call_element *elem = (grpc_call_element *)user_data; call_data *calld = (call_data *)elem->call_data; @@ -186,8 +181,7 @@ static grpc_filtered_mdelem lr_trailing_md_filter(grpc_exec_ctx *exec_ctx, } static void lr_start_transport_stream_op_batch( - grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - grpc_transport_stream_op_batch *op) { + grpc_call_element *elem, grpc_transport_stream_op_batch *op) { GPR_TIMER_BEGIN("lr_start_transport_stream_op_batch", 0); call_data *calld = (call_data *)elem->call_data; @@ -203,12 +197,11 @@ static void lr_start_transport_stream_op_batch( GRPC_LOG_IF_ERROR( "grpc_metadata_batch_filter", grpc_metadata_batch_filter( - exec_ctx, op->payload->send_trailing_metadata.send_trailing_metadata, lr_trailing_md_filter, elem, "LR trailing metadata filtering error")); } - grpc_call_next_op(exec_ctx, elem, op); + grpc_call_next_op(elem, op); GPR_TIMER_END("lr_start_transport_stream_op_batch", 0); } diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc b/src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc index 223fb3ee8b4..6a38b718329 100644 --- a/src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc +++ b/src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc @@ -38,7 +38,7 @@ static bool is_load_reporting_enabled(const grpc_channel_args *a) { } static bool maybe_add_server_load_reporting_filter( - grpc_exec_ctx *exec_ctx, grpc_channel_stack_builder *builder, void *arg) { + grpc_channel_stack_builder *builder, void *arg) { const grpc_channel_args *args = grpc_channel_stack_builder_get_channel_arguments(builder); const grpc_channel_filter *filter = (const grpc_channel_filter *)arg; diff --git a/src/core/ext/filters/max_age/max_age_filter.cc b/src/core/ext/filters/max_age/max_age_filter.cc index ade2e5bc825..1b9ce3b9967 100644 --- a/src/core/ext/filters/max_age/max_age_filter.cc +++ b/src/core/ext/filters/max_age/max_age_filter.cc @@ -88,73 +88,67 @@ typedef struct channel_data { /* Increase the nubmer of active calls. Before the increasement, if there are no calls, the max_idle_timer should be cancelled. */ -static void increase_call_count(grpc_exec_ctx* exec_ctx, channel_data* chand) { +static void increase_call_count(channel_data* chand) { if (gpr_atm_full_fetch_add(&chand->call_count, 1) == 0) { - grpc_timer_cancel(exec_ctx, &chand->max_idle_timer); + grpc_timer_cancel(&chand->max_idle_timer); } } /* Decrease the nubmer of active calls. After the decrement, if there are no calls, the max_idle_timer should be started. */ -static void decrease_call_count(grpc_exec_ctx* exec_ctx, channel_data* chand) { +static void decrease_call_count(channel_data* chand) { if (gpr_atm_full_fetch_add(&chand->call_count, -1) == 1) { GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age max_idle_timer"); - grpc_timer_init(exec_ctx, &chand->max_idle_timer, - grpc_exec_ctx_now(exec_ctx) + chand->max_connection_idle, + grpc_timer_init(&chand->max_idle_timer, + grpc_exec_ctx_now() + chand->max_connection_idle, &chand->close_max_idle_channel); } } -static void start_max_idle_timer_after_init(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void start_max_idle_timer_after_init(void* arg, grpc_error* error) { channel_data* chand = (channel_data*)arg; /* Decrease call_count. If there are no active calls at this time, max_idle_timer will start here. If the number of active calls is not 0, max_idle_timer will start after all the active calls end. */ - decrease_call_count(exec_ctx, chand); - GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->channel_stack, + decrease_call_count(chand); + GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, "max_age start_max_idle_timer_after_init"); } -static void start_max_age_timer_after_init(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void start_max_age_timer_after_init(void* arg, grpc_error* error) { channel_data* chand = (channel_data*)arg; gpr_mu_lock(&chand->max_age_timer_mu); chand->max_age_timer_pending = true; GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age max_age_timer"); - grpc_timer_init(exec_ctx, &chand->max_age_timer, - grpc_exec_ctx_now(exec_ctx) + chand->max_connection_age, + grpc_timer_init(&chand->max_age_timer, + grpc_exec_ctx_now() + chand->max_connection_age, &chand->close_max_age_channel); gpr_mu_unlock(&chand->max_age_timer_mu); grpc_transport_op* op = grpc_make_transport_op(NULL); op->on_connectivity_state_change = &chand->channel_connectivity_changed, op->connectivity_state = &chand->connectivity_state; - grpc_channel_next_op(exec_ctx, - grpc_channel_stack_element(chand->channel_stack, 0), op); - GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->channel_stack, + grpc_channel_next_op(grpc_channel_stack_element(chand->channel_stack, 0), op); + GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, "max_age start_max_age_timer_after_init"); } -static void start_max_age_grace_timer_after_goaway_op(grpc_exec_ctx* exec_ctx, - void* arg, +static void start_max_age_grace_timer_after_goaway_op(void* arg, grpc_error* error) { channel_data* chand = (channel_data*)arg; gpr_mu_lock(&chand->max_age_timer_mu); chand->max_age_grace_timer_pending = true; GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age max_age_grace_timer"); - grpc_timer_init( - exec_ctx, &chand->max_age_grace_timer, - chand->max_connection_age_grace == GRPC_MILLIS_INF_FUTURE - ? GRPC_MILLIS_INF_FUTURE - : grpc_exec_ctx_now(exec_ctx) + chand->max_connection_age_grace, - &chand->force_close_max_age_channel); + grpc_timer_init(&chand->max_age_grace_timer, + chand->max_connection_age_grace == GRPC_MILLIS_INF_FUTURE + ? GRPC_MILLIS_INF_FUTURE + : grpc_exec_ctx_now() + chand->max_connection_age_grace, + &chand->force_close_max_age_channel); gpr_mu_unlock(&chand->max_age_timer_mu); - GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->channel_stack, + GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, "max_age start_max_age_grace_timer_after_goaway_op"); } -static void close_max_idle_channel(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void close_max_idle_channel(void* arg, grpc_error* error) { channel_data* chand = (channel_data*)arg; if (error == GRPC_ERROR_NONE) { /* Prevent the max idle timer from being set again */ @@ -165,16 +159,14 @@ static void close_max_idle_channel(grpc_exec_ctx* exec_ctx, void* arg, GRPC_ERROR_INT_HTTP2_ERROR, GRPC_HTTP2_NO_ERROR); grpc_channel_element* elem = grpc_channel_stack_element(chand->channel_stack, 0); - elem->filter->start_transport_op(exec_ctx, elem, op); + elem->filter->start_transport_op(elem, op); } else if (error != GRPC_ERROR_CANCELLED) { GRPC_LOG_IF_ERROR("close_max_idle_channel", error); } - GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->channel_stack, - "max_age max_idle_timer"); + GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, "max_age max_idle_timer"); } -static void close_max_age_channel(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void close_max_age_channel(void* arg, grpc_error* error) { channel_data* chand = (channel_data*)arg; gpr_mu_lock(&chand->max_age_timer_mu); chand->max_age_timer_pending = false; @@ -189,16 +181,14 @@ static void close_max_age_channel(grpc_exec_ctx* exec_ctx, void* arg, GRPC_ERROR_INT_HTTP2_ERROR, GRPC_HTTP2_NO_ERROR); grpc_channel_element* elem = grpc_channel_stack_element(chand->channel_stack, 0); - elem->filter->start_transport_op(exec_ctx, elem, op); + elem->filter->start_transport_op(elem, op); } else if (error != GRPC_ERROR_CANCELLED) { GRPC_LOG_IF_ERROR("close_max_age_channel", error); } - GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->channel_stack, - "max_age max_age_timer"); + GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, "max_age max_age_timer"); } -static void force_close_max_age_channel(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void force_close_max_age_channel(void* arg, grpc_error* error) { channel_data* chand = (channel_data*)arg; gpr_mu_lock(&chand->max_age_timer_mu); chand->max_age_grace_timer_pending = false; @@ -209,38 +199,36 @@ static void force_close_max_age_channel(grpc_exec_ctx* exec_ctx, void* arg, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Channel reaches max age"); grpc_channel_element* elem = grpc_channel_stack_element(chand->channel_stack, 0); - elem->filter->start_transport_op(exec_ctx, elem, op); + elem->filter->start_transport_op(elem, op); } else if (error != GRPC_ERROR_CANCELLED) { GRPC_LOG_IF_ERROR("force_close_max_age_channel", error); } - GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->channel_stack, - "max_age max_age_grace_timer"); + GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, "max_age max_age_grace_timer"); } -static void channel_connectivity_changed(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void channel_connectivity_changed(void* arg, grpc_error* error) { channel_data* chand = (channel_data*)arg; if (chand->connectivity_state != GRPC_CHANNEL_SHUTDOWN) { grpc_transport_op* op = grpc_make_transport_op(NULL); op->on_connectivity_state_change = &chand->channel_connectivity_changed, op->connectivity_state = &chand->connectivity_state; - grpc_channel_next_op( - exec_ctx, grpc_channel_stack_element(chand->channel_stack, 0), op); + grpc_channel_next_op(grpc_channel_stack_element(chand->channel_stack, 0), + op); } else { gpr_mu_lock(&chand->max_age_timer_mu); if (chand->max_age_timer_pending) { - grpc_timer_cancel(exec_ctx, &chand->max_age_timer); + grpc_timer_cancel(&chand->max_age_timer); chand->max_age_timer_pending = false; } if (chand->max_age_grace_timer_pending) { - grpc_timer_cancel(exec_ctx, &chand->max_age_grace_timer); + grpc_timer_cancel(&chand->max_age_grace_timer); chand->max_age_grace_timer_pending = false; } gpr_mu_unlock(&chand->max_age_timer_mu); /* If there are no active calls, this increasement will cancel max_idle_timer, and prevent max_idle_timer from being started in the future. */ - increase_call_count(exec_ctx, chand); + increase_call_count(chand); } } @@ -263,25 +251,23 @@ add_random_max_connection_age_jitter_and_convert_to_grpc_millis(int value) { } /* Constructor for call_data. */ -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { channel_data* chand = (channel_data*)elem->channel_data; - increase_call_count(exec_ctx, chand); + increase_call_count(chand); return GRPC_ERROR_NONE; } /* Destructor for call_data. */ -static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { channel_data* chand = (channel_data*)elem->channel_data; - decrease_call_count(exec_ctx, chand); + decrease_call_count(chand); } /* Constructor for channel_data. */ -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { channel_data* chand = (channel_data*)elem->channel_data; gpr_mu_init(&chand->max_age_timer_mu); @@ -351,8 +337,7 @@ static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, initialization is done. */ GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age start_max_age_timer_after_init"); - GRPC_CLOSURE_SCHED(exec_ctx, &chand->start_max_age_timer_after_init, - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&chand->start_max_age_timer_after_init, GRPC_ERROR_NONE); } /* Initialize the number of calls as 1, so that the max_idle_timer will not @@ -361,15 +346,14 @@ static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, if (chand->max_connection_idle != GRPC_MILLIS_INF_FUTURE) { GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age start_max_idle_timer_after_init"); - GRPC_CLOSURE_SCHED(exec_ctx, &chand->start_max_idle_timer_after_init, + GRPC_CLOSURE_SCHED(&chand->start_max_idle_timer_after_init, GRPC_ERROR_NONE); } return GRPC_ERROR_NONE; } /* Destructor for channel_data. */ -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_channel_element* elem) {} const grpc_channel_filter grpc_max_age_filter = { grpc_call_next_op, @@ -384,8 +368,7 @@ const grpc_channel_filter grpc_max_age_filter = { grpc_channel_next_get_info, "max_age"}; -static bool maybe_add_max_age_filter(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, +static bool maybe_add_max_age_filter(grpc_channel_stack_builder* builder, void* arg) { const grpc_channel_args* channel_args = grpc_channel_stack_builder_get_channel_arguments(builder); diff --git a/src/core/ext/filters/message_size/message_size_filter.cc b/src/core/ext/filters/message_size/message_size_filter.cc index 5dc131b9f6c..b5c0efe6b9f 100644 --- a/src/core/ext/filters/message_size/message_size_filter.cc +++ b/src/core/ext/filters/message_size/message_size_filter.cc @@ -35,9 +35,7 @@ typedef struct message_size_limits { int max_recv_size; } message_size_limits; -static void message_size_limits_free(grpc_exec_ctx* exec_ctx, void* value) { - gpr_free(value); -} +static void message_size_limits_free(void* value) { gpr_free(value); } static void* message_size_limits_create_from_json(const grpc_json* json) { int max_request_message_bytes = -1; @@ -88,8 +86,7 @@ typedef struct channel_data { // Callback invoked when we receive a message. Here we check the max // receive message size. -static void recv_message_ready(grpc_exec_ctx* exec_ctx, void* user_data, - grpc_error* error) { +static void recv_message_ready(void* user_data, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; if (*calld->recv_message != NULL && calld->limits.max_recv_size >= 0 && @@ -112,13 +109,12 @@ static void recv_message_ready(grpc_exec_ctx* exec_ctx, void* user_data, GRPC_ERROR_REF(error); } // Invoke the next callback. - GRPC_CLOSURE_RUN(exec_ctx, calld->next_recv_message_ready, error); + GRPC_CLOSURE_RUN(calld->next_recv_message_ready, error); } // Start transport stream op. static void start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* op) { + grpc_call_element* elem, grpc_transport_stream_op_batch* op) { call_data* calld = (call_data*)elem->call_data; // Check max send message size. if (op->send_message && calld->limits.max_send_size >= 0 && @@ -129,10 +125,9 @@ static void start_transport_stream_op_batch( op->payload->send_message.send_message->length, calld->limits.max_send_size); grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, op, - grpc_error_set_int(GRPC_ERROR_CREATE_FROM_COPIED_STRING(message_string), - GRPC_ERROR_INT_GRPC_STATUS, - GRPC_STATUS_RESOURCE_EXHAUSTED), + op, grpc_error_set_int( + GRPC_ERROR_CREATE_FROM_COPIED_STRING(message_string), + GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_RESOURCE_EXHAUSTED), calld->call_combiner); gpr_free(message_string); return; @@ -145,12 +140,11 @@ static void start_transport_stream_op_batch( op->payload->recv_message.recv_message_ready = &calld->recv_message_ready; } // Chain to the next filter. - grpc_call_next_op(exec_ctx, elem, op); + grpc_call_next_op(elem, op); } // Constructor for call_data. -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; @@ -166,7 +160,7 @@ static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, if (chand->method_limit_table != NULL) { message_size_limits* limits = (message_size_limits*)grpc_method_config_table_get( - exec_ctx, chand->method_limit_table, args->path); + chand->method_limit_table, args->path); if (limits != NULL) { if (limits->max_send_size >= 0 && (limits->max_send_size < calld->limits.max_send_size || @@ -184,7 +178,7 @@ static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, } // Destructor for call_data. -static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) {} @@ -221,8 +215,7 @@ message_size_limits get_message_size_limits( } // Constructor for channel_data. -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { GPR_ASSERT(!args->is_last); channel_data* chand = (channel_data*)elem->channel_data; @@ -237,7 +230,7 @@ static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, if (service_config != NULL) { chand->method_limit_table = grpc_service_config_create_method_config_table( - exec_ctx, service_config, message_size_limits_create_from_json, + service_config, message_size_limits_create_from_json, message_size_limits_free); grpc_service_config_destroy(service_config); } @@ -246,10 +239,9 @@ static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, } // Destructor for channel_data. -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) { +static void destroy_channel_elem(grpc_channel_element* elem) { channel_data* chand = (channel_data*)elem->channel_data; - grpc_slice_hash_table_unref(exec_ctx, chand->method_limit_table); + grpc_slice_hash_table_unref(chand->method_limit_table); } const grpc_channel_filter grpc_message_size_filter = { @@ -265,8 +257,7 @@ const grpc_channel_filter grpc_message_size_filter = { grpc_channel_next_get_info, "message_size"}; -static bool maybe_add_message_size_filter(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, +static bool maybe_add_message_size_filter(grpc_channel_stack_builder* builder, void* arg) { const grpc_channel_args* channel_args = grpc_channel_stack_builder_get_channel_arguments(builder); diff --git a/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc b/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc index f77ed024211..95e4719e668 100644 --- a/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc +++ b/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc @@ -50,8 +50,7 @@ static bool get_user_agent_mdelem(const grpc_metadata_batch* batch, } // Callback invoked when we receive an initial metadata. -static void recv_initial_metadata_ready(grpc_exec_ctx* exec_ctx, - void* user_data, grpc_error* error) { +static void recv_initial_metadata_ready(void* user_data, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; @@ -67,14 +66,13 @@ static void recv_initial_metadata_ready(grpc_exec_ctx* exec_ctx, } // Invoke the next callback. - GRPC_CLOSURE_RUN(exec_ctx, calld->next_recv_initial_metadata_ready, + GRPC_CLOSURE_RUN(calld->next_recv_initial_metadata_ready, GRPC_ERROR_REF(error)); } // Start transport stream op. static void start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* op) { + grpc_call_element* elem, grpc_transport_stream_op_batch* op) { call_data* calld = (call_data*)elem->call_data; // Inject callback for receiving initial metadata @@ -96,12 +94,11 @@ static void start_transport_stream_op_batch( } // Chain to the next filter. - grpc_call_next_op(exec_ctx, elem, op); + grpc_call_next_op(elem, op); } // Constructor for call_data. -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; calld->next_recv_initial_metadata_ready = NULL; @@ -113,20 +110,18 @@ static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, } // Destructor for call_data. -static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) {} // Constructor for channel_data. -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } // Destructor for channel_data. -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_channel_element* elem) {} // Parse the user agent static bool parse_user_agent(grpc_mdelem md) { @@ -181,7 +176,7 @@ const grpc_channel_filter grpc_workaround_cronet_compression_filter = { "workaround_cronet_compression"}; static bool register_workaround_cronet_compression( - grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, void* arg) { + grpc_channel_stack_builder* builder, void* arg) { const grpc_channel_args* channel_args = grpc_channel_stack_builder_get_channel_arguments(builder); const grpc_arg* a = grpc_channel_args_find( diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.cc b/src/core/ext/transport/chttp2/client/chttp2_connector.cc index 202bcd47f5c..edeb59a702f 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.cc +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.cc @@ -61,38 +61,34 @@ static void chttp2_connector_ref(grpc_connector *con) { gpr_ref(&c->refs); } -static void chttp2_connector_unref(grpc_exec_ctx *exec_ctx, - grpc_connector *con) { +static void chttp2_connector_unref(grpc_connector *con) { chttp2_connector *c = (chttp2_connector *)con; if (gpr_unref(&c->refs)) { gpr_mu_destroy(&c->mu); // If handshaking is not yet in progress, destroy the endpoint. // Otherwise, the handshaker will do this for us. - if (c->endpoint != NULL) grpc_endpoint_destroy(exec_ctx, c->endpoint); + if (c->endpoint != NULL) grpc_endpoint_destroy(c->endpoint); gpr_free(c); } } -static void chttp2_connector_shutdown(grpc_exec_ctx *exec_ctx, - grpc_connector *con, grpc_error *why) { +static void chttp2_connector_shutdown(grpc_connector *con, grpc_error *why) { chttp2_connector *c = (chttp2_connector *)con; gpr_mu_lock(&c->mu); c->shutdown = true; if (c->handshake_mgr != NULL) { - grpc_handshake_manager_shutdown(exec_ctx, c->handshake_mgr, - GRPC_ERROR_REF(why)); + grpc_handshake_manager_shutdown(c->handshake_mgr, GRPC_ERROR_REF(why)); } // If handshaking is not yet in progress, shutdown the endpoint. // Otherwise, the handshaker will do this for us. if (!c->connecting && c->endpoint != NULL) { - grpc_endpoint_shutdown(exec_ctx, c->endpoint, GRPC_ERROR_REF(why)); + grpc_endpoint_shutdown(c->endpoint, GRPC_ERROR_REF(why)); } gpr_mu_unlock(&c->mu); GRPC_ERROR_UNREF(why); } -static void on_handshake_done(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void on_handshake_done(void *arg, grpc_error *error) { grpc_handshaker_args *args = (grpc_handshaker_args *)arg; chttp2_connector *c = (chttp2_connector *)args->user_data; gpr_mu_lock(&c->mu); @@ -105,10 +101,10 @@ static void on_handshake_done(grpc_exec_ctx *exec_ctx, void *arg, // before destroying them, even if we know that there are no // pending read/write callbacks. This should be fixed, at which // point this can be removed. - grpc_endpoint_shutdown(exec_ctx, args->endpoint, GRPC_ERROR_REF(error)); - grpc_endpoint_destroy(exec_ctx, args->endpoint); - grpc_channel_args_destroy(exec_ctx, args->args); - grpc_slice_buffer_destroy_internal(exec_ctx, args->read_buffer); + grpc_endpoint_shutdown(args->endpoint, GRPC_ERROR_REF(error)); + grpc_endpoint_destroy(args->endpoint); + grpc_channel_args_destroy(args->args); + grpc_slice_buffer_destroy_internal(args->read_buffer); gpr_free(args->read_buffer); } else { error = GRPC_ERROR_REF(error); @@ -116,33 +112,32 @@ static void on_handshake_done(grpc_exec_ctx *exec_ctx, void *arg, memset(c->result, 0, sizeof(*c->result)); } else { c->result->transport = - grpc_create_chttp2_transport(exec_ctx, args->args, args->endpoint, 1); + grpc_create_chttp2_transport(args->args, args->endpoint, 1); GPR_ASSERT(c->result->transport); - grpc_chttp2_transport_start_reading(exec_ctx, c->result->transport, + grpc_chttp2_transport_start_reading(c->result->transport, args->read_buffer); c->result->channel_args = args->args; } grpc_closure *notify = c->notify; c->notify = NULL; - GRPC_CLOSURE_SCHED(exec_ctx, notify, error); - grpc_handshake_manager_destroy(exec_ctx, c->handshake_mgr); + GRPC_CLOSURE_SCHED(notify, error); + grpc_handshake_manager_destroy(c->handshake_mgr); c->handshake_mgr = NULL; gpr_mu_unlock(&c->mu); - chttp2_connector_unref(exec_ctx, (grpc_connector *)c); + chttp2_connector_unref((grpc_connector *)c); } -static void start_handshake_locked(grpc_exec_ctx *exec_ctx, - chttp2_connector *c) { +static void start_handshake_locked(chttp2_connector *c) { c->handshake_mgr = grpc_handshake_manager_create(); - grpc_handshakers_add(exec_ctx, HANDSHAKER_CLIENT, c->args.channel_args, + grpc_handshakers_add(HANDSHAKER_CLIENT, c->args.channel_args, c->handshake_mgr); grpc_handshake_manager_do_handshake( - exec_ctx, c->handshake_mgr, c->endpoint, c->args.channel_args, - c->args.deadline, NULL /* acceptor */, on_handshake_done, c); + c->handshake_mgr, c->endpoint, c->args.channel_args, c->args.deadline, + NULL /* acceptor */, on_handshake_done, c); c->endpoint = NULL; // Endpoint handed off to handshake manager. } -static void connected(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void connected(void *arg, grpc_error *error) { chttp2_connector *c = (chttp2_connector *)arg; gpr_mu_lock(&c->mu); GPR_ASSERT(c->connecting); @@ -156,27 +151,26 @@ static void connected(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { memset(c->result, 0, sizeof(*c->result)); grpc_closure *notify = c->notify; c->notify = NULL; - GRPC_CLOSURE_SCHED(exec_ctx, notify, error); + GRPC_CLOSURE_SCHED(notify, error); if (c->endpoint != NULL) { - grpc_endpoint_shutdown(exec_ctx, c->endpoint, GRPC_ERROR_REF(error)); + grpc_endpoint_shutdown(c->endpoint, GRPC_ERROR_REF(error)); } gpr_mu_unlock(&c->mu); - chttp2_connector_unref(exec_ctx, (grpc_connector *)arg); + chttp2_connector_unref((grpc_connector *)arg); } else { GPR_ASSERT(c->endpoint != NULL); - start_handshake_locked(exec_ctx, c); + start_handshake_locked(c); gpr_mu_unlock(&c->mu); } } -static void chttp2_connector_connect(grpc_exec_ctx *exec_ctx, - grpc_connector *con, +static void chttp2_connector_connect(grpc_connector *con, const grpc_connect_in_args *args, grpc_connect_out_args *result, grpc_closure *notify) { chttp2_connector *c = (chttp2_connector *)con; grpc_resolved_address addr; - grpc_get_subchannel_address_arg(exec_ctx, args->channel_args, &addr); + grpc_get_subchannel_address_arg(args->channel_args, &addr); gpr_mu_lock(&c->mu); GPR_ASSERT(c->notify == NULL); c->notify = notify; @@ -187,9 +181,8 @@ static void chttp2_connector_connect(grpc_exec_ctx *exec_ctx, GRPC_CLOSURE_INIT(&c->connected, connected, c, grpc_schedule_on_exec_ctx); GPR_ASSERT(!c->connecting); c->connecting = true; - grpc_tcp_client_connect(exec_ctx, &c->connected, &c->endpoint, - args->interested_parties, args->channel_args, &addr, - args->deadline); + grpc_tcp_client_connect(&c->connected, &c->endpoint, args->interested_parties, + args->channel_args, &addr, args->deadline); gpr_mu_unlock(&c->mu); } diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc index 6410a6043db..b23c58d1c67 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc @@ -34,21 +34,19 @@ static void client_channel_factory_ref( grpc_client_channel_factory *cc_factory) {} static void client_channel_factory_unref( - grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory) {} + grpc_client_channel_factory *cc_factory) {} static grpc_subchannel *client_channel_factory_create_subchannel( - grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory, - const grpc_subchannel_args *args) { + grpc_client_channel_factory *cc_factory, const grpc_subchannel_args *args) { grpc_connector *connector = grpc_chttp2_connector_create(); - grpc_subchannel *s = grpc_subchannel_create(exec_ctx, connector, args); - grpc_connector_unref(exec_ctx, connector); + grpc_subchannel *s = grpc_subchannel_create(connector, args); + grpc_connector_unref(connector); 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, - const grpc_channel_args *args) { + grpc_client_channel_factory *cc_factory, const char *target, + grpc_client_channel_type type, const grpc_channel_args *args) { if (target == NULL) { gpr_log(GPR_ERROR, "cannot create channel with NULL target name"); return NULL; @@ -56,14 +54,14 @@ static grpc_channel *client_channel_factory_create_channel( // Add channel arg containing the server URI. grpc_arg arg = grpc_channel_arg_string_create( (char *)GRPC_ARG_SERVER_URI, - grpc_resolver_factory_add_default_prefix_if_needed(exec_ctx, target)); + grpc_resolver_factory_add_default_prefix_if_needed(target)); const char *to_remove[] = {GRPC_ARG_SERVER_URI}; grpc_channel_args *new_args = grpc_channel_args_copy_and_add_and_remove(args, to_remove, 1, &arg, 1); gpr_free(arg.value.string); - grpc_channel *channel = grpc_channel_create(exec_ctx, target, new_args, - GRPC_CLIENT_CHANNEL, NULL); - grpc_channel_args_destroy(exec_ctx, new_args); + grpc_channel *channel = + grpc_channel_create(target, new_args, GRPC_CLIENT_CHANNEL, NULL); + grpc_channel_args_destroy(new_args); return channel; } @@ -82,7 +80,7 @@ static grpc_client_channel_factory client_channel_factory = { grpc_channel *grpc_insecure_channel_create(const char *target, const grpc_channel_args *args, void *reserved) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GRPC_API_TRACE( "grpc_insecure_channel_create(target=%s, args=%p, reserved=%p)", 3, (target, args, reserved)); @@ -93,11 +91,11 @@ grpc_channel *grpc_insecure_channel_create(const char *target, grpc_channel_args *new_args = grpc_channel_args_copy_and_add(args, &arg, 1); // Create channel. grpc_channel *channel = client_channel_factory_create_channel( - &exec_ctx, &client_channel_factory, target, - GRPC_CLIENT_CHANNEL_TYPE_REGULAR, new_args); + &client_channel_factory, target, GRPC_CLIENT_CHANNEL_TYPE_REGULAR, + new_args); // Clean up. - grpc_channel_args_destroy(&exec_ctx, new_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_channel_args_destroy(new_args); + grpc_exec_ctx_finish(); return channel != NULL ? channel : grpc_lame_client_channel_create( target, GRPC_STATUS_INTERNAL, "Failed to create client channel"); diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc b/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc index dd88136f7b5..c438413961c 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc @@ -37,7 +37,7 @@ grpc_channel *grpc_insecure_channel_create_from_fd( const char *target, int fd, const grpc_channel_args *args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GRPC_API_TRACE("grpc_insecure_channel_create(target=%p, fd=%d, args=%p)", 3, (target, fd, args)); @@ -50,17 +50,17 @@ grpc_channel *grpc_insecure_channel_create_from_fd( GPR_ASSERT(fcntl(fd, F_SETFL, flags | O_NONBLOCK) == 0); grpc_endpoint *client = grpc_tcp_client_create_from_fd( - &exec_ctx, grpc_fd_create(fd, "client"), args, "fd-client"); + grpc_fd_create(fd, "client"), args, "fd-client"); grpc_transport *transport = - grpc_create_chttp2_transport(&exec_ctx, final_args, client, 1); + grpc_create_chttp2_transport(final_args, client, 1); GPR_ASSERT(transport); grpc_channel *channel = grpc_channel_create( - &exec_ctx, target, final_args, GRPC_CLIENT_DIRECT_CHANNEL, transport); - grpc_channel_args_destroy(&exec_ctx, final_args); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL); + target, final_args, GRPC_CLIENT_DIRECT_CHANNEL, transport); + grpc_channel_args_destroy(final_args); + grpc_chttp2_transport_start_reading(transport, NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return channel != NULL ? channel : grpc_lame_client_channel_create( target, GRPC_STATUS_INTERNAL, diff --git a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc index fe296cf4ff3..8d975cbfcdd 100644 --- a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc +++ b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc @@ -41,10 +41,10 @@ static void client_channel_factory_ref( grpc_client_channel_factory *cc_factory) {} static void client_channel_factory_unref( - grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory) {} + grpc_client_channel_factory *cc_factory) {} static grpc_subchannel_args *get_secure_naming_subchannel_args( - grpc_exec_ctx *exec_ctx, const grpc_subchannel_args *args) { + const grpc_subchannel_args *args) { grpc_channel_credentials *channel_credentials = grpc_channel_credentials_find_in_args(args->args); if (channel_credentials == NULL) { @@ -68,7 +68,7 @@ static grpc_subchannel_args *get_secure_naming_subchannel_args( const char *server_uri_str = server_uri_arg->value.string; GPR_ASSERT(server_uri_str != NULL); grpc_uri *server_uri = - grpc_uri_parse(exec_ctx, server_uri_str, true /* supress errors */); + grpc_uri_parse(server_uri_str, true /* supress errors */); GPR_ASSERT(server_uri != NULL); const char *server_uri_path; server_uri_path = @@ -81,7 +81,7 @@ static grpc_subchannel_args *get_secure_naming_subchannel_args( const char *target_uri_str = grpc_get_subchannel_address_uri_arg(args->args); grpc_uri *target_uri = - grpc_uri_parse(exec_ctx, target_uri_str, false /* suppress errors */); + grpc_uri_parse(target_uri_str, false /* suppress errors */); GPR_ASSERT(target_uri != NULL); if (target_uri->path[0] != '\0') { // "path" may be empty const grpc_slice key = grpc_slice_from_static_string( @@ -89,7 +89,7 @@ static grpc_subchannel_args *get_secure_naming_subchannel_args( const char *value = (const char *)grpc_slice_hash_table_get(targets_info, key); if (value != NULL) target_name_to_check = gpr_strdup(value); - grpc_slice_unref_internal(exec_ctx, key); + grpc_slice_unref_internal(key); } if (target_name_to_check == NULL) { // If the target name to check hasn't already been set, fall back to using @@ -107,7 +107,7 @@ static grpc_subchannel_args *get_secure_naming_subchannel_args( grpc_channel_args *new_args_from_connector = NULL; const grpc_security_status security_status = grpc_channel_credentials_create_security_connector( - exec_ctx, channel_credentials, target_name_to_check, args->args, + channel_credentials, target_name_to_check, args->args, &subchannel_security_connector, &new_args_from_connector); if (security_status != GRPC_SECURITY_OK) { gpr_log(GPR_ERROR, @@ -123,10 +123,10 @@ static grpc_subchannel_args *get_secure_naming_subchannel_args( grpc_channel_args *new_args = grpc_channel_args_copy_and_add( new_args_from_connector != NULL ? new_args_from_connector : args->args, &new_security_connector_arg, 1); - GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, &subchannel_security_connector->base, + GRPC_SECURITY_CONNECTOR_UNREF(&subchannel_security_connector->base, "lb_channel_create"); if (new_args_from_connector != NULL) { - grpc_channel_args_destroy(exec_ctx, new_args_from_connector); + grpc_channel_args_destroy(new_args_from_connector); } grpc_subchannel_args *final_sc_args = (grpc_subchannel_args *)gpr_malloc(sizeof(*final_sc_args)); @@ -136,10 +136,9 @@ static grpc_subchannel_args *get_secure_naming_subchannel_args( } static grpc_subchannel *client_channel_factory_create_subchannel( - grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory, - const grpc_subchannel_args *args) { + grpc_client_channel_factory *cc_factory, const grpc_subchannel_args *args) { grpc_subchannel_args *subchannel_args = - get_secure_naming_subchannel_args(exec_ctx, args); + get_secure_naming_subchannel_args(args); if (subchannel_args == NULL) { gpr_log( GPR_ERROR, @@ -147,19 +146,16 @@ static grpc_subchannel *client_channel_factory_create_subchannel( return NULL; } grpc_connector *connector = grpc_chttp2_connector_create(); - grpc_subchannel *s = - grpc_subchannel_create(exec_ctx, connector, subchannel_args); - grpc_connector_unref(exec_ctx, connector); - grpc_channel_args_destroy(exec_ctx, - (grpc_channel_args *)subchannel_args->args); + grpc_subchannel *s = grpc_subchannel_create(connector, subchannel_args); + grpc_connector_unref(connector); + grpc_channel_args_destroy((grpc_channel_args *)subchannel_args->args); gpr_free(subchannel_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, - const grpc_channel_args *args) { + grpc_client_channel_factory *cc_factory, const char *target, + grpc_client_channel_type type, const grpc_channel_args *args) { if (target == NULL) { gpr_log(GPR_ERROR, "cannot create channel with NULL target name"); return NULL; @@ -167,14 +163,14 @@ static grpc_channel *client_channel_factory_create_channel( // Add channel arg containing the server URI. grpc_arg arg = grpc_channel_arg_string_create( (char *)GRPC_ARG_SERVER_URI, - grpc_resolver_factory_add_default_prefix_if_needed(exec_ctx, target)); + grpc_resolver_factory_add_default_prefix_if_needed(target)); const char *to_remove[] = {GRPC_ARG_SERVER_URI}; grpc_channel_args *new_args = grpc_channel_args_copy_and_add_and_remove(args, to_remove, 1, &arg, 1); gpr_free(arg.value.string); - grpc_channel *channel = grpc_channel_create(exec_ctx, target, new_args, - GRPC_CLIENT_CHANNEL, NULL); - grpc_channel_args_destroy(exec_ctx, new_args); + grpc_channel *channel = + grpc_channel_create(target, new_args, GRPC_CLIENT_CHANNEL, NULL); + grpc_channel_args_destroy(new_args); return channel; } @@ -194,7 +190,7 @@ grpc_channel *grpc_secure_channel_create(grpc_channel_credentials *creds, const char *target, const grpc_channel_args *args, void *reserved) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GRPC_API_TRACE( "grpc_secure_channel_create(creds=%p, target=%s, args=%p, " "reserved=%p)", @@ -211,11 +207,11 @@ grpc_channel *grpc_secure_channel_create(grpc_channel_credentials *creds, args, args_to_add, GPR_ARRAY_SIZE(args_to_add)); // Create channel. channel = client_channel_factory_create_channel( - &exec_ctx, &client_channel_factory, target, - GRPC_CLIENT_CHANNEL_TYPE_REGULAR, new_args); + &client_channel_factory, target, GRPC_CLIENT_CHANNEL_TYPE_REGULAR, + new_args); // Clean up. - grpc_channel_args_destroy(&exec_ctx, new_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_channel_args_destroy(new_args); + grpc_exec_ctx_finish(); } return channel != NULL ? channel : grpc_lame_client_channel_create( diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index 7ac7f4ece82..a11e95cc728 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -59,8 +59,7 @@ typedef struct { grpc_handshake_manager *handshake_mgr; } server_connection_state; -static void on_handshake_done(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void on_handshake_done(void *arg, grpc_error *error) { grpc_handshaker_args *args = (grpc_handshaker_args *)arg; server_connection_state *connection_state = (server_connection_state *)args->user_data; @@ -76,10 +75,10 @@ static void on_handshake_done(grpc_exec_ctx *exec_ctx, void *arg, // before destroying them, even if we know that there are no // pending read/write callbacks. This should be fixed, at which // point this can be removed. - grpc_endpoint_shutdown(exec_ctx, args->endpoint, GRPC_ERROR_NONE); - grpc_endpoint_destroy(exec_ctx, args->endpoint); - grpc_channel_args_destroy(exec_ctx, args->args); - grpc_slice_buffer_destroy_internal(exec_ctx, args->read_buffer); + grpc_endpoint_shutdown(args->endpoint, GRPC_ERROR_NONE); + grpc_endpoint_destroy(args->endpoint); + grpc_channel_args_destroy(args->args); + grpc_slice_buffer_destroy_internal(args->read_buffer); gpr_free(args->read_buffer); } } else { @@ -88,34 +87,33 @@ static void on_handshake_done(grpc_exec_ctx *exec_ctx, void *arg, // code, so we can just clean up here without creating a transport. if (args->endpoint != NULL) { grpc_transport *transport = - grpc_create_chttp2_transport(exec_ctx, args->args, args->endpoint, 0); + grpc_create_chttp2_transport(args->args, args->endpoint, 0); grpc_server_setup_transport( - exec_ctx, connection_state->svr_state->server, transport, + connection_state->svr_state->server, transport, connection_state->accepting_pollset, args->args); - grpc_chttp2_transport_start_reading(exec_ctx, transport, - args->read_buffer); - grpc_channel_args_destroy(exec_ctx, args->args); + grpc_chttp2_transport_start_reading(transport, args->read_buffer); + grpc_channel_args_destroy(args->args); } } grpc_handshake_manager_pending_list_remove( &connection_state->svr_state->pending_handshake_mgrs, connection_state->handshake_mgr); gpr_mu_unlock(&connection_state->svr_state->mu); - grpc_handshake_manager_destroy(exec_ctx, connection_state->handshake_mgr); - grpc_tcp_server_unref(exec_ctx, connection_state->svr_state->tcp_server); + grpc_handshake_manager_destroy(connection_state->handshake_mgr); + grpc_tcp_server_unref(connection_state->svr_state->tcp_server); gpr_free(connection_state->acceptor); gpr_free(connection_state); } -static void on_accept(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *tcp, +static void on_accept(void *arg, grpc_endpoint *tcp, grpc_pollset *accepting_pollset, grpc_tcp_server_acceptor *acceptor) { server_state *state = (server_state *)arg; gpr_mu_lock(&state->mu); if (state->shutdown) { gpr_mu_unlock(&state->mu); - grpc_endpoint_shutdown(exec_ctx, tcp, GRPC_ERROR_NONE); - grpc_endpoint_destroy(exec_ctx, tcp); + grpc_endpoint_shutdown(tcp, GRPC_ERROR_NONE); + grpc_endpoint_destroy(tcp); gpr_free(acceptor); return; } @@ -130,55 +128,52 @@ static void on_accept(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *tcp, connection_state->accepting_pollset = accepting_pollset; connection_state->acceptor = acceptor; connection_state->handshake_mgr = handshake_mgr; - grpc_handshakers_add(exec_ctx, HANDSHAKER_SERVER, state->args, + grpc_handshakers_add(HANDSHAKER_SERVER, state->args, connection_state->handshake_mgr); // TODO(roth): We should really get this timeout value from channel // args instead of hard-coding it. - const grpc_millis deadline = - grpc_exec_ctx_now(exec_ctx) + 120 * GPR_MS_PER_SEC; - grpc_handshake_manager_do_handshake(exec_ctx, connection_state->handshake_mgr, - tcp, state->args, deadline, acceptor, + const grpc_millis deadline = grpc_exec_ctx_now() + 120 * GPR_MS_PER_SEC; + grpc_handshake_manager_do_handshake(connection_state->handshake_mgr, tcp, + state->args, deadline, acceptor, on_handshake_done, connection_state); } /* Server callback: start listening on our ports */ -static void server_start_listener(grpc_exec_ctx *exec_ctx, grpc_server *server, - void *arg, grpc_pollset **pollsets, +static void server_start_listener(grpc_server *server, void *arg, + grpc_pollset **pollsets, size_t pollset_count) { server_state *state = (server_state *)arg; gpr_mu_lock(&state->mu); state->shutdown = false; gpr_mu_unlock(&state->mu); - grpc_tcp_server_start(exec_ctx, state->tcp_server, pollsets, pollset_count, - on_accept, state); + grpc_tcp_server_start(state->tcp_server, pollsets, pollset_count, on_accept, + state); } -static void tcp_server_shutdown_complete(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void tcp_server_shutdown_complete(void *arg, grpc_error *error) { server_state *state = (server_state *)arg; /* ensure all threads have unlocked */ gpr_mu_lock(&state->mu); grpc_closure *destroy_done = state->server_destroy_listener_done; GPR_ASSERT(state->shutdown); grpc_handshake_manager_pending_list_shutdown_all( - exec_ctx, state->pending_handshake_mgrs, GRPC_ERROR_REF(error)); + state->pending_handshake_mgrs, GRPC_ERROR_REF(error)); gpr_mu_unlock(&state->mu); // Flush queued work before destroying handshaker factory, since that // may do a synchronous unref. - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); if (destroy_done != NULL) { - destroy_done->cb(exec_ctx, destroy_done->cb_arg, GRPC_ERROR_REF(error)); - grpc_exec_ctx_flush(exec_ctx); + destroy_done->cb(destroy_done->cb_arg, GRPC_ERROR_REF(error)); + grpc_exec_ctx_flush(); } - grpc_channel_args_destroy(exec_ctx, state->args); + grpc_channel_args_destroy(state->args); gpr_mu_destroy(&state->mu); gpr_free(state); } /* Server callback: destroy the tcp listener (so we don't generate further callbacks) */ -static void server_destroy_listener(grpc_exec_ctx *exec_ctx, - grpc_server *server, void *arg, +static void server_destroy_listener(grpc_server *server, void *arg, grpc_closure *destroy_done) { server_state *state = (server_state *)arg; gpr_mu_lock(&state->mu); @@ -186,12 +181,11 @@ static void server_destroy_listener(grpc_exec_ctx *exec_ctx, state->server_destroy_listener_done = destroy_done; grpc_tcp_server *tcp_server = state->tcp_server; gpr_mu_unlock(&state->mu); - grpc_tcp_server_shutdown_listeners(exec_ctx, tcp_server); - grpc_tcp_server_unref(exec_ctx, tcp_server); + grpc_tcp_server_shutdown_listeners(tcp_server); + grpc_tcp_server_unref(tcp_server); } -grpc_error *grpc_chttp2_server_add_port(grpc_exec_ctx *exec_ctx, - grpc_server *server, const char *addr, +grpc_error *grpc_chttp2_server_add_port(grpc_server *server, const char *addr, grpc_channel_args *args, int *port_num) { grpc_resolved_addresses *resolved = NULL; @@ -215,8 +209,8 @@ grpc_error *grpc_chttp2_server_add_port(grpc_exec_ctx *exec_ctx, GRPC_CLOSURE_INIT(&state->tcp_server_shutdown_complete, tcp_server_shutdown_complete, state, grpc_schedule_on_exec_ctx); - err = grpc_tcp_server_create(exec_ctx, &state->tcp_server_shutdown_complete, - args, &tcp_server); + err = grpc_tcp_server_create(&state->tcp_server_shutdown_complete, args, + &tcp_server); if (err != GRPC_ERROR_NONE) { goto error; } @@ -264,7 +258,7 @@ grpc_error *grpc_chttp2_server_add_port(grpc_exec_ctx *exec_ctx, grpc_resolved_addresses_destroy(resolved); /* Register with the server only upon success */ - grpc_server_add_listener(exec_ctx, server, state, server_start_listener, + grpc_server_add_listener(server, state, server_start_listener, server_destroy_listener); goto done; @@ -275,9 +269,9 @@ error: grpc_resolved_addresses_destroy(resolved); } if (tcp_server) { - grpc_tcp_server_unref(exec_ctx, tcp_server); + grpc_tcp_server_unref(tcp_server); } else { - grpc_channel_args_destroy(exec_ctx, args); + grpc_channel_args_destroy(args); gpr_free(state); } *port_num = 0; diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.h b/src/core/ext/transport/chttp2/server/chttp2_server.h index 2ac155160fc..a85d7e5a182 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.h +++ b/src/core/ext/transport/chttp2/server/chttp2_server.h @@ -29,8 +29,7 @@ extern "C" { /// Adds a port to \a server. Sets \a port_num to the port number. /// Takes ownership of \a args. -grpc_error *grpc_chttp2_server_add_port(grpc_exec_ctx *exec_ctx, - grpc_server *server, const char *addr, +grpc_error *grpc_chttp2_server_add_port(grpc_server *server, const char *addr, grpc_channel_args *args, int *port_num); #ifdef __cplusplus diff --git a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc index d42b2d123e6..a766b316bb9 100644 --- a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc +++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc @@ -26,12 +26,12 @@ #include "src/core/lib/surface/server.h" int grpc_server_add_insecure_http2_port(grpc_server *server, const char *addr) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; int port_num = 0; GRPC_API_TRACE("grpc_server_add_insecure_http2_port(server=%p, addr=%s)", 2, (server, addr)); grpc_error *err = grpc_chttp2_server_add_port( - &exec_ctx, server, addr, + server, addr, grpc_channel_args_copy(grpc_server_get_channel_args(server)), &port_num); if (err != GRPC_ERROR_NONE) { const char *msg = grpc_error_string(err); @@ -39,6 +39,6 @@ int grpc_server_add_insecure_http2_port(grpc_server *server, const char *addr) { GRPC_ERROR_UNREF(err); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return port_num; } diff --git a/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc b/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc index e647067f733..836365238a1 100644 --- a/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc +++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc @@ -38,31 +38,30 @@ void grpc_server_add_insecure_channel_from_fd(grpc_server *server, void *reserved, int fd) { GPR_ASSERT(reserved == NULL); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; char *name; gpr_asprintf(&name, "fd:%d", fd); - grpc_endpoint *server_endpoint = - grpc_tcp_create(&exec_ctx, grpc_fd_create(fd, name), - grpc_server_get_channel_args(server), name); + grpc_endpoint *server_endpoint = grpc_tcp_create( + grpc_fd_create(fd, name), grpc_server_get_channel_args(server), name); gpr_free(name); const grpc_channel_args *server_args = grpc_server_get_channel_args(server); grpc_transport *transport = grpc_create_chttp2_transport( - &exec_ctx, server_args, server_endpoint, 0 /* is_client */); + server_args, server_endpoint, 0 /* is_client */); grpc_pollset **pollsets; size_t num_pollsets = 0; grpc_server_get_pollsets(server, &pollsets, &num_pollsets); for (size_t i = 0; i < num_pollsets; i++) { - grpc_endpoint_add_to_pollset(&exec_ctx, server_endpoint, pollsets[i]); + grpc_endpoint_add_to_pollset(server_endpoint, pollsets[i]); } - grpc_server_setup_transport(&exec_ctx, server, transport, NULL, server_args); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_server_setup_transport(server, transport, NULL, server_args); + grpc_chttp2_transport_start_reading(transport, NULL); + grpc_exec_ctx_finish(); } #else // !GPR_SUPPORT_CHANNELS_FROM_FD diff --git a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc index e74a138d232..95ab9eed769 100644 --- a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc +++ b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc @@ -36,7 +36,7 @@ int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr, grpc_server_credentials *creds) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_error *err = GRPC_ERROR_NONE; grpc_server_security_connector *sc = NULL; int port_num = 0; @@ -52,8 +52,7 @@ int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr, "No credentials specified for secure server port (creds==NULL)"); goto done; } - status = - grpc_server_credentials_create_security_connector(&exec_ctx, creds, &sc); + status = grpc_server_credentials_create_security_connector(creds, &sc); if (status != GRPC_SECURITY_OK) { char *msg; gpr_asprintf(&msg, @@ -72,12 +71,12 @@ int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr, grpc_channel_args_copy_and_add(grpc_server_get_channel_args(server), args_to_add, GPR_ARRAY_SIZE(args_to_add)); // Add server port. - err = grpc_chttp2_server_add_port(&exec_ctx, server, addr, args, &port_num); + err = grpc_chttp2_server_add_port(server, addr, args, &port_num); done: if (sc != NULL) { - GRPC_SECURITY_CONNECTOR_UNREF(&exec_ctx, &sc->base, "server"); + GRPC_SECURITY_CONNECTOR_UNREF(&sc->base, "server"); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); if (err != GRPC_ERROR_NONE) { const char *msg = grpc_error_string(err); gpr_log(GPR_ERROR, "%s", msg); diff --git a/src/core/ext/transport/chttp2/transport/bin_decoder.cc b/src/core/ext/transport/chttp2/transport/bin_decoder.cc index 5a99cbeffcf..4c2a228060a 100644 --- a/src/core/ext/transport/chttp2/transport/bin_decoder.cc +++ b/src/core/ext/transport/chttp2/transport/bin_decoder.cc @@ -130,8 +130,7 @@ bool grpc_base64_decode_partial(struct grpc_base64_decode_context *ctx) { return true; } -grpc_slice grpc_chttp2_base64_decode(grpc_exec_ctx *exec_ctx, - grpc_slice input) { +grpc_slice grpc_chttp2_base64_decode(grpc_slice input) { size_t input_length = GRPC_SLICE_LENGTH(input); size_t output_length = input_length / 4 * 3; struct grpc_base64_decode_context ctx; @@ -167,7 +166,7 @@ grpc_slice grpc_chttp2_base64_decode(grpc_exec_ctx *exec_ctx, char *s = grpc_slice_to_c_string(input); gpr_log(GPR_ERROR, "Base64 decoding failed, input string:\n%s\n", s); gpr_free(s); - grpc_slice_unref_internal(exec_ctx, output); + grpc_slice_unref_internal(output); return grpc_empty_slice(); } GPR_ASSERT(ctx.output_cur == GRPC_SLICE_END_PTR(output)); @@ -175,8 +174,7 @@ grpc_slice grpc_chttp2_base64_decode(grpc_exec_ctx *exec_ctx, return output; } -grpc_slice grpc_chttp2_base64_decode_with_length(grpc_exec_ctx *exec_ctx, - grpc_slice input, +grpc_slice grpc_chttp2_base64_decode_with_length(grpc_slice input, size_t output_length) { size_t input_length = GRPC_SLICE_LENGTH(input); grpc_slice output = GRPC_SLICE_MALLOC(output_length); @@ -189,7 +187,7 @@ grpc_slice grpc_chttp2_base64_decode_with_length(grpc_exec_ctx *exec_ctx, "grpc_chttp2_base64_decode_with_length has a length of %d, which " "has a tail of 1 byte.\n", (int)input_length); - grpc_slice_unref_internal(exec_ctx, output); + grpc_slice_unref_internal(output); return grpc_empty_slice(); } @@ -199,7 +197,7 @@ grpc_slice grpc_chttp2_base64_decode_with_length(grpc_exec_ctx *exec_ctx, "than the max possible output length %d.\n", (int)output_length, (int)(input_length / 4 * 3 + tail_xtra[input_length % 4])); - grpc_slice_unref_internal(exec_ctx, output); + grpc_slice_unref_internal(output); return grpc_empty_slice(); } @@ -213,7 +211,7 @@ grpc_slice grpc_chttp2_base64_decode_with_length(grpc_exec_ctx *exec_ctx, char *s = grpc_slice_to_c_string(input); gpr_log(GPR_ERROR, "Base64 decoding failed, input string:\n%s\n", s); gpr_free(s); - grpc_slice_unref_internal(exec_ctx, output); + grpc_slice_unref_internal(output); return grpc_empty_slice(); } GPR_ASSERT(ctx.output_cur == GRPC_SLICE_END_PTR(output)); diff --git a/src/core/ext/transport/chttp2/transport/bin_decoder.h b/src/core/ext/transport/chttp2/transport/bin_decoder.h index 1c0b2b7e97a..48f206436b9 100644 --- a/src/core/ext/transport/chttp2/transport/bin_decoder.h +++ b/src/core/ext/transport/chttp2/transport/bin_decoder.h @@ -44,13 +44,12 @@ bool grpc_base64_decode_partial(struct grpc_base64_decode_context *ctx); /* base64 decode a slice with pad chars. Returns a new slice, does not take ownership of the input. Returns an empty slice if decoding is failed. */ -grpc_slice grpc_chttp2_base64_decode(grpc_exec_ctx *exec_ctx, grpc_slice input); +grpc_slice grpc_chttp2_base64_decode(grpc_slice input); /* base64 decode a slice without pad chars, data length is needed. Returns a new slice, does not take ownership of the input. Returns an empty slice if decoding is failed. */ -grpc_slice grpc_chttp2_base64_decode_with_length(grpc_exec_ctx *exec_ctx, - grpc_slice input, +grpc_slice grpc_chttp2_base64_decode_with_length(grpc_slice input, size_t output_length); #ifdef __cplusplus diff --git a/src/core/ext/transport/chttp2/transport/bin_encoder.h b/src/core/ext/transport/chttp2/transport/bin_encoder.h index 0be3633354e..2b71af2846d 100644 --- a/src/core/ext/transport/chttp2/transport/bin_encoder.h +++ b/src/core/ext/transport/chttp2/transport/bin_encoder.h @@ -36,7 +36,7 @@ grpc_slice grpc_chttp2_huffman_compress(grpc_slice input); /* equivalent to: grpc_slice x = grpc_chttp2_base64_encode(input); grpc_slice y = grpc_chttp2_huffman_compress(x); - grpc_slice_unref_internal(exec_ctx, x); + grpc_slice_unref_internal( x); return y; */ grpc_slice grpc_chttp2_base64_encode_and_huffman_compress(grpc_slice input); diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index 9462d1085eb..6f8493b58cb 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -100,105 +100,77 @@ grpc_tracer_flag grpc_trace_chttp2_refcount = #endif /* forward declarations of various callbacks that we'll build closures around */ -static void write_action_begin_locked(grpc_exec_ctx *exec_ctx, void *t, - grpc_error *error); -static void write_action(grpc_exec_ctx *exec_ctx, void *t, grpc_error *error); -static void write_action_end_locked(grpc_exec_ctx *exec_ctx, void *t, - grpc_error *error); +static void write_action_begin_locked(void *t, grpc_error *error); +static void write_action(void *t, grpc_error *error); +static void write_action_end_locked(void *t, grpc_error *error); -static void read_action_locked(grpc_exec_ctx *exec_ctx, void *t, - grpc_error *error); +static void read_action_locked(void *t, grpc_error *error); -static void complete_fetch_locked(grpc_exec_ctx *exec_ctx, void *gs, - grpc_error *error); +static void complete_fetch_locked(void *gs, grpc_error *error); /** Set a transport level setting, and push it to our peer */ -static void queue_setting_update(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +static void queue_setting_update(grpc_chttp2_transport *t, grpc_chttp2_setting_id id, uint32_t value); -static void close_from_api(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, - grpc_chttp2_stream *s, grpc_error *error); +static void close_from_api(grpc_chttp2_transport *t, grpc_chttp2_stream *s, + grpc_error *error); /** Start new streams that have been created if we can */ -static void maybe_start_some_streams(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t); +static void maybe_start_some_streams(grpc_chttp2_transport *t); -static void connectivity_state_set(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +static void connectivity_state_set(grpc_chttp2_transport *t, grpc_connectivity_state state, grpc_error *error, const char *reason); -static void incoming_byte_stream_destroy_locked(grpc_exec_ctx *exec_ctx, - void *byte_stream, +static void incoming_byte_stream_destroy_locked(void *byte_stream, grpc_error *error_ignored); static void incoming_byte_stream_publish_error( - grpc_exec_ctx *exec_ctx, grpc_chttp2_incoming_byte_stream *bs, - grpc_error *error); -static void incoming_byte_stream_unref(grpc_exec_ctx *exec_ctx, - grpc_chttp2_incoming_byte_stream *bs); - -static void benign_reclaimer_locked(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, - grpc_error *error); - -static void schedule_bdp_ping_locked(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t); -static void start_bdp_ping_locked(grpc_exec_ctx *exec_ctx, void *tp, - grpc_error *error); -static void finish_bdp_ping_locked(grpc_exec_ctx *exec_ctx, void *tp, - grpc_error *error); -static void next_bdp_ping_timer_expired_locked(grpc_exec_ctx *exec_ctx, - void *tp, grpc_error *error); - -static void cancel_pings(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, - grpc_error *error); -static void send_ping_locked(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, + grpc_chttp2_incoming_byte_stream *bs, grpc_error *error); +static void incoming_byte_stream_unref(grpc_chttp2_incoming_byte_stream *bs); + +static void benign_reclaimer_locked(void *t, grpc_error *error); +static void destructive_reclaimer_locked(void *t, grpc_error *error); + +static void post_benign_reclaimer(grpc_chttp2_transport *t); +static void post_destructive_reclaimer(grpc_chttp2_transport *t); + +static void close_transport_locked(grpc_chttp2_transport *t, grpc_error *error); +static void end_all_the_calls(grpc_chttp2_transport *t, grpc_error *error); + +static void schedule_bdp_ping_locked(grpc_chttp2_transport *t); +static void start_bdp_ping_locked(void *tp, grpc_error *error); +static void finish_bdp_ping_locked(void *tp, grpc_error *error); +static void next_bdp_ping_timer_expired_locked(void *tp, grpc_error *error); + +static void cancel_pings(grpc_chttp2_transport *t, grpc_error *error); +static void send_ping_locked(grpc_chttp2_transport *t, grpc_closure *on_initiate, grpc_closure *on_complete); -static void retry_initiate_ping_locked(grpc_exec_ctx *exec_ctx, void *tp, - grpc_error *error); +static void retry_initiate_ping_locked(void *tp, grpc_error *error); /** keepalive-relevant functions */ -static void init_keepalive_ping_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error); -static void start_keepalive_ping_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error); -static void finish_keepalive_ping_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error); -static void keepalive_watchdog_fired_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error); - -static void reset_byte_stream(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error); +static void init_keepalive_ping_locked(void *arg, grpc_error *error); +static void start_keepalive_ping_locked(void *arg, grpc_error *error); +static void finish_keepalive_ping_locked(void *arg, grpc_error *error); +static void keepalive_watchdog_fired_locked(void *arg, grpc_error *error); + +static void reset_byte_stream(void *arg, grpc_error *error); /******************************************************************************* * CONSTRUCTION/DESTRUCTION/REFCOUNTING */ -static void destruct_transport(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t) { +static void destruct_transport(grpc_chttp2_transport *t) { size_t i; - grpc_endpoint_destroy(exec_ctx, t->ep); + grpc_endpoint_destroy(t->ep); - grpc_slice_buffer_destroy_internal(exec_ctx, &t->qbuf); + grpc_slice_buffer_destroy_internal(&t->qbuf); - grpc_slice_buffer_destroy_internal(exec_ctx, &t->outbuf); - grpc_chttp2_hpack_compressor_destroy(exec_ctx, &t->hpack_compressor); + grpc_slice_buffer_destroy_internal(&t->outbuf); + grpc_chttp2_hpack_compressor_destroy(&t->hpack_compressor); - grpc_slice_buffer_destroy_internal(exec_ctx, &t->read_buffer); - grpc_chttp2_hpack_parser_destroy(exec_ctx, &t->hpack_parser); + grpc_slice_buffer_destroy_internal(&t->read_buffer); + grpc_chttp2_hpack_parser_destroy(&t->hpack_parser); grpc_chttp2_goaway_parser_destroy(&t->goaway_parser); for (i = 0; i < STREAM_LIST_COUNT; i++) { @@ -209,12 +181,11 @@ static void destruct_transport(grpc_exec_ctx *exec_ctx, GPR_ASSERT(grpc_chttp2_stream_map_size(&t->stream_map) == 0); grpc_chttp2_stream_map_destroy(&t->stream_map); - grpc_connectivity_state_destroy(exec_ctx, &t->channel_callback.state_tracker); + grpc_connectivity_state_destroy(&t->channel_callback.state_tracker); - GRPC_COMBINER_UNREF(exec_ctx, t->combiner, "chttp2_transport"); + GRPC_COMBINER_UNREF(t->combiner, "chttp2_transport"); - cancel_pings(exec_ctx, t, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Transport destroyed")); + cancel_pings(t, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Transport destroyed")); while (t->write_cb_pool) { grpc_chttp2_write_cb *next = t->write_cb_pool->next; @@ -231,8 +202,7 @@ static void destruct_transport(grpc_exec_ctx *exec_ctx, } #ifndef NDEBUG -void grpc_chttp2_unref_transport(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, const char *reason, +void grpc_chttp2_unref_transport(grpc_chttp2_transport *t, const char *reason, const char *file, int line) { if (GRPC_TRACER_ON(grpc_trace_chttp2_refcount)) { gpr_atm val = gpr_atm_no_barrier_load(&t->refs.count); @@ -240,7 +210,7 @@ void grpc_chttp2_unref_transport(grpc_exec_ctx *exec_ctx, t, val, val - 1, reason, file, line); } if (!gpr_unref(&t->refs)) return; - destruct_transport(exec_ctx, t); + destruct_transport(t); } void grpc_chttp2_ref_transport(grpc_chttp2_transport *t, const char *reason, @@ -253,10 +223,9 @@ void grpc_chttp2_ref_transport(grpc_chttp2_transport *t, const char *reason, gpr_ref(&t->refs); } #else -void grpc_chttp2_unref_transport(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t) { +void grpc_chttp2_unref_transport(grpc_chttp2_transport *t) { if (!gpr_unref(&t->refs)) return; - destruct_transport(exec_ctx, t); + destruct_transport(t); } void grpc_chttp2_ref_transport(grpc_chttp2_transport *t) { gpr_ref(&t->refs); } @@ -264,7 +233,7 @@ void grpc_chttp2_ref_transport(grpc_chttp2_transport *t) { gpr_ref(&t->refs); } static const grpc_transport_vtable *get_vtable(void); -static void init_transport(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, +static void init_transport(grpc_chttp2_transport *t, const grpc_channel_args *channel_args, grpc_endpoint *ep, bool is_client) { size_t i; @@ -328,7 +297,7 @@ static void init_transport(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, t->flow_control.bdp_estimator.Init(t->peer_string); grpc_chttp2_goaway_parser_init(&t->goaway_parser); - grpc_chttp2_hpack_parser_init(exec_ctx, &t->hpack_parser); + grpc_chttp2_hpack_parser_init(&t->hpack_parser); grpc_slice_buffer_init(&t->read_buffer); @@ -360,14 +329,13 @@ static void init_transport(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, /* configure http2 the way we like it */ if (is_client) { - queue_setting_update(exec_ctx, t, GRPC_CHTTP2_SETTINGS_ENABLE_PUSH, 0); - queue_setting_update(exec_ctx, t, - GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 0); + queue_setting_update(t, GRPC_CHTTP2_SETTINGS_ENABLE_PUSH, 0); + queue_setting_update(t, GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 0); } - queue_setting_update(exec_ctx, t, GRPC_CHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE, + queue_setting_update(t, GRPC_CHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE, DEFAULT_MAX_HEADER_LIST_SIZE); - queue_setting_update(exec_ctx, t, - GRPC_CHTTP2_SETTINGS_GRPC_ALLOW_TRUE_BINARY_METADATA, 1); + queue_setting_update(t, GRPC_CHTTP2_SETTINGS_GRPC_ALLOW_TRUE_BINARY_METADATA, + 1); t->ping_policy.max_pings_without_data = g_default_max_pings_without_data; t->ping_policy.min_sent_ping_interval_without_data = @@ -541,7 +509,7 @@ static void init_transport(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, int value = grpc_channel_arg_get_integer( &channel_args->args[i], settings_map[j].integer_options); if (value >= 0) { - queue_setting_update(exec_ctx, t, settings_map[j].setting_id, + queue_setting_update(t, settings_map[j].setting_id, (uint32_t)value); } } @@ -563,8 +531,8 @@ static void init_transport(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, if (t->keepalive_time != GRPC_MILLIS_INF_FUTURE) { t->keepalive_state = GRPC_CHTTP2_KEEPALIVE_STATE_WAITING; GRPC_CHTTP2_REF_TRANSPORT(t, "init keepalive ping"); - grpc_timer_init(exec_ctx, &t->keepalive_ping_timer, - grpc_exec_ctx_now(exec_ctx) + t->keepalive_time, + grpc_timer_init(&t->keepalive_ping_timer, + grpc_exec_ctx_now() + t->keepalive_time, &t->init_keepalive_ping_locked); } else { /* Use GRPC_CHTTP2_KEEPALIVE_STATE_DISABLED to indicate there are no @@ -574,44 +542,37 @@ static void init_transport(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, if (t->flow_control.enable_bdp_probe) { GRPC_CHTTP2_REF_TRANSPORT(t, "bdp_ping"); - schedule_bdp_ping_locked(exec_ctx, t); + schedule_bdp_ping_locked(t); } grpc_chttp2_act_on_flowctl_action( - exec_ctx, - grpc_chttp2_flowctl_get_action(exec_ctx, &t->flow_control, NULL), t, - NULL); + grpc_chttp2_flowctl_get_action(&t->flow_control, NULL), t, NULL); - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_INITIAL_WRITE); - post_benign_reclaimer(exec_ctx, t); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_INITIAL_WRITE); + post_benign_reclaimer(t); } -static void destroy_transport_locked(grpc_exec_ctx *exec_ctx, void *tp, - grpc_error *error) { +static void destroy_transport_locked(void *tp, grpc_error *error) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)tp; t->destroying = 1; close_transport_locked( - exec_ctx, t, - grpc_error_set_int( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Transport destroyed"), - GRPC_ERROR_INT_OCCURRED_DURING_WRITE, t->write_state)); - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "destroy"); + t, grpc_error_set_int( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Transport destroyed"), + GRPC_ERROR_INT_OCCURRED_DURING_WRITE, t->write_state)); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "destroy"); } -static void destroy_transport(grpc_exec_ctx *exec_ctx, grpc_transport *gt) { +static void destroy_transport(grpc_transport *gt) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; - GRPC_CLOSURE_SCHED(exec_ctx, - GRPC_CLOSURE_CREATE(destroy_transport_locked, t, + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(destroy_transport_locked, t, grpc_combiner_scheduler(t->combiner)), GRPC_ERROR_NONE); } -static void close_transport_locked(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +static void close_transport_locked(grpc_chttp2_transport *t, grpc_error *error) { - end_all_the_calls(exec_ctx, t, GRPC_ERROR_REF(error)); - cancel_pings(exec_ctx, t, GRPC_ERROR_REF(error)); + end_all_the_calls(t, GRPC_ERROR_REF(error)); + cancel_pings(t, GRPC_ERROR_REF(error)); if (t->closed_with_error == GRPC_ERROR_NONE) { if (!grpc_error_has_clear_grpc_status(error)) { error = grpc_error_set_int(error, GRPC_ERROR_INT_GRPC_STATUS, @@ -629,21 +590,22 @@ static void close_transport_locked(grpc_exec_ctx *exec_ctx, } GPR_ASSERT(error != GRPC_ERROR_NONE); t->closed_with_error = GRPC_ERROR_REF(error); - connectivity_state_set(exec_ctx, t, GRPC_CHANNEL_SHUTDOWN, - GRPC_ERROR_REF(error), "close_transport"); + + connectivity_state_set(t, GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_REF(error), + "close_transport"); if (t->ping_state.is_delayed_ping_timer_set) { - grpc_timer_cancel(exec_ctx, &t->ping_state.delayed_ping_timer); + grpc_timer_cancel(&t->ping_state.delayed_ping_timer); } if (t->have_next_bdp_ping_timer) { - grpc_timer_cancel(exec_ctx, &t->next_bdp_ping_timer); + grpc_timer_cancel(&t->next_bdp_ping_timer); } switch (t->keepalive_state) { case GRPC_CHTTP2_KEEPALIVE_STATE_WAITING: - grpc_timer_cancel(exec_ctx, &t->keepalive_ping_timer); + grpc_timer_cancel(&t->keepalive_ping_timer); break; case GRPC_CHTTP2_KEEPALIVE_STATE_PINGING: - grpc_timer_cancel(exec_ctx, &t->keepalive_ping_timer); - grpc_timer_cancel(exec_ctx, &t->keepalive_watchdog_timer); + grpc_timer_cancel(&t->keepalive_ping_timer); + grpc_timer_cancel(&t->keepalive_watchdog_timer); break; case GRPC_CHTTP2_KEEPALIVE_STATE_DYING: case GRPC_CHTTP2_KEEPALIVE_STATE_DISABLED: @@ -654,10 +616,11 @@ static void close_transport_locked(grpc_exec_ctx *exec_ctx, /* flush writable stream list to avoid dangling references */ grpc_chttp2_stream *s; while (grpc_chttp2_list_pop_writable_stream(t, &s)) { - GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "chttp2_writing:close"); + GRPC_CHTTP2_STREAM_UNREF(s, "chttp2_writing:close"); } + GPR_ASSERT(t->write_state == GRPC_CHTTP2_WRITE_STATE_IDLE); - grpc_endpoint_shutdown(exec_ctx, t->ep, GRPC_ERROR_REF(error)); + grpc_endpoint_shutdown(t->ep, GRPC_ERROR_REF(error)); } GRPC_ERROR_UNREF(error); } @@ -666,22 +629,21 @@ static void close_transport_locked(grpc_exec_ctx *exec_ctx, void grpc_chttp2_stream_ref(grpc_chttp2_stream *s, const char *reason) { grpc_stream_ref(s->refcount, reason); } -void grpc_chttp2_stream_unref(grpc_exec_ctx *exec_ctx, grpc_chttp2_stream *s, - const char *reason) { - grpc_stream_unref(exec_ctx, s->refcount, reason); +void grpc_chttp2_stream_unref(grpc_chttp2_stream *s, const char *reason) { + grpc_stream_unref(s->refcount, reason); } #else void grpc_chttp2_stream_ref(grpc_chttp2_stream *s) { grpc_stream_ref(s->refcount); } -void grpc_chttp2_stream_unref(grpc_exec_ctx *exec_ctx, grpc_chttp2_stream *s) { - grpc_stream_unref(exec_ctx, s->refcount); +void grpc_chttp2_stream_unref(grpc_chttp2_stream *s) { + grpc_stream_unref(s->refcount); } #endif -static int init_stream(grpc_exec_ctx *exec_ctx, grpc_transport *gt, - grpc_stream *gs, grpc_stream_refcount *refcount, - const void *server_data, gpr_arena *arena) { +static int init_stream(grpc_transport *gt, grpc_stream *gs, + grpc_stream_refcount *refcount, const void *server_data, + gpr_arena *arena) { GPR_TIMER_BEGIN("init_stream", 0); grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; grpc_chttp2_stream *s = (grpc_chttp2_stream *)gs; @@ -715,7 +677,7 @@ static int init_stream(grpc_exec_ctx *exec_ctx, grpc_transport *gt, s->id = (uint32_t)(uintptr_t)server_data; *t->accepting_stream = s; grpc_chttp2_stream_map_add(&t->stream_map, s->id, s); - post_destructive_reclaimer(exec_ctx, t); + post_destructive_reclaimer(t); } s->flow_control.s = s; @@ -724,8 +686,7 @@ static int init_stream(grpc_exec_ctx *exec_ctx, grpc_transport *gt, return 0; } -static void destroy_stream_locked(grpc_exec_ctx *exec_ctx, void *sp, - grpc_error *error) { +static void destroy_stream_locked(void *sp, grpc_error *error) { grpc_chttp2_stream *s = (grpc_chttp2_stream *)sp; grpc_chttp2_transport *t = s->t; @@ -736,11 +697,10 @@ static void destroy_stream_locked(grpc_exec_ctx *exec_ctx, void *sp, GPR_ASSERT(grpc_chttp2_stream_map_find(&t->stream_map, s->id) == NULL); } - grpc_slice_buffer_destroy_internal(exec_ctx, - &s->unprocessed_incoming_frames_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &s->frame_storage); - grpc_slice_buffer_destroy_internal(exec_ctx, &s->compressed_data_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &s->decompressed_data_buffer); + grpc_slice_buffer_destroy_internal(&s->unprocessed_incoming_frames_buffer); + grpc_slice_buffer_destroy_internal(&s->frame_storage); + grpc_slice_buffer_destroy_internal(&s->compressed_data_buffer); + grpc_slice_buffer_destroy_internal(&s->decompressed_data_buffer); grpc_chttp2_list_remove_stalled_by_transport(t, s); grpc_chttp2_list_remove_stalled_by_stream(t, s); @@ -759,27 +719,24 @@ static void destroy_stream_locked(grpc_exec_ctx *exec_ctx, void *sp, GPR_ASSERT(s->recv_initial_metadata_ready == NULL); GPR_ASSERT(s->recv_message_ready == NULL); GPR_ASSERT(s->recv_trailing_metadata_finished == NULL); - grpc_chttp2_data_parser_destroy(exec_ctx, &s->data_parser); - grpc_chttp2_incoming_metadata_buffer_destroy(exec_ctx, - &s->metadata_buffer[0]); - grpc_chttp2_incoming_metadata_buffer_destroy(exec_ctx, - &s->metadata_buffer[1]); - grpc_slice_buffer_destroy_internal(exec_ctx, &s->flow_controlled_buffer); + grpc_chttp2_data_parser_destroy(&s->data_parser); + grpc_chttp2_incoming_metadata_buffer_destroy(&s->metadata_buffer[0]); + grpc_chttp2_incoming_metadata_buffer_destroy(&s->metadata_buffer[1]); + grpc_slice_buffer_destroy_internal(&s->flow_controlled_buffer); GRPC_ERROR_UNREF(s->read_closed_error); GRPC_ERROR_UNREF(s->write_closed_error); GRPC_ERROR_UNREF(s->byte_stream_error); grpc_chttp2_flowctl_destroy_stream(&t->flow_control, &s->flow_control); - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "stream"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "stream"); GPR_TIMER_END("destroy_stream", 0); - GRPC_CLOSURE_SCHED(exec_ctx, s->destroy_stream_arg, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(s->destroy_stream_arg, GRPC_ERROR_NONE); } -static void destroy_stream(grpc_exec_ctx *exec_ctx, grpc_transport *gt, - grpc_stream *gs, +static void destroy_stream(grpc_transport *gt, grpc_stream *gs, grpc_closure *then_schedule_closure) { GPR_TIMER_BEGIN("destroy_stream", 0); grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; @@ -796,8 +753,8 @@ static void destroy_stream(grpc_exec_ctx *exec_ctx, grpc_transport *gt, s->destroy_stream_arg = then_schedule_closure; GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_INIT(&s->destroy_stream, destroy_stream_locked, s, - grpc_combiner_scheduler(t->combiner)), + GRPC_CLOSURE_INIT(&s->destroy_stream, destroy_stream_locked, s, + grpc_combiner_scheduler(t->combiner)), GRPC_ERROR_NONE); GPR_TIMER_END("destroy_stream", 0); } @@ -807,8 +764,7 @@ grpc_chttp2_stream *grpc_chttp2_parsing_lookup_stream(grpc_chttp2_transport *t, return (grpc_chttp2_stream *)grpc_chttp2_stream_map_find(&t->stream_map, id); } -grpc_chttp2_stream *grpc_chttp2_parsing_accept_stream(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +grpc_chttp2_stream *grpc_chttp2_parsing_accept_stream(grpc_chttp2_transport *t, uint32_t id) { if (t->channel_callback.accept_stream == NULL) { return NULL; @@ -816,8 +772,7 @@ grpc_chttp2_stream *grpc_chttp2_parsing_accept_stream(grpc_exec_ctx *exec_ctx, grpc_chttp2_stream *accepting; GPR_ASSERT(t->accepting_stream == NULL); t->accepting_stream = &accepting; - t->channel_callback.accept_stream(exec_ctx, - t->channel_callback.accept_stream_user_data, + t->channel_callback.accept_stream(t->channel_callback.accept_stream_user_data, &t->base, (void *)(uintptr_t)id); t->accepting_stream = NULL; return accepting; @@ -839,7 +794,7 @@ static const char *write_state_name(grpc_chttp2_write_state st) { GPR_UNREACHABLE_CODE(return "UNKNOWN"); } -static void set_write_state(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, +static void set_write_state(grpc_chttp2_transport *t, grpc_chttp2_write_state st, const char *reason) { GRPC_CHTTP2_IF_TRACING(gpr_log(GPR_DEBUG, "W:%p %s state %s -> %s [%s]", t, t->is_client ? "CLIENT" : "SERVER", @@ -847,108 +802,100 @@ static void set_write_state(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, write_state_name(st), reason)); t->write_state = st; if (st == GRPC_CHTTP2_WRITE_STATE_IDLE) { - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &t->run_after_write); + GRPC_CLOSURE_LIST_SCHED(&t->run_after_write); if (t->close_transport_on_writes_finished != NULL) { grpc_error *err = t->close_transport_on_writes_finished; t->close_transport_on_writes_finished = NULL; - close_transport_locked(exec_ctx, t, err); + close_transport_locked(t, err); } } } static void inc_initiate_write_reason( - grpc_exec_ctx *exec_ctx, grpc_chttp2_initiate_write_reason reason) { + grpc_chttp2_initiate_write_reason reason) { switch (reason) { case GRPC_CHTTP2_INITIATE_WRITE_INITIAL_WRITE: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_INITIAL_WRITE(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_INITIAL_WRITE(); break; case GRPC_CHTTP2_INITIATE_WRITE_START_NEW_STREAM: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_START_NEW_STREAM(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_START_NEW_STREAM(); break; case GRPC_CHTTP2_INITIATE_WRITE_SEND_MESSAGE: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_MESSAGE(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_MESSAGE(); break; case GRPC_CHTTP2_INITIATE_WRITE_SEND_INITIAL_METADATA: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_INITIAL_METADATA( - exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_INITIAL_METADATA(); break; case GRPC_CHTTP2_INITIATE_WRITE_SEND_TRAILING_METADATA: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_TRAILING_METADATA( - exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_TRAILING_METADATA(); break; case GRPC_CHTTP2_INITIATE_WRITE_RETRY_SEND_PING: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RETRY_SEND_PING(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RETRY_SEND_PING(); break; case GRPC_CHTTP2_INITIATE_WRITE_CONTINUE_PINGS: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CONTINUE_PINGS(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CONTINUE_PINGS(); break; case GRPC_CHTTP2_INITIATE_WRITE_GOAWAY_SENT: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_GOAWAY_SENT(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_GOAWAY_SENT(); break; case GRPC_CHTTP2_INITIATE_WRITE_RST_STREAM: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RST_STREAM(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RST_STREAM(); break; case GRPC_CHTTP2_INITIATE_WRITE_CLOSE_FROM_API: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CLOSE_FROM_API(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CLOSE_FROM_API(); break; case GRPC_CHTTP2_INITIATE_WRITE_STREAM_FLOW_CONTROL: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_STREAM_FLOW_CONTROL(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_STREAM_FLOW_CONTROL(); break; case GRPC_CHTTP2_INITIATE_WRITE_TRANSPORT_FLOW_CONTROL: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL( - exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL(); break; case GRPC_CHTTP2_INITIATE_WRITE_SEND_SETTINGS: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_SETTINGS(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_SETTINGS(); break; case GRPC_CHTTP2_INITIATE_WRITE_FLOW_CONTROL_UNSTALLED_BY_SETTING: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_SETTING( - exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_SETTING(); break; case GRPC_CHTTP2_INITIATE_WRITE_FLOW_CONTROL_UNSTALLED_BY_UPDATE: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_UPDATE( - exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_UPDATE(); break; case GRPC_CHTTP2_INITIATE_WRITE_APPLICATION_PING: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_APPLICATION_PING(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_APPLICATION_PING(); break; case GRPC_CHTTP2_INITIATE_WRITE_KEEPALIVE_PING: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_KEEPALIVE_PING(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_KEEPALIVE_PING(); break; case GRPC_CHTTP2_INITIATE_WRITE_TRANSPORT_FLOW_CONTROL_UNSTALLED: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL_UNSTALLED( - exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL_UNSTALLED(); break; case GRPC_CHTTP2_INITIATE_WRITE_PING_RESPONSE: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_PING_RESPONSE(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_PING_RESPONSE(); break; case GRPC_CHTTP2_INITIATE_WRITE_FORCE_RST_STREAM: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FORCE_RST_STREAM(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FORCE_RST_STREAM(); break; } } -void grpc_chttp2_initiate_write(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +void grpc_chttp2_initiate_write(grpc_chttp2_transport *t, grpc_chttp2_initiate_write_reason reason) { GPR_TIMER_BEGIN("grpc_chttp2_initiate_write", 0); switch (t->write_state) { case GRPC_CHTTP2_WRITE_STATE_IDLE: - inc_initiate_write_reason(exec_ctx, reason); - set_write_state(exec_ctx, t, GRPC_CHTTP2_WRITE_STATE_WRITING, + inc_initiate_write_reason(reason); + set_write_state(t, GRPC_CHTTP2_WRITE_STATE_WRITING, grpc_chttp2_initiate_write_reason_string(reason)); t->is_first_write_in_batch = true; GRPC_CHTTP2_REF_TRANSPORT(t, "writing"); GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_INIT(&t->write_action_begin_locked, write_action_begin_locked, t, grpc_combiner_finally_scheduler(t->combiner)), GRPC_ERROR_NONE); break; case GRPC_CHTTP2_WRITE_STATE_WRITING: - set_write_state(exec_ctx, t, GRPC_CHTTP2_WRITE_STATE_WRITING_WITH_MORE, + set_write_state(t, GRPC_CHTTP2_WRITE_STATE_WRITING_WITH_MORE, grpc_chttp2_initiate_write_reason_string(reason)); break; case GRPC_CHTTP2_WRITE_STATE_WRITING_WITH_MORE: @@ -957,8 +904,7 @@ void grpc_chttp2_initiate_write(grpc_exec_ctx *exec_ctx, GPR_TIMER_END("grpc_chttp2_initiate_write", 0); } -void grpc_chttp2_mark_stream_writable(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +void grpc_chttp2_mark_stream_writable(grpc_chttp2_transport *t, grpc_chttp2_stream *s) { if (t->closed_with_error == GRPC_ERROR_NONE && grpc_chttp2_list_add_writable_stream(t, s)) { @@ -1008,8 +954,7 @@ static const char *begin_writing_desc(bool partial, bool inlined) { GPR_UNREACHABLE_CODE(return "bad state tuple"); } -static void write_action_begin_locked(grpc_exec_ctx *exec_ctx, void *gt, - grpc_error *error_ignored) { +static void write_action_begin_locked(void *gt, grpc_error *error_ignored) { GPR_TIMER_BEGIN("write_action_begin_locked", 0); grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; GPR_ASSERT(t->write_state != GRPC_CHTTP2_WRITE_STATE_IDLE); @@ -1017,60 +962,58 @@ static void write_action_begin_locked(grpc_exec_ctx *exec_ctx, void *gt, if (t->closed_with_error != GRPC_ERROR_NONE) { r.writing = false; } else { - r = grpc_chttp2_begin_write(exec_ctx, t); + r = grpc_chttp2_begin_write(t); } if (r.writing) { if (r.partial) { - GRPC_STATS_INC_HTTP2_PARTIAL_WRITES(exec_ctx); + GRPC_STATS_INC_HTTP2_PARTIAL_WRITES(); } if (!t->is_first_write_in_batch) { - GRPC_STATS_INC_HTTP2_WRITES_CONTINUED(exec_ctx); + GRPC_STATS_INC_HTTP2_WRITES_CONTINUED(); } grpc_closure_scheduler *scheduler = write_scheduler(t, r.early_results_scheduled, r.partial); if (scheduler != grpc_schedule_on_exec_ctx) { - GRPC_STATS_INC_HTTP2_WRITES_OFFLOADED(exec_ctx); + GRPC_STATS_INC_HTTP2_WRITES_OFFLOADED(); } set_write_state( - exec_ctx, t, r.partial ? GRPC_CHTTP2_WRITE_STATE_WRITING_WITH_MORE - : GRPC_CHTTP2_WRITE_STATE_WRITING, + t, r.partial ? GRPC_CHTTP2_WRITE_STATE_WRITING_WITH_MORE + : GRPC_CHTTP2_WRITE_STATE_WRITING, begin_writing_desc(r.partial, scheduler == grpc_schedule_on_exec_ctx)); - GRPC_CLOSURE_SCHED(exec_ctx, GRPC_CLOSURE_INIT(&t->write_action, - write_action, t, scheduler), - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED( + GRPC_CLOSURE_INIT(&t->write_action, write_action, t, scheduler), + GRPC_ERROR_NONE); } else { - GRPC_STATS_INC_HTTP2_SPURIOUS_WRITES_BEGUN(exec_ctx); - set_write_state(exec_ctx, t, GRPC_CHTTP2_WRITE_STATE_IDLE, - "begin writing nothing"); - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "writing"); + GRPC_STATS_INC_HTTP2_SPURIOUS_WRITES_BEGUN(); + set_write_state(t, GRPC_CHTTP2_WRITE_STATE_IDLE, "begin writing nothing"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "writing"); } GPR_TIMER_END("write_action_begin_locked", 0); } -static void write_action(grpc_exec_ctx *exec_ctx, void *gt, grpc_error *error) { +static void write_action(void *gt, grpc_error *error) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; GPR_TIMER_BEGIN("write_action", 0); grpc_endpoint_write( - exec_ctx, t->ep, &t->outbuf, + t->ep, &t->outbuf, GRPC_CLOSURE_INIT(&t->write_action_end_locked, write_action_end_locked, t, grpc_combiner_scheduler(t->combiner))); GPR_TIMER_END("write_action", 0); } -static void write_action_end_locked(grpc_exec_ctx *exec_ctx, void *tp, - grpc_error *error) { +static void write_action_end_locked(void *tp, grpc_error *error) { GPR_TIMER_BEGIN("terminate_writing_with_lock", 0); grpc_chttp2_transport *t = (grpc_chttp2_transport *)tp; if (error != GRPC_ERROR_NONE) { - close_transport_locked(exec_ctx, t, GRPC_ERROR_REF(error)); + close_transport_locked(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_FROM_STATIC_STRING("goaway sent")); + t, GRPC_ERROR_CREATE_FROM_STATIC_STRING("goaway sent")); } } @@ -1079,17 +1022,14 @@ static void write_action_end_locked(grpc_exec_ctx *exec_ctx, void *tp, GPR_UNREACHABLE_CODE(break); case GRPC_CHTTP2_WRITE_STATE_WRITING: GPR_TIMER_MARK("state=writing", 0); - set_write_state(exec_ctx, t, GRPC_CHTTP2_WRITE_STATE_IDLE, - "finish writing"); + set_write_state(t, GRPC_CHTTP2_WRITE_STATE_IDLE, "finish writing"); break; case GRPC_CHTTP2_WRITE_STATE_WRITING_WITH_MORE: GPR_TIMER_MARK("state=writing_stale_no_poller", 0); - set_write_state(exec_ctx, t, GRPC_CHTTP2_WRITE_STATE_WRITING, - "continue writing"); + set_write_state(t, GRPC_CHTTP2_WRITE_STATE_WRITING, "continue writing"); t->is_first_write_in_batch = false; GRPC_CHTTP2_REF_TRANSPORT(t, "writing"); GRPC_CLOSURE_RUN( - exec_ctx, GRPC_CLOSURE_INIT(&t->write_action_begin_locked, write_action_begin_locked, t, grpc_combiner_finally_scheduler(t->combiner)), @@ -1097,16 +1037,15 @@ static void write_action_end_locked(grpc_exec_ctx *exec_ctx, void *tp, break; } - grpc_chttp2_end_write(exec_ctx, t, GRPC_ERROR_REF(error)); + grpc_chttp2_end_write(t, GRPC_ERROR_REF(error)); - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "writing"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "writing"); GPR_TIMER_END("terminate_writing_with_lock", 0); } // Dirties an HTTP2 setting to be sent out next time a writing path occurs. // If the change needs to occur immediately, manually initiate a write. -static void queue_setting_update(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +static void queue_setting_update(grpc_chttp2_transport *t, grpc_chttp2_setting_id id, uint32_t value) { const grpc_chttp2_setting_parameters *sp = &grpc_chttp2_settings_parameters[id]; @@ -1121,8 +1060,7 @@ static void queue_setting_update(grpc_exec_ctx *exec_ctx, } } -void grpc_chttp2_add_incoming_goaway(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +void grpc_chttp2_add_incoming_goaway(grpc_chttp2_transport *t, uint32_t goaway_error, grpc_slice goaway_text) { // GRPC_CHTTP2_IF_TRACING( @@ -1149,7 +1087,7 @@ void grpc_chttp2_add_incoming_goaway(grpc_exec_ctx *exec_ctx, /* lie: use transient failure from the transport to indicate goaway has been * received */ connectivity_state_set( - exec_ctx, t, GRPC_CHANNEL_TRANSIENT_FAILURE, + t, GRPC_CHANNEL_TRANSIENT_FAILURE, grpc_error_set_str( grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("GOAWAY received"), @@ -1158,8 +1096,7 @@ void grpc_chttp2_add_incoming_goaway(grpc_exec_ctx *exec_ctx, "got_goaway"); } -static void maybe_start_some_streams(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t) { +static void maybe_start_some_streams(grpc_chttp2_transport *t) { grpc_chttp2_stream *s; /* start streams where we have free grpc_chttp2_stream ids and free * concurrency */ @@ -1179,25 +1116,23 @@ static void maybe_start_some_streams(grpc_exec_ctx *exec_ctx, if (t->next_stream_id >= MAX_CLIENT_STREAM_ID) { connectivity_state_set( - exec_ctx, t, GRPC_CHANNEL_TRANSIENT_FAILURE, + t, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Stream IDs exhausted"), "no_more_stream_ids"); } grpc_chttp2_stream_map_add(&t->stream_map, s->id, s); - post_destructive_reclaimer(exec_ctx, t); - grpc_chttp2_mark_stream_writable(exec_ctx, t, s); - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_START_NEW_STREAM); + post_destructive_reclaimer(t); + grpc_chttp2_mark_stream_writable(t, s); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_START_NEW_STREAM); } /* cancel out streams that will never be started */ while (t->next_stream_id >= MAX_CLIENT_STREAM_ID && grpc_chttp2_list_pop_waiting_for_concurrency(t, &s)) { grpc_chttp2_cancel_stream( - exec_ctx, t, s, - grpc_error_set_int( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Stream IDs exhausted"), - GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE)); + t, s, grpc_error_set_int( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Stream IDs exhausted"), + GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE)); } } @@ -1216,15 +1151,13 @@ static grpc_closure *add_closure_barrier(grpc_closure *closure) { return closure; } -static void null_then_run_closure(grpc_exec_ctx *exec_ctx, - grpc_closure **closure, grpc_error *error) { +static void null_then_run_closure(grpc_closure **closure, grpc_error *error) { grpc_closure *c = *closure; *closure = NULL; - GRPC_CLOSURE_RUN(exec_ctx, c, error); + GRPC_CLOSURE_RUN(c, error); } -void grpc_chttp2_complete_closure_step(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +void grpc_chttp2_complete_closure_step(grpc_chttp2_transport *t, grpc_chttp2_stream *s, grpc_closure **pclosure, grpc_error *error, const char *desc) { @@ -1264,7 +1197,7 @@ void grpc_chttp2_complete_closure_step(grpc_exec_ctx *exec_ctx, } if ((t->write_state == GRPC_CHTTP2_WRITE_STATE_IDLE) || !(closure->next_data.scratch & CLOSURE_BARRIER_MAY_COVER_WRITE)) { - GRPC_CLOSURE_RUN(exec_ctx, closure, closure->error_data.error); + GRPC_CLOSURE_RUN(closure, closure->error_data.error); } else { grpc_closure_list_append(&t->run_after_write, closure, closure->error_data.error); @@ -1280,28 +1213,24 @@ static bool contains_non_ok_status(grpc_metadata_batch *batch) { return false; } -static void maybe_become_writable_due_to_send_msg(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +static void maybe_become_writable_due_to_send_msg(grpc_chttp2_transport *t, grpc_chttp2_stream *s) { if (s->id != 0 && (!s->write_buffering || s->flow_controlled_buffer.length > t->write_buffer_size)) { - grpc_chttp2_mark_stream_writable(exec_ctx, t, s); - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_SEND_MESSAGE); + grpc_chttp2_mark_stream_writable(t, s); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_SEND_MESSAGE); } } -static void add_fetched_slice_locked(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +static void add_fetched_slice_locked(grpc_chttp2_transport *t, grpc_chttp2_stream *s) { s->fetched_send_message_length += (uint32_t)GRPC_SLICE_LENGTH(s->fetching_slice); grpc_slice_buffer_add(&s->flow_controlled_buffer, s->fetching_slice); - maybe_become_writable_due_to_send_msg(exec_ctx, t, s); + maybe_become_writable_due_to_send_msg(t, s); } -static void continue_fetching_send_locked(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +static void continue_fetching_send_locked(grpc_chttp2_transport *t, grpc_chttp2_stream *s) { for (;;) { if (s->fetching_send_message == NULL) { @@ -1310,11 +1239,11 @@ static void continue_fetching_send_locked(grpc_exec_ctx *exec_ctx, return; /* early out */ } if (s->fetched_send_message_length == s->fetching_send_message->length) { - grpc_byte_stream_destroy(exec_ctx, s->fetching_send_message); + grpc_byte_stream_destroy(s->fetching_send_message); int64_t notify_offset = s->next_message_end_offset; if (notify_offset <= s->flow_controlled_bytes_written) { grpc_chttp2_complete_closure_step( - exec_ctx, t, s, &s->fetching_send_message_finished, GRPC_ERROR_NONE, + t, s, &s->fetching_send_message_finished, GRPC_ERROR_NONE, "fetching_send_message_finished"); } else { grpc_chttp2_write_cb *cb = t->write_cb_pool; @@ -1335,39 +1264,37 @@ static void continue_fetching_send_locked(grpc_exec_ctx *exec_ctx, } s->fetching_send_message = NULL; return; /* early out */ - } else if (grpc_byte_stream_next(exec_ctx, s->fetching_send_message, - UINT32_MAX, &s->complete_fetch_locked)) { - grpc_error *error = grpc_byte_stream_pull( - exec_ctx, s->fetching_send_message, &s->fetching_slice); + } else if (grpc_byte_stream_next(s->fetching_send_message, UINT32_MAX, + &s->complete_fetch_locked)) { + grpc_error *error = + grpc_byte_stream_pull(s->fetching_send_message, &s->fetching_slice); if (error != GRPC_ERROR_NONE) { - grpc_byte_stream_destroy(exec_ctx, s->fetching_send_message); - grpc_chttp2_cancel_stream(exec_ctx, t, s, error); + grpc_byte_stream_destroy(s->fetching_send_message); + grpc_chttp2_cancel_stream(t, s, error); } else { - add_fetched_slice_locked(exec_ctx, t, s); + add_fetched_slice_locked(t, s); } } } } -static void complete_fetch_locked(grpc_exec_ctx *exec_ctx, void *gs, - grpc_error *error) { +static void complete_fetch_locked(void *gs, grpc_error *error) { grpc_chttp2_stream *s = (grpc_chttp2_stream *)gs; grpc_chttp2_transport *t = s->t; if (error == GRPC_ERROR_NONE) { - error = grpc_byte_stream_pull(exec_ctx, s->fetching_send_message, - &s->fetching_slice); + error = grpc_byte_stream_pull(s->fetching_send_message, &s->fetching_slice); if (error == GRPC_ERROR_NONE) { - add_fetched_slice_locked(exec_ctx, t, s); - continue_fetching_send_locked(exec_ctx, t, s); + add_fetched_slice_locked(t, s); + continue_fetching_send_locked(t, s); } } if (error != GRPC_ERROR_NONE) { - grpc_byte_stream_destroy(exec_ctx, s->fetching_send_message); - grpc_chttp2_cancel_stream(exec_ctx, t, s, error); + grpc_byte_stream_destroy(s->fetching_send_message); + grpc_chttp2_cancel_stream(t, s, error); } } -static void do_nothing(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) {} +static void do_nothing(void *arg, grpc_error *error) {} static void log_metadata(const grpc_metadata_batch *md_batch, uint32_t id, bool is_client, bool is_initial) { @@ -1382,7 +1309,7 @@ static void log_metadata(const grpc_metadata_batch *md_batch, uint32_t id, } } -static void perform_stream_op_locked(grpc_exec_ctx *exec_ctx, void *stream_op, +static void perform_stream_op_locked(void *stream_op, grpc_error *error_ignored) { GPR_TIMER_BEGIN("perform_stream_op_locked", 0); @@ -1392,7 +1319,7 @@ static void perform_stream_op_locked(grpc_exec_ctx *exec_ctx, void *stream_op, grpc_transport_stream_op_batch_payload *op_payload = op->payload; grpc_chttp2_transport *t = s->t; - GRPC_STATS_INC_HTTP2_OP_BATCHES(exec_ctx); + GRPC_STATS_INC_HTTP2_OP_BATCHES(); if (GRPC_TRACER_ON(grpc_http_trace)) { char *str = grpc_transport_stream_op_batch_string(op); @@ -1427,13 +1354,12 @@ static void perform_stream_op_locked(grpc_exec_ctx *exec_ctx, void *stream_op, } if (op->cancel_stream) { - GRPC_STATS_INC_HTTP2_OP_CANCEL(exec_ctx); - grpc_chttp2_cancel_stream(exec_ctx, t, s, - op_payload->cancel_stream.cancel_error); + GRPC_STATS_INC_HTTP2_OP_CANCEL(); + grpc_chttp2_cancel_stream(t, s, op_payload->cancel_stream.cancel_error); } if (op->send_initial_metadata) { - GRPC_STATS_INC_HTTP2_OP_SEND_INITIAL_METADATA(exec_ctx); + GRPC_STATS_INC_HTTP2_OP_SEND_INITIAL_METADATA(); GPR_ASSERT(s->send_initial_metadata_finished == NULL); on_complete->next_data.scratch |= CLOSURE_BARRIER_MAY_COVER_WRITE; @@ -1461,7 +1387,7 @@ static void perform_stream_op_locked(grpc_exec_ctx *exec_ctx, void *stream_op, } if (metadata_size > metadata_peer_limit) { grpc_chttp2_cancel_stream( - exec_ctx, t, s, + t, s, grpc_error_set_int( grpc_error_set_int( grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING( @@ -1480,29 +1406,28 @@ static void perform_stream_op_locked(grpc_exec_ctx *exec_ctx, void *stream_op, if (t->closed_with_error == GRPC_ERROR_NONE) { GPR_ASSERT(s->id == 0); grpc_chttp2_list_add_waiting_for_concurrency(t, s); - maybe_start_some_streams(exec_ctx, t); + maybe_start_some_streams(t); } else { grpc_chttp2_cancel_stream( - exec_ctx, t, s, - grpc_error_set_int( - GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Transport closed", &t->closed_with_error, 1), - GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE)); + t, s, grpc_error_set_int( + GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Transport closed", &t->closed_with_error, 1), + GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE)); } } else { GPR_ASSERT(s->id != 0); - grpc_chttp2_mark_stream_writable(exec_ctx, t, s); + grpc_chttp2_mark_stream_writable(t, s); if (!(op->send_message && (op->payload->send_message.send_message->flags & GRPC_WRITE_BUFFER_HINT))) { grpc_chttp2_initiate_write( - exec_ctx, t, GRPC_CHTTP2_INITIATE_WRITE_SEND_INITIAL_METADATA); + t, GRPC_CHTTP2_INITIATE_WRITE_SEND_INITIAL_METADATA); } } } else { s->send_initial_metadata = NULL; grpc_chttp2_complete_closure_step( - exec_ctx, t, s, &s->send_initial_metadata_finished, + t, s, &s->send_initial_metadata_finished, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Attempt to send initial metadata after stream was closed", &s->write_closed_error, 1), @@ -1516,9 +1441,9 @@ static void perform_stream_op_locked(grpc_exec_ctx *exec_ctx, void *stream_op, } if (op->send_message) { - GRPC_STATS_INC_HTTP2_OP_SEND_MESSAGE(exec_ctx); + GRPC_STATS_INC_HTTP2_OP_SEND_MESSAGE(); GRPC_STATS_INC_HTTP2_SEND_MESSAGE_SIZE( - exec_ctx, op->payload->send_message.send_message->length); + op->payload->send_message.send_message->length); on_complete->next_data.scratch |= CLOSURE_BARRIER_MAY_COVER_WRITE; s->fetching_send_message_finished = add_closure_barrier(op->on_complete); if (s->write_closed) { @@ -1528,7 +1453,7 @@ static void perform_stream_op_locked(grpc_exec_ctx *exec_ctx, void *stream_op, // recv_message failure, breaking out of its loop, and then // starting recv_trailing_metadata. grpc_chttp2_complete_closure_step( - exec_ctx, t, s, &s->fetching_send_message_finished, + t, s, &s->fetching_send_message_finished, t->is_client && s->received_trailing_metadata ? GRPC_ERROR_NONE : GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( @@ -1557,13 +1482,13 @@ static void perform_stream_op_locked(grpc_exec_ctx *exec_ctx, void *stream_op, } else { s->write_buffering = false; } - continue_fetching_send_locked(exec_ctx, t, s); - maybe_become_writable_due_to_send_msg(exec_ctx, t, s); + continue_fetching_send_locked(t, s); + maybe_become_writable_due_to_send_msg(t, s); } } if (op->send_trailing_metadata) { - GRPC_STATS_INC_HTTP2_OP_SEND_TRAILING_METADATA(exec_ctx); + GRPC_STATS_INC_HTTP2_OP_SEND_TRAILING_METADATA(); GPR_ASSERT(s->send_trailing_metadata_finished == NULL); on_complete->next_data.scratch |= CLOSURE_BARRIER_MAY_COVER_WRITE; s->send_trailing_metadata_finished = add_closure_barrier(on_complete); @@ -1577,7 +1502,7 @@ static void perform_stream_op_locked(grpc_exec_ctx *exec_ctx, void *stream_op, [GRPC_CHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE]; if (metadata_size > metadata_peer_limit) { grpc_chttp2_cancel_stream( - exec_ctx, t, s, + t, s, grpc_error_set_int( grpc_error_set_int( grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING( @@ -1594,7 +1519,7 @@ static void perform_stream_op_locked(grpc_exec_ctx *exec_ctx, void *stream_op, if (s->write_closed) { s->send_trailing_metadata = NULL; grpc_chttp2_complete_closure_step( - exec_ctx, t, s, &s->send_trailing_metadata_finished, + t, s, &s->send_trailing_metadata_finished, grpc_metadata_batch_is_empty( op->payload->send_trailing_metadata.send_trailing_metadata) ? GRPC_ERROR_NONE @@ -1605,15 +1530,15 @@ static void perform_stream_op_locked(grpc_exec_ctx *exec_ctx, void *stream_op, } else if (s->id != 0) { /* TODO(ctiller): check if there's flow control for any outstanding bytes before going writable */ - grpc_chttp2_mark_stream_writable(exec_ctx, t, s); + grpc_chttp2_mark_stream_writable(t, s); grpc_chttp2_initiate_write( - exec_ctx, t, GRPC_CHTTP2_INITIATE_WRITE_SEND_TRAILING_METADATA); + t, GRPC_CHTTP2_INITIATE_WRITE_SEND_TRAILING_METADATA); } } } if (op->recv_initial_metadata) { - GRPC_STATS_INC_HTTP2_OP_RECV_INITIAL_METADATA(exec_ctx); + GRPC_STATS_INC_HTTP2_OP_RECV_INITIAL_METADATA(); GPR_ASSERT(s->recv_initial_metadata_ready == NULL); s->recv_initial_metadata_ready = op_payload->recv_initial_metadata.recv_initial_metadata_ready; @@ -1625,11 +1550,11 @@ static void perform_stream_op_locked(grpc_exec_ctx *exec_ctx, void *stream_op, gpr_atm_rel_store(op_payload->recv_initial_metadata.peer_string, (gpr_atm)gpr_strdup(t->peer_string)); } - grpc_chttp2_maybe_complete_recv_initial_metadata(exec_ctx, t, s); + grpc_chttp2_maybe_complete_recv_initial_metadata(t, s); } if (op->recv_message) { - GRPC_STATS_INC_HTTP2_OP_RECV_MESSAGE(exec_ctx); + GRPC_STATS_INC_HTTP2_OP_RECV_MESSAGE(); size_t already_received; GPR_ASSERT(s->recv_message_ready == NULL); GPR_ASSERT(!s->pending_byte_stream); @@ -1642,33 +1567,31 @@ static void perform_stream_op_locked(grpc_exec_ctx *exec_ctx, void *stream_op, &t->flow_control, &s->flow_control, GRPC_HEADER_SIZE_IN_BYTES, already_received); grpc_chttp2_act_on_flowctl_action( - exec_ctx, grpc_chttp2_flowctl_get_action(exec_ctx, &t->flow_control, - &s->flow_control), + grpc_chttp2_flowctl_get_action(&t->flow_control, &s->flow_control), t, s); } } - grpc_chttp2_maybe_complete_recv_message(exec_ctx, t, s); + grpc_chttp2_maybe_complete_recv_message(t, s); } if (op->recv_trailing_metadata) { - GRPC_STATS_INC_HTTP2_OP_RECV_TRAILING_METADATA(exec_ctx); + GRPC_STATS_INC_HTTP2_OP_RECV_TRAILING_METADATA(); GPR_ASSERT(s->recv_trailing_metadata_finished == NULL); s->recv_trailing_metadata_finished = add_closure_barrier(on_complete); s->recv_trailing_metadata = op_payload->recv_trailing_metadata.recv_trailing_metadata; s->final_metadata_requested = true; - grpc_chttp2_maybe_complete_recv_trailing_metadata(exec_ctx, t, s); + grpc_chttp2_maybe_complete_recv_trailing_metadata(t, s); } - grpc_chttp2_complete_closure_step(exec_ctx, t, s, &on_complete, - GRPC_ERROR_NONE, "op->on_complete"); + grpc_chttp2_complete_closure_step(t, s, &on_complete, GRPC_ERROR_NONE, + "op->on_complete"); GPR_TIMER_END("perform_stream_op_locked", 0); - GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "perform_stream_op"); + GRPC_CHTTP2_STREAM_UNREF(s, "perform_stream_op"); } -static void perform_stream_op(grpc_exec_ctx *exec_ctx, grpc_transport *gt, - grpc_stream *gs, +static void perform_stream_op(grpc_transport *gt, grpc_stream *gs, grpc_transport_stream_op_batch *op) { GPR_TIMER_BEGIN("perform_stream_op", 0); grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; @@ -1696,32 +1619,30 @@ static void perform_stream_op(grpc_exec_ctx *exec_ctx, grpc_transport *gt, op->handler_private.extra_arg = gs; GRPC_CHTTP2_STREAM_REF(s, "perform_stream_op"); GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_INIT(&op->handler_private.closure, perform_stream_op_locked, op, grpc_combiner_scheduler(t->combiner)), GRPC_ERROR_NONE); GPR_TIMER_END("perform_stream_op", 0); } -static void cancel_pings(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, - grpc_error *error) { +static void cancel_pings(grpc_chttp2_transport *t, grpc_error *error) { /* callback remaining pings: they're not allowed to call into the transpot, and maybe they hold resources that need to be freed */ grpc_chttp2_ping_queue *pq = &t->ping_queue; GPR_ASSERT(error != GRPC_ERROR_NONE); for (size_t j = 0; j < GRPC_CHTTP2_PCL_COUNT; j++) { grpc_closure_list_fail_all(&pq->lists[j], GRPC_ERROR_REF(error)); - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pq->lists[j]); + GRPC_CLOSURE_LIST_SCHED(&pq->lists[j]); } GRPC_ERROR_UNREF(error); } -static void send_ping_locked(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, +static void send_ping_locked(grpc_chttp2_transport *t, grpc_closure *on_initiate, grpc_closure *on_ack) { if (t->closed_with_error != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(exec_ctx, on_initiate, - GRPC_ERROR_REF(t->closed_with_error)); - GRPC_CLOSURE_SCHED(exec_ctx, on_ack, GRPC_ERROR_REF(t->closed_with_error)); + GRPC_CLOSURE_SCHED(on_initiate, GRPC_ERROR_REF(t->closed_with_error)); + GRPC_CLOSURE_SCHED(on_ack, GRPC_ERROR_REF(t->closed_with_error)); + return; } grpc_chttp2_ping_queue *pq = &t->ping_queue; @@ -1731,18 +1652,15 @@ static void send_ping_locked(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, GRPC_ERROR_NONE); } -static void retry_initiate_ping_locked(grpc_exec_ctx *exec_ctx, void *tp, - grpc_error *error) { +static void retry_initiate_ping_locked(void *tp, grpc_error *error) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)tp; t->ping_state.is_delayed_ping_timer_set = false; if (error == GRPC_ERROR_NONE) { - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_RETRY_SEND_PING); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_RETRY_SEND_PING); } } -void grpc_chttp2_ack_ping(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, - uint64_t id) { +void grpc_chttp2_ack_ping(grpc_chttp2_transport *t, uint64_t id) { grpc_chttp2_ping_queue *pq = &t->ping_queue; if (pq->inflight_id != id) { char *from = grpc_endpoint_get_peer(t->ep); @@ -1750,46 +1668,41 @@ void grpc_chttp2_ack_ping(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, gpr_free(from); return; } - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pq->lists[GRPC_CHTTP2_PCL_INFLIGHT]); + GRPC_CLOSURE_LIST_SCHED(&pq->lists[GRPC_CHTTP2_PCL_INFLIGHT]); if (!grpc_closure_list_empty(pq->lists[GRPC_CHTTP2_PCL_NEXT])) { - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_CONTINUE_PINGS); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_CONTINUE_PINGS); } } -static void send_goaway(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, - grpc_error *error) { +static void send_goaway(grpc_chttp2_transport *t, grpc_error *error) { t->sent_goaway_state = GRPC_CHTTP2_GOAWAY_SEND_SCHEDULED; grpc_http2_error_code http_error; grpc_slice slice; - grpc_error_get_status(exec_ctx, error, GRPC_MILLIS_INF_FUTURE, NULL, &slice, + grpc_error_get_status(error, GRPC_MILLIS_INF_FUTURE, NULL, &slice, &http_error); grpc_chttp2_goaway_append(t->last_new_stream_id, (uint32_t)http_error, grpc_slice_ref_internal(slice), &t->qbuf); - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_GOAWAY_SENT); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_GOAWAY_SENT); GRPC_ERROR_UNREF(error); } -void grpc_chttp2_add_ping_strike(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t) { +void grpc_chttp2_add_ping_strike(grpc_chttp2_transport *t) { t->ping_recv_state.ping_strikes++; if (++t->ping_recv_state.ping_strikes > t->ping_policy.max_ping_strikes && t->ping_policy.max_ping_strikes != 0) { - send_goaway(exec_ctx, t, + send_goaway(t, grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("too_many_pings"), GRPC_ERROR_INT_HTTP2_ERROR, GRPC_HTTP2_ENHANCE_YOUR_CALM)); /*The transport will be closed after the write is done */ close_transport_locked( - exec_ctx, t, grpc_error_set_int( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Too many pings"), - GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE)); + t, grpc_error_set_int( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Too many pings"), + GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE)); } } -static void perform_transport_op_locked(grpc_exec_ctx *exec_ctx, - void *stream_op, +static void perform_transport_op_locked(void *stream_op, grpc_error *error_ignored) { grpc_transport_op *op = (grpc_transport_op *)stream_op; grpc_chttp2_transport *t = @@ -1797,7 +1710,7 @@ static void perform_transport_op_locked(grpc_exec_ctx *exec_ctx, grpc_error *close_transport = op->disconnect_with_error; if (op->goaway_error) { - send_goaway(exec_ctx, t, op->goaway_error); + send_goaway(t, op->goaway_error); } if (op->set_accept_stream) { @@ -1807,43 +1720,40 @@ static void perform_transport_op_locked(grpc_exec_ctx *exec_ctx, } if (op->bind_pollset) { - grpc_endpoint_add_to_pollset(exec_ctx, t->ep, op->bind_pollset); + grpc_endpoint_add_to_pollset(t->ep, op->bind_pollset); } if (op->bind_pollset_set) { - grpc_endpoint_add_to_pollset_set(exec_ctx, t->ep, op->bind_pollset_set); + grpc_endpoint_add_to_pollset_set(t->ep, op->bind_pollset_set); } if (op->send_ping) { - send_ping_locked(exec_ctx, t, NULL, op->send_ping); - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_APPLICATION_PING); + send_ping_locked(t, NULL, op->send_ping); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_APPLICATION_PING); } if (op->on_connectivity_state_change != NULL) { grpc_connectivity_state_notify_on_state_change( - exec_ctx, &t->channel_callback.state_tracker, op->connectivity_state, + &t->channel_callback.state_tracker, op->connectivity_state, op->on_connectivity_state_change); } if (close_transport != GRPC_ERROR_NONE) { - close_transport_locked(exec_ctx, t, close_transport); + close_transport_locked(t, close_transport); } - GRPC_CLOSURE_RUN(exec_ctx, op->on_consumed, GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN(op->on_consumed, GRPC_ERROR_NONE); - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "transport_op"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "transport_op"); } -static void perform_transport_op(grpc_exec_ctx *exec_ctx, grpc_transport *gt, - grpc_transport_op *op) { +static void perform_transport_op(grpc_transport *gt, grpc_transport_op *op) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; char *msg = grpc_transport_op_string(op); gpr_free(msg); op->handler_private.extra_arg = gt; GRPC_CHTTP2_REF_TRANSPORT(t, "transport_op"); - GRPC_CLOSURE_SCHED(exec_ctx, - GRPC_CLOSURE_INIT(&op->handler_private.closure, + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_INIT(&op->handler_private.closure, perform_transport_op_locked, op, grpc_combiner_scheduler(t->combiner)), GRPC_ERROR_NONE); @@ -1853,36 +1763,33 @@ static void perform_transport_op(grpc_exec_ctx *exec_ctx, grpc_transport *gt, * INPUT PROCESSING - GENERAL */ -void grpc_chttp2_maybe_complete_recv_initial_metadata(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +void grpc_chttp2_maybe_complete_recv_initial_metadata(grpc_chttp2_transport *t, grpc_chttp2_stream *s) { if (s->recv_initial_metadata_ready != NULL && s->published_metadata[0] != GRPC_METADATA_NOT_PUBLISHED) { if (s->seen_error) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &s->frame_storage); + grpc_slice_buffer_reset_and_unref_internal(&s->frame_storage); if (!s->pending_byte_stream) { grpc_slice_buffer_reset_and_unref_internal( - exec_ctx, &s->unprocessed_incoming_frames_buffer); + &s->unprocessed_incoming_frames_buffer); } } - grpc_chttp2_incoming_metadata_buffer_publish( - exec_ctx, &s->metadata_buffer[0], s->recv_initial_metadata); - null_then_run_closure(exec_ctx, &s->recv_initial_metadata_ready, - GRPC_ERROR_NONE); + grpc_chttp2_incoming_metadata_buffer_publish(&s->metadata_buffer[0], + s->recv_initial_metadata); + null_then_run_closure(&s->recv_initial_metadata_ready, GRPC_ERROR_NONE); } } -void grpc_chttp2_maybe_complete_recv_message(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +void grpc_chttp2_maybe_complete_recv_message(grpc_chttp2_transport *t, grpc_chttp2_stream *s) { grpc_error *error = GRPC_ERROR_NONE; if (s->recv_message_ready != NULL) { *s->recv_message = NULL; if (s->final_metadata_requested && s->seen_error) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &s->frame_storage); + grpc_slice_buffer_reset_and_unref_internal(&s->frame_storage); if (!s->pending_byte_stream) { grpc_slice_buffer_reset_and_unref_internal( - exec_ctx, &s->unprocessed_incoming_frames_buffer); + &s->unprocessed_incoming_frames_buffer); } } if (!s->pending_byte_stream) { @@ -1909,10 +1816,9 @@ void grpc_chttp2_maybe_complete_recv_message(grpc_exec_ctx *exec_ctx, &s->decompressed_data_buffer, NULL, GRPC_HEADER_SIZE_IN_BYTES - s->decompressed_header_bytes, &end_of_context)) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, - &s->frame_storage); + grpc_slice_buffer_reset_and_unref_internal(&s->frame_storage); grpc_slice_buffer_reset_and_unref_internal( - exec_ctx, &s->unprocessed_incoming_frames_buffer); + &s->unprocessed_incoming_frames_buffer); error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Stream decompression error."); } else { @@ -1921,8 +1827,8 @@ void grpc_chttp2_maybe_complete_recv_message(grpc_exec_ctx *exec_ctx, s->decompressed_header_bytes = 0; } error = grpc_deframe_unprocessed_incoming_frames( - exec_ctx, &s->data_parser, s, &s->decompressed_data_buffer, - NULL, s->recv_message); + &s->data_parser, s, &s->decompressed_data_buffer, NULL, + s->recv_message); if (end_of_context) { grpc_stream_compression_context_destroy( s->stream_decompression_ctx); @@ -1931,15 +1837,14 @@ void grpc_chttp2_maybe_complete_recv_message(grpc_exec_ctx *exec_ctx, } } else { error = grpc_deframe_unprocessed_incoming_frames( - exec_ctx, &s->data_parser, s, - &s->unprocessed_incoming_frames_buffer, NULL, s->recv_message); + &s->data_parser, s, &s->unprocessed_incoming_frames_buffer, NULL, + s->recv_message); } if (error != GRPC_ERROR_NONE) { s->seen_error = true; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, - &s->frame_storage); + grpc_slice_buffer_reset_and_unref_internal(&s->frame_storage); grpc_slice_buffer_reset_and_unref_internal( - exec_ctx, &s->unprocessed_incoming_frames_buffer); + &s->unprocessed_incoming_frames_buffer); break; } else if (*s->recv_message != NULL) { break; @@ -1947,26 +1852,25 @@ void grpc_chttp2_maybe_complete_recv_message(grpc_exec_ctx *exec_ctx, } } if (error == GRPC_ERROR_NONE && *s->recv_message != NULL) { - null_then_run_closure(exec_ctx, &s->recv_message_ready, GRPC_ERROR_NONE); + null_then_run_closure(&s->recv_message_ready, GRPC_ERROR_NONE); } else if (s->published_metadata[1] != GRPC_METADATA_NOT_PUBLISHED) { *s->recv_message = NULL; - null_then_run_closure(exec_ctx, &s->recv_message_ready, GRPC_ERROR_NONE); + null_then_run_closure(&s->recv_message_ready, GRPC_ERROR_NONE); } GRPC_ERROR_UNREF(error); } } -void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_chttp2_transport *t, grpc_chttp2_stream *s) { - grpc_chttp2_maybe_complete_recv_message(exec_ctx, t, s); + grpc_chttp2_maybe_complete_recv_message(t, s); if (s->recv_trailing_metadata_finished != NULL && s->read_closed && s->write_closed) { if (s->seen_error) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &s->frame_storage); + grpc_slice_buffer_reset_and_unref_internal(&s->frame_storage); if (!s->pending_byte_stream) { grpc_slice_buffer_reset_and_unref_internal( - exec_ctx, &s->unprocessed_incoming_frames_buffer); + &s->unprocessed_incoming_frames_buffer); } } bool pending_data = s->pending_byte_stream || @@ -1984,9 +1888,9 @@ void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_exec_ctx *exec_ctx, &s->frame_storage, &s->unprocessed_incoming_frames_buffer, NULL, GRPC_HEADER_SIZE_IN_BYTES, &end_of_context)) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &s->frame_storage); + grpc_slice_buffer_reset_and_unref_internal(&s->frame_storage); grpc_slice_buffer_reset_and_unref_internal( - exec_ctx, &s->unprocessed_incoming_frames_buffer); + &s->unprocessed_incoming_frames_buffer); s->seen_error = true; } else { if (s->unprocessed_incoming_frames_buffer.length > 0) { @@ -2001,23 +1905,23 @@ void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_exec_ctx *exec_ctx, } if (s->read_closed && s->frame_storage.length == 0 && !pending_data && s->recv_trailing_metadata_finished != NULL) { - grpc_chttp2_incoming_metadata_buffer_publish( - exec_ctx, &s->metadata_buffer[1], s->recv_trailing_metadata); + grpc_chttp2_incoming_metadata_buffer_publish(&s->metadata_buffer[1], + s->recv_trailing_metadata); grpc_chttp2_complete_closure_step( - exec_ctx, t, s, &s->recv_trailing_metadata_finished, GRPC_ERROR_NONE, + t, s, &s->recv_trailing_metadata_finished, GRPC_ERROR_NONE, "recv_trailing_metadata_finished"); } } } -static void remove_stream(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, - uint32_t id, grpc_error *error) { +static void remove_stream(grpc_chttp2_transport *t, uint32_t id, + grpc_error *error) { grpc_chttp2_stream *s = (grpc_chttp2_stream *)grpc_chttp2_stream_map_delete(&t->stream_map, id); GPR_ASSERT(s); if (t->incoming_stream == s) { t->incoming_stream = NULL; - grpc_chttp2_parsing_become_skip_parser(exec_ctx, t); + grpc_chttp2_parsing_become_skip_parser(t); } if (s->pending_byte_stream) { if (s->on_next != NULL) { @@ -2025,8 +1929,8 @@ static void remove_stream(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, if (error == GRPC_ERROR_NONE) { error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Truncated message"); } - incoming_byte_stream_publish_error(exec_ctx, bs, error); - incoming_byte_stream_unref(exec_ctx, bs); + incoming_byte_stream_publish_error(bs, error); + incoming_byte_stream_unref(bs); s->data_parser.parsing_frame = NULL; } else { GRPC_ERROR_UNREF(s->byte_stream_error); @@ -2035,55 +1939,51 @@ static void remove_stream(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, } if (grpc_chttp2_stream_map_size(&t->stream_map) == 0) { - post_benign_reclaimer(exec_ctx, t); + post_benign_reclaimer(t); if (t->sent_goaway_state == GRPC_CHTTP2_GOAWAY_SENT) { close_transport_locked( - exec_ctx, t, - GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Last stream closed after sending GOAWAY", &error, 1)); + t, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "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"); + GRPC_CHTTP2_STREAM_UNREF(s, "chttp2_writing:remove_stream"); } GRPC_ERROR_UNREF(error); - maybe_start_some_streams(exec_ctx, t); + maybe_start_some_streams(t); } -void grpc_chttp2_cancel_stream(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, grpc_chttp2_stream *s, +void grpc_chttp2_cancel_stream(grpc_chttp2_transport *t, grpc_chttp2_stream *s, grpc_error *due_to_error) { if (!t->is_client && !s->sent_trailing_metadata && grpc_error_has_clear_grpc_status(due_to_error)) { - close_from_api(exec_ctx, t, s, due_to_error); + close_from_api(t, s, due_to_error); return; } if (!s->read_closed || !s->write_closed) { if (s->id != 0) { grpc_http2_error_code http_error; - grpc_error_get_status(exec_ctx, due_to_error, s->deadline, NULL, NULL, - &http_error); + grpc_error_get_status(due_to_error, s->deadline, NULL, NULL, &http_error); grpc_slice_buffer_add( &t->qbuf, grpc_chttp2_rst_stream_create(s->id, (uint32_t)http_error, &s->stats.outgoing)); - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_RST_STREAM); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_RST_STREAM); } } if (due_to_error != GRPC_ERROR_NONE && !s->seen_error) { s->seen_error = true; } - grpc_chttp2_mark_stream_closed(exec_ctx, t, s, 1, 1, due_to_error); + grpc_chttp2_mark_stream_closed(t, s, 1, 1, due_to_error); } -void grpc_chttp2_fake_status(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, - grpc_chttp2_stream *s, grpc_error *error) { +void grpc_chttp2_fake_status(grpc_chttp2_transport *t, grpc_chttp2_stream *s, + grpc_error *error) { grpc_status_code status; grpc_slice slice; - grpc_error_get_status(exec_ctx, error, s->deadline, &status, &slice, NULL); + grpc_error_get_status(error, s->deadline, &status, &slice, NULL); if (status != GRPC_STATUS_OK) { s->seen_error = true; @@ -2100,20 +2000,20 @@ void grpc_chttp2_fake_status(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, gpr_ltoa(status, status_string); GRPC_LOG_IF_ERROR("add_status", grpc_chttp2_incoming_metadata_buffer_replace_or_add( - exec_ctx, &s->metadata_buffer[1], + &s->metadata_buffer[1], grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_GRPC_STATUS, + GRPC_MDSTR_GRPC_STATUS, grpc_slice_from_copied_string(status_string)))); if (!GRPC_SLICE_IS_EMPTY(slice)) { GRPC_LOG_IF_ERROR( "add_status_message", grpc_chttp2_incoming_metadata_buffer_replace_or_add( - exec_ctx, &s->metadata_buffer[1], - grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_GRPC_MESSAGE, + &s->metadata_buffer[1], + grpc_mdelem_from_slices(GRPC_MDSTR_GRPC_MESSAGE, grpc_slice_ref_internal(slice)))); } s->published_metadata[1] = GRPC_METADATA_SYNTHESIZED_FROM_FAKE; - grpc_chttp2_maybe_complete_recv_trailing_metadata(exec_ctx, t, s); + grpc_chttp2_maybe_complete_recv_trailing_metadata(t, s); } GRPC_ERROR_UNREF(error); @@ -2146,14 +2046,12 @@ static grpc_error *removal_error(grpc_error *extra_error, grpc_chttp2_stream *s, return error; } -static void flush_write_list(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, - grpc_chttp2_stream *s, grpc_chttp2_write_cb **list, - grpc_error *error) { +static void flush_write_list(grpc_chttp2_transport *t, grpc_chttp2_stream *s, + grpc_chttp2_write_cb **list, grpc_error *error) { while (*list) { grpc_chttp2_write_cb *cb = *list; *list = cb->next; - grpc_chttp2_complete_closure_step(exec_ctx, t, s, &cb->closure, - GRPC_ERROR_REF(error), + grpc_chttp2_complete_closure_step(t, s, &cb->closure, GRPC_ERROR_REF(error), "on_write_finished_cb"); cb->next = t->write_cb_pool; t->write_cb_pool = cb; @@ -2161,37 +2059,34 @@ static void flush_write_list(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, GRPC_ERROR_UNREF(error); } -void grpc_chttp2_fail_pending_writes(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +void grpc_chttp2_fail_pending_writes(grpc_chttp2_transport *t, grpc_chttp2_stream *s, grpc_error *error) { error = removal_error(error, s, "Pending writes failed due to stream closure"); s->send_initial_metadata = NULL; - grpc_chttp2_complete_closure_step( - exec_ctx, t, s, &s->send_initial_metadata_finished, GRPC_ERROR_REF(error), - "send_initial_metadata_finished"); + grpc_chttp2_complete_closure_step(t, s, &s->send_initial_metadata_finished, + GRPC_ERROR_REF(error), + "send_initial_metadata_finished"); s->send_trailing_metadata = NULL; - grpc_chttp2_complete_closure_step( - exec_ctx, t, s, &s->send_trailing_metadata_finished, - GRPC_ERROR_REF(error), "send_trailing_metadata_finished"); + grpc_chttp2_complete_closure_step(t, s, &s->send_trailing_metadata_finished, + GRPC_ERROR_REF(error), + "send_trailing_metadata_finished"); s->fetching_send_message = NULL; - grpc_chttp2_complete_closure_step( - exec_ctx, t, s, &s->fetching_send_message_finished, GRPC_ERROR_REF(error), - "fetching_send_message_finished"); - flush_write_list(exec_ctx, t, s, &s->on_write_finished_cbs, - GRPC_ERROR_REF(error)); - flush_write_list(exec_ctx, t, s, &s->on_flow_controlled_cbs, error); + grpc_chttp2_complete_closure_step(t, s, &s->fetching_send_message_finished, + GRPC_ERROR_REF(error), + "fetching_send_message_finished"); + flush_write_list(t, s, &s->on_write_finished_cbs, GRPC_ERROR_REF(error)); + flush_write_list(t, s, &s->on_flow_controlled_cbs, error); } -void grpc_chttp2_mark_stream_closed(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +void grpc_chttp2_mark_stream_closed(grpc_chttp2_transport *t, grpc_chttp2_stream *s, int close_reads, int close_writes, grpc_error *error) { if (s->read_closed && s->write_closed) { /* already closed */ - grpc_chttp2_maybe_complete_recv_trailing_metadata(exec_ctx, t, s); + grpc_chttp2_maybe_complete_recv_trailing_metadata(t, s); GRPC_ERROR_UNREF(error); return; } @@ -2205,20 +2100,20 @@ void grpc_chttp2_mark_stream_closed(grpc_exec_ctx *exec_ctx, if (close_writes && !s->write_closed) { s->write_closed_error = GRPC_ERROR_REF(error); s->write_closed = true; - grpc_chttp2_fail_pending_writes(exec_ctx, t, s, GRPC_ERROR_REF(error)); + grpc_chttp2_fail_pending_writes(t, s, GRPC_ERROR_REF(error)); } if (s->read_closed && s->write_closed) { became_closed = true; grpc_error *overall_error = removal_error(GRPC_ERROR_REF(error), s, "Stream removed"); if (s->id != 0) { - remove_stream(exec_ctx, t, s->id, GRPC_ERROR_REF(overall_error)); + remove_stream(t, s->id, GRPC_ERROR_REF(overall_error)); } else { /* Purge streams waiting on concurrency still waiting for id assignment */ grpc_chttp2_list_remove_waiting_for_concurrency(t, s); } if (overall_error != GRPC_ERROR_NONE) { - grpc_chttp2_fake_status(exec_ctx, t, s, overall_error); + grpc_chttp2_fake_status(t, s, overall_error); } } if (closed_read) { @@ -2227,18 +2122,18 @@ void grpc_chttp2_mark_stream_closed(grpc_exec_ctx *exec_ctx, s->published_metadata[i] = GPRC_METADATA_PUBLISHED_AT_CLOSE; } } - grpc_chttp2_maybe_complete_recv_initial_metadata(exec_ctx, t, s); - grpc_chttp2_maybe_complete_recv_message(exec_ctx, t, s); + grpc_chttp2_maybe_complete_recv_initial_metadata(t, s); + grpc_chttp2_maybe_complete_recv_message(t, s); } if (became_closed) { - grpc_chttp2_maybe_complete_recv_trailing_metadata(exec_ctx, t, s); - GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "chttp2"); + grpc_chttp2_maybe_complete_recv_trailing_metadata(t, s); + GRPC_CHTTP2_STREAM_UNREF(s, "chttp2"); } GRPC_ERROR_UNREF(error); } -static void close_from_api(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, - grpc_chttp2_stream *s, grpc_error *error) { +static void close_from_api(grpc_chttp2_transport *t, grpc_chttp2_stream *s, + grpc_error *error) { grpc_slice hdr; grpc_slice status_hdr; grpc_slice http_status_hdr; @@ -2248,8 +2143,7 @@ static void close_from_api(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, uint32_t len = 0; grpc_status_code grpc_status; grpc_slice slice; - grpc_error_get_status(exec_ctx, error, s->deadline, &grpc_status, &slice, - NULL); + grpc_error_get_status(error, s->deadline, &grpc_status, &slice, NULL); GPR_ASSERT(grpc_status >= 0 && (int)grpc_status < 100); @@ -2391,13 +2285,12 @@ static void close_from_api(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, &t->qbuf, grpc_chttp2_rst_stream_create(s->id, GRPC_HTTP2_NO_ERROR, &s->stats.outgoing)); - grpc_chttp2_mark_stream_closed(exec_ctx, t, s, 1, 1, error); - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_CLOSE_FROM_API); + grpc_chttp2_mark_stream_closed(t, s, 1, 1, error); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_CLOSE_FROM_API); } typedef struct { - grpc_exec_ctx *exec_ctx; + ExecCtx *exec_ctx; grpc_error *error; grpc_chttp2_transport *t; } cancel_stream_cb_args; @@ -2405,12 +2298,10 @@ typedef struct { static void cancel_stream_cb(void *user_data, uint32_t key, void *stream) { cancel_stream_cb_args *args = (cancel_stream_cb_args *)user_data; grpc_chttp2_stream *s = (grpc_chttp2_stream *)stream; - grpc_chttp2_cancel_stream(args->exec_ctx, args->t, s, - GRPC_ERROR_REF(args->error)); + grpc_chttp2_cancel_stream(args->t, s, GRPC_ERROR_REF(args->error)); } -static void end_all_the_calls(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, - grpc_error *error) { +static void end_all_the_calls(grpc_chttp2_transport *t, grpc_error *error) { cancel_stream_cb_args args = {exec_ctx, error, t}; grpc_chttp2_stream_map_for_each(&t->stream_map, cancel_stream_cb, &args); GRPC_ERROR_UNREF(error); @@ -2420,20 +2311,19 @@ static void end_all_the_calls(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, * INPUT PROCESSING - PARSING */ -void grpc_chttp2_act_on_flowctl_action(grpc_exec_ctx *exec_ctx, - grpc_chttp2_flowctl_action action, +void grpc_chttp2_act_on_flowctl_action(grpc_chttp2_flowctl_action action, grpc_chttp2_transport *t, grpc_chttp2_stream *s) { switch (action.send_stream_update) { case GRPC_CHTTP2_FLOWCTL_NO_ACTION_NEEDED: break; case GRPC_CHTTP2_FLOWCTL_UPDATE_IMMEDIATELY: - grpc_chttp2_mark_stream_writable(exec_ctx, t, s); + grpc_chttp2_mark_stream_writable(t, s); grpc_chttp2_initiate_write( - exec_ctx, t, GRPC_CHTTP2_INITIATE_WRITE_STREAM_FLOW_CONTROL); + t, GRPC_CHTTP2_INITIATE_WRITE_STREAM_FLOW_CONTROL); break; case GRPC_CHTTP2_FLOWCTL_QUEUE_UPDATE: - grpc_chttp2_mark_stream_writable(exec_ctx, t, s); + grpc_chttp2_mark_stream_writable(t, s); break; } switch (action.send_transport_update) { @@ -2441,7 +2331,7 @@ void grpc_chttp2_act_on_flowctl_action(grpc_exec_ctx *exec_ctx, break; case GRPC_CHTTP2_FLOWCTL_UPDATE_IMMEDIATELY: grpc_chttp2_initiate_write( - exec_ctx, t, GRPC_CHTTP2_INITIATE_WRITE_TRANSPORT_FLOW_CONTROL); + t, GRPC_CHTTP2_INITIATE_WRITE_TRANSPORT_FLOW_CONTROL); break; // this is the same as no action b/c every time the transport enters the // writing path it will maybe do an update @@ -2450,23 +2340,20 @@ void grpc_chttp2_act_on_flowctl_action(grpc_exec_ctx *exec_ctx, } if (action.send_setting_update != GRPC_CHTTP2_FLOWCTL_NO_ACTION_NEEDED) { if (action.initial_window_size > 0) { - queue_setting_update(exec_ctx, t, - GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE, + queue_setting_update(t, GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE, (uint32_t)action.initial_window_size); } if (action.max_frame_size > 0) { - queue_setting_update(exec_ctx, t, GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE, + queue_setting_update(t, GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE, (uint32_t)action.max_frame_size); } if (action.send_setting_update == GRPC_CHTTP2_FLOWCTL_UPDATE_IMMEDIATELY) { - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_SEND_SETTINGS); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_SEND_SETTINGS); } } } -static grpc_error *try_http_parsing(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t) { +static grpc_error *try_http_parsing(grpc_chttp2_transport *t) { grpc_http_parser parser; size_t i = 0; grpc_error *error = GRPC_ERROR_NONE; @@ -2495,8 +2382,7 @@ static grpc_error *try_http_parsing(grpc_exec_ctx *exec_ctx, return error; } -static void read_action_locked(grpc_exec_ctx *exec_ctx, void *tp, - grpc_error *error) { +static void read_action_locked(void *tp, grpc_error *error) { GPR_TIMER_BEGIN("reading_action_locked", 0); grpc_chttp2_transport *t = (grpc_chttp2_transport *)tp; @@ -2520,11 +2406,10 @@ static void read_action_locked(grpc_exec_ctx *exec_ctx, void *tp, for (; i < t->read_buffer.count && errors[1] == GRPC_ERROR_NONE; i++) { t->flow_control.bdp_estimator->AddIncomingBytes( (int64_t)GRPC_SLICE_LENGTH(t->read_buffer.slices[i])); - errors[1] = - grpc_chttp2_perform_read(exec_ctx, t, t->read_buffer.slices[i]); + errors[1] = grpc_chttp2_perform_read(t, t->read_buffer.slices[i]); } if (errors[1] != GRPC_ERROR_NONE) { - errors[2] = try_http_parsing(exec_ctx, t); + errors[2] = try_http_parsing(t); GRPC_ERROR_UNREF(error); error = GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Failed parsing HTTP/2", errors, GPR_ARRAY_SIZE(errors)); @@ -2539,10 +2424,9 @@ static void read_action_locked(grpc_exec_ctx *exec_ctx, void *tp, if (t->flow_control.initial_window_update > 0) { grpc_chttp2_stream *s; while (grpc_chttp2_list_pop_stalled_by_stream(t, &s)) { - grpc_chttp2_mark_stream_writable(exec_ctx, t, s); + grpc_chttp2_mark_stream_writable(t, s); grpc_chttp2_initiate_write( - exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_FLOW_CONTROL_UNSTALLED_BY_SETTING); + t, GRPC_CHTTP2_INITIATE_WRITE_FLOW_CONTROL_UNSTALLED_BY_SETTING); } } t->flow_control.initial_window_update = 0; @@ -2557,24 +2441,21 @@ static void read_action_locked(grpc_exec_ctx *exec_ctx, void *tp, "Transport closed", &t->closed_with_error, 1); } if (error != GRPC_ERROR_NONE) { - close_transport_locked(exec_ctx, t, GRPC_ERROR_REF(error)); + close_transport_locked(t, GRPC_ERROR_REF(error)); t->endpoint_reading = 0; } else if (t->closed_with_error == GRPC_ERROR_NONE) { keep_reading = true; GRPC_CHTTP2_REF_TRANSPORT(t, "keep_reading"); } - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &t->read_buffer); + grpc_slice_buffer_reset_and_unref_internal(&t->read_buffer); if (keep_reading) { - grpc_endpoint_read(exec_ctx, t->ep, &t->read_buffer, - &t->read_action_locked); + grpc_endpoint_read(t->ep, &t->read_buffer, &t->read_action_locked); grpc_chttp2_act_on_flowctl_action( - exec_ctx, - grpc_chttp2_flowctl_get_action(exec_ctx, &t->flow_control, NULL), t, - NULL); - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "keep_reading"); + grpc_chttp2_flowctl_get_action(&t->flow_control, NULL), t, NULL); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "keep_reading"); } else { - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "reading_action"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "reading_action"); } GPR_TIMER_END("post_reading_action_locked", 0); @@ -2586,15 +2467,12 @@ static void read_action_locked(grpc_exec_ctx *exec_ctx, void *tp, // t is reffed prior to calling the first time, and once the callback chain // that kicks off finishes, it's unreffed -static void schedule_bdp_ping_locked(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t) { +static void schedule_bdp_ping_locked(grpc_chttp2_transport *t) { t->flow_control.bdp_estimator->SchedulePing(); - send_ping_locked(exec_ctx, t, &t->start_bdp_ping_locked, - &t->finish_bdp_ping_locked); + send_ping_locked(t, &t->start_bdp_ping_locked, &t->finish_bdp_ping_locked); } -static void start_bdp_ping_locked(grpc_exec_ctx *exec_ctx, void *tp, - grpc_error *error) { +static void start_bdp_ping_locked(void *tp, grpc_error *error) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)tp; if (GRPC_TRACER_ON(grpc_http_trace)) { gpr_log(GPR_DEBUG, "%s: Start BDP ping err=%s", t->peer_string, @@ -2602,39 +2480,37 @@ static void start_bdp_ping_locked(grpc_exec_ctx *exec_ctx, void *tp, } /* Reset the keepalive ping timer */ if (t->keepalive_state == GRPC_CHTTP2_KEEPALIVE_STATE_WAITING) { - grpc_timer_cancel(exec_ctx, &t->keepalive_ping_timer); + grpc_timer_cancel(&t->keepalive_ping_timer); } t->flow_control.bdp_estimator->StartPing(); } -static void finish_bdp_ping_locked(grpc_exec_ctx *exec_ctx, void *tp, - grpc_error *error) { +static void finish_bdp_ping_locked(void *tp, grpc_error *error) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)tp; if (GRPC_TRACER_ON(grpc_http_trace)) { gpr_log(GPR_DEBUG, "%s: Complete BDP ping err=%s", t->peer_string, grpc_error_string(error)); } if (error != GRPC_ERROR_NONE) { - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "bdp_ping"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "bdp_ping"); return; } - grpc_millis next_ping = t->flow_control.bdp_estimator->CompletePing(exec_ctx); + grpc_millis next_ping = t->flow_control.bdp_estimator->CompletePing(); GPR_ASSERT(!t->have_next_bdp_ping_timer); t->have_next_bdp_ping_timer = true; - grpc_timer_init(exec_ctx, &t->next_bdp_ping_timer, next_ping, + grpc_timer_init(&t->next_bdp_ping_timer, next_ping, &t->next_bdp_ping_timer_expired_locked); } -static void next_bdp_ping_timer_expired_locked(grpc_exec_ctx *exec_ctx, - void *tp, grpc_error *error) { +static void next_bdp_ping_timer_expired_locked(void *tp, grpc_error *error) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)tp; GPR_ASSERT(t->have_next_bdp_ping_timer); t->have_next_bdp_ping_timer = false; if (error != GRPC_ERROR_NONE) { - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "bdp_ping"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "bdp_ping"); return; } - schedule_bdp_ping_locked(exec_ctx, t); + schedule_bdp_ping_locked(t); } void grpc_chttp2_config_default_keepalive_args(grpc_channel_args *args, @@ -2695,8 +2571,7 @@ void grpc_chttp2_config_default_keepalive_args(grpc_channel_args *args, } } -static void init_keepalive_ping_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void init_keepalive_ping_locked(void *arg, grpc_error *error) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)arg; GPR_ASSERT(t->keepalive_state == GRPC_CHTTP2_KEEPALIVE_STATE_WAITING); if (t->destroying || t->closed_with_error != GRPC_ERROR_NONE) { @@ -2706,59 +2581,60 @@ static void init_keepalive_ping_locked(grpc_exec_ctx *exec_ctx, void *arg, grpc_chttp2_stream_map_size(&t->stream_map) > 0) { t->keepalive_state = GRPC_CHTTP2_KEEPALIVE_STATE_PINGING; GRPC_CHTTP2_REF_TRANSPORT(t, "keepalive ping end"); - send_ping_locked(exec_ctx, t, &t->start_keepalive_ping_locked, + send_ping_locked(t, &t->start_keepalive_ping_locked, &t->finish_keepalive_ping_locked); - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_KEEPALIVE_PING); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_KEEPALIVE_PING); } else { GRPC_CHTTP2_REF_TRANSPORT(t, "init keepalive ping"); - grpc_timer_init(exec_ctx, &t->keepalive_ping_timer, - grpc_exec_ctx_now(exec_ctx) + t->keepalive_time, + grpc_timer_init(&t->keepalive_ping_timer, + grpc_exec_ctx_now() + t->keepalive_time, &t->init_keepalive_ping_locked); } } else if (error == GRPC_ERROR_CANCELLED) { /* The keepalive ping timer may be cancelled by bdp */ GRPC_CHTTP2_REF_TRANSPORT(t, "init keepalive ping"); - grpc_timer_init(exec_ctx, &t->keepalive_ping_timer, - grpc_exec_ctx_now(exec_ctx) + t->keepalive_time, + grpc_timer_init(&t->keepalive_ping_timer, + grpc_exec_ctx_now() + t->keepalive_time, &t->init_keepalive_ping_locked); } - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "init keepalive ping"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "init keepalive ping"); } -static void start_keepalive_ping_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void start_keepalive_ping_locked(void *arg, grpc_error *error) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)arg; GRPC_CHTTP2_REF_TRANSPORT(t, "keepalive watchdog"); - grpc_timer_init(exec_ctx, &t->keepalive_watchdog_timer, - grpc_exec_ctx_now(exec_ctx) + t->keepalive_time, + grpc_timer_init(&t->keepalive_watchdog_timer, + grpc_exec_ctx_now() + t->keepalive_time, &t->keepalive_watchdog_fired_locked); } -static void finish_keepalive_ping_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void finish_keepalive_ping_locked(void *arg, grpc_error *error) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)arg; if (t->keepalive_state == GRPC_CHTTP2_KEEPALIVE_STATE_PINGING) { if (error == GRPC_ERROR_NONE) { t->keepalive_state = GRPC_CHTTP2_KEEPALIVE_STATE_WAITING; - grpc_timer_cancel(exec_ctx, &t->keepalive_watchdog_timer); + grpc_timer_cancel(&t->keepalive_watchdog_timer); GRPC_CHTTP2_REF_TRANSPORT(t, "init keepalive ping"); - grpc_timer_init(exec_ctx, &t->keepalive_ping_timer, - grpc_exec_ctx_now(exec_ctx) + t->keepalive_time, + grpc_timer_init(&t->keepalive_ping_timer, + grpc_exec_ctx_now() + t->keepalive_time, &t->init_keepalive_ping_locked); } } - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "keepalive ping end"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "keepalive ping end"); } -static void keepalive_watchdog_fired_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void keepalive_watchdog_fired_locked(void *arg, grpc_error *error) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)arg; if (t->keepalive_state == GRPC_CHTTP2_KEEPALIVE_STATE_PINGING) { if (error == GRPC_ERROR_NONE) { t->keepalive_state = GRPC_CHTTP2_KEEPALIVE_STATE_DYING; close_transport_locked( - exec_ctx, t, + t, + grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "keepalive watchdog timeout"), + GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_INTERNAL)); + close_transport_locked( + t, grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "keepalive watchdog timeout"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_INTERNAL)); @@ -2771,71 +2647,67 @@ static void keepalive_watchdog_fired_locked(grpc_exec_ctx *exec_ctx, void *arg, t->keepalive_state, GRPC_CHTTP2_KEEPALIVE_STATE_PINGING); } } - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "keepalive watchdog"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "keepalive watchdog"); } /******************************************************************************* * CALLBACK LOOP */ -static void connectivity_state_set(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +static void connectivity_state_set(grpc_chttp2_transport *t, grpc_connectivity_state state, grpc_error *error, const char *reason) { GRPC_CHTTP2_IF_TRACING( gpr_log(GPR_DEBUG, "set connectivity_state=%d", state)); - grpc_connectivity_state_set(exec_ctx, &t->channel_callback.state_tracker, - state, error, reason); + grpc_connectivity_state_set(&t->channel_callback.state_tracker, state, error, + reason); } /******************************************************************************* * POLLSET STUFF */ -static void set_pollset(grpc_exec_ctx *exec_ctx, grpc_transport *gt, - grpc_stream *gs, grpc_pollset *pollset) { +static void set_pollset(grpc_transport *gt, grpc_stream *gs, + grpc_pollset *pollset) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; - grpc_endpoint_add_to_pollset(exec_ctx, t->ep, pollset); + grpc_endpoint_add_to_pollset(t->ep, pollset); } -static void set_pollset_set(grpc_exec_ctx *exec_ctx, grpc_transport *gt, - grpc_stream *gs, grpc_pollset_set *pollset_set) { +static void set_pollset_set(grpc_transport *gt, grpc_stream *gs, + grpc_pollset_set *pollset_set) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)gt; - grpc_endpoint_add_to_pollset_set(exec_ctx, t->ep, pollset_set); + grpc_endpoint_add_to_pollset_set(t->ep, pollset_set); } /******************************************************************************* * BYTE STREAM */ -static void reset_byte_stream(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void reset_byte_stream(void *arg, grpc_error *error) { grpc_chttp2_stream *s = (grpc_chttp2_stream *)arg; s->pending_byte_stream = false; if (error == GRPC_ERROR_NONE) { - grpc_chttp2_maybe_complete_recv_message(exec_ctx, s->t, s); - grpc_chttp2_maybe_complete_recv_trailing_metadata(exec_ctx, s->t, s); + grpc_chttp2_maybe_complete_recv_message(s->t, s); + grpc_chttp2_maybe_complete_recv_trailing_metadata(s->t, s); } else { GPR_ASSERT(error != GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(exec_ctx, s->on_next, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(s->on_next, GRPC_ERROR_REF(error)); s->on_next = NULL; GRPC_ERROR_UNREF(s->byte_stream_error); s->byte_stream_error = GRPC_ERROR_NONE; - grpc_chttp2_cancel_stream(exec_ctx, s->t, s, GRPC_ERROR_REF(error)); + grpc_chttp2_cancel_stream(s->t, s, GRPC_ERROR_REF(error)); s->byte_stream_error = GRPC_ERROR_REF(error); } } -static void incoming_byte_stream_unref(grpc_exec_ctx *exec_ctx, - grpc_chttp2_incoming_byte_stream *bs) { +static void incoming_byte_stream_unref(grpc_chttp2_incoming_byte_stream *bs) { if (gpr_unref(&bs->refs)) { gpr_free(bs); } } -static void incoming_byte_stream_next_locked(grpc_exec_ctx *exec_ctx, - void *argp, +static void incoming_byte_stream_next_locked(void *argp, grpc_error *error_ignored) { grpc_chttp2_incoming_byte_stream *bs = (grpc_chttp2_incoming_byte_stream *)argp; @@ -2848,31 +2720,30 @@ static void incoming_byte_stream_next_locked(grpc_exec_ctx *exec_ctx, bs->next_action.max_size_hint, cur_length); grpc_chttp2_act_on_flowctl_action( - exec_ctx, grpc_chttp2_flowctl_get_action(exec_ctx, &t->flow_control, - &s->flow_control), - t, s); + grpc_chttp2_flowctl_get_action(&t->flow_control, &s->flow_control), t, + s); } GPR_ASSERT(s->unprocessed_incoming_frames_buffer.length == 0); if (s->frame_storage.length > 0) { grpc_slice_buffer_swap(&s->frame_storage, &s->unprocessed_incoming_frames_buffer); s->unprocessed_incoming_frames_decompressed = false; - GRPC_CLOSURE_SCHED(exec_ctx, bs->next_action.on_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(bs->next_action.on_complete, GRPC_ERROR_NONE); } else if (s->byte_stream_error != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(exec_ctx, bs->next_action.on_complete, + GRPC_CLOSURE_SCHED(bs->next_action.on_complete, GRPC_ERROR_REF(s->byte_stream_error)); if (s->data_parser.parsing_frame != NULL) { - incoming_byte_stream_unref(exec_ctx, s->data_parser.parsing_frame); + incoming_byte_stream_unref(s->data_parser.parsing_frame); s->data_parser.parsing_frame = NULL; } } else if (s->read_closed) { if (bs->remaining_bytes != 0) { s->byte_stream_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Truncated message"); - GRPC_CLOSURE_SCHED(exec_ctx, bs->next_action.on_complete, + GRPC_CLOSURE_SCHED(bs->next_action.on_complete, GRPC_ERROR_REF(s->byte_stream_error)); if (s->data_parser.parsing_frame != NULL) { - incoming_byte_stream_unref(exec_ctx, s->data_parser.parsing_frame); + incoming_byte_stream_unref(s->data_parser.parsing_frame); s->data_parser.parsing_frame = NULL; } } else { @@ -2882,11 +2753,10 @@ static void incoming_byte_stream_next_locked(grpc_exec_ctx *exec_ctx, } else { s->on_next = bs->next_action.on_complete; } - incoming_byte_stream_unref(exec_ctx, bs); + incoming_byte_stream_unref(bs); } -static bool incoming_byte_stream_next(grpc_exec_ctx *exec_ctx, - grpc_byte_stream *byte_stream, +static bool incoming_byte_stream_next(grpc_byte_stream *byte_stream, size_t max_size_hint, grpc_closure *on_complete) { GPR_TIMER_BEGIN("incoming_byte_stream_next", 0); @@ -2901,7 +2771,6 @@ static bool incoming_byte_stream_next(grpc_exec_ctx *exec_ctx, bs->next_action.max_size_hint = max_size_hint; bs->next_action.on_complete = on_complete; GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_INIT(&bs->next_action.closure, incoming_byte_stream_next_locked, bs, grpc_combiner_scheduler(bs->transport->combiner)), @@ -2911,8 +2780,7 @@ static bool incoming_byte_stream_next(grpc_exec_ctx *exec_ctx, } } -static grpc_error *incoming_byte_stream_pull(grpc_exec_ctx *exec_ctx, - grpc_byte_stream *byte_stream, +static grpc_error *incoming_byte_stream_pull(grpc_byte_stream *byte_stream, grpc_slice *slice) { GPR_TIMER_BEGIN("incoming_byte_stream_pull", 0); grpc_chttp2_incoming_byte_stream *bs = @@ -2948,62 +2816,58 @@ static grpc_error *incoming_byte_stream_pull(grpc_exec_ctx *exec_ctx, } } error = grpc_deframe_unprocessed_incoming_frames( - exec_ctx, &s->data_parser, s, &s->unprocessed_incoming_frames_buffer, - slice, NULL); + &s->data_parser, s, &s->unprocessed_incoming_frames_buffer, slice, + NULL); if (error != GRPC_ERROR_NONE) { return error; } } else { error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Truncated message"); - GRPC_CLOSURE_SCHED(exec_ctx, &s->reset_byte_stream, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(&s->reset_byte_stream, GRPC_ERROR_REF(error)); return error; } GPR_TIMER_END("incoming_byte_stream_pull", 0); return GRPC_ERROR_NONE; } -static void incoming_byte_stream_destroy_locked(grpc_exec_ctx *exec_ctx, - void *byte_stream, +static void incoming_byte_stream_destroy_locked(void *byte_stream, grpc_error *error_ignored); -static void incoming_byte_stream_destroy(grpc_exec_ctx *exec_ctx, - grpc_byte_stream *byte_stream) { +static void incoming_byte_stream_destroy(grpc_byte_stream *byte_stream) { GPR_TIMER_BEGIN("incoming_byte_stream_destroy", 0); grpc_chttp2_incoming_byte_stream *bs = (grpc_chttp2_incoming_byte_stream *)byte_stream; GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_INIT( - &bs->destroy_action, incoming_byte_stream_destroy_locked, - bs, grpc_combiner_scheduler(bs->transport->combiner)), + GRPC_CLOSURE_INIT(&bs->destroy_action, + incoming_byte_stream_destroy_locked, bs, + grpc_combiner_scheduler(bs->transport->combiner)), GRPC_ERROR_NONE); GPR_TIMER_END("incoming_byte_stream_destroy", 0); } static void incoming_byte_stream_publish_error( - grpc_exec_ctx *exec_ctx, grpc_chttp2_incoming_byte_stream *bs, - grpc_error *error) { + grpc_chttp2_incoming_byte_stream *bs, grpc_error *error) { grpc_chttp2_stream *s = bs->stream; GPR_ASSERT(error != GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(exec_ctx, s->on_next, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(s->on_next, GRPC_ERROR_REF(error)); s->on_next = NULL; GRPC_ERROR_UNREF(s->byte_stream_error); s->byte_stream_error = GRPC_ERROR_REF(error); - grpc_chttp2_cancel_stream(exec_ctx, bs->transport, bs->stream, - GRPC_ERROR_REF(error)); + grpc_chttp2_cancel_stream(bs->transport, bs->stream, GRPC_ERROR_REF(error)); } grpc_error *grpc_chttp2_incoming_byte_stream_push( - grpc_exec_ctx *exec_ctx, grpc_chttp2_incoming_byte_stream *bs, - grpc_slice slice, grpc_slice *slice_out) { + grpc_chttp2_incoming_byte_stream *bs, grpc_slice slice, + grpc_slice *slice_out) { grpc_chttp2_stream *s = bs->stream; if (bs->remaining_bytes < GRPC_SLICE_LENGTH(slice)) { grpc_error *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Too many bytes in stream"); - GRPC_CLOSURE_SCHED(exec_ctx, &s->reset_byte_stream, GRPC_ERROR_REF(error)); - grpc_slice_unref_internal(exec_ctx, slice); + GRPC_CLOSURE_SCHED(&s->reset_byte_stream, GRPC_ERROR_REF(error)); + grpc_slice_unref_internal(slice); return error; } else { bs->remaining_bytes -= (uint32_t)GRPC_SLICE_LENGTH(slice); @@ -3015,8 +2879,8 @@ grpc_error *grpc_chttp2_incoming_byte_stream_push( } grpc_error *grpc_chttp2_incoming_byte_stream_finished( - grpc_exec_ctx *exec_ctx, grpc_chttp2_incoming_byte_stream *bs, - grpc_error *error, bool reset_on_error) { + grpc_chttp2_incoming_byte_stream *bs, grpc_error *error, + bool reset_on_error) { grpc_chttp2_stream *s = bs->stream; if (error == GRPC_ERROR_NONE) { @@ -3025,27 +2889,25 @@ grpc_error *grpc_chttp2_incoming_byte_stream_finished( } } if (error != GRPC_ERROR_NONE && reset_on_error) { - GRPC_CLOSURE_SCHED(exec_ctx, &s->reset_byte_stream, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(&s->reset_byte_stream, GRPC_ERROR_REF(error)); } - incoming_byte_stream_unref(exec_ctx, bs); + incoming_byte_stream_unref(bs); return error; } -static void incoming_byte_stream_shutdown(grpc_exec_ctx *exec_ctx, - grpc_byte_stream *byte_stream, +static void incoming_byte_stream_shutdown(grpc_byte_stream *byte_stream, grpc_error *error) { grpc_chttp2_incoming_byte_stream *bs = (grpc_chttp2_incoming_byte_stream *)byte_stream; GRPC_ERROR_UNREF(grpc_chttp2_incoming_byte_stream_finished( - exec_ctx, bs, error, true /* reset_on_error */)); + bs, error, true /* reset_on_error */)); } static const grpc_byte_stream_vtable grpc_chttp2_incoming_byte_stream_vtable = { incoming_byte_stream_next, incoming_byte_stream_pull, incoming_byte_stream_shutdown, incoming_byte_stream_destroy}; -static void incoming_byte_stream_destroy_locked(grpc_exec_ctx *exec_ctx, - void *byte_stream, +static void incoming_byte_stream_destroy_locked(void *byte_stream, grpc_error *error_ignored) { grpc_chttp2_incoming_byte_stream *bs = (grpc_chttp2_incoming_byte_stream *)byte_stream; @@ -3053,15 +2915,15 @@ static void incoming_byte_stream_destroy_locked(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t = s->t; GPR_ASSERT(bs->base.vtable == &grpc_chttp2_incoming_byte_stream_vtable); - incoming_byte_stream_unref(exec_ctx, bs); + incoming_byte_stream_unref(bs); s->pending_byte_stream = false; - grpc_chttp2_maybe_complete_recv_message(exec_ctx, t, s); - grpc_chttp2_maybe_complete_recv_trailing_metadata(exec_ctx, t, s); + grpc_chttp2_maybe_complete_recv_message(t, s); + grpc_chttp2_maybe_complete_recv_trailing_metadata(t, s); } grpc_chttp2_incoming_byte_stream *grpc_chttp2_incoming_byte_stream_create( - grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, grpc_chttp2_stream *s, - uint32_t frame_size, uint32_t flags) { + grpc_chttp2_transport *t, grpc_chttp2_stream *s, uint32_t frame_size, + uint32_t flags) { grpc_chttp2_incoming_byte_stream *incoming_byte_stream = (grpc_chttp2_incoming_byte_stream *)gpr_malloc( sizeof(*incoming_byte_stream)); @@ -3081,30 +2943,25 @@ grpc_chttp2_incoming_byte_stream *grpc_chttp2_incoming_byte_stream_create( * RESOURCE QUOTAS */ -static void post_benign_reclaimer(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t) { +static void post_benign_reclaimer(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), + grpc_resource_user_post_reclaimer(grpc_endpoint_get_resource_user(t->ep), false, &t->benign_reclaimer_locked); } } -static void post_destructive_reclaimer(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t) { +static void post_destructive_reclaimer(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), + grpc_resource_user_post_reclaimer(grpc_endpoint_get_resource_user(t->ep), true, &t->destructive_reclaimer_locked); } } -static void benign_reclaimer_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void benign_reclaimer_locked(void *arg, grpc_error *error) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)arg; if (error == GRPC_ERROR_NONE && grpc_chttp2_stream_map_size(&t->stream_map) == 0) { @@ -3114,7 +2971,7 @@ static void benign_reclaimer_locked(grpc_exec_ctx *exec_ctx, void *arg, gpr_log(GPR_DEBUG, "HTTP2: %s - send goaway to free memory", t->peer_string); } - send_goaway(exec_ctx, t, + send_goaway(t, grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Buffers full"), GRPC_ERROR_INT_HTTP2_ERROR, GRPC_HTTP2_ENHANCE_YOUR_CALM)); @@ -3128,13 +2985,12 @@ static void benign_reclaimer_locked(grpc_exec_ctx *exec_ctx, void *arg, 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_endpoint_get_resource_user(t->ep)); } - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "benign_reclaimer"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "benign_reclaimer"); } -static void destructive_reclaimer_locked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void destructive_reclaimer_locked(void *arg, grpc_error *error) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)arg; size_t n = grpc_chttp2_stream_map_size(&t->stream_map); t->destructive_reclaimer_registered = false; @@ -3146,23 +3002,22 @@ static void destructive_reclaimer_locked(grpc_exec_ctx *exec_ctx, void *arg, s->id); } grpc_chttp2_cancel_stream( - exec_ctx, t, s, - grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING("Buffers full"), - GRPC_ERROR_INT_HTTP2_ERROR, - GRPC_HTTP2_ENHANCE_YOUR_CALM)); + t, s, grpc_error_set_int( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Buffers full"), + GRPC_ERROR_INT_HTTP2_ERROR, GRPC_HTTP2_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); + post_destructive_reclaimer(t); } } if (error != GRPC_ERROR_CANCELLED) { grpc_resource_user_finish_reclamation( - exec_ctx, grpc_endpoint_get_resource_user(t->ep)); + grpc_endpoint_get_resource_user(t->ep)); } - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "destructive_reclaimer"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "destructive_reclaimer"); } /******************************************************************************* @@ -3216,8 +3071,7 @@ const char *grpc_chttp2_initiate_write_reason_string( GPR_UNREACHABLE_CODE(return "unknown"); } -static grpc_endpoint *chttp2_get_endpoint(grpc_exec_ctx *exec_ctx, - grpc_transport *t) { +static grpc_endpoint *chttp2_get_endpoint(grpc_transport *t) { return ((grpc_chttp2_transport *)t)->ep; } @@ -3235,16 +3089,14 @@ static const grpc_transport_vtable vtable = {sizeof(grpc_chttp2_stream), static const grpc_transport_vtable *get_vtable(void) { return &vtable; } grpc_transport *grpc_create_chttp2_transport( - grpc_exec_ctx *exec_ctx, const grpc_channel_args *channel_args, - grpc_endpoint *ep, int is_client) { + const grpc_channel_args *channel_args, grpc_endpoint *ep, int is_client) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)gpr_zalloc(sizeof(grpc_chttp2_transport)); - init_transport(exec_ctx, t, channel_args, ep, is_client != 0); + init_transport(t, channel_args, ep, is_client != 0); return &t->base; } -void grpc_chttp2_transport_start_reading(grpc_exec_ctx *exec_ctx, - grpc_transport *transport, +void grpc_chttp2_transport_start_reading(grpc_transport *transport, grpc_slice_buffer *read_buffer) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)transport; GRPC_CHTTP2_REF_TRANSPORT( @@ -3253,5 +3105,5 @@ void grpc_chttp2_transport_start_reading(grpc_exec_ctx *exec_ctx, grpc_slice_buffer_move_into(read_buffer, &t->read_buffer); gpr_free(read_buffer); } - GRPC_CLOSURE_SCHED(exec_ctx, &t->read_action_locked, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&t->read_action_locked, GRPC_ERROR_NONE); } diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.h b/src/core/ext/transport/chttp2/transport/chttp2_transport.h index 321fca4c825..400c58066da 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.h +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.h @@ -36,13 +36,11 @@ extern grpc_tracer_flag grpc_trace_chttp2_refcount; #endif grpc_transport *grpc_create_chttp2_transport( - grpc_exec_ctx *exec_ctx, const grpc_channel_args *channel_args, - grpc_endpoint *ep, int is_client); + const grpc_channel_args *channel_args, grpc_endpoint *ep, int is_client); /// Takes ownership of \a read_buffer, which (if non-NULL) contains /// leftover bytes previously read from the endpoint (e.g., by handshakers). -void grpc_chttp2_transport_start_reading(grpc_exec_ctx *exec_ctx, - grpc_transport *transport, +void grpc_chttp2_transport_start_reading(grpc_transport *transport, grpc_slice_buffer *read_buffer); #ifdef __cplusplus diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc index d0e80c4bd5d..0d8a52f9246 100644 --- a/src/core/ext/transport/chttp2/transport/flow_control.cc +++ b/src/core/ext/transport/chttp2/transport/flow_control.cc @@ -392,10 +392,9 @@ static grpc_chttp2_flowctl_urgency delta_is_significant( // Takes in a target and uses the pid controller to return a stabilized // guess at the new bdp. -static double get_pid_controller_guess(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport_flowctl* tfc, +static double get_pid_controller_guess(grpc_chttp2_transport_flowctl* tfc, double target) { - grpc_millis now = grpc_exec_ctx_now(exec_ctx); + grpc_millis now = grpc_exec_ctx_now(); if (!tfc->pid_controller_initialized) { tfc->last_pid_update = now; tfc->pid_controller_initialized = true; @@ -440,8 +439,7 @@ static double get_target_under_memory_pressure( } grpc_chttp2_flowctl_action grpc_chttp2_flowctl_get_action( - grpc_exec_ctx* exec_ctx, grpc_chttp2_transport_flowctl* tfc, - grpc_chttp2_stream_flowctl* sfc) { + grpc_chttp2_transport_flowctl* tfc, grpc_chttp2_stream_flowctl* sfc) { grpc_chttp2_flowctl_action action; memset(&action, 0, sizeof(action)); // TODO(ncteisen): tune this @@ -471,7 +469,7 @@ grpc_chttp2_flowctl_action grpc_chttp2_flowctl_get_action( // run our target through the pid controller to stabilize change. // TODO(ncteisen): experiment with other controllers here. - double bdp_guess = get_pid_controller_guess(exec_ctx, tfc, target); + double bdp_guess = get_pid_controller_guess(tfc, target); // Though initial window 'could' drop to 0, we keep the floor at 128 tfc->target_initial_window_size = diff --git a/src/core/ext/transport/chttp2/transport/frame_data.cc b/src/core/ext/transport/chttp2/transport/frame_data.cc index 73aaab18025..04cf7eec934 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.cc +++ b/src/core/ext/transport/chttp2/transport/frame_data.cc @@ -36,11 +36,10 @@ grpc_error *grpc_chttp2_data_parser_init(grpc_chttp2_data_parser *parser) { return GRPC_ERROR_NONE; } -void grpc_chttp2_data_parser_destroy(grpc_exec_ctx *exec_ctx, - grpc_chttp2_data_parser *parser) { +void grpc_chttp2_data_parser_destroy(grpc_chttp2_data_parser *parser) { if (parser->parsing_frame != NULL) { GRPC_ERROR_UNREF(grpc_chttp2_incoming_byte_stream_finished( - exec_ctx, parser->parsing_frame, + parser->parsing_frame, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Parser destroyed"), false)); } GRPC_ERROR_UNREF(parser->error); @@ -98,7 +97,7 @@ void grpc_chttp2_encode_data(uint32_t id, grpc_slice_buffer *inbuf, } grpc_error *grpc_deframe_unprocessed_incoming_frames( - grpc_exec_ctx *exec_ctx, grpc_chttp2_data_parser *p, grpc_chttp2_stream *s, + grpc_chttp2_data_parser *p, grpc_chttp2_stream *s, grpc_slice_buffer *slices, grpc_slice *slice_out, grpc_byte_stream **stream_out) { grpc_error *error = GRPC_ERROR_NONE; @@ -118,14 +117,14 @@ grpc_error *grpc_deframe_unprocessed_incoming_frames( char *msg; if (cur == end) { - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); continue; } switch (p->state) { case GRPC_CHTTP2_DATA_ERROR: p->state = GRPC_CHTTP2_DATA_ERROR; - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); return GRPC_ERROR_REF(p->error); case GRPC_CHTTP2_DATA_FH_0: s->stats.incoming.framing_bytes++; @@ -150,12 +149,12 @@ grpc_error *grpc_deframe_unprocessed_incoming_frames( p->error = grpc_error_set_int(p->error, GRPC_ERROR_INT_OFFSET, cur - beg); p->state = GRPC_CHTTP2_DATA_ERROR; - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); return GRPC_ERROR_REF(p->error); } if (++cur == end) { p->state = GRPC_CHTTP2_DATA_FH_1; - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); continue; } /* fallthrough */ @@ -164,7 +163,7 @@ grpc_error *grpc_deframe_unprocessed_incoming_frames( p->frame_size = ((uint32_t)*cur) << 24; if (++cur == end) { p->state = GRPC_CHTTP2_DATA_FH_2; - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); continue; } /* fallthrough */ @@ -173,7 +172,7 @@ grpc_error *grpc_deframe_unprocessed_incoming_frames( p->frame_size |= ((uint32_t)*cur) << 16; if (++cur == end) { p->state = GRPC_CHTTP2_DATA_FH_3; - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); continue; } /* fallthrough */ @@ -182,7 +181,7 @@ grpc_error *grpc_deframe_unprocessed_incoming_frames( p->frame_size |= ((uint32_t)*cur) << 8; if (++cur == end) { p->state = GRPC_CHTTP2_DATA_FH_4; - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); continue; } /* fallthrough */ @@ -198,11 +197,11 @@ grpc_error *grpc_deframe_unprocessed_incoming_frames( message_flags |= GRPC_WRITE_INTERNAL_COMPRESS; } p->parsing_frame = grpc_chttp2_incoming_byte_stream_create( - exec_ctx, t, s, p->frame_size, message_flags); + t, s, p->frame_size, message_flags); *stream_out = &p->parsing_frame->base; if (p->parsing_frame->remaining_bytes == 0) { GRPC_ERROR_UNREF(grpc_chttp2_incoming_byte_stream_finished( - exec_ctx, p->parsing_frame, GRPC_ERROR_NONE, true)); + p->parsing_frame, GRPC_ERROR_NONE, true)); p->parsing_frame = NULL; p->state = GRPC_CHTTP2_DATA_FH_0; } @@ -213,64 +212,64 @@ grpc_error *grpc_deframe_unprocessed_incoming_frames( slices, grpc_slice_sub(slice, (size_t)(cur - beg), (size_t)(end - beg))); } - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); return GRPC_ERROR_NONE; case GRPC_CHTTP2_DATA_FRAME: { GPR_ASSERT(p->parsing_frame != NULL); GPR_ASSERT(slice_out != NULL); if (cur == end) { - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); continue; } uint32_t remaining = (uint32_t)(end - cur); if (remaining == p->frame_size) { s->stats.incoming.data_bytes += remaining; - if (GRPC_ERROR_NONE != (error = grpc_chttp2_incoming_byte_stream_push( - exec_ctx, p->parsing_frame, - grpc_slice_sub(slice, (size_t)(cur - beg), - (size_t)(end - beg)), - slice_out))) { - grpc_slice_unref_internal(exec_ctx, slice); + if (GRPC_ERROR_NONE != + (error = grpc_chttp2_incoming_byte_stream_push( + p->parsing_frame, grpc_slice_sub(slice, (size_t)(cur - beg), + (size_t)(end - beg)), + slice_out))) { + grpc_slice_unref_internal(slice); return error; } if (GRPC_ERROR_NONE != (error = grpc_chttp2_incoming_byte_stream_finished( - exec_ctx, p->parsing_frame, GRPC_ERROR_NONE, true))) { - grpc_slice_unref_internal(exec_ctx, slice); + p->parsing_frame, GRPC_ERROR_NONE, true))) { + grpc_slice_unref_internal(slice); return error; } p->parsing_frame = NULL; p->state = GRPC_CHTTP2_DATA_FH_0; - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); return GRPC_ERROR_NONE; } else if (remaining < p->frame_size) { s->stats.incoming.data_bytes += remaining; - if (GRPC_ERROR_NONE != (error = grpc_chttp2_incoming_byte_stream_push( - exec_ctx, p->parsing_frame, - grpc_slice_sub(slice, (size_t)(cur - beg), - (size_t)(end - beg)), - slice_out))) { + if (GRPC_ERROR_NONE != + (error = grpc_chttp2_incoming_byte_stream_push( + p->parsing_frame, grpc_slice_sub(slice, (size_t)(cur - beg), + (size_t)(end - beg)), + slice_out))) { return error; } p->frame_size -= remaining; - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); return GRPC_ERROR_NONE; } else { GPR_ASSERT(remaining > p->frame_size); s->stats.incoming.data_bytes += p->frame_size; if (GRPC_ERROR_NONE != (grpc_chttp2_incoming_byte_stream_push( - exec_ctx, p->parsing_frame, + p->parsing_frame, grpc_slice_sub(slice, (size_t)(cur - beg), (size_t)(cur + p->frame_size - beg)), slice_out))) { - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); return error; } if (GRPC_ERROR_NONE != (error = grpc_chttp2_incoming_byte_stream_finished( - exec_ctx, p->parsing_frame, GRPC_ERROR_NONE, true))) { - grpc_slice_unref_internal(exec_ctx, slice); + p->parsing_frame, GRPC_ERROR_NONE, true))) { + grpc_slice_unref_internal(slice); return error; } p->parsing_frame = NULL; @@ -279,7 +278,7 @@ grpc_error *grpc_deframe_unprocessed_incoming_frames( grpc_slice_buffer_undo_take_first( slices, grpc_slice_sub(slice, (size_t)(cur - beg), (size_t)(end - beg))); - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); return GRPC_ERROR_NONE; } } @@ -289,19 +288,19 @@ grpc_error *grpc_deframe_unprocessed_incoming_frames( return GRPC_ERROR_NONE; } -grpc_error *grpc_chttp2_data_parser_parse(grpc_exec_ctx *exec_ctx, void *parser, +grpc_error *grpc_chttp2_data_parser_parse(void *parser, grpc_chttp2_transport *t, grpc_chttp2_stream *s, grpc_slice slice, int is_last) { if (!s->pending_byte_stream) { grpc_slice_ref_internal(slice); grpc_slice_buffer_add(&s->frame_storage, slice); - grpc_chttp2_maybe_complete_recv_message(exec_ctx, t, s); + grpc_chttp2_maybe_complete_recv_message(t, s); } else if (s->on_next) { GPR_ASSERT(s->frame_storage.length == 0); grpc_slice_ref_internal(slice); grpc_slice_buffer_add(&s->unprocessed_incoming_frames_buffer, slice); - GRPC_CLOSURE_SCHED(exec_ctx, s->on_next, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(s->on_next, GRPC_ERROR_NONE); s->on_next = NULL; s->unprocessed_incoming_frames_decompressed = false; } else { @@ -310,8 +309,7 @@ grpc_error *grpc_chttp2_data_parser_parse(grpc_exec_ctx *exec_ctx, void *parser, } if (is_last && s->received_last_frame) { - grpc_chttp2_mark_stream_closed(exec_ctx, t, s, true, false, - GRPC_ERROR_NONE); + grpc_chttp2_mark_stream_closed(t, s, true, false, GRPC_ERROR_NONE); } return GRPC_ERROR_NONE; diff --git a/src/core/ext/transport/chttp2/transport/frame_data.h b/src/core/ext/transport/chttp2/transport/frame_data.h index 81ec5361a39..b5c30fd1dbf 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.h +++ b/src/core/ext/transport/chttp2/transport/frame_data.h @@ -58,8 +58,7 @@ typedef struct { /* initialize per-stream state for data frame parsing */ grpc_error *grpc_chttp2_data_parser_init(grpc_chttp2_data_parser *parser); -void grpc_chttp2_data_parser_destroy(grpc_exec_ctx *exec_ctx, - grpc_chttp2_data_parser *parser); +void grpc_chttp2_data_parser_destroy(grpc_chttp2_data_parser *parser); /* start processing a new data frame */ grpc_error *grpc_chttp2_data_parser_begin_frame(grpc_chttp2_data_parser *parser, @@ -69,7 +68,7 @@ grpc_error *grpc_chttp2_data_parser_begin_frame(grpc_chttp2_data_parser *parser, /* handle a slice of a data frame - is_last indicates the last slice of a frame */ -grpc_error *grpc_chttp2_data_parser_parse(grpc_exec_ctx *exec_ctx, void *parser, +grpc_error *grpc_chttp2_data_parser_parse(void *parser, grpc_chttp2_transport *t, grpc_chttp2_stream *s, grpc_slice slice, int is_last); @@ -80,7 +79,7 @@ void grpc_chttp2_encode_data(uint32_t id, grpc_slice_buffer *inbuf, grpc_slice_buffer *outbuf); grpc_error *grpc_deframe_unprocessed_incoming_frames( - grpc_exec_ctx *exec_ctx, grpc_chttp2_data_parser *p, grpc_chttp2_stream *s, + grpc_chttp2_data_parser *p, grpc_chttp2_stream *s, grpc_slice_buffer *slices, grpc_slice *slice_out, grpc_byte_stream **stream_out); diff --git a/src/core/ext/transport/chttp2/transport/frame_goaway.cc b/src/core/ext/transport/chttp2/transport/frame_goaway.cc index 78ec08e177f..8eda3611d16 100644 --- a/src/core/ext/transport/chttp2/transport/frame_goaway.cc +++ b/src/core/ext/transport/chttp2/transport/frame_goaway.cc @@ -52,8 +52,7 @@ grpc_error *grpc_chttp2_goaway_parser_begin_frame(grpc_chttp2_goaway_parser *p, return GRPC_ERROR_NONE; } -grpc_error *grpc_chttp2_goaway_parser_parse(grpc_exec_ctx *exec_ctx, - void *parser, +grpc_error *grpc_chttp2_goaway_parser_parse(void *parser, grpc_chttp2_transport *t, grpc_chttp2_stream *s, grpc_slice slice, int is_last) { @@ -135,7 +134,7 @@ grpc_error *grpc_chttp2_goaway_parser_parse(grpc_exec_ctx *exec_ctx, p->state = GRPC_CHTTP2_GOAWAY_DEBUG; if (is_last) { grpc_chttp2_add_incoming_goaway( - exec_ctx, t, (uint32_t)p->error_code, + t, (uint32_t)p->error_code, grpc_slice_new(p->debug_data, p->debug_length, gpr_free)); p->debug_data = NULL; } diff --git a/src/core/ext/transport/chttp2/transport/frame_goaway.h b/src/core/ext/transport/chttp2/transport/frame_goaway.h index 7b3aa45f3f2..135d6ec6ff1 100644 --- a/src/core/ext/transport/chttp2/transport/frame_goaway.h +++ b/src/core/ext/transport/chttp2/transport/frame_goaway.h @@ -54,8 +54,7 @@ void grpc_chttp2_goaway_parser_init(grpc_chttp2_goaway_parser *p); void grpc_chttp2_goaway_parser_destroy(grpc_chttp2_goaway_parser *p); grpc_error *grpc_chttp2_goaway_parser_begin_frame( grpc_chttp2_goaway_parser *parser, uint32_t length, uint8_t flags); -grpc_error *grpc_chttp2_goaway_parser_parse(grpc_exec_ctx *exec_ctx, - void *parser, +grpc_error *grpc_chttp2_goaway_parser_parse(void *parser, grpc_chttp2_transport *t, grpc_chttp2_stream *s, grpc_slice slice, int is_last); diff --git a/src/core/ext/transport/chttp2/transport/frame_ping.cc b/src/core/ext/transport/chttp2/transport/frame_ping.cc index 1cfa883ee15..1a5f2b8b3bd 100644 --- a/src/core/ext/transport/chttp2/transport/frame_ping.cc +++ b/src/core/ext/transport/chttp2/transport/frame_ping.cc @@ -68,7 +68,7 @@ grpc_error *grpc_chttp2_ping_parser_begin_frame(grpc_chttp2_ping_parser *parser, return GRPC_ERROR_NONE; } -grpc_error *grpc_chttp2_ping_parser_parse(grpc_exec_ctx *exec_ctx, void *parser, +grpc_error *grpc_chttp2_ping_parser_parse(void *parser, grpc_chttp2_transport *t, grpc_chttp2_stream *s, grpc_slice slice, int is_last) { @@ -86,10 +86,10 @@ grpc_error *grpc_chttp2_ping_parser_parse(grpc_exec_ctx *exec_ctx, void *parser, if (p->byte == 8) { GPR_ASSERT(is_last); if (p->is_ack) { - grpc_chttp2_ack_ping(exec_ctx, t, p->opaque_8bytes); + grpc_chttp2_ack_ping(t, p->opaque_8bytes); } else { if (!t->is_client) { - grpc_millis now = grpc_exec_ctx_now(exec_ctx); + grpc_millis now = grpc_exec_ctx_now(); grpc_millis next_allowed_ping = t->ping_recv_state.last_ping_recv_time + t->ping_policy.min_recv_ping_interval_without_data; @@ -104,7 +104,7 @@ grpc_error *grpc_chttp2_ping_parser_parse(grpc_exec_ctx *exec_ctx, void *parser, } if (next_allowed_ping > now) { - grpc_chttp2_add_ping_strike(exec_ctx, t); + grpc_chttp2_add_ping_strike(t); } t->ping_recv_state.last_ping_recv_time = now; @@ -116,8 +116,7 @@ grpc_error *grpc_chttp2_ping_parser_parse(grpc_exec_ctx *exec_ctx, void *parser, t->ping_acks, t->ping_ack_capacity * sizeof(*t->ping_acks)); } t->ping_acks[t->ping_ack_count++] = p->opaque_8bytes; - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_PING_RESPONSE); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_PING_RESPONSE); } } } diff --git a/src/core/ext/transport/chttp2/transport/frame_ping.h b/src/core/ext/transport/chttp2/transport/frame_ping.h index ffc2f0cf2ff..89fc0df000c 100644 --- a/src/core/ext/transport/chttp2/transport/frame_ping.h +++ b/src/core/ext/transport/chttp2/transport/frame_ping.h @@ -37,7 +37,7 @@ grpc_slice grpc_chttp2_ping_create(uint8_t ack, uint64_t opaque_8bytes); grpc_error *grpc_chttp2_ping_parser_begin_frame(grpc_chttp2_ping_parser *parser, uint32_t length, uint8_t flags); -grpc_error *grpc_chttp2_ping_parser_parse(grpc_exec_ctx *exec_ctx, void *parser, +grpc_error *grpc_chttp2_ping_parser_parse(void *parser, grpc_chttp2_transport *t, grpc_chttp2_stream *s, grpc_slice slice, int is_last); diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc index 0133b6efa25..222f0e2615e 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc @@ -69,8 +69,7 @@ grpc_error *grpc_chttp2_rst_stream_parser_begin_frame( return GRPC_ERROR_NONE; } -grpc_error *grpc_chttp2_rst_stream_parser_parse(grpc_exec_ctx *exec_ctx, - void *parser, +grpc_error *grpc_chttp2_rst_stream_parser_parse(void *parser, grpc_chttp2_transport *t, grpc_chttp2_stream *s, grpc_slice slice, int is_last) { @@ -103,7 +102,7 @@ grpc_error *grpc_chttp2_rst_stream_parser_parse(grpc_exec_ctx *exec_ctx, GRPC_ERROR_INT_HTTP2_ERROR, (intptr_t)reason); gpr_free(message); } - grpc_chttp2_mark_stream_closed(exec_ctx, t, s, true, true, error); + grpc_chttp2_mark_stream_closed(t, s, true, true, error); } return GRPC_ERROR_NONE; diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.h b/src/core/ext/transport/chttp2/transport/frame_rst_stream.h index 102ffdb3f36..c72d342de30 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.h +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.h @@ -38,8 +38,7 @@ grpc_slice grpc_chttp2_rst_stream_create(uint32_t stream_id, uint32_t code, grpc_error *grpc_chttp2_rst_stream_parser_begin_frame( grpc_chttp2_rst_stream_parser *parser, uint32_t length, uint8_t flags); -grpc_error *grpc_chttp2_rst_stream_parser_parse(grpc_exec_ctx *exec_ctx, - void *parser, +grpc_error *grpc_chttp2_rst_stream_parser_parse(void *parser, grpc_chttp2_transport *t, grpc_chttp2_stream *s, grpc_slice slice, int is_last); diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.cc b/src/core/ext/transport/chttp2/transport/frame_settings.cc index 2995bf73102..2dc7d2cde5b 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.cc +++ b/src/core/ext/transport/chttp2/transport/frame_settings.cc @@ -108,8 +108,7 @@ grpc_error *grpc_chttp2_settings_parser_begin_frame( } } -grpc_error *grpc_chttp2_settings_parser_parse(grpc_exec_ctx *exec_ctx, void *p, - grpc_chttp2_transport *t, +grpc_error *grpc_chttp2_settings_parser_parse(void *p, grpc_chttp2_transport *t, grpc_chttp2_stream *s, grpc_slice slice, int is_last) { grpc_chttp2_settings_parser *parser = (grpc_chttp2_settings_parser *)p; diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.h b/src/core/ext/transport/chttp2/transport/frame_settings.h index 3364da15207..3123e2422f6 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.h +++ b/src/core/ext/transport/chttp2/transport/frame_settings.h @@ -56,8 +56,7 @@ grpc_slice grpc_chttp2_settings_ack_create(void); grpc_error *grpc_chttp2_settings_parser_begin_frame( grpc_chttp2_settings_parser *parser, uint32_t length, uint8_t flags, uint32_t *settings); -grpc_error *grpc_chttp2_settings_parser_parse(grpc_exec_ctx *exec_ctx, - void *parser, +grpc_error *grpc_chttp2_settings_parser_parse(void *parser, grpc_chttp2_transport *t, grpc_chttp2_stream *s, grpc_slice slice, int is_last); diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.cc b/src/core/ext/transport/chttp2/transport/frame_window_update.cc index c9ab8d1b50f..0480e6b5dad 100644 --- a/src/core/ext/transport/chttp2/transport/frame_window_update.cc +++ b/src/core/ext/transport/chttp2/transport/frame_window_update.cc @@ -64,9 +64,11 @@ grpc_error *grpc_chttp2_window_update_parser_begin_frame( return GRPC_ERROR_NONE; } -grpc_error *grpc_chttp2_window_update_parser_parse( - grpc_exec_ctx *exec_ctx, void *parser, grpc_chttp2_transport *t, - grpc_chttp2_stream *s, grpc_slice slice, int is_last) { +grpc_error *grpc_chttp2_window_update_parser_parse(void *parser, + grpc_chttp2_transport *t, + grpc_chttp2_stream *s, + grpc_slice slice, + int is_last) { uint8_t *const beg = GRPC_SLICE_START_PTR(slice); uint8_t *const end = GRPC_SLICE_END_PTR(slice); uint8_t *cur = beg; @@ -99,10 +101,9 @@ grpc_error *grpc_chttp2_window_update_parser_parse( grpc_chttp2_flowctl_recv_stream_update( &t->flow_control, &s->flow_control, received_update); if (grpc_chttp2_list_remove_stalled_by_stream(t, s)) { - grpc_chttp2_mark_stream_writable(exec_ctx, t, s); + grpc_chttp2_mark_stream_writable(t, s); grpc_chttp2_initiate_write( - exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_FLOW_CONTROL_UNSTALLED_BY_UPDATE); + t, GRPC_CHTTP2_INITIATE_WRITE_FLOW_CONTROL_UNSTALLED_BY_UPDATE); } } } else { @@ -112,8 +113,7 @@ grpc_error *grpc_chttp2_window_update_parser_parse( bool is_zero = t->flow_control.remote_window <= 0; if (was_zero && !is_zero) { grpc_chttp2_initiate_write( - exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_TRANSPORT_FLOW_CONTROL_UNSTALLED); + t, GRPC_CHTTP2_INITIATE_WRITE_TRANSPORT_FLOW_CONTROL_UNSTALLED); } } } diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.h b/src/core/ext/transport/chttp2/transport/frame_window_update.h index 400f9f53989..0d7f7098c0a 100644 --- a/src/core/ext/transport/chttp2/transport/frame_window_update.h +++ b/src/core/ext/transport/chttp2/transport/frame_window_update.h @@ -39,9 +39,11 @@ grpc_slice grpc_chttp2_window_update_create( grpc_error *grpc_chttp2_window_update_parser_begin_frame( grpc_chttp2_window_update_parser *parser, uint32_t length, uint8_t flags); -grpc_error *grpc_chttp2_window_update_parser_parse( - grpc_exec_ctx *exec_ctx, void *parser, grpc_chttp2_transport *t, - grpc_chttp2_stream *s, grpc_slice slice, int is_last); +grpc_error *grpc_chttp2_window_update_parser_parse(void *parser, + grpc_chttp2_transport *t, + grpc_chttp2_stream *s, + grpc_slice slice, + int is_last); #ifdef __cplusplus } diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc index 17b8c4ab85e..60cd8d94007 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc @@ -179,8 +179,7 @@ static void evict_entry(grpc_chttp2_hpack_compressor *c) { } /* add an element to the decoder table */ -static void add_elem(grpc_exec_ctx *exec_ctx, grpc_chttp2_hpack_compressor *c, - grpc_mdelem elem) { +static void add_elem(grpc_chttp2_hpack_compressor *c, grpc_mdelem elem) { GPR_ASSERT(GRPC_MDELEM_IS_INTERNED(elem)); uint32_t key_hash = grpc_slice_hash(GRPC_MDKEY(elem)); @@ -228,12 +227,12 @@ static void add_elem(grpc_exec_ctx *exec_ctx, grpc_chttp2_hpack_compressor *c, } else if (c->indices_elems[HASH_FRAGMENT_2(elem_hash)] < c->indices_elems[HASH_FRAGMENT_3(elem_hash)]) { /* not there: replace oldest */ - GRPC_MDELEM_UNREF(exec_ctx, c->entries_elems[HASH_FRAGMENT_2(elem_hash)]); + GRPC_MDELEM_UNREF(c->entries_elems[HASH_FRAGMENT_2(elem_hash)]); c->entries_elems[HASH_FRAGMENT_2(elem_hash)] = GRPC_MDELEM_REF(elem); c->indices_elems[HASH_FRAGMENT_2(elem_hash)] = new_index; } else { /* not there: replace oldest */ - GRPC_MDELEM_UNREF(exec_ctx, c->entries_elems[HASH_FRAGMENT_3(elem_hash)]); + GRPC_MDELEM_UNREF(c->entries_elems[HASH_FRAGMENT_3(elem_hash)]); c->entries_elems[HASH_FRAGMENT_3(elem_hash)] = GRPC_MDELEM_REF(elem); c->indices_elems[HASH_FRAGMENT_3(elem_hash)] = new_index; } @@ -258,24 +257,21 @@ static void add_elem(grpc_exec_ctx *exec_ctx, grpc_chttp2_hpack_compressor *c, c->indices_keys[HASH_FRAGMENT_3(key_hash)] = new_index; } else if (c->indices_keys[HASH_FRAGMENT_2(key_hash)] < c->indices_keys[HASH_FRAGMENT_3(key_hash)]) { - grpc_slice_unref_internal(exec_ctx, - c->entries_keys[HASH_FRAGMENT_2(key_hash)]); + grpc_slice_unref_internal(c->entries_keys[HASH_FRAGMENT_2(key_hash)]); c->entries_keys[HASH_FRAGMENT_2(key_hash)] = grpc_slice_ref_internal(GRPC_MDKEY(elem)); c->indices_keys[HASH_FRAGMENT_2(key_hash)] = new_index; } else { - grpc_slice_unref_internal(exec_ctx, - c->entries_keys[HASH_FRAGMENT_3(key_hash)]); + grpc_slice_unref_internal(c->entries_keys[HASH_FRAGMENT_3(key_hash)]); c->entries_keys[HASH_FRAGMENT_3(key_hash)] = grpc_slice_ref_internal(GRPC_MDKEY(elem)); c->indices_keys[HASH_FRAGMENT_3(key_hash)] = new_index; } } -static void emit_indexed(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_compressor *c, uint32_t elem_index, +static void emit_indexed(grpc_chttp2_hpack_compressor *c, uint32_t elem_index, framer_state *st) { - GRPC_STATS_INC_HPACK_SEND_INDEXED(exec_ctx); + GRPC_STATS_INC_HPACK_SEND_INDEXED(); uint32_t len = GRPC_CHTTP2_VARINT_LENGTH(elem_index, 1); GRPC_CHTTP2_WRITE_VARINT(elem_index, 1, 0x80, add_tiny_header_data(st, len), len); @@ -287,18 +283,17 @@ typedef struct { bool insert_null_before_wire_value; } wire_value; -static wire_value get_wire_value(grpc_exec_ctx *exec_ctx, grpc_mdelem elem, - bool true_binary_enabled) { +static wire_value get_wire_value(grpc_mdelem elem, bool true_binary_enabled) { wire_value wire_val; if (grpc_is_binary_header(GRPC_MDKEY(elem))) { if (true_binary_enabled) { - GRPC_STATS_INC_HPACK_SEND_BINARY(exec_ctx); + GRPC_STATS_INC_HPACK_SEND_BINARY(); wire_val.huffman_prefix = 0x00; wire_val.insert_null_before_wire_value = true; wire_val.data = grpc_slice_ref_internal(GRPC_MDVALUE(elem)); } else { - GRPC_STATS_INC_HPACK_SEND_BINARY_BASE64(exec_ctx); + GRPC_STATS_INC_HPACK_SEND_BINARY_BASE64(); wire_val.huffman_prefix = 0x80; wire_val.insert_null_before_wire_value = false; wire_val.data = @@ -306,7 +301,7 @@ static wire_value get_wire_value(grpc_exec_ctx *exec_ctx, grpc_mdelem elem, } } else { /* TODO(ctiller): opportunistically compress non-binary headers */ - GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(exec_ctx); + GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(); wire_val.huffman_prefix = 0x00; wire_val.insert_null_before_wire_value = false; wire_val.data = grpc_slice_ref_internal(GRPC_MDVALUE(elem)); @@ -323,14 +318,12 @@ static void add_wire_value(framer_state *st, wire_value v) { add_header_data(st, v.data); } -static void emit_lithdr_incidx(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_compressor *c, +static void emit_lithdr_incidx(grpc_chttp2_hpack_compressor *c, uint32_t key_index, grpc_mdelem elem, framer_state *st) { - GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX(exec_ctx); + GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX(); uint32_t len_pfx = GRPC_CHTTP2_VARINT_LENGTH(key_index, 2); - wire_value value = - get_wire_value(exec_ctx, elem, st->use_true_binary_metadata); + wire_value value = get_wire_value(elem, st->use_true_binary_metadata); size_t len_val = wire_value_length(value); uint32_t len_val_len; GPR_ASSERT(len_val <= UINT32_MAX); @@ -342,14 +335,12 @@ static void emit_lithdr_incidx(grpc_exec_ctx *exec_ctx, add_wire_value(st, value); } -static void emit_lithdr_noidx(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_compressor *c, +static void emit_lithdr_noidx(grpc_chttp2_hpack_compressor *c, uint32_t key_index, grpc_mdelem elem, framer_state *st) { - GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX(exec_ctx); + GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX(); uint32_t len_pfx = GRPC_CHTTP2_VARINT_LENGTH(key_index, 4); - wire_value value = - get_wire_value(exec_ctx, elem, st->use_true_binary_metadata); + wire_value value = get_wire_value(elem, st->use_true_binary_metadata); size_t len_val = wire_value_length(value); uint32_t len_val_len; GPR_ASSERT(len_val <= UINT32_MAX); @@ -361,14 +352,12 @@ static void emit_lithdr_noidx(grpc_exec_ctx *exec_ctx, add_wire_value(st, value); } -static void emit_lithdr_incidx_v(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_compressor *c, +static void emit_lithdr_incidx_v(grpc_chttp2_hpack_compressor *c, grpc_mdelem elem, framer_state *st) { - GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX_V(exec_ctx); - GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(exec_ctx); + GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX_V(); + GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(); uint32_t len_key = (uint32_t)GRPC_SLICE_LENGTH(GRPC_MDKEY(elem)); - wire_value value = - get_wire_value(exec_ctx, elem, st->use_true_binary_metadata); + wire_value value = get_wire_value(elem, st->use_true_binary_metadata); uint32_t len_val = (uint32_t)wire_value_length(value); uint32_t len_key_len = GRPC_CHTTP2_VARINT_LENGTH(len_key, 1); uint32_t len_val_len = GRPC_CHTTP2_VARINT_LENGTH(len_val, 1); @@ -383,14 +372,12 @@ static void emit_lithdr_incidx_v(grpc_exec_ctx *exec_ctx, add_wire_value(st, value); } -static void emit_lithdr_noidx_v(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_compressor *c, +static void emit_lithdr_noidx_v(grpc_chttp2_hpack_compressor *c, grpc_mdelem elem, framer_state *st) { - GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX_V(exec_ctx); - GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(exec_ctx); + GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX_V(); + GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(); uint32_t len_key = (uint32_t)GRPC_SLICE_LENGTH(GRPC_MDKEY(elem)); - wire_value value = - get_wire_value(exec_ctx, elem, st->use_true_binary_metadata); + wire_value value = get_wire_value(elem, st->use_true_binary_metadata); uint32_t len_val = (uint32_t)wire_value_length(value); uint32_t len_key_len = GRPC_CHTTP2_VARINT_LENGTH(len_key, 1); uint32_t len_val_len = GRPC_CHTTP2_VARINT_LENGTH(len_val, 1); @@ -419,8 +406,8 @@ static uint32_t dynidx(grpc_chttp2_hpack_compressor *c, uint32_t elem_index) { } /* encode an mdelem */ -static void hpack_enc(grpc_exec_ctx *exec_ctx, grpc_chttp2_hpack_compressor *c, - grpc_mdelem elem, framer_state *st) { +static void hpack_enc(grpc_chttp2_hpack_compressor *c, grpc_mdelem elem, + framer_state *st) { GPR_ASSERT(GRPC_SLICE_LENGTH(GRPC_MDKEY(elem)) > 0); if (GRPC_SLICE_START_PTR(GRPC_MDKEY(elem))[0] != ':') { /* regular header */ st->seen_regular_header = 1; @@ -443,7 +430,7 @@ static void hpack_enc(grpc_exec_ctx *exec_ctx, grpc_chttp2_hpack_compressor *c, gpr_free(v); } if (!GRPC_MDELEM_IS_INTERNED(elem)) { - emit_lithdr_noidx_v(exec_ctx, c, elem, st); + emit_lithdr_noidx_v(c, elem, st); return; } @@ -465,16 +452,16 @@ static void hpack_enc(grpc_exec_ctx *exec_ctx, grpc_chttp2_hpack_compressor *c, if (grpc_mdelem_eq(c->entries_elems[HASH_FRAGMENT_2(elem_hash)], elem) && c->indices_elems[HASH_FRAGMENT_2(elem_hash)] > c->tail_remote_index) { /* HIT: complete element (first cuckoo hash) */ - emit_indexed(exec_ctx, c, - dynidx(c, c->indices_elems[HASH_FRAGMENT_2(elem_hash)]), st); + emit_indexed(c, dynidx(c, c->indices_elems[HASH_FRAGMENT_2(elem_hash)]), + st); return; } if (grpc_mdelem_eq(c->entries_elems[HASH_FRAGMENT_3(elem_hash)], elem) && c->indices_elems[HASH_FRAGMENT_3(elem_hash)] > c->tail_remote_index) { /* HIT: complete element (second cuckoo hash) */ - emit_indexed(exec_ctx, c, - dynidx(c, c->indices_elems[HASH_FRAGMENT_3(elem_hash)]), st); + emit_indexed(c, dynidx(c, c->indices_elems[HASH_FRAGMENT_3(elem_hash)]), + st); return; } @@ -492,11 +479,11 @@ static void hpack_enc(grpc_exec_ctx *exec_ctx, grpc_chttp2_hpack_compressor *c, indices_key > c->tail_remote_index) { /* HIT: key (first cuckoo hash) */ if (should_add_elem) { - emit_lithdr_incidx(exec_ctx, c, dynidx(c, indices_key), elem, st); - add_elem(exec_ctx, c, elem); + emit_lithdr_incidx(c, dynidx(c, indices_key), elem, st); + add_elem(c, elem); return; } else { - emit_lithdr_noidx(exec_ctx, c, dynidx(c, indices_key), elem, st); + emit_lithdr_noidx(c, dynidx(c, indices_key), elem, st); return; } GPR_UNREACHABLE_CODE(return ); @@ -508,11 +495,11 @@ static void hpack_enc(grpc_exec_ctx *exec_ctx, grpc_chttp2_hpack_compressor *c, indices_key > c->tail_remote_index) { /* HIT: key (first cuckoo hash) */ if (should_add_elem) { - emit_lithdr_incidx(exec_ctx, c, dynidx(c, indices_key), elem, st); - add_elem(exec_ctx, c, elem); + emit_lithdr_incidx(c, dynidx(c, indices_key), elem, st); + add_elem(c, elem); return; } else { - emit_lithdr_noidx(exec_ctx, c, dynidx(c, indices_key), elem, st); + emit_lithdr_noidx(c, dynidx(c, indices_key), elem, st); return; } GPR_UNREACHABLE_CODE(return ); @@ -521,11 +508,11 @@ static void hpack_enc(grpc_exec_ctx *exec_ctx, grpc_chttp2_hpack_compressor *c, /* no elem, key in the table... fall back to literal emission */ if (should_add_elem) { - emit_lithdr_incidx_v(exec_ctx, c, elem, st); - add_elem(exec_ctx, c, elem); + emit_lithdr_incidx_v(c, elem, st); + add_elem(c, elem); return; } else { - emit_lithdr_noidx_v(exec_ctx, c, elem, st); + emit_lithdr_noidx_v(c, elem, st); return; } GPR_UNREACHABLE_CODE(return ); @@ -534,17 +521,15 @@ static void hpack_enc(grpc_exec_ctx *exec_ctx, grpc_chttp2_hpack_compressor *c, #define STRLEN_LIT(x) (sizeof(x) - 1) #define TIMEOUT_KEY "grpc-timeout" -static void deadline_enc(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_compressor *c, grpc_millis deadline, +static void deadline_enc(grpc_chttp2_hpack_compressor *c, grpc_millis deadline, framer_state *st) { char timeout_str[GRPC_HTTP2_TIMEOUT_ENCODE_MIN_BUFSIZE]; grpc_mdelem mdelem; - grpc_http2_encode_timeout(deadline - grpc_exec_ctx_now(exec_ctx), - timeout_str); - mdelem = grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_GRPC_TIMEOUT, + grpc_http2_encode_timeout(deadline - grpc_exec_ctx_now(), timeout_str); + mdelem = grpc_mdelem_from_slices(GRPC_MDSTR_GRPC_TIMEOUT, grpc_slice_from_copied_string(timeout_str)); - hpack_enc(exec_ctx, c, mdelem, st); - GRPC_MDELEM_UNREF(exec_ctx, mdelem); + hpack_enc(c, mdelem, st); + GRPC_MDELEM_UNREF(mdelem); } static uint32_t elems_for_bytes(uint32_t bytes) { return (bytes + 31) / 32; } @@ -564,14 +549,13 @@ void grpc_chttp2_hpack_compressor_init(grpc_chttp2_hpack_compressor *c) { } } -void grpc_chttp2_hpack_compressor_destroy(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_compressor *c) { +void grpc_chttp2_hpack_compressor_destroy(grpc_chttp2_hpack_compressor *c) { int i; for (i = 0; i < GRPC_CHTTP2_HPACKC_NUM_VALUES; i++) { if (c->entries_keys[i].refcount != &terminal_slice_refcount) { - grpc_slice_unref_internal(exec_ctx, c->entries_keys[i]); + grpc_slice_unref_internal(c->entries_keys[i]); } - GRPC_MDELEM_UNREF(exec_ctx, c->entries_elems[i]); + GRPC_MDELEM_UNREF(c->entries_elems[i]); } gpr_free(c->table_elem_size); } @@ -627,8 +611,7 @@ void grpc_chttp2_hpack_compressor_set_max_table_size( } } -void grpc_chttp2_encode_header(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_compressor *c, +void grpc_chttp2_encode_header(grpc_chttp2_hpack_compressor *c, grpc_mdelem **extra_headers, size_t extra_headers_size, grpc_metadata_batch *metadata, @@ -654,15 +637,15 @@ void grpc_chttp2_encode_header(grpc_exec_ctx *exec_ctx, emit_advertise_table_size_change(c, &st); } for (size_t i = 0; i < extra_headers_size; ++i) { - hpack_enc(exec_ctx, c, *extra_headers[i], &st); + hpack_enc(c, *extra_headers[i], &st); } grpc_metadata_batch_assert_ok(metadata); for (grpc_linked_mdelem *l = metadata->list.head; l; l = l->next) { - hpack_enc(exec_ctx, c, l->md, &st); + hpack_enc(c, l->md, &st); } grpc_millis deadline = metadata->deadline; if (deadline != GRPC_MILLIS_INF_FUTURE) { - deadline_enc(exec_ctx, c, deadline, &st); + deadline_enc(c, deadline, &st); } finish_frame(&st, 1, options->is_eof); diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.h b/src/core/ext/transport/chttp2/transport/hpack_encoder.h index 16316b63f7c..eb8f80b7bd9 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.h +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.h @@ -72,8 +72,7 @@ typedef struct { } grpc_chttp2_hpack_compressor; void grpc_chttp2_hpack_compressor_init(grpc_chttp2_hpack_compressor *c); -void grpc_chttp2_hpack_compressor_destroy(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_compressor *c); +void grpc_chttp2_hpack_compressor_destroy(grpc_chttp2_hpack_compressor *c); void grpc_chttp2_hpack_compressor_set_max_table_size( grpc_chttp2_hpack_compressor *c, uint32_t max_table_size); void grpc_chttp2_hpack_compressor_set_max_usable_size( @@ -87,8 +86,7 @@ typedef struct { grpc_transport_one_way_stats *stats; } grpc_encode_header_options; -void grpc_chttp2_encode_header(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_compressor *c, +void grpc_chttp2_encode_header(grpc_chttp2_hpack_compressor *c, grpc_mdelem **extra_headers, size_t extra_headers_size, grpc_metadata_batch *metadata, diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc index 3d1df19bc38..97e3e85046b 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc @@ -60,96 +60,69 @@ typedef enum { a set of indirect jumps, and so not waste stack space. */ /* forward declarations for parsing states */ -static grpc_error *parse_begin(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, const uint8_t *cur, +static grpc_error *parse_begin(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_error(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, const uint8_t *cur, +static grpc_error *parse_error(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end, grpc_error *error); -static grpc_error *still_parse_error(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *still_parse_error(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_illegal_op(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_illegal_op(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_string_prefix(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_string_prefix(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_key_string(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_key_string(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); static grpc_error *parse_value_string_with_indexed_key( - grpc_exec_ctx *exec_ctx, grpc_chttp2_hpack_parser *p, const uint8_t *cur, - const uint8_t *end); + grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); static grpc_error *parse_value_string_with_literal_key( - grpc_exec_ctx *exec_ctx, grpc_chttp2_hpack_parser *p, const uint8_t *cur, - const uint8_t *end); + grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_value0(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, const uint8_t *cur, +static grpc_error *parse_value0(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_value1(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, const uint8_t *cur, +static grpc_error *parse_value1(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_value2(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, const uint8_t *cur, +static grpc_error *parse_value2(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_value3(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, const uint8_t *cur, +static grpc_error *parse_value3(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_value4(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, const uint8_t *cur, +static grpc_error *parse_value4(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_value5up(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_value5up(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_indexed_field(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_indexed_field(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_indexed_field_x(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_indexed_field_x(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_lithdr_incidx(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_lithdr_incidx(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_lithdr_incidx_x(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_lithdr_incidx_x(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_lithdr_incidx_v(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_lithdr_incidx_v(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_lithdr_notidx(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_lithdr_notidx(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_lithdr_notidx_x(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_lithdr_notidx_x(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_lithdr_notidx_v(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_lithdr_notidx_v(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_lithdr_nvridx(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_lithdr_nvridx(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_lithdr_nvridx_x(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_lithdr_nvridx_x(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_lithdr_nvridx_v(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_lithdr_nvridx_v(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_max_tbl_size(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_max_tbl_size(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); -static grpc_error *parse_max_tbl_size_x(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_max_tbl_size_x(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end); /* we translate the first byte of a hpack field into one of these decoding @@ -648,8 +621,8 @@ static const uint8_t inverse_base64[256] = { }; /* emission helpers */ -static grpc_error *on_hdr(grpc_exec_ctx *exec_ctx, grpc_chttp2_hpack_parser *p, - grpc_mdelem md, int add_to_table) { +static grpc_error *on_hdr(grpc_chttp2_hpack_parser *p, grpc_mdelem md, + int add_to_table) { if (GRPC_TRACER_ON(grpc_http_trace) && !GRPC_MDELEM_IS_INTERNED(md)) { char *k = grpc_slice_to_c_string(GRPC_MDKEY(md)); char *v = grpc_slice_to_c_string(GRPC_MDVALUE(md)); @@ -665,26 +638,25 @@ static grpc_error *on_hdr(grpc_exec_ctx *exec_ctx, grpc_chttp2_hpack_parser *p, if (add_to_table) { GPR_ASSERT(GRPC_MDELEM_STORAGE(md) == GRPC_MDELEM_STORAGE_INTERNED || GRPC_MDELEM_STORAGE(md) == GRPC_MDELEM_STORAGE_STATIC); - grpc_error *err = grpc_chttp2_hptbl_add(exec_ctx, &p->table, md); + grpc_error *err = grpc_chttp2_hptbl_add(&p->table, md); if (err != GRPC_ERROR_NONE) return err; } if (p->on_header == NULL) { - GRPC_MDELEM_UNREF(exec_ctx, md); + GRPC_MDELEM_UNREF(md); return GRPC_ERROR_CREATE_FROM_STATIC_STRING("on_header callback not set"); } - p->on_header(exec_ctx, p->on_header_user_data, md); + p->on_header(p->on_header_user_data, md); return GRPC_ERROR_NONE; } -static grpc_slice take_string(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_slice take_string(grpc_chttp2_hpack_parser *p, grpc_chttp2_hpack_parser_string *str, bool intern) { grpc_slice s; if (!str->copied) { if (intern) { s = grpc_slice_intern(str->data.referenced); - grpc_slice_unref_internal(exec_ctx, str->data.referenced); + grpc_slice_unref_internal(str->data.referenced); } else { s = str->data.referenced; } @@ -702,85 +674,77 @@ static grpc_slice take_string(grpc_exec_ctx *exec_ctx, } /* jump to the next state */ -static grpc_error *parse_next(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, const uint8_t *cur, +static grpc_error *parse_next(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { p->state = *p->next_state++; - return p->state(exec_ctx, p, cur, end); + return p->state(p, cur, end); } /* begin parsing a header: all functionality is encoded into lookup tables above */ -static grpc_error *parse_begin(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, const uint8_t *cur, +static grpc_error *parse_begin(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { if (cur == end) { p->state = parse_begin; return GRPC_ERROR_NONE; } - return first_byte_action[first_byte_lut[*cur]](exec_ctx, p, cur, end); + return first_byte_action[first_byte_lut[*cur]](p, cur, end); } /* stream dependency and prioritization data: we just skip it */ -static grpc_error *parse_stream_weight(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_stream_weight(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { if (cur == end) { p->state = parse_stream_weight; return GRPC_ERROR_NONE; } - return p->after_prioritization(exec_ctx, p, cur + 1, end); + return p->after_prioritization(p, cur + 1, end); } -static grpc_error *parse_stream_dep3(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_stream_dep3(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { if (cur == end) { p->state = parse_stream_dep3; return GRPC_ERROR_NONE; } - return parse_stream_weight(exec_ctx, p, cur + 1, end); + return parse_stream_weight(p, cur + 1, end); } -static grpc_error *parse_stream_dep2(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_stream_dep2(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { if (cur == end) { p->state = parse_stream_dep2; return GRPC_ERROR_NONE; } - return parse_stream_dep3(exec_ctx, p, cur + 1, end); + return parse_stream_dep3(p, cur + 1, end); } -static grpc_error *parse_stream_dep1(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_stream_dep1(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { if (cur == end) { p->state = parse_stream_dep1; return GRPC_ERROR_NONE; } - return parse_stream_dep2(exec_ctx, p, cur + 1, end); + return parse_stream_dep2(p, cur + 1, end); } -static grpc_error *parse_stream_dep0(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_stream_dep0(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { if (cur == end) { p->state = parse_stream_dep0; return GRPC_ERROR_NONE; } - return parse_stream_dep1(exec_ctx, p, cur + 1, end); + return parse_stream_dep1(p, cur + 1, end); } /* emit an indexed field; jumps to begin the next field on completion */ -static grpc_error *finish_indexed_field(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *finish_indexed_field(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { grpc_mdelem md = grpc_chttp2_hptbl_lookup(&p->table, p->index); @@ -792,24 +756,22 @@ static grpc_error *finish_indexed_field(grpc_exec_ctx *exec_ctx, GRPC_ERROR_INT_SIZE, (intptr_t)p->table.num_ents); } GRPC_MDELEM_REF(md); - GRPC_STATS_INC_HPACK_RECV_INDEXED(exec_ctx); - grpc_error *err = on_hdr(exec_ctx, p, md, 0); + GRPC_STATS_INC_HPACK_RECV_INDEXED(); + grpc_error *err = on_hdr(p, md, 0); if (err != GRPC_ERROR_NONE) return err; - return parse_begin(exec_ctx, p, cur, end); + return parse_begin(p, cur, end); } /* parse an indexed field with index < 127 */ -static grpc_error *parse_indexed_field(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_indexed_field(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { p->dynamic_table_update_allowed = 0; p->index = (*cur) & 0x7f; - return finish_indexed_field(exec_ctx, p, cur + 1, end); + return finish_indexed_field(p, cur + 1, end); } /* parse an indexed field with index >= 127 */ -static grpc_error *parse_indexed_field_x(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_indexed_field_x(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -818,56 +780,50 @@ static grpc_error *parse_indexed_field_x(grpc_exec_ctx *exec_ctx, p->next_state = and_then; p->index = 0x7f; p->parsing.value = &p->index; - return parse_value0(exec_ctx, p, cur + 1, end); + return parse_value0(p, cur + 1, end); } /* finish a literal header with incremental indexing */ -static grpc_error *finish_lithdr_incidx(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *finish_lithdr_incidx(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { grpc_mdelem md = grpc_chttp2_hptbl_lookup(&p->table, p->index); GPR_ASSERT(!GRPC_MDISNULL(md)); /* handled in string parsing */ - GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX(exec_ctx); - grpc_error *err = on_hdr( - exec_ctx, p, - grpc_mdelem_from_slices(exec_ctx, grpc_slice_ref_internal(GRPC_MDKEY(md)), - take_string(exec_ctx, p, &p->value, true)), - 1); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - return parse_begin(exec_ctx, p, cur, end); + GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX(); + grpc_error *err = + on_hdr(p, grpc_mdelem_from_slices(grpc_slice_ref_internal(GRPC_MDKEY(md)), + take_string(p, &p->value, true)), + 1); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + return parse_begin(p, cur, end); } /* finish a literal header with incremental indexing with no index */ -static grpc_error *finish_lithdr_incidx_v(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *finish_lithdr_incidx_v(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { - GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX_V(exec_ctx); - grpc_error *err = on_hdr( - exec_ctx, p, - grpc_mdelem_from_slices(exec_ctx, take_string(exec_ctx, p, &p->key, true), - take_string(exec_ctx, p, &p->value, true)), - 1); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - return parse_begin(exec_ctx, p, cur, end); + GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX_V(); + grpc_error *err = + on_hdr(p, grpc_mdelem_from_slices(take_string(p, &p->key, true), + take_string(p, &p->value, true)), + 1); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + return parse_begin(p, cur, end); } /* parse a literal header with incremental indexing; index < 63 */ -static grpc_error *parse_lithdr_incidx(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_lithdr_incidx(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { parse_value_string_with_indexed_key, finish_lithdr_incidx}; p->dynamic_table_update_allowed = 0; p->next_state = and_then; p->index = (*cur) & 0x3f; - return parse_string_prefix(exec_ctx, p, cur + 1, end); + return parse_string_prefix(p, cur + 1, end); } /* parse a literal header with incremental indexing; index >= 63 */ -static grpc_error *parse_lithdr_incidx_x(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_lithdr_incidx_x(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -877,12 +833,11 @@ static grpc_error *parse_lithdr_incidx_x(grpc_exec_ctx *exec_ctx, p->next_state = and_then; p->index = 0x3f; p->parsing.value = &p->index; - return parse_value0(exec_ctx, p, cur + 1, end); + return parse_value0(p, cur + 1, end); } /* parse a literal header with incremental indexing; index = 0 */ -static grpc_error *parse_lithdr_incidx_v(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_lithdr_incidx_v(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -890,56 +845,50 @@ static grpc_error *parse_lithdr_incidx_v(grpc_exec_ctx *exec_ctx, parse_value_string_with_literal_key, finish_lithdr_incidx_v}; p->dynamic_table_update_allowed = 0; p->next_state = and_then; - return parse_string_prefix(exec_ctx, p, cur + 1, end); + return parse_string_prefix(p, cur + 1, end); } /* finish a literal header without incremental indexing */ -static grpc_error *finish_lithdr_notidx(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *finish_lithdr_notidx(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { grpc_mdelem md = grpc_chttp2_hptbl_lookup(&p->table, p->index); GPR_ASSERT(!GRPC_MDISNULL(md)); /* handled in string parsing */ - GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX(exec_ctx); - grpc_error *err = on_hdr( - exec_ctx, p, - grpc_mdelem_from_slices(exec_ctx, grpc_slice_ref_internal(GRPC_MDKEY(md)), - take_string(exec_ctx, p, &p->value, false)), - 0); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - return parse_begin(exec_ctx, p, cur, end); + GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX(); + grpc_error *err = + on_hdr(p, grpc_mdelem_from_slices(grpc_slice_ref_internal(GRPC_MDKEY(md)), + take_string(p, &p->value, false)), + 0); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + return parse_begin(p, cur, end); } /* finish a literal header without incremental indexing with index = 0 */ -static grpc_error *finish_lithdr_notidx_v(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *finish_lithdr_notidx_v(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { - GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX_V(exec_ctx); - grpc_error *err = on_hdr( - exec_ctx, p, - grpc_mdelem_from_slices(exec_ctx, take_string(exec_ctx, p, &p->key, true), - take_string(exec_ctx, p, &p->value, false)), - 0); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - return parse_begin(exec_ctx, p, cur, end); + GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX_V(); + grpc_error *err = + on_hdr(p, grpc_mdelem_from_slices(take_string(p, &p->key, true), + take_string(p, &p->value, false)), + 0); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + return parse_begin(p, cur, end); } /* parse a literal header without incremental indexing; index < 15 */ -static grpc_error *parse_lithdr_notidx(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_lithdr_notidx(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { parse_value_string_with_indexed_key, finish_lithdr_notidx}; p->dynamic_table_update_allowed = 0; p->next_state = and_then; p->index = (*cur) & 0xf; - return parse_string_prefix(exec_ctx, p, cur + 1, end); + return parse_string_prefix(p, cur + 1, end); } /* parse a literal header without incremental indexing; index >= 15 */ -static grpc_error *parse_lithdr_notidx_x(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_lithdr_notidx_x(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -949,12 +898,11 @@ static grpc_error *parse_lithdr_notidx_x(grpc_exec_ctx *exec_ctx, p->next_state = and_then; p->index = 0xf; p->parsing.value = &p->index; - return parse_value0(exec_ctx, p, cur + 1, end); + return parse_value0(p, cur + 1, end); } /* parse a literal header without incremental indexing; index == 0 */ -static grpc_error *parse_lithdr_notidx_v(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_lithdr_notidx_v(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -962,56 +910,50 @@ static grpc_error *parse_lithdr_notidx_v(grpc_exec_ctx *exec_ctx, parse_value_string_with_literal_key, finish_lithdr_notidx_v}; p->dynamic_table_update_allowed = 0; p->next_state = and_then; - return parse_string_prefix(exec_ctx, p, cur + 1, end); + return parse_string_prefix(p, cur + 1, end); } /* finish a literal header that is never indexed */ -static grpc_error *finish_lithdr_nvridx(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *finish_lithdr_nvridx(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { grpc_mdelem md = grpc_chttp2_hptbl_lookup(&p->table, p->index); GPR_ASSERT(!GRPC_MDISNULL(md)); /* handled in string parsing */ - GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX(exec_ctx); - grpc_error *err = on_hdr( - exec_ctx, p, - grpc_mdelem_from_slices(exec_ctx, grpc_slice_ref_internal(GRPC_MDKEY(md)), - take_string(exec_ctx, p, &p->value, false)), - 0); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - return parse_begin(exec_ctx, p, cur, end); + GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX(); + grpc_error *err = + on_hdr(p, grpc_mdelem_from_slices(grpc_slice_ref_internal(GRPC_MDKEY(md)), + take_string(p, &p->value, false)), + 0); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + return parse_begin(p, cur, end); } /* finish a literal header that is never indexed with an extra value */ -static grpc_error *finish_lithdr_nvridx_v(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *finish_lithdr_nvridx_v(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { - GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX_V(exec_ctx); - grpc_error *err = on_hdr( - exec_ctx, p, - grpc_mdelem_from_slices(exec_ctx, take_string(exec_ctx, p, &p->key, true), - take_string(exec_ctx, p, &p->value, false)), - 0); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - return parse_begin(exec_ctx, p, cur, end); + GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX_V(); + grpc_error *err = + on_hdr(p, grpc_mdelem_from_slices(take_string(p, &p->key, true), + take_string(p, &p->value, false)), + 0); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + return parse_begin(p, cur, end); } /* parse a literal header that is never indexed; index < 15 */ -static grpc_error *parse_lithdr_nvridx(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_lithdr_nvridx(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { parse_value_string_with_indexed_key, finish_lithdr_nvridx}; p->dynamic_table_update_allowed = 0; p->next_state = and_then; p->index = (*cur) & 0xf; - return parse_string_prefix(exec_ctx, p, cur + 1, end); + return parse_string_prefix(p, cur + 1, end); } /* parse a literal header that is never indexed; index >= 15 */ -static grpc_error *parse_lithdr_nvridx_x(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_lithdr_nvridx_x(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -1021,12 +963,11 @@ static grpc_error *parse_lithdr_nvridx_x(grpc_exec_ctx *exec_ctx, p->next_state = and_then; p->index = 0xf; p->parsing.value = &p->index; - return parse_value0(exec_ctx, p, cur + 1, end); + return parse_value0(p, cur + 1, end); } /* parse a literal header that is never indexed; index == 0 */ -static grpc_error *parse_lithdr_nvridx_v(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_lithdr_nvridx_v(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -1034,47 +975,44 @@ static grpc_error *parse_lithdr_nvridx_v(grpc_exec_ctx *exec_ctx, parse_value_string_with_literal_key, finish_lithdr_nvridx_v}; p->dynamic_table_update_allowed = 0; p->next_state = and_then; - return parse_string_prefix(exec_ctx, p, cur + 1, end); + return parse_string_prefix(p, cur + 1, end); } /* finish parsing a max table size change */ -static grpc_error *finish_max_tbl_size(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *finish_max_tbl_size(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { if (GRPC_TRACER_ON(grpc_http_trace)) { gpr_log(GPR_INFO, "MAX TABLE SIZE: %d", p->index); } grpc_error *err = - grpc_chttp2_hptbl_set_current_table_size(exec_ctx, &p->table, p->index); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - return parse_begin(exec_ctx, p, cur, end); + grpc_chttp2_hptbl_set_current_table_size(&p->table, p->index); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + return parse_begin(p, cur, end); } /* parse a max table size change, max size < 15 */ -static grpc_error *parse_max_tbl_size(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_max_tbl_size(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { if (p->dynamic_table_update_allowed == 0) { return parse_error( - exec_ctx, p, cur, end, + p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "More than two max table size changes in a single frame")); } p->dynamic_table_update_allowed--; p->index = (*cur) & 0x1f; - return finish_max_tbl_size(exec_ctx, p, cur + 1, end); + return finish_max_tbl_size(p, cur + 1, end); } /* parse a max table size change, max size >= 15 */ -static grpc_error *parse_max_tbl_size_x(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_max_tbl_size_x(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { static const grpc_chttp2_hpack_parser_state and_then[] = { finish_max_tbl_size}; if (p->dynamic_table_update_allowed == 0) { return parse_error( - exec_ctx, p, cur, end, + p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "More than two max table size changes in a single frame")); } @@ -1082,12 +1020,11 @@ static grpc_error *parse_max_tbl_size_x(grpc_exec_ctx *exec_ctx, p->next_state = and_then; p->index = 0x1f; p->parsing.value = &p->index; - return parse_value0(exec_ctx, p, cur + 1, end); + return parse_value0(p, cur + 1, end); } /* a parse error: jam the parse state into parse_error, and return error */ -static grpc_error *parse_error(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, const uint8_t *cur, +static grpc_error *parse_error(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end, grpc_error *err) { GPR_ASSERT(err != GRPC_ERROR_NONE); if (p->last_error == GRPC_ERROR_NONE) { @@ -1097,27 +1034,24 @@ static grpc_error *parse_error(grpc_exec_ctx *exec_ctx, return err; } -static grpc_error *still_parse_error(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *still_parse_error(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { return GRPC_ERROR_REF(p->last_error); } -static grpc_error *parse_illegal_op(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_illegal_op(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { GPR_ASSERT(cur != end); char *msg; gpr_asprintf(&msg, "Illegal hpack op code %d", *cur); grpc_error *err = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - return parse_error(exec_ctx, p, cur, end, err); + return parse_error(p, cur, end, err); } /* parse the 1st byte of a varint into p->parsing.value no overflow is possible */ -static grpc_error *parse_value0(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, const uint8_t *cur, +static grpc_error *parse_value0(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { if (cur == end) { p->state = parse_value0; @@ -1127,16 +1061,15 @@ static grpc_error *parse_value0(grpc_exec_ctx *exec_ctx, *p->parsing.value += (*cur) & 0x7f; if ((*cur) & 0x80) { - return parse_value1(exec_ctx, p, cur + 1, end); + return parse_value1(p, cur + 1, end); } else { - return parse_next(exec_ctx, p, cur + 1, end); + return parse_next(p, cur + 1, end); } } /* parse the 2nd byte of a varint into p->parsing.value no overflow is possible */ -static grpc_error *parse_value1(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, const uint8_t *cur, +static grpc_error *parse_value1(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { if (cur == end) { p->state = parse_value1; @@ -1146,16 +1079,15 @@ static grpc_error *parse_value1(grpc_exec_ctx *exec_ctx, *p->parsing.value += (((uint32_t)*cur) & 0x7f) << 7; if ((*cur) & 0x80) { - return parse_value2(exec_ctx, p, cur + 1, end); + return parse_value2(p, cur + 1, end); } else { - return parse_next(exec_ctx, p, cur + 1, end); + return parse_next(p, cur + 1, end); } } /* parse the 3rd byte of a varint into p->parsing.value no overflow is possible */ -static grpc_error *parse_value2(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, const uint8_t *cur, +static grpc_error *parse_value2(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { if (cur == end) { p->state = parse_value2; @@ -1165,16 +1097,15 @@ static grpc_error *parse_value2(grpc_exec_ctx *exec_ctx, *p->parsing.value += (((uint32_t)*cur) & 0x7f) << 14; if ((*cur) & 0x80) { - return parse_value3(exec_ctx, p, cur + 1, end); + return parse_value3(p, cur + 1, end); } else { - return parse_next(exec_ctx, p, cur + 1, end); + return parse_next(p, cur + 1, end); } } /* parse the 4th byte of a varint into p->parsing.value no overflow is possible */ -static grpc_error *parse_value3(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, const uint8_t *cur, +static grpc_error *parse_value3(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { if (cur == end) { p->state = parse_value3; @@ -1184,16 +1115,15 @@ static grpc_error *parse_value3(grpc_exec_ctx *exec_ctx, *p->parsing.value += (((uint32_t)*cur) & 0x7f) << 21; if ((*cur) & 0x80) { - return parse_value4(exec_ctx, p, cur + 1, end); + return parse_value4(p, cur + 1, end); } else { - return parse_next(exec_ctx, p, cur + 1, end); + return parse_next(p, cur + 1, end); } } /* parse the 5th byte of a varint into p->parsing.value depending on the byte, we may overflow, and care must be taken */ -static grpc_error *parse_value4(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, const uint8_t *cur, +static grpc_error *parse_value4(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { uint8_t c; uint32_t cur_value; @@ -1219,9 +1149,9 @@ static grpc_error *parse_value4(grpc_exec_ctx *exec_ctx, *p->parsing.value = cur_value + add_value; if ((*cur) & 0x80) { - return parse_value5up(exec_ctx, p, cur + 1, end); + return parse_value5up(p, cur + 1, end); } else { - return parse_next(exec_ctx, p, cur + 1, end); + return parse_next(p, cur + 1, end); } error: @@ -1231,14 +1161,13 @@ error: *p->parsing.value, *cur); grpc_error *err = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - return parse_error(exec_ctx, p, cur, end, err); + return parse_error(p, cur, end, err); } /* parse any trailing bytes in a varint: it's possible to append an arbitrary number of 0x80's and not affect the value - a zero will terminate - and anything else will overflow */ -static grpc_error *parse_value5up(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_value5up(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { while (cur != end && *cur == 0x80) { ++cur; @@ -1250,7 +1179,7 @@ static grpc_error *parse_value5up(grpc_exec_ctx *exec_ctx, } if (*cur == 0) { - return parse_next(exec_ctx, p, cur + 1, end); + return parse_next(p, cur + 1, end); } char *msg; @@ -1260,12 +1189,11 @@ static grpc_error *parse_value5up(grpc_exec_ctx *exec_ctx, *p->parsing.value, *cur); grpc_error *err = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - return parse_error(exec_ctx, p, cur, end, err); + return parse_error(p, cur, end, err); } /* parse a string prefix */ -static grpc_error *parse_string_prefix(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_string_prefix(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { if (cur == end) { p->state = parse_string_prefix; @@ -1276,9 +1204,9 @@ static grpc_error *parse_string_prefix(grpc_exec_ctx *exec_ctx, p->huff = (*cur) >> 7; if (p->strlen == 0x7f) { p->parsing.value = &p->strlen; - return parse_value0(exec_ctx, p, cur + 1, end); + return parse_value0(p, cur + 1, end); } else { - return parse_next(exec_ctx, p, cur + 1, end); + return parse_next(p, cur + 1, end); } } @@ -1297,8 +1225,7 @@ static void append_bytes(grpc_chttp2_hpack_parser_string *str, str->data.copied.length += (uint32_t)length; } -static grpc_error *append_string(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *append_string(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { grpc_chttp2_hpack_parser_string *str = p->parsing.str; uint32_t bits; @@ -1316,11 +1243,11 @@ static grpc_error *append_string(grpc_exec_ctx *exec_ctx, /* 'true-binary' case */ ++cur; p->binary = NOT_BINARY; - GRPC_STATS_INC_HPACK_RECV_BINARY(exec_ctx); + GRPC_STATS_INC_HPACK_RECV_BINARY(); append_bytes(str, cur, (size_t)(end - cur)); return GRPC_ERROR_NONE; } - GRPC_STATS_INC_HPACK_RECV_BINARY_BASE64(exec_ctx); + GRPC_STATS_INC_HPACK_RECV_BINARY_BASE64(); /* fallthrough */ b64_byte0: case B64_BYTE0: @@ -1331,9 +1258,8 @@ static grpc_error *append_string(grpc_exec_ctx *exec_ctx, bits = inverse_base64[*cur]; ++cur; if (bits == 255) - return parse_error( - exec_ctx, p, cur, end, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Illegal base64 character")); + return parse_error(p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Illegal base64 character")); else if (bits == 64) goto b64_byte0; p->base64_buffer = bits << 18; @@ -1347,9 +1273,8 @@ static grpc_error *append_string(grpc_exec_ctx *exec_ctx, bits = inverse_base64[*cur]; ++cur; if (bits == 255) - return parse_error( - exec_ctx, p, cur, end, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Illegal base64 character")); + return parse_error(p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Illegal base64 character")); else if (bits == 64) goto b64_byte1; p->base64_buffer |= bits << 12; @@ -1363,9 +1288,8 @@ static grpc_error *append_string(grpc_exec_ctx *exec_ctx, bits = inverse_base64[*cur]; ++cur; if (bits == 255) - return parse_error( - exec_ctx, p, cur, end, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Illegal base64 character")); + return parse_error(p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Illegal base64 character")); else if (bits == 64) goto b64_byte2; p->base64_buffer |= bits << 6; @@ -1379,9 +1303,8 @@ static grpc_error *append_string(grpc_exec_ctx *exec_ctx, bits = inverse_base64[*cur]; ++cur; if (bits == 255) - return parse_error( - exec_ctx, p, cur, end, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Illegal base64 character")); + return parse_error(p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Illegal base64 character")); else if (bits == 64) goto b64_byte3; p->base64_buffer |= bits; @@ -1393,12 +1316,11 @@ static grpc_error *append_string(grpc_exec_ctx *exec_ctx, goto b64_byte0; } GPR_UNREACHABLE_CODE(return parse_error( - exec_ctx, p, cur, end, + p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Should never reach here"))); } -static grpc_error *finish_str(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, const uint8_t *cur, +static grpc_error *finish_str(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { uint8_t decoded[2]; uint32_t bits; @@ -1411,7 +1333,7 @@ static grpc_error *finish_str(grpc_exec_ctx *exec_ctx, case B64_BYTE0: break; case B64_BYTE1: - return parse_error(exec_ctx, p, cur, end, + return parse_error(p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "illegal base64 encoding")); /* illegal encoding */ case B64_BYTE2: @@ -1422,7 +1344,7 @@ static grpc_error *finish_str(grpc_exec_ctx *exec_ctx, bits & 0xffff); grpc_error *err = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - return parse_error(exec_ctx, p, cur, end, err); + return parse_error(p, cur, end, err); } decoded[0] = (uint8_t)(bits >> 16); append_bytes(str, decoded, 1); @@ -1435,7 +1357,7 @@ static grpc_error *finish_str(grpc_exec_ctx *exec_ctx, bits & 0xff); grpc_error *err = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - return parse_error(exec_ctx, p, cur, end, err); + return parse_error(p, cur, end, err); } decoded[0] = (uint8_t)(bits >> 16); decoded[1] = (uint8_t)(bits >> 8); @@ -1446,14 +1368,13 @@ static grpc_error *finish_str(grpc_exec_ctx *exec_ctx, } /* decode a nibble from a huffman encoded stream */ -static grpc_error *huff_nibble(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, uint8_t nibble) { +static grpc_error *huff_nibble(grpc_chttp2_hpack_parser *p, uint8_t nibble) { int16_t emit = emit_sub_tbl[16 * emit_tbl[p->huff_state] + nibble]; int16_t next = next_sub_tbl[16 * next_tbl[p->huff_state] + nibble]; if (emit != -1) { if (emit >= 0 && emit < 256) { uint8_t c = (uint8_t)emit; - grpc_error *err = append_string(exec_ctx, p, &c, (&c) + 1); + grpc_error *err = append_string(p, &c, (&c) + 1); if (err != GRPC_ERROR_NONE) return err; } else { assert(emit == 256); @@ -1464,45 +1385,42 @@ static grpc_error *huff_nibble(grpc_exec_ctx *exec_ctx, } /* decode full bytes from a huffman encoded stream */ -static grpc_error *add_huff_bytes(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *add_huff_bytes(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { for (; cur != end; ++cur) { - grpc_error *err = huff_nibble(exec_ctx, p, *cur >> 4); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - err = huff_nibble(exec_ctx, p, *cur & 0xf); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); + grpc_error *err = huff_nibble(p, *cur >> 4); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + err = huff_nibble(p, *cur & 0xf); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); } return GRPC_ERROR_NONE; } /* decode some string bytes based on the current decoding mode (huffman or not) */ -static grpc_error *add_str_bytes(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *add_str_bytes(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { if (p->huff) { - return add_huff_bytes(exec_ctx, p, cur, end); + return add_huff_bytes(p, cur, end); } else { - return append_string(exec_ctx, p, cur, end); + return append_string(p, cur, end); } } /* parse a string - tries to do large chunks at a time */ -static grpc_error *parse_string(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, const uint8_t *cur, +static grpc_error *parse_string(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { size_t remaining = p->strlen - p->strgot; size_t given = (size_t)(end - cur); if (remaining <= given) { - grpc_error *err = add_str_bytes(exec_ctx, p, cur, cur + remaining); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - err = finish_str(exec_ctx, p, cur + remaining, end); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - return parse_next(exec_ctx, p, cur + remaining, end); + grpc_error *err = add_str_bytes(p, cur, cur + remaining); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + err = finish_str(p, cur + remaining, end); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + return parse_next(p, cur + remaining, end); } else { - grpc_error *err = add_str_bytes(exec_ctx, p, cur, cur + given); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); + grpc_error *err = add_str_bytes(p, cur, cur + given); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); GPR_ASSERT(given <= UINT32_MAX - p->strgot); p->strgot += (uint32_t)given; p->state = parse_string; @@ -1511,20 +1429,19 @@ static grpc_error *parse_string(grpc_exec_ctx *exec_ctx, } /* begin parsing a string - performs setup, calls parse_string */ -static grpc_error *begin_parse_string(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *begin_parse_string(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end, uint8_t binary, grpc_chttp2_hpack_parser_string *str) { if (!p->huff && binary == NOT_BINARY && (end - cur) >= (intptr_t)p->strlen && p->current_slice_refcount != NULL) { - GRPC_STATS_INC_HPACK_RECV_UNCOMPRESSED(exec_ctx); + GRPC_STATS_INC_HPACK_RECV_UNCOMPRESSED(); str->copied = false; str->data.referenced.refcount = p->current_slice_refcount; str->data.referenced.data.refcounted.bytes = (uint8_t *)cur; str->data.referenced.data.refcounted.length = p->strlen; grpc_slice_ref_internal(str->data.referenced); - return parse_next(exec_ctx, p, cur + p->strlen, end); + return parse_next(p, cur + p->strlen, end); } p->strgot = 0; str->copied = true; @@ -1535,9 +1452,9 @@ static grpc_error *begin_parse_string(grpc_exec_ctx *exec_ctx, switch (p->binary) { case NOT_BINARY: if (p->huff) { - GRPC_STATS_INC_HPACK_RECV_HUFFMAN(exec_ctx); + GRPC_STATS_INC_HPACK_RECV_HUFFMAN(); } else { - GRPC_STATS_INC_HPACK_RECV_UNCOMPRESSED(exec_ctx); + GRPC_STATS_INC_HPACK_RECV_UNCOMPRESSED(); } break; case BINARY_BEGIN: @@ -1546,14 +1463,13 @@ static grpc_error *begin_parse_string(grpc_exec_ctx *exec_ctx, default: abort(); } - return parse_string(exec_ctx, p, cur, end); + return parse_string(p, cur, end); } /* parse the key string */ -static grpc_error *parse_key_string(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_key_string(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { - return begin_parse_string(exec_ctx, p, cur, end, NOT_BINARY, &p->key); + return begin_parse_string(p, cur, end, NOT_BINARY, &p->key); } /* check if a key represents a binary header or not */ @@ -1580,33 +1496,29 @@ static grpc_error *is_binary_indexed_header(grpc_chttp2_hpack_parser *p, } /* parse the value string */ -static grpc_error *parse_value_string(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +static grpc_error *parse_value_string(grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end, bool is_binary) { - return begin_parse_string(exec_ctx, p, cur, end, - is_binary ? BINARY_BEGIN : NOT_BINARY, &p->value); + return begin_parse_string(p, cur, end, is_binary ? BINARY_BEGIN : NOT_BINARY, + &p->value); } static grpc_error *parse_value_string_with_indexed_key( - grpc_exec_ctx *exec_ctx, grpc_chttp2_hpack_parser *p, const uint8_t *cur, - const uint8_t *end) { + grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { bool is_binary = false; grpc_error *err = is_binary_indexed_header(p, &is_binary); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - return parse_value_string(exec_ctx, p, cur, end, is_binary); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + return parse_value_string(p, cur, end, is_binary); } static grpc_error *parse_value_string_with_literal_key( - grpc_exec_ctx *exec_ctx, grpc_chttp2_hpack_parser *p, const uint8_t *cur, - const uint8_t *end) { - return parse_value_string(exec_ctx, p, cur, end, is_binary_literal_header(p)); + grpc_chttp2_hpack_parser *p, const uint8_t *cur, const uint8_t *end) { + return parse_value_string(p, cur, end, is_binary_literal_header(p)); } /* PUBLIC INTERFACE */ -void grpc_chttp2_hpack_parser_init(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p) { +void grpc_chttp2_hpack_parser_init(grpc_chttp2_hpack_parser *p) { p->on_header = NULL; p->on_header_user_data = NULL; p->state = parse_begin; @@ -1620,7 +1532,7 @@ void grpc_chttp2_hpack_parser_init(grpc_exec_ctx *exec_ctx, p->value.data.copied.length = 0; p->dynamic_table_update_allowed = 2; p->last_error = GRPC_ERROR_NONE; - grpc_chttp2_hptbl_init(exec_ctx, &p->table); + grpc_chttp2_hptbl_init(&p->table); } void grpc_chttp2_hpack_parser_set_has_priority(grpc_chttp2_hpack_parser *p) { @@ -1628,18 +1540,16 @@ void grpc_chttp2_hpack_parser_set_has_priority(grpc_chttp2_hpack_parser *p) { p->state = parse_stream_dep0; } -void grpc_chttp2_hpack_parser_destroy(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p) { - grpc_chttp2_hptbl_destroy(exec_ctx, &p->table); +void grpc_chttp2_hpack_parser_destroy(grpc_chttp2_hpack_parser *p) { + grpc_chttp2_hptbl_destroy(&p->table); GRPC_ERROR_UNREF(p->last_error); - grpc_slice_unref_internal(exec_ctx, p->key.data.referenced); - grpc_slice_unref_internal(exec_ctx, p->value.data.referenced); + grpc_slice_unref_internal(p->key.data.referenced); + grpc_slice_unref_internal(p->value.data.referenced); gpr_free(p->key.data.copied.str); gpr_free(p->value.data.copied.str); } -grpc_error *grpc_chttp2_hpack_parser_parse(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +grpc_error *grpc_chttp2_hpack_parser_parse(grpc_chttp2_hpack_parser *p, grpc_slice slice) { /* max number of bytes to parse at a time... limits call stack depth on * compilers without TCO */ @@ -1650,37 +1560,33 @@ grpc_error *grpc_chttp2_hpack_parser_parse(grpc_exec_ctx *exec_ctx, grpc_error *error = GRPC_ERROR_NONE; while (start != end && error == GRPC_ERROR_NONE) { uint8_t *target = start + GPR_MIN(MAX_PARSE_LENGTH, end - start); - error = p->state(exec_ctx, p, start, target); + error = p->state(p, start, target); start = target; } p->current_slice_refcount = NULL; return error; } -typedef void (*maybe_complete_func_type)(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +typedef void (*maybe_complete_func_type)(grpc_chttp2_transport *t, grpc_chttp2_stream *s); static const maybe_complete_func_type maybe_complete_funcs[] = { grpc_chttp2_maybe_complete_recv_initial_metadata, grpc_chttp2_maybe_complete_recv_trailing_metadata}; -static void force_client_rst_stream(grpc_exec_ctx *exec_ctx, void *sp, - grpc_error *error) { +static void force_client_rst_stream(void *sp, grpc_error *error) { grpc_chttp2_stream *s = (grpc_chttp2_stream *)sp; grpc_chttp2_transport *t = s->t; if (!s->write_closed) { grpc_slice_buffer_add( &t->qbuf, grpc_chttp2_rst_stream_create(s->id, GRPC_HTTP2_NO_ERROR, &s->stats.outgoing)); - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_FORCE_RST_STREAM); - grpc_chttp2_mark_stream_closed(exec_ctx, t, s, true, true, GRPC_ERROR_NONE); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_FORCE_RST_STREAM); + grpc_chttp2_mark_stream_closed(t, s, true, true, GRPC_ERROR_NONE); } - GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "final_rst"); + GRPC_CHTTP2_STREAM_UNREF(s, "final_rst"); } -static void parse_stream_compression_md(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +static void parse_stream_compression_md(grpc_chttp2_transport *t, grpc_chttp2_stream *s, grpc_metadata_batch *initial_metadata) { if (initial_metadata->idx.named.content_encoding == NULL || @@ -1692,8 +1598,7 @@ static void parse_stream_compression_md(grpc_exec_ctx *exec_ctx, } } -grpc_error *grpc_chttp2_header_parser_parse(grpc_exec_ctx *exec_ctx, - void *hpack_parser, +grpc_error *grpc_chttp2_header_parser_parse(void *hpack_parser, grpc_chttp2_transport *t, grpc_chttp2_stream *s, grpc_slice slice, int is_last) { @@ -1702,7 +1607,7 @@ grpc_error *grpc_chttp2_header_parser_parse(grpc_exec_ctx *exec_ctx, if (s != NULL) { s->stats.incoming.header_bytes += GRPC_SLICE_LENGTH(slice); } - grpc_error *error = grpc_chttp2_hpack_parser_parse(exec_ctx, parser, slice); + grpc_error *error = grpc_chttp2_hpack_parser_parse(parser, slice); if (error != GRPC_ERROR_NONE) { GPR_TIMER_END("grpc_chttp2_hpack_parser_parse", 0); return error; @@ -1725,12 +1630,11 @@ grpc_error *grpc_chttp2_header_parser_parse(grpc_exec_ctx *exec_ctx, /* Process stream compression md element if it exists */ if (s->header_frames_received == 0) { /* Only acts on initial metadata */ - parse_stream_compression_md(exec_ctx, t, s, - &s->metadata_buffer[0].batch); + parse_stream_compression_md(t, s, &s->metadata_buffer[0].batch); } s->published_metadata[s->header_frames_received] = GRPC_METADATA_PUBLISHED_FROM_WIRE; - maybe_complete_funcs[s->header_frames_received](exec_ctx, t, s); + maybe_complete_funcs[s->header_frames_received](t, s); s->header_frames_received++; } if (parser->is_eof) { @@ -1741,13 +1645,11 @@ grpc_error *grpc_chttp2_header_parser_parse(grpc_exec_ctx *exec_ctx, and can avoid the extra write */ GRPC_CHTTP2_STREAM_REF(s, "final_rst"); GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_CREATE(force_client_rst_stream, s, grpc_combiner_finally_scheduler(t->combiner)), GRPC_ERROR_NONE); } - grpc_chttp2_mark_stream_closed(exec_ctx, t, s, true, false, - GRPC_ERROR_NONE); + grpc_chttp2_mark_stream_closed(t, s, true, false, GRPC_ERROR_NONE); } } parser->on_header = NULL; diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.h b/src/core/ext/transport/chttp2/transport/hpack_parser.h index 52014175a06..6756f2a1b31 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.h @@ -34,8 +34,7 @@ extern "C" { typedef struct grpc_chttp2_hpack_parser grpc_chttp2_hpack_parser; typedef grpc_error *(*grpc_chttp2_hpack_parser_state)( - grpc_exec_ctx *exec_ctx, grpc_chttp2_hpack_parser *p, const uint8_t *beg, - const uint8_t *end); + grpc_chttp2_hpack_parser *p, const uint8_t *beg, const uint8_t *end); typedef struct { bool copied; @@ -51,7 +50,7 @@ typedef struct { struct grpc_chttp2_hpack_parser { /* user specified callback for each header output */ - void (*on_header)(grpc_exec_ctx *exec_ctx, void *user_data, grpc_mdelem md); + void (*on_header)(void *user_data, grpc_mdelem md); void *on_header_user_data; grpc_error *last_error; @@ -96,21 +95,17 @@ struct grpc_chttp2_hpack_parser { grpc_chttp2_hptbl table; }; -void grpc_chttp2_hpack_parser_init(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p); -void grpc_chttp2_hpack_parser_destroy(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p); +void grpc_chttp2_hpack_parser_init(grpc_chttp2_hpack_parser *p); +void grpc_chttp2_hpack_parser_destroy(grpc_chttp2_hpack_parser *p); void grpc_chttp2_hpack_parser_set_has_priority(grpc_chttp2_hpack_parser *p); -grpc_error *grpc_chttp2_hpack_parser_parse(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hpack_parser *p, +grpc_error *grpc_chttp2_hpack_parser_parse(grpc_chttp2_hpack_parser *p, grpc_slice slice); /* wraps grpc_chttp2_hpack_parser_parse to provide a frame level parser for the transport */ -grpc_error *grpc_chttp2_header_parser_parse(grpc_exec_ctx *exec_ctx, - void *hpack_parser, +grpc_error *grpc_chttp2_header_parser_parse(void *hpack_parser, grpc_chttp2_transport *t, grpc_chttp2_stream *s, grpc_slice slice, int is_last); diff --git a/src/core/ext/transport/chttp2/transport/hpack_table.cc b/src/core/ext/transport/chttp2/transport/hpack_table.cc index 82c284b36e3..c63b7d4c4ee 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_table.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_table.cc @@ -165,7 +165,7 @@ static uint32_t entries_for_bytes(uint32_t bytes) { GRPC_CHTTP2_HPACK_ENTRY_OVERHEAD; } -void grpc_chttp2_hptbl_init(grpc_exec_ctx *exec_ctx, grpc_chttp2_hptbl *tbl) { +void grpc_chttp2_hptbl_init(grpc_chttp2_hptbl *tbl) { size_t i; memset(tbl, 0, sizeof(*tbl)); @@ -177,22 +177,19 @@ void grpc_chttp2_hptbl_init(grpc_exec_ctx *exec_ctx, grpc_chttp2_hptbl *tbl) { memset(tbl->ents, 0, sizeof(*tbl->ents) * tbl->cap_entries); for (i = 1; i <= GRPC_CHTTP2_LAST_STATIC_ENTRY; i++) { tbl->static_ents[i - 1] = grpc_mdelem_from_slices( - exec_ctx, grpc_slice_intern(grpc_slice_from_static_string(static_table[i].key)), grpc_slice_intern( grpc_slice_from_static_string(static_table[i].value))); } } -void grpc_chttp2_hptbl_destroy(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hptbl *tbl) { +void grpc_chttp2_hptbl_destroy(grpc_chttp2_hptbl *tbl) { size_t i; for (i = 0; i < GRPC_CHTTP2_LAST_STATIC_ENTRY; i++) { - GRPC_MDELEM_UNREF(exec_ctx, tbl->static_ents[i]); + GRPC_MDELEM_UNREF(tbl->static_ents[i]); } for (i = 0; i < tbl->num_ents; i++) { - GRPC_MDELEM_UNREF(exec_ctx, - tbl->ents[(tbl->first_ent + i) % tbl->cap_entries]); + GRPC_MDELEM_UNREF(tbl->ents[(tbl->first_ent + i) % tbl->cap_entries]); } gpr_free(tbl->ents); } @@ -215,7 +212,7 @@ grpc_mdelem grpc_chttp2_hptbl_lookup(const grpc_chttp2_hptbl *tbl, } /* Evict one element from the table */ -static void evict1(grpc_exec_ctx *exec_ctx, grpc_chttp2_hptbl *tbl) { +static void evict1(grpc_chttp2_hptbl *tbl) { grpc_mdelem first_ent = tbl->ents[tbl->first_ent]; size_t elem_bytes = GRPC_SLICE_LENGTH(GRPC_MDKEY(first_ent)) + GRPC_SLICE_LENGTH(GRPC_MDVALUE(first_ent)) + @@ -224,7 +221,7 @@ static void evict1(grpc_exec_ctx *exec_ctx, grpc_chttp2_hptbl *tbl) { tbl->mem_used -= (uint32_t)elem_bytes; tbl->first_ent = ((tbl->first_ent + 1) % tbl->cap_entries); tbl->num_ents--; - GRPC_MDELEM_UNREF(exec_ctx, first_ent); + GRPC_MDELEM_UNREF(first_ent); } static void rebuild_ents(grpc_chttp2_hptbl *tbl, uint32_t new_cap) { @@ -240,8 +237,7 @@ static void rebuild_ents(grpc_chttp2_hptbl *tbl, uint32_t new_cap) { tbl->first_ent = 0; } -void grpc_chttp2_hptbl_set_max_bytes(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hptbl *tbl, +void grpc_chttp2_hptbl_set_max_bytes(grpc_chttp2_hptbl *tbl, uint32_t max_bytes) { if (tbl->max_bytes == max_bytes) { return; @@ -250,13 +246,12 @@ void grpc_chttp2_hptbl_set_max_bytes(grpc_exec_ctx *exec_ctx, gpr_log(GPR_DEBUG, "Update hpack parser max size to %d", max_bytes); } while (tbl->mem_used > max_bytes) { - evict1(exec_ctx, tbl); + evict1(tbl); } tbl->max_bytes = max_bytes; } -grpc_error *grpc_chttp2_hptbl_set_current_table_size(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hptbl *tbl, +grpc_error *grpc_chttp2_hptbl_set_current_table_size(grpc_chttp2_hptbl *tbl, uint32_t bytes) { if (tbl->current_table_bytes == bytes) { return GRPC_ERROR_NONE; @@ -274,7 +269,7 @@ grpc_error *grpc_chttp2_hptbl_set_current_table_size(grpc_exec_ctx *exec_ctx, gpr_log(GPR_DEBUG, "Update hpack parser table size to %d", bytes); } while (tbl->mem_used > bytes) { - evict1(exec_ctx, tbl); + evict1(tbl); } tbl->current_table_bytes = bytes; tbl->max_entries = entries_for_bytes(bytes); @@ -289,8 +284,7 @@ grpc_error *grpc_chttp2_hptbl_set_current_table_size(grpc_exec_ctx *exec_ctx, return GRPC_ERROR_NONE; } -grpc_error *grpc_chttp2_hptbl_add(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hptbl *tbl, grpc_mdelem md) { +grpc_error *grpc_chttp2_hptbl_add(grpc_chttp2_hptbl *tbl, grpc_mdelem md) { /* determine how many bytes of buffer this entry represents */ size_t elem_bytes = GRPC_SLICE_LENGTH(GRPC_MDKEY(md)) + GRPC_SLICE_LENGTH(GRPC_MDVALUE(md)) + @@ -320,14 +314,14 @@ grpc_error *grpc_chttp2_hptbl_add(grpc_exec_ctx *exec_ctx, * empty table. */ while (tbl->num_ents) { - evict1(exec_ctx, tbl); + evict1(tbl); } return GRPC_ERROR_NONE; } /* evict entries to ensure no overflow */ while (elem_bytes > (size_t)tbl->current_table_bytes - tbl->mem_used) { - evict1(exec_ctx, tbl); + evict1(tbl); } /* copy the finalized entry in */ diff --git a/src/core/ext/transport/chttp2/transport/hpack_table.h b/src/core/ext/transport/chttp2/transport/hpack_table.h index a3ce2730a89..02bc2afdc4a 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_table.h +++ b/src/core/ext/transport/chttp2/transport/hpack_table.h @@ -73,21 +73,18 @@ typedef struct { } grpc_chttp2_hptbl; /* initialize a hpack table */ -void grpc_chttp2_hptbl_init(grpc_exec_ctx *exec_ctx, grpc_chttp2_hptbl *tbl); -void grpc_chttp2_hptbl_destroy(grpc_exec_ctx *exec_ctx, grpc_chttp2_hptbl *tbl); -void grpc_chttp2_hptbl_set_max_bytes(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hptbl *tbl, +void grpc_chttp2_hptbl_init(grpc_chttp2_hptbl *tbl); +void grpc_chttp2_hptbl_destroy(grpc_chttp2_hptbl *tbl); +void grpc_chttp2_hptbl_set_max_bytes(grpc_chttp2_hptbl *tbl, uint32_t max_bytes); -grpc_error *grpc_chttp2_hptbl_set_current_table_size(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hptbl *tbl, +grpc_error *grpc_chttp2_hptbl_set_current_table_size(grpc_chttp2_hptbl *tbl, uint32_t bytes); /* lookup a table entry based on its hpack index */ grpc_mdelem grpc_chttp2_hptbl_lookup(const grpc_chttp2_hptbl *tbl, uint32_t index); /* add a table entry to the index */ -grpc_error *grpc_chttp2_hptbl_add(grpc_exec_ctx *exec_ctx, - grpc_chttp2_hptbl *tbl, +grpc_error *grpc_chttp2_hptbl_add(grpc_chttp2_hptbl *tbl, grpc_mdelem md) GRPC_MUST_USE_RESULT; /* Find a key/value pair in the table... returns the index in the table of the most similar entry, or 0 if the value was not found */ diff --git a/src/core/ext/transport/chttp2/transport/incoming_metadata.cc b/src/core/ext/transport/chttp2/transport/incoming_metadata.cc index 187ce0ea874..af690dabb25 100644 --- a/src/core/ext/transport/chttp2/transport/incoming_metadata.cc +++ b/src/core/ext/transport/chttp2/transport/incoming_metadata.cc @@ -33,32 +33,30 @@ void grpc_chttp2_incoming_metadata_buffer_init( } void grpc_chttp2_incoming_metadata_buffer_destroy( - grpc_exec_ctx *exec_ctx, grpc_chttp2_incoming_metadata_buffer *buffer) { - grpc_metadata_batch_destroy(exec_ctx, &buffer->batch); + grpc_chttp2_incoming_metadata_buffer *buffer) { + grpc_metadata_batch_destroy(&buffer->batch); } grpc_error *grpc_chttp2_incoming_metadata_buffer_add( - grpc_exec_ctx *exec_ctx, grpc_chttp2_incoming_metadata_buffer *buffer, - grpc_mdelem elem) { + grpc_chttp2_incoming_metadata_buffer *buffer, grpc_mdelem elem) { buffer->size += GRPC_MDELEM_LENGTH(elem); return grpc_metadata_batch_add_tail( - exec_ctx, &buffer->batch, (grpc_linked_mdelem *)gpr_arena_alloc( - buffer->arena, sizeof(grpc_linked_mdelem)), + &buffer->batch, (grpc_linked_mdelem *)gpr_arena_alloc( + buffer->arena, sizeof(grpc_linked_mdelem)), elem); } grpc_error *grpc_chttp2_incoming_metadata_buffer_replace_or_add( - grpc_exec_ctx *exec_ctx, grpc_chttp2_incoming_metadata_buffer *buffer, - grpc_mdelem elem) { + grpc_chttp2_incoming_metadata_buffer *buffer, grpc_mdelem elem) { for (grpc_linked_mdelem *l = buffer->batch.list.head; l != NULL; l = l->next) { if (grpc_slice_eq(GRPC_MDKEY(l->md), GRPC_MDKEY(elem))) { - GRPC_MDELEM_UNREF(exec_ctx, l->md); + GRPC_MDELEM_UNREF(l->md); l->md = elem; return GRPC_ERROR_NONE; } } - return grpc_chttp2_incoming_metadata_buffer_add(exec_ctx, buffer, elem); + return grpc_chttp2_incoming_metadata_buffer_add(buffer, elem); } void grpc_chttp2_incoming_metadata_buffer_set_deadline( @@ -67,8 +65,7 @@ void grpc_chttp2_incoming_metadata_buffer_set_deadline( } void grpc_chttp2_incoming_metadata_buffer_publish( - grpc_exec_ctx *exec_ctx, grpc_chttp2_incoming_metadata_buffer *buffer, - grpc_metadata_batch *batch) { + grpc_chttp2_incoming_metadata_buffer *buffer, grpc_metadata_batch *batch) { *batch = buffer->batch; grpc_metadata_batch_init(&buffer->batch); } diff --git a/src/core/ext/transport/chttp2/transport/incoming_metadata.h b/src/core/ext/transport/chttp2/transport/incoming_metadata.h index a0e01f2c4d2..0075a9b0816 100644 --- a/src/core/ext/transport/chttp2/transport/incoming_metadata.h +++ b/src/core/ext/transport/chttp2/transport/incoming_metadata.h @@ -35,16 +35,15 @@ typedef struct { void grpc_chttp2_incoming_metadata_buffer_init( grpc_chttp2_incoming_metadata_buffer *buffer, gpr_arena *arena); void grpc_chttp2_incoming_metadata_buffer_destroy( - grpc_exec_ctx *exec_ctx, grpc_chttp2_incoming_metadata_buffer *buffer); + grpc_chttp2_incoming_metadata_buffer *buffer); void grpc_chttp2_incoming_metadata_buffer_publish( - grpc_exec_ctx *exec_ctx, grpc_chttp2_incoming_metadata_buffer *buffer, - grpc_metadata_batch *batch); + grpc_chttp2_incoming_metadata_buffer *buffer, grpc_metadata_batch *batch); grpc_error *grpc_chttp2_incoming_metadata_buffer_add( - grpc_exec_ctx *exec_ctx, grpc_chttp2_incoming_metadata_buffer *buffer, + grpc_chttp2_incoming_metadata_buffer *buffer, grpc_mdelem elem) GRPC_MUST_USE_RESULT; grpc_error *grpc_chttp2_incoming_metadata_buffer_replace_or_add( - grpc_exec_ctx *exec_ctx, grpc_chttp2_incoming_metadata_buffer *buffer, + grpc_chttp2_incoming_metadata_buffer *buffer, grpc_mdelem elem) GRPC_MUST_USE_RESULT; void grpc_chttp2_incoming_metadata_buffer_set_deadline( grpc_chttp2_incoming_metadata_buffer *buffer, grpc_millis deadline); diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h index 703f3ba348e..1d5413e7b37 100644 --- a/src/core/ext/transport/chttp2/transport/internal.h +++ b/src/core/ext/transport/chttp2/transport/internal.h @@ -327,8 +327,8 @@ struct grpc_chttp2_transport { struct { /* accept stream callback */ - void (*accept_stream)(grpc_exec_ctx *exec_ctx, void *user_data, - grpc_transport *transport, const void *server_data); + void (*accept_stream)(void *user_data, grpc_transport *transport, + const void *server_data); void *accept_stream_user_data; /** connectivity tracking */ @@ -410,9 +410,8 @@ struct grpc_chttp2_transport { /* active parser */ void *parser_data; grpc_chttp2_stream *incoming_stream; - grpc_error *(*parser)(grpc_exec_ctx *exec_ctx, void *parser_user_data, - grpc_chttp2_transport *t, grpc_chttp2_stream *s, - grpc_slice slice, int is_last); + grpc_error *(*parser)(void *parser_user_data, grpc_chttp2_transport *t, + grpc_chttp2_stream *s, grpc_slice slice, int is_last); /* goaway data */ grpc_status_code goaway_error; @@ -633,8 +632,7 @@ struct grpc_chttp2_stream { The actual call chain is documented in the implementation of this function. */ -void grpc_chttp2_initiate_write(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +void grpc_chttp2_initiate_write(grpc_chttp2_transport *t, grpc_chttp2_initiate_write_reason reason); typedef struct { @@ -647,14 +645,12 @@ typedef struct { } grpc_chttp2_begin_write_result; grpc_chttp2_begin_write_result grpc_chttp2_begin_write( - grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t); -void grpc_chttp2_end_write(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, - grpc_error *error); + grpc_chttp2_transport *t); +void grpc_chttp2_end_write(grpc_chttp2_transport *t, grpc_error *error); /** Process one slice of incoming data; return 1 if the connection is still viable after reading, or 0 if the connection should be torn down */ -grpc_error *grpc_chttp2_perform_read(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +grpc_error *grpc_chttp2_perform_read(grpc_chttp2_transport *t, grpc_slice slice); bool grpc_chttp2_list_add_writable_stream(grpc_chttp2_transport *t, @@ -759,12 +755,10 @@ typedef struct { // Reads the flow control data and returns and actionable struct that will tell // chttp2 exactly what it needs to do grpc_chttp2_flowctl_action grpc_chttp2_flowctl_get_action( - grpc_exec_ctx *exec_ctx, grpc_chttp2_transport_flowctl *tfc, - grpc_chttp2_stream_flowctl *sfc); + grpc_chttp2_transport_flowctl *tfc, grpc_chttp2_stream_flowctl *sfc); // Takes in a flow control action and performs all the needed operations. -void grpc_chttp2_act_on_flowctl_action(grpc_exec_ctx *exec_ctx, - grpc_chttp2_flowctl_action action, +void grpc_chttp2_act_on_flowctl_action(grpc_chttp2_flowctl_action action, grpc_chttp2_transport *t, grpc_chttp2_stream *s); @@ -772,20 +766,16 @@ void grpc_chttp2_act_on_flowctl_action(grpc_exec_ctx *exec_ctx, grpc_chttp2_stream *grpc_chttp2_parsing_lookup_stream(grpc_chttp2_transport *t, uint32_t id); -grpc_chttp2_stream *grpc_chttp2_parsing_accept_stream(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +grpc_chttp2_stream *grpc_chttp2_parsing_accept_stream(grpc_chttp2_transport *t, uint32_t id); -void grpc_chttp2_add_incoming_goaway(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +void grpc_chttp2_add_incoming_goaway(grpc_chttp2_transport *t, uint32_t goaway_error, grpc_slice goaway_text); -void grpc_chttp2_parsing_become_skip_parser(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t); +void grpc_chttp2_parsing_become_skip_parser(grpc_chttp2_transport *t); -void grpc_chttp2_complete_closure_step(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +void grpc_chttp2_complete_closure_step(grpc_chttp2_transport *t, grpc_chttp2_stream *s, grpc_closure **pclosure, grpc_error *error, const char *desc); @@ -816,29 +806,26 @@ extern grpc_tracer_flag grpc_flowctl_trace; else \ stmt -void grpc_chttp2_fake_status(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, +void grpc_chttp2_fake_status(grpc_chttp2_transport *t, grpc_chttp2_stream *stream, grpc_error *error); -void grpc_chttp2_mark_stream_closed(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +void grpc_chttp2_mark_stream_closed(grpc_chttp2_transport *t, grpc_chttp2_stream *s, int close_reads, int close_writes, grpc_error *error); -void grpc_chttp2_start_writing(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t); +void grpc_chttp2_start_writing(grpc_chttp2_transport *t); #ifndef NDEBUG #define GRPC_CHTTP2_STREAM_REF(stream, reason) \ grpc_chttp2_stream_ref(stream, reason) -#define GRPC_CHTTP2_STREAM_UNREF(exec_ctx, stream, reason) \ - grpc_chttp2_stream_unref(exec_ctx, stream, reason) +#define GRPC_CHTTP2_STREAM_UNREF(stream, reason) \ + grpc_chttp2_stream_unref(stream, reason) void grpc_chttp2_stream_ref(grpc_chttp2_stream *s, const char *reason); -void grpc_chttp2_stream_unref(grpc_exec_ctx *exec_ctx, grpc_chttp2_stream *s, - const char *reason); +void grpc_chttp2_stream_unref(grpc_chttp2_stream *s, const char *reason); #else #define GRPC_CHTTP2_STREAM_REF(stream, reason) grpc_chttp2_stream_ref(stream) -#define GRPC_CHTTP2_STREAM_UNREF(exec_ctx, stream, reason) \ - grpc_chttp2_stream_unref(exec_ctx, stream) +#define GRPC_CHTTP2_STREAM_UNREF(stream, reason) \ + grpc_chttp2_stream_unref(stream) void grpc_chttp2_stream_ref(grpc_chttp2_stream *s); -void grpc_chttp2_stream_unref(grpc_exec_ctx *exec_ctx, grpc_chttp2_stream *s); +void grpc_chttp2_stream_unref(grpc_chttp2_stream *s); #endif #ifndef NDEBUG @@ -846,64 +833,53 @@ void grpc_chttp2_stream_unref(grpc_exec_ctx *exec_ctx, grpc_chttp2_stream *s); grpc_chttp2_ref_transport(t, r, __FILE__, __LINE__) #define GRPC_CHTTP2_UNREF_TRANSPORT(cl, t, r) \ grpc_chttp2_unref_transport(cl, t, r, __FILE__, __LINE__) -void grpc_chttp2_unref_transport(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, const char *reason, +void grpc_chttp2_unref_transport(grpc_chttp2_transport *t, const char *reason, const char *file, int line); void grpc_chttp2_ref_transport(grpc_chttp2_transport *t, const char *reason, const char *file, int line); #else #define GRPC_CHTTP2_REF_TRANSPORT(t, r) grpc_chttp2_ref_transport(t) -#define GRPC_CHTTP2_UNREF_TRANSPORT(cl, t, r) grpc_chttp2_unref_transport(cl, t) -void grpc_chttp2_unref_transport(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t); +#define GRPC_CHTTP2_UNREF_TRANSPORT(t, r) grpc_chttp2_unref_transport(t) +void grpc_chttp2_unref_transport(grpc_chttp2_transport *t); void grpc_chttp2_ref_transport(grpc_chttp2_transport *t); #endif grpc_chttp2_incoming_byte_stream *grpc_chttp2_incoming_byte_stream_create( - grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, grpc_chttp2_stream *s, - uint32_t frame_size, uint32_t flags); + grpc_chttp2_transport *t, grpc_chttp2_stream *s, uint32_t frame_size, + uint32_t flags); grpc_error *grpc_chttp2_incoming_byte_stream_push( - grpc_exec_ctx *exec_ctx, grpc_chttp2_incoming_byte_stream *bs, - grpc_slice slice, grpc_slice *slice_out); + grpc_chttp2_incoming_byte_stream *bs, grpc_slice slice, + grpc_slice *slice_out); grpc_error *grpc_chttp2_incoming_byte_stream_finished( - grpc_exec_ctx *exec_ctx, grpc_chttp2_incoming_byte_stream *bs, - grpc_error *error, bool reset_on_error); + grpc_chttp2_incoming_byte_stream *bs, grpc_error *error, + bool reset_on_error); void grpc_chttp2_incoming_byte_stream_notify( - grpc_exec_ctx *exec_ctx, grpc_chttp2_incoming_byte_stream *bs, - grpc_error *error); + grpc_chttp2_incoming_byte_stream *bs, grpc_error *error); -void grpc_chttp2_ack_ping(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, - uint64_t id); +void grpc_chttp2_ack_ping(grpc_chttp2_transport *t, uint64_t id); /** Add a new ping strike to ping_recv_state.ping_strikes. If ping_recv_state.ping_strikes > ping_policy.max_ping_strikes, it sends GOAWAY with error code ENHANCE_YOUR_CALM and additional debug data resembling "too_many_pings" followed by immediately closing the connection. */ -void grpc_chttp2_add_ping_strike(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t); +void grpc_chttp2_add_ping_strike(grpc_chttp2_transport *t); /** add a ref to the stream and add it to the writable list; ref will be dropped in writing.c */ -void grpc_chttp2_mark_stream_writable(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +void grpc_chttp2_mark_stream_writable(grpc_chttp2_transport *t, grpc_chttp2_stream *s); -void grpc_chttp2_cancel_stream(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, grpc_chttp2_stream *s, +void grpc_chttp2_cancel_stream(grpc_chttp2_transport *t, grpc_chttp2_stream *s, grpc_error *due_to_error); -void grpc_chttp2_maybe_complete_recv_initial_metadata(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +void grpc_chttp2_maybe_complete_recv_initial_metadata(grpc_chttp2_transport *t, grpc_chttp2_stream *s); -void grpc_chttp2_maybe_complete_recv_message(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +void grpc_chttp2_maybe_complete_recv_message(grpc_chttp2_transport *t, grpc_chttp2_stream *s); -void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_chttp2_transport *t, grpc_chttp2_stream *s); -void grpc_chttp2_fail_pending_writes(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +void grpc_chttp2_fail_pending_writes(grpc_chttp2_transport *t, grpc_chttp2_stream *s, grpc_error *error); /** Set the default keepalive configurations, must only be called at diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index 78886b497a7..cbc8d736f4a 100644 --- a/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/src/core/ext/transport/chttp2/transport/parsing.cc @@ -31,33 +31,22 @@ #include "src/core/lib/transport/status_conversion.h" #include "src/core/lib/transport/timeout_encoding.h" -static grpc_error *init_frame_parser(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t); -static grpc_error *init_header_frame_parser(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +static grpc_error *init_frame_parser(grpc_chttp2_transport *t); +static grpc_error *init_header_frame_parser(grpc_chttp2_transport *t, int is_continuation); -static grpc_error *init_data_frame_parser(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t); -static grpc_error *init_rst_stream_parser(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t); -static grpc_error *init_settings_frame_parser(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t); -static grpc_error *init_window_update_frame_parser(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t); -static grpc_error *init_ping_parser(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t); -static grpc_error *init_goaway_parser(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t); -static grpc_error *init_skip_frame_parser(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +static grpc_error *init_data_frame_parser(grpc_chttp2_transport *t); +static grpc_error *init_rst_stream_parser(grpc_chttp2_transport *t); +static grpc_error *init_settings_frame_parser(grpc_chttp2_transport *t); +static grpc_error *init_window_update_frame_parser(grpc_chttp2_transport *t); +static grpc_error *init_ping_parser(grpc_chttp2_transport *t); +static grpc_error *init_goaway_parser(grpc_chttp2_transport *t); +static grpc_error *init_skip_frame_parser(grpc_chttp2_transport *t, int is_header); -static grpc_error *parse_frame_slice(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, grpc_slice slice, +static grpc_error *parse_frame_slice(grpc_chttp2_transport *t, grpc_slice slice, int is_last); -grpc_error *grpc_chttp2_perform_read(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +grpc_error *grpc_chttp2_perform_read(grpc_chttp2_transport *t, grpc_slice slice) { uint8_t *beg = GRPC_SLICE_START_PTR(slice); uint8_t *end = GRPC_SLICE_END_PTR(slice); @@ -182,12 +171,12 @@ grpc_error *grpc_chttp2_perform_read(grpc_exec_ctx *exec_ctx, GPR_ASSERT(cur < end); t->incoming_stream_id |= ((uint32_t)*cur); t->deframe_state = GRPC_DTS_FRAME; - err = init_frame_parser(exec_ctx, t); + err = init_frame_parser(t); if (err != GRPC_ERROR_NONE) { return err; } if (t->incoming_frame_size == 0) { - err = parse_frame_slice(exec_ctx, t, grpc_empty_slice(), 1); + err = parse_frame_slice(t, grpc_empty_slice(), 1); if (err != GRPC_ERROR_NONE) { return err; } @@ -217,8 +206,8 @@ grpc_error *grpc_chttp2_perform_read(grpc_exec_ctx *exec_ctx, GPR_ASSERT(cur < end); if ((uint32_t)(end - cur) == t->incoming_frame_size) { err = parse_frame_slice( - exec_ctx, t, grpc_slice_sub_no_ref(slice, (size_t)(cur - beg), - (size_t)(end - beg)), + t, grpc_slice_sub_no_ref(slice, (size_t)(cur - beg), + (size_t)(end - beg)), 1); if (err != GRPC_ERROR_NONE) { return err; @@ -229,9 +218,8 @@ grpc_error *grpc_chttp2_perform_read(grpc_exec_ctx *exec_ctx, } else if ((uint32_t)(end - cur) > t->incoming_frame_size) { size_t cur_offset = (size_t)(cur - beg); err = parse_frame_slice( - exec_ctx, t, - grpc_slice_sub_no_ref(slice, cur_offset, - cur_offset + t->incoming_frame_size), + t, grpc_slice_sub_no_ref(slice, cur_offset, + cur_offset + t->incoming_frame_size), 1); if (err != GRPC_ERROR_NONE) { return err; @@ -241,8 +229,8 @@ grpc_error *grpc_chttp2_perform_read(grpc_exec_ctx *exec_ctx, goto dts_fh_0; /* loop */ } else { err = parse_frame_slice( - exec_ctx, t, grpc_slice_sub_no_ref(slice, (size_t)(cur - beg), - (size_t)(end - beg)), + t, grpc_slice_sub_no_ref(slice, (size_t)(cur - beg), + (size_t)(end - beg)), 0); if (err != GRPC_ERROR_NONE) { return err; @@ -256,8 +244,7 @@ grpc_error *grpc_chttp2_perform_read(grpc_exec_ctx *exec_ctx, GPR_UNREACHABLE_CODE(return 0); } -static grpc_error *init_frame_parser(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t) { +static grpc_error *init_frame_parser(grpc_chttp2_transport *t) { if (t->is_first_frame && t->incoming_frame_type != GRPC_CHTTP2_FRAME_SETTINGS) { char *msg; @@ -289,46 +276,43 @@ static grpc_error *init_frame_parser(grpc_exec_ctx *exec_ctx, gpr_free(msg); return err; } - return init_header_frame_parser(exec_ctx, t, 1); + return init_header_frame_parser(t, 1); } switch (t->incoming_frame_type) { case GRPC_CHTTP2_FRAME_DATA: - return init_data_frame_parser(exec_ctx, t); + return init_data_frame_parser(t); case GRPC_CHTTP2_FRAME_HEADER: - return init_header_frame_parser(exec_ctx, t, 0); + return init_header_frame_parser(t, 0); case GRPC_CHTTP2_FRAME_CONTINUATION: return GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Unexpected CONTINUATION frame"); case GRPC_CHTTP2_FRAME_RST_STREAM: - return init_rst_stream_parser(exec_ctx, t); + return init_rst_stream_parser(t); case GRPC_CHTTP2_FRAME_SETTINGS: - return init_settings_frame_parser(exec_ctx, t); + return init_settings_frame_parser(t); case GRPC_CHTTP2_FRAME_WINDOW_UPDATE: - return init_window_update_frame_parser(exec_ctx, t); + return init_window_update_frame_parser(t); case GRPC_CHTTP2_FRAME_PING: - return init_ping_parser(exec_ctx, t); + return init_ping_parser(t); case GRPC_CHTTP2_FRAME_GOAWAY: - return init_goaway_parser(exec_ctx, t); + return init_goaway_parser(t); default: if (GRPC_TRACER_ON(grpc_http_trace)) { gpr_log(GPR_ERROR, "Unknown frame type %02x", t->incoming_frame_type); } - return init_skip_frame_parser(exec_ctx, t, 0); + return init_skip_frame_parser(t, 0); } } -static grpc_error *skip_parser(grpc_exec_ctx *exec_ctx, void *parser, - grpc_chttp2_transport *t, grpc_chttp2_stream *s, - grpc_slice slice, int is_last) { +static grpc_error *skip_parser(void *parser, grpc_chttp2_transport *t, + grpc_chttp2_stream *s, grpc_slice slice, + int is_last) { return GRPC_ERROR_NONE; } -static void skip_header(grpc_exec_ctx *exec_ctx, void *tp, grpc_mdelem md) { - GRPC_MDELEM_UNREF(exec_ctx, md); -} +static void skip_header(void *tp, grpc_mdelem md) { GRPC_MDELEM_UNREF(md); } -static grpc_error *init_skip_frame_parser(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +static grpc_error *init_skip_frame_parser(grpc_chttp2_transport *t, int is_header) { if (is_header) { uint8_t is_eoh = t->expect_continuation_stream_id != 0; @@ -344,14 +328,11 @@ static grpc_error *init_skip_frame_parser(grpc_exec_ctx *exec_ctx, return GRPC_ERROR_NONE; } -void grpc_chttp2_parsing_become_skip_parser(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t) { - init_skip_frame_parser(exec_ctx, t, - t->parser == grpc_chttp2_header_parser_parse); +void grpc_chttp2_parsing_become_skip_parser(grpc_chttp2_transport *t) { + init_skip_frame_parser(t, t->parser == grpc_chttp2_header_parser_parse); } -static grpc_error *init_data_frame_parser(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t) { +static grpc_error *init_data_frame_parser(grpc_chttp2_transport *t) { grpc_chttp2_stream *s = grpc_chttp2_parsing_lookup_stream(t, t->incoming_stream_id); grpc_error *err = GRPC_ERROR_NONE; @@ -359,20 +340,19 @@ static grpc_error *init_data_frame_parser(grpc_exec_ctx *exec_ctx, s == NULL ? NULL : &s->flow_control, t->incoming_frame_size); grpc_chttp2_act_on_flowctl_action( - exec_ctx, - grpc_chttp2_flowctl_get_action(exec_ctx, &t->flow_control, + grpc_chttp2_flowctl_get_action(&t->flow_control, s == NULL ? NULL : &s->flow_control), t, s); if (err != GRPC_ERROR_NONE) { goto error_handler; } if (s == NULL) { - return init_skip_frame_parser(exec_ctx, t, 0); + return init_skip_frame_parser(t, 0); } s->received_bytes += t->incoming_frame_size; s->stats.incoming.framing_bytes += 9; if (err == GRPC_ERROR_NONE && s->read_closed) { - return init_skip_frame_parser(exec_ctx, t, 0); + return init_skip_frame_parser(t, 0); } if (err == GRPC_ERROR_NONE) { err = grpc_chttp2_data_parser_begin_frame( @@ -391,13 +371,13 @@ error_handler: } else if (grpc_error_get_int(err, GRPC_ERROR_INT_STREAM_ID, NULL)) { /* handle stream errors by closing the stream */ if (s != NULL) { - grpc_chttp2_mark_stream_closed(exec_ctx, t, s, true, false, err); + grpc_chttp2_mark_stream_closed(t, s, true, false, err); } grpc_slice_buffer_add( &t->qbuf, grpc_chttp2_rst_stream_create(t->incoming_stream_id, GRPC_HTTP2_PROTOCOL_ERROR, &s->stats.outgoing)); - return init_skip_frame_parser(exec_ctx, t, 0); + return init_skip_frame_parser(t, 0); } else { return err; } @@ -405,8 +385,7 @@ error_handler: static void free_timeout(void *p) { gpr_free(p); } -static void on_initial_header(grpc_exec_ctx *exec_ctx, void *tp, - grpc_mdelem md) { +static void on_initial_header(void *tp, grpc_mdelem md) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)tp; grpc_chttp2_stream *s = t->incoming_stream; @@ -450,9 +429,9 @@ static void on_initial_header(grpc_exec_ctx *exec_ctx, void *tp, } if (timeout != GRPC_MILLIS_INF_FUTURE) { grpc_chttp2_incoming_metadata_buffer_set_deadline( - &s->metadata_buffer[0], grpc_exec_ctx_now(exec_ctx) + timeout); + &s->metadata_buffer[0], grpc_exec_ctx_now() + timeout); } - GRPC_MDELEM_UNREF(exec_ctx, md); + GRPC_MDELEM_UNREF(md); } else { const size_t new_size = s->metadata_buffer[0].size + GRPC_MDELEM_LENGTH(md); const size_t metadata_size_limit = @@ -464,22 +443,22 @@ static void on_initial_header(grpc_exec_ctx *exec_ctx, void *tp, " vs. %" PRIuPTR ")", new_size, metadata_size_limit); grpc_chttp2_cancel_stream( - exec_ctx, t, s, + t, s, grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "received initial metadata size exceeds limit"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_RESOURCE_EXHAUSTED)); - grpc_chttp2_parsing_become_skip_parser(exec_ctx, t); + grpc_chttp2_parsing_become_skip_parser(t); s->seen_error = true; - GRPC_MDELEM_UNREF(exec_ctx, md); + GRPC_MDELEM_UNREF(md); } else { - grpc_error *error = grpc_chttp2_incoming_metadata_buffer_add( - exec_ctx, &s->metadata_buffer[0], md); + grpc_error *error = + grpc_chttp2_incoming_metadata_buffer_add(&s->metadata_buffer[0], md); if (error != GRPC_ERROR_NONE) { - grpc_chttp2_cancel_stream(exec_ctx, t, s, error); - grpc_chttp2_parsing_become_skip_parser(exec_ctx, t); + grpc_chttp2_cancel_stream(t, s, error); + grpc_chttp2_parsing_become_skip_parser(t); s->seen_error = true; - GRPC_MDELEM_UNREF(exec_ctx, md); + GRPC_MDELEM_UNREF(md); } } } @@ -487,8 +466,7 @@ static void on_initial_header(grpc_exec_ctx *exec_ctx, void *tp, GPR_TIMER_END("on_initial_header", 0); } -static void on_trailing_header(grpc_exec_ctx *exec_ctx, void *tp, - grpc_mdelem md) { +static void on_trailing_header(void *tp, grpc_mdelem md) { grpc_chttp2_transport *t = (grpc_chttp2_transport *)tp; grpc_chttp2_stream *s = t->incoming_stream; @@ -522,30 +500,28 @@ static void on_trailing_header(grpc_exec_ctx *exec_ctx, void *tp, " vs. %" PRIuPTR ")", new_size, metadata_size_limit); grpc_chttp2_cancel_stream( - exec_ctx, t, s, - grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "received trailing metadata size exceeds limit"), - GRPC_ERROR_INT_GRPC_STATUS, - GRPC_STATUS_RESOURCE_EXHAUSTED)); - grpc_chttp2_parsing_become_skip_parser(exec_ctx, t); + t, s, grpc_error_set_int( + GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "received trailing metadata size exceeds limit"), + GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_RESOURCE_EXHAUSTED)); + grpc_chttp2_parsing_become_skip_parser(t); s->seen_error = true; - GRPC_MDELEM_UNREF(exec_ctx, md); + GRPC_MDELEM_UNREF(md); } else { - grpc_error *error = grpc_chttp2_incoming_metadata_buffer_add( - exec_ctx, &s->metadata_buffer[1], md); + grpc_error *error = + grpc_chttp2_incoming_metadata_buffer_add(&s->metadata_buffer[1], md); if (error != GRPC_ERROR_NONE) { - grpc_chttp2_cancel_stream(exec_ctx, t, s, error); - grpc_chttp2_parsing_become_skip_parser(exec_ctx, t); + grpc_chttp2_cancel_stream(t, s, error); + grpc_chttp2_parsing_become_skip_parser(t); s->seen_error = true; - GRPC_MDELEM_UNREF(exec_ctx, md); + GRPC_MDELEM_UNREF(md); } } GPR_TIMER_END("on_trailing_header", 0); } -static grpc_error *init_header_frame_parser(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, +static grpc_error *init_header_frame_parser(grpc_chttp2_transport *t, int is_continuation) { uint8_t is_eoh = (t->incoming_frame_flags & GRPC_CHTTP2_DATA_FLAG_END_HEADERS) != 0; @@ -575,7 +551,7 @@ static grpc_error *init_header_frame_parser(grpc_exec_ctx *exec_ctx, GRPC_CHTTP2_IF_TRACING( gpr_log(GPR_ERROR, "grpc_chttp2_stream disbanded before CONTINUATION received")); - return init_skip_frame_parser(exec_ctx, t, 1); + return init_skip_frame_parser(t, 1); } if (t->is_client) { if ((t->incoming_stream_id & 1) && @@ -585,7 +561,7 @@ static grpc_error *init_header_frame_parser(grpc_exec_ctx *exec_ctx, GRPC_CHTTP2_IF_TRACING(gpr_log( GPR_ERROR, "ignoring new grpc_chttp2_stream creation on client")); } - return init_skip_frame_parser(exec_ctx, t, 1); + return init_skip_frame_parser(t, 1); } else if (t->last_new_stream_id >= t->incoming_stream_id) { GRPC_CHTTP2_IF_TRACING(gpr_log( GPR_ERROR, @@ -593,13 +569,13 @@ static grpc_error *init_header_frame_parser(grpc_exec_ctx *exec_ctx, "last grpc_chttp2_stream " "id=%d, new grpc_chttp2_stream id=%d", t->last_new_stream_id, t->incoming_stream_id)); - return init_skip_frame_parser(exec_ctx, t, 1); + return init_skip_frame_parser(t, 1); } else if ((t->incoming_stream_id & 1) == 0) { GRPC_CHTTP2_IF_TRACING(gpr_log( GPR_ERROR, "ignoring grpc_chttp2_stream with non-client generated index %d", t->incoming_stream_id)); - return init_skip_frame_parser(exec_ctx, t, 1); + return init_skip_frame_parser(t, 1); } else if (grpc_chttp2_stream_map_size(&t->stream_map) >= t->settings[GRPC_ACKED_SETTINGS] [GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS]) { @@ -607,11 +583,11 @@ static grpc_error *init_header_frame_parser(grpc_exec_ctx *exec_ctx, } t->last_new_stream_id = t->incoming_stream_id; s = t->incoming_stream = - grpc_chttp2_parsing_accept_stream(exec_ctx, t, t->incoming_stream_id); + grpc_chttp2_parsing_accept_stream(t, t->incoming_stream_id); if (s == NULL) { GRPC_CHTTP2_IF_TRACING( gpr_log(GPR_ERROR, "grpc_chttp2_stream not accepted")); - return init_skip_frame_parser(exec_ctx, t, 1); + return init_skip_frame_parser(t, 1); } } else { t->incoming_stream = s; @@ -622,7 +598,7 @@ static grpc_error *init_header_frame_parser(grpc_exec_ctx *exec_ctx, GRPC_CHTTP2_IF_TRACING(gpr_log( GPR_ERROR, "skipping already closed grpc_chttp2_stream header")); t->incoming_stream = NULL; - return init_skip_frame_parser(exec_ctx, t, 1); + return init_skip_frame_parser(t, 1); } t->parser = grpc_chttp2_header_parser_parse; t->parser_data = &t->hpack_parser; @@ -647,7 +623,7 @@ static grpc_error *init_header_frame_parser(grpc_exec_ctx *exec_ctx, break; case 2: gpr_log(GPR_ERROR, "too many header frames received"); - return init_skip_frame_parser(exec_ctx, t, 1); + return init_skip_frame_parser(t, 1); } t->hpack_parser.on_header_user_data = t; t->hpack_parser.is_boundary = is_eoh; @@ -659,8 +635,7 @@ static grpc_error *init_header_frame_parser(grpc_exec_ctx *exec_ctx, return GRPC_ERROR_NONE; } -static grpc_error *init_window_update_frame_parser(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t) { +static grpc_error *init_window_update_frame_parser(grpc_chttp2_transport *t) { grpc_error *err = grpc_chttp2_window_update_parser_begin_frame( &t->simple.window_update, t->incoming_frame_size, t->incoming_frame_flags); @@ -669,7 +644,7 @@ static grpc_error *init_window_update_frame_parser(grpc_exec_ctx *exec_ctx, grpc_chttp2_stream *s = t->incoming_stream = grpc_chttp2_parsing_lookup_stream(t, t->incoming_stream_id); if (s == NULL) { - return init_skip_frame_parser(exec_ctx, t, 0); + return init_skip_frame_parser(t, 0); } s->stats.incoming.framing_bytes += 9; } @@ -678,8 +653,7 @@ static grpc_error *init_window_update_frame_parser(grpc_exec_ctx *exec_ctx, return GRPC_ERROR_NONE; } -static grpc_error *init_ping_parser(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t) { +static grpc_error *init_ping_parser(grpc_chttp2_transport *t) { grpc_error *err = grpc_chttp2_ping_parser_begin_frame( &t->simple.ping, t->incoming_frame_size, t->incoming_frame_flags); if (err != GRPC_ERROR_NONE) return err; @@ -688,15 +662,14 @@ static grpc_error *init_ping_parser(grpc_exec_ctx *exec_ctx, return GRPC_ERROR_NONE; } -static grpc_error *init_rst_stream_parser(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t) { +static grpc_error *init_rst_stream_parser(grpc_chttp2_transport *t) { grpc_error *err = grpc_chttp2_rst_stream_parser_begin_frame( &t->simple.rst_stream, t->incoming_frame_size, t->incoming_frame_flags); if (err != GRPC_ERROR_NONE) return err; grpc_chttp2_stream *s = t->incoming_stream = grpc_chttp2_parsing_lookup_stream(t, t->incoming_stream_id); if (!t->incoming_stream) { - return init_skip_frame_parser(exec_ctx, t, 0); + return init_skip_frame_parser(t, 0); } s->stats.incoming.framing_bytes += 9; t->parser = grpc_chttp2_rst_stream_parser_parse; @@ -704,8 +677,7 @@ static grpc_error *init_rst_stream_parser(grpc_exec_ctx *exec_ctx, return GRPC_ERROR_NONE; } -static grpc_error *init_goaway_parser(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t) { +static grpc_error *init_goaway_parser(grpc_chttp2_transport *t) { grpc_error *err = grpc_chttp2_goaway_parser_begin_frame( &t->goaway_parser, t->incoming_frame_size, t->incoming_frame_flags); if (err != GRPC_ERROR_NONE) return err; @@ -714,8 +686,7 @@ static grpc_error *init_goaway_parser(grpc_exec_ctx *exec_ctx, return GRPC_ERROR_NONE; } -static grpc_error *init_settings_frame_parser(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t) { +static grpc_error *init_settings_frame_parser(grpc_chttp2_transport *t) { if (t->incoming_stream_id != 0) { return GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Settings frame received for grpc_chttp2_stream"); @@ -731,7 +702,7 @@ static grpc_error *init_settings_frame_parser(grpc_exec_ctx *exec_ctx, memcpy(t->settings[GRPC_ACKED_SETTINGS], t->settings[GRPC_SENT_SETTINGS], GRPC_CHTTP2_NUM_SETTINGS * sizeof(uint32_t)); grpc_chttp2_hptbl_set_max_bytes( - exec_ctx, &t->hpack_parser.table, + &t->hpack_parser.table, t->settings[GRPC_ACKED_SETTINGS] [GRPC_CHTTP2_SETTINGS_HEADER_TABLE_SIZE]); t->sent_local_settings = 0; @@ -741,11 +712,10 @@ static grpc_error *init_settings_frame_parser(grpc_exec_ctx *exec_ctx, return GRPC_ERROR_NONE; } -static grpc_error *parse_frame_slice(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t, grpc_slice slice, +static grpc_error *parse_frame_slice(grpc_chttp2_transport *t, grpc_slice slice, int is_last) { grpc_chttp2_stream *s = t->incoming_stream; - grpc_error *err = t->parser(exec_ctx, t->parser_data, t, s, slice, is_last); + grpc_error *err = t->parser(t->parser_data, t, s, slice, is_last); if (err == GRPC_ERROR_NONE) { return err; } else if (grpc_error_get_int(err, GRPC_ERROR_INT_STREAM_ID, NULL)) { @@ -753,7 +723,7 @@ static grpc_error *parse_frame_slice(grpc_exec_ctx *exec_ctx, const char *msg = grpc_error_string(err); gpr_log(GPR_ERROR, "%s", msg); } - grpc_chttp2_parsing_become_skip_parser(exec_ctx, t); + grpc_chttp2_parsing_become_skip_parser(t); if (s) { s->forced_close_error = err; grpc_slice_buffer_add( diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc index c6fecf2ee90..10e080dd352 100644 --- a/src/core/ext/transport/chttp2/transport/writing.cc +++ b/src/core/ext/transport/chttp2/transport/writing.cc @@ -33,17 +33,15 @@ static void add_to_write_list(grpc_chttp2_write_cb **list, *list = cb; } -static void finish_write_cb(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, - grpc_chttp2_stream *s, grpc_chttp2_write_cb *cb, - grpc_error *error) { - grpc_chttp2_complete_closure_step(exec_ctx, t, s, &cb->closure, error, +static void finish_write_cb(grpc_chttp2_transport *t, grpc_chttp2_stream *s, + grpc_chttp2_write_cb *cb, grpc_error *error) { + grpc_chttp2_complete_closure_step(t, s, &cb->closure, error, "finish_write_cb"); cb->next = t->write_cb_pool; t->write_cb_pool = cb; } -static void maybe_initiate_ping(grpc_exec_ctx *exec_ctx, - grpc_chttp2_transport *t) { +static void maybe_initiate_ping(grpc_chttp2_transport *t) { grpc_chttp2_ping_queue *pq = &t->ping_queue; if (grpc_closure_list_empty(pq->lists[GRPC_CHTTP2_PCL_NEXT])) { /* no ping needed: wait */ @@ -70,7 +68,7 @@ static void maybe_initiate_ping(grpc_exec_ctx *exec_ctx, } return; } - grpc_millis now = grpc_exec_ctx_now(exec_ctx); + grpc_millis now = grpc_exec_ctx_now(); grpc_millis next_allowed_ping = t->ping_state.last_ping_sent_time + t->ping_policy.min_sent_ping_interval_without_data; @@ -89,19 +87,19 @@ static void maybe_initiate_ping(grpc_exec_ctx *exec_ctx, } if (!t->ping_state.is_delayed_ping_timer_set) { t->ping_state.is_delayed_ping_timer_set = true; - grpc_timer_init(exec_ctx, &t->ping_state.delayed_ping_timer, - next_allowed_ping, &t->retry_initiate_ping_locked); + grpc_timer_init(&t->ping_state.delayed_ping_timer, next_allowed_ping, + &t->retry_initiate_ping_locked); } return; } pq->inflight_id = t->ping_ctr; t->ping_ctr++; - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pq->lists[GRPC_CHTTP2_PCL_INITIATE]); + GRPC_CLOSURE_LIST_SCHED(&pq->lists[GRPC_CHTTP2_PCL_INITIATE]); grpc_closure_list_move(&pq->lists[GRPC_CHTTP2_PCL_NEXT], &pq->lists[GRPC_CHTTP2_PCL_INFLIGHT]); grpc_slice_buffer_add(&t->outbuf, grpc_chttp2_ping_create(false, pq->inflight_id)); - GRPC_STATS_INC_HTTP2_PINGS_SENT(exec_ctx); + GRPC_STATS_INC_HTTP2_PINGS_SENT(); t->ping_state.last_ping_sent_time = now; if (GRPC_TRACER_ON(grpc_http_trace) || GRPC_TRACER_ON(grpc_bdp_estimator_trace)) { @@ -114,10 +112,9 @@ static void maybe_initiate_ping(grpc_exec_ctx *exec_ctx, (t->ping_state.pings_before_data_required != 0); } -static bool update_list(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, - grpc_chttp2_stream *s, int64_t send_bytes, - grpc_chttp2_write_cb **list, int64_t *ctr, - grpc_error *error) { +static bool update_list(grpc_chttp2_transport *t, grpc_chttp2_stream *s, + int64_t send_bytes, grpc_chttp2_write_cb **list, + int64_t *ctr, grpc_error *error) { bool sched_any = false; grpc_chttp2_write_cb *cb = *list; *list = NULL; @@ -126,7 +123,7 @@ static bool update_list(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, grpc_chttp2_write_cb *next = cb->next; if (cb->call_at_byte <= *ctr) { sched_any = true; - finish_write_cb(exec_ctx, t, s, cb, GRPC_ERROR_REF(error)); + finish_write_cb(t, s, cb, GRPC_ERROR_REF(error)); } else { add_to_write_list(list, cb); } @@ -179,22 +176,22 @@ class StreamWriteContext; class WriteContext { public: - WriteContext(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t) : t_(t) { - GRPC_STATS_INC_HTTP2_WRITES_BEGUN(exec_ctx); + WriteContext(grpc_chttp2_transport *t) : t_(t) { + GRPC_STATS_INC_HTTP2_WRITES_BEGUN(); GPR_TIMER_BEGIN("grpc_chttp2_begin_write", 0); } // TODO(ctiller): make this the destructor - void FlushStats(grpc_exec_ctx *exec_ctx) { + void FlushStats() { GRPC_STATS_INC_HTTP2_SEND_INITIAL_METADATA_PER_WRITE( - exec_ctx, initial_metadata_writes_); - GRPC_STATS_INC_HTTP2_SEND_MESSAGE_PER_WRITE(exec_ctx, message_writes_); + initial_metadata_writes_); + GRPC_STATS_INC_HTTP2_SEND_MESSAGE_PER_WRITE(message_writes_); GRPC_STATS_INC_HTTP2_SEND_TRAILING_METADATA_PER_WRITE( - exec_ctx, trailing_metadata_writes_); - GRPC_STATS_INC_HTTP2_SEND_FLOWCTL_PER_WRITE(exec_ctx, flow_control_writes_); + trailing_metadata_writes_); + GRPC_STATS_INC_HTTP2_SEND_FLOWCTL_PER_WRITE(flow_control_writes_); } - void FlushSettings(grpc_exec_ctx *exec_ctx) { + void FlushSettings() { if (t_->dirtied_local_settings && !t_->sent_local_settings) { grpc_slice_buffer_add( &t_->outbuf, grpc_chttp2_settings_create( @@ -204,17 +201,17 @@ class WriteContext { t_->force_send_settings = false; t_->dirtied_local_settings = false; t_->sent_local_settings = true; - GRPC_STATS_INC_HTTP2_SETTINGS_WRITES(exec_ctx); + GRPC_STATS_INC_HTTP2_SETTINGS_WRITES(); } } - void FlushQueuedBuffers(grpc_exec_ctx *exec_ctx) { + void FlushQueuedBuffers() { /* simple writes are queued to qbuf, and flushed here */ grpc_slice_buffer_move_into(&t_->qbuf, &t_->outbuf); GPR_ASSERT(t_->qbuf.count == 0); } - void FlushWindowUpdates(grpc_exec_ctx *exec_ctx) { + void FlushWindowUpdates() { uint32_t transport_announce = grpc_chttp2_flowctl_maybe_send_transport_update(&t_->flow_control, t_->outbuf.count > 0); @@ -235,7 +232,7 @@ class WriteContext { t_->ping_ack_count = 0; } - void EnactHpackSettings(grpc_exec_ctx *exec_ctx) { + void EnactHpackSettings() { grpc_chttp2_hpack_compressor_set_max_table_size( &t_->hpack_compressor, t_->settings[GRPC_PEER_SETTINGS] @@ -375,8 +372,8 @@ class DataSendContext { bool is_last_frame() const { return is_last_frame_; } - void CallCallbacks(grpc_exec_ctx *exec_ctx) { - if (update_list(exec_ctx, t_, s_, + void CallCallbacks() { + if (update_list(t_, s_, (int64_t)(s_->sending_bytes - sending_bytes_before_), &s_->on_flow_controlled_cbs, &s_->flow_controlled_bytes_flowed, GRPC_ERROR_NONE)) { @@ -404,7 +401,7 @@ class StreamWriteContext { s->flow_control.announced_window_delta))); } - void FlushInitialMetadata(grpc_exec_ctx *exec_ctx) { + void FlushInitialMetadata() { /* send initial metadata if it's available */ if (s_->sent_initial_metadata) return; if (s_->send_initial_metadata == nullptr) return; @@ -431,7 +428,7 @@ class StreamWriteContext { [GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE], // max_frame_size &s_->stats.outgoing // stats }; - grpc_chttp2_encode_header(exec_ctx, &t_->hpack_compressor, NULL, 0, + grpc_chttp2_encode_header(&t_->hpack_compressor, NULL, 0, s_->send_initial_metadata, &hopt, &t_->outbuf); write_context_->ResetPingRecvClock(); write_context_->IncInitialMetadataWrites(); @@ -441,11 +438,11 @@ class StreamWriteContext { s_->sent_initial_metadata = true; write_context_->NoteScheduledResults(); grpc_chttp2_complete_closure_step( - exec_ctx, t_, s_, &s_->send_initial_metadata_finished, GRPC_ERROR_NONE, + t_, s_, &s_->send_initial_metadata_finished, GRPC_ERROR_NONE, "send_initial_metadata_finished"); } - void FlushWindowUpdates(grpc_exec_ctx *exec_ctx) { + void FlushWindowUpdates() { /* send any window updates */ uint32_t stream_announce = grpc_chttp2_flowctl_maybe_send_stream_update( &t_->flow_control, &s_->flow_control); @@ -458,7 +455,7 @@ class StreamWriteContext { write_context_->IncWindowUpdateWrites(); } - void FlushData(grpc_exec_ctx *exec_ctx) { + void FlushData() { if (!s_->sent_initial_metadata) return; if (s_->flow_controlled_buffer.length == 0 && @@ -490,9 +487,9 @@ class StreamWriteContext { } write_context_->ResetPingRecvClock(); if (data_send_context.is_last_frame()) { - SentLastFrame(exec_ctx); + SentLastFrame(); } - data_send_context.CallCallbacks(exec_ctx); + data_send_context.CallCallbacks(); stream_became_writable_ = true; if (s_->flow_controlled_buffer.length > 0 || s_->compressed_data_buffer.length > 0) { @@ -502,7 +499,7 @@ class StreamWriteContext { write_context_->IncMessageWrites(); } - void FlushTrailingMetadata(grpc_exec_ctx *exec_ctx) { + void FlushTrailingMetadata() { if (!s_->sent_initial_metadata) return; if (s_->send_trailing_metadata == NULL) return; @@ -523,18 +520,18 @@ class StreamWriteContext { t_->settings[GRPC_PEER_SETTINGS][GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE], &s_->stats.outgoing}; - grpc_chttp2_encode_header(exec_ctx, &t_->hpack_compressor, + grpc_chttp2_encode_header(&t_->hpack_compressor, extra_headers_for_trailing_metadata_, num_extra_headers_for_trailing_metadata_, s_->send_trailing_metadata, &hopt, &t_->outbuf); } write_context_->IncTrailingMetadataWrites(); write_context_->ResetPingRecvClock(); - SentLastFrame(exec_ctx); + SentLastFrame(); write_context_->NoteScheduledResults(); grpc_chttp2_complete_closure_step( - exec_ctx, t_, s_, &s_->send_trailing_metadata_finished, GRPC_ERROR_NONE, + t_, s_, &s_->send_trailing_metadata_finished, GRPC_ERROR_NONE, "send_trailing_metadata_finished"); } @@ -558,7 +555,7 @@ class StreamWriteContext { } } - void SentLastFrame(grpc_exec_ctx *exec_ctx) { + void SentLastFrame() { s_->send_trailing_metadata = NULL; s_->sent_trailing_metadata = true; @@ -567,7 +564,7 @@ class StreamWriteContext { &t_->outbuf, grpc_chttp2_rst_stream_create( s_->id, GRPC_HTTP2_NO_ERROR, &s_->stats.outgoing)); } - grpc_chttp2_mark_stream_closed(exec_ctx, t_, s_, !t_->is_client, true, + grpc_chttp2_mark_stream_closed(t_, s_, !t_->is_client, true, GRPC_ERROR_NONE); } @@ -581,12 +578,12 @@ class StreamWriteContext { } // namespace grpc_chttp2_begin_write_result grpc_chttp2_begin_write( - grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t) { - WriteContext ctx(exec_ctx, t); - ctx.FlushSettings(exec_ctx); + grpc_chttp2_transport *t) { + WriteContext ctx(t); + ctx.FlushSettings(); ctx.FlushPingAcks(); - ctx.FlushQueuedBuffers(exec_ctx); - ctx.EnactHpackSettings(exec_ctx); + ctx.FlushQueuedBuffers(); + ctx.EnactHpackSettings(); if (t->flow_control.remote_window > 0) { ctx.UpdateStreamsNoLongerStalled(); @@ -596,47 +593,45 @@ grpc_chttp2_begin_write_result grpc_chttp2_begin_write( (according to available window sizes) and add to the output buffer */ while (grpc_chttp2_stream *s = ctx.NextStream()) { StreamWriteContext stream_ctx(&ctx, s); - stream_ctx.FlushInitialMetadata(exec_ctx); - stream_ctx.FlushWindowUpdates(exec_ctx); - stream_ctx.FlushData(exec_ctx); - stream_ctx.FlushTrailingMetadata(exec_ctx); + stream_ctx.FlushInitialMetadata(); + stream_ctx.FlushWindowUpdates(); + stream_ctx.FlushData(); + stream_ctx.FlushTrailingMetadata(); if (stream_ctx.stream_became_writable()) { if (!grpc_chttp2_list_add_writing_stream(t, s)) { /* already in writing list: drop ref */ - GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "chttp2_writing:already_writing"); + GRPC_CHTTP2_STREAM_UNREF(s, "chttp2_writing:already_writing"); } else { /* ref will be dropped at end of write */ } } else { - GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "chttp2_writing:no_write"); + GRPC_CHTTP2_STREAM_UNREF(s, "chttp2_writing:no_write"); } } - ctx.FlushWindowUpdates(exec_ctx); + ctx.FlushWindowUpdates(); - maybe_initiate_ping(exec_ctx, t); + maybe_initiate_ping(t); GPR_TIMER_END("grpc_chttp2_begin_write", 0); return ctx.Result(); } -void grpc_chttp2_end_write(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, - grpc_error *error) { +void grpc_chttp2_end_write(grpc_chttp2_transport *t, grpc_error *error) { GPR_TIMER_BEGIN("grpc_chttp2_end_write", 0); grpc_chttp2_stream *s; while (grpc_chttp2_list_pop_writing_stream(t, &s)) { if (s->sending_bytes != 0) { - update_list(exec_ctx, t, s, (int64_t)s->sending_bytes, - &s->on_write_finished_cbs, &s->flow_controlled_bytes_written, - GRPC_ERROR_REF(error)); + update_list(t, s, (int64_t)s->sending_bytes, &s->on_write_finished_cbs, + &s->flow_controlled_bytes_written, GRPC_ERROR_REF(error)); s->sending_bytes = 0; } - GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "chttp2_writing:end"); + GRPC_CHTTP2_STREAM_UNREF(s, "chttp2_writing:end"); } - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &t->outbuf); + grpc_slice_buffer_reset_and_unref_internal(&t->outbuf); GRPC_ERROR_UNREF(error); GPR_TIMER_END("grpc_chttp2_end_write", 0); } diff --git a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc index b280487ca3e..59d91a3318e 100644 --- a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc +++ b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc @@ -49,7 +49,6 @@ GRPCAPI grpc_channel *grpc_cronet_secure_channel_create( grpc_transport *ct = grpc_create_cronet_transport(engine, target, args, reserved); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - return grpc_channel_create(&exec_ctx, target, args, - GRPC_CLIENT_DIRECT_CHANNEL, ct); + ExecCtx _local_exec_ctx; + return grpc_channel_create(target, args, GRPC_CLIENT_DIRECT_CHANNEL, ct); } diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index ff1367fb285..fa7c9db7103 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -197,27 +197,23 @@ typedef struct stream_obj stream_obj; #ifndef NDEBUG #define GRPC_CRONET_STREAM_REF(stream, reason) \ grpc_cronet_stream_ref((stream), (reason)) -#define GRPC_CRONET_STREAM_UNREF(exec_ctx, stream, reason) \ - grpc_cronet_stream_unref((exec_ctx), (stream), (reason)) +#define GRPC_CRONET_STREAM_UNREF(stream, reason) \ + grpc_cronet_stream_unref((stream), (reason)) void grpc_cronet_stream_ref(stream_obj *s, const char *reason) { grpc_stream_ref(s->refcount, reason); } -void grpc_cronet_stream_unref(grpc_exec_ctx *exec_ctx, stream_obj *s, - const char *reason) { - grpc_stream_unref(exec_ctx, s->refcount, reason); +void grpc_cronet_stream_unref(stream_obj *s, const char *reason) { + grpc_stream_unref(s->refcount, reason); } #else #define GRPC_CRONET_STREAM_REF(stream, reason) grpc_cronet_stream_ref((stream)) -#define GRPC_CRONET_STREAM_UNREF(exec_ctx, stream, reason) \ - grpc_cronet_stream_unref((exec_ctx), (stream)) +#define GRPC_CRONET_STREAM_UNREF(stream, reason) \ + grpc_cronet_stream_unref((stream)) void grpc_cronet_stream_ref(stream_obj *s) { grpc_stream_ref(s->refcount); } -void grpc_cronet_stream_unref(grpc_exec_ctx *exec_ctx, stream_obj *s) { - grpc_stream_unref(exec_ctx, s->refcount); -} +void grpc_cronet_stream_unref(stream_obj *s) { grpc_stream_unref(s->refcount); } #endif -static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx, - struct op_and_state *oas); +static enum e_op_result execute_stream_op(struct op_and_state *oas); /* Utility function to translate enum into string for printing @@ -373,12 +369,12 @@ static void remove_from_storage(struct stream_obj *s, This can get executed from the Cronet network thread via cronet callback or on the application supplied thread via the perform_stream_op function. */ -static void execute_from_storage(grpc_exec_ctx *exec_ctx, stream_obj *s) { +static void execute_from_storage(stream_obj *s) { gpr_mu_lock(&s->mu); for (struct op_and_state *curr = s->storage.head; curr != NULL;) { CRONET_LOG(GPR_DEBUG, "calling op at %p. done = %d", curr, curr->done); GPR_ASSERT(curr->done == 0); - enum e_op_result result = execute_stream_op(exec_ctx, curr); + enum e_op_result result = execute_stream_op(curr); CRONET_LOG(GPR_DEBUG, "execute_stream_op[%p] returns %s", curr, op_result_string(result)); /* if this op is done, then remove it and free memory */ @@ -402,7 +398,7 @@ static void execute_from_storage(grpc_exec_ctx *exec_ctx, stream_obj *s) { */ static void on_failed(bidirectional_stream *stream, int net_error) { CRONET_LOG(GPR_DEBUG, "on_failed(%p, %d)", stream, net_error); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; stream_obj *s = (stream_obj *)stream->annotation; gpr_mu_lock(&s->mu); @@ -419,9 +415,9 @@ static void on_failed(bidirectional_stream *stream, int net_error) { } null_and_maybe_free_read_buffer(s); gpr_mu_unlock(&s->mu); - execute_from_storage(&exec_ctx, s); - GRPC_CRONET_STREAM_UNREF(&exec_ctx, s, "cronet transport"); - grpc_exec_ctx_finish(&exec_ctx); + execute_from_storage(s); + GRPC_CRONET_STREAM_UNREF(s, "cronet transport"); + grpc_exec_ctx_finish(); } /* @@ -429,7 +425,7 @@ static void on_failed(bidirectional_stream *stream, int net_error) { */ static void on_canceled(bidirectional_stream *stream) { CRONET_LOG(GPR_DEBUG, "on_canceled(%p)", stream); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; stream_obj *s = (stream_obj *)stream->annotation; gpr_mu_lock(&s->mu); @@ -446,9 +442,9 @@ static void on_canceled(bidirectional_stream *stream) { } null_and_maybe_free_read_buffer(s); gpr_mu_unlock(&s->mu); - execute_from_storage(&exec_ctx, s); - GRPC_CRONET_STREAM_UNREF(&exec_ctx, s, "cronet transport"); - grpc_exec_ctx_finish(&exec_ctx); + execute_from_storage(s); + GRPC_CRONET_STREAM_UNREF(s, "cronet transport"); + grpc_exec_ctx_finish(); } /* @@ -456,7 +452,7 @@ static void on_canceled(bidirectional_stream *stream) { */ static void on_succeeded(bidirectional_stream *stream) { CRONET_LOG(GPR_DEBUG, "on_succeeded(%p)", stream); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; stream_obj *s = (stream_obj *)stream->annotation; gpr_mu_lock(&s->mu); @@ -465,9 +461,9 @@ static void on_succeeded(bidirectional_stream *stream) { s->cbs = NULL; null_and_maybe_free_read_buffer(s); gpr_mu_unlock(&s->mu); - execute_from_storage(&exec_ctx, s); - GRPC_CRONET_STREAM_UNREF(&exec_ctx, s, "cronet transport"); - grpc_exec_ctx_finish(&exec_ctx); + execute_from_storage(s); + GRPC_CRONET_STREAM_UNREF(s, "cronet transport"); + grpc_exec_ctx_finish(); } /* @@ -475,7 +471,7 @@ static void on_succeeded(bidirectional_stream *stream) { */ static void on_stream_ready(bidirectional_stream *stream) { CRONET_LOG(GPR_DEBUG, "W: on_stream_ready(%p)", stream); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; stream_obj *s = (stream_obj *)stream->annotation; grpc_cronet_transport *t = (grpc_cronet_transport *)s->curr_ct; gpr_mu_lock(&s->mu); @@ -495,8 +491,8 @@ static void on_stream_ready(bidirectional_stream *stream) { } } gpr_mu_unlock(&s->mu); - execute_from_storage(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + execute_from_storage(s); + grpc_exec_ctx_finish(); } /* @@ -506,7 +502,7 @@ static void on_response_headers_received( bidirectional_stream *stream, const bidirectional_stream_header_array *headers, const char *negotiated_protocol) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; CRONET_LOG(GPR_DEBUG, "R: on_response_headers_received(%p, %p, %s)", stream, headers, negotiated_protocol); stream_obj *s = (stream_obj *)stream->annotation; @@ -526,15 +522,14 @@ static void on_response_headers_received( grpc_chttp2_incoming_metadata_buffer_init(&s->state.rs.initial_metadata, s->arena); for (size_t i = 0; i < headers->count; i++) { - GRPC_LOG_IF_ERROR( - "on_response_headers_received", - grpc_chttp2_incoming_metadata_buffer_add( - &exec_ctx, &s->state.rs.initial_metadata, - grpc_mdelem_from_slices( - &exec_ctx, grpc_slice_intern(grpc_slice_from_static_string( - headers->headers[i].key)), - grpc_slice_intern(grpc_slice_from_static_string( - headers->headers[i].value))))); + GRPC_LOG_IF_ERROR("on_response_headers_received", + grpc_chttp2_incoming_metadata_buffer_add( + &s->state.rs.initial_metadata, + grpc_mdelem_from_slices( + grpc_slice_intern(grpc_slice_from_static_string( + headers->headers[i].key)), + grpc_slice_intern(grpc_slice_from_static_string( + headers->headers[i].value))))); } s->state.state_callback_received[OP_RECV_INITIAL_METADATA] = true; if (!(s->state.state_op_done[OP_CANCEL_ERROR] || @@ -552,15 +547,15 @@ static void on_response_headers_received( s->state.pending_read_from_cronet = true; } gpr_mu_unlock(&s->mu); - execute_from_storage(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + execute_from_storage(s); + grpc_exec_ctx_finish(); } /* Cronet callback */ static void on_write_completed(bidirectional_stream *stream, const char *data) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; stream_obj *s = (stream_obj *)stream->annotation; CRONET_LOG(GPR_DEBUG, "W: on_write_completed(%p, %s)", stream, data); gpr_mu_lock(&s->mu); @@ -570,8 +565,8 @@ static void on_write_completed(bidirectional_stream *stream, const char *data) { } s->state.state_callback_received[OP_SEND_MESSAGE] = true; gpr_mu_unlock(&s->mu); - execute_from_storage(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + execute_from_storage(s); + grpc_exec_ctx_finish(); } /* @@ -579,7 +574,7 @@ static void on_write_completed(bidirectional_stream *stream, const char *data) { */ static void on_read_completed(bidirectional_stream *stream, char *data, int count) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; stream_obj *s = (stream_obj *)stream->annotation; CRONET_LOG(GPR_DEBUG, "R: on_read_completed(%p, %p, %d)", stream, data, count); @@ -605,15 +600,15 @@ static void on_read_completed(bidirectional_stream *stream, char *data, gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - execute_from_storage(&exec_ctx, s); + execute_from_storage(s); } } else { null_and_maybe_free_read_buffer(s); s->state.rs.read_stream_closed = true; gpr_mu_unlock(&s->mu); - execute_from_storage(&exec_ctx, s); + execute_from_storage(s); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } /* @@ -622,7 +617,7 @@ static void on_read_completed(bidirectional_stream *stream, char *data, static void on_response_trailers_received( bidirectional_stream *stream, const bidirectional_stream_header_array *trailers) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; CRONET_LOG(GPR_DEBUG, "R: on_response_trailers_received(%p,%p)", stream, trailers); stream_obj *s = (stream_obj *)stream->annotation; @@ -636,15 +631,14 @@ static void on_response_trailers_received( for (size_t i = 0; i < trailers->count; i++) { CRONET_LOG(GPR_DEBUG, "trailer key=%s, value=%s", trailers->headers[i].key, trailers->headers[i].value); - GRPC_LOG_IF_ERROR( - "on_response_trailers_received", - grpc_chttp2_incoming_metadata_buffer_add( - &exec_ctx, &s->state.rs.trailing_metadata, - grpc_mdelem_from_slices( - &exec_ctx, grpc_slice_intern(grpc_slice_from_static_string( - trailers->headers[i].key)), - grpc_slice_intern(grpc_slice_from_static_string( - trailers->headers[i].value))))); + GRPC_LOG_IF_ERROR("on_response_trailers_received", + grpc_chttp2_incoming_metadata_buffer_add( + &s->state.rs.trailing_metadata, + grpc_mdelem_from_slices( + grpc_slice_intern(grpc_slice_from_static_string( + trailers->headers[i].key)), + grpc_slice_intern(grpc_slice_from_static_string( + trailers->headers[i].value))))); s->state.rs.trailing_metadata_valid = true; if (0 == strcmp(trailers->headers[i].key, "grpc-status") && 0 != strcmp(trailers->headers[i].value, "0")) { @@ -670,17 +664,16 @@ static void on_response_trailers_received( gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - execute_from_storage(&exec_ctx, s); + execute_from_storage(s); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } /* Utility function that takes the data from s->write_slice_buffer and assembles into a contiguous byte stream with 5 byte gRPC header prepended. */ -static void create_grpc_frame(grpc_exec_ctx *exec_ctx, - grpc_slice_buffer *write_slice_buffer, +static void create_grpc_frame(grpc_slice_buffer *write_slice_buffer, char **pp_write_buffer, size_t *p_write_buffer_size, uint32_t flags) { grpc_slice slice = grpc_slice_buffer_take_first(write_slice_buffer); @@ -700,7 +693,7 @@ static void create_grpc_frame(grpc_exec_ctx *exec_ctx, *p++ = (uint8_t)(length); /* append actual data */ memcpy(p, GRPC_SLICE_START_PTR(slice), length); - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); } /* @@ -981,8 +974,7 @@ static bool op_can_be_run(grpc_transport_stream_op_batch *curr_op, /* TODO (makdharma): Break down this function in smaller chunks for readability. */ -static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx, - struct op_and_state *oas) { +static enum e_op_result execute_stream_op(struct op_and_state *oas) { grpc_transport_stream_op_batch *stream_op = &oas->op; struct stream_obj *s = oas->s; grpc_cronet_transport *t = (grpc_cronet_transport *)s->curr_ct; @@ -1040,15 +1032,14 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx, grpc_slice slice; grpc_slice_buffer_init(&write_slice_buffer); if (1 != grpc_byte_stream_next( - exec_ctx, stream_op->payload->send_message.send_message, + stream_op->payload->send_message.send_message, stream_op->payload->send_message.send_message->length, NULL)) { /* Should never reach here */ GPR_ASSERT(false); } if (GRPC_ERROR_NONE != - grpc_byte_stream_pull(exec_ctx, - stream_op->payload->send_message.send_message, + grpc_byte_stream_pull(stream_op->payload->send_message.send_message, &slice)) { /* Should never reach here */ GPR_ASSERT(false); @@ -1061,15 +1052,15 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx, } if (write_slice_buffer.count > 0) { size_t write_buffer_size; - create_grpc_frame(exec_ctx, &write_slice_buffer, - &stream_state->ws.write_buffer, &write_buffer_size, + create_grpc_frame(&write_slice_buffer, &stream_state->ws.write_buffer, + &write_buffer_size, stream_op->payload->send_message.send_message->flags); CRONET_LOG(GPR_DEBUG, "bidirectional_stream_write (%p, %p)", s->cbs, stream_state->ws.write_buffer); stream_state->state_callback_received[OP_SEND_MESSAGE] = false; bidirectional_stream_write(s->cbs, stream_state->ws.write_buffer, (int)write_buffer_size, false); - grpc_slice_buffer_destroy_internal(exec_ctx, &write_slice_buffer); + grpc_slice_buffer_destroy_internal(&write_slice_buffer); if (t->use_packet_coalescing) { if (!stream_op->send_trailing_metadata) { CRONET_LOG(GPR_DEBUG, "bidirectional_stream_flush (%p)", s->cbs); @@ -1112,25 +1103,21 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx, CRONET_LOG(GPR_DEBUG, "running: %p OP_RECV_INITIAL_METADATA", oas); if (stream_state->state_op_done[OP_CANCEL_ERROR]) { GRPC_CLOSURE_SCHED( - exec_ctx, stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_NONE); } else if (stream_state->state_callback_received[OP_FAILED]) { GRPC_CLOSURE_SCHED( - exec_ctx, stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_NONE); } else if (stream_state->state_op_done[OP_RECV_TRAILING_METADATA]) { GRPC_CLOSURE_SCHED( - exec_ctx, stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_NONE); } else { grpc_chttp2_incoming_metadata_buffer_publish( - exec_ctx, &oas->s->state.rs.initial_metadata, + &oas->s->state.rs.initial_metadata, stream_op->payload->recv_initial_metadata.recv_initial_metadata); GRPC_CLOSURE_SCHED( - exec_ctx, stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_NONE); } @@ -1141,16 +1128,14 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx, CRONET_LOG(GPR_DEBUG, "running: %p OP_RECV_MESSAGE", oas); if (stream_state->state_op_done[OP_CANCEL_ERROR]) { CRONET_LOG(GPR_DEBUG, "Stream is cancelled."); - GRPC_CLOSURE_SCHED(exec_ctx, - stream_op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(stream_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; result = ACTION_TAKEN_NO_CALLBACK; } else if (stream_state->state_callback_received[OP_FAILED]) { CRONET_LOG(GPR_DEBUG, "Stream failed."); - GRPC_CLOSURE_SCHED(exec_ctx, - stream_op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(stream_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; @@ -1158,16 +1143,14 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx, } else if (stream_state->rs.read_stream_closed == true) { /* No more data will be received */ CRONET_LOG(GPR_DEBUG, "read stream closed"); - GRPC_CLOSURE_SCHED(exec_ctx, - stream_op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(stream_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; result = ACTION_TAKEN_NO_CALLBACK; } else if (stream_state->flush_read) { CRONET_LOG(GPR_DEBUG, "flush read"); - GRPC_CLOSURE_SCHED(exec_ctx, - stream_op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(stream_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; @@ -1200,7 +1183,7 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx, CRONET_LOG(GPR_DEBUG, "read operation complete. Empty response."); /* Clean up read_slice_buffer in case there is unread data. */ grpc_slice_buffer_destroy_internal( - exec_ctx, &stream_state->rs.read_slice_buffer); + &stream_state->rs.read_slice_buffer); grpc_slice_buffer_init(&stream_state->rs.read_slice_buffer); grpc_slice_buffer_stream_init(&stream_state->rs.sbs, &stream_state->rs.read_slice_buffer, 0); @@ -1211,7 +1194,7 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx, stream_op->payload->recv_message.recv_message) = (grpc_byte_buffer *)&stream_state->rs.sbs; GRPC_CLOSURE_SCHED( - exec_ctx, stream_op->payload->recv_message.recv_message_ready, + stream_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; @@ -1255,8 +1238,7 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx, (size_t)stream_state->rs.length_field); null_and_maybe_free_read_buffer(s); /* Clean up read_slice_buffer in case there is unread data. */ - grpc_slice_buffer_destroy_internal(exec_ctx, - &stream_state->rs.read_slice_buffer); + grpc_slice_buffer_destroy_internal(&stream_state->rs.read_slice_buffer); grpc_slice_buffer_init(&stream_state->rs.read_slice_buffer); grpc_slice_buffer_add(&stream_state->rs.read_slice_buffer, read_data_slice); @@ -1267,8 +1249,7 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx, } *((grpc_byte_buffer **)stream_op->payload->recv_message.recv_message) = (grpc_byte_buffer *)&stream_state->rs.sbs; - GRPC_CLOSURE_SCHED(exec_ctx, - stream_op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(stream_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; @@ -1291,7 +1272,7 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx, CRONET_LOG(GPR_DEBUG, "running: %p OP_RECV_TRAILING_METADATA", oas); if (oas->s->state.rs.trailing_metadata_valid) { grpc_chttp2_incoming_metadata_buffer_publish( - exec_ctx, &oas->s->state.rs.trailing_metadata, + &oas->s->state.rs.trailing_metadata, stream_op->payload->recv_trailing_metadata.recv_trailing_metadata); stream_state->rs.trailing_metadata_valid = false; } @@ -1316,17 +1297,17 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx, op_can_be_run(stream_op, s, &oas->state, OP_ON_COMPLETE)) { CRONET_LOG(GPR_DEBUG, "running: %p OP_ON_COMPLETE", oas); if (stream_state->state_op_done[OP_CANCEL_ERROR]) { - GRPC_CLOSURE_SCHED(exec_ctx, stream_op->on_complete, + GRPC_CLOSURE_SCHED(stream_op->on_complete, GRPC_ERROR_REF(stream_state->cancel_error)); } else if (stream_state->state_callback_received[OP_FAILED]) { GRPC_CLOSURE_SCHED( - exec_ctx, stream_op->on_complete, + stream_op->on_complete, make_error_with_desc(GRPC_STATUS_UNAVAILABLE, "Unavailable.")); } else { /* All actions in this stream_op are complete. Call the on_complete * callback */ - GRPC_CLOSURE_SCHED(exec_ctx, stream_op->on_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(stream_op->on_complete, GRPC_ERROR_NONE); } oas->state.state_op_done[OP_ON_COMPLETE] = true; oas->done = true; @@ -1351,9 +1332,9 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx, Functions used by upper layers to access transport functionality. */ -static int init_stream(grpc_exec_ctx *exec_ctx, grpc_transport *gt, - grpc_stream *gs, grpc_stream_refcount *refcount, - const void *server_data, gpr_arena *arena) { +static int init_stream(grpc_transport *gt, grpc_stream *gs, + grpc_stream_refcount *refcount, const void *server_data, + gpr_arena *arena) { stream_obj *s = (stream_obj *)gs; s->refcount = refcount; @@ -1384,15 +1365,13 @@ static int init_stream(grpc_exec_ctx *exec_ctx, grpc_transport *gt, return 0; } -static void set_pollset_do_nothing(grpc_exec_ctx *exec_ctx, grpc_transport *gt, - grpc_stream *gs, grpc_pollset *pollset) {} +static void set_pollset_do_nothing(grpc_transport *gt, grpc_stream *gs, + grpc_pollset *pollset) {} -static void set_pollset_set_do_nothing(grpc_exec_ctx *exec_ctx, - grpc_transport *gt, grpc_stream *gs, +static void set_pollset_set_do_nothing(grpc_transport *gt, grpc_stream *gs, grpc_pollset_set *pollset_set) {} -static void perform_stream_op(grpc_exec_ctx *exec_ctx, grpc_transport *gt, - grpc_stream *gs, +static void perform_stream_op(grpc_transport *gt, grpc_stream *gs, grpc_transport_stream_op_batch *op) { CRONET_LOG(GPR_DEBUG, "perform_stream_op"); if (op->send_initial_metadata && @@ -1402,42 +1381,36 @@ static void perform_stream_op(grpc_exec_ctx *exec_ctx, grpc_transport *gt, this field is present in metadata */ if (op->recv_initial_metadata) { GRPC_CLOSURE_SCHED( - exec_ctx, op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_CANCELLED); } if (op->recv_message) { - GRPC_CLOSURE_SCHED(exec_ctx, op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(op->payload->recv_message.recv_message_ready, GRPC_ERROR_CANCELLED); } - GRPC_CLOSURE_SCHED(exec_ctx, op->on_complete, GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(op->on_complete, GRPC_ERROR_CANCELLED); return; } stream_obj *s = (stream_obj *)gs; add_to_storage(s, op); - execute_from_storage(exec_ctx, s); + execute_from_storage(s); } -static void destroy_stream(grpc_exec_ctx *exec_ctx, grpc_transport *gt, - grpc_stream *gs, +static void destroy_stream(grpc_transport *gt, grpc_stream *gs, grpc_closure *then_schedule_closure) { stream_obj *s = (stream_obj *)gs; null_and_maybe_free_read_buffer(s); /* Clean up read_slice_buffer in case there is unread data. */ - grpc_slice_buffer_destroy_internal(exec_ctx, &s->state.rs.read_slice_buffer); + grpc_slice_buffer_destroy_internal(&s->state.rs.read_slice_buffer); GRPC_ERROR_UNREF(s->state.cancel_error); - GRPC_CLOSURE_SCHED(exec_ctx, then_schedule_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(then_schedule_closure, GRPC_ERROR_NONE); } -static void destroy_transport(grpc_exec_ctx *exec_ctx, grpc_transport *gt) {} +static void destroy_transport(grpc_transport *gt) {} -static grpc_endpoint *get_endpoint(grpc_exec_ctx *exec_ctx, - grpc_transport *gt) { - return NULL; -} +static grpc_endpoint *get_endpoint(grpc_transport *gt) { return NULL; } -static void perform_op(grpc_exec_ctx *exec_ctx, grpc_transport *gt, - grpc_transport_op *op) {} +static void perform_op(grpc_transport *gt, grpc_transport_op *op) {} static const grpc_transport_vtable grpc_cronet_vtable = { sizeof(stream_obj), diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index 67a8358927c..ba9aa503c8d 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/src/core/ext/transport/inproc/inproc_transport.cc @@ -54,8 +54,8 @@ typedef struct inproc_transport { gpr_refcount refs; bool is_client; grpc_connectivity_state_tracker connectivity; - void (*accept_stream_cb)(grpc_exec_ctx *exec_ctx, void *user_data, - grpc_transport *transport, const void *server_data); + void (*accept_stream_cb)(void *user_data, grpc_transport *transport, + const void *server_data); void *accept_stream_data; bool is_closed; struct inproc_transport *other_side; @@ -118,39 +118,36 @@ typedef struct inproc_stream { } inproc_stream; static grpc_closure do_nothing_closure; -static bool cancel_stream_locked(grpc_exec_ctx *exec_ctx, inproc_stream *s, - grpc_error *error); -static void op_state_machine(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error); +static bool cancel_stream_locked(inproc_stream *s, grpc_error *error); +static void op_state_machine(void *arg, grpc_error *error); static void ref_transport(inproc_transport *t) { INPROC_LOG(GPR_DEBUG, "ref_transport %p", t); gpr_ref(&t->refs); } -static void really_destroy_transport(grpc_exec_ctx *exec_ctx, - inproc_transport *t) { +static void really_destroy_transport(inproc_transport *t) { INPROC_LOG(GPR_DEBUG, "really_destroy_transport %p", t); - grpc_connectivity_state_destroy(exec_ctx, &t->connectivity); + grpc_connectivity_state_destroy(&t->connectivity); if (gpr_unref(&t->mu->refs)) { gpr_free(t->mu); } gpr_free(t); } -static void unref_transport(grpc_exec_ctx *exec_ctx, inproc_transport *t) { +static void unref_transport(inproc_transport *t) { INPROC_LOG(GPR_DEBUG, "unref_transport %p", t); if (gpr_unref(&t->refs)) { - really_destroy_transport(exec_ctx, t); + really_destroy_transport(t); } } #ifndef NDEBUG #define STREAM_REF(refs, reason) grpc_stream_ref(refs, reason) -#define STREAM_UNREF(e, refs, reason) grpc_stream_unref(e, refs, reason) +#define STREAM_UNREF(refs, reason) grpc_stream_unref(refs, reason) #else #define STREAM_REF(refs, reason) grpc_stream_ref(refs) -#define STREAM_UNREF(e, refs, reason) grpc_stream_unref(e, refs) +#define STREAM_UNREF(refs, reason) grpc_stream_unref(refs) #endif static void ref_stream(inproc_stream *s, const char *reason) { @@ -158,13 +155,12 @@ static void ref_stream(inproc_stream *s, const char *reason) { STREAM_REF(s->refs, reason); } -static void unref_stream(grpc_exec_ctx *exec_ctx, inproc_stream *s, - const char *reason) { +static void unref_stream(inproc_stream *s, const char *reason) { INPROC_LOG(GPR_DEBUG, "unref_stream %p %s", s, reason); - STREAM_UNREF(exec_ctx, s->refs, reason); + STREAM_UNREF(s->refs, reason); } -static void really_destroy_stream(grpc_exec_ctx *exec_ctx, inproc_stream *s) { +static void really_destroy_stream(inproc_stream *s) { INPROC_LOG(GPR_DEBUG, "really_destroy_stream %p", s); GRPC_ERROR_UNREF(s->write_buffer_cancel_error); @@ -172,13 +168,13 @@ static void really_destroy_stream(grpc_exec_ctx *exec_ctx, inproc_stream *s) { GRPC_ERROR_UNREF(s->cancel_other_error); if (s->recv_inited) { - grpc_slice_buffer_destroy_internal(exec_ctx, &s->recv_message); + grpc_slice_buffer_destroy_internal(&s->recv_message); } - unref_transport(exec_ctx, s->t); + unref_transport(s->t); if (s->closure_at_destroy) { - GRPC_CLOSURE_SCHED(exec_ctx, s->closure_at_destroy, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(s->closure_at_destroy, GRPC_ERROR_NONE); } } @@ -195,7 +191,7 @@ static void log_metadata(const grpc_metadata_batch *md_batch, bool is_client, } } -static grpc_error *fill_in_metadata(grpc_exec_ctx *exec_ctx, inproc_stream *s, +static grpc_error *fill_in_metadata(inproc_stream *s, const grpc_metadata_batch *metadata, uint32_t flags, grpc_metadata_batch *out_md, uint32_t *outflags, bool *markfilled) { @@ -214,18 +210,18 @@ static grpc_error *fill_in_metadata(grpc_exec_ctx *exec_ctx, inproc_stream *s, (elem != NULL) && (error == GRPC_ERROR_NONE); elem = elem->next) { grpc_linked_mdelem *nelem = (grpc_linked_mdelem *)gpr_arena_alloc(s->arena, sizeof(*nelem)); - nelem->md = grpc_mdelem_from_slices( - exec_ctx, grpc_slice_intern(GRPC_MDKEY(elem->md)), - grpc_slice_intern(GRPC_MDVALUE(elem->md))); + nelem->md = + grpc_mdelem_from_slices(grpc_slice_intern(GRPC_MDKEY(elem->md)), + grpc_slice_intern(GRPC_MDVALUE(elem->md))); - error = grpc_metadata_batch_link_tail(exec_ctx, out_md, nelem); + error = grpc_metadata_batch_link_tail(out_md, nelem); } return error; } -static int init_stream(grpc_exec_ctx *exec_ctx, grpc_transport *gt, - grpc_stream *gs, grpc_stream_refcount *refcount, - const void *server_data, gpr_arena *arena) { +static int init_stream(grpc_transport *gt, grpc_stream *gs, + grpc_stream_refcount *refcount, const void *server_data, + gpr_arena *arena) { INPROC_LOG(GPR_DEBUG, "init_stream %p %p %p", gt, gs, server_data); inproc_transport *t = (inproc_transport *)gt; inproc_stream *s = (inproc_stream *)gs; @@ -285,8 +281,7 @@ static int init_stream(grpc_exec_ctx *exec_ctx, grpc_transport *gt, // side to avoid destruction INPROC_LOG(GPR_DEBUG, "calling accept stream cb %p %p", st->accept_stream_cb, st->accept_stream_data); - (*st->accept_stream_cb)(exec_ctx, st->accept_stream_data, &st->base, - (void *)s); + (*st->accept_stream_cb)(st->accept_stream_data, &st->base, (void *)s); } else { // This is the server-side and is being called through accept_stream_cb inproc_stream *cs = (inproc_stream *)server_data; @@ -301,19 +296,19 @@ static int init_stream(grpc_exec_ctx *exec_ctx, grpc_transport *gt, // Now transfer from the other side's write_buffer if any to the to_read // buffer if (cs->write_buffer_initial_md_filled) { - fill_in_metadata(exec_ctx, s, &cs->write_buffer_initial_md, + fill_in_metadata(s, &cs->write_buffer_initial_md, cs->write_buffer_initial_md_flags, &s->to_read_initial_md, &s->to_read_initial_md_flags, &s->to_read_initial_md_filled); s->deadline = GPR_MIN(s->deadline, cs->write_buffer_deadline); - grpc_metadata_batch_clear(exec_ctx, &cs->write_buffer_initial_md); + grpc_metadata_batch_clear(&cs->write_buffer_initial_md); cs->write_buffer_initial_md_filled = false; } if (cs->write_buffer_trailing_md_filled) { - fill_in_metadata(exec_ctx, s, &cs->write_buffer_trailing_md, 0, + fill_in_metadata(s, &cs->write_buffer_trailing_md, 0, &s->to_read_trailing_md, NULL, &s->to_read_trailing_md_filled); - grpc_metadata_batch_clear(exec_ctx, &cs->write_buffer_trailing_md); + grpc_metadata_batch_clear(&cs->write_buffer_trailing_md); cs->write_buffer_trailing_md_filled = false; } if (cs->write_buffer_cancel_error != GRPC_ERROR_NONE) { @@ -326,11 +321,11 @@ static int init_stream(grpc_exec_ctx *exec_ctx, grpc_transport *gt, return 0; // return value is not important } -static void close_stream_locked(grpc_exec_ctx *exec_ctx, inproc_stream *s) { +static void close_stream_locked(inproc_stream *s) { if (!s->closed) { // Release the metadata that we would have written out - grpc_metadata_batch_destroy(exec_ctx, &s->write_buffer_initial_md); - grpc_metadata_batch_destroy(exec_ctx, &s->write_buffer_trailing_md); + grpc_metadata_batch_destroy(&s->write_buffer_initial_md); + grpc_metadata_batch_destroy(&s->write_buffer_trailing_md); if (s->listed) { inproc_stream *p = s->stream_list_prev; @@ -344,22 +339,21 @@ static void close_stream_locked(grpc_exec_ctx *exec_ctx, inproc_stream *s) { n->stream_list_prev = p; } s->listed = false; - unref_stream(exec_ctx, s, "close_stream:list"); + unref_stream(s, "close_stream:list"); } s->closed = true; - unref_stream(exec_ctx, s, "close_stream:closing"); + unref_stream(s, "close_stream:closing"); } } // This function means that we are done talking/listening to the other side -static void close_other_side_locked(grpc_exec_ctx *exec_ctx, inproc_stream *s, - const char *reason) { +static void close_other_side_locked(inproc_stream *s, const char *reason) { if (s->other_side != NULL) { // First release the metadata that came from the other side's arena - grpc_metadata_batch_destroy(exec_ctx, &s->to_read_initial_md); - grpc_metadata_batch_destroy(exec_ctx, &s->to_read_trailing_md); + grpc_metadata_batch_destroy(&s->to_read_initial_md); + grpc_metadata_batch_destroy(&s->to_read_trailing_md); - unref_stream(exec_ctx, s->other_side, reason); + unref_stream(s->other_side, reason); s->other_side_closed = true; s->other_side = NULL; } else if (!s->other_side_closed) { @@ -371,8 +365,7 @@ static void close_other_side_locked(grpc_exec_ctx *exec_ctx, inproc_stream *s, // this stream_op_batch is only one of the pending operations for this // stream. This is called when one of the pending operations for the stream // is done and about to be NULLed out -static void complete_if_batch_end_locked(grpc_exec_ctx *exec_ctx, - inproc_stream *s, grpc_error *error, +static void complete_if_batch_end_locked(inproc_stream *s, grpc_error *error, grpc_transport_stream_op_batch *op, const char *msg) { int is_sm = (int)(op == s->send_message_op); @@ -383,22 +376,20 @@ static void complete_if_batch_end_locked(grpc_exec_ctx *exec_ctx, if ((is_sm + is_stm + is_rim + is_rm + is_rtm) == 1) { INPROC_LOG(GPR_DEBUG, "%s %p %p %p", msg, s, op, error); - GRPC_CLOSURE_SCHED(exec_ctx, op->on_complete, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(op->on_complete, GRPC_ERROR_REF(error)); } } -static void maybe_schedule_op_closure_locked(grpc_exec_ctx *exec_ctx, - inproc_stream *s, +static void maybe_schedule_op_closure_locked(inproc_stream *s, grpc_error *error) { if (s && s->ops_needed && !s->op_closure_scheduled) { - GRPC_CLOSURE_SCHED(exec_ctx, &s->op_closure, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(&s->op_closure, GRPC_ERROR_REF(error)); s->op_closure_scheduled = true; s->ops_needed = false; } } -static void fail_helper_locked(grpc_exec_ctx *exec_ctx, inproc_stream *s, - grpc_error *error) { +static void fail_helper_locked(inproc_stream *s, grpc_error *error) { INPROC_LOG(GPR_DEBUG, "op_state_machine %p fail_helper", s); // If we're failing this side, we need to make sure that // we also send or have already sent trailing metadata @@ -414,14 +405,14 @@ static void fail_helper_locked(grpc_exec_ctx *exec_ctx, inproc_stream *s, : &other->to_read_trailing_md; bool *destfilled = (other == NULL) ? &s->write_buffer_trailing_md_filled : &other->to_read_trailing_md_filled; - fill_in_metadata(exec_ctx, s, &fake_md, 0, dest, NULL, destfilled); - grpc_metadata_batch_destroy(exec_ctx, &fake_md); + fill_in_metadata(s, &fake_md, 0, dest, NULL, destfilled); + grpc_metadata_batch_destroy(&fake_md); if (other != NULL) { if (other->cancel_other_error == GRPC_ERROR_NONE) { other->cancel_other_error = GRPC_ERROR_REF(error); } - maybe_schedule_op_closure_locked(exec_ctx, other, error); + maybe_schedule_op_closure_locked(other, error); } else if (s->write_buffer_cancel_error == GRPC_ERROR_NONE) { s->write_buffer_cancel_error = GRPC_ERROR_REF(error); } @@ -435,24 +426,21 @@ static void fail_helper_locked(grpc_exec_ctx *exec_ctx, inproc_stream *s, grpc_metadata_batch_init(&fake_md); grpc_linked_mdelem *path_md = (grpc_linked_mdelem *)gpr_arena_alloc(s->arena, sizeof(*path_md)); - path_md->md = - grpc_mdelem_from_slices(exec_ctx, g_fake_path_key, g_fake_path_value); - GPR_ASSERT(grpc_metadata_batch_link_tail(exec_ctx, &fake_md, path_md) == + path_md->md = grpc_mdelem_from_slices(g_fake_path_key, g_fake_path_value); + GPR_ASSERT(grpc_metadata_batch_link_tail(&fake_md, path_md) == GRPC_ERROR_NONE); grpc_linked_mdelem *auth_md = (grpc_linked_mdelem *)gpr_arena_alloc(s->arena, sizeof(*auth_md)); - auth_md->md = - grpc_mdelem_from_slices(exec_ctx, g_fake_auth_key, g_fake_auth_value); - GPR_ASSERT(grpc_metadata_batch_link_tail(exec_ctx, &fake_md, auth_md) == + auth_md->md = grpc_mdelem_from_slices(g_fake_auth_key, g_fake_auth_value); + GPR_ASSERT(grpc_metadata_batch_link_tail(&fake_md, auth_md) == GRPC_ERROR_NONE); fill_in_metadata( - exec_ctx, s, &fake_md, 0, - s->recv_initial_md_op->payload->recv_initial_metadata - .recv_initial_metadata, + s, &fake_md, 0, s->recv_initial_md_op->payload->recv_initial_metadata + .recv_initial_metadata, s->recv_initial_md_op->payload->recv_initial_metadata.recv_flags, NULL); - grpc_metadata_batch_destroy(exec_ctx, &fake_md); + grpc_metadata_batch_destroy(&fake_md); err = GRPC_ERROR_NONE; } else { err = GRPC_ERROR_REF(error); @@ -460,14 +448,13 @@ static void fail_helper_locked(grpc_exec_ctx *exec_ctx, inproc_stream *s, INPROC_LOG(GPR_DEBUG, "fail_helper %p scheduling initial-metadata-ready %p %p", s, error, err); - GRPC_CLOSURE_SCHED(exec_ctx, - s->recv_initial_md_op->payload->recv_initial_metadata + GRPC_CLOSURE_SCHED(s->recv_initial_md_op->payload->recv_initial_metadata .recv_initial_metadata_ready, err); // Last use of err so no need to REF and then UNREF it complete_if_batch_end_locked( - exec_ctx, s, error, s->recv_initial_md_op, + s, error, s->recv_initial_md_op, "fail_helper scheduling recv-initial-metadata-on-complete"); s->recv_initial_md_op = NULL; } @@ -475,22 +462,22 @@ static void fail_helper_locked(grpc_exec_ctx *exec_ctx, inproc_stream *s, INPROC_LOG(GPR_DEBUG, "fail_helper %p scheduling message-ready %p", s, error); GRPC_CLOSURE_SCHED( - exec_ctx, s->recv_message_op->payload->recv_message.recv_message_ready, + s->recv_message_op->payload->recv_message.recv_message_ready, GRPC_ERROR_REF(error)); complete_if_batch_end_locked( - exec_ctx, s, error, s->recv_message_op, + s, error, s->recv_message_op, "fail_helper scheduling recv-message-on-complete"); s->recv_message_op = NULL; } if (s->send_message_op) { complete_if_batch_end_locked( - exec_ctx, s, error, s->send_message_op, + s, error, s->send_message_op, "fail_helper scheduling send-message-on-complete"); s->send_message_op = NULL; } if (s->send_trailing_md_op) { complete_if_batch_end_locked( - exec_ctx, s, error, s->send_trailing_md_op, + s, error, s->send_trailing_md_op, "fail_helper scheduling send-trailng-md-on-complete"); s->send_trailing_md_op = NULL; } @@ -499,23 +486,22 @@ static void fail_helper_locked(grpc_exec_ctx *exec_ctx, inproc_stream *s, "fail_helper %p scheduling trailing-md-on-complete %p", s, error); complete_if_batch_end_locked( - exec_ctx, s, error, s->recv_trailing_md_op, + s, error, s->recv_trailing_md_op, "fail_helper scheduling recv-trailing-metadata-on-complete"); s->recv_trailing_md_op = NULL; } - close_other_side_locked(exec_ctx, s, "fail_helper:other_side"); - close_stream_locked(exec_ctx, s); + close_other_side_locked(s, "fail_helper:other_side"); + close_stream_locked(s); GRPC_ERROR_UNREF(error); } -static void message_transfer_locked(grpc_exec_ctx *exec_ctx, - inproc_stream *sender, +static void message_transfer_locked(inproc_stream *sender, inproc_stream *receiver) { size_t remaining = sender->send_message_op->payload->send_message.send_message->length; if (receiver->recv_inited) { - grpc_slice_buffer_destroy_internal(exec_ctx, &receiver->recv_message); + grpc_slice_buffer_destroy_internal(&receiver->recv_message); } grpc_slice_buffer_init(&receiver->recv_message); receiver->recv_inited = true; @@ -523,13 +509,13 @@ static void message_transfer_locked(grpc_exec_ctx *exec_ctx, grpc_slice message_slice; grpc_closure unused; GPR_ASSERT(grpc_byte_stream_next( - exec_ctx, sender->send_message_op->payload->send_message.send_message, - SIZE_MAX, &unused)); + sender->send_message_op->payload->send_message.send_message, SIZE_MAX, + &unused)); grpc_error *error = grpc_byte_stream_pull( - exec_ctx, sender->send_message_op->payload->send_message.send_message, + sender->send_message_op->payload->send_message.send_message, &message_slice); if (error != GRPC_ERROR_NONE) { - cancel_stream_locked(exec_ctx, sender, GRPC_ERROR_REF(error)); + cancel_stream_locked(sender, GRPC_ERROR_REF(error)); break; } GPR_ASSERT(error == GRPC_ERROR_NONE); @@ -544,22 +530,20 @@ static void message_transfer_locked(grpc_exec_ctx *exec_ctx, INPROC_LOG(GPR_DEBUG, "message_transfer_locked %p scheduling message-ready", receiver); GRPC_CLOSURE_SCHED( - exec_ctx, receiver->recv_message_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); complete_if_batch_end_locked( - exec_ctx, sender, GRPC_ERROR_NONE, sender->send_message_op, + sender, GRPC_ERROR_NONE, sender->send_message_op, "message_transfer scheduling sender on_complete"); complete_if_batch_end_locked( - exec_ctx, receiver, GRPC_ERROR_NONE, receiver->recv_message_op, + receiver, GRPC_ERROR_NONE, receiver->recv_message_op, "message_transfer scheduling receiver on_complete"); receiver->recv_message_op = NULL; sender->send_message_op = NULL; } -static void op_state_machine(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void op_state_machine(void *arg, grpc_error *error) { // This function gets called when we have contents in the unprocessed reads // Get what we want based on our ops wanted // Schedule our appropriate closures @@ -580,26 +564,26 @@ static void op_state_machine(grpc_exec_ctx *exec_ctx, void *arg, inproc_stream *other = s->other_side; if (s->cancel_self_error != GRPC_ERROR_NONE) { - fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(s->cancel_self_error)); + fail_helper_locked(s, GRPC_ERROR_REF(s->cancel_self_error)); goto done; } else if (s->cancel_other_error != GRPC_ERROR_NONE) { - fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(s->cancel_other_error)); + fail_helper_locked(s, GRPC_ERROR_REF(s->cancel_other_error)); goto done; } else if (error != GRPC_ERROR_NONE) { - fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(error)); + fail_helper_locked(s, GRPC_ERROR_REF(error)); goto done; } if (s->send_message_op && other) { if (other->recv_message_op) { - message_transfer_locked(exec_ctx, s, other); - maybe_schedule_op_closure_locked(exec_ctx, other, GRPC_ERROR_NONE); + message_transfer_locked(s, other); + maybe_schedule_op_closure_locked(other, GRPC_ERROR_NONE); } else if (!s->t->is_client && (s->trailing_md_sent || other->recv_trailing_md_op)) { // A server send will never be matched if the client is waiting // for trailing metadata already complete_if_batch_end_locked( - exec_ctx, s, GRPC_ERROR_NONE, s->send_message_op, + s, GRPC_ERROR_NONE, s->send_message_op, "op_state_machine scheduling send-message-on-complete"); s->send_message_op = NULL; } @@ -620,28 +604,27 @@ static void op_state_machine(grpc_exec_ctx *exec_ctx, void *arg, // The buffer is already in use; that's an error! INPROC_LOG(GPR_DEBUG, "Extra trailing metadata %p", s); new_err = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Extra trailing metadata"); - fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(new_err)); + fail_helper_locked(s, GRPC_ERROR_REF(new_err)); goto done; } else { if (other && !other->closed) { - fill_in_metadata(exec_ctx, s, - s->send_trailing_md_op->payload->send_trailing_metadata - .send_trailing_metadata, + fill_in_metadata(s, s->send_trailing_md_op->payload + ->send_trailing_metadata.send_trailing_metadata, 0, dest, NULL, destfilled); } s->trailing_md_sent = true; if (!s->t->is_client && s->trailing_md_recvd && s->recv_trailing_md_op) { INPROC_LOG(GPR_DEBUG, "op_state_machine %p scheduling trailing-md-on-complete", s); - GRPC_CLOSURE_SCHED(exec_ctx, s->recv_trailing_md_op->on_complete, + GRPC_CLOSURE_SCHED(s->recv_trailing_md_op->on_complete, GRPC_ERROR_NONE); s->recv_trailing_md_op = NULL; needs_close = true; } } - maybe_schedule_op_closure_locked(exec_ctx, other, GRPC_ERROR_NONE); + maybe_schedule_op_closure_locked(other, GRPC_ERROR_NONE); complete_if_batch_end_locked( - exec_ctx, s, GRPC_ERROR_NONE, s->send_trailing_md_op, + s, GRPC_ERROR_NONE, s->send_trailing_md_op, "op_state_machine scheduling send-trailing-metadata-on-complete"); s->send_trailing_md_op = NULL; } @@ -654,31 +637,30 @@ static void op_state_machine(grpc_exec_ctx *exec_ctx, void *arg, "op_state_machine %p scheduling on_complete errors for already " "recvd initial md %p", s, new_err); - fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(new_err)); + fail_helper_locked(s, GRPC_ERROR_REF(new_err)); goto done; } if (s->to_read_initial_md_filled) { s->initial_md_recvd = true; new_err = fill_in_metadata( - exec_ctx, s, &s->to_read_initial_md, s->to_read_initial_md_flags, + s, &s->to_read_initial_md, s->to_read_initial_md_flags, s->recv_initial_md_op->payload->recv_initial_metadata .recv_initial_metadata, s->recv_initial_md_op->payload->recv_initial_metadata.recv_flags, NULL); s->recv_initial_md_op->payload->recv_initial_metadata .recv_initial_metadata->deadline = s->deadline; - grpc_metadata_batch_clear(exec_ctx, &s->to_read_initial_md); + grpc_metadata_batch_clear(&s->to_read_initial_md); s->to_read_initial_md_filled = false; INPROC_LOG(GPR_DEBUG, "op_state_machine %p scheduling initial-metadata-ready %p", s, new_err); - GRPC_CLOSURE_SCHED(exec_ctx, - s->recv_initial_md_op->payload->recv_initial_metadata + GRPC_CLOSURE_SCHED(s->recv_initial_md_op->payload->recv_initial_metadata .recv_initial_metadata_ready, GRPC_ERROR_REF(new_err)); complete_if_batch_end_locked( - exec_ctx, s, new_err, s->recv_initial_md_op, + s, new_err, s->recv_initial_md_op, "op_state_machine scheduling recv-initial-metadata-on-complete"); s->recv_initial_md_op = NULL; @@ -686,20 +668,20 @@ static void op_state_machine(grpc_exec_ctx *exec_ctx, void *arg, INPROC_LOG(GPR_DEBUG, "op_state_machine %p scheduling on_complete errors2 %p", s, new_err); - fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(new_err)); + fail_helper_locked(s, GRPC_ERROR_REF(new_err)); goto done; } } } if (s->recv_message_op) { if (other && other->send_message_op) { - message_transfer_locked(exec_ctx, other, s); - maybe_schedule_op_closure_locked(exec_ctx, other, GRPC_ERROR_NONE); + message_transfer_locked(other, s); + maybe_schedule_op_closure_locked(other, GRPC_ERROR_NONE); } } if (s->recv_trailing_md_op && s->t->is_client && other && other->send_message_op) { - maybe_schedule_op_closure_locked(exec_ctx, other, GRPC_ERROR_NONE); + maybe_schedule_op_closure_locked(other, GRPC_ERROR_NONE); } if (s->to_read_trailing_md_filled) { if (s->trailing_md_recvd) { @@ -710,7 +692,7 @@ static void op_state_machine(grpc_exec_ctx *exec_ctx, void *arg, "op_state_machine %p scheduling on_complete errors for already " "recvd trailing md %p", s, new_err); - fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(new_err)); + fail_helper_locked(s, GRPC_ERROR_REF(new_err)); goto done; } if (s->recv_message_op != NULL) { @@ -718,11 +700,10 @@ static void op_state_machine(grpc_exec_ctx *exec_ctx, void *arg, // satisfied INPROC_LOG(GPR_DEBUG, "op_state_machine %p scheduling message-ready", s); GRPC_CLOSURE_SCHED( - exec_ctx, s->recv_message_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); complete_if_batch_end_locked( - exec_ctx, s, new_err, s->recv_message_op, + s, new_err, s->recv_message_op, "op_state_machine scheduling recv-message-on-complete"); s->recv_message_op = NULL; } @@ -730,7 +711,7 @@ static void op_state_machine(grpc_exec_ctx *exec_ctx, void *arg, // Nothing further will try to receive from this stream, so finish off // any outstanding send_message op complete_if_batch_end_locked( - exec_ctx, s, new_err, s->send_message_op, + s, new_err, s->send_message_op, "op_state_machine scheduling send-message-on-complete"); s->send_message_op = NULL; } @@ -738,11 +719,11 @@ static void op_state_machine(grpc_exec_ctx *exec_ctx, void *arg, // We wanted trailing metadata and we got it s->trailing_md_recvd = true; new_err = - fill_in_metadata(exec_ctx, s, &s->to_read_trailing_md, 0, + fill_in_metadata(s, &s->to_read_trailing_md, 0, s->recv_trailing_md_op->payload ->recv_trailing_metadata.recv_trailing_metadata, NULL, NULL); - grpc_metadata_batch_clear(exec_ctx, &s->to_read_trailing_md); + grpc_metadata_batch_clear(&s->to_read_trailing_md); s->to_read_trailing_md_filled = false; // We should schedule the recv_trailing_md_op completion if @@ -754,7 +735,7 @@ static void op_state_machine(grpc_exec_ctx *exec_ctx, void *arg, INPROC_LOG(GPR_DEBUG, "op_state_machine %p scheduling trailing-md-on-complete %p", s, new_err); - GRPC_CLOSURE_SCHED(exec_ctx, s->recv_trailing_md_op->on_complete, + GRPC_CLOSURE_SCHED(s->recv_trailing_md_op->on_complete, GRPC_ERROR_REF(new_err)); s->recv_trailing_md_op = NULL; needs_close = true; @@ -775,10 +756,10 @@ static void op_state_machine(grpc_exec_ctx *exec_ctx, void *arg, // recv_message_op INPROC_LOG(GPR_DEBUG, "op_state_machine %p scheduling message-ready", s); GRPC_CLOSURE_SCHED( - exec_ctx, s->recv_message_op->payload->recv_message.recv_message_ready, + s->recv_message_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); complete_if_batch_end_locked( - exec_ctx, s, new_err, s->recv_message_op, + s, new_err, s->recv_message_op, "op_state_machine scheduling recv-message-on-complete"); s->recv_message_op = NULL; } @@ -787,7 +768,7 @@ static void op_state_machine(grpc_exec_ctx *exec_ctx, void *arg, // Nothing further will try to receive from this stream, so finish off // any outstanding send_message op complete_if_batch_end_locked( - exec_ctx, s, new_err, s->send_message_op, + s, new_err, s->send_message_op, "op_state_machine scheduling send-message-on-complete"); s->send_message_op = NULL; } @@ -803,22 +784,21 @@ static void op_state_machine(grpc_exec_ctx *exec_ctx, void *arg, } done: if (needs_close) { - close_other_side_locked(exec_ctx, s, "op_state_machine"); - close_stream_locked(exec_ctx, s); + close_other_side_locked(s, "op_state_machine"); + close_stream_locked(s); } gpr_mu_unlock(mu); GRPC_ERROR_UNREF(new_err); } -static bool cancel_stream_locked(grpc_exec_ctx *exec_ctx, inproc_stream *s, - grpc_error *error) { +static bool cancel_stream_locked(inproc_stream *s, grpc_error *error) { bool ret = false; // was the cancel accepted INPROC_LOG(GPR_DEBUG, "cancel_stream %p with %s", s, grpc_error_string(error)); if (s->cancel_self_error == GRPC_ERROR_NONE) { ret = true; s->cancel_self_error = GRPC_ERROR_REF(error); - maybe_schedule_op_closure_locked(exec_ctx, s, s->cancel_self_error); + maybe_schedule_op_closure_locked(s, s->cancel_self_error); // Send trailing md to the other side indicating cancellation, even if we // already have s->trailing_md_sent = true; @@ -831,15 +811,14 @@ static bool cancel_stream_locked(grpc_exec_ctx *exec_ctx, inproc_stream *s, : &other->to_read_trailing_md; bool *destfilled = (other == NULL) ? &s->write_buffer_trailing_md_filled : &other->to_read_trailing_md_filled; - fill_in_metadata(exec_ctx, s, &cancel_md, 0, dest, NULL, destfilled); - grpc_metadata_batch_destroy(exec_ctx, &cancel_md); + fill_in_metadata(s, &cancel_md, 0, dest, NULL, destfilled); + grpc_metadata_batch_destroy(&cancel_md); if (other != NULL) { if (other->cancel_other_error == GRPC_ERROR_NONE) { other->cancel_other_error = GRPC_ERROR_REF(s->cancel_self_error); } - maybe_schedule_op_closure_locked(exec_ctx, other, - other->cancel_other_error); + maybe_schedule_op_closure_locked(other, other->cancel_other_error); } else if (s->write_buffer_cancel_error == GRPC_ERROR_NONE) { s->write_buffer_cancel_error = GRPC_ERROR_REF(s->cancel_self_error); } @@ -849,21 +828,20 @@ static bool cancel_stream_locked(grpc_exec_ctx *exec_ctx, inproc_stream *s, // md, now's the chance if (!s->t->is_client && s->trailing_md_recvd && s->recv_trailing_md_op) { complete_if_batch_end_locked( - exec_ctx, s, s->cancel_self_error, s->recv_trailing_md_op, + s, s->cancel_self_error, s->recv_trailing_md_op, "cancel_stream scheduling trailing-md-on-complete"); s->recv_trailing_md_op = NULL; } } - close_other_side_locked(exec_ctx, s, "cancel_stream:other_side"); - close_stream_locked(exec_ctx, s); + close_other_side_locked(s, "cancel_stream:other_side"); + close_stream_locked(s); GRPC_ERROR_UNREF(error); return ret; } -static void perform_stream_op(grpc_exec_ctx *exec_ctx, grpc_transport *gt, - grpc_stream *gs, +static void perform_stream_op(grpc_transport *gt, grpc_stream *gs, grpc_transport_stream_op_batch *op) { INPROC_LOG(GPR_DEBUG, "perform_stream_op %p %p %p", gt, gs, op); inproc_stream *s = (inproc_stream *)gs; @@ -889,7 +867,7 @@ static void perform_stream_op(grpc_exec_ctx *exec_ctx, grpc_transport *gt, if (op->cancel_stream) { // Call cancel_stream_locked without ref'ing the cancel_error because // this function is responsible to make sure that that field gets unref'ed - cancel_stream_locked(exec_ctx, s, op->payload->cancel_stream.cancel_error); + cancel_stream_locked(s, op->payload->cancel_stream.cancel_error); // this op can complete without an error } else if (s->cancel_self_error != GRPC_ERROR_NONE) { // already self-canceled so still give it an error @@ -927,8 +905,7 @@ static void perform_stream_op(grpc_exec_ctx *exec_ctx, grpc_transport *gt, } else { if (!other->closed) { fill_in_metadata( - exec_ctx, s, - op->payload->send_initial_metadata.send_initial_metadata, + s, op->payload->send_initial_metadata.send_initial_metadata, op->payload->send_initial_metadata.send_initial_metadata_flags, dest, destflags, destfilled); } @@ -940,7 +917,7 @@ static void perform_stream_op(grpc_exec_ctx *exec_ctx, grpc_transport *gt, s->initial_md_sent = true; } } - maybe_schedule_op_closure_locked(exec_ctx, other, error); + maybe_schedule_op_closure_locked(other, error); } } @@ -979,7 +956,7 @@ static void perform_stream_op(grpc_exec_ctx *exec_ctx, grpc_transport *gt, (op->recv_message && (other && other->send_message_op != NULL)) || (s->to_read_trailing_md_filled || s->trailing_md_recvd)) { if (!s->op_closure_scheduled) { - GRPC_CLOSURE_SCHED(exec_ctx, &s->op_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&s->op_closure, GRPC_ERROR_NONE); s->op_closure_scheduled = true; } } else { @@ -994,7 +971,6 @@ static void perform_stream_op(grpc_exec_ctx *exec_ctx, grpc_transport *gt, "perform_stream_op error %p scheduling initial-metadata-ready %p", s, error); GRPC_CLOSURE_SCHED( - exec_ctx, op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_REF(error)); } @@ -1003,28 +979,26 @@ static void perform_stream_op(grpc_exec_ctx *exec_ctx, grpc_transport *gt, GPR_DEBUG, "perform_stream_op error %p scheduling recv message-ready %p", s, error); - GRPC_CLOSURE_SCHED(exec_ctx, - op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(op->payload->recv_message.recv_message_ready, GRPC_ERROR_REF(error)); } } INPROC_LOG(GPR_DEBUG, "perform_stream_op %p scheduling on_complete %p", s, error); - GRPC_CLOSURE_SCHED(exec_ctx, on_complete, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(on_complete, GRPC_ERROR_REF(error)); } if (needs_close) { - close_other_side_locked(exec_ctx, s, "perform_stream_op:other_side"); - close_stream_locked(exec_ctx, s); + close_other_side_locked(s, "perform_stream_op:other_side"); + close_stream_locked(s); } gpr_mu_unlock(mu); GRPC_ERROR_UNREF(error); } -static void close_transport_locked(grpc_exec_ctx *exec_ctx, - inproc_transport *t) { +static void close_transport_locked(inproc_transport *t) { INPROC_LOG(GPR_DEBUG, "close_transport %p %d", t, t->is_closed); grpc_connectivity_state_set( - exec_ctx, &t->connectivity, GRPC_CHANNEL_SHUTDOWN, + &t->connectivity, GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Closing transport."), "close transport"); if (!t->is_closed) { @@ -1033,7 +1007,7 @@ static void close_transport_locked(grpc_exec_ctx *exec_ctx, while (t->stream_list != NULL) { // cancel_stream_locked also adjusts stream list cancel_stream_locked( - exec_ctx, t->stream_list, + t->stream_list, grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Transport closed"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE)); @@ -1041,14 +1015,13 @@ static void close_transport_locked(grpc_exec_ctx *exec_ctx, } } -static void perform_transport_op(grpc_exec_ctx *exec_ctx, grpc_transport *gt, - grpc_transport_op *op) { +static void perform_transport_op(grpc_transport *gt, grpc_transport_op *op) { inproc_transport *t = (inproc_transport *)gt; INPROC_LOG(GPR_DEBUG, "perform_transport_op %p %p", t, op); gpr_mu_lock(&t->mu->mu); if (op->on_connectivity_state_change) { grpc_connectivity_state_notify_on_state_change( - exec_ctx, &t->connectivity, op->connectivity_state, + &t->connectivity, op->connectivity_state, op->on_connectivity_state_change); } if (op->set_accept_stream) { @@ -1056,7 +1029,7 @@ static void perform_transport_op(grpc_exec_ctx *exec_ctx, grpc_transport *gt, t->accept_stream_data = op->set_accept_stream_user_data; } if (op->on_consumed) { - GRPC_CLOSURE_SCHED(exec_ctx, op->on_consumed, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(op->on_consumed, GRPC_ERROR_NONE); } bool do_close = false; @@ -1070,71 +1043,68 @@ static void perform_transport_op(grpc_exec_ctx *exec_ctx, grpc_transport *gt, } if (do_close) { - close_transport_locked(exec_ctx, t); + close_transport_locked(t); } gpr_mu_unlock(&t->mu->mu); } -static void destroy_stream(grpc_exec_ctx *exec_ctx, grpc_transport *gt, - grpc_stream *gs, +static void destroy_stream(grpc_transport *gt, grpc_stream *gs, grpc_closure *then_schedule_closure) { INPROC_LOG(GPR_DEBUG, "destroy_stream %p %p", gs, then_schedule_closure); inproc_stream *s = (inproc_stream *)gs; s->closure_at_destroy = then_schedule_closure; - really_destroy_stream(exec_ctx, s); + really_destroy_stream(s); } -static void destroy_transport(grpc_exec_ctx *exec_ctx, grpc_transport *gt) { +static void destroy_transport(grpc_transport *gt) { inproc_transport *t = (inproc_transport *)gt; INPROC_LOG(GPR_DEBUG, "destroy_transport %p", t); gpr_mu_lock(&t->mu->mu); - close_transport_locked(exec_ctx, t); + close_transport_locked(t); gpr_mu_unlock(&t->mu->mu); - unref_transport(exec_ctx, t->other_side); - unref_transport(exec_ctx, t); + unref_transport(t->other_side); + unref_transport(t); } /******************************************************************************* * INTEGRATION GLUE */ -static void set_pollset(grpc_exec_ctx *exec_ctx, grpc_transport *gt, - grpc_stream *gs, grpc_pollset *pollset) { +static void set_pollset(grpc_transport *gt, grpc_stream *gs, + grpc_pollset *pollset) { // Nothing to do here } -static void set_pollset_set(grpc_exec_ctx *exec_ctx, grpc_transport *gt, - grpc_stream *gs, grpc_pollset_set *pollset_set) { +static void set_pollset_set(grpc_transport *gt, grpc_stream *gs, + grpc_pollset_set *pollset_set) { // Nothing to do here } -static grpc_endpoint *get_endpoint(grpc_exec_ctx *exec_ctx, grpc_transport *t) { - return NULL; -} +static grpc_endpoint *get_endpoint(grpc_transport *t) { return NULL; } /******************************************************************************* * GLOBAL INIT AND DESTROY */ -static void do_nothing(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) {} +static void do_nothing(void *arg, grpc_error *error) {} void grpc_inproc_transport_init(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GRPC_CLOSURE_INIT(&do_nothing_closure, do_nothing, NULL, grpc_schedule_on_exec_ctx); g_empty_slice = grpc_slice_from_static_buffer(NULL, 0); grpc_slice key_tmp = grpc_slice_from_static_string(":path"); g_fake_path_key = grpc_slice_intern(key_tmp); - grpc_slice_unref_internal(&exec_ctx, key_tmp); + grpc_slice_unref_internal(key_tmp); g_fake_path_value = grpc_slice_from_static_string("/"); grpc_slice auth_tmp = grpc_slice_from_static_string(":authority"); g_fake_auth_key = grpc_slice_intern(auth_tmp); - grpc_slice_unref_internal(&exec_ctx, auth_tmp); + grpc_slice_unref_internal(auth_tmp); g_fake_auth_value = grpc_slice_from_static_string("inproc-fail"); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static const grpc_transport_vtable inproc_vtable = { @@ -1146,8 +1116,7 @@ static const grpc_transport_vtable inproc_vtable = { /******************************************************************************* * Main inproc transport functions */ -static void inproc_transports_create(grpc_exec_ctx *exec_ctx, - grpc_transport **server_transport, +static void inproc_transports_create(grpc_transport **server_transport, const grpc_channel_args *server_args, grpc_transport **client_transport, const grpc_channel_args *client_args) { @@ -1184,7 +1153,7 @@ grpc_channel *grpc_inproc_channel_create(grpc_server *server, GRPC_API_TRACE("grpc_inproc_channel_create(server=%p, args=%p)", 2, (server, args)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; const grpc_channel_args *server_args = grpc_server_get_channel_args(server); @@ -1199,30 +1168,28 @@ grpc_channel *grpc_inproc_channel_create(grpc_server *server, grpc_transport *server_transport; grpc_transport *client_transport; - inproc_transports_create(&exec_ctx, &server_transport, server_args, - &client_transport, client_args); + inproc_transports_create(&server_transport, server_args, &client_transport, + client_args); - grpc_server_setup_transport(&exec_ctx, server, server_transport, NULL, - server_args); - grpc_channel *channel = - grpc_channel_create(&exec_ctx, "inproc", client_args, - GRPC_CLIENT_DIRECT_CHANNEL, client_transport); + grpc_server_setup_transport(server, server_transport, NULL, server_args); + grpc_channel *channel = grpc_channel_create( + "inproc", client_args, GRPC_CLIENT_DIRECT_CHANNEL, client_transport); // Free up created channel args - grpc_channel_args_destroy(&exec_ctx, client_args); + grpc_channel_args_destroy(client_args); // Now finish scheduled operations - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return channel; } void grpc_inproc_transport_shutdown(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_unref_internal(&exec_ctx, g_empty_slice); - grpc_slice_unref_internal(&exec_ctx, g_fake_path_key); - grpc_slice_unref_internal(&exec_ctx, g_fake_path_value); - grpc_slice_unref_internal(&exec_ctx, g_fake_auth_key); - grpc_slice_unref_internal(&exec_ctx, g_fake_auth_value); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_slice_unref_internal(g_empty_slice); + grpc_slice_unref_internal(g_fake_path_key); + grpc_slice_unref_internal(g_fake_path_value); + grpc_slice_unref_internal(g_fake_auth_key); + grpc_slice_unref_internal(g_fake_auth_value); + grpc_exec_ctx_finish(); } diff --git a/src/core/lib/backoff/backoff.cc b/src/core/lib/backoff/backoff.cc index fe0a7518171..bb9388e3b4f 100644 --- a/src/core/lib/backoff/backoff.cc +++ b/src/core/lib/backoff/backoff.cc @@ -32,11 +32,11 @@ void grpc_backoff_init(grpc_backoff *backoff, backoff->rng_state = (uint32_t)gpr_now(GPR_CLOCK_REALTIME).tv_nsec; } -grpc_millis grpc_backoff_begin(grpc_exec_ctx *exec_ctx, grpc_backoff *backoff) { +grpc_millis grpc_backoff_begin(grpc_backoff *backoff) { backoff->current_timeout_millis = backoff->initial_connect_timeout; const grpc_millis first_timeout = GPR_MAX(backoff->current_timeout_millis, backoff->min_timeout_millis); - return grpc_exec_ctx_now(exec_ctx) + first_timeout; + return grpc_exec_ctx_now() + first_timeout; } /* Generate a random number between 0 and 1. */ @@ -45,7 +45,7 @@ static double generate_uniform_random_number(uint32_t *rng_state) { return *rng_state / (double)((uint32_t)1 << 31); } -grpc_millis grpc_backoff_step(grpc_exec_ctx *exec_ctx, grpc_backoff *backoff) { +grpc_millis grpc_backoff_step(grpc_backoff *backoff) { const double new_timeout_millis = backoff->multiplier * (double)backoff->current_timeout_millis; backoff->current_timeout_millis = @@ -60,10 +60,10 @@ grpc_millis grpc_backoff_step(grpc_exec_ctx *exec_ctx, grpc_backoff *backoff) { (grpc_millis)((double)(backoff->current_timeout_millis) + jitter); const grpc_millis current_deadline = - grpc_exec_ctx_now(exec_ctx) + backoff->current_timeout_millis; + grpc_exec_ctx_now() + backoff->current_timeout_millis; const grpc_millis min_deadline = - grpc_exec_ctx_now(exec_ctx) + backoff->min_timeout_millis; + grpc_exec_ctx_now() + backoff->min_timeout_millis; return GPR_MAX(current_deadline, min_deadline); } diff --git a/src/core/lib/backoff/backoff.h b/src/core/lib/backoff/backoff.h index 80e49ea52ab..c48483758e2 100644 --- a/src/core/lib/backoff/backoff.h +++ b/src/core/lib/backoff/backoff.h @@ -51,9 +51,9 @@ void grpc_backoff_init(grpc_backoff *backoff, grpc_millis max_timeout_millis); /// Begin retry loop: returns a timespec for the NEXT retry -grpc_millis grpc_backoff_begin(grpc_exec_ctx *exec_ctx, grpc_backoff *backoff); +grpc_millis grpc_backoff_begin(grpc_backoff *backoff); /// Step a retry loop: returns a timespec for the NEXT retry -grpc_millis grpc_backoff_step(grpc_exec_ctx *exec_ctx, grpc_backoff *backoff); +grpc_millis grpc_backoff_step(grpc_backoff *backoff); /// Reset the backoff, so the next grpc_backoff_step will be a /// grpc_backoff_begin /// instead diff --git a/src/core/lib/channel/channel_args.cc b/src/core/lib/channel/channel_args.cc index 30248b3c609..5aa4ac2d3a4 100644 --- a/src/core/lib/channel/channel_args.cc +++ b/src/core/lib/channel/channel_args.cc @@ -188,7 +188,7 @@ grpc_channel_args *grpc_channel_args_normalize(const grpc_channel_args *a) { return b; } -void grpc_channel_args_destroy(grpc_exec_ctx *exec_ctx, grpc_channel_args *a) { +void grpc_channel_args_destroy(grpc_channel_args *a) { size_t i; if (!a) return; for (i = 0; i < a->num_args; i++) { @@ -199,8 +199,7 @@ void grpc_channel_args_destroy(grpc_exec_ctx *exec_ctx, grpc_channel_args *a) { case GRPC_ARG_INTEGER: break; case GRPC_ARG_POINTER: - a->args[i].value.pointer.vtable->destroy(exec_ctx, - a->args[i].value.pointer.p); + a->args[i].value.pointer.vtable->destroy(a->args[i].value.pointer.p); break; } gpr_free(a->args[i].key); @@ -299,8 +298,7 @@ static int find_stream_compression_algorithm_states_bitset( } grpc_channel_args *grpc_channel_args_compression_algorithm_set_state( - grpc_exec_ctx *exec_ctx, grpc_channel_args **a, - grpc_compression_algorithm algorithm, int state) { + grpc_channel_args **a, grpc_compression_algorithm algorithm, int state) { int *states_arg = NULL; grpc_channel_args *result = *a; const int states_arg_found = @@ -333,15 +331,15 @@ grpc_channel_args *grpc_channel_args_compression_algorithm_set_state( GPR_BITCLEAR((unsigned *)&tmp.value.integer, algorithm); } result = grpc_channel_args_copy_and_add(*a, &tmp, 1); - grpc_channel_args_destroy(exec_ctx, *a); + grpc_channel_args_destroy(*a); *a = result; } return result; } grpc_channel_args *grpc_channel_args_stream_compression_algorithm_set_state( - grpc_exec_ctx *exec_ctx, grpc_channel_args **a, - grpc_stream_compression_algorithm algorithm, int state) { + grpc_channel_args **a, grpc_stream_compression_algorithm algorithm, + int state) { int *states_arg = NULL; grpc_channel_args *result = *a; const int states_arg_found = @@ -375,7 +373,7 @@ grpc_channel_args *grpc_channel_args_stream_compression_algorithm_set_state( GPR_BITCLEAR((unsigned *)&tmp.value.integer, algorithm); } result = grpc_channel_args_copy_and_add(*a, &tmp, 1); - grpc_channel_args_destroy(exec_ctx, *a); + grpc_channel_args_destroy(*a); *a = result; } return result; diff --git a/src/core/lib/channel/channel_args.h b/src/core/lib/channel/channel_args.h index 1896d35cf45..6ef35621421 100644 --- a/src/core/lib/channel/channel_args.h +++ b/src/core/lib/channel/channel_args.h @@ -57,7 +57,7 @@ grpc_channel_args *grpc_channel_args_union(const grpc_channel_args *a, const grpc_channel_args *b); /** Destroy arguments created by \a grpc_channel_args_copy */ -void grpc_channel_args_destroy(grpc_exec_ctx *exec_ctx, grpc_channel_args *a); +void grpc_channel_args_destroy(grpc_channel_args *a); /** Returns the compression algorithm set in \a a. */ grpc_compression_algorithm grpc_channel_args_get_compression_algorithm( @@ -89,8 +89,7 @@ grpc_channel_args *grpc_channel_args_set_stream_compression_algorithm( * modified to point to the returned instance (which may be different from the * input value of \a a). */ grpc_channel_args *grpc_channel_args_compression_algorithm_set_state( - grpc_exec_ctx *exec_ctx, grpc_channel_args **a, - grpc_compression_algorithm algorithm, int enabled); + grpc_channel_args **a, grpc_compression_algorithm algorithm, int enabled); /** Sets the support for the given stream compression algorithm. By default, all * stream compression algorithms are enabled. It's an error to disable an @@ -100,8 +99,8 @@ grpc_channel_args *grpc_channel_args_compression_algorithm_set_state( * modified to point to the returned instance (which may be different from the * input value of \a a). */ grpc_channel_args *grpc_channel_args_stream_compression_algorithm_set_state( - grpc_exec_ctx *exec_ctx, grpc_channel_args **a, - grpc_stream_compression_algorithm algorithm, int enabled); + grpc_channel_args **a, grpc_stream_compression_algorithm algorithm, + int enabled); /** Returns the bitset representing the support state (true for enabled, false * for disabled) for compression algorithms. diff --git a/src/core/lib/channel/channel_stack.cc b/src/core/lib/channel/channel_stack.cc index 775c8bc667c..22372aa7d76 100644 --- a/src/core/lib/channel/channel_stack.cc +++ b/src/core/lib/channel/channel_stack.cc @@ -88,8 +88,8 @@ grpc_call_element *grpc_call_stack_element(grpc_call_stack *call_stack, } grpc_error *grpc_channel_stack_init( - grpc_exec_ctx *exec_ctx, int initial_refs, grpc_iomgr_cb_func destroy, - void *destroy_arg, const grpc_channel_filter **filters, size_t filter_count, + int initial_refs, grpc_iomgr_cb_func destroy, void *destroy_arg, + const grpc_channel_filter **filters, size_t filter_count, const grpc_channel_args *channel_args, grpc_transport *optional_transport, const char *name, grpc_channel_stack *stack) { size_t call_size = @@ -118,8 +118,7 @@ grpc_error *grpc_channel_stack_init( args.is_last = i == (filter_count - 1); elems[i].filter = filters[i]; elems[i].channel_data = user_data; - grpc_error *error = - elems[i].filter->init_channel_elem(exec_ctx, &elems[i], &args); + grpc_error *error = elems[i].filter->init_channel_elem(&elems[i], &args); if (error != GRPC_ERROR_NONE) { if (first_error == GRPC_ERROR_NONE) { first_error = error; @@ -139,20 +138,18 @@ grpc_error *grpc_channel_stack_init( return first_error; } -void grpc_channel_stack_destroy(grpc_exec_ctx *exec_ctx, - grpc_channel_stack *stack) { +void grpc_channel_stack_destroy(grpc_channel_stack *stack) { grpc_channel_element *channel_elems = CHANNEL_ELEMS_FROM_STACK(stack); size_t count = stack->count; size_t i; /* destroy per-filter data */ for (i = 0; i < count; i++) { - channel_elems[i].filter->destroy_channel_elem(exec_ctx, &channel_elems[i]); + channel_elems[i].filter->destroy_channel_elem(&channel_elems[i]); } } -grpc_error *grpc_call_stack_init(grpc_exec_ctx *exec_ctx, - grpc_channel_stack *channel_stack, +grpc_error *grpc_call_stack_init(grpc_channel_stack *channel_stack, int initial_refs, grpc_iomgr_cb_func destroy, void *destroy_arg, const grpc_call_element_args *elem_args) { @@ -175,8 +172,8 @@ grpc_error *grpc_call_stack_init(grpc_exec_ctx *exec_ctx, call_elems[i].filter = channel_elems[i].filter; call_elems[i].channel_data = channel_elems[i].channel_data; call_elems[i].call_data = user_data; - grpc_error *error = call_elems[i].filter->init_call_elem( - exec_ctx, &call_elems[i], elem_args); + grpc_error *error = + call_elems[i].filter->init_call_elem(&call_elems[i], elem_args); if (error != GRPC_ERROR_NONE) { if (first_error == GRPC_ERROR_NONE) { first_error = error; @@ -190,8 +187,7 @@ grpc_error *grpc_call_stack_init(grpc_exec_ctx *exec_ctx, return first_error; } -void grpc_call_stack_set_pollset_or_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_call_stack *call_stack, +void grpc_call_stack_set_pollset_or_pollset_set(grpc_call_stack *call_stack, grpc_polling_entity *pollent) { size_t count = call_stack->count; grpc_call_element *call_elems; @@ -204,18 +200,16 @@ void grpc_call_stack_set_pollset_or_pollset_set(grpc_exec_ctx *exec_ctx, /* init per-filter data */ for (i = 0; i < count; i++) { - call_elems[i].filter->set_pollset_or_pollset_set(exec_ctx, &call_elems[i], - pollent); + call_elems[i].filter->set_pollset_or_pollset_set(&call_elems[i], pollent); user_data += ROUND_UP_TO_ALIGNMENT_SIZE(call_elems[i].filter->sizeof_call_data); } } void grpc_call_stack_ignore_set_pollset_or_pollset_set( - grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - grpc_polling_entity *pollent) {} + grpc_call_element *elem, grpc_polling_entity *pollent) {} -void grpc_call_stack_destroy(grpc_exec_ctx *exec_ctx, grpc_call_stack *stack, +void grpc_call_stack_destroy(grpc_call_stack *stack, const grpc_call_final_info *final_info, grpc_closure *then_schedule_closure) { grpc_call_element *elems = CALL_ELEMS_FROM_STACK(stack); @@ -225,29 +219,26 @@ void grpc_call_stack_destroy(grpc_exec_ctx *exec_ctx, grpc_call_stack *stack, /* destroy per-filter data */ for (i = 0; i < count; i++) { elems[i].filter->destroy_call_elem( - exec_ctx, &elems[i], final_info, - i == count - 1 ? then_schedule_closure : NULL); + &elems[i], final_info, i == count - 1 ? then_schedule_closure : NULL); } } -void grpc_call_next_op(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, +void grpc_call_next_op(grpc_call_element *elem, grpc_transport_stream_op_batch *op) { grpc_call_element *next_elem = elem + 1; GRPC_CALL_LOG_OP(GPR_INFO, next_elem, op); - next_elem->filter->start_transport_stream_op_batch(exec_ctx, next_elem, op); + next_elem->filter->start_transport_stream_op_batch(next_elem, op); } -void grpc_channel_next_get_info(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +void grpc_channel_next_get_info(grpc_channel_element *elem, const grpc_channel_info *channel_info) { grpc_channel_element *next_elem = elem + 1; - next_elem->filter->get_channel_info(exec_ctx, next_elem, channel_info); + next_elem->filter->get_channel_info(next_elem, channel_info); } -void grpc_channel_next_op(grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, - grpc_transport_op *op) { +void grpc_channel_next_op(grpc_channel_element *elem, grpc_transport_op *op) { grpc_channel_element *next_elem = elem + 1; - next_elem->filter->start_transport_op(exec_ctx, next_elem, op); + next_elem->filter->start_transport_op(next_elem, op); } grpc_channel_stack *grpc_channel_stack_from_top_element( diff --git a/src/core/lib/channel/channel_stack.h b/src/core/lib/channel/channel_stack.h index 5c00c098894..6ff6394e035 100644 --- a/src/core/lib/channel/channel_stack.h +++ b/src/core/lib/channel/channel_stack.h @@ -99,14 +99,12 @@ typedef struct { typedef struct { /* Called to eg. send/receive data on a call. See grpc_call_next_op on how to call the next element in the stack */ - void (*start_transport_stream_op_batch)(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, + void (*start_transport_stream_op_batch)(grpc_call_element *elem, grpc_transport_stream_op_batch *op); /* Called to handle channel level operations - e.g. new calls, or transport closure. See grpc_channel_next_op on how to call the next element in the stack */ - void (*start_transport_op)(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, grpc_transport_op *op); + void (*start_transport_op)(grpc_channel_element *elem, grpc_transport_op *op); /* sizeof(per call data) */ size_t sizeof_call_data; @@ -119,11 +117,9 @@ typedef struct { transport and is on the server. Most filters want to ignore this argument. Implementations may assume that elem->call_data is all zeros. */ - grpc_error *(*init_call_elem)(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, + grpc_error *(*init_call_elem)(grpc_call_element *elem, const grpc_call_element_args *args); - void (*set_pollset_or_pollset_set)(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, + void (*set_pollset_or_pollset_set)(grpc_call_element *elem, grpc_polling_entity *pollent); /* Destroy per call data. The filter does not need to do any chaining. @@ -131,7 +127,7 @@ typedef struct { \a then_schedule_closure that should be passed to GRPC_CLOSURE_SCHED when destruction is complete. \a final_info contains data about the completed call, mainly for reporting purposes. */ - void (*destroy_call_elem)(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + void (*destroy_call_elem)(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *then_schedule_closure); @@ -144,16 +140,14 @@ typedef struct { useful for asserting correct configuration by upper layer code. The filter does not need to do any chaining. Implementations may assume that elem->call_data is all zeros. */ - grpc_error *(*init_channel_elem)(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, + grpc_error *(*init_channel_elem)(grpc_channel_element *elem, grpc_channel_element_args *args); /* Destroy per channel data. The filter does not need to do any chaining */ - void (*destroy_channel_elem)(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem); + void (*destroy_channel_elem)(grpc_channel_element *elem); /* Implement grpc_channel_get_info() */ - void (*get_channel_info)(grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, + void (*get_channel_info)(grpc_channel_element *elem, const grpc_channel_info *channel_info); /* The name of this filter */ @@ -211,68 +205,62 @@ size_t grpc_channel_stack_size(const grpc_channel_filter **filters, size_t filter_count); /* Initialize a channel stack given some filters */ grpc_error *grpc_channel_stack_init( - grpc_exec_ctx *exec_ctx, int initial_refs, grpc_iomgr_cb_func destroy, - void *destroy_arg, const grpc_channel_filter **filters, size_t filter_count, + int initial_refs, grpc_iomgr_cb_func destroy, void *destroy_arg, + const grpc_channel_filter **filters, size_t filter_count, const grpc_channel_args *args, grpc_transport *optional_transport, const char *name, grpc_channel_stack *stack); /* Destroy a channel stack */ -void grpc_channel_stack_destroy(grpc_exec_ctx *exec_ctx, - grpc_channel_stack *stack); +void grpc_channel_stack_destroy(grpc_channel_stack *stack); /* Initialize a call stack given a channel stack. transport_server_data is expected to be NULL on a client, or an opaque transport owned pointer on the server. */ -grpc_error *grpc_call_stack_init(grpc_exec_ctx *exec_ctx, - grpc_channel_stack *channel_stack, +grpc_error *grpc_call_stack_init(grpc_channel_stack *channel_stack, int initial_refs, grpc_iomgr_cb_func destroy, void *destroy_arg, const grpc_call_element_args *elem_args); /* Set a pollset or a pollset_set for a call stack: must occur before the first * op is started */ -void grpc_call_stack_set_pollset_or_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_call_stack *call_stack, +void grpc_call_stack_set_pollset_or_pollset_set(grpc_call_stack *call_stack, grpc_polling_entity *pollent); #ifndef NDEBUG #define GRPC_CALL_STACK_REF(call_stack, reason) \ grpc_stream_ref(&(call_stack)->refcount, reason) -#define GRPC_CALL_STACK_UNREF(exec_ctx, call_stack, reason) \ - grpc_stream_unref(exec_ctx, &(call_stack)->refcount, reason) +#define GRPC_CALL_STACK_UNREF(call_stack, reason) \ + grpc_stream_unref(&(call_stack)->refcount, reason) #define GRPC_CHANNEL_STACK_REF(channel_stack, reason) \ grpc_stream_ref(&(channel_stack)->refcount, reason) -#define GRPC_CHANNEL_STACK_UNREF(exec_ctx, channel_stack, reason) \ - grpc_stream_unref(exec_ctx, &(channel_stack)->refcount, reason) +#define GRPC_CHANNEL_STACK_UNREF(channel_stack, reason) \ + grpc_stream_unref(&(channel_stack)->refcount, reason) #else #define GRPC_CALL_STACK_REF(call_stack, reason) \ grpc_stream_ref(&(call_stack)->refcount) -#define GRPC_CALL_STACK_UNREF(exec_ctx, call_stack, reason) \ - grpc_stream_unref(exec_ctx, &(call_stack)->refcount) +#define GRPC_CALL_STACK_UNREF(call_stack, reason) \ + grpc_stream_unref(&(call_stack)->refcount) #define GRPC_CHANNEL_STACK_REF(channel_stack, reason) \ grpc_stream_ref(&(channel_stack)->refcount) -#define GRPC_CHANNEL_STACK_UNREF(exec_ctx, channel_stack, reason) \ - grpc_stream_unref(exec_ctx, &(channel_stack)->refcount) +#define GRPC_CHANNEL_STACK_UNREF(channel_stack, reason) \ + grpc_stream_unref(&(channel_stack)->refcount) #endif /* Destroy a call stack */ -void grpc_call_stack_destroy(grpc_exec_ctx *exec_ctx, grpc_call_stack *stack, +void grpc_call_stack_destroy(grpc_call_stack *stack, const grpc_call_final_info *final_info, grpc_closure *then_schedule_closure); /* Ignore set pollset{_set} - used by filters if they don't care about pollsets * at all. Does nothing. */ void grpc_call_stack_ignore_set_pollset_or_pollset_set( - grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - grpc_polling_entity *pollent); + grpc_call_element *elem, grpc_polling_entity *pollent); /* Call the next operation in a call stack */ -void grpc_call_next_op(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, +void grpc_call_next_op(grpc_call_element *elem, grpc_transport_stream_op_batch *op); /* Call the next operation (depending on call directionality) in a channel stack */ -void grpc_channel_next_op(grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, - grpc_transport_op *op); +void grpc_channel_next_op(grpc_channel_element *elem, grpc_transport_op *op); /* Pass through a request to get_channel_info() to the next child element */ -void grpc_channel_next_get_info(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +void grpc_channel_next_get_info(grpc_channel_element *elem, const grpc_channel_info *channel_info); /* Given the top element of a channel stack, get the channel stack itself */ diff --git a/src/core/lib/channel/channel_stack_builder.cc b/src/core/lib/channel/channel_stack_builder.cc index b663ebfb522..4de606a2773 100644 --- a/src/core/lib/channel/channel_stack_builder.cc +++ b/src/core/lib/channel/channel_stack_builder.cc @@ -150,10 +150,9 @@ void grpc_channel_stack_builder_set_name(grpc_channel_stack_builder *builder, } void grpc_channel_stack_builder_set_channel_arguments( - grpc_exec_ctx *exec_ctx, grpc_channel_stack_builder *builder, - const grpc_channel_args *args) { + grpc_channel_stack_builder *builder, const grpc_channel_args *args) { if (builder->args != NULL) { - grpc_channel_args_destroy(exec_ctx, builder->args); + grpc_channel_args_destroy(builder->args); } builder->args = grpc_channel_args_copy(args); } @@ -241,8 +240,7 @@ bool grpc_channel_stack_builder_add_filter_after( return true; } -void grpc_channel_stack_builder_destroy(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder) { +void grpc_channel_stack_builder_destroy(grpc_channel_stack_builder *builder) { filter_node *p = builder->begin.next; while (p != &builder->end) { filter_node *next = p->next; @@ -250,16 +248,15 @@ void grpc_channel_stack_builder_destroy(grpc_exec_ctx *exec_ctx, p = next; } if (builder->args != NULL) { - grpc_channel_args_destroy(exec_ctx, builder->args); + grpc_channel_args_destroy(builder->args); } gpr_free(builder->target); gpr_free(builder); } grpc_error *grpc_channel_stack_builder_finish( - grpc_exec_ctx *exec_ctx, grpc_channel_stack_builder *builder, - size_t prefix_bytes, int initial_refs, grpc_iomgr_cb_func destroy, - void *destroy_arg, void **result) { + grpc_channel_stack_builder *builder, size_t prefix_bytes, int initial_refs, + grpc_iomgr_cb_func destroy, void *destroy_arg, void **result) { // count the number of filters size_t num_filters = 0; for (filter_node *p = builder->begin.next; p != &builder->end; p = p->next) { @@ -284,12 +281,12 @@ grpc_error *grpc_channel_stack_builder_finish( (grpc_channel_stack *)((char *)(*result) + prefix_bytes); // and initialize it grpc_error *error = grpc_channel_stack_init( - exec_ctx, initial_refs, destroy, - destroy_arg == NULL ? *result : destroy_arg, filters, num_filters, - builder->args, builder->transport, builder->name, channel_stack); + initial_refs, destroy, destroy_arg == NULL ? *result : destroy_arg, + filters, num_filters, builder->args, builder->transport, builder->name, + channel_stack); if (error != GRPC_ERROR_NONE) { - grpc_channel_stack_destroy(exec_ctx, channel_stack); + grpc_channel_stack_destroy(channel_stack); gpr_free(*result); *result = NULL; } else { @@ -305,7 +302,7 @@ grpc_error *grpc_channel_stack_builder_finish( } } - grpc_channel_stack_builder_destroy(exec_ctx, builder); + grpc_channel_stack_builder_destroy(builder); gpr_free((grpc_channel_filter **)filters); return error; diff --git a/src/core/lib/channel/channel_stack_builder.h b/src/core/lib/channel/channel_stack_builder.h index fdff2a2b6db..683b5817f3f 100644 --- a/src/core/lib/channel/channel_stack_builder.h +++ b/src/core/lib/channel/channel_stack_builder.h @@ -58,8 +58,7 @@ grpc_transport *grpc_channel_stack_builder_get_transport( /// Set channel arguments: copies args void grpc_channel_stack_builder_set_channel_arguments( - grpc_exec_ctx *exec_ctx, grpc_channel_stack_builder *builder, - const grpc_channel_args *args); + grpc_channel_stack_builder *builder, const grpc_channel_args *args); /// Return a borrowed pointer to the channel arguments const grpc_channel_args *grpc_channel_stack_builder_get_channel_arguments( @@ -152,13 +151,11 @@ void grpc_channel_stack_builder_iterator_destroy( /// \a initial_refs, \a destroy, \a destroy_arg are as per /// grpc_channel_stack_init grpc_error *grpc_channel_stack_builder_finish( - grpc_exec_ctx *exec_ctx, grpc_channel_stack_builder *builder, - size_t prefix_bytes, int initial_refs, grpc_iomgr_cb_func destroy, - void *destroy_arg, void **result); + grpc_channel_stack_builder *builder, size_t prefix_bytes, int initial_refs, + grpc_iomgr_cb_func destroy, void *destroy_arg, void **result); /// Destroy the builder without creating a channel stack -void grpc_channel_stack_builder_destroy(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder); +void grpc_channel_stack_builder_destroy(grpc_channel_stack_builder *builder); extern grpc_tracer_flag grpc_trace_channel_stack_builder; diff --git a/src/core/lib/channel/connected_channel.cc b/src/core/lib/channel/connected_channel.cc index 4f37908958d..460e8b4c651 100644 --- a/src/core/lib/channel/connected_channel.cc +++ b/src/core/lib/channel/connected_channel.cc @@ -51,17 +51,14 @@ typedef struct connected_channel_call_data { callback_state recv_message_ready; } call_data; -static void run_in_call_combiner(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void run_in_call_combiner(void *arg, grpc_error *error) { callback_state *state = (callback_state *)arg; - GRPC_CALL_COMBINER_START(exec_ctx, state->call_combiner, - state->original_closure, GRPC_ERROR_REF(error), - state->reason); + GRPC_CALL_COMBINER_START(state->call_combiner, state->original_closure, + GRPC_ERROR_REF(error), state->reason); } -static void run_cancel_in_call_combiner(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { - run_in_call_combiner(exec_ctx, arg, error); +static void run_cancel_in_call_combiner(void *arg, grpc_error *error) { + run_in_call_combiner(arg, error); gpr_free(arg); } @@ -98,8 +95,7 @@ static callback_state *get_state_for_batch( /* Intercept a call operation and either push it directly up or translate it into transport stream operations */ static void con_start_transport_stream_op_batch( - grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - grpc_transport_stream_op_batch *batch) { + grpc_call_element *elem, grpc_transport_stream_op_batch *batch) { call_data *calld = (call_data *)elem->call_data; channel_data *chand = (channel_data *)elem->channel_data; if (batch->recv_initial_metadata) { @@ -126,58 +122,52 @@ static void con_start_transport_stream_op_batch( callback_state *state = get_state_for_batch(calld, batch); intercept_callback(calld, state, false, "on_complete", &batch->on_complete); } - grpc_transport_perform_stream_op(exec_ctx, chand->transport, - TRANSPORT_STREAM_FROM_CALL_DATA(calld), - batch); - GRPC_CALL_COMBINER_STOP(exec_ctx, calld->call_combiner, - "passed batch to transport"); + grpc_transport_perform_stream_op( + chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), batch); + GRPC_CALL_COMBINER_STOP(calld->call_combiner, "passed batch to transport"); } -static void con_start_transport_op(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static void con_start_transport_op(grpc_channel_element *elem, grpc_transport_op *op) { channel_data *chand = (channel_data *)elem->channel_data; - grpc_transport_perform_op(exec_ctx, chand->transport, op); + grpc_transport_perform_op(chand->transport, op); } /* Constructor for call_data */ -static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *init_call_elem(grpc_call_element *elem, const grpc_call_element_args *args) { call_data *calld = (call_data *)elem->call_data; channel_data *chand = (channel_data *)elem->channel_data; calld->call_combiner = args->call_combiner; int r = grpc_transport_init_stream( - exec_ctx, chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), + chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), &args->call_stack->refcount, args->server_transport_data, args->arena); return r == 0 ? GRPC_ERROR_NONE : GRPC_ERROR_CREATE_FROM_STATIC_STRING( "transport stream initialization failed"); } -static void set_pollset_or_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static void set_pollset_or_pollset_set(grpc_call_element *elem, grpc_polling_entity *pollent) { call_data *calld = (call_data *)elem->call_data; channel_data *chand = (channel_data *)elem->channel_data; - grpc_transport_set_pops(exec_ctx, chand->transport, + grpc_transport_set_pops(chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), pollent); } /* Destructor for call_data */ -static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, +static void destroy_call_elem(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *then_schedule_closure) { call_data *calld = (call_data *)elem->call_data; channel_data *chand = (channel_data *)elem->channel_data; - grpc_transport_destroy_stream(exec_ctx, chand->transport, + grpc_transport_destroy_stream(chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), then_schedule_closure); } /* Constructor for channel_data */ -static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static grpc_error *init_channel_elem(grpc_channel_element *elem, grpc_channel_element_args *args) { channel_data *cd = (channel_data *)elem->channel_data; GPR_ASSERT(args->is_last); @@ -186,17 +176,15 @@ static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, } /* Destructor for channel_data */ -static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem) { +static void destroy_channel_elem(grpc_channel_element *elem) { channel_data *cd = (channel_data *)elem->channel_data; if (cd->transport) { - grpc_transport_destroy(exec_ctx, cd->transport); + grpc_transport_destroy(cd->transport); } } /* No-op. */ -static void con_get_channel_info(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static void con_get_channel_info(grpc_channel_element *elem, const grpc_channel_info *channel_info) {} const grpc_channel_filter grpc_connected_filter = { @@ -230,8 +218,7 @@ static void bind_transport(grpc_channel_stack *channel_stack, grpc_transport_stream_size((grpc_transport *)t); } -bool grpc_add_connected_filter(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder, +bool grpc_add_connected_filter(grpc_channel_stack_builder *builder, void *arg_must_be_null) { GPR_ASSERT(arg_must_be_null == NULL); grpc_transport *t = grpc_channel_stack_builder_get_transport(builder); diff --git a/src/core/lib/channel/connected_channel.h b/src/core/lib/channel/connected_channel.h index 4615727baa1..46970061973 100644 --- a/src/core/lib/channel/connected_channel.h +++ b/src/core/lib/channel/connected_channel.h @@ -27,8 +27,7 @@ extern "C" { extern const grpc_channel_filter grpc_connected_filter; -bool grpc_add_connected_filter(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder, +bool grpc_add_connected_filter(grpc_channel_stack_builder *builder, void *arg_must_be_null); /* Debug helper to dig the transport stream out of a call element */ diff --git a/src/core/lib/channel/handshaker.cc b/src/core/lib/channel/handshaker.cc index b27ee37e5b3..ff7e10a5b92 100644 --- a/src/core/lib/channel/handshaker.cc +++ b/src/core/lib/channel/handshaker.cc @@ -34,23 +34,20 @@ void grpc_handshaker_init(const grpc_handshaker_vtable* vtable, handshaker->vtable = vtable; } -void grpc_handshaker_destroy(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker) { - handshaker->vtable->destroy(exec_ctx, handshaker); +void grpc_handshaker_destroy(grpc_handshaker* handshaker) { + handshaker->vtable->destroy(handshaker); } -void grpc_handshaker_shutdown(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker, grpc_error* why) { - handshaker->vtable->shutdown(exec_ctx, handshaker, why); +void grpc_handshaker_shutdown(grpc_handshaker* handshaker, grpc_error* why) { + handshaker->vtable->shutdown(handshaker, why); } -void grpc_handshaker_do_handshake(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker, +void grpc_handshaker_do_handshake(grpc_handshaker* handshaker, grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, grpc_handshaker_args* args) { - handshaker->vtable->do_handshake(exec_ctx, handshaker, acceptor, - on_handshake_done, args); + handshaker->vtable->do_handshake(handshaker, acceptor, on_handshake_done, + args); } // @@ -116,9 +113,9 @@ void grpc_handshake_manager_pending_list_remove(grpc_handshake_manager** head, } void grpc_handshake_manager_pending_list_shutdown_all( - grpc_exec_ctx* exec_ctx, grpc_handshake_manager* head, grpc_error* why) { + grpc_handshake_manager* head, grpc_error* why) { while (head != NULL) { - grpc_handshake_manager_shutdown(exec_ctx, head, GRPC_ERROR_REF(why)); + grpc_handshake_manager_shutdown(head, GRPC_ERROR_REF(why)); head = head->next; } GRPC_ERROR_UNREF(why); @@ -145,11 +142,10 @@ void grpc_handshake_manager_add(grpc_handshake_manager* mgr, gpr_mu_unlock(&mgr->mu); } -static void grpc_handshake_manager_unref(grpc_exec_ctx* exec_ctx, - grpc_handshake_manager* mgr) { +static void grpc_handshake_manager_unref(grpc_handshake_manager* mgr) { if (gpr_unref(&mgr->refs)) { for (size_t i = 0; i < mgr->count; ++i) { - grpc_handshaker_destroy(exec_ctx, mgr->handshakers[i]); + grpc_handshaker_destroy(mgr->handshakers[i]); } gpr_free(mgr->handshakers); gpr_mu_destroy(&mgr->mu); @@ -157,19 +153,17 @@ static void grpc_handshake_manager_unref(grpc_exec_ctx* exec_ctx, } } -void grpc_handshake_manager_destroy(grpc_exec_ctx* exec_ctx, - grpc_handshake_manager* mgr) { - grpc_handshake_manager_unref(exec_ctx, mgr); +void grpc_handshake_manager_destroy(grpc_handshake_manager* mgr) { + grpc_handshake_manager_unref(mgr); } -void grpc_handshake_manager_shutdown(grpc_exec_ctx* exec_ctx, - grpc_handshake_manager* mgr, +void grpc_handshake_manager_shutdown(grpc_handshake_manager* mgr, grpc_error* why) { gpr_mu_lock(&mgr->mu); // Shutdown the handshaker that's currently in progress, if any. if (!mgr->shutdown && mgr->index > 0) { mgr->shutdown = true; - grpc_handshaker_shutdown(exec_ctx, mgr->handshakers[mgr->index - 1], + grpc_handshaker_shutdown(mgr->handshakers[mgr->index - 1], GRPC_ERROR_REF(why)); } gpr_mu_unlock(&mgr->mu); @@ -179,8 +173,7 @@ void grpc_handshake_manager_shutdown(grpc_exec_ctx* exec_ctx, // Helper function to call either the next handshaker or the // on_handshake_done callback. // Returns true if we've scheduled the on_handshake_done callback. -static bool call_next_handshaker_locked(grpc_exec_ctx* exec_ctx, - grpc_handshake_manager* mgr, +static bool call_next_handshaker_locked(grpc_handshake_manager* mgr, grpc_error* error) { GPR_ASSERT(mgr->index <= mgr->count); // If we got an error or we've been shut down or we're exiting early or @@ -190,13 +183,12 @@ static bool call_next_handshaker_locked(grpc_exec_ctx* exec_ctx, mgr->index == mgr->count) { // Cancel deadline timer, since we're invoking the on_handshake_done // callback now. - grpc_timer_cancel(exec_ctx, &mgr->deadline_timer); - GRPC_CLOSURE_SCHED(exec_ctx, &mgr->on_handshake_done, error); + grpc_timer_cancel(&mgr->deadline_timer); + GRPC_CLOSURE_SCHED(&mgr->on_handshake_done, error); mgr->shutdown = true; } else { - grpc_handshaker_do_handshake(exec_ctx, mgr->handshakers[mgr->index], - mgr->acceptor, &mgr->call_next_handshaker, - &mgr->args); + grpc_handshaker_do_handshake(mgr->handshakers[mgr->index], mgr->acceptor, + &mgr->call_next_handshaker, &mgr->args); } ++mgr->index; return mgr->shutdown; @@ -204,36 +196,36 @@ static bool call_next_handshaker_locked(grpc_exec_ctx* exec_ctx, // A function used as the handshaker-done callback when chaining // handshakers together. -static void call_next_handshaker(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void call_next_handshaker(void* arg, grpc_error* error) { grpc_handshake_manager* mgr = (grpc_handshake_manager*)arg; gpr_mu_lock(&mgr->mu); - bool done = call_next_handshaker_locked(exec_ctx, mgr, GRPC_ERROR_REF(error)); + bool done = call_next_handshaker_locked(mgr, GRPC_ERROR_REF(error)); gpr_mu_unlock(&mgr->mu); // If we're invoked the final callback, we won't be coming back // to this function, so we can release our reference to the // handshake manager. if (done) { - grpc_handshake_manager_unref(exec_ctx, mgr); + grpc_handshake_manager_unref(mgr); } } // Callback invoked when deadline is exceeded. -static void on_timeout(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void on_timeout(void* arg, grpc_error* error) { grpc_handshake_manager* mgr = (grpc_handshake_manager*)arg; if (error == GRPC_ERROR_NONE) { // Timer fired, rather than being cancelled. grpc_handshake_manager_shutdown( - exec_ctx, mgr, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Handshake timed out")); + mgr, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Handshake timed out")); } - grpc_handshake_manager_unref(exec_ctx, mgr); + grpc_handshake_manager_unref(mgr); } -void grpc_handshake_manager_do_handshake( - grpc_exec_ctx* exec_ctx, grpc_handshake_manager* mgr, - grpc_endpoint* endpoint, const grpc_channel_args* channel_args, - grpc_millis deadline, grpc_tcp_server_acceptor* acceptor, - grpc_iomgr_cb_func on_handshake_done, void* user_data) { +void grpc_handshake_manager_do_handshake(grpc_handshake_manager* mgr, + grpc_endpoint* endpoint, + const grpc_channel_args* channel_args, + grpc_millis deadline, + grpc_tcp_server_acceptor* acceptor, + grpc_iomgr_cb_func on_handshake_done, + void* user_data) { gpr_mu_lock(&mgr->mu); GPR_ASSERT(mgr->index == 0); GPR_ASSERT(!mgr->shutdown); @@ -255,12 +247,12 @@ void grpc_handshake_manager_do_handshake( gpr_ref(&mgr->refs); GRPC_CLOSURE_INIT(&mgr->on_timeout, on_timeout, mgr, grpc_schedule_on_exec_ctx); - grpc_timer_init(exec_ctx, &mgr->deadline_timer, deadline, &mgr->on_timeout); + grpc_timer_init(&mgr->deadline_timer, deadline, &mgr->on_timeout); // Start first handshaker, which also owns a ref. gpr_ref(&mgr->refs); - bool done = call_next_handshaker_locked(exec_ctx, mgr, GRPC_ERROR_NONE); + bool done = call_next_handshaker_locked(mgr, GRPC_ERROR_NONE); gpr_mu_unlock(&mgr->mu); if (done) { - grpc_handshake_manager_unref(exec_ctx, mgr); + grpc_handshake_manager_unref(mgr); } } diff --git a/src/core/lib/channel/handshaker.h b/src/core/lib/channel/handshaker.h index 8ed38c15ba1..a7d3e5700f2 100644 --- a/src/core/lib/channel/handshaker.h +++ b/src/core/lib/channel/handshaker.h @@ -71,18 +71,17 @@ typedef struct { typedef struct { /// Destroys the handshaker. - void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_handshaker* handshaker); + void (*destroy)(grpc_handshaker* handshaker); /// Shuts down the handshaker (e.g., to clean up when the operation is /// aborted in the middle). - void (*shutdown)(grpc_exec_ctx* exec_ctx, grpc_handshaker* handshaker, - grpc_error* why); + void (*shutdown)(grpc_handshaker* handshaker, grpc_error* why); /// Performs handshaking, modifying \a args as needed (e.g., to /// replace \a endpoint with a wrapped endpoint). /// When finished, invokes \a on_handshake_done. /// \a acceptor will be NULL for client-side handshakers. - void (*do_handshake)(grpc_exec_ctx* exec_ctx, grpc_handshaker* handshaker, + void (*do_handshake)(grpc_handshaker* handshaker, grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, grpc_handshaker_args* args); @@ -98,12 +97,9 @@ struct grpc_handshaker { void grpc_handshaker_init(const grpc_handshaker_vtable* vtable, grpc_handshaker* handshaker); -void grpc_handshaker_destroy(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker); -void grpc_handshaker_shutdown(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker, grpc_error* why); -void grpc_handshaker_do_handshake(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker, +void grpc_handshaker_destroy(grpc_handshaker* handshaker); +void grpc_handshaker_shutdown(grpc_handshaker* handshaker, grpc_error* why); +void grpc_handshaker_do_handshake(grpc_handshaker* handshaker, grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, grpc_handshaker_args* args); @@ -123,15 +119,13 @@ void grpc_handshake_manager_add(grpc_handshake_manager* mgr, grpc_handshaker* handshaker); /// Destroys the handshake manager. -void grpc_handshake_manager_destroy(grpc_exec_ctx* exec_ctx, - grpc_handshake_manager* mgr); +void grpc_handshake_manager_destroy(grpc_handshake_manager* mgr); /// Shuts down the handshake manager (e.g., to clean up when the operation is /// aborted in the middle). /// The caller must still call grpc_handshake_manager_destroy() after /// calling this function. -void grpc_handshake_manager_shutdown(grpc_exec_ctx* exec_ctx, - grpc_handshake_manager* mgr, +void grpc_handshake_manager_shutdown(grpc_handshake_manager* mgr, grpc_error* why); /// Invokes handshakers in the order they were added. @@ -146,11 +140,13 @@ void grpc_handshake_manager_shutdown(grpc_exec_ctx* exec_ctx, /// GRPC_ERROR_NONE, then handshaking failed and the handshaker has done /// the necessary clean-up. Otherwise, the callback takes ownership of /// the arguments. -void grpc_handshake_manager_do_handshake( - grpc_exec_ctx* exec_ctx, grpc_handshake_manager* mgr, - grpc_endpoint* endpoint, const grpc_channel_args* channel_args, - grpc_millis deadline, grpc_tcp_server_acceptor* acceptor, - grpc_iomgr_cb_func on_handshake_done, void* user_data); +void grpc_handshake_manager_do_handshake(grpc_handshake_manager* mgr, + grpc_endpoint* endpoint, + const grpc_channel_args* channel_args, + grpc_millis deadline, + grpc_tcp_server_acceptor* acceptor, + grpc_iomgr_cb_func on_handshake_done, + void* user_data); /// Add \a mgr to the server side list of all pending handshake managers, the /// list starts with \a *head. @@ -166,7 +162,7 @@ void grpc_handshake_manager_pending_list_remove(grpc_handshake_manager** head, /// Shutdown all pending handshake managers on the server side. // Not thread-safe. Caller needs to synchronize. void grpc_handshake_manager_pending_list_shutdown_all( - grpc_exec_ctx* exec_ctx, grpc_handshake_manager* head, grpc_error* why); + grpc_handshake_manager* head, grpc_error* why); #ifdef __cplusplus } diff --git a/src/core/lib/channel/handshaker_factory.cc b/src/core/lib/channel/handshaker_factory.cc index 4deb280c60d..663cdf4a695 100644 --- a/src/core/lib/channel/handshaker_factory.cc +++ b/src/core/lib/channel/handshaker_factory.cc @@ -21,19 +21,19 @@ #include void grpc_handshaker_factory_add_handshakers( - grpc_exec_ctx *exec_ctx, grpc_handshaker_factory *handshaker_factory, - const grpc_channel_args *args, grpc_handshake_manager *handshake_mgr) { + grpc_handshaker_factory *handshaker_factory, const grpc_channel_args *args, + grpc_handshake_manager *handshake_mgr) { if (handshaker_factory != NULL) { GPR_ASSERT(handshaker_factory->vtable != NULL); - handshaker_factory->vtable->add_handshakers(exec_ctx, handshaker_factory, - args, handshake_mgr); + handshaker_factory->vtable->add_handshakers(handshaker_factory, args, + handshake_mgr); } } void grpc_handshaker_factory_destroy( - grpc_exec_ctx *exec_ctx, grpc_handshaker_factory *handshaker_factory) { + grpc_handshaker_factory *handshaker_factory) { if (handshaker_factory != NULL) { GPR_ASSERT(handshaker_factory->vtable != NULL); - handshaker_factory->vtable->destroy(exec_ctx, handshaker_factory); + handshaker_factory->vtable->destroy(handshaker_factory); } } diff --git a/src/core/lib/channel/handshaker_factory.h b/src/core/lib/channel/handshaker_factory.h index 59008adf057..ac07491d444 100644 --- a/src/core/lib/channel/handshaker_factory.h +++ b/src/core/lib/channel/handshaker_factory.h @@ -33,12 +33,10 @@ extern "C" { typedef struct grpc_handshaker_factory grpc_handshaker_factory; typedef struct { - void (*add_handshakers)(grpc_exec_ctx *exec_ctx, - grpc_handshaker_factory *handshaker_factory, + void (*add_handshakers)(grpc_handshaker_factory *handshaker_factory, const grpc_channel_args *args, grpc_handshake_manager *handshake_mgr); - void (*destroy)(grpc_exec_ctx *exec_ctx, - grpc_handshaker_factory *handshaker_factory); + void (*destroy)(grpc_handshaker_factory *handshaker_factory); } grpc_handshaker_factory_vtable; struct grpc_handshaker_factory { @@ -46,11 +44,11 @@ struct grpc_handshaker_factory { }; void grpc_handshaker_factory_add_handshakers( - grpc_exec_ctx *exec_ctx, grpc_handshaker_factory *handshaker_factory, - const grpc_channel_args *args, grpc_handshake_manager *handshake_mgr); + grpc_handshaker_factory *handshaker_factory, const grpc_channel_args *args, + grpc_handshake_manager *handshake_mgr); void grpc_handshaker_factory_destroy( - grpc_exec_ctx *exec_ctx, grpc_handshaker_factory *handshaker_factory); + grpc_handshaker_factory *handshaker_factory); #ifdef __cplusplus } diff --git a/src/core/lib/channel/handshaker_registry.cc b/src/core/lib/channel/handshaker_registry.cc index c6bc87d704c..098eabf084f 100644 --- a/src/core/lib/channel/handshaker_registry.cc +++ b/src/core/lib/channel/handshaker_registry.cc @@ -47,18 +47,17 @@ static void grpc_handshaker_factory_list_register( } static void grpc_handshaker_factory_list_add_handshakers( - grpc_exec_ctx* exec_ctx, grpc_handshaker_factory_list* list, - const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr) { + grpc_handshaker_factory_list* list, const grpc_channel_args* args, + grpc_handshake_manager* handshake_mgr) { for (size_t i = 0; i < list->num_factories; ++i) { - grpc_handshaker_factory_add_handshakers(exec_ctx, list->list[i], args, - handshake_mgr); + grpc_handshaker_factory_add_handshakers(list->list[i], args, handshake_mgr); } } static void grpc_handshaker_factory_list_destroy( - grpc_exec_ctx* exec_ctx, grpc_handshaker_factory_list* list) { + grpc_handshaker_factory_list* list) { for (size_t i = 0; i < list->num_factories; ++i) { - grpc_handshaker_factory_destroy(exec_ctx, list->list[i]); + grpc_handshaker_factory_destroy(list->list[i]); } gpr_free(list->list); } @@ -74,10 +73,9 @@ void grpc_handshaker_factory_registry_init() { memset(g_handshaker_factory_lists, 0, sizeof(g_handshaker_factory_lists)); } -void grpc_handshaker_factory_registry_shutdown(grpc_exec_ctx* exec_ctx) { +void grpc_handshaker_factory_registry_shutdown() { for (size_t i = 0; i < NUM_HANDSHAKER_TYPES; ++i) { - grpc_handshaker_factory_list_destroy(exec_ctx, - &g_handshaker_factory_lists[i]); + grpc_handshaker_factory_list_destroy(&g_handshaker_factory_lists[i]); } } @@ -88,11 +86,9 @@ void grpc_handshaker_factory_register(bool at_start, &g_handshaker_factory_lists[handshaker_type], at_start, factory); } -void grpc_handshakers_add(grpc_exec_ctx* exec_ctx, - grpc_handshaker_type handshaker_type, +void grpc_handshakers_add(grpc_handshaker_type handshaker_type, const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr) { grpc_handshaker_factory_list_add_handshakers( - exec_ctx, &g_handshaker_factory_lists[handshaker_type], args, - handshake_mgr); + &g_handshaker_factory_lists[handshaker_type], args, handshake_mgr); } diff --git a/src/core/lib/channel/handshaker_registry.h b/src/core/lib/channel/handshaker_registry.h index ddd280bea8a..edcf205feed 100644 --- a/src/core/lib/channel/handshaker_registry.h +++ b/src/core/lib/channel/handshaker_registry.h @@ -35,7 +35,7 @@ typedef enum { } grpc_handshaker_type; void grpc_handshaker_factory_registry_init(); -void grpc_handshaker_factory_registry_shutdown(grpc_exec_ctx* exec_ctx); +void grpc_handshaker_factory_registry_shutdown(); /// Registers a new handshaker factory. Takes ownership. /// If \a at_start is true, the new handshaker will be at the beginning of @@ -44,8 +44,7 @@ void grpc_handshaker_factory_register(bool at_start, grpc_handshaker_type handshaker_type, grpc_handshaker_factory* factory); -void grpc_handshakers_add(grpc_exec_ctx* exec_ctx, - grpc_handshaker_type handshaker_type, +void grpc_handshakers_add(grpc_handshaker_type handshaker_type, const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr); diff --git a/src/core/lib/compression/message_compress.cc b/src/core/lib/compression/message_compress.cc index c051e28864f..aa43a53f2b7 100644 --- a/src/core/lib/compression/message_compress.cc +++ b/src/core/lib/compression/message_compress.cc @@ -29,8 +29,8 @@ #define OUTPUT_BLOCK_SIZE 1024 -static int zlib_body(grpc_exec_ctx* exec_ctx, z_stream* zs, - grpc_slice_buffer* input, grpc_slice_buffer* output, +static int zlib_body(z_stream* zs, grpc_slice_buffer* input, + grpc_slice_buffer* output, int (*flate)(z_stream* zs, int flush)) { int r; int flush; @@ -74,7 +74,7 @@ static int zlib_body(grpc_exec_ctx* exec_ctx, z_stream* zs, return 1; error: - grpc_slice_unref_internal(exec_ctx, outbuf); + grpc_slice_unref_internal(outbuf); return 0; } @@ -84,8 +84,8 @@ static void* zalloc_gpr(void* opaque, unsigned int items, unsigned int size) { static void zfree_gpr(void* opaque, void* address) { gpr_free(address); } -static int zlib_compress(grpc_exec_ctx* exec_ctx, grpc_slice_buffer* input, - grpc_slice_buffer* output, int gzip) { +static int zlib_compress(grpc_slice_buffer* input, grpc_slice_buffer* output, + int gzip) { z_stream zs; int r; size_t i; @@ -97,11 +97,10 @@ static int zlib_compress(grpc_exec_ctx* exec_ctx, grpc_slice_buffer* input, r = deflateInit2(&zs, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 15 | (gzip ? 16 : 0), 8, Z_DEFAULT_STRATEGY); GPR_ASSERT(r == Z_OK); - r = zlib_body(exec_ctx, &zs, input, output, deflate) && - output->length < input->length; + r = zlib_body(&zs, input, output, deflate) && output->length < input->length; if (!r) { for (i = count_before; i < output->count; i++) { - grpc_slice_unref_internal(exec_ctx, output->slices[i]); + grpc_slice_unref_internal(output->slices[i]); } output->count = count_before; output->length = length_before; @@ -110,8 +109,8 @@ static int zlib_compress(grpc_exec_ctx* exec_ctx, grpc_slice_buffer* input, return r; } -static int zlib_decompress(grpc_exec_ctx* exec_ctx, grpc_slice_buffer* input, - grpc_slice_buffer* output, int gzip) { +static int zlib_decompress(grpc_slice_buffer* input, grpc_slice_buffer* output, + int gzip) { z_stream zs; int r; size_t i; @@ -122,10 +121,10 @@ static int zlib_decompress(grpc_exec_ctx* exec_ctx, grpc_slice_buffer* input, zs.zfree = zfree_gpr; r = inflateInit2(&zs, 15 | (gzip ? 16 : 0)); GPR_ASSERT(r == Z_OK); - r = zlib_body(exec_ctx, &zs, input, output, inflate); + r = zlib_body(&zs, input, output, inflate); if (!r) { for (i = count_before; i < output->count; i++) { - grpc_slice_unref_internal(exec_ctx, output->slices[i]); + grpc_slice_unref_internal(output->slices[i]); } output->count = count_before; output->length = length_before; @@ -142,8 +141,7 @@ static int copy(grpc_slice_buffer* input, grpc_slice_buffer* output) { return 1; } -static int compress_inner(grpc_exec_ctx* exec_ctx, - grpc_compression_algorithm algorithm, +static int compress_inner(grpc_compression_algorithm algorithm, grpc_slice_buffer* input, grpc_slice_buffer* output) { switch (algorithm) { case GRPC_COMPRESS_NONE: @@ -151,9 +149,9 @@ static int compress_inner(grpc_exec_ctx* exec_ctx, rely on that here */ return 0; case GRPC_COMPRESS_DEFLATE: - return zlib_compress(exec_ctx, input, output, 0); + return zlib_compress(input, output, 0); case GRPC_COMPRESS_GZIP: - return zlib_compress(exec_ctx, input, output, 1); + return zlib_compress(input, output, 1); case GRPC_COMPRESS_ALGORITHMS_COUNT: break; } @@ -161,26 +159,24 @@ static int compress_inner(grpc_exec_ctx* exec_ctx, return 0; } -int grpc_msg_compress(grpc_exec_ctx* exec_ctx, - grpc_compression_algorithm algorithm, +int grpc_msg_compress(grpc_compression_algorithm algorithm, grpc_slice_buffer* input, grpc_slice_buffer* output) { - if (!compress_inner(exec_ctx, algorithm, input, output)) { + if (!compress_inner(algorithm, input, output)) { copy(input, output); return 0; } return 1; } -int grpc_msg_decompress(grpc_exec_ctx* exec_ctx, - grpc_compression_algorithm algorithm, +int grpc_msg_decompress(grpc_compression_algorithm algorithm, grpc_slice_buffer* input, grpc_slice_buffer* output) { switch (algorithm) { case GRPC_COMPRESS_NONE: return copy(input, output); case GRPC_COMPRESS_DEFLATE: - return zlib_decompress(exec_ctx, input, output, 0); + return zlib_decompress(input, output, 0); case GRPC_COMPRESS_GZIP: - return zlib_decompress(exec_ctx, input, output, 1); + return zlib_decompress(input, output, 1); case GRPC_COMPRESS_ALGORITHMS_COUNT: break; } diff --git a/src/core/lib/compression/message_compress.h b/src/core/lib/compression/message_compress.h index fffe175fd22..9e109127ebd 100644 --- a/src/core/lib/compression/message_compress.h +++ b/src/core/lib/compression/message_compress.h @@ -29,15 +29,13 @@ extern "C" { /* compress 'input' to 'output' using 'algorithm'. On success, appends compressed slices to output and returns 1. On failure, appends uncompressed slices to output and returns 0. */ -int grpc_msg_compress(grpc_exec_ctx* exec_ctx, - grpc_compression_algorithm algorithm, +int grpc_msg_compress(grpc_compression_algorithm algorithm, grpc_slice_buffer* input, grpc_slice_buffer* output); /* decompress 'input' to 'output' using 'algorithm'. On success, appends slices to output and returns 1. On failure, output is unchanged, and returns 0. */ -int grpc_msg_decompress(grpc_exec_ctx* exec_ctx, - grpc_compression_algorithm algorithm, +int grpc_msg_decompress(grpc_compression_algorithm algorithm, grpc_slice_buffer* input, grpc_slice_buffer* output); #ifdef __cplusplus diff --git a/src/core/lib/compression/stream_compression_gzip.cc b/src/core/lib/compression/stream_compression_gzip.cc index 087b018be54..d1d55645594 100644 --- a/src/core/lib/compression/stream_compression_gzip.cc +++ b/src/core/lib/compression/stream_compression_gzip.cc @@ -40,7 +40,7 @@ static bool gzip_flate(grpc_stream_compression_context_gzip *ctx, /* Full flush is not allowed when inflating. */ GPR_ASSERT(!(ctx->flate == inflate && (flush == Z_FINISH))); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; int r; bool eoc = false; size_t original_max_output_size = max_output_size; @@ -57,8 +57,8 @@ static bool gzip_flate(grpc_stream_compression_context_gzip *ctx, r = ctx->flate(&ctx->zs, Z_NO_FLUSH); if (r < 0 && r != Z_BUF_ERROR) { gpr_log(GPR_ERROR, "zlib error (%d)", r); - grpc_slice_unref_internal(&exec_ctx, slice_out); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref_internal(slice_out); + grpc_exec_ctx_finish(); return false; } else if (r == Z_STREAM_END && ctx->flate == inflate) { eoc = true; @@ -69,7 +69,7 @@ static bool gzip_flate(grpc_stream_compression_context_gzip *ctx, grpc_slice_sub(slice, GRPC_SLICE_LENGTH(slice) - ctx->zs.avail_in, GRPC_SLICE_LENGTH(slice))); } - grpc_slice_unref_internal(&exec_ctx, slice); + grpc_slice_unref_internal(slice); } if (flush != 0 && ctx->zs.avail_out > 0 && !eoc) { GPR_ASSERT(in->length == 0); @@ -88,8 +88,8 @@ static bool gzip_flate(grpc_stream_compression_context_gzip *ctx, break; default: gpr_log(GPR_ERROR, "zlib error (%d)", r); - grpc_slice_unref_internal(&exec_ctx, slice_out); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref_internal(slice_out); + grpc_exec_ctx_finish(); return false; } } else if (flush == Z_FINISH) { @@ -104,8 +104,8 @@ static bool gzip_flate(grpc_stream_compression_context_gzip *ctx, break; default: gpr_log(GPR_ERROR, "zlib error (%d)", r); - grpc_slice_unref_internal(&exec_ctx, slice_out); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref_internal(slice_out); + grpc_exec_ctx_finish(); return false; } } @@ -117,11 +117,11 @@ static bool gzip_flate(grpc_stream_compression_context_gzip *ctx, slice_out.data.refcounted.length -= ctx->zs.avail_out; grpc_slice_buffer_add(out, slice_out); } else { - grpc_slice_unref_internal(&exec_ctx, slice_out); + grpc_slice_unref_internal(slice_out); } max_output_size -= (slice_size - ctx->zs.avail_out); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); if (end_of_context) { *end_of_context = eoc; } diff --git a/src/core/lib/debug/stats.cc b/src/core/lib/debug/stats.cc index 4096384dd92..3117de920e6 100644 --- a/src/core/lib/debug/stats.cc +++ b/src/core/lib/debug/stats.cc @@ -62,9 +62,9 @@ void grpc_stats_diff(const grpc_stats_data *b, const grpc_stats_data *a, } } -int grpc_stats_histo_find_bucket_slow(grpc_exec_ctx *exec_ctx, int value, - const int *table, int table_size) { - GRPC_STATS_INC_HISTOGRAM_SLOW_LOOKUPS(exec_ctx); +int grpc_stats_histo_find_bucket_slow(int value, const int *table, + int table_size) { + GRPC_STATS_INC_HISTOGRAM_SLOW_LOOKUPS(); const int *const start = table; while (table_size > 0) { int step = table_size / 2; diff --git a/src/core/lib/debug/stats.h b/src/core/lib/debug/stats.h index fec1d651e6a..69d1a9e6bfe 100644 --- a/src/core/lib/debug/stats.h +++ b/src/core/lib/debug/stats.h @@ -34,17 +34,15 @@ typedef struct grpc_stats_data { extern grpc_stats_data *grpc_stats_per_cpu_storage; -#define GRPC_THREAD_STATS_DATA(exec_ctx) \ +#define GRPC_THREAD_STATS_DATA() \ (&grpc_stats_per_cpu_storage[(exec_ctx)->starting_cpu]) -#define GRPC_STATS_INC_COUNTER(exec_ctx, ctr) \ - (gpr_atm_no_barrier_fetch_add( \ - &GRPC_THREAD_STATS_DATA((exec_ctx))->counters[(ctr)], 1)) +#define GRPC_STATS_INC_COUNTER(ctr) \ + (gpr_atm_no_barrier_fetch_add(&GRPC_THREAD_STATS_DATA()->counters[(ctr)], 1)) -#define GRPC_STATS_INC_HISTOGRAM(exec_ctx, histogram, index) \ - (gpr_atm_no_barrier_fetch_add( \ - &GRPC_THREAD_STATS_DATA((exec_ctx)) \ - ->histograms[histogram##_FIRST_SLOT + (index)], \ +#define GRPC_STATS_INC_HISTOGRAM(histogram, index) \ + (gpr_atm_no_barrier_fetch_add( \ + &GRPC_THREAD_STATS_DATA()->histograms[histogram##_FIRST_SLOT + (index)], \ 1)) void grpc_stats_init(void); @@ -54,8 +52,8 @@ void grpc_stats_collect(grpc_stats_data *output); void grpc_stats_diff(const grpc_stats_data *b, const grpc_stats_data *a, grpc_stats_data *c); char *grpc_stats_data_as_json(const grpc_stats_data *data); -int grpc_stats_histo_find_bucket_slow(grpc_exec_ctx *exec_ctx, int value, - const int *table, int table_size); +int grpc_stats_histo_find_bucket_slow(int value, const int *table, + int table_size); double grpc_stats_histo_percentile(const grpc_stats_data *data, grpc_stats_histograms histogram, double percentile); diff --git a/src/core/lib/debug/stats_data.cc b/src/core/lib/debug/stats_data.cc index 5d737c56cbf..9b087a5ed1b 100644 --- a/src/core/lib/debug/stats_data.cc +++ b/src/core/lib/debug/stats_data.cc @@ -339,11 +339,10 @@ const uint8_t grpc_stats_table_7[102] = { 42, 42, 43, 44, 44, 45, 46, 46, 47, 48, 48, 49, 49, 50, 50, 51, 51}; const int grpc_stats_table_8[9] = {0, 1, 2, 4, 7, 13, 23, 39, 64}; const uint8_t grpc_stats_table_9[9] = {0, 0, 1, 2, 2, 3, 4, 4, 5}; -void grpc_stats_inc_call_initial_size(grpc_exec_ctx *exec_ctx, int value) { +void grpc_stats_inc_call_initial_size(int value) { value = GPR_CLAMP(value, 0, 262144); if (value < 6) { - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_CALL_INITIAL_SIZE, - value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_CALL_INITIAL_SIZE, value); return; } union { @@ -356,19 +355,17 @@ void grpc_stats_inc_call_initial_size(grpc_exec_ctx *exec_ctx, int value) { grpc_stats_table_1[((_val.uint - 4618441417868443648ull) >> 49)] + 6; _bkt.dbl = grpc_stats_table_0[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_CALL_INITIAL_SIZE, - bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_CALL_INITIAL_SIZE, bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_CALL_INITIAL_SIZE, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_0, 64)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_CALL_INITIAL_SIZE, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_0, 64)); } -void grpc_stats_inc_poll_events_returned(grpc_exec_ctx *exec_ctx, int value) { +void grpc_stats_inc_poll_events_returned(int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 29) { - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_POLL_EVENTS_RETURNED, value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_POLL_EVENTS_RETURNED, value); return; } union { @@ -381,20 +378,17 @@ void grpc_stats_inc_poll_events_returned(grpc_exec_ctx *exec_ctx, int value) { grpc_stats_table_3[((_val.uint - 4628855992006737920ull) >> 47)] + 29; _bkt.dbl = grpc_stats_table_2[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_POLL_EVENTS_RETURNED, bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_POLL_EVENTS_RETURNED, bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_POLL_EVENTS_RETURNED, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_2, 128)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_POLL_EVENTS_RETURNED, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_2, 128)); } -void grpc_stats_inc_tcp_write_size(grpc_exec_ctx *exec_ctx, int value) { +void grpc_stats_inc_tcp_write_size(int value) { value = GPR_CLAMP(value, 0, 16777216); if (value < 5) { - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_WRITE_SIZE, - value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_WRITE_SIZE, value); return; } union { @@ -407,19 +401,17 @@ void grpc_stats_inc_tcp_write_size(grpc_exec_ctx *exec_ctx, int value) { grpc_stats_table_5[((_val.uint - 4617315517961601024ull) >> 50)] + 5; _bkt.dbl = grpc_stats_table_4[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_WRITE_SIZE, - bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_WRITE_SIZE, bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_WRITE_SIZE, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_4, 64)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_TCP_WRITE_SIZE, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_4, 64)); } -void grpc_stats_inc_tcp_write_iov_size(grpc_exec_ctx *exec_ctx, int value) { +void grpc_stats_inc_tcp_write_iov_size(int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 13) { - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_TCP_WRITE_IOV_SIZE, value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_WRITE_IOV_SIZE, value); return; } union { @@ -432,19 +424,17 @@ void grpc_stats_inc_tcp_write_iov_size(grpc_exec_ctx *exec_ctx, int value) { grpc_stats_table_7[((_val.uint - 4623507967449235456ull) >> 48)] + 13; _bkt.dbl = grpc_stats_table_6[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_TCP_WRITE_IOV_SIZE, bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_WRITE_IOV_SIZE, bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_WRITE_IOV_SIZE, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_6, 64)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_TCP_WRITE_IOV_SIZE, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_6, 64)); } -void grpc_stats_inc_tcp_read_size(grpc_exec_ctx *exec_ctx, int value) { +void grpc_stats_inc_tcp_read_size(int value) { value = GPR_CLAMP(value, 0, 16777216); if (value < 5) { - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_SIZE, - value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_READ_SIZE, value); return; } union { @@ -457,19 +447,17 @@ void grpc_stats_inc_tcp_read_size(grpc_exec_ctx *exec_ctx, int value) { grpc_stats_table_5[((_val.uint - 4617315517961601024ull) >> 50)] + 5; _bkt.dbl = grpc_stats_table_4[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_SIZE, - bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_READ_SIZE, bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_SIZE, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_4, 64)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_TCP_READ_SIZE, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_4, 64)); } -void grpc_stats_inc_tcp_read_offer(grpc_exec_ctx *exec_ctx, int value) { +void grpc_stats_inc_tcp_read_offer(int value) { value = GPR_CLAMP(value, 0, 16777216); if (value < 5) { - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_OFFER, - value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_READ_OFFER, value); return; } union { @@ -482,20 +470,18 @@ void grpc_stats_inc_tcp_read_offer(grpc_exec_ctx *exec_ctx, int value) { grpc_stats_table_5[((_val.uint - 4617315517961601024ull) >> 50)] + 5; _bkt.dbl = grpc_stats_table_4[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_OFFER, - bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_READ_OFFER, bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_OFFER, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_4, 64)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_TCP_READ_OFFER, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_4, 64)); } -void grpc_stats_inc_tcp_read_offer_iov_size(grpc_exec_ctx *exec_ctx, - int value) { +void grpc_stats_inc_tcp_read_offer_iov_size(int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 13) { - GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_OFFER_IOV_SIZE, value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_READ_OFFER_IOV_SIZE, + value); return; } union { @@ -508,21 +494,19 @@ void grpc_stats_inc_tcp_read_offer_iov_size(grpc_exec_ctx *exec_ctx, grpc_stats_table_7[((_val.uint - 4623507967449235456ull) >> 48)] + 13; _bkt.dbl = grpc_stats_table_6[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_OFFER_IOV_SIZE, bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_READ_OFFER_IOV_SIZE, + bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_TCP_READ_OFFER_IOV_SIZE, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_6, 64)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_TCP_READ_OFFER_IOV_SIZE, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_6, 64)); } -void grpc_stats_inc_http2_send_message_size(grpc_exec_ctx *exec_ctx, - int value) { +void grpc_stats_inc_http2_send_message_size(int value) { value = GPR_CLAMP(value, 0, 16777216); if (value < 5) { - GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_SIZE, value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_SIZE, + value); return; } union { @@ -535,22 +519,19 @@ void grpc_stats_inc_http2_send_message_size(grpc_exec_ctx *exec_ctx, grpc_stats_table_5[((_val.uint - 4617315517961601024ull) >> 50)] + 5; _bkt.dbl = grpc_stats_table_4[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_SIZE, bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_SIZE, + bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_SIZE, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_4, 64)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_SIZE, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_4, 64)); } -void grpc_stats_inc_http2_send_initial_metadata_per_write( - grpc_exec_ctx *exec_ctx, int value) { +void grpc_stats_inc_http2_send_initial_metadata_per_write(int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 13) { GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_INITIAL_METADATA_PER_WRITE, - value); + GRPC_STATS_HISTOGRAM_HTTP2_SEND_INITIAL_METADATA_PER_WRITE, value); return; } union { @@ -564,21 +545,18 @@ void grpc_stats_inc_http2_send_initial_metadata_per_write( _bkt.dbl = grpc_stats_table_6[bucket]; bucket -= (_val.uint < _bkt.uint); GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_INITIAL_METADATA_PER_WRITE, - bucket); + GRPC_STATS_HISTOGRAM_HTTP2_SEND_INITIAL_METADATA_PER_WRITE, bucket); return; } GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_INITIAL_METADATA_PER_WRITE, - grpc_stats_histo_find_bucket_slow((exec_ctx), value, grpc_stats_table_6, - 64)); + GRPC_STATS_HISTOGRAM_HTTP2_SEND_INITIAL_METADATA_PER_WRITE, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_6, 64)); } -void grpc_stats_inc_http2_send_message_per_write(grpc_exec_ctx *exec_ctx, - int value) { +void grpc_stats_inc_http2_send_message_per_write(int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 13) { - GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_PER_WRITE, value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_PER_WRITE, + value); return; } union { @@ -591,22 +569,19 @@ void grpc_stats_inc_http2_send_message_per_write(grpc_exec_ctx *exec_ctx, grpc_stats_table_7[((_val.uint - 4623507967449235456ull) >> 48)] + 13; _bkt.dbl = grpc_stats_table_6[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_PER_WRITE, bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_PER_WRITE, + bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_PER_WRITE, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_6, 64)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_PER_WRITE, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_6, 64)); } -void grpc_stats_inc_http2_send_trailing_metadata_per_write( - grpc_exec_ctx *exec_ctx, int value) { +void grpc_stats_inc_http2_send_trailing_metadata_per_write(int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 13) { GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_TRAILING_METADATA_PER_WRITE, - value); + GRPC_STATS_HISTOGRAM_HTTP2_SEND_TRAILING_METADATA_PER_WRITE, value); return; } union { @@ -620,21 +595,18 @@ void grpc_stats_inc_http2_send_trailing_metadata_per_write( _bkt.dbl = grpc_stats_table_6[bucket]; bucket -= (_val.uint < _bkt.uint); GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_TRAILING_METADATA_PER_WRITE, - bucket); + GRPC_STATS_HISTOGRAM_HTTP2_SEND_TRAILING_METADATA_PER_WRITE, bucket); return; } GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_TRAILING_METADATA_PER_WRITE, - grpc_stats_histo_find_bucket_slow((exec_ctx), value, grpc_stats_table_6, - 64)); + GRPC_STATS_HISTOGRAM_HTTP2_SEND_TRAILING_METADATA_PER_WRITE, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_6, 64)); } -void grpc_stats_inc_http2_send_flowctl_per_write(grpc_exec_ctx *exec_ctx, - int value) { +void grpc_stats_inc_http2_send_flowctl_per_write(int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 13) { - GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_FLOWCTL_PER_WRITE, value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_HTTP2_SEND_FLOWCTL_PER_WRITE, + value); return; } union { @@ -647,20 +619,18 @@ void grpc_stats_inc_http2_send_flowctl_per_write(grpc_exec_ctx *exec_ctx, grpc_stats_table_7[((_val.uint - 4623507967449235456ull) >> 48)] + 13; _bkt.dbl = grpc_stats_table_6[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_FLOWCTL_PER_WRITE, bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_HTTP2_SEND_FLOWCTL_PER_WRITE, + bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_HTTP2_SEND_FLOWCTL_PER_WRITE, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_6, 64)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_HTTP2_SEND_FLOWCTL_PER_WRITE, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_6, 64)); } -void grpc_stats_inc_server_cqs_checked(grpc_exec_ctx *exec_ctx, int value) { +void grpc_stats_inc_server_cqs_checked(int value) { value = GPR_CLAMP(value, 0, 64); if (value < 3) { - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED, value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED, value); return; } union { @@ -673,13 +643,12 @@ void grpc_stats_inc_server_cqs_checked(grpc_exec_ctx *exec_ctx, int value) { grpc_stats_table_9[((_val.uint - 4613937818241073152ull) >> 51)] + 3; _bkt.dbl = grpc_stats_table_8[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED, bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED, bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_8, 8)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_8, 8)); } const int grpc_stats_histo_buckets[13] = {64, 128, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 8}; @@ -691,7 +660,7 @@ const int *const grpc_stats_histo_bucket_boundaries[13] = { grpc_stats_table_6, grpc_stats_table_4, grpc_stats_table_6, grpc_stats_table_6, grpc_stats_table_6, grpc_stats_table_6, grpc_stats_table_8}; -void (*const grpc_stats_inc_histogram[13])(grpc_exec_ctx *exec_ctx, int x) = { +void (*const grpc_stats_inc_histogram[13])(int x) = { grpc_stats_inc_call_initial_size, grpc_stats_inc_poll_events_returned, grpc_stats_inc_tcp_write_size, diff --git a/src/core/lib/debug/stats_data.h b/src/core/lib/debug/stats_data.h index 031942df5c5..a92153ee89f 100644 --- a/src/core/lib/debug/stats_data.h +++ b/src/core/lib/debug/stats_data.h @@ -176,331 +176,263 @@ typedef enum { GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED_BUCKETS = 8, GRPC_STATS_HISTOGRAM_BUCKETS = 840 } grpc_stats_histogram_constants; -#define GRPC_STATS_INC_CLIENT_CALLS_CREATED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_CLIENT_CALLS_CREATED) -#define GRPC_STATS_INC_SERVER_CALLS_CREATED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SERVER_CALLS_CREATED) -#define GRPC_STATS_INC_CQS_CREATED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_CQS_CREATED) -#define GRPC_STATS_INC_CLIENT_CHANNELS_CREATED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_CLIENT_CHANNELS_CREATED) -#define GRPC_STATS_INC_CLIENT_SUBCHANNELS_CREATED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_CLIENT_SUBCHANNELS_CREATED) -#define GRPC_STATS_INC_SERVER_CHANNELS_CREATED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SERVER_CHANNELS_CREATED) -#define GRPC_STATS_INC_SYSCALL_POLL(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SYSCALL_POLL) -#define GRPC_STATS_INC_SYSCALL_WAIT(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SYSCALL_WAIT) -#define GRPC_STATS_INC_POLLSET_KICK(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_POLLSET_KICK) -#define GRPC_STATS_INC_POLLSET_KICKED_WITHOUT_POLLER(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_POLLSET_KICKED_WITHOUT_POLLER) -#define GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_POLLSET_KICKED_AGAIN) -#define GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_POLLSET_KICK_WAKEUP_FD) -#define GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_POLLSET_KICK_WAKEUP_CV) -#define GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_POLLSET_KICK_OWN_THREAD) -#define GRPC_STATS_INC_HISTOGRAM_SLOW_LOOKUPS(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HISTOGRAM_SLOW_LOOKUPS) -#define GRPC_STATS_INC_SYSCALL_WRITE(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SYSCALL_WRITE) -#define GRPC_STATS_INC_SYSCALL_READ(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SYSCALL_READ) -#define GRPC_STATS_INC_TCP_BACKUP_POLLERS_CREATED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_TCP_BACKUP_POLLERS_CREATED) -#define GRPC_STATS_INC_TCP_BACKUP_POLLER_POLLS(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_TCP_BACKUP_POLLER_POLLS) -#define GRPC_STATS_INC_HTTP2_OP_BATCHES(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_OP_BATCHES) -#define GRPC_STATS_INC_HTTP2_OP_CANCEL(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_OP_CANCEL) -#define GRPC_STATS_INC_HTTP2_OP_SEND_INITIAL_METADATA(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HTTP2_OP_SEND_INITIAL_METADATA) -#define GRPC_STATS_INC_HTTP2_OP_SEND_MESSAGE(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_OP_SEND_MESSAGE) -#define GRPC_STATS_INC_HTTP2_OP_SEND_TRAILING_METADATA(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HTTP2_OP_SEND_TRAILING_METADATA) -#define GRPC_STATS_INC_HTTP2_OP_RECV_INITIAL_METADATA(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HTTP2_OP_RECV_INITIAL_METADATA) -#define GRPC_STATS_INC_HTTP2_OP_RECV_MESSAGE(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_OP_RECV_MESSAGE) -#define GRPC_STATS_INC_HTTP2_OP_RECV_TRAILING_METADATA(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HTTP2_OP_RECV_TRAILING_METADATA) -#define GRPC_STATS_INC_HTTP2_SETTINGS_WRITES(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_SETTINGS_WRITES) -#define GRPC_STATS_INC_HTTP2_PINGS_SENT(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_PINGS_SENT) -#define GRPC_STATS_INC_HTTP2_WRITES_BEGUN(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_WRITES_BEGUN) -#define GRPC_STATS_INC_HTTP2_WRITES_OFFLOADED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_WRITES_OFFLOADED) -#define GRPC_STATS_INC_HTTP2_WRITES_CONTINUED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_WRITES_CONTINUED) -#define GRPC_STATS_INC_HTTP2_PARTIAL_WRITES(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_PARTIAL_WRITES) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_INITIAL_WRITE(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_CLIENT_CALLS_CREATED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CLIENT_CALLS_CREATED) +#define GRPC_STATS_INC_SERVER_CALLS_CREATED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SERVER_CALLS_CREATED) +#define GRPC_STATS_INC_CQS_CREATED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CQS_CREATED) +#define GRPC_STATS_INC_CLIENT_CHANNELS_CREATED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CLIENT_CHANNELS_CREATED) +#define GRPC_STATS_INC_CLIENT_SUBCHANNELS_CREATED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CLIENT_SUBCHANNELS_CREATED) +#define GRPC_STATS_INC_SERVER_CHANNELS_CREATED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SERVER_CHANNELS_CREATED) +#define GRPC_STATS_INC_SYSCALL_POLL() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SYSCALL_POLL) +#define GRPC_STATS_INC_SYSCALL_WAIT() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SYSCALL_WAIT) +#define GRPC_STATS_INC_POLLSET_KICK() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_POLLSET_KICK) +#define GRPC_STATS_INC_POLLSET_KICKED_WITHOUT_POLLER() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_POLLSET_KICKED_WITHOUT_POLLER) +#define GRPC_STATS_INC_POLLSET_KICKED_AGAIN() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_POLLSET_KICKED_AGAIN) +#define GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_POLLSET_KICK_WAKEUP_FD) +#define GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_POLLSET_KICK_WAKEUP_CV) +#define GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_POLLSET_KICK_OWN_THREAD) +#define GRPC_STATS_INC_HISTOGRAM_SLOW_LOOKUPS() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HISTOGRAM_SLOW_LOOKUPS) +#define GRPC_STATS_INC_SYSCALL_WRITE() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SYSCALL_WRITE) +#define GRPC_STATS_INC_SYSCALL_READ() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SYSCALL_READ) +#define GRPC_STATS_INC_TCP_BACKUP_POLLERS_CREATED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_TCP_BACKUP_POLLERS_CREATED) +#define GRPC_STATS_INC_TCP_BACKUP_POLLER_POLLS() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_TCP_BACKUP_POLLER_POLLS) +#define GRPC_STATS_INC_HTTP2_OP_BATCHES() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_BATCHES) +#define GRPC_STATS_INC_HTTP2_OP_CANCEL() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_CANCEL) +#define GRPC_STATS_INC_HTTP2_OP_SEND_INITIAL_METADATA() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_SEND_INITIAL_METADATA) +#define GRPC_STATS_INC_HTTP2_OP_SEND_MESSAGE() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_SEND_MESSAGE) +#define GRPC_STATS_INC_HTTP2_OP_SEND_TRAILING_METADATA() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_SEND_TRAILING_METADATA) +#define GRPC_STATS_INC_HTTP2_OP_RECV_INITIAL_METADATA() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_RECV_INITIAL_METADATA) +#define GRPC_STATS_INC_HTTP2_OP_RECV_MESSAGE() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_RECV_MESSAGE) +#define GRPC_STATS_INC_HTTP2_OP_RECV_TRAILING_METADATA() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_RECV_TRAILING_METADATA) +#define GRPC_STATS_INC_HTTP2_SETTINGS_WRITES() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_SETTINGS_WRITES) +#define GRPC_STATS_INC_HTTP2_PINGS_SENT() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_PINGS_SENT) +#define GRPC_STATS_INC_HTTP2_WRITES_BEGUN() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_WRITES_BEGUN) +#define GRPC_STATS_INC_HTTP2_WRITES_OFFLOADED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_WRITES_OFFLOADED) +#define GRPC_STATS_INC_HTTP2_WRITES_CONTINUED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_WRITES_CONTINUED) +#define GRPC_STATS_INC_HTTP2_PARTIAL_WRITES() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_PARTIAL_WRITES) +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_INITIAL_WRITE() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_INITIAL_WRITE) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_START_NEW_STREAM(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_START_NEW_STREAM() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_START_NEW_STREAM) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_MESSAGE(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_SEND_MESSAGE) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_INITIAL_METADATA( \ - exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ - GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_SEND_INITIAL_METADATA) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_TRAILING_METADATA( \ - exec_ctx) \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_MESSAGE() \ + GRPC_STATS_INC_COUNTER( \ + GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_SEND_MESSAGE) +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_INITIAL_METADATA() \ GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ + GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_SEND_INITIAL_METADATA) +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_TRAILING_METADATA() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_SEND_TRAILING_METADATA) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RETRY_SEND_PING(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RETRY_SEND_PING() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_RETRY_SEND_PING) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CONTINUE_PINGS(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CONTINUE_PINGS() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_CONTINUE_PINGS) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_GOAWAY_SENT(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_GOAWAY_SENT) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RST_STREAM(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_RST_STREAM) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CLOSE_FROM_API(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_GOAWAY_SENT() \ + GRPC_STATS_INC_COUNTER( \ + GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_GOAWAY_SENT) +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RST_STREAM() \ + GRPC_STATS_INC_COUNTER( \ + GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_RST_STREAM) +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CLOSE_FROM_API() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_CLOSE_FROM_API) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_STREAM_FLOW_CONTROL( \ - exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_STREAM_FLOW_CONTROL() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_STREAM_FLOW_CONTROL) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL( \ - exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_SETTINGS(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_SETTINGS() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_SEND_SETTINGS) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_BDP_ESTIMATOR_PING( \ - exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_BDP_ESTIMATOR_PING() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_BDP_ESTIMATOR_PING) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_SETTING( \ - exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_SETTING() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_SETTING) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_UPDATE( \ - exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_UPDATE() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_UPDATE) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_APPLICATION_PING(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_APPLICATION_PING() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_APPLICATION_PING) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_KEEPALIVE_PING(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_KEEPALIVE_PING() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_KEEPALIVE_PING) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL_UNSTALLED( \ - exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL_UNSTALLED() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL_UNSTALLED) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_PING_RESPONSE(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_PING_RESPONSE() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_PING_RESPONSE) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FORCE_RST_STREAM(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ - GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_FORCE_RST_STREAM) -#define GRPC_STATS_INC_HTTP2_SPURIOUS_WRITES_BEGUN(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HTTP2_SPURIOUS_WRITES_BEGUN) -#define GRPC_STATS_INC_HPACK_RECV_INDEXED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_RECV_INDEXED) -#define GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_INCIDX) -#define GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX_V(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_INCIDX_V) -#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NOTIDX) -#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX_V(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NOTIDX_V) -#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NVRIDX) -#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX_V(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NVRIDX_V) -#define GRPC_STATS_INC_HPACK_RECV_UNCOMPRESSED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_RECV_UNCOMPRESSED) -#define GRPC_STATS_INC_HPACK_RECV_HUFFMAN(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_RECV_HUFFMAN) -#define GRPC_STATS_INC_HPACK_RECV_BINARY(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_RECV_BINARY) -#define GRPC_STATS_INC_HPACK_RECV_BINARY_BASE64(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_RECV_BINARY_BASE64) -#define GRPC_STATS_INC_HPACK_SEND_INDEXED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_SEND_INDEXED) -#define GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_INCIDX) -#define GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX_V(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_INCIDX_V) -#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NOTIDX) -#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX_V(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NOTIDX_V) -#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NVRIDX(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NVRIDX) -#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NVRIDX_V(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NVRIDX_V) -#define GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_SEND_UNCOMPRESSED) -#define GRPC_STATS_INC_HPACK_SEND_HUFFMAN(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_SEND_HUFFMAN) -#define GRPC_STATS_INC_HPACK_SEND_BINARY(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_SEND_BINARY) -#define GRPC_STATS_INC_HPACK_SEND_BINARY_BASE64(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_SEND_BINARY_BASE64) -#define GRPC_STATS_INC_COMBINER_LOCKS_INITIATED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_COMBINER_LOCKS_INITIATED) -#define GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_ITEMS(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_COMBINER_LOCKS_SCHEDULED_ITEMS) -#define GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS(exec_ctx) \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FORCE_RST_STREAM() \ GRPC_STATS_INC_COUNTER( \ - (exec_ctx), GRPC_STATS_COUNTER_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS) -#define GRPC_STATS_INC_COMBINER_LOCKS_OFFLOADED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_COMBINER_LOCKS_OFFLOADED) -#define GRPC_STATS_INC_CALL_COMBINER_LOCKS_INITIATED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_CALL_COMBINER_LOCKS_INITIATED) -#define GRPC_STATS_INC_CALL_COMBINER_LOCKS_SCHEDULED_ITEMS(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), GRPC_STATS_COUNTER_CALL_COMBINER_LOCKS_SCHEDULED_ITEMS) -#define GRPC_STATS_INC_CALL_COMBINER_SET_NOTIFY_ON_CANCEL(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), GRPC_STATS_COUNTER_CALL_COMBINER_SET_NOTIFY_ON_CANCEL) -#define GRPC_STATS_INC_CALL_COMBINER_CANCELLED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_CALL_COMBINER_CANCELLED) -#define GRPC_STATS_INC_EXECUTOR_SCHEDULED_SHORT_ITEMS(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_EXECUTOR_SCHEDULED_SHORT_ITEMS) -#define GRPC_STATS_INC_EXECUTOR_SCHEDULED_LONG_ITEMS(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_EXECUTOR_SCHEDULED_LONG_ITEMS) -#define GRPC_STATS_INC_EXECUTOR_SCHEDULED_TO_SELF(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_EXECUTOR_SCHEDULED_TO_SELF) -#define GRPC_STATS_INC_EXECUTOR_WAKEUP_INITIATED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_EXECUTOR_WAKEUP_INITIATED) -#define GRPC_STATS_INC_EXECUTOR_QUEUE_DRAINED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_EXECUTOR_QUEUE_DRAINED) -#define GRPC_STATS_INC_EXECUTOR_PUSH_RETRIES(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_EXECUTOR_PUSH_RETRIES) -#define GRPC_STATS_INC_SERVER_REQUESTED_CALLS(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SERVER_REQUESTED_CALLS) -#define GRPC_STATS_INC_SERVER_SLOWPATH_REQUESTS_QUEUED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_SERVER_SLOWPATH_REQUESTS_QUEUED) -#define GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_FAILURES(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_CQ_EV_QUEUE_TRYLOCK_FAILURES) -#define GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_SUCCESSES(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_CQ_EV_QUEUE_TRYLOCK_SUCCESSES) -#define GRPC_STATS_INC_CQ_EV_QUEUE_TRANSIENT_POP_FAILURES(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), GRPC_STATS_COUNTER_CQ_EV_QUEUE_TRANSIENT_POP_FAILURES) -#define GRPC_STATS_INC_CALL_INITIAL_SIZE(exec_ctx, value) \ - grpc_stats_inc_call_initial_size((exec_ctx), (int)(value)) -void grpc_stats_inc_call_initial_size(grpc_exec_ctx *exec_ctx, int x); -#define GRPC_STATS_INC_POLL_EVENTS_RETURNED(exec_ctx, value) \ - grpc_stats_inc_poll_events_returned((exec_ctx), (int)(value)) -void grpc_stats_inc_poll_events_returned(grpc_exec_ctx *exec_ctx, int x); -#define GRPC_STATS_INC_TCP_WRITE_SIZE(exec_ctx, value) \ - grpc_stats_inc_tcp_write_size((exec_ctx), (int)(value)) -void grpc_stats_inc_tcp_write_size(grpc_exec_ctx *exec_ctx, int x); -#define GRPC_STATS_INC_TCP_WRITE_IOV_SIZE(exec_ctx, value) \ - grpc_stats_inc_tcp_write_iov_size((exec_ctx), (int)(value)) -void grpc_stats_inc_tcp_write_iov_size(grpc_exec_ctx *exec_ctx, int x); -#define GRPC_STATS_INC_TCP_READ_SIZE(exec_ctx, value) \ - grpc_stats_inc_tcp_read_size((exec_ctx), (int)(value)) -void grpc_stats_inc_tcp_read_size(grpc_exec_ctx *exec_ctx, int x); -#define GRPC_STATS_INC_TCP_READ_OFFER(exec_ctx, value) \ - grpc_stats_inc_tcp_read_offer((exec_ctx), (int)(value)) -void grpc_stats_inc_tcp_read_offer(grpc_exec_ctx *exec_ctx, int x); -#define GRPC_STATS_INC_TCP_READ_OFFER_IOV_SIZE(exec_ctx, value) \ - grpc_stats_inc_tcp_read_offer_iov_size((exec_ctx), (int)(value)) -void grpc_stats_inc_tcp_read_offer_iov_size(grpc_exec_ctx *exec_ctx, int x); -#define GRPC_STATS_INC_HTTP2_SEND_MESSAGE_SIZE(exec_ctx, value) \ - grpc_stats_inc_http2_send_message_size((exec_ctx), (int)(value)) -void grpc_stats_inc_http2_send_message_size(grpc_exec_ctx *exec_ctx, int x); -#define GRPC_STATS_INC_HTTP2_SEND_INITIAL_METADATA_PER_WRITE(exec_ctx, value) \ - grpc_stats_inc_http2_send_initial_metadata_per_write((exec_ctx), (int)(value)) -void grpc_stats_inc_http2_send_initial_metadata_per_write( - grpc_exec_ctx *exec_ctx, int x); -#define GRPC_STATS_INC_HTTP2_SEND_MESSAGE_PER_WRITE(exec_ctx, value) \ - grpc_stats_inc_http2_send_message_per_write((exec_ctx), (int)(value)) -void grpc_stats_inc_http2_send_message_per_write(grpc_exec_ctx *exec_ctx, - int x); -#define GRPC_STATS_INC_HTTP2_SEND_TRAILING_METADATA_PER_WRITE(exec_ctx, value) \ - grpc_stats_inc_http2_send_trailing_metadata_per_write((exec_ctx), \ - (int)(value)) -void grpc_stats_inc_http2_send_trailing_metadata_per_write( - grpc_exec_ctx *exec_ctx, int x); -#define GRPC_STATS_INC_HTTP2_SEND_FLOWCTL_PER_WRITE(exec_ctx, value) \ - grpc_stats_inc_http2_send_flowctl_per_write((exec_ctx), (int)(value)) -void grpc_stats_inc_http2_send_flowctl_per_write(grpc_exec_ctx *exec_ctx, - int x); -#define GRPC_STATS_INC_SERVER_CQS_CHECKED(exec_ctx, value) \ - grpc_stats_inc_server_cqs_checked((exec_ctx), (int)(value)) -void grpc_stats_inc_server_cqs_checked(grpc_exec_ctx *exec_ctx, int x); + GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_FORCE_RST_STREAM) +#define GRPC_STATS_INC_HTTP2_SPURIOUS_WRITES_BEGUN() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_SPURIOUS_WRITES_BEGUN) +#define GRPC_STATS_INC_HPACK_RECV_INDEXED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_INDEXED) +#define GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_INCIDX) +#define GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX_V() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_INCIDX_V) +#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NOTIDX) +#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX_V() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NOTIDX_V) +#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NVRIDX) +#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX_V() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NVRIDX_V) +#define GRPC_STATS_INC_HPACK_RECV_UNCOMPRESSED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_UNCOMPRESSED) +#define GRPC_STATS_INC_HPACK_RECV_HUFFMAN() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_HUFFMAN) +#define GRPC_STATS_INC_HPACK_RECV_BINARY() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_BINARY) +#define GRPC_STATS_INC_HPACK_RECV_BINARY_BASE64() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_BINARY_BASE64) +#define GRPC_STATS_INC_HPACK_SEND_INDEXED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_INDEXED) +#define GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_INCIDX) +#define GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX_V() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_INCIDX_V) +#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NOTIDX) +#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX_V() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NOTIDX_V) +#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NVRIDX() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NVRIDX) +#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NVRIDX_V() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NVRIDX_V) +#define GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_UNCOMPRESSED) +#define GRPC_STATS_INC_HPACK_SEND_HUFFMAN() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_HUFFMAN) +#define GRPC_STATS_INC_HPACK_SEND_BINARY() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_BINARY) +#define GRPC_STATS_INC_HPACK_SEND_BINARY_BASE64() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_BINARY_BASE64) +#define GRPC_STATS_INC_COMBINER_LOCKS_INITIATED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_COMBINER_LOCKS_INITIATED) +#define GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_ITEMS() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_COMBINER_LOCKS_SCHEDULED_ITEMS) +#define GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS() \ + GRPC_STATS_INC_COUNTER( \ + GRPC_STATS_COUNTER_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS) +#define GRPC_STATS_INC_COMBINER_LOCKS_OFFLOADED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_COMBINER_LOCKS_OFFLOADED) +#define GRPC_STATS_INC_CALL_COMBINER_LOCKS_INITIATED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CALL_COMBINER_LOCKS_INITIATED) +#define GRPC_STATS_INC_CALL_COMBINER_LOCKS_SCHEDULED_ITEMS() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CALL_COMBINER_LOCKS_SCHEDULED_ITEMS) +#define GRPC_STATS_INC_CALL_COMBINER_SET_NOTIFY_ON_CANCEL() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CALL_COMBINER_SET_NOTIFY_ON_CANCEL) +#define GRPC_STATS_INC_CALL_COMBINER_CANCELLED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CALL_COMBINER_CANCELLED) +#define GRPC_STATS_INC_EXECUTOR_SCHEDULED_SHORT_ITEMS() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_EXECUTOR_SCHEDULED_SHORT_ITEMS) +#define GRPC_STATS_INC_EXECUTOR_SCHEDULED_LONG_ITEMS() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_EXECUTOR_SCHEDULED_LONG_ITEMS) +#define GRPC_STATS_INC_EXECUTOR_SCHEDULED_TO_SELF() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_EXECUTOR_SCHEDULED_TO_SELF) +#define GRPC_STATS_INC_EXECUTOR_WAKEUP_INITIATED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_EXECUTOR_WAKEUP_INITIATED) +#define GRPC_STATS_INC_EXECUTOR_QUEUE_DRAINED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_EXECUTOR_QUEUE_DRAINED) +#define GRPC_STATS_INC_EXECUTOR_PUSH_RETRIES() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_EXECUTOR_PUSH_RETRIES) +#define GRPC_STATS_INC_SERVER_REQUESTED_CALLS() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SERVER_REQUESTED_CALLS) +#define GRPC_STATS_INC_SERVER_SLOWPATH_REQUESTS_QUEUED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SERVER_SLOWPATH_REQUESTS_QUEUED) +#define GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_FAILURES() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CQ_EV_QUEUE_TRYLOCK_FAILURES) +#define GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_SUCCESSES() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CQ_EV_QUEUE_TRYLOCK_SUCCESSES) +#define GRPC_STATS_INC_CQ_EV_QUEUE_TRANSIENT_POP_FAILURES() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CQ_EV_QUEUE_TRANSIENT_POP_FAILURES) +#define GRPC_STATS_INC_CALL_INITIAL_SIZE(value) \ + grpc_stats_inc_call_initial_size((int)(value)) +void grpc_stats_inc_call_initial_size(int x); +#define GRPC_STATS_INC_POLL_EVENTS_RETURNED(value) \ + grpc_stats_inc_poll_events_returned((int)(value)) +void grpc_stats_inc_poll_events_returned(int x); +#define GRPC_STATS_INC_TCP_WRITE_SIZE(value) \ + grpc_stats_inc_tcp_write_size((int)(value)) +void grpc_stats_inc_tcp_write_size(int x); +#define GRPC_STATS_INC_TCP_WRITE_IOV_SIZE(value) \ + grpc_stats_inc_tcp_write_iov_size((int)(value)) +void grpc_stats_inc_tcp_write_iov_size(int x); +#define GRPC_STATS_INC_TCP_READ_SIZE(value) \ + grpc_stats_inc_tcp_read_size((int)(value)) +void grpc_stats_inc_tcp_read_size(int x); +#define GRPC_STATS_INC_TCP_READ_OFFER(value) \ + grpc_stats_inc_tcp_read_offer((int)(value)) +void grpc_stats_inc_tcp_read_offer(int x); +#define GRPC_STATS_INC_TCP_READ_OFFER_IOV_SIZE(value) \ + grpc_stats_inc_tcp_read_offer_iov_size((int)(value)) +void grpc_stats_inc_tcp_read_offer_iov_size(int x); +#define GRPC_STATS_INC_HTTP2_SEND_MESSAGE_SIZE(value) \ + grpc_stats_inc_http2_send_message_size((int)(value)) +void grpc_stats_inc_http2_send_message_size(int x); +#define GRPC_STATS_INC_HTTP2_SEND_INITIAL_METADATA_PER_WRITE(value) \ + grpc_stats_inc_http2_send_initial_metadata_per_write((int)(value)) +void grpc_stats_inc_http2_send_initial_metadata_per_write(int x); +#define GRPC_STATS_INC_HTTP2_SEND_MESSAGE_PER_WRITE(value) \ + grpc_stats_inc_http2_send_message_per_write((int)(value)) +void grpc_stats_inc_http2_send_message_per_write(int x); +#define GRPC_STATS_INC_HTTP2_SEND_TRAILING_METADATA_PER_WRITE(value) \ + grpc_stats_inc_http2_send_trailing_metadata_per_write((int)(value)) +void grpc_stats_inc_http2_send_trailing_metadata_per_write(int x); +#define GRPC_STATS_INC_HTTP2_SEND_FLOWCTL_PER_WRITE(value) \ + grpc_stats_inc_http2_send_flowctl_per_write((int)(value)) +void grpc_stats_inc_http2_send_flowctl_per_write(int x); +#define GRPC_STATS_INC_SERVER_CQS_CHECKED(value) \ + grpc_stats_inc_server_cqs_checked((int)(value)) +void grpc_stats_inc_server_cqs_checked(int x); extern const int grpc_stats_histo_buckets[13]; extern const int grpc_stats_histo_start[13]; extern const int *const grpc_stats_histo_bucket_boundaries[13]; -extern void (*const grpc_stats_inc_histogram[13])(grpc_exec_ctx *exec_ctx, - int x); +extern void (*const grpc_stats_inc_histogram[13])(int x); #ifdef __cplusplus } diff --git a/src/core/lib/http/httpcli.cc b/src/core/lib/http/httpcli.cc index c96800b85c7..02da35ea990 100644 --- a/src/core/lib/http/httpcli.cc +++ b/src/core/lib/http/httpcli.cc @@ -63,13 +63,11 @@ typedef struct { static grpc_httpcli_get_override g_get_override = NULL; static grpc_httpcli_post_override g_post_override = NULL; -static void plaintext_handshake(grpc_exec_ctx *exec_ctx, void *arg, - grpc_endpoint *endpoint, const char *host, - grpc_millis deadline, - void (*on_done)(grpc_exec_ctx *exec_ctx, - void *arg, +static void plaintext_handshake(void *arg, grpc_endpoint *endpoint, + const char *host, grpc_millis deadline, + void (*on_done)(void *arg, grpc_endpoint *endpoint)) { - on_done(exec_ctx, arg, endpoint); + on_done(arg, endpoint); } const grpc_httpcli_handshaker grpc_httpcli_plaintext = {"http", @@ -79,34 +77,31 @@ void grpc_httpcli_context_init(grpc_httpcli_context *context) { context->pollset_set = grpc_pollset_set_create(); } -void grpc_httpcli_context_destroy(grpc_exec_ctx *exec_ctx, - grpc_httpcli_context *context) { - grpc_pollset_set_destroy(exec_ctx, context->pollset_set); +void grpc_httpcli_context_destroy(grpc_httpcli_context *context) { + grpc_pollset_set_destroy(context->pollset_set); } -static void next_address(grpc_exec_ctx *exec_ctx, internal_request *req, - grpc_error *due_to_error); +static void next_address(internal_request *req, grpc_error *due_to_error); -static void finish(grpc_exec_ctx *exec_ctx, internal_request *req, - grpc_error *error) { - grpc_polling_entity_del_from_pollset_set(exec_ctx, req->pollent, +static void finish(internal_request *req, grpc_error *error) { + grpc_polling_entity_del_from_pollset_set(req->pollent, req->context->pollset_set); - GRPC_CLOSURE_SCHED(exec_ctx, req->on_done, error); + GRPC_CLOSURE_SCHED(req->on_done, error); grpc_http_parser_destroy(&req->parser); if (req->addresses != NULL) { grpc_resolved_addresses_destroy(req->addresses); } if (req->ep != NULL) { - grpc_endpoint_destroy(exec_ctx, req->ep); + grpc_endpoint_destroy(req->ep); } - grpc_slice_unref_internal(exec_ctx, req->request_text); + grpc_slice_unref_internal(req->request_text); gpr_free(req->host); gpr_free(req->ssl_host_override); grpc_iomgr_unregister_object(&req->iomgr_obj); - grpc_slice_buffer_destroy_internal(exec_ctx, &req->incoming); - grpc_slice_buffer_destroy_internal(exec_ctx, &req->outgoing); + grpc_slice_buffer_destroy_internal(&req->incoming); + grpc_slice_buffer_destroy_internal(&req->outgoing); GRPC_ERROR_UNREF(req->overall_error); - grpc_resource_quota_unref_internal(exec_ctx, req->resource_quota); + grpc_resource_quota_unref_internal(req->resource_quota); gpr_free(req); } @@ -124,12 +119,11 @@ static void append_error(internal_request *req, grpc_error *error) { gpr_free(addr_text); } -static void do_read(grpc_exec_ctx *exec_ctx, internal_request *req) { - grpc_endpoint_read(exec_ctx, req->ep, &req->incoming, &req->on_read); +static void do_read(internal_request *req) { + grpc_endpoint_read(req->ep, &req->incoming, &req->on_read); } -static void on_read(grpc_exec_ctx *exec_ctx, void *user_data, - grpc_error *error) { +static void on_read(void *user_data, grpc_error *error) { internal_request *req = (internal_request *)user_data; size_t i; @@ -139,76 +133,70 @@ static void on_read(grpc_exec_ctx *exec_ctx, void *user_data, grpc_error *err = grpc_http_parser_parse(&req->parser, req->incoming.slices[i], NULL); if (err != GRPC_ERROR_NONE) { - finish(exec_ctx, req, err); + finish(req, err); return; } } } if (error == GRPC_ERROR_NONE) { - do_read(exec_ctx, req); + do_read(req); } else if (!req->have_read_byte) { - next_address(exec_ctx, req, GRPC_ERROR_REF(error)); + next_address(req, GRPC_ERROR_REF(error)); } else { - finish(exec_ctx, req, grpc_http_parser_eof(&req->parser)); + finish(req, grpc_http_parser_eof(&req->parser)); } } -static void on_written(grpc_exec_ctx *exec_ctx, internal_request *req) { - do_read(exec_ctx, req); -} +static void on_written(internal_request *req) { do_read(req); } -static void done_write(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void done_write(void *arg, grpc_error *error) { internal_request *req = (internal_request *)arg; if (error == GRPC_ERROR_NONE) { - on_written(exec_ctx, req); + on_written(req); } else { - next_address(exec_ctx, req, GRPC_ERROR_REF(error)); + next_address(req, GRPC_ERROR_REF(error)); } } -static void start_write(grpc_exec_ctx *exec_ctx, internal_request *req) { +static void start_write(internal_request *req) { grpc_slice_ref_internal(req->request_text); grpc_slice_buffer_add(&req->outgoing, req->request_text); - grpc_endpoint_write(exec_ctx, req->ep, &req->outgoing, &req->done_write); + grpc_endpoint_write(req->ep, &req->outgoing, &req->done_write); } -static void on_handshake_done(grpc_exec_ctx *exec_ctx, void *arg, - grpc_endpoint *ep) { +static void on_handshake_done(void *arg, grpc_endpoint *ep) { internal_request *req = (internal_request *)arg; if (!ep) { - next_address(exec_ctx, req, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Unexplained handshake failure")); + next_address(req, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Unexplained handshake failure")); return; } req->ep = ep; - start_write(exec_ctx, req); + start_write(req); } -static void on_connected(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void on_connected(void *arg, grpc_error *error) { internal_request *req = (internal_request *)arg; if (!req->ep) { - next_address(exec_ctx, req, GRPC_ERROR_REF(error)); + next_address(req, GRPC_ERROR_REF(error)); return; } req->handshaker->handshake( - exec_ctx, req, req->ep, - req->ssl_host_override ? req->ssl_host_override : req->host, + req, req->ep, req->ssl_host_override ? req->ssl_host_override : req->host, req->deadline, on_handshake_done); } -static void next_address(grpc_exec_ctx *exec_ctx, internal_request *req, - grpc_error *error) { +static void next_address(internal_request *req, grpc_error *error) { grpc_resolved_address *addr; if (error != GRPC_ERROR_NONE) { append_error(req, error); } if (req->next_address == req->addresses->naddrs) { - finish(exec_ctx, req, + finish(req, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Failed HTTP requests to all targets", &req->overall_error, 1)); return; @@ -220,23 +208,21 @@ static void next_address(grpc_exec_ctx *exec_ctx, internal_request *req, (char *)GRPC_ARG_RESOURCE_QUOTA, req->resource_quota, 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); + grpc_tcp_client_connect(&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) { +static void on_resolved(void *arg, grpc_error *error) { internal_request *req = (internal_request *)arg; if (error != GRPC_ERROR_NONE) { - finish(exec_ctx, req, GRPC_ERROR_REF(error)); + finish(req, GRPC_ERROR_REF(error)); return; } req->next_address = 0; - next_address(exec_ctx, req, GRPC_ERROR_NONE); + next_address(req, GRPC_ERROR_NONE); } -static void internal_request_begin(grpc_exec_ctx *exec_ctx, - grpc_httpcli_context *context, +static void internal_request_begin(grpc_httpcli_context *context, grpc_polling_entity *pollent, grpc_resource_quota *resource_quota, const grpc_httpcli_request *request, @@ -266,33 +252,31 @@ static void internal_request_begin(grpc_exec_ctx *exec_ctx, req->ssl_host_override = gpr_strdup(request->ssl_host_override); GPR_ASSERT(pollent); - grpc_polling_entity_add_to_pollset_set(exec_ctx, req->pollent, + grpc_polling_entity_add_to_pollset_set(req->pollent, req->context->pollset_set); grpc_resolve_address( - exec_ctx, request->host, req->handshaker->default_port, - req->context->pollset_set, + request->host, req->handshaker->default_port, req->context->pollset_set, GRPC_CLOSURE_CREATE(on_resolved, req, grpc_schedule_on_exec_ctx), &req->addresses); } -void grpc_httpcli_get(grpc_exec_ctx *exec_ctx, grpc_httpcli_context *context, +void grpc_httpcli_get(grpc_httpcli_context *context, grpc_polling_entity *pollent, grpc_resource_quota *resource_quota, const grpc_httpcli_request *request, grpc_millis deadline, grpc_closure *on_done, grpc_httpcli_response *response) { char *name; - if (g_get_override && - g_get_override(exec_ctx, request, deadline, on_done, response)) { + if (g_get_override && g_get_override(request, deadline, on_done, response)) { return; } gpr_asprintf(&name, "HTTP:GET:%s:%s", request->host, request->http.path); - internal_request_begin(exec_ctx, context, pollent, resource_quota, request, - deadline, on_done, response, name, + internal_request_begin(context, pollent, resource_quota, request, 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, +void grpc_httpcli_post(grpc_httpcli_context *context, grpc_polling_entity *pollent, grpc_resource_quota *resource_quota, const grpc_httpcli_request *request, @@ -300,16 +284,14 @@ void grpc_httpcli_post(grpc_exec_ctx *exec_ctx, grpc_httpcli_context *context, grpc_millis deadline, grpc_closure *on_done, grpc_httpcli_response *response) { char *name; - if (g_post_override && - g_post_override(exec_ctx, request, body_bytes, body_size, deadline, - on_done, response)) { + if (g_post_override && g_post_override(request, body_bytes, body_size, + deadline, on_done, response)) { return; } gpr_asprintf(&name, "HTTP:POST:%s:%s", request->host, request->http.path); internal_request_begin( - exec_ctx, context, pollent, resource_quota, request, deadline, on_done, - response, name, - grpc_httpcli_format_post_request(request, body_bytes, body_size)); + context, pollent, resource_quota, request, deadline, on_done, response, + name, grpc_httpcli_format_post_request(request, body_bytes, body_size)); gpr_free(name); } diff --git a/src/core/lib/http/httpcli.h b/src/core/lib/http/httpcli.h index 76b790fa8ac..dd372775ecb 100644 --- a/src/core/lib/http/httpcli.h +++ b/src/core/lib/http/httpcli.h @@ -45,10 +45,9 @@ typedef struct grpc_httpcli_context { typedef struct { const char *default_port; - void (*handshake)(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *endpoint, - const char *host, grpc_millis deadline, - void (*on_done)(grpc_exec_ctx *exec_ctx, void *arg, - grpc_endpoint *endpoint)); + void (*handshake)(void *arg, grpc_endpoint *endpoint, const char *host, + grpc_millis deadline, + void (*on_done)(void *arg, grpc_endpoint *endpoint)); } grpc_httpcli_handshaker; extern const grpc_httpcli_handshaker grpc_httpcli_plaintext; @@ -72,8 +71,7 @@ typedef struct grpc_httpcli_request { typedef struct grpc_http_response grpc_httpcli_response; void grpc_httpcli_context_init(grpc_httpcli_context *context); -void grpc_httpcli_context_destroy(grpc_exec_ctx *exec_ctx, - grpc_httpcli_context *context); +void grpc_httpcli_context_destroy(grpc_httpcli_context *context); /* Asynchronously perform a HTTP GET. 'context' specifies the http context under which to do the get @@ -84,7 +82,7 @@ void grpc_httpcli_context_destroy(grpc_exec_ctx *exec_ctx, destroyed once the call returns 'deadline' contains a deadline for the request (or gpr_inf_future) 'on_response' is a callback to report results to */ -void grpc_httpcli_get(grpc_exec_ctx *exec_ctx, grpc_httpcli_context *context, +void grpc_httpcli_get(grpc_httpcli_context *context, grpc_polling_entity *pollent, grpc_resource_quota *resource_quota, const grpc_httpcli_request *request, grpc_millis deadline, @@ -105,7 +103,7 @@ void grpc_httpcli_get(grpc_exec_ctx *exec_ctx, grpc_httpcli_context *context, lifetime of the request 'on_response' is a callback to report results to Does not support ?var1=val1&var2=val2 in the path. */ -void grpc_httpcli_post(grpc_exec_ctx *exec_ctx, grpc_httpcli_context *context, +void grpc_httpcli_post(grpc_httpcli_context *context, grpc_polling_entity *pollent, grpc_resource_quota *resource_quota, const grpc_httpcli_request *request, @@ -114,15 +112,16 @@ void grpc_httpcli_post(grpc_exec_ctx *exec_ctx, grpc_httpcli_context *context, grpc_httpcli_response *response); /* override functions return 1 if they handled the request, 0 otherwise */ -typedef int (*grpc_httpcli_get_override)(grpc_exec_ctx *exec_ctx, - const grpc_httpcli_request *request, +typedef int (*grpc_httpcli_get_override)(const grpc_httpcli_request *request, grpc_millis deadline, grpc_closure *on_complete, grpc_httpcli_response *response); -typedef int (*grpc_httpcli_post_override)( - grpc_exec_ctx *exec_ctx, const grpc_httpcli_request *request, - const char *body_bytes, size_t body_size, grpc_millis deadline, - grpc_closure *on_complete, grpc_httpcli_response *response); +typedef int (*grpc_httpcli_post_override)(const grpc_httpcli_request *request, + const char *body_bytes, + size_t body_size, + grpc_millis deadline, + grpc_closure *on_complete, + grpc_httpcli_response *response); void grpc_httpcli_set_override(grpc_httpcli_get_override get, grpc_httpcli_post_override post); diff --git a/src/core/lib/http/httpcli_security_connector.cc b/src/core/lib/http/httpcli_security_connector.cc index d832dacb69f..814f75cbfa6 100644 --- a/src/core/lib/http/httpcli_security_connector.cc +++ b/src/core/lib/http/httpcli_security_connector.cc @@ -38,8 +38,7 @@ typedef struct { char *secure_peer_name; } grpc_httpcli_ssl_channel_security_connector; -static void httpcli_ssl_destroy(grpc_exec_ctx *exec_ctx, - grpc_security_connector *sc) { +static void httpcli_ssl_destroy(grpc_security_connector *sc) { grpc_httpcli_ssl_channel_security_connector *c = (grpc_httpcli_ssl_channel_security_connector *)sc; if (c->handshaker_factory != NULL) { @@ -50,8 +49,7 @@ static void httpcli_ssl_destroy(grpc_exec_ctx *exec_ctx, gpr_free(sc); } -static void httpcli_ssl_add_handshakers(grpc_exec_ctx *exec_ctx, - grpc_channel_security_connector *sc, +static void httpcli_ssl_add_handshakers(grpc_channel_security_connector *sc, grpc_handshake_manager *handshake_mgr) { grpc_httpcli_ssl_channel_security_connector *c = (grpc_httpcli_ssl_channel_security_connector *)sc; @@ -65,13 +63,11 @@ static void httpcli_ssl_add_handshakers(grpc_exec_ctx *exec_ctx, } } grpc_handshake_manager_add( - handshake_mgr, - grpc_security_handshaker_create( - exec_ctx, tsi_create_adapter_handshaker(handshaker), &sc->base)); + handshake_mgr, grpc_security_handshaker_create( + tsi_create_adapter_handshaker(handshaker), &sc->base)); } -static void httpcli_ssl_check_peer(grpc_exec_ctx *exec_ctx, - grpc_security_connector *sc, tsi_peer peer, +static void httpcli_ssl_check_peer(grpc_security_connector *sc, tsi_peer peer, grpc_auth_context **auth_context, grpc_closure *on_peer_checked) { grpc_httpcli_ssl_channel_security_connector *c = @@ -87,7 +83,7 @@ static void httpcli_ssl_check_peer(grpc_exec_ctx *exec_ctx, error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); } - GRPC_CLOSURE_SCHED(exec_ctx, on_peer_checked, error); + GRPC_CLOSURE_SCHED(on_peer_checked, error); tsi_peer_destruct(&peer); } @@ -104,8 +100,8 @@ static grpc_security_connector_vtable httpcli_ssl_vtable = { httpcli_ssl_destroy, httpcli_ssl_check_peer, httpcli_ssl_cmp}; static grpc_security_status httpcli_ssl_channel_security_connector_create( - grpc_exec_ctx *exec_ctx, const char *pem_root_certs, - const char *secure_peer_name, grpc_channel_security_connector **sc) { + const char *pem_root_certs, const char *secure_peer_name, + grpc_channel_security_connector **sc) { tsi_result result = TSI_OK; grpc_httpcli_ssl_channel_security_connector *c; @@ -128,7 +124,7 @@ static grpc_security_status httpcli_ssl_channel_security_connector_create( if (result != TSI_OK) { gpr_log(GPR_ERROR, "Handshaker factory creation failed with %s.", tsi_result_to_string(result)); - httpcli_ssl_destroy(exec_ctx, &c->base.base); + httpcli_ssl_destroy(&c->base.base); *sc = NULL; return GRPC_SECURITY_ERROR; } @@ -144,40 +140,37 @@ static grpc_security_status httpcli_ssl_channel_security_connector_create( /* handshaker */ typedef struct { - void (*func)(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *endpoint); + void (*func)(void *arg, grpc_endpoint *endpoint); void *arg; grpc_handshake_manager *handshake_mgr; } on_done_closure; -static void on_handshake_done(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void on_handshake_done(void *arg, grpc_error *error) { grpc_handshaker_args *args = (grpc_handshaker_args *)arg; on_done_closure *c = (on_done_closure *)args->user_data; if (error != GRPC_ERROR_NONE) { const char *msg = grpc_error_string(error); gpr_log(GPR_ERROR, "Secure transport setup failed: %s", msg); - c->func(exec_ctx, c->arg, NULL); + c->func(c->arg, NULL); } else { - grpc_channel_args_destroy(exec_ctx, args->args); - grpc_slice_buffer_destroy_internal(exec_ctx, args->read_buffer); + grpc_channel_args_destroy(args->args); + grpc_slice_buffer_destroy_internal(args->read_buffer); gpr_free(args->read_buffer); - c->func(exec_ctx, c->arg, args->endpoint); + c->func(c->arg, args->endpoint); } - grpc_handshake_manager_destroy(exec_ctx, c->handshake_mgr); + grpc_handshake_manager_destroy(c->handshake_mgr); gpr_free(c); } -static void ssl_handshake(grpc_exec_ctx *exec_ctx, void *arg, - grpc_endpoint *tcp, const char *host, +static void ssl_handshake(void *arg, grpc_endpoint *tcp, const char *host, grpc_millis deadline, - void (*on_done)(grpc_exec_ctx *exec_ctx, void *arg, - grpc_endpoint *endpoint)) { + void (*on_done)(void *arg, grpc_endpoint *endpoint)) { on_done_closure *c = (on_done_closure *)gpr_malloc(sizeof(*c)); const char *pem_root_certs = grpc_get_default_ssl_roots(); if (pem_root_certs == NULL) { gpr_log(GPR_ERROR, "Could not get default pem root certs."); - on_done(exec_ctx, arg, NULL); + on_done(arg, NULL); gpr_free(c); return; } @@ -185,15 +178,15 @@ static void ssl_handshake(grpc_exec_ctx *exec_ctx, void *arg, c->arg = arg; grpc_channel_security_connector *sc = NULL; GPR_ASSERT(httpcli_ssl_channel_security_connector_create( - exec_ctx, pem_root_certs, host, &sc) == GRPC_SECURITY_OK); + pem_root_certs, host, &sc) == GRPC_SECURITY_OK); grpc_arg channel_arg = grpc_security_connector_to_arg(&sc->base); grpc_channel_args args = {1, &channel_arg}; c->handshake_mgr = grpc_handshake_manager_create(); - grpc_handshakers_add(exec_ctx, HANDSHAKER_CLIENT, &args, c->handshake_mgr); + grpc_handshakers_add(HANDSHAKER_CLIENT, &args, c->handshake_mgr); grpc_handshake_manager_do_handshake( - exec_ctx, c->handshake_mgr, tcp, NULL /* channel_args */, deadline, + c->handshake_mgr, tcp, NULL /* channel_args */, deadline, NULL /* acceptor */, on_handshake_done, c /* user_data */); - GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, &sc->base, "httpcli"); + GRPC_SECURITY_CONNECTOR_UNREF(&sc->base, "httpcli"); } const grpc_httpcli_handshaker grpc_httpcli_ssl = {"https", ssl_handshake}; diff --git a/src/core/lib/iomgr/block_annotate.h b/src/core/lib/iomgr/block_annotate.h index fcbfe9eb1a0..9db3cf0199e 100644 --- a/src/core/lib/iomgr/block_annotate.h +++ b/src/core/lib/iomgr/block_annotate.h @@ -43,10 +43,10 @@ void gpr_thd_end_blocking_region(); do { \ gpr_thd_end_blocking_region(); \ } while (0) -#define GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(ec) \ - do { \ - gpr_thd_end_blocking_region(); \ - grpc_exec_ctx_invalidate_now((ec)); \ +#define GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX() \ + do { \ + gpr_thd_end_blocking_region(); \ + grpc_exec_ctx_invalidate_now(); \ } while (0) #else #define GRPC_SCHEDULING_START_BLOCKING_REGION \ @@ -55,9 +55,9 @@ void gpr_thd_end_blocking_region(); #define GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX \ do { \ } while (0) -#define GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(ec) \ - do { \ - grpc_exec_ctx_invalidate_now((ec)); \ +#define GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX() \ + do { \ + grpc_exec_ctx_invalidate_now(); \ } while (0) #endif diff --git a/src/core/lib/iomgr/call_combiner.cc b/src/core/lib/iomgr/call_combiner.cc index d45719608b4..c2f5b4bb845 100644 --- a/src/core/lib/iomgr/call_combiner.cc +++ b/src/core/lib/iomgr/call_combiner.cc @@ -57,8 +57,7 @@ void grpc_call_combiner_destroy(grpc_call_combiner* call_combiner) { #define DEBUG_FMT_ARGS #endif -void grpc_call_combiner_start(grpc_exec_ctx* exec_ctx, - grpc_call_combiner* call_combiner, +void grpc_call_combiner_start(grpc_call_combiner* call_combiner, grpc_closure* closure, grpc_error* error DEBUG_ARGS, const char* reason) { @@ -76,15 +75,16 @@ void grpc_call_combiner_start(grpc_exec_ctx* exec_ctx, gpr_log(GPR_DEBUG, " size: %" PRIdPTR " -> %" PRIdPTR, prev_size, prev_size + 1); } - GRPC_STATS_INC_CALL_COMBINER_LOCKS_SCHEDULED_ITEMS(exec_ctx); + GRPC_STATS_INC_CALL_COMBINER_LOCKS_SCHEDULED_ITEMS(); if (prev_size == 0) { - GRPC_STATS_INC_CALL_COMBINER_LOCKS_INITIATED(exec_ctx); + GRPC_STATS_INC_CALL_COMBINER_LOCKS_INITIATED(); + GPR_TIMER_MARK("call_combiner_initiate", 0); if (GRPC_TRACER_ON(grpc_call_combiner_trace)) { gpr_log(GPR_DEBUG, " EXECUTING IMMEDIATELY"); } // Queue was empty, so execute this closure immediately. - GRPC_CLOSURE_SCHED(exec_ctx, closure, error); + GRPC_CLOSURE_SCHED(closure, error); } else { if (GRPC_TRACER_ON(grpc_call_combiner_trace)) { gpr_log(GPR_INFO, " QUEUING"); @@ -96,8 +96,7 @@ void grpc_call_combiner_start(grpc_exec_ctx* exec_ctx, GPR_TIMER_END("call_combiner_start", 0); } -void grpc_call_combiner_stop(grpc_exec_ctx* exec_ctx, - grpc_call_combiner* call_combiner DEBUG_ARGS, +void grpc_call_combiner_stop(grpc_call_combiner* call_combiner DEBUG_ARGS, const char* reason) { GPR_TIMER_BEGIN("call_combiner_stop", 0); if (GRPC_TRACER_ON(grpc_call_combiner_trace)) { @@ -132,7 +131,7 @@ void grpc_call_combiner_stop(grpc_exec_ctx* exec_ctx, gpr_log(GPR_DEBUG, " EXECUTING FROM QUEUE: closure=%p error=%s", closure, grpc_error_string(closure->error_data.error)); } - GRPC_CLOSURE_SCHED(exec_ctx, closure, closure->error_data.error); + GRPC_CLOSURE_SCHED(closure, closure->error_data.error); break; } } else if (GRPC_TRACER_ON(grpc_call_combiner_trace)) { @@ -141,10 +140,9 @@ void grpc_call_combiner_stop(grpc_exec_ctx* exec_ctx, GPR_TIMER_END("call_combiner_stop", 0); } -void grpc_call_combiner_set_notify_on_cancel(grpc_exec_ctx* exec_ctx, - grpc_call_combiner* call_combiner, +void grpc_call_combiner_set_notify_on_cancel(grpc_call_combiner* call_combiner, grpc_closure* closure) { - GRPC_STATS_INC_CALL_COMBINER_SET_NOTIFY_ON_CANCEL(exec_ctx); + GRPC_STATS_INC_CALL_COMBINER_SET_NOTIFY_ON_CANCEL(); while (true) { // Decode original state. gpr_atm original_state = gpr_atm_acq_load(&call_combiner->cancel_state); @@ -158,7 +156,7 @@ void grpc_call_combiner_set_notify_on_cancel(grpc_exec_ctx* exec_ctx, "for pre-existing cancellation", call_combiner, closure); } - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_REF(original_error)); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_REF(original_error)); break; } else { if (gpr_atm_full_cas(&call_combiner->cancel_state, original_state, @@ -177,7 +175,7 @@ void grpc_call_combiner_set_notify_on_cancel(grpc_exec_ctx* exec_ctx, "call_combiner=%p: scheduling old cancel callback=%p", call_combiner, closure); } - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); } break; } @@ -186,10 +184,9 @@ void grpc_call_combiner_set_notify_on_cancel(grpc_exec_ctx* exec_ctx, } } -void grpc_call_combiner_cancel(grpc_exec_ctx* exec_ctx, - grpc_call_combiner* call_combiner, +void grpc_call_combiner_cancel(grpc_call_combiner* call_combiner, grpc_error* error) { - GRPC_STATS_INC_CALL_COMBINER_CANCELLED(exec_ctx); + GRPC_STATS_INC_CALL_COMBINER_CANCELLED(); while (true) { gpr_atm original_state = gpr_atm_acq_load(&call_combiner->cancel_state); grpc_error* original_error = decode_cancel_state_error(original_state); @@ -206,7 +203,7 @@ void grpc_call_combiner_cancel(grpc_exec_ctx* exec_ctx, "call_combiner=%p: scheduling notify_on_cancel callback=%p", call_combiner, notify_on_cancel); } - GRPC_CLOSURE_SCHED(exec_ctx, notify_on_cancel, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(notify_on_cancel, GRPC_ERROR_REF(error)); } break; } diff --git a/src/core/lib/iomgr/call_combiner.h b/src/core/lib/iomgr/call_combiner.h index 527f84fce04..364f77a167c 100644 --- a/src/core/lib/iomgr/call_combiner.h +++ b/src/core/lib/iomgr/call_combiner.h @@ -57,37 +57,29 @@ void grpc_call_combiner_init(grpc_call_combiner* call_combiner); void grpc_call_combiner_destroy(grpc_call_combiner* call_combiner); #ifndef NDEBUG -#define GRPC_CALL_COMBINER_START(exec_ctx, call_combiner, closure, error, \ - reason) \ - grpc_call_combiner_start((exec_ctx), (call_combiner), (closure), (error), \ - __FILE__, __LINE__, (reason)) -#define GRPC_CALL_COMBINER_STOP(exec_ctx, call_combiner, reason) \ - grpc_call_combiner_stop((exec_ctx), (call_combiner), __FILE__, __LINE__, \ - (reason)) +#define GRPC_CALL_COMBINER_START(call_combiner, closure, error, reason) \ + grpc_call_combiner_start((call_combiner), (closure), (error), __FILE__, \ + __LINE__, (reason)) +#define GRPC_CALL_COMBINER_STOP(call_combiner, reason) \ + grpc_call_combiner_stop((call_combiner), __FILE__, __LINE__, (reason)) /// Starts processing \a closure on \a call_combiner. -void grpc_call_combiner_start(grpc_exec_ctx* exec_ctx, - grpc_call_combiner* call_combiner, +void grpc_call_combiner_start(grpc_call_combiner* call_combiner, grpc_closure* closure, grpc_error* error, const char* file, int line, const char* reason); /// Yields the call combiner to the next closure in the queue, if any. -void grpc_call_combiner_stop(grpc_exec_ctx* exec_ctx, - grpc_call_combiner* call_combiner, +void grpc_call_combiner_stop(grpc_call_combiner* call_combiner, const char* file, int line, const char* reason); #else -#define GRPC_CALL_COMBINER_START(exec_ctx, call_combiner, closure, error, \ - reason) \ - grpc_call_combiner_start((exec_ctx), (call_combiner), (closure), (error), \ - (reason)) -#define GRPC_CALL_COMBINER_STOP(exec_ctx, call_combiner, reason) \ - grpc_call_combiner_stop((exec_ctx), (call_combiner), (reason)) +#define GRPC_CALL_COMBINER_START(call_combiner, closure, error, reason) \ + grpc_call_combiner_start((call_combiner), (closure), (error), (reason)) +#define GRPC_CALL_COMBINER_STOP(call_combiner, reason) \ + grpc_call_combiner_stop((call_combiner), (reason)) /// Starts processing \a closure on \a call_combiner. -void grpc_call_combiner_start(grpc_exec_ctx* exec_ctx, - grpc_call_combiner* call_combiner, +void grpc_call_combiner_start(grpc_call_combiner* call_combiner, grpc_closure* closure, grpc_error* error, const char* reason); /// Yields the call combiner to the next closure in the queue, if any. -void grpc_call_combiner_stop(grpc_exec_ctx* exec_ctx, - grpc_call_combiner* call_combiner, +void grpc_call_combiner_stop(grpc_call_combiner* call_combiner, const char* reason); #endif @@ -113,13 +105,11 @@ void grpc_call_combiner_stop(grpc_exec_ctx* exec_ctx, /// cancellation; this effectively unregisters the previously set closure. /// However, most filters will not need to explicitly unregister their /// callbacks, as this is done automatically when the call is destroyed. -void grpc_call_combiner_set_notify_on_cancel(grpc_exec_ctx* exec_ctx, - grpc_call_combiner* call_combiner, +void grpc_call_combiner_set_notify_on_cancel(grpc_call_combiner* call_combiner, grpc_closure* closure); /// Indicates that the call has been cancelled. -void grpc_call_combiner_cancel(grpc_exec_ctx* exec_ctx, - grpc_call_combiner* call_combiner, +void grpc_call_combiner_cancel(grpc_call_combiner* call_combiner, grpc_error* error); #ifdef __cplusplus diff --git a/src/core/lib/iomgr/closure.cc b/src/core/lib/iomgr/closure.cc index 00edefc6ae4..71521daeb60 100644 --- a/src/core/lib/iomgr/closure.cc +++ b/src/core/lib/iomgr/closure.cc @@ -107,13 +107,12 @@ typedef struct { grpc_closure wrapper; } wrapped_closure; -static void closure_wrapper(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void closure_wrapper(void *arg, grpc_error *error) { wrapped_closure *wc = (wrapped_closure *)arg; grpc_iomgr_cb_func cb = wc->cb; void *cb_arg = wc->cb_arg; gpr_free(wc); - cb(exec_ctx, cb_arg, error); + cb(cb_arg, error); } #ifndef NDEBUG @@ -139,8 +138,7 @@ grpc_closure *grpc_closure_create(grpc_iomgr_cb_func cb, void *cb_arg, void grpc_closure_run(const char *file, int line, grpc_exec_ctx *exec_ctx, grpc_closure *c, grpc_error *error) { #else -void grpc_closure_run(grpc_exec_ctx *exec_ctx, grpc_closure *c, - grpc_error *error) { +void grpc_closure_run(grpc_closure *c, grpc_error *error) { #endif GPR_TIMER_BEGIN("grpc_closure_run", 0); if (c != NULL) { @@ -150,7 +148,7 @@ void grpc_closure_run(grpc_exec_ctx *exec_ctx, grpc_closure *c, c->run = true; #endif assert(c->cb); - c->scheduler->vtable->run(exec_ctx, c, error); + c->scheduler->vtable->run(c, error); } else { GRPC_ERROR_UNREF(error); } @@ -161,8 +159,7 @@ void grpc_closure_run(grpc_exec_ctx *exec_ctx, grpc_closure *c, void grpc_closure_sched(const char *file, int line, grpc_exec_ctx *exec_ctx, grpc_closure *c, grpc_error *error) { #else -void grpc_closure_sched(grpc_exec_ctx *exec_ctx, grpc_closure *c, - grpc_error *error) { +void grpc_closure_sched(grpc_closure *c, grpc_error *error) { #endif GPR_TIMER_BEGIN("grpc_closure_sched", 0); if (c != NULL) { @@ -181,7 +178,7 @@ void grpc_closure_sched(grpc_exec_ctx *exec_ctx, grpc_closure *c, c->run = false; #endif assert(c->cb); - c->scheduler->vtable->sched(exec_ctx, c, error); + c->scheduler->vtable->sched(c, error); } else { GRPC_ERROR_UNREF(error); } @@ -192,7 +189,7 @@ void grpc_closure_sched(grpc_exec_ctx *exec_ctx, grpc_closure *c, void grpc_closure_list_sched(const char *file, int line, grpc_exec_ctx *exec_ctx, grpc_closure_list *list) { #else -void grpc_closure_list_sched(grpc_exec_ctx *exec_ctx, grpc_closure_list *list) { +void grpc_closure_list_sched(grpc_closure_list *list) { #endif grpc_closure *c = list->head; while (c != NULL) { @@ -212,7 +209,7 @@ void grpc_closure_list_sched(grpc_exec_ctx *exec_ctx, grpc_closure_list *list) { c->run = false; #endif assert(c->cb); - c->scheduler->vtable->sched(exec_ctx, c, c->error_data.error); + c->scheduler->vtable->sched(c, c->error_data.error); c = next; } list->head = list->tail = NULL; diff --git a/src/core/lib/iomgr/closure.h b/src/core/lib/iomgr/closure.h index cd32a4ba381..8b59b17dfb3 100644 --- a/src/core/lib/iomgr/closure.h +++ b/src/core/lib/iomgr/closure.h @@ -49,18 +49,15 @@ typedef struct grpc_closure_list { * describing what went wrong. * Error contract: it is not the cb's job to unref this error; * the closure scheduler will do that after the cb returns */ -typedef void (*grpc_iomgr_cb_func)(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error); +typedef void (*grpc_iomgr_cb_func)(void *arg, grpc_error *error); typedef struct grpc_closure_scheduler grpc_closure_scheduler; typedef struct grpc_closure_scheduler_vtable { /* NOTE: for all these functions, closure->scheduler == the scheduler that was used to find this vtable */ - void (*run)(grpc_exec_ctx *exec_ctx, grpc_closure *closure, - grpc_error *error); - void (*sched)(grpc_exec_ctx *exec_ctx, grpc_closure *closure, - grpc_error *error); + void (*run)(grpc_closure *closure, grpc_error *error); + void (*sched)(grpc_closure *closure, grpc_error *error); const char *name; } grpc_closure_scheduler_vtable; @@ -164,26 +161,22 @@ bool grpc_closure_list_empty(grpc_closure_list list); #ifndef NDEBUG void grpc_closure_run(const char *file, int line, grpc_exec_ctx *exec_ctx, grpc_closure *closure, grpc_error *error); -#define GRPC_CLOSURE_RUN(exec_ctx, closure, error) \ +#define GRPC_CLOSURE_RUN(closure, error) \ grpc_closure_run(__FILE__, __LINE__, exec_ctx, closure, error) #else -void grpc_closure_run(grpc_exec_ctx *exec_ctx, grpc_closure *closure, - grpc_error *error); -#define GRPC_CLOSURE_RUN(exec_ctx, closure, error) \ - grpc_closure_run(exec_ctx, closure, error) +void grpc_closure_run(grpc_closure *closure, grpc_error *error); +#define GRPC_CLOSURE_RUN(closure, error) grpc_closure_run(closure, error) #endif /** Schedule a closure to be run. Does not need to be run from a safe point. */ #ifndef NDEBUG void grpc_closure_sched(const char *file, int line, grpc_exec_ctx *exec_ctx, grpc_closure *closure, grpc_error *error); -#define GRPC_CLOSURE_SCHED(exec_ctx, closure, error) \ +#define GRPC_CLOSURE_SCHED(closure, error) \ grpc_closure_sched(__FILE__, __LINE__, exec_ctx, closure, error) #else -void grpc_closure_sched(grpc_exec_ctx *exec_ctx, grpc_closure *closure, - grpc_error *error); -#define GRPC_CLOSURE_SCHED(exec_ctx, closure, error) \ - grpc_closure_sched(exec_ctx, closure, error) +void grpc_closure_sched(grpc_closure *closure, grpc_error *error); +#define GRPC_CLOSURE_SCHED(closure, error) grpc_closure_sched(closure, error) #endif /** Schedule all closures in a list to be run. Does not need to be run from a @@ -192,13 +185,12 @@ void grpc_closure_sched(grpc_exec_ctx *exec_ctx, grpc_closure *closure, void grpc_closure_list_sched(const char *file, int line, grpc_exec_ctx *exec_ctx, grpc_closure_list *closure_list); -#define GRPC_CLOSURE_LIST_SCHED(exec_ctx, closure_list) \ +#define GRPC_CLOSURE_LIST_SCHED(closure_list) \ grpc_closure_list_sched(__FILE__, __LINE__, exec_ctx, closure_list) #else -void grpc_closure_list_sched(grpc_exec_ctx *exec_ctx, - grpc_closure_list *closure_list); -#define GRPC_CLOSURE_LIST_SCHED(exec_ctx, closure_list) \ - grpc_closure_list_sched(exec_ctx, closure_list) +void grpc_closure_list_sched(grpc_closure_list *closure_list); +#define GRPC_CLOSURE_LIST_SCHED(closure_list) \ + grpc_closure_list_sched(closure_list) #endif #ifdef __cplusplus diff --git a/src/core/lib/iomgr/combiner.cc b/src/core/lib/iomgr/combiner.cc index 53f4b7eaa7e..c6d6d0fc438 100644 --- a/src/core/lib/iomgr/combiner.cc +++ b/src/core/lib/iomgr/combiner.cc @@ -62,17 +62,15 @@ struct grpc_combiner { gpr_refcount refs; }; -static void combiner_exec(grpc_exec_ctx *exec_ctx, grpc_closure *closure, - grpc_error *error); -static void combiner_finally_exec(grpc_exec_ctx *exec_ctx, - grpc_closure *closure, grpc_error *error); +static void combiner_exec(grpc_closure *closure, grpc_error *error); +static void combiner_finally_exec(grpc_closure *closure, grpc_error *error); static const grpc_closure_scheduler_vtable scheduler = { combiner_exec, combiner_exec, "combiner:immediately"}; static const grpc_closure_scheduler_vtable finally_scheduler = { combiner_finally_exec, combiner_finally_exec, "combiner:finally"}; -static void offload(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error); +static void offload(void *arg, grpc_error *error); grpc_combiner *grpc_combiner_create(void) { grpc_combiner *lock = (grpc_combiner *)gpr_zalloc(sizeof(*lock)); @@ -88,19 +86,19 @@ grpc_combiner *grpc_combiner_create(void) { return lock; } -static void really_destroy(grpc_exec_ctx *exec_ctx, grpc_combiner *lock) { +static void really_destroy(grpc_combiner *lock) { GRPC_COMBINER_TRACE(gpr_log(GPR_DEBUG, "C:%p really_destroy", lock)); GPR_ASSERT(gpr_atm_no_barrier_load(&lock->state) == 0); gpr_mpscq_destroy(&lock->queue); gpr_free(lock); } -static void start_destroy(grpc_exec_ctx *exec_ctx, grpc_combiner *lock) { +static void start_destroy(grpc_combiner *lock) { gpr_atm old_state = gpr_atm_full_fetch_add(&lock->state, -STATE_UNORPHANED); GRPC_COMBINER_TRACE(gpr_log( GPR_DEBUG, "C:%p really_destroy old_state=%" PRIdPTR, lock, old_state)); if (old_state == 1) { - really_destroy(exec_ctx, lock); + really_destroy(lock); } } @@ -116,11 +114,10 @@ static void start_destroy(grpc_exec_ctx *exec_ctx, grpc_combiner *lock) { #define GRPC_COMBINER_DEBUG_SPAM(op, delta) #endif -void grpc_combiner_unref(grpc_exec_ctx *exec_ctx, - grpc_combiner *lock GRPC_COMBINER_DEBUG_ARGS) { +void grpc_combiner_unref(grpc_combiner *lock GRPC_COMBINER_DEBUG_ARGS) { GRPC_COMBINER_DEBUG_SPAM("UNREF", -1); if (gpr_unref(&lock->refs)) { - start_destroy(exec_ctx, lock); + start_destroy(lock); } } @@ -130,8 +127,7 @@ grpc_combiner *grpc_combiner_ref(grpc_combiner *lock GRPC_COMBINER_DEBUG_ARGS) { return lock; } -static void push_last_on_exec_ctx(grpc_exec_ctx *exec_ctx, - grpc_combiner *lock) { +static void push_last_on_exec_ctx(grpc_combiner *lock) { lock->next_combiner_on_this_exec_ctx = NULL; if (exec_ctx->active_combiner == NULL) { exec_ctx->active_combiner = exec_ctx->last_combiner = lock; @@ -141,8 +137,7 @@ static void push_last_on_exec_ctx(grpc_exec_ctx *exec_ctx, } } -static void push_first_on_exec_ctx(grpc_exec_ctx *exec_ctx, - grpc_combiner *lock) { +static void push_first_on_exec_ctx(grpc_combiner *lock) { lock->next_combiner_on_this_exec_ctx = exec_ctx->active_combiner; exec_ctx->active_combiner = lock; if (lock->next_combiner_on_this_exec_ctx == NULL) { @@ -154,9 +149,8 @@ static void push_first_on_exec_ctx(grpc_exec_ctx *exec_ctx, ((grpc_combiner *)(((char *)((closure)->scheduler)) - \ offsetof(grpc_combiner, scheduler_name))) -static void combiner_exec(grpc_exec_ctx *exec_ctx, grpc_closure *cl, - grpc_error *error) { - GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_ITEMS(exec_ctx); +static void combiner_exec(grpc_closure *cl, grpc_error *error) { + GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_ITEMS(); GPR_TIMER_BEGIN("combiner.execute", 0); grpc_combiner *lock = COMBINER_FROM_CLOSURE_SCHEDULER(cl, scheduler); gpr_atm last = gpr_atm_full_fetch_add(&lock->state, STATE_ELEM_COUNT_LOW_BIT); @@ -164,19 +158,19 @@ static void combiner_exec(grpc_exec_ctx *exec_ctx, grpc_closure *cl, "C:%p grpc_combiner_execute c=%p last=%" PRIdPTR, lock, cl, last)); if (last == 1) { - GRPC_STATS_INC_COMBINER_LOCKS_INITIATED(exec_ctx); + GRPC_STATS_INC_COMBINER_LOCKS_INITIATED(); GPR_TIMER_MARK("combiner.initiated", 0); gpr_atm_no_barrier_store(&lock->initiating_exec_ctx_or_null, - (gpr_atm)exec_ctx); + (gpr_atm)&exec_ctx); // first element on this list: add it to the list of combiner locks // executing within this exec_ctx - push_last_on_exec_ctx(exec_ctx, lock); + push_last_on_exec_ctx(lock); } else { // there may be a race with setting here: if that happens, we may delay // offload for one or two actions, and that's fine gpr_atm initiator = gpr_atm_no_barrier_load(&lock->initiating_exec_ctx_or_null); - if (initiator != 0 && initiator != (gpr_atm)exec_ctx) { + if (initiator != 0 && initiator != (gpr_atm)&exec_ctx) { gpr_atm_no_barrier_store(&lock->initiating_exec_ctx_or_null, 0); } } @@ -187,7 +181,7 @@ static void combiner_exec(grpc_exec_ctx *exec_ctx, grpc_closure *cl, GPR_TIMER_END("combiner.execute", 0); } -static void move_next(grpc_exec_ctx *exec_ctx) { +static void move_next() { exec_ctx->active_combiner = exec_ctx->active_combiner->next_combiner_on_this_exec_ctx; if (exec_ctx->active_combiner == NULL) { @@ -195,19 +189,19 @@ static void move_next(grpc_exec_ctx *exec_ctx) { } } -static void offload(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void offload(void *arg, grpc_error *error) { grpc_combiner *lock = (grpc_combiner *)arg; - push_last_on_exec_ctx(exec_ctx, lock); + push_last_on_exec_ctx(lock); } -static void queue_offload(grpc_exec_ctx *exec_ctx, grpc_combiner *lock) { - GRPC_STATS_INC_COMBINER_LOCKS_OFFLOADED(exec_ctx); - move_next(exec_ctx); +static void queue_offload(grpc_combiner *lock) { + GRPC_STATS_INC_COMBINER_LOCKS_OFFLOADED(); + move_next(); GRPC_COMBINER_TRACE(gpr_log(GPR_DEBUG, "C:%p queue_offload", lock)); - GRPC_CLOSURE_SCHED(exec_ctx, &lock->offload, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&lock->offload, GRPC_ERROR_NONE); } -bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx *exec_ctx) { +bool grpc_combiner_continue_exec_ctx() { GPR_TIMER_BEGIN("combiner.continue_exec_ctx", 0); grpc_combiner *lock = exec_ctx->active_combiner; if (lock == NULL) { @@ -223,16 +217,15 @@ bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx *exec_ctx) { "contended=%d " "exec_ctx_ready_to_finish=%d " "time_to_execute_final_list=%d", - lock, contended, - grpc_exec_ctx_ready_to_finish(exec_ctx), + lock, contended, grpc_exec_ctx_ready_to_finish(), lock->time_to_execute_final_list)); - if (contended && grpc_exec_ctx_ready_to_finish(exec_ctx) && + if (contended && grpc_exec_ctx_ready_to_finish() && grpc_executor_is_threaded()) { GPR_TIMER_MARK("offload_from_finished_exec_ctx", 0); // this execution context wants to move on: schedule remaining work to be // picked up on the executor - queue_offload(exec_ctx, lock); + queue_offload(lock); GPR_TIMER_END("combiner.continue_exec_ctx", 0); return true; } @@ -248,7 +241,7 @@ bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx *exec_ctx) { // queue is in an inconsistent state: use this as a cue that we should // go off and do something else for a while (and come back later) GPR_TIMER_MARK("delay_busy", 0); - queue_offload(exec_ctx, lock); + queue_offload(lock); GPR_TIMER_END("combiner.continue_exec_ctx", 0); return true; } @@ -258,7 +251,7 @@ bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx *exec_ctx) { #ifndef NDEBUG cl->scheduled = false; #endif - cl->cb(exec_ctx, cl->cb_arg, cl_err); + cl->cb(cl->cb_arg, cl_err); GRPC_ERROR_UNREF(cl_err); GPR_TIMER_END("combiner.exec1", 0); } else { @@ -275,7 +268,7 @@ bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx *exec_ctx) { #ifndef NDEBUG c->scheduled = false; #endif - c->cb(exec_ctx, c->cb_arg, error); + c->cb(c->cb_arg, error); GRPC_ERROR_UNREF(error); c = next; GPR_TIMER_END("combiner.exec_1final", 0); @@ -283,7 +276,7 @@ bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx *exec_ctx) { } GPR_TIMER_MARK("unref", 0); - move_next(exec_ctx); + move_next(); lock->time_to_execute_final_list = false; gpr_atm old_state = gpr_atm_full_fetch_add(&lock->state, -STATE_ELEM_COUNT_LOW_BIT); @@ -312,7 +305,7 @@ bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx *exec_ctx) { return true; case OLD_STATE_WAS(true, 1): // and one count, one orphaned --> unlocked and orphaned - really_destroy(exec_ctx, lock); + really_destroy(lock); GPR_TIMER_END("combiner.continue_exec_ctx", 0); return true; case OLD_STATE_WAS(false, 0): @@ -322,17 +315,15 @@ bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx *exec_ctx) { GPR_TIMER_END("combiner.continue_exec_ctx", 0); GPR_UNREACHABLE_CODE(return true); } - push_first_on_exec_ctx(exec_ctx, lock); + push_first_on_exec_ctx(lock); GPR_TIMER_END("combiner.continue_exec_ctx", 0); return true; } -static void enqueue_finally(grpc_exec_ctx *exec_ctx, void *closure, - grpc_error *error); +static void enqueue_finally(void *closure, grpc_error *error); -static void combiner_finally_exec(grpc_exec_ctx *exec_ctx, - grpc_closure *closure, grpc_error *error) { - GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS(exec_ctx); +static void combiner_finally_exec(grpc_closure *closure, grpc_error *error) { + GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS(); grpc_combiner *lock = COMBINER_FROM_CLOSURE_SCHEDULER(closure, finally_scheduler); GRPC_COMBINER_TRACE(gpr_log(GPR_DEBUG, @@ -341,8 +332,7 @@ static void combiner_finally_exec(grpc_exec_ctx *exec_ctx, GPR_TIMER_BEGIN("combiner.execute_finally", 0); if (exec_ctx->active_combiner != lock) { GPR_TIMER_MARK("slowpath", 0); - GRPC_CLOSURE_SCHED(exec_ctx, - GRPC_CLOSURE_CREATE(enqueue_finally, closure, + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(enqueue_finally, closure, grpc_combiner_scheduler(lock)), error); GPR_TIMER_END("combiner.execute_finally", 0); @@ -356,10 +346,8 @@ static void combiner_finally_exec(grpc_exec_ctx *exec_ctx, GPR_TIMER_END("combiner.execute_finally", 0); } -static void enqueue_finally(grpc_exec_ctx *exec_ctx, void *closure, - grpc_error *error) { - combiner_finally_exec(exec_ctx, (grpc_closure *)closure, - GRPC_ERROR_REF(error)); +static void enqueue_finally(void *closure, grpc_error *error) { + combiner_finally_exec((grpc_closure *)closure, GRPC_ERROR_REF(error)); } grpc_closure_scheduler *grpc_combiner_scheduler(grpc_combiner *combiner) { diff --git a/src/core/lib/iomgr/combiner.h b/src/core/lib/iomgr/combiner.h index 10e5fb480db..4e30bc284fd 100644 --- a/src/core/lib/iomgr/combiner.h +++ b/src/core/lib/iomgr/combiner.h @@ -44,26 +44,24 @@ grpc_combiner *grpc_combiner_create(void); , const char *file, int line, const char *reason #define GRPC_COMBINER_REF(combiner, reason) \ grpc_combiner_ref((combiner), __FILE__, __LINE__, (reason)) -#define GRPC_COMBINER_UNREF(exec_ctx, combiner, reason) \ - grpc_combiner_unref((exec_ctx), (combiner), __FILE__, __LINE__, (reason)) +#define GRPC_COMBINER_UNREF(combiner, reason) \ + grpc_combiner_unref((combiner), __FILE__, __LINE__, (reason)) #else #define GRPC_COMBINER_DEBUG_ARGS #define GRPC_COMBINER_REF(combiner, reason) grpc_combiner_ref((combiner)) -#define GRPC_COMBINER_UNREF(exec_ctx, combiner, reason) \ - grpc_combiner_unref((exec_ctx), (combiner)) +#define GRPC_COMBINER_UNREF(combiner, reason) grpc_combiner_unref((combiner)) #endif // Ref/unref the lock, for when we're sharing the lock ownership // Prefer to use the macros above grpc_combiner *grpc_combiner_ref(grpc_combiner *lock GRPC_COMBINER_DEBUG_ARGS); -void grpc_combiner_unref(grpc_exec_ctx *exec_ctx, - grpc_combiner *lock GRPC_COMBINER_DEBUG_ARGS); +void grpc_combiner_unref(grpc_combiner *lock GRPC_COMBINER_DEBUG_ARGS); // Fetch a scheduler to schedule closures against grpc_closure_scheduler *grpc_combiner_scheduler(grpc_combiner *lock); // Scheduler to execute \a action within the lock just prior to unlocking. grpc_closure_scheduler *grpc_combiner_finally_scheduler(grpc_combiner *lock); -bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx *exec_ctx); +bool grpc_combiner_continue_exec_ctx(); extern grpc_tracer_flag grpc_combiner_trace; diff --git a/src/core/lib/iomgr/endpoint.cc b/src/core/lib/iomgr/endpoint.cc index 37cce335cab..824991f2ede 100644 --- a/src/core/lib/iomgr/endpoint.cc +++ b/src/core/lib/iomgr/endpoint.cc @@ -18,35 +18,30 @@ #include "src/core/lib/iomgr/endpoint.h" -void grpc_endpoint_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* slices, grpc_closure* cb) { - ep->vtable->read(exec_ctx, ep, slices, cb); +void grpc_endpoint_read(grpc_endpoint* ep, grpc_slice_buffer* slices, + grpc_closure* cb) { + ep->vtable->read(ep, slices, cb); } -void grpc_endpoint_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* slices, grpc_closure* cb) { - ep->vtable->write(exec_ctx, ep, slices, cb); +void grpc_endpoint_write(grpc_endpoint* ep, grpc_slice_buffer* slices, + grpc_closure* cb) { + ep->vtable->write(ep, slices, cb); } -void grpc_endpoint_add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_pollset* pollset) { - ep->vtable->add_to_pollset(exec_ctx, ep, pollset); +void grpc_endpoint_add_to_pollset(grpc_endpoint* ep, grpc_pollset* pollset) { + ep->vtable->add_to_pollset(ep, pollset); } -void grpc_endpoint_add_to_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_endpoint* ep, +void grpc_endpoint_add_to_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset_set) { - ep->vtable->add_to_pollset_set(exec_ctx, ep, pollset_set); + ep->vtable->add_to_pollset_set(ep, pollset_set); } -void grpc_endpoint_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_error* why) { - ep->vtable->shutdown(exec_ctx, ep, why); +void grpc_endpoint_shutdown(grpc_endpoint* ep, grpc_error* why) { + ep->vtable->shutdown(ep, why); } -void grpc_endpoint_destroy(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep) { - ep->vtable->destroy(exec_ctx, ep); -} +void grpc_endpoint_destroy(grpc_endpoint* ep) { ep->vtable->destroy(ep); } char* grpc_endpoint_get_peer(grpc_endpoint* ep) { return ep->vtable->get_peer(ep); diff --git a/src/core/lib/iomgr/endpoint.h b/src/core/lib/iomgr/endpoint.h index 21347d90230..f3f5efbb979 100644 --- a/src/core/lib/iomgr/endpoint.h +++ b/src/core/lib/iomgr/endpoint.h @@ -37,16 +37,12 @@ typedef struct grpc_endpoint grpc_endpoint; typedef struct grpc_endpoint_vtable grpc_endpoint_vtable; struct grpc_endpoint_vtable { - void (*read)(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_slice_buffer *slices, grpc_closure *cb); - void (*write)(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_slice_buffer *slices, grpc_closure *cb); - void (*add_to_pollset)(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_pollset *pollset); - void (*add_to_pollset_set)(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_pollset_set *pollset); - void (*shutdown)(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, grpc_error *why); - void (*destroy)(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep); + void (*read)(grpc_endpoint *ep, grpc_slice_buffer *slices, grpc_closure *cb); + void (*write)(grpc_endpoint *ep, grpc_slice_buffer *slices, grpc_closure *cb); + void (*add_to_pollset)(grpc_endpoint *ep, grpc_pollset *pollset); + void (*add_to_pollset_set)(grpc_endpoint *ep, grpc_pollset_set *pollset); + void (*shutdown)(grpc_endpoint *ep, grpc_error *why); + void (*destroy)(grpc_endpoint *ep); grpc_resource_user *(*get_resource_user)(grpc_endpoint *ep); char *(*get_peer)(grpc_endpoint *ep); int (*get_fd)(grpc_endpoint *ep); @@ -57,8 +53,8 @@ struct grpc_endpoint_vtable { indicates the endpoint is closed. Valid slices may be placed into \a slices even when the callback is invoked with error != GRPC_ERROR_NONE. */ -void grpc_endpoint_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_slice_buffer *slices, grpc_closure *cb); +void grpc_endpoint_read(grpc_endpoint *ep, grpc_slice_buffer *slices, + grpc_closure *cb); char *grpc_endpoint_get_peer(grpc_endpoint *ep); @@ -76,21 +72,18 @@ int grpc_endpoint_get_fd(grpc_endpoint *ep); No guarantee is made to the content of slices after a write EXCEPT that it is a valid slice buffer. */ -void grpc_endpoint_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_slice_buffer *slices, grpc_closure *cb); +void grpc_endpoint_write(grpc_endpoint *ep, grpc_slice_buffer *slices, + grpc_closure *cb); /* Causes any pending and future read/write callbacks to run immediately with success==0 */ -void grpc_endpoint_shutdown(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_error *why); -void grpc_endpoint_destroy(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep); +void grpc_endpoint_shutdown(grpc_endpoint *ep, grpc_error *why); +void grpc_endpoint_destroy(grpc_endpoint *ep); /* Add an endpoint to a pollset, so that when the pollset is polled, events from this endpoint are considered */ -void grpc_endpoint_add_to_pollset(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_pollset *pollset); -void grpc_endpoint_add_to_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_endpoint *ep, +void grpc_endpoint_add_to_pollset(grpc_endpoint *ep, grpc_pollset *pollset); +void grpc_endpoint_add_to_pollset_set(grpc_endpoint *ep, grpc_pollset_set *pollset_set); grpc_resource_user *grpc_endpoint_get_resource_user(grpc_endpoint *endpoint); diff --git a/src/core/lib/iomgr/endpoint_pair_posix.cc b/src/core/lib/iomgr/endpoint_pair_posix.cc index 3ade2148bac..9be636e0745 100644 --- a/src/core/lib/iomgr/endpoint_pair_posix.cc +++ b/src/core/lib/iomgr/endpoint_pair_posix.cc @@ -54,18 +54,18 @@ grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char *name, char *final_name; create_sockets(sv); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; gpr_asprintf(&final_name, "%s:client", name); - p.client = grpc_tcp_create(&exec_ctx, grpc_fd_create(sv[1], final_name), args, + p.client = grpc_tcp_create(grpc_fd_create(sv[1], final_name), args, "socketpair-server"); gpr_free(final_name); gpr_asprintf(&final_name, "%s:server", name); - p.server = grpc_tcp_create(&exec_ctx, grpc_fd_create(sv[0], final_name), args, + p.server = grpc_tcp_create(grpc_fd_create(sv[0], final_name), args, "socketpair-client"); gpr_free(final_name); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return p; } diff --git a/src/core/lib/iomgr/endpoint_pair_windows.cc b/src/core/lib/iomgr/endpoint_pair_windows.cc index 782fa2fd690..3355cb97b08 100644 --- a/src/core/lib/iomgr/endpoint_pair_windows.cc +++ b/src/core/lib/iomgr/endpoint_pair_windows.cc @@ -72,14 +72,12 @@ grpc_endpoint_pair grpc_iomgr_create_endpoint_pair( SOCKET sv[2]; grpc_endpoint_pair p; create_sockets(sv); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - p.client = grpc_tcp_create(&exec_ctx, - grpc_winsocket_create(sv[1], "endpoint:client"), + ExecCtx _local_exec_ctx; + p.client = grpc_tcp_create(grpc_winsocket_create(sv[1], "endpoint:client"), channel_args, "endpoint:server"); - p.server = grpc_tcp_create(&exec_ctx, - grpc_winsocket_create(sv[0], "endpoint:server"), + p.server = grpc_tcp_create(grpc_winsocket_create(sv[0], "endpoint:server"), channel_args, "endpoint:client"); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return p; } diff --git a/src/core/lib/iomgr/error.cc b/src/core/lib/iomgr/error.cc index 2ea6cf1301e..4b7fb62f79d 100644 --- a/src/core/lib/iomgr/error.cc +++ b/src/core/lib/iomgr/error.cc @@ -158,9 +158,9 @@ static void unref_errs(grpc_error *err) { } static void unref_slice(grpc_slice slice) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_unref_internal(&exec_ctx, slice); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_slice_unref_internal(slice); + grpc_exec_ctx_finish(); } static void unref_strs(grpc_error *err) { diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc index 6126e2771cd..301b729eb57 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -295,32 +295,29 @@ static int fd_wrapped_fd(grpc_fd *fd) { return fd->fd; } /* if 'releasing_fd' is true, it means that we are going to detach the internal * fd from grpc_fd structure (i.e which means we should not be calling * shutdown() syscall on that fd) */ -static void fd_shutdown_internal(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_error *why, bool releasing_fd) { - if (grpc_lfev_set_shutdown(exec_ctx, &fd->read_closure, - GRPC_ERROR_REF(why))) { +static void fd_shutdown_internal(grpc_fd *fd, grpc_error *why, + bool releasing_fd) { + if (grpc_lfev_set_shutdown(&fd->read_closure, GRPC_ERROR_REF(why))) { if (!releasing_fd) { shutdown(fd->fd, SHUT_RDWR); } - grpc_lfev_set_shutdown(exec_ctx, &fd->write_closure, GRPC_ERROR_REF(why)); + grpc_lfev_set_shutdown(&fd->write_closure, GRPC_ERROR_REF(why)); } GRPC_ERROR_UNREF(why); } /* Might be called multiple times */ -static void fd_shutdown(grpc_exec_ctx *exec_ctx, grpc_fd *fd, grpc_error *why) { - fd_shutdown_internal(exec_ctx, fd, why, false); +static void fd_shutdown(grpc_fd *fd, grpc_error *why) { + fd_shutdown_internal(fd, why, false); } -static void fd_orphan(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_closure *on_done, int *release_fd, +static void fd_orphan(grpc_fd *fd, grpc_closure *on_done, int *release_fd, bool already_closed, const char *reason) { grpc_error *error = GRPC_ERROR_NONE; bool is_release_fd = (release_fd != NULL); if (!grpc_lfev_is_shutdown(&fd->read_closure)) { - fd_shutdown_internal(exec_ctx, fd, - GRPC_ERROR_CREATE_FROM_COPIED_STRING(reason), + fd_shutdown_internal(fd, GRPC_ERROR_CREATE_FROM_COPIED_STRING(reason), is_release_fd); } @@ -332,7 +329,7 @@ static void fd_orphan(grpc_exec_ctx *exec_ctx, grpc_fd *fd, close(fd->fd); } - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_REF(error)); grpc_iomgr_unregister_object(&fd->iomgr_object); grpc_lfev_destroy(&fd->read_closure); @@ -344,8 +341,7 @@ static void fd_orphan(grpc_exec_ctx *exec_ctx, grpc_fd *fd, gpr_mu_unlock(&fd_freelist_mu); } -static grpc_pollset *fd_get_read_notifier_pollset(grpc_exec_ctx *exec_ctx, - grpc_fd *fd) { +static grpc_pollset *fd_get_read_notifier_pollset(grpc_fd *fd) { gpr_atm notifier = gpr_atm_acq_load(&fd->read_notifier_pollset); return (grpc_pollset *)notifier; } @@ -354,25 +350,22 @@ static bool fd_is_shutdown(grpc_fd *fd) { return grpc_lfev_is_shutdown(&fd->read_closure); } -static void fd_notify_on_read(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_closure *closure) { - grpc_lfev_notify_on(exec_ctx, &fd->read_closure, closure, "read"); +static void fd_notify_on_read(grpc_fd *fd, grpc_closure *closure) { + grpc_lfev_notify_on(&fd->read_closure, closure, "read"); } -static void fd_notify_on_write(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_closure *closure) { - grpc_lfev_notify_on(exec_ctx, &fd->write_closure, closure, "write"); +static void fd_notify_on_write(grpc_fd *fd, grpc_closure *closure) { + grpc_lfev_notify_on(&fd->write_closure, closure, "write"); } -static void fd_become_readable(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_pollset *notifier) { - grpc_lfev_set_ready(exec_ctx, &fd->read_closure, "read"); +static void fd_become_readable(grpc_fd *fd, grpc_pollset *notifier) { + grpc_lfev_set_ready(&fd->read_closure, "read"); /* Use release store to match with acquire load in fd_get_read_notifier */ gpr_atm_rel_store(&fd->read_notifier_pollset, (gpr_atm)notifier); } -static void fd_become_writable(grpc_exec_ctx *exec_ctx, grpc_fd *fd) { - grpc_lfev_set_ready(exec_ctx, &fd->write_closure, "write"); +static void fd_become_writable(grpc_fd *fd) { + grpc_lfev_set_ready(&fd->write_closure, "write"); } /******************************************************************************* @@ -476,7 +469,7 @@ static void pollset_init(grpc_pollset *pollset, gpr_mu **mu) { pollset->next = pollset->prev = NULL; } -static void pollset_destroy(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset) { +static void pollset_destroy(grpc_pollset *pollset) { gpr_mu_lock(&pollset->mu); if (!pollset->seen_inactive) { pollset_neighborhood *neighborhood = pollset->neighborhood; @@ -504,27 +497,26 @@ static void pollset_destroy(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset) { gpr_mu_destroy(&pollset->mu); } -static grpc_error *pollset_kick_all(grpc_exec_ctx *exec_ctx, - grpc_pollset *pollset) { +static grpc_error *pollset_kick_all(grpc_pollset *pollset) { GPR_TIMER_BEGIN("pollset_kick_all", 0); grpc_error *error = GRPC_ERROR_NONE; if (pollset->root_worker != NULL) { grpc_pollset_worker *worker = pollset->root_worker; do { - GRPC_STATS_INC_POLLSET_KICK(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK(); switch (worker->state) { case KICKED: - GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx); + GRPC_STATS_INC_POLLSET_KICKED_AGAIN(); break; case UNKICKED: SET_KICK_STATE(worker, KICKED); if (worker->initialized_cv) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); gpr_cv_signal(&worker->cv); } break; case DESIGNATED_POLLER: - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(); SET_KICK_STATE(worker, KICKED); append_error(&error, grpc_wakeup_fd_wakeup(&global_wakeup_fd), "pollset_kick_all"); @@ -540,32 +532,29 @@ static grpc_error *pollset_kick_all(grpc_exec_ctx *exec_ctx, return error; } -static void pollset_maybe_finish_shutdown(grpc_exec_ctx *exec_ctx, - grpc_pollset *pollset) { +static void pollset_maybe_finish_shutdown(grpc_pollset *pollset) { if (pollset->shutdown_closure != NULL && pollset->root_worker == NULL && pollset->begin_refs == 0) { GPR_TIMER_MARK("pollset_finish_shutdown", 0); - GRPC_CLOSURE_SCHED(exec_ctx, pollset->shutdown_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(pollset->shutdown_closure, GRPC_ERROR_NONE); pollset->shutdown_closure = NULL; } } -static void pollset_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_closure *closure) { +static void pollset_shutdown(grpc_pollset *pollset, grpc_closure *closure) { GPR_TIMER_BEGIN("pollset_shutdown", 0); GPR_ASSERT(pollset->shutdown_closure == NULL); GPR_ASSERT(!pollset->shutting_down); pollset->shutdown_closure = closure; pollset->shutting_down = true; - GRPC_LOG_IF_ERROR("pollset_shutdown", pollset_kick_all(exec_ctx, pollset)); - pollset_maybe_finish_shutdown(exec_ctx, pollset); + GRPC_LOG_IF_ERROR("pollset_shutdown", pollset_kick_all(pollset)); + pollset_maybe_finish_shutdown(pollset); GPR_TIMER_END("pollset_shutdown", 0); } -static int poll_deadline_to_millis_timeout(grpc_exec_ctx *exec_ctx, - grpc_millis millis) { +static int poll_deadline_to_millis_timeout(grpc_millis millis) { if (millis == GRPC_MILLIS_INF_FUTURE) return -1; - grpc_millis delta = millis - grpc_exec_ctx_now(exec_ctx); + grpc_millis delta = millis - grpc_exec_ctx_now(); if (delta > INT_MAX) { return INT_MAX; } else if (delta < 0) { @@ -583,8 +572,7 @@ static int poll_deadline_to_millis_timeout(grpc_exec_ctx *exec_ctx, NOTE ON SYNCRHONIZATION: Similar to do_epoll_wait(), this function is only called by g_active_poller thread. So there is no need for synchronization when accessing fields in g_epoll_set */ -static grpc_error *process_epoll_events(grpc_exec_ctx *exec_ctx, - grpc_pollset *pollset) { +static grpc_error *process_epoll_events(grpc_pollset *pollset) { static const char *err_desc = "process_events"; grpc_error *error = GRPC_ERROR_NONE; @@ -608,11 +596,11 @@ static grpc_error *process_epoll_events(grpc_exec_ctx *exec_ctx, bool write_ev = (ev->events & EPOLLOUT) != 0; if (read_ev || cancel) { - fd_become_readable(exec_ctx, fd, pollset); + fd_become_readable(fd, pollset); } if (write_ev || cancel) { - fd_become_writable(exec_ctx, fd); + fd_become_writable(fd); } } } @@ -628,27 +616,26 @@ static grpc_error *process_epoll_events(grpc_exec_ctx *exec_ctx, NOTE ON SYNCHRONIZATION: At any point of time, only the g_active_poller (i.e the designated poller thread) will be calling this function. So there is no need for any synchronization when accesing fields in g_epoll_set */ -static grpc_error *do_epoll_wait(grpc_exec_ctx *exec_ctx, grpc_pollset *ps, - grpc_millis deadline) { +static grpc_error *do_epoll_wait(grpc_pollset *ps, grpc_millis deadline) { GPR_TIMER_BEGIN("do_epoll_wait", 0); int r; - int timeout = poll_deadline_to_millis_timeout(exec_ctx, deadline); + int timeout = poll_deadline_to_millis_timeout(deadline); if (timeout != 0) { GRPC_SCHEDULING_START_BLOCKING_REGION; } do { - GRPC_STATS_INC_SYSCALL_POLL(exec_ctx); + GRPC_STATS_INC_SYSCALL_POLL(); r = epoll_wait(g_epoll_set.epfd, g_epoll_set.events, MAX_EPOLL_EVENTS, timeout); } while (r < 0 && errno == EINTR); if (timeout != 0) { - GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(exec_ctx); + GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(); } if (r < 0) return GRPC_OS_ERROR(errno, "epoll_wait"); - GRPC_STATS_INC_POLL_EVENTS_RETURNED(exec_ctx, r); + GRPC_STATS_INC_POLL_EVENTS_RETURNED(r); if (GRPC_TRACER_ON(grpc_polling_trace)) { gpr_log(GPR_DEBUG, "ps: %p poll got %d events", ps, r); @@ -661,8 +648,7 @@ static grpc_error *do_epoll_wait(grpc_exec_ctx *exec_ctx, grpc_pollset *ps, return GRPC_ERROR_NONE; } -static bool begin_worker(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_pollset_worker *worker, +static bool begin_worker(grpc_pollset *pollset, grpc_pollset_worker *worker, grpc_pollset_worker **worker_hdl, grpc_millis deadline) { GPR_TIMER_BEGIN("begin_worker", 0); @@ -757,7 +743,7 @@ static bool begin_worker(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, SET_KICK_STATE(worker, KICKED); } } - grpc_exec_ctx_invalidate_now(exec_ctx); + grpc_exec_ctx_invalidate_now(); } if (GRPC_TRACER_ON(grpc_polling_trace)) { @@ -788,7 +774,7 @@ static bool begin_worker(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, } static bool check_neighborhood_for_available_poller( - grpc_exec_ctx *exec_ctx, pollset_neighborhood *neighborhood) { + pollset_neighborhood *neighborhood) { GPR_TIMER_BEGIN("check_neighborhood_for_available_poller", 0); bool found_worker = false; do { @@ -812,7 +798,7 @@ static bool check_neighborhood_for_available_poller( SET_KICK_STATE(inspect_worker, DESIGNATED_POLLER); if (inspect_worker->initialized_cv) { GPR_TIMER_MARK("signal worker", 0); - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); gpr_cv_signal(&inspect_worker->cv); } } else { @@ -852,8 +838,7 @@ static bool check_neighborhood_for_available_poller( return found_worker; } -static void end_worker(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_pollset_worker *worker, +static void end_worker(grpc_pollset *pollset, grpc_pollset_worker *worker, grpc_pollset_worker **worker_hdl) { GPR_TIMER_BEGIN("end_worker", 0); if (GRPC_TRACER_ON(grpc_polling_trace)) { @@ -872,11 +857,11 @@ static void end_worker(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, GPR_ASSERT(worker->next->initialized_cv); gpr_atm_no_barrier_store(&g_active_poller, (gpr_atm)worker->next); SET_KICK_STATE(worker->next, DESIGNATED_POLLER); - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); gpr_cv_signal(&worker->next->cv); - if (grpc_exec_ctx_has_work(exec_ctx)) { + if (grpc_exec_ctx_has_work()) { gpr_mu_unlock(&pollset->mu); - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(&pollset->mu); } } else { @@ -891,8 +876,7 @@ static void end_worker(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, &g_neighborhoods[(poller_neighborhood_idx + i) % g_num_neighborhoods]; if (gpr_mu_trylock(&neighborhood->mu)) { - found_worker = - check_neighborhood_for_available_poller(exec_ctx, neighborhood); + found_worker = check_neighborhood_for_available_poller(neighborhood); gpr_mu_unlock(&neighborhood->mu); scan_state[i] = true; } else { @@ -905,16 +889,15 @@ static void end_worker(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, &g_neighborhoods[(poller_neighborhood_idx + i) % g_num_neighborhoods]; gpr_mu_lock(&neighborhood->mu); - found_worker = - check_neighborhood_for_available_poller(exec_ctx, neighborhood); + found_worker = check_neighborhood_for_available_poller(neighborhood); gpr_mu_unlock(&neighborhood->mu); } - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(&pollset->mu); } - } else if (grpc_exec_ctx_has_work(exec_ctx)) { + } else if (grpc_exec_ctx_has_work()) { gpr_mu_unlock(&pollset->mu); - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(&pollset->mu); } if (worker->initialized_cv) { @@ -924,7 +907,7 @@ static void end_worker(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, gpr_log(GPR_DEBUG, " .. remove worker"); } if (EMPTIED == worker_remove(pollset, worker)) { - pollset_maybe_finish_shutdown(exec_ctx, pollset); + pollset_maybe_finish_shutdown(pollset); } GPR_ASSERT(gpr_atm_no_barrier_load(&g_active_poller) != (gpr_atm)worker); GPR_TIMER_END("end_worker", 0); @@ -934,7 +917,7 @@ static void end_worker(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, The function pollset_work() may temporarily release the lock (pollset->po.mu) during the course of its execution but it will always re-acquire the lock and ensure that it is held by the time the function returns */ -static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *ps, +static grpc_error *pollset_work(grpc_pollset *ps, grpc_pollset_worker **worker_hdl, grpc_millis deadline) { grpc_pollset_worker worker; @@ -947,7 +930,7 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *ps, return GRPC_ERROR_NONE; } - if (begin_worker(exec_ctx, ps, &worker, worker_hdl, deadline)) { + if (begin_worker(ps, &worker, worker_hdl, deadline)) { gpr_tls_set(&g_current_thread_pollset, (intptr_t)ps); gpr_tls_set(&g_current_thread_worker, (intptr_t)&worker); GPR_ASSERT(!ps->shutting_down); @@ -970,9 +953,9 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *ps, designated poller */ if (gpr_atm_acq_load(&g_epoll_set.cursor) == gpr_atm_acq_load(&g_epoll_set.num_events)) { - append_error(&error, do_epoll_wait(exec_ctx, ps, deadline), err_desc); + append_error(&error, do_epoll_wait(ps, deadline), err_desc); } - append_error(&error, process_epoll_events(exec_ctx, ps), err_desc); + append_error(&error, process_epoll_events(ps), err_desc); gpr_mu_lock(&ps->mu); /* lock */ @@ -980,17 +963,17 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *ps, } else { gpr_tls_set(&g_current_thread_pollset, (intptr_t)ps); } - end_worker(exec_ctx, ps, &worker, worker_hdl); + end_worker(ps, &worker, worker_hdl); gpr_tls_set(&g_current_thread_pollset, 0); GPR_TIMER_END("pollset_work", 0); return error; } -static grpc_error *pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, +static grpc_error *pollset_kick(grpc_pollset *pollset, grpc_pollset_worker *specific_worker) { GPR_TIMER_BEGIN("pollset_kick", 0); - GRPC_STATS_INC_POLLSET_KICK(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK(); grpc_error *ret_err = GRPC_ERROR_NONE; if (GRPC_TRACER_ON(grpc_polling_trace)) { gpr_strvec log; @@ -1023,7 +1006,7 @@ static grpc_error *pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, if (gpr_tls_get(&g_current_thread_pollset) != (intptr_t)pollset) { grpc_pollset_worker *root_worker = pollset->root_worker; if (root_worker == NULL) { - GRPC_STATS_INC_POLLSET_KICKED_WITHOUT_POLLER(exec_ctx); + GRPC_STATS_INC_POLLSET_KICKED_WITHOUT_POLLER(); pollset->kicked_without_poller = true; if (GRPC_TRACER_ON(grpc_polling_trace)) { gpr_log(GPR_ERROR, " .. kicked_without_poller"); @@ -1032,14 +1015,14 @@ static grpc_error *pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, } grpc_pollset_worker *next_worker = root_worker->next; if (root_worker->state == KICKED) { - GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx); + GRPC_STATS_INC_POLLSET_KICKED_AGAIN(); if (GRPC_TRACER_ON(grpc_polling_trace)) { gpr_log(GPR_ERROR, " .. already kicked %p", root_worker); } SET_KICK_STATE(root_worker, KICKED); goto done; } else if (next_worker->state == KICKED) { - GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx); + GRPC_STATS_INC_POLLSET_KICKED_AGAIN(); if (GRPC_TRACER_ON(grpc_polling_trace)) { gpr_log(GPR_ERROR, " .. already kicked %p", next_worker); } @@ -1050,7 +1033,7 @@ static grpc_error *pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, // there is no next worker root_worker == (grpc_pollset_worker *)gpr_atm_no_barrier_load( &g_active_poller)) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(); if (GRPC_TRACER_ON(grpc_polling_trace)) { gpr_log(GPR_ERROR, " .. kicked %p", root_worker); } @@ -1058,7 +1041,7 @@ static grpc_error *pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, ret_err = grpc_wakeup_fd_wakeup(&global_wakeup_fd); goto done; } else if (next_worker->state == UNKICKED) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); if (GRPC_TRACER_ON(grpc_polling_trace)) { gpr_log(GPR_ERROR, " .. kicked %p", next_worker); } @@ -1076,12 +1059,12 @@ static grpc_error *pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, } SET_KICK_STATE(root_worker, KICKED); if (root_worker->initialized_cv) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); gpr_cv_signal(&root_worker->cv); } goto done; } else { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(); if (GRPC_TRACER_ON(grpc_polling_trace)) { gpr_log(GPR_ERROR, " .. non-root poller %p (root=%p)", next_worker, root_worker); @@ -1091,13 +1074,13 @@ static grpc_error *pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, goto done; } } else { - GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx); + GRPC_STATS_INC_POLLSET_KICKED_AGAIN(); GPR_ASSERT(next_worker->state == KICKED); SET_KICK_STATE(next_worker, KICKED); goto done; } } else { - GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(); if (GRPC_TRACER_ON(grpc_polling_trace)) { gpr_log(GPR_ERROR, " .. kicked while waking up"); } @@ -1114,7 +1097,7 @@ static grpc_error *pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, goto done; } else if (gpr_tls_get(&g_current_thread_worker) == (intptr_t)specific_worker) { - GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(); if (GRPC_TRACER_ON(grpc_polling_trace)) { gpr_log(GPR_ERROR, " .. mark %p kicked", specific_worker); } @@ -1122,7 +1105,7 @@ static grpc_error *pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, goto done; } else if (specific_worker == (grpc_pollset_worker *)gpr_atm_no_barrier_load(&g_active_poller)) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(); if (GRPC_TRACER_ON(grpc_polling_trace)) { gpr_log(GPR_ERROR, " .. kick active poller"); } @@ -1130,7 +1113,7 @@ static grpc_error *pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, ret_err = grpc_wakeup_fd_wakeup(&global_wakeup_fd); goto done; } else if (specific_worker->initialized_cv) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); if (GRPC_TRACER_ON(grpc_polling_trace)) { gpr_log(GPR_ERROR, " .. kick waiting worker"); } @@ -1138,7 +1121,7 @@ static grpc_error *pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, gpr_cv_signal(&specific_worker->cv); goto done; } else { - GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx); + GRPC_STATS_INC_POLLSET_KICKED_AGAIN(); if (GRPC_TRACER_ON(grpc_polling_trace)) { gpr_log(GPR_ERROR, " .. kick non-waiting worker"); } @@ -1150,8 +1133,7 @@ done: return ret_err; } -static void pollset_add_fd(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_fd *fd) {} +static void pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd) {} /******************************************************************************* * Pollset-set Definitions @@ -1161,27 +1143,20 @@ static grpc_pollset_set *pollset_set_create(void) { return (grpc_pollset_set *)((intptr_t)0xdeafbeef); } -static void pollset_set_destroy(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pss) {} +static void pollset_set_destroy(grpc_pollset_set *pss) {} -static void pollset_set_add_fd(grpc_exec_ctx *exec_ctx, grpc_pollset_set *pss, - grpc_fd *fd) {} +static void pollset_set_add_fd(grpc_pollset_set *pss, grpc_fd *fd) {} -static void pollset_set_del_fd(grpc_exec_ctx *exec_ctx, grpc_pollset_set *pss, - grpc_fd *fd) {} +static void pollset_set_del_fd(grpc_pollset_set *pss, grpc_fd *fd) {} -static void pollset_set_add_pollset(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pss, grpc_pollset *ps) {} +static void pollset_set_add_pollset(grpc_pollset_set *pss, grpc_pollset *ps) {} -static void pollset_set_del_pollset(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pss, grpc_pollset *ps) {} +static void pollset_set_del_pollset(grpc_pollset_set *pss, grpc_pollset *ps) {} -static void pollset_set_add_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *bag, +static void pollset_set_add_pollset_set(grpc_pollset_set *bag, grpc_pollset_set *item) {} -static void pollset_set_del_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *bag, +static void pollset_set_del_pollset_set(grpc_pollset_set *bag, grpc_pollset_set *item) {} /******************************************************************************* diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc index 59dd8fd2fe9..28fa48afa90 100644 --- a/src/core/lib/iomgr/ev_epollex_linux.cc +++ b/src/core/lib/iomgr/ev_epollex_linux.cc @@ -81,17 +81,14 @@ struct polling_group { static void po_init(polling_obj *po, polling_obj_type type); static void po_destroy(polling_obj *po); -static void po_join(grpc_exec_ctx *exec_ctx, polling_obj *a, polling_obj *b); +static void po_join(polling_obj *a, polling_obj *b); static int po_cmp(polling_obj *a, polling_obj *b); -static void pg_create(grpc_exec_ctx *exec_ctx, polling_obj **initial_po, - size_t initial_po_count); +static void pg_create(polling_obj **initial_po, size_t initial_po_count); static polling_group *pg_ref(polling_group *pg); static void pg_unref(polling_group *pg); -static void pg_merge(grpc_exec_ctx *exec_ctx, polling_group *a, - polling_group *b); -static void pg_join(grpc_exec_ctx *exec_ctx, polling_group *pg, - polling_obj *po); +static void pg_merge(polling_group *a, polling_group *b); +static void pg_join(polling_group *pg, polling_obj *po); /******************************************************************************* * pollable Declarations @@ -260,8 +257,7 @@ static gpr_mu fd_freelist_mu; #ifndef NDEBUG #define REF_BY(fd, n, reason) ref_by(fd, n, reason, __FILE__, __LINE__) -#define UNREF_BY(ec, fd, n, reason) \ - unref_by(ec, fd, n, reason, __FILE__, __LINE__) +#define UNREF_BY(fd, n, reason) unref_by(fd, n, reason, __FILE__, __LINE__) static void ref_by(grpc_fd *fd, int n, const char *reason, const char *file, int line) { if (GRPC_TRACER_ON(grpc_trace_fd_refcount)) { @@ -272,13 +268,13 @@ static void ref_by(grpc_fd *fd, int n, const char *reason, const char *file, } #else #define REF_BY(fd, n, reason) ref_by(fd, n) -#define UNREF_BY(ec, fd, n, reason) unref_by(ec, fd, n) +#define UNREF_BY(fd, n, reason) unref_by(fd, n) static void ref_by(grpc_fd *fd, int n) { #endif GPR_ASSERT(gpr_atm_no_barrier_fetch_add(&fd->refst, n) > 0); } -static void fd_destroy(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void fd_destroy(void *arg, grpc_error *error) { grpc_fd *fd = (grpc_fd *)arg; /* Add the fd to the freelist */ grpc_iomgr_unregister_object(&fd->iomgr_object); @@ -295,8 +291,8 @@ static void fd_destroy(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { } #ifndef NDEBUG -static void unref_by(grpc_exec_ctx *exec_ctx, grpc_fd *fd, int n, - const char *reason, const char *file, int line) { +static void unref_by(grpc_fd *fd, int n, const char *reason, const char *file, + int line) { if (GRPC_TRACER_ON(grpc_trace_fd_refcount)) { gpr_log(GPR_DEBUG, "FD %d %p unref %d %" PRIdPTR " -> %" PRIdPTR " [%s; %s:%d]", @@ -304,13 +300,13 @@ static void unref_by(grpc_exec_ctx *exec_ctx, grpc_fd *fd, int n, gpr_atm_no_barrier_load(&fd->refst) - n, reason, file, line); } #else -static void unref_by(grpc_exec_ctx *exec_ctx, grpc_fd *fd, int n) { +static void unref_by(grpc_fd *fd, int n) { #endif gpr_atm old = gpr_atm_full_fetch_add(&fd->refst, -n); if (old == n) { - GRPC_CLOSURE_SCHED(exec_ctx, GRPC_CLOSURE_CREATE(fd_destroy, fd, - grpc_schedule_on_exec_ctx), - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED( + GRPC_CLOSURE_CREATE(fd_destroy, fd, grpc_schedule_on_exec_ctx), + GRPC_ERROR_NONE); } else { GPR_ASSERT(old > n); } @@ -379,8 +375,7 @@ static int fd_wrapped_fd(grpc_fd *fd) { return ret_fd; } -static void fd_orphan(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_closure *on_done, int *release_fd, +static void fd_orphan(grpc_fd *fd, grpc_closure *on_done, int *release_fd, bool already_closed, const char *reason) { bool is_fd_closed = already_closed; grpc_error *error = GRPC_ERROR_NONE; @@ -408,17 +403,16 @@ static void fd_orphan(grpc_exec_ctx *exec_ctx, grpc_fd *fd, to be alive (and not added to freelist) until the end of this function */ REF_BY(fd, 1, reason); - GRPC_CLOSURE_SCHED(exec_ctx, fd->on_done_closure, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(fd->on_done_closure, GRPC_ERROR_REF(error)); gpr_mu_unlock(&fd->orphaned_mu); gpr_mu_unlock(&fd->pollable_obj.po.mu); - UNREF_BY(exec_ctx, fd, 2, reason); /* Drop the reference */ + UNREF_BY(fd, 2, reason); /* Drop the reference */ GRPC_LOG_IF_ERROR("fd_orphan", GRPC_ERROR_REF(error)); GRPC_ERROR_UNREF(error); } -static grpc_pollset *fd_get_read_notifier_pollset(grpc_exec_ctx *exec_ctx, - grpc_fd *fd) { +static grpc_pollset *fd_get_read_notifier_pollset(grpc_fd *fd) { gpr_atm notifier = gpr_atm_acq_load(&fd->read_notifier_pollset); return (grpc_pollset *)notifier; } @@ -428,23 +422,20 @@ static bool fd_is_shutdown(grpc_fd *fd) { } /* Might be called multiple times */ -static void fd_shutdown(grpc_exec_ctx *exec_ctx, grpc_fd *fd, grpc_error *why) { - if (grpc_lfev_set_shutdown(exec_ctx, &fd->read_closure, - GRPC_ERROR_REF(why))) { +static void fd_shutdown(grpc_fd *fd, grpc_error *why) { + if (grpc_lfev_set_shutdown(&fd->read_closure, GRPC_ERROR_REF(why))) { shutdown(fd->fd, SHUT_RDWR); - grpc_lfev_set_shutdown(exec_ctx, &fd->write_closure, GRPC_ERROR_REF(why)); + grpc_lfev_set_shutdown(&fd->write_closure, GRPC_ERROR_REF(why)); } GRPC_ERROR_UNREF(why); } -static void fd_notify_on_read(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_closure *closure) { - grpc_lfev_notify_on(exec_ctx, &fd->read_closure, closure, "read"); +static void fd_notify_on_read(grpc_fd *fd, grpc_closure *closure) { + grpc_lfev_notify_on(&fd->read_closure, closure, "read"); } -static void fd_notify_on_write(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_closure *closure) { - grpc_lfev_notify_on(exec_ctx, &fd->write_closure, closure, "write"); +static void fd_notify_on_write(grpc_fd *fd, grpc_closure *closure) { + grpc_lfev_notify_on(&fd->write_closure, closure, "write"); } /******************************************************************************* @@ -545,24 +536,22 @@ static void pollset_global_shutdown(void) { gpr_tls_destroy(&g_current_thread_worker); } -static void pollset_maybe_finish_shutdown(grpc_exec_ctx *exec_ctx, - grpc_pollset *pollset) { +static void pollset_maybe_finish_shutdown(grpc_pollset *pollset) { if (pollset->shutdown_closure != NULL && pollset->root_worker == NULL && pollset->kick_alls_pending == 0) { - GRPC_CLOSURE_SCHED(exec_ctx, pollset->shutdown_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(pollset->shutdown_closure, GRPC_ERROR_NONE); pollset->shutdown_closure = NULL; } } -static void do_kick_all(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error_unused) { +static void do_kick_all(void *arg, grpc_error *error_unused) { grpc_error *error = GRPC_ERROR_NONE; grpc_pollset *pollset = (grpc_pollset *)arg; gpr_mu_lock(&pollset->pollable_obj.po.mu); if (pollset->root_worker != NULL) { grpc_pollset_worker *worker = pollset->root_worker; do { - GRPC_STATS_INC_POLLSET_KICK(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK(); if (worker->pollable_obj != &pollset->pollable_obj) { gpr_mu_lock(&worker->pollable_obj->po.mu); } @@ -592,16 +581,16 @@ static void do_kick_all(grpc_exec_ctx *exec_ctx, void *arg, } while (worker != pollset->root_worker); } pollset->kick_alls_pending--; - pollset_maybe_finish_shutdown(exec_ctx, pollset); + pollset_maybe_finish_shutdown(pollset); gpr_mu_unlock(&pollset->pollable_obj.po.mu); GRPC_LOG_IF_ERROR("kick_all", error); } -static void pollset_kick_all(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset) { +static void pollset_kick_all(grpc_pollset *pollset) { pollset->kick_alls_pending++; - GRPC_CLOSURE_SCHED(exec_ctx, GRPC_CLOSURE_CREATE(do_kick_all, pollset, - grpc_schedule_on_exec_ctx), - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED( + GRPC_CLOSURE_CREATE(do_kick_all, pollset, grpc_schedule_on_exec_ctx), + GRPC_ERROR_NONE); } static grpc_error *pollset_kick_inner(grpc_pollset *pollset, pollable *p, @@ -667,10 +656,10 @@ static grpc_error *pollset_kick_inner(grpc_pollset *pollset, pollable *p, } /* p->po.mu must be held before calling this function */ -static grpc_error *pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, +static grpc_error *pollset_kick(grpc_pollset *pollset, grpc_pollset_worker *specific_worker) { pollable *p = pollset->current_pollable_obj; - GRPC_STATS_INC_POLLSET_KICK(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK(); if (p != &pollset->pollable_obj) { gpr_mu_lock(&p->po.mu); } @@ -690,10 +679,9 @@ static void pollset_init(grpc_pollset *pollset, gpr_mu **mu) { *mu = &pollset->pollable_obj.po.mu; } -static int poll_deadline_to_millis_timeout(grpc_exec_ctx *exec_ctx, - grpc_millis millis) { +static int poll_deadline_to_millis_timeout(grpc_millis millis) { if (millis == GRPC_MILLIS_INF_FUTURE) return -1; - grpc_millis delta = millis - grpc_exec_ctx_now(exec_ctx); + grpc_millis delta = millis - grpc_exec_ctx_now(); if (delta > INT_MAX) return INT_MAX; else if (delta < 0) @@ -702,9 +690,8 @@ static int poll_deadline_to_millis_timeout(grpc_exec_ctx *exec_ctx, return (int)delta; } -static void fd_become_readable(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_pollset *notifier) { - grpc_lfev_set_ready(exec_ctx, &fd->read_closure, "read"); +static void fd_become_readable(grpc_fd *fd, grpc_pollset *notifier) { + grpc_lfev_set_ready(&fd->read_closure, "read"); /* Note, it is possible that fd_become_readable might be called twice with different 'notifier's when an fd becomes readable and it is in two epoll @@ -715,8 +702,8 @@ static void fd_become_readable(grpc_exec_ctx *exec_ctx, grpc_fd *fd, gpr_atm_rel_store(&fd->read_notifier_pollset, (gpr_atm)notifier); } -static void fd_become_writable(grpc_exec_ctx *exec_ctx, grpc_fd *fd) { - grpc_lfev_set_ready(exec_ctx, &fd->write_closure, "write"); +static void fd_become_writable(grpc_fd *fd) { + grpc_lfev_set_ready(&fd->write_closure, "write"); } static grpc_error *fd_become_pollable_locked(grpc_fd *fd) { @@ -729,20 +716,18 @@ static grpc_error *fd_become_pollable_locked(grpc_fd *fd) { } /* pollset->po.mu lock must be held by the caller before calling this */ -static void pollset_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_closure *closure) { +static void pollset_shutdown(grpc_pollset *pollset, grpc_closure *closure) { GPR_ASSERT(pollset->shutdown_closure == NULL); pollset->shutdown_closure = closure; - pollset_kick_all(exec_ctx, pollset); - pollset_maybe_finish_shutdown(exec_ctx, pollset); + pollset_kick_all(pollset); + pollset_maybe_finish_shutdown(pollset); } static bool pollset_is_pollable_fd(grpc_pollset *pollset, pollable *p) { return p != &g_empty_pollable && p != &pollset->pollable_obj; } -static grpc_error *pollset_process_events(grpc_exec_ctx *exec_ctx, - grpc_pollset *pollset, bool drain) { +static grpc_error *pollset_process_events(grpc_pollset *pollset, bool drain) { static const char *err_desc = "pollset_process_events"; grpc_error *error = GRPC_ERROR_NONE; for (int i = 0; (drain || i < MAX_EPOLL_EVENTS_HANDLED_EACH_POLL_CALL) && @@ -771,10 +756,10 @@ static grpc_error *pollset_process_events(grpc_exec_ctx *exec_ctx, pollset, fd, cancel, read_ev, write_ev); } if (read_ev || cancel) { - fd_become_readable(exec_ctx, fd, pollset); + fd_become_readable(fd, pollset); } if (write_ev || cancel) { - fd_become_writable(exec_ctx, fd); + fd_become_writable(fd); } } } @@ -783,19 +768,18 @@ static grpc_error *pollset_process_events(grpc_exec_ctx *exec_ctx, } /* pollset_shutdown is guaranteed to be called before pollset_destroy. */ -static void pollset_destroy(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset) { +static void pollset_destroy(grpc_pollset *pollset) { pollable_destroy(&pollset->pollable_obj); if (pollset_is_pollable_fd(pollset, pollset->current_pollable_obj)) { - UNREF_BY(exec_ctx, (grpc_fd *)pollset->current_pollable_obj, 2, - "pollset_pollable"); + UNREF_BY((grpc_fd *)pollset->current_pollable_obj, 2, "pollset_pollable"); } GRPC_LOG_IF_ERROR("pollset_process_events", - pollset_process_events(exec_ctx, pollset, true)); + pollset_process_events(pollset, true)); } -static grpc_error *pollset_epoll(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - pollable *p, grpc_millis deadline) { - int timeout = poll_deadline_to_millis_timeout(exec_ctx, deadline); +static grpc_error *pollset_epoll(grpc_pollset *pollset, pollable *p, + grpc_millis deadline) { + int timeout = poll_deadline_to_millis_timeout(deadline); if (GRPC_TRACER_ON(grpc_polling_trace)) { char *desc = pollable_desc(p); @@ -808,11 +792,11 @@ static grpc_error *pollset_epoll(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, } int r; do { - GRPC_STATS_INC_SYSCALL_POLL(exec_ctx); + GRPC_STATS_INC_SYSCALL_POLL(); r = epoll_wait(p->epfd, pollset->events, MAX_EPOLL_EVENTS, timeout); } while (r < 0 && errno == EINTR); if (timeout != 0) { - GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(exec_ctx); + GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(); } if (r < 0) return GRPC_OS_ERROR(errno, "epoll_wait"); @@ -867,8 +851,7 @@ static worker_remove_result worker_remove(grpc_pollset_worker **root, } /* Return true if this thread should poll */ -static bool begin_worker(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_pollset_worker *worker, +static bool begin_worker(grpc_pollset *pollset, grpc_pollset_worker *worker, grpc_pollset_worker **worker_hdl, grpc_millis deadline) { bool do_poll = true; @@ -894,7 +877,7 @@ static bool begin_worker(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, worker->pollable_obj->root_worker != worker) { gpr_log(GPR_DEBUG, "PS:%p wait %p w=%p for %dms", pollset, worker->pollable_obj, worker, - poll_deadline_to_millis_timeout(exec_ctx, deadline)); + poll_deadline_to_millis_timeout(deadline)); } while (do_poll && worker->pollable_obj->root_worker != worker) { if (gpr_cv_wait(&worker->cv, &worker->pollable_obj->po.mu, @@ -921,15 +904,14 @@ static bool begin_worker(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, gpr_mu_lock(&pollset->pollable_obj.po.mu); gpr_mu_lock(&worker->pollable_obj->po.mu); } - grpc_exec_ctx_invalidate_now(exec_ctx); + grpc_exec_ctx_invalidate_now(); } return do_poll && pollset->shutdown_closure == NULL && pollset->current_pollable_obj == worker->pollable_obj; } -static void end_worker(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_pollset_worker *worker, +static void end_worker(grpc_pollset *pollset, grpc_pollset_worker *worker, grpc_pollset_worker **worker_hdl) { if (NEW_ROOT == worker_remove(&worker->pollable_obj->root_worker, PWL_POLLABLE, worker)) { @@ -939,10 +921,10 @@ static void end_worker(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, gpr_cv_destroy(&worker->cv); } if (pollset_is_pollable_fd(pollset, worker->pollable_obj)) { - UNREF_BY(exec_ctx, (grpc_fd *)worker->pollable_obj, 2, "one_poll"); + UNREF_BY((grpc_fd *)worker->pollable_obj, 2, "one_poll"); } if (EMPTIED == worker_remove(&pollset->root_worker, PWL_POLLSET, worker)) { - pollset_maybe_finish_shutdown(exec_ctx, pollset); + pollset_maybe_finish_shutdown(pollset); } } @@ -950,14 +932,14 @@ static void end_worker(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, The function pollset_work() may temporarily release the lock (pollset->po.mu) during the course of its execution but it will always re-acquire the lock and ensure that it is held by the time the function returns */ -static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, +static grpc_error *pollset_work(grpc_pollset *pollset, grpc_pollset_worker **worker_hdl, grpc_millis deadline) { grpc_pollset_worker worker; if (0 && GRPC_TRACER_ON(grpc_polling_trace)) { gpr_log(GPR_DEBUG, "PS:%p work hdl=%p worker=%p now=%" PRIdPTR " deadline=%" PRIdPTR " kwp=%d root_worker=%p", - pollset, worker_hdl, &worker, grpc_exec_ctx_now(exec_ctx), deadline, + pollset, worker_hdl, &worker, grpc_exec_ctx_now(), deadline, pollset->kicked_without_poller, pollset->root_worker); } grpc_error *error = GRPC_ERROR_NONE; @@ -969,7 +951,7 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, if (pollset->current_pollable_obj != &pollset->pollable_obj) { gpr_mu_lock(&pollset->current_pollable_obj->po.mu); } - if (begin_worker(exec_ctx, pollset, &worker, worker_hdl, deadline)) { + if (begin_worker(pollset, &worker, worker_hdl, deadline)) { gpr_tls_set(&g_current_thread_pollset, (intptr_t)pollset); gpr_tls_set(&g_current_thread_worker, (intptr_t)&worker); GPR_ASSERT(!pollset->shutdown_closure); @@ -979,41 +961,38 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, } gpr_mu_unlock(&pollset->pollable_obj.po.mu); if (pollset->event_cursor == pollset->event_count) { - append_error(&error, pollset_epoll(exec_ctx, pollset, worker.pollable_obj, - deadline), + append_error(&error, + pollset_epoll(pollset, worker.pollable_obj, deadline), err_desc); } - append_error(&error, pollset_process_events(exec_ctx, pollset, false), - err_desc); + append_error(&error, pollset_process_events(pollset, false), err_desc); gpr_mu_lock(&pollset->pollable_obj.po.mu); if (worker.pollable_obj != &pollset->pollable_obj) { gpr_mu_lock(&worker.pollable_obj->po.mu); } gpr_tls_set(&g_current_thread_pollset, 0); gpr_tls_set(&g_current_thread_worker, 0); - pollset_maybe_finish_shutdown(exec_ctx, pollset); + pollset_maybe_finish_shutdown(pollset); } - end_worker(exec_ctx, pollset, &worker, worker_hdl); + end_worker(pollset, &worker, worker_hdl); if (worker.pollable_obj != &pollset->pollable_obj) { gpr_mu_unlock(&worker.pollable_obj->po.mu); } - if (grpc_exec_ctx_has_work(exec_ctx)) { + if (grpc_exec_ctx_has_work()) { gpr_mu_unlock(&pollset->pollable_obj.po.mu); - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(&pollset->pollable_obj.po.mu); } return error; } -static void unref_fd_no_longer_poller(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void unref_fd_no_longer_poller(void *arg, grpc_error *error) { grpc_fd *fd = (grpc_fd *)arg; - UNREF_BY(exec_ctx, fd, 2, "pollset_pollable"); + UNREF_BY(fd, 2, "pollset_pollable"); } /* expects pollsets locked, flag whether fd is locked or not */ -static grpc_error *pollset_add_fd_locked(grpc_exec_ctx *exec_ctx, - grpc_pollset *pollset, grpc_fd *fd, +static grpc_error *pollset_add_fd_locked(grpc_pollset *pollset, grpc_fd *fd, bool fd_locked) { static const char *err_desc = "pollset_add_fd"; grpc_error *error = GRPC_ERROR_NONE; @@ -1024,7 +1003,7 @@ static grpc_error *pollset_add_fd_locked(grpc_exec_ctx *exec_ctx, fd); } /* empty pollable --> single fd pollable */ - pollset_kick_all(exec_ctx, pollset); + pollset_kick_all(pollset); pollset->current_pollable_obj = &fd->pollable_obj; if (!fd_locked) gpr_mu_lock(&fd->pollable_obj.po.mu); append_error(&error, fd_become_pollable_locked(fd), err_desc); @@ -1046,27 +1025,25 @@ static grpc_error *pollset_add_fd_locked(grpc_exec_ctx *exec_ctx, /* Introduce a spurious completion. If we do not, then it may be that the fd-specific epoll set consumed a completion without being polled, leading to a missed edge going up. */ - grpc_lfev_set_ready(exec_ctx, &had_fd->read_closure, "read"); - grpc_lfev_set_ready(exec_ctx, &had_fd->write_closure, "write"); - pollset_kick_all(exec_ctx, pollset); + grpc_lfev_set_ready(&had_fd->read_closure, "read"); + grpc_lfev_set_ready(&had_fd->write_closure, "write"); + pollset_kick_all(pollset); pollset->current_pollable_obj = &pollset->pollable_obj; if (append_error(&error, pollable_materialize(&pollset->pollable_obj), err_desc)) { pollable_add_fd(&pollset->pollable_obj, had_fd); pollable_add_fd(&pollset->pollable_obj, fd); } - GRPC_CLOSURE_SCHED(exec_ctx, - GRPC_CLOSURE_CREATE(unref_fd_no_longer_poller, had_fd, + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(unref_fd_no_longer_poller, had_fd, grpc_schedule_on_exec_ctx), GRPC_ERROR_NONE); } return error; } -static void pollset_add_fd(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_fd *fd) { +static void pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd) { gpr_mu_lock(&pollset->pollable_obj.po.mu); - grpc_error *error = pollset_add_fd_locked(exec_ctx, pollset, fd, false); + grpc_error *error = pollset_add_fd_locked(pollset, fd, false); gpr_mu_unlock(&pollset->pollable_obj.po.mu); GRPC_LOG_IF_ERROR("pollset_add_fd", error); } @@ -1081,36 +1058,29 @@ static grpc_pollset_set *pollset_set_create(void) { return pss; } -static void pollset_set_destroy(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pss) { +static void pollset_set_destroy(grpc_pollset_set *pss) { po_destroy(&pss->po); gpr_free(pss); } -static void pollset_set_add_fd(grpc_exec_ctx *exec_ctx, grpc_pollset_set *pss, - grpc_fd *fd) { - po_join(exec_ctx, &pss->po, &fd->pollable_obj.po); +static void pollset_set_add_fd(grpc_pollset_set *pss, grpc_fd *fd) { + po_join(&pss->po, &fd->pollable_obj.po); } -static void pollset_set_del_fd(grpc_exec_ctx *exec_ctx, grpc_pollset_set *pss, - grpc_fd *fd) {} +static void pollset_set_del_fd(grpc_pollset_set *pss, grpc_fd *fd) {} -static void pollset_set_add_pollset(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pss, grpc_pollset *ps) { - po_join(exec_ctx, &pss->po, &ps->pollable_obj.po); +static void pollset_set_add_pollset(grpc_pollset_set *pss, grpc_pollset *ps) { + po_join(&pss->po, &ps->pollable_obj.po); } -static void pollset_set_del_pollset(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pss, grpc_pollset *ps) {} +static void pollset_set_del_pollset(grpc_pollset_set *pss, grpc_pollset *ps) {} -static void pollset_set_add_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *bag, +static void pollset_set_add_pollset_set(grpc_pollset_set *bag, grpc_pollset_set *item) { - po_join(exec_ctx, &bag->po, &item->po); + po_join(&bag->po, &item->po); } -static void pollset_set_del_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *bag, +static void pollset_set_del_pollset_set(grpc_pollset_set *bag, grpc_pollset_set *item) {} static void po_init(polling_obj *po, polling_obj_type type) { @@ -1166,7 +1136,7 @@ static int po_cmp(polling_obj *a, polling_obj *b) { return 1; } -static void po_join(grpc_exec_ctx *exec_ctx, polling_obj *a, polling_obj *b) { +static void po_join(polling_obj *a, polling_obj *b) { switch (po_cmp(a, b)) { case 0: return; @@ -1180,20 +1150,20 @@ static void po_join(grpc_exec_ctx *exec_ctx, polling_obj *a, polling_obj *b) { if (a->group == NULL) { if (b->group == NULL) { polling_obj *initial_po[] = {a, b}; - pg_create(exec_ctx, initial_po, GPR_ARRAY_SIZE(initial_po)); + pg_create(initial_po, GPR_ARRAY_SIZE(initial_po)); gpr_mu_unlock(&a->mu); gpr_mu_unlock(&b->mu); } else { polling_group *b_group = pg_ref(b->group); gpr_mu_unlock(&b->mu); gpr_mu_unlock(&a->mu); - pg_join(exec_ctx, b_group, a); + pg_join(b_group, a); } } else if (b->group == NULL) { polling_group *a_group = pg_ref(a->group); gpr_mu_unlock(&a->mu); gpr_mu_unlock(&b->mu); - pg_join(exec_ctx, a_group, b); + pg_join(a_group, b); } else if (a->group == b->group) { /* nothing to do */ gpr_mu_unlock(&a->mu); @@ -1203,21 +1173,20 @@ static void po_join(grpc_exec_ctx *exec_ctx, polling_obj *a, polling_obj *b) { polling_group *b_group = pg_ref(b->group); gpr_mu_unlock(&a->mu); gpr_mu_unlock(&b->mu); - pg_merge(exec_ctx, a_group, b_group); + pg_merge(a_group, b_group); } } } -static void pg_notify(grpc_exec_ctx *exec_ctx, polling_obj *a, polling_obj *b) { +static void pg_notify(polling_obj *a, polling_obj *b) { if (a->type == PO_FD && b->type == PO_POLLSET) { - pollset_add_fd_locked(exec_ctx, (grpc_pollset *)b, (grpc_fd *)a, true); + pollset_add_fd_locked((grpc_pollset *)b, (grpc_fd *)a, true); } else if (a->type == PO_POLLSET && b->type == PO_FD) { - pollset_add_fd_locked(exec_ctx, (grpc_pollset *)a, (grpc_fd *)b, true); + pollset_add_fd_locked((grpc_pollset *)a, (grpc_fd *)b, true); } } -static void pg_broadcast(grpc_exec_ctx *exec_ctx, polling_group *from, - polling_group *to) { +static void pg_broadcast(polling_group *from, polling_group *to) { for (polling_obj *a = from->po.next; a != &from->po; a = a->next) { for (polling_obj *b = to->po.next; b != &to->po; b = b->next) { if (po_cmp(a, b) < 0) { @@ -1228,15 +1197,14 @@ static void pg_broadcast(grpc_exec_ctx *exec_ctx, polling_group *from, gpr_mu_lock(&b->mu); gpr_mu_lock(&a->mu); } - pg_notify(exec_ctx, a, b); + pg_notify(a, b); gpr_mu_unlock(&a->mu); gpr_mu_unlock(&b->mu); } } } -static void pg_create(grpc_exec_ctx *exec_ctx, polling_obj **initial_po, - size_t initial_po_count) { +static void pg_create(polling_obj **initial_po, size_t initial_po_count) { /* assumes all polling objects in initial_po are locked */ polling_group *pg = (polling_group *)gpr_malloc(sizeof(*pg)); po_init(&pg->po, PO_POLLING_GROUP); @@ -1257,13 +1225,12 @@ static void pg_create(grpc_exec_ctx *exec_ctx, polling_obj **initial_po, pg->po.prev = initial_po[initial_po_count - 1]; for (size_t i = 1; i < initial_po_count; i++) { for (size_t j = 0; j < i; j++) { - pg_notify(exec_ctx, initial_po[i], initial_po[j]); + pg_notify(initial_po[i], initial_po[j]); } } } -static void pg_join(grpc_exec_ctx *exec_ctx, polling_group *pg, - polling_obj *po) { +static void pg_join(polling_group *pg, polling_obj *po) { /* assumes neither pg nor po are locked; consumes one ref to pg */ pg = pg_lock_latest(pg); /* pg locked */ @@ -1283,12 +1250,12 @@ static void pg_join(grpc_exec_ctx *exec_ctx, polling_group *pg, polling_group *po_group = pg_ref(po->group); gpr_mu_unlock(&po->mu); gpr_mu_unlock(&existing->mu); - pg_merge(exec_ctx, pg, po_group); + pg_merge(pg, po_group); /* early exit: polling obj picked up a group during joining: we needed to do a full merge */ return; } - pg_notify(exec_ctx, po, existing); + pg_notify(po, existing); gpr_mu_unlock(&po->mu); gpr_mu_unlock(&existing->mu); } @@ -1297,7 +1264,7 @@ static void pg_join(grpc_exec_ctx *exec_ctx, polling_group *pg, gpr_mu_unlock(&pg->po.mu); polling_group *po_group = pg_ref(po->group); gpr_mu_unlock(&po->mu); - pg_merge(exec_ctx, pg, po_group); + pg_merge(pg, po_group); /* early exit: polling obj picked up a group during joining: we needed to do a full merge */ return; @@ -1310,8 +1277,7 @@ static void pg_join(grpc_exec_ctx *exec_ctx, polling_group *pg, gpr_mu_unlock(&po->mu); } -static void pg_merge(grpc_exec_ctx *exec_ctx, polling_group *a, - polling_group *b) { +static void pg_merge(polling_group *a, polling_group *b) { for (;;) { if (a == b) { pg_unref(a); @@ -1341,8 +1307,8 @@ static void pg_merge(grpc_exec_ctx *exec_ctx, polling_group *a, size_t unref_count = 0; size_t unref_cap = 0; b->po.group = a; - pg_broadcast(exec_ctx, a, b); - pg_broadcast(exec_ctx, b, a); + pg_broadcast(a, b); + pg_broadcast(b, a); while (b->po.next != &b->po) { polling_obj *po = b->po.next; gpr_mu_lock(&po->mu); diff --git a/src/core/lib/iomgr/ev_epollsig_linux.cc b/src/core/lib/iomgr/ev_epollsig_linux.cc index 035bdc4cb55..d7b61f0c447 100644 --- a/src/core/lib/iomgr/ev_epollsig_linux.cc +++ b/src/core/lib/iomgr/ev_epollsig_linux.cc @@ -164,13 +164,12 @@ static void fd_global_shutdown(void); #ifndef NDEBUG #define PI_ADD_REF(p, r) pi_add_ref_dbg((p), (r), __FILE__, __LINE__) -#define PI_UNREF(exec_ctx, p, r) \ - pi_unref_dbg((exec_ctx), (p), (r), __FILE__, __LINE__) +#define PI_UNREF(p, r) pi_unref_dbg((p), (r), __FILE__, __LINE__) #else #define PI_ADD_REF(p, r) pi_add_ref((p)) -#define PI_UNREF(exec_ctx, p, r) pi_unref((exec_ctx), (p)) +#define PI_UNREF(p, r) pi_unref((p)) #endif @@ -269,7 +268,7 @@ static grpc_wakeup_fd polling_island_wakeup_fd; static __thread polling_island *g_current_thread_polling_island; /* Forward declaration */ -static void polling_island_delete(grpc_exec_ctx *exec_ctx, polling_island *pi); +static void polling_island_delete(polling_island *pi); #ifdef GRPC_TSAN /* Currently TSAN may incorrectly flag data races between epoll_ctl and @@ -283,7 +282,7 @@ gpr_atm g_epoll_sync; #endif /* defined(GRPC_TSAN) */ static void pi_add_ref(polling_island *pi); -static void pi_unref(grpc_exec_ctx *exec_ctx, polling_island *pi); +static void pi_unref(polling_island *pi); #ifndef NDEBUG static void pi_add_ref_dbg(polling_island *pi, const char *reason, @@ -297,15 +296,15 @@ static void pi_add_ref_dbg(polling_island *pi, const char *reason, pi_add_ref(pi); } -static void pi_unref_dbg(grpc_exec_ctx *exec_ctx, polling_island *pi, - const char *reason, const char *file, int line) { +static void pi_unref_dbg(polling_island *pi, const char *reason, + const char *file, int line) { if (GRPC_TRACER_ON(grpc_polling_trace)) { gpr_atm old_cnt = gpr_atm_acq_load(&pi->ref_count); gpr_log(GPR_DEBUG, "Unref pi: %p, old:%" PRIdPTR " -> new:%" PRIdPTR " (%s) - (%s, %d)", pi, old_cnt, (old_cnt - 1), reason, file, line); } - pi_unref(exec_ctx, pi); + pi_unref(pi); } #endif @@ -313,7 +312,7 @@ static void pi_add_ref(polling_island *pi) { gpr_atm_no_barrier_fetch_add(&pi->ref_count, 1); } -static void pi_unref(grpc_exec_ctx *exec_ctx, polling_island *pi) { +static void pi_unref(polling_island *pi) { /* If ref count went to zero, delete the polling island. Note that this deletion not be done under a lock. Once the ref count goes to zero, we are guaranteed that no one else holds a reference to the @@ -324,9 +323,9 @@ static void pi_unref(grpc_exec_ctx *exec_ctx, polling_island *pi) { */ if (1 == gpr_atm_full_fetch_add(&pi->ref_count, -1)) { polling_island *next = (polling_island *)gpr_atm_acq_load(&pi->merged_to); - polling_island_delete(exec_ctx, pi); + polling_island_delete(pi); if (next != NULL) { - PI_UNREF(exec_ctx, next, "pi_delete"); /* Recursive call */ + PI_UNREF(next, "pi_delete"); /* Recursive call */ } } } @@ -462,8 +461,7 @@ static void polling_island_remove_fd_locked(polling_island *pi, grpc_fd *fd, } /* Might return NULL in case of an error */ -static polling_island *polling_island_create(grpc_exec_ctx *exec_ctx, - grpc_fd *initial_fd, +static polling_island *polling_island_create(grpc_fd *initial_fd, grpc_error **error) { polling_island *pi = NULL; const char *err_desc = "polling_island_create"; @@ -494,13 +492,13 @@ static polling_island *polling_island_create(grpc_exec_ctx *exec_ctx, done: if (*error != GRPC_ERROR_NONE) { - polling_island_delete(exec_ctx, pi); + polling_island_delete(pi); pi = NULL; } return pi; } -static void polling_island_delete(grpc_exec_ctx *exec_ctx, polling_island *pi) { +static void polling_island_delete(polling_island *pi) { GPR_ASSERT(pi->fd_cnt == 0); if (pi->epoll_fd >= 0) { @@ -857,8 +855,7 @@ static int fd_wrapped_fd(grpc_fd *fd) { return ret_fd; } -static void fd_orphan(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_closure *on_done, int *release_fd, +static void fd_orphan(grpc_fd *fd, grpc_closure *on_done, int *release_fd, bool already_closed, const char *reason) { grpc_error *error = GRPC_ERROR_NONE; polling_island *unref_pi = NULL; @@ -897,7 +894,7 @@ static void fd_orphan(grpc_exec_ctx *exec_ctx, grpc_fd *fd, fd->orphaned = true; - GRPC_CLOSURE_SCHED(exec_ctx, fd->on_done_closure, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(fd->on_done_closure, GRPC_ERROR_REF(error)); gpr_mu_unlock(&fd->po.mu); UNREF_BY(fd, 2, reason); /* Drop the reference */ @@ -906,7 +903,7 @@ static void fd_orphan(grpc_exec_ctx *exec_ctx, grpc_fd *fd, The polling island owns a workqueue which owns an fd, and unreffing inside the lock can cause an eventual lock loop that makes TSAN very unhappy. */ - PI_UNREF(exec_ctx, unref_pi, "fd_orphan"); + PI_UNREF(unref_pi, "fd_orphan"); } if (error != GRPC_ERROR_NONE) { const char *msg = grpc_error_string(error); @@ -915,8 +912,7 @@ static void fd_orphan(grpc_exec_ctx *exec_ctx, grpc_fd *fd, GRPC_ERROR_UNREF(error); } -static grpc_pollset *fd_get_read_notifier_pollset(grpc_exec_ctx *exec_ctx, - grpc_fd *fd) { +static grpc_pollset *fd_get_read_notifier_pollset(grpc_fd *fd) { gpr_atm notifier = gpr_atm_acq_load(&fd->read_notifier_pollset); return (grpc_pollset *)notifier; } @@ -926,23 +922,20 @@ static bool fd_is_shutdown(grpc_fd *fd) { } /* Might be called multiple times */ -static void fd_shutdown(grpc_exec_ctx *exec_ctx, grpc_fd *fd, grpc_error *why) { - if (grpc_lfev_set_shutdown(exec_ctx, &fd->read_closure, - GRPC_ERROR_REF(why))) { +static void fd_shutdown(grpc_fd *fd, grpc_error *why) { + if (grpc_lfev_set_shutdown(&fd->read_closure, GRPC_ERROR_REF(why))) { shutdown(fd->fd, SHUT_RDWR); - grpc_lfev_set_shutdown(exec_ctx, &fd->write_closure, GRPC_ERROR_REF(why)); + grpc_lfev_set_shutdown(&fd->write_closure, GRPC_ERROR_REF(why)); } GRPC_ERROR_UNREF(why); } -static void fd_notify_on_read(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_closure *closure) { - grpc_lfev_notify_on(exec_ctx, &fd->read_closure, closure, "read"); +static void fd_notify_on_read(grpc_fd *fd, grpc_closure *closure) { + grpc_lfev_notify_on(&fd->read_closure, closure, "read"); } -static void fd_notify_on_write(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_closure *closure) { - grpc_lfev_notify_on(exec_ctx, &fd->write_closure, closure, "write"); +static void fd_notify_on_write(grpc_fd *fd, grpc_closure *closure) { + grpc_lfev_notify_on(&fd->write_closure, closure, "write"); } /******************************************************************************* @@ -1024,11 +1017,11 @@ static void push_front_worker(grpc_pollset *p, grpc_pollset_worker *worker) { } /* p->mu must be held before calling this function */ -static grpc_error *pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *p, +static grpc_error *pollset_kick(grpc_pollset *p, grpc_pollset_worker *specific_worker) { GPR_TIMER_BEGIN("pollset_kick", 0); grpc_error *error = GRPC_ERROR_NONE; - GRPC_STATS_INC_POLLSET_KICK(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK(); const char *err_desc = "Kick Failure"; grpc_pollset_worker *worker = specific_worker; if (worker != NULL) { @@ -1092,10 +1085,9 @@ static void pollset_init(grpc_pollset *pollset, gpr_mu **mu) { pollset->shutdown_done = NULL; } -static int poll_deadline_to_millis_timeout(grpc_exec_ctx *exec_ctx, - grpc_millis millis) { +static int poll_deadline_to_millis_timeout(grpc_millis millis) { if (millis == GRPC_MILLIS_INF_FUTURE) return -1; - grpc_millis delta = millis - grpc_exec_ctx_now(exec_ctx); + grpc_millis delta = millis - grpc_exec_ctx_now(); if (delta > INT_MAX) return INT_MAX; else if (delta < 0) @@ -1104,9 +1096,8 @@ static int poll_deadline_to_millis_timeout(grpc_exec_ctx *exec_ctx, return (int)delta; } -static void fd_become_readable(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_pollset *notifier) { - grpc_lfev_set_ready(exec_ctx, &fd->read_closure, "read"); +static void fd_become_readable(grpc_fd *fd, grpc_pollset *notifier) { + grpc_lfev_set_ready(&fd->read_closure, "read"); /* Note, it is possible that fd_become_readable might be called twice with different 'notifier's when an fd becomes readable and it is in two epoll @@ -1117,39 +1108,36 @@ static void fd_become_readable(grpc_exec_ctx *exec_ctx, grpc_fd *fd, gpr_atm_rel_store(&fd->read_notifier_pollset, (gpr_atm)notifier); } -static void fd_become_writable(grpc_exec_ctx *exec_ctx, grpc_fd *fd) { - grpc_lfev_set_ready(exec_ctx, &fd->write_closure, "write"); +static void fd_become_writable(grpc_fd *fd) { + grpc_lfev_set_ready(&fd->write_closure, "write"); } -static void pollset_release_polling_island(grpc_exec_ctx *exec_ctx, - grpc_pollset *ps, +static void pollset_release_polling_island(grpc_pollset *ps, const char *reason) { if (ps->po.pi != NULL) { - PI_UNREF(exec_ctx, ps->po.pi, reason); + PI_UNREF(ps->po.pi, reason); } ps->po.pi = NULL; } -static void finish_shutdown_locked(grpc_exec_ctx *exec_ctx, - grpc_pollset *pollset) { +static void finish_shutdown_locked(grpc_pollset *pollset) { /* The pollset cannot have any workers if we are at this stage */ GPR_ASSERT(!pollset_has_workers(pollset)); pollset->finish_shutdown_called = true; /* Release the ref and set pollset->po.pi to NULL */ - pollset_release_polling_island(exec_ctx, pollset, "ps_shutdown"); - GRPC_CLOSURE_SCHED(exec_ctx, pollset->shutdown_done, GRPC_ERROR_NONE); + pollset_release_polling_island(pollset, "ps_shutdown"); + GRPC_CLOSURE_SCHED(pollset->shutdown_done, GRPC_ERROR_NONE); } /* pollset->po.mu lock must be held by the caller before calling this */ -static void pollset_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_closure *closure) { +static void pollset_shutdown(grpc_pollset *pollset, grpc_closure *closure) { GPR_TIMER_BEGIN("pollset_shutdown", 0); GPR_ASSERT(!pollset->shutting_down); pollset->shutting_down = true; pollset->shutdown_done = closure; - pollset_kick(exec_ctx, pollset, GRPC_POLLSET_KICK_BROADCAST); + pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); /* If the pollset has any workers, we cannot call finish_shutdown_locked() because it would release the underlying polling island. In such a case, we @@ -1157,7 +1145,7 @@ static void pollset_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, if (!pollset_has_workers(pollset)) { GPR_ASSERT(!pollset->finish_shutdown_called); GPR_TIMER_MARK("pollset_shutdown.finish_shutdown_locked", 0); - finish_shutdown_locked(exec_ctx, pollset); + finish_shutdown_locked(pollset); } GPR_TIMER_END("pollset_shutdown", 0); } @@ -1165,15 +1153,14 @@ static void pollset_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, /* pollset_shutdown is guaranteed to be called before pollset_destroy. So other * than destroying the mutexes, there is nothing special that needs to be done * here */ -static void pollset_destroy(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset) { +static void pollset_destroy(grpc_pollset *pollset) { GPR_ASSERT(!pollset_has_workers(pollset)); gpr_mu_destroy(&pollset->po.mu); } #define GRPC_EPOLL_MAX_EVENTS 100 /* Note: sig_mask contains the signal mask to use *during* epoll_wait() */ -static void pollset_work_and_unlock(grpc_exec_ctx *exec_ctx, - grpc_pollset *pollset, +static void pollset_work_and_unlock(grpc_pollset *pollset, grpc_pollset_worker *worker, int timeout_ms, sigset_t *sig_mask, grpc_error **error) { struct epoll_event ep_ev[GRPC_EPOLL_MAX_EVENTS]; @@ -1195,7 +1182,7 @@ static void pollset_work_and_unlock(grpc_exec_ctx *exec_ctx, this function (i.e pollset_work_and_unlock()) is called */ if (pollset->po.pi == NULL) { - pollset->po.pi = polling_island_create(exec_ctx, NULL, error); + pollset->po.pi = polling_island_create(NULL, error); if (pollset->po.pi == NULL) { GPR_TIMER_END("pollset_work_and_unlock", 0); return; /* Fatal error. We cannot continue */ @@ -1215,7 +1202,7 @@ static void pollset_work_and_unlock(grpc_exec_ctx *exec_ctx, /* Always do PI_ADD_REF before PI_UNREF because PI_UNREF may cause the polling island to be deleted */ PI_ADD_REF(pi, "ps"); - PI_UNREF(exec_ctx, pollset->po.pi, "ps"); + PI_UNREF(pollset->po.pi, "ps"); pollset->po.pi = pi; } @@ -1229,10 +1216,10 @@ static void pollset_work_and_unlock(grpc_exec_ctx *exec_ctx, g_current_thread_polling_island = pi; GRPC_SCHEDULING_START_BLOCKING_REGION; - GRPC_STATS_INC_SYSCALL_POLL(exec_ctx); + GRPC_STATS_INC_SYSCALL_POLL(); ep_rv = epoll_pwait(epoll_fd, ep_ev, GRPC_EPOLL_MAX_EVENTS, timeout_ms, sig_mask); - GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(exec_ctx); + GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(); if (ep_rv < 0) { if (errno != EINTR) { gpr_asprintf(&err_msg, @@ -1270,10 +1257,10 @@ static void pollset_work_and_unlock(grpc_exec_ctx *exec_ctx, int read_ev = ep_ev[i].events & (EPOLLIN | EPOLLPRI); int write_ev = ep_ev[i].events & EPOLLOUT; if (read_ev || cancel) { - fd_become_readable(exec_ctx, fd, pollset); + fd_become_readable(fd, pollset); } if (write_ev || cancel) { - fd_become_writable(exec_ctx, fd); + fd_become_writable(fd); } } } @@ -1288,7 +1275,7 @@ static void pollset_work_and_unlock(grpc_exec_ctx *exec_ctx, that we got before releasing the polling island lock). This is because pollset->po.pi pointer might get udpated in other parts of the code when there is an island merge while we are doing epoll_wait() above */ - PI_UNREF(exec_ctx, pi, "ps_work"); + PI_UNREF(pi, "ps_work"); GPR_TIMER_END("pollset_work_and_unlock", 0); } @@ -1297,12 +1284,12 @@ static void pollset_work_and_unlock(grpc_exec_ctx *exec_ctx, The function pollset_work() may temporarily release the lock (pollset->po.mu) during the course of its execution but it will always re-acquire the lock and ensure that it is held by the time the function returns */ -static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, +static grpc_error *pollset_work(grpc_pollset *pollset, grpc_pollset_worker **worker_hdl, grpc_millis deadline) { GPR_TIMER_BEGIN("pollset_work", 0); grpc_error *error = GRPC_ERROR_NONE; - int timeout_ms = poll_deadline_to_millis_timeout(exec_ctx, deadline); + int timeout_ms = poll_deadline_to_millis_timeout(deadline); sigset_t new_mask; @@ -1360,9 +1347,9 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, push_front_worker(pollset, &worker); /* Add worker to pollset */ - pollset_work_and_unlock(exec_ctx, pollset, &worker, timeout_ms, - &g_orig_sigmask, &error); - grpc_exec_ctx_flush(exec_ctx); + pollset_work_and_unlock(pollset, &worker, timeout_ms, &g_orig_sigmask, + &error); + grpc_exec_ctx_flush(); gpr_mu_lock(&pollset->po.mu); @@ -1382,10 +1369,10 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, if (pollset->shutting_down && !pollset_has_workers(pollset) && !pollset->finish_shutdown_called) { GPR_TIMER_MARK("pollset_work.finish_shutdown_locked", 0); - finish_shutdown_locked(exec_ctx, pollset); + finish_shutdown_locked(pollset); gpr_mu_unlock(&pollset->po.mu); - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(&pollset->po.mu); } @@ -1400,9 +1387,8 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, return error; } -static void add_poll_object(grpc_exec_ctx *exec_ctx, poll_obj *bag, - poll_obj_type bag_type, poll_obj *item, - poll_obj_type item_type) { +static void add_poll_object(poll_obj *bag, poll_obj_type bag_type, + poll_obj *item, poll_obj_type item_type) { GPR_TIMER_BEGIN("add_poll_object", 0); #ifndef NDEBUG @@ -1452,7 +1438,7 @@ retry: keeping TSAN happy outweigh any performance advantage we might have by keeping the lock held. */ gpr_mu_unlock(&item->mu); - pi_new = polling_island_create(exec_ctx, FD_FROM_PO(item), &error); + pi_new = polling_island_create(FD_FROM_PO(item), &error); gpr_mu_lock(&item->mu); /* Need to reverify any assumptions made between the initial lock and @@ -1471,11 +1457,11 @@ retry: /* 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"); + PI_UNREF(pi_new, "dance_of_destruction"); goto retry; } } else { - pi_new = polling_island_create(exec_ctx, NULL, &error); + pi_new = polling_island_create(NULL, &error); } GRPC_POLLING_TRACE( @@ -1530,7 +1516,7 @@ retry: if (item->pi != pi_new) { PI_ADD_REF(pi_new, poll_obj_string(item_type)); if (item->pi != NULL) { - PI_UNREF(exec_ctx, item->pi, poll_obj_string(item_type)); + PI_UNREF(item->pi, poll_obj_string(item_type)); } item->pi = pi_new; } @@ -1538,7 +1524,7 @@ retry: if (bag->pi != pi_new) { PI_ADD_REF(pi_new, poll_obj_string(bag_type)); if (bag->pi != NULL) { - PI_UNREF(exec_ctx, bag->pi, poll_obj_string(bag_type)); + PI_UNREF(bag->pi, poll_obj_string(bag_type)); } bag->pi = pi_new; } @@ -1550,10 +1536,8 @@ retry: GPR_TIMER_END("add_poll_object", 0); } -static void pollset_add_fd(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_fd *fd) { - add_poll_object(exec_ctx, &pollset->po, POLL_OBJ_POLLSET, &fd->po, - POLL_OBJ_FD); +static void pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd) { + add_poll_object(&pollset->po, POLL_OBJ_POLLSET, &fd->po, POLL_OBJ_FD); } /******************************************************************************* @@ -1570,48 +1554,39 @@ static grpc_pollset_set *pollset_set_create(void) { return pss; } -static void pollset_set_destroy(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pss) { +static void pollset_set_destroy(grpc_pollset_set *pss) { gpr_mu_destroy(&pss->po.mu); if (pss->po.pi != NULL) { - PI_UNREF(exec_ctx, pss->po.pi, "pss_destroy"); + PI_UNREF(pss->po.pi, "pss_destroy"); } gpr_free(pss); } -static void pollset_set_add_fd(grpc_exec_ctx *exec_ctx, grpc_pollset_set *pss, - grpc_fd *fd) { - add_poll_object(exec_ctx, &pss->po, POLL_OBJ_POLLSET_SET, &fd->po, - POLL_OBJ_FD); +static void pollset_set_add_fd(grpc_pollset_set *pss, grpc_fd *fd) { + add_poll_object(&pss->po, POLL_OBJ_POLLSET_SET, &fd->po, POLL_OBJ_FD); } -static void pollset_set_del_fd(grpc_exec_ctx *exec_ctx, grpc_pollset_set *pss, - grpc_fd *fd) { +static void pollset_set_del_fd(grpc_pollset_set *pss, grpc_fd *fd) { /* Nothing to do */ } -static void pollset_set_add_pollset(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pss, grpc_pollset *ps) { - add_poll_object(exec_ctx, &pss->po, POLL_OBJ_POLLSET_SET, &ps->po, - POLL_OBJ_POLLSET); +static void pollset_set_add_pollset(grpc_pollset_set *pss, grpc_pollset *ps) { + add_poll_object(&pss->po, POLL_OBJ_POLLSET_SET, &ps->po, POLL_OBJ_POLLSET); } -static void pollset_set_del_pollset(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pss, grpc_pollset *ps) { +static void pollset_set_del_pollset(grpc_pollset_set *pss, grpc_pollset *ps) { /* Nothing to do */ } -static void pollset_set_add_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *bag, +static void pollset_set_add_pollset_set(grpc_pollset_set *bag, grpc_pollset_set *item) { - add_poll_object(exec_ctx, &bag->po, POLL_OBJ_POLLSET_SET, &item->po, + add_poll_object(&bag->po, POLL_OBJ_POLLSET_SET, &item->po, POLL_OBJ_POLLSET_SET); } -static void pollset_set_del_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *bag, +static void pollset_set_del_pollset_set(grpc_pollset_set *bag, grpc_pollset_set *item) { /* Nothing to do */ } diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index 036a35690c5..b61ecf7c42d 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -128,8 +128,7 @@ static uint32_t fd_begin_poll(grpc_fd *fd, grpc_pollset *pollset, MUST NOT be called with a pollset lock taken if got_read or got_write are 1, also does the become_{readable,writable} as appropriate. */ -static void fd_end_poll(grpc_exec_ctx *exec_ctx, grpc_fd_watcher *rec, - int got_read, int got_write, +static void fd_end_poll(grpc_fd_watcher *rec, int got_read, int got_write, grpc_pollset *read_notifier_pollset); /* Return 1 if this fd is orphaned, 0 otherwise */ @@ -186,11 +185,9 @@ struct grpc_pollset { }; /* Add an fd to a pollset */ -static void pollset_add_fd(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - struct grpc_fd *fd); +static void pollset_add_fd(grpc_pollset *pollset, struct grpc_fd *fd); -static void pollset_set_add_fd(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set, grpc_fd *fd); +static void pollset_set_add_fd(grpc_pollset_set *pollset_set, grpc_fd *fd); /* Convert a timespec to milliseconds: - very small or negative poll times are clamped to zero to do a @@ -199,8 +196,7 @@ static void pollset_set_add_fd(grpc_exec_ctx *exec_ctx, - longer than a millisecond polls are rounded up to the next nearest millisecond to avoid spinning - infinite timeouts are converted to -1 */ -static int poll_deadline_to_millis_timeout(grpc_exec_ctx *exec_ctx, - grpc_millis deadline); +static int poll_deadline_to_millis_timeout(grpc_millis deadline); /* Allow kick to wakeup the currently polling worker */ #define GRPC_POLLSET_CAN_KICK_SELF 1 @@ -208,7 +204,7 @@ static int poll_deadline_to_millis_timeout(grpc_exec_ctx *exec_ctx, #define GRPC_POLLSET_REEVALUATE_POLLING_ON_WAKEUP 2 /* As per pollset_kick, with an extended set of flags (defined above) -- mostly for fd_posix's use. */ -static grpc_error *pollset_kick_ext(grpc_exec_ctx *exec_ctx, grpc_pollset *p, +static grpc_error *pollset_kick_ext(grpc_pollset *p, grpc_pollset_worker *specific_worker, uint32_t flags) GRPC_MUST_USE_RESULT; @@ -353,8 +349,7 @@ static bool fd_is_orphaned(grpc_fd *fd) { } /* Return the read-notifier pollset */ -static grpc_pollset *fd_get_read_notifier_pollset(grpc_exec_ctx *exec_ctx, - grpc_fd *fd) { +static grpc_pollset *fd_get_read_notifier_pollset(grpc_fd *fd) { grpc_pollset *notifier = NULL; gpr_mu_lock(&fd->mu); @@ -364,39 +359,36 @@ static grpc_pollset *fd_get_read_notifier_pollset(grpc_exec_ctx *exec_ctx, return notifier; } -static grpc_error *pollset_kick_locked(grpc_exec_ctx *exec_ctx, - grpc_fd_watcher *watcher) { +static grpc_error *pollset_kick_locked(grpc_fd_watcher *watcher) { gpr_mu_lock(&watcher->pollset->mu); GPR_ASSERT(watcher->worker); - grpc_error *err = - pollset_kick_ext(exec_ctx, watcher->pollset, watcher->worker, - GRPC_POLLSET_REEVALUATE_POLLING_ON_WAKEUP); + grpc_error *err = pollset_kick_ext(watcher->pollset, watcher->worker, + GRPC_POLLSET_REEVALUATE_POLLING_ON_WAKEUP); gpr_mu_unlock(&watcher->pollset->mu); return err; } -static void maybe_wake_one_watcher_locked(grpc_exec_ctx *exec_ctx, - grpc_fd *fd) { +static void maybe_wake_one_watcher_locked(grpc_fd *fd) { if (fd->inactive_watcher_root.next != &fd->inactive_watcher_root) { - pollset_kick_locked(exec_ctx, fd->inactive_watcher_root.next); + pollset_kick_locked(fd->inactive_watcher_root.next); } else if (fd->read_watcher) { - pollset_kick_locked(exec_ctx, fd->read_watcher); + pollset_kick_locked(fd->read_watcher); } else if (fd->write_watcher) { - pollset_kick_locked(exec_ctx, fd->write_watcher); + pollset_kick_locked(fd->write_watcher); } } -static void wake_all_watchers_locked(grpc_exec_ctx *exec_ctx, grpc_fd *fd) { +static void wake_all_watchers_locked(grpc_fd *fd) { grpc_fd_watcher *watcher; for (watcher = fd->inactive_watcher_root.next; watcher != &fd->inactive_watcher_root; watcher = watcher->next) { - pollset_kick_locked(exec_ctx, watcher); + pollset_kick_locked(watcher); } if (fd->read_watcher) { - pollset_kick_locked(exec_ctx, fd->read_watcher); + pollset_kick_locked(fd->read_watcher); } if (fd->write_watcher && fd->write_watcher != fd->read_watcher) { - pollset_kick_locked(exec_ctx, fd->write_watcher); + pollset_kick_locked(fd->write_watcher); } } @@ -405,12 +397,12 @@ static int has_watchers(grpc_fd *fd) { fd->inactive_watcher_root.next != &fd->inactive_watcher_root; } -static void close_fd_locked(grpc_exec_ctx *exec_ctx, grpc_fd *fd) { +static void close_fd_locked(grpc_fd *fd) { fd->closed = 1; if (!fd->released) { close(fd->fd); } - GRPC_CLOSURE_SCHED(exec_ctx, fd->on_done_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(fd->on_done_closure, GRPC_ERROR_NONE); } static int fd_wrapped_fd(grpc_fd *fd) { @@ -421,8 +413,7 @@ static int fd_wrapped_fd(grpc_fd *fd) { } } -static void fd_orphan(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_closure *on_done, int *release_fd, +static void fd_orphan(grpc_fd *fd, grpc_closure *on_done, int *release_fd, bool already_closed, const char *reason) { fd->on_done_closure = on_done; fd->released = release_fd != NULL; @@ -435,9 +426,9 @@ static void fd_orphan(grpc_exec_ctx *exec_ctx, grpc_fd *fd, gpr_mu_lock(&fd->mu); REF_BY(fd, 1, reason); /* remove active status, but keep referenced */ if (!has_watchers(fd)) { - close_fd_locked(exec_ctx, fd); + close_fd_locked(fd); } else { - wake_all_watchers_locked(exec_ctx, fd); + wake_all_watchers_locked(fd); } gpr_mu_unlock(&fd->mu); UNREF_BY(fd, 2, reason); /* drop the reference */ @@ -469,10 +460,10 @@ static grpc_error *fd_shutdown_error(grpc_fd *fd) { } } -static void notify_on_locked(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_closure **st, grpc_closure *closure) { +static void notify_on_locked(grpc_fd *fd, grpc_closure **st, + grpc_closure *closure) { if (fd->shutdown) { - GRPC_CLOSURE_SCHED(exec_ctx, closure, + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_CREATE_FROM_STATIC_STRING("FD shutdown")); } else if (*st == CLOSURE_NOT_READY) { /* not ready ==> switch to a waiting state by setting the closure */ @@ -480,8 +471,8 @@ static void notify_on_locked(grpc_exec_ctx *exec_ctx, grpc_fd *fd, } else if (*st == CLOSURE_READY) { /* already ready ==> queue the closure to run immediately */ *st = CLOSURE_NOT_READY; - GRPC_CLOSURE_SCHED(exec_ctx, closure, fd_shutdown_error(fd)); - maybe_wake_one_watcher_locked(exec_ctx, fd); + GRPC_CLOSURE_SCHED(closure, fd_shutdown_error(fd)); + maybe_wake_one_watcher_locked(fd); } else { /* upcallptr was set to a different closure. This is an error! */ gpr_log(GPR_ERROR, @@ -492,8 +483,7 @@ static void notify_on_locked(grpc_exec_ctx *exec_ctx, grpc_fd *fd, } /* returns 1 if state becomes not ready */ -static int set_ready_locked(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_closure **st) { +static int set_ready_locked(grpc_fd *fd, grpc_closure **st) { if (*st == CLOSURE_READY) { /* duplicate ready ==> ignore */ return 0; @@ -503,18 +493,18 @@ static int set_ready_locked(grpc_exec_ctx *exec_ctx, grpc_fd *fd, return 0; } else { /* waiting ==> queue closure */ - GRPC_CLOSURE_SCHED(exec_ctx, *st, fd_shutdown_error(fd)); + GRPC_CLOSURE_SCHED(*st, fd_shutdown_error(fd)); *st = CLOSURE_NOT_READY; return 1; } } static void set_read_notifier_pollset_locked( - grpc_exec_ctx *exec_ctx, grpc_fd *fd, grpc_pollset *read_notifier_pollset) { + grpc_fd *fd, grpc_pollset *read_notifier_pollset) { fd->read_notifier_pollset = read_notifier_pollset; } -static void fd_shutdown(grpc_exec_ctx *exec_ctx, grpc_fd *fd, grpc_error *why) { +static void fd_shutdown(grpc_fd *fd, grpc_error *why) { gpr_mu_lock(&fd->mu); /* only shutdown once */ if (!fd->shutdown) { @@ -522,8 +512,8 @@ static void fd_shutdown(grpc_exec_ctx *exec_ctx, grpc_fd *fd, grpc_error *why) { fd->shutdown_error = why; /* signal read/write closed to OS so that future operations fail */ shutdown(fd->fd, SHUT_RDWR); - set_ready_locked(exec_ctx, fd, &fd->read_closure); - set_ready_locked(exec_ctx, fd, &fd->write_closure); + set_ready_locked(fd, &fd->read_closure); + set_ready_locked(fd, &fd->write_closure); } else { GRPC_ERROR_UNREF(why); } @@ -537,17 +527,15 @@ static bool fd_is_shutdown(grpc_fd *fd) { return r; } -static void fd_notify_on_read(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_closure *closure) { +static void fd_notify_on_read(grpc_fd *fd, grpc_closure *closure) { gpr_mu_lock(&fd->mu); - notify_on_locked(exec_ctx, fd, &fd->read_closure, closure); + notify_on_locked(fd, &fd->read_closure, closure); gpr_mu_unlock(&fd->mu); } -static void fd_notify_on_write(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_closure *closure) { +static void fd_notify_on_write(grpc_fd *fd, grpc_closure *closure) { gpr_mu_lock(&fd->mu); - notify_on_locked(exec_ctx, fd, &fd->write_closure, closure); + notify_on_locked(fd, &fd->write_closure, closure); gpr_mu_unlock(&fd->mu); } @@ -602,8 +590,7 @@ static uint32_t fd_begin_poll(grpc_fd *fd, grpc_pollset *pollset, return mask; } -static void fd_end_poll(grpc_exec_ctx *exec_ctx, grpc_fd_watcher *watcher, - int got_read, int got_write, +static void fd_end_poll(grpc_fd_watcher *watcher, int got_read, int got_write, grpc_pollset *read_notifier_pollset) { int was_polling = 0; int kick = 0; @@ -637,23 +624,23 @@ static void fd_end_poll(grpc_exec_ctx *exec_ctx, grpc_fd_watcher *watcher, watcher->prev->next = watcher->next; } if (got_read) { - if (set_ready_locked(exec_ctx, fd, &fd->read_closure)) { + if (set_ready_locked(fd, &fd->read_closure)) { kick = 1; } if (read_notifier_pollset != NULL) { - set_read_notifier_pollset_locked(exec_ctx, fd, read_notifier_pollset); + set_read_notifier_pollset_locked(fd, read_notifier_pollset); } } if (got_write) { - if (set_ready_locked(exec_ctx, fd, &fd->write_closure)) { + if (set_ready_locked(fd, &fd->write_closure)) { kick = 1; } } if (kick) { - maybe_wake_one_watcher_locked(exec_ctx, fd); + maybe_wake_one_watcher_locked(fd); } if (fd_is_orphaned(fd) && !has_watchers(fd) && !fd->closed) { - close_fd_locked(exec_ctx, fd); + close_fd_locked(fd); } gpr_mu_unlock(&fd->mu); @@ -714,12 +701,12 @@ static void kick_append_error(grpc_error **composite, grpc_error *error) { *composite = grpc_error_add_child(*composite, error); } -static grpc_error *pollset_kick_ext(grpc_exec_ctx *exec_ctx, grpc_pollset *p, +static grpc_error *pollset_kick_ext(grpc_pollset *p, grpc_pollset_worker *specific_worker, uint32_t flags) { GPR_TIMER_BEGIN("pollset_kick_ext", 0); grpc_error *error = GRPC_ERROR_NONE; - GRPC_STATS_INC_POLLSET_KICK(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK(); /* pollset->mu already held */ if (specific_worker != NULL) { @@ -785,9 +772,9 @@ static grpc_error *pollset_kick_ext(grpc_exec_ctx *exec_ctx, grpc_pollset *p, return error; } -static grpc_error *pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *p, +static grpc_error *pollset_kick(grpc_pollset *p, grpc_pollset_worker *specific_worker) { - return pollset_kick_ext(exec_ctx, p, specific_worker, 0); + return pollset_kick_ext(p, specific_worker, 0); } /* global state management */ @@ -821,7 +808,7 @@ static void pollset_init(grpc_pollset *pollset, gpr_mu **mu) { pollset->pollset_set_count = 0; } -static void pollset_destroy(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset) { +static void pollset_destroy(grpc_pollset *pollset) { GPR_ASSERT(!pollset_has_workers(pollset)); GPR_ASSERT(pollset->idle_jobs.head == pollset->idle_jobs.tail); while (pollset->local_wakeup_cache) { @@ -834,8 +821,7 @@ static void pollset_destroy(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset) { gpr_mu_destroy(&pollset->mu); } -static void pollset_add_fd(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_fd *fd) { +static void pollset_add_fd(grpc_pollset *pollset, grpc_fd *fd) { gpr_mu_lock(&pollset->mu); size_t i; /* TODO(ctiller): this is O(num_fds^2); maybe switch to a hash set here */ @@ -850,19 +836,19 @@ static void pollset_add_fd(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, } pollset->fds[pollset->fd_count++] = fd; GRPC_FD_REF(fd, "multipoller"); - pollset_kick(exec_ctx, pollset, NULL); + pollset_kick(pollset, NULL); exit: gpr_mu_unlock(&pollset->mu); } -static void finish_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset) { +static void finish_shutdown(grpc_pollset *pollset) { GPR_ASSERT(grpc_closure_list_empty(pollset->idle_jobs)); size_t i; for (i = 0; i < pollset->fd_count; i++) { GRPC_FD_UNREF(pollset->fds[i], "multipoller"); } pollset->fd_count = 0; - GRPC_CLOSURE_SCHED(exec_ctx, pollset->shutdown_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(pollset->shutdown_done, GRPC_ERROR_NONE); } static void work_combine_error(grpc_error **composite, grpc_error *error) { @@ -873,7 +859,7 @@ static void work_combine_error(grpc_error **composite, grpc_error *error) { *composite = grpc_error_add_child(*composite, error); } -static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, +static grpc_error *pollset_work(grpc_pollset *pollset, grpc_pollset_worker **worker_hdl, grpc_millis deadline) { grpc_pollset_worker worker; @@ -912,7 +898,7 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, if (!pollset_has_workers(pollset) && !grpc_closure_list_empty(pollset->idle_jobs)) { GPR_TIMER_MARK("pollset_work.idle_jobs", 0); - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pollset->idle_jobs); + GRPC_CLOSURE_LIST_SCHED(&pollset->idle_jobs); goto done; } /* If we're shutting down then we don't execute any extended work */ @@ -944,7 +930,7 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, grpc_fd_watcher *watchers; struct pollfd *pfds; - timeout = poll_deadline_to_millis_timeout(exec_ctx, deadline); + timeout = poll_deadline_to_millis_timeout(deadline); if (pollset->fd_count + 2 <= inline_elements) { pfds = pollfd_space; @@ -988,9 +974,9 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, /* TODO(vpai): Consider first doing a 0 timeout poll here to avoid even going into the blocking annotation if possible */ GRPC_SCHEDULING_START_BLOCKING_REGION; - GRPC_STATS_INC_SYSCALL_POLL(exec_ctx); + GRPC_STATS_INC_SYSCALL_POLL(); r = grpc_poll_function(pfds, pfd_count, timeout); - GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(exec_ctx); + GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(); if (GRPC_TRACER_ON(grpc_polling_trace)) { gpr_log(GPR_DEBUG, "%p poll=%d", pollset, r); @@ -1003,16 +989,16 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, for (i = 1; i < pfd_count; i++) { if (watchers[i].fd == NULL) { - fd_end_poll(exec_ctx, &watchers[i], 0, 0, NULL); + fd_end_poll(&watchers[i], 0, 0, NULL); } else { // Wake up all the file descriptors, if we have an invalid one // we can identify it on the next pollset_work() - fd_end_poll(exec_ctx, &watchers[i], 1, 1, pollset); + fd_end_poll(&watchers[i], 1, 1, pollset); } } } else if (r == 0) { for (i = 1; i < pfd_count; i++) { - fd_end_poll(exec_ctx, &watchers[i], 0, 0, NULL); + fd_end_poll(&watchers[i], 0, 0, NULL); } } else { if (pfds[0].revents & POLLIN_CHECK) { @@ -1024,14 +1010,14 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, } for (i = 1; i < pfd_count; i++) { if (watchers[i].fd == NULL) { - fd_end_poll(exec_ctx, &watchers[i], 0, 0, NULL); + fd_end_poll(&watchers[i], 0, 0, NULL); } else { if (GRPC_TRACER_ON(grpc_polling_trace)) { gpr_log(GPR_DEBUG, "%p got_event: %d r:%d w:%d [%d]", pollset, pfds[i].fd, (pfds[i].revents & POLLIN_CHECK) != 0, (pfds[i].revents & POLLOUT_CHECK) != 0, pfds[i].revents); } - fd_end_poll(exec_ctx, &watchers[i], pfds[i].revents & POLLIN_CHECK, + fd_end_poll(&watchers[i], pfds[i].revents & POLLIN_CHECK, pfds[i].revents & POLLOUT_CHECK, pollset); } } @@ -1054,7 +1040,7 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, worker list, which means nobody could ask us to re-evaluate polling). */ done: if (!locked) { - queued_work |= grpc_exec_ctx_flush(exec_ctx); + queued_work |= grpc_exec_ctx_flush(); gpr_mu_lock(&pollset->mu); locked = 1; } @@ -1083,21 +1069,21 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, /* check shutdown conditions */ if (pollset->shutting_down) { if (pollset_has_workers(pollset)) { - pollset_kick(exec_ctx, pollset, NULL); + pollset_kick(pollset, NULL); } else if (!pollset->called_shutdown && !pollset_has_observers(pollset)) { pollset->called_shutdown = 1; gpr_mu_unlock(&pollset->mu); - finish_shutdown(exec_ctx, pollset); - grpc_exec_ctx_flush(exec_ctx); + finish_shutdown(pollset); + grpc_exec_ctx_flush(); /* Continuing to access pollset here is safe -- it is the caller's * responsibility to not destroy when it has outstanding calls to * pollset_work. * TODO(dklempner): Can we refactor the shutdown logic to avoid this? */ gpr_mu_lock(&pollset->mu); } else if (!grpc_closure_list_empty(pollset->idle_jobs)) { - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pollset->idle_jobs); + GRPC_CLOSURE_LIST_SCHED(&pollset->idle_jobs); gpr_mu_unlock(&pollset->mu); - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(&pollset->mu); } } @@ -1107,26 +1093,24 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, return error; } -static void pollset_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_closure *closure) { +static void pollset_shutdown(grpc_pollset *pollset, grpc_closure *closure) { GPR_ASSERT(!pollset->shutting_down); pollset->shutting_down = 1; pollset->shutdown_done = closure; - pollset_kick(exec_ctx, pollset, GRPC_POLLSET_KICK_BROADCAST); + pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); if (!pollset_has_workers(pollset)) { - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pollset->idle_jobs); + GRPC_CLOSURE_LIST_SCHED(&pollset->idle_jobs); } if (!pollset->called_shutdown && !pollset_has_observers(pollset)) { pollset->called_shutdown = 1; - finish_shutdown(exec_ctx, pollset); + finish_shutdown(pollset); } } -static int poll_deadline_to_millis_timeout(grpc_exec_ctx *exec_ctx, - grpc_millis deadline) { +static int poll_deadline_to_millis_timeout(grpc_millis deadline) { if (deadline == GRPC_MILLIS_INF_FUTURE) return -1; if (deadline == 0) return 0; - grpc_millis n = deadline - grpc_exec_ctx_now(exec_ctx); + grpc_millis n = deadline - grpc_exec_ctx_now(); if (n < 0) return 0; if (n > INT_MAX) return -1; return (int)n; @@ -1143,8 +1127,7 @@ static grpc_pollset_set *pollset_set_create(void) { return pollset_set; } -static void pollset_set_destroy(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set) { +static void pollset_set_destroy(grpc_pollset_set *pollset_set) { size_t i; gpr_mu_destroy(&pollset_set->mu); for (i = 0; i < pollset_set->fd_count; i++) { @@ -1159,7 +1142,7 @@ static void pollset_set_destroy(grpc_exec_ctx *exec_ctx, !pollset_has_observers(pollset)) { pollset->called_shutdown = 1; gpr_mu_unlock(&pollset->mu); - finish_shutdown(exec_ctx, pollset); + finish_shutdown(pollset); } else { gpr_mu_unlock(&pollset->mu); } @@ -1170,8 +1153,7 @@ static void pollset_set_destroy(grpc_exec_ctx *exec_ctx, gpr_free(pollset_set); } -static void pollset_set_add_pollset(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set, +static void pollset_set_add_pollset(grpc_pollset_set *pollset_set, grpc_pollset *pollset) { size_t i, j; gpr_mu_lock(&pollset->mu); @@ -1190,7 +1172,7 @@ static void pollset_set_add_pollset(grpc_exec_ctx *exec_ctx, if (fd_is_orphaned(pollset_set->fds[i])) { GRPC_FD_UNREF(pollset_set->fds[i], "pollset_set"); } else { - pollset_add_fd(exec_ctx, pollset, pollset_set->fds[i]); + pollset_add_fd(pollset, pollset_set->fds[i]); pollset_set->fds[j++] = pollset_set->fds[i]; } } @@ -1198,8 +1180,7 @@ static void pollset_set_add_pollset(grpc_exec_ctx *exec_ctx, gpr_mu_unlock(&pollset_set->mu); } -static void pollset_set_del_pollset(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set, +static void pollset_set_del_pollset(grpc_pollset_set *pollset_set, grpc_pollset *pollset) { size_t i; gpr_mu_lock(&pollset_set->mu); @@ -1219,14 +1200,13 @@ static void pollset_set_del_pollset(grpc_exec_ctx *exec_ctx, !pollset_has_observers(pollset)) { pollset->called_shutdown = 1; gpr_mu_unlock(&pollset->mu); - finish_shutdown(exec_ctx, pollset); + finish_shutdown(pollset); } else { gpr_mu_unlock(&pollset->mu); } } -static void pollset_set_add_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *bag, +static void pollset_set_add_pollset_set(grpc_pollset_set *bag, grpc_pollset_set *item) { size_t i, j; gpr_mu_lock(&bag->mu); @@ -1241,7 +1221,7 @@ static void pollset_set_add_pollset_set(grpc_exec_ctx *exec_ctx, if (fd_is_orphaned(bag->fds[i])) { GRPC_FD_UNREF(bag->fds[i], "pollset_set"); } else { - pollset_set_add_fd(exec_ctx, item, bag->fds[i]); + pollset_set_add_fd(item, bag->fds[i]); bag->fds[j++] = bag->fds[i]; } } @@ -1249,8 +1229,7 @@ static void pollset_set_add_pollset_set(grpc_exec_ctx *exec_ctx, gpr_mu_unlock(&bag->mu); } -static void pollset_set_del_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *bag, +static void pollset_set_del_pollset_set(grpc_pollset_set *bag, grpc_pollset_set *item) { size_t i; gpr_mu_lock(&bag->mu); @@ -1265,8 +1244,7 @@ static void pollset_set_del_pollset_set(grpc_exec_ctx *exec_ctx, gpr_mu_unlock(&bag->mu); } -static void pollset_set_add_fd(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set, grpc_fd *fd) { +static void pollset_set_add_fd(grpc_pollset_set *pollset_set, grpc_fd *fd) { size_t i; gpr_mu_lock(&pollset_set->mu); if (pollset_set->fd_count == pollset_set->fd_capacity) { @@ -1277,16 +1255,15 @@ static void pollset_set_add_fd(grpc_exec_ctx *exec_ctx, GRPC_FD_REF(fd, "pollset_set"); pollset_set->fds[pollset_set->fd_count++] = fd; for (i = 0; i < pollset_set->pollset_count; i++) { - pollset_add_fd(exec_ctx, pollset_set->pollsets[i], fd); + pollset_add_fd(pollset_set->pollsets[i], fd); } for (i = 0; i < pollset_set->pollset_set_count; i++) { - pollset_set_add_fd(exec_ctx, pollset_set->pollset_sets[i], fd); + pollset_set_add_fd(pollset_set->pollset_sets[i], fd); } gpr_mu_unlock(&pollset_set->mu); } -static void pollset_set_del_fd(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set, grpc_fd *fd) { +static void pollset_set_del_fd(grpc_pollset_set *pollset_set, grpc_fd *fd) { size_t i; gpr_mu_lock(&pollset_set->mu); for (i = 0; i < pollset_set->fd_count; i++) { @@ -1299,7 +1276,7 @@ static void pollset_set_del_fd(grpc_exec_ctx *exec_ctx, } } for (i = 0; i < pollset_set->pollset_set_count; i++) { - pollset_set_del_fd(exec_ctx, pollset_set->pollset_sets[i], fd); + pollset_set_del_fd(pollset_set->pollset_sets[i], fd); } gpr_mu_unlock(&pollset_set->mu); } diff --git a/src/core/lib/iomgr/ev_posix.cc b/src/core/lib/iomgr/ev_posix.cc index 3a1dd8d30b3..3bc34575a11 100644 --- a/src/core/lib/iomgr/ev_posix.cc +++ b/src/core/lib/iomgr/ev_posix.cc @@ -196,28 +196,25 @@ int grpc_fd_wrapped_fd(grpc_fd *fd) { return g_event_engine->fd_wrapped_fd(fd); } -void grpc_fd_orphan(grpc_exec_ctx *exec_ctx, grpc_fd *fd, grpc_closure *on_done, - int *release_fd, bool already_closed, const char *reason) { - g_event_engine->fd_orphan(exec_ctx, fd, on_done, release_fd, already_closed, - reason); +void grpc_fd_orphan(grpc_fd *fd, grpc_closure *on_done, int *release_fd, + bool already_closed, const char *reason) { + g_event_engine->fd_orphan(fd, on_done, release_fd, already_closed, reason); } -void grpc_fd_shutdown(grpc_exec_ctx *exec_ctx, grpc_fd *fd, grpc_error *why) { - g_event_engine->fd_shutdown(exec_ctx, fd, why); +void grpc_fd_shutdown(grpc_fd *fd, grpc_error *why) { + g_event_engine->fd_shutdown(fd, why); } bool grpc_fd_is_shutdown(grpc_fd *fd) { return g_event_engine->fd_is_shutdown(fd); } -void grpc_fd_notify_on_read(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_closure *closure) { - g_event_engine->fd_notify_on_read(exec_ctx, fd, closure); +void grpc_fd_notify_on_read(grpc_fd *fd, grpc_closure *closure) { + g_event_engine->fd_notify_on_read(fd, closure); } -void grpc_fd_notify_on_write(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_closure *closure) { - g_event_engine->fd_notify_on_write(exec_ctx, fd, closure); +void grpc_fd_notify_on_write(grpc_fd *fd, grpc_closure *closure) { + g_event_engine->fd_notify_on_write(fd, closure); } size_t grpc_pollset_size(void) { return g_event_engine->pollset_size; } @@ -226,72 +223,63 @@ void grpc_pollset_init(grpc_pollset *pollset, gpr_mu **mu) { g_event_engine->pollset_init(pollset, mu); } -void grpc_pollset_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_closure *closure) { - g_event_engine->pollset_shutdown(exec_ctx, pollset, closure); +void grpc_pollset_shutdown(grpc_pollset *pollset, grpc_closure *closure) { + g_event_engine->pollset_shutdown(pollset, closure); } -void grpc_pollset_destroy(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset) { - g_event_engine->pollset_destroy(exec_ctx, pollset); +void grpc_pollset_destroy(grpc_pollset *pollset) { + g_event_engine->pollset_destroy(pollset); } -grpc_error *grpc_pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, +grpc_error *grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker **worker, grpc_millis deadline) { - return g_event_engine->pollset_work(exec_ctx, pollset, worker, deadline); + return g_event_engine->pollset_work(pollset, worker, deadline); } -grpc_error *grpc_pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, +grpc_error *grpc_pollset_kick(grpc_pollset *pollset, grpc_pollset_worker *specific_worker) { - return g_event_engine->pollset_kick(exec_ctx, pollset, specific_worker); + return g_event_engine->pollset_kick(pollset, specific_worker); } -void grpc_pollset_add_fd(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - struct grpc_fd *fd) { - g_event_engine->pollset_add_fd(exec_ctx, pollset, fd); +void grpc_pollset_add_fd(grpc_pollset *pollset, struct grpc_fd *fd) { + g_event_engine->pollset_add_fd(pollset, fd); } grpc_pollset_set *grpc_pollset_set_create(void) { return g_event_engine->pollset_set_create(); } -void grpc_pollset_set_destroy(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set) { - g_event_engine->pollset_set_destroy(exec_ctx, pollset_set); +void grpc_pollset_set_destroy(grpc_pollset_set *pollset_set) { + g_event_engine->pollset_set_destroy(pollset_set); } -void grpc_pollset_set_add_pollset(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set, +void grpc_pollset_set_add_pollset(grpc_pollset_set *pollset_set, grpc_pollset *pollset) { - g_event_engine->pollset_set_add_pollset(exec_ctx, pollset_set, pollset); + g_event_engine->pollset_set_add_pollset(pollset_set, pollset); } -void grpc_pollset_set_del_pollset(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set, +void grpc_pollset_set_del_pollset(grpc_pollset_set *pollset_set, grpc_pollset *pollset) { - g_event_engine->pollset_set_del_pollset(exec_ctx, pollset_set, pollset); + g_event_engine->pollset_set_del_pollset(pollset_set, pollset); } -void grpc_pollset_set_add_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *bag, +void grpc_pollset_set_add_pollset_set(grpc_pollset_set *bag, grpc_pollset_set *item) { - g_event_engine->pollset_set_add_pollset_set(exec_ctx, bag, item); + g_event_engine->pollset_set_add_pollset_set(bag, item); } -void grpc_pollset_set_del_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *bag, +void grpc_pollset_set_del_pollset_set(grpc_pollset_set *bag, grpc_pollset_set *item) { - g_event_engine->pollset_set_del_pollset_set(exec_ctx, bag, item); + g_event_engine->pollset_set_del_pollset_set(bag, item); } -void grpc_pollset_set_add_fd(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set, grpc_fd *fd) { - g_event_engine->pollset_set_add_fd(exec_ctx, pollset_set, fd); +void grpc_pollset_set_add_fd(grpc_pollset_set *pollset_set, grpc_fd *fd) { + g_event_engine->pollset_set_add_fd(pollset_set, fd); } -void grpc_pollset_set_del_fd(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set, grpc_fd *fd) { - g_event_engine->pollset_set_del_fd(exec_ctx, pollset_set, fd); +void grpc_pollset_set_del_fd(grpc_pollset_set *pollset_set, grpc_fd *fd) { + g_event_engine->pollset_set_del_fd(pollset_set, fd); } #endif // GRPC_POSIX_SOCKET diff --git a/src/core/lib/iomgr/ev_posix.h b/src/core/lib/iomgr/ev_posix.h index bc4456c2a29..5f9511bf195 100644 --- a/src/core/lib/iomgr/ev_posix.h +++ b/src/core/lib/iomgr/ev_posix.h @@ -40,48 +40,36 @@ typedef struct grpc_event_engine_vtable { grpc_fd *(*fd_create)(int fd, const char *name); int (*fd_wrapped_fd)(grpc_fd *fd); - void (*fd_orphan)(grpc_exec_ctx *exec_ctx, grpc_fd *fd, grpc_closure *on_done, - int *release_fd, bool already_closed, const char *reason); - void (*fd_shutdown)(grpc_exec_ctx *exec_ctx, grpc_fd *fd, grpc_error *why); - void (*fd_notify_on_read)(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_closure *closure); - void (*fd_notify_on_write)(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_closure *closure); + void (*fd_orphan)(grpc_fd *fd, grpc_closure *on_done, int *release_fd, + bool already_closed, const char *reason); + void (*fd_shutdown)(grpc_fd *fd, grpc_error *why); + void (*fd_notify_on_read)(grpc_fd *fd, grpc_closure *closure); + void (*fd_notify_on_write)(grpc_fd *fd, grpc_closure *closure); bool (*fd_is_shutdown)(grpc_fd *fd); - grpc_pollset *(*fd_get_read_notifier_pollset)(grpc_exec_ctx *exec_ctx, - grpc_fd *fd); + grpc_pollset *(*fd_get_read_notifier_pollset)(grpc_fd *fd); void (*pollset_init)(grpc_pollset *pollset, gpr_mu **mu); - void (*pollset_shutdown)(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_closure *closure); - void (*pollset_destroy)(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset); - grpc_error *(*pollset_work)(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, + void (*pollset_shutdown)(grpc_pollset *pollset, grpc_closure *closure); + void (*pollset_destroy)(grpc_pollset *pollset); + grpc_error *(*pollset_work)(grpc_pollset *pollset, grpc_pollset_worker **worker, grpc_millis deadline); - grpc_error *(*pollset_kick)(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, + grpc_error *(*pollset_kick)(grpc_pollset *pollset, grpc_pollset_worker *specific_worker); - void (*pollset_add_fd)(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - struct grpc_fd *fd); + void (*pollset_add_fd)(grpc_pollset *pollset, struct grpc_fd *fd); grpc_pollset_set *(*pollset_set_create)(void); - void (*pollset_set_destroy)(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set); - void (*pollset_set_add_pollset)(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set, + void (*pollset_set_destroy)(grpc_pollset_set *pollset_set); + void (*pollset_set_add_pollset)(grpc_pollset_set *pollset_set, grpc_pollset *pollset); - void (*pollset_set_del_pollset)(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set, + void (*pollset_set_del_pollset)(grpc_pollset_set *pollset_set, grpc_pollset *pollset); - void (*pollset_set_add_pollset_set)(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *bag, + void (*pollset_set_add_pollset_set)(grpc_pollset_set *bag, grpc_pollset_set *item); - void (*pollset_set_del_pollset_set)(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *bag, + void (*pollset_set_del_pollset_set)(grpc_pollset_set *bag, grpc_pollset_set *item); - void (*pollset_set_add_fd)(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set, grpc_fd *fd); - void (*pollset_set_del_fd)(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set, grpc_fd *fd); + void (*pollset_set_add_fd)(grpc_pollset_set *pollset_set, grpc_fd *fd); + void (*pollset_set_del_fd)(grpc_pollset_set *pollset_set, grpc_fd *fd); void (*shutdown_engine)(void); } grpc_event_engine_vtable; @@ -107,14 +95,14 @@ int grpc_fd_wrapped_fd(grpc_fd *fd); Requires: *fd initialized; no outstanding notify_on_read or notify_on_write. MUST NOT be called with a pollset lock taken */ -void grpc_fd_orphan(grpc_exec_ctx *exec_ctx, grpc_fd *fd, grpc_closure *on_done, - int *release_fd, bool already_closed, const char *reason); +void grpc_fd_orphan(grpc_fd *fd, grpc_closure *on_done, int *release_fd, + bool already_closed, const char *reason); /* Has grpc_fd_shutdown been called on an fd? */ bool grpc_fd_is_shutdown(grpc_fd *fd); /* Cause any current and future callbacks to fail. */ -void grpc_fd_shutdown(grpc_exec_ctx *exec_ctx, grpc_fd *fd, grpc_error *why); +void grpc_fd_shutdown(grpc_fd *fd, grpc_error *why); /* Register read interest, causing read_cb to be called once when fd becomes readable, on deadline specified by deadline, or on shutdown triggered by @@ -129,29 +117,23 @@ void grpc_fd_shutdown(grpc_exec_ctx *exec_ctx, grpc_fd *fd, grpc_error *why); underlying platform. This means that users must drain fd in read_cb before calling notify_on_read again. Users are also expected to handle spurious events, i.e read_cb is called while nothing can be readable from fd */ -void grpc_fd_notify_on_read(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_closure *closure); +void grpc_fd_notify_on_read(grpc_fd *fd, grpc_closure *closure); /* Exactly the same semantics as above, except based on writable events. */ -void grpc_fd_notify_on_write(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - grpc_closure *closure); +void grpc_fd_notify_on_write(grpc_fd *fd, grpc_closure *closure); /* Return the read notifier pollset from the fd */ -grpc_pollset *grpc_fd_get_read_notifier_pollset(grpc_exec_ctx *exec_ctx, - grpc_fd *fd); +grpc_pollset *grpc_fd_get_read_notifier_pollset(grpc_fd *fd); /* pollset_posix functions */ /* Add an fd to a pollset */ -void grpc_pollset_add_fd(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - struct grpc_fd *fd); +void grpc_pollset_add_fd(grpc_pollset *pollset, struct grpc_fd *fd); /* pollset_set_posix functions */ -void grpc_pollset_set_add_fd(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set, grpc_fd *fd); -void grpc_pollset_set_del_fd(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set, grpc_fd *fd); +void grpc_pollset_set_add_fd(grpc_pollset_set *pollset_set, grpc_fd *fd); +void grpc_pollset_set_del_fd(grpc_pollset_set *pollset_set, grpc_fd *fd); /* override to allow tests to hook poll() usage */ typedef int (*grpc_poll_function_type)(struct pollfd *, nfds_t, int); diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index 3d17afcb8fb..0b346cfec7a 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -25,10 +25,46 @@ #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/profiling/timers.h" -bool grpc_exec_ctx_ready_to_finish(grpc_exec_ctx *exec_ctx) { +thread_local ExecCtx *exec_ctx = nullptr; + +ExecCtx::ExecCtx() + : closure_list(GRPC_CLOSURE_LIST_INIT), + active_combiner(nullptr), + last_combiner(nullptr), + flags(GRPC_EXEC_CTX_FLAG_IS_FINISHED), + starting_cpu(gpr_cpu_current_cpu()), + check_ready_to_finish_arg(nullptr), + check_ready_to_finish(nullptr), + now_is_valid(false), + now(0), + last_exec_ctx(exec_ctx) { + exec_ctx = this; +} + +ExecCtx::ExecCtx(uintptr_t fl, bool (*finish_check)(void *arg), + void *finish_check_arg) + : closure_list(GRPC_CLOSURE_LIST_INIT), + active_combiner(nullptr), + last_combiner(nullptr), + flags(fl), + starting_cpu(gpr_cpu_current_cpu()), + check_ready_to_finish_arg(finish_check_arg), + check_ready_to_finish(finish_check), + now_is_valid(false), + now(0), + last_exec_ctx(exec_ctx) { + exec_ctx = this; +} + +ExecCtx::~ExecCtx() { + GPR_ASSERT(exec_ctx == this); + grpc_exec_ctx_finish(); + exec_ctx = last_exec_ctx; +} + +bool grpc_exec_ctx_ready_to_finish() { if ((exec_ctx->flags & GRPC_EXEC_CTX_FLAG_IS_FINISHED) == 0) { - if (exec_ctx->check_ready_to_finish(exec_ctx, - exec_ctx->check_ready_to_finish_arg)) { + if (exec_ctx->check_ready_to_finish(exec_ctx->check_ready_to_finish_arg)) { exec_ctx->flags |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; return true; } @@ -38,26 +74,21 @@ bool grpc_exec_ctx_ready_to_finish(grpc_exec_ctx *exec_ctx) { } } -bool grpc_never_ready_to_finish(grpc_exec_ctx *exec_ctx, void *arg_ignored) { - return false; -} +bool grpc_never_ready_to_finish(void *arg_ignored) { return false; } -bool grpc_always_ready_to_finish(grpc_exec_ctx *exec_ctx, void *arg_ignored) { - return true; -} +bool grpc_always_ready_to_finish(void *arg_ignored) { return true; } -bool grpc_exec_ctx_has_work(grpc_exec_ctx *exec_ctx) { +bool grpc_exec_ctx_has_work() { return exec_ctx->active_combiner != NULL || !grpc_closure_list_empty(exec_ctx->closure_list); } -void grpc_exec_ctx_finish(grpc_exec_ctx *exec_ctx) { +void grpc_exec_ctx_finish() { exec_ctx->flags |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); } -static void exec_ctx_run(grpc_exec_ctx *exec_ctx, grpc_closure *closure, - grpc_error *error) { +static void exec_ctx_run(grpc_closure *closure, grpc_error *error) { #ifndef NDEBUG closure->scheduled = false; if (GRPC_TRACER_ON(grpc_trace_closure)) { @@ -67,7 +98,7 @@ static void exec_ctx_run(grpc_exec_ctx *exec_ctx, grpc_closure *closure, closure->line_initiated); } #endif - closure->cb(exec_ctx, closure->cb_arg, error); + closure->cb(closure->cb_arg, error); #ifndef NDEBUG if (GRPC_TRACER_ON(grpc_trace_closure)) { gpr_log(GPR_DEBUG, "closure %p finished", closure); @@ -76,7 +107,7 @@ static void exec_ctx_run(grpc_exec_ctx *exec_ctx, grpc_closure *closure, GRPC_ERROR_UNREF(error); } -bool grpc_exec_ctx_flush(grpc_exec_ctx *exec_ctx) { +bool grpc_exec_ctx_flush() { bool did_something = 0; GPR_TIMER_BEGIN("grpc_exec_ctx_flush", 0); for (;;) { @@ -87,10 +118,10 @@ bool grpc_exec_ctx_flush(grpc_exec_ctx *exec_ctx) { grpc_closure *next = c->next_data.next; grpc_error *error = c->error_data.error; did_something = true; - exec_ctx_run(exec_ctx, c, error); + exec_ctx_run(c, error); c = next; } - } else if (!grpc_combiner_continue_exec_ctx(exec_ctx)) { + } else if (!grpc_combiner_continue_exec_ctx()) { break; } } @@ -99,8 +130,7 @@ bool grpc_exec_ctx_flush(grpc_exec_ctx *exec_ctx) { return did_something; } -static void exec_ctx_sched(grpc_exec_ctx *exec_ctx, grpc_closure *closure, - grpc_error *error) { +static void exec_ctx_sched(grpc_closure *closure, grpc_error *error) { grpc_closure_list_append(&exec_ctx->closure_list, closure, error); } @@ -138,7 +168,7 @@ static gpr_atm timespec_to_atm_round_up(gpr_timespec ts) { return (gpr_atm)x; } -grpc_millis grpc_exec_ctx_now(grpc_exec_ctx *exec_ctx) { +grpc_millis grpc_exec_ctx_now() { if (!exec_ctx->now_is_valid) { exec_ctx->now = timespec_to_atm_round_down(gpr_now(GPR_CLOCK_MONOTONIC)); exec_ctx->now_is_valid = true; @@ -146,9 +176,7 @@ grpc_millis grpc_exec_ctx_now(grpc_exec_ctx *exec_ctx) { return exec_ctx->now; } -void grpc_exec_ctx_invalidate_now(grpc_exec_ctx *exec_ctx) { - exec_ctx->now_is_valid = false; -} +void grpc_exec_ctx_invalidate_now() { exec_ctx->now_is_valid = false; } gpr_timespec grpc_millis_to_timespec(grpc_millis millis, gpr_clock_type clock_type) { diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index 44b9be7aa99..f79c7ae89a4 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -21,6 +21,7 @@ #include #include +#include #include "src/core/lib/iomgr/closure.h" @@ -74,56 +75,87 @@ struct grpc_exec_ctx { uintptr_t flags; unsigned starting_cpu; void *check_ready_to_finish_arg; - bool (*check_ready_to_finish)(grpc_exec_ctx *exec_ctx, void *arg); + bool (*check_ready_to_finish)(void *arg); bool now_is_valid; grpc_millis now; + const char *creator; }; -/* initializer for grpc_exec_ctx: - prefer to use GRPC_EXEC_CTX_INIT whenever possible */ -#define GRPC_EXEC_CTX_INITIALIZER(flags, finish_check, finish_check_arg) \ - { \ - GRPC_CLOSURE_LIST_INIT, NULL, NULL, flags, gpr_cpu_current_cpu(), \ - finish_check_arg, finish_check, false, 0 \ - } - -/* initialize an execution context at the top level of an API call into grpc - (this is safe to use elsewhere, though possibly not as efficient) */ -#define GRPC_EXEC_CTX_INIT \ - GRPC_EXEC_CTX_INITIALIZER(GRPC_EXEC_CTX_FLAG_IS_FINISHED, NULL, NULL) - extern grpc_closure_scheduler *grpc_schedule_on_exec_ctx; -bool grpc_exec_ctx_has_work(grpc_exec_ctx *exec_ctx); +bool grpc_exec_ctx_has_work(); /** Flush any work that has been enqueued onto this grpc_exec_ctx. * Caller must guarantee that no interfering locks are held. * Returns true if work was performed, false otherwise. */ -bool grpc_exec_ctx_flush(grpc_exec_ctx *exec_ctx); +bool grpc_exec_ctx_flush(); /** Finish any pending work for a grpc_exec_ctx. Must be called before * the instance is destroyed, or work may be lost. */ -void grpc_exec_ctx_finish(grpc_exec_ctx *exec_ctx); +void grpc_exec_ctx_finish(); /** Returns true if we'd like to leave this execution context as soon as possible: useful for deciding whether to do something more or not depending on outside context */ -bool grpc_exec_ctx_ready_to_finish(grpc_exec_ctx *exec_ctx); +bool grpc_exec_ctx_ready_to_finish(); /** A finish check that is never ready to finish */ -bool grpc_never_ready_to_finish(grpc_exec_ctx *exec_ctx, void *arg_ignored); +bool grpc_never_ready_to_finish(void *arg_ignored); /** A finish check that is always ready to finish */ -bool grpc_always_ready_to_finish(grpc_exec_ctx *exec_ctx, void *arg_ignored); +bool grpc_always_ready_to_finish(void *arg_ignored); void grpc_exec_ctx_global_init(void); void grpc_exec_ctx_global_init(void); void grpc_exec_ctx_global_shutdown(void); -grpc_millis grpc_exec_ctx_now(grpc_exec_ctx *exec_ctx); -void grpc_exec_ctx_invalidate_now(grpc_exec_ctx *exec_ctx); +grpc_millis grpc_exec_ctx_now(); +void grpc_exec_ctx_invalidate_now(); gpr_timespec grpc_millis_to_timespec(grpc_millis millis, gpr_clock_type clock); grpc_millis grpc_timespec_to_millis_round_down(gpr_timespec timespec); grpc_millis grpc_timespec_to_millis_round_up(gpr_timespec timespec); +inline grpc_exec_ctx make_exec_ctx(grpc_exec_ctx r) { + grpc_exec_ctx_flush(); + return r; +} + +class ExecCtx { + public: + ExecCtx(); + ExecCtx(uintptr_t fl, bool (*finish_check)(void *arg), + void *finish_check_arg); + ~ExecCtx(); + + grpc_closure_list closure_list; + /** currently active combiner: updated only via combiner.c */ + grpc_combiner *active_combiner; + /** last active combiner in the active combiner list */ + grpc_combiner *last_combiner; + uintptr_t flags; + unsigned starting_cpu; + void *check_ready_to_finish_arg; + bool (*check_ready_to_finish)(void *arg); + + bool now_is_valid; + grpc_millis now; + + private: + ExecCtx *last_exec_ctx; +}; + +extern thread_local ExecCtx *exec_ctx; + +/* initializer for grpc_exec_ctx: + * prefer to use GRPC_EXEC_CTX_INIT whenever possible */ +#define GRPC_EXEC_CTX_INITIALIZER(flags, finish_check, finish_check_arg) \ + make_exec_ctx(grpc_exec_ctx{GRPC_CLOSURE_LIST_INIT, NULL, NULL, flags, \ + gpr_cpu_current_cpu(), finish_check_arg, \ + finish_check, false, 0, __PRETTY_FUNCTION__}) + +/* initialize an execution context at the top level of an API call into grpc + (this is safe to use elsewhere, though possibly not as efficient) */ +#define GRPC_EXEC_CTX_INIT \ + GRPC_EXEC_CTX_INITIALIZER(GRPC_EXEC_CTX_FLAG_IS_FINISHED, NULL, NULL) + #ifdef __cplusplus } #endif diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index 92c3e70301c..653f2fc24b6 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -56,7 +56,7 @@ static grpc_tracer_flag executor_trace = static void executor_thread(void *arg); -static size_t run_closures(grpc_exec_ctx *exec_ctx, grpc_closure_list list) { +static size_t run_closures(grpc_closure_list list) { size_t n = 0; grpc_closure *c = list.head; @@ -74,11 +74,11 @@ static size_t run_closures(grpc_exec_ctx *exec_ctx, grpc_closure_list list) { #ifndef NDEBUG c->scheduled = false; #endif - c->cb(exec_ctx, c->cb_arg, error); + c->cb(c->cb_arg, error); GRPC_ERROR_UNREF(error); c = next; n++; - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); } return n; @@ -88,7 +88,7 @@ bool grpc_executor_is_threaded() { return gpr_atm_no_barrier_load(&g_cur_threads) > 0; } -void grpc_executor_set_threading(grpc_exec_ctx *exec_ctx, bool threading) { +void grpc_executor_set_threading(bool threading) { gpr_atm cur_threads = gpr_atm_no_barrier_load(&g_cur_threads); if (threading) { if (cur_threads > 0) return; @@ -126,29 +126,26 @@ void grpc_executor_set_threading(grpc_exec_ctx *exec_ctx, bool threading) { for (size_t i = 0; i < g_max_threads; i++) { gpr_mu_destroy(&g_thread_state[i].mu); gpr_cv_destroy(&g_thread_state[i].cv); - run_closures(exec_ctx, g_thread_state[i].elems); + run_closures(g_thread_state[i].elems); } gpr_free(g_thread_state); gpr_tls_destroy(&g_this_thread_state); } } -void grpc_executor_init(grpc_exec_ctx *exec_ctx) { +void grpc_executor_init() { grpc_register_tracer(&executor_trace); gpr_atm_no_barrier_store(&g_cur_threads, 0); - grpc_executor_set_threading(exec_ctx, true); + grpc_executor_set_threading(true); } -void grpc_executor_shutdown(grpc_exec_ctx *exec_ctx) { - grpc_executor_set_threading(exec_ctx, false); -} +void grpc_executor_shutdown() { grpc_executor_set_threading(false); } static void executor_thread(void *arg) { thread_state *ts = (thread_state *)arg; gpr_tls_set(&g_this_thread_state, (intptr_t)ts); - grpc_exec_ctx exec_ctx = - GRPC_EXEC_CTX_INITIALIZER(0, grpc_never_ready_to_finish, NULL); + ExecCtx _local_exec_ctx(0, grpc_never_ready_to_finish, NULL); size_t subtract_depth = 0; for (;;) { @@ -170,7 +167,7 @@ static void executor_thread(void *arg) { gpr_mu_unlock(&ts->mu); break; } - GRPC_STATS_INC_EXECUTOR_QUEUE_DRAINED(&exec_ctx); + GRPC_STATS_INC_EXECUTOR_QUEUE_DRAINED(); grpc_closure_list exec = ts->elems; ts->elems = GRPC_CLOSURE_LIST_INIT; gpr_mu_unlock(&ts->mu); @@ -178,19 +175,19 @@ static void executor_thread(void *arg) { gpr_log(GPR_DEBUG, "EXECUTOR[%d]: execute", (int)(ts - g_thread_state)); } - grpc_exec_ctx_invalidate_now(&exec_ctx); - subtract_depth = run_closures(&exec_ctx, exec); + grpc_exec_ctx_invalidate_now(); + subtract_depth = run_closures(exec); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } -static void executor_push(grpc_exec_ctx *exec_ctx, grpc_closure *closure, - grpc_error *error, bool is_short) { +static void executor_push(grpc_closure *closure, grpc_error *error, + bool is_short) { bool retry_push; if (is_short) { - GRPC_STATS_INC_EXECUTOR_SCHEDULED_SHORT_ITEMS(exec_ctx); + GRPC_STATS_INC_EXECUTOR_SCHEDULED_SHORT_ITEMS(); } else { - GRPC_STATS_INC_EXECUTOR_SCHEDULED_LONG_ITEMS(exec_ctx); + GRPC_STATS_INC_EXECUTOR_SCHEDULED_LONG_ITEMS(); } do { retry_push = false; @@ -209,9 +206,9 @@ static void executor_push(grpc_exec_ctx *exec_ctx, grpc_closure *closure, } thread_state *ts = (thread_state *)gpr_tls_get(&g_this_thread_state); if (ts == NULL) { - ts = &g_thread_state[GPR_HASH_POINTER(exec_ctx, cur_thread_count)]; + ts = &g_thread_state[GPR_HASH_POINTER(&exec_ctx, cur_thread_count)]; } else { - GRPC_STATS_INC_EXECUTOR_SCHEDULED_TO_SELF(exec_ctx); + GRPC_STATS_INC_EXECUTOR_SCHEDULED_TO_SELF(); } thread_state *orig_ts = ts; @@ -247,7 +244,7 @@ static void executor_push(grpc_exec_ctx *exec_ctx, grpc_closure *closure, continue; } if (grpc_closure_list_empty(ts->elems)) { - GRPC_STATS_INC_EXECUTOR_WAKEUP_INITIATED(exec_ctx); + GRPC_STATS_INC_EXECUTOR_WAKEUP_INITIATED(); gpr_cv_signal(&ts->cv); } grpc_closure_list_append(&ts->elems, closure, error); @@ -271,19 +268,17 @@ static void executor_push(grpc_exec_ctx *exec_ctx, grpc_closure *closure, gpr_spinlock_unlock(&g_adding_thread_lock); } if (retry_push) { - GRPC_STATS_INC_EXECUTOR_PUSH_RETRIES(exec_ctx); + GRPC_STATS_INC_EXECUTOR_PUSH_RETRIES(); } } while (retry_push); } -static void executor_push_short(grpc_exec_ctx *exec_ctx, grpc_closure *closure, - grpc_error *error) { - executor_push(exec_ctx, closure, error, true); +static void executor_push_short(grpc_closure *closure, grpc_error *error) { + executor_push(closure, error, true); } -static void executor_push_long(grpc_exec_ctx *exec_ctx, grpc_closure *closure, - grpc_error *error) { - executor_push(exec_ctx, closure, error, false); +static void executor_push_long(grpc_closure *closure, grpc_error *error) { + executor_push(closure, error, false); } static const grpc_closure_scheduler_vtable executor_vtable_short = { diff --git a/src/core/lib/iomgr/executor.h b/src/core/lib/iomgr/executor.h index ef5ac56c832..d75ba20d5a4 100644 --- a/src/core/lib/iomgr/executor.h +++ b/src/core/lib/iomgr/executor.h @@ -35,19 +35,19 @@ typedef enum { * This mechanism is meant to outsource work (grpc_closure instances) to a * thread, for those cases where blocking isn't an option but there isn't a * non-blocking solution available. */ -void grpc_executor_init(grpc_exec_ctx *exec_ctx); +void grpc_executor_init(); grpc_closure_scheduler *grpc_executor_scheduler(grpc_executor_job_length); /** Shutdown the executor, running all pending work as part of the call */ -void grpc_executor_shutdown(grpc_exec_ctx *exec_ctx); +void grpc_executor_shutdown(); /** Is the executor multi-threaded? */ bool grpc_executor_is_threaded(); /* enable/disable threading - must be called after grpc_executor_init and before grpc_executor_shutdown */ -void grpc_executor_set_threading(grpc_exec_ctx *exec_ctx, bool enable); +void grpc_executor_set_threading(bool enable); #ifdef __cplusplus } diff --git a/src/core/lib/iomgr/iocp_windows.cc b/src/core/lib/iomgr/iocp_windows.cc index 78185cc084e..885a78bdfa0 100644 --- a/src/core/lib/iomgr/iocp_windows.cc +++ b/src/core/lib/iomgr/iocp_windows.cc @@ -42,20 +42,18 @@ static gpr_atm g_custom_events = 0; static HANDLE g_iocp; -static DWORD deadline_to_millis_timeout(grpc_exec_ctx *exec_ctx, - grpc_millis deadline) { +static DWORD deadline_to_millis_timeout(grpc_millis deadline) { if (deadline == GRPC_MILLIS_INF_FUTURE) { return INFINITE; } - grpc_millis now = grpc_exec_ctx_now(exec_ctx); + grpc_millis now = grpc_exec_ctx_now(); if (deadline < now) return 0; grpc_millis timeout = deadline - now; if (timeout > std::numeric_limits::max()) return INFINITE; return static_cast(deadline - now); } -grpc_iocp_work_status grpc_iocp_work(grpc_exec_ctx *exec_ctx, - grpc_millis deadline) { +grpc_iocp_work_status grpc_iocp_work(grpc_millis deadline) { BOOL success; DWORD bytes = 0; DWORD flags = 0; @@ -63,11 +61,11 @@ grpc_iocp_work_status grpc_iocp_work(grpc_exec_ctx *exec_ctx, LPOVERLAPPED overlapped; grpc_winsocket *socket; grpc_winsocket_callback_info *info; - GRPC_STATS_INC_SYSCALL_POLL(exec_ctx); + GRPC_STATS_INC_SYSCALL_POLL(); success = GetQueuedCompletionStatus(g_iocp, &bytes, &completion_key, &overlapped, - deadline_to_millis_timeout(exec_ctx, deadline)); - grpc_exec_ctx_invalidate_now(exec_ctx); + deadline_to_millis_timeout(deadline)); + grpc_exec_ctx_invalidate_now(); if (success == 0 && overlapped == NULL) { return GRPC_IOCP_WORK_TIMEOUT; } @@ -95,7 +93,7 @@ grpc_iocp_work_status grpc_iocp_work(grpc_exec_ctx *exec_ctx, info->bytes_transfered = bytes; info->wsa_error = success ? 0 : WSAGetLastError(); GPR_ASSERT(overlapped == &info->overlapped); - grpc_socket_become_ready(exec_ctx, socket, info); + grpc_socket_become_ready(socket, info); return GRPC_IOCP_WORK_WORK; } @@ -115,22 +113,21 @@ void grpc_iocp_kick(void) { } void grpc_iocp_flush(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_iocp_work_status work_status; do { - work_status = grpc_iocp_work(&exec_ctx, GRPC_MILLIS_INF_PAST); - } while (work_status == GRPC_IOCP_WORK_KICK || - grpc_exec_ctx_flush(&exec_ctx)); + work_status = grpc_iocp_work(GRPC_MILLIS_INF_PAST); + } while (work_status == GRPC_IOCP_WORK_KICK || grpc_exec_ctx_flush()); } void grpc_iocp_shutdown(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (gpr_atm_acq_load(&g_custom_events)) { - grpc_iocp_work(&exec_ctx, GRPC_MILLIS_INF_FUTURE); - grpc_exec_ctx_flush(&exec_ctx); + grpc_iocp_work(GRPC_MILLIS_INF_FUTURE); + grpc_exec_ctx_flush(); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); GPR_ASSERT(CloseHandle(g_iocp)); } diff --git a/src/core/lib/iomgr/iocp_windows.h b/src/core/lib/iomgr/iocp_windows.h index 4efbc94645a..f6e2b776d18 100644 --- a/src/core/lib/iomgr/iocp_windows.h +++ b/src/core/lib/iomgr/iocp_windows.h @@ -33,8 +33,7 @@ typedef enum { GRPC_IOCP_WORK_KICK } grpc_iocp_work_status; -grpc_iocp_work_status grpc_iocp_work(grpc_exec_ctx *exec_ctx, - grpc_millis deadline); +grpc_iocp_work_status grpc_iocp_work(grpc_millis deadline); void grpc_iocp_init(void); void grpc_iocp_kick(void); void grpc_iocp_flush(void); diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index d6a5b4a76c7..236679c361b 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -45,20 +45,20 @@ static gpr_cv g_rcv; static int g_shutdown; static grpc_iomgr_object g_root_object; -void grpc_iomgr_init(grpc_exec_ctx *exec_ctx) { +void grpc_iomgr_init() { g_shutdown = 0; gpr_mu_init(&g_mu); gpr_cv_init(&g_rcv); grpc_exec_ctx_global_init(); - grpc_executor_init(exec_ctx); - grpc_timer_list_init(exec_ctx); + grpc_executor_init(); + grpc_timer_list_init(); g_root_object.next = g_root_object.prev = &g_root_object; g_root_object.name = (char *)"root"; grpc_network_status_init(); grpc_iomgr_platform_init(); } -void grpc_iomgr_start(grpc_exec_ctx *exec_ctx) { grpc_timer_manager_init(); } +void grpc_iomgr_start() { grpc_timer_manager_init(); } static size_t count_objects(void) { grpc_iomgr_object *obj; @@ -76,14 +76,14 @@ static void dump_objects(const char *kind) { } } -void grpc_iomgr_shutdown(grpc_exec_ctx *exec_ctx) { +void grpc_iomgr_shutdown() { gpr_timespec shutdown_deadline = gpr_time_add( gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_seconds(10, GPR_TIMESPAN)); gpr_timespec last_warning_time = gpr_now(GPR_CLOCK_REALTIME); grpc_timer_manager_shutdown(); grpc_iomgr_platform_flush(); - grpc_executor_shutdown(exec_ctx); + grpc_executor_shutdown(); gpr_mu_lock(&g_mu); g_shutdown = 1; @@ -100,9 +100,9 @@ void grpc_iomgr_shutdown(grpc_exec_ctx *exec_ctx) { } exec_ctx->now_is_valid = true; exec_ctx->now = GRPC_MILLIS_INF_FUTURE; - if (grpc_timer_check(exec_ctx, NULL) == GRPC_TIMERS_FIRED) { + if (grpc_timer_check(NULL) == GRPC_TIMERS_FIRED) { gpr_mu_unlock(&g_mu); - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); grpc_iomgr_platform_flush(); gpr_mu_lock(&g_mu); continue; @@ -134,8 +134,8 @@ void grpc_iomgr_shutdown(grpc_exec_ctx *exec_ctx) { } gpr_mu_unlock(&g_mu); - grpc_timer_list_shutdown(exec_ctx); - grpc_exec_ctx_flush(exec_ctx); + grpc_timer_list_shutdown(); + grpc_exec_ctx_flush(); /* ensure all threads have left g_mu */ gpr_mu_lock(&g_mu); diff --git a/src/core/lib/iomgr/iomgr.h b/src/core/lib/iomgr/iomgr.h index 6c0a08b9183..ce9f60521c5 100644 --- a/src/core/lib/iomgr/iomgr.h +++ b/src/core/lib/iomgr/iomgr.h @@ -27,14 +27,14 @@ extern "C" { #endif /** Initializes the iomgr. */ -void grpc_iomgr_init(grpc_exec_ctx *exec_ctx); +void grpc_iomgr_init(); /** Starts any background threads for iomgr. */ -void grpc_iomgr_start(grpc_exec_ctx *exec_ctx); +void grpc_iomgr_start(); /** Signals the intention to shutdown the iomgr. Expects to be able to flush * exec_ctx. */ -void grpc_iomgr_shutdown(grpc_exec_ctx *exec_ctx); +void grpc_iomgr_shutdown(); #ifdef __cplusplus } diff --git a/src/core/lib/iomgr/iomgr_uv.cc b/src/core/lib/iomgr/iomgr_uv.cc index df5d23af3bb..4dda970286e 100644 --- a/src/core/lib/iomgr/iomgr_uv.cc +++ b/src/core/lib/iomgr/iomgr_uv.cc @@ -29,12 +29,12 @@ gpr_thd_id g_init_thread; void grpc_iomgr_platform_init(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_pollset_global_init(); grpc_register_tracer(&grpc_tcp_trace); - grpc_executor_set_threading(&exec_ctx, false); + grpc_executor_set_threading(false); g_init_thread = gpr_thd_currentid(); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } void grpc_iomgr_platform_flush(void) {} void grpc_iomgr_platform_shutdown(void) { grpc_pollset_global_shutdown(); } diff --git a/src/core/lib/iomgr/lockfree_event.cc b/src/core/lib/iomgr/lockfree_event.cc index f967b22ba99..2fa3531bc6c 100644 --- a/src/core/lib/iomgr/lockfree_event.cc +++ b/src/core/lib/iomgr/lockfree_event.cc @@ -78,8 +78,8 @@ bool grpc_lfev_is_shutdown(gpr_atm *state) { return (curr & FD_SHUTDOWN_BIT) != 0; } -void grpc_lfev_notify_on(grpc_exec_ctx *exec_ctx, gpr_atm *state, - grpc_closure *closure, const char *variable) { +void grpc_lfev_notify_on(gpr_atm *state, grpc_closure *closure, + const char *variable) { while (true) { gpr_atm curr = gpr_atm_no_barrier_load(state); if (GRPC_TRACER_ON(grpc_polling_trace)) { @@ -112,7 +112,7 @@ void grpc_lfev_notify_on(grpc_exec_ctx *exec_ctx, gpr_atm *state, closure when transitioning out of CLOSURE_NO_READY state (i.e there is no other code that needs to 'happen-after' this) */ if (gpr_atm_no_barrier_cas(state, CLOSURE_READY, CLOSURE_NOT_READY)) { - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); return; /* Successful. Return */ } @@ -125,7 +125,7 @@ void grpc_lfev_notify_on(grpc_exec_ctx *exec_ctx, gpr_atm *state, schedule the closure with the shutdown error */ if ((curr & FD_SHUTDOWN_BIT) > 0) { grpc_error *shutdown_err = (grpc_error *)(curr & ~FD_SHUTDOWN_BIT); - GRPC_CLOSURE_SCHED(exec_ctx, closure, + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "FD Shutdown", &shutdown_err, 1)); return; @@ -142,8 +142,7 @@ void grpc_lfev_notify_on(grpc_exec_ctx *exec_ctx, gpr_atm *state, GPR_UNREACHABLE_CODE(return ); } -bool grpc_lfev_set_shutdown(grpc_exec_ctx *exec_ctx, gpr_atm *state, - grpc_error *shutdown_err) { +bool grpc_lfev_set_shutdown(gpr_atm *state, grpc_error *shutdown_err) { gpr_atm new_state = (gpr_atm)shutdown_err | FD_SHUTDOWN_BIT; while (true) { @@ -177,7 +176,7 @@ bool grpc_lfev_set_shutdown(grpc_exec_ctx *exec_ctx, gpr_atm *state, happens-after on that edge), and a release to pair with anything loading the shutdown state. */ if (gpr_atm_full_cas(state, curr, new_state)) { - GRPC_CLOSURE_SCHED(exec_ctx, (grpc_closure *)curr, + GRPC_CLOSURE_SCHED((grpc_closure *)curr, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "FD Shutdown", &shutdown_err, 1)); return true; @@ -193,8 +192,7 @@ bool grpc_lfev_set_shutdown(grpc_exec_ctx *exec_ctx, gpr_atm *state, GPR_UNREACHABLE_CODE(return false); } -void grpc_lfev_set_ready(grpc_exec_ctx *exec_ctx, gpr_atm *state, - const char *variable) { +void grpc_lfev_set_ready(gpr_atm *state, const char *variable) { while (true) { gpr_atm curr = gpr_atm_no_barrier_load(state); @@ -228,7 +226,7 @@ void grpc_lfev_set_ready(grpc_exec_ctx *exec_ctx, gpr_atm *state, spurious set_ready; release pairs with this or the acquire in notify_on (or set_shutdown) */ else if (gpr_atm_full_cas(state, curr, CLOSURE_NOT_READY)) { - GRPC_CLOSURE_SCHED(exec_ctx, (grpc_closure *)curr, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED((grpc_closure *)curr, GRPC_ERROR_NONE); return; } /* else the state changed again (only possible by either a racing diff --git a/src/core/lib/iomgr/lockfree_event.h b/src/core/lib/iomgr/lockfree_event.h index 02229e569ef..cf681fc874d 100644 --- a/src/core/lib/iomgr/lockfree_event.h +++ b/src/core/lib/iomgr/lockfree_event.h @@ -33,13 +33,11 @@ void grpc_lfev_init(gpr_atm *state); void grpc_lfev_destroy(gpr_atm *state); bool grpc_lfev_is_shutdown(gpr_atm *state); -void grpc_lfev_notify_on(grpc_exec_ctx *exec_ctx, gpr_atm *state, - grpc_closure *closure, const char *variable); -/* Returns true on first successful shutdown */ -bool grpc_lfev_set_shutdown(grpc_exec_ctx *exec_ctx, gpr_atm *state, - grpc_error *shutdown_err); -void grpc_lfev_set_ready(grpc_exec_ctx *exec_ctx, gpr_atm *state, +void grpc_lfev_notify_on(gpr_atm *state, grpc_closure *closure, const char *variable); +/* Returns true on first successful shutdown */ +bool grpc_lfev_set_shutdown(gpr_atm *state, grpc_error *shutdown_err); +void grpc_lfev_set_ready(gpr_atm *state, const char *variable); #ifdef __cplusplus } diff --git a/src/core/lib/iomgr/polling_entity.cc b/src/core/lib/iomgr/polling_entity.cc index 8591a5518e3..06b78e823d8 100644 --- a/src/core/lib/iomgr/polling_entity.cc +++ b/src/core/lib/iomgr/polling_entity.cc @@ -56,32 +56,28 @@ bool grpc_polling_entity_is_empty(const grpc_polling_entity *pollent) { return pollent->tag == GRPC_POLLS_NONE; } -void grpc_polling_entity_add_to_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_polling_entity *pollent, +void grpc_polling_entity_add_to_pollset_set(grpc_polling_entity *pollent, grpc_pollset_set *pss_dst) { if (pollent->tag == GRPC_POLLS_POLLSET) { GPR_ASSERT(pollent->pollent.pollset != NULL); - grpc_pollset_set_add_pollset(exec_ctx, pss_dst, pollent->pollent.pollset); + grpc_pollset_set_add_pollset(pss_dst, pollent->pollent.pollset); } else if (pollent->tag == GRPC_POLLS_POLLSET_SET) { GPR_ASSERT(pollent->pollent.pollset_set != NULL); - grpc_pollset_set_add_pollset_set(exec_ctx, pss_dst, - pollent->pollent.pollset_set); + grpc_pollset_set_add_pollset_set(pss_dst, pollent->pollent.pollset_set); } else { gpr_log(GPR_ERROR, "Invalid grpc_polling_entity tag '%d'", pollent->tag); abort(); } } -void grpc_polling_entity_del_from_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_polling_entity *pollent, +void grpc_polling_entity_del_from_pollset_set(grpc_polling_entity *pollent, grpc_pollset_set *pss_dst) { if (pollent->tag == GRPC_POLLS_POLLSET) { GPR_ASSERT(pollent->pollent.pollset != NULL); - grpc_pollset_set_del_pollset(exec_ctx, pss_dst, pollent->pollent.pollset); + grpc_pollset_set_del_pollset(pss_dst, pollent->pollent.pollset); } else if (pollent->tag == GRPC_POLLS_POLLSET_SET) { GPR_ASSERT(pollent->pollent.pollset_set != NULL); - grpc_pollset_set_del_pollset_set(exec_ctx, pss_dst, - pollent->pollent.pollset_set); + grpc_pollset_set_del_pollset_set(pss_dst, pollent->pollent.pollset_set); } else { gpr_log(GPR_ERROR, "Invalid grpc_polling_entity tag '%d'", pollent->tag); abort(); diff --git a/src/core/lib/iomgr/polling_entity.h b/src/core/lib/iomgr/polling_entity.h index 009f968fac4..e1e4c47c837 100644 --- a/src/core/lib/iomgr/polling_entity.h +++ b/src/core/lib/iomgr/polling_entity.h @@ -59,14 +59,12 @@ bool grpc_polling_entity_is_empty(const grpc_polling_entity *pollent); /** Add the pollset or pollset_set in \a pollent to the destination pollset_set * \a * pss_dst */ -void grpc_polling_entity_add_to_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_polling_entity *pollent, +void grpc_polling_entity_add_to_pollset_set(grpc_polling_entity *pollent, grpc_pollset_set *pss_dst); /** Delete the pollset or pollset_set in \a pollent from the destination * pollset_set \a * pss_dst */ -void grpc_polling_entity_del_from_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_polling_entity *pollent, +void grpc_polling_entity_del_from_pollset_set(grpc_polling_entity *pollent, grpc_pollset_set *pss_dst); #ifdef __cplusplus } diff --git a/src/core/lib/iomgr/pollset.h b/src/core/lib/iomgr/pollset.h index 799fae154cf..1f5b6c12f11 100644 --- a/src/core/lib/iomgr/pollset.h +++ b/src/core/lib/iomgr/pollset.h @@ -48,9 +48,8 @@ size_t grpc_pollset_size(void); void grpc_pollset_init(grpc_pollset *pollset, gpr_mu **mu); /* Begin shutting down the pollset, and call closure when done. * pollset's mutex must be held */ -void grpc_pollset_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_closure *closure); -void grpc_pollset_destroy(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset); +void grpc_pollset_shutdown(grpc_pollset *pollset, grpc_closure *closure); +void grpc_pollset_destroy(grpc_pollset *pollset); /* Do some work on a pollset. May involve invoking asynchronous callbacks, or actually polling file @@ -74,13 +73,13 @@ void grpc_pollset_destroy(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset); May call grpc_closure_list_run on grpc_closure_list, without holding the pollset lock */ -grpc_error *grpc_pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, +grpc_error *grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker **worker, grpc_millis deadline) GRPC_MUST_USE_RESULT; /* Break one polling thread out of polling work for this pollset. If specific_worker is non-NULL, then kick that worker. */ -grpc_error *grpc_pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, +grpc_error *grpc_pollset_kick(grpc_pollset *pollset, grpc_pollset_worker *specific_worker) GRPC_MUST_USE_RESULT; diff --git a/src/core/lib/iomgr/pollset_set.h b/src/core/lib/iomgr/pollset_set.h index 5455eda02fd..a30069e6c84 100644 --- a/src/core/lib/iomgr/pollset_set.h +++ b/src/core/lib/iomgr/pollset_set.h @@ -33,19 +33,14 @@ extern "C" { typedef struct grpc_pollset_set grpc_pollset_set; grpc_pollset_set *grpc_pollset_set_create(void); -void grpc_pollset_set_destroy(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set); -void grpc_pollset_set_add_pollset(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set, +void grpc_pollset_set_destroy(grpc_pollset_set *pollset_set); +void grpc_pollset_set_add_pollset(grpc_pollset_set *pollset_set, grpc_pollset *pollset); -void grpc_pollset_set_del_pollset(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *pollset_set, +void grpc_pollset_set_del_pollset(grpc_pollset_set *pollset_set, grpc_pollset *pollset); -void grpc_pollset_set_add_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *bag, +void grpc_pollset_set_add_pollset_set(grpc_pollset_set *bag, grpc_pollset_set *item); -void grpc_pollset_set_del_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_pollset_set *bag, +void grpc_pollset_set_del_pollset_set(grpc_pollset_set *bag, grpc_pollset_set *item); #ifdef __cplusplus diff --git a/src/core/lib/iomgr/pollset_set_uv.cc b/src/core/lib/iomgr/pollset_set_uv.cc index 90186edbb73..ac5dade8a50 100644 --- a/src/core/lib/iomgr/pollset_set_uv.cc +++ b/src/core/lib/iomgr/pollset_set_uv.cc @@ -26,23 +26,18 @@ grpc_pollset_set* grpc_pollset_set_create(void) { return (grpc_pollset_set*)((intptr_t)0xdeafbeef); } -void grpc_pollset_set_destroy(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set) {} +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, +void grpc_pollset_set_add_pollset(grpc_pollset_set* pollset_set, grpc_pollset* pollset) {} -void grpc_pollset_set_del_pollset(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, +void grpc_pollset_set_del_pollset(grpc_pollset_set* pollset_set, grpc_pollset* pollset) {} -void grpc_pollset_set_add_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, +void grpc_pollset_set_add_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item) {} -void grpc_pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, +void grpc_pollset_set_del_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item) {} #endif /* GRPC_UV */ diff --git a/src/core/lib/iomgr/pollset_set_windows.cc b/src/core/lib/iomgr/pollset_set_windows.cc index 2105a47ad47..85edc9dee12 100644 --- a/src/core/lib/iomgr/pollset_set_windows.cc +++ b/src/core/lib/iomgr/pollset_set_windows.cc @@ -27,23 +27,18 @@ grpc_pollset_set* grpc_pollset_set_create(void) { return (grpc_pollset_set*)((intptr_t)0xdeafbeef); } -void grpc_pollset_set_destroy(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set) {} +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, +void grpc_pollset_set_add_pollset(grpc_pollset_set* pollset_set, grpc_pollset* pollset) {} -void grpc_pollset_set_del_pollset(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, +void grpc_pollset_set_del_pollset(grpc_pollset_set* pollset_set, grpc_pollset* pollset) {} -void grpc_pollset_set_add_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, +void grpc_pollset_set_add_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item) {} -void grpc_pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, +void grpc_pollset_set_del_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item) {} #endif /* GRPC_WINSOCK_SOCKET */ diff --git a/src/core/lib/iomgr/pollset_uv.cc b/src/core/lib/iomgr/pollset_uv.cc index b9901bf8efd..53585a80dc1 100644 --- a/src/core/lib/iomgr/pollset_uv.cc +++ b/src/core/lib/iomgr/pollset_uv.cc @@ -87,8 +87,7 @@ void grpc_pollset_init(grpc_pollset *pollset, gpr_mu **mu) { pollset->shutting_down = 0; } -void grpc_pollset_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_closure *closure) { +void grpc_pollset_shutdown(grpc_pollset *pollset, grpc_closure *closure) { GPR_ASSERT(!pollset->shutting_down); GRPC_UV_ASSERT_SAME_THREAD(); pollset->shutting_down = 1; @@ -99,10 +98,10 @@ void grpc_pollset_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, // kick the loop once uv_timer_start(dummy_uv_handle, dummy_timer_cb, 0, 0); } - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); } -void grpc_pollset_destroy(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset) { +void grpc_pollset_destroy(grpc_pollset *pollset) { GRPC_UV_ASSERT_SAME_THREAD(); uv_close((uv_handle_t *)&pollset->timer, timer_close_cb); // timer.data is a boolean indicating that the timer has finished closing @@ -114,14 +113,14 @@ void grpc_pollset_destroy(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset) { } } -grpc_error *grpc_pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, +grpc_error *grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker **worker_hdl, grpc_millis deadline) { uint64_t timeout; GRPC_UV_ASSERT_SAME_THREAD(); gpr_mu_unlock(&grpc_polling_mu); if (grpc_pollset_work_run_loop) { - grpc_millis now = grpc_exec_ctx_now(exec_ctx); + grpc_millis now = grpc_exec_ctx_now(); if (deadline >= now) { timeout = deadline - now; } else { @@ -140,13 +139,13 @@ grpc_error *grpc_pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, } } if (!grpc_closure_list_empty(exec_ctx->closure_list)) { - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); } gpr_mu_lock(&grpc_polling_mu); return GRPC_ERROR_NONE; } -grpc_error *grpc_pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, +grpc_error *grpc_pollset_kick(grpc_pollset *pollset, grpc_pollset_worker *specific_worker) { GRPC_UV_ASSERT_SAME_THREAD(); uv_timer_start(dummy_uv_handle, dummy_timer_cb, 0, 0); diff --git a/src/core/lib/iomgr/pollset_windows.cc b/src/core/lib/iomgr/pollset_windows.cc index bb4df83fc13..e1fdf9dc6b6 100644 --- a/src/core/lib/iomgr/pollset_windows.cc +++ b/src/core/lib/iomgr/pollset_windows.cc @@ -95,20 +95,19 @@ void grpc_pollset_init(grpc_pollset *pollset, gpr_mu **mu) { &pollset->root_worker; } -void grpc_pollset_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_closure *closure) { +void grpc_pollset_shutdown(grpc_pollset *pollset, grpc_closure *closure) { pollset->shutting_down = 1; - grpc_pollset_kick(exec_ctx, pollset, GRPC_POLLSET_KICK_BROADCAST); + grpc_pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); if (!pollset->is_iocp_worker) { - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); } else { pollset->on_shutdown = closure; } } -void grpc_pollset_destroy(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset) {} +void grpc_pollset_destroy(grpc_pollset *pollset) {} -grpc_error *grpc_pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, +grpc_error *grpc_pollset_work(grpc_pollset *pollset, grpc_pollset_worker **worker_hdl, grpc_millis deadline) { grpc_pollset_worker worker; @@ -129,8 +128,8 @@ grpc_error *grpc_pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, pollset->is_iocp_worker = 1; g_active_poller = &worker; gpr_mu_unlock(&grpc_polling_mu); - grpc_iocp_work(exec_ctx, deadline); - grpc_exec_ctx_flush(exec_ctx); + grpc_iocp_work(deadline); + grpc_exec_ctx_flush(); gpr_mu_lock(&grpc_polling_mu); pollset->is_iocp_worker = 0; g_active_poller = NULL; @@ -148,7 +147,7 @@ grpc_error *grpc_pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, } if (pollset->shutting_down && pollset->on_shutdown != NULL) { - GRPC_CLOSURE_SCHED(exec_ctx, pollset->on_shutdown, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(pollset->on_shutdown, GRPC_ERROR_NONE); pollset->on_shutdown = NULL; } goto done; @@ -170,7 +169,7 @@ grpc_error *grpc_pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, done: if (!grpc_closure_list_empty(exec_ctx->closure_list)) { gpr_mu_unlock(&grpc_polling_mu); - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(&grpc_polling_mu); } if (added_worker) { @@ -182,7 +181,7 @@ done: return GRPC_ERROR_NONE; } -grpc_error *grpc_pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *p, +grpc_error *grpc_pollset_kick(grpc_pollset *p, grpc_pollset_worker *specific_worker) { if (specific_worker != NULL) { if (specific_worker == GRPC_POLLSET_KICK_BROADCAST) { @@ -210,7 +209,7 @@ grpc_error *grpc_pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *p, specific_worker = pop_front_worker(&p->root_worker, GRPC_POLLSET_WORKER_LINK_POLLSET); if (specific_worker != NULL) { - grpc_pollset_kick(exec_ctx, p, specific_worker); + grpc_pollset_kick(p, specific_worker); } else if (p->is_iocp_worker) { grpc_iocp_kick(); } else { diff --git a/src/core/lib/iomgr/resolve_address.h b/src/core/lib/iomgr/resolve_address.h index 5f0634299e0..ac91ac3a7b3 100644 --- a/src/core/lib/iomgr/resolve_address.h +++ b/src/core/lib/iomgr/resolve_address.h @@ -42,8 +42,7 @@ typedef struct { /* Asynchronously resolve addr. Use default_port if a port isn't designated in addr, otherwise use the port in addr. */ /* TODO(ctiller): add a timeout here */ -extern void (*grpc_resolve_address)(grpc_exec_ctx *exec_ctx, const char *addr, - const char *default_port, +extern void (*grpc_resolve_address)(const char *addr, const char *default_port, grpc_pollset_set *interested_parties, grpc_closure *on_done, grpc_resolved_addresses **addresses); diff --git a/src/core/lib/iomgr/resolve_address_posix.cc b/src/core/lib/iomgr/resolve_address_posix.cc index 1b783495dfc..2fa09134039 100644 --- a/src/core/lib/iomgr/resolve_address_posix.cc +++ b/src/core/lib/iomgr/resolve_address_posix.cc @@ -152,12 +152,10 @@ typedef struct { /* Callback to be passed to grpc_executor to asynch-ify * grpc_blocking_resolve_address */ -static void do_request_thread(grpc_exec_ctx *exec_ctx, void *rp, - grpc_error *error) { +static void do_request_thread(void *rp, grpc_error *error) { request *r = (request *)rp; - GRPC_CLOSURE_SCHED( - exec_ctx, r->on_done, - grpc_blocking_resolve_address(r->name, r->default_port, r->addrs_out)); + GRPC_CLOSURE_SCHED(r->on_done, grpc_blocking_resolve_address( + r->name, r->default_port, r->addrs_out)); gpr_free(r->name); gpr_free(r->default_port); gpr_free(r); @@ -170,8 +168,7 @@ void grpc_resolved_addresses_destroy(grpc_resolved_addresses *addrs) { gpr_free(addrs); } -static void resolve_address_impl(grpc_exec_ctx *exec_ctx, const char *name, - const char *default_port, +static void resolve_address_impl(const char *name, const char *default_port, grpc_pollset_set *interested_parties, grpc_closure *on_done, grpc_resolved_addresses **addrs) { @@ -182,11 +179,11 @@ static void resolve_address_impl(grpc_exec_ctx *exec_ctx, const char *name, r->default_port = gpr_strdup(default_port); r->on_done = on_done; r->addrs_out = addrs; - GRPC_CLOSURE_SCHED(exec_ctx, &r->request_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&r->request_closure, GRPC_ERROR_NONE); } void (*grpc_resolve_address)( - grpc_exec_ctx *exec_ctx, const char *name, const char *default_port, + const char *name, const char *default_port, grpc_pollset_set *interested_parties, grpc_closure *on_done, grpc_resolved_addresses **addrs) = resolve_address_impl; diff --git a/src/core/lib/iomgr/resolve_address_uv.cc b/src/core/lib/iomgr/resolve_address_uv.cc index 4f7f234877d..82ea27d22e1 100644 --- a/src/core/lib/iomgr/resolve_address_uv.cc +++ b/src/core/lib/iomgr/resolve_address_uv.cc @@ -114,7 +114,7 @@ static grpc_error *handle_addrinfo_result(int status, struct addrinfo *result, 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; + ExecCtx _local_exec_ctx; grpc_error *error; int retry_status; char *port = r->port; @@ -130,8 +130,8 @@ static void getaddrinfo_callback(uv_getaddrinfo_t *req, int status, /* Either no retry was attempted, or the retry failed. Either way, the original error probably has more interesting information */ error = handle_addrinfo_result(status, res, r->addresses); - GRPC_CLOSURE_SCHED(&exec_ctx, r->on_done, error); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_CLOSURE_SCHED(r->on_done, error); + grpc_exec_ctx_finish(); gpr_free(r->hints); gpr_free(r->host); gpr_free(r->port); @@ -224,8 +224,7 @@ void grpc_resolved_addresses_destroy(grpc_resolved_addresses *addrs) { gpr_free(addrs); } -static void resolve_address_impl(grpc_exec_ctx *exec_ctx, const char *name, - const char *default_port, +static void resolve_address_impl(const char *name, const char *default_port, grpc_pollset_set *interested_parties, grpc_closure *on_done, grpc_resolved_addresses **addrs) { @@ -239,7 +238,7 @@ static void resolve_address_impl(grpc_exec_ctx *exec_ctx, const char *name, GRPC_UV_ASSERT_SAME_THREAD(); err = try_split_host_port(name, default_port, &host, &port); if (err != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(exec_ctx, on_done, err); + GRPC_CLOSURE_SCHED(on_done, err); gpr_free(host); gpr_free(port); return; @@ -268,7 +267,7 @@ static void resolve_address_impl(grpc_exec_ctx *exec_ctx, const char *name, err = GRPC_ERROR_CREATE_FROM_STATIC_STRING("getaddrinfo failed"); err = grpc_error_set_str(err, GRPC_ERROR_STR_OS_ERROR, grpc_slice_from_static_string(uv_strerror(s))); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, err); + GRPC_CLOSURE_SCHED(on_done, err); gpr_free(r); gpr_free(req); gpr_free(hints); @@ -278,7 +277,7 @@ static void resolve_address_impl(grpc_exec_ctx *exec_ctx, const char *name, } void (*grpc_resolve_address)( - grpc_exec_ctx *exec_ctx, const char *name, const char *default_port, + const char *name, const char *default_port, grpc_pollset_set *interested_parties, grpc_closure *on_done, grpc_resolved_addresses **addrs) = resolve_address_impl; diff --git a/src/core/lib/iomgr/resolve_address_windows.cc b/src/core/lib/iomgr/resolve_address_windows.cc index 451f01a701e..079ff5c9e22 100644 --- a/src/core/lib/iomgr/resolve_address_windows.cc +++ b/src/core/lib/iomgr/resolve_address_windows.cc @@ -132,8 +132,7 @@ grpc_error *(*grpc_blocking_resolve_address)( /* Callback to be passed to grpc_executor to asynch-ify * grpc_blocking_resolve_address */ -static void do_request_thread(grpc_exec_ctx *exec_ctx, void *rp, - grpc_error *error) { +static void do_request_thread(void *rp, grpc_error *error) { request *r = (request *)rp; if (error == GRPC_ERROR_NONE) { error = @@ -141,7 +140,7 @@ static void do_request_thread(grpc_exec_ctx *exec_ctx, void *rp, } else { GRPC_ERROR_REF(error); } - GRPC_CLOSURE_SCHED(exec_ctx, r->on_done, error); + GRPC_CLOSURE_SCHED(r->on_done, error); gpr_free(r->name); gpr_free(r->default_port); gpr_free(r); @@ -154,8 +153,7 @@ void grpc_resolved_addresses_destroy(grpc_resolved_addresses *addrs) { gpr_free(addrs); } -static void resolve_address_impl(grpc_exec_ctx *exec_ctx, const char *name, - const char *default_port, +static void resolve_address_impl(const char *name, const char *default_port, grpc_pollset_set *interested_parties, grpc_closure *on_done, grpc_resolved_addresses **addresses) { @@ -166,11 +164,11 @@ static void resolve_address_impl(grpc_exec_ctx *exec_ctx, const char *name, r->default_port = gpr_strdup(default_port); r->on_done = on_done; r->addresses = addresses; - GRPC_CLOSURE_SCHED(exec_ctx, &r->request_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&r->request_closure, GRPC_ERROR_NONE); } void (*grpc_resolve_address)( - grpc_exec_ctx *exec_ctx, const char *name, const char *default_port, + const char *name, const char *default_port, grpc_pollset_set *interested_parties, grpc_closure *on_done, grpc_resolved_addresses **addresses) = resolve_address_impl; diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc index ecb5747da86..0a8c9073cf7 100644 --- a/src/core/lib/iomgr/resource_quota.cc +++ b/src/core/lib/iomgr/resource_quota.cc @@ -155,8 +155,7 @@ struct grpc_resource_quota { char *name; }; -static void ru_unref_by(grpc_exec_ctx *exec_ctx, - grpc_resource_user *resource_user, gpr_atm amount); +static void ru_unref_by(grpc_resource_user *resource_user, gpr_atm amount); /******************************************************************************* * list management @@ -240,35 +239,31 @@ static void rulist_remove(grpc_resource_user *resource_user, grpc_rulist list) { * resource quota state machine */ -static bool rq_alloc(grpc_exec_ctx *exec_ctx, - grpc_resource_quota *resource_quota); +static bool rq_alloc(grpc_resource_quota *resource_quota); static bool rq_reclaim_from_per_user_free_pool( - grpc_exec_ctx *exec_ctx, grpc_resource_quota *resource_quota); -static bool rq_reclaim(grpc_exec_ctx *exec_ctx, - grpc_resource_quota *resource_quota, bool destructive); + grpc_resource_quota *resource_quota); +static bool rq_reclaim(grpc_resource_quota *resource_quota, bool destructive); -static void rq_step(grpc_exec_ctx *exec_ctx, void *rq, grpc_error *error) { +static void rq_step(void *rq, grpc_error *error) { grpc_resource_quota *resource_quota = (grpc_resource_quota *)rq; resource_quota->step_scheduled = false; do { - if (rq_alloc(exec_ctx, resource_quota)) goto done; - } while (rq_reclaim_from_per_user_free_pool(exec_ctx, resource_quota)); + if (rq_alloc(resource_quota)) goto done; + } while (rq_reclaim_from_per_user_free_pool(resource_quota)); - if (!rq_reclaim(exec_ctx, resource_quota, false)) { - rq_reclaim(exec_ctx, resource_quota, true); + if (!rq_reclaim(resource_quota, false)) { + rq_reclaim(resource_quota, true); } done: - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); } -static void rq_step_sched(grpc_exec_ctx *exec_ctx, - grpc_resource_quota *resource_quota) { +static void rq_step_sched(grpc_resource_quota *resource_quota) { if (resource_quota->step_scheduled) return; resource_quota->step_scheduled = true; grpc_resource_quota_ref_internal(resource_quota); - GRPC_CLOSURE_SCHED(exec_ctx, &resource_quota->rq_step_closure, - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&resource_quota->rq_step_closure, GRPC_ERROR_NONE); } /* update the atomically available resource estimate - use no barriers since @@ -288,8 +283,7 @@ static void rq_update_estimate(grpc_resource_quota *resource_quota) { } /* returns true if all allocations are completed */ -static bool rq_alloc(grpc_exec_ctx *exec_ctx, - grpc_resource_quota *resource_quota) { +static bool rq_alloc(grpc_resource_quota *resource_quota) { grpc_resource_user *resource_user; while ((resource_user = rulist_pop_head(resource_quota, GRPC_RULIST_AWAITING_ALLOCATION))) { @@ -308,9 +302,9 @@ static bool rq_alloc(grpc_exec_ctx *exec_ctx, int64_t aborted_allocations = resource_user->outstanding_allocations; resource_user->outstanding_allocations = 0; resource_user->free_pool += aborted_allocations; - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &resource_user->on_allocated); + GRPC_CLOSURE_LIST_SCHED(&resource_user->on_allocated); gpr_mu_unlock(&resource_user->mu); - ru_unref_by(exec_ctx, resource_user, (gpr_atm)aborted_allocations); + ru_unref_by(resource_user, (gpr_atm)aborted_allocations); continue; } if (resource_user->free_pool < 0 && @@ -333,7 +327,7 @@ static bool rq_alloc(grpc_exec_ctx *exec_ctx, if (resource_user->free_pool >= 0) { resource_user->allocating = false; resource_user->outstanding_allocations = 0; - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &resource_user->on_allocated); + GRPC_CLOSURE_LIST_SCHED(&resource_user->on_allocated); gpr_mu_unlock(&resource_user->mu); } else { rulist_add_head(resource_user, GRPC_RULIST_AWAITING_ALLOCATION); @@ -346,7 +340,7 @@ static bool rq_alloc(grpc_exec_ctx *exec_ctx, /* returns true if any memory could be reclaimed from buffers */ static bool rq_reclaim_from_per_user_free_pool( - grpc_exec_ctx *exec_ctx, grpc_resource_quota *resource_quota) { + grpc_resource_quota *resource_quota) { grpc_resource_user *resource_user; while ((resource_user = rulist_pop_head(resource_quota, GRPC_RULIST_NON_EMPTY_FREE_POOL))) { @@ -372,8 +366,7 @@ static bool rq_reclaim_from_per_user_free_pool( } /* returns true if reclamation is proceeding */ -static bool rq_reclaim(grpc_exec_ctx *exec_ctx, - grpc_resource_quota *resource_quota, bool destructive) { +static bool rq_reclaim(grpc_resource_quota *resource_quota, bool destructive) { if (resource_quota->reclaiming) return true; grpc_rulist list = destructive ? GRPC_RULIST_RECLAIMER_DESTRUCTIVE : GRPC_RULIST_RECLAIMER_BENIGN; @@ -391,7 +384,7 @@ static bool rq_reclaim(grpc_exec_ctx *exec_ctx, resource_quota->debug_only_last_reclaimer_resource_user = resource_user; resource_quota->debug_only_last_initiated_reclaimer = c; resource_user->reclaimers[destructive] = NULL; - GRPC_CLOSURE_RUN(exec_ctx, c, GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN(c, GRPC_ERROR_NONE); return true; } @@ -411,10 +404,10 @@ static void ru_slice_ref(void *p) { gpr_ref(&rc->refs); } -static void ru_slice_unref(grpc_exec_ctx *exec_ctx, void *p) { +static void ru_slice_unref(void *p) { ru_slice_refcount *rc = (ru_slice_refcount *)p; if (gpr_unref(&rc->refs)) { - grpc_resource_user_free(exec_ctx, rc->resource_user, rc->size); + grpc_resource_user_free(rc->resource_user, rc->size); gpr_free(rc); } } @@ -444,61 +437,57 @@ static grpc_slice ru_slice_create(grpc_resource_user *resource_user, * the combiner */ -static void ru_allocate(grpc_exec_ctx *exec_ctx, void *ru, grpc_error *error) { +static void ru_allocate(void *ru, grpc_error *error) { grpc_resource_user *resource_user = (grpc_resource_user *)ru; if (rulist_empty(resource_user->resource_quota, GRPC_RULIST_AWAITING_ALLOCATION)) { - rq_step_sched(exec_ctx, resource_user->resource_quota); + rq_step_sched(resource_user->resource_quota); } rulist_add_tail(resource_user, GRPC_RULIST_AWAITING_ALLOCATION); } -static void ru_add_to_free_pool(grpc_exec_ctx *exec_ctx, void *ru, - grpc_error *error) { +static void ru_add_to_free_pool(void *ru, grpc_error *error) { grpc_resource_user *resource_user = (grpc_resource_user *)ru; if (!rulist_empty(resource_user->resource_quota, GRPC_RULIST_AWAITING_ALLOCATION) && rulist_empty(resource_user->resource_quota, GRPC_RULIST_NON_EMPTY_FREE_POOL)) { - rq_step_sched(exec_ctx, resource_user->resource_quota); + rq_step_sched(resource_user->resource_quota); } rulist_add_tail(resource_user, GRPC_RULIST_NON_EMPTY_FREE_POOL); } -static bool ru_post_reclaimer(grpc_exec_ctx *exec_ctx, - grpc_resource_user *resource_user, +static bool ru_post_reclaimer(grpc_resource_user *resource_user, bool destructive) { grpc_closure *closure = resource_user->new_reclaimers[destructive]; GPR_ASSERT(closure != NULL); resource_user->new_reclaimers[destructive] = NULL; GPR_ASSERT(resource_user->reclaimers[destructive] == NULL); if (gpr_atm_acq_load(&resource_user->shutdown) > 0) { - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_CANCELLED); return false; } resource_user->reclaimers[destructive] = closure; return true; } -static void ru_post_benign_reclaimer(grpc_exec_ctx *exec_ctx, void *ru, - grpc_error *error) { +static void ru_post_benign_reclaimer(void *ru, grpc_error *error) { grpc_resource_user *resource_user = (grpc_resource_user *)ru; - if (!ru_post_reclaimer(exec_ctx, resource_user, false)) return; + if (!ru_post_reclaimer(resource_user, false)) return; if (!rulist_empty(resource_user->resource_quota, GRPC_RULIST_AWAITING_ALLOCATION) && rulist_empty(resource_user->resource_quota, GRPC_RULIST_NON_EMPTY_FREE_POOL) && rulist_empty(resource_user->resource_quota, GRPC_RULIST_RECLAIMER_BENIGN)) { - rq_step_sched(exec_ctx, resource_user->resource_quota); + rq_step_sched(resource_user->resource_quota); } rulist_add_tail(resource_user, GRPC_RULIST_RECLAIMER_BENIGN); } -static void ru_post_destructive_reclaimer(grpc_exec_ctx *exec_ctx, void *ru, - grpc_error *error) { +static void ru_post_destructive_reclaimer(void *ru, grpc_error *error) { grpc_resource_user *resource_user = (grpc_resource_user *)ru; - if (!ru_post_reclaimer(exec_ctx, resource_user, true)) return; + if (!ru_post_reclaimer(resource_user, true)) return; if (!rulist_empty(resource_user->resource_quota, GRPC_RULIST_AWAITING_ALLOCATION) && rulist_empty(resource_user->resource_quota, @@ -507,51 +496,46 @@ static void ru_post_destructive_reclaimer(grpc_exec_ctx *exec_ctx, void *ru, GRPC_RULIST_RECLAIMER_BENIGN) && rulist_empty(resource_user->resource_quota, GRPC_RULIST_RECLAIMER_DESTRUCTIVE)) { - rq_step_sched(exec_ctx, resource_user->resource_quota); + rq_step_sched(resource_user->resource_quota); } rulist_add_tail(resource_user, GRPC_RULIST_RECLAIMER_DESTRUCTIVE); } -static void ru_shutdown(grpc_exec_ctx *exec_ctx, void *ru, grpc_error *error) { +static void ru_shutdown(void *ru, grpc_error *error) { if (GRPC_TRACER_ON(grpc_resource_quota_trace)) { gpr_log(GPR_DEBUG, "RU shutdown %p", ru); } grpc_resource_user *resource_user = (grpc_resource_user *)ru; - GRPC_CLOSURE_SCHED(exec_ctx, resource_user->reclaimers[0], - GRPC_ERROR_CANCELLED); - GRPC_CLOSURE_SCHED(exec_ctx, resource_user->reclaimers[1], - GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(resource_user->reclaimers[0], GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(resource_user->reclaimers[1], GRPC_ERROR_CANCELLED); resource_user->reclaimers[0] = NULL; resource_user->reclaimers[1] = NULL; rulist_remove(resource_user, GRPC_RULIST_RECLAIMER_BENIGN); rulist_remove(resource_user, GRPC_RULIST_RECLAIMER_DESTRUCTIVE); if (resource_user->allocating) { - rq_step_sched(exec_ctx, resource_user->resource_quota); + rq_step_sched(resource_user->resource_quota); } } -static void ru_destroy(grpc_exec_ctx *exec_ctx, void *ru, grpc_error *error) { +static void ru_destroy(void *ru, grpc_error *error) { grpc_resource_user *resource_user = (grpc_resource_user *)ru; GPR_ASSERT(gpr_atm_no_barrier_load(&resource_user->refs) == 0); for (int i = 0; i < GRPC_RULIST_COUNT; i++) { rulist_remove(resource_user, (grpc_rulist)i); } - GRPC_CLOSURE_SCHED(exec_ctx, resource_user->reclaimers[0], - GRPC_ERROR_CANCELLED); - GRPC_CLOSURE_SCHED(exec_ctx, resource_user->reclaimers[1], - GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(resource_user->reclaimers[0], GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(resource_user->reclaimers[1], GRPC_ERROR_CANCELLED); if (resource_user->free_pool != 0) { resource_user->resource_quota->free_pool += resource_user->free_pool; - rq_step_sched(exec_ctx, resource_user->resource_quota); + rq_step_sched(resource_user->resource_quota); } - grpc_resource_quota_unref_internal(exec_ctx, resource_user->resource_quota); + grpc_resource_quota_unref_internal(resource_user->resource_quota); gpr_mu_destroy(&resource_user->mu); gpr_free(resource_user->name); gpr_free(resource_user); } -static void ru_allocated_slices(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void ru_allocated_slices(void *arg, grpc_error *error) { grpc_resource_user_slice_allocator *slice_allocator = (grpc_resource_user_slice_allocator *)arg; if (error == GRPC_ERROR_NONE) { @@ -561,7 +545,7 @@ static void ru_allocated_slices(grpc_exec_ctx *exec_ctx, void *arg, slice_allocator->length)); } } - GRPC_CLOSURE_RUN(exec_ctx, &slice_allocator->on_done, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(&slice_allocator->on_done, GRPC_ERROR_REF(error)); } /******************************************************************************* @@ -575,23 +559,22 @@ typedef struct { grpc_closure closure; } rq_resize_args; -static void rq_resize(grpc_exec_ctx *exec_ctx, void *args, grpc_error *error) { +static void rq_resize(void *args, grpc_error *error) { rq_resize_args *a = (rq_resize_args *)args; int64_t delta = a->size - a->resource_quota->size; a->resource_quota->size += delta; a->resource_quota->free_pool += delta; rq_update_estimate(a->resource_quota); - rq_step_sched(exec_ctx, a->resource_quota); - grpc_resource_quota_unref_internal(exec_ctx, a->resource_quota); + rq_step_sched(a->resource_quota); + grpc_resource_quota_unref_internal(a->resource_quota); gpr_free(a); } -static void rq_reclamation_done(grpc_exec_ctx *exec_ctx, void *rq, - grpc_error *error) { +static void rq_reclamation_done(void *rq, grpc_error *error) { grpc_resource_quota *resource_quota = (grpc_resource_quota *)rq; resource_quota->reclaiming = false; - rq_step_sched(exec_ctx, resource_quota); - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + rq_step_sched(resource_quota); + grpc_resource_quota_unref_internal(resource_quota); } /******************************************************************************* @@ -627,10 +610,9 @@ grpc_resource_quota *grpc_resource_quota_create(const char *name) { return resource_quota; } -void grpc_resource_quota_unref_internal(grpc_exec_ctx *exec_ctx, - grpc_resource_quota *resource_quota) { +void grpc_resource_quota_unref_internal(grpc_resource_quota *resource_quota) { if (gpr_unref(&resource_quota->refs)) { - GRPC_COMBINER_UNREF(exec_ctx, resource_quota->combiner, "resource_quota"); + GRPC_COMBINER_UNREF(resource_quota->combiner, "resource_quota"); gpr_free(resource_quota->name); gpr_free(resource_quota); } @@ -638,9 +620,9 @@ void grpc_resource_quota_unref_internal(grpc_exec_ctx *exec_ctx, /* Public API */ void grpc_resource_quota_unref(grpc_resource_quota *resource_quota) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_resource_quota_unref_internal(resource_quota); + grpc_exec_ctx_finish(); } grpc_resource_quota *grpc_resource_quota_ref_internal( @@ -664,15 +646,15 @@ double grpc_resource_quota_get_memory_pressure( /* Public API */ void grpc_resource_quota_resize(grpc_resource_quota *resource_quota, size_t size) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; rq_resize_args *a = (rq_resize_args *)gpr_malloc(sizeof(*a)); a->resource_quota = grpc_resource_quota_ref_internal(resource_quota); a->size = (int64_t)size; gpr_atm_no_barrier_store(&resource_quota->last_size, (gpr_atm)GPR_MIN((size_t)GPR_ATM_MAX, size)); GRPC_CLOSURE_INIT(&a->closure, rq_resize, a, grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(&exec_ctx, &a->closure, GRPC_ERROR_NONE); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_CLOSURE_SCHED(&a->closure, GRPC_ERROR_NONE); + grpc_exec_ctx_finish(); } size_t grpc_resource_quota_peek_size(grpc_resource_quota *resource_quota) { @@ -703,8 +685,8 @@ static void *rq_copy(void *rq) { return rq; } -static void rq_destroy(grpc_exec_ctx *exec_ctx, void *rq) { - grpc_resource_quota_unref_internal(exec_ctx, (grpc_resource_quota *)rq); +static void rq_destroy(void *rq) { + grpc_resource_quota_unref_internal((grpc_resource_quota *)rq); } static int rq_cmp(void *a, void *b) { return GPR_ICMP(a, b); } @@ -772,14 +754,12 @@ static void ru_ref_by(grpc_resource_user *resource_user, gpr_atm amount) { GPR_ASSERT(gpr_atm_no_barrier_fetch_add(&resource_user->refs, amount) != 0); } -static void ru_unref_by(grpc_exec_ctx *exec_ctx, - grpc_resource_user *resource_user, gpr_atm amount) { +static void ru_unref_by(grpc_resource_user *resource_user, gpr_atm amount) { GPR_ASSERT(amount > 0); gpr_atm old = gpr_atm_full_fetch_add(&resource_user->refs, -amount); GPR_ASSERT(old >= amount); if (old == amount) { - GRPC_CLOSURE_SCHED(exec_ctx, &resource_user->destroy_closure, - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&resource_user->destroy_closure, GRPC_ERROR_NONE); } } @@ -787,16 +767,13 @@ void grpc_resource_user_ref(grpc_resource_user *resource_user) { ru_ref_by(resource_user, 1); } -void grpc_resource_user_unref(grpc_exec_ctx *exec_ctx, - grpc_resource_user *resource_user) { - ru_unref_by(exec_ctx, resource_user, 1); +void grpc_resource_user_unref(grpc_resource_user *resource_user) { + ru_unref_by(resource_user, 1); } -void grpc_resource_user_shutdown(grpc_exec_ctx *exec_ctx, - grpc_resource_user *resource_user) { +void grpc_resource_user_shutdown(grpc_resource_user *resource_user) { if (gpr_atm_full_fetch_add(&resource_user->shutdown, 1) == 0) { GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_CREATE( ru_shutdown, resource_user, grpc_combiner_scheduler(resource_user->resource_quota->combiner)), @@ -804,8 +781,7 @@ void grpc_resource_user_shutdown(grpc_exec_ctx *exec_ctx, } } -void grpc_resource_user_alloc(grpc_exec_ctx *exec_ctx, - grpc_resource_user *resource_user, size_t size, +void grpc_resource_user_alloc(grpc_resource_user *resource_user, size_t size, grpc_closure *optional_on_done) { gpr_mu_lock(&resource_user->mu); ru_ref_by(resource_user, (gpr_atm)size); @@ -821,18 +797,16 @@ void grpc_resource_user_alloc(grpc_exec_ctx *exec_ctx, GRPC_ERROR_NONE); if (!resource_user->allocating) { resource_user->allocating = true; - GRPC_CLOSURE_SCHED(exec_ctx, &resource_user->allocate_closure, - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&resource_user->allocate_closure, GRPC_ERROR_NONE); } } else { resource_user->outstanding_allocations -= (int64_t)size; - GRPC_CLOSURE_SCHED(exec_ctx, optional_on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(optional_on_done, GRPC_ERROR_NONE); } gpr_mu_unlock(&resource_user->mu); } -void grpc_resource_user_free(grpc_exec_ctx *exec_ctx, - grpc_resource_user *resource_user, size_t size) { +void grpc_resource_user_free(grpc_resource_user *resource_user, size_t size) { gpr_mu_lock(&resource_user->mu); bool was_zero_or_negative = resource_user->free_pool <= 0; resource_user->free_pool += (int64_t)size; @@ -845,32 +819,29 @@ void grpc_resource_user_free(grpc_exec_ctx *exec_ctx, if (is_bigger_than_zero && was_zero_or_negative && !resource_user->added_to_free_pool) { resource_user->added_to_free_pool = true; - GRPC_CLOSURE_SCHED(exec_ctx, &resource_user->add_to_free_pool_closure, + GRPC_CLOSURE_SCHED(&resource_user->add_to_free_pool_closure, GRPC_ERROR_NONE); } gpr_mu_unlock(&resource_user->mu); - ru_unref_by(exec_ctx, resource_user, (gpr_atm)size); + ru_unref_by(resource_user, (gpr_atm)size); } -void grpc_resource_user_post_reclaimer(grpc_exec_ctx *exec_ctx, - grpc_resource_user *resource_user, +void grpc_resource_user_post_reclaimer(grpc_resource_user *resource_user, bool destructive, grpc_closure *closure) { GPR_ASSERT(resource_user->new_reclaimers[destructive] == NULL); resource_user->new_reclaimers[destructive] = closure; - GRPC_CLOSURE_SCHED(exec_ctx, - &resource_user->post_reclaimer_closure[destructive], + GRPC_CLOSURE_SCHED(&resource_user->post_reclaimer_closure[destructive], GRPC_ERROR_NONE); } -void grpc_resource_user_finish_reclamation(grpc_exec_ctx *exec_ctx, - grpc_resource_user *resource_user) { +void grpc_resource_user_finish_reclamation(grpc_resource_user *resource_user) { if (GRPC_TRACER_ON(grpc_resource_quota_trace)) { gpr_log(GPR_DEBUG, "RQ %s %s: reclamation complete", resource_user->resource_quota->name, resource_user->name); } GRPC_CLOSURE_SCHED( - exec_ctx, &resource_user->resource_quota->rq_reclamation_done_closure, + &resource_user->resource_quota->rq_reclamation_done_closure, GRPC_ERROR_NONE); } @@ -885,19 +856,17 @@ void grpc_resource_user_slice_allocator_init( } void grpc_resource_user_alloc_slices( - grpc_exec_ctx *exec_ctx, grpc_resource_user_slice_allocator *slice_allocator, size_t length, size_t count, grpc_slice_buffer *dest) { slice_allocator->length = length; slice_allocator->count = count; slice_allocator->dest = dest; - grpc_resource_user_alloc(exec_ctx, slice_allocator->resource_user, - count * length, &slice_allocator->on_allocated); + grpc_resource_user_alloc(slice_allocator->resource_user, count * length, + &slice_allocator->on_allocated); } -grpc_slice grpc_resource_user_slice_malloc(grpc_exec_ctx *exec_ctx, - grpc_resource_user *resource_user, +grpc_slice grpc_resource_user_slice_malloc(grpc_resource_user *resource_user, size_t size) { - grpc_resource_user_alloc(exec_ctx, resource_user, size, NULL); + grpc_resource_user_alloc(resource_user, size, NULL); return ru_slice_create(resource_user, size); } diff --git a/src/core/lib/iomgr/resource_quota.h b/src/core/lib/iomgr/resource_quota.h index 1d4249b7e29..763ac9fcc1c 100644 --- a/src/core/lib/iomgr/resource_quota.h +++ b/src/core/lib/iomgr/resource_quota.h @@ -69,8 +69,7 @@ extern grpc_tracer_flag grpc_resource_quota_trace; grpc_resource_quota *grpc_resource_quota_ref_internal( grpc_resource_quota *resource_quota); -void grpc_resource_quota_unref_internal(grpc_exec_ctx *exec_ctx, - grpc_resource_quota *resource_quota); +void grpc_resource_quota_unref_internal(grpc_resource_quota *resource_quota); grpc_resource_quota *grpc_resource_quota_from_channel_args( const grpc_channel_args *channel_args); @@ -93,32 +92,26 @@ grpc_resource_quota *grpc_resource_user_quota( grpc_resource_user *resource_user); void grpc_resource_user_ref(grpc_resource_user *resource_user); -void grpc_resource_user_unref(grpc_exec_ctx *exec_ctx, - grpc_resource_user *resource_user); -void grpc_resource_user_shutdown(grpc_exec_ctx *exec_ctx, - grpc_resource_user *resource_user); +void grpc_resource_user_unref(grpc_resource_user *resource_user); +void grpc_resource_user_shutdown(grpc_resource_user *resource_user); /* Allocate from the resource user (and its quota). If optional_on_done is NULL, then allocate immediately. This may push the quota over-limit, at which point reclamation will kick in. If optional_on_done is non-NULL, it will be scheduled when the allocation has been granted by the quota. */ -void grpc_resource_user_alloc(grpc_exec_ctx *exec_ctx, - grpc_resource_user *resource_user, size_t size, +void grpc_resource_user_alloc(grpc_resource_user *resource_user, size_t size, grpc_closure *optional_on_done); /* Release memory back to the quota */ -void grpc_resource_user_free(grpc_exec_ctx *exec_ctx, - grpc_resource_user *resource_user, size_t size); +void grpc_resource_user_free(grpc_resource_user *resource_user, size_t size); /* Post a memory reclaimer to the resource user. Only one benign and one destructive reclaimer can be posted at once. When executed, the reclaimer MUST call grpc_resource_user_finish_reclamation before it completes, to return control to the resource quota. */ -void grpc_resource_user_post_reclaimer(grpc_exec_ctx *exec_ctx, - grpc_resource_user *resource_user, +void grpc_resource_user_post_reclaimer(grpc_resource_user *resource_user, bool destructive, grpc_closure *closure); /* Finish a reclamation step */ -void grpc_resource_user_finish_reclamation(grpc_exec_ctx *exec_ctx, - grpc_resource_user *resource_user); +void grpc_resource_user_finish_reclamation(grpc_resource_user *resource_user); /* Helper to allocate slices from a resource user */ typedef struct grpc_resource_user_slice_allocator { @@ -145,13 +138,11 @@ void grpc_resource_user_slice_allocator_init( /* Allocate \a count slices of length \a length into \a dest. Only one request can be outstanding at a time. */ void grpc_resource_user_alloc_slices( - grpc_exec_ctx *exec_ctx, grpc_resource_user_slice_allocator *slice_allocator, size_t length, size_t count, grpc_slice_buffer *dest); /* Allocate one slice of length \a size synchronously. */ -grpc_slice grpc_resource_user_slice_malloc(grpc_exec_ctx *exec_ctx, - grpc_resource_user *resource_user, +grpc_slice grpc_resource_user_slice_malloc(grpc_resource_user *resource_user, size_t size); #ifdef __cplusplus diff --git a/src/core/lib/iomgr/socket_factory_posix.cc b/src/core/lib/iomgr/socket_factory_posix.cc index 8e907703ae7..a9d7dac3990 100644 --- a/src/core/lib/iomgr/socket_factory_posix.cc +++ b/src/core/lib/iomgr/socket_factory_posix.cc @@ -72,7 +72,7 @@ static void *socket_factory_arg_copy(void *p) { return grpc_socket_factory_ref((grpc_socket_factory *)p); } -static void socket_factory_arg_destroy(grpc_exec_ctx *exec_ctx, void *p) { +static void socket_factory_arg_destroy(void *p) { grpc_socket_factory_unref((grpc_socket_factory *)p); } diff --git a/src/core/lib/iomgr/socket_mutator.cc b/src/core/lib/iomgr/socket_mutator.cc index b0435d5a076..0a2e91da4d9 100644 --- a/src/core/lib/iomgr/socket_mutator.cc +++ b/src/core/lib/iomgr/socket_mutator.cc @@ -63,7 +63,7 @@ static void *socket_mutator_arg_copy(void *p) { return grpc_socket_mutator_ref((grpc_socket_mutator *)p); } -static void socket_mutator_arg_destroy(grpc_exec_ctx *exec_ctx, void *p) { +static void socket_mutator_arg_destroy(void *p) { grpc_socket_mutator_unref((grpc_socket_mutator *)p); } diff --git a/src/core/lib/iomgr/socket_windows.cc b/src/core/lib/iomgr/socket_windows.cc index 8c7f7cf683d..9d140fe4851 100644 --- a/src/core/lib/iomgr/socket_windows.cc +++ b/src/core/lib/iomgr/socket_windows.cc @@ -109,37 +109,34 @@ void grpc_winsocket_destroy(grpc_winsocket *winsocket) { -) The IOCP already completed in the background, and we need to call the callback now. -) The IOCP hasn't completed yet, and we're queuing it for later. */ -static void socket_notify_on_iocp(grpc_exec_ctx *exec_ctx, - grpc_winsocket *socket, grpc_closure *closure, +static void socket_notify_on_iocp(grpc_winsocket *socket, grpc_closure *closure, grpc_winsocket_callback_info *info) { GPR_ASSERT(info->closure == NULL); gpr_mu_lock(&socket->state_mu); if (info->has_pending_iocp) { info->has_pending_iocp = 0; - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); } else { info->closure = closure; } gpr_mu_unlock(&socket->state_mu); } -void grpc_socket_notify_on_write(grpc_exec_ctx *exec_ctx, - grpc_winsocket *socket, +void grpc_socket_notify_on_write(grpc_winsocket *socket, grpc_closure *closure) { - socket_notify_on_iocp(exec_ctx, socket, closure, &socket->write_info); + socket_notify_on_iocp(socket, closure, &socket->write_info); } -void grpc_socket_notify_on_read(grpc_exec_ctx *exec_ctx, grpc_winsocket *socket, - grpc_closure *closure) { - socket_notify_on_iocp(exec_ctx, socket, closure, &socket->read_info); +void grpc_socket_notify_on_read(grpc_winsocket *socket, grpc_closure *closure) { + socket_notify_on_iocp(socket, closure, &socket->read_info); } -void grpc_socket_become_ready(grpc_exec_ctx *exec_ctx, grpc_winsocket *socket, +void grpc_socket_become_ready(grpc_winsocket *socket, grpc_winsocket_callback_info *info) { GPR_ASSERT(!info->has_pending_iocp); gpr_mu_lock(&socket->state_mu); if (info->closure) { - GRPC_CLOSURE_SCHED(exec_ctx, info->closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(info->closure, GRPC_ERROR_NONE); info->closure = NULL; } else { info->has_pending_iocp = 1; diff --git a/src/core/lib/iomgr/socket_windows.h b/src/core/lib/iomgr/socket_windows.h index 84fa071e89a..2b9fa0a4fea 100644 --- a/src/core/lib/iomgr/socket_windows.h +++ b/src/core/lib/iomgr/socket_windows.h @@ -99,16 +99,13 @@ void grpc_winsocket_shutdown(grpc_winsocket *socket); /* Destroy a socket. Should only be called if there's no pending operation. */ void grpc_winsocket_destroy(grpc_winsocket *socket); -void grpc_socket_notify_on_write(grpc_exec_ctx *exec_ctx, - grpc_winsocket *winsocket, +void grpc_socket_notify_on_write(grpc_winsocket *winsocket, grpc_closure *closure); -void grpc_socket_notify_on_read(grpc_exec_ctx *exec_ctx, - grpc_winsocket *winsocket, +void grpc_socket_notify_on_read(grpc_winsocket *winsocket, grpc_closure *closure); -void grpc_socket_become_ready(grpc_exec_ctx *exec_ctx, - grpc_winsocket *winsocket, +void grpc_socket_become_ready(grpc_winsocket *winsocket, grpc_winsocket_callback_info *ci); #ifdef __cplusplus diff --git a/src/core/lib/iomgr/tcp_client.h b/src/core/lib/iomgr/tcp_client.h index b2f365f2af6..bea2d740df6 100644 --- a/src/core/lib/iomgr/tcp_client.h +++ b/src/core/lib/iomgr/tcp_client.h @@ -34,8 +34,7 @@ extern "C" { NULL on failure). interested_parties points to a set of pollsets that would be interested in this connection being established (in order to continue their work) */ -void grpc_tcp_client_connect(grpc_exec_ctx *exec_ctx, grpc_closure *on_connect, - grpc_endpoint **endpoint, +void grpc_tcp_client_connect(grpc_closure *on_connect, grpc_endpoint **endpoint, grpc_pollset_set *interested_parties, const grpc_channel_args *channel_args, const grpc_resolved_address *addr, diff --git a/src/core/lib/iomgr/tcp_client_posix.cc b/src/core/lib/iomgr/tcp_client_posix.cc index 5611dd90624..c231c3f619a 100644 --- a/src/core/lib/iomgr/tcp_client_posix.cc +++ b/src/core/lib/iomgr/tcp_client_posix.cc @@ -96,7 +96,7 @@ done: return err; } -static void tc_on_alarm(grpc_exec_ctx *exec_ctx, void *acp, grpc_error *error) { +static void tc_on_alarm(void *acp, grpc_error *error) { int done; async_connect *ac = (async_connect *)acp; if (GRPC_TRACER_ON(grpc_tcp_trace)) { @@ -106,26 +106,25 @@ static void tc_on_alarm(grpc_exec_ctx *exec_ctx, void *acp, grpc_error *error) { } gpr_mu_lock(&ac->mu); if (ac->fd != NULL) { - grpc_fd_shutdown(exec_ctx, ac->fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "connect() timed out")); + grpc_fd_shutdown( + ac->fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("connect() timed out")); } done = (--ac->refs == 0); gpr_mu_unlock(&ac->mu); if (done) { gpr_mu_destroy(&ac->mu); gpr_free(ac->addr_str); - grpc_channel_args_destroy(exec_ctx, ac->channel_args); + grpc_channel_args_destroy(ac->channel_args); gpr_free(ac); } } grpc_endpoint *grpc_tcp_client_create_from_fd( - grpc_exec_ctx *exec_ctx, grpc_fd *fd, const grpc_channel_args *channel_args, - const char *addr_str) { - return grpc_tcp_create(exec_ctx, fd, channel_args, addr_str); + grpc_fd *fd, const grpc_channel_args *channel_args, const char *addr_str) { + return grpc_tcp_create(fd, channel_args, addr_str); } -static void on_writable(grpc_exec_ctx *exec_ctx, void *acp, grpc_error *error) { +static void on_writable(void *acp, grpc_error *error) { async_connect *ac = (async_connect *)acp; int so_error = 0; socklen_t so_error_size; @@ -149,7 +148,7 @@ static void on_writable(grpc_exec_ctx *exec_ctx, void *acp, grpc_error *error) { ac->fd = NULL; gpr_mu_unlock(&ac->mu); - grpc_timer_cancel(exec_ctx, &ac->alarm); + grpc_timer_cancel(&ac->alarm); gpr_mu_lock(&ac->mu); if (error != GRPC_ERROR_NONE) { @@ -171,9 +170,8 @@ static void on_writable(grpc_exec_ctx *exec_ctx, void *acp, grpc_error *error) { switch (so_error) { case 0: - grpc_pollset_set_del_fd(exec_ctx, ac->interested_parties, fd); - *ep = grpc_tcp_client_create_from_fd(exec_ctx, fd, ac->channel_args, - ac->addr_str); + grpc_pollset_set_del_fd(ac->interested_parties, fd); + *ep = grpc_tcp_client_create_from_fd(fd, ac->channel_args, ac->addr_str); fd = NULL; break; case ENOBUFS: @@ -193,7 +191,7 @@ static void on_writable(grpc_exec_ctx *exec_ctx, void *acp, grpc_error *error) { don't do that! */ gpr_log(GPR_ERROR, "kernel out of buffers"); gpr_mu_unlock(&ac->mu); - grpc_fd_notify_on_write(exec_ctx, fd, &ac->write_closure); + grpc_fd_notify_on_write(fd, &ac->write_closure); return; case ECONNREFUSED: /* This error shouldn't happen for anything other than connect(). */ @@ -208,8 +206,8 @@ static void on_writable(grpc_exec_ctx *exec_ctx, void *acp, grpc_error *error) { finish: if (fd != NULL) { - grpc_pollset_set_del_fd(exec_ctx, ac->interested_parties, fd); - grpc_fd_orphan(exec_ctx, fd, NULL, NULL, false /* already_closed */, + grpc_pollset_set_del_fd(ac->interested_parties, fd); + grpc_fd_orphan(fd, NULL, NULL, false /* already_closed */, "tcp_client_orphan"); fd = NULL; } @@ -232,14 +230,13 @@ finish: if (done) { gpr_mu_destroy(&ac->mu); gpr_free(ac->addr_str); - grpc_channel_args_destroy(exec_ctx, ac->channel_args); + grpc_channel_args_destroy(ac->channel_args); gpr_free(ac); } - GRPC_CLOSURE_SCHED(exec_ctx, closure, error); + GRPC_CLOSURE_SCHED(closure, error); } -static void tcp_client_connect_impl(grpc_exec_ctx *exec_ctx, - grpc_closure *closure, grpc_endpoint **ep, +static void tcp_client_connect_impl(grpc_closure *closure, grpc_endpoint **ep, grpc_pollset_set *interested_parties, const grpc_channel_args *channel_args, const grpc_resolved_address *addr, @@ -264,7 +261,7 @@ static void tcp_client_connect_impl(grpc_exec_ctx *exec_ctx, error = grpc_create_dualstack_socket(addr, SOCK_STREAM, 0, &dsmode, &fd); if (error != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(exec_ctx, closure, error); + GRPC_CLOSURE_SCHED(closure, error); return; } if (dsmode == GRPC_DSMODE_IPV4) { @@ -273,7 +270,7 @@ static void tcp_client_connect_impl(grpc_exec_ctx *exec_ctx, addr = &addr4_copy; } if ((error = prepare_socket(addr, fd, channel_args)) != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(exec_ctx, closure, error); + GRPC_CLOSURE_SCHED(closure, error); return; } @@ -289,20 +286,19 @@ static void tcp_client_connect_impl(grpc_exec_ctx *exec_ctx, fdobj = grpc_fd_create(fd, name); if (err >= 0) { - *ep = - grpc_tcp_client_create_from_fd(exec_ctx, fdobj, channel_args, addr_str); - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); + *ep = grpc_tcp_client_create_from_fd(fdobj, channel_args, addr_str); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); goto done; } if (errno != EWOULDBLOCK && errno != EINPROGRESS) { - grpc_fd_orphan(exec_ctx, fdobj, NULL, NULL, false /* already_closed */, + grpc_fd_orphan(fdobj, NULL, NULL, false /* already_closed */, "tcp_client_connect_error"); - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_OS_ERROR(errno, "connect")); + GRPC_CLOSURE_SCHED(closure, GRPC_OS_ERROR(errno, "connect")); goto done; } - grpc_pollset_set_add_fd(exec_ctx, interested_parties, fdobj); + grpc_pollset_set_add_fd(interested_parties, fdobj); ac = (async_connect *)gpr_malloc(sizeof(async_connect)); ac->closure = closure; @@ -324,8 +320,8 @@ static void tcp_client_connect_impl(grpc_exec_ctx *exec_ctx, gpr_mu_lock(&ac->mu); GRPC_CLOSURE_INIT(&ac->on_alarm, tc_on_alarm, ac, grpc_schedule_on_exec_ctx); - grpc_timer_init(exec_ctx, &ac->alarm, deadline, &ac->on_alarm); - grpc_fd_notify_on_write(exec_ctx, ac->fd, &ac->write_closure); + grpc_timer_init(&ac->alarm, deadline, &ac->on_alarm); + grpc_fd_notify_on_write(ac->fd, &ac->write_closure); gpr_mu_unlock(&ac->mu); done: @@ -336,20 +332,19 @@ done: // overridden by api_fuzzer.c extern "C" { void (*grpc_tcp_client_connect_impl)( - grpc_exec_ctx *exec_ctx, grpc_closure *closure, grpc_endpoint **ep, + grpc_closure *closure, grpc_endpoint **ep, grpc_pollset_set *interested_parties, const grpc_channel_args *channel_args, const grpc_resolved_address *addr, grpc_millis deadline) = tcp_client_connect_impl; } -void grpc_tcp_client_connect(grpc_exec_ctx *exec_ctx, grpc_closure *closure, - grpc_endpoint **ep, +void grpc_tcp_client_connect(grpc_closure *closure, grpc_endpoint **ep, grpc_pollset_set *interested_parties, const grpc_channel_args *channel_args, const grpc_resolved_address *addr, grpc_millis deadline) { - grpc_tcp_client_connect_impl(exec_ctx, closure, ep, interested_parties, - channel_args, addr, deadline); + grpc_tcp_client_connect_impl(closure, ep, interested_parties, channel_args, + addr, deadline); } #endif diff --git a/src/core/lib/iomgr/tcp_client_posix.h b/src/core/lib/iomgr/tcp_client_posix.h index 8740511804d..ed37b5a9de4 100644 --- a/src/core/lib/iomgr/tcp_client_posix.h +++ b/src/core/lib/iomgr/tcp_client_posix.h @@ -28,8 +28,7 @@ extern "C" { #endif grpc_endpoint *grpc_tcp_client_create_from_fd( - grpc_exec_ctx *exec_ctx, grpc_fd *fd, const grpc_channel_args *channel_args, - const char *addr_str); + grpc_fd *fd, const grpc_channel_args *channel_args, const char *addr_str); #ifdef __cplusplus } diff --git a/src/core/lib/iomgr/tcp_client_uv.cc b/src/core/lib/iomgr/tcp_client_uv.cc index f3e9366299d..31ee397107a 100644 --- a/src/core/lib/iomgr/tcp_client_uv.cc +++ b/src/core/lib/iomgr/tcp_client_uv.cc @@ -46,17 +46,15 @@ typedef struct grpc_uv_tcp_connect { grpc_resource_quota *resource_quota; } grpc_uv_tcp_connect; -static void uv_tcp_connect_cleanup(grpc_exec_ctx *exec_ctx, - grpc_uv_tcp_connect *connect) { - grpc_resource_quota_unref_internal(exec_ctx, connect->resource_quota); +static void uv_tcp_connect_cleanup(grpc_uv_tcp_connect *connect) { + grpc_resource_quota_unref_internal(connect->resource_quota); gpr_free(connect->addr_name); gpr_free(connect); } static void tcp_close_callback(uv_handle_t *handle) { gpr_free(handle); } -static void uv_tc_on_alarm(grpc_exec_ctx *exec_ctx, void *acp, - grpc_error *error) { +static void uv_tc_on_alarm(void *acp, grpc_error *error) { int done; grpc_uv_tcp_connect *connect = (grpc_uv_tcp_connect *)acp; if (GRPC_TRACER_ON(grpc_tcp_trace)) { @@ -72,17 +70,17 @@ static void uv_tc_on_alarm(grpc_exec_ctx *exec_ctx, void *acp, } done = (--connect->refs == 0); if (done) { - uv_tcp_connect_cleanup(exec_ctx, connect); + uv_tcp_connect_cleanup(connect); } } static void uv_tc_on_connect(uv_connect_t *req, int status) { grpc_uv_tcp_connect *connect = (grpc_uv_tcp_connect *)req->data; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_error *error = GRPC_ERROR_NONE; int done; grpc_closure *closure = connect->closure; - grpc_timer_cancel(&exec_ctx, &connect->alarm); + grpc_timer_cancel(&connect->alarm); if (status == 0) { *connect->endpoint = grpc_tcp_create( connect->tcp_handle, connect->resource_quota, connect->addr_name); @@ -107,15 +105,14 @@ static void uv_tc_on_connect(uv_connect_t *req, int status) { } done = (--connect->refs == 0); if (done) { - grpc_exec_ctx_flush(&exec_ctx); - uv_tcp_connect_cleanup(&exec_ctx, connect); + grpc_exec_ctx_flush(); + uv_tcp_connect_cleanup(connect); } - GRPC_CLOSURE_SCHED(&exec_ctx, closure, error); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_CLOSURE_SCHED(closure, error); + grpc_exec_ctx_finish(); } -static void tcp_client_connect_impl(grpc_exec_ctx *exec_ctx, - grpc_closure *closure, grpc_endpoint **ep, +static void tcp_client_connect_impl(grpc_closure *closure, grpc_endpoint **ep, grpc_pollset_set *interested_parties, const grpc_channel_args *channel_args, const grpc_resolved_address *resolved_addr, @@ -130,7 +127,7 @@ static void tcp_client_connect_impl(grpc_exec_ctx *exec_ctx, if (channel_args != NULL) { for (size_t i = 0; i < channel_args->num_args; i++) { if (0 == strcmp(channel_args->args[i].key, GRPC_ARG_RESOURCE_QUOTA)) { - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); resource_quota = grpc_resource_quota_ref_internal( (grpc_resource_quota *)channel_args->args[i].value.pointer.p); } @@ -158,26 +155,25 @@ static void tcp_client_connect_impl(grpc_exec_ctx *exec_ctx, uv_tc_on_connect); GRPC_CLOSURE_INIT(&connect->on_alarm, uv_tc_on_alarm, connect, grpc_schedule_on_exec_ctx); - grpc_timer_init(exec_ctx, &connect->alarm, deadline, &connect->on_alarm); + grpc_timer_init(&connect->alarm, deadline, &connect->on_alarm); } // overridden by api_fuzzer.c extern "C" { void (*grpc_tcp_client_connect_impl)( - grpc_exec_ctx *exec_ctx, grpc_closure *closure, grpc_endpoint **ep, + grpc_closure *closure, grpc_endpoint **ep, grpc_pollset_set *interested_parties, const grpc_channel_args *channel_args, const grpc_resolved_address *addr, grpc_millis deadline) = tcp_client_connect_impl; } -void grpc_tcp_client_connect(grpc_exec_ctx *exec_ctx, grpc_closure *closure, - grpc_endpoint **ep, +void grpc_tcp_client_connect(grpc_closure *closure, grpc_endpoint **ep, grpc_pollset_set *interested_parties, const grpc_channel_args *channel_args, const grpc_resolved_address *addr, grpc_millis deadline) { - grpc_tcp_client_connect_impl(exec_ctx, closure, ep, interested_parties, - channel_args, addr, deadline); + grpc_tcp_client_connect_impl(closure, ep, interested_parties, channel_args, + addr, deadline); } #endif /* GRPC_UV */ diff --git a/src/core/lib/iomgr/tcp_client_windows.cc b/src/core/lib/iomgr/tcp_client_windows.cc index 9adf7ee4e9c..94ae9365f04 100644 --- a/src/core/lib/iomgr/tcp_client_windows.cc +++ b/src/core/lib/iomgr/tcp_client_windows.cc @@ -52,13 +52,12 @@ typedef struct { grpc_channel_args *channel_args; } async_connect; -static void async_connect_unlock_and_cleanup(grpc_exec_ctx *exec_ctx, - async_connect *ac, +static void async_connect_unlock_and_cleanup(async_connect *ac, grpc_winsocket *socket) { int done = (--ac->refs == 0); gpr_mu_unlock(&ac->mu); if (done) { - grpc_channel_args_destroy(exec_ctx, ac->channel_args); + grpc_channel_args_destroy(ac->channel_args); gpr_mu_destroy(&ac->mu); gpr_free(ac->addr_name); gpr_free(ac); @@ -66,7 +65,7 @@ static void async_connect_unlock_and_cleanup(grpc_exec_ctx *exec_ctx, if (socket != NULL) grpc_winsocket_destroy(socket); } -static void on_alarm(grpc_exec_ctx *exec_ctx, void *acp, grpc_error *error) { +static void on_alarm(void *acp, grpc_error *error) { async_connect *ac = (async_connect *)acp; gpr_mu_lock(&ac->mu); grpc_winsocket *socket = ac->socket; @@ -74,10 +73,10 @@ static void on_alarm(grpc_exec_ctx *exec_ctx, void *acp, grpc_error *error) { if (socket != NULL) { grpc_winsocket_shutdown(socket); } - async_connect_unlock_and_cleanup(exec_ctx, ac, socket); + async_connect_unlock_and_cleanup(ac, socket); } -static void on_connect(grpc_exec_ctx *exec_ctx, void *acp, grpc_error *error) { +static void on_connect(void *acp, grpc_error *error) { async_connect *ac = (async_connect *)acp; grpc_endpoint **ep = ac->endpoint; GPR_ASSERT(*ep == NULL); @@ -90,7 +89,7 @@ static void on_connect(grpc_exec_ctx *exec_ctx, void *acp, grpc_error *error) { ac->socket = NULL; gpr_mu_unlock(&ac->mu); - grpc_timer_cancel(exec_ctx, &ac->alarm); + grpc_timer_cancel(&ac->alarm); gpr_mu_lock(&ac->mu); @@ -105,8 +104,7 @@ static void on_connect(grpc_exec_ctx *exec_ctx, void *acp, grpc_error *error) { if (!wsa_success) { error = GRPC_WSA_ERROR(WSAGetLastError(), "ConnectEx"); } else { - *ep = - grpc_tcp_create(exec_ctx, socket, ac->channel_args, ac->addr_name); + *ep = grpc_tcp_create(socket, ac->channel_args, ac->addr_name); socket = NULL; } } else { @@ -114,18 +112,20 @@ static void on_connect(grpc_exec_ctx *exec_ctx, void *acp, grpc_error *error) { } } - async_connect_unlock_and_cleanup(exec_ctx, ac, socket); + async_connect_unlock_and_cleanup(ac, socket); /* If the connection was aborted, the callback was already called when the deadline was met. */ - GRPC_CLOSURE_SCHED(exec_ctx, on_done, error); + GRPC_CLOSURE_SCHED(on_done, error); } /* Tries to issue one async connection, then schedules both an IOCP notification request for the connection, and one timeout alert. */ -static void tcp_client_connect_impl( - grpc_exec_ctx *exec_ctx, grpc_closure *on_done, grpc_endpoint **endpoint, - grpc_pollset_set *interested_parties, const grpc_channel_args *channel_args, - const grpc_resolved_address *addr, grpc_millis deadline) { +static void tcp_client_connect_impl(grpc_closure *on_done, + grpc_endpoint **endpoint, + grpc_pollset_set *interested_parties, + const grpc_channel_args *channel_args, + const grpc_resolved_address *addr, + grpc_millis deadline) { SOCKET sock = INVALID_SOCKET; BOOL success; int status; @@ -205,8 +205,8 @@ static void tcp_client_connect_impl( GRPC_CLOSURE_INIT(&ac->on_connect, on_connect, ac, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&ac->on_alarm, on_alarm, ac, grpc_schedule_on_exec_ctx); - grpc_timer_init(exec_ctx, &ac->alarm, deadline, &ac->on_alarm); - grpc_socket_notify_on_write(exec_ctx, socket, &ac->on_connect); + grpc_timer_init(&ac->alarm, deadline, &ac->on_alarm); + grpc_socket_notify_on_write(socket, &ac->on_connect); return; failure: @@ -222,26 +222,25 @@ failure: } else if (sock != INVALID_SOCKET) { closesocket(sock); } - GRPC_CLOSURE_SCHED(exec_ctx, on_done, final_error); + GRPC_CLOSURE_SCHED(on_done, final_error); } // overridden by api_fuzzer.c extern "C" { void (*grpc_tcp_client_connect_impl)( - grpc_exec_ctx *exec_ctx, grpc_closure *closure, grpc_endpoint **ep, + grpc_closure *closure, grpc_endpoint **ep, grpc_pollset_set *interested_parties, const grpc_channel_args *channel_args, const grpc_resolved_address *addr, grpc_millis deadline) = tcp_client_connect_impl; } -void grpc_tcp_client_connect(grpc_exec_ctx *exec_ctx, grpc_closure *closure, - grpc_endpoint **ep, +void grpc_tcp_client_connect(grpc_closure *closure, grpc_endpoint **ep, grpc_pollset_set *interested_parties, const grpc_channel_args *channel_args, const grpc_resolved_address *addr, grpc_millis deadline) { - grpc_tcp_client_connect_impl(exec_ctx, closure, ep, interested_parties, - channel_args, addr, deadline); + grpc_tcp_client_connect_impl(closure, ep, interested_parties, channel_args, + addr, deadline); } #endif /* GRPC_WINSOCK_SOCKET */ diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index 7fcaef76792..b6b7231ee1b 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -110,36 +110,31 @@ typedef struct backup_poller { static gpr_atm g_uncovered_notifications_pending; static gpr_atm g_backup_poller; /* backup_poller* */ -static void tcp_handle_read(grpc_exec_ctx *exec_ctx, void *arg /* grpc_tcp */, - grpc_error *error); -static void tcp_handle_write(grpc_exec_ctx *exec_ctx, void *arg /* grpc_tcp */, - grpc_error *error); -static void tcp_drop_uncovered_then_handle_write(grpc_exec_ctx *exec_ctx, - void *arg /* grpc_tcp */, +static void tcp_handle_read(void *arg /* grpc_tcp */, grpc_error *error); +static void tcp_handle_write(void *arg /* grpc_tcp */, grpc_error *error); +static void tcp_drop_uncovered_then_handle_write(void *arg /* grpc_tcp */, grpc_error *error); -static void done_poller(grpc_exec_ctx *exec_ctx, void *bp, - grpc_error *error_ignored) { +static void done_poller(void *bp, grpc_error *error_ignored) { backup_poller *p = (backup_poller *)bp; if (GRPC_TRACER_ON(grpc_tcp_trace)) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p destroy", p); } - grpc_pollset_destroy(exec_ctx, BACKUP_POLLER_POLLSET(p)); + grpc_pollset_destroy(BACKUP_POLLER_POLLSET(p)); gpr_free(p); } -static void run_poller(grpc_exec_ctx *exec_ctx, void *bp, - grpc_error *error_ignored) { +static void run_poller(void *bp, grpc_error *error_ignored) { backup_poller *p = (backup_poller *)bp; if (GRPC_TRACER_ON(grpc_tcp_trace)) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p run", p); } gpr_mu_lock(p->pollset_mu); - grpc_millis deadline = grpc_exec_ctx_now(exec_ctx) + 13 * GPR_MS_PER_SEC; - GRPC_STATS_INC_TCP_BACKUP_POLLER_POLLS(exec_ctx); + grpc_millis deadline = grpc_exec_ctx_now() + 13 * GPR_MS_PER_SEC; + GRPC_STATS_INC_TCP_BACKUP_POLLER_POLLS(); GRPC_LOG_IF_ERROR( "backup_poller:pollset_work", - grpc_pollset_work(exec_ctx, BACKUP_POLLER_POLLSET(p), NULL, deadline)); + grpc_pollset_work(BACKUP_POLLER_POLLSET(p), NULL, deadline)); gpr_mu_unlock(p->pollset_mu); /* last "uncovered" notification is the ref that keeps us polling, if we get * there try a cas to release it */ @@ -154,18 +149,18 @@ static void run_poller(grpc_exec_ctx *exec_ctx, void *bp, if (GRPC_TRACER_ON(grpc_tcp_trace)) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p shutdown", p); } - grpc_pollset_shutdown(exec_ctx, BACKUP_POLLER_POLLSET(p), + grpc_pollset_shutdown(BACKUP_POLLER_POLLSET(p), GRPC_CLOSURE_INIT(&p->run_poller, done_poller, p, grpc_schedule_on_exec_ctx)); } else { if (GRPC_TRACER_ON(grpc_tcp_trace)) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p reschedule", p); } - GRPC_CLOSURE_SCHED(exec_ctx, &p->run_poller, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&p->run_poller, GRPC_ERROR_NONE); } } -static void drop_uncovered(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { +static void drop_uncovered(grpc_tcp *tcp) { backup_poller *p = (backup_poller *)gpr_atm_acq_load(&g_backup_poller); gpr_atm old_count = gpr_atm_no_barrier_fetch_add(&g_uncovered_notifications_pending, -1); @@ -176,7 +171,7 @@ static void drop_uncovered(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { GPR_ASSERT(old_count != 1); } -static void cover_self(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { +static void cover_self(grpc_tcp *tcp) { backup_poller *p; gpr_atm old_count = gpr_atm_no_barrier_fetch_add(&g_uncovered_notifications_pending, 2); @@ -185,7 +180,7 @@ static void cover_self(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { 2 + (int)old_count); } if (old_count == 0) { - GRPC_STATS_INC_TCP_BACKUP_POLLERS_CREATED(exec_ctx); + GRPC_STATS_INC_TCP_BACKUP_POLLERS_CREATED(); p = (backup_poller *)gpr_malloc(sizeof(*p) + grpc_pollset_size()); if (GRPC_TRACER_ON(grpc_tcp_trace)) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p create", p); @@ -193,7 +188,6 @@ static void cover_self(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { grpc_pollset_init(BACKUP_POLLER_POLLSET(p), &p->pollset_mu); gpr_atm_rel_store(&g_backup_poller, (gpr_atm)p); GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_INIT(&p->run_poller, run_poller, p, grpc_executor_scheduler(GRPC_EXECUTOR_LONG)), GRPC_ERROR_NONE); @@ -205,39 +199,38 @@ static void cover_self(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { if (GRPC_TRACER_ON(grpc_tcp_trace)) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p add %p", p, tcp); } - grpc_pollset_add_fd(exec_ctx, BACKUP_POLLER_POLLSET(p), tcp->em_fd); + grpc_pollset_add_fd(BACKUP_POLLER_POLLSET(p), tcp->em_fd); if (old_count != 0) { - drop_uncovered(exec_ctx, tcp); + drop_uncovered(tcp); } } -static void notify_on_read(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { +static void notify_on_read(grpc_tcp *tcp) { if (GRPC_TRACER_ON(grpc_tcp_trace)) { gpr_log(GPR_DEBUG, "TCP:%p notify_on_read", tcp); } GRPC_CLOSURE_INIT(&tcp->read_done_closure, tcp_handle_read, tcp, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(exec_ctx, tcp->em_fd, &tcp->read_done_closure); + grpc_fd_notify_on_read(tcp->em_fd, &tcp->read_done_closure); } -static void notify_on_write(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { +static void notify_on_write(grpc_tcp *tcp) { if (GRPC_TRACER_ON(grpc_tcp_trace)) { gpr_log(GPR_DEBUG, "TCP:%p notify_on_write", tcp); } - cover_self(exec_ctx, tcp); + cover_self(tcp); GRPC_CLOSURE_INIT(&tcp->write_done_closure, tcp_drop_uncovered_then_handle_write, tcp, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_write(exec_ctx, tcp->em_fd, &tcp->write_done_closure); + grpc_fd_notify_on_write(tcp->em_fd, &tcp->write_done_closure); } -static void tcp_drop_uncovered_then_handle_write(grpc_exec_ctx *exec_ctx, - void *arg, grpc_error *error) { +static void tcp_drop_uncovered_then_handle_write(void *arg, grpc_error *error) { if (GRPC_TRACER_ON(grpc_tcp_trace)) { gpr_log(GPR_DEBUG, "TCP:%p got_write: %s", arg, grpc_error_string(error)); } - drop_uncovered(exec_ctx, (grpc_tcp *)arg); - tcp_handle_write(exec_ctx, arg, error); + drop_uncovered((grpc_tcp *)arg); + tcp_handle_write(arg, error); } static void add_to_estimate(grpc_tcp *tcp, size_t bytes) { @@ -283,33 +276,29 @@ static grpc_error *tcp_annotate_error(grpc_error *src_error, grpc_tcp *tcp) { grpc_slice_from_copied_string(tcp->peer_string)); } -static void tcp_handle_read(grpc_exec_ctx *exec_ctx, void *arg /* grpc_tcp */, - grpc_error *error); -static void tcp_handle_write(grpc_exec_ctx *exec_ctx, void *arg /* grpc_tcp */, - grpc_error *error); +static void tcp_handle_read(void *arg /* grpc_tcp */, grpc_error *error); +static void tcp_handle_write(void *arg /* grpc_tcp */, grpc_error *error); -static void tcp_shutdown(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_error *why) { +static void tcp_shutdown(grpc_endpoint *ep, grpc_error *why) { grpc_tcp *tcp = (grpc_tcp *)ep; - grpc_fd_shutdown(exec_ctx, tcp->em_fd, why); - grpc_resource_user_shutdown(exec_ctx, tcp->resource_user); + grpc_fd_shutdown(tcp->em_fd, why); + grpc_resource_user_shutdown(tcp->resource_user); } -static void tcp_free(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { - grpc_fd_orphan(exec_ctx, tcp->em_fd, tcp->release_fd_cb, tcp->release_fd, +static void tcp_free(grpc_tcp *tcp) { + grpc_fd_orphan(tcp->em_fd, tcp->release_fd_cb, tcp->release_fd, false /* already_closed */, "tcp_unref_orphan"); - grpc_slice_buffer_destroy_internal(exec_ctx, &tcp->last_read_buffer); - grpc_resource_user_unref(exec_ctx, tcp->resource_user); + grpc_slice_buffer_destroy_internal(&tcp->last_read_buffer); + grpc_resource_user_unref(tcp->resource_user); gpr_free(tcp->peer_string); gpr_free(tcp); } #ifndef NDEBUG -#define TCP_UNREF(cl, tcp, reason) \ - tcp_unref((cl), (tcp), (reason), __FILE__, __LINE__) +#define TCP_UNREF(tcp, reason) tcp_unref((tcp), (reason), __FILE__, __LINE__) #define TCP_REF(tcp, reason) tcp_ref((tcp), (reason), __FILE__, __LINE__) -static void tcp_unref(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp, - const char *reason, const char *file, int line) { +static void tcp_unref(grpc_tcp *tcp, const char *reason, const char *file, + int line) { if (GRPC_TRACER_ON(grpc_tcp_trace)) { gpr_atm val = gpr_atm_no_barrier_load(&tcp->refcount.count); gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, @@ -317,7 +306,7 @@ static void tcp_unref(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp, val - 1); } if (gpr_unref(&tcp->refcount)) { - tcp_free(exec_ctx, tcp); + tcp_free(tcp); } } @@ -332,26 +321,25 @@ static void tcp_ref(grpc_tcp *tcp, const char *reason, const char *file, gpr_ref(&tcp->refcount); } #else -#define TCP_UNREF(cl, tcp, reason) tcp_unref((cl), (tcp)) +#define TCP_UNREF(tcp, reason) tcp_unref((tcp)) #define TCP_REF(tcp, reason) tcp_ref((tcp)) -static void tcp_unref(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { +static void tcp_unref(grpc_tcp *tcp) { if (gpr_unref(&tcp->refcount)) { - tcp_free(exec_ctx, tcp); + tcp_free(tcp); } } static void tcp_ref(grpc_tcp *tcp) { gpr_ref(&tcp->refcount); } #endif -static void tcp_destroy(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep) { +static void tcp_destroy(grpc_endpoint *ep) { grpc_network_status_unregister_endpoint(ep); grpc_tcp *tcp = (grpc_tcp *)ep; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &tcp->last_read_buffer); - TCP_UNREF(exec_ctx, tcp, "destroy"); + grpc_slice_buffer_reset_and_unref_internal(&tcp->last_read_buffer); + TCP_UNREF(tcp, "destroy"); } -static void call_read_cb(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp, - grpc_error *error) { +static void call_read_cb(grpc_tcp *tcp, grpc_error *error) { grpc_closure *cb = tcp->read_cb; if (GRPC_TRACER_ON(grpc_tcp_trace)) { @@ -370,11 +358,11 @@ static void call_read_cb(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp, tcp->read_cb = NULL; tcp->incoming_buffer = NULL; - GRPC_CLOSURE_RUN(exec_ctx, cb, error); + GRPC_CLOSURE_RUN(cb, error); } #define MAX_READ_IOVEC 4 -static void tcp_do_read(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { +static void tcp_do_read(grpc_tcp *tcp) { struct msghdr msg; struct iovec iov[MAX_READ_IOVEC]; ssize_t read_bytes; @@ -397,12 +385,12 @@ static void tcp_do_read(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { msg.msg_controllen = 0; msg.msg_flags = 0; - GRPC_STATS_INC_TCP_READ_OFFER(exec_ctx, tcp->incoming_buffer->length); - GRPC_STATS_INC_TCP_READ_OFFER_IOV_SIZE(exec_ctx, tcp->incoming_buffer->count); + GRPC_STATS_INC_TCP_READ_OFFER(tcp->incoming_buffer->length); + GRPC_STATS_INC_TCP_READ_OFFER_IOV_SIZE(tcp->incoming_buffer->count); GPR_TIMER_BEGIN("recvmsg", 0); do { - GRPC_STATS_INC_SYSCALL_READ(exec_ctx); + GRPC_STATS_INC_SYSCALL_READ(); read_bytes = recvmsg(tcp->fd, &msg, 0); } while (read_bytes < 0 && errno == EINTR); GPR_TIMER_END("recvmsg", read_bytes >= 0); @@ -413,24 +401,22 @@ static void tcp_do_read(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { if (errno == EAGAIN) { finish_estimate(tcp); /* We've consumed the edge, request a new one */ - notify_on_read(exec_ctx, tcp); + notify_on_read(tcp); } else { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, - tcp->incoming_buffer); - call_read_cb(exec_ctx, tcp, + grpc_slice_buffer_reset_and_unref_internal(tcp->incoming_buffer); + call_read_cb(tcp, tcp_annotate_error(GRPC_OS_ERROR(errno, "recvmsg"), tcp)); - TCP_UNREF(exec_ctx, tcp, "read"); + TCP_UNREF(tcp, "read"); } } else if (read_bytes == 0) { /* 0 read size ==> end of stream */ - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, tcp->incoming_buffer); + grpc_slice_buffer_reset_and_unref_internal(tcp->incoming_buffer); call_read_cb( - exec_ctx, tcp, - tcp_annotate_error( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Socket closed"), tcp)); - TCP_UNREF(exec_ctx, tcp, "read"); + tcp, tcp_annotate_error( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Socket closed"), tcp)); + TCP_UNREF(tcp, "read"); } else { - GRPC_STATS_INC_TCP_READ_SIZE(exec_ctx, read_bytes); + GRPC_STATS_INC_TCP_READ_SIZE(read_bytes); add_to_estimate(tcp, (size_t)read_bytes); GPR_ASSERT((size_t)read_bytes <= tcp->incoming_buffer->length); if ((size_t)read_bytes < tcp->incoming_buffer->length) { @@ -440,50 +426,47 @@ static void tcp_do_read(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { &tcp->last_read_buffer); } GPR_ASSERT((size_t)read_bytes == tcp->incoming_buffer->length); - call_read_cb(exec_ctx, tcp, GRPC_ERROR_NONE); - TCP_UNREF(exec_ctx, tcp, "read"); + call_read_cb(tcp, GRPC_ERROR_NONE); + TCP_UNREF(tcp, "read"); } GPR_TIMER_END("tcp_continue_read", 0); } -static void tcp_read_allocation_done(grpc_exec_ctx *exec_ctx, void *tcpp, - grpc_error *error) { +static void tcp_read_allocation_done(void *tcpp, grpc_error *error) { grpc_tcp *tcp = (grpc_tcp *)tcpp; if (GRPC_TRACER_ON(grpc_tcp_trace)) { gpr_log(GPR_DEBUG, "TCP:%p read_allocation_done: %s", tcp, grpc_error_string(error)); } if (error != GRPC_ERROR_NONE) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, tcp->incoming_buffer); - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, - &tcp->last_read_buffer); - call_read_cb(exec_ctx, tcp, GRPC_ERROR_REF(error)); - TCP_UNREF(exec_ctx, tcp, "read"); + grpc_slice_buffer_reset_and_unref_internal(tcp->incoming_buffer); + grpc_slice_buffer_reset_and_unref_internal(&tcp->last_read_buffer); + call_read_cb(tcp, GRPC_ERROR_REF(error)); + TCP_UNREF(tcp, "read"); } else { - tcp_do_read(exec_ctx, tcp); + tcp_do_read(tcp); } } -static void tcp_continue_read(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { +static void tcp_continue_read(grpc_tcp *tcp) { size_t target_read_size = get_target_read_size(tcp); if (tcp->incoming_buffer->length < target_read_size && tcp->incoming_buffer->count < MAX_READ_IOVEC) { if (GRPC_TRACER_ON(grpc_tcp_trace)) { gpr_log(GPR_DEBUG, "TCP:%p alloc_slices", tcp); } - grpc_resource_user_alloc_slices(exec_ctx, &tcp->slice_allocator, - target_read_size, 1, tcp->incoming_buffer); + grpc_resource_user_alloc_slices(&tcp->slice_allocator, target_read_size, 1, + tcp->incoming_buffer); } else { if (GRPC_TRACER_ON(grpc_tcp_trace)) { gpr_log(GPR_DEBUG, "TCP:%p do_read", tcp); } - tcp_do_read(exec_ctx, tcp); + tcp_do_read(tcp); } } -static void tcp_handle_read(grpc_exec_ctx *exec_ctx, void *arg /* grpc_tcp */, - grpc_error *error) { +static void tcp_handle_read(void *arg /* grpc_tcp */, grpc_error *error) { grpc_tcp *tcp = (grpc_tcp *)arg; GPR_ASSERT(!tcp->finished_edge); if (GRPC_TRACER_ON(grpc_tcp_trace)) { @@ -491,37 +474,35 @@ static void tcp_handle_read(grpc_exec_ctx *exec_ctx, void *arg /* grpc_tcp */, } if (error != GRPC_ERROR_NONE) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, tcp->incoming_buffer); - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, - &tcp->last_read_buffer); - call_read_cb(exec_ctx, tcp, GRPC_ERROR_REF(error)); - TCP_UNREF(exec_ctx, tcp, "read"); + grpc_slice_buffer_reset_and_unref_internal(tcp->incoming_buffer); + grpc_slice_buffer_reset_and_unref_internal(&tcp->last_read_buffer); + call_read_cb(tcp, GRPC_ERROR_REF(error)); + TCP_UNREF(tcp, "read"); } else { - tcp_continue_read(exec_ctx, tcp); + tcp_continue_read(tcp); } } -static void tcp_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_slice_buffer *incoming_buffer, grpc_closure *cb) { +static void tcp_read(grpc_endpoint *ep, grpc_slice_buffer *incoming_buffer, + grpc_closure *cb) { grpc_tcp *tcp = (grpc_tcp *)ep; GPR_ASSERT(tcp->read_cb == NULL); tcp->read_cb = cb; tcp->incoming_buffer = incoming_buffer; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, incoming_buffer); + grpc_slice_buffer_reset_and_unref_internal(incoming_buffer); grpc_slice_buffer_swap(incoming_buffer, &tcp->last_read_buffer); TCP_REF(tcp, "read"); if (tcp->finished_edge) { tcp->finished_edge = false; - notify_on_read(exec_ctx, tcp); + notify_on_read(tcp); } else { - GRPC_CLOSURE_SCHED(exec_ctx, &tcp->read_done_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&tcp->read_done_closure, GRPC_ERROR_NONE); } } /* returns true if done, false if pending; if returning true, *error is set */ #define MAX_WRITE_IOVEC 1000 -static bool tcp_flush(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp, - grpc_error **error) { +static bool tcp_flush(grpc_tcp *tcp, grpc_error **error) { struct msghdr msg; struct iovec iov[MAX_WRITE_IOVEC]; msg_iovlen_type iov_size; @@ -560,13 +541,13 @@ static bool tcp_flush(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp, msg.msg_controllen = 0; msg.msg_flags = 0; - GRPC_STATS_INC_TCP_WRITE_SIZE(exec_ctx, sending_length); - GRPC_STATS_INC_TCP_WRITE_IOV_SIZE(exec_ctx, iov_size); + GRPC_STATS_INC_TCP_WRITE_SIZE(sending_length); + GRPC_STATS_INC_TCP_WRITE_IOV_SIZE(iov_size); GPR_TIMER_BEGIN("sendmsg", 1); do { /* TODO(klempner): Cork if this is a partial write */ - GRPC_STATS_INC_SYSCALL_WRITE(exec_ctx); + GRPC_STATS_INC_SYSCALL_WRITE(); sent_length = sendmsg(tcp->fd, &msg, SENDMSG_FLAGS); } while (sent_length < 0 && errno == EINTR); GPR_TIMER_END("sendmsg", 0); @@ -610,24 +591,23 @@ static bool tcp_flush(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp, }; } -static void tcp_handle_write(grpc_exec_ctx *exec_ctx, void *arg /* grpc_tcp */, - grpc_error *error) { +static void tcp_handle_write(void *arg /* grpc_tcp */, grpc_error *error) { grpc_tcp *tcp = (grpc_tcp *)arg; grpc_closure *cb; if (error != GRPC_ERROR_NONE) { cb = tcp->write_cb; tcp->write_cb = NULL; - cb->cb(exec_ctx, cb->cb_arg, error); - TCP_UNREF(exec_ctx, tcp, "write"); + cb->cb(cb->cb_arg, error); + TCP_UNREF(tcp, "write"); return; } - if (!tcp_flush(exec_ctx, tcp, &error)) { + if (!tcp_flush(tcp, &error)) { if (GRPC_TRACER_ON(grpc_tcp_trace)) { gpr_log(GPR_DEBUG, "write: delayed"); } - notify_on_write(exec_ctx, tcp); + notify_on_write(tcp); } else { cb = tcp->write_cb; tcp->write_cb = NULL; @@ -636,13 +616,13 @@ static void tcp_handle_write(grpc_exec_ctx *exec_ctx, void *arg /* grpc_tcp */, gpr_log(GPR_DEBUG, "write: %s", str); } - GRPC_CLOSURE_RUN(exec_ctx, cb, error); - TCP_UNREF(exec_ctx, tcp, "write"); + GRPC_CLOSURE_RUN(cb, error); + TCP_UNREF(tcp, "write"); } } -static void tcp_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_slice_buffer *buf, grpc_closure *cb) { +static void tcp_write(grpc_endpoint *ep, grpc_slice_buffer *buf, + grpc_closure *cb) { grpc_tcp *tcp = (grpc_tcp *)ep; grpc_error *error = GRPC_ERROR_NONE; @@ -663,45 +643,43 @@ static void tcp_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, if (buf->length == 0) { GPR_TIMER_END("tcp_write", 0); GRPC_CLOSURE_SCHED( - exec_ctx, cb, - grpc_fd_is_shutdown(tcp->em_fd) - ? tcp_annotate_error(GRPC_ERROR_CREATE_FROM_STATIC_STRING("EOF"), - tcp) - : GRPC_ERROR_NONE); + cb, grpc_fd_is_shutdown(tcp->em_fd) + ? tcp_annotate_error( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("EOF"), tcp) + : GRPC_ERROR_NONE); return; } tcp->outgoing_buffer = buf; tcp->outgoing_slice_idx = 0; tcp->outgoing_byte_idx = 0; - if (!tcp_flush(exec_ctx, tcp, &error)) { + if (!tcp_flush(tcp, &error)) { TCP_REF(tcp, "write"); tcp->write_cb = cb; if (GRPC_TRACER_ON(grpc_tcp_trace)) { gpr_log(GPR_DEBUG, "write: delayed"); } - notify_on_write(exec_ctx, tcp); + notify_on_write(tcp); } else { if (GRPC_TRACER_ON(grpc_tcp_trace)) { const char *str = grpc_error_string(error); gpr_log(GPR_DEBUG, "write: %s", str); } - GRPC_CLOSURE_SCHED(exec_ctx, cb, error); + GRPC_CLOSURE_SCHED(cb, error); } GPR_TIMER_END("tcp_write", 0); } -static void tcp_add_to_pollset(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_pollset *pollset) { +static void tcp_add_to_pollset(grpc_endpoint *ep, grpc_pollset *pollset) { grpc_tcp *tcp = (grpc_tcp *)ep; - grpc_pollset_add_fd(exec_ctx, pollset, tcp->em_fd); + grpc_pollset_add_fd(pollset, tcp->em_fd); } -static void tcp_add_to_pollset_set(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, +static void tcp_add_to_pollset_set(grpc_endpoint *ep, grpc_pollset_set *pollset_set) { grpc_tcp *tcp = (grpc_tcp *)ep; - grpc_pollset_set_add_fd(exec_ctx, pollset_set, tcp->em_fd); + grpc_pollset_set_add_fd(pollset_set, tcp->em_fd); } static char *tcp_get_peer(grpc_endpoint *ep) { @@ -726,7 +704,7 @@ static const grpc_endpoint_vtable vtable = { #define MAX_CHUNK_SIZE 32 * 1024 * 1024 -grpc_endpoint *grpc_tcp_create(grpc_exec_ctx *exec_ctx, grpc_fd *em_fd, +grpc_endpoint *grpc_tcp_create(grpc_fd *em_fd, const grpc_channel_args *channel_args, const char *peer_string) { int tcp_read_chunk_size = GRPC_TCP_DEFAULT_READ_SLICE_SIZE; @@ -755,7 +733,7 @@ grpc_endpoint *grpc_tcp_create(grpc_exec_ctx *exec_ctx, grpc_fd *em_fd, grpc_channel_arg_get_integer(&channel_args->args[i], options); } else if (0 == strcmp(channel_args->args[i].key, GRPC_ARG_RESOURCE_QUOTA)) { - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); resource_quota = grpc_resource_quota_ref_internal( (grpc_resource_quota *)channel_args->args[i].value.pointer.p); } @@ -792,7 +770,7 @@ grpc_endpoint *grpc_tcp_create(grpc_exec_ctx *exec_ctx, grpc_fd *em_fd, &tcp->slice_allocator, tcp->resource_user, tcp_read_allocation_done, tcp); /* Tell network status tracker about new endpoint */ grpc_network_status_register_endpoint(&tcp->base); - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); return &tcp->base; } @@ -803,15 +781,15 @@ int grpc_tcp_fd(grpc_endpoint *ep) { return grpc_fd_wrapped_fd(tcp->em_fd); } -void grpc_tcp_destroy_and_release_fd(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - int *fd, grpc_closure *done) { +void grpc_tcp_destroy_and_release_fd(grpc_endpoint *ep, int *fd, + grpc_closure *done) { grpc_network_status_unregister_endpoint(ep); grpc_tcp *tcp = (grpc_tcp *)ep; GPR_ASSERT(ep->vtable == &vtable); tcp->release_fd = fd; tcp->release_fd_cb = done; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &tcp->last_read_buffer); - TCP_UNREF(exec_ctx, tcp, "destroy"); + grpc_slice_buffer_reset_and_unref_internal(&tcp->last_read_buffer); + TCP_UNREF(tcp, "destroy"); } #endif diff --git a/src/core/lib/iomgr/tcp_posix.h b/src/core/lib/iomgr/tcp_posix.h index 47e78fa67e6..f79d0fb8a35 100644 --- a/src/core/lib/iomgr/tcp_posix.h +++ b/src/core/lib/iomgr/tcp_posix.h @@ -41,8 +41,7 @@ extern grpc_tracer_flag grpc_tcp_trace; /* Create a tcp endpoint given a file desciptor and a read slice size. Takes ownership of fd. */ -grpc_endpoint *grpc_tcp_create(grpc_exec_ctx *exec_ctx, grpc_fd *fd, - const grpc_channel_args *args, +grpc_endpoint *grpc_tcp_create(grpc_fd *fd, const grpc_channel_args *args, const char *peer_string); /* Return the tcp endpoint's fd, or -1 if this is not available. Does not @@ -54,8 +53,8 @@ int grpc_tcp_fd(grpc_endpoint *ep); /* Destroy the tcp endpoint without closing its fd. *fd will be set and done * will be called when the endpoint is destroyed. * Requires: ep must be a tcp endpoint and fd must not be NULL. */ -void grpc_tcp_destroy_and_release_fd(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - int *fd, grpc_closure *done); +void grpc_tcp_destroy_and_release_fd(grpc_endpoint *ep, int *fd, + grpc_closure *done); #ifdef __cplusplus } diff --git a/src/core/lib/iomgr/tcp_server.h b/src/core/lib/iomgr/tcp_server.h index 8f9ce3819e6..eb6f593501d 100644 --- a/src/core/lib/iomgr/tcp_server.h +++ b/src/core/lib/iomgr/tcp_server.h @@ -43,22 +43,20 @@ typedef struct grpc_tcp_server_acceptor { /* Called for newly connected TCP connections. Takes ownership of acceptor. */ -typedef void (*grpc_tcp_server_cb)(grpc_exec_ctx *exec_ctx, void *arg, - grpc_endpoint *ep, +typedef void (*grpc_tcp_server_cb)(void *arg, grpc_endpoint *ep, grpc_pollset *accepting_pollset, grpc_tcp_server_acceptor *acceptor); /* Create a server, initially not bound to any ports. The caller owns one ref. If shutdown_complete is not NULL, it will be used by grpc_tcp_server_unref() when the ref count reaches zero. */ -grpc_error *grpc_tcp_server_create(grpc_exec_ctx *exec_ctx, - grpc_closure *shutdown_complete, +grpc_error *grpc_tcp_server_create(grpc_closure *shutdown_complete, const grpc_channel_args *args, grpc_tcp_server **server); /* Start listening to bound ports */ -void grpc_tcp_server_start(grpc_exec_ctx *exec_ctx, grpc_tcp_server *server, - grpc_pollset **pollsets, size_t pollset_count, +void grpc_tcp_server_start(grpc_tcp_server *server, grpc_pollset **pollsets, + size_t pollset_count, grpc_tcp_server_cb on_accept_cb, void *cb_arg); /* Add a port to the server, returning the newly allocated port on success, or @@ -96,11 +94,10 @@ void grpc_tcp_server_shutdown_starting_add(grpc_tcp_server *s, /* If the refcount drops to zero, enqueue calls on exec_ctx to shutdown_listeners and delete s. */ -void grpc_tcp_server_unref(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s); +void grpc_tcp_server_unref(grpc_tcp_server *s); /* Shutdown the fds of listeners. */ -void grpc_tcp_server_shutdown_listeners(grpc_exec_ctx *exec_ctx, - grpc_tcp_server *s); +void grpc_tcp_server_shutdown_listeners(grpc_tcp_server *s); #ifdef __cplusplus } diff --git a/src/core/lib/iomgr/tcp_server_posix.cc b/src/core/lib/iomgr/tcp_server_posix.cc index 06612d639cc..a9dcd68cfbd 100644 --- a/src/core/lib/iomgr/tcp_server_posix.cc +++ b/src/core/lib/iomgr/tcp_server_posix.cc @@ -68,8 +68,7 @@ static void init(void) { #endif } -grpc_error *grpc_tcp_server_create(grpc_exec_ctx *exec_ctx, - grpc_closure *shutdown_complete, +grpc_error *grpc_tcp_server_create(grpc_closure *shutdown_complete, const grpc_channel_args *args, grpc_tcp_server **server) { gpr_once_init(&check_init, init); @@ -116,12 +115,12 @@ grpc_error *grpc_tcp_server_create(grpc_exec_ctx *exec_ctx, return GRPC_ERROR_NONE; } -static void finish_shutdown(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s) { +static void finish_shutdown(grpc_tcp_server *s) { gpr_mu_lock(&s->mu); GPR_ASSERT(s->shutdown); gpr_mu_unlock(&s->mu); if (s->shutdown_complete != NULL) { - GRPC_CLOSURE_SCHED(exec_ctx, s->shutdown_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(s->shutdown_complete, GRPC_ERROR_NONE); } gpr_mu_destroy(&s->mu); @@ -131,19 +130,18 @@ static void finish_shutdown(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s) { s->head = sp->next; gpr_free(sp); } - grpc_channel_args_destroy(exec_ctx, s->channel_args); + grpc_channel_args_destroy(s->channel_args); gpr_free(s); } -static void destroyed_port(grpc_exec_ctx *exec_ctx, void *server, - grpc_error *error) { +static void destroyed_port(void *server, grpc_error *error) { grpc_tcp_server *s = (grpc_tcp_server *)server; gpr_mu_lock(&s->mu); s->destroyed_ports++; if (s->destroyed_ports == s->nports) { gpr_mu_unlock(&s->mu); - finish_shutdown(exec_ctx, s); + finish_shutdown(s); } else { GPR_ASSERT(s->destroyed_ports < s->nports); gpr_mu_unlock(&s->mu); @@ -153,7 +151,7 @@ static void destroyed_port(grpc_exec_ctx *exec_ctx, void *server, /* called when all listening endpoints have been shutdown, so no further events will be received on them - at this point it's safe to destroy things */ -static void deactivated_all_ports(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s) { +static void deactivated_all_ports(grpc_tcp_server *s) { /* delete ALL the things */ gpr_mu_lock(&s->mu); @@ -165,17 +163,17 @@ static void deactivated_all_ports(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s) { grpc_unlink_if_unix_domain_socket(&sp->addr); GRPC_CLOSURE_INIT(&sp->destroyed_closure, destroyed_port, s, grpc_schedule_on_exec_ctx); - grpc_fd_orphan(exec_ctx, sp->emfd, &sp->destroyed_closure, NULL, + grpc_fd_orphan(sp->emfd, &sp->destroyed_closure, NULL, false /* already_closed */, "tcp_listener_shutdown"); } gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - finish_shutdown(exec_ctx, s); + finish_shutdown(s); } } -static void tcp_server_destroy(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s) { +static void tcp_server_destroy(grpc_tcp_server *s) { gpr_mu_lock(&s->mu); GPR_ASSERT(!s->shutdown); @@ -185,18 +183,18 @@ static void tcp_server_destroy(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s) { if (s->active_ports) { grpc_tcp_listener *sp; for (sp = s->head; sp; sp = sp->next) { - grpc_fd_shutdown(exec_ctx, sp->emfd, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Server destroyed")); + grpc_fd_shutdown( + sp->emfd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server destroyed")); } gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - deactivated_all_ports(exec_ctx, s); + deactivated_all_ports(s); } } /* event manager callback when reads are ready */ -static void on_read(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *err) { +static void on_read(void *arg, grpc_error *err) { grpc_tcp_listener *sp = (grpc_tcp_listener *)arg; grpc_pollset *read_notifier_pollset; if (err != GRPC_ERROR_NONE) { @@ -222,7 +220,7 @@ static void on_read(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *err) { case EINTR: continue; case EAGAIN: - grpc_fd_notify_on_read(exec_ctx, sp->emfd, &sp->read_closure); + grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); return; default: gpr_mu_lock(&sp->server->mu); @@ -248,7 +246,7 @@ static void on_read(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *err) { grpc_fd *fdobj = grpc_fd_create(fd, name); - grpc_pollset_add_fd(exec_ctx, read_notifier_pollset, fdobj); + grpc_pollset_add_fd(read_notifier_pollset, fdobj); // Create acceptor. grpc_tcp_server_acceptor *acceptor = @@ -258,8 +256,8 @@ static void on_read(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *err) { acceptor->fd_index = sp->fd_index; sp->server->on_accept_cb( - exec_ctx, sp->server->on_accept_cb_arg, - grpc_tcp_create(exec_ctx, fdobj, sp->server->channel_args, addr_str), + sp->server->on_accept_cb_arg, + grpc_tcp_create(fdobj, sp->server->channel_args, addr_str), read_notifier_pollset, acceptor); gpr_free(name); @@ -272,7 +270,7 @@ error: gpr_mu_lock(&sp->server->mu); if (0 == --sp->server->active_ports && sp->server->shutdown) { gpr_mu_unlock(&sp->server->mu); - deactivated_all_ports(exec_ctx, sp->server); + deactivated_all_ports(sp->server); } else { gpr_mu_unlock(&sp->server->mu); } @@ -482,8 +480,8 @@ int grpc_tcp_server_port_fd(grpc_tcp_server *s, unsigned port_index, return -1; } -void grpc_tcp_server_start(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s, - grpc_pollset **pollsets, size_t pollset_count, +void grpc_tcp_server_start(grpc_tcp_server *s, grpc_pollset **pollsets, + size_t pollset_count, grpc_tcp_server_cb on_accept_cb, void *on_accept_cb_arg) { size_t i; @@ -503,20 +501,20 @@ void grpc_tcp_server_start(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s, GPR_ASSERT(GRPC_LOG_IF_ERROR( "clone_port", clone_port(sp, (unsigned)(pollset_count - 1)))); for (i = 0; i < pollset_count; i++) { - grpc_pollset_add_fd(exec_ctx, pollsets[i], sp->emfd); + grpc_pollset_add_fd(pollsets[i], sp->emfd); GRPC_CLOSURE_INIT(&sp->read_closure, on_read, sp, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(exec_ctx, sp->emfd, &sp->read_closure); + grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); s->active_ports++; sp = sp->next; } } else { for (i = 0; i < pollset_count; i++) { - grpc_pollset_add_fd(exec_ctx, pollsets[i], sp->emfd); + grpc_pollset_add_fd(pollsets[i], sp->emfd); } GRPC_CLOSURE_INIT(&sp->read_closure, on_read, sp, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(exec_ctx, sp->emfd, &sp->read_closure); + grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); s->active_ports++; sp = sp->next; } @@ -537,25 +535,24 @@ void grpc_tcp_server_shutdown_starting_add(grpc_tcp_server *s, gpr_mu_unlock(&s->mu); } -void grpc_tcp_server_unref(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s) { +void grpc_tcp_server_unref(grpc_tcp_server *s) { if (gpr_unref(&s->refs)) { - grpc_tcp_server_shutdown_listeners(exec_ctx, s); + grpc_tcp_server_shutdown_listeners(s); gpr_mu_lock(&s->mu); - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &s->shutdown_starting); + GRPC_CLOSURE_LIST_SCHED(&s->shutdown_starting); gpr_mu_unlock(&s->mu); - tcp_server_destroy(exec_ctx, s); + tcp_server_destroy(s); } } -void grpc_tcp_server_shutdown_listeners(grpc_exec_ctx *exec_ctx, - grpc_tcp_server *s) { +void grpc_tcp_server_shutdown_listeners(grpc_tcp_server *s) { gpr_mu_lock(&s->mu); s->shutdown_listeners = true; /* shutdown all fd's */ if (s->active_ports) { grpc_tcp_listener *sp; for (sp = s->head; sp; sp = sp->next) { - grpc_fd_shutdown(exec_ctx, sp->emfd, + grpc_fd_shutdown(sp->emfd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server shutdown")); } } diff --git a/src/core/lib/iomgr/tcp_server_uv.cc b/src/core/lib/iomgr/tcp_server_uv.cc index 348838c495c..fc4b58f81c4 100644 --- a/src/core/lib/iomgr/tcp_server_uv.cc +++ b/src/core/lib/iomgr/tcp_server_uv.cc @@ -73,8 +73,7 @@ struct grpc_tcp_server { grpc_resource_quota *resource_quota; }; -grpc_error *grpc_tcp_server_create(grpc_exec_ctx *exec_ctx, - grpc_closure *shutdown_complete, +grpc_error *grpc_tcp_server_create(grpc_closure *shutdown_complete, const grpc_channel_args *args, grpc_tcp_server **server) { grpc_tcp_server *s = (grpc_tcp_server *)gpr_malloc(sizeof(grpc_tcp_server)); @@ -82,11 +81,11 @@ grpc_error *grpc_tcp_server_create(grpc_exec_ctx *exec_ctx, for (size_t i = 0; i < (args == NULL ? 0 : args->num_args); i++) { if (0 == strcmp(GRPC_ARG_RESOURCE_QUOTA, args->args[i].key)) { if (args->args[i].type == GRPC_ARG_POINTER) { - grpc_resource_quota_unref_internal(exec_ctx, s->resource_quota); + grpc_resource_quota_unref_internal(s->resource_quota); s->resource_quota = grpc_resource_quota_ref_internal( (grpc_resource_quota *)args->args[i].value.pointer.p); } else { - grpc_resource_quota_unref_internal(exec_ctx, s->resource_quota); + grpc_resource_quota_unref_internal(s->resource_quota); gpr_free(s); return GRPC_ERROR_CREATE_FROM_STATIC_STRING( GRPC_ARG_RESOURCE_QUOTA " must be a pointer to a buffer pool"); @@ -119,10 +118,10 @@ void grpc_tcp_server_shutdown_starting_add(grpc_tcp_server *s, GRPC_ERROR_NONE); } -static void finish_shutdown(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s) { +static void finish_shutdown(grpc_tcp_server *s) { GPR_ASSERT(s->shutdown); if (s->shutdown_complete != NULL) { - GRPC_CLOSURE_SCHED(exec_ctx, s->shutdown_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(s->shutdown_complete, GRPC_ERROR_NONE); } while (s->head) { @@ -132,18 +131,18 @@ static void finish_shutdown(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s) { gpr_free(sp->handle); gpr_free(sp); } - grpc_resource_quota_unref_internal(exec_ctx, s->resource_quota); + grpc_resource_quota_unref_internal(s->resource_quota); gpr_free(s); } static void handle_close_callback(uv_handle_t *handle) { grpc_tcp_listener *sp = (grpc_tcp_listener *)handle->data; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; sp->server->open_ports--; if (sp->server->open_ports == 0 && sp->server->shutdown) { - finish_shutdown(&exec_ctx, sp->server); + finish_shutdown(sp->server); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void close_listener(grpc_tcp_listener *sp) { @@ -153,7 +152,7 @@ static void close_listener(grpc_tcp_listener *sp) { } } -static void tcp_server_destroy(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s) { +static void tcp_server_destroy(grpc_tcp_server *s) { int immediately_done = 0; grpc_tcp_listener *sp; @@ -168,15 +167,15 @@ static void tcp_server_destroy(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s) { } if (immediately_done) { - finish_shutdown(exec_ctx, s); + finish_shutdown(s); } } -void grpc_tcp_server_unref(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s) { +void grpc_tcp_server_unref(grpc_tcp_server *s) { GRPC_UV_ASSERT_SAME_THREAD(); if (gpr_unref(&s->refs)) { /* Complete shutdown_starting work before destroying. */ - grpc_exec_ctx local_exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_exec_ctx local_ExecCtx _local_exec_ctx; GRPC_CLOSURE_LIST_SCHED(&local_exec_ctx, &s->shutdown_starting); if (exec_ctx == NULL) { grpc_exec_ctx_flush(&local_exec_ctx); @@ -184,12 +183,12 @@ void grpc_tcp_server_unref(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s) { grpc_exec_ctx_finish(&local_exec_ctx); } else { grpc_exec_ctx_finish(&local_exec_ctx); - tcp_server_destroy(exec_ctx, s); + tcp_server_destroy(s); } } } -static void finish_accept(grpc_exec_ctx *exec_ctx, grpc_tcp_listener *sp) { +static void finish_accept(grpc_tcp_listener *sp) { grpc_tcp_server_acceptor *acceptor = (grpc_tcp_server_acceptor *)gpr_malloc(sizeof(*acceptor)); uv_tcp_t *client = NULL; @@ -225,14 +224,13 @@ static void finish_accept(grpc_exec_ctx *exec_ctx, grpc_tcp_listener *sp) { acceptor->from_server = sp->server; acceptor->port_index = sp->port_index; acceptor->fd_index = 0; - sp->server->on_accept_cb(exec_ctx, sp->server->on_accept_cb_arg, ep, NULL, - acceptor); + sp->server->on_accept_cb(sp->server->on_accept_cb_arg, ep, NULL, acceptor); gpr_free(peer_name_string); } static void on_connect(uv_stream_t *server, int status) { grpc_tcp_listener *sp = (grpc_tcp_listener *)server->data; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; if (status < 0) { switch (status) { @@ -253,11 +251,11 @@ static void on_connect(uv_stream_t *server, int status) { // Create acceptor. if (sp->server->on_accept_cb) { - finish_accept(&exec_ctx, sp); + finish_accept(sp); } else { sp->has_pending_connection = true; } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static grpc_error *add_socket_to_server(grpc_tcp_server *s, uv_tcp_t *handle, @@ -428,8 +426,8 @@ grpc_error *grpc_tcp_server_add_port(grpc_tcp_server *s, return error; } -void grpc_tcp_server_start(grpc_exec_ctx *exec_ctx, grpc_tcp_server *server, - grpc_pollset **pollsets, size_t pollset_count, +void grpc_tcp_server_start(grpc_tcp_server *server, grpc_pollset **pollsets, + size_t pollset_count, grpc_tcp_server_cb on_accept_cb, void *cb_arg) { grpc_tcp_listener *sp; (void)pollsets; @@ -444,13 +442,12 @@ void grpc_tcp_server_start(grpc_exec_ctx *exec_ctx, grpc_tcp_server *server, server->on_accept_cb_arg = cb_arg; for (sp = server->head; sp; sp = sp->next) { if (sp->has_pending_connection) { - finish_accept(exec_ctx, sp); + finish_accept(sp); sp->has_pending_connection = false; } } } -void grpc_tcp_server_shutdown_listeners(grpc_exec_ctx *exec_ctx, - grpc_tcp_server *s) {} +void grpc_tcp_server_shutdown_listeners(grpc_tcp_server *s) {} #endif /* GRPC_UV */ diff --git a/src/core/lib/iomgr/tcp_server_windows.cc b/src/core/lib/iomgr/tcp_server_windows.cc index f198aaaa5ba..4dfb17229a7 100644 --- a/src/core/lib/iomgr/tcp_server_windows.cc +++ b/src/core/lib/iomgr/tcp_server_windows.cc @@ -94,8 +94,7 @@ struct grpc_tcp_server { /* Public function. Allocates the proper data structures to hold a grpc_tcp_server. */ -grpc_error *grpc_tcp_server_create(grpc_exec_ctx *exec_ctx, - grpc_closure *shutdown_complete, +grpc_error *grpc_tcp_server_create(grpc_closure *shutdown_complete, const grpc_channel_args *args, grpc_tcp_server **server) { grpc_tcp_server *s = (grpc_tcp_server *)gpr_malloc(sizeof(grpc_tcp_server)); @@ -114,8 +113,7 @@ grpc_error *grpc_tcp_server_create(grpc_exec_ctx *exec_ctx, return GRPC_ERROR_NONE; } -static void destroy_server(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void destroy_server(void *arg, grpc_error *error) { grpc_tcp_server *s = (grpc_tcp_server *)arg; /* Now that the accepts have been aborted, we can destroy the sockets. @@ -128,19 +126,18 @@ static void destroy_server(grpc_exec_ctx *exec_ctx, void *arg, grpc_winsocket_destroy(sp->socket); gpr_free(sp); } - grpc_channel_args_destroy(exec_ctx, s->channel_args); + grpc_channel_args_destroy(s->channel_args); gpr_free(s); } -static void finish_shutdown_locked(grpc_exec_ctx *exec_ctx, - grpc_tcp_server *s) { +static void finish_shutdown_locked(grpc_tcp_server *s) { if (s->shutdown_complete != NULL) { - GRPC_CLOSURE_SCHED(exec_ctx, s->shutdown_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(s->shutdown_complete, GRPC_ERROR_NONE); } - GRPC_CLOSURE_SCHED(exec_ctx, GRPC_CLOSURE_CREATE(destroy_server, s, - grpc_schedule_on_exec_ctx), - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED( + GRPC_CLOSURE_CREATE(destroy_server, s, grpc_schedule_on_exec_ctx), + GRPC_ERROR_NONE); } grpc_tcp_server *grpc_tcp_server_ref(grpc_tcp_server *s) { @@ -156,14 +153,14 @@ void grpc_tcp_server_shutdown_starting_add(grpc_tcp_server *s, gpr_mu_unlock(&s->mu); } -static void tcp_server_destroy(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s) { +static void tcp_server_destroy(grpc_tcp_server *s) { grpc_tcp_listener *sp; gpr_mu_lock(&s->mu); /* First, shutdown all fd's. This will queue abortion calls for all of the pending accepts due to the normal operation mechanism. */ if (s->active_ports == 0) { - finish_shutdown_locked(exec_ctx, s); + finish_shutdown_locked(s); } else { for (sp = s->head; sp; sp = sp->next) { sp->shutting_down = 1; @@ -173,13 +170,13 @@ static void tcp_server_destroy(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s) { gpr_mu_unlock(&s->mu); } -void grpc_tcp_server_unref(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s) { +void grpc_tcp_server_unref(grpc_tcp_server *s) { if (gpr_unref(&s->refs)) { - grpc_tcp_server_shutdown_listeners(exec_ctx, s); + grpc_tcp_server_shutdown_listeners(s); gpr_mu_lock(&s->mu); - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &s->shutdown_starting); + GRPC_CLOSURE_LIST_SCHED(&s->shutdown_starting); gpr_mu_unlock(&s->mu); - tcp_server_destroy(exec_ctx, s); + tcp_server_destroy(s); } } @@ -233,19 +230,17 @@ failure: return error; } -static void decrement_active_ports_and_notify_locked(grpc_exec_ctx *exec_ctx, - grpc_tcp_listener *sp) { +static void decrement_active_ports_and_notify_locked(grpc_tcp_listener *sp) { sp->shutting_down = 0; GPR_ASSERT(sp->server->active_ports > 0); if (0 == --sp->server->active_ports) { - finish_shutdown_locked(exec_ctx, sp->server); + finish_shutdown_locked(sp->server); } } /* In order to do an async accept, we need to create a socket first which will be the one assigned to the new incoming connection. */ -static grpc_error *start_accept_locked(grpc_exec_ctx *exec_ctx, - grpc_tcp_listener *port) { +static grpc_error *start_accept_locked(grpc_tcp_listener *port) { SOCKET sock = INVALID_SOCKET; BOOL success; DWORD addrlen = sizeof(struct sockaddr_in6) + 16; @@ -284,7 +279,7 @@ static grpc_error *start_accept_locked(grpc_exec_ctx *exec_ctx, /* We're ready to do the accept. Calling grpc_socket_notify_on_read may immediately process an accept that happened in the meantime. */ port->new_socket = sock; - grpc_socket_notify_on_read(exec_ctx, port->socket, &port->on_accept); + grpc_socket_notify_on_read(port->socket, &port->on_accept); port->outstanding_calls++; return error; @@ -295,7 +290,7 @@ failure: } /* Event manager callback when reads are ready. */ -static void on_accept(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void on_accept(void *arg, grpc_error *error) { grpc_tcp_listener *sp = (grpc_tcp_listener *)arg; SOCKET sock = sp->new_socket; grpc_winsocket_callback_info *info = &sp->socket->read_info; @@ -357,7 +352,7 @@ static void on_accept(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { gpr_free(utf8_message); } gpr_asprintf(&fd_name, "tcp_server:%s", peer_name_string); - ep = grpc_tcp_create(exec_ctx, grpc_winsocket_create(sock, fd_name), + ep = grpc_tcp_create(grpc_winsocket_create(sock, fd_name), sp->server->channel_args, peer_name_string); gpr_free(fd_name); gpr_free(peer_name_string); @@ -375,17 +370,15 @@ static void on_accept(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { acceptor->from_server = sp->server; acceptor->port_index = sp->port_index; acceptor->fd_index = 0; - sp->server->on_accept_cb(exec_ctx, sp->server->on_accept_cb_arg, ep, NULL, - acceptor); + sp->server->on_accept_cb(sp->server->on_accept_cb_arg, ep, NULL, acceptor); } /* As we were notified from the IOCP of one and exactly one accept, the former socked we created has now either been destroy or assigned to the new connection. We need to create a new one for the next connection. */ - GPR_ASSERT( - GRPC_LOG_IF_ERROR("start_accept", start_accept_locked(exec_ctx, sp))); + GPR_ASSERT(GRPC_LOG_IF_ERROR("start_accept", start_accept_locked(sp))); if (0 == --sp->outstanding_calls) { - decrement_active_ports_and_notify_locked(exec_ctx, sp); + decrement_active_ports_and_notify_locked(sp); } gpr_mu_unlock(&sp->server->mu); } @@ -522,8 +515,8 @@ done: return error; } -void grpc_tcp_server_start(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s, - grpc_pollset **pollset, size_t pollset_count, +void grpc_tcp_server_start(grpc_tcp_server *s, grpc_pollset **pollset, + size_t pollset_count, grpc_tcp_server_cb on_accept_cb, void *on_accept_cb_arg) { grpc_tcp_listener *sp; @@ -534,14 +527,12 @@ void grpc_tcp_server_start(grpc_exec_ctx *exec_ctx, grpc_tcp_server *s, s->on_accept_cb = on_accept_cb; s->on_accept_cb_arg = on_accept_cb_arg; for (sp = s->head; sp; sp = sp->next) { - GPR_ASSERT( - GRPC_LOG_IF_ERROR("start_accept", start_accept_locked(exec_ctx, sp))); + GPR_ASSERT(GRPC_LOG_IF_ERROR("start_accept", start_accept_locked(sp))); s->active_ports++; } gpr_mu_unlock(&s->mu); } -void grpc_tcp_server_shutdown_listeners(grpc_exec_ctx *exec_ctx, - grpc_tcp_server *s) {} +void grpc_tcp_server_shutdown_listeners(grpc_tcp_server *s) {} #endif /* GRPC_WINSOCK_SOCKET */ diff --git a/src/core/lib/iomgr/tcp_uv.cc b/src/core/lib/iomgr/tcp_uv.cc index e311964dbcf..3628e1cc2c7 100644 --- a/src/core/lib/iomgr/tcp_uv.cc +++ b/src/core/lib/iomgr/tcp_uv.cc @@ -65,20 +65,19 @@ typedef struct { grpc_pollset *pollset; } grpc_tcp; -static void tcp_free(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { - grpc_slice_unref_internal(exec_ctx, tcp->read_slice); - grpc_resource_user_unref(exec_ctx, tcp->resource_user); +static void tcp_free(grpc_tcp *tcp) { + grpc_slice_unref_internal(tcp->read_slice); + grpc_resource_user_unref(tcp->resource_user); gpr_free(tcp->handle); gpr_free(tcp->peer_string); gpr_free(tcp); } #ifndef NDEBUG -#define TCP_UNREF(exec_ctx, tcp, reason) \ - tcp_unref((exec_ctx), (tcp), (reason), __FILE__, __LINE__) +#define TCP_UNREF(tcp, reason) tcp_unref((tcp), (reason), __FILE__, __LINE__) #define TCP_REF(tcp, reason) tcp_ref((tcp), (reason), __FILE__, __LINE__) -static void tcp_unref(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp, - const char *reason, const char *file, int line) { +static void tcp_unref(grpc_tcp *tcp, const char *reason, const char *file, + int line) { if (GRPC_TRACER_ON(grpc_tcp_trace)) { gpr_atm val = gpr_atm_no_barrier_load(&tcp->refcount.count); gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, @@ -86,7 +85,7 @@ static void tcp_unref(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp, val - 1); } if (gpr_unref(&tcp->refcount)) { - tcp_free(exec_ctx, tcp); + tcp_free(tcp); } } @@ -101,11 +100,11 @@ static void tcp_ref(grpc_tcp *tcp, const char *reason, const char *file, gpr_ref(&tcp->refcount); } #else -#define TCP_UNREF(exec_ctx, tcp, reason) tcp_unref((exec_ctx), (tcp)) +#define TCP_UNREF(tcp, reason) tcp_unref((tcp)) #define TCP_REF(tcp, reason) tcp_ref((tcp)) -static void tcp_unref(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { +static void tcp_unref(grpc_tcp *tcp) { if (gpr_unref(&tcp->refcount)) { - tcp_free(exec_ctx, tcp); + tcp_free(tcp); } } @@ -113,40 +112,39 @@ static void tcp_ref(grpc_tcp *tcp) { gpr_ref(&tcp->refcount); } #endif static void uv_close_callback(uv_handle_t *handle) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_tcp *tcp = (grpc_tcp *)handle->data; - TCP_UNREF(&exec_ctx, tcp, "destroy"); - grpc_exec_ctx_finish(&exec_ctx); + TCP_UNREF(tcp, "destroy"); + grpc_exec_ctx_finish(); } -static grpc_slice alloc_read_slice(grpc_exec_ctx *exec_ctx, - grpc_resource_user *resource_user) { - return grpc_resource_user_slice_malloc(exec_ctx, resource_user, +static grpc_slice alloc_read_slice(grpc_resource_user *resource_user) { + return grpc_resource_user_slice_malloc(resource_user, GRPC_TCP_DEFAULT_READ_SLICE_SIZE); } static void alloc_uv_buf(uv_handle_t *handle, size_t suggested_size, uv_buf_t *buf) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_tcp *tcp = (grpc_tcp *)handle->data; (void)suggested_size; buf->base = (char *)GRPC_SLICE_START_PTR(tcp->read_slice); buf->len = GRPC_SLICE_LENGTH(tcp->read_slice); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void read_callback(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf) { grpc_slice sub; grpc_error *error; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_tcp *tcp = (grpc_tcp *)stream->data; grpc_closure *cb = tcp->read_cb; if (nread == 0) { // Nothing happened. Wait for the next callback return; } - TCP_UNREF(&exec_ctx, tcp, "read"); + TCP_UNREF(tcp, "read"); tcp->read_cb = NULL; // TODO(murgatroid99): figure out what the return value here means uv_read_stop(stream); @@ -156,7 +154,7 @@ static void read_callback(uv_stream_t *stream, ssize_t nread, // Successful read sub = grpc_slice_sub_no_ref(tcp->read_slice, 0, (size_t)nread); grpc_slice_buffer_add(tcp->read_slices, sub); - tcp->read_slice = alloc_read_slice(&exec_ctx, tcp->resource_user); + tcp->read_slice = alloc_read_slice(tcp->resource_user); error = GRPC_ERROR_NONE; if (GRPC_TRACER_ON(grpc_tcp_trace)) { size_t i; @@ -175,12 +173,12 @@ static void read_callback(uv_stream_t *stream, ssize_t nread, // nread < 0: Error error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("TCP Read failed"); } - GRPC_CLOSURE_SCHED(&exec_ctx, cb, error); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_CLOSURE_SCHED(cb, error); + grpc_exec_ctx_finish(); } -static void uv_endpoint_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_slice_buffer *read_slices, grpc_closure *cb) { +static void uv_endpoint_read(grpc_endpoint *ep, grpc_slice_buffer *read_slices, + grpc_closure *cb) { grpc_tcp *tcp = (grpc_tcp *)ep; int status; grpc_error *error = GRPC_ERROR_NONE; @@ -188,7 +186,7 @@ static void uv_endpoint_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, GPR_ASSERT(tcp->read_cb == NULL); tcp->read_cb = cb; tcp->read_slices = read_slices; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, read_slices); + grpc_slice_buffer_reset_and_unref_internal(read_slices); TCP_REF(tcp, "read"); // TODO(murgatroid99): figure out what the return value here means status = @@ -198,7 +196,7 @@ static void uv_endpoint_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, error = grpc_error_set_str(error, GRPC_ERROR_STR_OS_ERROR, grpc_slice_from_static_string(uv_strerror(status))); - GRPC_CLOSURE_SCHED(exec_ctx, cb, error); + GRPC_CLOSURE_SCHED(cb, error); } if (GRPC_TRACER_ON(grpc_tcp_trace)) { const char *str = grpc_error_string(error); @@ -209,10 +207,10 @@ static void uv_endpoint_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, static void write_callback(uv_write_t *req, int status) { grpc_tcp *tcp = (grpc_tcp *)req->data; grpc_error *error; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_closure *cb = tcp->write_cb; tcp->write_cb = NULL; - TCP_UNREF(&exec_ctx, tcp, "write"); + TCP_UNREF(tcp, "write"); if (status == 0) { error = GRPC_ERROR_NONE; } else { @@ -223,13 +221,13 @@ static void write_callback(uv_write_t *req, int status) { gpr_log(GPR_DEBUG, "write complete on %p: error=%s", tcp, str); } gpr_free(tcp->write_buffers); - grpc_resource_user_free(&exec_ctx, tcp->resource_user, + grpc_resource_user_free(tcp->resource_user, sizeof(uv_buf_t) * tcp->write_slices->count); - GRPC_CLOSURE_SCHED(&exec_ctx, cb, error); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_CLOSURE_SCHED(cb, error); + grpc_exec_ctx_finish(); } -static void uv_endpoint_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, +static void uv_endpoint_write(grpc_endpoint *ep, grpc_slice_buffer *write_slices, grpc_closure *cb) { grpc_tcp *tcp = (grpc_tcp *)ep; @@ -252,8 +250,8 @@ static void uv_endpoint_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, } if (tcp->shutting_down) { - GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "TCP socket is shutting down")); + GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "TCP socket is shutting down")); return; } @@ -263,15 +261,15 @@ static void uv_endpoint_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, if (tcp->write_slices->count == 0) { // No slices means we don't have to do anything, // and libuv doesn't like empty writes - GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); return; } tcp->write_cb = cb; buffer_count = (unsigned int)tcp->write_slices->count; buffers = (uv_buf_t *)gpr_malloc(sizeof(uv_buf_t) * buffer_count); - grpc_resource_user_alloc(exec_ctx, tcp->resource_user, - sizeof(uv_buf_t) * buffer_count, NULL); + grpc_resource_user_alloc(tcp->resource_user, sizeof(uv_buf_t) * buffer_count, + NULL); for (i = 0; i < buffer_count; i++) { slice = &tcp->write_slices->slices[i]; buffers[i].base = (char *)GRPC_SLICE_START_PTR(*slice); @@ -286,8 +284,7 @@ static void uv_endpoint_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, write_callback); } -static void uv_add_to_pollset(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_pollset *pollset) { +static void uv_add_to_pollset(grpc_endpoint *ep, grpc_pollset *pollset) { // No-op. We're ignoring pollsets currently (void)exec_ctx; (void)ep; @@ -296,7 +293,7 @@ static void uv_add_to_pollset(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, tcp->pollset = pollset; } -static void uv_add_to_pollset_set(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, +static void uv_add_to_pollset_set(grpc_endpoint *ep, grpc_pollset_set *pollset) { // No-op. We're ignoring pollsets currently (void)exec_ctx; @@ -306,8 +303,7 @@ static void uv_add_to_pollset_set(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, static void shutdown_callback(uv_shutdown_t *req, int status) {} -static void uv_endpoint_shutdown(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_error *why) { +static void uv_endpoint_shutdown(grpc_endpoint *ep, grpc_error *why) { grpc_tcp *tcp = (grpc_tcp *)ep; if (!tcp->shutting_down) { if (GRPC_TRACER_ON(grpc_tcp_trace)) { @@ -317,12 +313,12 @@ static void uv_endpoint_shutdown(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, tcp->shutting_down = true; uv_shutdown_t *req = &tcp->shutdown_req; uv_shutdown(req, (uv_stream_t *)tcp->handle, shutdown_callback); - grpc_resource_user_shutdown(exec_ctx, tcp->resource_user); + grpc_resource_user_shutdown(tcp->resource_user); } GRPC_ERROR_UNREF(why); } -static void uv_destroy(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep) { +static void uv_destroy(grpc_endpoint *ep) { grpc_network_status_unregister_endpoint(ep); grpc_tcp *tcp = (grpc_tcp *)ep; uv_close((uv_handle_t *)tcp->handle, uv_close_callback); @@ -349,7 +345,7 @@ grpc_endpoint *grpc_tcp_create(uv_tcp_t *handle, grpc_resource_quota *resource_quota, char *peer_string) { grpc_tcp *tcp = (grpc_tcp *)gpr_malloc(sizeof(grpc_tcp)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; if (GRPC_TRACER_ON(grpc_tcp_trace)) { gpr_log(GPR_DEBUG, "Creating TCP endpoint %p", tcp); @@ -366,7 +362,7 @@ grpc_endpoint *grpc_tcp_create(uv_tcp_t *handle, tcp->peer_string = gpr_strdup(peer_string); tcp->shutting_down = false; tcp->resource_user = grpc_resource_user_create(resource_quota, peer_string); - tcp->read_slice = alloc_read_slice(&exec_ctx, tcp->resource_user); + tcp->read_slice = alloc_read_slice(tcp->resource_user); /* Tell network status tracking code about the new endpoint */ grpc_network_status_register_endpoint(&tcp->base); @@ -374,7 +370,7 @@ grpc_endpoint *grpc_tcp_create(uv_tcp_t *handle, uv_unref((uv_handle_t *)handle); #endif - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return &tcp->base; } diff --git a/src/core/lib/iomgr/tcp_windows.cc b/src/core/lib/iomgr/tcp_windows.cc index dc84e564a9b..baa0a1895e3 100644 --- a/src/core/lib/iomgr/tcp_windows.cc +++ b/src/core/lib/iomgr/tcp_windows.cc @@ -109,21 +109,20 @@ typedef struct grpc_tcp { char *peer_string; } grpc_tcp; -static void tcp_free(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { +static void tcp_free(grpc_tcp *tcp) { grpc_winsocket_destroy(tcp->socket); gpr_mu_destroy(&tcp->mu); gpr_free(tcp->peer_string); - grpc_resource_user_unref(exec_ctx, tcp->resource_user); + grpc_resource_user_unref(tcp->resource_user); if (tcp->shutting_down) GRPC_ERROR_UNREF(tcp->shutdown_error); gpr_free(tcp); } #ifndef NDEBUG -#define TCP_UNREF(exec_ctx, tcp, reason) \ - tcp_unref((exec_ctx), (tcp), (reason), __FILE__, __LINE__) +#define TCP_UNREF(tcp, reason) tcp_unref((tcp), (reason), __FILE__, __LINE__) #define TCP_REF(tcp, reason) tcp_ref((tcp), (reason), __FILE__, __LINE__) -static void tcp_unref(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp, - const char *reason, const char *file, int line) { +static void tcp_unref(grpc_tcp *tcp, const char *reason, const char *file, + int line) { if (GRPC_TRACER_ON(grpc_tcp_trace)) { gpr_atm val = gpr_atm_no_barrier_load(&tcp->refcount.count); gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, @@ -131,7 +130,7 @@ static void tcp_unref(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp, val - 1); } if (gpr_unref(&tcp->refcount)) { - tcp_free(exec_ctx, tcp); + tcp_free(tcp); } } @@ -146,11 +145,11 @@ static void tcp_ref(grpc_tcp *tcp, const char *reason, const char *file, gpr_ref(&tcp->refcount); } #else -#define TCP_UNREF(exec_ctx, tcp, reason) tcp_unref((exec_ctx), (tcp)) +#define TCP_UNREF(tcp, reason) tcp_unref((tcp)) #define TCP_REF(tcp, reason) tcp_ref((tcp)) -static void tcp_unref(grpc_exec_ctx *exec_ctx, grpc_tcp *tcp) { +static void tcp_unref(grpc_tcp *tcp) { if (gpr_unref(&tcp->refcount)) { - tcp_free(exec_ctx, tcp); + tcp_free(tcp); } } @@ -158,7 +157,7 @@ static void tcp_ref(grpc_tcp *tcp) { gpr_ref(&tcp->refcount); } #endif /* Asynchronous callback from the IOCP, or the background thread. */ -static void on_read(grpc_exec_ctx *exec_ctx, void *tcpp, grpc_error *error) { +static void on_read(void *tcpp, grpc_error *error) { grpc_tcp *tcp = (grpc_tcp *)tcpp; grpc_closure *cb = tcp->read_cb; grpc_winsocket *socket = tcp->socket; @@ -172,13 +171,13 @@ static void on_read(grpc_exec_ctx *exec_ctx, void *tcpp, grpc_error *error) { char *utf8_message = gpr_format_message(info->wsa_error); error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(utf8_message); gpr_free(utf8_message); - grpc_slice_unref_internal(exec_ctx, tcp->read_slice); + grpc_slice_unref_internal(tcp->read_slice); } else { if (info->bytes_transfered != 0 && !tcp->shutting_down) { sub = grpc_slice_sub_no_ref(tcp->read_slice, 0, info->bytes_transfered); grpc_slice_buffer_add(tcp->read_slices, sub); } else { - grpc_slice_unref_internal(exec_ctx, tcp->read_slice); + grpc_slice_unref_internal(tcp->read_slice); error = tcp->shutting_down ? GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "TCP stream shutting down", &tcp->shutdown_error, 1) @@ -188,12 +187,12 @@ static void on_read(grpc_exec_ctx *exec_ctx, void *tcpp, grpc_error *error) { } tcp->read_cb = NULL; - TCP_UNREF(exec_ctx, tcp, "read"); - GRPC_CLOSURE_SCHED(exec_ctx, cb, error); + TCP_UNREF(tcp, "read"); + GRPC_CLOSURE_SCHED(cb, error); } -static void win_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_slice_buffer *read_slices, grpc_closure *cb) { +static void win_read(grpc_endpoint *ep, grpc_slice_buffer *read_slices, + grpc_closure *cb) { grpc_tcp *tcp = (grpc_tcp *)ep; grpc_winsocket *handle = tcp->socket; grpc_winsocket_callback_info *info = &handle->read_info; @@ -204,15 +203,14 @@ static void win_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, if (tcp->shutting_down) { GRPC_CLOSURE_SCHED( - exec_ctx, cb, - GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "TCP socket is shutting down", &tcp->shutdown_error, 1)); + cb, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "TCP socket is shutting down", &tcp->shutdown_error, 1)); return; } tcp->read_cb = cb; tcp->read_slices = read_slices; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, read_slices); + grpc_slice_buffer_reset_and_unref_internal(read_slices); tcp->read_slice = GRPC_SLICE_MALLOC(8192); @@ -230,7 +228,7 @@ static void win_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, /* Did we get data immediately ? Yay. */ if (info->wsa_error != WSAEWOULDBLOCK) { info->bytes_transfered = bytes_read; - GRPC_CLOSURE_SCHED(exec_ctx, &tcp->on_read, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&tcp->on_read, GRPC_ERROR_NONE); return; } @@ -243,17 +241,17 @@ static void win_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, int wsa_error = WSAGetLastError(); if (wsa_error != WSA_IO_PENDING) { info->wsa_error = wsa_error; - GRPC_CLOSURE_SCHED(exec_ctx, &tcp->on_read, + GRPC_CLOSURE_SCHED(&tcp->on_read, GRPC_WSA_ERROR(info->wsa_error, "WSARecv")); return; } } - grpc_socket_notify_on_read(exec_ctx, tcp->socket, &tcp->on_read); + grpc_socket_notify_on_read(tcp->socket, &tcp->on_read); } /* Asynchronous callback from the IOCP, or the background thread. */ -static void on_write(grpc_exec_ctx *exec_ctx, void *tcpp, grpc_error *error) { +static void on_write(void *tcpp, grpc_error *error) { grpc_tcp *tcp = (grpc_tcp *)tcpp; grpc_winsocket *handle = tcp->socket; grpc_winsocket_callback_info *info = &handle->write_info; @@ -274,13 +272,13 @@ static void on_write(grpc_exec_ctx *exec_ctx, void *tcpp, grpc_error *error) { } } - TCP_UNREF(exec_ctx, tcp, "write"); - GRPC_CLOSURE_SCHED(exec_ctx, cb, error); + TCP_UNREF(tcp, "write"); + GRPC_CLOSURE_SCHED(cb, error); } /* Initiates a write. */ -static void win_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_slice_buffer *slices, grpc_closure *cb) { +static void win_write(grpc_endpoint *ep, grpc_slice_buffer *slices, + grpc_closure *cb) { grpc_tcp *tcp = (grpc_tcp *)ep; grpc_winsocket *socket = tcp->socket; grpc_winsocket_callback_info *info = &socket->write_info; @@ -294,9 +292,8 @@ static void win_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, if (tcp->shutting_down) { GRPC_CLOSURE_SCHED( - exec_ctx, cb, - GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "TCP socket is shutting down", &tcp->shutdown_error, 1)); + cb, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "TCP socket is shutting down", &tcp->shutdown_error, 1)); return; } @@ -327,7 +324,7 @@ static void win_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, grpc_error *error = status == 0 ? GRPC_ERROR_NONE : GRPC_WSA_ERROR(info->wsa_error, "WSASend"); - GRPC_CLOSURE_SCHED(exec_ctx, cb, error); + GRPC_CLOSURE_SCHED(cb, error); if (allocated) gpr_free(allocated); return; } @@ -344,27 +341,25 @@ static void win_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, if (status != 0) { int wsa_error = WSAGetLastError(); if (wsa_error != WSA_IO_PENDING) { - TCP_UNREF(exec_ctx, tcp, "write"); - GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_WSA_ERROR(wsa_error, "WSASend")); + TCP_UNREF(tcp, "write"); + GRPC_CLOSURE_SCHED(cb, GRPC_WSA_ERROR(wsa_error, "WSASend")); return; } } /* As all is now setup, we can now ask for the IOCP notification. It may trigger the callback immediately however, but no matter. */ - grpc_socket_notify_on_write(exec_ctx, socket, &tcp->on_write); + grpc_socket_notify_on_write(socket, &tcp->on_write); } -static void win_add_to_pollset(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_pollset *ps) { +static void win_add_to_pollset(grpc_endpoint *ep, grpc_pollset *ps) { grpc_tcp *tcp; (void)ps; tcp = (grpc_tcp *)ep; grpc_iocp_add_socket(tcp->socket); } -static void win_add_to_pollset_set(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_pollset_set *pss) { +static void win_add_to_pollset_set(grpc_endpoint *ep, grpc_pollset_set *pss) { grpc_tcp *tcp; (void)pss; tcp = (grpc_tcp *)ep; @@ -377,8 +372,7 @@ static void win_add_to_pollset_set(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, we're not going to protect against these. However the IO Completion Port callback will happen from another thread, so we need to protect against concurrent access of the data structure in that regard. */ -static void win_shutdown(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_error *why) { +static void win_shutdown(grpc_endpoint *ep, grpc_error *why) { grpc_tcp *tcp = (grpc_tcp *)ep; gpr_mu_lock(&tcp->mu); /* At that point, what may happen is that we're already inside the IOCP @@ -391,13 +385,13 @@ static void win_shutdown(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, } grpc_winsocket_shutdown(tcp->socket); gpr_mu_unlock(&tcp->mu); - grpc_resource_user_shutdown(exec_ctx, tcp->resource_user); + grpc_resource_user_shutdown(tcp->resource_user); } -static void win_destroy(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep) { +static void win_destroy(grpc_endpoint *ep) { grpc_network_status_unregister_endpoint(ep); grpc_tcp *tcp = (grpc_tcp *)ep; - TCP_UNREF(exec_ctx, tcp, "destroy"); + TCP_UNREF(tcp, "destroy"); } static char *win_get_peer(grpc_endpoint *ep) { @@ -417,14 +411,14 @@ static grpc_endpoint_vtable vtable = { win_shutdown, win_destroy, win_get_resource_user, win_get_peer, win_get_fd}; -grpc_endpoint *grpc_tcp_create(grpc_exec_ctx *exec_ctx, grpc_winsocket *socket, +grpc_endpoint *grpc_tcp_create(grpc_winsocket *socket, grpc_channel_args *channel_args, const char *peer_string) { grpc_resource_quota *resource_quota = grpc_resource_quota_create(NULL); if (channel_args != NULL) { for (size_t i = 0; i < channel_args->num_args; i++) { if (0 == strcmp(channel_args->args[i].key, GRPC_ARG_RESOURCE_QUOTA)) { - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); resource_quota = grpc_resource_quota_ref_internal( (grpc_resource_quota *)channel_args->args[i].value.pointer.p); } diff --git a/src/core/lib/iomgr/tcp_windows.h b/src/core/lib/iomgr/tcp_windows.h index f3697f707c7..1e647196e46 100644 --- a/src/core/lib/iomgr/tcp_windows.h +++ b/src/core/lib/iomgr/tcp_windows.h @@ -39,7 +39,7 @@ extern "C" { /* Create a tcp endpoint given a winsock handle. * Takes ownership of the handle. */ -grpc_endpoint *grpc_tcp_create(grpc_exec_ctx *exec_ctx, grpc_winsocket *socket, +grpc_endpoint *grpc_tcp_create(grpc_winsocket *socket, grpc_channel_args *channel_args, const char *peer_string); diff --git a/src/core/lib/iomgr/timer.h b/src/core/lib/iomgr/timer.h index 419e834cf18..6a9c06f2ee4 100644 --- a/src/core/lib/iomgr/timer.h +++ b/src/core/lib/iomgr/timer.h @@ -44,8 +44,8 @@ typedef struct grpc_timer grpc_timer; application code should check the error to determine how it was invoked. The application callback is also responsible for maintaining information about when to free up any user-level state. */ -void grpc_timer_init(grpc_exec_ctx *exec_ctx, grpc_timer *timer, - grpc_millis deadline, grpc_closure *closure); +void grpc_timer_init(grpc_timer *timer, grpc_millis deadline, + grpc_closure *closure); /* Initialize *timer without setting it. This can later be passed through the regular init or cancel */ @@ -77,7 +77,7 @@ void grpc_timer_init_unset(grpc_timer *timer); matches this aim. Requires: cancel() must happen after init() on a given timer */ -void grpc_timer_cancel(grpc_exec_ctx *exec_ctx, grpc_timer *timer); +void grpc_timer_cancel(grpc_timer *timer); /* iomgr internal api for dealing with timers */ @@ -94,10 +94,9 @@ typedef enum { *next is never guaranteed to be updated on any given execution; however, with high probability at least one thread in the system will see an update at any time slice. */ -grpc_timer_check_result grpc_timer_check(grpc_exec_ctx *exec_ctx, - grpc_millis *next); -void grpc_timer_list_init(grpc_exec_ctx *exec_ctx); -void grpc_timer_list_shutdown(grpc_exec_ctx *exec_ctx); +grpc_timer_check_result grpc_timer_check(grpc_millis *next); +void grpc_timer_list_init(); +void grpc_timer_list_shutdown(); /* Consume a kick issued by grpc_kick_poller */ void grpc_timer_consume_kick(void); diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index b8e895de6f0..c8cbd42a0c8 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -227,8 +227,7 @@ static gpr_atm saturating_add(gpr_atm a, gpr_atm b) { return a + b; } -static grpc_timer_check_result run_some_expired_timers(grpc_exec_ctx *exec_ctx, - gpr_atm now, +static grpc_timer_check_result run_some_expired_timers(gpr_atm now, gpr_atm *next, grpc_error *error); @@ -238,13 +237,13 @@ static gpr_atm compute_min_deadline(timer_shard *shard) { : grpc_timer_heap_top(&shard->heap)->deadline; } -void grpc_timer_list_init(grpc_exec_ctx *exec_ctx) { +void grpc_timer_list_init() { uint32_t i; g_shared_mutables.initialized = true; g_shared_mutables.checker_mu = GPR_SPINLOCK_INITIALIZER; gpr_mu_init(&g_shared_mutables.mu); - g_shared_mutables.min_timer = grpc_exec_ctx_now(exec_ctx); + g_shared_mutables.min_timer = grpc_exec_ctx_now(); gpr_tls_init(&g_last_seen_min_timer); gpr_tls_set(&g_last_seen_min_timer, 0); grpc_register_tracer(&grpc_timer_trace); @@ -266,10 +265,10 @@ void grpc_timer_list_init(grpc_exec_ctx *exec_ctx) { INIT_TIMER_HASH_TABLE(); } -void grpc_timer_list_shutdown(grpc_exec_ctx *exec_ctx) { +void grpc_timer_list_shutdown() { int i; run_some_expired_timers( - exec_ctx, GPR_ATM_MAX, NULL, + GPR_ATM_MAX, NULL, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Timer list shutdown")); for (i = 0; i < NUM_SHARDS; i++) { timer_shard *shard = &g_shards[i]; @@ -320,8 +319,8 @@ static void note_deadline_change(timer_shard *shard) { void grpc_timer_init_unset(grpc_timer *timer) { timer->pending = false; } -void grpc_timer_init(grpc_exec_ctx *exec_ctx, grpc_timer *timer, - grpc_millis deadline, grpc_closure *closure) { +void grpc_timer_init(grpc_timer *timer, grpc_millis deadline, + grpc_closure *closure) { int is_first_timer = 0; timer_shard *shard = &g_shards[GPR_HASH_POINTER(timer, NUM_SHARDS)]; timer->closure = closure; @@ -334,12 +333,12 @@ void grpc_timer_init(grpc_exec_ctx *exec_ctx, grpc_timer *timer, if (GRPC_TRACER_ON(grpc_timer_trace)) { gpr_log(GPR_DEBUG, "TIMER %p: SET %" PRIdPTR " now %" PRIdPTR " call %p[%p]", timer, - deadline, grpc_exec_ctx_now(exec_ctx), closure, closure->cb); + deadline, grpc_exec_ctx_now(), closure, closure->cb); } if (!g_shared_mutables.initialized) { timer->pending = false; - GRPC_CLOSURE_SCHED(exec_ctx, timer->closure, + GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Attempt to create timer before initialization")); return; @@ -347,10 +346,10 @@ void grpc_timer_init(grpc_exec_ctx *exec_ctx, grpc_timer *timer, gpr_mu_lock(&shard->mu); timer->pending = true; - grpc_millis now = grpc_exec_ctx_now(exec_ctx); + grpc_millis now = grpc_exec_ctx_now(); if (deadline <= now) { timer->pending = false; - GRPC_CLOSURE_SCHED(exec_ctx, timer->closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_NONE); gpr_mu_unlock(&shard->mu); /* early out */ return; @@ -410,7 +409,7 @@ void grpc_timer_consume_kick(void) { gpr_tls_set(&g_last_seen_min_timer, 0); } -void grpc_timer_cancel(grpc_exec_ctx *exec_ctx, grpc_timer *timer) { +void grpc_timer_cancel(grpc_timer *timer) { if (!g_shared_mutables.initialized) { /* must have already been cancelled, also the shard mutex is invalid */ return; @@ -426,7 +425,7 @@ void grpc_timer_cancel(grpc_exec_ctx *exec_ctx, grpc_timer *timer) { if (timer->pending) { REMOVE_FROM_HASH_TABLE(timer); - GRPC_CLOSURE_SCHED(exec_ctx, timer->closure, GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_CANCELLED); timer->pending = false; if (timer->heap_index == INVALID_HEAP_INDEX) { list_remove(timer); @@ -512,15 +511,14 @@ static grpc_timer *pop_one(timer_shard *shard, gpr_atm now) { } /* REQUIRES: shard->mu unlocked */ -static size_t pop_timers(grpc_exec_ctx *exec_ctx, timer_shard *shard, - gpr_atm now, gpr_atm *new_min_deadline, - grpc_error *error) { +static size_t pop_timers(timer_shard *shard, gpr_atm now, + gpr_atm *new_min_deadline, grpc_error *error) { size_t n = 0; grpc_timer *timer; gpr_mu_lock(&shard->mu); while ((timer = pop_one(shard, now))) { REMOVE_FROM_HASH_TABLE(timer); - GRPC_CLOSURE_SCHED(exec_ctx, timer->closure, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_REF(error)); n++; } *new_min_deadline = compute_min_deadline(shard); @@ -532,8 +530,7 @@ static size_t pop_timers(grpc_exec_ctx *exec_ctx, timer_shard *shard, return n; } -static grpc_timer_check_result run_some_expired_timers(grpc_exec_ctx *exec_ctx, - gpr_atm now, +static grpc_timer_check_result run_some_expired_timers(gpr_atm now, gpr_atm *next, grpc_error *error) { grpc_timer_check_result result = GRPC_TIMERS_NOT_CHECKED; @@ -562,8 +559,7 @@ static grpc_timer_check_result run_some_expired_timers(grpc_exec_ctx *exec_ctx, /* For efficiency, we pop as many available timers as we can from the shard. This may violate perfect timer deadline ordering, but that shouldn't be a big deal because we don't make ordering guarantees. */ - if (pop_timers(exec_ctx, g_shard_queue[0], now, &new_min_deadline, - error) > 0) { + if (pop_timers(g_shard_queue[0], now, &new_min_deadline, error) > 0) { result = GRPC_TIMERS_FIRED; } @@ -600,10 +596,9 @@ static grpc_timer_check_result run_some_expired_timers(grpc_exec_ctx *exec_ctx, return result; } -grpc_timer_check_result grpc_timer_check(grpc_exec_ctx *exec_ctx, - grpc_millis *next) { +grpc_timer_check_result grpc_timer_check(grpc_millis *next) { // prelude - grpc_millis now = grpc_exec_ctx_now(exec_ctx); + grpc_millis now = grpc_exec_ctx_now(); /* fetch from a thread-local first: this avoids contention on a globally mutable cacheline in the common case */ @@ -641,7 +636,7 @@ grpc_timer_check_result grpc_timer_check(grpc_exec_ctx *exec_ctx, } // actual code grpc_timer_check_result r = - run_some_expired_timers(exec_ctx, now, next, shutdown_error); + run_some_expired_timers(now, next, shutdown_error); // tracing if (GRPC_TRACER_ON(grpc_timer_check_trace)) { char *next_str; diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc index 1248f82189a..9c8d35add91 100644 --- a/src/core/lib/iomgr/timer_manager.cc +++ b/src/core/lib/iomgr/timer_manager.cc @@ -98,13 +98,13 @@ static void start_timer_thread_and_unlock(void) { } void grpc_timer_manager_tick() { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_millis next = GRPC_MILLIS_INF_FUTURE; - grpc_timer_check(&exec_ctx, &next); - grpc_exec_ctx_finish(&exec_ctx); + grpc_timer_check(&next); + grpc_exec_ctx_finish(); } -static void run_some_timers(grpc_exec_ctx *exec_ctx) { +static void run_some_timers() { // if there's something to execute... gpr_mu_lock(&g_mu); // remove a waiter from the pool, and start another thread if necessary @@ -126,7 +126,7 @@ static void run_some_timers(grpc_exec_ctx *exec_ctx) { if (GRPC_TRACER_ON(grpc_timer_check_trace)) { gpr_log(GPR_DEBUG, "flush exec_ctx"); } - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(&g_mu); // garbage collect any threads hanging out that are dead gc_completed_threads(); @@ -138,7 +138,7 @@ static void run_some_timers(grpc_exec_ctx *exec_ctx) { // wait until 'next' (or forever if there is already a timed waiter in the pool) // returns true if the thread should continue executing (false if it should // shutdown) -static bool wait_until(grpc_exec_ctx *exec_ctx, grpc_millis next) { +static bool wait_until(grpc_millis next) { gpr_mu_lock(&g_mu); // if we're not threaded anymore, leave if (!g_threaded) { @@ -179,7 +179,7 @@ static bool wait_until(grpc_exec_ctx *exec_ctx, grpc_millis next) { g_timed_waiter_deadline = next; if (GRPC_TRACER_ON(grpc_timer_check_trace)) { - grpc_millis wait_time = next - grpc_exec_ctx_now(exec_ctx); + grpc_millis wait_time = next - grpc_exec_ctx_now(); gpr_log(GPR_DEBUG, "sleep for a %" PRIdPTR " milliseconds", wait_time); } @@ -221,14 +221,14 @@ static bool wait_until(grpc_exec_ctx *exec_ctx, grpc_millis next) { return true; } -static void timer_main_loop(grpc_exec_ctx *exec_ctx) { +static void timer_main_loop() { for (;;) { grpc_millis next = GRPC_MILLIS_INF_FUTURE; - grpc_exec_ctx_invalidate_now(exec_ctx); + grpc_exec_ctx_invalidate_now(); // check timer state, updates next to the next time to run a check - switch (grpc_timer_check(exec_ctx, &next)) { + switch (grpc_timer_check(&next)) { case GRPC_TIMERS_FIRED: - run_some_timers(exec_ctx); + run_some_timers(); break; case GRPC_TIMERS_NOT_CHECKED: /* This case only happens under contention, meaning more than one timer @@ -246,7 +246,7 @@ static void timer_main_loop(grpc_exec_ctx *exec_ctx) { next = GRPC_MILLIS_INF_FUTURE; /* fall through */ case GRPC_TIMERS_CHECKED_AND_EMPTY: - if (!wait_until(exec_ctx, next)) { + if (!wait_until(next)) { return; } break; @@ -274,10 +274,9 @@ static void timer_thread_cleanup(completed_thread *ct) { static void timer_thread(void *completed_thread_ptr) { // this threads exec_ctx: we try to run things through to completion here // since it's easy to spin up new threads - grpc_exec_ctx exec_ctx = - GRPC_EXEC_CTX_INITIALIZER(0, grpc_never_ready_to_finish, NULL); - timer_main_loop(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx(0, grpc_never_ready_to_finish, NULL); + timer_main_loop(); + grpc_exec_ctx_finish(); timer_thread_cleanup((completed_thread *)completed_thread_ptr); } diff --git a/src/core/lib/iomgr/timer_uv.cc b/src/core/lib/iomgr/timer_uv.cc index ccbbe357ae9..b3e1ef372fa 100644 --- a/src/core/lib/iomgr/timer_uv.cc +++ b/src/core/lib/iomgr/timer_uv.cc @@ -45,28 +45,28 @@ static void stop_uv_timer(uv_timer_t *handle) { void run_expired_timer(uv_timer_t *handle) { grpc_timer *timer = (grpc_timer *)handle->data; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GRPC_UV_ASSERT_SAME_THREAD(); GPR_ASSERT(timer->pending); timer->pending = 0; - GRPC_CLOSURE_SCHED(&exec_ctx, timer->closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_NONE); stop_uv_timer(handle); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } -void grpc_timer_init(grpc_exec_ctx *exec_ctx, grpc_timer *timer, - grpc_millis deadline, grpc_closure *closure) { +void grpc_timer_init(grpc_timer *timer, grpc_millis deadline, + grpc_closure *closure) { uint64_t timeout; uv_timer_t *uv_timer; GRPC_UV_ASSERT_SAME_THREAD(); timer->closure = closure; - if (deadline <= grpc_exec_ctx_now(exec_ctx)) { + if (deadline <= grpc_exec_ctx_now()) { timer->pending = 0; - GRPC_CLOSURE_SCHED(exec_ctx, timer->closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_NONE); return; } timer->pending = 1; - timeout = (uint64_t)(deadline - grpc_exec_ctx_now(exec_ctx)); + timeout = (uint64_t)(deadline - grpc_exec_ctx_now()); uv_timer = (uv_timer_t *)gpr_malloc(sizeof(uv_timer_t)); uv_timer_init(uv_default_loop(), uv_timer); uv_timer->data = timer; @@ -80,22 +80,21 @@ void grpc_timer_init(grpc_exec_ctx *exec_ctx, grpc_timer *timer, void grpc_timer_init_unset(grpc_timer *timer) { timer->pending = 0; } -void grpc_timer_cancel(grpc_exec_ctx *exec_ctx, grpc_timer *timer) { +void grpc_timer_cancel(grpc_timer *timer) { GRPC_UV_ASSERT_SAME_THREAD(); if (timer->pending) { timer->pending = 0; - GRPC_CLOSURE_SCHED(exec_ctx, timer->closure, GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_CANCELLED); stop_uv_timer((uv_timer_t *)timer->uv_timer); } } -grpc_timer_check_result grpc_timer_check(grpc_exec_ctx *exec_ctx, - grpc_millis *next) { +grpc_timer_check_result grpc_timer_check(grpc_millis *next) { return GRPC_TIMERS_NOT_CHECKED; } -void grpc_timer_list_init(grpc_exec_ctx *exec_ctx) {} -void grpc_timer_list_shutdown(grpc_exec_ctx *exec_ctx) {} +void grpc_timer_list_init() {} +void grpc_timer_list_shutdown() {} void grpc_timer_consume_kick(void) {} diff --git a/src/core/lib/iomgr/udp_server.cc b/src/core/lib/iomgr/udp_server.cc index 00b2e68bb5e..c868e82d1d3 100644 --- a/src/core/lib/iomgr/udp_server.cc +++ b/src/core/lib/iomgr/udp_server.cc @@ -141,22 +141,21 @@ grpc_udp_server *grpc_udp_server_create(const grpc_channel_args *args) { return s; } -static void shutdown_fd(grpc_exec_ctx *exec_ctx, void *args, - grpc_error *error) { +static void shutdown_fd(void *args, grpc_error *error) { struct shutdown_fd_args *shutdown_args = (struct shutdown_fd_args *)args; gpr_mu_lock(shutdown_args->server_mu); - grpc_fd_shutdown(exec_ctx, shutdown_args->fd, GRPC_ERROR_REF(error)); + grpc_fd_shutdown(shutdown_args->fd, GRPC_ERROR_REF(error)); gpr_mu_unlock(shutdown_args->server_mu); gpr_free(shutdown_args); } -static void dummy_cb(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void dummy_cb(void *arg, grpc_error *error) { // No-op. } -static void finish_shutdown(grpc_exec_ctx *exec_ctx, grpc_udp_server *s) { +static void finish_shutdown(grpc_udp_server *s) { if (s->shutdown_complete != NULL) { - GRPC_CLOSURE_SCHED(exec_ctx, s->shutdown_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(s->shutdown_complete, GRPC_ERROR_NONE); } gpr_mu_destroy(&s->mu); @@ -174,14 +173,13 @@ static void finish_shutdown(grpc_exec_ctx *exec_ctx, grpc_udp_server *s) { gpr_free(s); } -static void destroyed_port(grpc_exec_ctx *exec_ctx, void *server, - grpc_error *error) { +static void destroyed_port(void *server, grpc_error *error) { grpc_udp_server *s = (grpc_udp_server *)server; gpr_mu_lock(&s->mu); s->destroyed_ports++; if (s->destroyed_ports == s->nports) { gpr_mu_unlock(&s->mu); - finish_shutdown(exec_ctx, s); + finish_shutdown(s); } else { gpr_mu_unlock(&s->mu); } @@ -190,7 +188,7 @@ static void destroyed_port(grpc_exec_ctx *exec_ctx, void *server, /* called when all listening endpoints have been shutdown, so no further events will be received on them - at this point it's safe to destroy things */ -static void deactivated_all_ports(grpc_exec_ctx *exec_ctx, grpc_udp_server *s) { +static void deactivated_all_ports(grpc_udp_server *s) { /* delete ALL the things */ gpr_mu_lock(&s->mu); @@ -210,21 +208,19 @@ static void deactivated_all_ports(grpc_exec_ctx *exec_ctx, grpc_udp_server *s) { GRPC_CLOSURE_INIT(&sp->orphan_fd_closure, dummy_cb, sp->emfd, grpc_schedule_on_exec_ctx); GPR_ASSERT(sp->orphan_cb); - sp->orphan_cb(exec_ctx, sp->emfd, &sp->orphan_fd_closure, - sp->server->user_data); + sp->orphan_cb(sp->emfd, &sp->orphan_fd_closure, sp->server->user_data); } - grpc_fd_orphan(exec_ctx, sp->emfd, &sp->destroyed_closure, NULL, + grpc_fd_orphan(sp->emfd, &sp->destroyed_closure, NULL, false /* already_closed */, "udp_listener_shutdown"); } gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - finish_shutdown(exec_ctx, s); + finish_shutdown(s); } } -void grpc_udp_server_destroy(grpc_exec_ctx *exec_ctx, grpc_udp_server *s, - grpc_closure *on_done) { +void grpc_udp_server_destroy(grpc_udp_server *s, grpc_closure *on_done) { grpc_udp_listener *sp; gpr_mu_lock(&s->mu); @@ -243,14 +239,13 @@ void grpc_udp_server_destroy(grpc_exec_ctx *exec_ctx, grpc_udp_server *s, args->server_mu = &s->mu; GRPC_CLOSURE_INIT(&sp->orphan_fd_closure, shutdown_fd, args, grpc_schedule_on_exec_ctx); - sp->orphan_cb(exec_ctx, sp->emfd, &sp->orphan_fd_closure, - sp->server->user_data); + sp->orphan_cb(sp->emfd, &sp->orphan_fd_closure, sp->server->user_data); sp->orphan_notified = true; } gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - deactivated_all_ports(exec_ctx, s); + deactivated_all_ports(s); } } @@ -331,14 +326,14 @@ error: } /* event manager callback when reads are ready */ -static void on_read(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void on_read(void *arg, grpc_error *error) { grpc_udp_listener *sp = (grpc_udp_listener *)arg; gpr_mu_lock(&sp->server->mu); if (error != GRPC_ERROR_NONE) { if (0 == --sp->server->active_ports && sp->server->shutdown) { gpr_mu_unlock(&sp->server->mu); - deactivated_all_ports(exec_ctx, sp->server); + deactivated_all_ports(sp->server); } else { gpr_mu_unlock(&sp->server->mu); } @@ -347,21 +342,21 @@ static void on_read(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { /* Tell the registered callback that data is available to read. */ GPR_ASSERT(sp->read_cb); - sp->read_cb(exec_ctx, sp->emfd, sp->server->user_data); + sp->read_cb(sp->emfd, sp->server->user_data); /* Re-arm the notification event so we get another chance to read. */ - grpc_fd_notify_on_read(exec_ctx, sp->emfd, &sp->read_closure); + grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); gpr_mu_unlock(&sp->server->mu); } -static void on_write(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void on_write(void *arg, grpc_error *error) { grpc_udp_listener *sp = (grpc_udp_listener *)arg; gpr_mu_lock(&(sp->server->mu)); if (error != GRPC_ERROR_NONE) { if (0 == --sp->server->active_ports && sp->server->shutdown) { gpr_mu_unlock(&sp->server->mu); - deactivated_all_ports(exec_ctx, sp->server); + deactivated_all_ports(sp->server); } else { gpr_mu_unlock(&sp->server->mu); } @@ -370,10 +365,10 @@ static void on_write(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { /* Tell the registered callback that the socket is writeable. */ GPR_ASSERT(sp->write_cb); - sp->write_cb(exec_ctx, sp->emfd, sp->server->user_data); + sp->write_cb(sp->emfd, sp->server->user_data); /* Re-arm the notification event so we get another chance to write. */ - grpc_fd_notify_on_write(exec_ctx, sp->emfd, &sp->write_closure); + grpc_fd_notify_on_write(sp->emfd, &sp->write_closure); gpr_mu_unlock(&sp->server->mu); } @@ -512,9 +507,8 @@ int grpc_udp_server_get_fd(grpc_udp_server *s, unsigned port_index) { return sp->fd; } -void grpc_udp_server_start(grpc_exec_ctx *exec_ctx, grpc_udp_server *s, - grpc_pollset **pollsets, size_t pollset_count, - void *user_data) { +void grpc_udp_server_start(grpc_udp_server *s, grpc_pollset **pollsets, + size_t pollset_count, void *user_data) { size_t i; gpr_mu_lock(&s->mu); grpc_udp_listener *sp; @@ -525,15 +519,15 @@ void grpc_udp_server_start(grpc_exec_ctx *exec_ctx, grpc_udp_server *s, sp = s->head; while (sp != NULL) { for (i = 0; i < pollset_count; i++) { - grpc_pollset_add_fd(exec_ctx, pollsets[i], sp->emfd); + grpc_pollset_add_fd(pollsets[i], sp->emfd); } GRPC_CLOSURE_INIT(&sp->read_closure, on_read, sp, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(exec_ctx, sp->emfd, &sp->read_closure); + grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); GRPC_CLOSURE_INIT(&sp->write_closure, on_write, sp, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_write(exec_ctx, sp->emfd, &sp->write_closure); + grpc_fd_notify_on_write(sp->emfd, &sp->write_closure); /* Registered for both read and write callbacks: increment active_ports * twice to account for this, and delay free-ing of memory until both diff --git a/src/core/lib/iomgr/udp_server.h b/src/core/lib/iomgr/udp_server.h index e887cb1bcf4..27cbf370e6f 100644 --- a/src/core/lib/iomgr/udp_server.h +++ b/src/core/lib/iomgr/udp_server.h @@ -35,16 +35,13 @@ struct grpc_server; typedef struct grpc_udp_server grpc_udp_server; /* Called when data is available to read from the socket. */ -typedef void (*grpc_udp_server_read_cb)(grpc_exec_ctx *exec_ctx, grpc_fd *emfd, - void *user_data); +typedef void (*grpc_udp_server_read_cb)(grpc_fd *emfd, void *user_data); /* Called when the socket is writeable. */ -typedef void (*grpc_udp_server_write_cb)(grpc_exec_ctx *exec_ctx, grpc_fd *emfd, - void *user_data); +typedef void (*grpc_udp_server_write_cb)(grpc_fd *emfd, void *user_data); /* Called when the grpc_fd is about to be orphaned (and the FD closed). */ -typedef void (*grpc_udp_server_orphan_cb)(grpc_exec_ctx *exec_ctx, - grpc_fd *emfd, +typedef void (*grpc_udp_server_orphan_cb)(grpc_fd *emfd, grpc_closure *shutdown_fd_callback, void *user_data); @@ -52,9 +49,8 @@ typedef void (*grpc_udp_server_orphan_cb)(grpc_exec_ctx *exec_ctx, grpc_udp_server *grpc_udp_server_create(const grpc_channel_args *args); /* Start listening to bound ports. user_data is passed to callbacks. */ -void grpc_udp_server_start(grpc_exec_ctx *exec_ctx, grpc_udp_server *udp_server, - grpc_pollset **pollsets, size_t pollset_count, - void *user_data); +void grpc_udp_server_start(grpc_udp_server *udp_server, grpc_pollset **pollsets, + size_t pollset_count, void *user_data); int grpc_udp_server_get_fd(grpc_udp_server *s, unsigned port_index); @@ -74,8 +70,7 @@ int grpc_udp_server_add_port(grpc_udp_server *s, grpc_udp_server_write_cb write_cb, grpc_udp_server_orphan_cb orphan_cb); -void grpc_udp_server_destroy(grpc_exec_ctx *exec_ctx, grpc_udp_server *server, - grpc_closure *on_done); +void grpc_udp_server_destroy(grpc_udp_server *server, grpc_closure *on_done); #ifdef __cplusplus } diff --git a/src/core/lib/security/context/security_context.cc b/src/core/lib/security/context/security_context.cc index 31d800b9b46..89f5019d99f 100644 --- a/src/core/lib/security/context/security_context.cc +++ b/src/core/lib/security/context/security_context.cc @@ -38,7 +38,7 @@ grpc_tracer_flag grpc_trace_auth_context_refcount = grpc_call_error grpc_call_set_credentials(grpc_call *call, grpc_call_credentials *creds) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_client_security_context *ctx = NULL; GRPC_API_TRACE("grpc_call_set_credentials(call=%p, creds=%p)", 2, (call, creds)); @@ -54,10 +54,10 @@ grpc_call_error grpc_call_set_credentials(grpc_call *call, grpc_call_context_set(call, GRPC_CONTEXT_SECURITY, ctx, grpc_client_security_context_destroy); } else { - grpc_call_credentials_unref(&exec_ctx, ctx->creds); + grpc_call_credentials_unref(ctx->creds); ctx->creds = grpc_call_credentials_ref(creds); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return GRPC_CALL_OK; } @@ -87,15 +87,15 @@ grpc_client_security_context *grpc_client_security_context_create(void) { } void grpc_client_security_context_destroy(void *ctx) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_client_security_context *c = (grpc_client_security_context *)ctx; - grpc_call_credentials_unref(&exec_ctx, c->creds); + grpc_call_credentials_unref(c->creds); GRPC_AUTH_CONTEXT_UNREF(c->auth_context, "client_security_context"); if (c->extension.instance != NULL && c->extension.destroy != NULL) { c->extension.destroy(c->extension.instance); } gpr_free(ctx); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } /* --- grpc_server_security_context --- */ @@ -304,7 +304,7 @@ void grpc_auth_property_reset(grpc_auth_property *property) { memset(property, 0, sizeof(grpc_auth_property)); } -static void auth_context_pointer_arg_destroy(grpc_exec_ctx *exec_ctx, void *p) { +static void auth_context_pointer_arg_destroy(void *p) { GRPC_AUTH_CONTEXT_UNREF((grpc_auth_context *)p, "auth_context_pointer_arg"); } diff --git a/src/core/lib/security/credentials/composite/composite_credentials.cc b/src/core/lib/security/credentials/composite/composite_credentials.cc index 779300ac078..d05a7a1f9ca 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.cc +++ b/src/core/lib/security/credentials/composite/composite_credentials.cc @@ -39,17 +39,15 @@ typedef struct { grpc_closure internal_on_request_metadata; } grpc_composite_call_credentials_metadata_context; -static void composite_call_destruct(grpc_exec_ctx *exec_ctx, - grpc_call_credentials *creds) { +static void composite_call_destruct(grpc_call_credentials *creds) { grpc_composite_call_credentials *c = (grpc_composite_call_credentials *)creds; for (size_t i = 0; i < c->inner.num_creds; i++) { - grpc_call_credentials_unref(exec_ctx, c->inner.creds_array[i]); + grpc_call_credentials_unref(c->inner.creds_array[i]); } gpr_free(c->inner.creds_array); } -static void composite_call_metadata_cb(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void composite_call_metadata_cb(void *arg, grpc_error *error) { grpc_composite_call_credentials_metadata_context *ctx = (grpc_composite_call_credentials_metadata_context *)arg; if (error == GRPC_ERROR_NONE) { @@ -58,23 +56,23 @@ static void composite_call_metadata_cb(grpc_exec_ctx *exec_ctx, void *arg, grpc_call_credentials *inner_creds = ctx->composite_creds->inner.creds_array[ctx->creds_index++]; if (grpc_call_credentials_get_request_metadata( - exec_ctx, inner_creds, ctx->pollent, ctx->auth_md_context, - ctx->md_array, &ctx->internal_on_request_metadata, &error)) { + inner_creds, ctx->pollent, ctx->auth_md_context, ctx->md_array, + &ctx->internal_on_request_metadata, &error)) { // Synchronous response, so call ourselves recursively. - composite_call_metadata_cb(exec_ctx, arg, error); + composite_call_metadata_cb(arg, error); GRPC_ERROR_UNREF(error); } return; } // We're done! } - GRPC_CLOSURE_SCHED(exec_ctx, ctx->on_request_metadata, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(ctx->on_request_metadata, GRPC_ERROR_REF(error)); gpr_free(ctx); } static bool composite_call_get_request_metadata( - grpc_exec_ctx *exec_ctx, grpc_call_credentials *creds, - grpc_polling_entity *pollent, grpc_auth_metadata_context auth_md_context, + grpc_call_credentials *creds, grpc_polling_entity *pollent, + grpc_auth_metadata_context auth_md_context, grpc_credentials_mdelem_array *md_array, grpc_closure *on_request_metadata, grpc_error **error) { grpc_composite_call_credentials *c = (grpc_composite_call_credentials *)creds; @@ -93,8 +91,8 @@ static bool composite_call_get_request_metadata( grpc_call_credentials *inner_creds = ctx->composite_creds->inner.creds_array[ctx->creds_index++]; if (grpc_call_credentials_get_request_metadata( - exec_ctx, inner_creds, ctx->pollent, ctx->auth_md_context, - ctx->md_array, &ctx->internal_on_request_metadata, error)) { + inner_creds, ctx->pollent, ctx->auth_md_context, ctx->md_array, + &ctx->internal_on_request_metadata, error)) { if (*error != GRPC_ERROR_NONE) break; } else { synchronous = false; // Async return. @@ -106,12 +104,12 @@ static bool composite_call_get_request_metadata( } static void composite_call_cancel_get_request_metadata( - grpc_exec_ctx *exec_ctx, grpc_call_credentials *creds, - grpc_credentials_mdelem_array *md_array, grpc_error *error) { + grpc_call_credentials *creds, grpc_credentials_mdelem_array *md_array, + grpc_error *error) { grpc_composite_call_credentials *c = (grpc_composite_call_credentials *)creds; for (size_t i = 0; i < c->inner.num_creds; ++i) { grpc_call_credentials_cancel_get_request_metadata( - exec_ctx, c->inner.creds_array[i], md_array, GRPC_ERROR_REF(error)); + c->inner.creds_array[i], md_array, GRPC_ERROR_REF(error)); } GRPC_ERROR_UNREF(error); } @@ -200,19 +198,17 @@ grpc_call_credentials *grpc_credentials_contains_type( /* -- Composite channel credentials. -- */ -static void composite_channel_destruct(grpc_exec_ctx *exec_ctx, - grpc_channel_credentials *creds) { +static void composite_channel_destruct(grpc_channel_credentials *creds) { grpc_composite_channel_credentials *c = (grpc_composite_channel_credentials *)creds; - grpc_channel_credentials_unref(exec_ctx, c->inner_creds); - grpc_call_credentials_unref(exec_ctx, c->call_creds); + grpc_channel_credentials_unref(c->inner_creds); + grpc_call_credentials_unref(c->call_creds); } static grpc_security_status composite_channel_create_security_connector( - grpc_exec_ctx *exec_ctx, grpc_channel_credentials *creds, - grpc_call_credentials *call_creds, const char *target, - const grpc_channel_args *args, grpc_channel_security_connector **sc, - grpc_channel_args **new_args) { + grpc_channel_credentials *creds, grpc_call_credentials *call_creds, + const char *target, const grpc_channel_args *args, + grpc_channel_security_connector **sc, grpc_channel_args **new_args) { grpc_composite_channel_credentials *c = (grpc_composite_channel_credentials *)creds; grpc_security_status status = GRPC_SECURITY_ERROR; @@ -226,12 +222,11 @@ static grpc_security_status composite_channel_create_security_connector( grpc_call_credentials *composite_call_creds = grpc_composite_call_credentials_create(c->call_creds, call_creds, NULL); status = c->inner_creds->vtable->create_security_connector( - exec_ctx, c->inner_creds, composite_call_creds, target, args, sc, - new_args); - grpc_call_credentials_unref(exec_ctx, composite_call_creds); + c->inner_creds, composite_call_creds, target, args, sc, new_args); + grpc_call_credentials_unref(composite_call_creds); } else { status = c->inner_creds->vtable->create_security_connector( - exec_ctx, c->inner_creds, c->call_creds, target, args, sc, new_args); + c->inner_creds, c->call_creds, target, args, sc, new_args); } return status; } diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index ebbf3508653..b12e3dac297 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -47,8 +47,8 @@ grpc_credentials_metadata_request *grpc_credentials_metadata_request_create( } void grpc_credentials_metadata_request_destroy( - grpc_exec_ctx *exec_ctx, grpc_credentials_metadata_request *r) { - grpc_call_credentials_unref(exec_ctx, r->creds); + grpc_credentials_metadata_request *r) { + grpc_call_credentials_unref(r->creds); grpc_http_response_destroy(&r->response); gpr_free(r); } @@ -60,12 +60,11 @@ grpc_channel_credentials *grpc_channel_credentials_ref( return creds; } -void grpc_channel_credentials_unref(grpc_exec_ctx *exec_ctx, - grpc_channel_credentials *creds) { +void grpc_channel_credentials_unref(grpc_channel_credentials *creds) { if (creds == NULL) return; if (gpr_unref(&creds->refcount)) { if (creds->vtable->destruct != NULL) { - creds->vtable->destruct(exec_ctx, creds); + creds->vtable->destruct(creds); } gpr_free(creds); } @@ -73,9 +72,9 @@ void grpc_channel_credentials_unref(grpc_exec_ctx *exec_ctx, void grpc_channel_credentials_release(grpc_channel_credentials *creds) { GRPC_API_TRACE("grpc_channel_credentials_release(creds=%p)", 1, (creds)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_credentials_unref(&exec_ctx, creds); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_channel_credentials_unref(creds); + grpc_exec_ctx_finish(); } grpc_call_credentials *grpc_call_credentials_ref(grpc_call_credentials *creds) { @@ -84,12 +83,11 @@ grpc_call_credentials *grpc_call_credentials_ref(grpc_call_credentials *creds) { return creds; } -void grpc_call_credentials_unref(grpc_exec_ctx *exec_ctx, - grpc_call_credentials *creds) { +void grpc_call_credentials_unref(grpc_call_credentials *creds) { if (creds == NULL) return; if (gpr_unref(&creds->refcount)) { if (creds->vtable->destruct != NULL) { - creds->vtable->destruct(exec_ctx, creds); + creds->vtable->destruct(creds); } gpr_free(creds); } @@ -97,43 +95,42 @@ void grpc_call_credentials_unref(grpc_exec_ctx *exec_ctx, void grpc_call_credentials_release(grpc_call_credentials *creds) { GRPC_API_TRACE("grpc_call_credentials_release(creds=%p)", 1, (creds)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_call_credentials_unref(&exec_ctx, creds); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_call_credentials_unref(creds); + grpc_exec_ctx_finish(); } bool grpc_call_credentials_get_request_metadata( - grpc_exec_ctx *exec_ctx, grpc_call_credentials *creds, - grpc_polling_entity *pollent, grpc_auth_metadata_context context, - grpc_credentials_mdelem_array *md_array, grpc_closure *on_request_metadata, - grpc_error **error) { + grpc_call_credentials *creds, grpc_polling_entity *pollent, + grpc_auth_metadata_context context, grpc_credentials_mdelem_array *md_array, + grpc_closure *on_request_metadata, grpc_error **error) { if (creds == NULL || creds->vtable->get_request_metadata == NULL) { return true; } - return creds->vtable->get_request_metadata( - exec_ctx, creds, pollent, context, md_array, on_request_metadata, error); + return creds->vtable->get_request_metadata(creds, pollent, context, md_array, + on_request_metadata, error); } void grpc_call_credentials_cancel_get_request_metadata( - grpc_exec_ctx *exec_ctx, grpc_call_credentials *creds, - grpc_credentials_mdelem_array *md_array, grpc_error *error) { + grpc_call_credentials *creds, grpc_credentials_mdelem_array *md_array, + grpc_error *error) { if (creds == NULL || creds->vtable->cancel_get_request_metadata == NULL) { return; } - creds->vtable->cancel_get_request_metadata(exec_ctx, creds, md_array, error); + creds->vtable->cancel_get_request_metadata(creds, md_array, error); } grpc_security_status grpc_channel_credentials_create_security_connector( - grpc_exec_ctx *exec_ctx, grpc_channel_credentials *channel_creds, - const char *target, const grpc_channel_args *args, - grpc_channel_security_connector **sc, grpc_channel_args **new_args) { + grpc_channel_credentials *channel_creds, const char *target, + const grpc_channel_args *args, grpc_channel_security_connector **sc, + grpc_channel_args **new_args) { *new_args = NULL; if (channel_creds == NULL) { return GRPC_SECURITY_ERROR; } GPR_ASSERT(channel_creds->vtable->create_security_connector != NULL); return channel_creds->vtable->create_security_connector( - exec_ctx, channel_creds, NULL, target, args, sc, new_args); + channel_creds, NULL, target, args, sc, new_args); } grpc_channel_credentials * @@ -148,8 +145,8 @@ grpc_channel_credentials_duplicate_without_call_credentials( } } -static void credentials_pointer_arg_destroy(grpc_exec_ctx *exec_ctx, void *p) { - grpc_channel_credentials_unref(exec_ctx, (grpc_channel_credentials *)p); +static void credentials_pointer_arg_destroy(void *p) { + grpc_channel_credentials_unref((grpc_channel_credentials *)p); } static void *credentials_pointer_arg_copy(void *p) { @@ -199,12 +196,11 @@ grpc_server_credentials *grpc_server_credentials_ref( return creds; } -void grpc_server_credentials_unref(grpc_exec_ctx *exec_ctx, - grpc_server_credentials *creds) { +void grpc_server_credentials_unref(grpc_server_credentials *creds) { if (creds == NULL) return; if (gpr_unref(&creds->refcount)) { if (creds->vtable->destruct != NULL) { - creds->vtable->destruct(exec_ctx, creds); + creds->vtable->destruct(creds); } if (creds->processor.destroy != NULL && creds->processor.state != NULL) { creds->processor.destroy(creds->processor.state); @@ -215,19 +211,18 @@ void grpc_server_credentials_unref(grpc_exec_ctx *exec_ctx, void grpc_server_credentials_release(grpc_server_credentials *creds) { GRPC_API_TRACE("grpc_server_credentials_release(creds=%p)", 1, (creds)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_server_credentials_unref(&exec_ctx, creds); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_server_credentials_unref(creds); + grpc_exec_ctx_finish(); } grpc_security_status grpc_server_credentials_create_security_connector( - grpc_exec_ctx *exec_ctx, grpc_server_credentials *creds, - grpc_server_security_connector **sc) { + grpc_server_credentials *creds, grpc_server_security_connector **sc) { if (creds == NULL || creds->vtable->create_security_connector == NULL) { gpr_log(GPR_ERROR, "Server credentials cannot create security context."); return GRPC_SECURITY_ERROR; } - return creds->vtable->create_security_connector(exec_ctx, creds, sc); + return creds->vtable->create_security_connector(creds, sc); } void grpc_server_credentials_set_auth_metadata_processor( @@ -244,9 +239,8 @@ void grpc_server_credentials_set_auth_metadata_processor( creds->processor = processor; } -static void server_credentials_pointer_arg_destroy(grpc_exec_ctx *exec_ctx, - void *p) { - grpc_server_credentials_unref(exec_ctx, (grpc_server_credentials *)p); +static void server_credentials_pointer_arg_destroy(void *p) { + grpc_server_credentials_unref((grpc_server_credentials *)p); } static void *server_credentials_pointer_arg_copy(void *p) { diff --git a/src/core/lib/security/credentials/credentials.h b/src/core/lib/security/credentials/credentials.h index 73e39ae039a..8f4b7645449 100644 --- a/src/core/lib/security/credentials/credentials.h +++ b/src/core/lib/security/credentials/credentials.h @@ -92,13 +92,12 @@ void grpc_override_well_known_credentials_path_getter( #define GRPC_ARG_CHANNEL_CREDENTIALS "grpc.channel_credentials" typedef struct { - void (*destruct)(grpc_exec_ctx *exec_ctx, grpc_channel_credentials *c); + void (*destruct)(grpc_channel_credentials *c); grpc_security_status (*create_security_connector)( - grpc_exec_ctx *exec_ctx, grpc_channel_credentials *c, - grpc_call_credentials *call_creds, const char *target, - const grpc_channel_args *args, grpc_channel_security_connector **sc, - grpc_channel_args **new_args); + grpc_channel_credentials *c, grpc_call_credentials *call_creds, + const char *target, const grpc_channel_args *args, + grpc_channel_security_connector **sc, grpc_channel_args **new_args); grpc_channel_credentials *(*duplicate_without_call_credentials)( grpc_channel_credentials *c); @@ -112,17 +111,16 @@ struct grpc_channel_credentials { grpc_channel_credentials *grpc_channel_credentials_ref( grpc_channel_credentials *creds); -void grpc_channel_credentials_unref(grpc_exec_ctx *exec_ctx, - grpc_channel_credentials *creds); +void grpc_channel_credentials_unref(grpc_channel_credentials *creds); /* Creates a security connector for the channel. May also create new channel args for the channel to be used in place of the passed in const args if returned non NULL. In that case the caller is responsible for destroying new_args after channel creation. */ grpc_security_status grpc_channel_credentials_create_security_connector( - grpc_exec_ctx *exec_ctx, grpc_channel_credentials *creds, - const char *target, const grpc_channel_args *args, - grpc_channel_security_connector **sc, grpc_channel_args **new_args); + grpc_channel_credentials *creds, const char *target, + const grpc_channel_args *args, grpc_channel_security_connector **sc, + grpc_channel_args **new_args); /* Creates a version of the channel credentials without any attached call credentials. This can be used in order to open a channel to a non-trusted @@ -157,22 +155,19 @@ void grpc_credentials_mdelem_array_add(grpc_credentials_mdelem_array *list, void grpc_credentials_mdelem_array_append(grpc_credentials_mdelem_array *dst, grpc_credentials_mdelem_array *src); -void grpc_credentials_mdelem_array_destroy(grpc_exec_ctx *exec_ctx, - grpc_credentials_mdelem_array *list); +void grpc_credentials_mdelem_array_destroy(grpc_credentials_mdelem_array *list); /* --- grpc_call_credentials. --- */ typedef struct { - void (*destruct)(grpc_exec_ctx *exec_ctx, grpc_call_credentials *c); - bool (*get_request_metadata)(grpc_exec_ctx *exec_ctx, - grpc_call_credentials *c, + void (*destruct)(grpc_call_credentials *c); + bool (*get_request_metadata)(grpc_call_credentials *c, grpc_polling_entity *pollent, grpc_auth_metadata_context context, grpc_credentials_mdelem_array *md_array, grpc_closure *on_request_metadata, grpc_error **error); - void (*cancel_get_request_metadata)(grpc_exec_ctx *exec_ctx, - grpc_call_credentials *c, + void (*cancel_get_request_metadata)(grpc_call_credentials *c, grpc_credentials_mdelem_array *md_array, grpc_error *error); } grpc_call_credentials_vtable; @@ -184,39 +179,35 @@ struct grpc_call_credentials { }; grpc_call_credentials *grpc_call_credentials_ref(grpc_call_credentials *creds); -void grpc_call_credentials_unref(grpc_exec_ctx *exec_ctx, - grpc_call_credentials *creds); +void grpc_call_credentials_unref(grpc_call_credentials *creds); /// Returns true if completed synchronously, in which case \a error will /// be set to indicate the result. Otherwise, \a on_request_metadata will /// be invoked asynchronously when complete. \a md_array will be populated /// with the resulting metadata once complete. bool grpc_call_credentials_get_request_metadata( - grpc_exec_ctx *exec_ctx, grpc_call_credentials *creds, - grpc_polling_entity *pollent, grpc_auth_metadata_context context, - grpc_credentials_mdelem_array *md_array, grpc_closure *on_request_metadata, - grpc_error **error); + grpc_call_credentials *creds, grpc_polling_entity *pollent, + grpc_auth_metadata_context context, grpc_credentials_mdelem_array *md_array, + grpc_closure *on_request_metadata, grpc_error **error); /// Cancels a pending asynchronous operation started by /// grpc_call_credentials_get_request_metadata() with the corresponding /// value of \a md_array. void grpc_call_credentials_cancel_get_request_metadata( - grpc_exec_ctx *exec_ctx, grpc_call_credentials *c, - grpc_credentials_mdelem_array *md_array, grpc_error *error); + grpc_call_credentials *c, grpc_credentials_mdelem_array *md_array, + grpc_error *error); /* Metadata-only credentials with the specified key and value where asynchronicity can be simulated for testing. */ grpc_call_credentials *grpc_md_only_test_credentials_create( - grpc_exec_ctx *exec_ctx, const char *md_key, const char *md_value, - bool is_async); + const char *md_key, const char *md_value, bool is_async); /* --- grpc_server_credentials. --- */ typedef struct { - void (*destruct)(grpc_exec_ctx *exec_ctx, grpc_server_credentials *c); + void (*destruct)(grpc_server_credentials *c); grpc_security_status (*create_security_connector)( - grpc_exec_ctx *exec_ctx, grpc_server_credentials *c, - grpc_server_security_connector **sc); + grpc_server_credentials *c, grpc_server_security_connector **sc); } grpc_server_credentials_vtable; struct grpc_server_credentials { @@ -227,14 +218,12 @@ struct grpc_server_credentials { }; grpc_security_status grpc_server_credentials_create_security_connector( - grpc_exec_ctx *exec_ctx, grpc_server_credentials *creds, - grpc_server_security_connector **sc); + grpc_server_credentials *creds, grpc_server_security_connector **sc); grpc_server_credentials *grpc_server_credentials_ref( grpc_server_credentials *creds); -void grpc_server_credentials_unref(grpc_exec_ctx *exec_ctx, - grpc_server_credentials *creds); +void grpc_server_credentials_unref(grpc_server_credentials *creds); #define GRPC_SERVER_CREDENTIALS_ARG "grpc.server_credentials" @@ -254,7 +243,7 @@ grpc_credentials_metadata_request *grpc_credentials_metadata_request_create( grpc_call_credentials *creds); void grpc_credentials_metadata_request_destroy( - grpc_exec_ctx *exec_ctx, grpc_credentials_metadata_request *r); + grpc_credentials_metadata_request *r); #ifdef __cplusplus } diff --git a/src/core/lib/security/credentials/credentials_metadata.cc b/src/core/lib/security/credentials/credentials_metadata.cc index 5ba98bda4e0..29b632376bb 100644 --- a/src/core/lib/security/credentials/credentials_metadata.cc +++ b/src/core/lib/security/credentials/credentials_metadata.cc @@ -52,9 +52,9 @@ void grpc_credentials_mdelem_array_append(grpc_credentials_mdelem_array *dst, } void grpc_credentials_mdelem_array_destroy( - grpc_exec_ctx *exec_ctx, grpc_credentials_mdelem_array *list) { + grpc_credentials_mdelem_array *list) { for (size_t i = 0; i < list->size; ++i) { - GRPC_MDELEM_UNREF(exec_ctx, list->md[i]); + GRPC_MDELEM_UNREF(list->md[i]); } gpr_free(list->md); } diff --git a/src/core/lib/security/credentials/fake/fake_credentials.cc b/src/core/lib/security/credentials/fake/fake_credentials.cc index cf10bf24c81..42257c7a131 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.cc +++ b/src/core/lib/security/credentials/fake/fake_credentials.cc @@ -34,10 +34,9 @@ "grpc.fake_security.expected_targets" static grpc_security_status fake_transport_security_create_security_connector( - grpc_exec_ctx *exec_ctx, grpc_channel_credentials *c, - grpc_call_credentials *call_creds, const char *target, - const grpc_channel_args *args, grpc_channel_security_connector **sc, - grpc_channel_args **new_args) { + grpc_channel_credentials *c, grpc_call_credentials *call_creds, + const char *target, const grpc_channel_args *args, + grpc_channel_security_connector **sc, grpc_channel_args **new_args) { *sc = grpc_fake_channel_security_connector_create(c, call_creds, target, args); return GRPC_SECURITY_OK; @@ -45,8 +44,7 @@ static grpc_security_status fake_transport_security_create_security_connector( static grpc_security_status fake_transport_security_server_create_security_connector( - grpc_exec_ctx *exec_ctx, grpc_server_credentials *c, - grpc_server_security_connector **sc) { + grpc_server_credentials *c, grpc_server_security_connector **sc) { *sc = grpc_fake_server_security_connector_create(c); return GRPC_SECURITY_OK; } @@ -98,29 +96,27 @@ const char *grpc_fake_transport_get_expected_targets( /* -- Metadata-only test credentials. -- */ -static void md_only_test_destruct(grpc_exec_ctx *exec_ctx, - grpc_call_credentials *creds) { +static void md_only_test_destruct(grpc_call_credentials *creds) { grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *)creds; - GRPC_MDELEM_UNREF(exec_ctx, c->md); + GRPC_MDELEM_UNREF(c->md); } static bool md_only_test_get_request_metadata( - grpc_exec_ctx *exec_ctx, grpc_call_credentials *creds, - grpc_polling_entity *pollent, grpc_auth_metadata_context context, - grpc_credentials_mdelem_array *md_array, grpc_closure *on_request_metadata, - grpc_error **error) { + grpc_call_credentials *creds, grpc_polling_entity *pollent, + grpc_auth_metadata_context context, grpc_credentials_mdelem_array *md_array, + grpc_closure *on_request_metadata, grpc_error **error) { grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *)creds; grpc_credentials_mdelem_array_add(md_array, c->md); if (c->is_async) { - GRPC_CLOSURE_SCHED(exec_ctx, on_request_metadata, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_request_metadata, GRPC_ERROR_NONE); return false; } return true; } static void md_only_test_cancel_get_request_metadata( - grpc_exec_ctx *exec_ctx, grpc_call_credentials *c, - grpc_credentials_mdelem_array *md_array, grpc_error *error) { + grpc_call_credentials *c, grpc_credentials_mdelem_array *md_array, + grpc_error *error) { GRPC_ERROR_UNREF(error); } @@ -129,17 +125,15 @@ static grpc_call_credentials_vtable md_only_test_vtable = { md_only_test_cancel_get_request_metadata}; grpc_call_credentials *grpc_md_only_test_credentials_create( - grpc_exec_ctx *exec_ctx, const char *md_key, const char *md_value, - bool is_async) { + const char *md_key, const char *md_value, bool is_async) { grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *)gpr_zalloc( sizeof(grpc_md_only_test_credentials)); c->base.type = GRPC_CALL_CREDENTIALS_TYPE_OAUTH2; c->base.vtable = &md_only_test_vtable; gpr_ref_init(&c->base.refcount, 1); - c->md = - grpc_mdelem_from_slices(exec_ctx, grpc_slice_from_copied_string(md_key), - grpc_slice_from_copied_string(md_value)); + c->md = grpc_mdelem_from_slices(grpc_slice_from_copied_string(md_key), + grpc_slice_from_copied_string(md_value)); c->is_async = is_async; return &c->base; } diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc index 5b2ddceb4a2..719e6d147a1 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc @@ -58,8 +58,7 @@ typedef struct { grpc_http_response response; } compute_engine_detector; -static void on_compute_engine_detection_http_response(grpc_exec_ctx *exec_ctx, - void *user_data, +static void on_compute_engine_detection_http_response(void *user_data, grpc_error *error) { compute_engine_detector *detector = (compute_engine_detector *)user_data; if (error == GRPC_ERROR_NONE && detector->response.status == 200 && @@ -80,16 +79,15 @@ static void on_compute_engine_detection_http_response(grpc_exec_ctx *exec_ctx, detector->is_done = 1; GRPC_LOG_IF_ERROR( "Pollset kick", - grpc_pollset_kick(exec_ctx, - grpc_polling_entity_pollset(&detector->pollent), NULL)); + grpc_pollset_kick(grpc_polling_entity_pollset(&detector->pollent), NULL)); gpr_mu_unlock(g_polling_mu); } -static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, grpc_error *e) { - grpc_pollset_destroy(exec_ctx, (grpc_pollset *)p); +static void destroy_pollset(void *p, grpc_error *e) { + grpc_pollset_destroy((grpc_pollset *)p); } -static int is_stack_running_on_compute_engine(grpc_exec_ctx *exec_ctx) { +static int is_stack_running_on_compute_engine() { compute_engine_detector detector; grpc_httpcli_request request; grpc_httpcli_context context; @@ -115,14 +113,14 @@ static int is_stack_running_on_compute_engine(grpc_exec_ctx *exec_ctx) { grpc_resource_quota *resource_quota = grpc_resource_quota_create("google_default_credentials"); grpc_httpcli_get( - exec_ctx, &context, &detector.pollent, resource_quota, &request, - grpc_exec_ctx_now(exec_ctx) + max_detection_delay, + &context, &detector.pollent, resource_quota, &request, + grpc_exec_ctx_now() + max_detection_delay, GRPC_CLOSURE_CREATE(on_compute_engine_detection_http_response, &detector, grpc_schedule_on_exec_ctx), &detector.response); - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); /* Block until we get the response. This is not ideal but this should only be called once for the lifetime of the process by the default credentials. */ @@ -131,8 +129,7 @@ static int is_stack_running_on_compute_engine(grpc_exec_ctx *exec_ctx) { grpc_pollset_worker *worker = NULL; if (!GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(exec_ctx, - grpc_polling_entity_pollset(&detector.pollent), + grpc_pollset_work(grpc_polling_entity_pollset(&detector.pollent), &worker, GRPC_MILLIS_INF_FUTURE))) { detector.is_done = 1; detector.success = 0; @@ -140,15 +137,14 @@ static int is_stack_running_on_compute_engine(grpc_exec_ctx *exec_ctx) { } gpr_mu_unlock(g_polling_mu); - grpc_httpcli_context_destroy(exec_ctx, &context); + grpc_httpcli_context_destroy(&context); GRPC_CLOSURE_INIT(&destroy_closure, destroy_pollset, grpc_polling_entity_pollset(&detector.pollent), grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(exec_ctx, - grpc_polling_entity_pollset(&detector.pollent), + grpc_pollset_shutdown(grpc_polling_entity_pollset(&detector.pollent), &destroy_closure); g_polling_mu = NULL; - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); gpr_free(grpc_polling_entity_pollset(&detector.pollent)); grpc_http_response_destroy(&detector.response); @@ -158,7 +154,7 @@ static int is_stack_running_on_compute_engine(grpc_exec_ctx *exec_ctx) { /* Takes ownership of creds_path if not NULL. */ static grpc_error *create_default_creds_from_path( - grpc_exec_ctx *exec_ctx, char *creds_path, grpc_call_credentials **creds) { + char *creds_path, grpc_call_credentials **creds) { grpc_json *json = NULL; grpc_auth_json_key key; grpc_auth_refresh_token token; @@ -187,7 +183,7 @@ static grpc_error *create_default_creds_from_path( if (grpc_auth_json_key_is_valid(&key)) { result = grpc_service_account_jwt_access_credentials_create_from_auth_json_key( - exec_ctx, key, grpc_max_auth_token_lifetime()); + key, grpc_max_auth_token_lifetime()); if (result == NULL) { error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "grpc_service_account_jwt_access_credentials_create_from_auth_json_" @@ -212,7 +208,7 @@ static grpc_error *create_default_creds_from_path( end: GPR_ASSERT((result == NULL) + (error == GRPC_ERROR_NONE) == 1); if (creds_path != NULL) gpr_free(creds_path); - grpc_slice_unref_internal(exec_ctx, creds_data); + grpc_slice_unref_internal(creds_data); if (json != NULL) grpc_json_destroy(json); *creds = result; return error; @@ -224,7 +220,7 @@ grpc_channel_credentials *grpc_google_default_credentials_create(void) { grpc_error *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Failed to create Google credentials"); grpc_error *err; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GRPC_API_TRACE("grpc_google_default_credentials_create(void)", 0, ()); @@ -239,22 +235,20 @@ grpc_channel_credentials *grpc_google_default_credentials_create(void) { /* First, try the environment variable. */ err = create_default_creds_from_path( - &exec_ctx, gpr_getenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR), &call_creds); + gpr_getenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR), &call_creds); if (err == GRPC_ERROR_NONE) goto end; error = grpc_error_add_child(error, err); /* Then the well-known file. */ err = create_default_creds_from_path( - &exec_ctx, grpc_get_well_known_google_credentials_file_path(), - &call_creds); + grpc_get_well_known_google_credentials_file_path(), &call_creds); if (err == GRPC_ERROR_NONE) goto end; error = grpc_error_add_child(error, err); /* At last try to see if we're on compute engine (do the detection only once since it requires a network test). */ if (!compute_engine_detection_done) { - int need_compute_engine_creds = - is_stack_running_on_compute_engine(&exec_ctx); + int need_compute_engine_creds = is_stack_running_on_compute_engine(); compute_engine_detection_done = 1; if (need_compute_engine_creds) { call_creds = grpc_google_compute_engine_credentials_create(NULL); @@ -278,8 +272,8 @@ end: grpc_composite_channel_credentials_create(ssl_creds, call_creds, NULL)); GPR_ASSERT(default_credentials != NULL); - grpc_channel_credentials_unref(&exec_ctx, ssl_creds); - grpc_call_credentials_unref(&exec_ctx, call_creds); + grpc_channel_credentials_unref(ssl_creds); + grpc_call_credentials_unref(call_creds); result = default_credentials; } else { gpr_log(GPR_ERROR, "Could not create google default credentials."); @@ -291,21 +285,21 @@ end: } else { GRPC_ERROR_UNREF(error); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return result; } void grpc_flush_cached_google_default_credentials(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; gpr_once_init(&g_once, init_default_credentials); gpr_mu_lock(&g_state_mu); if (default_credentials != NULL) { - grpc_channel_credentials_unref(&exec_ctx, default_credentials); + grpc_channel_credentials_unref(default_credentials); default_credentials = NULL; } compute_engine_detection_done = 0; gpr_mu_unlock(&g_state_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } /* -- Well known credentials path. -- */ diff --git a/src/core/lib/security/credentials/iam/iam_credentials.cc b/src/core/lib/security/credentials/iam/iam_credentials.cc index e9cf208c163..3b91e739f14 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.cc +++ b/src/core/lib/security/credentials/iam/iam_credentials.cc @@ -27,14 +27,12 @@ #include #include -static void iam_destruct(grpc_exec_ctx *exec_ctx, - grpc_call_credentials *creds) { +static void iam_destruct(grpc_call_credentials *creds) { grpc_google_iam_credentials *c = (grpc_google_iam_credentials *)creds; - grpc_credentials_mdelem_array_destroy(exec_ctx, &c->md_array); + grpc_credentials_mdelem_array_destroy(&c->md_array); } -static bool iam_get_request_metadata(grpc_exec_ctx *exec_ctx, - grpc_call_credentials *creds, +static bool iam_get_request_metadata(grpc_call_credentials *creds, grpc_polling_entity *pollent, grpc_auth_metadata_context context, grpc_credentials_mdelem_array *md_array, @@ -46,8 +44,8 @@ static bool iam_get_request_metadata(grpc_exec_ctx *exec_ctx, } static void iam_cancel_get_request_metadata( - grpc_exec_ctx *exec_ctx, grpc_call_credentials *c, - grpc_credentials_mdelem_array *md_array, grpc_error *error) { + grpc_call_credentials *c, grpc_credentials_mdelem_array *md_array, + grpc_error *error) { GRPC_ERROR_UNREF(error); } @@ -56,7 +54,7 @@ static grpc_call_credentials_vtable iam_vtable = { grpc_call_credentials *grpc_google_iam_credentials_create( const char *token, const char *authority_selector, void *reserved) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GRPC_API_TRACE( "grpc_iam_credentials_create(token=%s, authority_selector=%s, " "reserved=%p)", @@ -70,17 +68,15 @@ grpc_call_credentials *grpc_google_iam_credentials_create( c->base.vtable = &iam_vtable; gpr_ref_init(&c->base.refcount, 1); grpc_mdelem md = grpc_mdelem_from_slices( - &exec_ctx, grpc_slice_from_static_string(GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY), grpc_slice_from_copied_string(token)); grpc_credentials_mdelem_array_add(&c->md_array, md); - GRPC_MDELEM_UNREF(&exec_ctx, md); + GRPC_MDELEM_UNREF(md); md = grpc_mdelem_from_slices( - &exec_ctx, grpc_slice_from_static_string(GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY), grpc_slice_from_copied_string(authority_selector)); grpc_credentials_mdelem_array_add(&c->md_array, md); - GRPC_MDELEM_UNREF(&exec_ctx, md); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(md); + grpc_exec_ctx_finish(); return &c->base; } diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.cc b/src/core/lib/security/credentials/jwt/jwt_credentials.cc index 835dd677ed8..15eeaf6bac1 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.cc +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.cc @@ -30,9 +30,8 @@ #include #include -static void jwt_reset_cache(grpc_exec_ctx *exec_ctx, - grpc_service_account_jwt_access_credentials *c) { - GRPC_MDELEM_UNREF(exec_ctx, c->cached.jwt_md); +static void jwt_reset_cache(grpc_service_account_jwt_access_credentials *c) { + GRPC_MDELEM_UNREF(c->cached.jwt_md); c->cached.jwt_md = GRPC_MDNULL; if (c->cached.service_url != NULL) { gpr_free(c->cached.service_url); @@ -41,17 +40,15 @@ static void jwt_reset_cache(grpc_exec_ctx *exec_ctx, c->cached.jwt_expiration = gpr_inf_past(GPR_CLOCK_REALTIME); } -static void jwt_destruct(grpc_exec_ctx *exec_ctx, - grpc_call_credentials *creds) { +static void jwt_destruct(grpc_call_credentials *creds) { grpc_service_account_jwt_access_credentials *c = (grpc_service_account_jwt_access_credentials *)creds; grpc_auth_json_key_destruct(&c->key); - jwt_reset_cache(exec_ctx, c); + jwt_reset_cache(c); gpr_mu_destroy(&c->cache_mu); } -static bool jwt_get_request_metadata(grpc_exec_ctx *exec_ctx, - grpc_call_credentials *creds, +static bool jwt_get_request_metadata(grpc_call_credentials *creds, grpc_polling_entity *pollent, grpc_auth_metadata_context context, grpc_credentials_mdelem_array *md_array, @@ -81,7 +78,7 @@ static bool jwt_get_request_metadata(grpc_exec_ctx *exec_ctx, char *jwt = NULL; /* Generate a new jwt. */ gpr_mu_lock(&c->cache_mu); - jwt_reset_cache(exec_ctx, c); + jwt_reset_cache(c); jwt = grpc_jwt_encode_and_sign(&c->key, context.service_url, c->jwt_lifetime, NULL); if (jwt != NULL) { @@ -92,7 +89,6 @@ static bool jwt_get_request_metadata(grpc_exec_ctx *exec_ctx, gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), c->jwt_lifetime); c->cached.service_url = gpr_strdup(context.service_url); c->cached.jwt_md = grpc_mdelem_from_slices( - exec_ctx, grpc_slice_from_static_string(GRPC_AUTHORIZATION_METADATA_KEY), grpc_slice_from_copied_string(md_value)); gpr_free(md_value); @@ -103,7 +99,7 @@ static bool jwt_get_request_metadata(grpc_exec_ctx *exec_ctx, if (!GRPC_MDISNULL(jwt_md)) { grpc_credentials_mdelem_array_add(md_array, jwt_md); - GRPC_MDELEM_UNREF(exec_ctx, jwt_md); + GRPC_MDELEM_UNREF(jwt_md); } else { *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Could not generate JWT."); } @@ -111,8 +107,8 @@ static bool jwt_get_request_metadata(grpc_exec_ctx *exec_ctx, } static void jwt_cancel_get_request_metadata( - grpc_exec_ctx *exec_ctx, grpc_call_credentials *c, - grpc_credentials_mdelem_array *md_array, grpc_error *error) { + grpc_call_credentials *c, grpc_credentials_mdelem_array *md_array, + grpc_error *error) { GRPC_ERROR_UNREF(error); } @@ -121,8 +117,7 @@ static grpc_call_credentials_vtable jwt_vtable = { grpc_call_credentials * grpc_service_account_jwt_access_credentials_create_from_auth_json_key( - grpc_exec_ctx *exec_ctx, grpc_auth_json_key key, - gpr_timespec token_lifetime) { + grpc_auth_json_key key, gpr_timespec token_lifetime) { grpc_service_account_jwt_access_credentials *c; if (!grpc_auth_json_key_is_valid(&key)) { gpr_log(GPR_ERROR, "Invalid input for jwt credentials creation"); @@ -143,7 +138,7 @@ grpc_service_account_jwt_access_credentials_create_from_auth_json_key( } c->jwt_lifetime = token_lifetime; gpr_mu_init(&c->cache_mu); - jwt_reset_cache(exec_ctx, c); + jwt_reset_cache(c); return &c->base; } @@ -186,11 +181,10 @@ grpc_call_credentials *grpc_service_account_jwt_access_credentials_create( gpr_free(clean_json); } GPR_ASSERT(reserved == NULL); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_call_credentials *creds = grpc_service_account_jwt_access_credentials_create_from_auth_json_key( - &exec_ctx, grpc_auth_json_key_create_from_string(json_key), - token_lifetime); - grpc_exec_ctx_finish(&exec_ctx); + grpc_auth_json_key_create_from_string(json_key), token_lifetime); + grpc_exec_ctx_finish(); return creds; } diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.h b/src/core/lib/security/credentials/jwt/jwt_credentials.h index 5cee6ed0da6..12b39c30f2d 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.h +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.h @@ -46,8 +46,7 @@ typedef struct { // Takes ownership of the key. grpc_call_credentials * grpc_service_account_jwt_access_credentials_create_from_auth_json_key( - grpc_exec_ctx *exec_ctx, grpc_auth_json_key key, - gpr_timespec token_lifetime); + grpc_auth_json_key key, gpr_timespec token_lifetime); #ifdef __cplusplus } diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.cc b/src/core/lib/security/credentials/jwt/jwt_verifier.cc index 39e72c195ba..7e12d157170 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.cc +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.cc @@ -74,12 +74,11 @@ static const EVP_MD *evp_md_from_alg(const char *alg) { } } -static grpc_json *parse_json_part_from_jwt(grpc_exec_ctx *exec_ctx, - const char *str, size_t len, +static grpc_json *parse_json_part_from_jwt(const char *str, size_t len, grpc_slice *buffer) { grpc_json *json; - *buffer = grpc_base64_decode_with_len(exec_ctx, str, len, 1); + *buffer = grpc_base64_decode_with_len(str, len, 1); if (GRPC_SLICE_IS_EMPTY(*buffer)) { gpr_log(GPR_ERROR, "Invalid base64."); return NULL; @@ -87,7 +86,7 @@ static grpc_json *parse_json_part_from_jwt(grpc_exec_ctx *exec_ctx, json = grpc_json_parse_string_with_len((char *)GRPC_SLICE_START_PTR(*buffer), GRPC_SLICE_LENGTH(*buffer)); if (json == NULL) { - grpc_slice_unref_internal(exec_ctx, *buffer); + grpc_slice_unref_internal(*buffer); gpr_log(GPR_ERROR, "JSON parsing error."); } return json; @@ -123,14 +122,13 @@ typedef struct { grpc_slice buffer; } jose_header; -static void jose_header_destroy(grpc_exec_ctx *exec_ctx, jose_header *h) { - grpc_slice_unref_internal(exec_ctx, h->buffer); +static void jose_header_destroy(jose_header *h) { + grpc_slice_unref_internal(h->buffer); gpr_free(h); } /* Takes ownership of json and buffer. */ -static jose_header *jose_header_from_json(grpc_exec_ctx *exec_ctx, - grpc_json *json, grpc_slice buffer) { +static jose_header *jose_header_from_json(grpc_json *json, grpc_slice buffer) { grpc_json *cur; jose_header *h = (jose_header *)gpr_zalloc(sizeof(jose_header)); h->buffer = buffer; @@ -164,7 +162,7 @@ static jose_header *jose_header_from_json(grpc_exec_ctx *exec_ctx, error: grpc_json_destroy(json); - jose_header_destroy(exec_ctx, h); + jose_header_destroy(h); return NULL; } @@ -184,9 +182,9 @@ struct grpc_jwt_claims { grpc_slice buffer; }; -void grpc_jwt_claims_destroy(grpc_exec_ctx *exec_ctx, grpc_jwt_claims *claims) { +void grpc_jwt_claims_destroy(grpc_jwt_claims *claims) { grpc_json_destroy(claims->json); - grpc_slice_unref_internal(exec_ctx, claims->buffer); + grpc_slice_unref_internal(claims->buffer); gpr_free(claims); } @@ -231,8 +229,7 @@ gpr_timespec grpc_jwt_claims_not_before(const grpc_jwt_claims *claims) { } /* Takes ownership of json and buffer even in case of failure. */ -grpc_jwt_claims *grpc_jwt_claims_from_json(grpc_exec_ctx *exec_ctx, - grpc_json *json, grpc_slice buffer) { +grpc_jwt_claims *grpc_jwt_claims_from_json(grpc_json *json, grpc_slice buffer) { grpc_json *cur; grpc_jwt_claims *claims = (grpc_jwt_claims *)gpr_malloc(sizeof(grpc_jwt_claims)); @@ -274,7 +271,7 @@ grpc_jwt_claims *grpc_jwt_claims_from_json(grpc_exec_ctx *exec_ctx, return claims; error: - grpc_jwt_claims_destroy(exec_ctx, claims); + grpc_jwt_claims_destroy(claims); return NULL; } @@ -350,7 +347,7 @@ static verifier_cb_ctx *verifier_cb_ctx_create( grpc_jwt_claims *claims, const char *audience, grpc_slice signature, const char *signed_jwt, size_t signed_jwt_len, void *user_data, grpc_jwt_verification_done_cb cb) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; verifier_cb_ctx *ctx = (verifier_cb_ctx *)gpr_zalloc(sizeof(verifier_cb_ctx)); ctx->verifier = verifier; ctx->pollent = grpc_polling_entity_create_from_pollset(pollset); @@ -361,16 +358,16 @@ static verifier_cb_ctx *verifier_cb_ctx_create( ctx->signed_data = grpc_slice_from_copied_buffer(signed_jwt, signed_jwt_len); ctx->user_data = user_data; ctx->user_cb = cb; - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return ctx; } -void verifier_cb_ctx_destroy(grpc_exec_ctx *exec_ctx, verifier_cb_ctx *ctx) { +void verifier_cb_ctx_destroy(verifier_cb_ctx *ctx) { if (ctx->audience != NULL) gpr_free(ctx->audience); - if (ctx->claims != NULL) grpc_jwt_claims_destroy(exec_ctx, ctx->claims); - grpc_slice_unref_internal(exec_ctx, ctx->signature); - grpc_slice_unref_internal(exec_ctx, ctx->signed_data); - jose_header_destroy(exec_ctx, ctx->header); + if (ctx->claims != NULL) grpc_jwt_claims_destroy(ctx->claims); + grpc_slice_unref_internal(ctx->signature); + grpc_slice_unref_internal(ctx->signed_data); + jose_header_destroy(ctx->header); for (size_t i = 0; i < HTTP_RESPONSE_COUNT; i++) { grpc_http_response_destroy(&ctx->responses[i]); } @@ -450,19 +447,19 @@ end: return result; } -static BIGNUM *bignum_from_base64(grpc_exec_ctx *exec_ctx, const char *b64) { +static BIGNUM *bignum_from_base64(const char *b64) { BIGNUM *result = NULL; grpc_slice bin; if (b64 == NULL) return NULL; - bin = grpc_base64_decode(exec_ctx, b64, 1); + bin = grpc_base64_decode(b64, 1); if (GRPC_SLICE_IS_EMPTY(bin)) { gpr_log(GPR_ERROR, "Invalid base64 for big num."); return NULL; } result = BN_bin2bn(GRPC_SLICE_START_PTR(bin), TSI_SIZE_AS_SIZE(GRPC_SLICE_LENGTH(bin)), NULL); - grpc_slice_unref_internal(exec_ctx, bin); + grpc_slice_unref_internal(bin); return result; } @@ -495,8 +492,7 @@ static int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) { } #endif // OPENSSL_VERSION_NUMBER < 0x10100000L -static EVP_PKEY *pkey_from_jwk(grpc_exec_ctx *exec_ctx, const grpc_json *json, - const char *kty) { +static EVP_PKEY *pkey_from_jwk(const grpc_json *json, const char *kty) { const grpc_json *key_prop; RSA *rsa = NULL; EVP_PKEY *result = NULL; @@ -515,12 +511,10 @@ static EVP_PKEY *pkey_from_jwk(grpc_exec_ctx *exec_ctx, const grpc_json *json, } for (key_prop = json->child; key_prop != NULL; key_prop = key_prop->next) { if (strcmp(key_prop->key, "n") == 0) { - tmp_n = - bignum_from_base64(exec_ctx, validate_string_field(key_prop, "n")); + tmp_n = bignum_from_base64(validate_string_field(key_prop, "n")); if (tmp_n == NULL) goto end; } else if (strcmp(key_prop->key, "e") == 0) { - tmp_e = - bignum_from_base64(exec_ctx, validate_string_field(key_prop, "e")); + tmp_e = bignum_from_base64(validate_string_field(key_prop, "e")); if (tmp_e == NULL) goto end; } } @@ -545,8 +539,7 @@ end: return result; } -static EVP_PKEY *find_verification_key(grpc_exec_ctx *exec_ctx, - const grpc_json *json, +static EVP_PKEY *find_verification_key(const grpc_json *json, const char *header_alg, const char *header_kid) { const grpc_json *jkey; @@ -590,7 +583,7 @@ static EVP_PKEY *find_verification_key(grpc_exec_ctx *exec_ctx, } if (alg != NULL && kid != NULL && kty != NULL && strcmp(kid, header_kid) == 0 && strcmp(alg, header_alg) == 0) { - return pkey_from_jwk(exec_ctx, jkey, kty); + return pkey_from_jwk(jkey, kty); } } gpr_log(GPR_ERROR, @@ -631,8 +624,7 @@ end: return result; } -static void on_keys_retrieved(grpc_exec_ctx *exec_ctx, void *user_data, - grpc_error *error) { +static void on_keys_retrieved(void *user_data, grpc_error *error) { verifier_cb_ctx *ctx = (verifier_cb_ctx *)user_data; grpc_json *json = json_from_http(&ctx->responses[HTTP_RESPONSE_KEYS]); EVP_PKEY *verification_key = NULL; @@ -644,7 +636,7 @@ static void on_keys_retrieved(grpc_exec_ctx *exec_ctx, void *user_data, goto end; } verification_key = - find_verification_key(exec_ctx, json, ctx->header->alg, ctx->header->kid); + find_verification_key(json, ctx->header->alg, ctx->header->kid); if (verification_key == NULL) { gpr_log(GPR_ERROR, "Could not find verification key with kid %s.", ctx->header->kid); @@ -668,12 +660,11 @@ static void on_keys_retrieved(grpc_exec_ctx *exec_ctx, void *user_data, end: if (json != NULL) grpc_json_destroy(json); EVP_PKEY_free(verification_key); - ctx->user_cb(exec_ctx, ctx->user_data, status, claims); - verifier_cb_ctx_destroy(exec_ctx, ctx); + ctx->user_cb(ctx->user_data, status, claims); + verifier_cb_ctx_destroy(ctx); } -static void on_openid_config_retrieved(grpc_exec_ctx *exec_ctx, void *user_data, - grpc_error *error) { +static void on_openid_config_retrieved(void *user_data, grpc_error *error) { const grpc_json *cur; verifier_cb_ctx *ctx = (verifier_cb_ctx *)user_data; const grpc_http_response *response = &ctx->responses[HTTP_RESPONSE_OPENID]; @@ -710,20 +701,19 @@ static void on_openid_config_retrieved(grpc_exec_ctx *exec_ctx, void *user_data, extreme memory pressure. */ resource_quota = grpc_resource_quota_create("jwt_verifier"); grpc_httpcli_get( - exec_ctx, &ctx->verifier->http_ctx, &ctx->pollent, resource_quota, &req, - grpc_exec_ctx_now(exec_ctx) + grpc_jwt_verifier_max_delay, + &ctx->verifier->http_ctx, &ctx->pollent, resource_quota, &req, + grpc_exec_ctx_now() + grpc_jwt_verifier_max_delay, GRPC_CLOSURE_CREATE(on_keys_retrieved, ctx, grpc_schedule_on_exec_ctx), &ctx->responses[HTTP_RESPONSE_KEYS]); - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); grpc_json_destroy(json); gpr_free(req.host); return; error: if (json != NULL) grpc_json_destroy(json); - ctx->user_cb(exec_ctx, ctx->user_data, GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR, - NULL); - verifier_cb_ctx_destroy(exec_ctx, ctx); + ctx->user_cb(ctx->user_data, GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR, NULL); + verifier_cb_ctx_destroy(ctx); } static email_key_mapping *verifier_get_mapping(grpc_jwt_verifier *v, @@ -771,8 +761,7 @@ const char *grpc_jwt_issuer_email_domain(const char *issuer) { } /* Takes ownership of ctx. */ -static void retrieve_key_and_verify(grpc_exec_ctx *exec_ctx, - verifier_cb_ctx *ctx) { +static void retrieve_key_and_verify(verifier_cb_ctx *ctx) { const char *email_domain; grpc_closure *http_cb; char *path_prefix = NULL; @@ -838,23 +827,20 @@ static void retrieve_key_and_verify(grpc_exec_ctx *exec_ctx, channel. This would allow us to cancel an authentication query when under extreme memory pressure. */ resource_quota = grpc_resource_quota_create("jwt_verifier"); - grpc_httpcli_get(exec_ctx, &ctx->verifier->http_ctx, &ctx->pollent, - resource_quota, &req, - grpc_exec_ctx_now(exec_ctx) + grpc_jwt_verifier_max_delay, + grpc_httpcli_get(&ctx->verifier->http_ctx, &ctx->pollent, resource_quota, + &req, grpc_exec_ctx_now() + grpc_jwt_verifier_max_delay, http_cb, &ctx->responses[rsp_idx]); - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); gpr_free(req.host); gpr_free(req.http.path); return; error: - ctx->user_cb(exec_ctx, ctx->user_data, GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR, - NULL); - verifier_cb_ctx_destroy(exec_ctx, ctx); + ctx->user_cb(ctx->user_data, GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR, NULL); + verifier_cb_ctx_destroy(ctx); } -void grpc_jwt_verifier_verify(grpc_exec_ctx *exec_ctx, - grpc_jwt_verifier *verifier, +void grpc_jwt_verifier_verify(grpc_jwt_verifier *verifier, grpc_pollset *pollset, const char *jwt, const char *audience, grpc_jwt_verification_done_cb cb, @@ -872,35 +858,32 @@ void grpc_jwt_verifier_verify(grpc_exec_ctx *exec_ctx, GPR_ASSERT(verifier != NULL && jwt != NULL && audience != NULL && cb != NULL); dot = strchr(cur, '.'); if (dot == NULL) goto error; - json = parse_json_part_from_jwt(exec_ctx, cur, (size_t)(dot - cur), - &header_buffer); + json = parse_json_part_from_jwt(cur, (size_t)(dot - cur), &header_buffer); if (json == NULL) goto error; - header = jose_header_from_json(exec_ctx, json, header_buffer); + header = jose_header_from_json(json, header_buffer); if (header == NULL) goto error; cur = dot + 1; dot = strchr(cur, '.'); if (dot == NULL) goto error; - json = parse_json_part_from_jwt(exec_ctx, cur, (size_t)(dot - cur), - &claims_buffer); + json = parse_json_part_from_jwt(cur, (size_t)(dot - cur), &claims_buffer); if (json == NULL) goto error; - claims = grpc_jwt_claims_from_json(exec_ctx, json, claims_buffer); + claims = grpc_jwt_claims_from_json(json, claims_buffer); if (claims == NULL) goto error; signed_jwt_len = (size_t)(dot - jwt); cur = dot + 1; - signature = grpc_base64_decode(exec_ctx, cur, 1); + signature = grpc_base64_decode(cur, 1); if (GRPC_SLICE_IS_EMPTY(signature)) goto error; retrieve_key_and_verify( - exec_ctx, verifier_cb_ctx_create(verifier, pollset, header, claims, audience, signature, jwt, signed_jwt_len, user_data, cb)); return; error: - if (header != NULL) jose_header_destroy(exec_ctx, header); - if (claims != NULL) grpc_jwt_claims_destroy(exec_ctx, claims); - cb(exec_ctx, user_data, GRPC_JWT_VERIFIER_BAD_FORMAT, NULL); + if (header != NULL) jose_header_destroy(header); + if (claims != NULL) grpc_jwt_claims_destroy(claims); + cb(user_data, GRPC_JWT_VERIFIER_BAD_FORMAT, NULL); } grpc_jwt_verifier *grpc_jwt_verifier_create( @@ -927,10 +910,10 @@ grpc_jwt_verifier *grpc_jwt_verifier_create( return v; } -void grpc_jwt_verifier_destroy(grpc_exec_ctx *exec_ctx, grpc_jwt_verifier *v) { +void grpc_jwt_verifier_destroy(grpc_jwt_verifier *v) { size_t i; if (v == NULL) return; - grpc_httpcli_context_destroy(exec_ctx, &v->http_ctx); + grpc_httpcli_context_destroy(&v->http_ctx); if (v->mappings != NULL) { for (i = 0; i < v->num_mappings; i++) { gpr_free(v->mappings[i].email_domain); diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.h b/src/core/lib/security/credentials/jwt/jwt_verifier.h index 998365e75c8..671a52d7395 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.h +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.h @@ -55,7 +55,7 @@ const char *grpc_jwt_verifier_status_to_string(grpc_jwt_verifier_status status); typedef struct grpc_jwt_claims grpc_jwt_claims; -void grpc_jwt_claims_destroy(grpc_exec_ctx *exec_ctx, grpc_jwt_claims *claims); +void grpc_jwt_claims_destroy(grpc_jwt_claims *claims); /* Returns the whole JSON tree of the claims. */ const grpc_json *grpc_jwt_claims_json(const grpc_jwt_claims *claims); @@ -98,21 +98,18 @@ grpc_jwt_verifier *grpc_jwt_verifier_create( size_t num_mappings); /*The verifier must not be destroyed if there are still outstanding callbacks.*/ -void grpc_jwt_verifier_destroy(grpc_exec_ctx *exec_ctx, - grpc_jwt_verifier *verifier); +void grpc_jwt_verifier_destroy(grpc_jwt_verifier *verifier); /* User provided callback that will be called when the verification of the JWT is done (maybe in another thread). It is the responsibility of the callee to call grpc_jwt_claims_destroy on the claims. */ -typedef void (*grpc_jwt_verification_done_cb)(grpc_exec_ctx *exec_ctx, - void *user_data, +typedef void (*grpc_jwt_verification_done_cb)(void *user_data, grpc_jwt_verifier_status status, grpc_jwt_claims *claims); /* Verifies for the JWT for the given expected audience. */ -void grpc_jwt_verifier_verify(grpc_exec_ctx *exec_ctx, - grpc_jwt_verifier *verifier, +void grpc_jwt_verifier_verify(grpc_jwt_verifier *verifier, grpc_pollset *pollset, const char *jwt, const char *audience, grpc_jwt_verification_done_cb cb, @@ -120,8 +117,7 @@ void grpc_jwt_verifier_verify(grpc_exec_ctx *exec_ctx, /* --- TESTING ONLY exposed functions. --- */ -grpc_jwt_claims *grpc_jwt_claims_from_json(grpc_exec_ctx *exec_ctx, - grpc_json *json, grpc_slice buffer); +grpc_jwt_claims *grpc_jwt_claims_from_json(grpc_json *json, grpc_slice buffer); grpc_jwt_verifier_status grpc_jwt_claims_check(const grpc_jwt_claims *claims, const char *audience); const char *grpc_jwt_issuer_email_domain(const char *issuer); diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index f52a424e363..7dd75ed4e37 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -103,21 +103,19 @@ void grpc_auth_refresh_token_destruct(grpc_auth_refresh_token *refresh_token) { // Oauth2 Token Fetcher credentials. // -static void oauth2_token_fetcher_destruct(grpc_exec_ctx *exec_ctx, - grpc_call_credentials *creds) { +static void oauth2_token_fetcher_destruct(grpc_call_credentials *creds) { grpc_oauth2_token_fetcher_credentials *c = (grpc_oauth2_token_fetcher_credentials *)creds; - GRPC_MDELEM_UNREF(exec_ctx, c->access_token_md); + GRPC_MDELEM_UNREF(c->access_token_md); gpr_mu_destroy(&c->mu); - grpc_pollset_set_destroy(exec_ctx, - grpc_polling_entity_pollset_set(&c->pollent)); - grpc_httpcli_context_destroy(exec_ctx, &c->httpcli_context); + grpc_pollset_set_destroy(grpc_polling_entity_pollset_set(&c->pollent)); + grpc_httpcli_context_destroy(&c->httpcli_context); } grpc_credentials_status grpc_oauth2_token_fetcher_credentials_parse_server_response( - grpc_exec_ctx *exec_ctx, const grpc_http_response *response, - grpc_mdelem *token_md, grpc_millis *token_lifetime) { + const grpc_http_response *response, grpc_mdelem *token_md, + grpc_millis *token_lifetime) { char *null_terminated_body = NULL; char *new_access_token = NULL; grpc_credentials_status status = GRPC_CREDENTIALS_OK; @@ -184,9 +182,8 @@ grpc_oauth2_token_fetcher_credentials_parse_server_response( gpr_asprintf(&new_access_token, "%s %s", token_type->value, access_token->value); *token_lifetime = strtol(expires_in->value, NULL, 10) * GPR_MS_PER_SEC; - if (!GRPC_MDISNULL(*token_md)) GRPC_MDELEM_UNREF(exec_ctx, *token_md); + if (!GRPC_MDISNULL(*token_md)) GRPC_MDELEM_UNREF(*token_md); *token_md = grpc_mdelem_from_slices( - exec_ctx, grpc_slice_from_static_string(GRPC_AUTHORIZATION_METADATA_KEY), grpc_slice_from_copied_string(new_access_token)); status = GRPC_CREDENTIALS_OK; @@ -194,7 +191,7 @@ grpc_oauth2_token_fetcher_credentials_parse_server_response( end: if (status != GRPC_CREDENTIALS_OK && !GRPC_MDISNULL(*token_md)) { - GRPC_MDELEM_UNREF(exec_ctx, *token_md); + GRPC_MDELEM_UNREF(*token_md); *token_md = GRPC_MDNULL; } if (null_terminated_body != NULL) gpr_free(null_terminated_body); @@ -203,8 +200,7 @@ end: return status; } -static void on_oauth2_token_fetcher_http_response(grpc_exec_ctx *exec_ctx, - void *user_data, +static void on_oauth2_token_fetcher_http_response(void *user_data, grpc_error *error) { GRPC_LOG_IF_ERROR("oauth_fetch", GRPC_ERROR_REF(error)); grpc_credentials_metadata_request *r = @@ -215,14 +211,13 @@ static void on_oauth2_token_fetcher_http_response(grpc_exec_ctx *exec_ctx, grpc_millis token_lifetime; grpc_credentials_status status = grpc_oauth2_token_fetcher_credentials_parse_server_response( - exec_ctx, &r->response, &access_token_md, &token_lifetime); + &r->response, &access_token_md, &token_lifetime); // Update cache and grab list of pending requests. gpr_mu_lock(&c->mu); c->token_fetch_pending = false; c->access_token_md = GRPC_MDELEM_REF(access_token_md); - c->token_expiration = status == GRPC_CREDENTIALS_OK - ? grpc_exec_ctx_now(exec_ctx) + token_lifetime - : 0; + c->token_expiration = + status == GRPC_CREDENTIALS_OK ? grpc_exec_ctx_now() + token_lifetime : 0; grpc_oauth2_pending_get_request_metadata *pending_request = c->pending_requests; c->pending_requests = NULL; @@ -236,24 +231,22 @@ static void on_oauth2_token_fetcher_http_response(grpc_exec_ctx *exec_ctx, error = GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Error occured when fetching oauth2 token.", &error, 1); } - GRPC_CLOSURE_SCHED(exec_ctx, pending_request->on_request_metadata, error); + GRPC_CLOSURE_SCHED(pending_request->on_request_metadata, error); grpc_polling_entity_del_from_pollset_set( - exec_ctx, pending_request->pollent, - grpc_polling_entity_pollset_set(&c->pollent)); + pending_request->pollent, grpc_polling_entity_pollset_set(&c->pollent)); grpc_oauth2_pending_get_request_metadata *prev = pending_request; pending_request = pending_request->next; gpr_free(prev); } - GRPC_MDELEM_UNREF(exec_ctx, access_token_md); - grpc_call_credentials_unref(exec_ctx, r->creds); - grpc_credentials_metadata_request_destroy(exec_ctx, r); + GRPC_MDELEM_UNREF(access_token_md); + grpc_call_credentials_unref(r->creds); + grpc_credentials_metadata_request_destroy(r); } static bool oauth2_token_fetcher_get_request_metadata( - grpc_exec_ctx *exec_ctx, grpc_call_credentials *creds, - grpc_polling_entity *pollent, grpc_auth_metadata_context context, - grpc_credentials_mdelem_array *md_array, grpc_closure *on_request_metadata, - grpc_error **error) { + grpc_call_credentials *creds, grpc_polling_entity *pollent, + grpc_auth_metadata_context context, grpc_credentials_mdelem_array *md_array, + grpc_closure *on_request_metadata, grpc_error **error) { grpc_oauth2_token_fetcher_credentials *c = (grpc_oauth2_token_fetcher_credentials *)creds; // Check if we can use the cached token. @@ -262,13 +255,13 @@ static bool oauth2_token_fetcher_get_request_metadata( grpc_mdelem cached_access_token_md = GRPC_MDNULL; gpr_mu_lock(&c->mu); if (!GRPC_MDISNULL(c->access_token_md) && - (c->token_expiration + grpc_exec_ctx_now(exec_ctx) > refresh_threshold)) { + (c->token_expiration + grpc_exec_ctx_now() > refresh_threshold)) { cached_access_token_md = GRPC_MDELEM_REF(c->access_token_md); } if (!GRPC_MDISNULL(cached_access_token_md)) { gpr_mu_unlock(&c->mu); grpc_credentials_mdelem_array_add(md_array, cached_access_token_md); - GRPC_MDELEM_UNREF(exec_ctx, cached_access_token_md); + GRPC_MDELEM_UNREF(cached_access_token_md); return true; } // Couldn't get the token from the cache. @@ -280,7 +273,7 @@ static bool oauth2_token_fetcher_get_request_metadata( pending_request->on_request_metadata = on_request_metadata; pending_request->pollent = pollent; grpc_polling_entity_add_to_pollset_set( - exec_ctx, pollent, grpc_polling_entity_pollset_set(&c->pollent)); + pollent, grpc_polling_entity_pollset_set(&c->pollent)); pending_request->next = c->pending_requests; c->pending_requests = pending_request; bool start_fetch = false; @@ -291,17 +284,17 @@ static bool oauth2_token_fetcher_get_request_metadata( gpr_mu_unlock(&c->mu); if (start_fetch) { grpc_call_credentials_ref(creds); - c->fetch_func(exec_ctx, grpc_credentials_metadata_request_create(creds), + c->fetch_func(grpc_credentials_metadata_request_create(creds), &c->httpcli_context, &c->pollent, on_oauth2_token_fetcher_http_response, - grpc_exec_ctx_now(exec_ctx) + refresh_threshold); + grpc_exec_ctx_now() + refresh_threshold); } return false; } static void oauth2_token_fetcher_cancel_get_request_metadata( - grpc_exec_ctx *exec_ctx, grpc_call_credentials *creds, - grpc_credentials_mdelem_array *md_array, grpc_error *error) { + grpc_call_credentials *creds, grpc_credentials_mdelem_array *md_array, + grpc_error *error) { grpc_oauth2_token_fetcher_credentials *c = (grpc_oauth2_token_fetcher_credentials *)creds; gpr_mu_lock(&c->mu); @@ -317,7 +310,7 @@ static void oauth2_token_fetcher_cancel_get_request_metadata( c->pending_requests = pending_request->next; } // Invoke the callback immediately with an error. - GRPC_CLOSURE_SCHED(exec_ctx, pending_request->on_request_metadata, + GRPC_CLOSURE_SCHED(pending_request->on_request_metadata, GRPC_ERROR_REF(error)); gpr_free(pending_request); break; @@ -351,7 +344,7 @@ static grpc_call_credentials_vtable compute_engine_vtable = { oauth2_token_fetcher_cancel_get_request_metadata}; static void compute_engine_fetch_oauth2( - grpc_exec_ctx *exec_ctx, grpc_credentials_metadata_request *metadata_req, + grpc_credentials_metadata_request *metadata_req, grpc_httpcli_context *httpcli_context, grpc_polling_entity *pollent, grpc_iomgr_cb_func response_cb, grpc_millis deadline) { grpc_http_header header = {(char *)"Metadata-Flavor", (char *)"Google"}; @@ -367,10 +360,10 @@ static void compute_engine_fetch_oauth2( grpc_resource_quota *resource_quota = grpc_resource_quota_create("oauth2_credentials"); grpc_httpcli_get( - exec_ctx, httpcli_context, pollent, resource_quota, &request, deadline, + httpcli_context, pollent, resource_quota, &request, deadline, GRPC_CLOSURE_CREATE(response_cb, metadata_req, grpc_schedule_on_exec_ctx), &metadata_req->response); - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); } grpc_call_credentials *grpc_google_compute_engine_credentials_create( @@ -390,12 +383,11 @@ grpc_call_credentials *grpc_google_compute_engine_credentials_create( // Google Refresh Token credentials. // -static void refresh_token_destruct(grpc_exec_ctx *exec_ctx, - grpc_call_credentials *creds) { +static void refresh_token_destruct(grpc_call_credentials *creds) { grpc_google_refresh_token_credentials *c = (grpc_google_refresh_token_credentials *)creds; grpc_auth_refresh_token_destruct(&c->refresh_token); - oauth2_token_fetcher_destruct(exec_ctx, &c->base.base); + oauth2_token_fetcher_destruct(&c->base.base); } static grpc_call_credentials_vtable refresh_token_vtable = { @@ -403,7 +395,7 @@ static grpc_call_credentials_vtable refresh_token_vtable = { oauth2_token_fetcher_cancel_get_request_metadata}; static void refresh_token_fetch_oauth2( - grpc_exec_ctx *exec_ctx, grpc_credentials_metadata_request *metadata_req, + grpc_credentials_metadata_request *metadata_req, grpc_httpcli_context *httpcli_context, grpc_polling_entity *pollent, grpc_iomgr_cb_func response_cb, grpc_millis deadline) { grpc_google_refresh_token_credentials *c = @@ -427,11 +419,11 @@ static void refresh_token_fetch_oauth2( grpc_resource_quota *resource_quota = grpc_resource_quota_create("oauth2_credentials_refresh"); grpc_httpcli_post( - exec_ctx, httpcli_context, pollent, resource_quota, &request, body, - strlen(body), deadline, + httpcli_context, pollent, resource_quota, &request, body, strlen(body), + deadline, GRPC_CLOSURE_CREATE(response_cb, metadata_req, grpc_schedule_on_exec_ctx), &metadata_req->response); - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); gpr_free(body); } @@ -483,25 +475,23 @@ grpc_call_credentials *grpc_google_refresh_token_credentials_create( // Oauth2 Access Token credentials. // -static void access_token_destruct(grpc_exec_ctx *exec_ctx, - grpc_call_credentials *creds) { +static void access_token_destruct(grpc_call_credentials *creds) { grpc_access_token_credentials *c = (grpc_access_token_credentials *)creds; - GRPC_MDELEM_UNREF(exec_ctx, c->access_token_md); + GRPC_MDELEM_UNREF(c->access_token_md); } static bool access_token_get_request_metadata( - grpc_exec_ctx *exec_ctx, grpc_call_credentials *creds, - grpc_polling_entity *pollent, grpc_auth_metadata_context context, - grpc_credentials_mdelem_array *md_array, grpc_closure *on_request_metadata, - grpc_error **error) { + grpc_call_credentials *creds, grpc_polling_entity *pollent, + grpc_auth_metadata_context context, grpc_credentials_mdelem_array *md_array, + grpc_closure *on_request_metadata, grpc_error **error) { grpc_access_token_credentials *c = (grpc_access_token_credentials *)creds; grpc_credentials_mdelem_array_add(md_array, c->access_token_md); return true; } static void access_token_cancel_get_request_metadata( - grpc_exec_ctx *exec_ctx, grpc_call_credentials *c, - grpc_credentials_mdelem_array *md_array, grpc_error *error) { + grpc_call_credentials *c, grpc_credentials_mdelem_array *md_array, + grpc_error *error) { GRPC_ERROR_UNREF(error); } @@ -524,11 +514,11 @@ grpc_call_credentials *grpc_access_token_credentials_create( gpr_ref_init(&c->base.refcount, 1); char *token_md_value; gpr_asprintf(&token_md_value, "Bearer %s", access_token); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; c->access_token_md = grpc_mdelem_from_slices( - &exec_ctx, grpc_slice_from_static_string(GRPC_AUTHORIZATION_METADATA_KEY), + grpc_slice_from_static_string(GRPC_AUTHORIZATION_METADATA_KEY), grpc_slice_from_copied_string(token_md_value)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_free(token_md_value); return &c->base; } diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h index c12db896f33..b7b5f587461 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h @@ -56,8 +56,7 @@ void grpc_auth_refresh_token_destruct(grpc_auth_refresh_token *refresh_token); // This object is a base for credentials that need to acquire an oauth2 token // from an http service. -typedef void (*grpc_fetch_oauth2_func)(grpc_exec_ctx *exec_ctx, - grpc_credentials_metadata_request *req, +typedef void (*grpc_fetch_oauth2_func)(grpc_credentials_metadata_request *req, grpc_httpcli_context *http_context, grpc_polling_entity *pollent, grpc_iomgr_cb_func cb, @@ -103,8 +102,8 @@ grpc_refresh_token_credentials_create_from_auth_refresh_token( // Exposed for testing only. grpc_credentials_status grpc_oauth2_token_fetcher_credentials_parse_server_response( - grpc_exec_ctx *exec_ctx, const struct grpc_http_response *response, - grpc_mdelem *token_md, grpc_millis *token_lifetime); + const struct grpc_http_response *response, grpc_mdelem *token_md, + grpc_millis *token_lifetime); #ifdef __cplusplus } diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.cc b/src/core/lib/security/credentials/plugin/plugin_credentials.cc index 8106a730fea..c91d147ea53 100644 --- a/src/core/lib/security/credentials/plugin/plugin_credentials.cc +++ b/src/core/lib/security/credentials/plugin/plugin_credentials.cc @@ -34,8 +34,7 @@ grpc_tracer_flag grpc_plugin_credentials_trace = GRPC_TRACER_INITIALIZER(false, "plugin_credentials"); -static void plugin_destruct(grpc_exec_ctx *exec_ctx, - grpc_call_credentials *creds) { +static void plugin_destruct(grpc_call_credentials *creds) { grpc_plugin_credentials *c = (grpc_plugin_credentials *)creds; gpr_mu_destroy(&c->mu); if (c->plugin.state != NULL && c->plugin.destroy != NULL) { @@ -62,18 +61,17 @@ static void pending_request_remove_locked( // When this returns, r->cancelled indicates whether the request was // cancelled before completion. static void pending_request_complete( - grpc_exec_ctx *exec_ctx, grpc_plugin_credentials_pending_request *r) { + grpc_plugin_credentials_pending_request *r) { gpr_mu_lock(&r->creds->mu); if (!r->cancelled) pending_request_remove_locked(r->creds, r); gpr_mu_unlock(&r->creds->mu); // Ref to credentials not needed anymore. - grpc_call_credentials_unref(exec_ctx, &r->creds->base); + grpc_call_credentials_unref(&r->creds->base); } static grpc_error *process_plugin_result( - grpc_exec_ctx *exec_ctx, grpc_plugin_credentials_pending_request *r, - const grpc_metadata *md, size_t num_md, grpc_status_code status, - const char *error_details) { + grpc_plugin_credentials_pending_request *r, const grpc_metadata *md, + size_t num_md, grpc_status_code status, const char *error_details) { grpc_error *error = GRPC_ERROR_NONE; if (status != GRPC_STATUS_OK) { char *msg; @@ -101,11 +99,11 @@ static grpc_error *process_plugin_result( error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Illegal metadata"); } else { for (size_t i = 0; i < num_md; ++i) { - grpc_mdelem mdelem = grpc_mdelem_from_slices( - exec_ctx, grpc_slice_ref_internal(md[i].key), - grpc_slice_ref_internal(md[i].value)); + grpc_mdelem mdelem = + grpc_mdelem_from_slices(grpc_slice_ref_internal(md[i].key), + grpc_slice_ref_internal(md[i].value)); grpc_credentials_mdelem_array_add(r->md_array, mdelem); - GRPC_MDELEM_UNREF(exec_ctx, mdelem); + GRPC_MDELEM_UNREF(mdelem); } } } @@ -118,7 +116,7 @@ static void plugin_md_request_metadata_ready(void *request, grpc_status_code status, const char *error_details) { /* called from application code */ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INITIALIZER( + ExecCtx _local_exec_ctx( GRPC_EXEC_CTX_FLAG_IS_FINISHED | GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP, NULL, NULL); grpc_plugin_credentials_pending_request *r = @@ -130,12 +128,12 @@ static void plugin_md_request_metadata_ready(void *request, r->creds, r); } // Remove request from pending list if not previously cancelled. - pending_request_complete(&exec_ctx, r); + pending_request_complete(r); // If it has not been cancelled, process it. if (!r->cancelled) { grpc_error *error = - process_plugin_result(&exec_ctx, r, md, num_md, status, error_details); - GRPC_CLOSURE_SCHED(&exec_ctx, r->on_request_metadata, error); + process_plugin_result(r, md, num_md, status, error_details); + GRPC_CLOSURE_SCHED(r->on_request_metadata, error); } else if (GRPC_TRACER_ON(grpc_plugin_credentials_trace)) { gpr_log(GPR_INFO, "plugin_credentials[%p]: request %p: plugin was previously " @@ -143,11 +141,10 @@ static void plugin_md_request_metadata_ready(void *request, r->creds, r); } gpr_free(r); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } -static bool plugin_get_request_metadata(grpc_exec_ctx *exec_ctx, - grpc_call_credentials *creds, +static bool plugin_get_request_metadata(grpc_call_credentials *creds, grpc_polling_entity *pollent, grpc_auth_metadata_context context, grpc_credentials_mdelem_array *md_array, @@ -195,7 +192,7 @@ static bool plugin_get_request_metadata(grpc_exec_ctx *exec_ctx, } // Returned synchronously. // Remove request from pending list if not previously cancelled. - pending_request_complete(exec_ctx, pending_request); + pending_request_complete(pending_request); // If the request was cancelled, the error will have been returned // asynchronously by plugin_cancel_get_request_metadata(), so return // false. Otherwise, process the result. @@ -214,13 +211,13 @@ static bool plugin_get_request_metadata(grpc_exec_ctx *exec_ctx, "synchronously", c, pending_request); } - *error = process_plugin_result(exec_ctx, pending_request, creds_md, - num_creds_md, status, error_details); + *error = process_plugin_result(pending_request, creds_md, num_creds_md, + status, error_details); } // Clean up. for (size_t i = 0; i < num_creds_md; ++i) { - grpc_slice_unref_internal(exec_ctx, creds_md[i].key); - grpc_slice_unref_internal(exec_ctx, creds_md[i].value); + grpc_slice_unref_internal(creds_md[i].key); + grpc_slice_unref_internal(creds_md[i].value); } gpr_free((void *)error_details); gpr_free(pending_request); @@ -229,8 +226,8 @@ static bool plugin_get_request_metadata(grpc_exec_ctx *exec_ctx, } static void plugin_cancel_get_request_metadata( - grpc_exec_ctx *exec_ctx, grpc_call_credentials *creds, - grpc_credentials_mdelem_array *md_array, grpc_error *error) { + grpc_call_credentials *creds, grpc_credentials_mdelem_array *md_array, + grpc_error *error) { grpc_plugin_credentials *c = (grpc_plugin_credentials *)creds; gpr_mu_lock(&c->mu); for (grpc_plugin_credentials_pending_request *pending_request = @@ -242,7 +239,7 @@ static void plugin_cancel_get_request_metadata( pending_request); } pending_request->cancelled = true; - GRPC_CLOSURE_SCHED(exec_ctx, pending_request->on_request_metadata, + GRPC_CLOSURE_SCHED(pending_request->on_request_metadata, GRPC_ERROR_REF(error)); pending_request_remove_locked(c, pending_request); break; diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.cc b/src/core/lib/security/credentials/ssl/ssl_credentials.cc index 290336adc05..e78c20d34a2 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.cc +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.cc @@ -38,18 +38,16 @@ static void ssl_config_pem_key_cert_pair_destroy( gpr_free((void *)kp->cert_chain); } -static void ssl_destruct(grpc_exec_ctx *exec_ctx, - grpc_channel_credentials *creds) { +static void ssl_destruct(grpc_channel_credentials *creds) { grpc_ssl_credentials *c = (grpc_ssl_credentials *)creds; gpr_free(c->config.pem_root_certs); ssl_config_pem_key_cert_pair_destroy(&c->config.pem_key_cert_pair); } static grpc_security_status ssl_create_security_connector( - grpc_exec_ctx *exec_ctx, grpc_channel_credentials *creds, - grpc_call_credentials *call_creds, const char *target, - const grpc_channel_args *args, grpc_channel_security_connector **sc, - grpc_channel_args **new_args) { + grpc_channel_credentials *creds, grpc_call_credentials *call_creds, + const char *target, const grpc_channel_args *args, + grpc_channel_security_connector **sc, grpc_channel_args **new_args) { grpc_ssl_credentials *c = (grpc_ssl_credentials *)creds; grpc_security_status status = GRPC_SECURITY_OK; const char *overridden_target_name = NULL; @@ -62,7 +60,8 @@ static grpc_security_status ssl_create_security_connector( } } status = grpc_ssl_channel_security_connector_create( - exec_ctx, creds, call_creds, &c->config, target, overridden_target_name, + creds, call_creds, &c->config, target, overridden_target_name, + sc); if (status != GRPC_SECURITY_OK) { return status; @@ -114,8 +113,7 @@ grpc_channel_credentials *grpc_ssl_credentials_create( // SSL Server Credentials. // -static void ssl_server_destruct(grpc_exec_ctx *exec_ctx, - grpc_server_credentials *creds) { +static void ssl_server_destruct(grpc_server_credentials *creds) { grpc_ssl_server_credentials *c = (grpc_ssl_server_credentials *)creds; size_t i; for (i = 0; i < c->config.num_key_cert_pairs; i++) { @@ -126,11 +124,9 @@ static void ssl_server_destruct(grpc_exec_ctx *exec_ctx, } static grpc_security_status ssl_server_create_security_connector( - grpc_exec_ctx *exec_ctx, grpc_server_credentials *creds, - grpc_server_security_connector **sc) { + grpc_server_credentials *creds, grpc_server_security_connector **sc) { grpc_ssl_server_credentials *c = (grpc_ssl_server_credentials *)creds; - return grpc_ssl_server_security_connector_create(exec_ctx, creds, &c->config, - sc); + return grpc_ssl_server_security_connector_create(creds, &c->config, sc); } static grpc_server_credentials_vtable ssl_server_vtable = { diff --git a/src/core/lib/security/transport/client_auth_filter.cc b/src/core/lib/security/transport/client_auth_filter.cc index a8464dbf9e7..8e1853b9ec9 100644 --- a/src/core/lib/security/transport/client_auth_filter.cc +++ b/src/core/lib/security/transport/client_auth_filter.cc @@ -90,8 +90,7 @@ static void add_error(grpc_error **combined, grpc_error *error) { *combined = grpc_error_add_child(*combined, error); } -static void on_credentials_metadata(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *input_error) { +static void on_credentials_metadata(void *arg, grpc_error *input_error) { grpc_transport_stream_op_batch *batch = (grpc_transport_stream_op_batch *)arg; grpc_call_element *elem = (grpc_call_element *)batch->handler_private.extra_arg; @@ -105,16 +104,16 @@ static void on_credentials_metadata(grpc_exec_ctx *exec_ctx, void *arg, batch->payload->send_initial_metadata.send_initial_metadata; for (size_t i = 0; i < calld->md_array.size; ++i) { add_error(&error, grpc_metadata_batch_add_tail( - exec_ctx, mdb, &calld->md_links[i], + mdb, &calld->md_links[i], GRPC_MDELEM_REF(calld->md_array.md[i]))); } } if (error == GRPC_ERROR_NONE) { - grpc_call_next_op(exec_ctx, elem, batch); + grpc_call_next_op(elem, batch); } else { error = grpc_error_set_int(error, GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAUTHENTICATED); - grpc_transport_stream_op_batch_finish_with_failure(exec_ctx, batch, error, + grpc_transport_stream_op_batch_finish_with_failure(batch, error, calld->call_combiner); } } @@ -149,20 +148,17 @@ void build_auth_metadata_context(grpc_security_connector *sc, gpr_free(host); } -static void cancel_get_request_metadata(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void cancel_get_request_metadata(void *arg, grpc_error *error) { grpc_call_element *elem = (grpc_call_element *)arg; call_data *calld = (call_data *)elem->call_data; if (error != GRPC_ERROR_NONE) { grpc_call_credentials_cancel_get_request_metadata( - exec_ctx, calld->creds, &calld->md_array, GRPC_ERROR_REF(error)); + calld->creds, &calld->md_array, GRPC_ERROR_REF(error)); } - GRPC_CALL_STACK_UNREF(exec_ctx, calld->owning_call, - "cancel_get_request_metadata"); + GRPC_CALL_STACK_UNREF(calld->owning_call, "cancel_get_request_metadata"); } -static void send_security_metadata(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static void send_security_metadata(grpc_call_element *elem, grpc_transport_stream_op_batch *batch) { call_data *calld = (call_data *)elem->call_data; channel_data *chand = (channel_data *)elem->channel_data; @@ -176,7 +172,7 @@ static void send_security_metadata(grpc_exec_ctx *exec_ctx, if (channel_call_creds == NULL && !call_creds_has_md) { /* Skip sending metadata altogether. */ - grpc_call_next_op(exec_ctx, elem, batch); + grpc_call_next_op(elem, batch); return; } @@ -185,11 +181,10 @@ static void send_security_metadata(grpc_exec_ctx *exec_ctx, ctx->creds, NULL); if (calld->creds == NULL) { grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, batch, - grpc_error_set_int( - GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Incompatible credentials set on channel and call."), - GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAUTHENTICATED), + batch, grpc_error_set_int( + GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Incompatible credentials set on channel and call."), + GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAUTHENTICATED), calld->call_combiner); return; } @@ -207,30 +202,29 @@ static void send_security_metadata(grpc_exec_ctx *exec_ctx, batch, grpc_schedule_on_exec_ctx); grpc_error *error = GRPC_ERROR_NONE; if (grpc_call_credentials_get_request_metadata( - exec_ctx, calld->creds, calld->pollent, calld->auth_md_context, + calld->creds, calld->pollent, calld->auth_md_context, &calld->md_array, &calld->async_result_closure, &error)) { // Synchronous return; invoke on_credentials_metadata() directly. - on_credentials_metadata(exec_ctx, batch, error); + on_credentials_metadata(batch, error); GRPC_ERROR_UNREF(error); } else { // Async return; register cancellation closure with call combiner. GRPC_CALL_STACK_REF(calld->owning_call, "cancel_get_request_metadata"); grpc_call_combiner_set_notify_on_cancel( - exec_ctx, calld->call_combiner, + calld->call_combiner, GRPC_CLOSURE_INIT(&calld->get_request_metadata_cancel_closure, cancel_get_request_metadata, elem, grpc_schedule_on_exec_ctx)); } } -static void on_host_checked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void on_host_checked(void *arg, grpc_error *error) { grpc_transport_stream_op_batch *batch = (grpc_transport_stream_op_batch *)arg; grpc_call_element *elem = (grpc_call_element *)batch->handler_private.extra_arg; call_data *calld = (call_data *)elem->call_data; if (error == GRPC_ERROR_NONE) { - send_security_metadata(exec_ctx, elem, batch); + send_security_metadata(elem, batch); } else { char *error_msg; char *host = grpc_slice_to_c_string(calld->host); @@ -238,31 +232,28 @@ static void on_host_checked(grpc_exec_ctx *exec_ctx, void *arg, host); gpr_free(host); grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, batch, - grpc_error_set_int(GRPC_ERROR_CREATE_FROM_COPIED_STRING(error_msg), - GRPC_ERROR_INT_GRPC_STATUS, - GRPC_STATUS_UNAUTHENTICATED), + batch, grpc_error_set_int( + GRPC_ERROR_CREATE_FROM_COPIED_STRING(error_msg), + GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAUTHENTICATED), calld->call_combiner); gpr_free(error_msg); } } -static void cancel_check_call_host(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void cancel_check_call_host(void *arg, grpc_error *error) { grpc_call_element *elem = (grpc_call_element *)arg; call_data *calld = (call_data *)elem->call_data; channel_data *chand = (channel_data *)elem->channel_data; if (error != GRPC_ERROR_NONE) { grpc_channel_security_connector_cancel_check_call_host( - exec_ctx, chand->security_connector, &calld->async_result_closure, + chand->security_connector, &calld->async_result_closure, GRPC_ERROR_REF(error)); } - GRPC_CALL_STACK_UNREF(exec_ctx, calld->owning_call, "cancel_check_call_host"); + GRPC_CALL_STACK_UNREF(calld->owning_call, "cancel_check_call_host"); } static void auth_start_transport_stream_op_batch( - grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - grpc_transport_stream_op_batch *batch) { + grpc_call_element *elem, grpc_transport_stream_op_batch *batch) { GPR_TIMER_BEGIN("auth_start_transport_stream_op_batch", 0); /* grab pointers to our data from the call element */ @@ -295,13 +286,13 @@ static void auth_start_transport_stream_op_batch( */ if (grpc_slice_eq(GRPC_MDKEY(md), GRPC_MDSTR_AUTHORITY)) { if (calld->have_host) { - grpc_slice_unref_internal(exec_ctx, calld->host); + grpc_slice_unref_internal(calld->host); } calld->host = grpc_slice_ref_internal(GRPC_MDVALUE(md)); calld->have_host = true; } else if (grpc_slice_eq(GRPC_MDKEY(md), GRPC_MDSTR_PATH)) { if (calld->have_method) { - grpc_slice_unref_internal(exec_ctx, calld->method); + grpc_slice_unref_internal(calld->method); } calld->method = grpc_slice_ref_internal(GRPC_MDVALUE(md)); calld->have_method = true; @@ -314,16 +305,16 @@ static void auth_start_transport_stream_op_batch( char *call_host = grpc_slice_to_c_string(calld->host); grpc_error *error = GRPC_ERROR_NONE; if (grpc_channel_security_connector_check_call_host( - exec_ctx, chand->security_connector, call_host, - chand->auth_context, &calld->async_result_closure, &error)) { + chand->security_connector, call_host, chand->auth_context, + &calld->async_result_closure, &error)) { // Synchronous return; invoke on_host_checked() directly. - on_host_checked(exec_ctx, batch, error); + on_host_checked(batch, error); GRPC_ERROR_UNREF(error); } else { // Async return; register cancellation closure with call combiner. GRPC_CALL_STACK_REF(calld->owning_call, "cancel_check_call_host"); grpc_call_combiner_set_notify_on_cancel( - exec_ctx, calld->call_combiner, + calld->call_combiner, GRPC_CLOSURE_INIT(&calld->check_call_host_cancel_closure, cancel_check_call_host, elem, grpc_schedule_on_exec_ctx)); @@ -335,13 +326,12 @@ static void auth_start_transport_stream_op_batch( } /* pass control down the stack */ - grpc_call_next_op(exec_ctx, elem, batch); + grpc_call_next_op(elem, batch); GPR_TIMER_END("auth_start_transport_stream_op_batch", 0); } /* Constructor for call_data */ -static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *init_call_elem(grpc_call_element *elem, const grpc_call_element_args *args) { call_data *calld = (call_data *)elem->call_data; calld->owning_call = args->call_stack; @@ -349,32 +339,30 @@ static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, return GRPC_ERROR_NONE; } -static void set_pollset_or_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static void set_pollset_or_pollset_set(grpc_call_element *elem, grpc_polling_entity *pollent) { call_data *calld = (call_data *)elem->call_data; calld->pollent = pollent; } /* Destructor for call_data */ -static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, +static void destroy_call_elem(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *ignored) { call_data *calld = (call_data *)elem->call_data; - grpc_credentials_mdelem_array_destroy(exec_ctx, &calld->md_array); - grpc_call_credentials_unref(exec_ctx, calld->creds); + grpc_credentials_mdelem_array_destroy(&calld->md_array); + grpc_call_credentials_unref(calld->creds); if (calld->have_host) { - grpc_slice_unref_internal(exec_ctx, calld->host); + grpc_slice_unref_internal(calld->host); } if (calld->have_method) { - grpc_slice_unref_internal(exec_ctx, calld->method); + grpc_slice_unref_internal(calld->method); } reset_auth_metadata_context(&calld->auth_md_context); } /* Constructor for channel_data */ -static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static grpc_error *init_channel_elem(grpc_channel_element *elem, grpc_channel_element_args *args) { grpc_security_connector *sc = grpc_security_connector_find_in_args(args->channel_args); @@ -407,13 +395,12 @@ static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem) { +static void destroy_channel_elem(grpc_channel_element *elem) { /* grab pointers to our data from the channel element */ channel_data *chand = (channel_data *)elem->channel_data; grpc_channel_security_connector *sc = chand->security_connector; if (sc != NULL) { - GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, &sc->base, "client_auth_filter"); + GRPC_SECURITY_CONNECTOR_UNREF(&sc->base, "client_auth_filter"); } GRPC_AUTH_CONTEXT_UNREF(chand->auth_context, "client_auth_filter"); } diff --git a/src/core/lib/security/transport/lb_targets_info.cc b/src/core/lib/security/transport/lb_targets_info.cc index 947fc1addff..aa01e911d90 100644 --- a/src/core/lib/security/transport/lb_targets_info.cc +++ b/src/core/lib/security/transport/lb_targets_info.cc @@ -28,8 +28,8 @@ static void *targets_info_copy(void *p) { return grpc_slice_hash_table_ref((grpc_slice_hash_table *)p); } -static void targets_info_destroy(grpc_exec_ctx *exec_ctx, void *p) { - grpc_slice_hash_table_unref(exec_ctx, (grpc_slice_hash_table *)p); +static void targets_info_destroy(void *p) { + grpc_slice_hash_table_unref((grpc_slice_hash_table *)p); } static int targets_info_cmp(void *a, void *b) { return grpc_slice_hash_table_cmp((const grpc_slice_hash_table *)a, diff --git a/src/core/lib/security/transport/secure_endpoint.cc b/src/core/lib/security/transport/secure_endpoint.cc index ae5633b82c4..c784f2390f9 100644 --- a/src/core/lib/security/transport/secure_endpoint.cc +++ b/src/core/lib/security/transport/secure_endpoint.cc @@ -64,28 +64,27 @@ typedef struct { grpc_tracer_flag grpc_trace_secure_endpoint = GRPC_TRACER_INITIALIZER(false, "secure_endpoint"); -static void destroy(grpc_exec_ctx *exec_ctx, secure_endpoint *secure_ep) { +static void destroy(secure_endpoint *secure_ep) { secure_endpoint *ep = secure_ep; - grpc_endpoint_destroy(exec_ctx, ep->wrapped_ep); + grpc_endpoint_destroy(ep->wrapped_ep); tsi_frame_protector_destroy(ep->protector); - tsi_zero_copy_grpc_protector_destroy(exec_ctx, ep->zero_copy_protector); - grpc_slice_buffer_destroy_internal(exec_ctx, &ep->leftover_bytes); - grpc_slice_unref_internal(exec_ctx, ep->read_staging_buffer); - grpc_slice_unref_internal(exec_ctx, ep->write_staging_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &ep->output_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &ep->source_buffer); + tsi_zero_copy_grpc_protector_destroy(ep->zero_copy_protector); + grpc_slice_buffer_destroy_internal(&ep->leftover_bytes); + grpc_slice_unref_internal(ep->read_staging_buffer); + grpc_slice_unref_internal(ep->write_staging_buffer); + grpc_slice_buffer_destroy_internal(&ep->output_buffer); + grpc_slice_buffer_destroy_internal(&ep->source_buffer); gpr_mu_destroy(&ep->protector_mu); gpr_free(ep); } #ifndef NDEBUG -#define SECURE_ENDPOINT_UNREF(exec_ctx, ep, reason) \ - secure_endpoint_unref((exec_ctx), (ep), (reason), __FILE__, __LINE__) +#define SECURE_ENDPOINT_UNREF(ep, reason) \ + secure_endpoint_unref((ep), (reason), __FILE__, __LINE__) #define SECURE_ENDPOINT_REF(ep, reason) \ secure_endpoint_ref((ep), (reason), __FILE__, __LINE__) -static void secure_endpoint_unref(grpc_exec_ctx *exec_ctx, secure_endpoint *ep, - const char *reason, const char *file, - int line) { +static void secure_endpoint_unref(secure_endpoint *ep, const char *reason, + const char *file, int line) { if (GRPC_TRACER_ON(grpc_trace_secure_endpoint)) { gpr_atm val = gpr_atm_no_barrier_load(&ep->ref.count); gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, @@ -93,7 +92,7 @@ static void secure_endpoint_unref(grpc_exec_ctx *exec_ctx, secure_endpoint *ep, val - 1); } if (gpr_unref(&ep->ref)) { - destroy(exec_ctx, ep); + destroy(ep); } } @@ -108,13 +107,11 @@ static void secure_endpoint_ref(secure_endpoint *ep, const char *reason, gpr_ref(&ep->ref); } #else -#define SECURE_ENDPOINT_UNREF(exec_ctx, ep, reason) \ - secure_endpoint_unref((exec_ctx), (ep)) +#define SECURE_ENDPOINT_UNREF(ep, reason) secure_endpoint_unref((ep)) #define SECURE_ENDPOINT_REF(ep, reason) secure_endpoint_ref((ep)) -static void secure_endpoint_unref(grpc_exec_ctx *exec_ctx, - secure_endpoint *ep) { +static void secure_endpoint_unref(secure_endpoint *ep) { if (gpr_unref(&ep->ref)) { - destroy(exec_ctx, ep); + destroy(ep); } } @@ -129,8 +126,7 @@ static void flush_read_staging_buffer(secure_endpoint *ep, uint8_t **cur, *end = GRPC_SLICE_END_PTR(ep->read_staging_buffer); } -static void call_read_cb(grpc_exec_ctx *exec_ctx, secure_endpoint *ep, - grpc_error *error) { +static void call_read_cb(secure_endpoint *ep, grpc_error *error) { if (GRPC_TRACER_ON(grpc_trace_secure_endpoint)) { size_t i; for (i = 0; i < ep->read_buffer->count; i++) { @@ -141,12 +137,11 @@ static void call_read_cb(grpc_exec_ctx *exec_ctx, secure_endpoint *ep, } } ep->read_buffer = NULL; - GRPC_CLOSURE_SCHED(exec_ctx, ep->read_cb, error); - SECURE_ENDPOINT_UNREF(exec_ctx, ep, "read"); + GRPC_CLOSURE_SCHED(ep->read_cb, error); + SECURE_ENDPOINT_UNREF(ep, "read"); } -static void on_read(grpc_exec_ctx *exec_ctx, void *user_data, - grpc_error *error) { +static void on_read(void *user_data, grpc_error *error) { unsigned i; uint8_t keep_looping = 0; tsi_result result = TSI_OK; @@ -155,16 +150,16 @@ static void on_read(grpc_exec_ctx *exec_ctx, void *user_data, uint8_t *end = GRPC_SLICE_END_PTR(ep->read_staging_buffer); if (error != GRPC_ERROR_NONE) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, ep->read_buffer); - call_read_cb(exec_ctx, ep, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Secure read failed", &error, 1)); + grpc_slice_buffer_reset_and_unref_internal(ep->read_buffer); + call_read_cb(ep, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Secure read failed", &error, 1)); return; } if (ep->zero_copy_protector != NULL) { // Use zero-copy grpc protector to unprotect. result = tsi_zero_copy_grpc_protector_unprotect( - exec_ctx, ep->zero_copy_protector, &ep->source_buffer, ep->read_buffer); + ep->zero_copy_protector, &ep->source_buffer, ep->read_buffer); } else { // Use frame protector to unprotect. /* TODO(yangg) check error, maybe bail out early */ @@ -217,37 +212,35 @@ static void on_read(grpc_exec_ctx *exec_ctx, void *user_data, /* TODO(yangg) experiment with moving this block after read_cb to see if it helps latency */ - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &ep->source_buffer); + grpc_slice_buffer_reset_and_unref_internal(&ep->source_buffer); if (result != TSI_OK) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, ep->read_buffer); + grpc_slice_buffer_reset_and_unref_internal(ep->read_buffer); call_read_cb( - exec_ctx, ep, - grpc_set_tsi_error_result( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Unwrap failed"), result)); + ep, grpc_set_tsi_error_result( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Unwrap failed"), result)); return; } - call_read_cb(exec_ctx, ep, GRPC_ERROR_NONE); + call_read_cb(ep, GRPC_ERROR_NONE); } -static void endpoint_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *secure_ep, - grpc_slice_buffer *slices, grpc_closure *cb) { +static void endpoint_read(grpc_endpoint *secure_ep, grpc_slice_buffer *slices, + grpc_closure *cb) { secure_endpoint *ep = (secure_endpoint *)secure_ep; ep->read_cb = cb; ep->read_buffer = slices; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, ep->read_buffer); + grpc_slice_buffer_reset_and_unref_internal(ep->read_buffer); SECURE_ENDPOINT_REF(ep, "read"); if (ep->leftover_bytes.count) { grpc_slice_buffer_swap(&ep->leftover_bytes, &ep->source_buffer); GPR_ASSERT(ep->leftover_bytes.count == 0); - on_read(exec_ctx, ep, GRPC_ERROR_NONE); + on_read(ep, GRPC_ERROR_NONE); return; } - grpc_endpoint_read(exec_ctx, ep->wrapped_ep, &ep->source_buffer, - &ep->on_read); + grpc_endpoint_read(ep->wrapped_ep, &ep->source_buffer, &ep->on_read); } static void flush_write_staging_buffer(secure_endpoint *ep, uint8_t **cur, @@ -258,8 +251,8 @@ static void flush_write_staging_buffer(secure_endpoint *ep, uint8_t **cur, *end = GRPC_SLICE_END_PTR(ep->write_staging_buffer); } -static void endpoint_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *secure_ep, - grpc_slice_buffer *slices, grpc_closure *cb) { +static void endpoint_write(grpc_endpoint *secure_ep, grpc_slice_buffer *slices, + grpc_closure *cb) { GPR_TIMER_BEGIN("secure_endpoint.endpoint_write", 0); unsigned i; @@ -268,7 +261,7 @@ static void endpoint_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *secure_ep, uint8_t *cur = GRPC_SLICE_START_PTR(ep->write_staging_buffer); uint8_t *end = GRPC_SLICE_END_PTR(ep->write_staging_buffer); - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &ep->output_buffer); + grpc_slice_buffer_reset_and_unref_internal(&ep->output_buffer); if (GRPC_TRACER_ON(grpc_trace_secure_endpoint)) { for (i = 0; i < slices->count; i++) { @@ -281,8 +274,8 @@ static void endpoint_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *secure_ep, if (ep->zero_copy_protector != NULL) { // Use zero-copy grpc protector to protect. - result = tsi_zero_copy_grpc_protector_protect( - exec_ctx, ep->zero_copy_protector, slices, &ep->output_buffer); + result = tsi_zero_copy_grpc_protector_protect(ep->zero_copy_protector, + slices, &ep->output_buffer); } else { // Use frame protector to protect. for (i = 0; i < slices->count; i++) { @@ -340,43 +333,38 @@ static void endpoint_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *secure_ep, if (result != TSI_OK) { /* TODO(yangg) do different things according to the error type? */ - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &ep->output_buffer); + grpc_slice_buffer_reset_and_unref_internal(&ep->output_buffer); GRPC_CLOSURE_SCHED( - exec_ctx, cb, - grpc_set_tsi_error_result( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Wrap failed"), result)); + cb, grpc_set_tsi_error_result( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Wrap failed"), result)); GPR_TIMER_END("secure_endpoint.endpoint_write", 0); return; } - grpc_endpoint_write(exec_ctx, ep->wrapped_ep, &ep->output_buffer, cb); + grpc_endpoint_write(ep->wrapped_ep, &ep->output_buffer, cb); GPR_TIMER_END("secure_endpoint.endpoint_write", 0); } -static void endpoint_shutdown(grpc_exec_ctx *exec_ctx, grpc_endpoint *secure_ep, - grpc_error *why) { +static void endpoint_shutdown(grpc_endpoint *secure_ep, grpc_error *why) { secure_endpoint *ep = (secure_endpoint *)secure_ep; - grpc_endpoint_shutdown(exec_ctx, ep->wrapped_ep, why); + grpc_endpoint_shutdown(ep->wrapped_ep, why); } -static void endpoint_destroy(grpc_exec_ctx *exec_ctx, - grpc_endpoint *secure_ep) { +static void endpoint_destroy(grpc_endpoint *secure_ep) { secure_endpoint *ep = (secure_endpoint *)secure_ep; - SECURE_ENDPOINT_UNREF(exec_ctx, ep, "destroy"); + SECURE_ENDPOINT_UNREF(ep, "destroy"); } -static void endpoint_add_to_pollset(grpc_exec_ctx *exec_ctx, - grpc_endpoint *secure_ep, +static void endpoint_add_to_pollset(grpc_endpoint *secure_ep, grpc_pollset *pollset) { secure_endpoint *ep = (secure_endpoint *)secure_ep; - grpc_endpoint_add_to_pollset(exec_ctx, ep->wrapped_ep, pollset); + grpc_endpoint_add_to_pollset(ep->wrapped_ep, pollset); } -static void endpoint_add_to_pollset_set(grpc_exec_ctx *exec_ctx, - grpc_endpoint *secure_ep, +static void endpoint_add_to_pollset_set(grpc_endpoint *secure_ep, grpc_pollset_set *pollset_set) { secure_endpoint *ep = (secure_endpoint *)secure_ep; - grpc_endpoint_add_to_pollset_set(exec_ctx, ep->wrapped_ep, pollset_set); + grpc_endpoint_add_to_pollset_set(ep->wrapped_ep, pollset_set); } static char *endpoint_get_peer(grpc_endpoint *secure_ep) { diff --git a/src/core/lib/security/transport/security_connector.cc b/src/core/lib/security/transport/security_connector.cc index 80d9a7b77f6..d8259dd1305 100644 --- a/src/core/lib/security/transport/security_connector.cc +++ b/src/core/lib/security/transport/security_connector.cc @@ -106,33 +106,32 @@ const tsi_peer_property *tsi_peer_get_property_by_name(const tsi_peer *peer, } void grpc_channel_security_connector_add_handshakers( - grpc_exec_ctx *exec_ctx, grpc_channel_security_connector *connector, + grpc_channel_security_connector *connector, grpc_handshake_manager *handshake_mgr) { if (connector != NULL) { - connector->add_handshakers(exec_ctx, connector, handshake_mgr); + connector->add_handshakers(connector, handshake_mgr); } } void grpc_server_security_connector_add_handshakers( - grpc_exec_ctx *exec_ctx, grpc_server_security_connector *connector, + grpc_server_security_connector *connector, grpc_handshake_manager *handshake_mgr) { if (connector != NULL) { - connector->add_handshakers(exec_ctx, connector, handshake_mgr); + connector->add_handshakers(connector, handshake_mgr); } } -void grpc_security_connector_check_peer(grpc_exec_ctx *exec_ctx, - grpc_security_connector *sc, +void grpc_security_connector_check_peer(grpc_security_connector *sc, tsi_peer peer, grpc_auth_context **auth_context, grpc_closure *on_peer_checked) { if (sc == NULL) { - GRPC_CLOSURE_SCHED(exec_ctx, on_peer_checked, + GRPC_CLOSURE_SCHED(on_peer_checked, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "cannot check peer -- no security connector")); tsi_peer_destruct(&peer); } else { - sc->vtable->check_peer(exec_ctx, sc, peer, auth_context, on_peer_checked); + sc->vtable->check_peer(sc, peer, auth_context, on_peer_checked); } } @@ -170,26 +169,26 @@ int grpc_server_security_connector_cmp(grpc_server_security_connector *sc1, } bool grpc_channel_security_connector_check_call_host( - grpc_exec_ctx *exec_ctx, grpc_channel_security_connector *sc, - const char *host, grpc_auth_context *auth_context, - grpc_closure *on_call_host_checked, grpc_error **error) { + grpc_channel_security_connector *sc, const char *host, + grpc_auth_context *auth_context, grpc_closure *on_call_host_checked, + grpc_error **error) { if (sc == NULL || sc->check_call_host == NULL) { *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "cannot check call host -- no security connector"); return true; } - return sc->check_call_host(exec_ctx, sc, host, auth_context, - on_call_host_checked, error); + return sc->check_call_host(sc, host, auth_context, on_call_host_checked, + error); } void grpc_channel_security_connector_cancel_check_call_host( - grpc_exec_ctx *exec_ctx, grpc_channel_security_connector *sc, - grpc_closure *on_call_host_checked, grpc_error *error) { + grpc_channel_security_connector *sc, grpc_closure *on_call_host_checked, + grpc_error *error) { if (sc == NULL || sc->cancel_check_call_host == NULL) { GRPC_ERROR_UNREF(error); return; } - sc->cancel_check_call_host(exec_ctx, sc, on_call_host_checked, error); + sc->cancel_check_call_host(sc, on_call_host_checked, error); } #ifndef NDEBUG @@ -213,8 +212,7 @@ grpc_security_connector *grpc_security_connector_ref( } #ifndef NDEBUG -void grpc_security_connector_unref(grpc_exec_ctx *exec_ctx, - grpc_security_connector *sc, +void grpc_security_connector_unref(grpc_security_connector *sc, const char *file, int line, const char *reason) { if (sc == NULL) return; @@ -225,15 +223,14 @@ void grpc_security_connector_unref(grpc_exec_ctx *exec_ctx, val, val - 1, reason); } #else -void grpc_security_connector_unref(grpc_exec_ctx *exec_ctx, - grpc_security_connector *sc) { +void grpc_security_connector_unref(grpc_security_connector *sc) { if (sc == NULL) return; #endif - if (gpr_unref(&sc->refcount)) sc->vtable->destroy(exec_ctx, sc); + if (gpr_unref(&sc->refcount)) sc->vtable->destroy(sc); } -static void connector_arg_destroy(grpc_exec_ctx *exec_ctx, void *p) { - GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, (grpc_security_connector *)p, +static void connector_arg_destroy(void *p) { + GRPC_SECURITY_CONNECTOR_UNREF((grpc_security_connector *)p, "connector_arg_destroy"); } @@ -286,20 +283,16 @@ typedef struct { bool is_lb_channel; } grpc_fake_channel_security_connector; -static void fake_channel_destroy(grpc_exec_ctx *exec_ctx, - grpc_security_connector *sc) { +static void fake_channel_destroy(grpc_security_connector *sc) { grpc_fake_channel_security_connector *c = (grpc_fake_channel_security_connector *)sc; - grpc_call_credentials_unref(exec_ctx, c->base.request_metadata_creds); + grpc_call_credentials_unref(c->base.request_metadata_creds); gpr_free(c->target); gpr_free(c->expected_targets); gpr_free(c); } -static void fake_server_destroy(grpc_exec_ctx *exec_ctx, - grpc_security_connector *sc) { - gpr_free(sc); -} +static void fake_server_destroy(grpc_security_connector *sc) { gpr_free(sc); } static bool fake_check_target(const char *target_type, const char *target, const char *set_str) { @@ -363,8 +356,7 @@ done: if (!success) abort(); } -static void fake_check_peer(grpc_exec_ctx *exec_ctx, - grpc_security_connector *sc, tsi_peer peer, +static void fake_check_peer(grpc_security_connector *sc, tsi_peer peer, grpc_auth_context **auth_context, grpc_closure *on_peer_checked) { const char *prop_name; @@ -396,25 +388,23 @@ static void fake_check_peer(grpc_exec_ctx *exec_ctx, *auth_context, GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME, GRPC_FAKE_TRANSPORT_SECURITY_TYPE); end: - GRPC_CLOSURE_SCHED(exec_ctx, on_peer_checked, error); + GRPC_CLOSURE_SCHED(on_peer_checked, error); tsi_peer_destruct(&peer); } -static void fake_channel_check_peer(grpc_exec_ctx *exec_ctx, - grpc_security_connector *sc, tsi_peer peer, +static void fake_channel_check_peer(grpc_security_connector *sc, tsi_peer peer, grpc_auth_context **auth_context, grpc_closure *on_peer_checked) { - fake_check_peer(exec_ctx, sc, peer, auth_context, on_peer_checked); + fake_check_peer(sc, peer, auth_context, on_peer_checked); grpc_fake_channel_security_connector *c = (grpc_fake_channel_security_connector *)sc; fake_secure_name_check(c->target, c->expected_targets, c->is_lb_channel); } -static void fake_server_check_peer(grpc_exec_ctx *exec_ctx, - grpc_security_connector *sc, tsi_peer peer, +static void fake_server_check_peer(grpc_security_connector *sc, tsi_peer peer, grpc_auth_context **auth_context, grpc_closure *on_peer_checked) { - fake_check_peer(exec_ctx, sc, peer, auth_context, on_peer_checked); + fake_check_peer(sc, peer, auth_context, on_peer_checked); } static int fake_channel_cmp(grpc_security_connector *sc1, @@ -443,8 +433,7 @@ static int fake_server_cmp(grpc_security_connector *sc1, (grpc_server_security_connector *)sc2); } -static bool fake_channel_check_call_host(grpc_exec_ctx *exec_ctx, - grpc_channel_security_connector *sc, +static bool fake_channel_check_call_host(grpc_channel_security_connector *sc, const char *host, grpc_auth_context *auth_context, grpc_closure *on_call_host_checked, @@ -453,29 +442,26 @@ static bool fake_channel_check_call_host(grpc_exec_ctx *exec_ctx, } static void fake_channel_cancel_check_call_host( - grpc_exec_ctx *exec_ctx, grpc_channel_security_connector *sc, - grpc_closure *on_call_host_checked, grpc_error *error) { + grpc_channel_security_connector *sc, grpc_closure *on_call_host_checked, + grpc_error *error) { GRPC_ERROR_UNREF(error); } static void fake_channel_add_handshakers( - grpc_exec_ctx *exec_ctx, grpc_channel_security_connector *sc, + grpc_channel_security_connector *sc, grpc_handshake_manager *handshake_mgr) { grpc_handshake_manager_add( handshake_mgr, grpc_security_handshaker_create( - exec_ctx, tsi_create_fake_handshaker(true /* is_client */), - &sc->base)); + tsi_create_fake_handshaker(true /* is_client */), &sc->base)); } -static void fake_server_add_handshakers(grpc_exec_ctx *exec_ctx, - grpc_server_security_connector *sc, +static void fake_server_add_handshakers(grpc_server_security_connector *sc, grpc_handshake_manager *handshake_mgr) { grpc_handshake_manager_add( handshake_mgr, grpc_security_handshaker_create( - exec_ctx, tsi_create_fake_handshaker(false /* is_client */), - &sc->base)); + tsi_create_fake_handshaker(false /* is_client */), &sc->base)); } static grpc_security_connector_vtable fake_channel_vtable = { @@ -533,12 +519,11 @@ typedef struct { tsi_ssl_server_handshaker_factory *server_handshaker_factory; } grpc_ssl_server_security_connector; -static void ssl_channel_destroy(grpc_exec_ctx *exec_ctx, - grpc_security_connector *sc) { +static void ssl_channel_destroy(grpc_security_connector *sc) { grpc_ssl_channel_security_connector *c = (grpc_ssl_channel_security_connector *)sc; - grpc_channel_credentials_unref(exec_ctx, c->base.channel_creds); - grpc_call_credentials_unref(exec_ctx, c->base.request_metadata_creds); + grpc_channel_credentials_unref(c->base.channel_creds); + grpc_call_credentials_unref(c->base.request_metadata_creds); tsi_ssl_client_handshaker_factory_unref(c->client_handshaker_factory); c->client_handshaker_factory = NULL; if (c->target_name != NULL) gpr_free(c->target_name); @@ -546,18 +531,16 @@ static void ssl_channel_destroy(grpc_exec_ctx *exec_ctx, gpr_free(sc); } -static void ssl_server_destroy(grpc_exec_ctx *exec_ctx, - grpc_security_connector *sc) { +static void ssl_server_destroy(grpc_security_connector *sc) { grpc_ssl_server_security_connector *c = (grpc_ssl_server_security_connector *)sc; - grpc_server_credentials_unref(exec_ctx, c->base.server_creds); + grpc_server_credentials_unref(c->base.server_creds); tsi_ssl_server_handshaker_factory_unref(c->server_handshaker_factory); c->server_handshaker_factory = NULL; gpr_free(sc); } -static void ssl_channel_add_handshakers(grpc_exec_ctx *exec_ctx, - grpc_channel_security_connector *sc, +static void ssl_channel_add_handshakers(grpc_channel_security_connector *sc, grpc_handshake_manager *handshake_mgr) { grpc_ssl_channel_security_connector *c = (grpc_ssl_channel_security_connector *)sc; @@ -576,13 +559,11 @@ static void ssl_channel_add_handshakers(grpc_exec_ctx *exec_ctx, // Create handshakers. grpc_handshake_manager_add( - handshake_mgr, - grpc_security_handshaker_create( - exec_ctx, tsi_create_adapter_handshaker(tsi_hs), &sc->base)); + handshake_mgr, grpc_security_handshaker_create( + tsi_create_adapter_handshaker(tsi_hs), &sc->base)); } -static void ssl_server_add_handshakers(grpc_exec_ctx *exec_ctx, - grpc_server_security_connector *sc, +static void ssl_server_add_handshakers(grpc_server_security_connector *sc, grpc_handshake_manager *handshake_mgr) { grpc_ssl_server_security_connector *c = (grpc_ssl_server_security_connector *)sc; @@ -598,9 +579,8 @@ static void ssl_server_add_handshakers(grpc_exec_ctx *exec_ctx, // Create handshakers. grpc_handshake_manager_add( - handshake_mgr, - grpc_security_handshaker_create( - exec_ctx, tsi_create_adapter_handshaker(tsi_hs), &sc->base)); + handshake_mgr, grpc_security_handshaker_create( + tsi_create_adapter_handshaker(tsi_hs), &sc->base)); } static int ssl_host_matches_name(const tsi_peer *peer, const char *peer_name) { @@ -684,8 +664,7 @@ static grpc_error *ssl_check_peer(grpc_security_connector *sc, return GRPC_ERROR_NONE; } -static void ssl_channel_check_peer(grpc_exec_ctx *exec_ctx, - grpc_security_connector *sc, tsi_peer peer, +static void ssl_channel_check_peer(grpc_security_connector *sc, tsi_peer peer, grpc_auth_context **auth_context, grpc_closure *on_peer_checked) { grpc_ssl_channel_security_connector *c = @@ -694,17 +673,16 @@ static void ssl_channel_check_peer(grpc_exec_ctx *exec_ctx, ? c->overridden_target_name : c->target_name, &peer, auth_context); - GRPC_CLOSURE_SCHED(exec_ctx, on_peer_checked, error); + GRPC_CLOSURE_SCHED(on_peer_checked, error); tsi_peer_destruct(&peer); } -static void ssl_server_check_peer(grpc_exec_ctx *exec_ctx, - grpc_security_connector *sc, tsi_peer peer, +static void ssl_server_check_peer(grpc_security_connector *sc, tsi_peer peer, grpc_auth_context **auth_context, grpc_closure *on_peer_checked) { grpc_error *error = ssl_check_peer(sc, NULL, &peer, auth_context); tsi_peer_destruct(&peer); - GRPC_CLOSURE_SCHED(exec_ctx, on_peer_checked, error); + GRPC_CLOSURE_SCHED(on_peer_checked, error); } static int ssl_channel_cmp(grpc_security_connector *sc1, @@ -774,8 +752,7 @@ void tsi_shallow_peer_destruct(tsi_peer *peer) { if (peer->properties != NULL) gpr_free(peer->properties); } -static bool ssl_channel_check_call_host(grpc_exec_ctx *exec_ctx, - grpc_channel_security_connector *sc, +static bool ssl_channel_check_call_host(grpc_channel_security_connector *sc, const char *host, grpc_auth_context *auth_context, grpc_closure *on_call_host_checked, @@ -800,8 +777,8 @@ static bool ssl_channel_check_call_host(grpc_exec_ctx *exec_ctx, } static void ssl_channel_cancel_check_call_host( - grpc_exec_ctx *exec_ctx, grpc_channel_security_connector *sc, - grpc_closure *on_call_host_checked, grpc_error *error) { + grpc_channel_security_connector *sc, grpc_closure *on_call_host_checked, + grpc_error *error) { GRPC_ERROR_UNREF(error); } @@ -893,7 +870,7 @@ const char *grpc_get_default_ssl_roots(void) { } grpc_security_status grpc_ssl_channel_security_connector_create( - grpc_exec_ctx *exec_ctx, grpc_channel_credentials *channel_creds, + grpc_channel_credentials *channel_creds, grpc_call_credentials *request_metadata_creds, const grpc_ssl_config *config, const char *target_name, const char *overridden_target_name, grpc_channel_security_connector **sc) { @@ -951,7 +928,7 @@ grpc_security_status grpc_ssl_channel_security_connector_create( if (result != TSI_OK) { gpr_log(GPR_ERROR, "Handshaker factory creation failed with %s.", tsi_result_to_string(result)); - ssl_channel_destroy(exec_ctx, &c->base.base); + ssl_channel_destroy(&c->base.base); *sc = NULL; goto error; } @@ -965,8 +942,8 @@ error: } grpc_security_status grpc_ssl_server_security_connector_create( - grpc_exec_ctx *exec_ctx, grpc_server_credentials *server_creds, - const grpc_ssl_server_config *config, grpc_server_security_connector **sc) { + grpc_server_credentials *server_creds, const grpc_ssl_server_config *config, + grpc_server_security_connector **sc) { size_t num_alpn_protocols = grpc_chttp2_num_alpn_versions(); const char **alpn_protocol_strings = (const char **)gpr_malloc(sizeof(const char *) * num_alpn_protocols); @@ -998,7 +975,7 @@ grpc_security_status grpc_ssl_server_security_connector_create( if (result != TSI_OK) { gpr_log(GPR_ERROR, "Handshaker factory creation failed with %s.", tsi_result_to_string(result)); - ssl_server_destroy(exec_ctx, &c->base.base); + ssl_server_destroy(&c->base.base); *sc = NULL; goto error; } diff --git a/src/core/lib/security/transport/security_connector.h b/src/core/lib/security/transport/security_connector.h index 216bb35e811..78340457726 100644 --- a/src/core/lib/security/transport/security_connector.h +++ b/src/core/lib/security/transport/security_connector.h @@ -56,9 +56,9 @@ typedef struct grpc_security_connector grpc_security_connector; #define GRPC_ARG_SECURITY_CONNECTOR "grpc.security_connector" typedef struct { - void (*destroy)(grpc_exec_ctx *exec_ctx, grpc_security_connector *sc); - void (*check_peer)(grpc_exec_ctx *exec_ctx, grpc_security_connector *sc, - tsi_peer peer, grpc_auth_context **auth_context, + void (*destroy)(grpc_security_connector *sc); + void (*check_peer)(grpc_security_connector *sc, tsi_peer peer, + grpc_auth_context **auth_context, grpc_closure *on_peer_checked); int (*cmp)(grpc_security_connector *sc, grpc_security_connector *other); } grpc_security_connector_vtable; @@ -73,29 +73,25 @@ struct grpc_security_connector { #ifndef NDEBUG #define GRPC_SECURITY_CONNECTOR_REF(p, r) \ grpc_security_connector_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, p, r) \ - grpc_security_connector_unref((exec_ctx), (p), __FILE__, __LINE__, (r)) +#define GRPC_SECURITY_CONNECTOR_UNREF(p, r) \ + grpc_security_connector_unref((p), __FILE__, __LINE__, (r)) grpc_security_connector *grpc_security_connector_ref( grpc_security_connector *policy, const char *file, int line, const char *reason); -void grpc_security_connector_unref(grpc_exec_ctx *exec_ctx, - grpc_security_connector *policy, +void grpc_security_connector_unref(grpc_security_connector *policy, const char *file, int line, const char *reason); #else #define GRPC_SECURITY_CONNECTOR_REF(p, r) grpc_security_connector_ref((p)) -#define GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, p, r) \ - grpc_security_connector_unref((exec_ctx), (p)) +#define GRPC_SECURITY_CONNECTOR_UNREF(p, r) grpc_security_connector_unref((p)) grpc_security_connector *grpc_security_connector_ref( grpc_security_connector *policy); -void grpc_security_connector_unref(grpc_exec_ctx *exec_ctx, - grpc_security_connector *policy); +void grpc_security_connector_unref(grpc_security_connector *policy); #endif /* Check the peer. Callee takes ownership of the peer object. When done, sets *auth_context and invokes on_peer_checked. */ -void grpc_security_connector_check_peer(grpc_exec_ctx *exec_ctx, - grpc_security_connector *sc, +void grpc_security_connector_check_peer(grpc_security_connector *sc, tsi_peer peer, grpc_auth_context **auth_context, grpc_closure *on_peer_checked); @@ -125,17 +121,14 @@ struct grpc_channel_security_connector { grpc_security_connector base; grpc_channel_credentials *channel_creds; grpc_call_credentials *request_metadata_creds; - bool (*check_call_host)(grpc_exec_ctx *exec_ctx, - grpc_channel_security_connector *sc, const char *host, + bool (*check_call_host)(grpc_channel_security_connector *sc, const char *host, grpc_auth_context *auth_context, grpc_closure *on_call_host_checked, grpc_error **error); - void (*cancel_check_call_host)(grpc_exec_ctx *exec_ctx, - grpc_channel_security_connector *sc, + void (*cancel_check_call_host)(grpc_channel_security_connector *sc, grpc_closure *on_call_host_checked, grpc_error *error); - void (*add_handshakers)(grpc_exec_ctx *exec_ctx, - grpc_channel_security_connector *sc, + void (*add_handshakers)(grpc_channel_security_connector *sc, grpc_handshake_manager *handshake_mgr); }; @@ -148,20 +141,20 @@ int grpc_channel_security_connector_cmp(grpc_channel_security_connector *sc1, /// be set to indicate the result. Otherwise, \a on_call_host_checked /// will be invoked when complete. bool grpc_channel_security_connector_check_call_host( - grpc_exec_ctx *exec_ctx, grpc_channel_security_connector *sc, - const char *host, grpc_auth_context *auth_context, - grpc_closure *on_call_host_checked, grpc_error **error); + grpc_channel_security_connector *sc, const char *host, + grpc_auth_context *auth_context, grpc_closure *on_call_host_checked, + grpc_error **error); /// Cancels a pending asychronous call to /// grpc_channel_security_connector_check_call_host() with /// \a on_call_host_checked as its callback. void grpc_channel_security_connector_cancel_check_call_host( - grpc_exec_ctx *exec_ctx, grpc_channel_security_connector *sc, - grpc_closure *on_call_host_checked, grpc_error *error); + grpc_channel_security_connector *sc, grpc_closure *on_call_host_checked, + grpc_error *error); /* Registers handshakers with \a handshake_mgr. */ void grpc_channel_security_connector_add_handshakers( - grpc_exec_ctx *exec_ctx, grpc_channel_security_connector *connector, + grpc_channel_security_connector *connector, grpc_handshake_manager *handshake_mgr); /* --- server_security_connector object. --- @@ -174,8 +167,7 @@ typedef struct grpc_server_security_connector grpc_server_security_connector; struct grpc_server_security_connector { grpc_security_connector base; grpc_server_credentials *server_creds; - void (*add_handshakers)(grpc_exec_ctx *exec_ctx, - grpc_server_security_connector *sc, + void (*add_handshakers)(grpc_server_security_connector *sc, grpc_handshake_manager *handshake_mgr); }; @@ -184,7 +176,8 @@ int grpc_server_security_connector_cmp(grpc_server_security_connector *sc1, grpc_server_security_connector *sc2); void grpc_server_security_connector_add_handshakers( - grpc_exec_ctx *exec_ctx, grpc_server_security_connector *sc, + grpc_server_security_connector *sc, + grpc_handshake_manager *handshake_mgr); /* --- Creation security connectors. --- */ @@ -222,7 +215,7 @@ typedef struct { specific error code otherwise. */ grpc_security_status grpc_ssl_channel_security_connector_create( - grpc_exec_ctx *exec_ctx, grpc_channel_credentials *channel_creds, + grpc_channel_credentials *channel_creds, grpc_call_credentials *request_metadata_creds, const grpc_ssl_config *config, const char *target_name, const char *overridden_target_name, grpc_channel_security_connector **sc); @@ -248,8 +241,8 @@ typedef struct { specific error code otherwise. */ grpc_security_status grpc_ssl_server_security_connector_create( - grpc_exec_ctx *exec_ctx, grpc_server_credentials *server_creds, - const grpc_ssl_server_config *config, grpc_server_security_connector **sc); + grpc_server_credentials *server_creds, const grpc_ssl_server_config *config, + grpc_server_security_connector **sc); /* Util. */ const tsi_peer_property *tsi_peer_get_property_by_name(const tsi_peer *peer, diff --git a/src/core/lib/security/transport/security_handshaker.cc b/src/core/lib/security/transport/security_handshaker.cc index 3d196056177..ff0fc098170 100644 --- a/src/core/lib/security/transport/security_handshaker.cc +++ b/src/core/lib/security/transport/security_handshaker.cc @@ -65,43 +65,40 @@ typedef struct { tsi_handshaker_result *handshaker_result; } security_handshaker; -static void security_handshaker_unref(grpc_exec_ctx *exec_ctx, - security_handshaker *h) { +static void security_handshaker_unref(security_handshaker *h) { if (gpr_unref(&h->refs)) { gpr_mu_destroy(&h->mu); tsi_handshaker_destroy(h->handshaker); tsi_handshaker_result_destroy(h->handshaker_result); if (h->endpoint_to_destroy != NULL) { - grpc_endpoint_destroy(exec_ctx, h->endpoint_to_destroy); + grpc_endpoint_destroy(h->endpoint_to_destroy); } if (h->read_buffer_to_destroy != NULL) { - grpc_slice_buffer_destroy_internal(exec_ctx, h->read_buffer_to_destroy); + grpc_slice_buffer_destroy_internal(h->read_buffer_to_destroy); gpr_free(h->read_buffer_to_destroy); } gpr_free(h->handshake_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &h->outgoing); + grpc_slice_buffer_destroy_internal(&h->outgoing); GRPC_AUTH_CONTEXT_UNREF(h->auth_context, "handshake"); - GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, h->connector, "handshake"); + GRPC_SECURITY_CONNECTOR_UNREF(h->connector, "handshake"); gpr_free(h); } } // Set args fields to NULL, saving the endpoint and read buffer for // later destruction. -static void cleanup_args_for_failure_locked(grpc_exec_ctx *exec_ctx, - security_handshaker *h) { +static void cleanup_args_for_failure_locked(security_handshaker *h) { h->endpoint_to_destroy = h->args->endpoint; h->args->endpoint = NULL; h->read_buffer_to_destroy = h->args->read_buffer; h->args->read_buffer = NULL; - grpc_channel_args_destroy(exec_ctx, h->args->args); + grpc_channel_args_destroy(h->args->args); h->args->args = NULL; } // If the handshake failed or we're shutting down, clean up and invoke the // callback with the error. -static void security_handshake_failed_locked(grpc_exec_ctx *exec_ctx, - security_handshaker *h, +static void security_handshake_failed_locked(security_handshaker *h, grpc_error *error) { if (error == GRPC_ERROR_NONE) { // If we were shut down after the handshake succeeded but before an @@ -116,34 +113,33 @@ static void security_handshake_failed_locked(grpc_exec_ctx *exec_ctx, // before destroying them, even if we know that there are no // pending read/write callbacks. This should be fixed, at which // point this can be removed. - grpc_endpoint_shutdown(exec_ctx, h->args->endpoint, GRPC_ERROR_REF(error)); + grpc_endpoint_shutdown(h->args->endpoint, GRPC_ERROR_REF(error)); // Not shutting down, so the write failed. Clean up before // invoking the callback. - cleanup_args_for_failure_locked(exec_ctx, h); + cleanup_args_for_failure_locked(h); // Set shutdown to true so that subsequent calls to // security_handshaker_shutdown() do nothing. h->shutdown = true; } // Invoke callback. - GRPC_CLOSURE_SCHED(exec_ctx, h->on_handshake_done, error); + GRPC_CLOSURE_SCHED(h->on_handshake_done, error); } -static void on_peer_checked_inner(grpc_exec_ctx *exec_ctx, - security_handshaker *h, grpc_error *error) { +static void on_peer_checked_inner(security_handshaker *h, grpc_error *error) { if (error != GRPC_ERROR_NONE || h->shutdown) { - security_handshake_failed_locked(exec_ctx, h, GRPC_ERROR_REF(error)); + security_handshake_failed_locked(h, GRPC_ERROR_REF(error)); return; } // Create zero-copy frame protector, if implemented. tsi_zero_copy_grpc_protector *zero_copy_protector = NULL; tsi_result result = tsi_handshaker_result_create_zero_copy_grpc_protector( - exec_ctx, h->handshaker_result, NULL, &zero_copy_protector); + h->handshaker_result, NULL, &zero_copy_protector); if (result != TSI_OK && result != TSI_UNIMPLEMENTED) { error = grpc_set_tsi_error_result( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Zero-copy frame protector creation failed"), result); - security_handshake_failed_locked(exec_ctx, h, error); + security_handshake_failed_locked(h, error); return; } // Create frame protector if zero-copy frame protector is NULL. @@ -155,7 +151,7 @@ static void on_peer_checked_inner(grpc_exec_ctx *exec_ctx, error = grpc_set_tsi_error_result(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Frame protector creation failed"), result); - security_handshake_failed_locked(exec_ctx, h, error); + security_handshake_failed_locked(h, error); return; } } @@ -170,7 +166,7 @@ static void on_peer_checked_inner(grpc_exec_ctx *exec_ctx, grpc_slice_from_copied_buffer((char *)unused_bytes, unused_bytes_size); h->args->endpoint = grpc_secure_endpoint_create( protector, zero_copy_protector, h->args->endpoint, &slice, 1); - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); } else { h->args->endpoint = grpc_secure_endpoint_create( protector, zero_copy_protector, h->args->endpoint, NULL, 0); @@ -178,31 +174,29 @@ static void on_peer_checked_inner(grpc_exec_ctx *exec_ctx, tsi_handshaker_result_destroy(h->handshaker_result); h->handshaker_result = NULL; // Clear out the read buffer before it gets passed to the transport. - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, h->args->read_buffer); + grpc_slice_buffer_reset_and_unref_internal(h->args->read_buffer); // Add auth context to channel args. grpc_arg auth_context_arg = grpc_auth_context_to_arg(h->auth_context); grpc_channel_args *tmp_args = h->args->args; h->args->args = grpc_channel_args_copy_and_add(tmp_args, &auth_context_arg, 1); - grpc_channel_args_destroy(exec_ctx, tmp_args); + grpc_channel_args_destroy(tmp_args); // Invoke callback. - GRPC_CLOSURE_SCHED(exec_ctx, h->on_handshake_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(h->on_handshake_done, GRPC_ERROR_NONE); // Set shutdown to true so that subsequent calls to // security_handshaker_shutdown() do nothing. h->shutdown = true; } -static void on_peer_checked(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void on_peer_checked(void *arg, grpc_error *error) { security_handshaker *h = (security_handshaker *)arg; gpr_mu_lock(&h->mu); - on_peer_checked_inner(exec_ctx, h, error); + on_peer_checked_inner(h, error); gpr_mu_unlock(&h->mu); - security_handshaker_unref(exec_ctx, h); + security_handshaker_unref(h); } -static grpc_error *check_peer_locked(grpc_exec_ctx *exec_ctx, - security_handshaker *h) { +static grpc_error *check_peer_locked(security_handshaker *h) { tsi_peer peer; tsi_result result = tsi_handshaker_result_extract_peer(h->handshaker_result, &peer); @@ -210,20 +204,20 @@ static grpc_error *check_peer_locked(grpc_exec_ctx *exec_ctx, return grpc_set_tsi_error_result( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Peer extraction failed"), result); } - grpc_security_connector_check_peer(exec_ctx, h->connector, peer, - &h->auth_context, &h->on_peer_checked); + grpc_security_connector_check_peer(h->connector, peer, &h->auth_context, + &h->on_peer_checked); return GRPC_ERROR_NONE; } static grpc_error *on_handshake_next_done_locked( - grpc_exec_ctx *exec_ctx, security_handshaker *h, tsi_result result, + security_handshaker *h, tsi_result result, const unsigned char *bytes_to_send, size_t bytes_to_send_size, tsi_handshaker_result *handshaker_result) { grpc_error *error = GRPC_ERROR_NONE; // Read more if we need to. if (result == TSI_INCOMPLETE_DATA) { GPR_ASSERT(bytes_to_send_size == 0); - grpc_endpoint_read(exec_ctx, h->args->endpoint, h->args->read_buffer, + grpc_endpoint_read(h->args->endpoint, h->args->read_buffer, &h->on_handshake_data_received_from_peer); return error; } @@ -240,17 +234,17 @@ static grpc_error *on_handshake_next_done_locked( // Send data to peer, if needed. grpc_slice to_send = grpc_slice_from_copied_buffer( (const char *)bytes_to_send, bytes_to_send_size); - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &h->outgoing); + grpc_slice_buffer_reset_and_unref_internal(&h->outgoing); grpc_slice_buffer_add(&h->outgoing, to_send); - grpc_endpoint_write(exec_ctx, h->args->endpoint, &h->outgoing, + grpc_endpoint_write(h->args->endpoint, &h->outgoing, &h->on_handshake_data_sent_to_peer); } else if (handshaker_result == NULL) { // There is nothing to send, but need to read from peer. - grpc_endpoint_read(exec_ctx, h->args->endpoint, h->args->read_buffer, + grpc_endpoint_read(h->args->endpoint, h->args->read_buffer, &h->on_handshake_data_received_from_peer); } else { // Handshake has finished, check peer and so on. - error = check_peer_locked(exec_ctx, h); + error = check_peer_locked(h); } return error; } @@ -261,24 +255,23 @@ static void on_handshake_next_done_grpc_wrapper( security_handshaker *h = (security_handshaker *)user_data; // This callback will be invoked by TSI in a non-grpc thread, so it's // safe to create our own exec_ctx here. - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; gpr_mu_lock(&h->mu); - grpc_error *error = - on_handshake_next_done_locked(&exec_ctx, h, result, bytes_to_send, - bytes_to_send_size, handshaker_result); + grpc_error *error = on_handshake_next_done_locked( + h, result, bytes_to_send, bytes_to_send_size, handshaker_result); if (error != GRPC_ERROR_NONE) { - security_handshake_failed_locked(&exec_ctx, h, error); + security_handshake_failed_locked(h, error); gpr_mu_unlock(&h->mu); - security_handshaker_unref(&exec_ctx, h); + security_handshaker_unref(h); } else { gpr_mu_unlock(&h->mu); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static grpc_error *do_handshaker_next_locked( - grpc_exec_ctx *exec_ctx, security_handshaker *h, - const unsigned char *bytes_received, size_t bytes_received_size) { + security_handshaker *h, const unsigned char *bytes_received, + size_t bytes_received_size) { // Invoke TSI handshaker. const unsigned char *bytes_to_send = NULL; size_t bytes_to_send_size = 0; @@ -293,21 +286,20 @@ static grpc_error *do_handshaker_next_locked( return GRPC_ERROR_NONE; } // Handshaker returned synchronously. Invoke callback directly in - // this thread with our existing exec_ctx. - return on_handshake_next_done_locked(exec_ctx, h, result, bytes_to_send, + // this thread with our existing exec_ctx-> + return on_handshake_next_done_locked(h, result, bytes_to_send, bytes_to_send_size, handshaker_result); } -static void on_handshake_data_received_from_peer(grpc_exec_ctx *exec_ctx, - void *arg, grpc_error *error) { +static void on_handshake_data_received_from_peer(void *arg, grpc_error *error) { security_handshaker *h = (security_handshaker *)arg; gpr_mu_lock(&h->mu); if (error != GRPC_ERROR_NONE || h->shutdown) { security_handshake_failed_locked( - exec_ctx, h, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Handshake read failed", &error, 1)); + h, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Handshake read failed", &error, 1)); gpr_mu_unlock(&h->mu); - security_handshaker_unref(exec_ctx, h); + security_handshaker_unref(h); return; } // Copy all slices received. @@ -329,40 +321,39 @@ static void on_handshake_data_received_from_peer(grpc_exec_ctx *exec_ctx, offset += slice_size; } // Call TSI handshaker. - error = do_handshaker_next_locked(exec_ctx, h, h->handshake_buffer, - bytes_received_size); + error = + do_handshaker_next_locked(h, h->handshake_buffer, bytes_received_size); if (error != GRPC_ERROR_NONE) { - security_handshake_failed_locked(exec_ctx, h, error); + security_handshake_failed_locked(h, error); gpr_mu_unlock(&h->mu); - security_handshaker_unref(exec_ctx, h); + security_handshaker_unref(h); } else { gpr_mu_unlock(&h->mu); } } -static void on_handshake_data_sent_to_peer(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void on_handshake_data_sent_to_peer(void *arg, grpc_error *error) { security_handshaker *h = (security_handshaker *)arg; gpr_mu_lock(&h->mu); if (error != GRPC_ERROR_NONE || h->shutdown) { security_handshake_failed_locked( - exec_ctx, h, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Handshake write failed", &error, 1)); + h, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Handshake write failed", &error, 1)); gpr_mu_unlock(&h->mu); - security_handshaker_unref(exec_ctx, h); + security_handshaker_unref(h); return; } // We may be done. if (h->handshaker_result == NULL) { - grpc_endpoint_read(exec_ctx, h->args->endpoint, h->args->read_buffer, + grpc_endpoint_read(h->args->endpoint, h->args->read_buffer, &h->on_handshake_data_received_from_peer); } else { - error = check_peer_locked(exec_ctx, h); + error = check_peer_locked(h); if (error != GRPC_ERROR_NONE) { - security_handshake_failed_locked(exec_ctx, h, error); + security_handshake_failed_locked(h, error); gpr_mu_unlock(&h->mu); - security_handshaker_unref(exec_ctx, h); + security_handshaker_unref(h); return; } } @@ -373,28 +364,25 @@ static void on_handshake_data_sent_to_peer(grpc_exec_ctx *exec_ctx, void *arg, // public handshaker API // -static void security_handshaker_destroy(grpc_exec_ctx *exec_ctx, - grpc_handshaker *handshaker) { +static void security_handshaker_destroy(grpc_handshaker *handshaker) { security_handshaker *h = (security_handshaker *)handshaker; - security_handshaker_unref(exec_ctx, h); + security_handshaker_unref(h); } -static void security_handshaker_shutdown(grpc_exec_ctx *exec_ctx, - grpc_handshaker *handshaker, +static void security_handshaker_shutdown(grpc_handshaker *handshaker, grpc_error *why) { security_handshaker *h = (security_handshaker *)handshaker; gpr_mu_lock(&h->mu); if (!h->shutdown) { h->shutdown = true; - grpc_endpoint_shutdown(exec_ctx, h->args->endpoint, GRPC_ERROR_REF(why)); - cleanup_args_for_failure_locked(exec_ctx, h); + grpc_endpoint_shutdown(h->args->endpoint, GRPC_ERROR_REF(why)); + cleanup_args_for_failure_locked(h); } gpr_mu_unlock(&h->mu); GRPC_ERROR_UNREF(why); } -static void security_handshaker_do_handshake(grpc_exec_ctx *exec_ctx, - grpc_handshaker *handshaker, +static void security_handshaker_do_handshake(grpc_handshaker *handshaker, grpc_tcp_server_acceptor *acceptor, grpc_closure *on_handshake_done, grpc_handshaker_args *args) { @@ -403,11 +391,11 @@ static void security_handshaker_do_handshake(grpc_exec_ctx *exec_ctx, h->args = args; h->on_handshake_done = on_handshake_done; gpr_ref(&h->refs); - grpc_error *error = do_handshaker_next_locked(exec_ctx, h, NULL, 0); + grpc_error *error = do_handshaker_next_locked(h, NULL, 0); if (error != GRPC_ERROR_NONE) { - security_handshake_failed_locked(exec_ctx, h, error); + security_handshake_failed_locked(h, error); gpr_mu_unlock(&h->mu); - security_handshaker_unref(exec_ctx, h); + security_handshaker_unref(h); return; } gpr_mu_unlock(&h->mu); @@ -418,8 +406,7 @@ static const grpc_handshaker_vtable security_handshaker_vtable = { security_handshaker_do_handshake}; static grpc_handshaker *security_handshaker_create( - grpc_exec_ctx *exec_ctx, tsi_handshaker *handshaker, - grpc_security_connector *connector) { + tsi_handshaker *handshaker, grpc_security_connector *connector) { security_handshaker *h = (security_handshaker *)gpr_zalloc(sizeof(security_handshaker)); grpc_handshaker_init(&security_handshaker_vtable, &h->base); @@ -445,23 +432,20 @@ static grpc_handshaker *security_handshaker_create( // fail_handshaker // -static void fail_handshaker_destroy(grpc_exec_ctx *exec_ctx, - grpc_handshaker *handshaker) { +static void fail_handshaker_destroy(grpc_handshaker *handshaker) { gpr_free(handshaker); } -static void fail_handshaker_shutdown(grpc_exec_ctx *exec_ctx, - grpc_handshaker *handshaker, +static void fail_handshaker_shutdown(grpc_handshaker *handshaker, grpc_error *why) { GRPC_ERROR_UNREF(why); } -static void fail_handshaker_do_handshake(grpc_exec_ctx *exec_ctx, - grpc_handshaker *handshaker, +static void fail_handshaker_do_handshake(grpc_handshaker *handshaker, grpc_tcp_server_acceptor *acceptor, grpc_closure *on_handshake_done, grpc_handshaker_args *args) { - GRPC_CLOSURE_SCHED(exec_ctx, on_handshake_done, + GRPC_CLOSURE_SCHED(on_handshake_done, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Failed to create security handshaker")); } @@ -481,27 +465,27 @@ static grpc_handshaker *fail_handshaker_create() { // static void client_handshaker_factory_add_handshakers( - grpc_exec_ctx *exec_ctx, grpc_handshaker_factory *handshaker_factory, - const grpc_channel_args *args, grpc_handshake_manager *handshake_mgr) { + grpc_handshaker_factory *handshaker_factory, const grpc_channel_args *args, + grpc_handshake_manager *handshake_mgr) { grpc_channel_security_connector *security_connector = (grpc_channel_security_connector *)grpc_security_connector_find_in_args( args); - grpc_channel_security_connector_add_handshakers(exec_ctx, security_connector, + grpc_channel_security_connector_add_handshakers(security_connector, handshake_mgr); } static void server_handshaker_factory_add_handshakers( - grpc_exec_ctx *exec_ctx, grpc_handshaker_factory *hf, - const grpc_channel_args *args, grpc_handshake_manager *handshake_mgr) { + grpc_handshaker_factory *hf, const grpc_channel_args *args, + grpc_handshake_manager *handshake_mgr) { grpc_server_security_connector *security_connector = (grpc_server_security_connector *)grpc_security_connector_find_in_args( args); - grpc_server_security_connector_add_handshakers(exec_ctx, security_connector, + grpc_server_security_connector_add_handshakers(security_connector, handshake_mgr); } static void handshaker_factory_destroy( - grpc_exec_ctx *exec_ctx, grpc_handshaker_factory *handshaker_factory) {} + grpc_handshaker_factory *handshaker_factory) {} static const grpc_handshaker_factory_vtable client_handshaker_factory_vtable = { client_handshaker_factory_add_handshakers, handshaker_factory_destroy}; @@ -520,14 +504,13 @@ static grpc_handshaker_factory server_handshaker_factory = { // grpc_handshaker *grpc_security_handshaker_create( - grpc_exec_ctx *exec_ctx, tsi_handshaker *handshaker, - grpc_security_connector *connector) { + tsi_handshaker *handshaker, grpc_security_connector *connector) { // If no TSI handshaker was created, return a handshaker that always fails. // Otherwise, return a real security handshaker. if (handshaker == NULL) { return fail_handshaker_create(); } else { - return security_handshaker_create(exec_ctx, handshaker, connector); + return security_handshaker_create(handshaker, connector); } } diff --git a/src/core/lib/security/transport/security_handshaker.h b/src/core/lib/security/transport/security_handshaker.h index 178099bb945..b555a72a65e 100644 --- a/src/core/lib/security/transport/security_handshaker.h +++ b/src/core/lib/security/transport/security_handshaker.h @@ -29,8 +29,7 @@ extern "C" { /// Creates a security handshaker using \a handshaker. grpc_handshaker *grpc_security_handshaker_create( - grpc_exec_ctx *exec_ctx, tsi_handshaker *handshaker, - grpc_security_connector *connector); + tsi_handshaker *handshaker, grpc_security_connector *connector); /// Registers security handshaker factories. void grpc_security_register_handshaker_factories(); diff --git a/src/core/lib/security/transport/server_auth_filter.cc b/src/core/lib/security/transport/server_auth_filter.cc index f5e02f42fe0..36d0b7612b0 100644 --- a/src/core/lib/security/transport/server_auth_filter.cc +++ b/src/core/lib/security/transport/server_auth_filter.cc @@ -73,8 +73,7 @@ static grpc_metadata_array metadata_batch_to_md_array( return result; } -static grpc_filtered_mdelem remove_consumed_md(grpc_exec_ctx *exec_ctx, - void *user_data, +static grpc_filtered_mdelem remove_consumed_md(void *user_data, grpc_mdelem md) { grpc_call_element *elem = (grpc_call_element *)user_data; call_data *calld = (call_data *)elem->call_data; @@ -88,8 +87,7 @@ static grpc_filtered_mdelem remove_consumed_md(grpc_exec_ctx *exec_ctx, return GRPC_FILTERED_MDELEM(md); } -static void on_md_processing_done_inner(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static void on_md_processing_done_inner(grpc_call_element *elem, const grpc_metadata *consumed_md, size_t num_consumed_md, const grpc_metadata *response_md, @@ -107,11 +105,10 @@ static void on_md_processing_done_inner(grpc_exec_ctx *exec_ctx, calld->consumed_md = consumed_md; calld->num_consumed_md = num_consumed_md; error = grpc_metadata_batch_filter( - exec_ctx, batch->payload->recv_initial_metadata.recv_initial_metadata, + batch->payload->recv_initial_metadata.recv_initial_metadata, remove_consumed_md, elem, "Response metadata filtering error"); } - GRPC_CLOSURE_SCHED(exec_ctx, calld->original_recv_initial_metadata_ready, - error); + GRPC_CLOSURE_SCHED(calld->original_recv_initial_metadata_ready, error); } // Called from application code. @@ -121,7 +118,7 @@ static void on_md_processing_done( grpc_status_code status, const char *error_details) { grpc_call_element *elem = (grpc_call_element *)user_data; call_data *calld = (call_data *)elem->call_data; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; // If the call was not cancelled while we were in flight, process the result. if (gpr_atm_full_cas(&calld->state, (gpr_atm)STATE_INIT, (gpr_atm)STATE_DONE)) { @@ -134,34 +131,32 @@ static void on_md_processing_done( GRPC_ERROR_CREATE_FROM_COPIED_STRING(error_details), GRPC_ERROR_INT_GRPC_STATUS, status); } - on_md_processing_done_inner(&exec_ctx, elem, consumed_md, num_consumed_md, - response_md, num_response_md, error); + on_md_processing_done_inner(elem, consumed_md, num_consumed_md, response_md, + num_response_md, error); } // Clean up. for (size_t i = 0; i < calld->md.count; i++) { - grpc_slice_unref_internal(&exec_ctx, calld->md.metadata[i].key); - grpc_slice_unref_internal(&exec_ctx, calld->md.metadata[i].value); + grpc_slice_unref_internal(calld->md.metadata[i].key); + grpc_slice_unref_internal(calld->md.metadata[i].value); } grpc_metadata_array_destroy(&calld->md); - GRPC_CALL_STACK_UNREF(&exec_ctx, calld->owning_call, "server_auth_metadata"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_CALL_STACK_UNREF(calld->owning_call, "server_auth_metadata"); + grpc_exec_ctx_finish(); } -static void cancel_call(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void cancel_call(void *arg, grpc_error *error) { grpc_call_element *elem = (grpc_call_element *)arg; call_data *calld = (call_data *)elem->call_data; // If the result was not already processed, invoke the callback now. if (error != GRPC_ERROR_NONE && gpr_atm_full_cas(&calld->state, (gpr_atm)STATE_INIT, (gpr_atm)STATE_CANCELLED)) { - on_md_processing_done_inner(exec_ctx, elem, NULL, 0, NULL, 0, - GRPC_ERROR_REF(error)); + on_md_processing_done_inner(elem, NULL, 0, NULL, 0, GRPC_ERROR_REF(error)); } - GRPC_CALL_STACK_UNREF(exec_ctx, calld->owning_call, "cancel_call"); + GRPC_CALL_STACK_UNREF(calld->owning_call, "cancel_call"); } -static void recv_initial_metadata_ready(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void recv_initial_metadata_ready(void *arg, grpc_error *error) { grpc_call_element *elem = (grpc_call_element *)arg; channel_data *chand = (channel_data *)elem->channel_data; call_data *calld = (call_data *)elem->call_data; @@ -173,7 +168,7 @@ static void recv_initial_metadata_ready(grpc_exec_ctx *exec_ctx, void *arg, GRPC_CALL_STACK_REF(calld->owning_call, "cancel_call"); GRPC_CLOSURE_INIT(&calld->cancel_closure, cancel_call, elem, grpc_schedule_on_exec_ctx); - grpc_call_combiner_set_notify_on_cancel(exec_ctx, calld->call_combiner, + grpc_call_combiner_set_notify_on_cancel(calld->call_combiner, &calld->cancel_closure); GRPC_CALL_STACK_REF(calld->owning_call, "server_auth_metadata"); calld->md = metadata_batch_to_md_array( @@ -184,13 +179,12 @@ static void recv_initial_metadata_ready(grpc_exec_ctx *exec_ctx, void *arg, return; } } - GRPC_CLOSURE_RUN(exec_ctx, calld->original_recv_initial_metadata_ready, + GRPC_CLOSURE_RUN(calld->original_recv_initial_metadata_ready, GRPC_ERROR_REF(error)); } static void auth_start_transport_stream_op_batch( - grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - grpc_transport_stream_op_batch *batch) { + grpc_call_element *elem, grpc_transport_stream_op_batch *batch) { call_data *calld = (call_data *)elem->call_data; if (batch->recv_initial_metadata) { // Inject our callback. @@ -200,12 +194,11 @@ static void auth_start_transport_stream_op_batch( batch->payload->recv_initial_metadata.recv_initial_metadata_ready = &calld->recv_initial_metadata_ready; } - grpc_call_next_op(exec_ctx, elem, batch); + grpc_call_next_op(elem, batch); } /* Constructor for call_data */ -static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *init_call_elem(grpc_call_element *elem, const grpc_call_element_args *args) { call_data *calld = (call_data *)elem->call_data; channel_data *chand = (channel_data *)elem->channel_data; @@ -231,13 +224,12 @@ static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, } /* Destructor for call_data */ -static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, +static void destroy_call_elem(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *ignored) {} /* Constructor for channel_data */ -static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static grpc_error *init_channel_elem(grpc_channel_element *elem, grpc_channel_element_args *args) { GPR_ASSERT(!args->is_last); channel_data *chand = (channel_data *)elem->channel_data; @@ -253,11 +245,10 @@ static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem) { +static void destroy_channel_elem(grpc_channel_element *elem) { channel_data *chand = (channel_data *)elem->channel_data; GRPC_AUTH_CONTEXT_UNREF(chand->auth_context, "server_auth_filter"); - grpc_server_credentials_unref(exec_ctx, chand->creds); + grpc_server_credentials_unref(chand->creds); } const grpc_channel_filter grpc_server_auth_filter = { diff --git a/src/core/lib/slice/b64.cc b/src/core/lib/slice/b64.cc index 50264719a4b..69c64989238 100644 --- a/src/core/lib/slice/b64.cc +++ b/src/core/lib/slice/b64.cc @@ -122,9 +122,8 @@ void grpc_base64_encode_core(char *result, const void *vdata, size_t data_size, result[current - result] = '\0'; } -grpc_slice grpc_base64_decode(grpc_exec_ctx *exec_ctx, const char *b64, - int url_safe) { - return grpc_base64_decode_with_len(exec_ctx, b64, strlen(b64), url_safe); +grpc_slice grpc_base64_decode(const char *b64, int url_safe) { + return grpc_base64_decode_with_len(b64, strlen(b64), url_safe); } static void decode_one_char(const unsigned char *codes, unsigned char *result, @@ -185,8 +184,8 @@ static int decode_group(const unsigned char *codes, size_t num_codes, return 1; } -grpc_slice grpc_base64_decode_with_len(grpc_exec_ctx *exec_ctx, const char *b64, - size_t b64_len, int url_safe) { +grpc_slice grpc_base64_decode_with_len(const char *b64, size_t b64_len, + int url_safe) { grpc_slice result = GRPC_SLICE_MALLOC(b64_len); unsigned char *current = GRPC_SLICE_START_PTR(result); size_t result_size = 0; @@ -231,6 +230,6 @@ grpc_slice grpc_base64_decode_with_len(grpc_exec_ctx *exec_ctx, const char *b64, return result; fail: - grpc_slice_unref_internal(exec_ctx, result); + grpc_slice_unref_internal(result); return grpc_empty_slice(); } diff --git a/src/core/lib/slice/b64.h b/src/core/lib/slice/b64.h index 9b4dc65dbbb..0a60f5a3517 100644 --- a/src/core/lib/slice/b64.h +++ b/src/core/lib/slice/b64.h @@ -44,12 +44,11 @@ void grpc_base64_encode_core(char *result, const void *vdata, size_t data_size, /* Decodes data according to the base64 specification. Returns an empty slice in case of failure. */ -grpc_slice grpc_base64_decode(grpc_exec_ctx *exec_ctx, const char *b64, - int url_safe); +grpc_slice grpc_base64_decode(const char *b64, int url_safe); /* Same as above except that the length is provided by the caller. */ -grpc_slice grpc_base64_decode_with_len(grpc_exec_ctx *exec_ctx, const char *b64, - size_t b64_len, int url_safe); +grpc_slice grpc_base64_decode_with_len(const char *b64, size_t b64_len, + int url_safe); #ifdef __cplusplus } diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc index 0764eda0527..07fc49e189d 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc @@ -54,9 +54,9 @@ grpc_slice grpc_slice_ref_internal(grpc_slice slice) { return slice; } -void grpc_slice_unref_internal(grpc_exec_ctx *exec_ctx, grpc_slice slice) { +void grpc_slice_unref_internal(grpc_slice slice) { if (slice.refcount) { - slice.refcount->vtable->unref(exec_ctx, slice.refcount); + slice.refcount->vtable->unref(slice.refcount); } } @@ -67,15 +67,15 @@ grpc_slice grpc_slice_ref(grpc_slice slice) { /* Public API */ void grpc_slice_unref(grpc_slice slice) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_unref_internal(&exec_ctx, slice); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_slice_unref_internal(slice); + grpc_exec_ctx_finish(); } /* grpc_slice_from_static_string support structure - a refcount that does nothing */ static void noop_ref(void *unused) {} -static void noop_unref(grpc_exec_ctx *exec_ctx, void *unused) {} +static void noop_unref(void *unused) {} static const grpc_slice_refcount_vtable noop_refcount_vtable = { noop_ref, noop_unref, grpc_slice_default_eq_impl, @@ -109,7 +109,7 @@ static void new_slice_ref(void *p) { gpr_ref(&r->refs); } -static void new_slice_unref(grpc_exec_ctx *exec_ctx, void *p) { +static void new_slice_unref(void *p) { new_slice_refcount *r = (new_slice_refcount *)p; if (gpr_unref(&r->refs)) { r->user_destroy(r->user_data); @@ -159,7 +159,7 @@ static void new_with_len_ref(void *p) { gpr_ref(&r->refs); } -static void new_with_len_unref(grpc_exec_ctx *exec_ctx, void *p) { +static void new_with_len_unref(void *p) { new_with_len_slice_refcount *r = (new_with_len_slice_refcount *)p; if (gpr_unref(&r->refs)) { r->user_destroy(r->user_data, r->user_length); @@ -210,7 +210,7 @@ static void malloc_ref(void *p) { gpr_ref(&r->refs); } -static void malloc_unref(grpc_exec_ctx *exec_ctx, void *p) { +static void malloc_unref(void *p) { malloc_refcount *r = (malloc_refcount *)p; if (gpr_unref(&r->refs)) { gpr_free(r); diff --git a/src/core/lib/slice/slice_buffer.cc b/src/core/lib/slice/slice_buffer.cc index 63ffc0b00dc..c76d91bd1cf 100644 --- a/src/core/lib/slice/slice_buffer.cc +++ b/src/core/lib/slice/slice_buffer.cc @@ -65,18 +65,17 @@ void grpc_slice_buffer_init(grpc_slice_buffer *sb) { sb->base_slices = sb->slices = sb->inlined; } -void grpc_slice_buffer_destroy_internal(grpc_exec_ctx *exec_ctx, - grpc_slice_buffer *sb) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, sb); +void grpc_slice_buffer_destroy_internal(grpc_slice_buffer *sb) { + grpc_slice_buffer_reset_and_unref_internal(sb); if (sb->base_slices != sb->inlined) { gpr_free(sb->base_slices); } } void grpc_slice_buffer_destroy(grpc_slice_buffer *sb) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_buffer_destroy_internal(&exec_ctx, sb); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_slice_buffer_destroy_internal(sb); + grpc_exec_ctx_finish(); } uint8_t *grpc_slice_buffer_tiny_add(grpc_slice_buffer *sb, size_t n) { @@ -163,11 +162,10 @@ void grpc_slice_buffer_pop(grpc_slice_buffer *sb) { } } -void grpc_slice_buffer_reset_and_unref_internal(grpc_exec_ctx *exec_ctx, - grpc_slice_buffer *sb) { +void grpc_slice_buffer_reset_and_unref_internal(grpc_slice_buffer *sb) { size_t i; for (i = 0; i < sb->count; i++) { - grpc_slice_unref_internal(exec_ctx, sb->slices[i]); + grpc_slice_unref_internal(sb->slices[i]); } sb->count = 0; @@ -175,9 +173,9 @@ void grpc_slice_buffer_reset_and_unref_internal(grpc_exec_ctx *exec_ctx, } void grpc_slice_buffer_reset_and_unref(grpc_slice_buffer *sb) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, sb); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_slice_buffer_reset_and_unref_internal(sb); + grpc_exec_ctx_finish(); } void grpc_slice_buffer_swap(grpc_slice_buffer *a, grpc_slice_buffer *b) { @@ -289,8 +287,7 @@ void grpc_slice_buffer_move_first_no_ref(grpc_slice_buffer *src, size_t n, slice_buffer_move_first_maybe_ref(src, n, dst, false); } -void grpc_slice_buffer_move_first_into_buffer(grpc_exec_ctx *exec_ctx, - grpc_slice_buffer *src, size_t n, +void grpc_slice_buffer_move_first_into_buffer(grpc_slice_buffer *src, size_t n, void *dst) { char *dstp = (char *)dst; GPR_ASSERT(src->length >= n); @@ -305,13 +302,13 @@ void grpc_slice_buffer_move_first_into_buffer(grpc_exec_ctx *exec_ctx, n = 0; } else if (slice_len == n) { memcpy(dstp, GRPC_SLICE_START_PTR(slice), n); - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); n = 0; } else { memcpy(dstp, GRPC_SLICE_START_PTR(slice), slice_len); dstp += slice_len; n -= slice_len; - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); } } } diff --git a/src/core/lib/slice/slice_hash_table.cc b/src/core/lib/slice/slice_hash_table.cc index 6c2c9c201c3..c122c9f4ef8 100644 --- a/src/core/lib/slice/slice_hash_table.cc +++ b/src/core/lib/slice/slice_hash_table.cc @@ -27,7 +27,7 @@ struct grpc_slice_hash_table { gpr_refcount refs; - void (*destroy_value)(grpc_exec_ctx* exec_ctx, void* value); + void (*destroy_value)(void* value); int (*value_cmp)(void* a, void* b); size_t size; size_t max_num_probes; @@ -58,8 +58,7 @@ static void grpc_slice_hash_table_add(grpc_slice_hash_table* table, grpc_slice_hash_table* grpc_slice_hash_table_create( size_t num_entries, grpc_slice_hash_table_entry* entries, - void (*destroy_value)(grpc_exec_ctx* exec_ctx, void* value), - int (*value_cmp)(void* a, void* b)) { + void (*destroy_value)(void* value), int (*value_cmp)(void* a, void* b)) { grpc_slice_hash_table* table = (grpc_slice_hash_table*)gpr_zalloc(sizeof(*table)); gpr_ref_init(&table->refs, 1); @@ -81,14 +80,13 @@ grpc_slice_hash_table* grpc_slice_hash_table_ref(grpc_slice_hash_table* table) { return table; } -void grpc_slice_hash_table_unref(grpc_exec_ctx* exec_ctx, - grpc_slice_hash_table* table) { +void grpc_slice_hash_table_unref(grpc_slice_hash_table* table) { if (table != NULL && gpr_unref(&table->refs)) { for (size_t i = 0; i < table->size; ++i) { grpc_slice_hash_table_entry* entry = &table->entries[i]; if (!is_empty(entry)) { - grpc_slice_unref_internal(exec_ctx, entry->key); - table->destroy_value(exec_ctx, entry->value); + grpc_slice_unref_internal(entry->key); + table->destroy_value(entry->value); } } gpr_free(table->entries); diff --git a/src/core/lib/slice/slice_hash_table.h b/src/core/lib/slice/slice_hash_table.h index 41250df7385..a3df9c92e55 100644 --- a/src/core/lib/slice/slice_hash_table.h +++ b/src/core/lib/slice/slice_hash_table.h @@ -50,12 +50,10 @@ typedef struct grpc_slice_hash_table_entry { will be used. */ grpc_slice_hash_table *grpc_slice_hash_table_create( size_t num_entries, grpc_slice_hash_table_entry *entries, - void (*destroy_value)(grpc_exec_ctx *exec_ctx, void *value), - int (*value_cmp)(void *a, void *b)); + void (*destroy_value)(void *value), int (*value_cmp)(void *a, void *b)); grpc_slice_hash_table *grpc_slice_hash_table_ref(grpc_slice_hash_table *table); -void grpc_slice_hash_table_unref(grpc_exec_ctx *exec_ctx, - grpc_slice_hash_table *table); +void grpc_slice_hash_table_unref(grpc_slice_hash_table *table); /** Returns the value from \a table associated with \a key. Returns NULL if \a key is not found. */ diff --git a/src/core/lib/slice/slice_intern.cc b/src/core/lib/slice/slice_intern.cc index 1ea9a2aa677..2503ee81772 100644 --- a/src/core/lib/slice/slice_intern.cc +++ b/src/core/lib/slice/slice_intern.cc @@ -90,7 +90,7 @@ static void interned_slice_destroy(interned_slice_refcount *s) { gpr_mu_unlock(&shard->mu); } -static void interned_slice_unref(grpc_exec_ctx *exec_ctx, void *p) { +static void interned_slice_unref(void *p) { interned_slice_refcount *s = (interned_slice_refcount *)p; if (1 == gpr_atm_full_fetch_add(&s->refcnt, -1)) { interned_slice_destroy(s); @@ -101,9 +101,8 @@ static void interned_slice_sub_ref(void *p) { interned_slice_ref(((char *)p) - offsetof(interned_slice_refcount, sub)); } -static void interned_slice_sub_unref(grpc_exec_ctx *exec_ctx, void *p) { - interned_slice_unref(exec_ctx, - ((char *)p) - offsetof(interned_slice_refcount, sub)); +static void interned_slice_sub_unref(void *p) { + interned_slice_unref(((char *)p) - offsetof(interned_slice_refcount, sub)); } static uint32_t interned_slice_hash(grpc_slice slice) { diff --git a/src/core/lib/slice/slice_internal.h b/src/core/lib/slice/slice_internal.h index fcf70a0e55f..5156f3fc509 100644 --- a/src/core/lib/slice/slice_internal.h +++ b/src/core/lib/slice/slice_internal.h @@ -29,11 +29,9 @@ extern "C" { #endif grpc_slice grpc_slice_ref_internal(grpc_slice slice); -void grpc_slice_unref_internal(grpc_exec_ctx *exec_ctx, grpc_slice slice); -void grpc_slice_buffer_reset_and_unref_internal(grpc_exec_ctx *exec_ctx, - grpc_slice_buffer *sb); -void grpc_slice_buffer_destroy_internal(grpc_exec_ctx *exec_ctx, - grpc_slice_buffer *sb); +void grpc_slice_unref_internal(grpc_slice slice); +void grpc_slice_buffer_reset_and_unref_internal(grpc_slice_buffer *sb); +void grpc_slice_buffer_destroy_internal(grpc_slice_buffer *sb); /* Check if a slice is interned */ bool grpc_slice_is_interned(grpc_slice slice); diff --git a/src/core/lib/surface/alarm.cc b/src/core/lib/surface/alarm.cc index 16a16bfd93b..4f3bc5172d2 100644 --- a/src/core/lib/surface/alarm.cc +++ b/src/core/lib/surface/alarm.cc @@ -47,11 +47,11 @@ static void alarm_ref(grpc_alarm *alarm) { gpr_ref(&alarm->refs); } static void alarm_unref(grpc_alarm *alarm) { if (gpr_unref(&alarm->refs)) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; if (alarm->cq != NULL) { - GRPC_CQ_INTERNAL_UNREF(&exec_ctx, alarm->cq, "alarm"); + GRPC_CQ_INTERNAL_UNREF(alarm->cq, "alarm"); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_free(alarm); } } @@ -82,20 +82,19 @@ static void alarm_unref_dbg(grpc_alarm *alarm, const char *reason, } #endif -static void alarm_end_completion(grpc_exec_ctx *exec_ctx, void *arg, - grpc_cq_completion *c) { +static void alarm_end_completion(void *arg, grpc_cq_completion *c) { grpc_alarm *alarm = (grpc_alarm *)arg; GRPC_ALARM_UNREF(alarm, "dequeue-end-op"); } -static void alarm_cb(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void alarm_cb(void *arg, grpc_error *error) { grpc_alarm *alarm = (grpc_alarm *)arg; /* We are queuing an op on completion queue. This means, the alarm's structure cannot be destroyed until the op is dequeued. Adding an extra ref here and unref'ing when the op is dequeued will achieve this */ GRPC_ALARM_REF(alarm, "queue-end-op"); - grpc_cq_end_op(exec_ctx, alarm->cq, alarm->tag, error, alarm_end_completion, + grpc_cq_end_op(alarm->cq, alarm->tag, error, alarm_end_completion, (void *)alarm, &alarm->completion); } @@ -118,22 +117,22 @@ grpc_alarm *grpc_alarm_create(void *reserved) { void grpc_alarm_set(grpc_alarm *alarm, grpc_completion_queue *cq, gpr_timespec deadline, void *tag, void *reserved) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GRPC_CQ_INTERNAL_REF(cq, "alarm"); alarm->cq = cq; alarm->tag = tag; GPR_ASSERT(grpc_cq_begin_op(cq, tag)); - grpc_timer_init(&exec_ctx, &alarm->alarm, - grpc_timespec_to_millis_round_up(deadline), &alarm->on_alarm); - grpc_exec_ctx_finish(&exec_ctx); + grpc_timer_init(&alarm->alarm, grpc_timespec_to_millis_round_up(deadline), + &alarm->on_alarm); + grpc_exec_ctx_finish(); } void grpc_alarm_cancel(grpc_alarm *alarm, void *reserved) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_timer_cancel(&exec_ctx, &alarm->alarm); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_timer_cancel(&alarm->alarm); + grpc_exec_ctx_finish(); } void grpc_alarm_destroy(grpc_alarm *alarm, void *reserved) { diff --git a/src/core/lib/surface/byte_buffer.cc b/src/core/lib/surface/byte_buffer.cc index 7ed550ef87c..51231896712 100644 --- a/src/core/lib/surface/byte_buffer.cc +++ b/src/core/lib/surface/byte_buffer.cc @@ -71,14 +71,14 @@ grpc_byte_buffer *grpc_byte_buffer_copy(grpc_byte_buffer *bb) { void grpc_byte_buffer_destroy(grpc_byte_buffer *bb) { if (!bb) return; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; switch (bb->type) { case GRPC_BB_RAW: - grpc_slice_buffer_destroy_internal(&exec_ctx, &bb->data.raw.slice_buffer); + grpc_slice_buffer_destroy_internal(&bb->data.raw.slice_buffer); break; } gpr_free(bb); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } size_t grpc_byte_buffer_length(grpc_byte_buffer *bb) { diff --git a/src/core/lib/surface/byte_buffer_reader.cc b/src/core/lib/surface/byte_buffer_reader.cc index 87bd3239c03..5f5596c8035 100644 --- a/src/core/lib/surface/byte_buffer_reader.cc +++ b/src/core/lib/surface/byte_buffer_reader.cc @@ -42,15 +42,14 @@ static int is_compressed(grpc_byte_buffer *buffer) { int grpc_byte_buffer_reader_init(grpc_byte_buffer_reader *reader, grpc_byte_buffer *buffer) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_slice_buffer decompressed_slices_buffer; reader->buffer_in = buffer; switch (reader->buffer_in->type) { case GRPC_BB_RAW: grpc_slice_buffer_init(&decompressed_slices_buffer); if (is_compressed(reader->buffer_in)) { - if (grpc_msg_decompress(&exec_ctx, - reader->buffer_in->data.raw.compression, + if (grpc_msg_decompress(reader->buffer_in->data.raw.compression, &reader->buffer_in->data.raw.slice_buffer, &decompressed_slices_buffer) == 0) { gpr_log(GPR_ERROR, @@ -64,15 +63,14 @@ int grpc_byte_buffer_reader_init(grpc_byte_buffer_reader *reader, grpc_raw_byte_buffer_create(decompressed_slices_buffer.slices, decompressed_slices_buffer.count); } - grpc_slice_buffer_destroy_internal(&exec_ctx, - &decompressed_slices_buffer); + grpc_slice_buffer_destroy_internal(&decompressed_slices_buffer); } else { /* not compressed, use the input buffer as output */ reader->buffer_out = reader->buffer_in; } reader->current.index = 0; break; } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return 1; } @@ -112,14 +110,14 @@ grpc_slice grpc_byte_buffer_reader_readall(grpc_byte_buffer_reader *reader) { grpc_slice out_slice = GRPC_SLICE_MALLOC(input_size); uint8_t *const outbuf = GRPC_SLICE_START_PTR(out_slice); /* just an alias */ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (grpc_byte_buffer_reader_next(reader, &in_slice) != 0) { const size_t slice_length = GRPC_SLICE_LENGTH(in_slice); memcpy(&(outbuf[bytes_read]), GRPC_SLICE_START_PTR(in_slice), slice_length); bytes_read += slice_length; - grpc_slice_unref_internal(&exec_ctx, in_slice); + grpc_slice_unref_internal(in_slice); GPR_ASSERT(bytes_read <= input_size); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return out_slice; } diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index 8216aa0ec81..26002056eae 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -271,29 +271,26 @@ grpc_tracer_flag grpc_compression_trace = #define CALL_FROM_TOP_ELEM(top_elem) \ CALL_FROM_CALL_STACK(grpc_call_stack_from_top_element(top_elem)) -static void execute_batch(grpc_exec_ctx *exec_ctx, grpc_call *call, - grpc_transport_stream_op_batch *op, +static void execute_batch(grpc_call *call, grpc_transport_stream_op_batch *op, grpc_closure *start_batch_closure); -static void cancel_with_status(grpc_exec_ctx *exec_ctx, grpc_call *c, - status_source source, grpc_status_code status, +static void cancel_with_status(grpc_call *c, status_source source, + grpc_status_code status, const char *description); -static void cancel_with_error(grpc_exec_ctx *exec_ctx, grpc_call *c, - status_source source, grpc_error *error); -static void destroy_call(grpc_exec_ctx *exec_ctx, void *call_stack, - grpc_error *error); -static void receiving_slice_ready(grpc_exec_ctx *exec_ctx, void *bctlp, - grpc_error *error); -static void get_final_status(grpc_exec_ctx *exec_ctx, grpc_call *call, +static void cancel_with_error(grpc_call *c, status_source source, + grpc_error *error); +static void destroy_call(void *call_stack, grpc_error *error); +static void receiving_slice_ready(void *bctlp, grpc_error *error); +static void get_final_status(grpc_call *call, void (*set_value)(grpc_status_code code, void *user_data), void *set_value_user_data, grpc_slice *details); static void set_status_value_directly(grpc_status_code status, void *dest); -static void set_status_from_error(grpc_exec_ctx *exec_ctx, grpc_call *call, - status_source source, grpc_error *error); -static void process_data_after_md(grpc_exec_ctx *exec_ctx, batch_control *bctl); -static void post_batch_completion(grpc_exec_ctx *exec_ctx, batch_control *bctl); -static void add_batch_error(grpc_exec_ctx *exec_ctx, batch_control *bctl, - grpc_error *error, bool has_cancelled); +static void set_status_from_error(grpc_call *call, status_source source, + grpc_error *error); +static void process_data_after_md(batch_control *bctl); +static void post_batch_completion(batch_control *bctl); +static void add_batch_error(batch_control *bctl, grpc_error *error, + bool has_cancelled); static void add_init_error(grpc_error **composite, grpc_error *new_err) { if (new_err == GRPC_ERROR_NONE) return; @@ -323,8 +320,7 @@ static parent_call *get_parent_call(grpc_call *call) { return (parent_call *)gpr_atm_acq_load(&call->parent_call_atm); } -grpc_error *grpc_call_create(grpc_exec_ctx *exec_ctx, - const grpc_call_create_args *args, +grpc_error *grpc_call_create(const grpc_call_create_args *args, grpc_call **out_call) { size_t i, j; grpc_error *error = GRPC_ERROR_NONE; @@ -333,7 +329,7 @@ grpc_error *grpc_call_create(grpc_exec_ctx *exec_ctx, grpc_call *call; GPR_TIMER_BEGIN("grpc_call_create", 0); size_t initial_size = grpc_channel_get_call_size_estimate(args->channel); - GRPC_STATS_INC_CALL_INITIAL_SIZE(exec_ctx, initial_size); + GRPC_STATS_INC_CALL_INITIAL_SIZE(initial_size); gpr_arena *arena = gpr_arena_create(initial_size); call = (grpc_call *)gpr_arena_alloc( arena, sizeof(grpc_call) + channel_stack->call_stack_size); @@ -348,9 +344,9 @@ grpc_error *grpc_call_create(grpc_exec_ctx *exec_ctx, GPR_BITSET(&call->encodings_accepted_by_peer, GRPC_COMPRESS_NONE); call->is_client = args->server_transport_data == NULL; if (call->is_client) { - GRPC_STATS_INC_CLIENT_CALLS_CREATED(exec_ctx); + GRPC_STATS_INC_CLIENT_CALLS_CREATED(); } else { - GRPC_STATS_INC_SERVER_CALLS_CREATED(exec_ctx); + GRPC_STATS_INC_SERVER_CALLS_CREATED(); } call->stream_op_payload.context = call->context; grpc_slice path = grpc_empty_slice(); @@ -445,15 +441,13 @@ grpc_error *grpc_call_create(grpc_exec_ctx *exec_ctx, send_deadline, call->arena, &call->call_combiner}; - add_init_error(&error, grpc_call_stack_init(exec_ctx, channel_stack, 1, - destroy_call, call, &call_args)); + add_init_error(&error, grpc_call_stack_init(channel_stack, 1, destroy_call, + call, &call_args)); if (error != GRPC_ERROR_NONE) { - cancel_with_error(exec_ctx, call, STATUS_FROM_SURFACE, - GRPC_ERROR_REF(error)); + cancel_with_error(call, STATUS_FROM_SURFACE, GRPC_ERROR_REF(error)); } if (immediately_cancel) { - cancel_with_error(exec_ctx, call, STATUS_FROM_API_OVERRIDE, - GRPC_ERROR_CANCELLED); + cancel_with_error(call, STATUS_FROM_API_OVERRIDE, GRPC_ERROR_CANCELLED); } if (args->cq != NULL) { GPR_ASSERT( @@ -468,17 +462,17 @@ grpc_error *grpc_call_create(grpc_exec_ctx *exec_ctx, args->pollset_set_alternative); } if (!grpc_polling_entity_is_empty(&call->pollent)) { - grpc_call_stack_set_pollset_or_pollset_set( - exec_ctx, CALL_STACK_FROM_CALL(call), &call->pollent); + grpc_call_stack_set_pollset_or_pollset_set(CALL_STACK_FROM_CALL(call), + &call->pollent); } - grpc_slice_unref_internal(exec_ctx, path); + grpc_slice_unref_internal(path); GPR_TIMER_END("grpc_call_create", 0); return error; } -void grpc_call_set_completion_queue(grpc_exec_ctx *exec_ctx, grpc_call *call, +void grpc_call_set_completion_queue(grpc_call *call, grpc_completion_queue *cq) { GPR_ASSERT(cq); @@ -489,8 +483,8 @@ void grpc_call_set_completion_queue(grpc_exec_ctx *exec_ctx, grpc_call *call, call->cq = cq; GRPC_CQ_INTERNAL_REF(cq, "bind"); call->pollent = grpc_polling_entity_create_from_pollset(grpc_cq_pollset(cq)); - grpc_call_stack_set_pollset_or_pollset_set( - exec_ctx, CALL_STACK_FROM_CALL(call), &call->pollent); + grpc_call_stack_set_pollset_or_pollset_set(CALL_STACK_FROM_CALL(call), + &call->pollent); } #ifndef NDEBUG @@ -503,40 +497,38 @@ void grpc_call_set_completion_queue(grpc_exec_ctx *exec_ctx, grpc_call *call, void grpc_call_internal_ref(grpc_call *c REF_ARG) { GRPC_CALL_STACK_REF(CALL_STACK_FROM_CALL(c), REF_REASON); } -void grpc_call_internal_unref(grpc_exec_ctx *exec_ctx, grpc_call *c REF_ARG) { - GRPC_CALL_STACK_UNREF(exec_ctx, CALL_STACK_FROM_CALL(c), REF_REASON); +void grpc_call_internal_unref(grpc_call *c REF_ARG) { + GRPC_CALL_STACK_UNREF(CALL_STACK_FROM_CALL(c), REF_REASON); } -static void release_call(grpc_exec_ctx *exec_ctx, void *call, - grpc_error *error) { +static void release_call(void *call, grpc_error *error) { grpc_call *c = (grpc_call *)call; grpc_channel *channel = c->channel; grpc_call_combiner_destroy(&c->call_combiner); gpr_free((char *)c->peer_string); grpc_channel_update_call_size_estimate(channel, gpr_arena_destroy(c->arena)); - GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, channel, "call"); + GRPC_CHANNEL_INTERNAL_UNREF(channel, "call"); } static void set_status_value_directly(grpc_status_code status, void *dest); -static void destroy_call(grpc_exec_ctx *exec_ctx, void *call, - grpc_error *error) { +static void destroy_call(void *call, grpc_error *error) { size_t i; int ii; grpc_call *c = (grpc_call *)call; GPR_TIMER_BEGIN("destroy_call", 0); for (i = 0; i < 2; i++) { grpc_metadata_batch_destroy( - exec_ctx, &c->metadata_batch[1 /* is_receiving */][i /* is_initial */]); + &c->metadata_batch[1 /* is_receiving */][i /* is_initial */]); } if (c->receiving_stream != NULL) { - grpc_byte_stream_destroy(exec_ctx, c->receiving_stream); + grpc_byte_stream_destroy(c->receiving_stream); } parent_call *pc = get_parent_call(c); if (pc != NULL) { gpr_mu_destroy(&pc->child_list_mu); } for (ii = 0; ii < c->send_extra_metadata_count; ii++) { - GRPC_MDELEM_UNREF(exec_ctx, c->send_extra_metadata[ii].md); + GRPC_MDELEM_UNREF(c->send_extra_metadata[ii].md); } for (i = 0; i < GRPC_CONTEXT_COUNT; i++) { if (c->context[i].destroy) { @@ -544,11 +536,11 @@ static void destroy_call(grpc_exec_ctx *exec_ctx, void *call, } } if (c->cq) { - GRPC_CQ_INTERNAL_UNREF(exec_ctx, c->cq, "bind"); + GRPC_CQ_INTERNAL_UNREF(c->cq, "bind"); } - get_final_status(exec_ctx, c, set_status_value_directly, - &c->final_info.final_status, NULL); + get_final_status(c, set_status_value_directly, &c->final_info.final_status, + NULL); c->final_info.stats.latency = gpr_time_sub(gpr_now(GPR_CLOCK_MONOTONIC), c->start_time); @@ -557,7 +549,7 @@ static void destroy_call(grpc_exec_ctx *exec_ctx, void *call, unpack_received_status(gpr_atm_acq_load(&c->status[i])).error); } - grpc_call_stack_destroy(exec_ctx, CALL_STACK_FROM_CALL(c), &c->final_info, + grpc_call_stack_destroy(CALL_STACK_FROM_CALL(c), &c->final_info, GRPC_CLOSURE_INIT(&c->release_call, release_call, c, grpc_schedule_on_exec_ctx)); GPR_TIMER_END("destroy_call", 0); @@ -569,7 +561,7 @@ void grpc_call_unref(grpc_call *c) { if (!gpr_unref(&c->ext_ref)) return; child_call *cc = c->child; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GPR_TIMER_BEGIN("grpc_call_unref", 0); GRPC_API_TRACE("grpc_call_unref(c=%p)", 1, (c)); @@ -586,7 +578,7 @@ void grpc_call_unref(grpc_call *c) { cc->sibling_prev->child->sibling_next = cc->sibling_next; cc->sibling_next->child->sibling_prev = cc->sibling_prev; gpr_mu_unlock(&pc->child_list_mu); - GRPC_CALL_INTERNAL_UNREF(&exec_ctx, cc->parent, "child"); + GRPC_CALL_INTERNAL_UNREF(cc->parent, "child"); } GPR_ASSERT(!c->destroy_called); @@ -594,52 +586,49 @@ void grpc_call_unref(grpc_call *c) { bool cancel = gpr_atm_acq_load(&c->any_ops_sent_atm) != 0 && gpr_atm_acq_load(&c->received_final_op_atm) == 0; if (cancel) { - cancel_with_error(&exec_ctx, c, STATUS_FROM_API_OVERRIDE, - GRPC_ERROR_CANCELLED); + cancel_with_error(c, STATUS_FROM_API_OVERRIDE, GRPC_ERROR_CANCELLED); } else { // Unset the call combiner cancellation closure. This has the // effect of scheduling the previously set cancellation closure, if // any, so that it can release any internal references it may be // holding to the call stack. - grpc_call_combiner_set_notify_on_cancel(&exec_ctx, &c->call_combiner, NULL); + grpc_call_combiner_set_notify_on_cancel(&c->call_combiner, NULL); } - GRPC_CALL_INTERNAL_UNREF(&exec_ctx, c, "destroy"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_CALL_INTERNAL_UNREF(c, "destroy"); + grpc_exec_ctx_finish(); GPR_TIMER_END("grpc_call_unref", 0); } grpc_call_error grpc_call_cancel(grpc_call *call, void *reserved) { GRPC_API_TRACE("grpc_call_cancel(call=%p, reserved=%p)", 2, (call, reserved)); GPR_ASSERT(!reserved); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - cancel_with_error(&exec_ctx, call, STATUS_FROM_API_OVERRIDE, - GRPC_ERROR_CANCELLED); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + cancel_with_error(call, STATUS_FROM_API_OVERRIDE, GRPC_ERROR_CANCELLED); + grpc_exec_ctx_finish(); return GRPC_CALL_OK; } // This is called via the call combiner to start sending a batch down // the filter stack. -static void execute_batch_in_call_combiner(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *ignored) { +static void execute_batch_in_call_combiner(void *arg, grpc_error *ignored) { grpc_transport_stream_op_batch *batch = (grpc_transport_stream_op_batch *)arg; grpc_call *call = (grpc_call *)batch->handler_private.extra_arg; GPR_TIMER_BEGIN("execute_batch", 0); grpc_call_element *elem = CALL_ELEM_FROM_CALL(call, 0); GRPC_CALL_LOG_OP(GPR_INFO, elem, batch); - elem->filter->start_transport_stream_op_batch(exec_ctx, elem, batch); + elem->filter->start_transport_stream_op_batch(elem, batch); GPR_TIMER_END("execute_batch", 0); } // start_batch_closure points to a caller-allocated closure to be used // for entering the call combiner. -static void execute_batch(grpc_exec_ctx *exec_ctx, grpc_call *call, +static void execute_batch(grpc_call *call, grpc_transport_stream_op_batch *batch, grpc_closure *start_batch_closure) { batch->handler_private.extra_arg = call; GRPC_CLOSURE_INIT(start_batch_closure, execute_batch_in_call_combiner, batch, grpc_schedule_on_exec_ctx); - GRPC_CALL_COMBINER_START(exec_ctx, &call->call_combiner, start_batch_closure, + GRPC_CALL_COMBINER_START(&call->call_combiner, start_batch_closure, GRPC_ERROR_NONE, "executing batch"); } @@ -663,15 +652,14 @@ grpc_call_error grpc_call_cancel_with_status(grpc_call *c, grpc_status_code status, const char *description, void *reserved) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GRPC_API_TRACE( "grpc_call_cancel_with_status(" "c=%p, status=%d, description=%s, reserved=%p)", 4, (c, (int)status, description, reserved)); GPR_ASSERT(reserved == NULL); - cancel_with_status(&exec_ctx, c, STATUS_FROM_API_OVERRIDE, status, - description); - grpc_exec_ctx_finish(&exec_ctx); + cancel_with_status(c, STATUS_FROM_API_OVERRIDE, status, description); + grpc_exec_ctx_finish(); return GRPC_CALL_OK; } @@ -683,24 +671,23 @@ typedef struct { // The on_complete callback used when sending a cancel_stream batch down // the filter stack. Yields the call combiner when the batch is done. -static void done_termination(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void done_termination(void *arg, grpc_error *error) { cancel_state *state = (cancel_state *)arg; - GRPC_CALL_COMBINER_STOP(exec_ctx, &state->call->call_combiner, + GRPC_CALL_COMBINER_STOP(&state->call->call_combiner, "on_complete for cancel_stream op"); - GRPC_CALL_INTERNAL_UNREF(exec_ctx, state->call, "termination"); + GRPC_CALL_INTERNAL_UNREF(state->call, "termination"); gpr_free(state); } -static void cancel_with_error(grpc_exec_ctx *exec_ctx, grpc_call *c, - status_source source, grpc_error *error) { +static void cancel_with_error(grpc_call *c, status_source source, + grpc_error *error) { GRPC_CALL_INTERNAL_REF(c, "termination"); // Inform the call combiner of the cancellation, so that it can cancel // any in-flight asynchronous actions that may be holding the call // combiner. This ensures that the cancel_stream batch can be sent // down the filter stack in a timely manner. - grpc_call_combiner_cancel(exec_ctx, &c->call_combiner, GRPC_ERROR_REF(error)); - set_status_from_error(exec_ctx, c, source, GRPC_ERROR_REF(error)); + grpc_call_combiner_cancel(&c->call_combiner, GRPC_ERROR_REF(error)); + set_status_from_error(c, source, GRPC_ERROR_REF(error)); cancel_state *state = (cancel_state *)gpr_malloc(sizeof(*state)); state->call = c; GRPC_CLOSURE_INIT(&state->finish_batch, done_termination, state, @@ -709,7 +696,7 @@ static void cancel_with_error(grpc_exec_ctx *exec_ctx, grpc_call *c, grpc_make_transport_stream_op(&state->finish_batch); op->cancel_stream = true; op->payload->cancel_stream.cancel_error = error; - execute_batch(exec_ctx, c, op, &state->start_batch); + execute_batch(c, op, &state->start_batch); } static grpc_error *error_from_status(grpc_status_code status, @@ -723,27 +710,23 @@ static grpc_error *error_from_status(grpc_status_code status, GRPC_ERROR_INT_GRPC_STATUS, status); } -static void cancel_with_status(grpc_exec_ctx *exec_ctx, grpc_call *c, - status_source source, grpc_status_code status, +static void cancel_with_status(grpc_call *c, status_source source, + grpc_status_code status, const char *description) { - cancel_with_error(exec_ctx, c, source, - error_from_status(status, description)); + cancel_with_error(c, source, error_from_status(status, description)); } /******************************************************************************* * FINAL STATUS CODE MANIPULATION */ -static bool get_final_status_from(grpc_exec_ctx *exec_ctx, grpc_call *call, - grpc_error *error, bool allow_ok_status, - void (*set_value)(grpc_status_code code, - void *user_data), - void *set_value_user_data, - grpc_slice *details) { +static bool get_final_status_from( + grpc_call *call, grpc_error *error, bool allow_ok_status, + void (*set_value)(grpc_status_code code, void *user_data), + void *set_value_user_data, grpc_slice *details) { grpc_status_code code; grpc_slice slice = grpc_empty_slice(); - grpc_error_get_status(exec_ctx, error, call->send_deadline, &code, &slice, - NULL); + grpc_error_get_status(error, call->send_deadline, &code, &slice, NULL); if (code == GRPC_STATUS_OK && !allow_ok_status) { return false; } @@ -755,7 +738,7 @@ static bool get_final_status_from(grpc_exec_ctx *exec_ctx, grpc_call *call, return true; } -static void get_final_status(grpc_exec_ctx *exec_ctx, grpc_call *call, +static void get_final_status(grpc_call *call, void (*set_value)(grpc_status_code code, void *user_data), void *set_value_user_data, grpc_slice *details) { @@ -780,9 +763,8 @@ static void get_final_status(grpc_exec_ctx *exec_ctx, grpc_call *call, for (i = 0; i < STATUS_SOURCE_COUNT; i++) { if (status[i].is_set && grpc_error_has_clear_grpc_status(status[i].error)) { - if (get_final_status_from(exec_ctx, call, status[i].error, - allow_ok_status != 0, set_value, - set_value_user_data, details)) { + if (get_final_status_from(call, status[i].error, allow_ok_status != 0, + set_value, set_value_user_data, details)) { return; } } @@ -790,9 +772,8 @@ static void get_final_status(grpc_exec_ctx *exec_ctx, grpc_call *call, /* If no clearly defined status exists, search for 'anything' */ for (i = 0; i < STATUS_SOURCE_COUNT; i++) { if (status[i].is_set) { - if (get_final_status_from(exec_ctx, call, status[i].error, - allow_ok_status != 0, set_value, - set_value_user_data, details)) { + if (get_final_status_from(call, status[i].error, allow_ok_status != 0, + set_value, set_value_user_data, details)) { return; } } @@ -806,8 +787,8 @@ static void get_final_status(grpc_exec_ctx *exec_ctx, grpc_call *call, } } -static void set_status_from_error(grpc_exec_ctx *exec_ctx, grpc_call *call, - status_source source, grpc_error *error) { +static void set_status_from_error(grpc_call *call, status_source source, + grpc_error *error) { if (!gpr_atm_rel_cas(&call->status[source], pack_received_status({false, GRPC_ERROR_NONE}), pack_received_status({true, error}))) { @@ -859,8 +840,7 @@ uint32_t grpc_call_test_only_get_message_flags(grpc_call *call) { static void destroy_encodings_accepted_by_peer(void *p) { return; } -static void set_encodings_accepted_by_peer(grpc_exec_ctx *exec_ctx, - grpc_call *call, grpc_mdelem mdel) { +static void set_encodings_accepted_by_peer(grpc_call *call, grpc_mdelem mdel) { size_t i; grpc_compression_algorithm algorithm; grpc_slice_buffer accept_encoding_parts; @@ -898,15 +878,14 @@ static void set_encodings_accepted_by_peer(grpc_exec_ctx *exec_ctx, } } - grpc_slice_buffer_destroy_internal(exec_ctx, &accept_encoding_parts); + grpc_slice_buffer_destroy_internal(&accept_encoding_parts); grpc_mdelem_set_user_data( mdel, destroy_encodings_accepted_by_peer, (void *)(((uintptr_t)call->encodings_accepted_by_peer) + 1)); } -static void set_stream_encodings_accepted_by_peer(grpc_exec_ctx *exec_ctx, - grpc_call *call, +static void set_stream_encodings_accepted_by_peer(grpc_call *call, grpc_mdelem mdel) { size_t i; grpc_stream_compression_algorithm algorithm; @@ -944,7 +923,7 @@ static void set_stream_encodings_accepted_by_peer(grpc_exec_ctx *exec_ctx, } } - grpc_slice_buffer_destroy_internal(exec_ctx, &accept_encoding_parts); + grpc_slice_buffer_destroy_internal(&accept_encoding_parts); grpc_mdelem_set_user_data( mdel, destroy_encodings_accepted_by_peer, @@ -982,10 +961,12 @@ static grpc_metadata *get_md_elem(grpc_metadata *metadata, return res; } -static int prepare_application_metadata( - grpc_exec_ctx *exec_ctx, grpc_call *call, int count, - grpc_metadata *metadata, int is_trailing, int prepend_extra_metadata, - grpc_metadata *additional_metadata, int additional_metadata_count) { +static int prepare_application_metadata(grpc_call *call, int count, + grpc_metadata *metadata, + int is_trailing, + int prepend_extra_metadata, + grpc_metadata *additional_metadata, + int additional_metadata_count) { int total_count = count + additional_metadata_count; int i; grpc_metadata_batch *batch = @@ -1004,14 +985,14 @@ static int prepare_application_metadata( grpc_validate_header_nonbin_value_is_legal(md->value))) { break; } - l->md = grpc_mdelem_from_grpc_metadata(exec_ctx, (grpc_metadata *)md); + l->md = grpc_mdelem_from_grpc_metadata((grpc_metadata *)md); } if (i != total_count) { for (int j = 0; j < i; j++) { const grpc_metadata *md = get_md_elem(metadata, additional_metadata, j, count); grpc_linked_mdelem *l = linked_from_md(md); - GRPC_MDELEM_UNREF(exec_ctx, l->md); + GRPC_MDELEM_UNREF(l->md); } return 0; } @@ -1022,16 +1003,16 @@ static int prepare_application_metadata( for (i = 0; i < call->send_extra_metadata_count; i++) { GRPC_LOG_IF_ERROR("prepare_application_metadata", grpc_metadata_batch_link_tail( - exec_ctx, batch, &call->send_extra_metadata[i])); + batch, &call->send_extra_metadata[i])); } } } for (i = 0; i < total_count; i++) { grpc_metadata *md = get_md_elem(metadata, additional_metadata, i, count); grpc_linked_mdelem *l = linked_from_md(md); - grpc_error *error = grpc_metadata_batch_link_tail(exec_ctx, batch, l); + grpc_error *error = grpc_metadata_batch_link_tail(batch, l); if (error != GRPC_ERROR_NONE) { - GRPC_MDELEM_UNREF(exec_ctx, l->md); + GRPC_MDELEM_UNREF(l->md); } GRPC_LOG_IF_ERROR("prepare_application_metadata", error); } @@ -1118,46 +1099,43 @@ static void publish_app_metadata(grpc_call *call, grpc_metadata_batch *b, GPR_TIMER_END("publish_app_metadata", 0); } -static void recv_initial_filter(grpc_exec_ctx *exec_ctx, grpc_call *call, - grpc_metadata_batch *b) { +static void recv_initial_filter(grpc_call *call, grpc_metadata_batch *b) { if (b->idx.named.content_encoding != NULL) { if (b->idx.named.grpc_encoding != NULL) { gpr_log(GPR_ERROR, "Received both content-encoding and grpc-encoding header. " "Ignoring grpc-encoding."); - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.grpc_encoding); + grpc_metadata_batch_remove(b, b->idx.named.grpc_encoding); } GPR_TIMER_BEGIN("incoming_stream_compression_algorithm", 0); set_incoming_stream_compression_algorithm( call, decode_stream_compression(b->idx.named.content_encoding->md)); GPR_TIMER_END("incoming_stream_compression_algorithm", 0); - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.content_encoding); + grpc_metadata_batch_remove(b, b->idx.named.content_encoding); } else if (b->idx.named.grpc_encoding != NULL) { GPR_TIMER_BEGIN("incoming_compression_algorithm", 0); set_incoming_compression_algorithm( call, decode_compression(b->idx.named.grpc_encoding->md)); GPR_TIMER_END("incoming_compression_algorithm", 0); - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.grpc_encoding); + grpc_metadata_batch_remove(b, b->idx.named.grpc_encoding); } if (b->idx.named.grpc_accept_encoding != NULL) { GPR_TIMER_BEGIN("encodings_accepted_by_peer", 0); - set_encodings_accepted_by_peer(exec_ctx, call, - b->idx.named.grpc_accept_encoding->md); - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.grpc_accept_encoding); + set_encodings_accepted_by_peer(call, b->idx.named.grpc_accept_encoding->md); + grpc_metadata_batch_remove(b, b->idx.named.grpc_accept_encoding); GPR_TIMER_END("encodings_accepted_by_peer", 0); } if (b->idx.named.accept_encoding != NULL) { GPR_TIMER_BEGIN("stream_encodings_accepted_by_peer", 0); - set_stream_encodings_accepted_by_peer(exec_ctx, call, + set_stream_encodings_accepted_by_peer(call, b->idx.named.accept_encoding->md); - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.accept_encoding); + grpc_metadata_batch_remove(b, b->idx.named.accept_encoding); GPR_TIMER_END("stream_encodings_accepted_by_peer", 0); } publish_app_metadata(call, b, false); } -static void recv_trailing_filter(grpc_exec_ctx *exec_ctx, void *args, - grpc_metadata_batch *b) { +static void recv_trailing_filter(void *args, grpc_metadata_batch *b) { grpc_call *call = (grpc_call *)args; if (b->idx.named.grpc_status != NULL) { uint32_t status_code = decode_status(b->idx.named.grpc_status->md); @@ -1172,13 +1150,13 @@ static void recv_trailing_filter(grpc_exec_ctx *exec_ctx, void *args, error = grpc_error_set_str( error, GRPC_ERROR_STR_GRPC_MESSAGE, grpc_slice_ref_internal(GRPC_MDVALUE(b->idx.named.grpc_message->md))); - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.grpc_message); + grpc_metadata_batch_remove(b, b->idx.named.grpc_message); } else if (error != GRPC_ERROR_NONE) { error = grpc_error_set_str(error, GRPC_ERROR_STR_GRPC_MESSAGE, grpc_empty_slice()); } - set_status_from_error(exec_ctx, call, STATUS_FROM_WIRE, error); - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.grpc_status); + set_status_from_error(call, STATUS_FROM_WIRE, error); + grpc_metadata_batch_remove(b, b->idx.named.grpc_status); } publish_app_metadata(call, b, true); } @@ -1255,12 +1233,12 @@ static batch_control *allocate_batch_control(grpc_call *call, return bctl; } -static void finish_batch_completion(grpc_exec_ctx *exec_ctx, void *user_data, +static void finish_batch_completion(void *user_data, grpc_cq_completion *storage) { batch_control *bctl = (batch_control *)user_data; grpc_call *call = bctl->call; bctl->call = NULL; - GRPC_CALL_INTERNAL_UNREF(exec_ctx, call, "completion"); + GRPC_CALL_INTERNAL_UNREF(call, "completion"); } static grpc_error *consolidate_batch_errors(batch_control *bctl) { @@ -1284,15 +1262,13 @@ static grpc_error *consolidate_batch_errors(batch_control *bctl) { } } -static void post_batch_completion(grpc_exec_ctx *exec_ctx, - batch_control *bctl) { +static void post_batch_completion(batch_control *bctl) { grpc_call *next_child_call; grpc_call *call = bctl->call; grpc_error *error = consolidate_batch_errors(bctl); if (bctl->op.send_initial_metadata) { grpc_metadata_batch_destroy( - exec_ctx, &call->metadata_batch[0 /* is_receiving */][0 /* is_trailing */]); } if (bctl->op.send_message) { @@ -1300,13 +1276,12 @@ static void post_batch_completion(grpc_exec_ctx *exec_ctx, } if (bctl->op.send_trailing_metadata) { grpc_metadata_batch_destroy( - exec_ctx, &call->metadata_batch[0 /* is_receiving */][1 /* is_trailing */]); } if (bctl->op.recv_trailing_metadata) { grpc_metadata_batch *md = &call->metadata_batch[1 /* is_receiving */][1 /* is_trailing */]; - recv_trailing_filter(exec_ctx, call, md); + recv_trailing_filter(call, md); /* propagate cancellation to any interested children */ gpr_atm_rel_store(&call->received_final_op_atm, 1); @@ -1320,9 +1295,9 @@ static void post_batch_completion(grpc_exec_ctx *exec_ctx, next_child_call = child->child->sibling_next; if (child->cancellation_is_inherited) { GRPC_CALL_INTERNAL_REF(child, "propagate_cancel"); - cancel_with_error(exec_ctx, child, STATUS_FROM_API_OVERRIDE, + cancel_with_error(child, STATUS_FROM_API_OVERRIDE, GRPC_ERROR_CANCELLED); - GRPC_CALL_INTERNAL_UNREF(exec_ctx, child, "propagate_cancel"); + GRPC_CALL_INTERNAL_UNREF(child, "propagate_cancel"); } child = next_child_call; } while (child != pc->first_child); @@ -1331,11 +1306,11 @@ static void post_batch_completion(grpc_exec_ctx *exec_ctx, } if (call->is_client) { - get_final_status(exec_ctx, call, set_status_value_directly, + get_final_status(call, set_status_value_directly, call->final_op.client.status, call->final_op.client.status_details); } else { - get_final_status(exec_ctx, call, set_cancelled_value, + get_final_status(call, set_cancelled_value, call->final_op.server.cancelled, NULL); } @@ -1351,25 +1326,24 @@ static void post_batch_completion(grpc_exec_ctx *exec_ctx, if (bctl->completion_data.notify_tag.is_closure) { /* unrefs bctl->error */ bctl->call = NULL; - GRPC_CLOSURE_RUN( - exec_ctx, (grpc_closure *)bctl->completion_data.notify_tag.tag, error); - GRPC_CALL_INTERNAL_UNREF(exec_ctx, call, "completion"); + GRPC_CLOSURE_RUN((grpc_closure *)bctl->completion_data.notify_tag.tag, + error); + GRPC_CALL_INTERNAL_UNREF(call, "completion"); } else { /* unrefs bctl->error */ - grpc_cq_end_op( - exec_ctx, bctl->call->cq, bctl->completion_data.notify_tag.tag, error, - finish_batch_completion, bctl, &bctl->completion_data.cq_completion); + grpc_cq_end_op(bctl->call->cq, bctl->completion_data.notify_tag.tag, error, + finish_batch_completion, bctl, + &bctl->completion_data.cq_completion); } } -static void finish_batch_step(grpc_exec_ctx *exec_ctx, batch_control *bctl) { +static void finish_batch_step(batch_control *bctl) { if (gpr_unref(&bctl->steps_to_complete)) { - post_batch_completion(exec_ctx, bctl); + post_batch_completion(bctl); } } -static void continue_receiving_slices(grpc_exec_ctx *exec_ctx, - batch_control *bctl) { +static void continue_receiving_slices(batch_control *bctl) { grpc_error *error; grpc_call *call = bctl->call; for (;;) { @@ -1377,25 +1351,25 @@ static void continue_receiving_slices(grpc_exec_ctx *exec_ctx, (*call->receiving_buffer)->data.raw.slice_buffer.length; if (remaining == 0) { call->receiving_message = 0; - grpc_byte_stream_destroy(exec_ctx, call->receiving_stream); + grpc_byte_stream_destroy(call->receiving_stream); call->receiving_stream = NULL; - finish_batch_step(exec_ctx, bctl); + finish_batch_step(bctl); return; } - if (grpc_byte_stream_next(exec_ctx, call->receiving_stream, remaining, + if (grpc_byte_stream_next(call->receiving_stream, remaining, &call->receiving_slice_ready)) { - error = grpc_byte_stream_pull(exec_ctx, call->receiving_stream, - &call->receiving_slice); + error = + grpc_byte_stream_pull(call->receiving_stream, &call->receiving_slice); if (error == GRPC_ERROR_NONE) { grpc_slice_buffer_add(&(*call->receiving_buffer)->data.raw.slice_buffer, call->receiving_slice); } else { - grpc_byte_stream_destroy(exec_ctx, call->receiving_stream); + grpc_byte_stream_destroy(call->receiving_stream); call->receiving_stream = NULL; grpc_byte_buffer_destroy(*call->receiving_buffer); *call->receiving_buffer = NULL; call->receiving_message = 0; - finish_batch_step(exec_ctx, bctl); + finish_batch_step(bctl); return; } } else { @@ -1404,8 +1378,7 @@ static void continue_receiving_slices(grpc_exec_ctx *exec_ctx, } } -static void receiving_slice_ready(grpc_exec_ctx *exec_ctx, void *bctlp, - grpc_error *error) { +static void receiving_slice_ready(void *bctlp, grpc_error *error) { batch_control *bctl = (batch_control *)bctlp; grpc_call *call = bctl->call; grpc_byte_stream *bs = call->receiving_stream; @@ -1413,11 +1386,11 @@ static void receiving_slice_ready(grpc_exec_ctx *exec_ctx, void *bctlp, if (error == GRPC_ERROR_NONE) { grpc_slice slice; - error = grpc_byte_stream_pull(exec_ctx, bs, &slice); + error = grpc_byte_stream_pull(bs, &slice); if (error == GRPC_ERROR_NONE) { grpc_slice_buffer_add(&(*call->receiving_buffer)->data.raw.slice_buffer, slice); - continue_receiving_slices(exec_ctx, bctl); + continue_receiving_slices(bctl); } else { /* Error returned by grpc_byte_stream_pull needs to be released manually */ @@ -1429,25 +1402,24 @@ static void receiving_slice_ready(grpc_exec_ctx *exec_ctx, void *bctlp, if (GRPC_TRACER_ON(grpc_trace_operation_failures)) { GRPC_LOG_IF_ERROR("receiving_slice_ready", GRPC_ERROR_REF(error)); } - grpc_byte_stream_destroy(exec_ctx, call->receiving_stream); + grpc_byte_stream_destroy(call->receiving_stream); call->receiving_stream = NULL; grpc_byte_buffer_destroy(*call->receiving_buffer); *call->receiving_buffer = NULL; call->receiving_message = 0; - finish_batch_step(exec_ctx, bctl); + finish_batch_step(bctl); if (release_error) { GRPC_ERROR_UNREF(error); } } } -static void process_data_after_md(grpc_exec_ctx *exec_ctx, - batch_control *bctl) { +static void process_data_after_md(batch_control *bctl) { grpc_call *call = bctl->call; if (call->receiving_stream == NULL) { *call->receiving_buffer = NULL; call->receiving_message = 0; - finish_batch_step(exec_ctx, bctl); + finish_batch_step(bctl); } else { call->test_only_last_message_flags = call->receiving_stream->flags; if ((call->receiving_stream->flags & GRPC_WRITE_INTERNAL_COMPRESS) && @@ -1459,46 +1431,42 @@ static void process_data_after_md(grpc_exec_ctx *exec_ctx, } GRPC_CLOSURE_INIT(&call->receiving_slice_ready, receiving_slice_ready, bctl, grpc_schedule_on_exec_ctx); - continue_receiving_slices(exec_ctx, bctl); + continue_receiving_slices(bctl); } } -static void receiving_stream_ready(grpc_exec_ctx *exec_ctx, void *bctlp, - grpc_error *error) { +static void receiving_stream_ready(void *bctlp, grpc_error *error) { batch_control *bctl = (batch_control *)bctlp; grpc_call *call = bctl->call; if (error != GRPC_ERROR_NONE) { if (call->receiving_stream != NULL) { - grpc_byte_stream_destroy(exec_ctx, call->receiving_stream); + grpc_byte_stream_destroy(call->receiving_stream); call->receiving_stream = NULL; } - add_batch_error(exec_ctx, bctl, GRPC_ERROR_REF(error), true); - cancel_with_error(exec_ctx, call, STATUS_FROM_SURFACE, - GRPC_ERROR_REF(error)); + add_batch_error(bctl, GRPC_ERROR_REF(error), true); + cancel_with_error(call, STATUS_FROM_SURFACE, GRPC_ERROR_REF(error)); } /* If recv_state is RECV_NONE, we will save the batch_control * object with rel_cas, and will not use it after the cas. Its corresponding * acq_load is in receiving_initial_metadata_ready() */ if (error != GRPC_ERROR_NONE || call->receiving_stream == NULL || !gpr_atm_rel_cas(&call->recv_state, RECV_NONE, (gpr_atm)bctlp)) { - process_data_after_md(exec_ctx, bctl); + process_data_after_md(bctl); } } // The recv_message_ready callback used when sending a batch containing // a recv_message op down the filter stack. Yields the call combiner // before processing the received message. -static void receiving_stream_ready_in_call_combiner(grpc_exec_ctx *exec_ctx, - void *bctlp, +static void receiving_stream_ready_in_call_combiner(void *bctlp, grpc_error *error) { batch_control *bctl = (batch_control *)bctlp; grpc_call *call = bctl->call; - GRPC_CALL_COMBINER_STOP(exec_ctx, &call->call_combiner, "recv_message_ready"); - receiving_stream_ready(exec_ctx, bctlp, error); + GRPC_CALL_COMBINER_STOP(&call->call_combiner, "recv_message_ready"); + receiving_stream_ready(bctlp, error); } -static void validate_filtered_metadata(grpc_exec_ctx *exec_ctx, - batch_control *bctl) { +static void validate_filtered_metadata(batch_control *bctl) { grpc_call *call = bctl->call; /* validate compression algorithms */ if (call->incoming_stream_compression_algorithm != @@ -1512,8 +1480,8 @@ static void validate_filtered_metadata(grpc_exec_ctx *exec_ctx, gpr_asprintf(&error_msg, "Invalid stream compression algorithm value '%d'.", algo); gpr_log(GPR_ERROR, "%s", error_msg); - cancel_with_status(exec_ctx, call, STATUS_FROM_SURFACE, - GRPC_STATUS_UNIMPLEMENTED, error_msg); + cancel_with_status(call, STATUS_FROM_SURFACE, GRPC_STATUS_UNIMPLEMENTED, + error_msg); } else if (grpc_compression_options_is_stream_compression_algorithm_enabled( &compression_options, algo) == 0) { /* check if algorithm is supported by current channel config */ @@ -1522,8 +1490,8 @@ static void validate_filtered_metadata(grpc_exec_ctx *exec_ctx, gpr_asprintf(&error_msg, "Stream compression algorithm '%s' is disabled.", algo_name); gpr_log(GPR_ERROR, "%s", error_msg); - cancel_with_status(exec_ctx, call, STATUS_FROM_SURFACE, - GRPC_STATUS_UNIMPLEMENTED, error_msg); + cancel_with_status(call, STATUS_FROM_SURFACE, GRPC_STATUS_UNIMPLEMENTED, + error_msg); } gpr_free(error_msg); @@ -1553,8 +1521,8 @@ static void validate_filtered_metadata(grpc_exec_ctx *exec_ctx, gpr_asprintf(&error_msg, "Invalid compression algorithm value '%d'.", algo); gpr_log(GPR_ERROR, "%s", error_msg); - cancel_with_status(exec_ctx, call, STATUS_FROM_SURFACE, - GRPC_STATUS_UNIMPLEMENTED, error_msg); + cancel_with_status(call, STATUS_FROM_SURFACE, GRPC_STATUS_UNIMPLEMENTED, + error_msg); } else if (grpc_compression_options_is_algorithm_enabled( &compression_options, algo) == 0) { /* check if algorithm is supported by current channel config */ @@ -1563,8 +1531,8 @@ static void validate_filtered_metadata(grpc_exec_ctx *exec_ctx, gpr_asprintf(&error_msg, "Compression algorithm '%s' is disabled.", algo_name); gpr_log(GPR_ERROR, "%s", error_msg); - cancel_with_status(exec_ctx, call, STATUS_FROM_SURFACE, - GRPC_STATUS_UNIMPLEMENTED, error_msg); + cancel_with_status(call, STATUS_FROM_SURFACE, GRPC_STATUS_UNIMPLEMENTED, + error_msg); } else { call->incoming_compression_algorithm = algo; } @@ -1587,34 +1555,31 @@ static void validate_filtered_metadata(grpc_exec_ctx *exec_ctx, } } -static void add_batch_error(grpc_exec_ctx *exec_ctx, batch_control *bctl, - grpc_error *error, bool has_cancelled) { +static void add_batch_error(batch_control *bctl, grpc_error *error, + bool has_cancelled) { if (error == GRPC_ERROR_NONE) return; int idx = (int)gpr_atm_full_fetch_add(&bctl->num_errors, 1); if (idx == 0 && !has_cancelled) { - cancel_with_error(exec_ctx, bctl->call, STATUS_FROM_CORE, - GRPC_ERROR_REF(error)); + cancel_with_error(bctl->call, STATUS_FROM_CORE, GRPC_ERROR_REF(error)); } bctl->errors[idx] = error; } -static void receiving_initial_metadata_ready(grpc_exec_ctx *exec_ctx, - void *bctlp, grpc_error *error) { +static void receiving_initial_metadata_ready(void *bctlp, grpc_error *error) { batch_control *bctl = (batch_control *)bctlp; grpc_call *call = bctl->call; - GRPC_CALL_COMBINER_STOP(exec_ctx, &call->call_combiner, - "recv_initial_metadata_ready"); + GRPC_CALL_COMBINER_STOP(&call->call_combiner, "recv_initial_metadata_ready"); - add_batch_error(exec_ctx, bctl, GRPC_ERROR_REF(error), false); + add_batch_error(bctl, GRPC_ERROR_REF(error), false); if (error == GRPC_ERROR_NONE) { grpc_metadata_batch *md = &call->metadata_batch[1 /* is_receiving */][0 /* is_trailing */]; - recv_initial_filter(exec_ctx, call, md); + recv_initial_filter(call, md); /* TODO(ctiller): this could be moved into recv_initial_filter now */ GPR_TIMER_BEGIN("validate_filtered_metadata", 0); - validate_filtered_metadata(exec_ctx, bctl); + validate_filtered_metadata(bctl); GPR_TIMER_END("validate_filtered_metadata", 0); if (md->deadline != GRPC_MILLIS_INF_FUTURE && !call->is_client) { @@ -1647,28 +1612,25 @@ static void receiving_initial_metadata_ready(grpc_exec_ctx *exec_ctx, } } if (saved_rsr_closure != NULL) { - GRPC_CLOSURE_RUN(exec_ctx, saved_rsr_closure, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(saved_rsr_closure, GRPC_ERROR_REF(error)); } - finish_batch_step(exec_ctx, bctl); + finish_batch_step(bctl); } -static void finish_batch(grpc_exec_ctx *exec_ctx, void *bctlp, - grpc_error *error) { +static void finish_batch(void *bctlp, grpc_error *error) { batch_control *bctl = (batch_control *)bctlp; grpc_call *call = bctl->call; - GRPC_CALL_COMBINER_STOP(exec_ctx, &call->call_combiner, "on_complete"); - add_batch_error(exec_ctx, bctl, GRPC_ERROR_REF(error), false); - finish_batch_step(exec_ctx, bctl); + GRPC_CALL_COMBINER_STOP(&call->call_combiner, "on_complete"); + add_batch_error(bctl, GRPC_ERROR_REF(error), false); + finish_batch_step(bctl); } -static void free_no_op_completion(grpc_exec_ctx *exec_ctx, void *p, - grpc_cq_completion *completion) { +static void free_no_op_completion(void *p, grpc_cq_completion *completion) { gpr_free(completion); } -static grpc_call_error call_start_batch(grpc_exec_ctx *exec_ctx, - grpc_call *call, const grpc_op *ops, +static grpc_call_error call_start_batch(grpc_call *call, const grpc_op *ops, size_t nops, void *notify_tag, int is_notify_tag_closure) { size_t i; @@ -1686,11 +1648,10 @@ static grpc_call_error call_start_batch(grpc_exec_ctx *exec_ctx, if (!is_notify_tag_closure) { GPR_ASSERT(grpc_cq_begin_op(call->cq, notify_tag)); grpc_cq_end_op( - exec_ctx, call->cq, notify_tag, GRPC_ERROR_NONE, - free_no_op_completion, NULL, + call->cq, notify_tag, GRPC_ERROR_NONE, free_no_op_completion, NULL, (grpc_cq_completion *)gpr_malloc(sizeof(grpc_cq_completion))); } else { - GRPC_CLOSURE_SCHED(exec_ctx, (grpc_closure *)notify_tag, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED((grpc_closure *)notify_tag, GRPC_ERROR_NONE); } error = GRPC_CALL_OK; goto done; @@ -1790,7 +1751,7 @@ static grpc_call_error call_start_batch(grpc_exec_ctx *exec_ctx, stream_op->send_initial_metadata = true; call->sent_initial_metadata = true; if (!prepare_application_metadata( - exec_ctx, call, (int)op->data.send_initial_metadata.count, + call, (int)op->data.send_initial_metadata.count, op->data.send_initial_metadata.metadata, 0, call->is_client, &call->compression_md, (int)additional_metadata_count)) { error = GRPC_CALL_ERROR_INVALID_METADATA; @@ -1884,7 +1845,7 @@ static grpc_call_error call_start_batch(grpc_exec_ctx *exec_ctx, GPR_ASSERT(call->send_extra_metadata_count == 0); call->send_extra_metadata_count = 1; call->send_extra_metadata[0].md = grpc_channel_get_reffed_status_elem( - exec_ctx, call->channel, op->data.send_status_from_server.status); + call->channel, op->data.send_status_from_server.status); { grpc_error *override_error = GRPC_ERROR_NONE; if (op->data.send_status_from_server.status != GRPC_STATUS_OK) { @@ -1893,7 +1854,7 @@ static grpc_call_error call_start_batch(grpc_exec_ctx *exec_ctx, } if (op->data.send_status_from_server.status_details != NULL) { call->send_extra_metadata[1].md = grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_GRPC_MESSAGE, + GRPC_MDSTR_GRPC_MESSAGE, grpc_slice_ref_internal( *op->data.send_status_from_server.status_details)); call->send_extra_metadata_count++; @@ -1904,16 +1865,15 @@ static grpc_call_error call_start_batch(grpc_exec_ctx *exec_ctx, grpc_slice_from_copied_string(msg)); gpr_free(msg); } - set_status_from_error(exec_ctx, call, STATUS_FROM_API_OVERRIDE, - override_error); + set_status_from_error(call, STATUS_FROM_API_OVERRIDE, override_error); } if (!prepare_application_metadata( - exec_ctx, call, + call, (int)op->data.send_status_from_server.trailing_metadata_count, op->data.send_status_from_server.trailing_metadata, 1, 1, NULL, 0)) { for (int n = 0; n < call->send_extra_metadata_count; n++) { - GRPC_MDELEM_UNREF(exec_ctx, call->send_extra_metadata[n].md); + GRPC_MDELEM_UNREF(call->send_extra_metadata[n].md); } call->send_extra_metadata_count = 0; error = GRPC_CALL_ERROR_INVALID_METADATA; @@ -2040,7 +2000,7 @@ static grpc_call_error call_start_batch(grpc_exec_ctx *exec_ctx, stream_op->on_complete = &bctl->finish_batch; gpr_atm_rel_store(&call->any_ops_sent_atm, 1); - execute_batch(exec_ctx, call, stream_op, &bctl->start_batch); + execute_batch(call, stream_op, &bctl->start_batch); done: GPR_TIMER_END("grpc_call_start_batch", 0); @@ -2050,15 +2010,15 @@ done_with_error: /* reverse any mutations that occured */ if (stream_op->send_initial_metadata) { call->sent_initial_metadata = false; - grpc_metadata_batch_clear(exec_ctx, &call->metadata_batch[0][0]); + grpc_metadata_batch_clear(&call->metadata_batch[0][0]); } if (stream_op->send_message) { call->sending_message = false; - grpc_byte_stream_destroy(exec_ctx, &call->sending_stream.base); + grpc_byte_stream_destroy(&call->sending_stream.base); } if (stream_op->send_trailing_metadata) { call->sent_final_op = false; - grpc_metadata_batch_clear(exec_ctx, &call->metadata_batch[0][1]); + grpc_metadata_batch_clear(&call->metadata_batch[0][1]); } if (stream_op->recv_initial_metadata) { call->received_initial_metadata = false; @@ -2074,7 +2034,7 @@ done_with_error: grpc_call_error grpc_call_start_batch(grpc_call *call, const grpc_op *ops, size_t nops, void *tag, void *reserved) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_call_error err; GRPC_API_TRACE( @@ -2085,19 +2045,18 @@ grpc_call_error grpc_call_start_batch(grpc_call *call, const grpc_op *ops, if (reserved != NULL) { err = GRPC_CALL_ERROR; } else { - err = call_start_batch(&exec_ctx, call, ops, nops, tag, 0); + err = call_start_batch(call, ops, nops, tag, 0); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return err; } -grpc_call_error grpc_call_start_batch_and_execute(grpc_exec_ctx *exec_ctx, - grpc_call *call, +grpc_call_error grpc_call_start_batch_and_execute(grpc_call *call, const grpc_op *ops, size_t nops, grpc_closure *closure) { - return call_start_batch(exec_ctx, call, ops, nops, closure, 1); + return call_start_batch(call, ops, nops, closure, 1); } void grpc_call_context_set(grpc_call *call, grpc_context_index elem, diff --git a/src/core/lib/surface/call.h b/src/core/lib/surface/call.h index 27c2f5243ca..eba96e04b97 100644 --- a/src/core/lib/surface/call.h +++ b/src/core/lib/surface/call.h @@ -30,8 +30,7 @@ extern "C" { #include #include -typedef void (*grpc_ioreq_completion_func)(grpc_exec_ctx *exec_ctx, - grpc_call *call, int success, +typedef void (*grpc_ioreq_completion_func)(grpc_call *call, int success, void *user_data); typedef struct grpc_call_create_args { @@ -55,33 +54,28 @@ typedef struct grpc_call_create_args { /* Create a new call based on \a args. Regardless of success or failure, always returns a valid new call into *call */ -grpc_error *grpc_call_create(grpc_exec_ctx *exec_ctx, - const grpc_call_create_args *args, +grpc_error *grpc_call_create(const grpc_call_create_args *args, grpc_call **call); -void grpc_call_set_completion_queue(grpc_exec_ctx *exec_ctx, grpc_call *call, - grpc_completion_queue *cq); +void grpc_call_set_completion_queue(grpc_call *call, grpc_completion_queue *cq); #ifndef NDEBUG void grpc_call_internal_ref(grpc_call *call, const char *reason); -void grpc_call_internal_unref(grpc_exec_ctx *exec_ctx, grpc_call *call, - const char *reason); +void grpc_call_internal_unref(grpc_call *call, const char *reason); #define GRPC_CALL_INTERNAL_REF(call, reason) \ grpc_call_internal_ref(call, reason) -#define GRPC_CALL_INTERNAL_UNREF(exec_ctx, call, reason) \ - grpc_call_internal_unref(exec_ctx, call, reason) +#define GRPC_CALL_INTERNAL_UNREF(call, reason) \ + grpc_call_internal_unref(call, reason) #else void grpc_call_internal_ref(grpc_call *call); -void grpc_call_internal_unref(grpc_exec_ctx *exec_ctx, grpc_call *call); +void grpc_call_internal_unref(grpc_call *call); #define GRPC_CALL_INTERNAL_REF(call, reason) grpc_call_internal_ref(call) -#define GRPC_CALL_INTERNAL_UNREF(exec_ctx, call, reason) \ - grpc_call_internal_unref(exec_ctx, call) +#define GRPC_CALL_INTERNAL_UNREF(call, reason) grpc_call_internal_unref(call) #endif grpc_call_stack *grpc_call_get_call_stack(grpc_call *call); -grpc_call_error grpc_call_start_batch_and_execute(grpc_exec_ctx *exec_ctx, - grpc_call *call, +grpc_call_error grpc_call_start_batch_and_execute(grpc_call *call, const grpc_op *ops, size_t nops, grpc_closure *closure); diff --git a/src/core/lib/surface/call_details.cc b/src/core/lib/surface/call_details.cc index ea9208c7e32..01b19abefbd 100644 --- a/src/core/lib/surface/call_details.cc +++ b/src/core/lib/surface/call_details.cc @@ -34,8 +34,8 @@ void grpc_call_details_init(grpc_call_details* cd) { void grpc_call_details_destroy(grpc_call_details* cd) { GRPC_API_TRACE("grpc_call_details_destroy(cd=%p)", 1, (cd)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_unref_internal(&exec_ctx, cd->method); - grpc_slice_unref_internal(&exec_ctx, cd->host); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_slice_unref_internal(cd->method); + grpc_slice_unref_internal(cd->host); + grpc_exec_ctx_finish(); } diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc index 860dcc82db0..0511f561acc 100644 --- a/src/core/lib/surface/channel.cc +++ b/src/core/lib/surface/channel.cc @@ -69,23 +69,22 @@ struct grpc_channel { #define CHANNEL_FROM_TOP_ELEM(top_elem) \ CHANNEL_FROM_CHANNEL_STACK(grpc_channel_stack_from_top_element(top_elem)) -static void destroy_channel(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error); +static void destroy_channel(void *arg, grpc_error *error); grpc_channel *grpc_channel_create_with_builder( - grpc_exec_ctx *exec_ctx, grpc_channel_stack_builder *builder, + grpc_channel_stack_builder *builder, grpc_channel_stack_type channel_stack_type) { char *target = gpr_strdup(grpc_channel_stack_builder_get_target(builder)); grpc_channel_args *args = grpc_channel_args_copy( grpc_channel_stack_builder_get_channel_arguments(builder)); grpc_channel *channel; if (channel_stack_type == GRPC_SERVER_CHANNEL) { - GRPC_STATS_INC_SERVER_CHANNELS_CREATED(exec_ctx); + GRPC_STATS_INC_SERVER_CHANNELS_CREATED(); } else { - GRPC_STATS_INC_CLIENT_CHANNELS_CREATED(exec_ctx); + GRPC_STATS_INC_CLIENT_CHANNELS_CREATED(); } grpc_error *error = grpc_channel_stack_builder_finish( - exec_ctx, builder, sizeof(grpc_channel), 1, destroy_channel, NULL, + builder, sizeof(grpc_channel), 1, destroy_channel, NULL, (void **)&channel); if (error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "channel stack builder failed: %s", @@ -114,10 +113,10 @@ grpc_channel *grpc_channel_create_with_builder( } else { if (!GRPC_MDISNULL(channel->default_authority)) { /* setting this takes precedence over anything else */ - GRPC_MDELEM_UNREF(exec_ctx, channel->default_authority); + GRPC_MDELEM_UNREF(channel->default_authority); } channel->default_authority = grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_AUTHORITY, + GRPC_MDSTR_AUTHORITY, grpc_slice_intern( grpc_slice_from_static_string(args->args[i].value.string))); } @@ -134,7 +133,7 @@ grpc_channel *grpc_channel_create_with_builder( GRPC_SSL_TARGET_NAME_OVERRIDE_ARG); } else { channel->default_authority = grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_AUTHORITY, + GRPC_MDSTR_AUTHORITY, grpc_slice_intern( grpc_slice_from_static_string(args->args[i].value.string))); } @@ -191,25 +190,23 @@ grpc_channel *grpc_channel_create_with_builder( } done: - grpc_channel_args_destroy(exec_ctx, args); + grpc_channel_args_destroy(args); return channel; } -grpc_channel *grpc_channel_create(grpc_exec_ctx *exec_ctx, const char *target, +grpc_channel *grpc_channel_create(const char *target, const grpc_channel_args *input_args, grpc_channel_stack_type channel_stack_type, grpc_transport *optional_transport) { grpc_channel_stack_builder *builder = grpc_channel_stack_builder_create(); - grpc_channel_stack_builder_set_channel_arguments(exec_ctx, builder, - input_args); + grpc_channel_stack_builder_set_channel_arguments(builder, input_args); grpc_channel_stack_builder_set_target(builder, target); grpc_channel_stack_builder_set_transport(builder, optional_transport); - if (!grpc_channel_init_create_stack(exec_ctx, builder, channel_stack_type)) { - grpc_channel_stack_builder_destroy(exec_ctx, builder); + if (!grpc_channel_init_create_stack(builder, channel_stack_type)) { + grpc_channel_stack_builder_destroy(builder); return NULL; } - return grpc_channel_create_with_builder(exec_ctx, builder, - channel_stack_type); + return grpc_channel_create_with_builder(builder, channel_stack_type); } size_t grpc_channel_get_call_size_estimate(grpc_channel *channel) { @@ -251,18 +248,18 @@ char *grpc_channel_get_target(grpc_channel *channel) { void grpc_channel_get_info(grpc_channel *channel, const grpc_channel_info *channel_info) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_channel_element *elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CHANNEL(channel), 0); - elem->filter->get_channel_info(&exec_ctx, elem, channel_info); - grpc_exec_ctx_finish(&exec_ctx); + elem->filter->get_channel_info(elem, channel_info); + grpc_exec_ctx_finish(); } static grpc_call *grpc_channel_create_call_internal( - grpc_exec_ctx *exec_ctx, grpc_channel *channel, grpc_call *parent_call, - uint32_t propagation_mask, grpc_completion_queue *cq, - grpc_pollset_set *pollset_set_alternative, grpc_mdelem path_mdelem, - grpc_mdelem authority_mdelem, grpc_millis deadline) { + grpc_channel *channel, grpc_call *parent_call, uint32_t propagation_mask, + grpc_completion_queue *cq, grpc_pollset_set *pollset_set_alternative, + grpc_mdelem path_mdelem, grpc_mdelem authority_mdelem, + grpc_millis deadline) { grpc_mdelem send_metadata[2]; size_t num_metadata = 0; @@ -289,7 +286,7 @@ static grpc_call *grpc_channel_create_call_internal( args.send_deadline = deadline; grpc_call *call; - GRPC_LOG_IF_ERROR("call_create", grpc_call_create(exec_ctx, &args, &call)); + GRPC_LOG_IF_ERROR("call_create", grpc_call_create(&args, &call)); return call; } @@ -300,29 +297,27 @@ grpc_call *grpc_channel_create_call(grpc_channel *channel, grpc_slice method, const grpc_slice *host, gpr_timespec deadline, void *reserved) { GPR_ASSERT(!reserved); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_call *call = grpc_channel_create_call_internal( - &exec_ctx, channel, parent_call, propagation_mask, cq, NULL, - grpc_mdelem_from_slices(&exec_ctx, GRPC_MDSTR_PATH, - grpc_slice_ref_internal(method)), - host != NULL ? grpc_mdelem_from_slices(&exec_ctx, GRPC_MDSTR_AUTHORITY, + channel, parent_call, propagation_mask, cq, NULL, + grpc_mdelem_from_slices(GRPC_MDSTR_PATH, grpc_slice_ref_internal(method)), + host != NULL ? grpc_mdelem_from_slices(GRPC_MDSTR_AUTHORITY, grpc_slice_ref_internal(*host)) : GRPC_MDNULL, grpc_timespec_to_millis_round_up(deadline)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return call; } grpc_call *grpc_channel_create_pollset_set_call( - grpc_exec_ctx *exec_ctx, grpc_channel *channel, grpc_call *parent_call, - uint32_t propagation_mask, grpc_pollset_set *pollset_set, grpc_slice method, - const grpc_slice *host, grpc_millis deadline, void *reserved) { + grpc_channel *channel, grpc_call *parent_call, uint32_t propagation_mask, + grpc_pollset_set *pollset_set, grpc_slice method, const grpc_slice *host, + grpc_millis deadline, void *reserved) { GPR_ASSERT(!reserved); return grpc_channel_create_call_internal( - exec_ctx, channel, parent_call, propagation_mask, NULL, pollset_set, - grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_PATH, - grpc_slice_ref_internal(method)), - host != NULL ? grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_AUTHORITY, + channel, parent_call, propagation_mask, NULL, pollset_set, + grpc_mdelem_from_slices(GRPC_MDSTR_PATH, grpc_slice_ref_internal(method)), + host != NULL ? grpc_mdelem_from_slices(GRPC_MDSTR_AUTHORITY, grpc_slice_ref_internal(*host)) : GRPC_MDNULL, deadline); @@ -335,21 +330,21 @@ void *grpc_channel_register_call(grpc_channel *channel, const char *method, "grpc_channel_register_call(channel=%p, method=%s, host=%s, reserved=%p)", 4, (channel, method, host, reserved)); GPR_ASSERT(!reserved); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; rc->path = grpc_mdelem_from_slices( - &exec_ctx, GRPC_MDSTR_PATH, + GRPC_MDSTR_PATH, grpc_slice_intern(grpc_slice_from_static_string(method))); rc->authority = host ? grpc_mdelem_from_slices( - &exec_ctx, GRPC_MDSTR_AUTHORITY, + GRPC_MDSTR_AUTHORITY, grpc_slice_intern(grpc_slice_from_static_string(host))) : GRPC_MDNULL; gpr_mu_lock(&channel->registered_call_mu); rc->next = channel->registered_calls; channel->registered_calls = rc; gpr_mu_unlock(&channel->registered_call_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return rc; } @@ -369,12 +364,12 @@ grpc_call *grpc_channel_create_registered_call( registered_call_handle, deadline.tv_sec, deadline.tv_nsec, (int)deadline.clock_type, reserved)); GPR_ASSERT(!reserved); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_call *call = grpc_channel_create_call_internal( - &exec_ctx, channel, parent_call, propagation_mask, completion_queue, NULL, + channel, parent_call, propagation_mask, completion_queue, NULL, GRPC_MDELEM_REF(rc->path), GRPC_MDELEM_REF(rc->authority), grpc_timespec_to_millis_round_up(deadline)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return call; } @@ -389,23 +384,21 @@ void grpc_channel_internal_ref(grpc_channel *c REF_ARG) { GRPC_CHANNEL_STACK_REF(CHANNEL_STACK_FROM_CHANNEL(c), REF_REASON); } -void grpc_channel_internal_unref(grpc_exec_ctx *exec_ctx, - grpc_channel *c REF_ARG) { - GRPC_CHANNEL_STACK_UNREF(exec_ctx, CHANNEL_STACK_FROM_CHANNEL(c), REF_REASON); +void grpc_channel_internal_unref(grpc_channel *c REF_ARG) { + GRPC_CHANNEL_STACK_UNREF(CHANNEL_STACK_FROM_CHANNEL(c), REF_REASON); } -static void destroy_channel(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void destroy_channel(void *arg, grpc_error *error) { grpc_channel *channel = (grpc_channel *)arg; - grpc_channel_stack_destroy(exec_ctx, CHANNEL_STACK_FROM_CHANNEL(channel)); + grpc_channel_stack_destroy(CHANNEL_STACK_FROM_CHANNEL(channel)); while (channel->registered_calls) { registered_call *rc = channel->registered_calls; channel->registered_calls = rc->next; - GRPC_MDELEM_UNREF(exec_ctx, rc->path); - GRPC_MDELEM_UNREF(exec_ctx, rc->authority); + GRPC_MDELEM_UNREF(rc->path); + GRPC_MDELEM_UNREF(rc->authority); gpr_free(rc); } - GRPC_MDELEM_UNREF(exec_ctx, channel->default_authority); + GRPC_MDELEM_UNREF(channel->default_authority); gpr_mu_destroy(&channel->registered_call_mu); gpr_free(channel->target); gpr_free(channel); @@ -414,16 +407,16 @@ static void destroy_channel(grpc_exec_ctx *exec_ctx, void *arg, void grpc_channel_destroy(grpc_channel *channel) { grpc_transport_op *op = grpc_make_transport_op(NULL); grpc_channel_element *elem; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GRPC_API_TRACE("grpc_channel_destroy(channel=%p)", 1, (channel)); op->disconnect_with_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Channel Destroyed"); elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CHANNEL(channel), 0); - elem->filter->start_transport_op(&exec_ctx, elem, op); + elem->filter->start_transport_op(elem, op); - GRPC_CHANNEL_INTERNAL_UNREF(&exec_ctx, channel, "channel"); + GRPC_CHANNEL_INTERNAL_UNREF(channel, "channel"); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } grpc_channel_stack *grpc_channel_get_channel_stack(grpc_channel *channel) { @@ -435,8 +428,7 @@ grpc_compression_options grpc_channel_compression_options( return channel->compression_options; } -grpc_mdelem grpc_channel_get_reffed_status_elem(grpc_exec_ctx *exec_ctx, - grpc_channel *channel, int i) { +grpc_mdelem grpc_channel_get_reffed_status_elem(grpc_channel *channel, int i) { char tmp[GPR_LTOA_MIN_BUFSIZE]; switch (i) { case 0: @@ -447,6 +439,6 @@ grpc_mdelem grpc_channel_get_reffed_status_elem(grpc_exec_ctx *exec_ctx, return GRPC_MDELEM_GRPC_STATUS_2; } gpr_ltoa(i, tmp); - return grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_GRPC_STATUS, + return grpc_mdelem_from_slices(GRPC_MDSTR_GRPC_STATUS, grpc_slice_from_copied_string(tmp)); } diff --git a/src/core/lib/surface/channel.h b/src/core/lib/surface/channel.h index 4d1c7e369fd..dd8b8983ba8 100644 --- a/src/core/lib/surface/channel.h +++ b/src/core/lib/surface/channel.h @@ -27,13 +27,13 @@ extern "C" { #endif -grpc_channel *grpc_channel_create(grpc_exec_ctx *exec_ctx, const char *target, +grpc_channel *grpc_channel_create(const char *target, const grpc_channel_args *args, grpc_channel_stack_type channel_stack_type, grpc_transport *optional_transport); grpc_channel *grpc_channel_create_with_builder( - grpc_exec_ctx *exec_ctx, grpc_channel_stack_builder *builder, + grpc_channel_stack_builder *builder, grpc_channel_stack_type channel_stack_type); /** Create a call given a grpc_channel, in order to call \a method. @@ -45,9 +45,9 @@ grpc_channel *grpc_channel_create_with_builder( properties from the server call to this new client call, depending on the value of \a propagation_mask (see propagation_bits.h for possible values) */ grpc_call *grpc_channel_create_pollset_set_call( - grpc_exec_ctx *exec_ctx, grpc_channel *channel, grpc_call *parent_call, - uint32_t propagation_mask, grpc_pollset_set *pollset_set, grpc_slice method, - const grpc_slice *host, grpc_millis deadline, void *reserved); + grpc_channel *channel, grpc_call *parent_call, uint32_t propagation_mask, + grpc_pollset_set *pollset_set, grpc_slice method, const grpc_slice *host, + grpc_millis deadline, void *reserved); /** Get a (borrowed) pointer to this channels underlying channel stack */ grpc_channel_stack *grpc_channel_get_channel_stack(grpc_channel *channel); @@ -56,8 +56,7 @@ grpc_channel_stack *grpc_channel_get_channel_stack(grpc_channel *channel); status_code. The returned elem is owned by the caller. */ -grpc_mdelem grpc_channel_get_reffed_status_elem(grpc_exec_ctx *exec_ctx, - grpc_channel *channel, +grpc_mdelem grpc_channel_get_reffed_status_elem(grpc_channel *channel, int status_code); size_t grpc_channel_get_call_size_estimate(grpc_channel *channel); @@ -65,20 +64,18 @@ void grpc_channel_update_call_size_estimate(grpc_channel *channel, size_t size); #ifndef NDEBUG void grpc_channel_internal_ref(grpc_channel *channel, const char *reason); -void grpc_channel_internal_unref(grpc_exec_ctx *exec_ctx, grpc_channel *channel, - const char *reason); +void grpc_channel_internal_unref(grpc_channel *channel, const char *reason); #define GRPC_CHANNEL_INTERNAL_REF(channel, reason) \ grpc_channel_internal_ref(channel, reason) -#define GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, channel, reason) \ - grpc_channel_internal_unref(exec_ctx, channel, reason) +#define GRPC_CHANNEL_INTERNAL_UNREF(channel, reason) \ + grpc_channel_internal_unref(channel, reason) #else void grpc_channel_internal_ref(grpc_channel *channel); -void grpc_channel_internal_unref(grpc_exec_ctx *exec_ctx, - grpc_channel *channel); +void grpc_channel_internal_unref(grpc_channel *channel); #define GRPC_CHANNEL_INTERNAL_REF(channel, reason) \ grpc_channel_internal_ref(channel) -#define GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, channel, reason) \ - grpc_channel_internal_unref(exec_ctx, channel) +#define GRPC_CHANNEL_INTERNAL_UNREF(channel, reason) \ + grpc_channel_internal_unref(channel) #endif /** Return the channel's compression options. */ diff --git a/src/core/lib/surface/channel_init.cc b/src/core/lib/surface/channel_init.cc index 33f444b89e9..a2ea3160c0e 100644 --- a/src/core/lib/surface/channel_init.cc +++ b/src/core/lib/surface/channel_init.cc @@ -89,8 +89,7 @@ void grpc_channel_init_shutdown(void) { } } -bool grpc_channel_init_create_stack(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder, +bool grpc_channel_init_create_stack(grpc_channel_stack_builder *builder, grpc_channel_stack_type type) { GPR_ASSERT(g_finalized); @@ -99,7 +98,7 @@ bool grpc_channel_init_create_stack(grpc_exec_ctx *exec_ctx, for (size_t i = 0; i < g_slots[type].num_slots; i++) { const stage_slot *slot = &g_slots[type].slots[i]; - if (!slot->fn(exec_ctx, builder, slot->arg)) { + if (!slot->fn(builder, slot->arg)) { return false; } } diff --git a/src/core/lib/surface/channel_init.h b/src/core/lib/surface/channel_init.h index 5f109332ad6..1c5e0a29764 100644 --- a/src/core/lib/surface/channel_init.h +++ b/src/core/lib/surface/channel_init.h @@ -36,8 +36,7 @@ extern "C" { /// One stage of mutation: call functions against \a builder to influence the /// finally constructed channel stack -typedef bool (*grpc_channel_init_stage)(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder, +typedef bool (*grpc_channel_init_stage)(grpc_channel_stack_builder *builder, void *arg); /// Global initialization of the system @@ -70,8 +69,7 @@ void grpc_channel_init_shutdown(void); /// \a optional_transport is either NULL or a constructed transport object /// Returns a pointer to the base of the memory allocated (the actual channel /// stack object will be prefix_bytes past that pointer) -bool grpc_channel_init_create_stack(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder, +bool grpc_channel_init_create_stack(grpc_channel_stack_builder *builder, grpc_channel_stack_type type); #ifdef __cplusplus diff --git a/src/core/lib/surface/channel_ping.cc b/src/core/lib/surface/channel_ping.cc index f45b5689588..5d41b8e9e43 100644 --- a/src/core/lib/surface/channel_ping.cc +++ b/src/core/lib/surface/channel_ping.cc @@ -33,15 +33,14 @@ typedef struct { grpc_cq_completion completion_storage; } ping_result; -static void ping_destroy(grpc_exec_ctx *exec_ctx, void *arg, - grpc_cq_completion *storage) { +static void ping_destroy(void *arg, grpc_cq_completion *storage) { gpr_free(arg); } -static void ping_done(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void ping_done(void *arg, grpc_error *error) { ping_result *pr = (ping_result *)arg; - grpc_cq_end_op(exec_ctx, pr->cq, pr->tag, GRPC_ERROR_REF(error), ping_destroy, - pr, &pr->completion_storage); + grpc_cq_end_op(pr->cq, pr->tag, GRPC_ERROR_REF(error), ping_destroy, pr, + &pr->completion_storage); } void grpc_channel_ping(grpc_channel *channel, grpc_completion_queue *cq, @@ -52,7 +51,7 @@ void grpc_channel_ping(grpc_channel *channel, grpc_completion_queue *cq, ping_result *pr = (ping_result *)gpr_malloc(sizeof(*pr)); grpc_channel_element *top_elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GPR_ASSERT(reserved == NULL); pr->tag = tag; pr->cq = cq; @@ -60,6 +59,6 @@ void grpc_channel_ping(grpc_channel *channel, grpc_completion_queue *cq, op->send_ping = &pr->closure; op->bind_pollset = grpc_cq_pollset(cq); GPR_ASSERT(grpc_cq_begin_op(cq, tag)); - top_elem->filter->start_transport_op(&exec_ctx, top_elem, op); - grpc_exec_ctx_finish(&exec_ctx); + top_elem->filter->start_transport_op(top_elem, op); + grpc_exec_ctx_finish(); } diff --git a/src/core/lib/surface/completion_queue.cc b/src/core/lib/surface/completion_queue.cc index 21664f03c8b..8abcb70d255 100644 --- a/src/core/lib/surface/completion_queue.cc +++ b/src/core/lib/surface/completion_queue.cc @@ -58,13 +58,12 @@ typedef struct { bool can_listen; size_t (*size)(void); void (*init)(grpc_pollset *pollset, gpr_mu **mu); - grpc_error *(*kick)(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, + grpc_error *(*kick)(grpc_pollset *pollset, grpc_pollset_worker *specific_worker); - grpc_error *(*work)(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_pollset_worker **worker, grpc_millis deadline); - void (*shutdown)(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_closure *closure); - void (*destroy)(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset); + grpc_error *(*work)(grpc_pollset *pollset, grpc_pollset_worker **worker, + grpc_millis deadline); + void (*shutdown)(grpc_pollset *pollset, grpc_closure *closure); + void (*destroy)(grpc_pollset *pollset); } cq_poller_vtable; typedef struct non_polling_worker { @@ -90,14 +89,12 @@ static void non_polling_poller_init(grpc_pollset *pollset, gpr_mu **mu) { *mu = &npp->mu; } -static void non_polling_poller_destroy(grpc_exec_ctx *exec_ctx, - grpc_pollset *pollset) { +static void non_polling_poller_destroy(grpc_pollset *pollset) { non_polling_poller *npp = (non_polling_poller *)pollset; gpr_mu_destroy(&npp->mu); } -static grpc_error *non_polling_poller_work(grpc_exec_ctx *exec_ctx, - grpc_pollset *pollset, +static grpc_error *non_polling_poller_work(grpc_pollset *pollset, grpc_pollset_worker **worker, grpc_millis deadline) { non_polling_poller *npp = (non_polling_poller *)pollset; @@ -122,7 +119,7 @@ static grpc_error *non_polling_poller_work(grpc_exec_ctx *exec_ctx, npp->root = w.next; if (&w == npp->root) { if (npp->shutdown) { - GRPC_CLOSURE_SCHED(exec_ctx, npp->shutdown, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(npp->shutdown, GRPC_ERROR_NONE); } npp->root = NULL; } @@ -135,8 +132,7 @@ static grpc_error *non_polling_poller_work(grpc_exec_ctx *exec_ctx, } static grpc_error *non_polling_poller_kick( - grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, - grpc_pollset_worker *specific_worker) { + grpc_pollset *pollset, grpc_pollset_worker *specific_worker) { non_polling_poller *p = (non_polling_poller *)pollset; if (specific_worker == NULL) specific_worker = (grpc_pollset_worker *)p->root; if (specific_worker != NULL) { @@ -149,14 +145,13 @@ static grpc_error *non_polling_poller_kick( return GRPC_ERROR_NONE; } -static void non_polling_poller_shutdown(grpc_exec_ctx *exec_ctx, - grpc_pollset *pollset, +static void non_polling_poller_shutdown(grpc_pollset *pollset, grpc_closure *closure) { non_polling_poller *p = (non_polling_poller *)pollset; GPR_ASSERT(closure != NULL); p->shutdown = closure; if (p->root == NULL) { - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); } else { non_polling_worker *w = p->root; do { @@ -183,13 +178,11 @@ typedef struct cq_vtable { grpc_cq_completion_type cq_completion_type; size_t data_size; void (*init)(void *data); - void (*shutdown)(grpc_exec_ctx *exec_ctx, grpc_completion_queue *cq); + void (*shutdown)(grpc_completion_queue *cq); void (*destroy)(void *data); bool (*begin_op)(grpc_completion_queue *cq, void *tag); - void (*end_op)(grpc_exec_ctx *exec_ctx, grpc_completion_queue *cq, void *tag, - grpc_error *error, - void (*done)(grpc_exec_ctx *exec_ctx, void *done_arg, - grpc_cq_completion *storage), + void (*end_op)(grpc_completion_queue *cq, void *tag, grpc_error *error, + void (*done)(void *done_arg, grpc_cq_completion *storage), void *done_arg, grpc_cq_completion *storage); grpc_event (*next)(grpc_completion_queue *cq, gpr_timespec deadline, void *reserved); @@ -274,31 +267,23 @@ struct grpc_completion_queue { }; /* Forward declarations */ -static void cq_finish_shutdown_next(grpc_exec_ctx *exec_ctx, - grpc_completion_queue *cq); -static void cq_finish_shutdown_pluck(grpc_exec_ctx *exec_ctx, - grpc_completion_queue *cq); -static void cq_shutdown_next(grpc_exec_ctx *exec_ctx, - grpc_completion_queue *cq); -static void cq_shutdown_pluck(grpc_exec_ctx *exec_ctx, - grpc_completion_queue *cq); +static void cq_finish_shutdown_next(grpc_completion_queue *cq); +static void cq_finish_shutdown_pluck(grpc_completion_queue *cq); +static void cq_shutdown_next(grpc_completion_queue *cq); +static void cq_shutdown_pluck(grpc_completion_queue *cq); static bool cq_begin_op_for_next(grpc_completion_queue *cq, void *tag); static bool cq_begin_op_for_pluck(grpc_completion_queue *cq, void *tag); -static void cq_end_op_for_next(grpc_exec_ctx *exec_ctx, - grpc_completion_queue *cq, void *tag, +static void cq_end_op_for_next(grpc_completion_queue *cq, void *tag, grpc_error *error, - void (*done)(grpc_exec_ctx *exec_ctx, - void *done_arg, + void (*done)(void *done_arg, grpc_cq_completion *storage), void *done_arg, grpc_cq_completion *storage); -static void cq_end_op_for_pluck(grpc_exec_ctx *exec_ctx, - grpc_completion_queue *cq, void *tag, +static void cq_end_op_for_pluck(grpc_completion_queue *cq, void *tag, grpc_error *error, - void (*done)(grpc_exec_ctx *exec_ctx, - void *done_arg, + void (*done)(void *done_arg, grpc_cq_completion *storage), void *done_arg, grpc_cq_completion *storage); @@ -342,8 +327,7 @@ grpc_tracer_flag grpc_cq_event_timeout_trace = gpr_free(_ev); \ } -static void on_pollset_shutdown_done(grpc_exec_ctx *exec_ctx, void *cq, - grpc_error *error); +static void on_pollset_shutdown_done(void *cq, grpc_error *error); static void cq_event_queue_init(grpc_cq_event_queue *q) { gpr_mpscq_init(&q->queue); @@ -362,23 +346,23 @@ static bool cq_event_queue_push(grpc_cq_event_queue *q, grpc_cq_completion *c) { static grpc_cq_completion *cq_event_queue_pop(grpc_cq_event_queue *q) { grpc_cq_completion *c = NULL; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; if (gpr_spinlock_trylock(&q->queue_lock)) { - GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_SUCCESSES(&exec_ctx); + GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_SUCCESSES(); bool is_empty = false; c = (grpc_cq_completion *)gpr_mpscq_pop_and_check_end(&q->queue, &is_empty); gpr_spinlock_unlock(&q->queue_lock); if (c == NULL && !is_empty) { - GRPC_STATS_INC_CQ_EV_QUEUE_TRANSIENT_POP_FAILURES(&exec_ctx); + GRPC_STATS_INC_CQ_EV_QUEUE_TRANSIENT_POP_FAILURES(); } } else { - GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_FAILURES(&exec_ctx); + GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_FAILURES(); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); if (c) { gpr_atm_no_barrier_fetch_add(&q->num_queue_items, -1); @@ -409,9 +393,9 @@ grpc_completion_queue *grpc_completion_queue_create_internal( const cq_poller_vtable *poller_vtable = &g_poller_vtable_by_poller_type[polling_type]; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_STATS_INC_CQS_CREATED(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + GRPC_STATS_INC_CQS_CREATED(); + grpc_exec_ctx_finish(); cq = (grpc_completion_queue *)gpr_zalloc(sizeof(grpc_completion_queue) + vtable->data_size + @@ -493,15 +477,14 @@ void grpc_cq_internal_ref(grpc_completion_queue *cq) { gpr_ref(&cq->owning_refs); } -static void on_pollset_shutdown_done(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void on_pollset_shutdown_done(void *arg, grpc_error *error) { grpc_completion_queue *cq = (grpc_completion_queue *)arg; - GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "pollset_destroy"); + GRPC_CQ_INTERNAL_UNREF(cq, "pollset_destroy"); } #ifndef NDEBUG -void grpc_cq_internal_unref(grpc_exec_ctx *exec_ctx, grpc_completion_queue *cq, - const char *reason, const char *file, int line) { +void grpc_cq_internal_unref(grpc_completion_queue *cq, const char *reason, + const char *file, int line) { if (GRPC_TRACER_ON(grpc_trace_cq_refcount)) { gpr_atm val = gpr_atm_no_barrier_load(&cq->owning_refs.count); gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, @@ -509,12 +492,11 @@ void grpc_cq_internal_unref(grpc_exec_ctx *exec_ctx, grpc_completion_queue *cq, reason); } #else -void grpc_cq_internal_unref(grpc_exec_ctx *exec_ctx, - grpc_completion_queue *cq) { +void grpc_cq_internal_unref(grpc_completion_queue *cq) { #endif if (gpr_unref(&cq->owning_refs)) { cq->vtable->destroy(DATA_FROM_CQ(cq)); - cq->poller_vtable->destroy(exec_ctx, POLLSET_FROM_CQ(cq)); + cq->poller_vtable->destroy(POLLSET_FROM_CQ(cq)); #ifndef NDEBUG gpr_free(cq->outstanding_tags); #endif @@ -595,11 +577,9 @@ bool grpc_cq_begin_op(grpc_completion_queue *cq, void *tag) { /* Queue a GRPC_OP_COMPLETED operation to a completion queue (with a * completion * type of GRPC_CQ_NEXT) */ -static void cq_end_op_for_next(grpc_exec_ctx *exec_ctx, - grpc_completion_queue *cq, void *tag, +static void cq_end_op_for_next(grpc_completion_queue *cq, void *tag, grpc_error *error, - void (*done)(grpc_exec_ctx *exec_ctx, - void *done_arg, + void (*done)(void *done_arg, grpc_cq_completion *storage), void *done_arg, grpc_cq_completion *storage) { GPR_TIMER_BEGIN("cq_end_op_for_next", 0); @@ -609,9 +589,9 @@ static void cq_end_op_for_next(grpc_exec_ctx *exec_ctx, error != GRPC_ERROR_NONE)) { const char *errmsg = grpc_error_string(error); GRPC_API_TRACE( - "cq_end_op_for_next(exec_ctx=%p, cq=%p, tag=%p, error=%s, " + "cq_end_op_for_next(=%p, cq=%p, tag=%p, error=%s, " "done=%p, done_arg=%p, storage=%p)", - 7, (exec_ctx, cq, tag, errmsg, done, done_arg, storage)); + 7, (&exec_ctx, cq, tag, errmsg, done, done_arg, storage)); if (GRPC_TRACER_ON(grpc_trace_operation_failures) && error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "Operation failed: tag=%p, error=%s", tag, errmsg); @@ -643,7 +623,7 @@ static void cq_end_op_for_next(grpc_exec_ctx *exec_ctx, if (is_first) { gpr_mu_lock(cq->mu); grpc_error *kick_error = - cq->poller_vtable->kick(exec_ctx, POLLSET_FROM_CQ(cq), NULL); + cq->poller_vtable->kick(POLLSET_FROM_CQ(cq), NULL); gpr_mu_unlock(cq->mu); if (kick_error != GRPC_ERROR_NONE) { @@ -655,17 +635,17 @@ static void cq_end_op_for_next(grpc_exec_ctx *exec_ctx, if (gpr_atm_full_fetch_add(&cqd->pending_events, -1) == 1) { GRPC_CQ_INTERNAL_REF(cq, "shutting_down"); gpr_mu_lock(cq->mu); - cq_finish_shutdown_next(exec_ctx, cq); + cq_finish_shutdown_next(cq); gpr_mu_unlock(cq->mu); - GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "shutting_down"); + GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down"); } } else { GRPC_CQ_INTERNAL_REF(cq, "shutting_down"); gpr_atm_rel_store(&cqd->pending_events, 0); gpr_mu_lock(cq->mu); - cq_finish_shutdown_next(exec_ctx, cq); + cq_finish_shutdown_next(cq); gpr_mu_unlock(cq->mu); - GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "shutting_down"); + GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down"); } GPR_TIMER_END("cq_end_op_for_next", 0); @@ -676,11 +656,9 @@ static void cq_end_op_for_next(grpc_exec_ctx *exec_ctx, /* Queue a GRPC_OP_COMPLETED operation to a completion queue (with a * completion * type of GRPC_CQ_PLUCK) */ -static void cq_end_op_for_pluck(grpc_exec_ctx *exec_ctx, - grpc_completion_queue *cq, void *tag, +static void cq_end_op_for_pluck(grpc_completion_queue *cq, void *tag, grpc_error *error, - void (*done)(grpc_exec_ctx *exec_ctx, - void *done_arg, + void (*done)(void *done_arg, grpc_cq_completion *storage), void *done_arg, grpc_cq_completion *storage) { cq_pluck_data *cqd = (cq_pluck_data *)DATA_FROM_CQ(cq); @@ -693,9 +671,9 @@ static void cq_end_op_for_pluck(grpc_exec_ctx *exec_ctx, error != GRPC_ERROR_NONE)) { const char *errmsg = grpc_error_string(error); GRPC_API_TRACE( - "cq_end_op_for_pluck(exec_ctx=%p, cq=%p, tag=%p, error=%s, " + "cq_end_op_for_pluck(=%p, cq=%p, tag=%p, error=%s, " "done=%p, done_arg=%p, storage=%p)", - 7, (exec_ctx, cq, tag, errmsg, done, done_arg, storage)); + 7, (&exec_ctx, cq, tag, errmsg, done, done_arg, storage)); if (GRPC_TRACER_ON(grpc_trace_operation_failures) && error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "Operation failed: tag=%p, error=%s", tag, errmsg); @@ -717,7 +695,7 @@ static void cq_end_op_for_pluck(grpc_exec_ctx *exec_ctx, cqd->completed_tail = storage; if (gpr_atm_full_fetch_add(&cqd->pending_events, -1) == 1) { - cq_finish_shutdown_pluck(exec_ctx, cq); + cq_finish_shutdown_pluck(cq); gpr_mu_unlock(cq->mu); } else { grpc_pollset_worker *pluck_worker = NULL; @@ -729,7 +707,7 @@ static void cq_end_op_for_pluck(grpc_exec_ctx *exec_ctx, } grpc_error *kick_error = - cq->poller_vtable->kick(exec_ctx, POLLSET_FROM_CQ(cq), pluck_worker); + cq->poller_vtable->kick(POLLSET_FROM_CQ(cq), pluck_worker); gpr_mu_unlock(cq->mu); @@ -746,12 +724,10 @@ static void cq_end_op_for_pluck(grpc_exec_ctx *exec_ctx, GRPC_ERROR_UNREF(error); } -void grpc_cq_end_op(grpc_exec_ctx *exec_ctx, grpc_completion_queue *cq, - void *tag, grpc_error *error, - void (*done)(grpc_exec_ctx *exec_ctx, void *done_arg, - grpc_cq_completion *storage), +void grpc_cq_end_op(grpc_completion_queue *cq, void *tag, grpc_error *error, + void (*done)(void *done_arg, grpc_cq_completion *storage), void *done_arg, grpc_cq_completion *storage) { - cq->vtable->end_op(exec_ctx, cq, tag, error, done, done_arg, storage); + cq->vtable->end_op(cq, tag, error, done, done_arg, storage); } typedef struct { @@ -763,7 +739,7 @@ typedef struct { bool first_loop; } cq_is_finished_arg; -static bool cq_is_next_finished(grpc_exec_ctx *exec_ctx, void *arg) { +static bool cq_is_next_finished(void *arg) { cq_is_finished_arg *a = (cq_is_finished_arg *)arg; grpc_completion_queue *cq = a->cq; cq_next_data *cqd = (cq_next_data *)DATA_FROM_CQ(cq); @@ -786,7 +762,7 @@ static bool cq_is_next_finished(grpc_exec_ctx *exec_ctx, void *arg) { return true; } } - return !a->first_loop && a->deadline < grpc_exec_ctx_now(exec_ctx); + return !a->first_loop && a->deadline < grpc_exec_ctx_now(); } #ifndef NDEBUG @@ -841,8 +817,7 @@ static grpc_event cq_next(grpc_completion_queue *cq, gpr_timespec deadline, NULL, NULL, true}; - grpc_exec_ctx exec_ctx = - GRPC_EXEC_CTX_INITIALIZER(0, cq_is_next_finished, &is_finished_arg); + ExecCtx _local_exec_ctx(0, cq_is_next_finished, &is_finished_arg); for (;;) { grpc_millis iteration_deadline = deadline_millis; @@ -852,7 +827,7 @@ static grpc_event cq_next(grpc_completion_queue *cq, gpr_timespec deadline, ret.type = GRPC_OP_COMPLETE; ret.success = c->next & 1u; ret.tag = c->tag; - c->done(&exec_ctx, c->done_arg, c); + c->done(c->done_arg, c); break; } @@ -862,7 +837,7 @@ static grpc_event cq_next(grpc_completion_queue *cq, gpr_timespec deadline, ret.type = GRPC_OP_COMPLETE; ret.success = c->next & 1u; ret.tag = c->tag; - c->done(&exec_ctx, c->done_arg, c); + c->done(c->done_arg, c); break; } else { /* If c == NULL it means either the queue is empty OR in an transient @@ -892,8 +867,7 @@ static grpc_event cq_next(grpc_completion_queue *cq, gpr_timespec deadline, break; } - if (!is_finished_arg.first_loop && - grpc_exec_ctx_now(&exec_ctx) >= deadline_millis) { + if (!is_finished_arg.first_loop && grpc_exec_ctx_now() >= deadline_millis) { memset(&ret, 0, sizeof(ret)); ret.type = GRPC_QUEUE_TIMEOUT; dump_pending_tags(cq); @@ -903,8 +877,8 @@ static grpc_event cq_next(grpc_completion_queue *cq, gpr_timespec deadline, /* The main polling work happens in grpc_pollset_work */ gpr_mu_lock(cq->mu); cq->num_polls++; - grpc_error *err = cq->poller_vtable->work(&exec_ctx, POLLSET_FROM_CQ(cq), - NULL, iteration_deadline); + grpc_error *err = + cq->poller_vtable->work(POLLSET_FROM_CQ(cq), NULL, iteration_deadline); gpr_mu_unlock(cq->mu); if (err != GRPC_ERROR_NONE) { @@ -923,13 +897,13 @@ static grpc_event cq_next(grpc_completion_queue *cq, gpr_timespec deadline, if (cq_event_queue_num_items(&cqd->queue) > 0 && gpr_atm_acq_load(&cqd->pending_events) > 0) { gpr_mu_lock(cq->mu); - cq->poller_vtable->kick(&exec_ctx, POLLSET_FROM_CQ(cq), NULL); + cq->poller_vtable->kick(POLLSET_FROM_CQ(cq), NULL); gpr_mu_unlock(cq->mu); } GRPC_SURFACE_TRACE_RETURNED_EVENT(cq, &ret); - GRPC_CQ_INTERNAL_UNREF(&exec_ctx, cq, "next"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_CQ_INTERNAL_UNREF(cq, "next"); + grpc_exec_ctx_finish(); GPR_ASSERT(is_finished_arg.stolen_completion == NULL); GPR_TIMER_END("grpc_completion_queue_next", 0); @@ -943,19 +917,16 @@ static grpc_event cq_next(grpc_completion_queue *cq, gpr_timespec deadline, - Must be called only once in completion queue's lifetime - grpc_completion_queue_shutdown() MUST have been called before calling this function */ -static void cq_finish_shutdown_next(grpc_exec_ctx *exec_ctx, - grpc_completion_queue *cq) { +static void cq_finish_shutdown_next(grpc_completion_queue *cq) { cq_next_data *cqd = (cq_next_data *)DATA_FROM_CQ(cq); GPR_ASSERT(cqd->shutdown_called); GPR_ASSERT(gpr_atm_no_barrier_load(&cqd->pending_events) == 0); - cq->poller_vtable->shutdown(exec_ctx, POLLSET_FROM_CQ(cq), - &cq->pollset_shutdown_done); + cq->poller_vtable->shutdown(POLLSET_FROM_CQ(cq), &cq->pollset_shutdown_done); } -static void cq_shutdown_next(grpc_exec_ctx *exec_ctx, - grpc_completion_queue *cq) { +static void cq_shutdown_next(grpc_completion_queue *cq) { cq_next_data *cqd = (cq_next_data *)DATA_FROM_CQ(cq); /* Need an extra ref for cq here because: @@ -968,7 +939,7 @@ static void cq_shutdown_next(grpc_exec_ctx *exec_ctx, gpr_mu_lock(cq->mu); if (cqd->shutdown_called) { gpr_mu_unlock(cq->mu); - GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "shutting_down"); + GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down"); return; } cqd->shutdown_called = true; @@ -976,10 +947,10 @@ static void cq_shutdown_next(grpc_exec_ctx *exec_ctx, * cq_begin_op_for_next and and cq_end_op_for_next functions which read/write * on this counter without necessarily holding a lock on cq */ if (gpr_atm_full_fetch_add(&cqd->pending_events, -1) == 1) { - cq_finish_shutdown_next(exec_ctx, cq); + cq_finish_shutdown_next(cq); } gpr_mu_unlock(cq->mu); - GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "shutting_down"); + GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down"); } grpc_event grpc_completion_queue_next(grpc_completion_queue *cq, @@ -1012,7 +983,7 @@ static void del_plucker(grpc_completion_queue *cq, void *tag, GPR_UNREACHABLE_CODE(return ); } -static bool cq_is_pluck_finished(grpc_exec_ctx *exec_ctx, void *arg) { +static bool cq_is_pluck_finished(void *arg) { cq_is_finished_arg *a = (cq_is_finished_arg *)arg; grpc_completion_queue *cq = a->cq; cq_pluck_data *cqd = (cq_pluck_data *)DATA_FROM_CQ(cq); @@ -1041,7 +1012,7 @@ static bool cq_is_pluck_finished(grpc_exec_ctx *exec_ctx, void *arg) { } gpr_mu_unlock(cq->mu); } - return !a->first_loop && a->deadline < grpc_exec_ctx_now(exec_ctx); + return !a->first_loop && a->deadline < grpc_exec_ctx_now(); } static grpc_event cq_pluck(grpc_completion_queue *cq, void *tag, @@ -1078,8 +1049,7 @@ static grpc_event cq_pluck(grpc_completion_queue *cq, void *tag, NULL, tag, true}; - grpc_exec_ctx exec_ctx = - GRPC_EXEC_CTX_INITIALIZER(0, cq_is_pluck_finished, &is_finished_arg); + ExecCtx _local_exec_ctx(0, cq_is_pluck_finished, &is_finished_arg); for (;;) { if (is_finished_arg.stolen_completion != NULL) { gpr_mu_unlock(cq->mu); @@ -1088,7 +1058,7 @@ static grpc_event cq_pluck(grpc_completion_queue *cq, void *tag, ret.type = GRPC_OP_COMPLETE; ret.success = c->next & 1u; ret.tag = c->tag; - c->done(&exec_ctx, c->done_arg, c); + c->done(c->done_arg, c); break; } prev = &cqd->completed_head; @@ -1103,7 +1073,7 @@ static grpc_event cq_pluck(grpc_completion_queue *cq, void *tag, ret.type = GRPC_OP_COMPLETE; ret.success = c->next & 1u; ret.tag = c->tag; - c->done(&exec_ctx, c->done_arg, c); + c->done(c->done_arg, c); goto done; } prev = c; @@ -1126,8 +1096,7 @@ static grpc_event cq_pluck(grpc_completion_queue *cq, void *tag, dump_pending_tags(cq); break; } - if (!is_finished_arg.first_loop && - grpc_exec_ctx_now(&exec_ctx) >= deadline_millis) { + if (!is_finished_arg.first_loop && grpc_exec_ctx_now() >= deadline_millis) { del_plucker(cq, tag, &worker); gpr_mu_unlock(cq->mu); memset(&ret, 0, sizeof(ret)); @@ -1136,8 +1105,8 @@ static grpc_event cq_pluck(grpc_completion_queue *cq, void *tag, break; } cq->num_polls++; - grpc_error *err = cq->poller_vtable->work(&exec_ctx, POLLSET_FROM_CQ(cq), - &worker, deadline_millis); + grpc_error *err = + cq->poller_vtable->work(POLLSET_FROM_CQ(cq), &worker, deadline_millis); if (err != GRPC_ERROR_NONE) { del_plucker(cq, tag, &worker); gpr_mu_unlock(cq->mu); @@ -1155,8 +1124,8 @@ static grpc_event cq_pluck(grpc_completion_queue *cq, void *tag, } done: GRPC_SURFACE_TRACE_RETURNED_EVENT(cq, &ret); - GRPC_CQ_INTERNAL_UNREF(&exec_ctx, cq, "pluck"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_CQ_INTERNAL_UNREF(cq, "pluck"); + grpc_exec_ctx_finish(); GPR_ASSERT(is_finished_arg.stolen_completion == NULL); GPR_TIMER_END("grpc_completion_queue_pluck", 0); @@ -1169,22 +1138,19 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cq, void *tag, return cq->vtable->pluck(cq, tag, deadline, reserved); } -static void cq_finish_shutdown_pluck(grpc_exec_ctx *exec_ctx, - grpc_completion_queue *cq) { +static void cq_finish_shutdown_pluck(grpc_completion_queue *cq) { cq_pluck_data *cqd = (cq_pluck_data *)DATA_FROM_CQ(cq); GPR_ASSERT(cqd->shutdown_called); GPR_ASSERT(!gpr_atm_no_barrier_load(&cqd->shutdown)); gpr_atm_no_barrier_store(&cqd->shutdown, 1); - cq->poller_vtable->shutdown(exec_ctx, POLLSET_FROM_CQ(cq), - &cq->pollset_shutdown_done); + cq->poller_vtable->shutdown(POLLSET_FROM_CQ(cq), &cq->pollset_shutdown_done); } /* NOTE: This function is almost exactly identical to cq_shutdown_next() but * merging them is a bit tricky and probably not worth it */ -static void cq_shutdown_pluck(grpc_exec_ctx *exec_ctx, - grpc_completion_queue *cq) { +static void cq_shutdown_pluck(grpc_completion_queue *cq) { cq_pluck_data *cqd = (cq_pluck_data *)DATA_FROM_CQ(cq); /* Need an extra ref for cq here because: @@ -1197,25 +1163,25 @@ static void cq_shutdown_pluck(grpc_exec_ctx *exec_ctx, gpr_mu_lock(cq->mu); if (cqd->shutdown_called) { gpr_mu_unlock(cq->mu); - GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "shutting_down (pluck cq)"); + GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down (pluck cq)"); return; } cqd->shutdown_called = true; if (gpr_atm_full_fetch_add(&cqd->pending_events, -1) == 1) { - cq_finish_shutdown_pluck(exec_ctx, cq); + cq_finish_shutdown_pluck(cq); } gpr_mu_unlock(cq->mu); - GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "shutting_down (pluck cq)"); + GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down (pluck cq)"); } /* Shutdown simply drops a ref that we reserved at creation time; if we drop to zero here, then enter shutdown mode and wake up any waiters */ void grpc_completion_queue_shutdown(grpc_completion_queue *cq) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GPR_TIMER_BEGIN("grpc_completion_queue_shutdown", 0); GRPC_API_TRACE("grpc_completion_queue_shutdown(cq=%p)", 1, (cq)); - cq->vtable->shutdown(&exec_ctx, cq); - grpc_exec_ctx_finish(&exec_ctx); + cq->vtable->shutdown(cq); + grpc_exec_ctx_finish(); GPR_TIMER_END("grpc_completion_queue_shutdown", 0); } @@ -1224,9 +1190,9 @@ void grpc_completion_queue_destroy(grpc_completion_queue *cq) { GPR_TIMER_BEGIN("grpc_completion_queue_destroy", 0); grpc_completion_queue_shutdown(cq); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_CQ_INTERNAL_UNREF(&exec_ctx, cq, "destroy"); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + GRPC_CQ_INTERNAL_UNREF(cq, "destroy"); + grpc_exec_ctx_finish(); GPR_TIMER_END("grpc_completion_queue_destroy", 0); } diff --git a/src/core/lib/surface/completion_queue.h b/src/core/lib/surface/completion_queue.h index 69d144bd95c..304afb17f79 100644 --- a/src/core/lib/surface/completion_queue.h +++ b/src/core/lib/surface/completion_queue.h @@ -47,8 +47,7 @@ typedef struct grpc_cq_completion { void *tag; /** done callback - called when this queue element is no longer needed by the completion queue */ - void (*done)(grpc_exec_ctx *exec_ctx, void *done_arg, - struct grpc_cq_completion *c); + void (*done)(void *done_arg, struct grpc_cq_completion *c); void *done_arg; /** next pointer; low bit is used to indicate success or not */ uintptr_t next; @@ -57,17 +56,17 @@ typedef struct grpc_cq_completion { #ifndef NDEBUG void grpc_cq_internal_ref(grpc_completion_queue *cc, const char *reason, const char *file, int line); -void grpc_cq_internal_unref(grpc_exec_ctx *exec_ctx, grpc_completion_queue *cc, - const char *reason, const char *file, int line); +void grpc_cq_internal_unref(grpc_completion_queue *cc, const char *reason, + const char *file, int line); #define GRPC_CQ_INTERNAL_REF(cc, reason) \ grpc_cq_internal_ref(cc, reason, __FILE__, __LINE__) -#define GRPC_CQ_INTERNAL_UNREF(ec, cc, reason) \ - grpc_cq_internal_unref(ec, cc, reason, __FILE__, __LINE__) +#define GRPC_CQ_INTERNAL_UNREF(cc, reason) \ + grpc_cq_internal_unref(cc, reason, __FILE__, __LINE__) #else void grpc_cq_internal_ref(grpc_completion_queue *cc); -void grpc_cq_internal_unref(grpc_exec_ctx *exec_ctx, grpc_completion_queue *cc); +void grpc_cq_internal_unref(grpc_completion_queue *cc); #define GRPC_CQ_INTERNAL_REF(cc, reason) grpc_cq_internal_ref(cc) -#define GRPC_CQ_INTERNAL_UNREF(ec, cc, reason) grpc_cq_internal_unref(ec, cc) +#define GRPC_CQ_INTERNAL_UNREF(cc, reason) grpc_cq_internal_unref(cc) #endif /* Flag that an operation is beginning: the completion channel will not finish @@ -78,10 +77,8 @@ bool grpc_cq_begin_op(grpc_completion_queue *cc, void *tag); /* Queue a GRPC_OP_COMPLETED operation; tag must correspond to the tag passed to grpc_cq_begin_op */ -void grpc_cq_end_op(grpc_exec_ctx *exec_ctx, grpc_completion_queue *cc, - void *tag, grpc_error *error, - void (*done)(grpc_exec_ctx *exec_ctx, void *done_arg, - grpc_cq_completion *storage), +void grpc_cq_end_op(grpc_completion_queue *cc, void *tag, grpc_error *error, + void (*done)(void *done_arg, grpc_cq_completion *storage), void *done_arg, grpc_cq_completion *storage); grpc_pollset *grpc_cq_pollset(grpc_completion_queue *cc); diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index b089da2c54f..16d2cd189d2 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -67,14 +67,12 @@ static void do_basic_init(void) { g_initializations = 0; } -static bool append_filter(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder, void *arg) { +static bool append_filter(grpc_channel_stack_builder *builder, void *arg) { return grpc_channel_stack_builder_append_filter( builder, (const grpc_channel_filter *)arg, NULL, NULL); } -static bool prepend_filter(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder, void *arg) { +static bool prepend_filter(grpc_channel_stack_builder *builder, void *arg) { return grpc_channel_stack_builder_prepend_filter( builder, (const grpc_channel_filter *)arg, NULL, NULL); } @@ -117,7 +115,7 @@ void grpc_init(void) { int i; gpr_once_init(&g_basic_init, do_basic_init); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; gpr_mu_lock(&g_init_mu); if (++g_initializations == 1) { gpr_time_init(); @@ -150,7 +148,7 @@ void grpc_init(void) { grpc_register_tracer(&grpc_trace_metadata); #endif grpc_security_pre_init(); - grpc_iomgr_init(&exec_ctx); + grpc_iomgr_init(); gpr_timers_global_init(); grpc_handshaker_factory_registry_init(); grpc_security_init(); @@ -166,37 +164,36 @@ void grpc_init(void) { grpc_tracer_init("GRPC_TRACE"); /* no more changes to channel init pipelines */ grpc_channel_init_finalize(); - grpc_iomgr_start(&exec_ctx); + grpc_iomgr_start(); } gpr_mu_unlock(&g_init_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); GRPC_API_TRACE("grpc_init(void)", 0, ()); } void grpc_shutdown(void) { int i; GRPC_API_TRACE("grpc_shutdown(void)", 0, ()); - grpc_exec_ctx exec_ctx = - GRPC_EXEC_CTX_INITIALIZER(0, grpc_never_ready_to_finish, NULL); + ExecCtx _local_exec_ctx(0, grpc_never_ready_to_finish, NULL); gpr_mu_lock(&g_init_mu); if (--g_initializations == 0) { - grpc_executor_shutdown(&exec_ctx); + grpc_executor_shutdown(); grpc_timer_manager_set_threading(false); // shutdown timer_manager thread for (i = g_number_of_plugins; i >= 0; i--) { if (g_all_of_the_plugins[i].destroy != NULL) { g_all_of_the_plugins[i].destroy(); } } - grpc_iomgr_shutdown(&exec_ctx); + grpc_iomgr_shutdown(); gpr_timers_global_destroy(); grpc_tracer_shutdown(); - grpc_mdctx_global_shutdown(&exec_ctx); - grpc_handshaker_factory_registry_shutdown(&exec_ctx); + grpc_mdctx_global_shutdown(); + grpc_handshaker_factory_registry_shutdown(); grpc_slice_intern_shutdown(); grpc_stats_shutdown(); } gpr_mu_unlock(&g_init_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } int grpc_is_initialized(void) { diff --git a/src/core/lib/surface/init_secure.cc b/src/core/lib/surface/init_secure.cc index 8fbde3d1b4a..9fc721b5e4d 100644 --- a/src/core/lib/surface/init_secure.cc +++ b/src/core/lib/surface/init_secure.cc @@ -47,7 +47,7 @@ void grpc_security_pre_init(void) { } static bool maybe_prepend_client_auth_filter( - grpc_exec_ctx *exec_ctx, grpc_channel_stack_builder *builder, void *arg) { + grpc_channel_stack_builder *builder, void *arg) { const grpc_channel_args *args = grpc_channel_stack_builder_get_channel_arguments(builder); if (args) { @@ -62,7 +62,7 @@ static bool maybe_prepend_client_auth_filter( } static bool maybe_prepend_server_auth_filter( - grpc_exec_ctx *exec_ctx, grpc_channel_stack_builder *builder, void *arg) { + grpc_channel_stack_builder *builder, void *arg) { const grpc_channel_args *args = grpc_channel_stack_builder_get_channel_arguments(builder); if (args) { diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index 88e26cbeb70..79131a7b68d 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/src/core/lib/surface/lame_client.cc @@ -51,8 +51,7 @@ struct ChannelData { const char *error_message; }; -static void fill_metadata(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - grpc_metadata_batch *mdb) { +static void fill_metadata(grpc_call_element *elem, grpc_metadata_batch *mdb) { CallData *calld = reinterpret_cast(elem->call_data); bool expected = false; if (!calld->filled_metadata.compare_exchange_strong( @@ -64,9 +63,9 @@ static void fill_metadata(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, char tmp[GPR_LTOA_MIN_BUFSIZE]; gpr_ltoa(chand->error_code, tmp); calld->status.md = grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_GRPC_STATUS, grpc_slice_from_copied_string(tmp)); + GRPC_MDSTR_GRPC_STATUS, grpc_slice_from_copied_string(tmp)); calld->details.md = grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_GRPC_MESSAGE, + GRPC_MDSTR_GRPC_MESSAGE, grpc_slice_from_copied_string(chand->error_message)); calld->status.prev = calld->details.next = NULL; calld->status.next = &calld->details; @@ -78,69 +77,61 @@ static void fill_metadata(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, } static void lame_start_transport_stream_op_batch( - grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - grpc_transport_stream_op_batch *op) { + grpc_call_element *elem, grpc_transport_stream_op_batch *op) { CallData *calld = reinterpret_cast(elem->call_data); if (op->recv_initial_metadata) { - fill_metadata(exec_ctx, elem, + fill_metadata(elem, op->payload->recv_initial_metadata.recv_initial_metadata); } else if (op->recv_trailing_metadata) { - fill_metadata(exec_ctx, elem, + fill_metadata(elem, op->payload->recv_trailing_metadata.recv_trailing_metadata); } grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, op, GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel"), + op, GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel"), calld->call_combiner); } -static void lame_get_channel_info(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static void lame_get_channel_info(grpc_channel_element *elem, const grpc_channel_info *channel_info) {} -static void lame_start_transport_op(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static void lame_start_transport_op(grpc_channel_element *elem, grpc_transport_op *op) { if (op->on_connectivity_state_change) { GPR_ASSERT(*op->connectivity_state != GRPC_CHANNEL_SHUTDOWN); *op->connectivity_state = GRPC_CHANNEL_SHUTDOWN; - GRPC_CLOSURE_SCHED(exec_ctx, op->on_connectivity_state_change, - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(op->on_connectivity_state_change, GRPC_ERROR_NONE); } if (op->send_ping != NULL) { - GRPC_CLOSURE_SCHED( - exec_ctx, op->send_ping, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel")); + GRPC_CLOSURE_SCHED(op->send_ping, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "lame client channel")); } GRPC_ERROR_UNREF(op->disconnect_with_error); if (op->on_consumed != NULL) { - GRPC_CLOSURE_SCHED(exec_ctx, op->on_consumed, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(op->on_consumed, GRPC_ERROR_NONE); } } -static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *init_call_elem(grpc_call_element *elem, const grpc_call_element_args *args) { CallData *calld = reinterpret_cast(elem->call_data); calld->call_combiner = args->call_combiner; return GRPC_ERROR_NONE; } -static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, +static void destroy_call_elem(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *then_schedule_closure) { - GRPC_CLOSURE_SCHED(exec_ctx, then_schedule_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(then_schedule_closure, GRPC_ERROR_NONE); } -static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static grpc_error *init_channel_elem(grpc_channel_element *elem, grpc_channel_element_args *args) { GPR_ASSERT(args->is_first); GPR_ASSERT(args->is_last); return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem) {} +static void destroy_channel_elem(grpc_channel_element *elem) {} } // namespace @@ -165,10 +156,10 @@ extern "C" const grpc_channel_filter grpc_lame_filter = { grpc_channel *grpc_lame_client_channel_create(const char *target, grpc_status_code error_code, const char *error_message) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_channel_element *elem; - grpc_channel *channel = grpc_channel_create(&exec_ctx, target, NULL, - GRPC_CLIENT_LAME_CHANNEL, NULL); + grpc_channel *channel = + grpc_channel_create(target, NULL, GRPC_CLIENT_LAME_CHANNEL, NULL); elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); GRPC_API_TRACE( "grpc_lame_client_channel_create(target=%s, error_code=%d, " @@ -178,6 +169,6 @@ grpc_channel *grpc_lame_client_channel_create(const char *target, auto chand = reinterpret_cast(elem->channel_data); chand->error_code = error_code; chand->error_message = error_message; - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return channel; } diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc index dd09cb91de4..cf6883bd7ed 100644 --- a/src/core/lib/surface/server.cc +++ b/src/core/lib/surface/server.cc @@ -45,10 +45,9 @@ typedef struct listener { void *arg; - void (*start)(grpc_exec_ctx *exec_ctx, grpc_server *server, void *arg, - grpc_pollset **pollsets, size_t pollset_count); - void (*destroy)(grpc_exec_ctx *exec_ctx, grpc_server *server, void *arg, - grpc_closure *closure); + void (*start)(grpc_server *server, void *arg, grpc_pollset **pollsets, + size_t pollset_count); + void (*destroy)(grpc_server *server, void *arg, grpc_closure *closure); struct listener *next; grpc_closure destroy_done; } listener; @@ -231,13 +230,12 @@ struct grpc_server { #define SERVER_FROM_CALL_ELEM(elem) \ (((channel_data *)(elem)->channel_data)->server) -static void publish_new_rpc(grpc_exec_ctx *exec_ctx, void *calld, - grpc_error *error); -static void fail_call(grpc_exec_ctx *exec_ctx, grpc_server *server, - size_t cq_idx, requested_call *rc, grpc_error *error); +static void publish_new_rpc(void *calld, grpc_error *error); +static void fail_call(grpc_server *server, size_t cq_idx, requested_call *rc, + grpc_error *error); /* Before calling maybe_finish_shutdown, we must hold mu_global and not hold mu_call */ -static void maybe_finish_shutdown(grpc_exec_ctx *exec_ctx, grpc_server *server); +static void maybe_finish_shutdown(grpc_server *server); /* * channel broadcaster @@ -265,15 +263,14 @@ struct shutdown_cleanup_args { grpc_slice slice; }; -static void shutdown_cleanup(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void shutdown_cleanup(void *arg, grpc_error *error) { struct shutdown_cleanup_args *a = (struct shutdown_cleanup_args *)arg; - grpc_slice_unref_internal(exec_ctx, a->slice); + grpc_slice_unref_internal(a->slice); gpr_free(a); } -static void send_shutdown(grpc_exec_ctx *exec_ctx, grpc_channel *channel, - bool send_goaway, grpc_error *send_disconnect) { +static void send_shutdown(grpc_channel *channel, bool send_goaway, + grpc_error *send_disconnect) { struct shutdown_cleanup_args *sc = (struct shutdown_cleanup_args *)gpr_malloc(sizeof(*sc)); GRPC_CLOSURE_INIT(&sc->closure, shutdown_cleanup, sc, @@ -291,19 +288,18 @@ static void send_shutdown(grpc_exec_ctx *exec_ctx, grpc_channel *channel, op->disconnect_with_error = send_disconnect; elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); - elem->filter->start_transport_op(exec_ctx, elem, op); + elem->filter->start_transport_op(elem, op); } -static void channel_broadcaster_shutdown(grpc_exec_ctx *exec_ctx, - channel_broadcaster *cb, +static void channel_broadcaster_shutdown(channel_broadcaster *cb, bool send_goaway, grpc_error *force_disconnect) { size_t i; for (i = 0; i < cb->num_channels; i++) { - send_shutdown(exec_ctx, cb->channels[i], send_goaway, + send_shutdown(cb->channels[i], send_goaway, GRPC_ERROR_REF(force_disconnect)); - GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, cb->channels[i], "broadcast"); + GRPC_CHANNEL_INTERNAL_UNREF(cb->channels[i], "broadcast"); } gpr_free(cb->channels); GRPC_ERROR_UNREF(force_disconnect); @@ -332,13 +328,11 @@ static void request_matcher_destroy(request_matcher *rm) { gpr_free(rm->requests_per_cq); } -static void kill_zombie(grpc_exec_ctx *exec_ctx, void *elem, - grpc_error *error) { +static void kill_zombie(void *elem, grpc_error *error) { grpc_call_unref(grpc_call_from_top_element((grpc_call_element *)elem)); } -static void request_matcher_zombify_all_pending_calls(grpc_exec_ctx *exec_ctx, - request_matcher *rm) { +static void request_matcher_zombify_all_pending_calls(request_matcher *rm) { while (rm->pending_head) { call_data *calld = rm->pending_head; rm->pending_head = calld->pending_next; @@ -349,20 +343,18 @@ static void request_matcher_zombify_all_pending_calls(grpc_exec_ctx *exec_ctx, &calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0), grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(exec_ctx, &calld->kill_zombie_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&calld->kill_zombie_closure, GRPC_ERROR_NONE); } } -static void request_matcher_kill_requests(grpc_exec_ctx *exec_ctx, - grpc_server *server, +static void request_matcher_kill_requests(grpc_server *server, request_matcher *rm, grpc_error *error) { int request_id; for (size_t i = 0; i < server->cq_count; i++) { while ((request_id = gpr_stack_lockfree_pop(rm->requests_per_cq[i])) != -1) { - fail_call(exec_ctx, server, i, - &server->requested_calls_per_cq[i][request_id], + fail_call(server, i, &server->requested_calls_per_cq[i][request_id], GRPC_ERROR_REF(error)); } } @@ -377,10 +369,10 @@ static void server_ref(grpc_server *server) { gpr_ref(&server->internal_refcount); } -static void server_delete(grpc_exec_ctx *exec_ctx, grpc_server *server) { +static void server_delete(grpc_server *server) { registered_method *rm; size_t i; - grpc_channel_args_destroy(exec_ctx, server->channel_args); + grpc_channel_args_destroy(server->channel_args); gpr_mu_destroy(&server->mu_global); gpr_mu_destroy(&server->mu_call); gpr_cv_destroy(&server->starting_cv); @@ -397,7 +389,7 @@ static void server_delete(grpc_exec_ctx *exec_ctx, grpc_server *server) { request_matcher_destroy(&server->unregistered_request_matcher); } for (i = 0; i < server->cq_count; i++) { - GRPC_CQ_INTERNAL_UNREF(exec_ctx, server->cqs[i], "server"); + GRPC_CQ_INTERNAL_UNREF(server->cqs[i], "server"); if (server->started) { gpr_stack_lockfree_destroy(server->request_freelist_per_cq[i]); gpr_free(server->requested_calls_per_cq[i]); @@ -411,9 +403,9 @@ static void server_delete(grpc_exec_ctx *exec_ctx, grpc_server *server) { gpr_free(server); } -static void server_unref(grpc_exec_ctx *exec_ctx, grpc_server *server) { +static void server_unref(grpc_server *server) { if (gpr_unref(&server->internal_refcount)) { - server_delete(exec_ctx, server); + server_delete(server); } } @@ -427,21 +419,19 @@ static void orphan_channel(channel_data *chand) { chand->next = chand->prev = chand; } -static void finish_destroy_channel(grpc_exec_ctx *exec_ctx, void *cd, - grpc_error *error) { +static void finish_destroy_channel(void *cd, grpc_error *error) { channel_data *chand = (channel_data *)cd; grpc_server *server = chand->server; - GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, chand->channel, "server"); - server_unref(exec_ctx, server); + GRPC_CHANNEL_INTERNAL_UNREF(chand->channel, "server"); + server_unref(server); } -static void destroy_channel(grpc_exec_ctx *exec_ctx, channel_data *chand, - grpc_error *error) { +static void destroy_channel(channel_data *chand, grpc_error *error) { if (is_channel_orphaned(chand)) return; GPR_ASSERT(chand->server != NULL); orphan_channel(chand); server_ref(chand->server); - maybe_finish_shutdown(exec_ctx, chand->server); + maybe_finish_shutdown(chand->server); GRPC_CLOSURE_INIT(&chand->finish_destroy_channel_closure, finish_destroy_channel, chand, grpc_schedule_on_exec_ctx); @@ -454,14 +444,12 @@ static void destroy_channel(grpc_exec_ctx *exec_ctx, channel_data *chand, grpc_transport_op *op = grpc_make_transport_op(&chand->finish_destroy_channel_closure); op->set_accept_stream = true; - grpc_channel_next_op(exec_ctx, - grpc_channel_stack_element( + grpc_channel_next_op(grpc_channel_stack_element( grpc_channel_get_channel_stack(chand->channel), 0), op); } -static void done_request_event(grpc_exec_ctx *exec_ctx, void *req, - grpc_cq_completion *c) { +static void done_request_event(void *req, grpc_cq_completion *c) { requested_call *rc = (requested_call *)req; grpc_server *server = rc->server; @@ -476,12 +464,12 @@ static void done_request_event(grpc_exec_ctx *exec_ctx, void *req, gpr_free(req); } - server_unref(exec_ctx, server); + server_unref(server); } -static void publish_call(grpc_exec_ctx *exec_ctx, grpc_server *server, - call_data *calld, size_t cq_idx, requested_call *rc) { - grpc_call_set_completion_queue(exec_ctx, calld->call, rc->cq_bound_to_call); +static void publish_call(grpc_server *server, call_data *calld, size_t cq_idx, + requested_call *rc) { + grpc_call_set_completion_queue(calld->call, rc->cq_bound_to_call); grpc_call *call = calld->call; *rc->call = call; calld->cq_new = server->cqs[cq_idx]; @@ -512,12 +500,11 @@ static void publish_call(grpc_exec_ctx *exec_ctx, grpc_server *server, grpc_call_stack_element(grpc_call_get_call_stack(call), 0); channel_data *chand = (channel_data *)elem->channel_data; server_ref(chand->server); - grpc_cq_end_op(exec_ctx, calld->cq_new, rc->tag, GRPC_ERROR_NONE, - done_request_event, rc, &rc->completion); + grpc_cq_end_op(calld->cq_new, rc->tag, GRPC_ERROR_NONE, done_request_event, + rc, &rc->completion); } -static void publish_new_rpc(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void publish_new_rpc(void *arg, grpc_error *error) { grpc_call_element *call_elem = (grpc_call_element *)arg; call_data *calld = (call_data *)call_elem->call_data; channel_data *chand = (channel_data *)call_elem->channel_data; @@ -532,8 +519,7 @@ static void publish_new_rpc(grpc_exec_ctx *exec_ctx, void *arg, &calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0), grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(exec_ctx, &calld->kill_zombie_closure, - GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(&calld->kill_zombie_closure, GRPC_ERROR_REF(error)); return; } @@ -543,18 +529,18 @@ static void publish_new_rpc(grpc_exec_ctx *exec_ctx, void *arg, if (request_id == -1) { continue; } else { - GRPC_STATS_INC_SERVER_CQS_CHECKED(exec_ctx, i); + GRPC_STATS_INC_SERVER_CQS_CHECKED(i); gpr_mu_lock(&calld->mu_state); calld->state = ACTIVATED; gpr_mu_unlock(&calld->mu_state); - publish_call(exec_ctx, server, calld, cq_idx, + publish_call(server, calld, cq_idx, &server->requested_calls_per_cq[cq_idx][request_id]); return; /* early out */ } } /* no cq to take the request found: queue it on the slow list */ - GRPC_STATS_INC_SERVER_SLOWPATH_REQUESTS_QUEUED(exec_ctx); + GRPC_STATS_INC_SERVER_SLOWPATH_REQUESTS_QUEUED(); gpr_mu_lock(&server->mu_call); gpr_mu_lock(&calld->mu_state); calld->state = PENDING; @@ -570,8 +556,7 @@ static void publish_new_rpc(grpc_exec_ctx *exec_ctx, void *arg, } static void finish_start_new_rpc( - grpc_exec_ctx *exec_ctx, grpc_server *server, grpc_call_element *elem, - request_matcher *rm, + grpc_server *server, grpc_call_element *elem, request_matcher *rm, grpc_server_register_method_payload_handling payload_handling) { call_data *calld = (call_data *)elem->call_data; @@ -581,7 +566,7 @@ static void finish_start_new_rpc( gpr_mu_unlock(&calld->mu_state); GRPC_CLOSURE_INIT(&calld->kill_zombie_closure, kill_zombie, elem, grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(exec_ctx, &calld->kill_zombie_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&calld->kill_zombie_closure, GRPC_ERROR_NONE); return; } @@ -589,7 +574,7 @@ static void finish_start_new_rpc( switch (payload_handling) { case GRPC_SRM_PAYLOAD_NONE: - publish_new_rpc(exec_ctx, elem, GRPC_ERROR_NONE); + publish_new_rpc(elem, GRPC_ERROR_NONE); break; case GRPC_SRM_PAYLOAD_READ_INITIAL_BYTE_BUFFER: { grpc_op op; @@ -598,14 +583,13 @@ static void finish_start_new_rpc( op.data.recv_message.recv_message = &calld->payload; GRPC_CLOSURE_INIT(&calld->publish, publish_new_rpc, elem, grpc_schedule_on_exec_ctx); - grpc_call_start_batch_and_execute(exec_ctx, calld->call, &op, 1, - &calld->publish); + grpc_call_start_batch_and_execute(calld->call, &op, 1, &calld->publish); break; } } } -static void start_new_rpc(grpc_exec_ctx *exec_ctx, grpc_call_element *elem) { +static void start_new_rpc(grpc_call_element *elem) { channel_data *chand = (channel_data *)elem->channel_data; call_data *calld = (call_data *)elem->call_data; grpc_server *server = chand->server; @@ -630,8 +614,7 @@ static void start_new_rpc(grpc_exec_ctx *exec_ctx, grpc_call_element *elem) { GRPC_INITIAL_METADATA_IDEMPOTENT_REQUEST)) { continue; } - finish_start_new_rpc(exec_ctx, server, elem, - &rm->server_registered_method->matcher, + finish_start_new_rpc(server, elem, &rm->server_registered_method->matcher, rm->server_registered_method->payload_handling); return; } @@ -648,14 +631,12 @@ static void start_new_rpc(grpc_exec_ctx *exec_ctx, grpc_call_element *elem) { GRPC_INITIAL_METADATA_IDEMPOTENT_REQUEST)) { continue; } - finish_start_new_rpc(exec_ctx, server, elem, - &rm->server_registered_method->matcher, + finish_start_new_rpc(server, elem, &rm->server_registered_method->matcher, rm->server_registered_method->payload_handling); return; } } - finish_start_new_rpc(exec_ctx, server, elem, - &server->unregistered_request_matcher, + finish_start_new_rpc(server, elem, &server->unregistered_request_matcher, GRPC_SRM_PAYLOAD_NONE); } @@ -668,9 +649,8 @@ static int num_listeners(grpc_server *server) { return n; } -static void done_shutdown_event(grpc_exec_ctx *exec_ctx, void *server, - grpc_cq_completion *completion) { - server_unref(exec_ctx, (grpc_server *)server); +static void done_shutdown_event(void *server, grpc_cq_completion *completion) { + server_unref((grpc_server *)server); } static int num_channels(grpc_server *server) { @@ -683,34 +663,30 @@ static int num_channels(grpc_server *server) { return n; } -static void kill_pending_work_locked(grpc_exec_ctx *exec_ctx, - grpc_server *server, grpc_error *error) { +static void kill_pending_work_locked(grpc_server *server, grpc_error *error) { if (server->started) { - request_matcher_kill_requests(exec_ctx, server, - &server->unregistered_request_matcher, + request_matcher_kill_requests(server, &server->unregistered_request_matcher, GRPC_ERROR_REF(error)); request_matcher_zombify_all_pending_calls( - exec_ctx, &server->unregistered_request_matcher); + &server->unregistered_request_matcher); for (registered_method *rm = server->registered_methods; rm; rm = rm->next) { - request_matcher_kill_requests(exec_ctx, server, &rm->matcher, + request_matcher_kill_requests(server, &rm->matcher, GRPC_ERROR_REF(error)); - request_matcher_zombify_all_pending_calls(exec_ctx, &rm->matcher); + request_matcher_zombify_all_pending_calls(&rm->matcher); } } GRPC_ERROR_UNREF(error); } -static void maybe_finish_shutdown(grpc_exec_ctx *exec_ctx, - grpc_server *server) { +static void maybe_finish_shutdown(grpc_server *server) { size_t i; if (!gpr_atm_acq_load(&server->shutdown_flag) || server->shutdown_published) { return; } kill_pending_work_locked( - exec_ctx, server, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); + server, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); if (server->root_channel_data.next != &server->root_channel_data || server->listeners_destroyed < num_listeners(server)) { @@ -730,15 +706,13 @@ static void maybe_finish_shutdown(grpc_exec_ctx *exec_ctx, server->shutdown_published = 1; for (i = 0; i < server->num_shutdown_tags; i++) { server_ref(server); - grpc_cq_end_op(exec_ctx, server->shutdown_tags[i].cq, - server->shutdown_tags[i].tag, GRPC_ERROR_NONE, - done_shutdown_event, server, + grpc_cq_end_op(server->shutdown_tags[i].cq, server->shutdown_tags[i].tag, + GRPC_ERROR_NONE, done_shutdown_event, server, &server->shutdown_tags[i].completion); } } -static void server_on_recv_initial_metadata(grpc_exec_ctx *exec_ctx, void *ptr, - grpc_error *error) { +static void server_on_recv_initial_metadata(void *ptr, grpc_error *error) { grpc_call_element *elem = (grpc_call_element *)ptr; call_data *calld = (call_data *)elem->call_data; grpc_millis op_deadline; @@ -752,10 +726,10 @@ static void server_on_recv_initial_metadata(grpc_exec_ctx *exec_ctx, void *ptr, GRPC_MDVALUE(calld->recv_initial_metadata->idx.named.authority->md)); calld->path_set = true; calld->host_set = true; - grpc_metadata_batch_remove(exec_ctx, calld->recv_initial_metadata, + grpc_metadata_batch_remove(calld->recv_initial_metadata, calld->recv_initial_metadata->idx.named.path); grpc_metadata_batch_remove( - exec_ctx, calld->recv_initial_metadata, + calld->recv_initial_metadata, calld->recv_initial_metadata->idx.named.authority); } else { GRPC_ERROR_REF(error); @@ -773,7 +747,7 @@ static void server_on_recv_initial_metadata(grpc_exec_ctx *exec_ctx, void *ptr, GRPC_ERROR_UNREF(src_error); } - GRPC_CLOSURE_RUN(exec_ctx, calld->on_done_recv_initial_metadata, error); + GRPC_CLOSURE_RUN(calld->on_done_recv_initial_metadata, error); } static void server_mutate_op(grpc_call_element *elem, @@ -794,18 +768,16 @@ static void server_mutate_op(grpc_call_element *elem, } static void server_start_transport_stream_op_batch( - grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - grpc_transport_stream_op_batch *op) { + grpc_call_element *elem, grpc_transport_stream_op_batch *op) { server_mutate_op(elem, op); - grpc_call_next_op(exec_ctx, elem, op); + grpc_call_next_op(elem, op); } -static void got_initial_metadata(grpc_exec_ctx *exec_ctx, void *ptr, - grpc_error *error) { +static void got_initial_metadata(void *ptr, grpc_error *error) { grpc_call_element *elem = (grpc_call_element *)ptr; call_data *calld = (call_data *)elem->call_data; if (error == GRPC_ERROR_NONE) { - start_new_rpc(exec_ctx, elem); + start_new_rpc(elem); } else { gpr_mu_lock(&calld->mu_state); if (calld->state == NOT_STARTED) { @@ -813,8 +785,7 @@ static void got_initial_metadata(grpc_exec_ctx *exec_ctx, void *ptr, gpr_mu_unlock(&calld->mu_state); GRPC_CLOSURE_INIT(&calld->kill_zombie_closure, kill_zombie, elem, grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(exec_ctx, &calld->kill_zombie_closure, - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&calld->kill_zombie_closure, GRPC_ERROR_NONE); } else if (calld->state == PENDING) { calld->state = ZOMBIED; gpr_mu_unlock(&calld->mu_state); @@ -826,8 +797,7 @@ static void got_initial_metadata(grpc_exec_ctx *exec_ctx, void *ptr, } } -static void accept_stream(grpc_exec_ctx *exec_ctx, void *cd, - grpc_transport *transport, +static void accept_stream(void *cd, grpc_transport *transport, const void *transport_server_data) { channel_data *chand = (channel_data *)cd; /* create a call */ @@ -837,11 +807,11 @@ static void accept_stream(grpc_exec_ctx *exec_ctx, void *cd, args.server_transport_data = transport_server_data; args.send_deadline = GRPC_MILLIS_INF_FUTURE; grpc_call *call; - grpc_error *error = grpc_call_create(exec_ctx, &args, &call); + grpc_error *error = grpc_call_create(&args, &call); grpc_call_element *elem = grpc_call_stack_element(grpc_call_get_call_stack(call), 0); if (error != GRPC_ERROR_NONE) { - got_initial_metadata(exec_ctx, elem, error); + got_initial_metadata(elem, error); GRPC_ERROR_UNREF(error); return; } @@ -853,32 +823,28 @@ static void accept_stream(grpc_exec_ctx *exec_ctx, void *cd, &calld->initial_metadata; GRPC_CLOSURE_INIT(&calld->got_initial_metadata, got_initial_metadata, elem, grpc_schedule_on_exec_ctx); - grpc_call_start_batch_and_execute(exec_ctx, call, &op, 1, - &calld->got_initial_metadata); + grpc_call_start_batch_and_execute(call, &op, 1, &calld->got_initial_metadata); } -static void channel_connectivity_changed(grpc_exec_ctx *exec_ctx, void *cd, - grpc_error *error) { +static void channel_connectivity_changed(void *cd, grpc_error *error) { channel_data *chand = (channel_data *)cd; grpc_server *server = chand->server; if (chand->connectivity_state != GRPC_CHANNEL_SHUTDOWN) { grpc_transport_op *op = grpc_make_transport_op(NULL); op->on_connectivity_state_change = &chand->channel_connectivity_changed, op->connectivity_state = &chand->connectivity_state; - grpc_channel_next_op(exec_ctx, - grpc_channel_stack_element( + grpc_channel_next_op(grpc_channel_stack_element( grpc_channel_get_channel_stack(chand->channel), 0), op); } else { gpr_mu_lock(&server->mu_global); - destroy_channel(exec_ctx, chand, GRPC_ERROR_REF(error)); + destroy_channel(chand, GRPC_ERROR_REF(error)); gpr_mu_unlock(&server->mu_global); - GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, chand->channel, "connectivity"); + GRPC_CHANNEL_INTERNAL_UNREF(chand->channel, "connectivity"); } } -static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *init_call_elem(grpc_call_element *elem, const grpc_call_element_args *args) { call_data *calld = (call_data *)elem->call_data; channel_data *chand = (channel_data *)elem->channel_data; @@ -895,7 +861,7 @@ static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, return GRPC_ERROR_NONE; } -static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, +static void destroy_call_elem(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *ignored) { channel_data *chand = (channel_data *)elem->channel_data; @@ -904,21 +870,20 @@ static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, GPR_ASSERT(calld->state != PENDING); if (calld->host_set) { - grpc_slice_unref_internal(exec_ctx, calld->host); + grpc_slice_unref_internal(calld->host); } if (calld->path_set) { - grpc_slice_unref_internal(exec_ctx, calld->path); + grpc_slice_unref_internal(calld->path); } grpc_metadata_array_destroy(&calld->initial_metadata); grpc_byte_buffer_destroy(calld->payload); gpr_mu_destroy(&calld->mu_state); - server_unref(exec_ctx, chand->server); + server_unref(chand->server); } -static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static grpc_error *init_channel_elem(grpc_channel_element *elem, grpc_channel_element_args *args) { channel_data *chand = (channel_data *)elem->channel_data; GPR_ASSERT(args->is_first); @@ -934,15 +899,14 @@ static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem) { +static void destroy_channel_elem(grpc_channel_element *elem) { size_t i; channel_data *chand = (channel_data *)elem->channel_data; if (chand->registered_methods) { for (i = 0; i < chand->registered_method_slots; i++) { - grpc_slice_unref_internal(exec_ctx, chand->registered_methods[i].method); + grpc_slice_unref_internal(chand->registered_methods[i].method); if (chand->registered_methods[i].has_host) { - grpc_slice_unref_internal(exec_ctx, chand->registered_methods[i].host); + grpc_slice_unref_internal(chand->registered_methods[i].host); } } gpr_free(chand->registered_methods); @@ -952,9 +916,9 @@ static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, chand->next->prev = chand->prev; chand->prev->next = chand->next; chand->next = chand->prev = chand; - maybe_finish_shutdown(exec_ctx, chand->server); + maybe_finish_shutdown(chand->server); gpr_mu_unlock(&chand->server->mu_global); - server_unref(exec_ctx, chand->server); + server_unref(chand->server); } } @@ -1070,11 +1034,10 @@ void *grpc_server_register_method( return m; } -static void start_listeners(grpc_exec_ctx *exec_ctx, void *s, - grpc_error *error) { +static void start_listeners(void *s, grpc_error *error) { grpc_server *server = (grpc_server *)s; for (listener *l = server->listeners; l; l = l->next) { - l->start(exec_ctx, server, l->arg, server->pollsets, server->pollset_count); + l->start(server, l->arg, server->pollsets, server->pollset_count); } gpr_mu_lock(&server->mu_global); @@ -1082,12 +1045,12 @@ static void start_listeners(grpc_exec_ctx *exec_ctx, void *s, gpr_cv_signal(&server->starting_cv); gpr_mu_unlock(&server->mu_global); - server_unref(exec_ctx, server); + server_unref(server); } void grpc_server_start(grpc_server *server) { size_t i; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GRPC_API_TRACE("grpc_server_start(server=%p)", 1, (server)); @@ -1123,12 +1086,11 @@ void grpc_server_start(grpc_server *server) { server_ref(server); server->starting = true; GRPC_CLOSURE_SCHED( - &exec_ctx, GRPC_CLOSURE_CREATE(start_listeners, server, grpc_executor_scheduler(GRPC_EXECUTOR_SHORT)), GRPC_ERROR_NONE); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } void grpc_server_get_pollsets(grpc_server *server, grpc_pollset ***pollsets, @@ -1137,8 +1099,7 @@ void grpc_server_get_pollsets(grpc_server *server, grpc_pollset ***pollsets, *pollsets = server->pollsets; } -void grpc_server_setup_transport(grpc_exec_ctx *exec_ctx, grpc_server *s, - grpc_transport *transport, +void grpc_server_setup_transport(grpc_server *s, grpc_transport *transport, grpc_pollset *accepting_pollset, const grpc_channel_args *args) { size_t num_registered_methods; @@ -1153,8 +1114,7 @@ void grpc_server_setup_transport(grpc_exec_ctx *exec_ctx, grpc_server *s, uint32_t max_probes = 0; grpc_transport_op *op = NULL; - channel = - grpc_channel_create(exec_ctx, NULL, args, GRPC_SERVER_CHANNEL, transport); + channel = grpc_channel_create(NULL, args, GRPC_SERVER_CHANNEL, transport); chand = (channel_data *)grpc_channel_stack_element( grpc_channel_get_channel_stack(channel), 0) ->channel_data; @@ -1231,21 +1191,19 @@ void grpc_server_setup_transport(grpc_exec_ctx *exec_ctx, grpc_server *s, op->disconnect_with_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server shutdown"); } - grpc_transport_perform_op(exec_ctx, transport, op); + grpc_transport_perform_op(transport, op); } -void done_published_shutdown(grpc_exec_ctx *exec_ctx, void *done_arg, - grpc_cq_completion *storage) { +void done_published_shutdown(void *done_arg, grpc_cq_completion *storage) { (void)done_arg; gpr_free(storage); } -static void listener_destroy_done(grpc_exec_ctx *exec_ctx, void *s, - grpc_error *error) { +static void listener_destroy_done(void *s, grpc_error *error) { grpc_server *server = (grpc_server *)s; gpr_mu_lock(&server->mu_global); server->listeners_destroyed++; - maybe_finish_shutdown(exec_ctx, server); + maybe_finish_shutdown(server); gpr_mu_unlock(&server->mu_global); } @@ -1254,7 +1212,7 @@ void grpc_server_shutdown_and_notify(grpc_server *server, listener *l; shutdown_tag *sdt; channel_broadcaster broadcaster; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GRPC_API_TRACE("grpc_server_shutdown_and_notify(server=%p, cq=%p, tag=%p)", 3, (server, cq, tag)); @@ -1270,7 +1228,7 @@ void grpc_server_shutdown_and_notify(grpc_server *server, GPR_ASSERT(grpc_cq_begin_op(cq, tag)); if (server->shutdown_published) { grpc_cq_end_op( - &exec_ctx, cq, tag, GRPC_ERROR_NONE, done_published_shutdown, NULL, + cq, tag, GRPC_ERROR_NONE, done_published_shutdown, NULL, (grpc_cq_completion *)gpr_malloc(sizeof(grpc_cq_completion))); gpr_mu_unlock(&server->mu_global); goto done; @@ -1295,30 +1253,29 @@ void grpc_server_shutdown_and_notify(grpc_server *server, /* collect all unregistered then registered calls */ gpr_mu_lock(&server->mu_call); kill_pending_work_locked( - &exec_ctx, server, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); + server, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); gpr_mu_unlock(&server->mu_call); - maybe_finish_shutdown(&exec_ctx, server); + maybe_finish_shutdown(server); gpr_mu_unlock(&server->mu_global); /* Shutdown listeners */ for (l = server->listeners; l; l = l->next) { GRPC_CLOSURE_INIT(&l->destroy_done, listener_destroy_done, server, grpc_schedule_on_exec_ctx); - l->destroy(&exec_ctx, server, l->arg, &l->destroy_done); + l->destroy(server, l->arg, &l->destroy_done); } - channel_broadcaster_shutdown(&exec_ctx, &broadcaster, true /* send_goaway */, + channel_broadcaster_shutdown(&broadcaster, true /* send_goaway */, GRPC_ERROR_NONE); done: - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } void grpc_server_cancel_all_calls(grpc_server *server) { channel_broadcaster broadcaster; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GRPC_API_TRACE("grpc_server_cancel_all_calls(server=%p)", 1, (server)); @@ -1327,14 +1284,14 @@ void grpc_server_cancel_all_calls(grpc_server *server) { gpr_mu_unlock(&server->mu_global); channel_broadcaster_shutdown( - &exec_ctx, &broadcaster, false /* send_goaway */, + &broadcaster, false /* send_goaway */, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Cancelling all calls")); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } void grpc_server_destroy(grpc_server *server) { listener *l; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GRPC_API_TRACE("grpc_server_destroy(server=%p)", 1, (server)); @@ -1350,16 +1307,16 @@ void grpc_server_destroy(grpc_server *server) { gpr_mu_unlock(&server->mu_global); - server_unref(&exec_ctx, server); - grpc_exec_ctx_finish(&exec_ctx); + server_unref(server); + grpc_exec_ctx_finish(); } -void grpc_server_add_listener( - grpc_exec_ctx *exec_ctx, grpc_server *server, void *arg, - void (*start)(grpc_exec_ctx *exec_ctx, grpc_server *server, void *arg, - grpc_pollset **pollsets, size_t pollset_count), - void (*destroy)(grpc_exec_ctx *exec_ctx, grpc_server *server, void *arg, - grpc_closure *on_done)) { +void grpc_server_add_listener(grpc_server *server, void *arg, + void (*start)(grpc_server *server, void *arg, + grpc_pollset **pollsets, + size_t pollset_count), + void (*destroy)(grpc_server *server, void *arg, + grpc_closure *on_done)) { listener *l = (listener *)gpr_malloc(sizeof(listener)); l->arg = arg; l->start = start; @@ -1368,21 +1325,20 @@ void grpc_server_add_listener( server->listeners = l; } -static grpc_call_error queue_call_request(grpc_exec_ctx *exec_ctx, - grpc_server *server, size_t cq_idx, +static grpc_call_error queue_call_request(grpc_server *server, size_t cq_idx, requested_call *rc) { call_data *calld = NULL; request_matcher *rm = NULL; int request_id; if (gpr_atm_acq_load(&server->shutdown_flag)) { - fail_call(exec_ctx, server, cq_idx, rc, + fail_call(server, cq_idx, rc, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); return GRPC_CALL_OK; } request_id = gpr_stack_lockfree_pop(server->request_freelist_per_cq[cq_idx]); if (request_id == -1) { /* out of request ids: just fail this one */ - fail_call(exec_ctx, server, cq_idx, rc, + fail_call(server, cq_idx, rc, grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Out of request ids"), GRPC_ERROR_INT_LIMIT, server->max_requested_calls_per_cq)); @@ -1414,13 +1370,12 @@ static grpc_call_error queue_call_request(grpc_exec_ctx *exec_ctx, &calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0), grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(exec_ctx, &calld->kill_zombie_closure, - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&calld->kill_zombie_closure, GRPC_ERROR_NONE); } else { GPR_ASSERT(calld->state == PENDING); calld->state = ACTIVATED; gpr_mu_unlock(&calld->mu_state); - publish_call(exec_ctx, server, calld, cq_idx, + publish_call(server, calld, cq_idx, &server->requested_calls_per_cq[cq_idx][request_id]); } gpr_mu_lock(&server->mu_call); @@ -1436,9 +1391,9 @@ grpc_call_error grpc_server_request_call( grpc_completion_queue *cq_bound_to_call, grpc_completion_queue *cq_for_notification, void *tag) { grpc_call_error error; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; requested_call *rc = (requested_call *)gpr_malloc(sizeof(*rc)); - GRPC_STATS_INC_SERVER_REQUESTED_CALLS(&exec_ctx); + GRPC_STATS_INC_SERVER_REQUESTED_CALLS(); GRPC_API_TRACE( "grpc_server_request_call(" "server=%p, call=%p, details=%p, initial_metadata=%p, " @@ -1470,9 +1425,9 @@ grpc_call_error grpc_server_request_call( rc->call = call; rc->data.batch.details = details; rc->initial_metadata = initial_metadata; - error = queue_call_request(&exec_ctx, server, cq_idx, rc); + error = queue_call_request(server, cq_idx, rc); done: - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return error; } @@ -1482,10 +1437,10 @@ grpc_call_error grpc_server_request_registered_call( grpc_completion_queue *cq_bound_to_call, grpc_completion_queue *cq_for_notification, void *tag) { grpc_call_error error; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; requested_call *rc = (requested_call *)gpr_malloc(sizeof(*rc)); registered_method *rm = (registered_method *)rmp; - GRPC_STATS_INC_SERVER_REQUESTED_CALLS(&exec_ctx); + GRPC_STATS_INC_SERVER_REQUESTED_CALLS(); GRPC_API_TRACE( "grpc_server_request_registered_call(" "server=%p, rmp=%p, call=%p, deadline=%p, initial_metadata=%p, " @@ -1526,21 +1481,21 @@ grpc_call_error grpc_server_request_registered_call( rc->data.registered.deadline = deadline; rc->initial_metadata = initial_metadata; rc->data.registered.optional_payload = optional_payload; - error = queue_call_request(&exec_ctx, server, cq_idx, rc); + error = queue_call_request(server, cq_idx, rc); done: - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return error; } -static void fail_call(grpc_exec_ctx *exec_ctx, grpc_server *server, - size_t cq_idx, requested_call *rc, grpc_error *error) { +static void fail_call(grpc_server *server, size_t cq_idx, requested_call *rc, + grpc_error *error) { *rc->call = NULL; rc->initial_metadata->count = 0; GPR_ASSERT(error != GRPC_ERROR_NONE); server_ref(server); - grpc_cq_end_op(exec_ctx, server->cqs[cq_idx], rc->tag, error, - done_request_event, rc, &rc->completion); + grpc_cq_end_op(server->cqs[cq_idx], rc->tag, error, done_request_event, rc, + &rc->completion); } const grpc_channel_args *grpc_server_get_channel_args(grpc_server *server) { diff --git a/src/core/lib/surface/server.h b/src/core/lib/surface/server.h index 375eab4a048..604e038b806 100644 --- a/src/core/lib/surface/server.h +++ b/src/core/lib/surface/server.h @@ -35,17 +35,16 @@ extern grpc_tracer_flag grpc_server_channel_trace; /* Add a listener to the server: when the server starts, it will call start, and when it shuts down, it will call destroy */ -void grpc_server_add_listener( - grpc_exec_ctx *exec_ctx, grpc_server *server, void *listener, - void (*start)(grpc_exec_ctx *exec_ctx, grpc_server *server, void *arg, - grpc_pollset **pollsets, size_t npollsets), - void (*destroy)(grpc_exec_ctx *exec_ctx, grpc_server *server, void *arg, - grpc_closure *on_done)); +void grpc_server_add_listener(grpc_server *server, void *listener, + void (*start)(grpc_server *server, void *arg, + grpc_pollset **pollsets, + size_t npollsets), + void (*destroy)(grpc_server *server, void *arg, + grpc_closure *on_done)); /* Setup a transport - creates a channel stack, binds the transport to the server */ -void grpc_server_setup_transport(grpc_exec_ctx *exec_ctx, grpc_server *server, - grpc_transport *transport, +void grpc_server_setup_transport(grpc_server *server, grpc_transport *transport, grpc_pollset *accepting_pollset, const grpc_channel_args *args); diff --git a/src/core/lib/transport/bdp_estimator.cc b/src/core/lib/transport/bdp_estimator.cc index f1597014b17..6fd6597cfe2 100644 --- a/src/core/lib/transport/bdp_estimator.cc +++ b/src/core/lib/transport/bdp_estimator.cc @@ -38,7 +38,7 @@ BdpEstimator::BdpEstimator(const char *name) bw_est_(0), name_(name) {} -grpc_millis BdpEstimator::CompletePing(grpc_exec_ctx *exec_ctx) { +grpc_millis BdpEstimator::CompletePing() { gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); gpr_timespec dt_ts = gpr_time_sub(now, ping_start_time_); double dt = (double)dt_ts.tv_sec + 1e-9 * (double)dt_ts.tv_nsec; @@ -78,7 +78,7 @@ grpc_millis BdpEstimator::CompletePing(grpc_exec_ctx *exec_ctx) { } ping_state_ = PingState::UNSCHEDULED; accumulator_ = 0; - return grpc_exec_ctx_now(exec_ctx) + inter_ping_delay_; + return grpc_exec_ctx_now() + inter_ping_delay_; } } // namespace grpc_core diff --git a/src/core/lib/transport/bdp_estimator.h b/src/core/lib/transport/bdp_estimator.h index 470c127f7f3..81c5b0f98bb 100644 --- a/src/core/lib/transport/bdp_estimator.h +++ b/src/core/lib/transport/bdp_estimator.h @@ -80,7 +80,7 @@ class BdpEstimator { } // Completes a previously started ping, returns when to schedule the next one - grpc_millis CompletePing(grpc_exec_ctx *exec_ctx); + grpc_millis CompletePing(); private: enum class PingState { UNSCHEDULED, SCHEDULED, STARTED }; diff --git a/src/core/lib/transport/byte_stream.cc b/src/core/lib/transport/byte_stream.cc index 08f61629a92..4f32aeeaaac 100644 --- a/src/core/lib/transport/byte_stream.cc +++ b/src/core/lib/transport/byte_stream.cc @@ -25,34 +25,28 @@ #include "src/core/lib/slice/slice_internal.h" -bool grpc_byte_stream_next(grpc_exec_ctx *exec_ctx, - grpc_byte_stream *byte_stream, size_t max_size_hint, +bool grpc_byte_stream_next(grpc_byte_stream *byte_stream, size_t max_size_hint, grpc_closure *on_complete) { - return byte_stream->vtable->next(exec_ctx, byte_stream, max_size_hint, - on_complete); + return byte_stream->vtable->next(byte_stream, max_size_hint, on_complete); } -grpc_error *grpc_byte_stream_pull(grpc_exec_ctx *exec_ctx, - grpc_byte_stream *byte_stream, +grpc_error *grpc_byte_stream_pull(grpc_byte_stream *byte_stream, grpc_slice *slice) { - return byte_stream->vtable->pull(exec_ctx, byte_stream, slice); + return byte_stream->vtable->pull(byte_stream, slice); } -void grpc_byte_stream_shutdown(grpc_exec_ctx *exec_ctx, - grpc_byte_stream *byte_stream, +void grpc_byte_stream_shutdown(grpc_byte_stream *byte_stream, grpc_error *error) { - byte_stream->vtable->shutdown(exec_ctx, byte_stream, error); + byte_stream->vtable->shutdown(byte_stream, error); } -void grpc_byte_stream_destroy(grpc_exec_ctx *exec_ctx, - grpc_byte_stream *byte_stream) { - byte_stream->vtable->destroy(exec_ctx, byte_stream); +void grpc_byte_stream_destroy(grpc_byte_stream *byte_stream) { + byte_stream->vtable->destroy(byte_stream); } // grpc_slice_buffer_stream -static bool slice_buffer_stream_next(grpc_exec_ctx *exec_ctx, - grpc_byte_stream *byte_stream, +static bool slice_buffer_stream_next(grpc_byte_stream *byte_stream, size_t max_size_hint, grpc_closure *on_complete) { grpc_slice_buffer_stream *stream = (grpc_slice_buffer_stream *)byte_stream; @@ -60,8 +54,7 @@ static bool slice_buffer_stream_next(grpc_exec_ctx *exec_ctx, return true; } -static grpc_error *slice_buffer_stream_pull(grpc_exec_ctx *exec_ctx, - grpc_byte_stream *byte_stream, +static grpc_error *slice_buffer_stream_pull(grpc_byte_stream *byte_stream, grpc_slice *slice) { grpc_slice_buffer_stream *stream = (grpc_slice_buffer_stream *)byte_stream; if (stream->shutdown_error != GRPC_ERROR_NONE) { @@ -74,18 +67,16 @@ static grpc_error *slice_buffer_stream_pull(grpc_exec_ctx *exec_ctx, return GRPC_ERROR_NONE; } -static void slice_buffer_stream_shutdown(grpc_exec_ctx *exec_ctx, - grpc_byte_stream *byte_stream, +static void slice_buffer_stream_shutdown(grpc_byte_stream *byte_stream, grpc_error *error) { grpc_slice_buffer_stream *stream = (grpc_slice_buffer_stream *)byte_stream; GRPC_ERROR_UNREF(stream->shutdown_error); stream->shutdown_error = error; } -static void slice_buffer_stream_destroy(grpc_exec_ctx *exec_ctx, - grpc_byte_stream *byte_stream) { +static void slice_buffer_stream_destroy(grpc_byte_stream *byte_stream) { grpc_slice_buffer_stream *stream = (grpc_slice_buffer_stream *)byte_stream; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, stream->backing_buffer); + grpc_slice_buffer_reset_and_unref_internal(stream->backing_buffer); GRPC_ERROR_UNREF(stream->shutdown_error); } @@ -113,25 +104,22 @@ void grpc_byte_stream_cache_init(grpc_byte_stream_cache *cache, grpc_slice_buffer_init(&cache->cache_buffer); } -void grpc_byte_stream_cache_destroy(grpc_exec_ctx *exec_ctx, - grpc_byte_stream_cache *cache) { - grpc_byte_stream_destroy(exec_ctx, cache->underlying_stream); - grpc_slice_buffer_destroy_internal(exec_ctx, &cache->cache_buffer); +void grpc_byte_stream_cache_destroy(grpc_byte_stream_cache *cache) { + grpc_byte_stream_destroy(cache->underlying_stream); + grpc_slice_buffer_destroy_internal(&cache->cache_buffer); } -static bool caching_byte_stream_next(grpc_exec_ctx *exec_ctx, - grpc_byte_stream *byte_stream, +static bool caching_byte_stream_next(grpc_byte_stream *byte_stream, size_t max_size_hint, grpc_closure *on_complete) { grpc_caching_byte_stream *stream = (grpc_caching_byte_stream *)byte_stream; if (stream->shutdown_error != GRPC_ERROR_NONE) return true; if (stream->cursor < stream->cache->cache_buffer.count) return true; - return grpc_byte_stream_next(exec_ctx, stream->cache->underlying_stream, - max_size_hint, on_complete); + return grpc_byte_stream_next(stream->cache->underlying_stream, max_size_hint, + on_complete); } -static grpc_error *caching_byte_stream_pull(grpc_exec_ctx *exec_ctx, - grpc_byte_stream *byte_stream, +static grpc_error *caching_byte_stream_pull(grpc_byte_stream *byte_stream, grpc_slice *slice) { grpc_caching_byte_stream *stream = (grpc_caching_byte_stream *)byte_stream; if (stream->shutdown_error != GRPC_ERROR_NONE) { @@ -144,7 +132,7 @@ static grpc_error *caching_byte_stream_pull(grpc_exec_ctx *exec_ctx, return GRPC_ERROR_NONE; } grpc_error *error = - grpc_byte_stream_pull(exec_ctx, stream->cache->underlying_stream, slice); + grpc_byte_stream_pull(stream->cache->underlying_stream, slice); if (error == GRPC_ERROR_NONE) { ++stream->cursor; grpc_slice_buffer_add(&stream->cache->cache_buffer, @@ -153,17 +141,15 @@ static grpc_error *caching_byte_stream_pull(grpc_exec_ctx *exec_ctx, return error; } -static void caching_byte_stream_shutdown(grpc_exec_ctx *exec_ctx, - grpc_byte_stream *byte_stream, +static void caching_byte_stream_shutdown(grpc_byte_stream *byte_stream, grpc_error *error) { grpc_caching_byte_stream *stream = (grpc_caching_byte_stream *)byte_stream; GRPC_ERROR_UNREF(stream->shutdown_error); stream->shutdown_error = GRPC_ERROR_REF(error); - grpc_byte_stream_shutdown(exec_ctx, stream->cache->underlying_stream, error); + grpc_byte_stream_shutdown(stream->cache->underlying_stream, error); } -static void caching_byte_stream_destroy(grpc_exec_ctx *exec_ctx, - grpc_byte_stream *byte_stream) { +static void caching_byte_stream_destroy(grpc_byte_stream *byte_stream) { grpc_caching_byte_stream *stream = (grpc_caching_byte_stream *)byte_stream; GRPC_ERROR_UNREF(stream->shutdown_error); } diff --git a/src/core/lib/transport/byte_stream.h b/src/core/lib/transport/byte_stream.h index c1d8ee543f5..a2d57a680c4 100644 --- a/src/core/lib/transport/byte_stream.h +++ b/src/core/lib/transport/byte_stream.h @@ -35,13 +35,11 @@ extern "C" { typedef struct grpc_byte_stream grpc_byte_stream; typedef struct { - bool (*next)(grpc_exec_ctx *exec_ctx, grpc_byte_stream *byte_stream, - size_t max_size_hint, grpc_closure *on_complete); - grpc_error *(*pull)(grpc_exec_ctx *exec_ctx, grpc_byte_stream *byte_stream, - grpc_slice *slice); - void (*shutdown)(grpc_exec_ctx *exec_ctx, grpc_byte_stream *byte_stream, - grpc_error *error); - void (*destroy)(grpc_exec_ctx *exec_ctx, grpc_byte_stream *byte_stream); + bool (*next)(grpc_byte_stream *byte_stream, size_t max_size_hint, + grpc_closure *on_complete); + grpc_error *(*pull)(grpc_byte_stream *byte_stream, grpc_slice *slice); + void (*shutdown)(grpc_byte_stream *byte_stream, grpc_error *error); + void (*destroy)(grpc_byte_stream *byte_stream); } grpc_byte_stream_vtable; struct grpc_byte_stream { @@ -56,8 +54,7 @@ struct grpc_byte_stream { // // max_size_hint can be set as a hint as to the maximum number // of bytes that would be acceptable to read. -bool grpc_byte_stream_next(grpc_exec_ctx *exec_ctx, - grpc_byte_stream *byte_stream, size_t max_size_hint, +bool grpc_byte_stream_next(grpc_byte_stream *byte_stream, size_t max_size_hint, grpc_closure *on_complete); // Returns the next slice in the byte stream when it is ready (indicated by @@ -65,8 +62,7 @@ bool grpc_byte_stream_next(grpc_exec_ctx *exec_ctx, // grpc_byte_stream_next is called). // // Once a slice is returned into *slice, it is owned by the caller. -grpc_error *grpc_byte_stream_pull(grpc_exec_ctx *exec_ctx, - grpc_byte_stream *byte_stream, +grpc_error *grpc_byte_stream_pull(grpc_byte_stream *byte_stream, grpc_slice *slice); // Shuts down the byte stream. @@ -76,12 +72,10 @@ grpc_error *grpc_byte_stream_pull(grpc_exec_ctx *exec_ctx, // // The next call to grpc_byte_stream_pull() (if any) will return the error // passed to grpc_byte_stream_shutdown(). -void grpc_byte_stream_shutdown(grpc_exec_ctx *exec_ctx, - grpc_byte_stream *byte_stream, +void grpc_byte_stream_shutdown(grpc_byte_stream *byte_stream, grpc_error *error); -void grpc_byte_stream_destroy(grpc_exec_ctx *exec_ctx, - grpc_byte_stream *byte_stream); +void grpc_byte_stream_destroy(grpc_byte_stream *byte_stream); // grpc_slice_buffer_stream // @@ -123,8 +117,7 @@ void grpc_byte_stream_cache_init(grpc_byte_stream_cache *cache, grpc_byte_stream *underlying_stream); // Must not be called while still in use by a grpc_caching_byte_stream. -void grpc_byte_stream_cache_destroy(grpc_exec_ctx *exec_ctx, - grpc_byte_stream_cache *cache); +void grpc_byte_stream_cache_destroy(grpc_byte_stream_cache *cache); typedef struct { grpc_byte_stream base; diff --git a/src/core/lib/transport/connectivity_state.cc b/src/core/lib/transport/connectivity_state.cc index f328a6cdbb7..8775eed7674 100644 --- a/src/core/lib/transport/connectivity_state.cc +++ b/src/core/lib/transport/connectivity_state.cc @@ -54,8 +54,7 @@ void grpc_connectivity_state_init(grpc_connectivity_state_tracker *tracker, tracker->name = gpr_strdup(name); } -void grpc_connectivity_state_destroy(grpc_exec_ctx *exec_ctx, - grpc_connectivity_state_tracker *tracker) { +void grpc_connectivity_state_destroy(grpc_connectivity_state_tracker *tracker) { grpc_error *error; grpc_connectivity_state_watcher *w; while ((w = tracker->watchers)) { @@ -68,7 +67,7 @@ void grpc_connectivity_state_destroy(grpc_exec_ctx *exec_ctx, error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Shutdown connectivity owner"); } - GRPC_CLOSURE_SCHED(exec_ctx, w->notify, error); + GRPC_CLOSURE_SCHED(w->notify, error); gpr_free(w); } GRPC_ERROR_UNREF(tracker->current_error); @@ -108,8 +107,8 @@ bool grpc_connectivity_state_has_watchers( } bool grpc_connectivity_state_notify_on_state_change( - grpc_exec_ctx *exec_ctx, grpc_connectivity_state_tracker *tracker, - grpc_connectivity_state *current, grpc_closure *notify) { + grpc_connectivity_state_tracker *tracker, grpc_connectivity_state *current, + grpc_closure *notify) { grpc_connectivity_state cur = (grpc_connectivity_state)gpr_atm_no_barrier_load( &tracker->current_state_atm); @@ -126,7 +125,7 @@ bool grpc_connectivity_state_notify_on_state_change( if (current == NULL) { grpc_connectivity_state_watcher *w = tracker->watchers; if (w != NULL && w->notify == notify) { - GRPC_CLOSURE_SCHED(exec_ctx, notify, GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(notify, GRPC_ERROR_CANCELLED); tracker->watchers = w->next; gpr_free(w); return false; @@ -134,7 +133,7 @@ bool grpc_connectivity_state_notify_on_state_change( while (w != NULL) { grpc_connectivity_state_watcher *rm_candidate = w->next; if (rm_candidate != NULL && rm_candidate->notify == notify) { - GRPC_CLOSURE_SCHED(exec_ctx, notify, GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(notify, GRPC_ERROR_CANCELLED); w->next = w->next->next; gpr_free(rm_candidate); return false; @@ -145,8 +144,7 @@ bool grpc_connectivity_state_notify_on_state_change( } else { if (cur != *current) { *current = cur; - GRPC_CLOSURE_SCHED(exec_ctx, notify, - GRPC_ERROR_REF(tracker->current_error)); + GRPC_CLOSURE_SCHED(notify, GRPC_ERROR_REF(tracker->current_error)); } else { grpc_connectivity_state_watcher *w = (grpc_connectivity_state_watcher *)gpr_malloc(sizeof(*w)); @@ -159,8 +157,7 @@ bool grpc_connectivity_state_notify_on_state_change( } } -void grpc_connectivity_state_set(grpc_exec_ctx *exec_ctx, - grpc_connectivity_state_tracker *tracker, +void grpc_connectivity_state_set(grpc_connectivity_state_tracker *tracker, grpc_connectivity_state state, grpc_error *error, const char *reason) { grpc_connectivity_state cur = @@ -199,8 +196,7 @@ void grpc_connectivity_state_set(grpc_exec_ctx *exec_ctx, gpr_log(GPR_DEBUG, "NOTIFY: %p %s: %p", tracker, tracker->name, w->notify); } - GRPC_CLOSURE_SCHED(exec_ctx, w->notify, - GRPC_ERROR_REF(tracker->current_error)); + GRPC_CLOSURE_SCHED(w->notify, GRPC_ERROR_REF(tracker->current_error)); gpr_free(w); } } diff --git a/src/core/lib/transport/connectivity_state.h b/src/core/lib/transport/connectivity_state.h index c0ba1881484..b2dece34787 100644 --- a/src/core/lib/transport/connectivity_state.h +++ b/src/core/lib/transport/connectivity_state.h @@ -55,13 +55,11 @@ const char *grpc_connectivity_state_name(grpc_connectivity_state state); void grpc_connectivity_state_init(grpc_connectivity_state_tracker *tracker, grpc_connectivity_state init_state, const char *name); -void grpc_connectivity_state_destroy(grpc_exec_ctx *exec_ctx, - grpc_connectivity_state_tracker *tracker); +void grpc_connectivity_state_destroy(grpc_connectivity_state_tracker *tracker); /** Set connectivity state; not thread safe; access must be serialized with an * external lock */ -void grpc_connectivity_state_set(grpc_exec_ctx *exec_ctx, - grpc_connectivity_state_tracker *tracker, +void grpc_connectivity_state_set(grpc_connectivity_state_tracker *tracker, grpc_connectivity_state state, grpc_error *associated_error, const char *reason); @@ -85,8 +83,8 @@ grpc_connectivity_state grpc_connectivity_state_get( case). Access must be serialized with an external lock. */ bool grpc_connectivity_state_notify_on_state_change( - grpc_exec_ctx *exec_ctx, grpc_connectivity_state_tracker *tracker, - grpc_connectivity_state *current, grpc_closure *notify); + grpc_connectivity_state_tracker *tracker, grpc_connectivity_state *current, + grpc_closure *notify); #ifdef __cplusplus } diff --git a/src/core/lib/transport/error_utils.cc b/src/core/lib/transport/error_utils.cc index 2e3b61b7abc..276fdf1cdcc 100644 --- a/src/core/lib/transport/error_utils.cc +++ b/src/core/lib/transport/error_utils.cc @@ -39,9 +39,8 @@ static grpc_error *recursively_find_error_with_field(grpc_error *error, return NULL; } -void grpc_error_get_status(grpc_exec_ctx *exec_ctx, grpc_error *error, - grpc_millis deadline, grpc_status_code *code, - grpc_slice *slice, +void grpc_error_get_status(grpc_error *error, grpc_millis deadline, + grpc_status_code *code, grpc_slice *slice, grpc_http2_error_code *http_error) { // Start with the parent error and recurse through the tree of children // until we find the first one that has a status code. @@ -64,8 +63,8 @@ void grpc_error_get_status(grpc_exec_ctx *exec_ctx, grpc_error *error, status = (grpc_status_code)integer; } else if (grpc_error_get_int(found_error, GRPC_ERROR_INT_HTTP2_ERROR, &integer)) { - status = grpc_http2_error_to_grpc_status( - exec_ctx, (grpc_http2_error_code)integer, deadline); + status = grpc_http2_error_to_grpc_status((grpc_http2_error_code)integer, + deadline); } if (code != NULL) *code = status; diff --git a/src/core/lib/transport/error_utils.h b/src/core/lib/transport/error_utils.h index b4f9df4bf1a..94012450f73 100644 --- a/src/core/lib/transport/error_utils.h +++ b/src/core/lib/transport/error_utils.h @@ -33,9 +33,8 @@ extern "C" { /// All attributes are pulled from the same child error. If any of the /// attributes (code, msg, http_status) are unneeded, they can be passed as /// NULL. -void grpc_error_get_status(grpc_exec_ctx *exec_ctx, grpc_error *error, - grpc_millis deadline, grpc_status_code *code, - grpc_slice *slice, +void grpc_error_get_status(grpc_error *error, grpc_millis deadline, + grpc_status_code *code, grpc_slice *slice, grpc_http2_error_code *http_status); /// A utility function to check whether there is a clear status code that diff --git a/src/core/lib/transport/metadata.cc b/src/core/lib/transport/metadata.cc index 5455b2481bd..9f88917daad 100644 --- a/src/core/lib/transport/metadata.cc +++ b/src/core/lib/transport/metadata.cc @@ -108,7 +108,7 @@ typedef struct mdtab_shard { static mdtab_shard g_shards[SHARD_COUNT]; -static void gc_mdtab(grpc_exec_ctx *exec_ctx, mdtab_shard *shard); +static void gc_mdtab(mdtab_shard *shard); void grpc_mdctx_global_init(void) { /* initialize shards */ @@ -123,11 +123,11 @@ void grpc_mdctx_global_init(void) { } } -void grpc_mdctx_global_shutdown(grpc_exec_ctx *exec_ctx) { +void grpc_mdctx_global_shutdown() { for (size_t i = 0; i < SHARD_COUNT; i++) { mdtab_shard *shard = &g_shards[i]; gpr_mu_destroy(&shard->mu); - gc_mdtab(exec_ctx, shard); + gc_mdtab(shard); /* TODO(ctiller): GPR_ASSERT(shard->count == 0); */ if (shard->count != 0) { gpr_log(GPR_DEBUG, "WARNING: %" PRIuPTR " metadata elements were leaked", @@ -165,7 +165,7 @@ static void ref_md_locked(mdtab_shard *shard, } } -static void gc_mdtab(grpc_exec_ctx *exec_ctx, mdtab_shard *shard) { +static void gc_mdtab(mdtab_shard *shard) { size_t i; interned_metadata **prev_next; interned_metadata *md, *next; @@ -178,8 +178,8 @@ static void gc_mdtab(grpc_exec_ctx *exec_ctx, mdtab_shard *shard) { void *user_data = (void *)gpr_atm_no_barrier_load(&md->user_data); next = md->bucket_next; if (gpr_atm_acq_load(&md->refcnt) == 0) { - grpc_slice_unref_internal(exec_ctx, md->key); - grpc_slice_unref_internal(exec_ctx, md->value); + grpc_slice_unref_internal(md->key); + grpc_slice_unref_internal(md->value); if (md->user_data) { ((destroy_user_data_func)gpr_atm_no_barrier_load( &md->destroy_user_data))(user_data); @@ -228,17 +228,17 @@ static void grow_mdtab(mdtab_shard *shard) { GPR_TIMER_END("grow_mdtab", 0); } -static void rehash_mdtab(grpc_exec_ctx *exec_ctx, mdtab_shard *shard) { +static void rehash_mdtab(mdtab_shard *shard) { if (gpr_atm_no_barrier_load(&shard->free_estimate) > (gpr_atm)(shard->capacity / 4)) { - gc_mdtab(exec_ctx, shard); + gc_mdtab(shard); } else { grow_mdtab(shard); } } grpc_mdelem grpc_mdelem_create( - grpc_exec_ctx *exec_ctx, grpc_slice key, grpc_slice value, + grpc_slice key, grpc_slice value, grpc_mdelem_data *compatible_external_backing_store) { if (!grpc_slice_is_interned(key) || !grpc_slice_is_interned(value)) { if (compatible_external_backing_store != NULL) { @@ -318,7 +318,7 @@ grpc_mdelem grpc_mdelem_create( shard->count++; if (shard->count > shard->capacity * 2) { - rehash_mdtab(exec_ctx, shard); + rehash_mdtab(shard); } gpr_mu_unlock(&shard->mu); @@ -328,22 +328,20 @@ grpc_mdelem grpc_mdelem_create( return GRPC_MAKE_MDELEM(md, GRPC_MDELEM_STORAGE_INTERNED); } -grpc_mdelem grpc_mdelem_from_slices(grpc_exec_ctx *exec_ctx, grpc_slice key, - grpc_slice value) { - grpc_mdelem out = grpc_mdelem_create(exec_ctx, key, value, NULL); - grpc_slice_unref_internal(exec_ctx, key); - grpc_slice_unref_internal(exec_ctx, value); +grpc_mdelem grpc_mdelem_from_slices(grpc_slice key, grpc_slice value) { + grpc_mdelem out = grpc_mdelem_create(key, value, NULL); + grpc_slice_unref_internal(key); + grpc_slice_unref_internal(value); return out; } -grpc_mdelem grpc_mdelem_from_grpc_metadata(grpc_exec_ctx *exec_ctx, - grpc_metadata *metadata) { +grpc_mdelem grpc_mdelem_from_grpc_metadata(grpc_metadata *metadata) { bool changed = false; grpc_slice key_slice = grpc_slice_maybe_static_intern(metadata->key, &changed); grpc_slice value_slice = grpc_slice_maybe_static_intern(metadata->value, &changed); - return grpc_mdelem_create(exec_ctx, key_slice, value_slice, + return grpc_mdelem_create(key_slice, value_slice, changed ? NULL : (grpc_mdelem_data *)metadata); } @@ -414,7 +412,7 @@ grpc_mdelem grpc_mdelem_ref(grpc_mdelem gmd DEBUG_ARGS) { return gmd; } -void grpc_mdelem_unref(grpc_exec_ctx *exec_ctx, grpc_mdelem gmd DEBUG_ARGS) { +void grpc_mdelem_unref(grpc_mdelem gmd DEBUG_ARGS) { switch (GRPC_MDELEM_STORAGE(gmd)) { case GRPC_MDELEM_STORAGE_EXTERNAL: case GRPC_MDELEM_STORAGE_STATIC: @@ -462,8 +460,8 @@ void grpc_mdelem_unref(grpc_exec_ctx *exec_ctx, grpc_mdelem gmd DEBUG_ARGS) { const gpr_atm prev_refcount = gpr_atm_full_fetch_add(&md->refcnt, -1); GPR_ASSERT(prev_refcount >= 1); if (1 == prev_refcount) { - grpc_slice_unref_internal(exec_ctx, md->key); - grpc_slice_unref_internal(exec_ctx, md->value); + grpc_slice_unref_internal(md->key); + grpc_slice_unref_internal(md->value); gpr_free(md); } break; diff --git a/src/core/lib/transport/metadata.h b/src/core/lib/transport/metadata.h index 9f82225dc39..d0465d7215a 100644 --- a/src/core/lib/transport/metadata.h +++ b/src/core/lib/transport/metadata.h @@ -114,20 +114,18 @@ struct grpc_mdelem { (uintptr_t)GRPC_MDELEM_STORAGE_INTERNED_BIT)) /* Unrefs the slices. */ -grpc_mdelem grpc_mdelem_from_slices(grpc_exec_ctx *exec_ctx, grpc_slice key, - grpc_slice value); +grpc_mdelem grpc_mdelem_from_slices(grpc_slice key, grpc_slice value); /* Cheaply convert a grpc_metadata to a grpc_mdelem; may use the grpc_metadata object as backing storage (so lifetimes should align) */ -grpc_mdelem grpc_mdelem_from_grpc_metadata(grpc_exec_ctx *exec_ctx, - grpc_metadata *metadata); +grpc_mdelem grpc_mdelem_from_grpc_metadata(grpc_metadata *metadata); /* Does not unref the slices; if a new non-interned mdelem is needed, allocates one if compatible_external_backing_store is NULL, or uses compatible_external_backing_store if it is non-NULL (in which case it's the users responsibility to ensure that it outlives usage) */ grpc_mdelem grpc_mdelem_create( - grpc_exec_ctx *exec_ctx, grpc_slice key, grpc_slice value, + grpc_slice key, grpc_slice value, grpc_mdelem_data *compatible_external_backing_store); bool grpc_mdelem_eq(grpc_mdelem a, grpc_mdelem b); @@ -143,16 +141,14 @@ void *grpc_mdelem_set_user_data(grpc_mdelem md, void (*destroy_func)(void *), #ifndef NDEBUG #define GRPC_MDELEM_REF(s) grpc_mdelem_ref((s), __FILE__, __LINE__) -#define GRPC_MDELEM_UNREF(exec_ctx, s) \ - grpc_mdelem_unref((exec_ctx), (s), __FILE__, __LINE__) +#define GRPC_MDELEM_UNREF(s) grpc_mdelem_unref((s), __FILE__, __LINE__) grpc_mdelem grpc_mdelem_ref(grpc_mdelem md, const char *file, int line); -void grpc_mdelem_unref(grpc_exec_ctx *exec_ctx, grpc_mdelem md, - const char *file, int line); +void grpc_mdelem_unref(grpc_mdelem md, const char *file, int line); #else #define GRPC_MDELEM_REF(s) grpc_mdelem_ref((s)) -#define GRPC_MDELEM_UNREF(exec_ctx, s) grpc_mdelem_unref((exec_ctx), (s)) +#define GRPC_MDELEM_UNREF(s) grpc_mdelem_unref((s)) grpc_mdelem grpc_mdelem_ref(grpc_mdelem md); -void grpc_mdelem_unref(grpc_exec_ctx *exec_ctx, grpc_mdelem md); +void grpc_mdelem_unref(grpc_mdelem md); #endif #define GRPC_MDKEY(md) (GRPC_MDELEM_DATA(md)->key) @@ -169,7 +165,7 @@ void grpc_mdelem_unref(grpc_exec_ctx *exec_ctx, grpc_mdelem md); #define GRPC_MDSTR_KV_HASH(k_hash, v_hash) (GPR_ROTL((k_hash), 2) ^ (v_hash)) void grpc_mdctx_global_init(void); -void grpc_mdctx_global_shutdown(grpc_exec_ctx *exec_ctx); +void grpc_mdctx_global_shutdown(); #ifdef __cplusplus } diff --git a/src/core/lib/transport/metadata_batch.cc b/src/core/lib/transport/metadata_batch.cc index 2df9c9189cf..075a03c0f96 100644 --- a/src/core/lib/transport/metadata_batch.cc +++ b/src/core/lib/transport/metadata_batch.cc @@ -51,8 +51,7 @@ static void assert_valid_list(grpc_mdelem_list *list) { #endif /* NDEBUG */ } -static void assert_valid_callouts(grpc_exec_ctx *exec_ctx, - grpc_metadata_batch *batch) { +static void assert_valid_callouts(grpc_metadata_batch *batch) { #ifndef NDEBUG for (grpc_linked_mdelem *l = batch->list.head; l != NULL; l = l->next) { grpc_slice key_interned = grpc_slice_intern(GRPC_MDKEY(l->md)); @@ -61,7 +60,7 @@ static void assert_valid_callouts(grpc_exec_ctx *exec_ctx, if (callout_idx != GRPC_BATCH_CALLOUTS_COUNT) { GPR_ASSERT(batch->idx.array[callout_idx] == l); } - grpc_slice_unref_internal(exec_ctx, key_interned); + grpc_slice_unref_internal(key_interned); } #endif } @@ -77,11 +76,10 @@ void grpc_metadata_batch_init(grpc_metadata_batch *batch) { batch->deadline = GRPC_MILLIS_INF_FUTURE; } -void grpc_metadata_batch_destroy(grpc_exec_ctx *exec_ctx, - grpc_metadata_batch *batch) { +void grpc_metadata_batch_destroy(grpc_metadata_batch *batch) { grpc_linked_mdelem *l; for (l = batch->list.head; l; l = l->next) { - GRPC_MDELEM_UNREF(exec_ctx, l->md); + GRPC_MDELEM_UNREF(l->md); } } @@ -126,13 +124,12 @@ static void maybe_unlink_callout(grpc_metadata_batch *batch, batch->idx.array[idx] = NULL; } -grpc_error *grpc_metadata_batch_add_head(grpc_exec_ctx *exec_ctx, - grpc_metadata_batch *batch, +grpc_error *grpc_metadata_batch_add_head(grpc_metadata_batch *batch, grpc_linked_mdelem *storage, grpc_mdelem elem_to_add) { GPR_ASSERT(!GRPC_MDISNULL(elem_to_add)); storage->md = elem_to_add; - return grpc_metadata_batch_link_head(exec_ctx, batch, storage); + return grpc_metadata_batch_link_head(batch, storage); } static void link_head(grpc_mdelem_list *list, grpc_linked_mdelem *storage) { @@ -150,27 +147,25 @@ static void link_head(grpc_mdelem_list *list, grpc_linked_mdelem *storage) { assert_valid_list(list); } -grpc_error *grpc_metadata_batch_link_head(grpc_exec_ctx *exec_ctx, - grpc_metadata_batch *batch, +grpc_error *grpc_metadata_batch_link_head(grpc_metadata_batch *batch, grpc_linked_mdelem *storage) { - assert_valid_callouts(exec_ctx, batch); + assert_valid_callouts(batch); grpc_error *err = maybe_link_callout(batch, storage); if (err != GRPC_ERROR_NONE) { - assert_valid_callouts(exec_ctx, batch); + assert_valid_callouts(batch); return err; } link_head(&batch->list, storage); - assert_valid_callouts(exec_ctx, batch); + assert_valid_callouts(batch); return GRPC_ERROR_NONE; } -grpc_error *grpc_metadata_batch_add_tail(grpc_exec_ctx *exec_ctx, - grpc_metadata_batch *batch, +grpc_error *grpc_metadata_batch_add_tail(grpc_metadata_batch *batch, grpc_linked_mdelem *storage, grpc_mdelem elem_to_add) { GPR_ASSERT(!GRPC_MDISNULL(elem_to_add)); storage->md = elem_to_add; - return grpc_metadata_batch_link_tail(exec_ctx, batch, storage); + return grpc_metadata_batch_link_tail(batch, storage); } static void link_tail(grpc_mdelem_list *list, grpc_linked_mdelem *storage) { @@ -189,17 +184,16 @@ static void link_tail(grpc_mdelem_list *list, grpc_linked_mdelem *storage) { assert_valid_list(list); } -grpc_error *grpc_metadata_batch_link_tail(grpc_exec_ctx *exec_ctx, - grpc_metadata_batch *batch, +grpc_error *grpc_metadata_batch_link_tail(grpc_metadata_batch *batch, grpc_linked_mdelem *storage) { - assert_valid_callouts(exec_ctx, batch); + assert_valid_callouts(batch); grpc_error *err = maybe_link_callout(batch, storage); if (err != GRPC_ERROR_NONE) { - assert_valid_callouts(exec_ctx, batch); + assert_valid_callouts(batch); return err; } link_tail(&batch->list, storage); - assert_valid_callouts(exec_ctx, batch); + assert_valid_callouts(batch); return GRPC_ERROR_NONE; } @@ -220,31 +214,28 @@ static void unlink_storage(grpc_mdelem_list *list, assert_valid_list(list); } -void grpc_metadata_batch_remove(grpc_exec_ctx *exec_ctx, - grpc_metadata_batch *batch, +void grpc_metadata_batch_remove(grpc_metadata_batch *batch, grpc_linked_mdelem *storage) { - assert_valid_callouts(exec_ctx, batch); + assert_valid_callouts(batch); maybe_unlink_callout(batch, storage); unlink_storage(&batch->list, storage); - GRPC_MDELEM_UNREF(exec_ctx, storage->md); - assert_valid_callouts(exec_ctx, batch); + GRPC_MDELEM_UNREF(storage->md); + assert_valid_callouts(batch); } -void grpc_metadata_batch_set_value(grpc_exec_ctx *exec_ctx, - grpc_linked_mdelem *storage, +void grpc_metadata_batch_set_value(grpc_linked_mdelem *storage, grpc_slice value) { grpc_mdelem old_mdelem = storage->md; grpc_mdelem new_mdelem = grpc_mdelem_from_slices( - exec_ctx, grpc_slice_ref_internal(GRPC_MDKEY(old_mdelem)), value); + grpc_slice_ref_internal(GRPC_MDKEY(old_mdelem)), value); storage->md = new_mdelem; - GRPC_MDELEM_UNREF(exec_ctx, old_mdelem); + GRPC_MDELEM_UNREF(old_mdelem); } -grpc_error *grpc_metadata_batch_substitute(grpc_exec_ctx *exec_ctx, - grpc_metadata_batch *batch, +grpc_error *grpc_metadata_batch_substitute(grpc_metadata_batch *batch, grpc_linked_mdelem *storage, grpc_mdelem new_mdelem) { - assert_valid_callouts(exec_ctx, batch); + assert_valid_callouts(batch); grpc_error *error = GRPC_ERROR_NONE; grpc_mdelem old_mdelem = storage->md; if (!grpc_slice_eq(GRPC_MDKEY(new_mdelem), GRPC_MDKEY(old_mdelem))) { @@ -253,19 +244,18 @@ grpc_error *grpc_metadata_batch_substitute(grpc_exec_ctx *exec_ctx, error = maybe_link_callout(batch, storage); if (error != GRPC_ERROR_NONE) { unlink_storage(&batch->list, storage); - GRPC_MDELEM_UNREF(exec_ctx, storage->md); + GRPC_MDELEM_UNREF(storage->md); } } else { storage->md = new_mdelem; } - GRPC_MDELEM_UNREF(exec_ctx, old_mdelem); - assert_valid_callouts(exec_ctx, batch); + GRPC_MDELEM_UNREF(old_mdelem); + assert_valid_callouts(batch); return error; } -void grpc_metadata_batch_clear(grpc_exec_ctx *exec_ctx, - grpc_metadata_batch *batch) { - grpc_metadata_batch_destroy(exec_ctx, batch); +void grpc_metadata_batch_clear(grpc_metadata_batch *batch) { + grpc_metadata_batch_destroy(batch); grpc_metadata_batch_init(batch); } @@ -291,8 +281,7 @@ static void add_error(grpc_error **composite, grpc_error *error, *composite = grpc_error_add_child(*composite, error); } -grpc_error *grpc_metadata_batch_filter(grpc_exec_ctx *exec_ctx, - grpc_metadata_batch *batch, +grpc_error *grpc_metadata_batch_filter(grpc_metadata_batch *batch, grpc_metadata_batch_filter_func func, void *user_data, const char *composite_error_string) { @@ -300,12 +289,12 @@ grpc_error *grpc_metadata_batch_filter(grpc_exec_ctx *exec_ctx, grpc_error *error = GRPC_ERROR_NONE; while (l) { grpc_linked_mdelem *next = l->next; - grpc_filtered_mdelem new_mdelem = func(exec_ctx, user_data, l->md); + grpc_filtered_mdelem new_mdelem = func(user_data, l->md); add_error(&error, new_mdelem.error, composite_error_string); if (GRPC_MDISNULL(new_mdelem.md)) { - grpc_metadata_batch_remove(exec_ctx, batch, l); + grpc_metadata_batch_remove(batch, l); } else if (new_mdelem.md.payload != l->md.payload) { - grpc_metadata_batch_substitute(exec_ctx, batch, l, new_mdelem.md); + grpc_metadata_batch_substitute(batch, l, new_mdelem.md); } l = next; } diff --git a/src/core/lib/transport/metadata_batch.h b/src/core/lib/transport/metadata_batch.h index a2b4b92385b..0e6ef210914 100644 --- a/src/core/lib/transport/metadata_batch.h +++ b/src/core/lib/transport/metadata_batch.h @@ -57,28 +57,23 @@ typedef struct grpc_metadata_batch { } grpc_metadata_batch; void grpc_metadata_batch_init(grpc_metadata_batch *batch); -void grpc_metadata_batch_destroy(grpc_exec_ctx *exec_ctx, - grpc_metadata_batch *batch); -void grpc_metadata_batch_clear(grpc_exec_ctx *exec_ctx, - grpc_metadata_batch *batch); +void grpc_metadata_batch_destroy(grpc_metadata_batch *batch); +void grpc_metadata_batch_clear(grpc_metadata_batch *batch); bool grpc_metadata_batch_is_empty(grpc_metadata_batch *batch); /* Returns the transport size of the batch. */ size_t grpc_metadata_batch_size(grpc_metadata_batch *batch); /** Remove \a storage from the batch, unreffing the mdelem contained */ -void grpc_metadata_batch_remove(grpc_exec_ctx *exec_ctx, - grpc_metadata_batch *batch, +void grpc_metadata_batch_remove(grpc_metadata_batch *batch, grpc_linked_mdelem *storage); /** Substitute a new mdelem for an old value */ -grpc_error *grpc_metadata_batch_substitute(grpc_exec_ctx *exec_ctx, - grpc_metadata_batch *batch, +grpc_error *grpc_metadata_batch_substitute(grpc_metadata_batch *batch, grpc_linked_mdelem *storage, grpc_mdelem new_value); -void grpc_metadata_batch_set_value(grpc_exec_ctx *exec_ctx, - grpc_linked_mdelem *storage, +void grpc_metadata_batch_set_value(grpc_linked_mdelem *storage, grpc_slice value); /** Add \a storage to the beginning of \a batch. storage->md is @@ -86,17 +81,17 @@ void grpc_metadata_batch_set_value(grpc_exec_ctx *exec_ctx, \a storage is owned by the caller and must survive for the lifetime of batch. This usually means it should be around for the lifetime of the call. */ -grpc_error *grpc_metadata_batch_link_head( - grpc_exec_ctx *exec_ctx, grpc_metadata_batch *batch, - grpc_linked_mdelem *storage) GRPC_MUST_USE_RESULT; +grpc_error *grpc_metadata_batch_link_head(grpc_metadata_batch *batch, + grpc_linked_mdelem *storage) + GRPC_MUST_USE_RESULT; /** Add \a storage to the end of \a batch. storage->md is assumed to be valid. \a storage is owned by the caller and must survive for the lifetime of batch. This usually means it should be around for the lifetime of the call. */ -grpc_error *grpc_metadata_batch_link_tail( - grpc_exec_ctx *exec_ctx, grpc_metadata_batch *batch, - grpc_linked_mdelem *storage) GRPC_MUST_USE_RESULT; +grpc_error *grpc_metadata_batch_link_tail(grpc_metadata_batch *batch, + grpc_linked_mdelem *storage) + GRPC_MUST_USE_RESULT; /** Add \a elem_to_add as the first element in \a batch, using \a storage as backing storage for the linked list element. @@ -105,8 +100,8 @@ grpc_error *grpc_metadata_batch_link_tail( for the lifetime of the call. Takes ownership of \a elem_to_add */ grpc_error *grpc_metadata_batch_add_head( - grpc_exec_ctx *exec_ctx, grpc_metadata_batch *batch, - grpc_linked_mdelem *storage, grpc_mdelem elem_to_add) GRPC_MUST_USE_RESULT; + grpc_metadata_batch *batch, grpc_linked_mdelem *storage, + grpc_mdelem elem_to_add) GRPC_MUST_USE_RESULT; /** Add \a elem_to_add as the last element in \a batch, using \a storage as backing storage for the linked list element. \a storage is owned by the caller and must survive for the @@ -114,8 +109,8 @@ grpc_error *grpc_metadata_batch_add_head( for the lifetime of the call. Takes ownership of \a elem_to_add */ grpc_error *grpc_metadata_batch_add_tail( - grpc_exec_ctx *exec_ctx, grpc_metadata_batch *batch, - grpc_linked_mdelem *storage, grpc_mdelem elem_to_add) GRPC_MUST_USE_RESULT; + grpc_metadata_batch *batch, grpc_linked_mdelem *storage, + grpc_mdelem elem_to_add) GRPC_MUST_USE_RESULT; grpc_error *grpc_attach_md_to_error(grpc_error *src, grpc_mdelem md); @@ -132,11 +127,10 @@ typedef struct { { GRPC_ERROR_NONE, GRPC_MDNULL } typedef grpc_filtered_mdelem (*grpc_metadata_batch_filter_func)( - grpc_exec_ctx *exec_ctx, void *user_data, grpc_mdelem elem); + void *user_data, grpc_mdelem elem); grpc_error *grpc_metadata_batch_filter( - grpc_exec_ctx *exec_ctx, grpc_metadata_batch *batch, - grpc_metadata_batch_filter_func func, void *user_data, - const char *composite_error_string) GRPC_MUST_USE_RESULT; + grpc_metadata_batch *batch, grpc_metadata_batch_filter_func func, + void *user_data, const char *composite_error_string) GRPC_MUST_USE_RESULT; #ifndef NDEBUG void grpc_metadata_batch_assert_ok(grpc_metadata_batch *comd); diff --git a/src/core/lib/transport/service_config.cc b/src/core/lib/transport/service_config.cc index 070a13a2b46..7aa4873d371 100644 --- a/src/core/lib/transport/service_config.cc +++ b/src/core/lib/transport/service_config.cc @@ -146,8 +146,7 @@ static char* parse_json_method_name(grpc_json* json) { // each name found, incrementing \a idx for each entry added. // Returns false on error. static bool parse_json_method_config( - grpc_exec_ctx* exec_ctx, grpc_json* json, - void* (*create_value)(const grpc_json* method_config_json), + grpc_json* json, void* (*create_value)(const grpc_json* method_config_json), grpc_slice_hash_table_entry* entries, size_t* idx) { // Construct value. void* method_config = create_value(json); @@ -180,9 +179,9 @@ done: } grpc_slice_hash_table* grpc_service_config_create_method_config_table( - grpc_exec_ctx* exec_ctx, const grpc_service_config* service_config, + const grpc_service_config* service_config, void* (*create_value)(const grpc_json* method_config_json), - void (*destroy_value)(grpc_exec_ctx* exec_ctx, void* value)) { + void (*destroy_value)(void* value)) { const grpc_json* json = service_config->json_tree; // Traverse parsed JSON tree. if (json->type != GRPC_JSON_OBJECT || json->key != NULL) return NULL; @@ -204,8 +203,7 @@ grpc_slice_hash_table* grpc_service_config_create_method_config_table( size_t idx = 0; for (grpc_json* method = field->child; method != NULL; method = method->next) { - if (!parse_json_method_config(exec_ctx, method, create_value, entries, - &idx)) { + if (!parse_json_method_config(method, create_value, entries, &idx)) { return NULL; } } @@ -222,8 +220,7 @@ grpc_slice_hash_table* grpc_service_config_create_method_config_table( return method_config_table; } -void* grpc_method_config_table_get(grpc_exec_ctx* exec_ctx, - const grpc_slice_hash_table* table, +void* grpc_method_config_table_get(const grpc_slice_hash_table* table, grpc_slice path) { void* value = grpc_slice_hash_table_get(table, path); // If we didn't find a match for the path, try looking for a wildcard @@ -239,7 +236,7 @@ void* grpc_method_config_table_get(grpc_exec_ctx* exec_ctx, grpc_slice wildcard_path = grpc_slice_from_copied_string(buf); gpr_free(buf); value = grpc_slice_hash_table_get(table, wildcard_path); - grpc_slice_unref_internal(exec_ctx, wildcard_path); + grpc_slice_unref_internal(wildcard_path); gpr_free(path_str); } return value; diff --git a/src/core/lib/transport/service_config.h b/src/core/lib/transport/service_config.h index 9c430936274..6395a368f27 100644 --- a/src/core/lib/transport/service_config.h +++ b/src/core/lib/transport/service_config.h @@ -49,9 +49,9 @@ const char* grpc_service_config_get_lb_policy_name( /// \a destroy_value is used to clean up values. /// Returns NULL on error. grpc_slice_hash_table* grpc_service_config_create_method_config_table( - grpc_exec_ctx* exec_ctx, const grpc_service_config* service_config, + const grpc_service_config* service_config, void* (*create_value)(const grpc_json* method_config_json), - void (*destroy_value)(grpc_exec_ctx* exec_ctx, void* value)); + void (*destroy_value)(void* value)); /// A helper function for looking up values in the table returned by /// \a grpc_service_config_create_method_config_table(). @@ -59,8 +59,7 @@ grpc_slice_hash_table* grpc_service_config_create_method_config_table( /// the form "/service/method". /// Returns NULL if the method has no config. /// Caller does NOT own a reference to the result. -void* grpc_method_config_table_get(grpc_exec_ctx* exec_ctx, - const grpc_slice_hash_table* table, +void* grpc_method_config_table_get(const grpc_slice_hash_table* table, grpc_slice path); #ifdef __cplusplus diff --git a/src/core/lib/transport/static_metadata.cc b/src/core/lib/transport/static_metadata.cc index 472cf888eab..e6c8d290f23 100644 --- a/src/core/lib/transport/static_metadata.cc +++ b/src/core/lib/transport/static_metadata.cc @@ -104,7 +104,7 @@ static uint8_t g_bytes[] = { 101, 44, 103, 122, 105, 112}; static void static_ref(void *unused) {} -static void static_unref(grpc_exec_ctx *exec_ctx, void *unused) {} +static void static_unref(void *unused) {} static const grpc_slice_refcount_vtable static_sub_vtable = { static_ref, static_unref, grpc_slice_default_eq_impl, grpc_slice_default_hash_impl}; diff --git a/src/core/lib/transport/status_conversion.cc b/src/core/lib/transport/status_conversion.cc index 891c4427d7c..fd7764f2dba 100644 --- a/src/core/lib/transport/status_conversion.cc +++ b/src/core/lib/transport/status_conversion.cc @@ -37,8 +37,7 @@ grpc_http2_error_code grpc_status_to_http2_error(grpc_status_code status) { } } -grpc_status_code grpc_http2_error_to_grpc_status(grpc_exec_ctx *exec_ctx, - grpc_http2_error_code error, +grpc_status_code grpc_http2_error_to_grpc_status(grpc_http2_error_code error, grpc_millis deadline) { switch (error) { case GRPC_HTTP2_NO_ERROR: @@ -47,9 +46,8 @@ grpc_status_code grpc_http2_error_to_grpc_status(grpc_exec_ctx *exec_ctx, case GRPC_HTTP2_CANCEL: /* http2 cancel translates to STATUS_CANCELLED iff deadline hasn't been * exceeded */ - return grpc_exec_ctx_now(exec_ctx) > deadline - ? GRPC_STATUS_DEADLINE_EXCEEDED - : GRPC_STATUS_CANCELLED; + return grpc_exec_ctx_now() > deadline ? GRPC_STATUS_DEADLINE_EXCEEDED + : GRPC_STATUS_CANCELLED; case GRPC_HTTP2_ENHANCE_YOUR_CALM: return GRPC_STATUS_RESOURCE_EXHAUSTED; case GRPC_HTTP2_INADEQUATE_SECURITY: diff --git a/src/core/lib/transport/status_conversion.h b/src/core/lib/transport/status_conversion.h index 8ef91aecfea..c89a3e992ff 100644 --- a/src/core/lib/transport/status_conversion.h +++ b/src/core/lib/transport/status_conversion.h @@ -29,8 +29,7 @@ extern "C" { /* Conversion of grpc status codes to http2 error codes (for RST_STREAM) */ grpc_http2_error_code grpc_status_to_http2_error(grpc_status_code status); -grpc_status_code grpc_http2_error_to_grpc_status(grpc_exec_ctx *exec_ctx, - grpc_http2_error_code error, +grpc_status_code grpc_http2_error_to_grpc_status(grpc_http2_error_code error, grpc_millis deadline); /* Conversion of HTTP status codes (:status) to grpc status codes */ diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc index ab4f938e7b4..2afc7ba7b53 100644 --- a/src/core/lib/transport/transport.cc +++ b/src/core/lib/transport/transport.cc @@ -51,8 +51,7 @@ void grpc_stream_ref(grpc_stream_refcount *refcount) { } #ifndef NDEBUG -void grpc_stream_unref(grpc_exec_ctx *exec_ctx, grpc_stream_refcount *refcount, - const char *reason) { +void grpc_stream_unref(grpc_stream_refcount *refcount, const char *reason) { if (GRPC_TRACER_ON(grpc_trace_stream_refcount)) { gpr_atm val = gpr_atm_no_barrier_load(&refcount->refs.count); gpr_log(GPR_DEBUG, "%s %p:%p UNREF %" PRIdPTR "->%" PRIdPTR " %s", @@ -60,8 +59,7 @@ void grpc_stream_unref(grpc_exec_ctx *exec_ctx, grpc_stream_refcount *refcount, val - 1, reason); } #else -void grpc_stream_unref(grpc_exec_ctx *exec_ctx, - grpc_stream_refcount *refcount) { +void grpc_stream_unref(grpc_stream_refcount *refcount) { #endif if (gpr_unref(&refcount->refs)) { if (exec_ctx->flags & GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP) { @@ -75,7 +73,7 @@ void grpc_stream_unref(grpc_exec_ctx *exec_ctx, refcount->destroy.scheduler = grpc_executor_scheduler(GRPC_EXECUTOR_SHORT); } - GRPC_CLOSURE_SCHED(exec_ctx, &refcount->destroy, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&refcount->destroy, GRPC_ERROR_NONE); } } @@ -91,11 +89,11 @@ static void slice_stream_ref(void *p) { #endif } -static void slice_stream_unref(grpc_exec_ctx *exec_ctx, void *p) { +static void slice_stream_unref(void *p) { #ifndef NDEBUG - grpc_stream_unref(exec_ctx, STREAM_REF_FROM_SLICE_REF(p), "slice"); + grpc_stream_unref(STREAM_REF_FROM_SLICE_REF(p), "slice"); #else - grpc_stream_unref(exec_ctx, STREAM_REF_FROM_SLICE_REF(p)); + grpc_stream_unref(STREAM_REF_FROM_SLICE_REF(p)); #endif } @@ -153,58 +151,49 @@ size_t grpc_transport_stream_size(grpc_transport *transport) { return transport->vtable->sizeof_stream; } -void grpc_transport_destroy(grpc_exec_ctx *exec_ctx, - grpc_transport *transport) { - transport->vtable->destroy(exec_ctx, transport); +void grpc_transport_destroy(grpc_transport *transport) { + transport->vtable->destroy(transport); } -int grpc_transport_init_stream(grpc_exec_ctx *exec_ctx, - grpc_transport *transport, grpc_stream *stream, +int grpc_transport_init_stream(grpc_transport *transport, grpc_stream *stream, grpc_stream_refcount *refcount, const void *server_data, gpr_arena *arena) { - return transport->vtable->init_stream(exec_ctx, transport, stream, refcount, + return transport->vtable->init_stream(transport, stream, refcount, server_data, arena); } -void grpc_transport_perform_stream_op(grpc_exec_ctx *exec_ctx, - grpc_transport *transport, +void grpc_transport_perform_stream_op(grpc_transport *transport, grpc_stream *stream, grpc_transport_stream_op_batch *op) { - transport->vtable->perform_stream_op(exec_ctx, transport, stream, op); + transport->vtable->perform_stream_op(transport, stream, op); } -void grpc_transport_perform_op(grpc_exec_ctx *exec_ctx, - grpc_transport *transport, +void grpc_transport_perform_op(grpc_transport *transport, grpc_transport_op *op) { - transport->vtable->perform_op(exec_ctx, transport, op); + transport->vtable->perform_op(transport, op); } -void grpc_transport_set_pops(grpc_exec_ctx *exec_ctx, grpc_transport *transport, - grpc_stream *stream, +void grpc_transport_set_pops(grpc_transport *transport, grpc_stream *stream, grpc_polling_entity *pollent) { grpc_pollset *pollset; grpc_pollset_set *pollset_set; if ((pollset = grpc_polling_entity_pollset(pollent)) != NULL) { - transport->vtable->set_pollset(exec_ctx, transport, stream, pollset); + transport->vtable->set_pollset(transport, stream, pollset); } else if ((pollset_set = grpc_polling_entity_pollset_set(pollent)) != NULL) { - transport->vtable->set_pollset_set(exec_ctx, transport, stream, - pollset_set); + transport->vtable->set_pollset_set(transport, stream, pollset_set); } else { abort(); } } -void grpc_transport_destroy_stream(grpc_exec_ctx *exec_ctx, - grpc_transport *transport, +void grpc_transport_destroy_stream(grpc_transport *transport, grpc_stream *stream, grpc_closure *then_schedule_closure) { - transport->vtable->destroy_stream(exec_ctx, transport, stream, - then_schedule_closure); + transport->vtable->destroy_stream(transport, stream, then_schedule_closure); } -grpc_endpoint *grpc_transport_get_endpoint(grpc_exec_ctx *exec_ctx, - grpc_transport *transport) { - return transport->vtable->get_endpoint(exec_ctx, transport); +grpc_endpoint *grpc_transport_get_endpoint(grpc_transport *transport) { + return transport->vtable->get_endpoint(transport); } // This comment should be sung to the tune of @@ -215,25 +204,23 @@ grpc_endpoint *grpc_transport_get_endpoint(grpc_exec_ctx *exec_ctx, // though it lives in lib, it handles transport stream ops sure // it's grpc_transport_stream_op_batch_finish_with_failure void grpc_transport_stream_op_batch_finish_with_failure( - grpc_exec_ctx *exec_ctx, grpc_transport_stream_op_batch *batch, - grpc_error *error, grpc_call_combiner *call_combiner) { + grpc_transport_stream_op_batch *batch, grpc_error *error, + grpc_call_combiner *call_combiner) { if (batch->send_message) { - grpc_byte_stream_destroy(exec_ctx, - batch->payload->send_message.send_message); + grpc_byte_stream_destroy(batch->payload->send_message.send_message); } if (batch->recv_message) { - GRPC_CALL_COMBINER_START(exec_ctx, call_combiner, - batch->payload->recv_message.recv_message_ready, - GRPC_ERROR_REF(error), - "failing recv_message_ready"); + GRPC_CALL_COMBINER_START( + call_combiner, batch->payload->recv_message.recv_message_ready, + GRPC_ERROR_REF(error), "failing recv_message_ready"); } if (batch->recv_initial_metadata) { GRPC_CALL_COMBINER_START( - exec_ctx, call_combiner, + call_combiner, batch->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_REF(error), "failing recv_initial_metadata_ready"); } - GRPC_CLOSURE_SCHED(exec_ctx, batch->on_complete, error); + GRPC_CLOSURE_SCHED(batch->on_complete, error); if (batch->cancel_stream) { GRPC_ERROR_UNREF(batch->payload->cancel_stream.cancel_error); } @@ -245,10 +232,9 @@ typedef struct { grpc_transport_op op; } made_transport_op; -static void destroy_made_transport_op(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void destroy_made_transport_op(void *arg, grpc_error *error) { made_transport_op *op = (made_transport_op *)arg; - GRPC_CLOSURE_SCHED(exec_ctx, op->inner_on_complete, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(op->inner_on_complete, GRPC_ERROR_REF(error)); gpr_free(op); } @@ -269,12 +255,11 @@ typedef struct { grpc_transport_stream_op_batch_payload payload; } made_transport_stream_op; -static void destroy_made_transport_stream_op(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void destroy_made_transport_stream_op(void *arg, grpc_error *error) { made_transport_stream_op *op = (made_transport_stream_op *)arg; grpc_closure *c = op->inner_on_complete; gpr_free(op); - GRPC_CLOSURE_RUN(exec_ctx, c, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(c, GRPC_ERROR_REF(error)); } grpc_transport_stream_op_batch *grpc_make_transport_stream_op( diff --git a/src/core/lib/transport/transport.h b/src/core/lib/transport/transport.h index fbf5dcb8b59..db61f710f74 100644 --- a/src/core/lib/transport/transport.h +++ b/src/core/lib/transport/transport.h @@ -61,15 +61,14 @@ void grpc_stream_ref_init(grpc_stream_refcount *refcount, int initial_refs, grpc_iomgr_cb_func cb, void *cb_arg, const char *object_type); void grpc_stream_ref(grpc_stream_refcount *refcount, const char *reason); -void grpc_stream_unref(grpc_exec_ctx *exec_ctx, grpc_stream_refcount *refcount, - const char *reason); +void grpc_stream_unref(grpc_stream_refcount *refcount, const char *reason); #define GRPC_STREAM_REF_INIT(rc, ir, cb, cb_arg, objtype) \ grpc_stream_ref_init(rc, ir, cb, cb_arg, objtype) #else void grpc_stream_ref_init(grpc_stream_refcount *refcount, int initial_refs, grpc_iomgr_cb_func cb, void *cb_arg); void grpc_stream_ref(grpc_stream_refcount *refcount); -void grpc_stream_unref(grpc_exec_ctx *exec_ctx, grpc_stream_refcount *refcount); +void grpc_stream_unref(grpc_stream_refcount *refcount); #define GRPC_STREAM_REF_INIT(rc, ir, cb, cb_arg, objtype) \ grpc_stream_ref_init(rc, ir, cb, cb_arg) #endif @@ -243,8 +242,7 @@ typedef struct grpc_transport_op { If true, the callback is set to set_accept_stream_fn, with its user_data argument set to set_accept_stream_user_data */ bool set_accept_stream; - void (*set_accept_stream_fn)(grpc_exec_ctx *exec_ctx, void *user_data, - grpc_transport *transport, + void (*set_accept_stream_fn)(void *user_data, grpc_transport *transport, const void *server_data); void *set_accept_stream_user_data; /** add this transport to a pollset */ @@ -275,13 +273,12 @@ size_t grpc_transport_stream_size(grpc_transport *transport); stream - a pointer to uninitialized memory to initialize server_data - either NULL for a client initiated stream, or a pointer supplied from the accept_stream callback function */ -int grpc_transport_init_stream(grpc_exec_ctx *exec_ctx, - grpc_transport *transport, grpc_stream *stream, +int grpc_transport_init_stream(grpc_transport *transport, grpc_stream *stream, grpc_stream_refcount *refcount, const void *server_data, gpr_arena *arena); -void grpc_transport_set_pops(grpc_exec_ctx *exec_ctx, grpc_transport *transport, - grpc_stream *stream, grpc_polling_entity *pollent); +void grpc_transport_set_pops(grpc_transport *transport, grpc_stream *stream, + grpc_polling_entity *pollent); /* Destroy transport data for a stream. @@ -293,14 +290,13 @@ void grpc_transport_set_pops(grpc_exec_ctx *exec_ctx, grpc_transport *transport, transport - the transport on which to create this stream stream - the grpc_stream to destroy (memory is still owned by the caller, but any child memory must be cleaned up) */ -void grpc_transport_destroy_stream(grpc_exec_ctx *exec_ctx, - grpc_transport *transport, +void grpc_transport_destroy_stream(grpc_transport *transport, grpc_stream *stream, grpc_closure *then_schedule_closure); void grpc_transport_stream_op_batch_finish_with_failure( - grpc_exec_ctx *exec_ctx, grpc_transport_stream_op_batch *op, - grpc_error *error, grpc_call_combiner *call_combiner); + grpc_transport_stream_op_batch *op, grpc_error *error, + grpc_call_combiner *call_combiner); char *grpc_transport_stream_op_batch_string(grpc_transport_stream_op_batch *op); char *grpc_transport_op_string(grpc_transport_op *op); @@ -315,13 +311,11 @@ char *grpc_transport_op_string(grpc_transport_op *op); non-NULL and previously initialized by the same transport. op - a grpc_transport_stream_op_batch specifying the op to perform */ -void grpc_transport_perform_stream_op(grpc_exec_ctx *exec_ctx, - grpc_transport *transport, +void grpc_transport_perform_stream_op(grpc_transport *transport, grpc_stream *stream, grpc_transport_stream_op_batch *op); -void grpc_transport_perform_op(grpc_exec_ctx *exec_ctx, - grpc_transport *transport, +void grpc_transport_perform_op(grpc_transport *transport, grpc_transport_op *op); /* Send a ping on a transport @@ -337,11 +331,10 @@ void grpc_transport_goaway(grpc_transport *transport, grpc_status_code status, void grpc_transport_close(grpc_transport *transport); /* Destroy the transport */ -void grpc_transport_destroy(grpc_exec_ctx *exec_ctx, grpc_transport *transport); +void grpc_transport_destroy(grpc_transport *transport); /* Get the endpoint used by \a transport */ -grpc_endpoint *grpc_transport_get_endpoint(grpc_exec_ctx *exec_ctx, - grpc_transport *transport); +grpc_endpoint *grpc_transport_get_endpoint(grpc_transport *transport); /* Allocate a grpc_transport_op, and preconfigure the on_consumed closure to \a on_consumed and then delete the returned transport op */ diff --git a/src/core/lib/transport/transport_impl.h b/src/core/lib/transport/transport_impl.h index 445fb41ab16..c7b78afa615 100644 --- a/src/core/lib/transport/transport_impl.h +++ b/src/core/lib/transport/transport_impl.h @@ -34,37 +34,34 @@ typedef struct grpc_transport_vtable { const char *name; /* implementation of grpc_transport_init_stream */ - int (*init_stream)(grpc_exec_ctx *exec_ctx, grpc_transport *self, - grpc_stream *stream, grpc_stream_refcount *refcount, - const void *server_data, gpr_arena *arena); + int (*init_stream)(grpc_transport *self, grpc_stream *stream, + grpc_stream_refcount *refcount, const void *server_data, + gpr_arena *arena); /* implementation of grpc_transport_set_pollset */ - void (*set_pollset)(grpc_exec_ctx *exec_ctx, grpc_transport *self, - grpc_stream *stream, grpc_pollset *pollset); + void (*set_pollset)(grpc_transport *self, grpc_stream *stream, + grpc_pollset *pollset); /* implementation of grpc_transport_set_pollset */ - void (*set_pollset_set)(grpc_exec_ctx *exec_ctx, grpc_transport *self, - grpc_stream *stream, grpc_pollset_set *pollset_set); + void (*set_pollset_set)(grpc_transport *self, grpc_stream *stream, + grpc_pollset_set *pollset_set); /* implementation of grpc_transport_perform_stream_op */ - void (*perform_stream_op)(grpc_exec_ctx *exec_ctx, grpc_transport *self, - grpc_stream *stream, + void (*perform_stream_op)(grpc_transport *self, grpc_stream *stream, grpc_transport_stream_op_batch *op); /* implementation of grpc_transport_perform_op */ - void (*perform_op)(grpc_exec_ctx *exec_ctx, grpc_transport *self, - grpc_transport_op *op); + void (*perform_op)(grpc_transport *self, grpc_transport_op *op); /* implementation of grpc_transport_destroy_stream */ - void (*destroy_stream)(grpc_exec_ctx *exec_ctx, grpc_transport *self, - grpc_stream *stream, + void (*destroy_stream)(grpc_transport *self, grpc_stream *stream, grpc_closure *then_schedule_closure); /* implementation of grpc_transport_destroy */ - void (*destroy)(grpc_exec_ctx *exec_ctx, grpc_transport *self); + void (*destroy)(grpc_transport *self); /* implementation of grpc_transport_get_endpoint */ - grpc_endpoint *(*get_endpoint)(grpc_exec_ctx *exec_ctx, grpc_transport *self); + grpc_endpoint *(*get_endpoint)(grpc_transport *self); } grpc_transport_vtable; /* an instance of a grpc transport */ diff --git a/src/core/tsi/fake_transport_security.cc b/src/core/tsi/fake_transport_security.cc index 349dcf5cb8f..6ab7f8cc000 100644 --- a/src/core/tsi/fake_transport_security.cc +++ b/src/core/tsi/fake_transport_security.cc @@ -397,8 +397,7 @@ static const tsi_frame_protector_vtable frame_protector_vtable = { /* --- tsi_zero_copy_grpc_protector methods implementation. ---*/ static tsi_result fake_zero_copy_grpc_protector_protect( - grpc_exec_ctx *exec_ctx, tsi_zero_copy_grpc_protector *self, - grpc_slice_buffer *unprotected_slices, + tsi_zero_copy_grpc_protector *self, grpc_slice_buffer *unprotected_slices, grpc_slice_buffer *protected_slices) { if (self == NULL || unprotected_slices == NULL || protected_slices == NULL) { return TSI_INVALID_ARGUMENT; @@ -421,8 +420,7 @@ static tsi_result fake_zero_copy_grpc_protector_protect( } static tsi_result fake_zero_copy_grpc_protector_unprotect( - grpc_exec_ctx *exec_ctx, tsi_zero_copy_grpc_protector *self, - grpc_slice_buffer *protected_slices, + tsi_zero_copy_grpc_protector *self, grpc_slice_buffer *protected_slices, grpc_slice_buffer *unprotected_slices) { if (self == NULL || unprotected_slices == NULL || protected_slices == NULL) { return TSI_INVALID_ARGUMENT; @@ -450,18 +448,18 @@ static tsi_result fake_zero_copy_grpc_protector_unprotect( impl->parsed_frame_size - TSI_FAKE_FRAME_HEADER_SIZE, unprotected_slices); impl->parsed_frame_size = 0; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &impl->header_sb); + grpc_slice_buffer_reset_and_unref_internal(&impl->header_sb); } return TSI_OK; } static void fake_zero_copy_grpc_protector_destroy( - grpc_exec_ctx *exec_ctx, tsi_zero_copy_grpc_protector *self) { + tsi_zero_copy_grpc_protector *self) { if (self == NULL) return; tsi_fake_zero_copy_grpc_protector *impl = (tsi_fake_zero_copy_grpc_protector *)self; - grpc_slice_buffer_destroy_internal(exec_ctx, &impl->header_sb); - grpc_slice_buffer_destroy_internal(exec_ctx, &impl->protected_sb); + grpc_slice_buffer_destroy_internal(&impl->header_sb); + grpc_slice_buffer_destroy_internal(&impl->protected_sb); gpr_free(impl); } @@ -493,8 +491,7 @@ static tsi_result fake_handshaker_result_extract_peer( } static tsi_result fake_handshaker_result_create_zero_copy_grpc_protector( - void *exec_ctx, const tsi_handshaker_result *self, - size_t *max_output_protected_frame_size, + const tsi_handshaker_result *self, size_t *max_output_protected_frame_size, tsi_zero_copy_grpc_protector **protector) { *protector = tsi_create_fake_zero_copy_grpc_protector(max_output_protected_frame_size); diff --git a/src/core/tsi/transport_security.h b/src/core/tsi/transport_security.h index 3bba38149c8..27f22c5203d 100644 --- a/src/core/tsi/transport_security.h +++ b/src/core/tsi/transport_security.h @@ -94,7 +94,7 @@ struct tsi_handshaker { typedef struct { tsi_result (*extract_peer)(const tsi_handshaker_result *self, tsi_peer *peer); tsi_result (*create_zero_copy_grpc_protector)( - void *exec_ctx, const tsi_handshaker_result *self, + const tsi_handshaker_result *self, size_t *max_output_protected_frame_size, tsi_zero_copy_grpc_protector **protector); tsi_result (*create_frame_protector)(const tsi_handshaker_result *self, diff --git a/src/core/tsi/transport_security_grpc.cc b/src/core/tsi/transport_security_grpc.cc index affd995230e..ee8df0c2f1b 100644 --- a/src/core/tsi/transport_security_grpc.cc +++ b/src/core/tsi/transport_security_grpc.cc @@ -17,11 +17,11 @@ */ #include "src/core/tsi/transport_security_grpc.h" +#include "src/core/lib/iomgr/exec_ctx.h" /* This method creates a tsi_zero_copy_grpc_protector object. */ tsi_result tsi_handshaker_result_create_zero_copy_grpc_protector( - grpc_exec_ctx *exec_ctx, const tsi_handshaker_result *self, - size_t *max_output_protected_frame_size, + const tsi_handshaker_result *self, size_t *max_output_protected_frame_size, tsi_zero_copy_grpc_protector **protector) { if (exec_ctx == NULL || self == NULL || self->vtable == NULL || protector == NULL) { @@ -31,7 +31,7 @@ tsi_result tsi_handshaker_result_create_zero_copy_grpc_protector( return TSI_UNIMPLEMENTED; } return self->vtable->create_zero_copy_grpc_protector( - exec_ctx, self, max_output_protected_frame_size, protector); + self, max_output_protected_frame_size, protector); } /* --- tsi_zero_copy_grpc_protector common implementation. --- @@ -39,33 +39,28 @@ tsi_result tsi_handshaker_result_create_zero_copy_grpc_protector( Calls specific implementation after state/input validation. */ tsi_result tsi_zero_copy_grpc_protector_protect( - grpc_exec_ctx *exec_ctx, tsi_zero_copy_grpc_protector *self, - grpc_slice_buffer *unprotected_slices, + tsi_zero_copy_grpc_protector *self, grpc_slice_buffer *unprotected_slices, grpc_slice_buffer *protected_slices) { - if (exec_ctx == NULL || self == NULL || self->vtable == NULL || + if (/*&exec_ctx == NULL || */ self == NULL || self->vtable == NULL || unprotected_slices == NULL || protected_slices == NULL) { return TSI_INVALID_ARGUMENT; } if (self->vtable->protect == NULL) return TSI_UNIMPLEMENTED; - return self->vtable->protect(exec_ctx, self, unprotected_slices, - protected_slices); + return self->vtable->protect(self, unprotected_slices, protected_slices); } tsi_result tsi_zero_copy_grpc_protector_unprotect( - grpc_exec_ctx *exec_ctx, tsi_zero_copy_grpc_protector *self, - grpc_slice_buffer *protected_slices, + tsi_zero_copy_grpc_protector *self, grpc_slice_buffer *protected_slices, grpc_slice_buffer *unprotected_slices) { - if (exec_ctx == NULL || self == NULL || self->vtable == NULL || + if (/*&exec_ctx == NULL || self == NULL || */ self->vtable == NULL || protected_slices == NULL || unprotected_slices == NULL) { return TSI_INVALID_ARGUMENT; } if (self->vtable->unprotect == NULL) return TSI_UNIMPLEMENTED; - return self->vtable->unprotect(exec_ctx, self, protected_slices, - unprotected_slices); + return self->vtable->unprotect(self, protected_slices, unprotected_slices); } -void tsi_zero_copy_grpc_protector_destroy(grpc_exec_ctx *exec_ctx, - tsi_zero_copy_grpc_protector *self) { +void tsi_zero_copy_grpc_protector_destroy(tsi_zero_copy_grpc_protector *self) { if (self == NULL) return; - self->vtable->destroy(exec_ctx, self); + self->vtable->destroy(self); } diff --git a/src/core/tsi/transport_security_grpc.h b/src/core/tsi/transport_security_grpc.h index ca6755c12fa..5ab5297cc48 100644 --- a/src/core/tsi/transport_security_grpc.h +++ b/src/core/tsi/transport_security_grpc.h @@ -30,8 +30,7 @@ extern "C" { assuming there is no fatal error. The caller is responsible for destroying the protector. */ tsi_result tsi_handshaker_result_create_zero_copy_grpc_protector( - grpc_exec_ctx *exec_ctx, const tsi_handshaker_result *self, - size_t *max_output_protected_frame_size, + const tsi_handshaker_result *self, size_t *max_output_protected_frame_size, tsi_zero_copy_grpc_protector **protector); /* -- tsi_zero_copy_grpc_protector object -- */ @@ -43,8 +42,8 @@ tsi_result tsi_handshaker_result_create_zero_copy_grpc_protector( - This method returns TSI_OK in case of success or a specific error code in case of failure. */ tsi_result tsi_zero_copy_grpc_protector_protect( - grpc_exec_ctx *exec_ctx, tsi_zero_copy_grpc_protector *self, - grpc_slice_buffer *unprotected_slices, grpc_slice_buffer *protected_slices); + tsi_zero_copy_grpc_protector *self, grpc_slice_buffer *unprotected_slices, + grpc_slice_buffer *protected_slices); /* Outputs unprotected bytes. - protected_slices is the bytes of protected frames. @@ -53,24 +52,21 @@ tsi_result tsi_zero_copy_grpc_protector_protect( there is not enough data to output in which case unprotected_slices has 0 bytes. */ tsi_result tsi_zero_copy_grpc_protector_unprotect( - grpc_exec_ctx *exec_ctx, tsi_zero_copy_grpc_protector *self, - grpc_slice_buffer *protected_slices, grpc_slice_buffer *unprotected_slices); + tsi_zero_copy_grpc_protector *self, grpc_slice_buffer *protected_slices, + grpc_slice_buffer *unprotected_slices); /* Destroys the tsi_zero_copy_grpc_protector object. */ -void tsi_zero_copy_grpc_protector_destroy(grpc_exec_ctx *exec_ctx, - tsi_zero_copy_grpc_protector *self); +void tsi_zero_copy_grpc_protector_destroy(tsi_zero_copy_grpc_protector *self); /* Base for tsi_zero_copy_grpc_protector implementations. */ typedef struct { - tsi_result (*protect)(grpc_exec_ctx *exec_ctx, - tsi_zero_copy_grpc_protector *self, + tsi_result (*protect)(tsi_zero_copy_grpc_protector *self, grpc_slice_buffer *unprotected_slices, grpc_slice_buffer *protected_slices); - tsi_result (*unprotect)(grpc_exec_ctx *exec_ctx, - tsi_zero_copy_grpc_protector *self, + tsi_result (*unprotect)(tsi_zero_copy_grpc_protector *self, grpc_slice_buffer *protected_slices, grpc_slice_buffer *unprotected_slices); - void (*destroy)(grpc_exec_ctx *exec_ctx, tsi_zero_copy_grpc_protector *self); + void (*destroy)(tsi_zero_copy_grpc_protector *self); } tsi_zero_copy_grpc_protector_vtable; struct tsi_zero_copy_grpc_protector { diff --git a/src/cpp/common/channel_arguments.cc b/src/cpp/common/channel_arguments.cc index f89f5f1f03d..79e4aee4e29 100644 --- a/src/cpp/common/channel_arguments.cc +++ b/src/cpp/common/channel_arguments.cc @@ -67,13 +67,13 @@ ChannelArguments::ChannelArguments(const ChannelArguments& other) } ChannelArguments::~ChannelArguments() { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; for (auto it = args_.begin(); it != args_.end(); ++it) { if (it->type == GRPC_ARG_POINTER) { - it->value.pointer.vtable->destroy(&exec_ctx, it->value.pointer.p); + it->value.pointer.vtable->destroy(it->value.pointer.p); } } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } void ChannelArguments::Swap(ChannelArguments& other) { @@ -96,17 +96,17 @@ void ChannelArguments::SetSocketMutator(grpc_socket_mutator* mutator) { } grpc_arg mutator_arg = grpc_socket_mutator_to_arg(mutator); bool replaced = false; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; for (auto it = args_.begin(); it != args_.end(); ++it) { if (it->type == mutator_arg.type && grpc::string(it->key) == grpc::string(mutator_arg.key)) { GPR_ASSERT(!replaced); - it->value.pointer.vtable->destroy(&exec_ctx, it->value.pointer.p); + it->value.pointer.vtable->destroy(it->value.pointer.p); it->value.pointer = mutator_arg.value.pointer; replaced = true; } } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); if (!replaced) { args_.push_back(mutator_arg); } diff --git a/src/cpp/common/channel_filter.cc b/src/cpp/common/channel_filter.cc index ea44cff832c..cc84361bbc5 100644 --- a/src/cpp/common/channel_filter.cc +++ b/src/cpp/common/channel_filter.cc @@ -29,43 +29,39 @@ namespace grpc { // MetadataBatch -grpc_linked_mdelem *MetadataBatch::AddMetadata(grpc_exec_ctx *exec_ctx, - const string &key, +grpc_linked_mdelem *MetadataBatch::AddMetadata(const string &key, const string &value) { grpc_linked_mdelem *storage = new grpc_linked_mdelem; memset(storage, 0, sizeof(grpc_linked_mdelem)); - storage->md = grpc_mdelem_from_slices(exec_ctx, SliceFromCopiedString(key), + storage->md = grpc_mdelem_from_slices(SliceFromCopiedString(key), SliceFromCopiedString(value)); GRPC_LOG_IF_ERROR("MetadataBatch::AddMetadata", - grpc_metadata_batch_link_head(exec_ctx, batch_, storage)); + grpc_metadata_batch_link_head(batch_, storage)); return storage; } // ChannelData -void ChannelData::StartTransportOp(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +void ChannelData::StartTransportOp(grpc_channel_element *elem, TransportOp *op) { - grpc_channel_next_op(exec_ctx, elem, op->op()); + grpc_channel_next_op(elem, op->op()); } -void ChannelData::GetInfo(grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, +void ChannelData::GetInfo(grpc_channel_element *elem, const grpc_channel_info *channel_info) { - grpc_channel_next_get_info(exec_ctx, elem, channel_info); + grpc_channel_next_get_info(elem, channel_info); } // CallData -void CallData::StartTransportStreamOpBatch(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +void CallData::StartTransportStreamOpBatch(grpc_call_element *elem, TransportStreamOpBatch *op) { - grpc_call_next_op(exec_ctx, elem, op->op()); + grpc_call_next_op(elem, op->op()); } -void CallData::SetPollsetOrPollsetSet(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +void CallData::SetPollsetOrPollsetSet(grpc_call_element *elem, grpc_polling_entity *pollent) { - grpc_call_stack_ignore_set_pollset_or_pollset_set(exec_ctx, elem, pollent); + grpc_call_stack_ignore_set_pollset_or_pollset_set(elem, pollent); } // internal code used by RegisterChannelFilter() @@ -77,8 +73,7 @@ std::vector *channel_filters; namespace { -bool MaybeAddFilter(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder, void *arg) { +bool MaybeAddFilter(grpc_channel_stack_builder *builder, void *arg) { const FilterRecord &filter = *(FilterRecord *)arg; if (filter.include_filter) { const grpc_channel_args *args = diff --git a/src/cpp/common/channel_filter.h b/src/cpp/common/channel_filter.h index c1aeb3f7245..3adaae9d4bb 100644 --- a/src/cpp/common/channel_filter.h +++ b/src/cpp/common/channel_filter.h @@ -56,8 +56,7 @@ class MetadataBatch { /// Adds metadata and returns the newly allocated storage. /// The caller takes ownership of the result, which must exist for the /// lifetime of the gRPC call. - grpc_linked_mdelem *AddMetadata(grpc_exec_ctx *exec_ctx, const string &key, - const string &value); + grpc_linked_mdelem *AddMetadata(const string &key, const string &value); class const_iterator : public std::iterator { @@ -225,18 +224,17 @@ class ChannelData { // TODO(roth): Come up with a more C++-like API for the channel element. /// Initializes the channel data. - virtual grpc_error *Init(grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, + virtual grpc_error *Init(grpc_channel_element *elem, grpc_channel_element_args *args) { return GRPC_ERROR_NONE; } // Called before destruction. - virtual void Destroy(grpc_exec_ctx *exec_ctx, grpc_channel_element *elem) {} + virtual void Destroy(grpc_channel_element *elem) {} - virtual void StartTransportOp(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, TransportOp *op); + virtual void StartTransportOp(grpc_channel_element *elem, TransportOp *op); - virtual void GetInfo(grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, + virtual void GetInfo(grpc_channel_element *elem, const grpc_channel_info *channel_info); }; @@ -249,24 +247,22 @@ class CallData { // TODO(roth): Come up with a more C++-like API for the call element. /// Initializes the call data. - virtual grpc_error *Init(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + virtual grpc_error *Init(grpc_call_element *elem, const grpc_call_element_args *args) { return GRPC_ERROR_NONE; } // Called before destruction. - virtual void Destroy(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, + virtual void Destroy(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *then_call_closure) {} /// Starts a new stream operation. - virtual void StartTransportStreamOpBatch(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, + virtual void StartTransportStreamOpBatch(grpc_call_element *elem, TransportStreamOpBatch *op); /// Sets a pollset or pollset set. - virtual void SetPollsetOrPollsetSet(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, + virtual void SetPollsetOrPollsetSet(grpc_call_element *elem, grpc_polling_entity *pollent); }; @@ -280,71 +276,63 @@ class ChannelFilter final { public: static const size_t channel_data_size = sizeof(ChannelDataType); - static grpc_error *InitChannelElement(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, + static grpc_error *InitChannelElement(grpc_channel_element *elem, grpc_channel_element_args *args) { // Construct the object in the already-allocated memory. ChannelDataType *channel_data = new (elem->channel_data) ChannelDataType(); - return channel_data->Init(exec_ctx, elem, args); + return channel_data->Init(elem, args); } - static void DestroyChannelElement(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem) { + static void DestroyChannelElement(grpc_channel_element *elem) { ChannelDataType *channel_data = reinterpret_cast(elem->channel_data); - channel_data->Destroy(exec_ctx, elem); + channel_data->Destroy(elem); channel_data->~ChannelDataType(); } - static void StartTransportOp(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, + static void StartTransportOp(grpc_channel_element *elem, grpc_transport_op *op) { ChannelDataType *channel_data = reinterpret_cast(elem->channel_data); TransportOp op_wrapper(op); - channel_data->StartTransportOp(exec_ctx, elem, &op_wrapper); + channel_data->StartTransportOp(elem, &op_wrapper); } - static void GetChannelInfo(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, + static void GetChannelInfo(grpc_channel_element *elem, const grpc_channel_info *channel_info) { ChannelDataType *channel_data = reinterpret_cast(elem->channel_data); - channel_data->GetInfo(exec_ctx, elem, channel_info); + channel_data->GetInfo(elem, channel_info); } static const size_t call_data_size = sizeof(CallDataType); - static grpc_error *InitCallElement(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, + static grpc_error *InitCallElement(grpc_call_element *elem, const grpc_call_element_args *args) { // Construct the object in the already-allocated memory. CallDataType *call_data = new (elem->call_data) CallDataType(); - return call_data->Init(exec_ctx, elem, args); + return call_data->Init(elem, args); } - static void DestroyCallElement(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, + static void DestroyCallElement(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *then_call_closure) { CallDataType *call_data = reinterpret_cast(elem->call_data); - call_data->Destroy(exec_ctx, elem, final_info, then_call_closure); + call_data->Destroy(elem, final_info, then_call_closure); call_data->~CallDataType(); } - static void StartTransportStreamOpBatch(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, + static void StartTransportStreamOpBatch(grpc_call_element *elem, grpc_transport_stream_op_batch *op) { CallDataType *call_data = reinterpret_cast(elem->call_data); TransportStreamOpBatch op_wrapper(op); - call_data->StartTransportStreamOpBatch(exec_ctx, elem, &op_wrapper); + call_data->StartTransportStreamOpBatch(elem, &op_wrapper); } - static void SetPollsetOrPollsetSet(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, + static void SetPollsetOrPollsetSet(grpc_call_element *elem, grpc_polling_entity *pollent) { CallDataType *call_data = reinterpret_cast(elem->call_data); - call_data->SetPollsetOrPollsetSet(exec_ctx, elem, pollent); + call_data->SetPollsetOrPollsetSet(elem, pollent); } }; diff --git a/src/ruby/ext/grpc/rb_grpc_imports.generated.h b/src/ruby/ext/grpc/rb_grpc_imports.generated.h index 868772cfc85..6f7423c4e76 100644 --- a/src/ruby/ext/grpc/rb_grpc_imports.generated.h +++ b/src/ruby/ext/grpc/rb_grpc_imports.generated.h @@ -623,7 +623,7 @@ extern grpc_slice_buffer_move_first_type grpc_slice_buffer_move_first_import; typedef void(*grpc_slice_buffer_move_first_no_ref_type)(grpc_slice_buffer *src, size_t n, grpc_slice_buffer *dst); extern grpc_slice_buffer_move_first_no_ref_type grpc_slice_buffer_move_first_no_ref_import; #define grpc_slice_buffer_move_first_no_ref grpc_slice_buffer_move_first_no_ref_import -typedef void(*grpc_slice_buffer_move_first_into_buffer_type)(grpc_exec_ctx *exec_ctx, grpc_slice_buffer *src, size_t n, void *dst); +typedef void(*grpc_slice_buffer_move_first_into_buffer_type)(grpc_slice_buffer *src, size_t n, void *dst); extern grpc_slice_buffer_move_first_into_buffer_type grpc_slice_buffer_move_first_into_buffer_import; #define grpc_slice_buffer_move_first_into_buffer grpc_slice_buffer_move_first_into_buffer_import typedef grpc_slice(*grpc_slice_buffer_take_first_type)(grpc_slice_buffer *src); diff --git a/test/core/backoff/backoff_test.c b/test/core/backoff/backoff_test.c index a29cce6cc7b..93952f3d100 100644 --- a/test/core/backoff/backoff_test.c +++ b/test/core/backoff/backoff_test.c @@ -28,15 +28,15 @@ static void test_constant_backoff(void) { 0.0 /* jitter */, 100 /* min timeout */, 1000 /* max timeout */); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_millis next = grpc_backoff_begin(&exec_ctx, &backoff); - GPR_ASSERT(next - grpc_exec_ctx_now(&exec_ctx) == 200); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_millis next = grpc_backoff_begin(&backoff); + GPR_ASSERT(next - grpc_exec_ctx_now() == 200); for (int i = 0; i < 10000; i++) { - next = grpc_backoff_step(&exec_ctx, &backoff); - GPR_ASSERT(next - grpc_exec_ctx_now(&exec_ctx) == 200); + next = grpc_backoff_step(&backoff); + GPR_ASSERT(next - grpc_exec_ctx_now() == 200); exec_ctx.now = next; } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void test_min_connect(void) { @@ -45,10 +45,10 @@ static void test_min_connect(void) { 0.0 /* jitter */, 200 /* min timeout */, 1000 /* max timeout */); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_millis next = grpc_backoff_begin(&exec_ctx, &backoff); - GPR_ASSERT(next - grpc_exec_ctx_now(&exec_ctx) == 200); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_millis next = grpc_backoff_begin(&backoff); + GPR_ASSERT(next - grpc_exec_ctx_now() == 200); + grpc_exec_ctx_finish(); } static void test_no_jitter_backoff(void) { @@ -58,47 +58,47 @@ static void test_no_jitter_backoff(void) { 513 /* max timeout */); // x_1 = 2 // x_n = 2**i + x_{i-1} ( = 2**(n+1) - 2 ) - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; exec_ctx.now = 0; exec_ctx.now_is_valid = true; - grpc_millis next = grpc_backoff_begin(&exec_ctx, &backoff); + grpc_millis next = grpc_backoff_begin(&backoff); GPR_ASSERT(next == 2); exec_ctx.now = next; - next = grpc_backoff_step(&exec_ctx, &backoff); + next = grpc_backoff_step(&backoff); GPR_ASSERT(next == 6); exec_ctx.now = next; - next = grpc_backoff_step(&exec_ctx, &backoff); + next = grpc_backoff_step(&backoff); GPR_ASSERT(next == 14); exec_ctx.now = next; - next = grpc_backoff_step(&exec_ctx, &backoff); + next = grpc_backoff_step(&backoff); GPR_ASSERT(next == 30); exec_ctx.now = next; - next = grpc_backoff_step(&exec_ctx, &backoff); + next = grpc_backoff_step(&backoff); GPR_ASSERT(next == 62); exec_ctx.now = next; - next = grpc_backoff_step(&exec_ctx, &backoff); + next = grpc_backoff_step(&backoff); GPR_ASSERT(next == 126); exec_ctx.now = next; - next = grpc_backoff_step(&exec_ctx, &backoff); + next = grpc_backoff_step(&backoff); GPR_ASSERT(next == 254); exec_ctx.now = next; - next = grpc_backoff_step(&exec_ctx, &backoff); + next = grpc_backoff_step(&backoff); GPR_ASSERT(next == 510); exec_ctx.now = next; - next = grpc_backoff_step(&exec_ctx, &backoff); + next = grpc_backoff_step(&backoff); GPR_ASSERT(next == 1022); exec_ctx.now = next; - next = grpc_backoff_step(&exec_ctx, &backoff); + next = grpc_backoff_step(&backoff); // Hit the maximum timeout. From this point onwards, retries will increase // only by max timeout. GPR_ASSERT(next == 1535); exec_ctx.now = next; - next = grpc_backoff_step(&exec_ctx, &backoff); + next = grpc_backoff_step(&backoff); GPR_ASSERT(next == 2048); exec_ctx.now = next; - next = grpc_backoff_step(&exec_ctx, &backoff); + next = grpc_backoff_step(&backoff); GPR_ASSERT(next == 2561); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void test_jitter_backoff(void) { @@ -111,9 +111,9 @@ static void test_jitter_backoff(void) { backoff.rng_state = 0; // force consistent PRNG - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_millis next = grpc_backoff_begin(&exec_ctx, &backoff); - GPR_ASSERT(next - grpc_exec_ctx_now(&exec_ctx) == 500); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_millis next = grpc_backoff_begin(&backoff); + GPR_ASSERT(next - grpc_exec_ctx_now() == 500); int64_t expected_next_lower_bound = (int64_t)((double)initial_timeout * (1 - jitter)); @@ -121,10 +121,10 @@ static void test_jitter_backoff(void) { (int64_t)((double)initial_timeout * (1 + jitter)); for (int i = 0; i < 10000; i++) { - next = grpc_backoff_step(&exec_ctx, &backoff); + next = grpc_backoff_step(&backoff); // next-now must be within (jitter*100)% of the previous timeout. - const int64_t timeout_millis = next - grpc_exec_ctx_now(&exec_ctx); + const int64_t timeout_millis = next - grpc_exec_ctx_now(); GPR_ASSERT(timeout_millis >= expected_next_lower_bound); GPR_ASSERT(timeout_millis <= expected_next_upper_bound); @@ -134,7 +134,7 @@ static void test_jitter_backoff(void) { (int64_t)((double)timeout_millis * (1 + jitter)); exec_ctx.now = next; } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } int main(int argc, char **argv) { diff --git a/test/core/backoff/backoff_test.cc b/test/core/backoff/backoff_test.cc new file mode 100644 index 00000000000..ea27f7547fe --- /dev/null +++ b/test/core/backoff/backoff_test.cc @@ -0,0 +1,147 @@ +/* + * + * Copyright 2016 gRPC authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include "src/core/lib/backoff/backoff.h" + +#include + +#include "test/core/util/test_config.h" + +static void test_constant_backoff(void) { + grpc_backoff backoff; + grpc_backoff_init(&backoff, 200 /* initial timeout */, 1.0 /* multiplier */, + 0.0 /* jitter */, 100 /* min timeout */, + 1000 /* max timeout */); + + grpc_millis next = grpc_backoff_begin(&backoff); + GPR_ASSERT(next - grpc_exec_ctx_now() == 200); + for (int i = 0; i < 10000; i++) { + next = grpc_backoff_step(&backoff); + GPR_ASSERT(next - grpc_exec_ctx_now() == 200); + exec_ctx.now = next; + } + grpc_exec_ctx_finish(); +} + +static void test_min_connect(void) { + grpc_backoff backoff; + grpc_backoff_init(&backoff, 100 /* initial timeout */, 1.0 /* multiplier */, + 0.0 /* jitter */, 200 /* min timeout */, + 1000 /* max timeout */); + + grpc_millis next = grpc_backoff_begin(&backoff); + GPR_ASSERT(next - grpc_exec_ctx_now() == 200); + grpc_exec_ctx_finish(); +} + +static void test_no_jitter_backoff(void) { + grpc_backoff backoff; + grpc_backoff_init(&backoff, 2 /* initial timeout */, 2.0 /* multiplier */, + 0.0 /* jitter */, 1 /* min timeout */, + 513 /* max timeout */); + // x_1 = 2 + // x_n = 2**i + x_{i-1} ( = 2**(n+1) - 2 ) + + exec_ctx.now = 0; + exec_ctx.now_is_valid = true; + grpc_millis next = grpc_backoff_begin(&backoff); + GPR_ASSERT(next == 2); + exec_ctx.now = next; + next = grpc_backoff_step(&backoff); + GPR_ASSERT(next == 6); + exec_ctx.now = next; + next = grpc_backoff_step(&backoff); + GPR_ASSERT(next == 14); + exec_ctx.now = next; + next = grpc_backoff_step(&backoff); + GPR_ASSERT(next == 30); + exec_ctx.now = next; + next = grpc_backoff_step(&backoff); + GPR_ASSERT(next == 62); + exec_ctx.now = next; + next = grpc_backoff_step(&backoff); + GPR_ASSERT(next == 126); + exec_ctx.now = next; + next = grpc_backoff_step(&backoff); + GPR_ASSERT(next == 254); + exec_ctx.now = next; + next = grpc_backoff_step(&backoff); + GPR_ASSERT(next == 510); + exec_ctx.now = next; + next = grpc_backoff_step(&backoff); + GPR_ASSERT(next == 1022); + exec_ctx.now = next; + next = grpc_backoff_step(&backoff); + // Hit the maximum timeout. From this point onwards, retries will increase + // only by max timeout. + GPR_ASSERT(next == 1535); + exec_ctx.now = next; + next = grpc_backoff_step(&backoff); + GPR_ASSERT(next == 2048); + exec_ctx.now = next; + next = grpc_backoff_step(&backoff); + GPR_ASSERT(next == 2561); + grpc_exec_ctx_finish(); +} + +static void test_jitter_backoff(void) { + const int64_t initial_timeout = 500; + const double jitter = 0.1; + grpc_backoff backoff; + grpc_backoff_init(&backoff, (grpc_millis)initial_timeout, + 1.0 /* multiplier */, jitter, 100 /* min timeout */, + 1000 /* max timeout */); + + backoff.rng_state = 0; // force consistent PRNG + + grpc_millis next = grpc_backoff_begin(&backoff); + GPR_ASSERT(next - grpc_exec_ctx_now() == 500); + + int64_t expected_next_lower_bound = + (int64_t)((double)initial_timeout * (1 - jitter)); + int64_t expected_next_upper_bound = + (int64_t)((double)initial_timeout * (1 + jitter)); + + for (int i = 0; i < 10000; i++) { + next = grpc_backoff_step(&backoff); + + // next-now must be within (jitter*100)% of the previous timeout. + const int64_t timeout_millis = next - grpc_exec_ctx_now(); + GPR_ASSERT(timeout_millis >= expected_next_lower_bound); + GPR_ASSERT(timeout_millis <= expected_next_upper_bound); + + expected_next_lower_bound = + (int64_t)((double)timeout_millis * (1 - jitter)); + expected_next_upper_bound = + (int64_t)((double)timeout_millis * (1 + jitter)); + exec_ctx.now = next; + } + grpc_exec_ctx_finish(); +} + +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + gpr_time_init(); + + test_constant_backoff(); + test_min_connect(); + test_no_jitter_backoff(); + test_jitter_backoff(); + + return 0; +} diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.cc similarity index 80% rename from test/core/bad_client/bad_client.c rename to test/core/bad_client/bad_client.cc index b7b28a9ac4e..99006c28660 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.cc @@ -50,20 +50,20 @@ static void thd_func(void *arg) { gpr_event_set(&a->done_thd, (void *)1); } -static void done_write(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void done_write(void *arg, grpc_error *error) { thd_args *a = (thd_args *)arg; gpr_event_set(&a->done_write, (void *)1); } static void server_setup_transport(void *ts, grpc_transport *transport) { thd_args *a = (thd_args *)ts; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_server_setup_transport(&exec_ctx, a->server, transport, NULL, + ExecCtx _local_exec_ctx; + grpc_server_setup_transport(a->server, transport, NULL, grpc_server_get_channel_args(a->server)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } -static void read_done(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void read_done(void *arg, grpc_error *error) { gpr_event *read_done = (gpr_event *)arg; gpr_event_set(read_done, (void *)1); } @@ -81,7 +81,7 @@ void grpc_run_bad_client_test( grpc_slice_from_copied_buffer(client_payload, client_payload_length); grpc_slice_buffer outgoing; grpc_closure done_write_closure; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_completion_queue *shutdown_cq; if (client_payload_length < 4 * 1024) { @@ -115,14 +115,14 @@ void grpc_run_bad_client_test( GRPC_BAD_CLIENT_REGISTERED_HOST, GRPC_SRM_PAYLOAD_READ_INITIAL_BYTE_BUFFER, 0); grpc_server_start(a.server); - transport = grpc_create_chttp2_transport(&exec_ctx, NULL, sfd.server, 0); + transport = grpc_create_chttp2_transport(NULL, sfd.server, 0); server_setup_transport(&a, transport); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_transport_start_reading(transport, NULL); + grpc_exec_ctx_finish(); /* Bind everything into the same pollset */ - grpc_endpoint_add_to_pollset(&exec_ctx, sfd.client, grpc_cq_pollset(a.cq)); - grpc_endpoint_add_to_pollset(&exec_ctx, sfd.server, grpc_cq_pollset(a.cq)); + grpc_endpoint_add_to_pollset(sfd.client, grpc_cq_pollset(a.cq)); + grpc_endpoint_add_to_pollset(sfd.server, grpc_cq_pollset(a.cq)); /* Check a ground truth */ GPR_ASSERT(grpc_server_has_open_connections(a.server)); @@ -136,8 +136,8 @@ void grpc_run_bad_client_test( grpc_schedule_on_exec_ctx); /* Write data */ - grpc_endpoint_write(&exec_ctx, sfd.client, &outgoing, &done_write_closure); - grpc_exec_ctx_finish(&exec_ctx); + grpc_endpoint_write(sfd.client, &outgoing, &done_write_closure); + grpc_exec_ctx_finish(); /* Await completion, unless the request is large and write may not finish * before the peer shuts down. */ @@ -148,10 +148,9 @@ void grpc_run_bad_client_test( if (flags & GRPC_BAD_CLIENT_DISCONNECT) { grpc_endpoint_shutdown( - &exec_ctx, sfd.client, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Forced Disconnect")); - grpc_endpoint_destroy(&exec_ctx, sfd.client); - grpc_exec_ctx_finish(&exec_ctx); + sfd.client, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Forced Disconnect")); + grpc_endpoint_destroy(sfd.client); + grpc_exec_ctx_finish(); sfd.client = NULL; } @@ -170,9 +169,8 @@ void grpc_run_bad_client_test( grpc_closure read_done_closure; GRPC_CLOSURE_INIT(&read_done_closure, read_done, &read_done_event, grpc_schedule_on_exec_ctx); - grpc_endpoint_read(&exec_ctx, sfd.client, &incoming, - &read_done_closure); - grpc_exec_ctx_finish(&exec_ctx); + grpc_endpoint_read(sfd.client, &incoming, &read_done_closure); + grpc_exec_ctx_finish(); do { GPR_ASSERT(gpr_time_cmp(deadline, gpr_now(deadline.clock_type)) > 0); GPR_ASSERT(grpc_completion_queue_next( @@ -184,14 +182,13 @@ void grpc_run_bad_client_test( "client validator failed; trying additional read " "in case we didn't get all the data"); } - grpc_slice_buffer_destroy_internal(&exec_ctx, &incoming); + grpc_slice_buffer_destroy_internal(&incoming); } // Shutdown. grpc_endpoint_shutdown( - &exec_ctx, sfd.client, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); - grpc_endpoint_destroy(&exec_ctx, sfd.client); - grpc_exec_ctx_finish(&exec_ctx); + sfd.client, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); + grpc_endpoint_destroy(sfd.client); + grpc_exec_ctx_finish(); } GPR_ASSERT( @@ -204,8 +201,8 @@ void grpc_run_bad_client_test( grpc_completion_queue_destroy(shutdown_cq); grpc_server_destroy(a.server); grpc_completion_queue_destroy(a.cq); - grpc_slice_buffer_destroy_internal(&exec_ctx, &outgoing); + grpc_slice_buffer_destroy_internal(&outgoing); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_shutdown(); } diff --git a/test/core/bad_client/bad_client.h b/test/core/bad_client/bad_client.h index a5b01f7f2c1..0b77a3f8692 100644 --- a/test/core/bad_client/bad_client.h +++ b/test/core/bad_client/bad_client.h @@ -28,6 +28,10 @@ #define GRPC_BAD_CLIENT_REGISTERED_METHOD "/registered/bar" #define GRPC_BAD_CLIENT_REGISTERED_HOST "localhost" +#ifdef __cplusplus +extern "C" { +#endif + typedef void (*grpc_bad_client_server_side_validator)(grpc_server *server, grpc_completion_queue *cq, void *registered_method); @@ -54,4 +58,8 @@ void grpc_run_bad_client_test( grpc_run_bad_client_test(server_validator, client_validator, payload, \ sizeof(payload) - 1, flags) +#ifdef __cplusplus +} +#endif + #endif /* GRPC_TEST_CORE_BAD_CLIENT_BAD_CLIENT_H */ diff --git a/test/core/bad_client/gen_build_yaml.py b/test/core/bad_client/gen_build_yaml.py index dbd52777e1f..22e8aae4881 100755 --- a/test/core/bad_client/gen_build_yaml.py +++ b/test/core/bad_client/gen_build_yaml.py @@ -46,7 +46,7 @@ def main(): 'build': 'private', 'language': 'c', 'src': [ - 'test/core/bad_client/bad_client.c' + 'test/core/bad_client/bad_client.cc' ], 'headers': [ 'test/core/bad_client/bad_client.h' diff --git a/test/core/bad_client/generate_tests.bzl b/test/core/bad_client/generate_tests.bzl index 1aeb81c00d8..0ac3e7fdfd8 100755 --- a/test/core/bad_client/generate_tests.bzl +++ b/test/core/bad_client/generate_tests.bzl @@ -38,7 +38,7 @@ BAD_CLIENT_TESTS = { def grpc_bad_client_tests(): native.cc_library( name = 'bad_client_test', - srcs = ['bad_client.c'], + srcs = ['bad_client.cc'], hdrs = ['bad_client.h'], copts = ['-std=c99'], deps = ['//test/core/util:grpc_test_util', '//:grpc', '//:gpr', '//test/core/end2end:cq_verifier'] diff --git a/test/core/channel/channel_args_test.c b/test/core/channel/channel_args_test.c index deaf2933ec1..541c53ddf1b 100644 --- a/test/core/channel/channel_args_test.c +++ b/test/core/channel/channel_args_test.c @@ -26,7 +26,7 @@ #include "test/core/util/test_config.h" static void test_create(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_arg arg_int; grpc_arg arg_string; @@ -55,12 +55,12 @@ static void test_create(void) { GPR_ASSERT(strcmp(ch_args->args[1].value.string, arg_string.value.string) == 0); - grpc_channel_args_destroy(&exec_ctx, ch_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_channel_args_destroy(ch_args); + grpc_exec_ctx_finish(); } static void test_set_compression_algorithm(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_channel_args *ch_args; ch_args = @@ -70,12 +70,12 @@ static void test_set_compression_algorithm(void) { GRPC_COMPRESSION_CHANNEL_DEFAULT_ALGORITHM) == 0); GPR_ASSERT(ch_args->args[0].type == GRPC_ARG_INTEGER); - grpc_channel_args_destroy(&exec_ctx, ch_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_channel_args_destroy(ch_args); + grpc_exec_ctx_finish(); } static void test_compression_algorithm_states(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_channel_args *ch_args, *ch_args_wo_gzip, *ch_args_wo_gzip_deflate; unsigned states_bitset; size_t i; @@ -91,10 +91,10 @@ static void test_compression_algorithm_states(void) { /* disable gzip and deflate */ ch_args_wo_gzip = grpc_channel_args_compression_algorithm_set_state( - &exec_ctx, &ch_args, GRPC_COMPRESS_GZIP, 0); + &ch_args, GRPC_COMPRESS_GZIP, 0); GPR_ASSERT(ch_args == ch_args_wo_gzip); ch_args_wo_gzip_deflate = grpc_channel_args_compression_algorithm_set_state( - &exec_ctx, &ch_args_wo_gzip, GRPC_COMPRESS_DEFLATE, 0); + &ch_args_wo_gzip, GRPC_COMPRESS_DEFLATE, 0); GPR_ASSERT(ch_args_wo_gzip == ch_args_wo_gzip_deflate); states_bitset = (unsigned)grpc_channel_args_compression_algorithm_get_states( @@ -109,7 +109,7 @@ static void test_compression_algorithm_states(void) { /* re-enabled gzip only */ ch_args_wo_gzip = grpc_channel_args_compression_algorithm_set_state( - &exec_ctx, &ch_args_wo_gzip_deflate, GRPC_COMPRESS_GZIP, 1); + &ch_args_wo_gzip_deflate, GRPC_COMPRESS_GZIP, 1); GPR_ASSERT(ch_args_wo_gzip == ch_args_wo_gzip_deflate); states_bitset = (unsigned)grpc_channel_args_compression_algorithm_get_states( @@ -122,8 +122,8 @@ static void test_compression_algorithm_states(void) { } } - grpc_channel_args_destroy(&exec_ctx, ch_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_channel_args_destroy(ch_args); + grpc_exec_ctx_finish(); } static void test_set_socket_mutator(void) { @@ -137,9 +137,9 @@ static void test_set_socket_mutator(void) { GPR_ASSERT(ch_args->args[0].type == GRPC_ARG_POINTER); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, ch_args); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(ch_args); + grpc_exec_ctx_finish(); } } diff --git a/test/core/channel/channel_stack_builder_test.c b/test/core/channel/channel_stack_builder_test.c index 682efd14385..b745def2323 100644 --- a/test/core/channel/channel_stack_builder_test.c +++ b/test/core/channel/channel_stack_builder_test.c @@ -29,34 +29,30 @@ #include "src/core/lib/surface/channel_init.h" #include "test/core/util/test_config.h" -static grpc_error *channel_init_func(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static grpc_error *channel_init_func(grpc_channel_element *elem, grpc_channel_element_args *args) { return GRPC_ERROR_NONE; } -static grpc_error *call_init_func(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *call_init_func(grpc_call_element *elem, const grpc_call_element_args *args) { return GRPC_ERROR_NONE; } -static void channel_destroy_func(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem) {} +static void channel_destroy_func(grpc_channel_element *elem) {} -static void call_destroy_func(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, +static void call_destroy_func(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *ignored) {} -static void call_func(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, +static void call_func(grpc_call_element *elem, grpc_transport_stream_op_batch *op) {} -static void channel_func(grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, - grpc_transport_op *op) { +static void channel_func(grpc_channel_element *elem, grpc_transport_op *op) { if (op->disconnect_with_error != GRPC_ERROR_NONE) { GRPC_ERROR_UNREF(op->disconnect_with_error); } - GRPC_CLOSURE_SCHED(exec_ctx, op->on_consumed, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(op->on_consumed, GRPC_ERROR_NONE); } bool g_replacement_fn_called = false; @@ -106,8 +102,7 @@ const grpc_channel_filter original_filter = { grpc_channel_next_get_info, "filter_name"}; -static bool add_replacement_filter(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder, +static bool add_replacement_filter(grpc_channel_stack_builder *builder, void *arg) { const grpc_channel_filter *filter = arg; // Get rid of any other version of the filter, as determined by having the @@ -117,8 +112,7 @@ static bool add_replacement_filter(grpc_exec_ctx *exec_ctx, builder, filter, set_arg_once_fn, &g_replacement_fn_called); } -static bool add_original_filter(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder, +static bool add_original_filter(grpc_channel_stack_builder *builder, void *arg) { return grpc_channel_stack_builder_prepend_filter( builder, (const grpc_channel_filter *)arg, set_arg_once_fn, diff --git a/test/core/channel/channel_stack_test.c b/test/core/channel/channel_stack_test.c index a07ef89ba82..ef1a2ac3198 100644 --- a/test/core/channel/channel_stack_test.c +++ b/test/core/channel/channel_stack_test.c @@ -27,8 +27,7 @@ #include "src/core/lib/slice/slice_internal.h" #include "test/core/util/test_config.h" -static grpc_error *channel_init_func(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static grpc_error *channel_init_func(grpc_channel_element *elem, grpc_channel_element_args *args) { GPR_ASSERT(args->channel_args->num_args == 1); GPR_ASSERT(args->channel_args->args[0].type == GRPC_ARG_INTEGER); @@ -40,41 +39,37 @@ static grpc_error *channel_init_func(grpc_exec_ctx *exec_ctx, return GRPC_ERROR_NONE; } -static grpc_error *call_init_func(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *call_init_func(grpc_call_element *elem, const grpc_call_element_args *args) { ++*(int *)(elem->channel_data); *(int *)(elem->call_data) = 0; return GRPC_ERROR_NONE; } -static void channel_destroy_func(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem) {} +static void channel_destroy_func(grpc_channel_element *elem) {} -static void call_destroy_func(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, +static void call_destroy_func(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *ignored) { ++*(int *)(elem->channel_data); } -static void call_func(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, +static void call_func(grpc_call_element *elem, grpc_transport_stream_op_batch *op) { ++*(int *)(elem->call_data); } -static void channel_func(grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, - grpc_transport_op *op) { +static void channel_func(grpc_channel_element *elem, grpc_transport_op *op) { ++*(int *)(elem->channel_data); } -static void free_channel(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { - grpc_channel_stack_destroy(exec_ctx, arg); +static void free_channel(void *arg, grpc_error *error) { + grpc_channel_stack_destroy(arg); gpr_free(arg); } -static void free_call(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { - grpc_call_stack_destroy(exec_ctx, arg, NULL, NULL); +static void free_call(void *arg, grpc_error *error) { + grpc_call_stack_destroy(arg, NULL, NULL); gpr_free(arg); } @@ -100,7 +95,7 @@ static void test_create_channel_stack(void) { grpc_channel_args chan_args; int *channel_data; int *call_data; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_slice path = grpc_slice_from_static_string("/service/method"); arg.type = GRPC_ARG_INTEGER; @@ -111,8 +106,8 @@ static void test_create_channel_stack(void) { chan_args.args = &arg; channel_stack = gpr_malloc(grpc_channel_stack_size(&filters, 1)); - grpc_channel_stack_init(&exec_ctx, 1, free_channel, channel_stack, &filters, - 1, &chan_args, NULL, "test", channel_stack); + grpc_channel_stack_init(1, free_channel, channel_stack, &filters, 1, + &chan_args, NULL, "test", channel_stack); GPR_ASSERT(channel_stack->count == 1); channel_elem = grpc_channel_stack_element(channel_stack, 0); channel_data = (int *)channel_elem->channel_data; @@ -127,8 +122,8 @@ static void test_create_channel_stack(void) { .start_time = gpr_now(GPR_CLOCK_MONOTONIC), .deadline = GRPC_MILLIS_INF_FUTURE, .arena = NULL}; - grpc_error *error = grpc_call_stack_init(&exec_ctx, channel_stack, 1, - free_call, call_stack, &args); + grpc_error *error = + grpc_call_stack_init(channel_stack, 1, free_call, call_stack, &args); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(call_stack->count == 1); call_elem = grpc_call_stack_element(call_stack, 0); @@ -138,14 +133,14 @@ static void test_create_channel_stack(void) { GPR_ASSERT(*call_data == 0); GPR_ASSERT(*channel_data == 1); - GRPC_CALL_STACK_UNREF(&exec_ctx, call_stack, "done"); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CALL_STACK_UNREF(call_stack, "done"); + grpc_exec_ctx_flush(); GPR_ASSERT(*channel_data == 2); - GRPC_CHANNEL_STACK_UNREF(&exec_ctx, channel_stack, "done"); + GRPC_CHANNEL_STACK_UNREF(channel_stack, "done"); - grpc_slice_unref_internal(&exec_ctx, path); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref_internal(path); + grpc_exec_ctx_finish(); } int main(int argc, char **argv) { diff --git a/test/core/channel/minimal_stack_is_minimal_test.c b/test/core/channel/minimal_stack_is_minimal_test.c index b4528346f75..2f6a991a11a 100644 --- a/test/core/channel/minimal_stack_is_minimal_test.c +++ b/test/core/channel/minimal_stack_is_minimal_test.c @@ -122,12 +122,11 @@ static int check_stack(const char *file, int line, const char *transport_name, grpc_channel_stack_builder_set_transport(builder, &fake_transport); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_stack_builder_set_channel_arguments(&exec_ctx, builder, - channel_args); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_stack_builder_set_channel_arguments(builder, channel_args); GPR_ASSERT(grpc_channel_init_create_stack( - &exec_ctx, builder, (grpc_channel_stack_type)channel_stack_type)); - grpc_exec_ctx_finish(&exec_ctx); + builder, (grpc_channel_stack_type)channel_stack_type)); + grpc_exec_ctx_finish(); } // build up our expectation list @@ -207,10 +206,10 @@ static int check_stack(const char *file, int line, const char *transport_name, gpr_free(expect); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_stack_builder_destroy(&exec_ctx, builder); - grpc_channel_args_destroy(&exec_ctx, channel_args); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_stack_builder_destroy(builder); + grpc_channel_args_destroy(channel_args); + grpc_exec_ctx_finish(); } return result; diff --git a/test/core/client_channel/lb_policies_test.c b/test/core/client_channel/lb_policies_test.c index ba37cd673f6..446e5ef9d6c 100644 --- a/test/core/client_channel/lb_policies_test.c +++ b/test/core/client_channel/lb_policies_test.c @@ -639,9 +639,9 @@ static void test_get_channel_info() { grpc_channel_args *args = grpc_channel_args_copy_and_add(NULL, &arg, 1); channel = grpc_insecure_channel_create("ipv4:127.0.0.1:1234", args, NULL); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, args); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(args); + grpc_exec_ctx_finish(); } // Ensures that resolver returns. grpc_channel_check_connectivity_state(channel, true /* try_to_connect */); @@ -937,7 +937,7 @@ static void verify_rebirth_round_robin(const servers_fixture *f, } int main(int argc, char **argv) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; test_spec *spec; size_t i; const size_t NUM_ITERS = 10; @@ -947,9 +947,9 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_tracer_set_enabled("round_robin", 1); - GPR_ASSERT(grpc_lb_policy_create(&exec_ctx, "this-lb-policy-does-not-exist", - NULL) == NULL); - GPR_ASSERT(grpc_lb_policy_create(&exec_ctx, NULL, NULL) == NULL); + GPR_ASSERT(grpc_lb_policy_create("this-lb-policy-does-not-exist", NULL) == + NULL); + GPR_ASSERT(grpc_lb_policy_create(NULL, NULL) == NULL); spec = test_spec_create(NUM_ITERS, NUM_SERVERS); /* everything is fine, all servers stay up the whole time and life's peachy @@ -1003,7 +1003,7 @@ int main(int argc, char **argv) { test_ping(); test_get_channel_info(); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_shutdown(); return 0; } diff --git a/test/core/client_channel/parse_address_test.c b/test/core/client_channel/parse_address_test.c index d011176869c..6e1a69a581c 100644 --- a/test/core/client_channel/parse_address_test.c +++ b/test/core/client_channel/parse_address_test.c @@ -33,8 +33,8 @@ #ifdef GRPC_HAVE_UNIX_SOCKET static void test_grpc_parse_unix(const char *uri_text, const char *pathname) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri *uri = grpc_uri_parse(&exec_ctx, uri_text, 0); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_uri *uri = grpc_uri_parse(uri_text, 0); grpc_resolved_address addr; GPR_ASSERT(1 == grpc_parse_unix(uri, &addr)); @@ -43,7 +43,7 @@ static void test_grpc_parse_unix(const char *uri_text, const char *pathname) { GPR_ASSERT(0 == strcmp(addr_un->sun_path, pathname)); grpc_uri_destroy(uri); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } #else /* GRPC_HAVE_UNIX_SOCKET */ @@ -54,8 +54,8 @@ static void test_grpc_parse_unix(const char *uri_text, const char *pathname) {} static void test_grpc_parse_ipv4(const char *uri_text, const char *host, unsigned short port) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri *uri = grpc_uri_parse(&exec_ctx, uri_text, 0); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_uri *uri = grpc_uri_parse(uri_text, 0); grpc_resolved_address addr; char ntop_buf[INET_ADDRSTRLEN]; @@ -68,13 +68,13 @@ static void test_grpc_parse_ipv4(const char *uri_text, const char *host, GPR_ASSERT(ntohs(addr_in->sin_port) == port); grpc_uri_destroy(uri); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void test_grpc_parse_ipv6(const char *uri_text, const char *host, unsigned short port, uint32_t scope_id) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri *uri = grpc_uri_parse(&exec_ctx, uri_text, 0); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_uri *uri = grpc_uri_parse(uri_text, 0); grpc_resolved_address addr; char ntop_buf[INET6_ADDRSTRLEN]; @@ -88,7 +88,7 @@ static void test_grpc_parse_ipv6(const char *uri_text, const char *host, GPR_ASSERT(addr_in6->sin6_scope_id == scope_id); grpc_uri_destroy(uri); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } int main(int argc, char **argv) { diff --git a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c index 4597285063e..3715fbdc02e 100644 --- a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c +++ b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c @@ -35,8 +35,7 @@ static gpr_mu g_mu; static bool g_fail_resolution = true; static grpc_combiner *g_combiner; -static void my_resolve_address(grpc_exec_ctx *exec_ctx, const char *addr, - const char *default_port, +static void my_resolve_address(const char *addr, const char *default_port, grpc_pollset_set *interested_parties, grpc_closure *on_done, grpc_resolved_addresses **addrs) { @@ -54,13 +53,13 @@ static void my_resolve_address(grpc_exec_ctx *exec_ctx, const char *addr, (*addrs)->addrs = gpr_malloc(sizeof(*(*addrs)->addrs)); (*addrs)->addrs[0].len = 123; } - GRPC_CLOSURE_SCHED(exec_ctx, on_done, error); + GRPC_CLOSURE_SCHED(on_done, error); } static grpc_ares_request *my_dns_lookup_ares( - grpc_exec_ctx *exec_ctx, const char *dns_server, const char *addr, - const char *default_port, grpc_pollset_set *interested_parties, - grpc_closure *on_done, grpc_lb_addresses **lb_addrs, bool check_grpclb, + const char *dns_server, const char *addr, const char *default_port, + grpc_pollset_set *interested_parties, grpc_closure *on_done, + grpc_lb_addresses **lb_addrs, bool check_grpclb, char **service_config_json) { gpr_mu_lock(&g_mu); GPR_ASSERT(0 == strcmp("test", addr)); @@ -74,27 +73,26 @@ static grpc_ares_request *my_dns_lookup_ares( *lb_addrs = grpc_lb_addresses_create(1, NULL); grpc_lb_addresses_set_address(*lb_addrs, 0, NULL, 0, false, NULL, NULL); } - GRPC_CLOSURE_SCHED(exec_ctx, on_done, error); + GRPC_CLOSURE_SCHED(on_done, error); return NULL; } -static grpc_resolver *create_resolver(grpc_exec_ctx *exec_ctx, - const char *name) { +static grpc_resolver *create_resolver(const char *name) { grpc_resolver_factory *factory = grpc_resolver_factory_lookup("dns"); - grpc_uri *uri = grpc_uri_parse(exec_ctx, name, 0); + grpc_uri *uri = grpc_uri_parse(name, 0); GPR_ASSERT(uri); grpc_resolver_args args; memset(&args, 0, sizeof(args)); args.uri = uri; args.combiner = g_combiner; grpc_resolver *resolver = - grpc_resolver_factory_create_resolver(exec_ctx, factory, &args); + grpc_resolver_factory_create_resolver(factory, &args); grpc_resolver_factory_unref(factory); grpc_uri_destroy(uri); return resolver; } -static void on_done(grpc_exec_ctx *exec_ctx, void *ev, grpc_error *error) { +static void on_done(void *ev, grpc_error *error) { gpr_event_set(ev, (void *)1); } @@ -105,9 +103,9 @@ static bool wait_loop(int deadline_seconds, gpr_event *ev) { if (gpr_event_wait(ev, grpc_timeout_seconds_to_deadline(1))) return true; deadline_seconds--; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_timer_check(&exec_ctx, NULL); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_timer_check(NULL); + grpc_exec_ctx_finish(); } return false; } @@ -118,26 +116,24 @@ typedef struct next_args { grpc_closure *on_complete; } next_args; -static void call_resolver_next_now_lock_taken(grpc_exec_ctx *exec_ctx, - void *arg, +static void call_resolver_next_now_lock_taken(void *arg, grpc_error *error_unused) { next_args *a = arg; - grpc_resolver_next_locked(exec_ctx, a->resolver, a->result, a->on_complete); + grpc_resolver_next_locked(a->resolver, a->result, a->on_complete); gpr_free(a); } -static void call_resolver_next_after_locking(grpc_exec_ctx *exec_ctx, - grpc_resolver *resolver, +static void call_resolver_next_after_locking(grpc_resolver *resolver, grpc_channel_args **result, grpc_closure *on_complete) { next_args *a = gpr_malloc(sizeof(*a)); a->resolver = resolver; a->result = result; a->on_complete = on_complete; - GRPC_CLOSURE_SCHED(exec_ctx, GRPC_CLOSURE_CREATE( - call_resolver_next_now_lock_taken, a, - grpc_combiner_scheduler(resolver->combiner)), - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED( + GRPC_CLOSURE_CREATE(call_resolver_next_now_lock_taken, a, + grpc_combiner_scheduler(resolver->combiner)), + GRPC_ERROR_NONE); } int main(int argc, char **argv) { @@ -150,30 +146,30 @@ int main(int argc, char **argv) { grpc_dns_lookup_ares = my_dns_lookup_ares; grpc_channel_args *result = (grpc_channel_args *)1; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resolver *resolver = create_resolver(&exec_ctx, "dns:test"); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resolver *resolver = create_resolver("dns:test"); gpr_event ev1; gpr_event_init(&ev1); call_resolver_next_after_locking( - &exec_ctx, resolver, &result, + resolver, &result, GRPC_CLOSURE_CREATE(on_done, &ev1, grpc_schedule_on_exec_ctx)); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); GPR_ASSERT(wait_loop(5, &ev1)); GPR_ASSERT(result == NULL); gpr_event ev2; gpr_event_init(&ev2); call_resolver_next_after_locking( - &exec_ctx, resolver, &result, + resolver, &result, GRPC_CLOSURE_CREATE(on_done, &ev2, grpc_schedule_on_exec_ctx)); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); GPR_ASSERT(wait_loop(30, &ev2)); GPR_ASSERT(result != NULL); - grpc_channel_args_destroy(&exec_ctx, result); - GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "test"); - GRPC_COMBINER_UNREF(&exec_ctx, g_combiner, "test"); - grpc_exec_ctx_finish(&exec_ctx); + grpc_channel_args_destroy(result); + GRPC_RESOLVER_UNREF(resolver, "test"); + GRPC_COMBINER_UNREF(g_combiner, "test"); + grpc_exec_ctx_finish(); grpc_shutdown(); gpr_mu_destroy(&g_mu); diff --git a/test/core/client_channel/resolvers/dns_resolver_test.c b/test/core/client_channel/resolvers/dns_resolver_test.c index a14926f1730..3717d0efd7a 100644 --- a/test/core/client_channel/resolvers/dns_resolver_test.c +++ b/test/core/client_channel/resolvers/dns_resolver_test.c @@ -28,8 +28,8 @@ static grpc_combiner *g_combiner; static void test_succeeds(grpc_resolver_factory *factory, const char *string) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri *uri = grpc_uri_parse(&exec_ctx, string, 0); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_uri *uri = grpc_uri_parse(string, 0); grpc_resolver_args args; grpc_resolver *resolver; gpr_log(GPR_DEBUG, "test: '%s' should be valid for '%s'", string, @@ -38,16 +38,16 @@ static void test_succeeds(grpc_resolver_factory *factory, const char *string) { memset(&args, 0, sizeof(args)); args.uri = uri; args.combiner = g_combiner; - resolver = grpc_resolver_factory_create_resolver(&exec_ctx, factory, &args); + resolver = grpc_resolver_factory_create_resolver(factory, &args); GPR_ASSERT(resolver != NULL); - GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "test_succeeds"); + GRPC_RESOLVER_UNREF(resolver, "test_succeeds"); grpc_uri_destroy(uri); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void test_fails(grpc_resolver_factory *factory, const char *string) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri *uri = grpc_uri_parse(&exec_ctx, string, 0); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_uri *uri = grpc_uri_parse(string, 0); grpc_resolver_args args; grpc_resolver *resolver; gpr_log(GPR_DEBUG, "test: '%s' should be invalid for '%s'", string, @@ -56,10 +56,10 @@ static void test_fails(grpc_resolver_factory *factory, const char *string) { memset(&args, 0, sizeof(args)); args.uri = uri; args.combiner = g_combiner; - resolver = grpc_resolver_factory_create_resolver(&exec_ctx, factory, &args); + resolver = grpc_resolver_factory_create_resolver(factory, &args); GPR_ASSERT(resolver == NULL); grpc_uri_destroy(uri); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } int main(int argc, char **argv) { @@ -82,9 +82,9 @@ int main(int argc, char **argv) { grpc_resolver_factory_unref(dns); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_COMBINER_UNREF(&exec_ctx, g_combiner, "test"); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_COMBINER_UNREF(g_combiner, "test"); + grpc_exec_ctx_finish(); } grpc_shutdown(); diff --git a/test/core/client_channel/resolvers/fake_resolver_test.c b/test/core/client_channel/resolvers/fake_resolver_test.c index 9b0854d6d8d..8cc5fc6ce5b 100644 --- a/test/core/client_channel/resolvers/fake_resolver_test.c +++ b/test/core/client_channel/resolvers/fake_resolver_test.c @@ -33,7 +33,7 @@ #include "test/core/util/test_config.h" static grpc_resolver *build_fake_resolver( - grpc_exec_ctx *exec_ctx, grpc_combiner *combiner, + grpc_combiner *combiner, grpc_fake_resolver_response_generator *response_generator) { grpc_resolver_factory *factory = grpc_resolver_factory_lookup("fake"); grpc_arg generator_arg = @@ -44,7 +44,7 @@ static grpc_resolver *build_fake_resolver( args.args = &channel_args; args.combiner = combiner; grpc_resolver *resolver = - grpc_resolver_factory_create_resolver(exec_ctx, factory, &args); + grpc_resolver_factory_create_resolver(factory, &args); grpc_resolver_factory_unref(factory); return resolver; } @@ -55,7 +55,7 @@ typedef struct on_resolution_arg { gpr_event ev; } on_resolution_arg; -void on_resolution_cb(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +void on_resolution_cb(void *arg, grpc_error *error) { on_resolution_arg *res = arg; // We only check the addresses channel arg because that's the only one // explicitly set by the test via @@ -66,24 +66,23 @@ void on_resolution_cb(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { grpc_lb_addresses_find_channel_arg(res->expected_resolver_result); GPR_ASSERT( grpc_lb_addresses_cmp(actual_lb_addresses, expected_lb_addresses) == 0); - grpc_channel_args_destroy(exec_ctx, res->resolver_result); - grpc_channel_args_destroy(exec_ctx, res->expected_resolver_result); + grpc_channel_args_destroy(res->resolver_result); + grpc_channel_args_destroy(res->expected_resolver_result); gpr_event_set(&res->ev, (void *)1); } static void test_fake_resolver() { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_combiner *combiner = grpc_combiner_create(); // Create resolver. grpc_fake_resolver_response_generator *response_generator = grpc_fake_resolver_response_generator_create(); - grpc_resolver *resolver = - build_fake_resolver(&exec_ctx, combiner, response_generator); + grpc_resolver *resolver = build_fake_resolver(combiner, response_generator); GPR_ASSERT(resolver != NULL); // Setup expectations. - grpc_uri *uris[] = {grpc_uri_parse(&exec_ctx, "ipv4:10.2.1.1:1234", true), - grpc_uri_parse(&exec_ctx, "ipv4:127.0.0.1:4321", true)}; + grpc_uri *uris[] = {grpc_uri_parse("ipv4:10.2.1.1:1234", true), + grpc_uri_parse("ipv4:127.0.0.1:4321", true)}; char *balancer_names[] = {"name1", "name2"}; const bool is_balancer[] = {true, false}; grpc_lb_addresses *addresses = grpc_lb_addresses_create(3, NULL); @@ -96,7 +95,7 @@ static void test_fake_resolver() { grpc_lb_addresses_create_channel_arg(addresses); grpc_channel_args *results = grpc_channel_args_copy_and_add(NULL, &addresses_arg, 1); - grpc_lb_addresses_destroy(&exec_ctx, addresses); + grpc_lb_addresses_destroy(addresses); on_resolution_arg on_res_arg; memset(&on_res_arg, 0, sizeof(on_res_arg)); on_res_arg.expected_resolver_result = results; @@ -106,17 +105,16 @@ static void test_fake_resolver() { // Set resolver results and trigger first resolution. on_resolution_cb // performs the checks. - grpc_fake_resolver_response_generator_set_response( - &exec_ctx, response_generator, results); - grpc_resolver_next_locked(&exec_ctx, resolver, &on_res_arg.resolver_result, + grpc_fake_resolver_response_generator_set_response(response_generator, + results); + grpc_resolver_next_locked(resolver, &on_res_arg.resolver_result, on_resolution); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); GPR_ASSERT(gpr_event_wait(&on_res_arg.ev, grpc_timeout_seconds_to_deadline(5)) != NULL); // Setup update. - grpc_uri *uris_update[] = { - grpc_uri_parse(&exec_ctx, "ipv4:192.168.1.0:31416", true)}; + grpc_uri *uris_update[] = {grpc_uri_parse("ipv4:192.168.1.0:31416", true)}; char *balancer_names_update[] = {"name3"}; const bool is_balancer_update[] = {false}; grpc_lb_addresses *addresses_update = grpc_lb_addresses_create(1, NULL); @@ -131,7 +129,7 @@ static void test_fake_resolver() { grpc_lb_addresses_create_channel_arg(addresses_update); grpc_channel_args *results_update = grpc_channel_args_copy_and_add(NULL, &addresses_update_arg, 1); - grpc_lb_addresses_destroy(&exec_ctx, addresses_update); + grpc_lb_addresses_destroy(addresses_update); // Setup expectations for the update. on_resolution_arg on_res_arg_update; @@ -142,27 +140,27 @@ static void test_fake_resolver() { grpc_combiner_scheduler(combiner)); // Set updated resolver results and trigger a second resolution. - grpc_fake_resolver_response_generator_set_response( - &exec_ctx, response_generator, results_update); - grpc_resolver_next_locked(&exec_ctx, resolver, - &on_res_arg_update.resolver_result, on_resolution); - grpc_exec_ctx_flush(&exec_ctx); + grpc_fake_resolver_response_generator_set_response(response_generator, + results_update); + grpc_resolver_next_locked(resolver, &on_res_arg_update.resolver_result, + on_resolution); + grpc_exec_ctx_flush(); GPR_ASSERT(gpr_event_wait(&on_res_arg_update.ev, grpc_timeout_seconds_to_deadline(5)) != NULL); // Requesting a new resolution without re-senting the response shouldn't // trigger the resolution callback. memset(&on_res_arg, 0, sizeof(on_res_arg)); - grpc_resolver_next_locked(&exec_ctx, resolver, &on_res_arg.resolver_result, + grpc_resolver_next_locked(resolver, &on_res_arg.resolver_result, on_resolution); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); GPR_ASSERT(gpr_event_wait(&on_res_arg.ev, grpc_timeout_milliseconds_to_deadline(100)) == NULL); - GRPC_COMBINER_UNREF(&exec_ctx, combiner, "test_fake_resolver"); - GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "test_fake_resolver"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(combiner, "test_fake_resolver"); + GRPC_RESOLVER_UNREF(resolver, "test_fake_resolver"); + grpc_exec_ctx_finish(); grpc_fake_resolver_response_generator_unref(response_generator); } diff --git a/test/core/client_channel/resolvers/sockaddr_resolver_test.c b/test/core/client_channel/resolvers/sockaddr_resolver_test.c index 8b88619164c..e69c68141bb 100644 --- a/test/core/client_channel/resolvers/sockaddr_resolver_test.c +++ b/test/core/client_channel/resolvers/sockaddr_resolver_test.c @@ -35,14 +35,14 @@ typedef struct on_resolution_arg { grpc_channel_args *resolver_result; } on_resolution_arg; -void on_resolution_cb(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +void on_resolution_cb(void *arg, grpc_error *error) { on_resolution_arg *res = arg; - grpc_channel_args_destroy(exec_ctx, res->resolver_result); + grpc_channel_args_destroy(res->resolver_result); } static void test_succeeds(grpc_resolver_factory *factory, const char *string) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri *uri = grpc_uri_parse(&exec_ctx, string, 0); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_uri *uri = grpc_uri_parse(string, 0); grpc_resolver_args args; grpc_resolver *resolver; gpr_log(GPR_DEBUG, "test: '%s' should be valid for '%s'", string, @@ -51,7 +51,7 @@ static void test_succeeds(grpc_resolver_factory *factory, const char *string) { memset(&args, 0, sizeof(args)); args.uri = uri; args.combiner = g_combiner; - resolver = grpc_resolver_factory_create_resolver(&exec_ctx, factory, &args); + resolver = grpc_resolver_factory_create_resolver(factory, &args); GPR_ASSERT(resolver != NULL); on_resolution_arg on_res_arg; @@ -60,16 +60,16 @@ static void test_succeeds(grpc_resolver_factory *factory, const char *string) { grpc_closure *on_resolution = GRPC_CLOSURE_CREATE( on_resolution_cb, &on_res_arg, grpc_schedule_on_exec_ctx); - grpc_resolver_next_locked(&exec_ctx, resolver, &on_res_arg.resolver_result, + grpc_resolver_next_locked(resolver, &on_res_arg.resolver_result, on_resolution); - GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "test_succeeds"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_RESOLVER_UNREF(resolver, "test_succeeds"); + grpc_exec_ctx_finish(); grpc_uri_destroy(uri); } static void test_fails(grpc_resolver_factory *factory, const char *string) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri *uri = grpc_uri_parse(&exec_ctx, string, 0); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_uri *uri = grpc_uri_parse(string, 0); grpc_resolver_args args; grpc_resolver *resolver; gpr_log(GPR_DEBUG, "test: '%s' should be invalid for '%s'", string, @@ -78,10 +78,10 @@ static void test_fails(grpc_resolver_factory *factory, const char *string) { memset(&args, 0, sizeof(args)); args.uri = uri; args.combiner = g_combiner; - resolver = grpc_resolver_factory_create_resolver(&exec_ctx, factory, &args); + resolver = grpc_resolver_factory_create_resolver(factory, &args); GPR_ASSERT(resolver == NULL); grpc_uri_destroy(uri); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } int main(int argc, char **argv) { @@ -112,9 +112,9 @@ int main(int argc, char **argv) { grpc_resolver_factory_unref(ipv6); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_COMBINER_UNREF(&exec_ctx, g_combiner, "test"); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_COMBINER_UNREF(g_combiner, "test"); + grpc_exec_ctx_finish(); } grpc_shutdown(); diff --git a/test/core/client_channel/uri_fuzzer_test.c b/test/core/client_channel/uri_fuzzer_test.c index e51d0031ec1..2d91b92925b 100644 --- a/test/core/client_channel/uri_fuzzer_test.c +++ b/test/core/client_channel/uri_fuzzer_test.c @@ -33,12 +33,12 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { memcpy(s, data, size); s[size] = 0; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_uri *x; - if ((x = grpc_uri_parse(&exec_ctx, s, 1))) { + if ((x = grpc_uri_parse(s, 1))) { grpc_uri_destroy(x); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_free(s); return 0; } diff --git a/test/core/client_channel/uri_parser_test.c b/test/core/client_channel/uri_parser_test.c index f53cae196b0..643035d9ebc 100644 --- a/test/core/client_channel/uri_parser_test.c +++ b/test/core/client_channel/uri_parser_test.c @@ -28,29 +28,29 @@ static void test_succeeds(const char *uri_text, const char *scheme, const char *authority, const char *path, const char *query, const char *fragment) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri *uri = grpc_uri_parse(&exec_ctx, uri_text, 0); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_uri *uri = grpc_uri_parse(uri_text, 0); GPR_ASSERT(uri); GPR_ASSERT(0 == strcmp(scheme, uri->scheme)); GPR_ASSERT(0 == strcmp(authority, uri->authority)); GPR_ASSERT(0 == strcmp(path, uri->path)); GPR_ASSERT(0 == strcmp(query, uri->query)); GPR_ASSERT(0 == strcmp(fragment, uri->fragment)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_uri_destroy(uri); } static void test_fails(const char *uri_text) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT(NULL == grpc_uri_parse(&exec_ctx, uri_text, 0)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT(NULL == grpc_uri_parse(uri_text, 0)); + grpc_exec_ctx_finish(); } static void test_query_parts() { { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; const char *uri_text = "http://foo/path?a&b=B&c=&#frag"; - grpc_uri *uri = grpc_uri_parse(&exec_ctx, uri_text, 0); + grpc_uri *uri = grpc_uri_parse(uri_text, 0); GPR_ASSERT(uri); GPR_ASSERT(0 == strcmp("http", uri->scheme)); @@ -77,14 +77,14 @@ static void test_query_parts() { GPR_ASSERT(NULL == grpc_uri_get_query_arg(uri, "")); GPR_ASSERT(0 == strcmp("frag", uri->fragment)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_uri_destroy(uri); } { /* test the current behavior of multiple query part values */ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; const char *uri_text = "http://auth/path?foo=bar=baz&foobar=="; - grpc_uri *uri = grpc_uri_parse(&exec_ctx, uri_text, 0); + grpc_uri *uri = grpc_uri_parse(uri_text, 0); GPR_ASSERT(uri); GPR_ASSERT(0 == strcmp("http", uri->scheme)); @@ -96,14 +96,14 @@ static void test_query_parts() { GPR_ASSERT(0 == strcmp("bar", grpc_uri_get_query_arg(uri, "foo"))); GPR_ASSERT(0 == strcmp("", grpc_uri_get_query_arg(uri, "foobar"))); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_uri_destroy(uri); } { /* empty query */ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; const char *uri_text = "http://foo/path"; - grpc_uri *uri = grpc_uri_parse(&exec_ctx, uri_text, 0); + grpc_uri *uri = grpc_uri_parse(uri_text, 0); GPR_ASSERT(uri); GPR_ASSERT(0 == strcmp("http", uri->scheme)); @@ -114,7 +114,7 @@ static void test_query_parts() { GPR_ASSERT(NULL == uri->query_parts); GPR_ASSERT(NULL == uri->query_parts_values); GPR_ASSERT(0 == strcmp("", uri->fragment)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_uri_destroy(uri); } } diff --git a/test/core/compression/algorithm_test.c b/test/core/compression/algorithm_test.c index a11e6e90ace..9a771d9494f 100644 --- a/test/core/compression/algorithm_test.c +++ b/test/core/compression/algorithm_test.c @@ -39,7 +39,7 @@ static void test_algorithm_mesh(void) { grpc_compression_algorithm parsed; grpc_slice mdstr; grpc_mdelem mdelem; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; GPR_ASSERT( grpc_compression_algorithm_name((grpc_compression_algorithm)i, &name)); GPR_ASSERT(grpc_compression_algorithm_parse( @@ -51,9 +51,9 @@ static void test_algorithm_mesh(void) { mdelem = grpc_compression_encoding_mdelem(parsed); GPR_ASSERT(grpc_slice_eq(GRPC_MDVALUE(mdelem), mdstr)); GPR_ASSERT(grpc_slice_eq(GRPC_MDKEY(mdelem), GRPC_MDSTR_GRPC_ENCODING)); - grpc_slice_unref_internal(&exec_ctx, mdstr); - GRPC_MDELEM_UNREF(&exec_ctx, mdelem); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref_internal(mdstr); + GRPC_MDELEM_UNREF(mdelem); + grpc_exec_ctx_finish(); } /* test failure */ @@ -62,7 +62,7 @@ static void test_algorithm_mesh(void) { } static void test_algorithm_failure(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_slice mdstr; gpr_log(GPR_DEBUG, "test_algorithm_failure"); @@ -80,8 +80,8 @@ static void test_algorithm_failure(void) { GPR_ASSERT(grpc_slice_eq( grpc_compression_algorithm_slice(GRPC_COMPRESS_ALGORITHMS_COUNT + 1), grpc_empty_slice())); - grpc_slice_unref_internal(&exec_ctx, mdstr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref_internal(mdstr); + grpc_exec_ctx_finish(); } int main(int argc, char **argv) { diff --git a/test/core/compression/message_compress_test.c b/test/core/compression/message_compress_test.c index f7f4893deef..641e8f89007 100644 --- a/test/core/compression/message_compress_test.c +++ b/test/core/compression/message_compress_test.c @@ -69,10 +69,9 @@ static void assert_passthrough(grpc_slice value, grpc_split_slices_to_buffer(uncompressed_split_mode, &value, 1, &input); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - was_compressed = - grpc_msg_compress(&exec_ctx, algorithm, &input, &compressed_raw); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + was_compressed = grpc_msg_compress(algorithm, &input, &compressed_raw); + grpc_exec_ctx_finish(); } GPR_ASSERT(input.count > 0); @@ -91,11 +90,10 @@ static void assert_passthrough(grpc_slice value, grpc_split_slice_buffer(compressed_split_mode, &compressed_raw, &compressed); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; GPR_ASSERT(grpc_msg_decompress( - &exec_ctx, was_compressed ? algorithm : GRPC_COMPRESS_NONE, &compressed, - &output)); - grpc_exec_ctx_finish(&exec_ctx); + was_compressed ? algorithm : GRPC_COMPRESS_NONE, &compressed, &output)); + grpc_exec_ctx_finish(); } final = grpc_slice_merge(output.slices, output.count); @@ -156,9 +154,9 @@ static void test_tiny_data_compress(void) { for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { if (i == GRPC_COMPRESS_NONE) continue; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT(0 == grpc_msg_compress(&exec_ctx, i, &input, &output)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT(0 == grpc_msg_compress(i, &input, &output)); + grpc_exec_ctx_finish(); GPR_ASSERT(1 == output.count); } @@ -178,9 +176,9 @@ static void test_bad_decompression_data_crc(void) { grpc_slice_buffer_init(&output); grpc_slice_buffer_add(&input, create_test_value(ONE_MB_A)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; /* compress it */ - grpc_msg_compress(&exec_ctx, GRPC_COMPRESS_GZIP, &input, &corrupted); + grpc_msg_compress(GRPC_COMPRESS_GZIP, &input, &corrupted); /* corrupt the output by smashing the CRC */ GPR_ASSERT(corrupted.count > 1); GPR_ASSERT(GRPC_SLICE_LENGTH(corrupted.slices[1]) > 8); @@ -188,9 +186,8 @@ static void test_bad_decompression_data_crc(void) { memcpy(GRPC_SLICE_START_PTR(corrupted.slices[1]) + idx, &bad, 4); /* try (and fail) to decompress the corrupted compresed buffer */ - GPR_ASSERT(0 == grpc_msg_decompress(&exec_ctx, GRPC_COMPRESS_GZIP, &corrupted, - &output)); - grpc_exec_ctx_finish(&exec_ctx); + GPR_ASSERT(0 == grpc_msg_decompress(GRPC_COMPRESS_GZIP, &corrupted, &output)); + grpc_exec_ctx_finish(); grpc_slice_buffer_destroy(&input); grpc_slice_buffer_destroy(&corrupted); @@ -209,10 +206,9 @@ static void test_bad_decompression_data_trailing_garbage(void) { "\x78\xda\x63\x60\x60\x60\x00\x00\x00\x04\x00\x01\x99", 13)); /* try (and fail) to decompress the invalid compresed buffer */ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT(0 == grpc_msg_decompress(&exec_ctx, GRPC_COMPRESS_DEFLATE, &input, - &output)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT(0 == grpc_msg_decompress(GRPC_COMPRESS_DEFLATE, &input, &output)); + grpc_exec_ctx_finish(); grpc_slice_buffer_destroy(&input); grpc_slice_buffer_destroy(&output); @@ -228,10 +224,9 @@ static void test_bad_decompression_data_stream(void) { grpc_slice_from_copied_buffer("\x78\xda\xff\xff", 4)); /* try (and fail) to decompress the invalid compresed buffer */ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT(0 == grpc_msg_decompress(&exec_ctx, GRPC_COMPRESS_DEFLATE, &input, - &output)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT(0 == grpc_msg_decompress(GRPC_COMPRESS_DEFLATE, &input, &output)); + grpc_exec_ctx_finish(); grpc_slice_buffer_destroy(&input); grpc_slice_buffer_destroy(&output); @@ -247,15 +242,15 @@ static void test_bad_compression_algorithm(void) { grpc_slice_buffer_add( &input, grpc_slice_from_copied_string("Never gonna give you up")); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - was_compressed = grpc_msg_compress(&exec_ctx, GRPC_COMPRESS_ALGORITHMS_COUNT, - &input, &output); + exec_ctx = GRPC_EXEC_CTX_INIT; + was_compressed = + grpc_msg_compress(GRPC_COMPRESS_ALGORITHMS_COUNT, &input, &output); GPR_ASSERT(0 == was_compressed); - was_compressed = grpc_msg_compress( - &exec_ctx, GRPC_COMPRESS_ALGORITHMS_COUNT + 123, &input, &output); + was_compressed = + grpc_msg_compress(GRPC_COMPRESS_ALGORITHMS_COUNT + 123, &input, &output); GPR_ASSERT(0 == was_compressed); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_slice_buffer_destroy(&input); grpc_slice_buffer_destroy(&output); @@ -271,15 +266,15 @@ static void test_bad_decompression_algorithm(void) { grpc_slice_buffer_add(&input, grpc_slice_from_copied_string( "I'm not really compressed but it doesn't matter")); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - was_decompressed = grpc_msg_decompress( - &exec_ctx, GRPC_COMPRESS_ALGORITHMS_COUNT, &input, &output); + exec_ctx = GRPC_EXEC_CTX_INIT; + was_decompressed = + grpc_msg_decompress(GRPC_COMPRESS_ALGORITHMS_COUNT, &input, &output); GPR_ASSERT(0 == was_decompressed); - was_decompressed = grpc_msg_decompress( - &exec_ctx, GRPC_COMPRESS_ALGORITHMS_COUNT + 123, &input, &output); + was_decompressed = grpc_msg_decompress(GRPC_COMPRESS_ALGORITHMS_COUNT + 123, + &input, &output); GPR_ASSERT(0 == was_decompressed); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_slice_buffer_destroy(&input); grpc_slice_buffer_destroy(&output); diff --git a/test/core/debug/stats_test.cc b/test/core/debug/stats_test.cc index c85ab3598ab..ac7c3af8a43 100644 --- a/test/core/debug/stats_test.cc +++ b/test/core/debug/stats_test.cc @@ -47,9 +47,9 @@ TEST(StatsTest, IncCounters) { for (int i = 0; i < GRPC_STATS_COUNTER_COUNT; i++) { Snapshot snapshot; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_STATS_INC_COUNTER(&exec_ctx, (grpc_stats_counters)i); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + GRPC_STATS_INC_COUNTER((grpc_stats_counters)i); + grpc_exec_ctx_finish(); EXPECT_EQ(snapshot.delta().counters[i], 1); } @@ -58,9 +58,9 @@ TEST(StatsTest, IncCounters) { TEST(StatsTest, IncSpecificCounter) { Snapshot snapshot; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_STATS_INC_SYSCALL_POLL(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + GRPC_STATS_INC_SYSCALL_POLL(); + grpc_exec_ctx_finish(); EXPECT_EQ(snapshot.delta().counters[GRPC_STATS_COUNTER_SYSCALL_POLL], 1); } @@ -99,9 +99,9 @@ TEST(StatsTest, IncHistogram) { int expected_bucket = FindExpectedBucket(i, j); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_stats_inc_histogram[i](&exec_ctx, j); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); auto delta = snapshot.delta(); diff --git a/test/core/end2end/bad_server_response_test.c b/test/core/end2end/bad_server_response_test.cc similarity index 91% rename from test/core/end2end/bad_server_response_test.c rename to test/core/end2end/bad_server_response_test.cc index 2070fa5b02a..aa4f0e13d7a 100644 --- a/test/core/end2end/bad_server_response_test.c +++ b/test/core/end2end/bad_server_response_test.cc @@ -91,22 +91,22 @@ static grpc_closure on_write; static void *tag(intptr_t t) { return (void *)t; } -static void done_write(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void done_write(void *arg, grpc_error *error) { GPR_ASSERT(error == GRPC_ERROR_NONE); gpr_atm_rel_store(&state.done_atm, 1); } -static void handle_write(grpc_exec_ctx *exec_ctx) { +static void handle_write() { grpc_slice slice = grpc_slice_from_copied_buffer( state.response_payload, state.response_payload_length); grpc_slice_buffer_reset_and_unref(&state.outgoing_buffer); grpc_slice_buffer_add(&state.outgoing_buffer, slice); - grpc_endpoint_write(exec_ctx, state.tcp, &state.outgoing_buffer, &on_write); + grpc_endpoint_write(state.tcp, &state.outgoing_buffer, &on_write); } -static void handle_read(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void handle_read(void *arg, grpc_error *error) { GPR_ASSERT(error == GRPC_ERROR_NONE); state.incoming_data_length += state.temp_incoming_buffer.length; @@ -123,14 +123,13 @@ static void handle_read(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { SERVER_INCOMING_DATA_LENGTH_LOWER_THRESHOLD); if (state.incoming_data_length >= SERVER_INCOMING_DATA_LENGTH_LOWER_THRESHOLD) { - handle_write(exec_ctx); + handle_write(); } else { - grpc_endpoint_read(exec_ctx, state.tcp, &state.temp_incoming_buffer, - &on_read); + grpc_endpoint_read(state.tcp, &state.temp_incoming_buffer, &on_read); } } -static void on_connect(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *tcp, +static void on_connect(void *arg, grpc_endpoint *tcp, grpc_pollset *accepting_pollset, grpc_tcp_server_acceptor *acceptor) { gpr_free(acceptor); @@ -141,8 +140,8 @@ static void on_connect(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *tcp, grpc_slice_buffer_init(&state.outgoing_buffer); state.tcp = tcp; state.incoming_data_length = 0; - grpc_endpoint_add_to_pollset(exec_ctx, tcp, server->pollset); - grpc_endpoint_read(exec_ctx, tcp, &state.temp_incoming_buffer, &on_read); + grpc_endpoint_add_to_pollset(tcp, server->pollset); + grpc_endpoint_read(tcp, &state.temp_incoming_buffer, &on_read); } static gpr_timespec n_sec_deadline(int seconds) { @@ -217,10 +216,10 @@ static void start_rpc(int target_port, grpc_status_code expected_status, cq_verifier_destroy(cqv); } -static void cleanup_rpc(grpc_exec_ctx *exec_ctx) { +static void cleanup_rpc() { grpc_event ev; - grpc_slice_buffer_destroy_internal(exec_ctx, &state.temp_incoming_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &state.outgoing_buffer); + grpc_slice_buffer_destroy_internal(&state.temp_incoming_buffer); + grpc_slice_buffer_destroy_internal(&state.outgoing_buffer); grpc_call_unref(state.call); grpc_completion_queue_shutdown(state.cq); do { @@ -270,7 +269,7 @@ static void run_test(const char *response_payload, grpc_status_code expected_status, const char *expected_detail) { test_tcp_server test_server; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; gpr_event ev; grpc_init(); @@ -287,11 +286,11 @@ static void run_test(const char *response_payload, gpr_event_wait(&ev, gpr_inf_future(GPR_CLOCK_REALTIME)); /* clean up */ - grpc_endpoint_shutdown(&exec_ctx, state.tcp, + grpc_endpoint_shutdown(state.tcp, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); - grpc_endpoint_destroy(&exec_ctx, state.tcp); - cleanup_rpc(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + grpc_endpoint_destroy(state.tcp); + cleanup_rpc(); + grpc_exec_ctx_finish(); test_tcp_server_destroy(&test_server); grpc_shutdown(); diff --git a/test/core/end2end/connection_refused_test.c b/test/core/end2end/connection_refused_test.c index 40227dece41..c851271e445 100644 --- a/test/core/end2end/connection_refused_test.c +++ b/test/core/end2end/connection_refused_test.c @@ -131,9 +131,9 @@ static void run_test(bool wait_for_ready, bool use_service_config) { grpc_metadata_array_destroy(&trailing_metadata_recv); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - if (args != NULL) grpc_channel_args_destroy(&exec_ctx, args); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + if (args != NULL) grpc_channel_args_destroy(args); + grpc_exec_ctx_finish(); } grpc_shutdown(); diff --git a/test/core/end2end/fixtures/h2_census.c b/test/core/end2end/fixtures/h2_census.c index 9870ccb34a2..325615c8351 100644 --- a/test/core/end2end/fixtures/h2_census.c +++ b/test/core/end2end/fixtures/h2_census.c @@ -72,9 +72,9 @@ void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f, f->client = grpc_insecure_channel_create(ffd->localaddr, client_args, NULL); GPR_ASSERT(f->client); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, client_args); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(client_args); + grpc_exec_ctx_finish(); } } @@ -88,9 +88,9 @@ void chttp2_init_server_fullstack(grpc_end2end_test_fixture *f, server_args = grpc_channel_args_copy_and_add(server_args, &arg, 1); f->server = grpc_server_create(server_args, NULL); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(server_args); + grpc_exec_ctx_finish(); } grpc_server_register_completion_queue(f->server, f->cq, NULL); GPR_ASSERT(grpc_server_add_insecure_http2_port(f->server, ffd->localaddr)); diff --git a/test/core/end2end/fixtures/h2_compress.c b/test/core/end2end/fixtures/h2_compress.c index 9866dea7eba..1476224af04 100644 --- a/test/core/end2end/fixtures/h2_compress.c +++ b/test/core/end2end/fixtures/h2_compress.c @@ -64,9 +64,9 @@ void chttp2_init_client_fullstack_compression(grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { fullstack_compression_fixture_data *ffd = f->fixture_data; if (ffd->client_args_compression != NULL) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, ffd->client_args_compression); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(ffd->client_args_compression); + grpc_exec_ctx_finish(); } ffd->client_args_compression = grpc_channel_args_set_compression_algorithm( client_args, GRPC_COMPRESS_GZIP); @@ -78,9 +78,9 @@ void chttp2_init_server_fullstack_compression(grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { fullstack_compression_fixture_data *ffd = f->fixture_data; if (ffd->server_args_compression != NULL) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, ffd->server_args_compression); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(ffd->server_args_compression); + grpc_exec_ctx_finish(); } ffd->server_args_compression = grpc_channel_args_set_compression_algorithm( server_args, GRPC_COMPRESS_GZIP); @@ -94,13 +94,13 @@ void chttp2_init_server_fullstack_compression(grpc_end2end_test_fixture *f, } void chttp2_tear_down_fullstack_compression(grpc_end2end_test_fixture *f) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; fullstack_compression_fixture_data *ffd = f->fixture_data; - grpc_channel_args_destroy(&exec_ctx, ffd->client_args_compression); - grpc_channel_args_destroy(&exec_ctx, ffd->server_args_compression); + grpc_channel_args_destroy(ffd->client_args_compression); + grpc_channel_args_destroy(ffd->server_args_compression); gpr_free(ffd->localaddr); gpr_free(ffd); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } /* All test configurations */ diff --git a/test/core/end2end/fixtures/h2_fd.c b/test/core/end2end/fixtures/h2_fd.c index e82c120221d..cc7ec7ac6ef 100644 --- a/test/core/end2end/fixtures/h2_fd.c +++ b/test/core/end2end/fixtures/h2_fd.c @@ -65,7 +65,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; sp_fixture_data *sfd = f->fixture_data; GPR_ASSERT(!f->client); @@ -73,12 +73,12 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, "fixture_client", sfd->fd_pair[0], client_args); GPR_ASSERT(f->client); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; sp_fixture_data *sfd = f->fixture_data; GPR_ASSERT(!f->server); f->server = grpc_server_create(server_args, NULL); @@ -88,7 +88,7 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_server_add_insecure_channel_from_fd(f->server, NULL, sfd->fd_pair[1]); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture *f) { diff --git a/test/core/end2end/fixtures/h2_full+workarounds.c b/test/core/end2end/fixtures/h2_full+workarounds.c index a98e5ad57f7..f9d2f033cbb 100644 --- a/test/core/end2end/fixtures/h2_full+workarounds.c +++ b/test/core/end2end/fixtures/h2_full+workarounds.c @@ -69,7 +69,7 @@ void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f, void chttp2_init_server_fullstack(grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { int i; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; fullstack_fixture_data *ffd = f->fixture_data; grpc_arg args[GRPC_MAX_WORKAROUND_ID]; for (i = 0; i < GRPC_MAX_WORKAROUND_ID; i++) { @@ -86,8 +86,8 @@ void chttp2_init_server_fullstack(grpc_end2end_test_fixture *f, grpc_server_register_completion_queue(f->server, f->cq, NULL); GPR_ASSERT(grpc_server_add_insecure_http2_port(f->server, ffd->localaddr)); grpc_server_start(f->server); - grpc_channel_args_destroy(&exec_ctx, server_args_new); - grpc_exec_ctx_finish(&exec_ctx); + grpc_channel_args_destroy(server_args_new); + grpc_exec_ctx_finish(); } void chttp2_tear_down_fullstack(grpc_end2end_test_fixture *f) { diff --git a/test/core/end2end/fixtures/h2_load_reporting.c b/test/core/end2end/fixtures/h2_load_reporting.c index 8a05bb722aa..5218b38e6ad 100644 --- a/test/core/end2end/fixtures/h2_load_reporting.c +++ b/test/core/end2end/fixtures/h2_load_reporting.c @@ -75,9 +75,9 @@ void chttp2_init_server_load_reporting(grpc_end2end_test_fixture *f, server_args = grpc_channel_args_copy_and_add(server_args, &arg, 1); f->server = grpc_server_create(server_args, NULL); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(server_args); + grpc_exec_ctx_finish(); } grpc_server_register_completion_queue(f->server, f->cq, NULL); GPR_ASSERT(grpc_server_add_insecure_http2_port(f->server, ffd->localaddr)); diff --git a/test/core/end2end/fixtures/h2_oauth2.c b/test/core/end2end/fixtures/h2_oauth2.c index ee1d0b14169..d3660b26b43 100644 --- a/test/core/end2end/fixtures/h2_oauth2.c +++ b/test/core/end2end/fixtures/h2_oauth2.c @@ -137,11 +137,11 @@ void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { static void chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack( grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_channel_credentials *ssl_creds = grpc_ssl_credentials_create(test_root_cert, NULL, NULL); grpc_call_credentials *oauth2_creds = grpc_md_only_test_credentials_create( - &exec_ctx, "authorization", oauth2_md, true /* is_async */); + "authorization", oauth2_md, true /* is_async */); grpc_channel_credentials *ssl_oauth2_creds = grpc_composite_channel_credentials_create(ssl_creds, oauth2_creds, NULL); grpc_arg ssl_name_override = {GRPC_ARG_STRING, @@ -150,10 +150,10 @@ static void chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack( grpc_channel_args *new_client_args = grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); chttp2_init_client_secure_fullstack(f, new_client_args, ssl_oauth2_creds); - grpc_channel_args_destroy(&exec_ctx, new_client_args); + grpc_channel_args_destroy(new_client_args); grpc_channel_credentials_release(ssl_creds); grpc_call_credentials_release(oauth2_creds); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static int fail_server_auth_check(grpc_channel_args *server_args) { diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index 39ccb84b523..e34f45a5732 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -50,12 +50,12 @@ static void server_setup_transport(void *ts, grpc_transport *transport) { grpc_end2end_test_fixture *f = ts; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair *sfd = f->fixture_data; - grpc_endpoint_add_to_pollset(&exec_ctx, sfd->server, grpc_cq_pollset(f->cq)); - grpc_server_setup_transport(&exec_ctx, f->server, transport, NULL, + grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq)); + grpc_server_setup_transport(f->server, transport, NULL, grpc_server_get_channel_args(f->server)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } typedef struct { @@ -63,13 +63,11 @@ typedef struct { grpc_channel_args *client_args; } sp_client_setup; -static void client_setup_transport(grpc_exec_ctx *exec_ctx, void *ts, - grpc_transport *transport) { +static void client_setup_transport(void *ts, grpc_transport *transport) { sp_client_setup *cs = ts; - cs->f->client = - grpc_channel_create(exec_ctx, "socketpair-target", cs->client_args, - GRPC_CLIENT_DIRECT_CHANNEL, transport); + cs->f->client = grpc_channel_create("socketpair-target", cs->client_args, + GRPC_CLIENT_DIRECT_CHANNEL, transport); } static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( @@ -89,34 +87,32 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = - grpc_create_chttp2_transport(&exec_ctx, client_args, sfd->client, 1); - client_setup_transport(&exec_ctx, &cs, transport); + transport = grpc_create_chttp2_transport(client_args, sfd->client, 1); + client_setup_transport(&cs, transport); GPR_ASSERT(f->client); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_transport_start_reading(transport, NULL); + grpc_exec_ctx_finish(); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; GPR_ASSERT(!f->server); f->server = grpc_server_create(server_args, NULL); grpc_server_register_completion_queue(f->server, f->cq, NULL); grpc_server_start(f->server); - transport = - grpc_create_chttp2_transport(&exec_ctx, server_args, sfd->server, 0); + transport = grpc_create_chttp2_transport(server_args, sfd->server, 0); server_setup_transport(f, transport); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_transport_start_reading(transport, NULL); + grpc_exec_ctx_finish(); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture *f) { @@ -132,7 +128,7 @@ static grpc_end2end_test_config configs[] = { int main(int argc, char **argv) { size_t i; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; /* force tracing on, with a value to force many code paths in trace.c to be taken */ @@ -146,7 +142,7 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_end2end_tests_pre_init(); grpc_init(); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); GPR_ASSERT(0 == grpc_tracer_set_enabled("also-doesnt-exist", 0)); GPR_ASSERT(1 == grpc_tracer_set_enabled("http", 1)); diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c index 03566ead9bf..37bda654cfb 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -44,12 +44,12 @@ static void server_setup_transport(void *ts, grpc_transport *transport) { grpc_end2end_test_fixture *f = ts; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair *sfd = f->fixture_data; - grpc_endpoint_add_to_pollset(&exec_ctx, sfd->server, grpc_cq_pollset(f->cq)); - grpc_server_setup_transport(&exec_ctx, f->server, transport, NULL, + grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq)); + grpc_server_setup_transport(f->server, transport, NULL, grpc_server_get_channel_args(f->server)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } typedef struct { @@ -57,13 +57,11 @@ typedef struct { grpc_channel_args *client_args; } sp_client_setup; -static void client_setup_transport(grpc_exec_ctx *exec_ctx, void *ts, - grpc_transport *transport) { +static void client_setup_transport(void *ts, grpc_transport *transport) { sp_client_setup *cs = ts; - cs->f->client = - grpc_channel_create(exec_ctx, "socketpair-target", cs->client_args, - GRPC_CLIENT_DIRECT_CHANNEL, transport); + cs->f->client = grpc_channel_create("socketpair-target", cs->client_args, + GRPC_CLIENT_DIRECT_CHANNEL, transport); } static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( @@ -83,34 +81,32 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = - grpc_create_chttp2_transport(&exec_ctx, client_args, sfd->client, 1); - client_setup_transport(&exec_ctx, &cs, transport); + transport = grpc_create_chttp2_transport(client_args, sfd->client, 1); + client_setup_transport(&cs, transport); GPR_ASSERT(f->client); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_transport_start_reading(transport, NULL); + grpc_exec_ctx_finish(); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; GPR_ASSERT(!f->server); f->server = grpc_server_create(server_args, NULL); grpc_server_register_completion_queue(f->server, f->cq, NULL); grpc_server_start(f->server); - transport = - grpc_create_chttp2_transport(&exec_ctx, server_args, sfd->server, 0); + transport = grpc_create_chttp2_transport(server_args, sfd->server, 0); server_setup_transport(f, transport); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_transport_start_reading(transport, NULL); + grpc_exec_ctx_finish(); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture *f) { diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c index c75a3876d5a..fc58dad59f1 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -44,12 +44,12 @@ static void server_setup_transport(void *ts, grpc_transport *transport) { grpc_end2end_test_fixture *f = ts; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair *sfd = f->fixture_data; - grpc_endpoint_add_to_pollset(&exec_ctx, sfd->server, grpc_cq_pollset(f->cq)); - grpc_server_setup_transport(&exec_ctx, f->server, transport, NULL, + grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq)); + grpc_server_setup_transport(f->server, transport, NULL, grpc_server_get_channel_args(f->server)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } typedef struct { @@ -57,13 +57,11 @@ typedef struct { grpc_channel_args *client_args; } sp_client_setup; -static void client_setup_transport(grpc_exec_ctx *exec_ctx, void *ts, - grpc_transport *transport) { +static void client_setup_transport(void *ts, grpc_transport *transport) { sp_client_setup *cs = ts; - cs->f->client = - grpc_channel_create(exec_ctx, "socketpair-target", cs->client_args, - GRPC_CLIENT_DIRECT_CHANNEL, transport); + cs->f->client = grpc_channel_create("socketpair-target", cs->client_args, + GRPC_CLIENT_DIRECT_CHANNEL, transport); } static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( @@ -93,34 +91,32 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = - grpc_create_chttp2_transport(&exec_ctx, client_args, sfd->client, 1); - client_setup_transport(&exec_ctx, &cs, transport); + transport = grpc_create_chttp2_transport(client_args, sfd->client, 1); + client_setup_transport(&cs, transport); GPR_ASSERT(f->client); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_transport_start_reading(transport, NULL); + grpc_exec_ctx_finish(); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; GPR_ASSERT(!f->server); f->server = grpc_server_create(server_args, NULL); grpc_server_register_completion_queue(f->server, f->cq, NULL); grpc_server_start(f->server); - transport = - grpc_create_chttp2_transport(&exec_ctx, server_args, sfd->server, 0); + transport = grpc_create_chttp2_transport(server_args, sfd->server, 0); server_setup_transport(f, transport); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_transport_start_reading(transport, NULL); + grpc_exec_ctx_finish(); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture *f) { diff --git a/test/core/end2end/fixtures/h2_ssl.c b/test/core/end2end/fixtures/h2_ssl.c index 0bac464e695..3262a588c27 100644 --- a/test/core/end2end/fixtures/h2_ssl.c +++ b/test/core/end2end/fixtures/h2_ssl.c @@ -105,9 +105,9 @@ static void chttp2_init_client_simple_ssl_secure_fullstack( grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); chttp2_init_client_secure_fullstack(f, new_client_args, ssl_creds); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, new_client_args); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(new_client_args); + grpc_exec_ctx_finish(); } } diff --git a/test/core/end2end/fixtures/h2_ssl_proxy.c b/test/core/end2end/fixtures/h2_ssl_proxy.c index 8bc7183510e..21de427c5e0 100644 --- a/test/core/end2end/fixtures/h2_ssl_proxy.c +++ b/test/core/end2end/fixtures/h2_ssl_proxy.c @@ -65,9 +65,9 @@ static grpc_channel *create_proxy_client(const char *target, grpc_secure_channel_create(ssl_creds, target, new_client_args, NULL); grpc_channel_credentials_release(ssl_creds); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, new_client_args); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(new_client_args); + grpc_exec_ctx_finish(); } return channel; } @@ -142,9 +142,9 @@ static void chttp2_init_client_simple_ssl_secure_fullstack( grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); chttp2_init_client_secure_fullstack(f, new_client_args, ssl_creds); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, new_client_args); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(new_client_args); + grpc_exec_ctx_finish(); } } diff --git a/test/core/end2end/fixtures/http_proxy_fixture.c b/test/core/end2end/fixtures/http_proxy_fixture.cc similarity index 73% rename from test/core/end2end/fixtures/http_proxy_fixture.c rename to test/core/end2end/fixtures/http_proxy_fixture.cc index d29401fdc3a..b3ec44d77b0 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.c +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -102,24 +102,21 @@ static void proxy_connection_ref(proxy_connection* conn, const char* reason) { } // Helper function to destroy the proxy connection. -static void proxy_connection_unref(grpc_exec_ctx* exec_ctx, - proxy_connection* conn, const char* reason) { +static void proxy_connection_unref(proxy_connection* conn, const char* reason) { if (gpr_unref(&conn->refcount)) { gpr_log(GPR_DEBUG, "endpoints: %p %p", conn->client_endpoint, conn->server_endpoint); - grpc_endpoint_destroy(exec_ctx, conn->client_endpoint); + grpc_endpoint_destroy(conn->client_endpoint); if (conn->server_endpoint != NULL) { - grpc_endpoint_destroy(exec_ctx, conn->server_endpoint); + grpc_endpoint_destroy(conn->server_endpoint); } - grpc_pollset_set_destroy(exec_ctx, conn->pollset_set); - grpc_slice_buffer_destroy_internal(exec_ctx, &conn->client_read_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, - &conn->client_deferred_write_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &conn->client_write_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &conn->server_read_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, - &conn->server_deferred_write_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &conn->server_write_buffer); + grpc_pollset_set_destroy(conn->pollset_set); + grpc_slice_buffer_destroy_internal(&conn->client_read_buffer); + grpc_slice_buffer_destroy_internal(&conn->client_deferred_write_buffer); + grpc_slice_buffer_destroy_internal(&conn->client_write_buffer); + grpc_slice_buffer_destroy_internal(&conn->server_read_buffer); + grpc_slice_buffer_destroy_internal(&conn->server_deferred_write_buffer); + grpc_slice_buffer_destroy_internal(&conn->server_write_buffer); grpc_http_parser_destroy(&conn->http_parser); grpc_http_request_destroy(&conn->http_request); gpr_unref(&conn->proxy->users); @@ -129,27 +126,23 @@ static void proxy_connection_unref(grpc_exec_ctx* exec_ctx, // Helper function to shut down the proxy connection. // Does NOT take ownership of a reference to error. -static void proxy_connection_failed(grpc_exec_ctx* exec_ctx, - proxy_connection* conn, bool is_client, +static void proxy_connection_failed(proxy_connection* conn, bool is_client, const char* prefix, grpc_error* error) { const char* msg = grpc_error_string(error); gpr_log(GPR_INFO, "%s: %s", prefix, msg); - grpc_endpoint_shutdown(exec_ctx, conn->client_endpoint, - GRPC_ERROR_REF(error)); + grpc_endpoint_shutdown(conn->client_endpoint, GRPC_ERROR_REF(error)); if (conn->server_endpoint != NULL) { - grpc_endpoint_shutdown(exec_ctx, conn->server_endpoint, - GRPC_ERROR_REF(error)); + grpc_endpoint_shutdown(conn->server_endpoint, GRPC_ERROR_REF(error)); } - proxy_connection_unref(exec_ctx, conn, "conn_failed"); + proxy_connection_unref(conn, "conn_failed"); } // Callback for writing proxy data to the client. -static void on_client_write_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_client_write_done(void* arg, grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(exec_ctx, conn, true /* is_client */, + proxy_connection_failed(conn, true /* is_client */, "HTTP proxy client write", error); return; } @@ -160,21 +153,19 @@ static void on_client_write_done(grpc_exec_ctx* exec_ctx, void* arg, if (conn->client_deferred_write_buffer.length > 0) { grpc_slice_buffer_move_into(&conn->client_deferred_write_buffer, &conn->client_write_buffer); - grpc_endpoint_write(exec_ctx, conn->client_endpoint, - &conn->client_write_buffer, + grpc_endpoint_write(conn->client_endpoint, &conn->client_write_buffer, &conn->on_client_write_done); } else { // No more writes. Unref the connection. - proxy_connection_unref(exec_ctx, conn, "write_done"); + proxy_connection_unref(conn, "write_done"); } } // Callback for writing proxy data to the backend server. -static void on_server_write_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_server_write_done(void* arg, grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(exec_ctx, conn, false /* is_client */, + proxy_connection_failed(conn, false /* is_client */, "HTTP proxy server write", error); return; } @@ -185,22 +176,20 @@ static void on_server_write_done(grpc_exec_ctx* exec_ctx, void* arg, if (conn->server_deferred_write_buffer.length > 0) { grpc_slice_buffer_move_into(&conn->server_deferred_write_buffer, &conn->server_write_buffer); - grpc_endpoint_write(exec_ctx, conn->server_endpoint, - &conn->server_write_buffer, + grpc_endpoint_write(conn->server_endpoint, &conn->server_write_buffer, &conn->on_server_write_done); } else { // No more writes. Unref the connection. - proxy_connection_unref(exec_ctx, conn, "server_write"); + proxy_connection_unref(conn, "server_write"); } } // Callback for reading data from the client, which will be proxied to // the backend server. -static void on_client_read_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_client_read_done(void* arg, grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(exec_ctx, conn, true /* is_client */, + proxy_connection_failed(conn, true /* is_client */, "HTTP proxy client read", error); return; } @@ -217,22 +206,20 @@ static void on_client_read_done(grpc_exec_ctx* exec_ctx, void* arg, grpc_slice_buffer_move_into(&conn->client_read_buffer, &conn->server_write_buffer); proxy_connection_ref(conn, "client_read"); - grpc_endpoint_write(exec_ctx, conn->server_endpoint, - &conn->server_write_buffer, + grpc_endpoint_write(conn->server_endpoint, &conn->server_write_buffer, &conn->on_server_write_done); } // Read more data. - grpc_endpoint_read(exec_ctx, conn->client_endpoint, &conn->client_read_buffer, + grpc_endpoint_read(conn->client_endpoint, &conn->client_read_buffer, &conn->on_client_read_done); } // Callback for reading data from the backend server, which will be // proxied to the client. -static void on_server_read_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_server_read_done(void* arg, grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(exec_ctx, conn, false /* is_client */, + proxy_connection_failed(conn, false /* is_client */, "HTTP proxy server read", error); return; } @@ -249,21 +236,19 @@ static void on_server_read_done(grpc_exec_ctx* exec_ctx, void* arg, grpc_slice_buffer_move_into(&conn->server_read_buffer, &conn->client_write_buffer); proxy_connection_ref(conn, "server_read"); - grpc_endpoint_write(exec_ctx, conn->client_endpoint, - &conn->client_write_buffer, + grpc_endpoint_write(conn->client_endpoint, &conn->client_write_buffer, &conn->on_client_write_done); } // Read more data. - grpc_endpoint_read(exec_ctx, conn->server_endpoint, &conn->server_read_buffer, + grpc_endpoint_read(conn->server_endpoint, &conn->server_read_buffer, &conn->on_server_read_done); } // Callback to write the HTTP response for the CONNECT request. -static void on_write_response_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_write_response_done(void* arg, grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(exec_ctx, conn, true /* is_client */, + proxy_connection_failed(conn, true /* is_client */, "HTTP proxy write response", error); return; } @@ -274,17 +259,16 @@ static void on_write_response_done(grpc_exec_ctx* exec_ctx, void* arg, // for the other one. proxy_connection_ref(conn, "client_read"); proxy_connection_ref(conn, "server_read"); - proxy_connection_unref(exec_ctx, conn, "write_response"); - grpc_endpoint_read(exec_ctx, conn->client_endpoint, &conn->client_read_buffer, + proxy_connection_unref(conn, "write_response"); + grpc_endpoint_read(conn->client_endpoint, &conn->client_read_buffer, &conn->on_client_read_done); - grpc_endpoint_read(exec_ctx, conn->server_endpoint, &conn->server_read_buffer, + grpc_endpoint_read(conn->server_endpoint, &conn->server_read_buffer, &conn->on_server_read_done); } // Callback to connect to the backend server specified by the HTTP // CONNECT request. -static void on_server_connect_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_server_connect_done(void* arg, grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; if (error != GRPC_ERROR_NONE) { // TODO(roth): Technically, in this case, we should handle the error @@ -292,7 +276,7 @@ static void on_server_connect_done(grpc_exec_ctx* exec_ctx, void* arg, // connection failed. However, for the purposes of this test code, // it's fine to pretend this is a client-side error, which will // cause the client connection to be dropped. - proxy_connection_failed(exec_ctx, conn, true /* is_client */, + proxy_connection_failed(conn, true /* is_client */, "HTTP proxy server connect", error); return; } @@ -302,8 +286,7 @@ static void on_server_connect_done(grpc_exec_ctx* exec_ctx, void* arg, grpc_slice slice = grpc_slice_from_copied_string("HTTP/1.0 200 connected\r\n\r\n"); grpc_slice_buffer_add(&conn->client_write_buffer, slice); - grpc_endpoint_write(exec_ctx, conn->client_endpoint, - &conn->client_write_buffer, + grpc_endpoint_write(conn->client_endpoint, &conn->client_write_buffer, &conn->on_write_response_done); } @@ -312,8 +295,7 @@ static void on_server_connect_done(grpc_exec_ctx* exec_ctx, void* arg, * Basic * Returns true if it matches, false otherwise */ -static bool proxy_auth_header_matches(grpc_exec_ctx* exec_ctx, - char* proxy_auth_header_val, +static bool proxy_auth_header_matches(char* proxy_auth_header_val, char* expected_cred) { GPR_ASSERT(proxy_auth_header_val != NULL); GPR_ASSERT(expected_cred != NULL); @@ -321,11 +303,10 @@ static bool proxy_auth_header_matches(grpc_exec_ctx* exec_ctx, return false; } proxy_auth_header_val += 6; - grpc_slice decoded_slice = - grpc_base64_decode(exec_ctx, proxy_auth_header_val, 0); + grpc_slice decoded_slice = grpc_base64_decode(proxy_auth_header_val, 0); const bool header_matches = grpc_slice_str_cmp(decoded_slice, expected_cred) == 0; - grpc_slice_unref_internal(exec_ctx, decoded_slice); + grpc_slice_unref_internal(decoded_slice); return header_matches; } @@ -335,13 +316,12 @@ static bool proxy_auth_header_matches(grpc_exec_ctx* exec_ctx, // the client indicating that the request failed. However, for the purposes // of this test code, it's fine to pretend this is a client-side error, // which will cause the client connection to be dropped. -static void on_read_request_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_read_request_done(void* arg, grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; gpr_log(GPR_DEBUG, "on_read_request_done: %p %s", conn, grpc_error_string(error)); if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(exec_ctx, conn, true /* is_client */, + proxy_connection_failed(conn, true /* is_client */, "HTTP proxy read request", error); return; } @@ -351,7 +331,7 @@ static void on_read_request_done(grpc_exec_ctx* exec_ctx, void* arg, error = grpc_http_parser_parse(&conn->http_parser, conn->client_read_buffer.slices[i], NULL); if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(exec_ctx, conn, true /* is_client */, + proxy_connection_failed(conn, true /* is_client */, "HTTP proxy request parse", error); GRPC_ERROR_UNREF(error); return; @@ -361,8 +341,8 @@ static void on_read_request_done(grpc_exec_ctx* exec_ctx, void* arg, grpc_slice_buffer_reset_and_unref(&conn->client_read_buffer); // If we're not done reading the request, read more data. if (conn->http_parser.state != GRPC_HTTP_BODY) { - grpc_endpoint_read(exec_ctx, conn->client_endpoint, - &conn->client_read_buffer, &conn->on_read_request_done); + grpc_endpoint_read(conn->client_endpoint, &conn->client_read_buffer, + &conn->on_read_request_done); return; } // Make sure we got a CONNECT request. @@ -372,7 +352,7 @@ static void on_read_request_done(grpc_exec_ctx* exec_ctx, void* arg, conn->http_request.method); error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - proxy_connection_failed(exec_ctx, conn, true /* is_client */, + proxy_connection_failed(conn, true /* is_client */, "HTTP proxy read request", error); GRPC_ERROR_UNREF(error); return; @@ -385,15 +365,14 @@ static void on_read_request_done(grpc_exec_ctx* exec_ctx, void* arg, for (size_t i = 0; i < conn->http_request.hdr_count; i++) { if (strcmp(conn->http_request.hdrs[i].key, "Proxy-Authorization") == 0) { client_authenticated = proxy_auth_header_matches( - exec_ctx, conn->http_request.hdrs[i].value, - proxy_auth_arg->value.string); + conn->http_request.hdrs[i].value, proxy_auth_arg->value.string); break; } } if (!client_authenticated) { const char* msg = "HTTP Connect could not verify authentication"; error = GRPC_ERROR_CREATE_FROM_STATIC_STRING(msg); - proxy_connection_failed(exec_ctx, conn, true /* is_client */, + proxy_connection_failed(conn, true /* is_client */, "HTTP proxy read request", error); GRPC_ERROR_UNREF(error); return; @@ -404,24 +383,23 @@ static void on_read_request_done(grpc_exec_ctx* exec_ctx, void* arg, error = grpc_blocking_resolve_address(conn->http_request.path, "80", &resolved_addresses); if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(exec_ctx, conn, true /* is_client */, - "HTTP proxy DNS lookup", error); + proxy_connection_failed(conn, true /* is_client */, "HTTP proxy DNS lookup", + error); GRPC_ERROR_UNREF(error); return; } GPR_ASSERT(resolved_addresses->naddrs >= 1); // Connect to requested address. // The connection callback inherits our reference to conn. - const grpc_millis deadline = - grpc_exec_ctx_now(exec_ctx) + 10 * GPR_MS_PER_SEC; - grpc_tcp_client_connect(exec_ctx, &conn->on_server_connect_done, - &conn->server_endpoint, conn->pollset_set, NULL, + const grpc_millis deadline = grpc_exec_ctx_now() + 10 * GPR_MS_PER_SEC; + grpc_tcp_client_connect(&conn->on_server_connect_done, &conn->server_endpoint, + conn->pollset_set, NULL, &resolved_addresses->addrs[0], deadline); grpc_resolved_addresses_destroy(resolved_addresses); } -static void on_accept(grpc_exec_ctx* exec_ctx, void* arg, - grpc_endpoint* endpoint, grpc_pollset* accepting_pollset, +static void on_accept(void* arg, grpc_endpoint* endpoint, + grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor) { gpr_free(acceptor); grpc_end2end_http_proxy* proxy = (grpc_end2end_http_proxy*)arg; @@ -432,8 +410,8 @@ static void on_accept(grpc_exec_ctx* exec_ctx, void* arg, conn->proxy = proxy; gpr_ref_init(&conn->refcount, 1); conn->pollset_set = grpc_pollset_set_create(); - grpc_pollset_set_add_pollset(exec_ctx, conn->pollset_set, proxy->pollset); - grpc_endpoint_add_to_pollset_set(exec_ctx, endpoint, conn->pollset_set); + grpc_pollset_set_add_pollset(conn->pollset_set, proxy->pollset); + grpc_endpoint_add_to_pollset_set(endpoint, conn->pollset_set); GRPC_CLOSURE_INIT(&conn->on_read_request_done, on_read_request_done, conn, grpc_combiner_scheduler(conn->proxy->combiner)); GRPC_CLOSURE_INIT(&conn->on_server_connect_done, on_server_connect_done, conn, @@ -456,7 +434,7 @@ static void on_accept(grpc_exec_ctx* exec_ctx, void* arg, grpc_slice_buffer_init(&conn->server_write_buffer); grpc_http_parser_init(&conn->http_parser, GRPC_HTTP_REQUEST, &conn->http_request); - grpc_endpoint_read(exec_ctx, conn->client_endpoint, &conn->client_read_buffer, + grpc_endpoint_read(conn->client_endpoint, &conn->client_read_buffer, &conn->on_read_request_done); } @@ -466,24 +444,23 @@ static void on_accept(grpc_exec_ctx* exec_ctx, void* arg, static void thread_main(void* arg) { grpc_end2end_http_proxy* proxy = (grpc_end2end_http_proxy*)arg; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; do { gpr_ref(&proxy->users); grpc_pollset_worker* worker = NULL; gpr_mu_lock(proxy->mu); - GRPC_LOG_IF_ERROR( - "grpc_pollset_work", - grpc_pollset_work(&exec_ctx, proxy->pollset, &worker, - grpc_exec_ctx_now(&exec_ctx) + GPR_MS_PER_SEC)); + GRPC_LOG_IF_ERROR("grpc_pollset_work", + grpc_pollset_work(proxy->pollset, &worker, + grpc_exec_ctx_now() + GPR_MS_PER_SEC)); gpr_mu_unlock(proxy->mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); } while (!gpr_unref(&proxy->users)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( grpc_channel_args* args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_end2end_http_proxy* proxy = (grpc_end2end_http_proxy*)gpr_malloc(sizeof(*proxy)); memset(proxy, 0, sizeof(*proxy)); @@ -495,8 +472,8 @@ grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( gpr_log(GPR_INFO, "Proxy address: %s", proxy->proxy_name); // Create TCP server. proxy->channel_args = grpc_channel_args_copy(args); - grpc_error* error = grpc_tcp_server_create( - &exec_ctx, NULL, proxy->channel_args, &proxy->server); + grpc_error* error = + grpc_tcp_server_create(NULL, proxy->channel_args, &proxy->server); GPR_ASSERT(error == GRPC_ERROR_NONE); // Bind to port. grpc_resolved_address resolved_addr; @@ -511,9 +488,8 @@ grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( // Start server. proxy->pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); grpc_pollset_init(proxy->pollset, &proxy->mu); - grpc_tcp_server_start(&exec_ctx, proxy->server, &proxy->pollset, 1, on_accept, - proxy); - grpc_exec_ctx_finish(&exec_ctx); + grpc_tcp_server_start(proxy->server, &proxy->pollset, 1, on_accept, proxy); + grpc_exec_ctx_finish(); // Start proxy thread. gpr_thd_options opt = gpr_thd_options_default(); gpr_thd_options_set_joinable(&opt); @@ -521,27 +497,26 @@ grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( return proxy; } -static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void destroy_pollset(void* arg, grpc_error* error) { grpc_pollset* pollset = (grpc_pollset*)arg; - grpc_pollset_destroy(exec_ctx, pollset); + grpc_pollset_destroy(pollset); gpr_free(pollset); } void grpc_end2end_http_proxy_destroy(grpc_end2end_http_proxy* proxy) { gpr_unref(&proxy->users); // Signal proxy thread to shutdown. - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; gpr_thd_join(proxy->thd); - grpc_tcp_server_shutdown_listeners(&exec_ctx, proxy->server); - grpc_tcp_server_unref(&exec_ctx, proxy->server); + grpc_tcp_server_shutdown_listeners(proxy->server); + grpc_tcp_server_unref(proxy->server); gpr_free(proxy->proxy_name); - grpc_channel_args_destroy(&exec_ctx, proxy->channel_args); - grpc_pollset_shutdown(&exec_ctx, proxy->pollset, + grpc_channel_args_destroy(proxy->channel_args); + grpc_pollset_shutdown(proxy->pollset, GRPC_CLOSURE_CREATE(destroy_pollset, proxy->pollset, grpc_schedule_on_exec_ctx)); - GRPC_COMBINER_UNREF(&exec_ctx, proxy->combiner, "test"); + GRPC_COMBINER_UNREF(proxy->combiner, "test"); gpr_free(proxy); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } const char* grpc_end2end_http_proxy_get_proxy_name( diff --git a/test/core/end2end/fuzzers/api_fuzzer.c b/test/core/end2end/fuzzers/api_fuzzer.c index 0a787bbf300..5ca8bfccf84 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.c +++ b/test/core/end2end/fuzzers/api_fuzzer.c @@ -371,8 +371,7 @@ typedef struct addr_req { grpc_lb_addresses **lb_addrs; } addr_req; -static void finish_resolve(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void finish_resolve(void *arg, grpc_error *error) { addr_req *r = arg; if (error == GRPC_ERROR_NONE && 0 == strcmp(r->addr, "server")) { @@ -387,9 +386,9 @@ static void finish_resolve(grpc_exec_ctx *exec_ctx, void *arg, grpc_lb_addresses_set_address(lb_addrs, 0, NULL, 0, NULL, NULL, NULL); *r->lb_addrs = lb_addrs; } - GRPC_CLOSURE_SCHED(exec_ctx, r->on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(r->on_done, GRPC_ERROR_NONE); } else { - GRPC_CLOSURE_SCHED(exec_ctx, r->on_done, + GRPC_CLOSURE_SCHED(r->on_done, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Resolution failed", &error, 1)); } @@ -398,8 +397,7 @@ static void finish_resolve(grpc_exec_ctx *exec_ctx, void *arg, gpr_free(r); } -void my_resolve_address(grpc_exec_ctx *exec_ctx, const char *addr, - const char *default_port, +void my_resolve_address(const char *addr, const char *default_port, grpc_pollset_set *interested_parties, grpc_closure *on_done, grpc_resolved_addresses **addresses) { @@ -409,22 +407,24 @@ void my_resolve_address(grpc_exec_ctx *exec_ctx, const char *addr, r->addrs = addresses; r->lb_addrs = NULL; grpc_timer_init( - exec_ctx, &r->timer, GPR_MS_PER_SEC + grpc_exec_ctx_now(exec_ctx), + &r->timer, GPR_MS_PER_SEC + grpc_exec_ctx_now(), GRPC_CLOSURE_CREATE(finish_resolve, r, grpc_schedule_on_exec_ctx)); } -grpc_ares_request *my_dns_lookup_ares( - grpc_exec_ctx *exec_ctx, const char *dns_server, const char *addr, - const char *default_port, grpc_pollset_set *interested_parties, - grpc_closure *on_done, grpc_lb_addresses **lb_addrs, bool check_grpclb, - char **service_config_json) { +grpc_ares_request *my_dns_lookup_ares(const char *dns_server, const char *addr, + const char *default_port, + grpc_pollset_set *interested_parties, + grpc_closure *on_done, + grpc_lb_addresses **lb_addrs, + bool check_grpclb, + char **service_config_json) { addr_req *r = gpr_malloc(sizeof(*r)); r->addr = gpr_strdup(addr); r->on_done = on_done; r->addrs = NULL; r->lb_addrs = lb_addrs; grpc_timer_init( - exec_ctx, &r->timer, GPR_MS_PER_SEC + grpc_exec_ctx_now(exec_ctx), + &r->timer, GPR_MS_PER_SEC + grpc_exec_ctx_now(), GRPC_CLOSURE_CREATE(finish_resolve, r, grpc_schedule_on_exec_ctx)); return NULL; } @@ -434,12 +434,12 @@ grpc_ares_request *my_dns_lookup_ares( // defined in tcp_client_posix.c extern void (*grpc_tcp_client_connect_impl)( - grpc_exec_ctx *exec_ctx, grpc_closure *closure, grpc_endpoint **ep, + grpc_closure *closure, grpc_endpoint **ep, grpc_pollset_set *interested_parties, const grpc_channel_args *channel_args, const grpc_resolved_address *addr, gpr_timespec deadline); -static void sched_connect(grpc_exec_ctx *exec_ctx, grpc_closure *closure, - grpc_endpoint **ep, gpr_timespec deadline); +static void sched_connect(grpc_closure *closure, grpc_endpoint **ep, + gpr_timespec deadline); typedef struct { grpc_timer timer; @@ -448,35 +448,34 @@ typedef struct { gpr_timespec deadline; } future_connect; -static void do_connect(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void do_connect(void *arg, grpc_error *error) { future_connect *fc = arg; if (error != GRPC_ERROR_NONE) { *fc->ep = NULL; - GRPC_CLOSURE_SCHED(exec_ctx, fc->closure, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(fc->closure, GRPC_ERROR_REF(error)); } else if (g_server != NULL) { grpc_endpoint *client; grpc_endpoint *server; grpc_passthru_endpoint_create(&client, &server, g_resource_quota, NULL); *fc->ep = client; - grpc_transport *transport = - grpc_create_chttp2_transport(exec_ctx, NULL, server, 0); - grpc_server_setup_transport(exec_ctx, g_server, transport, NULL, NULL); - grpc_chttp2_transport_start_reading(exec_ctx, transport, NULL); + grpc_transport *transport = grpc_create_chttp2_transport(NULL, server, 0); + grpc_server_setup_transport(g_server, transport, NULL, NULL); + grpc_chttp2_transport_start_reading(transport, NULL); - GRPC_CLOSURE_SCHED(exec_ctx, fc->closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(fc->closure, GRPC_ERROR_NONE); } else { - sched_connect(exec_ctx, fc->closure, fc->ep, fc->deadline); + sched_connect(fc->closure, fc->ep, fc->deadline); } gpr_free(fc); } -static void sched_connect(grpc_exec_ctx *exec_ctx, grpc_closure *closure, - grpc_endpoint **ep, gpr_timespec deadline) { +static void sched_connect(grpc_closure *closure, grpc_endpoint **ep, + gpr_timespec deadline) { if (gpr_time_cmp(deadline, gpr_now(deadline.clock_type)) < 0) { *ep = NULL; - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Connect deadline exceeded")); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Connect deadline exceeded")); return; } @@ -485,17 +484,16 @@ static void sched_connect(grpc_exec_ctx *exec_ctx, grpc_closure *closure, fc->ep = ep; fc->deadline = deadline; grpc_timer_init( - exec_ctx, &fc->timer, GPR_MS_PER_SEC + grpc_exec_ctx_now(exec_ctx), + &fc->timer, GPR_MS_PER_SEC + grpc_exec_ctx_now(), GRPC_CLOSURE_CREATE(do_connect, fc, grpc_schedule_on_exec_ctx)); } -static void my_tcp_client_connect(grpc_exec_ctx *exec_ctx, - grpc_closure *closure, grpc_endpoint **ep, +static void my_tcp_client_connect(grpc_closure *closure, grpc_endpoint **ep, grpc_pollset_set *interested_parties, const grpc_channel_args *channel_args, const grpc_resolved_address *addr, gpr_timespec deadline) { - sched_connect(exec_ctx, closure, ep, deadline); + sched_connect(closure, ep, deadline); } //////////////////////////////////////////////////////////////////////////////// @@ -738,9 +736,9 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { grpc_init(); grpc_timer_manager_set_threading(false); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_executor_set_threading(&exec_ctx, false); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_executor_set_threading(false); + grpc_exec_ctx_finish(); } grpc_resolve_address = my_resolve_address; grpc_dns_lookup_ares = my_dns_lookup_ares; @@ -832,9 +830,9 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { g_channel = grpc_insecure_channel_create(target_uri, args, NULL); GPR_ASSERT(g_channel != NULL); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, args); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(args); + grpc_exec_ctx_finish(); } gpr_free(target_uri); gpr_free(target); @@ -860,9 +858,9 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { g_server = grpc_server_create(args, NULL); GPR_ASSERT(g_server != NULL); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, args); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(args); + grpc_exec_ctx_finish(); } grpc_server_register_completion_queue(g_server, cq, NULL); grpc_server_start(g_server); @@ -1186,9 +1184,9 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { g_channel = grpc_secure_channel_create(creds, target_uri, args, NULL); GPR_ASSERT(g_channel != NULL); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, args); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(args); + grpc_exec_ctx_finish(); } gpr_free(target_uri); gpr_free(target); diff --git a/test/core/end2end/fuzzers/client_fuzzer.c b/test/core/end2end/fuzzers/client_fuzzer.c index 88ba6bad83c..1aca2ee7584 100644 --- a/test/core/end2end/fuzzers/client_fuzzer.c +++ b/test/core/end2end/fuzzers/client_fuzzer.c @@ -43,22 +43,22 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { if (squelch) gpr_set_log_function(dont_log); if (leak_check) grpc_memory_counters_init(); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_executor_set_threading(&exec_ctx, false); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_executor_set_threading(false); grpc_resource_quota *resource_quota = grpc_resource_quota_create("client_fuzzer"); grpc_endpoint *mock_endpoint = grpc_mock_endpoint_create(discard_write, resource_quota); - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); grpc_completion_queue *cq = grpc_completion_queue_create_for_next(NULL); grpc_transport *transport = - grpc_create_chttp2_transport(&exec_ctx, NULL, mock_endpoint, 1); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL); + grpc_create_chttp2_transport(NULL, mock_endpoint, 1); + grpc_chttp2_transport_start_reading(transport, NULL); grpc_channel *channel = grpc_channel_create( - &exec_ctx, "test-target", NULL, GRPC_CLIENT_DIRECT_CHANNEL, transport); + "test-target", NULL, GRPC_CLIENT_DIRECT_CHANNEL, transport); grpc_slice host = grpc_slice_from_static_string("localhost"); grpc_call *call = grpc_channel_create_call( channel, NULL, 0, cq, grpc_slice_from_static_string("/foo"), &host, @@ -107,12 +107,11 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { GPR_ASSERT(GRPC_CALL_OK == error); grpc_mock_endpoint_put_read( - &exec_ctx, mock_endpoint, - grpc_slice_from_copied_buffer((const char *)data, size)); + mock_endpoint, grpc_slice_from_copied_buffer((const char *)data, size)); grpc_event ev; while (1) { - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), NULL); switch (ev.type) { case GRPC_QUEUE_TIMEOUT: diff --git a/test/core/end2end/fuzzers/server_fuzzer.c b/test/core/end2end/fuzzers/server_fuzzer.c index ef4c0a4bfda..bbeeba8550e 100644 --- a/test/core/end2end/fuzzers/server_fuzzer.c +++ b/test/core/end2end/fuzzers/server_fuzzer.c @@ -41,17 +41,16 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { if (squelch) gpr_set_log_function(dont_log); if (leak_check) grpc_memory_counters_init(); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_executor_set_threading(&exec_ctx, false); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_executor_set_threading(false); grpc_resource_quota *resource_quota = grpc_resource_quota_create("server_fuzzer"); grpc_endpoint *mock_endpoint = grpc_mock_endpoint_create(discard_write, resource_quota); - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); grpc_mock_endpoint_put_read( - &exec_ctx, mock_endpoint, - grpc_slice_from_copied_buffer((const char *)data, size)); + mock_endpoint, grpc_slice_from_copied_buffer((const char *)data, size)); grpc_server *server = grpc_server_create(NULL, NULL); grpc_completion_queue *cq = grpc_completion_queue_create_for_next(NULL); @@ -61,9 +60,9 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { // grpc_server_register_method(server, "/reg", NULL, 0); grpc_server_start(server); grpc_transport *transport = - grpc_create_chttp2_transport(&exec_ctx, NULL, mock_endpoint, 0); - grpc_server_setup_transport(&exec_ctx, server, transport, NULL, NULL); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL); + grpc_create_chttp2_transport(NULL, mock_endpoint, 0); + grpc_server_setup_transport(server, transport, NULL, NULL); + grpc_chttp2_transport_start_reading(transport, NULL); grpc_call *call1 = NULL; grpc_call_details call_details1; @@ -79,7 +78,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { grpc_event ev; while (1) { - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), NULL); switch (ev.type) { case GRPC_QUEUE_TIMEOUT: diff --git a/test/core/end2end/goaway_server_test.c b/test/core/end2end/goaway_server_test.c index c3aca132495..8deeda7c837 100644 --- a/test/core/end2end/goaway_server_test.c +++ b/test/core/end2end/goaway_server_test.c @@ -39,16 +39,15 @@ static void *tag(intptr_t i) { return (void *)i; } static gpr_mu g_mu; static int g_resolve_port = -1; -static void (*iomgr_resolve_address)(grpc_exec_ctx *exec_ctx, const char *addr, - const char *default_port, +static void (*iomgr_resolve_address)(const char *addr, const char *default_port, grpc_pollset_set *interested_parties, grpc_closure *on_done, grpc_resolved_addresses **addresses); static grpc_ares_request *(*iomgr_dns_lookup_ares)( - grpc_exec_ctx *exec_ctx, const char *dns_server, const char *addr, - const char *default_port, grpc_pollset_set *interested_parties, - grpc_closure *on_done, grpc_lb_addresses **addresses, bool check_grpclb, + const char *dns_server, const char *addr, const char *default_port, + grpc_pollset_set *interested_parties, grpc_closure *on_done, + grpc_lb_addresses **addresses, bool check_grpclb, char **service_config_json); static void set_resolve_port(int port) { @@ -57,14 +56,13 @@ static void set_resolve_port(int port) { gpr_mu_unlock(&g_mu); } -static void my_resolve_address(grpc_exec_ctx *exec_ctx, const char *addr, - const char *default_port, +static void my_resolve_address(const char *addr, const char *default_port, grpc_pollset_set *interested_parties, grpc_closure *on_done, grpc_resolved_addresses **addrs) { if (0 != strcmp(addr, "test")) { - iomgr_resolve_address(exec_ctx, addr, default_port, interested_parties, - on_done, addrs); + iomgr_resolve_address(addr, default_port, interested_parties, on_done, + addrs); return; } @@ -85,16 +83,16 @@ static void my_resolve_address(grpc_exec_ctx *exec_ctx, const char *addr, (*addrs)->addrs[0].len = sizeof(*sa); gpr_mu_unlock(&g_mu); } - GRPC_CLOSURE_SCHED(exec_ctx, on_done, error); + GRPC_CLOSURE_SCHED(on_done, error); } static grpc_ares_request *my_dns_lookup_ares( - grpc_exec_ctx *exec_ctx, const char *dns_server, const char *addr, - const char *default_port, grpc_pollset_set *interested_parties, - grpc_closure *on_done, grpc_lb_addresses **lb_addrs, bool check_grpclb, + const char *dns_server, const char *addr, const char *default_port, + grpc_pollset_set *interested_parties, grpc_closure *on_done, + grpc_lb_addresses **lb_addrs, bool check_grpclb, char **service_config_json) { if (0 != strcmp(addr, "test")) { - return iomgr_dns_lookup_ares(exec_ctx, dns_server, addr, default_port, + return iomgr_dns_lookup_ares(dns_server, addr, default_port, interested_parties, on_done, lb_addrs, check_grpclb, service_config_json); } @@ -115,7 +113,7 @@ static grpc_ares_request *my_dns_lookup_ares( gpr_free(sa); gpr_mu_unlock(&g_mu); } - GRPC_CLOSURE_SCHED(exec_ctx, on_done, error); + GRPC_CLOSURE_SCHED(on_done, error); return NULL; } diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc index 6da5e8396ef..fa9f5cc40c0 100644 --- a/test/core/end2end/h2_ssl_cert_test.cc +++ b/test/core/end2end/h2_ssl_cert_test.cc @@ -185,9 +185,9 @@ typedef enum { NONE, SELF_SIGNED, SIGNED, BAD_CERT_PAIR } certtype; grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); \ chttp2_init_client_secure_fullstack(f, new_client_args, ssl_creds); \ { \ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; \ - grpc_channel_args_destroy(&exec_ctx, new_client_args); \ - grpc_exec_ctx_finish(&exec_ctx); \ + ExecCtx _local_exec_ctx; \ + grpc_channel_args_destroy(new_client_args); \ + grpc_exec_ctx_finish(); \ } \ } diff --git a/test/core/end2end/tests/cancel_after_accept.c b/test/core/end2end/tests/cancel_after_accept.cc similarity index 97% rename from test/core/end2end/tests/cancel_after_accept.c rename to test/core/end2end/tests/cancel_after_accept.cc index c3ac0c32015..042353b95a9 100644 --- a/test/core/end2end/tests/cancel_after_accept.c +++ b/test/core/end2end/tests/cancel_after_accept.cc @@ -125,8 +125,8 @@ static void test_cancel_after_accept(grpc_end2end_test_config config, if (use_service_config) { grpc_arg arg; arg.type = GRPC_ARG_STRING; - arg.key = GRPC_ARG_SERVICE_CONFIG; - arg.value.string = + arg.key = (char *)GRPC_ARG_SERVICE_CONFIG; + arg.value.string = (char *) "{\n" " \"methodConfig\": [ {\n" " \"name\": [\n" @@ -244,9 +244,9 @@ static void test_cancel_after_accept(grpc_end2end_test_config config, grpc_call_unref(s); if (args != NULL) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, args); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_channel_args_destroy(args); + grpc_exec_ctx_finish(); } cq_verifier_destroy(cqv); diff --git a/test/core/end2end/tests/cancel_after_round_trip.c b/test/core/end2end/tests/cancel_after_round_trip.cc similarity index 98% rename from test/core/end2end/tests/cancel_after_round_trip.c rename to test/core/end2end/tests/cancel_after_round_trip.cc index bc41bd3a6d5..d45461b9f3e 100644 --- a/test/core/end2end/tests/cancel_after_round_trip.c +++ b/test/core/end2end/tests/cancel_after_round_trip.cc @@ -127,8 +127,8 @@ static void test_cancel_after_round_trip(grpc_end2end_test_config config, if (use_service_config) { grpc_arg arg; arg.type = GRPC_ARG_STRING; - arg.key = GRPC_ARG_SERVICE_CONFIG; - arg.value.string = + arg.key = (char *)GRPC_ARG_SERVICE_CONFIG; + arg.value.string = (char *) "{\n" " \"methodConfig\": [ {\n" " \"name\": [\n" @@ -277,9 +277,9 @@ static void test_cancel_after_round_trip(grpc_end2end_test_config config, grpc_call_unref(s); if (args != NULL) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, args); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_channel_args_destroy(args); + grpc_exec_ctx_finish(); } cq_verifier_destroy(cqv); diff --git a/test/core/end2end/tests/compressed_payload.c b/test/core/end2end/tests/compressed_payload.cc similarity index 97% rename from test/core/end2end/tests/compressed_payload.c rename to test/core/end2end/tests/compressed_payload.cc index ba03773036b..a80ac779e31 100644 --- a/test/core/end2end/tests/compressed_payload.c +++ b/test/core/end2end/tests/compressed_payload.cc @@ -129,10 +129,10 @@ static void request_for_disabled_algorithm( server_args = grpc_channel_args_set_compression_algorithm(NULL, GRPC_COMPRESS_NONE); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; server_args = grpc_channel_args_compression_algorithm_set_state( - &exec_ctx, &server_args, algorithm_to_disable, false); - grpc_exec_ctx_finish(&exec_ctx); + &server_args, algorithm_to_disable, false); + grpc_exec_ctx_finish(); } f = begin_test(config, test_name, client_args, server_args); @@ -257,10 +257,10 @@ static void request_for_disabled_algorithm( grpc_byte_buffer_destroy(request_payload_recv); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, client_args); - grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_channel_args_destroy(client_args); + grpc_channel_args_destroy(server_args); + grpc_exec_ctx_finish(); } end_test(&f); @@ -536,10 +536,10 @@ static void request_with_payload_template( cq_verifier_destroy(cqv); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, client_args); - grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_channel_args_destroy(client_args); + grpc_channel_args_destroy(server_args); + grpc_exec_ctx_finish(); } end_test(&f); diff --git a/test/core/end2end/tests/filter_call_init_fails.c b/test/core/end2end/tests/filter_call_init_fails.cc similarity index 95% rename from test/core/end2end/tests/filter_call_init_fails.c rename to test/core/end2end/tests/filter_call_init_fails.cc index 09e9dbcd7bb..7595ccb72ed 100644 --- a/test/core/end2end/tests/filter_call_init_fails.c +++ b/test/core/end2end/tests/filter_call_init_fails.cc @@ -399,26 +399,23 @@ static void test_client_subchannel_filter(grpc_end2end_test_config config) { * Test filter - always fails to initialize a call */ -static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *init_call_elem(grpc_call_element *elem, const grpc_call_element_args *args) { return grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("access denied"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_PERMISSION_DENIED); } -static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, +static void destroy_call_elem(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *ignored) {} -static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static grpc_error *init_channel_elem(grpc_channel_element *elem, grpc_channel_element_args *args) { return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem) {} +static void destroy_channel_elem(grpc_channel_element *elem) {} static const grpc_channel_filter test_filter = { grpc_call_next_op, @@ -437,8 +434,7 @@ static const grpc_channel_filter test_filter = { * Registration */ -static bool maybe_add_server_channel_filter(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder, +static bool maybe_add_server_channel_filter(grpc_channel_stack_builder *builder, void *arg) { if (g_enable_server_channel_filter) { // Want to add the filter as close to the end as possible, to make @@ -457,8 +453,7 @@ static bool maybe_add_server_channel_filter(grpc_exec_ctx *exec_ctx, } } -static bool maybe_add_client_channel_filter(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder, +static bool maybe_add_client_channel_filter(grpc_channel_stack_builder *builder, void *arg) { if (g_enable_client_channel_filter) { // Want to add the filter as close to the end as possible, to make @@ -478,7 +473,7 @@ static bool maybe_add_client_channel_filter(grpc_exec_ctx *exec_ctx, } static bool maybe_add_client_subchannel_filter( - grpc_exec_ctx *exec_ctx, grpc_channel_stack_builder *builder, void *arg) { + grpc_channel_stack_builder *builder, void *arg) { if (g_enable_client_subchannel_filter) { // Want to add the filter as close to the end as possible, to make // sure that all of the filters work well together. However, we diff --git a/test/core/end2end/tests/filter_causes_close.c b/test/core/end2end/tests/filter_causes_close.cc similarity index 90% rename from test/core/end2end/tests/filter_causes_close.c rename to test/core/end2end/tests/filter_causes_close.cc index ee7aeb3f333..cf84cbb279c 100644 --- a/test/core/end2end/tests/filter_causes_close.c +++ b/test/core/end2end/tests/filter_causes_close.cc @@ -193,12 +193,11 @@ typedef struct { grpc_closure *recv_im_ready; } call_data; typedef struct { uint8_t unused; } channel_data; -static void recv_im_ready(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void recv_im_ready(void *arg, grpc_error *error) { grpc_call_element *elem = (grpc_call_element *)arg; call_data *calld = (call_data *)elem->call_data; GRPC_CLOSURE_RUN( - exec_ctx, calld->recv_im_ready, + calld->recv_im_ready, grpc_error_set_int(GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Failure that's not preventable.", &error, 1), GRPC_ERROR_INT_GRPC_STATUS, @@ -206,8 +205,7 @@ static void recv_im_ready(grpc_exec_ctx *exec_ctx, void *arg, } static void start_transport_stream_op_batch( - grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - grpc_transport_stream_op_batch *op) { + grpc_call_element *elem, grpc_transport_stream_op_batch *op) { call_data *calld = (call_data *)elem->call_data; if (op->recv_initial_metadata) { calld->recv_im_ready = @@ -215,27 +213,24 @@ static void start_transport_stream_op_batch( op->payload->recv_initial_metadata.recv_initial_metadata_ready = GRPC_CLOSURE_CREATE(recv_im_ready, elem, grpc_schedule_on_exec_ctx); } - grpc_call_next_op(exec_ctx, elem, op); + grpc_call_next_op(elem, op); } -static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *init_call_elem(grpc_call_element *elem, const grpc_call_element_args *args) { return GRPC_ERROR_NONE; } -static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, +static void destroy_call_elem(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *ignored) {} -static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static grpc_error *init_channel_elem(grpc_channel_element *elem, grpc_channel_element_args *args) { return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem) {} +static void destroy_channel_elem(grpc_channel_element *elem) {} static const grpc_channel_filter test_filter = { start_transport_stream_op_batch, @@ -254,8 +249,7 @@ static const grpc_channel_filter test_filter = { * Registration */ -static bool maybe_add_filter(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder, void *arg) { +static bool maybe_add_filter(grpc_channel_stack_builder *builder, void *arg) { if (g_enable_filter) { return grpc_channel_stack_builder_prepend_filter(builder, &test_filter, NULL, NULL); diff --git a/test/core/end2end/tests/filter_latency.c b/test/core/end2end/tests/filter_latency.cc similarity index 94% rename from test/core/end2end/tests/filter_latency.c rename to test/core/end2end/tests/filter_latency.cc index c24934f05d5..693c400e43c 100644 --- a/test/core/end2end/tests/filter_latency.c +++ b/test/core/end2end/tests/filter_latency.cc @@ -247,14 +247,12 @@ static void test_request(grpc_end2end_test_config config) { * Test latency filter */ -static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *init_call_elem(grpc_call_element *elem, const grpc_call_element_args *args) { return GRPC_ERROR_NONE; } -static void client_destroy_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static void client_destroy_call_elem(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *ignored) { gpr_mu_lock(&g_mu); @@ -262,8 +260,7 @@ static void client_destroy_call_elem(grpc_exec_ctx *exec_ctx, gpr_mu_unlock(&g_mu); } -static void server_destroy_call_elem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static void server_destroy_call_elem(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *ignored) { gpr_mu_lock(&g_mu); @@ -271,14 +268,12 @@ static void server_destroy_call_elem(grpc_exec_ctx *exec_ctx, gpr_mu_unlock(&g_mu); } -static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static grpc_error *init_channel_elem(grpc_channel_element *elem, grpc_channel_element_args *args) { return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem) {} +static void destroy_channel_elem(grpc_channel_element *elem) {} static const grpc_channel_filter test_client_filter = { grpc_call_next_op, @@ -310,8 +305,7 @@ static const grpc_channel_filter test_server_filter = { * Registration */ -static bool maybe_add_filter(grpc_exec_ctx *exec_ctx, - grpc_channel_stack_builder *builder, void *arg) { +static bool maybe_add_filter(grpc_channel_stack_builder *builder, void *arg) { grpc_channel_filter *filter = (grpc_channel_filter *)arg; if (g_enable_filter) { // Want to add the filter as close to the end as possible, to make diff --git a/test/core/end2end/tests/keepalive_timeout.c b/test/core/end2end/tests/keepalive_timeout.c index 0053368eccf..b6e5776d121 100644 --- a/test/core/end2end/tests/keepalive_timeout.c +++ b/test/core/end2end/tests/keepalive_timeout.c @@ -28,7 +28,7 @@ #include #include "src/core/ext/transport/chttp2/transport/frame_ping.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/iomgr/exec_ctx.h" +//#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/support/env.h" #include "test/core/end2end/cq_verifier.h" diff --git a/test/core/end2end/tests/load_reporting_hook.c b/test/core/end2end/tests/load_reporting_hook.cc similarity index 98% rename from test/core/end2end/tests/load_reporting_hook.c rename to test/core/end2end/tests/load_reporting_hook.cc index 7b503790db3..d9f7549fa30 100644 --- a/test/core/end2end/tests/load_reporting_hook.c +++ b/test/core/end2end/tests/load_reporting_hook.cc @@ -300,9 +300,9 @@ static void test_load_reporting_hook(grpc_end2end_test_config config) { &trailing_lr_metadata); end_test(&f); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, lr_server_args); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_channel_args_destroy(lr_server_args); + grpc_exec_ctx_finish(); } config.tear_down_data(&f); } diff --git a/test/core/end2end/tests/max_message_length.c b/test/core/end2end/tests/max_message_length.cc similarity index 84% rename from test/core/end2end/tests/max_message_length.c rename to test/core/end2end/tests/max_message_length.cc index 01eb8d365e6..508ce8bdcda 100644 --- a/test/core/end2end/tests/max_message_length.c +++ b/test/core/end2end/tests/max_message_length.cc @@ -132,31 +132,32 @@ static void test_max_message_length_on_request(grpc_end2end_test_config config, GPR_ASSERT(send_limit); grpc_arg arg; arg.type = GRPC_ARG_STRING; - arg.key = GRPC_ARG_SERVICE_CONFIG; - arg.value.string = - use_string_json_value - ? "{\n" - " \"methodConfig\": [ {\n" - " \"name\": [\n" - " { \"service\": \"service\", \"method\": \"method\" }\n" - " ],\n" - " \"maxRequestMessageBytes\": \"5\"\n" - " } ]\n" - "}" - : "{\n" - " \"methodConfig\": [ {\n" - " \"name\": [\n" - " { \"service\": \"service\", \"method\": \"method\" }\n" - " ],\n" - " \"maxRequestMessageBytes\": 5\n" - " } ]\n" - "}"; + arg.key = (char *)GRPC_ARG_SERVICE_CONFIG; + arg.value.string = (char *)(use_string_json_value + ? "{\n" + " \"methodConfig\": [ {\n" + " \"name\": [\n" + " { \"service\": \"service\", " + "\"method\": \"method\" }\n" + " ],\n" + " \"maxRequestMessageBytes\": \"5\"\n" + " } ]\n" + "}" + : "{\n" + " \"methodConfig\": [ {\n" + " \"name\": [\n" + " { \"service\": \"service\", " + "\"method\": \"method\" }\n" + " ],\n" + " \"maxRequestMessageBytes\": 5\n" + " } ]\n" + "}"); client_args = grpc_channel_args_copy_and_add(NULL, &arg, 1); } else { // Set limit via channel args. grpc_arg arg; - arg.key = send_limit ? GRPC_ARG_MAX_SEND_MESSAGE_LENGTH - : GRPC_ARG_MAX_RECEIVE_MESSAGE_LENGTH; + arg.key = (char *)(send_limit ? GRPC_ARG_MAX_SEND_MESSAGE_LENGTH + : GRPC_ARG_MAX_RECEIVE_MESSAGE_LENGTH); arg.type = GRPC_ARG_INTEGER; arg.value.integer = 5; grpc_channel_args *args = grpc_channel_args_copy_and_add(NULL, &arg, 1); @@ -170,10 +171,10 @@ static void test_max_message_length_on_request(grpc_end2end_test_config config, f = begin_test(config, "test_max_request_message_length", client_args, server_args); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - if (client_args != NULL) grpc_channel_args_destroy(&exec_ctx, client_args); - if (server_args != NULL) grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + if (client_args != NULL) grpc_channel_args_destroy(client_args); + if (server_args != NULL) grpc_channel_args_destroy(server_args); + grpc_exec_ctx_finish(); } cqv = cq_verifier_create(f.cq); @@ -322,31 +323,32 @@ static void test_max_message_length_on_response(grpc_end2end_test_config config, GPR_ASSERT(!send_limit); grpc_arg arg; arg.type = GRPC_ARG_STRING; - arg.key = GRPC_ARG_SERVICE_CONFIG; - arg.value.string = - use_string_json_value - ? "{\n" - " \"methodConfig\": [ {\n" - " \"name\": [\n" - " { \"service\": \"service\", \"method\": \"method\" }\n" - " ],\n" - " \"maxResponseMessageBytes\": \"5\"\n" - " } ]\n" - "}" - : "{\n" - " \"methodConfig\": [ {\n" - " \"name\": [\n" - " { \"service\": \"service\", \"method\": \"method\" }\n" - " ],\n" - " \"maxResponseMessageBytes\": 5\n" - " } ]\n" - "}"; + arg.key = (char *)GRPC_ARG_SERVICE_CONFIG; + arg.value.string = (char *)(use_string_json_value + ? "{\n" + " \"methodConfig\": [ {\n" + " \"name\": [\n" + " { \"service\": \"service\", " + "\"method\": \"method\" }\n" + " ],\n" + " \"maxResponseMessageBytes\": \"5\"\n" + " } ]\n" + "}" + : "{\n" + " \"methodConfig\": [ {\n" + " \"name\": [\n" + " { \"service\": \"service\", " + "\"method\": \"method\" }\n" + " ],\n" + " \"maxResponseMessageBytes\": 5\n" + " } ]\n" + "}"); client_args = grpc_channel_args_copy_and_add(NULL, &arg, 1); } else { // Set limit via channel args. grpc_arg arg; - arg.key = send_limit ? GRPC_ARG_MAX_SEND_MESSAGE_LENGTH - : GRPC_ARG_MAX_RECEIVE_MESSAGE_LENGTH; + arg.key = (char *)(send_limit ? GRPC_ARG_MAX_SEND_MESSAGE_LENGTH + : GRPC_ARG_MAX_RECEIVE_MESSAGE_LENGTH); arg.type = GRPC_ARG_INTEGER; arg.value.integer = 5; grpc_channel_args *args = grpc_channel_args_copy_and_add(NULL, &arg, 1); @@ -360,10 +362,10 @@ static void test_max_message_length_on_response(grpc_end2end_test_config config, f = begin_test(config, "test_max_response_message_length", client_args, server_args); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - if (client_args != NULL) grpc_channel_args_destroy(&exec_ctx, client_args); - if (server_args != NULL) grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + if (client_args != NULL) grpc_channel_args_destroy(client_args); + if (server_args != NULL) grpc_channel_args_destroy(server_args); + grpc_exec_ctx_finish(); } cqv = cq_verifier_create(f.cq); diff --git a/test/core/end2end/tests/request_with_flags.c b/test/core/end2end/tests/request_with_flags.cc similarity index 100% rename from test/core/end2end/tests/request_with_flags.c rename to test/core/end2end/tests/request_with_flags.cc diff --git a/test/core/end2end/tests/stream_compression_compressed_payload.c b/test/core/end2end/tests/stream_compression_compressed_payload.cc similarity index 97% rename from test/core/end2end/tests/stream_compression_compressed_payload.c rename to test/core/end2end/tests/stream_compression_compressed_payload.cc index 8b47741cd40..e79bb95d955 100644 --- a/test/core/end2end/tests/stream_compression_compressed_payload.c +++ b/test/core/end2end/tests/stream_compression_compressed_payload.cc @@ -129,10 +129,10 @@ static void request_for_disabled_algorithm( server_args = grpc_channel_args_set_stream_compression_algorithm( NULL, GRPC_STREAM_COMPRESS_NONE); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; server_args = grpc_channel_args_stream_compression_algorithm_set_state( - &exec_ctx, &server_args, algorithm_to_disable, false); - grpc_exec_ctx_finish(&exec_ctx); + &server_args, algorithm_to_disable, false); + grpc_exec_ctx_finish(); } f = begin_test(config, test_name, client_args, server_args); @@ -258,10 +258,10 @@ static void request_for_disabled_algorithm( grpc_byte_buffer_destroy(request_payload_recv); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, client_args); - grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_channel_args_destroy(client_args); + grpc_channel_args_destroy(server_args); + grpc_exec_ctx_finish(); } end_test(&f); @@ -544,10 +544,10 @@ static void request_with_payload_template( cq_verifier_destroy(cqv); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, client_args); - grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_channel_args_destroy(client_args); + grpc_channel_args_destroy(server_args); + grpc_exec_ctx_finish(); } end_test(&f); diff --git a/test/core/end2end/tests/stream_compression_payload.c b/test/core/end2end/tests/stream_compression_payload.cc similarity index 98% rename from test/core/end2end/tests/stream_compression_payload.c rename to test/core/end2end/tests/stream_compression_payload.cc index e47d2aa93c3..bcde2a04c99 100644 --- a/test/core/end2end/tests/stream_compression_payload.c +++ b/test/core/end2end/tests/stream_compression_payload.cc @@ -278,10 +278,10 @@ static void test_invoke_request_response_with_payload( end_test(&f); config.tear_down_data(&f); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, client_args); - grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_channel_args_destroy(client_args); + grpc_channel_args_destroy(server_args); + grpc_exec_ctx_finish(); } } diff --git a/test/core/end2end/tests/stream_compression_ping_pong_streaming.c b/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc similarity index 97% rename from test/core/end2end/tests/stream_compression_ping_pong_streaming.c rename to test/core/end2end/tests/stream_compression_ping_pong_streaming.cc index 4c1a34cc648..2c42b593e2b 100644 --- a/test/core/end2end/tests/stream_compression_ping_pong_streaming.c +++ b/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc @@ -273,10 +273,10 @@ static void test_pingpong_streaming(grpc_end2end_test_config config, end_test(&f); config.tear_down_data(&f); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, client_args); - grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_channel_args_destroy(client_args); + grpc_channel_args_destroy(server_args); + grpc_exec_ctx_finish(); } } diff --git a/test/core/end2end/tests/workaround_cronet_compression.c b/test/core/end2end/tests/workaround_cronet_compression.cc similarity index 95% rename from test/core/end2end/tests/workaround_cronet_compression.c rename to test/core/end2end/tests/workaround_cronet_compression.cc index 44e8e046432..246ccfb3f9c 100644 --- a/test/core/end2end/tests/workaround_cronet_compression.c +++ b/test/core/end2end/tests/workaround_cronet_compression.cc @@ -142,15 +142,15 @@ static void request_with_payload_template( NULL, default_server_channel_compression_algorithm); if (user_agent_override) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_channel_args *client_args_old = client_args; grpc_arg arg; - arg.key = GRPC_ARG_PRIMARY_USER_AGENT_STRING; + arg.key = (char *)GRPC_ARG_PRIMARY_USER_AGENT_STRING; arg.type = GRPC_ARG_STRING; arg.value.string = user_agent_override; client_args = grpc_channel_args_copy_and_add(client_args_old, &arg, 1); - grpc_channel_args_destroy(&exec_ctx, client_args_old); - grpc_exec_ctx_finish(&exec_ctx); + grpc_channel_args_destroy(client_args_old); + grpc_exec_ctx_finish(); } f = begin_test(config, test_name, client_args, server_args); @@ -349,10 +349,10 @@ static void request_with_payload_template( cq_verifier_destroy(cqv); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, client_args); - grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_channel_args_destroy(client_args); + grpc_channel_args_destroy(server_args); + grpc_exec_ctx_finish(); } end_test(&f); @@ -366,11 +366,11 @@ typedef struct workaround_cronet_compression_config { static workaround_cronet_compression_config workaround_configs[] = { {NULL, GRPC_COMPRESS_GZIP}, - {"grpc-objc/1.3.0-dev grpc-c/3.0.0-dev (ios; cronet_http; gentle)", + {(char *)"grpc-objc/1.3.0-dev grpc-c/3.0.0-dev (ios; cronet_http; gentle)", GRPC_COMPRESS_NONE}, - {"grpc-objc/1.3.0-dev grpc-c/3.0.0-dev (ios; chttp2; gentle)", + {(char *)"grpc-objc/1.3.0-dev grpc-c/3.0.0-dev (ios; chttp2; gentle)", GRPC_COMPRESS_GZIP}, - {"grpc-objc/1.4.0 grpc-c/3.0.0-dev (ios; cronet_http; gentle)", + {(char *)"grpc-objc/1.4.0 grpc-c/3.0.0-dev (ios; cronet_http; gentle)", GRPC_COMPRESS_GZIP}}; static const size_t workaround_configs_num = sizeof(workaround_configs) / sizeof(*workaround_configs); diff --git a/test/core/http/httpcli_test.c b/test/core/http/httpcli_test.c index cc1c16d695b..de339304d9c 100644 --- a/test/core/http/httpcli_test.c +++ b/test/core/http/httpcli_test.c @@ -40,7 +40,7 @@ static grpc_millis n_seconds_time(int seconds) { grpc_timeout_seconds_to_deadline(seconds)); } -static void on_finish(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void on_finish(void *arg, grpc_error *error) { const char *expect = "Hello world!" "

    This is a test

    "; @@ -53,14 +53,14 @@ static void on_finish(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { g_done = 1; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&g_pops), NULL))); + grpc_pollset_kick(grpc_polling_entity_pollset(&g_pops), NULL))); gpr_mu_unlock(g_mu); } static void test_get(int port) { grpc_httpcli_request req; char *host; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; g_done = 0; gpr_log(GPR_INFO, "test_get"); @@ -77,19 +77,18 @@ static void test_get(int port) { memset(&response, 0, sizeof(response)); grpc_resource_quota *resource_quota = grpc_resource_quota_create("test_get"); grpc_httpcli_get( - &exec_ctx, &g_context, &g_pops, resource_quota, &req, n_seconds_time(15), + &g_context, &g_pops, resource_quota, &req, n_seconds_time(15), GRPC_CLOSURE_CREATE(on_finish, &response, grpc_schedule_on_exec_ctx), &response); - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); gpr_mu_lock(g_mu); while (!g_done) { grpc_pollset_worker *worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), - &worker, n_seconds_time(1)))); + "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&g_pops), + &worker, n_seconds_time(1)))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -100,7 +99,7 @@ static void test_get(int port) { static void test_post(int port) { grpc_httpcli_request req; char *host; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; g_done = 0; gpr_log(GPR_INFO, "test_post"); @@ -117,20 +116,18 @@ static void test_post(int port) { memset(&response, 0, sizeof(response)); grpc_resource_quota *resource_quota = grpc_resource_quota_create("test_post"); grpc_httpcli_post( - &exec_ctx, &g_context, &g_pops, resource_quota, &req, "hello", 5, - n_seconds_time(15), + &g_context, &g_pops, resource_quota, &req, "hello", 5, n_seconds_time(15), GRPC_CLOSURE_CREATE(on_finish, &response, grpc_schedule_on_exec_ctx), &response); - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); gpr_mu_lock(g_mu); while (!g_done) { grpc_pollset_worker *worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), - &worker, n_seconds_time(1)))); + "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&g_pops), + &worker, n_seconds_time(1)))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -138,13 +135,13 @@ static void test_post(int port) { grpc_http_response_destroy(&response); } -static void destroy_pops(grpc_exec_ctx *exec_ctx, void *p, grpc_error *error) { - grpc_pollset_destroy(exec_ctx, grpc_polling_entity_pollset(p)); +static void destroy_pops(void *p, grpc_error *error) { + grpc_pollset_destroy(grpc_polling_entity_pollset(p)); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; gpr_subprocess *server; char *me = argv[0]; char *lslash = strrchr(me, '/'); @@ -193,12 +190,11 @@ int main(int argc, char **argv) { test_get(port); test_post(port); - grpc_httpcli_context_destroy(&exec_ctx, &g_context); + grpc_httpcli_context_destroy(&g_context); GRPC_CLOSURE_INIT(&destroyed, destroy_pops, &g_pops, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&g_pops), - &destroyed); - grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_shutdown(grpc_polling_entity_pollset(&g_pops), &destroyed); + grpc_exec_ctx_finish(); grpc_shutdown(); gpr_free(grpc_polling_entity_pollset(&g_pops)); diff --git a/test/core/http/httpscli_test.c b/test/core/http/httpscli_test.c index f8a3cfdd764..dde2fbfd669 100644 --- a/test/core/http/httpscli_test.c +++ b/test/core/http/httpscli_test.c @@ -40,7 +40,7 @@ static grpc_millis n_seconds_time(int seconds) { grpc_timeout_seconds_to_deadline(seconds)); } -static void on_finish(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void on_finish(void *arg, grpc_error *error) { const char *expect = "Hello world!" "

    This is a test

    "; @@ -53,14 +53,14 @@ static void on_finish(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { g_done = 1; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&g_pops), NULL))); + grpc_pollset_kick(grpc_polling_entity_pollset(&g_pops), NULL))); gpr_mu_unlock(g_mu); } static void test_get(int port) { grpc_httpcli_request req; char *host; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; g_done = 0; gpr_log(GPR_INFO, "test_get"); @@ -78,19 +78,18 @@ static void test_get(int port) { memset(&response, 0, sizeof(response)); grpc_resource_quota *resource_quota = grpc_resource_quota_create("test_get"); grpc_httpcli_get( - &exec_ctx, &g_context, &g_pops, resource_quota, &req, n_seconds_time(15), + &g_context, &g_pops, resource_quota, &req, n_seconds_time(15), GRPC_CLOSURE_CREATE(on_finish, &response, grpc_schedule_on_exec_ctx), &response); - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); gpr_mu_lock(g_mu); while (!g_done) { grpc_pollset_worker *worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), - &worker, n_seconds_time(1)))); + "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&g_pops), + &worker, n_seconds_time(1)))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -101,7 +100,7 @@ static void test_get(int port) { static void test_post(int port) { grpc_httpcli_request req; char *host; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; g_done = 0; gpr_log(GPR_INFO, "test_post"); @@ -119,20 +118,18 @@ static void test_post(int port) { memset(&response, 0, sizeof(response)); grpc_resource_quota *resource_quota = grpc_resource_quota_create("test_post"); grpc_httpcli_post( - &exec_ctx, &g_context, &g_pops, resource_quota, &req, "hello", 5, - n_seconds_time(15), + &g_context, &g_pops, resource_quota, &req, "hello", 5, n_seconds_time(15), GRPC_CLOSURE_CREATE(on_finish, &response, grpc_schedule_on_exec_ctx), &response); - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); gpr_mu_lock(g_mu); while (!g_done) { grpc_pollset_worker *worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), - &worker, n_seconds_time(1)))); + "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&g_pops), + &worker, n_seconds_time(1)))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -140,13 +137,13 @@ static void test_post(int port) { grpc_http_response_destroy(&response); } -static void destroy_pops(grpc_exec_ctx *exec_ctx, void *p, grpc_error *error) { - grpc_pollset_destroy(exec_ctx, grpc_polling_entity_pollset(p)); +static void destroy_pops(void *p, grpc_error *error) { + grpc_pollset_destroy(grpc_polling_entity_pollset(p)); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; gpr_subprocess *server; char *me = argv[0]; char *lslash = strrchr(me, '/'); @@ -196,12 +193,11 @@ int main(int argc, char **argv) { test_get(port); test_post(port); - grpc_httpcli_context_destroy(&exec_ctx, &g_context); + grpc_httpcli_context_destroy(&g_context); GRPC_CLOSURE_INIT(&destroyed, destroy_pops, &g_pops, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&g_pops), - &destroyed); - grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_shutdown(grpc_polling_entity_pollset(&g_pops), &destroyed); + grpc_exec_ctx_finish(); grpc_shutdown(); gpr_free(grpc_polling_entity_pollset(&g_pops)); diff --git a/test/core/iomgr/combiner_test.c b/test/core/iomgr/combiner_test.c index 38f512de0ed..121cbfe41aa 100644 --- a/test/core/iomgr/combiner_test.c +++ b/test/core/iomgr/combiner_test.c @@ -28,13 +28,12 @@ static void test_no_op(void) { gpr_log(GPR_DEBUG, "test_no_op"); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_COMBINER_UNREF(&exec_ctx, grpc_combiner_create(), "test_no_op"); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_COMBINER_UNREF(grpc_combiner_create(), "test_no_op"); + grpc_exec_ctx_finish(); } -static void set_event_to_true(grpc_exec_ctx *exec_ctx, void *value, - grpc_error *error) { +static void set_event_to_true(void *value, grpc_error *error) { gpr_event_set(value, (void *)1); } @@ -44,16 +43,15 @@ static void test_execute_one(void) { grpc_combiner *lock = grpc_combiner_create(); gpr_event done; gpr_event_init(&done); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_CLOSURE_SCHED(&exec_ctx, - GRPC_CLOSURE_CREATE(set_event_to_true, &done, + exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(set_event_to_true, &done, grpc_combiner_scheduler(lock)), GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); GPR_ASSERT(gpr_event_wait(&done, grpc_timeout_seconds_to_deadline(5)) != NULL); - GRPC_COMBINER_UNREF(&exec_ctx, lock, "test_execute_one"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(lock, "test_execute_one"); + grpc_exec_ctx_finish(); } typedef struct { @@ -67,7 +65,7 @@ typedef struct { size_t value; } ex_args; -static void check_one(grpc_exec_ctx *exec_ctx, void *a, grpc_error *error) { +static void check_one(void *a, grpc_error *error) { ex_args *args = a; GPR_ASSERT(*args->ctr == args->value - 1); *args->ctr = args->value; @@ -76,28 +74,26 @@ static void check_one(grpc_exec_ctx *exec_ctx, void *a, grpc_error *error) { static void execute_many_loop(void *a) { thd_args *args = a; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; size_t n = 1; for (size_t i = 0; i < 10; i++) { for (size_t j = 0; j < 10000; j++) { ex_args *c = gpr_malloc(sizeof(*c)); c->ctr = &args->ctr; c->value = n++; - GRPC_CLOSURE_SCHED(&exec_ctx, - GRPC_CLOSURE_CREATE( + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE( check_one, c, grpc_combiner_scheduler(args->lock)), GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); } // sleep for a little bit, to test a combiner draining and another thread // picking it up gpr_sleep_until(grpc_timeout_milliseconds_to_deadline(100)); } - GRPC_CLOSURE_SCHED(&exec_ctx, - GRPC_CLOSURE_CREATE(set_event_to_true, &args->done, + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(set_event_to_true, &args->done, grpc_combiner_scheduler(args->lock)), GRPC_ERROR_NONE); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void test_execute_many(void) { @@ -119,20 +115,19 @@ static void test_execute_many(void) { gpr_inf_future(GPR_CLOCK_REALTIME)) != NULL); gpr_thd_join(thds[i]); } - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_COMBINER_UNREF(&exec_ctx, lock, "test_execute_many"); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_COMBINER_UNREF(lock, "test_execute_many"); + grpc_exec_ctx_finish(); } static gpr_event got_in_finally; -static void in_finally(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void in_finally(void *arg, grpc_error *error) { gpr_event_set(&got_in_finally, (void *)1); } -static void add_finally(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { - GRPC_CLOSURE_SCHED(exec_ctx, - GRPC_CLOSURE_CREATE(in_finally, arg, +static void add_finally(void *arg, grpc_error *error) { + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(in_finally, arg, grpc_combiner_finally_scheduler(arg)), GRPC_ERROR_NONE); } @@ -141,17 +136,16 @@ static void test_execute_finally(void) { gpr_log(GPR_DEBUG, "test_execute_finally"); grpc_combiner *lock = grpc_combiner_create(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; gpr_event_init(&got_in_finally); GRPC_CLOSURE_SCHED( - &exec_ctx, GRPC_CLOSURE_CREATE(add_finally, lock, grpc_combiner_scheduler(lock)), GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); GPR_ASSERT(gpr_event_wait(&got_in_finally, grpc_timeout_seconds_to_deadline(5)) != NULL); - GRPC_COMBINER_UNREF(&exec_ctx, lock, "test_execute_finally"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(lock, "test_execute_finally"); + grpc_exec_ctx_finish(); } int main(int argc, char **argv) { diff --git a/test/core/iomgr/endpoint_pair_test.c b/test/core/iomgr/endpoint_pair_test.c index f2ce3d0d127..989cc80016c 100644 --- a/test/core/iomgr/endpoint_pair_test.c +++ b/test/core/iomgr/endpoint_pair_test.c @@ -32,7 +32,7 @@ static void clean_up(void) {} static grpc_endpoint_test_fixture create_fixture_endpoint_pair( size_t slice_size) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_test_fixture f; grpc_arg a[] = {{.key = GRPC_ARG_TCP_READ_CHUNK_SIZE, .type = GRPC_ARG_INTEGER, @@ -42,9 +42,9 @@ static grpc_endpoint_test_fixture create_fixture_endpoint_pair( f.client_ep = p.client; f.server_ep = p.server; - grpc_endpoint_add_to_pollset(&exec_ctx, f.client_ep, g_pollset); - grpc_endpoint_add_to_pollset(&exec_ctx, f.server_ep, g_pollset); - grpc_exec_ctx_finish(&exec_ctx); + grpc_endpoint_add_to_pollset(f.client_ep, g_pollset); + grpc_endpoint_add_to_pollset(f.server_ep, g_pollset); + grpc_exec_ctx_finish(); return f; } @@ -53,14 +53,13 @@ static grpc_endpoint_test_config configs[] = { {"tcp/tcp_socketpair", create_fixture_endpoint_pair, clean_up}, }; -static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, - grpc_error *error) { - grpc_pollset_destroy(exec_ctx, p); +static void destroy_pollset(void *p, grpc_error *error) { + grpc_pollset_destroy(p); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); g_pollset = gpr_zalloc(grpc_pollset_size()); @@ -68,8 +67,8 @@ int main(int argc, char **argv) { grpc_endpoint_tests(configs[0], g_pollset, g_mu); GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); - grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + grpc_exec_ctx_finish(); grpc_shutdown(); gpr_free(g_pollset); diff --git a/test/core/iomgr/endpoint_tests.c b/test/core/iomgr/endpoint_tests.cc similarity index 75% rename from test/core/iomgr/endpoint_tests.c rename to test/core/iomgr/endpoint_tests.cc index 61e901f6455..a6ac24a2615 100644 --- a/test/core/iomgr/endpoint_tests.c +++ b/test/core/iomgr/endpoint_tests.cc @@ -115,8 +115,7 @@ struct read_and_write_test_state { grpc_closure done_write; }; -static void read_and_write_test_read_handler(grpc_exec_ctx *exec_ctx, - void *data, grpc_error *error) { +static void read_and_write_test_read_handler(void *data, grpc_error *error) { struct read_and_write_test_state *state = (struct read_and_write_test_state *)data; @@ -126,17 +125,14 @@ static void read_and_write_test_read_handler(grpc_exec_ctx *exec_ctx, gpr_log(GPR_INFO, "Read handler done"); gpr_mu_lock(g_mu); state->read_done = 1 + (error == GRPC_ERROR_NONE); - GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, g_pollset, NULL)); + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL)); gpr_mu_unlock(g_mu); } else if (error == GRPC_ERROR_NONE) { - grpc_endpoint_read(exec_ctx, state->read_ep, &state->incoming, - &state->done_read); + grpc_endpoint_read(state->read_ep, &state->incoming, &state->done_read); } } -static void read_and_write_test_write_handler(grpc_exec_ctx *exec_ctx, - void *data, grpc_error *error) { +static void read_and_write_test_write_handler(void *data, grpc_error *error) { struct read_and_write_test_state *state = (struct read_and_write_test_state *)data; grpc_slice *slices = NULL; @@ -153,7 +149,7 @@ static void read_and_write_test_write_handler(grpc_exec_ctx *exec_ctx, &state->current_write_data); grpc_slice_buffer_reset_and_unref(&state->outgoing); grpc_slice_buffer_addn(&state->outgoing, slices, nslices); - grpc_endpoint_write(exec_ctx, state->write_ep, &state->outgoing, + grpc_endpoint_write(state->write_ep, &state->outgoing, &state->done_write); gpr_free(slices); return; @@ -163,8 +159,7 @@ static void read_and_write_test_write_handler(grpc_exec_ctx *exec_ctx, gpr_log(GPR_INFO, "Write handler done"); gpr_mu_lock(g_mu); state->write_done = 1 + (error == GRPC_ERROR_NONE); - GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, g_pollset, NULL)); + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL)); gpr_mu_unlock(g_mu); } @@ -178,7 +173,7 @@ static void read_and_write_test(grpc_endpoint_test_config config, struct read_and_write_test_state state; grpc_endpoint_test_fixture f = begin_test(config, "read_and_write_test", slice_size); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); gpr_log(GPR_DEBUG, "num_bytes=%" PRIuPTR " write_size=%" PRIuPTR @@ -215,66 +210,57 @@ static void read_and_write_test(grpc_endpoint_test_config config, for the first iteration as for later iterations. It does the right thing even when bytes_written is unsigned. */ state.bytes_written -= state.current_write_size; - read_and_write_test_write_handler(&exec_ctx, &state, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + read_and_write_test_write_handler(&state, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(); - grpc_endpoint_read(&exec_ctx, state.read_ep, &state.incoming, - &state.done_read); + grpc_endpoint_read(state.read_ep, &state.incoming, &state.done_read); if (shutdown) { gpr_log(GPR_DEBUG, "shutdown read"); grpc_endpoint_shutdown( - &exec_ctx, state.read_ep, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); + state.read_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); gpr_log(GPR_DEBUG, "shutdown write"); grpc_endpoint_shutdown( - &exec_ctx, state.write_ep, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); + state.write_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); } - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(g_mu); while (!state.read_done || !state.write_done) { grpc_pollset_worker *worker = NULL; - GPR_ASSERT(grpc_exec_ctx_now(&exec_ctx) < deadline); + GPR_ASSERT(grpc_exec_ctx_now() < deadline); GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); + "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); } gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); end_test(config); - grpc_slice_buffer_destroy_internal(&exec_ctx, &state.outgoing); - grpc_slice_buffer_destroy_internal(&exec_ctx, &state.incoming); - grpc_endpoint_destroy(&exec_ctx, state.read_ep); - grpc_endpoint_destroy(&exec_ctx, state.write_ep); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_buffer_destroy_internal(&state.outgoing); + grpc_slice_buffer_destroy_internal(&state.incoming); + grpc_endpoint_destroy(state.read_ep); + grpc_endpoint_destroy(state.write_ep); + grpc_exec_ctx_finish(); } -static void inc_on_failure(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void inc_on_failure(void *arg, grpc_error *error) { gpr_mu_lock(g_mu); *(int *)arg += (error != GRPC_ERROR_NONE); - GPR_ASSERT( - GRPC_LOG_IF_ERROR("kick", grpc_pollset_kick(exec_ctx, g_pollset, NULL))); + GPR_ASSERT(GRPC_LOG_IF_ERROR("kick", grpc_pollset_kick(g_pollset, NULL))); gpr_mu_unlock(g_mu); } -static void wait_for_fail_count(grpc_exec_ctx *exec_ctx, int *fail_count, - int want_fail_count) { - grpc_exec_ctx_flush(exec_ctx); +static void wait_for_fail_count(int *fail_count, int want_fail_count) { + grpc_exec_ctx_flush(); gpr_mu_lock(g_mu); grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(10)); - while (grpc_exec_ctx_now(exec_ctx) < deadline && - *fail_count < want_fail_count) { + while (grpc_exec_ctx_now() < deadline && *fail_count < want_fail_count) { grpc_pollset_worker *worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(exec_ctx, g_pollset, &worker, deadline))); + "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(g_mu); } GPR_ASSERT(*fail_count == want_fail_count); @@ -289,33 +275,33 @@ static void multiple_shutdown_test(grpc_endpoint_test_config config) { grpc_slice_buffer slice_buffer; grpc_slice_buffer_init(&slice_buffer); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_endpoint_add_to_pollset(&exec_ctx, f.client_ep, g_pollset); - grpc_endpoint_read(&exec_ctx, f.client_ep, &slice_buffer, + ExecCtx _local_exec_ctx; + grpc_endpoint_add_to_pollset(f.client_ep, g_pollset); + grpc_endpoint_read(f.client_ep, &slice_buffer, GRPC_CLOSURE_CREATE(inc_on_failure, &fail_count, grpc_schedule_on_exec_ctx)); - wait_for_fail_count(&exec_ctx, &fail_count, 0); - grpc_endpoint_shutdown(&exec_ctx, f.client_ep, + wait_for_fail_count(&fail_count, 0); + grpc_endpoint_shutdown(f.client_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); - wait_for_fail_count(&exec_ctx, &fail_count, 1); - grpc_endpoint_read(&exec_ctx, f.client_ep, &slice_buffer, + wait_for_fail_count(&fail_count, 1); + grpc_endpoint_read(f.client_ep, &slice_buffer, GRPC_CLOSURE_CREATE(inc_on_failure, &fail_count, grpc_schedule_on_exec_ctx)); - wait_for_fail_count(&exec_ctx, &fail_count, 2); + wait_for_fail_count(&fail_count, 2); grpc_slice_buffer_add(&slice_buffer, grpc_slice_from_copied_string("a")); - grpc_endpoint_write(&exec_ctx, f.client_ep, &slice_buffer, + grpc_endpoint_write(f.client_ep, &slice_buffer, GRPC_CLOSURE_CREATE(inc_on_failure, &fail_count, grpc_schedule_on_exec_ctx)); - wait_for_fail_count(&exec_ctx, &fail_count, 3); - grpc_endpoint_shutdown(&exec_ctx, f.client_ep, + wait_for_fail_count(&fail_count, 3); + grpc_endpoint_shutdown(f.client_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); - wait_for_fail_count(&exec_ctx, &fail_count, 3); + wait_for_fail_count(&fail_count, 3); - grpc_slice_buffer_destroy_internal(&exec_ctx, &slice_buffer); + grpc_slice_buffer_destroy_internal(&slice_buffer); - grpc_endpoint_destroy(&exec_ctx, f.client_ep); - grpc_endpoint_destroy(&exec_ctx, f.server_ep); - grpc_exec_ctx_finish(&exec_ctx); + grpc_endpoint_destroy(f.client_ep); + grpc_endpoint_destroy(f.server_ep); + grpc_exec_ctx_finish(); } void grpc_endpoint_tests(grpc_endpoint_test_config config, diff --git a/test/core/iomgr/ev_epollsig_linux_test.c b/test/core/iomgr/ev_epollsig_linux_test.c index 37aadacd497..e6f9f59bd31 100644 --- a/test/core/iomgr/ev_epollsig_linux_test.c +++ b/test/core/iomgr/ev_epollsig_linux_test.c @@ -70,19 +70,18 @@ static void test_fd_init(test_fd *tfds, int *fds, int num_fds) { } } -static void test_fd_cleanup(grpc_exec_ctx *exec_ctx, test_fd *tfds, - int num_fds) { +static void test_fd_cleanup(test_fd *tfds, int num_fds) { int release_fd; int i; for (i = 0; i < num_fds; i++) { - grpc_fd_shutdown(exec_ctx, tfds[i].fd, + grpc_fd_shutdown(tfds[i].fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("test_fd_cleanup")); - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); - grpc_fd_orphan(exec_ctx, tfds[i].fd, NULL, &release_fd, - false /* already_closed */, "test_fd_cleanup"); - grpc_exec_ctx_flush(exec_ctx); + grpc_fd_orphan(tfds[i].fd, NULL, &release_fd, false /* already_closed */, + "test_fd_cleanup"); + grpc_exec_ctx_flush(); GPR_ASSERT(release_fd == tfds[i].inner_fd); close(tfds[i].inner_fd); @@ -97,22 +96,20 @@ static void test_pollset_init(test_pollset *pollsets, int num_pollsets) { } } -static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, - grpc_error *error) { - grpc_pollset_destroy(exec_ctx, p); +static void destroy_pollset(void *p, grpc_error *error) { + grpc_pollset_destroy(p); } -static void test_pollset_cleanup(grpc_exec_ctx *exec_ctx, - test_pollset *pollsets, int num_pollsets) { +static void test_pollset_cleanup(test_pollset *pollsets, int num_pollsets) { grpc_closure destroyed; int i; for (i = 0; i < num_pollsets; i++) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, pollsets[i].pollset, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(exec_ctx, pollsets[i].pollset, &destroyed); + grpc_pollset_shutdown(pollsets[i].pollset, &destroyed); - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); gpr_free(pollsets[i].pollset); } } @@ -132,7 +129,7 @@ static void test_pollset_cleanup(grpc_exec_ctx *exec_ctx, #define NUM_POLLSETS 4 static void test_add_fd_to_pollset() { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; test_fd tfds[NUM_FDS]; int fds[NUM_FDS]; test_pollset pollsets[NUM_POLLSETS]; @@ -169,33 +166,33 @@ static void test_add_fd_to_pollset() { /* == Step 1 == */ for (i = 0; i <= 2; i++) { - grpc_pollset_add_fd(&exec_ctx, pollsets[0].pollset, tfds[i].fd); - grpc_exec_ctx_flush(&exec_ctx); + grpc_pollset_add_fd(pollsets[0].pollset, tfds[i].fd); + grpc_exec_ctx_flush(); } for (i = 3; i <= 4; i++) { - grpc_pollset_add_fd(&exec_ctx, pollsets[1].pollset, tfds[i].fd); - grpc_exec_ctx_flush(&exec_ctx); + grpc_pollset_add_fd(pollsets[1].pollset, tfds[i].fd); + grpc_exec_ctx_flush(); } for (i = 5; i <= 7; i++) { - grpc_pollset_add_fd(&exec_ctx, pollsets[2].pollset, tfds[i].fd); - grpc_exec_ctx_flush(&exec_ctx); + grpc_pollset_add_fd(pollsets[2].pollset, tfds[i].fd); + grpc_exec_ctx_flush(); } /* == Step 2 == */ for (i = 0; i <= 1; i++) { - grpc_pollset_add_fd(&exec_ctx, pollsets[3].pollset, tfds[i].fd); - grpc_exec_ctx_flush(&exec_ctx); + grpc_pollset_add_fd(pollsets[3].pollset, tfds[i].fd); + grpc_exec_ctx_flush(); } /* == Step 3 == */ - grpc_pollset_add_fd(&exec_ctx, pollsets[1].pollset, tfds[0].fd); - grpc_exec_ctx_flush(&exec_ctx); + grpc_pollset_add_fd(pollsets[1].pollset, tfds[0].fd); + grpc_exec_ctx_flush(); /* == Step 4 == */ - grpc_pollset_add_fd(&exec_ctx, pollsets[2].pollset, tfds[3].fd); - grpc_exec_ctx_flush(&exec_ctx); + grpc_pollset_add_fd(pollsets[2].pollset, tfds[3].fd); + grpc_exec_ctx_flush(); /* All polling islands are merged at this point */ @@ -212,9 +209,9 @@ static void test_add_fd_to_pollset() { expected_pi, grpc_pollset_get_polling_island(pollsets[i].pollset))); } - test_fd_cleanup(&exec_ctx, tfds, NUM_FDS); - test_pollset_cleanup(&exec_ctx, pollsets, NUM_POLLSETS); - grpc_exec_ctx_finish(&exec_ctx); + test_fd_cleanup(tfds, NUM_FDS); + test_pollset_cleanup(pollsets, NUM_POLLSETS); + grpc_exec_ctx_finish(); } #undef NUM_FDS @@ -234,26 +231,25 @@ static __thread int thread_wakeups = 0; static void test_threading_loop(void *arg) { threading_shared *shared = arg; while (thread_wakeups < 1000000) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_pollset_worker *worker; gpr_mu_lock(shared->mu); GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(&exec_ctx, shared->pollset, &worker, - GRPC_MILLIS_INF_FUTURE))); + "pollset_work", + grpc_pollset_work(shared->pollset, &worker, GRPC_MILLIS_INF_FUTURE))); gpr_mu_unlock(shared->mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } } -static void test_threading_wakeup(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void test_threading_wakeup(void *arg, grpc_error *error) { threading_shared *shared = arg; ++shared->wakeups; ++thread_wakeups; if (error == GRPC_ERROR_NONE) { GPR_ASSERT(GRPC_LOG_IF_ERROR( "consume_wakeup", grpc_wakeup_fd_consume_wakeup(shared->wakeup_fd))); - grpc_fd_notify_on_read(exec_ctx, shared->wakeup_desc, &shared->on_wakeup); + grpc_fd_notify_on_read(shared->wakeup_desc, &shared->on_wakeup); GPR_ASSERT(GRPC_LOG_IF_ERROR("wakeup_next", grpc_wakeup_fd_wakeup(shared->wakeup_fd))); } @@ -276,13 +272,13 @@ static void test_threading(void) { shared.wakeup_desc = grpc_fd_create(fd.read_fd, "wakeup"); shared.wakeups = 0; { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_pollset_add_fd(&exec_ctx, shared.pollset, shared.wakeup_desc); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_pollset_add_fd(shared.pollset, shared.wakeup_desc); grpc_fd_notify_on_read( - &exec_ctx, shared.wakeup_desc, + shared.wakeup_desc, GRPC_CLOSURE_INIT(&shared.on_wakeup, test_threading_wakeup, &shared, grpc_schedule_on_exec_ctx)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } GPR_ASSERT(GRPC_LOG_IF_ERROR("wakeup_first", grpc_wakeup_fd_wakeup(shared.wakeup_fd))); @@ -292,14 +288,14 @@ static void test_threading(void) { fd.read_fd = 0; grpc_wakeup_fd_destroy(&fd); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_fd_shutdown(&exec_ctx, shared.wakeup_desc, GRPC_ERROR_CANCELLED); - grpc_fd_orphan(&exec_ctx, shared.wakeup_desc, NULL, NULL, - false /* already_closed */, "done"); - grpc_pollset_shutdown(&exec_ctx, shared.pollset, + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_fd_shutdown(shared.wakeup_desc, GRPC_ERROR_CANCELLED); + grpc_fd_orphan(shared.wakeup_desc, NULL, NULL, false /* already_closed */, + "done"); + grpc_pollset_shutdown(shared.pollset, GRPC_CLOSURE_CREATE(destroy_pollset, shared.pollset, grpc_schedule_on_exec_ctx)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } gpr_free(shared.pollset); } @@ -308,7 +304,7 @@ int main(int argc, char **argv) { const char *poll_strategy = NULL; grpc_test_init(argc, argv); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; poll_strategy = grpc_get_poll_strategy_name(); if (poll_strategy != NULL && strcmp(poll_strategy, "epollsig") == 0) { @@ -321,7 +317,7 @@ int main(int argc, char **argv) { poll_strategy); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/fd_conservation_posix_test.c b/test/core/iomgr/fd_conservation_posix_test.c index d29b1e8e41d..8fcb01efd81 100644 --- a/test/core/iomgr/fd_conservation_posix_test.c +++ b/test/core/iomgr/fd_conservation_posix_test.c @@ -31,7 +31,7 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; /* set max # of file descriptors to a low value, and verify we can create and destroy many more than this number @@ -43,14 +43,14 @@ int main(int argc, char **argv) { for (i = 0; i < 100; i++) { p = grpc_iomgr_create_endpoint_pair("test", NULL); - grpc_endpoint_destroy(&exec_ctx, p.client); - grpc_endpoint_destroy(&exec_ctx, p.server); - grpc_exec_ctx_flush(&exec_ctx); + grpc_endpoint_destroy(p.client); + grpc_endpoint_destroy(p.server); + grpc_exec_ctx_flush(); } grpc_resource_quota_unref(resource_quota); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c index 1c62f34d3e6..d16b5567681 100644 --- a/test/core/iomgr/fd_posix_test.c +++ b/test/core/iomgr/fd_posix_test.c @@ -111,20 +111,19 @@ typedef struct { /* Called when an upload session can be safely shutdown. Close session FD and start to shutdown listen FD. */ -static void session_shutdown_cb(grpc_exec_ctx *exec_ctx, void *arg, /*session */ +static void session_shutdown_cb(void *arg, /*session */ bool success) { session *se = arg; server *sv = se->sv; - grpc_fd_orphan(exec_ctx, se->em_fd, NULL, NULL, false /* already_closed */, - "a"); + grpc_fd_orphan(se->em_fd, NULL, NULL, false /* already_closed */, "a"); gpr_free(se); /* Start to shutdown listen fd. */ - grpc_fd_shutdown(exec_ctx, sv->em_fd, + grpc_fd_shutdown(sv->em_fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("session_shutdown_cb")); } /* Called when data become readable in a session. */ -static void session_read_cb(grpc_exec_ctx *exec_ctx, void *arg, /*session */ +static void session_read_cb(void *arg, /*session */ grpc_error *error) { session *se = arg; int fd = grpc_fd_wrapped_fd(se->em_fd); @@ -133,7 +132,7 @@ static void session_read_cb(grpc_exec_ctx *exec_ctx, void *arg, /*session */ ssize_t read_total = 0; if (error != GRPC_ERROR_NONE) { - session_shutdown_cb(exec_ctx, arg, 1); + session_shutdown_cb(arg, 1); return; } @@ -148,7 +147,7 @@ static void session_read_cb(grpc_exec_ctx *exec_ctx, void *arg, /*session */ It is possible to read nothing due to spurious edge event or data has been drained, In such a case, read() returns -1 and set errno to EAGAIN. */ if (read_once == 0) { - session_shutdown_cb(exec_ctx, arg, 1); + session_shutdown_cb(arg, 1); } else if (read_once == -1) { if (errno == EAGAIN) { /* An edge triggered event is cached in the kernel until next poll. @@ -159,7 +158,7 @@ static void session_read_cb(grpc_exec_ctx *exec_ctx, void *arg, /*session */ TODO(chenw): in multi-threaded version, callback and polling can be run in different threads. polling may catch a persist read edge event before notify_on_read is called. */ - grpc_fd_notify_on_read(exec_ctx, se->em_fd, &se->session_read_closure); + grpc_fd_notify_on_read(se->em_fd, &se->session_read_closure); } else { gpr_log(GPR_ERROR, "Unhandled read error %s", strerror(errno)); abort(); @@ -169,22 +168,20 @@ static void session_read_cb(grpc_exec_ctx *exec_ctx, void *arg, /*session */ /* Called when the listen FD can be safely shutdown. Close listen FD and signal that server can be shutdown. */ -static void listen_shutdown_cb(grpc_exec_ctx *exec_ctx, void *arg /*server */, - int success) { +static void listen_shutdown_cb(void *arg /*server */, int success) { server *sv = arg; - grpc_fd_orphan(exec_ctx, sv->em_fd, NULL, NULL, false /* already_closed */, - "b"); + grpc_fd_orphan(sv->em_fd, NULL, NULL, false /* already_closed */, "b"); gpr_mu_lock(g_mu); sv->done = 1; - GPR_ASSERT(GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, g_pollset, NULL))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); gpr_mu_unlock(g_mu); } /* Called when a new TCP connection request arrives in the listening port. */ -static void listen_cb(grpc_exec_ctx *exec_ctx, void *arg, /*=sv_arg*/ +static void listen_cb(void *arg, /*=sv_arg*/ grpc_error *error) { server *sv = arg; int fd; @@ -195,7 +192,7 @@ static void listen_cb(grpc_exec_ctx *exec_ctx, void *arg, /*=sv_arg*/ grpc_fd *listen_em_fd = sv->em_fd; if (error != GRPC_ERROR_NONE) { - listen_shutdown_cb(exec_ctx, arg, 1); + listen_shutdown_cb(arg, 1); return; } @@ -207,12 +204,12 @@ static void listen_cb(grpc_exec_ctx *exec_ctx, void *arg, /*=sv_arg*/ se = gpr_malloc(sizeof(*se)); se->sv = sv; se->em_fd = grpc_fd_create(fd, "listener"); - grpc_pollset_add_fd(exec_ctx, g_pollset, se->em_fd); + grpc_pollset_add_fd(g_pollset, se->em_fd); GRPC_CLOSURE_INIT(&se->session_read_closure, session_read_cb, se, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(exec_ctx, se->em_fd, &se->session_read_closure); + grpc_fd_notify_on_read(se->em_fd, &se->session_read_closure); - grpc_fd_notify_on_read(exec_ctx, listen_em_fd, &sv->listen_closure); + grpc_fd_notify_on_read(listen_em_fd, &sv->listen_closure); } /* Max number of connections pending to be accepted by listen(). */ @@ -222,7 +219,7 @@ static void listen_cb(grpc_exec_ctx *exec_ctx, void *arg, /*=sv_arg*/ listen_cb() is registered to be interested in reading from listen_fd. When connection request arrives, listen_cb() is called to accept the connection request. */ -static int server_start(grpc_exec_ctx *exec_ctx, server *sv) { +static int server_start(server *sv) { int port = 0; int fd; struct sockaddr_in sin; @@ -236,11 +233,11 @@ static int server_start(grpc_exec_ctx *exec_ctx, server *sv) { GPR_ASSERT(listen(fd, MAX_NUM_FD) == 0); sv->em_fd = grpc_fd_create(fd, "server"); - grpc_pollset_add_fd(exec_ctx, g_pollset, sv->em_fd); + grpc_pollset_add_fd(g_pollset, sv->em_fd); /* Register to be interested in reading from listen_fd. */ GRPC_CLOSURE_INIT(&sv->listen_closure, listen_cb, sv, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(exec_ctx, sv->em_fd, &sv->listen_closure); + grpc_fd_notify_on_read(sv->em_fd, &sv->listen_closure); return port; } @@ -249,13 +246,13 @@ static int server_start(grpc_exec_ctx *exec_ctx, server *sv) { static void server_wait_and_shutdown(server *sv) { gpr_mu_lock(g_mu); while (!sv->done) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_pollset_worker *worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(&exec_ctx, g_pollset, &worker, - GRPC_MILLIS_INF_FUTURE))); + "pollset_work", + grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -289,18 +286,16 @@ static void client_init(client *cl) { } /* Called when a client upload session is ready to shutdown. */ -static void client_session_shutdown_cb(grpc_exec_ctx *exec_ctx, - void *arg /*client */, int success) { +static void client_session_shutdown_cb(void *arg /*client */, int success) { client *cl = arg; - grpc_fd_orphan(exec_ctx, cl->em_fd, NULL, NULL, false /* already_closed */, - "c"); + grpc_fd_orphan(cl->em_fd, NULL, NULL, false /* already_closed */, "c"); cl->done = 1; - GPR_ASSERT(GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, g_pollset, NULL))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); } /* Write as much as possible, then register notify_on_write. */ -static void client_session_write(grpc_exec_ctx *exec_ctx, void *arg, /*client */ +static void client_session_write(void *arg, /*client */ grpc_error *error) { client *cl = arg; int fd = grpc_fd_wrapped_fd(cl->em_fd); @@ -308,7 +303,7 @@ static void client_session_write(grpc_exec_ctx *exec_ctx, void *arg, /*client */ if (error != GRPC_ERROR_NONE) { gpr_mu_lock(g_mu); - client_session_shutdown_cb(exec_ctx, arg, 1); + client_session_shutdown_cb(arg, 1); gpr_mu_unlock(g_mu); return; } @@ -323,10 +318,10 @@ static void client_session_write(grpc_exec_ctx *exec_ctx, void *arg, /*client */ if (cl->client_write_cnt < CLIENT_TOTAL_WRITE_CNT) { GRPC_CLOSURE_INIT(&cl->write_closure, client_session_write, cl, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_write(exec_ctx, cl->em_fd, &cl->write_closure); + grpc_fd_notify_on_write(cl->em_fd, &cl->write_closure); cl->client_write_cnt++; } else { - client_session_shutdown_cb(exec_ctx, arg, 1); + client_session_shutdown_cb(arg, 1); } gpr_mu_unlock(g_mu); } else { @@ -336,7 +331,7 @@ static void client_session_write(grpc_exec_ctx *exec_ctx, void *arg, /*client */ } /* Start a client to send a stream of bytes. */ -static void client_start(grpc_exec_ctx *exec_ctx, client *cl, int port) { +static void client_start(client *cl, int port) { int fd; struct sockaddr_in sin; create_test_socket(port, &fd, &sin); @@ -357,9 +352,9 @@ static void client_start(grpc_exec_ctx *exec_ctx, client *cl, int port) { } cl->em_fd = grpc_fd_create(fd, "client"); - grpc_pollset_add_fd(exec_ctx, g_pollset, cl->em_fd); + grpc_pollset_add_fd(g_pollset, cl->em_fd); - client_session_write(exec_ctx, cl, GRPC_ERROR_NONE); + client_session_write(cl, GRPC_ERROR_NONE); } /* Wait for the signal to shutdown a client. */ @@ -367,12 +362,12 @@ static void client_wait_and_shutdown(client *cl) { gpr_mu_lock(g_mu); while (!cl->done) { grpc_pollset_worker *worker = NULL; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(&exec_ctx, g_pollset, &worker, - GRPC_MILLIS_INF_FUTURE))); + "pollset_work", + grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -385,13 +380,13 @@ static void test_grpc_fd(void) { server sv; client cl; int port; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; server_init(&sv); - port = server_start(&exec_ctx, &sv); + port = server_start(&sv); client_init(&cl); - client_start(&exec_ctx, &cl, port); - grpc_exec_ctx_finish(&exec_ctx); + client_start(&cl, port); + grpc_exec_ctx_finish(); client_wait_and_shutdown(&cl); server_wait_and_shutdown(&sv); GPR_ASSERT(sv.read_bytes_total == cl.write_bytes_total); @@ -406,27 +401,25 @@ void init_change_data(fd_change_data *fdc) { fdc->cb_that_ran = NULL; } void destroy_change_data(fd_change_data *fdc) {} -static void first_read_callback(grpc_exec_ctx *exec_ctx, - void *arg /* fd_change_data */, +static void first_read_callback(void *arg /* fd_change_data */, grpc_error *error) { fd_change_data *fdc = arg; gpr_mu_lock(g_mu); fdc->cb_that_ran = first_read_callback; - GPR_ASSERT(GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, g_pollset, NULL))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); gpr_mu_unlock(g_mu); } -static void second_read_callback(grpc_exec_ctx *exec_ctx, - void *arg /* fd_change_data */, +static void second_read_callback(void *arg /* fd_change_data */, grpc_error *error) { fd_change_data *fdc = arg; gpr_mu_lock(g_mu); fdc->cb_that_ran = second_read_callback; - GPR_ASSERT(GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, g_pollset, NULL))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); gpr_mu_unlock(g_mu); } @@ -443,7 +436,7 @@ static void test_grpc_fd_change(void) { ssize_t result; grpc_closure first_closure; grpc_closure second_closure; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; GRPC_CLOSURE_INIT(&first_closure, first_read_callback, &a, grpc_schedule_on_exec_ctx); @@ -460,10 +453,10 @@ static void test_grpc_fd_change(void) { GPR_ASSERT(fcntl(sv[1], F_SETFL, flags | O_NONBLOCK) == 0); em_fd = grpc_fd_create(sv[0], "test_grpc_fd_change"); - grpc_pollset_add_fd(&exec_ctx, g_pollset, em_fd); + grpc_pollset_add_fd(g_pollset, em_fd); /* Register the first callback, then make its FD readable */ - grpc_fd_notify_on_read(&exec_ctx, em_fd, &first_closure); + grpc_fd_notify_on_read(em_fd, &first_closure); data = 0; result = write(sv[1], &data, 1); GPR_ASSERT(result == 1); @@ -473,10 +466,10 @@ static void test_grpc_fd_change(void) { while (a.cb_that_ran == NULL) { grpc_pollset_worker *worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(&exec_ctx, g_pollset, &worker, - GRPC_MILLIS_INF_FUTURE))); + "pollset_work", + grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_mu_lock(g_mu); } GPR_ASSERT(a.cb_that_ran == first_read_callback); @@ -488,7 +481,7 @@ static void test_grpc_fd_change(void) { /* Now register a second callback with distinct change data, and do the same thing again. */ - grpc_fd_notify_on_read(&exec_ctx, em_fd, &second_closure); + grpc_fd_notify_on_read(em_fd, &second_closure); data = 0; result = write(sv[1], &data, 1); GPR_ASSERT(result == 1); @@ -497,31 +490,30 @@ static void test_grpc_fd_change(void) { while (b.cb_that_ran == NULL) { grpc_pollset_worker *worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(&exec_ctx, g_pollset, &worker, - GRPC_MILLIS_INF_FUTURE))); + "pollset_work", + grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_mu_lock(g_mu); } /* Except now we verify that second_read_callback ran instead */ GPR_ASSERT(b.cb_that_ran == second_read_callback); gpr_mu_unlock(g_mu); - grpc_fd_orphan(&exec_ctx, em_fd, NULL, NULL, false /* already_closed */, "d"); - grpc_exec_ctx_finish(&exec_ctx); + grpc_fd_orphan(em_fd, NULL, NULL, false /* already_closed */, "d"); + grpc_exec_ctx_finish(); destroy_change_data(&a); destroy_change_data(&b); close(sv[1]); } -static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, - grpc_error *error) { - grpc_pollset_destroy(exec_ctx, p); +static void destroy_pollset(void *p, grpc_error *error) { + grpc_pollset_destroy(p); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); g_pollset = gpr_zalloc(grpc_pollset_size()); @@ -530,10 +522,10 @@ int main(int argc, char **argv) { test_grpc_fd_change(); GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); - grpc_exec_ctx_flush(&exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + grpc_exec_ctx_flush(); gpr_free(g_pollset); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/pollset_set_test.c b/test/core/iomgr/pollset_set_test.c index 3dd4bc887c7..7ab31e0006e 100644 --- a/test/core/iomgr/pollset_set_test.c +++ b/test/core/iomgr/pollset_set_test.c @@ -44,11 +44,10 @@ void init_test_pollset_sets(test_pollset_set *pollset_sets, const int num_pss) { } } -void cleanup_test_pollset_sets(grpc_exec_ctx *exec_ctx, - test_pollset_set *pollset_sets, +void cleanup_test_pollset_sets(test_pollset_set *pollset_sets, const int num_pss) { for (int i = 0; i < num_pss; i++) { - grpc_pollset_set_destroy(exec_ctx, pollset_sets[i].pss); + grpc_pollset_set_destroy(pollset_sets[i].pss); pollset_sets[i].pss = NULL; } } @@ -69,21 +68,19 @@ static void init_test_pollsets(test_pollset *pollsets, const int num_pollsets) { } } -static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, - grpc_error *error) { - grpc_pollset_destroy(exec_ctx, p); +static void destroy_pollset(void *p, grpc_error *error) { + grpc_pollset_destroy(p); } -static void cleanup_test_pollsets(grpc_exec_ctx *exec_ctx, - test_pollset *pollsets, +static void cleanup_test_pollsets(test_pollset *pollsets, const int num_pollsets) { grpc_closure destroyed; for (int i = 0; i < num_pollsets; i++) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, pollsets[i].ps, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(exec_ctx, pollsets[i].ps, &destroyed); + grpc_pollset_shutdown(pollsets[i].ps, &destroyed); - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); gpr_free(pollsets[i].ps); pollsets[i].ps = NULL; } @@ -101,45 +98,43 @@ typedef struct test_fd { grpc_closure on_readable; /* Closure to call when this fd is readable */ } test_fd; -void on_readable(grpc_exec_ctx *exec_ctx, void *tfd, grpc_error *error) { +void on_readable(void *tfd, grpc_error *error) { ((test_fd *)tfd)->is_on_readable_called = true; } -static void reset_test_fd(grpc_exec_ctx *exec_ctx, test_fd *tfd) { +static void reset_test_fd(test_fd *tfd) { tfd->is_on_readable_called = false; GRPC_CLOSURE_INIT(&tfd->on_readable, on_readable, tfd, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(exec_ctx, tfd->fd, &tfd->on_readable); + grpc_fd_notify_on_read(tfd->fd, &tfd->on_readable); } -static void init_test_fds(grpc_exec_ctx *exec_ctx, test_fd *tfds, - const int num_fds) { +static void init_test_fds(test_fd *tfds, const int num_fds) { for (int i = 0; i < num_fds; i++) { GPR_ASSERT(GRPC_ERROR_NONE == grpc_wakeup_fd_init(&tfds[i].wakeup_fd)); tfds[i].fd = grpc_fd_create(GRPC_WAKEUP_FD_GET_READ_FD(&tfds[i].wakeup_fd), "test_fd"); - reset_test_fd(exec_ctx, &tfds[i]); + reset_test_fd(&tfds[i]); } } -static void cleanup_test_fds(grpc_exec_ctx *exec_ctx, test_fd *tfds, - const int num_fds) { +static void cleanup_test_fds(test_fd *tfds, const int num_fds) { int release_fd; for (int i = 0; i < num_fds; i++) { - grpc_fd_shutdown(exec_ctx, tfds[i].fd, + grpc_fd_shutdown(tfds[i].fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("fd cleanup")); - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); /* grpc_fd_orphan frees the memory allocated for grpc_fd. Normally it also * calls close() on the underlying fd. In our case, we are using * grpc_wakeup_fd and we would like to destroy it ourselves (by calling * grpc_wakeup_fd_destroy). To prevent grpc_fd from calling close() on the * underlying fd, call it with a non-NULL 'release_fd' parameter */ - grpc_fd_orphan(exec_ctx, tfds[i].fd, NULL, &release_fd, - false /* already_closed */, "test_fd_cleanup"); - grpc_exec_ctx_flush(exec_ctx); + grpc_fd_orphan(tfds[i].fd, NULL, &release_fd, false /* already_closed */, + "test_fd_cleanup"); + grpc_exec_ctx_flush(); grpc_wakeup_fd_destroy(&tfds[i].wakeup_fd); } @@ -151,8 +146,7 @@ static void make_test_fds_readable(test_fd *tfds, const int num_fds) { } } -static void verify_readable_and_reset(grpc_exec_ctx *exec_ctx, test_fd *tfds, - const int num_fds) { +static void verify_readable_and_reset(test_fd *tfds, const int num_fds) { for (int i = 0; i < num_fds; i++) { /* Verify that the on_readable callback was called */ GPR_ASSERT(tfds[i].is_on_readable_called); @@ -160,7 +154,7 @@ static void verify_readable_and_reset(grpc_exec_ctx *exec_ctx, test_fd *tfds, /* Reset the tfd[i] structure */ GPR_ASSERT(GRPC_ERROR_NONE == grpc_wakeup_fd_consume_wakeup(&tfds[i].wakeup_fd)); - reset_test_fd(exec_ctx, &tfds[i]); + reset_test_fd(&tfds[i]); } } @@ -201,7 +195,7 @@ static void pollset_set_test_basic() { * | * +---> FD9 (Added after PS2 is added to PSS0) */ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_pollset_worker *worker; grpc_millis deadline; @@ -212,34 +206,33 @@ static void pollset_set_test_basic() { const int num_ps = GPR_ARRAY_SIZE(pollsets); const int num_pss = GPR_ARRAY_SIZE(pollset_sets); - init_test_fds(&exec_ctx, tfds, num_fds); + init_test_fds(tfds, num_fds); init_test_pollsets(pollsets, num_ps); init_test_pollset_sets(pollset_sets, num_pss); /* Construct the pollset_set/pollset/fd tree (see diagram above) */ - grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[0].pss, tfds[0].fd); - grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[1].pss, tfds[1].fd); + grpc_pollset_set_add_fd(pollset_sets[0].pss, tfds[0].fd); + grpc_pollset_set_add_fd(pollset_sets[1].pss, tfds[1].fd); - grpc_pollset_add_fd(&exec_ctx, pollsets[0].ps, tfds[2].fd); - grpc_pollset_add_fd(&exec_ctx, pollsets[1].ps, tfds[3].fd); - grpc_pollset_add_fd(&exec_ctx, pollsets[2].ps, tfds[4].fd); + grpc_pollset_add_fd(pollsets[0].ps, tfds[2].fd); + grpc_pollset_add_fd(pollsets[1].ps, tfds[3].fd); + grpc_pollset_add_fd(pollsets[2].ps, tfds[4].fd); - grpc_pollset_set_add_pollset_set(&exec_ctx, pollset_sets[0].pss, - pollset_sets[1].pss); + grpc_pollset_set_add_pollset_set(pollset_sets[0].pss, pollset_sets[1].pss); - grpc_pollset_set_add_pollset(&exec_ctx, pollset_sets[1].pss, pollsets[0].ps); - grpc_pollset_set_add_pollset(&exec_ctx, pollset_sets[0].pss, pollsets[1].ps); - grpc_pollset_set_add_pollset(&exec_ctx, pollset_sets[0].pss, pollsets[2].ps); + grpc_pollset_set_add_pollset(pollset_sets[1].pss, pollsets[0].ps); + grpc_pollset_set_add_pollset(pollset_sets[0].pss, pollsets[1].ps); + grpc_pollset_set_add_pollset(pollset_sets[0].pss, pollsets[2].ps); - grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[0].pss, tfds[5].fd); - grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[1].pss, tfds[6].fd); + grpc_pollset_set_add_fd(pollset_sets[0].pss, tfds[5].fd); + grpc_pollset_set_add_fd(pollset_sets[1].pss, tfds[6].fd); - grpc_pollset_add_fd(&exec_ctx, pollsets[0].ps, tfds[7].fd); - grpc_pollset_add_fd(&exec_ctx, pollsets[1].ps, tfds[8].fd); - grpc_pollset_add_fd(&exec_ctx, pollsets[2].ps, tfds[9].fd); + grpc_pollset_add_fd(pollsets[0].ps, tfds[7].fd); + grpc_pollset_add_fd(pollsets[1].ps, tfds[8].fd); + grpc_pollset_add_fd(pollsets[2].ps, tfds[9].fd); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); /* Test that if any FD in the above structure is readable, it is observable by * doing grpc_pollset_work on any pollset @@ -259,34 +252,33 @@ static void pollset_set_test_basic() { deadline = grpc_timespec_to_millis_round_up( grpc_timeout_milliseconds_to_deadline(2)); GPR_ASSERT(GRPC_ERROR_NONE == - grpc_pollset_work(&exec_ctx, pollsets[i].ps, &worker, deadline)); + grpc_pollset_work(pollsets[i].ps, &worker, deadline)); gpr_mu_unlock(pollsets[i].mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); - verify_readable_and_reset(&exec_ctx, tfds, num_fds); - grpc_exec_ctx_flush(&exec_ctx); + verify_readable_and_reset(tfds, num_fds); + grpc_exec_ctx_flush(); } /* Test tear down */ - grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[0].pss, tfds[0].fd); - grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[0].pss, tfds[5].fd); - grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[1].pss, tfds[1].fd); - grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[1].pss, tfds[6].fd); - grpc_exec_ctx_flush(&exec_ctx); - - grpc_pollset_set_del_pollset(&exec_ctx, pollset_sets[1].pss, pollsets[0].ps); - grpc_pollset_set_del_pollset(&exec_ctx, pollset_sets[0].pss, pollsets[1].ps); - grpc_pollset_set_del_pollset(&exec_ctx, pollset_sets[0].pss, pollsets[2].ps); - - grpc_pollset_set_del_pollset_set(&exec_ctx, pollset_sets[0].pss, - pollset_sets[1].pss); - grpc_exec_ctx_flush(&exec_ctx); - - cleanup_test_fds(&exec_ctx, tfds, num_fds); - cleanup_test_pollsets(&exec_ctx, pollsets, num_ps); - cleanup_test_pollset_sets(&exec_ctx, pollset_sets, num_pss); - grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_set_del_fd(pollset_sets[0].pss, tfds[0].fd); + grpc_pollset_set_del_fd(pollset_sets[0].pss, tfds[5].fd); + grpc_pollset_set_del_fd(pollset_sets[1].pss, tfds[1].fd); + grpc_pollset_set_del_fd(pollset_sets[1].pss, tfds[6].fd); + grpc_exec_ctx_flush(); + + grpc_pollset_set_del_pollset(pollset_sets[1].pss, pollsets[0].ps); + grpc_pollset_set_del_pollset(pollset_sets[0].pss, pollsets[1].ps); + grpc_pollset_set_del_pollset(pollset_sets[0].pss, pollsets[2].ps); + + grpc_pollset_set_del_pollset_set(pollset_sets[0].pss, pollset_sets[1].pss); + grpc_exec_ctx_flush(); + + cleanup_test_fds(tfds, num_fds); + cleanup_test_pollsets(pollsets, num_ps); + cleanup_test_pollset_sets(pollset_sets, num_pss); + grpc_exec_ctx_finish(); } /* Same FD added multiple times to the pollset_set tree */ @@ -306,7 +298,7 @@ void pollset_set_test_dup_fds() { * | +--> FD2 * +---> FD1 */ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_pollset_worker *worker; grpc_millis deadline; @@ -317,21 +309,20 @@ void pollset_set_test_dup_fds() { const int num_ps = 1; const int num_pss = GPR_ARRAY_SIZE(pollset_sets); - init_test_fds(&exec_ctx, tfds, num_fds); + init_test_fds(tfds, num_fds); init_test_pollsets(&pollset, num_ps); init_test_pollset_sets(pollset_sets, num_pss); /* Construct the structure */ - grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[0].pss, tfds[0].fd); - grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[1].pss, tfds[0].fd); - grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[1].pss, tfds[1].fd); + grpc_pollset_set_add_fd(pollset_sets[0].pss, tfds[0].fd); + grpc_pollset_set_add_fd(pollset_sets[1].pss, tfds[0].fd); + grpc_pollset_set_add_fd(pollset_sets[1].pss, tfds[1].fd); - grpc_pollset_add_fd(&exec_ctx, pollset.ps, tfds[1].fd); - grpc_pollset_add_fd(&exec_ctx, pollset.ps, tfds[2].fd); + grpc_pollset_add_fd(pollset.ps, tfds[1].fd); + grpc_pollset_add_fd(pollset.ps, tfds[2].fd); - grpc_pollset_set_add_pollset(&exec_ctx, pollset_sets[1].pss, pollset.ps); - grpc_pollset_set_add_pollset_set(&exec_ctx, pollset_sets[0].pss, - pollset_sets[1].pss); + grpc_pollset_set_add_pollset(pollset_sets[1].pss, pollset.ps); + grpc_pollset_set_add_pollset_set(pollset_sets[0].pss, pollset_sets[1].pss); /* Test. Make all FDs readable and make sure that can be observed by doing a * grpc_pollset_work on the pollset 'PS' */ @@ -341,27 +332,26 @@ void pollset_set_test_dup_fds() { deadline = grpc_timespec_to_millis_round_up( grpc_timeout_milliseconds_to_deadline(2)); GPR_ASSERT(GRPC_ERROR_NONE == - grpc_pollset_work(&exec_ctx, pollset.ps, &worker, deadline)); + grpc_pollset_work(pollset.ps, &worker, deadline)); gpr_mu_unlock(pollset.mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); - verify_readable_and_reset(&exec_ctx, tfds, num_fds); - grpc_exec_ctx_flush(&exec_ctx); + verify_readable_and_reset(tfds, num_fds); + grpc_exec_ctx_flush(); /* Tear down */ - grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[0].pss, tfds[0].fd); - grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[1].pss, tfds[0].fd); - grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[1].pss, tfds[1].fd); - - grpc_pollset_set_del_pollset(&exec_ctx, pollset_sets[1].pss, pollset.ps); - grpc_pollset_set_del_pollset_set(&exec_ctx, pollset_sets[0].pss, - pollset_sets[1].pss); - grpc_exec_ctx_flush(&exec_ctx); - - cleanup_test_fds(&exec_ctx, tfds, num_fds); - cleanup_test_pollsets(&exec_ctx, &pollset, num_ps); - cleanup_test_pollset_sets(&exec_ctx, pollset_sets, num_pss); - grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_set_del_fd(pollset_sets[0].pss, tfds[0].fd); + grpc_pollset_set_del_fd(pollset_sets[1].pss, tfds[0].fd); + grpc_pollset_set_del_fd(pollset_sets[1].pss, tfds[1].fd); + + grpc_pollset_set_del_pollset(pollset_sets[1].pss, pollset.ps); + grpc_pollset_set_del_pollset_set(pollset_sets[0].pss, pollset_sets[1].pss); + grpc_exec_ctx_flush(); + + cleanup_test_fds(tfds, num_fds); + cleanup_test_pollsets(&pollset, num_ps); + cleanup_test_pollset_sets(pollset_sets, num_pss); + grpc_exec_ctx_finish(); } /* Pollset_set with an empty pollset */ @@ -379,7 +369,7 @@ void pollset_set_test_empty_pollset() { * | * +---> FD2 */ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_pollset_worker *worker; grpc_millis deadline; @@ -390,17 +380,17 @@ void pollset_set_test_empty_pollset() { const int num_ps = GPR_ARRAY_SIZE(pollsets); const int num_pss = 1; - init_test_fds(&exec_ctx, tfds, num_fds); + init_test_fds(tfds, num_fds); init_test_pollsets(pollsets, num_ps); init_test_pollset_sets(&pollset_set, num_pss); /* Construct the structure */ - grpc_pollset_set_add_fd(&exec_ctx, pollset_set.pss, tfds[0].fd); - grpc_pollset_add_fd(&exec_ctx, pollsets[1].ps, tfds[1].fd); - grpc_pollset_add_fd(&exec_ctx, pollsets[1].ps, tfds[2].fd); + grpc_pollset_set_add_fd(pollset_set.pss, tfds[0].fd); + grpc_pollset_add_fd(pollsets[1].ps, tfds[1].fd); + grpc_pollset_add_fd(pollsets[1].ps, tfds[2].fd); - grpc_pollset_set_add_pollset(&exec_ctx, pollset_set.pss, pollsets[0].ps); - grpc_pollset_set_add_pollset(&exec_ctx, pollset_set.pss, pollsets[1].ps); + grpc_pollset_set_add_pollset(pollset_set.pss, pollsets[0].ps); + grpc_pollset_set_add_pollset(pollset_set.pss, pollsets[1].ps); /* Test. Make all FDs readable and make sure that can be observed by doing * grpc_pollset_work on the empty pollset 'PS0' */ @@ -410,31 +400,31 @@ void pollset_set_test_empty_pollset() { deadline = grpc_timespec_to_millis_round_up( grpc_timeout_milliseconds_to_deadline(2)); GPR_ASSERT(GRPC_ERROR_NONE == - grpc_pollset_work(&exec_ctx, pollsets[0].ps, &worker, deadline)); + grpc_pollset_work(pollsets[0].ps, &worker, deadline)); gpr_mu_unlock(pollsets[0].mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); - verify_readable_and_reset(&exec_ctx, tfds, num_fds); - grpc_exec_ctx_flush(&exec_ctx); + verify_readable_and_reset(tfds, num_fds); + grpc_exec_ctx_flush(); /* Tear down */ - grpc_pollset_set_del_fd(&exec_ctx, pollset_set.pss, tfds[0].fd); - grpc_pollset_set_del_pollset(&exec_ctx, pollset_set.pss, pollsets[0].ps); - grpc_pollset_set_del_pollset(&exec_ctx, pollset_set.pss, pollsets[1].ps); - grpc_exec_ctx_flush(&exec_ctx); - - cleanup_test_fds(&exec_ctx, tfds, num_fds); - cleanup_test_pollsets(&exec_ctx, pollsets, num_ps); - cleanup_test_pollset_sets(&exec_ctx, &pollset_set, num_pss); - grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_set_del_fd(pollset_set.pss, tfds[0].fd); + grpc_pollset_set_del_pollset(pollset_set.pss, pollsets[0].ps); + grpc_pollset_set_del_pollset(pollset_set.pss, pollsets[1].ps); + grpc_exec_ctx_flush(); + + cleanup_test_fds(tfds, num_fds); + cleanup_test_pollsets(pollsets, num_ps); + cleanup_test_pollset_sets(&pollset_set, num_pss); + grpc_exec_ctx_finish(); } int main(int argc, char **argv) { const char *poll_strategy = grpc_get_poll_strategy_name(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); - grpc_iomgr_init(&exec_ctx); - grpc_iomgr_start(&exec_ctx); + grpc_iomgr_init(); + grpc_iomgr_start(); if (poll_strategy != NULL && (strcmp(poll_strategy, "epoll") == 0 || @@ -449,8 +439,8 @@ int main(int argc, char **argv) { poll_strategy); } - grpc_iomgr_shutdown(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + grpc_iomgr_shutdown(); + grpc_exec_ctx_finish(); return 0; } #else /* defined(GRPC_LINUX_EPOLL) */ diff --git a/test/core/iomgr/resolve_address_posix_test.c b/test/core/iomgr/resolve_address_posix_test.cc similarity index 70% rename from test/core/iomgr/resolve_address_posix_test.c rename to test/core/iomgr/resolve_address_posix_test.cc index cb9d6080fbb..05c17fbf608 100644 --- a/test/core/iomgr/resolve_address_posix_test.c +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -46,29 +46,29 @@ typedef struct args_struct { grpc_pollset_set *pollset_set; } args_struct; -static void do_nothing(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) {} +static void do_nothing(void *arg, grpc_error *error) {} -void args_init(grpc_exec_ctx *exec_ctx, args_struct *args) { +void args_init(args_struct *args) { gpr_event_init(&args->ev); args->pollset = gpr_zalloc(grpc_pollset_size()); grpc_pollset_init(args->pollset, &args->mu); args->pollset_set = grpc_pollset_set_create(); - grpc_pollset_set_add_pollset(exec_ctx, args->pollset_set, args->pollset); + grpc_pollset_set_add_pollset(args->pollset_set, args->pollset); args->addrs = NULL; } -void args_finish(grpc_exec_ctx *exec_ctx, args_struct *args) { +void args_finish(args_struct *args) { GPR_ASSERT(gpr_event_wait(&args->ev, test_deadline())); grpc_resolved_addresses_destroy(args->addrs); - grpc_pollset_set_del_pollset(exec_ctx, args->pollset_set, args->pollset); - grpc_pollset_set_destroy(exec_ctx, args->pollset_set); + grpc_pollset_set_del_pollset(args->pollset_set, args->pollset); + grpc_pollset_set_destroy(args->pollset_set); grpc_closure do_nothing_cb; GRPC_CLOSURE_INIT(&do_nothing_cb, do_nothing, NULL, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(exec_ctx, args->pollset, &do_nothing_cb); + grpc_pollset_shutdown(args->pollset, &do_nothing_cb); // exec_ctx needs to be flushed before calling grpc_pollset_destroy() - grpc_exec_ctx_flush(exec_ctx); - grpc_pollset_destroy(exec_ctx, args->pollset); + grpc_exec_ctx_flush(); + grpc_pollset_destroy(args->pollset); gpr_free(args->pollset); } @@ -79,26 +79,25 @@ static grpc_millis n_sec_deadline(int seconds) { static void actually_poll(void *argsp) { args_struct *args = argsp; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_millis deadline = n_sec_deadline(10); while (true) { bool done = gpr_atm_acq_load(&args->done_atm) != 0; if (done) { break; } - grpc_millis time_left = deadline - grpc_exec_ctx_now(&exec_ctx); + grpc_millis time_left = deadline - grpc_exec_ctx_now(); gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRIdPTR, done, time_left); GPR_ASSERT(time_left >= 0); grpc_pollset_worker *worker = NULL; gpr_mu_lock(args->mu); - GRPC_LOG_IF_ERROR("pollset_work", - grpc_pollset_work(&exec_ctx, args->pollset, &worker, - n_sec_deadline(1))); + GRPC_LOG_IF_ERROR("pollset_work", grpc_pollset_work(args->pollset, &worker, + n_sec_deadline(1))); gpr_mu_unlock(args->mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); } gpr_event_set(&args->ev, (void *)1); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void poll_pollset_until_request_done(args_struct *args) { @@ -107,8 +106,7 @@ static void poll_pollset_until_request_done(args_struct *args) { gpr_thd_new(&id, actually_poll, args, NULL); } -static void must_succeed(grpc_exec_ctx *exec_ctx, void *argsp, - grpc_error *err) { +static void must_succeed(void *argsp, grpc_error *err) { args_struct *args = argsp; GPR_ASSERT(err == GRPC_ERROR_NONE); GPR_ASSERT(args->addrs != NULL); @@ -116,29 +114,29 @@ static void must_succeed(grpc_exec_ctx *exec_ctx, void *argsp, gpr_atm_rel_store(&args->done_atm, 1); } -static void must_fail(grpc_exec_ctx *exec_ctx, void *argsp, grpc_error *err) { +static void must_fail(void *argsp, grpc_error *err) { args_struct *args = argsp; GPR_ASSERT(err != GRPC_ERROR_NONE); gpr_atm_rel_store(&args->done_atm, 1); } static void test_unix_socket(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; args_struct args; - args_init(&exec_ctx, &args); + args_init(&args); poll_pollset_until_request_done(&args); grpc_resolve_address( - &exec_ctx, "unix:/path/name", NULL, args.pollset_set, + "unix:/path/name", NULL, args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - args_finish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + args_finish(&args); + grpc_exec_ctx_finish(); } static void test_unix_socket_path_name_too_long(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; args_struct args; - args_init(&exec_ctx, &args); + args_init(&args); const char prefix[] = "unix:/path/name"; size_t path_name_length = GPR_ARRAY_SIZE(((struct sockaddr_un *)0)->sun_path) + 6; @@ -149,22 +147,22 @@ static void test_unix_socket_path_name_too_long(void) { poll_pollset_until_request_done(&args); grpc_resolve_address( - &exec_ctx, path_name, NULL, args.pollset_set, + path_name, NULL, args.pollset_set, GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx), &args.addrs); gpr_free(path_name); - args_finish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + args_finish(&args); + grpc_exec_ctx_finish(); } int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; test_unix_socket(); test_unix_socket_path_name_too_long(); - grpc_executor_shutdown(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + grpc_executor_shutdown(); + grpc_exec_ctx_finish(); grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/resolve_address_test.c b/test/core/iomgr/resolve_address_test.c index 178bbbb95fd..7a59ee3dcc4 100644 --- a/test/core/iomgr/resolve_address_test.c +++ b/test/core/iomgr/resolve_address_test.c @@ -39,32 +39,32 @@ typedef struct args_struct { grpc_pollset_set *pollset_set; } args_struct; -static void do_nothing(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) {} +static void do_nothing(void *arg, grpc_error *error) {} -void args_init(grpc_exec_ctx *exec_ctx, args_struct *args) { +void args_init(args_struct *args) { gpr_event_init(&args->ev); args->pollset = gpr_zalloc(grpc_pollset_size()); grpc_pollset_init(args->pollset, &args->mu); args->pollset_set = grpc_pollset_set_create(); - grpc_pollset_set_add_pollset(exec_ctx, args->pollset_set, args->pollset); + grpc_pollset_set_add_pollset(args->pollset_set, args->pollset); args->addrs = NULL; gpr_atm_rel_store(&args->done_atm, 0); } -void args_finish(grpc_exec_ctx *exec_ctx, args_struct *args) { +void args_finish(args_struct *args) { GPR_ASSERT(gpr_event_wait(&args->ev, test_deadline())); grpc_resolved_addresses_destroy(args->addrs); - grpc_pollset_set_del_pollset(exec_ctx, args->pollset_set, args->pollset); - grpc_pollset_set_destroy(exec_ctx, args->pollset_set); + grpc_pollset_set_del_pollset(args->pollset_set, args->pollset); + grpc_pollset_set_destroy(args->pollset_set); grpc_closure do_nothing_cb; GRPC_CLOSURE_INIT(&do_nothing_cb, do_nothing, NULL, grpc_schedule_on_exec_ctx); gpr_mu_lock(args->mu); - grpc_pollset_shutdown(exec_ctx, args->pollset, &do_nothing_cb); + grpc_pollset_shutdown(args->pollset, &do_nothing_cb); gpr_mu_unlock(args->mu); // exec_ctx needs to be flushed before calling grpc_pollset_destroy() - grpc_exec_ctx_flush(exec_ctx); - grpc_pollset_destroy(exec_ctx, args->pollset); + grpc_exec_ctx_flush(); + grpc_pollset_destroy(args->pollset); gpr_free(args->pollset); } @@ -74,119 +74,115 @@ static grpc_millis n_sec_deadline(int seconds) { } static void poll_pollset_until_request_done(args_struct *args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_millis deadline = n_sec_deadline(10); while (true) { bool done = gpr_atm_acq_load(&args->done_atm) != 0; if (done) { break; } - grpc_millis time_left = deadline - grpc_exec_ctx_now(&exec_ctx); + grpc_millis time_left = deadline - grpc_exec_ctx_now(); gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRIdPTR, done, time_left); GPR_ASSERT(time_left >= 0); grpc_pollset_worker *worker = NULL; gpr_mu_lock(args->mu); - GRPC_LOG_IF_ERROR("pollset_work", - grpc_pollset_work(&exec_ctx, args->pollset, &worker, - n_sec_deadline(1))); + GRPC_LOG_IF_ERROR("pollset_work", grpc_pollset_work(args->pollset, &worker, + n_sec_deadline(1))); gpr_mu_unlock(args->mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); } gpr_event_set(&args->ev, (void *)1); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } -static void must_succeed(grpc_exec_ctx *exec_ctx, void *argsp, - grpc_error *err) { +static void must_succeed(void *argsp, grpc_error *err) { args_struct *args = argsp; GPR_ASSERT(err == GRPC_ERROR_NONE); GPR_ASSERT(args->addrs != NULL); GPR_ASSERT(args->addrs->naddrs > 0); gpr_atm_rel_store(&args->done_atm, 1); gpr_mu_lock(args->mu); - GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, args->pollset, NULL)); + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(args->pollset, NULL)); gpr_mu_unlock(args->mu); } -static void must_fail(grpc_exec_ctx *exec_ctx, void *argsp, grpc_error *err) { +static void must_fail(void *argsp, grpc_error *err) { args_struct *args = argsp; GPR_ASSERT(err != GRPC_ERROR_NONE); gpr_atm_rel_store(&args->done_atm, 1); gpr_mu_lock(args->mu); - GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, args->pollset, NULL)); + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(args->pollset, NULL)); gpr_mu_unlock(args->mu); } static void test_localhost(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; args_struct args; - args_init(&exec_ctx, &args); + args_init(&args); grpc_resolve_address( - &exec_ctx, "localhost:1", NULL, args.pollset_set, + "localhost:1", NULL, args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); poll_pollset_until_request_done(&args); - args_finish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + args_finish(&args); + grpc_exec_ctx_finish(); } static void test_default_port(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; args_struct args; - args_init(&exec_ctx, &args); + args_init(&args); grpc_resolve_address( - &exec_ctx, "localhost", "1", args.pollset_set, + "localhost", "1", args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); poll_pollset_until_request_done(&args); - args_finish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + args_finish(&args); + grpc_exec_ctx_finish(); } static void test_non_numeric_default_port(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; args_struct args; - args_init(&exec_ctx, &args); + args_init(&args); grpc_resolve_address( - &exec_ctx, "localhost", "https", args.pollset_set, + "localhost", "https", args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); poll_pollset_until_request_done(&args); - args_finish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + args_finish(&args); + grpc_exec_ctx_finish(); } static void test_missing_default_port(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; args_struct args; - args_init(&exec_ctx, &args); + args_init(&args); grpc_resolve_address( - &exec_ctx, "localhost", NULL, args.pollset_set, + "localhost", NULL, args.pollset_set, GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); poll_pollset_until_request_done(&args); - args_finish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + args_finish(&args); + grpc_exec_ctx_finish(); } static void test_ipv6_with_port(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; args_struct args; - args_init(&exec_ctx, &args); + args_init(&args); grpc_resolve_address( - &exec_ctx, "[2001:db8::1]:1", NULL, args.pollset_set, + "[2001:db8::1]:1", NULL, args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); poll_pollset_until_request_done(&args); - args_finish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + args_finish(&args); + grpc_exec_ctx_finish(); } static void test_ipv6_without_port(void) { @@ -195,17 +191,17 @@ static void test_ipv6_without_port(void) { }; unsigned i; for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; args_struct args; - args_init(&exec_ctx, &args); + args_init(&args); grpc_resolve_address( - &exec_ctx, kCases[i], "80", args.pollset_set, + kCases[i], "80", args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); poll_pollset_until_request_done(&args); - args_finish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + args_finish(&args); + grpc_exec_ctx_finish(); } } @@ -215,17 +211,17 @@ static void test_invalid_ip_addresses(void) { }; unsigned i; for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; args_struct args; - args_init(&exec_ctx, &args); + args_init(&args); grpc_resolve_address( - &exec_ctx, kCases[i], NULL, args.pollset_set, + kCases[i], NULL, args.pollset_set, GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); poll_pollset_until_request_done(&args); - args_finish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + args_finish(&args); + grpc_exec_ctx_finish(); } } @@ -235,24 +231,24 @@ static void test_unparseable_hostports(void) { }; unsigned i; for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; args_struct args; - args_init(&exec_ctx, &args); + args_init(&args); grpc_resolve_address( - &exec_ctx, kCases[i], "1", args.pollset_set, + kCases[i], "1", args.pollset_set, GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); poll_pollset_until_request_done(&args); - args_finish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + args_finish(&args); + grpc_exec_ctx_finish(); } } int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; test_localhost(); test_default_port(); test_non_numeric_default_port(); @@ -261,8 +257,8 @@ int main(int argc, char **argv) { test_ipv6_without_port(); test_invalid_ip_addresses(); test_unparseable_hostports(); - grpc_executor_shutdown(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + grpc_executor_shutdown(); + grpc_exec_ctx_finish(); grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/resource_quota_test.c b/test/core/iomgr/resource_quota_test.c index b588f3d1209..648e5f27d25 100644 --- a/test/core/iomgr/resource_quota_test.c +++ b/test/core/iomgr/resource_quota_test.c @@ -27,7 +27,7 @@ gpr_mu g_mu; gpr_cv g_cv; -static void inc_int_cb(grpc_exec_ctx *exec_ctx, void *a, grpc_error *error) { +static void inc_int_cb(void *a, grpc_error *error) { gpr_mu_lock(&g_mu); ++*(int *)a; gpr_cv_signal(&g_cv); @@ -43,7 +43,7 @@ static void assert_counter_becomes(int *ctr, int value) { gpr_mu_unlock(&g_mu); } -static void set_event_cb(grpc_exec_ctx *exec_ctx, void *a, grpc_error *error) { +static void set_event_cb(void *a, grpc_error *error) { gpr_event_set((gpr_event *)a, (void *)1); } grpc_closure *set_event(gpr_event *ev) { @@ -55,13 +55,12 @@ typedef struct { grpc_resource_user *resource_user; grpc_closure *then; } reclaimer_args; -static void reclaimer_cb(grpc_exec_ctx *exec_ctx, void *args, - grpc_error *error) { +static void reclaimer_cb(void *args, grpc_error *error) { GPR_ASSERT(error == GRPC_ERROR_NONE); reclaimer_args *a = args; - grpc_resource_user_free(exec_ctx, a->resource_user, a->size); - grpc_resource_user_finish_reclamation(exec_ctx, a->resource_user); - GRPC_CLOSURE_RUN(exec_ctx, a->then, GRPC_ERROR_NONE); + grpc_resource_user_free(a->resource_user, a->size); + grpc_resource_user_finish_reclamation(a->resource_user); + GRPC_CLOSURE_RUN(a->then, GRPC_ERROR_NONE); gpr_free(a); } grpc_closure *make_reclaimer(grpc_resource_user *resource_user, size_t size, @@ -73,10 +72,9 @@ grpc_closure *make_reclaimer(grpc_resource_user *resource_user, size_t size, return GRPC_CLOSURE_CREATE(reclaimer_cb, a, grpc_schedule_on_exec_ctx); } -static void unused_reclaimer_cb(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void unused_reclaimer_cb(void *arg, grpc_error *error) { GPR_ASSERT(error == GRPC_ERROR_CANCELLED); - GRPC_CLOSURE_RUN(exec_ctx, arg, GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN(arg, GRPC_ERROR_NONE); } grpc_closure *make_unused_reclaimer(grpc_closure *then) { return GRPC_CLOSURE_CREATE(unused_reclaimer_cb, then, @@ -84,9 +82,9 @@ grpc_closure *make_unused_reclaimer(grpc_closure *then) { } static void destroy_user(grpc_resource_user *usr) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_unref(&exec_ctx, usr); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_unref(usr); + grpc_exec_ctx_finish(); } static void test_no_op(void) { @@ -118,14 +116,14 @@ static void test_instant_alloc_then_free(void) { grpc_resource_quota_resize(q, 1024 * 1024); grpc_resource_user *usr = grpc_resource_user_create(q, "usr"); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, NULL); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr, 1024, NULL); + grpc_exec_ctx_finish(); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(usr, 1024); + grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -138,10 +136,10 @@ static void test_instant_alloc_free_pair(void) { grpc_resource_quota_resize(q, 1024 * 1024); grpc_resource_user *usr = grpc_resource_user_create(q, "usr"); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, NULL); - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr, 1024, NULL); + grpc_resource_user_free(usr, 1024); + grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -156,16 +154,16 @@ static void test_simple_async_alloc(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr, 1024, set_event(&ev)); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(usr, 1024); + grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -180,9 +178,9 @@ static void test_async_alloc_blocked_by_size(void) { gpr_event ev; gpr_event_init(&ev); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr, 1024, set_event(&ev)); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait( &ev, grpc_timeout_milliseconds_to_deadline(100)) == NULL); } @@ -190,9 +188,9 @@ static void test_async_alloc_blocked_by_size(void) { GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); ; { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(usr, 1024); + grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -207,32 +205,32 @@ static void test_scavenge(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr1, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); ; } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr1, 1024); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(usr1, 1024); + grpc_exec_ctx_finish(); } { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr2, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); ; } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr2, 1024); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(usr2, 1024); + grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr1); @@ -248,33 +246,33 @@ static void test_scavenge_blocked(void) { gpr_event ev; { gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr1, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); ; } { gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr2, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait( &ev, grpc_timeout_milliseconds_to_deadline(100)) == NULL); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr1, 1024); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(usr1, 1024); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); ; } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr2, 1024); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(usr2, 1024); + grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr1); @@ -290,9 +288,9 @@ static void test_blocked_until_scheduled_reclaim(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr, 1024, set_event(&ev)); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); ; @@ -300,18 +298,17 @@ static void test_blocked_until_scheduled_reclaim(void) { gpr_event reclaim_done; gpr_event_init(&reclaim_done); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resource_user_post_reclaimer( - &exec_ctx, usr, false, - make_reclaimer(usr, 1024, set_event(&reclaim_done))); - grpc_exec_ctx_finish(&exec_ctx); + usr, false, make_reclaimer(usr, 1024, set_event(&reclaim_done))); + grpc_exec_ctx_finish(); } { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr, 1024, set_event(&ev)); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&reclaim_done, grpc_timeout_seconds_to_deadline(5)) != NULL); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -319,9 +316,9 @@ static void test_blocked_until_scheduled_reclaim(void) { ; } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(usr, 1024); + grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -337,9 +334,9 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr1, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); ; @@ -347,18 +344,17 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) { gpr_event reclaim_done; gpr_event_init(&reclaim_done); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resource_user_post_reclaimer( - &exec_ctx, usr1, false, - make_reclaimer(usr1, 1024, set_event(&reclaim_done))); - grpc_exec_ctx_finish(&exec_ctx); + usr1, false, make_reclaimer(usr1, 1024, set_event(&reclaim_done))); + grpc_exec_ctx_finish(); } { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr2, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&reclaim_done, grpc_timeout_seconds_to_deadline(5)) != NULL); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -366,9 +362,9 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) { ; } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr2, 1024); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(usr2, 1024); + grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr1); @@ -384,9 +380,9 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr, 1024, set_event(&ev)); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); ; @@ -394,18 +390,17 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) { gpr_event reclaim_done; gpr_event_init(&reclaim_done); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resource_user_post_reclaimer( - &exec_ctx, usr, true, - make_reclaimer(usr, 1024, set_event(&reclaim_done))); - grpc_exec_ctx_finish(&exec_ctx); + usr, true, make_reclaimer(usr, 1024, set_event(&reclaim_done))); + grpc_exec_ctx_finish(); } { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr, 1024, set_event(&ev)); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&reclaim_done, grpc_timeout_seconds_to_deadline(5)) != NULL); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -413,9 +408,9 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) { ; } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(usr, 1024); + grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -432,13 +427,12 @@ static void test_unused_reclaim_is_cancelled(void) { gpr_event destructive_done; gpr_event_init(&destructive_done); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resource_user_post_reclaimer( - &exec_ctx, usr, false, make_unused_reclaimer(set_event(&benign_done))); + usr, false, make_unused_reclaimer(set_event(&benign_done))); grpc_resource_user_post_reclaimer( - &exec_ctx, usr, true, - make_unused_reclaimer(set_event(&destructive_done))); - grpc_exec_ctx_finish(&exec_ctx); + usr, true, make_unused_reclaimer(set_event(&destructive_done))); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_milliseconds_to_deadline(100)) == NULL); @@ -467,22 +461,20 @@ static void test_benign_reclaim_is_preferred(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr, 1024, set_event(&ev)); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); ; } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resource_user_post_reclaimer( - &exec_ctx, usr, false, - make_reclaimer(usr, 1024, set_event(&benign_done))); + usr, false, make_reclaimer(usr, 1024, set_event(&benign_done))); grpc_resource_user_post_reclaimer( - &exec_ctx, usr, true, - make_unused_reclaimer(set_event(&destructive_done))); - grpc_exec_ctx_finish(&exec_ctx); + usr, true, make_unused_reclaimer(set_event(&destructive_done))); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_milliseconds_to_deadline(100)) == NULL); @@ -493,9 +485,9 @@ static void test_benign_reclaim_is_preferred(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr, 1024, set_event(&ev)); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_seconds_to_deadline(5)) != NULL); GPR_ASSERT(gpr_event_wait(&destructive_done, @@ -505,9 +497,9 @@ static void test_benign_reclaim_is_preferred(void) { NULL); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(usr, 1024); + grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -530,22 +522,20 @@ static void test_multiple_reclaims_can_be_triggered(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr, 1024, set_event(&ev)); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); ; } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resource_user_post_reclaimer( - &exec_ctx, usr, false, - make_reclaimer(usr, 512, set_event(&benign_done))); + usr, false, make_reclaimer(usr, 512, set_event(&benign_done))); grpc_resource_user_post_reclaimer( - &exec_ctx, usr, true, - make_reclaimer(usr, 512, set_event(&destructive_done))); - grpc_exec_ctx_finish(&exec_ctx); + usr, true, make_reclaimer(usr, 512, set_event(&destructive_done))); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_milliseconds_to_deadline(100)) == NULL); @@ -556,9 +546,9 @@ static void test_multiple_reclaims_can_be_triggered(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr, 1024, set_event(&ev)); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_seconds_to_deadline(5)) != NULL); GPR_ASSERT(gpr_event_wait(&destructive_done, @@ -568,9 +558,9 @@ static void test_multiple_reclaims_can_be_triggered(void) { ; } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(usr, 1024); + grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -588,20 +578,20 @@ static void test_resource_user_stays_allocated_until_memory_released(void) { grpc_resource_quota_resize(q, 1024 * 1024); grpc_resource_user *usr = grpc_resource_user_create(q, "usr"); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, NULL); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr, 1024, NULL); + grpc_exec_ctx_finish(); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resource_quota_unref(q); - grpc_resource_user_unref(&exec_ctx, usr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_resource_user_unref(usr); + grpc_exec_ctx_finish(); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(usr, 1024); + grpc_exec_ctx_finish(); } } @@ -621,11 +611,10 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( gpr_event reclaimer_cancelled; gpr_event_init(&reclaimer_cancelled); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resource_user_post_reclaimer( - &exec_ctx, usr, false, - make_unused_reclaimer(set_event(&reclaimer_cancelled))); - grpc_exec_ctx_finish(&exec_ctx); + usr, false, make_unused_reclaimer(set_event(&reclaimer_cancelled))); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, grpc_timeout_milliseconds_to_deadline(100)) == NULL); @@ -633,9 +622,9 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( { gpr_event allocated; gpr_event_init(&allocated); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&allocated)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&allocated, grpc_timeout_seconds_to_deadline(5)) != NULL); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, @@ -643,17 +632,17 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( NULL); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_unref(&exec_ctx, usr); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_unref(usr); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, grpc_timeout_milliseconds_to_deadline(100)) == NULL); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(usr, 1024); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, grpc_timeout_seconds_to_deadline(5)) != NULL); } @@ -670,9 +659,9 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { { gpr_event allocated; gpr_event_init(&allocated); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&allocated)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&allocated, grpc_timeout_seconds_to_deadline(5)) != NULL); } @@ -680,11 +669,10 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { gpr_event reclaimer_done; gpr_event_init(&reclaimer_done); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resource_user_post_reclaimer( - &exec_ctx, usr, false, - make_reclaimer(usr, 1024, set_event(&reclaimer_done))); - grpc_exec_ctx_finish(&exec_ctx); + usr, false, make_reclaimer(usr, 1024, set_event(&reclaimer_done))); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&reclaimer_done, grpc_timeout_milliseconds_to_deadline(100)) == NULL); @@ -692,9 +680,9 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { { gpr_event allocated; gpr_event_init(&allocated); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&allocated)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); + grpc_exec_ctx_finish(); GPR_ASSERT(gpr_event_wait(&allocated, grpc_timeout_seconds_to_deadline(5)) != NULL); GPR_ASSERT(gpr_event_wait(&reclaimer_done, @@ -702,9 +690,9 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { } } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(usr, 1024); + grpc_exec_ctx_finish(); } destroy_user(usr); grpc_resource_quota_unref(q); @@ -727,16 +715,16 @@ static void test_one_slice(void) { { const int start_allocs = num_allocs; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc_slices(&exec_ctx, &alloc, 1024, 1, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); + grpc_exec_ctx_finish(); assert_counter_becomes(&num_allocs, start_allocs + 1); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice_buffer_destroy_internal(&buffer); + grpc_exec_ctx_finish(); } destroy_user(usr); grpc_resource_quota_unref(q); @@ -760,23 +748,23 @@ static void test_one_slice_deleted_late(void) { { const int start_allocs = num_allocs; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc_slices(&exec_ctx, &alloc, 1024, 1, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); + grpc_exec_ctx_finish(); assert_counter_becomes(&num_allocs, start_allocs + 1); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_unref(&exec_ctx, usr); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_unref(usr); + grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice_buffer_destroy_internal(&buffer); + grpc_exec_ctx_finish(); } } @@ -804,9 +792,9 @@ static void test_negative_rq_free_pool(void) { { const int start_allocs = num_allocs; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc_slices(&exec_ctx, &alloc, 1024, 1, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); + grpc_exec_ctx_finish(); assert_counter_becomes(&num_allocs, start_allocs + 1); } @@ -817,16 +805,16 @@ static void test_negative_rq_free_pool(void) { GPR_ASSERT(grpc_resource_quota_get_memory_pressure(q) > 1 - eps); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_unref(&exec_ctx, usr); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_unref(usr); + grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice_buffer_destroy_internal(&buffer); + grpc_exec_ctx_finish(); } } diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c index b8b76d1c426..1640cb4153b 100644 --- a/test/core/iomgr/tcp_client_posix_test.c +++ b/test/core/iomgr/tcp_client_posix_test.c @@ -53,26 +53,24 @@ static grpc_millis test_deadline(void) { static void finish_connection() { gpr_mu_lock(g_mu); g_connections_complete++; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT(GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(&exec_ctx, g_pollset, NULL))); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); + grpc_exec_ctx_finish(); gpr_mu_unlock(g_mu); } -static void must_succeed(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void must_succeed(void *arg, grpc_error *error) { GPR_ASSERT(g_connecting != NULL); GPR_ASSERT(error == GRPC_ERROR_NONE); - grpc_endpoint_shutdown( - exec_ctx, g_connecting, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("must_succeed called")); - grpc_endpoint_destroy(exec_ctx, g_connecting); + grpc_endpoint_shutdown(g_connecting, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "must_succeed called")); + grpc_endpoint_destroy(g_connecting); g_connecting = NULL; finish_connection(); } -static void must_fail(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void must_fail(void *arg, grpc_error *error) { GPR_ASSERT(g_connecting == NULL); GPR_ASSERT(error != GRPC_ERROR_NONE); finish_connection(); @@ -85,7 +83,7 @@ void test_succeeds(void) { int r; int connections_complete_before; grpc_closure done; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_DEBUG, "test_succeeds"); @@ -108,7 +106,7 @@ void test_succeeds(void) { GPR_ASSERT(getsockname(svr_fd, (struct sockaddr *)addr, (socklen_t *)&resolved_addr.len) == 0); GRPC_CLOSURE_INIT(&done, must_succeed, NULL, grpc_schedule_on_exec_ctx); - grpc_tcp_client_connect(&exec_ctx, &done, &g_connecting, g_pollset_set, NULL, + grpc_tcp_client_connect(&done, &g_connecting, g_pollset_set, NULL, &resolved_addr, GRPC_MILLIS_INF_FUTURE); /* await the connection */ @@ -126,17 +124,17 @@ void test_succeeds(void) { grpc_pollset_worker *worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(&exec_ctx, g_pollset, &worker, + grpc_pollset_work(g_pollset, &worker, grpc_timespec_to_millis_round_up( grpc_timeout_seconds_to_deadline(5))))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } void test_fails(void) { @@ -144,7 +142,7 @@ void test_fails(void) { struct sockaddr_in *addr = (struct sockaddr_in *)resolved_addr.addr; int connections_complete_before; grpc_closure done; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_DEBUG, "test_fails"); @@ -158,7 +156,7 @@ void test_fails(void) { /* connect to a broken address */ GRPC_CLOSURE_INIT(&done, must_fail, NULL, grpc_schedule_on_exec_ctx); - grpc_tcp_client_connect(&exec_ctx, &done, &g_connecting, g_pollset_set, NULL, + grpc_tcp_client_connect(&done, &g_connecting, g_pollset_set, NULL, &resolved_addr, GRPC_MILLIS_INF_FUTURE); gpr_mu_lock(g_mu); @@ -167,7 +165,7 @@ void test_fails(void) { while (g_connections_complete == connections_complete_before) { grpc_pollset_worker *worker = NULL; grpc_millis polling_deadline = test_deadline(); - switch (grpc_timer_check(&exec_ctx, &polling_deadline)) { + switch (grpc_timer_check(&polling_deadline)) { case GRPC_TIMERS_FIRED: break; case GRPC_TIMERS_NOT_CHECKED: @@ -175,42 +173,41 @@ void test_fails(void) { /* fall through */ case GRPC_TIMERS_CHECKED_AND_EMPTY: GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(&exec_ctx, g_pollset, &worker, - polling_deadline))); + "pollset_work", + grpc_pollset_work(g_pollset, &worker, polling_deadline))); break; } gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } -static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, - grpc_error *error) { - grpc_pollset_destroy(exec_ctx, p); +static void destroy_pollset(void *p, grpc_error *error) { + grpc_pollset_destroy(p); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); g_pollset_set = grpc_pollset_set_create(); g_pollset = gpr_zalloc(grpc_pollset_size()); grpc_pollset_init(g_pollset, &g_mu); - grpc_pollset_set_add_pollset(&exec_ctx, g_pollset_set, g_pollset); - grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_set_add_pollset(g_pollset_set, g_pollset); + grpc_exec_ctx_finish(); test_succeeds(); gpr_log(GPR_ERROR, "End of first test"); test_fails(); - grpc_pollset_set_destroy(&exec_ctx, g_pollset_set); + grpc_pollset_set_destroy(g_pollset_set); GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); - grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + grpc_exec_ctx_finish(); grpc_shutdown(); gpr_free(g_pollset); return 0; diff --git a/test/core/iomgr/tcp_client_uv_test.c b/test/core/iomgr/tcp_client_uv_test.c index edfccbe8678..393c183fa90 100644 --- a/test/core/iomgr/tcp_client_uv_test.c +++ b/test/core/iomgr/tcp_client_uv_test.c @@ -46,30 +46,28 @@ static grpc_millis test_deadline(void) { return grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(10)); } -static void finish_connection(grpc_exec_ctx *exec_ctx) { +static void finish_connection() { gpr_mu_lock(g_mu); g_connections_complete++; - GPR_ASSERT(GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, g_pollset, NULL))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); gpr_mu_unlock(g_mu); } -static void must_succeed(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void must_succeed(void *arg, grpc_error *error) { GPR_ASSERT(g_connecting != NULL); GPR_ASSERT(error == GRPC_ERROR_NONE); - grpc_endpoint_shutdown( - exec_ctx, g_connecting, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("must_succeed called")); - grpc_endpoint_destroy(exec_ctx, g_connecting); + grpc_endpoint_shutdown(g_connecting, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "must_succeed called")); + grpc_endpoint_destroy(g_connecting); g_connecting = NULL; - finish_connection(exec_ctx); + finish_connection(); } -static void must_fail(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void must_fail(void *arg, grpc_error *error) { GPR_ASSERT(g_connecting == NULL); GPR_ASSERT(error != GRPC_ERROR_NONE); - finish_connection(exec_ctx); + finish_connection(); } static void close_cb(uv_handle_t *handle) { gpr_free(handle); } @@ -88,7 +86,7 @@ void test_succeeds(void) { uv_tcp_t *svr_handle = gpr_malloc(sizeof(uv_tcp_t)); int connections_complete_before; grpc_closure done; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_DEBUG, "test_succeeds"); @@ -109,8 +107,8 @@ void test_succeeds(void) { GPR_ASSERT(uv_tcp_getsockname(svr_handle, (struct sockaddr *)addr, (int *)&resolved_addr.len) == 0); GRPC_CLOSURE_INIT(&done, must_succeed, NULL, grpc_schedule_on_exec_ctx); - grpc_tcp_client_connect(&exec_ctx, &done, &g_connecting, NULL, NULL, - &resolved_addr, GRPC_MILLIS_INF_FUTURE); + grpc_tcp_client_connect(&done, &g_connecting, NULL, NULL, &resolved_addr, + GRPC_MILLIS_INF_FUTURE); gpr_mu_lock(g_mu); @@ -118,11 +116,11 @@ void test_succeeds(void) { grpc_pollset_worker *worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(&exec_ctx, g_pollset, &worker, + grpc_pollset_work(g_pollset, &worker, grpc_timespec_to_millis_round_up( grpc_timeout_seconds_to_deadline(5))))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(g_mu); } @@ -131,7 +129,7 @@ void test_succeeds(void) { gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } void test_fails(void) { @@ -139,7 +137,7 @@ void test_fails(void) { struct sockaddr_in *addr = (struct sockaddr_in *)resolved_addr.addr; int connections_complete_before; grpc_closure done; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_DEBUG, "test_fails"); @@ -153,8 +151,8 @@ void test_fails(void) { /* connect to a broken address */ GRPC_CLOSURE_INIT(&done, must_fail, NULL, grpc_schedule_on_exec_ctx); - grpc_tcp_client_connect(&exec_ctx, &done, &g_connecting, NULL, NULL, - &resolved_addr, GRPC_MILLIS_INF_FUTURE); + grpc_tcp_client_connect(&done, &g_connecting, NULL, NULL, &resolved_addr, + GRPC_MILLIS_INF_FUTURE); gpr_mu_lock(g_mu); @@ -163,7 +161,7 @@ void test_fails(void) { grpc_pollset_worker *worker = NULL; gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); grpc_millis polling_deadline = test_deadline(); - switch (grpc_timer_check(&exec_ctx, &polling_deadline)) { + switch (grpc_timer_check(&polling_deadline)) { case GRPC_TIMERS_FIRED: break; case GRPC_TIMERS_NOT_CHECKED: @@ -171,39 +169,38 @@ void test_fails(void) { /* fall through */ case GRPC_TIMERS_CHECKED_AND_EMPTY: GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(&exec_ctx, g_pollset, &worker, - polling_deadline))); + "pollset_work", + grpc_pollset_work(g_pollset, &worker, polling_deadline))); break; } gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } -static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, - grpc_error *error) { - grpc_pollset_destroy(exec_ctx, p); +static void destroy_pollset(void *p, grpc_error *error) { + grpc_pollset_destroy(p); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); g_pollset = gpr_malloc(grpc_pollset_size()); grpc_pollset_init(g_pollset, &g_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); test_succeeds(); gpr_log(GPR_ERROR, "End of first test"); test_fails(); GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); - grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + grpc_exec_ctx_finish(); grpc_shutdown(); gpr_free(g_pollset); return 0; diff --git a/test/core/iomgr/tcp_posix_test.c b/test/core/iomgr/tcp_posix_test.c index 6501160c6f4..83f1ad424d2 100644 --- a/test/core/iomgr/tcp_posix_test.c +++ b/test/core/iomgr/tcp_posix_test.c @@ -131,8 +131,7 @@ static size_t count_slices(grpc_slice *slices, size_t nslices, return num_bytes; } -static void read_cb(grpc_exec_ctx *exec_ctx, void *user_data, - grpc_error *error) { +static void read_cb(void *user_data, grpc_error *error) { struct read_socket_state *state = (struct read_socket_state *)user_data; size_t read_bytes; int current_data; @@ -147,11 +146,10 @@ static void read_cb(grpc_exec_ctx *exec_ctx, void *user_data, gpr_log(GPR_INFO, "Read %" PRIuPTR " bytes of %" PRIuPTR, read_bytes, state->target_read_bytes); if (state->read_bytes >= state->target_read_bytes) { - GPR_ASSERT(GRPC_LOG_IF_ERROR("kick", - grpc_pollset_kick(exec_ctx, g_pollset, NULL))); + GPR_ASSERT(GRPC_LOG_IF_ERROR("kick", grpc_pollset_kick(g_pollset, NULL))); gpr_mu_unlock(g_mu); } else { - grpc_endpoint_read(exec_ctx, state->ep, &state->incoming, &state->read_cb); + grpc_endpoint_read(state->ep, &state->incoming, &state->read_cb); gpr_mu_unlock(g_mu); } } @@ -164,7 +162,7 @@ static void read_test(size_t num_bytes, size_t slice_size) { size_t written_bytes; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_INFO, "Read test of size %" PRIuPTR ", slice size %" PRIuPTR, num_bytes, slice_size); @@ -175,9 +173,8 @@ static void read_test(size_t num_bytes, size_t slice_size) { .type = GRPC_ARG_INTEGER, .value.integer = (int)slice_size}}; grpc_channel_args args = {.num_args = GPR_ARRAY_SIZE(a), .args = a}; - ep = grpc_tcp_create(&exec_ctx, grpc_fd_create(sv[1], "read_test"), &args, - "test"); - grpc_endpoint_add_to_pollset(&exec_ctx, ep, g_pollset); + ep = grpc_tcp_create(grpc_fd_create(sv[1], "read_test"), &args, "test"); + grpc_endpoint_add_to_pollset(ep, g_pollset); written_bytes = fill_socket_partial(sv[0], num_bytes); gpr_log(GPR_INFO, "Wrote %" PRIuPTR " bytes", written_bytes); @@ -188,24 +185,23 @@ static void read_test(size_t num_bytes, size_t slice_size) { grpc_slice_buffer_init(&state.incoming); GRPC_CLOSURE_INIT(&state.read_cb, read_cb, &state, grpc_schedule_on_exec_ctx); - grpc_endpoint_read(&exec_ctx, ep, &state.incoming, &state.read_cb); + grpc_endpoint_read(ep, &state.incoming, &state.read_cb); gpr_mu_lock(g_mu); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker *worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); + "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_mu_lock(g_mu); } GPR_ASSERT(state.read_bytes == state.target_read_bytes); gpr_mu_unlock(g_mu); - grpc_slice_buffer_destroy_internal(&exec_ctx, &state.incoming); - grpc_endpoint_destroy(&exec_ctx, ep); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_buffer_destroy_internal(&state.incoming); + grpc_endpoint_destroy(ep); + grpc_exec_ctx_finish(); } /* Write to a socket until it fills up, then read from it using the grpc_tcp @@ -217,7 +213,7 @@ static void large_read_test(size_t slice_size) { ssize_t written_bytes; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_INFO, "Start large read test, slice size %" PRIuPTR, slice_size); @@ -227,9 +223,8 @@ static void large_read_test(size_t slice_size) { .type = GRPC_ARG_INTEGER, .value.integer = (int)slice_size}}; grpc_channel_args args = {.num_args = GPR_ARRAY_SIZE(a), .args = a}; - ep = grpc_tcp_create(&exec_ctx, grpc_fd_create(sv[1], "large_read_test"), - &args, "test"); - grpc_endpoint_add_to_pollset(&exec_ctx, ep, g_pollset); + ep = grpc_tcp_create(grpc_fd_create(sv[1], "large_read_test"), &args, "test"); + grpc_endpoint_add_to_pollset(ep, g_pollset); written_bytes = fill_socket(sv[0]); gpr_log(GPR_INFO, "Wrote %" PRIuPTR " bytes", written_bytes); @@ -240,24 +235,23 @@ static void large_read_test(size_t slice_size) { grpc_slice_buffer_init(&state.incoming); GRPC_CLOSURE_INIT(&state.read_cb, read_cb, &state, grpc_schedule_on_exec_ctx); - grpc_endpoint_read(&exec_ctx, ep, &state.incoming, &state.read_cb); + grpc_endpoint_read(ep, &state.incoming, &state.read_cb); gpr_mu_lock(g_mu); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker *worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); + "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_mu_lock(g_mu); } GPR_ASSERT(state.read_bytes == state.target_read_bytes); gpr_mu_unlock(g_mu); - grpc_slice_buffer_destroy_internal(&exec_ctx, &state.incoming); - grpc_endpoint_destroy(&exec_ctx, ep); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_buffer_destroy_internal(&state.incoming); + grpc_endpoint_destroy(ep); + grpc_exec_ctx_finish(); } struct write_socket_state { @@ -288,16 +282,15 @@ static grpc_slice *allocate_blocks(size_t num_bytes, size_t slice_size, return slices; } -static void write_done(grpc_exec_ctx *exec_ctx, - void *user_data /* write_socket_state */, +static void write_done(void *user_data /* write_socket_state */, grpc_error *error) { struct write_socket_state *state = (struct write_socket_state *)user_data; gpr_log(GPR_INFO, "Write done callback called"); gpr_mu_lock(g_mu); gpr_log(GPR_INFO, "Signalling write done"); state->write_done = 1; - GPR_ASSERT(GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, g_pollset, NULL))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); gpr_mu_unlock(g_mu); } @@ -308,7 +301,7 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { int flags; int current = 0; int i; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; flags = fcntl(fd, F_GETFL, 0); GPR_ASSERT(fcntl(fd, F_SETFL, flags & ~O_NONBLOCK) == 0); @@ -318,11 +311,11 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { gpr_mu_lock(g_mu); GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(&exec_ctx, g_pollset, &worker, + grpc_pollset_work(g_pollset, &worker, grpc_timespec_to_millis_round_up( grpc_timeout_milliseconds_to_deadline(10))))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); do { bytes_read = read(fd, buf, bytes_left > read_size ? read_size : bytes_left); @@ -355,7 +348,7 @@ static void write_test(size_t num_bytes, size_t slice_size) { grpc_closure write_done_closure; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_INFO, "Start write test with %" PRIuPTR " bytes, slice size %" PRIuPTR, @@ -367,9 +360,8 @@ static void write_test(size_t num_bytes, size_t slice_size) { .type = GRPC_ARG_INTEGER, .value.integer = (int)slice_size}}; grpc_channel_args args = {.num_args = GPR_ARRAY_SIZE(a), .args = a}; - ep = grpc_tcp_create(&exec_ctx, grpc_fd_create(sv[1], "write_test"), &args, - "test"); - grpc_endpoint_add_to_pollset(&exec_ctx, ep, g_pollset); + ep = grpc_tcp_create(grpc_fd_create(sv[1], "write_test"), &args, "test"); + grpc_endpoint_add_to_pollset(ep, g_pollset); state.ep = ep; state.write_done = 0; @@ -381,7 +373,7 @@ static void write_test(size_t num_bytes, size_t slice_size) { GRPC_CLOSURE_INIT(&write_done_closure, write_done, &state, grpc_schedule_on_exec_ctx); - grpc_endpoint_write(&exec_ctx, ep, &outgoing, &write_done_closure); + grpc_endpoint_write(ep, &outgoing, &write_done_closure); drain_socket_blocking(sv[0], num_bytes, num_bytes); gpr_mu_lock(g_mu); for (;;) { @@ -390,25 +382,24 @@ static void write_test(size_t num_bytes, size_t slice_size) { break; } GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); + "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); - grpc_slice_buffer_destroy_internal(&exec_ctx, &outgoing); - grpc_endpoint_destroy(&exec_ctx, ep); + grpc_slice_buffer_destroy_internal(&outgoing); + grpc_endpoint_destroy(ep); gpr_free(slices); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } -void on_fd_released(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *errors) { +void on_fd_released(void *arg, grpc_error *errors) { int *done = (int *)arg; *done = 1; - GPR_ASSERT(GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, g_pollset, NULL))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); } /* Do a read_test, then release fd and try to read/write again. Verify that @@ -421,7 +412,7 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { int fd; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_closure fd_released_cb; int fd_released_done = 0; GRPC_CLOSURE_INIT(&fd_released_cb, &on_fd_released, &fd_released_done, @@ -437,10 +428,9 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { .type = GRPC_ARG_INTEGER, .value.integer = (int)slice_size}}; grpc_channel_args args = {.num_args = GPR_ARRAY_SIZE(a), .args = a}; - ep = grpc_tcp_create(&exec_ctx, grpc_fd_create(sv[1], "read_test"), &args, - "test"); + ep = grpc_tcp_create(grpc_fd_create(sv[1], "read_test"), &args, "test"); GPR_ASSERT(grpc_tcp_fd(ep) == sv[1] && sv[1] >= 0); - grpc_endpoint_add_to_pollset(&exec_ctx, ep, g_pollset); + grpc_endpoint_add_to_pollset(ep, g_pollset); written_bytes = fill_socket_partial(sv[0], num_bytes); gpr_log(GPR_INFO, "Wrote %" PRIuPTR " bytes", written_bytes); @@ -451,38 +441,36 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { grpc_slice_buffer_init(&state.incoming); GRPC_CLOSURE_INIT(&state.read_cb, read_cb, &state, grpc_schedule_on_exec_ctx); - grpc_endpoint_read(&exec_ctx, ep, &state.incoming, &state.read_cb); + grpc_endpoint_read(ep, &state.incoming, &state.read_cb); gpr_mu_lock(g_mu); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker *worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); + "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_log(GPR_DEBUG, "wakeup: read=%" PRIdPTR " target=%" PRIdPTR, state.read_bytes, state.target_read_bytes); gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(g_mu); } GPR_ASSERT(state.read_bytes == state.target_read_bytes); gpr_mu_unlock(g_mu); - grpc_slice_buffer_destroy_internal(&exec_ctx, &state.incoming); - grpc_tcp_destroy_and_release_fd(&exec_ctx, ep, &fd, &fd_released_cb); - grpc_exec_ctx_flush(&exec_ctx); + grpc_slice_buffer_destroy_internal(&state.incoming); + grpc_tcp_destroy_and_release_fd(ep, &fd, &fd_released_cb); + grpc_exec_ctx_flush(); gpr_mu_lock(g_mu); while (!fd_released_done) { grpc_pollset_worker *worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); + "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_log(GPR_DEBUG, "wakeup: fd_released_done=%d", fd_released_done); } gpr_mu_unlock(g_mu); GPR_ASSERT(fd_released_done == 1); GPR_ASSERT(fd == sv[1]); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); written_bytes = fill_socket_partial(sv[0], num_bytes); drain_socket_blocking(fd, written_bytes, written_bytes); @@ -520,7 +508,7 @@ static grpc_endpoint_test_fixture create_fixture_tcp_socketpair( size_t slice_size) { int sv[2]; grpc_endpoint_test_fixture f; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; create_sockets(sv); grpc_resource_quota *resource_quota = @@ -529,15 +517,15 @@ static grpc_endpoint_test_fixture create_fixture_tcp_socketpair( .type = GRPC_ARG_INTEGER, .value.integer = (int)slice_size}}; grpc_channel_args args = {.num_args = GPR_ARRAY_SIZE(a), .args = a}; - f.client_ep = grpc_tcp_create( - &exec_ctx, grpc_fd_create(sv[0], "fixture:client"), &args, "test"); - f.server_ep = grpc_tcp_create( - &exec_ctx, grpc_fd_create(sv[1], "fixture:server"), &args, "test"); - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); - grpc_endpoint_add_to_pollset(&exec_ctx, f.client_ep, g_pollset); - grpc_endpoint_add_to_pollset(&exec_ctx, f.server_ep, g_pollset); + f.client_ep = + grpc_tcp_create(grpc_fd_create(sv[0], "fixture:client"), &args, "test"); + f.server_ep = + grpc_tcp_create(grpc_fd_create(sv[1], "fixture:server"), &args, "test"); + grpc_resource_quota_unref_internal(resource_quota); + grpc_endpoint_add_to_pollset(f.client_ep, g_pollset); + grpc_endpoint_add_to_pollset(f.server_ep, g_pollset); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return f; } @@ -546,14 +534,13 @@ static grpc_endpoint_test_config configs[] = { {"tcp/tcp_socketpair", create_fixture_tcp_socketpair, clean_up}, }; -static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, - grpc_error *error) { - grpc_pollset_destroy(exec_ctx, (grpc_pollset *)p); +static void destroy_pollset(void *p, grpc_error *error) { + grpc_pollset_destroy((grpc_pollset *)p); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); g_pollset = (grpc_pollset *)gpr_zalloc(grpc_pollset_size()); @@ -562,8 +549,8 @@ int main(int argc, char **argv) { run_tests(); GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); - grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + grpc_exec_ctx_finish(); grpc_shutdown(); gpr_free(g_pollset); diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c index 782dfb413a9..a1684fe72ca 100644 --- a/test/core/iomgr/tcp_server_posix_test.c +++ b/test/core/iomgr/tcp_server_posix_test.c @@ -110,8 +110,7 @@ static void on_connect_result_set(on_connect_result *result, result->server, acceptor->port_index, acceptor->fd_index); } -static void server_weak_ref_shutdown(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void server_weak_ref_shutdown(void *arg, grpc_error *error) { server_weak_ref *weak_ref = arg; weak_ref->server = NULL; } @@ -145,12 +144,11 @@ static void test_addr_init_str(test_addr *addr) { } } -static void on_connect(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *tcp, - grpc_pollset *pollset, +static void on_connect(void *arg, grpc_endpoint *tcp, grpc_pollset *pollset, grpc_tcp_server_acceptor *acceptor) { - grpc_endpoint_shutdown(exec_ctx, tcp, + grpc_endpoint_shutdown(tcp, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Connected")); - grpc_endpoint_destroy(exec_ctx, tcp); + grpc_endpoint_destroy(tcp); on_connect_result temp_result; on_connect_result_set(&temp_result, acceptor); @@ -159,38 +157,35 @@ static void on_connect(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *tcp, gpr_mu_lock(g_mu); g_result = temp_result; g_nconnects++; - GPR_ASSERT(GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, g_pollset, NULL))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); gpr_mu_unlock(g_mu); } static void test_no_op(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_tcp_server *s; - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(&exec_ctx, NULL, NULL, &s)); - grpc_tcp_server_unref(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); + grpc_tcp_server_unref(s); + grpc_exec_ctx_finish(); } static void test_no_op_with_start(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_tcp_server *s; - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(&exec_ctx, NULL, NULL, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); LOG_TEST("test_no_op_with_start"); - grpc_tcp_server_start(&exec_ctx, s, NULL, 0, on_connect, NULL); - grpc_tcp_server_unref(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + grpc_tcp_server_start(s, NULL, 0, on_connect, NULL); + grpc_tcp_server_unref(s); + grpc_exec_ctx_finish(); } static void test_no_op_with_port(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; struct sockaddr_in *addr = (struct sockaddr_in *)resolved_addr.addr; grpc_tcp_server *s; - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(&exec_ctx, NULL, NULL, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); LOG_TEST("test_no_op_with_port"); memset(&resolved_addr, 0, sizeof(resolved_addr)); @@ -201,17 +196,16 @@ static void test_no_op_with_port(void) { GRPC_ERROR_NONE && port > 0); - grpc_tcp_server_unref(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + grpc_tcp_server_unref(s); + grpc_exec_ctx_finish(); } static void test_no_op_with_port_and_start(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; struct sockaddr_in *addr = (struct sockaddr_in *)resolved_addr.addr; grpc_tcp_server *s; - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(&exec_ctx, NULL, NULL, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); LOG_TEST("test_no_op_with_port_and_start"); int port = -1; @@ -222,13 +216,13 @@ static void test_no_op_with_port_and_start(void) { GRPC_ERROR_NONE && port > 0); - grpc_tcp_server_start(&exec_ctx, s, NULL, 0, on_connect, NULL); + grpc_tcp_server_start(s, NULL, 0, on_connect, NULL); - grpc_tcp_server_unref(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + grpc_tcp_server_unref(s); + grpc_exec_ctx_finish(); } -static grpc_error *tcp_connect(grpc_exec_ctx *exec_ctx, const test_addr *remote, +static grpc_error *tcp_connect(const test_addr *remote, on_connect_result *result) { grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(10)); @@ -253,18 +247,17 @@ static grpc_error *tcp_connect(grpc_exec_ctx *exec_ctx, const test_addr *remote, return GRPC_OS_ERROR(errno, "connect"); } gpr_log(GPR_DEBUG, "wait"); - while (g_nconnects == nconnects_before && - deadline > grpc_exec_ctx_now(exec_ctx)) { + while (g_nconnects == nconnects_before && deadline > grpc_exec_ctx_now()) { grpc_pollset_worker *worker = NULL; grpc_error *err; - if ((err = grpc_pollset_work(exec_ctx, g_pollset, &worker, deadline)) != + if ((err = grpc_pollset_work(g_pollset, &worker, deadline)) != GRPC_ERROR_NONE) { gpr_mu_unlock(g_mu); close(clifd); return err; } gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(exec_ctx); + grpc_exec_ctx_finish(); gpr_mu_lock(g_mu); } gpr_log(GPR_DEBUG, "wait done"); @@ -279,7 +272,7 @@ static grpc_error *tcp_connect(grpc_exec_ctx *exec_ctx, const test_addr *remote, gpr_mu_unlock(g_mu); gpr_log(GPR_INFO, "Result (%d, %d) fd %d", result->port_index, result->fd_index, result->server_fd); - grpc_tcp_server_unref(exec_ctx, result->server); + grpc_tcp_server_unref(result->server); return GRPC_ERROR_NONE; } @@ -292,7 +285,7 @@ static grpc_error *tcp_connect(grpc_exec_ctx *exec_ctx, const test_addr *remote, static void test_connect(size_t num_connects, const grpc_channel_args *channel_args, test_addrs *dst_addrs, bool test_dst_addrs) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; grpc_resolved_address resolved_addr1; struct sockaddr_storage *const addr = @@ -306,8 +299,7 @@ static void test_connect(size_t num_connects, int svr1_port; grpc_tcp_server *s; const unsigned num_ports = 2; - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(&exec_ctx, NULL, channel_args, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, channel_args, &s)); unsigned port_num; server_weak_ref weak_ref; server_weak_ref_init(&weak_ref); @@ -352,7 +344,7 @@ static void test_connect(size_t num_connects, svr1_fd_count = grpc_tcp_server_port_fd_count(s, 1); GPR_ASSERT(svr1_fd_count >= 1); - grpc_tcp_server_start(&exec_ctx, s, &g_pollset, 1, on_connect, NULL); + grpc_tcp_server_start(s, &g_pollset, 1, on_connect, NULL); if (dst_addrs != NULL) { int ports[] = {svr_port, svr1_port}; @@ -372,7 +364,7 @@ static void test_connect(size_t num_connects, test_addr_init_str(&dst); ++num_tested; on_connect_result_init(&result); - if ((err = tcp_connect(&exec_ctx, &dst, &result)) == GRPC_ERROR_NONE && + if ((err = tcp_connect(&dst, &result)) == GRPC_ERROR_NONE && result.server_fd >= 0 && result.server == s) { continue; } @@ -403,8 +395,8 @@ static void test_connect(size_t num_connects, for (connect_num = 0; connect_num < num_connects; ++connect_num) { on_connect_result result; on_connect_result_init(&result); - GPR_ASSERT(GRPC_LOG_IF_ERROR("tcp_connect", - tcp_connect(&exec_ctx, &dst, &result))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("tcp_connect", tcp_connect(&dst, &result))); GPR_ASSERT(result.server_fd == fd); GPR_ASSERT(result.port_index == port_num); GPR_ASSERT(result.fd_index == fd_num); @@ -420,21 +412,20 @@ static void test_connect(size_t num_connects, GPR_ASSERT(weak_ref.server != NULL); GPR_ASSERT(grpc_tcp_server_port_fd(s, 0, 0) >= 0); - grpc_tcp_server_unref(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + grpc_tcp_server_unref(s); + grpc_exec_ctx_finish(); /* Weak ref lost. */ GPR_ASSERT(weak_ref.server == NULL); } -static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, - grpc_error *error) { - grpc_pollset_destroy(exec_ctx, p); +static void destroy_pollset(void *p, grpc_error *error) { + grpc_pollset_destroy(p); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_arg chan_args[] = { {GRPC_ARG_INTEGER, GRPC_ARG_EXPAND_WILDCARD_ADDRS, {.integer = 1}}}; const grpc_channel_args channel_args = {1, chan_args}; @@ -494,8 +485,8 @@ int main(int argc, char **argv) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); - grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + grpc_exec_ctx_finish(); grpc_shutdown(); gpr_free(dst_addrs); gpr_free(g_pollset); diff --git a/test/core/iomgr/tcp_server_uv_test.c b/test/core/iomgr/tcp_server_uv_test.c index 9fafd3177a9..08873a8860b 100644 --- a/test/core/iomgr/tcp_server_uv_test.c +++ b/test/core/iomgr/tcp_server_uv_test.c @@ -74,8 +74,7 @@ static void on_connect_result_set(on_connect_result *result, result->fd_index = acceptor->fd_index; } -static void server_weak_ref_shutdown(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void server_weak_ref_shutdown(void *arg, grpc_error *error) { server_weak_ref *weak_ref = arg; weak_ref->server = NULL; } @@ -97,12 +96,11 @@ static void server_weak_ref_set(server_weak_ref *weak_ref, weak_ref->server = server; } -static void on_connect(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *tcp, - grpc_pollset *pollset, +static void on_connect(void *arg, grpc_endpoint *tcp, grpc_pollset *pollset, grpc_tcp_server_acceptor *acceptor) { - grpc_endpoint_shutdown(exec_ctx, tcp, + grpc_endpoint_shutdown(tcp, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Connected")); - grpc_endpoint_destroy(exec_ctx, tcp); + grpc_endpoint_destroy(tcp); on_connect_result temp_result; on_connect_result_set(&temp_result, acceptor); @@ -111,38 +109,35 @@ static void on_connect(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *tcp, gpr_mu_lock(g_mu); g_result = temp_result; g_nconnects++; - GPR_ASSERT(GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, g_pollset, NULL))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); gpr_mu_unlock(g_mu); } static void test_no_op(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_tcp_server *s; - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(&exec_ctx, NULL, NULL, &s)); - grpc_tcp_server_unref(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); + grpc_tcp_server_unref(s); + grpc_exec_ctx_finish(); } static void test_no_op_with_start(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_tcp_server *s; - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(&exec_ctx, NULL, NULL, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); LOG_TEST("test_no_op_with_start"); - grpc_tcp_server_start(&exec_ctx, s, NULL, 0, on_connect, NULL); - grpc_tcp_server_unref(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + grpc_tcp_server_start(s, NULL, 0, on_connect, NULL); + grpc_tcp_server_unref(s); + grpc_exec_ctx_finish(); } static void test_no_op_with_port(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; struct sockaddr_in *addr = (struct sockaddr_in *)resolved_addr.addr; grpc_tcp_server *s; - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(&exec_ctx, NULL, NULL, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); LOG_TEST("test_no_op_with_port"); memset(&resolved_addr, 0, sizeof(resolved_addr)); @@ -153,17 +148,16 @@ static void test_no_op_with_port(void) { GRPC_ERROR_NONE && port > 0); - grpc_tcp_server_unref(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + grpc_tcp_server_unref(s); + grpc_exec_ctx_finish(); } static void test_no_op_with_port_and_start(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; struct sockaddr_in *addr = (struct sockaddr_in *)resolved_addr.addr; grpc_tcp_server *s; - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(&exec_ctx, NULL, NULL, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); LOG_TEST("test_no_op_with_port_and_start"); int port; @@ -174,10 +168,10 @@ static void test_no_op_with_port_and_start(void) { GRPC_ERROR_NONE && port > 0); - grpc_tcp_server_start(&exec_ctx, s, NULL, 0, on_connect, NULL); + grpc_tcp_server_start(s, NULL, 0, on_connect, NULL); - grpc_tcp_server_unref(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + grpc_tcp_server_unref(s); + grpc_exec_ctx_finish(); } static void connect_cb(uv_connect_t *req, int status) { @@ -187,8 +181,8 @@ static void connect_cb(uv_connect_t *req, int status) { static void close_cb(uv_handle_t *handle) { gpr_free(handle); } -static void tcp_connect(grpc_exec_ctx *exec_ctx, const struct sockaddr *remote, - socklen_t remote_len, on_connect_result *result) { +static void tcp_connect(const struct sockaddr *remote, socklen_t remote_len, + on_connect_result *result) { gpr_timespec deadline = grpc_timeout_seconds_to_deadline(10); uv_tcp_t *client_handle = gpr_malloc(sizeof(uv_tcp_t)); uv_connect_t *req = gpr_malloc(sizeof(uv_connect_t)); @@ -206,10 +200,10 @@ static void tcp_connect(grpc_exec_ctx *exec_ctx, const struct sockaddr *remote, grpc_pollset_worker *worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(exec_ctx, g_pollset, &worker, + grpc_pollset_work(g_pollset, &worker, grpc_timespec_to_millis_round_up(deadline)))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(exec_ctx); + grpc_exec_ctx_finish(); gpr_mu_lock(g_mu); } gpr_log(GPR_DEBUG, "wait done"); @@ -222,7 +216,7 @@ static void tcp_connect(grpc_exec_ctx *exec_ctx, const struct sockaddr *remote, /* Tests a tcp server with multiple ports. */ static void test_connect(unsigned n) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; grpc_resolved_address resolved_addr1; struct sockaddr_storage *addr = (struct sockaddr_storage *)resolved_addr.addr; @@ -231,8 +225,7 @@ static void test_connect(unsigned n) { int svr_port; int svr1_port; grpc_tcp_server *s; - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(&exec_ctx, NULL, NULL, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); unsigned i; server_weak_ref weak_ref; server_weak_ref_init(&weak_ref); @@ -255,48 +248,46 @@ static void test_connect(unsigned n) { GRPC_ERROR_NONE && svr_port == svr1_port); - grpc_tcp_server_start(&exec_ctx, s, &g_pollset, 1, on_connect, NULL); + grpc_tcp_server_start(s, &g_pollset, 1, on_connect, NULL); GPR_ASSERT(uv_ip6_addr("::", svr_port, (struct sockaddr_in6 *)addr1) == 0); for (i = 0; i < n; i++) { on_connect_result result; on_connect_result_init(&result); - tcp_connect(&exec_ctx, (struct sockaddr *)addr, - (socklen_t)resolved_addr.len, &result); + tcp_connect((struct sockaddr *)addr, (socklen_t)resolved_addr.len, &result); GPR_ASSERT(result.port_index == 0); GPR_ASSERT(result.server == s); if (weak_ref.server == NULL) { server_weak_ref_set(&weak_ref, result.server); } - grpc_tcp_server_unref(&exec_ctx, result.server); + grpc_tcp_server_unref(result.server); on_connect_result_init(&result); - tcp_connect(&exec_ctx, (struct sockaddr *)addr1, - (socklen_t)resolved_addr1.len, &result); + tcp_connect((struct sockaddr *)addr1, (socklen_t)resolved_addr1.len, + &result); GPR_ASSERT(result.port_index == 1); GPR_ASSERT(result.server == s); - grpc_tcp_server_unref(&exec_ctx, result.server); + grpc_tcp_server_unref(result.server); } /* Weak ref to server valid until final unref. */ GPR_ASSERT(weak_ref.server != NULL); - grpc_tcp_server_unref(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + grpc_tcp_server_unref(s); + grpc_exec_ctx_finish(); /* Weak ref lost. */ GPR_ASSERT(weak_ref.server == NULL); } -static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, - grpc_error *error) { - grpc_pollset_destroy(exec_ctx, p); +static void destroy_pollset(void *p, grpc_error *error) { + grpc_pollset_destroy(p); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); g_pollset = gpr_malloc(grpc_pollset_size()); @@ -311,8 +302,8 @@ int main(int argc, char **argv) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); - grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + grpc_exec_ctx_finish(); grpc_shutdown(); gpr_free(g_pollset); return 0; diff --git a/test/core/iomgr/timer_list_test.c b/test/core/iomgr/timer_list_test.c index c3d9f9d88d4..1ef4501a36f 100644 --- a/test/core/iomgr/timer_list_test.c +++ b/test/core/iomgr/timer_list_test.c @@ -36,51 +36,50 @@ extern grpc_tracer_flag grpc_timer_check_trace; static int cb_called[MAX_CB][2]; -static void cb(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void cb(void *arg, grpc_error *error) { cb_called[(intptr_t)arg][error == GRPC_ERROR_NONE]++; } static void add_test(void) { int i; grpc_timer timers[20]; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_INFO, "add_test"); - grpc_timer_list_init(&exec_ctx); + grpc_timer_list_init(); grpc_timer_trace.value = 1; grpc_timer_check_trace.value = 1; memset(cb_called, 0, sizeof(cb_called)); - grpc_millis start = grpc_exec_ctx_now(&exec_ctx); + grpc_millis start = grpc_exec_ctx_now(); /* 10 ms timers. will expire in the current epoch */ for (i = 0; i < 10; i++) { - grpc_timer_init(&exec_ctx, &timers[i], start + 10, + grpc_timer_init(&timers[i], start + 10, GRPC_CLOSURE_CREATE(cb, (void *)(intptr_t)i, grpc_schedule_on_exec_ctx)); } /* 1010 ms timers. will expire in the next epoch */ for (i = 10; i < 20; i++) { - grpc_timer_init(&exec_ctx, &timers[i], start + 1010, + grpc_timer_init(&timers[i], start + 1010, GRPC_CLOSURE_CREATE(cb, (void *)(intptr_t)i, grpc_schedule_on_exec_ctx)); } /* collect timers. Only the first batch should be ready. */ exec_ctx.now = start + 500; - GPR_ASSERT(grpc_timer_check(&exec_ctx, NULL) == GRPC_TIMERS_FIRED); - grpc_exec_ctx_finish(&exec_ctx); + GPR_ASSERT(grpc_timer_check(NULL) == GRPC_TIMERS_FIRED); + grpc_exec_ctx_finish(); for (i = 0; i < 20; i++) { GPR_ASSERT(cb_called[i][1] == (i < 10)); GPR_ASSERT(cb_called[i][0] == 0); } exec_ctx.now = start + 600; - GPR_ASSERT(grpc_timer_check(&exec_ctx, NULL) == - GRPC_TIMERS_CHECKED_AND_EMPTY); - grpc_exec_ctx_finish(&exec_ctx); + GPR_ASSERT(grpc_timer_check(NULL) == GRPC_TIMERS_CHECKED_AND_EMPTY); + grpc_exec_ctx_finish(); for (i = 0; i < 30; i++) { GPR_ASSERT(cb_called[i][1] == (i < 10)); GPR_ASSERT(cb_called[i][0] == 0); @@ -88,66 +87,65 @@ static void add_test(void) { /* collect the rest of the timers */ exec_ctx.now = start + 1500; - GPR_ASSERT(grpc_timer_check(&exec_ctx, NULL) == GRPC_TIMERS_FIRED); - grpc_exec_ctx_finish(&exec_ctx); + GPR_ASSERT(grpc_timer_check(NULL) == GRPC_TIMERS_FIRED); + grpc_exec_ctx_finish(); for (i = 0; i < 30; i++) { GPR_ASSERT(cb_called[i][1] == (i < 20)); GPR_ASSERT(cb_called[i][0] == 0); } exec_ctx.now = start + 1600; - GPR_ASSERT(grpc_timer_check(&exec_ctx, NULL) == - GRPC_TIMERS_CHECKED_AND_EMPTY); + GPR_ASSERT(grpc_timer_check(NULL) == GRPC_TIMERS_CHECKED_AND_EMPTY); for (i = 0; i < 30; i++) { GPR_ASSERT(cb_called[i][1] == (i < 20)); GPR_ASSERT(cb_called[i][0] == 0); } - grpc_timer_list_shutdown(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + grpc_timer_list_shutdown(); + grpc_exec_ctx_finish(); } /* Cleaning up a list with pending timers. */ void destruction_test(void) { grpc_timer timers[5]; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_INFO, "destruction_test"); exec_ctx.now_is_valid = true; exec_ctx.now = 0; - grpc_timer_list_init(&exec_ctx); + grpc_timer_list_init(); grpc_timer_trace.value = 1; grpc_timer_check_trace.value = 1; memset(cb_called, 0, sizeof(cb_called)); grpc_timer_init( - &exec_ctx, &timers[0], 100, + &timers[0], 100, GRPC_CLOSURE_CREATE(cb, (void *)(intptr_t)0, grpc_schedule_on_exec_ctx)); grpc_timer_init( - &exec_ctx, &timers[1], 3, + &timers[1], 3, GRPC_CLOSURE_CREATE(cb, (void *)(intptr_t)1, grpc_schedule_on_exec_ctx)); grpc_timer_init( - &exec_ctx, &timers[2], 100, + &timers[2], 100, GRPC_CLOSURE_CREATE(cb, (void *)(intptr_t)2, grpc_schedule_on_exec_ctx)); grpc_timer_init( - &exec_ctx, &timers[3], 3, + &timers[3], 3, GRPC_CLOSURE_CREATE(cb, (void *)(intptr_t)3, grpc_schedule_on_exec_ctx)); grpc_timer_init( - &exec_ctx, &timers[4], 1, + &timers[4], 1, GRPC_CLOSURE_CREATE(cb, (void *)(intptr_t)4, grpc_schedule_on_exec_ctx)); exec_ctx.now = 2; - GPR_ASSERT(grpc_timer_check(&exec_ctx, NULL) == GRPC_TIMERS_FIRED); - grpc_exec_ctx_finish(&exec_ctx); + GPR_ASSERT(grpc_timer_check(NULL) == GRPC_TIMERS_FIRED); + grpc_exec_ctx_finish(); GPR_ASSERT(1 == cb_called[4][1]); - grpc_timer_cancel(&exec_ctx, &timers[0]); - grpc_timer_cancel(&exec_ctx, &timers[3]); - grpc_exec_ctx_finish(&exec_ctx); + grpc_timer_cancel(&timers[0]); + grpc_timer_cancel(&timers[3]); + grpc_exec_ctx_finish(); GPR_ASSERT(1 == cb_called[0][0]); GPR_ASSERT(1 == cb_called[3][0]); - grpc_timer_list_shutdown(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + grpc_timer_list_shutdown(); + grpc_exec_ctx_finish(); GPR_ASSERT(1 == cb_called[1][0]); GPR_ASSERT(1 == cb_called[2][0]); } diff --git a/test/core/iomgr/udp_server_test.c b/test/core/iomgr/udp_server_test.c index 2e44d0abc8b..2e2643749c7 100644 --- a/test/core/iomgr/udp_server_test.c +++ b/test/core/iomgr/udp_server_test.c @@ -50,7 +50,7 @@ static int g_number_of_writes = 0; static int g_number_of_bytes_read = 0; static int g_number_of_orphan_calls = 0; -static void on_read(grpc_exec_ctx *exec_ctx, grpc_fd *emfd, void *user_data) { +static void on_read(grpc_fd *emfd, void *user_data) { char read_buffer[512]; ssize_t byte_count; @@ -61,22 +61,22 @@ static void on_read(grpc_exec_ctx *exec_ctx, grpc_fd *emfd, void *user_data) { g_number_of_reads++; g_number_of_bytes_read += (int)byte_count; - GPR_ASSERT(GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, g_pollset, NULL))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); gpr_mu_unlock(g_mu); } -static void on_write(grpc_exec_ctx *exec_ctx, grpc_fd *emfd, void *user_data) { +static void on_write(grpc_fd *emfd, void *user_data) { gpr_mu_lock(g_mu); g_number_of_writes++; - GPR_ASSERT(GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, g_pollset, NULL))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); gpr_mu_unlock(g_mu); } -static void on_fd_orphaned(grpc_exec_ctx *exec_ctx, grpc_fd *emfd, - grpc_closure *closure, void *user_data) { +static void on_fd_orphaned(grpc_fd *emfd, grpc_closure *closure, + void *user_data) { gpr_log(GPR_INFO, "gRPC FD about to be orphaned: %d", grpc_fd_wrapped_fd(emfd)); g_number_of_orphan_calls++; @@ -126,24 +126,24 @@ static test_socket_factory *test_socket_factory_create(void) { } static void test_no_op(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_udp_server *s = grpc_udp_server_create(NULL); - grpc_udp_server_destroy(&exec_ctx, s, NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_udp_server_destroy(s, NULL); + grpc_exec_ctx_finish(); } static void test_no_op_with_start(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_udp_server *s = grpc_udp_server_create(NULL); LOG_TEST("test_no_op_with_start"); - grpc_udp_server_start(&exec_ctx, s, NULL, 0, NULL); - grpc_udp_server_destroy(&exec_ctx, s, NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_udp_server_start(s, NULL, 0, NULL); + grpc_udp_server_destroy(s, NULL); + grpc_exec_ctx_finish(); } static void test_no_op_with_port(void) { g_number_of_orphan_calls = 0; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; struct sockaddr_in *addr = (struct sockaddr_in *)resolved_addr.addr; grpc_udp_server *s = grpc_udp_server_create(NULL); @@ -155,8 +155,8 @@ static void test_no_op_with_port(void) { GPR_ASSERT(grpc_udp_server_add_port(s, &resolved_addr, on_read, on_write, on_fd_orphaned)); - grpc_udp_server_destroy(&exec_ctx, s, NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_udp_server_destroy(s, NULL); + grpc_exec_ctx_finish(); /* The server had a single FD, which should have been orphaned. */ GPR_ASSERT(g_number_of_orphan_calls == 1); @@ -164,7 +164,7 @@ static void test_no_op_with_port(void) { static void test_no_op_with_port_and_socket_factory(void) { g_number_of_orphan_calls = 0; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; struct sockaddr_in *addr = (struct sockaddr_in *)resolved_addr.addr; @@ -174,7 +174,7 @@ static void test_no_op_with_port_and_socket_factory(void) { grpc_channel_args *channel_args = grpc_channel_args_copy_and_add(NULL, &socket_factory_arg, 1); grpc_udp_server *s = grpc_udp_server_create(channel_args); - grpc_channel_args_destroy(&exec_ctx, channel_args); + grpc_channel_args_destroy(channel_args); LOG_TEST("test_no_op_with_port_and_socket_factory"); @@ -186,8 +186,8 @@ static void test_no_op_with_port_and_socket_factory(void) { GPR_ASSERT(socket_factory->number_of_socket_calls == 1); GPR_ASSERT(socket_factory->number_of_bind_calls == 1); - grpc_udp_server_destroy(&exec_ctx, s, NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_udp_server_destroy(s, NULL); + grpc_exec_ctx_finish(); grpc_socket_factory_unref(&socket_factory->base); /* The server had a single FD, which should have been orphaned. */ @@ -196,7 +196,7 @@ static void test_no_op_with_port_and_socket_factory(void) { static void test_no_op_with_port_and_start(void) { g_number_of_orphan_calls = 0; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; struct sockaddr_in *addr = (struct sockaddr_in *)resolved_addr.addr; grpc_udp_server *s = grpc_udp_server_create(NULL); @@ -208,10 +208,10 @@ static void test_no_op_with_port_and_start(void) { GPR_ASSERT(grpc_udp_server_add_port(s, &resolved_addr, on_read, on_write, on_fd_orphaned)); - grpc_udp_server_start(&exec_ctx, s, NULL, 0, NULL); + grpc_udp_server_start(s, NULL, 0, NULL); - grpc_udp_server_destroy(&exec_ctx, s, NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_udp_server_destroy(s, NULL); + grpc_exec_ctx_finish(); /* The server had a single FD, which is orphaned exactly once in * * grpc_udp_server_destroy. */ @@ -219,7 +219,7 @@ static void test_no_op_with_port_and_start(void) { } static void test_receive(int number_of_clients) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; struct sockaddr_storage *addr = (struct sockaddr_storage *)resolved_addr.addr; int clifd, svrfd; @@ -247,7 +247,7 @@ static void test_receive(int number_of_clients) { GPR_ASSERT(resolved_addr.len <= sizeof(struct sockaddr_storage)); pollsets[0] = g_pollset; - grpc_udp_server_start(&exec_ctx, s, pollsets, 1, NULL); + grpc_udp_server_start(s, pollsets, 1, NULL); gpr_mu_lock(g_mu); @@ -263,13 +263,12 @@ static void test_receive(int number_of_clients) { (socklen_t)resolved_addr.len) == 0); GPR_ASSERT(5 == write(clifd, "hello", 5)); while (g_number_of_reads == number_of_reads_before && - deadline > grpc_exec_ctx_now(&exec_ctx)) { + deadline > grpc_exec_ctx_now()) { grpc_pollset_worker *worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); + "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(g_mu); } GPR_ASSERT(g_number_of_reads == number_of_reads_before + 1); @@ -279,8 +278,8 @@ static void test_receive(int number_of_clients) { gpr_mu_unlock(g_mu); - grpc_udp_server_destroy(&exec_ctx, s, NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_udp_server_destroy(s, NULL); + grpc_exec_ctx_finish(); /* The server had a single FD, which is orphaned exactly once in * * grpc_udp_server_destroy. */ @@ -290,14 +289,13 @@ static void test_receive(int number_of_clients) { GPR_ASSERT(g_number_of_writes > 0); } -static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, - grpc_error *error) { - grpc_pollset_destroy(exec_ctx, p); +static void destroy_pollset(void *p, grpc_error *error) { + grpc_pollset_destroy(p); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); g_pollset = gpr_zalloc(grpc_pollset_size()); @@ -313,8 +311,8 @@ int main(int argc, char **argv) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); - grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + grpc_exec_ctx_finish(); gpr_free(g_pollset); grpc_shutdown(); return 0; diff --git a/test/core/security/credentials_test.c b/test/core/security/credentials_test.c index 34f310142c8..7f15642d947 100644 --- a/test/core/security/credentials_test.c +++ b/test/core/security/credentials_test.c @@ -144,41 +144,39 @@ static grpc_httpcli_response http_response(int status, const char *body) { /* -- Tests. -- */ static void test_empty_md_array(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_credentials_mdelem_array md_array; memset(&md_array, 0, sizeof(md_array)); GPR_ASSERT(md_array.md == NULL); GPR_ASSERT(md_array.size == 0); - grpc_credentials_mdelem_array_destroy(&exec_ctx, &md_array); - grpc_exec_ctx_finish(&exec_ctx); + grpc_credentials_mdelem_array_destroy(&md_array); + grpc_exec_ctx_finish(); } static void test_add_to_empty_md_array(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_credentials_mdelem_array md_array; memset(&md_array, 0, sizeof(md_array)); const char *key = "hello"; const char *value = "there blah blah blah blah blah blah blah"; - grpc_mdelem md = - grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_copied_string(key), - grpc_slice_from_copied_string(value)); + grpc_mdelem md = grpc_mdelem_from_slices( + grpc_slice_from_copied_string(key), grpc_slice_from_copied_string(value)); grpc_credentials_mdelem_array_add(&md_array, md); GPR_ASSERT(md_array.size == 1); GPR_ASSERT(grpc_mdelem_eq(md, md_array.md[0])); - GRPC_MDELEM_UNREF(&exec_ctx, md); - grpc_credentials_mdelem_array_destroy(&exec_ctx, &md_array); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(md); + grpc_credentials_mdelem_array_destroy(&md_array); + grpc_exec_ctx_finish(); } static void test_add_abunch_to_md_array(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_credentials_mdelem_array md_array; memset(&md_array, 0, sizeof(md_array)); const char *key = "hello"; const char *value = "there blah blah blah blah blah blah blah"; - grpc_mdelem md = - grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_copied_string(key), - grpc_slice_from_copied_string(value)); + grpc_mdelem md = grpc_mdelem_from_slices( + grpc_slice_from_copied_string(key), grpc_slice_from_copied_string(value)); size_t num_entries = 1000; for (size_t i = 0; i < num_entries; ++i) { grpc_credentials_mdelem_array_add(&md_array, md); @@ -186,57 +184,56 @@ static void test_add_abunch_to_md_array(void) { for (size_t i = 0; i < num_entries; ++i) { GPR_ASSERT(grpc_mdelem_eq(md_array.md[i], md)); } - GRPC_MDELEM_UNREF(&exec_ctx, md); - grpc_credentials_mdelem_array_destroy(&exec_ctx, &md_array); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(md); + grpc_credentials_mdelem_array_destroy(&md_array); + grpc_exec_ctx_finish(); } static void test_oauth2_token_fetcher_creds_parsing_ok(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = http_response(200, valid_oauth2_json_response); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &exec_ctx, &response, &token_md, &token_lifetime) == - GRPC_CREDENTIALS_OK); + &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_OK); GPR_ASSERT(token_lifetime == 3599 * GPR_MS_PER_SEC); GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDKEY(token_md), "authorization") == 0); GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDVALUE(token_md), "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_") == 0); - GRPC_MDELEM_UNREF(&exec_ctx, token_md); + GRPC_MDELEM_UNREF(token_md); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void test_oauth2_token_fetcher_creds_parsing_bad_http_status(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = http_response(401, valid_oauth2_json_response); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &exec_ctx, &response, &token_md, &token_lifetime) == + &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void test_oauth2_token_fetcher_creds_parsing_empty_http_body(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = http_response(200, ""); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &exec_ctx, &response, &token_md, &token_lifetime) == + &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void test_oauth2_token_fetcher_creds_parsing_invalid_json(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = @@ -245,14 +242,14 @@ static void test_oauth2_token_fetcher_creds_parsing_invalid_json(void) { " \"expires_in\":3599, " " \"token_type\":\"Bearer\""); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &exec_ctx, &response, &token_md, &token_lifetime) == + &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void test_oauth2_token_fetcher_creds_parsing_missing_token(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = http_response(200, @@ -260,14 +257,14 @@ static void test_oauth2_token_fetcher_creds_parsing_missing_token(void) { " \"expires_in\":3599, " " \"token_type\":\"Bearer\"}"); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &exec_ctx, &response, &token_md, &token_lifetime) == + &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void test_oauth2_token_fetcher_creds_parsing_missing_token_type(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = @@ -276,15 +273,15 @@ static void test_oauth2_token_fetcher_creds_parsing_missing_token_type(void) { " \"expires_in\":3599, " "}"); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &exec_ctx, &response, &token_md, &token_lifetime) == + &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void test_oauth2_token_fetcher_creds_parsing_missing_token_lifetime( void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = @@ -292,10 +289,10 @@ static void test_oauth2_token_fetcher_creds_parsing_missing_token_lifetime( "{\"access_token\":\"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_\"," " \"token_type\":\"Bearer\"}"); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &exec_ctx, &response, &token_md, &token_lifetime) == + &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } typedef struct { @@ -332,8 +329,7 @@ static void check_metadata(const expected_md *expected, } } -static void check_request_metadata(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void check_request_metadata(void *arg, grpc_error *error) { request_metadata_state *state = (request_metadata_state *)arg; gpr_log(GPR_INFO, "expected_error: %s", grpc_error_string(state->expected_error)); @@ -354,9 +350,8 @@ static void check_request_metadata(grpc_exec_ctx *exec_ctx, void *arg, state->expected_size, state->md_array.size); GPR_ASSERT(state->md_array.size == state->expected_size); check_metadata(state->expected, &state->md_array); - grpc_credentials_mdelem_array_destroy(exec_ctx, &state->md_array); - grpc_pollset_set_destroy(exec_ctx, - grpc_polling_entity_pollset_set(&state->pollent)); + grpc_credentials_mdelem_array_destroy(&state->md_array); + grpc_pollset_set_destroy(grpc_polling_entity_pollset_set(&state->pollent)); gpr_free(state); } @@ -374,22 +369,21 @@ static request_metadata_state *make_request_metadata_state( return state; } -static void run_request_metadata_test(grpc_exec_ctx *exec_ctx, - grpc_call_credentials *creds, +static void run_request_metadata_test(grpc_call_credentials *creds, grpc_auth_metadata_context auth_md_ctx, request_metadata_state *state) { grpc_error *error = GRPC_ERROR_NONE; if (grpc_call_credentials_get_request_metadata( - exec_ctx, creds, &state->pollent, auth_md_ctx, &state->md_array, + creds, &state->pollent, auth_md_ctx, &state->md_array, &state->on_request_metadata, &error)) { // Synchronous result. Invoke the callback directly. - check_request_metadata(exec_ctx, state, error); + check_request_metadata(state, error); GRPC_ERROR_UNREF(error); } } static void test_google_iam_creds(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; expected_md emd[] = {{GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, test_google_iam_authorization_token}, {GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, @@ -401,13 +395,13 @@ static void test_google_iam_creds(void) { NULL); grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, NULL, NULL}; - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_call_credentials_unref(&exec_ctx, creds); - grpc_exec_ctx_finish(&exec_ctx); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_call_credentials_unref(creds); + grpc_exec_ctx_finish(); } static void test_access_token_creds(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; expected_md emd[] = {{GRPC_AUTHORIZATION_METADATA_KEY, "Bearer blah"}}; request_metadata_state *state = make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); @@ -416,16 +410,15 @@ static void test_access_token_creds(void) { grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, NULL, NULL}; GPR_ASSERT(strcmp(creds->type, GRPC_CALL_CREDENTIALS_TYPE_OAUTH2) == 0); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_call_credentials_unref(&exec_ctx, creds); - grpc_exec_ctx_finish(&exec_ctx); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_call_credentials_unref(creds); + grpc_exec_ctx_finish(); } static grpc_security_status check_channel_oauth2_create_security_connector( - grpc_exec_ctx *exec_ctx, grpc_channel_credentials *c, - grpc_call_credentials *call_creds, const char *target, - const grpc_channel_args *args, grpc_channel_security_connector **sc, - grpc_channel_args **new_args) { + grpc_channel_credentials *c, grpc_call_credentials *call_creds, + const char *target, const grpc_channel_args *args, + grpc_channel_security_connector **sc, grpc_channel_args **new_args) { GPR_ASSERT(strcmp(c->type, "mock") == 0); GPR_ASSERT(call_creds != NULL); GPR_ASSERT(strcmp(call_creds->type, GRPC_CALL_CREDENTIALS_TYPE_OAUTH2) == 0); @@ -433,7 +426,7 @@ static grpc_security_status check_channel_oauth2_create_security_connector( } static void test_channel_oauth2_composite_creds(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_channel_args *new_args; grpc_channel_credentials_vtable vtable = { NULL, check_channel_oauth2_create_security_connector, NULL}; @@ -447,14 +440,14 @@ static void test_channel_oauth2_composite_creds(void) { grpc_channel_credentials_release(channel_creds); grpc_call_credentials_release(oauth2_creds); GPR_ASSERT(grpc_channel_credentials_create_security_connector( - &exec_ctx, channel_oauth2_creds, NULL, NULL, NULL, - &new_args) == GRPC_SECURITY_OK); + channel_oauth2_creds, NULL, NULL, NULL, &new_args) == + GRPC_SECURITY_OK); grpc_channel_credentials_release(channel_oauth2_creds); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void test_oauth2_google_iam_composite_creds(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; expected_md emd[] = { {GRPC_AUTHORIZATION_METADATA_KEY, test_oauth2_bearer_token}, {GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, @@ -466,15 +459,15 @@ static void test_oauth2_google_iam_composite_creds(void) { grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, NULL, NULL}; grpc_call_credentials *oauth2_creds = grpc_md_only_test_credentials_create( - &exec_ctx, "authorization", test_oauth2_bearer_token, 0); + "authorization", test_oauth2_bearer_token, 0); grpc_call_credentials *google_iam_creds = grpc_google_iam_credentials_create( test_google_iam_authorization_token, test_google_iam_authority_selector, NULL); grpc_call_credentials *composite_creds = grpc_composite_call_credentials_create(oauth2_creds, google_iam_creds, NULL); - grpc_call_credentials_unref(&exec_ctx, oauth2_creds); - grpc_call_credentials_unref(&exec_ctx, google_iam_creds); + grpc_call_credentials_unref(oauth2_creds); + grpc_call_credentials_unref(google_iam_creds); GPR_ASSERT( strcmp(composite_creds->type, GRPC_CALL_CREDENTIALS_TYPE_COMPOSITE) == 0); const grpc_call_credentials_array *creds_array = @@ -484,17 +477,16 @@ static void test_oauth2_google_iam_composite_creds(void) { GRPC_CALL_CREDENTIALS_TYPE_OAUTH2) == 0); GPR_ASSERT(strcmp(creds_array->creds_array[1]->type, GRPC_CALL_CREDENTIALS_TYPE_IAM) == 0); - run_request_metadata_test(&exec_ctx, composite_creds, auth_md_ctx, state); - grpc_call_credentials_unref(&exec_ctx, composite_creds); - grpc_exec_ctx_finish(&exec_ctx); + run_request_metadata_test(composite_creds, auth_md_ctx, state); + grpc_call_credentials_unref(composite_creds); + grpc_exec_ctx_finish(); } static grpc_security_status check_channel_oauth2_google_iam_create_security_connector( - grpc_exec_ctx *exec_ctx, grpc_channel_credentials *c, - grpc_call_credentials *call_creds, const char *target, - const grpc_channel_args *args, grpc_channel_security_connector **sc, - grpc_channel_args **new_args) { + grpc_channel_credentials *c, grpc_call_credentials *call_creds, + const char *target, const grpc_channel_args *args, + grpc_channel_security_connector **sc, grpc_channel_args **new_args) { const grpc_call_credentials_array *creds_array; GPR_ASSERT(strcmp(c->type, "mock") == 0); GPR_ASSERT(call_creds != NULL); @@ -509,7 +501,7 @@ check_channel_oauth2_google_iam_create_security_connector( } static void test_channel_oauth2_google_iam_composite_creds(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_channel_args *new_args; grpc_channel_credentials_vtable vtable = { NULL, check_channel_oauth2_google_iam_create_security_connector, NULL}; @@ -532,11 +524,11 @@ static void test_channel_oauth2_google_iam_composite_creds(void) { grpc_call_credentials_release(google_iam_creds); GPR_ASSERT(grpc_channel_credentials_create_security_connector( - &exec_ctx, channel_oauth2_iam_creds, NULL, NULL, NULL, - &new_args) == GRPC_SECURITY_OK); + channel_oauth2_iam_creds, NULL, NULL, NULL, &new_args) == + GRPC_SECURITY_OK); grpc_channel_credentials_release(channel_oauth2_iam_creds); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void validate_compute_engine_http_request( @@ -553,35 +545,32 @@ static void validate_compute_engine_http_request( } static int compute_engine_httpcli_get_success_override( - grpc_exec_ctx *exec_ctx, const grpc_httpcli_request *request, - grpc_millis deadline, grpc_closure *on_done, - grpc_httpcli_response *response) { + const grpc_httpcli_request *request, grpc_millis deadline, + grpc_closure *on_done, grpc_httpcli_response *response) { validate_compute_engine_http_request(request); *response = http_response(200, valid_oauth2_json_response); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } static int compute_engine_httpcli_get_failure_override( - grpc_exec_ctx *exec_ctx, const grpc_httpcli_request *request, - grpc_millis deadline, grpc_closure *on_done, - grpc_httpcli_response *response) { + const grpc_httpcli_request *request, grpc_millis deadline, + grpc_closure *on_done, grpc_httpcli_response *response) { validate_compute_engine_http_request(request); *response = http_response(403, "Not Authorized."); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } static int httpcli_post_should_not_be_called( - grpc_exec_ctx *exec_ctx, const grpc_httpcli_request *request, - const char *body_bytes, size_t body_size, grpc_millis deadline, - grpc_closure *on_done, grpc_httpcli_response *response) { + const grpc_httpcli_request *request, const char *body_bytes, + size_t body_size, grpc_millis deadline, grpc_closure *on_done, + grpc_httpcli_response *response) { GPR_ASSERT("HTTP POST should not be called" == NULL); return 1; } -static int httpcli_get_should_not_be_called(grpc_exec_ctx *exec_ctx, - const grpc_httpcli_request *request, +static int httpcli_get_should_not_be_called(const grpc_httpcli_request *request, grpc_millis deadline, grpc_closure *on_done, grpc_httpcli_response *response) { @@ -590,7 +579,7 @@ static int httpcli_get_should_not_be_called(grpc_exec_ctx *exec_ctx, } static void test_compute_engine_creds_success(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; expected_md emd[] = { {"authorization", "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_"}}; grpc_call_credentials *creds = @@ -603,24 +592,24 @@ static void test_compute_engine_creds_success(void) { make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); grpc_httpcli_set_override(compute_engine_httpcli_get_success_override, httpcli_post_should_not_be_called); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_exec_ctx_flush(&exec_ctx); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_exec_ctx_flush(); /* Second request: the cached token should be served directly. */ state = make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_exec_ctx_flush(&exec_ctx); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_exec_ctx_flush(); - grpc_call_credentials_unref(&exec_ctx, creds); + grpc_call_credentials_unref(creds); grpc_httpcli_set_override(NULL, NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void test_compute_engine_creds_failure(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; request_metadata_state *state = make_request_metadata_state( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Error occured when fetching oauth2 token."), @@ -631,10 +620,10 @@ static void test_compute_engine_creds_failure(void) { grpc_google_compute_engine_credentials_create(NULL); grpc_httpcli_set_override(compute_engine_httpcli_get_failure_override, httpcli_post_should_not_be_called); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_call_credentials_unref(&exec_ctx, creds); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_call_credentials_unref(creds); grpc_httpcli_set_override(NULL, NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void validate_refresh_token_http_request( @@ -661,27 +650,27 @@ static void validate_refresh_token_http_request( } static int refresh_token_httpcli_post_success( - grpc_exec_ctx *exec_ctx, const grpc_httpcli_request *request, - const char *body, size_t body_size, grpc_millis deadline, - grpc_closure *on_done, grpc_httpcli_response *response) { + const grpc_httpcli_request *request, const char *body, size_t body_size, + grpc_millis deadline, grpc_closure *on_done, + grpc_httpcli_response *response) { validate_refresh_token_http_request(request, body, body_size); *response = http_response(200, valid_oauth2_json_response); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } static int refresh_token_httpcli_post_failure( - grpc_exec_ctx *exec_ctx, const grpc_httpcli_request *request, - const char *body, size_t body_size, grpc_millis deadline, - grpc_closure *on_done, grpc_httpcli_response *response) { + const grpc_httpcli_request *request, const char *body, size_t body_size, + grpc_millis deadline, grpc_closure *on_done, + grpc_httpcli_response *response) { validate_refresh_token_http_request(request, body, body_size); *response = http_response(403, "Not Authorized."); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } static void test_refresh_token_creds_success(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; expected_md emd[] = { {"authorization", "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_"}}; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, NULL, @@ -694,24 +683,24 @@ static void test_refresh_token_creds_success(void) { make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); grpc_httpcli_set_override(httpcli_get_should_not_be_called, refresh_token_httpcli_post_success); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_exec_ctx_flush(&exec_ctx); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_exec_ctx_flush(); /* Second request: the cached token should be served directly. */ state = make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_exec_ctx_flush(&exec_ctx); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_exec_ctx_flush(); - grpc_call_credentials_unref(&exec_ctx, creds); + grpc_call_credentials_unref(creds); grpc_httpcli_set_override(NULL, NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void test_refresh_token_creds_failure(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; request_metadata_state *state = make_request_metadata_state( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Error occured when fetching oauth2 token."), @@ -722,10 +711,10 @@ static void test_refresh_token_creds_failure(void) { test_refresh_token_str, NULL); grpc_httpcli_set_override(httpcli_get_should_not_be_called, refresh_token_httpcli_post_failure); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_call_credentials_unref(&exec_ctx, creds); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_call_credentials_unref(creds); grpc_httpcli_set_override(NULL, NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void validate_jwt_encode_and_sign_params( @@ -815,7 +804,7 @@ static void test_jwt_creds_lifetime(void) { static void test_jwt_creds_success(void) { char *json_key_string = test_json_key_str(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, NULL, NULL}; char *expected_md_value; @@ -829,16 +818,16 @@ static void test_jwt_creds_success(void) { request_metadata_state *state = make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_success); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_exec_ctx_flush(&exec_ctx); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_exec_ctx_flush(); /* Second request: the cached token should be served directly. */ state = make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); grpc_jwt_encode_and_sign_set_override( encode_and_sign_jwt_should_not_be_called); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_exec_ctx_flush(&exec_ctx); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_exec_ctx_flush(); /* Third request: Different service url so jwt_encode_and_sign should be called again (no caching). */ @@ -846,19 +835,19 @@ static void test_jwt_creds_success(void) { make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); auth_md_ctx.service_url = other_test_service_url; grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_success); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_exec_ctx_flush(&exec_ctx); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_exec_ctx_flush(); - grpc_call_credentials_unref(&exec_ctx, creds); + grpc_call_credentials_unref(creds); gpr_free(json_key_string); gpr_free(expected_md_value); grpc_jwt_encode_and_sign_set_override(NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void test_jwt_creds_signing_failure(void) { char *json_key_string = test_json_key_str(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, NULL, NULL}; request_metadata_state *state = make_request_metadata_state( @@ -868,12 +857,12 @@ static void test_jwt_creds_signing_failure(void) { json_key_string, grpc_max_auth_token_lifetime(), NULL); grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_failure); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); + run_request_metadata_test(creds, auth_md_ctx, state); gpr_free(json_key_string); - grpc_call_credentials_unref(&exec_ctx, creds); + grpc_call_credentials_unref(creds); grpc_jwt_encode_and_sign_set_override(NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void set_google_default_creds_env_var_with_file_contents( @@ -890,7 +879,7 @@ static void set_google_default_creds_env_var_with_file_contents( } static void test_google_default_creds_auth_key(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_service_account_jwt_access_credentials *jwt; grpc_composite_channel_credentials *creds; char *json_key = test_json_key_str(); @@ -906,13 +895,13 @@ static void test_google_default_creds_auth_key(void) { strcmp(jwt->key.client_id, "777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent.com") == 0); - grpc_channel_credentials_unref(&exec_ctx, &creds->base); + grpc_channel_credentials_unref(&creds->base); gpr_setenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR, ""); /* Reset. */ - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void test_google_default_creds_refresh_token(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_google_refresh_token_credentials *refresh; grpc_composite_channel_credentials *creds; grpc_flush_cached_google_default_credentials(); @@ -924,15 +913,14 @@ static void test_google_default_creds_refresh_token(void) { refresh = (grpc_google_refresh_token_credentials *)creds->call_creds; GPR_ASSERT(strcmp(refresh->refresh_token.client_id, "32555999999.apps.googleusercontent.com") == 0); - grpc_channel_credentials_unref(&exec_ctx, &creds->base); + grpc_channel_credentials_unref(&creds->base); gpr_setenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR, ""); /* Reset. */ - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static int default_creds_gce_detection_httpcli_get_success_override( - grpc_exec_ctx *exec_ctx, const grpc_httpcli_request *request, - grpc_millis deadline, grpc_closure *on_done, - grpc_httpcli_response *response) { + const grpc_httpcli_request *request, grpc_millis deadline, + grpc_closure *on_done, grpc_httpcli_response *response) { *response = http_response(200, ""); grpc_http_header *headers = gpr_malloc(sizeof(*headers) * 1); headers[0].key = gpr_strdup("Metadata-Flavor"); @@ -941,14 +929,14 @@ static int default_creds_gce_detection_httpcli_get_success_override( response->hdrs = headers; GPR_ASSERT(strcmp(request->http.path, "/") == 0); GPR_ASSERT(strcmp(request->host, "metadata.google.internal") == 0); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } static char *null_well_known_creds_path_getter(void) { return NULL; } static void test_google_default_creds_gce(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; expected_md emd[] = { {"authorization", "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_"}}; request_metadata_state *state = @@ -973,8 +961,8 @@ static void test_google_default_creds_gce(void) { GPR_ASSERT(creds->call_creds != NULL); grpc_httpcli_set_override(compute_engine_httpcli_get_success_override, httpcli_post_should_not_be_called); - run_request_metadata_test(&exec_ctx, creds->call_creds, auth_md_ctx, state); - grpc_exec_ctx_flush(&exec_ctx); + run_request_metadata_test(creds->call_creds, auth_md_ctx, state); + grpc_exec_ctx_flush(); /* Check that we get a cached creds if we call grpc_google_default_credentials_create again. @@ -986,22 +974,21 @@ static void test_google_default_creds_gce(void) { GPR_ASSERT(cached_creds == &creds->base); /* Cleanup. */ - grpc_channel_credentials_unref(&exec_ctx, cached_creds); - grpc_channel_credentials_unref(&exec_ctx, &creds->base); + grpc_channel_credentials_unref(cached_creds); + grpc_channel_credentials_unref(&creds->base); grpc_httpcli_set_override(NULL, NULL); grpc_override_well_known_credentials_path_getter(NULL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static int default_creds_gce_detection_httpcli_get_failure_override( - grpc_exec_ctx *exec_ctx, const grpc_httpcli_request *request, - grpc_millis deadline, grpc_closure *on_done, - grpc_httpcli_response *response) { + const grpc_httpcli_request *request, grpc_millis deadline, + grpc_closure *on_done, grpc_httpcli_response *response) { /* No magic header. */ GPR_ASSERT(strcmp(request->http.path, "/") == 0); GPR_ASSERT(strcmp(request->host, "metadata.google.internal") == 0); *response = http_response(200, ""); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } @@ -1085,7 +1072,7 @@ static void plugin_destroy(void *state) { static void test_metadata_plugin_success(void) { plugin_state state = PLUGIN_INITIAL_STATE; grpc_metadata_credentials_plugin plugin; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, NULL, NULL}; request_metadata_state *md_state = make_request_metadata_state( @@ -1098,17 +1085,17 @@ static void test_metadata_plugin_success(void) { grpc_call_credentials *creds = grpc_metadata_credentials_create_from_plugin(plugin, NULL); GPR_ASSERT(state == PLUGIN_INITIAL_STATE); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, md_state); + run_request_metadata_test(creds, auth_md_ctx, md_state); GPR_ASSERT(state == PLUGIN_GET_METADATA_CALLED_STATE); - grpc_call_credentials_unref(&exec_ctx, creds); - grpc_exec_ctx_finish(&exec_ctx); + grpc_call_credentials_unref(creds); + grpc_exec_ctx_finish(); GPR_ASSERT(state == PLUGIN_DESTROY_CALLED_STATE); } static void test_metadata_plugin_failure(void) { plugin_state state = PLUGIN_INITIAL_STATE; grpc_metadata_credentials_plugin plugin; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, NULL, NULL}; char *expected_error; @@ -1126,10 +1113,10 @@ static void test_metadata_plugin_failure(void) { grpc_call_credentials *creds = grpc_metadata_credentials_create_from_plugin(plugin, NULL); GPR_ASSERT(state == PLUGIN_INITIAL_STATE); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, md_state); + run_request_metadata_test(creds, auth_md_ctx, md_state); GPR_ASSERT(state == PLUGIN_GET_METADATA_CALLED_STATE); - grpc_call_credentials_unref(&exec_ctx, creds); - grpc_exec_ctx_finish(&exec_ctx); + grpc_call_credentials_unref(creds); + grpc_exec_ctx_finish(); GPR_ASSERT(state == PLUGIN_DESTROY_CALLED_STATE); } @@ -1150,7 +1137,7 @@ static void test_get_well_known_google_credentials_file_path(void) { } static void test_channel_creds_duplicate_without_call_creds(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_channel_credentials *channel_creds = grpc_fake_transport_security_credentials_create(); @@ -1159,23 +1146,23 @@ static void test_channel_creds_duplicate_without_call_creds(void) { grpc_channel_credentials_duplicate_without_call_credentials( channel_creds); GPR_ASSERT(dup == channel_creds); - grpc_channel_credentials_unref(&exec_ctx, dup); + grpc_channel_credentials_unref(dup); grpc_call_credentials *call_creds = grpc_access_token_credentials_create("blah", NULL); grpc_channel_credentials *composite_creds = grpc_composite_channel_credentials_create(channel_creds, call_creds, NULL); - grpc_call_credentials_unref(&exec_ctx, call_creds); + grpc_call_credentials_unref(call_creds); dup = grpc_channel_credentials_duplicate_without_call_credentials( composite_creds); GPR_ASSERT(dup == channel_creds); - grpc_channel_credentials_unref(&exec_ctx, dup); + grpc_channel_credentials_unref(dup); - grpc_channel_credentials_unref(&exec_ctx, channel_creds); - grpc_channel_credentials_unref(&exec_ctx, composite_creds); + grpc_channel_credentials_unref(channel_creds); + grpc_channel_credentials_unref(composite_creds); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } int main(int argc, char **argv) { diff --git a/test/core/security/json_token_test.c b/test/core/security/json_token_test.c index 6573f70e724..3e410f44b91 100644 --- a/test/core/security/json_token_test.c +++ b/test/core/security/json_token_test.c @@ -206,7 +206,7 @@ static void test_parse_json_key_failure_no_private_key(void) { static grpc_json *parse_json_part_from_jwt(const char *str, size_t len, char **scratchpad) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; char *b64; char *decoded; grpc_json *json; @@ -214,7 +214,7 @@ static grpc_json *parse_json_part_from_jwt(const char *str, size_t len, b64 = gpr_malloc(len + 1); strncpy(b64, str, len); b64[len] = '\0'; - slice = grpc_base64_decode(&exec_ctx, b64, 1); + slice = grpc_base64_decode(b64, 1); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(slice)); decoded = gpr_malloc(GRPC_SLICE_LENGTH(slice) + 1); strncpy(decoded, (const char *)GRPC_SLICE_START_PTR(slice), @@ -224,7 +224,7 @@ static grpc_json *parse_json_part_from_jwt(const char *str, size_t len, gpr_free(b64); *scratchpad = decoded; grpc_slice_unref(slice); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return json; } @@ -326,12 +326,12 @@ static void check_jwt_claim(grpc_json *claim, const char *expected_audience, static void check_jwt_signature(const char *b64_signature, RSA *rsa_key, const char *signed_data, size_t signed_data_size) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; EVP_MD_CTX *md_ctx = EVP_MD_CTX_create(); EVP_PKEY *key = EVP_PKEY_new(); - grpc_slice sig = grpc_base64_decode(&exec_ctx, b64_signature, 1); + grpc_slice sig = grpc_base64_decode(b64_signature, 1); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(sig)); GPR_ASSERT(GRPC_SLICE_LENGTH(sig) == 128); @@ -345,11 +345,11 @@ static void check_jwt_signature(const char *b64_signature, RSA *rsa_key, GPR_ASSERT(EVP_DigestVerifyFinal(md_ctx, GRPC_SLICE_START_PTR(sig), GRPC_SLICE_LENGTH(sig)) == 1); - grpc_slice_unref_internal(&exec_ctx, sig); + grpc_slice_unref_internal(sig); if (key != NULL) EVP_PKEY_free(key); if (md_ctx != NULL) EVP_MD_CTX_destroy(md_ctx); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static char *service_account_creds_jwt_encode_and_sign( diff --git a/test/core/security/jwt_verifier_test.c b/test/core/security/jwt_verifier_test.c index a4bfe0130ee..9fffa4d90c5 100644 --- a/test/core/security/jwt_verifier_test.c +++ b/test/core/security/jwt_verifier_test.c @@ -209,8 +209,8 @@ static void test_claims_success(void) { grpc_json *json = grpc_json_parse_string_with_len( (char *)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); GPR_ASSERT(json != NULL); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - claims = grpc_jwt_claims_from_json(&exec_ctx, json, s); + exec_ctx = GRPC_EXEC_CTX_INIT; + claims = grpc_jwt_claims_from_json(json, s); GPR_ASSERT(claims != NULL); GPR_ASSERT(grpc_jwt_claims_json(claims) == json); GPR_ASSERT(strcmp(grpc_jwt_claims_audience(claims), "https://foo.com") == 0); @@ -219,8 +219,8 @@ static void test_claims_success(void) { GPR_ASSERT(strcmp(grpc_jwt_claims_id(claims), "jwtuniqueid") == 0); GPR_ASSERT(grpc_jwt_claims_check(claims, "https://foo.com") == GRPC_JWT_VERIFIER_OK); - grpc_jwt_claims_destroy(&exec_ctx, claims); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_claims_destroy(claims); + grpc_exec_ctx_finish(); } static void test_expired_claims_failure(void) { @@ -232,8 +232,8 @@ static void test_expired_claims_failure(void) { gpr_timespec exp_exp = {120, 0, GPR_CLOCK_REALTIME}; gpr_timespec exp_nbf = {60, 0, GPR_CLOCK_REALTIME}; GPR_ASSERT(json != NULL); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - claims = grpc_jwt_claims_from_json(&exec_ctx, json, s); + exec_ctx = GRPC_EXEC_CTX_INIT; + claims = grpc_jwt_claims_from_json(json, s); GPR_ASSERT(claims != NULL); GPR_ASSERT(grpc_jwt_claims_json(claims) == json); GPR_ASSERT(strcmp(grpc_jwt_claims_audience(claims), "https://foo.com") == 0); @@ -246,17 +246,17 @@ static void test_expired_claims_failure(void) { GPR_ASSERT(grpc_jwt_claims_check(claims, "https://foo.com") == GRPC_JWT_VERIFIER_TIME_CONSTRAINT_FAILURE); - grpc_jwt_claims_destroy(&exec_ctx, claims); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_claims_destroy(claims); + grpc_exec_ctx_finish(); } static void test_invalid_claims_failure(void) { grpc_slice s = grpc_slice_from_copied_string(invalid_claims); grpc_json *json = grpc_json_parse_string_with_len( (char *)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT(grpc_jwt_claims_from_json(&exec_ctx, json, s) == NULL); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT(grpc_jwt_claims_from_json(json, s) == NULL); + grpc_exec_ctx_finish(); } static void test_bad_audience_claims_failure(void) { @@ -265,13 +265,13 @@ static void test_bad_audience_claims_failure(void) { grpc_json *json = grpc_json_parse_string_with_len( (char *)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); GPR_ASSERT(json != NULL); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - claims = grpc_jwt_claims_from_json(&exec_ctx, json, s); + exec_ctx = GRPC_EXEC_CTX_INIT; + claims = grpc_jwt_claims_from_json(json, s); GPR_ASSERT(claims != NULL); GPR_ASSERT(grpc_jwt_claims_check(claims, "https://bar.com") == GRPC_JWT_VERIFIER_BAD_AUDIENCE); - grpc_jwt_claims_destroy(&exec_ctx, claims); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_claims_destroy(claims); + grpc_exec_ctx_finish(); } static void test_bad_subject_claims_failure(void) { @@ -280,13 +280,13 @@ static void test_bad_subject_claims_failure(void) { grpc_json *json = grpc_json_parse_string_with_len( (char *)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); GPR_ASSERT(json != NULL); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - claims = grpc_jwt_claims_from_json(&exec_ctx, json, s); + exec_ctx = GRPC_EXEC_CTX_INIT; + claims = grpc_jwt_claims_from_json(json, s); GPR_ASSERT(claims != NULL); GPR_ASSERT(grpc_jwt_claims_check(claims, "https://foo.com") == GRPC_JWT_VERIFIER_BAD_SUBJECT); - grpc_jwt_claims_destroy(&exec_ctx, claims); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_claims_destroy(claims); + grpc_exec_ctx_finish(); } static char *json_key_str(const char *last_part) { @@ -323,17 +323,16 @@ static grpc_httpcli_response http_response(int status, char *body) { } static int httpcli_post_should_not_be_called( - grpc_exec_ctx *exec_ctx, const grpc_httpcli_request *request, - const char *body_bytes, size_t body_size, grpc_millis deadline, - grpc_closure *on_done, grpc_httpcli_response *response) { + const grpc_httpcli_request *request, const char *body_bytes, + size_t body_size, grpc_millis deadline, grpc_closure *on_done, + grpc_httpcli_response *response) { GPR_ASSERT("HTTP POST should not be called" == NULL); return 1; } static int httpcli_get_google_keys_for_email( - grpc_exec_ctx *exec_ctx, const grpc_httpcli_request *request, - grpc_millis deadline, grpc_closure *on_done, - grpc_httpcli_response *response) { + const grpc_httpcli_request *request, grpc_millis deadline, + grpc_closure *on_done, grpc_httpcli_response *response) { *response = http_response(200, good_google_email_keys()); GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); GPR_ASSERT(strcmp(request->host, "www.googleapis.com") == 0); @@ -341,22 +340,22 @@ static int httpcli_get_google_keys_for_email( "/robot/v1/metadata/x509/" "777-abaslkan11hlb6nmim3bpspl31ud@developer." "gserviceaccount.com") == 0); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } -static void on_verification_success(grpc_exec_ctx *exec_ctx, void *user_data, +static void on_verification_success(void *user_data, grpc_jwt_verifier_status status, grpc_jwt_claims *claims) { GPR_ASSERT(status == GRPC_JWT_VERIFIER_OK); GPR_ASSERT(claims != NULL); GPR_ASSERT(user_data == (void *)expected_user_data); GPR_ASSERT(strcmp(grpc_jwt_claims_audience(claims), expected_audience) == 0); - grpc_jwt_claims_destroy(exec_ctx, claims); + grpc_jwt_claims_destroy(claims); } static void test_jwt_verifier_google_email_issuer_success(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_jwt_verifier *verifier = grpc_jwt_verifier_create(NULL, 0); char *jwt = NULL; char *key_str = json_key_str(json_key_str_part3_for_google_email_issuer); @@ -369,28 +368,27 @@ static void test_jwt_verifier_google_email_issuer_success(void) { NULL); grpc_auth_json_key_destruct(&key); GPR_ASSERT(jwt != NULL); - grpc_jwt_verifier_verify(&exec_ctx, verifier, NULL, jwt, expected_audience, + grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, on_verification_success, (void *)expected_user_data); - grpc_jwt_verifier_destroy(&exec_ctx, verifier); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_verifier_destroy(verifier); + grpc_exec_ctx_finish(); gpr_free(jwt); grpc_httpcli_set_override(NULL, NULL); } static int httpcli_get_custom_keys_for_email( - grpc_exec_ctx *exec_ctx, const grpc_httpcli_request *request, - grpc_millis deadline, grpc_closure *on_done, - grpc_httpcli_response *response) { + const grpc_httpcli_request *request, grpc_millis deadline, + grpc_closure *on_done, grpc_httpcli_response *response) { *response = http_response(200, gpr_strdup(good_jwk_set)); GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); GPR_ASSERT(strcmp(request->host, "keys.bar.com") == 0); GPR_ASSERT(strcmp(request->http.path, "/jwk/foo@bar.com") == 0); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } static void test_jwt_verifier_custom_email_issuer_success(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_jwt_verifier *verifier = grpc_jwt_verifier_create(&custom_mapping, 1); char *jwt = NULL; char *key_str = json_key_str(json_key_str_part3_for_custom_email_issuer); @@ -403,28 +401,26 @@ static void test_jwt_verifier_custom_email_issuer_success(void) { NULL); grpc_auth_json_key_destruct(&key); GPR_ASSERT(jwt != NULL); - grpc_jwt_verifier_verify(&exec_ctx, verifier, NULL, jwt, expected_audience, + grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, on_verification_success, (void *)expected_user_data); - grpc_jwt_verifier_destroy(&exec_ctx, verifier); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_verifier_destroy(verifier); + grpc_exec_ctx_finish(); gpr_free(jwt); grpc_httpcli_set_override(NULL, NULL); } -static int httpcli_get_jwk_set(grpc_exec_ctx *exec_ctx, - const grpc_httpcli_request *request, +static int httpcli_get_jwk_set(const grpc_httpcli_request *request, grpc_millis deadline, grpc_closure *on_done, grpc_httpcli_response *response) { *response = http_response(200, gpr_strdup(good_jwk_set)); GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); GPR_ASSERT(strcmp(request->host, "www.googleapis.com") == 0); GPR_ASSERT(strcmp(request->http.path, "/oauth2/v3/certs") == 0); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } -static int httpcli_get_openid_config(grpc_exec_ctx *exec_ctx, - const grpc_httpcli_request *request, +static int httpcli_get_openid_config(const grpc_httpcli_request *request, grpc_millis deadline, grpc_closure *on_done, grpc_httpcli_response *response) { @@ -434,12 +430,12 @@ static int httpcli_get_openid_config(grpc_exec_ctx *exec_ctx, GPR_ASSERT(strcmp(request->http.path, GRPC_OPENID_CONFIG_URL_SUFFIX) == 0); grpc_httpcli_set_override(httpcli_get_jwk_set, httpcli_post_should_not_be_called); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } static void test_jwt_verifier_url_issuer_success(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_jwt_verifier *verifier = grpc_jwt_verifier_create(NULL, 0); char *jwt = NULL; char *key_str = json_key_str(json_key_str_part3_for_url_issuer); @@ -452,16 +448,15 @@ static void test_jwt_verifier_url_issuer_success(void) { NULL); grpc_auth_json_key_destruct(&key); GPR_ASSERT(jwt != NULL); - grpc_jwt_verifier_verify(&exec_ctx, verifier, NULL, jwt, expected_audience, + grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, on_verification_success, (void *)expected_user_data); - grpc_jwt_verifier_destroy(&exec_ctx, verifier); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_verifier_destroy(verifier); + grpc_exec_ctx_finish(); gpr_free(jwt); grpc_httpcli_set_override(NULL, NULL); } -static void on_verification_key_retrieval_error(grpc_exec_ctx *exec_ctx, - void *user_data, +static void on_verification_key_retrieval_error(void *user_data, grpc_jwt_verifier_status status, grpc_jwt_claims *claims) { GPR_ASSERT(status == GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR); @@ -469,18 +464,17 @@ static void on_verification_key_retrieval_error(grpc_exec_ctx *exec_ctx, GPR_ASSERT(user_data == (void *)expected_user_data); } -static int httpcli_get_bad_json(grpc_exec_ctx *exec_ctx, - const grpc_httpcli_request *request, +static int httpcli_get_bad_json(const grpc_httpcli_request *request, grpc_millis deadline, grpc_closure *on_done, grpc_httpcli_response *response) { *response = http_response(200, gpr_strdup("{\"bad\": \"stuff\"}")); GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } static void test_jwt_verifier_url_issuer_bad_config(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_jwt_verifier *verifier = grpc_jwt_verifier_create(NULL, 0); char *jwt = NULL; char *key_str = json_key_str(json_key_str_part3_for_url_issuer); @@ -493,17 +487,17 @@ static void test_jwt_verifier_url_issuer_bad_config(void) { NULL); grpc_auth_json_key_destruct(&key); GPR_ASSERT(jwt != NULL); - grpc_jwt_verifier_verify(&exec_ctx, verifier, NULL, jwt, expected_audience, + grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, on_verification_key_retrieval_error, (void *)expected_user_data); - grpc_jwt_verifier_destroy(&exec_ctx, verifier); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_verifier_destroy(verifier); + grpc_exec_ctx_finish(); gpr_free(jwt); grpc_httpcli_set_override(NULL, NULL); } static void test_jwt_verifier_bad_json_key(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_jwt_verifier *verifier = grpc_jwt_verifier_create(NULL, 0); char *jwt = NULL; char *key_str = json_key_str(json_key_str_part3_for_google_email_issuer); @@ -516,11 +510,11 @@ static void test_jwt_verifier_bad_json_key(void) { NULL); grpc_auth_json_key_destruct(&key); GPR_ASSERT(jwt != NULL); - grpc_jwt_verifier_verify(&exec_ctx, verifier, NULL, jwt, expected_audience, + grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, on_verification_key_retrieval_error, (void *)expected_user_data); - grpc_jwt_verifier_destroy(&exec_ctx, verifier); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_verifier_destroy(verifier); + grpc_exec_ctx_finish(); gpr_free(jwt); grpc_httpcli_set_override(NULL, NULL); } @@ -532,9 +526,9 @@ static void corrupt_jwt_sig(char *jwt) { char *last_dot = strrchr(jwt, '.'); GPR_ASSERT(last_dot != NULL); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - sig = grpc_base64_decode(&exec_ctx, last_dot + 1, 1); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + sig = grpc_base64_decode(last_dot + 1, 1); + grpc_exec_ctx_finish(); } GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(sig)); sig_bytes = GRPC_SLICE_START_PTR(sig); @@ -546,8 +540,7 @@ static void corrupt_jwt_sig(char *jwt) { grpc_slice_unref(sig); } -static void on_verification_bad_signature(grpc_exec_ctx *exec_ctx, - void *user_data, +static void on_verification_bad_signature(void *user_data, grpc_jwt_verifier_status status, grpc_jwt_claims *claims) { GPR_ASSERT(status == GRPC_JWT_VERIFIER_BAD_SIGNATURE); @@ -556,7 +549,7 @@ static void on_verification_bad_signature(grpc_exec_ctx *exec_ctx, } static void test_jwt_verifier_bad_signature(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_jwt_verifier *verifier = grpc_jwt_verifier_create(NULL, 0); char *jwt = NULL; char *key_str = json_key_str(json_key_str_part3_for_url_issuer); @@ -570,17 +563,16 @@ static void test_jwt_verifier_bad_signature(void) { grpc_auth_json_key_destruct(&key); corrupt_jwt_sig(jwt); GPR_ASSERT(jwt != NULL); - grpc_jwt_verifier_verify(&exec_ctx, verifier, NULL, jwt, expected_audience, + grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, on_verification_bad_signature, (void *)expected_user_data); gpr_free(jwt); - grpc_jwt_verifier_destroy(&exec_ctx, verifier); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_verifier_destroy(verifier); + grpc_exec_ctx_finish(); grpc_httpcli_set_override(NULL, NULL); } -static int httpcli_get_should_not_be_called(grpc_exec_ctx *exec_ctx, - const grpc_httpcli_request *request, +static int httpcli_get_should_not_be_called(const grpc_httpcli_request *request, grpc_millis deadline, grpc_closure *on_done, grpc_httpcli_response *response) { @@ -588,7 +580,7 @@ static int httpcli_get_should_not_be_called(grpc_exec_ctx *exec_ctx, return 1; } -static void on_verification_bad_format(grpc_exec_ctx *exec_ctx, void *user_data, +static void on_verification_bad_format(void *user_data, grpc_jwt_verifier_status status, grpc_jwt_claims *claims) { GPR_ASSERT(status == GRPC_JWT_VERIFIER_BAD_FORMAT); @@ -597,15 +589,15 @@ static void on_verification_bad_format(grpc_exec_ctx *exec_ctx, void *user_data, } static void test_jwt_verifier_bad_format(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_jwt_verifier *verifier = grpc_jwt_verifier_create(NULL, 0); grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); - grpc_jwt_verifier_verify(&exec_ctx, verifier, NULL, "bad jwt", - expected_audience, on_verification_bad_format, + grpc_jwt_verifier_verify(verifier, NULL, "bad jwt", expected_audience, + on_verification_bad_format, (void *)expected_user_data); - grpc_jwt_verifier_destroy(&exec_ctx, verifier); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_verifier_destroy(verifier); + grpc_exec_ctx_finish(); grpc_httpcli_set_override(NULL, NULL); } diff --git a/test/core/security/oauth2_utils.c b/test/core/security/oauth2_utils.cc similarity index 76% rename from test/core/security/oauth2_utils.c rename to test/core/security/oauth2_utils.cc index 73d6c5bc7dc..3282701cfa7 100644 --- a/test/core/security/oauth2_utils.c +++ b/test/core/security/oauth2_utils.cc @@ -39,8 +39,7 @@ typedef struct { grpc_closure closure; } oauth2_request; -static void on_oauth2_response(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void on_oauth2_response(void *arg, grpc_error *error) { oauth2_request *request = (oauth2_request *)arg; char *token = NULL; grpc_slice token_slice; @@ -54,25 +53,23 @@ static void on_oauth2_response(grpc_exec_ctx *exec_ctx, void *arg, GRPC_SLICE_LENGTH(token_slice)); token[GRPC_SLICE_LENGTH(token_slice)] = '\0'; } - grpc_credentials_mdelem_array_destroy(exec_ctx, &request->md_array); + grpc_credentials_mdelem_array_destroy(&request->md_array); gpr_mu_lock(request->mu); request->is_done = true; request->token = token; GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&request->pops), - NULL)); + grpc_pollset_kick(grpc_polling_entity_pollset(&request->pops), NULL)); gpr_mu_unlock(request->mu); } -static void do_nothing(grpc_exec_ctx *exec_ctx, void *unused, - grpc_error *error) {} +static void do_nothing(void *unused, grpc_error *error) {} char *grpc_test_fetch_oauth2_token_with_credentials( grpc_call_credentials *creds) { oauth2_request request; memset(&request, 0, sizeof(request)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_closure do_nothing_closure; grpc_auth_metadata_context null_ctx = {"", "", NULL, NULL}; @@ -88,31 +85,30 @@ char *grpc_test_fetch_oauth2_token_with_credentials( grpc_schedule_on_exec_ctx); grpc_error *error = GRPC_ERROR_NONE; - if (grpc_call_credentials_get_request_metadata( - &exec_ctx, creds, &request.pops, null_ctx, &request.md_array, - &request.closure, &error)) { + if (grpc_call_credentials_get_request_metadata(creds, &request.pops, null_ctx, + &request.md_array, + &request.closure, &error)) { // Synchronous result; invoke callback directly. - on_oauth2_response(&exec_ctx, &request, error); + on_oauth2_response(&request, error); GRPC_ERROR_UNREF(error); } - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(request.mu); while (!request.is_done) { grpc_pollset_worker *worker = NULL; if (!GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(&exec_ctx, - grpc_polling_entity_pollset(&request.pops), + grpc_pollset_work(grpc_polling_entity_pollset(&request.pops), &worker, GRPC_MILLIS_INF_FUTURE))) { request.is_done = true; } } gpr_mu_unlock(request.mu); - grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&request.pops), + grpc_pollset_shutdown(grpc_polling_entity_pollset(&request.pops), &do_nothing_closure); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_free(grpc_polling_entity_pollset(&request.pops)); return request.token; } diff --git a/test/core/security/print_google_default_creds_token.c b/test/core/security/print_google_default_creds_token.c index 29c38dfdf81..d93f2363078 100644 --- a/test/core/security/print_google_default_creds_token.c +++ b/test/core/security/print_google_default_creds_token.c @@ -41,8 +41,7 @@ typedef struct { grpc_closure on_request_metadata; } synchronizer; -static void on_metadata_response(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void on_metadata_response(void *arg, grpc_error *error) { synchronizer *sync = arg; if (error != GRPC_ERROR_NONE) { fprintf(stderr, "Fetching token failed: %s\n", grpc_error_string(error)); @@ -57,14 +56,13 @@ static void on_metadata_response(grpc_exec_ctx *exec_ctx, void *arg, sync->is_done = true; GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&sync->pops), - NULL)); + grpc_pollset_kick(grpc_polling_entity_pollset(&sync->pops), NULL)); gpr_mu_unlock(sync->mu); } int main(int argc, char **argv) { int result = 0; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; synchronizer sync; grpc_channel_credentials *creds = NULL; char *service_url = "https://test.foo.google.com/Foo"; @@ -95,11 +93,10 @@ int main(int argc, char **argv) { grpc_error *error = GRPC_ERROR_NONE; if (grpc_call_credentials_get_request_metadata( - &exec_ctx, ((grpc_composite_channel_credentials *)creds)->call_creds, - &sync.pops, context, &sync.md_array, &sync.on_request_metadata, - &error)) { + ((grpc_composite_channel_credentials *)creds)->call_creds, &sync.pops, + context, &sync.md_array, &sync.on_request_metadata, &error)) { // Synchronous response. Invoke callback directly. - on_metadata_response(&exec_ctx, &sync, error); + on_metadata_response(&sync, error); GRPC_ERROR_UNREF(error); } @@ -108,17 +105,16 @@ int main(int argc, char **argv) { grpc_pollset_worker *worker = NULL; if (!GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(&exec_ctx, - grpc_polling_entity_pollset(&sync.pops), &worker, + grpc_pollset_work(grpc_polling_entity_pollset(&sync.pops), &worker, GRPC_MILLIS_INF_FUTURE))) sync.is_done = true; gpr_mu_unlock(sync.mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(sync.mu); } gpr_mu_unlock(sync.mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_channel_credentials_release(creds); gpr_free(grpc_polling_entity_pollset(&sync.pops)); diff --git a/test/core/security/secure_endpoint_test.c b/test/core/security/secure_endpoint_test.c index 839a05fa9b5..929f64cd40f 100644 --- a/test/core/security/secure_endpoint_test.c +++ b/test/core/security/secure_endpoint_test.c @@ -38,7 +38,7 @@ static grpc_pollset *g_pollset; static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( size_t slice_size, grpc_slice *leftover_slices, size_t leftover_nslices, bool use_zero_copy_protector) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; tsi_frame_protector *fake_read_protector = tsi_create_fake_frame_protector(NULL); tsi_frame_protector *fake_write_protector = @@ -57,8 +57,8 @@ static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( .value.integer = (int)slice_size}}; grpc_channel_args args = {.num_args = GPR_ARRAY_SIZE(a), .args = a}; tcp = grpc_iomgr_create_endpoint_pair("fixture", &args); - grpc_endpoint_add_to_pollset(&exec_ctx, tcp.client, g_pollset); - grpc_endpoint_add_to_pollset(&exec_ctx, tcp.server, g_pollset); + grpc_endpoint_add_to_pollset(tcp.client, g_pollset); + grpc_endpoint_add_to_pollset(tcp.server, g_pollset); if (leftover_nslices == 0) { f.client_ep = grpc_secure_endpoint_create(fake_read_protector, @@ -114,7 +114,7 @@ static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( f.server_ep = grpc_secure_endpoint_create(fake_write_protector, fake_write_zero_copy_protector, tcp.server, NULL, 0); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return f; } @@ -162,52 +162,46 @@ static grpc_endpoint_test_config configs[] = { clean_up}, }; -static void inc_call_ctr(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { - ++*(int *)arg; -} +static void inc_call_ctr(void *arg, grpc_error *error) { ++*(int *)arg; } static void test_leftover(grpc_endpoint_test_config config, size_t slice_size) { grpc_endpoint_test_fixture f = config.create_fixture(slice_size); grpc_slice_buffer incoming; grpc_slice s = grpc_slice_from_copied_string("hello world 12345678900987654321"); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; int n = 0; grpc_closure done_closure; gpr_log(GPR_INFO, "Start test left over"); grpc_slice_buffer_init(&incoming); GRPC_CLOSURE_INIT(&done_closure, inc_call_ctr, &n, grpc_schedule_on_exec_ctx); - grpc_endpoint_read(&exec_ctx, f.client_ep, &incoming, &done_closure); - grpc_exec_ctx_finish(&exec_ctx); + grpc_endpoint_read(f.client_ep, &incoming, &done_closure); + grpc_exec_ctx_finish(); GPR_ASSERT(n == 1); GPR_ASSERT(incoming.count == 1); GPR_ASSERT(grpc_slice_eq(s, incoming.slices[0])); grpc_endpoint_shutdown( - &exec_ctx, f.client_ep, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("test_leftover end")); + f.client_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("test_leftover end")); grpc_endpoint_shutdown( - &exec_ctx, f.server_ep, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("test_leftover end")); - grpc_endpoint_destroy(&exec_ctx, f.client_ep); - grpc_endpoint_destroy(&exec_ctx, f.server_ep); - grpc_exec_ctx_finish(&exec_ctx); - grpc_slice_unref_internal(&exec_ctx, s); - grpc_slice_buffer_destroy_internal(&exec_ctx, &incoming); + f.server_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("test_leftover end")); + grpc_endpoint_destroy(f.client_ep); + grpc_endpoint_destroy(f.server_ep); + grpc_exec_ctx_finish(); + grpc_slice_unref_internal(s); + grpc_slice_buffer_destroy_internal(&incoming); clean_up(); } -static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, - grpc_error *error) { - grpc_pollset_destroy(exec_ctx, (grpc_pollset *)p); +static void destroy_pollset(void *p, grpc_error *error) { + grpc_pollset_destroy((grpc_pollset *)p); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); @@ -219,8 +213,8 @@ int main(int argc, char **argv) { test_leftover(configs[3], 1); GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); - grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + grpc_exec_ctx_finish(); grpc_shutdown(); gpr_free(g_pollset); diff --git a/test/core/security/ssl_server_fuzzer.c b/test/core/security/ssl_server_fuzzer.c index f9b754b8f21..98e2b368f75 100644 --- a/test/core/security/ssl_server_fuzzer.c +++ b/test/core/security/ssl_server_fuzzer.c @@ -40,8 +40,7 @@ struct handshake_state { bool done_callback_called; }; -static void on_handshake_done(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void on_handshake_done(void *arg, grpc_error *error) { grpc_handshaker_args *args = arg; struct handshake_state *state = args->user_data; GPR_ASSERT(state->done_callback_called == false); @@ -55,17 +54,16 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { if (squelch) gpr_set_log_function(dont_log); if (leak_check) grpc_memory_counters_init(); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resource_quota *resource_quota = grpc_resource_quota_create("ssl_server_fuzzer"); grpc_endpoint *mock_endpoint = grpc_mock_endpoint_create(discard_write, resource_quota); - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); grpc_mock_endpoint_put_read( - &exec_ctx, mock_endpoint, - grpc_slice_from_copied_buffer((const char *)data, size)); + mock_endpoint, grpc_slice_from_copied_buffer((const char *)data, size)); // Load key pair and establish server SSL credentials. grpc_ssl_pem_key_cert_pair pem_key_cert_pair; @@ -82,38 +80,37 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { // Create security connector grpc_server_security_connector *sc = NULL; grpc_security_status status = - grpc_server_credentials_create_security_connector(&exec_ctx, creds, &sc); + grpc_server_credentials_create_security_connector(creds, &sc); GPR_ASSERT(status == GRPC_SECURITY_OK); - grpc_millis deadline = GPR_MS_PER_SEC + grpc_exec_ctx_now(&exec_ctx); + grpc_millis deadline = GPR_MS_PER_SEC + grpc_exec_ctx_now(); struct handshake_state state; state.done_callback_called = false; grpc_handshake_manager *handshake_mgr = grpc_handshake_manager_create(); - grpc_server_security_connector_add_handshakers(&exec_ctx, sc, handshake_mgr); + grpc_server_security_connector_add_handshakers(sc, handshake_mgr); grpc_handshake_manager_do_handshake( - &exec_ctx, handshake_mgr, mock_endpoint, NULL /* channel_args */, - deadline, NULL /* acceptor */, on_handshake_done, &state); - grpc_exec_ctx_flush(&exec_ctx); + handshake_mgr, mock_endpoint, NULL /* channel_args */, deadline, + NULL /* acceptor */, on_handshake_done, &state); + grpc_exec_ctx_flush(); // If the given string happens to be part of the correct client hello, the // server will wait for more data. Explicitly fail the server by shutting down // the endpoint. if (!state.done_callback_called) { grpc_endpoint_shutdown( - &exec_ctx, mock_endpoint, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Explicit close")); - grpc_exec_ctx_flush(&exec_ctx); + mock_endpoint, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Explicit close")); + grpc_exec_ctx_flush(); } GPR_ASSERT(state.done_callback_called); - grpc_handshake_manager_destroy(&exec_ctx, handshake_mgr); - GRPC_SECURITY_CONNECTOR_UNREF(&exec_ctx, &sc->base, "test"); + grpc_handshake_manager_destroy(handshake_mgr); + GRPC_SECURITY_CONNECTOR_UNREF(&sc->base, "test"); grpc_server_credentials_release(creds); grpc_slice_unref(cert_slice); grpc_slice_unref(key_slice); grpc_slice_unref(ca_slice); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); grpc_shutdown(); if (leak_check) { diff --git a/test/core/security/verify_jwt.c b/test/core/security/verify_jwt.cc similarity index 81% rename from test/core/security/verify_jwt.c rename to test/core/security/verify_jwt.cc index cec6fb94b4e..13f8acb242a 100644 --- a/test/core/security/verify_jwt.c +++ b/test/core/security/verify_jwt.cc @@ -44,7 +44,7 @@ static void print_usage_and_exit(gpr_cmdline *cl, const char *argv0) { exit(1); } -static void on_jwt_verification_done(grpc_exec_ctx *exec_ctx, void *user_data, +static void on_jwt_verification_done(void *user_data, grpc_jwt_verifier_status status, grpc_jwt_claims *claims) { synchronizer *sync = user_data; @@ -57,7 +57,7 @@ static void on_jwt_verification_done(grpc_exec_ctx *exec_ctx, void *user_data, grpc_json_dump_to_string((grpc_json *)grpc_jwt_claims_json(claims), 2); printf("Claims: \n\n%s\n", claims_str); gpr_free(claims_str); - grpc_jwt_claims_destroy(exec_ctx, claims); + grpc_jwt_claims_destroy(claims); } else { GPR_ASSERT(claims == NULL); fprintf(stderr, "Verification failed with error %s\n", @@ -66,8 +66,7 @@ static void on_jwt_verification_done(grpc_exec_ctx *exec_ctx, void *user_data, gpr_mu_lock(sync->mu); sync->is_done = 1; - GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, sync->pollset, NULL)); + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(sync->pollset, NULL)); gpr_mu_unlock(sync->mu); } @@ -77,7 +76,7 @@ int main(int argc, char **argv) { gpr_cmdline *cl; char *jwt = NULL; char *aud = NULL; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_init(); cl = gpr_cmdline_create("JWT verifier tool"); @@ -96,26 +95,26 @@ int main(int argc, char **argv) { grpc_pollset_init(sync.pollset, &sync.mu); sync.is_done = 0; - grpc_jwt_verifier_verify(&exec_ctx, verifier, sync.pollset, jwt, aud, + grpc_jwt_verifier_verify(verifier, sync.pollset, jwt, aud, on_jwt_verification_done, &sync); gpr_mu_lock(sync.mu); while (!sync.is_done) { grpc_pollset_worker *worker = NULL; - if (!GRPC_LOG_IF_ERROR("pollset_work", - grpc_pollset_work(&exec_ctx, sync.pollset, &worker, - GRPC_MILLIS_INF_FUTURE))) + if (!GRPC_LOG_IF_ERROR( + "pollset_work", + grpc_pollset_work(sync.pollset, &worker, GRPC_MILLIS_INF_FUTURE))) sync.is_done = true; gpr_mu_unlock(sync.mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(sync.mu); } gpr_mu_unlock(sync.mu); gpr_free(sync.pollset); - grpc_jwt_verifier_destroy(&exec_ctx, verifier); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_verifier_destroy(verifier); + grpc_exec_ctx_finish(); gpr_cmdline_destroy(cl); grpc_shutdown(); return !sync.success; diff --git a/test/core/slice/b64_test.c b/test/core/slice/b64_test.c index bd375aa6a7e..07403151956 100644 --- a/test/core/slice/b64_test.c +++ b/test/core/slice/b64_test.c @@ -44,14 +44,14 @@ static void test_simple_encode_decode_b64(int url_safe, int multiline) { const char *hello = "hello"; char *hello_b64 = grpc_base64_encode(hello, strlen(hello), url_safe, multiline); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice hello_slice = grpc_base64_decode(&exec_ctx, hello_b64, url_safe); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice hello_slice = grpc_base64_decode(hello_b64, url_safe); GPR_ASSERT(GRPC_SLICE_LENGTH(hello_slice) == strlen(hello)); GPR_ASSERT(strncmp((const char *)GRPC_SLICE_START_PTR(hello_slice), hello, GRPC_SLICE_LENGTH(hello_slice)) == 0); - grpc_slice_unref_internal(&exec_ctx, hello_slice); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref_internal(hello_slice); + grpc_exec_ctx_finish(); gpr_free(hello_b64); } @@ -64,15 +64,15 @@ static void test_full_range_encode_decode_b64(int url_safe, int multiline) { /* Try all the different paddings. */ for (i = 0; i < 3; i++) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; b64 = grpc_base64_encode(orig, sizeof(orig) - i, url_safe, multiline); - orig_decoded = grpc_base64_decode(&exec_ctx, b64, url_safe); + orig_decoded = grpc_base64_decode(b64, url_safe); GPR_ASSERT(GRPC_SLICE_LENGTH(orig_decoded) == (sizeof(orig) - i)); GPR_ASSERT(buffers_are_equal(orig, GRPC_SLICE_START_PTR(orig_decoded), sizeof(orig) - i)); - grpc_slice_unref_internal(&exec_ctx, orig_decoded); + grpc_slice_unref_internal(orig_decoded); gpr_free(b64); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } } @@ -116,19 +116,19 @@ static void test_url_safe_unsafe_mismatch_failure(void) { int url_safe = 1; for (i = 0; i < sizeof(orig); i++) orig[i] = (uint8_t)i; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; b64 = grpc_base64_encode(orig, sizeof(orig), url_safe, 0); - orig_decoded = grpc_base64_decode(&exec_ctx, b64, !url_safe); + orig_decoded = grpc_base64_decode(b64, !url_safe); GPR_ASSERT(GRPC_SLICE_IS_EMPTY(orig_decoded)); gpr_free(b64); - grpc_slice_unref_internal(&exec_ctx, orig_decoded); + grpc_slice_unref_internal(orig_decoded); b64 = grpc_base64_encode(orig, sizeof(orig), !url_safe, 0); - orig_decoded = grpc_base64_decode(&exec_ctx, b64, url_safe); + orig_decoded = grpc_base64_decode(b64, url_safe); GPR_ASSERT(GRPC_SLICE_IS_EMPTY(orig_decoded)); gpr_free(b64); - grpc_slice_unref_internal(&exec_ctx, orig_decoded); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref_internal(orig_decoded); + grpc_exec_ctx_finish(); } static void test_rfc4648_test_vectors(void) { @@ -166,40 +166,40 @@ static void test_rfc4648_test_vectors(void) { static void test_unpadded_decode(void) { grpc_slice decoded; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - decoded = grpc_base64_decode(&exec_ctx, "Zm9vYmFy", 0); + exec_ctx = GRPC_EXEC_CTX_INIT; + decoded = grpc_base64_decode("Zm9vYmFy", 0); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(decoded)); GPR_ASSERT(grpc_slice_str_cmp(decoded, "foobar") == 0); grpc_slice_unref(decoded); - decoded = grpc_base64_decode(&exec_ctx, "Zm9vYmE", 0); + decoded = grpc_base64_decode("Zm9vYmE", 0); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(decoded)); GPR_ASSERT(grpc_slice_str_cmp(decoded, "fooba") == 0); grpc_slice_unref(decoded); - decoded = grpc_base64_decode(&exec_ctx, "Zm9vYg", 0); + decoded = grpc_base64_decode("Zm9vYg", 0); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(decoded)); GPR_ASSERT(grpc_slice_str_cmp(decoded, "foob") == 0); grpc_slice_unref(decoded); - decoded = grpc_base64_decode(&exec_ctx, "Zm9v", 0); + decoded = grpc_base64_decode("Zm9v", 0); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(decoded)); GPR_ASSERT(grpc_slice_str_cmp(decoded, "foo") == 0); grpc_slice_unref(decoded); - decoded = grpc_base64_decode(&exec_ctx, "Zm8", 0); + decoded = grpc_base64_decode("Zm8", 0); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(decoded)); GPR_ASSERT(grpc_slice_str_cmp(decoded, "fo") == 0); grpc_slice_unref(decoded); - decoded = grpc_base64_decode(&exec_ctx, "Zg", 0); + decoded = grpc_base64_decode("Zg", 0); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(decoded)); GPR_ASSERT(grpc_slice_str_cmp(decoded, "f") == 0); grpc_slice_unref(decoded); - decoded = grpc_base64_decode(&exec_ctx, "", 0); + decoded = grpc_base64_decode("", 0); GPR_ASSERT(GRPC_SLICE_IS_EMPTY(decoded)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } int main(int argc, char **argv) { diff --git a/test/core/slice/slice_hash_table_test.c b/test/core/slice/slice_hash_table_test.c index f3689aac64f..67748433b12 100644 --- a/test/core/slice/slice_hash_table_test.c +++ b/test/core/slice/slice_hash_table_test.c @@ -58,9 +58,7 @@ static void check_non_existent_value(const char* key_string, grpc_slice_unref(key); } -static void destroy_string(grpc_exec_ctx* exec_ctx, void* value) { - gpr_free(value); -} +static void destroy_string(void* value) { gpr_free(value); } static grpc_slice_hash_table* create_table_from_entries( const test_entry* test_entries, size_t num_test_entries, @@ -119,9 +117,9 @@ static void test_slice_hash_table() { check_values(test_entries, num_entries, table); check_non_existent_value("XX", table); // Clean up. - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_hash_table_unref(&exec_ctx, table); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice_hash_table_unref(table); + grpc_exec_ctx_finish(); } static int value_cmp_fn(void* a, void* b) { @@ -147,10 +145,10 @@ static void test_slice_hash_table_eq() { create_table_from_entries(test_entries_b, num_entries_b, value_cmp_fn); GPR_ASSERT(grpc_slice_hash_table_cmp(table_a, table_b) == 0); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_hash_table_unref(&exec_ctx, table_a); - grpc_slice_hash_table_unref(&exec_ctx, table_b); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice_hash_table_unref(table_a); + grpc_slice_hash_table_unref(table_b); + grpc_exec_ctx_finish(); } static void test_slice_hash_table_not_eq() { @@ -219,17 +217,17 @@ static void test_slice_hash_table_not_eq() { create_table_from_entries(test_entries_h, num_entries_h, pointer_cmp_fn); GPR_ASSERT(grpc_slice_hash_table_cmp(table_g, table_h) != 0); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_hash_table_unref(&exec_ctx, table_a); - grpc_slice_hash_table_unref(&exec_ctx, table_b_larger); - grpc_slice_hash_table_unref(&exec_ctx, table_b_smaller); - grpc_slice_hash_table_unref(&exec_ctx, table_c); - grpc_slice_hash_table_unref(&exec_ctx, table_d); - grpc_slice_hash_table_unref(&exec_ctx, table_e); - grpc_slice_hash_table_unref(&exec_ctx, table_f); - grpc_slice_hash_table_unref(&exec_ctx, table_g); - grpc_slice_hash_table_unref(&exec_ctx, table_h); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice_hash_table_unref(table_a); + grpc_slice_hash_table_unref(table_b_larger); + grpc_slice_hash_table_unref(table_b_smaller); + grpc_slice_hash_table_unref(table_c); + grpc_slice_hash_table_unref(table_d); + grpc_slice_hash_table_unref(table_e); + grpc_slice_hash_table_unref(table_f); + grpc_slice_hash_table_unref(table_g); + grpc_slice_hash_table_unref(table_h); + grpc_exec_ctx_finish(); } int main(int argc, char** argv) { diff --git a/test/core/surface/byte_buffer_reader_test.c b/test/core/surface/byte_buffer_reader_test.c index a6b4c86abc1..820f56e15b7 100644 --- a/test/core/surface/byte_buffer_reader_test.c +++ b/test/core/surface/byte_buffer_reader_test.c @@ -132,10 +132,9 @@ static void read_compressed_slice(grpc_compression_algorithm algorithm, memset(GRPC_SLICE_START_PTR(input_slice), 'a', input_size); grpc_slice_buffer_add(&sliceb_in, input_slice); /* takes ownership */ { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT( - grpc_msg_compress(&exec_ctx, algorithm, &sliceb_in, &sliceb_out)); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT(grpc_msg_compress(algorithm, &sliceb_in, &sliceb_out)); + grpc_exec_ctx_finish(); } buffer = grpc_raw_compressed_byte_buffer_create(sliceb_out.slices, diff --git a/test/core/surface/channel_create_test.c b/test/core/surface/channel_create_test.c index a6884750e73..61cf2f7f3cc 100644 --- a/test/core/surface/channel_create_test.c +++ b/test/core/surface/channel_create_test.c @@ -35,11 +35,11 @@ void test_unknown_scheme_target(void) { chan = grpc_insecure_channel_create("blah://blah", NULL, NULL); GPR_ASSERT(chan != NULL); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_channel_element *elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_channel_destroy(chan); } diff --git a/test/core/surface/completion_queue_test.c b/test/core/surface/completion_queue_test.c index e6372a379ca..21e23fd5006 100644 --- a/test/core/surface/completion_queue_test.c +++ b/test/core/surface/completion_queue_test.c @@ -120,8 +120,7 @@ static void test_wait_empty(void) { } } -static void do_nothing_end_completion(grpc_exec_ctx *exec_ctx, void *arg, - grpc_cq_completion *c) {} +static void do_nothing_end_completion(void *arg, grpc_cq_completion *c) {} static void test_cq_end_op(void) { grpc_event ev; @@ -130,8 +129,6 @@ static void test_cq_end_op(void) { grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; grpc_completion_queue_attributes attr; - grpc_exec_ctx init_exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_exec_ctx exec_ctx; void *tag = create_test_tag(); LOG_TEST("test_cq_end_op"); @@ -139,14 +136,13 @@ static void test_cq_end_op(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_NEXT; for (size_t i = 0; i < GPR_ARRAY_SIZE(polling_types); i++) { - exec_ctx = init_exec_ctx; // Reset exec_ctx attr.cq_polling_type = polling_types[i]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, NULL); GPR_ASSERT(grpc_cq_begin_op(cc, tag)); - grpc_cq_end_op(&exec_ctx, cc, tag, GRPC_ERROR_NONE, - do_nothing_end_completion, NULL, &completion); + grpc_cq_end_op(cc, tag, GRPC_ERROR_NONE, do_nothing_end_completion, NULL, + &completion); ev = grpc_completion_queue_next(cc, gpr_inf_past(GPR_CLOCK_REALTIME), NULL); GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); @@ -154,7 +150,7 @@ static void test_cq_end_op(void) { GPR_ASSERT(ev.success); shutdown_and_destroy(cc); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } } @@ -211,8 +207,6 @@ static void test_pluck(void) { grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; grpc_completion_queue_attributes attr; - grpc_exec_ctx init_exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_exec_ctx exec_ctx; unsigned i, j; LOG_TEST("test_pluck"); @@ -227,15 +221,14 @@ static void test_pluck(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_PLUCK; for (size_t pidx = 0; pidx < GPR_ARRAY_SIZE(polling_types); pidx++) { - exec_ctx = init_exec_ctx; // reset exec_ctx attr.cq_polling_type = polling_types[pidx]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, NULL); for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { GPR_ASSERT(grpc_cq_begin_op(cc, tags[i])); - grpc_cq_end_op(&exec_ctx, cc, tags[i], GRPC_ERROR_NONE, - do_nothing_end_completion, NULL, &completions[i]); + grpc_cq_end_op(cc, tags[i], GRPC_ERROR_NONE, do_nothing_end_completion, + NULL, &completions[i]); } for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { @@ -246,8 +239,8 @@ static void test_pluck(void) { for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { GPR_ASSERT(grpc_cq_begin_op(cc, tags[i])); - grpc_cq_end_op(&exec_ctx, cc, tags[i], GRPC_ERROR_NONE, - do_nothing_end_completion, NULL, &completions[i]); + grpc_cq_end_op(cc, tags[i], GRPC_ERROR_NONE, do_nothing_end_completion, + NULL, &completions[i]); } for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { @@ -257,7 +250,7 @@ static void test_pluck(void) { } shutdown_and_destroy(cc); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } } diff --git a/test/core/surface/completion_queue_threading_test.c b/test/core/surface/completion_queue_threading_test.cc similarity index 92% rename from test/core/surface/completion_queue_threading_test.c rename to test/core/surface/completion_queue_threading_test.cc index 9996b6b840a..8a8d87be1a4 100644 --- a/test/core/surface/completion_queue_threading_test.c +++ b/test/core/surface/completion_queue_threading_test.cc @@ -59,8 +59,7 @@ static void shutdown_and_destroy(grpc_completion_queue *cc) { grpc_completion_queue_destroy(cc); } -static void do_nothing_end_completion(grpc_exec_ctx *exec_ctx, void *arg, - grpc_cq_completion *c) {} +static void do_nothing_end_completion(void *arg, grpc_cq_completion *c) {} struct thread_state { grpc_completion_queue *cc; @@ -81,7 +80,7 @@ static void test_too_many_plucks(void) { gpr_thd_id thread_ids[GPR_ARRAY_SIZE(tags)]; struct thread_state thread_states[GPR_ARRAY_SIZE(tags)]; gpr_thd_options thread_options = gpr_thd_options_default(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; unsigned i, j; LOG_TEST("test_too_many_plucks"); @@ -108,8 +107,8 @@ static void test_too_many_plucks(void) { for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { GPR_ASSERT(grpc_cq_begin_op(cc, tags[i])); - grpc_cq_end_op(&exec_ctx, cc, tags[i], GRPC_ERROR_NONE, - do_nothing_end_completion, NULL, &completions[i]); + grpc_cq_end_op(cc, tags[i], GRPC_ERROR_NONE, do_nothing_end_completion, + NULL, &completions[i]); } for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { @@ -117,7 +116,7 @@ static void test_too_many_plucks(void) { } shutdown_and_destroy(cc); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } #define TEST_THREAD_EVENTS 10000 @@ -137,15 +136,14 @@ gpr_timespec ten_seconds_time(void) { return grpc_timeout_seconds_to_deadline(10); } -static void free_completion(grpc_exec_ctx *exec_ctx, void *arg, - grpc_cq_completion *completion) { +static void free_completion(void *arg, grpc_cq_completion *completion) { gpr_free(completion); } static void producer_thread(void *arg) { test_thread_options *opt = arg; int i; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; gpr_log(GPR_INFO, "producer %d started", opt->id); gpr_event_set(&opt->on_started, (void *)(intptr_t)1); @@ -162,16 +160,16 @@ static void producer_thread(void *arg) { gpr_log(GPR_INFO, "producer %d phase 2", opt->id); for (i = 0; i < TEST_THREAD_EVENTS; i++) { - grpc_cq_end_op(&exec_ctx, opt->cc, (void *)(intptr_t)1, GRPC_ERROR_NONE, + grpc_cq_end_op(opt->cc, (void *)(intptr_t)1, GRPC_ERROR_NONE, free_completion, NULL, gpr_malloc(sizeof(grpc_cq_completion))); opt->events_triggered++; - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } gpr_log(GPR_INFO, "producer %d phase 2 done", opt->id); gpr_event_set(&opt->on_finished, (void *)(intptr_t)1); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void consumer_thread(void *arg) { diff --git a/test/core/surface/concurrent_connectivity_test.c b/test/core/surface/concurrent_connectivity_test.c index 3595885ff6d..28bdf5d1d36 100644 --- a/test/core/surface/concurrent_connectivity_test.c +++ b/test/core/surface/concurrent_connectivity_test.c @@ -99,29 +99,28 @@ void server_thread(void *vargs) { GPR_ASSERT(detag(ev.tag) == 0xd1e); } -static void on_connect(grpc_exec_ctx *exec_ctx, void *vargs, grpc_endpoint *tcp, +static void on_connect(void *vargs, grpc_endpoint *tcp, grpc_pollset *accepting_pollset, grpc_tcp_server_acceptor *acceptor) { gpr_free(acceptor); struct server_thread_args *args = (struct server_thread_args *)vargs; - grpc_endpoint_shutdown(exec_ctx, tcp, + grpc_endpoint_shutdown(tcp, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Connected")); - grpc_endpoint_destroy(exec_ctx, tcp); + grpc_endpoint_destroy(tcp); gpr_mu_lock(args->mu); - GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, args->pollset, NULL)); + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(args->pollset, NULL)); gpr_mu_unlock(args->mu); } void bad_server_thread(void *vargs) { struct server_thread_args *args = (struct server_thread_args *)vargs; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; struct sockaddr_storage *addr = (struct sockaddr_storage *)resolved_addr.addr; int port; grpc_tcp_server *s; - grpc_error *error = grpc_tcp_server_create(&exec_ctx, NULL, NULL, &s); + grpc_error *error = grpc_tcp_server_create(NULL, NULL, &s); GPR_ASSERT(error == GRPC_ERROR_NONE); memset(&resolved_addr, 0, sizeof(resolved_addr)); addr->ss_family = AF_INET; @@ -130,35 +129,34 @@ void bad_server_thread(void *vargs) { GPR_ASSERT(port > 0); gpr_asprintf(&args->addr, "localhost:%d", port); - grpc_tcp_server_start(&exec_ctx, s, &args->pollset, 1, on_connect, args); + grpc_tcp_server_start(s, &args->pollset, 1, on_connect, args); gpr_event_set(&args->ready, (void *)1); gpr_mu_lock(args->mu); while (gpr_atm_acq_load(&args->stop) == 0) { - grpc_millis deadline = grpc_exec_ctx_now(&exec_ctx) + 100; + grpc_millis deadline = grpc_exec_ctx_now() + 100; grpc_pollset_worker *worker = NULL; if (!GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(&exec_ctx, args->pollset, &worker, deadline))) { + grpc_pollset_work(args->pollset, &worker, deadline))) { gpr_atm_rel_store(&args->stop, 1); } gpr_mu_unlock(args->mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_mu_lock(args->mu); } gpr_mu_unlock(args->mu); - grpc_tcp_server_unref(&exec_ctx, s); + grpc_tcp_server_unref(s); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_free(args->addr); } -static void done_pollset_shutdown(grpc_exec_ctx *exec_ctx, void *pollset, - grpc_error *error) { - grpc_pollset_destroy(exec_ctx, pollset); +static void done_pollset_shutdown(void *pollset, grpc_error *error) { + grpc_pollset_destroy(pollset); gpr_free(pollset); } @@ -226,11 +224,11 @@ int run_concurrent_connectivity_test() { gpr_atm_rel_store(&args.stop, 1); gpr_thd_join(server); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_pollset_shutdown(&exec_ctx, args.pollset, + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_pollset_shutdown(args.pollset, GRPC_CLOSURE_CREATE(done_pollset_shutdown, args.pollset, grpc_schedule_on_exec_ctx)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_shutdown(); return 0; diff --git a/test/core/surface/lame_client_test.c b/test/core/surface/lame_client_test.c index f623e1a7432..f3890743d08 100644 --- a/test/core/surface/lame_client_test.c +++ b/test/core/surface/lame_client_test.c @@ -32,20 +32,19 @@ grpc_closure transport_op_cb; static void *tag(intptr_t x) { return (void *)x; } -void verify_connectivity(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +void verify_connectivity(void *arg, grpc_error *error) { grpc_connectivity_state *state = arg; GPR_ASSERT(GRPC_CHANNEL_SHUTDOWN == *state); GPR_ASSERT(error == GRPC_ERROR_NONE); } -void do_nothing(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) {} +void do_nothing(void *arg, grpc_error *error) {} void test_transport_op(grpc_channel *channel) { grpc_transport_op *op; grpc_channel_element *elem; grpc_connectivity_state state = GRPC_CHANNEL_IDLE; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; GRPC_CLOSURE_INIT(&transport_op_cb, verify_connectivity, &state, grpc_schedule_on_exec_ctx); @@ -54,14 +53,14 @@ void test_transport_op(grpc_channel *channel) { op->on_connectivity_state_change = &transport_op_cb; op->connectivity_state = &state; elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); - elem->filter->start_transport_op(&exec_ctx, elem, op); - grpc_exec_ctx_finish(&exec_ctx); + elem->filter->start_transport_op(elem, op); + grpc_exec_ctx_finish(); GRPC_CLOSURE_INIT(&transport_op_cb, do_nothing, NULL, grpc_schedule_on_exec_ctx); op = grpc_make_transport_op(&transport_op_cb); - elem->filter->start_transport_op(&exec_ctx, elem, op); - grpc_exec_ctx_finish(&exec_ctx); + elem->filter->start_transport_op(elem, op); + grpc_exec_ctx_finish(); } int main(int argc, char **argv) { diff --git a/test/core/surface/num_external_connectivity_watchers_test.c b/test/core/surface/num_external_connectivity_watchers_test.c index 16401bb7ac0..5c71d41bfce 100644 --- a/test/core/surface/num_external_connectivity_watchers_test.c +++ b/test/core/surface/num_external_connectivity_watchers_test.c @@ -176,9 +176,9 @@ static grpc_channel *secure_test_create_channel(const char *addr) { grpc_channel *channel = grpc_secure_channel_create(ssl_creds, addr, new_client_args, NULL); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, new_client_args); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(new_client_args); + grpc_exec_ctx_finish(); } grpc_channel_credentials_release(ssl_creds); return channel; diff --git a/test/core/surface/secure_channel_create_test.c b/test/core/surface/secure_channel_create_test.c index 0c451355017..78062cb2d1f 100644 --- a/test/core/surface/secure_channel_create_test.c +++ b/test/core/surface/secure_channel_create_test.c @@ -37,10 +37,10 @@ void test_unknown_scheme_target(void) { grpc_channel_element *elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_CHANNEL_INTERNAL_UNREF(&exec_ctx, chan, "test"); - grpc_channel_credentials_unref(&exec_ctx, creds); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_CHANNEL_INTERNAL_UNREF(chan, "test"); + grpc_channel_credentials_unref(creds); + grpc_exec_ctx_finish(); } void test_security_connector_already_in_arg(void) { @@ -55,9 +55,9 @@ void test_security_connector_already_in_arg(void) { grpc_channel_element *elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_CHANNEL_INTERNAL_UNREF(&exec_ctx, chan, "test"); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_CHANNEL_INTERNAL_UNREF(chan, "test"); + grpc_exec_ctx_finish(); } void test_null_creds(void) { @@ -65,9 +65,9 @@ void test_null_creds(void) { grpc_channel_element *elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_CHANNEL_INTERNAL_UNREF(&exec_ctx, chan, "test"); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_CHANNEL_INTERNAL_UNREF(chan, "test"); + grpc_exec_ctx_finish(); } int main(int argc, char **argv) { diff --git a/test/core/surface/sequential_connectivity_test.c b/test/core/surface/sequential_connectivity_test.c index d5fd2db81b0..ae5288427f5 100644 --- a/test/core/surface/sequential_connectivity_test.c +++ b/test/core/surface/sequential_connectivity_test.c @@ -153,9 +153,9 @@ static grpc_channel *secure_test_create_channel(const char *addr) { grpc_channel *channel = grpc_secure_channel_create(ssl_creds, addr, new_client_args, NULL); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, new_client_args); - grpc_exec_ctx_finish(&exec_ctx); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(new_client_args); + grpc_exec_ctx_finish(); } grpc_channel_credentials_release(ssl_creds); return channel; diff --git a/test/core/transport/bdp_estimator_test.cc b/test/core/transport/bdp_estimator_test.cc index 7ac35016c0b..cf1b422043b 100644 --- a/test/core/transport/bdp_estimator_test.cc +++ b/test/core/transport/bdp_estimator_test.cc @@ -23,92 +23,97 @@ #include #include #include -#include #include #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/lib/support/string.h" #include "test/core/util/test_config.h" -extern "C" gpr_timespec (*gpr_now_impl)(gpr_clock_type clock_type); +extern gpr_timespec (*gpr_now_impl)(gpr_clock_type clock_type); -namespace grpc_core { -namespace testing { -namespace { -int g_clock = 0; +static int g_clock = 0; -gpr_timespec fake_gpr_now(gpr_clock_type clock_type) { - gpr_timespec ts; - ts.tv_sec = g_clock; - ts.tv_nsec = 0; - ts.clock_type = clock_type; - return ts; +static gpr_timespec fake_gpr_now(gpr_clock_type clock_type) { + return (gpr_timespec){ + .tv_sec = g_clock, .tv_nsec = 0, .clock_type = clock_type, + }; } -void inc_time(void) { g_clock += 30; } -} // namespace +static void inc_time(void) { g_clock += 30; } -TEST(BdpEstimatorTest, NoOp) { BdpEstimator est("test"); } +static void test_noop(void) { + gpr_log(GPR_INFO, "test_noop"); + grpc_bdp_estimator est; + grpc_bdp_estimator_init(&est, "test"); +} -TEST(BdpEstimatorTest, EstimateBdpNoSamples) { - BdpEstimator est("test"); +static void test_get_estimate_no_samples(void) { + gpr_log(GPR_INFO, "test_get_estimate_no_samples"); + grpc_bdp_estimator est; + grpc_bdp_estimator_init(&est, "test"); int64_t estimate; - est.EstimateBdp(&estimate); + grpc_bdp_estimator_get_estimate(&est, &estimate); } -namespace { -void AddSamples(BdpEstimator *estimator, int64_t *samples, size_t n) { - estimator->AddIncomingBytes(1234567); +static void add_samples(grpc_bdp_estimator *estimator, int64_t *samples, + size_t n) { + grpc_bdp_estimator_add_incoming_bytes(estimator, 1234567); inc_time(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - estimator->SchedulePing(); - estimator->StartPing(); + + GPR_ASSERT(grpc_bdp_estimator_need_ping(estimator) == true); + grpc_bdp_estimator_schedule_ping(estimator); + grpc_bdp_estimator_start_ping(estimator); + for (size_t i = 0; i < n; i++) { - estimator->AddIncomingBytes(samples[i]); + grpc_bdp_estimator_add_incoming_bytes(estimator, samples[i]); + GPR_ASSERT(grpc_bdp_estimator_need_ping(estimator) == false); } gpr_sleep_until(gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_millis(1, GPR_TIMESPAN))); - grpc_exec_ctx_invalidate_now(&exec_ctx); - estimator->CompletePing(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + grpc_bdp_estimator_complete_ping(estimator); + grpc_exec_ctx_finish(); } -void AddSample(BdpEstimator *estimator, int64_t sample) { - AddSamples(estimator, &sample, 1); +static void add_sample(grpc_bdp_estimator *estimator, int64_t sample) { + add_samples(estimator, &sample, 1); } -} // namespace -TEST(BdpEstimatorTest, GetEstimate1Sample) { - BdpEstimator est("test"); - AddSample(&est, 100); +static void test_get_estimate_1_sample(void) { + gpr_log(GPR_INFO, "test_get_estimate_1_sample"); + grpc_bdp_estimator est; + grpc_bdp_estimator_init(&est, "test"); + add_sample(&est, 100); int64_t estimate; - est.EstimateBdp(&estimate); + grpc_bdp_estimator_get_estimate(&est, &estimate); } -TEST(BdpEstimatorTest, GetEstimate2Samples) { - BdpEstimator est("test"); - AddSample(&est, 100); - AddSample(&est, 100); +static void test_get_estimate_2_samples(void) { + gpr_log(GPR_INFO, "test_get_estimate_2_samples"); + grpc_bdp_estimator est; + grpc_bdp_estimator_init(&est, "test"); + add_sample(&est, 100); + add_sample(&est, 100); int64_t estimate; - est.EstimateBdp(&estimate); + grpc_bdp_estimator_get_estimate(&est, &estimate); } -TEST(BdpEstimatorTest, GetEstimate3Samples) { - BdpEstimator est("test"); - AddSample(&est, 100); - AddSample(&est, 100); - AddSample(&est, 100); - int64_t estimate; - est.EstimateBdp(&estimate); -} - -namespace { -static int64_t GetEstimate(const BdpEstimator &estimator) { +static int64_t get_estimate(grpc_bdp_estimator *estimator) { int64_t out; - EXPECT_TRUE(estimator.EstimateBdp(&out)); + GPR_ASSERT(grpc_bdp_estimator_get_estimate(estimator, &out)); return out; } -int64_t NextPow2(int64_t v) { +static void test_get_estimate_3_samples(void) { + gpr_log(GPR_INFO, "test_get_estimate_3_samples"); + grpc_bdp_estimator est; + grpc_bdp_estimator_init(&est, "test"); + add_sample(&est, 100); + add_sample(&est, 100); + add_sample(&est, 100); + int64_t estimate; + grpc_bdp_estimator_get_estimate(&est, &estimate); +} + +static int64_t next_pow_2(int64_t v) { v--; v |= v >> 1; v |= v >> 2; @@ -119,40 +124,40 @@ int64_t NextPow2(int64_t v) { v++; return v; } -} // namespace - -class BdpEstimatorRandomTest : public ::testing::TestWithParam {}; -TEST_P(BdpEstimatorRandomTest, GetEstimateRandomValues) { - BdpEstimator est("test"); +static void test_get_estimate_random_values(size_t n) { + gpr_log(GPR_INFO, "test_get_estimate_random_values(%" PRIdPTR ")", n); + grpc_bdp_estimator est; + grpc_bdp_estimator_init(&est, "test"); const int kMaxSample = 65535; int min = kMaxSample; int max = 0; - for (size_t i = 0; i < GetParam(); i++) { + for (size_t i = 0; i < n; i++) { int sample = rand() % (kMaxSample + 1); if (sample < min) min = sample; if (sample > max) max = sample; - AddSample(&est, sample); + add_sample(&est, sample); if (i >= 3) { - EXPECT_LE(GetEstimate(est), GPR_MAX(65536, 2 * NextPow2(max))) - << " min:" << min << " max:" << max << " sample:" << sample; + gpr_log(GPR_DEBUG, "est:%" PRId64 " min:%d max:%d", get_estimate(&est), + min, max); + GPR_ASSERT(get_estimate(&est) <= GPR_MAX(65536, 2 * next_pow_2(max))); } } } -INSTANTIATE_TEST_CASE_P(TooManyNames, BdpEstimatorRandomTest, - ::testing::Values(3, 4, 6, 9, 13, 19, 28, 42, 63, 94, - 141, 211, 316, 474, 711)); -} // namespace testing -} // namespace grpc_core - int main(int argc, char **argv) { grpc_test_init(argc, argv); - gpr_now_impl = grpc_core::testing::fake_gpr_now; + gpr_now_impl = fake_gpr_now; grpc_init(); grpc_timer_manager_set_threading(false); - ::testing::InitGoogleTest(&argc, argv); - int ret = RUN_ALL_TESTS(); + test_noop(); + test_get_estimate_no_samples(); + test_get_estimate_1_sample(); + test_get_estimate_2_samples(); + test_get_estimate_3_samples(); + for (size_t i = 3; i < 1000; i = i * 3 / 2) { + test_get_estimate_random_values(i); + } grpc_shutdown(); - return ret; + return 0; } diff --git a/test/core/transport/byte_stream_test.c b/test/core/transport/byte_stream_test.c index a0c5f961cfd..3516c191e20 100644 --- a/test/core/transport/byte_stream_test.c +++ b/test/core/transport/byte_stream_test.c @@ -30,14 +30,13 @@ // grpc_slice_buffer_stream tests // -static void not_called_closure(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void not_called_closure(void *arg, grpc_error *error) { GPR_ASSERT(false); } static void test_slice_buffer_stream_basic(void) { gpr_log(GPR_DEBUG, "test_slice_buffer_stream_basic"); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; // Create and populate slice buffer. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -57,23 +56,22 @@ static void test_slice_buffer_stream_basic(void) { grpc_schedule_on_exec_ctx); // Read each slice. Note that next() always returns synchronously. for (size_t i = 0; i < GPR_ARRAY_SIZE(input); ++i) { - GPR_ASSERT( - grpc_byte_stream_next(&exec_ctx, &stream.base, ~(size_t)0, &closure)); + GPR_ASSERT(grpc_byte_stream_next(&stream.base, ~(size_t)0, &closure)); grpc_slice output; - grpc_error *error = grpc_byte_stream_pull(&exec_ctx, &stream.base, &output); + grpc_error *error = grpc_byte_stream_pull(&stream.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[i], output)); - grpc_slice_unref_internal(&exec_ctx, output); + grpc_slice_unref_internal(output); } // Clean up. - grpc_byte_stream_destroy(&exec_ctx, &stream.base); - grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + grpc_byte_stream_destroy(&stream.base); + grpc_slice_buffer_destroy_internal(&buffer); + grpc_exec_ctx_finish(); } static void test_slice_buffer_stream_shutdown(void) { gpr_log(GPR_DEBUG, "test_slice_buffer_stream_shutdown"); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; // Create and populate slice buffer. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -92,29 +90,26 @@ static void test_slice_buffer_stream_shutdown(void) { GRPC_CLOSURE_INIT(&closure, not_called_closure, NULL, grpc_schedule_on_exec_ctx); // Read the first slice. - GPR_ASSERT( - grpc_byte_stream_next(&exec_ctx, &stream.base, ~(size_t)0, &closure)); + GPR_ASSERT(grpc_byte_stream_next(&stream.base, ~(size_t)0, &closure)); grpc_slice output; - grpc_error *error = grpc_byte_stream_pull(&exec_ctx, &stream.base, &output); + grpc_error *error = grpc_byte_stream_pull(&stream.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[0], output)); - grpc_slice_unref_internal(&exec_ctx, output); + grpc_slice_unref_internal(output); // Now shutdown. grpc_error *shutdown_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("shutdown error"); - grpc_byte_stream_shutdown(&exec_ctx, &stream.base, - GRPC_ERROR_REF(shutdown_error)); + grpc_byte_stream_shutdown(&stream.base, GRPC_ERROR_REF(shutdown_error)); // After shutdown, the next pull() should return the error. - GPR_ASSERT( - grpc_byte_stream_next(&exec_ctx, &stream.base, ~(size_t)0, &closure)); - error = grpc_byte_stream_pull(&exec_ctx, &stream.base, &output); + GPR_ASSERT(grpc_byte_stream_next(&stream.base, ~(size_t)0, &closure)); + error = grpc_byte_stream_pull(&stream.base, &output); GPR_ASSERT(error == shutdown_error); GRPC_ERROR_UNREF(error); GRPC_ERROR_UNREF(shutdown_error); // Clean up. - grpc_byte_stream_destroy(&exec_ctx, &stream.base); - grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + grpc_byte_stream_destroy(&stream.base); + grpc_slice_buffer_destroy_internal(&buffer); + grpc_exec_ctx_finish(); } // @@ -123,7 +118,7 @@ static void test_slice_buffer_stream_shutdown(void) { static void test_caching_byte_stream_basic(void) { gpr_log(GPR_DEBUG, "test_caching_byte_stream_basic"); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; // Create and populate slice buffer byte stream. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -147,24 +142,23 @@ static void test_caching_byte_stream_basic(void) { // Read each slice. Note that next() always returns synchronously, // because the underlying byte stream always does. for (size_t i = 0; i < GPR_ARRAY_SIZE(input); ++i) { - GPR_ASSERT( - grpc_byte_stream_next(&exec_ctx, &stream.base, ~(size_t)0, &closure)); + GPR_ASSERT(grpc_byte_stream_next(&stream.base, ~(size_t)0, &closure)); grpc_slice output; - grpc_error *error = grpc_byte_stream_pull(&exec_ctx, &stream.base, &output); + grpc_error *error = grpc_byte_stream_pull(&stream.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[i], output)); - grpc_slice_unref_internal(&exec_ctx, output); + grpc_slice_unref_internal(output); } // Clean up. - grpc_byte_stream_destroy(&exec_ctx, &stream.base); - grpc_byte_stream_cache_destroy(&exec_ctx, &cache); - grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + grpc_byte_stream_destroy(&stream.base); + grpc_byte_stream_cache_destroy(&cache); + grpc_slice_buffer_destroy_internal(&buffer); + grpc_exec_ctx_finish(); } static void test_caching_byte_stream_reset(void) { gpr_log(GPR_DEBUG, "test_caching_byte_stream_reset"); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; // Create and populate slice buffer byte stream. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -186,34 +180,32 @@ static void test_caching_byte_stream_reset(void) { GRPC_CLOSURE_INIT(&closure, not_called_closure, NULL, grpc_schedule_on_exec_ctx); // Read one slice. - GPR_ASSERT( - grpc_byte_stream_next(&exec_ctx, &stream.base, ~(size_t)0, &closure)); + GPR_ASSERT(grpc_byte_stream_next(&stream.base, ~(size_t)0, &closure)); grpc_slice output; - grpc_error *error = grpc_byte_stream_pull(&exec_ctx, &stream.base, &output); + grpc_error *error = grpc_byte_stream_pull(&stream.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[0], output)); - grpc_slice_unref_internal(&exec_ctx, output); + grpc_slice_unref_internal(output); // Reset the caching stream. The reads should start over from the // first slice. grpc_caching_byte_stream_reset(&stream); for (size_t i = 0; i < GPR_ARRAY_SIZE(input); ++i) { - GPR_ASSERT( - grpc_byte_stream_next(&exec_ctx, &stream.base, ~(size_t)0, &closure)); - error = grpc_byte_stream_pull(&exec_ctx, &stream.base, &output); + GPR_ASSERT(grpc_byte_stream_next(&stream.base, ~(size_t)0, &closure)); + error = grpc_byte_stream_pull(&stream.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[i], output)); - grpc_slice_unref_internal(&exec_ctx, output); + grpc_slice_unref_internal(output); } // Clean up. - grpc_byte_stream_destroy(&exec_ctx, &stream.base); - grpc_byte_stream_cache_destroy(&exec_ctx, &cache); - grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + grpc_byte_stream_destroy(&stream.base); + grpc_byte_stream_cache_destroy(&cache); + grpc_slice_buffer_destroy_internal(&buffer); + grpc_exec_ctx_finish(); } static void test_caching_byte_stream_shared_cache(void) { gpr_log(GPR_DEBUG, "test_caching_byte_stream_shared_cache"); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; // Create and populate slice buffer byte stream. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -237,35 +229,32 @@ static void test_caching_byte_stream_shared_cache(void) { GRPC_CLOSURE_INIT(&closure, not_called_closure, NULL, grpc_schedule_on_exec_ctx); // Read one slice from stream1. - GPR_ASSERT( - grpc_byte_stream_next(&exec_ctx, &stream1.base, ~(size_t)0, &closure)); + GPR_ASSERT(grpc_byte_stream_next(&stream1.base, ~(size_t)0, &closure)); grpc_slice output; - grpc_error *error = grpc_byte_stream_pull(&exec_ctx, &stream1.base, &output); + grpc_error *error = grpc_byte_stream_pull(&stream1.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[0], output)); - grpc_slice_unref_internal(&exec_ctx, output); + grpc_slice_unref_internal(output); // Read all slices from stream2. for (size_t i = 0; i < GPR_ARRAY_SIZE(input); ++i) { - GPR_ASSERT( - grpc_byte_stream_next(&exec_ctx, &stream2.base, ~(size_t)0, &closure)); - error = grpc_byte_stream_pull(&exec_ctx, &stream2.base, &output); + GPR_ASSERT(grpc_byte_stream_next(&stream2.base, ~(size_t)0, &closure)); + error = grpc_byte_stream_pull(&stream2.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[i], output)); - grpc_slice_unref_internal(&exec_ctx, output); + grpc_slice_unref_internal(output); } // Now read the second slice from stream1. - GPR_ASSERT( - grpc_byte_stream_next(&exec_ctx, &stream1.base, ~(size_t)0, &closure)); - error = grpc_byte_stream_pull(&exec_ctx, &stream1.base, &output); + GPR_ASSERT(grpc_byte_stream_next(&stream1.base, ~(size_t)0, &closure)); + error = grpc_byte_stream_pull(&stream1.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[1], output)); - grpc_slice_unref_internal(&exec_ctx, output); + grpc_slice_unref_internal(output); // Clean up. - grpc_byte_stream_destroy(&exec_ctx, &stream1.base); - grpc_byte_stream_destroy(&exec_ctx, &stream2.base); - grpc_byte_stream_cache_destroy(&exec_ctx, &cache); - grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + grpc_byte_stream_destroy(&stream1.base); + grpc_byte_stream_destroy(&stream2.base); + grpc_byte_stream_cache_destroy(&cache); + grpc_slice_buffer_destroy_internal(&buffer); + grpc_exec_ctx_finish(); } int main(int argc, char **argv) { diff --git a/test/core/transport/chttp2/bin_decoder_test.c b/test/core/transport/chttp2/bin_decoder_test.c index 775161ec91e..824b7563983 100644 --- a/test/core/transport/chttp2/bin_decoder_test.c +++ b/test/core/transport/chttp2/bin_decoder_test.c @@ -29,8 +29,8 @@ static int all_ok = 1; -static void expect_slice_eq(grpc_exec_ctx *exec_ctx, grpc_slice expected, - grpc_slice slice, char *debug, int line) { +static void expect_slice_eq(grpc_slice expected, grpc_slice slice, char *debug, + int line) { if (!grpc_slice_eq(slice, expected)) { char *hs = grpc_dump_slice(slice, GPR_DUMP_HEX | GPR_DUMP_ASCII); char *he = grpc_dump_slice(expected, GPR_DUMP_HEX | GPR_DUMP_ASCII); @@ -40,104 +40,94 @@ static void expect_slice_eq(grpc_exec_ctx *exec_ctx, grpc_slice expected, gpr_free(he); all_ok = 0; } - grpc_slice_unref_internal(exec_ctx, expected); - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(expected); + grpc_slice_unref_internal(slice); } -static grpc_slice base64_encode(grpc_exec_ctx *exec_ctx, const char *s) { +static grpc_slice base64_encode(const char *s) { grpc_slice ss = grpc_slice_from_copied_string(s); grpc_slice out = grpc_chttp2_base64_encode(ss); - grpc_slice_unref_internal(exec_ctx, ss); + grpc_slice_unref_internal(ss); return out; } -static grpc_slice base64_decode(grpc_exec_ctx *exec_ctx, const char *s) { +static grpc_slice base64_decode(const char *s) { grpc_slice ss = grpc_slice_from_copied_string(s); - grpc_slice out = grpc_chttp2_base64_decode(exec_ctx, ss); - grpc_slice_unref_internal(exec_ctx, ss); + grpc_slice out = grpc_chttp2_base64_decode(ss); + grpc_slice_unref_internal(ss); return out; } -static grpc_slice base64_decode_with_length(grpc_exec_ctx *exec_ctx, - const char *s, +static grpc_slice base64_decode_with_length(const char *s, size_t output_length) { grpc_slice ss = grpc_slice_from_copied_string(s); - grpc_slice out = - grpc_chttp2_base64_decode_with_length(exec_ctx, ss, output_length); - grpc_slice_unref_internal(exec_ctx, ss); + grpc_slice out = grpc_chttp2_base64_decode_with_length(ss, output_length); + grpc_slice_unref_internal(ss); return out; } -#define EXPECT_SLICE_EQ(exec_ctx, expected, slice) \ - expect_slice_eq( \ - exec_ctx, grpc_slice_from_copied_buffer(expected, sizeof(expected) - 1), \ - slice, #slice, __LINE__); +#define EXPECT_SLICE_EQ(expected, slice) \ + expect_slice_eq( \ + grpc_slice_from_copied_buffer(expected, sizeof(expected) - 1), slice, \ + #slice, __LINE__); -#define ENCODE_AND_DECODE(exec_ctx, s) \ - EXPECT_SLICE_EQ(exec_ctx, s, \ - grpc_chttp2_base64_decode_with_length( \ - exec_ctx, base64_encode(exec_ctx, s), strlen(s))); +#define ENCODE_AND_DECODE(s) \ + EXPECT_SLICE_EQ( \ + s, grpc_chttp2_base64_decode_with_length(base64_encode(s), strlen(s))); int main(int argc, char **argv) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - /* ENCODE_AND_DECODE tests grpc_chttp2_base64_decode_with_length(), which takes encoded base64 strings without pad chars, but output length is required. */ /* Base64 test vectors from RFC 4648 */ - ENCODE_AND_DECODE(&exec_ctx, ""); - ENCODE_AND_DECODE(&exec_ctx, "f"); - ENCODE_AND_DECODE(&exec_ctx, "foo"); - ENCODE_AND_DECODE(&exec_ctx, "fo"); - ENCODE_AND_DECODE(&exec_ctx, "foob"); - ENCODE_AND_DECODE(&exec_ctx, "fooba"); - ENCODE_AND_DECODE(&exec_ctx, "foobar"); + ENCODE_AND_DECODE(""); + ENCODE_AND_DECODE("f"); + ENCODE_AND_DECODE("foo"); + ENCODE_AND_DECODE("fo"); + ENCODE_AND_DECODE("foob"); + ENCODE_AND_DECODE("fooba"); + ENCODE_AND_DECODE("foobar"); - ENCODE_AND_DECODE(&exec_ctx, "\xc0\xc1\xc2\xc3\xc4\xc5"); + ENCODE_AND_DECODE("\xc0\xc1\xc2\xc3\xc4\xc5"); /* Base64 test vectors from RFC 4648, with pad chars */ /* BASE64("") = "" */ - EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode(&exec_ctx, "")); + EXPECT_SLICE_EQ("", base64_decode("")); /* BASE64("f") = "Zg==" */ - EXPECT_SLICE_EQ(&exec_ctx, "f", base64_decode(&exec_ctx, "Zg==")); + EXPECT_SLICE_EQ("f", base64_decode("Zg==")); /* BASE64("fo") = "Zm8=" */ - EXPECT_SLICE_EQ(&exec_ctx, "fo", base64_decode(&exec_ctx, "Zm8=")); + EXPECT_SLICE_EQ("fo", base64_decode("Zm8=")); /* BASE64("foo") = "Zm9v" */ - EXPECT_SLICE_EQ(&exec_ctx, "foo", base64_decode(&exec_ctx, "Zm9v")); + EXPECT_SLICE_EQ("foo", base64_decode("Zm9v")); /* BASE64("foob") = "Zm9vYg==" */ - EXPECT_SLICE_EQ(&exec_ctx, "foob", base64_decode(&exec_ctx, "Zm9vYg==")); + EXPECT_SLICE_EQ("foob", base64_decode("Zm9vYg==")); /* BASE64("fooba") = "Zm9vYmE=" */ - EXPECT_SLICE_EQ(&exec_ctx, "fooba", base64_decode(&exec_ctx, "Zm9vYmE=")); + EXPECT_SLICE_EQ("fooba", base64_decode("Zm9vYmE=")); /* BASE64("foobar") = "Zm9vYmFy" */ - EXPECT_SLICE_EQ(&exec_ctx, "foobar", base64_decode(&exec_ctx, "Zm9vYmFy")); + EXPECT_SLICE_EQ("foobar", base64_decode("Zm9vYmFy")); - EXPECT_SLICE_EQ(&exec_ctx, "\xc0\xc1\xc2\xc3\xc4\xc5", - base64_decode(&exec_ctx, "wMHCw8TF")); + EXPECT_SLICE_EQ("\xc0\xc1\xc2\xc3\xc4\xc5", base64_decode("wMHCw8TF")); // Test illegal input length in grpc_chttp2_base64_decode - EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode(&exec_ctx, "a")); - EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode(&exec_ctx, "ab")); - EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode(&exec_ctx, "abc")); + EXPECT_SLICE_EQ("", base64_decode("a")); + EXPECT_SLICE_EQ("", base64_decode("ab")); + EXPECT_SLICE_EQ("", base64_decode("abc")); // Test illegal charactors in grpc_chttp2_base64_decode - EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode(&exec_ctx, "Zm:v")); - EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode(&exec_ctx, "Zm=v")); + EXPECT_SLICE_EQ("", base64_decode("Zm:v")); + EXPECT_SLICE_EQ("", base64_decode("Zm=v")); // Test output_length longer than max possible output length in // grpc_chttp2_base64_decode_with_length - EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode_with_length(&exec_ctx, "Zg", 2)); - EXPECT_SLICE_EQ(&exec_ctx, "", - base64_decode_with_length(&exec_ctx, "Zm8", 3)); - EXPECT_SLICE_EQ(&exec_ctx, "", - base64_decode_with_length(&exec_ctx, "Zm9v", 4)); + EXPECT_SLICE_EQ("", base64_decode_with_length("Zg", 2)); + EXPECT_SLICE_EQ("", base64_decode_with_length("Zm8", 3)); + EXPECT_SLICE_EQ("", base64_decode_with_length("Zm9v", 4)); // Test illegal charactors in grpc_chttp2_base64_decode_with_length - EXPECT_SLICE_EQ(&exec_ctx, "", - base64_decode_with_length(&exec_ctx, "Zm:v", 3)); - EXPECT_SLICE_EQ(&exec_ctx, "", - base64_decode_with_length(&exec_ctx, "Zm=v", 3)); + EXPECT_SLICE_EQ("", base64_decode_with_length("Zm:v", 3)); + EXPECT_SLICE_EQ("", base64_decode_with_length("Zm=v", 3)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); return all_ok ? 0 : 1; } diff --git a/test/core/transport/chttp2/bin_decoder_test.cc b/test/core/transport/chttp2/bin_decoder_test.cc new file mode 100644 index 00000000000..d426731dae7 --- /dev/null +++ b/test/core/transport/chttp2/bin_decoder_test.cc @@ -0,0 +1,135 @@ +/* + * + * Copyright 2016 gRPC authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include "src/core/ext/transport/chttp2/transport/bin_decoder.h" + +#include + +#include +#include +#include "src/core/ext/transport/chttp2/transport/bin_encoder.h" +#include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/slice/slice_string_helpers.h" +#include "src/core/lib/support/string.h" + +static int all_ok = 1; + +static void expect_slice_eq(grpc_slice expected, grpc_slice slice, char *debug, + int line) { + if (!grpc_slice_eq(slice, expected)) { + char *hs = grpc_dump_slice(slice, GPR_DUMP_HEX | GPR_DUMP_ASCII); + char *he = grpc_dump_slice(expected, GPR_DUMP_HEX | GPR_DUMP_ASCII); + gpr_log(GPR_ERROR, "FAILED:%d: %s\ngot: %s\nwant: %s", line, debug, hs, + he); + gpr_free(hs); + gpr_free(he); + all_ok = 0; + } + grpc_slice_unref_internal(expected); + grpc_slice_unref_internal(slice); +} + +static grpc_slice base64_encode(const char *s) { + grpc_slice ss = grpc_slice_from_copied_string(s); + grpc_slice out = grpc_chttp2_base64_encode(ss); + grpc_slice_unref_internal(ss); + return out; +} + +static grpc_slice base64_decode(const char *s) { + grpc_slice ss = grpc_slice_from_copied_string(s); + grpc_slice out = grpc_chttp2_base64_decode(ss); + grpc_slice_unref_internal(ss); + return out; +} + +static grpc_slice base64_decode_with_length(const char *s, + size_t output_length) { + grpc_slice ss = grpc_slice_from_copied_string(s); + grpc_slice out = grpc_chttp2_base64_decode_with_length(ss, output_length); + grpc_slice_unref_internal(ss); + return out; +} + +#define EXPECT_SLICE_EQ(expected, slice) \ + expect_slice_eq( \ + exec_ctx, grpc_slice_from_copied_buffer(expected, sizeof(expected) - 1), \ + slice, #slice, __LINE__); + +#define ENCODE_AND_DECODE(s) \ + EXPECT_SLICE_EQ(s, grpc_chttp2_base64_decode_with_length( \ + exec_ctx, base64_encode(s), strlen(s))); + +int main(int argc, char **argv) { + ExecCtx _local_exec_ctx; + + /* ENCODE_AND_DECODE tests grpc_chttp2_base64_decode_with_length(), which + takes encoded base64 strings without pad chars, but output length is + required. */ + /* Base64 test vectors from RFC 4648 */ + ENCODE_AND_DECODE(""); + ENCODE_AND_DECODE("f"); + ENCODE_AND_DECODE("foo"); + ENCODE_AND_DECODE("fo"); + ENCODE_AND_DECODE("foob"); + ENCODE_AND_DECODE("fooba"); + ENCODE_AND_DECODE("foobar"); + + ENCODE_AND_DECODE("\xc0\xc1\xc2\xc3\xc4\xc5"); + + /* Base64 test vectors from RFC 4648, with pad chars */ + /* BASE64("") = "" */ + EXPECT_SLICE_EQ("", base64_decode("")); + /* BASE64("f") = "Zg==" */ + EXPECT_SLICE_EQ("f", base64_decode("Zg==")); + /* BASE64("fo") = "Zm8=" */ + EXPECT_SLICE_EQ("fo", base64_decode("Zm8=")); + /* BASE64("foo") = "Zm9v" */ + EXPECT_SLICE_EQ("foo", base64_decode("Zm9v")); + /* BASE64("foob") = "Zm9vYg==" */ + EXPECT_SLICE_EQ("foob", base64_decode("Zm9vYg==")); + /* BASE64("fooba") = "Zm9vYmE=" */ + EXPECT_SLICE_EQ("fooba", base64_decode("Zm9vYmE=")); + /* BASE64("foobar") = "Zm9vYmFy" */ + EXPECT_SLICE_EQ("foobar", base64_decode("Zm9vYmFy")); + + EXPECT_SLICE_EQ("\xc0\xc1\xc2\xc3\xc4\xc5", base64_decode("wMHCw8TF")); + + // Test illegal input length in grpc_chttp2_base64_decode + EXPECT_SLICE_EQ("", base64_decode("a")); + EXPECT_SLICE_EQ("", base64_decode("ab")); + EXPECT_SLICE_EQ("", base64_decode("abc")); + + // Test illegal charactors in grpc_chttp2_base64_decode + EXPECT_SLICE_EQ("", base64_decode("Zm:v")); + EXPECT_SLICE_EQ("", base64_decode("Zm=v")); + + // Test output_length longer than max possible output length in + // grpc_chttp2_base64_decode_with_length + EXPECT_SLICE_EQ("", base64_decode_with_length("Zg", 2)); + EXPECT_SLICE_EQ("", base64_decode_with_length("Zm8", 3)); + EXPECT_SLICE_EQ("", base64_decode_with_length("Zm9v", 4)); + + // Test illegal charactors in grpc_chttp2_base64_decode_with_length + EXPECT_SLICE_EQ("", base64_decode_with_length("Zm:v", 3)); + EXPECT_SLICE_EQ("", base64_decode_with_length("Zm=v", 3)); + + grpc_exec_ctx_finish(); + + return all_ok ? 0 : 1; +} diff --git a/test/core/transport/chttp2/hpack_encoder_test.c b/test/core/transport/chttp2/hpack_encoder_test.c index ed51dd18592..f3690fc410c 100644 --- a/test/core/transport/chttp2/hpack_encoder_test.c +++ b/test/core/transport/chttp2/hpack_encoder_test.c @@ -45,7 +45,7 @@ size_t cap_to_delete = 0; /* verify that the output generated by encoding the stream matches the hexstring passed in */ -static void verify(grpc_exec_ctx *exec_ctx, size_t window_available, bool eof, +static void verify(size_t window_available, bool eof, bool use_true_binary_metadata, size_t expect_window_used, const char *expected, size_t nheaders, ...) { grpc_slice_buffer output; @@ -67,7 +67,7 @@ static void verify(grpc_exec_ctx *exec_ctx, size_t window_available, bool eof, e[i].prev = &e[i - 1]; } e[i].md = grpc_mdelem_from_slices( - exec_ctx, grpc_slice_intern(grpc_slice_from_static_string(key)), + grpc_slice_intern(grpc_slice_from_static_string(key)), grpc_slice_intern(grpc_slice_from_static_string(value))); } e[0].prev = NULL; @@ -95,11 +95,10 @@ static void verify(grpc_exec_ctx *exec_ctx, size_t window_available, bool eof, .max_frame_size = 16384, .stats = &stats, }; - grpc_chttp2_encode_header(exec_ctx, &g_compressor, NULL, 0, &b, &hopt, - &output); + grpc_chttp2_encode_header(&g_compressor, NULL, 0, &b, &hopt, &output); merged = grpc_slice_merge(output.slices, output.count); - grpc_slice_buffer_destroy_internal(exec_ctx, &output); - grpc_metadata_batch_destroy(exec_ctx, &b); + grpc_slice_buffer_destroy_internal(&output); + grpc_metadata_batch_destroy(&b); if (!grpc_slice_eq(merged, expect)) { char *expect_str = grpc_dump_slice(expect, GPR_DUMP_HEX | GPR_DUMP_ASCII); @@ -112,35 +111,32 @@ static void verify(grpc_exec_ctx *exec_ctx, size_t window_available, bool eof, g_failure = 1; } - grpc_slice_unref_internal(exec_ctx, merged); - grpc_slice_unref_internal(exec_ctx, expect); + grpc_slice_unref_internal(merged); + grpc_slice_unref_internal(expect); } -static void test_basic_headers(grpc_exec_ctx *exec_ctx) { +static void test_basic_headers() { int i; - verify(exec_ctx, 0, false, false, 0, "000005 0104 deadbeef 40 0161 0161", 1, - "a", "a"); - verify(exec_ctx, 0, false, false, 0, "000001 0104 deadbeef be", 1, "a", "a"); - verify(exec_ctx, 0, false, false, 0, "000001 0104 deadbeef be", 1, "a", "a"); - verify(exec_ctx, 0, false, false, 0, "000006 0104 deadbeef be 40 0162 0163", - 2, "a", "a", "b", "c"); - verify(exec_ctx, 0, false, false, 0, "000002 0104 deadbeef bf be", 2, "a", + verify(0, false, false, 0, "000005 0104 deadbeef 40 0161 0161", 1, "a", "a"); + verify(0, false, false, 0, "000001 0104 deadbeef be", 1, "a", "a"); + verify(0, false, false, 0, "000001 0104 deadbeef be", 1, "a", "a"); + verify(0, false, false, 0, "000006 0104 deadbeef be 40 0162 0163", 2, "a", "a", "b", "c"); - verify(exec_ctx, 0, false, false, 0, "000004 0104 deadbeef 7f 00 0164", 1, - "a", "d"); + verify(0, false, false, 0, "000002 0104 deadbeef bf be", 2, "a", "a", "b", + "c"); + verify(0, false, false, 0, "000004 0104 deadbeef 7f 00 0164", 1, "a", "d"); /* flush out what's there to make a few values look very popular */ for (i = 0; i < 350; i++) { - verify(exec_ctx, 0, false, false, 0, "000003 0104 deadbeef c0 bf be", 3, - "a", "a", "b", "c", "a", "d"); + verify(0, false, false, 0, "000003 0104 deadbeef c0 bf be", 3, "a", "a", + "b", "c", "a", "d"); } - verify(exec_ctx, 0, false, false, 0, "000006 0104 deadbeef c0 00 016b 0176", - 2, "a", "a", "k", "v"); + verify(0, false, false, 0, "000006 0104 deadbeef c0 00 016b 0176", 2, "a", + "a", "k", "v"); /* this could be 000004 0104 deadbeef 0f 30 0176 also */ - verify(exec_ctx, 0, false, false, 0, "000004 0104 deadbeef 0f 2f 0176", 1, - "a", "v"); + verify(0, false, false, 0, "000004 0104 deadbeef 0f 2f 0176", 1, "a", "v"); } static void encode_int_to_str(int i, char *p) { @@ -151,7 +147,7 @@ static void encode_int_to_str(int i, char *p) { p[2] = 0; } -static void test_decode_table_overflow(grpc_exec_ctx *exec_ctx) { +static void test_decode_table_overflow() { int i; char key[3], value[3]; char *expect; @@ -174,25 +170,24 @@ static void test_decode_table_overflow(grpc_exec_ctx *exec_ctx) { } if (i > 0) { - verify(exec_ctx, 0, false, false, 0, expect, 2, "aa", "ba", key, value); + verify(0, false, false, 0, expect, 2, "aa", "ba", key, value); } else { - verify(exec_ctx, 0, false, false, 0, expect, 1, key, value); + verify(0, false, false, 0, expect, 1, key, value); } gpr_free(expect); } /* if the above passes, then we must have just knocked this pair out of the decoder stack, and so we'll be forced to re-encode it */ - verify(exec_ctx, 0, false, false, 0, "000007 0104 deadbeef 40 026161 026261", - 1, "aa", "ba"); + verify(0, false, false, 0, "000007 0104 deadbeef 40 026161 026261", 1, "aa", + "ba"); } -static void verify_table_size_change_match_elem_size(grpc_exec_ctx *exec_ctx, - const char *key, +static void verify_table_size_change_match_elem_size(const char *key, const char *value) { grpc_slice_buffer output; grpc_mdelem elem = grpc_mdelem_from_slices( - exec_ctx, grpc_slice_intern(grpc_slice_from_static_string(key)), + grpc_slice_intern(grpc_slice_from_static_string(key)), grpc_slice_intern(grpc_slice_from_static_string(value))); size_t elem_size = grpc_mdelem_get_size_in_hpack_table(elem); size_t initial_table_size = g_compressor.table_size; @@ -214,27 +209,26 @@ static void verify_table_size_change_match_elem_size(grpc_exec_ctx *exec_ctx, .use_true_binary_metadata = false, .max_frame_size = 16384, .stats = &stats}; - grpc_chttp2_encode_header(exec_ctx, &g_compressor, NULL, 0, &b, &hopt, - &output); - grpc_slice_buffer_destroy_internal(exec_ctx, &output); - grpc_metadata_batch_destroy(exec_ctx, &b); + grpc_chttp2_encode_header(&g_compressor, NULL, 0, &b, &hopt, &output); + grpc_slice_buffer_destroy_internal(&output); + grpc_metadata_batch_destroy(&b); GPR_ASSERT(g_compressor.table_size == elem_size + initial_table_size); gpr_free(e); } -static void test_encode_header_size(grpc_exec_ctx *exec_ctx) { - verify_table_size_change_match_elem_size(exec_ctx, "hello", "world"); - verify_table_size_change_match_elem_size(exec_ctx, "hello-bin", "world"); +static void test_encode_header_size() { + verify_table_size_change_match_elem_size("hello", "world"); + verify_table_size_change_match_elem_size("hello-bin", "world"); } -static void run_test(void (*test)(grpc_exec_ctx *exec_ctx), const char *name) { +static void run_test(void (*test)(), const char *name) { gpr_log(GPR_INFO, "RUN TEST: %s", name); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_chttp2_hpack_compressor_init(&g_compressor); - test(&exec_ctx); - grpc_chttp2_hpack_compressor_destroy(&exec_ctx, &g_compressor); - grpc_exec_ctx_finish(&exec_ctx); + test(); + grpc_chttp2_hpack_compressor_destroy(&g_compressor); + grpc_exec_ctx_finish(); } int main(int argc, char **argv) { diff --git a/test/core/transport/chttp2/hpack_parser_fuzzer_test.c b/test/core/transport/chttp2/hpack_parser_fuzzer_test.c index 03834084cbd..944f81f7c61 100644 --- a/test/core/transport/chttp2/hpack_parser_fuzzer_test.c +++ b/test/core/transport/chttp2/hpack_parser_fuzzer_test.c @@ -29,9 +29,7 @@ bool squelch = true; bool leak_check = true; -static void onhdr(grpc_exec_ctx *exec_ctx, void *ud, grpc_mdelem md) { - GRPC_MDELEM_UNREF(exec_ctx, md); -} +static void onhdr(void *ud, grpc_mdelem md) { GRPC_MDELEM_UNREF(md); } static void dont_log(gpr_log_func_args *args) {} int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { @@ -39,13 +37,13 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { if (squelch) gpr_set_log_function(dont_log); grpc_init(); grpc_chttp2_hpack_parser parser; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_chttp2_hpack_parser_init(&exec_ctx, &parser); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_chttp2_hpack_parser_init(&parser); parser.on_header = onhdr; GRPC_ERROR_UNREF(grpc_chttp2_hpack_parser_parse( - &exec_ctx, &parser, grpc_slice_from_static_buffer(data, size))); - grpc_chttp2_hpack_parser_destroy(&exec_ctx, &parser); - grpc_exec_ctx_finish(&exec_ctx); + &parser, grpc_slice_from_static_buffer(data, size))); + grpc_chttp2_hpack_parser_destroy(&parser); + grpc_exec_ctx_finish(); grpc_shutdown(); return 0; } diff --git a/test/core/transport/chttp2/hpack_parser_test.c b/test/core/transport/chttp2/hpack_parser_test.c index 0946c052614..67b527934e3 100644 --- a/test/core/transport/chttp2/hpack_parser_test.c +++ b/test/core/transport/chttp2/hpack_parser_test.c @@ -30,7 +30,7 @@ typedef struct { va_list args; } test_checker; -static void onhdr(grpc_exec_ctx *exec_ctx, void *ud, grpc_mdelem md) { +static void onhdr(void *ud, grpc_mdelem md) { const char *ekey, *evalue; test_checker *chk = ud; ekey = va_arg(chk->args, char *); @@ -39,7 +39,7 @@ static void onhdr(grpc_exec_ctx *exec_ctx, void *ud, grpc_mdelem md) { GPR_ASSERT(evalue); GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDKEY(md), ekey) == 0); GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDVALUE(md), evalue) == 0); - GRPC_MDELEM_UNREF(exec_ctx, md); + GRPC_MDELEM_UNREF(md); } static void test_vector(grpc_chttp2_hpack_parser *parser, @@ -60,10 +60,10 @@ static void test_vector(grpc_chttp2_hpack_parser *parser, grpc_slice_unref(input); for (i = 0; i < nslices; i++) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT(grpc_chttp2_hpack_parser_parse(&exec_ctx, parser, slices[i]) == + exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT(grpc_chttp2_hpack_parser_parse(parser, slices[i]) == GRPC_ERROR_NONE); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } for (i = 0; i < nslices; i++) { @@ -78,9 +78,9 @@ static void test_vector(grpc_chttp2_hpack_parser *parser, static void test_vectors(grpc_slice_split_mode mode) { grpc_chttp2_hpack_parser parser; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_chttp2_hpack_parser_init(&exec_ctx, &parser); + grpc_chttp2_hpack_parser_init(&parser); /* D.2.1 */ test_vector(&parser, mode, "400a 6375 7374 6f6d 2d6b 6579 0d63 7573" @@ -96,9 +96,9 @@ static void test_vectors(grpc_slice_split_mode mode) { "password", "secret", NULL); /* D.2.4 */ test_vector(&parser, mode, "82", ":method", "GET", NULL); - grpc_chttp2_hpack_parser_destroy(&exec_ctx, &parser); + grpc_chttp2_hpack_parser_destroy(&parser); - grpc_chttp2_hpack_parser_init(&exec_ctx, &parser); + grpc_chttp2_hpack_parser_init(&parser); /* D.3.1 */ test_vector(&parser, mode, "8286 8441 0f77 7777 2e65 7861 6d70 6c65" @@ -116,9 +116,9 @@ static void test_vectors(grpc_slice_split_mode mode) { ":method", "GET", ":scheme", "https", ":path", "/index.html", ":authority", "www.example.com", "custom-key", "custom-value", NULL); - grpc_chttp2_hpack_parser_destroy(&exec_ctx, &parser); + grpc_chttp2_hpack_parser_destroy(&parser); - grpc_chttp2_hpack_parser_init(&exec_ctx, &parser); + grpc_chttp2_hpack_parser_init(&parser); /* D.4.1 */ test_vector(&parser, mode, "8286 8441 8cf1 e3c2 e5f2 3a6b a0ab 90f4" @@ -136,11 +136,11 @@ static void test_vectors(grpc_slice_split_mode mode) { ":method", "GET", ":scheme", "https", ":path", "/index.html", ":authority", "www.example.com", "custom-key", "custom-value", NULL); - grpc_chttp2_hpack_parser_destroy(&exec_ctx, &parser); + grpc_chttp2_hpack_parser_destroy(&parser); - grpc_chttp2_hpack_parser_init(&exec_ctx, &parser); - grpc_chttp2_hptbl_set_max_bytes(&exec_ctx, &parser.table, 256); - grpc_chttp2_hptbl_set_current_table_size(&exec_ctx, &parser.table, 256); + grpc_chttp2_hpack_parser_init(&parser); + grpc_chttp2_hptbl_set_max_bytes(&parser.table, 256); + grpc_chttp2_hptbl_set_current_table_size(&parser.table, 256); /* D.5.1 */ test_vector(&parser, mode, "4803 3330 3258 0770 7269 7661 7465 611d" @@ -170,11 +170,11 @@ static void test_vectors(grpc_slice_split_mode mode) { "https://www.example.com", "content-encoding", "gzip", "set-cookie", "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1", NULL); - grpc_chttp2_hpack_parser_destroy(&exec_ctx, &parser); + grpc_chttp2_hpack_parser_destroy(&parser); - grpc_chttp2_hpack_parser_init(&exec_ctx, &parser); - grpc_chttp2_hptbl_set_max_bytes(&exec_ctx, &parser.table, 256); - grpc_chttp2_hptbl_set_current_table_size(&exec_ctx, &parser.table, 256); + grpc_chttp2_hpack_parser_init(&parser); + grpc_chttp2_hptbl_set_max_bytes(&parser.table, 256); + grpc_chttp2_hptbl_set_current_table_size(&parser.table, 256); /* D.6.1 */ test_vector(&parser, mode, "4882 6402 5885 aec3 771a 4b61 96d0 7abe" @@ -201,9 +201,9 @@ static void test_vectors(grpc_slice_split_mode mode) { "https://www.example.com", "content-encoding", "gzip", "set-cookie", "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1", NULL); - grpc_chttp2_hpack_parser_destroy(&exec_ctx, &parser); + grpc_chttp2_hpack_parser_destroy(&parser); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } int main(int argc, char **argv) { diff --git a/test/core/transport/chttp2/hpack_table_test.c b/test/core/transport/chttp2/hpack_table_test.c index 430ece33c70..cbb6b1d7a3d 100644 --- a/test/core/transport/chttp2/hpack_table_test.c +++ b/test/core/transport/chttp2/hpack_table_test.c @@ -44,10 +44,10 @@ static void assert_index(const grpc_chttp2_hptbl *tbl, uint32_t idx, } static void test_static_lookup(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_chttp2_hptbl tbl; - grpc_chttp2_hptbl_init(&exec_ctx, &tbl); + grpc_chttp2_hptbl_init(&tbl); LOG_TEST("test_static_lookup"); assert_index(&tbl, 1, ":authority", ""); @@ -112,8 +112,8 @@ static void test_static_lookup(void) { assert_index(&tbl, 60, "via", ""); assert_index(&tbl, 61, "www-authenticate", ""); - grpc_chttp2_hptbl_destroy(&exec_ctx, &tbl); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_hptbl_destroy(&tbl); + grpc_exec_ctx_finish(); } static void test_many_additions(void) { @@ -124,18 +124,17 @@ static void test_many_additions(void) { LOG_TEST("test_many_additions"); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_chttp2_hptbl_init(&exec_ctx, &tbl); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_chttp2_hptbl_init(&tbl); for (i = 0; i < 100000; i++) { grpc_mdelem elem; gpr_asprintf(&key, "K:%d", i); gpr_asprintf(&value, "VALUE:%d", i); - elem = - grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_copied_string(key), - grpc_slice_from_copied_string(value)); - GPR_ASSERT(grpc_chttp2_hptbl_add(&exec_ctx, &tbl, elem) == GRPC_ERROR_NONE); - GRPC_MDELEM_UNREF(&exec_ctx, elem); + elem = grpc_mdelem_from_slices(grpc_slice_from_copied_string(key), + grpc_slice_from_copied_string(value)); + GPR_ASSERT(grpc_chttp2_hptbl_add(&tbl, elem) == GRPC_ERROR_NONE); + GRPC_MDELEM_UNREF(elem); assert_index(&tbl, 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY, key, value); gpr_free(key); gpr_free(value); @@ -148,25 +147,24 @@ static void test_many_additions(void) { } } - grpc_chttp2_hptbl_destroy(&exec_ctx, &tbl); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_hptbl_destroy(&tbl); + grpc_exec_ctx_finish(); } static grpc_chttp2_hptbl_find_result find_simple(grpc_chttp2_hptbl *tbl, const char *key, const char *value) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_mdelem md = - grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_copied_string(key), - grpc_slice_from_copied_string(value)); + exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_mdelem md = grpc_mdelem_from_slices( + grpc_slice_from_copied_string(key), grpc_slice_from_copied_string(value)); grpc_chttp2_hptbl_find_result r = grpc_chttp2_hptbl_find(tbl, md); - GRPC_MDELEM_UNREF(&exec_ctx, md); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(md); + grpc_exec_ctx_finish(); return r; } static void test_find(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_chttp2_hptbl tbl; uint32_t i; char buffer[32]; @@ -175,21 +173,19 @@ static void test_find(void) { LOG_TEST("test_find"); - grpc_chttp2_hptbl_init(&exec_ctx, &tbl); - elem = - grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_static_string("abc"), - grpc_slice_from_static_string("xyz")); - GPR_ASSERT(grpc_chttp2_hptbl_add(&exec_ctx, &tbl, elem) == GRPC_ERROR_NONE); - GRPC_MDELEM_UNREF(&exec_ctx, elem); - elem = - grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_static_string("abc"), - grpc_slice_from_static_string("123")); - GPR_ASSERT(grpc_chttp2_hptbl_add(&exec_ctx, &tbl, elem) == GRPC_ERROR_NONE); - GRPC_MDELEM_UNREF(&exec_ctx, elem); - elem = grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_static_string("x"), + grpc_chttp2_hptbl_init(&tbl); + elem = grpc_mdelem_from_slices(grpc_slice_from_static_string("abc"), + grpc_slice_from_static_string("xyz")); + GPR_ASSERT(grpc_chttp2_hptbl_add(&tbl, elem) == GRPC_ERROR_NONE); + GRPC_MDELEM_UNREF(elem); + elem = grpc_mdelem_from_slices(grpc_slice_from_static_string("abc"), + grpc_slice_from_static_string("123")); + GPR_ASSERT(grpc_chttp2_hptbl_add(&tbl, elem) == GRPC_ERROR_NONE); + GRPC_MDELEM_UNREF(elem); + elem = grpc_mdelem_from_slices(grpc_slice_from_static_string("x"), grpc_slice_from_static_string("1")); - GPR_ASSERT(grpc_chttp2_hptbl_add(&exec_ctx, &tbl, elem) == GRPC_ERROR_NONE); - GRPC_MDELEM_UNREF(&exec_ctx, elem); + GPR_ASSERT(grpc_chttp2_hptbl_add(&tbl, elem) == GRPC_ERROR_NONE); + GRPC_MDELEM_UNREF(elem); r = find_simple(&tbl, "abc", "123"); GPR_ASSERT(r.index == 2 + GRPC_CHTTP2_LAST_STATIC_ENTRY); @@ -238,11 +234,10 @@ static void test_find(void) { /* overflow the string buffer, check find still works */ for (i = 0; i < 10000; i++) { int64_ttoa(i, buffer); - elem = grpc_mdelem_from_slices(&exec_ctx, - grpc_slice_from_static_string("test"), + elem = grpc_mdelem_from_slices(grpc_slice_from_static_string("test"), grpc_slice_from_copied_string(buffer)); - GPR_ASSERT(grpc_chttp2_hptbl_add(&exec_ctx, &tbl, elem) == GRPC_ERROR_NONE); - GRPC_MDELEM_UNREF(&exec_ctx, elem); + GPR_ASSERT(grpc_chttp2_hptbl_add(&tbl, elem) == GRPC_ERROR_NONE); + GRPC_MDELEM_UNREF(elem); } r = find_simple(&tbl, "abc", "123"); @@ -270,8 +265,8 @@ static void test_find(void) { GPR_ASSERT(r.index != 0); GPR_ASSERT(r.has_value == 0); - grpc_chttp2_hptbl_destroy(&exec_ctx, &tbl); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_hptbl_destroy(&tbl); + grpc_exec_ctx_finish(); } int main(int argc, char **argv) { diff --git a/test/core/transport/connectivity_state_test.c b/test/core/transport/connectivity_state_test.c index 4ef86831073..f0a907d4c78 100644 --- a/test/core/transport/connectivity_state_test.c +++ b/test/core/transport/connectivity_state_test.c @@ -28,14 +28,13 @@ int g_counter; -static void must_succeed(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void must_succeed(void *arg, grpc_error *error) { GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(arg == THE_ARG); g_counter++; } -static void must_fail(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { +static void must_fail(void *arg, grpc_error *error) { GPR_ASSERT(error != GRPC_ERROR_NONE); GPR_ASSERT(arg == THE_ARG); g_counter++; @@ -58,7 +57,7 @@ static void test_connectivity_state_name(void) { static void test_check(void) { grpc_connectivity_state_tracker tracker; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_error *error; gpr_log(GPR_DEBUG, "test_check"); grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx"); @@ -66,8 +65,8 @@ static void test_check(void) { GRPC_CHANNEL_IDLE); GPR_ASSERT(grpc_connectivity_state_check(&tracker) == GRPC_CHANNEL_IDLE); GPR_ASSERT(error == GRPC_ERROR_NONE); - grpc_connectivity_state_destroy(&exec_ctx, &tracker); - grpc_exec_ctx_finish(&exec_ctx); + grpc_connectivity_state_destroy(&tracker); + grpc_exec_ctx_finish(); } static void test_subscribe_then_unsubscribe(void) { @@ -75,23 +74,22 @@ static void test_subscribe_then_unsubscribe(void) { grpc_closure *closure = GRPC_CLOSURE_CREATE(must_fail, THE_ARG, grpc_schedule_on_exec_ctx); grpc_connectivity_state state = GRPC_CHANNEL_IDLE; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_DEBUG, "test_subscribe_then_unsubscribe"); g_counter = 0; grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx"); - GPR_ASSERT(grpc_connectivity_state_notify_on_state_change(&exec_ctx, &tracker, - &state, closure)); - grpc_exec_ctx_flush(&exec_ctx); + GPR_ASSERT(grpc_connectivity_state_notify_on_state_change(&tracker, &state, + closure)); + grpc_exec_ctx_flush(); GPR_ASSERT(state == GRPC_CHANNEL_IDLE); GPR_ASSERT(g_counter == 0); - grpc_connectivity_state_notify_on_state_change(&exec_ctx, &tracker, NULL, - closure); - grpc_exec_ctx_flush(&exec_ctx); + grpc_connectivity_state_notify_on_state_change(&tracker, NULL, closure); + grpc_exec_ctx_flush(); GPR_ASSERT(state == GRPC_CHANNEL_IDLE); GPR_ASSERT(g_counter == 1); - grpc_connectivity_state_destroy(&exec_ctx, &tracker); - grpc_exec_ctx_finish(&exec_ctx); + grpc_connectivity_state_destroy(&tracker); + grpc_exec_ctx_finish(); } static void test_subscribe_then_destroy(void) { @@ -99,17 +97,17 @@ static void test_subscribe_then_destroy(void) { grpc_closure *closure = GRPC_CLOSURE_CREATE(must_succeed, THE_ARG, grpc_schedule_on_exec_ctx); grpc_connectivity_state state = GRPC_CHANNEL_IDLE; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_DEBUG, "test_subscribe_then_destroy"); g_counter = 0; grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx"); - GPR_ASSERT(grpc_connectivity_state_notify_on_state_change(&exec_ctx, &tracker, - &state, closure)); - grpc_exec_ctx_flush(&exec_ctx); + GPR_ASSERT(grpc_connectivity_state_notify_on_state_change(&tracker, &state, + closure)); + grpc_exec_ctx_flush(); GPR_ASSERT(state == GRPC_CHANNEL_IDLE); GPR_ASSERT(g_counter == 0); - grpc_connectivity_state_destroy(&exec_ctx, &tracker); - grpc_exec_ctx_finish(&exec_ctx); + grpc_connectivity_state_destroy(&tracker); + grpc_exec_ctx_finish(); GPR_ASSERT(state == GRPC_CHANNEL_SHUTDOWN); GPR_ASSERT(g_counter == 1); } @@ -119,17 +117,17 @@ static void test_subscribe_with_failure_then_destroy(void) { grpc_closure *closure = GRPC_CLOSURE_CREATE(must_fail, THE_ARG, grpc_schedule_on_exec_ctx); grpc_connectivity_state state = GRPC_CHANNEL_SHUTDOWN; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_DEBUG, "test_subscribe_with_failure_then_destroy"); g_counter = 0; grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_SHUTDOWN, "xxx"); GPR_ASSERT(0 == grpc_connectivity_state_notify_on_state_change( - &exec_ctx, &tracker, &state, closure)); - grpc_exec_ctx_flush(&exec_ctx); + &tracker, &state, closure)); + grpc_exec_ctx_flush(); GPR_ASSERT(state == GRPC_CHANNEL_SHUTDOWN); GPR_ASSERT(g_counter == 0); - grpc_connectivity_state_destroy(&exec_ctx, &tracker); - grpc_exec_ctx_finish(&exec_ctx); + grpc_connectivity_state_destroy(&tracker); + grpc_exec_ctx_finish(); GPR_ASSERT(state == GRPC_CHANNEL_SHUTDOWN); GPR_ASSERT(g_counter == 1); } diff --git a/test/core/transport/metadata_test.c b/test/core/transport/metadata_test.c index cb06fce30bd..a7212477664 100644 --- a/test/core/transport/metadata_test.c +++ b/test/core/transport/metadata_test.c @@ -60,15 +60,15 @@ static void test_create_metadata(bool intern_keys, bool intern_values) { intern_keys, intern_values); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; m1 = grpc_mdelem_from_slices( - &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values)); m2 = grpc_mdelem_from_slices( - &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values)); m3 = grpc_mdelem_from_slices( - &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("c"), intern_values)); GPR_ASSERT(grpc_mdelem_eq(m1, m2)); GPR_ASSERT(!grpc_mdelem_eq(m3, m1)); @@ -77,10 +77,10 @@ static void test_create_metadata(bool intern_keys, bool intern_values) { GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDKEY(m1), "a") == 0); GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDVALUE(m1), "b") == 0); GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDVALUE(m3), "c") == 0); - GRPC_MDELEM_UNREF(&exec_ctx, m1); - GRPC_MDELEM_UNREF(&exec_ctx, m2); - GRPC_MDELEM_UNREF(&exec_ctx, m3); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(m1); + GRPC_MDELEM_UNREF(m2); + GRPC_MDELEM_UNREF(m3); + grpc_exec_ctx_finish(); grpc_shutdown(); } @@ -95,19 +95,15 @@ static void test_create_many_ephemeral_metadata(bool intern_keys, intern_keys, intern_values); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; /* add, and immediately delete a bunch of different elements */ for (i = 0; i < MANY; i++) { gpr_ltoa(i, buffer); - GRPC_MDELEM_UNREF( - &exec_ctx, - grpc_mdelem_from_slices( - &exec_ctx, - maybe_intern(grpc_slice_from_static_string("a"), intern_keys), - maybe_intern(grpc_slice_from_copied_string(buffer), - intern_values))); + GRPC_MDELEM_UNREF(grpc_mdelem_from_slices( + maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + maybe_intern(grpc_slice_from_copied_string(buffer), intern_values))); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_shutdown(); } @@ -120,28 +116,28 @@ static void test_create_many_persistant_metadata(void) { gpr_log(GPR_INFO, "test_create_many_persistant_metadata"); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; /* add phase */ for (i = 0; i < MANY; i++) { gpr_ltoa(i, buffer); created[i] = grpc_mdelem_from_slices( - &exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("a")), + grpc_slice_intern(grpc_slice_from_static_string("a")), grpc_slice_intern(grpc_slice_from_static_string(buffer))); } /* verify phase */ for (i = 0; i < MANY; i++) { gpr_ltoa(i, buffer); md = grpc_mdelem_from_slices( - &exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("a")), + grpc_slice_intern(grpc_slice_from_static_string("a")), grpc_slice_intern(grpc_slice_from_static_string(buffer))); GPR_ASSERT(grpc_mdelem_eq(md, created[i])); - GRPC_MDELEM_UNREF(&exec_ctx, md); + GRPC_MDELEM_UNREF(md); } /* cleanup phase */ for (i = 0; i < MANY; i++) { - GRPC_MDELEM_UNREF(&exec_ctx, created[i]); + GRPC_MDELEM_UNREF(created[i]); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_shutdown(); gpr_free(created); @@ -154,31 +150,25 @@ static void test_spin_creating_the_same_thing(bool intern_keys, intern_keys, intern_values); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_mdelem a, b, c; GRPC_MDELEM_UNREF( - &exec_ctx, a = grpc_mdelem_from_slices( - &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values))); GRPC_MDELEM_UNREF( - &exec_ctx, b = grpc_mdelem_from_slices( - &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values))); GRPC_MDELEM_UNREF( - &exec_ctx, c = grpc_mdelem_from_slices( - &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values))); if (intern_keys && intern_values) { GPR_ASSERT(a.payload == b.payload); GPR_ASSERT(a.payload == c.payload); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_shutdown(); } @@ -187,16 +177,16 @@ static void test_identity_laws(bool intern_keys, bool intern_values) { intern_keys, intern_values); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; grpc_mdelem a, b, c; a = grpc_mdelem_from_slices( - &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values)); b = grpc_mdelem_from_slices( - &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values)); c = grpc_mdelem_from_slices( - &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values)); GPR_ASSERT(grpc_mdelem_eq(a, a)); GPR_ASSERT(grpc_mdelem_eq(b, b)); @@ -215,10 +205,10 @@ static void test_identity_laws(bool intern_keys, bool intern_values) { GPR_ASSERT(a.payload != c.payload); GPR_ASSERT(b.payload != c.payload); } - GRPC_MDELEM_UNREF(&exec_ctx, a); - GRPC_MDELEM_UNREF(&exec_ctx, b); - GRPC_MDELEM_UNREF(&exec_ctx, c); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(a); + GRPC_MDELEM_UNREF(b); + GRPC_MDELEM_UNREF(c); + grpc_exec_ctx_finish(); grpc_shutdown(); } @@ -233,7 +223,7 @@ static void test_things_stick_around(void) { gpr_log(GPR_INFO, "test_things_stick_around"); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; for (i = 0; i < nstrs; i++) { gpr_asprintf(&buffer, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx%" PRIuPTR "x", i); @@ -244,7 +234,7 @@ static void test_things_stick_around(void) { for (i = 0; i < nstrs; i++) { grpc_slice_ref_internal(strs[i]); - grpc_slice_unref_internal(&exec_ctx, strs[i]); + grpc_slice_unref_internal(strs[i]); } for (i = 0; i < nstrs; i++) { @@ -256,18 +246,18 @@ static void test_things_stick_around(void) { } for (i = 0; i < nstrs; i++) { - grpc_slice_unref_internal(&exec_ctx, strs[shuf[i]]); + grpc_slice_unref_internal(strs[shuf[i]]); for (j = i + 1; j < nstrs; j++) { gpr_asprintf(&buffer, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx%" PRIuPTR "x", shuf[j]); test = grpc_slice_intern(grpc_slice_from_static_string(buffer)); GPR_ASSERT(grpc_slice_is_equivalent(test, strs[shuf[j]])); - grpc_slice_unref_internal(&exec_ctx, test); + grpc_slice_unref_internal(test); gpr_free(buffer); } } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_shutdown(); gpr_free(strs); gpr_free(shuf); @@ -280,39 +270,38 @@ static void test_user_data_works(void) { gpr_log(GPR_INFO, "test_user_data_works"); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; ud1 = gpr_malloc(sizeof(int)); *ud1 = 1; ud2 = gpr_malloc(sizeof(int)); *ud2 = 2; md = grpc_mdelem_from_slices( - &exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("abc")), + grpc_slice_intern(grpc_slice_from_static_string("abc")), grpc_slice_intern(grpc_slice_from_static_string("123"))); grpc_mdelem_set_user_data(md, gpr_free, ud1); grpc_mdelem_set_user_data(md, gpr_free, ud2); GPR_ASSERT(grpc_mdelem_get_user_data(md, gpr_free) == ud1); - GRPC_MDELEM_UNREF(&exec_ctx, md); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(md); + grpc_exec_ctx_finish(); grpc_shutdown(); } -static void verify_ascii_header_size(grpc_exec_ctx *exec_ctx, const char *key, - const char *value, bool intern_key, - bool intern_value) { +static void verify_ascii_header_size(const char *key, const char *value, + bool intern_key, bool intern_value) { grpc_mdelem elem = grpc_mdelem_from_slices( - exec_ctx, maybe_intern(grpc_slice_from_static_string(key), intern_key), + maybe_intern(grpc_slice_from_static_string(key), intern_key), maybe_intern(grpc_slice_from_static_string(value), intern_value)); size_t elem_size = grpc_mdelem_get_size_in_hpack_table(elem); size_t expected_size = 32 + strlen(key) + strlen(value); GPR_ASSERT(expected_size == elem_size); - GRPC_MDELEM_UNREF(exec_ctx, elem); + GRPC_MDELEM_UNREF(elem); } -static void verify_binary_header_size(grpc_exec_ctx *exec_ctx, const char *key, - const uint8_t *value, size_t value_len, - bool intern_key, bool intern_value) { +static void verify_binary_header_size(const char *key, const uint8_t *value, + size_t value_len, bool intern_key, + bool intern_value) { grpc_mdelem elem = grpc_mdelem_from_slices( - exec_ctx, maybe_intern(grpc_slice_from_static_string(key), intern_key), + maybe_intern(grpc_slice_from_static_string(key), intern_key), maybe_intern(grpc_slice_from_static_buffer(value, value_len), intern_value)); GPR_ASSERT(grpc_is_binary_header(GRPC_MDKEY(elem))); @@ -322,9 +311,9 @@ static void verify_binary_header_size(grpc_exec_ctx *exec_ctx, const char *key, grpc_slice base64_encoded = grpc_chttp2_base64_encode(value_slice); size_t expected_size = 32 + strlen(key) + GRPC_SLICE_LENGTH(base64_encoded); GPR_ASSERT(expected_size == elem_size); - grpc_slice_unref_internal(exec_ctx, value_slice); - grpc_slice_unref_internal(exec_ctx, base64_encoded); - GRPC_MDELEM_UNREF(exec_ctx, elem); + grpc_slice_unref_internal(value_slice); + grpc_slice_unref_internal(base64_encoded); + GRPC_MDELEM_UNREF(elem); } #define BUFFER_SIZE 64 @@ -332,27 +321,24 @@ static void test_mdelem_sizes_in_hpack(bool intern_key, bool intern_value) { gpr_log(GPR_INFO, "test_mdelem_size: intern_key=%d intern_value=%d", intern_key, intern_value); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; uint8_t binary_value[BUFFER_SIZE] = {0}; for (uint8_t i = 0; i < BUFFER_SIZE; i++) { binary_value[i] = i; } - verify_ascii_header_size(&exec_ctx, "hello", "world", intern_key, - intern_value); - verify_ascii_header_size(&exec_ctx, "hello", - "worldxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", intern_key, - intern_value); - verify_ascii_header_size(&exec_ctx, ":scheme", "http", intern_key, - intern_value); + verify_ascii_header_size("hello", "world", intern_key, intern_value); + verify_ascii_header_size("hello", "worldxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + intern_key, intern_value); + verify_ascii_header_size(":scheme", "http", intern_key, intern_value); for (uint8_t i = 0; i < BUFFER_SIZE; i++) { - verify_binary_header_size(&exec_ctx, "hello-bin", binary_value, i, - intern_key, intern_value); + verify_binary_header_size("hello-bin", binary_value, i, intern_key, + intern_value); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_shutdown(); } @@ -360,13 +346,13 @@ static void test_copied_static_metadata(bool dup_key, bool dup_value) { gpr_log(GPR_INFO, "test_static_metadata: dup_key=%d dup_value=%d", dup_key, dup_value); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx = GRPC_EXEC_CTX_INIT; for (size_t i = 0; i < GRPC_STATIC_MDELEM_COUNT; i++) { grpc_mdelem p = GRPC_MAKE_MDELEM(&grpc_static_mdelem_table[i], GRPC_MDELEM_STORAGE_STATIC); grpc_mdelem q = - grpc_mdelem_from_slices(&exec_ctx, maybe_dup(GRPC_MDKEY(p), dup_key), + grpc_mdelem_from_slices(maybe_dup(GRPC_MDKEY(p), dup_key), maybe_dup(GRPC_MDVALUE(p), dup_value)); GPR_ASSERT(grpc_mdelem_eq(p, q)); if (dup_key || dup_value) { @@ -374,11 +360,11 @@ static void test_copied_static_metadata(bool dup_key, bool dup_value) { } else { GPR_ASSERT(p.payload == q.payload); } - GRPC_MDELEM_UNREF(&exec_ctx, p); - GRPC_MDELEM_UNREF(&exec_ctx, q); + GRPC_MDELEM_UNREF(p); + GRPC_MDELEM_UNREF(q); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_shutdown(); } diff --git a/test/core/transport/status_conversion_test.c b/test/core/transport/status_conversion_test.c index de8fa4458a6..d91f3765c6e 100644 --- a/test/core/transport/status_conversion_test.c +++ b/test/core/transport/status_conversion_test.c @@ -22,12 +22,9 @@ #define GRPC_STATUS_TO_HTTP2_ERROR(a, b) \ GPR_ASSERT(grpc_status_to_http2_error(a) == (b)) -#define HTTP2_ERROR_TO_GRPC_STATUS(a, deadline, b) \ - do { \ - grpc_exec_ctx my_exec_ctx = GRPC_EXEC_CTX_INIT; \ - GPR_ASSERT(grpc_http2_error_to_grpc_status(&my_exec_ctx, a, deadline) == \ - (b)); \ - grpc_exec_ctx_finish(&my_exec_ctx); \ +#define HTTP2_ERROR_TO_GRPC_STATUS(a, deadline, b) \ + do { \ + GPR_ASSERT(grpc_http2_error_to_grpc_status(a, deadline) == (b)); \ } while (0) #define GRPC_STATUS_TO_HTTP2_STATUS(a, b) \ GPR_ASSERT(grpc_status_to_http2_status(a) == (b)) diff --git a/test/core/transport/stream_owned_slice_test.c b/test/core/transport/stream_owned_slice_test.c index 774ad4e72e9..f380763a6c3 100644 --- a/test/core/transport/stream_owned_slice_test.c +++ b/test/core/transport/stream_owned_slice_test.c @@ -22,7 +22,7 @@ #include -static void do_nothing(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) {} +static void do_nothing(void *arg, grpc_error *error) {} int main(int argc, char **argv) { grpc_test_init(argc, argv); diff --git a/test/core/util/mock_endpoint.c b/test/core/util/mock_endpoint.cc similarity index 76% rename from test/core/util/mock_endpoint.c rename to test/core/util/mock_endpoint.cc index bd386b21488..b7017057b07 100644 --- a/test/core/util/mock_endpoint.c +++ b/test/core/util/mock_endpoint.cc @@ -40,13 +40,13 @@ typedef struct grpc_mock_endpoint { grpc_resource_user *resource_user; } grpc_mock_endpoint; -static void me_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_slice_buffer *slices, grpc_closure *cb) { +static void me_read(grpc_endpoint *ep, grpc_slice_buffer *slices, + grpc_closure *cb) { grpc_mock_endpoint *m = (grpc_mock_endpoint *)ep; gpr_mu_lock(&m->mu); if (m->read_buffer.count > 0) { grpc_slice_buffer_swap(&m->read_buffer, slices); - GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); } else { m->on_read = cb; m->on_read_out = slices; @@ -54,40 +54,38 @@ static void me_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, gpr_mu_unlock(&m->mu); } -static void me_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_slice_buffer *slices, grpc_closure *cb) { +static void me_write(grpc_endpoint *ep, grpc_slice_buffer *slices, + grpc_closure *cb) { grpc_mock_endpoint *m = (grpc_mock_endpoint *)ep; for (size_t i = 0; i < slices->count; i++) { m->on_write(slices->slices[i]); } - GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); } -static void me_add_to_pollset(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_pollset *pollset) {} +static void me_add_to_pollset(grpc_endpoint *ep, grpc_pollset *pollset) {} -static void me_add_to_pollset_set(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, +static void me_add_to_pollset_set(grpc_endpoint *ep, grpc_pollset_set *pollset) {} -static void me_shutdown(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_error *why) { +static void me_shutdown(grpc_endpoint *ep, grpc_error *why) { grpc_mock_endpoint *m = (grpc_mock_endpoint *)ep; gpr_mu_lock(&m->mu); if (m->on_read) { - GRPC_CLOSURE_SCHED(exec_ctx, m->on_read, + GRPC_CLOSURE_SCHED(m->on_read, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Endpoint Shutdown", &why, 1)); m->on_read = NULL; } gpr_mu_unlock(&m->mu); - grpc_resource_user_shutdown(exec_ctx, m->resource_user); + grpc_resource_user_shutdown(m->resource_user); GRPC_ERROR_UNREF(why); } -static void me_destroy(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep) { +static void me_destroy(grpc_endpoint *ep) { grpc_mock_endpoint *m = (grpc_mock_endpoint *)ep; grpc_slice_buffer_destroy(&m->read_buffer); - grpc_resource_user_unref(exec_ctx, m->resource_user); + grpc_resource_user_unref(m->resource_user); gpr_free(m); } @@ -123,13 +121,12 @@ grpc_endpoint *grpc_mock_endpoint_create(void (*on_write)(grpc_slice slice), return &m->base; } -void grpc_mock_endpoint_put_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_slice slice) { +void grpc_mock_endpoint_put_read(grpc_endpoint *ep, grpc_slice slice) { grpc_mock_endpoint *m = (grpc_mock_endpoint *)ep; gpr_mu_lock(&m->mu); if (m->on_read != NULL) { grpc_slice_buffer_add(m->on_read_out, slice); - GRPC_CLOSURE_SCHED(exec_ctx, m->on_read, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(m->on_read, GRPC_ERROR_NONE); m->on_read = NULL; } else { grpc_slice_buffer_add(&m->read_buffer, slice); diff --git a/test/core/util/mock_endpoint.h b/test/core/util/mock_endpoint.h index 73b08dca31c..b59d67733b2 100644 --- a/test/core/util/mock_endpoint.h +++ b/test/core/util/mock_endpoint.h @@ -23,8 +23,7 @@ grpc_endpoint *grpc_mock_endpoint_create(void (*on_write)(grpc_slice slice), grpc_resource_quota *resource_quota); -void grpc_mock_endpoint_put_read(grpc_exec_ctx *exec_ctx, - grpc_endpoint *mock_endpoint, +void grpc_mock_endpoint_put_read(grpc_endpoint *mock_endpoint, grpc_slice slice); #endif diff --git a/test/core/util/passthru_endpoint.c b/test/core/util/passthru_endpoint.cc similarity index 80% rename from test/core/util/passthru_endpoint.c rename to test/core/util/passthru_endpoint.cc index 38a47584d57..4fcae991eb8 100644 --- a/test/core/util/passthru_endpoint.c +++ b/test/core/util/passthru_endpoint.cc @@ -55,16 +55,16 @@ struct passthru_endpoint { half server; }; -static void me_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_slice_buffer *slices, grpc_closure *cb) { +static void me_read(grpc_endpoint *ep, grpc_slice_buffer *slices, + grpc_closure *cb) { half *m = (half *)ep; gpr_mu_lock(&m->parent->mu); if (m->parent->shutdown) { GRPC_CLOSURE_SCHED( - exec_ctx, cb, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Already shutdown")); + cb, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Already shutdown")); } else if (m->read_buffer.count > 0) { grpc_slice_buffer_swap(&m->read_buffer, slices); - GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); } else { m->on_read = cb; m->on_read_out = slices; @@ -77,8 +77,8 @@ static half *other_half(half *h) { return &h->parent->client; } -static void me_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_slice_buffer *slices, grpc_closure *cb) { +static void me_write(grpc_endpoint *ep, grpc_slice_buffer *slices, + grpc_closure *cb) { half *m = other_half((half *)ep); gpr_mu_lock(&m->parent->mu); grpc_error *error = GRPC_ERROR_NONE; @@ -89,7 +89,7 @@ static void me_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, for (size_t i = 0; i < slices->count; i++) { grpc_slice_buffer_add(m->on_read_out, grpc_slice_copy(slices->slices[i])); } - GRPC_CLOSURE_SCHED(exec_ctx, m->on_read, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(m->on_read, GRPC_ERROR_NONE); m->on_read = NULL; } else { for (size_t i = 0; i < slices->count; i++) { @@ -98,48 +98,46 @@ static void me_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, } } gpr_mu_unlock(&m->parent->mu); - GRPC_CLOSURE_SCHED(exec_ctx, cb, error); + GRPC_CLOSURE_SCHED(cb, error); } -static void me_add_to_pollset(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_pollset *pollset) {} +static void me_add_to_pollset(grpc_endpoint *ep, grpc_pollset *pollset) {} -static void me_add_to_pollset_set(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, +static void me_add_to_pollset_set(grpc_endpoint *ep, grpc_pollset_set *pollset) {} -static void me_shutdown(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_error *why) { +static void me_shutdown(grpc_endpoint *ep, grpc_error *why) { half *m = (half *)ep; gpr_mu_lock(&m->parent->mu); m->parent->shutdown = true; if (m->on_read) { GRPC_CLOSURE_SCHED( - exec_ctx, m->on_read, + m->on_read, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING("Shutdown", &why, 1)); m->on_read = NULL; } m = other_half(m); if (m->on_read) { GRPC_CLOSURE_SCHED( - exec_ctx, m->on_read, + m->on_read, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING("Shutdown", &why, 1)); m->on_read = NULL; } gpr_mu_unlock(&m->parent->mu); - grpc_resource_user_shutdown(exec_ctx, m->resource_user); + grpc_resource_user_shutdown(m->resource_user); GRPC_ERROR_UNREF(why); } -static void me_destroy(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep) { +static void me_destroy(grpc_endpoint *ep) { passthru_endpoint *p = ((half *)ep)->parent; gpr_mu_lock(&p->mu); if (0 == --p->halves) { gpr_mu_unlock(&p->mu); gpr_mu_destroy(&p->mu); - grpc_slice_buffer_destroy_internal(exec_ctx, &p->client.read_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &p->server.read_buffer); - grpc_resource_user_unref(exec_ctx, p->client.resource_user); - grpc_resource_user_unref(exec_ctx, p->server.resource_user); + grpc_slice_buffer_destroy_internal(&p->client.read_buffer); + grpc_slice_buffer_destroy_internal(&p->server.read_buffer); + grpc_resource_user_unref(p->client.resource_user); + grpc_resource_user_unref(p->server.resource_user); gpr_free(p); } else { gpr_mu_unlock(&p->mu); diff --git a/test/core/util/passthru_endpoint.h b/test/core/util/passthru_endpoint.h index da769024a54..6d28c2cbcda 100644 --- a/test/core/util/passthru_endpoint.h +++ b/test/core/util/passthru_endpoint.h @@ -21,6 +21,10 @@ #include "src/core/lib/iomgr/endpoint.h" +#ifdef __cplusplus +extern "C" { +#endif + typedef struct { int num_writes; } grpc_passthru_endpoint_stats; void grpc_passthru_endpoint_create(grpc_endpoint **client, @@ -28,4 +32,8 @@ void grpc_passthru_endpoint_create(grpc_endpoint **client, grpc_resource_quota *resource_quota, grpc_passthru_endpoint_stats *stats); +#ifdef __cplusplus +} +#endif + #endif diff --git a/test/core/util/port.c b/test/core/util/port.cc similarity index 100% rename from test/core/util/port.c rename to test/core/util/port.cc diff --git a/test/core/util/port_server_client.c b/test/core/util/port_server_client.cc similarity index 70% rename from test/core/util/port_server_client.c rename to test/core/util/port_server_client.cc index 7b94ac4ada3..253a1df29ea 100644 --- a/test/core/util/port_server_client.c +++ b/test/core/util/port_server_client.cc @@ -40,22 +40,19 @@ typedef struct freereq { int done; } freereq; -static void destroy_pops_and_shutdown(grpc_exec_ctx *exec_ctx, void *p, - grpc_error *error) { +static void destroy_pops_and_shutdown(void *p, grpc_error *error) { grpc_pollset *pollset = grpc_polling_entity_pollset((grpc_polling_entity *)p); - grpc_pollset_destroy(exec_ctx, pollset); + grpc_pollset_destroy(pollset); gpr_free(pollset); } -static void freed_port_from_server(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void freed_port_from_server(void *arg, grpc_error *error) { freereq *pr = (freereq *)arg; gpr_mu_lock(pr->mu); pr->done = 1; GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&pr->pops), - NULL)); + grpc_pollset_kick(grpc_polling_entity_pollset(&pr->pops), NULL)); gpr_mu_unlock(pr->mu); } @@ -65,7 +62,7 @@ void grpc_free_port_using_server(int port) { grpc_httpcli_response rsp; freereq pr; char *path; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_closure *shutdown_closure; grpc_init(); @@ -80,37 +77,36 @@ void grpc_free_port_using_server(int port) { shutdown_closure = GRPC_CLOSURE_CREATE(destroy_pops_and_shutdown, &pr.pops, grpc_schedule_on_exec_ctx); - req.host = GRPC_PORT_SERVER_ADDRESS; + req.host = (char *)GRPC_PORT_SERVER_ADDRESS; gpr_asprintf(&path, "/drop/%d", port); req.http.path = path; grpc_httpcli_context_init(&context); grpc_resource_quota *resource_quota = grpc_resource_quota_create("port_server_client/free"); - grpc_httpcli_get(&exec_ctx, &context, &pr.pops, resource_quota, &req, - grpc_exec_ctx_now(&exec_ctx) + 30 * GPR_MS_PER_SEC, + grpc_httpcli_get(&context, &pr.pops, resource_quota, &req, + grpc_exec_ctx_now() + 30 * GPR_MS_PER_SEC, GRPC_CLOSURE_CREATE(freed_port_from_server, &pr, grpc_schedule_on_exec_ctx), &rsp); - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); - grpc_exec_ctx_flush(&exec_ctx); + grpc_resource_quota_unref_internal(resource_quota); + grpc_exec_ctx_flush(); gpr_mu_lock(pr.mu); while (!pr.done) { grpc_pollset_worker *worker = NULL; if (!GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&pr.pops), - &worker, - grpc_exec_ctx_now(&exec_ctx) + GPR_MS_PER_SEC))) { + grpc_pollset_work(grpc_polling_entity_pollset(&pr.pops), &worker, + grpc_exec_ctx_now() + GPR_MS_PER_SEC))) { pr.done = 1; } } gpr_mu_unlock(pr.mu); - grpc_httpcli_context_destroy(&exec_ctx, &context); - grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&pr.pops), + grpc_httpcli_context_destroy(&context); + grpc_pollset_shutdown(grpc_polling_entity_pollset(&pr.pops), shutdown_closure); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_free(path); grpc_http_response_destroy(&rsp); @@ -127,8 +123,7 @@ typedef struct portreq { grpc_httpcli_response response; } portreq; -static void got_port_from_server(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void got_port_from_server(void *arg, grpc_error *error) { size_t i; int port = 0; portreq *pr = (portreq *)arg; @@ -154,8 +149,7 @@ static void got_port_from_server(grpc_exec_ctx *exec_ctx, void *arg, pr->port = 0; GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&pr->pops), - NULL)); + grpc_pollset_kick(grpc_polling_entity_pollset(&pr->pops), NULL)); gpr_mu_unlock(pr->mu); return; } @@ -167,17 +161,17 @@ static void got_port_from_server(grpc_exec_ctx *exec_ctx, void *arg, GPR_TIMESPAN))); pr->retries++; req.host = pr->server; - req.http.path = "/get"; + req.http.path = (char *)"/get"; grpc_http_response_destroy(&pr->response); memset(&pr->response, 0, sizeof(pr->response)); grpc_resource_quota *resource_quota = grpc_resource_quota_create("port_server_client/pick_retry"); - grpc_httpcli_get(exec_ctx, pr->ctx, &pr->pops, resource_quota, &req, - grpc_exec_ctx_now(exec_ctx) + 30 * GPR_MS_PER_SEC, + grpc_httpcli_get(pr->ctx, &pr->pops, resource_quota, &req, + grpc_exec_ctx_now() + 30 * GPR_MS_PER_SEC, GRPC_CLOSURE_CREATE(got_port_from_server, pr, grpc_schedule_on_exec_ctx), &pr->response); - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); return; } GPR_ASSERT(response); @@ -191,8 +185,7 @@ static void got_port_from_server(grpc_exec_ctx *exec_ctx, void *arg, pr->port = port; GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&pr->pops), - NULL)); + grpc_pollset_kick(grpc_polling_entity_pollset(&pr->pops), NULL)); gpr_mu_unlock(pr->mu); } @@ -200,7 +193,7 @@ int grpc_pick_port_using_server(void) { grpc_httpcli_context context; grpc_httpcli_request req; portreq pr; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_closure *shutdown_closure; grpc_init(); @@ -213,40 +206,39 @@ int grpc_pick_port_using_server(void) { shutdown_closure = GRPC_CLOSURE_CREATE(destroy_pops_and_shutdown, &pr.pops, grpc_schedule_on_exec_ctx); pr.port = -1; - pr.server = GRPC_PORT_SERVER_ADDRESS; + pr.server = (char *)GRPC_PORT_SERVER_ADDRESS; pr.ctx = &context; - req.host = GRPC_PORT_SERVER_ADDRESS; - req.http.path = "/get"; + req.host = (char *)GRPC_PORT_SERVER_ADDRESS; + req.http.path = (char *)"/get"; grpc_httpcli_context_init(&context); grpc_resource_quota *resource_quota = grpc_resource_quota_create("port_server_client/pick"); grpc_httpcli_get( - &exec_ctx, &context, &pr.pops, resource_quota, &req, - grpc_exec_ctx_now(&exec_ctx) + 30 * GPR_MS_PER_SEC, + &context, &pr.pops, resource_quota, &req, + grpc_exec_ctx_now() + 30 * GPR_MS_PER_SEC, GRPC_CLOSURE_CREATE(got_port_from_server, &pr, grpc_schedule_on_exec_ctx), &pr.response); - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); - grpc_exec_ctx_flush(&exec_ctx); + grpc_resource_quota_unref_internal(resource_quota); + grpc_exec_ctx_flush(); gpr_mu_lock(pr.mu); while (pr.port == -1) { grpc_pollset_worker *worker = NULL; if (!GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&pr.pops), - &worker, - grpc_exec_ctx_now(&exec_ctx) + GPR_MS_PER_SEC))) { + grpc_pollset_work(grpc_polling_entity_pollset(&pr.pops), &worker, + grpc_exec_ctx_now() + GPR_MS_PER_SEC))) { pr.port = 0; } } gpr_mu_unlock(pr.mu); grpc_http_response_destroy(&pr.response); - grpc_httpcli_context_destroy(&exec_ctx, &context); - grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&pr.pops), + grpc_httpcli_context_destroy(&context); + grpc_pollset_shutdown(grpc_polling_entity_pollset(&pr.pops), shutdown_closure); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_shutdown(); return pr.port; diff --git a/test/core/util/port_server_client.h b/test/core/util/port_server_client.h index 86dd7018ffd..a88026ebe82 100644 --- a/test/core/util/port_server_client.h +++ b/test/core/util/port_server_client.h @@ -24,7 +24,15 @@ // must be synchronized with tools/run_tests/python_utils/start_port_server.py #define GRPC_PORT_SERVER_ADDRESS "localhost:32766" +#ifdef __cplusplus +extern "C" { +#endif + int grpc_pick_port_using_server(void); void grpc_free_port_using_server(int port); +#ifdef __cplusplus +} +#endif + #endif // GRPC_TEST_CORE_UTIL_PORT_SERVER_CLIENT_H diff --git a/test/core/util/reconnect_server.c b/test/core/util/reconnect_server.c index 9c56e02e8ec..ef4b5e01cdf 100644 --- a/test/core/util/reconnect_server.c +++ b/test/core/util/reconnect_server.c @@ -55,7 +55,7 @@ static void pretty_print_backoffs(reconnect_server *server) { } } -static void on_connect(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *tcp, +static void on_connect(void *arg, grpc_endpoint *tcp, grpc_pollset *accepting_pollset, grpc_tcp_server_acceptor *acceptor) { gpr_free(acceptor); @@ -65,9 +65,9 @@ static void on_connect(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *tcp, gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); timestamp_list *new_tail; peer = grpc_endpoint_get_peer(tcp); - grpc_endpoint_shutdown(exec_ctx, tcp, + grpc_endpoint_shutdown(tcp, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Connected")); - grpc_endpoint_destroy(exec_ctx, tcp); + grpc_endpoint_destroy(tcp); if (peer) { last_colon = strrchr(peer, ':'); if (server->peer == NULL) { diff --git a/test/core/util/test_tcp_server.c b/test/core/util/test_tcp_server.cc similarity index 74% rename from test/core/util/test_tcp_server.c rename to test/core/util/test_tcp_server.cc index 611ecb330c1..8b482b36e0a 100644 --- a/test/core/util/test_tcp_server.c +++ b/test/core/util/test_tcp_server.cc @@ -33,9 +33,8 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -static void on_server_destroyed(grpc_exec_ctx *exec_ctx, void *data, - grpc_error *error) { - test_tcp_server *server = data; +static void on_server_destroyed(void *data, grpc_error *error) { + test_tcp_server *server = (test_tcp_server *)data; server->shutdown = 1; } @@ -46,7 +45,7 @@ void test_tcp_server_init(test_tcp_server *server, GRPC_CLOSURE_INIT(&server->shutdown_complete, on_server_destroyed, server, grpc_schedule_on_exec_ctx); server->shutdown = 0; - server->pollset = gpr_zalloc(grpc_pollset_size()); + server->pollset = (grpc_pollset *)gpr_zalloc(grpc_pollset_size()); grpc_pollset_init(server->pollset, &server->mu); server->on_connect = on_connect; server->cb_data = user_data; @@ -56,51 +55,49 @@ void test_tcp_server_start(test_tcp_server *server, int port) { grpc_resolved_address resolved_addr; struct sockaddr_in *addr = (struct sockaddr_in *)resolved_addr.addr; int port_added; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; addr->sin_family = AF_INET; addr->sin_port = htons((uint16_t)port); memset(&addr->sin_addr, 0, sizeof(addr->sin_addr)); - grpc_error *error = grpc_tcp_server_create( - &exec_ctx, &server->shutdown_complete, NULL, &server->tcp_server); + grpc_error *error = grpc_tcp_server_create(&server->shutdown_complete, NULL, + &server->tcp_server); GPR_ASSERT(error == GRPC_ERROR_NONE); error = grpc_tcp_server_add_port(server->tcp_server, &resolved_addr, &port_added); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(port_added == port); - grpc_tcp_server_start(&exec_ctx, server->tcp_server, &server->pollset, 1, + grpc_tcp_server_start(server->tcp_server, &server->pollset, 1, server->on_connect, server->cb_data); gpr_log(GPR_INFO, "test tcp server listening on 0.0.0.0:%d", port); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } void test_tcp_server_poll(test_tcp_server *server, int seconds) { grpc_pollset_worker *worker = NULL; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_millis deadline = grpc_timespec_to_millis_round_up( grpc_timeout_seconds_to_deadline(seconds)); gpr_mu_lock(server->mu); - GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, server->pollset, &worker, deadline)); + GRPC_LOG_IF_ERROR("pollset_work", + grpc_pollset_work(server->pollset, &worker, deadline)); gpr_mu_unlock(server->mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } -static void do_nothing(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) {} -static void finish_pollset(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { - grpc_pollset_destroy(exec_ctx, arg); +static void do_nothing(void *arg, grpc_error *error) {} +static void finish_pollset(void *arg, grpc_error *error) { + grpc_pollset_destroy((grpc_pollset *)arg); } void test_tcp_server_destroy(test_tcp_server *server) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; gpr_timespec shutdown_deadline; grpc_closure do_nothing_cb; - grpc_tcp_server_unref(&exec_ctx, server->tcp_server); + grpc_tcp_server_unref(server->tcp_server); GRPC_CLOSURE_INIT(&do_nothing_cb, do_nothing, NULL, grpc_schedule_on_exec_ctx); shutdown_deadline = gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), @@ -109,10 +106,10 @@ void test_tcp_server_destroy(test_tcp_server *server) { gpr_time_cmp(gpr_now(GPR_CLOCK_MONOTONIC), shutdown_deadline) < 0) { test_tcp_server_poll(server, 1); } - grpc_pollset_shutdown(&exec_ctx, server->pollset, + grpc_pollset_shutdown(server->pollset, GRPC_CLOSURE_CREATE(finish_pollset, server->pollset, grpc_schedule_on_exec_ctx)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_free(server->pollset); grpc_shutdown(); } diff --git a/test/core/util/trickle_endpoint.c b/test/core/util/trickle_endpoint.cc similarity index 74% rename from test/core/util/trickle_endpoint.c rename to test/core/util/trickle_endpoint.cc index fc066f9d808..e36f64816e3 100644 --- a/test/core/util/trickle_endpoint.c +++ b/test/core/util/trickle_endpoint.cc @@ -45,23 +45,22 @@ typedef struct { grpc_closure *write_cb; } trickle_endpoint; -static void te_read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_slice_buffer *slices, grpc_closure *cb) { +static void te_read(grpc_endpoint *ep, grpc_slice_buffer *slices, + grpc_closure *cb) { trickle_endpoint *te = (trickle_endpoint *)ep; - grpc_endpoint_read(exec_ctx, te->wrapped, slices, cb); + grpc_endpoint_read(te->wrapped, slices, cb); } -static void maybe_call_write_cb_locked(grpc_exec_ctx *exec_ctx, - trickle_endpoint *te) { +static void maybe_call_write_cb_locked(trickle_endpoint *te) { if (te->write_cb != NULL && (te->error != GRPC_ERROR_NONE || te->write_buffer.length <= WRITE_BUFFER_SIZE)) { - GRPC_CLOSURE_SCHED(exec_ctx, te->write_cb, GRPC_ERROR_REF(te->error)); + GRPC_CLOSURE_SCHED(te->write_cb, GRPC_ERROR_REF(te->error)); te->write_cb = NULL; } } -static void te_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_slice_buffer *slices, grpc_closure *cb) { +static void te_write(grpc_endpoint *ep, grpc_slice_buffer *slices, + grpc_closure *cb) { trickle_endpoint *te = (trickle_endpoint *)ep; gpr_mu_lock(&te->mu); GPR_ASSERT(te->write_cb == NULL); @@ -73,40 +72,38 @@ static void te_write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, grpc_slice_copy(slices->slices[i])); } te->write_cb = cb; - maybe_call_write_cb_locked(exec_ctx, te); + maybe_call_write_cb_locked(te); gpr_mu_unlock(&te->mu); } -static void te_add_to_pollset(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_pollset *pollset) { +static void te_add_to_pollset(grpc_endpoint *ep, grpc_pollset *pollset) { trickle_endpoint *te = (trickle_endpoint *)ep; - grpc_endpoint_add_to_pollset(exec_ctx, te->wrapped, pollset); + grpc_endpoint_add_to_pollset(te->wrapped, pollset); } -static void te_add_to_pollset_set(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, +static void te_add_to_pollset_set(grpc_endpoint *ep, grpc_pollset_set *pollset_set) { trickle_endpoint *te = (trickle_endpoint *)ep; - grpc_endpoint_add_to_pollset_set(exec_ctx, te->wrapped, pollset_set); + grpc_endpoint_add_to_pollset_set(te->wrapped, pollset_set); } -static void te_shutdown(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_error *why) { +static void te_shutdown(grpc_endpoint *ep, grpc_error *why) { trickle_endpoint *te = (trickle_endpoint *)ep; gpr_mu_lock(&te->mu); if (te->error == GRPC_ERROR_NONE) { te->error = GRPC_ERROR_REF(why); } - maybe_call_write_cb_locked(exec_ctx, te); + maybe_call_write_cb_locked(te); gpr_mu_unlock(&te->mu); - grpc_endpoint_shutdown(exec_ctx, te->wrapped, why); + grpc_endpoint_shutdown(te->wrapped, why); } -static void te_destroy(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep) { +static void te_destroy(grpc_endpoint *ep) { trickle_endpoint *te = (trickle_endpoint *)ep; - grpc_endpoint_destroy(exec_ctx, te->wrapped); + grpc_endpoint_destroy(te->wrapped); gpr_mu_destroy(&te->mu); - grpc_slice_buffer_destroy_internal(exec_ctx, &te->write_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &te->writing_buffer); + grpc_slice_buffer_destroy_internal(&te->write_buffer); + grpc_slice_buffer_destroy_internal(&te->writing_buffer); GRPC_ERROR_UNREF(te->error); gpr_free(te); } @@ -126,8 +123,7 @@ static int te_get_fd(grpc_endpoint *ep) { return grpc_endpoint_get_fd(te->wrapped); } -static void te_finish_write(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { +static void te_finish_write(void *arg, grpc_error *error) { trickle_endpoint *te = (trickle_endpoint *)arg; gpr_mu_lock(&te->mu); te->writing = false; @@ -159,8 +155,7 @@ static double ts2dbl(gpr_timespec s) { return (double)s.tv_sec + 1e-9 * (double)s.tv_nsec; } -size_t grpc_trickle_endpoint_trickle(grpc_exec_ctx *exec_ctx, - grpc_endpoint *ep) { +size_t grpc_trickle_endpoint_trickle(grpc_endpoint *ep) { trickle_endpoint *te = (trickle_endpoint *)ep; gpr_mu_lock(&te->mu); if (!te->writing && te->write_buffer.length > 0) { @@ -175,9 +170,9 @@ size_t grpc_trickle_endpoint_trickle(grpc_exec_ctx *exec_ctx, te->writing = true; te->last_write = now; grpc_endpoint_write( - exec_ctx, te->wrapped, &te->writing_buffer, + te->wrapped, &te->writing_buffer, GRPC_CLOSURE_CREATE(te_finish_write, te, grpc_schedule_on_exec_ctx)); - maybe_call_write_cb_locked(exec_ctx, te); + maybe_call_write_cb_locked(te); } } size_t backlog = te->write_buffer.length; diff --git a/test/core/util/trickle_endpoint.h b/test/core/util/trickle_endpoint.h index ca39638ba0d..be19dd20355 100644 --- a/test/core/util/trickle_endpoint.h +++ b/test/core/util/trickle_endpoint.h @@ -29,8 +29,7 @@ grpc_endpoint *grpc_trickle_endpoint_create(grpc_endpoint *wrap, double bytes_per_second); /* Allow up to \a bytes through the endpoint. Returns the new backlog. */ -size_t grpc_trickle_endpoint_trickle(grpc_exec_ctx *exec_ctx, - grpc_endpoint *endpoint); +size_t grpc_trickle_endpoint_trickle(grpc_endpoint *endpoint); size_t grpc_trickle_get_backlog(grpc_endpoint *endpoint); diff --git a/test/cpp/common/channel_filter_test.cc b/test/cpp/common/channel_filter_test.cc index 638518107bb..7bdd53f9e7a 100644 --- a/test/cpp/common/channel_filter_test.cc +++ b/test/cpp/common/channel_filter_test.cc @@ -28,7 +28,7 @@ class MyChannelData : public ChannelData { public: MyChannelData() {} - grpc_error* Init(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, + grpc_error* Init(grpc_channel_element* elem, grpc_channel_element_args* args) override { (void)args->channel_args; // Make sure field is available. return GRPC_ERROR_NONE; @@ -39,7 +39,7 @@ class MyCallData : public CallData { public: MyCallData() {} - grpc_error* Init(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_error* Init(grpc_call_element* elem, const grpc_call_element_args* args) override { (void)args->path; // Make sure field is available. return GRPC_ERROR_NONE; diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index c236f76e89c..d129a961bad 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -109,12 +109,12 @@ class ClientLbEnd2endTest : public ::testing::Test { } void SetNextResolution(const std::vector& ports) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_lb_addresses* addresses = grpc_lb_addresses_create(ports.size(), NULL); for (size_t i = 0; i < ports.size(); ++i) { char* lb_uri_str; gpr_asprintf(&lb_uri_str, "ipv4:127.0.0.1:%d", ports[i]); - grpc_uri* lb_uri = grpc_uri_parse(&exec_ctx, lb_uri_str, true); + grpc_uri* lb_uri = grpc_uri_parse(lb_uri_str, true); GPR_ASSERT(lb_uri != NULL); grpc_lb_addresses_set_address_from_uri(addresses, i, lb_uri, false /* is balancer */, @@ -126,11 +126,11 @@ class ClientLbEnd2endTest : public ::testing::Test { grpc_lb_addresses_create_channel_arg(addresses); grpc_channel_args* fake_result = grpc_channel_args_copy_and_add(NULL, &fake_addresses, 1); - grpc_fake_resolver_response_generator_set_response( - &exec_ctx, response_generator_, fake_result); - grpc_channel_args_destroy(&exec_ctx, fake_result); - grpc_lb_addresses_destroy(&exec_ctx, addresses); - grpc_exec_ctx_finish(&exec_ctx); + grpc_fake_resolver_response_generator_set_response(response_generator_, + fake_result); + grpc_channel_args_destroy(fake_result); + grpc_lb_addresses_destroy(addresses); + grpc_exec_ctx_finish(); } void ResetStub(const grpc::string& lb_policy_name = "") { diff --git a/test/cpp/end2end/filter_end2end_test.cc b/test/cpp/end2end/filter_end2end_test.cc index f260ea0016d..c4430379dbf 100644 --- a/test/cpp/end2end/filter_end2end_test.cc +++ b/test/cpp/end2end/filter_end2end_test.cc @@ -100,7 +100,7 @@ int GetCallCounterValue() { class ChannelDataImpl : public ChannelData { public: - grpc_error* Init(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, + grpc_error* Init(grpc_channel_element* elem, grpc_channel_element_args* args) { IncrementConnectionCounter(); return GRPC_ERROR_NONE; @@ -109,13 +109,12 @@ class ChannelDataImpl : public ChannelData { class CallDataImpl : public CallData { public: - void StartTransportStreamOpBatch(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, + void StartTransportStreamOpBatch(grpc_call_element* elem, TransportStreamOpBatch* op) override { // Incrementing the counter could be done from Init(), but we want // to test that the individual methods are actually called correctly. if (op->recv_initial_metadata() != nullptr) IncrementCallCounter(); - grpc_call_next_op(exec_ctx, elem, op->op()); + grpc_call_next_op(elem, op->op()); } }; diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index f73a9c17917..1157c4510ee 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -449,13 +449,13 @@ class GrpclbEnd2endTest : public ::testing::Test { }; void SetNextResolution(const std::vector& address_data) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_lb_addresses* addresses = grpc_lb_addresses_create(address_data.size(), nullptr); for (size_t i = 0; i < address_data.size(); ++i) { char* lb_uri_str; gpr_asprintf(&lb_uri_str, "ipv4:127.0.0.1:%d", address_data[i].port); - grpc_uri* lb_uri = grpc_uri_parse(&exec_ctx, lb_uri_str, true); + grpc_uri* lb_uri = grpc_uri_parse(lb_uri_str, true); GPR_ASSERT(lb_uri != nullptr); grpc_lb_addresses_set_address_from_uri( addresses, i, lb_uri, address_data[i].is_balancer, @@ -465,10 +465,10 @@ class GrpclbEnd2endTest : public ::testing::Test { } grpc_arg fake_addresses = grpc_lb_addresses_create_channel_arg(addresses); grpc_channel_args fake_result = {1, &fake_addresses}; - grpc_fake_resolver_response_generator_set_response( - &exec_ctx, response_generator_, &fake_result); - grpc_lb_addresses_destroy(&exec_ctx, addresses); - grpc_exec_ctx_finish(&exec_ctx); + grpc_fake_resolver_response_generator_set_response(response_generator_, + &fake_result); + grpc_lb_addresses_destroy(addresses); + grpc_exec_ctx_finish(); } const std::vector GetBackendPorts(const size_t start_index = 0) const { diff --git a/test/cpp/grpclb/grpclb_test.cc b/test/cpp/grpclb/grpclb_test.cc index e740ea513a4..366ba10061d 100644 --- a/test/cpp/grpclb/grpclb_test.cc +++ b/test/cpp/grpclb/grpclb_test.cc @@ -557,7 +557,7 @@ static void perform_request(client_fixture *cf) { #define BALANCERS_NAME "lb.name" static void setup_client(const server_fixture *lb_server, const server_fixture *backends, client_fixture *cf) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; char *expected_target_names = NULL; const char *backends_name = lb_server->servers_hostport; @@ -569,7 +569,7 @@ static void setup_client(const server_fixture *lb_server, grpc_lb_addresses *addresses = grpc_lb_addresses_create(1, NULL); char *lb_uri_str; gpr_asprintf(&lb_uri_str, "ipv4:%s", lb_server->servers_hostport); - grpc_uri *lb_uri = grpc_uri_parse(&exec_ctx, lb_uri_str, true); + grpc_uri *lb_uri = grpc_uri_parse(lb_uri_str, true); GPR_ASSERT(lb_uri != NULL); grpc_lb_addresses_set_address_from_uri(addresses, 0, lb_uri, true, lb_server->balancer_name, NULL); @@ -581,7 +581,7 @@ static void setup_client(const server_fixture *lb_server, grpc_lb_addresses_create_channel_arg(addresses); grpc_channel_args *fake_result = grpc_channel_args_copy_and_add(NULL, &fake_addresses, 1); - grpc_lb_addresses_destroy(&exec_ctx, addresses); + grpc_lb_addresses_destroy(addresses); const grpc_arg new_args[] = { grpc_fake_transport_expected_targets_arg(expected_target_names), @@ -596,13 +596,13 @@ static void setup_client(const server_fixture *lb_server, grpc_fake_transport_security_credentials_create(); cf->client = grpc_secure_channel_create(fake_creds, cf->server_uri, args, NULL); - grpc_fake_resolver_response_generator_set_response( - &exec_ctx, response_generator, fake_result); - grpc_channel_args_destroy(&exec_ctx, fake_result); - grpc_channel_credentials_unref(&exec_ctx, fake_creds); - grpc_channel_args_destroy(&exec_ctx, args); + grpc_fake_resolver_response_generator_set_response(response_generator, + fake_result); + grpc_channel_args_destroy(fake_result); + grpc_channel_credentials_unref(fake_creds); + grpc_channel_args_destroy(args); grpc_fake_resolver_response_generator_unref(response_generator); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void teardown_client(client_fixture *cf) { diff --git a/test/cpp/microbenchmarks/bm_call_create.cc b/test/cpp/microbenchmarks/bm_call_create.cc index cf9a42e8c60..992de9ef316 100644 --- a/test/cpp/microbenchmarks/bm_call_create.cc +++ b/test/cpp/microbenchmarks/bm_call_create.cc @@ -313,12 +313,9 @@ static void BM_LameChannelCallCreateCoreSeparateBatch(benchmark::State &state) { } BENCHMARK(BM_LameChannelCallCreateCoreSeparateBatch); -static void FilterDestroy(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { - gpr_free(arg); -} +static void FilterDestroy(void *arg, grpc_error *error) { gpr_free(arg); } -static void DoNothing(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) {} +static void DoNothing(void *arg, grpc_error *error) {} class FakeClientChannelFactory : public grpc_client_channel_factory { public: @@ -326,15 +323,12 @@ class FakeClientChannelFactory : public grpc_client_channel_factory { private: static void NoRef(grpc_client_channel_factory *factory) {} - static void NoUnref(grpc_exec_ctx *exec_ctx, - grpc_client_channel_factory *factory) {} - static grpc_subchannel *CreateSubchannel(grpc_exec_ctx *exec_ctx, - grpc_client_channel_factory *factory, + static void NoUnref(grpc_client_channel_factory *factory) {} + static grpc_subchannel *CreateSubchannel(grpc_client_channel_factory *factory, const grpc_subchannel_args *args) { return nullptr; } - static grpc_channel *CreateClientChannel(grpc_exec_ctx *exec_ctx, - grpc_client_channel_factory *factory, + static grpc_channel *CreateClientChannel(grpc_client_channel_factory *factory, const char *target, grpc_client_channel_type type, const grpc_channel_args *args) { @@ -368,36 +362,32 @@ struct Fixture { namespace dummy_filter { -static void StartTransportStreamOp(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static void StartTransportStreamOp(grpc_call_element *elem, grpc_transport_stream_op_batch *op) {} -static void StartTransportOp(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static void StartTransportOp(grpc_channel_element *elem, grpc_transport_op *op) {} -static grpc_error *InitCallElem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *InitCallElem(grpc_call_element *elem, const grpc_call_element_args *args) { return GRPC_ERROR_NONE; } -static void SetPollsetOrPollsetSet(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static void SetPollsetOrPollsetSet(grpc_call_element *elem, grpc_polling_entity *pollent) {} -static void DestroyCallElem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, +static void DestroyCallElem(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *then_sched_closure) {} -grpc_error *InitChannelElem(grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, +grpc_error *InitChannelElem(grpc_channel_element *elem, grpc_channel_element_args *args) { return GRPC_ERROR_NONE; } -void DestroyChannelElem(grpc_exec_ctx *exec_ctx, grpc_channel_element *elem) {} +void DestroyChannelElem(grpc_channel_element *elem) {} -void GetChannelInfo(grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, +void GetChannelInfo(grpc_channel_element *elem, const grpc_channel_info *channel_info) {} static const grpc_channel_filter dummy_filter = {StartTransportStreamOp, @@ -424,41 +414,38 @@ size_t sizeof_stream; /* = sizeof(transport stream) */ const char *name; /* implementation of grpc_transport_init_stream */ -int InitStream(grpc_exec_ctx *exec_ctx, grpc_transport *self, - grpc_stream *stream, grpc_stream_refcount *refcount, - const void *server_data, gpr_arena *arena) { +int InitStream(grpc_transport *self, grpc_stream *stream, + grpc_stream_refcount *refcount, const void *server_data, + gpr_arena *arena) { return 0; } /* implementation of grpc_transport_set_pollset */ -void SetPollset(grpc_exec_ctx *exec_ctx, grpc_transport *self, - grpc_stream *stream, grpc_pollset *pollset) {} +void SetPollset(grpc_transport *self, grpc_stream *stream, + grpc_pollset *pollset) {} /* implementation of grpc_transport_set_pollset */ -void SetPollsetSet(grpc_exec_ctx *exec_ctx, grpc_transport *self, - grpc_stream *stream, grpc_pollset_set *pollset_set) {} +void SetPollsetSet(grpc_transport *self, grpc_stream *stream, + grpc_pollset_set *pollset_set) {} /* implementation of grpc_transport_perform_stream_op */ -void PerformStreamOp(grpc_exec_ctx *exec_ctx, grpc_transport *self, - grpc_stream *stream, grpc_transport_stream_op_batch *op) { - GRPC_CLOSURE_SCHED(exec_ctx, op->on_complete, GRPC_ERROR_NONE); +void PerformStreamOp(grpc_transport *self, grpc_stream *stream, + grpc_transport_stream_op_batch *op) { + GRPC_CLOSURE_SCHED(op->on_complete, GRPC_ERROR_NONE); } /* implementation of grpc_transport_perform_op */ -void PerformOp(grpc_exec_ctx *exec_ctx, grpc_transport *self, - grpc_transport_op *op) {} +void PerformOp(grpc_transport *self, grpc_transport_op *op) {} /* implementation of grpc_transport_destroy_stream */ -void DestroyStream(grpc_exec_ctx *exec_ctx, grpc_transport *self, - grpc_stream *stream, grpc_closure *then_sched_closure) {} +void DestroyStream(grpc_transport *self, grpc_stream *stream, + grpc_closure *then_sched_closure) {} /* implementation of grpc_transport_destroy */ -void Destroy(grpc_exec_ctx *exec_ctx, grpc_transport *self) {} +void Destroy(grpc_transport *self) {} /* implementation of grpc_transport_get_endpoint */ -grpc_endpoint *GetEndpoint(grpc_exec_ctx *exec_ctx, grpc_transport *self) { - return nullptr; -} +grpc_endpoint *GetEndpoint(grpc_transport *self) { return nullptr; } static const grpc_transport_vtable dummy_transport_vtable = { 0, "dummy_http2", InitStream, @@ -474,8 +461,8 @@ class NoOp { public: class Op { public: - Op(grpc_exec_ctx *exec_ctx, NoOp *p, grpc_call_stack *s) {} - void Finish(grpc_exec_ctx *exec_ctx) {} + Op(NoOp *p, grpc_call_stack *s) {} + void Finish() {} }; }; @@ -491,13 +478,11 @@ class SendEmptyMetadata { class Op { public: - Op(grpc_exec_ctx *exec_ctx, SendEmptyMetadata *p, grpc_call_stack *s) { + Op(SendEmptyMetadata *p, grpc_call_stack *s) { grpc_metadata_batch_init(&batch_); p->op_payload_.send_initial_metadata.send_initial_metadata = &batch_; } - void Finish(grpc_exec_ctx *exec_ctx) { - grpc_metadata_batch_destroy(exec_ctx, &batch_); - } + void Finish() { grpc_metadata_batch_destroy(&batch_); } private: grpc_metadata_batch batch_; @@ -538,20 +523,20 @@ static void BM_IsolatedFilter(benchmark::State &state) { label << " #has_dummy_filter"; } - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; size_t channel_size = grpc_channel_stack_size( filters.size() == 0 ? NULL : &filters[0], filters.size()); grpc_channel_stack *channel_stack = static_cast(gpr_zalloc(channel_size)); GPR_ASSERT(GRPC_LOG_IF_ERROR( "channel_stack_init", - grpc_channel_stack_init(&exec_ctx, 1, FilterDestroy, channel_stack, - &filters[0], filters.size(), &channel_args, + grpc_channel_stack_init(1, FilterDestroy, channel_stack, &filters[0], + filters.size(), &channel_args, fixture.flags & REQUIRES_TRANSPORT ? &dummy_transport::dummy_transport : nullptr, "CHANNEL", channel_stack))); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); grpc_call_stack *call_stack = static_cast( gpr_zalloc(channel_stack->call_stack_size)); grpc_millis deadline = GRPC_MILLIS_INF_FUTURE; @@ -570,12 +555,12 @@ static void BM_IsolatedFilter(benchmark::State &state) { call_args.arena = gpr_arena_create(kArenaSize); while (state.KeepRunning()) { GPR_TIMER_SCOPE("BenchmarkCycle", 0); - GRPC_ERROR_UNREF(grpc_call_stack_init(&exec_ctx, channel_stack, 1, - DoNothing, NULL, &call_args)); - typename TestOp::Op op(&exec_ctx, &test_op_data, call_stack); - grpc_call_stack_destroy(&exec_ctx, call_stack, &final_info, NULL); - op.Finish(&exec_ctx); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_ERROR_UNREF( + grpc_call_stack_init(channel_stack, 1, DoNothing, NULL, &call_args)); + typename TestOp::Op op(&test_op_data, call_stack); + grpc_call_stack_destroy(call_stack, &final_info, NULL); + op.Finish(); + grpc_exec_ctx_flush(); // recreate arena every 64k iterations to avoid oom if (0 == (state.iterations() & 0xffff)) { gpr_arena_destroy(call_args.arena); @@ -583,8 +568,8 @@ static void BM_IsolatedFilter(benchmark::State &state) { } } gpr_arena_destroy(call_args.arena); - grpc_channel_stack_destroy(&exec_ctx, channel_stack); - grpc_exec_ctx_finish(&exec_ctx); + grpc_channel_stack_destroy(channel_stack); + grpc_exec_ctx_finish(); gpr_free(channel_stack); gpr_free(call_stack); @@ -632,59 +617,55 @@ namespace isolated_call_filter { typedef struct { grpc_call_combiner *call_combiner; } call_data; -static void StartTransportStreamOp(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static void StartTransportStreamOp(grpc_call_element *elem, grpc_transport_stream_op_batch *op) { call_data *calld = static_cast(elem->call_data); if (op->recv_initial_metadata) { GRPC_CALL_COMBINER_START( - exec_ctx, calld->call_combiner, + calld->call_combiner, op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_NONE, "recv_initial_metadata"); } if (op->recv_message) { - GRPC_CALL_COMBINER_START(exec_ctx, calld->call_combiner, + GRPC_CALL_COMBINER_START(calld->call_combiner, op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE, "recv_message"); } - GRPC_CLOSURE_SCHED(exec_ctx, op->on_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(op->on_complete, GRPC_ERROR_NONE); } -static void StartTransportOp(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, +static void StartTransportOp(grpc_channel_element *elem, grpc_transport_op *op) { if (op->disconnect_with_error != GRPC_ERROR_NONE) { GRPC_ERROR_UNREF(op->disconnect_with_error); } - GRPC_CLOSURE_SCHED(exec_ctx, op->on_consumed, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(op->on_consumed, GRPC_ERROR_NONE); } -static grpc_error *InitCallElem(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static grpc_error *InitCallElem(grpc_call_element *elem, const grpc_call_element_args *args) { call_data *calld = static_cast(elem->call_data); calld->call_combiner = args->call_combiner; return GRPC_ERROR_NONE; } -static void SetPollsetOrPollsetSet(grpc_exec_ctx *exec_ctx, - grpc_call_element *elem, +static void SetPollsetOrPollsetSet(grpc_call_element *elem, grpc_polling_entity *pollent) {} -static void DestroyCallElem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, +static void DestroyCallElem(grpc_call_element *elem, const grpc_call_final_info *final_info, grpc_closure *then_sched_closure) { - GRPC_CLOSURE_SCHED(exec_ctx, then_sched_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(then_sched_closure, GRPC_ERROR_NONE); } -grpc_error *InitChannelElem(grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, +grpc_error *InitChannelElem(grpc_channel_element *elem, grpc_channel_element_args *args) { return GRPC_ERROR_NONE; } -void DestroyChannelElem(grpc_exec_ctx *exec_ctx, grpc_channel_element *elem) {} +void DestroyChannelElem(grpc_channel_element *elem) {} -void GetChannelInfo(grpc_exec_ctx *exec_ctx, grpc_channel_element *elem, +void GetChannelInfo(grpc_channel_element *elem, const grpc_channel_info *channel_info) {} static const grpc_channel_filter isolated_call_filter = { @@ -710,10 +691,9 @@ class IsolatedCallFixture : public TrackCounters { GPR_ASSERT(grpc_channel_stack_builder_append_filter( builder, &isolated_call_filter::isolated_call_filter, NULL, NULL)); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - channel_ = grpc_channel_create_with_builder(&exec_ctx, builder, - GRPC_CLIENT_CHANNEL); - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + channel_ = grpc_channel_create_with_builder(builder, GRPC_CLIENT_CHANNEL); + grpc_exec_ctx_finish(); } cq_ = grpc_completion_queue_create_for_next(NULL); } diff --git a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc index adbfa4d7967..13b0e0dd7f6 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc @@ -40,14 +40,14 @@ auto &force_library_initialization = Library::get(); static void BM_HpackEncoderInitDestroy(benchmark::State &state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_chttp2_hpack_compressor c; while (state.KeepRunning()) { grpc_chttp2_hpack_compressor_init(&c); - grpc_chttp2_hpack_compressor_destroy(&exec_ctx, &c); - grpc_exec_ctx_flush(&exec_ctx); + grpc_chttp2_hpack_compressor_destroy(&c); + grpc_exec_ctx_flush(); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_HpackEncoderInitDestroy); @@ -55,17 +55,16 @@ BENCHMARK(BM_HpackEncoderInitDestroy); template static void BM_HpackEncoderEncodeHeader(benchmark::State &state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; static bool logged_representative_output = false; grpc_metadata_batch b; grpc_metadata_batch_init(&b); - std::vector elems = Fixture::GetElems(&exec_ctx); + std::vector elems = Fixture::GetElems(); std::vector storage(elems.size()); for (size_t i = 0; i < elems.size(); i++) { GPR_ASSERT(GRPC_LOG_IF_ERROR( - "addmd", - grpc_metadata_batch_add_tail(&exec_ctx, &b, &storage[i], elems[i]))); + "addmd", grpc_metadata_batch_add_tail(&b, &storage[i], elems[i]))); } grpc_chttp2_hpack_compressor c; @@ -82,7 +81,7 @@ static void BM_HpackEncoderEncodeHeader(benchmark::State &state) { (size_t)state.range(1), &stats, }; - grpc_chttp2_encode_header(&exec_ctx, &c, NULL, 0, &b, &hopt, &outbuf); + grpc_chttp2_encode_header(&c, NULL, 0, &b, &hopt, &outbuf); if (!logged_representative_output && state.iterations() > 3) { logged_representative_output = true; for (size_t i = 0; i < outbuf.count; i++) { @@ -91,13 +90,13 @@ static void BM_HpackEncoderEncodeHeader(benchmark::State &state) { gpr_free(s); } } - grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, &outbuf); - grpc_exec_ctx_flush(&exec_ctx); + grpc_slice_buffer_reset_and_unref_internal(&outbuf); + grpc_exec_ctx_flush(); } - grpc_metadata_batch_destroy(&exec_ctx, &b); - grpc_chttp2_hpack_compressor_destroy(&exec_ctx, &c); - grpc_slice_buffer_destroy_internal(&exec_ctx, &outbuf); - grpc_exec_ctx_finish(&exec_ctx); + grpc_metadata_batch_destroy(&b); + grpc_chttp2_hpack_compressor_destroy(&c); + grpc_slice_buffer_destroy_internal(&outbuf); + grpc_exec_ctx_finish(); std::ostringstream label; label << "framing_bytes/iter:" << (static_cast(stats.framing_bytes) / @@ -113,15 +112,13 @@ namespace hpack_encoder_fixtures { class EmptyBatch { public: static constexpr bool kEnableTrueBinary = false; - static std::vector GetElems(grpc_exec_ctx *exec_ctx) { - return {}; - } + static std::vector GetElems() { return {}; } }; class SingleStaticElem { public: static constexpr bool kEnableTrueBinary = false; - static std::vector GetElems(grpc_exec_ctx *exec_ctx) { + static std::vector GetElems() { return {GRPC_MDELEM_GRPC_ACCEPT_ENCODING_IDENTITY_COMMA_DEFLATE}; } }; @@ -129,9 +126,9 @@ class SingleStaticElem { class SingleInternedElem { public: static constexpr bool kEnableTrueBinary = false; - static std::vector GetElems(grpc_exec_ctx *exec_ctx) { + static std::vector GetElems() { return {grpc_mdelem_from_slices( - exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("abc")), + grpc_slice_intern(grpc_slice_from_static_string("abc")), grpc_slice_intern(grpc_slice_from_static_string("def")))}; } }; @@ -140,10 +137,10 @@ template class SingleInternedBinaryElem { public: static constexpr bool kEnableTrueBinary = kTrueBinary; - static std::vector GetElems(grpc_exec_ctx *exec_ctx) { + static std::vector GetElems() { grpc_slice bytes = MakeBytes(); std::vector out = {grpc_mdelem_from_slices( - exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("abc-bin")), + grpc_slice_intern(grpc_slice_from_static_string("abc-bin")), grpc_slice_intern(bytes))}; grpc_slice_unref(bytes); return out; @@ -162,9 +159,9 @@ class SingleInternedBinaryElem { class SingleInternedKeyElem { public: static constexpr bool kEnableTrueBinary = false; - static std::vector GetElems(grpc_exec_ctx *exec_ctx) { + static std::vector GetElems() { return {grpc_mdelem_from_slices( - exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("abc")), + grpc_slice_intern(grpc_slice_from_static_string("abc")), grpc_slice_from_static_string("def"))}; } }; @@ -172,9 +169,8 @@ class SingleInternedKeyElem { class SingleNonInternedElem { public: static constexpr bool kEnableTrueBinary = false; - static std::vector GetElems(grpc_exec_ctx *exec_ctx) { - return {grpc_mdelem_from_slices(exec_ctx, - grpc_slice_from_static_string("abc"), + static std::vector GetElems() { + return {grpc_mdelem_from_slices(grpc_slice_from_static_string("abc"), grpc_slice_from_static_string("def"))}; } }; @@ -183,9 +179,9 @@ template class SingleNonInternedBinaryElem { public: static constexpr bool kEnableTrueBinary = kTrueBinary; - static std::vector GetElems(grpc_exec_ctx *exec_ctx) { - return {grpc_mdelem_from_slices( - exec_ctx, grpc_slice_from_static_string("abc-bin"), MakeBytes())}; + static std::vector GetElems() { + return {grpc_mdelem_from_slices(grpc_slice_from_static_string("abc-bin"), + MakeBytes())}; } private: @@ -201,20 +197,20 @@ class SingleNonInternedBinaryElem { class RepresentativeClientInitialMetadata { public: static constexpr bool kEnableTrueBinary = true; - static std::vector GetElems(grpc_exec_ctx *exec_ctx) { + static std::vector GetElems() { return { GRPC_MDELEM_SCHEME_HTTP, GRPC_MDELEM_METHOD_POST, grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_PATH, + GRPC_MDSTR_PATH, grpc_slice_intern(grpc_slice_from_static_string("/foo/bar"))), - grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_AUTHORITY, + grpc_mdelem_from_slices(GRPC_MDSTR_AUTHORITY, grpc_slice_intern(grpc_slice_from_static_string( "foo.test.google.fr:1234"))), GRPC_MDELEM_GRPC_ACCEPT_ENCODING_IDENTITY_COMMA_DEFLATE_COMMA_GZIP, GRPC_MDELEM_TE_TRAILERS, GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC, grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_USER_AGENT, + GRPC_MDSTR_USER_AGENT, grpc_slice_intern(grpc_slice_from_static_string( "grpc-c/3.0.0-dev (linux; chttp2; green)")))}; } @@ -223,7 +219,7 @@ class RepresentativeClientInitialMetadata { class RepresentativeServerInitialMetadata { public: static constexpr bool kEnableTrueBinary = true; - static std::vector GetElems(grpc_exec_ctx *exec_ctx) { + static std::vector GetElems() { return {GRPC_MDELEM_STATUS_200, GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC, GRPC_MDELEM_GRPC_ACCEPT_ENCODING_IDENTITY_COMMA_DEFLATE_COMMA_GZIP}; @@ -233,7 +229,7 @@ class RepresentativeServerInitialMetadata { class RepresentativeServerTrailingMetadata { public: static constexpr bool kEnableTrueBinary = true; - static std::vector GetElems(grpc_exec_ctx *exec_ctx) { + static std::vector GetElems() { return {GRPC_MDELEM_GRPC_STATUS_0}; } }; @@ -331,46 +327,45 @@ BENCHMARK_TEMPLATE(BM_HpackEncoderEncodeHeader, static void BM_HpackParserInitDestroy(benchmark::State &state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_chttp2_hpack_parser p; while (state.KeepRunning()) { - grpc_chttp2_hpack_parser_init(&exec_ctx, &p); - grpc_chttp2_hpack_parser_destroy(&exec_ctx, &p); - grpc_exec_ctx_flush(&exec_ctx); + grpc_chttp2_hpack_parser_init(&p); + grpc_chttp2_hpack_parser_destroy(&p); + grpc_exec_ctx_flush(); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_HpackParserInitDestroy); -static void UnrefHeader(grpc_exec_ctx *exec_ctx, void *user_data, - grpc_mdelem md) { - GRPC_MDELEM_UNREF(exec_ctx, md); +static void UnrefHeader(void *user_data, grpc_mdelem md) { + GRPC_MDELEM_UNREF(md); } template static void BM_HpackParserParseHeader(benchmark::State &state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; std::vector init_slices = Fixture::GetInitSlices(); std::vector benchmark_slices = Fixture::GetBenchmarkSlices(); grpc_chttp2_hpack_parser p; - grpc_chttp2_hpack_parser_init(&exec_ctx, &p); + grpc_chttp2_hpack_parser_init(&p); p.on_header = UnrefHeader; p.on_header_user_data = nullptr; for (auto slice : init_slices) { - grpc_chttp2_hpack_parser_parse(&exec_ctx, &p, slice); + grpc_chttp2_hpack_parser_parse(&p, slice); } while (state.KeepRunning()) { for (auto slice : benchmark_slices) { - grpc_chttp2_hpack_parser_parse(&exec_ctx, &p, slice); + grpc_chttp2_hpack_parser_parse(&p, slice); } - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); } for (auto slice : init_slices) grpc_slice_unref(slice); for (auto slice : benchmark_slices) grpc_slice_unref(slice); - grpc_chttp2_hpack_parser_destroy(&exec_ctx, &p); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_hpack_parser_destroy(&p); + grpc_exec_ctx_finish(); track_counters.Finish(state); } diff --git a/test/cpp/microbenchmarks/bm_chttp2_transport.cc b/test/cpp/microbenchmarks/bm_chttp2_transport.cc index 8ee3ae72686..08830c37466 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_transport.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_transport.cc @@ -52,7 +52,7 @@ class DummyEndpoint : public grpc_endpoint { ru_ = grpc_resource_user_create(Library::get().rq(), "dummy_endpoint"); } - void PushInput(grpc_exec_ctx *exec_ctx, grpc_slice slice) { + void PushInput(grpc_slice slice) { if (read_cb_ == nullptr) { GPR_ASSERT(!have_slice_); buffered_slice_ = slice; @@ -60,7 +60,7 @@ class DummyEndpoint : public grpc_endpoint { return; } grpc_slice_buffer_add(slices_, slice); - GRPC_CLOSURE_SCHED(exec_ctx, read_cb_, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(read_cb_, GRPC_ERROR_NONE); read_cb_ = nullptr; } @@ -71,47 +71,42 @@ class DummyEndpoint : public grpc_endpoint { bool have_slice_ = false; grpc_slice buffered_slice_; - void QueueRead(grpc_exec_ctx *exec_ctx, grpc_slice_buffer *slices, - grpc_closure *cb) { + void QueueRead(grpc_slice_buffer *slices, grpc_closure *cb) { GPR_ASSERT(read_cb_ == nullptr); if (have_slice_) { have_slice_ = false; grpc_slice_buffer_add(slices, buffered_slice_); - GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); return; } read_cb_ = cb; slices_ = slices; } - static void read(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_slice_buffer *slices, grpc_closure *cb) { - static_cast(ep)->QueueRead(exec_ctx, slices, cb); + static void read(grpc_endpoint *ep, grpc_slice_buffer *slices, + grpc_closure *cb) { + static_cast(ep)->QueueRead(slices, cb); } - static void write(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_slice_buffer *slices, grpc_closure *cb) { - GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); + static void write(grpc_endpoint *ep, grpc_slice_buffer *slices, + grpc_closure *cb) { + GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); } static grpc_workqueue *get_workqueue(grpc_endpoint *ep) { return NULL; } - static void add_to_pollset(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_pollset *pollset) {} + static void add_to_pollset(grpc_endpoint *ep, grpc_pollset *pollset) {} - static void add_to_pollset_set(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_pollset_set *pollset) {} + static void add_to_pollset_set(grpc_endpoint *ep, grpc_pollset_set *pollset) { + } - static void shutdown(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep, - grpc_error *why) { - grpc_resource_user_shutdown(exec_ctx, - static_cast(ep)->ru_); - GRPC_CLOSURE_SCHED(exec_ctx, static_cast(ep)->read_cb_, - why); + static void shutdown(grpc_endpoint *ep, grpc_error *why) { + grpc_resource_user_shutdown(static_cast(ep)->ru_); + GRPC_CLOSURE_SCHED(static_cast(ep)->read_cb_, why); } - static void destroy(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep) { - grpc_resource_user_unref(exec_ctx, static_cast(ep)->ru_); + static void destroy(grpc_endpoint *ep) { + grpc_resource_user_unref(static_cast(ep)->ru_); delete static_cast(ep); } @@ -127,16 +122,16 @@ class Fixture { Fixture(const grpc::ChannelArguments &args, bool client) { grpc_channel_args c_args = args.c_channel_args(); ep_ = new DummyEndpoint; - t_ = grpc_create_chttp2_transport(exec_ctx(), &c_args, ep_, client); - grpc_chttp2_transport_start_reading(exec_ctx(), t_, NULL); + t_ = grpc_create_chttp2_transport((), &c_args, ep_, client); + grpc_chttp2_transport_start_reading((), t_, NULL); FlushExecCtx(); } - void FlushExecCtx() { grpc_exec_ctx_flush(&exec_ctx_); } + void FlushExecCtx() { grpc_exec_ctx_flush(_); } ~Fixture() { - grpc_transport_destroy(&exec_ctx_, t_); - grpc_exec_ctx_finish(&exec_ctx_); + grpc_transport_destroy(_, t_); + grpc_exec_ctx_finish(_); } grpc_chttp2_transport *chttp2_transport() { @@ -145,7 +140,7 @@ class Fixture { grpc_transport *transport() { return t_; } grpc_exec_ctx *exec_ctx() { return &exec_ctx_; } - void PushInput(grpc_slice slice) { ep_->PushInput(exec_ctx(), slice); } + void PushInput(grpc_slice slice) { ep_->PushInput((), slice); } private: DummyEndpoint *ep_; @@ -166,8 +161,8 @@ std::unique_ptr MakeClosure( GRPC_CLOSURE_INIT(this, Execute, this, sched); } F f_; - static void Execute(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { - static_cast(arg)->f_(exec_ctx, error); + static void Execute(void *arg, grpc_error *error) { + static_cast(arg)->f_(error); } }; return std::unique_ptr(new C(f, sched)); @@ -179,8 +174,8 @@ grpc_closure *MakeOnceClosure( struct C : public grpc_closure { C(const F &f) : f_(f) {} F f_; - static void Execute(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { - static_cast(arg)->f_(exec_ctx, error); + static void Execute(void *arg, grpc_error *error) { + static_cast(arg)->f_(error); delete static_cast(arg); } }; @@ -216,17 +211,17 @@ class Stream { NULL, arena_); } - void DestroyThen(grpc_exec_ctx *exec_ctx, grpc_closure *closure) { + void DestroyThen(grpc_closure *closure) { destroy_closure_ = closure; #ifndef NDEBUG - grpc_stream_unref(exec_ctx, &refcount_, "DestroyThen"); + grpc_stream_unref(&refcount_, "DestroyThen"); #else - grpc_stream_unref(exec_ctx, &refcount_); + grpc_stream_unref(&refcount_); #endif } - void Op(grpc_exec_ctx *exec_ctx, grpc_transport_stream_op_batch *op) { - grpc_transport_perform_stream_op(exec_ctx, f_->transport(), + void Op(grpc_transport_stream_op_batch *op) { + grpc_transport_perform_stream_op(f_->transport(), static_cast(stream_), op); } @@ -235,10 +230,9 @@ class Stream { } private: - static void FinishDestroy(grpc_exec_ctx *exec_ctx, void *arg, - grpc_error *error) { + static void FinishDestroy(void *arg, grpc_error *error) { auto stream = static_cast(arg); - grpc_transport_destroy_stream(exec_ctx, stream->f_->transport(), + grpc_transport_destroy_stream(stream->f_->transport(), static_cast(stream->stream_), stream->destroy_closure_); gpr_event_set(&stream->done_, (void *)1); @@ -271,8 +265,8 @@ static void BM_StreamCreateDestroy(benchmark::State &state) { MakeClosure([&](grpc_exec_ctx *exec_ctx, grpc_error *error) { if (!state.KeepRunning()) return; s.Init(state); - s.Op(exec_ctx, &op); - s.DestroyThen(exec_ctx, next.get()); + s.Op(&op); + s.DestroyThen(next.get()); }); GRPC_CLOSURE_RUN(f.exec_ctx(), next.get(), GRPC_ERROR_NONE); f.FlushExecCtx(); @@ -282,20 +276,20 @@ BENCHMARK(BM_StreamCreateDestroy); class RepresentativeClientInitialMetadata { public: - static std::vector GetElems(grpc_exec_ctx *exec_ctx) { + static std::vector GetElems() { return { GRPC_MDELEM_SCHEME_HTTP, GRPC_MDELEM_METHOD_POST, grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_PATH, + GRPC_MDSTR_PATH, grpc_slice_intern(grpc_slice_from_static_string("/foo/bar"))), - grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_AUTHORITY, + grpc_mdelem_from_slices(GRPC_MDSTR_AUTHORITY, grpc_slice_intern(grpc_slice_from_static_string( "foo.test.google.fr:1234"))), GRPC_MDELEM_GRPC_ACCEPT_ENCODING_IDENTITY_COMMA_DEFLATE_COMMA_GZIP, GRPC_MDELEM_TE_TRAILERS, GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC, grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_USER_AGENT, + GRPC_MDSTR_USER_AGENT, grpc_slice_intern(grpc_slice_from_static_string( "grpc-c/3.0.0-dev (linux; chttp2; green)")))}; } @@ -336,14 +330,14 @@ static void BM_StreamCreateSendInitialMetadataDestroy(benchmark::State &state) { op.on_complete = done.get(); op.send_initial_metadata = true; op.payload->send_initial_metadata.send_initial_metadata = &b; - s.Op(exec_ctx, &op); + s.Op(&op); }); done = MakeClosure([&](grpc_exec_ctx *exec_ctx, grpc_error *error) { reset_op(); op.cancel_stream = true; op.payload->cancel_stream.cancel_error = GRPC_ERROR_CANCELLED; - s.Op(exec_ctx, &op); - s.DestroyThen(exec_ctx, start.get()); + s.Op(&op); + s.DestroyThen(start.get()); }); GRPC_CLOSURE_SCHED(f.exec_ctx(), start.get(), GRPC_ERROR_NONE); f.FlushExecCtx(); @@ -370,7 +364,7 @@ static void BM_TransportEmptyOp(benchmark::State &state) { if (!state.KeepRunning()) return; reset_op(); op.on_complete = c.get(); - s.Op(exec_ctx, &op); + s.Op(&op); }); GRPC_CLOSURE_SCHED(f.exec_ctx(), c.get(), GRPC_ERROR_NONE); f.FlushExecCtx(); @@ -436,7 +430,7 @@ static void BM_TransportStreamSend(benchmark::State &state) { op.on_complete = c.get(); op.send_message = true; op.payload->send_message.send_message = &send_stream.base; - s->Op(exec_ctx, &op); + s->Op(&op); }); reset_op(); @@ -573,7 +567,7 @@ static void BM_TransportStreamRecv(benchmark::State &state) { op.recv_message = true; op.payload->recv_message.recv_message = &recv_stream; op.payload->recv_message.recv_message_ready = drain_start.get(); - s.Op(exec_ctx, &op); + s.Op(&op); f.PushInput(grpc_slice_ref(incoming_data)); }); @@ -582,30 +576,29 @@ static void BM_TransportStreamRecv(benchmark::State &state) { GPR_ASSERT(!state.KeepRunning()); return; } - GRPC_CLOSURE_RUN(exec_ctx, drain.get(), GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN(drain.get(), GRPC_ERROR_NONE); }); drain = MakeClosure([&](grpc_exec_ctx *exec_ctx, grpc_error *error) { do { if (received == recv_stream->length) { - grpc_byte_stream_destroy(exec_ctx, recv_stream); - GRPC_CLOSURE_SCHED(exec_ctx, c.get(), GRPC_ERROR_NONE); + grpc_byte_stream_destroy(recv_stream); + GRPC_CLOSURE_SCHED(c.get(), GRPC_ERROR_NONE); return; } - } while (grpc_byte_stream_next(exec_ctx, recv_stream, - recv_stream->length - received, + } while (grpc_byte_stream_next(recv_stream, recv_stream->length - received, drain_continue.get()) && GRPC_ERROR_NONE == - grpc_byte_stream_pull(exec_ctx, recv_stream, &recv_slice) && + grpc_byte_stream_pull(recv_stream, &recv_slice) && (received += GRPC_SLICE_LENGTH(recv_slice), - grpc_slice_unref_internal(exec_ctx, recv_slice), true)); + grpc_slice_unref_internal(recv_slice), true)); }); drain_continue = MakeClosure([&](grpc_exec_ctx *exec_ctx, grpc_error *error) { - grpc_byte_stream_pull(exec_ctx, recv_stream, &recv_slice); + grpc_byte_stream_pull(recv_stream, &recv_slice); received += GRPC_SLICE_LENGTH(recv_slice); - grpc_slice_unref_internal(exec_ctx, recv_slice); - GRPC_CLOSURE_RUN(exec_ctx, drain.get(), GRPC_ERROR_NONE); + grpc_slice_unref_internal(recv_slice); + GRPC_CLOSURE_RUN(drain.get(), GRPC_ERROR_NONE); }); reset_op(); diff --git a/test/cpp/microbenchmarks/bm_closure.cc b/test/cpp/microbenchmarks/bm_closure.cc index 41649b8a731..2375fc0133d 100644 --- a/test/cpp/microbenchmarks/bm_closure.cc +++ b/test/cpp/microbenchmarks/bm_closure.cc @@ -36,8 +36,8 @@ auto& force_library_initialization = Library::get(); static void BM_NoOpExecCtx(benchmark::State& state) { TrackCounters track_counters; while (state.KeepRunning()) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_exec_ctx_finish(&exec_ctx); + ExecCtx _local_exec_ctx; + grpc_exec_ctx_finish(); } track_counters.Finish(state); } @@ -45,16 +45,16 @@ BENCHMARK(BM_NoOpExecCtx); static void BM_WellFlushed(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_WellFlushed); -static void DoNothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} +static void DoNothing(void* arg, grpc_error* error) {} static void BM_ClosureInitAgainstExecCtx(benchmark::State& state) { TrackCounters track_counters; @@ -71,13 +71,13 @@ static void BM_ClosureInitAgainstCombiner(benchmark::State& state) { TrackCounters track_counters; grpc_combiner* combiner = grpc_combiner_create(); grpc_closure c; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { benchmark::DoNotOptimize(GRPC_CLOSURE_INIT( &c, DoNothing, NULL, grpc_combiner_scheduler(combiner))); } - GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(combiner, "finished"); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureInitAgainstCombiner); @@ -86,39 +86,39 @@ static void BM_ClosureRunOnExecCtx(benchmark::State& state) { TrackCounters track_counters; grpc_closure c; GRPC_CLOSURE_INIT(&c, DoNothing, NULL, grpc_schedule_on_exec_ctx); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_RUN(&exec_ctx, &c, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_RUN(&c, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureRunOnExecCtx); static void BM_ClosureCreateAndRun(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_RUN(&exec_ctx, GRPC_CLOSURE_CREATE(DoNothing, NULL, - grpc_schedule_on_exec_ctx), - GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN( + GRPC_CLOSURE_CREATE(DoNothing, NULL, grpc_schedule_on_exec_ctx), + GRPC_ERROR_NONE); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureCreateAndRun); static void BM_ClosureInitAndRun(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_closure c; while (state.KeepRunning()) { - GRPC_CLOSURE_RUN(&exec_ctx, GRPC_CLOSURE_INIT(&c, DoNothing, NULL, - grpc_schedule_on_exec_ctx), - GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN( + GRPC_CLOSURE_INIT(&c, DoNothing, NULL, grpc_schedule_on_exec_ctx), + GRPC_ERROR_NONE); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureInitAndRun); @@ -127,12 +127,12 @@ static void BM_ClosureSchedOnExecCtx(benchmark::State& state) { TrackCounters track_counters; grpc_closure c; GRPC_CLOSURE_INIT(&c, DoNothing, NULL, grpc_schedule_on_exec_ctx); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureSchedOnExecCtx); @@ -143,13 +143,13 @@ static void BM_ClosureSched2OnExecCtx(benchmark::State& state) { grpc_closure c2; GRPC_CLOSURE_INIT(&c1, DoNothing, NULL, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&c2, DoNothing, NULL, grpc_schedule_on_exec_ctx); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureSched2OnExecCtx); @@ -162,14 +162,14 @@ static void BM_ClosureSched3OnExecCtx(benchmark::State& state) { GRPC_CLOSURE_INIT(&c1, DoNothing, NULL, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&c2, DoNothing, NULL, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&c3, DoNothing, NULL, grpc_schedule_on_exec_ctx); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c3, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureSched3OnExecCtx); @@ -179,13 +179,13 @@ static void BM_AcquireMutex(benchmark::State& state) { // for comparison with the combiner stuff below gpr_mu mu; gpr_mu_init(&mu); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { gpr_mu_lock(&mu); - DoNothing(&exec_ctx, NULL, GRPC_ERROR_NONE); + DoNothing(NULL, GRPC_ERROR_NONE); gpr_mu_unlock(&mu); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_AcquireMutex); @@ -195,16 +195,16 @@ static void BM_TryAcquireMutex(benchmark::State& state) { // for comparison with the combiner stuff below gpr_mu mu; gpr_mu_init(&mu); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { if (gpr_mu_trylock(&mu)) { - DoNothing(&exec_ctx, NULL, GRPC_ERROR_NONE); + DoNothing(NULL, GRPC_ERROR_NONE); gpr_mu_unlock(&mu); } else { abort(); } } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_TryAcquireMutex); @@ -213,13 +213,13 @@ static void BM_AcquireSpinlock(benchmark::State& state) { TrackCounters track_counters; // for comparison with the combiner stuff below gpr_spinlock mu = GPR_SPINLOCK_INITIALIZER; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { gpr_spinlock_lock(&mu); - DoNothing(&exec_ctx, NULL, GRPC_ERROR_NONE); + DoNothing(NULL, GRPC_ERROR_NONE); gpr_spinlock_unlock(&mu); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_AcquireSpinlock); @@ -228,16 +228,16 @@ static void BM_TryAcquireSpinlock(benchmark::State& state) { TrackCounters track_counters; // for comparison with the combiner stuff below gpr_spinlock mu = GPR_SPINLOCK_INITIALIZER; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { if (gpr_spinlock_trylock(&mu)) { - DoNothing(&exec_ctx, NULL, GRPC_ERROR_NONE); + DoNothing(NULL, GRPC_ERROR_NONE); gpr_spinlock_unlock(&mu); } else { abort(); } } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_TryAcquireSpinlock); @@ -247,13 +247,13 @@ static void BM_ClosureSchedOnCombiner(benchmark::State& state) { grpc_combiner* combiner = grpc_combiner_create(); grpc_closure c; GRPC_CLOSURE_INIT(&c, DoNothing, NULL, grpc_combiner_scheduler(combiner)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(); } - GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(combiner, "finished"); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureSchedOnCombiner); @@ -265,14 +265,14 @@ static void BM_ClosureSched2OnCombiner(benchmark::State& state) { grpc_closure c2; GRPC_CLOSURE_INIT(&c1, DoNothing, NULL, grpc_combiner_scheduler(combiner)); GRPC_CLOSURE_INIT(&c2, DoNothing, NULL, grpc_combiner_scheduler(combiner)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(); } - GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(combiner, "finished"); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureSched2OnCombiner); @@ -286,15 +286,15 @@ static void BM_ClosureSched3OnCombiner(benchmark::State& state) { GRPC_CLOSURE_INIT(&c1, DoNothing, NULL, grpc_combiner_scheduler(combiner)); GRPC_CLOSURE_INIT(&c2, DoNothing, NULL, grpc_combiner_scheduler(combiner)); GRPC_CLOSURE_INIT(&c3, DoNothing, NULL, grpc_combiner_scheduler(combiner)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c3, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(); } - GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(combiner, "finished"); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureSched3OnCombiner); @@ -307,15 +307,15 @@ static void BM_ClosureSched2OnTwoCombiners(benchmark::State& state) { grpc_closure c2; GRPC_CLOSURE_INIT(&c1, DoNothing, NULL, grpc_combiner_scheduler(combiner1)); GRPC_CLOSURE_INIT(&c2, DoNothing, NULL, grpc_combiner_scheduler(combiner2)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(); } - GRPC_COMBINER_UNREF(&exec_ctx, combiner1, "finished"); - GRPC_COMBINER_UNREF(&exec_ctx, combiner2, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(combiner1, "finished"); + GRPC_COMBINER_UNREF(combiner2, "finished"); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureSched2OnTwoCombiners); @@ -332,17 +332,17 @@ static void BM_ClosureSched4OnTwoCombiners(benchmark::State& state) { GRPC_CLOSURE_INIT(&c2, DoNothing, NULL, grpc_combiner_scheduler(combiner2)); GRPC_CLOSURE_INIT(&c3, DoNothing, NULL, grpc_combiner_scheduler(combiner1)); GRPC_CLOSURE_INIT(&c4, DoNothing, NULL, grpc_combiner_scheduler(combiner2)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c3, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c4, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c4, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(); } - GRPC_COMBINER_UNREF(&exec_ctx, combiner1, "finished"); - GRPC_COMBINER_UNREF(&exec_ctx, combiner2, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(combiner1, "finished"); + GRPC_COMBINER_UNREF(combiner2, "finished"); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureSched4OnTwoCombiners); @@ -356,13 +356,11 @@ class Rescheduler { GRPC_CLOSURE_INIT(&closure_, Step, this, scheduler); } - void ScheduleFirst(grpc_exec_ctx* exec_ctx) { - GRPC_CLOSURE_SCHED(exec_ctx, &closure_, GRPC_ERROR_NONE); - } + void ScheduleFirst() { GRPC_CLOSURE_SCHED(&closure_, GRPC_ERROR_NONE); } void ScheduleFirstAgainstDifferentScheduler( - grpc_exec_ctx* exec_ctx, grpc_closure_scheduler* scheduler) { - GRPC_CLOSURE_SCHED(exec_ctx, GRPC_CLOSURE_CREATE(Step, this, scheduler), + grpc_closure_scheduler* scheduler) { + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(Step, this, scheduler), GRPC_ERROR_NONE); } @@ -370,47 +368,46 @@ class Rescheduler { benchmark::State& state_; grpc_closure closure_; - static void Step(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { + static void Step(void* arg, grpc_error* error) { Rescheduler* self = static_cast(arg); if (self->state_.KeepRunning()) { - GRPC_CLOSURE_SCHED(exec_ctx, &self->closure_, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&self->closure_, GRPC_ERROR_NONE); } } }; static void BM_ClosureReschedOnExecCtx(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; Rescheduler r(state, grpc_schedule_on_exec_ctx); - r.ScheduleFirst(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + r.ScheduleFirst(); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureReschedOnExecCtx); static void BM_ClosureReschedOnCombiner(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_combiner* combiner = grpc_combiner_create(); Rescheduler r(state, grpc_combiner_scheduler(combiner)); - r.ScheduleFirst(&exec_ctx); - grpc_exec_ctx_flush(&exec_ctx); - GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + r.ScheduleFirst(); + grpc_exec_ctx_flush(); + GRPC_COMBINER_UNREF(combiner, "finished"); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureReschedOnCombiner); static void BM_ClosureReschedOnCombinerFinally(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_combiner* combiner = grpc_combiner_create(); Rescheduler r(state, grpc_combiner_finally_scheduler(combiner)); - r.ScheduleFirstAgainstDifferentScheduler(&exec_ctx, - grpc_combiner_scheduler(combiner)); - grpc_exec_ctx_flush(&exec_ctx); - GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + r.ScheduleFirstAgainstDifferentScheduler(grpc_combiner_scheduler(combiner)); + grpc_exec_ctx_flush(); + GRPC_COMBINER_UNREF(combiner, "finished"); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureReschedOnCombinerFinally); diff --git a/test/cpp/microbenchmarks/bm_cq.cc b/test/cpp/microbenchmarks/bm_cq.cc index a0c0414f2f5..2fd2ba23c0d 100644 --- a/test/cpp/microbenchmarks/bm_cq.cc +++ b/test/cpp/microbenchmarks/bm_cq.cc @@ -67,7 +67,7 @@ static void BM_CreateDestroyCore(benchmark::State& state) { } BENCHMARK(BM_CreateDestroyCore); -static void DoneWithCompletionOnStack(grpc_exec_ctx* exec_ctx, void* arg, +static void DoneWithCompletionOnStack(void* arg, grpc_cq_completion* completion) {} class DummyTag final : public CompletionQueueTag { @@ -82,11 +82,11 @@ static void BM_Pass1Cpp(benchmark::State& state) { while (state.KeepRunning()) { grpc_cq_completion completion; DummyTag dummy_tag; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GPR_ASSERT(grpc_cq_begin_op(c_cq, &dummy_tag)); - grpc_cq_end_op(&exec_ctx, c_cq, &dummy_tag, GRPC_ERROR_NONE, - DoneWithCompletionOnStack, NULL, &completion); - grpc_exec_ctx_finish(&exec_ctx); + grpc_cq_end_op(c_cq, &dummy_tag, GRPC_ERROR_NONE, DoneWithCompletionOnStack, + NULL, &completion); + grpc_exec_ctx_finish(); void* tag; bool ok; cq.Next(&tag, &ok); @@ -102,11 +102,11 @@ static void BM_Pass1Core(benchmark::State& state) { gpr_timespec deadline = gpr_inf_future(GPR_CLOCK_MONOTONIC); while (state.KeepRunning()) { grpc_cq_completion completion; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GPR_ASSERT(grpc_cq_begin_op(cq, NULL)); - grpc_cq_end_op(&exec_ctx, cq, NULL, GRPC_ERROR_NONE, - DoneWithCompletionOnStack, NULL, &completion); - grpc_exec_ctx_finish(&exec_ctx); + grpc_cq_end_op(cq, NULL, GRPC_ERROR_NONE, DoneWithCompletionOnStack, NULL, + &completion); + grpc_exec_ctx_finish(); grpc_completion_queue_next(cq, deadline, NULL); } grpc_completion_queue_destroy(cq); @@ -121,11 +121,11 @@ static void BM_Pluck1Core(benchmark::State& state) { gpr_timespec deadline = gpr_inf_future(GPR_CLOCK_MONOTONIC); while (state.KeepRunning()) { grpc_cq_completion completion; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GPR_ASSERT(grpc_cq_begin_op(cq, NULL)); - grpc_cq_end_op(&exec_ctx, cq, NULL, GRPC_ERROR_NONE, - DoneWithCompletionOnStack, NULL, &completion); - grpc_exec_ctx_finish(&exec_ctx); + grpc_cq_end_op(cq, NULL, GRPC_ERROR_NONE, DoneWithCompletionOnStack, NULL, + &completion); + grpc_exec_ctx_finish(); grpc_completion_queue_pluck(cq, NULL, deadline, NULL); } grpc_completion_queue_destroy(cq); diff --git a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc index 57a69acf01e..08bcb63bdc3 100644 --- a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc +++ b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc @@ -45,9 +45,8 @@ static grpc_completion_queue* g_cq; static grpc_event_engine_vtable g_vtable; static const grpc_event_engine_vtable* g_old_vtable; -static void pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* ps, - grpc_closure* closure) { - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); +static void pollset_shutdown(grpc_pollset* ps, grpc_closure* closure) { + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); } static void pollset_init(grpc_pollset* ps, gpr_mu** mu) { @@ -55,25 +54,20 @@ static void pollset_init(grpc_pollset* ps, gpr_mu** mu) { *mu = &ps->mu; } -static void pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* ps) { - gpr_mu_destroy(&ps->mu); -} +static void pollset_destroy(grpc_pollset* ps) { gpr_mu_destroy(&ps->mu); } -static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* p, - grpc_pollset_worker* worker) { +static grpc_error* pollset_kick(grpc_pollset* p, grpc_pollset_worker* worker) { return GRPC_ERROR_NONE; } /* Callback when the tag is dequeued from the completion queue. Does nothing */ -static void cq_done_cb(grpc_exec_ctx* exec_ctx, void* done_arg, - grpc_cq_completion* cq_completion) { +static void cq_done_cb(void* done_arg, grpc_cq_completion* cq_completion) { gpr_free(cq_completion); } /* Queues a completion tag if deadline is > 0. * Does nothing if deadline is 0 (i.e gpr_time_0(GPR_CLOCK_MONOTONIC)) */ -static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* ps, - grpc_pollset_worker** worker, +static grpc_error* pollset_work(grpc_pollset* ps, grpc_pollset_worker** worker, grpc_millis deadline) { if (deadline == 0) { gpr_log(GPR_DEBUG, "no-op"); @@ -82,9 +76,9 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* ps, gpr_mu_unlock(&ps->mu); GPR_ASSERT(grpc_cq_begin_op(g_cq, g_tag)); - grpc_cq_end_op(exec_ctx, g_cq, g_tag, GRPC_ERROR_NONE, cq_done_cb, NULL, + grpc_cq_end_op(g_cq, g_tag, GRPC_ERROR_NONE, cq_done_cb, NULL, (grpc_cq_completion*)gpr_malloc(sizeof(grpc_cq_completion))); - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(&ps->mu); return GRPC_ERROR_NONE; } diff --git a/test/cpp/microbenchmarks/bm_error.cc b/test/cpp/microbenchmarks/bm_error.cc index 56b80dfcf6d..3b97936dfea 100644 --- a/test/cpp/microbenchmarks/bm_error.cc +++ b/test/cpp/microbenchmarks/bm_error.cc @@ -248,14 +248,14 @@ template static void BM_ErrorGetStatus(benchmark::State& state) { TrackCounters track_counters; Fixture fixture; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { grpc_status_code status; grpc_slice slice; - grpc_error_get_status(&exec_ctx, fixture.error(), fixture.deadline(), - &status, &slice, NULL); + grpc_error_get_status(fixture.error(), fixture.deadline(), &status, &slice, + NULL); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } @@ -263,13 +263,13 @@ template static void BM_ErrorGetStatusCode(benchmark::State& state) { TrackCounters track_counters; Fixture fixture; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { grpc_status_code status; - grpc_error_get_status(&exec_ctx, fixture.error(), fixture.deadline(), - &status, NULL, NULL); + grpc_error_get_status(fixture.error(), fixture.deadline(), &status, NULL, + NULL); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } @@ -277,13 +277,13 @@ template static void BM_ErrorHttpError(benchmark::State& state) { TrackCounters track_counters; Fixture fixture; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { grpc_http2_error_code error; - grpc_error_get_status(&exec_ctx, fixture.error(), fixture.deadline(), NULL, - NULL, &error); + grpc_error_get_status(fixture.error(), fixture.deadline(), NULL, NULL, + &error); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } diff --git a/test/cpp/microbenchmarks/bm_fullstack_trickle.cc b/test/cpp/microbenchmarks/bm_fullstack_trickle.cc index 06ae3429857..43735eed0e7 100644 --- a/test/cpp/microbenchmarks/bm_fullstack_trickle.cc +++ b/test/cpp/microbenchmarks/bm_fullstack_trickle.cc @@ -172,13 +172,13 @@ class TrickledCHTTP2 : public EndpointPairFixture { } void Step(bool update_stats) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; inc_time(); size_t client_backlog = - grpc_trickle_endpoint_trickle(&exec_ctx, endpoint_pair_.client); + grpc_trickle_endpoint_trickle(endpoint_pair_.client); size_t server_backlog = - grpc_trickle_endpoint_trickle(&exec_ctx, endpoint_pair_.server); - grpc_exec_ctx_finish(&exec_ctx); + grpc_trickle_endpoint_trickle(endpoint_pair_.server); + grpc_exec_ctx_finish(); if (update_stats) { UpdateStats((grpc_chttp2_transport*)client_transport_, &client_stats_, client_backlog); diff --git a/test/cpp/microbenchmarks/bm_metadata.cc b/test/cpp/microbenchmarks/bm_metadata.cc index 360bbabe136..62a88f55b53 100644 --- a/test/cpp/microbenchmarks/bm_metadata.cc +++ b/test/cpp/microbenchmarks/bm_metadata.cc @@ -92,11 +92,11 @@ static void BM_MetadataFromNonInternedSlices(benchmark::State& state) { TrackCounters track_counters; gpr_slice k = grpc_slice_from_static_string("key"); gpr_slice v = grpc_slice_from_static_string("value"); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, NULL)); + GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_MetadataFromNonInternedSlices); @@ -105,11 +105,11 @@ static void BM_MetadataFromInternedSlices(benchmark::State& state) { TrackCounters track_counters; gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, NULL)); + GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_slice_unref(k); grpc_slice_unref(v); track_counters.Finish(state); @@ -121,13 +121,13 @@ static void BM_MetadataFromInternedSlicesAlreadyInIndex( TrackCounters track_counters; gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_mdelem seed = grpc_mdelem_create(&exec_ctx, k, v, NULL); + ExecCtx _local_exec_ctx; + grpc_mdelem seed = grpc_mdelem_create(k, v, NULL); while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, NULL)); + GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } - GRPC_MDELEM_UNREF(&exec_ctx, seed); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(seed); + grpc_exec_ctx_finish(); grpc_slice_unref(k); grpc_slice_unref(v); track_counters.Finish(state); @@ -138,11 +138,11 @@ static void BM_MetadataFromInternedKey(benchmark::State& state) { TrackCounters track_counters; gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_from_static_string("value"); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, NULL)); + GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_slice_unref(k); track_counters.Finish(state); } @@ -154,14 +154,12 @@ static void BM_MetadataFromNonInternedSlicesWithBackingStore( gpr_slice k = grpc_slice_from_static_string("key"); gpr_slice v = grpc_slice_from_static_string("value"); char backing_store[sizeof(grpc_mdelem_data)]; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF( - &exec_ctx, - grpc_mdelem_create(&exec_ctx, k, v, - reinterpret_cast(backing_store))); + GRPC_MDELEM_UNREF(grpc_mdelem_create( + k, v, reinterpret_cast(backing_store))); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_MetadataFromNonInternedSlicesWithBackingStore); @@ -172,14 +170,12 @@ static void BM_MetadataFromInternedSlicesWithBackingStore( gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); char backing_store[sizeof(grpc_mdelem_data)]; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF( - &exec_ctx, - grpc_mdelem_create(&exec_ctx, k, v, - reinterpret_cast(backing_store))); + GRPC_MDELEM_UNREF(grpc_mdelem_create( + k, v, reinterpret_cast(backing_store))); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_slice_unref(k); grpc_slice_unref(v); track_counters.Finish(state); @@ -192,14 +188,12 @@ static void BM_MetadataFromInternedKeyWithBackingStore( gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_from_static_string("value"); char backing_store[sizeof(grpc_mdelem_data)]; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF( - &exec_ctx, - grpc_mdelem_create(&exec_ctx, k, v, - reinterpret_cast(backing_store))); + GRPC_MDELEM_UNREF(grpc_mdelem_create( + k, v, reinterpret_cast(backing_store))); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_slice_unref(k); track_counters.Finish(state); } @@ -209,11 +203,11 @@ static void BM_MetadataFromStaticMetadataStrings(benchmark::State& state) { TrackCounters track_counters; gpr_slice k = GRPC_MDSTR_STATUS; gpr_slice v = GRPC_MDSTR_200; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, NULL)); + GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_slice_unref(k); track_counters.Finish(state); } @@ -224,11 +218,11 @@ static void BM_MetadataFromStaticMetadataStringsNotIndexed( TrackCounters track_counters; gpr_slice k = GRPC_MDSTR_STATUS; gpr_slice v = GRPC_MDSTR_GZIP; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, NULL)); + GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_slice_unref(k); track_counters.Finish(state); } @@ -237,16 +231,15 @@ BENCHMARK(BM_MetadataFromStaticMetadataStringsNotIndexed); static void BM_MetadataRefUnrefExternal(benchmark::State& state) { TrackCounters track_counters; char backing_store[sizeof(grpc_mdelem_data)]; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_mdelem el = - grpc_mdelem_create(&exec_ctx, grpc_slice_from_static_string("a"), - grpc_slice_from_static_string("b"), - reinterpret_cast(backing_store)); + ExecCtx _local_exec_ctx; + grpc_mdelem el = grpc_mdelem_create( + grpc_slice_from_static_string("a"), grpc_slice_from_static_string("b"), + reinterpret_cast(backing_store)); while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, GRPC_MDELEM_REF(el)); + GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); } - GRPC_MDELEM_UNREF(&exec_ctx, el); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(el); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_MetadataRefUnrefExternal); @@ -254,47 +247,45 @@ BENCHMARK(BM_MetadataRefUnrefExternal); static void BM_MetadataRefUnrefInterned(benchmark::State& state) { TrackCounters track_counters; char backing_store[sizeof(grpc_mdelem_data)]; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); grpc_mdelem el = grpc_mdelem_create( - &exec_ctx, k, v, reinterpret_cast(backing_store)); + k, v, reinterpret_cast(backing_store)); grpc_slice_unref(k); grpc_slice_unref(v); while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, GRPC_MDELEM_REF(el)); + GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); } - GRPC_MDELEM_UNREF(&exec_ctx, el); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(el); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_MetadataRefUnrefInterned); static void BM_MetadataRefUnrefAllocated(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_mdelem el = - grpc_mdelem_create(&exec_ctx, grpc_slice_from_static_string("a"), - grpc_slice_from_static_string("b"), NULL); + ExecCtx _local_exec_ctx; + grpc_mdelem el = grpc_mdelem_create(grpc_slice_from_static_string("a"), + grpc_slice_from_static_string("b"), NULL); while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, GRPC_MDELEM_REF(el)); + GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); } - GRPC_MDELEM_UNREF(&exec_ctx, el); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(el); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_MetadataRefUnrefAllocated); static void BM_MetadataRefUnrefStatic(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_mdelem el = - grpc_mdelem_create(&exec_ctx, GRPC_MDSTR_STATUS, GRPC_MDSTR_200, NULL); + ExecCtx _local_exec_ctx; + grpc_mdelem el = grpc_mdelem_create(GRPC_MDSTR_STATUS, GRPC_MDSTR_200, NULL); while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, GRPC_MDELEM_REF(el)); + GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); } - GRPC_MDELEM_UNREF(&exec_ctx, el); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(el); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_MetadataRefUnrefStatic); diff --git a/test/cpp/microbenchmarks/bm_pollset.cc b/test/cpp/microbenchmarks/bm_pollset.cc index eab1e894802..524129e511e 100644 --- a/test/cpp/microbenchmarks/bm_pollset.cc +++ b/test/cpp/microbenchmarks/bm_pollset.cc @@ -43,8 +43,8 @@ extern "C" { auto& force_library_initialization = Library::get(); -static void shutdown_ps(grpc_exec_ctx* exec_ctx, void* ps, grpc_error* error) { - grpc_pollset_destroy(exec_ctx, static_cast(ps)); +static void shutdown_ps(void* ps, grpc_error* error) { + grpc_pollset_destroy(static_cast(ps)); } static void BM_CreateDestroyPollset(benchmark::State& state) { @@ -52,7 +52,7 @@ static void BM_CreateDestroyPollset(benchmark::State& state) { size_t ps_sz = grpc_pollset_size(); grpc_pollset* ps = static_cast(gpr_malloc(ps_sz)); gpr_mu* mu; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_closure shutdown_ps_closure; GRPC_CLOSURE_INIT(&shutdown_ps_closure, shutdown_ps, ps, grpc_schedule_on_exec_ctx); @@ -60,11 +60,11 @@ static void BM_CreateDestroyPollset(benchmark::State& state) { memset(ps, 0, ps_sz); grpc_pollset_init(ps, &mu); gpr_mu_lock(mu); - grpc_pollset_shutdown(&exec_ctx, ps, &shutdown_ps_closure); + grpc_pollset_shutdown(ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_free(ps); track_counters.Finish(state); } @@ -116,17 +116,17 @@ static void BM_PollEmptyPollset(benchmark::State& state) { grpc_pollset* ps = static_cast(gpr_zalloc(ps_sz)); gpr_mu* mu; grpc_pollset_init(ps, &mu); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; gpr_mu_lock(mu); while (state.KeepRunning()) { - GRPC_ERROR_UNREF(grpc_pollset_work(&exec_ctx, ps, NULL, 0)); + GRPC_ERROR_UNREF(grpc_pollset_work(ps, NULL, 0)); } grpc_closure shutdown_ps_closure; GRPC_CLOSURE_INIT(&shutdown_ps_closure, shutdown_ps, ps, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, ps, &shutdown_ps_closure); + grpc_pollset_shutdown(ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_free(ps); track_counters.Finish(state); } @@ -138,23 +138,23 @@ static void BM_PollAddFd(benchmark::State& state) { grpc_pollset* ps = static_cast(gpr_zalloc(ps_sz)); gpr_mu* mu; grpc_pollset_init(ps, &mu); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_wakeup_fd wakeup_fd; GPR_ASSERT( GRPC_LOG_IF_ERROR("wakeup_fd_init", grpc_wakeup_fd_init(&wakeup_fd))); grpc_fd* fd = grpc_fd_create(wakeup_fd.read_fd, "xxx"); while (state.KeepRunning()) { - grpc_pollset_add_fd(&exec_ctx, ps, fd); - grpc_exec_ctx_flush(&exec_ctx); + grpc_pollset_add_fd(ps, fd); + grpc_exec_ctx_flush(); } - grpc_fd_orphan(&exec_ctx, fd, NULL, NULL, false /* already_closed */, "xxx"); + grpc_fd_orphan(fd, NULL, NULL, false /* already_closed */, "xxx"); grpc_closure shutdown_ps_closure; GRPC_CLOSURE_INIT(&shutdown_ps_closure, shutdown_ps, ps, grpc_schedule_on_exec_ctx); gpr_mu_lock(mu); - grpc_pollset_shutdown(&exec_ctx, ps, &shutdown_ps_closure); + grpc_pollset_shutdown(ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_free(ps); track_counters.Finish(state); } @@ -171,7 +171,7 @@ Closure* MakeClosure(F f, grpc_closure_scheduler* scheduler) { C(F f, grpc_closure_scheduler* scheduler) : f_(f) { GRPC_CLOSURE_INIT(this, C::cbfn, this, scheduler); } - static void cbfn(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { + static void cbfn(void* arg, grpc_error* error) { C* p = static_cast(arg); p->f_(); } @@ -220,11 +220,11 @@ static void BM_SingleThreadPollOneFd(benchmark::State& state) { grpc_pollset* ps = static_cast(gpr_zalloc(ps_sz)); gpr_mu* mu; grpc_pollset_init(ps, &mu); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_wakeup_fd wakeup_fd; GRPC_ERROR_UNREF(grpc_wakeup_fd_init(&wakeup_fd)); grpc_fd* wakeup = grpc_fd_create(wakeup_fd.read_fd, "wakeup_read"); - grpc_pollset_add_fd(&exec_ctx, ps, wakeup); + grpc_pollset_add_fd(ps, wakeup); bool done = false; Closure* continue_closure = MakeClosure( [&]() { @@ -234,25 +234,23 @@ static void BM_SingleThreadPollOneFd(benchmark::State& state) { return; } GRPC_ERROR_UNREF(grpc_wakeup_fd_wakeup(&wakeup_fd)); - grpc_fd_notify_on_read(&exec_ctx, wakeup, continue_closure); + grpc_fd_notify_on_read(wakeup, continue_closure); }, grpc_schedule_on_exec_ctx); GRPC_ERROR_UNREF(grpc_wakeup_fd_wakeup(&wakeup_fd)); - grpc_fd_notify_on_read(&exec_ctx, wakeup, continue_closure); + grpc_fd_notify_on_read(wakeup, continue_closure); gpr_mu_lock(mu); while (!done) { - GRPC_ERROR_UNREF( - grpc_pollset_work(&exec_ctx, ps, NULL, GRPC_MILLIS_INF_FUTURE)); + GRPC_ERROR_UNREF(grpc_pollset_work(ps, NULL, GRPC_MILLIS_INF_FUTURE)); } - grpc_fd_orphan(&exec_ctx, wakeup, NULL, NULL, false /* already_closed */, - "done"); + grpc_fd_orphan(wakeup, NULL, NULL, false /* already_closed */, "done"); wakeup_fd.read_fd = 0; grpc_closure shutdown_ps_closure; GRPC_CLOSURE_INIT(&shutdown_ps_closure, shutdown_ps, ps, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, ps, &shutdown_ps_closure); + grpc_pollset_shutdown(ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_wakeup_fd_destroy(&wakeup_fd); gpr_free(ps); track_counters.Finish(state); diff --git a/test/cpp/microbenchmarks/fullstack_fixtures.h b/test/cpp/microbenchmarks/fullstack_fixtures.h index a7f85045052..8a66f6fa0c8 100644 --- a/test/cpp/microbenchmarks/fullstack_fixtures.h +++ b/test/cpp/microbenchmarks/fullstack_fixtures.h @@ -167,7 +167,7 @@ class EndpointPairFixture : public BaseFixture { fixture_configuration.ApplyCommonServerBuilderConfig(&b); server_ = b.BuildAndStart(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; /* add server endpoint to server_ * */ @@ -175,19 +175,19 @@ class EndpointPairFixture : public BaseFixture { const grpc_channel_args* server_args = grpc_server_get_channel_args(server_->c_server()); server_transport_ = grpc_create_chttp2_transport( - &exec_ctx, server_args, endpoints.server, 0 /* is_client */); + server_args, endpoints.server, 0 /* is_client */); grpc_pollset** pollsets; size_t num_pollsets = 0; grpc_server_get_pollsets(server_->c_server(), &pollsets, &num_pollsets); for (size_t i = 0; i < num_pollsets; i++) { - grpc_endpoint_add_to_pollset(&exec_ctx, endpoints.server, pollsets[i]); + grpc_endpoint_add_to_pollset(endpoints.server, pollsets[i]); } - grpc_server_setup_transport(&exec_ctx, server_->c_server(), - server_transport_, NULL, server_args); - grpc_chttp2_transport_start_reading(&exec_ctx, server_transport_, NULL); + grpc_server_setup_transport(server_->c_server(), server_transport_, NULL, + server_args); + grpc_chttp2_transport_start_reading(server_transport_, NULL); } /* create channel */ @@ -198,17 +198,16 @@ class EndpointPairFixture : public BaseFixture { grpc_channel_args c_args = args.c_channel_args(); client_transport_ = - grpc_create_chttp2_transport(&exec_ctx, &c_args, endpoints.client, 1); + grpc_create_chttp2_transport(&c_args, endpoints.client, 1); GPR_ASSERT(client_transport_); - grpc_channel* channel = - grpc_channel_create(&exec_ctx, "target", &c_args, - GRPC_CLIENT_DIRECT_CHANNEL, client_transport_); - grpc_chttp2_transport_start_reading(&exec_ctx, client_transport_, NULL); + grpc_channel* channel = grpc_channel_create( + "target", &c_args, GRPC_CLIENT_DIRECT_CHANNEL, client_transport_); + grpc_chttp2_transport_start_reading(client_transport_, NULL); channel_ = CreateChannelInternal("", channel); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } virtual ~EndpointPairFixture() { diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc index 7d0371bea4c..742fb8d966b 100644 --- a/test/cpp/naming/resolver_component_test.cc +++ b/test/cpp/naming/resolver_component_test.cc @@ -151,32 +151,32 @@ struct ArgsStruct { std::string expected_lb_policy; }; -void ArgsInit(grpc_exec_ctx *exec_ctx, ArgsStruct *args) { +void ArgsInit(ArgsStruct *args) { gpr_event_init(&args->ev); args->pollset = (grpc_pollset *)gpr_zalloc(grpc_pollset_size()); grpc_pollset_init(args->pollset, &args->mu); args->pollset_set = grpc_pollset_set_create(); - grpc_pollset_set_add_pollset(exec_ctx, args->pollset_set, args->pollset); + grpc_pollset_set_add_pollset(args->pollset_set, args->pollset); args->lock = grpc_combiner_create(); gpr_atm_rel_store(&args->done_atm, 0); args->channel_args = NULL; } -void DoNothing(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) {} +void DoNothing(void *arg, grpc_error *error) {} -void ArgsFinish(grpc_exec_ctx *exec_ctx, ArgsStruct *args) { +void ArgsFinish(ArgsStruct *args) { GPR_ASSERT(gpr_event_wait(&args->ev, TestDeadline())); - grpc_pollset_set_del_pollset(exec_ctx, args->pollset_set, args->pollset); - grpc_pollset_set_destroy(exec_ctx, args->pollset_set); + grpc_pollset_set_del_pollset(args->pollset_set, args->pollset); + grpc_pollset_set_destroy(args->pollset_set); grpc_closure DoNothing_cb; GRPC_CLOSURE_INIT(&DoNothing_cb, DoNothing, NULL, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(exec_ctx, args->pollset, &DoNothing_cb); + grpc_pollset_shutdown(args->pollset, &DoNothing_cb); // exec_ctx needs to be flushed before calling grpc_pollset_destroy() - grpc_channel_args_destroy(exec_ctx, args->channel_args); - grpc_exec_ctx_flush(exec_ctx); - grpc_pollset_destroy(exec_ctx, args->pollset); + grpc_channel_args_destroy(args->channel_args); + grpc_exec_ctx_flush(); + grpc_pollset_destroy(args->pollset); gpr_free(args->pollset); - GRPC_COMBINER_UNREF(exec_ctx, args->lock, NULL); + GRPC_COMBINER_UNREF(args->lock, NULL); } gpr_timespec NSecondDeadline(int seconds) { @@ -197,14 +197,14 @@ void PollPollsetUntilRequestDone(ArgsStruct *args) { time_left.tv_sec, time_left.tv_nsec); GPR_ASSERT(gpr_time_cmp(time_left, gpr_time_0(GPR_TIMESPAN)) >= 0); grpc_pollset_worker *worker = NULL; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; gpr_mu_lock(args->mu); GRPC_LOG_IF_ERROR("pollset_work", - grpc_pollset_work(&exec_ctx, args->pollset, &worker, + grpc_pollset_work(args->pollset, &worker, grpc_timespec_to_millis_round_up( NSecondDeadline(1)))); gpr_mu_unlock(args->mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } gpr_event_set(&args->ev, (void *)1); } @@ -236,8 +236,7 @@ void CheckLBPolicyResultLocked(grpc_channel_args *channel_args, } } -void CheckResolverResultLocked(grpc_exec_ctx *exec_ctx, void *argsp, - grpc_error *err) { +void CheckResolverResultLocked(void *argsp, grpc_error *err) { ArgsStruct *args = (ArgsStruct *)argsp; grpc_channel_args *channel_args = args->channel_args; const grpc_arg *channel_arg = @@ -272,15 +271,14 @@ void CheckResolverResultLocked(grpc_exec_ctx *exec_ctx, void *argsp, } gpr_atm_rel_store(&args->done_atm, 1); gpr_mu_lock(args->mu); - GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, args->pollset, NULL)); + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(args->pollset, NULL)); gpr_mu_unlock(args->mu); } TEST(ResolverComponentTest, TestResolvesRelevantRecords) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; ArgsStruct args; - ArgsInit(&exec_ctx, &args); + ArgsInit(&args); args.expected_addrs = ParseExpectedAddrs(FLAGS_expected_addrs); args.expected_service_config_string = FLAGS_expected_chosen_service_config; args.expected_lb_policy = FLAGS_expected_lb_policy; @@ -290,19 +288,19 @@ TEST(ResolverComponentTest, TestResolvesRelevantRecords) { FLAGS_local_dns_server_address.c_str(), FLAGS_target_name.c_str())); // create resolver and resolve - grpc_resolver *resolver = grpc_resolver_create(&exec_ctx, whole_uri, NULL, - args.pollset_set, args.lock); + grpc_resolver *resolver = + grpc_resolver_create(whole_uri, NULL, args.pollset_set, args.lock); gpr_free(whole_uri); grpc_closure on_resolver_result_changed; GRPC_CLOSURE_INIT(&on_resolver_result_changed, CheckResolverResultLocked, (void *)&args, grpc_combiner_scheduler(args.lock)); - grpc_resolver_next_locked(&exec_ctx, resolver, &args.channel_args, + grpc_resolver_next_locked(resolver, &args.channel_args, &on_resolver_result_changed); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); PollPollsetUntilRequestDone(&args); - GRPC_RESOLVER_UNREF(&exec_ctx, resolver, NULL); - ArgsFinish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_RESOLVER_UNREF(resolver, NULL); + ArgsFinish(&args); + grpc_exec_ctx_finish(); } } // namespace diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc index f4f794cb88f..0cf0fd00690 100644 --- a/test/cpp/performance/writes_per_rpc_test.cc +++ b/test/cpp/performance/writes_per_rpc_test.cc @@ -83,26 +83,26 @@ class EndpointPairFixture { ApplyCommonServerBuilderConfig(&b); server_ = b.BuildAndStart(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; /* add server endpoint to server_ */ { const grpc_channel_args* server_args = grpc_server_get_channel_args(server_->c_server()); grpc_transport* transport = grpc_create_chttp2_transport( - &exec_ctx, server_args, endpoints.server, 0 /* is_client */); + server_args, endpoints.server, 0 /* is_client */); grpc_pollset** pollsets; size_t num_pollsets = 0; grpc_server_get_pollsets(server_->c_server(), &pollsets, &num_pollsets); for (size_t i = 0; i < num_pollsets; i++) { - grpc_endpoint_add_to_pollset(&exec_ctx, endpoints.server, pollsets[i]); + grpc_endpoint_add_to_pollset(endpoints.server, pollsets[i]); } - grpc_server_setup_transport(&exec_ctx, server_->c_server(), transport, - NULL, server_args); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL); + grpc_server_setup_transport(server_->c_server(), transport, NULL, + server_args); + grpc_chttp2_transport_start_reading(transport, NULL); } /* create channel */ @@ -113,16 +113,16 @@ class EndpointPairFixture { grpc_channel_args c_args = args.c_channel_args(); grpc_transport* transport = - grpc_create_chttp2_transport(&exec_ctx, &c_args, endpoints.client, 1); + grpc_create_chttp2_transport(&c_args, endpoints.client, 1); GPR_ASSERT(transport); grpc_channel* channel = grpc_channel_create( - &exec_ctx, "target", &c_args, GRPC_CLIENT_DIRECT_CHANNEL, transport); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL); + "target", &c_args, GRPC_CLIENT_DIRECT_CHANNEL, transport); + grpc_chttp2_transport_start_reading(transport, NULL); channel_ = CreateChannelInternal("", channel); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } virtual ~EndpointPairFixture() { diff --git a/tools/codegen/core/gen_stats_data.py b/tools/codegen/core/gen_stats_data.py index 072a6776152..d439d99a8c6 100755 --- a/tools/codegen/core/gen_stats_data.py +++ b/tools/codegen/core/gen_stats_data.py @@ -150,11 +150,11 @@ def gen_bucket_code(histogram): code = 'value = GPR_CLAMP(value, 0, %d);\n' % histogram.max map_table = gen_map_table(code_bounds[first_nontrivial:], shift_data) if first_nontrivial is None: - code += ('GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_%s, value);\n' + code += ('GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_%s, value);\n' % histogram.name.upper()) else: code += 'if (value < %d) {\n' % first_nontrivial - code += ('GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_%s, value);\n' + code += ('GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_%s, value);\n' % histogram.name.upper()) code += 'return;\n' code += '}' @@ -168,11 +168,11 @@ def gen_bucket_code(histogram): code += 'grpc_stats_table_%d[((_val.uint - %dull) >> %d)] + %d;\n' % (map_table_idx, first_nontrivial_code, shift_data[0], first_nontrivial) code += '_bkt.dbl = grpc_stats_table_%d[bucket];\n' % bounds_idx code += 'bucket -= (_val.uint < _bkt.uint);\n' - code += 'GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_%s, bucket);\n' % histogram.name.upper() + code += 'GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_%s, bucket);\n' % histogram.name.upper() code += 'return;\n' code += '}\n' - code += 'GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_%s, '% histogram.name.upper() - code += 'grpc_stats_histo_find_bucket_slow((exec_ctx), value, grpc_stats_table_%d, %d));\n' % (bounds_idx, histogram.buckets) + code += 'GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_%s, '% histogram.name.upper() + code += 'grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_%d, %d));\n' % (bounds_idx, histogram.buckets) return (code, bounds_idx) # utility: print a big comment block into a set of files @@ -240,13 +240,13 @@ with open('src/core/lib/debug/stats_data.h', 'w') as H: print >>H, "} grpc_stats_histogram_constants;" for ctr in inst_map['Counter']: - print >>H, ("#define GRPC_STATS_INC_%s(exec_ctx) " + - "GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_%s)") % ( + print >>H, ("#define GRPC_STATS_INC_%s() " + + "GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_%s)") % ( ctr.name.upper(), ctr.name.upper()) for histogram in inst_map['Histogram']: - print >>H, "#define GRPC_STATS_INC_%s(exec_ctx, value) grpc_stats_inc_%s((exec_ctx), (int)(value))" % ( + print >>H, "#define GRPC_STATS_INC_%s(value) grpc_stats_inc_%s( (int)(value))" % ( histogram.name.upper(), histogram.name.lower()) - print >>H, "void grpc_stats_inc_%s(grpc_exec_ctx *exec_ctx, int x);" % histogram.name.lower() + print >>H, "void grpc_stats_inc_%s(int x);" % histogram.name.lower() for i, tbl in enumerate(static_tables): print >>H, "extern const %s grpc_stats_table_%d[%d];" % (tbl[0], i, len(tbl[1])) @@ -254,7 +254,7 @@ with open('src/core/lib/debug/stats_data.h', 'w') as H: print >>H, "extern const int grpc_stats_histo_buckets[%d];" % len(inst_map['Histogram']) print >>H, "extern const int grpc_stats_histo_start[%d];" % len(inst_map['Histogram']) print >>H, "extern const int *const grpc_stats_histo_bucket_boundaries[%d];" % len(inst_map['Histogram']) - print >>H, "extern void (*const grpc_stats_inc_histogram[%d])(grpc_exec_ctx *exec_ctx, int x);" % len(inst_map['Histogram']) + print >>H, "extern void (*const grpc_stats_inc_histogram[%d])(int x);" % len(inst_map['Histogram']) print >>H print >>H, "#ifdef __cplusplus" @@ -309,7 +309,7 @@ with open('src/core/lib/debug/stats_data.cc', 'w') as C: tbl[0], i, len(tbl[1]), ','.join('%s' % x for x in tbl[1])) for histogram, code in zip(inst_map['Histogram'], histo_code): - print >>C, ("void grpc_stats_inc_%s(grpc_exec_ctx *exec_ctx, int value) {%s}") % ( + print >>C, ("void grpc_stats_inc_%s(int value) {%s}") % ( histogram.name.lower(), code) @@ -319,7 +319,7 @@ with open('src/core/lib/debug/stats_data.cc', 'w') as C: len(inst_map['Histogram']), ','.join('%s' % x for x in histo_start)) print >>C, "const int *const grpc_stats_histo_bucket_boundaries[%d] = {%s};" % ( len(inst_map['Histogram']), ','.join('grpc_stats_table_%d' % x for x in histo_bucket_boundaries)) - print >>C, "void (*const grpc_stats_inc_histogram[%d])(grpc_exec_ctx *exec_ctx, int x) = {%s};" % ( + print >>C, "void (*const grpc_stats_inc_histogram[%d])(int x) = {%s};" % ( len(inst_map['Histogram']), ','.join('grpc_stats_inc_%s' % histogram.name.lower() for histogram in inst_map['Histogram'])) # patch qps_test bigquery schema diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index 2e18ed2e8a4..b3f4b4bc398 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -6064,7 +6064,7 @@ "test/core/end2end/data/server1_key.c", "test/core/end2end/data/ssl_test_data.h", "test/core/end2end/data/test_root_cert.c", - "test/core/security/oauth2_utils.c", + "test/core/security/oauth2_utils.cc", "test/core/security/oauth2_utils.h" ], "third_party": false, @@ -6153,7 +6153,7 @@ "language": "c", "name": "test_tcp_server", "src": [ - "test/core/util/test_tcp_server.c", + "test/core/util/test_tcp_server.cc", "test/core/util/test_tcp_server.h" ], "third_party": false, @@ -7510,7 +7510,7 @@ "language": "c", "name": "bad_client_test", "src": [ - "test/core/bad_client/bad_client.c", + "test/core/bad_client/bad_client.cc", "test/core/bad_client/bad_client.h" ], "third_party": false, @@ -8932,11 +8932,11 @@ "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h", "test/core/end2end/cq_verifier.c", "test/core/end2end/cq_verifier.h", - "test/core/end2end/fixtures/http_proxy_fixture.c", + "test/core/end2end/fixtures/http_proxy_fixture.cc", "test/core/end2end/fixtures/http_proxy_fixture.h", "test/core/end2end/fixtures/proxy.c", "test/core/end2end/fixtures/proxy.h", - "test/core/iomgr/endpoint_tests.c", + "test/core/iomgr/endpoint_tests.cc", "test/core/iomgr/endpoint_tests.h", "test/core/util/debugger_macros.cc", "test/core/util/debugger_macros.h", @@ -8944,19 +8944,19 @@ "test/core/util/grpc_profiler.h", "test/core/util/memory_counters.c", "test/core/util/memory_counters.h", - "test/core/util/mock_endpoint.c", + "test/core/util/mock_endpoint.cc", "test/core/util/mock_endpoint.h", "test/core/util/parse_hexstring.c", "test/core/util/parse_hexstring.h", - "test/core/util/passthru_endpoint.c", + "test/core/util/passthru_endpoint.cc", "test/core/util/passthru_endpoint.h", - "test/core/util/port.c", + "test/core/util/port.cc", "test/core/util/port.h", - "test/core/util/port_server_client.c", + "test/core/util/port_server_client.cc", "test/core/util/port_server_client.h", "test/core/util/slice_splitter.c", "test/core/util/slice_splitter.h", - "test/core/util/trickle_endpoint.c", + "test/core/util/trickle_endpoint.cc", "test/core/util/trickle_endpoint.h" ], "third_party": false, From 3d2081b09aa9a11a35ddc602ebf675b5c0f96443 Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Tue, 31 Oct 2017 10:27:46 -0700 Subject: [PATCH 002/127] Require min Cocoapods version to be v1.2.0 --- gRPC-Core.podspec | 4 ++++ gRPC-ProtoRPC.podspec | 4 ++++ gRPC-RxLibrary.podspec | 4 ++++ gRPC.podspec | 4 ++++ src/objective-c/!ProtoCompiler-gRPCPlugin.podspec | 4 ++++ templates/gRPC-Core.podspec.template | 4 ++++ templates/gRPC-ProtoRPC.podspec.template | 4 ++++ templates/gRPC-RxLibrary.podspec.template | 4 ++++ templates/gRPC.podspec.template | 4 ++++ .../objective-c/!ProtoCompiler-gRPCPlugin.podspec.template | 4 ++++ 10 files changed, 40 insertions(+) diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 1c5864de64c..1479720a4bf 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -34,6 +34,10 @@ Pod::Spec.new do |s| :tag => "v#{version}", } + # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, + # which was released in Cocoapods v1.2.0. + s.cocoapods_version = '>= 1.2.0' + s.ios.deployment_target = '7.0' s.osx.deployment_target = '10.9' s.requires_arc = false diff --git a/gRPC-ProtoRPC.podspec b/gRPC-ProtoRPC.podspec index db1e8db06c0..dcf9cceb0b0 100644 --- a/gRPC-ProtoRPC.podspec +++ b/gRPC-ProtoRPC.podspec @@ -28,6 +28,10 @@ Pod::Spec.new do |s| s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } + # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, + # which was released in Cocoapods v1.2.0. + s.cocoapods_version = '>= 1.2.0' + s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => "v#{version}", diff --git a/gRPC-RxLibrary.podspec b/gRPC-RxLibrary.podspec index 36897790395..aad383ad193 100644 --- a/gRPC-RxLibrary.podspec +++ b/gRPC-RxLibrary.podspec @@ -28,6 +28,10 @@ Pod::Spec.new do |s| s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } + # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, + # which was released in Cocoapods v1.2.0. + s.cocoapods_version = '>= 1.2.0' + s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => "v#{version}", diff --git a/gRPC.podspec b/gRPC.podspec index 4c6cd3535f6..a9340e769e2 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -27,6 +27,10 @@ Pod::Spec.new do |s| s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } + # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, + # which was released in Cocoapods v1.2.0. + s.cocoapods_version = '>= 1.2.0' + s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => "v#{version}", diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec index 9065ab9f73e..cd83e866961 100644 --- a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec +++ b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec @@ -95,6 +95,10 @@ Pod::Spec.new do |s| # :sha1 => '??', } + # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, + # which was released in Cocoapods v1.2.0. + s.cocoapods_version = '>= 1.2.0' + repo_root = '../..' plugin = 'grpc_objective_c_plugin' diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index c329d2dedc2..758ccc7da36 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -61,6 +61,10 @@ :tag => "v#{version}", } + # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, + # which was released in Cocoapods v1.2.0. + s.cocoapods_version = '>= 1.2.0' + s.ios.deployment_target = '7.0' s.osx.deployment_target = '10.9' s.requires_arc = false diff --git a/templates/gRPC-ProtoRPC.podspec.template b/templates/gRPC-ProtoRPC.podspec.template index 4d99f6e19fc..bb6d7445e1b 100644 --- a/templates/gRPC-ProtoRPC.podspec.template +++ b/templates/gRPC-ProtoRPC.podspec.template @@ -30,6 +30,10 @@ s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } + # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, + # which was released in Cocoapods v1.2.0. + s.cocoapods_version = '>= 1.2.0' + s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => "v#{version}", diff --git a/templates/gRPC-RxLibrary.podspec.template b/templates/gRPC-RxLibrary.podspec.template index de4ee1e4385..42c50e5e632 100644 --- a/templates/gRPC-RxLibrary.podspec.template +++ b/templates/gRPC-RxLibrary.podspec.template @@ -30,6 +30,10 @@ s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } + # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, + # which was released in Cocoapods v1.2.0. + s.cocoapods_version = '>= 1.2.0' + s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => "v#{version}", diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template index 4b360cfb4c4..9d47aa95627 100644 --- a/templates/gRPC.podspec.template +++ b/templates/gRPC.podspec.template @@ -29,6 +29,10 @@ s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } + # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, + # which was released in Cocoapods v1.2.0. + s.cocoapods_version = '>= 1.2.0' + s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => "v#{version}", diff --git a/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template b/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template index 196c4054686..4af9dc5a8cc 100644 --- a/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template +++ b/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template @@ -97,6 +97,10 @@ # :sha1 => '??', } + # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, + # which was released in Cocoapods v1.2.0. + s.cocoapods_version = '>= 1.2.0' + repo_root = '../..' plugin = 'grpc_objective_c_plugin' From cf9b084211d1f2d99b1ce4685801bca1557f2f7b Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Thu, 9 Nov 2017 18:11:24 -0800 Subject: [PATCH 003/127] Removing few more instances of exec_ctx --- src/core/lib/iomgr/closure.h | 2 +- src/core/lib/iomgr/tcp_server_uv.cc | 10 +++++----- src/core/lib/iomgr/tcp_uv.cc | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/core/lib/iomgr/closure.h b/src/core/lib/iomgr/closure.h index f68918875a2..63843ad76d6 100644 --- a/src/core/lib/iomgr/closure.h +++ b/src/core/lib/iomgr/closure.h @@ -162,7 +162,7 @@ bool grpc_closure_list_empty(grpc_closure_list list); void grpc_closure_run(const char* file, int line, grpc_closure* closure, grpc_error* error); #define GRPC_CLOSURE_RUN(closure, error) \ - grpc_closure_run(__FILE__, __LINE__, exec_ctx, closure, error) + grpc_closure_run(__FILE__, __LINE__, closure, error) #else void grpc_closure_run(grpc_closure* closure, grpc_error* error); #define GRPC_CLOSURE_RUN(closure, error) grpc_closure_run(closure, error) diff --git a/src/core/lib/iomgr/tcp_server_uv.cc b/src/core/lib/iomgr/tcp_server_uv.cc index 2116ec106c4..71226600daa 100644 --- a/src/core/lib/iomgr/tcp_server_uv.cc +++ b/src/core/lib/iomgr/tcp_server_uv.cc @@ -176,13 +176,13 @@ void grpc_tcp_server_unref(grpc_tcp_server* s) { if (gpr_unref(&s->refs)) { /* Complete shutdown_starting work before destroying. */ grpc_exec_ctx local_ExecCtx _local_exec_ctx; - GRPC_CLOSURE_LIST_SCHED(&local_exec_ctx, &s->shutdown_starting); + GRPC_CLOSURE_LIST_SCHED(&s->shutdown_starting); if (exec_ctx == NULL) { - grpc_exec_ctx_flush(&local_exec_ctx); - tcp_server_destroy(&local_exec_ctx, s); - grpc_exec_ctx_finish(&local_exec_ctx); + grpc_exec_ctx_flush(); + tcp_server_destroy(s); + grpc_exec_ctx_finish(); } else { - grpc_exec_ctx_finish(&local_exec_ctx); + grpc_exec_ctx_finish(); tcp_server_destroy(s); } } diff --git a/src/core/lib/iomgr/tcp_uv.cc b/src/core/lib/iomgr/tcp_uv.cc index 9f2e1f79783..571c1d6f9a2 100644 --- a/src/core/lib/iomgr/tcp_uv.cc +++ b/src/core/lib/iomgr/tcp_uv.cc @@ -301,8 +301,7 @@ static void uv_add_to_pollset_set(grpc_endpoint* ep, (void)pollset; } -static void uv_delete_from_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_endpoint* ep, +static void uv_delete_from_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset) { // No-op. We're ignoring pollsets currently (void)exec_ctx; From 3150744c712449585e6c0a3347f2b9366671a8eb Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Thu, 9 Nov 2017 18:27:37 -0800 Subject: [PATCH 004/127] Removing more exec_ctx instances --- test/core/surface/completion_queue_test.cc | 16 +- test/cpp/common/channel_filter_test.cc | 4 +- test/cpp/end2end/client_lb_end2end_test.cc | 12 +- test/cpp/end2end/filter_end2end_test.cc | 7 +- test/cpp/end2end/grpclb_end2end_test.cc | 10 +- test/cpp/grpclb/grpclb_test.cc | 16 +- test/cpp/microbenchmarks/bm_call_create.cc | 136 ++++----- test/cpp/microbenchmarks/bm_chttp2_hpack.cc | 126 ++++----- .../microbenchmarks/bm_chttp2_transport.cc | 265 ++++++++---------- test/cpp/microbenchmarks/bm_closure.cc | 155 +++++----- test/cpp/microbenchmarks/bm_cq.cc | 20 +- .../microbenchmarks/bm_cq_multiple_threads.cc | 22 +- test/cpp/microbenchmarks/bm_error.cc | 18 +- .../microbenchmarks/bm_fullstack_trickle.cc | 6 +- test/cpp/microbenchmarks/bm_metadata.cc | 93 +++--- test/cpp/microbenchmarks/bm_pollset.cc | 44 ++- test/cpp/microbenchmarks/fullstack_fixtures.h | 23 +- test/cpp/naming/resolver_component_test.cc | 48 ++-- test/cpp/performance/writes_per_rpc_test.cc | 18 +- 19 files changed, 479 insertions(+), 560 deletions(-) diff --git a/test/core/surface/completion_queue_test.cc b/test/core/surface/completion_queue_test.cc index 63d8ea62684..f014738f4cb 100644 --- a/test/core/surface/completion_queue_test.cc +++ b/test/core/surface/completion_queue_test.cc @@ -129,8 +129,6 @@ static void test_cq_end_op(void) { grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; grpc_completion_queue_attributes attr; - grpc_exec_ctx init_exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_exec_ctx exec_ctx; void* tag = create_test_tag(); LOG_TEST("test_cq_end_op"); @@ -138,7 +136,7 @@ static void test_cq_end_op(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_NEXT; for (size_t i = 0; i < GPR_ARRAY_SIZE(polling_types); i++) { - exec_ctx = init_exec_ctx; // Reset exec_ctx + ExecCtx _local_exec_ctx; attr.cq_polling_type = polling_types[i]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, NULL); @@ -164,8 +162,6 @@ static void test_cq_tls_cache_full(void) { grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; grpc_completion_queue_attributes attr; - grpc_exec_ctx init_exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_exec_ctx exec_ctx; void* tag = create_test_tag(); void* res_tag; int ok; @@ -175,7 +171,7 @@ static void test_cq_tls_cache_full(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_NEXT; for (size_t i = 0; i < GPR_ARRAY_SIZE(polling_types); i++) { - exec_ctx = init_exec_ctx; // Reset exec_ctx + ExecCtx _local_exec_ctx; // Reset exec_ctx attr.cq_polling_type = polling_types[i]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, NULL); @@ -206,8 +202,6 @@ static void test_cq_tls_cache_empty(void) { grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; grpc_completion_queue_attributes attr; - grpc_exec_ctx init_exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_exec_ctx exec_ctx; void* res_tag; int ok; @@ -216,7 +210,7 @@ static void test_cq_tls_cache_empty(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_NEXT; for (size_t i = 0; i < GPR_ARRAY_SIZE(polling_types); i++) { - exec_ctx = init_exec_ctx; // Reset exec_ctx + ExecCtx _local_exec_ctx; // Reset exec_ctx attr.cq_polling_type = polling_types[i]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, NULL); @@ -284,8 +278,6 @@ static void test_pluck(void) { grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; grpc_completion_queue_attributes attr; - grpc_exec_ctx init_exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_exec_ctx exec_ctx; unsigned i, j; LOG_TEST("test_pluck"); @@ -300,7 +292,7 @@ static void test_pluck(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_PLUCK; for (size_t pidx = 0; pidx < GPR_ARRAY_SIZE(polling_types); pidx++) { - exec_ctx = init_exec_ctx; // reset exec_ctx + ExecCtx _local_exec_ctx; // reset exec_ctx attr.cq_polling_type = polling_types[pidx]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, NULL); diff --git a/test/cpp/common/channel_filter_test.cc b/test/cpp/common/channel_filter_test.cc index 638518107bb..7bdd53f9e7a 100644 --- a/test/cpp/common/channel_filter_test.cc +++ b/test/cpp/common/channel_filter_test.cc @@ -28,7 +28,7 @@ class MyChannelData : public ChannelData { public: MyChannelData() {} - grpc_error* Init(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, + grpc_error* Init(grpc_channel_element* elem, grpc_channel_element_args* args) override { (void)args->channel_args; // Make sure field is available. return GRPC_ERROR_NONE; @@ -39,7 +39,7 @@ class MyCallData : public CallData { public: MyCallData() {} - grpc_error* Init(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_error* Init(grpc_call_element* elem, const grpc_call_element_args* args) override { (void)args->path; // Make sure field is available. return GRPC_ERROR_NONE; diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index b2bbe56889d..df2ed0ecd00 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -117,7 +117,7 @@ class ClientLbEnd2endTest : public ::testing::Test { for (size_t i = 0; i < ports.size(); ++i) { char* lb_uri_str; gpr_asprintf(&lb_uri_str, "ipv4:127.0.0.1:%d", ports[i]); - grpc_uri* lb_uri = grpc_uri_parse(&exec_ctx, lb_uri_str, true); + grpc_uri* lb_uri = grpc_uri_parse(lb_uri_str, true); GPR_ASSERT(lb_uri != NULL); grpc_lb_addresses_set_address_from_uri(addresses, i, lb_uri, false /* is balancer */, @@ -129,11 +129,11 @@ class ClientLbEnd2endTest : public ::testing::Test { grpc_lb_addresses_create_channel_arg(addresses); grpc_channel_args* fake_result = grpc_channel_args_copy_and_add(NULL, &fake_addresses, 1); - grpc_fake_resolver_response_generator_set_response( - &exec_ctx, response_generator_, fake_result); - grpc_channel_args_destroy(&exec_ctx, fake_result); - grpc_lb_addresses_destroy(&exec_ctx, addresses); - grpc_exec_ctx_finish(&exec_ctx); + grpc_fake_resolver_response_generator_set_response(response_generator_, + fake_result); + grpc_channel_args_destroy(fake_result); + grpc_lb_addresses_destroy(addresses); + grpc_exec_ctx_finish(); } void ResetStub(const grpc::string& lb_policy_name = "") { diff --git a/test/cpp/end2end/filter_end2end_test.cc b/test/cpp/end2end/filter_end2end_test.cc index f260ea0016d..c4430379dbf 100644 --- a/test/cpp/end2end/filter_end2end_test.cc +++ b/test/cpp/end2end/filter_end2end_test.cc @@ -100,7 +100,7 @@ int GetCallCounterValue() { class ChannelDataImpl : public ChannelData { public: - grpc_error* Init(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, + grpc_error* Init(grpc_channel_element* elem, grpc_channel_element_args* args) { IncrementConnectionCounter(); return GRPC_ERROR_NONE; @@ -109,13 +109,12 @@ class ChannelDataImpl : public ChannelData { class CallDataImpl : public CallData { public: - void StartTransportStreamOpBatch(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, + void StartTransportStreamOpBatch(grpc_call_element* elem, TransportStreamOpBatch* op) override { // Incrementing the counter could be done from Init(), but we want // to test that the individual methods are actually called correctly. if (op->recv_initial_metadata() != nullptr) IncrementCallCounter(); - grpc_call_next_op(exec_ctx, elem, op->op()); + grpc_call_next_op(elem, op->op()); } }; diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index a6682b3e2f0..62d7094d4ca 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -457,7 +457,7 @@ class GrpclbEnd2endTest : public ::testing::Test { for (size_t i = 0; i < address_data.size(); ++i) { char* lb_uri_str; gpr_asprintf(&lb_uri_str, "ipv4:127.0.0.1:%d", address_data[i].port); - grpc_uri* lb_uri = grpc_uri_parse(&exec_ctx, lb_uri_str, true); + grpc_uri* lb_uri = grpc_uri_parse(lb_uri_str, true); GPR_ASSERT(lb_uri != nullptr); grpc_lb_addresses_set_address_from_uri( addresses, i, lb_uri, address_data[i].is_balancer, @@ -467,10 +467,10 @@ class GrpclbEnd2endTest : public ::testing::Test { } grpc_arg fake_addresses = grpc_lb_addresses_create_channel_arg(addresses); grpc_channel_args fake_result = {1, &fake_addresses}; - grpc_fake_resolver_response_generator_set_response( - &exec_ctx, response_generator_, &fake_result); - grpc_lb_addresses_destroy(&exec_ctx, addresses); - grpc_exec_ctx_finish(&exec_ctx); + grpc_fake_resolver_response_generator_set_response(response_generator_, + &fake_result); + grpc_lb_addresses_destroy(addresses); + grpc_exec_ctx_finish(); } const std::vector GetBackendPorts(const size_t start_index = 0) const { diff --git a/test/cpp/grpclb/grpclb_test.cc b/test/cpp/grpclb/grpclb_test.cc index 0955e2683d4..c2c6c0b3370 100644 --- a/test/cpp/grpclb/grpclb_test.cc +++ b/test/cpp/grpclb/grpclb_test.cc @@ -570,7 +570,7 @@ static void setup_client(const server_fixture* lb_server, grpc_lb_addresses* addresses = grpc_lb_addresses_create(1, NULL); char* lb_uri_str; gpr_asprintf(&lb_uri_str, "ipv4:%s", lb_server->servers_hostport); - grpc_uri* lb_uri = grpc_uri_parse(&exec_ctx, lb_uri_str, true); + grpc_uri* lb_uri = grpc_uri_parse(lb_uri_str, true); GPR_ASSERT(lb_uri != NULL); grpc_lb_addresses_set_address_from_uri(addresses, 0, lb_uri, true, lb_server->balancer_name, NULL); @@ -582,7 +582,7 @@ static void setup_client(const server_fixture* lb_server, grpc_lb_addresses_create_channel_arg(addresses); grpc_channel_args* fake_result = grpc_channel_args_copy_and_add(NULL, &fake_addresses, 1); - grpc_lb_addresses_destroy(&exec_ctx, addresses); + grpc_lb_addresses_destroy(addresses); const grpc_arg new_args[] = { grpc_fake_transport_expected_targets_arg(expected_target_names), @@ -597,13 +597,13 @@ static void setup_client(const server_fixture* lb_server, grpc_fake_transport_security_credentials_create(); cf->client = grpc_secure_channel_create(fake_creds, cf->server_uri, args, NULL); - grpc_fake_resolver_response_generator_set_response( - &exec_ctx, response_generator, fake_result); - grpc_channel_args_destroy(&exec_ctx, fake_result); - grpc_channel_credentials_unref(&exec_ctx, fake_creds); - grpc_channel_args_destroy(&exec_ctx, args); + grpc_fake_resolver_response_generator_set_response(response_generator, + fake_result); + grpc_channel_args_destroy(fake_result); + grpc_channel_credentials_unref(fake_creds); + grpc_channel_args_destroy(args); grpc_fake_resolver_response_generator_unref(response_generator); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } static void teardown_client(client_fixture* cf) { diff --git a/test/cpp/microbenchmarks/bm_call_create.cc b/test/cpp/microbenchmarks/bm_call_create.cc index c031aff1bb0..eac1c753c7a 100644 --- a/test/cpp/microbenchmarks/bm_call_create.cc +++ b/test/cpp/microbenchmarks/bm_call_create.cc @@ -311,12 +311,9 @@ static void BM_LameChannelCallCreateCoreSeparateBatch(benchmark::State& state) { } BENCHMARK(BM_LameChannelCallCreateCoreSeparateBatch); -static void FilterDestroy(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { - gpr_free(arg); -} +static void FilterDestroy(void* arg, grpc_error* error) { gpr_free(arg); } -static void DoNothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} +static void DoNothing(void* arg, grpc_error* error) {} class FakeClientChannelFactory : public grpc_client_channel_factory { public: @@ -324,15 +321,12 @@ class FakeClientChannelFactory : public grpc_client_channel_factory { private: static void NoRef(grpc_client_channel_factory* factory) {} - static void NoUnref(grpc_exec_ctx* exec_ctx, - grpc_client_channel_factory* factory) {} - static grpc_subchannel* CreateSubchannel(grpc_exec_ctx* exec_ctx, - grpc_client_channel_factory* factory, + static void NoUnref(grpc_client_channel_factory* factory) {} + static grpc_subchannel* CreateSubchannel(grpc_client_channel_factory* factory, const grpc_subchannel_args* args) { return nullptr; } - static grpc_channel* CreateClientChannel(grpc_exec_ctx* exec_ctx, - grpc_client_channel_factory* factory, + static grpc_channel* CreateClientChannel(grpc_client_channel_factory* factory, const char* target, grpc_client_channel_type type, const grpc_channel_args* args) { @@ -366,36 +360,32 @@ struct Fixture { namespace dummy_filter { -static void StartTransportStreamOp(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static void StartTransportStreamOp(grpc_call_element* elem, grpc_transport_stream_op_batch* op) {} -static void StartTransportOp(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static void StartTransportOp(grpc_channel_element* elem, grpc_transport_op* op) {} -static grpc_error* InitCallElem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* InitCallElem(grpc_call_element* elem, const grpc_call_element_args* args) { return GRPC_ERROR_NONE; } -static void SetPollsetOrPollsetSet(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static void SetPollsetOrPollsetSet(grpc_call_element* elem, grpc_polling_entity* pollent) {} -static void DestroyCallElem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void DestroyCallElem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_sched_closure) {} -grpc_error* InitChannelElem(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, +grpc_error* InitChannelElem(grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } -void DestroyChannelElem(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem) {} +void DestroyChannelElem(grpc_channel_element* elem) {} -void GetChannelInfo(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, +void GetChannelInfo(grpc_channel_element* elem, const grpc_channel_info* channel_info) {} static const grpc_channel_filter dummy_filter = {StartTransportStreamOp, @@ -422,41 +412,38 @@ size_t sizeof_stream; /* = sizeof(transport stream) */ const char* name; /* implementation of grpc_transport_init_stream */ -int InitStream(grpc_exec_ctx* exec_ctx, grpc_transport* self, - grpc_stream* stream, grpc_stream_refcount* refcount, - const void* server_data, gpr_arena* arena) { +int InitStream(grpc_transport* self, grpc_stream* stream, + grpc_stream_refcount* refcount, const void* server_data, + gpr_arena* arena) { return 0; } /* implementation of grpc_transport_set_pollset */ -void SetPollset(grpc_exec_ctx* exec_ctx, grpc_transport* self, - grpc_stream* stream, grpc_pollset* pollset) {} +void SetPollset(grpc_transport* self, grpc_stream* stream, + grpc_pollset* pollset) {} /* implementation of grpc_transport_set_pollset */ -void SetPollsetSet(grpc_exec_ctx* exec_ctx, grpc_transport* self, - grpc_stream* stream, grpc_pollset_set* pollset_set) {} +void SetPollsetSet(grpc_transport* self, grpc_stream* stream, + grpc_pollset_set* pollset_set) {} /* implementation of grpc_transport_perform_stream_op */ -void PerformStreamOp(grpc_exec_ctx* exec_ctx, grpc_transport* self, - grpc_stream* stream, grpc_transport_stream_op_batch* op) { - GRPC_CLOSURE_SCHED(exec_ctx, op->on_complete, GRPC_ERROR_NONE); +void PerformStreamOp(grpc_transport* self, grpc_stream* stream, + grpc_transport_stream_op_batch* op) { + GRPC_CLOSURE_SCHED(op->on_complete, GRPC_ERROR_NONE); } /* implementation of grpc_transport_perform_op */ -void PerformOp(grpc_exec_ctx* exec_ctx, grpc_transport* self, - grpc_transport_op* op) {} +void PerformOp(grpc_transport* self, grpc_transport_op* op) {} /* implementation of grpc_transport_destroy_stream */ -void DestroyStream(grpc_exec_ctx* exec_ctx, grpc_transport* self, - grpc_stream* stream, grpc_closure* then_sched_closure) {} +void DestroyStream(grpc_transport* self, grpc_stream* stream, + grpc_closure* then_sched_closure) {} /* implementation of grpc_transport_destroy */ -void Destroy(grpc_exec_ctx* exec_ctx, grpc_transport* self) {} +void Destroy(grpc_transport* self) {} /* implementation of grpc_transport_get_endpoint */ -grpc_endpoint* GetEndpoint(grpc_exec_ctx* exec_ctx, grpc_transport* self) { - return nullptr; -} +grpc_endpoint* GetEndpoint(grpc_transport* self) { return nullptr; } static const grpc_transport_vtable dummy_transport_vtable = { 0, "dummy_http2", InitStream, @@ -472,8 +459,8 @@ class NoOp { public: class Op { public: - Op(grpc_exec_ctx* exec_ctx, NoOp* p, grpc_call_stack* s) {} - void Finish(grpc_exec_ctx* exec_ctx) {} + Op(NoOp* p, grpc_call_stack* s) {} + void Finish() {} }; }; @@ -489,13 +476,11 @@ class SendEmptyMetadata { class Op { public: - Op(grpc_exec_ctx* exec_ctx, SendEmptyMetadata* p, grpc_call_stack* s) { + Op(SendEmptyMetadata* p, grpc_call_stack* s) { grpc_metadata_batch_init(&batch_); p->op_payload_.send_initial_metadata.send_initial_metadata = &batch_; } - void Finish(grpc_exec_ctx* exec_ctx) { - grpc_metadata_batch_destroy(exec_ctx, &batch_); - } + void Finish() { grpc_metadata_batch_destroy(&batch_); } private: grpc_metadata_batch batch_; @@ -543,13 +528,13 @@ static void BM_IsolatedFilter(benchmark::State& state) { static_cast(gpr_zalloc(channel_size)); GPR_ASSERT(GRPC_LOG_IF_ERROR( "channel_stack_init", - grpc_channel_stack_init(&exec_ctx, 1, FilterDestroy, channel_stack, - &filters[0], filters.size(), &channel_args, + grpc_channel_stack_init(1, FilterDestroy, channel_stack, &filters[0], + filters.size(), &channel_args, fixture.flags & REQUIRES_TRANSPORT ? &dummy_transport::dummy_transport : nullptr, "CHANNEL", channel_stack))); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); grpc_call_stack* call_stack = static_cast(gpr_zalloc(channel_stack->call_stack_size)); grpc_millis deadline = GRPC_MILLIS_INF_FUTURE; @@ -568,12 +553,12 @@ static void BM_IsolatedFilter(benchmark::State& state) { call_args.arena = gpr_arena_create(kArenaSize); while (state.KeepRunning()) { GPR_TIMER_SCOPE("BenchmarkCycle", 0); - GRPC_ERROR_UNREF(grpc_call_stack_init(&exec_ctx, channel_stack, 1, - DoNothing, NULL, &call_args)); - typename TestOp::Op op(&exec_ctx, &test_op_data, call_stack); - grpc_call_stack_destroy(&exec_ctx, call_stack, &final_info, NULL); - op.Finish(&exec_ctx); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_ERROR_UNREF( + grpc_call_stack_init(channel_stack, 1, DoNothing, NULL, &call_args)); + typename TestOp::Op op(&test_op_data, call_stack); + grpc_call_stack_destroy(call_stack, &final_info, NULL); + op.Finish(); + grpc_exec_ctx_flush(); // recreate arena every 64k iterations to avoid oom if (0 == (state.iterations() & 0xffff)) { gpr_arena_destroy(call_args.arena); @@ -581,8 +566,8 @@ static void BM_IsolatedFilter(benchmark::State& state) { } } gpr_arena_destroy(call_args.arena); - grpc_channel_stack_destroy(&exec_ctx, channel_stack); - grpc_exec_ctx_finish(&exec_ctx); + grpc_channel_stack_destroy(channel_stack); + grpc_exec_ctx_finish(); gpr_free(channel_stack); gpr_free(call_stack); @@ -632,59 +617,55 @@ typedef struct { grpc_call_combiner* call_combiner; } call_data; -static void StartTransportStreamOp(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static void StartTransportStreamOp(grpc_call_element* elem, grpc_transport_stream_op_batch* op) { call_data* calld = static_cast(elem->call_data); if (op->recv_initial_metadata) { GRPC_CALL_COMBINER_START( - exec_ctx, calld->call_combiner, + calld->call_combiner, op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_NONE, "recv_initial_metadata"); } if (op->recv_message) { - GRPC_CALL_COMBINER_START(exec_ctx, calld->call_combiner, + GRPC_CALL_COMBINER_START(calld->call_combiner, op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE, "recv_message"); } - GRPC_CLOSURE_SCHED(exec_ctx, op->on_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(op->on_complete, GRPC_ERROR_NONE); } -static void StartTransportOp(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static void StartTransportOp(grpc_channel_element* elem, grpc_transport_op* op) { if (op->disconnect_with_error != GRPC_ERROR_NONE) { GRPC_ERROR_UNREF(op->disconnect_with_error); } - GRPC_CLOSURE_SCHED(exec_ctx, op->on_consumed, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(op->on_consumed, GRPC_ERROR_NONE); } -static grpc_error* InitCallElem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* InitCallElem(grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = static_cast(elem->call_data); calld->call_combiner = args->call_combiner; return GRPC_ERROR_NONE; } -static void SetPollsetOrPollsetSet(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static void SetPollsetOrPollsetSet(grpc_call_element* elem, grpc_polling_entity* pollent) {} -static void DestroyCallElem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void DestroyCallElem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_sched_closure) { - GRPC_CLOSURE_SCHED(exec_ctx, then_sched_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(then_sched_closure, GRPC_ERROR_NONE); } -grpc_error* InitChannelElem(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, +grpc_error* InitChannelElem(grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } -void DestroyChannelElem(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem) {} +void DestroyChannelElem(grpc_channel_element* elem) {} -void GetChannelInfo(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, +void GetChannelInfo(grpc_channel_element* elem, const grpc_channel_info* channel_info) {} static const grpc_channel_filter isolated_call_filter = { @@ -711,9 +692,8 @@ class IsolatedCallFixture : public TrackCounters { builder, &isolated_call_filter::isolated_call_filter, NULL, NULL)); { ExecCtx _local_exec_ctx; - channel_ = grpc_channel_create_with_builder(&exec_ctx, builder, - GRPC_CLIENT_CHANNEL); - grpc_exec_ctx_finish(&exec_ctx); + channel_ = grpc_channel_create_with_builder(builder, GRPC_CLIENT_CHANNEL); + grpc_exec_ctx_finish(); } cq_ = grpc_completion_queue_create_for_next(NULL); } diff --git a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc index a1bfc6997f8..f9d02ee5041 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc @@ -54,10 +54,10 @@ static void BM_HpackEncoderInitDestroy(benchmark::State& state) { grpc_chttp2_hpack_compressor c; while (state.KeepRunning()) { grpc_chttp2_hpack_compressor_init(&c); - grpc_chttp2_hpack_compressor_destroy(&exec_ctx, &c); - grpc_exec_ctx_flush(&exec_ctx); + grpc_chttp2_hpack_compressor_destroy(&c); + grpc_exec_ctx_flush(); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_HpackEncoderInitDestroy); @@ -65,7 +65,7 @@ BENCHMARK(BM_HpackEncoderInitDestroy); static void BM_HpackEncoderEncodeDeadline(benchmark::State& state) { TrackCounters track_counters; ExecCtx _local_exec_ctx; - grpc_millis saved_now = grpc_exec_ctx_now(&exec_ctx); + grpc_millis saved_now = grpc_exec_ctx_now(); grpc_metadata_batch b; grpc_metadata_batch_init(&b); @@ -85,14 +85,14 @@ static void BM_HpackEncoderEncodeDeadline(benchmark::State& state) { (size_t)1024, &stats, }; - grpc_chttp2_encode_header(&exec_ctx, &c, NULL, 0, &b, &hopt, &outbuf); - grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, &outbuf); - grpc_exec_ctx_flush(&exec_ctx); + grpc_chttp2_encode_header(&c, NULL, 0, &b, &hopt, &outbuf); + grpc_slice_buffer_reset_and_unref_internal(&outbuf); + grpc_exec_ctx_flush(); } - grpc_metadata_batch_destroy(&exec_ctx, &b); - grpc_chttp2_hpack_compressor_destroy(&exec_ctx, &c); - grpc_slice_buffer_destroy_internal(&exec_ctx, &outbuf); - grpc_exec_ctx_finish(&exec_ctx); + grpc_metadata_batch_destroy(&b); + grpc_chttp2_hpack_compressor_destroy(&c); + grpc_slice_buffer_destroy_internal(&outbuf); + grpc_exec_ctx_finish(); std::ostringstream label; label << "framing_bytes/iter:" @@ -114,12 +114,11 @@ static void BM_HpackEncoderEncodeHeader(benchmark::State& state) { grpc_metadata_batch b; grpc_metadata_batch_init(&b); - std::vector elems = Fixture::GetElems(&exec_ctx); + std::vector elems = Fixture::GetElems(); std::vector storage(elems.size()); for (size_t i = 0; i < elems.size(); i++) { GPR_ASSERT(GRPC_LOG_IF_ERROR( - "addmd", - grpc_metadata_batch_add_tail(&exec_ctx, &b, &storage[i], elems[i]))); + "addmd", grpc_metadata_batch_add_tail(&b, &storage[i], elems[i]))); } grpc_chttp2_hpack_compressor c; @@ -136,7 +135,7 @@ static void BM_HpackEncoderEncodeHeader(benchmark::State& state) { (size_t)state.range(1), &stats, }; - grpc_chttp2_encode_header(&exec_ctx, &c, NULL, 0, &b, &hopt, &outbuf); + grpc_chttp2_encode_header(&c, NULL, 0, &b, &hopt, &outbuf); if (!logged_representative_output && state.iterations() > 3) { logged_representative_output = true; for (size_t i = 0; i < outbuf.count; i++) { @@ -145,13 +144,13 @@ static void BM_HpackEncoderEncodeHeader(benchmark::State& state) { gpr_free(s); } } - grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, &outbuf); - grpc_exec_ctx_flush(&exec_ctx); + grpc_slice_buffer_reset_and_unref_internal(&outbuf); + grpc_exec_ctx_flush(); } - grpc_metadata_batch_destroy(&exec_ctx, &b); - grpc_chttp2_hpack_compressor_destroy(&exec_ctx, &c); - grpc_slice_buffer_destroy_internal(&exec_ctx, &outbuf); - grpc_exec_ctx_finish(&exec_ctx); + grpc_metadata_batch_destroy(&b); + grpc_chttp2_hpack_compressor_destroy(&c); + grpc_slice_buffer_destroy_internal(&outbuf); + grpc_exec_ctx_finish(); std::ostringstream label; label << "framing_bytes/iter:" @@ -169,15 +168,13 @@ namespace hpack_encoder_fixtures { class EmptyBatch { public: static constexpr bool kEnableTrueBinary = false; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { - return {}; - } + static std::vector GetElems() { return {}; } }; class SingleStaticElem { public: static constexpr bool kEnableTrueBinary = false; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + static std::vector GetElems() { return {GRPC_MDELEM_GRPC_ACCEPT_ENCODING_IDENTITY_COMMA_DEFLATE}; } }; @@ -185,9 +182,9 @@ class SingleStaticElem { class SingleInternedElem { public: static constexpr bool kEnableTrueBinary = false; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + static std::vector GetElems() { return {grpc_mdelem_from_slices( - exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("abc")), + grpc_slice_intern(grpc_slice_from_static_string("abc")), grpc_slice_intern(grpc_slice_from_static_string("def")))}; } }; @@ -196,10 +193,10 @@ template class SingleInternedBinaryElem { public: static constexpr bool kEnableTrueBinary = kTrueBinary; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + static std::vector GetElems() { grpc_slice bytes = MakeBytes(); std::vector out = {grpc_mdelem_from_slices( - exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("abc-bin")), + grpc_slice_intern(grpc_slice_from_static_string("abc-bin")), grpc_slice_intern(bytes))}; grpc_slice_unref(bytes); return out; @@ -218,9 +215,9 @@ class SingleInternedBinaryElem { class SingleInternedKeyElem { public: static constexpr bool kEnableTrueBinary = false; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + static std::vector GetElems() { return {grpc_mdelem_from_slices( - exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("abc")), + grpc_slice_intern(grpc_slice_from_static_string("abc")), grpc_slice_from_static_string("def"))}; } }; @@ -228,9 +225,8 @@ class SingleInternedKeyElem { class SingleNonInternedElem { public: static constexpr bool kEnableTrueBinary = false; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { - return {grpc_mdelem_from_slices(exec_ctx, - grpc_slice_from_static_string("abc"), + static std::vector GetElems() { + return {grpc_mdelem_from_slices(grpc_slice_from_static_string("abc"), grpc_slice_from_static_string("def"))}; } }; @@ -239,9 +235,9 @@ template class SingleNonInternedBinaryElem { public: static constexpr bool kEnableTrueBinary = kTrueBinary; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { - return {grpc_mdelem_from_slices( - exec_ctx, grpc_slice_from_static_string("abc-bin"), MakeBytes())}; + static std::vector GetElems() { + return {grpc_mdelem_from_slices(grpc_slice_from_static_string("abc-bin"), + MakeBytes())}; } private: @@ -257,21 +253,21 @@ class SingleNonInternedBinaryElem { class RepresentativeClientInitialMetadata { public: static constexpr bool kEnableTrueBinary = true; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + static std::vector GetElems() { return { GRPC_MDELEM_SCHEME_HTTP, GRPC_MDELEM_METHOD_POST, grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_PATH, + GRPC_MDSTR_PATH, grpc_slice_intern(grpc_slice_from_static_string("/foo/bar"))), - grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_AUTHORITY, + grpc_mdelem_from_slices(GRPC_MDSTR_AUTHORITY, grpc_slice_intern(grpc_slice_from_static_string( "foo.test.google.fr:1234"))), GRPC_MDELEM_GRPC_ACCEPT_ENCODING_IDENTITY_COMMA_DEFLATE_COMMA_GZIP, GRPC_MDELEM_TE_TRAILERS, GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC, grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_USER_AGENT, + GRPC_MDSTR_USER_AGENT, grpc_slice_intern(grpc_slice_from_static_string( "grpc-c/3.0.0-dev (linux; chttp2; green)")))}; } @@ -283,18 +279,18 @@ class RepresentativeClientInitialMetadata { class MoreRepresentativeClientInitialMetadata { public: static constexpr bool kEnableTrueBinary = true; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + static std::vector GetElems() { return { GRPC_MDELEM_SCHEME_HTTP, GRPC_MDELEM_METHOD_POST, - grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_PATH, + grpc_mdelem_from_slices(GRPC_MDSTR_PATH, grpc_slice_intern(grpc_slice_from_static_string( "/grpc.test.FooService/BarMethod"))), - grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_AUTHORITY, + grpc_mdelem_from_slices(GRPC_MDSTR_AUTHORITY, grpc_slice_intern(grpc_slice_from_static_string( "foo.test.google.fr:1234"))), grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_GRPC_TRACE_BIN, + GRPC_MDSTR_GRPC_TRACE_BIN, grpc_slice_from_static_string("\x00\x01\x02\x03\x04\x05\x06\x07\x08" "\x09\x0a\x0b\x0c\x0d\x0e\x0f" "\x10\x11\x12\x13\x14\x15\x16\x17\x18" @@ -303,7 +299,7 @@ class MoreRepresentativeClientInitialMetadata { "\x29\x2a\x2b\x2c\x2d\x2e\x2f" "\x30")), grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_GRPC_TAGS_BIN, + GRPC_MDSTR_GRPC_TAGS_BIN, grpc_slice_from_static_string("\x00\x01\x02\x03\x04\x05\x06\x07\x08" "\x09\x0a\x0b\x0c\x0d\x0e\x0f" "\x10\x11\x12\x13")), @@ -311,7 +307,7 @@ class MoreRepresentativeClientInitialMetadata { GRPC_MDELEM_TE_TRAILERS, GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC, grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_USER_AGENT, + GRPC_MDSTR_USER_AGENT, grpc_slice_intern(grpc_slice_from_static_string( "grpc-c/3.0.0-dev (linux; chttp2; green)")))}; } @@ -320,7 +316,7 @@ class MoreRepresentativeClientInitialMetadata { class RepresentativeServerInitialMetadata { public: static constexpr bool kEnableTrueBinary = true; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + static std::vector GetElems() { return {GRPC_MDELEM_STATUS_200, GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC, GRPC_MDELEM_GRPC_ACCEPT_ENCODING_IDENTITY_COMMA_DEFLATE_COMMA_GZIP}; @@ -330,7 +326,7 @@ class RepresentativeServerInitialMetadata { class RepresentativeServerTrailingMetadata { public: static constexpr bool kEnableTrueBinary = true; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + static std::vector GetElems() { return {GRPC_MDELEM_GRPC_STATUS_0}; } }; @@ -434,18 +430,17 @@ static void BM_HpackParserInitDestroy(benchmark::State& state) { ExecCtx _local_exec_ctx; grpc_chttp2_hpack_parser p; while (state.KeepRunning()) { - grpc_chttp2_hpack_parser_init(&exec_ctx, &p); - grpc_chttp2_hpack_parser_destroy(&exec_ctx, &p); - grpc_exec_ctx_flush(&exec_ctx); + grpc_chttp2_hpack_parser_init(&p); + grpc_chttp2_hpack_parser_destroy(&p); + grpc_exec_ctx_flush(); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_HpackParserInitDestroy); -static void UnrefHeader(grpc_exec_ctx* exec_ctx, void* user_data, - grpc_mdelem md) { - GRPC_MDELEM_UNREF(exec_ctx, md); +static void UnrefHeader(void* user_data, grpc_mdelem md) { + GRPC_MDELEM_UNREF(md); } template @@ -455,24 +450,22 @@ static void BM_HpackParserParseHeader(benchmark::State& state) { std::vector init_slices = Fixture::GetInitSlices(); std::vector benchmark_slices = Fixture::GetBenchmarkSlices(); grpc_chttp2_hpack_parser p; - grpc_chttp2_hpack_parser_init(&exec_ctx, &p); + grpc_chttp2_hpack_parser_init(&p); p.on_header = OnHeader; p.on_header_user_data = nullptr; for (auto slice : init_slices) { - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_chttp2_hpack_parser_parse(&exec_ctx, &p, slice)); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_chttp2_hpack_parser_parse(&p, slice)); } while (state.KeepRunning()) { for (auto slice : benchmark_slices) { - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_chttp2_hpack_parser_parse(&exec_ctx, &p, slice)); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_chttp2_hpack_parser_parse(&p, slice)); } - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); } for (auto slice : init_slices) grpc_slice_unref(slice); for (auto slice : benchmark_slices) grpc_slice_unref(slice); - grpc_chttp2_hpack_parser_destroy(&exec_ctx, &p); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_hpack_parser_destroy(&p); + grpc_exec_ctx_finish(); track_counters.Finish(state); } @@ -769,8 +762,7 @@ class RepresentativeServerTrailingMetadata { static void free_timeout(void* p) { gpr_free(p); } // New implementation. -static void OnHeaderNew(grpc_exec_ctx* exec_ctx, void* user_data, - grpc_mdelem md) { +static void OnHeaderNew(void* user_data, grpc_mdelem md) { if (grpc_slice_eq(GRPC_MDKEY(md), GRPC_MDSTR_GRPC_TIMEOUT)) { grpc_millis* cached_timeout = static_cast(grpc_mdelem_get_user_data(md, free_timeout)); @@ -793,7 +785,7 @@ static void OnHeaderNew(grpc_exec_ctx* exec_ctx, void* user_data, } } benchmark::DoNotOptimize(timeout); - GRPC_MDELEM_UNREF(exec_ctx, md); + GRPC_MDELEM_UNREF(md); } else { GPR_ASSERT(0); } diff --git a/test/cpp/microbenchmarks/bm_chttp2_transport.cc b/test/cpp/microbenchmarks/bm_chttp2_transport.cc index 154cc917785..a32b841501e 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_transport.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_transport.cc @@ -58,7 +58,7 @@ class DummyEndpoint : public grpc_endpoint { ru_ = grpc_resource_user_create(Library::get().rq(), "dummy_endpoint"); } - void PushInput(grpc_exec_ctx* exec_ctx, grpc_slice slice) { + void PushInput(grpc_slice slice) { if (read_cb_ == nullptr) { GPR_ASSERT(!have_slice_); buffered_slice_ = slice; @@ -66,7 +66,7 @@ class DummyEndpoint : public grpc_endpoint { return; } grpc_slice_buffer_add(slices_, slice); - GRPC_CLOSURE_SCHED(exec_ctx, read_cb_, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(read_cb_, GRPC_ERROR_NONE); read_cb_ = nullptr; } @@ -77,50 +77,45 @@ class DummyEndpoint : public grpc_endpoint { bool have_slice_ = false; grpc_slice buffered_slice_; - void QueueRead(grpc_exec_ctx* exec_ctx, grpc_slice_buffer* slices, - grpc_closure* cb) { + void QueueRead(grpc_slice_buffer* slices, grpc_closure* cb) { GPR_ASSERT(read_cb_ == nullptr); if (have_slice_) { have_slice_ = false; grpc_slice_buffer_add(slices, buffered_slice_); - GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); return; } read_cb_ = cb; slices_ = slices; } - static void read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* slices, grpc_closure* cb) { - static_cast(ep)->QueueRead(exec_ctx, slices, cb); + static void read(grpc_endpoint* ep, grpc_slice_buffer* slices, + grpc_closure* cb) { + static_cast(ep)->QueueRead(slices, cb); } - static void write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* slices, grpc_closure* cb) { - GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); + static void write(grpc_endpoint* ep, grpc_slice_buffer* slices, + grpc_closure* cb) { + GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); } static grpc_workqueue* get_workqueue(grpc_endpoint* ep) { return NULL; } - static void add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_pollset* pollset) {} + static void add_to_pollset(grpc_endpoint* ep, grpc_pollset* pollset) {} - static void add_to_pollset_set(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_pollset_set* pollset) {} + static void add_to_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset) { + } - static void delete_from_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_endpoint* ep, + static void delete_from_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset) {} - static void shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_error* why) { - grpc_resource_user_shutdown(exec_ctx, static_cast(ep)->ru_); - GRPC_CLOSURE_SCHED(exec_ctx, static_cast(ep)->read_cb_, - why); + static void shutdown(grpc_endpoint* ep, grpc_error* why) { + grpc_resource_user_shutdown(static_cast(ep)->ru_); + GRPC_CLOSURE_SCHED(static_cast(ep)->read_cb_, why); } - static void destroy(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep) { - grpc_resource_user_unref(exec_ctx, static_cast(ep)->ru_); + static void destroy(grpc_endpoint* ep) { + grpc_resource_user_unref(static_cast(ep)->ru_); delete static_cast(ep); } @@ -136,29 +131,28 @@ class Fixture { Fixture(const grpc::ChannelArguments& args, bool client) { grpc_channel_args c_args = args.c_channel_args(); ep_ = new DummyEndpoint; - t_ = grpc_create_chttp2_transport(exec_ctx(), &c_args, ep_, client); - grpc_chttp2_transport_start_reading(exec_ctx(), t_, NULL); + t_ = grpc_create_chttp2_transport(&c_args, ep_, client); + grpc_chttp2_transport_start_reading(t_, NULL); FlushExecCtx(); } - void FlushExecCtx() { grpc_exec_ctx_flush(&exec_ctx_); } + void FlushExecCtx() { grpc_exec_ctx_flush(); } ~Fixture() { - grpc_transport_destroy(&exec_ctx_, t_); - grpc_exec_ctx_finish(&exec_ctx_); + grpc_transport_destroy(t_); + grpc_exec_ctx_finish(); } grpc_chttp2_transport* chttp2_transport() { return reinterpret_cast(t_); } grpc_transport* transport() { return t_; } - grpc_exec_ctx* exec_ctx() { return &exec_ctx_; } - void PushInput(grpc_slice slice) { ep_->PushInput(exec_ctx(), slice); } + void PushInput(grpc_slice slice) { ep_->PushInput(slice); } private: DummyEndpoint* ep_; - grpc_exec_ctx exec_ctx_ = GRPC_EXEC_CTX_INIT; + grpc_exec_ctx _local_exec_ctx; grpc_transport* t_; }; @@ -175,8 +169,8 @@ std::unique_ptr MakeClosure( GRPC_CLOSURE_INIT(this, Execute, this, sched); } F f_; - static void Execute(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { - static_cast(arg)->f_(exec_ctx, error); + static void Execute(void* arg, grpc_error* error) { + static_cast(arg)->f_(error); } }; return std::unique_ptr(new C(f, sched)); @@ -188,8 +182,8 @@ grpc_closure* MakeOnceClosure( struct C : public grpc_closure { C(const F& f) : f_(f) {} F f_; - static void Execute(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { - static_cast(arg)->f_(exec_ctx, error); + static void Execute(void* arg, grpc_error* error) { + static_cast(arg)->f_(error); delete static_cast(arg); } }; @@ -220,22 +214,22 @@ class Stream { gpr_arena_destroy(arena_); arena_ = gpr_arena_create(4096); } - grpc_transport_init_stream(f_->exec_ctx(), f_->transport(), + grpc_transport_init_stream(f_->transport(), static_cast(stream_), &refcount_, NULL, arena_); } - void DestroyThen(grpc_exec_ctx* exec_ctx, grpc_closure* closure) { + void DestroyThen(grpc_closure* closure) { destroy_closure_ = closure; #ifndef NDEBUG - grpc_stream_unref(exec_ctx, &refcount_, "DestroyThen"); + grpc_stream_unref(&refcount_, "DestroyThen"); #else - grpc_stream_unref(exec_ctx, &refcount_); + grpc_stream_unref(&refcount_); #endif } - void Op(grpc_exec_ctx* exec_ctx, grpc_transport_stream_op_batch* op) { - grpc_transport_perform_stream_op(exec_ctx, f_->transport(), + void Op(grpc_transport_stream_op_batch* op) { + grpc_transport_perform_stream_op(f_->transport(), static_cast(stream_), op); } @@ -244,10 +238,9 @@ class Stream { } private: - static void FinishDestroy(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { + static void FinishDestroy(void* arg, grpc_error* error) { auto stream = static_cast(arg); - grpc_transport_destroy_stream(exec_ctx, stream->f_->transport(), + grpc_transport_destroy_stream(stream->f_->transport(), static_cast(stream->stream_), stream->destroy_closure_); gpr_event_set(&stream->done_, (void*)1); @@ -276,14 +269,13 @@ static void BM_StreamCreateDestroy(benchmark::State& state) { op.cancel_stream = true; op.payload = &op_payload; op_payload.cancel_stream.cancel_error = GRPC_ERROR_CANCELLED; - std::unique_ptr next = - MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { - if (!state.KeepRunning()) return; - s.Init(state); - s.Op(exec_ctx, &op); - s.DestroyThen(exec_ctx, next.get()); - }); - GRPC_CLOSURE_RUN(f.exec_ctx(), next.get(), GRPC_ERROR_NONE); + std::unique_ptr next = MakeClosure([&](grpc_error* error) { + if (!state.KeepRunning()) return; + s.Init(state); + s.Op(&op); + s.DestroyThen(next.get()); + }); + GRPC_CLOSURE_RUN(next.get(), GRPC_ERROR_NONE); f.FlushExecCtx(); track_counters.Finish(state); } @@ -291,21 +283,21 @@ BENCHMARK(BM_StreamCreateDestroy); class RepresentativeClientInitialMetadata { public: - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + static std::vector GetElems() { return { GRPC_MDELEM_SCHEME_HTTP, GRPC_MDELEM_METHOD_POST, grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_PATH, + GRPC_MDSTR_PATH, grpc_slice_intern(grpc_slice_from_static_string("/foo/bar"))), - grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_AUTHORITY, + grpc_mdelem_from_slices(GRPC_MDSTR_AUTHORITY, grpc_slice_intern(grpc_slice_from_static_string( "foo.test.google.fr:1234"))), GRPC_MDELEM_GRPC_ACCEPT_ENCODING_IDENTITY_COMMA_DEFLATE_COMMA_GZIP, GRPC_MDELEM_TE_TRAILERS, GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC, grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_USER_AGENT, + GRPC_MDSTR_USER_AGENT, grpc_slice_intern(grpc_slice_from_static_string( "grpc-c/3.0.0-dev (linux; chttp2; green)")))}; } @@ -330,34 +322,33 @@ static void BM_StreamCreateSendInitialMetadataDestroy(benchmark::State& state) { grpc_metadata_batch b; grpc_metadata_batch_init(&b); b.deadline = GRPC_MILLIS_INF_FUTURE; - std::vector elems = Metadata::GetElems(f.exec_ctx()); + std::vector elems = Metadata::GetElems(); std::vector storage(elems.size()); for (size_t i = 0; i < elems.size(); i++) { GPR_ASSERT(GRPC_LOG_IF_ERROR( - "addmd", - grpc_metadata_batch_add_tail(f.exec_ctx(), &b, &storage[i], elems[i]))); + "addmd", grpc_metadata_batch_add_tail(&b, &storage[i], elems[i]))); } f.FlushExecCtx(); - start = MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { + start = MakeClosure([&](grpc_error* error) { if (!state.KeepRunning()) return; s.Init(state); reset_op(); op.on_complete = done.get(); op.send_initial_metadata = true; op.payload->send_initial_metadata.send_initial_metadata = &b; - s.Op(exec_ctx, &op); + s.Op(&op); }); - done = MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { + done = MakeClosure([&](grpc_error* error) { reset_op(); op.cancel_stream = true; op.payload->cancel_stream.cancel_error = GRPC_ERROR_CANCELLED; - s.Op(exec_ctx, &op); - s.DestroyThen(exec_ctx, start.get()); + s.Op(&op); + s.DestroyThen(start.get()); }); - GRPC_CLOSURE_SCHED(f.exec_ctx(), start.get(), GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(start.get(), GRPC_ERROR_NONE); f.FlushExecCtx(); - grpc_metadata_batch_destroy(f.exec_ctx(), &b); + grpc_metadata_batch_destroy(&b); track_counters.Finish(state); } BENCHMARK_TEMPLATE(BM_StreamCreateSendInitialMetadataDestroy, @@ -375,21 +366,19 @@ static void BM_TransportEmptyOp(benchmark::State& state) { memset(&op, 0, sizeof(op)); op.payload = &op_payload; }; - std::unique_ptr c = - MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { - if (!state.KeepRunning()) return; - reset_op(); - op.on_complete = c.get(); - s.Op(exec_ctx, &op); - }); - GRPC_CLOSURE_SCHED(f.exec_ctx(), c.get(), GRPC_ERROR_NONE); + std::unique_ptr c = MakeClosure([&](grpc_error* error) { + if (!state.KeepRunning()) return; + reset_op(); + op.on_complete = c.get(); + s.Op(&op); + }); + GRPC_CLOSURE_SCHED(c.get(), GRPC_ERROR_NONE); f.FlushExecCtx(); reset_op(); op.cancel_stream = true; op_payload.cancel_stream.cancel_error = GRPC_ERROR_CANCELLED; - s.Op(f.exec_ctx(), &op); - s.DestroyThen(f.exec_ctx(), MakeOnceClosure([](grpc_exec_ctx* exec_ctx, - grpc_error* error) {})); + s.Op(&op); + s.DestroyThen(MakeOnceClosure([](grpc_error* error) {})); f.FlushExecCtx(); track_counters.Finish(state); } @@ -420,39 +409,37 @@ static void BM_TransportStreamSend(benchmark::State& state) { grpc_metadata_batch_init(&b); b.deadline = GRPC_MILLIS_INF_FUTURE; std::vector elems = - RepresentativeClientInitialMetadata::GetElems(f.exec_ctx()); + RepresentativeClientInitialMetadata::GetElems(); std::vector storage(elems.size()); for (size_t i = 0; i < elems.size(); i++) { GPR_ASSERT(GRPC_LOG_IF_ERROR( - "addmd", - grpc_metadata_batch_add_tail(f.exec_ctx(), &b, &storage[i], elems[i]))); + "addmd", grpc_metadata_batch_add_tail(&b, &storage[i], elems[i]))); } gpr_event* bm_done = new gpr_event; gpr_event_init(bm_done); - std::unique_ptr c = - MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { - if (!state.KeepRunning()) { - gpr_event_set(bm_done, (void*)1); - return; - } - // force outgoing window to be yuge - s->chttp2_stream()->flow_control->TestOnlyForceHugeWindow(); - f.chttp2_transport()->flow_control->TestOnlyForceHugeWindow(); - grpc_slice_buffer_stream_init(&send_stream, &send_buffer, 0); - reset_op(); - op.on_complete = c.get(); - op.send_message = true; - op.payload->send_message.send_message = &send_stream.base; - s->Op(exec_ctx, &op); - }); + std::unique_ptr c = MakeClosure([&](grpc_error* error) { + if (!state.KeepRunning()) { + gpr_event_set(bm_done, (void*)1); + return; + } + // force outgoing window to be yuge + s->chttp2_stream()->flow_control->TestOnlyForceHugeWindow(); + f.chttp2_transport()->flow_control->TestOnlyForceHugeWindow(); + grpc_slice_buffer_stream_init(&send_stream, &send_buffer, 0); + reset_op(); + op.on_complete = c.get(); + op.send_message = true; + op.payload->send_message.send_message = &send_stream.base; + s->Op(&op); + }); reset_op(); op.send_initial_metadata = true; op.payload->send_initial_metadata.send_initial_metadata = &b; op.on_complete = c.get(); - s->Op(f.exec_ctx(), &op); + s->Op(&op); f.FlushExecCtx(); gpr_event_wait(bm_done, gpr_inf_future(GPR_CLOCK_REALTIME)); @@ -461,13 +448,12 @@ static void BM_TransportStreamSend(benchmark::State& state) { reset_op(); op.cancel_stream = true; op.payload->cancel_stream.cancel_error = GRPC_ERROR_CANCELLED; - s->Op(f.exec_ctx(), &op); - s->DestroyThen(f.exec_ctx(), MakeOnceClosure([](grpc_exec_ctx* exec_ctx, - grpc_error* error) {})); + s->Op(&op); + s->DestroyThen(MakeOnceClosure([](grpc_error* error) {})); f.FlushExecCtx(); s.reset(); track_counters.Finish(state); - grpc_metadata_batch_destroy(f.exec_ctx(), &b); + grpc_metadata_batch_destroy(&b); grpc_slice_buffer_destroy(&send_buffer); } BENCHMARK(BM_TransportStreamSend)->Range(0, 128 * 1024 * 1024); @@ -551,16 +537,14 @@ static void BM_TransportStreamRecv(benchmark::State& state) { grpc_metadata_batch_init(&b_recv); b.deadline = GRPC_MILLIS_INF_FUTURE; std::vector elems = - RepresentativeClientInitialMetadata::GetElems(f.exec_ctx()); + RepresentativeClientInitialMetadata::GetElems(); std::vector storage(elems.size()); for (size_t i = 0; i < elems.size(); i++) { GPR_ASSERT(GRPC_LOG_IF_ERROR( - "addmd", - grpc_metadata_batch_add_tail(f.exec_ctx(), &b, &storage[i], elems[i]))); + "addmd", grpc_metadata_batch_add_tail(&b, &storage[i], elems[i]))); } - std::unique_ptr do_nothing = - MakeClosure([](grpc_exec_ctx* exec_ctx, grpc_error* error) {}); + std::unique_ptr do_nothing = MakeClosure([](grpc_error* error) {}); uint32_t received; @@ -569,51 +553,49 @@ static void BM_TransportStreamRecv(benchmark::State& state) { std::unique_ptr drain_continue; grpc_slice recv_slice; - std::unique_ptr c = - MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { - if (!state.KeepRunning()) return; - // force outgoing window to be yuge - s.chttp2_stream()->flow_control->TestOnlyForceHugeWindow(); - f.chttp2_transport()->flow_control->TestOnlyForceHugeWindow(); - received = 0; - reset_op(); - op.on_complete = do_nothing.get(); - op.recv_message = true; - op.payload->recv_message.recv_message = &recv_stream; - op.payload->recv_message.recv_message_ready = drain_start.get(); - s.Op(exec_ctx, &op); - f.PushInput(grpc_slice_ref(incoming_data)); - }); - - drain_start = MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { + std::unique_ptr c = MakeClosure([&](grpc_error* error) { + if (!state.KeepRunning()) return; + // force outgoing window to be yuge + s.chttp2_stream()->flow_control->TestOnlyForceHugeWindow(); + f.chttp2_transport()->flow_control->TestOnlyForceHugeWindow(); + received = 0; + reset_op(); + op.on_complete = do_nothing.get(); + op.recv_message = true; + op.payload->recv_message.recv_message = &recv_stream; + op.payload->recv_message.recv_message_ready = drain_start.get(); + s.Op(&op); + f.PushInput(grpc_slice_ref(incoming_data)); + }); + + drain_start = MakeClosure([&](grpc_error* error) { if (recv_stream == NULL) { GPR_ASSERT(!state.KeepRunning()); return; } - GRPC_CLOSURE_RUN(exec_ctx, drain.get(), GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN(drain.get(), GRPC_ERROR_NONE); }); - drain = MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { + drain = MakeClosure([&](grpc_error* error) { do { if (received == recv_stream->length) { - grpc_byte_stream_destroy(exec_ctx, recv_stream); - GRPC_CLOSURE_SCHED(exec_ctx, c.get(), GRPC_ERROR_NONE); + grpc_byte_stream_destroy(recv_stream); + GRPC_CLOSURE_SCHED(c.get(), GRPC_ERROR_NONE); return; } - } while (grpc_byte_stream_next(exec_ctx, recv_stream, - recv_stream->length - received, + } while (grpc_byte_stream_next(recv_stream, recv_stream->length - received, drain_continue.get()) && GRPC_ERROR_NONE == - grpc_byte_stream_pull(exec_ctx, recv_stream, &recv_slice) && + grpc_byte_stream_pull(recv_stream, &recv_slice) && (received += GRPC_SLICE_LENGTH(recv_slice), - grpc_slice_unref_internal(exec_ctx, recv_slice), true)); + grpc_slice_unref_internal(recv_slice), true)); }); - drain_continue = MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { - grpc_byte_stream_pull(exec_ctx, recv_stream, &recv_slice); + drain_continue = MakeClosure([&](grpc_error* error) { + grpc_byte_stream_pull(recv_stream, &recv_slice); received += GRPC_SLICE_LENGTH(recv_slice); - grpc_slice_unref_internal(exec_ctx, recv_slice); - GRPC_CLOSURE_RUN(exec_ctx, drain.get(), GRPC_ERROR_NONE); + grpc_slice_unref_internal(recv_slice); + GRPC_CLOSURE_RUN(drain.get(), GRPC_ERROR_NONE); }); reset_op(); @@ -624,7 +606,7 @@ static void BM_TransportStreamRecv(benchmark::State& state) { op.payload->recv_initial_metadata.recv_initial_metadata_ready = do_nothing.get(); op.on_complete = c.get(); - s.Op(f.exec_ctx(), &op); + s.Op(&op); f.PushInput(SLICE_FROM_BUFFER( "\x00\x00\x00\x04\x00\x00\x00\x00\x00" // Generated using: @@ -642,13 +624,12 @@ static void BM_TransportStreamRecv(benchmark::State& state) { reset_op(); op.cancel_stream = true; op.payload->cancel_stream.cancel_error = GRPC_ERROR_CANCELLED; - s.Op(f.exec_ctx(), &op); - s.DestroyThen(f.exec_ctx(), MakeOnceClosure([](grpc_exec_ctx* exec_ctx, - grpc_error* error) {})); + s.Op(&op); + s.DestroyThen(MakeOnceClosure([](grpc_error* error) {})); f.FlushExecCtx(); track_counters.Finish(state); - grpc_metadata_batch_destroy(f.exec_ctx(), &b); - grpc_metadata_batch_destroy(f.exec_ctx(), &b_recv); + grpc_metadata_batch_destroy(&b); + grpc_metadata_batch_destroy(&b_recv); grpc_slice_unref(incoming_data); } BENCHMARK(BM_TransportStreamRecv)->Range(0, 128 * 1024 * 1024); diff --git a/test/cpp/microbenchmarks/bm_closure.cc b/test/cpp/microbenchmarks/bm_closure.cc index a09475b2d11..0e25c3d235d 100644 --- a/test/cpp/microbenchmarks/bm_closure.cc +++ b/test/cpp/microbenchmarks/bm_closure.cc @@ -35,7 +35,7 @@ static void BM_NoOpExecCtx(benchmark::State& state) { TrackCounters track_counters; while (state.KeepRunning()) { ExecCtx _local_exec_ctx; - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } track_counters.Finish(state); } @@ -45,14 +45,14 @@ static void BM_WellFlushed(benchmark::State& state) { TrackCounters track_counters; ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_WellFlushed); -static void DoNothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} +static void DoNothing(void* arg, grpc_error* error) {} static void BM_ClosureInitAgainstExecCtx(benchmark::State& state) { TrackCounters track_counters; @@ -74,8 +74,8 @@ static void BM_ClosureInitAgainstCombiner(benchmark::State& state) { benchmark::DoNotOptimize(GRPC_CLOSURE_INIT( &c, DoNothing, NULL, grpc_combiner_scheduler(combiner))); } - GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(combiner, "finished"); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureInitAgainstCombiner); @@ -86,10 +86,10 @@ static void BM_ClosureRunOnExecCtx(benchmark::State& state) { GRPC_CLOSURE_INIT(&c, DoNothing, NULL, grpc_schedule_on_exec_ctx); ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_RUN(&exec_ctx, &c, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_RUN(&c, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureRunOnExecCtx); @@ -99,11 +99,10 @@ static void BM_ClosureCreateAndRun(benchmark::State& state) { ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_RUN( - &exec_ctx, GRPC_CLOSURE_CREATE(DoNothing, NULL, grpc_schedule_on_exec_ctx), GRPC_ERROR_NONE); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureCreateAndRun); @@ -114,11 +113,10 @@ static void BM_ClosureInitAndRun(benchmark::State& state) { grpc_closure c; while (state.KeepRunning()) { GRPC_CLOSURE_RUN( - &exec_ctx, GRPC_CLOSURE_INIT(&c, DoNothing, NULL, grpc_schedule_on_exec_ctx), GRPC_ERROR_NONE); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureInitAndRun); @@ -129,10 +127,10 @@ static void BM_ClosureSchedOnExecCtx(benchmark::State& state) { GRPC_CLOSURE_INIT(&c, DoNothing, NULL, grpc_schedule_on_exec_ctx); ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureSchedOnExecCtx); @@ -145,11 +143,11 @@ static void BM_ClosureSched2OnExecCtx(benchmark::State& state) { GRPC_CLOSURE_INIT(&c2, DoNothing, NULL, grpc_schedule_on_exec_ctx); ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureSched2OnExecCtx); @@ -164,12 +162,12 @@ static void BM_ClosureSched3OnExecCtx(benchmark::State& state) { GRPC_CLOSURE_INIT(&c3, DoNothing, NULL, grpc_schedule_on_exec_ctx); ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c3, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureSched3OnExecCtx); @@ -182,10 +180,10 @@ static void BM_AcquireMutex(benchmark::State& state) { ExecCtx _local_exec_ctx; while (state.KeepRunning()) { gpr_mu_lock(&mu); - DoNothing(&exec_ctx, NULL, GRPC_ERROR_NONE); + DoNothing(NULL, GRPC_ERROR_NONE); gpr_mu_unlock(&mu); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_AcquireMutex); @@ -198,13 +196,13 @@ static void BM_TryAcquireMutex(benchmark::State& state) { ExecCtx _local_exec_ctx; while (state.KeepRunning()) { if (gpr_mu_trylock(&mu)) { - DoNothing(&exec_ctx, NULL, GRPC_ERROR_NONE); + DoNothing(NULL, GRPC_ERROR_NONE); gpr_mu_unlock(&mu); } else { abort(); } } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_TryAcquireMutex); @@ -216,10 +214,10 @@ static void BM_AcquireSpinlock(benchmark::State& state) { ExecCtx _local_exec_ctx; while (state.KeepRunning()) { gpr_spinlock_lock(&mu); - DoNothing(&exec_ctx, NULL, GRPC_ERROR_NONE); + DoNothing(NULL, GRPC_ERROR_NONE); gpr_spinlock_unlock(&mu); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_AcquireSpinlock); @@ -231,13 +229,13 @@ static void BM_TryAcquireSpinlock(benchmark::State& state) { ExecCtx _local_exec_ctx; while (state.KeepRunning()) { if (gpr_spinlock_trylock(&mu)) { - DoNothing(&exec_ctx, NULL, GRPC_ERROR_NONE); + DoNothing(NULL, GRPC_ERROR_NONE); gpr_spinlock_unlock(&mu); } else { abort(); } } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_TryAcquireSpinlock); @@ -249,11 +247,11 @@ static void BM_ClosureSchedOnCombiner(benchmark::State& state) { GRPC_CLOSURE_INIT(&c, DoNothing, NULL, grpc_combiner_scheduler(combiner)); ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(); } - GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(combiner, "finished"); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureSchedOnCombiner); @@ -267,12 +265,12 @@ static void BM_ClosureSched2OnCombiner(benchmark::State& state) { GRPC_CLOSURE_INIT(&c2, DoNothing, NULL, grpc_combiner_scheduler(combiner)); ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(); } - GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(combiner, "finished"); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureSched2OnCombiner); @@ -288,13 +286,13 @@ static void BM_ClosureSched3OnCombiner(benchmark::State& state) { GRPC_CLOSURE_INIT(&c3, DoNothing, NULL, grpc_combiner_scheduler(combiner)); ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c3, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(); } - GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(combiner, "finished"); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureSched3OnCombiner); @@ -309,13 +307,13 @@ static void BM_ClosureSched2OnTwoCombiners(benchmark::State& state) { GRPC_CLOSURE_INIT(&c2, DoNothing, NULL, grpc_combiner_scheduler(combiner2)); ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(); } - GRPC_COMBINER_UNREF(&exec_ctx, combiner1, "finished"); - GRPC_COMBINER_UNREF(&exec_ctx, combiner2, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(combiner1, "finished"); + GRPC_COMBINER_UNREF(combiner2, "finished"); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureSched2OnTwoCombiners); @@ -334,15 +332,15 @@ static void BM_ClosureSched4OnTwoCombiners(benchmark::State& state) { GRPC_CLOSURE_INIT(&c4, DoNothing, NULL, grpc_combiner_scheduler(combiner2)); ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c3, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c4, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c4, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(); } - GRPC_COMBINER_UNREF(&exec_ctx, combiner1, "finished"); - GRPC_COMBINER_UNREF(&exec_ctx, combiner2, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(combiner1, "finished"); + GRPC_COMBINER_UNREF(combiner2, "finished"); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureSched4OnTwoCombiners); @@ -356,13 +354,11 @@ class Rescheduler { GRPC_CLOSURE_INIT(&closure_, Step, this, scheduler); } - void ScheduleFirst(grpc_exec_ctx* exec_ctx) { - GRPC_CLOSURE_SCHED(exec_ctx, &closure_, GRPC_ERROR_NONE); - } + void ScheduleFirst() { GRPC_CLOSURE_SCHED(&closure_, GRPC_ERROR_NONE); } void ScheduleFirstAgainstDifferentScheduler( - grpc_exec_ctx* exec_ctx, grpc_closure_scheduler* scheduler) { - GRPC_CLOSURE_SCHED(exec_ctx, GRPC_CLOSURE_CREATE(Step, this, scheduler), + grpc_closure_scheduler* scheduler) { + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(Step, this, scheduler), GRPC_ERROR_NONE); } @@ -370,10 +366,10 @@ class Rescheduler { benchmark::State& state_; grpc_closure closure_; - static void Step(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { + static void Step(void* arg, grpc_error* error) { Rescheduler* self = static_cast(arg); if (self->state_.KeepRunning()) { - GRPC_CLOSURE_SCHED(exec_ctx, &self->closure_, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&self->closure_, GRPC_ERROR_NONE); } } }; @@ -382,8 +378,8 @@ static void BM_ClosureReschedOnExecCtx(benchmark::State& state) { TrackCounters track_counters; ExecCtx _local_exec_ctx; Rescheduler r(state, grpc_schedule_on_exec_ctx); - r.ScheduleFirst(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + r.ScheduleFirst(); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureReschedOnExecCtx); @@ -393,10 +389,10 @@ static void BM_ClosureReschedOnCombiner(benchmark::State& state) { ExecCtx _local_exec_ctx; grpc_combiner* combiner = grpc_combiner_create(); Rescheduler r(state, grpc_combiner_scheduler(combiner)); - r.ScheduleFirst(&exec_ctx); - grpc_exec_ctx_flush(&exec_ctx); - GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + r.ScheduleFirst(); + grpc_exec_ctx_flush(); + GRPC_COMBINER_UNREF(combiner, "finished"); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureReschedOnCombiner); @@ -406,11 +402,10 @@ static void BM_ClosureReschedOnCombinerFinally(benchmark::State& state) { ExecCtx _local_exec_ctx; grpc_combiner* combiner = grpc_combiner_create(); Rescheduler r(state, grpc_combiner_finally_scheduler(combiner)); - r.ScheduleFirstAgainstDifferentScheduler(&exec_ctx, - grpc_combiner_scheduler(combiner)); - grpc_exec_ctx_flush(&exec_ctx); - GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + r.ScheduleFirstAgainstDifferentScheduler(grpc_combiner_scheduler(combiner)); + grpc_exec_ctx_flush(); + GRPC_COMBINER_UNREF(combiner, "finished"); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_ClosureReschedOnCombinerFinally); diff --git a/test/cpp/microbenchmarks/bm_cq.cc b/test/cpp/microbenchmarks/bm_cq.cc index 8cf7823a94d..6d36e61cff9 100644 --- a/test/cpp/microbenchmarks/bm_cq.cc +++ b/test/cpp/microbenchmarks/bm_cq.cc @@ -65,7 +65,7 @@ static void BM_CreateDestroyCore(benchmark::State& state) { } BENCHMARK(BM_CreateDestroyCore); -static void DoneWithCompletionOnStack(grpc_exec_ctx* exec_ctx, void* arg, +static void DoneWithCompletionOnStack(void* arg, grpc_cq_completion* completion) {} class DummyTag final : public internal::CompletionQueueTag { @@ -82,9 +82,9 @@ static void BM_Pass1Cpp(benchmark::State& state) { DummyTag dummy_tag; ExecCtx _local_exec_ctx; GPR_ASSERT(grpc_cq_begin_op(c_cq, &dummy_tag)); - grpc_cq_end_op(&exec_ctx, c_cq, &dummy_tag, GRPC_ERROR_NONE, - DoneWithCompletionOnStack, NULL, &completion); - grpc_exec_ctx_finish(&exec_ctx); + grpc_cq_end_op(c_cq, &dummy_tag, GRPC_ERROR_NONE, DoneWithCompletionOnStack, + NULL, &completion); + grpc_exec_ctx_finish(); void* tag; bool ok; cq.Next(&tag, &ok); @@ -102,9 +102,9 @@ static void BM_Pass1Core(benchmark::State& state) { grpc_cq_completion completion; ExecCtx _local_exec_ctx; GPR_ASSERT(grpc_cq_begin_op(cq, NULL)); - grpc_cq_end_op(&exec_ctx, cq, NULL, GRPC_ERROR_NONE, - DoneWithCompletionOnStack, NULL, &completion); - grpc_exec_ctx_finish(&exec_ctx); + grpc_cq_end_op(cq, NULL, GRPC_ERROR_NONE, DoneWithCompletionOnStack, NULL, + &completion); + grpc_exec_ctx_finish(); grpc_completion_queue_next(cq, deadline, NULL); } grpc_completion_queue_destroy(cq); @@ -121,9 +121,9 @@ static void BM_Pluck1Core(benchmark::State& state) { grpc_cq_completion completion; ExecCtx _local_exec_ctx; GPR_ASSERT(grpc_cq_begin_op(cq, NULL)); - grpc_cq_end_op(&exec_ctx, cq, NULL, GRPC_ERROR_NONE, - DoneWithCompletionOnStack, NULL, &completion); - grpc_exec_ctx_finish(&exec_ctx); + grpc_cq_end_op(cq, NULL, GRPC_ERROR_NONE, DoneWithCompletionOnStack, NULL, + &completion); + grpc_exec_ctx_finish(); grpc_completion_queue_pluck(cq, NULL, deadline, NULL); } grpc_completion_queue_destroy(cq); diff --git a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc index 8d4349a297e..41e616a6ef0 100644 --- a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc +++ b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc @@ -43,9 +43,8 @@ static grpc_completion_queue* g_cq; static grpc_event_engine_vtable g_vtable; static const grpc_event_engine_vtable* g_old_vtable; -static void pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* ps, - grpc_closure* closure) { - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); +static void pollset_shutdown(grpc_pollset* ps, grpc_closure* closure) { + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); } static void pollset_init(grpc_pollset* ps, gpr_mu** mu) { @@ -53,25 +52,20 @@ static void pollset_init(grpc_pollset* ps, gpr_mu** mu) { *mu = &ps->mu; } -static void pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* ps) { - gpr_mu_destroy(&ps->mu); -} +static void pollset_destroy(grpc_pollset* ps) { gpr_mu_destroy(&ps->mu); } -static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* p, - grpc_pollset_worker* worker) { +static grpc_error* pollset_kick(grpc_pollset* p, grpc_pollset_worker* worker) { return GRPC_ERROR_NONE; } /* Callback when the tag is dequeued from the completion queue. Does nothing */ -static void cq_done_cb(grpc_exec_ctx* exec_ctx, void* done_arg, - grpc_cq_completion* cq_completion) { +static void cq_done_cb(void* done_arg, grpc_cq_completion* cq_completion) { gpr_free(cq_completion); } /* Queues a completion tag if deadline is > 0. * Does nothing if deadline is 0 (i.e gpr_time_0(GPR_CLOCK_MONOTONIC)) */ -static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* ps, - grpc_pollset_worker** worker, +static grpc_error* pollset_work(grpc_pollset* ps, grpc_pollset_worker** worker, grpc_millis deadline) { if (deadline == 0) { gpr_log(GPR_DEBUG, "no-op"); @@ -80,9 +74,9 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* ps, gpr_mu_unlock(&ps->mu); GPR_ASSERT(grpc_cq_begin_op(g_cq, g_tag)); - grpc_cq_end_op(exec_ctx, g_cq, g_tag, GRPC_ERROR_NONE, cq_done_cb, NULL, + grpc_cq_end_op(g_cq, g_tag, GRPC_ERROR_NONE, cq_done_cb, NULL, (grpc_cq_completion*)gpr_malloc(sizeof(grpc_cq_completion))); - grpc_exec_ctx_flush(exec_ctx); + grpc_exec_ctx_flush(); gpr_mu_lock(&ps->mu); return GRPC_ERROR_NONE; } diff --git a/test/cpp/microbenchmarks/bm_error.cc b/test/cpp/microbenchmarks/bm_error.cc index b9b3960f859..3f85e351f56 100644 --- a/test/cpp/microbenchmarks/bm_error.cc +++ b/test/cpp/microbenchmarks/bm_error.cc @@ -250,10 +250,10 @@ static void BM_ErrorGetStatus(benchmark::State& state) { while (state.KeepRunning()) { grpc_status_code status; grpc_slice slice; - grpc_error_get_status(&exec_ctx, fixture.error(), fixture.deadline(), - &status, &slice, NULL); + grpc_error_get_status(fixture.error(), fixture.deadline(), &status, &slice, + NULL); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } @@ -264,10 +264,10 @@ static void BM_ErrorGetStatusCode(benchmark::State& state) { ExecCtx _local_exec_ctx; while (state.KeepRunning()) { grpc_status_code status; - grpc_error_get_status(&exec_ctx, fixture.error(), fixture.deadline(), - &status, NULL, NULL); + grpc_error_get_status(fixture.error(), fixture.deadline(), &status, NULL, + NULL); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } @@ -278,10 +278,10 @@ static void BM_ErrorHttpError(benchmark::State& state) { ExecCtx _local_exec_ctx; while (state.KeepRunning()) { grpc_http2_error_code error; - grpc_error_get_status(&exec_ctx, fixture.error(), fixture.deadline(), NULL, - NULL, &error); + grpc_error_get_status(fixture.error(), fixture.deadline(), NULL, NULL, + &error); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } diff --git a/test/cpp/microbenchmarks/bm_fullstack_trickle.cc b/test/cpp/microbenchmarks/bm_fullstack_trickle.cc index 2680ae61983..74e99982ce8 100644 --- a/test/cpp/microbenchmarks/bm_fullstack_trickle.cc +++ b/test/cpp/microbenchmarks/bm_fullstack_trickle.cc @@ -180,10 +180,10 @@ class TrickledCHTTP2 : public EndpointPairFixture { ExecCtx _local_exec_ctx; inc_time(); size_t client_backlog = - grpc_trickle_endpoint_trickle(&exec_ctx, endpoint_pair_.client); + grpc_trickle_endpoint_trickle(endpoint_pair_.client); size_t server_backlog = - grpc_trickle_endpoint_trickle(&exec_ctx, endpoint_pair_.server); - grpc_exec_ctx_finish(&exec_ctx); + grpc_trickle_endpoint_trickle(endpoint_pair_.server); + grpc_exec_ctx_finish(); if (update_stats) { UpdateStats((grpc_chttp2_transport*)client_transport_, &client_stats_, client_backlog); diff --git a/test/cpp/microbenchmarks/bm_metadata.cc b/test/cpp/microbenchmarks/bm_metadata.cc index f330493de9e..5d89e0d3c6c 100644 --- a/test/cpp/microbenchmarks/bm_metadata.cc +++ b/test/cpp/microbenchmarks/bm_metadata.cc @@ -92,9 +92,9 @@ static void BM_MetadataFromNonInternedSlices(benchmark::State& state) { gpr_slice v = grpc_slice_from_static_string("value"); ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, NULL)); + GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_MetadataFromNonInternedSlices); @@ -105,9 +105,9 @@ static void BM_MetadataFromInternedSlices(benchmark::State& state) { gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, NULL)); + GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_slice_unref(k); grpc_slice_unref(v); track_counters.Finish(state); @@ -120,12 +120,12 @@ static void BM_MetadataFromInternedSlicesAlreadyInIndex( gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); ExecCtx _local_exec_ctx; - grpc_mdelem seed = grpc_mdelem_create(&exec_ctx, k, v, NULL); + grpc_mdelem seed = grpc_mdelem_create(k, v, NULL); while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, NULL)); + GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } - GRPC_MDELEM_UNREF(&exec_ctx, seed); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(seed); + grpc_exec_ctx_finish(); grpc_slice_unref(k); grpc_slice_unref(v); track_counters.Finish(state); @@ -138,9 +138,9 @@ static void BM_MetadataFromInternedKey(benchmark::State& state) { gpr_slice v = grpc_slice_from_static_string("value"); ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, NULL)); + GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_slice_unref(k); track_counters.Finish(state); } @@ -154,12 +154,10 @@ static void BM_MetadataFromNonInternedSlicesWithBackingStore( char backing_store[sizeof(grpc_mdelem_data)]; ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF( - &exec_ctx, - grpc_mdelem_create(&exec_ctx, k, v, - reinterpret_cast(backing_store))); + GRPC_MDELEM_UNREF(grpc_mdelem_create( + k, v, reinterpret_cast(backing_store))); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_MetadataFromNonInternedSlicesWithBackingStore); @@ -172,12 +170,10 @@ static void BM_MetadataFromInternedSlicesWithBackingStore( char backing_store[sizeof(grpc_mdelem_data)]; ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF( - &exec_ctx, - grpc_mdelem_create(&exec_ctx, k, v, - reinterpret_cast(backing_store))); + GRPC_MDELEM_UNREF(grpc_mdelem_create( + k, v, reinterpret_cast(backing_store))); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_slice_unref(k); grpc_slice_unref(v); track_counters.Finish(state); @@ -192,12 +188,10 @@ static void BM_MetadataFromInternedKeyWithBackingStore( char backing_store[sizeof(grpc_mdelem_data)]; ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF( - &exec_ctx, - grpc_mdelem_create(&exec_ctx, k, v, - reinterpret_cast(backing_store))); + GRPC_MDELEM_UNREF(grpc_mdelem_create( + k, v, reinterpret_cast(backing_store))); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_slice_unref(k); track_counters.Finish(state); } @@ -209,9 +203,9 @@ static void BM_MetadataFromStaticMetadataStrings(benchmark::State& state) { gpr_slice v = GRPC_MDSTR_200; ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, NULL)); + GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_slice_unref(k); track_counters.Finish(state); } @@ -224,9 +218,9 @@ static void BM_MetadataFromStaticMetadataStringsNotIndexed( gpr_slice v = GRPC_MDSTR_GZIP; ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, NULL)); + GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_slice_unref(k); track_counters.Finish(state); } @@ -236,15 +230,14 @@ static void BM_MetadataRefUnrefExternal(benchmark::State& state) { TrackCounters track_counters; char backing_store[sizeof(grpc_mdelem_data)]; ExecCtx _local_exec_ctx; - grpc_mdelem el = - grpc_mdelem_create(&exec_ctx, grpc_slice_from_static_string("a"), - grpc_slice_from_static_string("b"), - reinterpret_cast(backing_store)); + grpc_mdelem el = grpc_mdelem_create( + grpc_slice_from_static_string("a"), grpc_slice_from_static_string("b"), + reinterpret_cast(backing_store)); while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, GRPC_MDELEM_REF(el)); + GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); } - GRPC_MDELEM_UNREF(&exec_ctx, el); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(el); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_MetadataRefUnrefExternal); @@ -256,14 +249,14 @@ static void BM_MetadataRefUnrefInterned(benchmark::State& state) { gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); grpc_mdelem el = grpc_mdelem_create( - &exec_ctx, k, v, reinterpret_cast(backing_store)); + k, v, reinterpret_cast(backing_store)); grpc_slice_unref(k); grpc_slice_unref(v); while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, GRPC_MDELEM_REF(el)); + GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); } - GRPC_MDELEM_UNREF(&exec_ctx, el); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(el); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_MetadataRefUnrefInterned); @@ -271,14 +264,13 @@ BENCHMARK(BM_MetadataRefUnrefInterned); static void BM_MetadataRefUnrefAllocated(benchmark::State& state) { TrackCounters track_counters; ExecCtx _local_exec_ctx; - grpc_mdelem el = - grpc_mdelem_create(&exec_ctx, grpc_slice_from_static_string("a"), - grpc_slice_from_static_string("b"), NULL); + grpc_mdelem el = grpc_mdelem_create(grpc_slice_from_static_string("a"), + grpc_slice_from_static_string("b"), NULL); while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, GRPC_MDELEM_REF(el)); + GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); } - GRPC_MDELEM_UNREF(&exec_ctx, el); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(el); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_MetadataRefUnrefAllocated); @@ -286,13 +278,12 @@ BENCHMARK(BM_MetadataRefUnrefAllocated); static void BM_MetadataRefUnrefStatic(benchmark::State& state) { TrackCounters track_counters; ExecCtx _local_exec_ctx; - grpc_mdelem el = - grpc_mdelem_create(&exec_ctx, GRPC_MDSTR_STATUS, GRPC_MDSTR_200, NULL); + grpc_mdelem el = grpc_mdelem_create(GRPC_MDSTR_STATUS, GRPC_MDSTR_200, NULL); while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, GRPC_MDELEM_REF(el)); + GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); } - GRPC_MDELEM_UNREF(&exec_ctx, el); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(el); + grpc_exec_ctx_finish(); track_counters.Finish(state); } BENCHMARK(BM_MetadataRefUnrefStatic); diff --git a/test/cpp/microbenchmarks/bm_pollset.cc b/test/cpp/microbenchmarks/bm_pollset.cc index d097f8e32e8..3da8e16788e 100644 --- a/test/cpp/microbenchmarks/bm_pollset.cc +++ b/test/cpp/microbenchmarks/bm_pollset.cc @@ -41,8 +41,8 @@ auto& force_library_initialization = Library::get(); -static void shutdown_ps(grpc_exec_ctx* exec_ctx, void* ps, grpc_error* error) { - grpc_pollset_destroy(exec_ctx, static_cast(ps)); +static void shutdown_ps(void* ps, grpc_error* error) { + grpc_pollset_destroy(static_cast(ps)); } static void BM_CreateDestroyPollset(benchmark::State& state) { @@ -58,11 +58,11 @@ static void BM_CreateDestroyPollset(benchmark::State& state) { memset(ps, 0, ps_sz); grpc_pollset_init(ps, &mu); gpr_mu_lock(mu); - grpc_pollset_shutdown(&exec_ctx, ps, &shutdown_ps_closure); + grpc_pollset_shutdown(ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_free(ps); track_counters.Finish(state); } @@ -117,14 +117,14 @@ static void BM_PollEmptyPollset(benchmark::State& state) { ExecCtx _local_exec_ctx; gpr_mu_lock(mu); while (state.KeepRunning()) { - GRPC_ERROR_UNREF(grpc_pollset_work(&exec_ctx, ps, NULL, 0)); + GRPC_ERROR_UNREF(grpc_pollset_work(ps, NULL, 0)); } grpc_closure shutdown_ps_closure; GRPC_CLOSURE_INIT(&shutdown_ps_closure, shutdown_ps, ps, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, ps, &shutdown_ps_closure); + grpc_pollset_shutdown(ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_free(ps); track_counters.Finish(state); } @@ -142,17 +142,17 @@ static void BM_PollAddFd(benchmark::State& state) { GRPC_LOG_IF_ERROR("wakeup_fd_init", grpc_wakeup_fd_init(&wakeup_fd))); grpc_fd* fd = grpc_fd_create(wakeup_fd.read_fd, "xxx"); while (state.KeepRunning()) { - grpc_pollset_add_fd(&exec_ctx, ps, fd); - grpc_exec_ctx_flush(&exec_ctx); + grpc_pollset_add_fd(ps, fd); + grpc_exec_ctx_flush(); } - grpc_fd_orphan(&exec_ctx, fd, NULL, NULL, false /* already_closed */, "xxx"); + grpc_fd_orphan(fd, NULL, NULL, false /* already_closed */, "xxx"); grpc_closure shutdown_ps_closure; GRPC_CLOSURE_INIT(&shutdown_ps_closure, shutdown_ps, ps, grpc_schedule_on_exec_ctx); gpr_mu_lock(mu); - grpc_pollset_shutdown(&exec_ctx, ps, &shutdown_ps_closure); + grpc_pollset_shutdown(ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); gpr_free(ps); track_counters.Finish(state); } @@ -169,7 +169,7 @@ Closure* MakeClosure(F f, grpc_closure_scheduler* scheduler) { C(F f, grpc_closure_scheduler* scheduler) : f_(f) { GRPC_CLOSURE_INIT(this, C::cbfn, this, scheduler); } - static void cbfn(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { + static void cbfn(void* arg, grpc_error* error) { C* p = static_cast(arg); p->f_(); } @@ -222,7 +222,7 @@ static void BM_SingleThreadPollOneFd(benchmark::State& state) { grpc_wakeup_fd wakeup_fd; GRPC_ERROR_UNREF(grpc_wakeup_fd_init(&wakeup_fd)); grpc_fd* wakeup = grpc_fd_create(wakeup_fd.read_fd, "wakeup_read"); - grpc_pollset_add_fd(&exec_ctx, ps, wakeup); + grpc_pollset_add_fd(ps, wakeup); bool done = false; Closure* continue_closure = MakeClosure( [&]() { @@ -232,25 +232,23 @@ static void BM_SingleThreadPollOneFd(benchmark::State& state) { return; } GRPC_ERROR_UNREF(grpc_wakeup_fd_wakeup(&wakeup_fd)); - grpc_fd_notify_on_read(&exec_ctx, wakeup, continue_closure); + grpc_fd_notify_on_read(wakeup, continue_closure); }, grpc_schedule_on_exec_ctx); GRPC_ERROR_UNREF(grpc_wakeup_fd_wakeup(&wakeup_fd)); - grpc_fd_notify_on_read(&exec_ctx, wakeup, continue_closure); + grpc_fd_notify_on_read(wakeup, continue_closure); gpr_mu_lock(mu); while (!done) { - GRPC_ERROR_UNREF( - grpc_pollset_work(&exec_ctx, ps, NULL, GRPC_MILLIS_INF_FUTURE)); + GRPC_ERROR_UNREF(grpc_pollset_work(ps, NULL, GRPC_MILLIS_INF_FUTURE)); } - grpc_fd_orphan(&exec_ctx, wakeup, NULL, NULL, false /* already_closed */, - "done"); + grpc_fd_orphan(wakeup, NULL, NULL, false /* already_closed */, "done"); wakeup_fd.read_fd = 0; grpc_closure shutdown_ps_closure; GRPC_CLOSURE_INIT(&shutdown_ps_closure, shutdown_ps, ps, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, ps, &shutdown_ps_closure); + grpc_pollset_shutdown(ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); grpc_wakeup_fd_destroy(&wakeup_fd); gpr_free(ps); track_counters.Finish(state); diff --git a/test/cpp/microbenchmarks/fullstack_fixtures.h b/test/cpp/microbenchmarks/fullstack_fixtures.h index 71bbb393db4..24b74b9d374 100644 --- a/test/cpp/microbenchmarks/fullstack_fixtures.h +++ b/test/cpp/microbenchmarks/fullstack_fixtures.h @@ -166,7 +166,7 @@ class EndpointPairFixture : public BaseFixture { fixture_configuration.ApplyCommonServerBuilderConfig(&b); server_ = b.BuildAndStart(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; /* add server endpoint to server_ * */ @@ -174,19 +174,19 @@ class EndpointPairFixture : public BaseFixture { const grpc_channel_args* server_args = grpc_server_get_channel_args(server_->c_server()); server_transport_ = grpc_create_chttp2_transport( - &exec_ctx, server_args, endpoints.server, 0 /* is_client */); + server_args, endpoints.server, 0 /* is_client */); grpc_pollset** pollsets; size_t num_pollsets = 0; grpc_server_get_pollsets(server_->c_server(), &pollsets, &num_pollsets); for (size_t i = 0; i < num_pollsets; i++) { - grpc_endpoint_add_to_pollset(&exec_ctx, endpoints.server, pollsets[i]); + grpc_endpoint_add_to_pollset(endpoints.server, pollsets[i]); } - grpc_server_setup_transport(&exec_ctx, server_->c_server(), - server_transport_, NULL, server_args); - grpc_chttp2_transport_start_reading(&exec_ctx, server_transport_, NULL); + grpc_server_setup_transport(server_->c_server(), server_transport_, NULL, + server_args); + grpc_chttp2_transport_start_reading(server_transport_, NULL); } /* create channel */ @@ -197,17 +197,16 @@ class EndpointPairFixture : public BaseFixture { grpc_channel_args c_args = args.c_channel_args(); client_transport_ = - grpc_create_chttp2_transport(&exec_ctx, &c_args, endpoints.client, 1); + grpc_create_chttp2_transport(&c_args, endpoints.client, 1); GPR_ASSERT(client_transport_); - grpc_channel* channel = - grpc_channel_create(&exec_ctx, "target", &c_args, - GRPC_CLIENT_DIRECT_CHANNEL, client_transport_); - grpc_chttp2_transport_start_reading(&exec_ctx, client_transport_, NULL); + grpc_channel* channel = grpc_channel_create( + "target", &c_args, GRPC_CLIENT_DIRECT_CHANNEL, client_transport_); + grpc_chttp2_transport_start_reading(client_transport_, NULL); channel_ = CreateChannelInternal("", channel); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } virtual ~EndpointPairFixture() { diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc index 120cf6fa9fa..836cc676c23 100644 --- a/test/cpp/naming/resolver_component_test.cc +++ b/test/cpp/naming/resolver_component_test.cc @@ -149,32 +149,32 @@ struct ArgsStruct { std::string expected_lb_policy; }; -void ArgsInit(grpc_exec_ctx* exec_ctx, ArgsStruct* args) { +void ArgsInit(ArgsStruct* args) { gpr_event_init(&args->ev); args->pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); grpc_pollset_init(args->pollset, &args->mu); args->pollset_set = grpc_pollset_set_create(); - grpc_pollset_set_add_pollset(exec_ctx, args->pollset_set, args->pollset); + grpc_pollset_set_add_pollset(args->pollset_set, args->pollset); args->lock = grpc_combiner_create(); gpr_atm_rel_store(&args->done_atm, 0); args->channel_args = NULL; } -void DoNothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} +void DoNothing(void* arg, grpc_error* error) {} -void ArgsFinish(grpc_exec_ctx* exec_ctx, ArgsStruct* args) { +void ArgsFinish(ArgsStruct* args) { GPR_ASSERT(gpr_event_wait(&args->ev, TestDeadline())); - grpc_pollset_set_del_pollset(exec_ctx, args->pollset_set, args->pollset); - grpc_pollset_set_destroy(exec_ctx, args->pollset_set); + grpc_pollset_set_del_pollset(args->pollset_set, args->pollset); + grpc_pollset_set_destroy(args->pollset_set); grpc_closure DoNothing_cb; GRPC_CLOSURE_INIT(&DoNothing_cb, DoNothing, NULL, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(exec_ctx, args->pollset, &DoNothing_cb); + grpc_pollset_shutdown(args->pollset, &DoNothing_cb); // exec_ctx needs to be flushed before calling grpc_pollset_destroy() - grpc_channel_args_destroy(exec_ctx, args->channel_args); - grpc_exec_ctx_flush(exec_ctx); - grpc_pollset_destroy(exec_ctx, args->pollset); + grpc_channel_args_destroy(args->channel_args); + grpc_exec_ctx_flush(); + grpc_pollset_destroy(args->pollset); gpr_free(args->pollset); - GRPC_COMBINER_UNREF(exec_ctx, args->lock, NULL); + GRPC_COMBINER_UNREF(args->lock, NULL); } gpr_timespec NSecondDeadline(int seconds) { @@ -198,11 +198,11 @@ void PollPollsetUntilRequestDone(ArgsStruct* args) { ExecCtx _local_exec_ctx; gpr_mu_lock(args->mu); GRPC_LOG_IF_ERROR("pollset_work", - grpc_pollset_work(&exec_ctx, args->pollset, &worker, + grpc_pollset_work(args->pollset, &worker, grpc_timespec_to_millis_round_up( NSecondDeadline(1)))); gpr_mu_unlock(args->mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } gpr_event_set(&args->ev, (void*)1); } @@ -234,8 +234,7 @@ void CheckLBPolicyResultLocked(grpc_channel_args* channel_args, } } -void CheckResolverResultLocked(grpc_exec_ctx* exec_ctx, void* argsp, - grpc_error* err) { +void CheckResolverResultLocked(void* argsp, grpc_error* err) { ArgsStruct* args = (ArgsStruct*)argsp; grpc_channel_args* channel_args = args->channel_args; const grpc_arg* channel_arg = @@ -271,15 +270,14 @@ void CheckResolverResultLocked(grpc_exec_ctx* exec_ctx, void* argsp, } gpr_atm_rel_store(&args->done_atm, 1); gpr_mu_lock(args->mu); - GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, args->pollset, NULL)); + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(args->pollset, NULL)); gpr_mu_unlock(args->mu); } TEST(ResolverComponentTest, TestResolvesRelevantRecords) { ExecCtx _local_exec_ctx; ArgsStruct args; - ArgsInit(&exec_ctx, &args); + ArgsInit(&args); args.expected_addrs = ParseExpectedAddrs(FLAGS_expected_addrs); args.expected_service_config_string = FLAGS_expected_chosen_service_config; args.expected_lb_policy = FLAGS_expected_lb_policy; @@ -289,19 +287,19 @@ TEST(ResolverComponentTest, TestResolvesRelevantRecords) { FLAGS_local_dns_server_address.c_str(), FLAGS_target_name.c_str())); // create resolver and resolve - grpc_resolver* resolver = grpc_resolver_create(&exec_ctx, whole_uri, NULL, - args.pollset_set, args.lock); + grpc_resolver* resolver = + grpc_resolver_create(whole_uri, NULL, args.pollset_set, args.lock); gpr_free(whole_uri); grpc_closure on_resolver_result_changed; GRPC_CLOSURE_INIT(&on_resolver_result_changed, CheckResolverResultLocked, (void*)&args, grpc_combiner_scheduler(args.lock)); - grpc_resolver_next_locked(&exec_ctx, resolver, &args.channel_args, + grpc_resolver_next_locked(resolver, &args.channel_args, &on_resolver_result_changed); - grpc_exec_ctx_flush(&exec_ctx); + grpc_exec_ctx_flush(); PollPollsetUntilRequestDone(&args); - GRPC_RESOLVER_UNREF(&exec_ctx, resolver, NULL); - ArgsFinish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_RESOLVER_UNREF(resolver, NULL); + ArgsFinish(&args); + grpc_exec_ctx_finish(); } } // namespace diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc index 0e5233403e3..b05da25e1d5 100644 --- a/test/cpp/performance/writes_per_rpc_test.cc +++ b/test/cpp/performance/writes_per_rpc_test.cc @@ -89,19 +89,19 @@ class EndpointPairFixture { const grpc_channel_args* server_args = grpc_server_get_channel_args(server_->c_server()); grpc_transport* transport = grpc_create_chttp2_transport( - &exec_ctx, server_args, endpoints.server, 0 /* is_client */); + server_args, endpoints.server, 0 /* is_client */); grpc_pollset** pollsets; size_t num_pollsets = 0; grpc_server_get_pollsets(server_->c_server(), &pollsets, &num_pollsets); for (size_t i = 0; i < num_pollsets; i++) { - grpc_endpoint_add_to_pollset(&exec_ctx, endpoints.server, pollsets[i]); + grpc_endpoint_add_to_pollset(endpoints.server, pollsets[i]); } - grpc_server_setup_transport(&exec_ctx, server_->c_server(), transport, - NULL, server_args); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL); + grpc_server_setup_transport(server_->c_server(), transport, NULL, + server_args); + grpc_chttp2_transport_start_reading(transport, NULL); } /* create channel */ @@ -112,16 +112,16 @@ class EndpointPairFixture { grpc_channel_args c_args = args.c_channel_args(); grpc_transport* transport = - grpc_create_chttp2_transport(&exec_ctx, &c_args, endpoints.client, 1); + grpc_create_chttp2_transport(&c_args, endpoints.client, 1); GPR_ASSERT(transport); grpc_channel* channel = grpc_channel_create( - &exec_ctx, "target", &c_args, GRPC_CLIENT_DIRECT_CHANNEL, transport); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, NULL); + "target", &c_args, GRPC_CLIENT_DIRECT_CHANNEL, transport); + grpc_chttp2_transport_start_reading(transport, NULL); channel_ = CreateChannelInternal("", channel); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_exec_ctx_finish(); } virtual ~EndpointPairFixture() { From 00325486749b5b56bde1fe8155fb2e3eef6499de Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Thu, 9 Nov 2017 18:44:50 -0800 Subject: [PATCH 005/127] Correction to closure.cc,bm_chttp2_hpack and few more --- err | 37 ------------- grpc_c.32.ruby | Bin 2033926 -> 0 bytes grpc_c.64.ruby | Bin 2190421 -> 0 bytes memory_usage.csv | 1 - remove_exec_ctx.py | 49 ------------------ scenario_result.json | 1 - .../client_channel/subchannel_index.cc | 2 +- src/core/lib/iomgr/closure.cc | 10 ++-- src/core/lib/iomgr/combiner.cc | 4 +- src/core/lib/iomgr/executor.cc | 2 +- src/core/lib/iomgr/pollset_windows.cc | 4 +- src/core/lib/iomgr/tcp_windows.cc | 5 +- test/core/debug/stats_test.cc | 2 +- test/cpp/microbenchmarks/bm_chttp2_hpack.cc | 2 +- .../microbenchmarks/bm_chttp2_transport.cc | 2 +- 15 files changed, 16 insertions(+), 105 deletions(-) delete mode 100644 err delete mode 100644 grpc_c.32.ruby delete mode 100644 grpc_c.64.ruby delete mode 100644 memory_usage.csv delete mode 100644 remove_exec_ctx.py delete mode 100644 scenario_result.json diff --git a/err b/err deleted file mode 100644 index 3c68c4f300e..00000000000 --- a/err +++ /dev/null @@ -1,37 +0,0 @@ -src/core/ext/transport/inproc/inproc_transport.cc: In function ‘void grpc_inproc_transport_init()’: -src/core/ext/transport/inproc/inproc_transport.cc:1092:17: error: unused variable ‘exec_ctx’ [-Werror=unused-variable] - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - ^ -src/core/ext/transport/inproc/inproc_transport.cc: In function ‘grpc_channel* grpc_inproc_channel_create(grpc_server*, grpc_channel_args*, void*)’: -src/core/ext/transport/inproc/inproc_transport.cc:1158:17: error: unused variable ‘exec_ctx’ [-Werror=unused-variable] - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - ^ -src/core/ext/transport/inproc/inproc_transport.cc: In function ‘void grpc_inproc_transport_shutdown()’: -src/core/ext/transport/inproc/inproc_transport.cc:1192:17: error: unused variable ‘exec_ctx’ [-Werror=unused-variable] - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - ^ -cc1plus: all warnings being treated as errors -make: *** [/usr/local/google/home/yashkt/grpc-projects/grpc-c-fork/grpc/objs/opt/src/core/ext/transport/inproc/inproc_transport.o] Error 1 -src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc: In function ‘void grpc_ares_request_unref(grpc_ares_request*)’: -src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc:111:21: error: unused variable ‘new_exec_ctx’ [-Werror=unused-variable] - grpc_exec_ctx new_exec_ctx = GRPC_EXEC_CTX_INIT; - ^ -src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc: In function ‘void on_srv_query_done_cb(void*, int, int, unsigned char*, int)’: -src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc:229:17: error: unused variable ‘exec_ctx’ [-Werror=unused-variable] - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - ^ -cc1plus: all warnings being treated as errors -make: *** [/usr/local/google/home/yashkt/grpc-projects/grpc-c-fork/grpc/objs/opt/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.o] Error 1 -src/cpp/common/channel_arguments.cc: In destructor ‘grpc::ChannelArguments::~ChannelArguments()’: -src/cpp/common/channel_arguments.cc:70:17: error: unused variable ‘exec_ctx’ [-Werror=unused-variable] - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - ^ -src/cpp/common/channel_arguments.cc: In member function ‘void grpc::ChannelArguments::SetSocketMutator(grpc_socket_mutator*)’: -src/cpp/common/channel_arguments.cc:99:17: error: unused variable ‘exec_ctx’ [-Werror=unused-variable] - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - ^ -cc1plus: all warnings being treated as errors -make: *** [/usr/local/google/home/yashkt/grpc-projects/grpc-c-fork/grpc/objs/opt/src/cpp/common/channel_arguments.o] Error 1 -src/proto/grpc/testing/services.proto: warning: Import src/proto/grpc/testing/stats.proto but not used. -src/proto/grpc/testing/services.proto: warning: Import src/proto/grpc/testing/stats.proto but not used. -make: Target `all' not remade because of errors. diff --git a/grpc_c.32.ruby b/grpc_c.32.ruby deleted file mode 100644 index 5b14ce6a6ea3e1022fd2e5054a2c46a9b5834961..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2033926 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    e~8=i|WFm#vVLbMgjqvEn3j^nbo3%G1^CtP;q z;(*Ki`*o+KVm$&eMDf_ly)f%~+8QwHjRN!hqCL(N$-a|>X|z*R33Ami<20B1D`)D; z@sBOnIA6<7f;+Ed+E>bYwq{I#TWXaMQg16h6IM&Y-sTowW}Qsm-U~h~TJrdWh0m!U zj!y%<)#hH3z!5f}2>+!AoJ?@vw60fZcPeoTLDuxWM8i3M3Y7h=Su{EE9aHi z8;zE#Ug}d-+5*yVdzL778js6)P6Qf{l#K?&qlPRiB~q<%wC0I>4Zwla*Z5WS+!Tyg zEGxBdI_sR)vYusbeS$n?6p*?i3vY>`Iqvf%tW4P)*bJOUiPS zK*;E$4`}8sN+0dogCdXgv}Mm`krM&Y5>$S7o&<8X?GuVn9v(d{o>xD^r+>H@Tv5QF z$76Bw`g`o$T(*}2_Z1YFq5^FckQg-hUEW-ju5xEL5e;k}m<`Wp(kT7^g5b^JF;=?; zdFH*8wg|TD1;JYi3UsN!Jrv06e;tgBrF6kUI5X|aq4N($6~pEr{RX2o_DhtVULK-1 zHY8{H`XaAWJ^T5AJksaE&|iUhu_-ipZ)Fu$--LsPkFlD}pv^%}+(FZ3EzD|HX2r-x zi*|kBZ?auU=Z%Enr?TLuX z`i79Zq>j2%?kvrbQ`S1OV$Pg8#B(a-N2Hz8(*MYnhgA(sThPwUJj-d_wCRRi!DuSt7^c8+@u6K(Em zrgE#_ne_;35s2cpqWrMoJbUT1eX}#l(^wFeItO`|D+bFdr#@oT4kDAGf@t|+%cI^b zi5K;}N>!D}T!*248J^_6TH~(@_okgpC>UiwJsT!|{o63H1?=k^{`}##v>@-I8FOJA z;=3Yu4;%y$Vv*JlAMyhQlgTW>z8=_i{|HCtfRpJW4Uu$(XiSG0=B=?H^9D`-6pT@# z-aiYqbj(q(z)5g@8(mKiUNA7GZ)65ad~KtA!R9g%=dN2>?}fKz@9CY}F+W?^pCEBB z3Xk5MovR_EA7_@> zr51ux9FnNA%gHQWiNO8WLg^+QzFF7jM_{E&Ty$`w6>5Gp+K10D9T;Hw>0Xi)fdAqN zrK7;VE_bMKO6T>%pnMVuWRz}whpi@CU1d3VXIsl1jkK6XAZ&+ajMz8+I2`5R6S|Md zog1BrAKrfcO2H;0x9!d!)*gHp)agCJQ*;ib+G9LnR^6!NE_;IRUbEZa-fA`jp-czg z)LSXCuhUO_7I=rvVV%#lct~GUBhs3%f>HunN^-v@7r&*yB&eVPXfj^PIvfw?r9Or> z-*vc7_VD}=R}APt_5Ao;WaNH`Pa~gC9b1oGq4gL+x`|AGT&>^c2HVy>R^Qhaz#M924%&Z#)#@hfrNB`I z1+G_tE#C|lQoH#(YGo2kVg6ZSyY-KRyO(e5p{ymLjVb!}5BfPK;0Ej$R5%@{(#BUG z^RRg4RP2=S#YYOWk^exLJ#0i-3xEnm+58YEnh|BbQw576n6DiqI6K8e*_Z4i|H5Nt z&(AJd?EUo1(3rC+Fjx!XtCvrj!(cHm=n!Y(wkvGvyzT6O>4grlxs(6MUuG10KUnmX zclgq`0VYOh>9)A{#LrgQxt-=@@DXB?fnl}fZOqv!Z+lNXHVG>9V{TA5g8A(V$S_WM|RC4^JKm+^K zY4iw7Rp%rlIl3sRb(S~P#!@kezQz@wB8j@=Fe^D!S;0NqFj|7zbc)SNU_wy{2g!t$ zzD%H?`d%lUbqFkcLID;(XhHhwxU_G-olI5V&q;&rGt{<=*KtGtb`5=N)ndXF(r<%k z?ZeUUzfn+fH*w();qxh}M#q;~(NKBDo}yuS0ebJBYKfG#hHEu`cU*k9?Ee{S@!mwk z&kA7P2~6*;^FLZN_`z0;61qqQR#70(XPX0IAhiJ%0_CdGIgAY;P>;v2?Jj`t1IfPS6eB?@okd}1RteQr zJG0o0LwUM!faO}Yv4XkKaMdMnn~7VvH9C04;;os+r6IS!7jkBQr@v-@a+Dt|I1b&K zIffOU7MyTWC)PF1QMoskvZivag#R68F|-nx$xI$-ByKa!9;cCLZD;fUgZ!-Rel98h z@vHW}wsQ;G7NTv+e;M`WECoI~f4S%wpZv0L+cey-b>mYF#p zroKo%Rs|G$XbG|#fZqV%$bClt-$P%Y!#7`kc2Y&}lIEhGeb>}Chs-)VeYpSa4!!|e z*Xt#$vOa;zu;)AjI!}Yn$c7JxKY}66hfyT>zt^Nt)N{ZZ6Ig^=e%;G+D1D@#Y1$qY z-Ga`Mx0jmwhF_z;C&tz@EhVGp#eMk!y$J*|dS0o0_V*7Va~lJsg#pqI6+7svP9)ZR zw@XahMK303SyGA{sWi7z6=9&51-cGAa5j?HVPsf*^bAg*`9W8Mg>k`rt?09=ugwff z)hYW-Cw2Pu$@8j0!jLTOrfvyP)n{>tkj7NE>XU(h5HVyg89f8q=j%1{@65Sl=TUVP zc)4oY?I`c(X69!Q;MI+JPuyL=o|4J~1k2X#K z;_nUOOuN0u7p3F$yDU5nvGTF~hVl0^oBSyZP^pkPh{v<|Mbr(#9z7xloIoG;?Genh zJyTX*ccwPZtWo;~*6&a)aun}0$fXR3iUe(xbWHKud+223_C8-VhPu3cL%fkod#TqcNr!h`Y0HH-eo3R_<MUed|Qdx7G$72s7u))C)6!}p)-dv(Eg4*(-SwepScKi2m+-vxAy z1)H~_jK6=v@Vh)|umPQpZ_4=b@gez*DyKH6ow=hrF=*{>|EYGl5}7VZA;Q@YI1*($ zb9|Uve<(9NLCuE>W}XIuj6dGXgwb^CwadGJQIHUkn%n6C6uBj{ncD2TGF8gAQa=qZ z)N?pluB<>Ln|f@|&5K!A7y}H}rgCairC!?9DC?T{OISByrqEOB>3cN$Z)Lq zE4h=&IyV0GYKTm+7a%iftrY3B!1e&DrH|iI?=k^h-C@BKQ9x2HfM>WUb~JNNfl0WYK6M>||DIzBQq7j_H*aJ9Oj^)&{{eM{2#N zxvPUT@#Fu4KbW`a3~D?x%;n$IkfJuEL)iPf?f2AJ4Gn$`O@0kB*d_ii_r`gPRD*Se zac0J|bHiCq-OjXZG&7>MJ9F7VEOA;(uyYR=8`)j2uMj!nrXU8(}(xx6RcI9-x{grP?iRVp2zTP_Iea^5qyTdeYrP4lrcHrv>*KA zgJ7Sj=L^efiq7ho-?MA8Qy|p z>Q9P>h!Vm;?Zu5tu;%mH`vtIqI0=Rj!}W$@g&QrtzOYyL*NuapD1bi;_&OvF?+Rq@ z7oVRP_}{p667R#g8+eC&5PZ0q{h+vB+W-a#PAzb-K_p0Glo2y|TkGjW8fjp*+Va+4 zC#lcN?&mX{pCK;I!z=v#F3V5K#oj%BFnHXUKoNfPGXtQlf98bhvcc8-G>24&>zgzj z)$>yYx0rp9%t){5(R`f0;s|je>MlIlZhUy}pNViMP~o!xQs!~?0vT(4XwZzTb zDa`z7?22}cf>gnHZ*9TOFJqP2{y5#-G$Xah)wWgQqXNyD%3|I#9NVR`1jpt`k{rk* zA=XAE39&Zd42a=JqcpLt(YMFPtn)#AKM$(Lf|9NaDABuO4VJkz^+$x9`UZgn6jW5Z zP`$m0^T1ed#drC)|2msf#X8psVPgZ9;Un+(j2|f6Bm7`siO}9DCo)KHIm1qs6}+L~ z9tB=4C~%kxbWtFX_uS9*gddS(oSi3SCyo+#y0(+ca0hni`ac}SP&+f?a0Bc5^rxye zj}+rpmaVv%7MCgX0a^+ip8Yd>2VC~lQ*;VTq zpJ)u3RiWCgJ=?P3o5&%9qkuN3-XGko7n5t>N*_`6+Q=khpO}pH<;2Sw{+WkO&Tp=x zf9J(&-|C_EGE;liK-Kz@6=wa+_#CDFr_c+ad<~+s7ns*JCr{$Bnp4YStxklPZ=axD z#*ejnfl;w4xMeE567na72|Vuo`g7>L_6jnH&!u7v%rvWN!@v=*qm6P5>iOt$GAm=n zJ*g{n~J(7c|M)i-#zhZd+~8-9mVqehf;5sfJ6B9d0pMdIG{ON^bzNLImS zK$;PL0j?=dqk=4^)-=XLh1Gs#hN(7%)&Q6WhhU95@-b5iPP4pJH6$8Ul@W+1L0T0D zuz~!m)$6P6BWyB>tc>;hW`#W0n?S?*#%e)h-D~ufZ=6jntvtA51m# zlEQ!XD!+}*klS_vO1Hn>M`9<;5{osEB=@%IB_-*jT=vRll(MX>q37MpACOx?E^E$Zrsa|QGghq*5k-&g!`oVe};(iEPfgx3$m>G~albc zNb!Z!bu%LaW{9`3NB4r+tp%912(urYW=H>~y%hLiL4m_n;F}a+pzUVADRV!83A3*c zB#CPBSJzBa*-OI9hIAN!kt`OjI+a;LLADJAQuo}a?@N#D^T=2BKg5t$-HK5FiC!IGvuC~{-?}kn0`_M`=+X+b1 zGr;+yxb8lP*UpSA`iX%C3ceW5-3HY0{sqDpIox|WZY~GNdU_d|f*x4zJngWMJ1;>OZ&bcm zVMT$woxPZV8humg*WSyQ7Df9H=a;=i(s{~G8p~e24r(FJ7DCx@$2==Rk0oXp&DFa- zBjrQVcU}0*Vj3H zot|wY)p^NwQsXd58uQ*i8<^nY<1K!c=+>H1?9ogrrt5T!zs7tX!#sA8s@ayw zuS|2-5)o9G8TBr}S^n!}taLIj@ReWHPDVKMtH#L)XMWW=8R6_^{=#2Pn4hA!v#RP5 z?31TQGJ_$c;Wpnsor*A@Bd52y8Bz178#eN{YIE(H^!{f4X1*T^)voE;hIp3SLVigT zremSBp|B|a&@}-0k6GK(y`asx@#jy?k3! zzZAUEE3?0r;HdKP6nfZK6s!<8UUbiQ{ z=_S*md&e-$oyB;mdZcQ7Zkq;!nc3|9ZDxHPL$oDPt`pfyN+oHBK_HV+146LlcJH6~ zHXuV285^ys1Z#4jznwYP8E&oGEP<17(Viq;rn-~d@XZb!cw4Oz3_V;n#~WWi%OSPg z$+hi~MNiux_KQDFE_+yu7RI_Q;rGxZ6*eW1e1AO_$(NXO0P*OkKYO*2y(m>N)mnlX z)4D{(q_~d-u6p9p54eETh^*D*$<`ay>VEUHO(p+}hP#)v6W8&mkw&}UVZ!cj_!RGF z8uji^{1lCb^h#ONW%AG?{JT@%o?e%oTb7*}Gx8CW;-&2Ga38n1uaf;|osRF>XQV;5 zm0l9Lv<~BdW&pqIKJ^U2!pWX~!L9Gsdk}i?OVmPO{qWtC(TirPrR<{B#vr zKda17gXEFsXNle(s-KpVc-oIACPZ%{sqM|7Y-?AxzQa2f#>llxtloPh9l!hhT;Vcx zxfox#$=98Q+7s=&mOSR7&GcpH!W>qx#msrHvP-|dU<-OmsWf+FNvY-1worQKkZxK{uVNhx03$TaQkaFY@-bujhQ*k-xf%w)sEk63exUYEOVBp8~y2zmj=cQ1Hx^Oh$5{E-S`8<3E5}CoOB(xBCoyJU~>E6hRE7N zgAa430b%*nb%Wa{Trlvj*I$3#Hj|!Ssdl`DNTEl9%t=*;zGwFjRb2GkQb8gN4edA?1}qtE4ZHIq zOpcqgUnv!n3^X!EX11-F*-|77pJbfq^%OR^7_L;jUCp{&HRt7Du>U8IeJ%KLP{}L_ zhtp>=a>Z8O=C2{DhqLuH&aAL}E!o9J9RmD$w1?pzRxUlixgOn33x2?WYa2T<61KTV zpJou}>qFJ&`e@X*gFsfobKkF^#u3|kH=mAMewJ%>3Tyob(XN=U^+T>W6_ar)5i^!VG8&_hcc zXvFaGR&C&!hF{(QFp7*L(_4e4ck@Z2kNa`KVKbt z3s*&okEV;*j6S3CUiTl!e04LXge$1qYx(LPPsdQ6p_B%saL=@ z*X)O~>uj$Ct8nMEa}s?{hfbo;>C{Pd*>qYvnO^vXg{Z@wB#wTQ{?P7QKVif<*4E_C ztj@L>Wy+{54tjbs?VzwXj9)T!RvJh#epO@SCE;w6G(2;pWo8XB6d(02CpKK)1xPcR zF64IH!a;e(6Rfx~7LOVHmZT&k6s$r%7%{DNGz1I)>4XRxD_-3CX7#N1=<||W9U9B* zCoAvdj@@^7-Y;OySFyWzU#h43?EE4Qw1;}ch0(rGlh>V7c|I^wS&7M$^)LswP`By@D=h|PU) zTFL`X!60JZJ^?uDryI=i^9D=bCQILDjtr@5fJSp|@2G2ltlpW5#SJ`c@3cq-r+bnl zbWb@6-BaPVwh5P(${cGJ!~6f-3-6B<5bw9xhP<8A?E?MXy%c!0pum+X@CXI+`)R>> zH&lL?T}Kd>df(8$*Isy`L@dZq=RNqAPWy}i={7wby%1QN*5VpK>K5ye} zsmUQP=B5@iQ2NhBTDaeeIJ>wA-~{?Mj&?ph659CgJ35idFnl^&VNHFE`BxEzEM=qp zH_#HQ((1tNiqvjd^sw`;s@^T6<-~;$PbUx<`?1U#$v*G9m^hjCO0(yfBhyQG9BxdI z&rF_=>FX?GuO^GtDgs(?E?fY+dA1(dAdfVz-ic4lhM zsmpwE7o2}I_K?T1Uut*ZILnqja_ju`#hD$Up0C6D)%WkqOV;uX zx3_+st?$bI{w}@1P^o^dJl6<~>WO+sx7wN4@Il1;&y&pXkYk%BR1;DVI3?&VzUkyn z**IwPYQXI`CA>AH=yk$%Kxh;LM4>U_R#%%a3&C1#BA8y#XnP>Og5frcS@ z0r2mq%pREqey>rR1O10}Gh~!6Qd|Fe03_UVOQLbymH(a0a4PF*)&*hs%Qod7mHztqdw@!psR0g7Lkf5FFM9@6o=V(L#v7o*$ zjn(Ha3bQC{K;N9Hd9v?T7}rYL>&-7o-)s4$c{+>^AR)_at!bLsx`71!=oBV+)R?{J zc=^k)Ra{3YiUz$;PC@T4cm8VNNy-9G$^`JL4ZM})c5+qgt6r-bbk@FmY1xAH6~%KA zJ;#CwY*FDnG4k1h^~bjo(W@2sF&qAT)%t?$@_6sPoOQ-C!cB9rgoJ5A+%|!j5Nbl1 zJ44nZcSeE-?7T^m5_g93!;k1S=AO&)^z~K;0*25AhR_Cv&;~}tz=-hxj5rA}N=YK# zTmvK82cabT%eT!4$I|<3t8a@%`{bX6ia@jQlgbRl%ovqXMhy_(J>6z{ zdWW+vGtfZ|EiOzDaMQ_Jy$AkP1}@ZA-+dUZo0~Bdtak?UWJ~{06s~&Bd3xjss@3{V z^d;IJ=d7j%^mU#tzLE~n3E1ANN{V_miZb$~GZg+X>Tp~G9A;VS%(B#(WvNqxjt7M) zo?gCf7L=JJ%B1_8ow>h{nJ)r)R5dWS)dY6-?Q)t)?@itgL7b;eq~|;M35i<3?JBLG zq}^4kODo+z8+#KOh#g8;mUv5+LoHp4Pyv44g+JVVlDcBe2c!L)omJ`2GQ>(KV8-%f zQJ5*}A{(PzqHNO?cf*M6fm9TseHZ2r&PIdWtOwTZh!0GHq2fVI4@)tITE8kVveCzJ%T zx0ypVIjk=JwC>Kbz4=;QamBUH8T4`3X+!{*IE~0(Hc?r8#n`=*zd|DtuGDEnz?C_T zWpY+%Ovpgfh%7008p|b78Y?6P8!IIQ8`;aQaT-l$-nc*0mR1GPec@^CN#rf(J3eFR zs&{)>&T+O5Y<_AWbZQ{Qgk)4vX*JC}$GwN=8s*UN3McW@WpL0*FB`?ccSbPwyzHWm z-0|oH0Y8w{bZE6PzjXUq$K)%>wz!MZ!Z*P(#esq+TYOtS4BrKN;M?Zo+fFKcC7$En z!NS+qemH(+*l;@6W9Pm^&j2`ftX&iBVFbNytO9S{C(+gq{UU24DK=If+Vy+jAe?68 z$k_ycqG&&X_>D?JH#$*9`(v^l; z{Msj+v%3?~n`6LCw|xbG7_zoP5%2naY0gkKRVto1;|mOHSe~D=%}--aJ_##zHX|bx z7@I8{Wtdu}x7X@zeY&WZPRZQLgJbq5q#ADjABJ>sW;Ia?6@J7jmb>kjRs=2ZuZVNG zE-u=?4k+42t&!llsJ;KSo+%?=b1zJ=?&)B&j;jlIy>7aG#6<$V>20-7Tl%-HJdB1T zMPkv0tzwHieL5HkX;=2)!y@*_Vkq+AkXsd6FdF#rr^?GA>{D zJnZ}a9_|+N6B}~7WQRsCVus=h?{`sq25$|=lVM;?U(rXM_mJ1IzXC`U^b*~ogQnqw z3$R;xD17o32nn*9^H@Q1l=(AbnKdfCYba1PkgKq)73m(A{bOUpjDCY-12-0gu zd-0%ov5*&x;6;od4cyHV@hux2}N0Y+;w)p}RG#7eRFl7;wC=zTpk*Di@TlNMd)wx-!Ja5i}-JqwNP z9!OrE@@-~}Z=cb(OA~CRylRJlfSkhWdQE*x2p&d#R(r2 zu#PyPp`dG*eH^wqZ%o0=$8SO}h`3ELXCEDS03#FyRdbN0O7FarPYyfVnyEA~*u!_CgLgm6SsH0<7!}@}-|Rl$Z)U?AQ-?z|IdYf# zZU@lh%?dgWt-7bgY%|4j%Mf16d86H?t(P8*)xqCXs(G9(l#M+v@vU}iwC^nP(X4XC z#hKL(UmeB*AirKnCH&n>)WQC@!8&`c*&O&Oc2&d<2uPASGh^;GMvBdhI}2mZedagw z!L!PSc0+@_mS58pzvutLxdWNIaZOqGbu{21XCWJBH42~06u}sng-Ibjj}Bj`ehU1Q z{(Ptz)p}P(wW4yVpN7|s^`+=Yt!Yx}3X4fK_bw%kd$*hdgAo@&q`%d6ME+voN*sZ1 z2jG}ao%_#|wURuLqBYLYf&tT#f1gOJE^0?J6^j~PCKT~>RzSaEbW7`Wp0{Qbx6#;o z%xl^~ds-YwG10c81*l;Vk&+;Ur6dS3DGA15N_p>>Z&st$1S;OCS8G0D$k3^GWS>u} z;$5UF-c73F3zheB>)Ms#H=i2(B29h~sZXp&PlV;P=t&L!U2b-J&3H5!S+TEaNPZ?X zMFms^i6|{hL}_6nN=LlW6Ie_tS2>IKN8E*_&c=7&W$_+*)7-kzcQBM@w;sp4@V*5f zdPXRcbUs(RHd?>d#zIJP+l4|yeugNNGfL93L8hD;#uVwyNbuC;%n%;U&Wv)Bh0J=+ z43Q#Dzpw!)%x1(%mg18Y?UxZ1rKpYVMZDW+;VjY} z?Z26+nce#Af;Q%y8fgs&V!Q2K(o&S30ZUqCqb}(^hEa`H)-Z?4F6MVnow|qDDN+$f zToLyMd%bbSG(PPJphfs=~XnyIDlTkmBvmasAIA;ehUe*+Syez8dCK#YHtqj|wA0v!15Ea5gT%IMu566K&V zWt*0Xug!2F)xZ_uG;rhItl3DEK_IuIV|{KjV~NWCW-HUHU+5KG^aQWmd;S78xD7NI z{lP5zvsWqxQHjusoq;g)EuXi44zL_Rz#!+(k){e0kH)<;!qhq_TIi)OR<)^D%KDhOa-Aoe8g+>!-j67%M69wZcGrtJ+K*lTE^Pr;FlCQCam_SK`EgfA3WO@v2 zgIczs^$YUr*bqkgd>Fx;TlSURmFic+MoG+jYUjblytXO^MuD%wloWuf0?8RDzYG`JwT^}=y@9yQkc-q)!od!^ZE{uL{H z$j+{%_uHpzSHG)Qh!U_4-wYHH{xi6!!616K2Vb!)2vliM5MNc0YCu+!im$3k(H@`ll`j}LQTc!SVY6(>!KiGog(1_7Lox)3zZ`rr7!Dygs>DcTN)0izsz>ykt zJu}C=ss8GBe95_{4(d5T$Q*6BSw>aBS{jMKyg{2YsY zHL;tl+I#YuIojVVr23L3F^*WDbnR{oai?d8r%mmdJW@HW;+FJL@^~9!yD+k-*oyRo@Fv;y|r8aEv5gO zIHYx#O4|O@+(mrOlEVJ$@FuMR~bm~80I@W&)_1~f6`|nGDA34s< zCzO|P#(ZugTH)ltszuHY12u!uK5evNS&CDLAo>9gmaxNWu><27S&cWu*m}_VYjq?8SIVWhr&(i9ZD8Mt-ZT_l zvDsV2mkj<}vhn1P4=-2wHr5rLnz!VMJcl+QY3B2;E3~P0Q%`BGoL7N76)S9t_8rWt z=!%1!b%R)uSHus=yf8WX(^VJ02zs58bu95DVR_VAL7KYO3YvMeR)}~%n?|eFWHkXv zQA8FG#hAaiEroYqhkY6;$)g-x!c&KMnNp_Pl!@O|vBxB*yX=sZ1D(u=wkm0vn&hy0{e55i30pM1FU~Z3zLmfYCD#PAWz z5D7lIf<0MIT2XK-h3KIpMjj4E_{!TUH8i%ru<}=W4!&}}H9Ni3!JDi!xKFf%+KL<- zq*6bJr)$b4iLrVjiR;OG7!4F86PsQit}i#=>nr9fTYaUTw#>t_k`l>Rg%KSE{l|VG z=kM}I8amZ5m7qqil06ak%u*V#kVg$P9DYek-7^y;W$u}JDTgH;E|BIkpH!o?i&Udj z8=Wz4E$hnXyORsIbR^riFitkJ8h>`bmFIQLe{OKo>zf8PJ-YdoEzd;1qYb$&8=t?Z zWaArTP4%7-=B|<=cTq*O{}#sPmW`Q{CPe$^k&As}JbT@9O+X^aHqbU?aW5)~-mxka z8n6h5>F*|RX!fe_j}_q&dfgw$d{qgNtG@F;{Ms_B282@2=eBH&e&@%$0Ow}t*i`$} zRR>3}d!Aa!diB$!zP;2(N~N5OV$QkoE$6beaw!?yGb<3k-r=EjPi}W+RdB!{?q?pJ zWjev0S9g6gp;1eQXPNFDo@J01&2MemHCl}7F{^yc1Vx{X&4;rpPKbV%HvGsvwK98J zi2Y3G%*reO&HF*w0Y#gZCg;-PRP?@vFq8Gsl-V?KfULGp zRB$CZHVqUOt)eJp@Y*hU_9}_)1ZOzMV5vr4mI^FAU;QlG8l)BcPkOHuQ_TcKh#Bv^ zO652`7r3dbq&wokA!*zKQ@hdNEc-YF#@Z$jPryHdomIr5#*D9qhd<;N=?%O6+1 zD|k;C&hQd+TX(YXK%ktsVC6dbX!iH)c@3@gmO@FuQnH?pQs(wm$|*GroCNojkDlTk zCjfvy3%4ZbNW|z1d496;x0+=bmmk$O#V(n$5?(Hnd=(|u`IHzPM+ratP5f&d0zMft zk9Xt8?KY(J7sV%OK!0fhH3aGY)Q#*>sE=<|(!ACPCi`hKN-k;Bl`u2H#P>^>b1WvZ zp9F|G+rr^S6WtFiyq|~dtmY`TdotKgpJ}ItY{rS~keM1PWpDWET zT*vlLse;f(arQe8oM(u^GCNN%7bE$Vk=n(vi~r7<7JMMdJkOmZni~Ez{nKI;HpC)C z=(0rk7#TY=CYV#M>+|aTdyT)CJ162UiA}pKa`6#vNRfNk6eerfA%gE|n2yumvW0?e zz`=ipi!Za+E287LQRAC>s-jkvxTltoMBGy&6y{gVyQmnlu^y#G70x02s&?i|OxHMb zC8g_}xrTHjw~oz6?*1ZXw#}FZ6@)9yp09y^iiLhk9{K?mx<;;mHjoOcR_S{xlUQ+c4ewNNUdpLA>hQT89_xGo6%nXzgAz(NxZ%8cP;o8BA-vlEK zRfWSEo>5Xq3;Yt8y!Fl52TOK79=P!Ln`g8JUthuen%O>a(YLvB=2;+&(RbzfJW4C^ z>AUjVcZ_@f>h8}Bx5)LpBF#tWIa;(2C-365SAj{#TXb-KnECQ9K|7M> z{_}GG_QPQtlEXoitz=?hgT@HJz@L&Siympg*qw0CDdCVxWlsJK%ZH1ku2c=slkA)N zj$L8zokNg)xVR;3H(TXgWi>o0rVNXt=;JBP_%0L&s+xIY^u+w*nD-Kbv_J zZnN?;=&x>;_e3(J-@4o@u#X$ov@vKi?~N|~MCQE-(eFJ0wwd?BSBd|-wM@QTdavd9 zp>pcsb?x&`BV@c$Sx5PCEm@p%irgzo`bT>{KXR3yeLmSu-{7!krK>j`OvQ^Ac#u-r z)2E{^`lvXic=b1yqz4r7TjPYmggu^K2C0T?Of&OIw*y~Qi`VdWVUg-}?WF(A9!`zd!EdG? z`4)ByZ>G|6_*$_`7xJ!#XS8s21Uq#=!(X0-DuB0fKxR(&)L44|IZm` zKA`oT#HMy@brYcp?&*EamdDTXEI5pLp@QxU8#@=>fN#7v-QXAP+eCRtUBM79mWLyj zEc7bf9dCBrv=GxcI?y)fO1>+k;(RBB4A8kIlMBnI$+gtxLXkG75p~|ceCMT{+<~gF{8o8tp;04NHl6AG8%K81-CrF%5R9b)Y7t}O8(IEv7FpA zz~VNPlc%*WUv_Inv&pZUONyd>`;dtW0>e}V>=Wj>MF?dM2jNw@f5Jz+s?e(zUfGuC z^8QVHYkNQ>^4^rJ9%9rtaJV4nN`hb?%CAQ>edd>n0rr19LY&~N={b_9ZOP0~IsLrP z$R}Y8dOUqdwk~7C-x0k^tn^RqCo`wT#)2va{>*hQSJg8~%TTA2Z`4*nqSV+s^5c1y zB43qftM4}Q`oP>xWa@t{dr6Zs;vZU`)8H;>vKKtP>>fk|6AVIGGVoyzlj!Ce610- ze6`ezQqUiuqI)Nft(UeT`3`8|(hg8itu z0YE9dmFF+lNVpSV9GHH_yGqPq&ZtyDdn0V?#tGYg)e%m1@!CthjoA48$!72~aTAZp zu+=S8?brL`jJYn%JAYqzml|5jpXS5c`?FoBO#|uwb{k_zJarK;WR(Dh%r?L%v-7xM z?3MIiF<_#7=fmx0X-#nQMvSdJT;ucGE?TJpk#LYjcTCpqNVDV3%d8D)M)3I^UXvY) z_?ea7-Ot0*44~nZIbMg1S4@5Ru^LwwjZkZX)N*v88OZ0n%>Y%@X6@3dAqVlR+TrB8 z=3?&4k@|^&qK!7N<&*}J1+&zQbi18uARQz~Sgsea)5)P+$%bm#U1Y7Umr1;CxV`~Q z8G$J!PQ55oQQY4_Gck9xHaVqPoabq4=_I=Jrull`-^t%>}?c9F^%nk-j7 z+G{u-vOtyP?lmIY;42eq*G0eo0rk*2OhUIu6NF)Iwwp_GN4x>oU zq!6R6Nw<2r)bizeRKN>)Y-<$G6n~W9&rK5XDluZ=B{s?T5&O_Q5%P%Nhja>BfQ;#i z!(?K?z{buWE*ZOf+%yFoJ!~MX#XNB4TUV|B@mU|GJ#O7 zosFne@JuyqIt^2coUSrwanjyoBFiF5u=nr|j)`lJ&e?i&=it2ggWHR#IqYoAKLOx{ zj};aDlDz;Nm+yOz{5r-1e~Bt=>{fa$TcDiW*XCQ+4)asPLt;SUAVMl}5c4LzX_>*S zXki28gbkFj&bk_=$3SRw=!*oCcBOl%&p;V?!-w)=+ywt{X??xn^vv1`xrtzmzGdxg zQj9Q+23-m?F=D%wpkl@jUWt!7NkyRsQX$zyDqNaL)tna6nD-4Suxm^{fM4jqMaRQxnbq^SfPL5PuPa;%WFm!shX$?l2L? z#?p!D#}2To{vn+>8$Xsi9=AU5>tFrqSMUDq$yc)B8?y1!r*4R@`1j=b9rHu0GVB_! z^XrSQSQsC<3r6ti8C}sH&I~0+z8|c2?EadwD)YBu_6pJmWp+;J*+-A>Z_Ug|gfbX< zox#kD?`Ka-xF;vL-Vaec!Mui>V%OQ}KC;4}_Jie6ABtKq?VpT|#k;YX89mSk6Le@b zQ+cJcG4n#Pj<f~aFu~8295Ojupq161>|_ZM?=?qM!$E3YS$^Z%XrPT@Pq&QX8WJlvrSRe!sKw0O^SV2uA%Fj>)!%GvJPzg4=}q}g zKbBjzAxt_l`m_lwXwFH~y~{>Sb?;3aecBEGP!+<3<|F&Be11=#FRn#r&M`EP-%o(Y95g z^c^Fw=hxf$ct2vsxSfXy%28$@f5afU7xjh_deZ=~3+;F zS$4cu2k8lK4J~^`8bxO3j->}K+j$?wt{TDXCbRR9p77A}s`b4OB#c=%oaqXOvSBfHSJ4CW&(?+90gL#bq<0&0YC@8jle`}_v+hT5 zMfV^wSAOJV{jz5@8+t#y4=sfIG@n+JYCf$Y)qGk!p(VO~A&)09D(|zu`Fjg zbH|RQ2QS-UI@256QJmRv2+oqvF`n4U!J~a~tSH?hk_eff(sj;LLh&TE-oD*q=iu98 z9qG3=>9@ArZ*7HI>+M@63Ia_8^tecYMu1mf&*;5B;HLU;h(py_dL@za<6HeJ`BF!x z)fi=#km$v{sAl~xGp}x3Ph+mK`vm@nnGD*I5gHR4*b5)_kD>2%y#ycL^B#O?;+Lxn zq%Fn0A6fWAX>K1a!I5n!|K%TOrz5YB|0D4`cW?L|^1tHu>jM1NVqozO`Vjm^F8;-A&X__E8E0g zDG(3V)4}}R&2Iftd|$M4-^08o3^nv)R#VkoKRlIMO%;2u{k}Iv_EJTzeouM7>(?nr@txwMog&T`9N7)d7QotEyzkG-8(C;*= z3(vRk%yb>xOmIa})#%9c!FXY{HSz}*@*}^oV!*dgrdi`^>+maq0IU<4!`_z#+X}$! zm0{-%?p>S&XW8)hd7(Pf2-S@7od^i$%NIC4jBR$dRQ=+&hL$h8+~h^~@cq-kT-__t z({t#^^vvb4BCc3Zf7U&{)IB-OwY-VYI?9&22WYAx406x2$`f62cDQHr`OBj#PLCJl z>tT@XCg0S5Rompn2uHZx?BEy~|IL6N#0y_iaPX&FtscctLLUsKwJG>5%>{5Gy<6^` zc$ks7<<6RSSJ6?U>B`!J(qg*#eAY&sHjxbBR%>XDI`8$|hBd;NYcbIh~1>#kh(6`dAs$;{`(7jK&&K&jJ2;0fjHa@w^++w8P7@YLqte5 z)6&G#LZ@B2ZkyB6%v0KF*N|>^T3UEo?6ecWq7B!u(k<<=O|Nf>ZE4{bvbR8ifnphb8gF~%egIB`)6Bf9sY*XcPgIiLi8wa0zlsA6S*p^gkbMDduwrtw; z=oXMF-O>^>{RNa%ld9ePya1iOq4$=Amf=JeFJUqWh^m95B8b`vn*M) z*_*+yk%v?tU4Y5U$c7K@g9S__pHW6WP{X|3Aw1Y&W96OXC$TgUzcGg8Wb5riN0pgX zh#f+2xR=BqtfF>yhz}Y0yD#6}L(!l%@QI=G#Qi38!@u78dD;VD4S0#A8D7-{3B1?% z_ozO;AwMN1&WEqjnnMf>j6 z<3ezV_WhEdbVU<&D^(8^nKnKoI=uDsX#Y2rnKd4{`0kt6; z?)4ABKk^7Y30A5LtYrSp<6nol9_hfRI)`&{H<|+mre!tJzGwJ?e3{P|Z?!g+r6&0e zua5SK)0XqD+Hbv_5)6t4S+({rs)-D?h0m%Yzj$S|Ps$?uGjiqN$ay^zK(zlV-qG+S zmZ8#=o6z&Es?9`C!kcl#&_f%M>wC^}+e?Wf#M|^KYJRk@UeJx#*$JlDm+sdXayC44 zRzNfiqt_2QZ`J%M{lG(C<>mcm=W+u)@*qT;>~@us{Eu;kkytg&KH4_BQguMX%4ol= zr>4>NO?9+i=PhVPmqJHuSBtxi9?*nEuBD2Dguf}umSvD{^9d4=8Hy9?mMKF~0i>|r z`htcFYl{FTH>U_*Nmi8r! zM{_MYNVH$;WWJ~T?Si_riCvgS0Na^cOZI?f_p|I8`7!E369$4?T>tzE{v(t&OHBwVncW}= z%{z_Lf-~g(&#>Haf>Si)ja@`dDs#0>^Xpu(RUp|SSbw}Tx1w8*$qPH1oBc4V3RBhi zy)a&-`4sbh^S(rBdJ2=UA%yt33%pDjTXvz3t_noFSD!HQP{!3vo;MeNxHh^= zyWrY-X)ud6?YihdhgKBw3f7`d2RgK<>vV7$d>w2ZJPPJo_?+qRn;A?u%g5iJH~zU5 zRY08;$?Ou@?z>XMKD|$7XJn= z71b}=HvoVuPh7V1ZJyFcU-^w?JKyD(1^=04JGbjWCYJOe%XYq_2XTM2?-u@=CcVXZ ziDf(gO{Kf8oVjf0jmjfIpZ>?Po$}aUskMH3L<%~F4q^i67-C9^GbPk7SLnml--}l_y0-(E9ep8#XrII7_tf^ z7@H+Ah?yVPti8~Ly{7NRil(fJ_T5fV<*Bo&9s6j@3=A)6@<_B`PxRj<*pFP(P#h{+ z6E1GeSZg+&Bknc^Vk<&+2ZyorvFx~Vk=_=7Owt!1Mtfcs@1ZlIqT z*kGZ0d_4AOmegJ9@hU%}j`;<3H2HN%pAXiDij|98W|I5fFX@(LJ5HJrExPiH&e{i_ z`to_PcV8i(-1frVj1seO5bYY=;%FVQ7_=($15EI}XorMe?Zgg!A~|=;6zD zDBRSQS1jA16AjVtT@Rfzqx@*62EQ>63Yc2tr=}CUpVN{l>-;QKG(H2h^2#hEOv}G` z%@}nKTU=o%WLC{cx?dIqWDS2r*`f@=E(Dx zudMo(u9}!obiPxZn+kxXk!3r6^qo*q^qT)vPgrmd&i5PVr?zn^)jN*Lg&D>-Ze9QQ z#?8-tk}CZLtBI#$wBd*po<=$u?v1&aUP2pcH}vc~vJiVKmv3!Ie)}Mqc6NO@yZCh1~0xdv1b}8<(HgC zN1jj~K9X(nw_vmM)I~gv`tzqqDdqJxMS(CJ;H8x>~nd9kQ z1RR64b(92#KyUEw&6%)*iHyv`xeb2|%KP?|24hbVkOV53VBA9%P1UYoVQyhuC4f|J zttPo@;7Ok3rU?~(`1SycPk;+1syTc|qd9EbOmyc@;eRhyhdYfx=m4`%0Lfrw*01PM z`sls%Ni>D}*vRAK<~!P7QaWWm(5ip!}X<$zm2|$Gn728@ZTbznGkUJ zZx4s|IpFN@uo_T=jfmSM{5$YMvr7&*n+MZy7O8G~eAwQH7n&VA;A|cW4>+Kiy z96o}xK8cN2A#?ZwpGp<2W2X&`NeVP4qsY1FBXY*_IlbFoLf-lKmW{(F=|2bar|ha} z=1||xs!MF|3`hI#h9GywdM>-Oq^FTZiGo`D1MpZFNSC54-Y=MljQqmR;ihEbP5G~L zv$=70tpA0632zuRu{Lp@SX5;cGd*m9mv~1$_rWMG0t`dt-?-D}uPMy0c-#5>+qQgw zn5i$xwIOc|xLAPag2yC*_;ehfxIaSjg+bXt!@TGN$b_LFvTeBNeq!5by5%PNB~nQu z>|J>e{2lyTWn@eY*SCv9oF}L5z?F(Un1wyKj$Zwzesmpv29)J1op$g%;52M=BCdE*G??p3Fn@t|AybRa*!1n}Q}VyroLl9Tsk0P>zKc)vV=u$6gx9Der}qV?lYYtr=f`bwNJwuLl1YRlcm?{W{*8ZX!Bjmo|tt zVvjIv_(x@ZDV=i&U2mVz2 z~sO_ax(G$7pDCM?_++Q%)LJPud^*kPJ{jz3Ua>u7a#pks+z+6Wup%z zT&#eY%cMPdXOmZ3hd8QV#5j;;a3I=uhkojqf??sAYhf8Hnbpb`u~=PF4fPgiT&sot zJg`9E6zYfTZ;u}Ay( zt}MX!7KT|NzPFIwUJExbQt3_ zus(urVls8(AAp`&!d7Dcxd68{z6$?xos%`VMEjXfc;q&xIh@z|(MbRK%MFKOkyF<# zRU;tyMvapKmfXnvlI!vzMf-09$jJQy6YVF~Bmm2cqJ1CmU6G>D97b~k{ISEv>O*ya z>vYo`<b7wfop3l5cNW^wwvRPM&)sc=)}s7GP20kKE~ej}^Aq+;Hq zLy(CLx{QB6*ysL-5EuD>_WY7PJk;VAX`!~0VigykF?FZ&cy>m}dUAaIzYUNAqvs`? zQSO*5*EAf)E<%|+rd5q@$AB;YN`5ShEgZq?E`8sr^(!9&yI2|63CqvgG;j9(5)kOa zIt`YCLE7tlCZ_w~gZ(muNWy#eZU7&wLmEHTAE%Vf@ioN^8I%^uw;$^*!!e2BP|w<) zhi;~X_j$1LGxWTSo{Bx~j5F`o5S-ikP&@UC4&6{&JD9JtaZqJ*bE;?%nENvxU2e@` zQ~uh0dfqXM-=JXue?8Oz7`yKUfN0-iBFpO!_3Eumac}+HJx(Y_|6^73di?LWL4>#c z+aQS1{?o^~C+Y~Fzm5FhrWmU|Hn}z{14Feadedb0(lC2&Ps1Y>;^Q6*G+bDHS!o29M=#r=Zd2gY^Lly|DY> z_gei%`(C81vxdseYKzn?w755~J6Sezkh6-I38l{V?2-_K^hz0B!czp+cwM+rM0JLG zp4QV0o|HWspDe0x_j1h9(6$V^A2#w06%^g6omf)dW5CkK+KrcfjR0?q?Yg1a!2q+rYGvFY3H%rP2Psl2bdJ z5#~y5WguU|R);9@YVQe&T*J}+D7g@T3G)@w{fjRko`8(>U^_pRc93eR-$|;azwAX? zMuxq^n z%BZ5mdv;&~i~*!dXdY3mG{c)Yhqt8v6=I3IEnOoD|Kwk0>WtixHdCigZ{>$gtBAwo z2giEfmEnf`6Hv{7TfJ;lmpux91$QWb)nyR$tSED@TY9Do7IB43ScYCx!tmMN0oZ3)F zsy3uZ)rJOD(%PzlDr1kFF@$wybke$NT~3Pd%R_T6t*I$bpC{?2*_a zxAmG&JqNI@^jcex#OLI_%NXT8mG(hfaL>4;oH{tC}}t%I5tu z%=(tij)=PuJ4?1DT)QE9wJc8Vl9KG1#kH-GXy!&9bNBE^^8X-rP6^gm{EkBGZwamF zitClI8$Y-+JZ0UrAwSOyGMrAv-7|#;cTOPF^n5OXA|{>5HTc4$eXbU;Yo|}(l%>0` zdr3GuqZoTzc6vB7SW^4AQ+#nnX4NF{x;V+WW_UjU9i>Q|hls9PpIIHz*$3_U8Z~_C zn#`_nv`?ozGrK~}I-hQhMf;AV@1raJ*hEbPUPZ;x$)pz1{T-%tjO$|Kpf0n z#XWPlmQgKkq%{|gwdOar$>G5dCQR|v8b23cFB~I`pKHS42VruBLQ6_Q$C|sA^XtLh z#lB>6RAU|t(aK{8?%@l`ocS8+Rd+z7_GB)+- z)!!5rNXa5^dLD~@KJNzmBe4+ZGbmy0RSYh4l-k&$gK^oeZ7Nx`pHUqHeWHq}5qqqs zI#Ik9E8O=|G?j&{LmK;%y`bc*;-K4|#o6l9qy4QA6{-D3wEyG$VjSxfubJV`8Zcux zfquD|0V!QG*}sinDSkFPpnB21cbCnqc*`i(MZ^Gl<< zIoTFkyM`H{sCF&o+b=GueKVSwqAWV}h@A+O`4C1b8GI!s{1BrIV(+5g+xubfV#wMn z3WG6C8orYjB45mSerKf>%IEw7Ico(?m{fvBf=7Zzf~Sd8f+y`Dy9R--N#Fv~%<4|N z#Ol{Xb49eVEx9zbu6Ob12`nS&o2o~87wU zna#LIf&VHfaIgw=Qoz^`T4-TcbVUcTQeb@eu@fDz5!MG0Ylo$KuYQp3ea0T+iuNfy zAc9#EZg6BmHarh<4M(pzO}yy)@?2tncSCL6@l+9dhV@IGp++j&m)2L^ti_ZMEgB4C zH-`*kH(h*L?K2n4;l0lLJ*zQ}=69J@82QwXi&PdBgm=}po9?x5l&enq>(}jbH#IB_ zt*u=Zz2>X-O@#@7P-z1oRNDXuH6{Q;i#_x&QaENLb;FBd`h}!o`ZQ_8J8EUY7#i}~ zHLuugD4_9w|IV`M$L}y>NF!e0q^b#AwZM_en65E2-+{G`>)eDYfe^)0dYpkxa;nO%AzPI#f=G5JF1u;R=b&7;v3PUq$5GN-&BUD5Ob zCogvmz8EG7QRci`OvhBkE4SxPRP7iH~8M9f{%P?8qK_TQa<-+?QqWzvhiOb z2r4q8T)TZMy^tB5kp3cXTHGkE;#at*hPh3YV8D+?`%e;{I1m-%zRmHn{#|5OgED?V z5%f+K%&aQT3`{7%d3FI>LKw8i(3)+~viJs=%^p?dJsClZt~fWGJ#}JE$0eyCvuXm% z!~ci0vw@GQxcdKwY+%vVU39BKu||zH)M$yNPf3mK0tu#q8U+;(M7Fd5EQhI`523oK^;GN4BmFdB+eSw5aE=FKf0u{vzct2&B4az5|* zLY{sO;69$>@bl}Q#fa>grhipEcjpi+0Xn^6ECC8AbcrmPMVTlzV`-gEL(NeAxq}mL ztqqylDlsg54x`ZJL)_@&Dz50MO|R{pc)Wwx)F+Y4zk&~sEzULum$Qlf+0@fEwO7OH zpP9N3sV);0?_w{0aM6cbGSl|ig-Iu7nw3rWVc~qRu|93@RZSm`+>*JxXwz%XmQCK! zHEjnPsF1z%Y&;gI3}v1bVJ7Hm`l@0B;xq3ZCDosEcBa#~7fp4PSOPjL-1Dr{)w7O& z|Abq`cMZ@1DIf?sVEZ5GfTO$V00_soAF%kJL`~-OgXW%#kzNVUvQ))VybHX-7Mu^A zO&fcdDtBWHH)j$pnQ+7I9pMdIZhBy*NQ{Fl>V}s!+R!5*ZBj#-(OMY|15FqsZ1SZh zmVSjdzT<@9T*Q#kMcqzrJ%*ERl+@VK7Gn;zON%9Vh8RXCzQupdL7CX{$&8-yy`8TO zaymP_!Kv43;15IBI6E*F@vbIC^(Rd$D814goR-dvv(>S*e_!<&q^Kj2AZknpu2ct( z?97}gV_hA17)>{JZt5BOV%q@}QR6r3KsD=(NbwnASjfVk5IS1&GzWBOL@~%iv}nCU zHF4I%Gpny00FvMYK$AUNWESYTOPjE zOd*}rIcC#qOe42y8Ud+ehCZ3vr4vY_uNd5OgtBDncc}%N-eMjdlbKqinYK;y_!tsi zu`Sg-$oQ%bAj*%w13BD;@$$wT>b(je$+BoLYQwq`^=_7fFg|}egF`xBD5>6XMbpuI zXsZinCD!K4Lte>Inm+;k|Iyi94;of>G4+;bmsqV@nc&W9Uk=KOj{pfgqr0=SZQwo_ z9Ba{wc>AvNr}P0v)AoW4KU0QnYvTpVa`bPgl_}9%f9?$L{H)mw+phOB?0fVH-oMRz z3cFJ?f1_gV^S8VGB^`o$gGi44(Z@f2=H$!+Q_EmIzew`yJWHKU4Suv=L~r8n>wS&$ zMf9lj#HqCr@65+P>#csjX^WDbLo%v2RERx|J^z8X02J482hiWrJ@Oa=q}EEZi&7$} z3n%xQIKw+tccoe$TSla@u2Gh5YD@X{Ir;MRYFkNPWk;7huhjGwfy)XbPy5(ohWAC z&L(f{Lw1$6g*fA+HkN*0ucrf1DO!ewr~H^LDmLem~f%JZ50e3CJM?zzs9(lX&KeT9~o{>%G{Z6i0Ku@_@X<*#y!O?6 zqB7bOOroRx5uUB=#5%|-hzjH_so)!3t(B)HT=!1etgYS+)Y!7Jt%OJBL0ym*YfbYW zz!yvJfS^%_Bs2GX0DLwLm1^@xd^ReGnPU=YlI4im5dKw{e`a(UUnQ@*#8kyah^sX; zv>^#mj6{9Xl~T1uIGIUO>m^E?GHD@&Cj^6*v9x~v+G&s=bS*bpI#3y=-h`s)6?aI6JY1xdmW()aV%j#g$8cHM0#KwtKtfHOEO-WDUv_+E)1^kSi zS<1ppX7gWp6Z5h_nr1&lp9mD3%l0{611%cP7QV|sQ05FFSGjXym`8;!Sdqr!#HhJ$ z$%twGa6Z+i-Kd4UU)ufF9+2<8Mz^%P`6UZmfF|3)4tV)ylL#{)zU*8m+f6ml*ZSDm zNHfjH?1!)la2KBiR6L`&sMLtv?Yk=%&P4e<5=5`AE|NKI?!2 zz-)t>@d!$6|6+m6gBuPPmES~`)Jna>aNZiYBO*8>rTBCyiuZJRARjh zC^UmiDCL1tW&{tEGG#n!oC)Qrb+rQ6j6&=Sgs{hbgqcDqYDj*jf|BCi*U-5b!zeek zof_RGZ}7_(T^~{A8hG3#f<>fAT&bIiGwZ16&ASzShTsmD?;_e1{o?Huy{{dy@$%;W zJJ4UZDU){>8N3f3vCD=6dBLISk0Mx@{(=0dWR%#^w^y0rAcU6zP) zW0heM84BqmSf9>~fY#}3Wu%`2%JdWME+9O*ke^uHhCiYtnhEWvk@$<;8)Mo>=F`}c21CizNZTDH$4 z)Jf`~o2ZSaId;u=aex}a;ZvE<^3zDdyI`5srapBYPXw^FJl%O=8Hr5=tAW6UyWmXt zbZlz>mI*%|k|yG9xt*zgioAT)bH9Xs=glXl&?PSz42>C zQuyKOo3}%kjr%y}*|l&Lp(0=4HT>Cms%LW{{LqcKTy!Ih*ISaxA@_m)NypvMDrxtxxl^y7+2zos$!CA(rkj-=Ej_ zkNK{>^hfo*Wu+NWG`r@JIN=os@}mx6tdBsH&@^E>j#8xwx^TQuE-ePsLIRj>FVkyA5(uZnN^@xBU1jyIW-+=JOrbX^2P(% z@on6j*9w!aafmbRAr5p%qrjau%xAt?#m%=_c^Q(I6}&Npl&`8hef75=U}cS2l8w65 zfY%W8Q|pp;mm()GqY|yuecO#M3B>G=K}>6habs*iZk6zfINMsy5-ylKqWFK*loVi_-JUK8)q5yr&Hshs&_`N zbN=Rr!)$g;QL%!VXVQPx>S=4NH?Q4vOp*kX`~(dq7IOFI{2W>xj8Rg&XKtPz!SA=s z2{|Jqa{^s=#ta$Ad5+N@#J#hAfx6&Wr}GL~wH;lx6Sn9bq4fvdIFV`u1H|Dy%lrIw z%{0cBbCuwvdq0zRiq0k}b1FqgYF7=TlF89ztHT%5b@EhZdwCI-IU}y5rlc+U4u7I8rOgPam&^6@BF$DinOf5G&9RF4dFyuXZ+rb;JfYRWU0 zl^OE+1yUPeGO-hBVmykPHqkNKO4(Q-aWBX=B`lxEu?<^hvteOW%HgJDeCW zJ+76|_a=M*FRYP-?0x!d}K3AjVsHu&e{|PNB*OyQM`GVsvmmFlYZ9 zL6uWGe()T4CtO4PH2k>ccG8sk@odcHsQ6>Iurc{u+?4yQ3@cdPbvXz;CDfvQl;i8USBE zae^6tzPcw08$ye70vnT4%D>sTEDc3SHg379l&H5FtJ2Rkorp76>G(8;(ebrSDgR2W zRilkc0RVp0O-`+yjWiT! z;>uoT>3b}5pRfc?%%lME^BDoge)EUVus7%nkk=xBvai66eEEi)dkEXlz{G++9 z`kd)}6a>5LbKWR`;1^4P;LW>zeU8tcaQ5OdyNgf3pZ8}hduz}vx4Q~=-EGAH$}$tGxX!=tAvr)DBcKZONq-oHIvk+sv|vpCz}=nIeYie{`kH?r7H9JGC4E_Nzo6{M>aD7b-e^3L zt6Djx1g|vR09#Yz-?k)?Q|}&v7?0pYbzBFI<|Jc3*^X;4VciJ~sX(`CBM4W8|tt*ZAQ&0wA<#hV#C@bYPs+gFv6y{zse?WAq9;G9y8|HI(mth0_TB z5FCwb^n6!IY{=e*>rE?Plre5c1KX&Ul_B-LdwkEMfpgyIS5Q92yATSMy%g(b8O8PrcuxUd%4Imapj@ zcl=bTXd5zn$?qx8pg%pIVQh*yv0i2W z2yD@+^bZ2&J+FV}E!TAcyV{n4T~+*6%-fEameoeB;!bRMWCZzF9>EWFXpJAe#TJ+w z`Y%zCQ9Ic!)mZH&2149(ROVmru!2qH06;ul0K`;fxZTgNV}J~=7i9R7GR*NatQ#Q1 zYXup0qAc;o`Wf0<`p3&Z3Nk#d3~@ih_Xo)E_ks*dmEo1!ZKIO|WO%b6!v)H4pPwNy zK!!I8G90H2SCe74^=j(v@<6ku4Ms+8?qiauXDhMNF(FMvz+tbAT2il}G=+Mmu*l^e*9}xs z*_~20{iO>1fpV+Uzi4Xwi2*QrXo2Li{U>1b=->2_kAY7r+j3y6Xqk&dyf1p2bJynh zw_!~TwsNf0G2?yBIw@cR!7JwMM|$mj!jgM(>VIER*_C=o@(!-$KHuBkAH)Qp*){wD zpgI&e_BzA$6}QJsI6Ishv!HTd_1Zp?XM8ot5OAY%tGnPBcn(xugKZqxl+%>ynz(rC z@TYvl&E&~>8`6_@N_f5*`dFVOnKX8-0CPIVlyzQ)?F9SV;7SF@-?WV&I9+|sQ*1+k z&g2>OrXa?MdT_JQRx_QplX~8^lCtZ#0Nc27y`r2uxsQ!K zTw8wZ<_>!acO}* z6MB0?p(|?S&EZv*HX#Ac58YXeDtj2|CB5EaDt9a>jy;H%S~m++pO-!PHYp6uyR{E; z67s1g=YFHTxb|wK0Gg1X^G2i6!d453+M}Y_wRiAq49T**fa=lGnv-vgNn1=QWe{@$ zYLQ>+3Sw(w53ld^jFdN9eLo5HF07xgIRzKxgz+7in?G({hy+fVX2qcOpS$pBsv{ed z+XlUXjCQ&a7`x3U;>_GDFPYiT>{K<{D8Z-G*^5EQ{4S$%_tElDc?&sqL(2ibW*Rm8 zM-4M7^TQ?cT^{nzMZjfbB?aj^wF1lth}VB&MwjCE7+o9lEdp{8Z7om9(PCUu8Q3lU zKT1PKubvX6h6YLnMd;@+LnldtYNQ}FUPVmti;zvUikQZeYsBMZ^ZtgRle&SzvQKE` zoLgTwOHF%&{(lsOavy$=z1Q=SX=_||7b#J;PL+siQ`|!_Gd%_TMR89KH=k@((ecc9 ziGYcBg$fy1*mg+;A|NXSji&>wtwzs5?pyVu(wZKGHUitz>{kT|=h?(DXsG)WD_}Lo z+@HiDWbCL*vd_NV+l#@Poi41t-Rdi+!4T&H@oYEM0fsbM9%U@S8p(=4wu)an%wnwv znGZ$>7Hi#3z)EP=xIZ%4)%ED7~l}@8L>h zt}%?Yt|wRCpyfL%V-go98G{y3n=rm>k9MV<1dY-xONAO(vydY0-8I=-w3zXoQo+SW zo4G=X5m#fiosNm{+X*@N#aIvEM$eTnodIIKA72P!nz^(o)_R)|+ktaigCJdh6l*<; zxV$Zl29R%}6H6b+5ZJAbMq?Bsbs(6_*Kq)Kz=wXHSt5LOrKD^rvWY4fFk$ZuI48Yt zB=T?bF6gpnkjhu?`ntJe3z8kqdob_<>y#fZ9C*-8XMXCtkg4^Fv+tn$2KvkFPTFbo zu`Mf&8kVEt8a7tb>;rQfHt>P+w8CGO_@5T!KgH7MWD4dli&|mh3QL^bsSb4ye{{GJ zoh)L)UdJy#>%|=~BjzZh$DJk?z1CeK`xrp4bQ0xW^z=fD8PHZ~tm$*}rP8#W1{<-4 zGuHzPeyo>hiOp1UySqd~K~!!pBe5%&{y|bd9Rod%pT3h$Sm2^X2p7_}~?SlO@~@lFtHaMuG9w3ogBD1&ui`b+|`<*2LVdnlGZ(R{O= z(`vsh(IA$>PrBZmt=A1}lw1QpKX%12lyDHSvE@rtih|aB($r3tH%XKqs>?`|aYepu zQ_7Fd+@l=`A)tg*xsm#$xT6NNh}w)>hO|2H-=~@}i%#+ASh_^8+;b-d;QeW+Z+hme z@du%%X}{5p7rL%tH&5UrbLbk)cc?EL+$9FY=Nc!tsdZEj`=tlj8!#I#8q>eSCNyJ~ zoq(1YW&6l-0ZF-9_`zJnwx_WO_cesZKSh9}#v6M)qhGZo?=L*>LwN$eES?*&gimRa zo`vrP`j5WL^K0_y{j{JteLl&}1;`>-3w+p{Oj0vp0Mv=R`%I$hx$M74Zu>!)7d8(B zn|U)aX=;zo;**|K;<`bqpPpj1xJUc6|4mW^`UYlk$ZypAxe;#>8-rLO9^dp;uXj7P zq;`YItOooA@|`G^2#*18{z}EHjH?(+qJV}0hQPxGMrdzd!w?vCW8C-0+APN9-eSC+ zBMchxZ&mp%mXs1aG$eH|o>t;fngwC|%XRg%_qzo&malM;AwHsVV|rir9zz}+f|6x0 z=DdcX*q#v6mMEcBi9`w6l1Y>(yRG2|OzBY9ZBy(^ z#p^H-<=Yx;(sY=RHPvAmUBQAF6r$HZ%wUhHhj@vA5sp3PXg0)WQR#=`Xs~$ z4(kye=RM+;wwMM_&o@}@QiHX2P=jajEW0fkG`KcsaDC9=NkM~auIt<2S!@T19f*_j zj1)BZCN=ma6f)T|$&Ob4Vda%dD2*gQ=!8MWzGDB%`8JZ0c|(mDC)y#ratH-{CE1%OaDiQ5>7cCY}M1T36}Yu-vHc zMvN0a=D)p&>RBr-;}Kh)F293k>pN|=<%h=7UlLyGj07gNS=Cl^Lv(JwTYU=ftT>1a zPM7@K2#u>}Dy}>ir}h2nMT#4di(9I=I~8|$E^dS3o>ttExwu}%eW18wa&cqe|d<3v)b27sO#KX+XQF(_RSh-WZMn)SF*GgyrtmQt2`L<_2%+JL$P!x*=+T3{aj}Uaq|E;gqM0=2+2fyDUhv{32!#P=uICu86dXP{!)`wD z#8U1ft{K^hv&@O5vGi+H3L({V55pjylbmsaw?Vf!X%diE)zNZ8P~e{yzFNlZDfC46 zur%`lB>2%)hMkrXr|}e;-!+=)icqQFrf@1h6VeP7E;hdBzR~LYU}!LmwO+~Z3~N); zq*)hG&#Q}#>?vtoU}}l1@9KFKrAbTc-lRj?rXS0O#R889>U=ZIeu(sCQ(?7Jz|FMQ zt?o66#&58iJu3ZNK<>z zB)m6Zu0~aof_MzjGn@jI1tY@zcKzJlW&(;mrykoew{u z@WJ`;V+!w`4?m#rCprGte!Idw`S22jx8}pm3O|(#ix74Ek(;q&*Br^&yARh-Jk!xj63cGum=3ExzyX20FID0@ZPKC8ic;|2yE(no5o zICEh1pe=W=+T|0Qsx-YqXl?&bFUkBdI*Es<7G72+NQcuW532TdPew74W4gw@A{ z+k&wAn6Rc$WjB3HShBhatB(mU4Z`YU!ZIc>-_^&2ZwbQcW5UaVu=<#=WE+!SeN6by zAgn$nd~Xm|9}~Vm2(Pr^hl21uHoPhb|I&s#g0O4D>w@rAHoQIvUt+>}c~k~pGOCz_ zyC$l ze4f(+m?G#?Lf$E;M;w+_(nqJ(HPH6m?RzzzYnk4r&~puLY8{2SOJ?wk`-tidj){m} z*F#~l*nXWSjnmKx`#UP$mpKCpG>S9RInUfg{$jot{l@e^k?&;sCSQap&h);3cQjwH zUh@qCz>d^+X3A`VSoHaiL{fFX)8)&1RNen{c@ zVF&hJkYih4qzpCxqW8cN1H;d|ZnwOj z?3VW*m*QCGI)i_^zIzEwq4)Sek6X%j>2YuQr#xC7Gv)wIn19Si1`EZ~$0H>8>aeEM zjUhtQB~qLDirK~nH(kDilnnZWCJ0H3AS)1-}n|MP4}9j z8-Lrgudh$(`MrTRlP>SDCB=D|67@8Vw`v(*+Yx|4RgoshWr;^JaxYVAZDK4n1@X$o zv<;5W$S%Erru&H)gS=`!Fk>rSuBm|6D6yIac#UTk7=}V6U!4bG*`|v&#ApLSxndXk zwapq|mz$$LrI*`-;(u0@t&A)Qa@aDhEFGws_H56XMx$+-l-hMcY~f(Wa?8pVbqYcDp`r^jyX;Qkb5_f$s=h{N7b>62WF+W2S%liyeJu{8Vs@5;VGJNF5maj6HEuMrgIe=JY zklP*;3bB&3dt2c>wP+#mf-l9)}7&Sajn*cQ=E@Fv+=fw^HEo_ zxTrH5=}Lx6+Ukp(k1}(Iw$C{?a0>ukZQ zZoPdKCwSVv#=YaH&T<)gSi@i3M$)0-HhC7a*LUd!|4XjyhioY-yWPI3>{a$P?)^>c z*8hyJx^|Em7HnB>#HTiI8Ct7z2?mbTOO&72l5>KNJ0mDU}j z+Q!DRZ+~JKpRW&b*8Alyc^k}hXOjD7kB|@*tT!_dnnuVzYC6@wgvJOeo=tp{gPuhE zs?qYRA(_+mfn|LImIZqX!;?zjO@nz3fj32n8(IvnIu2en3SKpeR?OBemf4N+{T&qT z!k1p_`!E_htA#pMH+DLv?&+%AM#DZ@iRB#A20716^WMe(Ntj6epFH zu4GALS90)$UCAN5M|dB4Oji-6LSMm_jfAInzE|!MpL&JiH7>zK7`o>u6 z>9nY57hPFSS5C_AV8_I+hvigj2FScHI}^KR=?fYE*_YHuW<4ESZp~hNewiJ^7pZ(z zL(lE8<;~@dMm-3g;u{zCzt{K`2rgJ#G+)U2wwohi%5d)h8OjPWOjL#&{S0jbWDrRQ zH5{Z27y22(17!FU12V{vMVaD__A`tcAj1;{8QPVh*v~L+fDG>xWLT&S&v8}2Mfl&= z2{0Weo96yxbQvV{M6B)m%psW{b0O?eVlUpEUMO^Y>S@SsPMMohq7#q|=EW9%i*%`V zcAGhncV{s|N7(J7j@PyI+W2&EU>s9AW%douR_HLaITj7-qdP3v0BLDF70w}qfnUlH ztBlokifBHfSoivOkkLW3a$l{Y0C=}eoXpAp;-@S2*+VFBXF z89uI!6$(}D^L>UWI!59~_)W_#j&3PvqUC9|K)J_C&)f2IE6&SGT4f_^nBiZ9rSGLgU~uGOtZJ7m)Z1!cCZ$yLStIZ$7Ou%GF#k5O0$DBl%d^7Q%3r$B{tJp zWZG@V?i`x#y|M=UOq7DUQWL=j)j^+B*hWpF1|z*qZji;QrbFZfI>GzW8;13x&teZ3 zTm=b{RF7}F`3RBulaxh=RkXB^;!P3!x{E6bXkjk_mN7QTZBxS(^QvOTCMbWDlhB^1 zF6tfQ-Ey5lusVN~+oJ5g0OHNL(x}@g954kOYe)mRlQT!N6^3L(!B^x{QO$uUb z6{|`#0;pCWMPp-g=j`5l7vv~fc+w0pw17`7@H8;|PeP0z>yyTUF@!k$!%kGW%nBTw4m#@+5J^B*n zFr3FO^xsk;`*a@-e_2EcxMJ(&n%7-kFLa-+Ce+=cQLR7G5{bRU3lwxPRY4~e`GI$c z6rw&&y^0c)0aRfJUG@pV#nMJoirItG*aD<;@Ipuy#qTj?{iV-P&=8nmaBM9hGz7F9 zN_a=%*3gVqc{SmxJ)e=pTK|N&M#1q*2H^CU!Z zyVJ;n;}3U&SUBO3rc@KRc~EeUqKW%cL58%JCUms*suewvh&yQ!(8p-k=)f z{DsurCf>x5-&KAMMA2Gt&~J6`&}DqRR9{W{lyT{^R!Q^8u6dqhn1&N0PeQdh&p#zw ze0xHxU!MfOgzn!JB{W44{oxQzqf)(LjtE;-`+r|e?Y>TL z?W+dPK8IpYWxi2SFT4yRuv$r{8$MkbYt@1e>W~}|Ho8fFhqC571Iq^oL<^>O(R^N`aNI%fuLamBQ+Fu)`5V;okX7tj z`5|>>L#XlFW>>6bg}GPvfZ4D%%S+l@t??)X{G#F?~~D=264h`8gW_=vjW zrT2*E{UwY+)i}-bywD23d?$3HRCfyR0 zI9|$~d{HOU4lO%zcgekccIJki26Ue@x{WCjF`=E~!rV5wLU~;o2W6HR6CrXA>K;Es zDN?>0>>Pj2fFvu`yW_>H&@Y}Pmo2wPs5)YcKJKdvo#A-&s zjM~qn+X72#Em)W@?(jr$BkXP%I5Omu%W)Aoz)@Gz3IotCuZc;A)el^Z zabs!}Uq#wPnzFW<7B&kulK(n$9Lsap9kFPWh9I2LG-F9+w;!VMpb5!{G?B~#8GI3ky}Cx?JB@ogS<|wy zcNx5yuEUb7p(H?7R^uV8+(`m*UzVsM`bLt>UY%iJbW17XfEM~`$g zLyiZ=q?k;L8tb_{>ku8Y_?oaM?L2g=`(1Rmkn#6`t=!yDQ+3LBxwV)E2ab5X*({?? zIZf?qKB7yo0qZ^gGNbu7VykvtTKD}hGi>-B*J!5p_=)m1#AHvvX>IF%mMo zX<5g_E=T)<{2V&2!=^K z1%qTc!Jvh9!rQO_WEvFb?^E>84^WeT*oL~=&|&%Ks;JHoN&)_#{I^*JYQZeTL3!F6 z!FeKWuF+Bu^&#vKJCHtRQmKwfG6V8;tFcz&uUI*lH%UAN4bD)CX~w%F#TA9RlSVj+ zEk7%=b4`*Z_>!lI7r$!hBaPH)XUjI3{vbT`aRGnl(%x~8d{)K%Iu z9h6!>2v~4MAw%4xGkH3Nb*0P##KFZ3Et+!)QeUU)br)~edSqj4p^ReO@zdOfN>&kv zwI`X6QtL%qVRw-7eDeYc^-aMUk(_eqZ0d5aYLN5Km7*%2I@I;)5;23EJ=Jc&PdC8l zoLy)XfaN3wB;C^z@>aU!es%L{WsY@CwnW>D?rFLh`HKejWK@9Na5~6U#?#7au}O+( z!O<0?aso4VL7RE7;@nwzV#u^2Oc-QZ2CX@5p2?~C#@@t-`L{&WT@(}8FnTk;aK|jDw4ZZ zlJT9%Fv7=8whD-Zr9D?VGp;m0?bf8Jrb!z1Cade8?FxHoP8$K?lvG3n0#^t|nwC~U zzovgkscMH$l#P4i&17W>!!OiyamMb~F$}_^7-9~+@U2s1q9zj=VsrY@w+jY^^rN|* zbnO-|qAci3YPiMrHO{N%R${sTv&GDhELH`VhO<^u`4O*4pjPzhz3yX6Tq!#bHIkL@ zcf-dNgAeO{b_R0BM2&x`zD1qvCIQ~v~r?m@)WXqpMIZF*Da`nf!?OU*LZ+Cd5S%kRXuKI z?38gc9b*kt{cLQZtHQ=l8E{bE_1*plWtAoQprTkBTXQa))U^*2%s6il;e04M;)D=5 zHG=ux>uK-DtT6|nbHLxQ;X{yEqZHeF7E|ChR*sQSkcMU1NQ1x8Vu3=B^ zq~s!Q#dzLHwJ7b9G{3R*ul(^)^_<%x9ggLwMI*b1KkuwG3GY!tgU>BoxAd|1^grou z(CKXP-bLpJ>=swsc0r+xR|D0sZbNS53}v69lZ@JG+5!tPq=XJ#^@r)Tj~3KEQ?;A@athyL-eJ-a)w^cenfTj+d~%1CVLwBi zatCuCBBhzzCY)rXH^uKEz1`hs_)B_|B&mTrou{O?89Wo-eo{s@TZd2dzUlC9UJI9^ z4%O#dR2V7tDB_7TR%-eN3QYQaiT4W^LFdGRzr6r1b-r?O#@gB_({yny9qIEMG5^~% zBKLWZb{qmw!Q3t>)b90}+U%BzX-&@HF5!)B&I9i^$N+!weB!CMuuc3r}HCp1kqN0j=?{W_80Y$ygoLOW|lB9Sj zSm=yDm?XZnlGZx%x@{#vVpmyM)yW<9RTI=Y`>MvkB<-w_GoUK- z)@1(y?kF$5aDXMp)%o7@ZWzasWBb|hU@9;phozx+@582$i0H?x6;bV$sx74=ILL+t zpxUz8CzP5Ah7%}mkA^&&uMm($CR#J9$EBVYCy;(R;YEO-{KoHb_7Ef`wPGNzR~O{5 z<2^f;RvbhtlwlyRSEm$Y_?0qbr`ikydG7jG9&GPYWoY*^JZD!Hdzd4fT2MocGA#5n z4CE$j?}7|_E5n(7hJhS$olubBMO4M!k$#4OoQeIUpbd8^!v|;CMh|3CvAiI|TxD46 zXUGmfO`Qc9PE>}Uk-^#z`R8w~jV$ZeWzZ4^6?cfFPz7H6Lj)(W{?V~CTiqh5G43Vi zNZ`l*2>JVXv+X`wRHdnjXLvc{d7dAO`HbY|Pq)%0~hN>PwnTbXtqP&4a!I#B~ z&~QAi+Pye{$crqC1BR|{{rnuJqYbbwbh%8*vW#E3RQE$2jC5i~p+CIeM127hGdmx{ zf6oj~rcN>y9GSKAEf5308ZcTbag<1AF((5@pI5pVHpHZlmQ! zVKm!Yi(ZzVG*frXwX?{f<4iXi<{;*%u6SyXZmc)Z4y5GiVdvF(oaWDTn3v9z;#quz z_tWhAY`xd%J$1+7AZLl07`lhP(D>cdu2A!Y*mcWj9L8Bwd%kSsTj{!dEkMLuC3PFv zGSY_Mp%qWitY*@TDEFRzRK^%h>$_7bR)5{58og-+{tWZ3?awvDpxw=^6rEJPBdETM zCNW^551y_WRa$!)ytmAJ(-j{6{AKy7 z_^bG;_^bG;_^YO8>FP8+mvTQ5?eg0=;|_TG1b~*IMZ}=D0`>*Uy-cuiQ=v@G0!Bc^JV)bEKV!}Zx zc`%^vXGp)4y%q&!2;bA3x!GywjklMUAFpt^9fVAgu3u6sJ`PvoAAvBwLF^17-yCAQTcJ|);5SkE-Q(6@F=>z zb-l0#A-L)CGTXV{$JgqEnQTb5h?Q2R&Tv(TQ@!swYr!Vrx+EY(?>>R@yH zQwI%2!)WYXxmeh1-P+Za)Z`ZN%s%B@2yup$I7k1(x= z9M2nlGegreM{9NTGUOdWgmHf0Uk&B7PA9qXW#F{V)TnvVl=`T~F zaZTa0%HyzcAmOwwT$E)wgosnE1;%O=j-9si^y3#HSAs%W*f0aK0YpH z7`nW#ewt6l&xd07EB0e^UOf~m=es6t&i{vEe;35&ynQHkdk~xR_o3KtfDco`4%K!D zP${-Ch}{PUw&DwZ>=!}3Nh=p1#u*4{Tc?GIMcZT@e)wke$If`k-RFTN}&B z!e3Xbv5A4U%1pSWyLFv?qvuW(fbd(mCK>f7x;^bAlt_6xe*meUR>(C%wAhdakVG=A zv&bTt3X*>RQN4@Xfq>0MeSk;+& zmAPwwssQKpsn?3g5f_!SSe8^B{Uh%J7cw`q&SF7>K;TQ$UfbyW`Dq~6fP+Fr0gq{x z{s<`{XFv0Q0)O>i4fww_ox!46RB`+n9Mo`fGBQ0sz2)cD-Rzr2IFdy!j^=e z=Bvu{zDME0i?eWg8G5y^l7#iDjS;4@hY_>b`h&4+dvdD$^*jbHzk{!){6V?$XOvOe zCM%{`XD(K+KuVRjipRj^NqjctJ+LW&SKKq3^2^gW^*N>d&R9;F-H0Z^>>pV1L_KN6 zlTiDAsdxWR;t7ROnh{U3^5mWw-ze{K;Wq{_c9Z z{3V4bkMXwMzKRjOVPE6k4J?4UgTZ?Q#N%&cG0NX39#O9|HUFGY_Ec$fWl!NB>Esiy zOL^#zSBZkkEJ*xkZuBTj!@aKnzuCe_#%^elB#`~g>fe%qo2O<{s!HzoWQejzgFCL703Rd zjcffEZ}7KdchYDCvXgynmuOG*A8(&ICbykN1`O`^U%>?AaGPNkgXd5Y0As~$hO`Nq`6W=Om;yPvemH@-hi@BX%cPGeX08^7V zkEl29S+yh9c92T$9p#F1MNd0+47=t6x9FuSvKv$?RH~^kh;usZXXPn5Lr2I`rd7+hJ6g9u9NsK%x zGW?wA$jI=i;d9qo{ZZ=eX2!x|3SiB5iyrq{>l=Ga*=;CylV#N}(kh*LnH0PJkEDrZ zZc|F)qy(1Yo!X7Fp(Nh8NgK~-2ZAZlVN8~M3t5EI=EOA+COYhG{Hj^%HURwyiV{(j z`pbb4TKXou6F4@(b)2e+T7G@7?mTQZ&Wp~o{v)c_$F4n# zktA)?^%NR3^o)etE}pqvP}u5}-d@Xf{_4_m$ZGA*1J z{SivAdJfjbLfps+@!@ACRM;7bk?V)Q$a95<%}Q7?VU&Ht2aP_-a%q63-F#^~!kRJ#6 z34j(MYS+|U!g(*)1F5+o`XRXkq{>G)?eRW6nvSs*Tj-&aG45sM?zv?YJ&82(OjeUE z0f$Du59;l|!yAGQPn=*nyulEG-{ISf6BD-rP{LJ(_T)OOpH|cwR zhl`B7`-T^GxZpb;@M8neU;To>Q}3~n9`HSZm}P6X91Htlp~MkF_8ooC#Ph^n(^ko(ga z>hY7yu<)sS-}xlH)jhAgY5&wGp=+Z4?Q*96tG|h@_ls5Qt9o(K^Y@X@41Xon8@gur zW0cxk#c7?QXNJAvG?h75bJ+r`D5H^a96-B)o8rT-P86RM-~XJ1b5b1OopTb+hh1|}(aG^)=V2~SZUA`L=AYNm^Z4S_N1-cT zEjqb$*m>5rIrVwyiuRFBrNgft(X*WSe=N#h#`=dzp3-bmyA6?xw=SwMbUCLVXsj7n-_3@h5{pg&0>};-jZsd-l9m76$Q0$(D zhdud{T?+}vw_k5(!uaC8!|c*LDSNk8paAo}mA5Ze^MM%S2CQ$yBbxWSX77<>X3!nD#!}9yg`peMw(&NO2p}Asi{9S5~*FKb9P`l zV?Q)bamSXnwCe=_bl2HisDktN@K5DxnOhlZy3EBir`zf3>^;;6MqBd5^iuQ6L-Y1+E~!4T?6M);IdVs*bigttJKKD>IYZ5W7m>jEV0nW^>6bddnx5WMmuc&4G_}eH*UA z^E-Fj=ihNkw5?<|Nw;P%AF-umE^pgl)w*ONwy*+>Z`-W@bd|)mk`}(|%jM-SzxvYG z+7$9k$_2yxlw1D!5}V+vttYH}K%-TbsyrBTRHw@auVwDsP%Ql^&F~{K?JY`I!+n_b z@F?2|=e?sBt1(2wZX32Tr@pk$odS^=_@!Buh66g`d-p5(9Jy>u?72w)kyK7c~#QbQ+@Beo;f~$IR^fiJ%S&;M2{pJ&)htd zq%e4Sl4$RiBN+hysKM6K$~!<5wEVD((K0+_y5;x@Q}IKSW&5I+I$OwZ>(rZ1S`3_e z=Us;J_zE{Al65{|LYV5dyvrzLF;z}?HsknWGu3r|Jb2`qYHq5DWkyigE7@(EV+*HJ%zPx{k3zBQ zrIlV0O48V^pszu1S;b|hu#sT8tSdRUXoWV@syeomEC!#>3-8}UKWh4)yQO5QVkCL8 zmuDSeFO zk}V~-kc9Mi+V~N~YyCr#GG1@CujRbnVqYtGU1nb^dA-BFj^foXVKlGz+SoC?ibhjj zi^HH;&SivZNnes({Aw(et!EvnAv7OvcfVLy7JB5D{KT$*mCWi;c>l>8IP%4~a5i>+ zawu_AWlgjrPbKw+N+u0`GM28>N(t2GDW!pq+xW55IdY@3{^xYwB>3gvY6kD+U)wFA zB`G|cI2%pEdB}SIMzB}n*tIC#PJ>lj z)v(@g`IHgRMeI81SIA$l0f_7w=RsQ+MR;o3_Gw6OS;YnNz&wdi)2cgT3-$qVDj?rh ze^jUmo799UvFml!M{Lm!e!1qmA(q-Kh19G31m)$1Kq2)*^@jQ-hU*sRdNU_v$C2-) z?3Slqe&XeKU+$zY>$Alm{N-%+pCCZ1lf{dHDBMlo!7-8vJ*qkafnc?QS{~)^A2hx$ zugXAiAST=)l7(6-jx=(m;zlSB&r<&xu2eW&{#Q%gk}D-53n>*mwUDUfnP9)(*hEB? zj|k54C0J+i7WS^>T#TwY?Ns;`7of0=ORdx8g-Ighw*y%*fey1$AXEp89 z)iOysl&X%@x@l`|pvVRQUMKm@HhJ`?wgLaZln`;IhHpt~;&Yh&3e%`$e~qf%qfxa$ zWfl`W)u>546W*aTigL9dY_`5^*%9wVwsKS-iOi)G-`|(|c^9y|`Ky)u$Qi@{Itn`*_%hgsaV@%EA?; zp4P6Z7edaT^d;3%~?!QUn{Mqd}nebmVN`^{4%5ne8HqNS%UQSy`8Vdhd!Ch z@h5GL*joRG9FcsER+l=uixDK$)TB_sQ_WTPX_`{^iBvTkZ6}!nmVQw7d2jYXh{xJ* zTP&wq)R>~wVl{=f)L|shHa^T{EtFn^I{qQ>se&_BKS{TSr~0GIK~;kGMq&vP?sMNeq_A+Bl<2o)D zK^#yBDMF5rBIF1uQE%SKY(^ql=p(yFYJr1|^Ua4F$fv6^qu8@~W+)GNXYv#en8i~E zu^nn{-2;xxfP(@el&NRf^pZ_n;U}igx{Lh^{*#`&|BJw7i}*JJ_55`jCT6ttk>3sV zPL8L%Ck|H%w0?15^EfXM@*#pPbOp8Yx<|dpKGLOjK}UgsHbOmPRMQ^=9%H z6I&n)O231up37Kyr09A{8pCdq5DD)|A~=?UBao0FMn}AKlVGiwG*79#bO+ufo^kI{ zp+2{lCDCY^vZw=c5{`QNP8%z_zSq9e6A993n{B&d=#}F&7)E|p`*7&@AM zdu<3FK3r?9BRX#MVUe|t223+g^^{mQMS63qP4c7x^?zqrD-QnLr*&VkV=hR+u~Hoc zRAvvCu$NoEc8zB$sVfpwjkQ+ssk>O+p53Zc$crq94E@taL$HhaSoD}7*c)>MOS5U} ze?+iRxG7EBp{C_!d0s`ZOKq$O_GbGkH2C6sKLmT~uPwnIj$lU-qrhF|$nm1L|CACl z2N~3k%D#disP=-7BI_>wp`!pnKn6o(_aULKc?Ssee7p{EZM+$;-QuF5tPI0Ib5%z+ zP0>01O?RzASJ*5k3VJSM=fpl)sJj$K>Lg^*lR%;q zcMS8asCU#vOztUM&%DW z->VSI+l+)_gJMlrQ+&p!T`x^n(+rYdKEMpO1~aPc9*U$3?V*VAX%B^?U%DENlDx$T z@$^Q7$~hme+Jhy~0mm@ha*lX{I}=&%ac&9E&StIC6k$~)4yf%Idpqyw+@z{bRGIThJg+Am9F{EerogEt4#!mMym{!~iN&`?Ywu%8p@;@}E}u(=Yrd$PB6+PnFp% z%(tfLKkI*`aZCZZ&e;#zcyuJH;=(_08SYL-g*$uSoA@J##CT-y4~2DKvNmX@q&^uE zTd4gA$bv)nc70h!wQBytBh30zv*swmkOud+m73O!0=y9_oo8;*{AGp1<+aMLnZi!n zqL?v+C0lCgnDADkj4``!m6Ylo1~{p8^=w)d+&@FwhExxS_@YYkd2ew@G0xPuGorj| zt9PCvq_`U!?H+5`xwE+&q_A*VSFim^J3b(H8d)pJ?<$c$q)e~jwm5ZsB(|_wQG556 zXI=te{I#Y(BqFvv!rG_v)lz3-7)42XQ$bvOsEsq*cz(KwALr)M`4K#sCJUKeD3(+N_esmD&n<_XOf`GW@!{@5s zi!B&SzM>u7#Ttsvcv%!P(((gLqbNT2)EVyNxZwhlR3{6;rf2U;n4T@8Y;{?=-(?l* zGQyQSOXUy5_G~>*2}Mb=d*5l*6k@0?7?^ei(3AG{x4OJ<3YDH=ale4O=!_1y(^7bD z4gFIf_esdRIR<6Fev~}&Zj!BF-&f8aG+u%h?w23{+P0`NXU`{C6JJmitx^c}-Uhk|3e(RZNt07WE=>b9WW!2fTktzjr$ zh6u%Vf^zDhwuZf&x7wr)akk(anD2X2^c3T@yU5AnDmc_uAC+g`DW-%7DfUr{w)(hH zluhkMw8MeDc6&l#03Q>uuLIZoI0~suo&}gR# zk%p!TrJe4l6;sHiJ(skBQU&=-P?kdle;sL+Ve|kQ zBv1q$R<8_8$N;0X{WXIA5hn|q{<7YX#?Wsy4(CKx>`!ZS16|`Bw=SIC>b&cG?CYAG z_ha{dgvM#8^Klm!QP%I{ybD5!L;JKBamgYg_f=$sNbtM2A_qn2)4}RV^_IE^PtNp7 zw5>kYHZ`8Yt&`(vZ&YG`T}jU(5thGyW%#xBE$F^GKaVY6-!wG!aU_;@Xdh^+lz7D` zHtNAC;KHFh)*rGb`(C=A>7stw_X!qPbCuopoK{`x<-Y7YG`^61fA8bsfPIT2S8eU0 z@neg+#~OK{d#vFKJ=^-%4~jZ84QVm1NsZ>sAZ}*S2BQ$Jj4dy&i8THYFZ1c`K<8c+ zaW9Foh^gq=3&nG#b%z>TejEr{Ee0|2S$eaamyq)j{aD`lYBB7x4Ao;4@k3=eN?Y8{FMEr8c3W2Q4gga#9C*H7pOKE;bE8glgEMV|28UEW zk^M+ZYr+n_b-~w&UiQZl=ho9~*y7$Y1uK4~Aep}jQ5*2E^qWbfB=jo%2QU-A&mYgr?K3w&oJAdsXVIuPcPQg|ZJC)LC@lON z^~qW*1qI_9ziN!}8j3Url_3P}3XE~s8Ql_NC=5x}h4x9Efz4D$6Hq-_(5?f`%WOw;M*XNPK(EU^UZv_%5+)AUOFDi{5eG%G3>IBBjM;W)Fv#QJ_nFZ@SueRMcR8y1BC6y25S+zm8*mw6<}BGUJ9e&S7U4czUL2qP6xR+)uFI zU7XTMbqr3e4Y$>Q9D8`tes>blR{x1R@l(03sQ=WwuoLx}dEsu9&v|L9$M^TAPV`2o zy7~nihD2|y-n;3KvD=@Yb2m|x#vphL#7uV&gkq0^$+)LRxWi>b(+O%<%6Czx_e?`c z_82%I=O0NQTYhRd1K-$G^-dQp2=P-EYS&g;R-W8M?rnZ|-ML$Lon*VKgJ|zGboAaW z2g4?>|B{}=SG|>OWnCq=gJZ8+_-aP znL9V(T#4amDOYWT?2^tITM-1 zt-ZmH=m|px9;p{oAR|>Mg2coj`yZ+MeM5f7%pGh9w$m4t=qE6q%Z0d=2v{r+=x#l&a*4PuO;>xsh#0 ztWMK|!kP<;xvRKyd*mXgZZAc?LM9t|(NG(+Iv3Nqy%dWYrMk5sE_2Lq9B2+77 zQd5iQY6?$vxYTFraIK3H_++PM-lVpc7Ts+bQ)c=4{qG_ir39GCSZA!GZ&Aln9#AA5 zYVH|kCaWZ2u|_y$*n8L##q|E@kePfpa<`@Lw(sX1@pUsXC8?|2LBo*xr%}Dgu-M8n zR^J}@uS*xhi8w(?@`UhB)zK&fz%w^@Z0l2X-0MJjWBuunuahaRJoRz0UCMCO(Bq&& zy2F`tL!9$^=y^d{`6Df~p8j%2+y3$~X7pL*KK^|996_M8y*cQjN!Fs-BP@sjB*Zhk zIS)~+b`4n)z#sR%B*2cNPWW%#2x!6hgJf$({X>ch%*fUs&66@JRo1~sWW@_~(ry16 z@8H+RiesW26V>#EmJ_zqq)=1TIeA2u!%4w@jS5}S2xO1U<;TAfk6KEBCr%B~Rl7mG zkqkb^iq&m2VnNgAMj#hSXFKSL-2O#yow|l@=9co`l2v0iJ%##ZBaXh+UuXvNpFzBF z3!1%JvrAn_atZq)g9t4q$Y@sZeS;su3_XQkCrn7{6++M35W_{GZbEd={e(!OKW3K} zw=V3S9Csq_$qA>P*HVYu#ZDgK)JL&mOc!abvcbFu-sPhukmN)TB}8mQ%| zp(UY8Lu(RG?U4wlb_g;=b|K&c1X5D3&)+H;w@Ie{oR1%-*;*#2dS`UG_XMQu4o=m@ zSq~%x=rj&ra9#8{&aOSy1jzR#ME6+}?DE$HyZ*;DL8bK*x;ArWNzZTS<@gjkTB6_E zZPXk_Q?$|{+Pm)4V)Xy}7wG>B^#S-jKpC*-8ls)7!Vfq!5@I|04@O&`HAI@;1%Lg{ zBj3nF;G?_$d1MDeCa=yt{jELM5Zy@;50jeJ@-n|!d2t$D*1`w6p;2PK+*|xV;@$?l zs^Z%JKOqMRdi0!X)KpWAZK_byHnh2IQldl>AeB_3phlod+i0;;jc@`eScB&Tvb#N+ zUKO>qD!2At+uGJw#MdUgB=}muH+-w8t?pw$5nDw?^Z$Hj_CDt%5cGHN{XaL)1848q zGi%nYS+mxfHEU*qxx}shTw+At)6695s-Cu|kht^1Y)Z59|54H88cIi39K!tnLGk10 z$C=b)brC8wg1P^buZ{d$b=a97ZrwnykD{TA=+}ebf<=xudOas{nCXVKkKIXOaJYPl zaJbckE-K(gj7|Op?n9klf_<@R7Ykv|D~2_sX2gbzhMPlP;Z0{-aNv=5&IZG>i^wCE zUEsiy6BgP#Lmmf)iR%i6q0nP#y#cTf$N#Z=1p6M(+N%~N9dY2U(2)nsfy$hZpyLAE zRPt?f_a~n0-{(f<5CYDQ3|_adH+U`R?mOIV^S_S*-l*no{fUYNE({xWA<-%r?2+m$r z#_;oRQD*$5P8!~KgW47I+jY48%_!|D6o7CQBzsY{Yg*JeS^|HhvpTV*lHM_fu$e*7 zJ4-$>Jy8M`#qy;-$z|z^iG8j~jsUYVay0N0=F)OA zKRM;J#49_^m1)oFPKGi!j}a$B${xQHw#V;q7>_KOi1+KaKhY+Y4btJl$TdHk()-8dYRk%=zvn7BuFi*qjad1KB?> zG!R_54-POuYy+YlC_{n!(?n_U3^@98AiUCn=!McVpwoc;GR)6J-trWl(Y`s@I|~cl z$>IFT#YdkQWAEFNi)pyKu!vX^23FpQvCo~RyPXQuNZRD3LUzVu8olR^o>M?aZyNLP zn2p{WiXzzLb)k?=tPA3b#;VoMsyU0? z<4RBpb)%n5czMx#UT}^paZWEztQj?ZwZ_L!hZrA!$Qd7R<9hMF6R|51&kj*Qe&Jw1 zJ){C7{Q@0B6!>FKfs_ht+6T$vuc!I?^Sy4JR8tX6>f}A=2?E$3PrSa<-Ajx;F>I(c zQJu!_Qp?zd+_AtrUt=bZ3}1GjieJf7%umGIMqm;TqbwVjxoj*n_q3OLJ$v={A47C5 zH*9iwE;^lanyYv`5Powf7pDrNRqN*#Y5qz#U&s(8kt|AIHGhjcrKD;VW@~jcalgt6 z4IDgqA4KnYxVvlEHzj(tO%Oqms*B}eY?Jc-TrMnDhn?+IH=^IFDN^Z7E=HU>3rnIa zKG7ES)D`sxpc{rsjjdD0#WKk*7_5x*RmIB!p1i;G^S0jTiY@M5sf+igh8TqEej}Xs zGS7wDm8;2{p;j>#frvCoX<>JgC|KZ5(nybZV^KPi5Qz-%Ka?IQ89T$MbhTf`Z*4IP zu-k*w9R00U2v@Mz($R`lsSdRP*yV1WX-6e>d(9)W?eOQX3OO^RyM$w2dhjkHzkI(>`3-YTtO++i%d2#Ls_YM`VwaAB1Xb<&KYD4cn1UK?Wx!W81-6<9 zGMzV#?g};YkN-q*>?c_R%3=2e^<#m1LIFRVnI9nwPcd(zvXMz>IpeJ)7;onR>o1y@0w((^i<*f?_XMq8G}f|ru&?5h4iWF#QRHw9u;xxw?^@|A&`&sfCE{s?%%#iOqCS~qHhJ0GDIaNe2a8ET?2e_vi@+o#| zgtCdolPu{bS<+3iq?=?(XL>JPLCui7T&+$Y4vpMneehapR2*U0{aKiw0{3SH{6yS& zrW&TM-c8#xy;Nqna!);#w0*LMe)tS6nBapRss-r_fFrT}<`6=4WsXp-d>f&f*vpFT zf@`gPH`os9$|*2H1y1%06c170uQ>&t!Fl2xK>_SRXYHv|QWg8_%GPRY7L<9*Ud-3& zac0$)Vu)3T!O%$ocS1?k>N#^zOh454b5AOA(OkciAe3y>vLY5cj8SUUy0dP~#`l%7 z4wriLp7<#t-rps#x%6zO;uCo*jdw(bMKtR@? zVXT`1ZhHXr@gDBh#4V=Aki zWy2C5a{>KYIvwh_a3b~Iww=-BFG%YNU1Hms=o@F6iv)0R(f{iLKmT^td!P%qx)50N z^>|C-kxMl5eJih{QMx;vny^@mC3fnjjA|bRIvV1-H-VoTBUN^FrL=f*Bn28Pus0Hq z)^rs0B{TNb$TvG;eZR}Oa2qRjsjy|qPQFuk1*Itu#Qv-BN;-oHH`daw5B{Z2sd zD@cU{N6`~mdPD6e5?dCXQ*XI@U(I6{ck9lMZCrgjDA`UR^70rEukCdAQ8ej?V*7=X z^+aWyP~vcS-v(zDY(K-hal5*K(@xcF#XQZxL}`Z4$0_xv?OWlzW1|y#DO;Jho~xJ2 ze#XaRV8HU|Qmqb?RL*F4lkT-*Vw)Lm-g|h$O#gf49K*?lU%QhQDOMu7P)xSMnJe-3cuj4&P-O+E%H{+N0@ z=wnKiYcTpZ&7X6g?dM|=sx)w>8h?yG#%B7pq0mijv;5l5BC;CytC6}$+6pnW!1^Gc z`Kfe(PXcepHgqBegKhkqyg{c5ICckvND`t;d*I}glR7U;yqPC3XnqGSd=yaWXEfT( zs^8ui+8wcU0|V2{hgHCeG>VXY2H8z70IedrKgG*4 zejkUU9)&%eXZ(YN_fc8bZf#*ZhI%)7GxHL6irLn7>0Uh6hTAH?!x5m^=H~n9P=NdE zGxy;nC0*ZNE4oCJH=%F1LWln2IvBOmk3KY;DI;Dz{#_F$RLQ)#yLXt$XeTsg0?s_# zPG}C7Be*wpLaDQZ5Q|iy=1ev0LxF(R{j3kSE8a4-L`>fclFT)@50>K^^VYxFaS|N2 zG4G(Nb*)=C&>U+$y5cD}xlA@9q?RmYKKluC4K8-$ovD<2*)n4_cF+H}?zdwqqH1@z z$%jlK3S40daCZn*xtBep+?3PW)77NpPb@K)DO4m@9Xt9F#&Nk@Q=l|HkCa8u^``-ZHVZcX|CxX1GB5JPT z!$_!xOxjf^(x(ma%SHST5o4O3aDCs4oVRB0yUXc``5K@@^XDio0H$5yPJme75Ik(> z+CFQBm8W-4Ile)Z4+lN$zM6NVE8aDvizpU|z$S$d#j(%ph@kN3^&+uzVzch4HD?TZ zFaaNni6zk*Q)Wf%?i?m4`8x(8#zx0Reo=yL{HCw5GZ===)V)gGy}G>-L`+`^3z%~U zeHzYDCTKR$8>OHenNR~$10R(l4mht8zTc?Ty=Fm^{wc+32`B>3~HT zhd6O1bX(dtb~MPyYAC%J`Fnz~vZ5q~3MWtjBDdOQRlp|iQZ+{BA8x|v zJCK@urSrXLQg^XgrGpg*83Gfna-eA6_G7DfPN1e8L8nl7k1;B8Wg2 z6nO6d%RZ(<3D_`VV{Gq`2Ci6AK^F^yzQ^T`N?~XZYwU;K5|;(UH>kd8$S^q ztvBOEp@Afq+nHMW>oj~&JTTL*0GoJeMb+HG=)}2&W9NqBKQ%72_z|4F6zw}S)1Rn` z{qV6JC^o7s=Hpwb6Al+K=dvO)yy~w6^3FNeL^>1HTDyTj ztq~MI8v*XG*=s`~%cyovdUhv5)U3gmUpFvvU{1~yc*ozg(rM0h>dfnR9&t8tEmZBZ zUTh%L`0x8}?}VW>Bnzr=h>fRl{P1RuNAuSwbXt>wKrx^cv`#GL&HB03>8*W1{-#+v%7*jClB&)Jotj-b4(9j9AMtVj=+(w-LI;)N|4hl! zml?&^rwBKIjtw-YkY8E#3bm0{U(Bzp`jX`}=Ncs!US4M(3YOQ~hsg2<`=D3>;p_nN z2XCQZR}+ZhC$VJnp;s)d{e&5|>W8t-~c(Z4w}-iYI$`Nzr4iW@OvM8y@Is=b~OibsX1l8!5!-oN?m zPV(Pm^V|5qociJ@BU|TpQcZbP&&R)%=o*G>DMGc&4%8A}WcnFE8d$#%&(;t8^}r`M z+0uJY@M}{|!>Fb>(Um_$HM#g^;Ftd?2YyiB-}Y4BSlb@IzJ^p&KGhzQ;LP{kw=PSh zGgj+a6>hiVhgVboYkqw}{ZHiCt7RBxEr7ckyIF)iELDz!O4LlKOS<^AhP52C1`AM0-a z*vW1o2itE#7$9MHf?8i-W8)&;p)Z)pK!v^H!JS~|sT1sEV1k{ezW=;GVVGbh47<(q zB?5L3-sARESAX6o#!oU%6Q|iMG$9meTZQv{;?;cUVI~FqM%qLGCS^!hE$^19@uX*F z1;5DB$=iFAiHOjA$UCoxnE^Axv-wTe_);hY;RW;p`!~~fIrnBAJnW9~))Nj*W=2=ES+UnHvF8`)-wa2U zyK@)0(`VAG@N%E8w$n)vvz)YD`0606LU738s|v6dU#SnQ^A!Q-J;b3}VkW`GL1NU< zoBNX%H-|1Y%Lze&nLaA%C-{abDG8h|gC4Bc3oQ0n&-fNvq%Et7S1xgm7xg0P8|jhV z*;nO|yAE>K1Q&_6%lDbO(&K-3EXbISr`aViMTARlMRl0n`_p4+LnVu^>kOZ0(2P=T z{Ic4`e(+ETKeA!bAe3 z^Nz<2fpu6(WYjp~%oLgz>mAmGcuK6Pbk>=$5eIjqmfi4rdbj1%L%hHdqn!K!IaT#T zL-1)G_P5`8-WQ&RPiJjGTV~{KVoM!Bn`o{kc~h%awH}n#qNtVE3jSXoP5z#Q=!(7D zK4^Qd1%+{AcfYx6ANYQ->mlr8@5t73+*%cPGbaM(TpFJJOjOb0%v& zSl!!5hlIhb00jFt*rGQ6paIlpjm7b+aU4yKLU7Z1)}S_DQXP#heS_A!3yZrq7rWnf z{`LOTRUUT-iDW`c8y4es2vq*citK~`u`4lNdv56Aw*E5`(4l!;(t`r4##HT|ihP}5kSzoN;j3@;h3StbJIaLrqEs-r81Pz#a6KG#T+fe`Gxi>zlOU1khDw}CNKnq~$~`AMgYYa znuS%H;*+B*V(x{--LD?F_|;Hob2RVZw#v|gBi)nmA?Bqn3cLHWQ-srVA)_>;EJRs{ zI;p(>Rcmn;@ti(S6MHPed#r_e=IYK*sc%2()pQ*2A-)%$Jhb0a@zl$nxFDgbAePZ`7arm|0#rBF8^_zsNp}+Ye)PHsm@m}iLQ9gnbsU#QPlm> zh_(+d>6mtY{OdmDP8a2-8Ol-A@L(?GGV`O<@oXK-bB;Gz#FEox6^)NH-j^ZbT}Ogi zu-+_Mibl}Qr)L}Z8xo!*`WyN|Q2*ogd_Pg(>_Bi=ETC78aunKgB=1#E3r+kExWw82O~rR`#weLE|d zBuF8z>`8TjjF=d|GGYq7(y%Q43Y2AnV;H)1l76}k-@hNv>(5+3zQ)*6oVkkG+R!>v zhO3#Y6v%c3Depe;Z|`!tAECeL6?)CBBm zJ`H@y+c&J-RbYit3>;My$XhkTJL@qF@)kPWw-%||pQH@32lvz;-?aTfM`(*~V)Nk+ zjoWQ6ysi$m{>edo@z`I7?u#!EKziuDxOUjCeeqBHG8)g=g5ys+)#;hyn0Ve2B0X8x z8+&T;{C{&#D9r1Ipw_00lzNS?agO&1Mb0{ocwaq#Ox~l;8Gi7|yErE-zdNTE!(c>0 z7CNZt8}4O()9p+o9 z)Jcy;mwuU!bDoW^IQcy1(f-n_XI{^?CPTlfC!)!tm_4*rg`&xA%$Uvz<%AoDDW*9N zfHV75wXY6#3EeQG`IvqIPwwFV#EzP1`DNF zMxKh<>!1$5nTcd;4y_kG46S=NLu=cA$N~+J@X?e}4>mk*_)lrO$bw4XFj~ZTvZ^Em zW@+^BJDcCapg)U3++28CB+)BDu*17h0U-X`eP{RP{hdkibdO}A_>uY>bL)TXF;l%@N076&$jTDwhR2GEc`kje!UOB!N5OM zdc#g(GXy)-0^IGic2*YPZf6_mN5Has^Ik%jLxdC`u+OA8V+cC0f=u`;zODmjrj~w{ zcTb1&PA&Z!Cs%yct3ZyY6#xUTvMC{N0NZQ%Kx{8&8NI=))xgu|S-aCBQKXfA>?zwAZN!N_# zvloBZADUm9B2X;VP$2g=%G<_nnCLm01BFU3duU%EdCdz`ed3Z6`?iKI@ABzg*_ z!)V*2B=%J>%9`ND59n#4)9{^5ML@u(Gh5F{5-0spp2JuOJ#2Wfytmdke%NdQgbHoGkY9pRW?46LYGa8tQ?)nOLzD~mz z3*&^ngJ2RLN{~CS7fuSc>LEr8xHUr3)ca3cbBzU~YQ>PMR}86&#gH-YXK(KUSIyFd z-Z}sWZqHB)RcsQ)2o2HvnRgQ&Qdr6pfgcfmn04EHC$9Ur-yRm3k)O8zW+RxBqMn$9+hxvqVY!^bua>R^Ui3p1jck$4_wdQOi3f7PpEyt`ln#)|5g7i z$?2c{@f~^Jf9`*yf8M|&IAs59gCM)@pFGwIKSTd~WzGLi|D4PjaEzav{;7Fm_x&@A z;En&A@x%Ig#_F7dm&SYW+1>Wf3^&e-@C**?VPhz|YSB3pb7PzT9*}&pL{_=8JrG%! zv)ei~xx~n^OyY%h3wF5`$r4a91|*;=`IUgG=2rr$hToxu{X6S(1=RB_dcMq}CwlNu zmQ=VA%lIjcfEt0|^5qlrCBjbSxnIP5NozxKrX);I272zzQjJ-EwBB+c?tcDb<^QM9 zXUlHrBfjv?BLr_3`kYQ8jsG9hXTx7}8Bp~33rozqqt6=%j{i&g{BtP!oWLA+7y49@ z_`gA)+n*RrpBrD>J$-r^xc|S>XEvvz82jM?qZ+y8paYV)bDNKzJInca^y5`;&7YX} zMBBpi39$I1z9dWA_|XV@9y8N>1~bp;R&=!%4lL(;p95>us7Ao*j6EqBtV}ay7XqIYHHWMub(?B$P&n}T*%(xOtSm_ zD@YQuUW6orY5S=dt_*_CRP-+W5OZ|++V z`1={TimdNnpBA7@`%?aN#MO+LBmOX3oxd1?zS|i|2Qw0c)u%4Bow9vre~S3iZY_PV z@4|W0y8~fkX+9MMU`QqYn#A;447ChBCdY{&)EO{3mJsY}C~ns4*84NepWtf2@|5Ik z1YOy7-nY69%DbKQUB3&;vfpI44Ve6S|M3o&)dH7~Wlmu!#PIrW!4Xdb-Xv`l1y~p5tlQ>B@`S{-K<9pwu2H!^079ZawY{doAZfB8K?1HcCQQ?f$C77M+J}P9Jl&?LGed)_qWXGe`e*>_yEN zpFF0kcl<2S2{A45CoyL`<7YeDIBjNHamV=cqRAeTkw(sR*z>9#&-AO>?d^@3 z7%cak-RVuHZug?1_Wt;PozrTRD!QpG|KH5EiXORQwh=>34kFRqIn6{jF&$HQ^eBh; zL9MmV)sm9g=!hnZxYJ{*k+58E=Kb^v8F7`CqO{9|4JQQTAK#ps8+H$M=ER(7+Q}uf z0u=k1MB1e&Yeu(Sbbcsae9rf+y8nW~YV}ToReoN&m~I;M&0@?q-5(s>?^1N*WL;60) zY+An=c@T3HWv@9jQT8@;(}V;@yzW2wJplDB?Po#xX6FNXL=gvyp0M*nI6jbvbQqqy zCo}Ro6R%l86rxs3%l(L0;$HbntX|MtdzIo9&~@G=D-Chb2Dj2Zg--2l{1iF0ckxr) zTl;`Y^wzGiKVAB9YFDb@#7x1*Y{B)m;8V8Xi?)Q!SjunKPfzWRVNUI)-dg!vb+K^; zgRI0-gtr1l$f93Ai168!+ZQeGe_KmEa_gortiP#_gDP$ zOd1eJX05+{Yy4}lWQ%+EX2|S5s4kGQd|GcrnsTy^u0CzoSLbSdCAEd_kSvujh#Mm4 zR2&Hs1*2M@$4mz@L=i!>t|z{?*wHZKYByQh1{kcJzP5!IgyKJ2ywErtqRAtyf-ceU zDApns5WXjxG8rLl7x(BLy9`GoNy)BG6f)|?Lhti$ax;2QT3eyC9|)YsY)pTdH?#h* zwe{oy9N$xW!QXmn=kTv(Sb74v@Xsap0yX+)mb6fBvRzRxQixDqJKK#NRM;K|=eG7H zrgV923+II5w}8Pc|1`7szHJZ63mW2jBEjMdP0B>k@FB#zx$MIL6`x6WL4xNSQK_ec zh~Xa{Wz@h+bcLy@noUpB)f8Wxo$k}^z!gJ_vHN$STLpBIL7@4c=%)E!q4x@x0YW#q zy>MIx^84!9;Lpi66I1Ptupn5+guP0*!*B|?jaFjWTX`CbjHIuzI^*!g=1O#ndbIub zK<+hAM49xjctsm}57RdwF-x)OwEve+f`+1or4YiUjdxCN_6~Z4G@nLbV8Wf0_dL=~ z)KumQ1?-7l$pFI&sj&8CNqHA5_vRZIr5rW;Nzz z+6Y~*BH4TE&sbv|1d_d<#NI#r(4&f{ z#Pq|RuC+yNs;;)s{NSBo7_=IGt5b`ijSzHofO6%-b{RB4d4EPpfO6}ttoJXZ zv&9qeRW*fV{)TsoN$dDuj|Yd3hevyqIox+A4-GW_AwSK?aXztCAa zpi<}Sy+cDWS>5`W93xNajm7;%!%7sEH-*gx^S^4gf3%*FEn&OHHf? zVf$>$P|-K*)CfZ#e^xvbqCyYv<_C7APYV%xG<3K0`Nn6Y&x>4sE4l~tslILieXu8L z3e!i4B-ZTYn$2*Uy)MD~(X|Ctz4MAQ_O@x?`|`ln#>}_*TS0M_n$Z0q`&YVYcYZ!+ zewe}JL^>0-VOB`<78a!0iKX)|9|Us~W+-cMDpZ%3qKvc>>*p3R3y)R-yV5R*zIHG1!Ay6o;X&}Xm`Qc0`sp#GB zh<){LbFfmo`WO9O<|EerV~FFP7nULOS3ZsD@7s@8#BSBc(IpQGYe}pfzPKvvly;OV zutuHPZ^cP+1qKUq)X|p52Rm`^|F% zyHnN8x(0`b6(S{aaTxQT^iE@ZNNHsKo6!{uus5>uL7S`kuFJmL`Fb@7O$DJQn$_r@ z7ja&OP1P;!TU$r=o$LM-_5i;<@GZwws~JwD)UB8AB}`*9L9%yaMZ9J#0J!&VZLgp; z)KjLWJboWz?E4{l&0kJ1A3%h5O(kO^U(}cBHL`l8-{hzOfYUhJx8LqPRFu(xVk>s4 zCCs*T96UZ6&*`R?&$aquiT$y?O*3{ zMN|-{cWFBxF+X1qN0Z-@2)tC)>CgRlb1v%EX!}FFB{t{vCR$4L!Cc=N?nnr%o0v(O z!;aBJoCojNLo~sQCSM1Xlem@~_M+aA{zbiQEA#k*)4Ux!FLl3ZR3d1UbH5r8UD2s2 zQyZsqCl&7$y;MzV`;dvvzj%NZBRifO7(e6y48>Wz35&J*xA5jBPcC1n3hO$vXbx;Z z7HQ}62I+SBIDO?GO&%(k)V2B9fps01Q`h>NQPSJN(bCGfQnX7yEKbSj!?yd24p)nl zbII3szlg@m*?KufCt^d3hXtW?B_Ggv`8~s+vnM?vJx!aggA#&1QO#&yM=!IF94=+lQ7`69L0?~ zi4w9!6Xhh^%tnG>h9*>A?C*t(jH|%#P_!M@lkJ+eknNfogV^A#EVkaifob0~x*065Ni09u{=6kG9vPdcD4~}x z-N3h?7m^aAg4oDdPRT(KrsP2Qwji8NfxzEw zR}bWF*M77c)Qi9>)ipQYWrFE^%qG8}rgn*w<&8fvv&Y!-srI38d6Ru8T0X-*6ibz0 z>`Vv)YVfYWf8A=0oqYw%-?khJwk;P1+m?%hZOeOv^*bNd1sX2I@wk`qASr8((K#i? zhD5pO{)4LAQ_$N5C3)-JWn~Z_llpv&lG0S7m?C%zWhI#j@xNHJ6$tGlCQT~50F`IH zeV)ts7C#h7ebw34-akv7q@&d{H3k#x_VGh7q2!%24)j; zsJtF27%1vJ0;$bKUdCUyvgYpT0+v{pPdmcijJtKl5D|Y!IG?oU3WY$P?1{;4y2TOq3PD*j}=%ED(C zuPpqCcgl^1l#wRUq=zKQn2dDNu>b+%zJNQ#sVIF&o$nnBma4l~doeEQYok!C#1bv? z6`y#FFhjf>bAT)Zi1*5!Y(osztF*egTlw^^M(60DL0t6A!Lf8%X4MQa^k23qDmMKk|}Gs{b*>JqT%B+|6rL?_UC~zWrt5yh-#>+ zJ_@>~=2uynQt^V7DaCXw;LGWmUG!r#Th{QxQ2No^uzQ&jdv^CSWfNO@a~d1SlrbFA zV`R!;8PLSe8_9sVhEYR-gmwKsX`ik1>^M4?*Np$bjHel-_~U6$@}lMX&n_D+Kc5{iVo@(FldJI|F&Jr;+qd7Od9*Nbj24 zGVucVpER|paqp9orvmNk)Q%AyNLIqT;wN;##Z-QEPKNGaEaF$kKoz@JY6^ms;3eFD zrF339>s8UDITaj<5U?GbW7Nv`*X=Y5LN4za1EPbM#rJ0w=sMne%``^}RIadJsrWrp z5!{P=J$(hVh$cMUD`h@QH=%xTrd)bO0?cx&G@-0HDYj}uZ(hV{-RcLO{&McVhd@rMxry6cwY% z@_hbZab=PhMK!fI2q#w)wVs5@h%d7J9ukpU?Jtjn@QJ1`QoI*5>r;s}>Hw%4U18=_ zJQlc#%P4K9Rbg+-znghVZ?s)Og?8q}y;48MT>^sjw%c2lPHx6*Q?Y~?EIliqicDBE zj*sf9x1x#Ps6`fXdh|QGqG;njV7}xrP;<5)El=-d_PU}-Y2JGAF1QpyQqi18-8MDD zKI%*#pU@E=n{8^$%lkE=&|amZ(M7TjR6rvpORv|n1#**p6p)+kqkuG$+q(&k&T#0B zCf@+J#cR~-{!N$}c|@bD*$$p~iT1Dwn1!nDS7TLcoh#LPW`g@-mGb$ZoX-U#%|~&< zeE;)#na|m8&rqj|{(ipza@E=n)3I#F_rE&0RhiFFtET%^P&aekwbAw;A-*gxmH>K8fBHp)vgO~jc8Ub@ z8TzDuI`BRBJXq1M@2c#0(|bCdBj5G@uR-rxIL(3IC&zi<|NF2gnv}+fK6J-fjQ{A0 z%BuIBccSgzLY8S6k@F3pg2qtmlVE)$S?&1nM~!^-+V9`?;mBzF<@7i{$>iB148KHD z_SU$-?5cawD&3=S!f@TsEfgb%#GhkDs<-tz!-GoNoklJZM`?^DOCM7y$+cwZdi$s~ zv8U{#wsIMF&-b+O+sg;lMJ3*?i}OQB*!DB%4m;%3fM*olkr-8Cu)p+quxH%WaHd(+ zzoP9I!`8IC%;+CAbLk|qM^`+;4f5*|Lb`IxA6j)Z=ld4N>h!l+)afL_RP8T6toO~1 zFW;O?0nZ{QrQ-EnYbc^Lya8^3-H{ zV3W%DJ#enAUrD>GUpGGZJ@BHfNjG`Z@z|_wD)k(g5BcGw?QFJP6)*K0CaNmjv*>uQfG8AKzf|mgncvW)t1y z)5a3PcTw9mbuJEYNIw88WaTLxCtb*0MbCS;5vEVarO1%ce?do7P?^)i)ig$@%NjaL zL28$q`@{%o6ltBmrd-`Ih}EYvnCqR0;sP7I1v5dtf%jgxuZY?l#;(p4;G;w>;poDF zN9>QY$m{3g${&nfO=!jT#mb@%OqTj$Rcx=VYov++b*c-G8gga!QTBv^j3E8ycc2!g zsy4O4<^^!8e#5Yoj34hu4_eDto}{3dJ&V?iL$ccFCDyG$Dohi+66QszWxnJy_Ac$) zA$W@MG@4W`m6SX%X`q^qwmCbM&o)Q$g-10<8>rPBJY3dP_Fm9TK4WbA{JjHau>4Jp zs#z^r>5u0RI?Z_YlXn@<8))&s@vMgV^~e1BK}A6>q!xPjt~TR&9(A7G8B7Y2vt(EM zzRNeLSu_k+0Df%6BqW27Ek<_ayKrny4gM_k?P{gpG)jX~G`b&h}JYfaX}jctJC)2=gMtyxn9)bt2mQ<*vxyWq3P;A5i}4NA$$drjSk=Km+^S zZg~YA34uXIUWqc|KSHmQBptmM+d|k1eMqE=;I2 z9w3`=m`&J}N%(?I=*=Xk=P9xxlb~f(5`Ig9FBW|4Ry@{wr%wl~T=7VT2;Y4% zIY2xUXvm0Tqz*Z-P`jQyJxkx~FaFA#Jg8;Ho7l~zPvrCzgoCMkbcYv<k= zwofre!ORk}-zoox6@(?NC^O^P$S#3eRP3^C`ne1P9745pLJ1h#j{Lk$h?)esG~~ia z-=YEx$F&S}es}S8N^}JR?e{o$yno#g6={Ynpg{bfz=bNX=2HqR%PCN=0#|-Yf&a`Y zaIgye@KXxhkW=9GB@`I*DFvR(DR8$6gg&K!qRoOvCsp9Dzuq&IewI^UiVEC7fz*{n zC30KrWDwrV%!YGFoSt`o>n4;ej!7kIjxbLW2paklg~?4?Z+K7xH$CO;J@@7kG6i_P zh_l8!>QnHXms8*mD)8R*;A!<42rXV2_{KQz&%`u{sqFa#>3v>CSZ4o-jpzRH=u(MT z?jXPZZ!BDlGs#{==$$6?{PH`{ z6$ZHfp7-hSj>>`eKoWQ(vhYkiTuIxaz3W5Kb|ZqHOcg#ZOr4%obu90BcT#EZ_!1>B zjK`P8&vRz1D``6>@-VRh&Y7h>b^Fxk#ZT6KNzAwW6`Xrlg4BI?@gMzL9Iexx(OR=X zU})VU@+x1{U_s?Kyog_NYSwHTeK1J+A(YOUC4IjjPwW9(Ci1vnHn2@v1j8@)a)QQv z&+@slzg|Ls9UnL!P?L^%w62hzi- zdn?@ci)??U$_^TPaY^eqaB)r%YUy*ZMa3XP(c^?1dOU>p#T$8@m0~3pnO!()N=|{4 z3T(PIdmg74Nq6auZ)93qJf^GdqWVy)%)at54|{)x5-Sm4YQt*bbn*~Y_>$Ey`&U#& ztEqzdJiuiJhsQjeK8^`@XJQM7v5;7(isGs$Mn&I(5B-WFejt6|Ps`^2Zm9JD<+nQ> z56I$1k<9o|U2e@Ny8G%bB?tAJLg|MnadLUV-u8%TNEi zP5;>*%eQ9ApG{K-mT$Z0cne>nA${tu@J;$*dw_p@$iO%G_Sy~n$re7QODO#wcFDl{ z?=|TUsa`8+ccm`?EPa*L`%Nx=v--ixSG;)@E;k-<@7KJFRQ25yFq72%ewrV0@-o0VHN>@tLXJA4F;y>0z0!4EXCw_FnoK%rt6QmR~dRn7YTs z`x>>_JB>;b1Y)KS<9%TJ?EVRt2^07hxhE>{vfTaln2miAd)`!IUe$(q#m>6X>o<6L z>&F%^NtLw=*ZKdLdw|njwPF6>{fHw=&;0Yl@wcY4>ZjdZ@K-jTve7-Gz&$VK9&2yA z-w#flT2*)B&Zr3n;jKwB=w(3b3rjvIkurou*lS|Mw`)*vJ?Ie(x2nGQs8smZ!h(GR znBG&J$OxLyW6pReyOdDQh+DDL zskp)^`#D=?G}Bz&`Z|5s=x?z}ou1b_(ex0ascgCs+pyI+FV_8!Vf3Xo|9DTG3#End zUM$sUHxOY5U8E6wJ29L-ffkJEGS|xW-L1aeF+|_i(59eo^Dd@u8?Lg#>!~3MjLRvo z9{b%p)GrX)Y)#?8+;dz`fg4re%_|4#PgqEcVT}-As@C1R=!CNPx7>?4M+UwakuofC zWQHXwmZpjWmMF0-k)`h#7VWD2MH#Kn<$pgM?{mkpM_QvuuJNn8@+U;bQiU@i5_UQ2u%O93Mb>MD^ zdp?)$Myl4vr^9S#hU4SLY;51^emnkEct*!|S$i>(V1z{6>LpI~GAD8+>lMZ`0lx^u znPKO&g5F7{Zm$S*h?JjS;D)bEtcjQyY&JRm(?Ux9MFg<*Yd=;wG_L?iC3geU@~@0} zLG)suj2pg|cU>V|!0o%?YsGR5i~gr|(AOCS^Iya~G_WOw)V`IH6p0TnnKz0<$6%0^ zBK5pOdFekqv{C|m-hN}cxV?p-&ghk09N3>dpHT7OT8@@diX=W5K7Smm4(0HYFE*Sf zyZefDt!7hLj|ZB^d_C@G9*601gn7(MJkr(?Yilm(za$$ne%h&=E#}@Kx1)O>t|d(> zt08aAn11)R^@npcmicyo`384%w1FjgD&5;|`66Xj-pc>H>w>%r_cl$Tc`I}8FviP$ z#-i1|R9s!`-l2x$bJ5YBCGN@EE2VI~B4V&%t4O^aAsMUGSJEp`qB59aaj*+`9hx(IfY)@wiow{Jy1MYAgq0 zB@mrt=_XRnAtie>W1=grLyO3wZ*40dfK=Q#+P2b6nb=OTA7F2}tAru7HNG%4gRQae z8UAT|fHZgNHrQwz3rtcV)L~+zVJOHE@tV%X6=1i>$~7m4k{mQ`$_AZyOxj0zX;uAj zv;2g9`Gmvo{j{pvRQdcXQl0wP+om`D4bP1kxZJun1;brgN)xm+_P~L>b!ugM_%=1) z_kx{#t#OrzA_>#$q3C7HDHy$69hFL!ZsUhz+AT_fPxmq0zZ~_t&`)k#a7d{2HGFI) zvk!R`PDApnC6AKXz3vWUgdHk+rRud&Exs*!``+=J^`uX&X+J9onzRak(DY6Okl7WL zSSjY@+)cdS0YOrC*-D9|TD)>Ltzfi~qsZIvMn2krL2&f3T z-*5a&A3V+)z>2%uNQhp&%HIV{^K|k-If#|sx1Bs7S`KB47(m+l7%6>)<;MxSyEijx zu2h$4`M-f((BV>z9&ge-l;KqdU8wa>uxPtaH8JJX!KCi-Q?&?s2#Q<3wtl^DiQEdTkoZ7>{BRFQ;_Gk zv3LAbeeAhZZRD8cgYr`26~-f9Z($OWL063;5rU+cGW(olu%g~CZ{g0L0Tf%jN-}b| zS&u=c3%T`NP=JlpzE$hR4;b=BS1eVf$u5q*JR_Q%$+NpuVh^U>&%I(c!d|5QmeTJs z2(VbA){S`q8qRVr_o-R!UT%c%6{_@r8;xM5@7rIX_bZ|uXA_8mQm7U`xHm`y(~dgR zj;WVVj&zJf|h0!Yx10U{+Zip@|xsU+vzOU!N1V#~4jFsZvwhTMA1?(93^SL1LObs)}r@K_- zI+`_?F&p!jc0vmG#%fXyxJFvCcd4HBM<<)Fj!BOuiwP>hgk^&3{HyPWmxRaW&uM04 zE35Y)F*h_W#wkHiukf#8ZiR8n;Eo7>pbCC3ZBQ{hJD=An#F}r z3_}JyU=Lr8L`Iun7=Ff9iHY1X-F)@Kx4H)O6 zCfae{sZO-8Q`gp%@G^z-JnTt9)b#_$y7SXwS6dfjyd0ozn?P%hZw(H%?-|46Y-cY8 zkI3NYm^f_l8nYz3&DxH>eK+Res^_AYHG_Wi@^#Sp5}Z9A7%sB>;q`KlQRoy3_MR6LF8GU6k3wXtKw zw{>QJy+~V_x<>j$e8L;MQX9o5SD%Puzz7foqFCQ58#1NZjff`CnB&0q9)sY%-7OE)g#XQD@HOv-K`=XHyLPok|+E%#Jk~F4*TutFaHB!W`3QDL1qOa-i zpY#uq67A1t{aM*;zj%es0MCjUo=A^GFc^P}&#uo!6L$!)N6nelzGa|VQ#R@{^-Dw5 z8L;m7Mu#{JIMHi6-=Kf33R*FDy?qn~ZnBTELvFT@vgXx-j5S|=iLvI@AMU3aKjFOe zg_zo%47RE1$y)xu>qyFFtdD5>HIfvQnk5`AGmi+;XfmP4YYfjbr2nK6j6L-U<9JsN zH>-*TsilT<)W$6Y-@xakVz|M4K9#-<_NwSEsLIw?CD;5iu*c&R>a;f?5#67)GED_ROq-#V822q@@&{Z3X!aT ze3?Fe7xD!9*;olgdq)%hq1@JLs!ks$TFM^U1)p|_(xnXu1Hs#u<~yb#>Gc+$5AXer zmAU^R$+}yado9PC4zw53M;Mf-&*y>OT05K){&4Cv!)YVK>3)AWt!11gWe^3N9=%G= z88ejlHRFgI%q1QfWo9^a6)-)TN6Yk`(HL?&xC71IJb7~V^ zvvcOy=|4iyPWL_|ADO0}MIeBChZXP9_S5t>ZHDG74SKvFTs0=zejJY(skt1AakM$+ zLlFu1+y3RV2#1 zGdQqFJ2iey8NXh-?3gfnxLVDUM+vHx&`25Kh$C0hnb@!)}M{|6m5` zTxRe}{oKgZ%j^WQLki4JAlZOMdrgD57s@?Z5kSExfJ!kCFr8*PB?5b!fH3BN-sK&P zfX_45s9)XS-WD%0266jGdTX1hH>BcL-U7Z!K7u4fyDINYbI_ZQsU6BMbZxp)!H zk+g`^<#Zu^pxf8O4OmY58c z`(M=7TWux{z}tfSnfTRRG|B4=OdlGOTib_i^b#rQdy!hHjzJi#6hzoZc7cz<%`*%J z=8L8F16d5ZvKXwfkGo*dEDWrv0LnYa<=Y5p4>r#Fr$xc3zP$v&MVIgqbU>g-7M+!K zWgI^>U54i16B*ercO~1DFJfp4#><0XXs=WNqf#&|5^l|m^c~hX4y=XyZb78?@ZB)T z%2_4&Kv(K$gSM47tDM%}AAh>@iy7usiDXw5iH#xW7s`r;F{<@s;^YH# z8kKI*Q8R|u>m7A@!lFzbUt+nPg6y`bA}1m<0?ld)8@1&%oN5sCg_}5EObl#szSzi& z6zhZIQG91=H0CZfZfP}~zZ>1sBHiM5pI^$kP5sY^@jl*YlhM@`t`knV?e=M zbYT#Ale_+5_QRWPBESy23a$i!mS@auyVVYBfh2p4uh_}8ge`fh-A*|;2vK;1w^=H2 zSSS6x2(OF`l``u9$zR$567G#PFoT{GY(tl6QDHr%{aSr zQMf99{tV!k3I0P@?CSoAWAG?oTBE~9{IpH@8G&)^yzUd#e*G; zc8&V9Q}1OmC-TKG-6MZ_3N}jY7#TfbUDd`hY%8U-xTaXH!1sLd{?ii{*7@Mna?|eDD7J{^cc_4SBEW zcAkj-d$;p$<)f_^aiKN*SHl>t1{OYun8UU>bHEkXv)hg0=76h+_rSSk<8-n@z8LaT zuF@S3GgJzMA~g3{{9;pF1*6H&sTphYs=g9kiUUeR-cXFy5xkfHYoO(o(PSNCTZm=_*=n-*mJ8P2AA6>ICf-Mu+XqiH56ROU2rTjjde6gv~;`OR6uj(kdHl-^jV-jrLY2Q zG=`J6_9q5TrJQ=dkvRE^7G17WO+=lG#py~Q^?iqdP$LEzpmU2hzpmyNM~6h)~Th zaCpp&6P@f6(BU65z@MtBM$Nz0TXzb3(pP)8^8;;a+BfolWwiYrItr%K@m%$4i@+}y z5`Y)nv-CUz4~?CGhkvejn)88zM&uC7Y2v@mvGhtmPisKJl%+1O_(ub2@tDn6V;Zm4 zrh5m-D*zi_aw_%ITT@{AZO@%m1WY74P4HftYMR=^kI&u_p|55J%~R7Hn!>Mbk~Ra- ztS|1SS%>+}5*w^j@0s!Z5Kn&he_K$0Y@wMx5%fU04d)@~kg3ychuFTqM8lB2Kg9Mu z-99P&7lGMb-y;)Rug#$;AiT9d0GuvJq7hDUsn^N`41!gveP_6y623VmY@pG5^T(zu8=+eZbb+j4ZwcEI0o_8{Oh1j+IN!9av4GzQ zzl->ddEZGI{bD?LPt+TW` ztHqyB6Kq$P)Mk_haPZ|_dLK2A%~&zPe&7;&|;&1W)4xHIH$nICJKCk0t57+qCa)$Zz(8`QUq2_ zrIWwB>rRvzhKqP)+qW8wNJ!PrHuP`V*+1ZWXYf7I;dfEdE?K_egGgwdd-3Y2{4ZE< zpPvH@K2>!wKd-lukBK#f>fRjt!Q4OhBzIK9isgD z+eziV9z|%9-)&&jRg|`OX)+m|up#eCaTTO5r?bNRR`4s1t~Q)}(=@}$96_c_$}QPU z{9eouYY{{vaHO4Jpn~{O?g3O~<_K=WxK(|l^k|%c33D>7iT~E2_TINqpDaW^mP#1J zp~NXoaJ4N5SjD3NZImsS?)c=RjDIjwzYc{jVH}TgTM8guYKe>)LxXdm0fX5a({7B> zQSOpiA`jX5Tx)jHx_k@tpvAoermn?djZ9*Edo&3 zC%pI89MG;EC1w9xQ8JWbp;8AM*6a8h&NS4rKPRY~T~{urXq(x4%zI`kl&u}*hLo2B zx8)>hRP0TmYfjuI1g98eB_kwn_z?>t){N*V;8&s};(d)>?9iWFoIl|6fXQqb!_P0f zTlr(&6HU}RrJkebHpaiXvSe^eFX7}86Ki2wYPPTVt@XmRR0s66uo|`+K8;DpLyb%m zbjyKSz-j)PTrrT;f{3?p30Ik~=CJ^dHA44hi5cj6yB+pA5?75>S?}WM*~6Tb=co3) zMkC`fzuX6Eg!aBcAdrx0Asa%!!4zJ$kg6nGov`57ntFEaxzJndGH>8;5tSj5M5ECl zZO<8zFmK{rfnGXiq|h7w3wxvtgfaDK3P2g}K~1RWbHTwp%z@KPIl-Cb!c5n**R?j5*1kRDywiRlPS|QD$(Wma@!jDmw5yRfv7X0X6#F7A!!k9%e zmiG@7YHj_ecG0LG7%n1bEPjcOYdxM5f8!Uq#}`Idd^eVOkjV zpkk+loGX(&q^>kd=M-~n;~I#3Uk!u0%NyoAlXxPZQ$SgVsc|QSLAR1ATeST#@+4l3 zvA$aqitl${%{?eOWi=UapcEn*4g{Yt>{=ixy3cutxCz`MvZBN_c~rGvjc znf+Ej_}e|%Z!-pe`&H%}$|^NQvw=kwqM0c(XWkezQDt5_twyCt$%@LX8tJ@{tu_hl!r)hqu zn(14l#DDz=jbuGnawsmK#8!|{{Ba~t;))W_g2+J zlSeb~-If^Yz1sb5LDhcI#OF1sNC--A;wJvrA6+bLfLG^zxe>pB)xJF-S|>RYH?lJ9 zox?X5ma&ZL0GERk6Vjn6W4|~PcrYf+AB>`3+c!Fkk2(7NG+fB?jG@%g>eBI528;L) z2nsQCD;nEx@PWfdpD3-EO#}>t^|) zUoN>-MXZPk`tcbgW4-g&Fn!HVJtbJqay*eA3;OM>;TtgS`dlrMNo@LaVRP}5geL+V<)TW;B zLFzo|CjFXd2s(~W4W=Kc-!KII>>WHFo1udJ-)g09w`nMiV8UPon0s*5{(0PI1LMhKhq{Y17Pci1hRPr|gywS>nxDTp{{0sObwco-& z$&BLVo6kX)H2{DhP61y2cO`)8a?d_QmT$2SG4Ge(XZRqi_vbs&2Qu!A08_&rI!E#* z+CC2b&~{eAM<7)f$fA=Q%&;?(Ieh_(-@58%0N)#?!-CNQfJSY-B^15Y^!ZNO#+eWFI)f@bpv1<*Vu;(Gn zoK=Z6Mb7%^s|V@dAl_d$KFLS0$(v@twjM;iX0mC-de)zY+8+h-G{RZy9k!LH9-Wk5 zR+@NEk;-9j?>9-?&iCkw?cy-+yIVd2&-kAQqsMXO#xmnRa1f+AQ_~>)pckTN{aw?W zy$hCdiaSj#Wb3Dz*m7)xe#0>ww&W2Vyzgzc#?TOXWJY?U_narJJj4AwH~FHlWH)ua z^0KXKh&-mQ2mL%?;@4Y5(%+EXBrRTwe)DnBy7Kyy&7nLn+x}1lgwx3YcyZcOSIg4{2p2kNVmTFT$s#f|$ zLa9W}9xtDgxrD5Qp)fst$2{4myY)v^g!G;G4N0rr_*(3=6Dr^ zT}kjgQ3h2OuP)+$VbGGB5#Bc~8E;{EQ}~#1KhO|=ybn45o@g59?VN$=MycP`8ceSRrAaK6zBx8nNv|V;1^3@1eRM%=oMS}k^%l0&gXv?pUmpTTXyo*{YgP8j_yErwsGXp!&g04tS5b`yq zmI-x%#2H>_Zq`bE4`Q_)Bk>aAyl6orfZIJ~0V2DJ?x`k4N{{1k>(E7&{HuR?Hox+< z1)syEep21vKG^it$I>&JpTpDc?Z20*fI4-+#8^0=s-Ba#P$#|kE25kBT~Br(MH=5Q z3eL>kRH=C5WBuAO^%5(pUfTrJv)Y1G6$KmV`^60=POQzO;g-2uWbsaA8lNFX(B>aZ zK;a=Zpq8PArApX4UFj2=Q&)>mbvwibF)oTo89rjMroe4%?yWJMVb&E57Zi9uLaHxb zquPwv4*EMoO!n~fi;4mDz?Y~hDZNT}!U8q9gC_HvF*7x1^_xo}`EOM?<~emtSBrg# z5VnPOkqBB22_!-j1-#!(x30>e3JCL{z)>nNhXUsQho|N9)4Jg_@n!0M4PwhyeTQ`# zf7(6FWf6{C_#5zBLDl31@hQ+JYi-kk;>-JMjkVpI@VD8E^uCja$6}9jx791gDmZ+O zWPraN-;P&a*-m3(qSGNvh(KS9kuvuo${~0VKr4JDnqC4>>pwL3$|a2xa&7#GY|RDU z4@kvuEDs7TzkoS4O>#c8t#w0H-2b>O9tkpRW_l4k$5jJj>Qr4o8lwRb_xJ+$^k$cv zTIa>ypQuA#+OThqvy6k6TQY(cv+Xc_6efZ%j}jMhe8VB`oUr??_V?oJ`FN40QW^ib zdqExPEBjve^V{|}P@ydPS%~@Qiiriut_9z6r?4Q%G4J#%cg13oEypcPd#!+x&&wY+ zBU|MmZLn-BjR0%@mb@rLd82vzvEHUMJGDTJH@fH6lc>uh`r!occ!BM;E@@no@X&fI z!wbAWPcvSt*rOWE@Phi98-uK5n<>cOo3ax-b7FyReK=QqwXk06zYd0gs+Vxkm@smO zUZ7}+lH6Hr1#Obsa}jiPV+<@U#h|KpT8p<7;JbGZ-5>JBP$>dVHEPl-ur;yhZ`MT< zTLf@YlOHl551v6ZiB;V@p$=m5b*gIC`T3?n%Ao)QnsbJ1Z*Y-~eX;;esMF(8J(@a9 zC<2$&-~8hl&E1=a57+7LcA6MTO$fx0scILK8aQn^-`-|0&FHG1=a= z#(7RL$&;WSz?sXIbb-@QecH>>43eN+Kh{isqckA7Q5qNO*D4J@m3ouM8Kofx@&5c( zvoLJAtATo`B>lE#DcSJ`iVT#3+*U2XU<}YR%n<)BEQm(@Y#cc9W6gD_tJL0=0EjfV z4gG(#y$g6$)z$x>zzCy`%v7VMZM3nSYG|WPG}c6;Mw0+a)KntU7u3{JOBI#26Tw%i z*h$pW<5=2)+7=b+{aS3jfYlNRBzUXWD)mYg>mCF3j;LtI54jR?y}`v0o&vMsuv-Qegt{WIvA9zxf556#o{#L7HfvwxIi z%+vF8nkx#LTlyKzEgI5XXF+r3n>6RfW|rgMH3G}=h%`54FQ9GxO0TJ5PcOnf9Dj?4 zk3aHRp8W`~ktlW*WwSak1I|ip*v2$_Ieiq)ns3)LYu2~9X|_DjV}@$#e<~=@tpYnz zAPlDY4EqMC@RdZ<-3{vMYzDLX|G0kGJ~dqY+XxLk_-6~lc+e7J`LSUZ8yQQMzYopQ zeN31|dQiHjK^6UxTxe6~ieqH4xuwD(_Nvo&8Far3lc8^UnJ^ zqOv}dej4SHC041_zm8>#W_)G3{ExcwuV5W>@5#)Ylknl=OJ+7G zaEAvq{2-`7_s{6A?SiszD6B>&ArbmCin5D`wmvo}YwxaTEH5m3hb^o1f$9R+deG+E z)-N3Ie2^{(F6|D=nsZdH5t4G}81VWhR&E~AkUHOab7v%2cV!h4KQ2*&x48`wm%7am z3*4FP?gaIC=NJmp_+Ins4v%-X?x0|b{+;H{EiUHg383nk%#7l?H##<|t0IBVB%Ika zoCDS{9koc`^V-p!I$sizCzXjFzZPut&V{ShRaU_R5$eh<(QTri|Ks}HCC$0@xp?P9 zR5Phrrzh+-c!CuNuhVtyONQ)Yn(M_jHZCt@hDM2H_~D9UEkAUzv@@`5eL;VP8O{kZ z97BeT+m!&+k>3m2Gs;y(>JY|E?#r-Y^SeB47#@l?)9AM&C)k6p!Q+mGu;Zr&HAbsi zf!%*SJi{=p_f{^uNkif5nhaJ*Gw8It2lCKZMdDuvTWBOb`7#U|Zx}QYat6@I%;Qne z#N1%HgpsqtZf-Z;8l=^hnXzQ{c$%m;^p?gCf5GdWMMXW9U- z5*|YulEGFZw@SeF@{TNU)yP4zRMiCKt-uvbovJ}@b$3=Nk7Ybw>fV++PdKdbc^>d9 z$GPP$-7Z=nC{`ZNpmo?vg+3f%!Oxqh8KABs$tdEAH9lye$Q!ry5F;sbc7s^%2~K?X zm8H^74m_qTjoir`c?Z8Yo;mtr@f(#e0xfkSs$rl82wW&t@AzbKFw5{ptq1fLJUoit zx4FlJx#A#Nwxhf2t8}2>Scc@WkAU1NUfdJepcYQ5webrLdiNBJt9M874q)|e7-wqp z*x>1<$u^F2pH$OJ3u%ejmGxz2Z`&4PD(GW{>a@u`AsrmAZ~{hQreOTMrd@l3C6QBO z5GBCnqB%ZCHN2bihR7EiD?HZ-G=6F1h{loomAXmNoN)k)`ds1t)LwW=npwsuSc;1< z?YI%L>(Oq69E-3DM#!7#wGE7rQ?*yJGua(f{aQf82wlKytwO2AkhYt?ZCN;YJ&e46 z$O8t<5<_?KhDUX;T~-s3b0@x+nA_1V;KuHtnL<)8a3{dKF|=0I$kDLC?cP$1$UhNb zg*5*$tDxCE9XjReXW)J~K<7Z<1|6|@Av$|Hbb{Bz(78}x6(}Q};UU&S$9i=gI%QOA z+2*Ag7M-y5!RTm(!ZObSceJ=eN8TmgmYAJ~pz{Z9%dt8_*9+Pr!f>Su|`9s@(i&c(h2IFXjmc!8sE!TfmXsQ2>XBTfFj<0YA zaCQplu+D{4+66x#Zj&gZ*~w_L7YmRmJpWw;ThsnlsI@y8`Z>X^r(4yY;8yoQaI1SD zxYa!*%#4Nr6bKOl(}sX3ggy!MOmfzRx%Nncoo3q=(o5aMu^_4NyX;@wV5@?KMJ}hV zlnC230=Ls1{=k=E9TPYya$0_;+obF|rq+!nbxaUvSz@|=K*!|OmCd+^3ZXrRZCu$a z0eKl^iIvXoi2Th*HO0Fw0s8DW;JP94Msta$e4dC#7teI|G>jI-GmX=6UgfYv7|gWm z_`p8%kF8*FbBozPi$okf;qRcibu+Dok)kyqT(Z6n&8-*^%m0h$#EJ@tHPVl=XTv{2 zKGKALgghN3?A9eI^^Z_!pMn$1p)E-`A6M{NCQ>D7%=`+a3_lCGI_iQC%BYE288x{n zV+lU4z}y=+N}kXf7xL=l3mGD0Ou8(pTxC^<$|lU#Z^`rxilFZfy|3B%XXRmZ_f^j& zP+%55+D5rNyL4tWL05!1MEs*mMLBCzonGP{Tj?KN=ABjH9b1*T%*vdj%Wg`f_O&@H z{nIOmxj44QJF7mmedaQ|G;wsLzYDg+j^5H5|klrbETSqnqRW8wIAd&8KB+DNnV)n0~BjSRH!o_GK zV%9w=|C~bt&=WJ9;WW(Fovd*hs0}svkjw=~4)VpwEtB&v3|d}Dq<-izs^6Sy{Rgq4 zjaJB5og}o*eg(a#Jjo~X>^H1GEGio6xKGD!1H0(3n1Ju+>G-(2nei*W-?!sOpr>l3gacA~WnQ(wtA4yH%S z@j+O+EoI)vOCV;gRJD)qU94$9{NG^d%e$5*?bM)m6O?Bo%jN0SwJeSXD{gZ{Ce_V($T_;C#v!I4#C62-j|o;v?IQ-gyAu0u=m(rjI@lOL-&t%PNl6 zXp-bM7bxeNOhZH@(oCV|55_A=zL|Z^MP)>m*fj_R{PO9s{m9>3o@v%@)&%)&HwUTZ z?qJzOCx`2`*)&Go74N#7ADOw(wz;(76g-KVNpYrKjXF$`N~)_+`{vM>6t@wD#xc4^ z;l%a%=RE)>tYUj$c9vGLfCrtD?k>)IA<=d^{65 z-kTI#xn4d4?5BuoxELs4BPtmdKXu~d>h4L)r6{I1w!-WcVoC4icW(u8DKbUozVeZT z7_3!@0aezs*vDJYHG3`j1g}Mh#$W7>A=KQ@k!TsOjrVoI-)eWZ;?wFOzvB?fFK6MS-@qd~Z1c855@=se!LDYIVO>cqc{cR(0&_e;Ky= zLiQHD9I4E|;fd2;CvmrYYLiO!H8}n)WeXn%rV$u!!-Om2omzxZ4rbj7e@-M5yTIGx zy^P?g%6UkaFBeF@70^9dT-gY&mI3*NExE{524@lv=XobjU`Np+)1xW*+f-Gi6<~R z6KU{{i)3nk-hVN?o7muLhl$^!U=`{>%$1k77AnrTsQd(Wnh>FGD96Zk7&qHJRq8^B#L1q7ZH;k>mD+X)@ z%Qk|^Y*~r17RLV3V6MdnifG_Vf%*3FlCf)&pT)D37c>4e6^DLZX5?z5;E> z4_SiJW!h=vCZR<=A@S}X0`RAKfXzsnWC$!@qOt3ZT4KlQxX2PaRL9X%uByS~i=J)e zsLVEKI|WFlrRr%)hhb|~s*L}os23&lpY6L1Lz>rJo1uv6+!L|+mN`^@)p1dd><<|7 z*eDDs|L513oV-z)#$pYSZ^!t7)g~ipE~*!=8oy1f{kTYPq_n8;OnztYgakuk0;-l) zYg1K#Ra)4cH6X4|38#>+7l8NL9yGYlTrGDGoBbz+;7yEX%6{(E6CchT!%YkD(*Nqo z8bxOOfsBksXs7j57yrxfP<(eeMmj)$x+5IobdYy>>|=cck~G@k-REv=uu4f@-_Ff9 z45fH5om^Q>*RdMPRHD%|N;N+%aWgIgFYo71mJIufJKsH1G8OTYiOg3f&hH!GM0fJd ze%<~C2B=bQE6RS4U-P#)Kg=0Itz!##>E1Hxf!3NCvK%5@U@x4A0T-xK+Th%Z5?yMQ zDXTB*m-&$_1BNgp3Jl;romK6~v{fRjF$!KWPA3Jg?Erk>Ne}hm&K)R6SB$lhwoOw{ zks36Z-qyNq6jdlKssyD&JLD{?7(Ac&FodLYHci8Y^))4vFiY$aM~2AN8a2ubAXEM- z8`3JI*xM`g$)3F-O$d9;?#b`i%}=C18qx6;1w*V(!X8du@m#HAPeOS^8zr`Gypd{e zX+ZW+8XsN2qzzx@+=A}@rG@%UA-~jU!b$Ci3Y5s{(>mB<&vU-SwH50lBVBa)QFIvj zUUTfkUl$-Q?R@@x?(Y~-ot0oRfevh9_%|?~w5(EQmylEYX%s|`!f*s$vdOuHSswEv z%NWS%KDUkF0Q$7D@&|FtN25m;*=Z(p@eI;Gg?$Y`PXKMJN6|Ci z^ccI>;<0puEr;H=m3jL+Z^2E}=w?prp&b!chkPgT(}(>dVwt0h!6ZYtGVmoc6O$z6 z{}+VjhfOuJP7Xr96=aO`z^4;6$4Kl1u9RvZ%%(K@-2`U!ZRBzF^XZKV&`J8t6YNI- zqp#)o(H{q&TuE=hm=>vriNL5kIWhZReBlMMDSL}VbBb~fK;LX|8JtV$|@w!3d)meN6LwVk*eW)WY-Z%^DvAwOx z|6h#Lg!hrAkj%lYMBAok* zs_>6+En9;f6@o~N_7ToLd>5^Tn;^M2fqVcgs#jERTKVb- zSVMtS$^3ZaQ_`OWkNlBiOQ@jurF0MHiKv#D_*X`Cyd=)bE6(JXFSV3Ti(MLYmN4UY zsS9M@96g6Qa1s<5cSmD$&GdJvHWP^kQ#~WOsr-ELH!IC3M+JdE!+CX@XSZ zF*a~~B=9KVvWuh0s4KADxt+=F=blCt0v5pG9r;1kKhr@*rfj>qpLALv3<9HHJpU2Gqk*efKeKfH*Da}NT{%cvFM}2waHu}=W z8o9w}X48^cHCBrkP~`vM544`;9|1_Azr^a>&ZA_%A65AMKh^K%6J`ylAZnQ}7lCGP zL3JO=Fxe9|$(mZBzFCmrA7seE6V{icpXB8E7F6`$o2SVH2VfWYO1BTVbU>oDoXUwI zePUol(R}+@;NR=NV=%v;2mo#Q*`Ph|AgX$Iuz52PY(Q!nugxf&R_NXpfo}fpt@=T4 zIS=PLnFSg(R!6EgwUYgGZ?_GfZ*z)vps#%v{>lFae=_|i{6GB+{DbzAxxoH%QS)*Q z7H2S=F$Sf`(vUrYmr=!kORxDu==J>qdOZ{WJbK+EL!^LS97}EKHUD_IXb00v@*Ey4 z1@{s^!Dc=Q%@dvC8s~hOIqkJaGH7z zLawQ++g<&cI?RvylKZK{kieyUYCsA{fTD^ncP@GY9(Z35Eyd2_~^7hxdrGxA*eOmrS;Q4>Gzii!s{q+?p6O}?dmlojJ zz0?1X_E*5RA^rvO5O0jac*TYmgl zUUK7yzKYEl(r2$0KoSEIvO7N?>qpdA=wI)shR_wCK_mFD#+jO&{wPzk-Z~8Ngxlx9 zTe)Zm4c^SR%#f2!s_6F;a}g4@f1&J|uz&ev`MWmY?>$J#YW)jaZXd+o`eaXi{D0+d zTlY5j+lI~sv&4Gj+W+7F1=j2Ekd17O;2b&UYj#bnxVvuE?2p0~JL@-lX3Ge?ZR+Np zWfEBZ8$$j(ak4!y0Wu~~CDA*~EpU%^Egq5?SB%yo!g@>*-`|5EsmQ%)ca&OAemecS z5|yio5!B$H5Wy?S9rHTD1s=nB;-4S!cgu{|(II8{AUVthgEg>b#!zY9N!mhP=0)zC z{j}BL+{L89{5ahHRkdHuwIANN7@EJ8s_|s}bGY^L)^G0zOojFz>r-H)?H5tfN>X81 z;ep{7(CUGt#v9=dnXvN-_x+kH-G@^5A$P&AwNELm2&G8&rw8GR$;oTBcUv2q&zcm> zLad{C=Ovuug0qy+ei>=G>^( zmfX0^^{4Bfa){%yLc0e!&5AzX)gJm1xBfpJ4sqAs7TWH#I~XM37wL;_AQ-6jGtKYc zhxK~^`%+7$dcYe(q@!>H((f}0V?jE0A{L}AIh}VhQ{df*`JUc6-jVGqNhFC>D;kh$ zA5J-Gs2nu$TRb*_R4%p_QVG6x51iiLozVn~ymg7x{WiOzY56ngp9KPzdWE9766>U^ z+v`akpeg}L;TN%r&2A=dBUP2J$PJ7SPcqYjemb zMCns*aPZfy-zGn8pKhw5izRNMex&j4J$2zmh4^Of3L`~z5P*&WH&;bjf5&~&MGM$S zxfSnfh2>OlGH0^M8dQ4Yox8}^0o-p2++4_MgvZ4yE86Aa;uT(elY1)))(YLUTG~Wx z3~L?tzDzWvdZ2dDomqCRRb54pU?;WP#JI5eMH zt{CG&hcx|C`y7vV-{&2<=YW>DelDptX3TTwmGju?9+Nz7b&tZ|Mj|>os_lS|YMV#J zw1%5rsML1s8+)j6uP@&9qT6rt0+p%%o(}r&TxdnP;B^^a_1T){%C<_s2ld~2-URJ# zaF1%&xW^Jxr#pLkv-0wtHb0{Q91yepXp3?K1iF;W0NBK%)}MKtz~ch<*uvwLJZ6G@ zDo|_TQ9`1l8h{crKd=Kec8yDOqwwz(2>>;Bk3i)w`VvcWxjJ~tEp>n9jvTZ8J0Ye1 z%&rhx->4cPL6Vj{pg4|u)~P0VJ&aP1^;?TEv6Hw|s_b5tjagQY?UMEWFwCyCU zT0M}3^R=aB5gBOye&s`0w!rwot|GbhU5qquV?5en%nE=>M{ET9Ba{)yD}v5lw4DVx zcs&ecjlaR2`?wl)gY#+kD3I5=#}YHG7SV921x?N1)eb-uT;2NR;9Bh-6TDsP9!t!8 z?reiGxO8kFH$N#pe=!+AcL_}l?W>hgwQfYsZmYK`AHv7f-e$A@o2{Np>i>ltep<_=!wJNe4KY!7R z)%H!!$<9IOsS@3#O&uL;y?#`_vaEG$+sD2}4dkNiSE1Gr{4d=20$(zWZ*{>sswJ)B zRZ(V9avq5YaqUPt-es}9?!8Q=+@Ss^xeEK;O}Cm>8^B4Ef~MONbLO|V4%oE_Z%uVK z>!fZB2{3cyM9b}*dCVqz zatQMmXNTsp-AFdgLucQgh`NI&Jlb=w2--qN`B3Z)6o; z5+8?^>ao54ea4ozW=W}SJl^>s%?&)BE71{@c(kBIH6{E58^l;^7^7Wx^3BYgPBoEa z=6*Z!Oornvgs^3oUSTv<8ETR`Hps-8ogMX$U<%Q!qGJVAu*cD(Ms#O^kanlpFflXd=9 za(|=UP%?8n11;n`SC3}`%|J&qU`3#_Rf-`j;FQy@Mvb8pXpSOsBx6TUFwHt_iJm(1 z@Nn!vig|L_atb5oz3T`iFq+9`Z zc(?Iwx>%6ZQZG07&!)i;QbBnQ=f3&7+QYwDq68I_VQoIZ$?8%|MHt+Qiq)?!u{~#g zM4m#hZa&rG*0-HH*&=Z9VJ_$4$_b+Pz5(+EF}>$~M4M>8ecOq11SWosbLj(H@kY+ejJb*EF$wk4?0HC0B<6n>U?#;62p#Nve=QkoZ(gU?)54m2}h-pU1qJ;T?00s zi+pC0EEgZ`BN;RlB+Drm6%;CO(*UR$-=#?%K$!Qx1uMFH8bmd~+>q6Px>h6CT^xWe zs=hb3^Fal9wtR8b8~i>{`2fxi`R5ZT+l(H2lN6o%RRJD!ZuMrV2IP!<2pYwVx9m>H ze?G^yI;my_x!`?Ga0mFVL-J%7vd{sV%KJ3bQ8>|-WPh^TXG-H!yuk3C;eeSTV7?Xr^WMi6m??Q+rcs@MX(tsh(@6!4)>#G2Oi}?e zi&Vg*NE2pbv=ErH3V=BkV8lbeKs~>3wYtjNViy+!Iy0oD#@J=JO2#A5LPMbfz%FuLSgG3mGZ+~mw+Qw}-fXkb2!M8T&=-KWd-{)g_psdLcurRJGW4@9oRV9#g`S8N3n_L{Z(SpU?TId&2I=R3xW z>P+fvs)&_S1!;~?zAxM(Ny{gz-W{PBe+5UF-B@DQfpT91x$JKI$=O?~9S}s!Po4&pV4X&# zq;gV&9Va64@ekuJ+)|u6Ua;O+0BiLoW!p|X?xrkd=bkkakv`ei|Op&Eo{*p7MOtvsSjACW_~eo#CLs8kBI1uwxx z3KgO}abl3;=MOo0ep3)_Eoj2gbLTunW;TsvZ-=W@o3g8aNbP*6>4QqmuV0s@oxO-` z1^Slw0yPo;4z{x#c2b6mQ%=$eYC^c1m)_CcpIdHWJNAfR)f!8W9|`_#OH!SQWA02H;5z5_n=@ zffq9mu#kzucp1W4^~91}2P-n{;S5KO`PILft(*zXTY)EQnm0>H0`QjU3;%d~KS=;y zNdTS>)tRTSP>4inxrNZN2w(pLh3>#2fhUwJsEV;P1xrvnI%R-sMlfqpp2)Sp<(f}o z&C}rPE&4h+M#oF>qD-xMwvS$3sf_~slKy--pJ>3c)OTavcS`$?D47ds^zC52g@rkS z*!+&dSnaiVQi_QrR(PJ`Hp1fn6YD#&WHM#FBeigrYxDamrZ^4Gg0lhg@y>a!*am_1 z-55=_tC*@jLPbR>Q#rh~I*NJ!6Z1|lrKRcWK$q8|wzW5CW`qr(k9R%~2YXXu-W;~| zl*~{A?%-=GM;~0LF)A9?M-X+^5g5}KdddxEjpVhjlFQo9wPxdU$PLtjyVTBEvQ2G8 zUHlBO?J=|YW$7#Woh|@`Ua2M?u$<{Ywv=HR#~h`qw4T!kLA7-t-Z@TXPKou6=V~#^ zj4w&$%a|{!_R;=%QJp@vk>-Wo452q?2zuXoHbn2Fkybw(hMTmX>?;nvJ`)d+dv;Ag z#4YB9_v}<35$qaCOt#3%-8gtda4NvjderVF+h9QxtPc`T8`4E6Vse@9s&@Sl137#z zqaMa+E!|3=P7@kOmS!JNbmzoq_EgePA0Ud}I*1E@vjm<0PX5aZf1el4{;BXc<#n!D zt~~kY6#kwR%~q>jQf-NIvvI9?Zylou2(!0yl1G6&=UwDl3G$)#^HZhPezs>5R`|zP zz+@V)=HpNByEaz#HCBjmLLGP^)%P`4>Q%<6A34c;G*Jz-!U_3RBqd&B4N0ljSW8mo zHP+k3-<fe7W zlhZrR{>AoYh_2^&_dz4x0ro%JEsM0!PK`N$zo^p@aANX)7APxFYdWa{xpX;}e1^Il ztK6TYGvL|aD3>RDmTU+YCr1JmFB0ZX!j-^L#*-nz+L|#iPz|1r@sJXcH8hfl8D(EA#AiOHx>T&bL<L|Y5?0frjf9Xqn(7E9@A-yr*f2td4kog2id8` ztq0l3*R8u;>M|tEB*#__j;)#;TTO6m)dE{dD?E-FkV-Y*d5x6-X6F{$Sj4Q_1cSS| zTD|`Zp##nn`x)K2r8H?LnwOxDCc`V;qZTq3xyN!I7rRGk4A;3wX$&{HM`;YVxkoKD zt=A*XB)8C$+^FYfW4$^4?_yiq&HH>5cJt4+hTRO;)u)=7Cby~vxqV95zwiP&Tu^D? z37Se-C&^sQl|mcE36#J#r-&n`v)YbVVYl5YF-EcPKU5e zlUvaiTK5Ym7{`?DL46DCVDd%`g#&-)p!nQ?%`V}f7M-)6?unU8aay9ym8We;?x(mV z2gk!e+(t~$m z%z}%lqpfe`47uGJ8~DMtrzR4%J*nAtjx;CXTPuxJd34)(xC(hyMZ+59HKZElwWJ#5 znld!X%RM{Fll+YEvw}2AT1gr+uiJo)^Cc0hpn9wf*hq8kDSuEeB+R`yT4-N&nvef& z+b{PTr%*iUHBKX`@EY4mDm~8MCu)Rj3mk5(2!gT90O{2e6zt*bk&X1On$wI<8kv`G z&a}`JnH3>w{jW|wYZQh-&^e~Bf)4_wui-IZ`dS|C0E8CtF6pPdkRnRYbS*-x1V2#< zr`WY59IR99j>Q>#EHZz=(1D>A^9-$KX5_WB0ybh6y90g#=e(#b>WkW_K4bnWsOxv<$^?Q1BV>$*B(wJG$nda9DH z)@zP@g6es*!vl7Nie$(DZP&5Z{Ut+qL_4DbY;~Q86wqMQiVz}*2qQKvF|%KxYGlI8 zk7EaNf1O%1Px6C8Q>fSMCe(WSFM%5p<)2#ah*i5Z$0Zu_K_g~wDl|X-a18rdy{Cv6 z)0RHhN$iSovttPfQLv?UYTUd5EWzz$+8jRr;}3&q&Hlky_lJ9b^Ln@g>71J@zdpn}Hcq(>GU^ZfrH>Mk^h}2P;CsBcahv+J97onA zRcV#B4K_yOX%Ey`)!Lhj*8#T@RLotEK@q6574JOVQ0X1Xjxl#+RHokA->>Kkmj;an zu*zhn=5g~lZxq4E$tT^#R7`Z_IS+}X>jIKqGK8eK2}IJxyf#na(J*^%8KV)IXx~Nw zQ&8X!DzNE;F@x_5CYC^5E~-;etaxDXQ2)N`MBC!`sK6cgT%aFv-|RD!yvGzZT22MI zDZK_;F@4xb_S=m9ta{JP*Q@3O&P$k2URH+(+g0rNQ1PgC1FCis4JmUNXm}%6Zutr% z%VoFn2mjaZ;9&h@o0Pk{z4KzJuWRZ# zUkHJi$7H<(-voTUM|yPw-i#pLkweKMnMvFAKN-MhuO+UeyU;7eeCU<3leHOJ>@K}> z`9IwDjCEUP#3Ch|z0DyH`Z{E&Cs@d6Ob9wBr3 zqtUZR`;mo3+nqH1-Te6_!e1Qfj<{a~Bl8zP@yzJWMt_;1_gIdbYVzAILW z0SFjX^wnNm1#OyTum4Z=#fH@9{PQyzT2o+2yst8o%tdSIuQ?HX zQ)|N5Y>jb=^VheI{V=_9%F67BcW?DhYCwOvgb!SH!IM>RnkVpN4Ws53o)*}zQf~*z z`%W}*=v3}COUq?Dv1EFM*DS58(rYdon!hcVzsluT7m;5&F8S++=8pvV{i#t-j8l=W z=e_2nD^%eMRd#%}|0n7568PUrQ#;)EG^4FAEk#L~>9ge7hysqf|xT7Z0X+%`L+RpN#Ui-hr1wtkR*kY>#9DF`(6wHyXzesdLB z{bor$HfTubaY?XbUd()%)mf?bI;%f>+fa~%nz>1*ynH?{RTY9{{liXo74vP)$KW~WqCI*uQF1n>=4GroBiBycb zBZzJD1?)IRf_`!uB#AwnQ}YiOURc#QVKV=a=vUL^QPbqn6h|I=P?Kh%T&{6t>l_zVgCFBCC?t2R| z_wP7gyKm#2np&`imTxbndlpm3$U^dGm8QmcZ`rJ-k;8@+JDjp~|B%wc`M^zMit65q zcV4f8fh80vI%$ykdT)VJoWZFgwS5h@3JFH~P{x;(&8W0ZU05dC`DyLgb-c}G09x}~jLl4IF?`hgTza+Lw32U+!%y5RiX={U9TgjD zXWbQy}lgR8EFfdy&?oA(N*HX$VY6hOoJ4ko>;IKiiS z^i`dv&oOh$n^u%u@-zel)t1VIL~jVV`9G_GJ?hy=(^A0_gJf1Eje?0{g=eWv-F}LpM3u-c#QG@x%>tkdjX}w?f zb83c}>AR)dba$KC;T;i*2J7RUKS3tqY?Dr@D-(~8aUqecBMu!w$&Pm(K%l>8?%T8Y zr0M-}Yri;oz7OL>@?71PljodQ{u(c=c|~PA+q!Dwo%Zzc&Efjm&l0-8QO6AW&35hZ z4IaU-ibQE;kX9(|AE$XD-gzrHu2>2bPOEzcKfvBA?kfDv{oC@nCAe1!(5rIxzCHcn zV81m`5^tl7r{XsbuCC)wTl@)sN~ucFS(P0RS^JBF8;}l_0KIS(9lNl*b5-hKAGrXV z?GHQDAg&-L>kI#~UMcO}taVWb+z)2o;gP0S1N-Vs8_4v&I+%;AGWuhH8;4kvzW% z8P65(u9iCQIWksSYn&@ zm*o4y;@_!BgDfbMB?9E4*DUQ`@jFV*eTog{-LKj0AaUDcTKRe?Rb3Fj_(c!`uBaW{ z%pQj#@Ps}vDz$bysnE8w%g^djJOm!xNF?w5pUTkcmC zzoz7Vsl%t4_MbzE9=w$wY;;;yGq7lyI)Sc*0#=k+Ou@Vm>)mg#p+WJk`HUOJW2+n_ zX^mM<2m+ZlhDekqY^?S-!pzSoGnh$Xo9;4C;CEAD=1+pmou^3ZKzK8Rd1p~Dltx95 zKv=eQ4*Z48oc9Yl*$WZVya17+>dn~;_@%M5Vp%wrIR&U|4t1EupWB{8AmCMF`1mIw zfa9I4v2tGpEj#&8owu*vqzdy1@%s369oL$d2^XfX*Q6%PR*ZMrMvTM{MKH) zf5qEsT`#S@_*A}5eK0o>AkJlFszcE2yPJotCRJp;ivD8o1XJ?_v!@i-VTe<|O(W z5+GERP4HGtt{u|k83j$As3y7n%4WQDNXAnOGVZ60V}pz-h(paef%ENxjN6ehge51d zvd6L5Cx=*DrYU(sb~eP&uO@yqXD=5kv?RH=BHpR#SW)xe5Jw_>gDJj23+%Yn&j^h5 zD*aZV@}#JVT+dihm~%t|?O(TAv0!;5%YB^|v6dn5-Y*soyzeJG2x4yn9-SxMHFiIl zEuZDk+e&skb@@5llv9YjwiQx4b7kKU9=r_Xb9O3Ln<}g>Xx%yd?k#Bl?>Ka_XVX4e z6JK*#ht2eVE+}vv1y3|0!F;+X0it&rlVxVu_Fs)PrS1pk^+Vm?M;!v11z{Q z#CpQ7>$TIk6+Y`0W1_31$z{6Dk%gvIauO_-e9JR30hGAnDDRmuP zJF}Y3VVX`_VlGF-!yP@TS@7X{%2WM}%;aK`4TQB65LH=1i_CL>)&1BkO(U&lP{S-F zR`V*@x=Ya_AyMBjue<^U0ul$S5XZrU+0zk6dHXfY@rL;m`LkTiI8dOOT9V(&yFAII z1)JUIW8iI$#Je(l%_^4M>6hkV`w2f0t_9xWDYY#^^ck7^Z9t3L!RfANguO2j)S$!T zrS37squj#54%wS{6cJ4M3cF%FgJ*KwrdKEZ2{v5d0(z})gHy*l-PU===*vt=-gq(E zTPky6)H^!{8O@E%4&HbT7&ZRQyX@fhPDx}Ixrm$bioFpq-gt%HSm)CCa-OWSdVCVy zCz?S}BPBK}7d<0m?^AO%OK#v&<&Cc(sqw~FlGJ+Rt4Qj-@ikPT(cq1jGWVW+s%M(@ zUN%jmbh3&ijolWk)owX)hzFF!N}_i7lkI_z+`MDYx&L3*N#dRI1xaX0YD$URN_d9e z>i|+Tn+ktFNjT!6;8~8g$(#@|+yB#LsZ|!VcnEU2n@OCT2y9&Bk(vFRm_FWFN#(ta zyY6DEo->9sLF_TZcxR-9>KO6#h@wKL(TX!&*M2-h0K$i36`!jCu_t0 z8fdYeyaJbsia#)~Z&%<{((#fydR$T3S{9V{%h`PCz?U>C^dse@iHSadD=GLHL@B*b zL%h-m5v-G!TJ_+%;OBULX3uxCU+e^AN+_lz0j?%fFzcE-R+4eMAmhd%87m-in6ZnD z!bby`@>cFii236}vt~WN0A*mZ>>2wbaD1JPEXcmitW9^SeYqmd?dxzDofxg_i#L6w zZhoz=z^|9@uwJsM!%n1YU55#PGWF2lPCG2 z$T$%TW$y#jV7=A(JM8`{a!Lh;4XVuDx0Ab1tP1zl-iNQdx!4;YUAf*Ke{~RFmroOw zM&Ealk}YQSiwx4uEb4Dc?Zrv&Isc~L@>0Yvd5IgydWy|8WU70yqd!d`irahW?gLBE zX3}rsK+4UjQ!ByBt!{5$&H=_s!H;Z=F9S#`Oj7Du+=FT`GTe#7!GN&aGeQ z-0leqRWPUW)^aZXIED?al?miSp5=8J=fm8Fqx?>vyc27<2=LJ`{s9hC_Ut5zLuT!b zYl3+8NGnxRuS(AO^S1WyI{fOv&z{{Yyny%_hE)*rn>xuqqf+qgT)cIlc+G{MwBv9( ze?ky>dHds^4BU*WiWKBzWJ+$OB(2W05tp>Q^-p}05Tk~-$ednXZx2M9>OHPV%lQG5 zWzJ|YZ{Gr$R@uTbN=EQBi?AV*Dc+Ix9HKYBg1B{qJGVdSW8R@fRLB>6WXzjX6TfFt zRp*l(r}s8i=|cHS+LGTgrva6S`0rcMDJJS9B|;Y}%;81U*T;u+Pwj<$Ld-0>1$cD; zt%Nmx9MP8S8p!jWX_+nyYv2i4UEcx|oHgF#go}cAgcf*H{bYz(L3~9C)J^)Zorq=~ z;1RRoF^*?(p@v5xR#-&>1`mSmC>(=K@x6G~0mPPNb>`}e_t49O&x^|Kw@z=IhQGZ6 z7M(?dTDmDOC)j~BSw-r7V9%Q2yK-#V)h4gzDKkuviAWB^l%Fy0igo_ z=81M$o`|y^R^q*9Sc~77=%Z1__sR)<4NZEg?zXG*+IiU+xyHesTaSGn{~Ux3sQIYE z(0&@}Ym~B5WbP1g0skDLZV5f&;w^E-jJtJCnk0hTUwYw2=}yE7NH{{$DUh)B2G>s8 zT`p}=eclHgU)d^e5Ps8E61<8nWR9#OlaSBID5AX^9#-50HW&37Ixl5-X z;L@2vC(NRrxzeD_hgI9?jHLpB+Hc}MMtWW5SG}m){sfM7*EzS51)g=+pafT+2r&9h zYAK^YQRH{&(H;09WplCnV#Uu)XcN9t=h57cxRSsR5PS5-5k)TW(>g9sLw@rKmCx=U zJ_VHi`~Abn6!zMx48`s4-?OQmE(RR=EyB0owQr;Dt(vlV8|_=GtfaM5c=&wApxEYq zVcTrH)9Om}-@O1KN?v`s3~o;wh3^+Gnh$Y)e@R@Ui^()`g@=jXwYMM=Q;t+#vB4v* z8WG$)MOADHUZV}ge0r|n(=zwzmSDf|hJsI5*-sr;ute(Wr)=zpu6k>Ts;+99-yAj%AB@XBlNy{A$pkp5`U9zzNB}fKf0&szPw8A;|m+N*%8it{q#U3O^?q%5Z1-^CK;K$ra% zf9Q7W_&In85V}qv1mf1a0OBekXz>v!Q-)+;RFHkHvMV+x7*Ei%2CPR3>(p44UOS}p z9}7w!rqWfECNg_e`hvtrSLCfBMI?Vi_;yqg_KaCO+;5Pz7*nG>(pqHq=-`>9g*X@9 z4~hu($Cs+R$36@bF0dPKe$;KS1yHFRTlqy+XXC(w!R&NgpFJb2g*i_bA(e!BNZ)dM zT1vYB*h2syKIji~+`XJ=U92sA*6LP$=|G8aLT@n3A;oi)(@`MSfLA6Q3P^F&<^1%4iS5 zH6mt?q!9zO&nuA~QE5Ktvjd~HcU+YnMz617|Ij#2n`Z|$-{YNJ%v>FnV z3nk57_-8ZY8d#Ra8Q0OCT}j*XX~$W_&988tks@2{b|`imweXJJMy(|5Hfo~^t3VJ8TrgiZK+RVAzRJfe^B8P0 ze)lIZG1x=YQ70GiN|98f4Hqr~g3gt#6mow(zhh<(`Z!$}Kd%B7V~em|zne*GDlKhQ zryE3K+gn;!Qoop*)?;P^9twXhFcXG>s%ZP9-Q~;m$+`miH2skY5)I*ok2ER0dLA7h)hy65%xD@7Pn2R|??XQ6 zFsVJMufS*+IiHRZzP#4y?^D3lEFwh9cY;fwJ^;mlG&TDCB5oA#Ew}Fq!=PZ_RpZSR zbcCDKU~tA7AEm#Uahnjvd{8ue#=F>MQ=4 zC0(03-V+}8lN0`GO}ouP*}3>!=N;NjPZf1E_BI#Eq&El25o<-LyfC7Vm8^+gXuwj) zF^U3h@+Oq{C+HG^o4g|v{nrNkhqjozFEg^kV43nZd;m#mcx^i6ZuzA*v9|v{C+GtE z6w9<%TeeEr>y+-cCeqFLO6MJdg%au5o$XuPy+)%4c}KHvw}eYAMta{#1UX-pR~7e8 zVBXLBy#}XlGbqr%Ce-%#706H2?NSJv%n-2(|LtLG5PrMa`;)MJU=$fV!TlW0_Cc@} z#G4MXXUShH>G6H((azRm!`Gwox*p6cc(&eqjDfTmVi2>0S1sLFQ}5fbM z@d?|MbmoW@8rxKvZED>gTvI1+qp7uT*rvJ^R3?zt2K@|rb~ZRgY0%G$a5^zu+sPN% zB#g(h}2z5>sFp=hg%LRI;}ENrs6` z@_O$n_*EocdmPWi<8@+Ap6|@5i1>KP!Zzr5+PpZ-(J(XhcyOK>x zCUZ|*yz@2JqB=iwewkT%IkJfhyL$Z2=YlU zT{Sxn7LmbuIaWk|506W~Xwjgu&zXO+=7SuJch&JbhwdzXK>d~s`|>`tvrS% z81XN%$0nh)AF$8W;ifc@jQRcaAC;$PmRFIwTge1dz5`Iol@xpD28 zIpl`Vn`U1Yzh`FhaKv#fGkuE(Z#}vImOuqwLpq3vp*~kg%%UO0T&f-oF>UgA}j>qxVWP1yWz%H?;hZK0apujaMa0&(TzKM~u_24h|6rj6y$fOMJI>Tm1ZIP@Q#!v>#&htwV|S6}mft`k zX7;aQccfRh%F8O0~yX|cf!c4;0wYEPK0_$>OD<>4zRS~{d?;6Df^o`hK`AB|v} z5WvWMAPo_qRf`bhn+3v)zXjH#(kYLexCUSfe#jLNk&NCx-rIUt>v4Q3f~fA4 zve^o&F?ZTm<&J=Mz402}47uOc>Cct)qh=ZOf(E!sml#hlN02*b#dMsb^BcFL%bf)? zAbdwYUSPqf$(OLI@Eh!?N$2M`!TuadzZv%-Yo_i}O?L(NDaw1Q{hn}`oM3-w-{%m2 zHu|!5#N=$g7Dwlt&G$o~2KdFiHmyq#CnqpW#D|q*Y=^|&2nvLJIJuy}S14dkU*?v* zBikr&LP3FlBYR9;P~ab~=3y<&C@AoN3PdRo%40|G7C^2b8+2|*z)gqlGtCp1<>}oU z?|N6?5f<_=DjFp-F4{LPV(DHmo@e5&;}FtOYc<->PeOW}IHQ>vy>aD;nHdVlypoy} zK0AS0sBuQHYW_XiWBd9VZ=95~8C=mht}Nd9j+)hBsczR7*L8l$k9@43>nuPY+fTpO z^I4^t*e5(luoOSa#8z)IOe1!^r#Uk6*is7WdTYemqvof4snbQLTx@$sdUZ?S`RyBL zRowgwK$#V&BU%KthJKst8aI%nasaLd+kLbhbUs{OYL3IVlU*CwkyY`}W&nX6a?G9- zFh9B{V1R8D_+3GPO?X&LZBW2$gJTvH6u4gnMh6A9#WC738iM4jz%zG;`hHkjJ^%PxkL}YDHf4wWX202mK|WOVaNdXR6SKQ2#(0dv zOE1NLt9jLRx?9Vdt(UoVFJ)Uek5T1L(oJi1E2m#u`Q60wavR+;C1S5Ij7d~VJ30It zwpu5FxNh<|YWYn0)50K_A^9F`nlq*xG<(u7ZiigbbkiBBkgL8 zA}=Iv?;cBv3lzEY(7DW?&CmdzvWtQlI7ZykPXDTbFD|hLirx(~uL4KimC7orf*GkO zTtTY2vXZpKy!MooiCq0vs{iqz{^c%4QtyV<-{t1ag8F56ss7ra{(4(~7xiZk2}Ie5 zgyZBdxKy5#A~kqfzB1E>&&6Ex=VAUSw?7s49Adr7pQ6)vGj`Wn#9a7mv=J7e18=}j zd|hD{E9$79civ7#sifbisRKfb0#Uaqm2Ies#Sp0Gm8-RaLv3@33%K68)G_<%7gwsp zl`18nR9RT+HcD}4VlEyhw?0?_2k9V$awff>L{s~4#kWUiJ@TM+wZt+PNi(x`jz+6f z8)n`Y4y#K+i7t(#UdM0bC|DPxq%u)BOux?8bP|VTd257;t zFl2W%EA-)&hd#;e$C^fmDac_CpDTHmAy}nNJ+q|L)n>-cHNRoy3_#6}Gy?bbaKDJ% z7a5hKP`ziB*%zNd9he-Uka$h!)7inpbEOA_$3Civl^{;Rt$&THO>c?BFWynIoZ~Mx z9}z8%ckUPbs@~MqojJeW|4zi;0eM`LI>8@T<40~%T|d9w+SB5-8U(BWjfCy|>uz~H zyj7{4QKDKzUwM4H0SO_(S1Eh&61oQ+_4Zs%C5;OgAt4Gy)J=tS| zVN$V;VRBl&O0(~8876aNx`-0PQ65wo_!H|1hD*&6m``~)86sL>L9gbu3@g?$l+7y zfN;K{$=G5?*PNV6Q(e%f<~E!my`ziz?;k|ZX?_YW;$UF^d>kJ{=*K%>rO@YL{pa6; zwL+GKlx45v7aV&nmo5qPcXokfTe5-gRsK{-6U){A>$vYT#j}*3!Q59P5y#TBX6=?GwUC9BMXl(C^xnOm*Q zB-mPvu=L-o3)$GHn0e-Q2B_efX{W{p(3WfsriL=VaW21NetMpJpYR<^$T&)0;@+{1 zSTev$O@SedfusJS0o<&p{Hk3xPe={Eb;I!XJ6VA52xb8 zKeO5e$B1>^AWsBv!z?1$I@nl6vsZ3gT&W0S^)&i{|(8#iq@fXp?wB4gHOpR$v&lfO=0X}(JNbBHVz?JD^- zCw@;uw6lB85qjpeKdWA{=rm>}e@__;hw8~GU{{`F`%Nab2R(i?OFXC^x0T$){PSZm ztSZ_!aXK;gRLAz>D87hOvvLT|yC8;J&Ssh@f3i;Mim*CC67?sRlEnOpWz@}6!W?zE zr8k=ZG~n0-Ad8$$0J2i*d&kEJ{4Mj(i3nWTNJ~o8z^!CSDL=X4l;_eVWjymx z##}Dx=@^IMWBFDyZOlx)MnOLDt|90*R<=3zX7&_EhJFLttt;pOd-Q%8u5U+mb*P zMei^ot?noGwk?~>Ze|vy1&C`K7`jq2W&wDyGH(y|YGFLeoNJ-eH2k!LB|&B(8o}Qj z2D|T}ShaXpZmq_guriPjl#dhzvH>uJcrH5cSX zZ!rJ(@UDJ;e>e}UKrDRqkLuhm;JIrF!K6s z_V?TkS@`>m!M_9lns_Qnld;yFtt^RjYqA7mk!9KbVii=@!@>Ozbo3- zdrU_=&g%qoOV;!y?kVc06=ugfrXy{K<|&a$FVGXPeS$5AKq&`=NKv_am(^fWM7BHy z1oC^oQ4L~4^r^IM;m@}A->AOS9$rTgvzoHljKz<8qeEqf`$E$mUob7>_xwhA3crf% z;d*RR%p6!!Gwx(mAZ38>(4SLn-jRF9Jp4H6_0S~Dy9i$J(h0d(J>#SG`k1wX%Re`*Mu2HdjZhdFbt^OtpDcm9N1 zaju_t=nFWR6ti2In(H4w!9P+Vu|MJ9Eh7$Kz9_<0Sh+qjlA!s7SCaHOvr`KktvV4g z*wqj-53&D_VV|(dn~v0owFf*y1x4z}AQ*9`cxG8!RDba-pS)DrYy(5u&5v{0%_^^r-=&_A5_KJ^ z|A4x}U#M;%8as5O$#?8GYkn^bh5SCjqEa4&z%@WF0RA|icP`|O*SUzP#Z{Yo#BAv%L|VZ-m*+1_r{mG!c##h|Lo+CrQZWrD{F` zZo|(kQ)#u%25(MtYSHcTg~;e;#<$*;VR-p>ZH=z5uUh3El)cy&Go0NpH_1Cpjr3 zh184yshJk3Ygd6(0LA!20j>bSi&0<*4s{5IXjeaI&MtT#$nVSp=Yo3to`veF>|}b> zKc-Di&qHB?Ok{UJtOTMW?^9Y$+Vz7 zr}r2R?ejCunnufQd2J(Y9s3r)8^~Dh(b0S3=FPNWYP7IEfZ=5k({h3ooMtNto^l;v zrILzFq6oz+qD;Ij%Rs0cuyVt-L@$DscJVpJkoFM561&J6KC>~g3xz@`2B5KmRo8eldWtF#3 zgTYUsj6CVxZHI#NFk6}R@n%$6yz>T{E*3eG*_WU{Rq$NyePGs~XUB8wPma+w_vhw? z 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�WacJutHkMVuV|ItI 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

    xr``({9iYR)+pC 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

    c56Au= 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

    c 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%0D% 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

    $b>Xfo0FjKtbR%c?>dTg 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 diff --git a/grpc_c.64.ruby b/grpc_c.64.ruby deleted file mode 100644 index 9a3875dccc53a384a8fd8b854caaaaec6f8dd955..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2190421 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≻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 z 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

    Hr;`ns*kRr4`8H#II-Ju;`q)%k( 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 z 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

    }9p6NrxMYCBu8 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�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Μ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¸kb5Wr+>nP)~?S_LmLTP<+TdR*7^D${JwRJi=|-;h|62io z>e^D{%k_q6*SX0L7T+^iY_Y#*Q1Jdr^X}vpm;P!0=^VqqcuZdNHkkPlC$BdLW8W-v zJREYIH8w9OO2oiTV~Xn*YjfsL#Nw|R-Zf@Hc+i;Ry}xW3)7SgsJ`I?{A27hG#r1|iaq4YCb4Kb#2oq+H)pcXt;%ebtN&8~?Z>yI4l=UsdbJROW(QW%)kO8;M*%jJ7x z`?F`3{NAT?BX-4@KHhr=kx6S!!K&qT3BUJ+vH9@_>x&R9dM=39OkNk+-_Lt*5_<6E zl3suwz%36CxLGdgJw6^B%W0}FTvC|*xzE`6w6Ptv!00CQGS`29;MeNz z%E;EBQ%-#(@-7B7xm;ppHK6=W_ z7&6*3{}_ZxVGU^2#;p#2q_fX$qg;NY=GoMoYX9b*?KiU+N?zirjbCJn&V4zuKW~0J z-!1~&<$OEXXKoX(SLFHQS9a*_Pm%ov^Z&q?{P?XMk;8rF{>=Nr_Y2~4&2v1mzxVt_ z-WP7^6~DP7a)`d02lABvW^aG|rZVT#b$p7@uZvB?UidaF_Z@0dZq2*N{p~)r@j5<< zqcq*GiO<1*^8LPi@dTmcWbfiBkcOP!?~CZ14wYb#Pb&P8u0Fc%WyajEDXm}X+uY-2 z#?IjU$fx-?SLakt2j*uMLrHpIGRH(Z!zErbwj;izqc@Y${l1!b{Y^YYb+Jy=87h;S zITUVcN8~_%@BNRUWo5Vim|sSX+w;K*9lSiP>=WYCYV`6KQ#R6h{Dk<7T1MHgFiBT= zA8hsa+3b%T80P(z^K|e$Jr!>DHjV=#4wmU-y!Th~SlhTa{5`W}_)GZO!*K^oKk4w&GgdVjl2m>@p7}-i8U7rF&bey$#&WEJq8c znd_mQJZ~xqpG3o+d_4egH4pV4<{QCX_ssylswGq*MS#>l4c@@wHful0TI4b0sCZ4} z7(gcFxZ^dWJ5DCyM3dmy(Yx($ngs9t!nhZe zQA56it-YqxF#O^lk*Jm*#N+K}4y%YxX7{`8H!!RLvxvKHMYH!dh-S3k^yXhSie}#X zpMrxElbsyTK^1?K;>T1x=Hys>rjz)0lUVE~-s~nGO`_>W98a9GF& zQ|$w$oHM)HZJ+IyV-nH5+~h+0+it<-PQf#~;d_W%8iema;rnZqj?8C`8N;~XR5DW0 zGAa_@|J?7;-)KLgzM>O`Q# z-<%w`8;X>=tx2vo6j`jR(rLnpP7~(3wf|+GLxnn01F`XV1Lz=T;6?UV>ztG;9iT6F zIOx9Yf~yfY(7lg=WM+cx-iD1%mBs`vGSAEHFUA$n%uajSJZ=X50dg_G0I09b@h*DM zKwz&w1II47jY<>mS!B6_HA+OcJ$ns)_xAy2;%WXk9FNCC3(q3eNkv7a%ipVIBd%e%$iWP%a5MBD5yC}5&v+y%T=?9%E1gq%=W`=bRQ8O>k zIov(Jv7$2g(K*zcxD=6PQr!3JsL-*urnwQ)6-LUiBWFF!WOnWpt zN#2)vr))Cm7|n*bo%RkW$U;)xP*od_n)&P-$#z#CL(T-9tG*wBD(p_qt@d5tg>AoX zh}8h*5)ds0aeL1=4ym?f)V{Iq_0YcH;uvz>NFb794}9t2*hVM0kLYut*j-RS$=Zup|0f8w7de7Uy1qQ_VuJ# zkvj^7ZXMse4c~mP>IJNii}4T_<0@hNOv>Jh5B=m72j5atU|f+ZJ^{5uMBjktl@=d5 zi0U0YjZ4J-qXuB)j$+yrQ7^HwN=EX>`EfGZcPkI!Z?U4r4f6?it1dK4MM#I)2Iy&9 zOpy~i_`z#Zm>eScqkQ;4`Ov>o3vsS5ipOw~R1?m# zLKWi10^$=^g^w4QK-6Q9R6MfDuab2g$+xdRB0j9ge6>7wu9jwFSHR?4y}9D~s>SbN zjGXn<%VMt+|He;a*8*SSj{tP!FFaDig46en<1IdP2{~A>)%f%5Qm@PpN#wEMwC`ix zf3yGimIJvXm&fxrc$)oH?R76YY{c0_DzbBxF?o;G4V=#KmOjBx^wVzssPYttxwGS^ ziCi7<6>5gty!ruD3S2n4kS#oinYTrcPJAEP zo*fV4_y;Fjan49HBV&slmqaQt zm-Q418NEFj+GfW~B8698iN92<$Q0dT?=a=UD!+e9`twC&wR+ z@6A-W#eUWK_5gGIlH}ry{P#BvF?3ySak{9Lc#W!%8kuxOILE4sGyZ<_p1IG=NiR&N zJN;)W-Lwo^q0-mbk2aeLq5Hnu{t53^{IYpgeBwL@0ec1&Lyc-wOie5>gUNs0Xnd3_HsVfi8@=s^(d+ONfb;A`0Gz^c;$aZ*o?I+=}it=F*&{ez(q9qXi8o>h$VmGz8iW>hf3~%v5%ux zk!-MaxXXSem_0(OFES%!xHCddAcGkpT+S$ByY^L#@NlvJWWt$q?6syycx^W8Z*jgY zHLU-X>7^e04Pmb}goA%vLQZqvjdi>5BMX7z#;9JY)u9s2E6TM7SxNY5{LjvbC&ULV zfhx&Uv*2s#g!P8C8VMLoEfNGDGQ)$%21_z4^#-L@wcfG;(QhIHRGnmO>yp&|Lj}2F zT)&n)(Or!Bk%7o*icoKd`rbaO8`MtwC>QE0qMsWuZw?yHjwhAsJ5G%@_{6M=#11+n zgMZI>U*%`jN{yIMq z{K=~grz)F>vX?Z`Pb+p~?C}>XHf@(HPz_JD65FDTkGOTQ0zX*Qn1Gp4c0PM!nbnRW zOXERhX=d2c+AKessn4Exg$iK}Ft=>CPg^6tMd4C;p?&|Q23c>T%nu+F5dY`dQg*^o zY(f7%LCgg_4tCt*Asuy!gIJ?TW}@j?F~4oK7+xKF%VK-W<)$&xik2bP(Y)t2_0LVkq_E#tS^STM*hVo zuZSG*c<=ooU%88wW3@NId}F+g^?ax~@7l64%g(2L-rD7foB2X^-(Cvbwl#4zuRY|4 zVWB;F3`qpAUdYNdt+rCim$cZ=85=|qkN5X`yw@p4XVn{c9tVA0Bbp4h+=YOcb;oemJ!qrNI)9ncqB_gjao$NPsp-g~C^ zHppf2&+YO4Xx6*%i?kHk8~N6qIPUmXefJ1C2OfD7uY;^>7qdUhiVgC|3ZpAe&8<5s z(&-5gjC3L|G$TR&?12MV_+%E6*bQSrZ}%;aVTYzS{AtATn((Zc2g5r&T=M1|DNS)< z;)+Z9WXXGDS`V8FuBr5Mk4!%qLpq&)Z1;4-*%|$j<rNJ0wMddI&O(j!I%>C*38Z}u;~lYcmo`0Jg>2(H4#6O6 zXqD}?82EC@Ut3l|n5Q*sPqM<%2S&7YN)Fjm+T@blfmc$MRoIdT2$sPS3LC}TX}_|f zi_rEvR~zUHUs4NFBGa|^nvhUB*`r&MTCxNL6fn3_Epr;Z+YHJY}M z%zoJ00GoVQ<1d>ZzG}9pQjQI=)yD0S%XXMlzmKI11J`>*_68<0?`W#n>aw~1MdbL~mupHlEn1YV^BZ>R!w3{#eLhfwK2P(W0@>60Gi zaUckv|JUWM|A*xresVUc$QHG?UYzErkQJYUvAo+pSz0|l;MX{`?K_t9EPISy)n~Wo zY1r89>2D?B6YM@Po0FqFJfuB>;536P!)pS0tw6>m8dpkz{g8xRY$6@Likq-2TTL2# zptn=>X1H=&2(D}rS7!Rh^yk7BRbm$%joKDMP9GZnO4-9kq^;G4v8c&gMqUPQk;DF( z`!uY0s0i)4LbgHdu9BqBHJ_)ci3FKr!ivjug0o@I0ve-1;3(i%w3vZa($>N+ir1JZ z-%`<7NXv4+JOBlw&b!<6U!Xg5mW&yOSAQdMFvvEaO#9OQer;Qe-Cp8sDNUAS#w+uM zPWvfS;p{?1%$?&*6FTi`7Yn8W3A>ffGriIlK01Koj2X$yVq6RMDKD7>nq(~6v}4R{ zl08JJ@f-_o(ZP)9n;IiX0w>!j6WlvH0Q)^(9Czu3W}^*8L{+>W^G}HyvBga$%@vF ze8h~z$1!5sIJ&}$Uj?skvF})^-ntm4s*PLm5lL$#9H#BvO2A=R5IK}vH=Xkqv8+py z+}y&PEOv2;z2Qa4{=0703ru65K*gG7V#bHxAlisc=NrQ7W0Ui7CUC6XZc_o)nvoCl zn>bxeoE__pe(^{1S&^Q=iBVj*W&aF4lOmn#{Wp8B41a@B-5OtW@;z6cr1_=VYz*6I zp9)&^JMpgGhM#F{5ca1%Myz^SMRvShNY*m{;4X;GMhsvc7TR@=5pLrDi3~)TjneFD z!La1bu$%U{%HF(?eyIY~{L2kgrmiYGQZ>fru@wMCdB9#RE@Y^214D?BiD^@*O5;Pf zUnGsU-M*dtgx2an)QH(l>FgbL|7F*7&T$LwJa>oPKV%=;r3@L-=hm2K8K?+~uh{@gdG0)N9 zs@7YlIWsByTY8u8#cT^Hw;v~v849tFT(uTqlGZ)m9pX6#V%=Yr1MB^zO5=-h?VIlJ za$z7IcH4QXC6)Ea_7mi-r950Xo5J&#%8avbAD`09-UjI~W8%f<7PY(Tb+`SZqblti zP%~C+658Mm`w94;4i1l(a9gYdejfr9evWldI!=-6P@4XxZvoSFir61q!ZaN$<3Kdq zbetxszYW;ujo$x+-b`)=&^<1o=?0KL3(&&=%04eF)xTfTzMs|pyY@LlXSe;1QNmm7 zd$oM+wr|a$toHp?3AFENK!MgL|8&~dctraO-1hwii2uHQ-c z^ow)^^LvhJ$L+vrmiC*rBoxBd39koPHk{bkgLh+dbVc1!2AOOrZ;li(OU+xlrqYqo z71*faGt&iuXs;w^OzgIwL}1IWBB9S>23HW>p?ZK zhs_&P3Gd<$`M~}}OiypayF3RtcY+z}Os=)X2Ygn`-}^C!nYP+Lc}9d=;f;ta%7x|e zp1#Ex!tM6F$%^szHmo2O?@raU0@>F_qyK|X663G=`=G-ywI;BtQ;3n_U)ZTVQQrGm zTxAx0ToA+6+pv@DES2EdoWYZ#5;S7AmC9*w_duQ*PT#Nm3 zG-1U336HzP6Iq@gNtD!gUgh_W-=On9{8cRr){l=*JC-QdF~|BBvSnNK_XiSAN^ipn zK=yObA{?cdoND9SB&gEZ>zbfORz6u66jcjATCY?k` zL15N9_8U(*op-k)OifEAPPKI__KiY&6di-Z!P|H`AKUVB5+^H>9ZOa));qmjsn=vy z(??T&NzHlA{bb(w@nqDTiF0_>=0Zwum9 zW#C{Z!)D(5m679w6mG}Il3$P;@x0`(TIa=gl~y}9vz`Oxn1GcXF9oDy(KO^zP873# zEC}-XC!f;=v7$}l=d=%i7XnbJFOlkR@@D}a3gF})?D-=Mt08j39m`gdE^p~EstOJH z0y|;~LyddeSo96L{r7^LD)tQ*_5q&BA0N8`N}_lhc-eW{!zu-U$xVpW^{(U<0rmE)?vCL~B@f7P2|X0LeWJMD)AS;Az8eO%CN7RiEYqYJd&A#hmBa6bt#9+ZP&_xZn@~T9Qv5~8DvR6C>sb_m= z&Xn%W`N2O@%^~D^PqK)eh9_h->8oy&TFHh?!~A`l9B+4P&XJ8s+s7{c=J*)=?q%GV zZ68lK*>UzD09vy)>U=J^Unje$9W(f9rjNYfvvK|JrY~OUUVg*hzpVThP(HhS%Kl0B zCRFq`Y@#nM)_irc+Ke8YyiI?duwD<@IjmlfeL!C5SbV5VXZ z33b%-SjIr?iGI#nl?K9J#3SxNu#XC8NG0s0Cz}cwWb1^opQ99-sV| zv0qtXxYz#hZw5Y#CEmts=vb;Lqne&Im?bj%PprEpA5YDX$lCcQC+m+5GUNE0T6!b? zjm(ML4X-%!y>93G==`|(4qX&1w4v@OEo;hUS&c-XJF1~tKShOc?gO`7+BXM@41(V` zO)zZ9M!6a!7H6%KBYd^Ctu_Z(&L@@xZxcK3Jo`5H@4}O1*M7^au%E**TH!~m$OSod zKe3`Ck`FA&0{*>|T-vv00lh{O@KaQ*k9FP%Z^M_`WdF z!S|#u!Pnau1Xl9*Q1F?@9SXhzfK+!n#6Eul^h+T9QuKD{SAjdk3{cM8x3^s6j!|aD z*~3&;X5v0aa$f4zpk3=fNS0oE0SN7JF|2ehAJ$$;{8w5Y}u|MUMT3Mo3 zj8D-%v#?{vPCZbabwp<@nRiLP<9yBR`FOC|bcVmsSa~V`=n?+ml)Pku$f=I3Uf^ER z9!mS}8`OoFI)Nbn0Pt~F|J(B$-E=3n{PK8_(T zzPS=_RX?FSnDj>S+tnr=!&1o;amaIYpZ#nl21n{hMFolQb*TLZ=c~bi)DpLhsc)!# zuaoLj)IP4lq(^Tl7F)4 zWJGg1-kR{Y6$y7PwkLWmr*B1N9FR0X2>TF7v zK;3>8?*C*D`lsy?5sgi^(4fG6hMc0dH$|bmj95@GP*(rO{6qS5=sN8BmGukXt?!Na z;{=1Ke~2T6ocPOq8%n1PapVd4yOn32Tby_lot>VqwhT|4e0M?WUB?w>*B1#4$;F4R z0JwVfCib7!j~Ix}VRi<$*uS8&#UZIh@k&~cw_c$`<@QyNlPKpsIV_Il$JMQP)MQ&W z|E|ui&mC_X=*A)Zy0?MFW4hmwHT~hSs#;{tXM)U-TVNk}%pgE_mxr%nu+SZ5iQy9E z0KxB97dR$J8)u`%LJYO#_P-oP3ZLZo)H>}I0>T1F>%!0wwKK(uNPgB@)Hkg)xoKr! zmR}tG?__MRb!3sT!AQ*-Z+4C^#$J+mHje$JpK0mtPu7 zOB2I*)Ns`PESR$KMhd0OStk^zH6(u24wzyqekm^4P_aD>HzWMKNl6ufeJ#v+y28Bz zL`K&w7bTRt+=@?uBrWB3!Z^Ru3~yM(G}E!~pfU)IHVA|xR_sRfAUz z&ZA(d1XpqeV*NQKYgPDb1kYb7$5?!5m`dz*VpEAR<&E4Wr;QFO^Mg)dw6;*Er!=0% z2M&O$pzBN@g-;j#9#-EP%rlLhQli0cpW>k3@Bx+-rzHcJ4)iu)Hg$Qo*D^lqf<)~Gx-%FX+HW6moRaaUxeC+aV#easg>G?*b}*msg0?;6F@nWSH_|=vCRwuO5wfl#Iyn>nt9RB?)91ft%3E>2 zAu#eK(T11MvCjhgnhiJg;ns2q00OcmpfBx?BT&87q`=sw=eOs{syPrJDu;~mF zgaSnS9r%=K8o^!zUR5Hx`p4NkQ>ZsrSA~yr`~a1a zg9Tw)!8HAVy=RmO1pfeZ-f}Rb=W13UQeT>9l#LNr&Li|l(Qq0_*b79oR6d8lT>6~l z;wb&tse^1@Ro3=`WB6`rK{J_2fXiQIKExtp%;%b{2yih|;?7fZbCx3SbI{+T>Wt^;2$hyQ}D=tjg2lNl|w#FbFET?+niWB~)cw5&V5k9joHe+2}~?aO};ryrZ52VXR9Uivj6YC11x`y0P99Gux- zk+zOX$RlUrHCC(&w})|w$z3Rd;UOubpyM>GmY0paWRCrn>lT9 zmOY$i=6VfW_k12^XZ|KMA+mK%4L*_;s78(^yxzDl?R%Ag0dt0ydE-}i#d53mdxPA8 zur~~~4$9?oa$Eid&aP5Tt}^i|v3xcQVOV6&2PeK#M=S2Oe^bui8#wVxJyny7=2z8JCGQ%&Z{yhbs8fll@mQX>k^?jNITHjG;yz{jFu)_Ti#V?} zS@(exJ&%&(`K+_c` zQ80RdHjOiFavZGFs@fM!_D8ZcohtvVj}R3-92!e&Tos`+;nC@8Izqnjn*h1FmxtS3@Mu8$FbbN5ecm z#xEt48Yq(9^b4nriK`4vbK-X)E_U0W{~Ru8_r}9~9ce?7_`Jhb{0c7XfjCSLo$$BQ zDIBR*cOI;>6Bc=wbOY{nf%`cmQN&Ad_e~dI4n?LRZ#D-GvrW|!q(eBf+J+uim7 zpBWzbcGFXaEPV+*E`P|O$8KQ~oGZ<15_hZB9rD_r-%#H<-y( zc%bQ23YbYM6TSI```TIA%&Dv4Ku{#a#f5%^A1f=Ksm6!AF2ZDIdZg=cc$O|tiOzG5 zI&qY|nfxZ~lgilK-I`pkc#47cPtTx5@rw&_VVC&jqcz~p7-Q6p)5wH6O7g-mLh8s| z#)lQVtxz41uzy>bn-d-HRF(*s?4);ZAH#rH>hKk=PyG@x#}AC?tK*WH5i%RM*jv2J z@mxQ<)9xBh^Q?zsb)xS9Woa{I!Y><7IkzZ`NOq+3v++}mKPELOjJ*~9n@m`id1d1b zK#bNsko>Vj|06(a`UBg)p9=j7k zL;S))2{aveaFAF56X@vpv(x$#qkWU$ZGgu(CWo*5Fei!<=K6R~|l);?#g3}qF@u9Dg0YPuf zM8r%dUz1O}^!zvNt^E(}{oD!k0jqx9+neGC&T*~>qm*LSI>Fz?hLFA_dz~Qa=5r&J z5`SinNt-@@z!_s_nlZL8(>D8wuVuy<-2QLyulo=9pOwac;(%`b#W?-1{P~3$e}49I z>k@E32687}{Vqr4GM?}d^wImY1k|neqXXo+=;J zVUkbl)Am8w^Dey|U5rF~o%KG3ASYZwGolN+!gFx-6y~tL<#_imupjp!N8s)AnC~3! z(ze!#g=+Qyd))(Yn7hF}r4fu?%-A1J!FN^0Ie$BLer~oIECFO@6I$RpFZnzBM!}R- zI}T5oq>Pbw4phyTsJK^vX+)GQe;dNb1XA(&F_y}kqkWk*vkDuC60>XcQF|^Rx-$5r z?Hg9EIcal~ed@r&T`k*2Fv_B>EeDT>KiSH+rU3cit1xG_8u6#VX$F!pd363z+MaXm zK~3d1sv)sKcHlH)lzv5`*xUtVSj4dfzeDT6yH2B$Hnpn%xBQUKdG$M~{w!Ff_i1;f z`g_1qy+3$g>V4?rdLMGH`)>O8A${^3mDRr>6d$mF&qjsVmr~r7N0*_qE<3$|OM?pO zaz7$eICmC=`=%L;D+z`UHJG>9 z-}z}K7Fm-H^iS6M$o&_KNZssF;G6vsT%Jn9huwXw+E)97 z(F^L;6%%GVaM~x#Q7%f&bbqy2q4#R@n-=LN@Y=qCldyvE36_aF7pvN5Jz;p4eeBCP zDHO<^_NOb|PM%QiZTJIVVv{OjvkRlEBda~puUGgsG=4n4Uu0E*@smYKo70~=oEG0j zapjyooN%Mas=~&tq|NUWSyjY4kC6kOaDHS`MQ#lfd&11->!pN=3hRFx!oFBvUUi1@ z;t2r48D0pv2-+%&etmSfFAtWdWqV0brnlkuh9sZb zFF#;NLc}hh48Po3EEsW``0;l(a2X9$gOcvPoCkb4(~n9rpaznlSv}3gkYdHds&f*gJ^uj zWZ^&x2z(RQDg>h+hOb~fkFl;(D%ieJqH>JH8_gG-YTxBUq%yzmEfe0(fZq9>G1=D= z6&KD6M9=1QoB1UQpCJGZu{~3>BIjI1tO{W>uPFJjZiv8h#|{QIfFPIb#|)J4GTB=e zhrXA?F)*0vg>E3?1MZsHC&!-mV>Q)n+*U&mZuW`~n5o1&NKCvWt2>pWijkSz=JKEH zyTvHy&p7ZcW#8#N%yDz3e(bwA?@u7fqsrm=3`hn6j<(KOH{cx)O0gvmwEK~kxdjGv!-Z`B79)0>@A^2#0 zp<2^7ckkTs_O};93r5^%GdkMG8OJA`Q>_i-aMys#_mctDTWP=e1Cte7uUxEDSvQjA z?T9+2yu@jD_rbOkTvHxUNQLBsh9CVJXAELztK|{#GBJ}5*KuK*r3ApwT(fbICpWhOeChG=hr z=nvC#yTnQ>I^fK!`s8HQpSH)NYnRGGz#_-(Mi7d9>`=@GBe|m5N5^SZ(K*F<#Y^1% z6~=(Xo)Q;j+OyZ=sq2@uUoCMSV6yz5to6^yj_0J+yl4KS16GN@YG$SQrC_PvU%Dm3 zA9~NfJM}*FXL@hAGnL=r&-_ez!=DYQ^2T1hUPY$#f`1UFof;1{Zu!KTXt(viZt|_# zx7D}zc_|EL#z;7`SDIs`&H+Mlw6XMz636}liY`9lh(X=RpuI&2#kN=4H{K+1H1A|j zo8$WHv>#stJYoZ0GIQnXEExiS5pQUBTd#@_l`kVPjS58hY=3Z=;BUoD>WasSMfUDb z&53iga2O@*6DYxVBmWBQ-w&pD@mxHt-}YYgyzEX*3A*>E>wijJEnJ}N#^>+Yp7xvg zhRuh(@M!yV)oA8UMd6cNOLAPXV54W9ALC!dK_Vm9oqzlc{><_O{F;o;xU;{jNMvUk zSYV$aGJ)}qLGD@esq&XoUM_@8!Bni?>6A~otK9i-xBUx|j~H?HmHmwxSv5738EXFk z_!jOB^EJIw+O@ z1cC%5Zct+J9u*Z76}+@TL9-HYqe1ZwYLyl*Xsc4)MW_nF-6-4bDk@&9^@g_gX1}e{ zptS-)BDE?AUQnx|Sm$B2m8wX*<@f%ad7j-3+W+hI|NVHq$UbvFbLPyMGiT16VF=v( zUHkBRCOg}z!FrjsI(HlorDAZ)^5w3>I`84rh9W?=-9UG24s3MmjuNG(cp$LuR;p$7 zW6So&49PPB0!PM37cK{kfsPwO{TIxQJ9{k0-F2UAH?U&vScJHzD@T4D`}rzWP18e~ zkVuP;v@FW$t;J9cAFg2r6jCYQ!>Q6oHl)IUr z%h4yqv){!e1?;zNYR+9!9lL%UJ&r9Lj|B6d%!--Y7j`yycro^7b_;` z)wTB$Q{HT;{Gza1iT}m*gcfF7=|Uy$v%UQ*PBpu!YP~ul;T6z}`}eTU1n%eH>i=%y z4X#%-Eb^$ld~A1pVQU}$jIaPvevm_T?|Zyl^<<#uSR(nAw7KKCQT1v$FWB@9^hxk&8jVgbqyfE$?r7pT&U81d7W5WoJHGT^w6((*!kyc7L4~7vtM?<`q21h=nNA?2(x(N z=yNvZeQ8QboEOLNm1r&5-Kr6&_$lsUG95`j+BS8Lt)>sS{C!TN!WOfyjW-6E*;|PT z7TTcr{f;DCnPLpAL1w29!A&Y--N&;hlG5MQoO_R+u{8g?&9mAQz(!BmXc?BKwtkh5 zPLp^+mzyE9sLH}`c}||KRyjRH{xPSu>wZ)sw-e1=a4p@Qv)LldYgbe3gvDZauWD?- z4VPM5tMRq?slf7ZJJCx}1Ix+sB(e{yTh zj4tU4x7thJgY19fVcIP9Wk(lyJ-E7&`UW*BqA`3tMC9>J3~$i~Akj7r%NXBpacm9orm`-Qpfmb@XjA zAhdKIZB&`aqF=G6zD}(O3Py?L@*|^vAt(--uo9Fc!X%ia@G^`96=scUR=A3F#KI=e zeOFO)zO1zUNj9zYQu&z*%g8V+f1$$5u86{QlN4_1As>!Y)CkpACSN^^{Rk>0gsc&X zk^jZEGheeC`CLEp8RJ>b{UW3l9xPDwe}4jzWDjA~QDYTtNQ?-)nAOS{GKhy1-YAK` z^Q3=7#n(gKC>MrYW1X{0xrIh)f7b=o1p_Dg{(!GQ;rUqqhy7iv@S5pSxNe2QrvRPO zy*`>(%(X+17Woy;BNIZBlf=f%xgqw3uqY-2b54ra)BgRH*uhcMB#xw;(((3L{Eg`S zu{t}+IhzdPcmJB^CrpDI)-ROaG!d{AGu!R8?v|ITn2X8#LdJ)rq+;iMq(+lD&4kA0 zIgncS?AUcPMZUyf#m2*BfUy~L%i~28S4aDwPD>`BCb3;bDo9{x-dpt{I3<$%kX`g4 zsHYj!SC>KEJ&@ZYI!bbF)e-`^o?7<{jpaUqKf9ZWw82qiD6Zcge-jLQ&lXV^%j^RS zfIyzZ36Q(JO#ov*h(BcWPqZnyt9#cX5z{}HeZNwTeNGTs+;Sy`YrswbAY?3M$IMKd z`wIY;TjxgGvbIcFEWWjOWp6Tdxti5g5iOpo@OZ^DZVB3s3zlK3IeleqMKVRyfr=Wb zD70sLM1TlwF5MRl5PPOwKhSxBfd>AXukrZ%I-w-`a8aN~#-JRkpjv_6ODBQ&!o&DepaYrt(@IHrx#3CXLiv8m>kmZxY>rnK2T=MIBc7#BZxMh& zSv94lM6eDr&90dv_+E4SolDzBY5BTKh=UA=xlcJxfkcP-B4zvE=)6&WN%a(&6j(a7 z^@8-*>Y1nBaq8(MJF6FVnwn+>Q5O$1k(YkTaM$1(1(h8Ze@#9kQ{M{f0|Pa()ziZlMi23_`Si#D zPHtc5vEE1R|BwDl3@z*bwq^Y{5Wl_uhd}hvSpUE4KM!Vv?MD5-dDl|^1(okV`M%lz z*}ngFp}W0D|2Y@=|F8ehT6zEfW|Pm4zk&Fz{dc_S@&B>^V%Hw;QUA9u>%XA#{U_fy z`#;O~KVec&kN(HL(f@EgWiK+BvvwJ+ZCI!I#Ze!`9mnB2d%6T_>lMj)}lU5zw=T0@737}wUPE)t7(zmEwT_4!{Kb9ww7G&_}q3a*#TO_O_pil>SIfG zyWD_ymaPZpx``aSzDlbi(n*Ow)LV>>*|uUnbDaw*)xC?6m7#3R@S@!fN#c*tLy(zJ zT#rX8Ts1jbe`|&++!UUd!^d`1c-e(f{+fQ^GiWN6@48y)=M>8a3RjiNuT?k`miPM6 z<%;^r$6g*JlVTBK+K8YpPfBI|3jxR8`XPqP4 z@CHsFQ^%rCs@F*Mai>;lq;RpZ7&%(Tr)!=R&5ZG=^H}rxv0UzUYH{bvYN<1=Z~cqL z5)6W8j;HguLMtkbOdR1J9;=8h047v|-%#vN&r_IxL{0X;#d_WEmuvsNB!TSmSvzUDt4ri=5R3x($SQoxEl0h$jm=VKhU^>g@7O<)-JktIFmJ?% zg+KA}cC_9?uQN5?YsMGp<3fc`p^Z>}oTTu4)RrNAG%GwXlrP2qMX&Qq<%cRfuvC6W zg-c5k+04FgBVYN9KD>9n9A}Pd?X=szPRU2{RTU zr8P0Rms^TWfoa5XVrfbMw^%W(u)}RF2htlT&fPZmeoL{2qx3Apa0xosgyn~Jy6g0b zbN@XRf2_s-S(Mu2`f{{?lbDdNJCv#sjK4xiE6a7h*;icU`J?X4#M{U67b&?`Kd-y| z)>>tXH@K09Wv428?31x6i)KZcJvQkH9C}FLn3l-%60B}d*W0VD9K7><30RtnHzRj5 zj>z#ct|=ogbBR($%BGh|R066P?-b;6VzO44Nr|n0! zH#fZ{rHf3)SgzSi*a4aZI7T@;IT=U2iXd3{wGBn#zAfgv*k|8nZLYmRk-n=F*!dAh6vPn*Z^U&wrO>)G$xBr)!oS{KcC?!UZL zE)PcYcMU3B%||$m&EHeP{WJC1{GDIiKiAp(9T=Xkgy#cAd>+(fy+0L%Tl33hbvP_J zLpxaY^#ozsMk-i0MCUKWom1A2la zMhN3-t;y7_hG`CXU$E-*JXJLQ4W;o9;e9X?yvyLV^MEpVNBl2%2bIBlmGEAKcaVnv zTi_k1T#~m0FYktfqW=MJ8EVj*Kqid!wvu3~a@EvJf=Cm z%00p|XJBy|Sv2ka1453=HB5(Uh3Wqj8`#u$5C~mt>(ZUoaDP=~S>gD&CoT>tVJpmI zIW)CX@6vkLqy2+Q?eC%XV_#8L(x3<65CM>z<^kYxF#g;6l>uPm`;GRGh}s`lT?C*^ z{}{?QejXu^g04MfeM5hDg5w-O1J0?6oK2)er$$sqWhOvG{(!@I=*#1((hIO+SszqW z!LQ0IX!L3@tHIWX9e=9zk#m@E{`FIM4SQZ&A32|&Nq8U&ix1ZY3eQJ=lYAx~EvK5g z*n|)3@nEpWe#`f-$S>^PR3Eoc7CWICrL>x|Cv%m8k{zEQ3o@To`}RDXMf;X5&d(BJ zqxqU08d-7v4`cX5?(B(#w^FzgqgGBMS>E8U##AHY2u{T!enjTAcoTB-qrx0t%C=#d zBJWXT_SM3YMfD)v&D|6--;N}YIQ8bO%hBsZv5X9o+?$`G+RL3#ogFh!6fq!7O_!8zyqq>uO%{jiILJ}q--*<4L#xl5)y_SSK=11Vhm>Pm2Penyi z&jsJ7;~_Q1+KwVnSOjjLVOqJ43qw%HRmU=XW6ZU_FrXP%FR?Z~Z8|=Cq?EvdvKq+I zI$u7M)mq_+gpFrOXTHQOA~)!47CNQqQG;$xFKo&-(5K|@)Im9X*zEoTg`vV~`yJ>~ zYzy}lpZKvy%S|oxXg5`ruloz<(Q4>Y8VcSJYvwi3Fz!s^LaZ049;~Cw8%4PaH{m|3 z3eA?TEp2r5q$4Mj9J~H+)Djl^z!!6S`0Vl>G-1vR8}`&5B`jm4NSWYf{)Ca{#X&vp zWM{=VWXJFb=;g|EC4X#~Vr{4LS-2$(;LQh0!}bhetULHVe>5K_uy}Lc%&^%h4<{6+ z2XZSxMRuv2zsUCVI3_jPA-7>Fbx8YWTT(xteR+37Rj-Ooy{qurEHl}B-3dsQ?r;sP z&iV6omy+)GQ#hK|zyDa%x{Uvo_8SuPF!aY|u`Xn1MbY{&|Dvo7H+P4c#m?k3KOMXN zTbzz(yEPZ6r_8A_gOW$kg%8;jFL}F4Sn8epDZ*MJdu4U9NjE?e5rKn0FZ=p^it%r8 z^=g0=nS-D%_uJmE`0(~cxSwG`jU2k9WwO8?rzr1@=(d|W#c+blkfC`47Tv*B(5KjD z@n4y|JESG|gNgR=2!`1&x$S(9c;6RPaD=#@!I!Rv(VooE96!iaK#KG^mJvMzQpni# z=v?4dpHCuJgwlUkqI7D3+g(-Kde-6o3_kq?xk~5j3yQ&u6S?hWVELjJKVfuv>SxWl zDlYIZPTp@%RBg|j_vyE5U87N#awHE>4!N-gXaAL)klvOXtmA6kS$>*(Hzb-APf#sF z5f>a=0gPj|@y1r305O_oe{B@Bf%^pTO>i;%hVBQDpS&#fauI*Xk2|Kc9&y+otzQZc z4D}7Lo313`Q+VPoTE7%t!+C`&*Yeo&unI;L#m$j>Uu*BlIBbg@A{P}Uxp5MfWs;}6n3 z#WE`?1G&(nem-M8KlW~Km*gyMf9l-_b0pt!+4bXd?a1#c5%#WsHcvm-PX` z=N(0~y-xn*<23V-TGRZXAXnN;>uKE$Vako9G>1d!a6~8 zx05yebnKd2MP6l_Dswgnb_$nUKQUjp6QD>k)&7F?ahkKB*{&wmVO+Ov%Q(IqZ z)3NCNWzuDtEK|OpqVN5#fWAKo<+mR2hi{VNDfLw&?GAVM4>hQZH44*WnTz^~B-Xmy zxEvM6PK;#^B$hSq#}t9fgs0twv;2OxwV^SV`3ot2EzU<=8vE=1k{0qcKb_8Y@FiWQ z4%g^y74L0krfCHpsc9rO_7GBu>}Dpw;##oms18PE$&H2Iuv1 zf!E6tLtEodr76pgzWFlT?ol5(mVf+EtnCzrRh`g6UAVI(|0i-k4^QQSa;ncGPK+qDR@4LYK53B{lsn_ga3S3)mgxtui*``#p*x4A;Rce( z-ZMDQWPxNoEWi`8uc5ip4ExQFb`IFKI~Z+2d8HH3H>Y_O(_WyaXqO>3J#N@$o=k?< z!hBl^13hv@zOGjNo^YA()&7RElWSWKZ;Z8#wm>*2T(NNbag_t`vB-~Qj#6U2=2r}^ zyM|h=zd($Q0FnZYFB0Q*S9}q6u`k93zR06$@C083@i>;bn%qLuWZ6T_81Z2f7F|DX z!PK-c4!@&*EdLDL+$&DxFz7)HsK9tj$ifcI@bXbm!plZ?(;&l3MmGsPFWcyjKSvbI zs=;j~mJ;~E1_pgMu;p%6QaI>bsq=&G-64^snk;JZrUSF9S%XI-i5b7z==um6_HiRtxH~Vf z(k4!uJS<_h%iSy@)hs>M`X|P;(OsfiWv{`I{&%8U+UO3as^ANFx5+DucG7^n3~oF` z&G_|+wLMNUWb>;_JlRMC*Mn?~uG~kTiY?0cC13ZbaJKu2R1;2EY+Btt4?`OHxML%^{g3FtypHhO`&o++u>Jzcn=DDEuYJGT#_Q~E&UP7 z>Go>?#%4uCjvc2$j@zCE-mZ;mC-W_2Ru9%&59XBh;9aw(wjSI=CXl9|9zD2C@j_aU z9vrS7yo`3({qc+<&X#b$s59m3{6vF4jf&08*a4lo2cveNnkP?#oN zj)NCUzHyNUT)T}PQ`zmOLRU~o{rW4(y<5}Z48f4ExhpKc^c&?jY-H%*D|>FL ztOyPgoEmmjR_77?1FOss{6f?rC0F|7qb(VUrXu)bd2(N$yq6_kt7J_RKp7B%(m;lI z`!|qq2Ji&uLF;Pc|9pSmyionIN`9u%%-8&b7-jHAD&htqQ*b+}`~{jT`I?8qTz8P( z6KkJfdKCQF=V}deU1k9NtW=jDl@-dm#?OFL!>qel*6T}I-2=+?0=cvcD)BRbxC4F@ zoN{n+|CCjDO+4B!)y!0QAiOo)KV7Ksd=6OreyipVCQdN0th~bW%gQUfrg)xQ6M)}f z{fMZ1pS22~Tgtye;RRuSC~c9#gG=oN^f6daR$k%3W#tt+yyg!rRZ%OXa(! zD!no4UrnI!;8OXu3NHxD`}4u!iQM5}?gtmxM0}1Pu92fvapTQ06G`XO z;5Em8)xD{&sY$4i{n}CdP{}Sno$E16)609&-_c4I%fmUa`|@%vd8eaye=)hec?*_; zbU3S15Z}m7g$iCj-=L_WSkDZLDO;vrNF?&R9^iK_H!&pU`NUp0eTGVs#KiNBz3fgf zK%7TdM|*f)`-fPHyPV4G{ei$aTqLq~G)bxQmK=Ybj3#Xzo0UQC?(t04^z8Zyo@qXP zkoGQ5SY}iNbN7&p+N9Cyh!`OW62!tdlJ#A zT&BORdnU}dhiZMvq>d7Om-XNFZhPm%B=ZOSQa?I%ctzX$!qL(GmCH@G<<{jUHyfi& z6Og$3&i%Z%IaMNB+vNwZHOb>Nt7W5ms6{-g%bl$pl7}LI%e5D+%tjVj`FranV~)Yt zG^9|p`GcuGZsSWO^8nrD_W8p@r(%V6>h!JsSADU7qYc&E|p_cRA4lXmQ_}-=zM1olNW;NuJdarP^yZ(5S19gcb<D;5=ocy8}}m=5Vc#aevqP&U*!F>H3rS9=SYr%@qi&QMZaTZ3>w!`WMMxEc>;%-Oxq)(qg7b5rvBI@0-wspcBOVFsykpydaXXa4A#7-vDhUFiA9-3OkCoOY{gulMx@fs~tS_{xW;f z;{DJ@wx1WPQ`zSj)AdX|YWm9^@$?LgxIOg=iu+ZyfxWzFpl zaVI*Z=i&U1O3nSXwr{$I7z1f{Ef=!Zx&;#;V2BvfE&?NYfL2My5@rfy8G`gm=!q-{7X;(&7x6a|G zGO&{(0%eAG+#k%MW6_gj6T`TRh@-7b!?xNe(1Q|Oina`0!BJ!_r-z>WE1~;~Qg0jI z$_&1jPnS4epe#0S%Qa1QOZa~XZYN3pwS0aV-uzLEsPdtX(dOCBW*{x1g9{x*NL_;N zVvq=4s)r86aefG;xikmXQQ-=j(7tN8mgWr%faT_dRJqS!X1i0P+(OkVt9oL!$5gYu znDz6)2KwFOS=wND>Hkw6U{$QP!RtvdjU!i|V{P9RvQd|aNB->gQZJT~nCF|h zpH3asoI3_(+UO6aF!LZk@Wsqawh*;WQCmk*sXLkxAqDK!S_h;|8(W*oK($vx+dAod zn&Xr3RO49sqZhFXGyVKP_5`&J?k3#YYOjAReJ?DF_(@o(PDs!Quv)pPA-%WV2kp?v zAm4~8b!X8Kl=tZmJ(cSLA<}jx9iWaL2qdifLuH7Q~H$HcTqWhO} z|Jg@>`U9fjsbM8;D-{iT6B@WjKJ`PqKSLbJpZU6()Fj%uZ?ueE0vRTh4${r+M<`A7fGqF^zFlRX|f90VtFZ=CMx~oQ+)k5kREV2 z81h%|q;hJsFNn^FZkeo$kK)=(jl!-3Xw%8LU#yez=@@B(y2u2r=%zQHVDKTWQ}VmyQ00IB2KkOsu1<1=_#^XL=qvbS&uIVIXNAJaaK8-wEmHW= z;{LVnVTBLH+hDj~T?_t$N6X49d}vvDg_B`<+Uuuqrj);nArGob`2&TUO6{#xcp1*9 z!uGOsE@pQ-S&aK8+^7b;v;DnCi#OjtgWZ_pI7y~1_XNFKb8Bu9TYf@hP#>MA#2 zh4CUC6UQ<)F+d|;f0A+SE*#+ZTy9!I8E{l|ykt`xRHC(7%4={d+(W-LoBgBx0a=&( z*D*HpE?cg=oW@-HjM8Ubr=Yuo0B8OpdeN^I$`bu52O~VpU0#+;`;P!N1D~<$SjE%k zdD?FWu(M$B9udC!tW|iy@F-l9Wo-_sO6fBd&V=d0pTf(+^J?gClEO`gm&&tX1nRCxW!sJ@zq;f=w$rTXtsc>O^>o$^_Q2bapv zRCqyHUh@U&ZpH*SU(>C*xPci~!e?ktX9i#L7kaQ17YCSEvVQKMx9pakd~vghu$?Tg zHozM>6SAma{C_GdyrJsrq5Oo|)0wK{v|Qy8y;2j>o2#!l4kOWX&t;DK*M_Q_r&P7J zR4(p*8~z?_^B!u#Xu1x>!@9FwQz@Wed|b7f&p?w-gt*h8{di`caBCcL1hUfa)-f0g2Xq@SMAT9Mjc zkYJE0b6vPsFTeG%p!ox|$~ye}DIZ6-OJu*t3FUUViv4>5BK_MkyeVE)nc7;;1T&gH zT$z2Ly4;_N?12!wuqUdy@6^b@KGp)~YDTvCM^%$sXIIhzT;RD9TzZ7PKB%7? z{Dw`9S}byz3C4Az{De#PMIpXdyS;#4kZ}dUziG}>J!{=phn2ib8ooJHHXB^o%XY7f z7%@rV`Xr>?NUs==6Pf4nb~ahX{mrGXedR^1p82)EDm?G!m)V1*MggPK2A#BQzV{8|NZ{;FjePQTiwPDA9wT)+PQM%}4hD zK#M+jI`}vq;oMmtXLa1J{bR+ zy?KDVs2-kV!ZTKAQ9oVxOPW8yk>ri$n|GA9X|%ziyE(DUG?IZ;JA;P8-DR@bx7hPd zl}p3 z?mpn3h>El_OmMxaN4=l|vR0!=9iMgJ44sxcJ!u&BZbo&DUsGa@GNRQxR)j8X#(G7B z+yA}QL2duPv|QT$v*YUqQ|=-q!Q*X5h)AU!;b}raezY(dZv2T(eW&%O=-meZbHA4C z*9Nw|`wCS(7vlUnsxLnAJCFdnsO%bc+}h&9aK=M@?9vw^4N93L4cg~KX@cIbI5WxY zx!ZD+m>P!Bt#Emu8zrB+^N+HqSlccDO7q8u&1)yylLhvt@xq)E|4Q&&azo)Z%Ix&N z$^hTXtJ!5;O5I!9Z`ycgSC5rn_2=CSM}%N}SEQCdrq>97IbcUBM!WtUei+HK3Oj45 zTJvLujJvQz64c3uTXnEZBG}PJfM=)nX8m{<=Oj)lTEaV&=PdJl!4hM2_A` zwKZF2_DE;ZVRHtxymDOZFHKi7bJ35jJwLu=arM~PUlzL;Fd%78clS*_L5qj^7Twkq z*I}EN-$o&l_qcwt$-(tzpt#okP{n^GKD%&iU+&$F zm+bo>nfM+nB!b)opIhWS z^ygc}+CC$MApH2@{I&>8v!mN%nasU9+7DAI>gBCludF;MmiZ|az?4geRXD+G&J9OE z!F;_fMk+S2(v0lEXUmjv^-V{NsgK<-hgy))V{Njrvc;%WL;CZ|)b#PW`j*_##~aDl z%%rGp&RxvvxYpg-QC(rN;t{NtKO+p&3Bke+O!LAFid(5Uf#VEO@=D+ z7o#cXK3w7-y_yw*LVS7!Yu{V{{e%34e6}*5=nnQJ8p!h? z8ORs&HdxEhCHO0IBf^?-Tp{@Hq-NefiTqvF<4clTJTI`KwB&zKUD(>scUzEh+q(Iv zxFw!ls^yFQ+e0Os^VDsohOUpBf}Eq(<)V!MFi1l8+Vg^V&!BY`9zugh{~YYWkfi{l|fkKBTVe z4Cz0(d@21H=|dH+Dy8qJa3)MI;+GACtP5OD=ImM(pLQ#65lUvw*0tq&mPv^ZRRRZ3 zokO&$oWn?o;%+4}k}aNKc)R7?)AMf~g#~Wq{5#mdVF+KG2;w#FWh-NS>JO%F%Ns$Cxnoyp9PwVmB=w+7bKP z>-b=9n`MJ@I1-oyGg$g_6cr}UA|c*>3xA`tx7E)|YB3|im&nB0qn{pnTopF#kPl*@ znid%m4*kbhx>_=4nZPUU8T|efaDS+ZZ5fs{DI)040`J)t2o??Y>PQJ{J4Gy2Y>=5cAX?l z%pnlqy#jvI;tBSpBc;8E`W{hc$^2ygXreNU*n@q@Y%4#}Yl&8_7fFb>U%}sK%->p3 z9P@Q#V$Ai^W6V|fTgLpbzvIaZC*M`Hqy8g9p0q#0QfJj*>aPesfaa}zZHgPgX_dP_ z4sx|oSRTu42Yz(Ji7iKCZJYmJ{58bxP;&e)?9PRjBkZ!e3Bhgw1%rElM&n0E z#sIh5y*b>Qbm9h*Lh|q1$k}PUT{ka7Ly+I>i|n`=$Go#nHjoUQ%KwG{-Svb4WY+S- zsX|#=rr=O{Lt+Yid0KT#46q%d3W06mHY{))i~3qM*BfsCisV zOZMM~HrWx!+CBtN8k<)@8bfv9=^DYfFgVfr(jRC}tz`$&#~p2r^dH>B*20J~ULD*{ zakm0ofmj&<8Fg`H1e2z=w@-^|3kO^++4#Ti)^`?%{$FGRWBTba^lvIYYtmZzbU&Qy zrh%4$aC`xg^V|iG`x#RXoppiUHta)*9hk`OK)wWo^cVnmlmTeM%7q~!uJI{*Tgr4H z;sjEJ+(dLGm`KmgpHuR3;RzAv0R!OMvKb!{X{hDDoWX(YMYpzE7&(;&7ksb4`86zXzk&Saw%PAhGC zbh5h9?QK=P8oTyh^4sx`cMN$k@jc+U%R9y7BWO~;pPu~B7xjRBkb>3dH6 z1RwvP9Vlza5Kt5K?^|}fVcUDqcJLA7#Q5xeisxCM zP-DDZOKZfl_J3N0Yj)cQkcsN`(}QqTI3(OM%kyg}XpZYpK3$+yCF~|ocnIu|pRTG% zzx~zdJ77Gi0~1{MomgS+1@AoBgR(Qojkn)k2Fkt5sPTCKc9>H8LFh!Lf7I9*lR?wHo_Aa6^crhf=uW14l>`A+!4YZVP#MFk6$WA-nenS}~I|z~{kGc&f zd3d!w>Zu#}sDoU%fh)H^@%ur9tCwv*_yYJGKr^(~PwmUpYOU)`FxI|$ z##Jr_KiShfNUouAs`!+jux!rCj)Q=4cw6iGFSlYZDj&t3q?p|y7S}}Gh7)f8u^SLv z=PP^C@-lbB8b?xNv=^0_r1yJfhV|`AS|Ht6q{dQ5ActTXSEv1XY@aSb4w?oQ<vR(as*zo)=U$d7H<;&)RlM^CsgJBh~ zx}Dkn+M!*(W)N8vRc%oskF=fZ_0Sjhv=@?dhAhRTiCe-Ev#kTHc1JS!(!=e&jS}+* z>|{UFstfxpscjy^^eqB4AFNf z!Q`k<15La=#ouVUk6MDZ<+mmN91^CtMY!6s7i|$V=M!#gO85&l`CSu&BwsUvAI~B5 zj1WgwL!``OsTNL}Y>L%A$hU=lh4JXp z_#YacS5t4G@T1%Z6ir6{Q8e91d!9DOW}gAZ4!$%a&Xk!GUK^65Nd7aC-tn-KChxAE znWL0GO$y5W>L$ce|s^Ey2>XvYr7R@7neB5M= zXC@_r`JC{E^W{Q?2M&nlN6jRKPYKVvX`xx+H5_`FzWCH|$2RAKXM`|TBQ#B!!L<;i z->0!QPHV~k&SDC2qb+X^zKWfNhf z+~vMUNo}b9B%ji1iOq;wkI1gSHXFD+X43}qq}iG_vLH?|UkaCL|0Usv zioc0oY^nT&M2hOC$5Q!$;=PPlwp5-@L7TWe+79Ktx(mbh?*mS?pCcSxX;Yz5jWmbp zbHa3)q5$8~G}UuGn*8LqG@}|dqYM9t+OzqSby5T=WTS3Tp4*r z(&q&8G+tSeY?^+sefFwI_Op-P6{+J|a=qdRbj3XI5^RlSMv1@Z@PBcNcegnd zRC|~La8DQT(@;6DKIQAK-1HRfVKVCqiJUW>Z22kJ5`~#9KMHG|!lLg06ethCXl`8o6iNof_iV{zkWflW?*9v7A@@iDQ`P z!hPTtle4gZqJIjDcJBmp=41dh2k)~g_1bWM`kqoA*8H(0EILPo`@?jZD}n1!j_c;h zaA}5G6o_9Tn*@78Nu}|iwS&XfZlpv|rPMNegfjhe!VtSkS5UG~<3YfE^p@3Y2jJ(5 zE67X@+ZY@+X#Cq&H0407%nR70a(Jcvo%_X?2qOoi{~N3R8z5Vs-yelL0c4M#y0|A@-VxB0r$c_+8~w}qsK7S zuQE8L_cD0m>2+1^R5n?K+cjRfG06CsPSdd7C4$we3cYaF7`vqtV1i3D1QC4QvJY5p z3XO2So?fddOh>_ozxxxo)7WEWI|IF2gJ#z<2o;5YZh79+(3D#+_+FCi`UzS-)=9?l z1$PQ-tqp_3aGCY*3GV-Mg5mzq2_fz|Oaaz-dRdhlh?%OLPCZMWv7AL#754W0qwW)8 z`~@AYg4t{M$5=)7M~W7>%Q!5}g6J_G=Ccb%J8yD}bkPzf6;L*-ic5Y|Sj zFzqdWgHDv)XYQnxdEa?ReGiNelmHsv6meBE_?kY#+V>1lU?6`wU_tY#Y$w=nLI zj0Kq42a|tDm|tyvpj_;5!9CUPPs}fp~~iK zqFrK2mGHDzoa5lly^?3;PHfn;v@$g~o?Y4An-utYW4(Sh>nFMOrlq~wRU*0F#~n*H zRApDD->!r?w-Tj;{&%XA@8{x8>9_mhw`Ir0pOM^$ILreI*sxrgC4`T`GXpLdbm6^fJZ+Dr5i<@^DGdAXw-e(k$AAUQ_e zJMh=lNqnVmI=ZP5kAXINzb@;l_my12pFqFeK>zms3IEO67ssL($JRunu)D17c1k=h zx~S)W^Ij)`#Ls*67=_~a`0^`q%{C0!>cuz38>^CaFwz}bvMbzOHf#LQ?rj5D9Ey$c z+=)$_me!}-;thRc3zt?dwsb0JDmE5M9i{R1?X7OYP*#!}_VY!kUyPt$Y*1qmwI$TH z{;9uZ<(aHuuZ!h(F6m!$~^@eHMB5oBKq`0VzPfoeMR@xkhS;sOaB!0=VCc&TTC)A6>c*AJ7pEdd@m2f94oz{U+~YJjmmrA zdn#sx?9FQaPnl3d?QVuuEnE;7?ylb5u-6|`fg$O|{eWs}hqtBqgf2kenh%Znqv5{K z%CxmMyM4qF8|}To>?#)gQI3-%9p9j)8I^j2m88$HeyevsJ&w1x@i*FlKJh0BsfE9V z{6_QuY<0lat~*--u-Yx$iRug-FEy6>)3##99_g;?*}Q36oRm}dU|!h(^=v-vP><%&%TBHn#lj8JNsN* z{)0O?f|AX}bq|9EecUilOY;=8pSv_-5c=N_>FSbq=_WFtf0WIgeXVvRKewwP?2+8@ zgwcbWZJdvOLhuN;g}(@%w6P+M!YCa`8Ck!!~FsVp@Ta%XdjW66*hYm7(yv{8b7i}?>Z*B z>+mrd{FcRUs2=&Ffty6}ztJ7c0E|aQCct|g1XzlA&ipzi021IRw;fTC>8OB(za%d) zR%?eEUB@!>s2)k(&1DiuwrLwfP6-{ngy$_9PNQyHe*ywmNkTcLSAgw8X;L0K3B?m<1| zk6gUIJe-SH^;mzI-wF4tslwP2_tqmaBGzbPcc1Swoa<7uYnEnaARUj}Nu$@Sc&Y!| z`wg!}4xH$S>}|B|!#05Ho!TxZa$AdW;Kl89H0?Y)?-o3U|IwxGyOBs(jLoL&JbOt7 zad%(oIqtzw!=%F{?$JB!YI$w@?j8}ATk8!D@FX5{Ilu57g=G!8(WN+k;pJQ00Go1e zqpKo9DwDU02lkPCFp=`FCz1QRT+G@tF?JcBNCVi*7hWirSIW-k^AF!ESaeK}zrkI( zgn4#@KAU&LtOoEuC%KdO!w8-c931R;I3WAKolA^0*oD1go`Vqx;2yI+5Th zhiX@Uulk&-N*~|ADW1LKeY&;Cd55n1d4j$yR}E^9u|vh<8*0IGEOS{E&tQ8`u*nAZ z>OJ6k-0;FE@RJ+Y(E5+c>^OsTHh^GpT|9gj{=7e*5vt($hE|&E9H%KnKi9f@c-Hgge0i!4LCVw=D2(Nr?_?lj*%` zJJ#2hJXHOPUB3@Gw0*_n0fu3{nzG|YC2L{}PpVw`j~ zYZS=gn!V9|ri*pL7MkL}lR$|o=mn3M6{E$5W0^k4;j=CuEuBFuGl;&b%~o)6XEIclfrT@b15^d>I@&nt*V53ifF3k zdxHB|mbm)vaGULudA7veeYB=YEJKyiIG!5Tc@2dn#0;ZiYMA=?oq`4+FI24>jd9ar znUj5F*!TsM#md`_vxdh_rilWE=f_W$Cp_1<9VerDJ+4zt5Gxbo9FYucc#aaw{DL&! zdtugQ#pji=g_YT31||E&7M>`&>9=z4*{$5gIR>+^zJQXvYsBm6hRW0}7y{P1wF9V; zao*SFD=}KL2Gfif%Av|4rsDqOvt9O2_30%Uc;l6NKrE2V;3dFTxGWa^iR_XyVqpHsAyUL9;Gg&}5@3tk}#PC>W3gH>OEtK%E$*|1MgSDc->#@e`@ z(_OwFhC4{G&u~mBMxde%@+D1Apn_2ev^seP8vY>D9s`CH_>V?+7#1hnaq+{@|eJn&_-jzlq$j)w%702Z74w zi^)p~6Et+K?Vr!U>-;*$dxh*?G;9f^28$e1ojgP$C#TBRBLrYMSebjI7t$uta8Dua z%?DA!GPH8o(2KMFLZ{s~4gH$tM_)zB=IjbuUL@-&IjDFk)+QGh29Z0y2u>`sJ3Jf@ zIru5%BYky6W%4|XvUFK0mU)5_y7853Wb-tGx!;}qiL3lM!t4}YK{x?}ZVYo;OtgXl z3?Vo4h#-vq(f#aaQqU!TDD!Z-Yv!WUIYm~zeiJI&GpS#shU$j<*YQnDj zR*uW^H52&;dt6AWJD$(<;!0dFampl&x-W*Hra!qvpSkfYf*7E}!6)<=z1M1aTJA0% zD2tUYD~Uc5E&n<%<33IWnhXcu##HCFsm|$c)sYo7x!-TY2V&)~qj|iA9#Z?OwZIe{ z%C%C_KPu4`3P1XZ53~PRr0^%bqw}7+hZRnK9p$g-0)@dRc;^hu2MQ-k<<~0wXsP@P zg%1tONB+^Zvqn&TselabtzS||GMq#16ENj`-Tl=1^G=Z6Y2ec;nP*>V* zAL7Gh=MfF?4OFVM6Pv%3BN#N~UZ(%mnL$1LK95(4b`wZY8mjS$g1hARD%!~X3jClPi;KEpKxeSUt2ZgB)DeM#O z057i=dE;V*i&y5l3I7@t01iyNz4zIV`g#(7PUaJw2l_i0+_o-$mf5=xXNg^euv!rw z(fq^3Aqn~g<4ta>Ba9{PoEvS3j-W%IH1s48ove5QIpZF$)3}D>)>LHrZ1|53p;)!C z5{PzY!7V0nA?w)s$mZ>NPT7VdNQ3|kVO`YeOAYyiT^QP)0?*DXATs7g1_+FHCjpvh z_9KGv_A*@a+Ub+OgoCdr)6W;jGwQrM7L$aq)q{Pvr=kc0uNVajYL`Wr3Ss!A@)`^_ zdhicWv-W#EQS%jW7;0#LH0@K?o!7HqX^Ch;CLR+1Y-vR+BJY^yk*i|qM<|bgpIMwd zD9&+79L3qF1CzV?`GMB8k~hOD$(h{Q=ju1=z?2)Cc`^C!h{Yc>+9ahulgu-Pbgrq? zQqy~Jy$VuM*l%q9jHl9z>*K9o>^S|q@rI?TXI0b4qhkxJ`ZZJUF|mcGRCiP2&rJ<0 zlkYa=Cq89)J5^9$SKJv-FRhou8z2sKbsb6R71Aa7&Yx#|*B;e?QTB09&(mUqm4$`= zVj*p$N&1Zfksx@t0%?ERVf6<&V#>x3(+b-N5?3@}~`1kHt;5Z*>K$@r^kx%w!wR@A?dqwn=NdLQ%sN{CBh1**0 ze=AhAd|V~2$10NSonAHg>Ar3PS%<1`0jZ6-KxT28t?psm93xmn;suUNtT?7Q3u4@w0YhH+S{R7=j#vDJ0>Z9K4BgBws(0)UB7@YE;O@A=A)&O`>g+I8Tw(%P#l(h$Q7if(Omax z;&RP=8;a#1LTNZ1R+69k+$!)T)>Oi%!VddpBoBAzDCe!bJ z-JJb2m}(1MBMcMRDjwILLc8Q4{FxjoepW>cU2nqLu0{0G*dj{{_dyqj#;-MT0k1`l z>KfC3uhz9P*IIp*1~y*A``j!<_XT7nA7x3aRLRuFmxMcRODXrRU{vR-QJ&= zvV$a9xATu#F>*eMCld-;X{;0M!kZX`QBO!naQmWRZ(A&5sZp`HvX)Iu;VwJxPO5F~ zids0MF&J3T$dwQ$%XZA#tJEf%B44fh&5wFCXz{KNm;)pxYUb?oTWa<-#_m}hNVoC7 z`3*f;3_$TY>$+!a8TB6InzLNLf4V9AT)G?200~WxZWJf8`Oxvwy_5(wXi}88zU=e<11^ zir^6x+D)|R#@TqiOkyS|@C^4ZbSnXQ7%;`3;!j24AN za4n(P^hwmfD0a^LgDnd^rcUYn7u0ZR#!xc6461T$F4EOD$$86#z#YgHYg?j8G7`v} zvB8+$A5*;6f3)f%Xp=)L^cNHFvVZ#K7v!^b2Jjo!rPi zHQ`n-G$bVg-H$ENhn?@jnxzVORvH7e=d0{&nCYDvE}I(3u4F(c)PDEb>*VVuy}2q` zZ7y&)1_t-TM~e=w_z)sKbWWFjuhW9tfYFJCR@>}|hiOmG?LGInO5<`(bI0^*ntNRD z!vB@Y55t?MOsh?QU7H+$R&$qlu5q9gTqna*PA-bHh@8w{E=A8eGyQe{**rh`V(X{@ z6{$B{D!JtTcYiM$>ez|?LK*n8qa!xm1+HX068T*f(}&2DdV#`Uh65?%{9PsG!kF|&R?IlwrrF>Y#P1i89h$yPr3 zK2X1lASrI&GU7$^hV0&kVTey^xf+sM*34t*7heE#B!8`4`(5hphRz9deTQqntVf^1 zjVJNAN4Ntn%xAwliAZ1Je{cfG5JQF?PeST~#XE01nYE z1pBiyg^MNb2_{)nuCYoEgmGfSmb@P|0^;P-^;XW)$gQr-T#A5-_1usi_nBEcmkBhO z<5A%zXW-{wa~@Ecddm(TSoe!fxQF2lbXg9xqb+5LUVCme&oAz0K`f`GQki7_&DgoY z=NlsJ$f{jqtlNig=>z82H%f%R->uyHbVb%{Jiwt$-hoOi^P~cy3ovX44EW1y-Bw@v zVL6fQ*h#~%kw*Dtd%{ckjr1DskMn?m<{C1{{yO>B?rwhq;D{qvf*ai~1S5JuBQ&oE z0TChV@|yqb?{}Q#wfoKRc$z3Y!28F#y^F7IA;r?2htX0X=QM>Fs zqqyDOOZ2o&Z8$K?lROx<*6sY&mw+U*K+PEG`zpiUdjC#wFd8af*x!Et2KxKVh)uG) zY9%Gw&zIUOq0^t=XKWzuzq(aMZO=O*upWDi2tJ| z#@dX3r8{`yAOvRewrG%LovTcLlgObRKyX|+{TLAL+A0IP?fasi5X7U)K|Ixi7|To| z$DHG;bU<4I#TR+q9YikrP#^Z;W$VNFr9QY>`SKo!-pIaji0|@KmR$mJq>MX(>;Zb# zvh_aHw|I%yj3{iOOzuBo1-km@5p%pKlHAGGOKFKv`z-uI^I{{o{&{OSAN@L6e2<>P zDFg`0@-CVBmLGi`VA&}Lf{m_@%O0QTE4PS#-A7-jXaps&V!4<3=u@_c{=JVrO3_uN z+_(DZVOvDc_R+l*y;YQ(=d|;qx9S-sm&9HBmP3#nNtEju#R<{qR}{r@sE3m&njhWS zBPvzjsc!grK8($p;6~ zPmgOR7bxBYv*;}#_b~-g`rK(;r?egzze#X#hkG@R5Nf?i(&4c{;S9-381NQN2+yyI zZGXIvwXL5XZ5I^Zv+XN<+kavGEZVO$7H7X}KPO}{EIx11$=E_FU_)ORRTH~bM_Iba z)bLd0U}X9|Mh%N)3dCv7CGwY7j;gt0>qP8<&e%2g5}U|=JnHb&>&tsrxSKwVXf>9R zt1e&QxUvFL>eJ-{k4Q=B)VoyGB2q>TOTDjpj`j7#GXJpbxXF53B;Uc=sA)1d}p3i#uQGROcgZv3i4LL)drVeSwEf&=YLXJn#fXkU0;{#i`_%b z*<@G55F&ak8SbwtcCFIRBQ2219IE*Sy_&)@`!e3yX%gA+>U_&dxQkff7F;P=VR160 z$6c1rI-@CnwpiwQG)TCafj&MzaOYBev4wbZMIE1B+B=?oCcQ2eUyQOZwy=LcG=4F( zt5ubAkNvu7?$KX0k9=+U(cOoqo;xl-@JyTq5s>7onPHNaK4>Yum+#sGTXxM>HuuJL zn!k*1!Oy2H^nI+1$YI-w#7Z zOWt9ZznnR?W51Z^-wZ3t<+~we>IC*I?t;C= zY|NJGcf0759m^88hwMJ`bw7JZG3E#EpnoI#nrt~F;{Vb9C#>=R=!NiN`yUrmy&_KD zxYj;K=V3+jwO$|k9ZX}mgE>iI?=bWIHjIe=L{+I5bvZrVuvLmHV_Zzn24(x2RU2(z z^N4l`yr$Oip44o7!K* z-AW(D+av+lQKSy6Y_W8gi)nkF-=QU8t?3WlKc+MMI-Edv*v=jS{JxlcG|Ff(g=fn4 zAK%vgscL`U;xGvSNU#Ke`wYe&Raw^dgl}uRJ<1riy@fo%d5X^Axx^Gvg_`S2bM8jp zN<)V)`H7V*$^)o$F^qYk=mG8WlrcKI4N+EG;^9o8uUU(^;1Fe^>PAvQ5DGa0P2k70 zjEZzW`NBVFnkIn$yUC8#ZFf2a>zDLbwaFhtK{~vcJtdaW?nSqwCZI_^Wn@9WGcIhI z@@}k6_V)31&N?gNL*4i(i@|2B?NYthx1AI^R#IFW9L z^WB634uiYgHAz&$!pO1t{`;~e`k}(IZD?lyQhRKE;690=L87wDO;W-*tD-0U$^Z@b z1bJLeYo{sy#yDt`I%eoMM%RwGP4V%YphQgP&+{}J(sglu;&$2;x9F%gI!*F9lWlZB*%dz?%`i0n5y#%I86TFatCWZi}_7u3kp?K6~^=jZ_GB9ww;fsp>>MGB7voUJC2{da;7P}s+j|> zbzil1Ay`WST3eSkcl2cl{4o{wqXSzxRr0UFy)H@?qkb8gb z<#NxNtC<`;3}-41@ml%7-Ee|NHhG*$SYW#QUmmJ!E&|5#Jx|FW8#N~?Gb@r0#&>1f`*iuQ`D@5eKMp-`%cIt|tmH%j_`EnywWVWAFjQUKJEEBKfxwWVr_=I2_s`F!+7-r>6vbj5jy z>#e@3B24KCr|!f7{2Sc&@aN(0(VX$Wh+pR_tyn$Jb6Utg@e$u;myToo+3m*Ew~cUl$6C*{7t@2R`o zYM=FC#o0*&`JVD|x0J{I*2m2$kGsv{VwnpW*7Eq-KK_=)$R)w?Bu4Vh1aoI^>eIFE z;R^wsF04Z_0I;J$yKB2wqsRMoK23}ApZKI7x{t*;t@))KKM>lgc=osS$ zNpy~>rh*Fh(k~!(jqzINv^T%->xrj-Umy3^nj742Zt88Qyb1hMb;1Rg0Dtbd zsctw5Pd=u(@6Z$PwdW^wH^*A(jK(^c=QDK~ z@cngrWobPL8AFgG?j(CN&)spARZ5!A-Hsb{Ys>pz8S$ctwSh~%?<40@(WYy4D9diM z&w+FUlGsH*6pl5mbXRT^!p~+H0{4i%C8odT9z8;%bL%|8fjC*MUjt;eLOGv~~fvTta(G;bH32RTbvn4|yuwj}6g=XWm=klJj)3iG%e+ zBrk-Ut@o6~Sbradil3?&S4$}rxSzgbrLeD;9t5sGNqMm;UgjTZWb0?9w!S}tx>}Xw z>ninQZqnBu>j{)LbL(c^@z z;|ZYZE__s^_a6S9;G)msDc2!*0(va7P5|by4$_mmaE=#F^rty8g@WnMFn^9nvACEo zO!V{7=r?eC|MP3kXy1W6S!LX9RxUY3J=ysV@r;eS-CV&Zk2yfsvXQ^WXF5_Oy$??- z)4PK`iQ|9x4Nv0t$wayziHyQD&j;*Piqd+g`Csd2=c&+5@jdlgKz6ZYXv|z*R;SZ} zTYvI5DmBh5`d~pq!sARC`L0o?No=n$$g-}o4RnqJX`n^ESnIAjnC@x27s{K!vnb}_ z$r?Ph@Qi3Jm<^{h0wR03AKXH}II$(SVDMt0+n+)-XJ7EPJuO`Enee*NsGa%VO|@D8 z0Bvn3tZi_yDYm0-yPFDv6Uo7R(cU6(pZ?JAwe9=`uOcc}@ckpSR$Jop+ai=Z}$A7Kc?^ZApN*j8w#n@Pv`!f_m zG%s;lT;Og}T|~6$NX@HnCYFX6&qy{N;Pb+5(H}1Fd$6X^_J&iP3q?5H|1!O|x2+ok zpNDgOaEr*TtJz!7^ZLX#bgXc1iTG%mt z{jFqqjVuv3TU$1X4-q(bkuCT!JtF5Hea;C2oa+}`$PSk&r`$KeRmPNSf&3DbMFEkWpTy-ClDYYy3vBhd#tJAJyhE!in=_ z76C8$eZFVjcW+=X&;S4YpFht-_MO|AGc#w-oH=vmjIPd5{Z9Ot1idGKQCCQUjxSGb z`80VLMe2hhw^)(3LJ|MXsR2>O>2YUq9v3k?eofKrVAm(Vu%gq8ir!OP)a4KNOFEiF zP0k5`%&$Yk<*&kNx2&toknoIKg}I;Nm+TaX;-;_F1k!_ zMN4?*#R12&4Hif?2S_e7Bt_=ohztsm472VTWYyLx*40+jo`3#8U6H#BcpvQK8vR?# zq=T9e-V)1{ZF3`M>wEiKwtf}3#w2l#apD>i1FkX7|D&l#6GI9cu=W0@%mMa_M^Rxa zsBn<&ii){Li&co&qe^VC54MZHBCMXek;x2=ED54-4Wip!^ljR!PSr}&8e4puOVd8} zn=ZKnQo-^rIl%V&IW8{#xxS5D;Vu(}>o)(ZhG(Q>f~IQb7iJR~&)i?XfQ)f`7cSH< zT;$<%ZB8fd3roX%w)(X}>D?(E>v9LVaEYrw-+k8XG}HF9ZPX(ljr#!V`%7( zsZP8WC<|`j2@K*ANVHr1CDh|+@ptf}z`y5fn5Sy3kS107hcn^&fsL3y5Sub{Q7U;) zohg2+2}GwKQLRyaRaiJ3ga47tb7}DBfDmxW05@B2)T6`TJgQ8V&mp`$ftUNkR3GSFqP+9hrZ{JqA;BauR8mhDrW+vLz;s8jF~1*lmPLYVi2{q zsbzZh&6nS^xO|EH2AkRW6jbhr2)Ix6SK~36Zfudh@e&O-@=3z3D#( zSl@`!nSNfllYnb5dc=*ZRYlUD{s@Y=2wthZ{F6USN;= zj>d1Rf1vPStI7}6$SJ@9xCqPr766S!01h?)mlqMhHe9Ro4$^~8ekJ=rm)(}>uUPh2 zQT8Xuo|{Xym-`ja+TXH?(S~GoyFtxzBBila8T{BWZl-3e|JM6UbQ~u6>aj#pS6?sSePafASnizselqJ{zXmG+mSFbk zJ^ngo4Lg$+Groz4E>}Hoj5cxm4ClCCqjaHFl88aXk>DMGTdmX#Tz_lZne|^@%|Np4 z{H3l6Bx8(1>d_g6!83s^%4E;IQS1*Tpm*;kH!m<_L9un#E}?okJ$(vb-05W-4Gi~} z-n}mW({Ph1{=wvzWor8CQ>1BF?{D5Y1mFr65II+Q>NdL?;0kHCYrvYyJX0VIn2^055Ih zlUh18Tc?vRuVn^C-&3=nBf$9N^)ul(BDCV5`7v|@GyGf9TJr7_02sBM0@1&-)%(&j zrX1uMGb-|`g6;Gx1^7%TY=4Kde; zmb>*W9>YtNcYl2wS>s&)w;#xpGwB}vCvRfpslBxy+b8`Eqef!$H zxcF`i%+1=-pFFV-b~WfuTGAD{>s%Fek&aso8L&Fk>H@2Wg1V|AojTJ3SVdnRIG`7DE3nLi2X8RGWQvFRu^%sr!0iTtBU{U@6 zxAnj=+!Bc*yuR`0vbJQqOZvtC`gR$h}$@G&3PozP7mhkdky}e_46b`xMHPzSQqu7VcLF8~nQDfYhb6)sD+bN-V73 z*e#dAA6yeW1xGb?Rq3NppXJ|0 zIcuu1?V8-LZ{OuX9=Ctc=^47iu)pBNTR$39q|cVKGo2C%P-M0=bzV$2688Rh5O!q2 ztL}yRD8H2QazoihUW(PAmmIp7IFf#=9}G^4#tSRqOusJTalV>Z$@MCNe-|u!nKd;NXINbxD&Tw+n|aE2hh-v-cH)bd_d`bvn?)T`Oy8fN<6$@ z1}2f~d19mAZzvYe47r}c;u_s(KVJEC>PkAeV<_1rUfe#86)tmLU;GxW_xB%PI1tq- zFdZ5L6xMr^YPNn6>85G<#R)-39BQ#B8#ejTqg}$eA*Mny9ZIj z$@xC08H`PSZvc5O%V{v*a#5G;8njpS_~1Gm^H?20nm`ddFZQ)ye%hjYmk41?p9iJ# zqtAv@L!|Q&xQ^#~t5Z+sxcR?C>K3}{40TY@DV;fz5$pSB-{m9B(MS&SlNo}2Zz~ac z`SQVCT|HYB@m)m(6~CYed$%$#pN2`lQPPRZt3@0nuT;d5M3l*A%$LJh)1sFQg;dzj z_K=Tx&>pW`DgRg)My%2S=w5HH}|T&Zf)oOxphkK(jn<${n4AW z(enLOqxU;=wu-HvIx&|1TlxvPSYJpW1oJ8oIA4C@}QNevWz_=wYDJuj;z&hw$&tnd@EbiEQ3KC(|M~;5pL*g*6|aV zU91y31ol+D+-Qh(u8wq6^4;vY-e~S@84~FbT{h#HySejf>)uEQrw6^0F~&Qx!g-uA zE+U?h+6MFZ5g+B;dor#HxcGlN1+yF{1@j?>KQUNvXNDLWo;cRJMXE8HtL~@`+pj*t zzlLjn?b!60HDlA?;rCg(z`BCwcGDB;JBmX~BL`={4A>abxkm5Mk}6&$%l}*jur+-u zvM*w*X6s9g4S=ZduS9^l@P9MXAtt8b(r||OmyX}q^jYA38EyD`IE3M#=WYr~)vjf? zdWDhXQe^s5nw;eb4m!My;Fc`PI{Q|IymetNdTa^Irh^pa8p5EC^}a(6-yWa}_*;p- zqy4QLL7WE&4X^y}6nci%kDnJQ)uH5G$(-(&iZA`gsV5t)o*m`Fz_xw(3tTrlE@ z7Bn!Gj}V5^W~!#cTuhb4T%?!-TnwM&L336yBI;sf_`&^q#he@Is3}5$=Gpj-I4&}4 zI$dMuvZIHu9nCYj{CPWum*n&6FXI1{$OA{Vq(8{*V)^CR5}Uij>&;^sH{IfgY;wLX zUdxP@Isc29(NB-4y!h|7__o$hjda`z7OCETu6_uy^M0_3wtaF~q~o`Iv08rXUxQHS zHK(trpOOAWeH)SKKiAJu8r+Z(xSCIyH(!DFsF@s^x~<+7^;2_orVUDcRF9VrS|gVcAPJ^ox5VD$Oee%KfeWp)FE)@C5hP<|OrU*S0fn)y{V z_%{$Dxbdm17E`s`gP?r>htz>$?E^69O$H!D=Uh~O1;{D8A%_Bo_^E0@8*zvtq8v`Uizbimd|Pc48tTbNXMbvMjx3r|>xM?> zJ~$YObbJl!VZ^KIv*$DEwDxq$wh98uK0<`%s%C~H4Nr>H#DJctF^R|nBP&HN&~xXP z$Z5Mm2B`f}&9V|rT|vGqog&$nmHZPXJV6Kg^Lvd@V7D3D>@8kyIF>#Ye4sMW*FJDsJ(*^4Gm<#&<_;W-&oG%;A2b>Z5}s>FywhSX*p5Qw z*0gcv1{XSj5ROE0Yck)*q)+0!cf8+tjUAo+K=2>W6* z9aA);qKsuDUD?Yw8{lS+3xf8;mFg4`k3|+e#_ury*HrF^^kGhB$R;LjSd>hKaLNSJ zrL)_Sej_c6Ips(%2u*H2Zc42k`7}pHugktADiaen?N;_}9sO*c@y$3uG#GJ2I8A_H ze>-GR=h~Ua>xt`eddV)%#TVKUB|`;f&W&i-2sS_xqM>1mc5mg`*DC)7Y&qnks&n(D z_ls*?G`iZ&z7fY=G9j{gdJS+&=(X$6Lh}S+4%}+Lcy+X>&Nh ziNl?`j7#e$(64y!lumxDe+fD4Nn(}$iAq02X-N3RcO9t@H4=^)vSu3VH;;#ak0O_f z=%zvT#{}>{SNi_p3^O6bW&}4>IKzBWc1M%cRDDd*N2KF&wgdI+|~bvz2@Ti4q3QL;IuES$4(6S^mV@9)~9UV>V z?Z!Kv8P^?8N7)*6Lz3gx#haEUbMd9G^Tu)Wmo{Kj^(B(W6|jIVCW&;Xw4yDaqC>Dr z9AzyQnLFERyS32@$vg6)o1%txFc%2R1~E@OgzHq;zwLb>7@Xm&42GU9{NKTxR|Lk2 z0|tL1M#?+Fg;ipET=oEn|M@F)uJ^yA5b4y*-LWp~lErGgM1y7iGR~R8*y=F$e+Tbh zmWT7%g=0qK<$VnnVRv)w`HOit8bBB)%Q}W+pEYnW_wKiBHkFJY>s<)b-+)DiYoQ=A z5B@#Ga`f_WZY+T#YWcUAeI}f7f)kLGHS9mo!Vc+jry?Lr27=3fq)Rm%oQyZ-+w>@> zDaW0HaLPvtvh@Emx!6KPx;5I$1X=B{O^~P2| zx+pk$mh#9uW3aNNH_G>2=ku{SL#mRiwH{vvXvbr#T_xNtac;4Al2YoJO(z8Wd=xuP zUC4%aMLLCrkUx$>_<5bhx1JIra7f~cFwy6Dzs52vZS+% zdzwl)&=G^(uCsT`!};t<5wrQNArqhw1QqgWY>j#L_&aQvuVr!Jojt6FpZCwE{c7oW z^#k3SzK?FzD|-Hk#AJ7caUhxRlN|)91*7T@WwJ67XPLM+V8pSB8rIDLS((5i$6{;i zq|9n!tFt+TPF1k+cvrzNRe-GH|C5N^by%#MT5YL+8sY403Uk~Kn6FVYU)eMHmHg+s z#q$#gy5zteO#7Y8^7$=Q8@|ViogEs68Y!L3Pz`N^R={2@PS ztz6staA3*dZP$G zL+^+)h0Et7vvv^z!tRKZ6;or#9nqf(Bb|MOlQdle`M}}RmF&6%YUbfB=dW({cH+qO zLxPgD8s%vX5%CH$UT#fafM2nrf1@*DsVq75b9cf~*a@HSP^uWelN7#yF_V6d^zSMx z%d#N+J%x2KG6!(YhKl)Qf);H_8K8CFJV$X2x8$N%V6n%L0>0TAda z6reXqKBAYHNQX=^2;8J(yeL@xi`C2iJI4krU`1lk62%11RAr^cDmjm!(?-*sG`)jt ztfk%Rg@XKKVs6oSLU}s5;Sz=X=*YTmWI%WUD$)1-<@4;ZzYlRs+27^V`AALQ!ugBB zgLUUBf1bnXYoA0dy7R>6P#&8Oq)QT)og2*Ss^imMDs&h1^7aZ0?^CfAmE#sGgI!5^ ztQ9NwSDS*KSf1dF+HKbBaJGV0eK?)OG<=+GU|_u?={N5|SWL_R5q2hK0o@Q-Ht^yP zE|@#&+enr2eV;G%MT$w>WBt^U-lrbr&a-G$NQk7Ev@FW%6{q)%#)f@XhK7`XhAvAnnuwz_zCU>U-<+cSV1o z2K@Xv!rlO$=ehSftRrNO)sy(PQs!fCf$fYea%S-SVwEXd`}nN@knsS?2-Bm}BmbfxMhvPn7>JVb$3! zNw_g_gWOqm34c0%A-`sZ#~x1z?7c(-kY3Ts3fq{hSuwiei&^<04EoEg6?ib*JUin3 z)hvqmOJ>!Rxv{7;Do_ftA=7e(hDE0%s$vE=-c&`TL%xlO;d0aknZ6a7DFc?ijcG#G zpZOJ|GQ6!vI=H8a1|9fjf3XxW{)bCHHiM=}$0|)(T5%(-Fm*yJ%4fn02!l^NJuG_% zSqk&1guWqb|D%O+K1I*0fS}VSRr^c+o*&R}Y1ke|aB%~=K{xf3wI{KUQlgBN?NRNn z)h2)89%fk=)mUl_H~g6Vw5E}^Y3vqg5cu6f4K{Wm4G-U35>(j>fNga>mRLv++N~|U z)2@Y@wgCqrVXMFI4X!H_*H|ArDb`-8mGK?@I`}?i;HlabS>67er+Jb6J8cfevuHh} z<1Xde!`1a|z-I?3x0-YKWG5;5XXO1S*{2#-%M)K!^$$-1%kx+IPkt%nk1|U;&YTcp z`n%Ns$JbT;%){b0wxpA4d`r5j-XB2yHo=*Fg##{|$tHC8uL~YM_2NArJ9bf)t1zC< z-n=gEosD7G-&E$Z^He4G6}-zicG=0_cJIebv@PndP5!<{Iqo3Yrao6vOZc<(&mKIO z6ZDVSlTAcKFg{2X{>#S%ZRK?l&iCx{J+RmNKRlo>+^&uuGn?;C{(}8rI_8wOa6Suz z{LMQ~PSMOOkyHF{U{z<_5sTD-e+TwMsO0ajZ!^%?1>#`(uPgeG^S{A}($u3x@$*P* z(LEbB;oCq*Q{AS5hERbzzs?!ahS!=J#e&P%n}1uM-rM{i>Rb5#w7&hBy8lCc4akw~ zBmQmsCa1RUkvNpUwTWZ+yJzBr;obc1o9ORedhA-E?#c{pej8DT2Pw^5J@-yt-s>7e zdhW$Sc$UIX=ELpVZeg`f9NNC^2{tc@hW2fL(Qo7M?)Gi>vrkI&;rxk5 zU3&<^#(>^zY0kZzhu5{IQrG6gdHz+$^MJo*gFF0rJ2sIYQ4#o`heMrBJ(wb!*Q6EE zcIdB7=73+GJ zGNB>uxhDj30P@s*zf8X-VV3S2qGR#-^Jda-0#@$Dp#KQ3QuxW@`O7>IzG4s{+*b%^ z`hC;D@;V@|0~s4)DunMTx$HY`oUsk^I{6OBkwwv};xIl{Rn1U5wpUf3dm?NP@P_$!BGtj|Au=|> zwf>evE$Fv#s&>4l183=>i~WFp%<+z{Kn^<%>v#Y4J(&eqIeXr$kK#xc?C zY}N2C5yv-{F*VLPdT|1V`!A^zD(3LsD`tZw$)xcNLy(;Ob1~_Z$&1+Qa-(6*Wc(ag z^zr{*V zyDQw=r3d!VCJ@(Z`FijsmT(@84QReNy-w*rcj+ATnOSzYzUBdl&on*Gdy*Js^lNQe zmKe*;(7Jfj%Ea#RrY*@`{c{Qxh;uCWTfzvvusy;8mkYe5wjMXCF7b?jZD?s)oy5j_ zlkeXMiag^QZ+bF$tIRlx`wIiK;`d4!zmoS$)t^1>ZBQ@$RpGyV%qRAO<*@8>j>LeZ z{Q+B>CyMf{B9DJN$utBTrtZYVxOYZ8?)`Wj5Jb_R$3CTRVjo@7oyirCQKZcY({{DA zok9w0ICr^!NU9$KBe{C)S~Ea``z-&2@g2_QP%_*ptO~I%Egm7``(_gaz=GbJTU2!a zr{umzv;=Vsm4nCW2dD)v^CzCVd>9+q69BGTUn6ue;8=%o{)+Y3)C^j4k|Y+HS+HQv z(Pf$BI_!DHthahgx#Z!0d@>r)U6|S6Bi#5&D#ItcHNd0j(*qoj*9~I8eKru z8PfTTcSEY|bCTwEa@sFu1vj6t(DxRsC4dA{~9nV>3P0bpc6BXpg0T@-w^8e+OH9 zweyeGPI=c0N8yF9?6{pFznk2CMg6gT`$lGsW~5Z(^Er3biXXMl_5;=jjrN2zpRukl zhA8+ya`hh+)Zc0Kf4`{y^ZrBqBFz<7{f-h9*|R~xYrCCK_2q5>LWi!jF6it-xYe5; zZ%I8YVy#Ggl>z=ex*|3F*H&>e(P6`1`Et(^)9&J0m(SoUlkY=!+D z=5G%32aL|^x9smh{zHoMvscQlw7eZ^bVbaL@UnlhDC&3otds-5_VkqFQshVf7sK|H}qq8MuUFc2t-@_ayn&1o<{vzL$&g z4an!aV@Le&DDgiUA8?NstlcFXa8GeLw*>BDxaH*qH+%aezmi&_UaCx-%04li1peF` zM2j=OW!>0zBN=4B7)k>$%XtR0=PD~pa?e%D#N>rg(Dy8#=Uugc05a;AJxii|;z2sw zrWgm*aEcIa;x_BM?70wrfqsIllf;pdq~s7UcE00f*QJAP2#UMv1uQom7#T1jf68AT zJ}R1>GY42%V*j=-`9kcI9M(ARK0f5c0vRMa36vWpGVp?oV>pDf-cOC=923-dywzAd zh~EioRPp7oIqZ*z;J&84hH*@7_+;SfIrd4HL%%kD!@D{2?(cetTL_2i?n0ga(%}-K zBn;JYq4{X026prh)| zd6lVlNvTuHFI`HDUA)a6OBXA4w#6pxM(@vE4o~s7@U0dM(*<6mnoM)FU$!sB^8A5p zjjs6o+#_8Bgvu+%Y~1{B^#)F6>h6s=7pq#*m)@UzJnZ|VWs}n}XLG=NI7@3W#9

    ?A!mDg`rUf)5?cI7Q!QTbpR_UG24~5*nD|z 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

    Z!?N`w^tI{0n%1|HO*8bFrVq#8 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%0Aj}Fw;zh12YS6|jFD!T-?oG*XRJ(Xs%=^3+wO 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

  • kF+y3X*?n4xogHfHJq-;IJU^Kx|Q zI*3z7CI=;(O>6zi^s0)K&iIx7JYCx#>*n7H4>4 zbm%mnj-1Z(L3z)-PIzWS7x+?i=^|f`S-QlVOtU^Z&CjDpSNYiASreV(>(8;rah^9i z*E+;`Zad#P=!9R#3SHwvfA3uyuk)Q~`I$B0EoV9>I?d-|v@Y;7$ml9>@CWM~XZQ_d zb&Xe{U57tfrwctVafW*?a=*I73%i^FUFG9u*=wESC$I8;(-nUHhGAhroZ*#Nrt3WA zKKrHfyl>gr)>*y+sa>oa_hFPS^Akwx3V-~dd(n0N{X_Ou7x;h$KEF*T&2^!{gDVvwR4;b;1uW@+|8LPk+I?T^IOIDC;6me9?Zzd477i`;GH_ z?ECIl=XecjI(*>Wj^#SV?JMk~PWULSj`Mu?$JRub`PP-r>p0C1W0bD&gP-{M7(4n? zKOc3PM`N7M@ctOD6TT7?bdm4CL|x`r(WYxW>@%N9r?>-?bdIOioq3(-x6v8rd9%+w zw>r(cVy4b=8wxt%v(TjrochAEpren#Y@Orcm);LL`VP$1WquZAUF8c`S?4&zf5QS@ z;#;sV&htZ9tSdYpRbAylEYUUoApW(k^XFKm!&k$?I;iOsuaD(A&0AxI&hXAysk6Kv z>N?@Wu}bIoB&^nXJ_~DgfiFhb)#vBO(Woo@tFP^^&hhyer3>7Hv@Y>HjEVC+h>WiB zyBM$Q{1qnX@Qts5tWNWIwCOBQMxt|kV*G2J=UM2`MXq6rj(&Qzz19_;vc{gqdAB>wM{Y!^0F^nb0<>F}^1&hze@`FuLdk6?wa@chk(hm~=j zr?(Cdjl26gyxSJ;OK15=wCWsBMOx>121dtuo`o^G$eV0AJdD+8E@8ZmUW$pj#$O`Q zVXNU`LrjYEybC7lEMJBWUF7R9MVI(4Ox0!HIXygd#(8eX44rTXX6hWjje@T6&$b>O zigBJ#LP_Vj3v+alf4|M}(5DMLZM5}_%>!7hD;$12JS@@CBT&;RZpCt)=CN3zGduw+ zb(Y&v*9muEmCkV|R_i>^#9Ce8o8S+Tgc8q1i!Sp3M(7GJMoL$C8Aj?Fuf!-_=e20n zVcX$hOQdz0$6}1m@Pzo+I?D$mqZ2+B<8+Qs!+4$N^Dsdd_%dX5k*~uVz*rT^IQ= ztkxA?h_$-P|3%otXWP*_phefXEn|;#!dLC=o^^@;_A~1oo6p(B8PWwldYrY=IsV(O z&QP4;yHL<&ejZ)A%CDna*Z3n8b)DB>whp@u4^8ONDc%UZI?ba|(i!gB)AOQ>d^-ko znSZvIwbEIhi6y$g-=L<$gyCUt)Z+~Q0c+z7_v~#Q_VoFAa3AMZ*LdH3eQ%xR%aGAU zeh3qEg+E4C*SR5U9d(L-gm#_bgOKQikHRFKHqP*V zn5h%~&HmOo&hvZ}b(I?@x*wh5oiImdcrWznEKkH-o$#?J>l~kkex2v(n5PST83uHb zm!qQV{Kx^$macHq!PZWvco(eHSw0-Ab&jWFtuF8^guQ%Cz7CDL#E+vzS9m2x=sNH7 z3-1}7<%ww32~R>==Xe!H>u`vll^Cltd?Lo_Ja5+S9ir3Rjy9d}T}X79Uqy$m@gDzY zUv!qQL#HnBx0s>Bp?>b5OQ*RL-8#>Yp+{GE5OZ{mPd?20$C+ph=rXUtLhTQtg>Ed- zMSdAIUE|jew=S{yx+AUO1fPe8Px9{7DgGE~UFV06a&C2ne|WUB8fW+}wCgf|j}9G< z86NVOs-vIA3|-+@(WPtrC1%C>$@T}`I>oIh>NJnVY@Oi==+RkjN3Tw}10|i~GciZ! z`KQM^t2)D{VqUz?k77Vq_!Gmgp3>Vo;}fESBjEPe4s)`7kWk39tJrKPz>L z{|~FnB)eUE`G)r|Y~H<8?UEEGFm_w<4?4yb~ts z3{OCt&T@N1C)|NV=eQG-be?BovMz8pI&_hHk<%rfiz&LyPh+aC@ZKl+S~|-|V!F=p zIhdgf{1#^F8h?#$9j5p_CyF}ZlTp%nJ{xm%f&YX)UF2TO)usRE=nmlH9uLQlKc=J8 zq`gK_Tg+|BI*aXobYxp*w+X^BJJf`Q9g56?Ll73+2!i0y5*BuwA}qE;O;~KV>BuJR zP;{1UXDf=}Mp4B4-_QT`dwpJ?PoF)x`+lG2`Cjt#B8^5#mv|hjbeShHrYk&!ab4wU zly!|i!fNd=;RQbm#sZR62srE}3cmsyxoYU+bMs$wXp`>ek zOpi5>x)r&HX5yiRjF`gMjoF`%>DjX|B`J`{AGuf%d);46OY zvnDp*hLyU+uVYl#_&u!Bq0i5a7}E)U1>~Fe99!8xm@+cCz#N$|?%RGsNy24Xv)K#8FQrCC}i*&fw>tV4@a3h*@G8!qJ;ub8? zX>Lce&TuDMbe6l3);aD&tIqQv+H`@3(XNX;ii|FC_B#8bqYoVN=h*x*dUTC#r+Z8@4WSoLAiF`@SynEkE;_uSZj z1UF((C%Fj)o#GZO*J*CYkj`)?hIN*^QPer^!%Cg!L5%1E4`Wmpqfyc&ei*BCg+Dps zInqhK2&;90@4fq#m1y2$rpy)N@1cUTvl0*2a%0)co@rck-zq^b*S3=lOycoFQG{H&Dce?|kYqf8u3pr4zgrsyfMEz&f4c2eCfR=Y3wWhC0K?zUCfuj(_vIb=%h*ex~Mg zKv(%k|8)*^jtAegrnGp{kNSf9p3TJi!h)Q+=M}$;&v2t zhVRF6UFOff>w8U{!w+w?Cc46(e$TnoNxtiS=PJ(UT|RJr;(R{lLwlxk{I&ntGo9uG z!kn;CXZU&~+MEG?6^**amv1sBEY<~n3(Y!wY)+^{t4{ERXp3`rlTGJ@rE#3UhOAEW zjr{uZ!Hh*_=?&IsVD!b3#!U_*Rs3iN82|P8icE{u);6G=K3E zbHYR%=RaVLuJBW+>MDPIi#cIkoX-Q8)&+hM8+47Ys+$vLbdk@QJ15NE&spWI=2;V+ zAm9oX{D^`3nu!N~idG z^ywnsyue!N5_fGiCk*QxAF=hEuu^CF-i6jmm-&EC&hgI?T_+b%(f{9iN>}*C#yMfV zE^^Oyu2tvxb}ZQ6d-01%>KbqTY4@&^d@!1ImUC#;(dVE|=lQYi-Mg;vo9NUb>8v5E zqqoB{o#fNerSm+AUR~jrFraJvrO(U>gF3~PMRUUPIEUXyQHLGpgjrar6TAQ;I>|d@ zRHt|klysW+!z!KO!!f3_d;-RGj?YF}=lK$>)&;%+6S~NEU{aU(0aSFEpTZhl<(IKm z*Z4h5>9EtBum!3*!P{V+PVzojuQPlCrge@7P}2qO_?$DWvwZdEJ=eO(GpPHv*WcMS z?_%9`f&aP0bFHhKXqn^p_IY1EW>2rBbKHw=o#zXX(*?d3J-Wy@qgR*sF7)X#{~dW< zV!H0$U`k=7O7c(BhU9hS}syQ4kM=QEJedA<@$b%B454qf8=(5cJ(S7ddC zpT{y?<9E@e!y(Qmx^;p-gPczB9_Z0&{w{iThL1v@&heSZ>pTyjUl;g;@Ae|3T{!vcZ;uxPfI>8?;v!^;7J14wxoa@jv-iYQne!SN~ zi!SgrXw^l&8Ev}6ccERE`47nG3crA*y2c-&Lx(Q!k4~N7t&!D9ZpSj6;WN>#^L!a{ zy1>_=M;G}%^y)G{f<9g0myp*r-tLF?ODB1M4CoABi9uc94H(kl1Z#+*PVlx^sgwLU zjOY|E!KhC2z9{JoFU2aI<@FfTHSYb9XIAI=a!lv~k781nqEXQmei3VQjW_G|{YWQx z4@~Ja{}$_XnRhwSv#e9R6f-)@_hZ&~&EcI-@_gzP-++a>$XlH3`PB(N8;fm)yoE?wo<(4%YoA$oN<)is`G zPvd-U!*ZSBA7Dsl`D6_19RD6gUFLZ`)>kKZdyMHMcVJv+`5csWo-fC0UEn)0p-cQA zCUu$9r`sbPUB*-#=l(P7w=VEsFs&3>J)zuZ92KvbfKAq=5pb6znlAA(*r2QYZ*0^x-YoBo=>(sGaGFmuu}<<0XwpS~5Y4*GZ=*$r3w)NMRi}6j+I5xt`<)YA;CrxC zm-!#)h;#TAbm|({U+B!}1n+`nI>qmyONWc*gdNcv$9V<%bdhgHzb^4T7|>;Y2!p!9 zPobcz{2wgWHGT_2I$Z2o#;{KCmMH2Z?|_v$#k*ldr+F`o>I{D$C7tDCuuA9nG>qvy zUxaa8;A>IVMgBQf>k{9E30>wVF{!J3!ho}+bNoK0bhyONIaseV{Fh6eA6?;1FLO?G zf*TMHaxc6Xvvi7&!EBx5Q&Fe$Jb;8Q@Lq#Hi*$zHL!%Ct&k4t2kUd$ zkgo9F*VwN(&c9n8e`d9w{4bPsl{Z^q&2@rL!GzB9uTjw@zUX?-sV?w`Kee_x4EuhK zSqFPfoB$CTi5vb+dK<8$LC={=lNm`>H^=4f-dnGmg_QqgdrV9oOu*=lJ~+&o#8t% zqDwr6k}h-o?asMQ@NO8_X+9ULb)E+?sS7-eiZ1d$utrz8Yt(txIo|%)J`Z)0&xBtP z7V`X=>#8v9-ZZ5(Wi5KI`TTt7ouMmcm)P@k#E7EF7dr6=rT`Wxvub94CyMb z$FQ#PMih0pZ%#P!0sEq}e9eRQMHl&DjOq%nMM+nAJyz)&FD%!h9*}mv3_ebJ<9>$<9^6e<-5|3lKF7ux; zq$@myVO`~yQPefwh?P40#s5!%5uM;|F{+ci7$u$JJ+MlrxgBFV!yOpcS?)nu=lK$> z)&>3XV9qq1t6gXNuB2XuvlmK5;W-oPhyF#@TVX1H9E%fUpY}{0>VEl)&scw*;unz8wb;*E=h%GcT5B8U^SxNA%l!4f zSzDdv8=kXu3(k^G^9L`wejQ%&+@MvLxqiKC)(PJFWzW7&a(Klx$N4;f zK3(98r|orY9zju;_|^DlUE?pl=K6JtufSNG&yS<5E4<;r%U|hH$5*p&G%x7F7sh;**l%(ThJEg^LIB` z2c6*ukd5;>ylowH^nvKnS$+%oIR1|327@}sGguzS-*q-njPrSyjn2JJ@$MMcY2F8A zo#F3cb)3(ayl;JUfp`1Bn#B2hA=bxn{v$T%3STti499Wa`$N}#xYy(_{?E@#I>jr{ zq>EfaN=G+-WPNm!-wJj9{aV+*NnN-KnK+*pe5@{X#yQ-yX+O7m_;3 ziyG@fvrh5v(XPw~R~KekRMu)w-}ur+M&eb)iQW_&wxxXsHXo{kH#2m-$l%SWlhgPK@a+-}PPB z9Ov+%8S5Fxd8Y%dr%v(UL3Lr)5ni7Y2iJv09eoTI>l{CEh_%&K?*E>BkMsG|L%pBQ zb90A%*J&O>uP*WT4|B~r%d-!!3qv}=zx;k(7>#rIhez0No#Wdv703B0RCSeK#5!H$ zcd%ZEBkRH@nAQpYE^0c%&tXPa`FYGf(%14ksMFyGz7`3c;Q3gfll&Ph)G7WyH0m_B zA*nOmfkisYU0AGh+>0ii=K-X2frqd}7kLEDy2N8>(Pf@MT32{2T6LAzqfOU%BigmU zXe-P{Mkjb7mg*!gMu$#uGdgve+mO{6?!YpgO!|J@jl0Re&c*DF7y2A z=ye#;HQw)7`xxg$cX@Vni5L9P{pci*U`-t7ZBFp@ahz{KEspbkKdQ4QUWcDWLRb0U z-R@1-__!0Txz6#APja6+&mUrm4ky=zRcO&=J|JhUbcWwUXPk3NUAO{Wy1*;YtBbr2 zeY(c?oaU_SGVgPS&kLR5+L>|x%;7hC>%zDWXVrx>FroAO+p~Q>=rVu($8j&MKktXC z&hQVgPG|XStk-!iVOmG8MNLWU1P zy2`@?@f?`XBgpC!KXQrlpey{%ORb5{@MFlwaXxI&nbujJeYw}t3H~-l;(R^?r8tL= z#VVcS(=n#={Mjq4n@;iUE3KPO@TXAGN!}4_;vC)^YjuVX#gxwS@u=z??_aQpVY=eqH5`>zutfhwsObF7r+|Sbv@3 zy;0H`J^`zAj-SVvuJN{cd{M<8lvo+L7z7!jDfgiy} zUEwD&qpN)NEzac8UWb2itLImj_z^Vf3V-c3>#WnfHx}s(AA-d?%jps8ALsBTXwd~8 zN1HD5XKuH4I>mdSGtTD$WaE5Zhb~>?<~w{3jdOS}JD=U=0s zOFVnj^QII0z^{DX=`uflm$lUuei2i;#y8#TeCi@^Hf}w2g8%u5*E+_!aqEON(HY)h z(mLoA_djkebb;^1QeEa5bn5U|&rQWW>Iy&ogtMfp{EKJYi!Slu&-(1vS^g19I>)_O zrSp8;Kb(^|&V#7v0w4BI=R{}uLR8~8@AbU()fw)_MxEnc_yzI)-d@kyzkO!u1h->> z&hYQBP?!0)|8X{A^DQqr54yx-SQ5wi4K(W--}sU>(M29bTb$41Xpi&xFUaT$KaHij z%G2o3HJ(AI4(sc}7Rc%ZZ-r$#$xZ0eDQ-cxPV@fA=?ou&9-ZZG^y(bncxUNY{7f z(iuJkt8|vTF{X3ehjE?fOHtMZUV+uR$fKChB_7A5F7sbd(G`9gYjl;Tu~yf322(n` z;`&k53Em3pbdsB}UZ=PP(>l%jqoy-_2sY>}cVnZ@aUW)Mo-ai>*7frW%+f_3#cW;T zan$KD{{;zM;is`cS9ux>b&Y4xsKcwSA4#3yt*}TZxe1GPid*8Jb(-6e(i!f=5}oC4 zH0vDqp+)C;5NTcDVYKQZkD^VNcpUAz%#+CI3Qu9FuJSZGbd6`wsr_ZDp$=J{;6^Od zNp3=yPH_vmb(-6e(;4nWkIr&8dUcNbB0A55$m;?RqhA;Kml)6`{yheDncqM`*SPsL z=U=Bek0BlX5{Ba(UiG>&ugl!=hCk~ppMi3m&)=&#w{e^={;%_?3w$r8beX^Zma`Y< z@Xi~YF`eR@-nL%4$UDE|%p7N&e}tsY@$z@=yDst`@7s5s=IhZC$N7G==`ycJyRPw@ zSgOMZepZ}u4?4}qA*XYEGkSE1*MDf8b&WqnUWfmAESR4)J1*;%j0}LGSvIM z`0kPKKuMQ)BgS>uq&{qg)jG*XU?R@vF09cxJ_l=co(q`L(buA?i~KCs=_+sfvHCEr z6a3MvdjDRG_xgCf--S{iW^{(vW7hGmlRvvzeMsmOe`oXhuuy0C3M|qE9zseNxr8M; z`av}7GCzeDUFEls)?s#i*b=Qe$-ALVr+NE1^`SkEN7vQ+`&7LzpN1Zt=NHhcYrJoL zedv#K`0%;bLT7mlL%PfpDC!DtKCeEk)CnF+xNcqK39OED_z6tvDktaH`*(j_54SZ~ zbDiPRmex~8AGe_1zXxPrxP2?@rZard*1le6d9Q8i!{Rv3M=Z2Hah%^os}9@Nhu4wO zHNNnZ?p+tS{!{i|C-_73#QBZ&;d9&7hXI}9`!J--d{VML4C@@9yF-0grSrVWV)vyJ z{DaRs8#>F+ebM>TRX*@buK$O|`MBNdL!-{|mV3Bno#YdntwkK?9lq*1b&9Y4x@*%# z{(HJU4C*S+{gyS?3BD6!y2Rhv%ew0f|7ve*8^`%Y)O3w^+Q+r&6!#;XU`_bNed|M= zuJKK6u2UCz^Zn{WlTPrhXwfBp7#UsR?f0(_9XiR6BOAy0ruKUOjk4F_5e(=OKZ8MC z<+t#? zcphW(rN_HRUEqcjJZn11PoP~_`MW2&FP-75PjWB1$orpc?cz9JovRPa<2Y||O1*z) z%eCq*LWi)bU4lXV^Sx15h^;xU&b1p=3B8=mw0_d*La(r`mjMKxg9e) z!)IYuw>9KnW411F4Rty?b-FXDqYuIYo#jihP#3t0Mjibs7U>#)fWOT7fH58Y zn?7e%m-)tX?5QsDO03l-eh5>#!e2et`sy^FgmpT{=V4ms`Bl_(jki9}{^}$jowvUy zn$OMW+dG}+FI-?Rbc(O&_nhhifAJz~8^?JMbjJC7EV4Ss7h+kQ&&$!Ji+n4(b&2mo zPM3K#dUS=KMX#>%3+U4|ej9lmF7{lYUnlsJ7|=<60E4>Bi!SxvI>i~R)X_PN>gX%5 zN*DMQjOiM`g|ZHpSsSd@30{B+o#aKB)G6Kr6`kgNu|{Y3cC6JUei&6<;TN%9*Z3XO zbQtu#{<t&TuH$qd3k-W5G$TnYX{n^P-bHg0wF2?pJ#jbehjaM(6pW>wMY z!r9YVe*I?mrEC1!E!Om8&A+?Ved#hkKjOaPIDc@5^QOZuJqx3r-#CZ6?{xh-$0z;D z^~dJUU%O_V{D@LG)PDz8Ub*LWjV>u|TvHcaRQFT|uy@?unUikq=U zr@0Mlb%r}IrL)|Hs?KpQ*6BPCV7)Hz5TWG*<_T=n6<&)OUFG!%IoHn{ zF-wPgTz^C-cuUmjBp-={&T`)>pTj!OTl~i7TAa@d#+;=%pZ7vWXL#2A?k&#Yg~-M^ zd=QrDET4mJo#)l)(G}kE0ncol&lh4)7x+08b(NR>*8S@o_oA%xJb=}4J`Z6+7kLDe zy2N9s=raFf+`i~4zxALs*Wq`r{~>Fu6THQ0>vM|cLy**2e(z8AScixG?`Vm0cp=g{ z8I4vQ{UfyN9QUF_=lL(_)D>Pa;T-59rysQrI(qZR-H%Ri8%jFEbrt6`j`MM-=o~+c zDP7^6p0M{i#TQ|NF7Ob-sosl6FiV$s46}8aCs3y=-1Cg{p!2-?Z|*&g^R~~qcb()D z(57?TJLMUS^ZB3X(pBE`A6`qR`6lFbk^hH59scR;VMu5BcUY;*{ONzWcb(*OF|PCc zPfX}4?^(5{I?ZjU>I`>aoz8L>*6SSiVp`{U05x6UA#Bh^9>GRk;xWwVGEX3!W*vAf zX6Y)Q^1LdalBR{ubR*&o9J;U5ETc>#+Bz1-l#3G&Lqp(=#_!KnhJpTkK zUErIsM3?v;H0v@ygce=lwMgqKzlc^{<9E=e!zOdXCTQ0Q-WnO5Y zJGdEY~T%3@dek%m3%Tbo6Vxx-VVhUoDv% zrgVvS*nO_QpUl_t;a{=uXLx)i{toHaL$>NFpBnd{U!zW4IEVO*Da9VT>*ms~kFOvd^ARj|MtclL@Rx9U*UY+E{7|TJU@JoHPjV;7cDxhnj3aUt4?$8ebz0`=Mt9b=*P$AhHhQq zP4A!Uzen-s<2uI| zPP!&t;Ot{_LsduLhiP5rLmqdJah#9E?6Z9>Ux_+h;1x*dBHw}qy2MXlp|0|4Na`BD zjYT^A)tX_kPViP}(n%geN|*UXwCEb|RB=vpiqAs3&hws6c$RdUFF~g+@cvI)H=W_j z(G$n{G4$yQ*FR+qb%MW-L7n9rv0N8<_8Oo6aSmUAmAb%RdfM9R6mR)A*R7L$JSsZJ zcVn$C^M|PF@SNAcdR^kzP}4R3FE++Ge|OF?qZ7O}!jHW^FTpIG<||OA3p{(uUg!jG z^$%w+&gX`ITF==0!>aS9bG-LD>!ve&#Cp${&hi#7d%kpnPe(!LIrWNl(9sWKRF`AF z>fU4XZm-P^t96=>#9E!@K~!~tuYcXW>mnciU-#8#4%e_yM}PfI=R~J@2u-@kuV6`> z!(V;N*@$y^-aF2QPVjx`)MeiM1K$VZIDZENI>Q@2bYD9B&*uO}bcr`$ERKKVeNfhE z{w*eSnb&SIFRam3-h9(}VOl46Tg>PrAAoR<_u^j6)_ER5LYMdxv*v|`I>DdABAw!O zXwo(Q=4SIki_Y+4$mj}xy?$Qk)M@^F!@SU=Q+x&nb)GN5kS_4~Tg?l@vH63A^TH|} zww)Kg@yU5%Qm6Uy?Y(!L!?$2Ym-vqe=Xzg$zG+^VrE6UK(mcNxPxH)f^ZY(MueoHN z-)%oHw8j4NyzqAOywDN*EAzrL$muGFug(koah(77b=Ryb{4!SR8aI7oUKrIW{u#z~ zk)Oe8UFD{<>yLBz8LWxpe8@NFg{sc-e=x0UeAc(-g^fDTZ({a&u3;~0i8`I-$FV?H z_;aoHMW^^lq;!?%?=vs7>Lhm|qjP-KzV25Sc|Dft8b7w*ywI&H{Dp7N^WV>TO}-J! z<9z=6ckGd_@<*9@{<}KYcA)FRgii4GnAA!B5-K{y?FYMeo#9Tb*I7Op(>llJp{DaZ za;SaMCH_6?^3FC-BB3jMW`}jqdH&pC_FAX-SuE03KK5{XpmTg)=e)2a&gV}a;hJ=k zzl%kC_*ybe4aKX>=V{FPiPzyHkF^du%gfNHbG#f$UF6o|=7q&N z!zM}ouHeKPJj<+T{#d~!*GdjcDoZt-UBroo^4sj0u;3Utl&hk+wI}bX? zhvnR39OvUsb&qkJU&lIKCXB2?vXd1>H2l(^(>riUL5Bm`&^IC^0DW- z9-ZSap67aWiZ{=@f1ThhQPfF3_b2XO=Xw75p3^wa^Dgk5#`(M>rgVyzpsLfnFV^V{ zUyJp+$bZDNuJDVf=^Ag|@7(GHZ-m=`pv`+EMXw@}7Zosfgn#fUEQ{40HK>m;{cFIeq{Ob(wFx)|%)dzlV1)Fpl$Pqt1X%@HHsvA}{}y^AMZM z5gmO-$$8Lue()~OS{&zp-0eBiRo>|yYob&9JZ4{Hec~7v=&;JYW1&uPV?-yp2}zye zGk@dk>O4O+X03FUM}O;V=n^-NTOXa~_tBxlgU%I}=^AhOJ8Pno-1~dzJl}_YUFHc4 z=nAjJpsw)CJ3Z*!or?E=ccm`uS{L%elTqn2@Wu4?bv0A73 zI85psUyC)m$PZ&mSNQK(r>lJBL(ZQr@E@=t&f%?BdvBfOX3VvIvab@X#c=qkT~ zg}TOX{>k;}@bJ9wSuEBmJ_aeBl$zUXXjQY`2;MD^SK9Eo#zX&Oc(eX zbm=1BjBZ`xd4F-9b%MW%yv}guQF|1dAHVG)-_|oWzl1R0zIfg`Yp4^v>$Eeh)4Y4ld5z8AL95Qh-r#$2Y`y|n zUEpDK=^~G!TbKAgY}7eE3o|;;g9w*cH(r5Ry2vA#txJ3#>U5bmBB8@a^ZavT=UFHC z%V^YTUW&y!%NL+Y7x*5ebea8aU}1?)_`hbPb(-^N)6rwd#QFR-I&|11;h*^?LRLrT z(50hC;-7ViUqG*}@xqUJU7h4zF`(0Y5C(OYPenoJ`D!fJMZOzDy39{vSXcQ?6m{4% z5gM>kCwW(l=rkXMQJv*eQPO$78mn}X@5h)f^OG3YReld;9cCrMwpgu`yelSjnh(OH z&hlBP=saJIHM+?6W34Xp-!P@C{3fb8eBAY8olf#suwJM6AWZ8lpM{#v^VQg(i+n#e z>M}ox8C~V~5H9uln|XcA(nKZ_2X;{DL6Gki3%I>(n_nJ(}z z(4|ZKCc1U_glj{uPV!gKr_+28@;b|Bpm1h=P2OU122;bk? zz341|_6ycUr}#9?=sf?c$=M$CwLFcauJH^O>9C9Yz+#=?Ml|Up=aJIU^>TJk_wMct#OC@v?5|Gn z>8QkU{=a5>q|Hu~;wO>NRsPslJ=Z$HNi5XS zEojtfz6wcQ(Hf(ywx|X zVI1dq+iyEhI>}!@$T`$$z7xZ`#LWj= z!#K{r! z{egAR75;11a~GRmK}y$n?NPoj=ql%qwmv#~`(vz$PV&LaoF$#*Q_-#Sd^K{q$bUkQ zuJBs)>MCz~taGCiyc_y;n)mH;hIEF{z)GFxTQRCjeAJJeC7t7gyPXZ4<*8G>hpzGr zYC4>j2q&HCd5rVlnw z(|i;9b&=nx_!{kB(he73NEi4vtkfmm`AK`NQ+zH~={&bQ37zBT{^j#TSNR>J;+$$C9F8SA%gz7xbEZ!7 zmB{D<-+>NY;@moCUPnKQoUZT{FWA#KpGVOj=kozC`n=T{egs2tKJT{P_hp^tO<%SS zI>BRDt;>AYtJXp1`4_0_63=I3Vpi~Qop=Z9WhE}EY$_R5m{a2d7qjemc{uzf?i$Xf1+Pkc~;~6Fc|0XE?BNpd?bc-mQTk@o#*!L ztf$WKM;O=P)AK|9_VdG}PH-h@t#tIkJ6J27pZW(lrHiEsOmER-_i5KI-TYRkD2ekX*SM}B3$eGdDSv!LYFyttTU{mk2~J|>Ky;6 z+x^D*{0v%kl{Y)l-suD{L`ElLpX7YT=C+(OsWW`tsq;gRF7hU)*+-q=rXG8*Q~dH7 z)F3RXHRGN%nMw<&hvr&^Fw!>!@FN$A9b2fL_z2H5)A7CuRu{3`F*U^;mY~p zmKF9_m-r=2=o&A+*7KuN{QPz9F^==4L+(o#cnBMHk?+0U^P|f=fx034!XrPmce=#K z58F$f%Vmj4tvNvbxIK6|I9#@)79OS?>6`&z9JH zI|{nQ9XDH(IL=3{bk1}x8mo1gQ@6Nx9o>Vf&hxgn+FzaIWth=9z6rChcWrzR61vRI zx7lBv=IhZI=Wu$&y~lBGL$l6s2U>KNyO7p7?nSH4^8ng(frrqpi@fFS)<-A#OmxKg z{0_1@+%Z2~jxJr`n~~EcehNLh%5R}J&i|$71${cn9mwk}Ux)!+;F~e1OZ*TDy2Ag# za$Vz3jJj5x;6@DVBp-#M&T$PRaXvqNr_UB$_g* zSg%uY4AXHA|E%O0)J1**;RfTp*-HHHFWD5xBbqV>kPk$fjG{`{lQwr`TPtWqx8&Lzs1=>*u9kXb5#W%b!R!grrXJ0G8+ifAaqt zLbFct*1NjL*u3j*4I!=5yf@l)hL8R_Y4Bh!I`m&Aw?Jb%LvVSvMVh*xn6cTxYop zlRC#2prQ+WGuG%5-;1@n%zwg^u5j+#UROuIgpIn!P2aK3H+g<}{D6kAK$rQH?>aL& z&vhB|bb=4V5}oB6(X5MnJ6d&#A3&Qf^K)p|RsIke9S&>=+hM6raw|G?h7U)l&T<}E z9epX5=>q=@UAo9k2iY&3;!DsQ=kW9B*EQbdVCOH+;k_`dGyGQ+b%pO(YW;PIH#x*w z=mejM)jH1?qoNDE!}qMYPVqiir!)NJLmR?+o#ww`gRb%=9oG40zLr0Kn03}Eeie&! zjSGic+c<~s_`Y+iOT6}zbM2xKWGTQ#jq~(KQW@K9J0=BoWrMKOy{}oXzQsHeDX2Q zu+H%pmN~0B#jj(XuJI|yS~s2NUmxdni>{wvLqgYhldgu)s1y9!53O4q=aC;-w>Y2g zLzgb|(cRWc=lC@A={#4E*U{fT(Y@;opL|k77>e`x-IKkp4!MT#EXH+}TTk&k$N9X^ zsqQ5JqO(__^2NS*JCG**d{XkkD!VHWum(ABIMqjosrjFg6dP zNf-H1EYTI->2#lgI>qOsRTp@>Gdzzv$q%4ImwD$iJzsG?Z+@1uq!auLDDh%WIYMs7qR&-d3*2+@5}f9#QN(pKZ3?M z&VNHvSNV_UduHP}-+qBL*ClT6x6V4lhhFIU)L9-yHqPPyp<9QG8p1{B(FIDbpt4{LqXwx~q z8W~;WZC6+y9jZepZRivw!aVtTcyb zP^ZH$8vI@_=SNq0|CP>+&hTHcL|3@`7Hg$*y#KAvP@KajVQC!a^UUE(?SI(u=P?|#vG>N3BFUL9U? z4$-eOJc@!Y@x2(B+@3GYq-F0Jx}S6USZ*go;|U3BlEJOo*xM7X))T zx~uCNu5Hfcn0DP=t?e}+ik72d*7y6nQ_svZr_b#fT=w&M|9JKD`#dK+=Sk-|;oe(4 zK&Sq~ysHd-J-C>12YQFUGS}jVo){*=n<&?yA0M6I-7>O?q?as_(nF%$f^lgWSRlW#i_UL=0#<8L>?`vc0* z_kwp*?m{oTJ-$$GK^MSBDfghCy~9NKw93$v?l{4JOBoxWKLP(rc>vvdr-^V488k{43=%L^|%2nuNz>_F9q3;1tr`&~p z2wX@xhkg#UDEFYJU5LMw8_@59HswC_hu|{G1L&ilM-EeNLjM4+rW~F>5mtgOPF)7n*G?c}Q3%51DT+E|f~jE#h`IoiiotQ;F1X^f1I zt{k6K$+d}RiaG`sST!0}&8(=6WYou3hVjL*+Gw_-S&WJ6W{c=FHd%f3SXezdT3eBg zH227y8p>R;A{6aLJ#U3ydo8T5t;^On*EGiSRlTwPih*p!#+d|F4CbO3$i^vWv*|G^ zS@T0#qKerL7qhq?>sEZ`hrXodAl5H=(@wsR)hscK<8Slesp7Jjh)b+Xd{YU&I4>l- zj8`&eT>QKpDx1BEgUzY&*!&x{cB8Rui>;SsZ8pYa#l9+UriVFpL;A{c%=8(R9gFy@ zdK^Em+w3#DRkyVus`2t~ZkRJZ-+kHi8jaGt*1So5v0o( z&DsA;<E{zS*Ii4XeY3k;B5?otu8ij?Wt(E6suS zbmg)?H)Ed3;l5DBf6LN&FKd_Wt5<~8BX`}sr`Wt~8V{RBZX3MU`^>rD7ks(UbL3L} z%ArMcNuTAF*8S|>XpC$e4;yFK*4AX>&DD)n`B-m7zt|@|kB_IywqHxGV7cn!V}0Jv zvNnyI8Rn_%+wSc1GE=t7FTYQFS?2SBo)us4Vl7tpU5m0czNeTUih*qQzNu{f%uv?&Inyxg zOUd+c)OerM(j!@>uk4&HV#jk^1vTF7jpD(zOxumBptl zu4VhXG1uMQLF{N!Mi87J!`kf`y=<}z4ooieRqz1_6VC7 zZ=1E5-7)oZXuL*!u6sUTj@ON1y%=XUe)=)KEL(j&F5CWBHn-wm)NY9!v)lZaZT{R< zdn$%%kLSf?NT$w(cwNMGZ@0x*ZDzmtC*64@`Lb`y?K!IZJ#4q`=E&NWVeQD)usf?5 zXL99pT(o?kZ2yLllQI?6Q~}^>!Bf#o_zz7rsA^r(_hmZ?jZ)*_tY|NqQEBb69pCF`GrbU3%Z5oSWpE z;bm*X2^X*7--8+t+s<3fS&_I$Y~#N>ckx)*e8FhgaNdf2=RD)0qSK}Oy*M8jZ{qwpGq+I5!*{N8?agFQ6yeHl_NcQZ|C&`ga%h#QIv$Hs}c1HV` z_O!T7G6e6hwV7<|GwNd?-ncG4oei>er?b`b#qr-?-N#hr?L)aKn=H=iQ_h$@ag1$j zYVVSa1s7j$d)(*aCmp-oJb1fJpK{Hg*>Md07}*xTFOZH|r$gft$m_VxWXndak5tUf ze&ZFjxh-3N;wkzP@BGv!U*;oUmW!WkE952S!faPQ*qT?_)|AD_XmO_TO@5y@D#-Ua zV7#d~%6`Rrhs!N*gXy(4$z2$pQ^j+~?e{)+NY?&hWjvxj=ZpKwmVNIlMT`>XpyqYK z<-Pfu4P{Ob_X)L64Q-Xaz3)u2J!gvMDfLcI{?0I_u;K5P=DA|3eWvKY^V0sZcG;nM znBI5BmfUZP@rieAK4z(P8_#7~e#C3T%ax6V{!^Cv74JFXH5B>4-=oxafB7rsch_(( zEPsp^^UZGp{PV2IiRp6pHqB9NyNx$p%7gjgepoys9lZA$Npmq9%|($X{5^{9p~{b$ z#B-|GS@?bEUcZajowPJ|nwx32&Sa--JQiyCB)PWc4(Gqw$oKP!krS56Ds&|Fqas$f zSh^pS<&(uK_QBeVSZvw%IWW!v*_>K)vA>#!Ikz4Qn-cGTY~GBTEmrsII@aN1YUAR( z^y5vYsB%etGea9w`=#+2E!*e49OI4ckbT~kRK1AN(IxYr*dLa&$M(Wlr}SF>iP}BR z*6!Z*u=~5b#nt>0okNDFwl253yP%CTKNp8_HaV$hR=*yK=dpvAK9AXbPt<&o50X2D zUCLMg3|`CwzrnD5N;x#?)@97UT%O8LvtRph{QM``{@!*Vdw;Qpw=P}7e$Vl1&bP<< zEY>#new@$Ic%1lb?ktXFXNhudF0n^S<}Mf4B94jYn_@oP`^$naaqi2eS$DSEIxRZ~ zy>7*!kb9G*YpL+-sHO2P>^gjJo=Cr~36&>@wiI#`cio~r@jW=6lS0oHr$^uFCU&n$ z%VVuCt<4=SuO%mzwRv^eeBL~y&xTjqxA-_NVYr|#3Ky*OT{;@KXZ<=#i-Y3i=$<03n!ot?!TCURDM zI~-pzhllK)L+_u(O7_m%t}~oF@4Nc_z1GIX)V|AmyCuhRQ!(E;oNtSyQw(Aqk~2N@q3nz?do6~daeOU~8GXJS>nrSZ z&o8l@)casBPi2e0Z;#`V@>TvVCeBceogK!&d{vvxt<78UT;uk9>9_TM$eM7-$YCos z)i!1un(G_u@-cpO5yisWtGG^myVL0{^6AihpCwcGEXgdp!=&yIvd{9b*n1N9@OaIZ?SHY&aoy%N&N*w3V`w=M zudO%_{G1fFCBE;J-8U8YY2seC?@IQh%LP9tinX^{Wm_Am{U`R@=YwM9^D#A7MGhRY zZw?f8-+JkNuUN;???MXR#QP5KqkM|rANV{~*>Y6noATc+zIX%A@ax0GdF%LXio4^g zUq0Fz@!v6&yE~(MOqnln9+^E}Ud*%HUSspAx!*Osw@tgXCi(GP8E@+OOuAC$}*CX9u!<{wW5t&JX#Jx@#42PTcpz@6TqxH%QOiaIY)I zC*El++g|qUka)jtaZ`@O@2&ir(L5D86YmHtM^dyHleoXdIi#_EZ;@TI#C-3&f~>Th z(tDt7(z6pi@qAdjpO<2-9<}#5$j2wn;W!_PT;96x{pLX1;yrnP^|Jj}_U_pq$iGE* zH?)05dtrR{RSfKWuz9k&=F#t^#l9K6ht+u72TV_q7m0lIyryf~&IJ7)#obAYIJoyN z+8Y)UcOJ>HJU5wUkMe#;v^R>!o)J{`D0I3zUExRBdP}q`FMQmK@%LDIrbwqht8G8< zdxI}qT>Us3@9kf%?D>6eTkKMIAkP<%pBnCA@!BvO#J`B2nzy;cycMxIeQ9hYZ{Fpu zpDW3nadTG4NW7!*c_trhUHEoiUT*FC7!>*vd!)riyk&7Q9*d8cYjfaj@@2nYS#Iln z|9RVZ-+ut#4pMVe_>wrg%s#K*`=xeUvud~4+T0X-!~^!dTX|nKe%El#r|xE6zRI(H ze{kPoEM}=aO+Hw^(Rgipo6KkLr;QVx<_z&vXII%>MKb2xbM=m){a#<3`H0ha-^oVaV z+LINJIk)D$PZp2Z4r}+eiD&PfqPZsrJdcg@e9GO0;l85sTq1wG-zj;%Ew;nfzIZG* z%#QuZjn{5GmwpaRkI9Z>rn>c+y*`(0eClqlaasqGQQSdpxAYyj`eJ*FedhK{_j&2J zT-G>)*|0}X;`^lXDt;#=emg77$JiDhD<5~o)Zh1uZ>ek8TN8I%v(w^n=(=#|1r`4O zBJsOei*bf+`>uuE?^MdpFUi&(6WcF4{qvP#rSnjHGj9D@9OSR!4JeS9@@pCKt<8`7o`7i}d z<&U4M;tY#^Un2R_L%#}J6W?kq?gyHGQ^WnXOkP<`cIWQy-#w?|uxn^%aj!Xc?=#K* z{5HD_y@~sK5tlRfJ==@6=x+^ttW2iO$#ysAe$M2FKLhq%FT4NtTrvzM*J%8_;Pcw+ z@$+03-_&zM;b-*Tuo%D09wA%JK3hMrpR&!?OWB$#^dx@2VX=s58NbgPABU8`UZ(lr z-LK59OQvseM3w{+*ZP z?i`+Nro+ca{Jwo=_^s6Q#Ou)b%kGKA+T6BxZF=A3$Mnz-jZZ!Iif5Pe)%01cH7@ns zm6|8{C;d8)Gs>z9(y?=>qp;UKpZh+IT^Nq_F)1q-YbkpFDt*esozdN}Y=7BfSM-h| zo(I`EIrPC|BVFFMc#Q0rj_fGbRN~ps`(8Fzrf+5#qvHN_*wXuxm!-1t+uV9zeA)bp zsp*{>>h)v1|0X}CDIVp|RJ6`h@lq^O_XF8DL;TBPB^z|lEE}KNt5SBR+7u7_9&WKx zn_#}jxlrW&&G)X;l&?i@B39!?owz%X}4&<-Ghhd*X80__CbQc=b&s;v4&DI*nTV50qN$ zjE;`(&7CqC;?;dWKC2Xux#8N4^RjF$$2uf?64^%M{#5S7^APKfVR{?mu`QTR(;+*A4<+ncMn(pqU-mzYA#f_bzH=InQs88dA7Awwg%Onx~up+ z^l_5CeqSwH_p&9vlNK>coa5eS=~^7FJLPtKCyDiItmT_8`!%OAQ!d8dAKeEoSg~}! z_Tz0$c^LSstZy*g7&YlI7!_(q(ONj>P+2Y?sY_YR@tK(!G6X zyYYLfv(fa6#x|H7^;y}d+Weg8UMrjZI}RU58>hDU;r^1E=iPI&`&rD!q;&awksZf6 z8`WoP*_UJgif56;--N}nmkgf+lhJuEJGBl|F|-(|Pw;kITk2d^#*5lK8$cAz6z{?gV?^>&dn`Y}Fcw@5WxQ_;jA7`1~9f_9g!2wP?TN()n95_BKm-Om`d? z#Y{2XV9)W*1!Kd9xqE}dlylxp(FOb*D(9y_2dJ>+;>pl1`u7@=bRzZo4y5Q%?VsCv$eY-DPf7v-EJ5q6_CA>Gm`Zm%r)tw!f3HznF?Tm$kCweVqZp`dde|mg zEq4mpiSw@P-tNcBHt)BOlh;?~m)cYLdPDuy{O)k`>upp#=g}j3X5G57_$aqh?}p0! zFKkQvHhj4pwYbY)@y#Ue-s(&3*{OUGZyEd?r0yqvzEqwX=B%GD-){LXI?LLR_bb_9 zxgFb7#Okg~&tKy!vnAel#P8RX)%`k=tU0&-)ED2iy^qqd;LdH6FaIW8F2%k{&jNbl zzk}1=6WhI*YUddb5=H{tX;8)ZH(nxf9mX#KeiW$&-QPNM;YDC+bq`aj_ABG zIZI{p?*c~gm3*5=D;u>u@$rerONZsK@f+2*xEk@Xy7rnfTP4?@gBCN{ax5~uFKU~i zO>>gkJFMSmoX-{?>o;9yr&0AQHv6L{Pd-e$+)d55mn9#{#ujVG{T;a37{@=>sW@qU zWW$(Q*?dY-vq^E9a%-JF#m|FsHGW>y_+#Psd>S9;pkg_bh-E7OQ*DZs&%0QDoa1qSY@hi)kF6@l z^1c5y*Iq^}-{L4bH6@XiY)>k?=lQX|EM1bPHtCuf>N4BacI>dt=E={q z;vAocaeqAD(k1wB+P-WyrDT`ofXVc_eOdkS{78PvHa|xiGZXDcbFQv9Z6Ds3{JG+F zTP)-Jl1(cm^i;epH zzGyl;l|OUCIq)*4qCL*WNT&70v9R%R{QQ`*vdI^fT+OG-K7R2X){ohruU>E2{+Non z-`7&-WxT$*R77q9IT^3%>g`L*1-^*U1ff1E28r?@?yr{Y{pycdh@oOJI_EEoJd z?aw~%YivVYFOypqAH{gPyZ6U2_wv@S3hQ@{XRDjT|K5q}n_XRTD|`3h&tkocJ=VTZ zGA6Faa^rezV`@%|xkOGJWQW&_jBa!wb+?$zE5plhShEFwJ}EHJv4Qv^>bh5W_qW!)E%L)`RM~7Z|5VrhQM?f7a&COJs`Dpq~zsd3QB%WE;x%GK!c8Ev&&i?8e>;3k6ZmhC&m>ovF z%~pDLV^hV;pW~KWMvEMa{#%KuHsy_f&*SGZ)n_@SJn`@5 zm&;ArlsdoSToa%Dy^&%(SMm-teh=q!EnWwT)2`ut=YLantk-nee8kl9LG3>G%gV;@ z={#dqFQa}>iur7P7>)bA9+MO6v38@r|8JG+$C+HCH@18)Z-4&A^Bb=dzxT##qqu)u zwe!+S2?|+;r~FN6)xE zX0~26x0CLjjp8%o;^WtgpAXHk&5_Nw@Au`@^PB1S@{2en){%JT+&fX-f#aNv>yj_N zLT1^!o5b%P%jUIg?U^4wH|4wc%g4&cMP+-h8dDo1xjS6W@2_m~HGa;mA=y8Z*gG^g zi&37W?o&lv62D;;?{swcG8<(3Ww&$1Sc-fjLaw739#bnF28FI<%FrUP;gL9)ywx3_k#ZGs2%EyIhFD;W}@lk(j zy)QTa{;rt1Z=`ZWdZrTlhtECvwtbkd77wGIudHmmqKe~o;%IFeV|N;BEABQYl>b)V z_%zn%LMmQ1x861zUq)>X{?>jQmy%=l6!R1PTTsc;kIKl>^3W zx=eR!9cuin%k8)xpP~D!r*wE<&8C=^oiXN1?5B^-a($jJw%zZADwplyWY{3Rt}|Np|%~-T{|WJK-!c?v+g{I=TkCbI}b#z=aId$3448f{QQ=k&B~Rz=p2{5 z{;c*v>E7w6H9UHA6NM%$0Py$4#hv46{)%JAg7KLhRyXSNz?Xf0YCkf0MvdQ7>npq4sb6;^Ll_h&7 zai1%@=V?rFmL}eX#IpY^3CQrHK(#gGItE~q0B$OUgCA3wd?OPW%Hu; zg+xsMC-I1F`Jc$LvGF>!b{_+4GpbzEIbQsGkXv{EJ&MKM`Ya#)dN3ZzF+T0HlhHn# z+I!35S=R3DPvt`D%rO5%)$h;X;=So~Fn2idufCZ2kMA@tB379Nh(MtmOH*S6w#GCHz}1 zmXfD4!pn+t!uOeNzD>HN!_JZTZ)eJ4sd398wa3Tjm+Y|oi}#J#57}t-tBI$P4P&+=FjVm?e+G>eR19F6!qicvdxLttMcs7Uhx}`;^p^z-&dAf zk~QgMO%0z%VtYNGZ1y(zvSO{fwQSk$o~1pH$~Nb*&2io4)yE~J-{wz!Hdi**sFzWE z1H1XY-@xRvf94Rs#lx4S!y_eM``ONYcj3Y=-GR#T(642i-(oGge-BwU&b#MOZ9HL4GH%Rr>JBFPipfkOCdIum@m;Pg zhN&~?KGpX(`Xrw za;eNmjkR2x8s@FZTaIdsjg9q6m#s5j_H$)p%Jv%T7xglH+4K0a^vt<6Xl2jyKP~%t zO36}e=CIxR;<~ka>f__f;wg)@A0L;s2hK zR>{@+ES`H0Ui$CuD=!wKypa6uZeCM5yzQn>d!O3<-XYy)OMEuRIpD{d-$qS_uiIX0 zeMW6=W8Qc!is$Ux?EBwzv3NU&r{QFRB~sc^F8%Eq#T)x z@>z4W;O=F9uTUQBaQ9#7(;D)Ah<|dpw@Byq=owJ*7oGh0T}#}r`i$d`?Tg13>o)rR zXW27LEGxCXH zSL!_RF)oW?>2Iye{u^wGzYEmb(j3eV_nP_P-ln)sx%}|L>!`?0_wTeSFU)3@r-t^I*;B+U`ddR=D`oRj)}E48rq{1St*2SH*B4_F zzpwK#_hrq^yqg<4&x)8O{!RAOdMS91SbC=|Yq$04sgJkHGsD<>p8u_Kyx*6tk<{8U zn~Jz6-otrcq-WaAmG9F$%(!__ea_YWx|(yb@pEZBaZbdtHD-3W_s4zm$8y-uiDHs^ z|Cl<9HEw@4THK79PNTBX&X-i&m51?rW99A~_Iv-z_EqVX-1wQxWSAW(-IBk37(emH z_dWk_V3-{9)6?DapY8c~A{X3#>DOeOHSo1UMy_w z#QTX~Yl^q>Y-YHBjE(L6ExCAJ^G`BjTTGA1pB(N-;PGn}1~UT$1Yot4Gje2aa* zD{GvWAM4ltZ*~~3=`TA=wdTcZ>oGN7sWUc?Z(NrhvL|kr{j)AURu-Q>Q_UXndmrL= zaj89~Y)>r9tzwTZ`TM;194&Yg&y(J-!`Hp|@X?8pJ*P#!y0@}FIv8mXXW6^mo#SP; zrsko{ezm9ebmi6d=pGQqE3QjcYCT(C8TIQ)b2sDeEwN11C!NnJ-!$LKMePOp_nzat zIdp9}l;l3BR>?LsH#Rop>w07T6@xwJM_C-zzL40TEI&=J^vyXRv?ermE-_YpLXiu1 zTlyTloGmGNejOJw6TdT6%;uwgR5mX-o27TL#9rm+X1DIP56k9@(KzmYo)s&d{YGs} zOf5%zyV_>i4=mnBV;;YU`85@nz5UDCWAp6kBz8!i$?#=wk3W|z4o&TI@6&Cl*#og>MDjvJX6z?=nUHYy=b38fB`NIChzfn+(P5fI3 z(zBDCk!?HNJ{H$CuREi8Rokwpto%97+9za(&k^lAUWYH2ohQnxvNf6VbJfay?_2RbcRsPU z%kta&N!ez)Mo&JPrJLr4Ow3Y8cWGMHnGT>VC3VC;4evVV$7Ls-){u_Ee2Q=qX?mnnJchc>-DIZd8 zh0Vu|#4|8b*je9qk1X!xe;!$KFE5*eLiS^q#-nI|Zi&w7zB-kIv%?&;ye@ttaI3xl zy*VEjdxvS%@9WA*$+NqGFH5%Wqw-}gjt1lQ*KcbqwN@q9Y`1lhx);W0x9YQQPHn7o zXF|MSly_XXR$YGu~l7nKd;Y^Grk*2CBvSr?BV ze#w|g(8qGhoyo44io=MrAmu;{Cm!m$Gu4BYwZ|V{A>vXMlJ# z#^15#hu>P&zK|%(?j6|e_Z7=Cqq3_k-->k<{pKLve~b4=mn?mMB)NXylfL<3o~LNB z7GJXObKCyL#4#2B%ut8XSeLaM_5Jc~mwQ$!<~#8WU3QKsf94bGLUSiu{hm>_4lEbq zJuQyA-%I=+Ve@KoioA*5Q?48f_H|*Od&xApQnubKwyASOwrzKDi|5|kC%dPId!V;b zW%cb?=1%O#Dn7E;x55IorM&n}JRJYh#EMjWr+so4a8?U+I?2LZ<6YGrg zJ9T%DbKK%DyJkx4O|{2zy#10jpO6*D)X!mATw)*Ny-oGm#J;X^{?4PA&PC5g@z~fW zpQow2rTJrfr^V8!^&9muitST<(LEE`7^50%`-Hcv*hdq;4N*K(`DgOVsBE8d>n@Ie z>X}Ef%I3VRz07WJSK0pQ^G5u>UdT;+U-LY%PjPH#hi9M7qtQZk;#t*fR*vk5o&|0T@k^~g(`nS^&1hk3;@q`)ejl;;$LrMEjmCeEB-uNM z`D6MEKT7h(+aeowMY%9JypyGJ%lmD*tZR-OZQU%m%YZZDn&PnRcJH zaVA^iZ9e>2WNXj*m*esB#aF~7`WxI-9(Y@nLsmE4%C%{iYw?F)inu3!mnIpOqbf^BoTt8C$VvQePVt`~#$U0Xcl)8@k~&k>zL1Ew?4OP1 z#^RwojqjB{2C06vrS{=?kFdO(PuL_Kwr>?NxX03SQZcao&g|8=$>Dxij5~elILl|F zW${wK_QuparP_=?o>TG4)|uga+5C%dZ=UD-JVX2S<;y!NRI9%HV>XkW<19F<94g7e<$POxW;wy`#dqZM%8a+@0aXV&X)Dt zm?G~I_kcL21>c*O=BN3iIZf?*-uBeqqj{Z*_JgU!8Y|108`|#e@nyx%&IrpHquL{; zqVvzEqhY-$MfoSr{ZGy7LQZBmJ|BuXO`PFA7O||j zZaNjCnLRP$FF&x;_r>wEKBE>-tC!ifetc;TD&`A`oUz}NtzEtJdr3-;<+7-cfwh;- zt@X#$^q1wR=l8!+EPg9j-TPZP&u3-HoJ;uZ?T+Uv&LzcMdzVqk_Tx?0{;1DoKi;?d zvgxriCS}*;aG$m{sWI}$-yPKEb369;hSt5T)Lmh@yT{)eqd4y+Cys}YosVz)-wX46 z^4;HI{J63_c06m=ty;NmYW1k?%!B7l>^@7LxH%jT!u)PpoG;QfW1QG8AGD5j{=|Lq zZFbLnIZxh4V?Pe$e6aZ2{!vDaPrh3I8L!PnOkG^|Ig5RJ@$TWRd;dn)_nFQcO81w) z%E#&GF09zuGl9ys?|XmEjyOm5r_axe_s`F@&pFfMX`I{Ex9|Cpujr9GW&37|SN6;e z@2oxs(znayTWVbw@ADJ?&Vp<+-&D4JQgqhso0dODeQY!?&iS<~SMnZmv^bF)LmgAl zc$~#X?Ut*uKYm`>w)Vx_M)#b6x&1Zkp7S@3x#jo%=G*v;nmwXE7tHSir8a)^@J=H8 zHoH0UvSS-fhvE?5DZG8A!}8yJ@Unee%VMN)IwPf5``Jx4hMQb45e`3ZbC?)OysOwa z8a9rMuPFXa5?}VZWSjYM;)ZbIW$VICE?yfByI@V&eBO9iJF;!>*)P6%_+`fq?AW+6 zY`kDqSaaUWFt$j$i(&C$fjw=&m0kEuGtdK{?~&;L&sZFkR4lHp-FYu=V0qp>n~>unv3n+44p_I~)F z5QO8aM}+Znj|kVi=ZKJ}EBI7dwKmj1b`^Z^_Zi!OuL&Azhc~Ca z@e^d@XB}E4eyvy2_8RoO7GBErmthCAy>V@*)814&G-kmssS` z+AENAIr6~ZP1vPA;vS%t^=m_)wkCZ&Vp%5+IkZh*6`mHf_kXB^?s>F59y!lGD0H6y z?<>fe7abJ(^o8@03HqOd51uOhmFFx5^^W8tClfDdh|(9(*`+`H3b~*~y?-6LpaWUyhS0nn`X06+v>rgL){ciR$dKKlKRkqS*W)*1 za^%&agNML}&3)Mis*gP=)Ud1e0LD&_hk$Q&jhnze(7)A&P`xdFoB(c(zEjbCXU5m@ z`wsZIbv$%HAJn$s$HCZpCUH6xUnmbAwISrl36z`L@E>3M_h!ufhzU04o2kQ_{|0}E zLBQVb@0hPc(6m~4|E?3A2iTbfi|FRcm^}jN8%f_LA^tJcr@dlfFHDHkANTAqkq7-I`z&|n9pZ} zr(xSOuoYT)CVqkz=zuP0oKFm(89X)6dKP0YpbgrDww_L%_AWHQH-I)kpSHm)a?nvj zc9piA{y@17y25MMhUzH$KD738#)XZc4k~{|?v?B*tG9+Gv~u;P(7kF?Xuoq)=)Z$9 zv;!Kncc?ch53XMmGSC7Y&<8oFyl_)!U9>4w=Qf4#+clvIGEfJV-@y0lHDLe(<;Hoe zzjKlGOwQyB$k(T{SDt%NsDDMVr0+@S`x5i^Wn%br=gj=Z z(0DU_9r)h@ALR*xIOzjHF)HAhHu7eCTe#V)>xmt%-K%a6@nK{hIDMM?Q zujO2ThjI^u590qPH-_E^HiiK0eh7KAH9m?C%K0aV&DE55Y-Fx!2TjnWJp;W@W9MhF z<5K{>D)sJX=v#oF{=vtg|BN4?#<<>xDI=@@K78H*po0^c*SnHib>{3e=5mTM^&0g7 z_1>MC>pOr`Xrp~Vy?=Y^rvqs9fro_VSF!W!==}3AYR7wK#g*XF$2(|9xkAbas}Phf5R5p_zi5so+kA=zT|5ACX{-6C$R$= zJOR6_^fmrS|Ml?xihlSi)En@0;He|GeGV~r4D~aR`$*cZS{pi>wuTzCi9J2g0emV4Yl&>l1g722EBJCp~YeF=3CE=4w|f(odE0qr$-nxH{F zXKY>dKXJ~0I>`UPJ@1dKKWO_!=z*`HaWBNiClW6ZK=%pw3R;&yK?eHN>z4w`P2qZE zB4+?PzvXVL`W*ftvnD%R=zkJ%I*+(N9+}VpTA+U}W%{Zh13l_pkb{o;Zo~d{GJDkP z82ehOJCB zJDa`YEcS6K<(I&W7B|`ww^@)*NJJLIRhE! z?I7M@06O$FX={Nt=zu=$IS3yhPyQKRc)GOb0_7gG_kQ@m093>as-OnypaC+_1TD}3 zZIHc&So{lZpbOfd11g*m;pNC>O;nr2<9z%96>R9-gMIMsoYDBw0pZEWpx!@&J@T`R z1x?VUF9$u)2Ln*~Z)E-e8KAZZ-<>MV`?iolc?lLe>=)GyJR6E$y_UOxp7nS}dk5zV z^$vXvwH;jv1L|$HeHctI2HJW!=jcPRh52e`+#4Rj9{%V}p$@8)`;TJ(r`)F8qg1)8#qOA$qpbmP(Hz>vx-ch_ApO9Av4Uqo^-#2mJ7-e1mg*Cv7kPc^S4y~-`ZuM*8 z0-D!@-vP>X_*+{T^9$-fM-Q~Vi}EiiUxrU_z~*0J#{_)W()LsEGwQu{p}v)Ihk$L| zdwzoKA2SDI+^Y`ePIVn}ke4AZ8&F1GhP(`U0eKzXt!2o|ke4B^fxHUxD#)uKFGF6A zyo%&uPak;$2Lt3)kkx)Y`2#AKv-Xi&L3coA1(_Abgs-m)IdXI4=E$v}vw01D z$Zz}!-N|?={RX$kCG_yGaZ>jL(suBfpEyO=LHb-9&bd%qp^T z(7Y4%yP)q>;zoIJXYPni=3|z*cr)^_w|yw{^xZ9?1TN7xym24^aIe@tE5dD$w2|sXqiC&j;rq=V8eF z-j>jPDEV*}a|msL8mNH&+4M7}sd2)yz*FIYw}qVcne;ypoQ^Gb$Hsd??}Hs@K<|OP zS@@dpf&Rm>9dw>a-*e!73Vn~Djtw39d&uoQp0Vf&kES2}P5SE8bL^lRki&LevtowzH2D|6dR%04;k|#dt- z2~}wQ7Zvi2edYQ}sN88?=$x=Fgqy7k?VGO)4NwJ5kR1oT%eqjbuMQfZ3R<8E+8_fR zFaUuueP|ctphCUP_%3LH4yb;GwlBk5VeCDziE<0t=_2FYb)iRp4k{0Z??LEoG6uAs zPTN0GKMQ$Z0$+pw3$$H8KlK59txfblm-2IvO@EKJ@OA}@!(jh@C6u=O9| zgEqd%I8XyUka1tEpUqhMdoMvA=z}`#70{vF1v#iafiilUpe=p$SH(wr6?ACJKnv7p z545$gWq{4CBdOzm`-$ig@F&O5F73^yA%k*u6yxA+e-Rsykv|!G@w0a{{rHyC9_AP` z4WE2}5pD1do`-Jy4){EPRxgDg^e&-Iv7kQ(8G0I^TE!lC>)W9k3)ftEf zp+fWfqo4e3fdTW>{}>eXKnLV6#fA(W=fOw(`tUWFj~=maGq(Ez^xlW@8?oz;^pX2D z&?Tmw6VbPt`}f0XJC3uSw)QiT`8Dii4s-YdaqKfc8Rd%nem44u;edI{$ekK!V^{5k zfVpjg7N{^cmAeD%>XA!*)=+N^ywGqivaz}H81zuDl5YY1IlN8fGPXBAk30|_i=Hn) zk>6I%D8A2Q3>cuNcW?YaUI!U1WVRnq8@bUJzic@lK9FCHOmx+;zeE3kxa7}(2YsC@ z*~jp+0tSym7yk8#Lm$~aWah~3!`}jZa<&2OL0jZkm-u&)UA-IcawyjyK|eG!;K8oJ z{pmZ8HV|g%Cl(Fts` zdk>!~j|R{lI_ku(N(@?;!V7Akj*mU!)dvmrF?Tt9jaSppT5HnY1|9VFur0^#3O?t= zyD>xmKLV{$Y^gA|$Cwr|%%q#xw#l0+YqRoL-q|znZPr%vVkmKFYMmiBBepHj2W{E= z0CY1x`v`JBL?5;fUV*Kz1klEp;5&@+g~&i}13499+UNe*12uiKdKBL%pcT-j+!GeL zBUJhRA^P9kC4R`=;77dUqg(|8%Gr;(YaGq{BI*ss))`la4xmlY1$~f#4hZzMpt;(( zpH#W0G@zX~)Au%X>OI6`d2a!-+wp7xa-JQ+yScZ#i+hUNZp+#D9`u14Z2@HO#4g%f zr+`z*$uH9PRc!tO_oP+i!+RMEfBtLuuBQ+5e#cm7ehtqlUj~wSd&Z)p`g_{{0N)?+ zkGAR^&+izliw!aZBhxYtLaWeor4Xn}P4=TgWTyJ_lbw zPPutAc!Zl`*U|J*ZVb3fuEu`)JD~L##)CS26;K5=5I_c6$f{qrCDe~3hVb{{?cN6p zn(DhRGAY-1_G#+*hkCdl?eO&nTSEUX=(#gFBAY<1jvg?$EAoHI{g1Xb{~wQq?G&;y;@& z?;sD`6ofn^XJET=Aqujw;p`0PtXo+kFZbB z-iL1hdg7L3q1_cGV|fA8k#2W?O#KPt*8$_5LAY5@L6Pj0iU2PXcHPhlX6?2-2XIw@*bh{l5L>|ZJ$Bh z?gh>yCX{QZfqP>EZEe~DL3RL(4&0-UlUY7i?)U+$Us%= zmU(HlkSkE`yZ{;OH?3olb5nGF2cNzNUBOu)jB-|ukvHF`?HJ_IH^7HB`$K<`7=M-A zxfwdiwHA9*U`$q}4>YMa8Pj?mdIDz?Xt35Z&;m`+26YfFB)-pO9J0C~2R+aMRqV{r zSC=ek2YF4^+1om-cn5!|K(P@7>-$Q>BcxTEx^|=Y| zf)kAB#s{Qd#jh4vqZd}tloxP-P#(e+gHzK}LBI3Kx9zU70? z^Z9=N0@|NVeU3Wi-bIXgE@LkQ@Q0Tp8`_6IK&vXlTY*-P+l012cnNd!;?1FbHz>$K z6I5F4i9E~q?^a=NVE^WMt$7-`&u?4$*K+rRR-qk!ZisL=`2z2a zS8~S!fpYWdv{TMN?ep|~k-H$@?^-{BUc>!x6@8%j4AvO53M#zstn&`K`*!vO%57w~ zc|Y3&&DWuW_Q73vUvpR9!|1)%Yq5)Wf*J4CT5I4LM;91qO@EfPiM<2a{3-Sb(4Ivu zvNCuFyg#o|u2Swkmv=d1?Bk=vmUm1Y%6-a%53t`q4LQ^UXn&49w8x!$5t~5`o9gU8 zf%{?|gomQ%LMVGxi~S+c*W}Esf&L2QgZ4T2Av^_pK(6}+=X3*P=&Z_yN5fCO!kLmW zrV6^RAU_^SZoQnG`VM>9x7q8i9 zgEr``;(Xe|IlBRRG-oy#jOi}J^9AUSaITN)4#9U*>b1?}7-)lVC}s752B?Z6ucGmX zG5^q<@2TNi{FaJu#qBSn`PmP#|*Rl7p_OkbLj|MGJeINJuF84mr+CjT0 z$lnX-53~j9b!Z3P9NKs%`^7t0=g{_-n9C1RemDEX2Ppp|dZ<^SJ!k_u_yT*y_vokG zQvXi)dbEMT*J*=R|AqbPljOr!kojfG0_6(wGj#Pq_bR~n#y`>bZQ4K^*#qkR&mi+7 z$oXgbK8#G!PhrE==w)mJzWk$>G?#>_8hdKn6O*q4{sb^;-a%eFwWh>tCrutI!tqRN?Eu)A$ek z_%7xDM9x)=1sQ088uQeXfB0JA-@feLG2rV+7<^@fIE`>`p#06ix5$amxHtBI_9s__ z!RyCD4OF&+*N%nOQ5+>Z`~2o#t4mzkz!I{SEqimw|<`(9vB0T2&doHto$n zfj=V)+W#XsH1O>qa31nH7=)K&&o5T+-D-s2UXJj7b%bx+BiyMb!Zokw4)JyBpbzqI zjD+q^%Fysl#$CCB-=$#l6)SiaMh57EE^XoM)K{?rK{0kUo#LY=nyL7+Vr>eSnRM_Y}#pd4-$cpkteWVF#+hi0G!8lWjExy()W#MOMG zCl7AH*b{j4fmV>!gLZC?EYLX?*+)|b*%7>^6|KT^9Bs!?7HG>w;jh78gEnpoJ)Z3W zS^1Y&hW^Rea{P)=xdpK}k+@9a*DUwdrRuXutvQDZK(|Ecf?lE!=?fL zgs)=99Y#a<>{0gMQSJkj$=UEL{JkEV|A=3ABo=oaCB~y6+!~%It_ro6jfVEcqr7K> z|Fxr`a>*!bZmvAH0Hxdn8Rg0YiSHYsmmwPrUJsz1 zKO^faj0f$n!jJ6iPow-M2VVN>lsmU)&4JD;>>Fckk5eCEO{%<-xrDZV&z$_|;Ltu9 z{*xF#iTt(jfi7sS9}BH@sBFk^4Z#)7HHe{72D$1moX~A8(=Wt+fAzc!Qk2@HYBEZJx0oTge*5 z?knK^;lcbyjq=sR;8bk6EwWBQ&h5}m9GaASlylHSP9Ic=ac47f-oyC!BKv*VbqmhO z4{qVkwTe6AsxSaO&;>c@pUpEMef8C=LSu|}X!jEn+|%fPBIBONyBzkOHv44v9pu{8 z39Y@8T!dDjo%fN?@1^YnjVjf~1Te8i#(4Z>4a^1d5B>})_=@U-vA`Uh>w zeS8=+M~NBx|K0if3+%4Fn|T5~P``rt(;jmUwtxZ19s`{r-k?IccIjx?#u?xJ{0M); z0Ek-?v_ThiKo07l1sY)RRrZC?Q~o4zc@MTj^Y=nO!TyrdPJbKZ3&e?fm)KXnjf`(G z7tjs}l*4!EQ=PLkTZFey9a@KWMDMYZ^MNxOG$)`SP|l$P`daU0ot>pb7F})l9pFtg-{C$i^SL6GuxLdLoKE(Ksllxr}Z$u|FK&zu$LWNjWFQE?d7cj@qqy72lpx)ig-$q@EoiAtnO777& z8439o`aAe{KJf$9d?K{ojF0og;K}$)+u%p!#}63;nxL+_V*C^ACV#5eP`?g+U;sMQ zTlBS|K|J#7=Zxd7(|pnhzlTCE=s#~Hw4Y2)K&znkWbQGb1DbQ(dq5pDUI-uPf$EF6 z_k5QaEHcmkMxOjTIU>;315Ho^4cZ#e`sZl>67&CG)IUDKdr#`1PPxYT{?FLUS#OO; ztl;l}h|iI$_zeeZ6*P`!y&px+KnK)&N6apU z0kuQvho^B%av!uP=b%aZ0Dc~@`98+IMo=4lEod7A)^p=H)`!q$!a(*a_GD=5mF%z3 z99mcT6+HjYSNSEe2Tjld`L9v&E9Q)Os628txkWzw#|nNkOMZQX=by{53xoyY!`jQb z!~-$km`Y1NNjkOGVkAx4jKE=F$n)UiQ@JZ^Q zXB@OoJ6 z*KR_*nTPD=#G7*dW%7u6k9z$|?0PwO{5CoF1@wFgd=Z;KpFC(>PfS1n)!&k*qM)X> zj~pJFtjX5z(epcWf(qsAPf*G=wK1j&t%IO8`U7Z#&T-5!XoD809gm&R95ha#Ouf}3 zzd@I0ksA9{g*mU250x#*y%l`ta}WI?vBraDX@hYqMw&JJcRu4TPW5WCIT z2c7iT2p<~sVfvR)6P%$U}p^c^ySFRU%vGtdG9>P_)b4kw{&61|`$IiFh@ zvQxns+%@k`u7f`J-Uc*)?hGInHIP4s{wFbxyJh{g6PL5*@HtBgv;5(cdiIkXy<+8-j0dTZyn5g62^TDolifQZ{)1$S8-;%20Whi{5bZ~ z?^EuxXPnC(M7;wI)a&gD_G7I}>hN@)P4hDXzpaDk>FgI5urEBBw&&0`OZ{n-oAjMe z`6FZp?odvYW z#p=WH|6!{_^})n~=aLTRYV(bZ<<3)k3v$TE&dspX!`UHu!EZ;G034_wO0+@pHZz)EGB_zeas<#ahnD zjXdA+J{UClW-#EJLEt+;i+YD|29+=I9`8NCFvhL19{LosPdhl!8e1P zZv!pL9b|WSuipnP-p}`G&-IRf9A3T`bY90heds`x?*<+E+VnL*MU?LbJ!}q)&G=?e z1%Yn>4dm6~ZSoDWLOD>b-Fs80>i4pI8_0QY-{3n!pK?{-3qFVr#s&FDy{X^1@$F#1 zcY`jdBfr7-fePOZ8lb|rg8|Sb}*n`<=a7vF?Eptl;4uj z!b>^lKfRj2-Q(WyEba|YqYkRipiW!!0?Mk>*M+uKz8AlRe(u(APtZDr-@d<_?-HQ# zINsxf91PB39v{oQeP{-4f*$RiukdY;zYl2eZ8|4s^1raZtl+)~YGddFecEcH==&Y} z&GoFS_1sq~^sUAw(Aa<-8=;izz|#Ra=!5V` zc%Fg%@b@2utZ(z|Ft>(pa{LDTjeIkF72oC3M}2K5?f&|jgw4((F!(qB~@W7_H$-`iQg-(Wq0 z)=u`C7Qf?r7HvOg4N}j($v3ngunxaZxzB#_uk2Z0htk&k4ty8!`?sGm?mEUp1LNw8 z)PF+Xw3~%?^Enw?w zcNcbdpkgO>pjfDgg^jH!f~eSv*xelD`@~d+wQCb{ERvMg6m$ z;~qQ~rOce;9FN@Gzvodw&WWMDLVvUUe`w3xJkQ568*&atW|qr2yOHzBgNR2ca+9}m zA5ewR-ONY!us?#9h}_RUQjjWmLtu`Pdo4Eeo%QTL#qjbf6UBECzm?^&KJSKnpVtEG z4`uF^j_-!Dym&lH$teUe#>Et*PZc4?3#8*()odKU;{2C6*%&j4-|%dllh1oj7Qvh6 z-Irz)B5h(z<@Ks;#1o&-<^4=qgxt$`&GScGD|b9I<5Z3;{EeAM50=AyXC8U+IuF;t zmE!z}qG^OjC7JW^y!-zjD{!rCIp#QJ7?(YVjnKy3BJR; z?jd-f7;2#%{1AvxL}MS~@doM*55W@^&rp$mp!5*A_& zw&O73@CYC957}>d2qjSuoiQ9U5RQF_!%O@|n%f>i9+XF8_+lU?VD(X3j1&ckMRZaBVq%^Q2`Cm0$tD#!!Q905sr;GfD3ql&q#&-*h9#G zTqp%^G(;P8$3Tq7EG)uW?8Ql3#7!jQ4Zh+J>}2`}3ZWvr(FE<#6aEOnQmnxa9K=OD z##dNRh!s>qb9BW}1Ys^#VFPyJ7%t-$Uf~bYJSDDC8r9GcZO|11F&5LY3>&c@=kXBl zkpl4pSARkJgCK|&R12GL@*o5P_j>q^2^(C={{HTKZXoW8D z!&pqid@My2HX#E3BD~QQz8Hovn2u#wgRR(yb4WlEp5Yz7LU>KN zP#9HE8;#K#-OvvsF&T>yi5MKhStK9{ukj7?8xJ8X3ZN`%!WaE81@jSxJvf1jxP#Y7 zf%2AiLsk?-2~fqFE6Gw0fx9|`jVgK?FvY`OVqcM75EJCpy+i(hZ@DiUOq%xi( z6LO(AywM)xFdJdmffKln$M^*0H?f0!D2p0siZ1ZOD1=}Mq7Z}gxR1{;|B%~J9u47( z0L;ZY96}O4AQjqQ)`xvnShOIb>Yj^`u_Y|_B7`)LA{V@$I5R1!r zgfGwxPa!Y7;fvu2#xiWf5nRS?yv9%1rl;V6;;4>h=#0Ubghg13y*Q8Sc!F0KBBP~XK@qH@dJ*{I#Cj};DZ4ehq;JAEKVXGkMI$a<0+&?P831~)PoQF zFb)e4i#WW6>3Rx9&=4Il81t|L3HSgfji*o;jp2ten1i+0hcigPYshImg-j@dDrf;e zjKzF}V>^!HCSKqt(xmega-$e(q6K;*2y?L(2N92Ce21ByvZ64mp)q=4I3{BOqHz?7 z_=tb-%E0&07t^r;hj9~Mks%|WqcZ{#j#ym6b7+}7g#u^^KTN`WL|_MwAr24m0soLT zGyN1LQ4=lD4FfS6Q!pQqh`|vg;5kx}HjAf_50%go{V)`xF%@Chfup#H1SH})KH)d? zti%;6pc6)6F4p28PUALS;uq{}d>%BYJL=nQ|%L^xt`1aWwTH~0l5C(A$)R7Xqn zfIp^VB{pLp&fpsE;wj!j@Sse{ixQ}edT5Ex@Pj`lVK%nl6s{u~pP+cM4Jd@lXb(S3 z!~#TOH%=n~kMSPAk=2X1K?AfyKLlVVR$&(|AqgMw8&)p17o|`cP0$kon289);slcL z9#U>kAv;Q<4mzMO#vl|?*o_mojnA<1cnWz?6|K<+(-DSPT)_+cL$C`{f%75HEjW?&gMVmFT9JZ>Th@9-O15!wNHQ4w{}0Bz6* z0honV*n!hX!h8INQIvI~5K5sgdSDc$V-eP3Kh7cvDfk1Y82KGd;D>1l!(k-i7t$3c zx5683;fE<$g;<=y9ejpWg7`pbR6zr@L~jhmI4s6mY{V`c!DZaRL%hWgXeB)b7dcQ6 z6;TgO(Gh*%k8zlRMOcSeB;YCjB5f(Q31!h3T`>$Z5QQVShF1_u6SF9X2Iz?4n29ym zi<@|XRHQ9KyP-PTBLK^B0GIFtsYqXzK8&UqfQeX+SR~*XQjx73^AdE1KZ39Vu{eVV z_=+^;$>pey_85tI*o@P-iC0i65F4n1<`|5bh{8eK!8`m!x{Aa-s-p`=VHP5A0Qc|> zX)4hksD(D@hw)g39XN+%{D4`R`ayZLML&$kVr;-EB;yw{SD{SsMh}d~B5cP6JcCx1 zZA2aTUnst;P1BE_xymp;(WDxQb+a zhgqAs2P&XGd@ux4u@buwk093fbZJ-CK9_>HuUsBe@xRR6*l7xt|J+rp|_xKp#&PC zBZeRt^RODRxPXWFfL}=0lAHl=bixpXU==puC~o5ke!^_Uyae^o0~0V8>#z^;NQK^- z@f~GQ2YoRetFReo@DzWLxefJ;YG{To2*6Y*5WWO;|+czLr3xp zyx{{s1Ytg+up1Zg5TBrSVm&B;N@#%g=z~$1hDC@%EKcJdK0x&)f1oBhV<@Iz74{(> z$w)z(&WtIjhGysnf6TxNY{em*$1S|VFF0MOH(JxRP?JxjiFbm7E5&LloFQIm)&!ZR`qC3W64kB;}*YOU& zVfA1i7ggYcA((_vtifKK!)?5U*pu(0I(#t{QxT5+xP*uJfsDPVTU18}_+uVcVHZv# z0Wa|#c5ljxTJXgvOvN&+Lo80?243I~>^{T@ywM%wu^4Ny6X$UkuORd#=OPzMqCR{u z2otdc+i)65NP*dpV;m@rx@d=f7>C8!j`Mhg-^l7m-J=>Bp*w~k7>ltDXOV3zci^I5!Z?J|kcB3rn zpd*GL1X0+DTX+j|7~>Jjq80ow0ZXwF`*0EW@Bzwj=3Xd)I%tjl7>y|i#dci63#cQ= zqbQ3O7>e20fKzyYZ*cr68@$mO0a%O}#N#cDk?g0UK6+pR!m$JAkc2l#g*}Spp*-rL z4SHiFg0UFUID&XQ#%l-xh*s-PnRFazP(jH5`v z8~jDuF^q{QhsNlE(U^fK9L06Kf;^V;ASa5V4ty{G{+NbU*p7>M0c9Nd5Vg?(Be4kk za03tV4u9c{XWLO4wb2xvFa%Su0x`IRr}zvxkZ}YBP#V?I9NjP)^RWR3k$`0UM7jy| zF_cFGw8tO>BOI}a!*dj#$aY{kE+PLU>Iu`a9SKOqfFSY{7GgI(ApK<84h_)*qp<)R zupI|*7WeT1S}^$?rBDYx7>K!8jg8ocbBM=dyg@3QDUA0hit?zAX6T0g7=;;Fgf-ZK zu@|Rt4M}*5U(l!1 ze#nKgsEf83fFLZxHk?Be#2NH^ltKfvM{fjTF=B8MxA7iI2ssTE(Hea*0SmDn#}SV= zNJaLU^aa#|FZ?kPbFm0(uoDN6fOjxv5r3$Sju?y}EXFpR#%;XBH)ylTMJS1e=!&5T zMkrPz1{ZJ-@1f42j!+i$(HSEVf+g6512~WScn@VRk)%vxPoW+jZE`tA2dNn^hF?MV>J%r3hv+qQlNw~wxTeq zq80jLH0B@@yKoXW@dDprFJQbx9+X05G(-ms#2Cy%IJRIvE+P?c@D~{tG6z68)I}@w z!bnWT5=3DK4&yu?;0xqMYy+|(KT4u5TB92VBM>vO6dQ0DS8x|^ATA~kBNwWnIr?He zLa`qEaS9Lc0m2g62Src`wc&$-n29wwhGcw&x|Dv6;%JP12*wI*#xca>6{Ka92PIGs zT`>v^uoio84iE7i1(tKn3LP;TOR)o2kc@xGzJl0ATMR}B*5EQeB7GS1Bluwy=3oV) z5r;&4#9ufoX=6;sP9)$LJXSI8p*Ln=Ew14MjBw^ZsD+*wfhkymC~U_OT);iN#SiGK zi7ymF4YWpYjKWleVl_77AWq>L9^pOyAYBCIM-enYYxIUcf-naW*n(X+g+zQtDzr#` zj{>NO`e=(`n1p!HDaNju?SZMB^B4<2y2KVUB}V z7=}4mk3+bIH!!y{7NZ8*p)aN&9QzTEA4tEAT#MT1i7}Xm2wcN&WZ6zmL`w|7WURza zT*fo}K-wLw6V=cXJ>ZYYh{Qo8;5FKm;w0gJE)PmpCN{Tf5C5&Lls?_tLh|EP_g z2*w&5!h7W2Mg5^Yf)ItnxQ>4)vzxq%afmbU`pS;sPGv8*=WYub?{?Ar2|X zx{rE6JB-3&Y{C`1g|wfzKn--k7|cfuF5wx(1H>OnqX+yk4@Z%L0tablOvDCUz#o)4 z#6AQ@AsUyFf;@-$KE`1^F5&~SAED0Rk7YQ5=Maywet4q;#vl~2xQ0~ZJw|(=3nn1~ zhj0_A$b6hWip~hYa-76N$S2tEfj7D$0HKJ+StLO`NxPu|Mq(XK;uSKUqHfR@L$DZo zaT6)Xe41R3&X|KENWyRAJVU#p4`w0)2M~`J5Y7_&XoS8PkF~ghFYq|WXYfZPZa_Ov z9iuUZVHr-~Ju+S(_Rs}Wu^ovJE|Qbb9OJPC*YOz{FHv_Ggw;5VB&e4eYv7Fz2t*iS zaTPD2T_Fz87Q+yVt+jD@I;Ht37#ScyZpf@k;%_Xd3s zoe_*ph{HQ%xXFA5jo^p*IEGh9bBjKTwitz_*oR~|w^=_rUZ^~6z<_W%tyons-P_fAp{Y)gcRg@%zOg@*o2!9lIeqJjbI$W9sEJMCyWtjfq@9Z zO6~;357Y-*f5{-7pc+IE7^BFNg_rfIsGAGve_Y z+DrN}YN87Q5sCBog8Z*&b9Ba7ticH+!+6d3g9hl1QJ9AqoIoN{kogVs1vEz>7GXQi z;XXdYd`me{1MSflQxJ|5cns+seGElV4eikn0SLlM>_QwK<2Q1?XFmd6Fap6?fJp4Z zN!-V8I3F0_P!pXo8ndwq2M~vkP(HFBfx@VYwitn#*o0%ak59<>i5NvA^g$5T;Up6A z3Fc?&88y%f0}+g6h{Z)bf%%2)LmhNR02X2ouHqs7A>CKLhw5mL@mPZWxP?DRo5I`% zjWHNYu@#r`6=}Z_Z|Hy^ti(ZFMJjT9XZh%W(U^q|IFFZbeh|y3f%X`NS%}3A{6e;$ z)D5~}4tC-;zQX-Q{h}%wqdP_-1QFPdD|m=+$dpQXPzzl#9+B9G1U$o6WcHm@w(F}f=jtCsZ8yNq{Q7D7@=!R*C!WE<- zo!})jMJLS0O6?IUL zO?1W(1R)$paSLCNNnu^6gLdeL$ykoPxQ4fIR4?wS=OwhjK+M2K#KF~A2I`>`0&PdtN6n+Rn7NHMB^gv z;VaT-_Y#Vt9(uqZv#=gVaT71_4_-NlRn$W-_#+r$*n-1Iz)Ki8y@Z@70&n=h55ZW8 zSj6EKWDm9#)zJyVF%zqC8cFz$jGnX$8lxvBU>Ra@6+e;Li+V;^gkT%);s?BPc?lKK z7XFxzbvT6Uc#c2FoSSl@I=W*lLJ^Crc!s~omWLQZYfQv0JcO3lOQ?qK2u38%;VHCy z^h1399}~zOe~@#8lXEyV>Y(q23|ub;w7X- z8MMbptipC2!!5jrRFv&TNi;-f_+ti^VH-{&5nqt07&#RU(Gh_NM+~mv1Ki@26P3{l zeK7$mu@4FOiZmrCFKVGD#$g+-<2^XhSIB}&XoT(@xfYB~cyC&WkM-D#3%HGE_=~hF)rcq~FVw&F0(A`bWQ6z`D&sRsQC*--*@&=j2!fFLYJH1^{H z67dSZpwy(kPz2S`3_URt!3e_^976)0;V060)5h>dL$pUX1Rw+}5Q|f|ju-d=s}^|- zRnY-M5P~S|Mm*j@u1&q5BI=_HMqnzIV+RuO6n~Jl4mlW&&!0sBp%=g z(l?;);f?kfj``StGf2Q|7!9d6lt)u^gFiwLhOIb(n|KMW5p{wBsElUlj!6hdEKcDX z67dSZkghS?j#8+ChG+pFbVGjxU;<_$6w9y{TM&zrxP9q4nlb}M<4hj2n(!Wqc++j01L4mhj1PDVRRzjp*ZTI69!-c=3)bm z;4&WIHC$h|6U{ITkvNJZ{6yZ))H_BZ5{GdIzmTm9V-VV5IKr?S=kWm^U762f7#86m zuHgy9ZhVf?Xo3-l##N*sZFlMh-4TLSIDzMIdr)^MifU+%o*0agn1Jb6fCy~BZXCr` z+{6RC!!M-iNxnoOR74H5L4O2d8bYxG8*mDD@D55ZVgqH-9=#EO8HmC`+`voxhTNNe ziA>0eV&Fzmf+Wa-BB+8U=z<}bg2lbu9Kq#3T=IWgxXL(#kWt9Q{eZIwS%qvub|Ht5 zQ{W18fk+l|3weaRLOvnCP(Uas6cYXu3JXPqqCzpDIRE~kq)C-@2dg#p4qZrM4Q>!F7V z!-V0&2*F<%DU1>VgwetnVXQDt7%v106NHJvBq2zc%r(zTAzrv9Bna1q8{CZj7B^$RBit4435mjejus^e4~0j< zV@v+zauDx`2L|)#cASnafTQo&J<^f zv&A{$TydT_Uknu&hzrF<;$m@$xKvywE*DpbVd6@0l^8Cr79+$+ag7)yt`*mb>&0ks zgSb)LByJYBh+D;N;&yR|7$fc!W5r$KZgG#eSKKG=7Y~RB#Y5s@@rZa-JSH9&PlzYQ zQ{rjyjCfW&C!QBCh!@36;$`uQcvXxOI^kiMPc&;$88cm?+*CABaif zL-CRLSWFh5h)>05;&btZ_)>f&z82qzZ^d`wd+~$#QT!x+7QcvJ#T4HJS0!aOUfnXmhwn>rF>F;sen{aDkS|U6_$!fMWtd=ajAqLc})`bmCLe`$a;P#Po+ zmWD_}rD4)=X@ul2jg&@70n%t`j5JmnCykc^r3unRX_6EqO_qYCDbiGFnlxRSA%#dY zrCHK!X^u2knkUVdLZt=LLTQn-SXv@2m6l1%r4>?`v{G6ng-ffY2q{upBSlGTrFGJJ zDO%bfZIm`io24z%R%x5GUD_eVNIRuiX_vHH+9U0i_DTDt1JXh1kaSo&A{~{ENynuV z(n;x*bXqziot4f>=cNnMMd^}sS-K)!mExp$>6(-vU6*c1H>F$BZRw75SGp%9O82D) zQj+vgdL%uTlBFloQ|X!XTzVnBlwL`%r8m-B>7Ddm`XGIjK1rXYFVa^jMfxUvmwre; zrC(C2^jrEP{gwWa`bAliWm%C`S(A0ykWJZ=ZP}4sIgOlFPA8|AGsqd`Omb#9i=0)? zCTEv($T?*X*;DqCbIG~oJaS$+pPXMVAQzMi$^XfPGICkD zoLpY6AXk(t$(7|Qa#gvSTwSgq*Oa~GT5@f??PcyU1PTZgO|Ihul-{CHI#5$bIF0vY*^v9v}~t z2g!rwA@Wdpm^@q_A^XcC^4BnQcp7-AC%>0J$RFiT@@M&r{8dhozscX_ zAM#K6mz*m9mjB3q<$nzPq9Q4>qA04ODY{}PreZ0!;wY|?MoFurQ_?FLl#EIyC9{%6 z$*N>ivMV{1oQj9ysdy>5l-x=lC9jfC$*&Yp3Mz$^|CGW?5v8b7OewCEP)aJLl+sEW zrL0m;DX&yeDk_zf%1RZbs!~msjJje>MISDhDsx)vC>3osx(uY zD=n0kN-L$c(ne{kv{TwEK1v6rqtZ$7RXQtOl&(rQrMuEY>8bQmdMkaDzDhsEPwB4= zPzEZ4l)=gnWvDVt8Lo^_{FRZ)C?!A{t&CB|D&v&#N}w`9nW#)sf|SWhurfuNs!UU+ zD>IZ3Wu`JqnXSxG<|^})`AVp=Kv}3PQWh&ql%>itWx29K2~$=otCVnMwGyF3Dr=M| zWv#MKS+7JZ83R4b{K)hcRLwVGO8t)bRbz13Q3ZMBYCSFNYkR~x7e)kbP#wTaqP zZKgI?Tc|D7R%&atjoMair?yvp)DCJ#wUg?rc2>KnUDa-CceRJwQ|+bpR{N-Z)qbj< z+Fu=@4paxJgViDGP<5C(TpgkMt0UD>YJfUg9ixs_$EoAhKy`vTQJtg)sgu=Ub&5Jw zou*D#XQ(0SOm&tzTb-lMRp+Vm)lhYTx=>xDE>@SQOVwrSa&?6ormj?1sp0BsHA0P4 z*QinIT6LYeUX4~as2kNy>SlF|x>en#ZdZ4xG3rh=R^6rUR`;lT)qU!I^?-U%J)|C1 zkElo0W9o7BgnCjvrJh#LsAtu4>Us5odQrWkURJNDSJgN*UcII!sMpmS>P_{QdRx7t z-c|3ZiRyjzftsW~R3E92)nxUF`c!?UK389;FV$D-YxRx#R(+?wS3js9)lceY^^5vd zO;Nw8-_;-LPxY6Ys{U60sDIUes-TIQq{*71shXzgnxUDRrP-RJxmp@6t(HzpuVv6O zYMHdmS{5yuS~;z}Rza(%RnjVJRkW&FHLbcp-a{%Zd;K^JvNmvu!~bxqfGLpOCxw{=H%^)z}~J)NFj z&!A`2GwGT2EP7Two1R_Iq36^+bWhz&&!y+q^XPf?e0qMpfL>59r2nTE){E#x^5cU!dQ-ib-dt~?x71tdt@So~TfLp$UiZ;E=pFS=y06|@@1l3ryXoEa9(qr`m)=|N zqxaSO>3({DeSkhtAEXb~hv-A~Vft`=gzm48)JN$7`e=QOK2{&6kJkhB3Hn5Rk{+Z_ z)`Rsa`c!?IK3$)ohv+l)S^8{!jy_kPr_a|z^#%GueUZLcU!pJ7m+8y(6?&MyQeUNq z>#Ow$JyKtzN9k+zb^3ZeTHl~=)Hmsy^)32VeVe{r-=W9oJM~z7m%dxyqwm%C>HGBq z`a%7Wepo-EAJvcP$MqBXN&S?5T0f(o)z9hY^$Yq%{gQrJzoK8&TDzo#ea_w@&QlKxPCq(9b^^(XpM{h9t;f1$tBU+J&)H~L%so&H|`pnudq z>7Vs4`d2+g|E7P}f9OB;UwW$kTmPf~)&J?7Y+y)+Y$%3mXohYWhG|%aZ8(N&q%qPO z>5TM71|y@9$;fPEF|r!jjO<1ZBd6hEcp6?tE+e;*$H;5sGx8e+jDkiX<3FRYQN$=} z6f=q&C5)0rDWkMe#wcr)Gs+tkjEY7jqq0%OsA^O*sv9+onufPg%cyPCG3pxijQU0c zqoL8rXlyhwni|cF=0*#nrP0c0ZL~4k8tshshL6#~=xB5@e2vaV7o)4u&FF6QFnSuj zjNV2cqp#7=@H6@w1B`*jAY-sG#29J}Glm-@41Z&!G0F%qMjK;{vBo%Kyb)+jFeVz4 zj38sO5o}B`rW(_X>BbBr#F%N!GG-fdjJd`D(_-uSJz8WdUH{-kU!}w|ZGE$A-#vkLa@y`%U(UeTtR7};>Ox-k0)3i+6bWGPw zW2QCJnd!|8W=1oUnc2)@W;L^!+07hgPSeBmG`-ARW^OZ&nb*u`<~IwN1eW7S=+2*)-~&y z_00xmL$i_D*lc1pHJh2u%@$@$vz6J}Y-6@H+nMc6AG3qm(d=aUnw`xqW>>SD+1>16 z_B4B$z0E#mU$dX-XZAM-m;=p0=3sM(In*3x4mU@b{^m$?lo?=-HpiG_&2i>8)&Vm>vWna|A^=1cRH`PzJAzBS*O z@68Y9NAr{U+5BRDHB-!Q=6Cal`P2MmrkcOaKjvTapD9?PC0VkiSgNI2x@B0VWm&f6 zSgw`EN^7OF(pwp-c~KEwpGWf zYt^&rTMev+RwJvi)x>IQHM5#qEv%MSE338D#%gP|v)WreRtKx2)yeX;I$K?=u2wgz zyVb+$Y4x&tTYap)RzJ(n>TeCO23mux!PXFKs5Q(QZjG?~t&!F!E5I6Ujj_gB$b-+4k9kLEvN35gPG3&T>!a8Z4vQArPth3fR>%4Wrx@cXpE?ZZut5%#9 zZ(Xwztn1bd>!x+fx^3OD?ppV(MC-owz)G?nT92&9R)l+ptaB zvTfV3T|14P)=p=qw=>uo?M!xNJByvw&Sqz~bJ#g;58KoBvUAzF?L2l~JD;83E?^h5 z3)%nKh3z7CQM;I3+%934v`g8g?J{;*yPRF#u3%TRE7_IpDt1-7nqA$lVb`?1?OJwi zyN+Ggu4mV`8`ur)Ms{PniQUw0W;eH6*e&f=c5Azh-PUerx3_)l4t7VolkIDFw!7F} z?QV8=yNBJ=?q&D3``CT$ezu?8-yUEOv2?g*dg{zdzL-ho@39o=h^e^P+-on$|>AK8!XWc!Kz)P80^w_n&V?N|0| z`;Gn9erLb8KiD7bPxfc~i~ZG3vA@~h?H~3}`%+WNWD-Y3{UeS~{(q)=nFzt<%nF@Ax$JgoX zbaA>m-JI@D52vTo%jxa(ar!#_96zVOGr$?>3~~lLL!6<`FlV?k!tr-TI-{HbXS6fM z8S9L5#yf$|1ZSc%$q8~MJHgHrXR0&JneNPRLY$e-EN8Ye$C>NQbLKmt&H`tlv&dQO zEOC}P%bexT3Mb52>8x_Xoz+f+6X~pRqMWtPI%mBT?QC#1I-8u$&K75@v(4G=>~Lb7 zoldN?%h~PharQdsJ2#x0&MoJ*bH};s+;bA0`_2O=$$98JavnR$&J*XU^UQhfyl`GR zubkJ;8|SU_&Ux>Aa6USpoX^e|=c|+Ad~?1#Kb)V=FDKRc?fh~6I{zHO6q$txOv@t zZhp6bThJ}!{^u5Ui?~JIVs3G_gj>=r<(78KxMkgPZh5zYThXoLR(7knRo!ZCb+?9F z)Ae?1xwYLoZe6#YTi2ubX&Qt-8ODpx1HPG^>I769o+gC0q}^54mUSh0v%Z0oku;L#TGD7|H1_(2 znVFfHnVFfHIWNfzGycD?s=B+n&l%hQcYk}W>8k2#s;;iCuI}>HjYM_0r!g{q54&@ z(myTz^U}X8{p-@dE&cn_e=Pmy(tj=e_tO6?U8r89deQ2|su!#`z ztCy)>wpyyHs;-)9P`zCB^3^L;uUNfO^~%+&RIggSTJ`GHYgDgUy;k+w)$3HRTfJWO z`qdj$Z&QeP!^-%S2^+@%c>e1@C)!S5W zTfJTN_SHL7?^wN4wOn1UR;tx%t$M6_yn3Qquim+Ovbs`Ttv0G_)n@g)YOC6=cB<>u zQ`NgvPgggp=U4Aqy<7F})q7NJ^`6zR+O77g{c2PlREO13HLhMz-K>tQlj^jZRA<#Q z)wG&b=heKrRo$+ht?pDWtlq17@9KT3_pRQqdjIMJst>F_sQTdQL#hw0KCJri>LaR; ztUjvx=;~vtkF7qg`uOS-s!yywsruyVQ>ss`KCSxn>NBd(tUjyy?CNu>&#gYM`uyq( zsxPd*sQTjSOR6uezO4H4>MN?RtiG!H>gsE%udTkW`uge{s&A~msru&XTdHrZzODN9 z>N~3MtiG%I?&^E0@2$SC`u^$%svoR=sQTgRN2(vKeysZO>L;q7tbVHc>FQ^ypRInb z`uXY?s$Z;rsru#WSE^sFey#fT>Nl$2tbVKd?do@`->rVH`u*w;sz0p$sQTmTPpUty z{;c}*>i<-KQT=80SJnTm{<`{`>Tj#RtNyO%b@^^4XoR=;@t67@^gFIE4q`lajtUB68Ivh`A3)pgy}gZky_m#<%;e#QEg z>Q}B`rGC}=)#_KTU!#7_`nBrUu3x8q-TL+F*RS88e#82W>Nl?6q<+)-&FVL=-=coY z`mO4>t{xb%x>qqM6)Q{HBt>318+xqS5x3Ax!e#iQq>gD=!y;85%YxQIG z-VgO z^=`da@7JUHpgydR>T&&o`euDxpVX)Iq&};ksi*aCEch}!je{cPL_4n65Q2${4 zL-h~WKT`i_{bTiy*FRDJWc^e1PuD+F|7`tp_0QM8Q2%26OZ6|;zf%8d{cH8F*S}H! zX8l|BZ`Z$5|8D(z_3zhzQ2$~5NA(}qe^UQx{b%)`*Z-&fi~29?zpDRl{nz#1)PGz5 zUH$jvF62_muOzHc`1C3 z@1^mny_acTwpnVbrf!;M(7asp^35wWuh_g&^UBSuG_TscTJ!47Yc#LfyjJtt&FeI; z+q_=$`pp|OZ`iz1^Ty4aG;i9xS@Y)2TQqOkyjAno%>&KF=2G)u^HB3}^GNfY=F#T4 z&D%6@+q_-#_RTvq@7TOkv)o*6R+`mjt$D0@ym_KoZ{E3ivboY+Z8n-~&1UnwW~6SmGj3kc+-#1UljgLU zG-u5-&9s>{=gqvi)!c5LZSFKLY~HJR@8*4)_if&_=;mXZk8M7#`S|7&non##srlsQQ<_h0KCSum<};elY(A^`?B;Wt&uu=h z`TXV!nlEg=sQKdNOPVijzO4E3<|~@7Y`&`b>gH>juWi1r`TFJ?ns02rsrlySTbgfe zzODK8<~y42Y`&}c?&f=%?`^)X`TphynjdU_sQKaMN17jPeysWN<|mq;Y<{Zw>E>se zpKX4w`T6D-nqO>wsrlvRSDIgKey#cS<~N$(Y<{cx?dEry-)(-c`Tgb(nm=s*sQKgO zPnth%{;c_Pe4Okrn!jxR3Lh=|>*jBozis}m`TOP{ntyEmsrl#TUz&ey{;m1<=0BSM zZ2qhH@8*9RJP1E{(ZP!iUVQKpgO?n<)Zl*&UV8Aq2QM>t*}>AF8q|YkFc`et;N=Ie zFnGnmD-B+G@G65>9lYA$)d#OJc+J6U4PJZjI)m38yx!pT2X8QV!@(O3-gxjPgEt+# z+2G9wZ!vhw!CMX9dho#D;^5NY!NEg=hX;=go-=rK@Z7=M4BmF|c7wMcyu;uf2k$gk z9$X%*3|0qggU1Gs51tsT58iq3R@AVZLm3b-e7C6J=hssA3Qa9m%-D68-wQ$ z-gWS9gLfai$Dkd&=U_P49qbME2cyBk;Bas>7!O`BxH&i;oD5C}lfl{GnZa~08=Md3 zgIj~!gJ%bK1}_}E*WkSe?=yJc!TSx~fA9f=4;*~Z;DZMrGWgKJhYdb_@DYQL9DLN^ zqX!=|_}Ib64L*MG34>1@eA3{P2cI(d)WN3>K7H^RgU=j%*5I=TpELN}!RHM=fA9r^ zFC2W);EM-eGWgQLmkqvr@D+ov9DLQ_s|Q~*_}anO4ZeQx4TEnSeAD2Y2j4RI*1@+8 z4yR{(Z~5?B?H?asSYBCK+um+h*S1%-);D+7uWhsk)6u98K0fb*o{nx`SYF$1_jdQ% z(dpjw&KbyCqf?J}p7}qm*N`x0{iBZj&yz+338r?Cs6b9VwJB%cijHjf?H_ z#*LPB=kLqwJMH$)*80Zd?cUL7?`8+8jW0+K!FIQYMGr{2qsWe0b;@B)6U(ccRw-9} zgvC-KBo%V)+Lg8Cjo7@kjq6v}ww8C+R&5kn69+^?v?dM~*gH_{I%7c^{Z>`aQ_8LSt8sxl&I7jB_>q5gvXkfh_mVV)Y@L6V#|6E z?d%*G53`zghRX68yr`N%W5w2&+nu#h=HQpSy)wa3@C+P#xAt1cQkokD3eP^zN=0s~7X z7Arezan5e6u00lo{hG(bUdf=bYci-S+p~x@@WB3h#NOG2D%n}Sd}XaOrX?nDFX6F( zh;Ut-V4du3PsZ~*XV%NxYtOsBwz0C7DZdB|%(l_9UOQSNq(PXl`#NG7bnkdHJPiVu zVWNx~G>%9}PtKsEDFO!AAD$0$K*2YSljWcu-X9$d=f~&m$#7=c+mOej)5G(ljG=%zpilK=j4o=yWt49*Suj$W#&H zQo)wGsO`DFvHsNB*7ow1PG^>w(8>}X%PA3Ph+lB7@2p7s;@TMiuCpWPSK>~`vU@Mz*J}i#d4oo-(K%ip*cKo$f1#mbV)lt zJs6*k&quHVO?&N4PG{$8?Db&xFO6Y_O>|(H2y=UXd^nm}SH@LDg$&$J!PTTY!frjN zT&ScbyDu2+S?=+r{Zs@Kp$Js-q(zyUEuZED+;t~@<7^$%A=%BPS=m;$ga(*&CAKx0e9!juSEeei{d2dMdaL` zT)VLzwg{12ff)w{G4JK&?e&#*<=O`3^D=CnZSAuz82P(E;jn(K9iE+GVzviktjt4b z>C1ra4Udm^ArBbw>9Im!V@%tF!@w7vZ4yECLAiX8O$RJ)4cCj zj0wt~PW6x!2kiiZBHE1|GCP{gkN4X#EDFyN-X%+%;&i6B_VOuI;RoaXfIz`-&hsD%;Xfx9i!@C%G?3QT^dL$^Q`PVEsMYX z3^@tLYzq{Qcy>P2(y)zRxh#@EDovr!nYemwV@Ej4YT^Nbf21(ZFCS z;qI&*&)VCQsV1@KB6NR0fo6M`b|EPnFbqz^FZ>uQOn$Xz$e|2(PcQB5?&bh^$t3^j zC1@1;bv(*xPR_=}aC--JWj|1)G+&^m@PVRAl0UJMp<7UrRdIiOi$wSniD*UvG)`!YeJ z$%7#p$GM_)aU+bMFC0xL%zSeSh7bhl@8gkG>v(oFK9Gv(FQ~o^Y<8!!BlMc8LZ)Xo zS!<|EB%toOSx-OPXXaxVSO&1(B^iERlAd+A-gG`bmQ^TYPZB88kSbAYVaay)n9EhH zQ2<*{GGl6GN@+_Y@?zc!&5^@S=Fp5Z+}+Jrwn1vhe%AF*Vtjd7sD@069uI}jA+GwC|RP{RPhn%B-xX$fmT z_JE=C4-aK_Q0TDtJ-^dZ=*SEZS_}4rI|%-sjpqB4b~?n~C{Gf0D8m?#{F_5HWfBc> zG%3|zGImsLrZM=_&m*R7Hu7iaI~x=Hk;-BKSTT-6pumn;d`8LZOo{+C=cIvhl`*$D zF*kiRH}1EF$MaF>ZJmqPA8W6!T{Q(~iNomx>xoN5U z#8$xlJl-3kkqSQE!=}W3pE{aT*u@uCE?<@vKqk9Sv~vt9R9b+k=!Db^JET#>%`ZOU zf4AleJHvWCeikAXa?LL#e)zqZ?!ikb&!g^VZ;s$4WGP}0%a1WuHL+YYHQO6b_pvh{ zA8U2EbB8rfr2dpGq$I^m=Pyy(;Rnbn_T-a*pR zjg(XYeH85&8_V$?*DO7p$Z|v((Tb!Bvs%Ykm)bdpPqCA;^YP>~EG)gyc6Ty4?$6Lp z_Rhhys71yziL4f=Vi|w;2#?`JEaUIRbRw2Um)bRdv^R%I&o5p@03ichCa4xT`ZSAZ-w!VU6xXo)<)>qbX8Y-qu z9|AT=ADG$&o9)NiracZVbLUzMRrMH-o;GpDXGM46U2>iI8Ku@c194DVbRWw1WyvsP zkZu8hpgJ%XyV-4PVmz;2-&uQF6*vb-*(y+F!b51C>*h8i6tL+pPd-0gkiigH76`-* z45=x&P?G@lbqTQf8M<)Ucd=O=GIUSv`|ufqohP=|mRI3G z+M7?OqTIAUBAiQnaGQiGXGmB=@ZatA;?5>m<*22VDdGwkG!Oy>a%cz<2vCg@fZDV` zgdCot5psA*eKg!V8n%}nh*i)tFM5Sw{+Q;s+T|e)fo}$-r-N!rb3j9sOgJe@*x}v@ zn>~b!#WEVC=!hJe7iGAjc{#K&6BF{l zVmLB$L|aP}VmLbq1XyBtNHC_`4jvpB>tg39?eTbbI)pdV_bDuRl#qi)Cp2EINH(Tu zCU+EUPE-s7HQ!7P13F}pL9 z{S%_8g2H<60uu;rdN3*_1LW!b(WNYeN{IGH4|aj7+LZ69kGf(O){MbW?l-oPayAB| zKR~e&hxZ4jI0&DxK&bGeJ;UxxSO7CQflqc6lCpS%F8W)HET+K|UVSL<83dKAF%2IG zx#joSGlvF`qO4?0rr8QuaCs!2%m@JvgeYiX^m zu5Tek<=WN_e|lL0VI7qqsmc2G=9T3euq}4fEP|O80g@*rjoz%Vc4HYw-P)niG*h7F z%jk-{Wwty=LCmh$KNEGgy1m?PuRm_ZTEhDILO@D(!%5c)Mo(Aiju^smJrWpP2@Ak- zo=1itv4c8Eq5oH(ki6OiP(;}gS@M81q9RO!3epr3B2Jn}ZGW-zQNXJRRSn zr4=d?$>(rq?L~0tAL$zkpGmwl%YX$ZgXVlP5k)m(pYaFhF=bQWIIiT6AiVgQ`c%p{ zLEgEtee0s^KIvDT%ptQ1I)aXdzqf$00#x=~oD78tF@@_B=TK`am@a<$1Au~~^!Oy~ zZ{1}kU=S(~d6ru;GB!T!$dr;ka%pVUJyQshbdYAS6y+iUtWPxUXr((Nq3hg0iSE^( zkwg3VV`u8?)WbC3+sC)AUEdVfcT7-w#DoZROo^^D(Vk2bmB8Wahk5I1(bEURz4L;S z<~7cyQJI2Rz%rvVCi|m9?g}$lQI;JJ;w&^$agHE3Nz2Na64g@&3XbfXc|w~Q5!};c zg2kk#IfO2rLA=_7$@GLdalULigtIOHcw%qAt&d3;dYHd6tzo3v=hKOfic&#ez!Ms$ zwWq`~7p8RrOC7V?fh!kkJM?mtVR^|x>@qbt4GuGKayEQsF5|*V1+|iQxX1L=Sm%m# zSMPW+I}u4<2~oY%Ey(myQe9S8gLgZuGveehH`!!kl;Anju;Q1GW)F{U$-y1Ir)idE5$2jdYAMkNLS2yu$Y`AJN;V^{;raoG>}&+K4ZXUJt}1bvtu9I+?&QLEr?X5!no2TjB(# zC~Bpi+H9BMGn5#LA>)SDJR}?!Wk3!wyh|BOoD&^LdwYC-giwPiVlKsa^}HttK*^cR zMsVX~OvH5&Ay6lFdXT72hR?QW^YkdIJE8D*sbL!mm9PZQ;4)8mcP3BL!U56B`sNex zr86K!oVvO@EiilIvm+XbIlb>E$3~(rN>T=h6)=scD}iD&=H;;K5vpebmgC|OxC$W1 z1GYV*?+fNdSGp`X$bjtRtVQz`ps|XI%SoYHR5{`nmq{!mWf&9aitZnUPG|KtvcIsh zai^gbZdB#xV=!0fQ`YJTXq{mxQoESU39ie5fRLKl;YB{ z2qo_@+`p0r6C}LSmsQkYo(*Z34plW0&syV_rIzy3)heZ9egUNtVlpS##$LJPLs*fK zpiWgffTtv+xMZi$f}sK(hc(0*V^^JE zw)y1B_M?|Ju`!W4@CQ5fr!D5aw9;Eb`OC%#6A*JJ?AChDFV?Z!_gUz z)^|s$aU&qwFG6~4)ya7_Lm2Du_*~p7MSaCvBCfhl!9mMLegMD$ zp0^FE@&T#)qP9_&vTf)UY{oUjiNhJW76jOCGY+knq_=-U{@(rx$lm^m$VL4_0`3I5 z{WF{qo@%M-7A~s}40|dsZ19LMD=qItDiM0I$vn#O3GX~ia7MLbBObhp5wUMKrAvVL z@Dg9RmKeI|sF?00k{vv(P&G4T;6`?C8nYXq$e&LUnFsLe#!L$E9U+ji#{`)57a$k& z&K5{d#*2AJd+~K1mmrTSq^W`?v{6Gz+fT+AL7V{gb$&Ky)VdZjSl6KpgR1kS0~QxX zfk9+up)zbyP~?3R?g;UXOrnUT*k7brYhxJgX1K$4yG@! z+r-vtx)2Kk!VIUW+#xo2$^=uaRYMmW-0@I5lR#HDZWh`hB3^hJ&eJZ$!Cq`4qj2$1?8Hstnz! zONm|FDo4qmcjNTnqYo{>->uc;+G(``^Hw9Y0{>mYf@%lRsi$B>w4-q5*)z^veAbX& zbbp_m&f!q$DIviV=O}tsQA^`i4`)LVO`Py%>C_oYkAwMyf3BSM=4sCl_>3RYo}Z0o z%r9w|pJ|`p#v!8*_3;KEI}pMsbkdpDChOP)w=wd7m=P;R%Wf1T)VIy>-8*`=fG*2` zrnw2zSzi!FU=Jbg;YleHd4akgA)fU15T}zInBZs6oXQ^VyvhXc>kjH<|6$F(|F8&% zBzhd<$YRi(&vfrn`_KciH<%1vI^EMED0jjZKQ1B8k+tPd(Eo@XCPDo+|6Yv?&TstOa)2lUR8dsbLSR+MS9y) z3POyE_3iEJys?#nOZAYh2M&fkP`2*s>O=g0tL5{T6wel)ToY6lV>Gj};_tfkRXnx9sxcd<*8}GA9EJGJ8qSYZrdpa<-W4ZMQaq3Qq{KzH;^-$&$dsA`67V8&!z|)mF*j;V&(V);a0X!4JdA}H+7Tx zBpg~E+-_dKOqYg-mAThe`Z8nRTIN;XTVy547S9w+#yN1qDF6i8qlE6}WuWTvj0RFmyrz zk!}DH_lIXU_huIn&C09xLI)t??B$~MnLJS<-AWGfQU*_*5OdG8UZ}8&hG{IA_!y+T z?&n4BQPDqG1cdd&EPTuu}+~k$ubNoxR{GlI+>aUugNa2!FP-Ebt$up=Q!R4 z&0SNwD6b$dbr>VQYm@GelLyU zvtm8uEOa`AdXfb0dB~6A0F*F0?c`5$Z>67NPFz|YnFm+}c!cpUFfIuAVsGrmlp&%l%q6kRYd7gkAJlc!dnF!hWJ5lq< z0o3@DsF?`V{GAm>K*)|=b`11{yIS9=h#`>|XuCzc=&THqg;{18YJ?0Rah(}N;yMX2 z2MLa?_NHTb;X<++m~!k}DK3((cb5FBtZ4jl?An0@UlDWL5x1gGmOmsfh>kFQ+q!ckl=eV2IUiDmqE z=>eDvH+b*3;I;b1S^+^!dmjwpBze>L(s%*Vz%h%R&8Zobj9Yw|*P7?rRh->otqyk- zcq_?P8p%jJ<+F!imN-yux*Q6EG{Ok^MVVM_kMO=sOY2`*Dg5FBIO6ihxJ2HrSk;v} zK={&cV@sUill)7C38P56c@g2(YbC1N5QhBW z;#F24p47nmTse#;=AsG`*H=Np`zlEIf(n|T<`se__5ke5?4{Q;zRQ)W&P^N@Q4R`% z+|@6rhb=fh2SB`CoRt`0xvG);xrP(a0yQhRyVeFrs%NLzQcTV#S@8;=;UzT4P&TGW zvR!?!T$iG7B@Gq8F(;p#_AO`c+1k+IC^s=W%?~T^%JM=~Z~gSqBw4A-lENn6>UlOi zKg#=Jf5In5C+8YbP-e$!e0)dt<+y~)b<=Bsv`cbAgG;!$2Lde$-8rs(4(d$qz^g}Myq4(H9YGIX< zP2Elty=RGMc>&FLeDHdsH-v(OF;+7(_L?Y1rRbF&BTHseIZhpdym^M6 zL*vZQ2bq-74%$x^6~{zD81x=>P26a&Cj)M!bolb7Nezs(*cZ=i1e_ zI6)wWTXBgZbhc)KVfT!MKv+azaPnul5!S_rT{9R>CiA$&%!G9~BCl36k`cm3CpeXJ zrV~DaFCdHb5Pv?)4e7Y8OMvL=^mM2SBGh>|rhtaK2_@L?x&m*uC-aM!nXCgmJznvMusgBnOo)}^rH}L@;b`~KmUgL}-CLKN!lPl3c%?a7pN|~r-)dG;O5cyU| zhi)HG232)SmdQ;ue0*d>zf>tM27ZZ*oE+FK2K`XH z&}Tjt%^)Wh`b2`u;GijkF3;F#2_bb6!XxPl(lo!g=?xf#CVa0uNnJ^CSFK5J8QK0) zna$7f3c+N4cqD!~c`t+g$4EMaPQwpYW)~;=vwr>uUm%Pqde8 zr_{2teSm=d0>LrV1zJ&sBTInEhQ)T)d7ftr9GDMX*%8fC!mRC!RG=)UhW}+t4|`a|X6o zaDq$K<0POz>S@F9x@PQQ-H)eJ0@8$CqSyU|>pLQ$onBW9R!?j-f_28S8NylF#^7>fb1?@^nUE)ZIEVU!3_&_<7GXmuS_a z$@!7Ny~j2pIyDwH^nNYmMYCS-3rE8~b^yYT`KE+PRs!d~UMbxfV2REFlT}9Yo{bm5 zQ-mGG+{F$|@QnPO;q7vqx2m=is2egwbK@09=aHk9D~CAf4l&ikb|sc;o5*4=7?j3& zFkx7B+IbZDWivuGzySE7^w_@|11xq#eP1-OxU?$E+h|NC&Gd$Z& zC*1bqecKJA#u{cLja~P_5ZgT-me}zUK+#&k`QJVoDMjJ8n$q}pc4YGxKpiY0$=)eu zkBC28-&|6QKv|s(4{^8_=0VW*{PGzyabELqHoc%jXvg^-%u_yUoP5QQOf3U*R2_C! zjIgHk+mE<9mFZ9~ft#x#t!f6v#ghYkxs4Y)V6_-feGbzRHda~+%v$eem1LZalClxy zD(en(1Qmx7DerpKWOBQ@bXo=lm{wIu_81caUs#81-2|zbm6R1b5D;MDhb1gXAb(5S z%;_rW!dW4(V0dONpmRo!0`da=O2y13;r!Y4K@!?sC<3(W3k;a9Z!uudU2(bz3=?Jn zA7DDv!Ivmmox9Lv2(@*<=y(z8^LZrd+EJwN%N^6+`DYuQ_$pk05D#7A1mjS`^^XPZj{d zN9NK!IiqikWU5r6RG5xQOI)IXD8%KA(6C}_ERE6_f$e*7AHp?cB32uwx1z zS`JEnFv2sxnly({w=3#{OMWG*8@#SxciouKupVktB0OUu=Gr(MZ1(H#BrSg;Z zPKSp96AuG;9-&4&I=z6`tBc+t#Cm~0^M29CuCcOa9U7o18y?B#juOY5Q^yQYT-EQ% ziVx;#$gOg^)SI<0W0oy1@A@|GM9M8$-OIZ)dcdXF4gAbIcdmQ-3vV>;U3gkvKD9qI zwdDa+g@)iziQ=>s;{vZnJoO-*ye+@;L+6lw#M&Wv52hCZpl3iDeXzx4CQt%C3RtI< zSVB9y>A42ivCGddS-YeNm`kHiJeuOf%T11gUsZO=PF)00Wal8!DP77ZaD>{ciJ698j{tUbP9Fs#SNXwj&aW_ z$CZTN1ULRnX2Yr5k(8xfzVi6BExBaDESi+3BwUi0m|Zdom{Fs;4|qK0rlaQEbV<}G zBW4ZZ_*IIXovroD_y`paB6fK1qk!tRvIN4Uf?3`R<&*6j>#K{AxYE8D$vf`_+td@W zs;)O8j6I@(|3!X5;G#U^g8ERh$1f1wen?#!OGGzb>@86czC^hUgX_Ca1|ldF6#=oN z2uUKZ*J^mj8j?OoKjWb9`ue*Fo_HK;*QKkQ`WUSvGl|AW`TW zV<{b`8!M7GK;(ztA>i&iW(ZKMp7e=(cwR0DrBQxbun-52GopYaMjU5OJ>1RNQx@6= zRVW?D0=UpS5hZ^=gmCHa9i_TwV?-qp+_`2i#PWzkfZ7~pifjln1mA+TnEMRgQy21~ zzoU;l7_Es1_DQL(^m<0EEA5@(tRmsqEvdOUS6G z5-3Shf^l5(kZ0(IGQ>&mQW@}ei|htzKfgGwt?}=QH7aQfK7aNy9hmB(8U`ehV zkb;$jr$G3jbf}(|#C~vOxsViy4r^}E@UTkKHIjk09xe;utLdpjBP^S5IXO{zuVuON zF5^osiG5fHic-}-<>`XSWaXqQ701&E zq>};+gTp*FFq_eanvP(fk8rklFT7i>EURjHKUQ*WJB^hjWAp7|@W!>(HMftjyZmn1 z*Joeka9!Gv(g?kgs}mj^y4t8xY4R2U6{+@w;gK%5Y;9iK)?4|;Rsnw7i8?9}(qgu} zhqz@p1JBa(?BMKZ+l_j@(*OM#+%CZL>0^RpEyS&54T(L#ZG5qgL{R9(2#Eb?oBxaW z-VBaygmVUBz2lCfgMp+h$P+b(<)N9TVHGC2U3lD(%gY?y>qoJ2rg`!jd%Z*6QL{4< z3(w0)qD&%;K1}43;nJz7T6^l+lWVK=GZotqhhb$y zvy?onF&%hVQ$lV(lA6_eFz08$V(hXE#JSu~Pth zof|p5KeQUX0)c^ymu!(X^!AE~MEqD^Oof7oiG`$4kW3XOaO%&mvJ+fe@ekcY{s7ASo zJqd}!_)if@P}EQmy`xGYO}qP4xWMJ+QkPZO8~2m~6vMH5@@N=TAELigSpogPL{FY@ z`q_h$c-%gCTATA$svcy>e3465a|F4-F^o$|4oMrl>@$JoGmfC+$>e5GhFWYnZ&mss zsM(+?v=~VMss1uMQkhBsNV>`B>RJeq2m&e=9zH?b4ErUxqLdqm@K8#!^&&J3JdnHs z<%;2Gb%wro2np0)5lJojo!FkiCD<8PsY1Pj=lvf$TZp6Qx~8?&WTsLTguXS~GNs)r z8-W~vVEQGXTUQd$NpAwWRwxin^HpO@&Gn?IY^+s?k5YkY=poZ#e2$oDq+Pymugtf&3R{tU#tC zdekz{p1@^Jmf&RVid&D{4^t4DW*=&465|SEgkkjFHLq~5jFe`0Gbj*E@0tHmQ*MW& zfFu{14zdtZY5WaB=d`Iig}{FiA1jjnF|b`KbReglqBjXYqCu60htQNNHv)dQ7k7Hn zGN;Sn8Qm9ks@`;*zG5SjP80$x#V@TyS0F2^3--R64jqG3|v-dh|7~zC!HmC zQOR@Ys@lmwovD|LdAWwnH0Q$5m-GK(+3N0(KxhnnI=iN=g zY7g6Ud`w#w;^;E;04@>1#aY6G@+#rMy$N{fjRZ(!ho?nk?N|VwyopNJ@g)}Ep4@Kw z+7 zJ%iTE2eEmtiY(Zk6WkLU9_nQeL=>Ii>6*b3??Fi`Ks#0OG>B_U}*0}P0JTK?_9jZx>Lc-&hSwz z4DX{xPM+4GsMjO2+1~Kpta2aT zIu;NfBn8FBb5%m|n%Bikm-o-sW+;7#R$aWbV&8Dz#8LfPDQI`gx^i(%hhib~l}k#2 zt>2uX=AvTu_c6^N?Ex4^1`>m=1_C~`_V8>1iN%oe^R+PO1q#Cyz9&Mkc|M)Yjz^<2 zhrvzS<70H#9zJ^7w$H-axBv;FQs#1RpM$mp$}n!SbCQX6fh7x+6_t?h1R9?*XbBPN z%05s+Zi~EA7#Xs5;9>@zu8lmo1Qt92I-TsI#G8q%FKdFSxx+Li$K{&dc>y}?0{lb_ z#K79hU;2)mJS^#w>_0(^+m#4$Ok+0^F$ilvzH?!CX#pnQe;f3MsR30$pGY#?^ z^8#b}nA{9g2yRdh_jmO-bc`BOLd%piFQy=L@|Il$%!c?TsiyEY9HM%|@A0KQ{jE2d zk8w$FUq%2A1)QG*6r}2CGKMbD+gp=qLcq*}PUTHAVTq?!WFdl_?1?(Wr`OM0`M!IO zr-bk!Ux6~wTLMC@U2XWO^(k+k7M0Zq9Z zJ{nSykbRvJ&tM%Po#dK@l;mP65zcp0;pq2^c0jL7CH(efCOxQy{3trm8LsY!gCAmDR ztTn5HHG?w@2VQaT?F)($wH}8ubS)k9Rt3s6`^s*D(5W0z;WAnvl~Rn5dD1Xw1O<$`O^`U(rSF10i*JuT$t?HoE5wRejB7IJ{ zjoRgv6)c(U>Y6?r!w*0Sczfew>oiA#UEMTg5?~it;%X2kmF610Y>Q-vdfJAKqrVexxUWVgD$1taa+)(uxjWZ1m2d}9Xz!NMdlD3TJ?r?Bkx zFJbH55d&m^@WGrs>G{MkyvU?QG)Tyg3B*r8Fgu>x!gKfmhffm` zg?N8B)f8Ryu>W{bEHDFFz0=3yluxJ;jh-A5GOWVx-P*Y!X0T9nzBwxyGjo}A9-xER z{RXMz^k2Bd_jQ=pgVq%izG^9{__0Ds$;Tfqxu3BI6hj9dxia-=>bQ)`!##Qag`UJF zhv%#cT*fZ+v(zP3toXK$mJ`38M3Ct#w2V_|Tl`GbL8Ae)(ynZ64q-PYw-YUQsG3=!^;o;IT zm)yKntlrv{-|4ofBIm@N ztb~FhWhiP631hBBfW-Ph((yh;$`e7Z=200)CW)u!y#Za-1g3$&i3^>_v0@BM%qvDn zRxtv6#Vpt^@d&z6N<)Z5!eo5NL$(vx{j1@s50skmF8i`zPeQjACOy)}jQ6v@m+}70 zen_nF+s=kqOW?;x=c{;x0G_cScA|z~hoOC`^{JQ;%`PRgq)k|du$KcRrXDtb#$;Mgc;Lu?7eA9Z?RAMbX` z4xQJUF7V|V#3y6hsgJazG<~~p``Xi9;;u_c}g+ za7jbqg_B35`&&qd2tE%4Uwn%mKZNHDuiUAh9zrJ!bk`#-iVz$icz`~2R8&`iuCvTN zGlmZweNmKS$o@*uiw~*m&By0v^7o5aZS2}cr`Wsh!5<^FRvP{6m%M8xRFcuC;FEg% zu`@ck5pgJvD|0k-5$06rBCwmf(1pTTl0gsg1|otfs31JCf>nTf5R|kYFeW{v7cM;G zH5>Efg)^~$Fq9*w+24)TwOrb8*NhDA8e(wHkaxy=JdCK}am(HW9X`e({%FSDEXwOP zJg|`-$(x>`Y>swXsT_&jAK|t1vJ({TdoJU;sPDw_7CYOrU|QqU4{sikT^zZD#P=?K4++5c%?)ZfUU* zhB%{}sgjvpxSzc1JOP52>;EmcOzOK7)L)ZT92iZNQd(e>hH3}Fp%U>yS<795w8yNI|kS3;=DU`FLq~m z*q?0&D?e6DoCoygduogW${eFownOuCMW4ry1U%P8oDIw@9?V~mb6!d7Ra*zJ6I+GM z&KS0Gpb4CQaw(9!`0aBd2{Dc+D7ewd8B|-KJsIBF9c3gq!HHP?PD)J9PXiJr3eI$K zM8qG0hqDq+P^?pOVkxgpu#CO4c{IH6TS)=q8-rN55tAxZx7yw5WVpYFOZ5TZo4a=l zItojp(aPESaY)f#mESOGhj_*jr>KXTW>5{Y=z(?U2TetOnuO|bq>&|FImgLyFqecv ztV(j_4?TZ`{YL=xg^Z%jg!!p#0l)b2A@>K<9Zlrz7}l52>U!v;xJS2H!+n&eBqSL2mvcSAvM6M6odO_ax$o2`y`6X z+d}ywlH+_}QYSnDFb;Bn22qr#0=&3-j;oeZ1g5 zVc<(}7-hh*Fu?rRT3E{FwIaFsG3=Cq#!_9b1UAW4u5rwS76hb(2^gWwof&q^mc9kE zA!tqHWioGofVla`#Pyk?OpEfPa6~0|egwNlFXiE2iUko8YrzDqmw>R>B~h*@t_~bi ze;;v5m>-E*$O9bts%c^c1ssQcVMZeJoLJ7<2efeh44uN=p9C99b(xURB%HFt1)alA z#(PtIG^zw1BbuxOJVl^X36%hsf)a<{I0|!=soz-_>@`yY2K4yYRwZcz0wNO@ z!v(ajm`<#4Ko;6CMFh|BWEZcDd8v>cal~XbLWVHi800JWF#L?|e(pVC_TLQ@(% zWaMWC@M*boMBiYm0mlMX2%N*>xE$gSFO&o}VSuo9N_ZOVXcPv+(J*K?)>RGLQCfxg z+yaS>l2QeP+6OMThj(UjDlFd{woQogI~%JT%}B9=%l3vBGL(Q2?HFNwPWi<1X=J78$LNSUSSA5MW~z`v}<$ zv6)`0NNgV6hiKL07zP#;1b$*I;5gGD3g2K92U`c4DK}4!b{xWw-N``P0?yop`3 z-POU6NzQzUhU6cpc~>%IWi+I&#_HZvaE30*HC(s0hA3)c&@+BpG_~BIF$hO6tPT5J zT3{5Z@II`QI|+%-_Ocu;g*tVtbr7&$s2rdbnWNQ**e$CUzYL*ql-N_c^-Z${Ox7hi z$~VI^qc&7$I>Hg}!Wz}#jw?1P)&}u3HqG(^WzU~yfNNS`wCBgO^tOvH+DHPTMCfS11sgzqO1V{69 z47;W~VgXYOnAi?9A|RF!QCA7W(7EEEvXotK|?6PO7ogi}~&+KRioi z7lLbmiW`A?;=I0)J8XCy22wl zclilqt#*Oo1i@p7U8Eth4Gj-G`Biurnd-^MTI{WPkJstH2+g?S6F6vs6ePxq2?{ul zzcd4qBzsbk&3k8Iw@8*w>sSa*{K_6tun4Jau6xQk!<&-WrEn+2zrpdkm~tUSKGS_` zxDV>7+r8$7XF*yMM|O0lJA2qeO~82=jXpP)x?#RwKGN$N_KyoT5}n=cXB`@~tnRaZ zcWchwrQ@zS?E0q5vF+p{Ua1{WQnF#hz`^PQZyK9vZAL_X z*^-zAK0#a&=BABBFt$Y2c*k{dUhxpXwJui^7nYEF2g1m?0-TW$#=^BJH;{S={5HFf zyVvcOy?3%F`-XQJY=>27M4>SzJ(5N=P9Y|Fmk|o9c|Yf@ zlp^_yaNKt=p7I>hFTVH8!}q}NmZf*5=3F8Ey#IHXaw&YFotR^DZfpu6%2_f)-)!um zVvLxc`7CaCxEEDy+e}(>rjgbLHMv|v3l`FsX37FW?6u_3aB+Q4CU71lcSwK1LIhI= zhqH@00e_zor-s>mh^8#1)^+zan9OjmUL?)E2VAJ`HsE)W)_gym4gG>mV@A_eX zKgDh|%a`1S`6x2d0PoS{yY4KfQ0TUy7-7Al6^sits7y8Il=>lP)sd{of<;yG=Iqe8 zxFtP0KR>&K%^N@>Xrv3*AH%<<&*-Z?fx5;zd*pcGJ#af5j{8RCehgC|>>=VN?h z*<@MrX3pNl81=h(AL*V}+46g@Zy!c>E=PEs=0q;`>-Hcoj;?IG-sdZ5E0G%1Sq^h~ z;2;uVuksnu=+(9=U|~HNA3`H(@W)LAM8k-n)0po}WTk{B9g5wf^pQLUAxHaoP*|#o za9u=Rdj_7Sm?0e=Ud}s6DJNsCeXF6szDR=~X$W_Y3D-G2^Z;J9@V!m#=)4aO7|chZ zjILE3;vjj}EJ_jF(^(Y*3D=Y!0S)LVq`L@o&=06*6*Ljoz$5u6q?UD`#Bi(XI(0XC zg!|s=_GPG{VDDY1klj~tXax@38O7~eD*ePyc`}ZJPA6=?@t{sdBJ;RKRJB{kL|Sx) zYpls)fy}A;L^7x72xX4$ilxe3s74PSSAp?WOWSe60oYfEqmrmojSdADC`Ntji+^7C zOYbbCpU)T&;m(*$NoWR}-izyK1PkhC*hRfyXjYxE>f%MvQm1Flkj0m>QB3u>^P9Wq6@+c`+ zL3dpth@9QQ6-ZxnQYk!kvzeP)_R^$YI<>09>AJ~7FXfp;Be_0}RN?$296LHMUS4oX z*f$;vxpu~4A*DUk)Za;E9bma0^WGC?=Y7|k!@Q3*N4}tu4+S4dpp!-J=r2aWQ846N zM;NWr*nzb+^m;MAN|v>U-!haL)a@G+ zOJ_S(r*v1ujL2-Sa@7=?BRsz%J(h@a2^T5^$#H4ES7QsZyEK-R_uW__zE@)dQEErG z*K7lHA1&!p-lZ`{eBbQ}^ml2}$xt4?Qg<=0RYmu>%xaGgVvsdgZJ21Hiow81j8Ka5 z$W^VZz6>!?*D0PpI&{q#(~*(A*3lW%U_%fnpaiB8aY=-NfTL zx}aq(4rKPMch7u8@D_unIsNnAl+8(x(iXTDwb1bPG(wtJN**_JL1(7q?bVdh1t?<+ z#~&k3a+ilnk8>^(+UJjw_%e!8r9#Fy5Qapczg@x`c_K^{PHynx# zj|O<{7W3Yt4JBPq3p9*{ukV$Mi*+JV`XEj=Xc-oXNv?k#x?{O`98~xSK`V<`ca~I_ z7o(p`sKa$EPQy8Wu?~_pKXVofBFYvuI*zG19Wa_%JtfxyDZH(BWP;cg0)zex^<<|aw$PxH! zW!{xK4QhYkesl{87keA}%6f#mzf`_I56f9N3C$7reR_~*E3{pXgjB{LnH+Nu*Od|n zi!gU?Do&m_hN+2rDO_oKWW^sPNZ463Mj4%1jwZyg!6HQu&f#OUH&=~!#Cu&3 zfY6bsGcNa#;T-P|7MYTWha8J2y@&)_KLN1S$E6o;va!-bF~Didz)p@i$z(-is7%`R zA%_oI%Ga`fq?qQ;Z+{mmEb{S~d;wWF?TdYq*C!XTl1ETh*^am*x=U5>R=;Adf-7%g z!PkkgWH-gL?M&bolTqimY^lA*HYn@6aPCBO$WZuLMHJsdG{vK0Gn~JNnb1q+4ljD~ zensjfSWrTgz!Mr8!E5O_go`nFV?y?FG5jZWQD{>j)%zfwK(QXCPA&9dx!FCWC+G;L z!E#?GXoY@ivowNFEsIuL%pjY#;c7@&aAhs>+t=R9BX&Z~!~M8!#x*)=#F*Dnr2tx3 zI}~6@T0D;L%RqxZ^nIwU#o{MhpAg7X(v&VNJWjqn?pdeoS8X4O(-6%f1Gv zRAW+Az_X4=fScU>fOvDQ2=_FM{WG@piy^UiT^xr3V zzz~KRg`-FAvN7nUx1d6!>sCFRQ5z9mq zQ=$(^KfSV#1X(L1luN^biBSejkR~w>0l*#(Pi-jrvZL=-09a z1QlhelJliIjbjfEIKOzX^m#}VBY+a{IG#&Hm|aax(ph4Pj<>CZ98BR&XS?(eGvP5D z-lOBvEmz~IR3fqq;Xrq8hLRrdenS1lP`w0#K9k4h!;UCoifu@Oqf<3Yv=kC9Jm)I| zDJR;&(((I8u3o5)mm;C12;)+jzSn@n8J=3_6BwuV=5yj2DZ5ljd*?iRC>K|thd7Gc zJ=s$10t1z_duDM$D75B&yq``>8Wk^|p<|)qG|b4YW5P2La%PsquA+%BmG9P+POtUQ zTm3;A7sxCd@BRAEc0e>aZl-wYSA?FFx0^kSoXElzPk4{<;4i?JL{k^sX9jzog9-`7Fy1s7#fQhc zE&dBTbU*ar!6j_5_+1uU`{X1tMqVVisd+y1T@^^2yOf{mpU6 z1qqXh3n91v`?&edueYI#ll2wgG?Agr zJh2H$!{1~@ix1tQt`R)KiN4A#n!qN!L&g1bya!YwVMT>UAVjjX3@%(ex(iyhw}1|j zb6Qw2&J|ji&V8NMXIvYjfa+^#z-fS3)>pCqQnf`rYMKwGJ>Hkd@+(HXr0F`7RmtIe zPVDzJ>>N=$r-;ONp$1))m#!{0YitjC0wcx>(^|)5ESu3(+-FD=;x6ePbb4NVUo3-h z1<#I!=5%=nnu1{wArbIZEyBP)S~{ZN-!}YMf~Cr?DAv0v=n+;5qL8RAJyUW5Ac*16xgL-^xJtoArEf= ztGmETkqy1YSehdt!|?ku+;dU-#m^G949ZhC5eo@|YWIgB%osw1p&btC;o#F$;o3$R z!c+}AOYyI&2ovRsO-p7D3rZ$_DQYa(5Tl7*X7s2r(NZ$cdOPA*~05YWxA%* z56-G0bF75y8aW*5F!9K|s>Cqn05>O@Dw#midJi-!|_0ReL6IS^PyM^kuU zB(#AXazYyGI3~h}+wfHz5vD*3vrPdoP!Qf99}`GT9E)2a9Fu1I8ADm1Lnn*Da{;kD zuIm%ToF*Mc&i2lP4UQ__&{KymZ}586z5uCjssx|Ic(Nyv1NL<$>k0zJ%ywy4DWY$V z!?BOBDB4Jhw9g$+P7bjm?c!{b{!%=aeA85?VzkzDFRCwvUc68;bNZs0#;~7DkV{s_ z46`sxSyASSYGAU7cqOWr?dz%dv*_w1qqbD zg~%d(NQ`O@1gt$QA>4E@hYVnJX=bA&?p#0M0?6jALg?Uv4)snEL2x1}uy6+p){GbD zCh36Vg$3;l!P7SZg_`<5gYqV}97ozL^vHNRD?o8kNqivvvEV3|0!(cBDIh;R_@XAp zSI3F#o2$FwbWxiQ@lYJc!xt7&eNE4@XT5zJnh~n%1PknZe~k4mG(RE4Ico(bXg-<= zuFsx>oeAp;5=t%svCbW4;h`o+EMI5FCcVo>zuVm5(aRXePZ%D|$ZoT+w@p)u1>0he z^;SO7nF=Tn^q>|ho7wGi()xk({RuyAl~_Q*%V&?#+5E2D>?Ys(lOaUTgp?D39z>_J zV-^Nd<7hKn`C&yOF4-XEkVg{vVS+}zDGr9|c zihh@6XK9v|9Jn*I{*ef`22D(aqpi zOQg=&hjK}@MCix2?K+c?`E4?@b|`oxkhb`aM6cQUBf|xRd9PXtqi1p7dW=s|E?^%F zeOvotxv|;CC(y<1e54GPsz2vTND2i~a=Vwp;fBYQWQR6Y#fZzg7|*0pJ1p|$GNJpj z^dDL;=q@+peY_lcQ5EhY4HDkU4>0!+a8K9AjaOe~B63kx@De}N-*mzqR4)UEU&OIJ7WA15$t(~DM=n2b*JL*~{+>9;PnE28zb z>3G{5O?Twc&G2xy>9m{*lU^SkPuSJqaO$Gg)rz`;hpjIUkNGOsmK~(tAFZ8Cbcyea zV@9-))wcM*ukfx#w;V2?RU<%bkv-D)qHmg=ks!yr$x!<4blcD#1|A`G>XslCG4{; zzjN-_MK00_=9*m~^6Cqc&*SNvugBv9Jn$9no#NS4dA^D+`-MK|lYM?Xy>lX%fr~OF zOe))~S=hkn8S50K5L-@`_x#d#vBi%-gS5Ni;ZOaUHp5)XxUU27#QJ6(&`aoAABz$^QVV?n0R8yW54)vjB*~I-FisbrL=q%A>E;gh(`*-M|ufGhq0aEnSYA8@<@?f zmJT}uOHzeFw}haSEGQZpCxyfUbAsI?9WH^$T+*IsEYgP+6b>5i#W>3m>9v^x0U-=d z$^zr>;+td8_q8*#=pE9v6B9|o%-A)A%IX{W=VWHR%bH-c*7x_M<4WI4i&e-b={*Y1 z6;#oHyVYi4t4{E(5|IL{ebGPciA>7|MxAxIK;$zwAk*p)Aj!WOAS{ySKbB6_vr+NL zyhj6p4pBEFyLlm3hwSIt+YSBAOjAyEwVXFs`S32D^Zkba0l5 z*c3OAp@P1(UhzERK59Xk5nnXc@!;39#J}BNF-51E!RM!MFYn?SylT~W?XSeiM5B2e z962NiYYqYj{43Oc;9*{&GQr;TD!|WR37g4CwSz);wQ?Bbd$PdC{apd~%WY(a3Ta4I zih7N>7#*aBi>+f3E%Va6^$|#^8pxD^`QLa@_9NM^u@%Uhj%fhyxC?{$Kh zj<9SN7y~SeIN0O4$P8nn0fc^UoXDIDCjuEQ$~rk)p^M8!FT>*tefn{l@N!-sc0vB& z^`X8AVKKP&aeyNL?4C|XFs003jZ8xplcE66IxHPPbBhod7eP%SXY?=mt2Z5F+%0r4 zZg=2tc>X3$=N!JEFM7!3xxe0#>{dsGGCN6+#YUViC;Ebs_H)s1i84EYi=0B;GZ#|A z!ox`KXJ6A9xGuQBqA0oO#yKv1wa?5a=lEh7p6k8kc6Kbzp>w5^p+t9uxsf9B3I>!B zd}NAOMdiwod>)HyazTesW!Tl&Z>E~NYGfml!_ggjOJG69g*=@xP}F5{ZwY2miL$?i zxy~=ZWi3nywI!qab79!oMn2X@a;n{q4#V*e&d1}kvjr8us@YSnorKHLQCwxhAPavH zgublZUKjeVjLC>7jTiFocqhO39o}8b<6VA0*6c3(i zl2Aw(@7U&q`gdsk%{xrI+g`QGJ(+)!cXm5pOu_AI1e8kz&H~kf#ROrR^`}}QL3``fGXyY&T>QDiIa9x(u0#PQZHmK zdl`03bkD$))@Eg{{5N2zzjTjO;e9WvevukAIrh7oRm@}OX=Po1EpJr3)qL{ z`~=T+@$}YxXHl1o><}e3B?hsuKICHl)4l>S6lZ_wZ%u7=oH~8zaGbSqv*~vEMP<}o zXWkhkhT)AlF}>|xxE#dBXZMMTw<=;Rh)6rXu@!2Hi%PSx?e1Wy;0v@7BTr$#a|hLR zd(0&*%(2XfSAzyyemaK{q81KeBAl)OENI47%p`LV=rV_ACBt^C%wy3h8947v&(1J~ zm6~OCTFK{>N0i;W*;$^1BrzEoJ$&csBdY~8-j3gs|yaw<* z3yQn7-wpy7bi?fSu&)N^e06nE??6c0UEZwY5d6kR1NufDC-^vs=;bRP<)vM$ykdxs zC1Y%kro%3Lg!|F*DcqDZps>Upb&=tVkIE(&THWAH&c<{^i7(5Ki^uw)CFLYo%mjQD zaZz5wF3hWEwYN`uOJ{3*ZKQR2)>Cwq$9VHfM8_eaf)+3=MA+r&h@$RAJs*WY7=r^x z`^Uh=x-WI28~mC17{_MuK*I9Si^RQdt|$B^N(mLx;)9^!{e}SNcfzgTyH%C1+9tt4 zvItOAE)gypzVu?QV)bj%iA&LWNcK)l$?W^hJ^`E<3BVmuYH6$+$&?x{Zd zEbFmA4tNaEiv=i9!<6BpgzsX;XNroZfvVeRly2`HVwQ(+6EX(EzBMGC^?0AGz_}Tk zXOhg&{H_}v%OqKOF4QsYyK*6||wOAp49cxM!viBK7}=wzn~< z&e*}`Z_+NV2z@85Jbl5h5uVSTDH2;46v{IYMEW}8!W1daaj%DZuEmFuqc3g&wjECp zLl}<*(r82`i;&X&cg?O8-Tcu~lRB}d_s-_f8wU~R%&GchnP|y}{y4{u7Pm8QlIZxSz-$y+~V=bhE6QS#VQC07o z63FuXZkH}C4-)mbu-L;F;!)&W6?d8%z7T&eI`e#V`=g8-vtCcOg4Q2tzcEmtw+>)w z?(sYC`bJ|n(#Spfzy(mwMdSwrEc!OwJ8+~iA8m|+EqSC$78z;ZFAal!0YOli8@*nZ5l1swbPRZAmIy~Ul(ynf9Yl?>lh7s2)SI#Kzg zOWBf9N=>FWN26*?WPN={nHT3kev=@LYUbZbycUv|HxIZlgqu(*G}?1)>>#MxciRh`45#*pwUowzJTYU0>iymg3tc7gz3^xYCj;xO+&80r9T`n=cHZmv)YpnYqJagJn zX+|O{#5Y6fa9D${=(*d(njZn#?m=@0%f#Bj^Qz-QKN-*+lftGQb@Wp@m=A?^;CLZi zVP!c?L+qgld~4<5i;`4;L2NvAc(S9+5a84@#amojnMjbivvVB0c;+crcrgSFqo&4XCKc9r3&_v1m~l$3maO?!>5`8h|-74df5kOHIJV4+VU#8$Y;li-c%H7IIyxk ziRP7^DxVe73*#=M53vzi>>AO1*^7q(p7&Zf49YbpXzfyd@Xc$DW08jC`qin9yUve( zfR3`KaT8N(_$j5}U6Gg{LZKCkVg1{6Aoe#l@eV%1Uox$KII48?(1o7I2EwLImFZ7+AR2e^$|b4@89!! zN=b2-XH=lR<*Q}B-|!s)^DX(6DnYa6CUD+!b`r)}kKwi>GHpPL+k`;_v83^qo}2b( zocBZN#_+z#i)zk>;jRM2f#Wti!kW%+vuo_tg`*KZP!?U3<4ePKd1Ym7d%Im-+g{mP z-`rWhwsAqg+Zz|#^^Kji$Je$J;M(PPUR&8gdaqq3!R7Uxc6(=QedF;2OPTijnFHL( z8(>#ABRd1FZCt;)wza&owu&MQ_W0TcKv&kEzqY!wes!&bD0!?eKimPurWwzT>sPKM zMzNuWy|%Km=9+5IO|*Px`SKN4g9s`M++KU$^|g(awRU;qMk;3;Tr&GHwza){rOb4FXC=>fedn=9OQNUNx7Sg755B(h#I>#Uof{bY$FAA}v! z$+a8nIvAIix7SzNm1`T|u#B$Q7Rr^it)2D9)>klQo7b+audJ^beCtZPy1u>BZeEMD zt4~0U@LZc?ySlyw>AJRc!&L|wHm@w-*jam;Vn>?5ph&hG%O(k{+sm6%94MWSp2SlX zlF38xz{sQrdTe_0Hrnc9&mmgO#v$>YK z*8_B5*SEK?Lj{y$v$3|by|TQy)^2Y;xx6Bs;X&&Pxwf+ofmwS@QrC8#Slfy<+I(_l z`_a@P>%2c52ColiT~VMGWoZ|XpCb5SK`AY9K3j|F{*-hWr;9W}O3&dry8@T7%gRk9 zg#l?d*S6NL>D-g4bt4tanRerO*P#_-O}4H*eWT@U)X6LZysZj;AGIJ>xoE|ckgL3> zY6~V-CzsGPK8Ze3#5~!Qg1$<*r0fh5`Q%XRC;~g&0wBv8fhlLZiKPx=zkF3C7tH*$ zNlDMBm^jz8lV7GTuWv)RMcxJV^urH4H~wgsuRMN@EA4(u zxF)rdn%==Od-?i~PD%w`e>&02FfVr?o6GBt=?Y}SW!cgNPnfMhIY-HfkRXo{U|lKc zT%K}}t9hKxLcvtKwz0FN>QrD(y-Ip(?Rlw|NE8(#B&!$!zG7QzPhES`>;+*Mbg?9! zT6WFO_y~^)m2eOpRAZ*rN@j+1U~RAh43lgi0~GedxiXDb#;qQc=vM1BEozbj(8H$( zc+_hY{;o`5%3kLO0S&Rjs2Tgc24|rCe0+4i3O_3xZ+K?Q0iV!&Sw^*vP5PxapqYw^ ztM~+AKwuu@klyla$wf||xRjxu#CNU(V7spt+jma)A_0DHP7t;c0N3#;Vq8Z(jm14> zTZcdZ!~5*cbbNRevtT2PSM97qdN&%W@J?8?ie~_xKk`s}em)uU=TzSqlgJmw-^(*v zeF(kH-jhRJD18VShfWFDxX;+G4nn-ReQ;iX=z+@?uon(L9=oDbf_w+42QJ&oo7eCz zDHPn6d>D0Gwxg^3XmpOiNX&6G+6TOXZ(-bgO7~^63v!Ml@v8qHdv5|KM^*Lx-;e-< zvb2!E$lA!_pomS_Mnr6~;D96)B*1_|I>}5jfh1GR5+=Zd#p(!xEwT*AQkgBCWHM=x zW!Otm91yht#X&$?MHrE#0p%Il{Qu6WTRrDYro;1j-sgQj|L1v`58-xy>)dm1-8yye zx#!-hUJh%uUwJ_^`rd%qCw_PdNARhUw(-Uvc!%9g05bI#?#^AW2jQOY97KR1r?qF2)M&qGC3mt=Q-{erAPV(<1VX zR+x{_b+a$4BO$@q{54{G1&X3a_!%z>*V2k97?$iQViZN(?H)d0-sBUVk-lVj=jC|v zV0_K^7ez~Tj~2MGCcI=JRv7RDjUSrB)U*CPh{$npsmVQ3dhP<3J1rj6w&c36(3QRvT^zN zys!|5*+3KC*Rzm@5{1V$Da)$!VPd0QDl5g6>*!~JwZ;-g2Zo`Y9)(@*YLSgHjeB*e zU_O9L!Y}qyO5!7K6dl_5*hVM8InZ8Zbm7QGx^NSrA1|FXf5mOe%67XA_R=O>U!GGI`q07QMgOu1Z zJUE1fAesZx!p+#jI6zU@=%F!MUQ?NAT%1R543?GQv6z5MJtXZoGO!#f0u#Z~Ct8Ft z&2Y|nAt9b@mw=jV$15aaw%1H|Wj(#p9us8#!X0tx(>xbH!$se)VvB^GP)f2T@yvB3C5IAPCjQ7b0Egd3JD!WrTN zJ=cpAi(su>___5>jRw1%58}t;aM_~I*r|XAC`gtM;j6WYg-cv|*A?07=&{(7XJObA z=E-gZR77A@r|IOmL-jH<*# zb8Ax*{raxTLUWpM9utG*9VyOZ&UQ_6R>hJTG!U#?+a2%!-Q??V#mmjL$sU zqA6?0b7g&Y5sF@ZJpCx%OGBq8a07nW2oGA}lHx7@@gduy^A;{xP-4;Eo{h!vn`lvM ziZ`c_9$OJ?bDdYWWbu*~-a3r6Tx^Zy4gl{wq&=f!MB{D%ceFT!mcpJFT({;?$TwVE zPHa0-srHITUwG+xp4+;hq>{JFK;Vd&bdyLDpBl0{doY$~T5n z4>X>B8RXUHT5PCaGJuDwvJa|LP=$S>w>A7V*YKhJydJ>un#;fkR zQO;Hy>;h4<|)EDH{o@Mz6coFy4TH9YD4p7}Z&_`cV|$)QHbX zyXJCM-^gZUe;*x$=|{J5WD5}##-nmrSB=_>_OC<^5!yst0ys^PS4eFo zIW-hVId~k18%RpfQEpQOqf3HrkM;v`-qO#GZzNpmh~o|2rI9r5f~e}Sza@*JQHBR^ z8v~>Yi|^>tF!*p0ibfkNH{x)A__4yVTDX1b;%<~9ZUQ?};8vlxkd2|u^kQuq6YN_q zBlU0y?Q{8~{djXd23lAt{N*vK?EOdfOg%ewcBAGj4q|X=UB*9`LZyfU)G3UUCB89Z z$)@@R)LoRikWo%u17SE~+zeEI8lp;HtSEoC+hI9)${@O4IJf!Odsn)|mRfJaI(5;r zLiXuuaRnov$-Y}4`f(dNM}X*D*lm=9P9wfvQ6_s2+K!x8Lg>E6hALyD zm#}S2Qsfu3Gyq2BsTkYHYoZq+k-5XpEvJ6ho^QmP`2gH|^5I9v`tfOO@X^RmSxT;S zj8@P_<7fy(9qL*U%Zd)gClvpTm&I5W;UCy>U5x9|cG9R%j4NgZMtjC_53|L&w8|KF zsZpu;6&7^ER3Cm25?y5z{d#e9Fs?j8;|nd~5sdo8(MGa;1%3hwHWy_qRmOhj83T0) z@jI?8=eL866^?t9jaz%1Bf7<7fwYhi3of5`&=8c4Hlem~4;%5<5;Rb(Z)D*WQkJ;zo(=4n5zZNWgZgrK^a> zYHomIOwWmpdXSMU_eQOF6OmOi`aPOAaXsSh1{x#pGs!j5ot^p&UOF{rnzPR(Z- z+V(rYZoW&4XQkGNej+-Gv)8c*1_ms1wZh$jt4!~y=vV4dSPLG9!i%=JLQ!r$K6>68 z9im7Hhj?Ij^lI$!bWp!PwjV6L@Kb7xhE0B@)o76jn^2`}%SE-?q#!*(PG>OYtV%J% z@s8PgkDJdPv%fnxUhY=9{E3hD0}vzTuoGpDITkiC%Mqdxl@6Wj#)=&L(f9_;QRk;(s7d^fVWp4Cx-t8sBvD z=)FbpBdf6(pEs|5!~ST7Rw{^(;H1Z``Pfmn)CFv!=H>H@)|~DV>SyCeX{egz%uICx zWrgJ3TvllGrf)?ceSQv_;x5Av4KH~mGvVcYo z`mhi?6QU1zD1-vw#PAW_BmKZ$^o?_3trzb!#W8|3bvdh*J|Rv(<2j}g(UB!}E@6rQ zMQOv51&9aFU%rw#)g%f#LWn2j(HMql144_$umUpwkZ8Q;uRJ}$r^bcN2>dNXPuR?w z+=WX>o>v}NBW?$*DRN!yc8f8pEwvjtxU}ZDp7o1+2T6Dk$??oeD#y%~=2q0nj%po+cr*$7&c;2` zOs`c!@4~+cB1Q1#pwSF1ja>DZG}DWY>sql2%F&G|jKuSM*vaBXY$j<~rVd%(izjHD zg(p$-cm)W(J&czg4&Woi=vRZNIq<6`C5A72>UeqWxik5PI?kmTG=hWXT#63jwIJs% zN|>Dw}rN^e&tJ%BH`!Y0;)zc#;0SZF;0lPqXP#n|e0wv}xX^ zflZ&b=_@v!bYY~o(xy{wdZbNf+qA)^=i4-E(|()YWz#2Z`X`&dW7EwpipojYba$Ip z+jOo?7uj@$O|v%bwdqf6`g@zkwpO&?D=v=8+1;l5+w^do9&6JxY`WB@7udAjrX4oz zv}vDB@3rY8Hht2jf3oQ-HvPLzKeXuCQIY+oma-9%0j?ZR*(cG@CZqw9Td$ z+4ORoUTxExY}#wnewz;1G_dJoHvNrFpR?(UHhtZu@7VN1n{IJwbUxeKbVr-+Zqq88 zrfhn+O=sA2woPkoy1=GOZQ5qj%WRsp>5Vq+wrRgj2W7>i-`Pj75rhD5oWz)lLI>V;3ZCY#71vXu3(-k)LY611s*z^^fzGc&QZMqr88Tw1uG(OLd$BC$2J{~8mec1l|<8dNtkB`TRs2x5YC!%)v ze|4OAd$Tz!v0}39Xl(zZ)q&JOhnnroQFV1EbJV-OZf4uUdR|Pc;oay>=43OS_N7H% z&9}{Tjy}&^fsH&z8FRV(eu^Mf*1{rP4&oq=U4^} z_gOZ#0R`0=^Ng9n4{A-vlpf23OXr}Xw5;)WGlQ0RXqCa%?OijIUe7sJ&@7#BGyLH(D1iGFQ$Ku-lW+MhA<~5=- zm#gsUK8<)q;W!{rV$JoR66OU=0F>U&s<6t$@ zuqrUK&6pjC)h}pWytux}L35z#&8&%#SW&-`m7G5DI4oH$J({-OoG3H$`dI3?{Th~mObRs<{%Qvero6|SE&nvdo zEhe4VvJ`d__XTr#+s2ker(>-TJ1yf2x-GHe8XM1Qbz@=NYFLgkQ|QRaOPX3*=Px~J zIbLc5Yd?9?oHEv4%SWi|fc4R5Vd3Y~cY8BxJN+IV8DnABkFt`5brU;jc>{M`qa7J6 z6}^JFZPJ{j^i=TeQM!?FO`l`TJ(K3NV*m2;I@?4KO`6LO0;7+Ky9x8tNpqJrAH~5w z^9X&0`Jc>trhiV~P=)B*FDK1yT8UQLxI=nsQrSwHHz(P~M0vcJX5Nko8M>q;{Z0a>hQP6I znQu*?UkJoHLv+Y^{QWG`jubEOL!Y_NX7~*=uF{t`mH82f=_Kx7W4Wr(UeNx10TcE?X@#V%NC;}a&W zh%cC_n{>{?W-jmQNw^OelZ`$!DYndA%qeq@nvO9Aubnk!H~wZH#W4HRx39_W`3sgD zk7bml^kiinjU`y?F^AESV;UE>pl&ni^NIBfSD0hz(;VEExbx`~o=>Z9fq!xmf1{^A zsMKpr^uBt!n`vK>G1nP3(&#;Ero)hJVG#?q4=2RjU~rbDueZ=QT5aX!*Dm@-`S@FR z{H+lWu9zOv(1KUOnqE$u%^JL(01MjqnH<-wjXqfRl%ykRpF|kRfScE4=N zr?<8@)7#MN_O|tUz3si(-i}_sH`kl*9q0{u2YbWbq25C8aBs19q}QyjSe;m1xjMPJ zYISOL_3E0{wW}Lex2^V8x33;p9jqQ)J+!*8dU*B7YLiRms&c7ZbuOK&$vL^&Tqf6+ z>&WGD1GykKmAb}D%T{}RIN#^sa}&_Q?sUaO~abDHSKFU*5uaY z*9@*1S~I*RxwdL;dTq_x%-V*v-rDxH{@UEyVC~@A!rI}rW?jX)2)>hGV2=F zdF$HO`Rj7)f^~!I3hRc~nZAm?WM5TZy04}$)7Q}F^|kl;eYw7%Z?Lb>H{55|SFBI2 zuUem8U$Z{5zG1z$zJ0yFKDRztKe)cIet5mks+| z`wRWU{bobOhUA8-4e1Rv8!{UjHh3G_H~1TJ8-fjk8wwkSH^A2Y9nAX^D6N34SFyEc zVCf#L-1l>A;|18afo&&ORk3AfVAUQh+J`jdPHu)rj&FAdAf!0J3$oDXXYU}*(dnSq5RVO?oh zRt8q(!J>RvQvgdUz={kkC<*IH!*VjP8V?rZ!&(AZN&!}4U?E9ZM;f+~fo*uO41aZw zZKD9oFu4l0j5MqwlWWL%x%Qk7s|a8d1z3cEH6&pPX;?u9R^Y)3d{{vMD=5GU%-V{z z$^T)NVDdYd$>`@YANMls?)~ig4&43u^#i#7hwR;-;QK$tcfZT`f0lcI zJof=1`ha5p2=@b38&VspxhHTo)N*g&ZfN5kp#y!w0Q!WG`h#Ex^BW|_PoOtQ`PJwV zYQ@;+`+4pYhA`?CG3Hg+5ihl>x-{xFpl7JE<5j>TRguT2B#%xGk4qkpNO>NM3Oou$ z;}4A^(HIhqARdnxG*-|kL3cQf3^XRtXb|1qQTw;A&f;z!UY*G$Y@eN8#du(nlg+{4F88Hr_6a;5$$cKj-F0mk5qyjX`E>*9sBh1%H|fcU z%_0u_5gtTx%t&pV$z}%f71xjOsF3Kd?62l=!RfEX$Pk^MkFg=Pj3FK&BHM`0*<>ao z{)<0c`vCp=5cljO);pnIZiM@}O77`WYcm*;T((TAdB=L=PB!ObEXjP_fB*N7BeMz+||X|j_|74k|O87TP>)PMNs9boDHWRu`B$ScN&{A5!@i9dio zp`g6rr1ce?k{9e*k0D?3e+%sWLP0p$?2RM|Pbk$_&EAmHSIZue+tj*4V5V?iKvyKX z+Li3PrB+c7T+KdMt(_Yr;I&8NPHKHM{LE;?fr{i5?z=pAv>oiz4zO1nuJz!%u>>JhLTh>hKwD@1Nh(J+M%_mj5CG%({Xw)`0MW4L|-L);Hkc-Z;bkR zr~R`J;x%yH08nB`RSJjYo-1g~YJzZUbAHaatOFjEW`7)%Yu(F)9>bMP+cY-)L? z&}L_+0cHwAJXeV4qdsP0k<||IY^*rW-9lqn8_%mccxIJfkAi|JCO{I6!EtM4dH$Q| z4SBXui8&^vbcM4YxAf_WRb&bi)%;LR;){` ztHiu8g?XW~t`_!0z5v}<9o8F&T4{J)aoxze$OfVwF}mj>+hO~%cWjn@!w`O9VZ8~b zm{(DM>T$FGM^T3mF^0%T8$`TdSi}mVR`ED4kViy-`jMpa+%i1(AKYl3UpbDi9rg}$ zt591|OHe!H;S+`Hq7flF_h=-@b8i>lJ*F_l+(ehGOhljnZ?F<`Hiu_y1L#wVYjU_2 zbQP-5`f*9a>neEcsl_b3o$t+J-$-8#{O<<#5UFL0xK9(9X_G${_7AaVoq)HP!u{>w zPIO_fS=^8L*e@(jF-eSB74W28M2@nE8qrue3@fJbssYz0gqKxB1So;%PaAy09O66V zGgqLeCQrE?bL0?_nhN-P4lJJTT(a}wZt77T#8_N-$OD)KClEhLA$H;*ZbJR*U~d8u zkrbjK4(2E><|kRiL55c+Fat>;{?X1+k0K%+)IurrypD}*q}Eom4ZE=5EbKQA>kZMH zQkx}Ux2bj2Y_&Pu%dvgdpxyEq2k5#K(Q;&)DcsQw@M^b5jHHa;w5EW}c`-HH_B4!g+7-L*Sw%WOMa@=##+<>A)d7OQS z=ui=np|}ki(0hlNi&Y@{;~?teV!o9{3k>FlFuRY=z80en-K#WuP>(_9OLuA#cWO0a zIF7wjbBNp&VVMnmZeJBHoSPkgc z$Sy+oHsm*vZG4pfAC!q84#RTDZm4Z?7`qaP>ZK6TBim`<=v`zf4H${zHmbrrHj9}N z%~{(q_YBb{WET}2?HGjLpRyLwfYzx&Z>P|p?T94N*%f)lScBMT1`!w^^R)s; z>^eRVV|}NTjqbLgy*tq218DOhwE76QdlmNsY4n#3?16dc5weJO`W)}1-gA&WGV-R1 zb~c#6$cOXxc4U94Va@0WAB|q|IG@~vcb_eJl5~G?-;mwWEQMO?8(j3AgXlAB&|eO& zsz8LXoqNa{oab;?4Xk>&y9U0@U{4hye>p_^s&KatTN_TWXPHC1cA!-I_ENtVP~H6< z+1JhCz6}sLCGW!^a$05MCFF;YUzoG={$c97@=@PK*E?-j2t3$%fSS_vru#P@f9d*C zAC^YVJ)Zw}@HI4uiPCkW>s4WGEQ7n$#~BrHPBfmJH@s$kWQ_~fsD@VSX!_kTccr01#>xbO`4Rdc# zy=Vjq@qs{)bt7mX=x=*zM^lNey{ zxWJ=o1(&y>M^q% zEge9Q9mm@~Tt^MyNa@*C9MqvM&SsN@8WInpYDt?5VeNoSJNnRxXEE7vUu(;J1^lrPz`xA$Rd1MI~XY$SzjEd>vX`uzsKUrH6 z^R6`3HObmsjL%ujymEFOqW~|ItgX^Cu&pKF4U(r_!)qBXuWok0+VU8$L-?h`94AYl zzp7$ubJ*J2;BR!mU(E9==TH=_&2AUKt^4 z8)E;!u(egOwK;5UZ8q9Q);7r2R%C0dWNS-fUP#_V8^^VL_WsG*3T$l^Y;7sFwpw@= z*2&sx*xFpSwhp$o0G=Xw8Dwnj3E?5q+#WHm-ava<%Zvn<=$0NYuC?W_Vb&nk?F zX^xDLoq23$Ie03A7!}FRM%I&^CE3nu*v?$Gvktbi0JFCOdw~@g8OhG7+0HU-XYFif zd0sCYitH>=Y3g`fBs;5OJ9DsRMt*BM?-U_B8)Q2x!aGc0j|kaWn&v?m8QXYI$RN*k zi|i>@@(h41tQNCg^8d-ga%^ECW-H|RlZ7R*+oJ)aBH304=6eGe7sZTaxA0(jJ9TSfR-2}Bpjw$kviG8iSv zwzBZC@*HUxVjs(3jh$>O1s}^P?ZC+LdguUpvXE_S1at68_Oa3!H_5hKwyh4ft-$WU z7{Tl_!M0V+ww1wr#Ix~@A5=lPt~oAMeeRrM0o8 z`S8#Jc=SWUrzcBGv!ylI_^vNJd$P0&<=c~`dH==UJy}|wEp5oI9gw9}{nvQ;sY*O| zxM?4s>?~wE8^Nr+@;~k6lbz);6DCie?93=%pX{uS?aUwJ?-$&muCtW#{nXgEW`d8 zMOetv26$F(Fb}A*I|yh7;A4~=g!f;>I9Z8NGR?kN1N&nC9ezJqRhs9H4gY7Jf4b5f zH?H6BaqKtuvFHC^o_zW={4Db7$*2FH z;n9;nPu@KI2CtIWV+S#!)6AE~a5|4X&ZGjdT$*2GF~7(oQZn3A!4X>*vx%Hougq~Q zwhG>S1ELZ%`i-njVGdZq5iO^*-c-Y}P9L*6!~39X5PQm$Vowweh<)gST~ny!y^R&{ zp(77w*v|W7U%AG{nc7xSM5zY;u-{pMo$--(Oa4Z!ou$)E%ICfCQB-KSyB+iKXfB?_ zOsRq6&s97R%5sExWOWkpn+!*726^_J;>dgl`8-t1FEm<2eMtNZ+$M~ap#1LX4BUq8CKkpiFn>Ci?z z$+}b4mv(KmGmll6kYk<3#-7NF&T!<3eCWK5auzueHi}-baZQumo$Vo74Nv>VkG@kZC54$TOyj@hZxTwOJzo<{($Eyhm~HVdoG3{W zBn3g1p|N3{zeB*Xu?!zS4*ySVF7?a@2^7JD;U-lfW$>W8NpB^|l_1%elqvmI$P{83 ze5NOyQTivOo}YpQiu?{Fv$d3&K>D|nBngsKWEx0XkyAl3inJ2Jw$ag6{T_(Tcg)>0&KaU$o?RyJ*3PTAZbNbfaDcv2T3Gl zt}c+IA_E{PMVAhsGW)Me_Zjg*3zXS;s zc^4$Px74#2dKyoW<3S3FtOQB#BXivZ;w$nXNdEIuW(dUDUy^r05(h}K9s01OBA*3G zDUt?BD{?xBqsVz6Sw*@?&lhD`zXHiC@>h^_O3GAx5}FmM0tpm36~sSK=K42~%t4k+ zfGv&l*F$<@89x3qkR%>2nPAYfmC5xt$T+bK=bC~(KCj53ASn!4tcPX34w8*Y8O=*6 z*I_c(H6Tv4BzJ(AFG=z&h_A?mZE#J$EM*QLf=3xf>vKGa`HCdxfcT1ZfD{!8KvGA_ zTz>$`C{nR4?j}VJ0`U}?50X`+6U0~K=O9j6mi0E}s*z-KjEc!)B>6OmACofed;nzf zu?%0GnIM58OF>e{O3l}Rq!qabBzuyTDO1*?kO^ZMF6()af+9uIbFwUpT(^QEp8;|3 zewfiK_$3fuk&{5ur%IV+Ab6Qnl&ee)uYyeKbeZdRkjxp9gdqMrN!|h}WF*<{Q@9oj zB>4hJW}zf=LHs&N&I2jbOOhu&izRuE^fXAaJvYOKY?E&Ir!=|`iAnD5`IUdAQqyZ$W$VDLL3YqI> zkc=XCfF!P#GLMp;n3TEhe}s%5%b*av3koDuWD5Mg%r#Q;7eJirBsmGhzh06?kbH+E z7lH(ebby44+y;`oLFRfKB%{cSAg&_sf#en0ZVGxWMUo(i8>QxhKvIf)9mKgs%49&y zt&+5Wc#2#G;w#b%lI)VX9t24#@&}M~Ov+rHHzDK1GJJJ5hwq$G1O#Nh@+PNa7JGa~4QakxM~*MY=%pirfieelGPq36fCc71E=~ zHlKziC~^QuDwKL^K+=lTfn=VPGUtH!id+SfSELstj7gbxz8f-ykC1r;GKt^H(tiu$ zD)J)fQRMF+>8E9`EqBKCQe;<<sZwjL8HpY@`2O1{pIfbKMG(P~?8n ztjIGUDMj7|Nh`9;?r3L44hAVIasr6?t1NvXNJ0_%iJz1r_@N);DT1)2$trR?Naj_k z`KKV}O-Wt^ao?5XUqs%Mn|_uvsAc|}eK2^DDtDJXI?h?yw$43Hj0o(2gN zc^@P*N#@!mi5e<$2#B+Vl$i~ZQKX)7DRKdbr^t;U1x0=YQruE%{sl;4D@k4>J&NqG zCvqwBWsvkIWUg<3xQd(yQi#a}Gw$EDkO@91^=ts~@NoL*)p-;oxs4<*Q7%O$B0`hd zR>~wnJVmNO3foDUSs>YjBxizzid;;&6uA*3^C_9@Hjw=Gk~~Iw6!{ZKQ4zBjT7Cza zYgdqzB8P%_iktwFkI95_8FqYvqOo2Fx)Pne5lbV--gf)^}Ml#1pauY~ikv@>bEGhF-kdz`% zgE+IL%*!A}N0RqJ%n6cA-WQq`sRAh~@>LLLj?7gHl2K$Sh^vSPk~&T1>Hx_qk_R#0 zkTQ>hq!oD$B%{cOAVEyZT%FxM3(en@nvVo=6*&>aQ=|nXtH_NYeoV@gwGJ{tEW?)Y z07&X|TY8yXPeI0uWjI%n%2H(WD%?%W$dN|_&l zWEBZPf}E6j1*D+J7GK0!tdTNFkZ`Rehl6DLBsm47xL%UwAc=lSE(S>}@&k}Sk=sGM zyv+3|NM4a=Dc7A+=0lKzB2!Xm)w`uk3M7vQaQQAMGZxUgRxy@AlVgwu3GSDAmXgc^ zl3W1dJSfSPAgPBWxfR4yf8Ojw%J^uj7Dzf8&xb8oeGW&zLip&HlC~`VT z{wFfmxgf#AlH5qS6uBG3{8Y;P4kY|{NnWE|ihKx?p0HWe^4zMsO+}qIljLBKlp?c0 z(u#Zo#8Kod5Hm^YIUgic^a~Mcck*|ZK6gdkdt;nSy*{!UeGFEpJWHO(S zW!*(&Ye}9WvaKX9gCsvCNyQ;3y;720K?;hbL5hkj25~+ubA1cMSL9ld1h&TTz04NX z4^r4wlBYmYdr0y+i1~~p+aC(edr7iCNM4Z|kU){sLBhRduJb_(irfs6*hk9z7{uFG zk|B^lk$-~ZKPzP>ABHxplH`jZo+7hB{Qaa%hH`!0k}_BMBGMDfa2u`yNggKk{2auo zmgLVM8AV1wvWjd|jru6EH%NMh)N=@kqsR=9j3V6s}t4}cUD83aij zEoGhsNhv}r_MRg9f)o{*1(Nxi)N>|CJ|<<_`FzMY*t9ijt2cqTvn?r;>rTjou?%0G zCqRos(;z~)b0Ws%Fk_U0I^=$OKLXhAh zNnQg9FP3D&mthH)O0qLZR*{21oNr5+Q$XDBNYVo0DRM2zTp?xd1_{3_NeGg>Qj+&5 zmm<3zfn16l1d_VS<|=c&z6P0eEW_99R1ha7WpbS-WjNQ(Ao(~KlOd4c8d>MpK|)0) zeFZkJ$nGFTMGgZo*GfGnfw+pC4dN-11<5PYPkOGCdVUF#h)J0EW_uu<&mhN zBA*2*TrV}x1W9*DG9M(b$YmgbB6os#H_BX3fFy2~1Al2PQ3By*pXc^AZq$%Jv#0!^8Q)`(?T z0-slQ3`0Z9IJOUl$|%GaPdmSO8X5X9eXq8ar!W`P9TO0pOv zROABEqsa9jMMdrbG22N!&w^wXc^@QHWY-$l{HJ8DBSE~$k~D(k6}cY7t&}p4f~0qm zHQ_C zJQjMsD9Kb1{|HG=0LdRCNi#?>BS{t{(J09sAeoqyv5hAoioKd5}q8 zC3AIynD0sQ6Odw7lIKX~`vs(vJYiyf4Xe z5Lb~Of@HUzBwFJRko@kFJPVTAOA<2&xfIz4#8+e%NT|r!AZBl==X#KYBKLtL6&VIe zD>7v+tVNNTAg&^fAX!Cj0Pz)h1SC-8HIRZLlTSiBD{>@=yN^7J(?~{W!Qes1PMMb^;|?UM@iB_ znx|P(M)QM^G1FzP=RgvQ{0k&JRm$vm3N)W4$$=ngPm-^LWG<9s0Z37i%RtOUQf4hk zLXn3_k0Q^2c#3RUiyA8OMUdphQu7=TUy&A&#HCW^7LY)Z5F~q!r*d-$b1iIT0jKW)l;Vbxd}4K)v~OILCktdiXd4<_RQc~C~_i*>6f`$iQF#9)gVbl z`av8;9s>y#c^$;RL+Y74A6G|_FM&9BN|_ZP>ANNQ9!PkfBzJ$sHu~oFu;lN&iKXmq0>AOdWFlP0H*ElE5R>qh(D4aTPg> z$ZJyOI*_6wPl9-FOBqv-mjAmXM}ia-ISVB5j+DuQWbpv^Xnh_4DNdB+84zc4N&W@m zZ7IoT7Qvpkk>orOXD3OzKs-f$29nuV%KQ<;KS+`-7Q+%0*&8Hzu#}k#l2+tmkc=X| zAgM!SuBSl)MYd@`iz%`nh&fc|`WlF%$RZF=k#B<(73l*>A13t-k&Ge}mq4ak$|OPZ zM@aHD5a+9s%m;B5X$Q$F(gjjfX;RM!Nd81gD$hjw%#maUNb+<`CZJ`;`8xwL z*^iJpA2J571Q@ltAA+RjNpd@gqsS8=c|~3XNxL%Fzd!;-_Bab=oh@Z*K(a9@a~2uM z_^}M1WfMrKNIQsowbXn+}1WDW?HTQy~Vp2x)eUM4tDs%k~B&*0jK?;iO zv>cj!nd=}BN0D!W_=;Q%QdHz-kn}34=N^!PA}@esI;G6pAbCYT(TLViB)LYC zyFuLbk~{^Hxm%LgL4x}wnS3@{>;Xw;fP{)H2Qd#ynQKVqZAtD2DJb$+5a;hwCfS6u zP-GTJ{vT3i8AzbW_dr5L9snsQG7M5wWT$4>&%aB}DUiG(vp@q{A zBHsl`D$)&-*=!3l+Cx4`xwewzEs#`9%9OrE3$AG_!*}zpOG>rfus~U55!ZX10+!79uTva)bkgT*+-Iz=c9B*_5vv?au`T@ zUzy7RNmNPF1mY@kB}kx17v)OHT#tY_io6EmA1GyZ{WsK5ky#)`MV5l3r^;N{f&_~6 zgM^Aa3Q|zyucYT7sb~8OP(wvN2a-|50r3x(xmrN-igbXa50NqhL=KhYS&*zEZ-JO2 zq|7$oLK`ZwABeBWOpt;i8IaUhq@MFZ@{0TrBv9l|kWi5j#5+>zc>^SymL%cfyrxMq z9VCg@l8xRwCxWfGUs}019$pka*-%TX*O`EHX%+DZGJY8!36G&>_rgLq15nAjcWcGkeHkRS~ zeHp~NQkHcxNHQzQ*&vClCCP#~zm{YjNJf!IKzv310+NqOnRDOfV%S(HHGc^t`Gh2= zf;ft-0C5%ZK|Do%0g_kbeIidv&B;q}rcX&y1L7*Om}H)oG8ch3isV6(zmqb*AU#8p zybR(i@`+1vH$5X|_5(@%UXtTMlFvzU7D(cGNiL;aigZ%0KS-GXB(KN|AVozcT?P|* z!R9J+y(%G-ie=cMJ`a*C#AUe)<~7yNuQQ1kV?shlLdJVZl9NDuMHYeNhowvlY5uDu z7l9NM`5{Q~x|F$-WE6P>B>R?>2|+?dUIap;k46`2O&{JWHyOPUo~1QICH29h3;xh@0AC~^x(@_i|j11TzUKZx^zl=&q{ z_Crbj1d=dYn$iCG9T0b-Bzv{v3Mw)SBv51}h?yjF^-(TGo(2gOG2cP1&1J4ikc1)! zgE+fMnK>Y?A}c_G!==o1AO%J41u4d)jLkm{8S`bS=N*ugBHLY#tE0&7AdVs_kYJkB zGaJO4E{RK|Mw0J>_=@y_BxXyQUx1_)c?%??$Zl7lePUAPOb>#LGe>GZ1|)xyBnv?T zMa~5&DsnSO`ed2wPLP5kkAq}RkurY*2^1NjT&G!?GIgHvUFi9S)H4;NI8TyeLA;D4 zi$Jn5DWka!GKE+MCV(wgAc^@>&kZ0+MRG(IN|^w}Q{)+ttRioM_=;3qiI!I+36idp zn!f}RC~^WwvR=xZNivGuOfrk5%-tlTNC@IKNSR@f^b$!v1j(Nz$@W*lewIqIABewP zk|RM9jgp*1GK!oD5}qw(E(OUpNzw&Uh)J0%_+!YJW|`|bkc1-t4w6)4%kSatR%8lD zIwobx`T}H}Sca`-8c0Tw(?MKCnn658t^hIT$U6HZqsWgyQf*S^F%aimN&X0uKTnbo z5OcmHpUk3F71;$Og;(}+&tK+DQ;^BWGJK{pNzb=7o$F-C_^}MrkBgJ*bT&0TLLMCxzTsoDt2*goj1(6?ay2WlG zJvT``>p_x={2IjXk}}VNm~Kg41927kCrGGB#Wm2}BXdm#aTNIsh^xp!AYM$$w8l)x z_^}K%hB*}^ACoe<>LBCv%KEGTaTU1`q!^PjdafZotEHYCNRYFnOs)Vj$u%-p2;wU8 z5{ReB2O!Q`nQQxNak|arW4UCROB)v(SLNCdxsvOoo-cv;eVeXx4P=5?hTHixko0<~ zX9-9~kxM~}iu?d1(ZA`kx+&L3$UF!cZ-XrT84zEQH$jqlDN}JB+WEGaQ2W%iE^~tt zp%dEyGN~WMGDN-rk}VN#)t1KjL5YyeS0UryA#)u|a$nzk+BCnIoJu=t3AX!DWxE@z0CS@$V5;E?+QqSi= z68A~+6_9L9%IGcEPW4niqnYpGeXIl2GI#kaSGST+N0ql$inID{=xz@)0R>2FWP01SC+T4WyvRr6A_# zQqK(_8AbX@k0K9)BnM@#XFxnf-T*O=N|}i_qQw-UcSz?SlQO%3IFCzm0EqufNsa73B2R*Zio673hUB@AfD{zj>L#?tGg4*> zNK%o{fH;bzKr)IP1>!1lGKi;O- z*LbhQGE_qVQ!Ek6H3hkne~V>^d_WK|`7B65k*Oew z_hhakK*AD1S#?WRK;{E0GyYwcR-4YTmzEYT;|GwB({*`E)ZXlpMew<`90~`Qs#OI#I2CzEfBMnBp;F4HlyPcFdfn*Yr%mXRxBFQoke|JgF1M#Y2 zf~&l&bt!UvIVJ{w-=SPb#so6WXE&kFUyTXLTnm}hQI?cB(_0~vpC)sy1<6d8*lx24^EV1Y5j5&mI!IS4Y`VnJWhJ%#JNaj7$l*{q)xPt zBHM#x6-j~=71-;lX321zUO1CWd&w@|Kc%3OUQNk#4_J&HU@dKCE+h*u&r zPj==lt2-F)wYHkaxfYSkA$ZeuTso2FhWQ8PON1`Zo6sC6@;*qY$d=t`4MnyGDJrrX zh&eqji!^@@Br#8tBS9QRP6SD2q|9QFd`!kUFVegcGX8v->k`VPNERf$K+3G4T#DQY zQd}ry0+3XlB);dBZo77wlVlI$mE=W?51(Zt>7sONK ze2}anmxF|g+ys*NmMp6u#8o5!$t&_C{%mq9X$ybls6vdub_uE-ulE|hw{2x2ah zWI9Mnk&{3?MV5f%6*-UeTrBlmO?nhrO?ni02qaMCd61$a?|~#Qk(zhxgJwkz1xYJ1 z8^lp$5lBXnCJ^sZsrh1%tRmNg_=>CnDJpU=NO+ml^8`pikw1f&b}91?NJf!K>!DeZ zPlGt$k-7E*DJb$)ko4tJ#sLWxSp<^0Ldu*25-4&FNbS^i50Pq+ydp<~1SNv9NDRN380VTb;}9-A zJ!nap(j6)*mSG+BM4pWG5OS$>MJ}MyO9W+c&hR%fS36{!-)_3}TObq0GOVK?q@c+C zAc?1?=3juM6?qoKRpb>APmvEmvWk4_HnhAVyMqLZ>`&x(vh-;nMMdUG{3Xv)S#?qsVR`o+1Z>_=-3n=2@wyf%GVH z5lB{%4v;{RAAuyElX@N_J&OE^^eFNU=}~06A3@LaQqSHX8AZMd;wkbCkb)x3An89y zJy(FZirfm~D>495ROFYW=LMRuBnnc`;UF1B=7M;NG=dZq zxeO%zN2%v#5Lb~rh_A>XNKujJNY9_7p0_|UifnZ!dH_Xs1u=h?xl$l0MbaP{MNT3; ziYy{MFIqii`lxdt${;jmSN4igSd(u0um@v1CpqaXHiFb6gi*tC~^boQRH@z%vMs*W0XsgKY@6PybF?5 zWQPH0-b3oy6U0eM@)`%BUa;wf?w>G^_`xdtRSKoXy1 z6j?`lz9?nx1#wa_Iq|63Gv>{&tMg-0#(D>lD<8{5wgD0-@<)(Rk+(sLihKxS4vb4D zMHTnp{!wHnkW`6q4eJ-zrAvfz?F$)4krYTqkt0A{MNRyB*~9J@&`-uB#3jUBySKoOp;;njk|fhXoFgQuC-PNEz6BCYm*f_Z z@nRWs;+&(RT|+go9wM}9AX_4IEq+dA9TUqCc@m_c$O|BeW2H|PLO3yz8__sD9IimiMf(| z0VF(Ck{KYyGbA~Ua?O+EOb{<4$+tkVirfg|D{==&a=y&<3y@HeKZ9fzNSS|B=3WSEs}ilL9|AjB>RB`7fMnC5?&$6H$c+9B=sO!Ma~AvE8>9!B{HYx zr~}E$i=9%>6_82ZCCT-qS&=RfbGMYajdCgS5J*~)5X31Fls@&4Ls6f5q@L#?5A9b^u8zvL}c$BxSw`k|`0Ce#n7S(T2}T znIj;Re=a7FIj9;n3`(T=tY|M*@Vu2N)6*UUJ;^`BdMH=xGW1%K@ct-Ak`?opw$^7Q zX|8WUeI(&MU4;^%_BjbZjA~K)ORFShl+=7&81u2vWYS`ScWKm1hiufR*BI_yFi#Au8 zmVXd3ek?;pnctIUMcx4k6xks_S&CGF6cm{WQdDFAnBH{{PpNcb@0@%`XC%V$w*Qp zgA_#OxH_xYI!__K$a_dy_;+Gm;Q_1WAg#iufXnk(9`J7NAe>3BL$HokfO*q#9PzO z;bbH#G98JDT!zF&<{$}?SCFL0SBNjN@_fcF(g#V43`8;_2_z@dfaFC^buqo|xGqFu zYg@Sv@kQn!8Ik9ZyvRFF7+Byfg7?C7W6!DSldN%6} zB)-0tTakpwlSo?ReIzIHE0Pyk`#DDXFI#zgq#&{nl8D-vW01^-R;D`H$jZ4$s*jZn zlHAzJLoRC*D|sX<@-dPZ`2#74tnxf_D6$#iZE7pWk%-7KNK|AB5(}ilndEF@(p!`( zSBSZam~0S3NBDDqNPJ7%pXZU3$R~)mm5uq)Wr-~J0$Cz!BAKmi*7itY8!HJUzO9vU zNLu6!BqwquQWTksL}Ip19*K#3>0~<_)BQz`!R@WAjpRiJAd&ty<{%^{(u~AK&Os6) zHzP@rrx0IcA(9gL14)al^Ackh*#*fBuss}!M0U0^9*K*bi6lj?MN%S9AZd|BNJhka znbt+tL5d2 zk=0%yG;U+IM$#gCBL$IToa|wTS#vq#$x0k{DxSu11m~ z_qaMDPa!FhH<7f+$4ExxJ0vUeHF{)ji$j%yDj zB66UM8E0dTb}=I3k*LU2Bo<0-zlJLJq$VCpL%-URBtj`Y$>AdmlA*XBPN$9^N-2it z&8bja%mu`xMQ(O7-u8J8k`;L#DT=&{c#SseDS4+ibO@mA~BKUkhsV>NKxc+B-3o$x)sTbJcM|@jd>MGiG1#2jV ziljxhM=~Nqk*vrONI|3#iM80)PeA;MRxWaN0;#a)uP4TvWV7ZtnOv3%SuYV2pVD>A zhr}d;7)tV8DkLe=;~n}evH_Af&h}?pBz3x#y^*v?6_OE|jATX9NKWJ`BrkFYQV@9r zDT?F~?+n|YMMy;CCnPG;<6YKEWNjoa(icgH?1&^q_C|b>Ly(k64U!f)7RiXDkgUih zNbGDot{aiUMOGd{iXtx~-b@>_2#JXNf<#4@dylq6)t`f# zg_Rx!`XjPAk`UPm$%^dlkz63%c(s$ScZtadF{RhPLo%=0I)5QqkscpWS!7KlFVY7oh-{4%MRr8I*KAvR zAQ6$_NK~X6Nr_BC(y!Y(XCle}Sh)--irngA-mo!`BDpuMyzJy7D+R>+#LCY|L}aCp zS!Iz;k%Y)DNKRxwm-VTwd=!#jY~@%a`k9q8U7gRZ%yxCYuyP0De`V!iB>r_EP1O_X z-1oZ^#X#Ivc#fEi$lFL!c5WHRFaWMk5<&aYPPK?)){B>tO?c^yfMEJBJRMI`fw&06+T_Ud0&)M~aPA<1Q}9F63bw=xb%^ssU!k`~Dzd65T@Oi!DYM^YK2sc1JQIMNvHHl9KvBJU$nkzbL7$m(A*E|I=ST4WHCT+6m~7?N4r%6O!(v6WMh$W~S^ zMf`27WRaA}D@a=8TO=dW{VV2BWD_JOvKvwmIR+_;oPl`T+Wy>tM0T+90OE_hh~z~+ zL=rpNtRE0>Co3y|%{~9@~{ zB7R-nc>ctu*KxfV<0^|B>tqibb0QMo)5?WNR^)CZFOoyN!8YrCS4ZR*Bqh?b$hbr{ zLb4(|AUTntNM2+VQWP1BctdP|rXmrM8Awdz3M4La3z86d0P#hhMp7alAZd~B5N~hW zpH;r4j>uL>L1Y->4YOHek+{f2C;J33ZYQ`O^^Og<;y&XyzJDOp^iC$rPgpr0Nr_y6 zl@*?*lk%MfV$B?wh^GM=g8}o+C8ewHI;vHh;FQj;=l~unZ<}fRLk+jGlBqMS# zk`-w{aw5kgd6DTzQREuL8)aLci$p~7NK~YNBt(8eQX;E-&nQH;L^2{nketYoNM7Vv zq$qM85`G6zYEyp4EA*sL#*h{)eaRAk*BIGRLuMB*ZcA_wenIjgtNci1kxh}vQMU4qNL*xJBqwq>5w^0NMx*y*#U`(?2jZw zl87&IJdzT*7)guVj$}mUBRP>pNM7VOq$sk=Z|sBy+vkmtxXAX1FER*8iyVk#M5>U; zI9qul5*0ZIiHXcak|Nh4zQ}_}TI6LUFY*CW5cviviY)&-t&g`oTn~wd;;!A3tN9e- zP?#$(ModyQ zWCl_cxekf=w(9i^Y@I(bvY7MYUMH{A#y8{pJrp8 zKqALkS%^eMenny;D=kIqBAX#8k%36`L|gd~BrY-@DT~v1zH!`7D?Z4 z>kL9-bFGX*d=Vc>K44?cb#+9pMlvFIAz6_pketXXNM7V4q#*J=QWROX2NU<8?avxW zL}UvjDzYaM6FCBji?kvMk@JwG$dyP+puCo5aI z3rR+-%tz9zS$W^ZtYM|cD%26#1c|L_V+JD0waUVjclNa(G3nkm>sX|)wv}^`+=fsB(b@b6;@@hZeitLh_{uM0Z4A3l|zx}?p7L+^qy8uLn3=w zxeD<`<{*V3HfDjVGt|nDNNR5@E3ZbMhgsPg$%@30_N7Nz1E=e2rHW*nUPioAw`ix zknAWMGa88=Zl%e^h@@Q15kbrzBM#Wk{T;k)AQeV&K3Rz)gDf|UtB^t<6|(Ljrg)Ui zdIs^2w(=g5I>yTPh*wpX3YEPz*)2g#X;yn8iKMObFT|_1vMrJhq(bF5F_|EyRQVvJ zC^8z!)!53dNTS}#=`L%Gm5ULt!OD$DO5{N#H_pbqh-4;MS%^eht^9z*1F0~srPpG; zf|$~{R!1^ZY@LmftVn+(Kh?$zMiSGk9O7a`>X78|HfACcIl;whANldP=Mo3=!DM0}A^NFrsknvjCX=}7uy8*@35ImOBx zBz~%uCy<25D@ao01H>2k8cB)#fy7UYQoYx(JD#ZRJKJA@U&Ni@b^yMHV528Me+3E=Hv1I;_RHU5{c- zV!ZQhohXvN(8}&eUgS`uAX1NHX45mjeh9KUXw$Fzm5s|S-ROEOhCXzn8+tc zT;x|IA+pj2%#TPE@kO>rQX)f5C)iCl%`MeaumBJ+`=$Xkf_ww<5P zk%-72NK|BvDDxw-4H6gG8%c;%BT11dh%a&;k`lQANsBy+WJKOTvLZz!C$hqZ%#TPP zq#&{bQWV(-@!qlXa}*L0@sX&=iAYRj1`-#!3`vOGj3htYAjnk2o$b~LTog zy%`GsVyU1q;*z{t+DToX~QhV5}Bb@AQr4cEH!g{q-^Lg))Vda<#Jv@%A z$iBAD*+^96awNZ>jmaVfkw=lD$O0z^R&JdhwjRr8)Ta-#l?!A=kEopGcGNe-WR9^} z-8bjRtqNqXJx7%O`h0P;mDceMzE@+#{T=zJi2FP8F_G4`=E?C;T6h-z# zqP0O=E-T@BC~_o{5*dSJMOu-f$Vo`7&Q?ATNs3&7q(yE+3L?)SMUh2_S8pr-jYLEu zThNxs=159pD3TEwfn-I-A~}(1NI~S^NNSAj&vhtYhyk_iXwj_nFbrP?v})e z?103^m18O#DfQ+rzxe68RWOi~Nk_8g14J zTQSlJR@OzbBHJSQKq`!MFJj_Nw$5RQFES2EiJXiSMP?$=W?ScGSI4*V5E5^(@-h-@ zwXzUNw^{ko#Z0o|ZA~4KRS;ifVsMk*vr8NKT{%$%~wZ z6hy8^iXx99-nDjq-asNEUpl$j#w@oTASsb^ zk+jI|NJivEBrEbIk`q~LdsbOw8zlCs?ejiJYTDv}XdgrvTwXgwS9gaiHLlML`8ZHV4g+RMl$QT->?YY zcW;SA*R`@YlH9<`F-SqA6^TV{%yc9zaxs$I(8gSc6gRT+43gd0%0eWzsg<9QZszwV#ycd4aWdA`5t)qm$Jv-u zk=zMZE=GzX*CO$gY)lqOrL5#!mdGnE>kJ$7A(9jM*~QGTF+F#rawvm`wf{A=f|b%= zC`+7cvo<2DD6$O_`L~VP1&ND{MEtaksYQ|(1VZcX4?lX*ivn@8+Dc4JR3I#GXJ7BSn2T-Y?~ueLR{lnEp$snnUC!vNa!eXn}QfOQn$>Jn*(t}oli_gAEY4iB~ldWK9Ko&%(lKR5)s)JiHhus7c?ioA~$MSgTy&)cl!ccafD8zNDW!AM->2$%JO zt<&PNUbHg9$xBvlMEty!$B@JVD{msnH?4ezMBcLU8`ku#C(*ES}Dc;8rg2#Jdl??GEX*{oqmUgQWQ{-=#;L}E+z^16A!z52;W zO5{o;Ei%{1GB)cu#9P72M@YPfm1XuMtCyAak*vr7Bp*nH-Ma@d#r4W{D#RR2jJJtx zYqXQitu!MAk(7(s!p5AB8Nyb~dKxUi3#~10>bY#%zap+gsTcNs8=?bz@^T z6jx^o6plw94QX1vN78rsne_^ki1Bf z%R1f0oPqcv*C08O2a(JfHtQ9nDDou|Khwta7{+XfY>X5{1|rGnHtPVFC2};96FC-% zoMp34c6CIqadkuBOy|%59NKvE?@$R!R(~y|R*@!Q46_OUY11X9; zf zJNd}QT#ckf9!4@EZy;HbB9aqX;Xw9}NMEENG7Kq-R3qNUwm-)qQIRW=n8>3@T;x3@ zA@U=V6j?dJdWmd?q(p`y*-vbLs*#+?G$b!_E)xCJW?k*%b1RP`F_G7ig2-n`@@t#5 z)Is!FWL+dBvOSU(Ngx>!AIXYbh~z}>K)i2k>+_L_$cIQg5W+kA`k9zy5K{_R7$Yi7- zG6V5`w*9#piHh8d_#!zZEs{sFA_XKb@-0#n`3s5sVq0JFP>xEGwULC#W{5AcCz2L9 z8p(=GLA+mWTW2Ftk=aOG!$_#z1; z9S8&J?5l>DOb}BFn1p0S&O&k`S0H(jJCTCOJftY{8shzK$Mp#k38X>~zb7Ud#Iz4# z6tf|+5)v0#7fJqM+u9C^{Apz`SEpyhJZ&C{c)hIDyE-CMovdPG&USUyuyQ4mUDL{) zE^8et^N_-NR^C90B3~ii`ZlKf;fz9L9V8k^g*n`Ym{br`n!`PvY+@^qaI&eDu}EYy zE0bM}$azS-uZ_75Ns2t;vPAxa6h#&ziOp@D-;u1y%11C`A{!x*Eo|2INK|A`BpyhG z`8mqPY-Q`TA_`|dERh$HVt*U+xvMk4$}&eWKRa28B1w_mk(9_$NI_&065rX@xd_RL z+=Y0%*q9fPl*mFPI?%>^kHq)15;>YV6zPM+_p&iNAvuwKk-}gbGY0X8SecAuM9y|u z``MV=5pTGahmc4h6?WzeF6#iBRY39wTKUUK!pfS*u!16+BZY%(%Uuf&>hj<@a8IMFoPDhd=mmt|s zY}U<4J1p@@g1G_fY|QGlWUXjrYa}Z&7%7O1a#=lXRx1({ zIUPxgT!o}W<{*icY@HVoZ)GdrA(38zv^BPFSLL_V7uF2KZTg;dWUXaoBP1rWGm`0T zV-9vP>so1YG3!}53n@meWRTqURvtnk{jI!$q(r_zq62J9w|eS`tb!DGurYm*{7zQ3 zM-sc2g+X`rwKp-|UN-AUS9!3NF|N)&R$7td{#{o-gP2SZQ)>ERBqwqM;vHZsKY%1e zUO-X@*_cm}jL1@Bs4TJ(5ttg5!@7>S zfSAb9w(?c3av+^l=BK7>#@5x0j~-*QvScNaUAOf(F`3ae>n$W!YvmiHSZ`&yv2FHLUKyqhUS%Bn479;))8}mDo__vkS8i)y`LZ3Gx#yhW^RUu|4Vj@9IX$}uW zG9vXzL1YpVP22vQg(O8Tb8^0onS*3SUUD%P+L$j8{~{~h$1!6fQ6x6g#_WWoL=His z7u%Q#h%a&qk`cKA$%)*D#4oXRUUpd`pSqY?<(LZdy!3chFo-G5^9D##WM{+|8HuDs zT9CBJ`A8;^3awv7O!QJaiaT88Kq_QCLX3Br&3Yb52T~zxF)`U7rZm!}8`(c1eGu<* zTX}CJDpHFiMN&vwr@+}g*#>Ony zMCCv#jN)I!#BQ=#+aWoTeUNO<#vFs>AGgwqB%ZKx8WMfd%K3=*l$C3cxX4{dTI5j| z^R&%+&c%dMTUXy$-B#yipRqA-xU4s=e2f&|vQl()-nR0WllQEw*vv>p)d69Em<)v&)2JyOE zxeJMlJc9Vk*qE1)tjOC)YB?M8g^LmS9Vv<|=hL6%ZB}n29Y`lTv#PD7^w}EG4QFFvyq(0eMmthk9d37w!T85B0XBzKO%jRq{vVtB{Bv{i%fSh zLu^|YyBLuS5*un`?nM$J&m-}@ZOlTXAo2&29%f_KXr=N#R<=QkB7>3izBc9vB)gxL ziLTE6R?wnPdd zgOEhEjTzx&w3TWkDKZ&JiJXRHMP?!eksFanjjcQviHqcsgveqfDe|L}T3ctuN$doX z4UoLZ4oJGrX6=JS>#ZDtE$sz@j$6cLqw$2+!T;zKs zDbi~)t1Pk=k`dVl$%<4Vd69`oLF7E7C~`C6jki5~0*Q#cheSnwK++;TrckHR)>#|z zo2+c=q}j@jNZz+H6v-WHVj}w^d65Rhn_{z$b6FziBbnoD%ndH)1S=0B$rG)-f}~HfvIy}` zv+^4f5m|p4s~ia7oqcUbj33050!APik@1LkM!BsDb*2)N=pu%@@+l2%G;pTv^BH7C z1F2AX7BR^n#;dBDP~FhPw?RU2oxX*bVjvaj%p)d0-L}2}@y@og2=PU}K~jNKsQfoE z=^&;whrN!Y&J0_5b0_DOr9z#(h>4tUvkphR3#|A^;vy^OB6*S95r3wQndjtUD+`dc z$Rea5@{7y5#AdB=JpGwvWoslZ5=U|(372)L&6Doxtq-V^ z>>{SIxoONee($C}i1Aw6TAJMF1p0w=(z>hsg&W0xiTQ(=+<)x2dY(YJH>|9OBm$|> z);7dsyNGFQ9@EeDDc?nm-#poc@M-En>s3{ZwXL~6_kLL_w7v_ihcTrZ`yl=YU1yE3 zF`P+gzk$DwU8tNjVKlv&T*FUa2R(F+)let$aUjIF#o_mt1934ETw8&3GK$hT8yh=f zT#`4Lto-82{V8QlY-|i;N?9k974N=U`8fa|(AuvNPp?##PFioQEq#nD-~Z|&h81*m z3SGpw=FfMn_o`gS#bn%U1ThZ0EK(GC2#G|3QB+lpscmbn_R_0#U3tE%yjj;Vue+GO zL1owahe&>NE8jTT!piSRd`l}UoJgNVRzsp&*_eMJiLI?{jpVnnvWt^#tqgW`Vpa}B zGTT`>9Le^xQse4uZ>1UW`j@4Xb$4SwiI~JrHtRejEpjCi-Py+6gcL_st~|MhBW1#9 zego8I-Az{Hus|l)w3g0ekx`ZFxE?-CR{X!jJWEWhy6ZX%iOKz!n6HUR)OB6w7Z+0> zjKcMB>5~}O7%LGZDY5~Q7ugEQj<;EZketZDNTJcj9D{gGRwf{kKq{>A6k_}!#&y{{ z9f==Xu2UiFa$?d!jK{53+t|96mP{zF&fPAirRzE`5|asHya{y^+%J-PeH(&N9NXH= z=kW3sO7-Y=={+upX{l>}hE^OKNNa0NbyGcOqz-8q(^Sn#YH^3OwUpYL9}2B=Z^8LF zY->XK;oMFgQa52j^Q1bjcPI_5jm?wmTD-BLaPF~@Ews^C`I`uV;&8>AFpDP>A zPg{%o6<#k9#*oGTaV-dC5;sx}O>OnbP~5mE?BzqLZ>!_VL{?b2J;(Ew55@KQFM9Z9 z*u(nCEe$++_ojz2RBo#Ar+S&Na``=g_e&U4?hfy}gHhCvscUPcdcH&0gU#;wYACMt z6;j>2#bN8T)z&<*(VG&s#q-u`K0e&LDa_*hQ@T=*3S)xDv|d=pRbHRUg;47KiETW| z_2!0kMz_{gGiToN665-u4P)Ax+xL$jwpCx(%-&_MhB5A6o6}YY66; z20EGN!F>XI%yYkn9a%{u|urnk(9_!h$nqs?Ns`+ zm0i<~kyz(7R_7?BFMXi{<-OX7B!}Di zISEPaW9Ru&Bqw|I4kWXs&B`I(##UZK`d-5~F~hcgK^~SlT=8_)LMm^F6lJ$0kff~g zR3s}|XCsBZY@cVkESa$zkgep%orie)*gn63tS&wL7KwAU?ij^-XE65bY+ErTQ92_9 zv$_j%uk7ccNOoVFbre$QVOwuSJlXTpkr{FZ$RIn(?tK`UEp5GsL=UiSeTZabR+l=n zn>SeYMg+;qJa2;>FMD;Mi;?4NKP0!mZL1FXrF4(vX2U%yXyDdrl+4d@#H3_4&UaF8 z_x#PsC^;_fM}l%^Mf%EFy$U&A_C_n> zPU#(IfHZQQtk*S2GHxs1iDVwL@)+`_jP!k^kh3x0AnVC0|Au%6+L@1@#kEOdwnSnw ziro;O+34u=2xPE~s~(vm{h5Neua5J^*~oe_t5+lO@Y>YSTDlwclBMf%a9q4ZOiK3Q zPsj}EbGNgZu?_9mS3{yxt@K46mUGuC|*GN%hB{E@{#O>uaV>`cD;Ue(rE8VmOY1eZPLTuNJfsYosdG- zo{>f((Rp@1`$$%@PDK)&{W?Z5+tmrL_>;D;YMs)=JFtW7*zY0cT^Ys8$P027U5w+*ij6cKsxA%7oX1`u=Cp8r+^ZiT2{~te zhvc5KGq&P++zHEhV;v;9(C)fJ5xo+%AsdG~!L@Zd(kP>tiNxh-$|AYVf*Bi8*EVEQ zT~pgEndgUziOL+ljijVM%cQx_lslr;k&k4?Hbe??2eKP-uk?9;BreBb4HAvn)tTr- z?$G}2vN$PpoPTaW@-m9MkQ8lo#Jq^)o(RV7X6$36AS3N{KF5XZ-o8jq?qsTvyvSw9 z(lV~wkiIfMk0M366Mh?+A?v;viHx%6sGkw{)p6|fxPaEB&PGTsVY7xJ8%yO8NFtn{ z!$$0Ja9zzLFCQLFu8mq^qI=u#I{s*~8ViqG_cusIxJuYOu!clPksqvc|TT|QHKCeqmMpkf3BqnRIE0Po0AMxbO zKL$xIYb#Gg;$iEqKPMv@Ig4KFWD}cpCz5;79`6q#`D5&r`dK6`JG_9TM%p!9<|670 zv$8f4y~bYSh9Dcu`KQKZEfe&os{DLxikuIRC8i*)pMkXPWRIOIkts4`bCIlE`eN2X-oI~$cu||R2NDmD3)lLgE@qBh_c6!H; zimM}Mq#KZkoWmbNe3{k7NLp6sS7eq*k4t!GCu8r8Y$dWa(wDw7X{Ga~=M6zpAKIC( zaq_es`y?b@&REJDG3tOJBe^ga4zw}n5tH1=%53Bh*{kzhAvU-wJ9dACW{x=3F3b6+IBjXf#{BW<#R2^X`bU9UPMDLd+17bCNAH{yrq%&Liv z?%S~ZgqwYily`OHT=xTVo9y0hmvJW}cOa`Gi)9~fhU8_Q4@RP4<*LT^2es3s^=ZUp zWR=fFk}`_>k(@l4%sbi1?x;mbl)cJf$PVW^xKDFUTjQIuqrM_0b%dS6WjOZ~!}*z3 z#RKvQtz(kw*qym9F-bWe?ur!V+1B@SF;Clb!XZffaVs^5dtcD;jA$y7XtdXh^N^0a z!P33xwDzNx%}_pa?;_@SS&K)JvEkVH5AS(ozRdI6NK{6#>}<|sUf_fI^YeH z72KAX8DWfDuicTOL=Huw;f%SM8ss_|mye8+d7g$8*PK=hYuqu*&8n+ zN6Gc{EhHE8yvZf$yvggl6JQ?ZrNKsbsF(m$o-Qh1F9cOh{`F&(m zxHFv;k>RrLD_z4#2isNN5XpUHuU`X^gp6xnWPZ3?T;;=DouRf)8&Z(_jSG;R+_zkd ztS)2Ex;irU`G_a?Kd&RHgl(&U)XI_a1(K7!(fwNHP*!;zBrYTEk9;X-$bFE9<*8%6 z%aXO2jNBx%F&&vJyKW}3dRUn|hY@ug2=l|Ez|G-p#5^gh^DMHSjB5cBmmT#3a<9ZJ zbsa~6T;n!DGSb7{ki{~JBayURiJB2#uGBM}$o1l0Bq5{7Aq&Ehx^XQ;GVd{gHd6t+7ZxJa3F_Y~92CTHP=i`)S0u zW3=O*B;zXcNU=j6KoYWh|AQ3dX!;mQ$sX%*19igIT@SZF-VMj)WGIrA{v3@&<=N?Y zB)78N;U^*mS)FrTmYjcXM`E(;<|3Juf-`ni>1RGT_e#vWE@m&=);CB}?zL9Ekz+?% z-w?^jY;1$fmOF=mNM82pp$LCk(A=G#h-Bqy>MUfwJm1J7t21*Bn1iIG^;eLnoa^34V$%BWNSsm~SD96B=E#-feSj0m+7F4zkvq=C z$T4^#va}pcvye>A&c@wHA-vCQbtf^tVsZv}k{Hj6nxpA`B-zi_`4Wk5ZAa1L7S1g) ziWriYQ5@)Evl9aRY2;?@|QPs#`X{!nOL(VPJ5l_x7 zS0lA@RNjeXWM{tSL}u)BSErX9Mfcn2k6Z`WM7;1`%gy{gNKfhWNF*+IgJY1wrMB{k zNJ3V5CUS4sRx3ZO<$fA7Dl>nRt1Qn&=O7t*pE3_AJZ0~ZUO|45BllAzEi?85k`!6# zc6O9pzcxgYGOk?_U(a=jCoy$MA!pB8XCqm;Bf18ul~ukQX_Q%g6!{^XA2;)_A?_W2 z$MtI=5`D@ZaX%vqWG5_t2R-y{%mzquBYW)Zj-+Jw9*GoW-H%7&3+=cbM7EMXKjZ4i z734i+zO2R1NLprN{W}?{?C_nCKV<9)B)Xd&MK$uIoX3tslF!(fG?HV+I?fWexH_kH zH`k^|keHkkzCb*ABJ?Ygls@;$Qu#wW8!@CH_bo>tdHF6?tBaB6y{9`l%ht&tvt?X4 z7ZaX0c-L0l=#G>J?Vf*~mDf_t=$#l0dEyxr(x=%o!l&rIn(?n(=%P^*nJ%2A!EAulS z`BL`$8%RN(34e@SCwujKBr2m=;cmt*=Y&4U49SWiOG{h3B5AopJJ^Zrgf?VXsgput za^AQciO5>qhioP9o1R6IU)kOAJ+it~_U@sw^k-uvD%acuQh3PjpE~3RnbqTw%m((@ zxfE%WvEP6sPq0VRqew)q_%At;Gr)(4J_-B|$;kO<)q9yS8T-aaRPI-IMhZjho!(w9 zMy@ioE=JDk$04zBmB+U6!wKxKv9dESBqk$gzx$EJVHOGA)5u)OdIiyOEkcs)=Z^Ew zZ%BWc!{z4Cmi%rP66%DggJ6s-JzR%-mdb!#4Ihd z`V_J&qv^P}dC%36-Mid<%%SYnK8XA3I4TD^q4f?q2r0_UCy|`YVH@Jh-Z%w$SoYxs zNLE_E8;KX}*xyAO!z{O^jr7i!)%lH>RM=KSYw4FQJYRlVY?b?&c^Uh5h%Z;P1QH3) zt8NyiAUB1Tot%sG<$qcF^4a(*M4zGEj-=%L^AzIA_3L#cx~3gz5m`^JmCMhi&(iuD zNbWJ4H4w?jxuw>{$WNk9Mcfyc-EyDLM53}@7b7XTV|)OKOY5&APs%&HFOj~o7C*Z> z94Z}ct?&SK{$+RgI*2DTzYCIWvq_=$c|4*c^%+Hz+a-7O{x3@$JQ9G{PktgMheIOF`gCp0qbuyBXr&yOE zOqkhGw;=b*PIwF{JZjhdO=N-GM}2{0?ziWJpOA#SKkfZc`>fK*@=n+c@ufd;q$o2s z2AM9a-0HIEVaM6;6vVwX?pXH=kVtsH;l_Rw68*rA;#njwXOa(*qFmAbK!(em!wL`c zIPrgh34U*j2?v|w<;ruN7aBbvEX=^hiD@V%ii2fA!aAde-jY2qKn;kV4DYn_? z{F9KKWQU)E^pttN5OHhTvC4NlDUCbWKl6~BjC27K&DoKDhV%~Kzn2QIm(y|`+zdHh zM$sR+PF8s@Brj))@kmbIkzL|qqe(TVig9b4~8TR$Pw<=JU>&bt}ez3U?p znZy1_Qr@)IueP?6RIZUHktVo5KoSsi;$0Gx7>^9nm&Q#F1N?m2S`uZ^WPy+ zIZ{?-{&tm^4Uwpe>-xT^zca}bD%xj{0B+O(}Pcuk7QPVKvJd8jtF*dw|T6EjABisAoH^ul9n^% z!AMf(XDSkrtP7C1oX74$Jh^*+61gaxA2;S#k(jjg8Il=jXZ}~Dr|g8aALq;_bv8p1 zvVV3#Jh`{2a}tids;aiJv5JSQe09wHG*?GPF%$Vgj+ASWh}>B{gRCwwuOpey?cVqd ziSl@tWi6dwxR5_Vf8_l|Z)C0n}?k5(aL@`C> z8S706|WaJFlh^!~;H5G~OX1~XAK9Z92^DW39vJ>Va3Ax*OAGuC;)Q`wm*}W@0%e{nL zE4M=Wi|mUOq|a4|zQ><}M5oy~JRgb4+3z+aBTsH0Mv|23IKCD*k*x1rmhA9lpW`|x zV_zL9gx4l_q-=>a%B=2;{2*7op@=V)tB|E->^_o^v(}Z!3*pXmZOuU^%o>B*THq3=e|Yyycu%5NPi?HBi#oX#zT&dcT$HSM}_NNI{Q_Zmdl*|CK5AP z&Z}o4z2)k85t5Sg*n=)h`tvMOkmLOeBqv9~iZ5_qCvB~dw0}jthSGlq|8CbRcY!P4 zT{v0F+m4LVPYLXEz&<0r@+WEWQv)N~s$1GPGw^9ZH8uRe`WW~7s z1dnO)O{m{EaSR{IRl?GDkxT#8I(A}PZS&;7TT34>+)&-vFs-h(J$7_;&G_c}`qB$3 zqv=ICF$khlz6O;(&#awl##T2q)iqXCw~T46s%iG8R#h|l>RSGv|81!&eeg)BR}~|> zD%53xP7<4%TloAF2HMGMwRN0{o2Pd23LnKl-zT`wX=`n0ZsI!=W19K6kFgUf#8RiO zdcyyl!pBwozheKNY&$mzd|1an(wTyWrZN1KVqIs;5j0!zb-&qltfkY}OD*z@e8~;p?sbiI z6ZoAs?NR$njn%DfRr)%g8`M66CA@rux94@7WrE|m-Syz=C}rY1(CtlrorxcRZ>wr< z3ICISmb=;!%10nIx73w3<^P!R&z|s;m9$enhXvg(Vf(7{twC9{PUG8$S>Mt;p{lLf zUt)?n`dcAD=5X}H20o&$s|5`r+yrrvpqtvm_Ra)RZWRALijOa9aR*VAPEZ#;<5yeC zDb;ON^$mR3Qdhlb-`;*=E^UJUHSqt{ zh4yPO8^BF`S6y&d{qpjRuB+#;?J}5;g5nP0|5de`&+h872dw4)SoME62w3k1KJKhE z=Wb~H0(ethO6!HmJ3H#C3VkW#T$7)Nu~$vQ9@>=VeM)!q&zHK0K{-2z6O($>7dQ{;$RMTAA_7iH|olnJXbsA?2HT!McM7F=LYOm7St94D)qZ{k~@n*uj&j{+&Hnje) zpcB$L{t;cb@)o@G8 z1tJ)MORH_Duebjm%L%uciyl|L(G%UzidMN#;{0bsP4mRyzP-J6dm^8nSi>DdLt}VM zl^UsTtFEeUts2)Fyt4`VTvO#f1G02#;{CsQpU@HD?y9R;U+zPAyWTdjr774@9WiY+ ze)~_}by}h0)rRIt6(ij5<9Gcc4lcBZ^ZPza1!dbfqILbm^16#O4lf<)s#n z_-(;MHJf6d{FT|BqJt7G6N85_<)Bt}b#O(q<*WyjF9idf*wj)NELC9t6t_Fc;&6fBlr&23+ z?b|E4Q^yjO94%4FO>WIt9>BC0Yv##A>GPLM>od8v+WwP2^H9}LZ-qJG!czKJ?)C*O z@1D}SPjyRb-!(RIU3D{1UHgxhsv9R)Pjy$^PF@SPB=1jnz}VbUexw+3`^Ru=`?lFI za7<(KXfAOb2m6w*EU}S-!88T8Bw>6*(p_tx`$P+fw69uf|G*lQt1`9w(T!00sZ7ubX6A zZFK*Xb6QEti8mGr6sC5V*3H5 zWh?iM$Ba^8LNm9P%`N4Jic7p0E>mzC?X(kSIlGJtCc<5s!xM9Ph26}%+fVm?p>1mU z{Sn_>__uc?VkmnqybGx!?5dcAuhc6%qg29btP9jszw&EkXhXjM^I)rjWeCLpuJapJgZs}gfTEr}D_vlNn-5is>hR}og&kFH_zopCfUEUl!zV5@ zoW@8-F;FR<&subjjwKZf1lgzgPiMVQhbIcCCu$uFXi}IeN|Se3jjpf*^GJM@JrJ|c zPjwnBOsH{u-G@R;a~okIol?OB7U=Sc<3NvZ{Nyx7ru`W&QBh|>8wxH2wgvB&7Jv;mfL`wo}- zZHGbIVDMNQVEc`2aoI9|Sw1>(o^~pBrP*TU2T%J zU;#si_fnGZkPV-%(O?PB?M?+B+8&ON@334@waO;cF)Rh#&L7sH435$4*4lwMU#~f5 zo!+Ry%npo3%ha4&@U#m0dk@WNmo6%9ERF}C%ATc#*Gad9kF{d(;XqMK&A4mW#j9up90~IZKKK z3dWMPU6x%4&E`$#6`=W0f@l|-*QEwZ?>F||7|R)1j9dcB!02;4){m!;*q6BxY=F0V z2z;}9ShFH|aS%fGrGZ=yrJW0{iP0d>J|D(8U!}lSV+3#e$=RocuOc}wi~=yBZRUQ0 zF^U?iq6=r)bA_(vTSOw9L8*j86^so!isKAYG_IiFS>6I|9x7Y|w`Ow?50OCHwseCt zaz9-0GEKwqe#EypXhqZM3v^yFOs9;%Jm94$ZgHoHOfk7x+|Chobhh|&wnTsN0;tXK z<6bwPR~w{85Yb_6==5J>J*HF}rmQB3Fqdq{ub8Em*Ep9-=P)WSWAn!{W{-<6*0$2V zc$AVk1KTCL4`ED9U7Ouwb$6BA;HFTo)=Tt(3BllWO6*XuMg>$ww!15sudqPJnOs1# zh}-o&RtF3koDI#tU2#2c$qRm%3)6O}1Y*7TGt=;;JX1)m+$SjeEr?V5pSvZ-1yqJi zi@KwRI5z-3!}Yjb;>j1zQc{hW0lbKi@O0SCX=~!Na@kjKFbwAMn;6N#)f%=3V~&YKE>0$+)MMBdvu7jBqJ5+${C^9ewjCI=q%++h7GOz z5;nqP`govuW`x@lHxbFVuE{5!-$#!0=`55Our*dAL&ynXo`o5AR2CSaKLSNphOFV4 zpb6OxlY~hc=^z*OD7jTqu5M_=yeWz_bK0a;`8u}@ZifsRNq-*nKUp$SOs(fi`~#8JTR)|#Li_w7}}r!>>aKo(sKoe z^E+Scgtl&g^O`b}T5uXhLbPN(Ht$kIPHR9t2NX!3W89nBvfEnCv9WW_Q2A zB~(#-VXnfl*OT0~Dqqc?uDvhzP%T<^-ju&K)o%JNl`*M&0WH&_pqPWqijV}#t={=v zDUY3rcKZckZs75<#68?P4K?5x8?%4!{~%QX-tMMco&EMd4oGtFj5OCC9*evW)3!86gehDjctBLn zbSCo$1-kK&W@OxZ8x>3*+>VRS)YL-_=mfc=Mw_RR>b{3Bg+QtW?^V*lXCM)u+i)9i8IwM|GV$gVimah##+U974Z+Ri~4)AkzeZ+zR~#niBp98FG(T^>%b)ehMqbz(A!WmfJDyd}aj zUg|w2Z5*~tV)I#5S0~kNzOL z(Ix=#gGs{hHm{5lR8%H4>72P85b+puwR5=*OGxCy_xE4#xXMiB5Xhv zv85^6MfL-5Nkh8mRWq4$sW!s(S1slZ)lsl+1B?q)`*qFK^qLChnuAg(kx5rkIHSTx zdvI*oUJMD!;c@7OvT(veKakIbm?)5)vUOyvWqHkDWw3e1y@g~s;I)I|q$QV{nlEJQ zz=d63>4NZbkS?3Y%#~Fr2j{Hi#rOl zM~+cE%;iO_DS!vu)xpnM@Cz4Pw}0HK+EtwzdB-`}Sw*4aqr_^>e37kT zIhMgKu-~Oa%eEKTnjE)0EV601gX7>du59a^-{%Uif-g03obw6KpW|i$eZz~pq*Ior z$}0ML7pFJRQP~_4hcC}j=3RB6igsnpwdH9fxowY+8XzWwuRe0p#~5 zP`o~cG1z$dKH55H!zyWq_EKV_pes}`Bnr;b~qk3lQvuTjBN^xtAD%I`C*T@QXo)8&pW zdR;xZ@-^SYJ~!KGc&X9zW@NLtkKpCi;~~S$6krATlw7|D1{~vx;rM*LSz*J(BfU~h zq1thpg^=#qw7kt;lQn43V|8dLrfShrO^VT6TeSLXoQ(`_!NtfuqDI;-)1)%FkBOW5 zBB=*KRwe@EaA+$un1)`{WC{D7@`sd33hx6D2JRS)xi&1R;5Z9ChyRWog^$w>rGOhP zE_L}387rzK_)dAF#KS^u%g#lRr;d%MxHry#Vyp)ai1>XU=3mVikUY+&mDkZ)cl|hXRb#bROQ(<7CjNMu?TP8CwR$s_)=0OJ04Jp#)`epdi)c zC{tgx56JIrsGLqxjy1p}aWC;CA)Kr4v9n-Yw7;E)?RtZ62@_4LRZN!R2Nz9~#IBGk zK#OqY*!|nLpO$eUzagVlU%Qx4etj|=5@7==<;p&B+M;>~6DJQl^<8Gvsz~IDRoU)l zULWBy-VwF^PbG#}&v8;|b1RL852&-&W3StxSsDIa;;8T6rKcp&*oyYE#Qu2>LjK-;(19Dr-vox7=qti5qVp?dRbg;rwLve931Wg;0 zDt^?%p%H4dJnF(MxcC+g-qHo1h(%}>7ELK5aOpI?VZzQE5-o9a6LZFdSZwtFpNe?3 zlW_ihv?_$46Xd;MsAx>(#J<^r6#uWns0@|x(aGG>w;MyZpO6DTXRe%kOlDi>j~a_9WN$vK zti3J&+=2QsINt@IXcX^jJ*k^_p2;!!0n8}u6By`+73NR!6~Nc*FK)Ih~=A&;L=wc!8Uzi1dmc!^E|?HdyVAaOs7E^pO4cI zjU&;Rcb6BQ$$T4m)*A7%4%b! z+}4oRQ>N%gD)mgZ#aD!fVdzxz$;6Tu*LXYr93efi34(KP`Pj?rH#b=>mf627FiU(w zn3~7g-D-7b_ZG@z#Bd|9TS0lKmk69JY|>NA754-KiXmfy^++BQ_rH+DGDOs~EPs|n zGJ|Ugf$LH)8Hs-4rg`y0YhPPjYD*!>I%9BC=td&syKY zaFE$p{!C-bJRFk_{z0Ft?G~1V0~pajSL#a$d|X0Y#E5@^1= z!Ik!i>zWW^f#@Kvqa_T6G)yuW_Cpk$3gPvNZIE}%luJEAm7vFEX^-nGdRB%3s&`8} z+yAkntW9clgx?5Gw*10yMS5ca>uJ5d!(pLm^;ymvA7R)d)=%15X*GGypVGLB`%9}?J1WQWp5%vowkS8rE7Mfp;Hd)sU0MA zRu81^h5&E&zfTTRU86`_2-SSA$o1k8mYNq#oo0wQtMoGxyUIVBZG=6#cC_O_%0?|7 zU|WTBfNmAik&=g>SvuKsRZAN_(N2E|?;-s7>>M&HP~dF65%MFpOgKssfkY2uTf)!X~CLzl+0V6qx_i;kZR2WzFTQ?YokjKJ6-L)J^;JVT|A2tp+27X4_IW%T~C)>>SS^rvWFh}tzDK%gvyu-Z0&xgkpFsaiTq(G%64!Mw^9;XGQ zm=y`&hjU9%6|n^ScQGqQ!atwK250d0PEk4h4c^mvDsPwUSy6IJrw%$I3sxlxoS06^ zP+CAE6G1sJp>54_7gfS2SW#u>>HiFMm3d-7v5*A$Y=2Rn~snSgQyR`%V%Bc=2oHR_ zw7#7n%R+J1u(b#ElFeS3)aL_Y8xC%RSv#S`A|Oz|&})#go8YwNdp8>4T!~{!=E*@6 zr4pVeF(uWl<{f?cnx4DsGA$L4mCy+k3$i8dZm)PrTRWT@C2ct?e@n;RbV%7=3DnxMyDG9nBXMpm zovUFqcHP=+|CQiz-?HeC-Cf7PCp~h4B36Xb3Zo4W{G8ew?7twb=D$vkx_Wnr zvWT0LTkL-@i@DnDeGKYeu4SQfw98n)EnA&NIwd%JK;<+$dc}=PCD2<0o7LBE@E<~O zNe{tOZ(-D0Ragu?#&X-Cn3>4Z`b&<7~*VJ=7J*L?pb-$>Jr z0G@aRpTRR)M50RbU}yGqwvhy6_h9gKR^a2X7&x zIyufDI_yxGz>EnMIPd0Bj(w*{l}#H}f-ox37?FH13+>2P8{(oZx^hZh&L~k3w&AzY z)yv2!EbH-o0Y#m%<7Gkm$kIUiJJkth=nS1i47K@)kXGTN;(JEC8ifIm2%xK{CoBqb z9EYF%YJ=GR`To}T$+tV5tymj9OI~bcZkHZP(0uy_-FlC8(i7Q#t3hrxBR%+OT{1aM zX4f64_!kYTuIQuKB?dP&8x&5$ z5@2;KN0>_}>^9AQ&P5-v|R3CsiL=TJC8 zs=>f(7h|?&wM;DKTbS170c!k{S+;hB53-JR1ItL|Yta6NikW%>O>t~PF+otHnX$WK zX5p1_nw-mhE~qDVj(onJN&FsSVk+^q0AO=OpVayseUJH~jW zsm{^imY6@Qqx9$!ZkfQl8>)$3h>X=`M4q59Cz_`IfokRrFN8gYmy$7W*mH~8U^Ur2 zo9j=!D$tbF;c2po<#SnKfVaoZ8mR~M zj>cJIs4W-wm|$p#m2duD3zOZv1!=Vb2yLU;RCAFBoB-GZS=a>ta*N0o^E;+=Pe+9^ zr7#I@YsP|S9Es4K;xJS<7-#pm()cg@Q%P_|Tt1*iHwm^K$b-$y;s&v43kNg>AV2*; z2=?z|b#te!%F6+XyF(K93^DEwK{P^^Ra4U3OWPQn6daY7qO;gviOPOYb@6uA;2+6E7e>Y1}Hd;!yUT{KF zdL4~tX#{0ak5UV@@TuiQ7Rv}^9nq8PDw5Ds9PA0g&5A+VYU!0l#GX9*=7m(4czP9ts{BhVO3A?haWrpEy&7A3S~N1D{g)6- z8z;Mvml)JrdI`v{fkDDhm63J<=h4&-~N0;ME^PbUm zaa_2taiga=0C=II!MY-DL@mlk{1^(>5$D31)s)5+Ln)zNG#Lh!8xR#Yt_*LjR1nTZ z&@s1j#Wn{#cyvJT#Nd*ksv16BnE^OK+GG=-CCxtwe*Hffv3!cIPD`JIt)VK!dRZ(xjmwVhZ05>yC!ap7cGcy+8fzp3;*m#B1V&hiY z{e$4k%Xjdn-?ua#XkF_7K;zq>|wl160l}WHr~<*!$KUV?#YG3kQM-PHns#TMCqzd;)WB z`oQ%D2br9gYl!;+!@ot|mf*)t7%wx35>LH^fk^KSn*eBmmoHpT^5bZ3l^Mg_Z3SDr zGwUA-H*1@?ngehwizx$#6sIB73d;bmhD0uGxu^^Cjy_CYfbv85m|z6z+udV?(gl*l zlgN092XudlNc=Eu*^3DP`};pwo9_@*PiRi5U|9jsk?_hwD9p%YfLtkq7+bX*sh%GA zK*|*^Oz|=W-=O6F90TX#0(5gtX?wW32KFDN#e8RbXoN+4`~VaabsBVRG>us>sp9 zy-+l%-e7{HHVG8BzIea|m<>Mw^kIvWf@Z>#XirZoJgil+A(-?dqE!2~z`p1G;`V9H z*d3rkIr`$;g;mzmf%}Z;|w_BszLR#yB+G z7ev$$65HomX(rH!@-Y>*jzrPv!9iHZgu}-yuEnaaCGk#fNl^(?@?lpC!SCFvNYca> zWO%?ZrEtnvk{;Gig!r9#AXzGe-?|HjBO%Cv)YS$rs$b7(N&^6)Nn+24)YC`mT?&34 zgG^Kz&RLw#gJ9TLWqKt0l*KjdIN~c$W(01KPw&Dx51-N)p~oR4w*+(#dnAn*Ch$;8 z#XxVUi5L2b8!lLycssBp*U=ziAS2r2{BdP-YK1*4vDy!TctyPj;uvA2w-Q4r@q}c! zsMyou5;h-C4ayi%Di+qZirGS~!MjZrkSvUzn_3vhN|F?UV6K3M!oK5I`=hKfMz;5e zvIzf~Cxmu>b#jV$U6^8S_4BiKE(H2|YZSI05m=tg{I%wLbx#{3z@$_YSf4QdNW%_f zFZ(d1Bdwa;qAg$n)kqPsrE6J*0As<}8O0J#&!{@K?t)@?g9%UN!HQQ-$;`ryr@}JP zO%cxW)gmjen$=htWrgCx7(*q?{XzxuhJwrmqBJ3(dhoJSZ5lQh+8?=LyQ zrjsqU$jUPSU7b>65gqJle~*j^i%z%%$Q36{0sr;~wB@BNYHs8iC>t?rW;@OAei|{v_ z(29LnFZm09oWTReA16=(?I#Yu`I4~%IG@&^E$(55$;0w(|3r_npZD93%Ud3yCoTqS zDbW3MhW(o3W{CyadjN&XzoX?JABj;4pB<9uI-`AP2b2Va^DY1kDq9n%T}_Y)cBNPI zpV^a2O1+OPDz2o|tfUMPYenssD!EaMu)6k3Kz3V<6hdus^aT1Dez8}pedgOw8ew~{ zKD?Q|JATLUUw+#{;|Q)8&@c<~ZnLVCOsE|6N6<)gYzj4}ToL~`yA0D1Mxv#R5h2D$A zNIU-hZ1(Q8tp)zumOM{rD)--4(lIjR=<;8t>^cS0zHQ17bG?ePNE8}vrs8^vX`}-w z{aO(sPH6sgiV8^tA1qWaIT-#8wAK4Ii$Ez)F7M$cr}~PHS6})7OJs+!NETv(ONs~h zBE<0Lk3YrFmp>QikNXFLKHU6BqJ1Se2O6KNZ;#N4$sxn=9`^ty%gyo8?6>1Te9fh< zvR5JTQ-iRA83YX4H;$Gv2c4ul5r>cebgj`-Tw>O9Zjc-R8DGF*WK}b8)@T4C!QB6u zR#p1Dc~%mRfQ_6_Y+Vni2T(Q%|B9#U%hv(k$`(IApA8UT~pY~-9 zOxp8{L#RjA4GhZihfvZUAH5!>Zs6~ZFMmCK4OQ!Q&wtvEnQEh|w%H(RQj_AFG3Xze zKp?Lx_07fNlRpe1^|K^v)=Dy#m(Q&93@WVS(jlrCwy4>gI+VkMQNpL0>MwWywHi|S z-C=!swZWrZs$q>^>9odk`wc<-p`@0^xnIH$fvK>ru{_#Rhfv$y4B`|p>kN{bc zpIu)KVNkx*;y4Sc!f_5WR@NIKS_`^WCiWSIr8f>dD#D&L(mEEt-h5jFh@~6H3K$iv zBkj2vAVO;T10cx@uuSF`Fa>i7(ClaP`|k{q^Q{AtZm<#<}4`IqWr4$D23r+^L3_$h=kQXyd3>{4md4cJJ3r|Nj0tB~TD-}CYE7TmdM0}?wBm7Z-0e zim-XddBz>DkbK1BO{Zta@5fPGoo@H~tk=u6-f`>U)}^esgjQRckU~)j?*TlEY+!Ad zmWsxOJbIv4?!|1a)i8r)5-NnOeN_q7FzrW$wF*PFBQant4r?|ikdDfsl?+?U5i*BX zGB1)x%J|taZILw-&e)5~O{tv&*$H&`+#zaiv=Ywsx}pqNiP)%Qwb}A5h#Q%R3P*48 zX=KTXU}W3*J+9uQq0{7^A_xvHY&&;k;hX?L!(rGMmwz>fg>h^+uyUiwDE;B?c7HPG zC=xkes9nTY=gqB9n%zplMsRfg$JwP>%%E)1Fl9=Z!zoQDVJ)dvLI*KhM+F7B2Wh42 z$b4k-jI@wH-25=JO$Ez9#CQ62ynFq_%$F(tyyVMUQdF6;MTy&mk$gYad_Ok%e)N1X z<3O+A!K-hv11bsOL*rG&)|rb_V0B7%P?A`kwI>fW(%dPeBu*g~nE`VIOp87o-gy8h z+urAGq|RV9kkWMpqwl|deDROj`SJhm6=(x-n`2LC;O|h*-XH%{Y+LFAZe=(+f7{6r zkWPjcEExh+IAYm7vpvvn*aDTR4Z)T76mAG_O3_YbP)Gx9%NRkihz6WXn4Nui#ic)2 zBEuT)Lj-tdVBw6FyKAA!XbLxkXLf^PK%QX@{~@BI7U$;+l>V@-4Fl=~YKj}cTiQ~M z%RG*7xgA`zU{Qv%edMMN~b8^7} zFs2$qoV_~cZX=Qyd05jO=eq90{5l{KCTa_7Wc{grn3Av;oFBe_jeWTsuJt>%8%nIV zi`@8ZGcXqM%Y0>CWQ@t~CbXCWLsP4*bR?~_GcG=^b!&U3HqwrCw!fE=W(Ax?(?F7t2hZni(aZ}c z6tu;tFsFydXEUn64L-}$Quy~ZY0fS#hIy;74H{th#ja>9UvKDTp?*Q3sPTHMGwHSt z{*;o9E-2ZQu)BoY3b@8`rceErqZ&n_1UsF>a4_|R>#Zt1xW|- zw9loV)zVDr*r|5y7uAAmt?vm)4D-0W3vkSBl~=G7ZDmid0Reu9s^Appi8h%7K97_VnTZJXgx0>G# z3nFU?%vMvxH5@I0<7E!J#~l_4{HBwqCMx{)I~(}rPdJrd^jjh|MmC;x;9W%|xT4U^ zN5ebQH*}EFxmWD;;Vi=A&TXtD%s~L{u;FqOII4?NIOgN%Cw?-ct$<$i<*(<*hp$ht z)KW-y`H7+$Bs^MRr7DYEgImLe4p!trK6kbYILp9sb6*U>H{ax+7?*>eBN?q+=HchP zgL2q%-zg`PjFyuLrpkHu;quszs=bvBB8JpbqdgK>YGVsGkIguoH;aBjF5-yL&xrgzxa zy&-4@{ZMUz6Ik5pL(;RI{;b^{JrTFJj0zdt@d ze0%cmTuOz)>{Sygpvs?wO|@$HRN|6%wt^2!mQZ4luwn*0D(V($ z68#+p4Qo6D?HmlqMufUUT_&0jM<4>o(FrSy;HJKz(-hAJ2jdE!-$B^!aOL#M$kjHA zjGCeFfCsf}*vd~jiog(Pc292rMupy=ysm769Prau|92FAjRPpW5p_R6R)DRcEVsgf zGt{gK#LBiW@t|ro(3&^$r3wTn3!h*`@C0jxc7&DK3(M8ENFFST)I*8SkAFY??fCUr zOZTWO@CdF5K7wm2&=FWg0@zn5;7!E>IH+JCh82B#divXkGZ`k-k320EDg%~0WY2(d zc`XBV?w0{*oM!Midw_k&**w;81`-4BZn3eMy<>;lU-PZeUtFG^o4<=_ESblOL26wr z%_j4xcqt!eVk%{^=Y?lHEM?%~wt_O*42V zx=k-}A!UF!LHQZ`oCUK#yOxP3RRQ#XZtx^#F259#R)^XUWRhExjRO`Ld_m zdV#qHCNT)SS*)LYC9<*zT<ArgF5U{C<3X^5zd1 zX3r1b*$z#GG+=DxOxy+viT9Jb(&KUmY;e@FHvYrPlt2^0sLl1F`~=gaoD7(bWXVfP zLvOFv$DU6uP9=_=3|62mL-{qpqzShOx+=Ooq{%?+g5nT1WNG58wWBdM?vwO4grMJrto$-)-iLF876f1EZ%=HE~1Fdy&%|r8&)>3Adq? zgPYA--X+WluVB1MMHY}{iewVJfT}upSYTDa0`e;hrBojlwafsh#27SX1q(neEg&qb zaOFf$P7%eaK$=voNZ`AV0B{wJiITmD#GF+erb@M$(0s@Vfo}wq+R(Ys% z^eZNU6x*{f=oVN7&3NajFbQjF}n^Fs^?E~=t*j; za05XV_ZonVocc@-=I0PM9*K7Mh8gX7CC`Zk9ja2M$O2!lz{YDK3@xe?Q=G zfu3Njtx*+Fn^eXQR7(DEaeV&%6o)`Io2O*`DF!K7GF!&;V;lE1RemXFO(~-~lZi8X zfBM?barR!HT)=ti^yK|zZTAG@Vxg+`ur93;B065Vc=k88Gne|B!M}J1>u6MZ z4=bggTwHwMX;ft@DMr9UkT{Qk#k?{!y=SeBC+py+P_xo}4S*D_M>_zijhz?oKz=Urp}$8{tGreP1ZIAX24lWh<^hpUCW@HnWcGE zdt~A`hMmlp${NXMUD2n$z6D0WRZgsHvkw=CzZ}obV9Y$VB~I6w8t4FG^7OeIIo=(f zopDl9VJ<|#LSOV=fcPaiM>d<0gX%#E0JZO=^YTns&acltoS&Uu9CNl(zk@P-J||!=k`*|W1Kn}F{A8pp@oj7Km|%8F zJO32L`KfI_sW8y>JZF%N4$*55wljGioE}{sU(U?WVQ-5GeF)_=fAO#P$Cs`f#c%(s zP7=RMpA$giz<%lfmDKu+0j<$6gf5SNIX>SrAZHcmwWC0qQyZ$?{R+BV!>!Udd!zBW zjdv1F1P8D<#n(|=q0<$>Y^PvuJ>BeTwX(yehM3S9?mL$DJ%0b;9UM6>k2&bP&7)GK zxdSjL1Rg3O5UXJkfO5$dnn-Ogq`4e1Z0L1p_mB7N4*?8u!_sJsz?nCq>-x!=()3y} zH1~EriKuJqxl2H`%3HTfJPiN~`5ZlINjGI<9&p*miGxP)`t|wo#f2zKYWDspT0s-N zc6qpvrN?A=>y)kFdpO(q+xZ$#&~S*kr+20qSBw)!qXu~cAZM~Aj%GR=L32lLI~xO+H(qU~eU?3+< zRJ97FmeyU|GlWnBq}qzqUY7`mS-SFM7m>ovKI$_lT=88#VJRs4X8PjJb_`=HG1ZJb z++~}xc6j?Z*F`gwkfVrH0efU6z6B9YL)97>nBChAyl1KH@msG+I*^d7)->;+)3Bv9#N8w-J9UhG!=<(a5#O3gHrZ&dE9K9O?_YZ!af*-wViZmuDaR@*9 z^$`CKUO;d9WB=ugAG>1Se|Y=01KCYkyFK5b6yKzSz5eyMgMexP<1H9OrGYUs6SMIV z1+pCVrREiC{&fl^rKThQglo#&v2@_g?e!>J*SGcE&6B`tTsyDdWrK$-4(k;MwC5Zr zlq&G_orN9Bp|8!XzqNcM(BzO}W4qnIVNmP999%7+Z`N?y!L#eJoZu84BEd0vHBrNgtDYg-*k z$uI>n)EVgzl7?YyaG(pv0s=URxfz&A&9U}mwyu9!9SEI^aSO!NeB93yACSD5eMu=@ zDkDpMfj}@JDz-NRp+PnA2svDcNso(VW!4h_>L{O-*KdN|iO=+~b`=T0$e-d5CC{ahQsEossHssT4gTj~22S$3#AlyelCIGgYdG zvL!N%d~g3T9Hp=Z#C!!H@gswkQE&~RbH}ORj=c{p(IOqs)%+=ZVM*f|ok%kCVVELPCI%W_0 z2^EPqc$JSh)-nD3;=d_k`kBE^PK_iSqy{T`#n7$Mo{S5qD@sknV*mbt*~)I2DL-47 z;?Qe8)C-k)q9`iV#9wkzk6VuTb3SqCNNLC((3+X zWK)B|7xT{QDz1^mB6Q`fG7(+`y)1dS)^*QEVp2CS+hiLe6I0*XiI>tFPRC#c~! zwpy_TQ&L$xG!liX>B=^^3{)b0DKsBkb8$_gN9$Xe9$q>pVH4!`A*gs1m8S)nLK7`# zYmN4FgDr=(<@YIAF{jej0%|GVbf94eEis9JRCWeCD7QA5XolMrHNJHhy&F+#8cpnd z$rLc@N#)*HR6OxWWDIFditXZFS60|zwa^MGaTIya7T=goeAbQ9D+OL^yTO-uT5eg% zroY0b5xk?cj$nSjM!;jP@}*NlZ)jmrq~I>Jvyrd~-U-Qdk~%4TlDR0_XR>KNeb1K4 zn?_@GDzks@k&G@Y4zZh}gXt(7l^7#e-8f(S&RTuiT8TNbQgi{U6g``JIMZ(I2<4Rm zigO1isb5(1(djaqO0ijBOHdccLRq&L(Rm6NMdp?tCOaGX`(A-lN*0H`6uSu$WKGf~ z9YamzU>PHfNZoLjEV-!MmPGpaiLW+DGqOp&U>VgLLb-RXDtt|u0C++N1E!l$8y^rG zrNw+$nmAlSTuwFaAftE1ustesv}w;k69qmCuSGYr$Rr}T+xjq`>E>e#XC9ix*1RLk zK=^$5<|A#xtjIKm%{88<$CNKdayLab^$D@3@T@O!-c={_K8JtUrhCiriO4u3^u}X+ z-;5|#$iPA!@?-q)ouGkyY>+7&MTmh*1v3nJ_7D*~GwnOTB*g7$t5(C*QueIZyC>XQ zUG47hc`^R^5}Sku%`M*lW#~~v*B3|~9S26&is48-Y)k9FO9T`)t! zOIsbTadMGIDTK67U?n4L1SVYljuwiAB2A#(+HT@3k|BF&h;iVdXc$KwX`w}4>}vT(u# z+g1m)OEorbi|cNuAV7@eJlDu3xKq%0~wTz60$e+F#H_RZY|x$SzQ4 zRoa$WK&BwpfF-mJI}Hxf2BZ;4re{$WxgJqsO;-_0gNb_>3&JuMdU_o727a^9qs*Kd zntYs?zUVQoFa`yOWHSy>vBd>|2gDq|k=6oc(`E)`TT>73^V>bN9tz76uJq~e-=;4|2;- z%|i&EHAB^fb%x>#l2+C{~TvBJ>WmDyJ(3oRcP}G#;{}5Ohz4|VaD3}g5#2p=T`@Uk{;NGi8n!J)Php20ug5kUW@ho>0=#uQuQ3em_&N4 zQlGiXi;=WNsKD~^ojgIK-a1tnxTIKLs9>r;eWxOaF}Maz-MUEzFYU!B6Nn8&>6G3G zFoqXUM}cIb|klO(11y?vSjKM~k+aX}jzJ4jg*Mbc*gmPBL zDZQR|g^WwQxr&`aGKjKCr;E{e=}Q>^y9q;w%)Fz)o*fG(&zeh=Y9unUB2o?kZQndb zZkSBZs`|F};{x&3%``E9dWFs9TOSiAlGq!^$imZ+U)dr?z!_r?MudH>5^_S&QA7b@ zOHG5FJ+mYzhYB`1Jdo+qX5AOi4*QBz17Q|Z)`t^xM<|WP;Q$?Mf#7vvEdWB=L$Sfj zHZBn4=3>u{KBc1CY@TsuGElor5t`z_ju0O62 zizV$z>W093LphCLI4xu5JprT7Pbv&-9lwXVH%;-;;CAXG9C7e+0jHML$)J7FenP>M&Oe|t8K{>=XFu(Ya zTL*195!rD;T%6>?=fcL!0ZSV?`=>=$hosEsu3;0d31^0U`z=$c1_g%h%?`nqqXM7j z^qCkzaoWIQf)~x~u{F!!51!QTisNvY=&WBcx()0Miy3YPB4CM@Yv@s#0B2}8Y?x-O z{ezs*JfjO5O@>X}wS#bSLxUbfrwsrBj_g*t$!WckHgddG$|&vz_WqIJmv0dj*`7ti zu>XAUGEzW%-k%+`Njywqw1!O?2l?D6+R$_3#|f?F(!wak%TYSayXKDD@f?G;FylFd zp|-=q0cG-2{w|K!SpOrW2MuIHwM>g zWYk>wxw4BT6A^_HvG(wkaK;u$O9E?zGS^E7s!I>!GK|Mhp~!TYL2i(|dT&tbAVoSR znxb1Q<;^61zd<+WRAc~nSFW^l+=3|08~|2b*>L^Q?uax@__-QDSHICrsb&vXelOxt zF>}SLzyxAl1h(*JxSi0Zmj_P`et9r&(kU;u;U;a0zgBye7f@>K>CC|6dl)F)-l?sd z@AN2a<&d_t8J+}qe|h-o?Xg+^MET+U3E}`<9KQANr)Vo{Arsu8oMU4H1nbnN2FXQj z64~d}{STGwtW6+(#tdaPxRobP(3_H^wl4xnK;m&>n|)3Br8!QFcZsvp}q$!|Q<$y_SH)BNrL zJqi8Ur<-P`BbFF|V>Em{`?x<(6PA!>W~3h6yHyHC-7dSj&*pfc4hO zFu}yIrYpk)YZ;bBspr}w#JU4k{ym~C$h<0Z6)T0fT{M6hPBo-xE`BYG0hWH|9Zx8>#qXn1Zl+)?A zc;s|qaE=(pr{{m9)_i@^!n(9GYiMjWDYNs%@&A4}et&d4JAD5~tziRAw1~shk{Lh? zBo!B!rIs*8m`@bm4i|!2)+nMp_V+cvxFLVkM;}Dyi-Kvvb1v zD9;uYIap|lc)MKOw^r%|ch@gL22%Fv0x& z)^wQ)dBuk)5`~BOtOQWZ5V4)<*LcRZWnqvL-rlMiO46{2p#ge^ui!`Z(+{Zx6N$F( zTb$^AThF#RCnCZF%bY{$DX{K@a(KhcR)D9&N`za4L(#W@* zxy`uKfM9Xbm99*-fkZit3;TLbfh?f+#9O1VF`})xpZ98bk~L-ES>Dp7p@~~K5ekIO z(q@k&4twOro@q0|In?fp1(`pr4!Z#Yg3rF-eOKBLXc3IxX0TP)+93uEFCUX+1ndts z0U56{F&Bw>M#Qzpf2w=?Z*zI{1X??2xUB#bPK2;~%0JL$*Ik->j(l~)e-;lftnZWwot?`q|s^3hw9SpGFfR_E&P_EmUG)f7x$D7;q(&r)#Wr`rArpW35WuiVD14b9Q33z#P! z_h-2L#8E_ZEMXk(f-kXKLVWA8rzaAdGHw9*lddQ@(A>`WOdre_aO5Qz4-(Jd*UE=# zoZ0T@`g8xM`upIA`upWU`OT2Zvy{hPF0&HXco9tx7gpXg+i;?>7q`o==o1CC|I;)M zk7!Nhn?K^YMh@Cw6o477yy#|HMzHbJS_5Rmg6*6saQO4d@?kSuOCs40Qy^yeD8%lS z@nD6PH@%Eze3q+4d|^IxX&va8XuPT}zYz(eS{9HT@wf@+Qg(=kuyj~q zZCYXKgx=B>O2<1s@vdu=B|o8P3{qE8&KP@}n*MN>J%a(F$X6#8<>u<^q z4Q2Cf9Wlm99bKa&<>xR%^PSg?Xt_r5+OEn(3eWYX$t z#51ncZBqT0pC=HSq1L!*$bi`$J8C)5I!198Bfral>2c9B(VHovQ*%&9ix%}(&LD5n z3`(`2K>mJdUkp*>)$dwxy!FPjj<(vM=C#(PhLSE-Pw7-QrKuI!M~627UwvUKHKTx` zFbI6bdHQno8-gJ)Iman8B8$L-?z&AwXV3TrT-B^56!M&0L;3Or)oqfdNDP1Q(1RBY1` z=PC)|x@wGu69ejo##l6*{!Z~;e~CwtLQ$gW3idQ9>{Da$M1hRd4FtDlEo8T_+YtM zKEk)maht^*;%`t_rJHSBybIZ_6+EX`dhgB28MJw>j$aRc{BfTF^{`Da^}9m2{SvHf znksJnlKTqX0J=#`*86K*WnRtJ2V=mO3CN?*$_~5poWeG2zTxw`vn?Bg8vs^poP-;@ zQA_~g@(fqF9kxuzudTYe{1FMXK5uPJyN(XC_b+3D*mKxJ86CEO ze0MNV&SUTOG5t8C36$U1i_^M*?V>;nQ}$jeabr52B``6^jR7GaIUJqbvR+>y{-{5? z&7$Desp-21YI1IXp`PIFT{;$`l8Bsy;q`(_OZmP2^Ui+z1K|)GDge3~R*kO>#&hu_ z?XWxcByX#6S3y$0nDY8pF~Pk|Y&ES+@RBV{kJ%7L;ds(V6|j;-(gt!Bg(P8+Nl+R= zqcF4IddYiy(IBM3&syt9sM<=5*Zbly*C7+C-T=g_0W7LK8o-1+@94={ZU#vlfV~%z z$WEGDii9SDZNvsNmg>&@%?Yw?O#qwbtVGtHWPrwa{i}FUR<&I=%OuF(QU zA^Too$d1?4$%r`e3ymiX!wgtF-1h=ga)^P&bgrv6v<|dzgtby-DzP`Lv3!6d=Zr3u zIIReFTlB3VRD;JTv5KOBVeZE^N8d7XYAj9D*tcXifX7eU#3l_Fy~69}3I>W&LmFIR zafvh*KlUI!A+A#YFMMhF&IKJ1M#QtC*?_X;a8pQT1~%_S>~9G2M}OEW?Px{58ikfD ztW>BkkV%2V;6se9*^!zkv=G$~O2`o(pm2M6TW7*!6i;J(>C~FhFw@A>YSR{yGjPZr zAEhzOQQZKXqRu!@Q2{ICk>-vSS(G$B1IDurVRzT(InNM`PDWpzA%bnH1{lF<$mA^c zQT+Rtf(;5=Z^Oc%PywjQ4VgflkOd?l%EQ)MU>yZY!zPgI+TkeQ>A_$SOn&UW5 z;d|HfyEbVHV zC6c06s0E`1H?m82OY{Yo5JiPFIwoylrU+GMt61$_Y&%zhJ{5b>%!Up&B>HMrddVlF zuFarcl+>caQ^pln->Uw{t$xh=zDc6CNU+l;m98O9aF&|pbtVsSi!FgTk=I$8eDo9q zmIvrsR<6p-P%B^n=3=nj`}MciZ=gQo3I=9KPpo-n$DqqP;M5#YQeoQ{;KU8dO1P0- zzu(AhKtI)-`XvK9%_sQW0x)|mN7KUnM}_;KbKrIl37-7(`D*^g*&Njc{IZ8Q^=rkg zGK07QjKdw>BXW}hwvIGt#b&XE`mQsK6EI7T(Kb-pE_tqZ{>Rzn>Fkb0nY|()*AL{O z_G&?xx?pN+VRP7QT1Y1-454J#3F=U%?L=yFjN*LWZVTp-oz7L@3=Qk+^*shZnvM7C zi;S=nk2Da&VZ(OS)Hz@~3veP^|2C=`NS6an^Yj}&;Q0W5Utev@@9ksxd0&5m@&GwR z&EH(bnUlY_kLBmR{ls&pg_^&k9G1zaP*o;8KVZe+EluCSr5jB-_;BgpQ9Oj4-49*b)II9p#WaA;!oBI~B4b-0hMru)XZ!8p)5 zb@b*!+YYN&AKtt&M$QI7kZ2&P#8;-I&)JT3e@3bsr@Mu9ik8UBH zv1Tme{OAWM!CblEY4Hm0&b=;A24w(c&1u^<$ql4rawSOKhjR9IJ>e@KGYL~U%{ui~ zXhs>eeFcsa+;W+nU0m4f?)E%b2Wpej7CMkxO@%17A8tI;Y`fj=6&MnP;WD(rY+)re zG1{H^^XT?)36;{gJ!3%y{>ADUQfBBHP(T$km|Pl^OUjpFDCZQe$(Qm#)2(?BRydc{;#wKzPdEfjZ#((RG_Ym>?$?4Ep#y>0 zc*v-58NDN=h@)SYh%{;{7b0qZZs9Qqu6l{|#r(P2CmN7DG1Sezy33)_^&}?g z?VN#ShPfkTPlrLK1{2de1l576$ODKoMm-cPt9OIR>y6dXL}1RG)|Om3wT&-*PbDy( zT;?0B z9_8h>H zZ71a7mqf*cFot5P;+oA_d_yCgM%6lBv)Dx!gCD_g#Y@NJ5F(sn~vI`o)C zO|?3a3a&~}>fM5pRE5ICie#Rr@Lm}+bf7k=T}TJgn#C$-_{o6R$zFpWa5}M*STa&i zfgMIXN+NzJXGzo*Gp$|5N;D3YjthRD`Ff)@Ztn^$oh(~>NtcBAgc8cs_L^^+LzXgvMRoZu|e=?C?9RcaT6X3?Ez&| ztMJylIusk zgbR6j2Q}SLRuBh$8Z^uC``5>>WzW&`#QHWP;2}s~X9TRzb9i)wHymd0?m0R?IlJUz z4rR;?aVm5KJOrswj+es^m%pB#pIrW7uR$B7@fpR8(u>?{EtcmrWSVY|a}@77fS3i4Bkz7-xWFN14b+RL;ftW3_v%WZ%Jn-ohquJ0L!?Gevr!R60#nPIhI zZlI3)&2kH~*7ZlPTXY#t5Zleu8cvEU`jJ{3#&M|Tr2(zYR(x}ZJHCW29gp15Avhcu z6q7W z61}&U;NUOYzAnyYs4g8_u-wxNV5CPCob_`g)$5~Jp2Ucx>H31$b7vTN2+pTRVqbCu zFlY>I7BF=(d@lL%i`5zjXIiYqhiw~UvHN6L#@ii`| z4C(a}BxSI!;Dy3D#3Q>aM~mYz`5*_U!4S0}*YF$C%PmK3a(RCE-ZU$lAarKVrc8)1 zw{>8d?K&7ch(FBPvwyGv`-!jZR3&)F#!uEdD96&6eCo%VJbZ|b5yfPOSdL^%UN~aG zwQpRuE+UlM%>|_(j+~V8O0UPOT zjjj*9%ilqXUFi^I}@ zg}Var;iSOdoht=F*{fe9$*G^|&bdG&t-paBJnd7JNNqf*i}-22yDaf(Z2PMHT#sV? zeCITZFLBjIGN!0mYZ|G=K!=;VM*(ms`e}nGA-GM4|*vd8k22C#;Hp)9Ns=K%%t9dGE&_JH%8|s+yFJ5 zsrI$8Oc-vTCs;CLMbq&`T9zuRlvFGw<+j%)%jsFR*WJS>ju+obD`zC+dw~T56eiIC zC%_WBHWfNRW4pySwyETGG*;{*9IQvmHlzwCMZ;WKgtF2mkc_i|7d~;4H9-K)j&CWu z$R-HRtl369gYyaP)1Jwq=}od&nmZjObAB~<1|Y`s^+(?)lQH*)FcR>H@3jSF<`P0x zXo-y^&keDe!HuGgB2hcJV&Dk5iCpY9PVGd{`Uu!Szg#2mgKb;);b4oCnfh#ul@G&= zMf2QvX7@ty;&JUP%AtmlveU_`_BGQ{VfG(_JCG}tJRw-%)bwd_v3Poo_lofV+Z=Ie z9Qex^@O*(5`fag*<=?Uj5DD=46&Jg)Ksxpefq`JDDM`iHaopt&mstGwD|C0Xk+D28 z|5Z;NSHuZE%)uiJ(*EL4srEg{gHE5;r%KH7cy}xi7_;){k=I~_s( zZgK||q;Ed~o9YVE_jdui7T{J<1C}aS$fM9G0%{p!^fd-nUBE*-xElj`|`WQ7A&jNr|HABQF12FkLni=!DPBN_Z z7<};+^OL@ggu=vde~+hyub~DONs;$)bp<@8?+^u!x+`1_b<%(`tXl^{V zG3O$6m*>+GTisF=YEAbpSU3uZwJ}hXJRBLL!$?5nzQIes*B?h%ps-0C^0|ZC7J5|e zzG8}u(@5mp;;PD`R5-FsKrvjlgl^;g$tv5Gfk63o(2P;wRqbA1>CG0-2nIx z6pQ*HFbN0{Wm?-6u_4!3r(;3meUvU|xwC*lfRF?6AarL5`S)tFlt$3#S1*WWvMW#& z(l2@$2djG03<`#o5T=eErDu=x$JO?pifpt>&NEh$&5^hww_QBUX9&MJhyDruZLxW5 zcxbN3sskBYgoL^x3wE_Zw3h3v%w`35{`gzq-O+=>~cxis21Hhw$<~Auyuu z7#>8;huLlQX^A-k5-TR^-S&3Ayx$?t6Y_q0RNNh3i=OTg3Wj|5XoTd()EA~b8o-+L zda-=@^G~x4_ROp^s=&AYn3FFhL*k3$UoCd3&Y+;R77PoUEqra-o83L`uw}bm*b71h zJez&_=?CM5Szd=@Ty{*l4(ShbCcMdj4Q4#awl@oX{seEoE*L3yZ}tWjyR+j9_w#6z zufDx!w6dtqFN-Iqd$ZacVhX}J`v~$#Mue8r@mCyd&%og9IF)^}eZP9-wvZc#lgA@- zXcj@?yWnb#>(mTo8zF)?>{;^eX8HMP`I5g7hsS;`ps_=)xLuBoRj9c_(|AL=yHLKhv0FGhcxKjwWefrUJeBS!6S#2bA=_dpbK=?k;daQKzzBz=^iN%67{S7!t1nO3-y|z1m;|uH=nVWLbsc}J~%}3u}jm&fZj3( z>dzgvWDica*?wH!K6wI81k3xsJn<^Cd&T^Yz!knHnmeqZ<-t{g`_J|2%a0`U$n%CuoA9A<>Fx zRKW0I5lPue?OQXl^77862rB^)Owqxw2qjBQWR?4Zk@JcvH?@vpAXMDC7EZF+nRI+D z_DMgcE+9qT#vq4;oIMbl>H*=aJ^9Iu%rn!RJ>fkQ9}P|n=mqequk#8@rLnC8bMly& zABZY*#>F>;zrTvd+gyi@PTnh3R4NY)@QR+HO-`sMwcJ6x*}$^6olHsGI`1=_4xheIXvlU zzZLN4_#7_+d_dS;#E_q-XXBr*~H9FE_SXgtzPkmSV#mGOiC=JMuz~mbO+r0t%lbbHvYt(DAyxMV8&CYe|?Rl-1z|zsc5*DWq3GAky zW?z?-68#Nr=O%QFT-YLD_lwV!y_gYF0F53P4nTboe2nyI&JIt`N!EWsfV``yUCl|# zv^)+!1pJxnpvVOMeYttUX~O^R7(_jnSiJQMG^*)+A2OxO22OkrAbT5{`uG+I1D z6~?EA1xw)$p*7~xSP8Ti-__MZgU@j(qXD`NOqEm$I8FezUU-6$!u0^(A~h;zT6_g~ zNg=MBWjKGjKfJk#x&Km~OZC{{tP`UG^N)`4SG25S?!b^_Cx($%@y4Nwz{_+i9T-jm zPY4jdM=j@Z$!TFWJ2|}cFB_Gyp>vLFH5^D|KKNr_77;gG;NfBg`G1EVOVjglDAU#m zTp-yhSeE$00fK{)=ZI`nC`!sw1L{zQ83{dE;cfbARR2_Os%!?g1SC2Q=FZKpYppMV$ zV=ZWAjK1l~A3oVy0N8-gSFh-UOXm<9Jnn+nb#tH1HC-lO`?@akQ}oJ^K2a;XH7yjv z@N_f{ft0WUDMOxdPcMHxK3Acrl&X1gtjAhd@cH5aUSyL!MC5N?;g0?BA>J;Cfy8%M zOY=({ooa9pbjwufW5{5l&Fm(t^f_haPRw_Nq1dohF&V$be*9RMOOdb-cLtL;x3K&= zni~<1m*XmZ3^Za^_nHoAE6rQ%^`X<#YIjbbpt|BT#9kGg++cWcf$jS-JbwH*T2A&C z^r1%^(TnVHg@eSe^rP?xUVW_DO9+;Dd|G|POv8ZoRgswAe4ekDR3%CS&)`6gzFm|K zw$48<4lmG~ZThZm1pKm)zzsx=)gI;b;%awyfmQqQuBwkQImNX;aC?~l2QOi-@Ct$l zwVSoAeNAoiAXd3D7sB|pg-!>Ebf0^Mqt4og$S0{toMke zNNbxqux)z&_roD#YQO=c6v6f5@cw?dgmeuP>Oz#J?rb-eF(`2FoL9M_^<)0Pp^R=h zYvNHet!_D#F)PE4f?Zhc1X#=DJ7L|iPHIt#>g1i|3uab)O%LlM7h8CV%yCf#7|$ZE_T~?8x8u>~D<`+R%0&Z>+N4ihYTsrI9o`4&&dIvcaz_UB9| zW#KC0e6`&7Z}<%w%BC|g!~xEo;TcA~cvYXXfIrvpUY40nFXe9n3r%cQ&(2T(^#`U+S#-)k67V6F`Y>$q=rd_jZ<&qr>zjckx3VNpZOa=$4;*ANWygFy>SEAAv zAp^G1^i!oHmzg_x6-&o=@tHWLSV_CcUMgYi8)E~tObetEdF6)f9>F<-@1oI{XnxU= z38#V3d+Nk{{P=l^0YP(anBM-mr@%;MDUGtqzMgwDSh;N(L}!1%4i;+oe2a+?pAUQU z-Qwm5;|ux@h8OJ?yJ|R)n2(qYXbqj;;H5EKFUMkvaI>FIv0;MK`?+|j8*JagMiCMy z>kTr&Fjuq$t;0dlTt{xyLi*AleHgo-*-pFf7@82F@XgF(Z7Mqv4x*ZZYxn-}2zvpX zp6Y)0jSPKz|AejU2#=XuuHHcnT(T2-F06!aaT>N;$5#KCCm@c*>D9gMn`8(~)8SvP zoJcIwS5M4_+Uzj4Yb?QRAeoB1H~xP5+wtqFp=2cphVE?6IjK}!Qa;AM9b&D%BtwX# z2wMq)H9|F_k%RW!^2vC^0S|3su7K-kd?m|xzoaoE%_g#(loM3+q<4DQ!i)$1WY@}o zFd}n1#+S%^_LXt^Nwydm*t)&W!}c@xaPv-8cLqeEhjj#5;67qUvbsZ< zO&oY$Cvz64Oos1lao?X_p1@dn{KlFYYa056+mWb^`mMugtl8`ne?WTcWQ(&xf&9XC9_v zeB9mMZolEoJnEN`cdPjqILb6Ca!Y4DIz~j%3xY@kF)R1DCD|1PErB+7sQL`+UN~64 z!Z}*C*xpqm8s?7goMmu`;0`uBF3g$Kfbp0flp(3WZDorD-0INeU!{n8B)eyTtevd> z<3^~4GH*Q74lQg(@&v$Q2a~owj`7VVz~DAR_>j9YdIG9kHa(h+KL&Pw+}PG;-b4Ph zi&feeF)P)^A#AH_3RhsP6N3ZFamCEOWamXXbUhX$doQnXG#8-SnPylcqtgUXX3hpDe5p5O&Z@tvxGCN;84~129`SfPBxqvEhzc^J0s?vE{ zeJPl!B~$Oyw3!a9((d~i6G-9GpS$=V5JQ`^m8bLg#ZPyerx9kbK2VNVPOll_QDD5-G5|o=e7|7j2-fX5Z2j7j7i4J z_V5Ffl4^^4U3iweR(0(A7#HZTFh^jyvSiW8i(y9m^mch!#@tdgzR8_ZSo5~ZwvOsg ziYENT^Dg@cu@^9Lu!`X@HyXq)fp)8)TFJMh`SeEI583<|Y=^Vec1r)`Sr&EL9phPW zZCtLx05QLUUyC=*?b8CTjUkJQ<=O!A7VK#}s^RHQpf7$s{Bi$acF6z`T=@#Zhb|AU zY_B3l?UAy7-w_=V%`~Y~PDq6D{yN!gLqNvh;$@dea~Z91xe8cJJNqguC@tQAQzeJC zOMI@Uvd@r#uwQDt2%na<2gIJ(7S1r*-7esY7H!1dII=!FpCz9lOggpISE^mVN?`^W z-PtS4n zIFX<=*FKGLyxe^Iz9Q_}ZTPf!!@@%Jd2lcjVp!e&;F@Kfd17An0iTs*YnSn( z>F(9aQD}89p`Xi zzPb4D>hk>fm@-6x8tb-sVnCBSo{o6T-5`-ne{l+}M;_J&JH&i=s%JXYl0}~(I;Pmi z8Ii8{R#Giua)sH4ZX(tv%(_Qw)cw=;2KTHO)`VVj?Qtt22q2G+TkYf8C)cP#U*UlS zoy6dXm<%W3pbBSII4G|fJc9XR}imJDN^ojEn=l(EeXO6bGmN0n=9A)WaBX%wZsL$H>h(2ng_E= zog|ViA9SfkW}xsM+UiDsj|ytb{>#wZ*ne=7=o9xdzN`IweSHr{hcM*&4O}#IoCjMm zu)dFcxO!YIs&2+oZ%`|EuvS!!3p`yMJQ}thSH3_%yB@gOe&>i6Qa$F=IF;LOV9I7*IPS5r)l|$c zn^CM1THoP=ZRQ(ppk1gmZo208ig$(>pO;IiR%>|`$MAp?9m5lI$6$qgEKl1tLyE02K^BI9xs26`b9v4sk8W`M`j34T_K{? z1S}R4T9qzLF%1+K04#3MvH1+cZwQAI7({yE1HP)gS&$mb`nc~7^xjw|?^pDE*J&|( zJ!bOwT(@#TGhDaYV>&2`#LU{th4-06QwEtP`!Jn;{CS_R$?d0f8rn+ScM@azRug7t zZ48ZV)auDOrnMPjPt|xqkDpMV&>9JM)v+^nR^iqnSw(|~u4zu?RfG23&T8|1_i&Y0 zx<-Wa*kbuvhd2G0(%L>;8opTw5EOKw%%wh~MtTOQEe%-~}?gj&NH z1Gzc3+C-EOhs@Vkq@5ZRii>*xv=*VP82H(@97D#;mAr3e&UKC0-`{$2b9ptgHwZRG z<>UE*mg*0eM{&I7y+&Rnaue*DxSHCX5(=@d^Jtux>lWsgRfjT6Bzkf*{72CD%w3k= zz&=Z0K%da0fMm90TRDi*NoC9A{r%+P z1}!BM4%7TH1EYoUxK*IP;PFiFE{8QTCrH0`4tdd6NBBD)7G8y0QxBs2ku67A+JZ(! zjA-?F&oK-pU1r;XgMstI`C7REP|xJ8iYN{L_TtTYJuwS)nC`ltaeqP_k`-iZnu)6UI|pPHPFeKk_vBib}n8rY7cpK+G%+RR1z zo>K(Pi*?G?TF@?dWwm(+2L;?)rPss&?^QF+={&jzyn6AMcKA&bsk682ux??p(_eXP31i4hqk4cruXNa;=LYr=uog@~CPm_G(3f1SNiI zGq7RV4ZzIH?bULH`MLc;G4-y=3=&Qm4H2i24_e#GjGN`}(7uE3+|?T!WHj{;4=B$yW+( z5lf;h@Ki3vcUQ-(Ce>eWY&^QoH06iuEqA(8}gL0+m(;J}(2!Oa+79^TPm z_s8pdRIpr${Tm11Wavq?Q^yYkMjwXbgY~nC^))Zks!`*Qq*1rx>?eLrtY+yh7!Enb z#Ai>laT&rSY@~+Eg=rW!E|*d^leULJ#W8UM&?K)CmIT@l>HyzXumU*5P(=}NMNK`l z2$`-Qh6>WPlRAei?=(u9Z$hU=W2@zkd6G_4g{|06V}oheR-ssKEM5!&h19Ql0>B@_ zlK9G+HNbis6rLE1Q zH$|39!I;eh<&!grk-iPq!5B+66T5o-!7JlPf(Y1(TV?Dm{78?>C_7#abDu>9h$95B znYwn*WP-JIp2f`Nd)(&P)VijQnV35VXA?&xNNZ&AxB!Lrrj!D&TE`?^eEVuD#5kW) zyrkhE!qFEBB*xaGsfG30cL&&X+a)l|)*cCsM(w|72IW0raw=faL$#rBEW))qUoFly zOKOi5QVpipCSQoMziJ|L!*SAJ$vyssIm_T8X8i>*k~pVI;`v$5Nj$sRRtO!%cbOOq zR}BBh+2ZLg-}SO7@#betfaUwu)!BOUIf6(rk;*W#tTnKV`V$f6ViRw6`ygYy*5nOL z=w$N7l@qJtJaXBWXpBR3vcx>z$Va&@THPD~Q731y2nL-fCX^EL^8zK_15Yw*zZJxCqTYF4s7J;XIv@Y958Minitiating_exec_ctx_or_null, - (gpr_atm)&exec_ctx); + (gpr_atm)exec_ctx); // first element on this list: add it to the list of combiner locks // executing within this exec_ctx push_last_on_exec_ctx(lock); @@ -170,7 +170,7 @@ static void combiner_exec(grpc_closure* cl, grpc_error* error) { // offload for one or two actions, and that's fine gpr_atm initiator = gpr_atm_no_barrier_load(&lock->initiating_exec_ctx_or_null); - if (initiator != 0 && initiator != (gpr_atm)&exec_ctx) { + if (initiator != 0 && initiator != (gpr_atm)exec_ctx) { gpr_atm_no_barrier_store(&lock->initiating_exec_ctx_or_null, 0); } } diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index b45af562f89..f764d915ff6 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -206,7 +206,7 @@ static void executor_push(grpc_closure* closure, grpc_error* error, } thread_state* ts = (thread_state*)gpr_tls_get(&g_this_thread_state); if (ts == NULL) { - ts = &g_thread_state[GPR_HASH_POINTER(&exec_ctx, cur_thread_count)]; + ts = &g_thread_state[GPR_HASH_POINTER(exec_ctx, cur_thread_count)]; } else { GRPC_STATS_INC_EXECUTOR_SCHEDULED_TO_SELF(); } diff --git a/src/core/lib/iomgr/pollset_windows.cc b/src/core/lib/iomgr/pollset_windows.cc index 6486f8ad9d7..dd019b1ec39 100644 --- a/src/core/lib/iomgr/pollset_windows.cc +++ b/src/core/lib/iomgr/pollset_windows.cc @@ -160,10 +160,10 @@ grpc_error* grpc_pollset_work(grpc_pollset* pollset, while (!worker.kicked) { if (gpr_cv_wait(&worker.cv, &grpc_polling_mu, grpc_millis_to_timespec(deadline, GPR_CLOCK_REALTIME))) { - grpc_exec_ctx_invalidate_now(exec_ctx); + grpc_exec_ctx_invalidate_now(); break; } - grpc_exec_ctx_invalidate_now(exec_ctx); + grpc_exec_ctx_invalidate_now(); } } else { pollset->kicked_without_pollers = 0; diff --git a/src/core/lib/iomgr/tcp_windows.cc b/src/core/lib/iomgr/tcp_windows.cc index 8efced8b5ba..ab9a8a5c1e6 100644 --- a/src/core/lib/iomgr/tcp_windows.cc +++ b/src/core/lib/iomgr/tcp_windows.cc @@ -366,8 +366,7 @@ static void win_add_to_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pss) { grpc_iocp_add_socket(tcp->socket); } -static void win_delete_from_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_endpoint* ep, +static void win_delete_from_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pss) {} /* Initiates a shutdown of the TCP endpoint. This will queue abort callbacks @@ -446,7 +445,7 @@ grpc_endpoint* grpc_tcp_create(grpc_winsocket* socket, tcp->resource_user = grpc_resource_user_create(resource_quota, peer_string); /* Tell network status tracking code about the new endpoint */ grpc_network_status_register_endpoint(&tcp->base); - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); return &tcp->base; } diff --git a/test/core/debug/stats_test.cc b/test/core/debug/stats_test.cc index 554a4a32882..8401618670f 100644 --- a/test/core/debug/stats_test.cc +++ b/test/core/debug/stats_test.cc @@ -95,7 +95,7 @@ TEST_P(HistogramTest, IncHistogram) { Snapshot snapshot; ExecCtx _local_exec_ctx; - grpc_stats_inc_histogram[kHistogram](&exec_ctx, j); + grpc_stats_inc_histogram[kHistogram](j); grpc_exec_ctx_finish(); auto delta = snapshot.delta(); diff --git a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc index f9d02ee5041..d6fb3cd3695 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc @@ -443,7 +443,7 @@ static void UnrefHeader(void* user_data, grpc_mdelem md) { GRPC_MDELEM_UNREF(md); } -template +template static void BM_HpackParserParseHeader(benchmark::State& state) { TrackCounters track_counters; ExecCtx _local_exec_ctx; diff --git a/test/cpp/microbenchmarks/bm_chttp2_transport.cc b/test/cpp/microbenchmarks/bm_chttp2_transport.cc index a32b841501e..3a3547141df 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_transport.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_transport.cc @@ -152,7 +152,7 @@ class Fixture { private: DummyEndpoint* ep_; - grpc_exec_ctx _local_exec_ctx; + ExecCtx _local_exec_ctx; grpc_transport* t_; }; From a6465d124c44b924bdc094675c3fd22b8c843da8 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Fri, 10 Nov 2017 12:03:17 -0800 Subject: [PATCH 006/127] UV Correction --- src/core/lib/iomgr/tcp_server_uv.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/lib/iomgr/tcp_server_uv.cc b/src/core/lib/iomgr/tcp_server_uv.cc index 71226600daa..8d5387fe6ec 100644 --- a/src/core/lib/iomgr/tcp_server_uv.cc +++ b/src/core/lib/iomgr/tcp_server_uv.cc @@ -175,7 +175,7 @@ void grpc_tcp_server_unref(grpc_tcp_server* s) { GRPC_UV_ASSERT_SAME_THREAD(); if (gpr_unref(&s->refs)) { /* Complete shutdown_starting work before destroying. */ - grpc_exec_ctx local_ExecCtx _local_exec_ctx; + ExecCtx _local_exec_ctx; GRPC_CLOSURE_LIST_SCHED(&s->shutdown_starting); if (exec_ctx == NULL) { grpc_exec_ctx_flush(); From 8c5c654fa32c3f139babb6a5180c01028e19b631 Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Fri, 10 Nov 2017 13:59:12 -0800 Subject: [PATCH 007/127] Removed expiration_interval from LB proto --- .../lb_policy/grpclb/load_balancer_api.cc | 9 ----- .../lb_policy/grpclb/load_balancer_api.h | 1 - .../proto/grpc/lb/v1/load_balancer.pb.c | 33 +++++++++++++++---- .../proto/grpc/lb/v1/load_balancer.pb.h | 27 ++++++++------- src/proto/grpc/lb/v1/load_balancer.proto | 7 ++-- test/cpp/grpclb/grpclb_api_test.cc | 8 ----- test/cpp/grpclb/grpclb_test.cc | 22 ++++--------- 7 files changed, 49 insertions(+), 58 deletions(-) diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc index 87d7336b0cc..341b4e4f08e 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc @@ -215,9 +215,6 @@ grpc_grpclb_serverlist* grpc_grpclb_response_parse_serverlist( return NULL; } } - if (res.server_list.has_expiration_interval) { - sl->expiration_interval = res.server_list.expiration_interval; - } return sl; } @@ -237,8 +234,6 @@ grpc_grpclb_serverlist* grpc_grpclb_serverlist_copy( grpc_grpclb_serverlist* copy = (grpc_grpclb_serverlist*)gpr_zalloc(sizeof(grpc_grpclb_serverlist)); copy->num_servers = sl->num_servers; - memcpy(©->expiration_interval, &sl->expiration_interval, - sizeof(grpc_grpclb_duration)); copy->servers = (grpc_grpclb_server**)gpr_malloc(sizeof(grpc_grpclb_server*) * sl->num_servers); for (size_t i = 0; i < sl->num_servers; i++) { @@ -257,10 +252,6 @@ bool grpc_grpclb_serverlist_equals(const grpc_grpclb_serverlist* lhs, if (lhs->num_servers != rhs->num_servers) { return false; } - if (grpc_grpclb_duration_compare(&lhs->expiration_interval, - &rhs->expiration_interval) != 0) { - return false; - } for (size_t i = 0; i < lhs->num_servers; i++) { if (!grpc_grpclb_server_equals(lhs->servers[i], rhs->servers[i])) { return false; diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h index 138012c63ae..be44695c57e 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h @@ -39,7 +39,6 @@ typedef grpc_lb_v1_Duration grpc_grpclb_duration; typedef struct { grpc_grpclb_server** servers; size_t num_servers; - grpc_grpclb_duration expiration_interval; } grpc_grpclb_serverlist; /** Create a request for a gRPC LB service under \a lb_service_name */ diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c b/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c index 6a5d54c82a0..f5f09a18f06 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c @@ -61,11 +61,10 @@ const pb_field_t grpc_lb_v1_InitialLoadBalanceResponse_fields[3] = { PB_LAST_FIELD }; -const pb_field_t grpc_lb_v1_ServerList_fields[3] = { - PB_FIELD( 1, MESSAGE , REPEATED, CALLBACK, FIRST, grpc_lb_v1_ServerList, servers, servers, &grpc_lb_v1_Server_fields), - PB_FIELD( 3, MESSAGE , OPTIONAL, STATIC , OTHER, grpc_lb_v1_ServerList, expiration_interval, servers, &grpc_lb_v1_Duration_fields), - PB_LAST_FIELD -}; +const pb_field_t grpc_lb_v1_ServerList_fields[2] = { + PB_FIELD(1, MESSAGE, REPEATED, CALLBACK, FIRST, grpc_lb_v1_ServerList, + servers, servers, &grpc_lb_v1_Server_fields), + PB_LAST_FIELD}; const pb_field_t grpc_lb_v1_Server_fields[5] = { PB_FIELD( 1, BYTES , OPTIONAL, STATIC , FIRST, grpc_lb_v1_Server, ip_address, ip_address, 0), @@ -85,7 +84,17 @@ const pb_field_t grpc_lb_v1_Server_fields[5] = { * numbers or field sizes that are larger than what can fit in 8 or 16 bit * field descriptors. */ -PB_STATIC_ASSERT((pb_membersize(grpc_lb_v1_LoadBalanceRequest, initial_request) < 65536 && pb_membersize(grpc_lb_v1_LoadBalanceRequest, client_stats) < 65536 && pb_membersize(grpc_lb_v1_ClientStats, timestamp) < 65536 && pb_membersize(grpc_lb_v1_ClientStats, calls_finished_with_drop) < 65536 && pb_membersize(grpc_lb_v1_LoadBalanceResponse, initial_response) < 65536 && pb_membersize(grpc_lb_v1_LoadBalanceResponse, server_list) < 65536 && pb_membersize(grpc_lb_v1_InitialLoadBalanceResponse, client_stats_report_interval) < 65536 && pb_membersize(grpc_lb_v1_ServerList, servers) < 65536 && pb_membersize(grpc_lb_v1_ServerList, expiration_interval) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_grpc_lb_v1_Duration_grpc_lb_v1_Timestamp_grpc_lb_v1_LoadBalanceRequest_grpc_lb_v1_InitialLoadBalanceRequest_grpc_lb_v1_ClientStatsPerToken_grpc_lb_v1_ClientStats_grpc_lb_v1_LoadBalanceResponse_grpc_lb_v1_InitialLoadBalanceResponse_grpc_lb_v1_ServerList_grpc_lb_v1_Server) +PB_STATIC_ASSERT( + (pb_membersize(grpc_lb_v1_LoadBalanceRequest, initial_request) < 65536 && + pb_membersize(grpc_lb_v1_LoadBalanceRequest, client_stats) < 65536 && + pb_membersize(grpc_lb_v1_ClientStats, timestamp) < 65536 && + pb_membersize(grpc_lb_v1_ClientStats, calls_finished_with_drop) < 65536 && + pb_membersize(grpc_lb_v1_LoadBalanceResponse, initial_response) < 65536 && + pb_membersize(grpc_lb_v1_LoadBalanceResponse, server_list) < 65536 && + pb_membersize(grpc_lb_v1_InitialLoadBalanceResponse, + client_stats_report_interval) < 65536 && + pb_membersize(grpc_lb_v1_ServerList, servers) < 65536), + YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_grpc_lb_v1_Duration_grpc_lb_v1_Timestamp_grpc_lb_v1_LoadBalanceRequest_grpc_lb_v1_InitialLoadBalanceRequest_grpc_lb_v1_ClientStatsPerToken_grpc_lb_v1_ClientStats_grpc_lb_v1_LoadBalanceResponse_grpc_lb_v1_InitialLoadBalanceResponse_grpc_lb_v1_ServerList_grpc_lb_v1_Server) #endif #if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT) @@ -96,7 +105,17 @@ PB_STATIC_ASSERT((pb_membersize(grpc_lb_v1_LoadBalanceRequest, initial_request) * numbers or field sizes that are larger than what can fit in the default * 8 bit descriptors. */ -PB_STATIC_ASSERT((pb_membersize(grpc_lb_v1_LoadBalanceRequest, initial_request) < 256 && pb_membersize(grpc_lb_v1_LoadBalanceRequest, client_stats) < 256 && pb_membersize(grpc_lb_v1_ClientStats, timestamp) < 256 && pb_membersize(grpc_lb_v1_ClientStats, calls_finished_with_drop) < 256 && pb_membersize(grpc_lb_v1_LoadBalanceResponse, initial_response) < 256 && pb_membersize(grpc_lb_v1_LoadBalanceResponse, server_list) < 256 && pb_membersize(grpc_lb_v1_InitialLoadBalanceResponse, client_stats_report_interval) < 256 && pb_membersize(grpc_lb_v1_ServerList, servers) < 256 && pb_membersize(grpc_lb_v1_ServerList, expiration_interval) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_grpc_lb_v1_Duration_grpc_lb_v1_Timestamp_grpc_lb_v1_LoadBalanceRequest_grpc_lb_v1_InitialLoadBalanceRequest_grpc_lb_v1_ClientStatsPerToken_grpc_lb_v1_ClientStats_grpc_lb_v1_LoadBalanceResponse_grpc_lb_v1_InitialLoadBalanceResponse_grpc_lb_v1_ServerList_grpc_lb_v1_Server) +PB_STATIC_ASSERT( + (pb_membersize(grpc_lb_v1_LoadBalanceRequest, initial_request) < 256 && + pb_membersize(grpc_lb_v1_LoadBalanceRequest, client_stats) < 256 && + pb_membersize(grpc_lb_v1_ClientStats, timestamp) < 256 && + pb_membersize(grpc_lb_v1_ClientStats, calls_finished_with_drop) < 256 && + pb_membersize(grpc_lb_v1_LoadBalanceResponse, initial_response) < 256 && + pb_membersize(grpc_lb_v1_LoadBalanceResponse, server_list) < 256 && + pb_membersize(grpc_lb_v1_InitialLoadBalanceResponse, + client_stats_report_interval) < 256 && + pb_membersize(grpc_lb_v1_ServerList, servers) < 256), + YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_grpc_lb_v1_Duration_grpc_lb_v1_Timestamp_grpc_lb_v1_LoadBalanceRequest_grpc_lb_v1_InitialLoadBalanceRequest_grpc_lb_v1_ClientStatsPerToken_grpc_lb_v1_ClientStats_grpc_lb_v1_LoadBalanceResponse_grpc_lb_v1_InitialLoadBalanceResponse_grpc_lb_v1_ServerList_grpc_lb_v1_Server) #endif diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h b/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h index 93333d1aed2..cd9a798f5e2 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h @@ -14,6 +14,11 @@ extern "C" { #endif /* Struct definitions */ +typedef struct _grpc_lb_v1_ServerList { + pb_callback_t servers; + /* @@protoc_insertion_point(struct:grpc_lb_v1_ServerList) */ +} grpc_lb_v1_ServerList; + typedef struct _grpc_lb_v1_ClientStatsPerToken { pb_callback_t load_balance_token; bool has_num_calls; @@ -79,13 +84,6 @@ typedef struct _grpc_lb_v1_InitialLoadBalanceResponse { /* @@protoc_insertion_point(struct:grpc_lb_v1_InitialLoadBalanceResponse) */ } grpc_lb_v1_InitialLoadBalanceResponse; -typedef struct _grpc_lb_v1_ServerList { - pb_callback_t servers; - bool has_expiration_interval; - grpc_lb_v1_Duration expiration_interval; -/* @@protoc_insertion_point(struct:grpc_lb_v1_ServerList) */ -} grpc_lb_v1_ServerList; - typedef struct _grpc_lb_v1_LoadBalanceRequest { bool has_initial_request; grpc_lb_v1_InitialLoadBalanceRequest initial_request; @@ -113,7 +111,10 @@ typedef struct _grpc_lb_v1_LoadBalanceResponse { #define grpc_lb_v1_ClientStats_init_default {false, grpc_lb_v1_Timestamp_init_default, false, 0, false, 0, false, 0, false, 0, {{NULL}, NULL}} #define grpc_lb_v1_LoadBalanceResponse_init_default {false, grpc_lb_v1_InitialLoadBalanceResponse_init_default, false, grpc_lb_v1_ServerList_init_default} #define grpc_lb_v1_InitialLoadBalanceResponse_init_default {false, "", false, grpc_lb_v1_Duration_init_default} -#define grpc_lb_v1_ServerList_init_default {{{NULL}, NULL}, false, grpc_lb_v1_Duration_init_default} +#define grpc_lb_v1_ServerList_init_default \ + { \ + { {NULL}, NULL } \ + } #define grpc_lb_v1_Server_init_default {false, {0, {0}}, false, 0, false, "", false, 0} #define grpc_lb_v1_Duration_init_zero {false, 0, false, 0} #define grpc_lb_v1_Timestamp_init_zero {false, 0, false, 0} @@ -123,10 +124,14 @@ typedef struct _grpc_lb_v1_LoadBalanceResponse { #define grpc_lb_v1_ClientStats_init_zero {false, grpc_lb_v1_Timestamp_init_zero, false, 0, false, 0, false, 0, false, 0, {{NULL}, NULL}} #define grpc_lb_v1_LoadBalanceResponse_init_zero {false, grpc_lb_v1_InitialLoadBalanceResponse_init_zero, false, grpc_lb_v1_ServerList_init_zero} #define grpc_lb_v1_InitialLoadBalanceResponse_init_zero {false, "", false, grpc_lb_v1_Duration_init_zero} -#define grpc_lb_v1_ServerList_init_zero {{{NULL}, NULL}, false, grpc_lb_v1_Duration_init_zero} +#define grpc_lb_v1_ServerList_init_zero \ + { \ + { {NULL}, NULL } \ + } #define grpc_lb_v1_Server_init_zero {false, {0, {0}}, false, 0, false, "", false, 0} /* Field tags (for use in manual encoding/decoding) */ +#define grpc_lb_v1_ServerList_servers_tag 1 #define grpc_lb_v1_ClientStatsPerToken_load_balance_token_tag 1 #define grpc_lb_v1_ClientStatsPerToken_num_calls_tag 2 #define grpc_lb_v1_Duration_seconds_tag 1 @@ -146,8 +151,6 @@ typedef struct _grpc_lb_v1_LoadBalanceResponse { #define grpc_lb_v1_ClientStats_calls_finished_with_drop_tag 8 #define grpc_lb_v1_InitialLoadBalanceResponse_load_balancer_delegate_tag 1 #define grpc_lb_v1_InitialLoadBalanceResponse_client_stats_report_interval_tag 2 -#define grpc_lb_v1_ServerList_servers_tag 1 -#define grpc_lb_v1_ServerList_expiration_interval_tag 3 #define grpc_lb_v1_LoadBalanceRequest_initial_request_tag 1 #define grpc_lb_v1_LoadBalanceRequest_client_stats_tag 2 #define grpc_lb_v1_LoadBalanceResponse_initial_response_tag 1 @@ -162,7 +165,7 @@ extern const pb_field_t grpc_lb_v1_ClientStatsPerToken_fields[3]; extern const pb_field_t grpc_lb_v1_ClientStats_fields[7]; extern const pb_field_t grpc_lb_v1_LoadBalanceResponse_fields[3]; extern const pb_field_t grpc_lb_v1_InitialLoadBalanceResponse_fields[3]; -extern const pb_field_t grpc_lb_v1_ServerList_fields[3]; +extern const pb_field_t grpc_lb_v1_ServerList_fields[2]; extern const pb_field_t grpc_lb_v1_Server_fields[5]; /* Maximum encoded size of messages (where known) */ diff --git a/src/proto/grpc/lb/v1/load_balancer.proto b/src/proto/grpc/lb/v1/load_balancer.proto index 0a33568bd67..75c916defa3 100644 --- a/src/proto/grpc/lb/v1/load_balancer.proto +++ b/src/proto/grpc/lb/v1/load_balancer.proto @@ -133,11 +133,8 @@ message ServerList { // unless instructed otherwise via the client_config. repeated Server servers = 1; - // Indicates the amount of time that the client should consider this server - // list as valid. It may be considered stale after waiting this interval of - // time after receiving the list. If the interval is not positive, the - // client can assume the list is valid until the next list is received. - Duration expiration_interval = 3; + // Was google.protobuf.Duration expiration_interval. + reserved 3; } // Contains server information. When the drop field is not true, use the other diff --git a/test/cpp/grpclb/grpclb_api_test.cc b/test/cpp/grpclb/grpclb_api_test.cc index 6b0350e1f91..54b5708e6ac 100644 --- a/test/cpp/grpclb/grpclb_api_test.cc +++ b/test/cpp/grpclb/grpclb_api_test.cc @@ -98,9 +98,6 @@ TEST_F(GrpclbTest, ParseResponseServerList) { server->set_port(54321); server->set_load_balance_token("load_balancing"); server->set_drop(true); - auto* expiration_interval = serverlist->mutable_expiration_interval(); - expiration_interval->set_seconds(888); - expiration_interval->set_nanos(999); const grpc::string encoded_response = response.SerializeAsString(); const grpc_slice encoded_slice = grpc_slice_from_copied_buffer( @@ -121,11 +118,6 @@ TEST_F(GrpclbTest, ParseResponseServerList) { EXPECT_STREQ(c_serverlist->servers[1]->load_balance_token, "load_balancing"); EXPECT_TRUE(c_serverlist->servers[1]->drop); - EXPECT_TRUE(c_serverlist->expiration_interval.has_seconds); - EXPECT_EQ(c_serverlist->expiration_interval.seconds, 888); - EXPECT_TRUE(c_serverlist->expiration_interval.has_nanos); - EXPECT_EQ(c_serverlist->expiration_interval.nanos, 999); - grpc_slice_unref(encoded_slice); grpc_grpclb_destroy_serverlist(c_serverlist); } diff --git a/test/cpp/grpclb/grpclb_test.cc b/test/cpp/grpclb/grpclb_test.cc index a7647344c01..d032c0dfccf 100644 --- a/test/cpp/grpclb/grpclb_test.cc +++ b/test/cpp/grpclb/grpclb_test.cc @@ -113,10 +113,9 @@ typedef struct test_fixture { static void* tag(intptr_t t) { return (void*)t; } -static grpc_slice build_response_payload_slice( - const char* host, int* ports, size_t nports, - int64_t expiration_interval_secs, int32_t expiration_interval_nanos, - const char* token_prefix) { +static grpc_slice build_response_payload_slice(const char* host, int* ports, + size_t nports, + const char* token_prefix) { // server_list { // servers { // ip_address: @@ -128,15 +127,6 @@ static grpc_slice build_response_payload_slice( grpc::lb::v1::LoadBalanceResponse response; auto* serverlist = response.mutable_server_list(); - if (expiration_interval_secs > 0 || expiration_interval_nanos > 0) { - auto* expiration_interval = serverlist->mutable_expiration_interval(); - if (expiration_interval_secs > 0) { - expiration_interval->set_seconds(expiration_interval_secs); - } - if (expiration_interval_nanos > 0) { - expiration_interval->set_nanos(expiration_interval_nanos); - } - } for (size_t i = 0; i < nports; i++) { auto* server = serverlist->add_servers(); // TODO(dgq): test ipv6 @@ -248,13 +238,13 @@ static void start_lb_server(server_fixture* sf, int* ports, size_t nports, if (i == 0) { // First half of the ports. response_payload_slice = build_response_payload_slice( - "127.0.0.1", ports, nports / 2, -1, -1, sf->lb_token_prefix); + "127.0.0.1", ports, nports / 2, sf->lb_token_prefix); } else { // Second half of the ports. sleep_ms(update_delay_ms); response_payload_slice = build_response_payload_slice( - "127.0.0.1", ports + (nports / 2), (nports + 1) / 2 /* ceil */, -1, - -1, "" /* this half doesn't get to receive an LB token */); + "127.0.0.1", ports + (nports / 2), (nports + 1) / 2 /* ceil */, + "" /* this half doesn't get to receive an LB token */); } response_payload = grpc_raw_byte_buffer_create(&response_payload_slice, 1); From 66b5aadef76c44912f0dff3a2d0583f0841f62e8 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Fri, 10 Nov 2017 14:56:30 -0800 Subject: [PATCH 008/127] gpr_malloc to gpr_zalloc --- src/core/lib/iomgr/tcp_posix.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index d61092c4f29..697281d8b12 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -181,7 +181,7 @@ static void cover_self(grpc_tcp* tcp) { } if (old_count == 0) { GRPC_STATS_INC_TCP_BACKUP_POLLERS_CREATED(); - p = (backup_poller*)gpr_malloc(sizeof(*p) + grpc_pollset_size()); + p = (backup_poller*)gpr_zalloc(sizeof(*p) + grpc_pollset_size()); if (GRPC_TRACER_ON(grpc_tcp_trace)) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p create", p); } From 75122c23578e24417dcf64081c737571a9fc2dbc Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Mon, 13 Nov 2017 15:37:58 -0800 Subject: [PATCH 009/127] Address some PR comments --- .../filters/client_channel/backup_poller.cc | 6 +- .../client_channel/channel_connectivity.cc | 6 +- .../client_channel/lb_policy/grpclb/grpclb.cc | 8 +- .../resolver/dns/c_ares/dns_resolver_ares.cc | 2 +- .../resolver/dns/c_ares/grpc_ares_wrapper.cc | 14 +- .../resolver/dns/native/dns_resolver.cc | 2 +- .../ext/filters/client_channel/subchannel.cc | 2 +- .../client_channel/subchannel_index.cc | 36 ++--- .../ext/filters/max_age/max_age_filter.cc | 6 +- .../chttp2/client/insecure/channel_create.cc | 2 +- .../client/insecure/channel_create_posix.cc | 2 - .../client/secure/secure_channel_create.cc | 1 - .../transport/chttp2/server/chttp2_server.cc | 6 +- .../chttp2/server/insecure/server_chttp2.cc | 2 +- .../server/insecure/server_chttp2_posix.cc | 1 - .../server/secure/server_secure_chttp2.cc | 2 +- .../chttp2/transport/chttp2_transport.cc | 10 +- .../chttp2/transport/flow_control.cc | 4 +- .../transport/chttp2/transport/frame_ping.cc | 2 +- .../chttp2/transport/hpack_encoder.cc | 2 +- .../ext/transport/chttp2/transport/parsing.cc | 2 +- .../ext/transport/chttp2/transport/writing.cc | 2 +- .../cronet/transport/cronet_transport.cc | 8 - .../ext/transport/inproc/inproc_transport.cc | 3 - src/core/lib/backoff/backoff.cc | 4 +- .../compression/stream_compression_gzip.cc | 8 +- src/core/lib/debug/stats.h | 2 +- src/core/lib/iomgr/block_annotate.h | 23 ++- src/core/lib/iomgr/combiner.cc | 49 +++--- src/core/lib/iomgr/endpoint_pair_posix.cc | 1 - src/core/lib/iomgr/endpoint_pair_windows.cc | 2 +- src/core/lib/iomgr/error.cc | 6 +- src/core/lib/iomgr/ev_epoll1_linux.cc | 24 +-- src/core/lib/iomgr/ev_epollex_linux.cc | 10 +- src/core/lib/iomgr/ev_epollsig_linux.cc | 8 +- src/core/lib/iomgr/ev_poll_posix.cc | 10 +- src/core/lib/iomgr/exec_ctx.cc | 98 ++++-------- src/core/lib/iomgr/exec_ctx.h | 148 ++++++++---------- src/core/lib/iomgr/executor.cc | 11 +- src/core/lib/iomgr/iocp_windows.cc | 10 +- src/core/lib/iomgr/iomgr.cc | 11 +- src/core/lib/iomgr/iomgr_uv.cc | 1 - src/core/lib/iomgr/load_file.cc | 2 +- src/core/lib/iomgr/pollset_uv.cc | 4 +- src/core/lib/iomgr/pollset_windows.cc | 8 +- src/core/lib/iomgr/resolve_address_posix.cc | 4 +- src/core/lib/iomgr/resolve_address_uv.cc | 2 +- src/core/lib/iomgr/resolve_address_windows.cc | 2 +- src/core/lib/iomgr/resource_quota.cc | 2 - src/core/lib/iomgr/tcp_client_uv.cc | 3 +- src/core/lib/iomgr/tcp_posix.cc | 2 +- src/core/lib/iomgr/tcp_server_uv.cc | 12 +- src/core/lib/iomgr/tcp_uv.cc | 5 - src/core/lib/iomgr/timer_generic.cc | 8 +- src/core/lib/iomgr/timer_manager.cc | 11 +- src/core/lib/iomgr/timer_uv.cc | 5 +- .../lib/security/context/security_context.cc | 3 +- .../lib/security/credentials/credentials.cc | 3 - .../google_default_credentials.cc | 9 +- .../credentials/iam/iam_credentials.cc | 2 +- .../credentials/jwt/jwt_credentials.cc | 2 +- .../security/credentials/jwt/jwt_verifier.cc | 6 +- .../credentials/oauth2/oauth2_credentials.cc | 11 +- .../credentials/plugin/plugin_credentials.cc | 6 +- .../security/transport/security_handshaker.cc | 1 - .../security/transport/server_auth_filter.cc | 1 - src/core/lib/slice/slice.cc | 1 - src/core/lib/slice/slice_buffer.cc | 2 - src/core/lib/surface/alarm.cc | 4 +- src/core/lib/surface/byte_buffer.cc | 1 - src/core/lib/surface/byte_buffer_reader.cc | 4 +- src/core/lib/surface/call.cc | 7 +- src/core/lib/surface/call_details.cc | 1 - src/core/lib/surface/channel.cc | 9 +- src/core/lib/surface/channel_ping.cc | 1 - src/core/lib/surface/completion_queue.cc | 138 ++++++++-------- src/core/lib/surface/init.cc | 5 +- src/core/lib/surface/lame_client.cc | 2 +- src/core/lib/surface/server.cc | 15 +- src/core/lib/transport/bdp_estimator.cc | 2 +- src/core/lib/transport/status_conversion.cc | 4 +- src/core/lib/transport/transport.cc | 2 +- src/cpp/common/channel_arguments.cc | 3 +- test/core/backoff/backoff_test.cc | 51 +++--- test/core/bad_client/bad_client.cc | 9 +- test/core/channel/channel_args_test.cc | 4 - test/core/channel/channel_stack_test.cc | 3 +- .../channel/minimal_stack_is_minimal_test.cc | 2 - test/core/client_channel/lb_policies_test.cc | 2 - .../core/client_channel/parse_address_test.cc | 3 - .../dns_resolver_connectivity_test.cc | 6 +- .../resolvers/dns_resolver_test.cc | 3 - .../resolvers/fake_resolver_test.cc | 8 +- .../resolvers/sockaddr_resolver_test.cc | 4 +- test/core/client_channel/uri_fuzzer_test.cc | 2 +- test/core/client_channel/uri_parser_test.cc | 8 +- test/core/compression/algorithm_test.cc | 2 - .../core/compression/message_compress_test.cc | 9 +- test/core/debug/stats_test.cc | 3 - test/core/end2end/bad_server_response_test.cc | 2 +- test/core/end2end/connection_refused_test.cc | 1 - test/core/end2end/fixtures/h2_census.cc | 2 - test/core/end2end/fixtures/h2_compress.cc | 3 - test/core/end2end/fixtures/h2_fd.cc | 4 - .../end2end/fixtures/h2_full+workarounds.cc | 1 - .../end2end/fixtures/h2_load_reporting.cc | 1 - test/core/end2end/fixtures/h2_oauth2.cc | 1 - .../end2end/fixtures/h2_sockpair+trace.cc | 4 - test/core/end2end/fixtures/h2_sockpair.cc | 3 - .../end2end/fixtures/h2_sockpair_1byte.cc | 3 - test/core/end2end/fixtures/h2_ssl.cc | 1 - test/core/end2end/fixtures/h2_ssl_proxy.cc | 2 - .../end2end/fixtures/http_proxy_fixture.cc | 15 +- test/core/end2end/fuzzers/api_fuzzer.cc | 10 +- test/core/end2end/fuzzers/client_fuzzer.cc | 2 +- test/core/end2end/fuzzers/server_fuzzer.cc | 2 +- test/core/end2end/h2_ssl_cert_test.cc | 1 - .../core/end2end/tests/cancel_after_accept.cc | 1 - .../end2end/tests/cancel_after_round_trip.cc | 1 - test/core/end2end/tests/compressed_payload.cc | 3 - .../core/end2end/tests/load_reporting_hook.cc | 1 - test/core/end2end/tests/max_message_length.cc | 2 - .../stream_compression_compressed_payload.cc | 3 - .../tests/stream_compression_payload.cc | 1 - .../stream_compression_ping_pong_streaming.cc | 1 - .../tests/workaround_cronet_compression.cc | 2 - test/core/http/httpcli_test.cc | 6 +- test/core/http/httpscli_test.cc | 6 +- test/core/iomgr/combiner_test.cc | 11 +- test/core/iomgr/endpoint_pair_test.cc | 3 +- test/core/iomgr/endpoint_tests.cc | 16 +- test/core/iomgr/ev_epollsig_linux_test.cc | 23 ++- test/core/iomgr/fd_conservation_posix_test.cc | 3 +- test/core/iomgr/fd_posix_test.cc | 16 +- test/core/iomgr/pollset_set_test.cc | 32 ++-- test/core/iomgr/resolve_address_posix_test.cc | 11 +- test/core/iomgr/resolve_address_test.cc | 33 ++-- test/core/iomgr/resource_quota_test.cc | 86 ++++------ test/core/iomgr/tcp_client_posix_test.cc | 13 +- test/core/iomgr/tcp_client_uv_test.cc | 11 +- test/core/iomgr/tcp_posix_test.cc | 20 +-- test/core/iomgr/tcp_server_posix_test.cc | 11 +- test/core/iomgr/tcp_server_uv_test.cc | 9 +- test/core/iomgr/timer_list_test.cc | 28 ++-- test/core/iomgr/udp_server_test.cc | 13 +- test/core/security/credentials_test.cc | 46 ++---- test/core/security/json_token_test.cc | 4 +- test/core/security/jwt_verifier_test.cc | 20 +-- test/core/security/oauth2_utils.cc | 4 +- .../print_google_default_creds_token.cc | 4 +- test/core/security/secure_endpoint_test.cc | 8 +- test/core/security/ssl_server_fuzzer.cc | 8 +- test/core/security/verify_jwt.cc | 4 +- test/core/slice/b64_test.cc | 5 +- test/core/slice/slice_hash_table_test.cc | 3 - test/core/surface/byte_buffer_reader_test.cc | 1 - test/core/surface/channel_create_test.cc | 1 - test/core/surface/completion_queue_test.cc | 4 - .../completion_queue_threading_test.cc | 3 - .../surface/concurrent_connectivity_test.cc | 7 +- test/core/surface/lame_client_test.cc | 2 - ...num_external_connectivity_watchers_test.cc | 1 - .../surface/secure_channel_create_test.cc | 3 - .../surface/sequential_connectivity_test.cc | 1 - test/core/transport/bdp_estimator_test.cc | 3 +- test/core/transport/byte_stream_test.cc | 5 - .../core/transport/chttp2/bin_decoder_test.cc | 2 - .../transport/chttp2/hpack_encoder_test.cc | 1 - .../chttp2/hpack_parser_fuzzer_test.cc | 2 +- .../transport/chttp2/hpack_parser_test.cc | 3 - .../core/transport/chttp2/hpack_table_test.cc | 5 +- .../core/transport/connectivity_state_test.cc | 14 +- test/core/transport/metadata_test.cc | 15 +- test/core/transport/status_conversion_test.cc | 2 +- test/core/util/port_server_client.cc | 18 +-- test/core/util/test_tcp_server.cc | 5 +- test/cpp/end2end/client_lb_end2end_test.cc | 1 - test/cpp/end2end/grpclb_end2end_test.cc | 1 - test/cpp/grpclb/grpclb_test.cc | 1 - test/cpp/microbenchmarks/bm_call_create.cc | 7 +- test/cpp/microbenchmarks/bm_chttp2_hpack.cc | 20 ++- .../microbenchmarks/bm_chttp2_transport.cc | 13 +- test/cpp/microbenchmarks/bm_closure.cc | 65 ++++---- test/cpp/microbenchmarks/bm_cq.cc | 6 +- .../microbenchmarks/bm_cq_multiple_threads.cc | 2 +- test/cpp/microbenchmarks/bm_error.cc | 6 +- .../microbenchmarks/bm_fullstack_trickle.cc | 2 +- test/cpp/microbenchmarks/bm_metadata.cc | 26 +-- test/cpp/microbenchmarks/bm_pollset.cc | 12 +- test/cpp/microbenchmarks/fullstack_fixtures.h | 2 - test/cpp/naming/resolver_component_test.cc | 6 +- test/cpp/performance/writes_per_rpc_test.cc | 2 - 192 files changed, 700 insertions(+), 1091 deletions(-) diff --git a/src/core/ext/filters/client_channel/backup_poller.cc b/src/core/ext/filters/client_channel/backup_poller.cc index 1b42f5d6a06..dbdcd53ef5d 100644 --- a/src/core/ext/filters/client_channel/backup_poller.cc +++ b/src/core/ext/filters/client_channel/backup_poller.cc @@ -112,10 +112,10 @@ static void run_poller(void* arg, grpc_error* error) { backup_poller_shutdown_unref(p); return; } - grpc_error* err = grpc_pollset_work(p->pollset, NULL, grpc_exec_ctx_now()); + grpc_error* err = grpc_pollset_work(p->pollset, NULL, ExecCtx::Get()->Now()); gpr_mu_unlock(p->pollset_mu); GRPC_LOG_IF_ERROR("Run client channel backup poller", err); - grpc_timer_init(&p->polling_timer, grpc_exec_ctx_now() + g_poll_interval_ms, + grpc_timer_init(&p->polling_timer, ExecCtx::Get()->Now() + g_poll_interval_ms, &p->run_poller_closure); } @@ -137,7 +137,7 @@ void grpc_client_channel_start_backup_polling( GRPC_CLOSURE_INIT(&g_poller->run_poller_closure, run_poller, g_poller, grpc_schedule_on_exec_ctx); grpc_timer_init(&g_poller->polling_timer, - grpc_exec_ctx_now() + g_poll_interval_ms, + ExecCtx::Get()->Now() + g_poll_interval_ms, &g_poller->run_poller_closure); } diff --git a/src/core/ext/filters/client_channel/channel_connectivity.cc b/src/core/ext/filters/client_channel/channel_connectivity.cc index 3069e667750..0ceedb9f86b 100644 --- a/src/core/ext/filters/client_channel/channel_connectivity.cc +++ b/src/core/ext/filters/client_channel/channel_connectivity.cc @@ -41,14 +41,14 @@ grpc_connectivity_state grpc_channel_check_connectivity_state( if (client_channel_elem->filter == &grpc_client_channel_filter) { state = grpc_client_channel_check_connectivity_state(client_channel_elem, try_to_connect); - grpc_exec_ctx_finish(); + return state; } gpr_log(GPR_ERROR, "grpc_channel_check_connectivity_state called on something that is " "not a client channel, but '%s'", client_channel_elem->filter->name); - grpc_exec_ctx_finish(); + return GRPC_CHANNEL_SHUTDOWN; } @@ -241,6 +241,4 @@ void grpc_channel_watch_connectivity_state( } else { abort(); } - - grpc_exec_ctx_finish(); } diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index d4c58fb1e0f..63cf417c4e0 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -1122,7 +1122,7 @@ static void start_picking_locked(glb_lb_policy* glb_policy) { if (glb_policy->lb_fallback_timeout_ms > 0 && glb_policy->serverlist == NULL && !glb_policy->fallback_timer_active) { grpc_millis deadline = - grpc_exec_ctx_now() + glb_policy->lb_fallback_timeout_ms; + ExecCtx::Get()->Now() + glb_policy->lb_fallback_timeout_ms; GRPC_LB_POLICY_WEAK_REF(&glb_policy->base, "grpclb_fallback_timer"); GRPC_CLOSURE_INIT(&glb_policy->lb_on_fallback, lb_on_fallback_timer_locked, glb_policy, @@ -1271,7 +1271,7 @@ static void maybe_restart_lb_call(glb_lb_policy* glb_policy) { if (GRPC_TRACER_ON(grpc_lb_glb_trace)) { gpr_log(GPR_DEBUG, "[grpclb %p] Connection to LB server lost...", glb_policy); - grpc_millis timeout = next_try - grpc_exec_ctx_now(); + grpc_millis timeout = next_try - ExecCtx::Get()->Now(); if (timeout > 0) { gpr_log(GPR_DEBUG, "[grpclb %p] ... retry_timer_active in %" PRIuPTR "ms.", @@ -1297,7 +1297,7 @@ static void send_client_load_report_locked(void* arg, grpc_error* error); static void schedule_next_client_load_report(glb_lb_policy* glb_policy) { const grpc_millis next_client_load_report_time = - grpc_exec_ctx_now() + glb_policy->client_stats_report_interval; + ExecCtx::Get()->Now() + glb_policy->client_stats_report_interval; GRPC_CLOSURE_INIT(&glb_policy->client_load_report_closure, send_client_load_report_locked, glb_policy, grpc_combiner_scheduler(glb_policy->base.combiner)); @@ -1392,7 +1392,7 @@ static void lb_call_init_locked(glb_lb_policy* glb_policy) { grpc_millis deadline = glb_policy->lb_call_timeout_ms == 0 ? GRPC_MILLIS_INF_FUTURE - : grpc_exec_ctx_now() + glb_policy->lb_call_timeout_ms; + : ExecCtx::Get()->Now() + glb_policy->lb_call_timeout_ms; glb_policy->lb_call = grpc_channel_create_pollset_set_call( glb_policy->lb_channel, NULL, GRPC_PROPAGATE_DEFAULTS, glb_policy->base.interested_parties, diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc index 77d790aa385..f0543964ae2 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc @@ -265,7 +265,7 @@ static void dns_ares_on_resolved_locked(void* arg, grpc_error* error) { gpr_log(GPR_DEBUG, "dns resolution failed: %s", msg); grpc_millis next_try = grpc_backoff_step(&r->backoff_state).next_attempt_start_time; - grpc_millis timeout = next_try - grpc_exec_ctx_now(); + grpc_millis timeout = next_try - ExecCtx::Get()->Now(); gpr_log(GPR_INFO, "dns resolution failed (will retry): %s", grpc_error_string(error)); GPR_ASSERT(!r->have_retry_timer); diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc index c57fac61a46..925223d1897 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -101,18 +101,7 @@ static void grpc_ares_request_unref(grpc_ares_request* r) { request */ if (gpr_unref(&r->pending_queries)) { /* TODO(zyc): Sort results with RFC6724 before invoking on_done. */ - if (exec_ctx == NULL) { - /* A new exec_ctx is created here, as the c-ares interface does not - provide one in ares_host_callback. It's safe to schedule on_done with - the newly created exec_ctx, since the caller has been warned not to - acquire locks in on_done. ares_dns_resolver is using combiner to - protect resources needed by on_done. */ - ExecCtx _local_exec_ctx; - GRPC_CLOSURE_SCHED(r->on_done, r->error); - grpc_exec_ctx_finish(); - } else { - GRPC_CLOSURE_SCHED(r->on_done, r->error); - } + GRPC_CLOSURE_SCHED(r->on_done, r->error); gpr_mu_destroy(&r->mu); grpc_ares_ev_driver_destroy(r->ev_driver); gpr_free(r); @@ -263,7 +252,6 @@ static void on_srv_query_done_cb(void* arg, int status, int timeouts, } } grpc_ares_request_unref(r); - grpc_exec_ctx_finish(); } static const char g_service_config_attribute_prefix[] = "grpc_config="; diff --git a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc index 4463673e1fc..10404ec4ef8 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc @@ -163,7 +163,7 @@ static void dns_on_resolved_locked(void* arg, grpc_error* error) { } else { grpc_millis next_try = grpc_backoff_step(&r->backoff_state).next_attempt_start_time; - grpc_millis timeout = next_try - grpc_exec_ctx_now(); + grpc_millis timeout = next_try - ExecCtx::Get()->Now(); gpr_log(GPR_INFO, "dns resolution failed (will retry): %s", grpc_error_string(error)); GPR_ASSERT(!r->have_retry_timer); diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc index c8583687d59..98f96b57504 100644 --- a/src/core/ext/filters/client_channel/subchannel.cc +++ b/src/core/ext/filters/client_channel/subchannel.cc @@ -458,7 +458,7 @@ static void maybe_start_connecting_locked(grpc_subchannel* c) { GPR_ASSERT(!c->have_alarm); c->have_alarm = true; const grpc_millis time_til_next = - c->backoff_result.next_attempt_start_time - grpc_exec_ctx_now(); + c->backoff_result.next_attempt_start_time - ExecCtx::Get()->Now(); if (time_til_next <= 0) { gpr_log(GPR_INFO, "Retry immediately"); } else { diff --git a/src/core/ext/filters/client_channel/subchannel_index.cc b/src/core/ext/filters/client_channel/subchannel_index.cc index cb8e480734f..fbab57769cf 100644 --- a/src/core/ext/filters/client_channel/subchannel_index.cc +++ b/src/core/ext/filters/client_channel/subchannel_index.cc @@ -132,10 +132,8 @@ void grpc_subchannel_index_shutdown(void) { void grpc_subchannel_index_unref(void) { if (gpr_unref(&g_refcount)) { - ExecCtx _local_exec_ctx; gpr_mu_destroy(&g_mu); - gpr_avl_unref(g_subchannel_index, exec_ctx); - grpc_exec_ctx_finish(); + gpr_avl_unref(g_subchannel_index, ExecCtx::Get()); } } @@ -145,12 +143,12 @@ grpc_subchannel* grpc_subchannel_index_find(grpc_subchannel_key* key) { // Lock, and take a reference to the subchannel index. // We don't need to do the search under a lock as avl's are immutable. gpr_mu_lock(&g_mu); - gpr_avl index = gpr_avl_ref(g_subchannel_index, exec_ctx); + gpr_avl index = gpr_avl_ref(g_subchannel_index, ExecCtx::Get()); gpr_mu_unlock(&g_mu); grpc_subchannel* c = GRPC_SUBCHANNEL_REF_FROM_WEAK_REF( - (grpc_subchannel*)gpr_avl_get(index, key, exec_ctx), "index_find"); - gpr_avl_unref(index, exec_ctx); + (grpc_subchannel*)gpr_avl_get(index, key, ExecCtx::Get()), "index_find"); + gpr_avl_unref(index, ExecCtx::Get()); return c; } @@ -166,11 +164,11 @@ grpc_subchannel* grpc_subchannel_index_register(grpc_subchannel_key* key, // Compare and swap loop: // - take a reference to the current index gpr_mu_lock(&g_mu); - gpr_avl index = gpr_avl_ref(g_subchannel_index, exec_ctx); + gpr_avl index = gpr_avl_ref(g_subchannel_index, ExecCtx::Get()); gpr_mu_unlock(&g_mu); // - Check to see if a subchannel already exists - c = (grpc_subchannel*)gpr_avl_get(index, key, exec_ctx); + c = (grpc_subchannel*)gpr_avl_get(index, key, ExecCtx::Get()); if (c != NULL) { c = GRPC_SUBCHANNEL_REF_FROM_WEAK_REF(c, "index_register"); } @@ -180,8 +178,9 @@ grpc_subchannel* grpc_subchannel_index_register(grpc_subchannel_key* key, } else { // no -> update the avl and compare/swap gpr_avl updated = gpr_avl_add( - gpr_avl_ref(index, exec_ctx), subchannel_key_copy(key), - GRPC_SUBCHANNEL_WEAK_REF(constructed, "index_register"), exec_ctx); + gpr_avl_ref(index, ExecCtx::Get()), subchannel_key_copy(key), + GRPC_SUBCHANNEL_WEAK_REF(constructed, "index_register"), + ExecCtx::Get()); // it may happen (but it's expected to be unlikely) // that some other thread has changed the index: @@ -193,9 +192,9 @@ grpc_subchannel* grpc_subchannel_index_register(grpc_subchannel_key* key, } gpr_mu_unlock(&g_mu); - gpr_avl_unref(updated, exec_ctx); + gpr_avl_unref(updated, ExecCtx::Get()); } - gpr_avl_unref(index, exec_ctx); + gpr_avl_unref(index, ExecCtx::Get()); } if (need_to_unref_constructed) { @@ -212,21 +211,22 @@ void grpc_subchannel_index_unregister(grpc_subchannel_key* key, // Compare and swap loop: // - take a reference to the current index gpr_mu_lock(&g_mu); - gpr_avl index = gpr_avl_ref(g_subchannel_index, exec_ctx); + gpr_avl index = gpr_avl_ref(g_subchannel_index, ExecCtx::Get()); gpr_mu_unlock(&g_mu); // Check to see if this key still refers to the previously // registered subchannel - grpc_subchannel* c = (grpc_subchannel*)gpr_avl_get(index, key, exec_ctx); + grpc_subchannel* c = + (grpc_subchannel*)gpr_avl_get(index, key, ExecCtx::Get()); if (c != constructed) { - gpr_avl_unref(index, exec_ctx); + gpr_avl_unref(index, ExecCtx::Get()); break; } // compare and swap the update (some other thread may have // mutated the index behind us) gpr_avl updated = - gpr_avl_remove(gpr_avl_ref(index, exec_ctx), key, exec_ctx); + gpr_avl_remove(gpr_avl_ref(index, ExecCtx::Get()), key, ExecCtx::Get()); gpr_mu_lock(&g_mu); if (index.root == g_subchannel_index.root) { @@ -235,8 +235,8 @@ void grpc_subchannel_index_unregister(grpc_subchannel_key* key, } gpr_mu_unlock(&g_mu); - gpr_avl_unref(updated, exec_ctx); - gpr_avl_unref(index, exec_ctx); + gpr_avl_unref(updated, ExecCtx::Get()); + gpr_avl_unref(index, ExecCtx::Get()); } } diff --git a/src/core/ext/filters/max_age/max_age_filter.cc b/src/core/ext/filters/max_age/max_age_filter.cc index 1b9ce3b9967..015a3ce124d 100644 --- a/src/core/ext/filters/max_age/max_age_filter.cc +++ b/src/core/ext/filters/max_age/max_age_filter.cc @@ -100,7 +100,7 @@ static void decrease_call_count(channel_data* chand) { if (gpr_atm_full_fetch_add(&chand->call_count, -1) == 1) { GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age max_idle_timer"); grpc_timer_init(&chand->max_idle_timer, - grpc_exec_ctx_now() + chand->max_connection_idle, + ExecCtx::Get()->Now() + chand->max_connection_idle, &chand->close_max_idle_channel); } } @@ -121,7 +121,7 @@ static void start_max_age_timer_after_init(void* arg, grpc_error* error) { chand->max_age_timer_pending = true; GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age max_age_timer"); grpc_timer_init(&chand->max_age_timer, - grpc_exec_ctx_now() + chand->max_connection_age, + ExecCtx::Get()->Now() + chand->max_connection_age, &chand->close_max_age_channel); gpr_mu_unlock(&chand->max_age_timer_mu); grpc_transport_op* op = grpc_make_transport_op(NULL); @@ -141,7 +141,7 @@ static void start_max_age_grace_timer_after_goaway_op(void* arg, grpc_timer_init(&chand->max_age_grace_timer, chand->max_connection_age_grace == GRPC_MILLIS_INF_FUTURE ? GRPC_MILLIS_INF_FUTURE - : grpc_exec_ctx_now() + chand->max_connection_age_grace, + : ExecCtx::Get()->Now() + chand->max_connection_age_grace, &chand->force_close_max_age_channel); gpr_mu_unlock(&chand->max_age_timer_mu); GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc index e7741f97d44..3afca884ca4 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc @@ -95,7 +95,7 @@ grpc_channel* grpc_insecure_channel_create(const char* target, new_args); // Clean up. grpc_channel_args_destroy(new_args); - grpc_exec_ctx_finish(); + return channel != NULL ? channel : grpc_lame_client_channel_create( target, GRPC_STATUS_INTERNAL, diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc b/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc index 37e6f1f30dc..b0eff1c992d 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc @@ -60,8 +60,6 @@ grpc_channel* grpc_insecure_channel_create_from_fd( grpc_channel_args_destroy(final_args); grpc_chttp2_transport_start_reading(transport, NULL); - grpc_exec_ctx_finish(); - return channel != NULL ? channel : grpc_lame_client_channel_create( target, GRPC_STATUS_INTERNAL, diff --git a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc index a5da71a67cd..bebc38c2480 100644 --- a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc +++ b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc @@ -211,7 +211,6 @@ grpc_channel* grpc_secure_channel_create(grpc_channel_credentials* creds, new_args); // Clean up. grpc_channel_args_destroy(new_args); - grpc_exec_ctx_finish(); } return channel != NULL ? channel : grpc_lame_client_channel_create( diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index 6eb1e3491c4..bbcfb1b195b 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -132,7 +132,7 @@ static void on_accept(void* arg, grpc_endpoint* tcp, connection_state->handshake_mgr); // TODO(roth): We should really get this timeout value from channel // args instead of hard-coding it. - const grpc_millis deadline = grpc_exec_ctx_now() + 120 * GPR_MS_PER_SEC; + const grpc_millis deadline = ExecCtx::Get()->Now() + 120 * GPR_MS_PER_SEC; grpc_handshake_manager_do_handshake(connection_state->handshake_mgr, tcp, state->args, deadline, acceptor, on_handshake_done, connection_state); @@ -161,10 +161,10 @@ static void tcp_server_shutdown_complete(void* arg, grpc_error* error) { gpr_mu_unlock(&state->mu); // Flush queued work before destroying handshaker factory, since that // may do a synchronous unref. - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); if (destroy_done != NULL) { destroy_done->cb(destroy_done->cb_arg, GRPC_ERROR_REF(error)); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } grpc_channel_args_destroy(state->args); gpr_mu_destroy(&state->mu); diff --git a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc index d7aad110b94..6cbb26a349f 100644 --- a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc +++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc @@ -39,6 +39,6 @@ int grpc_server_add_insecure_http2_port(grpc_server* server, const char* addr) { GRPC_ERROR_UNREF(err); } - grpc_exec_ctx_finish(); + return port_num; } diff --git a/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc b/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc index 57a8316a58b..e5419e5e6e1 100644 --- a/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc +++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc @@ -61,7 +61,6 @@ void grpc_server_add_insecure_channel_from_fd(grpc_server* server, grpc_server_setup_transport(server, transport, NULL, server_args); grpc_chttp2_transport_start_reading(transport, NULL); - grpc_exec_ctx_finish(); } #else // !GPR_SUPPORT_CHANNELS_FROM_FD diff --git a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc index dc7da962105..aeae8f42e36 100644 --- a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc +++ b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc @@ -76,7 +76,7 @@ done: if (sc != NULL) { GRPC_SECURITY_CONNECTOR_UNREF(&sc->base, "server"); } - grpc_exec_ctx_finish(); + if (err != GRPC_ERROR_NONE) { const char* msg = grpc_error_string(err); gpr_log(GPR_ERROR, "%s", msg); diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index ecf3cf69efc..e49e26fc35a 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -530,7 +530,7 @@ static void init_transport(grpc_chttp2_transport* t, t->keepalive_state = GRPC_CHTTP2_KEEPALIVE_STATE_WAITING; GRPC_CHTTP2_REF_TRANSPORT(t, "init keepalive ping"); grpc_timer_init(&t->keepalive_ping_timer, - grpc_exec_ctx_now() + t->keepalive_time, + ExecCtx::Get()->Now() + t->keepalive_time, &t->init_keepalive_ping_locked); } else { /* Use GRPC_CHTTP2_KEEPALIVE_STATE_DISABLED to indicate there are no @@ -2585,14 +2585,14 @@ static void init_keepalive_ping_locked(void* arg, grpc_error* error) { } else { GRPC_CHTTP2_REF_TRANSPORT(t, "init keepalive ping"); grpc_timer_init(&t->keepalive_ping_timer, - grpc_exec_ctx_now() + t->keepalive_time, + ExecCtx::Get()->Now() + t->keepalive_time, &t->init_keepalive_ping_locked); } } else if (error == GRPC_ERROR_CANCELLED) { /* The keepalive ping timer may be cancelled by bdp */ GRPC_CHTTP2_REF_TRANSPORT(t, "init keepalive ping"); grpc_timer_init(&t->keepalive_ping_timer, - grpc_exec_ctx_now() + t->keepalive_time, + ExecCtx::Get()->Now() + t->keepalive_time, &t->init_keepalive_ping_locked); } GRPC_CHTTP2_UNREF_TRANSPORT(t, "init keepalive ping"); @@ -2602,7 +2602,7 @@ static void start_keepalive_ping_locked(void* arg, grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)arg; GRPC_CHTTP2_REF_TRANSPORT(t, "keepalive watchdog"); grpc_timer_init(&t->keepalive_watchdog_timer, - grpc_exec_ctx_now() + t->keepalive_time, + ExecCtx::Get()->Now() + t->keepalive_time, &t->keepalive_watchdog_fired_locked); } @@ -2614,7 +2614,7 @@ static void finish_keepalive_ping_locked(void* arg, grpc_error* error) { grpc_timer_cancel(&t->keepalive_watchdog_timer); GRPC_CHTTP2_REF_TRANSPORT(t, "init keepalive ping"); grpc_timer_init(&t->keepalive_ping_timer, - grpc_exec_ctx_now() + t->keepalive_time, + ExecCtx::Get()->Now() + t->keepalive_time, &t->init_keepalive_ping_locked); } } diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc index 1609fa05321..e54d59b5fa2 100644 --- a/src/core/ext/transport/chttp2/transport/flow_control.cc +++ b/src/core/ext/transport/chttp2/transport/flow_control.cc @@ -160,7 +160,7 @@ TransportFlowControl::TransportFlowControl(const grpc_chttp2_transport* t, .set_min_control_value(-1) .set_max_control_value(25) .set_integral_range(10)), - last_pid_update_(grpc_exec_ctx_now()) {} + last_pid_update_(ExecCtx::Get()->Now()) {} uint32_t TransportFlowControl::MaybeSendUpdate(bool writing_anyway) { FlowControlTrace trace("t updt sent", this, nullptr); @@ -306,7 +306,7 @@ double TransportFlowControl::TargetLogBdp() { } double TransportFlowControl::SmoothLogBdp(double value) { - grpc_millis now = grpc_exec_ctx_now(); + grpc_millis now = ExecCtx::Get()->Now(); double bdp_error = value - pid_controller_.last_control_value(); const double dt = (double)(now - last_pid_update_) * 1e-3; last_pid_update_ = now; diff --git a/src/core/ext/transport/chttp2/transport/frame_ping.cc b/src/core/ext/transport/chttp2/transport/frame_ping.cc index 1b0dc0dfaaf..60172be9cb7 100644 --- a/src/core/ext/transport/chttp2/transport/frame_ping.cc +++ b/src/core/ext/transport/chttp2/transport/frame_ping.cc @@ -89,7 +89,7 @@ grpc_error* grpc_chttp2_ping_parser_parse(void* parser, grpc_chttp2_ack_ping(t, p->opaque_8bytes); } else { if (!t->is_client) { - grpc_millis now = grpc_exec_ctx_now(); + grpc_millis now = ExecCtx::Get()->Now(); grpc_millis next_allowed_ping = t->ping_recv_state.last_ping_recv_time + t->ping_policy.min_recv_ping_interval_without_data; diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc index e225a0244af..efb6e54ce79 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc @@ -570,7 +570,7 @@ static void deadline_enc(grpc_chttp2_hpack_compressor* c, grpc_millis deadline, framer_state* st) { char timeout_str[GRPC_HTTP2_TIMEOUT_ENCODE_MIN_BUFSIZE]; grpc_mdelem mdelem; - grpc_http2_encode_timeout(deadline - grpc_exec_ctx_now(), timeout_str); + grpc_http2_encode_timeout(deadline - ExecCtx::Get()->Now(), timeout_str); mdelem = grpc_mdelem_from_slices(GRPC_MDSTR_GRPC_TIMEOUT, grpc_slice_from_copied_string(timeout_str)); hpack_enc(c, mdelem, st); diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index 5731e9ff78e..f7f83c9aee4 100644 --- a/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/src/core/ext/transport/chttp2/transport/parsing.cc @@ -436,7 +436,7 @@ static void on_initial_header(void* tp, grpc_mdelem md) { } if (timeout != GRPC_MILLIS_INF_FUTURE) { grpc_chttp2_incoming_metadata_buffer_set_deadline( - &s->metadata_buffer[0], grpc_exec_ctx_now() + timeout); + &s->metadata_buffer[0], ExecCtx::Get()->Now() + timeout); } GRPC_MDELEM_UNREF(md); } else { diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc index ec836334724..4f76c2eb232 100644 --- a/src/core/ext/transport/chttp2/transport/writing.cc +++ b/src/core/ext/transport/chttp2/transport/writing.cc @@ -68,7 +68,7 @@ static void maybe_initiate_ping(grpc_chttp2_transport* t) { } return; } - grpc_millis now = grpc_exec_ctx_now(); + grpc_millis now = ExecCtx::Get()->Now(); grpc_millis next_allowed_ping = t->ping_state.last_ping_sent_time + t->ping_policy.min_sent_ping_interval_without_data; diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index bff0fb36ade..3411acc5639 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -417,7 +417,6 @@ static void on_failed(bidirectional_stream* stream, int net_error) { gpr_mu_unlock(&s->mu); execute_from_storage(s); GRPC_CRONET_STREAM_UNREF(s, "cronet transport"); - grpc_exec_ctx_finish(); } /* @@ -444,7 +443,6 @@ static void on_canceled(bidirectional_stream* stream) { gpr_mu_unlock(&s->mu); execute_from_storage(s); GRPC_CRONET_STREAM_UNREF(s, "cronet transport"); - grpc_exec_ctx_finish(); } /* @@ -463,7 +461,6 @@ static void on_succeeded(bidirectional_stream* stream) { gpr_mu_unlock(&s->mu); execute_from_storage(s); GRPC_CRONET_STREAM_UNREF(s, "cronet transport"); - grpc_exec_ctx_finish(); } /* @@ -492,7 +489,6 @@ static void on_stream_ready(bidirectional_stream* stream) { } gpr_mu_unlock(&s->mu); execute_from_storage(s); - grpc_exec_ctx_finish(); } /* @@ -548,7 +544,6 @@ static void on_response_headers_received( } gpr_mu_unlock(&s->mu); execute_from_storage(s); - grpc_exec_ctx_finish(); } /* @@ -566,7 +561,6 @@ static void on_write_completed(bidirectional_stream* stream, const char* data) { s->state.state_callback_received[OP_SEND_MESSAGE] = true; gpr_mu_unlock(&s->mu); execute_from_storage(s); - grpc_exec_ctx_finish(); } /* @@ -608,7 +602,6 @@ static void on_read_completed(bidirectional_stream* stream, char* data, gpr_mu_unlock(&s->mu); execute_from_storage(s); } - grpc_exec_ctx_finish(); } /* @@ -666,7 +659,6 @@ static void on_response_trailers_received( gpr_mu_unlock(&s->mu); execute_from_storage(s); } - grpc_exec_ctx_finish(); } /* diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index 1c7f2873d10..a79b2b26b02 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/src/core/ext/transport/inproc/inproc_transport.cc @@ -1107,7 +1107,6 @@ void grpc_inproc_transport_init(void) { grpc_slice_unref_internal(auth_tmp); g_fake_auth_value = grpc_slice_from_static_string("inproc-fail"); - grpc_exec_ctx_finish(); } static const grpc_transport_vtable inproc_vtable = { @@ -1182,7 +1181,6 @@ grpc_channel* grpc_inproc_channel_create(grpc_server* server, grpc_channel_args_destroy(client_args); // Now finish scheduled operations - grpc_exec_ctx_finish(); return channel; } @@ -1194,5 +1192,4 @@ void grpc_inproc_transport_shutdown(void) { grpc_slice_unref_internal(g_fake_path_value); grpc_slice_unref_internal(g_fake_auth_key); grpc_slice_unref_internal(g_fake_auth_value); - grpc_exec_ctx_finish(); } diff --git a/src/core/lib/backoff/backoff.cc b/src/core/lib/backoff/backoff.cc index e6c55f420d3..b75ce79d464 100644 --- a/src/core/lib/backoff/backoff.cc +++ b/src/core/lib/backoff/backoff.cc @@ -36,7 +36,7 @@ grpc_backoff_result grpc_backoff_begin(grpc_backoff* backoff) { backoff->current_backoff = backoff->initial_backoff; const grpc_millis initial_timeout = GPR_MAX(backoff->initial_backoff, backoff->min_connect_timeout); - const grpc_millis now = grpc_exec_ctx_now(); + const grpc_millis now = ExecCtx::Get()->Now(); const grpc_backoff_result result = {now + initial_timeout, now + backoff->current_backoff}; return result; @@ -67,7 +67,7 @@ grpc_backoff_result grpc_backoff_step(grpc_backoff* backoff) { backoff->min_connect_timeout); const grpc_millis next_timeout = GPR_MIN( (grpc_millis)(backoff->current_backoff + jitter), backoff->max_backoff); - const grpc_millis now = grpc_exec_ctx_now(); + const grpc_millis now = ExecCtx::Get()->Now(); const grpc_backoff_result result = {now + current_timeout, now + next_timeout}; return result; diff --git a/src/core/lib/compression/stream_compression_gzip.cc b/src/core/lib/compression/stream_compression_gzip.cc index 4d5d0955cea..3fae3490cee 100644 --- a/src/core/lib/compression/stream_compression_gzip.cc +++ b/src/core/lib/compression/stream_compression_gzip.cc @@ -58,7 +58,7 @@ static bool gzip_flate(grpc_stream_compression_context_gzip* ctx, if (r < 0 && r != Z_BUF_ERROR) { gpr_log(GPR_ERROR, "zlib error (%d)", r); grpc_slice_unref_internal(slice_out); - grpc_exec_ctx_finish(); + return false; } else if (r == Z_STREAM_END && ctx->flate == inflate) { eoc = true; @@ -89,7 +89,7 @@ static bool gzip_flate(grpc_stream_compression_context_gzip* ctx, default: gpr_log(GPR_ERROR, "zlib error (%d)", r); grpc_slice_unref_internal(slice_out); - grpc_exec_ctx_finish(); + return false; } } else if (flush == Z_FINISH) { @@ -105,7 +105,7 @@ static bool gzip_flate(grpc_stream_compression_context_gzip* ctx, default: gpr_log(GPR_ERROR, "zlib error (%d)", r); grpc_slice_unref_internal(slice_out); - grpc_exec_ctx_finish(); + return false; } } @@ -121,7 +121,7 @@ static bool gzip_flate(grpc_stream_compression_context_gzip* ctx, } max_output_size -= (slice_size - ctx->zs.avail_out); } - grpc_exec_ctx_finish(); + if (end_of_context) { *end_of_context = eoc; } diff --git a/src/core/lib/debug/stats.h b/src/core/lib/debug/stats.h index 1c2826506c3..24b00841302 100644 --- a/src/core/lib/debug/stats.h +++ b/src/core/lib/debug/stats.h @@ -35,7 +35,7 @@ typedef struct grpc_stats_data { extern grpc_stats_data* grpc_stats_per_cpu_storage; #define GRPC_THREAD_STATS_DATA() \ - (&grpc_stats_per_cpu_storage[(exec_ctx)->starting_cpu]) + (&grpc_stats_per_cpu_storage[ExecCtx::Get()->starting_cpu()]) #define GRPC_STATS_INC_COUNTER(ctr) \ (gpr_atm_no_barrier_fetch_add(&GRPC_THREAD_STATS_DATA()->counters[(ctr)], 1)) diff --git a/src/core/lib/iomgr/block_annotate.h b/src/core/lib/iomgr/block_annotate.h index 9db3cf0199e..7783da0c148 100644 --- a/src/core/lib/iomgr/block_annotate.h +++ b/src/core/lib/iomgr/block_annotate.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_BLOCK_ANNOTATE_H #define GRPC_CORE_LIB_IOMGR_BLOCK_ANNOTATE_H +#include "src/core/lib/iomgr/exec_ctx.h" + #ifdef __cplusplus extern "C" { #endif @@ -39,25 +41,18 @@ void gpr_thd_end_blocking_region(); do { \ gpr_thd_start_blocking_region(); \ } while (0) -#define GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX \ - do { \ - gpr_thd_end_blocking_region(); \ - } while (0) -#define GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX() \ - do { \ - gpr_thd_end_blocking_region(); \ - grpc_exec_ctx_invalidate_now(); \ +#define GRPC_SCHEDULING_END_BLOCKING_REGION \ + do { \ + gpr_thd_end_blocking_region(); \ + ExecCtx::Get()->InvalidateNow(); \ } while (0) #else #define GRPC_SCHEDULING_START_BLOCKING_REGION \ do { \ } while (0) -#define GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX \ - do { \ - } while (0) -#define GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX() \ - do { \ - grpc_exec_ctx_invalidate_now(); \ +#define GRPC_SCHEDULING_END_BLOCKING_REGION \ + do { \ + ExecCtx::Get()->InvalidateNow(); \ } while (0) #endif diff --git a/src/core/lib/iomgr/combiner.cc b/src/core/lib/iomgr/combiner.cc index b1b8fffdcad..c9f5448630a 100644 --- a/src/core/lib/iomgr/combiner.cc +++ b/src/core/lib/iomgr/combiner.cc @@ -128,20 +128,24 @@ grpc_combiner* grpc_combiner_ref(grpc_combiner* lock GRPC_COMBINER_DEBUG_ARGS) { } static void push_last_on_exec_ctx(grpc_combiner* lock) { - lock->next_combiner_on_this_exec_ctx = NULL; - if (exec_ctx->active_combiner == NULL) { - exec_ctx->active_combiner = exec_ctx->last_combiner = lock; + lock->next_combiner_on_this_exec_ctx = nullptr; + if (ExecCtx::Get()->combiner_data()->active_combiner == nullptr) { + ExecCtx::Get()->combiner_data()->active_combiner = + ExecCtx::Get()->combiner_data()->last_combiner = lock; } else { - exec_ctx->last_combiner->next_combiner_on_this_exec_ctx = lock; - exec_ctx->last_combiner = lock; + ExecCtx::Get() + ->combiner_data() + ->last_combiner->next_combiner_on_this_exec_ctx = lock; + ExecCtx::Get()->combiner_data()->last_combiner = lock; } } static void push_first_on_exec_ctx(grpc_combiner* lock) { - lock->next_combiner_on_this_exec_ctx = exec_ctx->active_combiner; - exec_ctx->active_combiner = lock; + lock->next_combiner_on_this_exec_ctx = + ExecCtx::Get()->combiner_data()->active_combiner; + ExecCtx::Get()->combiner_data()->active_combiner = lock; if (lock->next_combiner_on_this_exec_ctx == NULL) { - exec_ctx->last_combiner = lock; + ExecCtx::Get()->combiner_data()->last_combiner = lock; } } @@ -161,7 +165,7 @@ static void combiner_exec(grpc_closure* cl, grpc_error* error) { GRPC_STATS_INC_COMBINER_LOCKS_INITIATED(); GPR_TIMER_MARK("combiner.initiated", 0); gpr_atm_no_barrier_store(&lock->initiating_exec_ctx_or_null, - (gpr_atm)exec_ctx); + (gpr_atm)ExecCtx::Get()); // first element on this list: add it to the list of combiner locks // executing within this exec_ctx push_last_on_exec_ctx(lock); @@ -170,7 +174,7 @@ static void combiner_exec(grpc_closure* cl, grpc_error* error) { // offload for one or two actions, and that's fine gpr_atm initiator = gpr_atm_no_barrier_load(&lock->initiating_exec_ctx_or_null); - if (initiator != 0 && initiator != (gpr_atm)exec_ctx) { + if (initiator != 0 && initiator != (gpr_atm)ExecCtx::Get()) { gpr_atm_no_barrier_store(&lock->initiating_exec_ctx_or_null, 0); } } @@ -182,10 +186,12 @@ static void combiner_exec(grpc_closure* cl, grpc_error* error) { } static void move_next() { - exec_ctx->active_combiner = - exec_ctx->active_combiner->next_combiner_on_this_exec_ctx; - if (exec_ctx->active_combiner == NULL) { - exec_ctx->last_combiner = NULL; + ExecCtx::Get()->combiner_data()->active_combiner = + ExecCtx::Get() + ->combiner_data() + ->active_combiner->next_combiner_on_this_exec_ctx; + if (ExecCtx::Get()->combiner_data()->active_combiner == NULL) { + ExecCtx::Get()->combiner_data()->last_combiner = NULL; } } @@ -203,7 +209,7 @@ static void queue_offload(grpc_combiner* lock) { bool grpc_combiner_continue_exec_ctx() { GPR_TIMER_BEGIN("combiner.continue_exec_ctx", 0); - grpc_combiner* lock = exec_ctx->active_combiner; + grpc_combiner* lock = ExecCtx::Get()->combiner_data()->active_combiner; if (lock == NULL) { GPR_TIMER_END("combiner.continue_exec_ctx", 0); return false; @@ -217,10 +223,11 @@ bool grpc_combiner_continue_exec_ctx() { "contended=%d " "exec_ctx_ready_to_finish=%d " "time_to_execute_final_list=%d", - lock, contended, grpc_exec_ctx_ready_to_finish(), + lock, contended, + ExecCtx::Get()->IsReadyToFinish(), lock->time_to_execute_final_list)); - if (contended && grpc_exec_ctx_ready_to_finish() && + if (contended && ExecCtx::Get()->IsReadyToFinish() && grpc_executor_is_threaded()) { GPR_TIMER_MARK("offload_from_finished_exec_ctx", 0); // this execution context wants to move on: schedule remaining work to be @@ -326,11 +333,11 @@ static void combiner_finally_exec(grpc_closure* closure, grpc_error* error) { GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS(); grpc_combiner* lock = COMBINER_FROM_CLOSURE_SCHEDULER(closure, finally_scheduler); - GRPC_COMBINER_TRACE(gpr_log(GPR_DEBUG, - "C:%p grpc_combiner_execute_finally c=%p; ac=%p", - lock, closure, exec_ctx->active_combiner)); + GRPC_COMBINER_TRACE( + gpr_log(GPR_DEBUG, "C:%p grpc_combiner_execute_finally c=%p; ac=%p", lock, + closure, ExecCtx::Get()->combiner_data()->active_combiner)); GPR_TIMER_BEGIN("combiner.execute_finally", 0); - if (exec_ctx->active_combiner != lock) { + if (ExecCtx::Get()->combiner_data()->active_combiner != lock) { GPR_TIMER_MARK("slowpath", 0); GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(enqueue_finally, closure, grpc_combiner_scheduler(lock)), diff --git a/src/core/lib/iomgr/endpoint_pair_posix.cc b/src/core/lib/iomgr/endpoint_pair_posix.cc index 696ac6942f0..1a281322a84 100644 --- a/src/core/lib/iomgr/endpoint_pair_posix.cc +++ b/src/core/lib/iomgr/endpoint_pair_posix.cc @@ -65,7 +65,6 @@ grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char* name, "socketpair-client"); gpr_free(final_name); - grpc_exec_ctx_finish(); return p; } diff --git a/src/core/lib/iomgr/endpoint_pair_windows.cc b/src/core/lib/iomgr/endpoint_pair_windows.cc index d4646170979..e0f211cdf91 100644 --- a/src/core/lib/iomgr/endpoint_pair_windows.cc +++ b/src/core/lib/iomgr/endpoint_pair_windows.cc @@ -77,7 +77,7 @@ grpc_endpoint_pair grpc_iomgr_create_endpoint_pair( channel_args, "endpoint:server"); p.server = grpc_tcp_create(grpc_winsocket_create(sv[0], "endpoint:server"), channel_args, "endpoint:client"); - grpc_exec_ctx_finish(); + return p; } diff --git a/src/core/lib/iomgr/error.cc b/src/core/lib/iomgr/error.cc index ce8b538773e..157f12a36dd 100644 --- a/src/core/lib/iomgr/error.cc +++ b/src/core/lib/iomgr/error.cc @@ -157,11 +157,7 @@ static void unref_errs(grpc_error* err) { } } -static void unref_slice(grpc_slice slice) { - ExecCtx _local_exec_ctx; - grpc_slice_unref_internal(slice); - grpc_exec_ctx_finish(); -} +static void unref_slice(grpc_slice slice) { grpc_slice_unref_internal(slice); } static void unref_strs(grpc_error* err) { for (size_t which = 0; which < GRPC_ERROR_STR_MAX; ++which) { diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc index 31f51df15d8..2b486887b81 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -554,7 +554,7 @@ static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { static int poll_deadline_to_millis_timeout(grpc_millis millis) { if (millis == GRPC_MILLIS_INF_FUTURE) return -1; - grpc_millis delta = millis - grpc_exec_ctx_now(); + grpc_millis delta = millis - ExecCtx::Get()->Now(); if (delta > INT_MAX) { return INT_MAX; } else if (delta < 0) { @@ -630,7 +630,7 @@ static grpc_error* do_epoll_wait(grpc_pollset* ps, grpc_millis deadline) { timeout); } while (r < 0 && errno == EINTR); if (timeout != 0) { - GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(); + GRPC_SCHEDULING_END_BLOCKING_REGION; } if (r < 0) return GRPC_OS_ERROR(errno, "epoll_wait"); @@ -743,7 +743,7 @@ static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, SET_KICK_STATE(worker, KICKED); } } - grpc_exec_ctx_invalidate_now(); + ExecCtx::Get()->InvalidateNow(); } if (GRPC_TRACER_ON(grpc_polling_trace)) { @@ -848,7 +848,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, /* Make sure we appear kicked */ SET_KICK_STATE(worker, KICKED); grpc_closure_list_move(&worker->schedule_on_end_work, - &exec_ctx->closure_list); + ExecCtx::Get()->closure_list()); if (gpr_atm_no_barrier_load(&g_active_poller) == (gpr_atm)worker) { if (worker->next != worker && worker->next->state == UNKICKED) { if (GRPC_TRACER_ON(grpc_polling_trace)) { @@ -859,9 +859,9 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, SET_KICK_STATE(worker->next, DESIGNATED_POLLER); GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); gpr_cv_signal(&worker->next->cv); - if (grpc_exec_ctx_has_work()) { + if (ExecCtx::Get()->HasWork()) { gpr_mu_unlock(&pollset->mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->mu); } } else { @@ -892,12 +892,12 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, found_worker = check_neighborhood_for_available_poller(neighborhood); gpr_mu_unlock(&neighborhood->mu); } - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->mu); } - } else if (grpc_exec_ctx_has_work()) { + } else if (ExecCtx::Get()->HasWork()) { gpr_mu_unlock(&pollset->mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->mu); } if (worker->initialized_cv) { @@ -948,9 +948,9 @@ static grpc_error* pollset_work(grpc_pollset* ps, process_epoll_events() returns very quickly: It just queues the work on exec_ctx but does not execute it (the actual exectution or more - accurately grpc_exec_ctx_flush() happens in end_worker() AFTER selecting - a designated poller). So we are not waiting long periods without a - designated poller */ + accurately ExecCtx::Get()->Flush() happens in end_worker() AFTER + selecting a designated poller). So we are not waiting long periods + without a designated poller */ if (gpr_atm_acq_load(&g_epoll_set.cursor) == gpr_atm_acq_load(&g_epoll_set.num_events)) { append_error(&error, do_epoll_wait(ps, deadline), err_desc); diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc index 0979a45270b..385b5f68d06 100644 --- a/src/core/lib/iomgr/ev_epollex_linux.cc +++ b/src/core/lib/iomgr/ev_epollex_linux.cc @@ -682,7 +682,7 @@ static void pollset_init(grpc_pollset* pollset, gpr_mu** mu) { static int poll_deadline_to_millis_timeout(grpc_millis millis) { if (millis == GRPC_MILLIS_INF_FUTURE) return -1; - grpc_millis delta = millis - grpc_exec_ctx_now(); + grpc_millis delta = millis - ExecCtx::Get()->Now(); if (delta > INT_MAX) return INT_MAX; else if (delta < 0) @@ -804,7 +804,7 @@ static grpc_error* pollable_epoll(pollable* p, grpc_millis deadline) { r = epoll_wait(p->epfd, p->events, MAX_EPOLL_EVENTS, timeout); } while (r < 0 && errno == EINTR); if (timeout != 0) { - GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(); + GRPC_SCHEDULING_END_BLOCKING_REGION; } if (r < 0) return GRPC_OS_ERROR(errno, "epoll_wait"); @@ -902,7 +902,7 @@ static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, worker->pollable_obj, worker); } } - grpc_exec_ctx_invalidate_now(); + ExecCtx::Get()->InvalidateNow(); } else { gpr_mu_unlock(&pollset->mu); } @@ -970,7 +970,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, gpr_log(GPR_DEBUG, "PS:%p work hdl=%p worker=%p now=%" PRIdPTR " deadline=%" PRIdPTR " kwp=%d pollable=%p", - pollset, worker_hdl, WORKER_PTR, grpc_exec_ctx_now(), deadline, + pollset, worker_hdl, WORKER_PTR, ExecCtx::Get()->Now(), deadline, pollset->kicked_without_poller, pollset->active_pollable); } static const char* err_desc = "pollset_work"; @@ -990,7 +990,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, &error, pollable_process_events(pollset, WORKER_PTR->pollable_obj, false), err_desc); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_tls_set(&g_current_thread_pollset, 0); gpr_tls_set(&g_current_thread_worker, 0); } diff --git a/src/core/lib/iomgr/ev_epollsig_linux.cc b/src/core/lib/iomgr/ev_epollsig_linux.cc index c42a609fee1..a9b094a2fab 100644 --- a/src/core/lib/iomgr/ev_epollsig_linux.cc +++ b/src/core/lib/iomgr/ev_epollsig_linux.cc @@ -1090,7 +1090,7 @@ static void pollset_init(grpc_pollset* pollset, gpr_mu** mu) { static int poll_deadline_to_millis_timeout(grpc_millis millis) { if (millis == GRPC_MILLIS_INF_FUTURE) return -1; - grpc_millis delta = millis - grpc_exec_ctx_now(); + grpc_millis delta = millis - ExecCtx::Get()->Now(); if (delta > INT_MAX) return INT_MAX; else if (delta < 0) @@ -1220,7 +1220,7 @@ static void pollset_work_and_unlock(grpc_pollset* pollset, GRPC_STATS_INC_SYSCALL_POLL(); ep_rv = epoll_pwait(epoll_fd, ep_ev, GRPC_EPOLL_MAX_EVENTS, timeout_ms, sig_mask); - GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(); + GRPC_SCHEDULING_END_BLOCKING_REGION; if (ep_rv < 0) { if (errno != EINTR) { gpr_asprintf(&err_msg, @@ -1350,7 +1350,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, pollset_work_and_unlock(pollset, &worker, timeout_ms, &g_orig_sigmask, &error); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->po.mu); @@ -1373,7 +1373,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, finish_shutdown_locked(pollset); gpr_mu_unlock(&pollset->po.mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->po.mu); } diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index c7189950f03..cab4f7547c4 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -976,7 +976,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, GRPC_SCHEDULING_START_BLOCKING_REGION; GRPC_STATS_INC_SYSCALL_POLL(); r = grpc_poll_function(pfds, pfd_count, timeout); - GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(); + GRPC_SCHEDULING_END_BLOCKING_REGION; if (GRPC_TRACER_ON(grpc_polling_trace)) { gpr_log(GPR_DEBUG, "%p poll=%d", pollset, r); @@ -1040,7 +1040,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, worker list, which means nobody could ask us to re-evaluate polling). */ done: if (!locked) { - queued_work |= grpc_exec_ctx_flush(); + queued_work |= ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->mu); locked = 1; } @@ -1074,7 +1074,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, pollset->called_shutdown = 1; gpr_mu_unlock(&pollset->mu); finish_shutdown(pollset); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); /* Continuing to access pollset here is safe -- it is the caller's * responsibility to not destroy when it has outstanding calls to * pollset_work. @@ -1083,7 +1083,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, } else if (!grpc_closure_list_empty(pollset->idle_jobs)) { GRPC_CLOSURE_LIST_SCHED(&pollset->idle_jobs); gpr_mu_unlock(&pollset->mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->mu); } } @@ -1110,7 +1110,7 @@ static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { static int poll_deadline_to_millis_timeout(grpc_millis deadline) { if (deadline == GRPC_MILLIS_INF_FUTURE) return -1; if (deadline == 0) return 0; - grpc_millis n = deadline - grpc_exec_ctx_now(); + grpc_millis n = deadline - ExecCtx::Get()->Now(); if (n < 0) return 0; if (n > INT_MAX) return -1; return (int)n; diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index c10d1e60f06..fe5a0e7e2de 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -27,45 +27,19 @@ thread_local ExecCtx* exec_ctx = nullptr; -ExecCtx::ExecCtx() - : closure_list(GRPC_CLOSURE_LIST_INIT), - active_combiner(nullptr), - last_combiner(nullptr), - flags(GRPC_EXEC_CTX_FLAG_IS_FINISHED), - starting_cpu(gpr_cpu_current_cpu()), - check_ready_to_finish_arg(nullptr), - check_ready_to_finish(nullptr), - now_is_valid(false), - now(0), - last_exec_ctx(exec_ctx) { - exec_ctx = this; -} - -ExecCtx::ExecCtx(uintptr_t fl, bool (*finish_check)(void* arg), - void* finish_check_arg) - : closure_list(GRPC_CLOSURE_LIST_INIT), - active_combiner(nullptr), - last_combiner(nullptr), - flags(fl), - starting_cpu(gpr_cpu_current_cpu()), - check_ready_to_finish_arg(finish_check_arg), - check_ready_to_finish(finish_check), - now_is_valid(false), - now(0), - last_exec_ctx(exec_ctx) { - exec_ctx = this; -} - +ExecCtx::ExecCtx() : flags_(GRPC_EXEC_CTX_FLAG_IS_FINISHED) { exec_ctx = this; } +ExecCtx::ExecCtx(uintptr_t fl) : flags_(fl) { exec_ctx = this; } ExecCtx::~ExecCtx() { GPR_ASSERT(exec_ctx == this); - grpc_exec_ctx_finish(); - exec_ctx = last_exec_ctx; + flags_ |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; + Flush(); + exec_ctx = last_exec_ctx_; } -bool grpc_exec_ctx_ready_to_finish() { - if ((exec_ctx->flags & GRPC_EXEC_CTX_FLAG_IS_FINISHED) == 0) { - if (exec_ctx->check_ready_to_finish(exec_ctx->check_ready_to_finish_arg)) { - exec_ctx->flags |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; +bool ExecCtx::IsReadyToFinish() { + if ((flags_ & GRPC_EXEC_CTX_FLAG_IS_FINISHED) == 0) { + if (CheckReadyToFinish()) { + flags_ |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; return true; } return false; @@ -74,21 +48,7 @@ bool grpc_exec_ctx_ready_to_finish() { } } -bool grpc_never_ready_to_finish(void* arg_ignored) { return false; } - -bool grpc_always_ready_to_finish(void* arg_ignored) { return true; } - -bool grpc_exec_ctx_has_work() { - return exec_ctx->active_combiner != NULL || - !grpc_closure_list_empty(exec_ctx->closure_list); -} - -void grpc_exec_ctx_finish() { - exec_ctx->flags |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; - grpc_exec_ctx_flush(); -} - -static void exec_ctx_run(grpc_closure* closure, grpc_error* error) { +void exec_ctx_run(grpc_closure* closure, grpc_error* error) { #ifndef NDEBUG closure->scheduled = false; if (GRPC_TRACER_ON(grpc_trace_closure)) { @@ -107,13 +67,13 @@ static void exec_ctx_run(grpc_closure* closure, grpc_error* error) { GRPC_ERROR_UNREF(error); } -bool grpc_exec_ctx_flush() { +bool ExecCtx::Flush() { bool did_something = 0; GPR_TIMER_BEGIN("grpc_exec_ctx_flush", 0); for (;;) { - if (!grpc_closure_list_empty(exec_ctx->closure_list)) { - grpc_closure* c = exec_ctx->closure_list.head; - exec_ctx->closure_list.head = exec_ctx->closure_list.tail = NULL; + if (!grpc_closure_list_empty(closure_list_)) { + grpc_closure* c = closure_list_.head; + closure_list_.head = closure_list_.tail = NULL; while (c != NULL) { grpc_closure* next = c->next_data.next; grpc_error* error = c->error_data.error; @@ -125,13 +85,13 @@ bool grpc_exec_ctx_flush() { break; } } - GPR_ASSERT(exec_ctx->active_combiner == NULL); + GPR_ASSERT(combiner_data_.active_combiner == nullptr); GPR_TIMER_END("grpc_exec_ctx_flush", 0); return did_something; } -static void exec_ctx_sched(grpc_closure* closure, grpc_error* error) { - grpc_closure_list_append(&exec_ctx->closure_list, closure, error); +void exec_ctx_sched(grpc_closure* closure, grpc_error* error) { + grpc_closure_list_append(exec_ctx->closure_list(), closure, error); } static gpr_timespec @@ -139,7 +99,7 @@ static gpr_timespec // last enum value in // gpr_clock_type -void grpc_exec_ctx_global_init(void) { +void ExecCtx::GlobalInit(void) { for (int i = 0; i < GPR_TIMESPAN; i++) { g_start_time[i] = gpr_now((gpr_clock_type)i); } @@ -147,7 +107,7 @@ void grpc_exec_ctx_global_init(void) { g_start_time[GPR_TIMESPAN] = gpr_time_0(GPR_TIMESPAN); } -void grpc_exec_ctx_global_shutdown(void) {} +void ExecCtx::GlobalShutdown(void) {} static gpr_atm timespec_to_atm_round_down(gpr_timespec ts) { ts = gpr_time_sub(ts, g_start_time[ts.clock_type]); @@ -168,16 +128,6 @@ static gpr_atm timespec_to_atm_round_up(gpr_timespec ts) { return (gpr_atm)x; } -grpc_millis grpc_exec_ctx_now() { - if (!exec_ctx->now_is_valid) { - exec_ctx->now = timespec_to_atm_round_down(gpr_now(GPR_CLOCK_MONOTONIC)); - exec_ctx->now_is_valid = true; - } - return exec_ctx->now; -} - -void grpc_exec_ctx_invalidate_now() { exec_ctx->now_is_valid = false; } - gpr_timespec grpc_millis_to_timespec(grpc_millis millis, gpr_clock_type clock_type) { // special-case infinities as grpc_millis can be 32bit on some platforms @@ -204,6 +154,16 @@ grpc_millis grpc_timespec_to_millis_round_up(gpr_timespec ts) { return timespec_to_atm_round_up(ts); } +grpc_millis ExecCtx::Now() { + if (!now_is_valid_) { + now_ = timespec_to_atm_round_down(gpr_now(GPR_CLOCK_MONOTONIC)); + now_is_valid_ = true; + } + return now_; +} + +ExecCtx* ExecCtx::Get() { return exec_ctx; } + static const grpc_closure_scheduler_vtable exec_ctx_scheduler_vtable = { exec_ctx_run, exec_ctx_sched, "exec_ctx"}; static grpc_closure_scheduler exec_ctx_scheduler = {&exec_ctx_scheduler_vtable}; diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index a80bcbbc0d9..a71e43e178c 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -66,95 +66,81 @@ typedef struct grpc_combiner grpc_combiner; * - Instances are always passed as the first argument to a function that * takes it, and always as a pointer (grpc_exec_ctx is never copied). */ -struct grpc_exec_ctx { - grpc_closure_list closure_list; - /** currently active combiner: updated only via combiner.c */ - grpc_combiner* active_combiner; - /** last active combiner in the active combiner list */ - grpc_combiner* last_combiner; - uintptr_t flags; - unsigned starting_cpu; - void* check_ready_to_finish_arg; - bool (*check_ready_to_finish)(void* arg); - - bool now_is_valid; - grpc_millis now; - const char* creator; -}; - -extern grpc_closure_scheduler* grpc_schedule_on_exec_ctx; - -bool grpc_exec_ctx_has_work(); - -/** Flush any work that has been enqueued onto this grpc_exec_ctx. - * Caller must guarantee that no interfering locks are held. - * Returns true if work was performed, false otherwise. */ -bool grpc_exec_ctx_flush(); -/** Finish any pending work for a grpc_exec_ctx. Must be called before - * the instance is destroyed, or work may be lost. */ -void grpc_exec_ctx_finish(); -/** Returns true if we'd like to leave this execution context as soon as - possible: useful for deciding whether to do something more or not depending - on outside context */ -bool grpc_exec_ctx_ready_to_finish(); -/** A finish check that is never ready to finish */ -bool grpc_never_ready_to_finish(void* arg_ignored); -/** A finish check that is always ready to finish */ -bool grpc_always_ready_to_finish(void* arg_ignored); - -void grpc_exec_ctx_global_init(void); - -void grpc_exec_ctx_global_init(void); -void grpc_exec_ctx_global_shutdown(void); - -grpc_millis grpc_exec_ctx_now(); -void grpc_exec_ctx_invalidate_now(); -gpr_timespec grpc_millis_to_timespec(grpc_millis millis, gpr_clock_type clock); -grpc_millis grpc_timespec_to_millis_round_down(gpr_timespec timespec); -grpc_millis grpc_timespec_to_millis_round_up(gpr_timespec timespec); - -inline grpc_exec_ctx make_exec_ctx(grpc_exec_ctx r) { - grpc_exec_ctx_flush(); - return r; -} - class ExecCtx { public: ExecCtx(); - ExecCtx(uintptr_t fl, bool (*finish_check)(void* arg), - void* finish_check_arg); + ExecCtx(uintptr_t fl); ~ExecCtx(); - grpc_closure_list closure_list; - /** currently active combiner: updated only via combiner.c */ - grpc_combiner* active_combiner; - /** last active combiner in the active combiner list */ - grpc_combiner* last_combiner; - uintptr_t flags; - unsigned starting_cpu; - void* check_ready_to_finish_arg; - bool (*check_ready_to_finish)(void* arg); - - bool now_is_valid; - grpc_millis now; - - private: - ExecCtx* last_exec_ctx; -}; + unsigned starting_cpu() const { return starting_cpu_; } + + struct CombinerData { + /* currently active combiner: updated only via combiner.c */ + grpc_combiner* active_combiner; + /* last active combiner in the active combiner list */ + grpc_combiner* last_combiner; + }; + + /** Only to be used by grpc-combiner code */ + CombinerData* combiner_data() { return &combiner_data_; } + + grpc_closure_list* closure_list() { return &closure_list_; } + + bool HasWork() { + return combiner_data_.active_combiner != NULL || + !grpc_closure_list_empty(closure_list_); + } + + /** Flush any work that has been enqueued onto this grpc_exec_ctx. + * Caller must guarantee that no interfering locks are held. + * Returns true if work was performed, false otherwise. */ + bool Flush(); + + /** Returns true if we'd like to leave this execution context as soon as +possible: useful for deciding whether to do something more or not depending +on outside context */ + bool IsReadyToFinish(); -extern thread_local ExecCtx* exec_ctx; + grpc_millis Now(); -/* initializer for grpc_exec_ctx: - * prefer to use GRPC_EXEC_CTX_INIT whenever possible */ -#define GRPC_EXEC_CTX_INITIALIZER(flags, finish_check, finish_check_arg) \ - make_exec_ctx(grpc_exec_ctx{GRPC_CLOSURE_LIST_INIT, NULL, NULL, flags, \ - gpr_cpu_current_cpu(), finish_check_arg, \ - finish_check, false, 0, __PRETTY_FUNCTION__}) + void InvalidateNow() { now_is_valid_ = false; } -/* initialize an execution context at the top level of an API call into grpc - (this is safe to use elsewhere, though possibly not as efficient) */ -#define GRPC_EXEC_CTX_INIT \ - GRPC_EXEC_CTX_INITIALIZER(GRPC_EXEC_CTX_FLAG_IS_FINISHED, NULL, NULL) + void SetNow(grpc_millis new_val) { + now_ = new_val; + now_is_valid_ = true; + } + + uintptr_t flags() { return flags_; } + + /** Finish any pending work for a grpc_exec_ctx. Must be called before + * the instance is destroyed, or work may be lost. */ + void Finish(); + + static void GlobalInit(void); + + static void GlobalShutdown(void); + + static ExecCtx* Get(); + + protected: + virtual bool CheckReadyToFinish() { return false; } + + grpc_closure_list closure_list_ = GRPC_CLOSURE_LIST_INIT; + CombinerData combiner_data_ = {nullptr, nullptr}; + uintptr_t flags_; + unsigned starting_cpu_ = gpr_cpu_current_cpu(); + + bool now_is_valid_ = false; + grpc_millis now_ = 0; + + ExecCtx* last_exec_ctx_ = Get(); +}; + +extern grpc_closure_scheduler* grpc_schedule_on_exec_ctx; + +gpr_timespec grpc_millis_to_timespec(grpc_millis millis, gpr_clock_type clock); +grpc_millis grpc_timespec_to_millis_round_down(gpr_timespec timespec); +grpc_millis grpc_timespec_to_millis_round_up(gpr_timespec timespec); #ifdef __cplusplus } diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index f764d915ff6..bf8805a2cdd 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -78,7 +78,7 @@ static size_t run_closures(grpc_closure_list list) { GRPC_ERROR_UNREF(error); c = next; n++; - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } return n; @@ -145,7 +145,7 @@ static void executor_thread(void* arg) { thread_state* ts = (thread_state*)arg; gpr_tls_set(&g_this_thread_state, (intptr_t)ts); - ExecCtx _local_exec_ctx(0, grpc_never_ready_to_finish, NULL); + ExecCtx _local_exec_ctx; size_t subtract_depth = 0; for (;;) { @@ -175,10 +175,9 @@ static void executor_thread(void* arg) { gpr_log(GPR_DEBUG, "EXECUTOR[%d]: execute", (int)(ts - g_thread_state)); } - grpc_exec_ctx_invalidate_now(); + ExecCtx::Get()->InvalidateNow(); subtract_depth = run_closures(exec); } - grpc_exec_ctx_finish(); } static void executor_push(grpc_closure* closure, grpc_error* error, @@ -201,12 +200,12 @@ static void executor_push(grpc_closure* closure, grpc_error* error, gpr_log(GPR_DEBUG, "EXECUTOR: schedule %p inline", closure); #endif } - grpc_closure_list_append(&exec_ctx->closure_list, closure, error); + grpc_closure_list_append(ExecCtx::Get()->closure_list(), closure, error); return; } thread_state* ts = (thread_state*)gpr_tls_get(&g_this_thread_state); if (ts == NULL) { - ts = &g_thread_state[GPR_HASH_POINTER(exec_ctx, cur_thread_count)]; + ts = &g_thread_state[GPR_HASH_POINTER(ExecCtx::Get(), cur_thread_count)]; } else { GRPC_STATS_INC_EXECUTOR_SCHEDULED_TO_SELF(); } diff --git a/src/core/lib/iomgr/iocp_windows.cc b/src/core/lib/iomgr/iocp_windows.cc index 8f15f5e6ccd..1686bf28727 100644 --- a/src/core/lib/iomgr/iocp_windows.cc +++ b/src/core/lib/iomgr/iocp_windows.cc @@ -46,7 +46,7 @@ static DWORD deadline_to_millis_timeout(grpc_millis deadline) { if (deadline == GRPC_MILLIS_INF_FUTURE) { return INFINITE; } - grpc_millis now = grpc_exec_ctx_now(); + grpc_millis now = ExecCtx::Get()->Now(); if (deadline < now) return 0; grpc_millis timeout = deadline - now; if (timeout > std::numeric_limits::max()) return INFINITE; @@ -65,7 +65,7 @@ grpc_iocp_work_status grpc_iocp_work(grpc_millis deadline) { success = GetQueuedCompletionStatus(g_iocp, &bytes, &completion_key, &overlapped, deadline_to_millis_timeout(deadline)); - grpc_exec_ctx_invalidate_now(); + ExecCtx::Get()->InvalidateNow(); if (success == 0 && overlapped == NULL) { return GRPC_IOCP_WORK_TIMEOUT; } @@ -118,16 +118,16 @@ void grpc_iocp_flush(void) { do { work_status = grpc_iocp_work(GRPC_MILLIS_INF_PAST); - } while (work_status == GRPC_IOCP_WORK_KICK || grpc_exec_ctx_flush()); + } while (work_status == GRPC_IOCP_WORK_KICK || ExecCtx::Get()->Flush()); } void grpc_iocp_shutdown(void) { ExecCtx _local_exec_ctx; while (gpr_atm_acq_load(&g_custom_events)) { grpc_iocp_work(GRPC_MILLIS_INF_FUTURE); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } - grpc_exec_ctx_finish(); + GPR_ASSERT(CloseHandle(g_iocp)); } diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index 01d9964cc82..a1add4a303a 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -49,7 +49,7 @@ void grpc_iomgr_init() { g_shutdown = 0; gpr_mu_init(&g_mu); gpr_cv_init(&g_rcv); - grpc_exec_ctx_global_init(); + ExecCtx::GlobalInit(); grpc_executor_init(); grpc_timer_list_init(); g_root_object.next = g_root_object.prev = &g_root_object; @@ -98,11 +98,10 @@ void grpc_iomgr_shutdown() { } last_warning_time = gpr_now(GPR_CLOCK_REALTIME); } - exec_ctx->now_is_valid = true; - exec_ctx->now = GRPC_MILLIS_INF_FUTURE; + ExecCtx::Get()->SetNow(GRPC_MILLIS_INF_FUTURE); if (grpc_timer_check(NULL) == GRPC_TIMERS_FIRED) { gpr_mu_unlock(&g_mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); grpc_iomgr_platform_flush(); gpr_mu_lock(&g_mu); continue; @@ -137,14 +136,14 @@ void grpc_iomgr_shutdown() { gpr_mu_unlock(&g_mu); grpc_timer_list_shutdown(); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); /* ensure all threads have left g_mu */ gpr_mu_lock(&g_mu); gpr_mu_unlock(&g_mu); grpc_iomgr_platform_shutdown(); - grpc_exec_ctx_global_shutdown(); + ExecCtx::GlobalShutdown(); grpc_network_status_shutdown(); gpr_mu_destroy(&g_mu); gpr_cv_destroy(&g_rcv); diff --git a/src/core/lib/iomgr/iomgr_uv.cc b/src/core/lib/iomgr/iomgr_uv.cc index 4dda970286e..2ab414252a3 100644 --- a/src/core/lib/iomgr/iomgr_uv.cc +++ b/src/core/lib/iomgr/iomgr_uv.cc @@ -34,7 +34,6 @@ void grpc_iomgr_platform_init(void) { grpc_register_tracer(&grpc_tcp_trace); grpc_executor_set_threading(false); g_init_thread = gpr_thd_currentid(); - grpc_exec_ctx_finish(); } void grpc_iomgr_platform_flush(void) {} void grpc_iomgr_platform_shutdown(void) { grpc_pollset_global_shutdown(); } diff --git a/src/core/lib/iomgr/load_file.cc b/src/core/lib/iomgr/load_file.cc index 97e448fb325..feef65cc34c 100644 --- a/src/core/lib/iomgr/load_file.cc +++ b/src/core/lib/iomgr/load_file.cc @@ -73,6 +73,6 @@ end: GRPC_ERROR_UNREF(error); error = error_out; } - GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX; + GRPC_SCHEDULING_END_BLOCKING_REGION; return error; } diff --git a/src/core/lib/iomgr/pollset_uv.cc b/src/core/lib/iomgr/pollset_uv.cc index 70288762972..a68ad4a6e3f 100644 --- a/src/core/lib/iomgr/pollset_uv.cc +++ b/src/core/lib/iomgr/pollset_uv.cc @@ -124,7 +124,7 @@ grpc_error* grpc_pollset_work(grpc_pollset* pollset, GRPC_UV_ASSERT_SAME_THREAD(); gpr_mu_unlock(&grpc_polling_mu); if (grpc_pollset_work_run_loop) { - grpc_millis now = grpc_exec_ctx_now(); + grpc_millis now = ExecCtx::Get()->Now(); if (deadline >= now) { timeout = deadline - now; } else { @@ -143,7 +143,7 @@ grpc_error* grpc_pollset_work(grpc_pollset* pollset, } } if (!grpc_closure_list_empty(exec_ctx->closure_list)) { - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } gpr_mu_lock(&grpc_polling_mu); return GRPC_ERROR_NONE; diff --git a/src/core/lib/iomgr/pollset_windows.cc b/src/core/lib/iomgr/pollset_windows.cc index dd019b1ec39..5ff3e7cb3a3 100644 --- a/src/core/lib/iomgr/pollset_windows.cc +++ b/src/core/lib/iomgr/pollset_windows.cc @@ -129,7 +129,7 @@ grpc_error* grpc_pollset_work(grpc_pollset* pollset, g_active_poller = &worker; gpr_mu_unlock(&grpc_polling_mu); grpc_iocp_work(deadline); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(&grpc_polling_mu); pollset->is_iocp_worker = 0; g_active_poller = NULL; @@ -160,10 +160,10 @@ grpc_error* grpc_pollset_work(grpc_pollset* pollset, while (!worker.kicked) { if (gpr_cv_wait(&worker.cv, &grpc_polling_mu, grpc_millis_to_timespec(deadline, GPR_CLOCK_REALTIME))) { - grpc_exec_ctx_invalidate_now(); + ExecCtx::Get()->InvalidateNow(); break; } - grpc_exec_ctx_invalidate_now(); + ExecCtx::Get()->InvalidateNow(); } } else { pollset->kicked_without_pollers = 0; @@ -171,7 +171,7 @@ grpc_error* grpc_pollset_work(grpc_pollset* pollset, done: if (!grpc_closure_list_empty(exec_ctx->closure_list)) { gpr_mu_unlock(&grpc_polling_mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(&grpc_polling_mu); } if (added_worker) { diff --git a/src/core/lib/iomgr/resolve_address_posix.cc b/src/core/lib/iomgr/resolve_address_posix.cc index 3795c3f75ef..80a1a45cc0b 100644 --- a/src/core/lib/iomgr/resolve_address_posix.cc +++ b/src/core/lib/iomgr/resolve_address_posix.cc @@ -81,7 +81,7 @@ static grpc_error* blocking_resolve_address_impl( GRPC_SCHEDULING_START_BLOCKING_REGION; s = getaddrinfo(host, port, &hints, &result); - GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX; + GRPC_SCHEDULING_END_BLOCKING_REGION; if (s != 0) { /* Retry if well-known service name is recognized */ @@ -90,7 +90,7 @@ static grpc_error* blocking_resolve_address_impl( if (strcmp(port, svc[i][0]) == 0) { GRPC_SCHEDULING_START_BLOCKING_REGION; s = getaddrinfo(host, svc[i][1], &hints, &result); - GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX; + GRPC_SCHEDULING_END_BLOCKING_REGION; break; } } diff --git a/src/core/lib/iomgr/resolve_address_uv.cc b/src/core/lib/iomgr/resolve_address_uv.cc index 038926af073..ffd70c4f35e 100644 --- a/src/core/lib/iomgr/resolve_address_uv.cc +++ b/src/core/lib/iomgr/resolve_address_uv.cc @@ -131,7 +131,7 @@ static void getaddrinfo_callback(uv_getaddrinfo_t* req, int status, original error probably has more interesting information */ error = handle_addrinfo_result(status, res, r->addresses); GRPC_CLOSURE_SCHED(r->on_done, error); - grpc_exec_ctx_finish(); + gpr_free(r->hints); gpr_free(r->host); gpr_free(r->port); diff --git a/src/core/lib/iomgr/resolve_address_windows.cc b/src/core/lib/iomgr/resolve_address_windows.cc index 15f3fd9f1a2..4e2bc7b5cab 100644 --- a/src/core/lib/iomgr/resolve_address_windows.cc +++ b/src/core/lib/iomgr/resolve_address_windows.cc @@ -87,7 +87,7 @@ static grpc_error* blocking_resolve_address_impl( GRPC_SCHEDULING_START_BLOCKING_REGION; s = getaddrinfo(host, port, &hints, &result); - GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX; + GRPC_SCHEDULING_END_BLOCKING_REGION; if (s != 0) { error = GRPC_WSA_ERROR(WSAGetLastError(), "getaddrinfo"); goto done; diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc index b58ae1cb21d..8fee585f4bb 100644 --- a/src/core/lib/iomgr/resource_quota.cc +++ b/src/core/lib/iomgr/resource_quota.cc @@ -624,7 +624,6 @@ void grpc_resource_quota_unref_internal(grpc_resource_quota* resource_quota) { void grpc_resource_quota_unref(grpc_resource_quota* resource_quota) { ExecCtx _local_exec_ctx; grpc_resource_quota_unref_internal(resource_quota); - grpc_exec_ctx_finish(); } grpc_resource_quota* grpc_resource_quota_ref_internal( @@ -656,7 +655,6 @@ void grpc_resource_quota_resize(grpc_resource_quota* resource_quota, (gpr_atm)GPR_MIN((size_t)GPR_ATM_MAX, size)); GRPC_CLOSURE_INIT(&a->closure, rq_resize, a, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_SCHED(&a->closure, GRPC_ERROR_NONE); - grpc_exec_ctx_finish(); } size_t grpc_resource_quota_peek_size(grpc_resource_quota* resource_quota) { diff --git a/src/core/lib/iomgr/tcp_client_uv.cc b/src/core/lib/iomgr/tcp_client_uv.cc index 2a127993a25..7454b014451 100644 --- a/src/core/lib/iomgr/tcp_client_uv.cc +++ b/src/core/lib/iomgr/tcp_client_uv.cc @@ -105,11 +105,10 @@ static void uv_tc_on_connect(uv_connect_t* req, int status) { } done = (--connect->refs == 0); if (done) { - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); uv_tcp_connect_cleanup(connect); } GRPC_CLOSURE_SCHED(closure, error); - grpc_exec_ctx_finish(); } static void tcp_client_connect_impl(grpc_closure* closure, grpc_endpoint** ep, diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index 697281d8b12..de3dabd7fc6 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -130,7 +130,7 @@ static void run_poller(void* bp, grpc_error* error_ignored) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p run", p); } gpr_mu_lock(p->pollset_mu); - grpc_millis deadline = grpc_exec_ctx_now() + 13 * GPR_MS_PER_SEC; + grpc_millis deadline = ExecCtx::Get()->Now() + 13 * GPR_MS_PER_SEC; GRPC_STATS_INC_TCP_BACKUP_POLLER_POLLS(); GRPC_LOG_IF_ERROR( "backup_poller:pollset_work", diff --git a/src/core/lib/iomgr/tcp_server_uv.cc b/src/core/lib/iomgr/tcp_server_uv.cc index 8d5387fe6ec..9db2cbe58d0 100644 --- a/src/core/lib/iomgr/tcp_server_uv.cc +++ b/src/core/lib/iomgr/tcp_server_uv.cc @@ -142,7 +142,6 @@ static void handle_close_callback(uv_handle_t* handle) { if (sp->server->open_ports == 0 && sp->server->shutdown) { finish_shutdown(sp->server); } - grpc_exec_ctx_finish(); } static void close_listener(grpc_tcp_listener* sp) { @@ -177,14 +176,8 @@ void grpc_tcp_server_unref(grpc_tcp_server* s) { /* Complete shutdown_starting work before destroying. */ ExecCtx _local_exec_ctx; GRPC_CLOSURE_LIST_SCHED(&s->shutdown_starting); - if (exec_ctx == NULL) { - grpc_exec_ctx_flush(); - tcp_server_destroy(s); - grpc_exec_ctx_finish(); - } else { - grpc_exec_ctx_finish(); - tcp_server_destroy(s); - } + ExecCtx::Get()->Flush(); + tcp_server_destroy(s); } } @@ -255,7 +248,6 @@ static void on_connect(uv_stream_t* server, int status) { } else { sp->has_pending_connection = true; } - grpc_exec_ctx_finish(); } static grpc_error* add_socket_to_server(grpc_tcp_server* s, uv_tcp_t* handle, diff --git a/src/core/lib/iomgr/tcp_uv.cc b/src/core/lib/iomgr/tcp_uv.cc index 571c1d6f9a2..3ea96748407 100644 --- a/src/core/lib/iomgr/tcp_uv.cc +++ b/src/core/lib/iomgr/tcp_uv.cc @@ -115,7 +115,6 @@ static void uv_close_callback(uv_handle_t* handle) { ExecCtx _local_exec_ctx; grpc_tcp* tcp = (grpc_tcp*)handle->data; TCP_UNREF(tcp, "destroy"); - grpc_exec_ctx_finish(); } static grpc_slice alloc_read_slice(grpc_resource_user* resource_user) { @@ -130,7 +129,6 @@ static void alloc_uv_buf(uv_handle_t* handle, size_t suggested_size, (void)suggested_size; buf->base = (char*)GRPC_SLICE_START_PTR(tcp->read_slice); buf->len = GRPC_SLICE_LENGTH(tcp->read_slice); - grpc_exec_ctx_finish(); } static void read_callback(uv_stream_t* stream, ssize_t nread, @@ -174,7 +172,6 @@ static void read_callback(uv_stream_t* stream, ssize_t nread, error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("TCP Read failed"); } GRPC_CLOSURE_SCHED(cb, error); - grpc_exec_ctx_finish(); } static void uv_endpoint_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, @@ -224,7 +221,6 @@ static void write_callback(uv_write_t* req, int status) { grpc_resource_user_free(tcp->resource_user, sizeof(uv_buf_t) * tcp->write_slices->count); GRPC_CLOSURE_SCHED(cb, error); - grpc_exec_ctx_finish(); } static void uv_endpoint_write(grpc_endpoint* ep, @@ -384,7 +380,6 @@ grpc_endpoint* grpc_tcp_create(uv_tcp_t* handle, uv_unref((uv_handle_t*)handle); #endif - grpc_exec_ctx_finish(); return &tcp->base; } diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index e7fe12b07bd..d5e6066f35e 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -249,7 +249,7 @@ void grpc_timer_list_init() { g_shared_mutables.initialized = true; g_shared_mutables.checker_mu = GPR_SPINLOCK_INITIALIZER; gpr_mu_init(&g_shared_mutables.mu); - g_shared_mutables.min_timer = grpc_exec_ctx_now(); + g_shared_mutables.min_timer = ExecCtx::Get()->Now(); gpr_tls_init(&g_last_seen_min_timer); gpr_tls_set(&g_last_seen_min_timer, 0); grpc_register_tracer(&grpc_timer_trace); @@ -341,7 +341,7 @@ void grpc_timer_init(grpc_timer* timer, grpc_millis deadline, if (GRPC_TRACER_ON(grpc_timer_trace)) { gpr_log(GPR_DEBUG, "TIMER %p: SET %" PRIdPTR " now %" PRIdPTR " call %p[%p]", timer, - deadline, grpc_exec_ctx_now(), closure, closure->cb); + deadline, ExecCtx::Get()->Now(), closure, closure->cb); } if (!g_shared_mutables.initialized) { @@ -354,7 +354,7 @@ void grpc_timer_init(grpc_timer* timer, grpc_millis deadline, gpr_mu_lock(&shard->mu); timer->pending = true; - grpc_millis now = grpc_exec_ctx_now(); + grpc_millis now = ExecCtx::Get()->Now(); if (deadline <= now) { timer->pending = false; GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_NONE); @@ -607,7 +607,7 @@ static grpc_timer_check_result run_some_expired_timers(gpr_atm now, grpc_timer_check_result grpc_timer_check(grpc_millis* next) { // prelude - grpc_millis now = grpc_exec_ctx_now(); + grpc_millis now = ExecCtx::Get()->Now(); /* fetch from a thread-local first: this avoids contention on a globally mutable cacheline in the common case */ diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc index 499fc73748f..69adb673d86 100644 --- a/src/core/lib/iomgr/timer_manager.cc +++ b/src/core/lib/iomgr/timer_manager.cc @@ -101,7 +101,6 @@ void grpc_timer_manager_tick() { ExecCtx _local_exec_ctx; grpc_millis next = GRPC_MILLIS_INF_FUTURE; grpc_timer_check(&next); - grpc_exec_ctx_finish(); } static void run_some_timers() { @@ -126,7 +125,7 @@ static void run_some_timers() { if (GRPC_TRACER_ON(grpc_timer_check_trace)) { gpr_log(GPR_DEBUG, "flush exec_ctx"); } - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(&g_mu); // garbage collect any threads hanging out that are dead gc_completed_threads(); @@ -179,7 +178,7 @@ static bool wait_until(grpc_millis next) { g_timed_waiter_deadline = next; if (GRPC_TRACER_ON(grpc_timer_check_trace)) { - grpc_millis wait_time = next - grpc_exec_ctx_now(); + grpc_millis wait_time = next - ExecCtx::Get()->Now(); gpr_log(GPR_DEBUG, "sleep for a %" PRIdPTR " milliseconds", wait_time); } @@ -224,7 +223,7 @@ static bool wait_until(grpc_millis next) { static void timer_main_loop() { for (;;) { grpc_millis next = GRPC_MILLIS_INF_FUTURE; - grpc_exec_ctx_invalidate_now(); + ExecCtx::Get()->InvalidateNow(); // check timer state, updates next to the next time to run a check switch (grpc_timer_check(&next)) { case GRPC_TIMERS_FIRED: @@ -274,9 +273,9 @@ static void timer_thread_cleanup(completed_thread* ct) { static void timer_thread(void* completed_thread_ptr) { // this threads exec_ctx: we try to run things through to completion here // since it's easy to spin up new threads - ExecCtx _local_exec_ctx(0, grpc_never_ready_to_finish, NULL); + ExecCtx _local_exec_ctx; timer_main_loop(); - grpc_exec_ctx_finish(); + timer_thread_cleanup((completed_thread*)completed_thread_ptr); } diff --git a/src/core/lib/iomgr/timer_uv.cc b/src/core/lib/iomgr/timer_uv.cc index 94601d99afc..6edd4169f12 100644 --- a/src/core/lib/iomgr/timer_uv.cc +++ b/src/core/lib/iomgr/timer_uv.cc @@ -51,7 +51,6 @@ void run_expired_timer(uv_timer_t* handle) { timer->pending = 0; GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_NONE); stop_uv_timer(handle); - grpc_exec_ctx_finish(); } void grpc_timer_init(grpc_timer* timer, grpc_millis deadline, @@ -60,13 +59,13 @@ void grpc_timer_init(grpc_timer* timer, grpc_millis deadline, uv_timer_t* uv_timer; GRPC_UV_ASSERT_SAME_THREAD(); timer->closure = closure; - if (deadline <= grpc_exec_ctx_now()) { + if (deadline <= ExecCtx::Get()->Now()) { timer->pending = 0; GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_NONE); return; } timer->pending = 1; - timeout = (uint64_t)(deadline - grpc_exec_ctx_now()); + timeout = (uint64_t)(deadline - ExecCtx::Get()->Now()); uv_timer = (uv_timer_t*)gpr_malloc(sizeof(uv_timer_t)); uv_timer_init(uv_default_loop(), uv_timer); uv_timer->data = timer; diff --git a/src/core/lib/security/context/security_context.cc b/src/core/lib/security/context/security_context.cc index 1d708c997c6..9b58b3657fd 100644 --- a/src/core/lib/security/context/security_context.cc +++ b/src/core/lib/security/context/security_context.cc @@ -57,7 +57,7 @@ grpc_call_error grpc_call_set_credentials(grpc_call* call, grpc_call_credentials_unref(ctx->creds); ctx->creds = grpc_call_credentials_ref(creds); } - grpc_exec_ctx_finish(); + return GRPC_CALL_OK; } @@ -95,7 +95,6 @@ void grpc_client_security_context_destroy(void* ctx) { c->extension.destroy(c->extension.instance); } gpr_free(ctx); - grpc_exec_ctx_finish(); } /* --- grpc_server_security_context --- */ diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index 20c4ae70fb3..6a272653f80 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -74,7 +74,6 @@ void grpc_channel_credentials_release(grpc_channel_credentials* creds) { GRPC_API_TRACE("grpc_channel_credentials_release(creds=%p)", 1, (creds)); ExecCtx _local_exec_ctx; grpc_channel_credentials_unref(creds); - grpc_exec_ctx_finish(); } grpc_call_credentials* grpc_call_credentials_ref(grpc_call_credentials* creds) { @@ -97,7 +96,6 @@ void grpc_call_credentials_release(grpc_call_credentials* creds) { GRPC_API_TRACE("grpc_call_credentials_release(creds=%p)", 1, (creds)); ExecCtx _local_exec_ctx; grpc_call_credentials_unref(creds); - grpc_exec_ctx_finish(); } bool grpc_call_credentials_get_request_metadata( @@ -213,7 +211,6 @@ void grpc_server_credentials_release(grpc_server_credentials* creds) { GRPC_API_TRACE("grpc_server_credentials_release(creds=%p)", 1, (creds)); ExecCtx _local_exec_ctx; grpc_server_credentials_unref(creds); - grpc_exec_ctx_finish(); } grpc_security_status grpc_server_credentials_create_security_connector( diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc index 897b9d75201..03ec4bc3b3d 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc @@ -114,13 +114,13 @@ static int is_stack_running_on_compute_engine() { grpc_resource_quota_create("google_default_credentials"); grpc_httpcli_get( &context, &detector.pollent, resource_quota, &request, - grpc_exec_ctx_now() + max_detection_delay, + ExecCtx::Get()->Now() + max_detection_delay, GRPC_CLOSURE_CREATE(on_compute_engine_detection_http_response, &detector, grpc_schedule_on_exec_ctx), &detector.response); grpc_resource_quota_unref_internal(resource_quota); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); /* Block until we get the response. This is not ideal but this should only be called once for the lifetime of the process by the default credentials. */ @@ -144,7 +144,7 @@ static int is_stack_running_on_compute_engine() { grpc_pollset_shutdown(grpc_polling_entity_pollset(&detector.pollent), &destroy_closure); g_polling_mu = NULL; - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_free(grpc_polling_entity_pollset(&detector.pollent)); grpc_http_response_destroy(&detector.response); @@ -285,7 +285,7 @@ end: } else { GRPC_ERROR_UNREF(error); } - grpc_exec_ctx_finish(); + return result; } @@ -299,7 +299,6 @@ void grpc_flush_cached_google_default_credentials(void) { } compute_engine_detection_done = 0; gpr_mu_unlock(&g_state_mu); - grpc_exec_ctx_finish(); } /* -- Well known credentials path. -- */ diff --git a/src/core/lib/security/credentials/iam/iam_credentials.cc b/src/core/lib/security/credentials/iam/iam_credentials.cc index 07938ec67e0..4d9da0cbe3d 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.cc +++ b/src/core/lib/security/credentials/iam/iam_credentials.cc @@ -77,6 +77,6 @@ grpc_call_credentials* grpc_google_iam_credentials_create( grpc_slice_from_copied_string(authority_selector)); grpc_credentials_mdelem_array_add(&c->md_array, md); GRPC_MDELEM_UNREF(md); - grpc_exec_ctx_finish(); + return &c->base; } diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.cc b/src/core/lib/security/credentials/jwt/jwt_credentials.cc index 1d43ee6e037..ccc3f4aeed5 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.cc +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.cc @@ -185,6 +185,6 @@ grpc_call_credentials* grpc_service_account_jwt_access_credentials_create( grpc_call_credentials* creds = grpc_service_account_jwt_access_credentials_create_from_auth_json_key( grpc_auth_json_key_create_from_string(json_key), token_lifetime); - grpc_exec_ctx_finish(); + return creds; } diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.cc b/src/core/lib/security/credentials/jwt/jwt_verifier.cc index eaa20787879..5246e1f9859 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.cc +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.cc @@ -358,7 +358,7 @@ static verifier_cb_ctx* verifier_cb_ctx_create( ctx->signed_data = grpc_slice_from_copied_buffer(signed_jwt, signed_jwt_len); ctx->user_data = user_data; ctx->user_cb = cb; - grpc_exec_ctx_finish(); + return ctx; } @@ -702,7 +702,7 @@ static void on_openid_config_retrieved(void* user_data, grpc_error* error) { resource_quota = grpc_resource_quota_create("jwt_verifier"); grpc_httpcli_get( &ctx->verifier->http_ctx, &ctx->pollent, resource_quota, &req, - grpc_exec_ctx_now() + grpc_jwt_verifier_max_delay, + ExecCtx::Get()->Now() + grpc_jwt_verifier_max_delay, GRPC_CLOSURE_CREATE(on_keys_retrieved, ctx, grpc_schedule_on_exec_ctx), &ctx->responses[HTTP_RESPONSE_KEYS]); grpc_resource_quota_unref_internal(resource_quota); @@ -828,7 +828,7 @@ static void retrieve_key_and_verify(verifier_cb_ctx* ctx) { extreme memory pressure. */ resource_quota = grpc_resource_quota_create("jwt_verifier"); grpc_httpcli_get(&ctx->verifier->http_ctx, &ctx->pollent, resource_quota, - &req, grpc_exec_ctx_now() + grpc_jwt_verifier_max_delay, + &req, ExecCtx::Get()->Now() + grpc_jwt_verifier_max_delay, http_cb, &ctx->responses[rsp_idx]); grpc_resource_quota_unref_internal(resource_quota); gpr_free(req.host); diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index bae96929386..b6537056093 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -216,8 +216,9 @@ static void on_oauth2_token_fetcher_http_response(void* user_data, gpr_mu_lock(&c->mu); c->token_fetch_pending = false; c->access_token_md = GRPC_MDELEM_REF(access_token_md); - c->token_expiration = - status == GRPC_CREDENTIALS_OK ? grpc_exec_ctx_now() + token_lifetime : 0; + c->token_expiration = status == GRPC_CREDENTIALS_OK + ? ExecCtx::Get()->Now() + token_lifetime + : 0; grpc_oauth2_pending_get_request_metadata* pending_request = c->pending_requests; c->pending_requests = NULL; @@ -255,7 +256,7 @@ static bool oauth2_token_fetcher_get_request_metadata( grpc_mdelem cached_access_token_md = GRPC_MDNULL; gpr_mu_lock(&c->mu); if (!GRPC_MDISNULL(c->access_token_md) && - (c->token_expiration - grpc_exec_ctx_now() > refresh_threshold)) { + (c->token_expiration - ExecCtx::Get()->Now() > refresh_threshold)) { cached_access_token_md = GRPC_MDELEM_REF(c->access_token_md); } if (!GRPC_MDISNULL(cached_access_token_md)) { @@ -287,7 +288,7 @@ static bool oauth2_token_fetcher_get_request_metadata( c->fetch_func(grpc_credentials_metadata_request_create(creds), &c->httpcli_context, &c->pollent, on_oauth2_token_fetcher_http_response, - grpc_exec_ctx_now() + refresh_threshold); + ExecCtx::Get()->Now() + refresh_threshold); } return false; } @@ -517,7 +518,7 @@ grpc_call_credentials* grpc_access_token_credentials_create( c->access_token_md = grpc_mdelem_from_slices( grpc_slice_from_static_string(GRPC_AUTHORIZATION_METADATA_KEY), grpc_slice_from_copied_string(token_md_value)); - grpc_exec_ctx_finish(); + gpr_free(token_md_value); return &c->base; } diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.cc b/src/core/lib/security/credentials/plugin/plugin_credentials.cc index 064666a7d0c..025d024617b 100644 --- a/src/core/lib/security/credentials/plugin/plugin_credentials.cc +++ b/src/core/lib/security/credentials/plugin/plugin_credentials.cc @@ -116,9 +116,8 @@ static void plugin_md_request_metadata_ready(void* request, grpc_status_code status, const char* error_details) { /* called from application code */ - ExecCtx _local_exec_ctx( - GRPC_EXEC_CTX_FLAG_IS_FINISHED | GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP, - NULL, NULL); + ExecCtx _local_exec_ctx(GRPC_EXEC_CTX_FLAG_IS_FINISHED | + GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP); grpc_plugin_credentials_pending_request* r = (grpc_plugin_credentials_pending_request*)request; if (GRPC_TRACER_ON(grpc_plugin_credentials_trace)) { @@ -141,7 +140,6 @@ static void plugin_md_request_metadata_ready(void* request, r->creds, r); } gpr_free(r); - grpc_exec_ctx_finish(); } static bool plugin_get_request_metadata(grpc_call_credentials* creds, diff --git a/src/core/lib/security/transport/security_handshaker.cc b/src/core/lib/security/transport/security_handshaker.cc index cb204014091..4ed2ec55bd8 100644 --- a/src/core/lib/security/transport/security_handshaker.cc +++ b/src/core/lib/security/transport/security_handshaker.cc @@ -266,7 +266,6 @@ static void on_handshake_next_done_grpc_wrapper( } else { gpr_mu_unlock(&h->mu); } - grpc_exec_ctx_finish(); } static grpc_error* do_handshaker_next_locked( diff --git a/src/core/lib/security/transport/server_auth_filter.cc b/src/core/lib/security/transport/server_auth_filter.cc index 5f21a2933bc..86817076f83 100644 --- a/src/core/lib/security/transport/server_auth_filter.cc +++ b/src/core/lib/security/transport/server_auth_filter.cc @@ -141,7 +141,6 @@ static void on_md_processing_done( } grpc_metadata_array_destroy(&calld->md); GRPC_CALL_STACK_UNREF(calld->owning_call, "server_auth_metadata"); - grpc_exec_ctx_finish(); } static void cancel_call(void* arg, grpc_error* error) { diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc index 3b3b2e4f057..6e1554d471e 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc @@ -69,7 +69,6 @@ grpc_slice grpc_slice_ref(grpc_slice slice) { void grpc_slice_unref(grpc_slice slice) { ExecCtx _local_exec_ctx; grpc_slice_unref_internal(slice); - grpc_exec_ctx_finish(); } /* grpc_slice_from_static_string support structure - a refcount that does diff --git a/src/core/lib/slice/slice_buffer.cc b/src/core/lib/slice/slice_buffer.cc index 6774269972c..4bc54c303f6 100644 --- a/src/core/lib/slice/slice_buffer.cc +++ b/src/core/lib/slice/slice_buffer.cc @@ -75,7 +75,6 @@ void grpc_slice_buffer_destroy_internal(grpc_slice_buffer* sb) { void grpc_slice_buffer_destroy(grpc_slice_buffer* sb) { ExecCtx _local_exec_ctx; grpc_slice_buffer_destroy_internal(sb); - grpc_exec_ctx_finish(); } uint8_t* grpc_slice_buffer_tiny_add(grpc_slice_buffer* sb, size_t n) { @@ -175,7 +174,6 @@ void grpc_slice_buffer_reset_and_unref_internal(grpc_slice_buffer* sb) { void grpc_slice_buffer_reset_and_unref(grpc_slice_buffer* sb) { ExecCtx _local_exec_ctx; grpc_slice_buffer_reset_and_unref_internal(sb); - grpc_exec_ctx_finish(); } void grpc_slice_buffer_swap(grpc_slice_buffer* a, grpc_slice_buffer* b) { diff --git a/src/core/lib/surface/alarm.cc b/src/core/lib/surface/alarm.cc index 395ffd393ca..7aee100f3f5 100644 --- a/src/core/lib/surface/alarm.cc +++ b/src/core/lib/surface/alarm.cc @@ -51,7 +51,7 @@ static void alarm_unref(grpc_alarm* alarm) { if (alarm->cq != NULL) { GRPC_CQ_INTERNAL_UNREF(alarm->cq, "alarm"); } - grpc_exec_ctx_finish(); + gpr_free(alarm); } } @@ -126,13 +126,11 @@ void grpc_alarm_set(grpc_alarm* alarm, grpc_completion_queue* cq, GPR_ASSERT(grpc_cq_begin_op(cq, tag)); grpc_timer_init(&alarm->alarm, grpc_timespec_to_millis_round_up(deadline), &alarm->on_alarm); - grpc_exec_ctx_finish(); } void grpc_alarm_cancel(grpc_alarm* alarm, void* reserved) { ExecCtx _local_exec_ctx; grpc_timer_cancel(&alarm->alarm); - grpc_exec_ctx_finish(); } void grpc_alarm_destroy(grpc_alarm* alarm, void* reserved) { diff --git a/src/core/lib/surface/byte_buffer.cc b/src/core/lib/surface/byte_buffer.cc index f3c10797f3a..6a9b13bb416 100644 --- a/src/core/lib/surface/byte_buffer.cc +++ b/src/core/lib/surface/byte_buffer.cc @@ -78,7 +78,6 @@ void grpc_byte_buffer_destroy(grpc_byte_buffer* bb) { break; } gpr_free(bb); - grpc_exec_ctx_finish(); } size_t grpc_byte_buffer_length(grpc_byte_buffer* bb) { diff --git a/src/core/lib/surface/byte_buffer_reader.cc b/src/core/lib/surface/byte_buffer_reader.cc index fb66829baaf..9a9e26ecdc8 100644 --- a/src/core/lib/surface/byte_buffer_reader.cc +++ b/src/core/lib/surface/byte_buffer_reader.cc @@ -70,7 +70,7 @@ int grpc_byte_buffer_reader_init(grpc_byte_buffer_reader* reader, reader->current.index = 0; break; } - grpc_exec_ctx_finish(); + return 1; } @@ -118,6 +118,6 @@ grpc_slice grpc_byte_buffer_reader_readall(grpc_byte_buffer_reader* reader) { grpc_slice_unref_internal(in_slice); GPR_ASSERT(bytes_read <= input_size); } - grpc_exec_ctx_finish(); + return out_slice; } diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index 5e1c0badd0b..bbb7a39e294 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -595,7 +595,7 @@ void grpc_call_unref(grpc_call* c) { grpc_call_combiner_set_notify_on_cancel(&c->call_combiner, NULL); } GRPC_CALL_INTERNAL_UNREF(c, "destroy"); - grpc_exec_ctx_finish(); + GPR_TIMER_END("grpc_call_unref", 0); } @@ -604,7 +604,7 @@ grpc_call_error grpc_call_cancel(grpc_call* call, void* reserved) { GPR_ASSERT(!reserved); ExecCtx _local_exec_ctx; cancel_with_error(call, STATUS_FROM_API_OVERRIDE, GRPC_ERROR_CANCELLED); - grpc_exec_ctx_finish(); + return GRPC_CALL_OK; } @@ -659,7 +659,7 @@ grpc_call_error grpc_call_cancel_with_status(grpc_call* c, 4, (c, (int)status, description, reserved)); GPR_ASSERT(reserved == NULL); cancel_with_status(c, STATUS_FROM_API_OVERRIDE, status, description); - grpc_exec_ctx_finish(); + return GRPC_CALL_OK; } @@ -2048,7 +2048,6 @@ grpc_call_error grpc_call_start_batch(grpc_call* call, const grpc_op* ops, err = call_start_batch(call, ops, nops, tag, 0); } - grpc_exec_ctx_finish(); return err; } diff --git a/src/core/lib/surface/call_details.cc b/src/core/lib/surface/call_details.cc index 01b19abefbd..03ce7f88fbc 100644 --- a/src/core/lib/surface/call_details.cc +++ b/src/core/lib/surface/call_details.cc @@ -37,5 +37,4 @@ void grpc_call_details_destroy(grpc_call_details* cd) { ExecCtx _local_exec_ctx; grpc_slice_unref_internal(cd->method); grpc_slice_unref_internal(cd->host); - grpc_exec_ctx_finish(); } diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc index dc1fc1632e2..7725351f74e 100644 --- a/src/core/lib/surface/channel.cc +++ b/src/core/lib/surface/channel.cc @@ -252,7 +252,6 @@ void grpc_channel_get_info(grpc_channel* channel, grpc_channel_element* elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CHANNEL(channel), 0); elem->filter->get_channel_info(elem, channel_info); - grpc_exec_ctx_finish(); } static grpc_call* grpc_channel_create_call_internal( @@ -305,7 +304,7 @@ grpc_call* grpc_channel_create_call(grpc_channel* channel, grpc_slice_ref_internal(*host)) : GRPC_MDNULL, grpc_timespec_to_millis_round_up(deadline)); - grpc_exec_ctx_finish(); + return call; } @@ -344,7 +343,7 @@ void* grpc_channel_register_call(grpc_channel* channel, const char* method, rc->next = channel->registered_calls; channel->registered_calls = rc; gpr_mu_unlock(&channel->registered_call_mu); - grpc_exec_ctx_finish(); + return rc; } @@ -370,7 +369,7 @@ grpc_call* grpc_channel_create_registered_call( channel, parent_call, propagation_mask, completion_queue, NULL, GRPC_MDELEM_REF(rc->path), GRPC_MDELEM_REF(rc->authority), grpc_timespec_to_millis_round_up(deadline)); - grpc_exec_ctx_finish(); + return call; } @@ -416,8 +415,6 @@ void grpc_channel_destroy(grpc_channel* channel) { elem->filter->start_transport_op(elem, op); GRPC_CHANNEL_INTERNAL_UNREF(channel, "channel"); - - grpc_exec_ctx_finish(); } grpc_channel_stack* grpc_channel_get_channel_stack(grpc_channel* channel) { diff --git a/src/core/lib/surface/channel_ping.cc b/src/core/lib/surface/channel_ping.cc index 0966a8d9678..06cdbf6c73d 100644 --- a/src/core/lib/surface/channel_ping.cc +++ b/src/core/lib/surface/channel_ping.cc @@ -60,5 +60,4 @@ void grpc_channel_ping(grpc_channel* channel, grpc_completion_queue* cq, op->bind_pollset = grpc_cq_pollset(cq); GPR_ASSERT(grpc_cq_begin_op(cq, tag)); top_elem->filter->start_transport_op(top_elem, op); - grpc_exec_ctx_finish(); } diff --git a/src/core/lib/surface/completion_queue.cc b/src/core/lib/surface/completion_queue.cc index b69d40534df..0b0a8d070d5 100644 --- a/src/core/lib/surface/completion_queue.cc +++ b/src/core/lib/surface/completion_queue.cc @@ -124,7 +124,7 @@ static grpc_error* non_polling_poller_work(grpc_pollset* pollset, while (!npp->shutdown && !w.kicked && !gpr_cv_wait(&w.cv, &npp->mu, deadline_ts)) ; - grpc_exec_ctx_invalidate_now(); + ExecCtx::Get()->InvalidateNow(); if (&w == npp->root) { npp->root = w.next; if (&w == npp->root) { @@ -371,7 +371,6 @@ int grpc_completion_queue_thread_local_cache_flush(grpc_completion_queue* cq, gpr_mu_unlock(cq->mu); GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down"); } - grpc_exec_ctx_finish(); } gpr_tls_set(&g_cached_event, (intptr_t)0); gpr_tls_set(&g_cached_cq, (intptr_t)0); @@ -412,8 +411,6 @@ static grpc_cq_completion* cq_event_queue_pop(grpc_cq_event_queue* q) { GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_FAILURES(); } - grpc_exec_ctx_finish(); - if (c) { gpr_atm_no_barrier_fetch_add(&q->num_queue_items, -1); } @@ -445,7 +442,6 @@ grpc_completion_queue* grpc_completion_queue_create_internal( ExecCtx _local_exec_ctx; GRPC_STATS_INC_CQS_CREATED(); - grpc_exec_ctx_finish(); cq = (grpc_completion_queue*)gpr_zalloc(sizeof(grpc_completion_queue) + vtable->data_size + @@ -639,9 +635,9 @@ static void cq_end_op_for_next(grpc_completion_queue* cq, void* tag, error != GRPC_ERROR_NONE)) { const char* errmsg = grpc_error_string(error); GRPC_API_TRACE( - "cq_end_op_for_next(=%p, cq=%p, tag=%p, error=%s, " + "cq_end_op_for_next(cq=%p, tag=%p, error=%s, " "done=%p, done_arg=%p, storage=%p)", - 7, (exec_ctx, cq, tag, errmsg, done, done_arg, storage)); + 6, (cq, tag, errmsg, done, done_arg, storage)); if (GRPC_TRACER_ON(grpc_trace_operation_failures) && error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "Operation failed: tag=%p, error=%s", tag, errmsg); @@ -726,9 +722,9 @@ static void cq_end_op_for_pluck(grpc_completion_queue* cq, void* tag, error != GRPC_ERROR_NONE)) { const char* errmsg = grpc_error_string(error); GRPC_API_TRACE( - "cq_end_op_for_pluck(=%p, cq=%p, tag=%p, error=%s, " + "cq_end_op_for_pluck(cq=%p, tag=%p, error=%s, " "done=%p, done_arg=%p, storage=%p)", - 7, (exec_ctx, cq, tag, errmsg, done, done_arg, storage)); + 6, (cq, tag, errmsg, done, done_arg, storage)); if (GRPC_TRACER_ON(grpc_trace_operation_failures) && error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "Operation failed: tag=%p, error=%s", tag, errmsg); @@ -794,31 +790,40 @@ typedef struct { bool first_loop; } cq_is_finished_arg; -static bool cq_is_next_finished(void* arg) { - cq_is_finished_arg* a = (cq_is_finished_arg*)arg; - grpc_completion_queue* cq = a->cq; - cq_next_data* cqd = (cq_next_data*)DATA_FROM_CQ(cq); - GPR_ASSERT(a->stolen_completion == NULL); +class ExecCtxNext : public ExecCtx { + public: + ExecCtxNext(void* arg) : ExecCtx(0), check_ready_to_finish_arg_(arg) {} - gpr_atm current_last_seen_things_queued_ever = - gpr_atm_no_barrier_load(&cqd->things_queued_ever); + bool CheckReadyToFinish() override { + cq_is_finished_arg* a = (cq_is_finished_arg*)check_ready_to_finish_arg_; + grpc_completion_queue* cq = a->cq; + cq_next_data* cqd = (cq_next_data*)DATA_FROM_CQ(cq); + GPR_ASSERT(a->stolen_completion == NULL); - if (current_last_seen_things_queued_ever != a->last_seen_things_queued_ever) { - a->last_seen_things_queued_ever = + gpr_atm current_last_seen_things_queued_ever = gpr_atm_no_barrier_load(&cqd->things_queued_ever); - /* Pop a cq_completion from the queue. Returns NULL if the queue is empty - * might return NULL in some cases even if the queue is not empty; but - * that - * is ok and doesn't affect correctness. Might effect the tail latencies a - * bit) */ - a->stolen_completion = cq_event_queue_pop(&cqd->queue); - if (a->stolen_completion != NULL) { - return true; + if (current_last_seen_things_queued_ever != + a->last_seen_things_queued_ever) { + a->last_seen_things_queued_ever = + gpr_atm_no_barrier_load(&cqd->things_queued_ever); + + /* Pop a cq_completion from the queue. Returns NULL if the queue is empty + * might return NULL in some cases even if the queue is not empty; but + * that + * is ok and doesn't affect correctness. Might effect the tail latencies a + * bit) */ + a->stolen_completion = cq_event_queue_pop(&cqd->queue); + if (a->stolen_completion != NULL) { + return true; + } } + return !a->first_loop && a->deadline < ExecCtx::Get()->Now(); } - return !a->first_loop && a->deadline < grpc_exec_ctx_now(); -} + + private: + void* check_ready_to_finish_arg_; +}; #ifndef NDEBUG static void dump_pending_tags(grpc_completion_queue* cq) { @@ -873,7 +878,7 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline, NULL, NULL, true}; - ExecCtx _local_exec_ctx(0, cq_is_next_finished, &is_finished_arg); + ExecCtxNext _local_exec_ctx(&is_finished_arg); for (;;) { grpc_millis iteration_deadline = deadline_millis; @@ -923,7 +928,8 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline, break; } - if (!is_finished_arg.first_loop && grpc_exec_ctx_now() >= deadline_millis) { + if (!is_finished_arg.first_loop && + ExecCtx::Get()->Now() >= deadline_millis) { memset(&ret, 0, sizeof(ret)); ret.type = GRPC_QUEUE_TIMEOUT; dump_pending_tags(cq); @@ -959,7 +965,7 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline, GRPC_SURFACE_TRACE_RETURNED_EVENT(cq, &ret); GRPC_CQ_INTERNAL_UNREF(cq, "next"); - grpc_exec_ctx_finish(); + GPR_ASSERT(is_finished_arg.stolen_completion == NULL); GPR_TIMER_END("grpc_completion_queue_next", 0); @@ -1039,37 +1045,46 @@ static void del_plucker(grpc_completion_queue* cq, void* tag, GPR_UNREACHABLE_CODE(return ); } -static bool cq_is_pluck_finished(void* arg) { - cq_is_finished_arg* a = (cq_is_finished_arg*)arg; - grpc_completion_queue* cq = a->cq; - cq_pluck_data* cqd = (cq_pluck_data*)DATA_FROM_CQ(cq); +class ExecCtxPluck : public ExecCtx { + public: + ExecCtxPluck(void* arg) : ExecCtx(0), check_ready_to_finish_arg_(arg) {} - GPR_ASSERT(a->stolen_completion == NULL); - gpr_atm current_last_seen_things_queued_ever = - gpr_atm_no_barrier_load(&cqd->things_queued_ever); - if (current_last_seen_things_queued_ever != a->last_seen_things_queued_ever) { - gpr_mu_lock(cq->mu); - a->last_seen_things_queued_ever = + bool CheckReadyToFinish() override { + cq_is_finished_arg* a = (cq_is_finished_arg*)check_ready_to_finish_arg_; + grpc_completion_queue* cq = a->cq; + cq_pluck_data* cqd = (cq_pluck_data*)DATA_FROM_CQ(cq); + + GPR_ASSERT(a->stolen_completion == NULL); + gpr_atm current_last_seen_things_queued_ever = gpr_atm_no_barrier_load(&cqd->things_queued_ever); - grpc_cq_completion* c; - grpc_cq_completion* prev = &cqd->completed_head; - while ((c = (grpc_cq_completion*)(prev->next & ~(uintptr_t)1)) != - &cqd->completed_head) { - if (c->tag == a->tag) { - prev->next = (prev->next & (uintptr_t)1) | (c->next & ~(uintptr_t)1); - if (c == cqd->completed_tail) { - cqd->completed_tail = prev; + if (current_last_seen_things_queued_ever != + a->last_seen_things_queued_ever) { + gpr_mu_lock(cq->mu); + a->last_seen_things_queued_ever = + gpr_atm_no_barrier_load(&cqd->things_queued_ever); + grpc_cq_completion* c; + grpc_cq_completion* prev = &cqd->completed_head; + while ((c = (grpc_cq_completion*)(prev->next & ~(uintptr_t)1)) != + &cqd->completed_head) { + if (c->tag == a->tag) { + prev->next = (prev->next & (uintptr_t)1) | (c->next & ~(uintptr_t)1); + if (c == cqd->completed_tail) { + cqd->completed_tail = prev; + } + gpr_mu_unlock(cq->mu); + a->stolen_completion = c; + return true; } - gpr_mu_unlock(cq->mu); - a->stolen_completion = c; - return true; + prev = c; } - prev = c; + gpr_mu_unlock(cq->mu); } - gpr_mu_unlock(cq->mu); + return !a->first_loop && a->deadline < ExecCtx::Get()->Now(); } - return !a->first_loop && a->deadline < grpc_exec_ctx_now(); -} + + private: + void* check_ready_to_finish_arg_; +}; static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, gpr_timespec deadline, void* reserved) { @@ -1106,7 +1121,7 @@ static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, NULL, tag, true}; - ExecCtx _local_exec_ctx(0, cq_is_pluck_finished, &is_finished_arg); + ExecCtxPluck _local_exec_ctx(&is_finished_arg); for (;;) { if (is_finished_arg.stolen_completion != NULL) { gpr_mu_unlock(cq->mu); @@ -1153,7 +1168,8 @@ static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, dump_pending_tags(cq); break; } - if (!is_finished_arg.first_loop && grpc_exec_ctx_now() >= deadline_millis) { + if (!is_finished_arg.first_loop && + ExecCtx::Get()->Now() >= deadline_millis) { del_plucker(cq, tag, &worker); gpr_mu_unlock(cq->mu); memset(&ret, 0, sizeof(ret)); @@ -1182,7 +1198,7 @@ static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, done: GRPC_SURFACE_TRACE_RETURNED_EVENT(cq, &ret); GRPC_CQ_INTERNAL_UNREF(cq, "pluck"); - grpc_exec_ctx_finish(); + GPR_ASSERT(is_finished_arg.stolen_completion == NULL); GPR_TIMER_END("grpc_completion_queue_pluck", 0); @@ -1238,7 +1254,7 @@ void grpc_completion_queue_shutdown(grpc_completion_queue* cq) { GPR_TIMER_BEGIN("grpc_completion_queue_shutdown", 0); GRPC_API_TRACE("grpc_completion_queue_shutdown(cq=%p)", 1, (cq)); cq->vtable->shutdown(cq); - grpc_exec_ctx_finish(); + GPR_TIMER_END("grpc_completion_queue_shutdown", 0); } @@ -1249,7 +1265,7 @@ void grpc_completion_queue_destroy(grpc_completion_queue* cq) { ExecCtx _local_exec_ctx; GRPC_CQ_INTERNAL_UNREF(cq, "destroy"); - grpc_exec_ctx_finish(); + GPR_TIMER_END("grpc_completion_queue_destroy", 0); } diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index 66c8c3b6dad..20e17a7f60b 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -168,14 +168,14 @@ void grpc_init(void) { grpc_iomgr_start(); } gpr_mu_unlock(&g_init_mu); - grpc_exec_ctx_finish(); + GRPC_API_TRACE("grpc_init(void)", 0, ()); } void grpc_shutdown(void) { int i; GRPC_API_TRACE("grpc_shutdown(void)", 0, ()); - ExecCtx _local_exec_ctx(0, grpc_never_ready_to_finish, NULL); + ExecCtx _local_exec_ctx; gpr_mu_lock(&g_init_mu); if (--g_initializations == 0) { grpc_executor_shutdown(); @@ -194,7 +194,6 @@ void grpc_shutdown(void) { grpc_stats_shutdown(); } gpr_mu_unlock(&g_init_mu); - grpc_exec_ctx_finish(); } int grpc_is_initialized(void) { diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index 5cd8c1fd899..da081e68cbd 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/src/core/lib/surface/lame_client.cc @@ -169,6 +169,6 @@ grpc_channel* grpc_lame_client_channel_create(const char* target, auto chand = reinterpret_cast(elem->channel_data); chand->error_code = error_code; chand->error_message = error_message; - grpc_exec_ctx_finish(); + return channel; } diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc index 6e3ce005a21..0d4435d5563 100644 --- a/src/core/lib/surface/server.cc +++ b/src/core/lib/surface/server.cc @@ -1047,8 +1047,6 @@ void grpc_server_start(grpc_server* server) { GRPC_CLOSURE_CREATE(start_listeners, server, grpc_executor_scheduler(GRPC_EXECUTOR_SHORT)), GRPC_ERROR_NONE); - - grpc_exec_ctx_finish(); } void grpc_server_get_pollsets(grpc_server* server, grpc_pollset*** pollsets, @@ -1188,7 +1186,7 @@ void grpc_server_shutdown_and_notify(grpc_server* server, grpc_cq_end_op(cq, tag, GRPC_ERROR_NONE, done_published_shutdown, NULL, (grpc_cq_completion*)gpr_malloc(sizeof(grpc_cq_completion))); gpr_mu_unlock(&server->mu_global); - goto done; + return; } server->shutdown_tags = (shutdown_tag*)gpr_realloc( server->shutdown_tags, @@ -1198,7 +1196,7 @@ void grpc_server_shutdown_and_notify(grpc_server* server, sdt->cq = cq; if (gpr_atm_acq_load(&server->shutdown_flag)) { gpr_mu_unlock(&server->mu_global); - goto done; + return; } server->last_shutdown_message_time = gpr_now(GPR_CLOCK_REALTIME); @@ -1225,9 +1223,6 @@ void grpc_server_shutdown_and_notify(grpc_server* server, channel_broadcaster_shutdown(&broadcaster, true /* send_goaway */, GRPC_ERROR_NONE); - -done: - grpc_exec_ctx_finish(); } void grpc_server_cancel_all_calls(grpc_server* server) { @@ -1243,7 +1238,6 @@ void grpc_server_cancel_all_calls(grpc_server* server) { channel_broadcaster_shutdown( &broadcaster, false /* send_goaway */, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Cancelling all calls")); - grpc_exec_ctx_finish(); } void grpc_server_destroy(grpc_server* server) { @@ -1265,7 +1259,6 @@ void grpc_server_destroy(grpc_server* server) { gpr_mu_unlock(&server->mu_global); server_unref(server); - grpc_exec_ctx_finish(); } void grpc_server_add_listener(grpc_server* server, void* arg, @@ -1368,7 +1361,7 @@ grpc_call_error grpc_server_request_call( rc->initial_metadata = initial_metadata; error = queue_call_request(server, cq_idx, rc); done: - grpc_exec_ctx_finish(); + return error; } @@ -1425,7 +1418,7 @@ grpc_call_error grpc_server_request_registered_call( rc->data.registered.optional_payload = optional_payload; error = queue_call_request(server, cq_idx, rc); done: - grpc_exec_ctx_finish(); + return error; } diff --git a/src/core/lib/transport/bdp_estimator.cc b/src/core/lib/transport/bdp_estimator.cc index 47d65870d1a..4e279b4d94a 100644 --- a/src/core/lib/transport/bdp_estimator.cc +++ b/src/core/lib/transport/bdp_estimator.cc @@ -79,7 +79,7 @@ grpc_millis BdpEstimator::CompletePing() { } ping_state_ = PingState::UNSCHEDULED; accumulator_ = 0; - return grpc_exec_ctx_now() + inter_ping_delay_; + return ExecCtx::Get()->Now() + inter_ping_delay_; } } // namespace grpc_core diff --git a/src/core/lib/transport/status_conversion.cc b/src/core/lib/transport/status_conversion.cc index fd7764f2dba..61470b8c784 100644 --- a/src/core/lib/transport/status_conversion.cc +++ b/src/core/lib/transport/status_conversion.cc @@ -46,8 +46,8 @@ grpc_status_code grpc_http2_error_to_grpc_status(grpc_http2_error_code error, case GRPC_HTTP2_CANCEL: /* http2 cancel translates to STATUS_CANCELLED iff deadline hasn't been * exceeded */ - return grpc_exec_ctx_now() > deadline ? GRPC_STATUS_DEADLINE_EXCEEDED - : GRPC_STATUS_CANCELLED; + return ExecCtx::Get()->Now() > deadline ? GRPC_STATUS_DEADLINE_EXCEEDED + : GRPC_STATUS_CANCELLED; case GRPC_HTTP2_ENHANCE_YOUR_CALM: return GRPC_STATUS_RESOURCE_EXHAUSTED; case GRPC_HTTP2_INADEQUATE_SECURITY: diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc index 6f31bd07f97..ca80a7404d3 100644 --- a/src/core/lib/transport/transport.cc +++ b/src/core/lib/transport/transport.cc @@ -62,7 +62,7 @@ void grpc_stream_unref(grpc_stream_refcount* refcount, const char* reason) { void grpc_stream_unref(grpc_stream_refcount* refcount) { #endif if (gpr_unref(&refcount->refs)) { - if (exec_ctx->flags & GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP) { + if (ExecCtx::Get()->flags() & GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP) { /* Ick. The thread we're running on MAY be owned (indirectly) by a call-stack. If that's the case, destroying the call-stack MAY try to destroy the diff --git a/src/cpp/common/channel_arguments.cc b/src/cpp/common/channel_arguments.cc index 79e4aee4e29..0bcfac28459 100644 --- a/src/cpp/common/channel_arguments.cc +++ b/src/cpp/common/channel_arguments.cc @@ -73,7 +73,6 @@ ChannelArguments::~ChannelArguments() { it->value.pointer.vtable->destroy(it->value.pointer.p); } } - grpc_exec_ctx_finish(); } void ChannelArguments::Swap(ChannelArguments& other) { @@ -106,7 +105,7 @@ void ChannelArguments::SetSocketMutator(grpc_socket_mutator* mutator) { replaced = true; } } - grpc_exec_ctx_finish(); + if (!replaced) { args_.push_back(mutator_arg); } diff --git a/test/core/backoff/backoff_test.cc b/test/core/backoff/backoff_test.cc index 4e32298da40..739ab86bb23 100644 --- a/test/core/backoff/backoff_test.cc +++ b/test/core/backoff/backoff_test.cc @@ -34,19 +34,18 @@ static void test_constant_backoff(void) { min_connect_timeout, max_backoff); ExecCtx _local_exec_ctx; grpc_backoff_result next_deadlines = grpc_backoff_begin(&backoff); - GPR_ASSERT(next_deadlines.current_deadline - grpc_exec_ctx_now() == + GPR_ASSERT(next_deadlines.current_deadline - ExecCtx::Get()->Now() == initial_backoff); - GPR_ASSERT(next_deadlines.next_attempt_start_time - grpc_exec_ctx_now() == + GPR_ASSERT(next_deadlines.next_attempt_start_time - ExecCtx::Get()->Now() == initial_backoff); for (int i = 0; i < 10000; i++) { next_deadlines = grpc_backoff_step(&backoff); - GPR_ASSERT(next_deadlines.current_deadline - grpc_exec_ctx_now() == + GPR_ASSERT(next_deadlines.current_deadline - ExecCtx::Get()->Now() == initial_backoff); - GPR_ASSERT(next_deadlines.next_attempt_start_time - grpc_exec_ctx_now() == + GPR_ASSERT(next_deadlines.next_attempt_start_time - ExecCtx::Get()->Now() == initial_backoff); - exec_ctx->now = next_deadlines.current_deadline; + ExecCtx::Get()->SetNow(next_deadlines.current_deadline); } - grpc_exec_ctx_finish(); } static void test_min_connect(void) { @@ -62,13 +61,12 @@ static void test_min_connect(void) { grpc_backoff_result next = grpc_backoff_begin(&backoff); // Because the min_connect_timeout > initial_backoff, current_deadline is used // as the deadline for the current attempt. - GPR_ASSERT(next.current_deadline - grpc_exec_ctx_now() == + GPR_ASSERT(next.current_deadline - ExecCtx::Get()->Now() == min_connect_timeout); // ... while, if the current attempt fails, the next one will happen after // initial_backoff. - GPR_ASSERT(next.next_attempt_start_time - grpc_exec_ctx_now() == + GPR_ASSERT(next.next_attempt_start_time - ExecCtx::Get()->Now() == initial_backoff); - grpc_exec_ctx_finish(); } static void test_no_jitter_backoff(void) { @@ -83,48 +81,46 @@ static void test_no_jitter_backoff(void) { // x_1 = 2 // x_n = 2**i + x_{i-1} ( = 2**(n+1) - 2 ) ExecCtx _local_exec_ctx; - exec_ctx->now = 0; - exec_ctx->now_is_valid = true; + ExecCtx::Get()->SetNow(0); grpc_backoff_result next_deadlines = grpc_backoff_begin(&backoff); GPR_ASSERT(next_deadlines.current_deadline == next_deadlines.next_attempt_start_time); GPR_ASSERT(next_deadlines.current_deadline == 2); - exec_ctx->now = next_deadlines.current_deadline; + ExecCtx::Get()->SetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 6); - exec_ctx->now = next_deadlines.current_deadline; + ExecCtx::Get()->SetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 14); - exec_ctx->now = next_deadlines.current_deadline; + ExecCtx::Get()->SetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 30); - exec_ctx->now = next_deadlines.current_deadline; + ExecCtx::Get()->SetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 62); - exec_ctx->now = next_deadlines.current_deadline; + ExecCtx::Get()->SetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 126); - exec_ctx->now = next_deadlines.current_deadline; + ExecCtx::Get()->SetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 254); - exec_ctx->now = next_deadlines.current_deadline; + ExecCtx::Get()->SetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 510); - exec_ctx->now = next_deadlines.current_deadline; + ExecCtx::Get()->SetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 1022); - exec_ctx->now = next_deadlines.current_deadline; + ExecCtx::Get()->SetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); // Hit the maximum timeout. From this point onwards, retries will increase // only by max timeout. GPR_ASSERT(next_deadlines.current_deadline == 1535); - exec_ctx->now = next_deadlines.current_deadline; + ExecCtx::Get()->SetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 2048); - exec_ctx->now = next_deadlines.current_deadline; + ExecCtx::Get()->SetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 2561); - grpc_exec_ctx_finish(); } static void test_jitter_backoff(void) { @@ -142,9 +138,9 @@ static void test_jitter_backoff(void) { ExecCtx _local_exec_ctx; grpc_backoff_result next_deadlines = grpc_backoff_begin(&backoff); - GPR_ASSERT(next_deadlines.current_deadline - grpc_exec_ctx_now() == + GPR_ASSERT(next_deadlines.current_deadline - ExecCtx::Get()->Now() == initial_backoff); - GPR_ASSERT(next_deadlines.next_attempt_start_time - grpc_exec_ctx_now() == + GPR_ASSERT(next_deadlines.next_attempt_start_time - ExecCtx::Get()->Now() == initial_backoff); grpc_millis expected_next_lower_bound = @@ -157,7 +153,7 @@ static void test_jitter_backoff(void) { // next-now must be within (jitter*100)% of the current backoff (which // increases by * multiplier up to max_backoff). const grpc_millis timeout_millis = - next_deadlines.current_deadline - grpc_exec_ctx_now(); + next_deadlines.current_deadline - ExecCtx::Get()->Now(); GPR_ASSERT(timeout_millis >= expected_next_lower_bound); GPR_ASSERT(timeout_millis <= expected_next_upper_bound); current_backoff = GPR_MIN( @@ -166,9 +162,8 @@ static void test_jitter_backoff(void) { (grpc_millis)((double)current_backoff * (1 - jitter)); expected_next_upper_bound = (grpc_millis)((double)current_backoff * (1 + jitter)); - exec_ctx->now = next_deadlines.current_deadline; + ExecCtx::Get()->SetNow(next_deadlines.current_deadline); } - grpc_exec_ctx_finish(); } int main(int argc, char** argv) { diff --git a/test/core/bad_client/bad_client.cc b/test/core/bad_client/bad_client.cc index c7e074ae6fa..bc9e65089c8 100644 --- a/test/core/bad_client/bad_client.cc +++ b/test/core/bad_client/bad_client.cc @@ -60,7 +60,6 @@ static void server_setup_transport(void* ts, grpc_transport* transport) { ExecCtx _local_exec_ctx; grpc_server_setup_transport(a->server, transport, NULL, grpc_server_get_channel_args(a->server)); - grpc_exec_ctx_finish(); } static void read_done(void* arg, grpc_error* error) { @@ -118,7 +117,6 @@ void grpc_run_bad_client_test( transport = grpc_create_chttp2_transport(NULL, sfd.server, 0); server_setup_transport(&a, transport); grpc_chttp2_transport_start_reading(transport, NULL); - grpc_exec_ctx_finish(); /* Bind everything into the same pollset */ grpc_endpoint_add_to_pollset(sfd.client, grpc_cq_pollset(a.cq)); @@ -137,7 +135,6 @@ void grpc_run_bad_client_test( /* Write data */ grpc_endpoint_write(sfd.client, &outgoing, &done_write_closure); - grpc_exec_ctx_finish(); /* Await completion, unless the request is large and write may not finish * before the peer shuts down. */ @@ -150,7 +147,7 @@ void grpc_run_bad_client_test( grpc_endpoint_shutdown( sfd.client, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Forced Disconnect")); grpc_endpoint_destroy(sfd.client); - grpc_exec_ctx_finish(); + sfd.client = NULL; } @@ -170,7 +167,7 @@ void grpc_run_bad_client_test( GRPC_CLOSURE_INIT(&read_done_closure, read_done, &read_done_event, grpc_schedule_on_exec_ctx); grpc_endpoint_read(sfd.client, &incoming, &read_done_closure); - grpc_exec_ctx_finish(); + do { GPR_ASSERT(gpr_time_cmp(deadline, gpr_now(deadline.clock_type)) > 0); GPR_ASSERT(grpc_completion_queue_next( @@ -188,7 +185,6 @@ void grpc_run_bad_client_test( grpc_endpoint_shutdown( sfd.client, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); grpc_endpoint_destroy(sfd.client); - grpc_exec_ctx_finish(); } GPR_ASSERT( @@ -203,6 +199,5 @@ void grpc_run_bad_client_test( grpc_completion_queue_destroy(a.cq); grpc_slice_buffer_destroy_internal(&outgoing); - grpc_exec_ctx_finish(); grpc_shutdown(); } diff --git a/test/core/channel/channel_args_test.cc b/test/core/channel/channel_args_test.cc index 03b1cbf2653..f0393b0f400 100644 --- a/test/core/channel/channel_args_test.cc +++ b/test/core/channel/channel_args_test.cc @@ -56,7 +56,6 @@ static void test_create(void) { 0); grpc_channel_args_destroy(ch_args); - grpc_exec_ctx_finish(); } static void test_set_compression_algorithm(void) { @@ -71,7 +70,6 @@ static void test_set_compression_algorithm(void) { GPR_ASSERT(ch_args->args[0].type == GRPC_ARG_INTEGER); grpc_channel_args_destroy(ch_args); - grpc_exec_ctx_finish(); } static void test_compression_algorithm_states(void) { @@ -123,7 +121,6 @@ static void test_compression_algorithm_states(void) { } grpc_channel_args_destroy(ch_args); - grpc_exec_ctx_finish(); } static void test_set_socket_mutator(void) { @@ -139,7 +136,6 @@ static void test_set_socket_mutator(void) { { ExecCtx _local_exec_ctx; grpc_channel_args_destroy(ch_args); - grpc_exec_ctx_finish(); } } diff --git a/test/core/channel/channel_stack_test.cc b/test/core/channel/channel_stack_test.cc index 04337589055..66ee2948b1c 100644 --- a/test/core/channel/channel_stack_test.cc +++ b/test/core/channel/channel_stack_test.cc @@ -138,13 +138,12 @@ static void test_create_channel_stack(void) { GPR_ASSERT(*channel_data == 1); GRPC_CALL_STACK_UNREF(call_stack, "done"); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); GPR_ASSERT(*channel_data == 2); GRPC_CHANNEL_STACK_UNREF(channel_stack, "done"); grpc_slice_unref_internal(path); - grpc_exec_ctx_finish(); } int main(int argc, char** argv) { diff --git a/test/core/channel/minimal_stack_is_minimal_test.cc b/test/core/channel/minimal_stack_is_minimal_test.cc index f35557324f2..dd3c70a261c 100644 --- a/test/core/channel/minimal_stack_is_minimal_test.cc +++ b/test/core/channel/minimal_stack_is_minimal_test.cc @@ -128,7 +128,6 @@ static int check_stack(const char* file, int line, const char* transport_name, grpc_channel_stack_builder_set_channel_arguments(builder, channel_args); GPR_ASSERT(grpc_channel_init_create_stack( builder, (grpc_channel_stack_type)channel_stack_type)); - grpc_exec_ctx_finish(); } // build up our expectation list @@ -213,7 +212,6 @@ static int check_stack(const char* file, int line, const char* transport_name, ExecCtx _local_exec_ctx; grpc_channel_stack_builder_destroy(builder); grpc_channel_args_destroy(channel_args); - grpc_exec_ctx_finish(); } return result; diff --git a/test/core/client_channel/lb_policies_test.cc b/test/core/client_channel/lb_policies_test.cc index aabe8dea3ca..5b412cc6229 100644 --- a/test/core/client_channel/lb_policies_test.cc +++ b/test/core/client_channel/lb_policies_test.cc @@ -653,7 +653,6 @@ static void test_get_channel_info() { { ExecCtx _local_exec_ctx; grpc_channel_args_destroy(args); - grpc_exec_ctx_finish(); } // Ensures that resolver returns. grpc_channel_check_connectivity_state(channel, true /* try_to_connect */); @@ -1025,7 +1024,6 @@ int main(int argc, char** argv) { test_ping(); test_get_channel_info(); - grpc_exec_ctx_finish(); grpc_shutdown(); return 0; } diff --git a/test/core/client_channel/parse_address_test.cc b/test/core/client_channel/parse_address_test.cc index 17725ba5ff1..597a1212c14 100644 --- a/test/core/client_channel/parse_address_test.cc +++ b/test/core/client_channel/parse_address_test.cc @@ -43,7 +43,6 @@ static void test_grpc_parse_unix(const char* uri_text, const char* pathname) { GPR_ASSERT(0 == strcmp(addr_un->sun_path, pathname)); grpc_uri_destroy(uri); - grpc_exec_ctx_finish(); } #else /* GRPC_HAVE_UNIX_SOCKET */ @@ -68,7 +67,6 @@ static void test_grpc_parse_ipv4(const char* uri_text, const char* host, GPR_ASSERT(ntohs(addr_in->sin_port) == port); grpc_uri_destroy(uri); - grpc_exec_ctx_finish(); } static void test_grpc_parse_ipv6(const char* uri_text, const char* host, @@ -88,7 +86,6 @@ static void test_grpc_parse_ipv6(const char* uri_text, const char* host, GPR_ASSERT(addr_in6->sin6_scope_id == scope_id); grpc_uri_destroy(uri); - grpc_exec_ctx_finish(); } int main(int argc, char** argv) { diff --git a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc index e2823a45019..c7a0e029f22 100644 --- a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc @@ -106,7 +106,6 @@ static bool wait_loop(int deadline_seconds, gpr_event* ev) { ExecCtx _local_exec_ctx; grpc_timer_check(NULL); - grpc_exec_ctx_finish(); } return false; } @@ -154,7 +153,7 @@ int main(int argc, char** argv) { call_resolver_next_after_locking( resolver, &result, GRPC_CLOSURE_CREATE(on_done, &ev1, grpc_schedule_on_exec_ctx)); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); GPR_ASSERT(wait_loop(5, &ev1)); GPR_ASSERT(result == NULL); @@ -163,14 +162,13 @@ int main(int argc, char** argv) { call_resolver_next_after_locking( resolver, &result, GRPC_CLOSURE_CREATE(on_done, &ev2, grpc_schedule_on_exec_ctx)); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); GPR_ASSERT(wait_loop(30, &ev2)); GPR_ASSERT(result != NULL); grpc_channel_args_destroy(result); GRPC_RESOLVER_UNREF(resolver, "test"); GRPC_COMBINER_UNREF(g_combiner, "test"); - grpc_exec_ctx_finish(); grpc_shutdown(); gpr_mu_destroy(&g_mu); diff --git a/test/core/client_channel/resolvers/dns_resolver_test.cc b/test/core/client_channel/resolvers/dns_resolver_test.cc index 8b403602635..33916b59ec8 100644 --- a/test/core/client_channel/resolvers/dns_resolver_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_test.cc @@ -42,7 +42,6 @@ static void test_succeeds(grpc_resolver_factory* factory, const char* string) { GPR_ASSERT(resolver != NULL); GRPC_RESOLVER_UNREF(resolver, "test_succeeds"); grpc_uri_destroy(uri); - grpc_exec_ctx_finish(); } static void test_fails(grpc_resolver_factory* factory, const char* string) { @@ -59,7 +58,6 @@ static void test_fails(grpc_resolver_factory* factory, const char* string) { resolver = grpc_resolver_factory_create_resolver(factory, &args); GPR_ASSERT(resolver == NULL); grpc_uri_destroy(uri); - grpc_exec_ctx_finish(); } int main(int argc, char** argv) { @@ -84,7 +82,6 @@ int main(int argc, char** argv) { { ExecCtx _local_exec_ctx; GRPC_COMBINER_UNREF(g_combiner, "test"); - grpc_exec_ctx_finish(); } grpc_shutdown(); diff --git a/test/core/client_channel/resolvers/fake_resolver_test.cc b/test/core/client_channel/resolvers/fake_resolver_test.cc index ec49558f872..9a1971561cf 100644 --- a/test/core/client_channel/resolvers/fake_resolver_test.cc +++ b/test/core/client_channel/resolvers/fake_resolver_test.cc @@ -109,7 +109,7 @@ static void test_fake_resolver() { results); grpc_resolver_next_locked(resolver, &on_res_arg.resolver_result, on_resolution); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&on_res_arg.ev, grpc_timeout_seconds_to_deadline(5)) != NULL); @@ -144,7 +144,7 @@ static void test_fake_resolver() { results_update); grpc_resolver_next_locked(resolver, &on_res_arg_update.resolver_result, on_resolution); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&on_res_arg_update.ev, grpc_timeout_seconds_to_deadline(5)) != NULL); @@ -153,14 +153,14 @@ static void test_fake_resolver() { memset(&on_res_arg, 0, sizeof(on_res_arg)); grpc_resolver_next_locked(resolver, &on_res_arg.resolver_result, on_resolution); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&on_res_arg.ev, grpc_timeout_milliseconds_to_deadline(100)) == NULL); GRPC_COMBINER_UNREF(combiner, "test_fake_resolver"); GRPC_RESOLVER_UNREF(resolver, "test_fake_resolver"); - grpc_exec_ctx_finish(); + grpc_fake_resolver_response_generator_unref(response_generator); } diff --git a/test/core/client_channel/resolvers/sockaddr_resolver_test.cc b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc index dbc8a965d5f..70b3cbf5b75 100644 --- a/test/core/client_channel/resolvers/sockaddr_resolver_test.cc +++ b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc @@ -63,7 +63,7 @@ static void test_succeeds(grpc_resolver_factory* factory, const char* string) { grpc_resolver_next_locked(resolver, &on_res_arg.resolver_result, on_resolution); GRPC_RESOLVER_UNREF(resolver, "test_succeeds"); - grpc_exec_ctx_finish(); + grpc_uri_destroy(uri); } @@ -81,7 +81,6 @@ static void test_fails(grpc_resolver_factory* factory, const char* string) { resolver = grpc_resolver_factory_create_resolver(factory, &args); GPR_ASSERT(resolver == NULL); grpc_uri_destroy(uri); - grpc_exec_ctx_finish(); } int main(int argc, char** argv) { @@ -114,7 +113,6 @@ int main(int argc, char** argv) { { ExecCtx _local_exec_ctx; GRPC_COMBINER_UNREF(g_combiner, "test"); - grpc_exec_ctx_finish(); } grpc_shutdown(); diff --git a/test/core/client_channel/uri_fuzzer_test.cc b/test/core/client_channel/uri_fuzzer_test.cc index 805becad188..6c1e8cb137c 100644 --- a/test/core/client_channel/uri_fuzzer_test.cc +++ b/test/core/client_channel/uri_fuzzer_test.cc @@ -38,7 +38,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if ((x = grpc_uri_parse(s, 1))) { grpc_uri_destroy(x); } - grpc_exec_ctx_finish(); + gpr_free(s); return 0; } diff --git a/test/core/client_channel/uri_parser_test.cc b/test/core/client_channel/uri_parser_test.cc index 591c642f4e7..024c30faee0 100644 --- a/test/core/client_channel/uri_parser_test.cc +++ b/test/core/client_channel/uri_parser_test.cc @@ -36,14 +36,13 @@ static void test_succeeds(const char* uri_text, const char* scheme, GPR_ASSERT(0 == strcmp(path, uri->path)); GPR_ASSERT(0 == strcmp(query, uri->query)); GPR_ASSERT(0 == strcmp(fragment, uri->fragment)); - grpc_exec_ctx_finish(); + grpc_uri_destroy(uri); } static void test_fails(const char* uri_text) { ExecCtx _local_exec_ctx; GPR_ASSERT(NULL == grpc_uri_parse(uri_text, 0)); - grpc_exec_ctx_finish(); } static void test_query_parts() { @@ -77,7 +76,7 @@ static void test_query_parts() { GPR_ASSERT(NULL == grpc_uri_get_query_arg(uri, "")); GPR_ASSERT(0 == strcmp("frag", uri->fragment)); - grpc_exec_ctx_finish(); + grpc_uri_destroy(uri); } { @@ -96,7 +95,6 @@ static void test_query_parts() { GPR_ASSERT(0 == strcmp("bar", grpc_uri_get_query_arg(uri, "foo"))); GPR_ASSERT(0 == strcmp("", grpc_uri_get_query_arg(uri, "foobar"))); - grpc_exec_ctx_finish(); grpc_uri_destroy(uri); } { @@ -114,7 +112,7 @@ static void test_query_parts() { GPR_ASSERT(NULL == uri->query_parts); GPR_ASSERT(NULL == uri->query_parts_values); GPR_ASSERT(0 == strcmp("", uri->fragment)); - grpc_exec_ctx_finish(); + grpc_uri_destroy(uri); } } diff --git a/test/core/compression/algorithm_test.cc b/test/core/compression/algorithm_test.cc index dea8e330306..9ae6363d97f 100644 --- a/test/core/compression/algorithm_test.cc +++ b/test/core/compression/algorithm_test.cc @@ -53,7 +53,6 @@ static void test_algorithm_mesh(void) { GPR_ASSERT(grpc_slice_eq(GRPC_MDKEY(mdelem), GRPC_MDSTR_GRPC_ENCODING)); grpc_slice_unref_internal(mdstr); GRPC_MDELEM_UNREF(mdelem); - grpc_exec_ctx_finish(); } /* test failure */ @@ -84,7 +83,6 @@ static void test_algorithm_failure(void) { static_cast(GRPC_COMPRESS_ALGORITHMS_COUNT) + 1)), grpc_empty_slice())); grpc_slice_unref_internal(mdstr); - grpc_exec_ctx_finish(); } int main(int argc, char** argv) { diff --git a/test/core/compression/message_compress_test.cc b/test/core/compression/message_compress_test.cc index d642e056d8d..a5dfdc884fc 100644 --- a/test/core/compression/message_compress_test.cc +++ b/test/core/compression/message_compress_test.cc @@ -72,7 +72,6 @@ static void assert_passthrough(grpc_slice value, { ExecCtx _local_exec_ctx; was_compressed = grpc_msg_compress(algorithm, &input, &compressed_raw); - grpc_exec_ctx_finish(); } GPR_ASSERT(input.count > 0); @@ -94,7 +93,6 @@ static void assert_passthrough(grpc_slice value, ExecCtx _local_exec_ctx; GPR_ASSERT(grpc_msg_decompress( was_compressed ? algorithm : GRPC_COMPRESS_NONE, &compressed, &output)); - grpc_exec_ctx_finish(); } final = grpc_slice_merge(output.slices, output.count); @@ -158,7 +156,7 @@ static void test_tiny_data_compress(void) { GPR_ASSERT(0 == grpc_msg_compress(static_cast(i), &input, &output)); - grpc_exec_ctx_finish(); + GPR_ASSERT(1 == output.count); } @@ -189,7 +187,6 @@ static void test_bad_decompression_data_crc(void) { /* try (and fail) to decompress the corrupted compresed buffer */ GPR_ASSERT(0 == grpc_msg_decompress(GRPC_COMPRESS_GZIP, &corrupted, &output)); - grpc_exec_ctx_finish(); grpc_slice_buffer_destroy(&input); grpc_slice_buffer_destroy(&corrupted); @@ -210,7 +207,6 @@ static void test_bad_decompression_data_trailing_garbage(void) { /* try (and fail) to decompress the invalid compresed buffer */ ExecCtx _local_exec_ctx; GPR_ASSERT(0 == grpc_msg_decompress(GRPC_COMPRESS_DEFLATE, &input, &output)); - grpc_exec_ctx_finish(); grpc_slice_buffer_destroy(&input); grpc_slice_buffer_destroy(&output); @@ -228,7 +224,6 @@ static void test_bad_decompression_data_stream(void) { /* try (and fail) to decompress the invalid compresed buffer */ ExecCtx _local_exec_ctx; GPR_ASSERT(0 == grpc_msg_decompress(GRPC_COMPRESS_DEFLATE, &input, &output)); - grpc_exec_ctx_finish(); grpc_slice_buffer_destroy(&input); grpc_slice_buffer_destroy(&output); @@ -253,7 +248,6 @@ static void test_bad_compression_algorithm(void) { GRPC_COMPRESS_ALGORITHMS_COUNT + 123), &input, &output); GPR_ASSERT(0 == was_compressed); - grpc_exec_ctx_finish(); grpc_slice_buffer_destroy(&input); grpc_slice_buffer_destroy(&output); @@ -279,7 +273,6 @@ static void test_bad_decompression_algorithm(void) { GRPC_COMPRESS_ALGORITHMS_COUNT + 123), &input, &output); GPR_ASSERT(0 == was_decompressed); - grpc_exec_ctx_finish(); grpc_slice_buffer_destroy(&input); grpc_slice_buffer_destroy(&output); diff --git a/test/core/debug/stats_test.cc b/test/core/debug/stats_test.cc index 8401618670f..c7aaf68dd3e 100644 --- a/test/core/debug/stats_test.cc +++ b/test/core/debug/stats_test.cc @@ -51,7 +51,6 @@ TEST(StatsTest, IncCounters) { ExecCtx _local_exec_ctx; GRPC_STATS_INC_COUNTER((grpc_stats_counters)i); - grpc_exec_ctx_finish(); EXPECT_EQ(snapshot.delta().counters[i], 1); } @@ -62,7 +61,6 @@ TEST(StatsTest, IncSpecificCounter) { ExecCtx _local_exec_ctx; GRPC_STATS_INC_SYSCALL_POLL(); - grpc_exec_ctx_finish(); EXPECT_EQ(snapshot.delta().counters[GRPC_STATS_COUNTER_SYSCALL_POLL], 1); } @@ -96,7 +94,6 @@ TEST_P(HistogramTest, IncHistogram) { ExecCtx _local_exec_ctx; grpc_stats_inc_histogram[kHistogram](j); - grpc_exec_ctx_finish(); auto delta = snapshot.delta(); diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc index 9ae3d3cfbff..5e7e12643e2 100644 --- a/test/core/end2end/bad_server_response_test.cc +++ b/test/core/end2end/bad_server_response_test.cc @@ -290,7 +290,7 @@ static void run_test(const char* response_payload, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); grpc_endpoint_destroy(state.tcp); cleanup_rpc(); - grpc_exec_ctx_finish(); + test_tcp_server_destroy(&test_server); grpc_shutdown(); diff --git a/test/core/end2end/connection_refused_test.cc b/test/core/end2end/connection_refused_test.cc index 677e3151129..1372c5a7463 100644 --- a/test/core/end2end/connection_refused_test.cc +++ b/test/core/end2end/connection_refused_test.cc @@ -133,7 +133,6 @@ static void run_test(bool wait_for_ready, bool use_service_config) { { ExecCtx _local_exec_ctx; if (args != NULL) grpc_channel_args_destroy(args); - grpc_exec_ctx_finish(); } grpc_shutdown(); diff --git a/test/core/end2end/fixtures/h2_census.cc b/test/core/end2end/fixtures/h2_census.cc index c3c3e961e7b..a43d963c54e 100644 --- a/test/core/end2end/fixtures/h2_census.cc +++ b/test/core/end2end/fixtures/h2_census.cc @@ -76,7 +76,6 @@ void chttp2_init_client_fullstack(grpc_end2end_test_fixture* f, { ExecCtx _local_exec_ctx; grpc_channel_args_destroy(client_args); - grpc_exec_ctx_finish(); } } @@ -93,7 +92,6 @@ void chttp2_init_server_fullstack(grpc_end2end_test_fixture* f, { ExecCtx _local_exec_ctx; grpc_channel_args_destroy(server_args); - grpc_exec_ctx_finish(); } grpc_server_register_completion_queue(f->server, f->cq, NULL); GPR_ASSERT(grpc_server_add_insecure_http2_port(f->server, ffd->localaddr)); diff --git a/test/core/end2end/fixtures/h2_compress.cc b/test/core/end2end/fixtures/h2_compress.cc index f520b48fa32..3f9a87d0fcd 100644 --- a/test/core/end2end/fixtures/h2_compress.cc +++ b/test/core/end2end/fixtures/h2_compress.cc @@ -68,7 +68,6 @@ void chttp2_init_client_fullstack_compression(grpc_end2end_test_fixture* f, if (ffd->client_args_compression != NULL) { ExecCtx _local_exec_ctx; grpc_channel_args_destroy(ffd->client_args_compression); - grpc_exec_ctx_finish(); } ffd->client_args_compression = grpc_channel_args_set_compression_algorithm( client_args, GRPC_COMPRESS_GZIP); @@ -83,7 +82,6 @@ void chttp2_init_server_fullstack_compression(grpc_end2end_test_fixture* f, if (ffd->server_args_compression != NULL) { ExecCtx _local_exec_ctx; grpc_channel_args_destroy(ffd->server_args_compression); - grpc_exec_ctx_finish(); } ffd->server_args_compression = grpc_channel_args_set_compression_algorithm( server_args, GRPC_COMPRESS_GZIP); @@ -104,7 +102,6 @@ void chttp2_tear_down_fullstack_compression(grpc_end2end_test_fixture* f) { grpc_channel_args_destroy(ffd->server_args_compression); gpr_free(ffd->localaddr); gpr_free(ffd); - grpc_exec_ctx_finish(); } /* All test configurations */ diff --git a/test/core/end2end/fixtures/h2_fd.cc b/test/core/end2end/fixtures/h2_fd.cc index 48e1b313fd4..99bced86514 100644 --- a/test/core/end2end/fixtures/h2_fd.cc +++ b/test/core/end2end/fixtures/h2_fd.cc @@ -75,8 +75,6 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, f->client = grpc_insecure_channel_create_from_fd( "fixture_client", sfd->fd_pair[0], client_args); GPR_ASSERT(f->client); - - grpc_exec_ctx_finish(); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, @@ -90,8 +88,6 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, grpc_server_start(f->server); grpc_server_add_insecure_channel_from_fd(f->server, NULL, sfd->fd_pair[1]); - - grpc_exec_ctx_finish(); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture* f) { diff --git a/test/core/end2end/fixtures/h2_full+workarounds.cc b/test/core/end2end/fixtures/h2_full+workarounds.cc index 563e1e1ac2d..e98df083f23 100644 --- a/test/core/end2end/fixtures/h2_full+workarounds.cc +++ b/test/core/end2end/fixtures/h2_full+workarounds.cc @@ -90,7 +90,6 @@ void chttp2_init_server_fullstack(grpc_end2end_test_fixture* f, GPR_ASSERT(grpc_server_add_insecure_http2_port(f->server, ffd->localaddr)); grpc_server_start(f->server); grpc_channel_args_destroy(server_args_new); - grpc_exec_ctx_finish(); } void chttp2_tear_down_fullstack(grpc_end2end_test_fixture* f) { diff --git a/test/core/end2end/fixtures/h2_load_reporting.cc b/test/core/end2end/fixtures/h2_load_reporting.cc index 74b59833643..84eb9e45139 100644 --- a/test/core/end2end/fixtures/h2_load_reporting.cc +++ b/test/core/end2end/fixtures/h2_load_reporting.cc @@ -79,7 +79,6 @@ void chttp2_init_server_load_reporting(grpc_end2end_test_fixture* f, { ExecCtx _local_exec_ctx; grpc_channel_args_destroy(server_args); - grpc_exec_ctx_finish(); } grpc_server_register_completion_queue(f->server, f->cq, NULL); GPR_ASSERT(grpc_server_add_insecure_http2_port(f->server, ffd->localaddr)); diff --git a/test/core/end2end/fixtures/h2_oauth2.cc b/test/core/end2end/fixtures/h2_oauth2.cc index 8ff7cb304c0..9ffc5b7b7e0 100644 --- a/test/core/end2end/fixtures/h2_oauth2.cc +++ b/test/core/end2end/fixtures/h2_oauth2.cc @@ -160,7 +160,6 @@ static void chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack( grpc_channel_args_destroy(new_client_args); grpc_channel_credentials_release(ssl_creds); grpc_call_credentials_release(oauth2_creds); - grpc_exec_ctx_finish(); } static int fail_server_auth_check(grpc_channel_args* server_args) { diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.cc b/test/core/end2end/fixtures/h2_sockpair+trace.cc index 391de0bd0bd..9e87a229625 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.cc +++ b/test/core/end2end/fixtures/h2_sockpair+trace.cc @@ -55,7 +55,6 @@ static void server_setup_transport(void* ts, grpc_transport* transport) { grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq)); grpc_server_setup_transport(f->server, transport, NULL, grpc_server_get_channel_args(f->server)); - grpc_exec_ctx_finish(); } typedef struct { @@ -98,7 +97,6 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, client_setup_transport(&cs, transport); GPR_ASSERT(f->client); grpc_chttp2_transport_start_reading(transport, NULL); - grpc_exec_ctx_finish(); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, @@ -113,7 +111,6 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, transport = grpc_create_chttp2_transport(server_args, sfd->server, 0); server_setup_transport(f, transport); grpc_chttp2_transport_start_reading(transport, NULL); - grpc_exec_ctx_finish(); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture* f) { @@ -143,7 +140,6 @@ int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_end2end_tests_pre_init(); grpc_init(); - grpc_exec_ctx_finish(); GPR_ASSERT(0 == grpc_tracer_set_enabled("also-doesnt-exist", 0)); GPR_ASSERT(1 == grpc_tracer_set_enabled("http", 1)); diff --git a/test/core/end2end/fixtures/h2_sockpair.cc b/test/core/end2end/fixtures/h2_sockpair.cc index 4e7eb3dbb8d..fa69ad84cf3 100644 --- a/test/core/end2end/fixtures/h2_sockpair.cc +++ b/test/core/end2end/fixtures/h2_sockpair.cc @@ -49,7 +49,6 @@ static void server_setup_transport(void* ts, grpc_transport* transport) { grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq)); grpc_server_setup_transport(f->server, transport, NULL, grpc_server_get_channel_args(f->server)); - grpc_exec_ctx_finish(); } typedef struct { @@ -92,7 +91,6 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, client_setup_transport(&cs, transport); GPR_ASSERT(f->client); grpc_chttp2_transport_start_reading(transport, NULL); - grpc_exec_ctx_finish(); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, @@ -107,7 +105,6 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, transport = grpc_create_chttp2_transport(server_args, sfd->server, 0); server_setup_transport(f, transport); grpc_chttp2_transport_start_reading(transport, NULL); - grpc_exec_ctx_finish(); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture* f) { diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.cc b/test/core/end2end/fixtures/h2_sockpair_1byte.cc index cfa32d4a274..a12d60575bf 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.cc +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.cc @@ -49,7 +49,6 @@ static void server_setup_transport(void* ts, grpc_transport* transport) { grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq)); grpc_server_setup_transport(f->server, transport, NULL, grpc_server_get_channel_args(f->server)); - grpc_exec_ctx_finish(); } typedef struct { @@ -103,7 +102,6 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, client_setup_transport(&cs, transport); GPR_ASSERT(f->client); grpc_chttp2_transport_start_reading(transport, NULL); - grpc_exec_ctx_finish(); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, @@ -118,7 +116,6 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, transport = grpc_create_chttp2_transport(server_args, sfd->server, 0); server_setup_transport(f, transport); grpc_chttp2_transport_start_reading(transport, NULL); - grpc_exec_ctx_finish(); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture* f) { diff --git a/test/core/end2end/fixtures/h2_ssl.cc b/test/core/end2end/fixtures/h2_ssl.cc index ac555d9ee8c..c137cec8b9a 100644 --- a/test/core/end2end/fixtures/h2_ssl.cc +++ b/test/core/end2end/fixtures/h2_ssl.cc @@ -112,7 +112,6 @@ static void chttp2_init_client_simple_ssl_secure_fullstack( { ExecCtx _local_exec_ctx; grpc_channel_args_destroy(new_client_args); - grpc_exec_ctx_finish(); } } diff --git a/test/core/end2end/fixtures/h2_ssl_proxy.cc b/test/core/end2end/fixtures/h2_ssl_proxy.cc index 66c5b167e1d..0c130d6ae1b 100644 --- a/test/core/end2end/fixtures/h2_ssl_proxy.cc +++ b/test/core/end2end/fixtures/h2_ssl_proxy.cc @@ -68,7 +68,6 @@ static grpc_channel* create_proxy_client(const char* target, { ExecCtx _local_exec_ctx; grpc_channel_args_destroy(new_client_args); - grpc_exec_ctx_finish(); } return channel; } @@ -150,7 +149,6 @@ static void chttp2_init_client_simple_ssl_secure_fullstack( { ExecCtx _local_exec_ctx; grpc_channel_args_destroy(new_client_args); - grpc_exec_ctx_finish(); } } diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc index b3ec44d77b0..73a3e2c444e 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.cc +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -391,7 +391,7 @@ static void on_read_request_done(void* arg, grpc_error* error) { GPR_ASSERT(resolved_addresses->naddrs >= 1); // Connect to requested address. // The connection callback inherits our reference to conn. - const grpc_millis deadline = grpc_exec_ctx_now() + 10 * GPR_MS_PER_SEC; + const grpc_millis deadline = ExecCtx::Get()->Now() + 10 * GPR_MS_PER_SEC; grpc_tcp_client_connect(&conn->on_server_connect_done, &conn->server_endpoint, conn->pollset_set, NULL, &resolved_addresses->addrs[0], deadline); @@ -449,13 +449,13 @@ static void thread_main(void* arg) { gpr_ref(&proxy->users); grpc_pollset_worker* worker = NULL; gpr_mu_lock(proxy->mu); - GRPC_LOG_IF_ERROR("grpc_pollset_work", - grpc_pollset_work(proxy->pollset, &worker, - grpc_exec_ctx_now() + GPR_MS_PER_SEC)); + GRPC_LOG_IF_ERROR( + "grpc_pollset_work", + grpc_pollset_work(proxy->pollset, &worker, + ExecCtx::Get()->Now() + GPR_MS_PER_SEC)); gpr_mu_unlock(proxy->mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } while (!gpr_unref(&proxy->users)); - grpc_exec_ctx_finish(); } grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( @@ -489,7 +489,7 @@ grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( proxy->pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); grpc_pollset_init(proxy->pollset, &proxy->mu); grpc_tcp_server_start(proxy->server, &proxy->pollset, 1, on_accept, proxy); - grpc_exec_ctx_finish(); + // Start proxy thread. gpr_thd_options opt = gpr_thd_options_default(); gpr_thd_options_set_joinable(&opt); @@ -516,7 +516,6 @@ void grpc_end2end_http_proxy_destroy(grpc_end2end_http_proxy* proxy) { grpc_schedule_on_exec_ctx)); GRPC_COMBINER_UNREF(proxy->combiner, "test"); gpr_free(proxy); - grpc_exec_ctx_finish(); } const char* grpc_end2end_http_proxy_get_proxy_name( diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index 1d6a40c7e32..1d22ba3a42f 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -411,7 +411,7 @@ void my_resolve_address(const char* addr, const char* default_port, r->addrs = addresses; r->lb_addrs = NULL; grpc_timer_init( - &r->timer, GPR_MS_PER_SEC + grpc_exec_ctx_now(), + &r->timer, GPR_MS_PER_SEC + ExecCtx::Get()->Now(), GRPC_CLOSURE_CREATE(finish_resolve, r, grpc_schedule_on_exec_ctx)); } @@ -428,7 +428,7 @@ grpc_ares_request* my_dns_lookup_ares(const char* dns_server, const char* addr, r->addrs = NULL; r->lb_addrs = lb_addrs; grpc_timer_init( - &r->timer, GPR_MS_PER_SEC + grpc_exec_ctx_now(), + &r->timer, GPR_MS_PER_SEC + ExecCtx::Get()->Now(), GRPC_CLOSURE_CREATE(finish_resolve, r, grpc_schedule_on_exec_ctx)); return NULL; } @@ -488,7 +488,7 @@ static void sched_connect(grpc_closure* closure, grpc_endpoint** ep, fc->ep = ep; fc->deadline = deadline; grpc_timer_init( - &fc->timer, GPR_MS_PER_SEC + grpc_exec_ctx_now(), + &fc->timer, GPR_MS_PER_SEC + ExecCtx::Get()->Now(), GRPC_CLOSURE_CREATE(do_connect, fc, grpc_schedule_on_exec_ctx)); } @@ -745,7 +745,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { { ExecCtx _local_exec_ctx; grpc_executor_set_threading(false); - grpc_exec_ctx_finish(); } grpc_resolve_address = my_resolve_address; grpc_dns_lookup_ares = my_dns_lookup_ares; @@ -840,7 +839,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { { ExecCtx _local_exec_ctx; grpc_channel_args_destroy(args); - grpc_exec_ctx_finish(); } gpr_free(target_uri); gpr_free(target); @@ -868,7 +866,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { { ExecCtx _local_exec_ctx; grpc_channel_args_destroy(args); - grpc_exec_ctx_finish(); } grpc_server_register_completion_queue(g_server, cq, NULL); grpc_server_start(g_server); @@ -1197,7 +1194,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { { ExecCtx _local_exec_ctx; grpc_channel_args_destroy(args); - grpc_exec_ctx_finish(); } gpr_free(target_uri); gpr_free(target); diff --git a/test/core/end2end/fuzzers/client_fuzzer.cc b/test/core/end2end/fuzzers/client_fuzzer.cc index 219c42847ee..95ed2fcdac9 100644 --- a/test/core/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/end2end/fuzzers/client_fuzzer.cc @@ -111,7 +111,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_event ev; while (1) { - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), NULL); switch (ev.type) { case GRPC_QUEUE_TIMEOUT: diff --git a/test/core/end2end/fuzzers/server_fuzzer.cc b/test/core/end2end/fuzzers/server_fuzzer.cc index d7295f4c834..21778c0a679 100644 --- a/test/core/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/end2end/fuzzers/server_fuzzer.cc @@ -78,7 +78,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_event ev; while (1) { - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), NULL); switch (ev.type) { case GRPC_QUEUE_TIMEOUT: diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc index 850d6516f29..e0da548a75d 100644 --- a/test/core/end2end/h2_ssl_cert_test.cc +++ b/test/core/end2end/h2_ssl_cert_test.cc @@ -183,7 +183,6 @@ typedef enum { NONE, SELF_SIGNED, SIGNED, BAD_CERT_PAIR } certtype; { \ ExecCtx _local_exec_ctx; \ grpc_channel_args_destroy(new_client_args); \ - grpc_exec_ctx_finish(); \ } \ } diff --git a/test/core/end2end/tests/cancel_after_accept.cc b/test/core/end2end/tests/cancel_after_accept.cc index fcf30f0cc68..ffafb1f1e9b 100644 --- a/test/core/end2end/tests/cancel_after_accept.cc +++ b/test/core/end2end/tests/cancel_after_accept.cc @@ -247,7 +247,6 @@ static void test_cancel_after_accept(grpc_end2end_test_config config, if (args != NULL) { ExecCtx _local_exec_ctx; grpc_channel_args_destroy(args); - grpc_exec_ctx_finish(); } cq_verifier_destroy(cqv); diff --git a/test/core/end2end/tests/cancel_after_round_trip.cc b/test/core/end2end/tests/cancel_after_round_trip.cc index b63491c7d21..7e20487f8b9 100644 --- a/test/core/end2end/tests/cancel_after_round_trip.cc +++ b/test/core/end2end/tests/cancel_after_round_trip.cc @@ -279,7 +279,6 @@ static void test_cancel_after_round_trip(grpc_end2end_test_config config, if (args != NULL) { ExecCtx _local_exec_ctx; grpc_channel_args_destroy(args); - grpc_exec_ctx_finish(); } cq_verifier_destroy(cqv); diff --git a/test/core/end2end/tests/compressed_payload.cc b/test/core/end2end/tests/compressed_payload.cc index a85fdf2662d..f04addbe9e7 100644 --- a/test/core/end2end/tests/compressed_payload.cc +++ b/test/core/end2end/tests/compressed_payload.cc @@ -132,7 +132,6 @@ static void request_for_disabled_algorithm( ExecCtx _local_exec_ctx; server_args = grpc_channel_args_compression_algorithm_set_state( &server_args, algorithm_to_disable, false); - grpc_exec_ctx_finish(); } f = begin_test(config, test_name, client_args, server_args); @@ -260,7 +259,6 @@ static void request_for_disabled_algorithm( ExecCtx _local_exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); - grpc_exec_ctx_finish(); } end_test(&f); @@ -539,7 +537,6 @@ static void request_with_payload_template( ExecCtx _local_exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); - grpc_exec_ctx_finish(); } end_test(&f); diff --git a/test/core/end2end/tests/load_reporting_hook.cc b/test/core/end2end/tests/load_reporting_hook.cc index 670610f37f1..6ce22d77c61 100644 --- a/test/core/end2end/tests/load_reporting_hook.cc +++ b/test/core/end2end/tests/load_reporting_hook.cc @@ -302,7 +302,6 @@ static void test_load_reporting_hook(grpc_end2end_test_config config) { { ExecCtx _local_exec_ctx; grpc_channel_args_destroy(lr_server_args); - grpc_exec_ctx_finish(); } config.tear_down_data(&f); } diff --git a/test/core/end2end/tests/max_message_length.cc b/test/core/end2end/tests/max_message_length.cc index 0200517de3e..f884d8b11f9 100644 --- a/test/core/end2end/tests/max_message_length.cc +++ b/test/core/end2end/tests/max_message_length.cc @@ -176,7 +176,6 @@ static void test_max_message_length_on_request(grpc_end2end_test_config config, ExecCtx _local_exec_ctx; if (client_args != NULL) grpc_channel_args_destroy(client_args); if (server_args != NULL) grpc_channel_args_destroy(server_args); - grpc_exec_ctx_finish(); } cqv = cq_verifier_create(f.cq); @@ -367,7 +366,6 @@ static void test_max_message_length_on_response(grpc_end2end_test_config config, ExecCtx _local_exec_ctx; if (client_args != NULL) grpc_channel_args_destroy(client_args); if (server_args != NULL) grpc_channel_args_destroy(server_args); - grpc_exec_ctx_finish(); } cqv = cq_verifier_create(f.cq); diff --git a/test/core/end2end/tests/stream_compression_compressed_payload.cc b/test/core/end2end/tests/stream_compression_compressed_payload.cc index 6100d604d20..cec46305bd3 100644 --- a/test/core/end2end/tests/stream_compression_compressed_payload.cc +++ b/test/core/end2end/tests/stream_compression_compressed_payload.cc @@ -132,7 +132,6 @@ static void request_for_disabled_algorithm( ExecCtx _local_exec_ctx; server_args = grpc_channel_args_stream_compression_algorithm_set_state( &server_args, algorithm_to_disable, false); - grpc_exec_ctx_finish(); } f = begin_test(config, test_name, client_args, server_args); @@ -261,7 +260,6 @@ static void request_for_disabled_algorithm( ExecCtx _local_exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); - grpc_exec_ctx_finish(); } end_test(&f); @@ -547,7 +545,6 @@ static void request_with_payload_template( ExecCtx _local_exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); - grpc_exec_ctx_finish(); } end_test(&f); diff --git a/test/core/end2end/tests/stream_compression_payload.cc b/test/core/end2end/tests/stream_compression_payload.cc index 42318ffbc82..c304c990d79 100644 --- a/test/core/end2end/tests/stream_compression_payload.cc +++ b/test/core/end2end/tests/stream_compression_payload.cc @@ -280,7 +280,6 @@ static void test_invoke_request_response_with_payload( ExecCtx _local_exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); - grpc_exec_ctx_finish(); } } diff --git a/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc b/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc index 5fb6a7e46f3..f4b737d7a32 100644 --- a/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc +++ b/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc @@ -276,7 +276,6 @@ static void test_pingpong_streaming(grpc_end2end_test_config config, ExecCtx _local_exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); - grpc_exec_ctx_finish(); } } diff --git a/test/core/end2end/tests/workaround_cronet_compression.cc b/test/core/end2end/tests/workaround_cronet_compression.cc index f38a51a5b77..100f393b8ed 100644 --- a/test/core/end2end/tests/workaround_cronet_compression.cc +++ b/test/core/end2end/tests/workaround_cronet_compression.cc @@ -150,7 +150,6 @@ static void request_with_payload_template( arg.value.string = user_agent_override; client_args = grpc_channel_args_copy_and_add(client_args_old, &arg, 1); grpc_channel_args_destroy(client_args_old); - grpc_exec_ctx_finish(); } f = begin_test(config, test_name, client_args, server_args); @@ -352,7 +351,6 @@ static void request_with_payload_template( ExecCtx _local_exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); - grpc_exec_ctx_finish(); } end_test(&f); diff --git a/test/core/http/httpcli_test.cc b/test/core/http/httpcli_test.cc index 85e4bc8a0ed..dfa328360d7 100644 --- a/test/core/http/httpcli_test.cc +++ b/test/core/http/httpcli_test.cc @@ -88,7 +88,7 @@ static void test_get(int port) { "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&g_pops), &worker, n_seconds_time(1)))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(); + gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -127,7 +127,7 @@ static void test_post(int port) { "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&g_pops), &worker, n_seconds_time(1)))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(); + gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -196,7 +196,7 @@ int main(int argc, char** argv) { GRPC_CLOSURE_INIT(&destroyed, destroy_pops, &g_pops, grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(grpc_polling_entity_pollset(&g_pops), &destroyed); - grpc_exec_ctx_finish(); + grpc_shutdown(); gpr_free(grpc_polling_entity_pollset(&g_pops)); diff --git a/test/core/http/httpscli_test.cc b/test/core/http/httpscli_test.cc index d948bb5e31d..ff082e8367b 100644 --- a/test/core/http/httpscli_test.cc +++ b/test/core/http/httpscli_test.cc @@ -89,7 +89,7 @@ static void test_get(int port) { "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&g_pops), &worker, n_seconds_time(1)))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(); + gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -129,7 +129,7 @@ static void test_post(int port) { "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&g_pops), &worker, n_seconds_time(1)))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(); + gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -199,7 +199,7 @@ int main(int argc, char** argv) { GRPC_CLOSURE_INIT(&destroyed, destroy_pops, &g_pops, grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(grpc_polling_entity_pollset(&g_pops), &destroyed); - grpc_exec_ctx_finish(); + grpc_shutdown(); gpr_free(grpc_polling_entity_pollset(&g_pops)); diff --git a/test/core/iomgr/combiner_test.cc b/test/core/iomgr/combiner_test.cc index 9fc1890c972..df8d55f1f69 100644 --- a/test/core/iomgr/combiner_test.cc +++ b/test/core/iomgr/combiner_test.cc @@ -30,7 +30,6 @@ static void test_no_op(void) { gpr_log(GPR_DEBUG, "test_no_op"); ExecCtx _local_exec_ctx; GRPC_COMBINER_UNREF(grpc_combiner_create(), "test_no_op"); - grpc_exec_ctx_finish(); } static void set_event_to_true(void* value, grpc_error* error) { @@ -47,11 +46,10 @@ static void test_execute_one(void) { GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(set_event_to_true, &done, grpc_combiner_scheduler(lock)), GRPC_ERROR_NONE); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&done, grpc_timeout_seconds_to_deadline(5)) != NULL); GRPC_COMBINER_UNREF(lock, "test_execute_one"); - grpc_exec_ctx_finish(); } typedef struct { @@ -84,7 +82,7 @@ static void execute_many_loop(void* a) { GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE( check_one, c, grpc_combiner_scheduler(args->lock)), GRPC_ERROR_NONE); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } // sleep for a little bit, to test a combiner draining and another thread // picking it up @@ -93,7 +91,6 @@ static void execute_many_loop(void* a) { GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(set_event_to_true, &args->done, grpc_combiner_scheduler(args->lock)), GRPC_ERROR_NONE); - grpc_exec_ctx_finish(); } static void test_execute_many(void) { @@ -117,7 +114,6 @@ static void test_execute_many(void) { } ExecCtx _local_exec_ctx; GRPC_COMBINER_UNREF(lock, "test_execute_many"); - grpc_exec_ctx_finish(); } static gpr_event got_in_finally; @@ -142,11 +138,10 @@ static void test_execute_finally(void) { GRPC_CLOSURE_SCHED( GRPC_CLOSURE_CREATE(add_finally, lock, grpc_combiner_scheduler(lock)), GRPC_ERROR_NONE); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&got_in_finally, grpc_timeout_seconds_to_deadline(5)) != NULL); GRPC_COMBINER_UNREF(lock, "test_execute_finally"); - grpc_exec_ctx_finish(); } int main(int argc, char** argv) { diff --git a/test/core/iomgr/endpoint_pair_test.cc b/test/core/iomgr/endpoint_pair_test.cc index bddeadd3297..72833a8dbe8 100644 --- a/test/core/iomgr/endpoint_pair_test.cc +++ b/test/core/iomgr/endpoint_pair_test.cc @@ -45,7 +45,6 @@ static grpc_endpoint_test_fixture create_fixture_endpoint_pair( f.server_ep = p.server; grpc_endpoint_add_to_pollset(f.client_ep, g_pollset); grpc_endpoint_add_to_pollset(f.server_ep, g_pollset); - grpc_exec_ctx_finish(); return f; } @@ -69,7 +68,7 @@ int main(int argc, char** argv) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(g_pollset, &destroyed); - grpc_exec_ctx_finish(); + grpc_shutdown(); gpr_free(g_pollset); diff --git a/test/core/iomgr/endpoint_tests.cc b/test/core/iomgr/endpoint_tests.cc index 10e80fc71b4..5c156ef5248 100644 --- a/test/core/iomgr/endpoint_tests.cc +++ b/test/core/iomgr/endpoint_tests.cc @@ -213,7 +213,7 @@ static void read_and_write_test(grpc_endpoint_test_config config, even when bytes_written is unsigned. */ state.bytes_written -= state.current_write_size; read_and_write_test_write_handler(&state, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); grpc_endpoint_read(state.read_ep, &state.incoming, &state.done_read); @@ -225,24 +225,23 @@ static void read_and_write_test(grpc_endpoint_test_config config, grpc_endpoint_shutdown( state.write_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); } - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); while (!state.read_done || !state.write_done) { grpc_pollset_worker* worker = NULL; - GPR_ASSERT(grpc_exec_ctx_now() < deadline); + GPR_ASSERT(ExecCtx::Get()->Now() < deadline); GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); } gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); end_test(config); grpc_slice_buffer_destroy_internal(&state.outgoing); grpc_slice_buffer_destroy_internal(&state.incoming); grpc_endpoint_destroy(state.read_ep); grpc_endpoint_destroy(state.write_ep); - grpc_exec_ctx_finish(); } static void inc_on_failure(void* arg, grpc_error* error) { @@ -253,16 +252,16 @@ static void inc_on_failure(void* arg, grpc_error* error) { } static void wait_for_fail_count(int* fail_count, int want_fail_count) { - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(10)); - while (grpc_exec_ctx_now() < deadline && *fail_count < want_fail_count) { + while (ExecCtx::Get()->Now() < deadline && *fail_count < want_fail_count) { grpc_pollset_worker* worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } GPR_ASSERT(*fail_count == want_fail_count); @@ -303,7 +302,6 @@ static void multiple_shutdown_test(grpc_endpoint_test_config config) { grpc_endpoint_destroy(f.client_ep); grpc_endpoint_destroy(f.server_ep); - grpc_exec_ctx_finish(); } void grpc_endpoint_tests(grpc_endpoint_test_config config, diff --git a/test/core/iomgr/ev_epollsig_linux_test.cc b/test/core/iomgr/ev_epollsig_linux_test.cc index 5dd28eac9c2..5c71bc6152f 100644 --- a/test/core/iomgr/ev_epollsig_linux_test.cc +++ b/test/core/iomgr/ev_epollsig_linux_test.cc @@ -77,11 +77,11 @@ static void test_fd_cleanup(test_fd* tfds, int num_fds) { for (i = 0; i < num_fds; i++) { grpc_fd_shutdown(tfds[i].fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("test_fd_cleanup")); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); grpc_fd_orphan(tfds[i].fd, NULL, &release_fd, false /* already_closed */, "test_fd_cleanup"); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); GPR_ASSERT(release_fd == tfds[i].inner_fd); close(tfds[i].inner_fd); @@ -110,7 +110,7 @@ static void test_pollset_cleanup(test_pollset* pollsets, int num_pollsets) { grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(pollsets[i].pollset, &destroyed); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_free(pollsets[i].pollset); } } @@ -168,32 +168,32 @@ static void test_add_fd_to_pollset() { /* == Step 1 == */ for (i = 0; i <= 2; i++) { grpc_pollset_add_fd(pollsets[0].pollset, tfds[i].fd); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } for (i = 3; i <= 4; i++) { grpc_pollset_add_fd(pollsets[1].pollset, tfds[i].fd); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } for (i = 5; i <= 7; i++) { grpc_pollset_add_fd(pollsets[2].pollset, tfds[i].fd); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } /* == Step 2 == */ for (i = 0; i <= 1; i++) { grpc_pollset_add_fd(pollsets[3].pollset, tfds[i].fd); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } /* == Step 3 == */ grpc_pollset_add_fd(pollsets[1].pollset, tfds[0].fd); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); /* == Step 4 == */ grpc_pollset_add_fd(pollsets[2].pollset, tfds[3].fd); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); /* All polling islands are merged at this point */ @@ -212,7 +212,6 @@ static void test_add_fd_to_pollset() { test_fd_cleanup(tfds, NUM_FDS); test_pollset_cleanup(pollsets, NUM_POLLSETS); - grpc_exec_ctx_finish(); } #undef NUM_FDS @@ -239,7 +238,6 @@ static void test_threading_loop(void* arg) { "pollset_work", grpc_pollset_work(shared->pollset, &worker, GRPC_MILLIS_INF_FUTURE))); gpr_mu_unlock(shared->mu); - grpc_exec_ctx_finish(); } } @@ -279,7 +277,6 @@ static void test_threading(void) { shared.wakeup_desc, GRPC_CLOSURE_INIT(&shared.on_wakeup, test_threading_wakeup, &shared, grpc_schedule_on_exec_ctx)); - grpc_exec_ctx_finish(); } GPR_ASSERT(GRPC_LOG_IF_ERROR("wakeup_first", grpc_wakeup_fd_wakeup(shared.wakeup_fd))); @@ -296,7 +293,6 @@ static void test_threading(void) { grpc_pollset_shutdown(shared.pollset, GRPC_CLOSURE_CREATE(destroy_pollset, shared.pollset, grpc_schedule_on_exec_ctx)); - grpc_exec_ctx_finish(); } gpr_free(shared.pollset); } @@ -318,7 +314,6 @@ int main(int argc, char** argv) { poll_strategy); } - grpc_exec_ctx_finish(); grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/fd_conservation_posix_test.cc b/test/core/iomgr/fd_conservation_posix_test.cc index a5f6d339984..7f3420269ed 100644 --- a/test/core/iomgr/fd_conservation_posix_test.cc +++ b/test/core/iomgr/fd_conservation_posix_test.cc @@ -45,12 +45,11 @@ int main(int argc, char** argv) { p = grpc_iomgr_create_endpoint_pair("test", NULL); grpc_endpoint_destroy(p.client); grpc_endpoint_destroy(p.server); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } grpc_resource_quota_unref(resource_quota); - grpc_exec_ctx_finish(); grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/fd_posix_test.cc b/test/core/iomgr/fd_posix_test.cc index 9bf16923cb4..d22cb5f4f62 100644 --- a/test/core/iomgr/fd_posix_test.cc +++ b/test/core/iomgr/fd_posix_test.cc @@ -252,7 +252,7 @@ static void server_wait_and_shutdown(server* sv) { "pollset_work", grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(); + gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -367,7 +367,7 @@ static void client_wait_and_shutdown(client* cl) { "pollset_work", grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(); + gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -386,7 +386,7 @@ static void test_grpc_fd(void) { port = server_start(&sv); client_init(&cl); client_start(&cl, port); - grpc_exec_ctx_finish(); + client_wait_and_shutdown(&cl); server_wait_and_shutdown(&sv); GPR_ASSERT(sv.read_bytes_total == cl.write_bytes_total); @@ -469,7 +469,7 @@ static void test_grpc_fd_change(void) { "pollset_work", grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(); + gpr_mu_lock(g_mu); } GPR_ASSERT(a.cb_that_ran == first_read_callback); @@ -493,7 +493,7 @@ static void test_grpc_fd_change(void) { "pollset_work", grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(); + gpr_mu_lock(g_mu); } /* Except now we verify that second_read_callback ran instead */ @@ -501,7 +501,7 @@ static void test_grpc_fd_change(void) { gpr_mu_unlock(g_mu); grpc_fd_orphan(em_fd, NULL, NULL, false /* already_closed */, "d"); - grpc_exec_ctx_finish(); + destroy_change_data(&a); destroy_change_data(&b); close(sv[1]); @@ -523,9 +523,9 @@ int main(int argc, char** argv) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(g_pollset, &destroyed); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_free(g_pollset); - grpc_exec_ctx_finish(); + grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/pollset_set_test.cc b/test/core/iomgr/pollset_set_test.cc index ba794ca192e..e9b46f59e32 100644 --- a/test/core/iomgr/pollset_set_test.cc +++ b/test/core/iomgr/pollset_set_test.cc @@ -84,7 +84,7 @@ static void cleanup_test_pollsets(test_pollset* pollsets, grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(pollsets[i].ps, &destroyed); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_free(pollsets[i].ps); pollsets[i].ps = NULL; } @@ -129,7 +129,7 @@ static void cleanup_test_fds(test_fd* tfds, const int num_fds) { for (int i = 0; i < num_fds; i++) { grpc_fd_shutdown(tfds[i].fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("fd cleanup")); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); /* grpc_fd_orphan frees the memory allocated for grpc_fd. Normally it also * calls close() on the underlying fd. In our case, we are using @@ -138,7 +138,7 @@ static void cleanup_test_fds(test_fd* tfds, const int num_fds) { * underlying fd, call it with a non-NULL 'release_fd' parameter */ grpc_fd_orphan(tfds[i].fd, NULL, &release_fd, false /* already_closed */, "test_fd_cleanup"); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); grpc_wakeup_fd_destroy(&tfds[i].wakeup_fd); } @@ -236,7 +236,7 @@ static void pollset_set_test_basic() { grpc_pollset_add_fd(pollsets[1].ps, tfds[8].fd); grpc_pollset_add_fd(pollsets[2].ps, tfds[9].fd); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); /* Test that if any FD in the above structure is readable, it is observable by * doing grpc_pollset_work on any pollset @@ -259,10 +259,10 @@ static void pollset_set_test_basic() { grpc_pollset_work(pollsets[i].ps, &worker, deadline)); gpr_mu_unlock(pollsets[i].mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); verify_readable_and_reset(tfds, num_fds); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } /* Test tear down */ @@ -270,19 +270,18 @@ static void pollset_set_test_basic() { grpc_pollset_set_del_fd(pollset_sets[0].pss, tfds[5].fd); grpc_pollset_set_del_fd(pollset_sets[1].pss, tfds[1].fd); grpc_pollset_set_del_fd(pollset_sets[1].pss, tfds[6].fd); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); grpc_pollset_set_del_pollset(pollset_sets[1].pss, pollsets[0].ps); grpc_pollset_set_del_pollset(pollset_sets[0].pss, pollsets[1].ps); grpc_pollset_set_del_pollset(pollset_sets[0].pss, pollsets[2].ps); grpc_pollset_set_del_pollset_set(pollset_sets[0].pss, pollset_sets[1].pss); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); cleanup_test_fds(tfds, num_fds); cleanup_test_pollsets(pollsets, num_ps); cleanup_test_pollset_sets(pollset_sets, num_pss); - grpc_exec_ctx_finish(); } /* Same FD added multiple times to the pollset_set tree */ @@ -338,10 +337,10 @@ void pollset_set_test_dup_fds() { GPR_ASSERT(GRPC_ERROR_NONE == grpc_pollset_work(pollset.ps, &worker, deadline)); gpr_mu_unlock(pollset.mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); verify_readable_and_reset(tfds, num_fds); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); /* Tear down */ grpc_pollset_set_del_fd(pollset_sets[0].pss, tfds[0].fd); @@ -350,12 +349,11 @@ void pollset_set_test_dup_fds() { grpc_pollset_set_del_pollset(pollset_sets[1].pss, pollset.ps); grpc_pollset_set_del_pollset_set(pollset_sets[0].pss, pollset_sets[1].pss); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); cleanup_test_fds(tfds, num_fds); cleanup_test_pollsets(&pollset, num_ps); cleanup_test_pollset_sets(pollset_sets, num_pss); - grpc_exec_ctx_finish(); } /* Pollset_set with an empty pollset */ @@ -406,21 +404,20 @@ void pollset_set_test_empty_pollset() { GPR_ASSERT(GRPC_ERROR_NONE == grpc_pollset_work(pollsets[0].ps, &worker, deadline)); gpr_mu_unlock(pollsets[0].mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); verify_readable_and_reset(tfds, num_fds); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); /* Tear down */ grpc_pollset_set_del_fd(pollset_set.pss, tfds[0].fd); grpc_pollset_set_del_pollset(pollset_set.pss, pollsets[0].ps); grpc_pollset_set_del_pollset(pollset_set.pss, pollsets[1].ps); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); cleanup_test_fds(tfds, num_fds); cleanup_test_pollsets(pollsets, num_ps); cleanup_test_pollset_sets(&pollset_set, num_pss); - grpc_exec_ctx_finish(); } int main(int argc, char** argv) { @@ -442,7 +439,6 @@ int main(int argc, char** argv) { poll_strategy); } - grpc_exec_ctx_finish(); grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index d06777d86fe..9870d7aa73b 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -67,7 +67,7 @@ void args_finish(args_struct* args) { grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(args->pollset, &do_nothing_cb); // exec_ctx needs to be flushed before calling grpc_pollset_destroy() - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); grpc_pollset_destroy(args->pollset); gpr_free(args->pollset); } @@ -86,7 +86,7 @@ static void actually_poll(void* argsp) { if (done) { break; } - grpc_millis time_left = deadline - grpc_exec_ctx_now(); + grpc_millis time_left = deadline - ExecCtx::Get()->Now(); gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRIdPTR, done, time_left); GPR_ASSERT(time_left >= 0); grpc_pollset_worker* worker = NULL; @@ -94,10 +94,9 @@ static void actually_poll(void* argsp) { GRPC_LOG_IF_ERROR("pollset_work", grpc_pollset_work(args->pollset, &worker, n_sec_deadline(1))); gpr_mu_unlock(args->mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } gpr_event_set(&args->ev, (void*)1); - grpc_exec_ctx_finish(); } static void poll_pollset_until_request_done(args_struct* args) { @@ -130,7 +129,6 @@ static void test_unix_socket(void) { GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); args_finish(&args); - grpc_exec_ctx_finish(); } static void test_unix_socket_path_name_too_long(void) { @@ -153,7 +151,6 @@ static void test_unix_socket_path_name_too_long(void) { &args.addrs); gpr_free(path_name); args_finish(&args); - grpc_exec_ctx_finish(); } int main(int argc, char** argv) { @@ -163,7 +160,7 @@ int main(int argc, char** argv) { test_unix_socket(); test_unix_socket_path_name_too_long(); grpc_executor_shutdown(); - grpc_exec_ctx_finish(); + grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc index 1eb753dc859..dbc825884d6 100644 --- a/test/core/iomgr/resolve_address_test.cc +++ b/test/core/iomgr/resolve_address_test.cc @@ -63,7 +63,7 @@ void args_finish(args_struct* args) { grpc_pollset_shutdown(args->pollset, &do_nothing_cb); gpr_mu_unlock(args->mu); // exec_ctx needs to be flushed before calling grpc_pollset_destroy() - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); grpc_pollset_destroy(args->pollset); gpr_free(args->pollset); } @@ -81,7 +81,7 @@ static void poll_pollset_until_request_done(args_struct* args) { if (done) { break; } - grpc_millis time_left = deadline - grpc_exec_ctx_now(); + grpc_millis time_left = deadline - ExecCtx::Get()->Now(); gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRIdPTR, done, time_left); GPR_ASSERT(time_left >= 0); grpc_pollset_worker* worker = NULL; @@ -89,10 +89,9 @@ static void poll_pollset_until_request_done(args_struct* args) { GRPC_LOG_IF_ERROR("pollset_work", grpc_pollset_work(args->pollset, &worker, n_sec_deadline(1))); gpr_mu_unlock(args->mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } gpr_event_set(&args->ev, (void*)1); - grpc_exec_ctx_finish(); } static void must_succeed(void* argsp, grpc_error* err) { @@ -123,10 +122,9 @@ static void test_localhost(void) { "localhost:1", NULL, args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); args_finish(&args); - grpc_exec_ctx_finish(); } static void test_default_port(void) { @@ -137,10 +135,9 @@ static void test_default_port(void) { "localhost", "1", args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); args_finish(&args); - grpc_exec_ctx_finish(); } static void test_non_numeric_default_port(void) { @@ -151,10 +148,9 @@ static void test_non_numeric_default_port(void) { "localhost", "https", args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); args_finish(&args); - grpc_exec_ctx_finish(); } static void test_missing_default_port(void) { @@ -165,10 +161,9 @@ static void test_missing_default_port(void) { "localhost", NULL, args.pollset_set, GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); args_finish(&args); - grpc_exec_ctx_finish(); } static void test_ipv6_with_port(void) { @@ -179,10 +174,9 @@ static void test_ipv6_with_port(void) { "[2001:db8::1]:1", NULL, args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); args_finish(&args); - grpc_exec_ctx_finish(); } static void test_ipv6_without_port(void) { @@ -200,10 +194,9 @@ static void test_ipv6_without_port(void) { kCases[i], "80", args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); args_finish(&args); - grpc_exec_ctx_finish(); } } @@ -221,10 +214,9 @@ static void test_invalid_ip_addresses(void) { kCases[i], NULL, args.pollset_set, GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); args_finish(&args); - grpc_exec_ctx_finish(); } } @@ -241,10 +233,9 @@ static void test_unparseable_hostports(void) { kCases[i], "1", args.pollset_set, GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); args_finish(&args); - grpc_exec_ctx_finish(); } } @@ -261,7 +252,7 @@ int main(int argc, char** argv) { test_invalid_ip_addresses(); test_unparseable_hostports(); grpc_executor_shutdown(); - grpc_exec_ctx_finish(); + grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/resource_quota_test.cc b/test/core/iomgr/resource_quota_test.cc index bee9373ff60..40beadc5d6c 100644 --- a/test/core/iomgr/resource_quota_test.cc +++ b/test/core/iomgr/resource_quota_test.cc @@ -86,7 +86,6 @@ grpc_closure* make_unused_reclaimer(grpc_closure* then) { static void destroy_user(grpc_resource_user* usr) { ExecCtx _local_exec_ctx; grpc_resource_user_unref(usr); - grpc_exec_ctx_finish(); } static void test_no_op(void) { @@ -120,12 +119,10 @@ static void test_instant_alloc_then_free(void) { { ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, NULL); - grpc_exec_ctx_finish(); } { ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); - grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -141,7 +138,6 @@ static void test_instant_alloc_free_pair(void) { ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, NULL); grpc_resource_user_free(usr, 1024); - grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -158,14 +154,13 @@ static void test_simple_async_alloc(void) { gpr_event_init(&ev); ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); } { ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); - grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -182,7 +177,7 @@ static void test_async_alloc_blocked_by_size(void) { { ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait( &ev, grpc_timeout_milliseconds_to_deadline(100)) == NULL); } @@ -192,7 +187,6 @@ static void test_async_alloc_blocked_by_size(void) { { ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); - grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -209,7 +203,7 @@ static void test_scavenge(void) { gpr_event_init(&ev); ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); ; @@ -217,14 +211,13 @@ static void test_scavenge(void) { { ExecCtx _local_exec_ctx; grpc_resource_user_free(usr1, 1024); - grpc_exec_ctx_finish(); } { gpr_event ev; gpr_event_init(&ev); ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); ; @@ -232,7 +225,6 @@ static void test_scavenge(void) { { ExecCtx _local_exec_ctx; grpc_resource_user_free(usr2, 1024); - grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr1); @@ -250,7 +242,7 @@ static void test_scavenge_blocked(void) { gpr_event_init(&ev); ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); ; @@ -259,14 +251,14 @@ static void test_scavenge_blocked(void) { gpr_event_init(&ev); ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait( &ev, grpc_timeout_milliseconds_to_deadline(100)) == NULL); } { ExecCtx _local_exec_ctx; grpc_resource_user_free(usr1, 1024); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); ; @@ -274,7 +266,6 @@ static void test_scavenge_blocked(void) { { ExecCtx _local_exec_ctx; grpc_resource_user_free(usr2, 1024); - grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr1); @@ -292,7 +283,7 @@ static void test_blocked_until_scheduled_reclaim(void) { gpr_event_init(&ev); ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); ; @@ -303,14 +294,13 @@ static void test_blocked_until_scheduled_reclaim(void) { ExecCtx _local_exec_ctx; grpc_resource_user_post_reclaimer( usr, false, make_reclaimer(usr, 1024, set_event(&reclaim_done))); - grpc_exec_ctx_finish(); } { gpr_event ev; gpr_event_init(&ev); ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&reclaim_done, grpc_timeout_seconds_to_deadline(5)) != NULL); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -320,7 +310,6 @@ static void test_blocked_until_scheduled_reclaim(void) { { ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); - grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -338,7 +327,7 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) { gpr_event_init(&ev); ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); ; @@ -349,14 +338,13 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) { ExecCtx _local_exec_ctx; grpc_resource_user_post_reclaimer( usr1, false, make_reclaimer(usr1, 1024, set_event(&reclaim_done))); - grpc_exec_ctx_finish(); } { gpr_event ev; gpr_event_init(&ev); ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&reclaim_done, grpc_timeout_seconds_to_deadline(5)) != NULL); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -366,7 +354,6 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) { { ExecCtx _local_exec_ctx; grpc_resource_user_free(usr2, 1024); - grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr1); @@ -384,7 +371,7 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) { gpr_event_init(&ev); ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); ; @@ -395,14 +382,13 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) { ExecCtx _local_exec_ctx; grpc_resource_user_post_reclaimer( usr, true, make_reclaimer(usr, 1024, set_event(&reclaim_done))); - grpc_exec_ctx_finish(); } { gpr_event ev; gpr_event_init(&ev); ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&reclaim_done, grpc_timeout_seconds_to_deadline(5)) != NULL); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -412,7 +398,6 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) { { ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); - grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -434,7 +419,7 @@ static void test_unused_reclaim_is_cancelled(void) { usr, false, make_unused_reclaimer(set_event(&benign_done))); grpc_resource_user_post_reclaimer( usr, true, make_unused_reclaimer(set_event(&destructive_done))); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_milliseconds_to_deadline(100)) == NULL); @@ -465,7 +450,7 @@ static void test_benign_reclaim_is_preferred(void) { gpr_event_init(&ev); ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); ; @@ -476,7 +461,7 @@ static void test_benign_reclaim_is_preferred(void) { usr, false, make_reclaimer(usr, 1024, set_event(&benign_done))); grpc_resource_user_post_reclaimer( usr, true, make_unused_reclaimer(set_event(&destructive_done))); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_milliseconds_to_deadline(100)) == NULL); @@ -489,7 +474,7 @@ static void test_benign_reclaim_is_preferred(void) { gpr_event_init(&ev); ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_seconds_to_deadline(5)) != NULL); GPR_ASSERT(gpr_event_wait(&destructive_done, @@ -501,7 +486,6 @@ static void test_benign_reclaim_is_preferred(void) { { ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); - grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -526,7 +510,7 @@ static void test_multiple_reclaims_can_be_triggered(void) { gpr_event_init(&ev); ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); ; @@ -537,7 +521,7 @@ static void test_multiple_reclaims_can_be_triggered(void) { usr, false, make_reclaimer(usr, 512, set_event(&benign_done))); grpc_resource_user_post_reclaimer( usr, true, make_reclaimer(usr, 512, set_event(&destructive_done))); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_milliseconds_to_deadline(100)) == NULL); @@ -550,7 +534,7 @@ static void test_multiple_reclaims_can_be_triggered(void) { gpr_event_init(&ev); ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_seconds_to_deadline(5)) != NULL); GPR_ASSERT(gpr_event_wait(&destructive_done, @@ -562,7 +546,6 @@ static void test_multiple_reclaims_can_be_triggered(void) { { ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); - grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -582,18 +565,15 @@ static void test_resource_user_stays_allocated_until_memory_released(void) { { ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, NULL); - grpc_exec_ctx_finish(); } { ExecCtx _local_exec_ctx; grpc_resource_quota_unref(q); grpc_resource_user_unref(usr); - grpc_exec_ctx_finish(); } { ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); - grpc_exec_ctx_finish(); } } @@ -616,7 +596,7 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( ExecCtx _local_exec_ctx; grpc_resource_user_post_reclaimer( usr, false, make_unused_reclaimer(set_event(&reclaimer_cancelled))); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, grpc_timeout_milliseconds_to_deadline(100)) == NULL); @@ -626,7 +606,7 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( gpr_event_init(&allocated); ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&allocated, grpc_timeout_seconds_to_deadline(5)) != NULL); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, @@ -636,7 +616,7 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( { ExecCtx _local_exec_ctx; grpc_resource_user_unref(usr); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, grpc_timeout_milliseconds_to_deadline(100)) == NULL); @@ -644,7 +624,7 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( { ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, grpc_timeout_seconds_to_deadline(5)) != NULL); } @@ -663,7 +643,7 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { gpr_event_init(&allocated); ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&allocated, grpc_timeout_seconds_to_deadline(5)) != NULL); } @@ -674,7 +654,7 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { ExecCtx _local_exec_ctx; grpc_resource_user_post_reclaimer( usr, false, make_reclaimer(usr, 1024, set_event(&reclaimer_done))); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&reclaimer_done, grpc_timeout_milliseconds_to_deadline(100)) == NULL); @@ -684,7 +664,7 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { gpr_event_init(&allocated); ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); - grpc_exec_ctx_finish(); + GPR_ASSERT(gpr_event_wait(&allocated, grpc_timeout_seconds_to_deadline(5)) != NULL); GPR_ASSERT(gpr_event_wait(&reclaimer_done, @@ -694,7 +674,6 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { { ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); - grpc_exec_ctx_finish(); } destroy_user(usr); grpc_resource_quota_unref(q); @@ -719,14 +698,13 @@ static void test_one_slice(void) { const int start_allocs = num_allocs; ExecCtx _local_exec_ctx; grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); - grpc_exec_ctx_finish(); + assert_counter_becomes(&num_allocs, start_allocs + 1); } { ExecCtx _local_exec_ctx; grpc_slice_buffer_destroy_internal(&buffer); - grpc_exec_ctx_finish(); } destroy_user(usr); grpc_resource_quota_unref(q); @@ -752,21 +730,19 @@ static void test_one_slice_deleted_late(void) { const int start_allocs = num_allocs; ExecCtx _local_exec_ctx; grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); - grpc_exec_ctx_finish(); + assert_counter_becomes(&num_allocs, start_allocs + 1); } { ExecCtx _local_exec_ctx; grpc_resource_user_unref(usr); - grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); { ExecCtx _local_exec_ctx; grpc_slice_buffer_destroy_internal(&buffer); - grpc_exec_ctx_finish(); } } @@ -796,7 +772,7 @@ static void test_negative_rq_free_pool(void) { const int start_allocs = num_allocs; ExecCtx _local_exec_ctx; grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); - grpc_exec_ctx_finish(); + assert_counter_becomes(&num_allocs, start_allocs + 1); } @@ -809,14 +785,12 @@ static void test_negative_rq_free_pool(void) { { ExecCtx _local_exec_ctx; grpc_resource_user_unref(usr); - grpc_exec_ctx_finish(); } grpc_resource_quota_unref(q); { ExecCtx _local_exec_ctx; grpc_slice_buffer_destroy_internal(&buffer); - grpc_exec_ctx_finish(); } } diff --git a/test/core/iomgr/tcp_client_posix_test.cc b/test/core/iomgr/tcp_client_posix_test.cc index 7fad3b08bef..abefecba335 100644 --- a/test/core/iomgr/tcp_client_posix_test.cc +++ b/test/core/iomgr/tcp_client_posix_test.cc @@ -56,7 +56,7 @@ static void finish_connection() { ExecCtx _local_exec_ctx; GPR_ASSERT( GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); - grpc_exec_ctx_finish(); + gpr_mu_unlock(g_mu); } @@ -127,13 +127,11 @@ void test_succeeds(void) { grpc_timespec_to_millis_round_up( grpc_timeout_seconds_to_deadline(5))))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); - - grpc_exec_ctx_finish(); } void test_fails(void) { @@ -177,12 +175,11 @@ void test_fails(void) { break; } gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(); } static void destroy_pollset(void* p, grpc_error* error) { @@ -198,7 +195,7 @@ int main(int argc, char** argv) { g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); grpc_pollset_init(g_pollset, &g_mu); grpc_pollset_set_add_pollset(g_pollset_set, g_pollset); - grpc_exec_ctx_finish(); + test_succeeds(); gpr_log(GPR_ERROR, "End of first test"); test_fails(); @@ -206,7 +203,7 @@ int main(int argc, char** argv) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(g_pollset, &destroyed); - grpc_exec_ctx_finish(); + grpc_shutdown(); gpr_free(g_pollset); return 0; diff --git a/test/core/iomgr/tcp_client_uv_test.cc b/test/core/iomgr/tcp_client_uv_test.cc index dd98fb2275f..0355896b858 100644 --- a/test/core/iomgr/tcp_client_uv_test.cc +++ b/test/core/iomgr/tcp_client_uv_test.cc @@ -121,7 +121,7 @@ void test_succeeds(void) { grpc_timespec_to_millis_round_up( grpc_timeout_seconds_to_deadline(5))))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } @@ -129,8 +129,6 @@ void test_succeeds(void) { uv_close((uv_handle_t*)svr_handle, close_cb); gpr_mu_unlock(g_mu); - - grpc_exec_ctx_finish(); } void test_fails(void) { @@ -175,12 +173,11 @@ void test_fails(void) { break; } gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(); } static void destroy_pollset(void* p, grpc_error* error) { @@ -194,14 +191,14 @@ int main(int argc, char** argv) { grpc_init(); g_pollset = static_cast(gpr_malloc(grpc_pollset_size())); grpc_pollset_init(g_pollset, &g_mu); - grpc_exec_ctx_finish(); + test_succeeds(); gpr_log(GPR_ERROR, "End of first test"); test_fails(); GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(g_pollset, &destroyed); - grpc_exec_ctx_finish(); + grpc_shutdown(); gpr_free(g_pollset); return 0; diff --git a/test/core/iomgr/tcp_posix_test.cc b/test/core/iomgr/tcp_posix_test.cc index e4126fb05aa..678e1c3638d 100644 --- a/test/core/iomgr/tcp_posix_test.cc +++ b/test/core/iomgr/tcp_posix_test.cc @@ -193,7 +193,7 @@ static void read_test(size_t num_bytes, size_t slice_size) { GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(); + gpr_mu_lock(g_mu); } GPR_ASSERT(state.read_bytes == state.target_read_bytes); @@ -201,7 +201,6 @@ static void read_test(size_t num_bytes, size_t slice_size) { grpc_slice_buffer_destroy_internal(&state.incoming); grpc_endpoint_destroy(ep); - grpc_exec_ctx_finish(); } /* Write to a socket until it fills up, then read from it using the grpc_tcp @@ -244,7 +243,7 @@ static void large_read_test(size_t slice_size) { GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(); + gpr_mu_lock(g_mu); } GPR_ASSERT(state.read_bytes == state.target_read_bytes); @@ -252,7 +251,6 @@ static void large_read_test(size_t slice_size) { grpc_slice_buffer_destroy_internal(&state.incoming); grpc_endpoint_destroy(ep); - grpc_exec_ctx_finish(); } struct write_socket_state { @@ -316,7 +314,7 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { grpc_timespec_to_millis_round_up( grpc_timeout_milliseconds_to_deadline(10))))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(); + do { bytes_read = read(fd, buf, bytes_left > read_size ? read_size : bytes_left); @@ -385,7 +383,7 @@ static void write_test(size_t num_bytes, size_t slice_size) { GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(); + gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -393,7 +391,6 @@ static void write_test(size_t num_bytes, size_t slice_size) { grpc_slice_buffer_destroy_internal(&outgoing); grpc_endpoint_destroy(ep); gpr_free(slices); - grpc_exec_ctx_finish(); } void on_fd_released(void* arg, grpc_error* errors) { @@ -453,7 +450,7 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { gpr_log(GPR_DEBUG, "wakeup: read=%" PRIdPTR " target=%" PRIdPTR, state.read_bytes, state.target_read_bytes); gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } GPR_ASSERT(state.read_bytes == state.target_read_bytes); @@ -461,7 +458,7 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { grpc_slice_buffer_destroy_internal(&state.incoming); grpc_tcp_destroy_and_release_fd(ep, &fd, &fd_released_cb); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); while (!fd_released_done) { grpc_pollset_worker* worker = NULL; @@ -472,7 +469,6 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { gpr_mu_unlock(g_mu); GPR_ASSERT(fd_released_done == 1); GPR_ASSERT(fd == sv[1]); - grpc_exec_ctx_finish(); written_bytes = fill_socket_partial(sv[0], num_bytes); drain_socket_blocking(fd, written_bytes, written_bytes); @@ -528,8 +524,6 @@ static grpc_endpoint_test_fixture create_fixture_tcp_socketpair( grpc_endpoint_add_to_pollset(f.client_ep, g_pollset); grpc_endpoint_add_to_pollset(f.server_ep, g_pollset); - grpc_exec_ctx_finish(); - return f; } @@ -553,7 +547,7 @@ int main(int argc, char** argv) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(g_pollset, &destroyed); - grpc_exec_ctx_finish(); + grpc_shutdown(); gpr_free(g_pollset); diff --git a/test/core/iomgr/tcp_server_posix_test.cc b/test/core/iomgr/tcp_server_posix_test.cc index 3707634c293..1c3f4490d5c 100644 --- a/test/core/iomgr/tcp_server_posix_test.cc +++ b/test/core/iomgr/tcp_server_posix_test.cc @@ -167,7 +167,6 @@ static void test_no_op(void) { grpc_tcp_server* s; GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); grpc_tcp_server_unref(s); - grpc_exec_ctx_finish(); } static void test_no_op_with_start(void) { @@ -177,7 +176,6 @@ static void test_no_op_with_start(void) { LOG_TEST("test_no_op_with_start"); grpc_tcp_server_start(s, NULL, 0, on_connect, NULL); grpc_tcp_server_unref(s); - grpc_exec_ctx_finish(); } static void test_no_op_with_port(void) { @@ -197,7 +195,6 @@ static void test_no_op_with_port(void) { port > 0); grpc_tcp_server_unref(s); - grpc_exec_ctx_finish(); } static void test_no_op_with_port_and_start(void) { @@ -219,7 +216,6 @@ static void test_no_op_with_port_and_start(void) { grpc_tcp_server_start(s, NULL, 0, on_connect, NULL); grpc_tcp_server_unref(s); - grpc_exec_ctx_finish(); } static grpc_error* tcp_connect(const test_addr* remote, @@ -247,7 +243,7 @@ static grpc_error* tcp_connect(const test_addr* remote, return GRPC_OS_ERROR(errno, "connect"); } gpr_log(GPR_DEBUG, "wait"); - while (g_nconnects == nconnects_before && deadline > grpc_exec_ctx_now()) { + while (g_nconnects == nconnects_before && deadline > ExecCtx::Get()->Now()) { grpc_pollset_worker* worker = NULL; grpc_error* err; if ((err = grpc_pollset_work(g_pollset, &worker, deadline)) != @@ -257,7 +253,7 @@ static grpc_error* tcp_connect(const test_addr* remote, return err; } gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(); + gpr_mu_lock(g_mu); } gpr_log(GPR_DEBUG, "wait done"); @@ -413,7 +409,6 @@ static void test_connect(size_t num_connects, GPR_ASSERT(grpc_tcp_server_port_fd(s, 0, 0) >= 0); grpc_tcp_server_unref(s); - grpc_exec_ctx_finish(); /* Weak ref lost. */ GPR_ASSERT(weak_ref.server == NULL); @@ -489,7 +484,7 @@ int main(int argc, char** argv) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(g_pollset, &destroyed); - grpc_exec_ctx_finish(); + grpc_shutdown(); gpr_free(dst_addrs); gpr_free(g_pollset); diff --git a/test/core/iomgr/tcp_server_uv_test.cc b/test/core/iomgr/tcp_server_uv_test.cc index 2a0ada225c5..50042af37f5 100644 --- a/test/core/iomgr/tcp_server_uv_test.cc +++ b/test/core/iomgr/tcp_server_uv_test.cc @@ -119,7 +119,6 @@ static void test_no_op(void) { grpc_tcp_server* s; GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); grpc_tcp_server_unref(s); - grpc_exec_ctx_finish(); } static void test_no_op_with_start(void) { @@ -129,7 +128,6 @@ static void test_no_op_with_start(void) { LOG_TEST("test_no_op_with_start"); grpc_tcp_server_start(s, NULL, 0, on_connect, NULL); grpc_tcp_server_unref(s); - grpc_exec_ctx_finish(); } static void test_no_op_with_port(void) { @@ -149,7 +147,6 @@ static void test_no_op_with_port(void) { port > 0); grpc_tcp_server_unref(s); - grpc_exec_ctx_finish(); } static void test_no_op_with_port_and_start(void) { @@ -171,7 +168,6 @@ static void test_no_op_with_port_and_start(void) { grpc_tcp_server_start(s, NULL, 0, on_connect, NULL); grpc_tcp_server_unref(s); - grpc_exec_ctx_finish(); } static void connect_cb(uv_connect_t* req, int status) { @@ -205,7 +201,7 @@ static void tcp_connect(const struct sockaddr* remote, socklen_t remote_len, grpc_pollset_work(g_pollset, &worker, grpc_timespec_to_millis_round_up(deadline)))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(); + gpr_mu_lock(g_mu); } gpr_log(GPR_DEBUG, "wait done"); @@ -277,7 +273,6 @@ static void test_connect(unsigned n) { GPR_ASSERT(weak_ref.server != NULL); grpc_tcp_server_unref(s); - grpc_exec_ctx_finish(); /* Weak ref lost. */ GPR_ASSERT(weak_ref.server == NULL); @@ -305,7 +300,7 @@ int main(int argc, char** argv) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(g_pollset, &destroyed); - grpc_exec_ctx_finish(); + grpc_shutdown(); gpr_free(g_pollset); return 0; diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc index 07dfec168cf..7281f55b854 100644 --- a/test/core/iomgr/timer_list_test.cc +++ b/test/core/iomgr/timer_list_test.cc @@ -52,7 +52,7 @@ static void add_test(void) { grpc_timer_check_trace.value = 1; memset(cb_called, 0, sizeof(cb_called)); - grpc_millis start = grpc_exec_ctx_now(); + grpc_millis start = ExecCtx::Get()->Now(); /* 10 ms timers. will expire in the current epoch */ for (i = 0; i < 10; i++) { @@ -69,32 +69,32 @@ static void add_test(void) { } /* collect timers. Only the first batch should be ready. */ - exec_ctx->now = start + 500; + ExecCtx::Get()->SetNow(start + 500); GPR_ASSERT(grpc_timer_check(NULL) == GRPC_TIMERS_FIRED); - grpc_exec_ctx_finish(); + for (i = 0; i < 20; i++) { GPR_ASSERT(cb_called[i][1] == (i < 10)); GPR_ASSERT(cb_called[i][0] == 0); } - exec_ctx->now = start + 600; + ExecCtx::Get()->SetNow(start + 600); GPR_ASSERT(grpc_timer_check(NULL) == GRPC_TIMERS_CHECKED_AND_EMPTY); - grpc_exec_ctx_finish(); + for (i = 0; i < 30; i++) { GPR_ASSERT(cb_called[i][1] == (i < 10)); GPR_ASSERT(cb_called[i][0] == 0); } /* collect the rest of the timers */ - exec_ctx->now = start + 1500; + ExecCtx::Get()->SetNow(start + 1500); GPR_ASSERT(grpc_timer_check(NULL) == GRPC_TIMERS_FIRED); - grpc_exec_ctx_finish(); + for (i = 0; i < 30; i++) { GPR_ASSERT(cb_called[i][1] == (i < 20)); GPR_ASSERT(cb_called[i][0] == 0); } - exec_ctx->now = start + 1600; + ExecCtx::Get()->SetNow(start + 1600); GPR_ASSERT(grpc_timer_check(NULL) == GRPC_TIMERS_CHECKED_AND_EMPTY); for (i = 0; i < 30; i++) { GPR_ASSERT(cb_called[i][1] == (i < 20)); @@ -102,7 +102,6 @@ static void add_test(void) { } grpc_timer_list_shutdown(); - grpc_exec_ctx_finish(); } /* Cleaning up a list with pending timers. */ @@ -112,8 +111,7 @@ void destruction_test(void) { gpr_log(GPR_INFO, "destruction_test"); - exec_ctx->now_is_valid = true; - exec_ctx->now = 0; + ExecCtx::Get()->SetNow(0); grpc_timer_list_init(); grpc_timer_trace.value = 1; grpc_timer_check_trace.value = 1; @@ -134,18 +132,18 @@ void destruction_test(void) { grpc_timer_init( &timers[4], 1, GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)4, grpc_schedule_on_exec_ctx)); - exec_ctx->now = 2; + ExecCtx::Get()->SetNow(2); GPR_ASSERT(grpc_timer_check(NULL) == GRPC_TIMERS_FIRED); - grpc_exec_ctx_finish(); + GPR_ASSERT(1 == cb_called[4][1]); grpc_timer_cancel(&timers[0]); grpc_timer_cancel(&timers[3]); - grpc_exec_ctx_finish(); + GPR_ASSERT(1 == cb_called[0][0]); GPR_ASSERT(1 == cb_called[3][0]); grpc_timer_list_shutdown(); - grpc_exec_ctx_finish(); + GPR_ASSERT(1 == cb_called[1][0]); GPR_ASSERT(1 == cb_called[2][0]); } diff --git a/test/core/iomgr/udp_server_test.cc b/test/core/iomgr/udp_server_test.cc index c079dbf7162..47e5cf02545 100644 --- a/test/core/iomgr/udp_server_test.cc +++ b/test/core/iomgr/udp_server_test.cc @@ -130,7 +130,6 @@ static void test_no_op(void) { ExecCtx _local_exec_ctx; grpc_udp_server* s = grpc_udp_server_create(NULL); grpc_udp_server_destroy(s, NULL); - grpc_exec_ctx_finish(); } static void test_no_op_with_start(void) { @@ -139,7 +138,6 @@ static void test_no_op_with_start(void) { LOG_TEST("test_no_op_with_start"); grpc_udp_server_start(s, NULL, 0, NULL); grpc_udp_server_destroy(s, NULL); - grpc_exec_ctx_finish(); } static void test_no_op_with_port(void) { @@ -157,7 +155,6 @@ static void test_no_op_with_port(void) { on_fd_orphaned)); grpc_udp_server_destroy(s, NULL); - grpc_exec_ctx_finish(); /* The server had a single FD, which should have been orphaned. */ GPR_ASSERT(g_number_of_orphan_calls == 1); @@ -188,7 +185,7 @@ static void test_no_op_with_port_and_socket_factory(void) { GPR_ASSERT(socket_factory->number_of_bind_calls == 1); grpc_udp_server_destroy(s, NULL); - grpc_exec_ctx_finish(); + grpc_socket_factory_unref(&socket_factory->base); /* The server had a single FD, which should have been orphaned. */ @@ -212,7 +209,6 @@ static void test_no_op_with_port_and_start(void) { grpc_udp_server_start(s, NULL, 0, NULL); grpc_udp_server_destroy(s, NULL); - grpc_exec_ctx_finish(); /* The server had a single FD, which is orphaned exactly once in * * grpc_udp_server_destroy. */ @@ -264,12 +260,12 @@ static void test_receive(int number_of_clients) { (socklen_t)resolved_addr.len) == 0); GPR_ASSERT(5 == write(clifd, "hello", 5)); while (g_number_of_reads == number_of_reads_before && - deadline > grpc_exec_ctx_now()) { + deadline > ExecCtx::Get()->Now()) { grpc_pollset_worker* worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } GPR_ASSERT(g_number_of_reads == number_of_reads_before + 1); @@ -280,7 +276,6 @@ static void test_receive(int number_of_clients) { gpr_mu_unlock(g_mu); grpc_udp_server_destroy(s, NULL); - grpc_exec_ctx_finish(); /* The server had a single FD, which is orphaned exactly once in * * grpc_udp_server_destroy. */ @@ -313,7 +308,7 @@ int main(int argc, char** argv) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(g_pollset, &destroyed); - grpc_exec_ctx_finish(); + gpr_free(g_pollset); grpc_shutdown(); return 0; diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc index c03ae5c584c..029171c931e 100644 --- a/test/core/security/credentials_test.cc +++ b/test/core/security/credentials_test.cc @@ -154,7 +154,6 @@ static void test_empty_md_array(void) { GPR_ASSERT(md_array.md == NULL); GPR_ASSERT(md_array.size == 0); grpc_credentials_mdelem_array_destroy(&md_array); - grpc_exec_ctx_finish(); } static void test_add_to_empty_md_array(void) { @@ -170,7 +169,6 @@ static void test_add_to_empty_md_array(void) { GPR_ASSERT(grpc_mdelem_eq(md, md_array.md[0])); GRPC_MDELEM_UNREF(md); grpc_credentials_mdelem_array_destroy(&md_array); - grpc_exec_ctx_finish(); } static void test_add_abunch_to_md_array(void) { @@ -190,7 +188,6 @@ static void test_add_abunch_to_md_array(void) { } GRPC_MDELEM_UNREF(md); grpc_credentials_mdelem_array_destroy(&md_array); - grpc_exec_ctx_finish(); } static void test_oauth2_token_fetcher_creds_parsing_ok(void) { @@ -208,7 +205,6 @@ static void test_oauth2_token_fetcher_creds_parsing_ok(void) { 0); GRPC_MDELEM_UNREF(token_md); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(); } static void test_oauth2_token_fetcher_creds_parsing_bad_http_status(void) { @@ -221,7 +217,6 @@ static void test_oauth2_token_fetcher_creds_parsing_bad_http_status(void) { &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(); } static void test_oauth2_token_fetcher_creds_parsing_empty_http_body(void) { @@ -233,7 +228,6 @@ static void test_oauth2_token_fetcher_creds_parsing_empty_http_body(void) { &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(); } static void test_oauth2_token_fetcher_creds_parsing_invalid_json(void) { @@ -249,7 +243,6 @@ static void test_oauth2_token_fetcher_creds_parsing_invalid_json(void) { &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(); } static void test_oauth2_token_fetcher_creds_parsing_missing_token(void) { @@ -264,7 +257,6 @@ static void test_oauth2_token_fetcher_creds_parsing_missing_token(void) { &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(); } static void test_oauth2_token_fetcher_creds_parsing_missing_token_type(void) { @@ -280,7 +272,6 @@ static void test_oauth2_token_fetcher_creds_parsing_missing_token_type(void) { &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(); } static void test_oauth2_token_fetcher_creds_parsing_missing_token_lifetime( @@ -296,7 +287,6 @@ static void test_oauth2_token_fetcher_creds_parsing_missing_token_lifetime( &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(); } typedef struct { @@ -402,7 +392,6 @@ static void test_google_iam_creds(void) { NULL}; run_request_metadata_test(creds, auth_md_ctx, state); grpc_call_credentials_unref(creds); - grpc_exec_ctx_finish(); } static void test_access_token_creds(void) { @@ -417,7 +406,6 @@ static void test_access_token_creds(void) { GPR_ASSERT(strcmp(creds->type, GRPC_CALL_CREDENTIALS_TYPE_OAUTH2) == 0); run_request_metadata_test(creds, auth_md_ctx, state); grpc_call_credentials_unref(creds); - grpc_exec_ctx_finish(); } static grpc_security_status check_channel_oauth2_create_security_connector( @@ -448,7 +436,6 @@ static void test_channel_oauth2_composite_creds(void) { channel_oauth2_creds, NULL, NULL, NULL, &new_args) == GRPC_SECURITY_OK); grpc_channel_credentials_release(channel_oauth2_creds); - grpc_exec_ctx_finish(); } static void test_oauth2_google_iam_composite_creds(void) { @@ -484,7 +471,6 @@ static void test_oauth2_google_iam_composite_creds(void) { GRPC_CALL_CREDENTIALS_TYPE_IAM) == 0); run_request_metadata_test(composite_creds, auth_md_ctx, state); grpc_call_credentials_unref(composite_creds); - grpc_exec_ctx_finish(); } static grpc_security_status @@ -533,7 +519,6 @@ static void test_channel_oauth2_google_iam_composite_creds(void) { GRPC_SECURITY_OK); grpc_channel_credentials_release(channel_oauth2_iam_creds); - grpc_exec_ctx_finish(); } static void validate_compute_engine_http_request( @@ -598,7 +583,7 @@ static void test_compute_engine_creds_success(void) { grpc_httpcli_set_override(compute_engine_httpcli_get_success_override, httpcli_post_should_not_be_called); run_request_metadata_test(creds, auth_md_ctx, state); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); /* Second request: the cached token should be served directly. */ state = @@ -606,11 +591,10 @@ static void test_compute_engine_creds_success(void) { grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); run_request_metadata_test(creds, auth_md_ctx, state); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); grpc_call_credentials_unref(creds); grpc_httpcli_set_override(NULL, NULL); - grpc_exec_ctx_finish(); } static void test_compute_engine_creds_failure(void) { @@ -628,7 +612,6 @@ static void test_compute_engine_creds_failure(void) { run_request_metadata_test(creds, auth_md_ctx, state); grpc_call_credentials_unref(creds); grpc_httpcli_set_override(NULL, NULL); - grpc_exec_ctx_finish(); } static void validate_refresh_token_http_request( @@ -689,7 +672,7 @@ static void test_refresh_token_creds_success(void) { grpc_httpcli_set_override(httpcli_get_should_not_be_called, refresh_token_httpcli_post_success); run_request_metadata_test(creds, auth_md_ctx, state); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); /* Second request: the cached token should be served directly. */ state = @@ -697,11 +680,10 @@ static void test_refresh_token_creds_success(void) { grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); run_request_metadata_test(creds, auth_md_ctx, state); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); grpc_call_credentials_unref(creds); grpc_httpcli_set_override(NULL, NULL); - grpc_exec_ctx_finish(); } static void test_refresh_token_creds_failure(void) { @@ -719,7 +701,6 @@ static void test_refresh_token_creds_failure(void) { run_request_metadata_test(creds, auth_md_ctx, state); grpc_call_credentials_unref(creds); grpc_httpcli_set_override(NULL, NULL); - grpc_exec_ctx_finish(); } static void validate_jwt_encode_and_sign_params( @@ -824,7 +805,7 @@ static void test_jwt_creds_success(void) { make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_success); run_request_metadata_test(creds, auth_md_ctx, state); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); /* Second request: the cached token should be served directly. */ state = @@ -832,7 +813,7 @@ static void test_jwt_creds_success(void) { grpc_jwt_encode_and_sign_set_override( encode_and_sign_jwt_should_not_be_called); run_request_metadata_test(creds, auth_md_ctx, state); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); /* Third request: Different service url so jwt_encode_and_sign should be called again (no caching). */ @@ -841,13 +822,12 @@ static void test_jwt_creds_success(void) { auth_md_ctx.service_url = other_test_service_url; grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_success); run_request_metadata_test(creds, auth_md_ctx, state); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); grpc_call_credentials_unref(creds); gpr_free(json_key_string); gpr_free(expected_md_value); grpc_jwt_encode_and_sign_set_override(NULL); - grpc_exec_ctx_finish(); } static void test_jwt_creds_signing_failure(void) { @@ -867,7 +847,6 @@ static void test_jwt_creds_signing_failure(void) { gpr_free(json_key_string); grpc_call_credentials_unref(creds); grpc_jwt_encode_and_sign_set_override(NULL); - grpc_exec_ctx_finish(); } static void set_google_default_creds_env_var_with_file_contents( @@ -902,7 +881,6 @@ static void test_google_default_creds_auth_key(void) { 0); grpc_channel_credentials_unref(&creds->base); gpr_setenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR, ""); /* Reset. */ - grpc_exec_ctx_finish(); } static void test_google_default_creds_refresh_token(void) { @@ -920,7 +898,6 @@ static void test_google_default_creds_refresh_token(void) { "32555999999.apps.googleusercontent.com") == 0); grpc_channel_credentials_unref(&creds->base); gpr_setenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR, ""); /* Reset. */ - grpc_exec_ctx_finish(); } static int default_creds_gce_detection_httpcli_get_success_override( @@ -968,7 +945,7 @@ static void test_google_default_creds_gce(void) { grpc_httpcli_set_override(compute_engine_httpcli_get_success_override, httpcli_post_should_not_be_called); run_request_metadata_test(creds->call_creds, auth_md_ctx, state); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); /* Check that we get a cached creds if we call grpc_google_default_credentials_create again. @@ -984,7 +961,6 @@ static void test_google_default_creds_gce(void) { grpc_channel_credentials_unref(&creds->base); grpc_httpcli_set_override(NULL, NULL); grpc_override_well_known_credentials_path_getter(NULL); - grpc_exec_ctx_finish(); } static int default_creds_gce_detection_httpcli_get_failure_override( @@ -1094,7 +1070,7 @@ static void test_metadata_plugin_success(void) { run_request_metadata_test(creds, auth_md_ctx, md_state); GPR_ASSERT(state == PLUGIN_GET_METADATA_CALLED_STATE); grpc_call_credentials_unref(creds); - grpc_exec_ctx_finish(); + GPR_ASSERT(state == PLUGIN_DESTROY_CALLED_STATE); } @@ -1122,7 +1098,7 @@ static void test_metadata_plugin_failure(void) { run_request_metadata_test(creds, auth_md_ctx, md_state); GPR_ASSERT(state == PLUGIN_GET_METADATA_CALLED_STATE); grpc_call_credentials_unref(creds); - grpc_exec_ctx_finish(); + GPR_ASSERT(state == PLUGIN_DESTROY_CALLED_STATE); } @@ -1167,8 +1143,6 @@ static void test_channel_creds_duplicate_without_call_creds(void) { grpc_channel_credentials_unref(channel_creds); grpc_channel_credentials_unref(composite_creds); - - grpc_exec_ctx_finish(); } typedef struct { diff --git a/test/core/security/json_token_test.cc b/test/core/security/json_token_test.cc index 70529259445..9eac2b92541 100644 --- a/test/core/security/json_token_test.cc +++ b/test/core/security/json_token_test.cc @@ -224,7 +224,7 @@ static grpc_json* parse_json_part_from_jwt(const char* str, size_t len, gpr_free(b64); *scratchpad = decoded; grpc_slice_unref(slice); - grpc_exec_ctx_finish(); + return json; } @@ -348,8 +348,6 @@ static void check_jwt_signature(const char* b64_signature, RSA* rsa_key, grpc_slice_unref_internal(sig); if (key != NULL) EVP_PKEY_free(key); if (md_ctx != NULL) EVP_MD_CTX_destroy(md_ctx); - - grpc_exec_ctx_finish(); } static char* service_account_creds_jwt_encode_and_sign( diff --git a/test/core/security/jwt_verifier_test.cc b/test/core/security/jwt_verifier_test.cc index 16fad9d45eb..7485aa10b4e 100644 --- a/test/core/security/jwt_verifier_test.cc +++ b/test/core/security/jwt_verifier_test.cc @@ -220,7 +220,6 @@ static void test_claims_success(void) { GPR_ASSERT(grpc_jwt_claims_check(claims, "https://foo.com") == GRPC_JWT_VERIFIER_OK); grpc_jwt_claims_destroy(claims); - grpc_exec_ctx_finish(); } static void test_expired_claims_failure(void) { @@ -247,7 +246,6 @@ static void test_expired_claims_failure(void) { GPR_ASSERT(grpc_jwt_claims_check(claims, "https://foo.com") == GRPC_JWT_VERIFIER_TIME_CONSTRAINT_FAILURE); grpc_jwt_claims_destroy(claims); - grpc_exec_ctx_finish(); } static void test_invalid_claims_failure(void) { @@ -256,7 +254,6 @@ static void test_invalid_claims_failure(void) { (char*)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); ExecCtx _local_exec_ctx; GPR_ASSERT(grpc_jwt_claims_from_json(json, s) == NULL); - grpc_exec_ctx_finish(); } static void test_bad_audience_claims_failure(void) { @@ -271,7 +268,6 @@ static void test_bad_audience_claims_failure(void) { GPR_ASSERT(grpc_jwt_claims_check(claims, "https://bar.com") == GRPC_JWT_VERIFIER_BAD_AUDIENCE); grpc_jwt_claims_destroy(claims); - grpc_exec_ctx_finish(); } static void test_bad_subject_claims_failure(void) { @@ -286,7 +282,6 @@ static void test_bad_subject_claims_failure(void) { GPR_ASSERT(grpc_jwt_claims_check(claims, "https://foo.com") == GRPC_JWT_VERIFIER_BAD_SUBJECT); grpc_jwt_claims_destroy(claims); - grpc_exec_ctx_finish(); } static char* json_key_str(const char* last_part) { @@ -371,7 +366,7 @@ static void test_jwt_verifier_google_email_issuer_success(void) { grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, on_verification_success, (void*)expected_user_data); grpc_jwt_verifier_destroy(verifier); - grpc_exec_ctx_finish(); + gpr_free(jwt); grpc_httpcli_set_override(NULL, NULL); } @@ -404,7 +399,7 @@ static void test_jwt_verifier_custom_email_issuer_success(void) { grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, on_verification_success, (void*)expected_user_data); grpc_jwt_verifier_destroy(verifier); - grpc_exec_ctx_finish(); + gpr_free(jwt); grpc_httpcli_set_override(NULL, NULL); } @@ -451,7 +446,7 @@ static void test_jwt_verifier_url_issuer_success(void) { grpc_jwt_verifier_verify(verifier, NULL, jwt, expected_audience, on_verification_success, (void*)expected_user_data); grpc_jwt_verifier_destroy(verifier); - grpc_exec_ctx_finish(); + gpr_free(jwt); grpc_httpcli_set_override(NULL, NULL); } @@ -491,7 +486,7 @@ static void test_jwt_verifier_url_issuer_bad_config(void) { on_verification_key_retrieval_error, (void*)expected_user_data); grpc_jwt_verifier_destroy(verifier); - grpc_exec_ctx_finish(); + gpr_free(jwt); grpc_httpcli_set_override(NULL, NULL); } @@ -514,7 +509,7 @@ static void test_jwt_verifier_bad_json_key(void) { on_verification_key_retrieval_error, (void*)expected_user_data); grpc_jwt_verifier_destroy(verifier); - grpc_exec_ctx_finish(); + gpr_free(jwt); grpc_httpcli_set_override(NULL, NULL); } @@ -528,7 +523,6 @@ static void corrupt_jwt_sig(char* jwt) { { ExecCtx _local_exec_ctx; sig = grpc_base64_decode(last_dot + 1, 1); - grpc_exec_ctx_finish(); } GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(sig)); sig_bytes = GRPC_SLICE_START_PTR(sig); @@ -568,7 +562,7 @@ static void test_jwt_verifier_bad_signature(void) { (void*)expected_user_data); gpr_free(jwt); grpc_jwt_verifier_destroy(verifier); - grpc_exec_ctx_finish(); + grpc_httpcli_set_override(NULL, NULL); } @@ -597,7 +591,7 @@ static void test_jwt_verifier_bad_format(void) { on_verification_bad_format, (void*)expected_user_data); grpc_jwt_verifier_destroy(verifier); - grpc_exec_ctx_finish(); + grpc_httpcli_set_override(NULL, NULL); } diff --git a/test/core/security/oauth2_utils.cc b/test/core/security/oauth2_utils.cc index 6104c7e9dd4..f4a52aaba0c 100644 --- a/test/core/security/oauth2_utils.cc +++ b/test/core/security/oauth2_utils.cc @@ -92,7 +92,7 @@ char* grpc_test_fetch_oauth2_token_with_credentials( on_oauth2_response(&request, error); GRPC_ERROR_UNREF(error); } - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(request.mu); while (!request.is_done) { @@ -108,7 +108,7 @@ char* grpc_test_fetch_oauth2_token_with_credentials( grpc_pollset_shutdown(grpc_polling_entity_pollset(&request.pops), &do_nothing_closure); - grpc_exec_ctx_finish(); + gpr_free(grpc_polling_entity_pollset(&request.pops)); return request.token; } diff --git a/test/core/security/print_google_default_creds_token.cc b/test/core/security/print_google_default_creds_token.cc index 6ea51658e16..6153e8a9cb0 100644 --- a/test/core/security/print_google_default_creds_token.cc +++ b/test/core/security/print_google_default_creds_token.cc @@ -111,13 +111,11 @@ int main(int argc, char** argv) { GRPC_MILLIS_INF_FUTURE))) sync.is_done = true; gpr_mu_unlock(sync.mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(sync.mu); } gpr_mu_unlock(sync.mu); - grpc_exec_ctx_finish(); - grpc_channel_credentials_release(creds); gpr_free(grpc_polling_entity_pollset(&sync.pops)); diff --git a/test/core/security/secure_endpoint_test.cc b/test/core/security/secure_endpoint_test.cc index a72329d5040..a49bf1a0b4b 100644 --- a/test/core/security/secure_endpoint_test.cc +++ b/test/core/security/secure_endpoint_test.cc @@ -115,7 +115,7 @@ static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( f.server_ep = grpc_secure_endpoint_create(fake_write_protector, fake_write_zero_copy_protector, tcp.server, NULL, 0); - grpc_exec_ctx_finish(); + return f; } @@ -178,7 +178,7 @@ static void test_leftover(grpc_endpoint_test_config config, size_t slice_size) { grpc_slice_buffer_init(&incoming); GRPC_CLOSURE_INIT(&done_closure, inc_call_ctr, &n, grpc_schedule_on_exec_ctx); grpc_endpoint_read(f.client_ep, &incoming, &done_closure); - grpc_exec_ctx_finish(); + GPR_ASSERT(n == 1); GPR_ASSERT(incoming.count == 1); GPR_ASSERT(grpc_slice_eq(s, incoming.slices[0])); @@ -189,7 +189,7 @@ static void test_leftover(grpc_endpoint_test_config config, size_t slice_size) { f.server_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("test_leftover end")); grpc_endpoint_destroy(f.client_ep); grpc_endpoint_destroy(f.server_ep); - grpc_exec_ctx_finish(); + grpc_slice_unref_internal(s); grpc_slice_buffer_destroy_internal(&incoming); @@ -215,7 +215,7 @@ int main(int argc, char** argv) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(g_pollset, &destroyed); - grpc_exec_ctx_finish(); + grpc_shutdown(); gpr_free(g_pollset); diff --git a/test/core/security/ssl_server_fuzzer.cc b/test/core/security/ssl_server_fuzzer.cc index 3ee7738ea8d..84a42546c67 100644 --- a/test/core/security/ssl_server_fuzzer.cc +++ b/test/core/security/ssl_server_fuzzer.cc @@ -83,7 +83,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_security_status status = grpc_server_credentials_create_security_connector(creds, &sc); GPR_ASSERT(status == GRPC_SECURITY_OK); - grpc_millis deadline = GPR_MS_PER_SEC + grpc_exec_ctx_now(); + grpc_millis deadline = GPR_MS_PER_SEC + ExecCtx::Get()->Now(); struct handshake_state state; state.done_callback_called = false; @@ -92,7 +92,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_handshake_manager_do_handshake( handshake_mgr, mock_endpoint, NULL /* channel_args */, deadline, NULL /* acceptor */, on_handshake_done, &state); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); // If the given string happens to be part of the correct client hello, the // server will wait for more data. Explicitly fail the server by shutting down @@ -100,7 +100,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (!state.done_callback_called) { grpc_endpoint_shutdown( mock_endpoint, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Explicit close")); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } GPR_ASSERT(state.done_callback_called); @@ -111,7 +111,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_slice_unref(cert_slice); grpc_slice_unref(key_slice); grpc_slice_unref(ca_slice); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); grpc_shutdown(); if (leak_check) { diff --git a/test/core/security/verify_jwt.cc b/test/core/security/verify_jwt.cc index fce1e9d8de1..f3e89666257 100644 --- a/test/core/security/verify_jwt.cc +++ b/test/core/security/verify_jwt.cc @@ -106,7 +106,7 @@ int main(int argc, char** argv) { grpc_pollset_work(sync.pollset, &worker, GRPC_MILLIS_INF_FUTURE))) sync.is_done = true; gpr_mu_unlock(sync.mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(sync.mu); } gpr_mu_unlock(sync.mu); @@ -114,7 +114,7 @@ int main(int argc, char** argv) { gpr_free(sync.pollset); grpc_jwt_verifier_destroy(verifier); - grpc_exec_ctx_finish(); + gpr_cmdline_destroy(cl); grpc_shutdown(); return !sync.success; diff --git a/test/core/slice/b64_test.cc b/test/core/slice/b64_test.cc index 3f1de9bc125..5ed99107405 100644 --- a/test/core/slice/b64_test.cc +++ b/test/core/slice/b64_test.cc @@ -51,7 +51,7 @@ static void test_simple_encode_decode_b64(int url_safe, int multiline) { GRPC_SLICE_LENGTH(hello_slice)) == 0); grpc_slice_unref_internal(hello_slice); - grpc_exec_ctx_finish(); + gpr_free(hello_b64); } @@ -72,7 +72,6 @@ static void test_full_range_encode_decode_b64(int url_safe, int multiline) { sizeof(orig) - i)); grpc_slice_unref_internal(orig_decoded); gpr_free(b64); - grpc_exec_ctx_finish(); } } @@ -128,7 +127,6 @@ static void test_url_safe_unsafe_mismatch_failure(void) { GPR_ASSERT(GRPC_SLICE_IS_EMPTY(orig_decoded)); gpr_free(b64); grpc_slice_unref_internal(orig_decoded); - grpc_exec_ctx_finish(); } static void test_rfc4648_test_vectors(void) { @@ -199,7 +197,6 @@ static void test_unpadded_decode(void) { decoded = grpc_base64_decode("", 0); GPR_ASSERT(GRPC_SLICE_IS_EMPTY(decoded)); - grpc_exec_ctx_finish(); } int main(int argc, char** argv) { diff --git a/test/core/slice/slice_hash_table_test.cc b/test/core/slice/slice_hash_table_test.cc index b5b9c1bb734..89fc33a7bf0 100644 --- a/test/core/slice/slice_hash_table_test.cc +++ b/test/core/slice/slice_hash_table_test.cc @@ -121,7 +121,6 @@ static void test_slice_hash_table() { // Clean up. ExecCtx _local_exec_ctx; grpc_slice_hash_table_unref(table); - grpc_exec_ctx_finish(); } static int value_cmp_fn(void* a, void* b) { @@ -150,7 +149,6 @@ static void test_slice_hash_table_eq() { ExecCtx _local_exec_ctx; grpc_slice_hash_table_unref(table_a); grpc_slice_hash_table_unref(table_b); - grpc_exec_ctx_finish(); } static void test_slice_hash_table_not_eq() { @@ -229,7 +227,6 @@ static void test_slice_hash_table_not_eq() { grpc_slice_hash_table_unref(table_f); grpc_slice_hash_table_unref(table_g); grpc_slice_hash_table_unref(table_h); - grpc_exec_ctx_finish(); } int main(int argc, char** argv) { diff --git a/test/core/surface/byte_buffer_reader_test.cc b/test/core/surface/byte_buffer_reader_test.cc index 0ac4018a9ee..1f3a83efe64 100644 --- a/test/core/surface/byte_buffer_reader_test.cc +++ b/test/core/surface/byte_buffer_reader_test.cc @@ -134,7 +134,6 @@ static void read_compressed_slice(grpc_compression_algorithm algorithm, { ExecCtx _local_exec_ctx; GPR_ASSERT(grpc_msg_compress(algorithm, &sliceb_in, &sliceb_out)); - grpc_exec_ctx_finish(); } buffer = grpc_raw_compressed_byte_buffer_create(sliceb_out.slices, diff --git a/test/core/surface/channel_create_test.cc b/test/core/surface/channel_create_test.cc index 516a55275a1..ece06e4968b 100644 --- a/test/core/surface/channel_create_test.cc +++ b/test/core/surface/channel_create_test.cc @@ -39,7 +39,6 @@ void test_unknown_scheme_target(void) { grpc_channel_element* elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); - grpc_exec_ctx_finish(); grpc_channel_destroy(chan); } diff --git a/test/core/surface/completion_queue_test.cc b/test/core/surface/completion_queue_test.cc index f014738f4cb..39aedeba026 100644 --- a/test/core/surface/completion_queue_test.cc +++ b/test/core/surface/completion_queue_test.cc @@ -151,7 +151,6 @@ static void test_cq_end_op(void) { GPR_ASSERT(ev.success); shutdown_and_destroy(cc); - grpc_exec_ctx_finish(); } } @@ -193,7 +192,6 @@ static void test_cq_tls_cache_full(void) { GPR_ASSERT(ev.type == GRPC_QUEUE_TIMEOUT); shutdown_and_destroy(cc); - grpc_exec_ctx_finish(); } } @@ -221,7 +219,6 @@ static void test_cq_tls_cache_empty(void) { GPR_ASSERT( grpc_completion_queue_thread_local_cache_flush(cc, &res_tag, &ok) == 0); shutdown_and_destroy(cc); - grpc_exec_ctx_finish(); } } @@ -322,7 +319,6 @@ static void test_pluck(void) { } shutdown_and_destroy(cc); - grpc_exec_ctx_finish(); } } diff --git a/test/core/surface/completion_queue_threading_test.cc b/test/core/surface/completion_queue_threading_test.cc index 43e90029bca..6625e7e09f1 100644 --- a/test/core/surface/completion_queue_threading_test.cc +++ b/test/core/surface/completion_queue_threading_test.cc @@ -116,7 +116,6 @@ static void test_too_many_plucks(void) { } shutdown_and_destroy(cc); - grpc_exec_ctx_finish(); } #define TEST_THREAD_EVENTS 10000 @@ -165,12 +164,10 @@ static void producer_thread(void* arg) { static_cast( gpr_malloc(sizeof(grpc_cq_completion)))); opt->events_triggered++; - grpc_exec_ctx_finish(); } gpr_log(GPR_INFO, "producer %d phase 2 done", opt->id); gpr_event_set(&opt->on_finished, (void*)(intptr_t)1); - grpc_exec_ctx_finish(); } static void consumer_thread(void* arg) { diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index 62fb58dcbc5..b3999b481f5 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -134,7 +134,7 @@ void bad_server_thread(void* vargs) { gpr_mu_lock(args->mu); while (gpr_atm_acq_load(&args->stop) == 0) { - grpc_millis deadline = grpc_exec_ctx_now() + 100; + grpc_millis deadline = ExecCtx::Get()->Now() + 100; grpc_pollset_worker* worker = NULL; if (!GRPC_LOG_IF_ERROR( @@ -143,15 +143,13 @@ void bad_server_thread(void* vargs) { gpr_atm_rel_store(&args->stop, 1); } gpr_mu_unlock(args->mu); - grpc_exec_ctx_finish(); + gpr_mu_lock(args->mu); } gpr_mu_unlock(args->mu); grpc_tcp_server_unref(s); - grpc_exec_ctx_finish(); - gpr_free(args->addr); } @@ -228,7 +226,6 @@ int run_concurrent_connectivity_test() { grpc_pollset_shutdown(args.pollset, GRPC_CLOSURE_CREATE(done_pollset_shutdown, args.pollset, grpc_schedule_on_exec_ctx)); - grpc_exec_ctx_finish(); grpc_shutdown(); return 0; diff --git a/test/core/surface/lame_client_test.cc b/test/core/surface/lame_client_test.cc index 7104d2e30ac..dd14a035771 100644 --- a/test/core/surface/lame_client_test.cc +++ b/test/core/surface/lame_client_test.cc @@ -54,13 +54,11 @@ void test_transport_op(grpc_channel* channel) { op->connectivity_state = &state; elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); elem->filter->start_transport_op(elem, op); - grpc_exec_ctx_finish(); GRPC_CLOSURE_INIT(&transport_op_cb, do_nothing, NULL, grpc_schedule_on_exec_ctx); op = grpc_make_transport_op(&transport_op_cb); elem->filter->start_transport_op(elem, op); - grpc_exec_ctx_finish(); } int main(int argc, char** argv) { diff --git a/test/core/surface/num_external_connectivity_watchers_test.cc b/test/core/surface/num_external_connectivity_watchers_test.cc index e7cde7e39b9..bf51dac6ddb 100644 --- a/test/core/surface/num_external_connectivity_watchers_test.cc +++ b/test/core/surface/num_external_connectivity_watchers_test.cc @@ -180,7 +180,6 @@ static grpc_channel* secure_test_create_channel(const char* addr) { { ExecCtx _local_exec_ctx; grpc_channel_args_destroy(new_client_args); - grpc_exec_ctx_finish(); } grpc_channel_credentials_release(ssl_creds); return channel; diff --git a/test/core/surface/secure_channel_create_test.cc b/test/core/surface/secure_channel_create_test.cc index 9a4ac1f0bd0..dd9f907652a 100644 --- a/test/core/surface/secure_channel_create_test.cc +++ b/test/core/surface/secure_channel_create_test.cc @@ -40,7 +40,6 @@ void test_unknown_scheme_target(void) { ExecCtx _local_exec_ctx; GRPC_CHANNEL_INTERNAL_UNREF(chan, "test"); grpc_channel_credentials_unref(creds); - grpc_exec_ctx_finish(); } void test_security_connector_already_in_arg(void) { @@ -57,7 +56,6 @@ void test_security_connector_already_in_arg(void) { GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); ExecCtx _local_exec_ctx; GRPC_CHANNEL_INTERNAL_UNREF(chan, "test"); - grpc_exec_ctx_finish(); } void test_null_creds(void) { @@ -67,7 +65,6 @@ void test_null_creds(void) { GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); ExecCtx _local_exec_ctx; GRPC_CHANNEL_INTERNAL_UNREF(chan, "test"); - grpc_exec_ctx_finish(); } int main(int argc, char** argv) { diff --git a/test/core/surface/sequential_connectivity_test.cc b/test/core/surface/sequential_connectivity_test.cc index f88124e4ae7..aae418cedbe 100644 --- a/test/core/surface/sequential_connectivity_test.cc +++ b/test/core/surface/sequential_connectivity_test.cc @@ -158,7 +158,6 @@ static grpc_channel* secure_test_create_channel(const char* addr) { { ExecCtx _local_exec_ctx; grpc_channel_args_destroy(new_client_args); - grpc_exec_ctx_finish(); } grpc_channel_credentials_release(ssl_creds); return channel; diff --git a/test/core/transport/bdp_estimator_test.cc b/test/core/transport/bdp_estimator_test.cc index ca29b826168..4d41ece875f 100644 --- a/test/core/transport/bdp_estimator_test.cc +++ b/test/core/transport/bdp_estimator_test.cc @@ -66,9 +66,8 @@ void AddSamples(BdpEstimator* estimator, int64_t* samples, size_t n) { } gpr_sleep_until(gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_millis(1, GPR_TIMESPAN))); - grpc_exec_ctx_invalidate_now(); + ExecCtx::Get()->InvalidateNow(); estimator->CompletePing(); - grpc_exec_ctx_finish(); } void AddSample(BdpEstimator* estimator, int64_t sample) { diff --git a/test/core/transport/byte_stream_test.cc b/test/core/transport/byte_stream_test.cc index af6abaeeedb..12a933f3327 100644 --- a/test/core/transport/byte_stream_test.cc +++ b/test/core/transport/byte_stream_test.cc @@ -66,7 +66,6 @@ static void test_slice_buffer_stream_basic(void) { // Clean up. grpc_byte_stream_destroy(&stream.base); grpc_slice_buffer_destroy_internal(&buffer); - grpc_exec_ctx_finish(); } static void test_slice_buffer_stream_shutdown(void) { @@ -109,7 +108,6 @@ static void test_slice_buffer_stream_shutdown(void) { // Clean up. grpc_byte_stream_destroy(&stream.base); grpc_slice_buffer_destroy_internal(&buffer); - grpc_exec_ctx_finish(); } // @@ -153,7 +151,6 @@ static void test_caching_byte_stream_basic(void) { grpc_byte_stream_destroy(&stream.base); grpc_byte_stream_cache_destroy(&cache); grpc_slice_buffer_destroy_internal(&buffer); - grpc_exec_ctx_finish(); } static void test_caching_byte_stream_reset(void) { @@ -200,7 +197,6 @@ static void test_caching_byte_stream_reset(void) { grpc_byte_stream_destroy(&stream.base); grpc_byte_stream_cache_destroy(&cache); grpc_slice_buffer_destroy_internal(&buffer); - grpc_exec_ctx_finish(); } static void test_caching_byte_stream_shared_cache(void) { @@ -254,7 +250,6 @@ static void test_caching_byte_stream_shared_cache(void) { grpc_byte_stream_destroy(&stream2.base); grpc_byte_stream_cache_destroy(&cache); grpc_slice_buffer_destroy_internal(&buffer); - grpc_exec_ctx_finish(); } int main(int argc, char** argv) { diff --git a/test/core/transport/chttp2/bin_decoder_test.cc b/test/core/transport/chttp2/bin_decoder_test.cc index 663ccf189b4..3d463c40a53 100644 --- a/test/core/transport/chttp2/bin_decoder_test.cc +++ b/test/core/transport/chttp2/bin_decoder_test.cc @@ -129,7 +129,5 @@ int main(int argc, char** argv) { EXPECT_SLICE_EQ("", base64_decode_with_length("Zm:v", 3)); EXPECT_SLICE_EQ("", base64_decode_with_length("Zm=v", 3)); - grpc_exec_ctx_finish(); - return all_ok ? 0 : 1; } diff --git a/test/core/transport/chttp2/hpack_encoder_test.cc b/test/core/transport/chttp2/hpack_encoder_test.cc index e1bfcc5b37f..fe4538339e9 100644 --- a/test/core/transport/chttp2/hpack_encoder_test.cc +++ b/test/core/transport/chttp2/hpack_encoder_test.cc @@ -261,7 +261,6 @@ static void run_test(void (*test)(), const char* name) { grpc_chttp2_hpack_compressor_init(&g_compressor); test(); grpc_chttp2_hpack_compressor_destroy(&g_compressor); - grpc_exec_ctx_finish(); } int main(int argc, char** argv) { diff --git a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc index d2199ca7063..feb27fc0ff6 100644 --- a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc +++ b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc @@ -43,7 +43,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { GRPC_ERROR_UNREF(grpc_chttp2_hpack_parser_parse( &parser, grpc_slice_from_static_buffer(data, size))); grpc_chttp2_hpack_parser_destroy(&parser); - grpc_exec_ctx_finish(); + grpc_shutdown(); return 0; } diff --git a/test/core/transport/chttp2/hpack_parser_test.cc b/test/core/transport/chttp2/hpack_parser_test.cc index 0a3cbf84ad8..69a13108f94 100644 --- a/test/core/transport/chttp2/hpack_parser_test.cc +++ b/test/core/transport/chttp2/hpack_parser_test.cc @@ -65,7 +65,6 @@ static void test_vector(grpc_chttp2_hpack_parser* parser, ExecCtx _local_exec_ctx; GPR_ASSERT(grpc_chttp2_hpack_parser_parse(parser, slices[i]) == GRPC_ERROR_NONE); - grpc_exec_ctx_finish(); } for (i = 0; i < nslices; i++) { @@ -204,8 +203,6 @@ static void test_vectors(grpc_slice_split_mode mode) { "set-cookie", "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1", NULL); grpc_chttp2_hpack_parser_destroy(&parser); - - grpc_exec_ctx_finish(); } int main(int argc, char** argv) { diff --git a/test/core/transport/chttp2/hpack_table_test.cc b/test/core/transport/chttp2/hpack_table_test.cc index 68682f19919..fd5604d8576 100644 --- a/test/core/transport/chttp2/hpack_table_test.cc +++ b/test/core/transport/chttp2/hpack_table_test.cc @@ -113,7 +113,6 @@ static void test_static_lookup(void) { assert_index(&tbl, 61, "www-authenticate", ""); grpc_chttp2_hptbl_destroy(&tbl); - grpc_exec_ctx_finish(); } static void test_many_additions(void) { @@ -148,7 +147,6 @@ static void test_many_additions(void) { } grpc_chttp2_hptbl_destroy(&tbl); - grpc_exec_ctx_finish(); } static grpc_chttp2_hptbl_find_result find_simple(grpc_chttp2_hptbl* tbl, @@ -159,7 +157,7 @@ static grpc_chttp2_hptbl_find_result find_simple(grpc_chttp2_hptbl* tbl, grpc_slice_from_copied_string(key), grpc_slice_from_copied_string(value)); grpc_chttp2_hptbl_find_result r = grpc_chttp2_hptbl_find(tbl, md); GRPC_MDELEM_UNREF(md); - grpc_exec_ctx_finish(); + return r; } @@ -266,7 +264,6 @@ static void test_find(void) { GPR_ASSERT(r.has_value == 0); grpc_chttp2_hptbl_destroy(&tbl); - grpc_exec_ctx_finish(); } int main(int argc, char** argv) { diff --git a/test/core/transport/connectivity_state_test.cc b/test/core/transport/connectivity_state_test.cc index 92bf1ba9033..8ddd8bb2dfe 100644 --- a/test/core/transport/connectivity_state_test.cc +++ b/test/core/transport/connectivity_state_test.cc @@ -66,7 +66,6 @@ static void test_check(void) { GPR_ASSERT(grpc_connectivity_state_check(&tracker) == GRPC_CHANNEL_IDLE); GPR_ASSERT(error == GRPC_ERROR_NONE); grpc_connectivity_state_destroy(&tracker); - grpc_exec_ctx_finish(); } static void test_subscribe_then_unsubscribe(void) { @@ -80,16 +79,15 @@ static void test_subscribe_then_unsubscribe(void) { grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx"); GPR_ASSERT(grpc_connectivity_state_notify_on_state_change(&tracker, &state, closure)); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); GPR_ASSERT(state == GRPC_CHANNEL_IDLE); GPR_ASSERT(g_counter == 0); grpc_connectivity_state_notify_on_state_change(&tracker, NULL, closure); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); GPR_ASSERT(state == GRPC_CHANNEL_IDLE); GPR_ASSERT(g_counter == 1); grpc_connectivity_state_destroy(&tracker); - grpc_exec_ctx_finish(); } static void test_subscribe_then_destroy(void) { @@ -103,11 +101,11 @@ static void test_subscribe_then_destroy(void) { grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx"); GPR_ASSERT(grpc_connectivity_state_notify_on_state_change(&tracker, &state, closure)); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); GPR_ASSERT(state == GRPC_CHANNEL_IDLE); GPR_ASSERT(g_counter == 0); grpc_connectivity_state_destroy(&tracker); - grpc_exec_ctx_finish(); + GPR_ASSERT(state == GRPC_CHANNEL_SHUTDOWN); GPR_ASSERT(g_counter == 1); } @@ -123,11 +121,11 @@ static void test_subscribe_with_failure_then_destroy(void) { grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_SHUTDOWN, "xxx"); GPR_ASSERT(0 == grpc_connectivity_state_notify_on_state_change( &tracker, &state, closure)); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); GPR_ASSERT(state == GRPC_CHANNEL_SHUTDOWN); GPR_ASSERT(g_counter == 0); grpc_connectivity_state_destroy(&tracker); - grpc_exec_ctx_finish(); + GPR_ASSERT(state == GRPC_CHANNEL_SHUTDOWN); GPR_ASSERT(g_counter == 1); } diff --git a/test/core/transport/metadata_test.cc b/test/core/transport/metadata_test.cc index 4bc56729581..3d7034e4cea 100644 --- a/test/core/transport/metadata_test.cc +++ b/test/core/transport/metadata_test.cc @@ -80,7 +80,7 @@ static void test_create_metadata(bool intern_keys, bool intern_values) { GRPC_MDELEM_UNREF(m1); GRPC_MDELEM_UNREF(m2); GRPC_MDELEM_UNREF(m3); - grpc_exec_ctx_finish(); + grpc_shutdown(); } @@ -103,7 +103,7 @@ static void test_create_many_ephemeral_metadata(bool intern_keys, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_copied_string(buffer), intern_values))); } - grpc_exec_ctx_finish(); + grpc_shutdown(); } @@ -138,7 +138,7 @@ static void test_create_many_persistant_metadata(void) { for (i = 0; i < MANY; i++) { GRPC_MDELEM_UNREF(created[i]); } - grpc_exec_ctx_finish(); + grpc_shutdown(); gpr_free(created); @@ -169,7 +169,7 @@ static void test_spin_creating_the_same_thing(bool intern_keys, GPR_ASSERT(a.payload == b.payload); GPR_ASSERT(a.payload == c.payload); } - grpc_exec_ctx_finish(); + grpc_shutdown(); } @@ -209,7 +209,7 @@ static void test_identity_laws(bool intern_keys, bool intern_values) { GRPC_MDELEM_UNREF(a); GRPC_MDELEM_UNREF(b); GRPC_MDELEM_UNREF(c); - grpc_exec_ctx_finish(); + grpc_shutdown(); } @@ -259,7 +259,6 @@ static void test_things_stick_around(void) { } } - grpc_exec_ctx_finish(); grpc_shutdown(); gpr_free(strs); gpr_free(shuf); @@ -284,7 +283,7 @@ static void test_user_data_works(void) { grpc_mdelem_set_user_data(md, gpr_free, ud2); GPR_ASSERT(grpc_mdelem_get_user_data(md, gpr_free) == ud1); GRPC_MDELEM_UNREF(md); - grpc_exec_ctx_finish(); + grpc_shutdown(); } @@ -340,7 +339,6 @@ static void test_mdelem_sizes_in_hpack(bool intern_key, bool intern_value) { intern_value); } - grpc_exec_ctx_finish(); grpc_shutdown(); } @@ -366,7 +364,6 @@ static void test_copied_static_metadata(bool dup_key, bool dup_value) { GRPC_MDELEM_UNREF(q); } - grpc_exec_ctx_finish(); grpc_shutdown(); } diff --git a/test/core/transport/status_conversion_test.cc b/test/core/transport/status_conversion_test.cc index 44e961310a4..16ecd076a30 100644 --- a/test/core/transport/status_conversion_test.cc +++ b/test/core/transport/status_conversion_test.cc @@ -26,7 +26,7 @@ do { \ ExecCtx _local_exec_ctx; \ GPR_ASSERT(grpc_http2_error_to_grpc_status(a, deadline) == (b)); \ - grpc_exec_ctx_finish(); \ + \ } while (0) #define GRPC_STATUS_TO_HTTP2_STATUS(a, b) \ GPR_ASSERT(grpc_status_to_http2_status(a) == (b)) diff --git a/test/core/util/port_server_client.cc b/test/core/util/port_server_client.cc index 2cabd560ee2..4e68ee3744d 100644 --- a/test/core/util/port_server_client.cc +++ b/test/core/util/port_server_client.cc @@ -85,19 +85,19 @@ void grpc_free_port_using_server(int port) { grpc_resource_quota* resource_quota = grpc_resource_quota_create("port_server_client/free"); grpc_httpcli_get(&context, &pr.pops, resource_quota, &req, - grpc_exec_ctx_now() + 30 * GPR_MS_PER_SEC, + ExecCtx::Get()->Now() + 30 * GPR_MS_PER_SEC, GRPC_CLOSURE_CREATE(freed_port_from_server, &pr, grpc_schedule_on_exec_ctx), &rsp); grpc_resource_quota_unref_internal(resource_quota); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(pr.mu); while (!pr.done) { grpc_pollset_worker* worker = NULL; if (!GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&pr.pops), &worker, - grpc_exec_ctx_now() + GPR_MS_PER_SEC))) { + ExecCtx::Get()->Now() + GPR_MS_PER_SEC))) { pr.done = 1; } } @@ -106,7 +106,7 @@ void grpc_free_port_using_server(int port) { grpc_httpcli_context_destroy(&context); grpc_pollset_shutdown(grpc_polling_entity_pollset(&pr.pops), shutdown_closure); - grpc_exec_ctx_finish(); + gpr_free(path); grpc_http_response_destroy(&rsp); @@ -167,7 +167,7 @@ static void got_port_from_server(void* arg, grpc_error* error) { grpc_resource_quota* resource_quota = grpc_resource_quota_create("port_server_client/pick_retry"); grpc_httpcli_get(pr->ctx, &pr->pops, resource_quota, &req, - grpc_exec_ctx_now() + 30 * GPR_MS_PER_SEC, + ExecCtx::Get()->Now() + 30 * GPR_MS_PER_SEC, GRPC_CLOSURE_CREATE(got_port_from_server, pr, grpc_schedule_on_exec_ctx), &pr->response); @@ -217,18 +217,18 @@ int grpc_pick_port_using_server(void) { grpc_resource_quota_create("port_server_client/pick"); grpc_httpcli_get( &context, &pr.pops, resource_quota, &req, - grpc_exec_ctx_now() + 30 * GPR_MS_PER_SEC, + ExecCtx::Get()->Now() + 30 * GPR_MS_PER_SEC, GRPC_CLOSURE_CREATE(got_port_from_server, &pr, grpc_schedule_on_exec_ctx), &pr.response); grpc_resource_quota_unref_internal(resource_quota); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(pr.mu); while (pr.port == -1) { grpc_pollset_worker* worker = NULL; if (!GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&pr.pops), &worker, - grpc_exec_ctx_now() + GPR_MS_PER_SEC))) { + ExecCtx::Get()->Now() + GPR_MS_PER_SEC))) { pr.port = 0; } } @@ -238,7 +238,7 @@ int grpc_pick_port_using_server(void) { grpc_httpcli_context_destroy(&context); grpc_pollset_shutdown(grpc_polling_entity_pollset(&pr.pops), shutdown_closure); - grpc_exec_ctx_finish(); + grpc_shutdown(); return pr.port; diff --git a/test/core/util/test_tcp_server.cc b/test/core/util/test_tcp_server.cc index 79178a7cbdf..7e17ff1f532 100644 --- a/test/core/util/test_tcp_server.cc +++ b/test/core/util/test_tcp_server.cc @@ -72,8 +72,6 @@ void test_tcp_server_start(test_tcp_server* server, int port) { grpc_tcp_server_start(server->tcp_server, &server->pollset, 1, server->on_connect, server->cb_data); gpr_log(GPR_INFO, "test tcp server listening on 0.0.0.0:%d", port); - - grpc_exec_ctx_finish(); } void test_tcp_server_poll(test_tcp_server* server, int seconds) { @@ -85,7 +83,6 @@ void test_tcp_server_poll(test_tcp_server* server, int seconds) { GRPC_LOG_IF_ERROR("pollset_work", grpc_pollset_work(server->pollset, &worker, deadline)); gpr_mu_unlock(server->mu); - grpc_exec_ctx_finish(); } static void do_nothing(void* arg, grpc_error* error) {} @@ -109,7 +106,7 @@ void test_tcp_server_destroy(test_tcp_server* server) { grpc_pollset_shutdown(server->pollset, GRPC_CLOSURE_CREATE(finish_pollset, server->pollset, grpc_schedule_on_exec_ctx)); - grpc_exec_ctx_finish(); + gpr_free(server->pollset); grpc_shutdown(); } diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index df2ed0ecd00..4cf39eab482 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -133,7 +133,6 @@ class ClientLbEnd2endTest : public ::testing::Test { fake_result); grpc_channel_args_destroy(fake_result); grpc_lb_addresses_destroy(addresses); - grpc_exec_ctx_finish(); } void ResetStub(const grpc::string& lb_policy_name = "") { diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index 62d7094d4ca..962d5a7e688 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -470,7 +470,6 @@ class GrpclbEnd2endTest : public ::testing::Test { grpc_fake_resolver_response_generator_set_response(response_generator_, &fake_result); grpc_lb_addresses_destroy(addresses); - grpc_exec_ctx_finish(); } const std::vector GetBackendPorts(const size_t start_index = 0) const { diff --git a/test/cpp/grpclb/grpclb_test.cc b/test/cpp/grpclb/grpclb_test.cc index c2c6c0b3370..6f6dd3c4df7 100644 --- a/test/cpp/grpclb/grpclb_test.cc +++ b/test/cpp/grpclb/grpclb_test.cc @@ -603,7 +603,6 @@ static void setup_client(const server_fixture* lb_server, grpc_channel_credentials_unref(fake_creds); grpc_channel_args_destroy(args); grpc_fake_resolver_response_generator_unref(response_generator); - grpc_exec_ctx_finish(); } static void teardown_client(client_fixture* cf) { diff --git a/test/cpp/microbenchmarks/bm_call_create.cc b/test/cpp/microbenchmarks/bm_call_create.cc index eac1c753c7a..47b984bc280 100644 --- a/test/cpp/microbenchmarks/bm_call_create.cc +++ b/test/cpp/microbenchmarks/bm_call_create.cc @@ -534,7 +534,7 @@ static void BM_IsolatedFilter(benchmark::State& state) { ? &dummy_transport::dummy_transport : nullptr, "CHANNEL", channel_stack))); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); grpc_call_stack* call_stack = static_cast(gpr_zalloc(channel_stack->call_stack_size)); grpc_millis deadline = GRPC_MILLIS_INF_FUTURE; @@ -558,7 +558,7 @@ static void BM_IsolatedFilter(benchmark::State& state) { typename TestOp::Op op(&test_op_data, call_stack); grpc_call_stack_destroy(call_stack, &final_info, NULL); op.Finish(); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); // recreate arena every 64k iterations to avoid oom if (0 == (state.iterations() & 0xffff)) { gpr_arena_destroy(call_args.arena); @@ -567,7 +567,7 @@ static void BM_IsolatedFilter(benchmark::State& state) { } gpr_arena_destroy(call_args.arena); grpc_channel_stack_destroy(channel_stack); - grpc_exec_ctx_finish(); + gpr_free(channel_stack); gpr_free(call_stack); @@ -693,7 +693,6 @@ class IsolatedCallFixture : public TrackCounters { { ExecCtx _local_exec_ctx; channel_ = grpc_channel_create_with_builder(builder, GRPC_CLIENT_CHANNEL); - grpc_exec_ctx_finish(); } cq_ = grpc_completion_queue_create_for_next(NULL); } diff --git a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc index d6fb3cd3695..f822f095a78 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc @@ -55,9 +55,9 @@ static void BM_HpackEncoderInitDestroy(benchmark::State& state) { while (state.KeepRunning()) { grpc_chttp2_hpack_compressor_init(&c); grpc_chttp2_hpack_compressor_destroy(&c); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_HpackEncoderInitDestroy); @@ -65,7 +65,7 @@ BENCHMARK(BM_HpackEncoderInitDestroy); static void BM_HpackEncoderEncodeDeadline(benchmark::State& state) { TrackCounters track_counters; ExecCtx _local_exec_ctx; - grpc_millis saved_now = grpc_exec_ctx_now(); + grpc_millis saved_now = ExecCtx::Get()->Now(); grpc_metadata_batch b; grpc_metadata_batch_init(&b); @@ -87,12 +87,11 @@ static void BM_HpackEncoderEncodeDeadline(benchmark::State& state) { }; grpc_chttp2_encode_header(&c, NULL, 0, &b, &hopt, &outbuf); grpc_slice_buffer_reset_and_unref_internal(&outbuf); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } grpc_metadata_batch_destroy(&b); grpc_chttp2_hpack_compressor_destroy(&c); grpc_slice_buffer_destroy_internal(&outbuf); - grpc_exec_ctx_finish(); std::ostringstream label; label << "framing_bytes/iter:" @@ -145,12 +144,11 @@ static void BM_HpackEncoderEncodeHeader(benchmark::State& state) { } } grpc_slice_buffer_reset_and_unref_internal(&outbuf); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } grpc_metadata_batch_destroy(&b); grpc_chttp2_hpack_compressor_destroy(&c); grpc_slice_buffer_destroy_internal(&outbuf); - grpc_exec_ctx_finish(); std::ostringstream label; label << "framing_bytes/iter:" @@ -432,9 +430,9 @@ static void BM_HpackParserInitDestroy(benchmark::State& state) { while (state.KeepRunning()) { grpc_chttp2_hpack_parser_init(&p); grpc_chttp2_hpack_parser_destroy(&p); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_HpackParserInitDestroy); @@ -460,12 +458,12 @@ static void BM_HpackParserParseHeader(benchmark::State& state) { for (auto slice : benchmark_slices) { GPR_ASSERT(GRPC_ERROR_NONE == grpc_chttp2_hpack_parser_parse(&p, slice)); } - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } for (auto slice : init_slices) grpc_slice_unref(slice); for (auto slice : benchmark_slices) grpc_slice_unref(slice); grpc_chttp2_hpack_parser_destroy(&p); - grpc_exec_ctx_finish(); + track_counters.Finish(state); } diff --git a/test/cpp/microbenchmarks/bm_chttp2_transport.cc b/test/cpp/microbenchmarks/bm_chttp2_transport.cc index 3a3547141df..f6e4c2bcc43 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_transport.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_transport.cc @@ -136,12 +136,9 @@ class Fixture { FlushExecCtx(); } - void FlushExecCtx() { grpc_exec_ctx_flush(); } + void FlushExecCtx() { ExecCtx::Get()->Flush(); } - ~Fixture() { - grpc_transport_destroy(t_); - grpc_exec_ctx_finish(); - } + ~Fixture() { grpc_transport_destroy(t_); } grpc_chttp2_transport* chttp2_transport() { return reinterpret_cast(t_); @@ -152,7 +149,6 @@ class Fixture { private: DummyEndpoint* ep_; - ExecCtx _local_exec_ctx; grpc_transport* t_; }; @@ -261,6 +257,7 @@ class Stream { static void BM_StreamCreateDestroy(benchmark::State& state) { TrackCounters track_counters; + ExecCtx _local_exec_ctx; Fixture f(grpc::ChannelArguments(), true); Stream s(&f); grpc_transport_stream_op_batch op; @@ -306,6 +303,7 @@ class RepresentativeClientInitialMetadata { template static void BM_StreamCreateSendInitialMetadataDestroy(benchmark::State& state) { TrackCounters track_counters; + ExecCtx _local_exec_ctx; Fixture f(grpc::ChannelArguments(), true); Stream s(&f); grpc_transport_stream_op_batch op; @@ -356,6 +354,7 @@ BENCHMARK_TEMPLATE(BM_StreamCreateSendInitialMetadataDestroy, static void BM_TransportEmptyOp(benchmark::State& state) { TrackCounters track_counters; + ExecCtx _local_exec_ctx; Fixture f(grpc::ChannelArguments(), true); Stream s(&f); s.Init(state); @@ -388,6 +387,7 @@ std::vector> done_events; static void BM_TransportStreamSend(benchmark::State& state) { TrackCounters track_counters; + ExecCtx _local_exec_ctx; Fixture f(grpc::ChannelArguments(), true); auto s = std::unique_ptr(new Stream(&f)); s->Init(state); @@ -517,6 +517,7 @@ static grpc_slice CreateIncomingDataSlice(size_t length, size_t frame_size) { static void BM_TransportStreamRecv(benchmark::State& state) { TrackCounters track_counters; + ExecCtx _local_exec_ctx; Fixture f(grpc::ChannelArguments(), true); Stream s(&f); s.Init(state); diff --git a/test/cpp/microbenchmarks/bm_closure.cc b/test/cpp/microbenchmarks/bm_closure.cc index 0e25c3d235d..ce8a0545153 100644 --- a/test/cpp/microbenchmarks/bm_closure.cc +++ b/test/cpp/microbenchmarks/bm_closure.cc @@ -35,7 +35,6 @@ static void BM_NoOpExecCtx(benchmark::State& state) { TrackCounters track_counters; while (state.KeepRunning()) { ExecCtx _local_exec_ctx; - grpc_exec_ctx_finish(); } track_counters.Finish(state); } @@ -45,9 +44,9 @@ static void BM_WellFlushed(benchmark::State& state) { TrackCounters track_counters; ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_WellFlushed); @@ -75,7 +74,7 @@ static void BM_ClosureInitAgainstCombiner(benchmark::State& state) { &c, DoNothing, NULL, grpc_combiner_scheduler(combiner))); } GRPC_COMBINER_UNREF(combiner, "finished"); - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_ClosureInitAgainstCombiner); @@ -87,9 +86,9 @@ static void BM_ClosureRunOnExecCtx(benchmark::State& state) { ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_RUN(&c, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_ClosureRunOnExecCtx); @@ -102,7 +101,7 @@ static void BM_ClosureCreateAndRun(benchmark::State& state) { GRPC_CLOSURE_CREATE(DoNothing, NULL, grpc_schedule_on_exec_ctx), GRPC_ERROR_NONE); } - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_ClosureCreateAndRun); @@ -116,7 +115,7 @@ static void BM_ClosureInitAndRun(benchmark::State& state) { GRPC_CLOSURE_INIT(&c, DoNothing, NULL, grpc_schedule_on_exec_ctx), GRPC_ERROR_NONE); } - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_ClosureInitAndRun); @@ -128,9 +127,9 @@ static void BM_ClosureSchedOnExecCtx(benchmark::State& state) { ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_ClosureSchedOnExecCtx); @@ -145,9 +144,9 @@ static void BM_ClosureSched2OnExecCtx(benchmark::State& state) { while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_ClosureSched2OnExecCtx); @@ -165,9 +164,9 @@ static void BM_ClosureSched3OnExecCtx(benchmark::State& state) { GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_ClosureSched3OnExecCtx); @@ -183,7 +182,7 @@ static void BM_AcquireMutex(benchmark::State& state) { DoNothing(NULL, GRPC_ERROR_NONE); gpr_mu_unlock(&mu); } - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_AcquireMutex); @@ -202,7 +201,7 @@ static void BM_TryAcquireMutex(benchmark::State& state) { abort(); } } - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_TryAcquireMutex); @@ -217,7 +216,7 @@ static void BM_AcquireSpinlock(benchmark::State& state) { DoNothing(NULL, GRPC_ERROR_NONE); gpr_spinlock_unlock(&mu); } - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_AcquireSpinlock); @@ -235,7 +234,7 @@ static void BM_TryAcquireSpinlock(benchmark::State& state) { abort(); } } - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_TryAcquireSpinlock); @@ -248,10 +247,10 @@ static void BM_ClosureSchedOnCombiner(benchmark::State& state) { ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } GRPC_COMBINER_UNREF(combiner, "finished"); - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_ClosureSchedOnCombiner); @@ -267,10 +266,10 @@ static void BM_ClosureSched2OnCombiner(benchmark::State& state) { while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } GRPC_COMBINER_UNREF(combiner, "finished"); - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_ClosureSched2OnCombiner); @@ -289,10 +288,10 @@ static void BM_ClosureSched3OnCombiner(benchmark::State& state) { GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } GRPC_COMBINER_UNREF(combiner, "finished"); - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_ClosureSched3OnCombiner); @@ -309,11 +308,11 @@ static void BM_ClosureSched2OnTwoCombiners(benchmark::State& state) { while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } GRPC_COMBINER_UNREF(combiner1, "finished"); GRPC_COMBINER_UNREF(combiner2, "finished"); - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_ClosureSched2OnTwoCombiners); @@ -336,11 +335,11 @@ static void BM_ClosureSched4OnTwoCombiners(benchmark::State& state) { GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c4, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } GRPC_COMBINER_UNREF(combiner1, "finished"); GRPC_COMBINER_UNREF(combiner2, "finished"); - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_ClosureSched4OnTwoCombiners); @@ -379,7 +378,7 @@ static void BM_ClosureReschedOnExecCtx(benchmark::State& state) { ExecCtx _local_exec_ctx; Rescheduler r(state, grpc_schedule_on_exec_ctx); r.ScheduleFirst(); - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_ClosureReschedOnExecCtx); @@ -390,9 +389,9 @@ static void BM_ClosureReschedOnCombiner(benchmark::State& state) { grpc_combiner* combiner = grpc_combiner_create(); Rescheduler r(state, grpc_combiner_scheduler(combiner)); r.ScheduleFirst(); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); GRPC_COMBINER_UNREF(combiner, "finished"); - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_ClosureReschedOnCombiner); @@ -403,9 +402,9 @@ static void BM_ClosureReschedOnCombinerFinally(benchmark::State& state) { grpc_combiner* combiner = grpc_combiner_create(); Rescheduler r(state, grpc_combiner_finally_scheduler(combiner)); r.ScheduleFirstAgainstDifferentScheduler(grpc_combiner_scheduler(combiner)); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); GRPC_COMBINER_UNREF(combiner, "finished"); - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_ClosureReschedOnCombinerFinally); diff --git a/test/cpp/microbenchmarks/bm_cq.cc b/test/cpp/microbenchmarks/bm_cq.cc index 6d36e61cff9..9fb603213ac 100644 --- a/test/cpp/microbenchmarks/bm_cq.cc +++ b/test/cpp/microbenchmarks/bm_cq.cc @@ -84,7 +84,7 @@ static void BM_Pass1Cpp(benchmark::State& state) { GPR_ASSERT(grpc_cq_begin_op(c_cq, &dummy_tag)); grpc_cq_end_op(c_cq, &dummy_tag, GRPC_ERROR_NONE, DoneWithCompletionOnStack, NULL, &completion); - grpc_exec_ctx_finish(); + void* tag; bool ok; cq.Next(&tag, &ok); @@ -104,7 +104,7 @@ static void BM_Pass1Core(benchmark::State& state) { GPR_ASSERT(grpc_cq_begin_op(cq, NULL)); grpc_cq_end_op(cq, NULL, GRPC_ERROR_NONE, DoneWithCompletionOnStack, NULL, &completion); - grpc_exec_ctx_finish(); + grpc_completion_queue_next(cq, deadline, NULL); } grpc_completion_queue_destroy(cq); @@ -123,7 +123,7 @@ static void BM_Pluck1Core(benchmark::State& state) { GPR_ASSERT(grpc_cq_begin_op(cq, NULL)); grpc_cq_end_op(cq, NULL, GRPC_ERROR_NONE, DoneWithCompletionOnStack, NULL, &completion); - grpc_exec_ctx_finish(); + grpc_completion_queue_pluck(cq, NULL, deadline, NULL); } grpc_completion_queue_destroy(cq); diff --git a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc index 41e616a6ef0..0cd9a2c3613 100644 --- a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc +++ b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc @@ -76,7 +76,7 @@ static grpc_error* pollset_work(grpc_pollset* ps, grpc_pollset_worker** worker, GPR_ASSERT(grpc_cq_begin_op(g_cq, g_tag)); grpc_cq_end_op(g_cq, g_tag, GRPC_ERROR_NONE, cq_done_cb, NULL, (grpc_cq_completion*)gpr_malloc(sizeof(grpc_cq_completion))); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(&ps->mu); return GRPC_ERROR_NONE; } diff --git a/test/cpp/microbenchmarks/bm_error.cc b/test/cpp/microbenchmarks/bm_error.cc index 3f85e351f56..8dc98ab9238 100644 --- a/test/cpp/microbenchmarks/bm_error.cc +++ b/test/cpp/microbenchmarks/bm_error.cc @@ -253,7 +253,7 @@ static void BM_ErrorGetStatus(benchmark::State& state) { grpc_error_get_status(fixture.error(), fixture.deadline(), &status, &slice, NULL); } - grpc_exec_ctx_finish(); + track_counters.Finish(state); } @@ -267,7 +267,7 @@ static void BM_ErrorGetStatusCode(benchmark::State& state) { grpc_error_get_status(fixture.error(), fixture.deadline(), &status, NULL, NULL); } - grpc_exec_ctx_finish(); + track_counters.Finish(state); } @@ -281,7 +281,7 @@ static void BM_ErrorHttpError(benchmark::State& state) { grpc_error_get_status(fixture.error(), fixture.deadline(), NULL, NULL, &error); } - grpc_exec_ctx_finish(); + track_counters.Finish(state); } diff --git a/test/cpp/microbenchmarks/bm_fullstack_trickle.cc b/test/cpp/microbenchmarks/bm_fullstack_trickle.cc index 74e99982ce8..191c93c58de 100644 --- a/test/cpp/microbenchmarks/bm_fullstack_trickle.cc +++ b/test/cpp/microbenchmarks/bm_fullstack_trickle.cc @@ -183,7 +183,7 @@ class TrickledCHTTP2 : public EndpointPairFixture { grpc_trickle_endpoint_trickle(endpoint_pair_.client); size_t server_backlog = grpc_trickle_endpoint_trickle(endpoint_pair_.server); - grpc_exec_ctx_finish(); + if (update_stats) { UpdateStats((grpc_chttp2_transport*)client_transport_, &client_stats_, client_backlog); diff --git a/test/cpp/microbenchmarks/bm_metadata.cc b/test/cpp/microbenchmarks/bm_metadata.cc index 5d89e0d3c6c..07fcf6af991 100644 --- a/test/cpp/microbenchmarks/bm_metadata.cc +++ b/test/cpp/microbenchmarks/bm_metadata.cc @@ -94,7 +94,7 @@ static void BM_MetadataFromNonInternedSlices(benchmark::State& state) { while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_MetadataFromNonInternedSlices); @@ -107,7 +107,7 @@ static void BM_MetadataFromInternedSlices(benchmark::State& state) { while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } - grpc_exec_ctx_finish(); + grpc_slice_unref(k); grpc_slice_unref(v); track_counters.Finish(state); @@ -125,7 +125,7 @@ static void BM_MetadataFromInternedSlicesAlreadyInIndex( GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } GRPC_MDELEM_UNREF(seed); - grpc_exec_ctx_finish(); + grpc_slice_unref(k); grpc_slice_unref(v); track_counters.Finish(state); @@ -140,7 +140,7 @@ static void BM_MetadataFromInternedKey(benchmark::State& state) { while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } - grpc_exec_ctx_finish(); + grpc_slice_unref(k); track_counters.Finish(state); } @@ -157,7 +157,7 @@ static void BM_MetadataFromNonInternedSlicesWithBackingStore( GRPC_MDELEM_UNREF(grpc_mdelem_create( k, v, reinterpret_cast(backing_store))); } - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_MetadataFromNonInternedSlicesWithBackingStore); @@ -173,7 +173,7 @@ static void BM_MetadataFromInternedSlicesWithBackingStore( GRPC_MDELEM_UNREF(grpc_mdelem_create( k, v, reinterpret_cast(backing_store))); } - grpc_exec_ctx_finish(); + grpc_slice_unref(k); grpc_slice_unref(v); track_counters.Finish(state); @@ -191,7 +191,7 @@ static void BM_MetadataFromInternedKeyWithBackingStore( GRPC_MDELEM_UNREF(grpc_mdelem_create( k, v, reinterpret_cast(backing_store))); } - grpc_exec_ctx_finish(); + grpc_slice_unref(k); track_counters.Finish(state); } @@ -205,7 +205,7 @@ static void BM_MetadataFromStaticMetadataStrings(benchmark::State& state) { while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } - grpc_exec_ctx_finish(); + grpc_slice_unref(k); track_counters.Finish(state); } @@ -220,7 +220,7 @@ static void BM_MetadataFromStaticMetadataStringsNotIndexed( while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } - grpc_exec_ctx_finish(); + grpc_slice_unref(k); track_counters.Finish(state); } @@ -237,7 +237,7 @@ static void BM_MetadataRefUnrefExternal(benchmark::State& state) { GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); } GRPC_MDELEM_UNREF(el); - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_MetadataRefUnrefExternal); @@ -256,7 +256,7 @@ static void BM_MetadataRefUnrefInterned(benchmark::State& state) { GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); } GRPC_MDELEM_UNREF(el); - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_MetadataRefUnrefInterned); @@ -270,7 +270,7 @@ static void BM_MetadataRefUnrefAllocated(benchmark::State& state) { GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); } GRPC_MDELEM_UNREF(el); - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_MetadataRefUnrefAllocated); @@ -283,7 +283,7 @@ static void BM_MetadataRefUnrefStatic(benchmark::State& state) { GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); } GRPC_MDELEM_UNREF(el); - grpc_exec_ctx_finish(); + track_counters.Finish(state); } BENCHMARK(BM_MetadataRefUnrefStatic); diff --git a/test/cpp/microbenchmarks/bm_pollset.cc b/test/cpp/microbenchmarks/bm_pollset.cc index 3da8e16788e..7ddca45eca2 100644 --- a/test/cpp/microbenchmarks/bm_pollset.cc +++ b/test/cpp/microbenchmarks/bm_pollset.cc @@ -60,9 +60,9 @@ static void BM_CreateDestroyPollset(benchmark::State& state) { gpr_mu_lock(mu); grpc_pollset_shutdown(ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } - grpc_exec_ctx_finish(); + gpr_free(ps); track_counters.Finish(state); } @@ -124,7 +124,7 @@ static void BM_PollEmptyPollset(benchmark::State& state) { grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - grpc_exec_ctx_finish(); + gpr_free(ps); track_counters.Finish(state); } @@ -143,7 +143,7 @@ static void BM_PollAddFd(benchmark::State& state) { grpc_fd* fd = grpc_fd_create(wakeup_fd.read_fd, "xxx"); while (state.KeepRunning()) { grpc_pollset_add_fd(ps, fd); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); } grpc_fd_orphan(fd, NULL, NULL, false /* already_closed */, "xxx"); grpc_closure shutdown_ps_closure; @@ -152,7 +152,7 @@ static void BM_PollAddFd(benchmark::State& state) { gpr_mu_lock(mu); grpc_pollset_shutdown(ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - grpc_exec_ctx_finish(); + gpr_free(ps); track_counters.Finish(state); } @@ -248,7 +248,7 @@ static void BM_SingleThreadPollOneFd(benchmark::State& state) { grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - grpc_exec_ctx_finish(); + grpc_wakeup_fd_destroy(&wakeup_fd); gpr_free(ps); track_counters.Finish(state); diff --git a/test/cpp/microbenchmarks/fullstack_fixtures.h b/test/cpp/microbenchmarks/fullstack_fixtures.h index 24b74b9d374..075064eca73 100644 --- a/test/cpp/microbenchmarks/fullstack_fixtures.h +++ b/test/cpp/microbenchmarks/fullstack_fixtures.h @@ -205,8 +205,6 @@ class EndpointPairFixture : public BaseFixture { channel_ = CreateChannelInternal("", channel); } - - grpc_exec_ctx_finish(); } virtual ~EndpointPairFixture() { diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc index 836cc676c23..8ba8be0ea48 100644 --- a/test/cpp/naming/resolver_component_test.cc +++ b/test/cpp/naming/resolver_component_test.cc @@ -171,7 +171,7 @@ void ArgsFinish(ArgsStruct* args) { grpc_pollset_shutdown(args->pollset, &DoNothing_cb); // exec_ctx needs to be flushed before calling grpc_pollset_destroy() grpc_channel_args_destroy(args->channel_args); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); grpc_pollset_destroy(args->pollset); gpr_free(args->pollset); GRPC_COMBINER_UNREF(args->lock, NULL); @@ -202,7 +202,6 @@ void PollPollsetUntilRequestDone(ArgsStruct* args) { grpc_timespec_to_millis_round_up( NSecondDeadline(1)))); gpr_mu_unlock(args->mu); - grpc_exec_ctx_finish(); } gpr_event_set(&args->ev, (void*)1); } @@ -295,11 +294,10 @@ TEST(ResolverComponentTest, TestResolvesRelevantRecords) { (void*)&args, grpc_combiner_scheduler(args.lock)); grpc_resolver_next_locked(resolver, &args.channel_args, &on_resolver_result_changed); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); PollPollsetUntilRequestDone(&args); GRPC_RESOLVER_UNREF(resolver, NULL); ArgsFinish(&args); - grpc_exec_ctx_finish(); } } // namespace diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc index b05da25e1d5..b9514e63066 100644 --- a/test/cpp/performance/writes_per_rpc_test.cc +++ b/test/cpp/performance/writes_per_rpc_test.cc @@ -120,8 +120,6 @@ class EndpointPairFixture { channel_ = CreateChannelInternal("", channel); } - - grpc_exec_ctx_finish(); } virtual ~EndpointPairFixture() { From 6c26b16fe06b1cc75b4dac372f4f51f6b7d1bfc0 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 14 Nov 2017 18:11:22 -0800 Subject: [PATCH 010/127] Move ExecCtx to grpc_core namespace. Make exec_ctx a private static in ExecCtx and some minor changes --- .../filters/client_channel/backup_poller.cc | 8 +- .../client_channel/channel_connectivity.cc | 4 +- .../client_channel/lb_policy/grpclb/grpclb.cc | 9 +- .../resolver/dns/c_ares/dns_resolver_ares.cc | 2 +- .../resolver/dns/c_ares/grpc_ares_wrapper.cc | 2 +- .../resolver/dns/native/dns_resolver.cc | 2 +- .../ext/filters/client_channel/subchannel.cc | 3 +- .../client_channel/subchannel_index.cc | 39 +++--- .../ext/filters/max_age/max_age_filter.cc | 20 ++-- .../chttp2/client/insecure/channel_create.cc | 2 +- .../client/insecure/channel_create_posix.cc | 2 +- .../client/secure/secure_channel_create.cc | 2 +- .../transport/chttp2/server/chttp2_server.cc | 7 +- .../chttp2/server/insecure/server_chttp2.cc | 2 +- .../server/insecure/server_chttp2_posix.cc | 2 +- .../server/secure/server_secure_chttp2.cc | 2 +- .../chttp2/transport/chttp2_transport.cc | 10 +- .../chttp2/transport/flow_control.cc | 4 +- .../transport/chttp2/transport/frame_ping.cc | 2 +- .../chttp2/transport/hpack_encoder.cc | 3 +- .../ext/transport/chttp2/transport/parsing.cc | 2 +- .../ext/transport/chttp2/transport/writing.cc | 2 +- .../client/secure/cronet_channel_create.cc | 2 +- .../cronet/transport/cronet_transport.cc | 16 +-- .../ext/transport/inproc/inproc_transport.cc | 6 +- src/core/lib/backoff/backoff.cc | 4 +- .../compression/stream_compression_gzip.cc | 2 +- src/core/lib/debug/stats.h | 2 +- src/core/lib/iomgr/block_annotate.h | 14 +-- src/core/lib/iomgr/combiner.cc | 43 +++---- src/core/lib/iomgr/endpoint_pair_posix.cc | 2 +- src/core/lib/iomgr/endpoint_pair_windows.cc | 2 +- src/core/lib/iomgr/ev_epoll1_linux.cc | 20 ++-- src/core/lib/iomgr/ev_epollex_linux.cc | 10 +- src/core/lib/iomgr/ev_epollsig_linux.cc | 6 +- src/core/lib/iomgr/ev_poll_posix.cc | 8 +- src/core/lib/iomgr/exec_ctx.cc | 109 +++++++---------- src/core/lib/iomgr/exec_ctx.h | 68 +++++++++-- src/core/lib/iomgr/executor.cc | 12 +- src/core/lib/iomgr/iocp_windows.cc | 13 +- src/core/lib/iomgr/iomgr.cc | 10 +- src/core/lib/iomgr/iomgr_uv.cc | 2 +- src/core/lib/iomgr/pollset_uv.cc | 4 +- src/core/lib/iomgr/pollset_windows.cc | 8 +- src/core/lib/iomgr/resolve_address_uv.cc | 2 +- src/core/lib/iomgr/resource_quota.cc | 4 +- src/core/lib/iomgr/tcp_client_uv.cc | 4 +- src/core/lib/iomgr/tcp_posix.cc | 2 +- src/core/lib/iomgr/tcp_server_uv.cc | 8 +- src/core/lib/iomgr/tcp_uv.cc | 10 +- src/core/lib/iomgr/timer_generic.cc | 8 +- src/core/lib/iomgr/timer_manager.cc | 10 +- src/core/lib/iomgr/timer_uv.cc | 6 +- .../lib/security/context/security_context.cc | 4 +- .../lib/security/credentials/credentials.cc | 6 +- .../google_default_credentials.cc | 10 +- .../credentials/iam/iam_credentials.cc | 2 +- .../credentials/jwt/jwt_credentials.cc | 2 +- .../security/credentials/jwt/jwt_verifier.cc | 11 +- .../credentials/oauth2/oauth2_credentials.cc | 9 +- .../credentials/plugin/plugin_credentials.cc | 4 +- .../security/transport/security_handshaker.cc | 2 +- .../security/transport/server_auth_filter.cc | 2 +- src/core/lib/slice/slice.cc | 2 +- src/core/lib/slice/slice_buffer.cc | 4 +- src/core/lib/surface/alarm.cc | 6 +- src/core/lib/surface/byte_buffer.cc | 2 +- src/core/lib/surface/byte_buffer_reader.cc | 4 +- src/core/lib/surface/call.cc | 8 +- src/core/lib/surface/call_details.cc | 2 +- src/core/lib/surface/channel.cc | 10 +- src/core/lib/surface/channel_ping.cc | 2 +- src/core/lib/surface/completion_queue.cc | 24 ++-- src/core/lib/surface/init.cc | 4 +- src/core/lib/surface/lame_client.cc | 2 +- src/core/lib/surface/server.cc | 12 +- src/core/lib/transport/bdp_estimator.cc | 2 +- src/core/lib/transport/status_conversion.cc | 5 +- src/core/lib/transport/transport.cc | 3 +- src/cpp/common/channel_arguments.cc | 4 +- test/core/backoff/backoff_test.cc | 60 +++++----- test/core/bad_client/bad_client.cc | 4 +- test/core/channel/channel_args_test.cc | 8 +- test/core/channel/channel_stack_test.cc | 4 +- .../channel/minimal_stack_is_minimal_test.cc | 4 +- test/core/client_channel/lb_policies_test.cc | 4 +- .../core/client_channel/parse_address_test.cc | 6 +- .../dns_resolver_connectivity_test.cc | 8 +- .../resolvers/dns_resolver_test.cc | 6 +- .../resolvers/fake_resolver_test.cc | 8 +- .../resolvers/sockaddr_resolver_test.cc | 6 +- test/core/client_channel/uri_fuzzer_test.cc | 2 +- test/core/client_channel/uri_parser_test.cc | 10 +- test/core/compression/algorithm_test.cc | 4 +- .../core/compression/message_compress_test.cc | 16 +-- test/core/debug/stats_test.cc | 6 +- test/core/end2end/bad_server_response_test.cc | 2 +- test/core/end2end/connection_refused_test.cc | 2 +- test/core/end2end/fixtures/h2_census.cc | 4 +- test/core/end2end/fixtures/h2_compress.cc | 6 +- test/core/end2end/fixtures/h2_fd.cc | 4 +- .../end2end/fixtures/h2_full+workarounds.cc | 2 +- .../end2end/fixtures/h2_load_reporting.cc | 2 +- test/core/end2end/fixtures/h2_oauth2.cc | 2 +- .../end2end/fixtures/h2_sockpair+trace.cc | 8 +- test/core/end2end/fixtures/h2_sockpair.cc | 6 +- .../end2end/fixtures/h2_sockpair_1byte.cc | 6 +- test/core/end2end/fixtures/h2_ssl.cc | 2 +- test/core/end2end/fixtures/h2_ssl_proxy.cc | 4 +- .../end2end/fixtures/http_proxy_fixture.cc | 13 +- test/core/end2end/fuzzers/api_fuzzer.cc | 14 +-- test/core/end2end/fuzzers/client_fuzzer.cc | 4 +- test/core/end2end/fuzzers/server_fuzzer.cc | 4 +- test/core/end2end/h2_ssl_cert_test.cc | 2 +- .../core/end2end/tests/cancel_after_accept.cc | 2 +- .../end2end/tests/cancel_after_round_trip.cc | 2 +- test/core/end2end/tests/compressed_payload.cc | 6 +- .../core/end2end/tests/load_reporting_hook.cc | 2 +- test/core/end2end/tests/max_message_length.cc | 4 +- .../stream_compression_compressed_payload.cc | 6 +- .../tests/stream_compression_payload.cc | 2 +- .../stream_compression_ping_pong_streaming.cc | 2 +- .../tests/workaround_cronet_compression.cc | 4 +- test/core/http/httpcli_test.cc | 6 +- test/core/http/httpscli_test.cc | 6 +- test/core/iomgr/combiner_test.cc | 16 +-- test/core/iomgr/endpoint_pair_test.cc | 4 +- test/core/iomgr/endpoint_tests.cc | 19 +-- test/core/iomgr/ev_epollsig_linux_test.cc | 28 ++--- test/core/iomgr/fd_conservation_posix_test.cc | 4 +- test/core/iomgr/fd_posix_test.cc | 12 +- test/core/iomgr/pollset_set_test.cc | 36 +++--- test/core/iomgr/resolve_address_posix_test.cc | 14 +-- test/core/iomgr/resolve_address_test.cc | 42 +++---- test/core/iomgr/resource_quota_test.cc | 112 +++++++++--------- test/core/iomgr/tcp_client_posix_test.cc | 12 +- test/core/iomgr/tcp_client_uv_test.cc | 10 +- test/core/iomgr/tcp_posix_test.cc | 18 +-- test/core/iomgr/tcp_server_posix_test.cc | 15 +-- test/core/iomgr/tcp_server_uv_test.cc | 12 +- test/core/iomgr/timer_list_test.cc | 18 +-- test/core/iomgr/udp_server_test.cc | 18 +-- test/core/security/credentials_test.cc | 70 +++++------ test/core/security/json_token_test.cc | 4 +- test/core/security/jwt_verifier_test.cc | 26 ++-- test/core/security/oauth2_utils.cc | 4 +- .../print_google_default_creds_token.cc | 4 +- test/core/security/secure_endpoint_test.cc | 6 +- test/core/security/ssl_server_fuzzer.cc | 10 +- test/core/security/verify_jwt.cc | 4 +- test/core/slice/b64_test.cc | 8 +- test/core/slice/slice_hash_table_test.cc | 6 +- test/core/surface/byte_buffer_reader_test.cc | 2 +- test/core/surface/channel_create_test.cc | 2 +- test/core/surface/completion_queue_test.cc | 8 +- .../completion_queue_threading_test.cc | 4 +- .../surface/concurrent_connectivity_test.cc | 6 +- test/core/surface/lame_client_test.cc | 2 +- ...num_external_connectivity_watchers_test.cc | 2 +- .../surface/secure_channel_create_test.cc | 6 +- .../surface/sequential_connectivity_test.cc | 2 +- test/core/transport/bdp_estimator_test.cc | 4 +- test/core/transport/byte_stream_test.cc | 10 +- .../core/transport/chttp2/bin_decoder_test.cc | 2 +- .../transport/chttp2/hpack_encoder_test.cc | 2 +- .../chttp2/hpack_parser_fuzzer_test.cc | 2 +- .../transport/chttp2/hpack_parser_test.cc | 4 +- .../core/transport/chttp2/hpack_table_test.cc | 8 +- .../core/transport/connectivity_state_test.cc | 16 +-- test/core/transport/metadata_test.cc | 18 +-- test/core/transport/status_conversion_test.cc | 2 +- test/core/util/port_server_client.cc | 24 ++-- test/core/util/test_tcp_server.cc | 6 +- test/cpp/end2end/client_lb_end2end_test.cc | 2 +- test/cpp/end2end/grpclb_end2end_test.cc | 2 +- test/cpp/grpclb/grpclb_test.cc | 2 +- test/cpp/microbenchmarks/bm_call_create.cc | 8 +- test/cpp/microbenchmarks/bm_chttp2_hpack.cc | 22 ++-- .../microbenchmarks/bm_chttp2_transport.cc | 12 +- test/cpp/microbenchmarks/bm_closure.cc | 66 +++++------ test/cpp/microbenchmarks/bm_cq.cc | 6 +- .../microbenchmarks/bm_cq_multiple_threads.cc | 2 +- test/cpp/microbenchmarks/bm_error.cc | 6 +- .../microbenchmarks/bm_fullstack_trickle.cc | 2 +- test/cpp/microbenchmarks/bm_metadata.cc | 26 ++-- test/cpp/microbenchmarks/bm_pollset.cc | 12 +- test/cpp/microbenchmarks/fullstack_fixtures.h | 2 +- test/cpp/naming/resolver_component_test.cc | 8 +- test/cpp/performance/writes_per_rpc_test.cc | 2 +- 189 files changed, 943 insertions(+), 882 deletions(-) diff --git a/src/core/ext/filters/client_channel/backup_poller.cc b/src/core/ext/filters/client_channel/backup_poller.cc index dbdcd53ef5d..ea9fb2cae1b 100644 --- a/src/core/ext/filters/client_channel/backup_poller.cc +++ b/src/core/ext/filters/client_channel/backup_poller.cc @@ -112,10 +112,12 @@ static void run_poller(void* arg, grpc_error* error) { backup_poller_shutdown_unref(p); return; } - grpc_error* err = grpc_pollset_work(p->pollset, NULL, ExecCtx::Get()->Now()); + grpc_error* err = + grpc_pollset_work(p->pollset, NULL, grpc_core::ExecCtx::Get()->Now()); gpr_mu_unlock(p->pollset_mu); GRPC_LOG_IF_ERROR("Run client channel backup poller", err); - grpc_timer_init(&p->polling_timer, ExecCtx::Get()->Now() + g_poll_interval_ms, + grpc_timer_init(&p->polling_timer, + grpc_core::ExecCtx::Get()->Now() + g_poll_interval_ms, &p->run_poller_closure); } @@ -137,7 +139,7 @@ void grpc_client_channel_start_backup_polling( GRPC_CLOSURE_INIT(&g_poller->run_poller_closure, run_poller, g_poller, grpc_schedule_on_exec_ctx); grpc_timer_init(&g_poller->polling_timer, - ExecCtx::Get()->Now() + g_poll_interval_ms, + grpc_core::ExecCtx::Get()->Now() + g_poll_interval_ms, &g_poller->run_poller_closure); } diff --git a/src/core/ext/filters/client_channel/channel_connectivity.cc b/src/core/ext/filters/client_channel/channel_connectivity.cc index 0ceedb9f86b..c949e52bd47 100644 --- a/src/core/ext/filters/client_channel/channel_connectivity.cc +++ b/src/core/ext/filters/client_channel/channel_connectivity.cc @@ -33,7 +33,7 @@ grpc_connectivity_state grpc_channel_check_connectivity_state( /* forward through to the underlying client channel */ grpc_channel_element* client_channel_elem = grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel)); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_connectivity_state state; GRPC_API_TRACE( "grpc_channel_check_connectivity_state(channel=%p, try_to_connect=%d)", 2, @@ -198,7 +198,7 @@ void grpc_channel_watch_connectivity_state( gpr_timespec deadline, grpc_completion_queue* cq, void* tag) { grpc_channel_element* client_channel_elem = grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel)); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; state_watcher* w = (state_watcher*)gpr_malloc(sizeof(*w)); GRPC_API_TRACE( diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index 63cf417c4e0..e757777aecb 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -1122,7 +1122,7 @@ static void start_picking_locked(glb_lb_policy* glb_policy) { if (glb_policy->lb_fallback_timeout_ms > 0 && glb_policy->serverlist == NULL && !glb_policy->fallback_timer_active) { grpc_millis deadline = - ExecCtx::Get()->Now() + glb_policy->lb_fallback_timeout_ms; + grpc_core::ExecCtx::Get()->Now() + glb_policy->lb_fallback_timeout_ms; GRPC_LB_POLICY_WEAK_REF(&glb_policy->base, "grpclb_fallback_timer"); GRPC_CLOSURE_INIT(&glb_policy->lb_on_fallback, lb_on_fallback_timer_locked, glb_policy, @@ -1271,7 +1271,7 @@ static void maybe_restart_lb_call(glb_lb_policy* glb_policy) { if (GRPC_TRACER_ON(grpc_lb_glb_trace)) { gpr_log(GPR_DEBUG, "[grpclb %p] Connection to LB server lost...", glb_policy); - grpc_millis timeout = next_try - ExecCtx::Get()->Now(); + grpc_millis timeout = next_try - grpc_core::ExecCtx::Get()->Now(); if (timeout > 0) { gpr_log(GPR_DEBUG, "[grpclb %p] ... retry_timer_active in %" PRIuPTR "ms.", @@ -1297,7 +1297,8 @@ static void send_client_load_report_locked(void* arg, grpc_error* error); static void schedule_next_client_load_report(glb_lb_policy* glb_policy) { const grpc_millis next_client_load_report_time = - ExecCtx::Get()->Now() + glb_policy->client_stats_report_interval; + grpc_core::ExecCtx::Get()->Now() + + glb_policy->client_stats_report_interval; GRPC_CLOSURE_INIT(&glb_policy->client_load_report_closure, send_client_load_report_locked, glb_policy, grpc_combiner_scheduler(glb_policy->base.combiner)); @@ -1392,7 +1393,7 @@ static void lb_call_init_locked(glb_lb_policy* glb_policy) { grpc_millis deadline = glb_policy->lb_call_timeout_ms == 0 ? GRPC_MILLIS_INF_FUTURE - : ExecCtx::Get()->Now() + glb_policy->lb_call_timeout_ms; + : grpc_core::ExecCtx::Get()->Now() + glb_policy->lb_call_timeout_ms; glb_policy->lb_call = grpc_channel_create_pollset_set_call( glb_policy->lb_channel, NULL, GRPC_PROPAGATE_DEFAULTS, glb_policy->base.interested_parties, diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc index f0543964ae2..5ac5d37a54c 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc @@ -265,7 +265,7 @@ static void dns_ares_on_resolved_locked(void* arg, grpc_error* error) { gpr_log(GPR_DEBUG, "dns resolution failed: %s", msg); grpc_millis next_try = grpc_backoff_step(&r->backoff_state).next_attempt_start_time; - grpc_millis timeout = next_try - ExecCtx::Get()->Now(); + grpc_millis timeout = next_try - grpc_core::ExecCtx::Get()->Now(); gpr_log(GPR_INFO, "dns resolution failed (will retry): %s", grpc_error_string(error)); GPR_ASSERT(!r->have_retry_timer); diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc index 925223d1897..06af5bf0b29 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -213,7 +213,7 @@ static void on_hostbyname_done_cb(void* arg, int status, int timeouts, static void on_srv_query_done_cb(void* arg, int status, int timeouts, unsigned char* abuf, int alen) { grpc_ares_request* r = (grpc_ares_request*)arg; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_log(GPR_DEBUG, "on_query_srv_done_cb"); if (status == ARES_SUCCESS) { gpr_log(GPR_DEBUG, "on_query_srv_done_cb ARES_SUCCESS"); diff --git a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc index 10404ec4ef8..82cd28fb2b7 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc @@ -163,7 +163,7 @@ static void dns_on_resolved_locked(void* arg, grpc_error* error) { } else { grpc_millis next_try = grpc_backoff_step(&r->backoff_state).next_attempt_start_time; - grpc_millis timeout = next_try - ExecCtx::Get()->Now(); + grpc_millis timeout = next_try - grpc_core::ExecCtx::Get()->Now(); gpr_log(GPR_INFO, "dns resolution failed (will retry): %s", grpc_error_string(error)); GPR_ASSERT(!r->have_retry_timer); diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc index 98f96b57504..61adb984f3e 100644 --- a/src/core/ext/filters/client_channel/subchannel.cc +++ b/src/core/ext/filters/client_channel/subchannel.cc @@ -458,7 +458,8 @@ static void maybe_start_connecting_locked(grpc_subchannel* c) { GPR_ASSERT(!c->have_alarm); c->have_alarm = true; const grpc_millis time_til_next = - c->backoff_result.next_attempt_start_time - ExecCtx::Get()->Now(); + c->backoff_result.next_attempt_start_time - + grpc_core::ExecCtx::Get()->Now(); if (time_til_next <= 0) { gpr_log(GPR_INFO, "Retry immediately"); } else { diff --git a/src/core/ext/filters/client_channel/subchannel_index.cc b/src/core/ext/filters/client_channel/subchannel_index.cc index fbab57769cf..b7b7472affe 100644 --- a/src/core/ext/filters/client_channel/subchannel_index.cc +++ b/src/core/ext/filters/client_channel/subchannel_index.cc @@ -133,7 +133,7 @@ void grpc_subchannel_index_shutdown(void) { void grpc_subchannel_index_unref(void) { if (gpr_unref(&g_refcount)) { gpr_mu_destroy(&g_mu); - gpr_avl_unref(g_subchannel_index, ExecCtx::Get()); + gpr_avl_unref(g_subchannel_index, grpc_core::ExecCtx::Get()); } } @@ -143,12 +143,13 @@ grpc_subchannel* grpc_subchannel_index_find(grpc_subchannel_key* key) { // Lock, and take a reference to the subchannel index. // We don't need to do the search under a lock as avl's are immutable. gpr_mu_lock(&g_mu); - gpr_avl index = gpr_avl_ref(g_subchannel_index, ExecCtx::Get()); + gpr_avl index = gpr_avl_ref(g_subchannel_index, grpc_core::ExecCtx::Get()); gpr_mu_unlock(&g_mu); grpc_subchannel* c = GRPC_SUBCHANNEL_REF_FROM_WEAK_REF( - (grpc_subchannel*)gpr_avl_get(index, key, ExecCtx::Get()), "index_find"); - gpr_avl_unref(index, ExecCtx::Get()); + (grpc_subchannel*)gpr_avl_get(index, key, grpc_core::ExecCtx::Get()), + "index_find"); + gpr_avl_unref(index, grpc_core::ExecCtx::Get()); return c; } @@ -164,11 +165,11 @@ grpc_subchannel* grpc_subchannel_index_register(grpc_subchannel_key* key, // Compare and swap loop: // - take a reference to the current index gpr_mu_lock(&g_mu); - gpr_avl index = gpr_avl_ref(g_subchannel_index, ExecCtx::Get()); + gpr_avl index = gpr_avl_ref(g_subchannel_index, grpc_core::ExecCtx::Get()); gpr_mu_unlock(&g_mu); // - Check to see if a subchannel already exists - c = (grpc_subchannel*)gpr_avl_get(index, key, ExecCtx::Get()); + c = (grpc_subchannel*)gpr_avl_get(index, key, grpc_core::ExecCtx::Get()); if (c != NULL) { c = GRPC_SUBCHANNEL_REF_FROM_WEAK_REF(c, "index_register"); } @@ -177,10 +178,11 @@ grpc_subchannel* grpc_subchannel_index_register(grpc_subchannel_key* key, need_to_unref_constructed = true; } else { // no -> update the avl and compare/swap - gpr_avl updated = gpr_avl_add( - gpr_avl_ref(index, ExecCtx::Get()), subchannel_key_copy(key), - GRPC_SUBCHANNEL_WEAK_REF(constructed, "index_register"), - ExecCtx::Get()); + gpr_avl updated = + gpr_avl_add(gpr_avl_ref(index, grpc_core::ExecCtx::Get()), + subchannel_key_copy(key), + GRPC_SUBCHANNEL_WEAK_REF(constructed, "index_register"), + grpc_core::ExecCtx::Get()); // it may happen (but it's expected to be unlikely) // that some other thread has changed the index: @@ -192,9 +194,9 @@ grpc_subchannel* grpc_subchannel_index_register(grpc_subchannel_key* key, } gpr_mu_unlock(&g_mu); - gpr_avl_unref(updated, ExecCtx::Get()); + gpr_avl_unref(updated, grpc_core::ExecCtx::Get()); } - gpr_avl_unref(index, ExecCtx::Get()); + gpr_avl_unref(index, grpc_core::ExecCtx::Get()); } if (need_to_unref_constructed) { @@ -211,22 +213,23 @@ void grpc_subchannel_index_unregister(grpc_subchannel_key* key, // Compare and swap loop: // - take a reference to the current index gpr_mu_lock(&g_mu); - gpr_avl index = gpr_avl_ref(g_subchannel_index, ExecCtx::Get()); + gpr_avl index = gpr_avl_ref(g_subchannel_index, grpc_core::ExecCtx::Get()); gpr_mu_unlock(&g_mu); // Check to see if this key still refers to the previously // registered subchannel grpc_subchannel* c = - (grpc_subchannel*)gpr_avl_get(index, key, ExecCtx::Get()); + (grpc_subchannel*)gpr_avl_get(index, key, grpc_core::ExecCtx::Get()); if (c != constructed) { - gpr_avl_unref(index, ExecCtx::Get()); + gpr_avl_unref(index, grpc_core::ExecCtx::Get()); break; } // compare and swap the update (some other thread may have // mutated the index behind us) gpr_avl updated = - gpr_avl_remove(gpr_avl_ref(index, ExecCtx::Get()), key, ExecCtx::Get()); + gpr_avl_remove(gpr_avl_ref(index, grpc_core::ExecCtx::Get()), key, + grpc_core::ExecCtx::Get()); gpr_mu_lock(&g_mu); if (index.root == g_subchannel_index.root) { @@ -235,8 +238,8 @@ void grpc_subchannel_index_unregister(grpc_subchannel_key* key, } gpr_mu_unlock(&g_mu); - gpr_avl_unref(updated, ExecCtx::Get()); - gpr_avl_unref(index, ExecCtx::Get()); + gpr_avl_unref(updated, grpc_core::ExecCtx::Get()); + gpr_avl_unref(index, grpc_core::ExecCtx::Get()); } } diff --git a/src/core/ext/filters/max_age/max_age_filter.cc b/src/core/ext/filters/max_age/max_age_filter.cc index 015a3ce124d..f89e8c730d7 100644 --- a/src/core/ext/filters/max_age/max_age_filter.cc +++ b/src/core/ext/filters/max_age/max_age_filter.cc @@ -99,9 +99,10 @@ static void increase_call_count(channel_data* chand) { static void decrease_call_count(channel_data* chand) { if (gpr_atm_full_fetch_add(&chand->call_count, -1) == 1) { GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age max_idle_timer"); - grpc_timer_init(&chand->max_idle_timer, - ExecCtx::Get()->Now() + chand->max_connection_idle, - &chand->close_max_idle_channel); + grpc_timer_init( + &chand->max_idle_timer, + grpc_core::ExecCtx::Get()->Now() + chand->max_connection_idle, + &chand->close_max_idle_channel); } } @@ -121,7 +122,7 @@ static void start_max_age_timer_after_init(void* arg, grpc_error* error) { chand->max_age_timer_pending = true; GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age max_age_timer"); grpc_timer_init(&chand->max_age_timer, - ExecCtx::Get()->Now() + chand->max_connection_age, + grpc_core::ExecCtx::Get()->Now() + chand->max_connection_age, &chand->close_max_age_channel); gpr_mu_unlock(&chand->max_age_timer_mu); grpc_transport_op* op = grpc_make_transport_op(NULL); @@ -138,11 +139,12 @@ static void start_max_age_grace_timer_after_goaway_op(void* arg, gpr_mu_lock(&chand->max_age_timer_mu); chand->max_age_grace_timer_pending = true; GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age max_age_grace_timer"); - grpc_timer_init(&chand->max_age_grace_timer, - chand->max_connection_age_grace == GRPC_MILLIS_INF_FUTURE - ? GRPC_MILLIS_INF_FUTURE - : ExecCtx::Get()->Now() + chand->max_connection_age_grace, - &chand->force_close_max_age_channel); + grpc_timer_init( + &chand->max_age_grace_timer, + chand->max_connection_age_grace == GRPC_MILLIS_INF_FUTURE + ? GRPC_MILLIS_INF_FUTURE + : grpc_core::ExecCtx::Get()->Now() + chand->max_connection_age_grace, + &chand->force_close_max_age_channel); gpr_mu_unlock(&chand->max_age_timer_mu); GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, "max_age start_max_age_grace_timer_after_goaway_op"); diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc index 3afca884ca4..fec61281c3e 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc @@ -80,7 +80,7 @@ static grpc_client_channel_factory client_channel_factory = { grpc_channel* grpc_insecure_channel_create(const char* target, const grpc_channel_args* args, void* reserved) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_API_TRACE( "grpc_insecure_channel_create(target=%s, args=%p, reserved=%p)", 3, (target, args, reserved)); diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc b/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc index b0eff1c992d..c713ce1960a 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc @@ -37,7 +37,7 @@ grpc_channel* grpc_insecure_channel_create_from_fd( const char* target, int fd, const grpc_channel_args* args) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_API_TRACE("grpc_insecure_channel_create(target=%p, fd=%d, args=%p)", 3, (target, fd, args)); diff --git a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc index bebc38c2480..a328126263d 100644 --- a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc +++ b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc @@ -190,7 +190,7 @@ grpc_channel* grpc_secure_channel_create(grpc_channel_credentials* creds, const char* target, const grpc_channel_args* args, void* reserved) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_API_TRACE( "grpc_secure_channel_create(creds=%p, target=%s, args=%p, " "reserved=%p)", diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index bbcfb1b195b..97b6ad38deb 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -132,7 +132,8 @@ static void on_accept(void* arg, grpc_endpoint* tcp, connection_state->handshake_mgr); // TODO(roth): We should really get this timeout value from channel // args instead of hard-coding it. - const grpc_millis deadline = ExecCtx::Get()->Now() + 120 * GPR_MS_PER_SEC; + const grpc_millis deadline = + grpc_core::ExecCtx::Get()->Now() + 120 * GPR_MS_PER_SEC; grpc_handshake_manager_do_handshake(connection_state->handshake_mgr, tcp, state->args, deadline, acceptor, on_handshake_done, connection_state); @@ -161,10 +162,10 @@ static void tcp_server_shutdown_complete(void* arg, grpc_error* error) { gpr_mu_unlock(&state->mu); // Flush queued work before destroying handshaker factory, since that // may do a synchronous unref. - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); if (destroy_done != NULL) { destroy_done->cb(destroy_done->cb_arg, GRPC_ERROR_REF(error)); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } grpc_channel_args_destroy(state->args); gpr_mu_destroy(&state->mu); diff --git a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc index 6cbb26a349f..826886c9618 100644 --- a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc +++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc @@ -26,7 +26,7 @@ #include "src/core/lib/surface/server.h" int grpc_server_add_insecure_http2_port(grpc_server* server, const char* addr) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; int port_num = 0; GRPC_API_TRACE("grpc_server_add_insecure_http2_port(server=%p, addr=%s)", 2, (server, addr)); diff --git a/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc b/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc index e5419e5e6e1..11b3d710dfc 100644 --- a/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc +++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc @@ -38,7 +38,7 @@ void grpc_server_add_insecure_channel_from_fd(grpc_server* server, void* reserved, int fd) { GPR_ASSERT(reserved == NULL); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; char* name; gpr_asprintf(&name, "fd:%d", fd); diff --git a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc index aeae8f42e36..827f0020bb0 100644 --- a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc +++ b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc @@ -36,7 +36,7 @@ int grpc_server_add_secure_http2_port(grpc_server* server, const char* addr, grpc_server_credentials* creds) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_error* err = GRPC_ERROR_NONE; grpc_server_security_connector* sc = NULL; int port_num = 0; diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index e49e26fc35a..a2861dfd6fc 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -530,7 +530,7 @@ static void init_transport(grpc_chttp2_transport* t, t->keepalive_state = GRPC_CHTTP2_KEEPALIVE_STATE_WAITING; GRPC_CHTTP2_REF_TRANSPORT(t, "init keepalive ping"); grpc_timer_init(&t->keepalive_ping_timer, - ExecCtx::Get()->Now() + t->keepalive_time, + grpc_core::ExecCtx::Get()->Now() + t->keepalive_time, &t->init_keepalive_ping_locked); } else { /* Use GRPC_CHTTP2_KEEPALIVE_STATE_DISABLED to indicate there are no @@ -2585,14 +2585,14 @@ static void init_keepalive_ping_locked(void* arg, grpc_error* error) { } else { GRPC_CHTTP2_REF_TRANSPORT(t, "init keepalive ping"); grpc_timer_init(&t->keepalive_ping_timer, - ExecCtx::Get()->Now() + t->keepalive_time, + grpc_core::ExecCtx::Get()->Now() + t->keepalive_time, &t->init_keepalive_ping_locked); } } else if (error == GRPC_ERROR_CANCELLED) { /* The keepalive ping timer may be cancelled by bdp */ GRPC_CHTTP2_REF_TRANSPORT(t, "init keepalive ping"); grpc_timer_init(&t->keepalive_ping_timer, - ExecCtx::Get()->Now() + t->keepalive_time, + grpc_core::ExecCtx::Get()->Now() + t->keepalive_time, &t->init_keepalive_ping_locked); } GRPC_CHTTP2_UNREF_TRANSPORT(t, "init keepalive ping"); @@ -2602,7 +2602,7 @@ static void start_keepalive_ping_locked(void* arg, grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)arg; GRPC_CHTTP2_REF_TRANSPORT(t, "keepalive watchdog"); grpc_timer_init(&t->keepalive_watchdog_timer, - ExecCtx::Get()->Now() + t->keepalive_time, + grpc_core::ExecCtx::Get()->Now() + t->keepalive_time, &t->keepalive_watchdog_fired_locked); } @@ -2614,7 +2614,7 @@ static void finish_keepalive_ping_locked(void* arg, grpc_error* error) { grpc_timer_cancel(&t->keepalive_watchdog_timer); GRPC_CHTTP2_REF_TRANSPORT(t, "init keepalive ping"); grpc_timer_init(&t->keepalive_ping_timer, - ExecCtx::Get()->Now() + t->keepalive_time, + grpc_core::ExecCtx::Get()->Now() + t->keepalive_time, &t->init_keepalive_ping_locked); } } diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc index e54d59b5fa2..14f089859eb 100644 --- a/src/core/ext/transport/chttp2/transport/flow_control.cc +++ b/src/core/ext/transport/chttp2/transport/flow_control.cc @@ -160,7 +160,7 @@ TransportFlowControl::TransportFlowControl(const grpc_chttp2_transport* t, .set_min_control_value(-1) .set_max_control_value(25) .set_integral_range(10)), - last_pid_update_(ExecCtx::Get()->Now()) {} + last_pid_update_(grpc_core::ExecCtx::Get()->Now()) {} uint32_t TransportFlowControl::MaybeSendUpdate(bool writing_anyway) { FlowControlTrace trace("t updt sent", this, nullptr); @@ -306,7 +306,7 @@ double TransportFlowControl::TargetLogBdp() { } double TransportFlowControl::SmoothLogBdp(double value) { - grpc_millis now = ExecCtx::Get()->Now(); + grpc_millis now = grpc_core::ExecCtx::Get()->Now(); double bdp_error = value - pid_controller_.last_control_value(); const double dt = (double)(now - last_pid_update_) * 1e-3; last_pid_update_ = now; diff --git a/src/core/ext/transport/chttp2/transport/frame_ping.cc b/src/core/ext/transport/chttp2/transport/frame_ping.cc index 60172be9cb7..298a56721a3 100644 --- a/src/core/ext/transport/chttp2/transport/frame_ping.cc +++ b/src/core/ext/transport/chttp2/transport/frame_ping.cc @@ -89,7 +89,7 @@ grpc_error* grpc_chttp2_ping_parser_parse(void* parser, grpc_chttp2_ack_ping(t, p->opaque_8bytes); } else { if (!t->is_client) { - grpc_millis now = ExecCtx::Get()->Now(); + grpc_millis now = grpc_core::ExecCtx::Get()->Now(); grpc_millis next_allowed_ping = t->ping_recv_state.last_ping_recv_time + t->ping_policy.min_recv_ping_interval_without_data; diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc index efb6e54ce79..2f9849c09a8 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc @@ -570,7 +570,8 @@ static void deadline_enc(grpc_chttp2_hpack_compressor* c, grpc_millis deadline, framer_state* st) { char timeout_str[GRPC_HTTP2_TIMEOUT_ENCODE_MIN_BUFSIZE]; grpc_mdelem mdelem; - grpc_http2_encode_timeout(deadline - ExecCtx::Get()->Now(), timeout_str); + grpc_http2_encode_timeout(deadline - grpc_core::ExecCtx::Get()->Now(), + timeout_str); mdelem = grpc_mdelem_from_slices(GRPC_MDSTR_GRPC_TIMEOUT, grpc_slice_from_copied_string(timeout_str)); hpack_enc(c, mdelem, st); diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index f7f83c9aee4..f73b498d407 100644 --- a/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/src/core/ext/transport/chttp2/transport/parsing.cc @@ -436,7 +436,7 @@ static void on_initial_header(void* tp, grpc_mdelem md) { } if (timeout != GRPC_MILLIS_INF_FUTURE) { grpc_chttp2_incoming_metadata_buffer_set_deadline( - &s->metadata_buffer[0], ExecCtx::Get()->Now() + timeout); + &s->metadata_buffer[0], grpc_core::ExecCtx::Get()->Now() + timeout); } GRPC_MDELEM_UNREF(md); } else { diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc index 4f76c2eb232..ddcac45d839 100644 --- a/src/core/ext/transport/chttp2/transport/writing.cc +++ b/src/core/ext/transport/chttp2/transport/writing.cc @@ -68,7 +68,7 @@ static void maybe_initiate_ping(grpc_chttp2_transport* t) { } return; } - grpc_millis now = ExecCtx::Get()->Now(); + grpc_millis now = grpc_core::ExecCtx::Get()->Now(); grpc_millis next_allowed_ping = t->ping_state.last_ping_sent_time + t->ping_policy.min_sent_ping_interval_without_data; diff --git a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc index f634627f033..8e1dcc542ec 100644 --- a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc +++ b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc @@ -49,6 +49,6 @@ GRPCAPI grpc_channel* grpc_cronet_secure_channel_create( grpc_transport* ct = grpc_create_cronet_transport(engine, target, args, reserved); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; return grpc_channel_create(target, args, GRPC_CLIENT_DIRECT_CHANNEL, ct); } diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index 3411acc5639..971071e3879 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -398,7 +398,7 @@ static void execute_from_storage(stream_obj* s) { */ static void on_failed(bidirectional_stream* stream, int net_error) { CRONET_LOG(GPR_DEBUG, "on_failed(%p, %d)", stream, net_error); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; stream_obj* s = (stream_obj*)stream->annotation; gpr_mu_lock(&s->mu); @@ -424,7 +424,7 @@ static void on_failed(bidirectional_stream* stream, int net_error) { */ static void on_canceled(bidirectional_stream* stream) { CRONET_LOG(GPR_DEBUG, "on_canceled(%p)", stream); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; stream_obj* s = (stream_obj*)stream->annotation; gpr_mu_lock(&s->mu); @@ -450,7 +450,7 @@ static void on_canceled(bidirectional_stream* stream) { */ static void on_succeeded(bidirectional_stream* stream) { CRONET_LOG(GPR_DEBUG, "on_succeeded(%p)", stream); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; stream_obj* s = (stream_obj*)stream->annotation; gpr_mu_lock(&s->mu); @@ -468,7 +468,7 @@ static void on_succeeded(bidirectional_stream* stream) { */ static void on_stream_ready(bidirectional_stream* stream) { CRONET_LOG(GPR_DEBUG, "W: on_stream_ready(%p)", stream); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; stream_obj* s = (stream_obj*)stream->annotation; grpc_cronet_transport* t = (grpc_cronet_transport*)s->curr_ct; gpr_mu_lock(&s->mu); @@ -498,7 +498,7 @@ static void on_response_headers_received( bidirectional_stream* stream, const bidirectional_stream_header_array* headers, const char* negotiated_protocol) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; CRONET_LOG(GPR_DEBUG, "R: on_response_headers_received(%p, %p, %s)", stream, headers, negotiated_protocol); stream_obj* s = (stream_obj*)stream->annotation; @@ -550,7 +550,7 @@ static void on_response_headers_received( Cronet callback */ static void on_write_completed(bidirectional_stream* stream, const char* data) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; stream_obj* s = (stream_obj*)stream->annotation; CRONET_LOG(GPR_DEBUG, "W: on_write_completed(%p, %s)", stream, data); gpr_mu_lock(&s->mu); @@ -568,7 +568,7 @@ static void on_write_completed(bidirectional_stream* stream, const char* data) { */ static void on_read_completed(bidirectional_stream* stream, char* data, int count) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; stream_obj* s = (stream_obj*)stream->annotation; CRONET_LOG(GPR_DEBUG, "R: on_read_completed(%p, %p, %d)", stream, data, count); @@ -610,7 +610,7 @@ static void on_read_completed(bidirectional_stream* stream, char* data, static void on_response_trailers_received( bidirectional_stream* stream, const bidirectional_stream_header_array* trailers) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; CRONET_LOG(GPR_DEBUG, "R: on_response_trailers_received(%p,%p)", stream, trailers); stream_obj* s = (stream_obj*)stream->annotation; diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index a79b2b26b02..e303f5ac0d0 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/src/core/ext/transport/inproc/inproc_transport.cc @@ -1091,7 +1091,7 @@ static grpc_endpoint* get_endpoint(grpc_transport* t) { return NULL; } static void do_nothing(void* arg, grpc_error* error) {} void grpc_inproc_transport_init(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_CLOSURE_INIT(&do_nothing_closure, do_nothing, NULL, grpc_schedule_on_exec_ctx); g_empty_slice = grpc_slice_from_static_buffer(NULL, 0); @@ -1155,7 +1155,7 @@ grpc_channel* grpc_inproc_channel_create(grpc_server* server, GRPC_API_TRACE("grpc_inproc_channel_create(server=%p, args=%p)", 2, (server, args)); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; const grpc_channel_args* server_args = grpc_server_get_channel_args(server); @@ -1186,7 +1186,7 @@ grpc_channel* grpc_inproc_channel_create(grpc_server* server, } void grpc_inproc_transport_shutdown(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_slice_unref_internal(g_empty_slice); grpc_slice_unref_internal(g_fake_path_key); grpc_slice_unref_internal(g_fake_path_value); diff --git a/src/core/lib/backoff/backoff.cc b/src/core/lib/backoff/backoff.cc index b75ce79d464..da3b9b1b2d2 100644 --- a/src/core/lib/backoff/backoff.cc +++ b/src/core/lib/backoff/backoff.cc @@ -36,7 +36,7 @@ grpc_backoff_result grpc_backoff_begin(grpc_backoff* backoff) { backoff->current_backoff = backoff->initial_backoff; const grpc_millis initial_timeout = GPR_MAX(backoff->initial_backoff, backoff->min_connect_timeout); - const grpc_millis now = ExecCtx::Get()->Now(); + const grpc_millis now = grpc_core::ExecCtx::Get()->Now(); const grpc_backoff_result result = {now + initial_timeout, now + backoff->current_backoff}; return result; @@ -67,7 +67,7 @@ grpc_backoff_result grpc_backoff_step(grpc_backoff* backoff) { backoff->min_connect_timeout); const grpc_millis next_timeout = GPR_MIN( (grpc_millis)(backoff->current_backoff + jitter), backoff->max_backoff); - const grpc_millis now = ExecCtx::Get()->Now(); + const grpc_millis now = grpc_core::ExecCtx::Get()->Now(); const grpc_backoff_result result = {now + current_timeout, now + next_timeout}; return result; diff --git a/src/core/lib/compression/stream_compression_gzip.cc b/src/core/lib/compression/stream_compression_gzip.cc index 3fae3490cee..4aaef4e1286 100644 --- a/src/core/lib/compression/stream_compression_gzip.cc +++ b/src/core/lib/compression/stream_compression_gzip.cc @@ -40,7 +40,7 @@ static bool gzip_flate(grpc_stream_compression_context_gzip* ctx, /* Full flush is not allowed when inflating. */ GPR_ASSERT(!(ctx->flate == inflate && (flush == Z_FINISH))); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; int r; bool eoc = false; size_t original_max_output_size = max_output_size; diff --git a/src/core/lib/debug/stats.h b/src/core/lib/debug/stats.h index 24b00841302..6b36f67172b 100644 --- a/src/core/lib/debug/stats.h +++ b/src/core/lib/debug/stats.h @@ -35,7 +35,7 @@ typedef struct grpc_stats_data { extern grpc_stats_data* grpc_stats_per_cpu_storage; #define GRPC_THREAD_STATS_DATA() \ - (&grpc_stats_per_cpu_storage[ExecCtx::Get()->starting_cpu()]) + (&grpc_stats_per_cpu_storage[grpc_core::ExecCtx::Get()->starting_cpu()]) #define GRPC_STATS_INC_COUNTER(ctr) \ (gpr_atm_no_barrier_fetch_add(&GRPC_THREAD_STATS_DATA()->counters[(ctr)], 1)) diff --git a/src/core/lib/iomgr/block_annotate.h b/src/core/lib/iomgr/block_annotate.h index 7783da0c148..55bde3eaac7 100644 --- a/src/core/lib/iomgr/block_annotate.h +++ b/src/core/lib/iomgr/block_annotate.h @@ -41,18 +41,18 @@ void gpr_thd_end_blocking_region(); do { \ gpr_thd_start_blocking_region(); \ } while (0) -#define GRPC_SCHEDULING_END_BLOCKING_REGION \ - do { \ - gpr_thd_end_blocking_region(); \ - ExecCtx::Get()->InvalidateNow(); \ +#define GRPC_SCHEDULING_END_BLOCKING_REGION \ + do { \ + gpr_thd_end_blocking_region(); \ + grpc_core::ExecCtx::Get()->InvalidateNow(); \ } while (0) #else #define GRPC_SCHEDULING_START_BLOCKING_REGION \ do { \ } while (0) -#define GRPC_SCHEDULING_END_BLOCKING_REGION \ - do { \ - ExecCtx::Get()->InvalidateNow(); \ +#define GRPC_SCHEDULING_END_BLOCKING_REGION \ + do { \ + grpc_core::ExecCtx::Get()->InvalidateNow(); \ } while (0) #endif diff --git a/src/core/lib/iomgr/combiner.cc b/src/core/lib/iomgr/combiner.cc index c9f5448630a..6cc4eef1d8d 100644 --- a/src/core/lib/iomgr/combiner.cc +++ b/src/core/lib/iomgr/combiner.cc @@ -129,23 +129,23 @@ grpc_combiner* grpc_combiner_ref(grpc_combiner* lock GRPC_COMBINER_DEBUG_ARGS) { static void push_last_on_exec_ctx(grpc_combiner* lock) { lock->next_combiner_on_this_exec_ctx = nullptr; - if (ExecCtx::Get()->combiner_data()->active_combiner == nullptr) { - ExecCtx::Get()->combiner_data()->active_combiner = - ExecCtx::Get()->combiner_data()->last_combiner = lock; + if (grpc_core::ExecCtx::Get()->combiner_data()->active_combiner == nullptr) { + grpc_core::ExecCtx::Get()->combiner_data()->active_combiner = + grpc_core::ExecCtx::Get()->combiner_data()->last_combiner = lock; } else { - ExecCtx::Get() + grpc_core::ExecCtx::Get() ->combiner_data() ->last_combiner->next_combiner_on_this_exec_ctx = lock; - ExecCtx::Get()->combiner_data()->last_combiner = lock; + grpc_core::ExecCtx::Get()->combiner_data()->last_combiner = lock; } } static void push_first_on_exec_ctx(grpc_combiner* lock) { lock->next_combiner_on_this_exec_ctx = - ExecCtx::Get()->combiner_data()->active_combiner; - ExecCtx::Get()->combiner_data()->active_combiner = lock; + grpc_core::ExecCtx::Get()->combiner_data()->active_combiner; + grpc_core::ExecCtx::Get()->combiner_data()->active_combiner = lock; if (lock->next_combiner_on_this_exec_ctx == NULL) { - ExecCtx::Get()->combiner_data()->last_combiner = lock; + grpc_core::ExecCtx::Get()->combiner_data()->last_combiner = lock; } } @@ -165,7 +165,7 @@ static void combiner_exec(grpc_closure* cl, grpc_error* error) { GRPC_STATS_INC_COMBINER_LOCKS_INITIATED(); GPR_TIMER_MARK("combiner.initiated", 0); gpr_atm_no_barrier_store(&lock->initiating_exec_ctx_or_null, - (gpr_atm)ExecCtx::Get()); + (gpr_atm)grpc_core::ExecCtx::Get()); // first element on this list: add it to the list of combiner locks // executing within this exec_ctx push_last_on_exec_ctx(lock); @@ -174,7 +174,7 @@ static void combiner_exec(grpc_closure* cl, grpc_error* error) { // offload for one or two actions, and that's fine gpr_atm initiator = gpr_atm_no_barrier_load(&lock->initiating_exec_ctx_or_null); - if (initiator != 0 && initiator != (gpr_atm)ExecCtx::Get()) { + if (initiator != 0 && initiator != (gpr_atm)grpc_core::ExecCtx::Get()) { gpr_atm_no_barrier_store(&lock->initiating_exec_ctx_or_null, 0); } } @@ -186,12 +186,12 @@ static void combiner_exec(grpc_closure* cl, grpc_error* error) { } static void move_next() { - ExecCtx::Get()->combiner_data()->active_combiner = - ExecCtx::Get() + grpc_core::ExecCtx::Get()->combiner_data()->active_combiner = + grpc_core::ExecCtx::Get() ->combiner_data() ->active_combiner->next_combiner_on_this_exec_ctx; - if (ExecCtx::Get()->combiner_data()->active_combiner == NULL) { - ExecCtx::Get()->combiner_data()->last_combiner = NULL; + if (grpc_core::ExecCtx::Get()->combiner_data()->active_combiner == NULL) { + grpc_core::ExecCtx::Get()->combiner_data()->last_combiner = NULL; } } @@ -209,7 +209,8 @@ static void queue_offload(grpc_combiner* lock) { bool grpc_combiner_continue_exec_ctx() { GPR_TIMER_BEGIN("combiner.continue_exec_ctx", 0); - grpc_combiner* lock = ExecCtx::Get()->combiner_data()->active_combiner; + grpc_combiner* lock = + grpc_core::ExecCtx::Get()->combiner_data()->active_combiner; if (lock == NULL) { GPR_TIMER_END("combiner.continue_exec_ctx", 0); return false; @@ -224,10 +225,10 @@ bool grpc_combiner_continue_exec_ctx() { "exec_ctx_ready_to_finish=%d " "time_to_execute_final_list=%d", lock, contended, - ExecCtx::Get()->IsReadyToFinish(), + grpc_core::ExecCtx::Get()->IsReadyToFinish(), lock->time_to_execute_final_list)); - if (contended && ExecCtx::Get()->IsReadyToFinish() && + if (contended && grpc_core::ExecCtx::Get()->IsReadyToFinish() && grpc_executor_is_threaded()) { GPR_TIMER_MARK("offload_from_finished_exec_ctx", 0); // this execution context wants to move on: schedule remaining work to be @@ -333,11 +334,11 @@ static void combiner_finally_exec(grpc_closure* closure, grpc_error* error) { GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS(); grpc_combiner* lock = COMBINER_FROM_CLOSURE_SCHEDULER(closure, finally_scheduler); - GRPC_COMBINER_TRACE( - gpr_log(GPR_DEBUG, "C:%p grpc_combiner_execute_finally c=%p; ac=%p", lock, - closure, ExecCtx::Get()->combiner_data()->active_combiner)); + GRPC_COMBINER_TRACE(gpr_log( + GPR_DEBUG, "C:%p grpc_combiner_execute_finally c=%p; ac=%p", lock, + closure, grpc_core::ExecCtx::Get()->combiner_data()->active_combiner)); GPR_TIMER_BEGIN("combiner.execute_finally", 0); - if (ExecCtx::Get()->combiner_data()->active_combiner != lock) { + if (grpc_core::ExecCtx::Get()->combiner_data()->active_combiner != lock) { GPR_TIMER_MARK("slowpath", 0); GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(enqueue_finally, closure, grpc_combiner_scheduler(lock)), diff --git a/src/core/lib/iomgr/endpoint_pair_posix.cc b/src/core/lib/iomgr/endpoint_pair_posix.cc index 1a281322a84..65db4a9675f 100644 --- a/src/core/lib/iomgr/endpoint_pair_posix.cc +++ b/src/core/lib/iomgr/endpoint_pair_posix.cc @@ -54,7 +54,7 @@ grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char* name, char* final_name; create_sockets(sv); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_asprintf(&final_name, "%s:client", name); p.client = grpc_tcp_create(grpc_fd_create(sv[1], final_name), args, diff --git a/src/core/lib/iomgr/endpoint_pair_windows.cc b/src/core/lib/iomgr/endpoint_pair_windows.cc index e0f211cdf91..afd91c9932b 100644 --- a/src/core/lib/iomgr/endpoint_pair_windows.cc +++ b/src/core/lib/iomgr/endpoint_pair_windows.cc @@ -72,7 +72,7 @@ grpc_endpoint_pair grpc_iomgr_create_endpoint_pair( SOCKET sv[2]; grpc_endpoint_pair p; create_sockets(sv); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; p.client = grpc_tcp_create(grpc_winsocket_create(sv[1], "endpoint:client"), channel_args, "endpoint:server"); p.server = grpc_tcp_create(grpc_winsocket_create(sv[0], "endpoint:server"), diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc index 2b486887b81..f22fb82797d 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -554,7 +554,7 @@ static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { static int poll_deadline_to_millis_timeout(grpc_millis millis) { if (millis == GRPC_MILLIS_INF_FUTURE) return -1; - grpc_millis delta = millis - ExecCtx::Get()->Now(); + grpc_millis delta = millis - grpc_core::ExecCtx::Get()->Now(); if (delta > INT_MAX) { return INT_MAX; } else if (delta < 0) { @@ -743,7 +743,7 @@ static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, SET_KICK_STATE(worker, KICKED); } } - ExecCtx::Get()->InvalidateNow(); + grpc_core::ExecCtx::Get()->InvalidateNow(); } if (GRPC_TRACER_ON(grpc_polling_trace)) { @@ -848,7 +848,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, /* Make sure we appear kicked */ SET_KICK_STATE(worker, KICKED); grpc_closure_list_move(&worker->schedule_on_end_work, - ExecCtx::Get()->closure_list()); + grpc_core::ExecCtx::Get()->closure_list()); if (gpr_atm_no_barrier_load(&g_active_poller) == (gpr_atm)worker) { if (worker->next != worker && worker->next->state == UNKICKED) { if (GRPC_TRACER_ON(grpc_polling_trace)) { @@ -859,9 +859,9 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, SET_KICK_STATE(worker->next, DESIGNATED_POLLER); GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); gpr_cv_signal(&worker->next->cv); - if (ExecCtx::Get()->HasWork()) { + if (grpc_core::ExecCtx::Get()->HasWork()) { gpr_mu_unlock(&pollset->mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->mu); } } else { @@ -892,12 +892,12 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, found_worker = check_neighborhood_for_available_poller(neighborhood); gpr_mu_unlock(&neighborhood->mu); } - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->mu); } - } else if (ExecCtx::Get()->HasWork()) { + } else if (grpc_core::ExecCtx::Get()->HasWork()) { gpr_mu_unlock(&pollset->mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->mu); } if (worker->initialized_cv) { @@ -948,8 +948,8 @@ static grpc_error* pollset_work(grpc_pollset* ps, process_epoll_events() returns very quickly: It just queues the work on exec_ctx but does not execute it (the actual exectution or more - accurately ExecCtx::Get()->Flush() happens in end_worker() AFTER - selecting a designated poller). So we are not waiting long periods + accurately grpc_core::ExecCtx::Get()->Flush() happens in end_worker() + AFTER selecting a designated poller). So we are not waiting long periods without a designated poller */ if (gpr_atm_acq_load(&g_epoll_set.cursor) == gpr_atm_acq_load(&g_epoll_set.num_events)) { diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc index 385b5f68d06..5b4edd1e74f 100644 --- a/src/core/lib/iomgr/ev_epollex_linux.cc +++ b/src/core/lib/iomgr/ev_epollex_linux.cc @@ -682,7 +682,7 @@ static void pollset_init(grpc_pollset* pollset, gpr_mu** mu) { static int poll_deadline_to_millis_timeout(grpc_millis millis) { if (millis == GRPC_MILLIS_INF_FUTURE) return -1; - grpc_millis delta = millis - ExecCtx::Get()->Now(); + grpc_millis delta = millis - grpc_core::ExecCtx::Get()->Now(); if (delta > INT_MAX) return INT_MAX; else if (delta < 0) @@ -902,7 +902,7 @@ static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, worker->pollable_obj, worker); } } - ExecCtx::Get()->InvalidateNow(); + grpc_core::ExecCtx::Get()->InvalidateNow(); } else { gpr_mu_unlock(&pollset->mu); } @@ -970,8 +970,8 @@ static grpc_error* pollset_work(grpc_pollset* pollset, gpr_log(GPR_DEBUG, "PS:%p work hdl=%p worker=%p now=%" PRIdPTR " deadline=%" PRIdPTR " kwp=%d pollable=%p", - pollset, worker_hdl, WORKER_PTR, ExecCtx::Get()->Now(), deadline, - pollset->kicked_without_poller, pollset->active_pollable); + pollset, worker_hdl, WORKER_PTR, grpc_core::ExecCtx::Get()->Now(), + deadline, pollset->kicked_without_poller, pollset->active_pollable); } static const char* err_desc = "pollset_work"; grpc_error* error = GRPC_ERROR_NONE; @@ -990,7 +990,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, &error, pollable_process_events(pollset, WORKER_PTR->pollable_obj, false), err_desc); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_tls_set(&g_current_thread_pollset, 0); gpr_tls_set(&g_current_thread_worker, 0); } diff --git a/src/core/lib/iomgr/ev_epollsig_linux.cc b/src/core/lib/iomgr/ev_epollsig_linux.cc index a9b094a2fab..4ded7c0211c 100644 --- a/src/core/lib/iomgr/ev_epollsig_linux.cc +++ b/src/core/lib/iomgr/ev_epollsig_linux.cc @@ -1090,7 +1090,7 @@ static void pollset_init(grpc_pollset* pollset, gpr_mu** mu) { static int poll_deadline_to_millis_timeout(grpc_millis millis) { if (millis == GRPC_MILLIS_INF_FUTURE) return -1; - grpc_millis delta = millis - ExecCtx::Get()->Now(); + grpc_millis delta = millis - grpc_core::ExecCtx::Get()->Now(); if (delta > INT_MAX) return INT_MAX; else if (delta < 0) @@ -1350,7 +1350,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, pollset_work_and_unlock(pollset, &worker, timeout_ms, &g_orig_sigmask, &error); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->po.mu); @@ -1373,7 +1373,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, finish_shutdown_locked(pollset); gpr_mu_unlock(&pollset->po.mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->po.mu); } diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index cab4f7547c4..b6546aa4b46 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -1040,7 +1040,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, worker list, which means nobody could ask us to re-evaluate polling). */ done: if (!locked) { - queued_work |= ExecCtx::Get()->Flush(); + queued_work |= grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->mu); locked = 1; } @@ -1074,7 +1074,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, pollset->called_shutdown = 1; gpr_mu_unlock(&pollset->mu); finish_shutdown(pollset); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); /* Continuing to access pollset here is safe -- it is the caller's * responsibility to not destroy when it has outstanding calls to * pollset_work. @@ -1083,7 +1083,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, } else if (!grpc_closure_list_empty(pollset->idle_jobs)) { GRPC_CLOSURE_LIST_SCHED(&pollset->idle_jobs); gpr_mu_unlock(&pollset->mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->mu); } } @@ -1110,7 +1110,7 @@ static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { static int poll_deadline_to_millis_timeout(grpc_millis deadline) { if (deadline == GRPC_MILLIS_INF_FUTURE) return -1; if (deadline == 0) return 0; - grpc_millis n = deadline - ExecCtx::Get()->Now(); + grpc_millis n = deadline - grpc_core::ExecCtx::Get()->Now(); if (n < 0) return 0; if (n > INT_MAX) return -1; return (int)n; diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index fe5a0e7e2de..de71c1cf9c8 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -25,29 +25,6 @@ #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/profiling/timers.h" -thread_local ExecCtx* exec_ctx = nullptr; - -ExecCtx::ExecCtx() : flags_(GRPC_EXEC_CTX_FLAG_IS_FINISHED) { exec_ctx = this; } -ExecCtx::ExecCtx(uintptr_t fl) : flags_(fl) { exec_ctx = this; } -ExecCtx::~ExecCtx() { - GPR_ASSERT(exec_ctx == this); - flags_ |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; - Flush(); - exec_ctx = last_exec_ctx_; -} - -bool ExecCtx::IsReadyToFinish() { - if ((flags_ & GRPC_EXEC_CTX_FLAG_IS_FINISHED) == 0) { - if (CheckReadyToFinish()) { - flags_ |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; - return true; - } - return false; - } else { - return true; - } -} - void exec_ctx_run(grpc_closure* closure, grpc_error* error) { #ifndef NDEBUG closure->scheduled = false; @@ -67,48 +44,16 @@ void exec_ctx_run(grpc_closure* closure, grpc_error* error) { GRPC_ERROR_UNREF(error); } -bool ExecCtx::Flush() { - bool did_something = 0; - GPR_TIMER_BEGIN("grpc_exec_ctx_flush", 0); - for (;;) { - if (!grpc_closure_list_empty(closure_list_)) { - grpc_closure* c = closure_list_.head; - closure_list_.head = closure_list_.tail = NULL; - while (c != NULL) { - grpc_closure* next = c->next_data.next; - grpc_error* error = c->error_data.error; - did_something = true; - exec_ctx_run(c, error); - c = next; - } - } else if (!grpc_combiner_continue_exec_ctx()) { - break; - } - } - GPR_ASSERT(combiner_data_.active_combiner == nullptr); - GPR_TIMER_END("grpc_exec_ctx_flush", 0); - return did_something; -} - -void exec_ctx_sched(grpc_closure* closure, grpc_error* error) { - grpc_closure_list_append(exec_ctx->closure_list(), closure, error); -} - static gpr_timespec g_start_time[GPR_TIMESPAN + 1]; // assumes GPR_TIMESPAN is the // last enum value in // gpr_clock_type -void ExecCtx::GlobalInit(void) { - for (int i = 0; i < GPR_TIMESPAN; i++) { - g_start_time[i] = gpr_now((gpr_clock_type)i); - } - // allows uniform treatment in conversion functions - g_start_time[GPR_TIMESPAN] = gpr_time_0(GPR_TIMESPAN); +void exec_ctx_sched(grpc_closure* closure, grpc_error* error) { + grpc_closure_list_append(grpc_core::ExecCtx::Get()->closure_list(), closure, + error); } -void ExecCtx::GlobalShutdown(void) {} - static gpr_atm timespec_to_atm_round_down(gpr_timespec ts) { ts = gpr_time_sub(ts, g_start_time[ts.clock_type]); double x = @@ -154,6 +99,47 @@ grpc_millis grpc_timespec_to_millis_round_up(gpr_timespec ts) { return timespec_to_atm_round_up(ts); } +static const grpc_closure_scheduler_vtable exec_ctx_scheduler_vtable = { + exec_ctx_run, exec_ctx_sched, "exec_ctx"}; +static grpc_closure_scheduler exec_ctx_scheduler = {&exec_ctx_scheduler_vtable}; +grpc_closure_scheduler* grpc_schedule_on_exec_ctx = &exec_ctx_scheduler; + +namespace grpc_core { +thread_local ExecCtx* ExecCtx::exec_ctx_ = nullptr; + +bool ExecCtx::Flush() { + bool did_something = 0; + GPR_TIMER_BEGIN("grpc_exec_ctx_flush", 0); + for (;;) { + if (!grpc_closure_list_empty(closure_list_)) { + grpc_closure* c = closure_list_.head; + closure_list_.head = closure_list_.tail = NULL; + while (c != NULL) { + grpc_closure* next = c->next_data.next; + grpc_error* error = c->error_data.error; + did_something = true; + exec_ctx_run(c, error); + c = next; + } + } else if (!grpc_combiner_continue_exec_ctx()) { + break; + } + } + GPR_ASSERT(combiner_data_.active_combiner == nullptr); + GPR_TIMER_END("grpc_exec_ctx_flush", 0); + return did_something; +} + +void ExecCtx::GlobalInit(void) { + for (int i = 0; i < GPR_TIMESPAN; i++) { + g_start_time[i] = gpr_now((gpr_clock_type)i); + } + // allows uniform treatment in conversion functions + g_start_time[GPR_TIMESPAN] = gpr_time_0(GPR_TIMESPAN); +} + +void ExecCtx::GlobalShutdown(void) {} + grpc_millis ExecCtx::Now() { if (!now_is_valid_) { now_ = timespec_to_atm_round_down(gpr_now(GPR_CLOCK_MONOTONIC)); @@ -162,9 +148,4 @@ grpc_millis ExecCtx::Now() { return now_; } -ExecCtx* ExecCtx::Get() { return exec_ctx; } - -static const grpc_closure_scheduler_vtable exec_ctx_scheduler_vtable = { - exec_ctx_run, exec_ctx_sched, "exec_ctx"}; -static grpc_closure_scheduler exec_ctx_scheduler = {&exec_ctx_scheduler_vtable}; -grpc_closure_scheduler* grpc_schedule_on_exec_ctx = &exec_ctx_scheduler; +} // namespace grpc_core diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index a71e43e178c..7b8da2f0af6 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -46,6 +46,7 @@ typedef struct grpc_combiner grpc_combiner; should be given to not delete said call/channel from this exec_ctx */ #define GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP 2 +namespace grpc_core { /** Execution context. * A bag of data that collects information along a callstack. * Generally created at public API entry points, and passed down as @@ -68,10 +69,25 @@ typedef struct grpc_combiner grpc_combiner; */ class ExecCtx { public: - ExecCtx(); - ExecCtx(uintptr_t fl); - ~ExecCtx(); + /** Default Constructor */ + ExecCtx() : flags_(GRPC_EXEC_CTX_FLAG_IS_FINISHED) { exec_ctx_ = this; } + + /** Parameterised Constructor */ + ExecCtx(uintptr_t fl) : flags_(fl) { exec_ctx_ = this; } + + /** Destructor */ + ~ExecCtx() { + GPR_ASSERT(exec_ctx_ == this); + flags_ |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; + Flush(); + exec_ctx_ = last_exec_ctx_; + } + + /** Disallow copy and assignment operators */ + ExecCtx(const ExecCtx&) = delete; + ExecCtx& operator=(const ExecCtx&) = delete; + /** Return starting_cpu */ unsigned starting_cpu() const { return starting_cpu_; } struct CombinerData { @@ -84,8 +100,13 @@ class ExecCtx { /** Only to be used by grpc-combiner code */ CombinerData* combiner_data() { return &combiner_data_; } + /** Return pointer to grpc_closure_list */ grpc_closure_list* closure_list() { return &closure_list_; } + /** Return flags */ + uintptr_t flags() { return flags_; } + + /** Checks if there is work to be done */ bool HasWork() { return combiner_data_.active_combiner != NULL || !grpc_closure_list_empty(closure_list_); @@ -99,32 +120,59 @@ class ExecCtx { /** Returns true if we'd like to leave this execution context as soon as possible: useful for deciding whether to do something more or not depending on outside context */ - bool IsReadyToFinish(); + bool IsReadyToFinish() { + if ((flags_ & GRPC_EXEC_CTX_FLAG_IS_FINISHED) == 0) { + if (CheckReadyToFinish()) { + flags_ |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; + return true; + } + return false; + } else { + return true; + } + } + /** Returns the stored current time relative to start if valid, + * otherwise refreshes the stored time, sets it valid and returns the new + * value */ grpc_millis Now(); + /** Invalidates the stored time value. A new time value will be set on calling + * Now() */ void InvalidateNow() { now_is_valid_ = false; } - void SetNow(grpc_millis new_val) { - now_ = new_val; + /** To be used only by shutdown code in iomgr */ + void SetNowIomgrShutdown() { + now_ = GRPC_MILLIS_INF_FUTURE; now_is_valid_ = true; } - uintptr_t flags() { return flags_; } + /** To be used only for testing. + * Sets the now value + */ + void TestOnlySetNow(grpc_millis new_val) { + now_ = new_val; + now_is_valid_ = true; + } /** Finish any pending work for a grpc_exec_ctx. Must be called before * the instance is destroyed, or work may be lost. */ void Finish(); + /** Global initialization for ExecCtx. Called by iomgr */ static void GlobalInit(void); + /** Global shutdown for ExecCtx. Called by iomgr */ static void GlobalShutdown(void); - static ExecCtx* Get(); + /** Gets pointer to current exec_ctx */ + static ExecCtx* Get() { return exec_ctx_; } protected: + /** Check if ready to finish */ virtual bool CheckReadyToFinish() { return false; } + private: grpc_closure_list closure_list_ = GRPC_CLOSURE_LIST_INIT; CombinerData combiner_data_ = {nullptr, nullptr}; uintptr_t flags_; @@ -133,8 +181,10 @@ on outside context */ bool now_is_valid_ = false; grpc_millis now_ = 0; - ExecCtx* last_exec_ctx_ = Get(); + static thread_local ExecCtx* exec_ctx_; + ExecCtx* last_exec_ctx_ = exec_ctx_; }; +} // namespace grpc_core extern grpc_closure_scheduler* grpc_schedule_on_exec_ctx; diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index bf8805a2cdd..4db298c1c54 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -78,7 +78,7 @@ static size_t run_closures(grpc_closure_list list) { GRPC_ERROR_UNREF(error); c = next; n++; - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } return n; @@ -145,7 +145,7 @@ static void executor_thread(void* arg) { thread_state* ts = (thread_state*)arg; gpr_tls_set(&g_this_thread_state, (intptr_t)ts); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; size_t subtract_depth = 0; for (;;) { @@ -175,7 +175,7 @@ static void executor_thread(void* arg) { gpr_log(GPR_DEBUG, "EXECUTOR[%d]: execute", (int)(ts - g_thread_state)); } - ExecCtx::Get()->InvalidateNow(); + grpc_core::ExecCtx::Get()->InvalidateNow(); subtract_depth = run_closures(exec); } } @@ -200,12 +200,14 @@ static void executor_push(grpc_closure* closure, grpc_error* error, gpr_log(GPR_DEBUG, "EXECUTOR: schedule %p inline", closure); #endif } - grpc_closure_list_append(ExecCtx::Get()->closure_list(), closure, error); + grpc_closure_list_append(grpc_core::ExecCtx::Get()->closure_list(), + closure, error); return; } thread_state* ts = (thread_state*)gpr_tls_get(&g_this_thread_state); if (ts == NULL) { - ts = &g_thread_state[GPR_HASH_POINTER(ExecCtx::Get(), cur_thread_count)]; + ts = &g_thread_state[GPR_HASH_POINTER(grpc_core::ExecCtx::Get(), + cur_thread_count)]; } else { GRPC_STATS_INC_EXECUTOR_SCHEDULED_TO_SELF(); } diff --git a/src/core/lib/iomgr/iocp_windows.cc b/src/core/lib/iomgr/iocp_windows.cc index 1686bf28727..f5c6297438b 100644 --- a/src/core/lib/iomgr/iocp_windows.cc +++ b/src/core/lib/iomgr/iocp_windows.cc @@ -46,7 +46,7 @@ static DWORD deadline_to_millis_timeout(grpc_millis deadline) { if (deadline == GRPC_MILLIS_INF_FUTURE) { return INFINITE; } - grpc_millis now = ExecCtx::Get()->Now(); + grpc_millis now = grpc_core::ExecCtx::Get()->Now(); if (deadline < now) return 0; grpc_millis timeout = deadline - now; if (timeout > std::numeric_limits::max()) return INFINITE; @@ -65,7 +65,7 @@ grpc_iocp_work_status grpc_iocp_work(grpc_millis deadline) { success = GetQueuedCompletionStatus(g_iocp, &bytes, &completion_key, &overlapped, deadline_to_millis_timeout(deadline)); - ExecCtx::Get()->InvalidateNow(); + grpc_core::ExecCtx::Get()->InvalidateNow(); if (success == 0 && overlapped == NULL) { return GRPC_IOCP_WORK_TIMEOUT; } @@ -113,19 +113,20 @@ void grpc_iocp_kick(void) { } void grpc_iocp_flush(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_iocp_work_status work_status; do { work_status = grpc_iocp_work(GRPC_MILLIS_INF_PAST); - } while (work_status == GRPC_IOCP_WORK_KICK || ExecCtx::Get()->Flush()); + } while (work_status == GRPC_IOCP_WORK_KICK || + grpc_core::ExecCtx::Get()->Flush()); } void grpc_iocp_shutdown(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (gpr_atm_acq_load(&g_custom_events)) { grpc_iocp_work(GRPC_MILLIS_INF_FUTURE); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } GPR_ASSERT(CloseHandle(g_iocp)); diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index a1add4a303a..9c74b5d1c3a 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -49,7 +49,7 @@ void grpc_iomgr_init() { g_shutdown = 0; gpr_mu_init(&g_mu); gpr_cv_init(&g_rcv); - ExecCtx::GlobalInit(); + grpc_core::ExecCtx::GlobalInit(); grpc_executor_init(); grpc_timer_list_init(); g_root_object.next = g_root_object.prev = &g_root_object; @@ -98,10 +98,10 @@ void grpc_iomgr_shutdown() { } last_warning_time = gpr_now(GPR_CLOCK_REALTIME); } - ExecCtx::Get()->SetNow(GRPC_MILLIS_INF_FUTURE); + grpc_core::ExecCtx::Get()->SetNowIomgrShutdown(); if (grpc_timer_check(NULL) == GRPC_TIMERS_FIRED) { gpr_mu_unlock(&g_mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); grpc_iomgr_platform_flush(); gpr_mu_lock(&g_mu); continue; @@ -136,14 +136,14 @@ void grpc_iomgr_shutdown() { gpr_mu_unlock(&g_mu); grpc_timer_list_shutdown(); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); /* ensure all threads have left g_mu */ gpr_mu_lock(&g_mu); gpr_mu_unlock(&g_mu); grpc_iomgr_platform_shutdown(); - ExecCtx::GlobalShutdown(); + grpc_core::ExecCtx::GlobalShutdown(); grpc_network_status_shutdown(); gpr_mu_destroy(&g_mu); gpr_cv_destroy(&g_rcv); diff --git a/src/core/lib/iomgr/iomgr_uv.cc b/src/core/lib/iomgr/iomgr_uv.cc index 2ab414252a3..5823bb7ec2a 100644 --- a/src/core/lib/iomgr/iomgr_uv.cc +++ b/src/core/lib/iomgr/iomgr_uv.cc @@ -29,7 +29,7 @@ gpr_thd_id g_init_thread; void grpc_iomgr_platform_init(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_pollset_global_init(); grpc_register_tracer(&grpc_tcp_trace); grpc_executor_set_threading(false); diff --git a/src/core/lib/iomgr/pollset_uv.cc b/src/core/lib/iomgr/pollset_uv.cc index a68ad4a6e3f..89d28a0f9d5 100644 --- a/src/core/lib/iomgr/pollset_uv.cc +++ b/src/core/lib/iomgr/pollset_uv.cc @@ -124,7 +124,7 @@ grpc_error* grpc_pollset_work(grpc_pollset* pollset, GRPC_UV_ASSERT_SAME_THREAD(); gpr_mu_unlock(&grpc_polling_mu); if (grpc_pollset_work_run_loop) { - grpc_millis now = ExecCtx::Get()->Now(); + grpc_millis now = grpc_core::ExecCtx::Get()->Now(); if (deadline >= now) { timeout = deadline - now; } else { @@ -143,7 +143,7 @@ grpc_error* grpc_pollset_work(grpc_pollset* pollset, } } if (!grpc_closure_list_empty(exec_ctx->closure_list)) { - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } gpr_mu_lock(&grpc_polling_mu); return GRPC_ERROR_NONE; diff --git a/src/core/lib/iomgr/pollset_windows.cc b/src/core/lib/iomgr/pollset_windows.cc index 5ff3e7cb3a3..81e1d009ca6 100644 --- a/src/core/lib/iomgr/pollset_windows.cc +++ b/src/core/lib/iomgr/pollset_windows.cc @@ -129,7 +129,7 @@ grpc_error* grpc_pollset_work(grpc_pollset* pollset, g_active_poller = &worker; gpr_mu_unlock(&grpc_polling_mu); grpc_iocp_work(deadline); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&grpc_polling_mu); pollset->is_iocp_worker = 0; g_active_poller = NULL; @@ -160,10 +160,10 @@ grpc_error* grpc_pollset_work(grpc_pollset* pollset, while (!worker.kicked) { if (gpr_cv_wait(&worker.cv, &grpc_polling_mu, grpc_millis_to_timespec(deadline, GPR_CLOCK_REALTIME))) { - ExecCtx::Get()->InvalidateNow(); + grpc_core::ExecCtx::Get()->InvalidateNow(); break; } - ExecCtx::Get()->InvalidateNow(); + grpc_core::ExecCtx::Get()->InvalidateNow(); } } else { pollset->kicked_without_pollers = 0; @@ -171,7 +171,7 @@ grpc_error* grpc_pollset_work(grpc_pollset* pollset, done: if (!grpc_closure_list_empty(exec_ctx->closure_list)) { gpr_mu_unlock(&grpc_polling_mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&grpc_polling_mu); } if (added_worker) { diff --git a/src/core/lib/iomgr/resolve_address_uv.cc b/src/core/lib/iomgr/resolve_address_uv.cc index ffd70c4f35e..54adf9b9f6b 100644 --- a/src/core/lib/iomgr/resolve_address_uv.cc +++ b/src/core/lib/iomgr/resolve_address_uv.cc @@ -114,7 +114,7 @@ static grpc_error* handle_addrinfo_result(int status, struct addrinfo* result, static void getaddrinfo_callback(uv_getaddrinfo_t* req, int status, struct addrinfo* res) { request* r = (request*)req->data; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_error* error; int retry_status; char* port = r->port; diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc index 8fee585f4bb..11cb5ddbeeb 100644 --- a/src/core/lib/iomgr/resource_quota.cc +++ b/src/core/lib/iomgr/resource_quota.cc @@ -622,7 +622,7 @@ void grpc_resource_quota_unref_internal(grpc_resource_quota* resource_quota) { /* Public API */ void grpc_resource_quota_unref(grpc_resource_quota* resource_quota) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_quota_unref_internal(resource_quota); } @@ -647,7 +647,7 @@ double grpc_resource_quota_get_memory_pressure( /* Public API */ void grpc_resource_quota_resize(grpc_resource_quota* resource_quota, size_t size) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; rq_resize_args* a = (rq_resize_args*)gpr_malloc(sizeof(*a)); a->resource_quota = grpc_resource_quota_ref_internal(resource_quota); a->size = (int64_t)size; diff --git a/src/core/lib/iomgr/tcp_client_uv.cc b/src/core/lib/iomgr/tcp_client_uv.cc index 7454b014451..0bf3a043df7 100644 --- a/src/core/lib/iomgr/tcp_client_uv.cc +++ b/src/core/lib/iomgr/tcp_client_uv.cc @@ -76,7 +76,7 @@ static void uv_tc_on_alarm(void* acp, grpc_error* error) { static void uv_tc_on_connect(uv_connect_t* req, int status) { grpc_uv_tcp_connect* connect = (grpc_uv_tcp_connect*)req->data; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_error* error = GRPC_ERROR_NONE; int done; grpc_closure* closure = connect->closure; @@ -105,7 +105,7 @@ static void uv_tc_on_connect(uv_connect_t* req, int status) { } done = (--connect->refs == 0); if (done) { - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); uv_tcp_connect_cleanup(connect); } GRPC_CLOSURE_SCHED(closure, error); diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index de3dabd7fc6..04d4440f9e6 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -130,7 +130,7 @@ static void run_poller(void* bp, grpc_error* error_ignored) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p run", p); } gpr_mu_lock(p->pollset_mu); - grpc_millis deadline = ExecCtx::Get()->Now() + 13 * GPR_MS_PER_SEC; + grpc_millis deadline = grpc_core::ExecCtx::Get()->Now() + 13 * GPR_MS_PER_SEC; GRPC_STATS_INC_TCP_BACKUP_POLLER_POLLS(); GRPC_LOG_IF_ERROR( "backup_poller:pollset_work", diff --git a/src/core/lib/iomgr/tcp_server_uv.cc b/src/core/lib/iomgr/tcp_server_uv.cc index 9db2cbe58d0..daa7afe95fd 100644 --- a/src/core/lib/iomgr/tcp_server_uv.cc +++ b/src/core/lib/iomgr/tcp_server_uv.cc @@ -137,7 +137,7 @@ static void finish_shutdown(grpc_tcp_server* s) { static void handle_close_callback(uv_handle_t* handle) { grpc_tcp_listener* sp = (grpc_tcp_listener*)handle->data; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; sp->server->open_ports--; if (sp->server->open_ports == 0 && sp->server->shutdown) { finish_shutdown(sp->server); @@ -174,9 +174,9 @@ void grpc_tcp_server_unref(grpc_tcp_server* s) { GRPC_UV_ASSERT_SAME_THREAD(); if (gpr_unref(&s->refs)) { /* Complete shutdown_starting work before destroying. */ - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_CLOSURE_LIST_SCHED(&s->shutdown_starting); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); tcp_server_destroy(s); } } @@ -223,7 +223,7 @@ static void finish_accept(grpc_tcp_listener* sp) { static void on_connect(uv_stream_t* server, int status) { grpc_tcp_listener* sp = (grpc_tcp_listener*)server->data; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; if (status < 0) { switch (status) { diff --git a/src/core/lib/iomgr/tcp_uv.cc b/src/core/lib/iomgr/tcp_uv.cc index 3ea96748407..742ab9a754c 100644 --- a/src/core/lib/iomgr/tcp_uv.cc +++ b/src/core/lib/iomgr/tcp_uv.cc @@ -112,7 +112,7 @@ static void tcp_ref(grpc_tcp* tcp) { gpr_ref(&tcp->refcount); } #endif static void uv_close_callback(uv_handle_t* handle) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_tcp* tcp = (grpc_tcp*)handle->data; TCP_UNREF(tcp, "destroy"); } @@ -124,7 +124,7 @@ static grpc_slice alloc_read_slice(grpc_resource_user* resource_user) { static void alloc_uv_buf(uv_handle_t* handle, size_t suggested_size, uv_buf_t* buf) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_tcp* tcp = (grpc_tcp*)handle->data; (void)suggested_size; buf->base = (char*)GRPC_SLICE_START_PTR(tcp->read_slice); @@ -135,7 +135,7 @@ static void read_callback(uv_stream_t* stream, ssize_t nread, const uv_buf_t* buf) { grpc_slice sub; grpc_error* error; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_tcp* tcp = (grpc_tcp*)stream->data; grpc_closure* cb = tcp->read_cb; if (nread == 0) { @@ -204,7 +204,7 @@ static void uv_endpoint_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, static void write_callback(uv_write_t* req, int status) { grpc_tcp* tcp = (grpc_tcp*)req->data; grpc_error* error; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_closure* cb = tcp->write_cb; tcp->write_cb = NULL; TCP_UNREF(tcp, "write"); @@ -355,7 +355,7 @@ grpc_endpoint* grpc_tcp_create(uv_tcp_t* handle, grpc_resource_quota* resource_quota, char* peer_string) { grpc_tcp* tcp = (grpc_tcp*)gpr_malloc(sizeof(grpc_tcp)); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; if (GRPC_TRACER_ON(grpc_tcp_trace)) { gpr_log(GPR_DEBUG, "Creating TCP endpoint %p", tcp); diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index d5e6066f35e..ae827016760 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -249,7 +249,7 @@ void grpc_timer_list_init() { g_shared_mutables.initialized = true; g_shared_mutables.checker_mu = GPR_SPINLOCK_INITIALIZER; gpr_mu_init(&g_shared_mutables.mu); - g_shared_mutables.min_timer = ExecCtx::Get()->Now(); + g_shared_mutables.min_timer = grpc_core::ExecCtx::Get()->Now(); gpr_tls_init(&g_last_seen_min_timer); gpr_tls_set(&g_last_seen_min_timer, 0); grpc_register_tracer(&grpc_timer_trace); @@ -341,7 +341,7 @@ void grpc_timer_init(grpc_timer* timer, grpc_millis deadline, if (GRPC_TRACER_ON(grpc_timer_trace)) { gpr_log(GPR_DEBUG, "TIMER %p: SET %" PRIdPTR " now %" PRIdPTR " call %p[%p]", timer, - deadline, ExecCtx::Get()->Now(), closure, closure->cb); + deadline, grpc_core::ExecCtx::Get()->Now(), closure, closure->cb); } if (!g_shared_mutables.initialized) { @@ -354,7 +354,7 @@ void grpc_timer_init(grpc_timer* timer, grpc_millis deadline, gpr_mu_lock(&shard->mu); timer->pending = true; - grpc_millis now = ExecCtx::Get()->Now(); + grpc_millis now = grpc_core::ExecCtx::Get()->Now(); if (deadline <= now) { timer->pending = false; GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_NONE); @@ -607,7 +607,7 @@ static grpc_timer_check_result run_some_expired_timers(gpr_atm now, grpc_timer_check_result grpc_timer_check(grpc_millis* next) { // prelude - grpc_millis now = ExecCtx::Get()->Now(); + grpc_millis now = grpc_core::ExecCtx::Get()->Now(); /* fetch from a thread-local first: this avoids contention on a globally mutable cacheline in the common case */ diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc index 69adb673d86..6a43f4fadb2 100644 --- a/src/core/lib/iomgr/timer_manager.cc +++ b/src/core/lib/iomgr/timer_manager.cc @@ -98,7 +98,7 @@ static void start_timer_thread_and_unlock(void) { } void grpc_timer_manager_tick() { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_millis next = GRPC_MILLIS_INF_FUTURE; grpc_timer_check(&next); } @@ -125,7 +125,7 @@ static void run_some_timers() { if (GRPC_TRACER_ON(grpc_timer_check_trace)) { gpr_log(GPR_DEBUG, "flush exec_ctx"); } - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&g_mu); // garbage collect any threads hanging out that are dead gc_completed_threads(); @@ -178,7 +178,7 @@ static bool wait_until(grpc_millis next) { g_timed_waiter_deadline = next; if (GRPC_TRACER_ON(grpc_timer_check_trace)) { - grpc_millis wait_time = next - ExecCtx::Get()->Now(); + grpc_millis wait_time = next - grpc_core::ExecCtx::Get()->Now(); gpr_log(GPR_DEBUG, "sleep for a %" PRIdPTR " milliseconds", wait_time); } @@ -223,7 +223,7 @@ static bool wait_until(grpc_millis next) { static void timer_main_loop() { for (;;) { grpc_millis next = GRPC_MILLIS_INF_FUTURE; - ExecCtx::Get()->InvalidateNow(); + grpc_core::ExecCtx::Get()->InvalidateNow(); // check timer state, updates next to the next time to run a check switch (grpc_timer_check(&next)) { case GRPC_TIMERS_FIRED: @@ -273,7 +273,7 @@ static void timer_thread_cleanup(completed_thread* ct) { static void timer_thread(void* completed_thread_ptr) { // this threads exec_ctx: we try to run things through to completion here // since it's easy to spin up new threads - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; timer_main_loop(); timer_thread_cleanup((completed_thread*)completed_thread_ptr); diff --git a/src/core/lib/iomgr/timer_uv.cc b/src/core/lib/iomgr/timer_uv.cc index 6edd4169f12..1432eba51ef 100644 --- a/src/core/lib/iomgr/timer_uv.cc +++ b/src/core/lib/iomgr/timer_uv.cc @@ -45,7 +45,7 @@ static void stop_uv_timer(uv_timer_t* handle) { void run_expired_timer(uv_timer_t* handle) { grpc_timer* timer = (grpc_timer*)handle->data; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_UV_ASSERT_SAME_THREAD(); GPR_ASSERT(timer->pending); timer->pending = 0; @@ -59,13 +59,13 @@ void grpc_timer_init(grpc_timer* timer, grpc_millis deadline, uv_timer_t* uv_timer; GRPC_UV_ASSERT_SAME_THREAD(); timer->closure = closure; - if (deadline <= ExecCtx::Get()->Now()) { + if (deadline <= grpc_core::ExecCtx::Get()->Now()) { timer->pending = 0; GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_NONE); return; } timer->pending = 1; - timeout = (uint64_t)(deadline - ExecCtx::Get()->Now()); + timeout = (uint64_t)(deadline - grpc_core::ExecCtx::Get()->Now()); uv_timer = (uv_timer_t*)gpr_malloc(sizeof(uv_timer_t)); uv_timer_init(uv_default_loop(), uv_timer); uv_timer->data = timer; diff --git a/src/core/lib/security/context/security_context.cc b/src/core/lib/security/context/security_context.cc index 9b58b3657fd..570db788824 100644 --- a/src/core/lib/security/context/security_context.cc +++ b/src/core/lib/security/context/security_context.cc @@ -38,7 +38,7 @@ grpc_tracer_flag grpc_trace_auth_context_refcount = grpc_call_error grpc_call_set_credentials(grpc_call* call, grpc_call_credentials* creds) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_client_security_context* ctx = NULL; GRPC_API_TRACE("grpc_call_set_credentials(call=%p, creds=%p)", 2, (call, creds)); @@ -87,7 +87,7 @@ grpc_client_security_context* grpc_client_security_context_create(void) { } void grpc_client_security_context_destroy(void* ctx) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_client_security_context* c = (grpc_client_security_context*)ctx; grpc_call_credentials_unref(c->creds); GRPC_AUTH_CONTEXT_UNREF(c->auth_context, "client_security_context"); diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index 6a272653f80..5181f7f2600 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -72,7 +72,7 @@ void grpc_channel_credentials_unref(grpc_channel_credentials* creds) { void grpc_channel_credentials_release(grpc_channel_credentials* creds) { GRPC_API_TRACE("grpc_channel_credentials_release(creds=%p)", 1, (creds)); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_credentials_unref(creds); } @@ -94,7 +94,7 @@ void grpc_call_credentials_unref(grpc_call_credentials* creds) { void grpc_call_credentials_release(grpc_call_credentials* creds) { GRPC_API_TRACE("grpc_call_credentials_release(creds=%p)", 1, (creds)); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_call_credentials_unref(creds); } @@ -209,7 +209,7 @@ void grpc_server_credentials_unref(grpc_server_credentials* creds) { void grpc_server_credentials_release(grpc_server_credentials* creds) { GRPC_API_TRACE("grpc_server_credentials_release(creds=%p)", 1, (creds)); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_server_credentials_unref(creds); } diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc index 03ec4bc3b3d..a8991943b01 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc @@ -114,13 +114,13 @@ static int is_stack_running_on_compute_engine() { grpc_resource_quota_create("google_default_credentials"); grpc_httpcli_get( &context, &detector.pollent, resource_quota, &request, - ExecCtx::Get()->Now() + max_detection_delay, + grpc_core::ExecCtx::Get()->Now() + max_detection_delay, GRPC_CLOSURE_CREATE(on_compute_engine_detection_http_response, &detector, grpc_schedule_on_exec_ctx), &detector.response); grpc_resource_quota_unref_internal(resource_quota); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); /* Block until we get the response. This is not ideal but this should only be called once for the lifetime of the process by the default credentials. */ @@ -144,7 +144,7 @@ static int is_stack_running_on_compute_engine() { grpc_pollset_shutdown(grpc_polling_entity_pollset(&detector.pollent), &destroy_closure); g_polling_mu = NULL; - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_free(grpc_polling_entity_pollset(&detector.pollent)); grpc_http_response_destroy(&detector.response); @@ -220,7 +220,7 @@ grpc_channel_credentials* grpc_google_default_credentials_create(void) { grpc_error* error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Failed to create Google credentials"); grpc_error* err; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_API_TRACE("grpc_google_default_credentials_create(void)", 0, ()); @@ -290,7 +290,7 @@ end: } void grpc_flush_cached_google_default_credentials(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_once_init(&g_once, init_default_credentials); gpr_mu_lock(&g_state_mu); if (default_credentials != NULL) { diff --git a/src/core/lib/security/credentials/iam/iam_credentials.cc b/src/core/lib/security/credentials/iam/iam_credentials.cc index 4d9da0cbe3d..9f3a86877bf 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.cc +++ b/src/core/lib/security/credentials/iam/iam_credentials.cc @@ -54,7 +54,7 @@ static grpc_call_credentials_vtable iam_vtable = { grpc_call_credentials* grpc_google_iam_credentials_create( const char* token, const char* authority_selector, void* reserved) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_API_TRACE( "grpc_iam_credentials_create(token=%s, authority_selector=%s, " "reserved=%p)", diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.cc b/src/core/lib/security/credentials/jwt/jwt_credentials.cc index ccc3f4aeed5..3facce17985 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.cc +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.cc @@ -181,7 +181,7 @@ grpc_call_credentials* grpc_service_account_jwt_access_credentials_create( gpr_free(clean_json); } GPR_ASSERT(reserved == NULL); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_call_credentials* creds = grpc_service_account_jwt_access_credentials_create_from_auth_json_key( grpc_auth_json_key_create_from_string(json_key), token_lifetime); diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.cc b/src/core/lib/security/credentials/jwt/jwt_verifier.cc index 5246e1f9859..dd0d206b019 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.cc +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.cc @@ -347,7 +347,7 @@ static verifier_cb_ctx* verifier_cb_ctx_create( grpc_jwt_claims* claims, const char* audience, grpc_slice signature, const char* signed_jwt, size_t signed_jwt_len, void* user_data, grpc_jwt_verification_done_cb cb) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; verifier_cb_ctx* ctx = (verifier_cb_ctx*)gpr_zalloc(sizeof(verifier_cb_ctx)); ctx->verifier = verifier; ctx->pollent = grpc_polling_entity_create_from_pollset(pollset); @@ -702,7 +702,7 @@ static void on_openid_config_retrieved(void* user_data, grpc_error* error) { resource_quota = grpc_resource_quota_create("jwt_verifier"); grpc_httpcli_get( &ctx->verifier->http_ctx, &ctx->pollent, resource_quota, &req, - ExecCtx::Get()->Now() + grpc_jwt_verifier_max_delay, + grpc_core::ExecCtx::Get()->Now() + grpc_jwt_verifier_max_delay, GRPC_CLOSURE_CREATE(on_keys_retrieved, ctx, grpc_schedule_on_exec_ctx), &ctx->responses[HTTP_RESPONSE_KEYS]); grpc_resource_quota_unref_internal(resource_quota); @@ -827,9 +827,10 @@ static void retrieve_key_and_verify(verifier_cb_ctx* ctx) { channel. This would allow us to cancel an authentication query when under extreme memory pressure. */ resource_quota = grpc_resource_quota_create("jwt_verifier"); - grpc_httpcli_get(&ctx->verifier->http_ctx, &ctx->pollent, resource_quota, - &req, ExecCtx::Get()->Now() + grpc_jwt_verifier_max_delay, - http_cb, &ctx->responses[rsp_idx]); + grpc_httpcli_get( + &ctx->verifier->http_ctx, &ctx->pollent, resource_quota, &req, + grpc_core::ExecCtx::Get()->Now() + grpc_jwt_verifier_max_delay, http_cb, + &ctx->responses[rsp_idx]); grpc_resource_quota_unref_internal(resource_quota); gpr_free(req.host); gpr_free(req.http.path); diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index b6537056093..71be15a46eb 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -217,7 +217,7 @@ static void on_oauth2_token_fetcher_http_response(void* user_data, c->token_fetch_pending = false; c->access_token_md = GRPC_MDELEM_REF(access_token_md); c->token_expiration = status == GRPC_CREDENTIALS_OK - ? ExecCtx::Get()->Now() + token_lifetime + ? grpc_core::ExecCtx::Get()->Now() + token_lifetime : 0; grpc_oauth2_pending_get_request_metadata* pending_request = c->pending_requests; @@ -256,7 +256,8 @@ static bool oauth2_token_fetcher_get_request_metadata( grpc_mdelem cached_access_token_md = GRPC_MDNULL; gpr_mu_lock(&c->mu); if (!GRPC_MDISNULL(c->access_token_md) && - (c->token_expiration - ExecCtx::Get()->Now() > refresh_threshold)) { + (c->token_expiration - grpc_core::ExecCtx::Get()->Now() > + refresh_threshold)) { cached_access_token_md = GRPC_MDELEM_REF(c->access_token_md); } if (!GRPC_MDISNULL(cached_access_token_md)) { @@ -288,7 +289,7 @@ static bool oauth2_token_fetcher_get_request_metadata( c->fetch_func(grpc_credentials_metadata_request_create(creds), &c->httpcli_context, &c->pollent, on_oauth2_token_fetcher_http_response, - ExecCtx::Get()->Now() + refresh_threshold); + grpc_core::ExecCtx::Get()->Now() + refresh_threshold); } return false; } @@ -514,7 +515,7 @@ grpc_call_credentials* grpc_access_token_credentials_create( gpr_ref_init(&c->base.refcount, 1); char* token_md_value; gpr_asprintf(&token_md_value, "Bearer %s", access_token); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; c->access_token_md = grpc_mdelem_from_slices( grpc_slice_from_static_string(GRPC_AUTHORIZATION_METADATA_KEY), grpc_slice_from_copied_string(token_md_value)); diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.cc b/src/core/lib/security/credentials/plugin/plugin_credentials.cc index 025d024617b..7634cadc3a9 100644 --- a/src/core/lib/security/credentials/plugin/plugin_credentials.cc +++ b/src/core/lib/security/credentials/plugin/plugin_credentials.cc @@ -116,8 +116,8 @@ static void plugin_md_request_metadata_ready(void* request, grpc_status_code status, const char* error_details) { /* called from application code */ - ExecCtx _local_exec_ctx(GRPC_EXEC_CTX_FLAG_IS_FINISHED | - GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP); + grpc_core::ExecCtx _local_exec_ctx(GRPC_EXEC_CTX_FLAG_IS_FINISHED | + GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP); grpc_plugin_credentials_pending_request* r = (grpc_plugin_credentials_pending_request*)request; if (GRPC_TRACER_ON(grpc_plugin_credentials_trace)) { diff --git a/src/core/lib/security/transport/security_handshaker.cc b/src/core/lib/security/transport/security_handshaker.cc index 4ed2ec55bd8..0df3375d342 100644 --- a/src/core/lib/security/transport/security_handshaker.cc +++ b/src/core/lib/security/transport/security_handshaker.cc @@ -255,7 +255,7 @@ static void on_handshake_next_done_grpc_wrapper( security_handshaker* h = (security_handshaker*)user_data; // This callback will be invoked by TSI in a non-grpc thread, so it's // safe to create our own exec_ctx here. - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_mu_lock(&h->mu); grpc_error* error = on_handshake_next_done_locked( h, result, bytes_to_send, bytes_to_send_size, handshaker_result); diff --git a/src/core/lib/security/transport/server_auth_filter.cc b/src/core/lib/security/transport/server_auth_filter.cc index 86817076f83..5f5ff7c09cc 100644 --- a/src/core/lib/security/transport/server_auth_filter.cc +++ b/src/core/lib/security/transport/server_auth_filter.cc @@ -118,7 +118,7 @@ static void on_md_processing_done( grpc_status_code status, const char* error_details) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; // If the call was not cancelled while we were in flight, process the result. if (gpr_atm_full_cas(&calld->state, (gpr_atm)STATE_INIT, (gpr_atm)STATE_DONE)) { diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc index 6e1554d471e..3604bb77a8e 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc @@ -67,7 +67,7 @@ grpc_slice grpc_slice_ref(grpc_slice slice) { /* Public API */ void grpc_slice_unref(grpc_slice slice) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_slice_unref_internal(slice); } diff --git a/src/core/lib/slice/slice_buffer.cc b/src/core/lib/slice/slice_buffer.cc index 4bc54c303f6..0a4d48f1140 100644 --- a/src/core/lib/slice/slice_buffer.cc +++ b/src/core/lib/slice/slice_buffer.cc @@ -73,7 +73,7 @@ void grpc_slice_buffer_destroy_internal(grpc_slice_buffer* sb) { } void grpc_slice_buffer_destroy(grpc_slice_buffer* sb) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_slice_buffer_destroy_internal(sb); } @@ -172,7 +172,7 @@ void grpc_slice_buffer_reset_and_unref_internal(grpc_slice_buffer* sb) { } void grpc_slice_buffer_reset_and_unref(grpc_slice_buffer* sb) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_slice_buffer_reset_and_unref_internal(sb); } diff --git a/src/core/lib/surface/alarm.cc b/src/core/lib/surface/alarm.cc index 7aee100f3f5..8dcfb1ddb5c 100644 --- a/src/core/lib/surface/alarm.cc +++ b/src/core/lib/surface/alarm.cc @@ -47,7 +47,7 @@ static void alarm_ref(grpc_alarm* alarm) { gpr_ref(&alarm->refs); } static void alarm_unref(grpc_alarm* alarm) { if (gpr_unref(&alarm->refs)) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; if (alarm->cq != NULL) { GRPC_CQ_INTERNAL_UNREF(alarm->cq, "alarm"); } @@ -117,7 +117,7 @@ grpc_alarm* grpc_alarm_create(void* reserved) { void grpc_alarm_set(grpc_alarm* alarm, grpc_completion_queue* cq, gpr_timespec deadline, void* tag, void* reserved) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_CQ_INTERNAL_REF(cq, "alarm"); alarm->cq = cq; @@ -129,7 +129,7 @@ void grpc_alarm_set(grpc_alarm* alarm, grpc_completion_queue* cq, } void grpc_alarm_cancel(grpc_alarm* alarm, void* reserved) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_timer_cancel(&alarm->alarm); } diff --git a/src/core/lib/surface/byte_buffer.cc b/src/core/lib/surface/byte_buffer.cc index 6a9b13bb416..03097c6896a 100644 --- a/src/core/lib/surface/byte_buffer.cc +++ b/src/core/lib/surface/byte_buffer.cc @@ -71,7 +71,7 @@ grpc_byte_buffer* grpc_byte_buffer_copy(grpc_byte_buffer* bb) { void grpc_byte_buffer_destroy(grpc_byte_buffer* bb) { if (!bb) return; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; switch (bb->type) { case GRPC_BB_RAW: grpc_slice_buffer_destroy_internal(&bb->data.raw.slice_buffer); diff --git a/src/core/lib/surface/byte_buffer_reader.cc b/src/core/lib/surface/byte_buffer_reader.cc index 9a9e26ecdc8..c5f8df3ddab 100644 --- a/src/core/lib/surface/byte_buffer_reader.cc +++ b/src/core/lib/surface/byte_buffer_reader.cc @@ -42,7 +42,7 @@ static int is_compressed(grpc_byte_buffer* buffer) { int grpc_byte_buffer_reader_init(grpc_byte_buffer_reader* reader, grpc_byte_buffer* buffer) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_slice_buffer decompressed_slices_buffer; reader->buffer_in = buffer; switch (reader->buffer_in->type) { @@ -110,7 +110,7 @@ grpc_slice grpc_byte_buffer_reader_readall(grpc_byte_buffer_reader* reader) { grpc_slice out_slice = GRPC_SLICE_MALLOC(input_size); uint8_t* const outbuf = GRPC_SLICE_START_PTR(out_slice); /* just an alias */ - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (grpc_byte_buffer_reader_next(reader, &in_slice) != 0) { const size_t slice_length = GRPC_SLICE_LENGTH(in_slice); memcpy(&(outbuf[bytes_read]), GRPC_SLICE_START_PTR(in_slice), slice_length); diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index bbb7a39e294..cb858785f29 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -561,7 +561,7 @@ void grpc_call_unref(grpc_call* c) { if (!gpr_unref(&c->ext_ref)) return; child_call* cc = c->child; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GPR_TIMER_BEGIN("grpc_call_unref", 0); GRPC_API_TRACE("grpc_call_unref(c=%p)", 1, (c)); @@ -602,7 +602,7 @@ void grpc_call_unref(grpc_call* c) { grpc_call_error grpc_call_cancel(grpc_call* call, void* reserved) { GRPC_API_TRACE("grpc_call_cancel(call=%p, reserved=%p)", 2, (call, reserved)); GPR_ASSERT(!reserved); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; cancel_with_error(call, STATUS_FROM_API_OVERRIDE, GRPC_ERROR_CANCELLED); return GRPC_CALL_OK; @@ -652,7 +652,7 @@ grpc_call_error grpc_call_cancel_with_status(grpc_call* c, grpc_status_code status, const char* description, void* reserved) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_API_TRACE( "grpc_call_cancel_with_status(" "c=%p, status=%d, description=%s, reserved=%p)", @@ -2034,7 +2034,7 @@ done_with_error: grpc_call_error grpc_call_start_batch(grpc_call* call, const grpc_op* ops, size_t nops, void* tag, void* reserved) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_call_error err; GRPC_API_TRACE( diff --git a/src/core/lib/surface/call_details.cc b/src/core/lib/surface/call_details.cc index 03ce7f88fbc..7d81ba9e22a 100644 --- a/src/core/lib/surface/call_details.cc +++ b/src/core/lib/surface/call_details.cc @@ -34,7 +34,7 @@ void grpc_call_details_init(grpc_call_details* cd) { void grpc_call_details_destroy(grpc_call_details* cd) { GRPC_API_TRACE("grpc_call_details_destroy(cd=%p)", 1, (cd)); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_slice_unref_internal(cd->method); grpc_slice_unref_internal(cd->host); } diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc index 7725351f74e..80ba47676e4 100644 --- a/src/core/lib/surface/channel.cc +++ b/src/core/lib/surface/channel.cc @@ -248,7 +248,7 @@ char* grpc_channel_get_target(grpc_channel* channel) { void grpc_channel_get_info(grpc_channel* channel, const grpc_channel_info* channel_info) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_element* elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CHANNEL(channel), 0); elem->filter->get_channel_info(elem, channel_info); @@ -296,7 +296,7 @@ grpc_call* grpc_channel_create_call(grpc_channel* channel, grpc_slice method, const grpc_slice* host, gpr_timespec deadline, void* reserved) { GPR_ASSERT(!reserved); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_call* call = grpc_channel_create_call_internal( channel, parent_call, propagation_mask, cq, NULL, grpc_mdelem_from_slices(GRPC_MDSTR_PATH, grpc_slice_ref_internal(method)), @@ -329,7 +329,7 @@ void* grpc_channel_register_call(grpc_channel* channel, const char* method, "grpc_channel_register_call(channel=%p, method=%s, host=%s, reserved=%p)", 4, (channel, method, host, reserved)); GPR_ASSERT(!reserved); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; rc->path = grpc_mdelem_from_slices( GRPC_MDSTR_PATH, @@ -364,7 +364,7 @@ grpc_call* grpc_channel_create_registered_call( registered_call_handle, deadline.tv_sec, deadline.tv_nsec, (int)deadline.clock_type, reserved)); GPR_ASSERT(!reserved); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_call* call = grpc_channel_create_call_internal( channel, parent_call, propagation_mask, completion_queue, NULL, GRPC_MDELEM_REF(rc->path), GRPC_MDELEM_REF(rc->authority), @@ -407,7 +407,7 @@ static void destroy_channel(void* arg, grpc_error* error) { void grpc_channel_destroy(grpc_channel* channel) { grpc_transport_op* op = grpc_make_transport_op(NULL); grpc_channel_element* elem; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_API_TRACE("grpc_channel_destroy(channel=%p)", 1, (channel)); op->disconnect_with_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Channel Destroyed"); diff --git a/src/core/lib/surface/channel_ping.cc b/src/core/lib/surface/channel_ping.cc index 06cdbf6c73d..545b8fe6eef 100644 --- a/src/core/lib/surface/channel_ping.cc +++ b/src/core/lib/surface/channel_ping.cc @@ -51,7 +51,7 @@ void grpc_channel_ping(grpc_channel* channel, grpc_completion_queue* cq, ping_result* pr = (ping_result*)gpr_malloc(sizeof(*pr)); grpc_channel_element* top_elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GPR_ASSERT(reserved == NULL); pr->tag = tag; pr->cq = cq; diff --git a/src/core/lib/surface/completion_queue.cc b/src/core/lib/surface/completion_queue.cc index 0b0a8d070d5..24c502881a4 100644 --- a/src/core/lib/surface/completion_queue.cc +++ b/src/core/lib/surface/completion_queue.cc @@ -124,7 +124,7 @@ static grpc_error* non_polling_poller_work(grpc_pollset* pollset, while (!npp->shutdown && !w.kicked && !gpr_cv_wait(&w.cv, &npp->mu, deadline_ts)) ; - ExecCtx::Get()->InvalidateNow(); + grpc_core::ExecCtx::Get()->InvalidateNow(); if (&w == npp->root) { npp->root = w.next; if (&w == npp->root) { @@ -359,7 +359,7 @@ int grpc_completion_queue_thread_local_cache_flush(grpc_completion_queue* cq, if (storage != NULL && (grpc_completion_queue*)gpr_tls_get(&g_cached_cq) == cq) { *tag = storage->tag; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; *ok = (storage->next & (uintptr_t)(1)) == 1; storage->done(storage->done_arg, storage); ret = 1; @@ -395,7 +395,7 @@ static bool cq_event_queue_push(grpc_cq_event_queue* q, grpc_cq_completion* c) { static grpc_cq_completion* cq_event_queue_pop(grpc_cq_event_queue* q) { grpc_cq_completion* c = NULL; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; if (gpr_spinlock_trylock(&q->queue_lock)) { GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_SUCCESSES(); @@ -440,7 +440,7 @@ grpc_completion_queue* grpc_completion_queue_create_internal( const cq_poller_vtable* poller_vtable = &g_poller_vtable_by_poller_type[polling_type]; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_STATS_INC_CQS_CREATED(); cq = (grpc_completion_queue*)gpr_zalloc(sizeof(grpc_completion_queue) + @@ -790,7 +790,7 @@ typedef struct { bool first_loop; } cq_is_finished_arg; -class ExecCtxNext : public ExecCtx { +class ExecCtxNext : public grpc_core::ExecCtx { public: ExecCtxNext(void* arg) : ExecCtx(0), check_ready_to_finish_arg_(arg) {} @@ -818,7 +818,7 @@ class ExecCtxNext : public ExecCtx { return true; } } - return !a->first_loop && a->deadline < ExecCtx::Get()->Now(); + return !a->first_loop && a->deadline < grpc_core::ExecCtx::Get()->Now(); } private: @@ -929,7 +929,7 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline, } if (!is_finished_arg.first_loop && - ExecCtx::Get()->Now() >= deadline_millis) { + grpc_core::ExecCtx::Get()->Now() >= deadline_millis) { memset(&ret, 0, sizeof(ret)); ret.type = GRPC_QUEUE_TIMEOUT; dump_pending_tags(cq); @@ -1045,7 +1045,7 @@ static void del_plucker(grpc_completion_queue* cq, void* tag, GPR_UNREACHABLE_CODE(return ); } -class ExecCtxPluck : public ExecCtx { +class ExecCtxPluck : public grpc_core::ExecCtx { public: ExecCtxPluck(void* arg) : ExecCtx(0), check_ready_to_finish_arg_(arg) {} @@ -1079,7 +1079,7 @@ class ExecCtxPluck : public ExecCtx { } gpr_mu_unlock(cq->mu); } - return !a->first_loop && a->deadline < ExecCtx::Get()->Now(); + return !a->first_loop && a->deadline < grpc_core::ExecCtx::Get()->Now(); } private: @@ -1169,7 +1169,7 @@ static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, break; } if (!is_finished_arg.first_loop && - ExecCtx::Get()->Now() >= deadline_millis) { + grpc_core::ExecCtx::Get()->Now() >= deadline_millis) { del_plucker(cq, tag, &worker); gpr_mu_unlock(cq->mu); memset(&ret, 0, sizeof(ret)); @@ -1250,7 +1250,7 @@ static void cq_shutdown_pluck(grpc_completion_queue* cq) { /* Shutdown simply drops a ref that we reserved at creation time; if we drop to zero here, then enter shutdown mode and wake up any waiters */ void grpc_completion_queue_shutdown(grpc_completion_queue* cq) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GPR_TIMER_BEGIN("grpc_completion_queue_shutdown", 0); GRPC_API_TRACE("grpc_completion_queue_shutdown(cq=%p)", 1, (cq)); cq->vtable->shutdown(cq); @@ -1263,7 +1263,7 @@ void grpc_completion_queue_destroy(grpc_completion_queue* cq) { GPR_TIMER_BEGIN("grpc_completion_queue_destroy", 0); grpc_completion_queue_shutdown(cq); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_CQ_INTERNAL_UNREF(cq, "destroy"); GPR_TIMER_END("grpc_completion_queue_destroy", 0); diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index 20e17a7f60b..fdbf926f77b 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -116,7 +116,7 @@ void grpc_init(void) { int i; gpr_once_init(&g_basic_init, do_basic_init); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_mu_lock(&g_init_mu); if (++g_initializations == 1) { gpr_time_init(); @@ -175,7 +175,7 @@ void grpc_init(void) { void grpc_shutdown(void) { int i; GRPC_API_TRACE("grpc_shutdown(void)", 0, ()); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_mu_lock(&g_init_mu); if (--g_initializations == 0) { grpc_executor_shutdown(); diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index da081e68cbd..3bbdd212854 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/src/core/lib/surface/lame_client.cc @@ -156,7 +156,7 @@ extern "C" const grpc_channel_filter grpc_lame_filter = { grpc_channel* grpc_lame_client_channel_create(const char* target, grpc_status_code error_code, const char* error_message) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_element* elem; grpc_channel* channel = grpc_channel_create(target, NULL, GRPC_CLIENT_LAME_CHANNEL, NULL); diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc index 0d4435d5563..835e4954955 100644 --- a/src/core/lib/surface/server.cc +++ b/src/core/lib/surface/server.cc @@ -1022,7 +1022,7 @@ static void start_listeners(void* s, grpc_error* error) { void grpc_server_start(grpc_server* server) { size_t i; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_API_TRACE("grpc_server_start(server=%p)", 1, (server)); @@ -1168,7 +1168,7 @@ void grpc_server_shutdown_and_notify(grpc_server* server, listener* l; shutdown_tag* sdt; channel_broadcaster broadcaster; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_API_TRACE("grpc_server_shutdown_and_notify(server=%p, cq=%p, tag=%p)", 3, (server, cq, tag)); @@ -1227,7 +1227,7 @@ void grpc_server_shutdown_and_notify(grpc_server* server, void grpc_server_cancel_all_calls(grpc_server* server) { channel_broadcaster broadcaster; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_API_TRACE("grpc_server_cancel_all_calls(server=%p)", 1, (server)); @@ -1242,7 +1242,7 @@ void grpc_server_cancel_all_calls(grpc_server* server) { void grpc_server_destroy(grpc_server* server) { listener* l; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_API_TRACE("grpc_server_destroy(server=%p)", 1, (server)); @@ -1324,7 +1324,7 @@ grpc_call_error grpc_server_request_call( grpc_completion_queue* cq_bound_to_call, grpc_completion_queue* cq_for_notification, void* tag) { grpc_call_error error; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; requested_call* rc = (requested_call*)gpr_malloc(sizeof(*rc)); GRPC_STATS_INC_SERVER_REQUESTED_CALLS(); GRPC_API_TRACE( @@ -1371,7 +1371,7 @@ grpc_call_error grpc_server_request_registered_call( grpc_completion_queue* cq_bound_to_call, grpc_completion_queue* cq_for_notification, void* tag) { grpc_call_error error; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; requested_call* rc = (requested_call*)gpr_malloc(sizeof(*rc)); registered_method* rm = (registered_method*)rmp; GRPC_STATS_INC_SERVER_REQUESTED_CALLS(); diff --git a/src/core/lib/transport/bdp_estimator.cc b/src/core/lib/transport/bdp_estimator.cc index 4e279b4d94a..d2b6e5db258 100644 --- a/src/core/lib/transport/bdp_estimator.cc +++ b/src/core/lib/transport/bdp_estimator.cc @@ -79,7 +79,7 @@ grpc_millis BdpEstimator::CompletePing() { } ping_state_ = PingState::UNSCHEDULED; accumulator_ = 0; - return ExecCtx::Get()->Now() + inter_ping_delay_; + return grpc_core::ExecCtx::Get()->Now() + inter_ping_delay_; } } // namespace grpc_core diff --git a/src/core/lib/transport/status_conversion.cc b/src/core/lib/transport/status_conversion.cc index 61470b8c784..46cba4292b4 100644 --- a/src/core/lib/transport/status_conversion.cc +++ b/src/core/lib/transport/status_conversion.cc @@ -46,8 +46,9 @@ grpc_status_code grpc_http2_error_to_grpc_status(grpc_http2_error_code error, case GRPC_HTTP2_CANCEL: /* http2 cancel translates to STATUS_CANCELLED iff deadline hasn't been * exceeded */ - return ExecCtx::Get()->Now() > deadline ? GRPC_STATUS_DEADLINE_EXCEEDED - : GRPC_STATUS_CANCELLED; + return grpc_core::ExecCtx::Get()->Now() > deadline + ? GRPC_STATUS_DEADLINE_EXCEEDED + : GRPC_STATUS_CANCELLED; case GRPC_HTTP2_ENHANCE_YOUR_CALM: return GRPC_STATUS_RESOURCE_EXHAUSTED; case GRPC_HTTP2_INADEQUATE_SECURITY: diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc index ca80a7404d3..ed2f02de550 100644 --- a/src/core/lib/transport/transport.cc +++ b/src/core/lib/transport/transport.cc @@ -62,7 +62,8 @@ void grpc_stream_unref(grpc_stream_refcount* refcount, const char* reason) { void grpc_stream_unref(grpc_stream_refcount* refcount) { #endif if (gpr_unref(&refcount->refs)) { - if (ExecCtx::Get()->flags() & GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP) { + if (grpc_core::ExecCtx::Get()->flags() & + GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP) { /* Ick. The thread we're running on MAY be owned (indirectly) by a call-stack. If that's the case, destroying the call-stack MAY try to destroy the diff --git a/src/cpp/common/channel_arguments.cc b/src/cpp/common/channel_arguments.cc index 0bcfac28459..82d687c530d 100644 --- a/src/cpp/common/channel_arguments.cc +++ b/src/cpp/common/channel_arguments.cc @@ -67,7 +67,7 @@ ChannelArguments::ChannelArguments(const ChannelArguments& other) } ChannelArguments::~ChannelArguments() { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; for (auto it = args_.begin(); it != args_.end(); ++it) { if (it->type == GRPC_ARG_POINTER) { it->value.pointer.vtable->destroy(it->value.pointer.p); @@ -95,7 +95,7 @@ void ChannelArguments::SetSocketMutator(grpc_socket_mutator* mutator) { } grpc_arg mutator_arg = grpc_socket_mutator_to_arg(mutator); bool replaced = false; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; for (auto it = args_.begin(); it != args_.end(); ++it) { if (it->type == mutator_arg.type && grpc::string(it->key) == grpc::string(mutator_arg.key)) { diff --git a/test/core/backoff/backoff_test.cc b/test/core/backoff/backoff_test.cc index 739ab86bb23..76a9f39c35a 100644 --- a/test/core/backoff/backoff_test.cc +++ b/test/core/backoff/backoff_test.cc @@ -32,19 +32,23 @@ static void test_constant_backoff(void) { const grpc_millis max_backoff = 1000; grpc_backoff_init(&backoff, initial_backoff, multiplier, jitter, min_connect_timeout, max_backoff); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_backoff_result next_deadlines = grpc_backoff_begin(&backoff); - GPR_ASSERT(next_deadlines.current_deadline - ExecCtx::Get()->Now() == + GPR_ASSERT(next_deadlines.current_deadline - + grpc_core::ExecCtx::Get()->Now() == initial_backoff); - GPR_ASSERT(next_deadlines.next_attempt_start_time - ExecCtx::Get()->Now() == + GPR_ASSERT(next_deadlines.next_attempt_start_time - + grpc_core::ExecCtx::Get()->Now() == initial_backoff); for (int i = 0; i < 10000; i++) { next_deadlines = grpc_backoff_step(&backoff); - GPR_ASSERT(next_deadlines.current_deadline - ExecCtx::Get()->Now() == + GPR_ASSERT(next_deadlines.current_deadline - + grpc_core::ExecCtx::Get()->Now() == initial_backoff); - GPR_ASSERT(next_deadlines.next_attempt_start_time - ExecCtx::Get()->Now() == + GPR_ASSERT(next_deadlines.next_attempt_start_time - + grpc_core::ExecCtx::Get()->Now() == initial_backoff); - ExecCtx::Get()->SetNow(next_deadlines.current_deadline); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); } } @@ -57,15 +61,15 @@ static void test_min_connect(void) { const grpc_millis max_backoff = 1000; grpc_backoff_init(&backoff, initial_backoff, multiplier, jitter, min_connect_timeout, max_backoff); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_backoff_result next = grpc_backoff_begin(&backoff); // Because the min_connect_timeout > initial_backoff, current_deadline is used // as the deadline for the current attempt. - GPR_ASSERT(next.current_deadline - ExecCtx::Get()->Now() == + GPR_ASSERT(next.current_deadline - grpc_core::ExecCtx::Get()->Now() == min_connect_timeout); // ... while, if the current attempt fails, the next one will happen after // initial_backoff. - GPR_ASSERT(next.next_attempt_start_time - ExecCtx::Get()->Now() == + GPR_ASSERT(next.next_attempt_start_time - grpc_core::ExecCtx::Get()->Now() == initial_backoff); } @@ -80,45 +84,45 @@ static void test_no_jitter_backoff(void) { min_connect_timeout, max_backoff); // x_1 = 2 // x_n = 2**i + x_{i-1} ( = 2**(n+1) - 2 ) - ExecCtx _local_exec_ctx; - ExecCtx::Get()->SetNow(0); + grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx::Get()->TestOnlySetNow(0); grpc_backoff_result next_deadlines = grpc_backoff_begin(&backoff); GPR_ASSERT(next_deadlines.current_deadline == next_deadlines.next_attempt_start_time); GPR_ASSERT(next_deadlines.current_deadline == 2); - ExecCtx::Get()->SetNow(next_deadlines.current_deadline); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 6); - ExecCtx::Get()->SetNow(next_deadlines.current_deadline); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 14); - ExecCtx::Get()->SetNow(next_deadlines.current_deadline); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 30); - ExecCtx::Get()->SetNow(next_deadlines.current_deadline); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 62); - ExecCtx::Get()->SetNow(next_deadlines.current_deadline); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 126); - ExecCtx::Get()->SetNow(next_deadlines.current_deadline); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 254); - ExecCtx::Get()->SetNow(next_deadlines.current_deadline); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 510); - ExecCtx::Get()->SetNow(next_deadlines.current_deadline); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 1022); - ExecCtx::Get()->SetNow(next_deadlines.current_deadline); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); // Hit the maximum timeout. From this point onwards, retries will increase // only by max timeout. GPR_ASSERT(next_deadlines.current_deadline == 1535); - ExecCtx::Get()->SetNow(next_deadlines.current_deadline); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 2048); - ExecCtx::Get()->SetNow(next_deadlines.current_deadline); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 2561); } @@ -136,11 +140,13 @@ static void test_jitter_backoff(void) { backoff.rng_state = 0; // force consistent PRNG - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_backoff_result next_deadlines = grpc_backoff_begin(&backoff); - GPR_ASSERT(next_deadlines.current_deadline - ExecCtx::Get()->Now() == + GPR_ASSERT(next_deadlines.current_deadline - + grpc_core::ExecCtx::Get()->Now() == initial_backoff); - GPR_ASSERT(next_deadlines.next_attempt_start_time - ExecCtx::Get()->Now() == + GPR_ASSERT(next_deadlines.next_attempt_start_time - + grpc_core::ExecCtx::Get()->Now() == initial_backoff); grpc_millis expected_next_lower_bound = @@ -153,7 +159,7 @@ static void test_jitter_backoff(void) { // next-now must be within (jitter*100)% of the current backoff (which // increases by * multiplier up to max_backoff). const grpc_millis timeout_millis = - next_deadlines.current_deadline - ExecCtx::Get()->Now(); + next_deadlines.current_deadline - grpc_core::ExecCtx::Get()->Now(); GPR_ASSERT(timeout_millis >= expected_next_lower_bound); GPR_ASSERT(timeout_millis <= expected_next_upper_bound); current_backoff = GPR_MIN( @@ -162,7 +168,7 @@ static void test_jitter_backoff(void) { (grpc_millis)((double)current_backoff * (1 - jitter)); expected_next_upper_bound = (grpc_millis)((double)current_backoff * (1 + jitter)); - ExecCtx::Get()->SetNow(next_deadlines.current_deadline); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); } } diff --git a/test/core/bad_client/bad_client.cc b/test/core/bad_client/bad_client.cc index bc9e65089c8..b7c9404638a 100644 --- a/test/core/bad_client/bad_client.cc +++ b/test/core/bad_client/bad_client.cc @@ -57,7 +57,7 @@ static void done_write(void* arg, grpc_error* error) { static void server_setup_transport(void* ts, grpc_transport* transport) { thd_args* a = (thd_args*)ts; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_server_setup_transport(a->server, transport, NULL, grpc_server_get_channel_args(a->server)); } @@ -80,7 +80,7 @@ void grpc_run_bad_client_test( grpc_slice_from_copied_buffer(client_payload, client_payload_length); grpc_slice_buffer outgoing; grpc_closure done_write_closure; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_completion_queue* shutdown_cq; if (client_payload_length < 4 * 1024) { diff --git a/test/core/channel/channel_args_test.cc b/test/core/channel/channel_args_test.cc index f0393b0f400..eb2654e6a91 100644 --- a/test/core/channel/channel_args_test.cc +++ b/test/core/channel/channel_args_test.cc @@ -26,7 +26,7 @@ #include "test/core/util/test_config.h" static void test_create(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_arg arg_int; grpc_arg arg_string; @@ -59,7 +59,7 @@ static void test_create(void) { } static void test_set_compression_algorithm(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args* ch_args; ch_args = @@ -73,7 +73,7 @@ static void test_set_compression_algorithm(void) { } static void test_compression_algorithm_states(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args *ch_args, *ch_args_wo_gzip, *ch_args_wo_gzip_deflate; unsigned states_bitset; size_t i; @@ -134,7 +134,7 @@ static void test_set_socket_mutator(void) { GPR_ASSERT(ch_args->args[0].type == GRPC_ARG_POINTER); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(ch_args); } } diff --git a/test/core/channel/channel_stack_test.cc b/test/core/channel/channel_stack_test.cc index 66ee2948b1c..21d7e89cb02 100644 --- a/test/core/channel/channel_stack_test.cc +++ b/test/core/channel/channel_stack_test.cc @@ -95,7 +95,7 @@ static void test_create_channel_stack(void) { grpc_channel_args chan_args; int* channel_data; int* call_data; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_slice path = grpc_slice_from_static_string("/service/method"); arg.type = GRPC_ARG_INTEGER; @@ -138,7 +138,7 @@ static void test_create_channel_stack(void) { GPR_ASSERT(*channel_data == 1); GRPC_CALL_STACK_UNREF(call_stack, "done"); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(*channel_data == 2); GRPC_CHANNEL_STACK_UNREF(channel_stack, "done"); diff --git a/test/core/channel/minimal_stack_is_minimal_test.cc b/test/core/channel/minimal_stack_is_minimal_test.cc index dd3c70a261c..5aab969276a 100644 --- a/test/core/channel/minimal_stack_is_minimal_test.cc +++ b/test/core/channel/minimal_stack_is_minimal_test.cc @@ -124,7 +124,7 @@ static int check_stack(const char* file, int line, const char* transport_name, grpc_channel_stack_builder_set_transport(builder, &fake_transport); } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_stack_builder_set_channel_arguments(builder, channel_args); GPR_ASSERT(grpc_channel_init_create_stack( builder, (grpc_channel_stack_type)channel_stack_type)); @@ -209,7 +209,7 @@ static int check_stack(const char* file, int line, const char* transport_name, gpr_free(expect); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_stack_builder_destroy(builder); grpc_channel_args_destroy(channel_args); } diff --git a/test/core/client_channel/lb_policies_test.cc b/test/core/client_channel/lb_policies_test.cc index 5b412cc6229..88e12ed8e1f 100644 --- a/test/core/client_channel/lb_policies_test.cc +++ b/test/core/client_channel/lb_policies_test.cc @@ -651,7 +651,7 @@ static void test_get_channel_info() { grpc_channel_args* args = grpc_channel_args_copy_and_add(NULL, &arg, 1); channel = grpc_insecure_channel_create("ipv4:127.0.0.1:1234", args, NULL); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(args); } // Ensures that resolver returns. @@ -958,7 +958,7 @@ static void verify_rebirth_round_robin(const servers_fixture* f, } int main(int argc, char** argv) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; test_spec* spec; size_t i; const size_t NUM_ITERS = 10; diff --git a/test/core/client_channel/parse_address_test.cc b/test/core/client_channel/parse_address_test.cc index 597a1212c14..8f880830450 100644 --- a/test/core/client_channel/parse_address_test.cc +++ b/test/core/client_channel/parse_address_test.cc @@ -33,7 +33,7 @@ #ifdef GRPC_HAVE_UNIX_SOCKET static void test_grpc_parse_unix(const char* uri_text, const char* pathname) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_uri* uri = grpc_uri_parse(uri_text, 0); grpc_resolved_address addr; @@ -53,7 +53,7 @@ static void test_grpc_parse_unix(const char* uri_text, const char* pathname) {} static void test_grpc_parse_ipv4(const char* uri_text, const char* host, unsigned short port) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_uri* uri = grpc_uri_parse(uri_text, 0); grpc_resolved_address addr; char ntop_buf[INET_ADDRSTRLEN]; @@ -71,7 +71,7 @@ static void test_grpc_parse_ipv4(const char* uri_text, const char* host, static void test_grpc_parse_ipv6(const char* uri_text, const char* host, unsigned short port, uint32_t scope_id) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_uri* uri = grpc_uri_parse(uri_text, 0); grpc_resolved_address addr; char ntop_buf[INET6_ADDRSTRLEN]; diff --git a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc index c7a0e029f22..1f00d9ab439 100644 --- a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc @@ -104,7 +104,7 @@ static bool wait_loop(int deadline_seconds, gpr_event* ev) { if (gpr_event_wait(ev, grpc_timeout_seconds_to_deadline(1))) return true; deadline_seconds--; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_timer_check(NULL); } return false; @@ -146,14 +146,14 @@ int main(int argc, char** argv) { grpc_dns_lookup_ares = my_dns_lookup_ares; grpc_channel_args* result = (grpc_channel_args*)1; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resolver* resolver = create_resolver("dns:test"); gpr_event ev1; gpr_event_init(&ev1); call_resolver_next_after_locking( resolver, &result, GRPC_CLOSURE_CREATE(on_done, &ev1, grpc_schedule_on_exec_ctx)); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(wait_loop(5, &ev1)); GPR_ASSERT(result == NULL); @@ -162,7 +162,7 @@ int main(int argc, char** argv) { call_resolver_next_after_locking( resolver, &result, GRPC_CLOSURE_CREATE(on_done, &ev2, grpc_schedule_on_exec_ctx)); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(wait_loop(30, &ev2)); GPR_ASSERT(result != NULL); diff --git a/test/core/client_channel/resolvers/dns_resolver_test.cc b/test/core/client_channel/resolvers/dns_resolver_test.cc index 33916b59ec8..e8900ab1bb7 100644 --- a/test/core/client_channel/resolvers/dns_resolver_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_test.cc @@ -28,7 +28,7 @@ static grpc_combiner* g_combiner; static void test_succeeds(grpc_resolver_factory* factory, const char* string) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_uri* uri = grpc_uri_parse(string, 0); grpc_resolver_args args; grpc_resolver* resolver; @@ -45,7 +45,7 @@ static void test_succeeds(grpc_resolver_factory* factory, const char* string) { } static void test_fails(grpc_resolver_factory* factory, const char* string) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_uri* uri = grpc_uri_parse(string, 0); grpc_resolver_args args; grpc_resolver* resolver; @@ -80,7 +80,7 @@ int main(int argc, char** argv) { grpc_resolver_factory_unref(dns); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_COMBINER_UNREF(g_combiner, "test"); } grpc_shutdown(); diff --git a/test/core/client_channel/resolvers/fake_resolver_test.cc b/test/core/client_channel/resolvers/fake_resolver_test.cc index 9a1971561cf..1595313f36e 100644 --- a/test/core/client_channel/resolvers/fake_resolver_test.cc +++ b/test/core/client_channel/resolvers/fake_resolver_test.cc @@ -72,7 +72,7 @@ void on_resolution_cb(void* arg, grpc_error* error) { } static void test_fake_resolver() { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_combiner* combiner = grpc_combiner_create(); // Create resolver. grpc_fake_resolver_response_generator* response_generator = @@ -109,7 +109,7 @@ static void test_fake_resolver() { results); grpc_resolver_next_locked(resolver, &on_res_arg.resolver_result, on_resolution); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&on_res_arg.ev, grpc_timeout_seconds_to_deadline(5)) != NULL); @@ -144,7 +144,7 @@ static void test_fake_resolver() { results_update); grpc_resolver_next_locked(resolver, &on_res_arg_update.resolver_result, on_resolution); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&on_res_arg_update.ev, grpc_timeout_seconds_to_deadline(5)) != NULL); @@ -153,7 +153,7 @@ static void test_fake_resolver() { memset(&on_res_arg, 0, sizeof(on_res_arg)); grpc_resolver_next_locked(resolver, &on_res_arg.resolver_result, on_resolution); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&on_res_arg.ev, grpc_timeout_milliseconds_to_deadline(100)) == NULL); diff --git a/test/core/client_channel/resolvers/sockaddr_resolver_test.cc b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc index 70b3cbf5b75..75849018133 100644 --- a/test/core/client_channel/resolvers/sockaddr_resolver_test.cc +++ b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc @@ -41,7 +41,7 @@ void on_resolution_cb(void* arg, grpc_error* error) { } static void test_succeeds(grpc_resolver_factory* factory, const char* string) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_uri* uri = grpc_uri_parse(string, 0); grpc_resolver_args args; grpc_resolver* resolver; @@ -68,7 +68,7 @@ static void test_succeeds(grpc_resolver_factory* factory, const char* string) { } static void test_fails(grpc_resolver_factory* factory, const char* string) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_uri* uri = grpc_uri_parse(string, 0); grpc_resolver_args args; grpc_resolver* resolver; @@ -111,7 +111,7 @@ int main(int argc, char** argv) { grpc_resolver_factory_unref(ipv6); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_COMBINER_UNREF(g_combiner, "test"); } grpc_shutdown(); diff --git a/test/core/client_channel/uri_fuzzer_test.cc b/test/core/client_channel/uri_fuzzer_test.cc index 6c1e8cb137c..484676e4720 100644 --- a/test/core/client_channel/uri_fuzzer_test.cc +++ b/test/core/client_channel/uri_fuzzer_test.cc @@ -33,7 +33,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { memcpy(s, data, size); s[size] = 0; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_uri* x; if ((x = grpc_uri_parse(s, 1))) { grpc_uri_destroy(x); diff --git a/test/core/client_channel/uri_parser_test.cc b/test/core/client_channel/uri_parser_test.cc index 024c30faee0..61418ae7d89 100644 --- a/test/core/client_channel/uri_parser_test.cc +++ b/test/core/client_channel/uri_parser_test.cc @@ -28,7 +28,7 @@ static void test_succeeds(const char* uri_text, const char* scheme, const char* authority, const char* path, const char* query, const char* fragment) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_uri* uri = grpc_uri_parse(uri_text, 0); GPR_ASSERT(uri); GPR_ASSERT(0 == strcmp(scheme, uri->scheme)); @@ -41,13 +41,13 @@ static void test_succeeds(const char* uri_text, const char* scheme, } static void test_fails(const char* uri_text) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GPR_ASSERT(NULL == grpc_uri_parse(uri_text, 0)); } static void test_query_parts() { { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; const char* uri_text = "http://foo/path?a&b=B&c=&#frag"; grpc_uri* uri = grpc_uri_parse(uri_text, 0); GPR_ASSERT(uri); @@ -81,7 +81,7 @@ static void test_query_parts() { } { /* test the current behavior of multiple query part values */ - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; const char* uri_text = "http://auth/path?foo=bar=baz&foobar=="; grpc_uri* uri = grpc_uri_parse(uri_text, 0); GPR_ASSERT(uri); @@ -99,7 +99,7 @@ static void test_query_parts() { } { /* empty query */ - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; const char* uri_text = "http://foo/path"; grpc_uri* uri = grpc_uri_parse(uri_text, 0); GPR_ASSERT(uri); diff --git a/test/core/compression/algorithm_test.cc b/test/core/compression/algorithm_test.cc index 9ae6363d97f..a6fc55e682e 100644 --- a/test/core/compression/algorithm_test.cc +++ b/test/core/compression/algorithm_test.cc @@ -39,7 +39,7 @@ static void test_algorithm_mesh(void) { grpc_compression_algorithm parsed; grpc_slice mdstr; grpc_mdelem mdelem; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GPR_ASSERT( grpc_compression_algorithm_name((grpc_compression_algorithm)i, &name)); GPR_ASSERT(grpc_compression_algorithm_parse( @@ -61,7 +61,7 @@ static void test_algorithm_mesh(void) { } static void test_algorithm_failure(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_slice mdstr; gpr_log(GPR_DEBUG, "test_algorithm_failure"); diff --git a/test/core/compression/message_compress_test.cc b/test/core/compression/message_compress_test.cc index a5dfdc884fc..0145b4f4020 100644 --- a/test/core/compression/message_compress_test.cc +++ b/test/core/compression/message_compress_test.cc @@ -70,7 +70,7 @@ static void assert_passthrough(grpc_slice value, grpc_split_slices_to_buffer(uncompressed_split_mode, &value, 1, &input); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; was_compressed = grpc_msg_compress(algorithm, &input, &compressed_raw); } GPR_ASSERT(input.count > 0); @@ -90,7 +90,7 @@ static void assert_passthrough(grpc_slice value, grpc_split_slice_buffer(compressed_split_mode, &compressed_raw, &compressed); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GPR_ASSERT(grpc_msg_decompress( was_compressed ? algorithm : GRPC_COMPRESS_NONE, &compressed, &output)); } @@ -152,7 +152,7 @@ static void test_tiny_data_compress(void) { for (int i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { if (i == GRPC_COMPRESS_NONE) continue; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GPR_ASSERT(0 == grpc_msg_compress(static_cast(i), &input, &output)); @@ -176,7 +176,7 @@ static void test_bad_decompression_data_crc(void) { grpc_slice_buffer_init(&output); grpc_slice_buffer_add(&input, create_test_value(ONE_MB_A)); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; /* compress it */ grpc_msg_compress(GRPC_COMPRESS_GZIP, &input, &corrupted); /* corrupt the output by smashing the CRC */ @@ -205,7 +205,7 @@ static void test_bad_decompression_data_trailing_garbage(void) { "\x78\xda\x63\x60\x60\x60\x00\x00\x00\x04\x00\x01\x99", 13)); /* try (and fail) to decompress the invalid compresed buffer */ - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GPR_ASSERT(0 == grpc_msg_decompress(GRPC_COMPRESS_DEFLATE, &input, &output)); grpc_slice_buffer_destroy(&input); @@ -222,7 +222,7 @@ static void test_bad_decompression_data_stream(void) { grpc_slice_from_copied_buffer("\x78\xda\xff\xff", 4)); /* try (and fail) to decompress the invalid compresed buffer */ - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GPR_ASSERT(0 == grpc_msg_decompress(GRPC_COMPRESS_DEFLATE, &input, &output)); grpc_slice_buffer_destroy(&input); @@ -239,7 +239,7 @@ static void test_bad_compression_algorithm(void) { grpc_slice_buffer_add( &input, grpc_slice_from_copied_string("Never gonna give you up")); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; was_compressed = grpc_msg_compress(GRPC_COMPRESS_ALGORITHMS_COUNT, &input, &output); GPR_ASSERT(0 == was_compressed); @@ -263,7 +263,7 @@ static void test_bad_decompression_algorithm(void) { grpc_slice_buffer_add(&input, grpc_slice_from_copied_string( "I'm not really compressed but it doesn't matter")); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; was_decompressed = grpc_msg_decompress(GRPC_COMPRESS_ALGORITHMS_COUNT, &input, &output); GPR_ASSERT(0 == was_decompressed); diff --git a/test/core/debug/stats_test.cc b/test/core/debug/stats_test.cc index c7aaf68dd3e..a3bb44f496a 100644 --- a/test/core/debug/stats_test.cc +++ b/test/core/debug/stats_test.cc @@ -49,7 +49,7 @@ TEST(StatsTest, IncCounters) { for (int i = 0; i < GRPC_STATS_COUNTER_COUNT; i++) { Snapshot snapshot; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_STATS_INC_COUNTER((grpc_stats_counters)i); EXPECT_EQ(snapshot.delta().counters[i], 1); @@ -59,7 +59,7 @@ TEST(StatsTest, IncCounters) { TEST(StatsTest, IncSpecificCounter) { Snapshot snapshot; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_STATS_INC_SYSCALL_POLL(); EXPECT_EQ(snapshot.delta().counters[GRPC_STATS_COUNTER_SYSCALL_POLL], 1); @@ -92,7 +92,7 @@ TEST_P(HistogramTest, IncHistogram) { for (auto j : test_values) { Snapshot snapshot; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_stats_inc_histogram[kHistogram](j); auto delta = snapshot.delta(); diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc index 5e7e12643e2..bb192267c70 100644 --- a/test/core/end2end/bad_server_response_test.cc +++ b/test/core/end2end/bad_server_response_test.cc @@ -269,7 +269,7 @@ static void run_test(const char* response_payload, grpc_status_code expected_status, const char* expected_detail) { test_tcp_server test_server; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_event ev; grpc_init(); diff --git a/test/core/end2end/connection_refused_test.cc b/test/core/end2end/connection_refused_test.cc index 1372c5a7463..2c4163ea028 100644 --- a/test/core/end2end/connection_refused_test.cc +++ b/test/core/end2end/connection_refused_test.cc @@ -131,7 +131,7 @@ static void run_test(bool wait_for_ready, bool use_service_config) { grpc_metadata_array_destroy(&trailing_metadata_recv); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; if (args != NULL) grpc_channel_args_destroy(args); } diff --git a/test/core/end2end/fixtures/h2_census.cc b/test/core/end2end/fixtures/h2_census.cc index a43d963c54e..885b2b22b9e 100644 --- a/test/core/end2end/fixtures/h2_census.cc +++ b/test/core/end2end/fixtures/h2_census.cc @@ -74,7 +74,7 @@ void chttp2_init_client_fullstack(grpc_end2end_test_fixture* f, f->client = grpc_insecure_channel_create(ffd->localaddr, client_args, NULL); GPR_ASSERT(f->client); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(client_args); } } @@ -90,7 +90,7 @@ void chttp2_init_server_fullstack(grpc_end2end_test_fixture* f, server_args = grpc_channel_args_copy_and_add(server_args, &arg, 1); f->server = grpc_server_create(server_args, NULL); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(server_args); } grpc_server_register_completion_queue(f->server, f->cq, NULL); diff --git a/test/core/end2end/fixtures/h2_compress.cc b/test/core/end2end/fixtures/h2_compress.cc index 3f9a87d0fcd..6fea4d40e05 100644 --- a/test/core/end2end/fixtures/h2_compress.cc +++ b/test/core/end2end/fixtures/h2_compress.cc @@ -66,7 +66,7 @@ void chttp2_init_client_fullstack_compression(grpc_end2end_test_fixture* f, fullstack_compression_fixture_data* ffd = static_cast(f->fixture_data); if (ffd->client_args_compression != NULL) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(ffd->client_args_compression); } ffd->client_args_compression = grpc_channel_args_set_compression_algorithm( @@ -80,7 +80,7 @@ void chttp2_init_server_fullstack_compression(grpc_end2end_test_fixture* f, fullstack_compression_fixture_data* ffd = static_cast(f->fixture_data); if (ffd->server_args_compression != NULL) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(ffd->server_args_compression); } ffd->server_args_compression = grpc_channel_args_set_compression_algorithm( @@ -95,7 +95,7 @@ void chttp2_init_server_fullstack_compression(grpc_end2end_test_fixture* f, } void chttp2_tear_down_fullstack_compression(grpc_end2end_test_fixture* f) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; fullstack_compression_fixture_data* ffd = static_cast(f->fixture_data); grpc_channel_args_destroy(ffd->client_args_compression); diff --git a/test/core/end2end/fixtures/h2_fd.cc b/test/core/end2end/fixtures/h2_fd.cc index 99bced86514..62cc0f6f8f1 100644 --- a/test/core/end2end/fixtures/h2_fd.cc +++ b/test/core/end2end/fixtures/h2_fd.cc @@ -68,7 +68,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* client_args) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; sp_fixture_data* sfd = static_cast(f->fixture_data); GPR_ASSERT(!f->client); @@ -79,7 +79,7 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* server_args) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; sp_fixture_data* sfd = static_cast(f->fixture_data); GPR_ASSERT(!f->server); f->server = grpc_server_create(server_args, NULL); diff --git a/test/core/end2end/fixtures/h2_full+workarounds.cc b/test/core/end2end/fixtures/h2_full+workarounds.cc index e98df083f23..074ba289c94 100644 --- a/test/core/end2end/fixtures/h2_full+workarounds.cc +++ b/test/core/end2end/fixtures/h2_full+workarounds.cc @@ -71,7 +71,7 @@ void chttp2_init_client_fullstack(grpc_end2end_test_fixture* f, void chttp2_init_server_fullstack(grpc_end2end_test_fixture* f, grpc_channel_args* server_args) { int i; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; fullstack_fixture_data* ffd = static_cast(f->fixture_data); grpc_arg args[GRPC_MAX_WORKAROUND_ID]; diff --git a/test/core/end2end/fixtures/h2_load_reporting.cc b/test/core/end2end/fixtures/h2_load_reporting.cc index 84eb9e45139..846319285ea 100644 --- a/test/core/end2end/fixtures/h2_load_reporting.cc +++ b/test/core/end2end/fixtures/h2_load_reporting.cc @@ -77,7 +77,7 @@ void chttp2_init_server_load_reporting(grpc_end2end_test_fixture* f, server_args = grpc_channel_args_copy_and_add(server_args, &arg, 1); f->server = grpc_server_create(server_args, NULL); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(server_args); } grpc_server_register_completion_queue(f->server, f->cq, NULL); diff --git a/test/core/end2end/fixtures/h2_oauth2.cc b/test/core/end2end/fixtures/h2_oauth2.cc index 9ffc5b7b7e0..b648a1be4dc 100644 --- a/test/core/end2end/fixtures/h2_oauth2.cc +++ b/test/core/end2end/fixtures/h2_oauth2.cc @@ -143,7 +143,7 @@ void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture* f) { static void chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack( grpc_end2end_test_fixture* f, grpc_channel_args* client_args) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_credentials* ssl_creds = grpc_ssl_credentials_create(test_root_cert, NULL, NULL); grpc_call_credentials* oauth2_creds = grpc_md_only_test_credentials_create( diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.cc b/test/core/end2end/fixtures/h2_sockpair+trace.cc index 9e87a229625..c18f815f9fa 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.cc +++ b/test/core/end2end/fixtures/h2_sockpair+trace.cc @@ -50,7 +50,7 @@ static void server_setup_transport(void* ts, grpc_transport* transport) { grpc_end2end_test_fixture* f = static_cast(ts); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq)); grpc_server_setup_transport(f->server, transport, NULL, @@ -87,7 +87,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* client_args) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; sp_client_setup cs; @@ -101,7 +101,7 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* server_args) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; GPR_ASSERT(!f->server); @@ -126,7 +126,7 @@ static grpc_end2end_test_config configs[] = { int main(int argc, char** argv) { size_t i; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; /* force tracing on, with a value to force many code paths in trace.c to be taken */ diff --git a/test/core/end2end/fixtures/h2_sockpair.cc b/test/core/end2end/fixtures/h2_sockpair.cc index fa69ad84cf3..6c34dbba6fb 100644 --- a/test/core/end2end/fixtures/h2_sockpair.cc +++ b/test/core/end2end/fixtures/h2_sockpair.cc @@ -44,7 +44,7 @@ static void server_setup_transport(void* ts, grpc_transport* transport) { grpc_end2end_test_fixture* f = static_cast(ts); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq)); grpc_server_setup_transport(f->server, transport, NULL, @@ -81,7 +81,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* client_args) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; sp_client_setup cs; @@ -95,7 +95,7 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* server_args) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; GPR_ASSERT(!f->server); diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.cc b/test/core/end2end/fixtures/h2_sockpair_1byte.cc index a12d60575bf..909a2db8aa0 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.cc +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.cc @@ -44,7 +44,7 @@ static void server_setup_transport(void* ts, grpc_transport* transport) { grpc_end2end_test_fixture* f = static_cast(ts); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq)); grpc_server_setup_transport(f->server, transport, NULL, @@ -92,7 +92,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* client_args) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; sp_client_setup cs; @@ -106,7 +106,7 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* server_args) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; GPR_ASSERT(!f->server); diff --git a/test/core/end2end/fixtures/h2_ssl.cc b/test/core/end2end/fixtures/h2_ssl.cc index c137cec8b9a..ea8286c9e70 100644 --- a/test/core/end2end/fixtures/h2_ssl.cc +++ b/test/core/end2end/fixtures/h2_ssl.cc @@ -110,7 +110,7 @@ static void chttp2_init_client_simple_ssl_secure_fullstack( grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); chttp2_init_client_secure_fullstack(f, new_client_args, ssl_creds); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(new_client_args); } } diff --git a/test/core/end2end/fixtures/h2_ssl_proxy.cc b/test/core/end2end/fixtures/h2_ssl_proxy.cc index 0c130d6ae1b..d50cd5c9e31 100644 --- a/test/core/end2end/fixtures/h2_ssl_proxy.cc +++ b/test/core/end2end/fixtures/h2_ssl_proxy.cc @@ -66,7 +66,7 @@ static grpc_channel* create_proxy_client(const char* target, grpc_secure_channel_create(ssl_creds, target, new_client_args, NULL); grpc_channel_credentials_release(ssl_creds); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(new_client_args); } return channel; @@ -147,7 +147,7 @@ static void chttp2_init_client_simple_ssl_secure_fullstack( grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); chttp2_init_client_secure_fullstack(f, new_client_args, ssl_creds); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(new_client_args); } } diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc index 73a3e2c444e..698282d9906 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.cc +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -391,7 +391,8 @@ static void on_read_request_done(void* arg, grpc_error* error) { GPR_ASSERT(resolved_addresses->naddrs >= 1); // Connect to requested address. // The connection callback inherits our reference to conn. - const grpc_millis deadline = ExecCtx::Get()->Now() + 10 * GPR_MS_PER_SEC; + const grpc_millis deadline = + grpc_core::ExecCtx::Get()->Now() + 10 * GPR_MS_PER_SEC; grpc_tcp_client_connect(&conn->on_server_connect_done, &conn->server_endpoint, conn->pollset_set, NULL, &resolved_addresses->addrs[0], deadline); @@ -444,7 +445,7 @@ static void on_accept(void* arg, grpc_endpoint* endpoint, static void thread_main(void* arg) { grpc_end2end_http_proxy* proxy = (grpc_end2end_http_proxy*)arg; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; do { gpr_ref(&proxy->users); grpc_pollset_worker* worker = NULL; @@ -452,15 +453,15 @@ static void thread_main(void* arg) { GRPC_LOG_IF_ERROR( "grpc_pollset_work", grpc_pollset_work(proxy->pollset, &worker, - ExecCtx::Get()->Now() + GPR_MS_PER_SEC)); + grpc_core::ExecCtx::Get()->Now() + GPR_MS_PER_SEC)); gpr_mu_unlock(proxy->mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } while (!gpr_unref(&proxy->users)); } grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( grpc_channel_args* args) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_end2end_http_proxy* proxy = (grpc_end2end_http_proxy*)gpr_malloc(sizeof(*proxy)); memset(proxy, 0, sizeof(*proxy)); @@ -505,7 +506,7 @@ static void destroy_pollset(void* arg, grpc_error* error) { void grpc_end2end_http_proxy_destroy(grpc_end2end_http_proxy* proxy) { gpr_unref(&proxy->users); // Signal proxy thread to shutdown. - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_thd_join(proxy->thd); grpc_tcp_server_shutdown_listeners(proxy->server); grpc_tcp_server_unref(proxy->server); diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index 1d22ba3a42f..3fb6d0fdb6f 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -411,7 +411,7 @@ void my_resolve_address(const char* addr, const char* default_port, r->addrs = addresses; r->lb_addrs = NULL; grpc_timer_init( - &r->timer, GPR_MS_PER_SEC + ExecCtx::Get()->Now(), + &r->timer, GPR_MS_PER_SEC + grpc_core::ExecCtx::Get()->Now(), GRPC_CLOSURE_CREATE(finish_resolve, r, grpc_schedule_on_exec_ctx)); } @@ -428,7 +428,7 @@ grpc_ares_request* my_dns_lookup_ares(const char* dns_server, const char* addr, r->addrs = NULL; r->lb_addrs = lb_addrs; grpc_timer_init( - &r->timer, GPR_MS_PER_SEC + ExecCtx::Get()->Now(), + &r->timer, GPR_MS_PER_SEC + grpc_core::ExecCtx::Get()->Now(), GRPC_CLOSURE_CREATE(finish_resolve, r, grpc_schedule_on_exec_ctx)); return NULL; } @@ -488,7 +488,7 @@ static void sched_connect(grpc_closure* closure, grpc_endpoint** ep, fc->ep = ep; fc->deadline = deadline; grpc_timer_init( - &fc->timer, GPR_MS_PER_SEC + ExecCtx::Get()->Now(), + &fc->timer, GPR_MS_PER_SEC + grpc_core::ExecCtx::Get()->Now(), GRPC_CLOSURE_CREATE(do_connect, fc, grpc_schedule_on_exec_ctx)); } @@ -743,7 +743,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_init(); grpc_timer_manager_set_threading(false); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_executor_set_threading(false); } grpc_resolve_address = my_resolve_address; @@ -837,7 +837,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { g_channel = grpc_insecure_channel_create(target_uri, args, NULL); GPR_ASSERT(g_channel != NULL); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(args); } gpr_free(target_uri); @@ -864,7 +864,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { g_server = grpc_server_create(args, NULL); GPR_ASSERT(g_server != NULL); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(args); } grpc_server_register_completion_queue(g_server, cq, NULL); @@ -1192,7 +1192,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { g_channel = grpc_secure_channel_create(creds, target_uri, args, NULL); GPR_ASSERT(g_channel != NULL); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(args); } gpr_free(target_uri); diff --git a/test/core/end2end/fuzzers/client_fuzzer.cc b/test/core/end2end/fuzzers/client_fuzzer.cc index 95ed2fcdac9..318e8129d07 100644 --- a/test/core/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/end2end/fuzzers/client_fuzzer.cc @@ -43,7 +43,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (squelch) gpr_set_log_function(dont_log); if (leak_check) grpc_memory_counters_init(); grpc_init(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_executor_set_threading(false); grpc_resource_quota* resource_quota = @@ -111,7 +111,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_event ev; while (1) { - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), NULL); switch (ev.type) { case GRPC_QUEUE_TIMEOUT: diff --git a/test/core/end2end/fuzzers/server_fuzzer.cc b/test/core/end2end/fuzzers/server_fuzzer.cc index 21778c0a679..dca3ff498ed 100644 --- a/test/core/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/end2end/fuzzers/server_fuzzer.cc @@ -41,7 +41,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (squelch) gpr_set_log_function(dont_log); if (leak_check) grpc_memory_counters_init(); grpc_init(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_executor_set_threading(false); grpc_resource_quota* resource_quota = @@ -78,7 +78,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_event ev; while (1) { - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), NULL); switch (ev.type) { case GRPC_QUEUE_TIMEOUT: diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc index e0da548a75d..97c06927112 100644 --- a/test/core/end2end/h2_ssl_cert_test.cc +++ b/test/core/end2end/h2_ssl_cert_test.cc @@ -181,7 +181,7 @@ typedef enum { NONE, SELF_SIGNED, SIGNED, BAD_CERT_PAIR } certtype; grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); \ chttp2_init_client_secure_fullstack(f, new_client_args, ssl_creds); \ { \ - ExecCtx _local_exec_ctx; \ + grpc_core::ExecCtx _local_exec_ctx; \ grpc_channel_args_destroy(new_client_args); \ } \ } diff --git a/test/core/end2end/tests/cancel_after_accept.cc b/test/core/end2end/tests/cancel_after_accept.cc index ffafb1f1e9b..45ea2b9906d 100644 --- a/test/core/end2end/tests/cancel_after_accept.cc +++ b/test/core/end2end/tests/cancel_after_accept.cc @@ -245,7 +245,7 @@ static void test_cancel_after_accept(grpc_end2end_test_config config, grpc_call_unref(s); if (args != NULL) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(args); } diff --git a/test/core/end2end/tests/cancel_after_round_trip.cc b/test/core/end2end/tests/cancel_after_round_trip.cc index 7e20487f8b9..231aa7abbcc 100644 --- a/test/core/end2end/tests/cancel_after_round_trip.cc +++ b/test/core/end2end/tests/cancel_after_round_trip.cc @@ -277,7 +277,7 @@ static void test_cancel_after_round_trip(grpc_end2end_test_config config, grpc_call_unref(s); if (args != NULL) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(args); } diff --git a/test/core/end2end/tests/compressed_payload.cc b/test/core/end2end/tests/compressed_payload.cc index f04addbe9e7..aa3523a9878 100644 --- a/test/core/end2end/tests/compressed_payload.cc +++ b/test/core/end2end/tests/compressed_payload.cc @@ -129,7 +129,7 @@ static void request_for_disabled_algorithm( server_args = grpc_channel_args_set_compression_algorithm(NULL, GRPC_COMPRESS_NONE); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; server_args = grpc_channel_args_compression_algorithm_set_state( &server_args, algorithm_to_disable, false); } @@ -256,7 +256,7 @@ static void request_for_disabled_algorithm( grpc_byte_buffer_destroy(request_payload_recv); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); } @@ -534,7 +534,7 @@ static void request_with_payload_template( cq_verifier_destroy(cqv); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); } diff --git a/test/core/end2end/tests/load_reporting_hook.cc b/test/core/end2end/tests/load_reporting_hook.cc index 6ce22d77c61..34c046d364b 100644 --- a/test/core/end2end/tests/load_reporting_hook.cc +++ b/test/core/end2end/tests/load_reporting_hook.cc @@ -300,7 +300,7 @@ static void test_load_reporting_hook(grpc_end2end_test_config config) { &trailing_lr_metadata); end_test(&f); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(lr_server_args); } config.tear_down_data(&f); diff --git a/test/core/end2end/tests/max_message_length.cc b/test/core/end2end/tests/max_message_length.cc index f884d8b11f9..808cf470e1f 100644 --- a/test/core/end2end/tests/max_message_length.cc +++ b/test/core/end2end/tests/max_message_length.cc @@ -173,7 +173,7 @@ static void test_max_message_length_on_request(grpc_end2end_test_config config, f = begin_test(config, "test_max_request_message_length", client_args, server_args); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; if (client_args != NULL) grpc_channel_args_destroy(client_args); if (server_args != NULL) grpc_channel_args_destroy(server_args); } @@ -363,7 +363,7 @@ static void test_max_message_length_on_response(grpc_end2end_test_config config, f = begin_test(config, "test_max_response_message_length", client_args, server_args); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; if (client_args != NULL) grpc_channel_args_destroy(client_args); if (server_args != NULL) grpc_channel_args_destroy(server_args); } diff --git a/test/core/end2end/tests/stream_compression_compressed_payload.cc b/test/core/end2end/tests/stream_compression_compressed_payload.cc index cec46305bd3..d118aceeb1d 100644 --- a/test/core/end2end/tests/stream_compression_compressed_payload.cc +++ b/test/core/end2end/tests/stream_compression_compressed_payload.cc @@ -129,7 +129,7 @@ static void request_for_disabled_algorithm( server_args = grpc_channel_args_set_stream_compression_algorithm( NULL, GRPC_STREAM_COMPRESS_NONE); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; server_args = grpc_channel_args_stream_compression_algorithm_set_state( &server_args, algorithm_to_disable, false); } @@ -257,7 +257,7 @@ static void request_for_disabled_algorithm( grpc_byte_buffer_destroy(request_payload_recv); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); } @@ -542,7 +542,7 @@ static void request_with_payload_template( cq_verifier_destroy(cqv); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); } diff --git a/test/core/end2end/tests/stream_compression_payload.cc b/test/core/end2end/tests/stream_compression_payload.cc index c304c990d79..6bd1e99ca1a 100644 --- a/test/core/end2end/tests/stream_compression_payload.cc +++ b/test/core/end2end/tests/stream_compression_payload.cc @@ -277,7 +277,7 @@ static void test_invoke_request_response_with_payload( end_test(&f); config.tear_down_data(&f); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); } diff --git a/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc b/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc index f4b737d7a32..2504c791e68 100644 --- a/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc +++ b/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc @@ -273,7 +273,7 @@ static void test_pingpong_streaming(grpc_end2end_test_config config, end_test(&f); config.tear_down_data(&f); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); } diff --git a/test/core/end2end/tests/workaround_cronet_compression.cc b/test/core/end2end/tests/workaround_cronet_compression.cc index 100f393b8ed..723d3274e24 100644 --- a/test/core/end2end/tests/workaround_cronet_compression.cc +++ b/test/core/end2end/tests/workaround_cronet_compression.cc @@ -142,7 +142,7 @@ static void request_with_payload_template( NULL, default_server_channel_compression_algorithm); if (user_agent_override) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args* client_args_old = client_args; grpc_arg arg; arg.key = const_cast(GRPC_ARG_PRIMARY_USER_AGENT_STRING); @@ -348,7 +348,7 @@ static void request_with_payload_template( cq_verifier_destroy(cqv); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); } diff --git a/test/core/http/httpcli_test.cc b/test/core/http/httpcli_test.cc index dfa328360d7..4f9421e6d43 100644 --- a/test/core/http/httpcli_test.cc +++ b/test/core/http/httpcli_test.cc @@ -60,7 +60,7 @@ static void on_finish(void* arg, grpc_error* error) { static void test_get(int port) { grpc_httpcli_request req; char* host; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; g_done = 0; gpr_log(GPR_INFO, "test_get"); @@ -99,7 +99,7 @@ static void test_get(int port) { static void test_post(int port) { grpc_httpcli_request req; char* host; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; g_done = 0; gpr_log(GPR_INFO, "test_post"); @@ -142,7 +142,7 @@ static void destroy_pops(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_subprocess* server; char* me = argv[0]; char* lslash = strrchr(me, '/'); diff --git a/test/core/http/httpscli_test.cc b/test/core/http/httpscli_test.cc index ff082e8367b..fb69fc97d1f 100644 --- a/test/core/http/httpscli_test.cc +++ b/test/core/http/httpscli_test.cc @@ -60,7 +60,7 @@ static void on_finish(void* arg, grpc_error* error) { static void test_get(int port) { grpc_httpcli_request req; char* host; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; g_done = 0; gpr_log(GPR_INFO, "test_get"); @@ -100,7 +100,7 @@ static void test_get(int port) { static void test_post(int port) { grpc_httpcli_request req; char* host; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; g_done = 0; gpr_log(GPR_INFO, "test_post"); @@ -144,7 +144,7 @@ static void destroy_pops(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_subprocess* server; char* me = argv[0]; char* lslash = strrchr(me, '/'); diff --git a/test/core/iomgr/combiner_test.cc b/test/core/iomgr/combiner_test.cc index df8d55f1f69..cf2bc0ce066 100644 --- a/test/core/iomgr/combiner_test.cc +++ b/test/core/iomgr/combiner_test.cc @@ -28,7 +28,7 @@ static void test_no_op(void) { gpr_log(GPR_DEBUG, "test_no_op"); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_COMBINER_UNREF(grpc_combiner_create(), "test_no_op"); } @@ -42,11 +42,11 @@ static void test_execute_one(void) { grpc_combiner* lock = grpc_combiner_create(); gpr_event done; gpr_event_init(&done); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(set_event_to_true, &done, grpc_combiner_scheduler(lock)), GRPC_ERROR_NONE); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&done, grpc_timeout_seconds_to_deadline(5)) != NULL); GRPC_COMBINER_UNREF(lock, "test_execute_one"); @@ -72,7 +72,7 @@ static void check_one(void* a, grpc_error* error) { static void execute_many_loop(void* a) { thd_args* args = static_cast(a); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; size_t n = 1; for (size_t i = 0; i < 10; i++) { for (size_t j = 0; j < 10000; j++) { @@ -82,7 +82,7 @@ static void execute_many_loop(void* a) { GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE( check_one, c, grpc_combiner_scheduler(args->lock)), GRPC_ERROR_NONE); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } // sleep for a little bit, to test a combiner draining and another thread // picking it up @@ -112,7 +112,7 @@ static void test_execute_many(void) { gpr_inf_future(GPR_CLOCK_REALTIME)) != NULL); gpr_thd_join(thds[i]); } - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_COMBINER_UNREF(lock, "test_execute_many"); } @@ -133,12 +133,12 @@ static void test_execute_finally(void) { gpr_log(GPR_DEBUG, "test_execute_finally"); grpc_combiner* lock = grpc_combiner_create(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_event_init(&got_in_finally); GRPC_CLOSURE_SCHED( GRPC_CLOSURE_CREATE(add_finally, lock, grpc_combiner_scheduler(lock)), GRPC_ERROR_NONE); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&got_in_finally, grpc_timeout_seconds_to_deadline(5)) != NULL); GRPC_COMBINER_UNREF(lock, "test_execute_finally"); diff --git a/test/core/iomgr/endpoint_pair_test.cc b/test/core/iomgr/endpoint_pair_test.cc index 72833a8dbe8..658971b9fb0 100644 --- a/test/core/iomgr/endpoint_pair_test.cc +++ b/test/core/iomgr/endpoint_pair_test.cc @@ -32,7 +32,7 @@ static void clean_up(void) {} static grpc_endpoint_test_fixture create_fixture_endpoint_pair( size_t slice_size) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_endpoint_test_fixture f; grpc_arg a[1]; a[0].key = const_cast(GRPC_ARG_TCP_READ_CHUNK_SIZE); @@ -59,7 +59,7 @@ static void destroy_pollset(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_test_init(argc, argv); grpc_init(); g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); diff --git a/test/core/iomgr/endpoint_tests.cc b/test/core/iomgr/endpoint_tests.cc index 5c156ef5248..e000eb289b8 100644 --- a/test/core/iomgr/endpoint_tests.cc +++ b/test/core/iomgr/endpoint_tests.cc @@ -173,7 +173,7 @@ static void read_and_write_test(grpc_endpoint_test_config config, struct read_and_write_test_state state; grpc_endpoint_test_fixture f = begin_test(config, "read_and_write_test", slice_size); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); gpr_log(GPR_DEBUG, @@ -213,7 +213,7 @@ static void read_and_write_test(grpc_endpoint_test_config config, even when bytes_written is unsigned. */ state.bytes_written -= state.current_write_size; read_and_write_test_write_handler(&state, GRPC_ERROR_NONE); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); grpc_endpoint_read(state.read_ep, &state.incoming, &state.done_read); @@ -225,17 +225,17 @@ static void read_and_write_test(grpc_endpoint_test_config config, grpc_endpoint_shutdown( state.write_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); } - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); while (!state.read_done || !state.write_done) { grpc_pollset_worker* worker = NULL; - GPR_ASSERT(ExecCtx::Get()->Now() < deadline); + GPR_ASSERT(grpc_core::ExecCtx::Get()->Now() < deadline); GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); } gpr_mu_unlock(g_mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); end_test(config); grpc_slice_buffer_destroy_internal(&state.outgoing); @@ -252,16 +252,17 @@ static void inc_on_failure(void* arg, grpc_error* error) { } static void wait_for_fail_count(int* fail_count, int want_fail_count) { - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(10)); - while (ExecCtx::Get()->Now() < deadline && *fail_count < want_fail_count) { + while (grpc_core::ExecCtx::Get()->Now() < deadline && + *fail_count < want_fail_count) { grpc_pollset_worker* worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } GPR_ASSERT(*fail_count == want_fail_count); @@ -276,7 +277,7 @@ static void multiple_shutdown_test(grpc_endpoint_test_config config) { grpc_slice_buffer slice_buffer; grpc_slice_buffer_init(&slice_buffer); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_endpoint_add_to_pollset(f.client_ep, g_pollset); grpc_endpoint_read(f.client_ep, &slice_buffer, GRPC_CLOSURE_CREATE(inc_on_failure, &fail_count, diff --git a/test/core/iomgr/ev_epollsig_linux_test.cc b/test/core/iomgr/ev_epollsig_linux_test.cc index 5c71bc6152f..8aa68c6f6fd 100644 --- a/test/core/iomgr/ev_epollsig_linux_test.cc +++ b/test/core/iomgr/ev_epollsig_linux_test.cc @@ -77,11 +77,11 @@ static void test_fd_cleanup(test_fd* tfds, int num_fds) { for (i = 0; i < num_fds; i++) { grpc_fd_shutdown(tfds[i].fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("test_fd_cleanup")); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); grpc_fd_orphan(tfds[i].fd, NULL, &release_fd, false /* already_closed */, "test_fd_cleanup"); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(release_fd == tfds[i].inner_fd); close(tfds[i].inner_fd); @@ -110,7 +110,7 @@ static void test_pollset_cleanup(test_pollset* pollsets, int num_pollsets) { grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(pollsets[i].pollset, &destroyed); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_free(pollsets[i].pollset); } } @@ -130,7 +130,7 @@ static void test_pollset_cleanup(test_pollset* pollsets, int num_pollsets) { #define NUM_POLLSETS 4 static void test_add_fd_to_pollset() { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; test_fd tfds[NUM_FDS]; int fds[NUM_FDS]; test_pollset pollsets[NUM_POLLSETS]; @@ -168,32 +168,32 @@ static void test_add_fd_to_pollset() { /* == Step 1 == */ for (i = 0; i <= 2; i++) { grpc_pollset_add_fd(pollsets[0].pollset, tfds[i].fd); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } for (i = 3; i <= 4; i++) { grpc_pollset_add_fd(pollsets[1].pollset, tfds[i].fd); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } for (i = 5; i <= 7; i++) { grpc_pollset_add_fd(pollsets[2].pollset, tfds[i].fd); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } /* == Step 2 == */ for (i = 0; i <= 1; i++) { grpc_pollset_add_fd(pollsets[3].pollset, tfds[i].fd); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } /* == Step 3 == */ grpc_pollset_add_fd(pollsets[1].pollset, tfds[0].fd); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); /* == Step 4 == */ grpc_pollset_add_fd(pollsets[2].pollset, tfds[3].fd); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); /* All polling islands are merged at this point */ @@ -231,7 +231,7 @@ static __thread int thread_wakeups = 0; static void test_threading_loop(void* arg) { threading_shared* shared = static_cast(arg); while (thread_wakeups < 1000000) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_pollset_worker* worker; gpr_mu_lock(shared->mu); GPR_ASSERT(GRPC_LOG_IF_ERROR( @@ -271,7 +271,7 @@ static void test_threading(void) { shared.wakeup_desc = grpc_fd_create(fd.read_fd, "wakeup"); shared.wakeups = 0; { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_pollset_add_fd(shared.pollset, shared.wakeup_desc); grpc_fd_notify_on_read( shared.wakeup_desc, @@ -286,7 +286,7 @@ static void test_threading(void) { fd.read_fd = 0; grpc_wakeup_fd_destroy(&fd); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_fd_shutdown(shared.wakeup_desc, GRPC_ERROR_CANCELLED); grpc_fd_orphan(shared.wakeup_desc, NULL, NULL, false /* already_closed */, "done"); @@ -301,7 +301,7 @@ int main(int argc, char** argv) { const char* poll_strategy = NULL; grpc_test_init(argc, argv); grpc_init(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; poll_strategy = grpc_get_poll_strategy_name(); if (poll_strategy != NULL && strcmp(poll_strategy, "epollsig") == 0) { diff --git a/test/core/iomgr/fd_conservation_posix_test.cc b/test/core/iomgr/fd_conservation_posix_test.cc index 7f3420269ed..11e664d8ff8 100644 --- a/test/core/iomgr/fd_conservation_posix_test.cc +++ b/test/core/iomgr/fd_conservation_posix_test.cc @@ -31,7 +31,7 @@ int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; /* set max # of file descriptors to a low value, and verify we can create and destroy many more than this number @@ -45,7 +45,7 @@ int main(int argc, char** argv) { p = grpc_iomgr_create_endpoint_pair("test", NULL); grpc_endpoint_destroy(p.client); grpc_endpoint_destroy(p.server); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } grpc_resource_quota_unref(resource_quota); diff --git a/test/core/iomgr/fd_posix_test.cc b/test/core/iomgr/fd_posix_test.cc index d22cb5f4f62..160cfd4e991 100644 --- a/test/core/iomgr/fd_posix_test.cc +++ b/test/core/iomgr/fd_posix_test.cc @@ -246,7 +246,7 @@ static int server_start(server* sv) { static void server_wait_and_shutdown(server* sv) { gpr_mu_lock(g_mu); while (!sv->done) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_pollset_worker* worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", @@ -362,7 +362,7 @@ static void client_wait_and_shutdown(client* cl) { gpr_mu_lock(g_mu); while (!cl->done) { grpc_pollset_worker* worker = NULL; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE))); @@ -380,7 +380,7 @@ static void test_grpc_fd(void) { server sv; client cl; int port; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; server_init(&sv); port = server_start(&sv); @@ -436,7 +436,7 @@ static void test_grpc_fd_change(void) { ssize_t result; grpc_closure first_closure; grpc_closure second_closure; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_CLOSURE_INIT(&first_closure, first_read_callback, &a, grpc_schedule_on_exec_ctx); @@ -513,7 +513,7 @@ static void destroy_pollset(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_test_init(argc, argv); grpc_init(); g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); @@ -523,7 +523,7 @@ int main(int argc, char** argv) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(g_pollset, &destroyed); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_free(g_pollset); grpc_shutdown(); diff --git a/test/core/iomgr/pollset_set_test.cc b/test/core/iomgr/pollset_set_test.cc index e9b46f59e32..bc9aafd5bdd 100644 --- a/test/core/iomgr/pollset_set_test.cc +++ b/test/core/iomgr/pollset_set_test.cc @@ -84,7 +84,7 @@ static void cleanup_test_pollsets(test_pollset* pollsets, grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(pollsets[i].ps, &destroyed); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_free(pollsets[i].ps); pollsets[i].ps = NULL; } @@ -129,7 +129,7 @@ static void cleanup_test_fds(test_fd* tfds, const int num_fds) { for (int i = 0; i < num_fds; i++) { grpc_fd_shutdown(tfds[i].fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("fd cleanup")); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); /* grpc_fd_orphan frees the memory allocated for grpc_fd. Normally it also * calls close() on the underlying fd. In our case, we are using @@ -138,7 +138,7 @@ static void cleanup_test_fds(test_fd* tfds, const int num_fds) { * underlying fd, call it with a non-NULL 'release_fd' parameter */ grpc_fd_orphan(tfds[i].fd, NULL, &release_fd, false /* already_closed */, "test_fd_cleanup"); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); grpc_wakeup_fd_destroy(&tfds[i].wakeup_fd); } @@ -199,7 +199,7 @@ static void pollset_set_test_basic() { * | * +---> FD9 (Added after PS2 is added to PSS0) */ - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_pollset_worker* worker; grpc_millis deadline; @@ -236,7 +236,7 @@ static void pollset_set_test_basic() { grpc_pollset_add_fd(pollsets[1].ps, tfds[8].fd); grpc_pollset_add_fd(pollsets[2].ps, tfds[9].fd); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); /* Test that if any FD in the above structure is readable, it is observable by * doing grpc_pollset_work on any pollset @@ -259,10 +259,10 @@ static void pollset_set_test_basic() { grpc_pollset_work(pollsets[i].ps, &worker, deadline)); gpr_mu_unlock(pollsets[i].mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); verify_readable_and_reset(tfds, num_fds); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } /* Test tear down */ @@ -270,14 +270,14 @@ static void pollset_set_test_basic() { grpc_pollset_set_del_fd(pollset_sets[0].pss, tfds[5].fd); grpc_pollset_set_del_fd(pollset_sets[1].pss, tfds[1].fd); grpc_pollset_set_del_fd(pollset_sets[1].pss, tfds[6].fd); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); grpc_pollset_set_del_pollset(pollset_sets[1].pss, pollsets[0].ps); grpc_pollset_set_del_pollset(pollset_sets[0].pss, pollsets[1].ps); grpc_pollset_set_del_pollset(pollset_sets[0].pss, pollsets[2].ps); grpc_pollset_set_del_pollset_set(pollset_sets[0].pss, pollset_sets[1].pss); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); cleanup_test_fds(tfds, num_fds); cleanup_test_pollsets(pollsets, num_ps); @@ -301,7 +301,7 @@ void pollset_set_test_dup_fds() { * | +--> FD2 * +---> FD1 */ - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_pollset_worker* worker; grpc_millis deadline; @@ -337,10 +337,10 @@ void pollset_set_test_dup_fds() { GPR_ASSERT(GRPC_ERROR_NONE == grpc_pollset_work(pollset.ps, &worker, deadline)); gpr_mu_unlock(pollset.mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); verify_readable_and_reset(tfds, num_fds); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); /* Tear down */ grpc_pollset_set_del_fd(pollset_sets[0].pss, tfds[0].fd); @@ -349,7 +349,7 @@ void pollset_set_test_dup_fds() { grpc_pollset_set_del_pollset(pollset_sets[1].pss, pollset.ps); grpc_pollset_set_del_pollset_set(pollset_sets[0].pss, pollset_sets[1].pss); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); cleanup_test_fds(tfds, num_fds); cleanup_test_pollsets(&pollset, num_ps); @@ -371,7 +371,7 @@ void pollset_set_test_empty_pollset() { * | * +---> FD2 */ - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_pollset_worker* worker; grpc_millis deadline; @@ -404,16 +404,16 @@ void pollset_set_test_empty_pollset() { GPR_ASSERT(GRPC_ERROR_NONE == grpc_pollset_work(pollsets[0].ps, &worker, deadline)); gpr_mu_unlock(pollsets[0].mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); verify_readable_and_reset(tfds, num_fds); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); /* Tear down */ grpc_pollset_set_del_fd(pollset_set.pss, tfds[0].fd); grpc_pollset_set_del_pollset(pollset_set.pss, pollsets[0].ps); grpc_pollset_set_del_pollset(pollset_set.pss, pollsets[1].ps); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); cleanup_test_fds(tfds, num_fds); cleanup_test_pollsets(pollsets, num_ps); @@ -421,7 +421,7 @@ void pollset_set_test_empty_pollset() { } int main(int argc, char** argv) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_test_init(argc, argv); grpc_init(); const char* poll_strategy = grpc_get_poll_strategy_name(); diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index 9870d7aa73b..4da5cd7a1f0 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -67,7 +67,7 @@ void args_finish(args_struct* args) { grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(args->pollset, &do_nothing_cb); // exec_ctx needs to be flushed before calling grpc_pollset_destroy() - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); grpc_pollset_destroy(args->pollset); gpr_free(args->pollset); } @@ -79,14 +79,14 @@ static grpc_millis n_sec_deadline(int seconds) { static void actually_poll(void* argsp) { args_struct* args = static_cast(argsp); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_millis deadline = n_sec_deadline(10); while (true) { bool done = gpr_atm_acq_load(&args->done_atm) != 0; if (done) { break; } - grpc_millis time_left = deadline - ExecCtx::Get()->Now(); + grpc_millis time_left = deadline - grpc_core::ExecCtx::Get()->Now(); gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRIdPTR, done, time_left); GPR_ASSERT(time_left >= 0); grpc_pollset_worker* worker = NULL; @@ -94,7 +94,7 @@ static void actually_poll(void* argsp) { GRPC_LOG_IF_ERROR("pollset_work", grpc_pollset_work(args->pollset, &worker, n_sec_deadline(1))); gpr_mu_unlock(args->mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } gpr_event_set(&args->ev, (void*)1); } @@ -120,7 +120,7 @@ static void must_fail(void* argsp, grpc_error* err) { } static void test_unix_socket(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; args_struct args; args_init(&args); poll_pollset_until_request_done(&args); @@ -132,7 +132,7 @@ static void test_unix_socket(void) { } static void test_unix_socket_path_name_too_long(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; args_struct args; args_init(&args); const char prefix[] = "unix:/path/name"; @@ -156,7 +156,7 @@ static void test_unix_socket_path_name_too_long(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; test_unix_socket(); test_unix_socket_path_name_too_long(); grpc_executor_shutdown(); diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc index dbc825884d6..035d99cf5e3 100644 --- a/test/core/iomgr/resolve_address_test.cc +++ b/test/core/iomgr/resolve_address_test.cc @@ -63,7 +63,7 @@ void args_finish(args_struct* args) { grpc_pollset_shutdown(args->pollset, &do_nothing_cb); gpr_mu_unlock(args->mu); // exec_ctx needs to be flushed before calling grpc_pollset_destroy() - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); grpc_pollset_destroy(args->pollset); gpr_free(args->pollset); } @@ -74,14 +74,14 @@ static grpc_millis n_sec_deadline(int seconds) { } static void poll_pollset_until_request_done(args_struct* args) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_millis deadline = n_sec_deadline(10); while (true) { bool done = gpr_atm_acq_load(&args->done_atm) != 0; if (done) { break; } - grpc_millis time_left = deadline - ExecCtx::Get()->Now(); + grpc_millis time_left = deadline - grpc_core::ExecCtx::Get()->Now(); gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRIdPTR, done, time_left); GPR_ASSERT(time_left >= 0); grpc_pollset_worker* worker = NULL; @@ -89,7 +89,7 @@ static void poll_pollset_until_request_done(args_struct* args) { GRPC_LOG_IF_ERROR("pollset_work", grpc_pollset_work(args->pollset, &worker, n_sec_deadline(1))); gpr_mu_unlock(args->mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } gpr_event_set(&args->ev, (void*)1); } @@ -115,66 +115,66 @@ static void must_fail(void* argsp, grpc_error* err) { } static void test_localhost(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; args_struct args; args_init(&args); grpc_resolve_address( "localhost:1", NULL, args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); args_finish(&args); } static void test_default_port(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; args_struct args; args_init(&args); grpc_resolve_address( "localhost", "1", args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); args_finish(&args); } static void test_non_numeric_default_port(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; args_struct args; args_init(&args); grpc_resolve_address( "localhost", "https", args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); args_finish(&args); } static void test_missing_default_port(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; args_struct args; args_init(&args); grpc_resolve_address( "localhost", NULL, args.pollset_set, GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx), &args.addrs); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); args_finish(&args); } static void test_ipv6_with_port(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; args_struct args; args_init(&args); grpc_resolve_address( "[2001:db8::1]:1", NULL, args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); args_finish(&args); } @@ -187,14 +187,14 @@ static void test_ipv6_without_port(void) { }; unsigned i; for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; args_struct args; args_init(&args); grpc_resolve_address( kCases[i], "80", args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); args_finish(&args); } @@ -207,14 +207,14 @@ static void test_invalid_ip_addresses(void) { }; unsigned i; for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; args_struct args; args_init(&args); grpc_resolve_address( kCases[i], NULL, args.pollset_set, GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx), &args.addrs); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); args_finish(&args); } @@ -226,14 +226,14 @@ static void test_unparseable_hostports(void) { }; unsigned i; for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; args_struct args; args_init(&args); grpc_resolve_address( kCases[i], "1", args.pollset_set, GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx), &args.addrs); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); args_finish(&args); } @@ -242,7 +242,7 @@ static void test_unparseable_hostports(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; test_localhost(); test_default_port(); test_non_numeric_default_port(); diff --git a/test/core/iomgr/resource_quota_test.cc b/test/core/iomgr/resource_quota_test.cc index 40beadc5d6c..c4f68868367 100644 --- a/test/core/iomgr/resource_quota_test.cc +++ b/test/core/iomgr/resource_quota_test.cc @@ -84,7 +84,7 @@ grpc_closure* make_unused_reclaimer(grpc_closure* then) { } static void destroy_user(grpc_resource_user* usr) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_unref(usr); } @@ -117,11 +117,11 @@ static void test_instant_alloc_then_free(void) { grpc_resource_quota_resize(q, 1024 * 1024); grpc_resource_user* usr = grpc_resource_user_create(q, "usr"); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, NULL); } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); @@ -135,7 +135,7 @@ static void test_instant_alloc_free_pair(void) { grpc_resource_quota_resize(q, 1024 * 1024); grpc_resource_user* usr = grpc_resource_user_create(q, "usr"); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, NULL); grpc_resource_user_free(usr, 1024); } @@ -152,14 +152,14 @@ static void test_simple_async_alloc(void) { { gpr_event ev; gpr_event_init(&ev); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); @@ -175,7 +175,7 @@ static void test_async_alloc_blocked_by_size(void) { gpr_event ev; gpr_event_init(&ev); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); GPR_ASSERT(gpr_event_wait( @@ -185,7 +185,7 @@ static void test_async_alloc_blocked_by_size(void) { GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != NULL); ; { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); @@ -201,7 +201,7 @@ static void test_scavenge(void) { { gpr_event ev; gpr_event_init(&ev); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -209,13 +209,13 @@ static void test_scavenge(void) { ; } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_free(usr1, 1024); } { gpr_event ev; gpr_event_init(&ev); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -223,7 +223,7 @@ static void test_scavenge(void) { ; } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_free(usr2, 1024); } grpc_resource_quota_unref(q); @@ -240,7 +240,7 @@ static void test_scavenge_blocked(void) { gpr_event ev; { gpr_event_init(&ev); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -249,14 +249,14 @@ static void test_scavenge_blocked(void) { } { gpr_event_init(&ev); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); GPR_ASSERT(gpr_event_wait( &ev, grpc_timeout_milliseconds_to_deadline(100)) == NULL); } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_free(usr1, 1024); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -264,7 +264,7 @@ static void test_scavenge_blocked(void) { ; } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_free(usr2, 1024); } grpc_resource_quota_unref(q); @@ -281,7 +281,7 @@ static void test_blocked_until_scheduled_reclaim(void) { { gpr_event ev; gpr_event_init(&ev); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -291,14 +291,14 @@ static void test_blocked_until_scheduled_reclaim(void) { gpr_event reclaim_done; gpr_event_init(&reclaim_done); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_post_reclaimer( usr, false, make_reclaimer(usr, 1024, set_event(&reclaim_done))); } { gpr_event ev; gpr_event_init(&ev); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); GPR_ASSERT(gpr_event_wait(&reclaim_done, @@ -308,7 +308,7 @@ static void test_blocked_until_scheduled_reclaim(void) { ; } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); @@ -325,7 +325,7 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) { { gpr_event ev; gpr_event_init(&ev); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -335,14 +335,14 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) { gpr_event reclaim_done; gpr_event_init(&reclaim_done); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_post_reclaimer( usr1, false, make_reclaimer(usr1, 1024, set_event(&reclaim_done))); } { gpr_event ev; gpr_event_init(&ev); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); GPR_ASSERT(gpr_event_wait(&reclaim_done, @@ -352,7 +352,7 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) { ; } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_free(usr2, 1024); } grpc_resource_quota_unref(q); @@ -369,7 +369,7 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) { { gpr_event ev; gpr_event_init(&ev); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -379,14 +379,14 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) { gpr_event reclaim_done; gpr_event_init(&reclaim_done); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_post_reclaimer( usr, true, make_reclaimer(usr, 1024, set_event(&reclaim_done))); } { gpr_event ev; gpr_event_init(&ev); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); GPR_ASSERT(gpr_event_wait(&reclaim_done, @@ -396,7 +396,7 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) { ; } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); @@ -414,7 +414,7 @@ static void test_unused_reclaim_is_cancelled(void) { gpr_event destructive_done; gpr_event_init(&destructive_done); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_post_reclaimer( usr, false, make_unused_reclaimer(set_event(&benign_done))); grpc_resource_user_post_reclaimer( @@ -448,7 +448,7 @@ static void test_benign_reclaim_is_preferred(void) { { gpr_event ev; gpr_event_init(&ev); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -456,7 +456,7 @@ static void test_benign_reclaim_is_preferred(void) { ; } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_post_reclaimer( usr, false, make_reclaimer(usr, 1024, set_event(&benign_done))); grpc_resource_user_post_reclaimer( @@ -472,7 +472,7 @@ static void test_benign_reclaim_is_preferred(void) { { gpr_event ev; gpr_event_init(&ev); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); GPR_ASSERT(gpr_event_wait(&benign_done, @@ -484,7 +484,7 @@ static void test_benign_reclaim_is_preferred(void) { NULL); } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); @@ -508,7 +508,7 @@ static void test_multiple_reclaims_can_be_triggered(void) { { gpr_event ev; gpr_event_init(&ev); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -516,7 +516,7 @@ static void test_multiple_reclaims_can_be_triggered(void) { ; } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_post_reclaimer( usr, false, make_reclaimer(usr, 512, set_event(&benign_done))); grpc_resource_user_post_reclaimer( @@ -532,7 +532,7 @@ static void test_multiple_reclaims_can_be_triggered(void) { { gpr_event ev; gpr_event_init(&ev); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); GPR_ASSERT(gpr_event_wait(&benign_done, @@ -544,7 +544,7 @@ static void test_multiple_reclaims_can_be_triggered(void) { ; } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); @@ -563,16 +563,16 @@ static void test_resource_user_stays_allocated_until_memory_released(void) { grpc_resource_quota_resize(q, 1024 * 1024); grpc_resource_user* usr = grpc_resource_user_create(q, "usr"); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, NULL); } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_quota_unref(q); grpc_resource_user_unref(usr); } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); } } @@ -593,7 +593,7 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( gpr_event reclaimer_cancelled; gpr_event_init(&reclaimer_cancelled); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_post_reclaimer( usr, false, make_unused_reclaimer(set_event(&reclaimer_cancelled))); @@ -604,7 +604,7 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( { gpr_event allocated; gpr_event_init(&allocated); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); GPR_ASSERT(gpr_event_wait(&allocated, @@ -614,7 +614,7 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( NULL); } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_unref(usr); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, @@ -622,7 +622,7 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( NULL); } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, @@ -641,7 +641,7 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { { gpr_event allocated; gpr_event_init(&allocated); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); GPR_ASSERT(gpr_event_wait(&allocated, @@ -651,7 +651,7 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { gpr_event reclaimer_done; gpr_event_init(&reclaimer_done); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_post_reclaimer( usr, false, make_reclaimer(usr, 1024, set_event(&reclaimer_done))); @@ -662,7 +662,7 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { { gpr_event allocated; gpr_event_init(&allocated); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); GPR_ASSERT(gpr_event_wait(&allocated, @@ -672,7 +672,7 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { } } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); } destroy_user(usr); @@ -696,14 +696,14 @@ static void test_one_slice(void) { { const int start_allocs = num_allocs; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); assert_counter_becomes(&num_allocs, start_allocs + 1); } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_slice_buffer_destroy_internal(&buffer); } destroy_user(usr); @@ -728,20 +728,20 @@ static void test_one_slice_deleted_late(void) { { const int start_allocs = num_allocs; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); assert_counter_becomes(&num_allocs, start_allocs + 1); } { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_unref(usr); } grpc_resource_quota_unref(q); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_slice_buffer_destroy_internal(&buffer); } } @@ -770,7 +770,7 @@ static void test_negative_rq_free_pool(void) { { const int start_allocs = num_allocs; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); assert_counter_becomes(&num_allocs, start_allocs + 1); @@ -783,13 +783,13 @@ static void test_negative_rq_free_pool(void) { GPR_ASSERT(grpc_resource_quota_get_memory_pressure(q) > 1 - eps); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_unref(usr); } grpc_resource_quota_unref(q); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_slice_buffer_destroy_internal(&buffer); } } diff --git a/test/core/iomgr/tcp_client_posix_test.cc b/test/core/iomgr/tcp_client_posix_test.cc index abefecba335..d736d08a45c 100644 --- a/test/core/iomgr/tcp_client_posix_test.cc +++ b/test/core/iomgr/tcp_client_posix_test.cc @@ -53,7 +53,7 @@ static grpc_millis test_deadline(void) { static void finish_connection() { gpr_mu_lock(g_mu); g_connections_complete++; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GPR_ASSERT( GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); @@ -83,7 +83,7 @@ void test_succeeds(void) { int r; int connections_complete_before; grpc_closure done; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_log(GPR_DEBUG, "test_succeeds"); @@ -127,7 +127,7 @@ void test_succeeds(void) { grpc_timespec_to_millis_round_up( grpc_timeout_seconds_to_deadline(5))))); gpr_mu_unlock(g_mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } @@ -139,7 +139,7 @@ void test_fails(void) { struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; int connections_complete_before; grpc_closure done; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_log(GPR_DEBUG, "test_fails"); @@ -175,7 +175,7 @@ void test_fails(void) { break; } gpr_mu_unlock(g_mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } @@ -188,7 +188,7 @@ static void destroy_pollset(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_test_init(argc, argv); grpc_init(); g_pollset_set = grpc_pollset_set_create(); diff --git a/test/core/iomgr/tcp_client_uv_test.cc b/test/core/iomgr/tcp_client_uv_test.cc index 0355896b858..344478ea975 100644 --- a/test/core/iomgr/tcp_client_uv_test.cc +++ b/test/core/iomgr/tcp_client_uv_test.cc @@ -87,7 +87,7 @@ void test_succeeds(void) { uv_tcp_t* svr_handle = static_cast(gpr_malloc(sizeof(uv_tcp_t))); int connections_complete_before; grpc_closure done; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_log(GPR_DEBUG, "test_succeeds"); @@ -121,7 +121,7 @@ void test_succeeds(void) { grpc_timespec_to_millis_round_up( grpc_timeout_seconds_to_deadline(5))))); gpr_mu_unlock(g_mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } @@ -136,7 +136,7 @@ void test_fails(void) { struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; int connections_complete_before; grpc_closure done; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_log(GPR_DEBUG, "test_fails"); @@ -173,7 +173,7 @@ void test_fails(void) { break; } gpr_mu_unlock(g_mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } @@ -186,7 +186,7 @@ static void destroy_pollset(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_test_init(argc, argv); grpc_init(); g_pollset = static_cast(gpr_malloc(grpc_pollset_size())); diff --git a/test/core/iomgr/tcp_posix_test.cc b/test/core/iomgr/tcp_posix_test.cc index 678e1c3638d..c12e695fb6e 100644 --- a/test/core/iomgr/tcp_posix_test.cc +++ b/test/core/iomgr/tcp_posix_test.cc @@ -162,7 +162,7 @@ static void read_test(size_t num_bytes, size_t slice_size) { size_t written_bytes; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_log(GPR_INFO, "Read test of size %" PRIuPTR ", slice size %" PRIuPTR, num_bytes, slice_size); @@ -212,7 +212,7 @@ static void large_read_test(size_t slice_size) { ssize_t written_bytes; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_log(GPR_INFO, "Start large read test, slice size %" PRIuPTR, slice_size); @@ -300,7 +300,7 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { int flags; int current = 0; int i; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; flags = fcntl(fd, F_GETFL, 0); GPR_ASSERT(fcntl(fd, F_SETFL, flags & ~O_NONBLOCK) == 0); @@ -347,7 +347,7 @@ static void write_test(size_t num_bytes, size_t slice_size) { grpc_closure write_done_closure; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_log(GPR_INFO, "Start write test with %" PRIuPTR " bytes, slice size %" PRIuPTR, @@ -410,7 +410,7 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { int fd; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_closure fd_released_cb; int fd_released_done = 0; GRPC_CLOSURE_INIT(&fd_released_cb, &on_fd_released, &fd_released_done, @@ -450,7 +450,7 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { gpr_log(GPR_DEBUG, "wakeup: read=%" PRIdPTR " target=%" PRIdPTR, state.read_bytes, state.target_read_bytes); gpr_mu_unlock(g_mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } GPR_ASSERT(state.read_bytes == state.target_read_bytes); @@ -458,7 +458,7 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { grpc_slice_buffer_destroy_internal(&state.incoming); grpc_tcp_destroy_and_release_fd(ep, &fd, &fd_released_cb); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); while (!fd_released_done) { grpc_pollset_worker* worker = NULL; @@ -506,7 +506,7 @@ static grpc_endpoint_test_fixture create_fixture_tcp_socketpair( size_t slice_size) { int sv[2]; grpc_endpoint_test_fixture f; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; create_sockets(sv); grpc_resource_quota* resource_quota = @@ -537,7 +537,7 @@ static void destroy_pollset(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_test_init(argc, argv); grpc_init(); g_pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); diff --git a/test/core/iomgr/tcp_server_posix_test.cc b/test/core/iomgr/tcp_server_posix_test.cc index 1c3f4490d5c..7b3219320e9 100644 --- a/test/core/iomgr/tcp_server_posix_test.cc +++ b/test/core/iomgr/tcp_server_posix_test.cc @@ -163,14 +163,14 @@ static void on_connect(void* arg, grpc_endpoint* tcp, grpc_pollset* pollset, } static void test_no_op(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_tcp_server* s; GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); grpc_tcp_server_unref(s); } static void test_no_op_with_start(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_tcp_server* s; GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); LOG_TEST("test_no_op_with_start"); @@ -179,7 +179,7 @@ static void test_no_op_with_start(void) { } static void test_no_op_with_port(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_tcp_server* s; @@ -198,7 +198,7 @@ static void test_no_op_with_port(void) { } static void test_no_op_with_port_and_start(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_tcp_server* s; @@ -243,7 +243,8 @@ static grpc_error* tcp_connect(const test_addr* remote, return GRPC_OS_ERROR(errno, "connect"); } gpr_log(GPR_DEBUG, "wait"); - while (g_nconnects == nconnects_before && deadline > ExecCtx::Get()->Now()) { + while (g_nconnects == nconnects_before && + deadline > grpc_core::ExecCtx::Get()->Now()) { grpc_pollset_worker* worker = NULL; grpc_error* err; if ((err = grpc_pollset_work(g_pollset, &worker, deadline)) != @@ -281,7 +282,7 @@ static grpc_error* tcp_connect(const test_addr* remote, static void test_connect(size_t num_connects, const grpc_channel_args* channel_args, test_addrs* dst_addrs, bool test_dst_addrs) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resolved_address resolved_addr; grpc_resolved_address resolved_addr1; struct sockaddr_storage* const addr = @@ -420,7 +421,7 @@ static void destroy_pollset(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_arg chan_args[1]; chan_args[0].type = GRPC_ARG_INTEGER; chan_args[0].key = const_cast(GRPC_ARG_EXPAND_WILDCARD_ADDRS); diff --git a/test/core/iomgr/tcp_server_uv_test.cc b/test/core/iomgr/tcp_server_uv_test.cc index 50042af37f5..07b1fb15799 100644 --- a/test/core/iomgr/tcp_server_uv_test.cc +++ b/test/core/iomgr/tcp_server_uv_test.cc @@ -115,14 +115,14 @@ static void on_connect(void* arg, grpc_endpoint* tcp, grpc_pollset* pollset, } static void test_no_op(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_tcp_server* s; GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); grpc_tcp_server_unref(s); } static void test_no_op_with_start(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_tcp_server* s; GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); LOG_TEST("test_no_op_with_start"); @@ -131,7 +131,7 @@ static void test_no_op_with_start(void) { } static void test_no_op_with_port(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_tcp_server* s; @@ -150,7 +150,7 @@ static void test_no_op_with_port(void) { } static void test_no_op_with_port_and_start(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_tcp_server* s; @@ -214,7 +214,7 @@ static void tcp_connect(const struct sockaddr* remote, socklen_t remote_len, /* Tests a tcp server with multiple ports. */ static void test_connect(unsigned n) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resolved_address resolved_addr; grpc_resolved_address resolved_addr1; struct sockaddr_storage* addr = (struct sockaddr_storage*)resolved_addr.addr; @@ -284,7 +284,7 @@ static void destroy_pollset(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_test_init(argc, argv); grpc_init(); g_pollset = static_cast(gpr_malloc(grpc_pollset_size())); diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc index 7281f55b854..537733150fe 100644 --- a/test/core/iomgr/timer_list_test.cc +++ b/test/core/iomgr/timer_list_test.cc @@ -43,7 +43,7 @@ static void cb(void* arg, grpc_error* error) { static void add_test(void) { int i; grpc_timer timers[20]; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_log(GPR_INFO, "add_test"); @@ -52,7 +52,7 @@ static void add_test(void) { grpc_timer_check_trace.value = 1; memset(cb_called, 0, sizeof(cb_called)); - grpc_millis start = ExecCtx::Get()->Now(); + grpc_millis start = grpc_core::ExecCtx::Get()->Now(); /* 10 ms timers. will expire in the current epoch */ for (i = 0; i < 10; i++) { @@ -69,7 +69,7 @@ static void add_test(void) { } /* collect timers. Only the first batch should be ready. */ - ExecCtx::Get()->SetNow(start + 500); + grpc_core::ExecCtx::Get()->TestOnlySetNow(start + 500); GPR_ASSERT(grpc_timer_check(NULL) == GRPC_TIMERS_FIRED); for (i = 0; i < 20; i++) { @@ -77,7 +77,7 @@ static void add_test(void) { GPR_ASSERT(cb_called[i][0] == 0); } - ExecCtx::Get()->SetNow(start + 600); + grpc_core::ExecCtx::Get()->TestOnlySetNow(start + 600); GPR_ASSERT(grpc_timer_check(NULL) == GRPC_TIMERS_CHECKED_AND_EMPTY); for (i = 0; i < 30; i++) { @@ -86,7 +86,7 @@ static void add_test(void) { } /* collect the rest of the timers */ - ExecCtx::Get()->SetNow(start + 1500); + grpc_core::ExecCtx::Get()->TestOnlySetNow(start + 1500); GPR_ASSERT(grpc_timer_check(NULL) == GRPC_TIMERS_FIRED); for (i = 0; i < 30; i++) { @@ -94,7 +94,7 @@ static void add_test(void) { GPR_ASSERT(cb_called[i][0] == 0); } - ExecCtx::Get()->SetNow(start + 1600); + grpc_core::ExecCtx::Get()->TestOnlySetNow(start + 1600); GPR_ASSERT(grpc_timer_check(NULL) == GRPC_TIMERS_CHECKED_AND_EMPTY); for (i = 0; i < 30; i++) { GPR_ASSERT(cb_called[i][1] == (i < 20)); @@ -107,11 +107,11 @@ static void add_test(void) { /* Cleaning up a list with pending timers. */ void destruction_test(void) { grpc_timer timers[5]; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_log(GPR_INFO, "destruction_test"); - ExecCtx::Get()->SetNow(0); + grpc_core::ExecCtx::Get()->TestOnlySetNow(0); grpc_timer_list_init(); grpc_timer_trace.value = 1; grpc_timer_check_trace.value = 1; @@ -132,7 +132,7 @@ void destruction_test(void) { grpc_timer_init( &timers[4], 1, GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)4, grpc_schedule_on_exec_ctx)); - ExecCtx::Get()->SetNow(2); + grpc_core::ExecCtx::Get()->TestOnlySetNow(2); GPR_ASSERT(grpc_timer_check(NULL) == GRPC_TIMERS_FIRED); GPR_ASSERT(1 == cb_called[4][1]); diff --git a/test/core/iomgr/udp_server_test.cc b/test/core/iomgr/udp_server_test.cc index 47e5cf02545..0afd8367445 100644 --- a/test/core/iomgr/udp_server_test.cc +++ b/test/core/iomgr/udp_server_test.cc @@ -127,13 +127,13 @@ static test_socket_factory* test_socket_factory_create(void) { } static void test_no_op(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_udp_server* s = grpc_udp_server_create(NULL); grpc_udp_server_destroy(s, NULL); } static void test_no_op_with_start(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_udp_server* s = grpc_udp_server_create(NULL); LOG_TEST("test_no_op_with_start"); grpc_udp_server_start(s, NULL, 0, NULL); @@ -142,7 +142,7 @@ static void test_no_op_with_start(void) { static void test_no_op_with_port(void) { g_number_of_orphan_calls = 0; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_udp_server* s = grpc_udp_server_create(NULL); @@ -162,7 +162,7 @@ static void test_no_op_with_port(void) { static void test_no_op_with_port_and_socket_factory(void) { g_number_of_orphan_calls = 0; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; @@ -194,7 +194,7 @@ static void test_no_op_with_port_and_socket_factory(void) { static void test_no_op_with_port_and_start(void) { g_number_of_orphan_calls = 0; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_udp_server* s = grpc_udp_server_create(NULL); @@ -216,7 +216,7 @@ static void test_no_op_with_port_and_start(void) { } static void test_receive(int number_of_clients) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_storage* addr = (struct sockaddr_storage*)resolved_addr.addr; int clifd, svrfd; @@ -260,12 +260,12 @@ static void test_receive(int number_of_clients) { (socklen_t)resolved_addr.len) == 0); GPR_ASSERT(5 == write(clifd, "hello", 5)); while (g_number_of_reads == number_of_reads_before && - deadline > ExecCtx::Get()->Now()) { + deadline > grpc_core::ExecCtx::Get()->Now()) { grpc_pollset_worker* worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } GPR_ASSERT(g_number_of_reads == number_of_reads_before + 1); @@ -291,7 +291,7 @@ static void destroy_pollset(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_test_init(argc, argv); grpc_init(); g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc index 029171c931e..639f4e50561 100644 --- a/test/core/security/credentials_test.cc +++ b/test/core/security/credentials_test.cc @@ -148,7 +148,7 @@ static grpc_httpcli_response http_response(int status, const char* body) { /* -- Tests. -- */ static void test_empty_md_array(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_credentials_mdelem_array md_array; memset(&md_array, 0, sizeof(md_array)); GPR_ASSERT(md_array.md == NULL); @@ -157,7 +157,7 @@ static void test_empty_md_array(void) { } static void test_add_to_empty_md_array(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_credentials_mdelem_array md_array; memset(&md_array, 0, sizeof(md_array)); const char* key = "hello"; @@ -172,7 +172,7 @@ static void test_add_to_empty_md_array(void) { } static void test_add_abunch_to_md_array(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_credentials_mdelem_array md_array; memset(&md_array, 0, sizeof(md_array)); const char* key = "hello"; @@ -191,7 +191,7 @@ static void test_add_abunch_to_md_array(void) { } static void test_oauth2_token_fetcher_creds_parsing_ok(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = @@ -208,7 +208,7 @@ static void test_oauth2_token_fetcher_creds_parsing_ok(void) { } static void test_oauth2_token_fetcher_creds_parsing_bad_http_status(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = @@ -220,7 +220,7 @@ static void test_oauth2_token_fetcher_creds_parsing_bad_http_status(void) { } static void test_oauth2_token_fetcher_creds_parsing_empty_http_body(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = http_response(200, ""); @@ -231,7 +231,7 @@ static void test_oauth2_token_fetcher_creds_parsing_empty_http_body(void) { } static void test_oauth2_token_fetcher_creds_parsing_invalid_json(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = @@ -246,7 +246,7 @@ static void test_oauth2_token_fetcher_creds_parsing_invalid_json(void) { } static void test_oauth2_token_fetcher_creds_parsing_missing_token(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = http_response(200, @@ -260,7 +260,7 @@ static void test_oauth2_token_fetcher_creds_parsing_missing_token(void) { } static void test_oauth2_token_fetcher_creds_parsing_missing_token_type(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = @@ -276,7 +276,7 @@ static void test_oauth2_token_fetcher_creds_parsing_missing_token_type(void) { static void test_oauth2_token_fetcher_creds_parsing_missing_token_lifetime( void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = @@ -378,7 +378,7 @@ static void run_request_metadata_test(grpc_call_credentials* creds, } static void test_google_iam_creds(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; expected_md emd[] = {{GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, test_google_iam_authorization_token}, {GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, @@ -395,7 +395,7 @@ static void test_google_iam_creds(void) { } static void test_access_token_creds(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; expected_md emd[] = {{GRPC_AUTHORIZATION_METADATA_KEY, "Bearer blah"}}; request_metadata_state* state = make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); @@ -419,7 +419,7 @@ static grpc_security_status check_channel_oauth2_create_security_connector( } static void test_channel_oauth2_composite_creds(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args* new_args; grpc_channel_credentials_vtable vtable = { NULL, check_channel_oauth2_create_security_connector, NULL}; @@ -439,7 +439,7 @@ static void test_channel_oauth2_composite_creds(void) { } static void test_oauth2_google_iam_composite_creds(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; expected_md emd[] = { {GRPC_AUTHORIZATION_METADATA_KEY, test_oauth2_bearer_token}, {GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, @@ -492,7 +492,7 @@ check_channel_oauth2_google_iam_create_security_connector( } static void test_channel_oauth2_google_iam_composite_creds(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args* new_args; grpc_channel_credentials_vtable vtable = { NULL, check_channel_oauth2_google_iam_create_security_connector, NULL}; @@ -569,7 +569,7 @@ static int httpcli_get_should_not_be_called(const grpc_httpcli_request* request, } static void test_compute_engine_creds_success(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; expected_md emd[] = { {"authorization", "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_"}}; grpc_call_credentials* creds = @@ -583,7 +583,7 @@ static void test_compute_engine_creds_success(void) { grpc_httpcli_set_override(compute_engine_httpcli_get_success_override, httpcli_post_should_not_be_called); run_request_metadata_test(creds, auth_md_ctx, state); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); /* Second request: the cached token should be served directly. */ state = @@ -591,14 +591,14 @@ static void test_compute_engine_creds_success(void) { grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); run_request_metadata_test(creds, auth_md_ctx, state); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); grpc_call_credentials_unref(creds); grpc_httpcli_set_override(NULL, NULL); } static void test_compute_engine_creds_failure(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; request_metadata_state* state = make_request_metadata_state( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Error occured when fetching oauth2 token."), @@ -658,7 +658,7 @@ static int refresh_token_httpcli_post_failure( } static void test_refresh_token_creds_success(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; expected_md emd[] = { {"authorization", "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_"}}; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, NULL, @@ -672,7 +672,7 @@ static void test_refresh_token_creds_success(void) { grpc_httpcli_set_override(httpcli_get_should_not_be_called, refresh_token_httpcli_post_success); run_request_metadata_test(creds, auth_md_ctx, state); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); /* Second request: the cached token should be served directly. */ state = @@ -680,14 +680,14 @@ static void test_refresh_token_creds_success(void) { grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); run_request_metadata_test(creds, auth_md_ctx, state); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); grpc_call_credentials_unref(creds); grpc_httpcli_set_override(NULL, NULL); } static void test_refresh_token_creds_failure(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; request_metadata_state* state = make_request_metadata_state( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Error occured when fetching oauth2 token."), @@ -790,7 +790,7 @@ static void test_jwt_creds_lifetime(void) { static void test_jwt_creds_success(void) { char* json_key_string = test_json_key_str(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, NULL, NULL}; char* expected_md_value; @@ -805,7 +805,7 @@ static void test_jwt_creds_success(void) { make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_success); run_request_metadata_test(creds, auth_md_ctx, state); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); /* Second request: the cached token should be served directly. */ state = @@ -813,7 +813,7 @@ static void test_jwt_creds_success(void) { grpc_jwt_encode_and_sign_set_override( encode_and_sign_jwt_should_not_be_called); run_request_metadata_test(creds, auth_md_ctx, state); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); /* Third request: Different service url so jwt_encode_and_sign should be called again (no caching). */ @@ -822,7 +822,7 @@ static void test_jwt_creds_success(void) { auth_md_ctx.service_url = other_test_service_url; grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_success); run_request_metadata_test(creds, auth_md_ctx, state); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); grpc_call_credentials_unref(creds); gpr_free(json_key_string); @@ -832,7 +832,7 @@ static void test_jwt_creds_success(void) { static void test_jwt_creds_signing_failure(void) { char* json_key_string = test_json_key_str(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, NULL, NULL}; request_metadata_state* state = make_request_metadata_state( @@ -863,7 +863,7 @@ static void set_google_default_creds_env_var_with_file_contents( } static void test_google_default_creds_auth_key(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_service_account_jwt_access_credentials* jwt; grpc_composite_channel_credentials* creds; char* json_key = test_json_key_str(); @@ -884,7 +884,7 @@ static void test_google_default_creds_auth_key(void) { } static void test_google_default_creds_refresh_token(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_google_refresh_token_credentials* refresh; grpc_composite_channel_credentials* creds; grpc_flush_cached_google_default_credentials(); @@ -919,7 +919,7 @@ static int default_creds_gce_detection_httpcli_get_success_override( static char* null_well_known_creds_path_getter(void) { return NULL; } static void test_google_default_creds_gce(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; expected_md emd[] = { {"authorization", "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_"}}; request_metadata_state* state = @@ -945,7 +945,7 @@ static void test_google_default_creds_gce(void) { grpc_httpcli_set_override(compute_engine_httpcli_get_success_override, httpcli_post_should_not_be_called); run_request_metadata_test(creds->call_creds, auth_md_ctx, state); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); /* Check that we get a cached creds if we call grpc_google_default_credentials_create again. @@ -1054,7 +1054,7 @@ static void plugin_destroy(void* state) { static void test_metadata_plugin_success(void) { plugin_state state = PLUGIN_INITIAL_STATE; grpc_metadata_credentials_plugin plugin; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, NULL, NULL}; request_metadata_state* md_state = make_request_metadata_state( @@ -1077,7 +1077,7 @@ static void test_metadata_plugin_success(void) { static void test_metadata_plugin_failure(void) { plugin_state state = PLUGIN_INITIAL_STATE; grpc_metadata_credentials_plugin plugin; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, NULL, NULL}; char* expected_error; @@ -1119,7 +1119,7 @@ static void test_get_well_known_google_credentials_file_path(void) { } static void test_channel_creds_duplicate_without_call_creds(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_credentials* channel_creds = grpc_fake_transport_security_credentials_create(); diff --git a/test/core/security/json_token_test.cc b/test/core/security/json_token_test.cc index 9eac2b92541..a139f3776f1 100644 --- a/test/core/security/json_token_test.cc +++ b/test/core/security/json_token_test.cc @@ -206,7 +206,7 @@ static void test_parse_json_key_failure_no_private_key(void) { static grpc_json* parse_json_part_from_jwt(const char* str, size_t len, char** scratchpad) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; char* b64; char* decoded; grpc_json* json; @@ -326,7 +326,7 @@ static void check_jwt_claim(grpc_json* claim, const char* expected_audience, static void check_jwt_signature(const char* b64_signature, RSA* rsa_key, const char* signed_data, size_t signed_data_size) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; EVP_MD_CTX* md_ctx = EVP_MD_CTX_create(); EVP_PKEY* key = EVP_PKEY_new(); diff --git a/test/core/security/jwt_verifier_test.cc b/test/core/security/jwt_verifier_test.cc index 7485aa10b4e..55e28e6eb2c 100644 --- a/test/core/security/jwt_verifier_test.cc +++ b/test/core/security/jwt_verifier_test.cc @@ -209,7 +209,7 @@ static void test_claims_success(void) { grpc_json* json = grpc_json_parse_string_with_len( (char*)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); GPR_ASSERT(json != NULL); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; claims = grpc_jwt_claims_from_json(json, s); GPR_ASSERT(claims != NULL); GPR_ASSERT(grpc_jwt_claims_json(claims) == json); @@ -231,7 +231,7 @@ static void test_expired_claims_failure(void) { gpr_timespec exp_exp = {120, 0, GPR_CLOCK_REALTIME}; gpr_timespec exp_nbf = {60, 0, GPR_CLOCK_REALTIME}; GPR_ASSERT(json != NULL); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; claims = grpc_jwt_claims_from_json(json, s); GPR_ASSERT(claims != NULL); GPR_ASSERT(grpc_jwt_claims_json(claims) == json); @@ -252,7 +252,7 @@ static void test_invalid_claims_failure(void) { grpc_slice s = grpc_slice_from_copied_string(invalid_claims); grpc_json* json = grpc_json_parse_string_with_len( (char*)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GPR_ASSERT(grpc_jwt_claims_from_json(json, s) == NULL); } @@ -262,7 +262,7 @@ static void test_bad_audience_claims_failure(void) { grpc_json* json = grpc_json_parse_string_with_len( (char*)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); GPR_ASSERT(json != NULL); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; claims = grpc_jwt_claims_from_json(json, s); GPR_ASSERT(claims != NULL); GPR_ASSERT(grpc_jwt_claims_check(claims, "https://bar.com") == @@ -276,7 +276,7 @@ static void test_bad_subject_claims_failure(void) { grpc_json* json = grpc_json_parse_string_with_len( (char*)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); GPR_ASSERT(json != NULL); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; claims = grpc_jwt_claims_from_json(json, s); GPR_ASSERT(claims != NULL); GPR_ASSERT(grpc_jwt_claims_check(claims, "https://foo.com") == @@ -350,7 +350,7 @@ static void on_verification_success(void* user_data, } static void test_jwt_verifier_google_email_issuer_success(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(NULL, 0); char* jwt = NULL; char* key_str = json_key_str(json_key_str_part3_for_google_email_issuer); @@ -383,7 +383,7 @@ static int httpcli_get_custom_keys_for_email( } static void test_jwt_verifier_custom_email_issuer_success(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(&custom_mapping, 1); char* jwt = NULL; char* key_str = json_key_str(json_key_str_part3_for_custom_email_issuer); @@ -430,7 +430,7 @@ static int httpcli_get_openid_config(const grpc_httpcli_request* request, } static void test_jwt_verifier_url_issuer_success(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(NULL, 0); char* jwt = NULL; char* key_str = json_key_str(json_key_str_part3_for_url_issuer); @@ -469,7 +469,7 @@ static int httpcli_get_bad_json(const grpc_httpcli_request* request, } static void test_jwt_verifier_url_issuer_bad_config(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(NULL, 0); char* jwt = NULL; char* key_str = json_key_str(json_key_str_part3_for_url_issuer); @@ -492,7 +492,7 @@ static void test_jwt_verifier_url_issuer_bad_config(void) { } static void test_jwt_verifier_bad_json_key(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(NULL, 0); char* jwt = NULL; char* key_str = json_key_str(json_key_str_part3_for_google_email_issuer); @@ -521,7 +521,7 @@ static void corrupt_jwt_sig(char* jwt) { char* last_dot = strrchr(jwt, '.'); GPR_ASSERT(last_dot != NULL); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; sig = grpc_base64_decode(last_dot + 1, 1); } GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(sig)); @@ -543,7 +543,7 @@ static void on_verification_bad_signature(void* user_data, } static void test_jwt_verifier_bad_signature(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(NULL, 0); char* jwt = NULL; char* key_str = json_key_str(json_key_str_part3_for_url_issuer); @@ -583,7 +583,7 @@ static void on_verification_bad_format(void* user_data, } static void test_jwt_verifier_bad_format(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(NULL, 0); grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); diff --git a/test/core/security/oauth2_utils.cc b/test/core/security/oauth2_utils.cc index f4a52aaba0c..e24ccbc1073 100644 --- a/test/core/security/oauth2_utils.cc +++ b/test/core/security/oauth2_utils.cc @@ -69,7 +69,7 @@ char* grpc_test_fetch_oauth2_token_with_credentials( grpc_call_credentials* creds) { oauth2_request request; memset(&request, 0, sizeof(request)); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_closure do_nothing_closure; grpc_auth_metadata_context null_ctx = {"", "", NULL, NULL}; @@ -92,7 +92,7 @@ char* grpc_test_fetch_oauth2_token_with_credentials( on_oauth2_response(&request, error); GRPC_ERROR_UNREF(error); } - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(request.mu); while (!request.is_done) { diff --git a/test/core/security/print_google_default_creds_token.cc b/test/core/security/print_google_default_creds_token.cc index 6153e8a9cb0..29201afe40a 100644 --- a/test/core/security/print_google_default_creds_token.cc +++ b/test/core/security/print_google_default_creds_token.cc @@ -62,7 +62,7 @@ static void on_metadata_response(void* arg, grpc_error* error) { int main(int argc, char** argv) { int result = 0; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; synchronizer sync; grpc_channel_credentials* creds = NULL; const char* service_url = "https://test.foo.google.com/Foo"; @@ -111,7 +111,7 @@ int main(int argc, char** argv) { GRPC_MILLIS_INF_FUTURE))) sync.is_done = true; gpr_mu_unlock(sync.mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(sync.mu); } gpr_mu_unlock(sync.mu); diff --git a/test/core/security/secure_endpoint_test.cc b/test/core/security/secure_endpoint_test.cc index a49bf1a0b4b..7cee0dd3fe4 100644 --- a/test/core/security/secure_endpoint_test.cc +++ b/test/core/security/secure_endpoint_test.cc @@ -38,7 +38,7 @@ static grpc_pollset* g_pollset; static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( size_t slice_size, grpc_slice* leftover_slices, size_t leftover_nslices, bool use_zero_copy_protector) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; tsi_frame_protector* fake_read_protector = tsi_create_fake_frame_protector(NULL); tsi_frame_protector* fake_write_protector = @@ -170,7 +170,7 @@ static void test_leftover(grpc_endpoint_test_config config, size_t slice_size) { grpc_slice_buffer incoming; grpc_slice s = grpc_slice_from_copied_string("hello world 12345678900987654321"); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; int n = 0; grpc_closure done_closure; gpr_log(GPR_INFO, "Start test left over"); @@ -202,7 +202,7 @@ static void destroy_pollset(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_test_init(argc, argv); grpc_init(); diff --git a/test/core/security/ssl_server_fuzzer.cc b/test/core/security/ssl_server_fuzzer.cc index 84a42546c67..b9198279e3f 100644 --- a/test/core/security/ssl_server_fuzzer.cc +++ b/test/core/security/ssl_server_fuzzer.cc @@ -55,7 +55,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (squelch) gpr_set_log_function(dont_log); if (leak_check) grpc_memory_counters_init(); grpc_init(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resource_quota* resource_quota = grpc_resource_quota_create("ssl_server_fuzzer"); @@ -83,7 +83,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_security_status status = grpc_server_credentials_create_security_connector(creds, &sc); GPR_ASSERT(status == GRPC_SECURITY_OK); - grpc_millis deadline = GPR_MS_PER_SEC + ExecCtx::Get()->Now(); + grpc_millis deadline = GPR_MS_PER_SEC + grpc_core::ExecCtx::Get()->Now(); struct handshake_state state; state.done_callback_called = false; @@ -92,7 +92,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_handshake_manager_do_handshake( handshake_mgr, mock_endpoint, NULL /* channel_args */, deadline, NULL /* acceptor */, on_handshake_done, &state); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); // If the given string happens to be part of the correct client hello, the // server will wait for more data. Explicitly fail the server by shutting down @@ -100,7 +100,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (!state.done_callback_called) { grpc_endpoint_shutdown( mock_endpoint, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Explicit close")); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } GPR_ASSERT(state.done_callback_called); @@ -111,7 +111,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_slice_unref(cert_slice); grpc_slice_unref(key_slice); grpc_slice_unref(ca_slice); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); grpc_shutdown(); if (leak_check) { diff --git a/test/core/security/verify_jwt.cc b/test/core/security/verify_jwt.cc index f3e89666257..c4c3541d198 100644 --- a/test/core/security/verify_jwt.cc +++ b/test/core/security/verify_jwt.cc @@ -76,7 +76,7 @@ int main(int argc, char** argv) { gpr_cmdline* cl; const char* jwt = NULL; const char* aud = NULL; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_init(); cl = gpr_cmdline_create("JWT verifier tool"); @@ -106,7 +106,7 @@ int main(int argc, char** argv) { grpc_pollset_work(sync.pollset, &worker, GRPC_MILLIS_INF_FUTURE))) sync.is_done = true; gpr_mu_unlock(sync.mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(sync.mu); } gpr_mu_unlock(sync.mu); diff --git a/test/core/slice/b64_test.cc b/test/core/slice/b64_test.cc index 5ed99107405..08a5770b2af 100644 --- a/test/core/slice/b64_test.cc +++ b/test/core/slice/b64_test.cc @@ -44,7 +44,7 @@ static void test_simple_encode_decode_b64(int url_safe, int multiline) { const char* hello = "hello"; char* hello_b64 = grpc_base64_encode(hello, strlen(hello), url_safe, multiline); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_slice hello_slice = grpc_base64_decode(hello_b64, url_safe); GPR_ASSERT(GRPC_SLICE_LENGTH(hello_slice) == strlen(hello)); GPR_ASSERT(strncmp((const char*)GRPC_SLICE_START_PTR(hello_slice), hello, @@ -64,7 +64,7 @@ static void test_full_range_encode_decode_b64(int url_safe, int multiline) { /* Try all the different paddings. */ for (i = 0; i < 3; i++) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; b64 = grpc_base64_encode(orig, sizeof(orig) - i, url_safe, multiline); orig_decoded = grpc_base64_decode(b64, url_safe); GPR_ASSERT(GRPC_SLICE_LENGTH(orig_decoded) == (sizeof(orig) - i)); @@ -115,7 +115,7 @@ static void test_url_safe_unsafe_mismatch_failure(void) { int url_safe = 1; for (i = 0; i < sizeof(orig); i++) orig[i] = (uint8_t)i; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; b64 = grpc_base64_encode(orig, sizeof(orig), url_safe, 0); orig_decoded = grpc_base64_decode(b64, !url_safe); GPR_ASSERT(GRPC_SLICE_IS_EMPTY(orig_decoded)); @@ -164,7 +164,7 @@ static void test_rfc4648_test_vectors(void) { static void test_unpadded_decode(void) { grpc_slice decoded; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; decoded = grpc_base64_decode("Zm9vYmFy", 0); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(decoded)); GPR_ASSERT(grpc_slice_str_cmp(decoded, "foobar") == 0); diff --git a/test/core/slice/slice_hash_table_test.cc b/test/core/slice/slice_hash_table_test.cc index 89fc33a7bf0..ea00688af0b 100644 --- a/test/core/slice/slice_hash_table_test.cc +++ b/test/core/slice/slice_hash_table_test.cc @@ -119,7 +119,7 @@ static void test_slice_hash_table() { check_values(test_entries, num_entries, table); check_non_existent_value("XX", table); // Clean up. - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_slice_hash_table_unref(table); } @@ -146,7 +146,7 @@ static void test_slice_hash_table_eq() { create_table_from_entries(test_entries_b, num_entries_b, value_cmp_fn); GPR_ASSERT(grpc_slice_hash_table_cmp(table_a, table_b) == 0); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_slice_hash_table_unref(table_a); grpc_slice_hash_table_unref(table_b); } @@ -217,7 +217,7 @@ static void test_slice_hash_table_not_eq() { create_table_from_entries(test_entries_h, num_entries_h, pointer_cmp_fn); GPR_ASSERT(grpc_slice_hash_table_cmp(table_g, table_h) != 0); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_slice_hash_table_unref(table_a); grpc_slice_hash_table_unref(table_b_larger); grpc_slice_hash_table_unref(table_b_smaller); diff --git a/test/core/surface/byte_buffer_reader_test.cc b/test/core/surface/byte_buffer_reader_test.cc index 1f3a83efe64..f9ce98da218 100644 --- a/test/core/surface/byte_buffer_reader_test.cc +++ b/test/core/surface/byte_buffer_reader_test.cc @@ -132,7 +132,7 @@ static void read_compressed_slice(grpc_compression_algorithm algorithm, memset(GRPC_SLICE_START_PTR(input_slice), 'a', input_size); grpc_slice_buffer_add(&sliceb_in, input_slice); /* takes ownership */ { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GPR_ASSERT(grpc_msg_compress(algorithm, &sliceb_in, &sliceb_out)); } diff --git a/test/core/surface/channel_create_test.cc b/test/core/surface/channel_create_test.cc index ece06e4968b..3e7dd311db0 100644 --- a/test/core/surface/channel_create_test.cc +++ b/test/core/surface/channel_create_test.cc @@ -35,7 +35,7 @@ void test_unknown_scheme_target(void) { chan = grpc_insecure_channel_create("blah://blah", NULL, NULL); GPR_ASSERT(chan != NULL); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_element* elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); diff --git a/test/core/surface/completion_queue_test.cc b/test/core/surface/completion_queue_test.cc index 39aedeba026..e38b087a4b0 100644 --- a/test/core/surface/completion_queue_test.cc +++ b/test/core/surface/completion_queue_test.cc @@ -136,7 +136,7 @@ static void test_cq_end_op(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_NEXT; for (size_t i = 0; i < GPR_ARRAY_SIZE(polling_types); i++) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; attr.cq_polling_type = polling_types[i]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, NULL); @@ -170,7 +170,7 @@ static void test_cq_tls_cache_full(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_NEXT; for (size_t i = 0; i < GPR_ARRAY_SIZE(polling_types); i++) { - ExecCtx _local_exec_ctx; // Reset exec_ctx + grpc_core::ExecCtx _local_exec_ctx; // Reset exec_ctx attr.cq_polling_type = polling_types[i]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, NULL); @@ -208,7 +208,7 @@ static void test_cq_tls_cache_empty(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_NEXT; for (size_t i = 0; i < GPR_ARRAY_SIZE(polling_types); i++) { - ExecCtx _local_exec_ctx; // Reset exec_ctx + grpc_core::ExecCtx _local_exec_ctx; // Reset exec_ctx attr.cq_polling_type = polling_types[i]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, NULL); @@ -289,7 +289,7 @@ static void test_pluck(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_PLUCK; for (size_t pidx = 0; pidx < GPR_ARRAY_SIZE(polling_types); pidx++) { - ExecCtx _local_exec_ctx; // reset exec_ctx + grpc_core::ExecCtx _local_exec_ctx; // reset exec_ctx attr.cq_polling_type = polling_types[pidx]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, NULL); diff --git a/test/core/surface/completion_queue_threading_test.cc b/test/core/surface/completion_queue_threading_test.cc index 6625e7e09f1..0c818e02813 100644 --- a/test/core/surface/completion_queue_threading_test.cc +++ b/test/core/surface/completion_queue_threading_test.cc @@ -80,7 +80,7 @@ static void test_too_many_plucks(void) { gpr_thd_id thread_ids[GPR_ARRAY_SIZE(tags)]; struct thread_state thread_states[GPR_ARRAY_SIZE(tags)]; gpr_thd_options thread_options = gpr_thd_options_default(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; unsigned i, j; LOG_TEST("test_too_many_plucks"); @@ -142,7 +142,7 @@ static void free_completion(void* arg, grpc_cq_completion* completion) { static void producer_thread(void* arg) { test_thread_options* opt = static_cast(arg); int i; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_log(GPR_INFO, "producer %d started", opt->id); gpr_event_set(&opt->on_started, (void*)(intptr_t)1); diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index b3999b481f5..18d7f2f9856 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -115,7 +115,7 @@ static void on_connect(void* vargs, grpc_endpoint* tcp, void bad_server_thread(void* vargs) { struct server_thread_args* args = (struct server_thread_args*)vargs; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_storage* addr = (struct sockaddr_storage*)resolved_addr.addr; int port; @@ -134,7 +134,7 @@ void bad_server_thread(void* vargs) { gpr_mu_lock(args->mu); while (gpr_atm_acq_load(&args->stop) == 0) { - grpc_millis deadline = ExecCtx::Get()->Now() + 100; + grpc_millis deadline = grpc_core::ExecCtx::Get()->Now() + 100; grpc_pollset_worker* worker = NULL; if (!GRPC_LOG_IF_ERROR( @@ -222,7 +222,7 @@ int run_concurrent_connectivity_test() { gpr_atm_rel_store(&args.stop, 1); gpr_thd_join(server); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_pollset_shutdown(args.pollset, GRPC_CLOSURE_CREATE(done_pollset_shutdown, args.pollset, grpc_schedule_on_exec_ctx)); diff --git a/test/core/surface/lame_client_test.cc b/test/core/surface/lame_client_test.cc index dd14a035771..54d55bf4404 100644 --- a/test/core/surface/lame_client_test.cc +++ b/test/core/surface/lame_client_test.cc @@ -44,7 +44,7 @@ void test_transport_op(grpc_channel* channel) { grpc_transport_op* op; grpc_channel_element* elem; grpc_connectivity_state state = GRPC_CHANNEL_IDLE; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_CLOSURE_INIT(&transport_op_cb, verify_connectivity, &state, grpc_schedule_on_exec_ctx); diff --git a/test/core/surface/num_external_connectivity_watchers_test.cc b/test/core/surface/num_external_connectivity_watchers_test.cc index bf51dac6ddb..59fecf2d502 100644 --- a/test/core/surface/num_external_connectivity_watchers_test.cc +++ b/test/core/surface/num_external_connectivity_watchers_test.cc @@ -178,7 +178,7 @@ static grpc_channel* secure_test_create_channel(const char* addr) { grpc_channel* channel = grpc_secure_channel_create(ssl_creds, addr, new_client_args, NULL); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(new_client_args); } grpc_channel_credentials_release(ssl_creds); diff --git a/test/core/surface/secure_channel_create_test.cc b/test/core/surface/secure_channel_create_test.cc index dd9f907652a..14afa6f18e3 100644 --- a/test/core/surface/secure_channel_create_test.cc +++ b/test/core/surface/secure_channel_create_test.cc @@ -37,7 +37,7 @@ void test_unknown_scheme_target(void) { grpc_channel_element* elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_CHANNEL_INTERNAL_UNREF(chan, "test"); grpc_channel_credentials_unref(creds); } @@ -54,7 +54,7 @@ void test_security_connector_already_in_arg(void) { grpc_channel_element* elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_CHANNEL_INTERNAL_UNREF(chan, "test"); } @@ -63,7 +63,7 @@ void test_null_creds(void) { grpc_channel_element* elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GRPC_CHANNEL_INTERNAL_UNREF(chan, "test"); } diff --git a/test/core/surface/sequential_connectivity_test.cc b/test/core/surface/sequential_connectivity_test.cc index aae418cedbe..5ad9ce65d19 100644 --- a/test/core/surface/sequential_connectivity_test.cc +++ b/test/core/surface/sequential_connectivity_test.cc @@ -156,7 +156,7 @@ static grpc_channel* secure_test_create_channel(const char* addr) { grpc_channel* channel = grpc_secure_channel_create(ssl_creds, addr, new_client_args, NULL); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_channel_args_destroy(new_client_args); } grpc_channel_credentials_release(ssl_creds); diff --git a/test/core/transport/bdp_estimator_test.cc b/test/core/transport/bdp_estimator_test.cc index 4d41ece875f..168807adde7 100644 --- a/test/core/transport/bdp_estimator_test.cc +++ b/test/core/transport/bdp_estimator_test.cc @@ -58,7 +58,7 @@ namespace { void AddSamples(BdpEstimator* estimator, int64_t* samples, size_t n) { estimator->AddIncomingBytes(1234567); inc_time(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; estimator->SchedulePing(); estimator->StartPing(); for (size_t i = 0; i < n; i++) { @@ -66,7 +66,7 @@ void AddSamples(BdpEstimator* estimator, int64_t* samples, size_t n) { } gpr_sleep_until(gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_millis(1, GPR_TIMESPAN))); - ExecCtx::Get()->InvalidateNow(); + grpc_core::ExecCtx::Get()->InvalidateNow(); estimator->CompletePing(); } diff --git a/test/core/transport/byte_stream_test.cc b/test/core/transport/byte_stream_test.cc index 12a933f3327..08dd91e4ec0 100644 --- a/test/core/transport/byte_stream_test.cc +++ b/test/core/transport/byte_stream_test.cc @@ -36,7 +36,7 @@ static void not_called_closure(void* arg, grpc_error* error) { static void test_slice_buffer_stream_basic(void) { gpr_log(GPR_DEBUG, "test_slice_buffer_stream_basic"); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; // Create and populate slice buffer. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -70,7 +70,7 @@ static void test_slice_buffer_stream_basic(void) { static void test_slice_buffer_stream_shutdown(void) { gpr_log(GPR_DEBUG, "test_slice_buffer_stream_shutdown"); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; // Create and populate slice buffer. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -116,7 +116,7 @@ static void test_slice_buffer_stream_shutdown(void) { static void test_caching_byte_stream_basic(void) { gpr_log(GPR_DEBUG, "test_caching_byte_stream_basic"); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; // Create and populate slice buffer byte stream. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -155,7 +155,7 @@ static void test_caching_byte_stream_basic(void) { static void test_caching_byte_stream_reset(void) { gpr_log(GPR_DEBUG, "test_caching_byte_stream_reset"); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; // Create and populate slice buffer byte stream. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -201,7 +201,7 @@ static void test_caching_byte_stream_reset(void) { static void test_caching_byte_stream_shared_cache(void) { gpr_log(GPR_DEBUG, "test_caching_byte_stream_shared_cache"); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; // Create and populate slice buffer byte stream. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); diff --git a/test/core/transport/chttp2/bin_decoder_test.cc b/test/core/transport/chttp2/bin_decoder_test.cc index 3d463c40a53..897d3008b9a 100644 --- a/test/core/transport/chttp2/bin_decoder_test.cc +++ b/test/core/transport/chttp2/bin_decoder_test.cc @@ -76,7 +76,7 @@ static grpc_slice base64_decode_with_length(const char* s, s, grpc_chttp2_base64_decode_with_length(base64_encode(s), strlen(s))); int main(int argc, char** argv) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; /* ENCODE_AND_DECODE tests grpc_chttp2_base64_decode_with_length(), which takes encoded base64 strings without pad chars, but output length is diff --git a/test/core/transport/chttp2/hpack_encoder_test.cc b/test/core/transport/chttp2/hpack_encoder_test.cc index fe4538339e9..91e2ca376ef 100644 --- a/test/core/transport/chttp2/hpack_encoder_test.cc +++ b/test/core/transport/chttp2/hpack_encoder_test.cc @@ -257,7 +257,7 @@ static void test_interned_key_indexed() { static void run_test(void (*test)(), const char* name) { gpr_log(GPR_INFO, "RUN TEST: %s", name); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_chttp2_hpack_compressor_init(&g_compressor); test(); grpc_chttp2_hpack_compressor_destroy(&g_compressor); diff --git a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc index feb27fc0ff6..0dfd5ecc2d8 100644 --- a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc +++ b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc @@ -37,7 +37,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (squelch) gpr_set_log_function(dont_log); grpc_init(); grpc_chttp2_hpack_parser parser; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_chttp2_hpack_parser_init(&parser); parser.on_header = onhdr; GRPC_ERROR_UNREF(grpc_chttp2_hpack_parser_parse( diff --git a/test/core/transport/chttp2/hpack_parser_test.cc b/test/core/transport/chttp2/hpack_parser_test.cc index 69a13108f94..1bd3644faba 100644 --- a/test/core/transport/chttp2/hpack_parser_test.cc +++ b/test/core/transport/chttp2/hpack_parser_test.cc @@ -62,7 +62,7 @@ static void test_vector(grpc_chttp2_hpack_parser* parser, grpc_slice_unref(input); for (i = 0; i < nslices; i++) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GPR_ASSERT(grpc_chttp2_hpack_parser_parse(parser, slices[i]) == GRPC_ERROR_NONE); } @@ -79,7 +79,7 @@ static void test_vector(grpc_chttp2_hpack_parser* parser, static void test_vectors(grpc_slice_split_mode mode) { grpc_chttp2_hpack_parser parser; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_chttp2_hpack_parser_init(&parser); /* D.2.1 */ diff --git a/test/core/transport/chttp2/hpack_table_test.cc b/test/core/transport/chttp2/hpack_table_test.cc index fd5604d8576..97e1a02621b 100644 --- a/test/core/transport/chttp2/hpack_table_test.cc +++ b/test/core/transport/chttp2/hpack_table_test.cc @@ -44,7 +44,7 @@ static void assert_index(const grpc_chttp2_hptbl* tbl, uint32_t idx, } static void test_static_lookup(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_chttp2_hptbl tbl; grpc_chttp2_hptbl_init(&tbl); @@ -123,7 +123,7 @@ static void test_many_additions(void) { LOG_TEST("test_many_additions"); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_chttp2_hptbl_init(&tbl); for (i = 0; i < 100000; i++) { @@ -152,7 +152,7 @@ static void test_many_additions(void) { static grpc_chttp2_hptbl_find_result find_simple(grpc_chttp2_hptbl* tbl, const char* key, const char* value) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_mdelem md = grpc_mdelem_from_slices( grpc_slice_from_copied_string(key), grpc_slice_from_copied_string(value)); grpc_chttp2_hptbl_find_result r = grpc_chttp2_hptbl_find(tbl, md); @@ -162,7 +162,7 @@ static grpc_chttp2_hptbl_find_result find_simple(grpc_chttp2_hptbl* tbl, } static void test_find(void) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_chttp2_hptbl tbl; uint32_t i; char buffer[32]; diff --git a/test/core/transport/connectivity_state_test.cc b/test/core/transport/connectivity_state_test.cc index 8ddd8bb2dfe..0ccf7ba2887 100644 --- a/test/core/transport/connectivity_state_test.cc +++ b/test/core/transport/connectivity_state_test.cc @@ -57,7 +57,7 @@ static void test_connectivity_state_name(void) { static void test_check(void) { grpc_connectivity_state_tracker tracker; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_error* error; gpr_log(GPR_DEBUG, "test_check"); grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx"); @@ -73,17 +73,17 @@ static void test_subscribe_then_unsubscribe(void) { grpc_closure* closure = GRPC_CLOSURE_CREATE(must_fail, THE_ARG, grpc_schedule_on_exec_ctx); grpc_connectivity_state state = GRPC_CHANNEL_IDLE; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_log(GPR_DEBUG, "test_subscribe_then_unsubscribe"); g_counter = 0; grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx"); GPR_ASSERT(grpc_connectivity_state_notify_on_state_change(&tracker, &state, closure)); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(state == GRPC_CHANNEL_IDLE); GPR_ASSERT(g_counter == 0); grpc_connectivity_state_notify_on_state_change(&tracker, NULL, closure); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(state == GRPC_CHANNEL_IDLE); GPR_ASSERT(g_counter == 1); @@ -95,13 +95,13 @@ static void test_subscribe_then_destroy(void) { grpc_closure* closure = GRPC_CLOSURE_CREATE(must_succeed, THE_ARG, grpc_schedule_on_exec_ctx); grpc_connectivity_state state = GRPC_CHANNEL_IDLE; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_log(GPR_DEBUG, "test_subscribe_then_destroy"); g_counter = 0; grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx"); GPR_ASSERT(grpc_connectivity_state_notify_on_state_change(&tracker, &state, closure)); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(state == GRPC_CHANNEL_IDLE); GPR_ASSERT(g_counter == 0); grpc_connectivity_state_destroy(&tracker); @@ -115,13 +115,13 @@ static void test_subscribe_with_failure_then_destroy(void) { grpc_closure* closure = GRPC_CLOSURE_CREATE(must_fail, THE_ARG, grpc_schedule_on_exec_ctx); grpc_connectivity_state state = GRPC_CHANNEL_SHUTDOWN; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_log(GPR_DEBUG, "test_subscribe_with_failure_then_destroy"); g_counter = 0; grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_SHUTDOWN, "xxx"); GPR_ASSERT(0 == grpc_connectivity_state_notify_on_state_change( &tracker, &state, closure)); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(state == GRPC_CHANNEL_SHUTDOWN); GPR_ASSERT(g_counter == 0); grpc_connectivity_state_destroy(&tracker); diff --git a/test/core/transport/metadata_test.cc b/test/core/transport/metadata_test.cc index 3d7034e4cea..e5bdc5901d6 100644 --- a/test/core/transport/metadata_test.cc +++ b/test/core/transport/metadata_test.cc @@ -60,7 +60,7 @@ static void test_create_metadata(bool intern_keys, bool intern_values) { intern_keys, intern_values); grpc_init(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; m1 = grpc_mdelem_from_slices( maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values)); @@ -95,7 +95,7 @@ static void test_create_many_ephemeral_metadata(bool intern_keys, intern_keys, intern_values); grpc_init(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; /* add, and immediately delete a bunch of different elements */ for (i = 0; i < MANY; i++) { gpr_ltoa(i, buffer); @@ -117,7 +117,7 @@ static void test_create_many_persistant_metadata(void) { gpr_log(GPR_INFO, "test_create_many_persistant_metadata"); grpc_init(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; /* add phase */ for (i = 0; i < MANY; i++) { gpr_ltoa(i, buffer); @@ -151,7 +151,7 @@ static void test_spin_creating_the_same_thing(bool intern_keys, intern_keys, intern_values); grpc_init(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_mdelem a, b, c; GRPC_MDELEM_UNREF( a = grpc_mdelem_from_slices( @@ -178,7 +178,7 @@ static void test_identity_laws(bool intern_keys, bool intern_values) { intern_keys, intern_values); grpc_init(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_mdelem a, b, c; a = grpc_mdelem_from_slices( maybe_intern(grpc_slice_from_static_string("a"), intern_keys), @@ -225,7 +225,7 @@ static void test_things_stick_around(void) { gpr_log(GPR_INFO, "test_things_stick_around"); grpc_init(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; for (i = 0; i < nstrs; i++) { gpr_asprintf(&buffer, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx%" PRIuPTR "x", i); @@ -271,7 +271,7 @@ static void test_user_data_works(void) { gpr_log(GPR_INFO, "test_user_data_works"); grpc_init(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; ud1 = static_cast(gpr_malloc(sizeof(int))); *ud1 = 1; ud2 = static_cast(gpr_malloc(sizeof(int))); @@ -322,7 +322,7 @@ static void test_mdelem_sizes_in_hpack(bool intern_key, bool intern_value) { gpr_log(GPR_INFO, "test_mdelem_size: intern_key=%d intern_value=%d", intern_key, intern_value); grpc_init(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; uint8_t binary_value[BUFFER_SIZE] = {0}; for (uint8_t i = 0; i < BUFFER_SIZE; i++) { @@ -346,7 +346,7 @@ static void test_copied_static_metadata(bool dup_key, bool dup_value) { gpr_log(GPR_INFO, "test_static_metadata: dup_key=%d dup_value=%d", dup_key, dup_value); grpc_init(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; for (size_t i = 0; i < GRPC_STATIC_MDELEM_COUNT; i++) { grpc_mdelem p = GRPC_MAKE_MDELEM(&grpc_static_mdelem_table[i], diff --git a/test/core/transport/status_conversion_test.cc b/test/core/transport/status_conversion_test.cc index 16ecd076a30..2a192e04ef8 100644 --- a/test/core/transport/status_conversion_test.cc +++ b/test/core/transport/status_conversion_test.cc @@ -24,7 +24,7 @@ GPR_ASSERT(grpc_status_to_http2_error(a) == (b)) #define HTTP2_ERROR_TO_GRPC_STATUS(a, deadline, b) \ do { \ - ExecCtx _local_exec_ctx; \ + grpc_core::ExecCtx _local_exec_ctx; \ GPR_ASSERT(grpc_http2_error_to_grpc_status(a, deadline) == (b)); \ \ } while (0) diff --git a/test/core/util/port_server_client.cc b/test/core/util/port_server_client.cc index 4e68ee3744d..8e61145a265 100644 --- a/test/core/util/port_server_client.cc +++ b/test/core/util/port_server_client.cc @@ -62,7 +62,7 @@ void grpc_free_port_using_server(int port) { grpc_httpcli_response rsp; freereq pr; char* path; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_closure* shutdown_closure; grpc_init(); @@ -85,19 +85,20 @@ void grpc_free_port_using_server(int port) { grpc_resource_quota* resource_quota = grpc_resource_quota_create("port_server_client/free"); grpc_httpcli_get(&context, &pr.pops, resource_quota, &req, - ExecCtx::Get()->Now() + 30 * GPR_MS_PER_SEC, + grpc_core::ExecCtx::Get()->Now() + 30 * GPR_MS_PER_SEC, GRPC_CLOSURE_CREATE(freed_port_from_server, &pr, grpc_schedule_on_exec_ctx), &rsp); grpc_resource_quota_unref_internal(resource_quota); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(pr.mu); while (!pr.done) { grpc_pollset_worker* worker = NULL; if (!GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(grpc_polling_entity_pollset(&pr.pops), &worker, - ExecCtx::Get()->Now() + GPR_MS_PER_SEC))) { + grpc_pollset_work( + grpc_polling_entity_pollset(&pr.pops), &worker, + grpc_core::ExecCtx::Get()->Now() + GPR_MS_PER_SEC))) { pr.done = 1; } } @@ -167,7 +168,7 @@ static void got_port_from_server(void* arg, grpc_error* error) { grpc_resource_quota* resource_quota = grpc_resource_quota_create("port_server_client/pick_retry"); grpc_httpcli_get(pr->ctx, &pr->pops, resource_quota, &req, - ExecCtx::Get()->Now() + 30 * GPR_MS_PER_SEC, + grpc_core::ExecCtx::Get()->Now() + 30 * GPR_MS_PER_SEC, GRPC_CLOSURE_CREATE(got_port_from_server, pr, grpc_schedule_on_exec_ctx), &pr->response); @@ -193,7 +194,7 @@ int grpc_pick_port_using_server(void) { grpc_httpcli_context context; grpc_httpcli_request req; portreq pr; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_closure* shutdown_closure; grpc_init(); @@ -217,18 +218,19 @@ int grpc_pick_port_using_server(void) { grpc_resource_quota_create("port_server_client/pick"); grpc_httpcli_get( &context, &pr.pops, resource_quota, &req, - ExecCtx::Get()->Now() + 30 * GPR_MS_PER_SEC, + grpc_core::ExecCtx::Get()->Now() + 30 * GPR_MS_PER_SEC, GRPC_CLOSURE_CREATE(got_port_from_server, &pr, grpc_schedule_on_exec_ctx), &pr.response); grpc_resource_quota_unref_internal(resource_quota); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(pr.mu); while (pr.port == -1) { grpc_pollset_worker* worker = NULL; if (!GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(grpc_polling_entity_pollset(&pr.pops), &worker, - ExecCtx::Get()->Now() + GPR_MS_PER_SEC))) { + grpc_pollset_work( + grpc_polling_entity_pollset(&pr.pops), &worker, + grpc_core::ExecCtx::Get()->Now() + GPR_MS_PER_SEC))) { pr.port = 0; } } diff --git a/test/core/util/test_tcp_server.cc b/test/core/util/test_tcp_server.cc index 7e17ff1f532..6418a7dfaa2 100644 --- a/test/core/util/test_tcp_server.cc +++ b/test/core/util/test_tcp_server.cc @@ -55,7 +55,7 @@ void test_tcp_server_start(test_tcp_server* server, int port) { grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; int port_added; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; addr->sin_family = AF_INET; addr->sin_port = htons((uint16_t)port); @@ -76,7 +76,7 @@ void test_tcp_server_start(test_tcp_server* server, int port) { void test_tcp_server_poll(test_tcp_server* server, int seconds) { grpc_pollset_worker* worker = NULL; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_millis deadline = grpc_timespec_to_millis_round_up( grpc_timeout_seconds_to_deadline(seconds)); gpr_mu_lock(server->mu); @@ -91,7 +91,7 @@ static void finish_pollset(void* arg, grpc_error* error) { } void test_tcp_server_destroy(test_tcp_server* server) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_timespec shutdown_deadline; grpc_closure do_nothing_cb; grpc_tcp_server_unref(server->tcp_server); diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index 4cf39eab482..d4289850341 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -112,7 +112,7 @@ class ClientLbEnd2endTest : public ::testing::Test { } void SetNextResolution(const std::vector& ports) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_lb_addresses* addresses = grpc_lb_addresses_create(ports.size(), NULL); for (size_t i = 0; i < ports.size(); ++i) { char* lb_uri_str; diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index 962d5a7e688..c5c53b8b8a8 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -451,7 +451,7 @@ class GrpclbEnd2endTest : public ::testing::Test { }; void SetNextResolution(const std::vector& address_data) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_lb_addresses* addresses = grpc_lb_addresses_create(address_data.size(), nullptr); for (size_t i = 0; i < address_data.size(); ++i) { diff --git a/test/cpp/grpclb/grpclb_test.cc b/test/cpp/grpclb/grpclb_test.cc index 6f6dd3c4df7..31103d9696e 100644 --- a/test/cpp/grpclb/grpclb_test.cc +++ b/test/cpp/grpclb/grpclb_test.cc @@ -558,7 +558,7 @@ static void perform_request(client_fixture* cf) { #define BALANCERS_NAME "lb.name" static void setup_client(const server_fixture* lb_server, const server_fixture* backends, client_fixture* cf) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; char* expected_target_names = NULL; const char* backends_name = lb_server->servers_hostport; diff --git a/test/cpp/microbenchmarks/bm_call_create.cc b/test/cpp/microbenchmarks/bm_call_create.cc index 47b984bc280..bb76a2e762b 100644 --- a/test/cpp/microbenchmarks/bm_call_create.cc +++ b/test/cpp/microbenchmarks/bm_call_create.cc @@ -521,7 +521,7 @@ static void BM_IsolatedFilter(benchmark::State& state) { label << " #has_dummy_filter"; } - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; size_t channel_size = grpc_channel_stack_size( filters.size() == 0 ? NULL : &filters[0], filters.size()); grpc_channel_stack* channel_stack = @@ -534,7 +534,7 @@ static void BM_IsolatedFilter(benchmark::State& state) { ? &dummy_transport::dummy_transport : nullptr, "CHANNEL", channel_stack))); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); grpc_call_stack* call_stack = static_cast(gpr_zalloc(channel_stack->call_stack_size)); grpc_millis deadline = GRPC_MILLIS_INF_FUTURE; @@ -558,7 +558,7 @@ static void BM_IsolatedFilter(benchmark::State& state) { typename TestOp::Op op(&test_op_data, call_stack); grpc_call_stack_destroy(call_stack, &final_info, NULL); op.Finish(); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); // recreate arena every 64k iterations to avoid oom if (0 == (state.iterations() & 0xffff)) { gpr_arena_destroy(call_args.arena); @@ -691,7 +691,7 @@ class IsolatedCallFixture : public TrackCounters { GPR_ASSERT(grpc_channel_stack_builder_append_filter( builder, &isolated_call_filter::isolated_call_filter, NULL, NULL)); { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; channel_ = grpc_channel_create_with_builder(builder, GRPC_CLIENT_CHANNEL); } cq_ = grpc_completion_queue_create_for_next(NULL); diff --git a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc index f822f095a78..d4f78e60b7b 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc @@ -50,12 +50,12 @@ static grpc_slice MakeSlice(std::vector bytes) { static void BM_HpackEncoderInitDestroy(benchmark::State& state) { TrackCounters track_counters; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_chttp2_hpack_compressor c; while (state.KeepRunning()) { grpc_chttp2_hpack_compressor_init(&c); grpc_chttp2_hpack_compressor_destroy(&c); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } track_counters.Finish(state); @@ -64,8 +64,8 @@ BENCHMARK(BM_HpackEncoderInitDestroy); static void BM_HpackEncoderEncodeDeadline(benchmark::State& state) { TrackCounters track_counters; - ExecCtx _local_exec_ctx; - grpc_millis saved_now = ExecCtx::Get()->Now(); + grpc_core::ExecCtx _local_exec_ctx; + grpc_millis saved_now = grpc_core::ExecCtx::Get()->Now(); grpc_metadata_batch b; grpc_metadata_batch_init(&b); @@ -87,7 +87,7 @@ static void BM_HpackEncoderEncodeDeadline(benchmark::State& state) { }; grpc_chttp2_encode_header(&c, NULL, 0, &b, &hopt, &outbuf); grpc_slice_buffer_reset_and_unref_internal(&outbuf); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } grpc_metadata_batch_destroy(&b); grpc_chttp2_hpack_compressor_destroy(&c); @@ -108,7 +108,7 @@ BENCHMARK(BM_HpackEncoderEncodeDeadline); template static void BM_HpackEncoderEncodeHeader(benchmark::State& state) { TrackCounters track_counters; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; static bool logged_representative_output = false; grpc_metadata_batch b; @@ -144,7 +144,7 @@ static void BM_HpackEncoderEncodeHeader(benchmark::State& state) { } } grpc_slice_buffer_reset_and_unref_internal(&outbuf); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } grpc_metadata_batch_destroy(&b); grpc_chttp2_hpack_compressor_destroy(&c); @@ -425,12 +425,12 @@ BENCHMARK_TEMPLATE(BM_HpackEncoderEncodeHeader, static void BM_HpackParserInitDestroy(benchmark::State& state) { TrackCounters track_counters; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_chttp2_hpack_parser p; while (state.KeepRunning()) { grpc_chttp2_hpack_parser_init(&p); grpc_chttp2_hpack_parser_destroy(&p); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } track_counters.Finish(state); @@ -444,7 +444,7 @@ static void UnrefHeader(void* user_data, grpc_mdelem md) { template static void BM_HpackParserParseHeader(benchmark::State& state) { TrackCounters track_counters; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; std::vector init_slices = Fixture::GetInitSlices(); std::vector benchmark_slices = Fixture::GetBenchmarkSlices(); grpc_chttp2_hpack_parser p; @@ -458,7 +458,7 @@ static void BM_HpackParserParseHeader(benchmark::State& state) { for (auto slice : benchmark_slices) { GPR_ASSERT(GRPC_ERROR_NONE == grpc_chttp2_hpack_parser_parse(&p, slice)); } - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } for (auto slice : init_slices) grpc_slice_unref(slice); for (auto slice : benchmark_slices) grpc_slice_unref(slice); diff --git a/test/cpp/microbenchmarks/bm_chttp2_transport.cc b/test/cpp/microbenchmarks/bm_chttp2_transport.cc index f6e4c2bcc43..caccde0cd9d 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_transport.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_transport.cc @@ -136,7 +136,7 @@ class Fixture { FlushExecCtx(); } - void FlushExecCtx() { ExecCtx::Get()->Flush(); } + void FlushExecCtx() { grpc_core::ExecCtx::Get()->Flush(); } ~Fixture() { grpc_transport_destroy(t_); } @@ -257,7 +257,7 @@ class Stream { static void BM_StreamCreateDestroy(benchmark::State& state) { TrackCounters track_counters; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; Fixture f(grpc::ChannelArguments(), true); Stream s(&f); grpc_transport_stream_op_batch op; @@ -303,7 +303,7 @@ class RepresentativeClientInitialMetadata { template static void BM_StreamCreateSendInitialMetadataDestroy(benchmark::State& state) { TrackCounters track_counters; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; Fixture f(grpc::ChannelArguments(), true); Stream s(&f); grpc_transport_stream_op_batch op; @@ -354,7 +354,7 @@ BENCHMARK_TEMPLATE(BM_StreamCreateSendInitialMetadataDestroy, static void BM_TransportEmptyOp(benchmark::State& state) { TrackCounters track_counters; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; Fixture f(grpc::ChannelArguments(), true); Stream s(&f); s.Init(state); @@ -387,7 +387,7 @@ std::vector> done_events; static void BM_TransportStreamSend(benchmark::State& state) { TrackCounters track_counters; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; Fixture f(grpc::ChannelArguments(), true); auto s = std::unique_ptr(new Stream(&f)); s->Init(state); @@ -517,7 +517,7 @@ static grpc_slice CreateIncomingDataSlice(size_t length, size_t frame_size) { static void BM_TransportStreamRecv(benchmark::State& state) { TrackCounters track_counters; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; Fixture f(grpc::ChannelArguments(), true); Stream s(&f); s.Init(state); diff --git a/test/cpp/microbenchmarks/bm_closure.cc b/test/cpp/microbenchmarks/bm_closure.cc index ce8a0545153..64925fd3f9e 100644 --- a/test/cpp/microbenchmarks/bm_closure.cc +++ b/test/cpp/microbenchmarks/bm_closure.cc @@ -34,7 +34,7 @@ auto& force_library_initialization = Library::get(); static void BM_NoOpExecCtx(benchmark::State& state) { TrackCounters track_counters; while (state.KeepRunning()) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; } track_counters.Finish(state); } @@ -42,9 +42,9 @@ BENCHMARK(BM_NoOpExecCtx); static void BM_WellFlushed(benchmark::State& state) { TrackCounters track_counters; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } track_counters.Finish(state); @@ -68,7 +68,7 @@ static void BM_ClosureInitAgainstCombiner(benchmark::State& state) { TrackCounters track_counters; grpc_combiner* combiner = grpc_combiner_create(); grpc_closure c; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { benchmark::DoNotOptimize(GRPC_CLOSURE_INIT( &c, DoNothing, NULL, grpc_combiner_scheduler(combiner))); @@ -83,10 +83,10 @@ static void BM_ClosureRunOnExecCtx(benchmark::State& state) { TrackCounters track_counters; grpc_closure c; GRPC_CLOSURE_INIT(&c, DoNothing, NULL, grpc_schedule_on_exec_ctx); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_RUN(&c, GRPC_ERROR_NONE); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } track_counters.Finish(state); @@ -95,7 +95,7 @@ BENCHMARK(BM_ClosureRunOnExecCtx); static void BM_ClosureCreateAndRun(benchmark::State& state) { TrackCounters track_counters; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_RUN( GRPC_CLOSURE_CREATE(DoNothing, NULL, grpc_schedule_on_exec_ctx), @@ -108,7 +108,7 @@ BENCHMARK(BM_ClosureCreateAndRun); static void BM_ClosureInitAndRun(benchmark::State& state) { TrackCounters track_counters; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_closure c; while (state.KeepRunning()) { GRPC_CLOSURE_RUN( @@ -124,10 +124,10 @@ static void BM_ClosureSchedOnExecCtx(benchmark::State& state) { TrackCounters track_counters; grpc_closure c; GRPC_CLOSURE_INIT(&c, DoNothing, NULL, grpc_schedule_on_exec_ctx); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c, GRPC_ERROR_NONE); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } track_counters.Finish(state); @@ -140,11 +140,11 @@ static void BM_ClosureSched2OnExecCtx(benchmark::State& state) { grpc_closure c2; GRPC_CLOSURE_INIT(&c1, DoNothing, NULL, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&c2, DoNothing, NULL, grpc_schedule_on_exec_ctx); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } track_counters.Finish(state); @@ -159,12 +159,12 @@ static void BM_ClosureSched3OnExecCtx(benchmark::State& state) { GRPC_CLOSURE_INIT(&c1, DoNothing, NULL, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&c2, DoNothing, NULL, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&c3, DoNothing, NULL, grpc_schedule_on_exec_ctx); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } track_counters.Finish(state); @@ -176,7 +176,7 @@ static void BM_AcquireMutex(benchmark::State& state) { // for comparison with the combiner stuff below gpr_mu mu; gpr_mu_init(&mu); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { gpr_mu_lock(&mu); DoNothing(NULL, GRPC_ERROR_NONE); @@ -192,7 +192,7 @@ static void BM_TryAcquireMutex(benchmark::State& state) { // for comparison with the combiner stuff below gpr_mu mu; gpr_mu_init(&mu); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { if (gpr_mu_trylock(&mu)) { DoNothing(NULL, GRPC_ERROR_NONE); @@ -210,7 +210,7 @@ static void BM_AcquireSpinlock(benchmark::State& state) { TrackCounters track_counters; // for comparison with the combiner stuff below gpr_spinlock mu = GPR_SPINLOCK_INITIALIZER; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { gpr_spinlock_lock(&mu); DoNothing(NULL, GRPC_ERROR_NONE); @@ -225,7 +225,7 @@ static void BM_TryAcquireSpinlock(benchmark::State& state) { TrackCounters track_counters; // for comparison with the combiner stuff below gpr_spinlock mu = GPR_SPINLOCK_INITIALIZER; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { if (gpr_spinlock_trylock(&mu)) { DoNothing(NULL, GRPC_ERROR_NONE); @@ -244,10 +244,10 @@ static void BM_ClosureSchedOnCombiner(benchmark::State& state) { grpc_combiner* combiner = grpc_combiner_create(); grpc_closure c; GRPC_CLOSURE_INIT(&c, DoNothing, NULL, grpc_combiner_scheduler(combiner)); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c, GRPC_ERROR_NONE); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } GRPC_COMBINER_UNREF(combiner, "finished"); @@ -262,11 +262,11 @@ static void BM_ClosureSched2OnCombiner(benchmark::State& state) { grpc_closure c2; GRPC_CLOSURE_INIT(&c1, DoNothing, NULL, grpc_combiner_scheduler(combiner)); GRPC_CLOSURE_INIT(&c2, DoNothing, NULL, grpc_combiner_scheduler(combiner)); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } GRPC_COMBINER_UNREF(combiner, "finished"); @@ -283,12 +283,12 @@ static void BM_ClosureSched3OnCombiner(benchmark::State& state) { GRPC_CLOSURE_INIT(&c1, DoNothing, NULL, grpc_combiner_scheduler(combiner)); GRPC_CLOSURE_INIT(&c2, DoNothing, NULL, grpc_combiner_scheduler(combiner)); GRPC_CLOSURE_INIT(&c3, DoNothing, NULL, grpc_combiner_scheduler(combiner)); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } GRPC_COMBINER_UNREF(combiner, "finished"); @@ -304,11 +304,11 @@ static void BM_ClosureSched2OnTwoCombiners(benchmark::State& state) { grpc_closure c2; GRPC_CLOSURE_INIT(&c1, DoNothing, NULL, grpc_combiner_scheduler(combiner1)); GRPC_CLOSURE_INIT(&c2, DoNothing, NULL, grpc_combiner_scheduler(combiner2)); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } GRPC_COMBINER_UNREF(combiner1, "finished"); GRPC_COMBINER_UNREF(combiner2, "finished"); @@ -329,13 +329,13 @@ static void BM_ClosureSched4OnTwoCombiners(benchmark::State& state) { GRPC_CLOSURE_INIT(&c2, DoNothing, NULL, grpc_combiner_scheduler(combiner2)); GRPC_CLOSURE_INIT(&c3, DoNothing, NULL, grpc_combiner_scheduler(combiner1)); GRPC_CLOSURE_INIT(&c4, DoNothing, NULL, grpc_combiner_scheduler(combiner2)); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c4, GRPC_ERROR_NONE); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } GRPC_COMBINER_UNREF(combiner1, "finished"); GRPC_COMBINER_UNREF(combiner2, "finished"); @@ -375,7 +375,7 @@ class Rescheduler { static void BM_ClosureReschedOnExecCtx(benchmark::State& state) { TrackCounters track_counters; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; Rescheduler r(state, grpc_schedule_on_exec_ctx); r.ScheduleFirst(); @@ -385,11 +385,11 @@ BENCHMARK(BM_ClosureReschedOnExecCtx); static void BM_ClosureReschedOnCombiner(benchmark::State& state) { TrackCounters track_counters; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_combiner* combiner = grpc_combiner_create(); Rescheduler r(state, grpc_combiner_scheduler(combiner)); r.ScheduleFirst(); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); GRPC_COMBINER_UNREF(combiner, "finished"); track_counters.Finish(state); @@ -398,11 +398,11 @@ BENCHMARK(BM_ClosureReschedOnCombiner); static void BM_ClosureReschedOnCombinerFinally(benchmark::State& state) { TrackCounters track_counters; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_combiner* combiner = grpc_combiner_create(); Rescheduler r(state, grpc_combiner_finally_scheduler(combiner)); r.ScheduleFirstAgainstDifferentScheduler(grpc_combiner_scheduler(combiner)); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); GRPC_COMBINER_UNREF(combiner, "finished"); track_counters.Finish(state); diff --git a/test/cpp/microbenchmarks/bm_cq.cc b/test/cpp/microbenchmarks/bm_cq.cc index 9fb603213ac..85248ef91ac 100644 --- a/test/cpp/microbenchmarks/bm_cq.cc +++ b/test/cpp/microbenchmarks/bm_cq.cc @@ -80,7 +80,7 @@ static void BM_Pass1Cpp(benchmark::State& state) { while (state.KeepRunning()) { grpc_cq_completion completion; DummyTag dummy_tag; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GPR_ASSERT(grpc_cq_begin_op(c_cq, &dummy_tag)); grpc_cq_end_op(c_cq, &dummy_tag, GRPC_ERROR_NONE, DoneWithCompletionOnStack, NULL, &completion); @@ -100,7 +100,7 @@ static void BM_Pass1Core(benchmark::State& state) { gpr_timespec deadline = gpr_inf_future(GPR_CLOCK_MONOTONIC); while (state.KeepRunning()) { grpc_cq_completion completion; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GPR_ASSERT(grpc_cq_begin_op(cq, NULL)); grpc_cq_end_op(cq, NULL, GRPC_ERROR_NONE, DoneWithCompletionOnStack, NULL, &completion); @@ -119,7 +119,7 @@ static void BM_Pluck1Core(benchmark::State& state) { gpr_timespec deadline = gpr_inf_future(GPR_CLOCK_MONOTONIC); while (state.KeepRunning()) { grpc_cq_completion completion; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; GPR_ASSERT(grpc_cq_begin_op(cq, NULL)); grpc_cq_end_op(cq, NULL, GRPC_ERROR_NONE, DoneWithCompletionOnStack, NULL, &completion); diff --git a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc index 0cd9a2c3613..aeeba0963f1 100644 --- a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc +++ b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc @@ -76,7 +76,7 @@ static grpc_error* pollset_work(grpc_pollset* ps, grpc_pollset_worker** worker, GPR_ASSERT(grpc_cq_begin_op(g_cq, g_tag)); grpc_cq_end_op(g_cq, g_tag, GRPC_ERROR_NONE, cq_done_cb, NULL, (grpc_cq_completion*)gpr_malloc(sizeof(grpc_cq_completion))); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&ps->mu); return GRPC_ERROR_NONE; } diff --git a/test/cpp/microbenchmarks/bm_error.cc b/test/cpp/microbenchmarks/bm_error.cc index 8dc98ab9238..d6dba1d82f3 100644 --- a/test/cpp/microbenchmarks/bm_error.cc +++ b/test/cpp/microbenchmarks/bm_error.cc @@ -246,7 +246,7 @@ template static void BM_ErrorGetStatus(benchmark::State& state) { TrackCounters track_counters; Fixture fixture; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { grpc_status_code status; grpc_slice slice; @@ -261,7 +261,7 @@ template static void BM_ErrorGetStatusCode(benchmark::State& state) { TrackCounters track_counters; Fixture fixture; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { grpc_status_code status; grpc_error_get_status(fixture.error(), fixture.deadline(), &status, NULL, @@ -275,7 +275,7 @@ template static void BM_ErrorHttpError(benchmark::State& state) { TrackCounters track_counters; Fixture fixture; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { grpc_http2_error_code error; grpc_error_get_status(fixture.error(), fixture.deadline(), NULL, NULL, diff --git a/test/cpp/microbenchmarks/bm_fullstack_trickle.cc b/test/cpp/microbenchmarks/bm_fullstack_trickle.cc index 191c93c58de..7b04909ee11 100644 --- a/test/cpp/microbenchmarks/bm_fullstack_trickle.cc +++ b/test/cpp/microbenchmarks/bm_fullstack_trickle.cc @@ -177,7 +177,7 @@ class TrickledCHTTP2 : public EndpointPairFixture { } void Step(bool update_stats) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; inc_time(); size_t client_backlog = grpc_trickle_endpoint_trickle(endpoint_pair_.client); diff --git a/test/cpp/microbenchmarks/bm_metadata.cc b/test/cpp/microbenchmarks/bm_metadata.cc index 07fcf6af991..3a00db7a133 100644 --- a/test/cpp/microbenchmarks/bm_metadata.cc +++ b/test/cpp/microbenchmarks/bm_metadata.cc @@ -90,7 +90,7 @@ static void BM_MetadataFromNonInternedSlices(benchmark::State& state) { TrackCounters track_counters; gpr_slice k = grpc_slice_from_static_string("key"); gpr_slice v = grpc_slice_from_static_string("value"); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } @@ -103,7 +103,7 @@ static void BM_MetadataFromInternedSlices(benchmark::State& state) { TrackCounters track_counters; gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } @@ -119,7 +119,7 @@ static void BM_MetadataFromInternedSlicesAlreadyInIndex( TrackCounters track_counters; gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_mdelem seed = grpc_mdelem_create(k, v, NULL); while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); @@ -136,7 +136,7 @@ static void BM_MetadataFromInternedKey(benchmark::State& state) { TrackCounters track_counters; gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_from_static_string("value"); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } @@ -152,7 +152,7 @@ static void BM_MetadataFromNonInternedSlicesWithBackingStore( gpr_slice k = grpc_slice_from_static_string("key"); gpr_slice v = grpc_slice_from_static_string("value"); char backing_store[sizeof(grpc_mdelem_data)]; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create( k, v, reinterpret_cast(backing_store))); @@ -168,7 +168,7 @@ static void BM_MetadataFromInternedSlicesWithBackingStore( gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); char backing_store[sizeof(grpc_mdelem_data)]; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create( k, v, reinterpret_cast(backing_store))); @@ -186,7 +186,7 @@ static void BM_MetadataFromInternedKeyWithBackingStore( gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_from_static_string("value"); char backing_store[sizeof(grpc_mdelem_data)]; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create( k, v, reinterpret_cast(backing_store))); @@ -201,7 +201,7 @@ static void BM_MetadataFromStaticMetadataStrings(benchmark::State& state) { TrackCounters track_counters; gpr_slice k = GRPC_MDSTR_STATUS; gpr_slice v = GRPC_MDSTR_200; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } @@ -216,7 +216,7 @@ static void BM_MetadataFromStaticMetadataStringsNotIndexed( TrackCounters track_counters; gpr_slice k = GRPC_MDSTR_STATUS; gpr_slice v = GRPC_MDSTR_GZIP; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, NULL)); } @@ -229,7 +229,7 @@ BENCHMARK(BM_MetadataFromStaticMetadataStringsNotIndexed); static void BM_MetadataRefUnrefExternal(benchmark::State& state) { TrackCounters track_counters; char backing_store[sizeof(grpc_mdelem_data)]; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_mdelem el = grpc_mdelem_create( grpc_slice_from_static_string("a"), grpc_slice_from_static_string("b"), reinterpret_cast(backing_store)); @@ -245,7 +245,7 @@ BENCHMARK(BM_MetadataRefUnrefExternal); static void BM_MetadataRefUnrefInterned(benchmark::State& state) { TrackCounters track_counters; char backing_store[sizeof(grpc_mdelem_data)]; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); grpc_mdelem el = grpc_mdelem_create( @@ -263,7 +263,7 @@ BENCHMARK(BM_MetadataRefUnrefInterned); static void BM_MetadataRefUnrefAllocated(benchmark::State& state) { TrackCounters track_counters; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_mdelem el = grpc_mdelem_create(grpc_slice_from_static_string("a"), grpc_slice_from_static_string("b"), NULL); while (state.KeepRunning()) { @@ -277,7 +277,7 @@ BENCHMARK(BM_MetadataRefUnrefAllocated); static void BM_MetadataRefUnrefStatic(benchmark::State& state) { TrackCounters track_counters; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_mdelem el = grpc_mdelem_create(GRPC_MDSTR_STATUS, GRPC_MDSTR_200, NULL); while (state.KeepRunning()) { GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); diff --git a/test/cpp/microbenchmarks/bm_pollset.cc b/test/cpp/microbenchmarks/bm_pollset.cc index 7ddca45eca2..59ee937fe42 100644 --- a/test/cpp/microbenchmarks/bm_pollset.cc +++ b/test/cpp/microbenchmarks/bm_pollset.cc @@ -50,7 +50,7 @@ static void BM_CreateDestroyPollset(benchmark::State& state) { size_t ps_sz = grpc_pollset_size(); grpc_pollset* ps = static_cast(gpr_malloc(ps_sz)); gpr_mu* mu; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_closure shutdown_ps_closure; GRPC_CLOSURE_INIT(&shutdown_ps_closure, shutdown_ps, ps, grpc_schedule_on_exec_ctx); @@ -60,7 +60,7 @@ static void BM_CreateDestroyPollset(benchmark::State& state) { gpr_mu_lock(mu); grpc_pollset_shutdown(ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } gpr_free(ps); @@ -114,7 +114,7 @@ static void BM_PollEmptyPollset(benchmark::State& state) { grpc_pollset* ps = static_cast(gpr_zalloc(ps_sz)); gpr_mu* mu; grpc_pollset_init(ps, &mu); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_mu_lock(mu); while (state.KeepRunning()) { GRPC_ERROR_UNREF(grpc_pollset_work(ps, NULL, 0)); @@ -136,14 +136,14 @@ static void BM_PollAddFd(benchmark::State& state) { grpc_pollset* ps = static_cast(gpr_zalloc(ps_sz)); gpr_mu* mu; grpc_pollset_init(ps, &mu); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_wakeup_fd wakeup_fd; GPR_ASSERT( GRPC_LOG_IF_ERROR("wakeup_fd_init", grpc_wakeup_fd_init(&wakeup_fd))); grpc_fd* fd = grpc_fd_create(wakeup_fd.read_fd, "xxx"); while (state.KeepRunning()) { grpc_pollset_add_fd(ps, fd); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); } grpc_fd_orphan(fd, NULL, NULL, false /* already_closed */, "xxx"); grpc_closure shutdown_ps_closure; @@ -218,7 +218,7 @@ static void BM_SingleThreadPollOneFd(benchmark::State& state) { grpc_pollset* ps = static_cast(gpr_zalloc(ps_sz)); gpr_mu* mu; grpc_pollset_init(ps, &mu); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; grpc_wakeup_fd wakeup_fd; GRPC_ERROR_UNREF(grpc_wakeup_fd_init(&wakeup_fd)); grpc_fd* wakeup = grpc_fd_create(wakeup_fd.read_fd, "wakeup_read"); diff --git a/test/cpp/microbenchmarks/fullstack_fixtures.h b/test/cpp/microbenchmarks/fullstack_fixtures.h index 075064eca73..4efcafa8e1e 100644 --- a/test/cpp/microbenchmarks/fullstack_fixtures.h +++ b/test/cpp/microbenchmarks/fullstack_fixtures.h @@ -166,7 +166,7 @@ class EndpointPairFixture : public BaseFixture { fixture_configuration.ApplyCommonServerBuilderConfig(&b); server_ = b.BuildAndStart(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; /* add server endpoint to server_ * */ diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc index 8ba8be0ea48..ca8c26092af 100644 --- a/test/cpp/naming/resolver_component_test.cc +++ b/test/cpp/naming/resolver_component_test.cc @@ -171,7 +171,7 @@ void ArgsFinish(ArgsStruct* args) { grpc_pollset_shutdown(args->pollset, &DoNothing_cb); // exec_ctx needs to be flushed before calling grpc_pollset_destroy() grpc_channel_args_destroy(args->channel_args); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); grpc_pollset_destroy(args->pollset); gpr_free(args->pollset); GRPC_COMBINER_UNREF(args->lock, NULL); @@ -195,7 +195,7 @@ void PollPollsetUntilRequestDone(ArgsStruct* args) { time_left.tv_sec, time_left.tv_nsec); GPR_ASSERT(gpr_time_cmp(time_left, gpr_time_0(GPR_TIMESPAN)) >= 0); grpc_pollset_worker* worker = NULL; - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; gpr_mu_lock(args->mu); GRPC_LOG_IF_ERROR("pollset_work", grpc_pollset_work(args->pollset, &worker, @@ -274,7 +274,7 @@ void CheckResolverResultLocked(void* argsp, grpc_error* err) { } TEST(ResolverComponentTest, TestResolvesRelevantRecords) { - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; ArgsStruct args; ArgsInit(&args); args.expected_addrs = ParseExpectedAddrs(FLAGS_expected_addrs); @@ -294,7 +294,7 @@ TEST(ResolverComponentTest, TestResolvesRelevantRecords) { (void*)&args, grpc_combiner_scheduler(args.lock)); grpc_resolver_next_locked(resolver, &args.channel_args, &on_resolver_result_changed); - ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); PollPollsetUntilRequestDone(&args); GRPC_RESOLVER_UNREF(resolver, NULL); ArgsFinish(&args); diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc index b9514e63066..ae658ff87c3 100644 --- a/test/cpp/performance/writes_per_rpc_test.cc +++ b/test/cpp/performance/writes_per_rpc_test.cc @@ -82,7 +82,7 @@ class EndpointPairFixture { ApplyCommonServerBuilderConfig(&b); server_ = b.BuildAndStart(); - ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; /* add server endpoint to server_ */ { From 995aa91bbbc68deb6dfd7c667cfee3af2bedec08 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 14 Nov 2017 18:21:18 -0800 Subject: [PATCH 011/127] Maintain exec_ctx flags initialization as it was before --- src/core/lib/iomgr/executor.cc | 2 +- src/core/lib/iomgr/timer_manager.cc | 2 +- src/core/lib/surface/init.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index 4db298c1c54..d26b89aea30 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -145,7 +145,7 @@ static void executor_thread(void* arg) { thread_state* ts = (thread_state*)arg; gpr_tls_set(&g_this_thread_state, (intptr_t)ts); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx(0); size_t subtract_depth = 0; for (;;) { diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc index 6a43f4fadb2..ed03e48b32f 100644 --- a/src/core/lib/iomgr/timer_manager.cc +++ b/src/core/lib/iomgr/timer_manager.cc @@ -273,7 +273,7 @@ static void timer_thread_cleanup(completed_thread* ct) { static void timer_thread(void* completed_thread_ptr) { // this threads exec_ctx: we try to run things through to completion here // since it's easy to spin up new threads - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx(0); timer_main_loop(); timer_thread_cleanup((completed_thread*)completed_thread_ptr); diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index fdbf926f77b..16187b8478d 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -175,7 +175,7 @@ void grpc_init(void) { void grpc_shutdown(void) { int i; GRPC_API_TRACE("grpc_shutdown(void)", 0, ()); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx(0); gpr_mu_lock(&g_init_mu); if (--g_initializations == 0) { grpc_executor_shutdown(); From 5dca5bf644afc3df624f4c97c406a66b149df6f4 Mon Sep 17 00:00:00 2001 From: Ian Coolidge Date: Sun, 16 Oct 2016 22:36:02 -0700 Subject: [PATCH 012/127] sync_posix: Add Linux-specific monotonic clock preference When gRPC is running during wall clock acquisition, it's useful to avoid wall clock references as much as possible. --- src/core/lib/support/sync_posix.cc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/core/lib/support/sync_posix.cc b/src/core/lib/support/sync_posix.cc index dfdd233bf43..c3f6b104631 100644 --- a/src/core/lib/support/sync_posix.cc +++ b/src/core/lib/support/sync_posix.cc @@ -66,7 +66,12 @@ int gpr_mu_trylock(gpr_mu* mu) { /*----------------------------------------*/ void gpr_cv_init(gpr_cv* cv) { - GPR_ASSERT(pthread_cond_init(cv, nullptr) == 0); + pthread_condattr_t attr; + GPR_ASSERT(pthread_condattr_init(&attr) == 0); +#if GPR_LINUX + GPR_ASSERT(pthread_condattr_setclock(&attr, CLOCK_MONOTONIC) == 0); +#endif // GPR_LINUX + GPR_ASSERT(pthread_cond_init(cv, &attr) == 0); } void gpr_cv_destroy(gpr_cv* cv) { GPR_ASSERT(pthread_cond_destroy(cv) == 0); } @@ -78,7 +83,11 @@ int gpr_cv_wait(gpr_cv* cv, gpr_mu* mu, gpr_timespec abs_deadline) { err = pthread_cond_wait(cv, mu); } else { struct timespec abs_deadline_ts; +#if GPR_LINUX + abs_deadline = gpr_convert_clock_type(abs_deadline, GPR_CLOCK_MONOTONIC); +#else abs_deadline = gpr_convert_clock_type(abs_deadline, GPR_CLOCK_REALTIME); +#endif // GPR_LINUX abs_deadline_ts.tv_sec = (time_t)abs_deadline.tv_sec; abs_deadline_ts.tv_nsec = abs_deadline.tv_nsec; err = pthread_cond_timedwait(cv, mu, &abs_deadline_ts); From d48981221542a5bd760b64e5af379adb0e846bba Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Mon, 20 Nov 2017 13:04:30 -0800 Subject: [PATCH 013/127] changes for macos --- src/core/lib/iomgr/exec_ctx.cc | 11 ++++++- src/core/lib/iomgr/exec_ctx.h | 32 +++++++++++++++---- .../readahead_handshaker_server_ssl.cc | 18 ++++------- 3 files changed, 43 insertions(+), 18 deletions(-) diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index 8a4b489ebba..a5d65f3d2c7 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -161,7 +161,9 @@ static grpc_closure_scheduler exec_ctx_scheduler = {&exec_ctx_scheduler_vtable}; grpc_closure_scheduler* grpc_schedule_on_exec_ctx = &exec_ctx_scheduler; namespace grpc_core { +#ifndef GPR_PTHREAD_TLS thread_local ExecCtx* ExecCtx::exec_ctx_ = nullptr; +#endif bool ExecCtx::Flush() { bool did_something = 0; @@ -192,9 +194,16 @@ void ExecCtx::GlobalInit(void) { } // allows uniform treatment in conversion functions time_atm_pair_store(&g_start_time[GPR_TIMESPAN], gpr_time_0(GPR_TIMESPAN)); +#ifdef GPR_PTHREAD_TLS + gpr_tls_init(&exec_ctx_); +#endif } -void ExecCtx::GlobalShutdown(void) {} +void ExecCtx::GlobalShutdown(void) { +#ifdef GPR_PTHREAD_TLS + gpr_tls_destroy(&exec_ctx_); +#endif +} grpc_millis ExecCtx::Now() { if (!now_is_valid_) { diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index 0f2ee8d4faa..6320e13acb5 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -22,6 +22,7 @@ #include #include #include +#include #include "src/core/lib/iomgr/closure.h" @@ -70,17 +71,17 @@ namespace grpc_core { class ExecCtx { public: /** Default Constructor */ - ExecCtx() : flags_(GRPC_EXEC_CTX_FLAG_IS_FINISHED) { exec_ctx_ = this; } + ExecCtx() : flags_(GRPC_EXEC_CTX_FLAG_IS_FINISHED) { Set(this); } /** Parameterised Constructor */ - ExecCtx(uintptr_t fl) : flags_(fl) { exec_ctx_ = this; } + ExecCtx(uintptr_t fl) : flags_(fl) { Set(this); } /** Destructor */ ~ExecCtx() { - GPR_ASSERT(exec_ctx_ == this); + GPR_ASSERT(Get() == this); flags_ |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; Flush(); - exec_ctx_ = last_exec_ctx_; + Set(last_exec_ctx_); } /** Disallow copy and assignment operators */ @@ -166,13 +167,28 @@ on outside context */ static void GlobalShutdown(void); /** Gets pointer to current exec_ctx */ - static ExecCtx* Get() { return exec_ctx_; } + static ExecCtx* Get() { +#ifdef GPR_PTHREAD_TLS + return (ExecCtx*)gpr_tls_get(&exec_ctx_); +#else + return exec_ctx_; +#endif + } protected: /** Check if ready to finish */ virtual bool CheckReadyToFinish() { return false; } private: + /** Set exec_ctx_ to exec_ctx */ + void Set(ExecCtx* exec_ctx) { +#ifdef GPR_PTHREAD_THS + gpr_tls_set(&exec_ctx_, exec_ctx); +#else + exec_ctx_ = exec_ctx; +#endif + } + grpc_closure_list closure_list_ = GRPC_CLOSURE_LIST_INIT; CombinerData combiner_data_ = {nullptr, nullptr}; uintptr_t flags_; @@ -181,8 +197,12 @@ on outside context */ bool now_is_valid_ = false; grpc_millis now_ = 0; +#ifdef GPR_PTHREAD_TLS + GPR_TLS_DECL(exec_ctx_); +#else static thread_local ExecCtx* exec_ctx_; - ExecCtx* last_exec_ctx_ = exec_ctx_; +#endif + ExecCtx* last_exec_ctx_ = Get(); }; } // namespace grpc_core diff --git a/test/core/handshake/readahead_handshaker_server_ssl.cc b/test/core/handshake/readahead_handshaker_server_ssl.cc index f271200b7bc..599e0e16e2d 100644 --- a/test/core/handshake/readahead_handshaker_server_ssl.cc +++ b/test/core/handshake/readahead_handshaker_server_ssl.cc @@ -49,19 +49,16 @@ * to the security_handshaker). This test is meant to protect code relying on * this functionality that lives outside of this repo. */ -static void readahead_handshaker_destroy( - grpc_handshaker* handshaker) { +static void readahead_handshaker_destroy(grpc_handshaker* handshaker) { gpr_free(handshaker); } -static void readahead_handshaker_shutdown( - grpc_handshaker* handshaker, +static void readahead_handshaker_shutdown(grpc_handshaker* handshaker, grpc_error* error) {} static void readahead_handshaker_do_handshake( - grpc_handshaker* handshaker, - grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, - grpc_handshaker_args* args) { + grpc_handshaker* handshaker, grpc_tcp_server_acceptor* acceptor, + grpc_closure* on_handshake_done, grpc_handshaker_args* args) { grpc_endpoint_read(args->endpoint, args->read_buffer, on_handshake_done); } @@ -76,10 +73,9 @@ static grpc_handshaker* readahead_handshaker_create() { } static void readahead_handshaker_factory_add_handshakers( - grpc_handshaker_factory* hf, - const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr) { - grpc_handshake_manager_add(handshake_mgr, - readahead_handshaker_create()); + grpc_handshaker_factory* hf, const grpc_channel_args* args, + grpc_handshake_manager* handshake_mgr) { + grpc_handshake_manager_add(handshake_mgr, readahead_handshaker_create()); } static void readahead_handshaker_factory_destroy( From a13a8c0f3ea9bdf70680c0c8b5667186c832a412 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 21 Nov 2017 19:38:09 -0800 Subject: [PATCH 014/127] A few src/core fixes due to missing exec_ctx_finish --- include/grpc/support/tls_gcc.h | 7 +++ include/grpc/support/tls_msvc.h | 3 + include/grpc/support/tls_pthread.h | 1 + src/core/lib/iomgr/ev_posix.cc | 2 +- src/core/lib/iomgr/resolve_address_posix.cc | 1 + src/core/lib/iomgr/tcp_uv.cc | 19 ++---- src/core/lib/surface/init.cc | 3 + test/core/bad_client/bad_client.cc | 6 +- test/core/end2end/bad_server_response_test.cc | 2 +- test/core/iomgr/resource_quota_test.cc | 60 +++++++++---------- test/core/iomgr/tcp_posix_test.cc | 1 + test/core/iomgr/tcp_server_posix_test.cc | 1 + test/core/iomgr/timer_list_test.cc | 12 ++-- test/core/iomgr/udp_server_test.cc | 2 +- test/core/security/jwt_verifier_test.cc | 14 ++--- test/core/security/secure_endpoint_test.cc | 1 + .../core/transport/connectivity_state_test.cc | 3 +- test/core/util/port_server_client.cc | 1 + test/cpp/client/client_channel_stress_test.cc | 11 ++-- 19 files changed, 82 insertions(+), 68 deletions(-) diff --git a/include/grpc/support/tls_gcc.h b/include/grpc/support/tls_gcc.h index 019acdf122e..170baf82ca4 100644 --- a/include/grpc/support/tls_gcc.h +++ b/include/grpc/support/tls_gcc.h @@ -37,6 +37,10 @@ struct gpr_gcc_thread_local { static bool name##_inited = false; \ static __thread struct gpr_gcc_thread_local name = {0, &(name##_inited)} +#define GPR_TLS_NON_STATIC_DECL(name) \ + bool name##_inited = false; \ + __thread struct gpr_gcc_thread_local name = {0, &(name##_inited)} + #define gpr_tls_init(tls) \ do { \ GPR_ASSERT(*((tls)->inited) == false); \ @@ -71,6 +75,9 @@ struct gpr_gcc_thread_local { #define GPR_TLS_DECL(name) \ static __thread struct gpr_gcc_thread_local name = {0} +#define GPR_TLS_NON_STATIC_DECL(name) \ + __thread struct gpr_gcc_thread_local name = {0} + #define gpr_tls_init(tls) \ do { \ } while (0) diff --git a/include/grpc/support/tls_msvc.h b/include/grpc/support/tls_msvc.h index e5f2205fc15..e3a0921912b 100644 --- a/include/grpc/support/tls_msvc.h +++ b/include/grpc/support/tls_msvc.h @@ -29,6 +29,9 @@ struct gpr_msvc_thread_local { #define GPR_TLS_DECL(name) \ static __declspec(thread) struct gpr_msvc_thread_local name = {0} +#define GPR_TLS_NON_STATIC_DECL(name) \ + __declspec(thread) struct gpr_msvc_thread_local name = {0} + #define gpr_tls_init(tls) \ do { \ } while (0) diff --git a/include/grpc/support/tls_pthread.h b/include/grpc/support/tls_pthread.h index fb0edd8e744..09768d84238 100644 --- a/include/grpc/support/tls_pthread.h +++ b/include/grpc/support/tls_pthread.h @@ -30,6 +30,7 @@ struct gpr_pthread_thread_local { }; #define GPR_TLS_DECL(name) static struct gpr_pthread_thread_local name = {0} +#define GPR_TLS_NON_STATIC_DECL(name) struct gpr_pthread_thread_local name = {0} #define gpr_tls_init(tls) GPR_ASSERT(0 == pthread_key_create(&(tls)->key, NULL)) #define gpr_tls_destroy(tls) pthread_key_delete((tls)->key) diff --git a/src/core/lib/iomgr/ev_posix.cc b/src/core/lib/iomgr/ev_posix.cc index 6dd7dcea30c..d8a349fd30f 100644 --- a/src/core/lib/iomgr/ev_posix.cc +++ b/src/core/lib/iomgr/ev_posix.cc @@ -46,7 +46,7 @@ grpc_poll_function_type grpc_poll_function = poll; grpc_wakeup_fd grpc_global_wakeup_fd; -static const grpc_event_engine_vtable* g_event_engine; +static const grpc_event_engine_vtable* g_event_engine = nullptr; static const char* g_poll_strategy_name = nullptr; typedef const grpc_event_engine_vtable* (*event_engine_factory_fn)( diff --git a/src/core/lib/iomgr/resolve_address_posix.cc b/src/core/lib/iomgr/resolve_address_posix.cc index 6c9534a291e..cc3d4fd7cfa 100644 --- a/src/core/lib/iomgr/resolve_address_posix.cc +++ b/src/core/lib/iomgr/resolve_address_posix.cc @@ -42,6 +42,7 @@ static grpc_error* blocking_resolve_address_impl( const char* name, const char* default_port, grpc_resolved_addresses** addresses) { + grpc_core::ExecCtx exec_ctx; struct addrinfo hints; struct addrinfo *result = nullptr, *resp; char* host; diff --git a/src/core/lib/iomgr/tcp_uv.cc b/src/core/lib/iomgr/tcp_uv.cc index d1e91357ea2..18037d77b4e 100644 --- a/src/core/lib/iomgr/tcp_uv.cc +++ b/src/core/lib/iomgr/tcp_uv.cc @@ -65,7 +65,7 @@ typedef struct { grpc_pollset* pollset; } grpc_tcp; -static void tcp_free(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { +static void tcp_free(grpc_tcp* tcp) { grpc_resource_user_unref(tcp->resource_user); gpr_free(tcp->handle); gpr_free(tcp->peer_string); @@ -126,11 +126,9 @@ static void alloc_uv_buf(uv_handle_t* handle, size_t suggested_size, * allocation was successful. So slices[0] should always exist here */ buf->base = (char*)GRPC_SLICE_START_PTR(tcp->read_slices->slices[0]); buf->len = GRPC_SLICE_LENGTH(tcp->read_slices->slices[0]); - grpc_exec_ctx_finish(); } -static void call_read_cb(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, - grpc_error* error) { +static void call_read_cb(grpc_tcp* tcp, grpc_error* error) { grpc_closure* cb = tcp->read_cb; if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "TCP:%p call_cb %p %p:%p", tcp, cb, cb->cb, cb->cb_arg); @@ -147,7 +145,7 @@ static void call_read_cb(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, } tcp->read_slices = NULL; tcp->read_cb = NULL; - GRPC_CLOSURE_RUN(exec_ctx, cb, error); + GRPC_CLOSURE_RUN(, cb, error); } static void read_callback(uv_stream_t* stream, ssize_t nread, @@ -165,7 +163,7 @@ static void read_callback(uv_stream_t* stream, ssize_t nread, uv_read_stop(stream); if (nread == UV_EOF) { error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("EOF"); - grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, tcp->read_slices); + grpc_slice_buffer_reset_and_unref_internal(tcp->read_slices); } else if (nread > 0) { // Successful read error = GRPC_ERROR_NONE; @@ -175,15 +173,14 @@ static void read_callback(uv_stream_t* stream, ssize_t nread, grpc_slice_buffer_init(&garbage); grpc_slice_buffer_trim_end( tcp->read_slices, tcp->read_slices->length - (size_t)nread, &garbage); - grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, &garbage); + grpc_slice_buffer_reset_and_unref_internal(&garbage); } } else { // nread < 0: Error error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("TCP Read failed"); - grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, tcp->read_slices); + grpc_slice_buffer_reset_and_unref_internal(tcp->read_slices); } call_read_cb(tcp, error); - grpc_exec_ctx_finish(); } static void tcp_read_allocation_done(void* tcpp, grpc_error* error) { @@ -246,7 +243,6 @@ static void write_callback(uv_write_t* req, int status) { } gpr_free(tcp->write_buffers); GRPC_CLOSURE_SCHED(cb, error); - grpc_exec_ctx_finish(); } static void uv_endpoint_write(grpc_endpoint* ep, @@ -306,7 +302,6 @@ static void uv_endpoint_write(grpc_endpoint* ep, static void uv_add_to_pollset(grpc_endpoint* ep, grpc_pollset* pollset) { // No-op. We're ignoring pollsets currently - (void)exec_ctx; (void)ep; (void)pollset; grpc_tcp* tcp = (grpc_tcp*)ep; @@ -316,7 +311,6 @@ static void uv_add_to_pollset(grpc_endpoint* ep, grpc_pollset* pollset) { static void uv_add_to_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset) { // No-op. We're ignoring pollsets currently - (void)exec_ctx; (void)ep; (void)pollset; } @@ -324,7 +318,6 @@ static void uv_add_to_pollset_set(grpc_endpoint* ep, static void uv_delete_from_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset) { // No-op. We're ignoring pollsets currently - (void)exec_ctx; (void)ep; (void)pollset; } diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index 678f837cb72..cdbe01e1d45 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -151,6 +151,9 @@ void grpc_init(void) { void grpc_shutdown(void) { int i; GRPC_API_TRACE("grpc_shutdown(void)", 0, ()); + if (grpc_core::ExecCtx::Get()) { + grpc_core::ExecCtx::Get()->Flush(); + } grpc_core::ExecCtx _local_exec_ctx(0); gpr_mu_lock(&g_init_mu); if (--g_initializations == 0) { diff --git a/test/core/bad_client/bad_client.cc b/test/core/bad_client/bad_client.cc index 313c43f9b32..267933ff623 100644 --- a/test/core/bad_client/bad_client.cc +++ b/test/core/bad_client/bad_client.cc @@ -135,6 +135,7 @@ void grpc_run_bad_client_test( /* Write data */ grpc_endpoint_write(sfd.client, &outgoing, &done_write_closure); + grpc_core::ExecCtx::Get()->Flush(); /* Await completion, unless the request is large and write may not finish * before the peer shuts down. */ @@ -147,7 +148,7 @@ void grpc_run_bad_client_test( grpc_endpoint_shutdown( sfd.client, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Forced Disconnect")); grpc_endpoint_destroy(sfd.client); - + grpc_core::ExecCtx::Get()->Flush(); sfd.client = nullptr; } @@ -167,7 +168,7 @@ void grpc_run_bad_client_test( GRPC_CLOSURE_INIT(&read_done_closure, read_done, &read_done_event, grpc_schedule_on_exec_ctx); grpc_endpoint_read(sfd.client, &incoming, &read_done_closure); - + grpc_core::ExecCtx::Get()->Flush(); do { GPR_ASSERT(gpr_time_cmp(deadline, gpr_now(deadline.clock_type)) > 0); GPR_ASSERT( @@ -186,6 +187,7 @@ void grpc_run_bad_client_test( grpc_endpoint_shutdown( sfd.client, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); grpc_endpoint_destroy(sfd.client); + grpc_core::ExecCtx::Get()->Flush(); } GPR_ASSERT( diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc index 576d39b319d..d3237839254 100644 --- a/test/core/end2end/bad_server_response_test.cc +++ b/test/core/end2end/bad_server_response_test.cc @@ -290,7 +290,7 @@ static void run_test(const char* response_payload, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); grpc_endpoint_destroy(state.tcp); cleanup_rpc(); - + grpc_core::ExecCtx::Get()->Flush(); test_tcp_server_destroy(&test_server); grpc_shutdown(); diff --git a/test/core/iomgr/resource_quota_test.cc b/test/core/iomgr/resource_quota_test.cc index b44e8ce1be8..7d793937b26 100644 --- a/test/core/iomgr/resource_quota_test.cc +++ b/test/core/iomgr/resource_quota_test.cc @@ -154,7 +154,7 @@ static void test_simple_async_alloc(void) { gpr_event_init(&ev); grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); } @@ -177,7 +177,7 @@ static void test_async_alloc_blocked_by_size(void) { { grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait( &ev, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); } @@ -204,7 +204,7 @@ static void test_scavenge(void) { gpr_event_init(&ev); grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; @@ -218,7 +218,7 @@ static void test_scavenge(void) { gpr_event_init(&ev); grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; @@ -243,7 +243,7 @@ static void test_scavenge_blocked(void) { gpr_event_init(&ev); grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; @@ -252,14 +252,14 @@ static void test_scavenge_blocked(void) { gpr_event_init(&ev); grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait( &ev, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); } { grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_free(usr1, 1024); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; @@ -284,7 +284,7 @@ static void test_blocked_until_scheduled_reclaim(void) { gpr_event_init(&ev); grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; @@ -301,7 +301,7 @@ static void test_blocked_until_scheduled_reclaim(void) { gpr_event_init(&ev); grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&reclaim_done, grpc_timeout_seconds_to_deadline(5)) != nullptr); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -328,7 +328,7 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) { gpr_event_init(&ev); grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; @@ -345,7 +345,7 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) { gpr_event_init(&ev); grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&reclaim_done, grpc_timeout_seconds_to_deadline(5)) != nullptr); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -372,7 +372,7 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) { gpr_event_init(&ev); grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; @@ -389,7 +389,7 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) { gpr_event_init(&ev); grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&reclaim_done, grpc_timeout_seconds_to_deadline(5)) != nullptr); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -420,7 +420,7 @@ static void test_unused_reclaim_is_cancelled(void) { usr, false, make_unused_reclaimer(set_event(&benign_done))); grpc_resource_user_post_reclaimer( usr, true, make_unused_reclaimer(set_event(&destructive_done))); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); @@ -451,7 +451,7 @@ static void test_benign_reclaim_is_preferred(void) { gpr_event_init(&ev); grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; @@ -462,7 +462,7 @@ static void test_benign_reclaim_is_preferred(void) { usr, false, make_reclaimer(usr, 1024, set_event(&benign_done))); grpc_resource_user_post_reclaimer( usr, true, make_unused_reclaimer(set_event(&destructive_done))); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); @@ -475,7 +475,7 @@ static void test_benign_reclaim_is_preferred(void) { gpr_event_init(&ev); grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_seconds_to_deadline(5)) != nullptr); GPR_ASSERT(gpr_event_wait(&destructive_done, @@ -511,7 +511,7 @@ static void test_multiple_reclaims_can_be_triggered(void) { gpr_event_init(&ev); grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; @@ -522,7 +522,7 @@ static void test_multiple_reclaims_can_be_triggered(void) { usr, false, make_reclaimer(usr, 512, set_event(&benign_done))); grpc_resource_user_post_reclaimer( usr, true, make_reclaimer(usr, 512, set_event(&destructive_done))); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); @@ -535,7 +535,7 @@ static void test_multiple_reclaims_can_be_triggered(void) { gpr_event_init(&ev); grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_seconds_to_deadline(5)) != nullptr); GPR_ASSERT(gpr_event_wait(&destructive_done, @@ -597,7 +597,7 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_post_reclaimer( usr, false, make_unused_reclaimer(set_event(&reclaimer_cancelled))); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); @@ -607,7 +607,7 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( gpr_event_init(&allocated); grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&allocated, grpc_timeout_seconds_to_deadline(5)) != NULL); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, @@ -617,7 +617,7 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( { grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_unref(usr); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); @@ -625,7 +625,7 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( { grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_free(usr, 1024); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, grpc_timeout_seconds_to_deadline(5)) != nullptr); @@ -645,7 +645,7 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { gpr_event_init(&allocated); grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&allocated, grpc_timeout_seconds_to_deadline(5)) != nullptr); } @@ -656,7 +656,7 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_post_reclaimer( usr, false, make_reclaimer(usr, 1024, set_event(&reclaimer_done))); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&reclaimer_done, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); @@ -666,7 +666,7 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { gpr_event_init(&allocated); grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&allocated, grpc_timeout_seconds_to_deadline(5)) != NULL); GPR_ASSERT(gpr_event_wait(&reclaimer_done, @@ -701,7 +701,7 @@ static void test_one_slice(void) { const int start_allocs = num_allocs; grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); - + grpc_core::ExecCtx::Get()->Flush(); assert_counter_becomes(&num_allocs, start_allocs + 1); } @@ -733,7 +733,7 @@ static void test_one_slice_deleted_late(void) { const int start_allocs = num_allocs; grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); - + grpc_core::ExecCtx::Get()->Flush(); assert_counter_becomes(&num_allocs, start_allocs + 1); } @@ -775,7 +775,7 @@ static void test_negative_rq_free_pool(void) { const int start_allocs = num_allocs; grpc_core::ExecCtx _local_exec_ctx; grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); - + grpc_core::ExecCtx::Get()->Flush(); assert_counter_becomes(&num_allocs, start_allocs + 1); } diff --git a/test/core/iomgr/tcp_posix_test.cc b/test/core/iomgr/tcp_posix_test.cc index 4018fe50bda..614ceaa02d3 100644 --- a/test/core/iomgr/tcp_posix_test.cc +++ b/test/core/iomgr/tcp_posix_test.cc @@ -549,6 +549,7 @@ int main(int argc, char** argv) { grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(g_pollset, &destroyed); + grpc_core::ExecCtx::Get()->Flush(); grpc_shutdown(); gpr_free(g_pollset); diff --git a/test/core/iomgr/tcp_server_posix_test.cc b/test/core/iomgr/tcp_server_posix_test.cc index ba9fe92c9c5..a4dfa9e7725 100644 --- a/test/core/iomgr/tcp_server_posix_test.cc +++ b/test/core/iomgr/tcp_server_posix_test.cc @@ -411,6 +411,7 @@ static void test_connect(size_t num_connects, GPR_ASSERT(grpc_tcp_server_port_fd(s, 0, 0) >= 0); grpc_tcp_server_unref(s); + grpc_core::ExecCtx::Get()->Flush(); /* Weak ref lost. */ GPR_ASSERT(weak_ref.server == nullptr); diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc index a4a53a0e46c..329b767f326 100644 --- a/test/core/iomgr/timer_list_test.cc +++ b/test/core/iomgr/timer_list_test.cc @@ -72,7 +72,7 @@ static void add_test(void) { /* collect timers. Only the first batch should be ready. */ grpc_core::ExecCtx::Get()->TestOnlySetNow(start + 500); GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); - + grpc_core::ExecCtx::Get()->Flush(); for (i = 0; i < 20; i++) { GPR_ASSERT(cb_called[i][1] == (i < 10)); GPR_ASSERT(cb_called[i][0] == 0); @@ -80,7 +80,7 @@ static void add_test(void) { grpc_core::ExecCtx::Get()->TestOnlySetNow(start + 600); GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_CHECKED_AND_EMPTY); - + grpc_core::ExecCtx::Get()->Flush(); for (i = 0; i < 30; i++) { GPR_ASSERT(cb_called[i][1] == (i < 10)); GPR_ASSERT(cb_called[i][0] == 0); @@ -89,7 +89,7 @@ static void add_test(void) { /* collect the rest of the timers */ grpc_core::ExecCtx::Get()->TestOnlySetNow(start + 1500); GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); - + grpc_core::ExecCtx::Get()->Flush(); for (i = 0; i < 30; i++) { GPR_ASSERT(cb_called[i][1] == (i < 20)); GPR_ASSERT(cb_called[i][0] == 0); @@ -135,16 +135,16 @@ void destruction_test(void) { GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)4, grpc_schedule_on_exec_ctx)); grpc_core::ExecCtx::Get()->TestOnlySetNow(2); GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(1 == cb_called[4][1]); grpc_timer_cancel(&timers[0]); grpc_timer_cancel(&timers[3]); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(1 == cb_called[0][0]); GPR_ASSERT(1 == cb_called[3][0]); grpc_timer_list_shutdown(); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(1 == cb_called[1][0]); GPR_ASSERT(1 == cb_called[2][0]); } diff --git a/test/core/iomgr/udp_server_test.cc b/test/core/iomgr/udp_server_test.cc index 2c5719f4ae6..e271acbeef4 100644 --- a/test/core/iomgr/udp_server_test.cc +++ b/test/core/iomgr/udp_server_test.cc @@ -308,7 +308,7 @@ int main(int argc, char** argv) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(g_pollset, &destroyed); - + grpc_core::ExecCtx::Get()->Flush(); gpr_free(g_pollset); grpc_shutdown(); return 0; diff --git a/test/core/security/jwt_verifier_test.cc b/test/core/security/jwt_verifier_test.cc index dd798ec1d1c..ec14fec6978 100644 --- a/test/core/security/jwt_verifier_test.cc +++ b/test/core/security/jwt_verifier_test.cc @@ -366,7 +366,7 @@ static void test_jwt_verifier_google_email_issuer_success(void) { grpc_jwt_verifier_verify(verifier, nullptr, jwt, expected_audience, on_verification_success, (void*)expected_user_data); grpc_jwt_verifier_destroy(verifier); - + grpc_core::ExecCtx::Get()->Flush(); gpr_free(jwt); grpc_httpcli_set_override(nullptr, nullptr); } @@ -399,7 +399,7 @@ static void test_jwt_verifier_custom_email_issuer_success(void) { grpc_jwt_verifier_verify(verifier, nullptr, jwt, expected_audience, on_verification_success, (void*)expected_user_data); grpc_jwt_verifier_destroy(verifier); - + grpc_core::ExecCtx::Get()->Flush(); gpr_free(jwt); grpc_httpcli_set_override(nullptr, nullptr); } @@ -446,7 +446,7 @@ static void test_jwt_verifier_url_issuer_success(void) { grpc_jwt_verifier_verify(verifier, nullptr, jwt, expected_audience, on_verification_success, (void*)expected_user_data); grpc_jwt_verifier_destroy(verifier); - + grpc_core::ExecCtx::Get()->Flush(); gpr_free(jwt); grpc_httpcli_set_override(nullptr, nullptr); } @@ -486,7 +486,7 @@ static void test_jwt_verifier_url_issuer_bad_config(void) { on_verification_key_retrieval_error, (void*)expected_user_data); grpc_jwt_verifier_destroy(verifier); - + grpc_core::ExecCtx::Get()->Flush(); gpr_free(jwt); grpc_httpcli_set_override(nullptr, nullptr); } @@ -509,7 +509,7 @@ static void test_jwt_verifier_bad_json_key(void) { on_verification_key_retrieval_error, (void*)expected_user_data); grpc_jwt_verifier_destroy(verifier); - + grpc_core::ExecCtx::Get()->Flush(); gpr_free(jwt); grpc_httpcli_set_override(nullptr, nullptr); } @@ -562,7 +562,7 @@ static void test_jwt_verifier_bad_signature(void) { (void*)expected_user_data); gpr_free(jwt); grpc_jwt_verifier_destroy(verifier); - + grpc_core::ExecCtx::Get()->Flush(); grpc_httpcli_set_override(nullptr, nullptr); } @@ -591,7 +591,7 @@ static void test_jwt_verifier_bad_format(void) { on_verification_bad_format, (void*)expected_user_data); grpc_jwt_verifier_destroy(verifier); - + grpc_core::ExecCtx::Get()->Flush(); grpc_httpcli_set_override(nullptr, nullptr); } diff --git a/test/core/security/secure_endpoint_test.cc b/test/core/security/secure_endpoint_test.cc index 14ca0a89275..694a8584ea0 100644 --- a/test/core/security/secure_endpoint_test.cc +++ b/test/core/security/secure_endpoint_test.cc @@ -181,6 +181,7 @@ static void test_leftover(grpc_endpoint_test_config config, size_t slice_size) { GRPC_CLOSURE_INIT(&done_closure, inc_call_ctr, &n, grpc_schedule_on_exec_ctx); grpc_endpoint_read(f.client_ep, &incoming, &done_closure); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(n == 1); GPR_ASSERT(incoming.count == 1); GPR_ASSERT(grpc_slice_eq(s, incoming.slices[0])); diff --git a/test/core/transport/connectivity_state_test.cc b/test/core/transport/connectivity_state_test.cc index feb603cd235..99bd0fc65f0 100644 --- a/test/core/transport/connectivity_state_test.cc +++ b/test/core/transport/connectivity_state_test.cc @@ -107,6 +107,7 @@ static void test_subscribe_then_destroy(void) { GPR_ASSERT(g_counter == 0); grpc_connectivity_state_destroy(&tracker); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(state == GRPC_CHANNEL_SHUTDOWN); GPR_ASSERT(g_counter == 1); } @@ -126,7 +127,7 @@ static void test_subscribe_with_failure_then_destroy(void) { GPR_ASSERT(state == GRPC_CHANNEL_SHUTDOWN); GPR_ASSERT(g_counter == 0); grpc_connectivity_state_destroy(&tracker); - + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(state == GRPC_CHANNEL_SHUTDOWN); GPR_ASSERT(g_counter == 1); } diff --git a/test/core/util/port_server_client.cc b/test/core/util/port_server_client.cc index 7efa951862b..9d0cb20bbda 100644 --- a/test/core/util/port_server_client.cc +++ b/test/core/util/port_server_client.cc @@ -241,6 +241,7 @@ int grpc_pick_port_using_server(void) { grpc_pollset_shutdown(grpc_polling_entity_pollset(&pr.pops), shutdown_closure); + grpc_core::ExecCtx::Get()->Flush(); grpc_shutdown(); return pr.port; diff --git a/test/cpp/client/client_channel_stress_test.cc b/test/cpp/client/client_channel_stress_test.cc index 8940f6ff9e8..bdb0441bd7c 100644 --- a/test/cpp/client/client_channel_stress_test.cc +++ b/test/cpp/client/client_channel_stress_test.cc @@ -214,13 +214,13 @@ class ClientChannelStressTest { }; void SetNextResolution(const std::vector& address_data) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_lb_addresses* addresses = grpc_lb_addresses_create(address_data.size(), nullptr); for (size_t i = 0; i < address_data.size(); ++i) { char* lb_uri_str; gpr_asprintf(&lb_uri_str, "ipv4:127.0.0.1:%d", address_data[i].port); - grpc_uri* lb_uri = grpc_uri_parse(&exec_ctx, lb_uri_str, true); + grpc_uri* lb_uri = grpc_uri_parse(lb_uri_str, true); GPR_ASSERT(lb_uri != nullptr); grpc_lb_addresses_set_address_from_uri( addresses, i, lb_uri, address_data[i].is_balancer, @@ -230,10 +230,9 @@ class ClientChannelStressTest { } grpc_arg fake_addresses = grpc_lb_addresses_create_channel_arg(addresses); grpc_channel_args fake_result = {1, &fake_addresses}; - grpc_fake_resolver_response_generator_set_response( - &exec_ctx, response_generator_, &fake_result); - grpc_lb_addresses_destroy(&exec_ctx, addresses); - grpc_exec_ctx_finish(&exec_ctx); + grpc_fake_resolver_response_generator_set_response(response_generator_, + &fake_result); + grpc_lb_addresses_destroy(addresses); } void KeepSendingRequests() { From eaf67dbdf67821b76e67066f201f2fafe1f5859c Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Wed, 22 Nov 2017 16:03:32 -0800 Subject: [PATCH 015/127] Fixing errors and minor bugs --- src/core/lib/iomgr/exec_ctx.cc | 20 +++++++------------- src/core/lib/iomgr/exec_ctx.h | 20 +++++++++++--------- src/core/lib/iomgr/pollset_uv.cc | 2 +- src/core/lib/iomgr/pollset_windows.cc | 2 +- test/core/util/test_tcp_server.cc | 2 +- test/cpp/microbenchmarks/bm_pollset.cc | 8 ++++---- 6 files changed, 25 insertions(+), 29 deletions(-) diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index 4bd92a41419..25ff686188f 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -108,6 +108,13 @@ namespace grpc_core { thread_local ExecCtx* ExecCtx::exec_ctx_ = nullptr; #endif +void ExecCtx::GlobalInit(void) { + g_start_time = gpr_now(GPR_CLOCK_MONOTONIC); +#ifdef GPR_PTHREAD_TLS + gpr_tls_init(&exec_ctx_); +#endif +} + bool ExecCtx::Flush() { bool did_something = 0; GPR_TIMER_BEGIN("grpc_exec_ctx_flush", 0); @@ -131,19 +138,6 @@ bool ExecCtx::Flush() { return did_something; } -void ExecCtx::GlobalInit(void) { - g_start_time = gpr_now(GPR_CLOCK_MONOTONIC); -#ifdef GPR_PTHREAD_TLS - gpr_tls_init(&exec_ctx_); -#endif -} - -void ExecCtx::GlobalShutdown(void) { -#ifdef GPR_PTHREAD_TLS - gpr_tls_destroy(&exec_ctx_); -#endif -} - grpc_millis ExecCtx::Now() { if (!now_is_valid_) { now_ = timespec_to_atm_round_down(gpr_now(GPR_CLOCK_MONOTONIC)); diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index 6320e13acb5..6c310a4fd61 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -47,6 +47,12 @@ typedef struct grpc_combiner grpc_combiner; should be given to not delete said call/channel from this exec_ctx */ #define GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP 2 +extern grpc_closure_scheduler* grpc_schedule_on_exec_ctx; + +gpr_timespec grpc_millis_to_timespec(grpc_millis millis, gpr_clock_type clock); +grpc_millis grpc_timespec_to_millis_round_down(gpr_timespec timespec); +grpc_millis grpc_timespec_to_millis_round_up(gpr_timespec timespec); + namespace grpc_core { /** Execution context. * A bag of data that collects information along a callstack. @@ -164,7 +170,11 @@ on outside context */ static void GlobalInit(void); /** Global shutdown for ExecCtx. Called by iomgr */ - static void GlobalShutdown(void); + static void GlobalShutdown(void) { +#ifdef GPR_PTHREAD_TLS + gpr_tls_destroy(&exec_ctx_); +#endif + } /** Gets pointer to current exec_ctx */ static ExecCtx* Get() { @@ -206,14 +216,6 @@ on outside context */ }; } // namespace grpc_core -extern grpc_closure_scheduler* grpc_schedule_on_exec_ctx; - -gpr_timespec grpc_millis_to_timespec(grpc_millis millis, gpr_clock_type clock); -grpc_millis grpc_timespec_to_millis_round_down(gpr_timespec timespec); -grpc_millis grpc_timespec_to_millis_round_up(gpr_timespec timespec); - -void grpc_exec_ctx_maybe_update_start_time(); - #ifdef __cplusplus } #endif diff --git a/src/core/lib/iomgr/pollset_uv.cc b/src/core/lib/iomgr/pollset_uv.cc index d040c0cccb6..d9e5ad81be4 100644 --- a/src/core/lib/iomgr/pollset_uv.cc +++ b/src/core/lib/iomgr/pollset_uv.cc @@ -139,7 +139,7 @@ grpc_error* grpc_pollset_work(grpc_pollset* pollset, uv_run(uv_default_loop(), UV_RUN_NOWAIT); } } - if (!grpc_closure_list_empty(exec_ctx->closure_list)) { + if (!grpc_closure_list_empty(*grpc_core::ExecCtx::Get()->closure_list())) { grpc_core::ExecCtx::Get()->Flush(); } gpr_mu_lock(&grpc_polling_mu); diff --git a/src/core/lib/iomgr/pollset_windows.cc b/src/core/lib/iomgr/pollset_windows.cc index 162037a8da4..6ef949aad70 100644 --- a/src/core/lib/iomgr/pollset_windows.cc +++ b/src/core/lib/iomgr/pollset_windows.cc @@ -166,7 +166,7 @@ grpc_error* grpc_pollset_work(grpc_pollset* pollset, pollset->kicked_without_pollers = 0; } done: - if (!grpc_closure_list_empty(exec_ctx->closure_list)) { + if (!grpc_closure_list_empty(*grpc_core::ExecCtx::Get()->closure_list())) { gpr_mu_unlock(&grpc_polling_mu); grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&grpc_polling_mu); diff --git a/test/core/util/test_tcp_server.cc b/test/core/util/test_tcp_server.cc index 71e6f3af2c7..b94297addab 100644 --- a/test/core/util/test_tcp_server.cc +++ b/test/core/util/test_tcp_server.cc @@ -106,7 +106,7 @@ void test_tcp_server_destroy(test_tcp_server* server) { grpc_pollset_shutdown(server->pollset, GRPC_CLOSURE_CREATE(finish_pollset, server->pollset, grpc_schedule_on_exec_ctx)); - + grpc_core::ExecCtx::Get()->Flush(); gpr_free(server->pollset); grpc_shutdown(); } diff --git a/test/cpp/microbenchmarks/bm_pollset.cc b/test/cpp/microbenchmarks/bm_pollset.cc index ec0bf4e4b9b..9a859b51eac 100644 --- a/test/cpp/microbenchmarks/bm_pollset.cc +++ b/test/cpp/microbenchmarks/bm_pollset.cc @@ -62,7 +62,7 @@ static void BM_CreateDestroyPollset(benchmark::State& state) { gpr_mu_unlock(mu); grpc_core::ExecCtx::Get()->Flush(); } - + grpc_core::ExecCtx::Get()->Flush(); gpr_free(ps); track_counters.Finish(state); } @@ -124,7 +124,7 @@ static void BM_PollEmptyPollset(benchmark::State& state) { grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - + grpc_core::ExecCtx::Get()->Flush(); gpr_free(ps); track_counters.Finish(state); } @@ -152,7 +152,7 @@ static void BM_PollAddFd(benchmark::State& state) { gpr_mu_lock(mu); grpc_pollset_shutdown(ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - + grpc_core::ExecCtx::Get()->Flush(); gpr_free(ps); track_counters.Finish(state); } @@ -248,7 +248,7 @@ static void BM_SingleThreadPollOneFd(benchmark::State& state) { grpc_schedule_on_exec_ctx); grpc_pollset_shutdown(ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - + grpc_core::ExecCtx::Get()->Flush(); grpc_wakeup_fd_destroy(&wakeup_fd); gpr_free(ps); track_counters.Finish(state); From ba0689fa2a7fa5f0684d6ce0cde61f453d565ef5 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Mon, 27 Nov 2017 09:22:38 -0800 Subject: [PATCH 016/127] tls macro changes and UV fix --- include/grpc/impl/codegen/port_platform.h | 1 + include/grpc/support/tls_gcc.h | 16 ++++++++++++---- include/grpc/support/tls_msvc.h | 8 +++++++- include/grpc/support/tls_pthread.h | 10 +++++++++- src/core/lib/iomgr/exec_ctx.cc | 6 ++++-- src/core/lib/iomgr/exec_ctx.h | 14 +++++++------- src/core/lib/iomgr/tcp_uv.cc | 2 +- 7 files changed, 41 insertions(+), 16 deletions(-) diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h index 1906886d5e2..de27a53e268 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h @@ -182,6 +182,7 @@ #ifndef _BSD_SOURCE #define _BSD_SOURCE #endif +#define TLS_NO_SUPPORT 1 #if TARGET_OS_IPHONE #define GPR_PLATFORM_STRING "ios" #define GPR_CPU_IPHONE 1 diff --git a/include/grpc/support/tls_gcc.h b/include/grpc/support/tls_gcc.h index 170baf82ca4..c926400e8e6 100644 --- a/include/grpc/support/tls_gcc.h +++ b/include/grpc/support/tls_gcc.h @@ -33,12 +33,18 @@ struct gpr_gcc_thread_local { bool* inited; }; +/** Use GPR_TLS_DECL to declare tls static variables outside a class */ #define GPR_TLS_DECL(name) \ static bool name##_inited = false; \ static __thread struct gpr_gcc_thread_local name = {0, &(name##_inited)} -#define GPR_TLS_NON_STATIC_DECL(name) \ - bool name##_inited = false; \ +/** Use GPR_TLS_CLASS_DECL to declare tls static variable members of a class. + * GPR_TLS_CLASS_DEF needs to be called to define this member. */ +#define GPR_TLS_CLASS_DECL(name) \ + static bool name##_inited = false; \ + static __thread struct gpr_gcc_thread_local name + +#define GPR_TLS_CLASS_DEF(name) \ __thread struct gpr_gcc_thread_local name = {0, &(name##_inited)} #define gpr_tls_init(tls) \ @@ -75,8 +81,10 @@ struct gpr_gcc_thread_local { #define GPR_TLS_DECL(name) \ static __thread struct gpr_gcc_thread_local name = {0} -#define GPR_TLS_NON_STATIC_DECL(name) \ - __thread struct gpr_gcc_thread_local name = {0} +#define GPR_TLS_CLASS_DECL(name) \ + static __thread struct gpr_gcc_thread_local name + +#define GPR_TLS_CLASS_DEF(name) __thread struct gpr_gcc_thread_local name = {0} #define gpr_tls_init(tls) \ do { \ diff --git a/include/grpc/support/tls_msvc.h b/include/grpc/support/tls_msvc.h index e3a0921912b..68a411f5d46 100644 --- a/include/grpc/support/tls_msvc.h +++ b/include/grpc/support/tls_msvc.h @@ -26,10 +26,16 @@ struct gpr_msvc_thread_local { intptr_t value; }; +/** Use GPR_TLS_DECL to declare tls static variables outside a class */ #define GPR_TLS_DECL(name) \ static __declspec(thread) struct gpr_msvc_thread_local name = {0} -#define GPR_TLS_NON_STATIC_DECL(name) \ +/** Use GPR_TLS_CLASS_DECL to declare tls static variable members of a class. + * GPR_TLS_CLASS_DEF needs to be called to define this member. */ +#define GPR_TLS_CLASS_DECL(name) \ + static __declspec(thread) struct gpr_msvc_thread_local name + +#define GPR_TLS_CLASS_DEF(name) \ __declspec(thread) struct gpr_msvc_thread_local name = {0} #define gpr_tls_init(tls) \ diff --git a/include/grpc/support/tls_pthread.h b/include/grpc/support/tls_pthread.h index 09768d84238..249c8b16f85 100644 --- a/include/grpc/support/tls_pthread.h +++ b/include/grpc/support/tls_pthread.h @@ -29,8 +29,16 @@ struct gpr_pthread_thread_local { pthread_key_t key; }; +/** Use GPR_TLS_DECL to declare tls static variables outside a class */ #define GPR_TLS_DECL(name) static struct gpr_pthread_thread_local name = {0} -#define GPR_TLS_NON_STATIC_DECL(name) struct gpr_pthread_thread_local name = {0} + +/** Use GPR_TLS_CLASS_DECL to declare tls static variable members of a class. + * GPR_TLS_CLASS_DEF needs to be called to define this member. */ +#define GPR_TLS_CLASS_DECL(name) static struct gpr_pthread_thread_local name + +/** Use GPR_TLS_CLASS_DEF to declare tls static variable members of a class. + * GPR_TLS_CLASS_DEF needs to be called to define this member. */ +#define GPR_TLS_CLASS_DEF(name) struct gpr_pthread_thread_local name = {0} #define gpr_tls_init(tls) GPR_ASSERT(0 == pthread_key_create(&(tls)->key, NULL)) #define gpr_tls_destroy(tls) pthread_key_delete((tls)->key) diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index 25ff686188f..f4247db754d 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -104,13 +104,15 @@ static grpc_closure_scheduler exec_ctx_scheduler = {&exec_ctx_scheduler_vtable}; grpc_closure_scheduler* grpc_schedule_on_exec_ctx = &exec_ctx_scheduler; namespace grpc_core { -#ifndef GPR_PTHREAD_TLS +#ifdef TLS_NO_SUPPORT +GPR_TLS_CLASS_DEF(ExecCtx::exec_ctx_); +#else thread_local ExecCtx* ExecCtx::exec_ctx_ = nullptr; #endif void ExecCtx::GlobalInit(void) { g_start_time = gpr_now(GPR_CLOCK_MONOTONIC); -#ifdef GPR_PTHREAD_TLS +#ifdef TLS_NO_SUPPORT gpr_tls_init(&exec_ctx_); #endif } diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index 6c310a4fd61..3a44d691b73 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -171,15 +171,15 @@ on outside context */ /** Global shutdown for ExecCtx. Called by iomgr */ static void GlobalShutdown(void) { -#ifdef GPR_PTHREAD_TLS +#ifdef TLS_NO_SUPPORT gpr_tls_destroy(&exec_ctx_); #endif } /** Gets pointer to current exec_ctx */ static ExecCtx* Get() { -#ifdef GPR_PTHREAD_TLS - return (ExecCtx*)gpr_tls_get(&exec_ctx_); +#ifdef TLS_NO_SUPPORT + return reinterpret_cast(gpr_tls_get(&exec_ctx_)); #else return exec_ctx_; #endif @@ -192,8 +192,8 @@ on outside context */ private: /** Set exec_ctx_ to exec_ctx */ void Set(ExecCtx* exec_ctx) { -#ifdef GPR_PTHREAD_THS - gpr_tls_set(&exec_ctx_, exec_ctx); +#ifdef TLS_NO_SUPPORT + gpr_tls_set(&exec_ctx_, reinterpret_cast(exec_ctx)); #else exec_ctx_ = exec_ctx; #endif @@ -207,8 +207,8 @@ on outside context */ bool now_is_valid_ = false; grpc_millis now_ = 0; -#ifdef GPR_PTHREAD_TLS - GPR_TLS_DECL(exec_ctx_); +#ifdef TLS_NO_SUPPORT + GPR_TLS_CLASS_DECL(exec_ctx_); #else static thread_local ExecCtx* exec_ctx_; #endif diff --git a/src/core/lib/iomgr/tcp_uv.cc b/src/core/lib/iomgr/tcp_uv.cc index 18037d77b4e..d41ddaf4280 100644 --- a/src/core/lib/iomgr/tcp_uv.cc +++ b/src/core/lib/iomgr/tcp_uv.cc @@ -145,7 +145,7 @@ static void call_read_cb(grpc_tcp* tcp, grpc_error* error) { } tcp->read_slices = NULL; tcp->read_cb = NULL; - GRPC_CLOSURE_RUN(, cb, error); + GRPC_CLOSURE_RUN(cb, error); } static void read_callback(uv_stream_t* stream, ssize_t nread, From 6fbe010851bd2041e98468f5befef5d6e3d598b0 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Mon, 27 Nov 2017 13:46:18 -0800 Subject: [PATCH 017/127] minor objc test change --- .../tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm | 5 ++--- tools/codegen/core/gen_static_metadata.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm b/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm index d5e668a858a..55c5105de4c 100644 --- a/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm +++ b/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm @@ -110,13 +110,12 @@ static void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { static void cronet_init_client_simple_ssl_secure_fullstack( grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { - grpc_exec_ctx ctx = GRPC_EXEC_CTX_INIT; + grpc_exec_ctx _local_exec_ctx; stream_engine *cronetEngine = [Cronet getGlobalEngine]; grpc_channel_args *new_client_args = grpc_channel_args_copy(client_args); cronet_init_client_secure_fullstack(f, new_client_args, cronetEngine); - grpc_channel_args_destroy(&ctx, new_client_args); - grpc_exec_ctx_finish(&ctx); + grpc_channel_args_destroy(new_client_args); } static int fail_server_auth_check(grpc_channel_args *server_args) { diff --git a/tools/codegen/core/gen_static_metadata.py b/tools/codegen/core/gen_static_metadata.py index 355f3f4e232..7847b8ed1de 100755 --- a/tools/codegen/core/gen_static_metadata.py +++ b/tools/codegen/core/gen_static_metadata.py @@ -395,7 +395,7 @@ print >> C, 'static uint8_t g_bytes[] = {%s};' % ( ','.join('%d' % ord(c) for c in ''.join(all_strs))) print >> C print >> C, 'static void static_ref(void *unused) {}' -print >> C, 'static void static_unref(grpc_exec_ctx *exec_ctx, void *unused) {}' +print >> C, 'static void static_unref(void *unused) {}' print >> C, ('static const grpc_slice_refcount_vtable static_sub_vtable = ' '{static_ref, static_unref, grpc_slice_default_eq_impl, ' 'grpc_slice_default_hash_impl};') From fc8eafefa3af8a441e2ad4dc75fa3df52d2c00a2 Mon Sep 17 00:00:00 2001 From: Jack Wakefield Date: Mon, 25 Sep 2017 12:31:14 +0100 Subject: [PATCH 018/127] Fix a PHP memory leak with SSL root certificates --- src/php/ext/grpc/channel_credentials.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/php/ext/grpc/channel_credentials.c b/src/php/ext/grpc/channel_credentials.c index 86e4f46c67a..d120d6e90fe 100644 --- a/src/php/ext/grpc/channel_credentials.c +++ b/src/php/ext/grpc/channel_credentials.c @@ -35,6 +35,7 @@ #include #include +#include #include #include @@ -46,10 +47,11 @@ static char *default_pem_root_certs = NULL; static grpc_ssl_roots_override_result get_ssl_roots_override( char **pem_root_certs) { - *pem_root_certs = default_pem_root_certs; - if (default_pem_root_certs == NULL) { + if (!default_pem_root_certs) { + *pem_root_certs = NULL; return GRPC_SSL_ROOTS_OVERRIDE_FAIL; } + *pem_root_certs = gpr_strdup(default_pem_root_certs); return GRPC_SSL_ROOTS_OVERRIDE_OK; } @@ -101,7 +103,7 @@ PHP_METHOD(ChannelCredentials, setDefaultRootsPem) { "setDefaultRootsPem expects 1 string", 1 TSRMLS_CC); return; } - default_pem_root_certs = gpr_malloc((pem_roots_length + 1) * sizeof(char)); + default_pem_root_certs = gpr_realloc(default_pem_root_certs, (pem_roots_length + 1) * sizeof(char)); memcpy(default_pem_root_certs, pem_roots, pem_roots_length + 1); } From 45b7ad5cf51ad97314d769ed70cfcda53d41b9d1 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Mon, 27 Nov 2017 15:35:21 -0800 Subject: [PATCH 019/127] GPR_TLS Macro fix, and windows resolve_address fix --- include/grpc/support/tls_gcc.h | 3 ++- src/core/lib/iomgr/resolve_address_windows.cc | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/grpc/support/tls_gcc.h b/include/grpc/support/tls_gcc.h index c926400e8e6..136cb75dac7 100644 --- a/include/grpc/support/tls_gcc.h +++ b/include/grpc/support/tls_gcc.h @@ -41,10 +41,11 @@ struct gpr_gcc_thread_local { /** Use GPR_TLS_CLASS_DECL to declare tls static variable members of a class. * GPR_TLS_CLASS_DEF needs to be called to define this member. */ #define GPR_TLS_CLASS_DECL(name) \ - static bool name##_inited = false; \ + static bool name##_inited; \ static __thread struct gpr_gcc_thread_local name #define GPR_TLS_CLASS_DEF(name) \ + bool name##_inited = false; \ __thread struct gpr_gcc_thread_local name = {0, &(name##_inited)} #define gpr_tls_init(tls) \ diff --git a/src/core/lib/iomgr/resolve_address_windows.cc b/src/core/lib/iomgr/resolve_address_windows.cc index 4e2bc7b5cab..ccb1dae689c 100644 --- a/src/core/lib/iomgr/resolve_address_windows.cc +++ b/src/core/lib/iomgr/resolve_address_windows.cc @@ -51,6 +51,7 @@ typedef struct { static grpc_error* blocking_resolve_address_impl( const char* name, const char* default_port, grpc_resolved_addresses** addresses) { + grpc_core::ExecCtx exec_ctx; struct addrinfo hints; struct addrinfo *result = NULL, *resp; char* host; From 0a5cacae46bf696e6560840652e670068741c606 Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Mon, 27 Nov 2017 15:43:28 -0800 Subject: [PATCH 020/127] Remove changes for podspecs other than gRPC-Core --- gRPC-ProtoRPC.podspec | 4 ---- gRPC-RxLibrary.podspec | 4 ---- gRPC.podspec | 4 ---- src/objective-c/!ProtoCompiler-gRPCPlugin.podspec | 4 ---- templates/gRPC-ProtoRPC.podspec.template | 4 ---- templates/gRPC-RxLibrary.podspec.template | 4 ---- templates/gRPC.podspec.template | 4 ---- .../objective-c/!ProtoCompiler-gRPCPlugin.podspec.template | 4 ---- 8 files changed, 32 deletions(-) diff --git a/gRPC-ProtoRPC.podspec b/gRPC-ProtoRPC.podspec index dcf9cceb0b0..db1e8db06c0 100644 --- a/gRPC-ProtoRPC.podspec +++ b/gRPC-ProtoRPC.podspec @@ -28,10 +28,6 @@ Pod::Spec.new do |s| s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } - # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, - # which was released in Cocoapods v1.2.0. - s.cocoapods_version = '>= 1.2.0' - s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => "v#{version}", diff --git a/gRPC-RxLibrary.podspec b/gRPC-RxLibrary.podspec index aad383ad193..36897790395 100644 --- a/gRPC-RxLibrary.podspec +++ b/gRPC-RxLibrary.podspec @@ -28,10 +28,6 @@ Pod::Spec.new do |s| s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } - # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, - # which was released in Cocoapods v1.2.0. - s.cocoapods_version = '>= 1.2.0' - s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => "v#{version}", diff --git a/gRPC.podspec b/gRPC.podspec index a9340e769e2..4c6cd3535f6 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -27,10 +27,6 @@ Pod::Spec.new do |s| s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } - # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, - # which was released in Cocoapods v1.2.0. - s.cocoapods_version = '>= 1.2.0' - s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => "v#{version}", diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec index cd83e866961..9065ab9f73e 100644 --- a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec +++ b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec @@ -95,10 +95,6 @@ Pod::Spec.new do |s| # :sha1 => '??', } - # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, - # which was released in Cocoapods v1.2.0. - s.cocoapods_version = '>= 1.2.0' - repo_root = '../..' plugin = 'grpc_objective_c_plugin' diff --git a/templates/gRPC-ProtoRPC.podspec.template b/templates/gRPC-ProtoRPC.podspec.template index bb6d7445e1b..4d99f6e19fc 100644 --- a/templates/gRPC-ProtoRPC.podspec.template +++ b/templates/gRPC-ProtoRPC.podspec.template @@ -30,10 +30,6 @@ s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } - # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, - # which was released in Cocoapods v1.2.0. - s.cocoapods_version = '>= 1.2.0' - s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => "v#{version}", diff --git a/templates/gRPC-RxLibrary.podspec.template b/templates/gRPC-RxLibrary.podspec.template index 42c50e5e632..de4ee1e4385 100644 --- a/templates/gRPC-RxLibrary.podspec.template +++ b/templates/gRPC-RxLibrary.podspec.template @@ -30,10 +30,6 @@ s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } - # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, - # which was released in Cocoapods v1.2.0. - s.cocoapods_version = '>= 1.2.0' - s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => "v#{version}", diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template index 9d47aa95627..4b360cfb4c4 100644 --- a/templates/gRPC.podspec.template +++ b/templates/gRPC.podspec.template @@ -29,10 +29,6 @@ s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } - # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, - # which was released in Cocoapods v1.2.0. - s.cocoapods_version = '>= 1.2.0' - s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => "v#{version}", diff --git a/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template b/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template index 4af9dc5a8cc..196c4054686 100644 --- a/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template +++ b/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template @@ -97,10 +97,6 @@ # :sha1 => '??', } - # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, - # which was released in Cocoapods v1.2.0. - s.cocoapods_version = '>= 1.2.0' - repo_root = '../..' plugin = 'grpc_objective_c_plugin' From 3285f4c7329bf4305133be74f88dd4b10d5e2052 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Mon, 27 Nov 2017 15:58:44 -0800 Subject: [PATCH 021/127] Fix grpc_init by removing exec_ctx usage before init --- include/grpc/support/tls_gcc.h | 6 +++--- src/core/lib/iomgr/iomgr.cc | 7 +++++-- src/core/lib/surface/init.cc | 1 - 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/grpc/support/tls_gcc.h b/include/grpc/support/tls_gcc.h index 136cb75dac7..e0ef6b2789b 100644 --- a/include/grpc/support/tls_gcc.h +++ b/include/grpc/support/tls_gcc.h @@ -40,12 +40,12 @@ struct gpr_gcc_thread_local { /** Use GPR_TLS_CLASS_DECL to declare tls static variable members of a class. * GPR_TLS_CLASS_DEF needs to be called to define this member. */ -#define GPR_TLS_CLASS_DECL(name) \ - static bool name##_inited; \ +#define GPR_TLS_CLASS_DECL(name) \ + static bool name##_inited; \ static __thread struct gpr_gcc_thread_local name #define GPR_TLS_CLASS_DEF(name) \ - bool name##_inited = false; \ + bool name##_inited = false; \ __thread struct gpr_gcc_thread_local name = {0, &(name##_inited)} #define gpr_tls_init(tls) \ diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index f3f080e3157..3bad17a54ec 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -50,8 +50,11 @@ void grpc_iomgr_init() { gpr_mu_init(&g_mu); gpr_cv_init(&g_rcv); grpc_core::ExecCtx::GlobalInit(); - grpc_executor_init(); - grpc_timer_list_init(); + { + grpc_core::ExecCtx _local_exec_ctx; + grpc_executor_init(); + grpc_timer_list_init(); + } g_root_object.next = g_root_object.prev = &g_root_object; g_root_object.name = (char*)"root"; grpc_network_status_init(); diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index cdbe01e1d45..da641e1cf5f 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -116,7 +116,6 @@ void grpc_init(void) { int i; gpr_once_init(&g_basic_init, do_basic_init); - grpc_core::ExecCtx _local_exec_ctx; gpr_mu_lock(&g_init_mu); if (++g_initializations == 1) { gpr_time_init(); From 81fc8c9c336fab7a71b448f748a32d680301277c Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 28 Nov 2017 13:23:36 -0800 Subject: [PATCH 022/127] Fix tests to call grpc_init and grpc_shutdown before using exec_ctx --- include/grpc/impl/codegen/port_platform.h | 2 +- include/grpc/support/tls.h | 6 + src/core/lib/iomgr/block_annotate.h | 8 + src/core/lib/iomgr/exec_ctx.h | 2 +- src/core/lib/iomgr/iomgr.cc | 102 +++++---- src/core/lib/iomgr/load_file.cc | 3 +- src/core/lib/surface/init.cc | 31 +-- test/core/backoff/backoff_test.cc | 3 + test/core/bad_client/tests/badreq.cc | 4 + .../bad_client/tests/connection_prefix.cc | 3 + .../bad_client/tests/head_of_line_blocking.cc | 3 + test/core/bad_client/tests/headers.cc | 2 + .../tests/initial_settings_frame.cc | 2 + .../tests/server_registered_method.cc | 2 + test/core/bad_client/tests/simple_request.cc | 4 + test/core/bad_client/tests/unknown_frame.cc | 2 + test/core/bad_client/tests/window_overflow.cc | 3 + .../core/client_channel/parse_address_test.cc | 4 + .../dns_resolver_connectivity_test.cc | 48 ++-- test/core/client_channel/uri_fuzzer_test.cc | 17 +- test/core/client_channel/uri_parser_test.cc | 3 + test/core/end2end/bad_server_response_test.cc | 2 + .../end2end/fixtures/h2_sockpair+trace.cc | 1 - test/core/end2end/fuzzers/api_fuzzer.cc | 2 +- test/core/end2end/fuzzers/client_fuzzer.cc | 209 +++++++++--------- test/core/end2end/fuzzers/server_fuzzer.cc | 134 +++++------ test/core/http/format_request_test.cc | 2 + test/core/http/httpcli_test.cc | 107 ++++----- test/core/http/httpscli_test.cc | 11 +- test/core/http/parser_test.cc | 3 + test/core/iomgr/endpoint_pair_test.cc | 17 +- test/core/iomgr/ev_epollsig_linux_test.cc | 22 +- test/core/iomgr/fd_conservation_posix_test.cc | 36 +-- test/core/iomgr/fd_posix_test.cc | 23 +- test/core/iomgr/load_file_test.cc | 3 + test/core/iomgr/pollset_set_test.cc | 31 +-- test/core/iomgr/resolve_address_posix_test.cc | 10 +- test/core/iomgr/resolve_address_test.cc | 22 +- test/core/iomgr/tcp_client_posix_test.cc | 29 +-- test/core/iomgr/tcp_posix_test.cc | 20 +- test/core/iomgr/tcp_server_posix_test.cc | 98 ++++---- test/core/iomgr/timer_list_test.cc | 3 + test/core/iomgr/udp_server_test.cc | 36 +-- test/core/security/json_token_test.cc | 2 + test/core/security/secure_endpoint_test.cc | 24 +- test/core/security/ssl_server_fuzzer.cc | 115 +++++----- test/core/slice/b64_test.cc | 3 + test/core/slice/percent_encoding_test.cc | 3 + test/core/slice/slice_buffer_test.cc | 3 + test/core/slice/slice_hash_table_test.cc | 2 + test/core/slice/slice_string_helpers_test.cc | 3 + test/core/slice/slice_test.cc | 2 + test/core/surface/byte_buffer_reader_test.cc | 2 + .../surface/concurrent_connectivity_test.cc | 10 +- test/core/transport/byte_stream_test.cc | 3 + .../core/transport/chttp2/bin_decoder_test.cc | 110 ++++----- .../core/transport/chttp2/bin_encoder_test.cc | 3 + .../chttp2/hpack_parser_fuzzer_test.cc | 15 +- test/core/transport/chttp2/varint_test.cc | 3 + .../core/transport/connectivity_state_test.cc | 2 + test/core/transport/metadata_test.cc | 2 + .../core/transport/stream_owned_slice_test.cc | 3 + test/core/util/one_corpus_entry_fuzzer.cc | 10 + test/core/util/port_server_client.cc | 83 +++---- 64 files changed, 822 insertions(+), 656 deletions(-) diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h index de27a53e268..1a93be38e01 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h @@ -182,7 +182,7 @@ #ifndef _BSD_SOURCE #define _BSD_SOURCE #endif -#define TLS_NO_SUPPORT 1 +#define TLS_NO_SUPPORT 1 /* thread-local storage not supported. Use GPR_TLS */ #if TARGET_OS_IPHONE #define GPR_PLATFORM_STRING "ios" #define GPR_CPU_IPHONE 1 diff --git a/include/grpc/support/tls.h b/include/grpc/support/tls.h index 8519a8350bc..4c9e79b6cff 100644 --- a/include/grpc/support/tls.h +++ b/include/grpc/support/tls.h @@ -32,6 +32,12 @@ GPR_TLS_DECL(foo); Thread locals always have static scope. + Declaring a thread local class variable 'foo': + GPR_TLS_CLASS_DECL(foo); + + Defining the thread local class variable: + GPR_TLS_CLASS_DEF(foo); + Initializing a thread local (must be done at library initialization time): gpr_tls_init(&foo); diff --git a/src/core/lib/iomgr/block_annotate.h b/src/core/lib/iomgr/block_annotate.h index 55bde3eaac7..e3d4368d176 100644 --- a/src/core/lib/iomgr/block_annotate.h +++ b/src/core/lib/iomgr/block_annotate.h @@ -46,6 +46,11 @@ void gpr_thd_end_blocking_region(); gpr_thd_end_blocking_region(); \ grpc_core::ExecCtx::Get()->InvalidateNow(); \ } while (0) +#define GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX \ + do { \ + gpr_thd_end_blocking_region(); \ + } while (0) + #else #define GRPC_SCHEDULING_START_BLOCKING_REGION \ do { \ @@ -54,6 +59,9 @@ void gpr_thd_end_blocking_region(); do { \ grpc_core::ExecCtx::Get()->InvalidateNow(); \ } while (0) +#define GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX \ + do { \ + } while (0) #endif #endif /* GRPC_CORE_LIB_IOMGR_BLOCK_ANNOTATE_H */ diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index 3a44d691b73..b04aab61fab 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -77,6 +77,7 @@ namespace grpc_core { class ExecCtx { public: /** Default Constructor */ + ExecCtx() : flags_(GRPC_EXEC_CTX_FLAG_IS_FINISHED) { Set(this); } /** Parameterised Constructor */ @@ -84,7 +85,6 @@ class ExecCtx { /** Destructor */ ~ExecCtx() { - GPR_ASSERT(Get() == this); flags_ |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; Flush(); Set(last_exec_ctx_); diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index 3bad17a54ec..570d97443d8 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -84,62 +84,66 @@ void grpc_iomgr_shutdown() { gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_seconds(10, GPR_TIMESPAN)); gpr_timespec last_warning_time = gpr_now(GPR_CLOCK_REALTIME); - grpc_timer_manager_shutdown(); - grpc_iomgr_platform_flush(); - grpc_executor_shutdown(); - - gpr_mu_lock(&g_mu); - g_shutdown = 1; - while (g_root_object.next != &g_root_object) { - if (gpr_time_cmp( - gpr_time_sub(gpr_now(GPR_CLOCK_REALTIME), last_warning_time), - gpr_time_from_seconds(1, GPR_TIMESPAN)) >= 0) { - if (g_root_object.next != &g_root_object) { - gpr_log(GPR_DEBUG, - "Waiting for %" PRIuPTR " iomgr objects to be destroyed", - count_objects()); + { + grpc_core::ExecCtx _local_exec_ctx(0); + grpc_timer_manager_shutdown(); + grpc_iomgr_platform_flush(); + grpc_executor_shutdown(); + + gpr_mu_lock(&g_mu); + g_shutdown = 1; + while (g_root_object.next != &g_root_object) { + if (gpr_time_cmp( + gpr_time_sub(gpr_now(GPR_CLOCK_REALTIME), last_warning_time), + gpr_time_from_seconds(1, GPR_TIMESPAN)) >= 0) { + if (g_root_object.next != &g_root_object) { + gpr_log(GPR_DEBUG, + "Waiting for %" PRIuPTR " iomgr objects to be destroyed", + count_objects()); + } + last_warning_time = gpr_now(GPR_CLOCK_REALTIME); } - last_warning_time = gpr_now(GPR_CLOCK_REALTIME); - } - grpc_core::ExecCtx::Get()->SetNowIomgrShutdown(); - if (grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED) { - gpr_mu_unlock(&g_mu); - grpc_core::ExecCtx::Get()->Flush(); - grpc_iomgr_platform_flush(); - gpr_mu_lock(&g_mu); - continue; - } - if (g_root_object.next != &g_root_object) { - if (grpc_iomgr_abort_on_leaks()) { - gpr_log(GPR_DEBUG, - "Failed to free %" PRIuPTR - " iomgr objects before shutdown deadline: " - "memory leaks are likely", - count_objects()); - dump_objects("LEAKED"); - abort(); + grpc_core::ExecCtx::Get()->SetNowIomgrShutdown(); + if (grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED) { + gpr_mu_unlock(&g_mu); + grpc_core::ExecCtx::Get()->Flush(); + grpc_iomgr_platform_flush(); + gpr_mu_lock(&g_mu); + continue; } - gpr_timespec short_deadline = gpr_time_add( - gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_millis(100, GPR_TIMESPAN)); - if (gpr_cv_wait(&g_rcv, &g_mu, short_deadline)) { - if (gpr_time_cmp(gpr_now(GPR_CLOCK_REALTIME), shutdown_deadline) > 0) { - if (g_root_object.next != &g_root_object) { - gpr_log(GPR_DEBUG, - "Failed to free %" PRIuPTR - " iomgr objects before shutdown deadline: " - "memory leaks are likely", - count_objects()); - dump_objects("LEAKED"); + if (g_root_object.next != &g_root_object) { + if (grpc_iomgr_abort_on_leaks()) { + gpr_log(GPR_DEBUG, + "Failed to free %" PRIuPTR + " iomgr objects before shutdown deadline: " + "memory leaks are likely", + count_objects()); + dump_objects("LEAKED"); + abort(); + } + gpr_timespec short_deadline = + gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), + gpr_time_from_millis(100, GPR_TIMESPAN)); + if (gpr_cv_wait(&g_rcv, &g_mu, short_deadline)) { + if (gpr_time_cmp(gpr_now(GPR_CLOCK_REALTIME), shutdown_deadline) > + 0) { + if (g_root_object.next != &g_root_object) { + gpr_log(GPR_DEBUG, + "Failed to free %" PRIuPTR + " iomgr objects before shutdown deadline: " + "memory leaks are likely", + count_objects()); + dump_objects("LEAKED"); + } + break; } - break; } } } - } - gpr_mu_unlock(&g_mu); + gpr_mu_unlock(&g_mu); - grpc_timer_list_shutdown(); - grpc_core::ExecCtx::Get()->Flush(); + grpc_timer_list_shutdown(); + } /* ensure all threads have left g_mu */ gpr_mu_lock(&g_mu); diff --git a/src/core/lib/iomgr/load_file.cc b/src/core/lib/iomgr/load_file.cc index 1afe6ba96dd..4a05de1410c 100644 --- a/src/core/lib/iomgr/load_file.cc +++ b/src/core/lib/iomgr/load_file.cc @@ -30,7 +30,6 @@ grpc_error* grpc_load_file(const char* filename, int add_null_terminator, grpc_slice* output) { - grpc_core::ExecCtx exec_ctx; unsigned char* contents = nullptr; size_t contents_size = 0; grpc_slice result = grpc_empty_slice(); @@ -74,6 +73,6 @@ end: GRPC_ERROR_UNREF(error); error = error_out; } - GRPC_SCHEDULING_END_BLOCKING_REGION; + GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX; return error; } diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index da641e1cf5f..2d7a33e147b 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -153,23 +153,28 @@ void grpc_shutdown(void) { if (grpc_core::ExecCtx::Get()) { grpc_core::ExecCtx::Get()->Flush(); } - grpc_core::ExecCtx _local_exec_ctx(0); gpr_mu_lock(&g_init_mu); if (--g_initializations == 0) { - grpc_executor_shutdown(); - grpc_timer_manager_set_threading(false); // shutdown timer_manager thread - for (i = g_number_of_plugins; i >= 0; i--) { - if (g_all_of_the_plugins[i].destroy != nullptr) { - g_all_of_the_plugins[i].destroy(); + { + { + grpc_core::ExecCtx _local_exec_ctx(0); + grpc_executor_shutdown(); + grpc_timer_manager_set_threading( + false); // shutdown timer_manager thread + for (i = g_number_of_plugins; i >= 0; i--) { + if (g_all_of_the_plugins[i].destroy != nullptr) { + g_all_of_the_plugins[i].destroy(); + } + } + grpc_mdctx_global_shutdown(); + grpc_handshaker_factory_registry_shutdown(); } + grpc_iomgr_shutdown(); + gpr_timers_global_destroy(); + grpc_tracer_shutdown(); + grpc_slice_intern_shutdown(); + grpc_stats_shutdown(); } - grpc_iomgr_shutdown(); - gpr_timers_global_destroy(); - grpc_tracer_shutdown(); - grpc_mdctx_global_shutdown(); - grpc_handshaker_factory_registry_shutdown(); - grpc_slice_intern_shutdown(); - grpc_stats_shutdown(); } gpr_mu_unlock(&g_init_mu); } diff --git a/test/core/backoff/backoff_test.cc b/test/core/backoff/backoff_test.cc index 76a9f39c35a..2cd97d80556 100644 --- a/test/core/backoff/backoff_test.cc +++ b/test/core/backoff/backoff_test.cc @@ -18,6 +18,7 @@ #include "src/core/lib/backoff/backoff.h" +#include #include #include @@ -174,6 +175,7 @@ static void test_jitter_backoff(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); gpr_time_init(); test_constant_backoff(); @@ -181,5 +183,6 @@ int main(int argc, char** argv) { test_no_jitter_backoff(); test_jitter_backoff(); + grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/badreq.cc b/test/core/bad_client/tests/badreq.cc index c30244e0cdd..eeaf4c99748 100644 --- a/test/core/bad_client/tests/badreq.cc +++ b/test/core/bad_client/tests/badreq.cc @@ -20,6 +20,8 @@ #include +#include + #include "src/core/lib/surface/server.h" #include "test/core/end2end/cq_verifier.h" @@ -38,6 +40,7 @@ static void verifier(grpc_server* server, grpc_completion_queue* cq, int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); /* invalid content type */ GRPC_RUN_BAD_CLIENT_TEST( @@ -126,5 +129,6 @@ int main(int argc, char** argv) { "\x10\x0auser-agent\"bad-client grpc-c/0.12.0.0 (linux)", GRPC_BAD_CLIENT_DISCONNECT); + grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/connection_prefix.cc b/test/core/bad_client/tests/connection_prefix.cc index 47252f9f105..4aab234d3e5 100644 --- a/test/core/bad_client/tests/connection_prefix.cc +++ b/test/core/bad_client/tests/connection_prefix.cc @@ -30,6 +30,7 @@ static void verifier(grpc_server* server, grpc_completion_queue* cq, int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, "X", 0); GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, "PX", 0); @@ -57,5 +58,7 @@ int main(int argc, char** argv) { 0); GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, "PRI * HTTP/2.0\r\n\r\nSM\r\n\rX", 0); + + grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/head_of_line_blocking.cc b/test/core/bad_client/tests/head_of_line_blocking.cc index bbc56119914..f56c4d71dd6 100644 --- a/test/core/bad_client/tests/head_of_line_blocking.cc +++ b/test/core/bad_client/tests/head_of_line_blocking.cc @@ -20,6 +20,7 @@ #include +#include #include #include "src/core/lib/surface/server.h" @@ -109,6 +110,7 @@ static void addbuf(const void* data, size_t len) { int main(int argc, char** argv) { int i; grpc_test_init(argc, argv); + grpc_init(); #define NUM_FRAMES 10 #define FRAME_SIZE 1000 @@ -131,6 +133,7 @@ int main(int argc, char** argv) { } grpc_run_bad_client_test(verifier, nullptr, g_buffer, g_count, 0); gpr_free(g_buffer); + grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/headers.cc b/test/core/bad_client/tests/headers.cc index 50bb72c493a..2aa1b280cee 100644 --- a/test/core/bad_client/tests/headers.cc +++ b/test/core/bad_client/tests/headers.cc @@ -34,6 +34,7 @@ static void verifier(grpc_server* server, grpc_completion_queue* cq, int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); /* partial http2 header prefixes */ GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, PFX_STR "\x00", @@ -335,5 +336,6 @@ int main(int argc, char** argv) { "15 seconds", GRPC_BAD_CLIENT_DISCONNECT); + grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/initial_settings_frame.cc b/test/core/bad_client/tests/initial_settings_frame.cc index edc52f503e5..0220000ecea 100644 --- a/test/core/bad_client/tests/initial_settings_frame.cc +++ b/test/core/bad_client/tests/initial_settings_frame.cc @@ -33,6 +33,7 @@ static void verifier(grpc_server* server, grpc_completion_queue* cq, int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); /* various partial prefixes */ GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, PFX_STR "\x00", @@ -106,5 +107,6 @@ int main(int argc, char** argv) { PFX_STR ONE_SETTING_HDR "\x00\x99\x00\x00\x00\x00", GRPC_BAD_CLIENT_DISCONNECT); + grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/server_registered_method.cc b/test/core/bad_client/tests/server_registered_method.cc index 6613c94b419..c2dc9c66af1 100644 --- a/test/core/bad_client/tests/server_registered_method.cc +++ b/test/core/bad_client/tests/server_registered_method.cc @@ -77,6 +77,7 @@ static void verifier_fails(grpc_server* server, grpc_completion_queue* cq, int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); /* body generated with * tools/codegen/core/gen_server_registered_method_bad_client_test_body.py */ @@ -123,5 +124,6 @@ int main(int argc, char** argv) { "\x00\x00\x07\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\x02\x00\x00", 0); + grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/simple_request.cc b/test/core/bad_client/tests/simple_request.cc index 9f4a03e69b3..c80fc5cb4af 100644 --- a/test/core/bad_client/tests/simple_request.cc +++ b/test/core/bad_client/tests/simple_request.cc @@ -20,6 +20,8 @@ #include +#include + #include "src/core/lib/surface/server.h" #include "test/core/end2end/cq_verifier.h" @@ -122,6 +124,7 @@ static void failure_verifier(grpc_server* server, grpc_completion_queue* cq, int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); /* basic request: check that things are working */ GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, PFX_STR, 0); @@ -164,5 +167,6 @@ int main(int argc, char** argv) { GRPC_RUN_BAD_CLIENT_TEST(failure_verifier, nullptr, PFX_STR "\x00\x00\x00\x03\x10\x00\x00\x00\x01", 0); + grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/unknown_frame.cc b/test/core/bad_client/tests/unknown_frame.cc index d962a4244d0..b1b618a43f3 100644 --- a/test/core/bad_client/tests/unknown_frame.cc +++ b/test/core/bad_client/tests/unknown_frame.cc @@ -33,6 +33,7 @@ static void verifier(grpc_server* server, grpc_completion_queue* cq, } int main(int argc, char** argv) { + grpc_init(); grpc_test_init(argc, argv); /* test adding prioritization data */ @@ -40,5 +41,6 @@ int main(int argc, char** argv) { PFX_STR "\x00\x00\x00\x88\x00\x00\x00\x00\x01", GRPC_BAD_CLIENT_DISCONNECT); + grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/window_overflow.cc b/test/core/bad_client/tests/window_overflow.cc index f4bd81828be..ed8279c9519 100644 --- a/test/core/bad_client/tests/window_overflow.cc +++ b/test/core/bad_client/tests/window_overflow.cc @@ -20,6 +20,7 @@ #include +#include #include #include "src/core/lib/surface/server.h" @@ -72,6 +73,7 @@ int main(int argc, char** argv) { #define SEND_SIZE (6 * 1024 * 1024) #define NUM_FRAMES (SEND_SIZE / FRAME_SIZE + 1) grpc_test_init(argc, argv); + grpc_init(); addbuf(PFX_STR, sizeof(PFX_STR) - 1); for (i = 0; i < NUM_FRAMES; i++) { @@ -93,6 +95,7 @@ int main(int argc, char** argv) { grpc_run_bad_client_test(verifier, nullptr, g_buffer, g_count, GRPC_BAD_CLIENT_LARGE_REQUEST); gpr_free(g_buffer); + grpc_shutdown(); return 0; } diff --git a/test/core/client_channel/parse_address_test.cc b/test/core/client_channel/parse_address_test.cc index f64b092743a..21c86d01f1a 100644 --- a/test/core/client_channel/parse_address_test.cc +++ b/test/core/client_channel/parse_address_test.cc @@ -24,6 +24,7 @@ #include #endif +#include #include #include "src/core/lib/iomgr/exec_ctx.h" @@ -90,9 +91,12 @@ static void test_grpc_parse_ipv6(const char* uri_text, const char* host, int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); test_grpc_parse_unix("unix:/path/name", "/path/name"); test_grpc_parse_ipv4("ipv4:192.0.2.1:12345", "192.0.2.1", 12345); test_grpc_parse_ipv6("ipv6:[2001:db8::1]:12345", "2001:db8::1", 12345, 0); test_grpc_parse_ipv6("ipv6:[2001:db8::1%252]:12345", "2001:db8::1", 12345, 2); + + grpc_shutdown(); } diff --git a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc index 08ce148efea..f6d7731a6d3 100644 --- a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc @@ -147,29 +147,31 @@ int main(int argc, char** argv) { grpc_dns_lookup_ares = my_dns_lookup_ares; grpc_channel_args* result = (grpc_channel_args*)1; - grpc_core::ExecCtx _local_exec_ctx; - grpc_resolver* resolver = create_resolver("dns:test"); - gpr_event ev1; - gpr_event_init(&ev1); - call_resolver_next_after_locking( - resolver, &result, - GRPC_CLOSURE_CREATE(on_done, &ev1, grpc_schedule_on_exec_ctx)); - grpc_core::ExecCtx::Get()->Flush(); - GPR_ASSERT(wait_loop(5, &ev1)); - GPR_ASSERT(result == nullptr); - - gpr_event ev2; - gpr_event_init(&ev2); - call_resolver_next_after_locking( - resolver, &result, - GRPC_CLOSURE_CREATE(on_done, &ev2, grpc_schedule_on_exec_ctx)); - grpc_core::ExecCtx::Get()->Flush(); - GPR_ASSERT(wait_loop(30, &ev2)); - GPR_ASSERT(result != nullptr); - - grpc_channel_args_destroy(result); - GRPC_RESOLVER_UNREF(resolver, "test"); - GRPC_COMBINER_UNREF(g_combiner, "test"); + { + grpc_core::ExecCtx _local_exec_ctx; + grpc_resolver* resolver = create_resolver("dns:test"); + gpr_event ev1; + gpr_event_init(&ev1); + call_resolver_next_after_locking( + resolver, &result, + GRPC_CLOSURE_CREATE(on_done, &ev1, grpc_schedule_on_exec_ctx)); + grpc_core::ExecCtx::Get()->Flush(); + GPR_ASSERT(wait_loop(5, &ev1)); + GPR_ASSERT(result == nullptr); + + gpr_event ev2; + gpr_event_init(&ev2); + call_resolver_next_after_locking( + resolver, &result, + GRPC_CLOSURE_CREATE(on_done, &ev2, grpc_schedule_on_exec_ctx)); + grpc_core::ExecCtx::Get()->Flush(); + GPR_ASSERT(wait_loop(30, &ev2)); + GPR_ASSERT(result != nullptr); + + grpc_channel_args_destroy(result); + GRPC_RESOLVER_UNREF(resolver, "test"); + GRPC_COMBINER_UNREF(g_combiner, "test"); + } grpc_shutdown(); gpr_mu_destroy(&g_mu); diff --git a/test/core/client_channel/uri_fuzzer_test.cc b/test/core/client_channel/uri_fuzzer_test.cc index 484676e4720..8f1f5e2eda2 100644 --- a/test/core/client_channel/uri_fuzzer_test.cc +++ b/test/core/client_channel/uri_fuzzer_test.cc @@ -20,6 +20,7 @@ #include #include +#include #include #include "src/core/ext/filters/client_channel/uri_parser.h" @@ -33,12 +34,18 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { memcpy(s, data, size); s[size] = 0; - grpc_core::ExecCtx _local_exec_ctx; - grpc_uri* x; - if ((x = grpc_uri_parse(s, 1))) { - grpc_uri_destroy(x); + grpc_init(); + + { + grpc_core::ExecCtx _local_exec_ctx; + grpc_uri* x; + if ((x = grpc_uri_parse(s, 1))) { + grpc_uri_destroy(x); + } + + gpr_free(s); } - gpr_free(s); + grpc_shutdown(); return 0; } diff --git a/test/core/client_channel/uri_parser_test.cc b/test/core/client_channel/uri_parser_test.cc index 1694f2363dc..33cf82d17c7 100644 --- a/test/core/client_channel/uri_parser_test.cc +++ b/test/core/client_channel/uri_parser_test.cc @@ -20,6 +20,7 @@ #include +#include #include #include "src/core/lib/iomgr/exec_ctx.h" @@ -119,6 +120,7 @@ static void test_query_parts() { int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); test_succeeds("http://www.google.com", "http", "www.google.com", "", "", ""); test_succeeds("dns:///foo", "dns", "", "/foo", "", ""); test_succeeds("http://www.google.com:90", "http", "www.google.com:90", "", "", @@ -146,5 +148,6 @@ int main(int argc, char** argv) { test_fails("http://foo?bar#lol#"); test_query_parts(); + grpc_shutdown(); return 0; } diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc index d3237839254..b65ba522ac5 100644 --- a/test/core/end2end/bad_server_response_test.cc +++ b/test/core/end2end/bad_server_response_test.cc @@ -298,6 +298,7 @@ static void run_test(const char* response_payload, int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); /* status defined in hpack static table */ run_test(HTTP2_RESP(204), sizeof(HTTP2_RESP(204)) - 1, GRPC_STATUS_CANCELLED, @@ -336,5 +337,6 @@ int main(int argc, char** argv) { run_test(HTTP1_RESP, sizeof(HTTP1_RESP) - 1, GRPC_STATUS_UNAVAILABLE, HTTP1_DETAIL_MSG); + grpc_shutdown(); return 0; } diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.cc b/test/core/end2end/fixtures/h2_sockpair+trace.cc index b8b18e2a956..574b7555397 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.cc +++ b/test/core/end2end/fixtures/h2_sockpair+trace.cc @@ -126,7 +126,6 @@ static grpc_end2end_test_config configs[] = { int main(int argc, char** argv) { size_t i; - grpc_core::ExecCtx _local_exec_ctx; /* force tracing on, with a value to force many code paths in trace.c to be taken */ diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index ce916bd3414..f3127e92cc4 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -745,8 +745,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { input_stream inp = {data, data + size}; grpc_tcp_client_connect_impl = my_tcp_client_connect; gpr_now_impl = now_impl; - grpc_init(); grpc_timer_manager_set_threading(false); + grpc_init(); { grpc_core::ExecCtx _local_exec_ctx; grpc_executor_set_threading(false); diff --git a/test/core/end2end/fuzzers/client_fuzzer.cc b/test/core/end2end/fuzzers/client_fuzzer.cc index 1298dd4e4f4..e2fb13936a9 100644 --- a/test/core/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/end2end/fuzzers/client_fuzzer.cc @@ -43,111 +43,114 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (squelch) gpr_set_log_function(dont_log); if (leak_check) grpc_memory_counters_init(); grpc_init(); - grpc_core::ExecCtx _local_exec_ctx; - grpc_executor_set_threading(false); - - grpc_resource_quota* resource_quota = - grpc_resource_quota_create("client_fuzzer"); - grpc_endpoint* mock_endpoint = - grpc_mock_endpoint_create(discard_write, resource_quota); - grpc_resource_quota_unref_internal(resource_quota); - - grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr); - grpc_transport* transport = - grpc_create_chttp2_transport(nullptr, mock_endpoint, 1); - grpc_chttp2_transport_start_reading(transport, nullptr); - - grpc_channel* channel = grpc_channel_create( - "test-target", nullptr, GRPC_CLIENT_DIRECT_CHANNEL, transport); - grpc_slice host = grpc_slice_from_static_string("localhost"); - grpc_call* call = grpc_channel_create_call( - channel, nullptr, 0, cq, grpc_slice_from_static_string("/foo"), &host, - gpr_inf_future(GPR_CLOCK_REALTIME), nullptr); - - grpc_metadata_array initial_metadata_recv; - grpc_metadata_array_init(&initial_metadata_recv); - grpc_byte_buffer* response_payload_recv = nullptr; - grpc_metadata_array trailing_metadata_recv; - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_status_code status; - grpc_slice details = grpc_empty_slice(); - - grpc_op ops[6]; - memset(ops, 0, sizeof(ops)); - grpc_op* op = ops; - op->op = GRPC_OP_SEND_INITIAL_METADATA; - op->data.send_initial_metadata.count = 0; - op->flags = 0; - op->reserved = nullptr; - op++; - op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT; - op->flags = 0; - op->reserved = nullptr; - op++; - op->op = GRPC_OP_RECV_INITIAL_METADATA; - op->data.recv_initial_metadata.recv_initial_metadata = &initial_metadata_recv; - op->flags = 0; - op->reserved = nullptr; - op++; - op->op = GRPC_OP_RECV_MESSAGE; - op->data.recv_message.recv_message = &response_payload_recv; - op->flags = 0; - op->reserved = nullptr; - op++; - op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; - op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv; - op->data.recv_status_on_client.status = &status; - op->data.recv_status_on_client.status_details = &details; - op->flags = 0; - op->reserved = nullptr; - op++; - grpc_call_error error = - grpc_call_start_batch(call, ops, (size_t)(op - ops), tag(1), nullptr); - int requested_calls = 1; - GPR_ASSERT(GRPC_CALL_OK == error); - - grpc_mock_endpoint_put_read( - mock_endpoint, grpc_slice_from_copied_buffer((const char*)data, size)); - - grpc_event ev; - while (1) { - grpc_core::ExecCtx::Get()->Flush(); - ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), - nullptr); - switch (ev.type) { - case GRPC_QUEUE_TIMEOUT: - goto done; - case GRPC_QUEUE_SHUTDOWN: - break; - case GRPC_OP_COMPLETE: - requested_calls--; - break; + { + grpc_core::ExecCtx _local_exec_ctx; + grpc_executor_set_threading(false); + + grpc_resource_quota* resource_quota = + grpc_resource_quota_create("client_fuzzer"); + grpc_endpoint* mock_endpoint = + grpc_mock_endpoint_create(discard_write, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); + + grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr); + grpc_transport* transport = + grpc_create_chttp2_transport(nullptr, mock_endpoint, 1); + grpc_chttp2_transport_start_reading(transport, nullptr); + + grpc_channel* channel = grpc_channel_create( + "test-target", nullptr, GRPC_CLIENT_DIRECT_CHANNEL, transport); + grpc_slice host = grpc_slice_from_static_string("localhost"); + grpc_call* call = grpc_channel_create_call( + channel, nullptr, 0, cq, grpc_slice_from_static_string("/foo"), &host, + gpr_inf_future(GPR_CLOCK_REALTIME), nullptr); + + grpc_metadata_array initial_metadata_recv; + grpc_metadata_array_init(&initial_metadata_recv); + grpc_byte_buffer* response_payload_recv = nullptr; + grpc_metadata_array trailing_metadata_recv; + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_status_code status; + grpc_slice details = grpc_empty_slice(); + + grpc_op ops[6]; + memset(ops, 0, sizeof(ops)); + grpc_op* op = ops; + op->op = GRPC_OP_SEND_INITIAL_METADATA; + op->data.send_initial_metadata.count = 0; + op->flags = 0; + op->reserved = nullptr; + op++; + op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT; + op->flags = 0; + op->reserved = nullptr; + op++; + op->op = GRPC_OP_RECV_INITIAL_METADATA; + op->data.recv_initial_metadata.recv_initial_metadata = + &initial_metadata_recv; + op->flags = 0; + op->reserved = nullptr; + op++; + op->op = GRPC_OP_RECV_MESSAGE; + op->data.recv_message.recv_message = &response_payload_recv; + op->flags = 0; + op->reserved = nullptr; + op++; + op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; + op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv; + op->data.recv_status_on_client.status = &status; + op->data.recv_status_on_client.status_details = &details; + op->flags = 0; + op->reserved = nullptr; + op++; + grpc_call_error error = + grpc_call_start_batch(call, ops, (size_t)(op - ops), tag(1), nullptr); + int requested_calls = 1; + GPR_ASSERT(GRPC_CALL_OK == error); + + grpc_mock_endpoint_put_read( + mock_endpoint, grpc_slice_from_copied_buffer((const char*)data, size)); + + grpc_event ev; + while (1) { + grpc_core::ExecCtx::Get()->Flush(); + ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), + nullptr); + switch (ev.type) { + case GRPC_QUEUE_TIMEOUT: + goto done; + case GRPC_QUEUE_SHUTDOWN: + break; + case GRPC_OP_COMPLETE: + requested_calls--; + break; + } } - } -done: - if (requested_calls) { - grpc_call_cancel(call, nullptr); - } - for (int i = 0; i < requested_calls; i++) { - ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), - nullptr); - GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); - } - grpc_completion_queue_shutdown(cq); - for (int i = 0; i < requested_calls; i++) { - ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), - nullptr); - GPR_ASSERT(ev.type == GRPC_QUEUE_SHUTDOWN); - } - grpc_call_unref(call); - grpc_completion_queue_destroy(cq); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_slice_unref(details); - grpc_channel_destroy(channel); - if (response_payload_recv != nullptr) { - grpc_byte_buffer_destroy(response_payload_recv); + done: + if (requested_calls) { + grpc_call_cancel(call, nullptr); + } + for (int i = 0; i < requested_calls; i++) { + ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), + nullptr); + GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); + } + grpc_completion_queue_shutdown(cq); + for (int i = 0; i < requested_calls; i++) { + ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), + nullptr); + GPR_ASSERT(ev.type == GRPC_QUEUE_SHUTDOWN); + } + grpc_call_unref(call); + grpc_completion_queue_destroy(cq); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_slice_unref(details); + grpc_channel_destroy(channel); + if (response_payload_recv != nullptr) { + grpc_byte_buffer_destroy(response_payload_recv); + } } grpc_shutdown(); if (leak_check) { diff --git a/test/core/end2end/fuzzers/server_fuzzer.cc b/test/core/end2end/fuzzers/server_fuzzer.cc index 2cb6c984c54..4506ff5c0b2 100644 --- a/test/core/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/end2end/fuzzers/server_fuzzer.cc @@ -41,80 +41,82 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (squelch) gpr_set_log_function(dont_log); if (leak_check) grpc_memory_counters_init(); grpc_init(); - grpc_core::ExecCtx _local_exec_ctx; - grpc_executor_set_threading(false); + { + grpc_core::ExecCtx _local_exec_ctx; + grpc_executor_set_threading(false); - grpc_resource_quota* resource_quota = - grpc_resource_quota_create("server_fuzzer"); - grpc_endpoint* mock_endpoint = - grpc_mock_endpoint_create(discard_write, resource_quota); - grpc_resource_quota_unref_internal(resource_quota); - grpc_mock_endpoint_put_read( - mock_endpoint, grpc_slice_from_copied_buffer((const char*)data, size)); + grpc_resource_quota* resource_quota = + grpc_resource_quota_create("server_fuzzer"); + grpc_endpoint* mock_endpoint = + grpc_mock_endpoint_create(discard_write, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); + grpc_mock_endpoint_put_read( + mock_endpoint, grpc_slice_from_copied_buffer((const char*)data, size)); - grpc_server* server = grpc_server_create(nullptr, nullptr); - grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr); - grpc_server_register_completion_queue(server, cq, nullptr); - // TODO(ctiller): add registered methods (one for POST, one for PUT) - // void *registered_method = - // grpc_server_register_method(server, "/reg", NULL, 0); - grpc_server_start(server); - grpc_transport* transport = - grpc_create_chttp2_transport(nullptr, mock_endpoint, 0); - grpc_server_setup_transport(server, transport, nullptr, nullptr); - grpc_chttp2_transport_start_reading(transport, nullptr); + grpc_server* server = grpc_server_create(nullptr, nullptr); + grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr); + grpc_server_register_completion_queue(server, cq, nullptr); + // TODO(ctiller): add registered methods (one for POST, one for PUT) + // void *registered_method = + // grpc_server_register_method(server, "/reg", NULL, 0); + grpc_server_start(server); + grpc_transport* transport = + grpc_create_chttp2_transport(nullptr, mock_endpoint, 0); + grpc_server_setup_transport(server, transport, nullptr, nullptr); + grpc_chttp2_transport_start_reading(transport, nullptr); - grpc_call* call1 = nullptr; - grpc_call_details call_details1; - grpc_metadata_array request_metadata1; - grpc_call_details_init(&call_details1); - grpc_metadata_array_init(&request_metadata1); - int requested_calls = 0; + grpc_call* call1 = nullptr; + grpc_call_details call_details1; + grpc_metadata_array request_metadata1; + grpc_call_details_init(&call_details1); + grpc_metadata_array_init(&request_metadata1); + int requested_calls = 0; - GPR_ASSERT(GRPC_CALL_OK == - grpc_server_request_call(server, &call1, &call_details1, - &request_metadata1, cq, cq, tag(1))); - requested_calls++; + GPR_ASSERT(GRPC_CALL_OK == + grpc_server_request_call(server, &call1, &call_details1, + &request_metadata1, cq, cq, tag(1))); + requested_calls++; - grpc_event ev; - while (1) { - grpc_core::ExecCtx::Get()->Flush(); - ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), - nullptr); - switch (ev.type) { - case GRPC_QUEUE_TIMEOUT: - goto done; - case GRPC_QUEUE_SHUTDOWN: - break; - case GRPC_OP_COMPLETE: - switch (detag(ev.tag)) { - case 1: - requested_calls--; - // TODO(ctiller): keep reading that call! - break; - } + grpc_event ev; + while (1) { + grpc_core::ExecCtx::Get()->Flush(); + ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), + nullptr); + switch (ev.type) { + case GRPC_QUEUE_TIMEOUT: + goto done; + case GRPC_QUEUE_SHUTDOWN: + break; + case GRPC_OP_COMPLETE: + switch (detag(ev.tag)) { + case 1: + requested_calls--; + // TODO(ctiller): keep reading that call! + break; + } + } } - } -done: - if (call1 != nullptr) grpc_call_unref(call1); - grpc_call_details_destroy(&call_details1); - grpc_metadata_array_destroy(&request_metadata1); - grpc_server_shutdown_and_notify(server, cq, tag(0xdead)); - grpc_server_cancel_all_calls(server); - for (int i = 0; i <= requested_calls; i++) { - ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), - nullptr); - GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); - } - grpc_completion_queue_shutdown(cq); - for (int i = 0; i <= requested_calls; i++) { - ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), - nullptr); - GPR_ASSERT(ev.type == GRPC_QUEUE_SHUTDOWN); + done: + if (call1 != nullptr) grpc_call_unref(call1); + grpc_call_details_destroy(&call_details1); + grpc_metadata_array_destroy(&request_metadata1); + grpc_server_shutdown_and_notify(server, cq, tag(0xdead)); + grpc_server_cancel_all_calls(server); + for (int i = 0; i <= requested_calls; i++) { + ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), + nullptr); + GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); + } + grpc_completion_queue_shutdown(cq); + for (int i = 0; i <= requested_calls; i++) { + ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), + nullptr); + GPR_ASSERT(ev.type == GRPC_QUEUE_SHUTDOWN); + } + grpc_server_destroy(server); + grpc_completion_queue_destroy(cq); } - grpc_server_destroy(server); - grpc_completion_queue_destroy(cq); grpc_shutdown(); if (leak_check) { counters = grpc_memory_counters_snapshot(); diff --git a/test/core/http/format_request_test.cc b/test/core/http/format_request_test.cc index 684738a9973..353e138b2a1 100644 --- a/test/core/http/format_request_test.cc +++ b/test/core/http/format_request_test.cc @@ -139,11 +139,13 @@ static void test_format_post_request_content_type_override(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); test_format_get_request(); test_format_post_request(); test_format_post_request_no_body(); test_format_post_request_content_type_override(); + grpc_shutdown(); return 0; } diff --git a/test/core/http/httpcli_test.cc b/test/core/http/httpcli_test.cc index d354ad35707..ed5c03558f3 100644 --- a/test/core/http/httpcli_test.cc +++ b/test/core/http/httpcli_test.cc @@ -141,62 +141,63 @@ static void destroy_pops(void* p, grpc_error* error) { } int main(int argc, char** argv) { - grpc_closure destroyed; - grpc_core::ExecCtx _local_exec_ctx; gpr_subprocess* server; - char* me = argv[0]; - char* lslash = strrchr(me, '/'); - char* args[4]; - int port = grpc_pick_unused_port_or_die(); - int arg_shift = 0; - /* figure out where we are */ - char* root; - if (lslash) { - root = static_cast(gpr_malloc((size_t)(lslash - me + 1))); - memcpy(root, me, (size_t)(lslash - me)); - root[lslash - me] = 0; - } else { - root = gpr_strdup("."); - } - - GPR_ASSERT(argc <= 2); - if (argc == 2) { - args[0] = gpr_strdup(argv[1]); - } else { - arg_shift = 1; - gpr_asprintf(&args[0], "%s/../../tools/distrib/python_wrapper.sh", root); - gpr_asprintf(&args[1], "%s/../../test/core/http/test_server.py", root); - } - - /* start the server */ - args[1 + arg_shift] = const_cast("--port"); - gpr_asprintf(&args[2 + arg_shift], "%d", port); - server = gpr_subprocess_create(3 + arg_shift, (const char**)args); - GPR_ASSERT(server); - gpr_free(args[0]); - if (arg_shift) gpr_free(args[1]); - gpr_free(args[2 + arg_shift]); - gpr_free(root); - - gpr_sleep_until(gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), - gpr_time_from_seconds(5, GPR_TIMESPAN))); - grpc_test_init(argc, argv); grpc_init(); - grpc_httpcli_context_init(&g_context); - grpc_pollset* pollset = - static_cast(gpr_zalloc(grpc_pollset_size())); - grpc_pollset_init(pollset, &g_mu); - g_pops = grpc_polling_entity_create_from_pollset(pollset); - - test_get(port); - test_post(port); - - grpc_httpcli_context_destroy(&g_context); - GRPC_CLOSURE_INIT(&destroyed, destroy_pops, &g_pops, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(grpc_polling_entity_pollset(&g_pops), &destroyed); - + { + grpc_closure destroyed; + grpc_core::ExecCtx _local_exec_ctx; + char* me = argv[0]; + char* lslash = strrchr(me, '/'); + char* args[4]; + int port = grpc_pick_unused_port_or_die(); + int arg_shift = 0; + /* figure out where we are */ + char* root; + if (lslash) { + root = static_cast(gpr_malloc((size_t)(lslash - me + 1))); + memcpy(root, me, (size_t)(lslash - me)); + root[lslash - me] = 0; + } else { + root = gpr_strdup("."); + } + + GPR_ASSERT(argc <= 2); + if (argc == 2) { + args[0] = gpr_strdup(argv[1]); + } else { + arg_shift = 1; + gpr_asprintf(&args[0], "%s/../../tools/distrib/python_wrapper.sh", root); + gpr_asprintf(&args[1], "%s/../../test/core/http/test_server.py", root); + } + + /* start the server */ + args[1 + arg_shift] = const_cast("--port"); + gpr_asprintf(&args[2 + arg_shift], "%d", port); + server = gpr_subprocess_create(3 + arg_shift, (const char**)args); + GPR_ASSERT(server); + gpr_free(args[0]); + if (arg_shift) gpr_free(args[1]); + gpr_free(args[2 + arg_shift]); + gpr_free(root); + + gpr_sleep_until(gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), + gpr_time_from_seconds(5, GPR_TIMESPAN))); + + grpc_httpcli_context_init(&g_context); + grpc_pollset* pollset = + static_cast(gpr_zalloc(grpc_pollset_size())); + grpc_pollset_init(pollset, &g_mu); + g_pops = grpc_polling_entity_create_from_pollset(pollset); + + test_get(port); + test_post(port); + + grpc_httpcli_context_destroy(&g_context); + GRPC_CLOSURE_INIT(&destroyed, destroy_pops, &g_pops, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(grpc_polling_entity_pollset(&g_pops), &destroyed); + } grpc_shutdown(); gpr_free(grpc_polling_entity_pollset(&g_pops)); diff --git a/test/core/http/httpscli_test.cc b/test/core/http/httpscli_test.cc index 76bbd2d366e..ee2bff18dbb 100644 --- a/test/core/http/httpscli_test.cc +++ b/test/core/http/httpscli_test.cc @@ -195,11 +195,12 @@ int main(int argc, char** argv) { test_get(port); test_post(port); - grpc_httpcli_context_destroy(&g_context); - GRPC_CLOSURE_INIT(&destroyed, destroy_pops, &g_pops, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(grpc_polling_entity_pollset(&g_pops), &destroyed); - + { + grpc_httpcli_context_destroy(&g_context); + GRPC_CLOSURE_INIT(&destroyed, destroy_pops, &g_pops, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(grpc_polling_entity_pollset(&g_pops), &destroyed); + } grpc_shutdown(); gpr_free(grpc_polling_entity_pollset(&g_pops)); diff --git a/test/core/http/parser_test.cc b/test/core/http/parser_test.cc index 0b60e369b79..18f19856bd9 100644 --- a/test/core/http/parser_test.cc +++ b/test/core/http/parser_test.cc @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -217,6 +218,7 @@ int main(int argc, char** argv) { char *tmp1, *tmp2; grpc_test_init(argc, argv); + grpc_init(); for (i = 0; i < GPR_ARRAY_SIZE(split_modes); i++) { test_succeeds(split_modes[i], @@ -300,5 +302,6 @@ int main(int argc, char** argv) { gpr_free(tmp2); } + grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/endpoint_pair_test.cc b/test/core/iomgr/endpoint_pair_test.cc index 658971b9fb0..d895a270ada 100644 --- a/test/core/iomgr/endpoint_pair_test.cc +++ b/test/core/iomgr/endpoint_pair_test.cc @@ -59,16 +59,17 @@ static void destroy_pollset(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - grpc_core::ExecCtx _local_exec_ctx; grpc_test_init(argc, argv); grpc_init(); - g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); - grpc_pollset_init(g_pollset, &g_mu); - grpc_endpoint_tests(configs[0], g_pollset, g_mu); - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(g_pollset, &destroyed); - + { + grpc_core::ExecCtx _local_exec_ctx; + g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); + grpc_pollset_init(g_pollset, &g_mu); + grpc_endpoint_tests(configs[0], g_pollset, g_mu); + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + } grpc_shutdown(); gpr_free(g_pollset); diff --git a/test/core/iomgr/ev_epollsig_linux_test.cc b/test/core/iomgr/ev_epollsig_linux_test.cc index ae778344018..45c96ce12d0 100644 --- a/test/core/iomgr/ev_epollsig_linux_test.cc +++ b/test/core/iomgr/ev_epollsig_linux_test.cc @@ -301,17 +301,19 @@ int main(int argc, char** argv) { const char* poll_strategy = nullptr; grpc_test_init(argc, argv); grpc_init(); - grpc_core::ExecCtx _local_exec_ctx; + { + grpc_core::ExecCtx _local_exec_ctx; - poll_strategy = grpc_get_poll_strategy_name(); - if (poll_strategy != nullptr && strcmp(poll_strategy, "epollsig") == 0) { - test_add_fd_to_pollset(); - test_threading(); - } else { - gpr_log(GPR_INFO, - "Skipping the test. The test is only relevant for 'epollsig' " - "strategy. and the current strategy is: '%s'", - poll_strategy); + poll_strategy = grpc_get_poll_strategy_name(); + if (poll_strategy != nullptr && strcmp(poll_strategy, "epollsig") == 0) { + test_add_fd_to_pollset(); + test_threading(); + } else { + gpr_log(GPR_INFO, + "Skipping the test. The test is only relevant for 'epollsig' " + "strategy. and the current strategy is: '%s'", + poll_strategy); + } } grpc_shutdown(); diff --git a/test/core/iomgr/fd_conservation_posix_test.cc b/test/core/iomgr/fd_conservation_posix_test.cc index 11e664d8ff8..f4c8e5a21f4 100644 --- a/test/core/iomgr/fd_conservation_posix_test.cc +++ b/test/core/iomgr/fd_conservation_posix_test.cc @@ -31,25 +31,27 @@ int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); - grpc_core::ExecCtx _local_exec_ctx; - - /* set max # of file descriptors to a low value, and - verify we can create and destroy many more than this number - of descriptors */ - rlim.rlim_cur = rlim.rlim_max = 10; - GPR_ASSERT(0 == setrlimit(RLIMIT_NOFILE, &rlim)); - grpc_resource_quota* resource_quota = - grpc_resource_quota_create("fd_conservation_posix_test"); - - for (i = 0; i < 100; i++) { - p = grpc_iomgr_create_endpoint_pair("test", NULL); - grpc_endpoint_destroy(p.client); - grpc_endpoint_destroy(p.server); - grpc_core::ExecCtx::Get()->Flush(); + { + grpc_core::ExecCtx _local_exec_ctx; + + /* set max # of file descriptors to a low value, and + verify we can create and destroy many more than this number + of descriptors */ + rlim.rlim_cur = rlim.rlim_max = 10; + GPR_ASSERT(0 == setrlimit(RLIMIT_NOFILE, &rlim)); + grpc_resource_quota* resource_quota = + grpc_resource_quota_create("fd_conservation_posix_test"); + + for (i = 0; i < 100; i++) { + p = grpc_iomgr_create_endpoint_pair("test", NULL); + grpc_endpoint_destroy(p.client); + grpc_endpoint_destroy(p.server); + grpc_core::ExecCtx::Get()->Flush(); + } + + grpc_resource_quota_unref(resource_quota); } - grpc_resource_quota_unref(resource_quota); - grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/fd_posix_test.cc b/test/core/iomgr/fd_posix_test.cc index 3a9d801169a..8eda76cf9b1 100644 --- a/test/core/iomgr/fd_posix_test.cc +++ b/test/core/iomgr/fd_posix_test.cc @@ -513,19 +513,20 @@ static void destroy_pollset(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - grpc_core::ExecCtx _local_exec_ctx; grpc_test_init(argc, argv); grpc_init(); - g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); - grpc_pollset_init(g_pollset, &g_mu); - test_grpc_fd(); - test_grpc_fd_change(); - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(g_pollset, &destroyed); - grpc_core::ExecCtx::Get()->Flush(); - gpr_free(g_pollset); - + { + grpc_core::ExecCtx _local_exec_ctx; + g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); + grpc_pollset_init(g_pollset, &g_mu); + test_grpc_fd(); + test_grpc_fd_change(); + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + grpc_core::ExecCtx::Get()->Flush(); + gpr_free(g_pollset); + } grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/load_file_test.cc b/test/core/iomgr/load_file_test.cc index 9f360badcc3..797d0ef1a4d 100644 --- a/test/core/iomgr/load_file_test.cc +++ b/test/core/iomgr/load_file_test.cc @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -152,9 +153,11 @@ static void test_load_big_file(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); test_load_empty_file(); test_load_failure(); test_load_small_file(); test_load_big_file(); + grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/pollset_set_test.cc b/test/core/iomgr/pollset_set_test.cc index 502b40f2cfe..cf9c82b4821 100644 --- a/test/core/iomgr/pollset_set_test.cc +++ b/test/core/iomgr/pollset_set_test.cc @@ -421,24 +421,25 @@ void pollset_set_test_empty_pollset() { } int main(int argc, char** argv) { - grpc_core::ExecCtx _local_exec_ctx; grpc_test_init(argc, argv); grpc_init(); - const char* poll_strategy = grpc_get_poll_strategy_name(); - - if (poll_strategy != nullptr && - (strcmp(poll_strategy, "epollsig") == 0 || - strcmp(poll_strategy, "epoll-threadpool") == 0)) { - pollset_set_test_basic(); - pollset_set_test_dup_fds(); - pollset_set_test_empty_pollset(); - } else { - gpr_log(GPR_INFO, - "Skipping the test. The test is only relevant for 'epoll' " - "strategy. and the current strategy is: '%s'", - poll_strategy); + { + grpc_core::ExecCtx _local_exec_ctx; + const char* poll_strategy = grpc_get_poll_strategy_name(); + + if (poll_strategy != nullptr && + (strcmp(poll_strategy, "epollsig") == 0 || + strcmp(poll_strategy, "epoll-threadpool") == 0)) { + pollset_set_test_basic(); + pollset_set_test_dup_fds(); + pollset_set_test_empty_pollset(); + } else { + gpr_log(GPR_INFO, + "Skipping the test. The test is only relevant for 'epoll' " + "strategy. and the current strategy is: '%s'", + poll_strategy); + } } - grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index 6fb6f72a000..0ea57e22023 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -156,10 +156,12 @@ static void test_unix_socket_path_name_too_long(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); - grpc_core::ExecCtx _local_exec_ctx; - test_unix_socket(); - test_unix_socket_path_name_too_long(); - grpc_executor_shutdown(); + + { + grpc_core::ExecCtx _local_exec_ctx; + test_unix_socket(); + test_unix_socket_path_name_too_long(); + } grpc_shutdown(); return 0; diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc index e44d660dad3..e6986f332ba 100644 --- a/test/core/iomgr/resolve_address_test.cc +++ b/test/core/iomgr/resolve_address_test.cc @@ -242,16 +242,18 @@ static void test_unparseable_hostports(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); - grpc_core::ExecCtx _local_exec_ctx; - test_localhost(); - test_default_port(); - test_non_numeric_default_port(); - test_missing_default_port(); - test_ipv6_with_port(); - test_ipv6_without_port(); - test_invalid_ip_addresses(); - test_unparseable_hostports(); - grpc_executor_shutdown(); + { + grpc_core::ExecCtx _local_exec_ctx; + test_localhost(); + test_default_port(); + test_non_numeric_default_port(); + test_missing_default_port(); + test_ipv6_with_port(); + test_ipv6_without_port(); + test_invalid_ip_addresses(); + test_unparseable_hostports(); + grpc_executor_shutdown(); + } grpc_shutdown(); return 0; diff --git a/test/core/iomgr/tcp_client_posix_test.cc b/test/core/iomgr/tcp_client_posix_test.cc index 12295ef1801..0cdf30590ef 100644 --- a/test/core/iomgr/tcp_client_posix_test.cc +++ b/test/core/iomgr/tcp_client_posix_test.cc @@ -188,21 +188,24 @@ static void destroy_pollset(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - grpc_core::ExecCtx _local_exec_ctx; grpc_test_init(argc, argv); grpc_init(); - g_pollset_set = grpc_pollset_set_create(); - g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); - grpc_pollset_init(g_pollset, &g_mu); - grpc_pollset_set_add_pollset(g_pollset_set, g_pollset); - - test_succeeds(); - gpr_log(GPR_ERROR, "End of first test"); - test_fails(); - grpc_pollset_set_destroy(g_pollset_set); - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(g_pollset, &destroyed); + + { + grpc_core::ExecCtx _local_exec_ctx; + g_pollset_set = grpc_pollset_set_create(); + g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); + grpc_pollset_init(g_pollset, &g_mu); + grpc_pollset_set_add_pollset(g_pollset_set, g_pollset); + + test_succeeds(); + gpr_log(GPR_ERROR, "End of first test"); + test_fails(); + grpc_pollset_set_destroy(g_pollset_set); + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + } grpc_shutdown(); gpr_free(g_pollset); diff --git a/test/core/iomgr/tcp_posix_test.cc b/test/core/iomgr/tcp_posix_test.cc index 614ceaa02d3..b42fb588ebb 100644 --- a/test/core/iomgr/tcp_posix_test.cc +++ b/test/core/iomgr/tcp_posix_test.cc @@ -538,18 +538,20 @@ static void destroy_pollset(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - grpc_core::ExecCtx _local_exec_ctx; grpc_test_init(argc, argv); grpc_init(); - g_pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); - grpc_pollset_init(g_pollset, &g_mu); - grpc_endpoint_tests(configs[0], g_pollset, g_mu); - run_tests(); - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(g_pollset, &destroyed); + { + grpc_core::ExecCtx _local_exec_ctx; + g_pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); + grpc_pollset_init(g_pollset, &g_mu); + grpc_endpoint_tests(configs[0], g_pollset, g_mu); + run_tests(); + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); - grpc_core::ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); + } grpc_shutdown(); gpr_free(g_pollset); diff --git a/test/core/iomgr/tcp_server_posix_test.cc b/test/core/iomgr/tcp_server_posix_test.cc index a4dfa9e7725..28fc3601ad9 100644 --- a/test/core/iomgr/tcp_server_posix_test.cc +++ b/test/core/iomgr/tcp_server_posix_test.cc @@ -423,7 +423,6 @@ static void destroy_pollset(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - grpc_core::ExecCtx _local_exec_ctx; grpc_arg chan_args[1]; chan_args[0].type = GRPC_ARG_INTEGER; chan_args[0].key = const_cast(GRPC_ARG_EXPAND_WILDCARD_ADDRS); @@ -436,58 +435,61 @@ int main(int argc, char** argv) { static_cast(gpr_zalloc(sizeof(*dst_addrs))); grpc_test_init(argc, argv); grpc_init(); - g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); - grpc_pollset_init(g_pollset, &g_mu); - - test_no_op(); - test_no_op_with_start(); - test_no_op_with_port(); - test_no_op_with_port_and_start(); - - if (getifaddrs(&ifa) != 0 || ifa == nullptr) { - gpr_log(GPR_ERROR, "getifaddrs: %s", strerror(errno)); - return EXIT_FAILURE; - } - dst_addrs->naddrs = 0; - for (ifa_it = ifa; ifa_it != nullptr && dst_addrs->naddrs < MAX_ADDRS; - ifa_it = ifa_it->ifa_next) { - if (ifa_it->ifa_addr == nullptr) { - continue; - } else if (ifa_it->ifa_addr->sa_family == AF_INET) { - dst_addrs->addrs[dst_addrs->naddrs].addr.len = sizeof(struct sockaddr_in); - } else if (ifa_it->ifa_addr->sa_family == AF_INET6) { - dst_addrs->addrs[dst_addrs->naddrs].addr.len = - sizeof(struct sockaddr_in6); - } else { - continue; + { + grpc_core::ExecCtx _local_exec_ctx; + g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); + grpc_pollset_init(g_pollset, &g_mu); + + test_no_op(); + test_no_op_with_start(); + test_no_op_with_port(); + test_no_op_with_port_and_start(); + + if (getifaddrs(&ifa) != 0 || ifa == nullptr) { + gpr_log(GPR_ERROR, "getifaddrs: %s", strerror(errno)); + return EXIT_FAILURE; } - memcpy(dst_addrs->addrs[dst_addrs->naddrs].addr.addr, ifa_it->ifa_addr, - dst_addrs->addrs[dst_addrs->naddrs].addr.len); - GPR_ASSERT( - grpc_sockaddr_set_port(&dst_addrs->addrs[dst_addrs->naddrs].addr, 0)); - test_addr_init_str(&dst_addrs->addrs[dst_addrs->naddrs]); - ++dst_addrs->naddrs; - } - freeifaddrs(ifa); - ifa = nullptr; - - /* Connect to same addresses as listeners. */ - test_connect(1, nullptr, nullptr, false); - test_connect(10, nullptr, nullptr, false); + dst_addrs->naddrs = 0; + for (ifa_it = ifa; ifa_it != nullptr && dst_addrs->naddrs < MAX_ADDRS; + ifa_it = ifa_it->ifa_next) { + if (ifa_it->ifa_addr == nullptr) { + continue; + } else if (ifa_it->ifa_addr->sa_family == AF_INET) { + dst_addrs->addrs[dst_addrs->naddrs].addr.len = + sizeof(struct sockaddr_in); + } else if (ifa_it->ifa_addr->sa_family == AF_INET6) { + dst_addrs->addrs[dst_addrs->naddrs].addr.len = + sizeof(struct sockaddr_in6); + } else { + continue; + } + memcpy(dst_addrs->addrs[dst_addrs->naddrs].addr.addr, ifa_it->ifa_addr, + dst_addrs->addrs[dst_addrs->naddrs].addr.len); + GPR_ASSERT( + grpc_sockaddr_set_port(&dst_addrs->addrs[dst_addrs->naddrs].addr, 0)); + test_addr_init_str(&dst_addrs->addrs[dst_addrs->naddrs]); + ++dst_addrs->naddrs; + } + freeifaddrs(ifa); + ifa = nullptr; - /* Set dst_addrs->addrs[i].len=0 for dst_addrs that are unreachable with a - "::" listener. */ - test_connect(1, nullptr, dst_addrs, true); + /* Connect to same addresses as listeners. */ + test_connect(1, nullptr, nullptr, false); + test_connect(10, nullptr, nullptr, false); - /* Test connect(2) with dst_addrs. */ - test_connect(1, &channel_args, dst_addrs, false); - /* Test connect(2) with dst_addrs. */ - test_connect(10, &channel_args, dst_addrs, false); + /* Set dst_addrs->addrs[i].len=0 for dst_addrs that are unreachable with a + "::" listener. */ + test_connect(1, nullptr, dst_addrs, true); - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(g_pollset, &destroyed); + /* Test connect(2) with dst_addrs. */ + test_connect(1, &channel_args, dst_addrs, false); + /* Test connect(2) with dst_addrs. */ + test_connect(10, &channel_args, dst_addrs, false); + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + } grpc_shutdown(); gpr_free(dst_addrs); gpr_free(g_pollset); diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc index 329b767f326..7ab4c4415c5 100644 --- a/test/core/iomgr/timer_list_test.cc +++ b/test/core/iomgr/timer_list_test.cc @@ -25,6 +25,7 @@ #include +#include #include #include "src/core/lib/debug/trace.h" #include "test/core/util/test_config.h" @@ -151,9 +152,11 @@ void destruction_test(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_core::ExecCtx::GlobalInit(); gpr_set_log_verbosity(GPR_LOG_SEVERITY_DEBUG); add_test(); destruction_test(); + grpc_core::ExecCtx::GlobalShutdown(); return 0; } diff --git a/test/core/iomgr/udp_server_test.cc b/test/core/iomgr/udp_server_test.cc index e271acbeef4..379c50c09da 100644 --- a/test/core/iomgr/udp_server_test.cc +++ b/test/core/iomgr/udp_server_test.cc @@ -291,25 +291,27 @@ static void destroy_pollset(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - grpc_core::ExecCtx _local_exec_ctx; grpc_test_init(argc, argv); grpc_init(); - g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); - grpc_pollset_init(g_pollset, &g_mu); - - test_no_op(); - test_no_op_with_start(); - test_no_op_with_port(); - test_no_op_with_port_and_socket_factory(); - test_no_op_with_port_and_start(); - test_receive(1); - test_receive(10); - - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(g_pollset, &destroyed); - grpc_core::ExecCtx::Get()->Flush(); - gpr_free(g_pollset); + { + grpc_core::ExecCtx _local_exec_ctx; + g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); + grpc_pollset_init(g_pollset, &g_mu); + + test_no_op(); + test_no_op_with_start(); + test_no_op_with_port(); + test_no_op_with_port_and_socket_factory(); + test_no_op_with_port_and_start(); + test_receive(1); + test_receive(10); + + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + grpc_core::ExecCtx::Get()->Flush(); + gpr_free(g_pollset); + } grpc_shutdown(); return 0; } diff --git a/test/core/security/json_token_test.cc b/test/core/security/json_token_test.cc index b717de06d9c..57e2f4c9787 100644 --- a/test/core/security/json_token_test.cc +++ b/test/core/security/json_token_test.cc @@ -483,6 +483,7 @@ static void test_parse_refresh_token_failure_no_refresh_token(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); test_parse_json_key_success(); test_parse_json_key_failure_bad_json(); test_parse_json_key_failure_no_type(); @@ -497,5 +498,6 @@ int main(int argc, char** argv) { test_parse_refresh_token_failure_no_client_id(); test_parse_refresh_token_failure_no_client_secret(); test_parse_refresh_token_failure_no_refresh_token(); + grpc_shutdown(); return 0; } diff --git a/test/core/security/secure_endpoint_test.cc b/test/core/security/secure_endpoint_test.cc index 694a8584ea0..c8f4f32538c 100644 --- a/test/core/security/secure_endpoint_test.cc +++ b/test/core/security/secure_endpoint_test.cc @@ -205,19 +205,21 @@ static void destroy_pollset(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - grpc_core::ExecCtx _local_exec_ctx; grpc_test_init(argc, argv); - grpc_init(); - g_pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); - grpc_pollset_init(g_pollset, &g_mu); - grpc_endpoint_tests(configs[0], g_pollset, g_mu); - grpc_endpoint_tests(configs[1], g_pollset, g_mu); - test_leftover(configs[2], 1); - test_leftover(configs[3], 1); - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(g_pollset, &destroyed); + + { + grpc_core::ExecCtx _local_exec_ctx; + g_pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); + grpc_pollset_init(g_pollset, &g_mu); + grpc_endpoint_tests(configs[0], g_pollset, g_mu); + grpc_endpoint_tests(configs[1], g_pollset, g_mu); + test_leftover(configs[2], 1); + test_leftover(configs[3], 1); + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + } grpc_shutdown(); diff --git a/test/core/security/ssl_server_fuzzer.cc b/test/core/security/ssl_server_fuzzer.cc index df62dc17b82..9cf73fa8715 100644 --- a/test/core/security/ssl_server_fuzzer.cc +++ b/test/core/security/ssl_server_fuzzer.cc @@ -55,63 +55,68 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (squelch) gpr_set_log_function(dont_log); if (leak_check) grpc_memory_counters_init(); grpc_init(); - grpc_core::ExecCtx _local_exec_ctx; - - grpc_resource_quota* resource_quota = - grpc_resource_quota_create("ssl_server_fuzzer"); - grpc_endpoint* mock_endpoint = - grpc_mock_endpoint_create(discard_write, resource_quota); - grpc_resource_quota_unref_internal(resource_quota); - - grpc_mock_endpoint_put_read( - mock_endpoint, grpc_slice_from_copied_buffer((const char*)data, size)); - - // Load key pair and establish server SSL credentials. - grpc_ssl_pem_key_cert_pair pem_key_cert_pair; - grpc_slice ca_slice, cert_slice, key_slice; - ca_slice = grpc_slice_from_static_string(test_root_cert); - cert_slice = grpc_slice_from_static_string(test_server1_cert); - key_slice = grpc_slice_from_static_string(test_server1_key); - const char* ca_cert = (const char*)GRPC_SLICE_START_PTR(ca_slice); - pem_key_cert_pair.private_key = (const char*)GRPC_SLICE_START_PTR(key_slice); - pem_key_cert_pair.cert_chain = (const char*)GRPC_SLICE_START_PTR(cert_slice); - grpc_server_credentials* creds = grpc_ssl_server_credentials_create( - ca_cert, &pem_key_cert_pair, 1, 0, nullptr); - - // Create security connector - grpc_server_security_connector* sc = nullptr; - grpc_security_status status = - grpc_server_credentials_create_security_connector(creds, &sc); - GPR_ASSERT(status == GRPC_SECURITY_OK); - grpc_millis deadline = GPR_MS_PER_SEC + grpc_core::ExecCtx::Get()->Now(); - - struct handshake_state state; - state.done_callback_called = false; - grpc_handshake_manager* handshake_mgr = grpc_handshake_manager_create(); - grpc_server_security_connector_add_handshakers(sc, handshake_mgr); - grpc_handshake_manager_do_handshake( - handshake_mgr, mock_endpoint, nullptr /* channel_args */, deadline, - nullptr /* acceptor */, on_handshake_done, &state); - grpc_core::ExecCtx::Get()->Flush(); - - // If the given string happens to be part of the correct client hello, the - // server will wait for more data. Explicitly fail the server by shutting down - // the endpoint. - if (!state.done_callback_called) { - grpc_endpoint_shutdown( - mock_endpoint, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Explicit close")); + { + grpc_core::ExecCtx _local_exec_ctx; + + grpc_resource_quota* resource_quota = + grpc_resource_quota_create("ssl_server_fuzzer"); + grpc_endpoint* mock_endpoint = + grpc_mock_endpoint_create(discard_write, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); + + grpc_mock_endpoint_put_read( + mock_endpoint, grpc_slice_from_copied_buffer((const char*)data, size)); + + // Load key pair and establish server SSL credentials. + grpc_ssl_pem_key_cert_pair pem_key_cert_pair; + grpc_slice ca_slice, cert_slice, key_slice; + ca_slice = grpc_slice_from_static_string(test_root_cert); + cert_slice = grpc_slice_from_static_string(test_server1_cert); + key_slice = grpc_slice_from_static_string(test_server1_key); + const char* ca_cert = (const char*)GRPC_SLICE_START_PTR(ca_slice); + pem_key_cert_pair.private_key = + (const char*)GRPC_SLICE_START_PTR(key_slice); + pem_key_cert_pair.cert_chain = + (const char*)GRPC_SLICE_START_PTR(cert_slice); + grpc_server_credentials* creds = grpc_ssl_server_credentials_create( + ca_cert, &pem_key_cert_pair, 1, 0, nullptr); + + // Create security connector + grpc_server_security_connector* sc = nullptr; + grpc_security_status status = + grpc_server_credentials_create_security_connector(creds, &sc); + GPR_ASSERT(status == GRPC_SECURITY_OK); + grpc_millis deadline = GPR_MS_PER_SEC + grpc_core::ExecCtx::Get()->Now(); + + struct handshake_state state; + state.done_callback_called = false; + grpc_handshake_manager* handshake_mgr = grpc_handshake_manager_create(); + grpc_server_security_connector_add_handshakers(sc, handshake_mgr); + grpc_handshake_manager_do_handshake( + handshake_mgr, mock_endpoint, nullptr /* channel_args */, deadline, + nullptr /* acceptor */, on_handshake_done, &state); grpc_core::ExecCtx::Get()->Flush(); - } - - GPR_ASSERT(state.done_callback_called); - grpc_handshake_manager_destroy(handshake_mgr); - GRPC_SECURITY_CONNECTOR_UNREF(&sc->base, "test"); - grpc_server_credentials_release(creds); - grpc_slice_unref(cert_slice); - grpc_slice_unref(key_slice); - grpc_slice_unref(ca_slice); - grpc_core::ExecCtx::Get()->Flush(); + // If the given string happens to be part of the correct client hello, the + // server will wait for more data. Explicitly fail the server by shutting + // down the endpoint. + if (!state.done_callback_called) { + grpc_endpoint_shutdown( + mock_endpoint, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Explicit close")); + grpc_core::ExecCtx::Get()->Flush(); + } + + GPR_ASSERT(state.done_callback_called); + + grpc_handshake_manager_destroy(handshake_mgr); + GRPC_SECURITY_CONNECTOR_UNREF(&sc->base, "test"); + grpc_server_credentials_release(creds); + grpc_slice_unref(cert_slice); + grpc_slice_unref(key_slice); + grpc_slice_unref(ca_slice); + grpc_core::ExecCtx::Get()->Flush(); + } grpc_shutdown(); if (leak_check) { diff --git a/test/core/slice/b64_test.cc b/test/core/slice/b64_test.cc index 08a5770b2af..e0c7ed361dc 100644 --- a/test/core/slice/b64_test.cc +++ b/test/core/slice/b64_test.cc @@ -20,6 +20,7 @@ #include +#include #include #include #include @@ -201,6 +202,7 @@ static void test_unpadded_decode(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); test_simple_encode_decode_b64_no_multiline(); test_simple_encode_decode_b64_multiline(); test_simple_encode_decode_b64_urlsafe_no_multiline(); @@ -212,5 +214,6 @@ int main(int argc, char** argv) { test_url_safe_unsafe_mismatch_failure(); test_rfc4648_test_vectors(); test_unpadded_decode(); + grpc_shutdown(); return 0; } diff --git a/test/core/slice/percent_encoding_test.cc b/test/core/slice/percent_encoding_test.cc index 253240faad4..11f3995f98e 100644 --- a/test/core/slice/percent_encoding_test.cc +++ b/test/core/slice/percent_encoding_test.cc @@ -18,6 +18,7 @@ #include "src/core/lib/slice/percent_encoding.h" +#include #include #include @@ -118,6 +119,7 @@ static void test_nonconformant_vector(const char* encoded, int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); TEST_VECTOR( "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.~", "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.~", @@ -140,5 +142,6 @@ int main(int argc, char** argv) { grpc_url_percent_encoding_unreserved_bytes); TEST_NONCONFORMANT_VECTOR("\0", "\0", grpc_url_percent_encoding_unreserved_bytes); + grpc_shutdown(); return 0; } diff --git a/test/core/slice/slice_buffer_test.cc b/test/core/slice/slice_buffer_test.cc index 338e8079dc8..e59986730b8 100644 --- a/test/core/slice/slice_buffer_test.cc +++ b/test/core/slice/slice_buffer_test.cc @@ -16,6 +16,7 @@ * */ +#include #include #include #include "test/core/util/test_config.h" @@ -106,9 +107,11 @@ void test_slice_buffer_move_first() { int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); test_slice_buffer_add(); test_slice_buffer_move_first(); + grpc_shutdown(); return 0; } diff --git a/test/core/slice/slice_hash_table_test.cc b/test/core/slice/slice_hash_table_test.cc index 26c2938782a..1cbb241a983 100644 --- a/test/core/slice/slice_hash_table_test.cc +++ b/test/core/slice/slice_hash_table_test.cc @@ -231,8 +231,10 @@ static void test_slice_hash_table_not_eq() { int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_core::ExecCtx::GlobalInit(); test_slice_hash_table(); test_slice_hash_table_eq(); test_slice_hash_table_not_eq(); + grpc_core::ExecCtx::GlobalShutdown(); return 0; } diff --git a/test/core/slice/slice_string_helpers_test.cc b/test/core/slice/slice_string_helpers_test.cc index 260f8c80d5d..f1d470461a4 100644 --- a/test/core/slice/slice_string_helpers_test.cc +++ b/test/core/slice/slice_string_helpers_test.cc @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -130,7 +131,9 @@ static void test_strsplit(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); test_dump_slice(); test_strsplit(); + grpc_shutdown(); return 0; } diff --git a/test/core/slice/slice_test.cc b/test/core/slice/slice_test.cc index 02f6b1ea79c..e40154dd0ee 100644 --- a/test/core/slice/slice_test.cc +++ b/test/core/slice/slice_test.cc @@ -292,6 +292,7 @@ static void test_static_slice_copy_interning(void) { int main(int argc, char** argv) { unsigned length; grpc_test_init(argc, argv); + grpc_init(); test_slice_malloc_returns_something_sensible(); test_slice_new_returns_something_sensible(); test_slice_new_with_user_data(); @@ -305,5 +306,6 @@ int main(int argc, char** argv) { test_slice_interning(); test_static_slice_interning(); test_static_slice_copy_interning(); + grpc_shutdown(); return 0; } diff --git a/test/core/surface/byte_buffer_reader_test.cc b/test/core/surface/byte_buffer_reader_test.cc index f9ce98da218..b762fed9412 100644 --- a/test/core/surface/byte_buffer_reader_test.cc +++ b/test/core/surface/byte_buffer_reader_test.cc @@ -265,6 +265,7 @@ static void test_byte_buffer_copy(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); test_read_one_slice(); test_read_one_slice_malloc(); test_read_none_compressed_slice(); @@ -274,5 +275,6 @@ int main(int argc, char** argv) { test_byte_buffer_from_reader(); test_byte_buffer_copy(); test_readall(); + grpc_shutdown(); return 0; } diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index 5771e2f2408..f21086847b8 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -224,10 +224,12 @@ int run_concurrent_connectivity_test() { gpr_atm_rel_store(&args.stop, 1); gpr_thd_join(server); - grpc_core::ExecCtx _local_exec_ctx; - grpc_pollset_shutdown(args.pollset, - GRPC_CLOSURE_CREATE(done_pollset_shutdown, args.pollset, - grpc_schedule_on_exec_ctx)); + { + grpc_core::ExecCtx _local_exec_ctx; + grpc_pollset_shutdown( + args.pollset, GRPC_CLOSURE_CREATE(done_pollset_shutdown, args.pollset, + grpc_schedule_on_exec_ctx)); + } grpc_shutdown(); return 0; diff --git a/test/core/transport/byte_stream_test.cc b/test/core/transport/byte_stream_test.cc index 593c2ae141e..a0dbc79158f 100644 --- a/test/core/transport/byte_stream_test.cc +++ b/test/core/transport/byte_stream_test.cc @@ -18,6 +18,7 @@ #include "src/core/lib/transport/byte_stream.h" +#include #include #include #include @@ -253,11 +254,13 @@ static void test_caching_byte_stream_shared_cache(void) { } int main(int argc, char** argv) { + grpc_init(); grpc_test_init(argc, argv); test_slice_buffer_stream_basic(); test_slice_buffer_stream_shutdown(); test_caching_byte_stream_basic(); test_caching_byte_stream_reset(); test_caching_byte_stream_shared_cache(); + grpc_shutdown(); return 0; } diff --git a/test/core/transport/chttp2/bin_decoder_test.cc b/test/core/transport/chttp2/bin_decoder_test.cc index 897d3008b9a..4b65d7d3cac 100644 --- a/test/core/transport/chttp2/bin_decoder_test.cc +++ b/test/core/transport/chttp2/bin_decoder_test.cc @@ -20,6 +20,7 @@ #include +#include #include #include #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" @@ -76,58 +77,61 @@ static grpc_slice base64_decode_with_length(const char* s, s, grpc_chttp2_base64_decode_with_length(base64_encode(s), strlen(s))); int main(int argc, char** argv) { - grpc_core::ExecCtx _local_exec_ctx; - - /* ENCODE_AND_DECODE tests grpc_chttp2_base64_decode_with_length(), which - takes encoded base64 strings without pad chars, but output length is - required. */ - /* Base64 test vectors from RFC 4648 */ - ENCODE_AND_DECODE(""); - ENCODE_AND_DECODE("f"); - ENCODE_AND_DECODE("foo"); - ENCODE_AND_DECODE("fo"); - ENCODE_AND_DECODE("foob"); - ENCODE_AND_DECODE("fooba"); - ENCODE_AND_DECODE("foobar"); - - ENCODE_AND_DECODE("\xc0\xc1\xc2\xc3\xc4\xc5"); - - /* Base64 test vectors from RFC 4648, with pad chars */ - /* BASE64("") = "" */ - EXPECT_SLICE_EQ("", base64_decode("")); - /* BASE64("f") = "Zg==" */ - EXPECT_SLICE_EQ("f", base64_decode("Zg==")); - /* BASE64("fo") = "Zm8=" */ - EXPECT_SLICE_EQ("fo", base64_decode("Zm8=")); - /* BASE64("foo") = "Zm9v" */ - EXPECT_SLICE_EQ("foo", base64_decode("Zm9v")); - /* BASE64("foob") = "Zm9vYg==" */ - EXPECT_SLICE_EQ("foob", base64_decode("Zm9vYg==")); - /* BASE64("fooba") = "Zm9vYmE=" */ - EXPECT_SLICE_EQ("fooba", base64_decode("Zm9vYmE=")); - /* BASE64("foobar") = "Zm9vYmFy" */ - EXPECT_SLICE_EQ("foobar", base64_decode("Zm9vYmFy")); - - EXPECT_SLICE_EQ("\xc0\xc1\xc2\xc3\xc4\xc5", base64_decode("wMHCw8TF")); - - // Test illegal input length in grpc_chttp2_base64_decode - EXPECT_SLICE_EQ("", base64_decode("a")); - EXPECT_SLICE_EQ("", base64_decode("ab")); - EXPECT_SLICE_EQ("", base64_decode("abc")); - - // Test illegal charactors in grpc_chttp2_base64_decode - EXPECT_SLICE_EQ("", base64_decode("Zm:v")); - EXPECT_SLICE_EQ("", base64_decode("Zm=v")); - - // Test output_length longer than max possible output length in - // grpc_chttp2_base64_decode_with_length - EXPECT_SLICE_EQ("", base64_decode_with_length("Zg", 2)); - EXPECT_SLICE_EQ("", base64_decode_with_length("Zm8", 3)); - EXPECT_SLICE_EQ("", base64_decode_with_length("Zm9v", 4)); - - // Test illegal charactors in grpc_chttp2_base64_decode_with_length - EXPECT_SLICE_EQ("", base64_decode_with_length("Zm:v", 3)); - EXPECT_SLICE_EQ("", base64_decode_with_length("Zm=v", 3)); - + grpc_init(); + { + grpc_core::ExecCtx _local_exec_ctx; + + /* ENCODE_AND_DECODE tests grpc_chttp2_base64_decode_with_length(), which + takes encoded base64 strings without pad chars, but output length is + required. */ + /* Base64 test vectors from RFC 4648 */ + ENCODE_AND_DECODE(""); + ENCODE_AND_DECODE("f"); + ENCODE_AND_DECODE("foo"); + ENCODE_AND_DECODE("fo"); + ENCODE_AND_DECODE("foob"); + ENCODE_AND_DECODE("fooba"); + ENCODE_AND_DECODE("foobar"); + + ENCODE_AND_DECODE("\xc0\xc1\xc2\xc3\xc4\xc5"); + + /* Base64 test vectors from RFC 4648, with pad chars */ + /* BASE64("") = "" */ + EXPECT_SLICE_EQ("", base64_decode("")); + /* BASE64("f") = "Zg==" */ + EXPECT_SLICE_EQ("f", base64_decode("Zg==")); + /* BASE64("fo") = "Zm8=" */ + EXPECT_SLICE_EQ("fo", base64_decode("Zm8=")); + /* BASE64("foo") = "Zm9v" */ + EXPECT_SLICE_EQ("foo", base64_decode("Zm9v")); + /* BASE64("foob") = "Zm9vYg==" */ + EXPECT_SLICE_EQ("foob", base64_decode("Zm9vYg==")); + /* BASE64("fooba") = "Zm9vYmE=" */ + EXPECT_SLICE_EQ("fooba", base64_decode("Zm9vYmE=")); + /* BASE64("foobar") = "Zm9vYmFy" */ + EXPECT_SLICE_EQ("foobar", base64_decode("Zm9vYmFy")); + + EXPECT_SLICE_EQ("\xc0\xc1\xc2\xc3\xc4\xc5", base64_decode("wMHCw8TF")); + + // Test illegal input length in grpc_chttp2_base64_decode + EXPECT_SLICE_EQ("", base64_decode("a")); + EXPECT_SLICE_EQ("", base64_decode("ab")); + EXPECT_SLICE_EQ("", base64_decode("abc")); + + // Test illegal charactors in grpc_chttp2_base64_decode + EXPECT_SLICE_EQ("", base64_decode("Zm:v")); + EXPECT_SLICE_EQ("", base64_decode("Zm=v")); + + // Test output_length longer than max possible output length in + // grpc_chttp2_base64_decode_with_length + EXPECT_SLICE_EQ("", base64_decode_with_length("Zg", 2)); + EXPECT_SLICE_EQ("", base64_decode_with_length("Zm8", 3)); + EXPECT_SLICE_EQ("", base64_decode_with_length("Zm9v", 4)); + + // Test illegal charactors in grpc_chttp2_base64_decode_with_length + EXPECT_SLICE_EQ("", base64_decode_with_length("Zm:v", 3)); + EXPECT_SLICE_EQ("", base64_decode_with_length("Zm=v", 3)); + } + grpc_shutdown(); return all_ok ? 0 : 1; } diff --git a/test/core/transport/chttp2/bin_encoder_test.cc b/test/core/transport/chttp2/bin_encoder_test.cc index 78b8808c413..44f5de8a50d 100644 --- a/test/core/transport/chttp2/bin_encoder_test.cc +++ b/test/core/transport/chttp2/bin_encoder_test.cc @@ -99,6 +99,8 @@ static void expect_binary_header(const char* hdr, int binary) { } int main(int argc, char** argv) { + grpc_init(); + /* Base64 test vectors from RFC 4648, with padding removed */ /* BASE64("") = "" */ EXPECT_SLICE_EQ("", B64("")); @@ -169,5 +171,6 @@ int main(int argc, char** argv) { expect_binary_header("foo-bar", 0); expect_binary_header("-bin", 0); + grpc_shutdown(); return all_ok ? 0 : 1; } diff --git a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc index 0dfd5ecc2d8..dcec8b2230e 100644 --- a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc +++ b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc @@ -37,13 +37,14 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (squelch) gpr_set_log_function(dont_log); grpc_init(); grpc_chttp2_hpack_parser parser; - grpc_core::ExecCtx _local_exec_ctx; - grpc_chttp2_hpack_parser_init(&parser); - parser.on_header = onhdr; - GRPC_ERROR_UNREF(grpc_chttp2_hpack_parser_parse( - &parser, grpc_slice_from_static_buffer(data, size))); - grpc_chttp2_hpack_parser_destroy(&parser); - + { + grpc_core::ExecCtx _local_exec_ctx; + grpc_chttp2_hpack_parser_init(&parser); + parser.on_header = onhdr; + GRPC_ERROR_UNREF(grpc_chttp2_hpack_parser_parse( + &parser, grpc_slice_from_static_buffer(data, size))); + grpc_chttp2_hpack_parser_destroy(&parser); + } grpc_shutdown(); return 0; } diff --git a/test/core/transport/chttp2/varint_test.cc b/test/core/transport/chttp2/varint_test.cc index 413b461b3af..36760d0c723 100644 --- a/test/core/transport/chttp2/varint_test.cc +++ b/test/core/transport/chttp2/varint_test.cc @@ -18,6 +18,7 @@ #include "src/core/ext/transport/chttp2/transport/varint.h" +#include #include #include @@ -44,11 +45,13 @@ static void test_varint(uint32_t value, uint32_t prefix_bits, uint8_t prefix_or, int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); TEST_VARINT(0, 1, 0, "\x00"); TEST_VARINT(128, 1, 0, "\x7f\x01"); TEST_VARINT(16384, 1, 0, "\x7f\x81\x7f"); TEST_VARINT(2097152, 1, 0, "\x7f\x81\xff\x7f"); TEST_VARINT(268435456, 1, 0, "\x7f\x81\xff\xff\x7f"); TEST_VARINT(0xffffffff, 1, 0, "\x7f\x80\xff\xff\xff\x0f"); + grpc_shutdown(); return 0; } diff --git a/test/core/transport/connectivity_state_test.cc b/test/core/transport/connectivity_state_test.cc index 99bd0fc65f0..e1bc0c4eb73 100644 --- a/test/core/transport/connectivity_state_test.cc +++ b/test/core/transport/connectivity_state_test.cc @@ -134,11 +134,13 @@ static void test_subscribe_with_failure_then_destroy(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); grpc_core::testing::grpc_tracer_enable_flag(&grpc_connectivity_state_trace); test_connectivity_state_name(); test_check(); test_subscribe_then_unsubscribe(); test_subscribe_then_destroy(); test_subscribe_with_failure_then_destroy(); + grpc_shutdown(); return 0; } diff --git a/test/core/transport/metadata_test.cc b/test/core/transport/metadata_test.cc index e5bdc5901d6..70d557b1287 100644 --- a/test/core/transport/metadata_test.cc +++ b/test/core/transport/metadata_test.cc @@ -369,6 +369,7 @@ static void test_copied_static_metadata(bool dup_key, bool dup_value) { int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); test_no_op(); for (int k = 0; k <= 1; k++) { for (int v = 0; v <= 1; v++) { @@ -383,5 +384,6 @@ int main(int argc, char** argv) { test_create_many_persistant_metadata(); test_things_stick_around(); test_user_data_works(); + grpc_shutdown(); return 0; } diff --git a/test/core/transport/stream_owned_slice_test.cc b/test/core/transport/stream_owned_slice_test.cc index d25d83c2c6c..7831f67a048 100644 --- a/test/core/transport/stream_owned_slice_test.cc +++ b/test/core/transport/stream_owned_slice_test.cc @@ -20,12 +20,14 @@ #include "test/core/util/test_config.h" +#include #include static void do_nothing(void* arg, grpc_error* error) {} int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); uint8_t buffer[] = "abc123"; grpc_stream_refcount r; @@ -39,5 +41,6 @@ int main(int argc, char** argv) { grpc_slice_unref(slice); GPR_ASSERT(r.refs.count == 1); + grpc_shutdown(); return 0; } diff --git a/test/core/util/one_corpus_entry_fuzzer.cc b/test/core/util/one_corpus_entry_fuzzer.cc index c0b67da1e26..fc75125a9bc 100644 --- a/test/core/util/one_corpus_entry_fuzzer.cc +++ b/test/core/util/one_corpus_entry_fuzzer.cc @@ -18,7 +18,10 @@ #include +#include + #include +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/load_file.h" extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size); @@ -30,10 +33,17 @@ int main(int argc, char** argv) { grpc_slice buffer; squelch = false; leak_check = false; + /* TODO(yashkt) Calling grpc_init breaks tests. Fix the tests and replace + * grpc_core::ExecCtx::GlobalInit with grpc_init and GlobalShutdown with + * grpc_shutdown */ + grpc_core::ExecCtx::GlobalInit(); GPR_ASSERT( GRPC_LOG_IF_ERROR("load_file", grpc_load_file(argv[1], 0, &buffer))); LLVMFuzzerTestOneInput(GRPC_SLICE_START_PTR(buffer), GRPC_SLICE_LENGTH(buffer)); + grpc_core::ExecCtx::GlobalShutdown(); + grpc_core::ExecCtx::GlobalInit(); grpc_slice_unref(buffer); + grpc_core::ExecCtx::GlobalShutdown(); return 0; } diff --git a/test/core/util/port_server_client.cc b/test/core/util/port_server_client.cc index 9d0cb20bbda..705286c6d4b 100644 --- a/test/core/util/port_server_client.cc +++ b/test/core/util/port_server_client.cc @@ -194,54 +194,55 @@ int grpc_pick_port_using_server(void) { grpc_httpcli_context context; grpc_httpcli_request req; portreq pr; - grpc_core::ExecCtx _local_exec_ctx; grpc_closure* shutdown_closure; grpc_init(); + { + grpc_core::ExecCtx _local_exec_ctx; + memset(&pr, 0, sizeof(pr)); + memset(&req, 0, sizeof(req)); + grpc_pollset* pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); + grpc_pollset_init(pollset, &pr.mu); + pr.pops = grpc_polling_entity_create_from_pollset(pollset); + shutdown_closure = GRPC_CLOSURE_CREATE(destroy_pops_and_shutdown, &pr.pops, + grpc_schedule_on_exec_ctx); + pr.port = -1; + pr.server = const_cast(GRPC_PORT_SERVER_ADDRESS); + pr.ctx = &context; + + req.host = const_cast(GRPC_PORT_SERVER_ADDRESS); + req.http.path = const_cast("/get"); - memset(&pr, 0, sizeof(pr)); - memset(&req, 0, sizeof(req)); - grpc_pollset* pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); - grpc_pollset_init(pollset, &pr.mu); - pr.pops = grpc_polling_entity_create_from_pollset(pollset); - shutdown_closure = GRPC_CLOSURE_CREATE(destroy_pops_and_shutdown, &pr.pops, - grpc_schedule_on_exec_ctx); - pr.port = -1; - pr.server = const_cast(GRPC_PORT_SERVER_ADDRESS); - pr.ctx = &context; - - req.host = const_cast(GRPC_PORT_SERVER_ADDRESS); - req.http.path = const_cast("/get"); - - grpc_httpcli_context_init(&context); - grpc_resource_quota* resource_quota = - grpc_resource_quota_create("port_server_client/pick"); - grpc_httpcli_get( - &context, &pr.pops, resource_quota, &req, - grpc_core::ExecCtx::Get()->Now() + 30 * GPR_MS_PER_SEC, - GRPC_CLOSURE_CREATE(got_port_from_server, &pr, grpc_schedule_on_exec_ctx), - &pr.response); - grpc_resource_quota_unref_internal(resource_quota); - grpc_core::ExecCtx::Get()->Flush(); - gpr_mu_lock(pr.mu); - while (pr.port == -1) { - grpc_pollset_worker* worker = nullptr; - if (!GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work( - grpc_polling_entity_pollset(&pr.pops), &worker, - grpc_core::ExecCtx::Get()->Now() + GPR_MS_PER_SEC))) { - pr.port = 0; + grpc_httpcli_context_init(&context); + grpc_resource_quota* resource_quota = + grpc_resource_quota_create("port_server_client/pick"); + grpc_httpcli_get(&context, &pr.pops, resource_quota, &req, + grpc_core::ExecCtx::Get()->Now() + 30 * GPR_MS_PER_SEC, + GRPC_CLOSURE_CREATE(got_port_from_server, &pr, + grpc_schedule_on_exec_ctx), + &pr.response); + grpc_resource_quota_unref_internal(resource_quota); + grpc_core::ExecCtx::Get()->Flush(); + gpr_mu_lock(pr.mu); + while (pr.port == -1) { + grpc_pollset_worker* worker = nullptr; + if (!GRPC_LOG_IF_ERROR( + "pollset_work", + grpc_pollset_work( + grpc_polling_entity_pollset(&pr.pops), &worker, + grpc_core::ExecCtx::Get()->Now() + GPR_MS_PER_SEC))) { + pr.port = 0; + } } - } - gpr_mu_unlock(pr.mu); + gpr_mu_unlock(pr.mu); - grpc_http_response_destroy(&pr.response); - grpc_httpcli_context_destroy(&context); - grpc_pollset_shutdown(grpc_polling_entity_pollset(&pr.pops), - shutdown_closure); + grpc_http_response_destroy(&pr.response); + grpc_httpcli_context_destroy(&context); + grpc_pollset_shutdown(grpc_polling_entity_pollset(&pr.pops), + shutdown_closure); - grpc_core::ExecCtx::Get()->Flush(); + grpc_core::ExecCtx::Get()->Flush(); + } grpc_shutdown(); return pr.port; From 03412ee9de902e378bc4cea933397ebe5faddc29 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 28 Nov 2017 18:06:23 -0800 Subject: [PATCH 023/127] Remove TLS_NO_SUPPORT and always use GPR_TLS. Reorder statements in grpc_init and grpc_shutdown. Add grpc_init and grpc_shutdown in failing test/cpp tests --- include/grpc/impl/codegen/port_platform.h | 1 - src/core/lib/iomgr/exec_ctx.cc | 6 ------ src/core/lib/iomgr/exec_ctx.h | 18 +----------------- src/core/lib/iomgr/iomgr.cc | 13 ++++--------- src/core/lib/surface/init.cc | 10 ++++++---- .../CoreCronetEnd2EndTests.mm | 2 +- test/core/end2end/fuzzers/api_fuzzer.cc | 2 +- test/core/http/httpscli_test.cc | 6 +++--- test/core/slice/percent_decode_fuzzer.cc | 3 +++ test/core/slice/percent_encode_fuzzer.cc | 3 +++ test/core/util/one_corpus_entry_fuzzer.cc | 2 -- test/cpp/common/channel_arguments_test.cc | 5 ++++- test/cpp/grpclb/grpclb_api_test.cc | 6 +++++- test/cpp/server/server_builder_test.cc | 7 ++++++- test/cpp/util/byte_buffer_test.cc | 6 +++++- test/cpp/util/slice_test.cc | 6 +++++- 16 files changed, 47 insertions(+), 49 deletions(-) diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h index 1a93be38e01..1906886d5e2 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h @@ -182,7 +182,6 @@ #ifndef _BSD_SOURCE #define _BSD_SOURCE #endif -#define TLS_NO_SUPPORT 1 /* thread-local storage not supported. Use GPR_TLS */ #if TARGET_OS_IPHONE #define GPR_PLATFORM_STRING "ios" #define GPR_CPU_IPHONE 1 diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index f4247db754d..e005437e0a8 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -104,17 +104,11 @@ static grpc_closure_scheduler exec_ctx_scheduler = {&exec_ctx_scheduler_vtable}; grpc_closure_scheduler* grpc_schedule_on_exec_ctx = &exec_ctx_scheduler; namespace grpc_core { -#ifdef TLS_NO_SUPPORT GPR_TLS_CLASS_DEF(ExecCtx::exec_ctx_); -#else -thread_local ExecCtx* ExecCtx::exec_ctx_ = nullptr; -#endif void ExecCtx::GlobalInit(void) { g_start_time = gpr_now(GPR_CLOCK_MONOTONIC); -#ifdef TLS_NO_SUPPORT gpr_tls_init(&exec_ctx_); -#endif } bool ExecCtx::Flush() { diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index b04aab61fab..c8700f33524 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -170,19 +170,11 @@ on outside context */ static void GlobalInit(void); /** Global shutdown for ExecCtx. Called by iomgr */ - static void GlobalShutdown(void) { -#ifdef TLS_NO_SUPPORT - gpr_tls_destroy(&exec_ctx_); -#endif - } + static void GlobalShutdown(void) { gpr_tls_destroy(&exec_ctx_); } /** Gets pointer to current exec_ctx */ static ExecCtx* Get() { -#ifdef TLS_NO_SUPPORT return reinterpret_cast(gpr_tls_get(&exec_ctx_)); -#else - return exec_ctx_; -#endif } protected: @@ -192,11 +184,7 @@ on outside context */ private: /** Set exec_ctx_ to exec_ctx */ void Set(ExecCtx* exec_ctx) { -#ifdef TLS_NO_SUPPORT gpr_tls_set(&exec_ctx_, reinterpret_cast(exec_ctx)); -#else - exec_ctx_ = exec_ctx; -#endif } grpc_closure_list closure_list_ = GRPC_CLOSURE_LIST_INIT; @@ -207,11 +195,7 @@ on outside context */ bool now_is_valid_ = false; grpc_millis now_ = 0; -#ifdef TLS_NO_SUPPORT GPR_TLS_CLASS_DECL(exec_ctx_); -#else - static thread_local ExecCtx* exec_ctx_; -#endif ExecCtx* last_exec_ctx_ = Get(); }; } // namespace grpc_core diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index 570d97443d8..27e93762720 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -46,15 +46,12 @@ static int g_shutdown; static grpc_iomgr_object g_root_object; void grpc_iomgr_init() { + grpc_core::ExecCtx _local_exec_ctx; g_shutdown = 0; gpr_mu_init(&g_mu); gpr_cv_init(&g_rcv); - grpc_core::ExecCtx::GlobalInit(); - { - grpc_core::ExecCtx _local_exec_ctx; - grpc_executor_init(); - grpc_timer_list_init(); - } + grpc_executor_init(); + grpc_timer_list_init(); g_root_object.next = g_root_object.prev = &g_root_object; g_root_object.name = (char*)"root"; grpc_network_status_init(); @@ -85,7 +82,6 @@ void grpc_iomgr_shutdown() { gpr_timespec last_warning_time = gpr_now(GPR_CLOCK_REALTIME); { - grpc_core::ExecCtx _local_exec_ctx(0); grpc_timer_manager_shutdown(); grpc_iomgr_platform_flush(); grpc_executor_shutdown(); @@ -141,8 +137,8 @@ void grpc_iomgr_shutdown() { } } gpr_mu_unlock(&g_mu); - grpc_timer_list_shutdown(); + grpc_core::ExecCtx::Get()->Flush(); } /* ensure all threads have left g_mu */ @@ -150,7 +146,6 @@ void grpc_iomgr_shutdown() { gpr_mu_unlock(&g_mu); grpc_iomgr_platform_shutdown(); - grpc_core::ExecCtx::GlobalShutdown(); grpc_network_status_shutdown(); gpr_mu_destroy(&g_mu); gpr_cv_destroy(&g_rcv); diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index 2d7a33e147b..e6ff475a90a 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -124,6 +124,7 @@ void grpc_init(void) { grpc_mdctx_global_init(); grpc_channel_init_init(); grpc_security_pre_init(); + grpc_core::ExecCtx::GlobalInit(); grpc_iomgr_init(); gpr_timers_global_init(); grpc_handshaker_factory_registry_init(); @@ -156,8 +157,8 @@ void grpc_shutdown(void) { gpr_mu_lock(&g_init_mu); if (--g_initializations == 0) { { + grpc_core::ExecCtx _local_exec_ctx(0); { - grpc_core::ExecCtx _local_exec_ctx(0); grpc_executor_shutdown(); grpc_timer_manager_set_threading( false); // shutdown timer_manager thread @@ -166,15 +167,16 @@ void grpc_shutdown(void) { g_all_of_the_plugins[i].destroy(); } } - grpc_mdctx_global_shutdown(); - grpc_handshaker_factory_registry_shutdown(); } - grpc_iomgr_shutdown(); gpr_timers_global_destroy(); grpc_tracer_shutdown(); + grpc_handshaker_factory_registry_shutdown(); + grpc_iomgr_shutdown(); + grpc_mdctx_global_shutdown(); grpc_slice_intern_shutdown(); grpc_stats_shutdown(); } + grpc_core::ExecCtx::GlobalShutdown(); } gpr_mu_unlock(&g_init_mu); } diff --git a/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm b/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm index 55c5105de4c..7a09e8f3952 100644 --- a/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm +++ b/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm @@ -110,7 +110,7 @@ static void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { static void cronet_init_client_simple_ssl_secure_fullstack( grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { - grpc_exec_ctx _local_exec_ctx; + grpc_core::ExecCtx _local_exec_ctx; stream_engine *cronetEngine = [Cronet getGlobalEngine]; grpc_channel_args *new_client_args = grpc_channel_args_copy(client_args); diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index f3127e92cc4..ce916bd3414 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -745,8 +745,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { input_stream inp = {data, data + size}; grpc_tcp_client_connect_impl = my_tcp_client_connect; gpr_now_impl = now_impl; - grpc_timer_manager_set_threading(false); grpc_init(); + grpc_timer_manager_set_threading(false); { grpc_core::ExecCtx _local_exec_ctx; grpc_executor_set_threading(false); diff --git a/test/core/http/httpscli_test.cc b/test/core/http/httpscli_test.cc index ee2bff18dbb..418afb6992e 100644 --- a/test/core/http/httpscli_test.cc +++ b/test/core/http/httpscli_test.cc @@ -89,7 +89,7 @@ static void test_get(int port) { "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&g_pops), &worker, n_seconds_time(1)))); gpr_mu_unlock(g_mu); - + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -129,7 +129,7 @@ static void test_post(int port) { "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&g_pops), &worker, n_seconds_time(1)))); gpr_mu_unlock(g_mu); - + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -144,7 +144,6 @@ static void destroy_pops(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - grpc_core::ExecCtx _local_exec_ctx; gpr_subprocess* server; char* me = argv[0]; char* lslash = strrchr(me, '/'); @@ -196,6 +195,7 @@ int main(int argc, char** argv) { test_post(port); { + grpc_core::ExecCtx _local_exec_ctx; grpc_httpcli_context_destroy(&g_context); GRPC_CLOSURE_INIT(&destroyed, destroy_pops, &g_pops, grpc_schedule_on_exec_ctx); diff --git a/test/core/slice/percent_decode_fuzzer.cc b/test/core/slice/percent_decode_fuzzer.cc index 3603177c47f..81eb031014f 100644 --- a/test/core/slice/percent_decode_fuzzer.cc +++ b/test/core/slice/percent_decode_fuzzer.cc @@ -20,6 +20,7 @@ #include #include +#include #include #include @@ -31,6 +32,7 @@ bool leak_check = true; extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { struct grpc_memory_counters counters; + grpc_init(); grpc_memory_counters_init(); grpc_slice input = grpc_slice_from_copied_buffer((const char*)data, size); grpc_slice output; @@ -46,6 +48,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_slice_unref(input); counters = grpc_memory_counters_snapshot(); grpc_memory_counters_destroy(); + grpc_shutdown(); GPR_ASSERT(counters.total_size_relative == 0); return 0; } diff --git a/test/core/slice/percent_encode_fuzzer.cc b/test/core/slice/percent_encode_fuzzer.cc index c8e3849fc8e..201ae2790eb 100644 --- a/test/core/slice/percent_encode_fuzzer.cc +++ b/test/core/slice/percent_encode_fuzzer.cc @@ -20,6 +20,7 @@ #include #include +#include #include #include @@ -31,6 +32,7 @@ bool leak_check = true; static void test(const uint8_t* data, size_t size, const uint8_t* dict) { struct grpc_memory_counters counters; + grpc_init(); grpc_memory_counters_init(); grpc_slice input = grpc_slice_from_copied_buffer((const char*)data, size); grpc_slice output = grpc_percent_encode_slice(input, dict); @@ -48,6 +50,7 @@ static void test(const uint8_t* data, size_t size, const uint8_t* dict) { grpc_slice_unref(permissive_decoded_output); counters = grpc_memory_counters_snapshot(); grpc_memory_counters_destroy(); + grpc_shutdown(); GPR_ASSERT(counters.total_size_relative == 0); } diff --git a/test/core/util/one_corpus_entry_fuzzer.cc b/test/core/util/one_corpus_entry_fuzzer.cc index fc75125a9bc..c745eb5dc65 100644 --- a/test/core/util/one_corpus_entry_fuzzer.cc +++ b/test/core/util/one_corpus_entry_fuzzer.cc @@ -36,12 +36,10 @@ int main(int argc, char** argv) { /* TODO(yashkt) Calling grpc_init breaks tests. Fix the tests and replace * grpc_core::ExecCtx::GlobalInit with grpc_init and GlobalShutdown with * grpc_shutdown */ - grpc_core::ExecCtx::GlobalInit(); GPR_ASSERT( GRPC_LOG_IF_ERROR("load_file", grpc_load_file(argv[1], 0, &buffer))); LLVMFuzzerTestOneInput(GRPC_SLICE_START_PTR(buffer), GRPC_SLICE_LENGTH(buffer)); - grpc_core::ExecCtx::GlobalShutdown(); grpc_core::ExecCtx::GlobalInit(); grpc_slice_unref(buffer); grpc_core::ExecCtx::GlobalShutdown(); diff --git a/test/cpp/common/channel_arguments_test.cc b/test/cpp/common/channel_arguments_test.cc index d6ed2e5aa24..f330c01281e 100644 --- a/test/cpp/common/channel_arguments_test.cc +++ b/test/cpp/common/channel_arguments_test.cc @@ -249,5 +249,8 @@ TEST_F(ChannelArgumentsTest, SetUserAgentPrefix) { int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); + grpc_init(); + int ret = RUN_ALL_TESTS(); + grpc_shutdown(); + return ret; } diff --git a/test/cpp/grpclb/grpclb_api_test.cc b/test/cpp/grpclb/grpclb_api_test.cc index 7b62080b497..a494d6f5195 100644 --- a/test/cpp/grpclb/grpclb_api_test.cc +++ b/test/cpp/grpclb/grpclb_api_test.cc @@ -17,6 +17,7 @@ */ #include +#include #include #include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" @@ -135,5 +136,8 @@ TEST_F(GrpclbTest, ParseResponseServerList) { int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); + grpc_init(); + int ret = RUN_ALL_TESTS(); + grpc_shutdown(); + return ret; } diff --git a/test/cpp/server/server_builder_test.cc b/test/cpp/server/server_builder_test.cc index d18459cec9d..694ce549c06 100644 --- a/test/cpp/server/server_builder_test.cc +++ b/test/cpp/server/server_builder_test.cc @@ -22,6 +22,8 @@ #include #include +#include + #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" @@ -77,5 +79,8 @@ TEST(ServerBuilderTest, CreateServerRepeatedPortWithDisallowedReusePort) { int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); + grpc_init(); + int ret = RUN_ALL_TESTS(); + grpc_shutdown(); + return ret; } diff --git a/test/cpp/util/byte_buffer_test.cc b/test/cpp/util/byte_buffer_test.cc index 8fb51bc6635..d603b289c88 100644 --- a/test/cpp/util/byte_buffer_test.cc +++ b/test/cpp/util/byte_buffer_test.cc @@ -22,6 +22,7 @@ #include #include +#include #include #include @@ -109,5 +110,8 @@ TEST_F(ByteBufferTest, SerializationMakesCopy) { int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); + grpc_init(); + int ret = RUN_ALL_TESTS(); + grpc_shutdown(); + return ret; } diff --git a/test/cpp/util/slice_test.cc b/test/cpp/util/slice_test.cc index 8a8962d7ee0..c2e55f3374f 100644 --- a/test/cpp/util/slice_test.cc +++ b/test/cpp/util/slice_test.cc @@ -18,6 +18,7 @@ #include +#include #include #include @@ -127,5 +128,8 @@ TEST_F(SliceTest, Cslice) { int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); + grpc_init(); + int ret = RUN_ALL_TESTS(); + grpc_shutdown(); + return ret; } From 26e934245d2af33f613f932f290315c5c9feca27 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Wed, 29 Nov 2017 11:55:32 -0800 Subject: [PATCH 024/127] Fix race conditions and more grpc_inits required. csharp tests will be fixed in a different PR --- test/core/http/request_fuzzer.cc | 3 +++ test/core/http/response_fuzzer.cc | 3 +++ test/core/iomgr/resolve_address_posix_test.cc | 2 +- test/core/nanopb/fuzzer_response.cc | 3 +++ test/core/nanopb/fuzzer_serverlist.cc | 3 +++ test/core/surface/completion_queue_threading_test.cc | 2 +- 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/test/core/http/request_fuzzer.cc b/test/core/http/request_fuzzer.cc index 368ac1b49db..9798cfb33c7 100644 --- a/test/core/http/request_fuzzer.cc +++ b/test/core/http/request_fuzzer.cc @@ -20,6 +20,7 @@ #include #include +#include #include #include "src/core/lib/http/parser.h" @@ -30,6 +31,7 @@ bool leak_check = true; extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_http_parser parser; grpc_http_request request; + grpc_init(); memset(&request, 0, sizeof(request)); grpc_http_parser_init(&parser, GRPC_HTTP_REQUEST, &request); grpc_slice slice = grpc_slice_from_copied_buffer((const char*)data, size); @@ -38,5 +40,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_slice_unref(slice); grpc_http_parser_destroy(&parser); grpc_http_request_destroy(&request); + grpc_shutdown(); return 0; } diff --git a/test/core/http/response_fuzzer.cc b/test/core/http/response_fuzzer.cc index 2a793fddd4b..fc0904b1db7 100644 --- a/test/core/http/response_fuzzer.cc +++ b/test/core/http/response_fuzzer.cc @@ -19,6 +19,7 @@ #include #include +#include #include #include "src/core/lib/http/parser.h" @@ -29,6 +30,7 @@ bool leak_check = true; extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_http_parser parser; grpc_http_response response; + grpc_init(); memset(&response, 0, sizeof(response)); grpc_http_parser_init(&parser, GRPC_HTTP_RESPONSE, &response); grpc_slice slice = grpc_slice_from_copied_buffer((const char*)data, size); @@ -37,5 +39,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_slice_unref(slice); grpc_http_parser_destroy(&parser); grpc_http_response_destroy(&response); + grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index 0ea57e22023..45a5e5a0b13 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -79,9 +79,9 @@ static grpc_millis n_sec_deadline(int seconds) { static void actually_poll(void* argsp) { args_struct* args = static_cast(argsp); - grpc_core::ExecCtx _local_exec_ctx; grpc_millis deadline = n_sec_deadline(10); while (true) { + grpc_core::ExecCtx _local_exec_ctx; bool done = gpr_atm_acq_load(&args->done_atm) != 0; if (done) { break; diff --git a/test/core/nanopb/fuzzer_response.cc b/test/core/nanopb/fuzzer_response.cc index 7039c801cb9..3a70dea5e98 100644 --- a/test/core/nanopb/fuzzer_response.cc +++ b/test/core/nanopb/fuzzer_response.cc @@ -19,6 +19,7 @@ #include #include +#include #include #include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" @@ -29,6 +30,7 @@ bool leak_check = true; static void dont_log(gpr_log_func_args* args) {} extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { + grpc_init(); if (squelch) gpr_set_log_function(dont_log); grpc_slice slice = grpc_slice_from_copied_buffer((const char*)data, size); grpc_grpclb_initial_response* response; @@ -36,5 +38,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_grpclb_initial_response_destroy(response); } grpc_slice_unref(slice); + grpc_shutdown(); return 0; } diff --git a/test/core/nanopb/fuzzer_serverlist.cc b/test/core/nanopb/fuzzer_serverlist.cc index 0a6b1767a1a..d0af117ef96 100644 --- a/test/core/nanopb/fuzzer_serverlist.cc +++ b/test/core/nanopb/fuzzer_serverlist.cc @@ -19,6 +19,7 @@ #include #include +#include #include #include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" @@ -29,6 +30,7 @@ bool leak_check = true; static void dont_log(gpr_log_func_args* args) {} extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { + grpc_init(); if (squelch) gpr_set_log_function(dont_log); grpc_slice slice = grpc_slice_from_copied_buffer((const char*)data, size); grpc_grpclb_serverlist* serverlist; @@ -36,5 +38,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_grpclb_destroy_serverlist(serverlist); } grpc_slice_unref(slice); + grpc_shutdown(); return 0; } diff --git a/test/core/surface/completion_queue_threading_test.cc b/test/core/surface/completion_queue_threading_test.cc index d923387e23e..8867ba88c3a 100644 --- a/test/core/surface/completion_queue_threading_test.cc +++ b/test/core/surface/completion_queue_threading_test.cc @@ -142,7 +142,6 @@ static void free_completion(void* arg, grpc_cq_completion* completion) { static void producer_thread(void* arg) { test_thread_options* opt = static_cast(arg); int i; - grpc_core::ExecCtx _local_exec_ctx; gpr_log(GPR_INFO, "producer %d started", opt->id); gpr_event_set(&opt->on_started, (void*)(intptr_t)1); @@ -159,6 +158,7 @@ static void producer_thread(void* arg) { gpr_log(GPR_INFO, "producer %d phase 2", opt->id); for (i = 0; i < TEST_THREAD_EVENTS; i++) { + grpc_core::ExecCtx _local_exec_ctx; grpc_cq_end_op(opt->cc, (void*)(intptr_t)1, GRPC_ERROR_NONE, free_completion, nullptr, static_cast( From af5c54de9cdf3a8ac27aa428571d98a93f32cc1f Mon Sep 17 00:00:00 2001 From: Dave MacLachlan Date: Wed, 29 Nov 2017 16:25:10 -0800 Subject: [PATCH 025/127] Add thread naming support on platforms that support it. As a client of grpc I want to be aware of which threads are being created by grpc, and giving them recognizable names makes it significantly easier to diagnose what is going on in my programs. This provides thread names for macOS and Linux. Adding support for other platforms should be easy for platform specialists. --- include/grpc/impl/codegen/port_platform.h | 3 +++ include/grpc/support/thd.h | 5 ++++- src/core/lib/iomgr/ev_poll_posix.cc | 2 +- src/core/lib/iomgr/executor.cc | 8 ++++---- src/core/lib/iomgr/timer_manager.cc | 2 +- src/core/lib/support/thd_posix.cc | 19 +++++++++++++++++-- src/core/lib/support/thd_windows.cc | 3 ++- test/core/bad_client/bad_client.cc | 2 +- test/core/end2end/bad_server_response_test.cc | 2 +- .../end2end/fixtures/http_proxy_fixture.cc | 3 ++- test/core/end2end/fixtures/proxy.cc | 3 ++- test/core/end2end/tests/connectivity.cc | 3 ++- test/core/handshake/client_ssl.cc | 3 ++- test/core/handshake/server_ssl_common.cc | 3 ++- test/core/iomgr/combiner_test.cc | 3 ++- test/core/iomgr/resolve_address_posix_test.cc | 2 +- test/core/iomgr/wakeup_fd_cv_test.cc | 10 +++++----- test/core/support/arena_test.cc | 3 ++- test/core/support/cpu_test.cc | 2 +- test/core/support/mpscq_test.cc | 9 ++++++--- test/core/support/spinlock_test.cc | 3 ++- test/core/support/sync_test.cc | 4 ++-- test/core/support/thd_test.cc | 5 +++-- test/core/support/tls_test.cc | 2 +- .../completion_queue_threading_test.cc | 5 +++-- .../surface/concurrent_connectivity_test.cc | 16 ++++++++++------ .../surface/sequential_connectivity_test.cc | 3 ++- 27 files changed, 84 insertions(+), 44 deletions(-) diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h index 1906886d5e2..0c87aef27d7 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h @@ -166,6 +166,7 @@ #define GPR_POSIX_SYNC 1 #define GPR_POSIX_TIME 1 #define GPR_GETPID_IN_UNISTD_H 1 +#define GPR_LINUX_PTHREAD_NAME 1 #ifdef _LP64 #define GPR_ARCH_64 1 #else /* _LP64 */ @@ -195,6 +196,7 @@ #else /* __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_7 */ #define GPR_CPU_POSIX 1 #define GPR_GCC_TLS 1 +#define GPR_APPLE_PTHREAD_NAME 1 #endif #else /* __MAC_OS_X_VERSION_MIN_REQUIRED */ #define GPR_CPU_POSIX 1 @@ -236,6 +238,7 @@ #define GPR_POSIX_TIME 1 #define GPR_GETPID_IN_UNISTD_H 1 #define GPR_SUPPORT_CHANNELS_FROM_FD 1 +#define GPR_BSD_PTHREAD_NAME 1 #ifdef _LP64 #define GPR_ARCH_64 1 #else /* _LP64 */ diff --git a/include/grpc/support/thd.h b/include/grpc/support/thd.h index 225d9d6c755..e9444e88c9e 100644 --- a/include/grpc/support/thd.h +++ b/include/grpc/support/thd.h @@ -42,9 +42,12 @@ typedef struct { /** Create a new thread running (*thd_body)(arg) and place its thread identifier in *t, and return true. If there are insufficient resources, return false. + thd_name is the name of the thread for identification purposes on platforms + that support thread naming. If options==NULL, default options are used. The thread is immediately runnable, and exits when (*thd_body)() returns. */ -GPRAPI int gpr_thd_new(gpr_thd_id* t, void (*thd_body)(void* arg), void* arg, +GPRAPI int gpr_thd_new(gpr_thd_id* t, const char* thd_name, + void (*thd_body)(void* arg), void* arg, const gpr_thd_options* options); /** Return a gpr_thd_options struct with all fields set to defaults. */ diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index 8659559f78a..7f701b2fb78 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -1382,7 +1382,7 @@ static poll_args* get_poller_locked(struct pollfd* fds, nfds_t count) { gpr_thd_options opt = gpr_thd_options_default(); gpr_ref(&g_cvfds.pollcount); gpr_thd_options_set_detached(&opt); - GPR_ASSERT(gpr_thd_new(&t_id, &run_poll, pargs, &opt)); + GPR_ASSERT(gpr_thd_new(&t_id, "gpr_poller", &run_poll, pargs, &opt)); return pargs; } diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index d8a195f0108..5c32ca3b360 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -104,8 +104,8 @@ void grpc_executor_set_threading(grpc_exec_ctx* exec_ctx, bool threading) { gpr_thd_options opt = gpr_thd_options_default(); gpr_thd_options_set_joinable(&opt); - gpr_thd_new(&g_thread_state[0].id, executor_thread, &g_thread_state[0], - &opt); + gpr_thd_new(&g_thread_state[0].id, "gpr_executor", executor_thread, + &g_thread_state[0], &opt); } else { if (cur_threads == 0) return; for (size_t i = 0; i < g_max_threads; i++) { @@ -263,8 +263,8 @@ static void executor_push(grpc_exec_ctx* exec_ctx, grpc_closure* closure, gpr_thd_options opt = gpr_thd_options_default(); gpr_thd_options_set_joinable(&opt); - gpr_thd_new(&g_thread_state[cur_thread_count].id, executor_thread, - &g_thread_state[cur_thread_count], &opt); + gpr_thd_new(&g_thread_state[cur_thread_count].id, "gpr_executor", + executor_thread, &g_thread_state[cur_thread_count], &opt); } gpr_spinlock_unlock(&g_adding_thread_lock); } diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc index dac74aea24e..0e68637fa41 100644 --- a/src/core/lib/iomgr/timer_manager.cc +++ b/src/core/lib/iomgr/timer_manager.cc @@ -93,7 +93,7 @@ static void start_timer_thread_and_unlock(void) { // to leak through g_completed_threads and be freed in gc_completed_threads() // before "&ct->t" is written to, causing a use-after-free. gpr_mu_lock(&g_mu); - gpr_thd_new(&ct->t, timer_thread, ct, &opt); + gpr_thd_new(&ct->t, "gpr_timer", timer_thread, ct, &opt); gpr_mu_unlock(&g_mu); } diff --git a/src/core/lib/support/thd_posix.cc b/src/core/lib/support/thd_posix.cc index 02e3846be19..ae31a179908 100644 --- a/src/core/lib/support/thd_posix.cc +++ b/src/core/lib/support/thd_posix.cc @@ -33,17 +33,31 @@ struct thd_arg { void (*body)(void* arg); /* body of a thread */ void* arg; /* argument to a thread */ + const char* name; /* name of thread */ }; /* Body of every thread started via gpr_thd_new. */ static void* thread_body(void* v) { struct thd_arg a = *(struct thd_arg*)v; free(v); + if (a.name != NULL) { +#if GPR_APPLE_PTHREAD_NAME + /* Apple supports 64 characters, and will truncate if it's longer. */ + pthread_setname_np(a.name); +#elif GPR_LINUX_PTHREAD_NAME + /* Linux supports 16 characters max, and will error if it's longer. */ + char buf[16]; + strncpy(buf, a.name, sizeof(buf) - 1); + buf[sizeof(buf) - 1] = '\0'; + pthread_setname_np(pthread_self(), buf); +#endif // GPR_APPLE_PTHREAD_NAME + } (*a.body)(a.arg); return nullptr; } -int gpr_thd_new(gpr_thd_id* t, void (*thd_body)(void* arg), void* arg, +int gpr_thd_new(gpr_thd_id* t, const char* thd_name, + void (*thd_body)(void* arg), void* arg, const gpr_thd_options* options) { int thread_started; pthread_attr_t attr; @@ -54,7 +68,8 @@ int gpr_thd_new(gpr_thd_id* t, void (*thd_body)(void* arg), void* arg, GPR_ASSERT(a != nullptr); a->body = thd_body; a->arg = arg; - + a->name = thd_name; + GPR_ASSERT(pthread_attr_init(&attr) == 0); if (gpr_thd_options_is_detached(options)) { GPR_ASSERT(pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) == diff --git a/src/core/lib/support/thd_windows.cc b/src/core/lib/support/thd_windows.cc index 5bda7f440c4..b54d0b6c627 100644 --- a/src/core/lib/support/thd_windows.cc +++ b/src/core/lib/support/thd_windows.cc @@ -63,7 +63,8 @@ static DWORD WINAPI thread_body(void* v) { return 0; } -int gpr_thd_new(gpr_thd_id* t, void (*thd_body)(void* arg), void* arg, +int gpr_thd_new(gpr_thd_id* t, const char* thd_name, + void (*thd_body)(void* arg), void* arg, const gpr_thd_options* options) { HANDLE handle; struct thd_info* info = (struct thd_info*)gpr_malloc(sizeof(*info)); diff --git a/test/core/bad_client/bad_client.cc b/test/core/bad_client/bad_client.cc index c19b7bdf40a..99e61b0c5f2 100644 --- a/test/core/bad_client/bad_client.cc +++ b/test/core/bad_client/bad_client.cc @@ -128,7 +128,7 @@ void grpc_run_bad_client_test( GPR_ASSERT(grpc_server_has_open_connections(a.server)); /* Start validator */ - gpr_thd_new(&id, thd_func, &a, nullptr); + gpr_thd_new(&id, "gpr_bad_client", thd_func, &a, nullptr); grpc_slice_buffer_init(&outgoing); grpc_slice_buffer_add(&outgoing, slice); diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc index b0c6ae926ec..566fd129154 100644 --- a/test/core/end2end/bad_server_response_test.cc +++ b/test/core/end2end/bad_server_response_test.cc @@ -262,7 +262,7 @@ static void poll_server_until_read_done(test_tcp_server* server, poll_args* pa = (poll_args*)gpr_malloc(sizeof(*pa)); pa->server = server; pa->signal_when_done = signal_when_done; - gpr_thd_new(&id, actually_poll_server, pa, nullptr); + gpr_thd_new(&id, "gpr_poll_server", actually_poll_server, pa, nullptr); } static void run_test(const char* response_payload, diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc index ac0c953a79f..25d8983503a 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.cc +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -529,7 +529,8 @@ grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( // Start proxy thread. gpr_thd_options opt = gpr_thd_options_default(); gpr_thd_options_set_joinable(&opt); - GPR_ASSERT(gpr_thd_new(&proxy->thd, thread_main, proxy, &opt)); + GPR_ASSERT(gpr_thd_new(&proxy->thd, "gpr_http_proxy", thread_main, proxy, + &opt)); return proxy; } diff --git a/test/core/end2end/fixtures/proxy.cc b/test/core/end2end/fixtures/proxy.cc index 2fab62b721b..6bbb1f4d1dd 100644 --- a/test/core/end2end/fixtures/proxy.cc +++ b/test/core/end2end/fixtures/proxy.cc @@ -98,7 +98,8 @@ grpc_end2end_proxy* grpc_end2end_proxy_create(const grpc_end2end_proxy_def* def, grpc_call_details_init(&proxy->new_call_details); gpr_thd_options_set_joinable(&opt); - GPR_ASSERT(gpr_thd_new(&proxy->thd, thread_main, proxy, &opt)); + GPR_ASSERT(gpr_thd_new(&proxy->thd, "gpr_end2end_proxy", thread_main, proxy, + &opt)); request_call(proxy); diff --git a/test/core/end2end/tests/connectivity.cc b/test/core/end2end/tests/connectivity.cc index 2ea4ca81f58..6477dcdd69d 100644 --- a/test/core/end2end/tests/connectivity.cc +++ b/test/core/end2end/tests/connectivity.cc @@ -68,7 +68,8 @@ static void test_connectivity(grpc_end2end_test_config config) { ce.cq = f.cq; gpr_event_init(&ce.started); gpr_thd_options_set_joinable(&thdopt); - GPR_ASSERT(gpr_thd_new(&thdid, child_thread, &ce, &thdopt)); + GPR_ASSERT(gpr_thd_new(&thdid, "gpr_connectivity", child_thread, &ce, + &thdopt)); gpr_event_wait(&ce.started, gpr_inf_future(GPR_CLOCK_MONOTONIC)); diff --git a/test/core/handshake/client_ssl.cc b/test/core/handshake/client_ssl.cc index 2b149a73b33..21147ef445e 100644 --- a/test/core/handshake/client_ssl.cc +++ b/test/core/handshake/client_ssl.cc @@ -231,7 +231,8 @@ static bool client_ssl_test(char* server_alpn_preferred) { gpr_thd_id thdid; gpr_thd_options_set_joinable(&thdopt); server_args args = {server_socket, server_alpn_preferred}; - GPR_ASSERT(gpr_thd_new(&thdid, server_thread, &args, &thdopt)); + GPR_ASSERT(gpr_thd_new(&thdid, "gpr_client_ssl_test", server_thread, &args, + &thdopt)); // Load key pair and establish client SSL credentials. grpc_ssl_pem_key_cert_pair pem_key_cert_pair; diff --git a/test/core/handshake/server_ssl_common.cc b/test/core/handshake/server_ssl_common.cc index 599b2814e0c..9b06d31ab27 100644 --- a/test/core/handshake/server_ssl_common.cc +++ b/test/core/handshake/server_ssl_common.cc @@ -137,7 +137,8 @@ bool server_ssl_test(const char* alpn_list[], unsigned int alpn_list_len, gpr_thd_options thdopt = gpr_thd_options_default(); gpr_thd_id thdid; gpr_thd_options_set_joinable(&thdopt); - GPR_ASSERT(gpr_thd_new(&thdid, server_thread, &port, &thdopt)); + GPR_ASSERT(gpr_thd_new(&thdid, "gpr_ssl_test", server_thread, &port, + &thdopt)); SSL_load_error_strings(); OpenSSL_add_ssl_algorithms(); diff --git a/test/core/iomgr/combiner_test.cc b/test/core/iomgr/combiner_test.cc index 146a6bd5530..8c97d8a6ef5 100644 --- a/test/core/iomgr/combiner_test.cc +++ b/test/core/iomgr/combiner_test.cc @@ -112,7 +112,8 @@ static void test_execute_many(void) { ta[i].ctr = 0; ta[i].lock = lock; gpr_event_init(&ta[i].done); - GPR_ASSERT(gpr_thd_new(&thds[i], execute_many_loop, &ta[i], &options)); + GPR_ASSERT(gpr_thd_new(&thds[i], "gpr_execute_many", execute_many_loop, + &ta[i], &options)); } for (size_t i = 0; i < GPR_ARRAY_SIZE(thds); i++) { GPR_ASSERT(gpr_event_wait(&ta[i].done, diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index 1a5eb9ace14..ea70dab89ef 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -104,7 +104,7 @@ static void actually_poll(void* argsp) { static void poll_pollset_until_request_done(args_struct* args) { gpr_atm_rel_store(&args->done_atm, 0); gpr_thd_id id; - gpr_thd_new(&id, actually_poll, args, nullptr); + gpr_thd_new(&id, "gpr_poll_pollset", actually_poll, args, nullptr); } static void must_succeed(grpc_exec_ctx* exec_ctx, void* argsp, diff --git a/test/core/iomgr/wakeup_fd_cv_test.cc b/test/core/iomgr/wakeup_fd_cv_test.cc index dc1d77a0abc..9d761712e75 100644 --- a/test/core/iomgr/wakeup_fd_cv_test.cc +++ b/test/core/iomgr/wakeup_fd_cv_test.cc @@ -138,7 +138,7 @@ void test_poll_cv_trigger(void) { opt = gpr_thd_options_default(); gpr_thd_options_set_joinable(&opt); - gpr_thd_new(&t_id, &background_poll, &pargs, &opt); + gpr_thd_new(&t_id, "gpr_background_poll", &background_poll, &pargs, &opt); // Wakeup wakeup_fd not listening for events GPR_ASSERT(grpc_wakeup_fd_wakeup(&cvfd1) == GRPC_ERROR_NONE); @@ -154,7 +154,7 @@ void test_poll_cv_trigger(void) { // Pollin on socket fd pargs.timeout = -1; pargs.result = -2; - gpr_thd_new(&t_id, &background_poll, &pargs, &opt); + gpr_thd_new(&t_id, "gpr_background_poll", &background_poll, &pargs, &opt); trigger_socket_event(); gpr_thd_join(t_id); GPR_ASSERT(pargs.result == 1); @@ -168,7 +168,7 @@ void test_poll_cv_trigger(void) { // Pollin on wakeup fd reset_socket_event(); pargs.result = -2; - gpr_thd_new(&t_id, &background_poll, &pargs, &opt); + gpr_thd_new(&t_id, "gpr_background_poll", &background_poll, &pargs, &opt); GPR_ASSERT(grpc_wakeup_fd_wakeup(&cvfd2) == GRPC_ERROR_NONE); gpr_thd_join(t_id); @@ -182,7 +182,7 @@ void test_poll_cv_trigger(void) { // Pollin on wakeupfd before poll() pargs.result = -2; - gpr_thd_new(&t_id, &background_poll, &pargs, &opt); + gpr_thd_new(&t_id, "gpr_background_poll", &background_poll, &pargs, &opt); gpr_thd_join(t_id); GPR_ASSERT(pargs.result == 1); @@ -199,7 +199,7 @@ void test_poll_cv_trigger(void) { reset_socket_event(); GPR_ASSERT(grpc_wakeup_fd_consume_wakeup(&cvfd1) == GRPC_ERROR_NONE); GPR_ASSERT(grpc_wakeup_fd_consume_wakeup(&cvfd2) == GRPC_ERROR_NONE); - gpr_thd_new(&t_id, &background_poll, &pargs, &opt); + gpr_thd_new(&t_id, "gpr_background_poll", &background_poll, &pargs, &opt); gpr_thd_join(t_id); GPR_ASSERT(pargs.result == 0); diff --git a/test/core/support/arena_test.cc b/test/core/support/arena_test.cc index 244d860639f..4e11652318d 100644 --- a/test/core/support/arena_test.cc +++ b/test/core/support/arena_test.cc @@ -100,7 +100,8 @@ static void concurrent_test(void) { for (int i = 0; i < CONCURRENT_TEST_THREADS; i++) { gpr_thd_options opt = gpr_thd_options_default(); gpr_thd_options_set_joinable(&opt); - gpr_thd_new(&thds[i], concurrent_test_body, &args, &opt); + gpr_thd_new(&thds[i], "gpr_concurrent_test", concurrent_test_body, &args, + &opt); } gpr_event_set(&args.ev_start, (void*)1); diff --git a/test/core/support/cpu_test.cc b/test/core/support/cpu_test.cc index 1783ec3c60a..db94b8f1c43 100644 --- a/test/core/support/cpu_test.cc +++ b/test/core/support/cpu_test.cc @@ -110,7 +110,7 @@ static void cpu_test(void) { gpr_cv_init(&ct.done_cv); ct.is_done = 0; for (i = 0; i < ct.ncores * 3; i++) { - GPR_ASSERT(gpr_thd_new(&thd, &worker_thread, &ct, nullptr)); + GPR_ASSERT(gpr_thd_new(&thd, "gpr_cpu_test", &worker_thread, &ct, nullptr)); } gpr_mu_lock(&ct.mu); while (!ct.is_done) { diff --git a/test/core/support/mpscq_test.cc b/test/core/support/mpscq_test.cc index 50ff8174f69..026b045b0fd 100644 --- a/test/core/support/mpscq_test.cc +++ b/test/core/support/mpscq_test.cc @@ -85,7 +85,8 @@ static void test_mt(void) { ta[i].ctr = 0; ta[i].q = &q; ta[i].start = &start; - GPR_ASSERT(gpr_thd_new(&thds[i], test_thread, &ta[i], &options)); + GPR_ASSERT(gpr_thd_new(&thds[i], "gpr_test_md", test_thread, &ta[i], + &options)); } size_t num_done = 0; size_t spins = 0; @@ -156,7 +157,8 @@ static void test_mt_multipop(void) { ta[i].ctr = 0; ta[i].q = &q; ta[i].start = &start; - GPR_ASSERT(gpr_thd_new(&thds[i], test_thread, &ta[i], &options)); + GPR_ASSERT(gpr_thd_new(&thds[i], "gpr_multipop_test", test_thread, &ta[i], + &options)); } pull_args pa; pa.ta = ta; @@ -169,7 +171,8 @@ static void test_mt_multipop(void) { for (size_t i = 0; i < GPR_ARRAY_SIZE(pull_thds); i++) { gpr_thd_options options = gpr_thd_options_default(); gpr_thd_options_set_joinable(&options); - GPR_ASSERT(gpr_thd_new(&pull_thds[i], pull_thread, &pa, &options)); + GPR_ASSERT(gpr_thd_new(&pull_thds[i], "gpr_multipop_pull", pull_thread, &pa, + &options)); } gpr_event_set(&start, (void*)1); for (size_t i = 0; i < GPR_ARRAY_SIZE(pull_thds); i++) { diff --git a/test/core/support/spinlock_test.cc b/test/core/support/spinlock_test.cc index 3639802cd7e..1658c5c5f1a 100644 --- a/test/core/support/spinlock_test.cc +++ b/test/core/support/spinlock_test.cc @@ -67,7 +67,8 @@ static void test_create_threads(struct test* m, void (*body)(void* arg)) { for (i = 0; i != m->thread_count; i++) { gpr_thd_options opt = gpr_thd_options_default(); gpr_thd_options_set_joinable(&opt); - GPR_ASSERT(gpr_thd_new(&m->threads[i], body, m, &opt)); + GPR_ASSERT(gpr_thd_new(&m->threads[i], "gpr_create_threads", body, m, + &opt)); } } diff --git a/test/core/support/sync_test.cc b/test/core/support/sync_test.cc index 86e78ce0b51..de53742dd80 100644 --- a/test/core/support/sync_test.cc +++ b/test/core/support/sync_test.cc @@ -189,7 +189,7 @@ static void test_create_threads(struct test* m, void (*body)(void* arg)) { gpr_thd_id id; int i; for (i = 0; i != m->threads; i++) { - GPR_ASSERT(gpr_thd_new(&id, body, m, nullptr)); + GPR_ASSERT(gpr_thd_new(&id, "gpr_create_threads", body, m, nullptr)); } } @@ -244,7 +244,7 @@ static void test(const char* name, void (*body)(void* m), m = test_new(10, iterations, incr_step); if (extra != nullptr) { gpr_thd_id id; - GPR_ASSERT(gpr_thd_new(&id, extra, m, nullptr)); + GPR_ASSERT(gpr_thd_new(&id, name, extra, m, nullptr)); m->done++; /* one more thread to wait for */ } test_create_threads(m, body); diff --git a/test/core/support/thd_test.cc b/test/core/support/thd_test.cc index 34befd80d18..50702c4ae7e 100644 --- a/test/core/support/thd_test.cc +++ b/test/core/support/thd_test.cc @@ -74,7 +74,7 @@ static void test(void) { t.n = NUM_THREADS; t.is_done = 0; for (i = 0; i < NUM_THREADS; i++) { - GPR_ASSERT(gpr_thd_new(&thd, &thd_body, &t, nullptr)); + GPR_ASSERT(gpr_thd_new(&thd, "gpr_thread_test", &thd_body, &t, nullptr)); } gpr_mu_lock(&t.mu); while (!t.is_done) { @@ -84,7 +84,8 @@ static void test(void) { GPR_ASSERT(t.n == 0); gpr_thd_options_set_joinable(&options); for (i = 0; i < NUM_THREADS; i++) { - GPR_ASSERT(gpr_thd_new(&thds[i], &thd_body_joinable, nullptr, &options)); + GPR_ASSERT(gpr_thd_new(&thds[i], "gpr_thread_test_joinable", + &thd_body_joinable, nullptr, &options)); } for (i = 0; i < NUM_THREADS; i++) { gpr_thd_join(thds[i]); diff --git a/test/core/support/tls_test.cc b/test/core/support/tls_test.cc index 0f64d2ee7c8..2a560a4df37 100644 --- a/test/core/support/tls_test.cc +++ b/test/core/support/tls_test.cc @@ -56,7 +56,7 @@ int main(int argc, char* argv[]) { gpr_thd_options_set_joinable(&opt); for (i = 0; i < NUM_THREADS; i++) { - gpr_thd_new(&threads[i], thd_body, nullptr, &opt); + gpr_thd_new(&threads[i], "gpr_tls_test", thd_body, nullptr, &opt); } for (i = 0; i < NUM_THREADS; i++) { gpr_thd_join(threads[i]); diff --git a/test/core/surface/completion_queue_threading_test.cc b/test/core/surface/completion_queue_threading_test.cc index af54e00c4a2..17e185d236e 100644 --- a/test/core/surface/completion_queue_threading_test.cc +++ b/test/core/surface/completion_queue_threading_test.cc @@ -96,7 +96,8 @@ static void test_too_many_plucks(void) { } thread_states[i].cc = cc; thread_states[i].tag = tags[i]; - gpr_thd_new(thread_ids + i, pluck_one, thread_states + i, &thread_options); + gpr_thd_new(thread_ids + i, "gpr_test_pluck", pluck_one, thread_states + i, + &thread_options); } /* wait until all other threads are plucking */ @@ -233,7 +234,7 @@ static void test_threading(size_t producers, size_t consumers) { options[i].events_triggered = 0; options[i].cc = cc; options[i].id = optid++; - GPR_ASSERT(gpr_thd_new(&id, + GPR_ASSERT(gpr_thd_new(&id, i < producers ? "gpr_producer" : "gpr_consumer", i < producers ? producer_thread : consumer_thread, options + i, nullptr)); gpr_event_wait(&options[i].on_started, ten_seconds_time()); diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index 8fa15ab3313..50bea0aee13 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -180,7 +180,8 @@ int run_concurrent_connectivity_test() { /* First round, no server */ gpr_log(GPR_DEBUG, "Wave 1"); for (size_t i = 0; i < NUM_THREADS; ++i) { - gpr_thd_new(&threads[i], create_loop_destroy, localhost, &options); + gpr_thd_new(&threads[i], "gpr_wave_1", create_loop_destroy, localhost, + &options); } for (size_t i = 0; i < NUM_THREADS; ++i) { gpr_thd_join(threads[i]); @@ -196,10 +197,11 @@ int run_concurrent_connectivity_test() { args.cq = grpc_completion_queue_create_for_next(nullptr); grpc_server_register_completion_queue(args.server, args.cq, nullptr); grpc_server_start(args.server); - gpr_thd_new(&server, server_thread, &args, &options); + gpr_thd_new(&server, "gpr_wave_2_server", server_thread, &args, &options); for (size_t i = 0; i < NUM_THREADS; ++i) { - gpr_thd_new(&threads[i], create_loop_destroy, args.addr, &options); + gpr_thd_new(&threads[i], "gpr_wave_2", create_loop_destroy, args.addr, + &options); } for (size_t i = 0; i < NUM_THREADS; ++i) { gpr_thd_join(threads[i]); @@ -216,11 +218,12 @@ int run_concurrent_connectivity_test() { args.pollset = static_cast(gpr_zalloc(grpc_pollset_size())); grpc_pollset_init(args.pollset, &args.mu); gpr_event_init(&args.ready); - gpr_thd_new(&server, bad_server_thread, &args, &options); + gpr_thd_new(&server, "gpr_wave_3_server", bad_server_thread, &args, &options); gpr_event_wait(&args.ready, gpr_inf_future(GPR_CLOCK_MONOTONIC)); for (size_t i = 0; i < NUM_THREADS; ++i) { - gpr_thd_new(&threads[i], create_loop_destroy, args.addr, &options); + gpr_thd_new(&threads[i], "gpr_wave_3", create_loop_destroy, args.addr, + &options); } for (size_t i = 0; i < NUM_THREADS; ++i) { gpr_thd_join(threads[i]); @@ -278,7 +281,8 @@ int run_concurrent_watches_with_short_timeouts_test() { gpr_thd_options_set_joinable(&options); for (size_t i = 0; i < NUM_THREADS; ++i) { - gpr_thd_new(&threads[i], watches_with_short_timeouts, localhost, &options); + gpr_thd_new(&threads[i], "gpr_watches_with_short_timeouts", + watches_with_short_timeouts, localhost, &options); } for (size_t i = 0; i < NUM_THREADS; ++i) { gpr_thd_join(threads[i]); diff --git a/test/core/surface/sequential_connectivity_test.cc b/test/core/surface/sequential_connectivity_test.cc index 015db92cb03..82225f7a892 100644 --- a/test/core/surface/sequential_connectivity_test.cc +++ b/test/core/surface/sequential_connectivity_test.cc @@ -70,7 +70,8 @@ static void run_test(const test_fixture* fixture) { gpr_thd_id server_thread; gpr_thd_options thdopt = gpr_thd_options_default(); gpr_thd_options_set_joinable(&thdopt); - gpr_thd_new(&server_thread, server_thread_func, &sta, &thdopt); + gpr_thd_new(&server_thread, "gpr_server_thread", server_thread_func, &sta, + &thdopt); grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr); grpc_channel* channels[NUM_CONNECTIONS]; From 8a631a2b052330b169fd52d7fb7efea2c149d3a5 Mon Sep 17 00:00:00 2001 From: Dave MacLachlan Date: Wed, 29 Nov 2017 16:31:14 -0800 Subject: [PATCH 026/127] Remove unused BSD thread name macro --- include/grpc/impl/codegen/port_platform.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h index 0c87aef27d7..b22988a438c 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h @@ -238,7 +238,6 @@ #define GPR_POSIX_TIME 1 #define GPR_GETPID_IN_UNISTD_H 1 #define GPR_SUPPORT_CHANNELS_FROM_FD 1 -#define GPR_BSD_PTHREAD_NAME 1 #ifdef _LP64 #define GPR_ARCH_64 1 #else /* _LP64 */ From c354269ba7bd1f6dfe9c86ba18f38fc8e346dcfc Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Wed, 29 Nov 2017 19:07:44 -0800 Subject: [PATCH 027/127] Remove _ prefixed variable names --- .../client_channel/channel_connectivity.cc | 4 +- .../resolver/dns/c_ares/grpc_ares_wrapper.cc | 2 +- .../chttp2/client/insecure/channel_create.cc | 2 +- .../client/insecure/channel_create_posix.cc | 2 +- .../client/secure/secure_channel_create.cc | 2 +- .../chttp2/server/insecure/server_chttp2.cc | 2 +- .../server/insecure/server_chttp2_posix.cc | 2 +- .../server/secure/server_secure_chttp2.cc | 2 +- .../client/secure/cronet_channel_create.cc | 2 +- .../cronet/transport/cronet_transport.cc | 16 +-- .../ext/transport/inproc/inproc_transport.cc | 6 +- .../compression/stream_compression_gzip.cc | 2 +- src/core/lib/iomgr/endpoint_pair_posix.cc | 2 +- src/core/lib/iomgr/endpoint_pair_windows.cc | 2 +- src/core/lib/iomgr/executor.cc | 2 +- src/core/lib/iomgr/iocp_windows.cc | 4 +- src/core/lib/iomgr/iomgr.cc | 2 +- src/core/lib/iomgr/iomgr_uv.cc | 2 +- src/core/lib/iomgr/resolve_address_uv.cc | 2 +- src/core/lib/iomgr/resource_quota.cc | 4 +- src/core/lib/iomgr/tcp_client_uv.cc | 2 +- src/core/lib/iomgr/tcp_server_uv.cc | 6 +- src/core/lib/iomgr/tcp_uv.cc | 10 +- src/core/lib/iomgr/timer_manager.cc | 4 +- src/core/lib/iomgr/timer_uv.cc | 2 +- .../lib/security/context/security_context.cc | 4 +- .../lib/security/credentials/credentials.cc | 6 +- .../google_default_credentials.cc | 4 +- .../credentials/iam/iam_credentials.cc | 2 +- .../credentials/jwt/jwt_credentials.cc | 2 +- .../security/credentials/jwt/jwt_verifier.cc | 2 +- .../credentials/oauth2/oauth2_credentials.cc | 2 +- .../credentials/plugin/plugin_credentials.cc | 4 +- .../security/transport/security_handshaker.cc | 2 +- .../security/transport/server_auth_filter.cc | 2 +- src/core/lib/slice/slice.cc | 2 +- src/core/lib/slice/slice_buffer.cc | 4 +- src/core/lib/surface/alarm.cc | 6 +- src/core/lib/surface/byte_buffer.cc | 2 +- src/core/lib/surface/byte_buffer_reader.cc | 4 +- src/core/lib/surface/call.cc | 8 +- src/core/lib/surface/call_details.cc | 2 +- src/core/lib/surface/channel.cc | 10 +- src/core/lib/surface/channel_ping.cc | 2 +- src/core/lib/surface/completion_queue.cc | 14 +-- src/core/lib/surface/init.cc | 2 +- src/core/lib/surface/lame_client.cc | 2 +- src/core/lib/surface/server.cc | 12 +- src/cpp/common/channel_arguments.cc | 4 +- .../CoreCronetEnd2EndTests.mm | 2 +- test/core/backoff/backoff_test.cc | 8 +- test/core/bad_client/bad_client.cc | 4 +- test/core/channel/channel_args_test.cc | 8 +- test/core/channel/channel_stack_test.cc | 2 +- .../channel/minimal_stack_is_minimal_test.cc | 4 +- test/core/client_channel/lb_policies_test.cc | 4 +- .../core/client_channel/parse_address_test.cc | 6 +- .../dns_resolver_connectivity_test.cc | 4 +- .../resolvers/dns_resolver_test.cc | 6 +- .../resolvers/fake_resolver_test.cc | 2 +- .../resolvers/sockaddr_resolver_test.cc | 6 +- test/core/client_channel/uri_fuzzer_test.cc | 2 +- test/core/client_channel/uri_parser_test.cc | 10 +- test/core/compression/algorithm_test.cc | 4 +- .../core/compression/message_compress_test.cc | 16 +-- test/core/debug/stats_test.cc | 6 +- test/core/end2end/bad_server_response_test.cc | 2 +- test/core/end2end/connection_refused_test.cc | 2 +- test/core/end2end/fixtures/h2_census.cc | 4 +- test/core/end2end/fixtures/h2_compress.cc | 6 +- test/core/end2end/fixtures/h2_fd.cc | 4 +- .../end2end/fixtures/h2_full+workarounds.cc | 2 +- .../end2end/fixtures/h2_load_reporting.cc | 2 +- test/core/end2end/fixtures/h2_oauth2.cc | 2 +- .../end2end/fixtures/h2_sockpair+trace.cc | 6 +- test/core/end2end/fixtures/h2_sockpair.cc | 6 +- .../end2end/fixtures/h2_sockpair_1byte.cc | 6 +- test/core/end2end/fixtures/h2_ssl.cc | 2 +- test/core/end2end/fixtures/h2_ssl_proxy.cc | 4 +- .../end2end/fixtures/http_proxy_fixture.cc | 6 +- test/core/end2end/fuzzers/api_fuzzer.cc | 8 +- test/core/end2end/fuzzers/client_fuzzer.cc | 2 +- test/core/end2end/fuzzers/server_fuzzer.cc | 2 +- test/core/end2end/h2_ssl_cert_test.cc | 2 +- .../core/end2end/tests/cancel_after_accept.cc | 2 +- .../end2end/tests/cancel_after_round_trip.cc | 2 +- test/core/end2end/tests/compressed_payload.cc | 6 +- .../core/end2end/tests/load_reporting_hook.cc | 2 +- test/core/end2end/tests/max_message_length.cc | 4 +- .../stream_compression_compressed_payload.cc | 6 +- .../tests/stream_compression_payload.cc | 2 +- .../stream_compression_ping_pong_streaming.cc | 2 +- .../tests/workaround_cronet_compression.cc | 4 +- test/core/http/httpcli_test.cc | 6 +- test/core/http/httpscli_test.cc | 6 +- test/core/iomgr/combiner_test.cc | 10 +- test/core/iomgr/endpoint_pair_test.cc | 4 +- test/core/iomgr/endpoint_tests.cc | 4 +- test/core/iomgr/ev_epollsig_linux_test.cc | 10 +- test/core/iomgr/fd_conservation_posix_test.cc | 2 +- test/core/iomgr/fd_posix_test.cc | 10 +- test/core/iomgr/pollset_set_test.cc | 8 +- test/core/iomgr/resolve_address_posix_test.cc | 8 +- test/core/iomgr/resolve_address_test.cc | 20 ++-- test/core/iomgr/resource_quota_test.cc | 112 +++++++++--------- test/core/iomgr/tcp_client_posix_test.cc | 8 +- test/core/iomgr/tcp_client_uv_test.cc | 6 +- test/core/iomgr/tcp_posix_test.cc | 14 +-- test/core/iomgr/tcp_server_posix_test.cc | 12 +- test/core/iomgr/tcp_server_uv_test.cc | 12 +- test/core/iomgr/timer_list_test.cc | 4 +- test/core/iomgr/udp_server_test.cc | 14 +-- test/core/security/credentials_test.cc | 54 ++++----- test/core/security/json_token_test.cc | 4 +- test/core/security/jwt_verifier_test.cc | 26 ++-- test/core/security/oauth2_utils.cc | 2 +- .../print_google_default_creds_token.cc | 2 +- test/core/security/secure_endpoint_test.cc | 6 +- test/core/security/ssl_server_fuzzer.cc | 2 +- test/core/security/verify_jwt.cc | 2 +- test/core/slice/b64_test.cc | 8 +- test/core/slice/slice_hash_table_test.cc | 6 +- test/core/surface/byte_buffer_reader_test.cc | 2 +- test/core/surface/channel_create_test.cc | 2 +- test/core/surface/completion_queue_test.cc | 8 +- .../completion_queue_threading_test.cc | 4 +- .../surface/concurrent_connectivity_test.cc | 4 +- test/core/surface/lame_client_test.cc | 2 +- ...num_external_connectivity_watchers_test.cc | 2 +- .../surface/secure_channel_create_test.cc | 6 +- .../surface/sequential_connectivity_test.cc | 2 +- test/core/transport/bdp_estimator_test.cc | 2 +- test/core/transport/byte_stream_test.cc | 10 +- .../core/transport/chttp2/bin_decoder_test.cc | 2 +- .../transport/chttp2/hpack_encoder_test.cc | 2 +- .../chttp2/hpack_parser_fuzzer_test.cc | 2 +- .../transport/chttp2/hpack_parser_test.cc | 4 +- .../core/transport/chttp2/hpack_table_test.cc | 8 +- .../core/transport/connectivity_state_test.cc | 8 +- test/core/transport/metadata_test.cc | 18 +-- test/core/transport/status_conversion_test.cc | 2 +- test/core/util/port_server_client.cc | 4 +- test/core/util/test_tcp_server.cc | 6 +- test/cpp/end2end/client_lb_end2end_test.cc | 2 +- test/cpp/end2end/grpclb_end2end_test.cc | 2 +- test/cpp/grpclb/grpclb_test.cc | 2 +- test/cpp/microbenchmarks/bm_call_create.cc | 4 +- test/cpp/microbenchmarks/bm_chttp2_hpack.cc | 10 +- .../microbenchmarks/bm_chttp2_transport.cc | 10 +- test/cpp/microbenchmarks/bm_closure.cc | 42 +++---- test/cpp/microbenchmarks/bm_cq.cc | 6 +- test/cpp/microbenchmarks/bm_error.cc | 6 +- .../microbenchmarks/bm_fullstack_trickle.cc | 2 +- test/cpp/microbenchmarks/bm_metadata.cc | 26 ++-- test/cpp/microbenchmarks/bm_pollset.cc | 8 +- test/cpp/microbenchmarks/fullstack_fixtures.h | 2 +- test/cpp/naming/resolver_component_test.cc | 4 +- test/cpp/performance/writes_per_rpc_test.cc | 2 +- 158 files changed, 497 insertions(+), 497 deletions(-) diff --git a/src/core/ext/filters/client_channel/channel_connectivity.cc b/src/core/ext/filters/client_channel/channel_connectivity.cc index 1d5386643aa..20693ba4190 100644 --- a/src/core/ext/filters/client_channel/channel_connectivity.cc +++ b/src/core/ext/filters/client_channel/channel_connectivity.cc @@ -33,7 +33,7 @@ grpc_connectivity_state grpc_channel_check_connectivity_state( /* forward through to the underlying client channel */ grpc_channel_element* client_channel_elem = grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel)); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_connectivity_state state; GRPC_API_TRACE( "grpc_channel_check_connectivity_state(channel=%p, try_to_connect=%d)", 2, @@ -198,7 +198,7 @@ void grpc_channel_watch_connectivity_state( gpr_timespec deadline, grpc_completion_queue* cq, void* tag) { grpc_channel_element* client_channel_elem = grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel)); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; state_watcher* w = (state_watcher*)gpr_malloc(sizeof(*w)); GRPC_API_TRACE( diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc index d4b7f0b6c9e..3a870b2d061 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -213,7 +213,7 @@ static void on_hostbyname_done_cb(void* arg, int status, int timeouts, static void on_srv_query_done_cb(void* arg, int status, int timeouts, unsigned char* abuf, int alen) { grpc_ares_request* r = (grpc_ares_request*)arg; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_DEBUG, "on_query_srv_done_cb"); if (status == ARES_SUCCESS) { gpr_log(GPR_DEBUG, "on_query_srv_done_cb ARES_SUCCESS"); diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc index 9cf7bf884bd..6a1b70964d7 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc @@ -80,7 +80,7 @@ static grpc_client_channel_factory client_channel_factory = { grpc_channel* grpc_insecure_channel_create(const char* target, const grpc_channel_args* args, void* reserved) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE( "grpc_insecure_channel_create(target=%s, args=%p, reserved=%p)", 3, (target, args, reserved)); diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc b/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc index bdd8d93bd3b..6236551e24b 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc @@ -37,7 +37,7 @@ grpc_channel* grpc_insecure_channel_create_from_fd( const char* target, int fd, const grpc_channel_args* args) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE("grpc_insecure_channel_create(target=%p, fd=%d, args=%p)", 3, (target, fd, args)); diff --git a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc index e0264cadc5d..27c5b96a4ce 100644 --- a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc +++ b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc @@ -190,7 +190,7 @@ grpc_channel* grpc_secure_channel_create(grpc_channel_credentials* creds, const char* target, const grpc_channel_args* args, void* reserved) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE( "grpc_secure_channel_create(creds=%p, target=%s, args=%p, " "reserved=%p)", diff --git a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc index 826886c9618..52c42d056c6 100644 --- a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc +++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc @@ -26,7 +26,7 @@ #include "src/core/lib/surface/server.h" int grpc_server_add_insecure_http2_port(grpc_server* server, const char* addr) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; int port_num = 0; GRPC_API_TRACE("grpc_server_add_insecure_http2_port(server=%p, addr=%s)", 2, (server, addr)); diff --git a/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc b/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc index 56789ab53d8..210939e6af4 100644 --- a/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc +++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc @@ -38,7 +38,7 @@ void grpc_server_add_insecure_channel_from_fd(grpc_server* server, void* reserved, int fd) { GPR_ASSERT(reserved == nullptr); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; char* name; gpr_asprintf(&name, "fd:%d", fd); diff --git a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc index 7b426c18fb6..723af97ff08 100644 --- a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc +++ b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc @@ -36,7 +36,7 @@ int grpc_server_add_secure_http2_port(grpc_server* server, const char* addr, grpc_server_credentials* creds) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_error* err = GRPC_ERROR_NONE; grpc_server_security_connector* sc = nullptr; int port_num = 0; diff --git a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc index 8e1dcc542ec..40a30e4a31d 100644 --- a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc +++ b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc @@ -49,6 +49,6 @@ GRPCAPI grpc_channel* grpc_cronet_secure_channel_create( grpc_transport* ct = grpc_create_cronet_transport(engine, target, args, reserved); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; return grpc_channel_create(target, args, GRPC_CLIENT_DIRECT_CHANNEL, ct); } diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index f9f47a4a12f..c9fd94176bd 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -398,7 +398,7 @@ static void execute_from_storage(stream_obj* s) { */ static void on_failed(bidirectional_stream* stream, int net_error) { CRONET_LOG(GPR_DEBUG, "on_failed(%p, %d)", stream, net_error); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; stream_obj* s = (stream_obj*)stream->annotation; gpr_mu_lock(&s->mu); @@ -424,7 +424,7 @@ static void on_failed(bidirectional_stream* stream, int net_error) { */ static void on_canceled(bidirectional_stream* stream) { CRONET_LOG(GPR_DEBUG, "on_canceled(%p)", stream); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; stream_obj* s = (stream_obj*)stream->annotation; gpr_mu_lock(&s->mu); @@ -450,7 +450,7 @@ static void on_canceled(bidirectional_stream* stream) { */ static void on_succeeded(bidirectional_stream* stream) { CRONET_LOG(GPR_DEBUG, "on_succeeded(%p)", stream); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; stream_obj* s = (stream_obj*)stream->annotation; gpr_mu_lock(&s->mu); @@ -468,7 +468,7 @@ static void on_succeeded(bidirectional_stream* stream) { */ static void on_stream_ready(bidirectional_stream* stream) { CRONET_LOG(GPR_DEBUG, "W: on_stream_ready(%p)", stream); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; stream_obj* s = (stream_obj*)stream->annotation; grpc_cronet_transport* t = (grpc_cronet_transport*)s->curr_ct; gpr_mu_lock(&s->mu); @@ -498,7 +498,7 @@ static void on_response_headers_received( bidirectional_stream* stream, const bidirectional_stream_header_array* headers, const char* negotiated_protocol) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; CRONET_LOG(GPR_DEBUG, "R: on_response_headers_received(%p, %p, %s)", stream, headers, negotiated_protocol); stream_obj* s = (stream_obj*)stream->annotation; @@ -550,7 +550,7 @@ static void on_response_headers_received( Cronet callback */ static void on_write_completed(bidirectional_stream* stream, const char* data) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; stream_obj* s = (stream_obj*)stream->annotation; CRONET_LOG(GPR_DEBUG, "W: on_write_completed(%p, %s)", stream, data); gpr_mu_lock(&s->mu); @@ -568,7 +568,7 @@ static void on_write_completed(bidirectional_stream* stream, const char* data) { */ static void on_read_completed(bidirectional_stream* stream, char* data, int count) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; stream_obj* s = (stream_obj*)stream->annotation; CRONET_LOG(GPR_DEBUG, "R: on_read_completed(%p, %p, %d)", stream, data, count); @@ -610,7 +610,7 @@ static void on_read_completed(bidirectional_stream* stream, char* data, static void on_response_trailers_received( bidirectional_stream* stream, const bidirectional_stream_header_array* trailers) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; CRONET_LOG(GPR_DEBUG, "R: on_response_trailers_received(%p,%p)", stream, trailers); stream_obj* s = (stream_obj*)stream->annotation; diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index 18e77b9b1c1..d816a5d1a71 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/src/core/ext/transport/inproc/inproc_transport.cc @@ -1096,7 +1096,7 @@ static grpc_endpoint* get_endpoint(grpc_transport* t) { return nullptr; } static void do_nothing(void* arg, grpc_error* error) {} void grpc_inproc_transport_init(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_CLOSURE_INIT(&do_nothing_closure, do_nothing, nullptr, grpc_schedule_on_exec_ctx); g_empty_slice = grpc_slice_from_static_buffer(nullptr, 0); @@ -1160,7 +1160,7 @@ grpc_channel* grpc_inproc_channel_create(grpc_server* server, GRPC_API_TRACE("grpc_inproc_channel_create(server=%p, args=%p)", 2, (server, args)); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; const grpc_channel_args* server_args = grpc_server_get_channel_args(server); @@ -1191,7 +1191,7 @@ grpc_channel* grpc_inproc_channel_create(grpc_server* server, } void grpc_inproc_transport_shutdown(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_slice_unref_internal(g_empty_slice); grpc_slice_unref_internal(g_fake_path_key); grpc_slice_unref_internal(g_fake_path_value); diff --git a/src/core/lib/compression/stream_compression_gzip.cc b/src/core/lib/compression/stream_compression_gzip.cc index 6c4397759fb..9d829b31dbf 100644 --- a/src/core/lib/compression/stream_compression_gzip.cc +++ b/src/core/lib/compression/stream_compression_gzip.cc @@ -40,7 +40,7 @@ static bool gzip_flate(grpc_stream_compression_context_gzip* ctx, /* Full flush is not allowed when inflating. */ GPR_ASSERT(!(ctx->flate == inflate && (flush == Z_FINISH))); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; int r; bool eoc = false; size_t original_max_output_size = max_output_size; diff --git a/src/core/lib/iomgr/endpoint_pair_posix.cc b/src/core/lib/iomgr/endpoint_pair_posix.cc index 65db4a9675f..0b4aefd1b70 100644 --- a/src/core/lib/iomgr/endpoint_pair_posix.cc +++ b/src/core/lib/iomgr/endpoint_pair_posix.cc @@ -54,7 +54,7 @@ grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char* name, char* final_name; create_sockets(sv); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_asprintf(&final_name, "%s:client", name); p.client = grpc_tcp_create(grpc_fd_create(sv[1], final_name), args, diff --git a/src/core/lib/iomgr/endpoint_pair_windows.cc b/src/core/lib/iomgr/endpoint_pair_windows.cc index afd91c9932b..cc07ac07081 100644 --- a/src/core/lib/iomgr/endpoint_pair_windows.cc +++ b/src/core/lib/iomgr/endpoint_pair_windows.cc @@ -72,7 +72,7 @@ grpc_endpoint_pair grpc_iomgr_create_endpoint_pair( SOCKET sv[2]; grpc_endpoint_pair p; create_sockets(sv); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; p.client = grpc_tcp_create(grpc_winsocket_create(sv[1], "endpoint:client"), channel_args, "endpoint:server"); p.server = grpc_tcp_create(grpc_winsocket_create(sv[0], "endpoint:server"), diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index d2fb7727650..d9b0c1daf0f 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -143,7 +143,7 @@ static void executor_thread(void* arg) { thread_state* ts = (thread_state*)arg; gpr_tls_set(&g_this_thread_state, (intptr_t)ts); - grpc_core::ExecCtx _local_exec_ctx(0); + grpc_core::ExecCtx exec_ctx(0); size_t subtract_depth = 0; for (;;) { diff --git a/src/core/lib/iomgr/iocp_windows.cc b/src/core/lib/iomgr/iocp_windows.cc index f5c6297438b..0b6e6823b3f 100644 --- a/src/core/lib/iomgr/iocp_windows.cc +++ b/src/core/lib/iomgr/iocp_windows.cc @@ -113,7 +113,7 @@ void grpc_iocp_kick(void) { } void grpc_iocp_flush(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_iocp_work_status work_status; do { @@ -123,7 +123,7 @@ void grpc_iocp_flush(void) { } void grpc_iocp_shutdown(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (gpr_atm_acq_load(&g_custom_events)) { grpc_iocp_work(GRPC_MILLIS_INF_FUTURE); grpc_core::ExecCtx::Get()->Flush(); diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index 27e93762720..dacf08ea9eb 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -46,7 +46,7 @@ static int g_shutdown; static grpc_iomgr_object g_root_object; void grpc_iomgr_init() { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; g_shutdown = 0; gpr_mu_init(&g_mu); gpr_cv_init(&g_rcv); diff --git a/src/core/lib/iomgr/iomgr_uv.cc b/src/core/lib/iomgr/iomgr_uv.cc index 95b06e2ca5a..9614c2e664a 100644 --- a/src/core/lib/iomgr/iomgr_uv.cc +++ b/src/core/lib/iomgr/iomgr_uv.cc @@ -29,7 +29,7 @@ gpr_thd_id g_init_thread; void grpc_iomgr_platform_init(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_pollset_global_init(); grpc_executor_set_threading(false); diff --git a/src/core/lib/iomgr/resolve_address_uv.cc b/src/core/lib/iomgr/resolve_address_uv.cc index 54adf9b9f6b..3eab04f3de0 100644 --- a/src/core/lib/iomgr/resolve_address_uv.cc +++ b/src/core/lib/iomgr/resolve_address_uv.cc @@ -114,7 +114,7 @@ static grpc_error* handle_addrinfo_result(int status, struct addrinfo* result, static void getaddrinfo_callback(uv_getaddrinfo_t* req, int status, struct addrinfo* res) { request* r = (request*)req->data; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_error* error; int retry_status; char* port = r->port; diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc index 55d559c466a..cabe28e4e6d 100644 --- a/src/core/lib/iomgr/resource_quota.cc +++ b/src/core/lib/iomgr/resource_quota.cc @@ -621,7 +621,7 @@ void grpc_resource_quota_unref_internal(grpc_resource_quota* resource_quota) { /* Public API */ void grpc_resource_quota_unref(grpc_resource_quota* resource_quota) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_quota_unref_internal(resource_quota); } @@ -646,7 +646,7 @@ double grpc_resource_quota_get_memory_pressure( /* Public API */ void grpc_resource_quota_resize(grpc_resource_quota* resource_quota, size_t size) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; rq_resize_args* a = (rq_resize_args*)gpr_malloc(sizeof(*a)); a->resource_quota = grpc_resource_quota_ref_internal(resource_quota); a->size = (int64_t)size; diff --git a/src/core/lib/iomgr/tcp_client_uv.cc b/src/core/lib/iomgr/tcp_client_uv.cc index 0ba074500b5..0cb688cf163 100644 --- a/src/core/lib/iomgr/tcp_client_uv.cc +++ b/src/core/lib/iomgr/tcp_client_uv.cc @@ -76,7 +76,7 @@ static void uv_tc_on_alarm(void* acp, grpc_error* error) { static void uv_tc_on_connect(uv_connect_t* req, int status) { grpc_uv_tcp_connect* connect = (grpc_uv_tcp_connect*)req->data; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_error* error = GRPC_ERROR_NONE; int done; grpc_closure* closure = connect->closure; diff --git a/src/core/lib/iomgr/tcp_server_uv.cc b/src/core/lib/iomgr/tcp_server_uv.cc index 2181b12b237..55f16126b65 100644 --- a/src/core/lib/iomgr/tcp_server_uv.cc +++ b/src/core/lib/iomgr/tcp_server_uv.cc @@ -137,7 +137,7 @@ static void finish_shutdown(grpc_tcp_server* s) { static void handle_close_callback(uv_handle_t* handle) { grpc_tcp_listener* sp = (grpc_tcp_listener*)handle->data; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; sp->server->open_ports--; if (sp->server->open_ports == 0 && sp->server->shutdown) { finish_shutdown(sp->server); @@ -174,7 +174,7 @@ void grpc_tcp_server_unref(grpc_tcp_server* s) { GRPC_UV_ASSERT_SAME_THREAD(); if (gpr_unref(&s->refs)) { /* Complete shutdown_starting work before destroying. */ - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_CLOSURE_LIST_SCHED(&s->shutdown_starting); grpc_core::ExecCtx::Get()->Flush(); tcp_server_destroy(s); @@ -223,7 +223,7 @@ static void finish_accept(grpc_tcp_listener* sp) { static void on_connect(uv_stream_t* server, int status) { grpc_tcp_listener* sp = (grpc_tcp_listener*)server->data; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; if (status < 0) { switch (status) { diff --git a/src/core/lib/iomgr/tcp_uv.cc b/src/core/lib/iomgr/tcp_uv.cc index d41ddaf4280..2c26b60511d 100644 --- a/src/core/lib/iomgr/tcp_uv.cc +++ b/src/core/lib/iomgr/tcp_uv.cc @@ -111,14 +111,14 @@ static void tcp_ref(grpc_tcp* tcp) { gpr_ref(&tcp->refcount); } #endif static void uv_close_callback(uv_handle_t* handle) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_tcp* tcp = (grpc_tcp*)handle->data; TCP_UNREF(tcp, "destroy"); } static void alloc_uv_buf(uv_handle_t* handle, size_t suggested_size, uv_buf_t* buf) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_tcp* tcp = (grpc_tcp*)handle->data; (void)suggested_size; /* Before calling uv_read_start, we allocate a buffer with exactly one slice @@ -151,7 +151,7 @@ static void call_read_cb(grpc_tcp* tcp, grpc_error* error) { static void read_callback(uv_stream_t* stream, ssize_t nread, const uv_buf_t* buf) { grpc_error* error; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_tcp* tcp = (grpc_tcp*)stream->data; grpc_slice_buffer garbage; if (nread == 0) { @@ -228,7 +228,7 @@ static void uv_endpoint_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, static void write_callback(uv_write_t* req, int status) { grpc_tcp* tcp = (grpc_tcp*)req->data; grpc_error* error; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_closure* cb = tcp->write_cb; tcp->write_cb = NULL; TCP_UNREF(tcp, "write"); @@ -372,7 +372,7 @@ grpc_endpoint* grpc_tcp_create(uv_tcp_t* handle, grpc_resource_quota* resource_quota, char* peer_string) { grpc_tcp* tcp = (grpc_tcp*)gpr_malloc(sizeof(grpc_tcp)); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "Creating TCP endpoint %p", tcp); diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc index 0e1fa0c0490..e11e9156c3f 100644 --- a/src/core/lib/iomgr/timer_manager.cc +++ b/src/core/lib/iomgr/timer_manager.cc @@ -98,7 +98,7 @@ static void start_timer_thread_and_unlock(void) { } void grpc_timer_manager_tick() { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_millis next = GRPC_MILLIS_INF_FUTURE; grpc_timer_check(&next); } @@ -273,7 +273,7 @@ static void timer_thread_cleanup(completed_thread* ct) { static void timer_thread(void* completed_thread_ptr) { // this threads exec_ctx: we try to run things through to completion here // since it's easy to spin up new threads - grpc_core::ExecCtx _local_exec_ctx(0); + grpc_core::ExecCtx exec_ctx(0); timer_main_loop(); timer_thread_cleanup((completed_thread*)completed_thread_ptr); diff --git a/src/core/lib/iomgr/timer_uv.cc b/src/core/lib/iomgr/timer_uv.cc index 879890603c5..5d238da0892 100644 --- a/src/core/lib/iomgr/timer_uv.cc +++ b/src/core/lib/iomgr/timer_uv.cc @@ -42,7 +42,7 @@ static void stop_uv_timer(uv_timer_t* handle) { void run_expired_timer(uv_timer_t* handle) { grpc_timer* timer = (grpc_timer*)handle->data; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_UV_ASSERT_SAME_THREAD(); GPR_ASSERT(timer->pending); timer->pending = 0; diff --git a/src/core/lib/security/context/security_context.cc b/src/core/lib/security/context/security_context.cc index d4efdac5839..03710279948 100644 --- a/src/core/lib/security/context/security_context.cc +++ b/src/core/lib/security/context/security_context.cc @@ -36,7 +36,7 @@ grpc_core::DebugOnlyTraceFlag grpc_trace_auth_context_refcount( grpc_call_error grpc_call_set_credentials(grpc_call* call, grpc_call_credentials* creds) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_client_security_context* ctx = nullptr; GRPC_API_TRACE("grpc_call_set_credentials(call=%p, creds=%p)", 2, (call, creds)); @@ -85,7 +85,7 @@ grpc_client_security_context* grpc_client_security_context_create(void) { } void grpc_client_security_context_destroy(void* ctx) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_client_security_context* c = (grpc_client_security_context*)ctx; grpc_call_credentials_unref(c->creds); GRPC_AUTH_CONTEXT_UNREF(c->auth_context, "client_security_context"); diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index d8a98fa3f05..48b459e1be9 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -72,7 +72,7 @@ void grpc_channel_credentials_unref(grpc_channel_credentials* creds) { void grpc_channel_credentials_release(grpc_channel_credentials* creds) { GRPC_API_TRACE("grpc_channel_credentials_release(creds=%p)", 1, (creds)); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_credentials_unref(creds); } @@ -94,7 +94,7 @@ void grpc_call_credentials_unref(grpc_call_credentials* creds) { void grpc_call_credentials_release(grpc_call_credentials* creds) { GRPC_API_TRACE("grpc_call_credentials_release(creds=%p)", 1, (creds)); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_call_credentials_unref(creds); } @@ -211,7 +211,7 @@ void grpc_server_credentials_unref(grpc_server_credentials* creds) { void grpc_server_credentials_release(grpc_server_credentials* creds) { GRPC_API_TRACE("grpc_server_credentials_release(creds=%p)", 1, (creds)); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_server_credentials_unref(creds); } diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc index 072dffe0353..03d52850d90 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc @@ -221,7 +221,7 @@ grpc_channel_credentials* grpc_google_default_credentials_create(void) { grpc_error* error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Failed to create Google credentials"); grpc_error* err; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE("grpc_google_default_credentials_create(void)", 0, ()); @@ -291,7 +291,7 @@ end: } void grpc_flush_cached_google_default_credentials(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_once_init(&g_once, init_default_credentials); gpr_mu_lock(&g_state_mu); if (default_credentials != nullptr) { diff --git a/src/core/lib/security/credentials/iam/iam_credentials.cc b/src/core/lib/security/credentials/iam/iam_credentials.cc index 3b01137ed92..75acb2a58e6 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.cc +++ b/src/core/lib/security/credentials/iam/iam_credentials.cc @@ -54,7 +54,7 @@ static grpc_call_credentials_vtable iam_vtable = { grpc_call_credentials* grpc_google_iam_credentials_create( const char* token, const char* authority_selector, void* reserved) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE( "grpc_iam_credentials_create(token=%s, authority_selector=%s, " "reserved=%p)", diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.cc b/src/core/lib/security/credentials/jwt/jwt_credentials.cc index 3eaedeea4e8..2404e860e42 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.cc +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.cc @@ -181,7 +181,7 @@ grpc_call_credentials* grpc_service_account_jwt_access_credentials_create( gpr_free(clean_json); } GPR_ASSERT(reserved == nullptr); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_call_credentials* creds = grpc_service_account_jwt_access_credentials_create_from_auth_json_key( grpc_auth_json_key_create_from_string(json_key), token_lifetime); diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.cc b/src/core/lib/security/credentials/jwt/jwt_verifier.cc index dc67a20e6fa..39339f07d73 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.cc +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.cc @@ -347,7 +347,7 @@ static verifier_cb_ctx* verifier_cb_ctx_create( grpc_jwt_claims* claims, const char* audience, grpc_slice signature, const char* signed_jwt, size_t signed_jwt_len, void* user_data, grpc_jwt_verification_done_cb cb) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; verifier_cb_ctx* ctx = (verifier_cb_ctx*)gpr_zalloc(sizeof(verifier_cb_ctx)); ctx->verifier = verifier; ctx->pollent = grpc_polling_entity_create_from_pollset(pollset); diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index 0fe368d3f2e..e243ea52c62 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -515,7 +515,7 @@ grpc_call_credentials* grpc_access_token_credentials_create( gpr_ref_init(&c->base.refcount, 1); char* token_md_value; gpr_asprintf(&token_md_value, "Bearer %s", access_token); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; c->access_token_md = grpc_mdelem_from_slices( grpc_slice_from_static_string(GRPC_AUTHORIZATION_METADATA_KEY), grpc_slice_from_copied_string(token_md_value)); diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.cc b/src/core/lib/security/credentials/plugin/plugin_credentials.cc index a75ae033b93..203ba58c671 100644 --- a/src/core/lib/security/credentials/plugin/plugin_credentials.cc +++ b/src/core/lib/security/credentials/plugin/plugin_credentials.cc @@ -115,8 +115,8 @@ static void plugin_md_request_metadata_ready(void* request, grpc_status_code status, const char* error_details) { /* called from application code */ - grpc_core::ExecCtx _local_exec_ctx(GRPC_EXEC_CTX_FLAG_IS_FINISHED | - GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP); + grpc_core::ExecCtx exec_ctx(GRPC_EXEC_CTX_FLAG_IS_FINISHED | + GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP); grpc_plugin_credentials_pending_request* r = (grpc_plugin_credentials_pending_request*)request; if (grpc_plugin_credentials_trace.enabled()) { diff --git a/src/core/lib/security/transport/security_handshaker.cc b/src/core/lib/security/transport/security_handshaker.cc index 25a1e59ace5..7623fbfd5b3 100644 --- a/src/core/lib/security/transport/security_handshaker.cc +++ b/src/core/lib/security/transport/security_handshaker.cc @@ -271,7 +271,7 @@ static void on_handshake_next_done_grpc_wrapper( security_handshaker* h = (security_handshaker*)user_data; // This callback will be invoked by TSI in a non-grpc thread, so it's // safe to create our own exec_ctx here. - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_mu_lock(&h->mu); grpc_error* error = on_handshake_next_done_locked( h, result, bytes_to_send, bytes_to_send_size, handshaker_result); diff --git a/src/core/lib/security/transport/server_auth_filter.cc b/src/core/lib/security/transport/server_auth_filter.cc index 3566ddf64e8..73653f2a668 100644 --- a/src/core/lib/security/transport/server_auth_filter.cc +++ b/src/core/lib/security/transport/server_auth_filter.cc @@ -118,7 +118,7 @@ static void on_md_processing_done( grpc_status_code status, const char* error_details) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; // If the call was not cancelled while we were in flight, process the result. if (gpr_atm_full_cas(&calld->state, (gpr_atm)STATE_INIT, (gpr_atm)STATE_DONE)) { diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc index 7ac62047162..1eb15290eb0 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc @@ -67,7 +67,7 @@ grpc_slice grpc_slice_ref(grpc_slice slice) { /* Public API */ void grpc_slice_unref(grpc_slice slice) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_slice_unref_internal(slice); } diff --git a/src/core/lib/slice/slice_buffer.cc b/src/core/lib/slice/slice_buffer.cc index dbe8d48343d..33ec2af683c 100644 --- a/src/core/lib/slice/slice_buffer.cc +++ b/src/core/lib/slice/slice_buffer.cc @@ -73,7 +73,7 @@ void grpc_slice_buffer_destroy_internal(grpc_slice_buffer* sb) { } void grpc_slice_buffer_destroy(grpc_slice_buffer* sb) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_slice_buffer_destroy_internal(sb); } @@ -172,7 +172,7 @@ void grpc_slice_buffer_reset_and_unref_internal(grpc_slice_buffer* sb) { } void grpc_slice_buffer_reset_and_unref(grpc_slice_buffer* sb) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_slice_buffer_reset_and_unref_internal(sb); } diff --git a/src/core/lib/surface/alarm.cc b/src/core/lib/surface/alarm.cc index 9a13a7b3237..f6ea016c333 100644 --- a/src/core/lib/surface/alarm.cc +++ b/src/core/lib/surface/alarm.cc @@ -45,7 +45,7 @@ static void alarm_ref(grpc_alarm* alarm) { gpr_ref(&alarm->refs); } static void alarm_unref(grpc_alarm* alarm) { if (gpr_unref(&alarm->refs)) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; if (alarm->cq != nullptr) { GRPC_CQ_INTERNAL_UNREF(alarm->cq, "alarm"); } @@ -115,7 +115,7 @@ grpc_alarm* grpc_alarm_create(void* reserved) { void grpc_alarm_set(grpc_alarm* alarm, grpc_completion_queue* cq, gpr_timespec deadline, void* tag, void* reserved) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_CQ_INTERNAL_REF(cq, "alarm"); alarm->cq = cq; @@ -127,7 +127,7 @@ void grpc_alarm_set(grpc_alarm* alarm, grpc_completion_queue* cq, } void grpc_alarm_cancel(grpc_alarm* alarm, void* reserved) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_timer_cancel(&alarm->alarm); } diff --git a/src/core/lib/surface/byte_buffer.cc b/src/core/lib/surface/byte_buffer.cc index b706f5ba9b1..e4c2a4a4c22 100644 --- a/src/core/lib/surface/byte_buffer.cc +++ b/src/core/lib/surface/byte_buffer.cc @@ -71,7 +71,7 @@ grpc_byte_buffer* grpc_byte_buffer_copy(grpc_byte_buffer* bb) { void grpc_byte_buffer_destroy(grpc_byte_buffer* bb) { if (!bb) return; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; switch (bb->type) { case GRPC_BB_RAW: grpc_slice_buffer_destroy_internal(&bb->data.raw.slice_buffer); diff --git a/src/core/lib/surface/byte_buffer_reader.cc b/src/core/lib/surface/byte_buffer_reader.cc index c5f8df3ddab..81a48e95fcc 100644 --- a/src/core/lib/surface/byte_buffer_reader.cc +++ b/src/core/lib/surface/byte_buffer_reader.cc @@ -42,7 +42,7 @@ static int is_compressed(grpc_byte_buffer* buffer) { int grpc_byte_buffer_reader_init(grpc_byte_buffer_reader* reader, grpc_byte_buffer* buffer) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_slice_buffer decompressed_slices_buffer; reader->buffer_in = buffer; switch (reader->buffer_in->type) { @@ -110,7 +110,7 @@ grpc_slice grpc_byte_buffer_reader_readall(grpc_byte_buffer_reader* reader) { grpc_slice out_slice = GRPC_SLICE_MALLOC(input_size); uint8_t* const outbuf = GRPC_SLICE_START_PTR(out_slice); /* just an alias */ - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (grpc_byte_buffer_reader_next(reader, &in_slice) != 0) { const size_t slice_length = GRPC_SLICE_LENGTH(in_slice); memcpy(&(outbuf[bytes_read]), GRPC_SLICE_START_PTR(in_slice), slice_length); diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index e4c8f015051..a457aaa7a2f 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -560,7 +560,7 @@ void grpc_call_unref(grpc_call* c) { if (!gpr_unref(&c->ext_ref)) return; child_call* cc = c->child; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GPR_TIMER_BEGIN("grpc_call_unref", 0); GRPC_API_TRACE("grpc_call_unref(c=%p)", 1, (c)); @@ -601,7 +601,7 @@ void grpc_call_unref(grpc_call* c) { grpc_call_error grpc_call_cancel(grpc_call* call, void* reserved) { GRPC_API_TRACE("grpc_call_cancel(call=%p, reserved=%p)", 2, (call, reserved)); GPR_ASSERT(!reserved); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; cancel_with_error(call, STATUS_FROM_API_OVERRIDE, GRPC_ERROR_CANCELLED); return GRPC_CALL_OK; @@ -651,7 +651,7 @@ grpc_call_error grpc_call_cancel_with_status(grpc_call* c, grpc_status_code status, const char* description, void* reserved) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE( "grpc_call_cancel_with_status(" "c=%p, status=%d, description=%s, reserved=%p)", @@ -2038,7 +2038,7 @@ done_with_error: grpc_call_error grpc_call_start_batch(grpc_call* call, const grpc_op* ops, size_t nops, void* tag, void* reserved) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_call_error err; GRPC_API_TRACE( diff --git a/src/core/lib/surface/call_details.cc b/src/core/lib/surface/call_details.cc index 7d81ba9e22a..cd0b14586a3 100644 --- a/src/core/lib/surface/call_details.cc +++ b/src/core/lib/surface/call_details.cc @@ -34,7 +34,7 @@ void grpc_call_details_init(grpc_call_details* cd) { void grpc_call_details_destroy(grpc_call_details* cd) { GRPC_API_TRACE("grpc_call_details_destroy(cd=%p)", 1, (cd)); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_slice_unref_internal(cd->method); grpc_slice_unref_internal(cd->host); } diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc index b44096fc329..cf5e8c2150d 100644 --- a/src/core/lib/surface/channel.cc +++ b/src/core/lib/surface/channel.cc @@ -248,7 +248,7 @@ char* grpc_channel_get_target(grpc_channel* channel) { void grpc_channel_get_info(grpc_channel* channel, const grpc_channel_info* channel_info) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_element* elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CHANNEL(channel), 0); elem->filter->get_channel_info(elem, channel_info); @@ -296,7 +296,7 @@ grpc_call* grpc_channel_create_call(grpc_channel* channel, grpc_slice method, const grpc_slice* host, gpr_timespec deadline, void* reserved) { GPR_ASSERT(!reserved); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_call* call = grpc_channel_create_call_internal( channel, parent_call, propagation_mask, cq, nullptr, grpc_mdelem_from_slices(GRPC_MDSTR_PATH, grpc_slice_ref_internal(method)), @@ -329,7 +329,7 @@ void* grpc_channel_register_call(grpc_channel* channel, const char* method, "grpc_channel_register_call(channel=%p, method=%s, host=%s, reserved=%p)", 4, (channel, method, host, reserved)); GPR_ASSERT(!reserved); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; rc->path = grpc_mdelem_from_slices( GRPC_MDSTR_PATH, @@ -364,7 +364,7 @@ grpc_call* grpc_channel_create_registered_call( registered_call_handle, deadline.tv_sec, deadline.tv_nsec, (int)deadline.clock_type, reserved)); GPR_ASSERT(!reserved); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_call* call = grpc_channel_create_call_internal( channel, parent_call, propagation_mask, completion_queue, nullptr, GRPC_MDELEM_REF(rc->path), GRPC_MDELEM_REF(rc->authority), @@ -407,7 +407,7 @@ static void destroy_channel(void* arg, grpc_error* error) { void grpc_channel_destroy(grpc_channel* channel) { grpc_transport_op* op = grpc_make_transport_op(nullptr); grpc_channel_element* elem; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE("grpc_channel_destroy(channel=%p)", 1, (channel)); op->disconnect_with_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Channel Destroyed"); diff --git a/src/core/lib/surface/channel_ping.cc b/src/core/lib/surface/channel_ping.cc index c44307df8d8..616ba9e0ac5 100644 --- a/src/core/lib/surface/channel_ping.cc +++ b/src/core/lib/surface/channel_ping.cc @@ -51,7 +51,7 @@ void grpc_channel_ping(grpc_channel* channel, grpc_completion_queue* cq, ping_result* pr = (ping_result*)gpr_malloc(sizeof(*pr)); grpc_channel_element* top_elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT(reserved == nullptr); pr->tag = tag; pr->cq = cq; diff --git a/src/core/lib/surface/completion_queue.cc b/src/core/lib/surface/completion_queue.cc index 958318f814c..12385b71304 100644 --- a/src/core/lib/surface/completion_queue.cc +++ b/src/core/lib/surface/completion_queue.cc @@ -353,7 +353,7 @@ int grpc_completion_queue_thread_local_cache_flush(grpc_completion_queue* cq, if (storage != nullptr && (grpc_completion_queue*)gpr_tls_get(&g_cached_cq) == cq) { *tag = storage->tag; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; *ok = (storage->next & (uintptr_t)(1)) == 1; storage->done(storage->done_arg, storage); ret = 1; @@ -389,7 +389,7 @@ static bool cq_event_queue_push(grpc_cq_event_queue* q, grpc_cq_completion* c) { static grpc_cq_completion* cq_event_queue_pop(grpc_cq_event_queue* q) { grpc_cq_completion* c = nullptr; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; if (gpr_spinlock_trylock(&q->queue_lock)) { GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_SUCCESSES(); @@ -434,7 +434,7 @@ grpc_completion_queue* grpc_completion_queue_create_internal( const cq_poller_vtable* poller_vtable = &g_poller_vtable_by_poller_type[polling_type]; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_STATS_INC_CQS_CREATED(); cq = (grpc_completion_queue*)gpr_zalloc(sizeof(grpc_completion_queue) + @@ -868,7 +868,7 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline, nullptr, nullptr, true}; - ExecCtxNext _local_exec_ctx(&is_finished_arg); + ExecCtxNext exec_ctx(&is_finished_arg); for (;;) { grpc_millis iteration_deadline = deadline_millis; @@ -1111,7 +1111,7 @@ static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, nullptr, tag, true}; - ExecCtxPluck _local_exec_ctx(&is_finished_arg); + ExecCtxPluck exec_ctx(&is_finished_arg); for (;;) { if (is_finished_arg.stolen_completion != nullptr) { gpr_mu_unlock(cq->mu); @@ -1240,7 +1240,7 @@ static void cq_shutdown_pluck(grpc_completion_queue* cq) { /* Shutdown simply drops a ref that we reserved at creation time; if we drop to zero here, then enter shutdown mode and wake up any waiters */ void grpc_completion_queue_shutdown(grpc_completion_queue* cq) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GPR_TIMER_BEGIN("grpc_completion_queue_shutdown", 0); GRPC_API_TRACE("grpc_completion_queue_shutdown(cq=%p)", 1, (cq)); cq->vtable->shutdown(cq); @@ -1253,7 +1253,7 @@ void grpc_completion_queue_destroy(grpc_completion_queue* cq) { GPR_TIMER_BEGIN("grpc_completion_queue_destroy", 0); grpc_completion_queue_shutdown(cq); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_CQ_INTERNAL_UNREF(cq, "destroy"); GPR_TIMER_END("grpc_completion_queue_destroy", 0); diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index e6ff475a90a..f96d8eba6c0 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -157,7 +157,7 @@ void grpc_shutdown(void) { gpr_mu_lock(&g_init_mu); if (--g_initializations == 0) { { - grpc_core::ExecCtx _local_exec_ctx(0); + grpc_core::ExecCtx exec_ctx(0); { grpc_executor_shutdown(); grpc_timer_manager_set_threading( diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index d79f9a9ab21..011f5eae8bc 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/src/core/lib/surface/lame_client.cc @@ -154,7 +154,7 @@ extern "C" const grpc_channel_filter grpc_lame_filter = { grpc_channel* grpc_lame_client_channel_create(const char* target, grpc_status_code error_code, const char* error_message) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_element* elem; grpc_channel* channel = grpc_channel_create(target, nullptr, GRPC_CLIENT_LAME_CHANNEL, nullptr); diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc index e003b5410bf..e9c92b04dce 100644 --- a/src/core/lib/surface/server.cc +++ b/src/core/lib/surface/server.cc @@ -1015,7 +1015,7 @@ static void start_listeners(void* s, grpc_error* error) { void grpc_server_start(grpc_server* server) { size_t i; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE("grpc_server_start(server=%p)", 1, (server)); @@ -1161,7 +1161,7 @@ void grpc_server_shutdown_and_notify(grpc_server* server, listener* l; shutdown_tag* sdt; channel_broadcaster broadcaster; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE("grpc_server_shutdown_and_notify(server=%p, cq=%p, tag=%p)", 3, (server, cq, tag)); @@ -1220,7 +1220,7 @@ void grpc_server_shutdown_and_notify(grpc_server* server, void grpc_server_cancel_all_calls(grpc_server* server) { channel_broadcaster broadcaster; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE("grpc_server_cancel_all_calls(server=%p)", 1, (server)); @@ -1235,7 +1235,7 @@ void grpc_server_cancel_all_calls(grpc_server* server) { void grpc_server_destroy(grpc_server* server) { listener* l; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE("grpc_server_destroy(server=%p)", 1, (server)); @@ -1317,7 +1317,7 @@ grpc_call_error grpc_server_request_call( grpc_completion_queue* cq_bound_to_call, grpc_completion_queue* cq_for_notification, void* tag) { grpc_call_error error; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; requested_call* rc = (requested_call*)gpr_malloc(sizeof(*rc)); GRPC_STATS_INC_SERVER_REQUESTED_CALLS(); GRPC_API_TRACE( @@ -1364,7 +1364,7 @@ grpc_call_error grpc_server_request_registered_call( grpc_completion_queue* cq_bound_to_call, grpc_completion_queue* cq_for_notification, void* tag) { grpc_call_error error; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; requested_call* rc = (requested_call*)gpr_malloc(sizeof(*rc)); registered_method* rm = (registered_method*)rmp; GRPC_STATS_INC_SERVER_REQUESTED_CALLS(); diff --git a/src/cpp/common/channel_arguments.cc b/src/cpp/common/channel_arguments.cc index 82d687c530d..f1984134981 100644 --- a/src/cpp/common/channel_arguments.cc +++ b/src/cpp/common/channel_arguments.cc @@ -67,7 +67,7 @@ ChannelArguments::ChannelArguments(const ChannelArguments& other) } ChannelArguments::~ChannelArguments() { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; for (auto it = args_.begin(); it != args_.end(); ++it) { if (it->type == GRPC_ARG_POINTER) { it->value.pointer.vtable->destroy(it->value.pointer.p); @@ -95,7 +95,7 @@ void ChannelArguments::SetSocketMutator(grpc_socket_mutator* mutator) { } grpc_arg mutator_arg = grpc_socket_mutator_to_arg(mutator); bool replaced = false; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; for (auto it = args_.begin(); it != args_.end(); ++it) { if (it->type == mutator_arg.type && grpc::string(it->key) == grpc::string(mutator_arg.key)) { diff --git a/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm b/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm index 7a09e8f3952..d1309713644 100644 --- a/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm +++ b/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm @@ -110,7 +110,7 @@ static void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { static void cronet_init_client_simple_ssl_secure_fullstack( grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; stream_engine *cronetEngine = [Cronet getGlobalEngine]; grpc_channel_args *new_client_args = grpc_channel_args_copy(client_args); diff --git a/test/core/backoff/backoff_test.cc b/test/core/backoff/backoff_test.cc index 2cd97d80556..d3115fe1ddc 100644 --- a/test/core/backoff/backoff_test.cc +++ b/test/core/backoff/backoff_test.cc @@ -33,7 +33,7 @@ static void test_constant_backoff(void) { const grpc_millis max_backoff = 1000; grpc_backoff_init(&backoff, initial_backoff, multiplier, jitter, min_connect_timeout, max_backoff); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_backoff_result next_deadlines = grpc_backoff_begin(&backoff); GPR_ASSERT(next_deadlines.current_deadline - grpc_core::ExecCtx::Get()->Now() == @@ -62,7 +62,7 @@ static void test_min_connect(void) { const grpc_millis max_backoff = 1000; grpc_backoff_init(&backoff, initial_backoff, multiplier, jitter, min_connect_timeout, max_backoff); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_backoff_result next = grpc_backoff_begin(&backoff); // Because the min_connect_timeout > initial_backoff, current_deadline is used // as the deadline for the current attempt. @@ -85,7 +85,7 @@ static void test_no_jitter_backoff(void) { min_connect_timeout, max_backoff); // x_1 = 2 // x_n = 2**i + x_{i-1} ( = 2**(n+1) - 2 ) - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_core::ExecCtx::Get()->TestOnlySetNow(0); grpc_backoff_result next_deadlines = grpc_backoff_begin(&backoff); GPR_ASSERT(next_deadlines.current_deadline == @@ -141,7 +141,7 @@ static void test_jitter_backoff(void) { backoff.rng_state = 0; // force consistent PRNG - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_backoff_result next_deadlines = grpc_backoff_begin(&backoff); GPR_ASSERT(next_deadlines.current_deadline - grpc_core::ExecCtx::Get()->Now() == diff --git a/test/core/bad_client/bad_client.cc b/test/core/bad_client/bad_client.cc index 267933ff623..f63a32ea5b5 100644 --- a/test/core/bad_client/bad_client.cc +++ b/test/core/bad_client/bad_client.cc @@ -57,7 +57,7 @@ static void done_write(void* arg, grpc_error* error) { static void server_setup_transport(void* ts, grpc_transport* transport) { thd_args* a = (thd_args*)ts; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_server_setup_transport(a->server, transport, nullptr, grpc_server_get_channel_args(a->server)); } @@ -80,7 +80,7 @@ void grpc_run_bad_client_test( grpc_slice_from_copied_buffer(client_payload, client_payload_length); grpc_slice_buffer outgoing; grpc_closure done_write_closure; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_completion_queue* shutdown_cq; if (client_payload_length < 4 * 1024) { diff --git a/test/core/channel/channel_args_test.cc b/test/core/channel/channel_args_test.cc index 99a6566a1cd..4a8195e984e 100644 --- a/test/core/channel/channel_args_test.cc +++ b/test/core/channel/channel_args_test.cc @@ -26,7 +26,7 @@ #include "test/core/util/test_config.h" static void test_create(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_arg arg_int; grpc_arg arg_string; @@ -59,7 +59,7 @@ static void test_create(void) { } static void test_set_compression_algorithm(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args* ch_args; ch_args = @@ -73,7 +73,7 @@ static void test_set_compression_algorithm(void) { } static void test_compression_algorithm_states(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args *ch_args, *ch_args_wo_gzip, *ch_args_wo_gzip_deflate; unsigned states_bitset; size_t i; @@ -134,7 +134,7 @@ static void test_set_socket_mutator(void) { GPR_ASSERT(ch_args->args[0].type == GRPC_ARG_POINTER); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(ch_args); } } diff --git a/test/core/channel/channel_stack_test.cc b/test/core/channel/channel_stack_test.cc index 93ddd0fee59..ef43facd6ed 100644 --- a/test/core/channel/channel_stack_test.cc +++ b/test/core/channel/channel_stack_test.cc @@ -95,7 +95,7 @@ static void test_create_channel_stack(void) { grpc_channel_args chan_args; int* channel_data; int* call_data; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_slice path = grpc_slice_from_static_string("/service/method"); arg.type = GRPC_ARG_INTEGER; diff --git a/test/core/channel/minimal_stack_is_minimal_test.cc b/test/core/channel/minimal_stack_is_minimal_test.cc index 2373bc6329b..3495f603e4f 100644 --- a/test/core/channel/minimal_stack_is_minimal_test.cc +++ b/test/core/channel/minimal_stack_is_minimal_test.cc @@ -125,7 +125,7 @@ static int check_stack(const char* file, int line, const char* transport_name, grpc_channel_stack_builder_set_transport(builder, &fake_transport); } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_stack_builder_set_channel_arguments(builder, channel_args); GPR_ASSERT(grpc_channel_init_create_stack( builder, (grpc_channel_stack_type)channel_stack_type)); @@ -210,7 +210,7 @@ static int check_stack(const char* file, int line, const char* transport_name, gpr_free(expect); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_stack_builder_destroy(builder); grpc_channel_args_destroy(channel_args); } diff --git a/test/core/client_channel/lb_policies_test.cc b/test/core/client_channel/lb_policies_test.cc index 590f9346570..847ea0066ba 100644 --- a/test/core/client_channel/lb_policies_test.cc +++ b/test/core/client_channel/lb_policies_test.cc @@ -651,7 +651,7 @@ static void test_get_channel_info() { grpc_channel_args* args = grpc_channel_args_copy_and_add(nullptr, &arg, 1); channel = grpc_insecure_channel_create("ipv4:127.0.0.1:1234", args, nullptr); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(args); } // Ensures that resolver returns. @@ -958,7 +958,7 @@ static void verify_rebirth_round_robin(const servers_fixture* f, } int main(int argc, char** argv) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; test_spec* spec; size_t i; const size_t NUM_ITERS = 10; diff --git a/test/core/client_channel/parse_address_test.cc b/test/core/client_channel/parse_address_test.cc index 21c86d01f1a..6d56961d84a 100644 --- a/test/core/client_channel/parse_address_test.cc +++ b/test/core/client_channel/parse_address_test.cc @@ -34,7 +34,7 @@ #ifdef GRPC_HAVE_UNIX_SOCKET static void test_grpc_parse_unix(const char* uri_text, const char* pathname) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_uri* uri = grpc_uri_parse(uri_text, 0); grpc_resolved_address addr; @@ -54,7 +54,7 @@ static void test_grpc_parse_unix(const char* uri_text, const char* pathname) {} static void test_grpc_parse_ipv4(const char* uri_text, const char* host, unsigned short port) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_uri* uri = grpc_uri_parse(uri_text, 0); grpc_resolved_address addr; char ntop_buf[INET_ADDRSTRLEN]; @@ -72,7 +72,7 @@ static void test_grpc_parse_ipv4(const char* uri_text, const char* host, static void test_grpc_parse_ipv6(const char* uri_text, const char* host, unsigned short port, uint32_t scope_id) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_uri* uri = grpc_uri_parse(uri_text, 0); grpc_resolved_address addr; char ntop_buf[INET6_ADDRSTRLEN]; diff --git a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc index f6d7731a6d3..18a795fbcb2 100644 --- a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc @@ -105,7 +105,7 @@ static bool wait_loop(int deadline_seconds, gpr_event* ev) { if (gpr_event_wait(ev, grpc_timeout_seconds_to_deadline(1))) return true; deadline_seconds--; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_timer_check(nullptr); } return false; @@ -148,7 +148,7 @@ int main(int argc, char** argv) { grpc_channel_args* result = (grpc_channel_args*)1; { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resolver* resolver = create_resolver("dns:test"); gpr_event ev1; gpr_event_init(&ev1); diff --git a/test/core/client_channel/resolvers/dns_resolver_test.cc b/test/core/client_channel/resolvers/dns_resolver_test.cc index 63d1287521d..80667908ef2 100644 --- a/test/core/client_channel/resolvers/dns_resolver_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_test.cc @@ -28,7 +28,7 @@ static grpc_combiner* g_combiner; static void test_succeeds(grpc_resolver_factory* factory, const char* string) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_uri* uri = grpc_uri_parse(string, 0); grpc_resolver_args args; grpc_resolver* resolver; @@ -45,7 +45,7 @@ static void test_succeeds(grpc_resolver_factory* factory, const char* string) { } static void test_fails(grpc_resolver_factory* factory, const char* string) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_uri* uri = grpc_uri_parse(string, 0); grpc_resolver_args args; grpc_resolver* resolver; @@ -80,7 +80,7 @@ int main(int argc, char** argv) { grpc_resolver_factory_unref(dns); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_COMBINER_UNREF(g_combiner, "test"); } grpc_shutdown(); diff --git a/test/core/client_channel/resolvers/fake_resolver_test.cc b/test/core/client_channel/resolvers/fake_resolver_test.cc index ecfe43f9b7f..d85cbb1d036 100644 --- a/test/core/client_channel/resolvers/fake_resolver_test.cc +++ b/test/core/client_channel/resolvers/fake_resolver_test.cc @@ -72,7 +72,7 @@ void on_resolution_cb(void* arg, grpc_error* error) { } static void test_fake_resolver() { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_combiner* combiner = grpc_combiner_create(); // Create resolver. grpc_fake_resolver_response_generator* response_generator = diff --git a/test/core/client_channel/resolvers/sockaddr_resolver_test.cc b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc index f3711c151ef..4d16a779245 100644 --- a/test/core/client_channel/resolvers/sockaddr_resolver_test.cc +++ b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc @@ -41,7 +41,7 @@ void on_resolution_cb(void* arg, grpc_error* error) { } static void test_succeeds(grpc_resolver_factory* factory, const char* string) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_uri* uri = grpc_uri_parse(string, 0); grpc_resolver_args args; grpc_resolver* resolver; @@ -68,7 +68,7 @@ static void test_succeeds(grpc_resolver_factory* factory, const char* string) { } static void test_fails(grpc_resolver_factory* factory, const char* string) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_uri* uri = grpc_uri_parse(string, 0); grpc_resolver_args args; grpc_resolver* resolver; @@ -111,7 +111,7 @@ int main(int argc, char** argv) { grpc_resolver_factory_unref(ipv6); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_COMBINER_UNREF(g_combiner, "test"); } grpc_shutdown(); diff --git a/test/core/client_channel/uri_fuzzer_test.cc b/test/core/client_channel/uri_fuzzer_test.cc index 8f1f5e2eda2..ee384531661 100644 --- a/test/core/client_channel/uri_fuzzer_test.cc +++ b/test/core/client_channel/uri_fuzzer_test.cc @@ -37,7 +37,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_init(); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_uri* x; if ((x = grpc_uri_parse(s, 1))) { grpc_uri_destroy(x); diff --git a/test/core/client_channel/uri_parser_test.cc b/test/core/client_channel/uri_parser_test.cc index 33cf82d17c7..254bfddfb3c 100644 --- a/test/core/client_channel/uri_parser_test.cc +++ b/test/core/client_channel/uri_parser_test.cc @@ -29,7 +29,7 @@ static void test_succeeds(const char* uri_text, const char* scheme, const char* authority, const char* path, const char* query, const char* fragment) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_uri* uri = grpc_uri_parse(uri_text, 0); GPR_ASSERT(uri); GPR_ASSERT(0 == strcmp(scheme, uri->scheme)); @@ -42,13 +42,13 @@ static void test_succeeds(const char* uri_text, const char* scheme, } static void test_fails(const char* uri_text) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT(nullptr == grpc_uri_parse(uri_text, 0)); } static void test_query_parts() { { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; const char* uri_text = "http://foo/path?a&b=B&c=&#frag"; grpc_uri* uri = grpc_uri_parse(uri_text, 0); GPR_ASSERT(uri); @@ -82,7 +82,7 @@ static void test_query_parts() { } { /* test the current behavior of multiple query part values */ - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; const char* uri_text = "http://auth/path?foo=bar=baz&foobar=="; grpc_uri* uri = grpc_uri_parse(uri_text, 0); GPR_ASSERT(uri); @@ -100,7 +100,7 @@ static void test_query_parts() { } { /* empty query */ - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; const char* uri_text = "http://foo/path"; grpc_uri* uri = grpc_uri_parse(uri_text, 0); GPR_ASSERT(uri); diff --git a/test/core/compression/algorithm_test.cc b/test/core/compression/algorithm_test.cc index b0613c4b7d1..9e811e9af19 100644 --- a/test/core/compression/algorithm_test.cc +++ b/test/core/compression/algorithm_test.cc @@ -39,7 +39,7 @@ static void test_algorithm_mesh(void) { grpc_compression_algorithm parsed; grpc_slice mdstr; grpc_mdelem mdelem; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT( grpc_compression_algorithm_name((grpc_compression_algorithm)i, &name)); GPR_ASSERT(grpc_compression_algorithm_parse( @@ -61,7 +61,7 @@ static void test_algorithm_mesh(void) { } static void test_algorithm_failure(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_slice mdstr; gpr_log(GPR_DEBUG, "test_algorithm_failure"); diff --git a/test/core/compression/message_compress_test.cc b/test/core/compression/message_compress_test.cc index 0145b4f4020..6ca07b70c4f 100644 --- a/test/core/compression/message_compress_test.cc +++ b/test/core/compression/message_compress_test.cc @@ -70,7 +70,7 @@ static void assert_passthrough(grpc_slice value, grpc_split_slices_to_buffer(uncompressed_split_mode, &value, 1, &input); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; was_compressed = grpc_msg_compress(algorithm, &input, &compressed_raw); } GPR_ASSERT(input.count > 0); @@ -90,7 +90,7 @@ static void assert_passthrough(grpc_slice value, grpc_split_slice_buffer(compressed_split_mode, &compressed_raw, &compressed); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT(grpc_msg_decompress( was_compressed ? algorithm : GRPC_COMPRESS_NONE, &compressed, &output)); } @@ -152,7 +152,7 @@ static void test_tiny_data_compress(void) { for (int i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { if (i == GRPC_COMPRESS_NONE) continue; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT(0 == grpc_msg_compress(static_cast(i), &input, &output)); @@ -176,7 +176,7 @@ static void test_bad_decompression_data_crc(void) { grpc_slice_buffer_init(&output); grpc_slice_buffer_add(&input, create_test_value(ONE_MB_A)); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; /* compress it */ grpc_msg_compress(GRPC_COMPRESS_GZIP, &input, &corrupted); /* corrupt the output by smashing the CRC */ @@ -205,7 +205,7 @@ static void test_bad_decompression_data_trailing_garbage(void) { "\x78\xda\x63\x60\x60\x60\x00\x00\x00\x04\x00\x01\x99", 13)); /* try (and fail) to decompress the invalid compresed buffer */ - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT(0 == grpc_msg_decompress(GRPC_COMPRESS_DEFLATE, &input, &output)); grpc_slice_buffer_destroy(&input); @@ -222,7 +222,7 @@ static void test_bad_decompression_data_stream(void) { grpc_slice_from_copied_buffer("\x78\xda\xff\xff", 4)); /* try (and fail) to decompress the invalid compresed buffer */ - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT(0 == grpc_msg_decompress(GRPC_COMPRESS_DEFLATE, &input, &output)); grpc_slice_buffer_destroy(&input); @@ -239,7 +239,7 @@ static void test_bad_compression_algorithm(void) { grpc_slice_buffer_add( &input, grpc_slice_from_copied_string("Never gonna give you up")); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; was_compressed = grpc_msg_compress(GRPC_COMPRESS_ALGORITHMS_COUNT, &input, &output); GPR_ASSERT(0 == was_compressed); @@ -263,7 +263,7 @@ static void test_bad_decompression_algorithm(void) { grpc_slice_buffer_add(&input, grpc_slice_from_copied_string( "I'm not really compressed but it doesn't matter")); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; was_decompressed = grpc_msg_decompress(GRPC_COMPRESS_ALGORITHMS_COUNT, &input, &output); GPR_ASSERT(0 == was_decompressed); diff --git a/test/core/debug/stats_test.cc b/test/core/debug/stats_test.cc index 1623e7c8a4e..e60e54b2fdc 100644 --- a/test/core/debug/stats_test.cc +++ b/test/core/debug/stats_test.cc @@ -49,7 +49,7 @@ TEST(StatsTest, IncCounters) { for (int i = 0; i < GRPC_STATS_COUNTER_COUNT; i++) { Snapshot snapshot; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_STATS_INC_COUNTER((grpc_stats_counters)i); EXPECT_EQ(snapshot.delta().counters[i], 1); @@ -59,7 +59,7 @@ TEST(StatsTest, IncCounters) { TEST(StatsTest, IncSpecificCounter) { Snapshot snapshot; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_STATS_INC_SYSCALL_POLL(); EXPECT_EQ(snapshot.delta().counters[GRPC_STATS_COUNTER_SYSCALL_POLL], 1); @@ -92,7 +92,7 @@ TEST_P(HistogramTest, IncHistogram) { for (auto j : test_values) { Snapshot snapshot; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_stats_inc_histogram[kHistogram](j); auto delta = snapshot.delta(); diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc index b65ba522ac5..1ce0dc5bf84 100644 --- a/test/core/end2end/bad_server_response_test.cc +++ b/test/core/end2end/bad_server_response_test.cc @@ -269,7 +269,7 @@ static void run_test(const char* response_payload, grpc_status_code expected_status, const char* expected_detail) { test_tcp_server test_server; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_event ev; grpc_init(); diff --git a/test/core/end2end/connection_refused_test.cc b/test/core/end2end/connection_refused_test.cc index 9904c1384cb..ca6d17e7c89 100644 --- a/test/core/end2end/connection_refused_test.cc +++ b/test/core/end2end/connection_refused_test.cc @@ -133,7 +133,7 @@ static void run_test(bool wait_for_ready, bool use_service_config) { grpc_metadata_array_destroy(&trailing_metadata_recv); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; if (args != nullptr) grpc_channel_args_destroy(args); } diff --git a/test/core/end2end/fixtures/h2_census.cc b/test/core/end2end/fixtures/h2_census.cc index 60aafc3b94d..75c80aa1ffd 100644 --- a/test/core/end2end/fixtures/h2_census.cc +++ b/test/core/end2end/fixtures/h2_census.cc @@ -75,7 +75,7 @@ void chttp2_init_client_fullstack(grpc_end2end_test_fixture* f, grpc_insecure_channel_create(ffd->localaddr, client_args, nullptr); GPR_ASSERT(f->client); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(client_args); } } @@ -91,7 +91,7 @@ void chttp2_init_server_fullstack(grpc_end2end_test_fixture* f, server_args = grpc_channel_args_copy_and_add(server_args, &arg, 1); f->server = grpc_server_create(server_args, nullptr); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(server_args); } grpc_server_register_completion_queue(f->server, f->cq, nullptr); diff --git a/test/core/end2end/fixtures/h2_compress.cc b/test/core/end2end/fixtures/h2_compress.cc index 040c041f386..5b9181586cb 100644 --- a/test/core/end2end/fixtures/h2_compress.cc +++ b/test/core/end2end/fixtures/h2_compress.cc @@ -66,7 +66,7 @@ void chttp2_init_client_fullstack_compression(grpc_end2end_test_fixture* f, fullstack_compression_fixture_data* ffd = static_cast(f->fixture_data); if (ffd->client_args_compression != nullptr) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(ffd->client_args_compression); } ffd->client_args_compression = grpc_channel_args_set_compression_algorithm( @@ -80,7 +80,7 @@ void chttp2_init_server_fullstack_compression(grpc_end2end_test_fixture* f, fullstack_compression_fixture_data* ffd = static_cast(f->fixture_data); if (ffd->server_args_compression != nullptr) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(ffd->server_args_compression); } ffd->server_args_compression = grpc_channel_args_set_compression_algorithm( @@ -95,7 +95,7 @@ void chttp2_init_server_fullstack_compression(grpc_end2end_test_fixture* f, } void chttp2_tear_down_fullstack_compression(grpc_end2end_test_fixture* f) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; fullstack_compression_fixture_data* ffd = static_cast(f->fixture_data); grpc_channel_args_destroy(ffd->client_args_compression); diff --git a/test/core/end2end/fixtures/h2_fd.cc b/test/core/end2end/fixtures/h2_fd.cc index 85f5061ee80..9157ab04d0d 100644 --- a/test/core/end2end/fixtures/h2_fd.cc +++ b/test/core/end2end/fixtures/h2_fd.cc @@ -68,7 +68,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* client_args) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; sp_fixture_data* sfd = static_cast(f->fixture_data); GPR_ASSERT(!f->client); @@ -79,7 +79,7 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* server_args) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; sp_fixture_data* sfd = static_cast(f->fixture_data); GPR_ASSERT(!f->server); f->server = grpc_server_create(server_args, nullptr); diff --git a/test/core/end2end/fixtures/h2_full+workarounds.cc b/test/core/end2end/fixtures/h2_full+workarounds.cc index 2f9a9d4c4b0..237841d1854 100644 --- a/test/core/end2end/fixtures/h2_full+workarounds.cc +++ b/test/core/end2end/fixtures/h2_full+workarounds.cc @@ -72,7 +72,7 @@ void chttp2_init_client_fullstack(grpc_end2end_test_fixture* f, void chttp2_init_server_fullstack(grpc_end2end_test_fixture* f, grpc_channel_args* server_args) { int i; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; fullstack_fixture_data* ffd = static_cast(f->fixture_data); grpc_arg args[GRPC_MAX_WORKAROUND_ID]; diff --git a/test/core/end2end/fixtures/h2_load_reporting.cc b/test/core/end2end/fixtures/h2_load_reporting.cc index 61853740ab8..fda5f4b052b 100644 --- a/test/core/end2end/fixtures/h2_load_reporting.cc +++ b/test/core/end2end/fixtures/h2_load_reporting.cc @@ -78,7 +78,7 @@ void chttp2_init_server_load_reporting(grpc_end2end_test_fixture* f, server_args = grpc_channel_args_copy_and_add(server_args, &arg, 1); f->server = grpc_server_create(server_args, nullptr); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(server_args); } grpc_server_register_completion_queue(f->server, f->cq, nullptr); diff --git a/test/core/end2end/fixtures/h2_oauth2.cc b/test/core/end2end/fixtures/h2_oauth2.cc index 40ca2a77fb4..5fed4434dec 100644 --- a/test/core/end2end/fixtures/h2_oauth2.cc +++ b/test/core/end2end/fixtures/h2_oauth2.cc @@ -143,7 +143,7 @@ void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture* f) { static void chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack( grpc_end2end_test_fixture* f, grpc_channel_args* client_args) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_credentials* ssl_creds = grpc_ssl_credentials_create(test_root_cert, nullptr, nullptr); grpc_call_credentials* oauth2_creds = grpc_md_only_test_credentials_create( diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.cc b/test/core/end2end/fixtures/h2_sockpair+trace.cc index 574b7555397..447bb91d0c8 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.cc +++ b/test/core/end2end/fixtures/h2_sockpair+trace.cc @@ -50,7 +50,7 @@ static void server_setup_transport(void* ts, grpc_transport* transport) { grpc_end2end_test_fixture* f = static_cast(ts); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq)); grpc_server_setup_transport(f->server, transport, nullptr, @@ -87,7 +87,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* client_args) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; sp_client_setup cs; @@ -101,7 +101,7 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* server_args) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; GPR_ASSERT(!f->server); diff --git a/test/core/end2end/fixtures/h2_sockpair.cc b/test/core/end2end/fixtures/h2_sockpair.cc index 304d0dd1faf..c1f8ee0b64c 100644 --- a/test/core/end2end/fixtures/h2_sockpair.cc +++ b/test/core/end2end/fixtures/h2_sockpair.cc @@ -44,7 +44,7 @@ static void server_setup_transport(void* ts, grpc_transport* transport) { grpc_end2end_test_fixture* f = static_cast(ts); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq)); grpc_server_setup_transport(f->server, transport, nullptr, @@ -81,7 +81,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* client_args) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; sp_client_setup cs; @@ -95,7 +95,7 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* server_args) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; GPR_ASSERT(!f->server); diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.cc b/test/core/end2end/fixtures/h2_sockpair_1byte.cc index 0b5ae3abe44..55b847bdae7 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.cc +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.cc @@ -44,7 +44,7 @@ static void server_setup_transport(void* ts, grpc_transport* transport) { grpc_end2end_test_fixture* f = static_cast(ts); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq)); grpc_server_setup_transport(f->server, transport, nullptr, @@ -92,7 +92,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* client_args) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; sp_client_setup cs; @@ -106,7 +106,7 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* server_args) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; GPR_ASSERT(!f->server); diff --git a/test/core/end2end/fixtures/h2_ssl.cc b/test/core/end2end/fixtures/h2_ssl.cc index 4d6fed14e08..9a0680c40ef 100644 --- a/test/core/end2end/fixtures/h2_ssl.cc +++ b/test/core/end2end/fixtures/h2_ssl.cc @@ -110,7 +110,7 @@ static void chttp2_init_client_simple_ssl_secure_fullstack( grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); chttp2_init_client_secure_fullstack(f, new_client_args, ssl_creds); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(new_client_args); } } diff --git a/test/core/end2end/fixtures/h2_ssl_proxy.cc b/test/core/end2end/fixtures/h2_ssl_proxy.cc index aee1388a560..5ddbdefc8c3 100644 --- a/test/core/end2end/fixtures/h2_ssl_proxy.cc +++ b/test/core/end2end/fixtures/h2_ssl_proxy.cc @@ -66,7 +66,7 @@ static grpc_channel* create_proxy_client(const char* target, grpc_secure_channel_create(ssl_creds, target, new_client_args, nullptr); grpc_channel_credentials_release(ssl_creds); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(new_client_args); } return channel; @@ -147,7 +147,7 @@ static void chttp2_init_client_simple_ssl_secure_fullstack( grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); chttp2_init_client_secure_fullstack(f, new_client_args, ssl_creds); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(new_client_args); } } diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc index c49a866a6c2..539bbe41342 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.cc +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -457,7 +457,7 @@ static void on_accept(void* arg, grpc_endpoint* endpoint, static void thread_main(void* arg) { grpc_end2end_http_proxy* proxy = (grpc_end2end_http_proxy*)arg; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; do { gpr_ref(&proxy->users); grpc_pollset_worker* worker = nullptr; @@ -473,7 +473,7 @@ static void thread_main(void* arg) { grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( grpc_channel_args* args) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_end2end_http_proxy* proxy = (grpc_end2end_http_proxy*)gpr_malloc(sizeof(*proxy)); memset(proxy, 0, sizeof(*proxy)); @@ -518,7 +518,7 @@ static void destroy_pollset(void* arg, grpc_error* error) { void grpc_end2end_http_proxy_destroy(grpc_end2end_http_proxy* proxy) { gpr_unref(&proxy->users); // Signal proxy thread to shutdown. - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_thd_join(proxy->thd); grpc_tcp_server_shutdown_listeners(proxy->server); grpc_tcp_server_unref(proxy->server); diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index ce916bd3414..40e9f33ff10 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -748,7 +748,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_init(); grpc_timer_manager_set_threading(false); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_executor_set_threading(false); } grpc_resolve_address = my_resolve_address; @@ -842,7 +842,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { g_channel = grpc_insecure_channel_create(target_uri, args, nullptr); GPR_ASSERT(g_channel != nullptr); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(args); } gpr_free(target_uri); @@ -869,7 +869,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { g_server = grpc_server_create(args, nullptr); GPR_ASSERT(g_server != nullptr); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(args); } grpc_server_register_completion_queue(g_server, cq, nullptr); @@ -1199,7 +1199,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_secure_channel_create(creds, target_uri, args, nullptr); GPR_ASSERT(g_channel != nullptr); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(args); } gpr_free(target_uri); diff --git a/test/core/end2end/fuzzers/client_fuzzer.cc b/test/core/end2end/fuzzers/client_fuzzer.cc index e2fb13936a9..2d3fc7a074b 100644 --- a/test/core/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/end2end/fuzzers/client_fuzzer.cc @@ -44,7 +44,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (leak_check) grpc_memory_counters_init(); grpc_init(); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_executor_set_threading(false); grpc_resource_quota* resource_quota = diff --git a/test/core/end2end/fuzzers/server_fuzzer.cc b/test/core/end2end/fuzzers/server_fuzzer.cc index 4506ff5c0b2..db25160e2b0 100644 --- a/test/core/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/end2end/fuzzers/server_fuzzer.cc @@ -42,7 +42,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (leak_check) grpc_memory_counters_init(); grpc_init(); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_executor_set_threading(false); grpc_resource_quota* resource_quota = diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc index 177731669ea..d50d1f4d81e 100644 --- a/test/core/end2end/h2_ssl_cert_test.cc +++ b/test/core/end2end/h2_ssl_cert_test.cc @@ -181,7 +181,7 @@ typedef enum { NONE, SELF_SIGNED, SIGNED, BAD_CERT_PAIR } certtype; grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); \ chttp2_init_client_secure_fullstack(f, new_client_args, ssl_creds); \ { \ - grpc_core::ExecCtx _local_exec_ctx; \ + grpc_core::ExecCtx exec_ctx; \ grpc_channel_args_destroy(new_client_args); \ } \ } diff --git a/test/core/end2end/tests/cancel_after_accept.cc b/test/core/end2end/tests/cancel_after_accept.cc index 5ce45b4c616..f59caf7e35a 100644 --- a/test/core/end2end/tests/cancel_after_accept.cc +++ b/test/core/end2end/tests/cancel_after_accept.cc @@ -245,7 +245,7 @@ static void test_cancel_after_accept(grpc_end2end_test_config config, grpc_call_unref(s); if (args != nullptr) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(args); } diff --git a/test/core/end2end/tests/cancel_after_round_trip.cc b/test/core/end2end/tests/cancel_after_round_trip.cc index 9bd92b06e38..b10b93978d1 100644 --- a/test/core/end2end/tests/cancel_after_round_trip.cc +++ b/test/core/end2end/tests/cancel_after_round_trip.cc @@ -278,7 +278,7 @@ static void test_cancel_after_round_trip(grpc_end2end_test_config config, grpc_call_unref(s); if (args != nullptr) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(args); } diff --git a/test/core/end2end/tests/compressed_payload.cc b/test/core/end2end/tests/compressed_payload.cc index 93a06c9dfc3..944edc7a70f 100644 --- a/test/core/end2end/tests/compressed_payload.cc +++ b/test/core/end2end/tests/compressed_payload.cc @@ -129,7 +129,7 @@ static void request_for_disabled_algorithm( server_args = grpc_channel_args_set_compression_algorithm(nullptr, GRPC_COMPRESS_NONE); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; server_args = grpc_channel_args_compression_algorithm_set_state( &server_args, algorithm_to_disable, false); } @@ -256,7 +256,7 @@ static void request_for_disabled_algorithm( grpc_byte_buffer_destroy(request_payload_recv); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); } @@ -537,7 +537,7 @@ static void request_with_payload_template( cq_verifier_destroy(cqv); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); } diff --git a/test/core/end2end/tests/load_reporting_hook.cc b/test/core/end2end/tests/load_reporting_hook.cc index 13e3af7ac51..e056bd547b8 100644 --- a/test/core/end2end/tests/load_reporting_hook.cc +++ b/test/core/end2end/tests/load_reporting_hook.cc @@ -300,7 +300,7 @@ static void test_load_reporting_hook(grpc_end2end_test_config config) { &trailing_lr_metadata); end_test(&f); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(lr_server_args); } config.tear_down_data(&f); diff --git a/test/core/end2end/tests/max_message_length.cc b/test/core/end2end/tests/max_message_length.cc index 06243be75b2..e581f1fc20e 100644 --- a/test/core/end2end/tests/max_message_length.cc +++ b/test/core/end2end/tests/max_message_length.cc @@ -173,7 +173,7 @@ static void test_max_message_length_on_request(grpc_end2end_test_config config, f = begin_test(config, "test_max_request_message_length", client_args, server_args); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; if (client_args != nullptr) grpc_channel_args_destroy(client_args); if (server_args != nullptr) grpc_channel_args_destroy(server_args); } @@ -363,7 +363,7 @@ static void test_max_message_length_on_response(grpc_end2end_test_config config, f = begin_test(config, "test_max_response_message_length", client_args, server_args); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; if (client_args != nullptr) grpc_channel_args_destroy(client_args); if (server_args != nullptr) grpc_channel_args_destroy(server_args); } diff --git a/test/core/end2end/tests/stream_compression_compressed_payload.cc b/test/core/end2end/tests/stream_compression_compressed_payload.cc index 4f09df25db8..ec3050ad45f 100644 --- a/test/core/end2end/tests/stream_compression_compressed_payload.cc +++ b/test/core/end2end/tests/stream_compression_compressed_payload.cc @@ -129,7 +129,7 @@ static void request_for_disabled_algorithm( server_args = grpc_channel_args_set_stream_compression_algorithm( nullptr, GRPC_STREAM_COMPRESS_NONE); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; server_args = grpc_channel_args_stream_compression_algorithm_set_state( &server_args, algorithm_to_disable, false); } @@ -257,7 +257,7 @@ static void request_for_disabled_algorithm( grpc_byte_buffer_destroy(request_payload_recv); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); } @@ -545,7 +545,7 @@ static void request_with_payload_template( cq_verifier_destroy(cqv); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); } diff --git a/test/core/end2end/tests/stream_compression_payload.cc b/test/core/end2end/tests/stream_compression_payload.cc index 6a8c9cdcb27..b95e6528cde 100644 --- a/test/core/end2end/tests/stream_compression_payload.cc +++ b/test/core/end2end/tests/stream_compression_payload.cc @@ -277,7 +277,7 @@ static void test_invoke_request_response_with_payload( end_test(&f); config.tear_down_data(&f); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); } diff --git a/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc b/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc index 3e1a532af5c..2a8799ee67b 100644 --- a/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc +++ b/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc @@ -275,7 +275,7 @@ static void test_pingpong_streaming(grpc_end2end_test_config config, end_test(&f); config.tear_down_data(&f); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); } diff --git a/test/core/end2end/tests/workaround_cronet_compression.cc b/test/core/end2end/tests/workaround_cronet_compression.cc index 8c5c9e834fe..d4decce0aa1 100644 --- a/test/core/end2end/tests/workaround_cronet_compression.cc +++ b/test/core/end2end/tests/workaround_cronet_compression.cc @@ -142,7 +142,7 @@ static void request_with_payload_template( nullptr, default_server_channel_compression_algorithm); if (user_agent_override) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args* client_args_old = client_args; grpc_arg arg; arg.key = const_cast(GRPC_ARG_PRIMARY_USER_AGENT_STRING); @@ -350,7 +350,7 @@ static void request_with_payload_template( cq_verifier_destroy(cqv); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(client_args); grpc_channel_args_destroy(server_args); } diff --git a/test/core/http/httpcli_test.cc b/test/core/http/httpcli_test.cc index ed5c03558f3..259e3aa463e 100644 --- a/test/core/http/httpcli_test.cc +++ b/test/core/http/httpcli_test.cc @@ -60,7 +60,7 @@ static void on_finish(void* arg, grpc_error* error) { static void test_get(int port) { grpc_httpcli_request req; char* host; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; g_done = 0; gpr_log(GPR_INFO, "test_get"); @@ -99,7 +99,7 @@ static void test_get(int port) { static void test_post(int port) { grpc_httpcli_request req; char* host; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; g_done = 0; gpr_log(GPR_INFO, "test_post"); @@ -146,7 +146,7 @@ int main(int argc, char** argv) { grpc_init(); { grpc_closure destroyed; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; char* me = argv[0]; char* lslash = strrchr(me, '/'); char* args[4]; diff --git a/test/core/http/httpscli_test.cc b/test/core/http/httpscli_test.cc index 418afb6992e..adf69f1b16f 100644 --- a/test/core/http/httpscli_test.cc +++ b/test/core/http/httpscli_test.cc @@ -60,7 +60,7 @@ static void on_finish(void* arg, grpc_error* error) { static void test_get(int port) { grpc_httpcli_request req; char* host; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; g_done = 0; gpr_log(GPR_INFO, "test_get"); @@ -100,7 +100,7 @@ static void test_get(int port) { static void test_post(int port) { grpc_httpcli_request req; char* host; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; g_done = 0; gpr_log(GPR_INFO, "test_post"); @@ -195,7 +195,7 @@ int main(int argc, char** argv) { test_post(port); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_httpcli_context_destroy(&g_context); GRPC_CLOSURE_INIT(&destroyed, destroy_pops, &g_pops, grpc_schedule_on_exec_ctx); diff --git a/test/core/iomgr/combiner_test.cc b/test/core/iomgr/combiner_test.cc index faa5c3dcbc7..cbcbe7feff0 100644 --- a/test/core/iomgr/combiner_test.cc +++ b/test/core/iomgr/combiner_test.cc @@ -28,7 +28,7 @@ static void test_no_op(void) { gpr_log(GPR_DEBUG, "test_no_op"); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_COMBINER_UNREF(grpc_combiner_create(), "test_no_op"); } @@ -42,7 +42,7 @@ static void test_execute_one(void) { grpc_combiner* lock = grpc_combiner_create(); gpr_event done; gpr_event_init(&done); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(set_event_to_true, &done, grpc_combiner_scheduler(lock)), GRPC_ERROR_NONE); @@ -72,7 +72,7 @@ static void check_one(void* a, grpc_error* error) { static void execute_many_loop(void* a) { thd_args* args = static_cast(a); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; size_t n = 1; for (size_t i = 0; i < 10; i++) { for (size_t j = 0; j < 10000; j++) { @@ -112,7 +112,7 @@ static void test_execute_many(void) { gpr_inf_future(GPR_CLOCK_REALTIME)) != nullptr); gpr_thd_join(thds[i]); } - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_COMBINER_UNREF(lock, "test_execute_many"); } @@ -133,7 +133,7 @@ static void test_execute_finally(void) { gpr_log(GPR_DEBUG, "test_execute_finally"); grpc_combiner* lock = grpc_combiner_create(); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_event_init(&got_in_finally); GRPC_CLOSURE_SCHED( GRPC_CLOSURE_CREATE(add_finally, lock, grpc_combiner_scheduler(lock)), diff --git a/test/core/iomgr/endpoint_pair_test.cc b/test/core/iomgr/endpoint_pair_test.cc index d895a270ada..90dd40d9c48 100644 --- a/test/core/iomgr/endpoint_pair_test.cc +++ b/test/core/iomgr/endpoint_pair_test.cc @@ -32,7 +32,7 @@ static void clean_up(void) {} static grpc_endpoint_test_fixture create_fixture_endpoint_pair( size_t slice_size) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_test_fixture f; grpc_arg a[1]; a[0].key = const_cast(GRPC_ARG_TCP_READ_CHUNK_SIZE); @@ -62,7 +62,7 @@ int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); grpc_pollset_init(g_pollset, &g_mu); grpc_endpoint_tests(configs[0], g_pollset, g_mu); diff --git a/test/core/iomgr/endpoint_tests.cc b/test/core/iomgr/endpoint_tests.cc index c011ab96d96..8ccae520670 100644 --- a/test/core/iomgr/endpoint_tests.cc +++ b/test/core/iomgr/endpoint_tests.cc @@ -173,7 +173,7 @@ static void read_and_write_test(grpc_endpoint_test_config config, struct read_and_write_test_state state; grpc_endpoint_test_fixture f = begin_test(config, "read_and_write_test", slice_size); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); gpr_log(GPR_DEBUG, @@ -277,7 +277,7 @@ static void multiple_shutdown_test(grpc_endpoint_test_config config) { grpc_slice_buffer slice_buffer; grpc_slice_buffer_init(&slice_buffer); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_add_to_pollset(f.client_ep, g_pollset); grpc_endpoint_read(f.client_ep, &slice_buffer, GRPC_CLOSURE_CREATE(inc_on_failure, &fail_count, diff --git a/test/core/iomgr/ev_epollsig_linux_test.cc b/test/core/iomgr/ev_epollsig_linux_test.cc index 45c96ce12d0..750bbf89d45 100644 --- a/test/core/iomgr/ev_epollsig_linux_test.cc +++ b/test/core/iomgr/ev_epollsig_linux_test.cc @@ -130,7 +130,7 @@ static void test_pollset_cleanup(test_pollset* pollsets, int num_pollsets) { #define NUM_POLLSETS 4 static void test_add_fd_to_pollset() { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; test_fd tfds[NUM_FDS]; int fds[NUM_FDS]; test_pollset pollsets[NUM_POLLSETS]; @@ -231,7 +231,7 @@ static __thread int thread_wakeups = 0; static void test_threading_loop(void* arg) { threading_shared* shared = static_cast(arg); while (thread_wakeups < 1000000) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_pollset_worker* worker; gpr_mu_lock(shared->mu); GPR_ASSERT(GRPC_LOG_IF_ERROR( @@ -271,7 +271,7 @@ static void test_threading(void) { shared.wakeup_desc = grpc_fd_create(fd.read_fd, "wakeup"); shared.wakeups = 0; { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_pollset_add_fd(shared.pollset, shared.wakeup_desc); grpc_fd_notify_on_read( shared.wakeup_desc, @@ -286,7 +286,7 @@ static void test_threading(void) { fd.read_fd = 0; grpc_wakeup_fd_destroy(&fd); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_fd_shutdown(shared.wakeup_desc, GRPC_ERROR_CANCELLED); grpc_fd_orphan(shared.wakeup_desc, nullptr, nullptr, false /* already_closed */, "done"); @@ -302,7 +302,7 @@ int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; poll_strategy = grpc_get_poll_strategy_name(); if (poll_strategy != nullptr && strcmp(poll_strategy, "epollsig") == 0) { diff --git a/test/core/iomgr/fd_conservation_posix_test.cc b/test/core/iomgr/fd_conservation_posix_test.cc index f4c8e5a21f4..aaa14010f8d 100644 --- a/test/core/iomgr/fd_conservation_posix_test.cc +++ b/test/core/iomgr/fd_conservation_posix_test.cc @@ -32,7 +32,7 @@ int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; /* set max # of file descriptors to a low value, and verify we can create and destroy many more than this number diff --git a/test/core/iomgr/fd_posix_test.cc b/test/core/iomgr/fd_posix_test.cc index 8eda76cf9b1..cf75517538a 100644 --- a/test/core/iomgr/fd_posix_test.cc +++ b/test/core/iomgr/fd_posix_test.cc @@ -246,7 +246,7 @@ static int server_start(server* sv) { static void server_wait_and_shutdown(server* sv) { gpr_mu_lock(g_mu); while (!sv->done) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", @@ -362,7 +362,7 @@ static void client_wait_and_shutdown(client* cl) { gpr_mu_lock(g_mu); while (!cl->done) { grpc_pollset_worker* worker = nullptr; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE))); @@ -380,7 +380,7 @@ static void test_grpc_fd(void) { server sv; client cl; int port; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; server_init(&sv); port = server_start(&sv); @@ -436,7 +436,7 @@ static void test_grpc_fd_change(void) { ssize_t result; grpc_closure first_closure; grpc_closure second_closure; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_CLOSURE_INIT(&first_closure, first_read_callback, &a, grpc_schedule_on_exec_ctx); @@ -516,7 +516,7 @@ int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); grpc_pollset_init(g_pollset, &g_mu); test_grpc_fd(); diff --git a/test/core/iomgr/pollset_set_test.cc b/test/core/iomgr/pollset_set_test.cc index cf9c82b4821..f27079134b8 100644 --- a/test/core/iomgr/pollset_set_test.cc +++ b/test/core/iomgr/pollset_set_test.cc @@ -199,7 +199,7 @@ static void pollset_set_test_basic() { * | * +---> FD9 (Added after PS2 is added to PSS0) */ - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_pollset_worker* worker; grpc_millis deadline; @@ -301,7 +301,7 @@ void pollset_set_test_dup_fds() { * | +--> FD2 * +---> FD1 */ - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_pollset_worker* worker; grpc_millis deadline; @@ -371,7 +371,7 @@ void pollset_set_test_empty_pollset() { * | * +---> FD2 */ - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_pollset_worker* worker; grpc_millis deadline; @@ -424,7 +424,7 @@ int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; const char* poll_strategy = grpc_get_poll_strategy_name(); if (poll_strategy != nullptr && diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index 45a5e5a0b13..d37d79fed30 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -81,7 +81,7 @@ static void actually_poll(void* argsp) { args_struct* args = static_cast(argsp); grpc_millis deadline = n_sec_deadline(10); while (true) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; bool done = gpr_atm_acq_load(&args->done_atm) != 0; if (done) { break; @@ -120,7 +120,7 @@ static void must_fail(void* argsp, grpc_error* err) { } static void test_unix_socket(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; args_struct args; args_init(&args); poll_pollset_until_request_done(&args); @@ -132,7 +132,7 @@ static void test_unix_socket(void) { } static void test_unix_socket_path_name_too_long(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; args_struct args; args_init(&args); const char prefix[] = "unix:/path/name"; @@ -158,7 +158,7 @@ int main(int argc, char** argv) { grpc_init(); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; test_unix_socket(); test_unix_socket_path_name_too_long(); } diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc index e6986f332ba..a0dc484f3e4 100644 --- a/test/core/iomgr/resolve_address_test.cc +++ b/test/core/iomgr/resolve_address_test.cc @@ -74,7 +74,7 @@ static grpc_millis n_sec_deadline(int seconds) { } static void poll_pollset_until_request_done(args_struct* args) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_millis deadline = n_sec_deadline(10); while (true) { bool done = gpr_atm_acq_load(&args->done_atm) != 0; @@ -115,7 +115,7 @@ static void must_fail(void* argsp, grpc_error* err) { } static void test_localhost(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; args_struct args; args_init(&args); grpc_resolve_address( @@ -128,7 +128,7 @@ static void test_localhost(void) { } static void test_default_port(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; args_struct args; args_init(&args); grpc_resolve_address( @@ -141,7 +141,7 @@ static void test_default_port(void) { } static void test_non_numeric_default_port(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; args_struct args; args_init(&args); grpc_resolve_address( @@ -154,7 +154,7 @@ static void test_non_numeric_default_port(void) { } static void test_missing_default_port(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; args_struct args; args_init(&args); grpc_resolve_address( @@ -167,7 +167,7 @@ static void test_missing_default_port(void) { } static void test_ipv6_with_port(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; args_struct args; args_init(&args); grpc_resolve_address( @@ -187,7 +187,7 @@ static void test_ipv6_without_port(void) { }; unsigned i; for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; args_struct args; args_init(&args); grpc_resolve_address( @@ -207,7 +207,7 @@ static void test_invalid_ip_addresses(void) { }; unsigned i; for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; args_struct args; args_init(&args); grpc_resolve_address( @@ -226,7 +226,7 @@ static void test_unparseable_hostports(void) { }; unsigned i; for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; args_struct args; args_init(&args); grpc_resolve_address( @@ -243,7 +243,7 @@ int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; test_localhost(); test_default_port(); test_non_numeric_default_port(); diff --git a/test/core/iomgr/resource_quota_test.cc b/test/core/iomgr/resource_quota_test.cc index 7d793937b26..ae26f72701b 100644 --- a/test/core/iomgr/resource_quota_test.cc +++ b/test/core/iomgr/resource_quota_test.cc @@ -84,7 +84,7 @@ grpc_closure* make_unused_reclaimer(grpc_closure* then) { } static void destroy_user(grpc_resource_user* usr) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_unref(usr); } @@ -117,11 +117,11 @@ static void test_instant_alloc_then_free(void) { grpc_resource_quota_resize(q, 1024 * 1024); grpc_resource_user* usr = grpc_resource_user_create(q, "usr"); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr, 1024, NULL); } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); @@ -135,7 +135,7 @@ static void test_instant_alloc_free_pair(void) { grpc_resource_quota_resize(q, 1024 * 1024); grpc_resource_user* usr = grpc_resource_user_create(q, "usr"); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr, 1024, NULL); grpc_resource_user_free(usr, 1024); } @@ -152,14 +152,14 @@ static void test_simple_async_alloc(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); @@ -175,7 +175,7 @@ static void test_async_alloc_blocked_by_size(void) { gpr_event ev; gpr_event_init(&ev); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait( @@ -186,7 +186,7 @@ static void test_async_alloc_blocked_by_size(void) { nullptr); ; { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); @@ -202,7 +202,7 @@ static void test_scavenge(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -210,13 +210,13 @@ static void test_scavenge(void) { ; } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_free(usr1, 1024); } { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -224,7 +224,7 @@ static void test_scavenge(void) { ; } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_free(usr2, 1024); } grpc_resource_quota_unref(q); @@ -241,7 +241,7 @@ static void test_scavenge_blocked(void) { gpr_event ev; { gpr_event_init(&ev); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -250,14 +250,14 @@ static void test_scavenge_blocked(void) { } { gpr_event_init(&ev); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait( &ev, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_free(usr1, 1024); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -265,7 +265,7 @@ static void test_scavenge_blocked(void) { ; } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_free(usr2, 1024); } grpc_resource_quota_unref(q); @@ -282,7 +282,7 @@ static void test_blocked_until_scheduled_reclaim(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -292,14 +292,14 @@ static void test_blocked_until_scheduled_reclaim(void) { gpr_event reclaim_done; gpr_event_init(&reclaim_done); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_post_reclaimer( usr, false, make_reclaimer(usr, 1024, set_event(&reclaim_done))); } { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&reclaim_done, @@ -309,7 +309,7 @@ static void test_blocked_until_scheduled_reclaim(void) { ; } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); @@ -326,7 +326,7 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -336,14 +336,14 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) { gpr_event reclaim_done; gpr_event_init(&reclaim_done); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_post_reclaimer( usr1, false, make_reclaimer(usr1, 1024, set_event(&reclaim_done))); } { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&reclaim_done, @@ -353,7 +353,7 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) { ; } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_free(usr2, 1024); } grpc_resource_quota_unref(q); @@ -370,7 +370,7 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -380,14 +380,14 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) { gpr_event reclaim_done; gpr_event_init(&reclaim_done); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_post_reclaimer( usr, true, make_reclaimer(usr, 1024, set_event(&reclaim_done))); } { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&reclaim_done, @@ -397,7 +397,7 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) { ; } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); @@ -415,7 +415,7 @@ static void test_unused_reclaim_is_cancelled(void) { gpr_event destructive_done; gpr_event_init(&destructive_done); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_post_reclaimer( usr, false, make_unused_reclaimer(set_event(&benign_done))); grpc_resource_user_post_reclaimer( @@ -449,7 +449,7 @@ static void test_benign_reclaim_is_preferred(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -457,7 +457,7 @@ static void test_benign_reclaim_is_preferred(void) { ; } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_post_reclaimer( usr, false, make_reclaimer(usr, 1024, set_event(&benign_done))); grpc_resource_user_post_reclaimer( @@ -473,7 +473,7 @@ static void test_benign_reclaim_is_preferred(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&benign_done, @@ -485,7 +485,7 @@ static void test_benign_reclaim_is_preferred(void) { nullptr); } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); @@ -509,7 +509,7 @@ static void test_multiple_reclaims_can_be_triggered(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -517,7 +517,7 @@ static void test_multiple_reclaims_can_be_triggered(void) { ; } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_post_reclaimer( usr, false, make_reclaimer(usr, 512, set_event(&benign_done))); grpc_resource_user_post_reclaimer( @@ -533,7 +533,7 @@ static void test_multiple_reclaims_can_be_triggered(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&ev)); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&benign_done, @@ -545,7 +545,7 @@ static void test_multiple_reclaims_can_be_triggered(void) { ; } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); @@ -564,16 +564,16 @@ static void test_resource_user_stays_allocated_until_memory_released(void) { grpc_resource_quota_resize(q, 1024 * 1024); grpc_resource_user* usr = grpc_resource_user_create(q, "usr"); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr, 1024, NULL); } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_quota_unref(q); grpc_resource_user_unref(usr); } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_free(usr, 1024); } } @@ -594,7 +594,7 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( gpr_event reclaimer_cancelled; gpr_event_init(&reclaimer_cancelled); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_post_reclaimer( usr, false, make_unused_reclaimer(set_event(&reclaimer_cancelled))); grpc_core::ExecCtx::Get()->Flush(); @@ -605,7 +605,7 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( { gpr_event allocated; gpr_event_init(&allocated); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&allocated, @@ -615,7 +615,7 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( nullptr); } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_unref(usr); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, @@ -623,7 +623,7 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( nullptr); } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_free(usr, 1024); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, @@ -643,7 +643,7 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { { gpr_event allocated; gpr_event_init(&allocated); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&allocated, @@ -653,7 +653,7 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { gpr_event reclaimer_done; gpr_event_init(&reclaimer_done); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_post_reclaimer( usr, false, make_reclaimer(usr, 1024, set_event(&reclaimer_done))); grpc_core::ExecCtx::Get()->Flush(); @@ -664,7 +664,7 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { { gpr_event allocated; gpr_event_init(&allocated); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&allocated, @@ -675,7 +675,7 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { } } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_free(usr, 1024); } destroy_user(usr); @@ -699,14 +699,14 @@ static void test_one_slice(void) { { const int start_allocs = num_allocs; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); grpc_core::ExecCtx::Get()->Flush(); assert_counter_becomes(&num_allocs, start_allocs + 1); } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_slice_buffer_destroy_internal(&buffer); } destroy_user(usr); @@ -731,20 +731,20 @@ static void test_one_slice_deleted_late(void) { { const int start_allocs = num_allocs; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); grpc_core::ExecCtx::Get()->Flush(); assert_counter_becomes(&num_allocs, start_allocs + 1); } { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_unref(usr); } grpc_resource_quota_unref(q); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_slice_buffer_destroy_internal(&buffer); } } @@ -773,7 +773,7 @@ static void test_negative_rq_free_pool(void) { { const int start_allocs = num_allocs; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); grpc_core::ExecCtx::Get()->Flush(); assert_counter_becomes(&num_allocs, start_allocs + 1); @@ -786,13 +786,13 @@ static void test_negative_rq_free_pool(void) { GPR_ASSERT(grpc_resource_quota_get_memory_pressure(q) > 1 - eps); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_unref(usr); } grpc_resource_quota_unref(q); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_slice_buffer_destroy_internal(&buffer); } } diff --git a/test/core/iomgr/tcp_client_posix_test.cc b/test/core/iomgr/tcp_client_posix_test.cc index 0cdf30590ef..40a050ed9f6 100644 --- a/test/core/iomgr/tcp_client_posix_test.cc +++ b/test/core/iomgr/tcp_client_posix_test.cc @@ -53,7 +53,7 @@ static grpc_millis test_deadline(void) { static void finish_connection() { gpr_mu_lock(g_mu); g_connections_complete++; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT( GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); @@ -83,7 +83,7 @@ void test_succeeds(void) { int r; int connections_complete_before; grpc_closure done; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_DEBUG, "test_succeeds"); @@ -139,7 +139,7 @@ void test_fails(void) { struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; int connections_complete_before; grpc_closure done; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_DEBUG, "test_fails"); @@ -192,7 +192,7 @@ int main(int argc, char** argv) { grpc_init(); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; g_pollset_set = grpc_pollset_set_create(); g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); grpc_pollset_init(g_pollset, &g_mu); diff --git a/test/core/iomgr/tcp_client_uv_test.cc b/test/core/iomgr/tcp_client_uv_test.cc index 344478ea975..0c6250ed7f5 100644 --- a/test/core/iomgr/tcp_client_uv_test.cc +++ b/test/core/iomgr/tcp_client_uv_test.cc @@ -87,7 +87,7 @@ void test_succeeds(void) { uv_tcp_t* svr_handle = static_cast(gpr_malloc(sizeof(uv_tcp_t))); int connections_complete_before; grpc_closure done; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_DEBUG, "test_succeeds"); @@ -136,7 +136,7 @@ void test_fails(void) { struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; int connections_complete_before; grpc_closure done; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_DEBUG, "test_fails"); @@ -186,7 +186,7 @@ static void destroy_pollset(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_test_init(argc, argv); grpc_init(); g_pollset = static_cast(gpr_malloc(grpc_pollset_size())); diff --git a/test/core/iomgr/tcp_posix_test.cc b/test/core/iomgr/tcp_posix_test.cc index b42fb588ebb..f4acba83025 100644 --- a/test/core/iomgr/tcp_posix_test.cc +++ b/test/core/iomgr/tcp_posix_test.cc @@ -163,7 +163,7 @@ static void read_test(size_t num_bytes, size_t slice_size) { size_t written_bytes; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_INFO, "Read test of size %" PRIuPTR ", slice size %" PRIuPTR, num_bytes, slice_size); @@ -213,7 +213,7 @@ static void large_read_test(size_t slice_size) { ssize_t written_bytes; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_INFO, "Start large read test, slice size %" PRIuPTR, slice_size); @@ -301,7 +301,7 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { int flags; int current = 0; int i; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; flags = fcntl(fd, F_GETFL, 0); GPR_ASSERT(fcntl(fd, F_SETFL, flags & ~O_NONBLOCK) == 0); @@ -348,7 +348,7 @@ static void write_test(size_t num_bytes, size_t slice_size) { grpc_closure write_done_closure; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_INFO, "Start write test with %" PRIuPTR " bytes, slice size %" PRIuPTR, @@ -411,7 +411,7 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { int fd; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_closure fd_released_cb; int fd_released_done = 0; GRPC_CLOSURE_INIT(&fd_released_cb, &on_fd_released, &fd_released_done, @@ -507,7 +507,7 @@ static grpc_endpoint_test_fixture create_fixture_tcp_socketpair( size_t slice_size) { int sv[2]; grpc_endpoint_test_fixture f; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; create_sockets(sv); grpc_resource_quota* resource_quota = @@ -541,7 +541,7 @@ int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; g_pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); grpc_pollset_init(g_pollset, &g_mu); grpc_endpoint_tests(configs[0], g_pollset, g_mu); diff --git a/test/core/iomgr/tcp_server_posix_test.cc b/test/core/iomgr/tcp_server_posix_test.cc index 28fc3601ad9..3c9ca2109ec 100644 --- a/test/core/iomgr/tcp_server_posix_test.cc +++ b/test/core/iomgr/tcp_server_posix_test.cc @@ -163,14 +163,14 @@ static void on_connect(void* arg, grpc_endpoint* tcp, grpc_pollset* pollset, } static void test_no_op(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_tcp_server* s; GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(nullptr, nullptr, &s)); grpc_tcp_server_unref(s); } static void test_no_op_with_start(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_tcp_server* s; GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(nullptr, nullptr, &s)); LOG_TEST("test_no_op_with_start"); @@ -179,7 +179,7 @@ static void test_no_op_with_start(void) { } static void test_no_op_with_port(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_tcp_server* s; @@ -198,7 +198,7 @@ static void test_no_op_with_port(void) { } static void test_no_op_with_port_and_start(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_tcp_server* s; @@ -282,7 +282,7 @@ static grpc_error* tcp_connect(const test_addr* remote, static void test_connect(size_t num_connects, const grpc_channel_args* channel_args, test_addrs* dst_addrs, bool test_dst_addrs) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; grpc_resolved_address resolved_addr1; struct sockaddr_storage* const addr = @@ -436,7 +436,7 @@ int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); grpc_pollset_init(g_pollset, &g_mu); diff --git a/test/core/iomgr/tcp_server_uv_test.cc b/test/core/iomgr/tcp_server_uv_test.cc index 07b1fb15799..35d62b51b76 100644 --- a/test/core/iomgr/tcp_server_uv_test.cc +++ b/test/core/iomgr/tcp_server_uv_test.cc @@ -115,14 +115,14 @@ static void on_connect(void* arg, grpc_endpoint* tcp, grpc_pollset* pollset, } static void test_no_op(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_tcp_server* s; GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); grpc_tcp_server_unref(s); } static void test_no_op_with_start(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_tcp_server* s; GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); LOG_TEST("test_no_op_with_start"); @@ -131,7 +131,7 @@ static void test_no_op_with_start(void) { } static void test_no_op_with_port(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_tcp_server* s; @@ -150,7 +150,7 @@ static void test_no_op_with_port(void) { } static void test_no_op_with_port_and_start(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_tcp_server* s; @@ -214,7 +214,7 @@ static void tcp_connect(const struct sockaddr* remote, socklen_t remote_len, /* Tests a tcp server with multiple ports. */ static void test_connect(unsigned n) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; grpc_resolved_address resolved_addr1; struct sockaddr_storage* addr = (struct sockaddr_storage*)resolved_addr.addr; @@ -284,7 +284,7 @@ static void destroy_pollset(void* p, grpc_error* error) { int main(int argc, char** argv) { grpc_closure destroyed; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_test_init(argc, argv); grpc_init(); g_pollset = static_cast(gpr_malloc(grpc_pollset_size())); diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc index 7ab4c4415c5..deb8c4d87e9 100644 --- a/test/core/iomgr/timer_list_test.cc +++ b/test/core/iomgr/timer_list_test.cc @@ -45,7 +45,7 @@ static void cb(void* arg, grpc_error* error) { static void add_test(void) { int i; grpc_timer timers[20]; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_INFO, "add_test"); @@ -109,7 +109,7 @@ static void add_test(void) { /* Cleaning up a list with pending timers. */ void destruction_test(void) { grpc_timer timers[5]; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_INFO, "destruction_test"); diff --git a/test/core/iomgr/udp_server_test.cc b/test/core/iomgr/udp_server_test.cc index 379c50c09da..7f662f06836 100644 --- a/test/core/iomgr/udp_server_test.cc +++ b/test/core/iomgr/udp_server_test.cc @@ -127,13 +127,13 @@ static test_socket_factory* test_socket_factory_create(void) { } static void test_no_op(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_udp_server* s = grpc_udp_server_create(nullptr); grpc_udp_server_destroy(s, nullptr); } static void test_no_op_with_start(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_udp_server* s = grpc_udp_server_create(nullptr); LOG_TEST("test_no_op_with_start"); grpc_udp_server_start(s, nullptr, 0, nullptr); @@ -142,7 +142,7 @@ static void test_no_op_with_start(void) { static void test_no_op_with_port(void) { g_number_of_orphan_calls = 0; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_udp_server* s = grpc_udp_server_create(nullptr); @@ -162,7 +162,7 @@ static void test_no_op_with_port(void) { static void test_no_op_with_port_and_socket_factory(void) { g_number_of_orphan_calls = 0; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; @@ -194,7 +194,7 @@ static void test_no_op_with_port_and_socket_factory(void) { static void test_no_op_with_port_and_start(void) { g_number_of_orphan_calls = 0; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_udp_server* s = grpc_udp_server_create(nullptr); @@ -216,7 +216,7 @@ static void test_no_op_with_port_and_start(void) { } static void test_receive(int number_of_clients) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_storage* addr = (struct sockaddr_storage*)resolved_addr.addr; int clifd, svrfd; @@ -294,7 +294,7 @@ int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); grpc_pollset_init(g_pollset, &g_mu); diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc index 7d0a24a459e..ecc61928f59 100644 --- a/test/core/security/credentials_test.cc +++ b/test/core/security/credentials_test.cc @@ -148,7 +148,7 @@ static grpc_httpcli_response http_response(int status, const char* body) { /* -- Tests. -- */ static void test_empty_md_array(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_credentials_mdelem_array md_array; memset(&md_array, 0, sizeof(md_array)); GPR_ASSERT(md_array.md == nullptr); @@ -157,7 +157,7 @@ static void test_empty_md_array(void) { } static void test_add_to_empty_md_array(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_credentials_mdelem_array md_array; memset(&md_array, 0, sizeof(md_array)); const char* key = "hello"; @@ -172,7 +172,7 @@ static void test_add_to_empty_md_array(void) { } static void test_add_abunch_to_md_array(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_credentials_mdelem_array md_array; memset(&md_array, 0, sizeof(md_array)); const char* key = "hello"; @@ -191,7 +191,7 @@ static void test_add_abunch_to_md_array(void) { } static void test_oauth2_token_fetcher_creds_parsing_ok(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = @@ -208,7 +208,7 @@ static void test_oauth2_token_fetcher_creds_parsing_ok(void) { } static void test_oauth2_token_fetcher_creds_parsing_bad_http_status(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = @@ -220,7 +220,7 @@ static void test_oauth2_token_fetcher_creds_parsing_bad_http_status(void) { } static void test_oauth2_token_fetcher_creds_parsing_empty_http_body(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = http_response(200, ""); @@ -231,7 +231,7 @@ static void test_oauth2_token_fetcher_creds_parsing_empty_http_body(void) { } static void test_oauth2_token_fetcher_creds_parsing_invalid_json(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = @@ -246,7 +246,7 @@ static void test_oauth2_token_fetcher_creds_parsing_invalid_json(void) { } static void test_oauth2_token_fetcher_creds_parsing_missing_token(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = http_response(200, @@ -260,7 +260,7 @@ static void test_oauth2_token_fetcher_creds_parsing_missing_token(void) { } static void test_oauth2_token_fetcher_creds_parsing_missing_token_type(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = @@ -276,7 +276,7 @@ static void test_oauth2_token_fetcher_creds_parsing_missing_token_type(void) { static void test_oauth2_token_fetcher_creds_parsing_missing_token_lifetime( void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = @@ -378,7 +378,7 @@ static void run_request_metadata_test(grpc_call_credentials* creds, } static void test_google_iam_creds(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; expected_md emd[] = {{GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, test_google_iam_authorization_token}, {GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, @@ -395,7 +395,7 @@ static void test_google_iam_creds(void) { } static void test_access_token_creds(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; expected_md emd[] = {{GRPC_AUTHORIZATION_METADATA_KEY, "Bearer blah"}}; request_metadata_state* state = make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); @@ -419,7 +419,7 @@ static grpc_security_status check_channel_oauth2_create_security_connector( } static void test_channel_oauth2_composite_creds(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args* new_args; grpc_channel_credentials_vtable vtable = { nullptr, check_channel_oauth2_create_security_connector, nullptr}; @@ -439,7 +439,7 @@ static void test_channel_oauth2_composite_creds(void) { } static void test_oauth2_google_iam_composite_creds(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; expected_md emd[] = { {GRPC_AUTHORIZATION_METADATA_KEY, test_oauth2_bearer_token}, {GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, @@ -492,7 +492,7 @@ check_channel_oauth2_google_iam_create_security_connector( } static void test_channel_oauth2_google_iam_composite_creds(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args* new_args; grpc_channel_credentials_vtable vtable = { nullptr, check_channel_oauth2_google_iam_create_security_connector, @@ -570,7 +570,7 @@ static int httpcli_get_should_not_be_called(const grpc_httpcli_request* request, } static void test_compute_engine_creds_success(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; expected_md emd[] = { {"authorization", "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_"}}; grpc_call_credentials* creds = @@ -599,7 +599,7 @@ static void test_compute_engine_creds_success(void) { } static void test_compute_engine_creds_failure(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; request_metadata_state* state = make_request_metadata_state( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Error occured when fetching oauth2 token."), @@ -659,7 +659,7 @@ static int refresh_token_httpcli_post_failure( } static void test_refresh_token_creds_success(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; expected_md emd[] = { {"authorization", "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_"}}; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, @@ -688,7 +688,7 @@ static void test_refresh_token_creds_success(void) { } static void test_refresh_token_creds_failure(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; request_metadata_state* state = make_request_metadata_state( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Error occured when fetching oauth2 token."), @@ -791,7 +791,7 @@ static void test_jwt_creds_lifetime(void) { static void test_jwt_creds_success(void) { char* json_key_string = test_json_key_str(); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, nullptr, nullptr}; char* expected_md_value; @@ -833,7 +833,7 @@ static void test_jwt_creds_success(void) { static void test_jwt_creds_signing_failure(void) { char* json_key_string = test_json_key_str(); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, nullptr, nullptr}; request_metadata_state* state = make_request_metadata_state( @@ -865,7 +865,7 @@ static void set_google_default_creds_env_var_with_file_contents( } static void test_google_default_creds_auth_key(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_service_account_jwt_access_credentials* jwt; grpc_composite_channel_credentials* creds; char* json_key = test_json_key_str(); @@ -886,7 +886,7 @@ static void test_google_default_creds_auth_key(void) { } static void test_google_default_creds_refresh_token(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_google_refresh_token_credentials* refresh; grpc_composite_channel_credentials* creds; grpc_flush_cached_google_default_credentials(); @@ -921,7 +921,7 @@ static int default_creds_gce_detection_httpcli_get_success_override( static char* null_well_known_creds_path_getter(void) { return nullptr; } static void test_google_default_creds_gce(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; expected_md emd[] = { {"authorization", "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_"}}; request_metadata_state* state = @@ -1056,7 +1056,7 @@ static void plugin_destroy(void* state) { static void test_metadata_plugin_success(void) { plugin_state state = PLUGIN_INITIAL_STATE; grpc_metadata_credentials_plugin plugin; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, nullptr, nullptr}; request_metadata_state* md_state = make_request_metadata_state( @@ -1079,7 +1079,7 @@ static void test_metadata_plugin_success(void) { static void test_metadata_plugin_failure(void) { plugin_state state = PLUGIN_INITIAL_STATE; grpc_metadata_credentials_plugin plugin; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, nullptr, nullptr}; char* expected_error; @@ -1121,7 +1121,7 @@ static void test_get_well_known_google_credentials_file_path(void) { } static void test_channel_creds_duplicate_without_call_creds(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_credentials* channel_creds = grpc_fake_transport_security_credentials_create(); diff --git a/test/core/security/json_token_test.cc b/test/core/security/json_token_test.cc index 57e2f4c9787..aac9cc00297 100644 --- a/test/core/security/json_token_test.cc +++ b/test/core/security/json_token_test.cc @@ -207,7 +207,7 @@ static void test_parse_json_key_failure_no_private_key(void) { static grpc_json* parse_json_part_from_jwt(const char* str, size_t len, char** scratchpad) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; char* b64; char* decoded; grpc_json* json; @@ -327,7 +327,7 @@ static void check_jwt_claim(grpc_json* claim, const char* expected_audience, static void check_jwt_signature(const char* b64_signature, RSA* rsa_key, const char* signed_data, size_t signed_data_size) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; EVP_MD_CTX* md_ctx = EVP_MD_CTX_create(); EVP_PKEY* key = EVP_PKEY_new(); diff --git a/test/core/security/jwt_verifier_test.cc b/test/core/security/jwt_verifier_test.cc index ec14fec6978..e219260b1d2 100644 --- a/test/core/security/jwt_verifier_test.cc +++ b/test/core/security/jwt_verifier_test.cc @@ -209,7 +209,7 @@ static void test_claims_success(void) { grpc_json* json = grpc_json_parse_string_with_len( (char*)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); GPR_ASSERT(json != nullptr); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; claims = grpc_jwt_claims_from_json(json, s); GPR_ASSERT(claims != nullptr); GPR_ASSERT(grpc_jwt_claims_json(claims) == json); @@ -231,7 +231,7 @@ static void test_expired_claims_failure(void) { gpr_timespec exp_exp = {120, 0, GPR_CLOCK_REALTIME}; gpr_timespec exp_nbf = {60, 0, GPR_CLOCK_REALTIME}; GPR_ASSERT(json != nullptr); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; claims = grpc_jwt_claims_from_json(json, s); GPR_ASSERT(claims != nullptr); GPR_ASSERT(grpc_jwt_claims_json(claims) == json); @@ -252,7 +252,7 @@ static void test_invalid_claims_failure(void) { grpc_slice s = grpc_slice_from_copied_string(invalid_claims); grpc_json* json = grpc_json_parse_string_with_len( (char*)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT(grpc_jwt_claims_from_json(json, s) == nullptr); } @@ -262,7 +262,7 @@ static void test_bad_audience_claims_failure(void) { grpc_json* json = grpc_json_parse_string_with_len( (char*)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); GPR_ASSERT(json != nullptr); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; claims = grpc_jwt_claims_from_json(json, s); GPR_ASSERT(claims != nullptr); GPR_ASSERT(grpc_jwt_claims_check(claims, "https://bar.com") == @@ -276,7 +276,7 @@ static void test_bad_subject_claims_failure(void) { grpc_json* json = grpc_json_parse_string_with_len( (char*)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); GPR_ASSERT(json != nullptr); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; claims = grpc_jwt_claims_from_json(json, s); GPR_ASSERT(claims != nullptr); GPR_ASSERT(grpc_jwt_claims_check(claims, "https://foo.com") == @@ -350,7 +350,7 @@ static void on_verification_success(void* user_data, } static void test_jwt_verifier_google_email_issuer_success(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(nullptr, 0); char* jwt = nullptr; char* key_str = json_key_str(json_key_str_part3_for_google_email_issuer); @@ -383,7 +383,7 @@ static int httpcli_get_custom_keys_for_email( } static void test_jwt_verifier_custom_email_issuer_success(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(&custom_mapping, 1); char* jwt = nullptr; char* key_str = json_key_str(json_key_str_part3_for_custom_email_issuer); @@ -430,7 +430,7 @@ static int httpcli_get_openid_config(const grpc_httpcli_request* request, } static void test_jwt_verifier_url_issuer_success(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(nullptr, 0); char* jwt = nullptr; char* key_str = json_key_str(json_key_str_part3_for_url_issuer); @@ -469,7 +469,7 @@ static int httpcli_get_bad_json(const grpc_httpcli_request* request, } static void test_jwt_verifier_url_issuer_bad_config(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(nullptr, 0); char* jwt = nullptr; char* key_str = json_key_str(json_key_str_part3_for_url_issuer); @@ -492,7 +492,7 @@ static void test_jwt_verifier_url_issuer_bad_config(void) { } static void test_jwt_verifier_bad_json_key(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(nullptr, 0); char* jwt = nullptr; char* key_str = json_key_str(json_key_str_part3_for_google_email_issuer); @@ -521,7 +521,7 @@ static void corrupt_jwt_sig(char* jwt) { char* last_dot = strrchr(jwt, '.'); GPR_ASSERT(last_dot != nullptr); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; sig = grpc_base64_decode(last_dot + 1, 1); } GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(sig)); @@ -543,7 +543,7 @@ static void on_verification_bad_signature(void* user_data, } static void test_jwt_verifier_bad_signature(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(nullptr, 0); char* jwt = nullptr; char* key_str = json_key_str(json_key_str_part3_for_url_issuer); @@ -583,7 +583,7 @@ static void on_verification_bad_format(void* user_data, } static void test_jwt_verifier_bad_format(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(nullptr, 0); grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); diff --git a/test/core/security/oauth2_utils.cc b/test/core/security/oauth2_utils.cc index 7551d7df859..0d3a1279af3 100644 --- a/test/core/security/oauth2_utils.cc +++ b/test/core/security/oauth2_utils.cc @@ -69,7 +69,7 @@ char* grpc_test_fetch_oauth2_token_with_credentials( grpc_call_credentials* creds) { oauth2_request request; memset(&request, 0, sizeof(request)); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_closure do_nothing_closure; grpc_auth_metadata_context null_ctx = {"", "", nullptr, nullptr}; diff --git a/test/core/security/print_google_default_creds_token.cc b/test/core/security/print_google_default_creds_token.cc index 7089b9808a7..b3742f58a89 100644 --- a/test/core/security/print_google_default_creds_token.cc +++ b/test/core/security/print_google_default_creds_token.cc @@ -62,7 +62,7 @@ static void on_metadata_response(void* arg, grpc_error* error) { int main(int argc, char** argv) { int result = 0; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; synchronizer sync; grpc_channel_credentials* creds = nullptr; const char* service_url = "https://test.foo.google.com/Foo"; diff --git a/test/core/security/secure_endpoint_test.cc b/test/core/security/secure_endpoint_test.cc index c8f4f32538c..38c78fed423 100644 --- a/test/core/security/secure_endpoint_test.cc +++ b/test/core/security/secure_endpoint_test.cc @@ -38,7 +38,7 @@ static grpc_pollset* g_pollset; static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( size_t slice_size, grpc_slice* leftover_slices, size_t leftover_nslices, bool use_zero_copy_protector) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; tsi_frame_protector* fake_read_protector = tsi_create_fake_frame_protector(nullptr); tsi_frame_protector* fake_write_protector = @@ -172,7 +172,7 @@ static void test_leftover(grpc_endpoint_test_config config, size_t slice_size) { grpc_slice_buffer incoming; grpc_slice s = grpc_slice_from_copied_string("hello world 12345678900987654321"); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; int n = 0; grpc_closure done_closure; gpr_log(GPR_INFO, "Start test left over"); @@ -209,7 +209,7 @@ int main(int argc, char** argv) { grpc_init(); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; g_pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); grpc_pollset_init(g_pollset, &g_mu); grpc_endpoint_tests(configs[0], g_pollset, g_mu); diff --git a/test/core/security/ssl_server_fuzzer.cc b/test/core/security/ssl_server_fuzzer.cc index 9cf73fa8715..7056cfe581b 100644 --- a/test/core/security/ssl_server_fuzzer.cc +++ b/test/core/security/ssl_server_fuzzer.cc @@ -56,7 +56,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (leak_check) grpc_memory_counters_init(); grpc_init(); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resource_quota* resource_quota = grpc_resource_quota_create("ssl_server_fuzzer"); diff --git a/test/core/security/verify_jwt.cc b/test/core/security/verify_jwt.cc index 1bd92bbc977..e039970c671 100644 --- a/test/core/security/verify_jwt.cc +++ b/test/core/security/verify_jwt.cc @@ -76,7 +76,7 @@ int main(int argc, char** argv) { gpr_cmdline* cl; const char* jwt = nullptr; const char* aud = nullptr; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_init(); cl = gpr_cmdline_create("JWT verifier tool"); diff --git a/test/core/slice/b64_test.cc b/test/core/slice/b64_test.cc index e0c7ed361dc..94785fd1e28 100644 --- a/test/core/slice/b64_test.cc +++ b/test/core/slice/b64_test.cc @@ -45,7 +45,7 @@ static void test_simple_encode_decode_b64(int url_safe, int multiline) { const char* hello = "hello"; char* hello_b64 = grpc_base64_encode(hello, strlen(hello), url_safe, multiline); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_slice hello_slice = grpc_base64_decode(hello_b64, url_safe); GPR_ASSERT(GRPC_SLICE_LENGTH(hello_slice) == strlen(hello)); GPR_ASSERT(strncmp((const char*)GRPC_SLICE_START_PTR(hello_slice), hello, @@ -65,7 +65,7 @@ static void test_full_range_encode_decode_b64(int url_safe, int multiline) { /* Try all the different paddings. */ for (i = 0; i < 3; i++) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; b64 = grpc_base64_encode(orig, sizeof(orig) - i, url_safe, multiline); orig_decoded = grpc_base64_decode(b64, url_safe); GPR_ASSERT(GRPC_SLICE_LENGTH(orig_decoded) == (sizeof(orig) - i)); @@ -116,7 +116,7 @@ static void test_url_safe_unsafe_mismatch_failure(void) { int url_safe = 1; for (i = 0; i < sizeof(orig); i++) orig[i] = (uint8_t)i; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; b64 = grpc_base64_encode(orig, sizeof(orig), url_safe, 0); orig_decoded = grpc_base64_decode(b64, !url_safe); GPR_ASSERT(GRPC_SLICE_IS_EMPTY(orig_decoded)); @@ -165,7 +165,7 @@ static void test_rfc4648_test_vectors(void) { static void test_unpadded_decode(void) { grpc_slice decoded; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; decoded = grpc_base64_decode("Zm9vYmFy", 0); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(decoded)); GPR_ASSERT(grpc_slice_str_cmp(decoded, "foobar") == 0); diff --git a/test/core/slice/slice_hash_table_test.cc b/test/core/slice/slice_hash_table_test.cc index 1cbb241a983..9fad9a614ea 100644 --- a/test/core/slice/slice_hash_table_test.cc +++ b/test/core/slice/slice_hash_table_test.cc @@ -119,7 +119,7 @@ static void test_slice_hash_table() { check_values(test_entries, num_entries, table); check_non_existent_value("XX", table); // Clean up. - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_slice_hash_table_unref(table); } @@ -146,7 +146,7 @@ static void test_slice_hash_table_eq() { create_table_from_entries(test_entries_b, num_entries_b, value_cmp_fn); GPR_ASSERT(grpc_slice_hash_table_cmp(table_a, table_b) == 0); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_slice_hash_table_unref(table_a); grpc_slice_hash_table_unref(table_b); } @@ -217,7 +217,7 @@ static void test_slice_hash_table_not_eq() { create_table_from_entries(test_entries_h, num_entries_h, pointer_cmp_fn); GPR_ASSERT(grpc_slice_hash_table_cmp(table_g, table_h) != 0); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_slice_hash_table_unref(table_a); grpc_slice_hash_table_unref(table_b_larger); grpc_slice_hash_table_unref(table_b_smaller); diff --git a/test/core/surface/byte_buffer_reader_test.cc b/test/core/surface/byte_buffer_reader_test.cc index b762fed9412..94a8615b3cd 100644 --- a/test/core/surface/byte_buffer_reader_test.cc +++ b/test/core/surface/byte_buffer_reader_test.cc @@ -132,7 +132,7 @@ static void read_compressed_slice(grpc_compression_algorithm algorithm, memset(GRPC_SLICE_START_PTR(input_slice), 'a', input_size); grpc_slice_buffer_add(&sliceb_in, input_slice); /* takes ownership */ { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT(grpc_msg_compress(algorithm, &sliceb_in, &sliceb_out)); } diff --git a/test/core/surface/channel_create_test.cc b/test/core/surface/channel_create_test.cc index 65fac9daa3c..37247f89d01 100644 --- a/test/core/surface/channel_create_test.cc +++ b/test/core/surface/channel_create_test.cc @@ -35,7 +35,7 @@ void test_unknown_scheme_target(void) { chan = grpc_insecure_channel_create("blah://blah", nullptr, nullptr); GPR_ASSERT(chan != nullptr); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_element* elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); diff --git a/test/core/surface/completion_queue_test.cc b/test/core/surface/completion_queue_test.cc index 3452f78a3b5..fefbb3c1854 100644 --- a/test/core/surface/completion_queue_test.cc +++ b/test/core/surface/completion_queue_test.cc @@ -137,7 +137,7 @@ static void test_cq_end_op(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_NEXT; for (size_t i = 0; i < GPR_ARRAY_SIZE(polling_types); i++) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; attr.cq_polling_type = polling_types[i]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, nullptr); @@ -172,7 +172,7 @@ static void test_cq_tls_cache_full(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_NEXT; for (size_t i = 0; i < GPR_ARRAY_SIZE(polling_types); i++) { - grpc_core::ExecCtx _local_exec_ctx; // Reset exec_ctx + grpc_core::ExecCtx exec_ctx; // Reset exec_ctx attr.cq_polling_type = polling_types[i]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, nullptr); @@ -212,7 +212,7 @@ static void test_cq_tls_cache_empty(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_NEXT; for (size_t i = 0; i < GPR_ARRAY_SIZE(polling_types); i++) { - grpc_core::ExecCtx _local_exec_ctx; // Reset exec_ctx + grpc_core::ExecCtx exec_ctx; // Reset exec_ctx attr.cq_polling_type = polling_types[i]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, nullptr); @@ -293,7 +293,7 @@ static void test_pluck(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_PLUCK; for (size_t pidx = 0; pidx < GPR_ARRAY_SIZE(polling_types); pidx++) { - grpc_core::ExecCtx _local_exec_ctx; // reset exec_ctx + grpc_core::ExecCtx exec_ctx; // reset exec_ctx attr.cq_polling_type = polling_types[pidx]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, nullptr); diff --git a/test/core/surface/completion_queue_threading_test.cc b/test/core/surface/completion_queue_threading_test.cc index 8867ba88c3a..ba9491fc416 100644 --- a/test/core/surface/completion_queue_threading_test.cc +++ b/test/core/surface/completion_queue_threading_test.cc @@ -80,7 +80,7 @@ static void test_too_many_plucks(void) { gpr_thd_id thread_ids[GPR_ARRAY_SIZE(tags)]; struct thread_state thread_states[GPR_ARRAY_SIZE(tags)]; gpr_thd_options thread_options = gpr_thd_options_default(); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; unsigned i, j; LOG_TEST("test_too_many_plucks"); @@ -158,7 +158,7 @@ static void producer_thread(void* arg) { gpr_log(GPR_INFO, "producer %d phase 2", opt->id); for (i = 0; i < TEST_THREAD_EVENTS; i++) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_cq_end_op(opt->cc, (void*)(intptr_t)1, GRPC_ERROR_NONE, free_completion, nullptr, static_cast( diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index f21086847b8..0bebac216ad 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -117,7 +117,7 @@ static void on_connect(void* vargs, grpc_endpoint* tcp, void bad_server_thread(void* vargs) { struct server_thread_args* args = (struct server_thread_args*)vargs; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_storage* addr = (struct sockaddr_storage*)resolved_addr.addr; int port; @@ -225,7 +225,7 @@ int run_concurrent_connectivity_test() { gpr_atm_rel_store(&args.stop, 1); gpr_thd_join(server); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_pollset_shutdown( args.pollset, GRPC_CLOSURE_CREATE(done_pollset_shutdown, args.pollset, grpc_schedule_on_exec_ctx)); diff --git a/test/core/surface/lame_client_test.cc b/test/core/surface/lame_client_test.cc index 258ee6a8313..4bf40569e64 100644 --- a/test/core/surface/lame_client_test.cc +++ b/test/core/surface/lame_client_test.cc @@ -44,7 +44,7 @@ void test_transport_op(grpc_channel* channel) { grpc_transport_op* op; grpc_channel_element* elem; grpc_connectivity_state state = GRPC_CHANNEL_IDLE; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_CLOSURE_INIT(&transport_op_cb, verify_connectivity, &state, grpc_schedule_on_exec_ctx); diff --git a/test/core/surface/num_external_connectivity_watchers_test.cc b/test/core/surface/num_external_connectivity_watchers_test.cc index 4052f19f51d..9cdd299ae3b 100644 --- a/test/core/surface/num_external_connectivity_watchers_test.cc +++ b/test/core/surface/num_external_connectivity_watchers_test.cc @@ -178,7 +178,7 @@ static grpc_channel* secure_test_create_channel(const char* addr) { grpc_channel* channel = grpc_secure_channel_create(ssl_creds, addr, new_client_args, nullptr); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(new_client_args); } grpc_channel_credentials_release(ssl_creds); diff --git a/test/core/surface/secure_channel_create_test.cc b/test/core/surface/secure_channel_create_test.cc index 62c2d928851..fa22cd68731 100644 --- a/test/core/surface/secure_channel_create_test.cc +++ b/test/core/surface/secure_channel_create_test.cc @@ -37,7 +37,7 @@ void test_unknown_scheme_target(void) { grpc_channel_element* elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_CHANNEL_INTERNAL_UNREF(chan, "test"); grpc_channel_credentials_unref(creds); } @@ -55,7 +55,7 @@ void test_security_connector_already_in_arg(void) { grpc_channel_element* elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_CHANNEL_INTERNAL_UNREF(chan, "test"); } @@ -65,7 +65,7 @@ void test_null_creds(void) { grpc_channel_element* elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GRPC_CHANNEL_INTERNAL_UNREF(chan, "test"); } diff --git a/test/core/surface/sequential_connectivity_test.cc b/test/core/surface/sequential_connectivity_test.cc index e7ae97908ce..b2d9b428f0f 100644 --- a/test/core/surface/sequential_connectivity_test.cc +++ b/test/core/surface/sequential_connectivity_test.cc @@ -156,7 +156,7 @@ static grpc_channel* secure_test_create_channel(const char* addr) { grpc_channel* channel = grpc_secure_channel_create(ssl_creds, addr, new_client_args, nullptr); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_channel_args_destroy(new_client_args); } grpc_channel_credentials_release(ssl_creds); diff --git a/test/core/transport/bdp_estimator_test.cc b/test/core/transport/bdp_estimator_test.cc index 168807adde7..fb7fc4cab26 100644 --- a/test/core/transport/bdp_estimator_test.cc +++ b/test/core/transport/bdp_estimator_test.cc @@ -58,7 +58,7 @@ namespace { void AddSamples(BdpEstimator* estimator, int64_t* samples, size_t n) { estimator->AddIncomingBytes(1234567); inc_time(); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; estimator->SchedulePing(); estimator->StartPing(); for (size_t i = 0; i < n; i++) { diff --git a/test/core/transport/byte_stream_test.cc b/test/core/transport/byte_stream_test.cc index a0dbc79158f..2aab6e92628 100644 --- a/test/core/transport/byte_stream_test.cc +++ b/test/core/transport/byte_stream_test.cc @@ -37,7 +37,7 @@ static void not_called_closure(void* arg, grpc_error* error) { static void test_slice_buffer_stream_basic(void) { gpr_log(GPR_DEBUG, "test_slice_buffer_stream_basic"); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; // Create and populate slice buffer. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -71,7 +71,7 @@ static void test_slice_buffer_stream_basic(void) { static void test_slice_buffer_stream_shutdown(void) { gpr_log(GPR_DEBUG, "test_slice_buffer_stream_shutdown"); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; // Create and populate slice buffer. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -117,7 +117,7 @@ static void test_slice_buffer_stream_shutdown(void) { static void test_caching_byte_stream_basic(void) { gpr_log(GPR_DEBUG, "test_caching_byte_stream_basic"); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; // Create and populate slice buffer byte stream. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -156,7 +156,7 @@ static void test_caching_byte_stream_basic(void) { static void test_caching_byte_stream_reset(void) { gpr_log(GPR_DEBUG, "test_caching_byte_stream_reset"); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; // Create and populate slice buffer byte stream. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -202,7 +202,7 @@ static void test_caching_byte_stream_reset(void) { static void test_caching_byte_stream_shared_cache(void) { gpr_log(GPR_DEBUG, "test_caching_byte_stream_shared_cache"); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; // Create and populate slice buffer byte stream. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); diff --git a/test/core/transport/chttp2/bin_decoder_test.cc b/test/core/transport/chttp2/bin_decoder_test.cc index 4b65d7d3cac..6d70a4261b0 100644 --- a/test/core/transport/chttp2/bin_decoder_test.cc +++ b/test/core/transport/chttp2/bin_decoder_test.cc @@ -79,7 +79,7 @@ static grpc_slice base64_decode_with_length(const char* s, int main(int argc, char** argv) { grpc_init(); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; /* ENCODE_AND_DECODE tests grpc_chttp2_base64_decode_with_length(), which takes encoded base64 strings without pad chars, but output length is diff --git a/test/core/transport/chttp2/hpack_encoder_test.cc b/test/core/transport/chttp2/hpack_encoder_test.cc index 2772aef3c4b..d2dbd4a7986 100644 --- a/test/core/transport/chttp2/hpack_encoder_test.cc +++ b/test/core/transport/chttp2/hpack_encoder_test.cc @@ -257,7 +257,7 @@ static void test_interned_key_indexed() { static void run_test(void (*test)(), const char* name) { gpr_log(GPR_INFO, "RUN TEST: %s", name); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_chttp2_hpack_compressor_init(&g_compressor); test(); grpc_chttp2_hpack_compressor_destroy(&g_compressor); diff --git a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc index dcec8b2230e..9a195daee0a 100644 --- a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc +++ b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc @@ -38,7 +38,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_init(); grpc_chttp2_hpack_parser parser; { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_chttp2_hpack_parser_init(&parser); parser.on_header = onhdr; GRPC_ERROR_UNREF(grpc_chttp2_hpack_parser_parse( diff --git a/test/core/transport/chttp2/hpack_parser_test.cc b/test/core/transport/chttp2/hpack_parser_test.cc index 52900c54199..9d3456a873a 100644 --- a/test/core/transport/chttp2/hpack_parser_test.cc +++ b/test/core/transport/chttp2/hpack_parser_test.cc @@ -62,7 +62,7 @@ static void test_vector(grpc_chttp2_hpack_parser* parser, grpc_slice_unref(input); for (i = 0; i < nslices; i++) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT(grpc_chttp2_hpack_parser_parse(parser, slices[i]) == GRPC_ERROR_NONE); } @@ -79,7 +79,7 @@ static void test_vector(grpc_chttp2_hpack_parser* parser, static void test_vectors(grpc_slice_split_mode mode) { grpc_chttp2_hpack_parser parser; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_chttp2_hpack_parser_init(&parser); /* D.2.1 */ diff --git a/test/core/transport/chttp2/hpack_table_test.cc b/test/core/transport/chttp2/hpack_table_test.cc index 97e1a02621b..3f3cb2ee9db 100644 --- a/test/core/transport/chttp2/hpack_table_test.cc +++ b/test/core/transport/chttp2/hpack_table_test.cc @@ -44,7 +44,7 @@ static void assert_index(const grpc_chttp2_hptbl* tbl, uint32_t idx, } static void test_static_lookup(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_chttp2_hptbl tbl; grpc_chttp2_hptbl_init(&tbl); @@ -123,7 +123,7 @@ static void test_many_additions(void) { LOG_TEST("test_many_additions"); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_chttp2_hptbl_init(&tbl); for (i = 0; i < 100000; i++) { @@ -152,7 +152,7 @@ static void test_many_additions(void) { static grpc_chttp2_hptbl_find_result find_simple(grpc_chttp2_hptbl* tbl, const char* key, const char* value) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_mdelem md = grpc_mdelem_from_slices( grpc_slice_from_copied_string(key), grpc_slice_from_copied_string(value)); grpc_chttp2_hptbl_find_result r = grpc_chttp2_hptbl_find(tbl, md); @@ -162,7 +162,7 @@ static grpc_chttp2_hptbl_find_result find_simple(grpc_chttp2_hptbl* tbl, } static void test_find(void) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_chttp2_hptbl tbl; uint32_t i; char buffer[32]; diff --git a/test/core/transport/connectivity_state_test.cc b/test/core/transport/connectivity_state_test.cc index e1bc0c4eb73..f5894599e52 100644 --- a/test/core/transport/connectivity_state_test.cc +++ b/test/core/transport/connectivity_state_test.cc @@ -58,7 +58,7 @@ static void test_connectivity_state_name(void) { static void test_check(void) { grpc_connectivity_state_tracker tracker; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_error* error; gpr_log(GPR_DEBUG, "test_check"); grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx"); @@ -74,7 +74,7 @@ static void test_subscribe_then_unsubscribe(void) { grpc_closure* closure = GRPC_CLOSURE_CREATE(must_fail, THE_ARG, grpc_schedule_on_exec_ctx); grpc_connectivity_state state = GRPC_CHANNEL_IDLE; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_DEBUG, "test_subscribe_then_unsubscribe"); g_counter = 0; grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx"); @@ -96,7 +96,7 @@ static void test_subscribe_then_destroy(void) { grpc_closure* closure = GRPC_CLOSURE_CREATE(must_succeed, THE_ARG, grpc_schedule_on_exec_ctx); grpc_connectivity_state state = GRPC_CHANNEL_IDLE; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_DEBUG, "test_subscribe_then_destroy"); g_counter = 0; grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx"); @@ -117,7 +117,7 @@ static void test_subscribe_with_failure_then_destroy(void) { grpc_closure* closure = GRPC_CLOSURE_CREATE(must_fail, THE_ARG, grpc_schedule_on_exec_ctx); grpc_connectivity_state state = GRPC_CHANNEL_SHUTDOWN; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_DEBUG, "test_subscribe_with_failure_then_destroy"); g_counter = 0; grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_SHUTDOWN, "xxx"); diff --git a/test/core/transport/metadata_test.cc b/test/core/transport/metadata_test.cc index 70d557b1287..5c52ae8d5f5 100644 --- a/test/core/transport/metadata_test.cc +++ b/test/core/transport/metadata_test.cc @@ -60,7 +60,7 @@ static void test_create_metadata(bool intern_keys, bool intern_values) { intern_keys, intern_values); grpc_init(); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; m1 = grpc_mdelem_from_slices( maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values)); @@ -95,7 +95,7 @@ static void test_create_many_ephemeral_metadata(bool intern_keys, intern_keys, intern_values); grpc_init(); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; /* add, and immediately delete a bunch of different elements */ for (i = 0; i < MANY; i++) { gpr_ltoa(i, buffer); @@ -117,7 +117,7 @@ static void test_create_many_persistant_metadata(void) { gpr_log(GPR_INFO, "test_create_many_persistant_metadata"); grpc_init(); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; /* add phase */ for (i = 0; i < MANY; i++) { gpr_ltoa(i, buffer); @@ -151,7 +151,7 @@ static void test_spin_creating_the_same_thing(bool intern_keys, intern_keys, intern_values); grpc_init(); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_mdelem a, b, c; GRPC_MDELEM_UNREF( a = grpc_mdelem_from_slices( @@ -178,7 +178,7 @@ static void test_identity_laws(bool intern_keys, bool intern_values) { intern_keys, intern_values); grpc_init(); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_mdelem a, b, c; a = grpc_mdelem_from_slices( maybe_intern(grpc_slice_from_static_string("a"), intern_keys), @@ -225,7 +225,7 @@ static void test_things_stick_around(void) { gpr_log(GPR_INFO, "test_things_stick_around"); grpc_init(); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; for (i = 0; i < nstrs; i++) { gpr_asprintf(&buffer, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx%" PRIuPTR "x", i); @@ -271,7 +271,7 @@ static void test_user_data_works(void) { gpr_log(GPR_INFO, "test_user_data_works"); grpc_init(); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; ud1 = static_cast(gpr_malloc(sizeof(int))); *ud1 = 1; ud2 = static_cast(gpr_malloc(sizeof(int))); @@ -322,7 +322,7 @@ static void test_mdelem_sizes_in_hpack(bool intern_key, bool intern_value) { gpr_log(GPR_INFO, "test_mdelem_size: intern_key=%d intern_value=%d", intern_key, intern_value); grpc_init(); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; uint8_t binary_value[BUFFER_SIZE] = {0}; for (uint8_t i = 0; i < BUFFER_SIZE; i++) { @@ -346,7 +346,7 @@ static void test_copied_static_metadata(bool dup_key, bool dup_value) { gpr_log(GPR_INFO, "test_static_metadata: dup_key=%d dup_value=%d", dup_key, dup_value); grpc_init(); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; for (size_t i = 0; i < GRPC_STATIC_MDELEM_COUNT; i++) { grpc_mdelem p = GRPC_MAKE_MDELEM(&grpc_static_mdelem_table[i], diff --git a/test/core/transport/status_conversion_test.cc b/test/core/transport/status_conversion_test.cc index 2a192e04ef8..1ed6ccfba62 100644 --- a/test/core/transport/status_conversion_test.cc +++ b/test/core/transport/status_conversion_test.cc @@ -24,7 +24,7 @@ GPR_ASSERT(grpc_status_to_http2_error(a) == (b)) #define HTTP2_ERROR_TO_GRPC_STATUS(a, deadline, b) \ do { \ - grpc_core::ExecCtx _local_exec_ctx; \ + grpc_core::ExecCtx exec_ctx; \ GPR_ASSERT(grpc_http2_error_to_grpc_status(a, deadline) == (b)); \ \ } while (0) diff --git a/test/core/util/port_server_client.cc b/test/core/util/port_server_client.cc index 705286c6d4b..7e76c8063f9 100644 --- a/test/core/util/port_server_client.cc +++ b/test/core/util/port_server_client.cc @@ -62,7 +62,7 @@ void grpc_free_port_using_server(int port) { grpc_httpcli_response rsp; freereq pr; char* path; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_closure* shutdown_closure; grpc_init(); @@ -198,7 +198,7 @@ int grpc_pick_port_using_server(void) { grpc_init(); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; memset(&pr, 0, sizeof(pr)); memset(&req, 0, sizeof(req)); grpc_pollset* pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); diff --git a/test/core/util/test_tcp_server.cc b/test/core/util/test_tcp_server.cc index b94297addab..5f6af4e7070 100644 --- a/test/core/util/test_tcp_server.cc +++ b/test/core/util/test_tcp_server.cc @@ -55,7 +55,7 @@ void test_tcp_server_start(test_tcp_server* server, int port) { grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; int port_added; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; addr->sin_family = AF_INET; addr->sin_port = htons((uint16_t)port); @@ -76,7 +76,7 @@ void test_tcp_server_start(test_tcp_server* server, int port) { void test_tcp_server_poll(test_tcp_server* server, int seconds) { grpc_pollset_worker* worker = nullptr; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_millis deadline = grpc_timespec_to_millis_round_up( grpc_timeout_seconds_to_deadline(seconds)); gpr_mu_lock(server->mu); @@ -91,7 +91,7 @@ static void finish_pollset(void* arg, grpc_error* error) { } void test_tcp_server_destroy(test_tcp_server* server) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_timespec shutdown_deadline; grpc_closure do_nothing_cb; grpc_tcp_server_unref(server->tcp_server); diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index f2f3cc34252..e6e6e71f422 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -112,7 +112,7 @@ class ClientLbEnd2endTest : public ::testing::Test { } void SetNextResolution(const std::vector& ports) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_lb_addresses* addresses = grpc_lb_addresses_create(ports.size(), nullptr); for (size_t i = 0; i < ports.size(); ++i) { diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index c5c53b8b8a8..48cdd433b2c 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -451,7 +451,7 @@ class GrpclbEnd2endTest : public ::testing::Test { }; void SetNextResolution(const std::vector& address_data) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_lb_addresses* addresses = grpc_lb_addresses_create(address_data.size(), nullptr); for (size_t i = 0; i < address_data.size(); ++i) { diff --git a/test/cpp/grpclb/grpclb_test.cc b/test/cpp/grpclb/grpclb_test.cc index 792c82639c6..fd455c4c9a9 100644 --- a/test/cpp/grpclb/grpclb_test.cc +++ b/test/cpp/grpclb/grpclb_test.cc @@ -562,7 +562,7 @@ static void perform_request(client_fixture* cf) { #define BALANCERS_NAME "lb.name" static void setup_client(const server_fixture* lb_server, const server_fixture* backends, client_fixture* cf) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; char* expected_target_names = nullptr; const char* backends_name = lb_server->servers_hostport; diff --git a/test/cpp/microbenchmarks/bm_call_create.cc b/test/cpp/microbenchmarks/bm_call_create.cc index b17f79613ab..5c2c38c27dc 100644 --- a/test/cpp/microbenchmarks/bm_call_create.cc +++ b/test/cpp/microbenchmarks/bm_call_create.cc @@ -521,7 +521,7 @@ static void BM_IsolatedFilter(benchmark::State& state) { label << " #has_dummy_filter"; } - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; size_t channel_size = grpc_channel_stack_size( filters.size() == 0 ? nullptr : &filters[0], filters.size()); grpc_channel_stack* channel_stack = @@ -692,7 +692,7 @@ class IsolatedCallFixture : public TrackCounters { builder, &isolated_call_filter::isolated_call_filter, nullptr, nullptr)); { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; channel_ = grpc_channel_create_with_builder(builder, GRPC_CLIENT_CHANNEL); } cq_ = grpc_completion_queue_create_for_next(nullptr); diff --git a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc index 6b6b441d930..4b7310389c4 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc @@ -50,7 +50,7 @@ static grpc_slice MakeSlice(std::vector bytes) { static void BM_HpackEncoderInitDestroy(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_chttp2_hpack_compressor c; while (state.KeepRunning()) { grpc_chttp2_hpack_compressor_init(&c); @@ -64,7 +64,7 @@ BENCHMARK(BM_HpackEncoderInitDestroy); static void BM_HpackEncoderEncodeDeadline(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_millis saved_now = grpc_core::ExecCtx::Get()->Now(); grpc_metadata_batch b; @@ -108,7 +108,7 @@ BENCHMARK(BM_HpackEncoderEncodeDeadline); template static void BM_HpackEncoderEncodeHeader(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; static bool logged_representative_output = false; grpc_metadata_batch b; @@ -425,7 +425,7 @@ BENCHMARK_TEMPLATE(BM_HpackEncoderEncodeHeader, static void BM_HpackParserInitDestroy(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_chttp2_hpack_parser p; while (state.KeepRunning()) { grpc_chttp2_hpack_parser_init(&p); @@ -444,7 +444,7 @@ static void UnrefHeader(void* user_data, grpc_mdelem md) { template static void BM_HpackParserParseHeader(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; std::vector init_slices = Fixture::GetInitSlices(); std::vector benchmark_slices = Fixture::GetBenchmarkSlices(); grpc_chttp2_hpack_parser p; diff --git a/test/cpp/microbenchmarks/bm_chttp2_transport.cc b/test/cpp/microbenchmarks/bm_chttp2_transport.cc index 044417830f2..43bbbad880c 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_transport.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_transport.cc @@ -257,7 +257,7 @@ class Stream { static void BM_StreamCreateDestroy(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; Fixture f(grpc::ChannelArguments(), true); Stream s(&f); grpc_transport_stream_op_batch op; @@ -303,7 +303,7 @@ class RepresentativeClientInitialMetadata { template static void BM_StreamCreateSendInitialMetadataDestroy(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; Fixture f(grpc::ChannelArguments(), true); Stream s(&f); grpc_transport_stream_op_batch op; @@ -354,7 +354,7 @@ BENCHMARK_TEMPLATE(BM_StreamCreateSendInitialMetadataDestroy, static void BM_TransportEmptyOp(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; Fixture f(grpc::ChannelArguments(), true); Stream s(&f); s.Init(state); @@ -387,7 +387,7 @@ std::vector> done_events; static void BM_TransportStreamSend(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; Fixture f(grpc::ChannelArguments(), true); auto s = std::unique_ptr(new Stream(&f)); s->Init(state); @@ -517,7 +517,7 @@ static grpc_slice CreateIncomingDataSlice(size_t length, size_t frame_size) { static void BM_TransportStreamRecv(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; Fixture f(grpc::ChannelArguments(), true); Stream s(&f); s.Init(state); diff --git a/test/cpp/microbenchmarks/bm_closure.cc b/test/cpp/microbenchmarks/bm_closure.cc index f28093ae17d..4d5a82c3f67 100644 --- a/test/cpp/microbenchmarks/bm_closure.cc +++ b/test/cpp/microbenchmarks/bm_closure.cc @@ -34,7 +34,7 @@ auto& force_library_initialization = Library::get(); static void BM_NoOpExecCtx(benchmark::State& state) { TrackCounters track_counters; while (state.KeepRunning()) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; } track_counters.Finish(state); } @@ -42,7 +42,7 @@ BENCHMARK(BM_NoOpExecCtx); static void BM_WellFlushed(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { grpc_core::ExecCtx::Get()->Flush(); } @@ -68,7 +68,7 @@ static void BM_ClosureInitAgainstCombiner(benchmark::State& state) { TrackCounters track_counters; grpc_combiner* combiner = grpc_combiner_create(); grpc_closure c; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { benchmark::DoNotOptimize(GRPC_CLOSURE_INIT( &c, DoNothing, nullptr, grpc_combiner_scheduler(combiner))); @@ -83,7 +83,7 @@ static void BM_ClosureRunOnExecCtx(benchmark::State& state) { TrackCounters track_counters; grpc_closure c; GRPC_CLOSURE_INIT(&c, DoNothing, nullptr, grpc_schedule_on_exec_ctx); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_RUN(&c, GRPC_ERROR_NONE); grpc_core::ExecCtx::Get()->Flush(); @@ -95,7 +95,7 @@ BENCHMARK(BM_ClosureRunOnExecCtx); static void BM_ClosureCreateAndRun(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_RUN( GRPC_CLOSURE_CREATE(DoNothing, nullptr, grpc_schedule_on_exec_ctx), @@ -108,7 +108,7 @@ BENCHMARK(BM_ClosureCreateAndRun); static void BM_ClosureInitAndRun(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_closure c; while (state.KeepRunning()) { GRPC_CLOSURE_RUN( @@ -124,7 +124,7 @@ static void BM_ClosureSchedOnExecCtx(benchmark::State& state) { TrackCounters track_counters; grpc_closure c; GRPC_CLOSURE_INIT(&c, DoNothing, nullptr, grpc_schedule_on_exec_ctx); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c, GRPC_ERROR_NONE); grpc_core::ExecCtx::Get()->Flush(); @@ -140,7 +140,7 @@ static void BM_ClosureSched2OnExecCtx(benchmark::State& state) { grpc_closure c2; GRPC_CLOSURE_INIT(&c1, DoNothing, nullptr, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&c2, DoNothing, nullptr, grpc_schedule_on_exec_ctx); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); @@ -159,7 +159,7 @@ static void BM_ClosureSched3OnExecCtx(benchmark::State& state) { GRPC_CLOSURE_INIT(&c1, DoNothing, nullptr, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&c2, DoNothing, nullptr, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&c3, DoNothing, nullptr, grpc_schedule_on_exec_ctx); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); @@ -176,7 +176,7 @@ static void BM_AcquireMutex(benchmark::State& state) { // for comparison with the combiner stuff below gpr_mu mu; gpr_mu_init(&mu); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { gpr_mu_lock(&mu); DoNothing(nullptr, GRPC_ERROR_NONE); @@ -192,7 +192,7 @@ static void BM_TryAcquireMutex(benchmark::State& state) { // for comparison with the combiner stuff below gpr_mu mu; gpr_mu_init(&mu); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { if (gpr_mu_trylock(&mu)) { DoNothing(nullptr, GRPC_ERROR_NONE); @@ -210,7 +210,7 @@ static void BM_AcquireSpinlock(benchmark::State& state) { TrackCounters track_counters; // for comparison with the combiner stuff below gpr_spinlock mu = GPR_SPINLOCK_INITIALIZER; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { gpr_spinlock_lock(&mu); DoNothing(nullptr, GRPC_ERROR_NONE); @@ -225,7 +225,7 @@ static void BM_TryAcquireSpinlock(benchmark::State& state) { TrackCounters track_counters; // for comparison with the combiner stuff below gpr_spinlock mu = GPR_SPINLOCK_INITIALIZER; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { if (gpr_spinlock_trylock(&mu)) { DoNothing(nullptr, GRPC_ERROR_NONE); @@ -244,7 +244,7 @@ static void BM_ClosureSchedOnCombiner(benchmark::State& state) { grpc_combiner* combiner = grpc_combiner_create(); grpc_closure c; GRPC_CLOSURE_INIT(&c, DoNothing, nullptr, grpc_combiner_scheduler(combiner)); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c, GRPC_ERROR_NONE); grpc_core::ExecCtx::Get()->Flush(); @@ -262,7 +262,7 @@ static void BM_ClosureSched2OnCombiner(benchmark::State& state) { grpc_closure c2; GRPC_CLOSURE_INIT(&c1, DoNothing, nullptr, grpc_combiner_scheduler(combiner)); GRPC_CLOSURE_INIT(&c2, DoNothing, nullptr, grpc_combiner_scheduler(combiner)); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); @@ -283,7 +283,7 @@ static void BM_ClosureSched3OnCombiner(benchmark::State& state) { GRPC_CLOSURE_INIT(&c1, DoNothing, nullptr, grpc_combiner_scheduler(combiner)); GRPC_CLOSURE_INIT(&c2, DoNothing, nullptr, grpc_combiner_scheduler(combiner)); GRPC_CLOSURE_INIT(&c3, DoNothing, nullptr, grpc_combiner_scheduler(combiner)); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); @@ -306,7 +306,7 @@ static void BM_ClosureSched2OnTwoCombiners(benchmark::State& state) { grpc_combiner_scheduler(combiner1)); GRPC_CLOSURE_INIT(&c2, DoNothing, nullptr, grpc_combiner_scheduler(combiner2)); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); @@ -335,7 +335,7 @@ static void BM_ClosureSched4OnTwoCombiners(benchmark::State& state) { grpc_combiner_scheduler(combiner1)); GRPC_CLOSURE_INIT(&c4, DoNothing, nullptr, grpc_combiner_scheduler(combiner2)); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); @@ -381,7 +381,7 @@ class Rescheduler { static void BM_ClosureReschedOnExecCtx(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; Rescheduler r(state, grpc_schedule_on_exec_ctx); r.ScheduleFirst(); @@ -391,7 +391,7 @@ BENCHMARK(BM_ClosureReschedOnExecCtx); static void BM_ClosureReschedOnCombiner(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_combiner* combiner = grpc_combiner_create(); Rescheduler r(state, grpc_combiner_scheduler(combiner)); r.ScheduleFirst(); @@ -404,7 +404,7 @@ BENCHMARK(BM_ClosureReschedOnCombiner); static void BM_ClosureReschedOnCombinerFinally(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_combiner* combiner = grpc_combiner_create(); Rescheduler r(state, grpc_combiner_finally_scheduler(combiner)); r.ScheduleFirstAgainstDifferentScheduler(grpc_combiner_scheduler(combiner)); diff --git a/test/cpp/microbenchmarks/bm_cq.cc b/test/cpp/microbenchmarks/bm_cq.cc index 16f451d98ff..97242598f19 100644 --- a/test/cpp/microbenchmarks/bm_cq.cc +++ b/test/cpp/microbenchmarks/bm_cq.cc @@ -81,7 +81,7 @@ static void BM_Pass1Cpp(benchmark::State& state) { while (state.KeepRunning()) { grpc_cq_completion completion; DummyTag dummy_tag; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT(grpc_cq_begin_op(c_cq, &dummy_tag)); grpc_cq_end_op(c_cq, &dummy_tag, GRPC_ERROR_NONE, DoneWithCompletionOnStack, nullptr, &completion); @@ -101,7 +101,7 @@ static void BM_Pass1Core(benchmark::State& state) { gpr_timespec deadline = gpr_inf_future(GPR_CLOCK_MONOTONIC); while (state.KeepRunning()) { grpc_cq_completion completion; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT(grpc_cq_begin_op(cq, nullptr)); grpc_cq_end_op(cq, nullptr, GRPC_ERROR_NONE, DoneWithCompletionOnStack, nullptr, &completion); @@ -120,7 +120,7 @@ static void BM_Pluck1Core(benchmark::State& state) { gpr_timespec deadline = gpr_inf_future(GPR_CLOCK_MONOTONIC); while (state.KeepRunning()) { grpc_cq_completion completion; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT(grpc_cq_begin_op(cq, nullptr)); grpc_cq_end_op(cq, nullptr, GRPC_ERROR_NONE, DoneWithCompletionOnStack, nullptr, &completion); diff --git a/test/cpp/microbenchmarks/bm_error.cc b/test/cpp/microbenchmarks/bm_error.cc index fd888a5a40d..d12f475a493 100644 --- a/test/cpp/microbenchmarks/bm_error.cc +++ b/test/cpp/microbenchmarks/bm_error.cc @@ -246,7 +246,7 @@ template static void BM_ErrorGetStatus(benchmark::State& state) { TrackCounters track_counters; Fixture fixture; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { grpc_status_code status; grpc_slice slice; @@ -261,7 +261,7 @@ template static void BM_ErrorGetStatusCode(benchmark::State& state) { TrackCounters track_counters; Fixture fixture; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { grpc_status_code status; grpc_error_get_status(fixture.error(), fixture.deadline(), &status, nullptr, @@ -275,7 +275,7 @@ template static void BM_ErrorHttpError(benchmark::State& state) { TrackCounters track_counters; Fixture fixture; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { grpc_http2_error_code error; grpc_error_get_status(fixture.error(), fixture.deadline(), nullptr, nullptr, diff --git a/test/cpp/microbenchmarks/bm_fullstack_trickle.cc b/test/cpp/microbenchmarks/bm_fullstack_trickle.cc index 23ca750307e..0212cdddf8c 100644 --- a/test/cpp/microbenchmarks/bm_fullstack_trickle.cc +++ b/test/cpp/microbenchmarks/bm_fullstack_trickle.cc @@ -177,7 +177,7 @@ class TrickledCHTTP2 : public EndpointPairFixture { } void Step(bool update_stats) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; inc_time(); size_t client_backlog = grpc_trickle_endpoint_trickle(endpoint_pair_.client); diff --git a/test/cpp/microbenchmarks/bm_metadata.cc b/test/cpp/microbenchmarks/bm_metadata.cc index 62c9a2e335c..f1e7890fc03 100644 --- a/test/cpp/microbenchmarks/bm_metadata.cc +++ b/test/cpp/microbenchmarks/bm_metadata.cc @@ -90,7 +90,7 @@ static void BM_MetadataFromNonInternedSlices(benchmark::State& state) { TrackCounters track_counters; gpr_slice k = grpc_slice_from_static_string("key"); gpr_slice v = grpc_slice_from_static_string("value"); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, nullptr)); } @@ -103,7 +103,7 @@ static void BM_MetadataFromInternedSlices(benchmark::State& state) { TrackCounters track_counters; gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, nullptr)); } @@ -119,7 +119,7 @@ static void BM_MetadataFromInternedSlicesAlreadyInIndex( TrackCounters track_counters; gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_mdelem seed = grpc_mdelem_create(k, v, nullptr); while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, nullptr)); @@ -136,7 +136,7 @@ static void BM_MetadataFromInternedKey(benchmark::State& state) { TrackCounters track_counters; gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_from_static_string("value"); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, nullptr)); } @@ -152,7 +152,7 @@ static void BM_MetadataFromNonInternedSlicesWithBackingStore( gpr_slice k = grpc_slice_from_static_string("key"); gpr_slice v = grpc_slice_from_static_string("value"); char backing_store[sizeof(grpc_mdelem_data)]; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create( k, v, reinterpret_cast(backing_store))); @@ -168,7 +168,7 @@ static void BM_MetadataFromInternedSlicesWithBackingStore( gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); char backing_store[sizeof(grpc_mdelem_data)]; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create( k, v, reinterpret_cast(backing_store))); @@ -186,7 +186,7 @@ static void BM_MetadataFromInternedKeyWithBackingStore( gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_from_static_string("value"); char backing_store[sizeof(grpc_mdelem_data)]; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create( k, v, reinterpret_cast(backing_store))); @@ -201,7 +201,7 @@ static void BM_MetadataFromStaticMetadataStrings(benchmark::State& state) { TrackCounters track_counters; gpr_slice k = GRPC_MDSTR_STATUS; gpr_slice v = GRPC_MDSTR_200; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, nullptr)); } @@ -216,7 +216,7 @@ static void BM_MetadataFromStaticMetadataStringsNotIndexed( TrackCounters track_counters; gpr_slice k = GRPC_MDSTR_STATUS; gpr_slice v = GRPC_MDSTR_GZIP; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, nullptr)); } @@ -229,7 +229,7 @@ BENCHMARK(BM_MetadataFromStaticMetadataStringsNotIndexed); static void BM_MetadataRefUnrefExternal(benchmark::State& state) { TrackCounters track_counters; char backing_store[sizeof(grpc_mdelem_data)]; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_mdelem el = grpc_mdelem_create( grpc_slice_from_static_string("a"), grpc_slice_from_static_string("b"), reinterpret_cast(backing_store)); @@ -245,7 +245,7 @@ BENCHMARK(BM_MetadataRefUnrefExternal); static void BM_MetadataRefUnrefInterned(benchmark::State& state) { TrackCounters track_counters; char backing_store[sizeof(grpc_mdelem_data)]; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); grpc_mdelem el = grpc_mdelem_create( @@ -263,7 +263,7 @@ BENCHMARK(BM_MetadataRefUnrefInterned); static void BM_MetadataRefUnrefAllocated(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_mdelem el = grpc_mdelem_create(grpc_slice_from_static_string("a"), grpc_slice_from_static_string("b"), nullptr); @@ -278,7 +278,7 @@ BENCHMARK(BM_MetadataRefUnrefAllocated); static void BM_MetadataRefUnrefStatic(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_mdelem el = grpc_mdelem_create(GRPC_MDSTR_STATUS, GRPC_MDSTR_200, nullptr); while (state.KeepRunning()) { diff --git a/test/cpp/microbenchmarks/bm_pollset.cc b/test/cpp/microbenchmarks/bm_pollset.cc index 9a859b51eac..d9d5164cce5 100644 --- a/test/cpp/microbenchmarks/bm_pollset.cc +++ b/test/cpp/microbenchmarks/bm_pollset.cc @@ -50,7 +50,7 @@ static void BM_CreateDestroyPollset(benchmark::State& state) { size_t ps_sz = grpc_pollset_size(); grpc_pollset* ps = static_cast(gpr_malloc(ps_sz)); gpr_mu* mu; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_closure shutdown_ps_closure; GRPC_CLOSURE_INIT(&shutdown_ps_closure, shutdown_ps, ps, grpc_schedule_on_exec_ctx); @@ -114,7 +114,7 @@ static void BM_PollEmptyPollset(benchmark::State& state) { grpc_pollset* ps = static_cast(gpr_zalloc(ps_sz)); gpr_mu* mu; grpc_pollset_init(ps, &mu); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_mu_lock(mu); while (state.KeepRunning()) { GRPC_ERROR_UNREF(grpc_pollset_work(ps, nullptr, 0)); @@ -136,7 +136,7 @@ static void BM_PollAddFd(benchmark::State& state) { grpc_pollset* ps = static_cast(gpr_zalloc(ps_sz)); gpr_mu* mu; grpc_pollset_init(ps, &mu); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_wakeup_fd wakeup_fd; GPR_ASSERT( GRPC_LOG_IF_ERROR("wakeup_fd_init", grpc_wakeup_fd_init(&wakeup_fd))); @@ -218,7 +218,7 @@ static void BM_SingleThreadPollOneFd(benchmark::State& state) { grpc_pollset* ps = static_cast(gpr_zalloc(ps_sz)); gpr_mu* mu; grpc_pollset_init(ps, &mu); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_wakeup_fd wakeup_fd; GRPC_ERROR_UNREF(grpc_wakeup_fd_init(&wakeup_fd)); grpc_fd* wakeup = grpc_fd_create(wakeup_fd.read_fd, "wakeup_read"); diff --git a/test/cpp/microbenchmarks/fullstack_fixtures.h b/test/cpp/microbenchmarks/fullstack_fixtures.h index 15202820097..ab0a696e3d6 100644 --- a/test/cpp/microbenchmarks/fullstack_fixtures.h +++ b/test/cpp/microbenchmarks/fullstack_fixtures.h @@ -166,7 +166,7 @@ class EndpointPairFixture : public BaseFixture { fixture_configuration.ApplyCommonServerBuilderConfig(&b); server_ = b.BuildAndStart(); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; /* add server endpoint to server_ * */ diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc index 3bd1df94291..3481d9d1aaf 100644 --- a/test/cpp/naming/resolver_component_test.cc +++ b/test/cpp/naming/resolver_component_test.cc @@ -196,7 +196,7 @@ void PollPollsetUntilRequestDone(ArgsStruct* args) { time_left.tv_sec, time_left.tv_nsec); GPR_ASSERT(gpr_time_cmp(time_left, gpr_time_0(GPR_TIMESPAN)) >= 0); grpc_pollset_worker* worker = nullptr; - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; gpr_mu_lock(args->mu); GRPC_LOG_IF_ERROR("pollset_work", grpc_pollset_work(args->pollset, &worker, @@ -275,7 +275,7 @@ void CheckResolverResultLocked(void* argsp, grpc_error* err) { } TEST(ResolverComponentTest, TestResolvesRelevantRecords) { - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; ArgsStruct args; ArgsInit(&args); args.expected_addrs = ParseExpectedAddrs(FLAGS_expected_addrs); diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc index c5d29469b26..1711eef3039 100644 --- a/test/cpp/performance/writes_per_rpc_test.cc +++ b/test/cpp/performance/writes_per_rpc_test.cc @@ -82,7 +82,7 @@ class EndpointPairFixture { ApplyCommonServerBuilderConfig(&b); server_ = b.BuildAndStart(); - grpc_core::ExecCtx _local_exec_ctx; + grpc_core::ExecCtx exec_ctx; /* add server endpoint to server_ */ { From e8b331305cd9613867e5c012a78030b89d9ef814 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 28 Nov 2017 13:54:13 +0100 Subject: [PATCH 028/127] basic pooling of requestcallcontext --- src/csharp/Grpc.Core/Internal/CompletionRegistry.cs | 8 ++++++-- src/csharp/Grpc.Core/Internal/GrpcThreadPool.cs | 2 +- src/csharp/Grpc.Core/Internal/ServerSafeHandle.cs | 3 +-- src/csharp/Grpc.Core/Server.cs | 1 + .../Grpc.Microbenchmarks/CompletionRegistryBenchmark.cs | 4 ++-- src/csharp/Grpc.Microbenchmarks/SendMessageBenchmark.cs | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/csharp/Grpc.Core/Internal/CompletionRegistry.cs b/src/csharp/Grpc.Core/Internal/CompletionRegistry.cs index cf3f3c0995a..79d0c914209 100644 --- a/src/csharp/Grpc.Core/Internal/CompletionRegistry.cs +++ b/src/csharp/Grpc.Core/Internal/CompletionRegistry.cs @@ -37,14 +37,16 @@ namespace Grpc.Core.Internal readonly GrpcEnvironment environment; readonly Func batchContextFactory; + readonly Func requestCallContextFactory; readonly Dictionary dict = new Dictionary(new IntPtrComparer()); SpinLock spinLock = new SpinLock(Debugger.IsAttached); IntPtr lastRegisteredKey; // only for testing - public CompletionRegistry(GrpcEnvironment environment, Func batchContextFactory) + public CompletionRegistry(GrpcEnvironment environment, Func batchContextFactory, Func requestCallContextFactory) { this.environment = GrpcPreconditions.CheckNotNull(environment); this.batchContextFactory = GrpcPreconditions.CheckNotNull(batchContextFactory); + this.requestCallContextFactory = GrpcPreconditions.CheckNotNull(requestCallContextFactory); } public void Register(IntPtr key, IOpCompletionCallback callback) @@ -73,10 +75,12 @@ namespace Grpc.Core.Internal return ctx; } - public void RegisterRequestCallCompletion(RequestCallContextSafeHandle ctx, RequestCallCompletionDelegate callback) + public RequestCallContextSafeHandle RegisterRequestCallCompletion(RequestCallCompletionDelegate callback) { + var ctx = requestCallContextFactory(); ctx.CompletionCallback = callback; Register(ctx.Handle, ctx); + return ctx; } public IOpCompletionCallback Extract(IntPtr key) diff --git a/src/csharp/Grpc.Core/Internal/GrpcThreadPool.cs b/src/csharp/Grpc.Core/Internal/GrpcThreadPool.cs index f1b5a4f9ffd..010a6c6998f 100644 --- a/src/csharp/Grpc.Core/Internal/GrpcThreadPool.cs +++ b/src/csharp/Grpc.Core/Internal/GrpcThreadPool.cs @@ -219,7 +219,7 @@ namespace Grpc.Core.Internal var list = new List(); for (int i = 0; i < completionQueueCount; i++) { - var completionRegistry = new CompletionRegistry(environment, () => environment.BatchContextPool.Lease()); + var completionRegistry = new CompletionRegistry(environment, () => environment.BatchContextPool.Lease(), () => RequestCallContextSafeHandle.Create()); list.Add(CompletionQueueSafeHandle.CreateAsync(completionRegistry)); } return list.AsReadOnly(); diff --git a/src/csharp/Grpc.Core/Internal/ServerSafeHandle.cs b/src/csharp/Grpc.Core/Internal/ServerSafeHandle.cs index 9b7ea884dd0..56dda9cff54 100644 --- a/src/csharp/Grpc.Core/Internal/ServerSafeHandle.cs +++ b/src/csharp/Grpc.Core/Internal/ServerSafeHandle.cs @@ -75,8 +75,7 @@ namespace Grpc.Core.Internal { using (completionQueue.NewScope()) { - var ctx = RequestCallContextSafeHandle.Create(); - completionQueue.CompletionRegistry.RegisterRequestCallCompletion(ctx, callback); + var ctx = completionQueue.CompletionRegistry.RegisterRequestCallCompletion(callback); Native.grpcsharp_server_request_call(this, completionQueue, ctx).CheckOk(); } } diff --git a/src/csharp/Grpc.Core/Server.cs b/src/csharp/Grpc.Core/Server.cs index 71c7f108f33..60dacbf126c 100644 --- a/src/csharp/Grpc.Core/Server.cs +++ b/src/csharp/Grpc.Core/Server.cs @@ -300,6 +300,7 @@ namespace Grpc.Core { if (!shutdownRequested) { + // TODO(jtattermusch): avoid unnecessary delegate allocation handle.RequestCall((success, ctx) => HandleNewServerRpc(success, ctx, cq), cq); } } diff --git a/src/csharp/Grpc.Microbenchmarks/CompletionRegistryBenchmark.cs b/src/csharp/Grpc.Microbenchmarks/CompletionRegistryBenchmark.cs index eefdb50e39f..c84473830c6 100644 --- a/src/csharp/Grpc.Microbenchmarks/CompletionRegistryBenchmark.cs +++ b/src/csharp/Grpc.Microbenchmarks/CompletionRegistryBenchmark.cs @@ -43,7 +43,7 @@ namespace Grpc.Microbenchmarks public void Run(int threadCount, int iterations, bool useSharedRegistry) { Console.WriteLine(string.Format("CompletionRegistryBenchmark: threads={0}, iterations={1}, useSharedRegistry={2}", threadCount, iterations, useSharedRegistry)); - CompletionRegistry sharedRegistry = useSharedRegistry ? new CompletionRegistry(environment, () => BatchContextSafeHandle.Create()) : null; + CompletionRegistry sharedRegistry = useSharedRegistry ? new CompletionRegistry(environment, () => BatchContextSafeHandle.Create(), () => RequestCallContextSafeHandle.Create()) : null; var threadedBenchmark = new ThreadedBenchmark(threadCount, () => ThreadBody(iterations, sharedRegistry)); threadedBenchmark.Run(); // TODO: parametrize by number of pending completions @@ -51,7 +51,7 @@ namespace Grpc.Microbenchmarks private void ThreadBody(int iterations, CompletionRegistry optionalSharedRegistry) { - var completionRegistry = optionalSharedRegistry ?? new CompletionRegistry(environment, () => BatchContextSafeHandle.Create()); + var completionRegistry = optionalSharedRegistry ?? new CompletionRegistry(environment, () => BatchContextSafeHandle.Create(), () => RequestCallContextSafeHandle.Create()); var ctx = BatchContextSafeHandle.Create(); var stopwatch = Stopwatch.StartNew(); diff --git a/src/csharp/Grpc.Microbenchmarks/SendMessageBenchmark.cs b/src/csharp/Grpc.Microbenchmarks/SendMessageBenchmark.cs index da4f35ff963..f16113539a1 100644 --- a/src/csharp/Grpc.Microbenchmarks/SendMessageBenchmark.cs +++ b/src/csharp/Grpc.Microbenchmarks/SendMessageBenchmark.cs @@ -52,7 +52,7 @@ namespace Grpc.Microbenchmarks private void ThreadBody(int iterations, int payloadSize) { - var completionRegistry = new CompletionRegistry(environment, () => environment.BatchContextPool.Lease()); + var completionRegistry = new CompletionRegistry(environment, () => environment.BatchContextPool.Lease(), () => RequestCallContextSafeHandle.Create()); var cq = CompletionQueueSafeHandle.CreateAsync(completionRegistry); var call = CreateFakeCall(cq); From fb6d01a30cc4da420ea1be904ae3b9c9c1b6992e Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 28 Nov 2017 16:46:41 +0100 Subject: [PATCH 029/127] recycling of requestcallcontext --- .../Internal/CompletionQueueSafeHandleTest.cs | 2 +- .../Grpc.Core/Internal/NativeMethods.cs | 3 +++ .../Internal/RequestCallContextSafeHandle.cs | 22 ++++++++++++++++--- src/csharp/ext/grpc_csharp_ext.c | 13 +++++++---- 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/src/csharp/Grpc.Core.Tests/Internal/CompletionQueueSafeHandleTest.cs b/src/csharp/Grpc.Core.Tests/Internal/CompletionQueueSafeHandleTest.cs index 775c950c8ce..7e4e2975c16 100644 --- a/src/csharp/Grpc.Core.Tests/Internal/CompletionQueueSafeHandleTest.cs +++ b/src/csharp/Grpc.Core.Tests/Internal/CompletionQueueSafeHandleTest.cs @@ -40,7 +40,7 @@ namespace Grpc.Core.Internal.Tests public void CreateAsyncAndShutdown() { var env = GrpcEnvironment.AddRef(); - var cq = CompletionQueueSafeHandle.CreateAsync(new CompletionRegistry(env, () => BatchContextSafeHandle.Create())); + var cq = CompletionQueueSafeHandle.CreateAsync(new CompletionRegistry(env, () => BatchContextSafeHandle.Create(), () => RequestCallContextSafeHandle.Create())); cq.Shutdown(); var ev = cq.Next(); cq.Dispose(); diff --git a/src/csharp/Grpc.Core/Internal/NativeMethods.cs b/src/csharp/Grpc.Core/Internal/NativeMethods.cs index 43acb8f9156..8b15c2690f0 100644 --- a/src/csharp/Grpc.Core/Internal/NativeMethods.cs +++ b/src/csharp/Grpc.Core/Internal/NativeMethods.cs @@ -61,6 +61,7 @@ namespace Grpc.Core.Internal public readonly Delegates.grpcsharp_request_call_context_host_delegate grpcsharp_request_call_context_host; public readonly Delegates.grpcsharp_request_call_context_deadline_delegate grpcsharp_request_call_context_deadline; public readonly Delegates.grpcsharp_request_call_context_request_metadata_delegate grpcsharp_request_call_context_request_metadata; + public readonly Delegates.grpcsharp_request_call_context_reset_delegate grpcsharp_request_call_context_reset; public readonly Delegates.grpcsharp_request_call_context_destroy_delegate grpcsharp_request_call_context_destroy; public readonly Delegates.grpcsharp_composite_call_credentials_create_delegate grpcsharp_composite_call_credentials_create; @@ -179,6 +180,7 @@ namespace Grpc.Core.Internal this.grpcsharp_request_call_context_host = GetMethodDelegate(library); this.grpcsharp_request_call_context_deadline = GetMethodDelegate(library); this.grpcsharp_request_call_context_request_metadata = GetMethodDelegate(library); + this.grpcsharp_request_call_context_reset = GetMethodDelegate(library); this.grpcsharp_request_call_context_destroy = GetMethodDelegate(library); this.grpcsharp_composite_call_credentials_create = GetMethodDelegate(library); @@ -322,6 +324,7 @@ namespace Grpc.Core.Internal public delegate IntPtr grpcsharp_request_call_context_host_delegate(RequestCallContextSafeHandle ctx, out UIntPtr hostLength); public delegate Timespec grpcsharp_request_call_context_deadline_delegate(RequestCallContextSafeHandle ctx); public delegate IntPtr grpcsharp_request_call_context_request_metadata_delegate(RequestCallContextSafeHandle ctx); + public delegate void grpcsharp_request_call_context_reset_delegate(RequestCallContextSafeHandle ctx); public delegate void grpcsharp_request_call_context_destroy_delegate(IntPtr ctx); public delegate CallCredentialsSafeHandle grpcsharp_composite_call_credentials_create_delegate(CallCredentialsSafeHandle creds1, CallCredentialsSafeHandle creds2); diff --git a/src/csharp/Grpc.Core/Internal/RequestCallContextSafeHandle.cs b/src/csharp/Grpc.Core/Internal/RequestCallContextSafeHandle.cs index 09f5c3e4526..59e9d9b1ab6 100644 --- a/src/csharp/Grpc.Core/Internal/RequestCallContextSafeHandle.cs +++ b/src/csharp/Grpc.Core/Internal/RequestCallContextSafeHandle.cs @@ -30,14 +30,17 @@ namespace Grpc.Core.Internal { static readonly NativeMethods Native = NativeMethods.Get(); static readonly ILogger Logger = GrpcEnvironment.Logger.ForType(); + IObjectPool ownedByPool; private RequestCallContextSafeHandle() { } - public static RequestCallContextSafeHandle Create() + public static RequestCallContextSafeHandle Create(IObjectPool ownedByPool = null) { - return Native.grpcsharp_request_call_context_create(); + var ctx = Native.grpcsharp_request_call_context_create(); + ctx.ownedByPool = ownedByPool; + return ctx; } public IntPtr Handle @@ -71,6 +74,19 @@ namespace Grpc.Core.Internal return new ServerRpcNew(server, call, method, host, deadline, metadata); } + public void Recycle() + { + if (ownedByPool != null) + { + Native.grpcsharp_request_call_context_reset(this); + ownedByPool.Return(this); + } + else + { + Dispose(); + } + } + protected override bool ReleaseHandle() { Native.grpcsharp_request_call_context_destroy(handle); @@ -90,7 +106,7 @@ namespace Grpc.Core.Internal finally { CompletionCallback = null; - Dispose(); + Recycle(); } } } diff --git a/src/csharp/ext/grpc_csharp_ext.c b/src/csharp/ext/grpc_csharp_ext.c index 24d779e1e57..6875d40aa08 100644 --- a/src/csharp/ext/grpc_csharp_ext.c +++ b/src/csharp/ext/grpc_csharp_ext.c @@ -226,17 +226,22 @@ grpcsharp_batch_context_destroy(grpcsharp_batch_context* ctx) { } GPR_EXPORT void GPR_CALLTYPE -grpcsharp_request_call_context_destroy(grpcsharp_request_call_context* ctx) { - if (!ctx) { - return; - } +grpcsharp_request_call_context_reset(grpcsharp_request_call_context* ctx) { /* NOTE: ctx->server_rpc_new.call is not destroyed because callback handler is supposed to take its ownership. */ grpc_call_details_destroy(&(ctx->call_details)); grpcsharp_metadata_array_destroy_metadata_only(&(ctx->request_metadata)); + memset(ctx, 0, sizeof(grpcsharp_request_call_context)); +} +GPR_EXPORT void GPR_CALLTYPE +grpcsharp_request_call_context_destroy(grpcsharp_request_call_context* ctx) { + if (!ctx) { + return; + } + grpcsharp_request_call_context_reset(ctx); gpr_free(ctx); } From 36dfd7d36365a4e435ef60eb5ffe7fda5b92ee21 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 28 Nov 2017 17:06:23 +0100 Subject: [PATCH 030/127] enable requestCallContext pooling --- src/csharp/Grpc.Core/GrpcEnvironment.cs | 28 +++++++++++++++++++ .../Grpc.Core/Internal/GrpcThreadPool.cs | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/csharp/Grpc.Core/GrpcEnvironment.cs b/src/csharp/Grpc.Core/GrpcEnvironment.cs index 2b1b5e32d74..7b4342b74b9 100644 --- a/src/csharp/Grpc.Core/GrpcEnvironment.cs +++ b/src/csharp/Grpc.Core/GrpcEnvironment.cs @@ -35,6 +35,8 @@ namespace Grpc.Core const int MinDefaultThreadPoolSize = 4; const int DefaultBatchContextPoolSharedCapacity = 10000; const int DefaultBatchContextPoolThreadLocalCapacity = 64; + const int DefaultRequestCallContextPoolSharedCapacity = 10000; + const int DefaultRequestCallContextPoolThreadLocalCapacity = 64; static object staticLock = new object(); static GrpcEnvironment instance; @@ -44,12 +46,15 @@ namespace Grpc.Core static bool inlineHandlers; static int batchContextPoolSharedCapacity = DefaultBatchContextPoolSharedCapacity; static int batchContextPoolThreadLocalCapacity = DefaultBatchContextPoolThreadLocalCapacity; + static int requestCallContextPoolSharedCapacity = DefaultRequestCallContextPoolSharedCapacity; + static int requestCallContextPoolThreadLocalCapacity = DefaultRequestCallContextPoolThreadLocalCapacity; static readonly HashSet registeredChannels = new HashSet(); static readonly HashSet registeredServers = new HashSet(); static ILogger logger = new LogLevelFilterLogger(new ConsoleLogger(), LogLevel.Off, true); readonly IObjectPool batchContextPool; + readonly IObjectPool requestCallContextPool; readonly GrpcThreadPool threadPool; readonly DebugStats debugStats = new DebugStats(); readonly AtomicCounter cqPickerCounter = new AtomicCounter(); @@ -262,6 +267,26 @@ namespace Grpc.Core } } + /// + /// Sets the parameters for a pool that caches request call context instances. Reusing request call context instances + /// instead of creating a new one for every requested call in C core helps reducing the GC pressure. + /// Can be only invoked before the GrpcEnviroment is started and cannot be changed afterwards. + /// This is an advanced setting and you should only use it if you know what you are doing. + /// Most users should rely on the default value provided by gRPC library. + /// Note: this method is part of an experimental API that can change or be removed without any prior notice. + /// + public static void SetRequestCallContextPoolParams(int sharedCapacity, int threadLocalCapacity) + { + lock (staticLock) + { + GrpcPreconditions.CheckState(instance == null, "Can only be set before GrpcEnvironment is initialized"); + GrpcPreconditions.CheckArgument(sharedCapacity >= 0, "Shared capacity needs to be a non-negative number"); + GrpcPreconditions.CheckArgument(threadLocalCapacity >= 0, "Thread local capacity needs to be a non-negative number"); + requestCallContextPoolSharedCapacity = sharedCapacity; + requestCallContextPoolThreadLocalCapacity = threadLocalCapacity; + } + } + /// /// Occurs when GrpcEnvironment is about the start the shutdown logic. /// If GrpcEnvironment is later initialized and shutdown, the event will be fired again (unless unregistered first). @@ -275,6 +300,7 @@ namespace Grpc.Core { GrpcNativeInit(); batchContextPool = new DefaultObjectPool(() => BatchContextSafeHandle.Create(this.batchContextPool), batchContextPoolSharedCapacity, batchContextPoolThreadLocalCapacity); + requestCallContextPool = new DefaultObjectPool(() => RequestCallContextSafeHandle.Create(this.requestCallContextPool), requestCallContextPoolSharedCapacity, requestCallContextPoolThreadLocalCapacity); threadPool = new GrpcThreadPool(this, GetThreadPoolSizeOrDefault(), GetCompletionQueueCountOrDefault(), inlineHandlers); threadPool.Start(); } @@ -292,6 +318,8 @@ namespace Grpc.Core internal IObjectPool BatchContextPool => batchContextPool; + internal IObjectPool RequestCallContextPool => requestCallContextPool; + internal bool IsAlive { get diff --git a/src/csharp/Grpc.Core/Internal/GrpcThreadPool.cs b/src/csharp/Grpc.Core/Internal/GrpcThreadPool.cs index 010a6c6998f..8ddda9be5cd 100644 --- a/src/csharp/Grpc.Core/Internal/GrpcThreadPool.cs +++ b/src/csharp/Grpc.Core/Internal/GrpcThreadPool.cs @@ -219,7 +219,7 @@ namespace Grpc.Core.Internal var list = new List(); for (int i = 0; i < completionQueueCount; i++) { - var completionRegistry = new CompletionRegistry(environment, () => environment.BatchContextPool.Lease(), () => RequestCallContextSafeHandle.Create()); + var completionRegistry = new CompletionRegistry(environment, () => environment.BatchContextPool.Lease(), () => environment.RequestCallContextPool.Lease()); list.Add(CompletionQueueSafeHandle.CreateAsync(completionRegistry)); } return list.AsReadOnly(); From ede1b2703d4058578b8b5830f006c89c9216521b Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Thu, 30 Nov 2017 11:06:37 -0800 Subject: [PATCH 031/127] Merging master --- src/core/lib/iomgr/fork_posix.cc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/core/lib/iomgr/fork_posix.cc b/src/core/lib/iomgr/fork_posix.cc index a55b3a349a2..969b7ac6702 100644 --- a/src/core/lib/iomgr/fork_posix.cc +++ b/src/core/lib/iomgr/fork_posix.cc @@ -49,10 +49,10 @@ void grpc_prefork() { return; } if (grpc_is_initialized()) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_timer_manager_set_threading(false); - grpc_executor_set_threading(&exec_ctx, false); - grpc_exec_ctx_finish(&exec_ctx); + grpc_executor_set_threading(false); + grpc_core::ExecCtx::Get()->Flush(); if (!gpr_await_threads( gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_seconds(3, GPR_TIMESPAN)))) { @@ -64,18 +64,17 @@ void grpc_prefork() { void grpc_postfork_parent() { if (grpc_is_initialized()) { grpc_timer_manager_set_threading(true); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_executor_set_threading(&exec_ctx, true); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_executor_set_threading(true); } } void grpc_postfork_child() { if (grpc_is_initialized()) { grpc_timer_manager_set_threading(true); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_executor_set_threading(&exec_ctx, true); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_executor_set_threading(true); + grpc_core::ExecCtx::Get()->Flush(); } } From da341bcb8969264800f63eac718e5b483aba9896 Mon Sep 17 00:00:00 2001 From: Dave MacLachlan Date: Thu, 30 Nov 2017 12:48:22 -0800 Subject: [PATCH 032/127] Fix up review comments --- src/core/lib/iomgr/ev_poll_posix.cc | 2 +- src/core/lib/iomgr/executor.cc | 2 +- src/core/lib/iomgr/timer_manager.cc | 2 +- src/core/lib/support/thd_posix.cc | 11 ++++++----- test/core/bad_client/bad_client.cc | 2 +- test/core/end2end/bad_server_response_test.cc | 2 +- test/core/end2end/fixtures/http_proxy_fixture.cc | 2 +- test/core/end2end/fixtures/proxy.cc | 2 +- test/core/end2end/tests/connectivity.cc | 2 +- test/core/handshake/client_ssl.cc | 2 +- test/core/handshake/server_ssl_common.cc | 2 +- test/core/iomgr/combiner_test.cc | 2 +- test/core/iomgr/resolve_address_posix_test.cc | 2 +- test/core/iomgr/wakeup_fd_cv_test.cc | 10 +++++----- test/core/support/arena_test.cc | 2 +- test/core/support/cpu_test.cc | 3 ++- test/core/support/mpscq_test.cc | 8 ++++---- test/core/support/spinlock_test.cc | 2 +- test/core/support/sync_test.cc | 2 +- test/core/support/thd_test.cc | 4 ++-- test/core/support/tls_test.cc | 2 +- test/core/surface/completion_queue_threading_test.cc | 5 +++-- test/core/surface/concurrent_connectivity_test.cc | 12 ++++++------ test/core/surface/sequential_connectivity_test.cc | 3 +-- 24 files changed, 45 insertions(+), 43 deletions(-) diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index 7f701b2fb78..e32e1ba42a9 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -1382,7 +1382,7 @@ static poll_args* get_poller_locked(struct pollfd* fds, nfds_t count) { gpr_thd_options opt = gpr_thd_options_default(); gpr_ref(&g_cvfds.pollcount); gpr_thd_options_set_detached(&opt); - GPR_ASSERT(gpr_thd_new(&t_id, "gpr_poller", &run_poll, pargs, &opt)); + GPR_ASSERT(gpr_thd_new(&t_id, "grpc_poller", &run_poll, pargs, &opt)); return pargs; } diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index 5c32ca3b360..fabdbdf934f 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -104,7 +104,7 @@ void grpc_executor_set_threading(grpc_exec_ctx* exec_ctx, bool threading) { gpr_thd_options opt = gpr_thd_options_default(); gpr_thd_options_set_joinable(&opt); - gpr_thd_new(&g_thread_state[0].id, "gpr_executor", executor_thread, + gpr_thd_new(&g_thread_state[0].id, "grpc_executor", executor_thread, &g_thread_state[0], &opt); } else { if (cur_threads == 0) return; diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc index 0e68637fa41..87ed0e05dcd 100644 --- a/src/core/lib/iomgr/timer_manager.cc +++ b/src/core/lib/iomgr/timer_manager.cc @@ -93,7 +93,7 @@ static void start_timer_thread_and_unlock(void) { // to leak through g_completed_threads and be freed in gc_completed_threads() // before "&ct->t" is written to, causing a use-after-free. gpr_mu_lock(&g_mu); - gpr_thd_new(&ct->t, "gpr_timer", timer_thread, ct, &opt); + gpr_thd_new(&ct->t, "grpc_global_timer", timer_thread, ct, &opt); gpr_mu_unlock(&g_mu); } diff --git a/src/core/lib/support/thd_posix.cc b/src/core/lib/support/thd_posix.cc index ae31a179908..fb308801740 100644 --- a/src/core/lib/support/thd_posix.cc +++ b/src/core/lib/support/thd_posix.cc @@ -33,22 +33,23 @@ struct thd_arg { void (*body)(void* arg); /* body of a thread */ void* arg; /* argument to a thread */ - const char* name; /* name of thread */ + const char* name; /* name of thread. Can be nullptr. */ }; /* Body of every thread started via gpr_thd_new. */ static void* thread_body(void* v) { struct thd_arg a = *(struct thd_arg*)v; free(v); - if (a.name != NULL) { + if (a.name != nullptr) { #if GPR_APPLE_PTHREAD_NAME /* Apple supports 64 characters, and will truncate if it's longer. */ pthread_setname_np(a.name); #elif GPR_LINUX_PTHREAD_NAME /* Linux supports 16 characters max, and will error if it's longer. */ char buf[16]; - strncpy(buf, a.name, sizeof(buf) - 1); - buf[sizeof(buf) - 1] = '\0'; + size_t buf_len = GPR_ARRAY_SIZE(buf) - 1; + strncpy(buf, a.name, buf_len); + buf[buf_len] = '\0'; pthread_setname_np(pthread_self(), buf); #endif // GPR_APPLE_PTHREAD_NAME } @@ -69,7 +70,7 @@ int gpr_thd_new(gpr_thd_id* t, const char* thd_name, a->body = thd_body; a->arg = arg; a->name = thd_name; - + GPR_ASSERT(pthread_attr_init(&attr) == 0); if (gpr_thd_options_is_detached(options)) { GPR_ASSERT(pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) == diff --git a/test/core/bad_client/bad_client.cc b/test/core/bad_client/bad_client.cc index 99e61b0c5f2..443886751ce 100644 --- a/test/core/bad_client/bad_client.cc +++ b/test/core/bad_client/bad_client.cc @@ -128,7 +128,7 @@ void grpc_run_bad_client_test( GPR_ASSERT(grpc_server_has_open_connections(a.server)); /* Start validator */ - gpr_thd_new(&id, "gpr_bad_client", thd_func, &a, nullptr); + gpr_thd_new(&id, "grpc_bad_client", thd_func, &a, nullptr); grpc_slice_buffer_init(&outgoing); grpc_slice_buffer_add(&outgoing, slice); diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc index 566fd129154..0fdb637eadd 100644 --- a/test/core/end2end/bad_server_response_test.cc +++ b/test/core/end2end/bad_server_response_test.cc @@ -262,7 +262,7 @@ static void poll_server_until_read_done(test_tcp_server* server, poll_args* pa = (poll_args*)gpr_malloc(sizeof(*pa)); pa->server = server; pa->signal_when_done = signal_when_done; - gpr_thd_new(&id, "gpr_poll_server", actually_poll_server, pa, nullptr); + gpr_thd_new(&id, "grpc_poll_server", actually_poll_server, pa, nullptr); } static void run_test(const char* response_payload, diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc index 25d8983503a..1c33e578ec5 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.cc +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -529,7 +529,7 @@ grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( // Start proxy thread. gpr_thd_options opt = gpr_thd_options_default(); gpr_thd_options_set_joinable(&opt); - GPR_ASSERT(gpr_thd_new(&proxy->thd, "gpr_http_proxy", thread_main, proxy, + GPR_ASSERT(gpr_thd_new(&proxy->thd, "grpc_http_proxy", thread_main, proxy, &opt)); return proxy; } diff --git a/test/core/end2end/fixtures/proxy.cc b/test/core/end2end/fixtures/proxy.cc index 6bbb1f4d1dd..00fc9fecbee 100644 --- a/test/core/end2end/fixtures/proxy.cc +++ b/test/core/end2end/fixtures/proxy.cc @@ -98,7 +98,7 @@ grpc_end2end_proxy* grpc_end2end_proxy_create(const grpc_end2end_proxy_def* def, grpc_call_details_init(&proxy->new_call_details); gpr_thd_options_set_joinable(&opt); - GPR_ASSERT(gpr_thd_new(&proxy->thd, "gpr_end2end_proxy", thread_main, proxy, + GPR_ASSERT(gpr_thd_new(&proxy->thd, "grpc_end2end_proxy", thread_main, proxy, &opt)); request_call(proxy); diff --git a/test/core/end2end/tests/connectivity.cc b/test/core/end2end/tests/connectivity.cc index 6477dcdd69d..7fab55cb3a5 100644 --- a/test/core/end2end/tests/connectivity.cc +++ b/test/core/end2end/tests/connectivity.cc @@ -68,7 +68,7 @@ static void test_connectivity(grpc_end2end_test_config config) { ce.cq = f.cq; gpr_event_init(&ce.started); gpr_thd_options_set_joinable(&thdopt); - GPR_ASSERT(gpr_thd_new(&thdid, "gpr_connectivity", child_thread, &ce, + GPR_ASSERT(gpr_thd_new(&thdid, "grpc_connectivity", child_thread, &ce, &thdopt)); gpr_event_wait(&ce.started, gpr_inf_future(GPR_CLOCK_MONOTONIC)); diff --git a/test/core/handshake/client_ssl.cc b/test/core/handshake/client_ssl.cc index 21147ef445e..2302e3da2f9 100644 --- a/test/core/handshake/client_ssl.cc +++ b/test/core/handshake/client_ssl.cc @@ -231,7 +231,7 @@ static bool client_ssl_test(char* server_alpn_preferred) { gpr_thd_id thdid; gpr_thd_options_set_joinable(&thdopt); server_args args = {server_socket, server_alpn_preferred}; - GPR_ASSERT(gpr_thd_new(&thdid, "gpr_client_ssl_test", server_thread, &args, + GPR_ASSERT(gpr_thd_new(&thdid, "grpc_client_ssl_test", server_thread, &args, &thdopt)); // Load key pair and establish client SSL credentials. diff --git a/test/core/handshake/server_ssl_common.cc b/test/core/handshake/server_ssl_common.cc index 9b06d31ab27..001d4e24cac 100644 --- a/test/core/handshake/server_ssl_common.cc +++ b/test/core/handshake/server_ssl_common.cc @@ -137,7 +137,7 @@ bool server_ssl_test(const char* alpn_list[], unsigned int alpn_list_len, gpr_thd_options thdopt = gpr_thd_options_default(); gpr_thd_id thdid; gpr_thd_options_set_joinable(&thdopt); - GPR_ASSERT(gpr_thd_new(&thdid, "gpr_ssl_test", server_thread, &port, + GPR_ASSERT(gpr_thd_new(&thdid, "grpc_ssl_test", server_thread, &port, &thdopt)); SSL_load_error_strings(); diff --git a/test/core/iomgr/combiner_test.cc b/test/core/iomgr/combiner_test.cc index 8c97d8a6ef5..33d892fa06a 100644 --- a/test/core/iomgr/combiner_test.cc +++ b/test/core/iomgr/combiner_test.cc @@ -112,7 +112,7 @@ static void test_execute_many(void) { ta[i].ctr = 0; ta[i].lock = lock; gpr_event_init(&ta[i].done); - GPR_ASSERT(gpr_thd_new(&thds[i], "gpr_execute_many", execute_many_loop, + GPR_ASSERT(gpr_thd_new(&thds[i], "grpc_execute_many", execute_many_loop, &ta[i], &options)); } for (size_t i = 0; i < GPR_ARRAY_SIZE(thds); i++) { diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index ea70dab89ef..836de423bd8 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -104,7 +104,7 @@ static void actually_poll(void* argsp) { static void poll_pollset_until_request_done(args_struct* args) { gpr_atm_rel_store(&args->done_atm, 0); gpr_thd_id id; - gpr_thd_new(&id, "gpr_poll_pollset", actually_poll, args, nullptr); + gpr_thd_new(&id, "grpc_poll_pollset", actually_poll, args, nullptr); } static void must_succeed(grpc_exec_ctx* exec_ctx, void* argsp, diff --git a/test/core/iomgr/wakeup_fd_cv_test.cc b/test/core/iomgr/wakeup_fd_cv_test.cc index 9d761712e75..d4e05bd7ef8 100644 --- a/test/core/iomgr/wakeup_fd_cv_test.cc +++ b/test/core/iomgr/wakeup_fd_cv_test.cc @@ -138,7 +138,7 @@ void test_poll_cv_trigger(void) { opt = gpr_thd_options_default(); gpr_thd_options_set_joinable(&opt); - gpr_thd_new(&t_id, "gpr_background_poll", &background_poll, &pargs, &opt); + gpr_thd_new(&t_id, "grpc_background_poll", &background_poll, &pargs, &opt); // Wakeup wakeup_fd not listening for events GPR_ASSERT(grpc_wakeup_fd_wakeup(&cvfd1) == GRPC_ERROR_NONE); @@ -154,7 +154,7 @@ void test_poll_cv_trigger(void) { // Pollin on socket fd pargs.timeout = -1; pargs.result = -2; - gpr_thd_new(&t_id, "gpr_background_poll", &background_poll, &pargs, &opt); + gpr_thd_new(&t_id, "grpc_background_poll", &background_poll, &pargs, &opt); trigger_socket_event(); gpr_thd_join(t_id); GPR_ASSERT(pargs.result == 1); @@ -168,7 +168,7 @@ void test_poll_cv_trigger(void) { // Pollin on wakeup fd reset_socket_event(); pargs.result = -2; - gpr_thd_new(&t_id, "gpr_background_poll", &background_poll, &pargs, &opt); + gpr_thd_new(&t_id, "grpc_background_poll", &background_poll, &pargs, &opt); GPR_ASSERT(grpc_wakeup_fd_wakeup(&cvfd2) == GRPC_ERROR_NONE); gpr_thd_join(t_id); @@ -182,7 +182,7 @@ void test_poll_cv_trigger(void) { // Pollin on wakeupfd before poll() pargs.result = -2; - gpr_thd_new(&t_id, "gpr_background_poll", &background_poll, &pargs, &opt); + gpr_thd_new(&t_id, "grpc_background_poll", &background_poll, &pargs, &opt); gpr_thd_join(t_id); GPR_ASSERT(pargs.result == 1); @@ -199,7 +199,7 @@ void test_poll_cv_trigger(void) { reset_socket_event(); GPR_ASSERT(grpc_wakeup_fd_consume_wakeup(&cvfd1) == GRPC_ERROR_NONE); GPR_ASSERT(grpc_wakeup_fd_consume_wakeup(&cvfd2) == GRPC_ERROR_NONE); - gpr_thd_new(&t_id, "gpr_background_poll", &background_poll, &pargs, &opt); + gpr_thd_new(&t_id, "grpc_background_poll", &background_poll, &pargs, &opt); gpr_thd_join(t_id); GPR_ASSERT(pargs.result == 0); diff --git a/test/core/support/arena_test.cc b/test/core/support/arena_test.cc index 4e11652318d..ada0f438542 100644 --- a/test/core/support/arena_test.cc +++ b/test/core/support/arena_test.cc @@ -100,7 +100,7 @@ static void concurrent_test(void) { for (int i = 0; i < CONCURRENT_TEST_THREADS; i++) { gpr_thd_options opt = gpr_thd_options_default(); gpr_thd_options_set_joinable(&opt); - gpr_thd_new(&thds[i], "gpr_concurrent_test", concurrent_test_body, &args, + gpr_thd_new(&thds[i], "grpc_concurrent_test", concurrent_test_body, &args, &opt); } diff --git a/test/core/support/cpu_test.cc b/test/core/support/cpu_test.cc index db94b8f1c43..53ce0f948c1 100644 --- a/test/core/support/cpu_test.cc +++ b/test/core/support/cpu_test.cc @@ -110,7 +110,8 @@ static void cpu_test(void) { gpr_cv_init(&ct.done_cv); ct.is_done = 0; for (i = 0; i < ct.ncores * 3; i++) { - GPR_ASSERT(gpr_thd_new(&thd, "gpr_cpu_test", &worker_thread, &ct, nullptr)); + GPR_ASSERT(gpr_thd_new(&thd, "grpc_cpu_test", &worker_thread, &ct, + nullptr)); } gpr_mu_lock(&ct.mu); while (!ct.is_done) { diff --git a/test/core/support/mpscq_test.cc b/test/core/support/mpscq_test.cc index 026b045b0fd..6a9ac4ca2ce 100644 --- a/test/core/support/mpscq_test.cc +++ b/test/core/support/mpscq_test.cc @@ -85,7 +85,7 @@ static void test_mt(void) { ta[i].ctr = 0; ta[i].q = &q; ta[i].start = &start; - GPR_ASSERT(gpr_thd_new(&thds[i], "gpr_test_md", test_thread, &ta[i], + GPR_ASSERT(gpr_thd_new(&thds[i], "grpc_mt_test", test_thread, &ta[i], &options)); } size_t num_done = 0; @@ -157,7 +157,7 @@ static void test_mt_multipop(void) { ta[i].ctr = 0; ta[i].q = &q; ta[i].start = &start; - GPR_ASSERT(gpr_thd_new(&thds[i], "gpr_multipop_test", test_thread, &ta[i], + GPR_ASSERT(gpr_thd_new(&thds[i], "grpc_multipop_test", test_thread, &ta[i], &options)); } pull_args pa; @@ -171,8 +171,8 @@ static void test_mt_multipop(void) { for (size_t i = 0; i < GPR_ARRAY_SIZE(pull_thds); i++) { gpr_thd_options options = gpr_thd_options_default(); gpr_thd_options_set_joinable(&options); - GPR_ASSERT(gpr_thd_new(&pull_thds[i], "gpr_multipop_pull", pull_thread, &pa, - &options)); + GPR_ASSERT(gpr_thd_new(&pull_thds[i], "grpc_multipop_pull", pull_thread, + &pa, &options)); } gpr_event_set(&start, (void*)1); for (size_t i = 0; i < GPR_ARRAY_SIZE(pull_thds); i++) { diff --git a/test/core/support/spinlock_test.cc b/test/core/support/spinlock_test.cc index 1658c5c5f1a..4828ce0c23f 100644 --- a/test/core/support/spinlock_test.cc +++ b/test/core/support/spinlock_test.cc @@ -67,7 +67,7 @@ static void test_create_threads(struct test* m, void (*body)(void* arg)) { for (i = 0; i != m->thread_count; i++) { gpr_thd_options opt = gpr_thd_options_default(); gpr_thd_options_set_joinable(&opt); - GPR_ASSERT(gpr_thd_new(&m->threads[i], "gpr_create_threads", body, m, + GPR_ASSERT(gpr_thd_new(&m->threads[i], "grpc_create_threads", body, m, &opt)); } } diff --git a/test/core/support/sync_test.cc b/test/core/support/sync_test.cc index de53742dd80..3f534de8203 100644 --- a/test/core/support/sync_test.cc +++ b/test/core/support/sync_test.cc @@ -189,7 +189,7 @@ static void test_create_threads(struct test* m, void (*body)(void* arg)) { gpr_thd_id id; int i; for (i = 0; i != m->threads; i++) { - GPR_ASSERT(gpr_thd_new(&id, "gpr_create_threads", body, m, nullptr)); + GPR_ASSERT(gpr_thd_new(&id, "grpc_create_threads", body, m, nullptr)); } } diff --git a/test/core/support/thd_test.cc b/test/core/support/thd_test.cc index 50702c4ae7e..b755bf18f37 100644 --- a/test/core/support/thd_test.cc +++ b/test/core/support/thd_test.cc @@ -74,7 +74,7 @@ static void test(void) { t.n = NUM_THREADS; t.is_done = 0; for (i = 0; i < NUM_THREADS; i++) { - GPR_ASSERT(gpr_thd_new(&thd, "gpr_thread_test", &thd_body, &t, nullptr)); + GPR_ASSERT(gpr_thd_new(&thd, "grpc_thread_test", &thd_body, &t, nullptr)); } gpr_mu_lock(&t.mu); while (!t.is_done) { @@ -84,7 +84,7 @@ static void test(void) { GPR_ASSERT(t.n == 0); gpr_thd_options_set_joinable(&options); for (i = 0; i < NUM_THREADS; i++) { - GPR_ASSERT(gpr_thd_new(&thds[i], "gpr_thread_test_joinable", + GPR_ASSERT(gpr_thd_new(&thds[i], "grpc_joinable_thread_test", &thd_body_joinable, nullptr, &options)); } for (i = 0; i < NUM_THREADS; i++) { diff --git a/test/core/support/tls_test.cc b/test/core/support/tls_test.cc index 2a560a4df37..743b10f0907 100644 --- a/test/core/support/tls_test.cc +++ b/test/core/support/tls_test.cc @@ -56,7 +56,7 @@ int main(int argc, char* argv[]) { gpr_thd_options_set_joinable(&opt); for (i = 0; i < NUM_THREADS; i++) { - gpr_thd_new(&threads[i], "gpr_tls_test", thd_body, nullptr, &opt); + gpr_thd_new(&threads[i], "grpc_tls_test", thd_body, nullptr, &opt); } for (i = 0; i < NUM_THREADS; i++) { gpr_thd_join(threads[i]); diff --git a/test/core/surface/completion_queue_threading_test.cc b/test/core/surface/completion_queue_threading_test.cc index 17e185d236e..42c8aee767b 100644 --- a/test/core/surface/completion_queue_threading_test.cc +++ b/test/core/surface/completion_queue_threading_test.cc @@ -96,7 +96,7 @@ static void test_too_many_plucks(void) { } thread_states[i].cc = cc; thread_states[i].tag = tags[i]; - gpr_thd_new(thread_ids + i, "gpr_test_pluck", pluck_one, thread_states + i, + gpr_thd_new(thread_ids + i, "grpc_pluck_test", pluck_one, thread_states + i, &thread_options); } @@ -234,7 +234,8 @@ static void test_threading(size_t producers, size_t consumers) { options[i].events_triggered = 0; options[i].cc = cc; options[i].id = optid++; - GPR_ASSERT(gpr_thd_new(&id, i < producers ? "gpr_producer" : "gpr_consumer", + GPR_ASSERT(gpr_thd_new(&id, + i < producers ? "grpc_producer" : "grpc_consumer", i < producers ? producer_thread : consumer_thread, options + i, nullptr)); gpr_event_wait(&options[i].on_started, ten_seconds_time()); diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index 50bea0aee13..e750d09495a 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -180,7 +180,7 @@ int run_concurrent_connectivity_test() { /* First round, no server */ gpr_log(GPR_DEBUG, "Wave 1"); for (size_t i = 0; i < NUM_THREADS; ++i) { - gpr_thd_new(&threads[i], "gpr_wave_1", create_loop_destroy, localhost, + gpr_thd_new(&threads[i], "grpc_wave_1", create_loop_destroy, localhost, &options); } for (size_t i = 0; i < NUM_THREADS; ++i) { @@ -197,10 +197,10 @@ int run_concurrent_connectivity_test() { args.cq = grpc_completion_queue_create_for_next(nullptr); grpc_server_register_completion_queue(args.server, args.cq, nullptr); grpc_server_start(args.server); - gpr_thd_new(&server, "gpr_wave_2_server", server_thread, &args, &options); + gpr_thd_new(&server, "grpc_wave_2_server", server_thread, &args, &options); for (size_t i = 0; i < NUM_THREADS; ++i) { - gpr_thd_new(&threads[i], "gpr_wave_2", create_loop_destroy, args.addr, + gpr_thd_new(&threads[i], "grpc_wave_2", create_loop_destroy, args.addr, &options); } for (size_t i = 0; i < NUM_THREADS; ++i) { @@ -218,11 +218,11 @@ int run_concurrent_connectivity_test() { args.pollset = static_cast(gpr_zalloc(grpc_pollset_size())); grpc_pollset_init(args.pollset, &args.mu); gpr_event_init(&args.ready); - gpr_thd_new(&server, "gpr_wave_3_server", bad_server_thread, &args, &options); + gpr_thd_new(&server, "grpc_wave_3_server", bad_server_thread, &args, &options); gpr_event_wait(&args.ready, gpr_inf_future(GPR_CLOCK_MONOTONIC)); for (size_t i = 0; i < NUM_THREADS; ++i) { - gpr_thd_new(&threads[i], "gpr_wave_3", create_loop_destroy, args.addr, + gpr_thd_new(&threads[i], "grpc_wave_3", create_loop_destroy, args.addr, &options); } for (size_t i = 0; i < NUM_THREADS; ++i) { @@ -281,7 +281,7 @@ int run_concurrent_watches_with_short_timeouts_test() { gpr_thd_options_set_joinable(&options); for (size_t i = 0; i < NUM_THREADS; ++i) { - gpr_thd_new(&threads[i], "gpr_watches_with_short_timeouts", + gpr_thd_new(&threads[i], "grpc_short_watches", watches_with_short_timeouts, localhost, &options); } for (size_t i = 0; i < NUM_THREADS; ++i) { diff --git a/test/core/surface/sequential_connectivity_test.cc b/test/core/surface/sequential_connectivity_test.cc index 82225f7a892..11d0aa705d9 100644 --- a/test/core/surface/sequential_connectivity_test.cc +++ b/test/core/surface/sequential_connectivity_test.cc @@ -70,8 +70,7 @@ static void run_test(const test_fixture* fixture) { gpr_thd_id server_thread; gpr_thd_options thdopt = gpr_thd_options_default(); gpr_thd_options_set_joinable(&thdopt); - gpr_thd_new(&server_thread, "gpr_server_thread", server_thread_func, &sta, - &thdopt); + gpr_thd_new(&server_thread, "grpc_server", server_thread_func, &sta, &thdopt); grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr); grpc_channel* channels[NUM_CONNECTIONS]; From c5df7fd3e2a348569c7f0b34ef7ebf984c8743d5 Mon Sep 17 00:00:00 2001 From: Junsung Ko Date: Mon, 4 Dec 2017 15:16:57 +0900 Subject: [PATCH 033/127] fix or slow down windows socket leak related issue https://github.com/grpc/grpc/issues/13519 https://github.com/grpc/grpc/issues/13102 --- src/core/lib/iomgr/tcp_client_windows.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/lib/iomgr/tcp_client_windows.cc b/src/core/lib/iomgr/tcp_client_windows.cc index 5e30725e904..9a9da85002f 100644 --- a/src/core/lib/iomgr/tcp_client_windows.cc +++ b/src/core/lib/iomgr/tcp_client_windows.cc @@ -104,6 +104,7 @@ static void on_connect(grpc_exec_ctx* exec_ctx, void* acp, grpc_error* error) { GPR_ASSERT(transfered_bytes == 0); if (!wsa_success) { error = GRPC_WSA_ERROR(WSAGetLastError(), "ConnectEx"); + closesocket(socket->socket); } else { *ep = grpc_tcp_create(exec_ctx, socket, ac->channel_args, ac->addr_name); From 3a9743c8818eb5fb0dcd77e93ac2f40f0decf472 Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Mon, 4 Dec 2017 12:25:29 -0800 Subject: [PATCH 034/127] Fix UpdatesTest.UpdateBalancersDeadUpdate expectation --- test/cpp/end2end/grpclb_end2end_test.cc | 40 ++++++++++++++++++++----- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index c15ab88da18..bbf3da4663a 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -353,11 +353,6 @@ class GrpclbEnd2endTest : public ::testing::Test { "balancer", server_host_, balancers_.back().get())); } ResetStub(); - std::vector addresses; - for (size_t i = 0; i < balancer_servers_.size(); ++i) { - addresses.emplace_back(AddressData{balancer_servers_[i].port_, true, ""}); - } - SetNextResolution(addresses); } void TearDown() override { @@ -370,6 +365,14 @@ class GrpclbEnd2endTest : public ::testing::Test { grpc_fake_resolver_response_generator_unref(response_generator_); } + void SetNextResolutionAllBalancers() { + std::vector addresses; + for (size_t i = 0; i < balancer_servers_.size(); ++i) { + addresses.emplace_back(AddressData{balancer_servers_[i].port_, true, ""}); + } + SetNextResolution(addresses); + } + void ResetStub(int fallback_timeout = 0) { ChannelArguments args; args.SetGrpclbFallbackTimeout(fallback_timeout); @@ -581,6 +584,7 @@ class SingleBalancerTest : public GrpclbEnd2endTest { }; TEST_F(SingleBalancerTest, Vanilla) { + SetNextResolutionAllBalancers(); const size_t kNumRpcsPerAddress = 100; ScheduleResponseForBalancer( 0, BalancerServiceImpl::BuildResponseForBackends(GetBackendPorts(), {}), @@ -608,6 +612,7 @@ TEST_F(SingleBalancerTest, Vanilla) { } TEST_F(SingleBalancerTest, InitiallyEmptyServerlist) { + SetNextResolutionAllBalancers(); const int kServerlistDelayMs = 500 * grpc_test_slowdown_factor(); const int kCallDeadlineMs = 1000 * grpc_test_slowdown_factor(); @@ -645,6 +650,7 @@ TEST_F(SingleBalancerTest, InitiallyEmptyServerlist) { } TEST_F(SingleBalancerTest, Fallback) { + SetNextResolutionAllBalancers(); const int kFallbackTimeoutMs = 200 * grpc_test_slowdown_factor(); const int kServerlistDelayMs = 500 * grpc_test_slowdown_factor(); const size_t kNumBackendInResolution = backends_.size() / 2; @@ -711,6 +717,7 @@ TEST_F(SingleBalancerTest, Fallback) { } TEST_F(SingleBalancerTest, FallbackUpdate) { + SetNextResolutionAllBalancers(); const int kFallbackTimeoutMs = 200 * grpc_test_slowdown_factor(); const int kServerlistDelayMs = 500 * grpc_test_slowdown_factor(); const size_t kNumBackendInResolution = backends_.size() / 3; @@ -818,6 +825,7 @@ TEST_F(SingleBalancerTest, FallbackUpdate) { } TEST_F(SingleBalancerTest, BackendsRestart) { + SetNextResolutionAllBalancers(); const size_t kNumRpcsPerAddress = 100; ScheduleResponseForBalancer( 0, BalancerServiceImpl::BuildResponseForBackends(GetBackendPorts(), {}), @@ -857,6 +865,7 @@ class UpdatesTest : public GrpclbEnd2endTest { }; TEST_F(UpdatesTest, UpdateBalancers) { + SetNextResolutionAllBalancers(); const std::vector first_backend{GetBackendPorts()[0]}; const std::vector second_backend{GetBackendPorts()[1]}; ScheduleResponseForBalancer( @@ -919,6 +928,7 @@ TEST_F(UpdatesTest, UpdateBalancers) { // verify that the LB channel inside grpclb keeps the initial connection (which // by definition is also present in the update). TEST_F(UpdatesTest, UpdateBalancersRepeated) { + SetNextResolutionAllBalancers(); const std::vector first_backend{GetBackendPorts()[0]}; const std::vector second_backend{GetBackendPorts()[0]}; @@ -989,6 +999,9 @@ TEST_F(UpdatesTest, UpdateBalancersRepeated) { } TEST_F(UpdatesTest, UpdateBalancersDeadUpdate) { + std::vector addresses; + addresses.emplace_back(AddressData{balancer_servers_[0].port_, true, ""}); + SetNextResolution(addresses); const std::vector first_backend{GetBackendPorts()[0]}; const std::vector second_backend{GetBackendPorts()[1]}; @@ -1030,7 +1043,7 @@ TEST_F(UpdatesTest, UpdateBalancersDeadUpdate) { EXPECT_EQ(0U, balancer_servers_[2].service_->request_count()); EXPECT_EQ(0U, balancer_servers_[2].service_->response_count()); - std::vector addresses; + addresses.clear(); addresses.emplace_back(AddressData{balancer_servers_[1].port_, true, ""}); gpr_log(GPR_INFO, "========= ABOUT TO UPDATE 1 =========="); SetNextResolution(addresses); @@ -1055,8 +1068,14 @@ TEST_F(UpdatesTest, UpdateBalancersDeadUpdate) { balancers_[2]->NotifyDoneWithServerlists(); EXPECT_EQ(1U, balancer_servers_[0].service_->request_count()); EXPECT_EQ(1U, balancer_servers_[0].service_->response_count()); - EXPECT_EQ(1U, balancer_servers_[1].service_->request_count()); - EXPECT_EQ(1U, balancer_servers_[1].service_->response_count()); + // The second balancer, published as part of the first update, may end up + // getting two requests (that is, 1 <= #req <= 2) if the LB call retry timer + // firing races with the arrival of the update containing the second + // balancer. + EXPECT_GE(balancer_servers_[1].service_->request_count(), 1U); + EXPECT_GE(balancer_servers_[1].service_->response_count(), 1U); + EXPECT_LE(balancer_servers_[1].service_->request_count(), 2U); + EXPECT_LE(balancer_servers_[1].service_->response_count(), 2U); EXPECT_EQ(0U, balancer_servers_[2].service_->request_count()); EXPECT_EQ(0U, balancer_servers_[2].service_->response_count()); // Check LB policy name for the channel. @@ -1064,6 +1083,7 @@ TEST_F(UpdatesTest, UpdateBalancersDeadUpdate) { } TEST_F(SingleBalancerTest, Drop) { + SetNextResolutionAllBalancers(); const size_t kNumRpcsPerAddress = 100; const int num_of_drop_by_rate_limiting_addresses = 1; const int num_of_drop_by_load_balancing_addresses = 2; @@ -1107,6 +1127,7 @@ TEST_F(SingleBalancerTest, Drop) { } TEST_F(SingleBalancerTest, DropAllFirst) { + SetNextResolutionAllBalancers(); // All registered addresses are marked as "drop". const int num_of_drop_by_rate_limiting_addresses = 1; const int num_of_drop_by_load_balancing_addresses = 1; @@ -1122,6 +1143,7 @@ TEST_F(SingleBalancerTest, DropAllFirst) { } TEST_F(SingleBalancerTest, DropAll) { + SetNextResolutionAllBalancers(); ScheduleResponseForBalancer( 0, BalancerServiceImpl::BuildResponseForBackends(GetBackendPorts(), {}), 0); @@ -1152,6 +1174,7 @@ class SingleBalancerWithClientLoadReportingTest : public GrpclbEnd2endTest { }; TEST_F(SingleBalancerWithClientLoadReportingTest, Vanilla) { + SetNextResolutionAllBalancers(); const size_t kNumRpcsPerAddress = 100; ScheduleResponseForBalancer( 0, BalancerServiceImpl::BuildResponseForBackends(GetBackendPorts(), {}), @@ -1186,6 +1209,7 @@ TEST_F(SingleBalancerWithClientLoadReportingTest, Vanilla) { } TEST_F(SingleBalancerWithClientLoadReportingTest, Drop) { + SetNextResolutionAllBalancers(); const size_t kNumRpcsPerAddress = 3; const int num_of_drop_by_rate_limiting_addresses = 2; const int num_of_drop_by_load_balancing_addresses = 1; From 74c106eff3d1a43ee9e4823c9dfdd28540591ec1 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Wed, 15 Nov 2017 18:43:00 -0800 Subject: [PATCH 035/127] Add error string to C++ --- include/grpc++/impl/codegen/call.h | 6 ++++-- include/grpc++/impl/codegen/status.h | 13 +++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/include/grpc++/impl/codegen/call.h b/include/grpc++/impl/codegen/call.h index af2c2b510c1..6a2ac8b70ca 100644 --- a/include/grpc++/impl/codegen/call.h +++ b/include/grpc++/impl/codegen/call.h @@ -574,7 +574,7 @@ class CallOpClientRecvStatus { op->data.recv_status_on_client.trailing_metadata = metadata_map_->arr(); op->data.recv_status_on_client.status = &status_code_; op->data.recv_status_on_client.status_details = &error_message_; - op->data.recv_status_on_client.error_string = nullptr; + op->data.recv_status_on_client.error_string = &error_string_; op->flags = 0; op->reserved = NULL; } @@ -591,14 +591,16 @@ class CallOpClientRecvStatus { *recv_status_ = Status(static_cast(status_code_), grpc::string(GRPC_SLICE_START_PTR(error_message_), GRPC_SLICE_END_PTR(error_message_)), - binary_error_details); + binary_error_details, grpc::string(error_string_)); g_core_codegen_interface->grpc_slice_unref(error_message_); + g_core_codegen_interface->gpr_free((void*)error_string_); recv_status_ = nullptr; } private: MetadataMap* metadata_map_; Status* recv_status_; + const char* error_string_; grpc_status_code status_code_; grpc_slice error_message_; }; diff --git a/include/grpc++/impl/codegen/status.h b/include/grpc++/impl/codegen/status.h index 6f013cf0ca4..cdaf5e17064 100644 --- a/include/grpc++/impl/codegen/status.h +++ b/include/grpc++/impl/codegen/status.h @@ -46,6 +46,16 @@ class Status { error_message_(error_message), binary_error_details_(error_details) {} + /// Construct an instance with \a code, \a error_message and + /// \a error_details. It is an error to construct an OK status with non-empty + /// \a error_message and/or \a error_details. + Status(StatusCode code, const grpc::string& error_message, + const grpc::string& error_details, const grpc::string& error_string) + : code_(code), + error_message_(error_message), + binary_error_details_(error_details), + error_string_(error_string) {} + // Pre-defined special status objects. /// An OK pre-defined instance. static const Status& OK; @@ -59,6 +69,8 @@ class Status { /// Return the (binary) error details. // Usually it contains a serialized google.rpc.Status proto. grpc::string error_details() const { return binary_error_details_; } + /// Return the full fidelity error string, which includes all child errors. + grpc::string error_string() const { return error_string_; } /// Is the status OK? bool ok() const { return code_ == StatusCode::OK; } @@ -72,6 +84,7 @@ class Status { StatusCode code_; grpc::string error_message_; grpc::string binary_error_details_; + grpc::string error_string_; }; } // namespace grpc From 0d7f5e77c0ca60fd715e00f98b705c99fba2c097 Mon Sep 17 00:00:00 2001 From: Noah Eisen Date: Tue, 21 Nov 2017 12:19:37 -0800 Subject: [PATCH 036/127] No null string ctor --- include/grpc++/impl/codegen/call.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/grpc++/impl/codegen/call.h b/include/grpc++/impl/codegen/call.h index 6a2ac8b70ca..4c2e550473b 100644 --- a/include/grpc++/impl/codegen/call.h +++ b/include/grpc++/impl/codegen/call.h @@ -588,10 +588,12 @@ class CallOpClientRecvStatus { binary_error_details = grpc::string(iter->second.begin(), iter->second.length()); } - *recv_status_ = Status(static_cast(status_code_), - grpc::string(GRPC_SLICE_START_PTR(error_message_), - GRPC_SLICE_END_PTR(error_message_)), - binary_error_details, grpc::string(error_string_)); + *recv_status_ = + Status(static_cast(status_code_), + grpc::string(GRPC_SLICE_START_PTR(error_message_), + GRPC_SLICE_END_PTR(error_message_)), + binary_error_details, + error_string_ != nullptr ? grpc::string(error_string_) : ""); g_core_codegen_interface->grpc_slice_unref(error_message_); g_core_codegen_interface->gpr_free((void*)error_string_); recv_status_ = nullptr; From 54961bb9e16f84d193077277f7d2d8269f57a411 Mon Sep 17 00:00:00 2001 From: Sree Kuchibhotla Date: Mon, 4 Dec 2017 12:50:27 -0800 Subject: [PATCH 037/127] Change the code to use MONOTONIC clocks when calling gpr_cv_wait (condition varialbes in linux support MONOTONIC clock type) --- src/core/lib/iomgr/ev_epoll1_linux.cc | 2 +- src/core/lib/iomgr/ev_poll_posix.cc | 8 ++++---- src/core/lib/iomgr/executor.cc | 2 +- src/core/lib/iomgr/iomgr.cc | 5 +++-- src/core/lib/iomgr/timer_manager.cc | 4 ++-- src/core/lib/surface/completion_queue.cc | 2 +- src/core/lib/surface/server.cc | 2 +- test/core/support/cpu_test.cc | 2 +- test/core/support/sync_test.cc | 12 ++++++------ test/cpp/util/cli_call.cc | 4 ++-- 10 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc index 0dda1d924c3..a52bedeb7a4 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -753,7 +753,7 @@ static bool begin_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, } if (gpr_cv_wait(&worker->cv, &pollset->mu, - grpc_millis_to_timespec(deadline, GPR_CLOCK_REALTIME)) && + grpc_millis_to_timespec(deadline, GPR_CLOCK_MONOTONIC)) && worker->state == UNKICKED) { /* If gpr_cv_wait returns true (i.e a timeout), pretend that the worker received a kick */ diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index 8659559f78a..43a63c5255e 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -1494,7 +1494,7 @@ static void run_poll(void* args) { decref_poll_result(result); // Leave this polling thread alive for a grace period to do another poll() // op - gpr_timespec deadline = gpr_now(GPR_CLOCK_REALTIME); + gpr_timespec deadline = gpr_now(GPR_CLOCK_MONOTONIC); deadline = gpr_time_add(deadline, thread_grace); pargs->trigger_set = 0; gpr_cv_wait(&pargs->trigger, &g_cvfds.mu, deadline); @@ -1549,9 +1549,9 @@ static int cvfd_poll(struct pollfd* fds, nfds_t nfds, int timeout) { } } - gpr_timespec deadline = gpr_now(GPR_CLOCK_REALTIME); + gpr_timespec deadline = gpr_now(GPR_CLOCK_MONOTONIC); if (timeout < 0) { - deadline = gpr_inf_future(GPR_CLOCK_REALTIME); + deadline = gpr_inf_future(GPR_CLOCK_MONOTONIC); } else { deadline = gpr_time_add(deadline, gpr_time_from_millis(timeout, GPR_TIMESPAN)); @@ -1654,7 +1654,7 @@ static void global_cv_fd_table_shutdown() { // Not doing so will result in reported memory leaks if (!gpr_unref(&g_cvfds.pollcount)) { int res = gpr_cv_wait(&g_cvfds.shutdown_cv, &g_cvfds.mu, - gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), + gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), gpr_time_from_seconds(3, GPR_TIMESPAN))); GPR_ASSERT(res == 0); } diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index d8a195f0108..cca59e7a528 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -158,7 +158,7 @@ static void executor_thread(void* arg) { ts->depth -= subtract_depth; while (grpc_closure_list_empty(ts->elems) && !ts->shutdown) { ts->queued_long_job = false; - gpr_cv_wait(&ts->cv, &ts->mu, gpr_inf_future(GPR_CLOCK_REALTIME)); + gpr_cv_wait(&ts->cv, &ts->mu, gpr_inf_future(GPR_CLOCK_MONOTONIC)); } if (ts->shutdown) { if (executor_trace.enabled()) { diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index e077b35014f..bdedd850410 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -117,8 +117,9 @@ void grpc_iomgr_shutdown(grpc_exec_ctx* exec_ctx) { dump_objects("LEAKED"); abort(); } - gpr_timespec short_deadline = gpr_time_add( - gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_millis(100, GPR_TIMESPAN)); + gpr_timespec short_deadline = + gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), + gpr_time_from_millis(100, GPR_TIMESPAN)); if (gpr_cv_wait(&g_rcv, &g_mu, short_deadline)) { if (gpr_time_cmp(gpr_now(GPR_CLOCK_REALTIME), shutdown_deadline) > 0) { if (g_root_object.next != &g_root_object) { diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc index dac74aea24e..b68088e4bd5 100644 --- a/src/core/lib/iomgr/timer_manager.cc +++ b/src/core/lib/iomgr/timer_manager.cc @@ -193,7 +193,7 @@ static bool wait_until(grpc_exec_ctx* exec_ctx, grpc_millis next) { } gpr_cv_wait(&g_cv_wait, &g_mu, - grpc_millis_to_timespec(next, GPR_CLOCK_REALTIME)); + grpc_millis_to_timespec(next, GPR_CLOCK_MONOTONIC)); if (grpc_timer_check_trace.enabled()) { gpr_log(GPR_DEBUG, "wait ended: was_timed:%d kicked:%d", @@ -319,7 +319,7 @@ static void stop_threads(void) { gpr_log(GPR_DEBUG, "num timer threads: %d", g_thread_count); } while (g_thread_count > 0) { - gpr_cv_wait(&g_cv_shutdown, &g_mu, gpr_inf_future(GPR_CLOCK_REALTIME)); + gpr_cv_wait(&g_cv_shutdown, &g_mu, gpr_inf_future(GPR_CLOCK_MONOTONIC)); if (grpc_timer_check_trace.enabled()) { gpr_log(GPR_DEBUG, "num timer threads: %d", g_thread_count); } diff --git a/src/core/lib/surface/completion_queue.cc b/src/core/lib/surface/completion_queue.cc index 98d7e359437..dfb5b5bf291 100644 --- a/src/core/lib/surface/completion_queue.cc +++ b/src/core/lib/surface/completion_queue.cc @@ -118,7 +118,7 @@ static grpc_error* non_polling_poller_work(grpc_exec_ctx* exec_ctx, } w.kicked = false; gpr_timespec deadline_ts = - grpc_millis_to_timespec(deadline, GPR_CLOCK_REALTIME); + grpc_millis_to_timespec(deadline, GPR_CLOCK_MONOTONIC); while (!npp->shutdown && !w.kicked && !gpr_cv_wait(&w.cv, &npp->mu, deadline_ts)) ; diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc index 0f8a057f315..e88e1ee1610 100644 --- a/src/core/lib/surface/server.cc +++ b/src/core/lib/surface/server.cc @@ -1213,7 +1213,7 @@ void grpc_server_shutdown_and_notify(grpc_server* server, gpr_mu_lock(&server->mu_global); while (server->starting) { gpr_cv_wait(&server->starting_cv, &server->mu_global, - gpr_inf_future(GPR_CLOCK_REALTIME)); + gpr_inf_future(GPR_CLOCK_MONOTONIC)); } /* stay locked, and gather up some stuff to do */ diff --git a/test/core/support/cpu_test.cc b/test/core/support/cpu_test.cc index 1783ec3c60a..770b074d47a 100644 --- a/test/core/support/cpu_test.cc +++ b/test/core/support/cpu_test.cc @@ -114,7 +114,7 @@ static void cpu_test(void) { } gpr_mu_lock(&ct.mu); while (!ct.is_done) { - gpr_cv_wait(&ct.done_cv, &ct.mu, gpr_inf_future(GPR_CLOCK_REALTIME)); + gpr_cv_wait(&ct.done_cv, &ct.mu, gpr_inf_future(GPR_CLOCK_MONOTONIC)); } gpr_mu_unlock(&ct.mu); fprintf(stderr, "Saw cores ["); diff --git a/test/core/support/sync_test.cc b/test/core/support/sync_test.cc index 86e78ce0b51..c8824882430 100644 --- a/test/core/support/sync_test.cc +++ b/test/core/support/sync_test.cc @@ -73,7 +73,7 @@ void queue_append(queue* q, int x) { corresponding condition variable. The predicate must be on state protected by the lock. */ while (q->length == N) { - gpr_cv_wait(&q->non_full, &q->mu, gpr_inf_future(GPR_CLOCK_REALTIME)); + gpr_cv_wait(&q->non_full, &q->mu, gpr_inf_future(GPR_CLOCK_MONOTONIC)); } if (q->length == 0) { /* Wake threads blocked in queue_remove(). */ /* It's normal to use gpr_cv_broadcast() or gpr_signal() while @@ -197,7 +197,7 @@ static void test_create_threads(struct test* m, void (*body)(void* arg)) { static void test_wait(struct test* m) { gpr_mu_lock(&m->mu); while (m->done != 0) { - gpr_cv_wait(&m->done_cv, &m->mu, gpr_inf_future(GPR_CLOCK_REALTIME)); + gpr_cv_wait(&m->done_cv, &m->mu, gpr_inf_future(GPR_CLOCK_MONOTONIC)); } gpr_mu_unlock(&m->mu); } @@ -297,7 +297,7 @@ static void inc_by_turns(void* v /*=m*/) { for (i = 0; i != m->iterations; i++) { gpr_mu_lock(&m->mu); while ((m->counter % m->threads) != id) { - gpr_cv_wait(&m->cv, &m->mu, gpr_inf_future(GPR_CLOCK_REALTIME)); + gpr_cv_wait(&m->cv, &m->mu, gpr_inf_future(GPR_CLOCK_MONOTONIC)); } m->counter++; gpr_cv_broadcast(&m->cv); @@ -314,7 +314,7 @@ static void inc_with_1ms_delay(void* v /*=m*/) { for (i = 0; i != m->iterations; i++) { gpr_timespec deadline; gpr_mu_lock(&m->mu); - deadline = gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), + deadline = gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), gpr_time_from_micros(1000, GPR_TIMESPAN)); while (!gpr_cv_wait(&m->cv, &m->mu, deadline)) { } @@ -370,14 +370,14 @@ static void consumer(void* v /*=m*/) { int64_t i; int value; for (i = 0; i != n; i++) { - queue_remove(&m->q, &value, gpr_inf_future(GPR_CLOCK_REALTIME)); + queue_remove(&m->q, &value, gpr_inf_future(GPR_CLOCK_MONOTONIC)); } gpr_mu_lock(&m->mu); m->counter = n; gpr_mu_unlock(&m->mu); GPR_ASSERT( !queue_remove(&m->q, &value, - gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), + gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), gpr_time_from_micros(1000000, GPR_TIMESPAN)))); mark_thread_done(m); } diff --git a/test/cpp/util/cli_call.cc b/test/cpp/util/cli_call.cc index c3220efa544..4f1a20c7278 100644 --- a/test/cpp/util/cli_call.cc +++ b/test/cpp/util/cli_call.cc @@ -126,7 +126,7 @@ void CliCall::WriteAndWait(const grpc::string& request) { call_->Write(send_buffer, tag(2)); write_done_ = false; while (!write_done_) { - gpr_cv_wait(&write_cv_, &write_mu_, gpr_inf_future(GPR_CLOCK_REALTIME)); + gpr_cv_wait(&write_cv_, &write_mu_, gpr_inf_future(GPR_CLOCK_MONOTONIC)); } gpr_mu_unlock(&write_mu_); } @@ -136,7 +136,7 @@ void CliCall::WritesDoneAndWait() { call_->WritesDone(tag(4)); write_done_ = false; while (!write_done_) { - gpr_cv_wait(&write_cv_, &write_mu_, gpr_inf_future(GPR_CLOCK_REALTIME)); + gpr_cv_wait(&write_cv_, &write_mu_, gpr_inf_future(GPR_CLOCK_MONOTONIC)); } gpr_mu_unlock(&write_mu_); } From a3a4f39121ba2f367be704a89c80f611fdd1584f Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Mon, 4 Dec 2017 13:02:12 -0800 Subject: [PATCH 038/127] Update ev_epollsig_linux_test.cc --- test/core/iomgr/ev_epollsig_linux_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/core/iomgr/ev_epollsig_linux_test.cc b/test/core/iomgr/ev_epollsig_linux_test.cc index ac8b2f43d16..94f387164a8 100644 --- a/test/core/iomgr/ev_epollsig_linux_test.cc +++ b/test/core/iomgr/ev_epollsig_linux_test.cc @@ -269,7 +269,7 @@ static void test_threading(void) { for (size_t i = 0; i < GPR_ARRAY_SIZE(thds); i++) { gpr_thd_options opt = gpr_thd_options_default(); gpr_thd_options_set_joinable(&opt); - gpr_thd_new(&thds[i], test_threading_loop, &shared, &opt); + gpr_thd_new(&thds[i], "test_thread", test_threading_loop, &shared, &opt); } grpc_wakeup_fd fd; GPR_ASSERT(GRPC_LOG_IF_ERROR("wakeup_fd_init", grpc_wakeup_fd_init(&fd))); From b9cff78f9eaa2647a20813c03fe08199bdc8a668 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 4 Dec 2017 13:16:13 -0800 Subject: [PATCH 039/127] Reviewer feedback --- include/grpc++/impl/codegen/call.h | 22 ++++++++++++-------- include/grpc++/impl/codegen/client_context.h | 9 ++++++++ include/grpc++/impl/codegen/status.h | 13 ------------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/grpc++/impl/codegen/call.h b/include/grpc++/impl/codegen/call.h index 4c2e550473b..21b1f0a423d 100644 --- a/include/grpc++/impl/codegen/call.h +++ b/include/grpc++/impl/codegen/call.h @@ -558,10 +558,11 @@ class CallOpRecvInitialMetadata { class CallOpClientRecvStatus { public: - CallOpClientRecvStatus() : recv_status_(nullptr) {} + CallOpClientRecvStatus() : recv_status_(nullptr), error_string_(nullptr) {} void ClientRecvStatus(ClientContext* context, Status* status) { - metadata_map_ = &context->trailing_metadata_; + client_context_ = context; + metadata_map_ = &client_context_->trailing_metadata_; recv_status_ = status; error_message_ = g_core_codegen_interface->grpc_empty_slice(); } @@ -588,18 +589,21 @@ class CallOpClientRecvStatus { binary_error_details = grpc::string(iter->second.begin(), iter->second.length()); } - *recv_status_ = - Status(static_cast(status_code_), - grpc::string(GRPC_SLICE_START_PTR(error_message_), - GRPC_SLICE_END_PTR(error_message_)), - binary_error_details, - error_string_ != nullptr ? grpc::string(error_string_) : ""); + *recv_status_ = Status(static_cast(status_code_), + grpc::string(GRPC_SLICE_START_PTR(error_message_), + GRPC_SLICE_END_PTR(error_message_)), + binary_error_details); + client_context_->set_debug_error_string( + error_string_ != nullptr ? grpc::string(error_string_) : ""); g_core_codegen_interface->grpc_slice_unref(error_message_); - g_core_codegen_interface->gpr_free((void*)error_string_); + if (error_string_ != nullptr) { + g_core_codegen_interface->gpr_free((void*)error_string_); + } recv_status_ = nullptr; } private: + ClientContext* client_context_; MetadataMap* metadata_map_; Status* recv_status_; const char* error_string_; diff --git a/include/grpc++/impl/codegen/client_context.h b/include/grpc++/impl/codegen/client_context.h index 22b581cbc55..9fe5f4093e7 100644 --- a/include/grpc++/impl/codegen/client_context.h +++ b/include/grpc++/impl/codegen/client_context.h @@ -348,6 +348,8 @@ class ClientContext { /// Applications never need to call this method. grpc_call* c_call() { return call_; } + grpc::string debug_error_string() const { return debug_error_string_; } + private: // Disallow copy and assign. ClientContext(const ClientContext&); @@ -374,6 +376,11 @@ class ClientContext { template friend class ::grpc::internal::BlockingUnaryCallImpl; + // Used by friend class CallOpClientRecvStatus + void set_debug_error_string(grpc::string debug_error_string) { + debug_error_string_ = debug_error_string; + } + grpc_call* call() const { return call_; } void set_call(grpc_call* call, const std::shared_ptr& channel); @@ -412,6 +419,8 @@ class ClientContext { grpc_compression_algorithm compression_algorithm_; bool initial_metadata_corked_; + + grpc::string debug_error_string_; }; } // namespace grpc diff --git a/include/grpc++/impl/codegen/status.h b/include/grpc++/impl/codegen/status.h index cdaf5e17064..6f013cf0ca4 100644 --- a/include/grpc++/impl/codegen/status.h +++ b/include/grpc++/impl/codegen/status.h @@ -46,16 +46,6 @@ class Status { error_message_(error_message), binary_error_details_(error_details) {} - /// Construct an instance with \a code, \a error_message and - /// \a error_details. It is an error to construct an OK status with non-empty - /// \a error_message and/or \a error_details. - Status(StatusCode code, const grpc::string& error_message, - const grpc::string& error_details, const grpc::string& error_string) - : code_(code), - error_message_(error_message), - binary_error_details_(error_details), - error_string_(error_string) {} - // Pre-defined special status objects. /// An OK pre-defined instance. static const Status& OK; @@ -69,8 +59,6 @@ class Status { /// Return the (binary) error details. // Usually it contains a serialized google.rpc.Status proto. grpc::string error_details() const { return binary_error_details_; } - /// Return the full fidelity error string, which includes all child errors. - grpc::string error_string() const { return error_string_; } /// Is the status OK? bool ok() const { return code_ == StatusCode::OK; } @@ -84,7 +72,6 @@ class Status { StatusCode code_; grpc::string error_message_; grpc::string binary_error_details_; - grpc::string error_string_; }; } // namespace grpc From 18bc278c818bc68f50918c86d428690b20da0b95 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 4 Dec 2017 13:25:14 -0800 Subject: [PATCH 040/127] Add tests --- test/cpp/end2end/end2end_test.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index c71034bbe8e..1608b00fb0d 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -741,6 +741,7 @@ TEST_P(End2endTest, RequestStreamOneRequest) { Status s = stream->Finish(); EXPECT_EQ(response.message(), request.message()); EXPECT_TRUE(s.ok()); + EXPECT_TRUE(context.debug_error_string() == ""); } TEST_P(End2endTest, RequestStreamOneRequestWithCoalescingApi) { @@ -1258,6 +1259,13 @@ TEST_P(End2endTest, ExpectErrorTest) { EXPECT_EQ(iter->code(), s.error_code()); EXPECT_EQ(iter->error_message(), s.error_message()); EXPECT_EQ(iter->binary_error_details(), s.error_details()); + EXPECT_TRUE(context.debug_error_string().find("created") != + std::string::npos); + EXPECT_TRUE(context.debug_error_string().find("file") != std::string::npos); + EXPECT_TRUE(context.debug_error_string().find("line") != std::string::npos); + EXPECT_TRUE(context.debug_error_string().find("status") != + std::string::npos); + EXPECT_TRUE(context.debug_error_string().find("13") != std::string::npos); } } From 64e0b10a972238adffeaf4e4a736ee031d439a31 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 4 Dec 2017 13:26:26 -0800 Subject: [PATCH 041/127] Variable name consistency --- include/grpc++/impl/codegen/call.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/include/grpc++/impl/codegen/call.h b/include/grpc++/impl/codegen/call.h index 21b1f0a423d..73773f366a7 100644 --- a/include/grpc++/impl/codegen/call.h +++ b/include/grpc++/impl/codegen/call.h @@ -558,7 +558,8 @@ class CallOpRecvInitialMetadata { class CallOpClientRecvStatus { public: - CallOpClientRecvStatus() : recv_status_(nullptr), error_string_(nullptr) {} + CallOpClientRecvStatus() + : recv_status_(nullptr), debug_error_string_(nullptr) {} void ClientRecvStatus(ClientContext* context, Status* status) { client_context_ = context; @@ -575,7 +576,7 @@ class CallOpClientRecvStatus { op->data.recv_status_on_client.trailing_metadata = metadata_map_->arr(); op->data.recv_status_on_client.status = &status_code_; op->data.recv_status_on_client.status_details = &error_message_; - op->data.recv_status_on_client.error_string = &error_string_; + op->data.recv_status_on_client.error_string = &debug_error_string_; op->flags = 0; op->reserved = NULL; } @@ -594,10 +595,11 @@ class CallOpClientRecvStatus { GRPC_SLICE_END_PTR(error_message_)), binary_error_details); client_context_->set_debug_error_string( - error_string_ != nullptr ? grpc::string(error_string_) : ""); + debug_error_string_ != nullptr ? grpc::string(debug_error_string_) + : ""); g_core_codegen_interface->grpc_slice_unref(error_message_); - if (error_string_ != nullptr) { - g_core_codegen_interface->gpr_free((void*)error_string_); + if (debug_error_string_ != nullptr) { + g_core_codegen_interface->gpr_free((void*)debug_error_string_); } recv_status_ = nullptr; } @@ -606,7 +608,7 @@ class CallOpClientRecvStatus { ClientContext* client_context_; MetadataMap* metadata_map_; Status* recv_status_; - const char* error_string_; + const char* debug_error_string_; grpc_status_code status_code_; grpc_slice error_message_; }; From 11f6780bfd4600398da1ccb6b7c624e6704e8aa5 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 4 Dec 2017 13:29:33 -0800 Subject: [PATCH 042/127] Add comment with API --- include/grpc++/impl/codegen/client_context.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/grpc++/impl/codegen/client_context.h b/include/grpc++/impl/codegen/client_context.h index 9fe5f4093e7..b06b1fa44fe 100644 --- a/include/grpc++/impl/codegen/client_context.h +++ b/include/grpc++/impl/codegen/client_context.h @@ -348,6 +348,11 @@ class ClientContext { /// Applications never need to call this method. grpc_call* c_call() { return call_; } + /// EXPERIMENTAL debugging API + /// + /// if status is not ok() for an RPC, this will return a detailed string + /// of the gRPC Core error that led to the failure. It should not be relied + /// upon for anything other than gaining more debug data in failure cases. grpc::string debug_error_string() const { return debug_error_string_; } private: From 33dd7f07ff9ea9a6027f8aa3340c496df7d7d603 Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Mon, 4 Dec 2017 15:26:43 -0800 Subject: [PATCH 043/127] Add thread name --- test/core/network_benchmarks/low_level_ping_pong.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/core/network_benchmarks/low_level_ping_pong.cc b/test/core/network_benchmarks/low_level_ping_pong.cc index 2ae9a45d7c6..96b0745f529 100644 --- a/test/core/network_benchmarks/low_level_ping_pong.cc +++ b/test/core/network_benchmarks/low_level_ping_pong.cc @@ -583,7 +583,7 @@ static int run_benchmark(const char* socket_type, thread_args* client_args, gpr_log(GPR_INFO, "Starting test %s %s %zu", client_args->strategy_name, socket_type, client_args->msg_size); - gpr_thd_new(&tid, server_thread_wrap, server_args, nullptr); + gpr_thd_new(&tid, "server_thread", server_thread_wrap, server_args, nullptr); client_thread(client_args); return 0; } From 19988c6c7ebfdbd239d87907519851957b34262f Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Mon, 4 Dec 2017 15:28:35 -0800 Subject: [PATCH 044/127] clang-format --- src/core/lib/support/thd_posix.cc | 2 +- test/core/end2end/fixtures/http_proxy_fixture.cc | 4 ++-- test/core/end2end/fixtures/proxy.cc | 4 ++-- test/core/end2end/tests/connectivity.cc | 4 ++-- test/core/handshake/server_ssl_common.cc | 4 ++-- test/core/support/cpu_test.cc | 4 ++-- test/core/support/mpscq_test.cc | 4 ++-- test/core/support/spinlock_test.cc | 4 ++-- test/core/surface/completion_queue_threading_test.cc | 2 +- test/core/surface/concurrent_connectivity_test.cc | 7 ++++--- 10 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/core/lib/support/thd_posix.cc b/src/core/lib/support/thd_posix.cc index 339c40fe4c6..f0ed48dbfc2 100644 --- a/src/core/lib/support/thd_posix.cc +++ b/src/core/lib/support/thd_posix.cc @@ -62,7 +62,7 @@ static void* thread_body(void* v) { strncpy(buf, a.name, buf_len); buf[buf_len] = '\0'; pthread_setname_np(pthread_self(), buf); -#endif // GPR_APPLE_PTHREAD_NAME +#endif // GPR_APPLE_PTHREAD_NAME } (*a.body)(a.arg); dec_thd_count(); diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc index 1c33e578ec5..3f7806942be 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.cc +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -529,8 +529,8 @@ grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( // Start proxy thread. gpr_thd_options opt = gpr_thd_options_default(); gpr_thd_options_set_joinable(&opt); - GPR_ASSERT(gpr_thd_new(&proxy->thd, "grpc_http_proxy", thread_main, proxy, - &opt)); + GPR_ASSERT( + gpr_thd_new(&proxy->thd, "grpc_http_proxy", thread_main, proxy, &opt)); return proxy; } diff --git a/test/core/end2end/fixtures/proxy.cc b/test/core/end2end/fixtures/proxy.cc index 00fc9fecbee..b1698c804ce 100644 --- a/test/core/end2end/fixtures/proxy.cc +++ b/test/core/end2end/fixtures/proxy.cc @@ -98,8 +98,8 @@ grpc_end2end_proxy* grpc_end2end_proxy_create(const grpc_end2end_proxy_def* def, grpc_call_details_init(&proxy->new_call_details); gpr_thd_options_set_joinable(&opt); - GPR_ASSERT(gpr_thd_new(&proxy->thd, "grpc_end2end_proxy", thread_main, proxy, - &opt)); + GPR_ASSERT( + gpr_thd_new(&proxy->thd, "grpc_end2end_proxy", thread_main, proxy, &opt)); request_call(proxy); diff --git a/test/core/end2end/tests/connectivity.cc b/test/core/end2end/tests/connectivity.cc index 7fab55cb3a5..da65080bc06 100644 --- a/test/core/end2end/tests/connectivity.cc +++ b/test/core/end2end/tests/connectivity.cc @@ -68,8 +68,8 @@ static void test_connectivity(grpc_end2end_test_config config) { ce.cq = f.cq; gpr_event_init(&ce.started); gpr_thd_options_set_joinable(&thdopt); - GPR_ASSERT(gpr_thd_new(&thdid, "grpc_connectivity", child_thread, &ce, - &thdopt)); + GPR_ASSERT( + gpr_thd_new(&thdid, "grpc_connectivity", child_thread, &ce, &thdopt)); gpr_event_wait(&ce.started, gpr_inf_future(GPR_CLOCK_MONOTONIC)); diff --git a/test/core/handshake/server_ssl_common.cc b/test/core/handshake/server_ssl_common.cc index 001d4e24cac..0bf453a204a 100644 --- a/test/core/handshake/server_ssl_common.cc +++ b/test/core/handshake/server_ssl_common.cc @@ -137,8 +137,8 @@ bool server_ssl_test(const char* alpn_list[], unsigned int alpn_list_len, gpr_thd_options thdopt = gpr_thd_options_default(); gpr_thd_id thdid; gpr_thd_options_set_joinable(&thdopt); - GPR_ASSERT(gpr_thd_new(&thdid, "grpc_ssl_test", server_thread, &port, - &thdopt)); + GPR_ASSERT( + gpr_thd_new(&thdid, "grpc_ssl_test", server_thread, &port, &thdopt)); SSL_load_error_strings(); OpenSSL_add_ssl_algorithms(); diff --git a/test/core/support/cpu_test.cc b/test/core/support/cpu_test.cc index 53ce0f948c1..6e04feedaa5 100644 --- a/test/core/support/cpu_test.cc +++ b/test/core/support/cpu_test.cc @@ -110,8 +110,8 @@ static void cpu_test(void) { gpr_cv_init(&ct.done_cv); ct.is_done = 0; for (i = 0; i < ct.ncores * 3; i++) { - GPR_ASSERT(gpr_thd_new(&thd, "grpc_cpu_test", &worker_thread, &ct, - nullptr)); + GPR_ASSERT( + gpr_thd_new(&thd, "grpc_cpu_test", &worker_thread, &ct, nullptr)); } gpr_mu_lock(&ct.mu); while (!ct.is_done) { diff --git a/test/core/support/mpscq_test.cc b/test/core/support/mpscq_test.cc index 6a9ac4ca2ce..1b83f7d5be9 100644 --- a/test/core/support/mpscq_test.cc +++ b/test/core/support/mpscq_test.cc @@ -85,8 +85,8 @@ static void test_mt(void) { ta[i].ctr = 0; ta[i].q = &q; ta[i].start = &start; - GPR_ASSERT(gpr_thd_new(&thds[i], "grpc_mt_test", test_thread, &ta[i], - &options)); + GPR_ASSERT( + gpr_thd_new(&thds[i], "grpc_mt_test", test_thread, &ta[i], &options)); } size_t num_done = 0; size_t spins = 0; diff --git a/test/core/support/spinlock_test.cc b/test/core/support/spinlock_test.cc index 4828ce0c23f..58d5fcd42b9 100644 --- a/test/core/support/spinlock_test.cc +++ b/test/core/support/spinlock_test.cc @@ -67,8 +67,8 @@ static void test_create_threads(struct test* m, void (*body)(void* arg)) { for (i = 0; i != m->thread_count; i++) { gpr_thd_options opt = gpr_thd_options_default(); gpr_thd_options_set_joinable(&opt); - GPR_ASSERT(gpr_thd_new(&m->threads[i], "grpc_create_threads", body, m, - &opt)); + GPR_ASSERT( + gpr_thd_new(&m->threads[i], "grpc_create_threads", body, m, &opt)); } } diff --git a/test/core/surface/completion_queue_threading_test.cc b/test/core/surface/completion_queue_threading_test.cc index 42c8aee767b..126d363f839 100644 --- a/test/core/surface/completion_queue_threading_test.cc +++ b/test/core/surface/completion_queue_threading_test.cc @@ -234,7 +234,7 @@ static void test_threading(size_t producers, size_t consumers) { options[i].events_triggered = 0; options[i].cc = cc; options[i].id = optid++; - GPR_ASSERT(gpr_thd_new(&id, + GPR_ASSERT(gpr_thd_new(&id, i < producers ? "grpc_producer" : "grpc_consumer", i < producers ? producer_thread : consumer_thread, options + i, nullptr)); diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index 386eb29cbce..2ff1ca3d799 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -220,7 +220,8 @@ int run_concurrent_connectivity_test() { args.pollset = static_cast(gpr_zalloc(grpc_pollset_size())); grpc_pollset_init(args.pollset, &args.mu); gpr_event_init(&args.ready); - gpr_thd_new(&server, "grpc_wave_3_server", bad_server_thread, &args, &options); + gpr_thd_new(&server, "grpc_wave_3_server", bad_server_thread, &args, + &options); gpr_event_wait(&args.ready, gpr_inf_future(GPR_CLOCK_MONOTONIC)); for (size_t i = 0; i < NUM_THREADS; ++i) { @@ -283,8 +284,8 @@ int run_concurrent_watches_with_short_timeouts_test() { gpr_thd_options_set_joinable(&options); for (size_t i = 0; i < NUM_THREADS; ++i) { - gpr_thd_new(&threads[i], "grpc_short_watches", - watches_with_short_timeouts, localhost, &options); + gpr_thd_new(&threads[i], "grpc_short_watches", watches_with_short_timeouts, + localhost, &options); } for (size_t i = 0; i < NUM_THREADS; ++i) { gpr_thd_join(threads[i]); From 9a4db28783b25e0cbe2ac86ac344b1ffa4e3db37 Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Tue, 5 Dec 2017 11:04:36 -0800 Subject: [PATCH 045/127] Verbose log message in on_failed in Cronet transport --- src/core/ext/transport/cronet/transport/cronet_transport.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index 4d24efe47b1..4e16032da00 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -401,7 +401,7 @@ static void execute_from_storage(grpc_exec_ctx* exec_ctx, stream_obj* s) { Cronet callback */ static void on_failed(bidirectional_stream* stream, int net_error) { - CRONET_LOG(GPR_DEBUG, "on_failed(%p, %d)", stream, net_error); + gpr_log(GPR_INFO, "on_failed(%p, %d)", stream, net_error); grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; stream_obj* s = (stream_obj*)stream->annotation; From 65c45fbb4d576d99bcd1c00a13f430c8994fee38 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 5 Dec 2017 12:04:41 -0800 Subject: [PATCH 046/127] Revert ordering of tracers and timers in shutdown --- src/core/lib/surface/init.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index 5eb5a56ebbf..c6ce235da7f 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -174,11 +174,11 @@ void grpc_shutdown(void) { } } } + grpc_iomgr_shutdown(); gpr_timers_global_destroy(); grpc_tracer_shutdown(); - grpc_handshaker_factory_registry_shutdown(); - grpc_iomgr_shutdown(); grpc_mdctx_global_shutdown(); + grpc_handshaker_factory_registry_shutdown(); grpc_slice_intern_shutdown(); grpc_stats_shutdown(); } From c272dd73aad1273b70fbd038efb02d6f0e169b60 Mon Sep 17 00:00:00 2001 From: Yuchen Zeng Date: Tue, 5 Dec 2017 12:18:34 -0800 Subject: [PATCH 047/127] Add on_initiate callback for the send_ping tranport op --- .../filters/client_channel/client_channel.cc | 14 +++++--- .../ext/filters/client_channel/lb_policy.cc | 5 +-- .../ext/filters/client_channel/lb_policy.h | 5 +-- .../client_channel/lb_policy/grpclb/grpclb.cc | 32 +++++++++---------- .../lb_policy/pick_first/pick_first.cc | 9 ++++-- .../lb_policy/round_robin/round_robin.cc | 10 ++++-- .../ext/filters/client_channel/subchannel.cc | 6 ++-- .../ext/filters/client_channel/subchannel.h | 3 +- .../chttp2/transport/chttp2_transport.cc | 5 +-- src/core/lib/surface/channel_ping.cc | 2 +- src/core/lib/surface/lame_client.cc | 9 ++++-- src/core/lib/transport/transport.h | 10 ++++-- src/core/lib/transport/transport_op_string.cc | 2 +- 13 files changed, 71 insertions(+), 41 deletions(-) diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index aced9adf9f1..fc8210569e8 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.cc @@ -643,16 +643,22 @@ static void start_transport_op_locked(grpc_exec_ctx* exec_ctx, void* arg, op->connectivity_state = nullptr; } - if (op->send_ping != nullptr) { + if (op->send_ping.on_initiate != nullptr || op->send_ping.on_ack != nullptr) { if (chand->lb_policy == nullptr) { GRPC_CLOSURE_SCHED( - exec_ctx, op->send_ping, + exec_ctx, op->send_ping.on_initiate, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Ping with no load balancing")); + GRPC_CLOSURE_SCHED( + exec_ctx, op->send_ping.on_ack, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Ping with no load balancing")); } else { - grpc_lb_policy_ping_one_locked(exec_ctx, chand->lb_policy, op->send_ping); + grpc_lb_policy_ping_one_locked(exec_ctx, chand->lb_policy, + op->send_ping.on_initiate, + op->send_ping.on_ack); op->bind_pollset = nullptr; } - op->send_ping = nullptr; + op->send_ping.on_initiate = nullptr; + op->send_ping.on_ack = nullptr; } if (op->disconnect_with_error != GRPC_ERROR_NONE) { diff --git a/src/core/ext/filters/client_channel/lb_policy.cc b/src/core/ext/filters/client_channel/lb_policy.cc index db566f1b562..6b6022c2476 100644 --- a/src/core/ext/filters/client_channel/lb_policy.cc +++ b/src/core/ext/filters/client_channel/lb_policy.cc @@ -138,8 +138,9 @@ void grpc_lb_policy_exit_idle_locked(grpc_exec_ctx* exec_ctx, void grpc_lb_policy_ping_one_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, - grpc_closure* closure) { - policy->vtable->ping_one_locked(exec_ctx, policy, closure); + grpc_closure* on_initiate, + grpc_closure* on_ack) { + policy->vtable->ping_one_locked(exec_ctx, policy, on_initiate, on_ack); } void grpc_lb_policy_notify_on_state_change_locked( diff --git a/src/core/ext/filters/client_channel/lb_policy.h b/src/core/ext/filters/client_channel/lb_policy.h index d3159eebf3b..38cc26422fc 100644 --- a/src/core/ext/filters/client_channel/lb_policy.h +++ b/src/core/ext/filters/client_channel/lb_policy.h @@ -78,7 +78,7 @@ struct grpc_lb_policy_vtable { /** \see grpc_lb_policy_ping_one */ void (*ping_one_locked)(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, - grpc_closure* closure); + grpc_closure* on_initiate, grpc_closure* on_ack); /** Try to enter a READY connectivity state */ void (*exit_idle_locked)(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy); @@ -171,7 +171,8 @@ int grpc_lb_policy_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, against one of the connected subchannels managed by \a policy. */ void grpc_lb_policy_ping_one_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, - grpc_closure* closure); + grpc_closure* on_initiate, + grpc_closure* on_ack); /** Cancel picks for \a target. The \a on_complete callback of the pending picks will be invoked with \a diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index db06fc20b60..a6972b850f0 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -275,18 +275,17 @@ static void add_pending_pick(pending_pick** root, typedef struct pending_ping { struct pending_ping* next; - /* args for wrapped_notify */ - wrapped_rr_closure_arg wrapped_notify_arg; + /* args for sending the ping */ + grpc_closure* on_initiate; + grpc_closure* on_ack; } pending_ping; -static void add_pending_ping(pending_ping** root, grpc_closure* notify) { +static void add_pending_ping(pending_ping** root, grpc_closure* on_initiate, + grpc_closure* on_ack) { pending_ping* pping = (pending_ping*)gpr_zalloc(sizeof(*pping)); - pping->wrapped_notify_arg.wrapped_closure = notify; - pping->wrapped_notify_arg.free_when_done = pping; + pping->on_initiate = on_initiate; + pping->on_ack = on_ack; pping->next = *root; - GRPC_CLOSURE_INIT(&pping->wrapped_notify_arg.wrapper_closure, - wrapped_rr_closure, &pping->wrapped_notify_arg, - grpc_schedule_on_exec_ctx); *root = pping; } @@ -822,14 +821,13 @@ static void create_rr_locked(grpc_exec_ctx* exec_ctx, glb_lb_policy* glb_policy, pending_ping* pping; while ((pping = glb_policy->pending_pings)) { glb_policy->pending_pings = pping->next; - GRPC_LB_POLICY_REF(glb_policy->rr_policy, "rr_handover_pending_ping"); - pping->wrapped_notify_arg.rr_policy = glb_policy->rr_policy; if (grpc_lb_glb_trace.enabled()) { gpr_log(GPR_INFO, "[grpclb %p] Pending ping about to PING from RR %p", glb_policy, glb_policy->rr_policy); } grpc_lb_policy_ping_one_locked(exec_ctx, glb_policy->rr_policy, - &pping->wrapped_notify_arg.wrapper_closure); + pping->on_initiate, pping->on_ack); + gpr_free(pping); } } @@ -1052,8 +1050,8 @@ static void glb_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { while (pping != nullptr) { pending_ping* next = pping->next; - GRPC_CLOSURE_SCHED(exec_ctx, &pping->wrapped_notify_arg.wrapper_closure, - GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(exec_ctx, pping->on_initiate, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(exec_ctx, pping->on_ack, GRPC_ERROR_REF(error)); gpr_free(pping); pping = next; } @@ -1251,12 +1249,14 @@ static grpc_connectivity_state glb_check_connectivity_locked( } static void glb_ping_one_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, - grpc_closure* closure) { + grpc_closure* on_initiate, + grpc_closure* on_ack) { glb_lb_policy* glb_policy = (glb_lb_policy*)pol; if (glb_policy->rr_policy) { - grpc_lb_policy_ping_one_locked(exec_ctx, glb_policy->rr_policy, closure); + grpc_lb_policy_ping_one_locked(exec_ctx, glb_policy->rr_policy, on_initiate, + on_ack); } else { - add_pending_ping(&glb_policy->pending_pings, closure); + add_pending_ping(&glb_policy->pending_pings, on_initiate, on_ack); if (!glb_policy->started_picking) { start_picking_locked(exec_ctx, glb_policy); } diff --git a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc index 228a77d9db7..b2007ca301a 100644 --- a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +++ b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc @@ -226,13 +226,16 @@ static void pf_notify_on_state_change_locked(grpc_exec_ctx* exec_ctx, } static void pf_ping_one_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, - grpc_closure* closure) { + grpc_closure* on_initiate, + grpc_closure* on_ack) { pick_first_lb_policy* p = (pick_first_lb_policy*)pol; if (p->selected) { grpc_connected_subchannel_ping(exec_ctx, p->selected->connected_subchannel, - closure); + on_initiate, on_ack); } else { - GRPC_CLOSURE_SCHED(exec_ctx, closure, + GRPC_CLOSURE_SCHED(exec_ctx, on_initiate, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Not connected")); + GRPC_CLOSURE_SCHED(exec_ctx, on_ack, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Not connected")); } } diff --git a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc index f68daba474c..bf6a72a62a8 100644 --- a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +++ b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc @@ -548,7 +548,8 @@ static void rr_notify_on_state_change_locked(grpc_exec_ctx* exec_ctx, } static void rr_ping_one_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, - grpc_closure* closure) { + grpc_closure* on_initiate, + grpc_closure* on_ack) { round_robin_lb_policy* p = (round_robin_lb_policy*)pol; const size_t next_ready_index = get_next_ready_subchannel_index_locked(p); if (next_ready_index < p->subchannel_list->num_subchannels) { @@ -556,11 +557,14 @@ static void rr_ping_one_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, &p->subchannel_list->subchannels[next_ready_index]; grpc_connected_subchannel* target = GRPC_CONNECTED_SUBCHANNEL_REF( selected->connected_subchannel, "rr_ping"); - grpc_connected_subchannel_ping(exec_ctx, target, closure); + grpc_connected_subchannel_ping(exec_ctx, target, on_initiate, on_ack); GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, target, "rr_ping"); } else { GRPC_CLOSURE_SCHED( - exec_ctx, closure, + exec_ctx, on_initiate, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Round Robin not connected")); + GRPC_CLOSURE_SCHED( + exec_ctx, on_ack, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Round Robin not connected")); } } diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc index 58e294d597f..bff2ae487dd 100644 --- a/src/core/ext/filters/client_channel/subchannel.cc +++ b/src/core/ext/filters/client_channel/subchannel.cc @@ -584,10 +584,12 @@ void grpc_connected_subchannel_notify_on_state_change( void grpc_connected_subchannel_ping(grpc_exec_ctx* exec_ctx, grpc_connected_subchannel* con, - grpc_closure* closure) { + grpc_closure* on_initiate, + grpc_closure* on_ack) { grpc_transport_op* op = grpc_make_transport_op(nullptr); grpc_channel_element* elem; - op->send_ping = closure; + op->send_ping.on_initiate = on_initiate; + op->send_ping.on_ack = on_ack; elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CONNECTION(con), 0); elem->filter->start_transport_op(exec_ctx, elem, op); } diff --git a/src/core/ext/filters/client_channel/subchannel.h b/src/core/ext/filters/client_channel/subchannel.h index 1f326fc1d20..3916ea00caf 100644 --- a/src/core/ext/filters/client_channel/subchannel.h +++ b/src/core/ext/filters/client_channel/subchannel.h @@ -135,7 +135,8 @@ void grpc_connected_subchannel_notify_on_state_change( grpc_closure* notify); void grpc_connected_subchannel_ping(grpc_exec_ctx* exec_ctx, grpc_connected_subchannel* channel, - grpc_closure* notify); + grpc_closure* on_initiate, + grpc_closure* on_ack); /** retrieve the grpc_connected_subchannel - or NULL if called before the subchannel becomes connected */ diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index 63ac65ac788..ea637e6bece 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -1815,8 +1815,9 @@ static void perform_transport_op_locked(grpc_exec_ctx* exec_ctx, grpc_endpoint_add_to_pollset_set(exec_ctx, t->ep, op->bind_pollset_set); } - if (op->send_ping) { - send_ping_locked(exec_ctx, t, nullptr, op->send_ping); + if (op->send_ping.on_initiate != nullptr || op->send_ping.on_ack != nullptr) { + send_ping_locked(exec_ctx, t, op->send_ping.on_initiate, + op->send_ping.on_ack); grpc_chttp2_initiate_write(exec_ctx, t, GRPC_CHTTP2_INITIATE_WRITE_APPLICATION_PING); } diff --git a/src/core/lib/surface/channel_ping.cc b/src/core/lib/surface/channel_ping.cc index e8f47f01cf4..7b1964fd55e 100644 --- a/src/core/lib/surface/channel_ping.cc +++ b/src/core/lib/surface/channel_ping.cc @@ -57,7 +57,7 @@ void grpc_channel_ping(grpc_channel* channel, grpc_completion_queue* cq, pr->tag = tag; pr->cq = cq; GRPC_CLOSURE_INIT(&pr->closure, ping_done, pr, grpc_schedule_on_exec_ctx); - op->send_ping = &pr->closure; + op->send_ping.on_ack = &pr->closure; op->bind_pollset = grpc_cq_pollset(cq); GPR_ASSERT(grpc_cq_begin_op(cq, tag)); top_elem->filter->start_transport_op(&exec_ctx, top_elem, op); diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index c32c9af50e5..559d7af43e6 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/src/core/lib/surface/lame_client.cc @@ -104,9 +104,14 @@ static void lame_start_transport_op(grpc_exec_ctx* exec_ctx, GRPC_CLOSURE_SCHED(exec_ctx, op->on_connectivity_state_change, GRPC_ERROR_NONE); } - if (op->send_ping != nullptr) { + if (op->send_ping.on_initiate != nullptr) { GRPC_CLOSURE_SCHED( - exec_ctx, op->send_ping, + exec_ctx, op->send_ping.on_initiate, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel")); + } + if (op->send_ping.on_ack != nullptr) { + GRPC_CLOSURE_SCHED( + exec_ctx, op->send_ping.on_ack, GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel")); } GRPC_ERROR_UNREF(op->disconnect_with_error); diff --git a/src/core/lib/transport/transport.h b/src/core/lib/transport/transport.h index b3cf04c22da..73264142d96 100644 --- a/src/core/lib/transport/transport.h +++ b/src/core/lib/transport/transport.h @@ -245,8 +245,14 @@ typedef struct grpc_transport_op { grpc_pollset* bind_pollset; /** add this transport to a pollset_set */ grpc_pollset_set* bind_pollset_set; - /** send a ping, call this back if not NULL */ - grpc_closure* send_ping; + /** send a ping, if either on_initiate or on_ack is not NULL */ + struct { + /** Ping may be delayed by the transport, on_initiate callback will be + called when the ping is actually being sent. */ + grpc_closure* on_initiate; + /** Called when the ping ack is received */ + grpc_closure* on_ack; + } send_ping; /*************************************************************************** * remaining fields are initialized and used at the discretion of the diff --git a/src/core/lib/transport/transport_op_string.cc b/src/core/lib/transport/transport_op_string.cc index e69ab025707..c0f82fea0dc 100644 --- a/src/core/lib/transport/transport_op_string.cc +++ b/src/core/lib/transport/transport_op_string.cc @@ -187,7 +187,7 @@ char* grpc_transport_op_string(grpc_transport_op* op) { gpr_strvec_add(&b, gpr_strdup("BIND_POLLSET_SET")); } - if (op->send_ping != nullptr) { + if (op->send_ping.on_initiate != nullptr || op->send_ping.on_ack != nullptr) { if (!first) gpr_strvec_add(&b, gpr_strdup(" ")); // first = false; gpr_strvec_add(&b, gpr_strdup("SEND_PING")); From 770bf078d517dbaa49eb532bff47566011940375 Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Tue, 5 Dec 2017 16:09:04 -0600 Subject: [PATCH 048/127] Regen projects and fix more uses of gpr_thd_new --- src/core/lib/profiling/basic_timers.cc | 3 ++- src/ruby/ext/grpc/rb_grpc_imports.generated.h | 2 +- test/cpp/grpclb/grpclb_test.cc | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/core/lib/profiling/basic_timers.cc b/src/core/lib/profiling/basic_timers.cc index 3ec6280e6b0..8fcb712f6b3 100644 --- a/src/core/lib/profiling/basic_timers.cc +++ b/src/core/lib/profiling/basic_timers.cc @@ -203,7 +203,8 @@ void gpr_timers_set_log_filename(const char* filename) { static void init_output() { gpr_thd_options options = gpr_thd_options_default(); gpr_thd_options_set_joinable(&options); - GPR_ASSERT(gpr_thd_new(&g_writing_thread, writing_thread, NULL, &options)); + GPR_ASSERT(gpr_thd_new(&g_writing_thread, "timer_output_thread", + writing_thread, NULL, &options)); atexit(finish_writing); } diff --git a/src/ruby/ext/grpc/rb_grpc_imports.generated.h b/src/ruby/ext/grpc/rb_grpc_imports.generated.h index 62223fda5b7..fae77843f03 100644 --- a/src/ruby/ext/grpc/rb_grpc_imports.generated.h +++ b/src/ruby/ext/grpc/rb_grpc_imports.generated.h @@ -768,7 +768,7 @@ extern gpr_stats_inc_type gpr_stats_inc_import; typedef intptr_t(*gpr_stats_read_type)(const gpr_stats_counter* c); extern gpr_stats_read_type gpr_stats_read_import; #define gpr_stats_read gpr_stats_read_import -typedef int(*gpr_thd_new_type)(gpr_thd_id* t, void (*thd_body)(void* arg), void* arg, const gpr_thd_options* options); +typedef int(*gpr_thd_new_type)(gpr_thd_id* t, const char* thd_name, void (*thd_body)(void* arg), void* arg, const gpr_thd_options* options); extern gpr_thd_new_type gpr_thd_new_import; #define gpr_thd_new gpr_thd_new_import typedef gpr_thd_options(*gpr_thd_options_default_type)(void); diff --git a/test/cpp/grpclb/grpclb_test.cc b/test/cpp/grpclb/grpclb_test.cc index ca846c72fde..67bf5a2bb00 100644 --- a/test/cpp/grpclb/grpclb_test.cc +++ b/test/cpp/grpclb/grpclb_test.cc @@ -703,14 +703,14 @@ static test_fixture setup_test_fixture(int lb_server_update_delay_ms) { tf.lb_backends[i].lb_token_prefix = ""; } setup_server("127.0.0.1", &tf.lb_backends[i]); - gpr_thd_new(&tf.lb_backends[i].tid, fork_backend_server, &tf.lb_backends[i], + gpr_thd_new(&tf.lb_backends[i].tid, "grpclb_backend", fork_backend_server, &tf.lb_backends[i], &options); } tf.lb_server.lb_token_prefix = LB_TOKEN_PREFIX; tf.lb_server.balancer_name = BALANCERS_NAME; setup_server("127.0.0.1", &tf.lb_server); - gpr_thd_new(&tf.lb_server.tid, fork_lb_server, &tf.lb_server, &options); + gpr_thd_new(&tf.lb_server.tid, "grpclb_server", fork_lb_server, &tf.lb_server, &options); setup_client(&tf.lb_server, tf.lb_backends, &tf.client); return tf; } From dba6f847d7db7dbe13fb65988e2c22a698ff7943 Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Tue, 5 Dec 2017 17:16:35 -0600 Subject: [PATCH 049/127] Update basic_timers.cc --- src/core/lib/profiling/basic_timers.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/lib/profiling/basic_timers.cc b/src/core/lib/profiling/basic_timers.cc index 8fcb712f6b3..87dd4ab120b 100644 --- a/src/core/lib/profiling/basic_timers.cc +++ b/src/core/lib/profiling/basic_timers.cc @@ -204,7 +204,7 @@ static void init_output() { gpr_thd_options options = gpr_thd_options_default(); gpr_thd_options_set_joinable(&options); GPR_ASSERT(gpr_thd_new(&g_writing_thread, "timer_output_thread", - writing_thread, NULL, &options)); + writing_thread, NULL, &options)); atexit(finish_writing); } From 43b8f8a11e8d14f5ad8a7523b770a06a0a554c18 Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Tue, 5 Dec 2017 17:17:40 -0600 Subject: [PATCH 050/127] Update grpclb_test.cc --- test/cpp/grpclb/grpclb_test.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/cpp/grpclb/grpclb_test.cc b/test/cpp/grpclb/grpclb_test.cc index 67bf5a2bb00..a469fbb7e3b 100644 --- a/test/cpp/grpclb/grpclb_test.cc +++ b/test/cpp/grpclb/grpclb_test.cc @@ -703,14 +703,15 @@ static test_fixture setup_test_fixture(int lb_server_update_delay_ms) { tf.lb_backends[i].lb_token_prefix = ""; } setup_server("127.0.0.1", &tf.lb_backends[i]); - gpr_thd_new(&tf.lb_backends[i].tid, "grpclb_backend", fork_backend_server, &tf.lb_backends[i], - &options); + gpr_thd_new(&tf.lb_backends[i].tid, "grpclb_backend", fork_backend_server, + &tf.lb_backends[i], &options); } tf.lb_server.lb_token_prefix = LB_TOKEN_PREFIX; tf.lb_server.balancer_name = BALANCERS_NAME; setup_server("127.0.0.1", &tf.lb_server); - gpr_thd_new(&tf.lb_server.tid, "grpclb_server", fork_lb_server, &tf.lb_server, &options); + gpr_thd_new(&tf.lb_server.tid, "grpclb_server", fork_lb_server, &tf.lb_server, + &options); setup_client(&tf.lb_server, tf.lb_backends, &tf.client); return tf; } From e6e60162e5314a54492982ecfc8de93a01451ffa Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Tue, 5 Dec 2017 16:17:30 -0800 Subject: [PATCH 051/127] Change GPR_INFO to GPR_ERROR --- src/core/ext/transport/cronet/transport/cronet_transport.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index 4e16032da00..8836a3253c0 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -401,7 +401,7 @@ static void execute_from_storage(grpc_exec_ctx* exec_ctx, stream_obj* s) { Cronet callback */ static void on_failed(bidirectional_stream* stream, int net_error) { - gpr_log(GPR_INFO, "on_failed(%p, %d)", stream, net_error); + gpr_log(GPR_ERROR, "on_failed(%p, %d)", stream, net_error); grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; stream_obj* s = (stream_obj*)stream->annotation; From 30ccc944d659a9314f717c9fff582d917420656a Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Tue, 5 Dec 2017 18:30:52 -0600 Subject: [PATCH 052/127] Update port_platform.h --- include/grpc/impl/codegen/port_platform.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h index b22988a438c..5a0ed851111 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h @@ -166,7 +166,6 @@ #define GPR_POSIX_SYNC 1 #define GPR_POSIX_TIME 1 #define GPR_GETPID_IN_UNISTD_H 1 -#define GPR_LINUX_PTHREAD_NAME 1 #ifdef _LP64 #define GPR_ARCH_64 1 #else /* _LP64 */ @@ -174,6 +173,7 @@ #endif /* _LP64 */ #ifdef __GLIBC__ #define GPR_POSIX_CRASH_HANDLER 1 +#define GPR_LINUX_PTHREAD_NAME 1 #else /* musl libc */ #define GPR_MUSL_LIBC_COMPAT 1 #endif From 570707b07674913c011154bd7c880dc28a1e73e5 Mon Sep 17 00:00:00 2001 From: Juanli Shen Date: Tue, 5 Dec 2017 17:08:19 -0800 Subject: [PATCH 053/127] RR goes to TF if all subchannels are SD or TF --- .../lb_policy/round_robin/round_robin.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc index f68daba474c..31a26bc2cee 100644 --- a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +++ b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc @@ -365,19 +365,18 @@ static void update_lb_connectivity_status_locked(grpc_exec_ctx* exec_ctx, * CHECK: subchannel_list->num_shutdown == * subchannel_list->num_subchannels. * - * 4) RULE: ALL subchannels are TRANSIENT_FAILURE => policy is + * 4) RULE: ALL subchannels are SHUTDOWN or TRANSIENT_FAILURE => policy is * TRANSIENT_FAILURE. - * CHECK: subchannel_list->num_transient_failures == - * subchannel_list->num_subchannels. + * CHECK: subchannel_list->num_shutdown + + subchannel_list->num_transient_failures == + subchannel_list->num_subchannels. * * 5) RULE: ALL subchannels are IDLE => policy is IDLE. * CHECK: subchannel_list->num_idle == subchannel_list->num_subchannels. * (Note that all the subchannels will transition from IDLE to CONNECTING * in batch when we start trying to connect.) */ - // TODO(juanlishen): if the subchannel states are mixed by {SHUTDOWN, - // TRANSIENT_FAILURE}, we don't change the state. We may want to improve on - // this. + // TODO(juanlishen): For rule 4, we may want to re-resolve instead. grpc_lb_subchannel_list* subchannel_list = sd->subchannel_list; round_robin_lb_policy* p = (round_robin_lb_policy*)subchannel_list->policy; if (subchannel_list->num_ready > 0) { @@ -398,7 +397,8 @@ static void update_lb_connectivity_status_locked(grpc_exec_ctx* exec_ctx, p->started_picking = false; grpc_lb_policy_try_reresolve(exec_ctx, &p->base, &grpc_lb_round_robin_trace, GRPC_ERROR_NONE); - } else if (subchannel_list->num_transient_failures == + } else if (subchannel_list->num_shutdown + + subchannel_list->num_transient_failures == subchannel_list->num_subchannels) { /* 4) TRANSIENT_FAILURE */ grpc_connectivity_state_set(exec_ctx, &p->state_tracker, From d742f2893fba18d6c4a7b7e780fb4d79b8232a3b Mon Sep 17 00:00:00 2001 From: yang-g Date: Tue, 5 Dec 2017 17:34:48 -0800 Subject: [PATCH 054/127] Bug fix, use the last_sent ping time for next send --- .../ext/transport/chttp2/transport/writing.cc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc index 204b5a77087..cfaa0d0f703 100644 --- a/src/core/ext/transport/chttp2/transport/writing.cc +++ b/src/core/ext/transport/chttp2/transport/writing.cc @@ -69,14 +69,15 @@ static void maybe_initiate_ping(grpc_exec_ctx* exec_ctx, return; } grpc_millis now = grpc_exec_ctx_now(exec_ctx); + + grpc_millis next_allowed_ping_interval = + (t->keepalive_permit_without_calls == 0 && + grpc_chttp2_stream_map_size(&t->stream_map) == 0) + ? 7200 * GPR_MS_PER_SEC + : t->ping_policy.min_sent_ping_interval_without_data; grpc_millis next_allowed_ping = - t->ping_state.last_ping_sent_time + - t->ping_policy.min_sent_ping_interval_without_data; - if (t->keepalive_permit_without_calls == 0 && - grpc_chttp2_stream_map_size(&t->stream_map) == 0) { - next_allowed_ping = - t->ping_recv_state.last_ping_recv_time + 7200 * GPR_MS_PER_SEC; - } + t->ping_state.last_ping_sent_time + next_allowed_ping_interval; + if (next_allowed_ping > now) { /* not enough elapsed time between successive pings */ if (grpc_http_trace.enabled() || grpc_bdp_estimator_trace.enabled()) { From ad4d2dde0052efbbf49d64b0843c45f0381cfeb3 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Wed, 6 Dec 2017 09:05:05 -0800 Subject: [PATCH 055/127] Revert "All instances of exec_ctx being passed around in src/core removed" --- include/grpc++/support/channel_arguments.h | 2 +- include/grpc/impl/codegen/grpc_types.h | 2 +- include/grpc/impl/codegen/slice.h | 2 +- include/grpc/slice_buffer.h | 3 +- include/grpc/support/tls.h | 6 - include/grpc/support/tls_gcc.h | 5 - include/grpc/support/tls_msvc.h | 9 - include/grpc/support/tls_pthread.h | 9 - .../filters/client_channel/backup_poller.cc | 47 +- .../filters/client_channel/backup_poller.h | 4 +- .../client_channel/channel_connectivity.cc | 52 +- .../filters/client_channel/client_channel.cc | 409 ++++--- .../filters/client_channel/client_channel.h | 8 +- .../client_channel/client_channel_factory.cc | 23 +- .../client_channel/client_channel_factory.h | 19 +- .../client_channel/client_channel_plugin.cc | 13 +- .../ext/filters/client_channel/connector.cc | 13 +- .../ext/filters/client_channel/connector.h | 14 +- .../client_channel/http_connect_handshaker.cc | 84 +- .../ext/filters/client_channel/http_proxy.cc | 18 +- .../ext/filters/client_channel/lb_policy.cc | 79 +- .../ext/filters/client_channel/lb_policy.h | 80 +- .../grpclb/client_load_reporting_filter.cc | 27 +- .../client_channel/lb_policy/grpclb/grpclb.cc | 434 ++++--- .../lb_policy/grpclb/grpclb_channel.cc | 6 +- .../lb_policy/grpclb/grpclb_channel.h | 4 +- .../lb_policy/grpclb/grpclb_channel_secure.cc | 10 +- .../lb_policy/pick_first/pick_first.cc | 190 +-- .../lb_policy/round_robin/round_robin.cc | 140 ++- .../lb_policy/subchannel_list.cc | 54 +- .../lb_policy/subchannel_list.h | 18 +- .../client_channel/lb_policy_factory.cc | 15 +- .../client_channel/lb_policy_factory.h | 11 +- .../client_channel/lb_policy_registry.cc | 4 +- .../client_channel/lb_policy_registry.h | 2 +- .../filters/client_channel/proxy_mapper.cc | 14 +- .../ext/filters/client_channel/proxy_mapper.h | 14 +- .../client_channel/proxy_mapper_registry.cc | 30 +- .../client_channel/proxy_mapper_registry.h | 6 +- .../ext/filters/client_channel/resolver.cc | 24 +- .../ext/filters/client_channel/resolver.h | 31 +- .../resolver/dns/c_ares/dns_resolver_ares.cc | 94 +- .../resolver/dns/c_ares/grpc_ares_ev_driver.h | 6 +- .../dns/c_ares/grpc_ares_ev_driver_posix.cc | 52 +- .../resolver/dns/c_ares/grpc_ares_wrapper.cc | 70 +- .../resolver/dns/c_ares/grpc_ares_wrapper.h | 12 +- .../dns/c_ares/grpc_ares_wrapper_fallback.cc | 20 +- .../resolver/dns/native/dns_resolver.cc | 90 +- .../resolver/fake/fake_resolver.cc | 52 +- .../resolver/fake/fake_resolver.h | 2 +- .../resolver/sockaddr/sockaddr_resolver.cc | 55 +- .../client_channel/resolver_factory.cc | 5 +- .../filters/client_channel/resolver_factory.h | 6 +- .../client_channel/resolver_registry.cc | 27 +- .../client_channel/resolver_registry.h | 7 +- .../ext/filters/client_channel/subchannel.cc | 239 ++-- .../ext/filters/client_channel/subchannel.h | 75 +- .../client_channel/subchannel_index.cc | 63 +- .../filters/client_channel/subchannel_index.h | 12 +- .../ext/filters/client_channel/uri_parser.cc | 28 +- .../ext/filters/client_channel/uri_parser.h | 3 +- .../ext/filters/deadline/deadline_filter.cc | 112 +- .../ext/filters/deadline/deadline_filter.h | 10 +- .../filters/http/client/http_client_filter.cc | 125 +- .../ext/filters/http/http_filters_plugin.cc | 6 +- .../message_compress_filter.cc | 126 +- .../filters/http/server/http_server_filter.cc | 118 +- .../server_load_reporting_filter.cc | 33 +- .../server_load_reporting_plugin.cc | 2 +- .../ext/filters/max_age/max_age_filter.cc | 101 +- .../message_size/message_size_filter.cc | 36 +- .../workaround_cronet_compression_filter.cc | 23 +- .../chttp2/client/chttp2_connector.cc | 70 +- .../chttp2/client/insecure/channel_create.cc | 32 +- .../client/insecure/channel_create_posix.cc | 16 +- .../client/secure/secure_channel_create.cc | 51 +- .../transport/chttp2/server/chttp2_server.cc | 108 +- .../transport/chttp2/server/chttp2_server.h | 3 +- .../chttp2/server/insecure/server_chttp2.cc | 6 +- .../server/insecure/server_chttp2_posix.cc | 17 +- .../server/secure/server_secure_chttp2.cc | 11 +- .../transport/chttp2/transport/bin_decoder.cc | 14 +- .../transport/chttp2/transport/bin_decoder.h | 5 +- .../transport/chttp2/transport/bin_encoder.h | 2 +- .../chttp2/transport/chttp2_transport.cc | 1088 ++++++++++------- .../chttp2/transport/chttp2_transport.h | 7 +- .../chttp2/transport/flow_control.cc | 15 +- .../transport/chttp2/transport/flow_control.h | 7 +- .../transport/chttp2/transport/frame_data.cc | 62 +- .../transport/chttp2/transport/frame_data.h | 7 +- .../chttp2/transport/frame_goaway.cc | 5 +- .../transport/chttp2/transport/frame_goaway.h | 3 +- .../transport/chttp2/transport/frame_ping.cc | 11 +- .../transport/chttp2/transport/frame_ping.h | 2 +- .../chttp2/transport/frame_rst_stream.cc | 5 +- .../chttp2/transport/frame_rst_stream.h | 3 +- .../chttp2/transport/frame_settings.cc | 5 +- .../chttp2/transport/frame_settings.h | 3 +- .../chttp2/transport/frame_window_update.cc | 16 +- .../chttp2/transport/frame_window_update.h | 8 +- .../chttp2/transport/hpack_encoder.cc | 144 ++- .../chttp2/transport/hpack_encoder.h | 6 +- .../chttp2/transport/hpack_parser.cc | 546 +++++---- .../transport/chttp2/transport/hpack_parser.h | 17 +- .../transport/chttp2/transport/hpack_table.cc | 32 +- .../transport/chttp2/transport/hpack_table.h | 13 +- .../chttp2/transport/incoming_metadata.cc | 19 +- .../chttp2/transport/incoming_metadata.h | 9 +- .../ext/transport/chttp2/transport/internal.h | 106 +- .../ext/transport/chttp2/transport/parsing.cc | 185 +-- .../ext/transport/chttp2/transport/writing.cc | 121 +- .../client/secure/cronet_channel_create.cc | 5 +- .../cronet/transport/cronet_transport.cc | 173 +-- .../ext/transport/inproc/inproc_transport.cc | 342 +++--- src/core/lib/backoff/backoff.cc | 10 +- src/core/lib/backoff/backoff.h | 6 +- src/core/lib/channel/channel_args.cc | 16 +- src/core/lib/channel/channel_args.h | 9 +- src/core/lib/channel/channel_stack.cc | 46 +- src/core/lib/channel/channel_stack.h | 64 +- src/core/lib/channel/channel_stack_builder.cc | 25 +- src/core/lib/channel/channel_stack_builder.h | 11 +- src/core/lib/channel/connected_channel.cc | 57 +- src/core/lib/channel/connected_channel.h | 3 +- src/core/lib/channel/handshaker.cc | 77 +- src/core/lib/channel/handshaker.h | 33 +- src/core/lib/channel/handshaker_factory.cc | 12 +- src/core/lib/channel/handshaker_factory.h | 12 +- src/core/lib/channel/handshaker_registry.cc | 22 +- src/core/lib/channel/handshaker_registry.h | 5 +- src/core/lib/compression/message_compress.cc | 42 +- src/core/lib/compression/message_compress.h | 6 +- .../compression/stream_compression_gzip.cc | 20 +- src/core/lib/debug/stats.cc | 6 +- src/core/lib/debug/stats.h | 20 +- src/core/lib/debug/stats_data.cc | 201 +-- src/core/lib/debug/stats_data.h | 540 ++++---- src/core/lib/http/httpcli.cc | 127 +- src/core/lib/http/httpcli.h | 27 +- .../lib/http/httpcli_security_connector.cc | 55 +- src/core/lib/iomgr/block_annotate.h | 19 +- src/core/lib/iomgr/call_combiner.cc | 31 +- src/core/lib/iomgr/call_combiner.h | 40 +- src/core/lib/iomgr/closure.h | 58 +- src/core/lib/iomgr/combiner.cc | 128 +- src/core/lib/iomgr/combiner.h | 12 +- src/core/lib/iomgr/endpoint.cc | 36 +- src/core/lib/iomgr/endpoint.h | 41 +- src/core/lib/iomgr/endpoint_pair_posix.cc | 7 +- src/core/lib/iomgr/endpoint_pair_windows.cc | 10 +- src/core/lib/iomgr/error.cc | 6 +- src/core/lib/iomgr/ev_epoll1_linux.cc | 196 +-- src/core/lib/iomgr/ev_epollex_linux.cc | 238 ++-- src/core/lib/iomgr/ev_epollsig_linux.cc | 180 +-- src/core/lib/iomgr/ev_poll_posix.cc | 199 +-- src/core/lib/iomgr/ev_posix.cc | 80 +- src/core/lib/iomgr/ev_posix.h | 72 +- src/core/lib/iomgr/exec_ctx.cc | 124 +- src/core/lib/iomgr/exec_ctx.h | 182 +-- src/core/lib/iomgr/executor.cc | 58 +- src/core/lib/iomgr/executor.h | 6 +- src/core/lib/iomgr/fork_posix.cc | 17 +- src/core/lib/iomgr/iocp_windows.cc | 30 +- src/core/lib/iomgr/iocp_windows.h | 3 +- src/core/lib/iomgr/iomgr.cc | 115 +- src/core/lib/iomgr/iomgr.h | 6 +- src/core/lib/iomgr/iomgr_uv.cc | 5 +- src/core/lib/iomgr/lockfree_event.cc | 15 +- src/core/lib/iomgr/lockfree_event.h | 6 +- src/core/lib/iomgr/polling_entity.cc | 16 +- src/core/lib/iomgr/polling_entity.h | 6 +- src/core/lib/iomgr/pollset.h | 9 +- src/core/lib/iomgr/pollset_set.h | 15 +- src/core/lib/iomgr/pollset_set_uv.cc | 15 +- src/core/lib/iomgr/pollset_set_windows.cc | 15 +- src/core/lib/iomgr/pollset_uv.cc | 17 +- src/core/lib/iomgr/pollset_windows.cc | 29 +- src/core/lib/iomgr/resolve_address.h | 3 +- src/core/lib/iomgr/resolve_address_posix.cc | 20 +- src/core/lib/iomgr/resolve_address_uv.cc | 15 +- src/core/lib/iomgr/resolve_address_windows.cc | 15 +- src/core/lib/iomgr/resource_quota.cc | 182 +-- src/core/lib/iomgr/resource_quota.h | 25 +- src/core/lib/iomgr/socket_factory_posix.cc | 2 +- src/core/lib/iomgr/socket_mutator.cc | 2 +- src/core/lib/iomgr/socket_windows.cc | 19 +- src/core/lib/iomgr/socket_windows.h | 9 +- src/core/lib/iomgr/tcp_client.h | 3 +- src/core/lib/iomgr/tcp_client_posix.cc | 64 +- src/core/lib/iomgr/tcp_client_posix.h | 3 +- src/core/lib/iomgr/tcp_client_uv.cc | 37 +- src/core/lib/iomgr/tcp_client_windows.cc | 45 +- src/core/lib/iomgr/tcp_posix.cc | 262 ++-- src/core/lib/iomgr/tcp_posix.h | 7 +- src/core/lib/iomgr/tcp_server.h | 15 +- src/core/lib/iomgr/tcp_server_posix.cc | 64 +- src/core/lib/iomgr/tcp_server_uv.cc | 57 +- src/core/lib/iomgr/tcp_server_windows.cc | 58 +- src/core/lib/iomgr/tcp_uv.cc | 99 +- src/core/lib/iomgr/tcp_windows.cc | 93 +- src/core/lib/iomgr/tcp_windows.h | 2 +- src/core/lib/iomgr/timer.h | 13 +- src/core/lib/iomgr/timer_generic.cc | 47 +- src/core/lib/iomgr/timer_manager.cc | 30 +- src/core/lib/iomgr/timer_uv.cc | 26 +- src/core/lib/iomgr/udp_server.cc | 83 +- src/core/lib/iomgr/udp_server.h | 17 +- .../lib/security/context/security_context.cc | 17 +- .../composite/composite_credentials.cc | 51 +- .../lib/security/credentials/credentials.cc | 73 +- .../lib/security/credentials/credentials.h | 59 +- .../credentials/credentials_metadata.cc | 4 +- .../credentials/fake/fake_credentials.cc | 36 +- .../google_default_credentials.cc | 58 +- .../credentials/iam/iam_credentials.cc | 22 +- .../credentials/jwt/jwt_credentials.cc | 34 +- .../credentials/jwt/jwt_credentials.h | 3 +- .../security/credentials/jwt/jwt_verifier.cc | 126 +- .../security/credentials/jwt/jwt_verifier.h | 14 +- .../credentials/oauth2/oauth2_credentials.cc | 102 +- .../credentials/oauth2/oauth2_credentials.h | 7 +- .../credentials/plugin/plugin_credentials.cc | 51 +- .../credentials/ssl/ssl_credentials.cc | 21 +- .../security/transport/client_auth_filter.cc | 85 +- .../lib/security/transport/lb_targets_info.cc | 4 +- .../lib/security/transport/secure_endpoint.cc | 120 +- .../security/transport/security_connector.cc | 144 ++- .../security/transport/security_connector.h | 53 +- .../security/transport/security_handshaker.cc | 189 +-- .../security/transport/security_handshaker.h | 3 +- .../security/transport/server_auth_filter.cc | 55 +- src/core/lib/slice/b64.cc | 11 +- src/core/lib/slice/b64.h | 7 +- src/core/lib/slice/slice.cc | 17 +- src/core/lib/slice/slice_buffer.cc | 27 +- src/core/lib/slice/slice_hash_table.cc | 12 +- src/core/lib/slice/slice_hash_table.h | 6 +- src/core/lib/slice/slice_intern.cc | 7 +- src/core/lib/slice/slice_internal.h | 11 +- src/core/lib/surface/alarm.cc | 25 +- src/core/lib/surface/byte_buffer.cc | 5 +- src/core/lib/surface/byte_buffer_reader.cc | 16 +- src/core/lib/surface/call.cc | 429 ++++--- src/core/lib/surface/call.h | 24 +- src/core/lib/surface/call_details.cc | 7 +- src/core/lib/surface/channel.cc | 115 +- src/core/lib/surface/channel.h | 27 +- src/core/lib/surface/channel_init.cc | 5 +- src/core/lib/surface/channel_init.h | 6 +- src/core/lib/surface/channel_ping.cc | 14 +- src/core/lib/surface/completion_queue.cc | 328 ++--- src/core/lib/surface/completion_queue.h | 21 +- src/core/lib/surface/init.cc | 51 +- src/core/lib/surface/init_secure.cc | 4 +- src/core/lib/surface/lame_client.cc | 53 +- src/core/lib/surface/server.cc | 322 +++-- src/core/lib/surface/server.h | 15 +- src/core/lib/transport/bdp_estimator.cc | 4 +- src/core/lib/transport/bdp_estimator.h | 2 +- src/core/lib/transport/byte_stream.cc | 62 +- src/core/lib/transport/byte_stream.h | 27 +- src/core/lib/transport/connectivity_state.cc | 22 +- src/core/lib/transport/connectivity_state.h | 10 +- src/core/lib/transport/error_utils.cc | 10 +- src/core/lib/transport/error_utils.h | 5 +- src/core/lib/transport/metadata.cc | 40 +- src/core/lib/transport/metadata.h | 20 +- src/core/lib/transport/metadata_batch.cc | 79 +- src/core/lib/transport/metadata_batch.h | 42 +- src/core/lib/transport/service_config.cc | 24 +- src/core/lib/transport/service_config.h | 8 +- src/core/lib/transport/static_metadata.cc | 2 +- src/core/lib/transport/status_conversion.cc | 5 +- src/core/lib/transport/status_conversion.h | 3 +- src/core/lib/transport/transport.cc | 84 +- src/core/lib/transport/transport.h | 33 +- src/core/lib/transport/transport_impl.h | 27 +- src/core/tsi/fake_transport_security.cc | 17 +- src/core/tsi/transport_security.h | 2 +- src/core/tsi/transport_security_grpc.cc | 29 +- src/core/tsi/transport_security_grpc.h | 22 +- src/cpp/common/channel_arguments.cc | 11 +- src/cpp/common/channel_filter.cc | 29 +- src/cpp/common/channel_filter.h | 62 +- .../CoreCronetEnd2EndTests.mm | 5 +- src/ruby/ext/grpc/rb_grpc_imports.generated.h | 2 +- test/core/backoff/backoff_test.cc | 99 +- test/core/bad_client/bad_client.cc | 49 +- test/core/bad_client/tests/badreq.cc | 4 - .../bad_client/tests/connection_prefix.cc | 3 - .../bad_client/tests/head_of_line_blocking.cc | 3 - test/core/bad_client/tests/headers.cc | 2 - .../tests/initial_settings_frame.cc | 2 - .../tests/server_registered_method.cc | 2 - test/core/bad_client/tests/simple_request.cc | 4 - test/core/bad_client/tests/unknown_frame.cc | 2 - test/core/bad_client/tests/window_overflow.cc | 3 - test/core/channel/channel_args_test.cc | 26 +- .../channel/channel_stack_builder_test.cc | 24 +- test/core/channel/channel_stack_test.cc | 45 +- .../channel/minimal_stack_is_minimal_test.cc | 15 +- test/core/client_channel/lb_policies_test.cc | 14 +- .../core/client_channel/parse_address_test.cc | 19 +- .../dns_resolver_connectivity_test.cc | 85 +- .../resolvers/dns_resolver_test.cc | 21 +- .../resolvers/fake_resolver_test.cc | 54 +- .../resolvers/sockaddr_resolver_test.cc | 28 +- test/core/client_channel/uri_fuzzer_test.cc | 19 +- test/core/client_channel/uri_parser_test.cc | 31 +- test/core/compression/algorithm_test.cc | 12 +- .../core/compression/message_compress_test.cc | 62 +- test/core/debug/stats_test.cc | 15 +- test/core/end2end/bad_server_response_test.cc | 37 +- test/core/end2end/connection_refused_test.cc | 5 +- test/core/end2end/fixtures/h2_census.cc | 10 +- test/core/end2end/fixtures/h2_compress.cc | 17 +- test/core/end2end/fixtures/h2_fd.cc | 8 +- .../end2end/fixtures/h2_full+workarounds.cc | 5 +- .../end2end/fixtures/h2_load_reporting.cc | 5 +- test/core/end2end/fixtures/h2_oauth2.cc | 7 +- .../end2end/fixtures/h2_sockpair+trace.cc | 35 +- test/core/end2end/fixtures/h2_sockpair.cc | 33 +- .../end2end/fixtures/h2_sockpair_1byte.cc | 33 +- test/core/end2end/fixtures/h2_ssl.cc | 5 +- test/core/end2end/fixtures/h2_ssl_proxy.cc | 10 +- .../end2end/fixtures/http_proxy_fixture.cc | 192 +-- test/core/end2end/fuzzers/api_fuzzer.cc | 83 +- test/core/end2end/fuzzers/client_fuzzer.cc | 210 ++-- test/core/end2end/fuzzers/server_fuzzer.cc | 135 +- test/core/end2end/goaway_server_test.cc | 28 +- test/core/end2end/h2_ssl_cert_test.cc | 5 +- .../core/end2end/tests/cancel_after_accept.cc | 5 +- .../end2end/tests/cancel_after_round_trip.cc | 5 +- test/core/end2end/tests/compressed_payload.cc | 19 +- .../end2end/tests/filter_call_init_fails.cc | 19 +- .../core/end2end/tests/filter_causes_close.cc | 24 +- test/core/end2end/tests/filter_latency.cc | 18 +- .../core/end2end/tests/load_reporting_hook.cc | 5 +- test/core/end2end/tests/max_message_length.cc | 18 +- .../stream_compression_compressed_payload.cc | 19 +- .../tests/stream_compression_payload.cc | 7 +- .../stream_compression_ping_pong_streaming.cc | 7 +- .../tests/workaround_cronet_compression.cc | 12 +- .../readahead_handshaker_server_ssl.cc | 24 +- test/core/http/format_request_test.cc | 2 - test/core/http/httpcli_test.cc | 146 +-- test/core/http/httpscli_test.cc | 52 +- test/core/http/parser_test.cc | 3 - test/core/http/request_fuzzer.cc | 3 - test/core/http/response_fuzzer.cc | 3 - test/core/iomgr/combiner_test.cc | 51 +- test/core/iomgr/endpoint_pair_test.cc | 29 +- test/core/iomgr/endpoint_tests.cc | 99 +- test/core/iomgr/ev_epollsig_linux_test.cc | 109 +- test/core/iomgr/fd_conservation_posix_test.cc | 37 +- test/core/iomgr/fd_posix_test.cc | 156 +-- test/core/iomgr/load_file_test.cc | 3 - test/core/iomgr/pollset_set_test.cc | 245 ++-- test/core/iomgr/resolve_address_posix_test.cc | 65 +- test/core/iomgr/resolve_address_test.cc | 153 +-- test/core/iomgr/resource_quota_test.cc | 354 +++--- test/core/iomgr/tcp_client_posix_test.cc | 83 +- test/core/iomgr/tcp_client_uv_test.cc | 62 +- test/core/iomgr/tcp_posix_test.cc | 153 +-- test/core/iomgr/tcp_server_posix_test.cc | 183 +-- test/core/iomgr/tcp_server_uv_test.cc | 90 +- test/core/iomgr/timer_list_test.cc | 75 +- test/core/iomgr/udp_server_test.cc | 105 +- test/core/nanopb/fuzzer_response.cc | 3 - test/core/nanopb/fuzzer_serverlist.cc | 3 - test/core/security/credentials_test.cc | 303 +++-- test/core/security/json_token_test.cc | 16 +- test/core/security/jwt_verifier_test.cc | 146 ++- test/core/security/oauth2_utils.cc | 30 +- .../print_google_default_creds_token.cc | 22 +- test/core/security/secure_endpoint_test.cc | 67 +- test/core/security/ssl_server_fuzzer.cc | 124 +- test/core/security/verify_jwt.cc | 23 +- test/core/slice/b64_test.cc | 46 +- test/core/slice/percent_decode_fuzzer.cc | 3 - test/core/slice/percent_encode_fuzzer.cc | 3 - test/core/slice/percent_encoding_test.cc | 3 - test/core/slice/slice_buffer_test.cc | 3 - test/core/slice/slice_hash_table_test.cc | 39 +- test/core/slice/slice_string_helpers_test.cc | 3 - test/core/slice/slice_test.cc | 2 - test/core/surface/byte_buffer_reader_test.cc | 8 +- test/core/surface/channel_create_test.cc | 3 +- test/core/surface/completion_queue_test.cc | 39 +- .../completion_queue_threading_test.cc | 19 +- .../surface/concurrent_connectivity_test.cc | 41 +- test/core/surface/lame_client_test.cc | 13 +- ...num_external_connectivity_watchers_test.cc | 5 +- .../surface/secure_channel_create_test.cc | 17 +- .../surface/sequential_connectivity_test.cc | 5 +- test/core/transport/bdp_estimator_test.cc | 7 +- test/core/transport/byte_stream_test.cc | 113 +- .../core/transport/chttp2/bin_decoder_test.cc | 158 +-- .../core/transport/chttp2/bin_encoder_test.cc | 3 - .../transport/chttp2/hpack_encoder_test.cc | 91 +- .../chttp2/hpack_parser_fuzzer_test.cc | 19 +- .../transport/chttp2/hpack_parser_test.cc | 41 +- .../core/transport/chttp2/hpack_table_test.cc | 72 +- .../transport/chttp2/settings_timeout_test.cc | 55 +- test/core/transport/chttp2/varint_test.cc | 3 - .../core/transport/connectivity_state_test.cc | 51 +- test/core/transport/metadata_test.cc | 137 ++- test/core/transport/status_conversion_test.cc | 11 +- .../core/transport/stream_owned_slice_test.cc | 5 +- test/core/util/mock_endpoint.cc | 36 +- test/core/util/mock_endpoint.h | 3 +- test/core/util/one_corpus_entry_fuzzer.cc | 8 - test/core/util/passthru_endpoint.cc | 45 +- test/core/util/port_server_client.cc | 130 +- test/core/util/reconnect_server.cc | 6 +- test/core/util/test_tcp_server.cc | 36 +- test/core/util/trickle_endpoint.cc | 56 +- test/core/util/trickle_endpoint.h | 3 +- test/cpp/client/client_channel_stress_test.cc | 11 +- test/cpp/common/channel_arguments_test.cc | 5 +- test/cpp/common/channel_filter_test.cc | 4 +- test/cpp/end2end/client_lb_end2end_test.cc | 13 +- test/cpp/end2end/filter_end2end_test.cc | 7 +- test/cpp/end2end/grpclb_end2end_test.cc | 11 +- test/cpp/grpclb/grpclb_api_test.cc | 6 +- test/cpp/grpclb/grpclb_test.cc | 17 +- test/cpp/microbenchmarks/bm_call_create.cc | 139 ++- test/cpp/microbenchmarks/bm_chttp2_hpack.cc | 136 ++- .../microbenchmarks/bm_chttp2_transport.cc | 270 ++-- test/cpp/microbenchmarks/bm_closure.cc | 196 +-- test/cpp/microbenchmarks/bm_cq.cc | 26 +- .../microbenchmarks/bm_cq_multiple_threads.cc | 22 +- test/cpp/microbenchmarks/bm_error.cc | 24 +- .../microbenchmarks/bm_fullstack_trickle.cc | 8 +- test/cpp/microbenchmarks/bm_metadata.cc | 115 +- test/cpp/microbenchmarks/bm_pollset.cc | 53 +- test/cpp/microbenchmarks/fullstack_fixtures.h | 27 +- test/cpp/naming/resolver_component_test.cc | 50 +- test/cpp/performance/writes_per_rpc_test.cc | 24 +- test/cpp/server/server_builder_test.cc | 7 +- test/cpp/util/byte_buffer_test.cc | 6 +- test/cpp/util/slice_test.cc | 6 +- tools/codegen/core/gen_static_metadata.py | 2 +- tools/codegen/core/gen_stats_data.py | 24 +- 444 files changed, 12454 insertions(+), 10022 deletions(-) diff --git a/include/grpc++/support/channel_arguments.h b/include/grpc++/support/channel_arguments.h index c9879d8a28d..9dc505f0082 100644 --- a/include/grpc++/support/channel_arguments.h +++ b/include/grpc++/support/channel_arguments.h @@ -122,7 +122,7 @@ class ChannelArguments { /// Default pointer argument operations. struct PointerVtableMembers { static void* Copy(void* in) { return in; } - static void Destroy(void* in) {} + static void Destroy(grpc_exec_ctx* exec_ctx, void* in) {} static int Compare(void* a, void* b) { if (a < b) return -1; if (a > b) return 1; diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h index fcbc8ac5a1e..77844aa2afe 100644 --- a/include/grpc/impl/codegen/grpc_types.h +++ b/include/grpc/impl/codegen/grpc_types.h @@ -85,7 +85,7 @@ typedef enum { typedef struct grpc_arg_pointer_vtable { void* (*copy)(void* p); - void (*destroy)(void* p); + void (*destroy)(grpc_exec_ctx* exec_ctx, void* p); int (*cmp)(void* p, void* q); } grpc_arg_pointer_vtable; diff --git a/include/grpc/impl/codegen/slice.h b/include/grpc/impl/codegen/slice.h index ad026b685ed..11997fcb563 100644 --- a/include/grpc/impl/codegen/slice.h +++ b/include/grpc/impl/codegen/slice.h @@ -43,7 +43,7 @@ typedef struct grpc_slice grpc_slice; typedef struct grpc_slice_refcount_vtable { void (*ref)(void*); - void (*unref)(void*); + void (*unref)(grpc_exec_ctx* exec_ctx, void*); int (*eq)(grpc_slice a, grpc_slice b); uint32_t (*hash)(grpc_slice slice); } grpc_slice_refcount_vtable; diff --git a/include/grpc/slice_buffer.h b/include/grpc/slice_buffer.h index 30833d02dbf..6510c151b3c 100644 --- a/include/grpc/slice_buffer.h +++ b/include/grpc/slice_buffer.h @@ -67,7 +67,8 @@ GPRAPI void grpc_slice_buffer_move_first_no_ref(grpc_slice_buffer* src, size_t n, grpc_slice_buffer* dst); /** move the first n bytes of src into dst (copying them) */ -GPRAPI void grpc_slice_buffer_move_first_into_buffer(grpc_slice_buffer* src, +GPRAPI void grpc_slice_buffer_move_first_into_buffer(grpc_exec_ctx* exec_ctx, + grpc_slice_buffer* src, size_t n, void* dst); /** take the first slice in the slice buffer */ GPRAPI grpc_slice grpc_slice_buffer_take_first(grpc_slice_buffer* src); diff --git a/include/grpc/support/tls.h b/include/grpc/support/tls.h index 4c9e79b6cff..8519a8350bc 100644 --- a/include/grpc/support/tls.h +++ b/include/grpc/support/tls.h @@ -32,12 +32,6 @@ GPR_TLS_DECL(foo); Thread locals always have static scope. - Declaring a thread local class variable 'foo': - GPR_TLS_CLASS_DECL(foo); - - Defining the thread local class variable: - GPR_TLS_CLASS_DEF(foo); - Initializing a thread local (must be done at library initialization time): gpr_tls_init(&foo); diff --git a/include/grpc/support/tls_gcc.h b/include/grpc/support/tls_gcc.h index b44f0f1c8c2..1b91d22be12 100644 --- a/include/grpc/support/tls_gcc.h +++ b/include/grpc/support/tls_gcc.h @@ -33,11 +33,6 @@ struct gpr_gcc_thread_local { #define GPR_TLS_DECL(name) \ static __thread struct gpr_gcc_thread_local name = {0} -#define GPR_TLS_CLASS_DECL(name) \ - static __thread struct gpr_gcc_thread_local name - -#define GPR_TLS_CLASS_DEF(name) __thread struct gpr_gcc_thread_local name = {0} - #define gpr_tls_init(tls) \ do { \ } while (0) diff --git a/include/grpc/support/tls_msvc.h b/include/grpc/support/tls_msvc.h index 68a411f5d46..e5f2205fc15 100644 --- a/include/grpc/support/tls_msvc.h +++ b/include/grpc/support/tls_msvc.h @@ -26,18 +26,9 @@ struct gpr_msvc_thread_local { intptr_t value; }; -/** Use GPR_TLS_DECL to declare tls static variables outside a class */ #define GPR_TLS_DECL(name) \ static __declspec(thread) struct gpr_msvc_thread_local name = {0} -/** Use GPR_TLS_CLASS_DECL to declare tls static variable members of a class. - * GPR_TLS_CLASS_DEF needs to be called to define this member. */ -#define GPR_TLS_CLASS_DECL(name) \ - static __declspec(thread) struct gpr_msvc_thread_local name - -#define GPR_TLS_CLASS_DEF(name) \ - __declspec(thread) struct gpr_msvc_thread_local name = {0} - #define gpr_tls_init(tls) \ do { \ } while (0) diff --git a/include/grpc/support/tls_pthread.h b/include/grpc/support/tls_pthread.h index 249c8b16f85..fb0edd8e744 100644 --- a/include/grpc/support/tls_pthread.h +++ b/include/grpc/support/tls_pthread.h @@ -29,17 +29,8 @@ struct gpr_pthread_thread_local { pthread_key_t key; }; -/** Use GPR_TLS_DECL to declare tls static variables outside a class */ #define GPR_TLS_DECL(name) static struct gpr_pthread_thread_local name = {0} -/** Use GPR_TLS_CLASS_DECL to declare tls static variable members of a class. - * GPR_TLS_CLASS_DEF needs to be called to define this member. */ -#define GPR_TLS_CLASS_DECL(name) static struct gpr_pthread_thread_local name - -/** Use GPR_TLS_CLASS_DEF to declare tls static variable members of a class. - * GPR_TLS_CLASS_DEF needs to be called to define this member. */ -#define GPR_TLS_CLASS_DEF(name) struct gpr_pthread_thread_local name = {0} - #define gpr_tls_init(tls) GPR_ASSERT(0 == pthread_key_create(&(tls)->key, NULL)) #define gpr_tls_destroy(tls) pthread_key_delete((tls)->key) #define gpr_tls_get(tls) ((intptr_t)pthread_getspecific((tls)->key)) diff --git a/src/core/ext/filters/client_channel/backup_poller.cc b/src/core/ext/filters/client_channel/backup_poller.cc index 339a79b0fb9..ed437d255c9 100644 --- a/src/core/ext/filters/client_channel/backup_poller.cc +++ b/src/core/ext/filters/client_channel/backup_poller.cc @@ -69,19 +69,20 @@ static void init_globals() { gpr_free(env); } -static void backup_poller_shutdown_unref(backup_poller* p) { +static void backup_poller_shutdown_unref(grpc_exec_ctx* exec_ctx, + backup_poller* p) { if (gpr_unref(&p->shutdown_refs)) { - grpc_pollset_destroy(p->pollset); + grpc_pollset_destroy(exec_ctx, p->pollset); gpr_free(p->pollset); gpr_free(p); } } -static void done_poller(void* arg, grpc_error* error) { - backup_poller_shutdown_unref((backup_poller*)arg); +static void done_poller(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { + backup_poller_shutdown_unref(exec_ctx, (backup_poller*)arg); } -static void g_poller_unref() { +static void g_poller_unref(grpc_exec_ctx* exec_ctx) { if (gpr_unref(&g_poller->refs)) { gpr_mu_lock(&g_poller_mu); backup_poller* p = g_poller; @@ -89,40 +90,40 @@ static void g_poller_unref() { gpr_mu_unlock(&g_poller_mu); gpr_mu_lock(p->pollset_mu); p->shutting_down = true; - grpc_pollset_shutdown( - p->pollset, GRPC_CLOSURE_INIT(&p->shutdown_closure, done_poller, p, - grpc_schedule_on_exec_ctx)); + grpc_pollset_shutdown(exec_ctx, p->pollset, + GRPC_CLOSURE_INIT(&p->shutdown_closure, done_poller, + p, grpc_schedule_on_exec_ctx)); gpr_mu_unlock(p->pollset_mu); - grpc_timer_cancel(&p->polling_timer); + grpc_timer_cancel(exec_ctx, &p->polling_timer); } } -static void run_poller(void* arg, grpc_error* error) { +static void run_poller(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { backup_poller* p = (backup_poller*)arg; if (error != GRPC_ERROR_NONE) { if (error != GRPC_ERROR_CANCELLED) { GRPC_LOG_IF_ERROR("run_poller", GRPC_ERROR_REF(error)); } - backup_poller_shutdown_unref(p); + backup_poller_shutdown_unref(exec_ctx, p); return; } gpr_mu_lock(p->pollset_mu); if (p->shutting_down) { gpr_mu_unlock(p->pollset_mu); - backup_poller_shutdown_unref(p); + backup_poller_shutdown_unref(exec_ctx, p); return; } - grpc_error* err = - grpc_pollset_work(p->pollset, nullptr, grpc_core::ExecCtx::Get()->Now()); + grpc_error* err = grpc_pollset_work(exec_ctx, p->pollset, nullptr, + grpc_exec_ctx_now(exec_ctx)); gpr_mu_unlock(p->pollset_mu); GRPC_LOG_IF_ERROR("Run client channel backup poller", err); - grpc_timer_init(&p->polling_timer, - grpc_core::ExecCtx::Get()->Now() + g_poll_interval_ms, + grpc_timer_init(exec_ctx, &p->polling_timer, + grpc_exec_ctx_now(exec_ctx) + g_poll_interval_ms, &p->run_poller_closure); } void grpc_client_channel_start_backup_polling( - grpc_pollset_set* interested_parties) { + grpc_exec_ctx* exec_ctx, grpc_pollset_set* interested_parties) { gpr_once_init(&g_once, init_globals); if (g_poll_interval_ms == 0) { return; @@ -138,8 +139,8 @@ void grpc_client_channel_start_backup_polling( gpr_ref_init(&g_poller->shutdown_refs, 2); GRPC_CLOSURE_INIT(&g_poller->run_poller_closure, run_poller, g_poller, grpc_schedule_on_exec_ctx); - grpc_timer_init(&g_poller->polling_timer, - grpc_core::ExecCtx::Get()->Now() + g_poll_interval_ms, + grpc_timer_init(exec_ctx, &g_poller->polling_timer, + grpc_exec_ctx_now(exec_ctx) + g_poll_interval_ms, &g_poller->run_poller_closure); } @@ -151,14 +152,14 @@ void grpc_client_channel_start_backup_polling( grpc_pollset* pollset = g_poller->pollset; gpr_mu_unlock(&g_poller_mu); - grpc_pollset_set_add_pollset(interested_parties, pollset); + grpc_pollset_set_add_pollset(exec_ctx, interested_parties, pollset); } void grpc_client_channel_stop_backup_polling( - grpc_pollset_set* interested_parties) { + grpc_exec_ctx* exec_ctx, grpc_pollset_set* interested_parties) { if (g_poll_interval_ms == 0) { return; } - grpc_pollset_set_del_pollset(interested_parties, g_poller->pollset); - g_poller_unref(); + grpc_pollset_set_del_pollset(exec_ctx, interested_parties, g_poller->pollset); + g_poller_unref(exec_ctx); } diff --git a/src/core/ext/filters/client_channel/backup_poller.h b/src/core/ext/filters/client_channel/backup_poller.h index 551e0331dcf..e993d506392 100644 --- a/src/core/ext/filters/client_channel/backup_poller.h +++ b/src/core/ext/filters/client_channel/backup_poller.h @@ -25,10 +25,10 @@ /* Start polling \a interested_parties periodically in the timer thread */ void grpc_client_channel_start_backup_polling( - grpc_pollset_set* interested_parties); + grpc_exec_ctx* exec_ctx, grpc_pollset_set* interested_parties); /* Stop polling \a interested_parties */ void grpc_client_channel_stop_backup_polling( - grpc_pollset_set* interested_parties); + grpc_exec_ctx* exec_ctx, grpc_pollset_set* interested_parties); #endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_BACKUP_POLLER_H */ diff --git a/src/core/ext/filters/client_channel/channel_connectivity.cc b/src/core/ext/filters/client_channel/channel_connectivity.cc index 20693ba4190..7eaf5d98cd8 100644 --- a/src/core/ext/filters/client_channel/channel_connectivity.cc +++ b/src/core/ext/filters/client_channel/channel_connectivity.cc @@ -33,22 +33,22 @@ grpc_connectivity_state grpc_channel_check_connectivity_state( /* forward through to the underlying client channel */ grpc_channel_element* client_channel_elem = grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel)); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_connectivity_state state; GRPC_API_TRACE( "grpc_channel_check_connectivity_state(channel=%p, try_to_connect=%d)", 2, (channel, try_to_connect)); if (client_channel_elem->filter == &grpc_client_channel_filter) { - state = grpc_client_channel_check_connectivity_state(client_channel_elem, - try_to_connect); - + state = grpc_client_channel_check_connectivity_state( + &exec_ctx, client_channel_elem, try_to_connect); + grpc_exec_ctx_finish(&exec_ctx); return state; } gpr_log(GPR_ERROR, "grpc_channel_check_connectivity_state called on something that is " "not a client channel, but '%s'", client_channel_elem->filter->name); - + grpc_exec_ctx_finish(&exec_ctx); return GRPC_CHANNEL_SHUTDOWN; } @@ -73,11 +73,12 @@ typedef struct { void* tag; } state_watcher; -static void delete_state_watcher(state_watcher* w) { +static void delete_state_watcher(grpc_exec_ctx* exec_ctx, state_watcher* w) { grpc_channel_element* client_channel_elem = grpc_channel_stack_last_element( grpc_channel_get_channel_stack(w->channel)); if (client_channel_elem->filter == &grpc_client_channel_filter) { - GRPC_CHANNEL_INTERNAL_UNREF(w->channel, "watch_channel_connectivity"); + GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, w->channel, + "watch_channel_connectivity"); } else { abort(); } @@ -85,7 +86,8 @@ static void delete_state_watcher(state_watcher* w) { gpr_free(w); } -static void finished_completion(void* pw, grpc_cq_completion* ignored) { +static void finished_completion(grpc_exec_ctx* exec_ctx, void* pw, + grpc_cq_completion* ignored) { bool should_delete = false; state_watcher* w = (state_watcher*)pw; gpr_mu_lock(&w->mu); @@ -100,19 +102,19 @@ static void finished_completion(void* pw, grpc_cq_completion* ignored) { gpr_mu_unlock(&w->mu); if (should_delete) { - delete_state_watcher(w); + delete_state_watcher(exec_ctx, w); } } -static void partly_done(state_watcher* w, bool due_to_completion, - grpc_error* error) { +static void partly_done(grpc_exec_ctx* exec_ctx, state_watcher* w, + bool due_to_completion, grpc_error* error) { if (due_to_completion) { - grpc_timer_cancel(&w->alarm); + grpc_timer_cancel(exec_ctx, &w->alarm); } else { grpc_channel_element* client_channel_elem = grpc_channel_stack_last_element( grpc_channel_get_channel_stack(w->channel)); grpc_client_channel_watch_connectivity_state( - client_channel_elem, + exec_ctx, client_channel_elem, grpc_polling_entity_create_from_pollset(grpc_cq_pollset(w->cq)), nullptr, &w->on_complete, nullptr); } @@ -147,7 +149,7 @@ static void partly_done(state_watcher* w, bool due_to_completion, w->error = error; } w->phase = CALLING_BACK_AND_FINISHED; - grpc_cq_end_op(w->cq, w->tag, w->error, finished_completion, w, + grpc_cq_end_op(exec_ctx, w->cq, w->tag, w->error, finished_completion, w, &w->completion_storage); break; case CALLING_BACK_AND_FINISHED: @@ -159,12 +161,14 @@ static void partly_done(state_watcher* w, bool due_to_completion, GRPC_ERROR_UNREF(error); } -static void watch_complete(void* pw, grpc_error* error) { - partly_done((state_watcher*)pw, true, GRPC_ERROR_REF(error)); +static void watch_complete(grpc_exec_ctx* exec_ctx, void* pw, + grpc_error* error) { + partly_done(exec_ctx, (state_watcher*)pw, true, GRPC_ERROR_REF(error)); } -static void timeout_complete(void* pw, grpc_error* error) { - partly_done((state_watcher*)pw, false, GRPC_ERROR_REF(error)); +static void timeout_complete(grpc_exec_ctx* exec_ctx, void* pw, + grpc_error* error) { + partly_done(exec_ctx, (state_watcher*)pw, false, GRPC_ERROR_REF(error)); } int grpc_channel_num_external_connectivity_watchers(grpc_channel* channel) { @@ -179,10 +183,12 @@ typedef struct watcher_timer_init_arg { gpr_timespec deadline; } watcher_timer_init_arg; -static void watcher_timer_init(void* arg, grpc_error* error_ignored) { +static void watcher_timer_init(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error_ignored) { watcher_timer_init_arg* wa = (watcher_timer_init_arg*)arg; - grpc_timer_init(&wa->w->alarm, grpc_timespec_to_millis_round_up(wa->deadline), + grpc_timer_init(exec_ctx, &wa->w->alarm, + grpc_timespec_to_millis_round_up(wa->deadline), &wa->w->on_timeout); gpr_free(wa); } @@ -198,7 +204,7 @@ void grpc_channel_watch_connectivity_state( gpr_timespec deadline, grpc_completion_queue* cq, void* tag) { grpc_channel_element* client_channel_elem = grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel)); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; state_watcher* w = (state_watcher*)gpr_malloc(sizeof(*w)); GRPC_API_TRACE( @@ -235,10 +241,12 @@ void grpc_channel_watch_connectivity_state( if (client_channel_elem->filter == &grpc_client_channel_filter) { GRPC_CHANNEL_INTERNAL_REF(channel, "watch_channel_connectivity"); grpc_client_channel_watch_connectivity_state( - client_channel_elem, + &exec_ctx, client_channel_elem, grpc_polling_entity_create_from_pollset(grpc_cq_pollset(cq)), &w->state, &w->on_complete, &w->watcher_timer_init); } else { abort(); } + + grpc_exec_ctx_finish(&exec_ctx); } diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index ba82c88eb72..aced9adf9f1 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.cc @@ -91,7 +91,8 @@ static void method_parameters_unref(method_parameters* method_params) { static void* method_parameters_ref_wrapper(void* value) { return method_parameters_ref((method_parameters*)value); } -static void method_parameters_unref_wrapper(void* value) { +static void method_parameters_unref_wrapper(grpc_exec_ctx* exec_ctx, + void* value) { method_parameters_unref((method_parameters*)value); } @@ -227,11 +228,12 @@ typedef struct { grpc_lb_policy* lb_policy; } lb_policy_connectivity_watcher; -static void watch_lb_policy_locked(channel_data* chand, +static void watch_lb_policy_locked(grpc_exec_ctx* exec_ctx, channel_data* chand, grpc_lb_policy* lb_policy, grpc_connectivity_state current_state); -static void set_channel_connectivity_state_locked(channel_data* chand, +static void set_channel_connectivity_state_locked(grpc_exec_ctx* exec_ctx, + channel_data* chand, grpc_connectivity_state state, grpc_error* error, const char* reason) { @@ -243,12 +245,12 @@ static void set_channel_connectivity_state_locked(channel_data* chand, if (state == GRPC_CHANNEL_TRANSIENT_FAILURE) { /* cancel picks with wait_for_ready=false */ grpc_lb_policy_cancel_picks_locked( - chand->lb_policy, + exec_ctx, chand->lb_policy, /* mask= */ GRPC_INITIAL_METADATA_WAIT_FOR_READY, /* check= */ 0, GRPC_ERROR_REF(error)); } else if (state == GRPC_CHANNEL_SHUTDOWN) { /* cancel all picks */ - grpc_lb_policy_cancel_picks_locked(chand->lb_policy, + grpc_lb_policy_cancel_picks_locked(exec_ctx, chand->lb_policy, /* mask= */ 0, /* check= */ 0, GRPC_ERROR_REF(error)); } @@ -257,10 +259,12 @@ static void set_channel_connectivity_state_locked(channel_data* chand, gpr_log(GPR_DEBUG, "chand=%p: setting connectivity state to %s", chand, grpc_connectivity_state_name(state)); } - grpc_connectivity_state_set(&chand->state_tracker, state, error, reason); + grpc_connectivity_state_set(exec_ctx, &chand->state_tracker, state, error, + reason); } -static void on_lb_policy_state_changed_locked(void* arg, grpc_error* error) { +static void on_lb_policy_state_changed_locked(grpc_exec_ctx* exec_ctx, + void* arg, grpc_error* error) { lb_policy_connectivity_watcher* w = (lb_policy_connectivity_watcher*)arg; /* check if the notification is for the latest policy */ if (w->lb_policy == w->chand->lb_policy) { @@ -268,17 +272,17 @@ static void on_lb_policy_state_changed_locked(void* arg, grpc_error* error) { gpr_log(GPR_DEBUG, "chand=%p: lb_policy=%p state changed to %s", w->chand, w->lb_policy, grpc_connectivity_state_name(w->state)); } - set_channel_connectivity_state_locked(w->chand, w->state, + set_channel_connectivity_state_locked(exec_ctx, w->chand, w->state, GRPC_ERROR_REF(error), "lb_changed"); if (w->state != GRPC_CHANNEL_SHUTDOWN) { - watch_lb_policy_locked(w->chand, w->lb_policy, w->state); + watch_lb_policy_locked(exec_ctx, w->chand, w->lb_policy, w->state); } } - GRPC_CHANNEL_STACK_UNREF(w->chand->owning_stack, "watch_lb_policy"); + GRPC_CHANNEL_STACK_UNREF(exec_ctx, w->chand->owning_stack, "watch_lb_policy"); gpr_free(w); } -static void watch_lb_policy_locked(channel_data* chand, +static void watch_lb_policy_locked(grpc_exec_ctx* exec_ctx, channel_data* chand, grpc_lb_policy* lb_policy, grpc_connectivity_state current_state) { lb_policy_connectivity_watcher* w = @@ -289,18 +293,19 @@ static void watch_lb_policy_locked(channel_data* chand, grpc_combiner_scheduler(chand->combiner)); w->state = current_state; w->lb_policy = lb_policy; - grpc_lb_policy_notify_on_state_change_locked(lb_policy, &w->state, + grpc_lb_policy_notify_on_state_change_locked(exec_ctx, lb_policy, &w->state, &w->on_changed); } -static void start_resolving_locked(channel_data* chand) { +static void start_resolving_locked(grpc_exec_ctx* exec_ctx, + channel_data* chand) { if (grpc_client_channel_trace.enabled()) { gpr_log(GPR_DEBUG, "chand=%p: starting name resolution", chand); } GPR_ASSERT(!chand->started_resolving); chand->started_resolving = true; GRPC_CHANNEL_STACK_REF(chand->owning_stack, "resolver"); - grpc_resolver_next_locked(chand->resolver, &chand->resolver_result, + grpc_resolver_next_locked(exec_ctx, chand->resolver, &chand->resolver_result, &chand->on_resolver_result_changed); } @@ -364,26 +369,29 @@ static void parse_retry_throttle_params(const grpc_json* field, void* arg) { } } -static void request_reresolution_locked(void* arg, grpc_error* error) { +static void request_reresolution_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { reresolution_request_args* args = (reresolution_request_args*)arg; channel_data* chand = args->chand; // If this invocation is for a stale LB policy, treat it as an LB shutdown // signal. if (args->lb_policy != chand->lb_policy || error != GRPC_ERROR_NONE || chand->resolver == nullptr) { - GRPC_CHANNEL_STACK_UNREF(chand->owning_stack, "re-resolution"); + GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->owning_stack, "re-resolution"); gpr_free(args); return; } if (grpc_client_channel_trace.enabled()) { gpr_log(GPR_DEBUG, "chand=%p: started name re-resolving", chand); } - grpc_resolver_channel_saw_error_locked(chand->resolver); + grpc_resolver_channel_saw_error_locked(exec_ctx, chand->resolver); // Give back the closure to the LB policy. - grpc_lb_policy_set_reresolve_closure_locked(chand->lb_policy, &args->closure); + grpc_lb_policy_set_reresolve_closure_locked(exec_ctx, chand->lb_policy, + &args->closure); } -static void on_resolver_result_changed_locked(void* arg, grpc_error* error) { +static void on_resolver_result_changed_locked(grpc_exec_ctx* exec_ctx, + void* arg, grpc_error* error) { channel_data* chand = (channel_data*)arg; if (grpc_client_channel_trace.enabled()) { gpr_log(GPR_DEBUG, "chand=%p: got resolver result: error=%s", chand, @@ -450,10 +458,12 @@ static void on_resolver_result_changed_locked(void* arg, grpc_error* error) { if (chand->lb_policy != nullptr && !lb_policy_name_changed) { // Continue using the same LB policy. Update with new addresses. lb_policy_updated = true; - grpc_lb_policy_update_locked(chand->lb_policy, &lb_policy_args); + grpc_lb_policy_update_locked(exec_ctx, chand->lb_policy, + &lb_policy_args); } else { // Instantiate new LB policy. - new_lb_policy = grpc_lb_policy_create(lb_policy_name, &lb_policy_args); + new_lb_policy = + grpc_lb_policy_create(exec_ctx, lb_policy_name, &lb_policy_args); if (new_lb_policy == nullptr) { gpr_log(GPR_ERROR, "could not create LB policy \"%s\"", lb_policy_name); @@ -465,7 +475,7 @@ static void on_resolver_result_changed_locked(void* arg, grpc_error* error) { GRPC_CLOSURE_INIT(&args->closure, request_reresolution_locked, args, grpc_combiner_scheduler(chand->combiner)); GRPC_CHANNEL_STACK_REF(chand->owning_stack, "re-resolution"); - grpc_lb_policy_set_reresolve_closure_locked(new_lb_policy, + grpc_lb_policy_set_reresolve_closure_locked(exec_ctx, new_lb_policy, &args->closure); } } @@ -482,7 +492,8 @@ static void on_resolver_result_changed_locked(void* arg, grpc_error* error) { GRPC_ARG_SERVER_URI); GPR_ASSERT(channel_arg != nullptr); GPR_ASSERT(channel_arg->type == GRPC_ARG_STRING); - grpc_uri* uri = grpc_uri_parse(channel_arg->value.string, true); + grpc_uri* uri = + grpc_uri_parse(exec_ctx, channel_arg->value.string, true); GPR_ASSERT(uri->path[0] != '\0'); service_config_parsing_state parsing_state; memset(&parsing_state, 0, sizeof(parsing_state)); @@ -493,7 +504,7 @@ static void on_resolver_result_changed_locked(void* arg, grpc_error* error) { grpc_uri_destroy(uri); retry_throttle_data = parsing_state.retry_throttle_data; method_params_table = grpc_service_config_create_method_config_table( - service_config, method_parameters_create_from_json, + exec_ctx, service_config, method_parameters_create_from_json, method_parameters_ref_wrapper, method_parameters_unref_wrapper); grpc_service_config_destroy(service_config); } @@ -503,7 +514,7 @@ static void on_resolver_result_changed_locked(void* arg, grpc_error* error) { // The copy will be saved in chand->lb_policy_name below. lb_policy_name_dup = gpr_strdup(lb_policy_name); } - grpc_channel_args_destroy(chand->resolver_result); + grpc_channel_args_destroy(exec_ctx, chand->resolver_result); chand->resolver_result = nullptr; } if (grpc_client_channel_trace.enabled()) { @@ -535,7 +546,7 @@ static void on_resolver_result_changed_locked(void* arg, grpc_error* error) { chand->retry_throttle_data = retry_throttle_data; // Swap out the method params table. if (chand->method_params_table != nullptr) { - grpc_slice_hash_table_unref(chand->method_params_table); + grpc_slice_hash_table_unref(exec_ctx, chand->method_params_table); } chand->method_params_table = method_params_table; // If we have a new LB policy or are shutting down (in which case @@ -551,9 +562,10 @@ static void on_resolver_result_changed_locked(void* arg, grpc_error* error) { gpr_log(GPR_DEBUG, "chand=%p: unreffing lb_policy=%p", chand, chand->lb_policy); } - grpc_pollset_set_del_pollset_set(chand->lb_policy->interested_parties, + grpc_pollset_set_del_pollset_set(exec_ctx, + chand->lb_policy->interested_parties, chand->interested_parties); - GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel"); + GRPC_LB_POLICY_UNREF(exec_ctx, chand->lb_policy, "channel"); } chand->lb_policy = new_lb_policy; } @@ -567,20 +579,21 @@ static void on_resolver_result_changed_locked(void* arg, grpc_error* error) { if (grpc_client_channel_trace.enabled()) { gpr_log(GPR_DEBUG, "chand=%p: shutting down resolver", chand); } - grpc_resolver_shutdown_locked(chand->resolver); - GRPC_RESOLVER_UNREF(chand->resolver, "channel"); + grpc_resolver_shutdown_locked(exec_ctx, chand->resolver); + GRPC_RESOLVER_UNREF(exec_ctx, chand->resolver, "channel"); chand->resolver = nullptr; } set_channel_connectivity_state_locked( - chand, GRPC_CHANNEL_SHUTDOWN, + exec_ctx, chand, GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Got resolver result after disconnection", &error, 1), "resolver_gone"); - GRPC_CHANNEL_STACK_UNREF(chand->owning_stack, "resolver"); + GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->owning_stack, "resolver"); grpc_closure_list_fail_all(&chand->waiting_for_resolver_result_closures, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Channel disconnected", &error, 1)); - GRPC_CLOSURE_LIST_SCHED(&chand->waiting_for_resolver_result_closures); + GRPC_CLOSURE_LIST_SCHED(exec_ctx, + &chand->waiting_for_resolver_result_closures); } else { // Not shutting down. grpc_connectivity_state state = GRPC_CHANNEL_TRANSIENT_FAILURE; grpc_error* state_error = @@ -590,28 +603,33 @@ static void on_resolver_result_changed_locked(void* arg, grpc_error* error) { gpr_log(GPR_DEBUG, "chand=%p: initializing new LB policy", chand); } GRPC_ERROR_UNREF(state_error); - state = - grpc_lb_policy_check_connectivity_locked(new_lb_policy, &state_error); - grpc_pollset_set_add_pollset_set(new_lb_policy->interested_parties, + state = grpc_lb_policy_check_connectivity_locked(exec_ctx, new_lb_policy, + &state_error); + grpc_pollset_set_add_pollset_set(exec_ctx, + new_lb_policy->interested_parties, chand->interested_parties); - GRPC_CLOSURE_LIST_SCHED(&chand->waiting_for_resolver_result_closures); + GRPC_CLOSURE_LIST_SCHED(exec_ctx, + &chand->waiting_for_resolver_result_closures); if (chand->exit_idle_when_lb_policy_arrives) { - grpc_lb_policy_exit_idle_locked(new_lb_policy); + grpc_lb_policy_exit_idle_locked(exec_ctx, new_lb_policy); chand->exit_idle_when_lb_policy_arrives = false; } - watch_lb_policy_locked(chand, new_lb_policy, state); + watch_lb_policy_locked(exec_ctx, chand, new_lb_policy, state); } if (!lb_policy_updated) { - set_channel_connectivity_state_locked( - chand, state, GRPC_ERROR_REF(state_error), "new_lb+resolver"); + set_channel_connectivity_state_locked(exec_ctx, chand, state, + GRPC_ERROR_REF(state_error), + "new_lb+resolver"); } - grpc_resolver_next_locked(chand->resolver, &chand->resolver_result, + grpc_resolver_next_locked(exec_ctx, chand->resolver, + &chand->resolver_result, &chand->on_resolver_result_changed); GRPC_ERROR_UNREF(state_error); } } -static void start_transport_op_locked(void* arg, grpc_error* error_ignored) { +static void start_transport_op_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error_ignored) { grpc_transport_op* op = (grpc_transport_op*)arg; grpc_channel_element* elem = (grpc_channel_element*)op->handler_private.extra_arg; @@ -619,7 +637,7 @@ static void start_transport_op_locked(void* arg, grpc_error* error_ignored) { if (op->on_connectivity_state_change != nullptr) { grpc_connectivity_state_notify_on_state_change( - &chand->state_tracker, op->connectivity_state, + exec_ctx, &chand->state_tracker, op->connectivity_state, op->on_connectivity_state_change); op->on_connectivity_state_change = nullptr; op->connectivity_state = nullptr; @@ -627,10 +645,11 @@ static void start_transport_op_locked(void* arg, grpc_error* error_ignored) { if (op->send_ping != nullptr) { if (chand->lb_policy == nullptr) { - GRPC_CLOSURE_SCHED(op->send_ping, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Ping with no load balancing")); + GRPC_CLOSURE_SCHED( + exec_ctx, op->send_ping, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Ping with no load balancing")); } else { - grpc_lb_policy_ping_one_locked(chand->lb_policy, op->send_ping); + grpc_lb_policy_ping_one_locked(exec_ctx, chand->lb_policy, op->send_ping); op->bind_pollset = nullptr; } op->send_ping = nullptr; @@ -639,48 +658,54 @@ static void start_transport_op_locked(void* arg, grpc_error* error_ignored) { if (op->disconnect_with_error != GRPC_ERROR_NONE) { if (chand->resolver != nullptr) { set_channel_connectivity_state_locked( - chand, GRPC_CHANNEL_SHUTDOWN, + exec_ctx, chand, GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_REF(op->disconnect_with_error), "disconnect"); - grpc_resolver_shutdown_locked(chand->resolver); - GRPC_RESOLVER_UNREF(chand->resolver, "channel"); + grpc_resolver_shutdown_locked(exec_ctx, chand->resolver); + GRPC_RESOLVER_UNREF(exec_ctx, chand->resolver, "channel"); chand->resolver = nullptr; if (!chand->started_resolving) { grpc_closure_list_fail_all(&chand->waiting_for_resolver_result_closures, GRPC_ERROR_REF(op->disconnect_with_error)); - GRPC_CLOSURE_LIST_SCHED(&chand->waiting_for_resolver_result_closures); + GRPC_CLOSURE_LIST_SCHED(exec_ctx, + &chand->waiting_for_resolver_result_closures); } if (chand->lb_policy != nullptr) { - grpc_pollset_set_del_pollset_set(chand->lb_policy->interested_parties, + grpc_pollset_set_del_pollset_set(exec_ctx, + chand->lb_policy->interested_parties, chand->interested_parties); - GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel"); + GRPC_LB_POLICY_UNREF(exec_ctx, chand->lb_policy, "channel"); chand->lb_policy = nullptr; } } GRPC_ERROR_UNREF(op->disconnect_with_error); } - GRPC_CHANNEL_STACK_UNREF(chand->owning_stack, "start_transport_op"); + GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->owning_stack, "start_transport_op"); - GRPC_CLOSURE_SCHED(op->on_consumed, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, op->on_consumed, GRPC_ERROR_NONE); } -static void cc_start_transport_op(grpc_channel_element* elem, +static void cc_start_transport_op(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_transport_op* op) { channel_data* chand = (channel_data*)elem->channel_data; GPR_ASSERT(op->set_accept_stream == false); if (op->bind_pollset != nullptr) { - grpc_pollset_set_add_pollset(chand->interested_parties, op->bind_pollset); + grpc_pollset_set_add_pollset(exec_ctx, chand->interested_parties, + op->bind_pollset); } op->handler_private.extra_arg = elem; GRPC_CHANNEL_STACK_REF(chand->owning_stack, "start_transport_op"); GRPC_CLOSURE_SCHED( + exec_ctx, GRPC_CLOSURE_INIT(&op->handler_private.closure, start_transport_op_locked, op, grpc_combiner_scheduler(chand->combiner)), GRPC_ERROR_NONE); } -static void cc_get_channel_info(grpc_channel_element* elem, +static void cc_get_channel_info(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, const grpc_channel_info* info) { channel_data* chand = (channel_data*)elem->channel_data; gpr_mu_lock(&chand->info_mu); @@ -699,7 +724,8 @@ static void cc_get_channel_info(grpc_channel_element* elem, } /* Constructor for channel_data */ -static grpc_error* cc_init_channel_elem(grpc_channel_element* elem, +static grpc_error* cc_init_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { channel_data* chand = (channel_data*)elem->channel_data; GPR_ASSERT(args->is_last); @@ -720,7 +746,7 @@ static grpc_error* cc_init_channel_elem(grpc_channel_element* elem, chand->interested_parties = grpc_pollset_set_create(); grpc_connectivity_state_init(&chand->state_tracker, GRPC_CHANNEL_IDLE, "client_channel"); - grpc_client_channel_start_backup_polling(chand->interested_parties); + grpc_client_channel_start_backup_polling(exec_ctx, chand->interested_parties); // Record client channel factory. const grpc_arg* arg = grpc_channel_args_find(args->channel_args, GRPC_ARG_CLIENT_CHANNEL_FACTORY); @@ -748,15 +774,15 @@ static grpc_error* cc_init_channel_elem(grpc_channel_element* elem, } char* proxy_name = nullptr; grpc_channel_args* new_args = nullptr; - grpc_proxy_mappers_map_name(arg->value.string, args->channel_args, + grpc_proxy_mappers_map_name(exec_ctx, arg->value.string, args->channel_args, &proxy_name, &new_args); // Instantiate resolver. chand->resolver = grpc_resolver_create( - proxy_name != nullptr ? proxy_name : arg->value.string, + exec_ctx, proxy_name != nullptr ? proxy_name : arg->value.string, new_args != nullptr ? new_args : args->channel_args, chand->interested_parties, chand->combiner); if (proxy_name != nullptr) gpr_free(proxy_name); - if (new_args != nullptr) grpc_channel_args_destroy(new_args); + if (new_args != nullptr) grpc_channel_args_destroy(exec_ctx, new_args); if (chand->resolver == nullptr) { return GRPC_ERROR_CREATE_FROM_STATIC_STRING("resolver creation failed"); } @@ -765,28 +791,32 @@ static grpc_error* cc_init_channel_elem(grpc_channel_element* elem, return GRPC_ERROR_NONE; } -static void shutdown_resolver_locked(void* arg, grpc_error* error) { +static void shutdown_resolver_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_resolver* resolver = (grpc_resolver*)arg; - grpc_resolver_shutdown_locked(resolver); - GRPC_RESOLVER_UNREF(resolver, "channel"); + grpc_resolver_shutdown_locked(exec_ctx, resolver); + GRPC_RESOLVER_UNREF(exec_ctx, resolver, "channel"); } /* Destructor for channel_data */ -static void cc_destroy_channel_elem(grpc_channel_element* elem) { +static void cc_destroy_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) { channel_data* chand = (channel_data*)elem->channel_data; if (chand->resolver != nullptr) { GRPC_CLOSURE_SCHED( + exec_ctx, GRPC_CLOSURE_CREATE(shutdown_resolver_locked, chand->resolver, grpc_combiner_scheduler(chand->combiner)), GRPC_ERROR_NONE); } if (chand->client_channel_factory != nullptr) { - grpc_client_channel_factory_unref(chand->client_channel_factory); + grpc_client_channel_factory_unref(exec_ctx, chand->client_channel_factory); } if (chand->lb_policy != nullptr) { - grpc_pollset_set_del_pollset_set(chand->lb_policy->interested_parties, + grpc_pollset_set_del_pollset_set(exec_ctx, + chand->lb_policy->interested_parties, chand->interested_parties); - GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel"); + GRPC_LB_POLICY_UNREF(exec_ctx, chand->lb_policy, "channel"); } gpr_free(chand->info_lb_policy_name); gpr_free(chand->info_service_config_json); @@ -794,12 +824,12 @@ static void cc_destroy_channel_elem(grpc_channel_element* elem) { grpc_server_retry_throttle_data_unref(chand->retry_throttle_data); } if (chand->method_params_table != nullptr) { - grpc_slice_hash_table_unref(chand->method_params_table); + grpc_slice_hash_table_unref(exec_ctx, chand->method_params_table); } - grpc_client_channel_stop_backup_polling(chand->interested_parties); - grpc_connectivity_state_destroy(&chand->state_tracker); - grpc_pollset_set_destroy(chand->interested_parties); - GRPC_COMBINER_UNREF(chand->combiner, "client_channel"); + grpc_client_channel_stop_backup_polling(exec_ctx, chand->interested_parties); + grpc_connectivity_state_destroy(exec_ctx, &chand->state_tracker); + grpc_pollset_set_destroy(exec_ctx, chand->interested_parties); + GRPC_COMBINER_UNREF(exec_ctx, chand->combiner, "client_channel"); gpr_mu_destroy(&chand->info_mu); gpr_mu_destroy(&chand->external_connectivity_watcher_list_mu); } @@ -886,18 +916,21 @@ static void waiting_for_pick_batches_add( } // This is called via the call combiner, so access to calld is synchronized. -static void fail_pending_batch_in_call_combiner(void* arg, grpc_error* error) { +static void fail_pending_batch_in_call_combiner(grpc_exec_ctx* exec_ctx, + void* arg, grpc_error* error) { call_data* calld = (call_data*)arg; if (calld->waiting_for_pick_batches_count > 0) { --calld->waiting_for_pick_batches_count; grpc_transport_stream_op_batch_finish_with_failure( + exec_ctx, calld->waiting_for_pick_batches[calld->waiting_for_pick_batches_count], GRPC_ERROR_REF(error), calld->call_combiner); } } // This is called via the call combiner, so access to calld is synchronized. -static void waiting_for_pick_batches_fail(grpc_call_element* elem, +static void waiting_for_pick_batches_fail(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_error* error) { call_data* calld = (call_data*)elem->call_data; if (grpc_client_channel_trace.enabled()) { @@ -910,34 +943,37 @@ static void waiting_for_pick_batches_fail(grpc_call_element* elem, GRPC_CLOSURE_INIT(&calld->handle_pending_batch_in_call_combiner[i], fail_pending_batch_in_call_combiner, calld, grpc_schedule_on_exec_ctx); - GRPC_CALL_COMBINER_START( - calld->call_combiner, &calld->handle_pending_batch_in_call_combiner[i], - GRPC_ERROR_REF(error), "waiting_for_pick_batches_fail"); + GRPC_CALL_COMBINER_START(exec_ctx, calld->call_combiner, + &calld->handle_pending_batch_in_call_combiner[i], + GRPC_ERROR_REF(error), + "waiting_for_pick_batches_fail"); } if (calld->initial_metadata_batch != nullptr) { grpc_transport_stream_op_batch_finish_with_failure( - calld->initial_metadata_batch, GRPC_ERROR_REF(error), + exec_ctx, calld->initial_metadata_batch, GRPC_ERROR_REF(error), calld->call_combiner); } else { - GRPC_CALL_COMBINER_STOP(calld->call_combiner, + GRPC_CALL_COMBINER_STOP(exec_ctx, calld->call_combiner, "waiting_for_pick_batches_fail"); } GRPC_ERROR_UNREF(error); } // This is called via the call combiner, so access to calld is synchronized. -static void run_pending_batch_in_call_combiner(void* arg, grpc_error* ignored) { +static void run_pending_batch_in_call_combiner(grpc_exec_ctx* exec_ctx, + void* arg, grpc_error* ignored) { call_data* calld = (call_data*)arg; if (calld->waiting_for_pick_batches_count > 0) { --calld->waiting_for_pick_batches_count; grpc_subchannel_call_process_op( - calld->subchannel_call, + exec_ctx, calld->subchannel_call, calld->waiting_for_pick_batches[calld->waiting_for_pick_batches_count]); } } // This is called via the call combiner, so access to calld is synchronized. -static void waiting_for_pick_batches_resume(grpc_call_element* elem) { +static void waiting_for_pick_batches_resume(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem) { channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; if (grpc_client_channel_trace.enabled()) { @@ -951,18 +987,20 @@ static void waiting_for_pick_batches_resume(grpc_call_element* elem) { GRPC_CLOSURE_INIT(&calld->handle_pending_batch_in_call_combiner[i], run_pending_batch_in_call_combiner, calld, grpc_schedule_on_exec_ctx); - GRPC_CALL_COMBINER_START( - calld->call_combiner, &calld->handle_pending_batch_in_call_combiner[i], - GRPC_ERROR_NONE, "waiting_for_pick_batches_resume"); + GRPC_CALL_COMBINER_START(exec_ctx, calld->call_combiner, + &calld->handle_pending_batch_in_call_combiner[i], + GRPC_ERROR_NONE, + "waiting_for_pick_batches_resume"); } GPR_ASSERT(calld->initial_metadata_batch != nullptr); - grpc_subchannel_call_process_op(calld->subchannel_call, + grpc_subchannel_call_process_op(exec_ctx, calld->subchannel_call, calld->initial_metadata_batch); } // Applies service config to the call. Must be invoked once we know // that the resolver has returned results to the channel. -static void apply_service_config_to_call_locked(grpc_call_element* elem) { +static void apply_service_config_to_call_locked(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem) { channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; if (grpc_client_channel_trace.enabled()) { @@ -975,7 +1013,7 @@ static void apply_service_config_to_call_locked(grpc_call_element* elem) { } if (chand->method_params_table != nullptr) { calld->method_params = (method_parameters*)grpc_method_config_table_get( - chand->method_params_table, calld->path); + exec_ctx, chand->method_params_table, calld->path); if (calld->method_params != nullptr) { method_parameters_ref(calld->method_params); // If the deadline from the service config is shorter than the one @@ -987,14 +1025,15 @@ static void apply_service_config_to_call_locked(grpc_call_element* elem) { calld->method_params->timeout; if (per_method_deadline < calld->deadline) { calld->deadline = per_method_deadline; - grpc_deadline_state_reset(elem, calld->deadline); + grpc_deadline_state_reset(exec_ctx, elem, calld->deadline); } } } } } -static void create_subchannel_call_locked(grpc_call_element* elem, +static void create_subchannel_call_locked(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_error* error) { channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; @@ -1008,22 +1047,24 @@ static void create_subchannel_call_locked(grpc_call_element* elem, calld->call_combiner // call_combiner }; grpc_error* new_error = grpc_connected_subchannel_create_call( - calld->connected_subchannel, &call_args, &calld->subchannel_call); + exec_ctx, calld->connected_subchannel, &call_args, + &calld->subchannel_call); if (grpc_client_channel_trace.enabled()) { gpr_log(GPR_DEBUG, "chand=%p calld=%p: create subchannel_call=%p: error=%s", chand, calld, calld->subchannel_call, grpc_error_string(new_error)); } if (new_error != GRPC_ERROR_NONE) { new_error = grpc_error_add_child(new_error, error); - waiting_for_pick_batches_fail(elem, new_error); + waiting_for_pick_batches_fail(exec_ctx, elem, new_error); } else { - waiting_for_pick_batches_resume(elem); + waiting_for_pick_batches_resume(exec_ctx, elem); } GRPC_ERROR_UNREF(error); } // Invoked when a pick is completed, on both success or failure. -static void pick_done_locked(grpc_call_element* elem, grpc_error* error) { +static void pick_done_locked(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_error* error) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; if (calld->connected_subchannel == nullptr) { @@ -1039,10 +1080,10 @@ static void pick_done_locked(grpc_call_element* elem, grpc_error* error) { "chand=%p calld=%p: failed to create subchannel: error=%s", chand, calld, grpc_error_string(calld->error)); } - waiting_for_pick_batches_fail(elem, GRPC_ERROR_REF(calld->error)); + waiting_for_pick_batches_fail(exec_ctx, elem, GRPC_ERROR_REF(calld->error)); } else { /* Create call on subchannel. */ - create_subchannel_call_locked(elem, GRPC_ERROR_REF(error)); + create_subchannel_call_locked(exec_ctx, elem, GRPC_ERROR_REF(error)); } GRPC_ERROR_UNREF(error); } @@ -1051,17 +1092,19 @@ static void pick_done_locked(grpc_call_element* elem, grpc_error* error) { // either (a) the pick was deferred pending a resolver result or (b) the // pick was done asynchronously. Removes the call's polling entity from // chand->interested_parties before invoking pick_done_locked(). -static void async_pick_done_locked(grpc_call_element* elem, grpc_error* error) { +static void async_pick_done_locked(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_error* error) { channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; - grpc_polling_entity_del_from_pollset_set(calld->pollent, + grpc_polling_entity_del_from_pollset_set(exec_ctx, calld->pollent, chand->interested_parties); - pick_done_locked(elem, error); + pick_done_locked(exec_ctx, elem, error); } // Note: This runs under the client_channel combiner, but will NOT be // holding the call combiner. -static void pick_callback_cancel_locked(void* arg, grpc_error* error) { +static void pick_callback_cancel_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; @@ -1070,15 +1113,17 @@ static void pick_callback_cancel_locked(void* arg, grpc_error* error) { gpr_log(GPR_DEBUG, "chand=%p calld=%p: cancelling pick from LB policy %p", chand, calld, calld->lb_policy); } - grpc_lb_policy_cancel_pick_locked( - calld->lb_policy, &calld->connected_subchannel, GRPC_ERROR_REF(error)); + grpc_lb_policy_cancel_pick_locked(exec_ctx, calld->lb_policy, + &calld->connected_subchannel, + GRPC_ERROR_REF(error)); } - GRPC_CALL_STACK_UNREF(calld->owning_call, "pick_callback_cancel"); + GRPC_CALL_STACK_UNREF(exec_ctx, calld->owning_call, "pick_callback_cancel"); } // Callback invoked by grpc_lb_policy_pick_locked() for async picks. // Unrefs the LB policy and invokes async_pick_done_locked(). -static void pick_callback_done_locked(void* arg, grpc_error* error) { +static void pick_callback_done_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; @@ -1087,22 +1132,23 @@ static void pick_callback_done_locked(void* arg, grpc_error* error) { chand, calld); } GPR_ASSERT(calld->lb_policy != nullptr); - GRPC_LB_POLICY_UNREF(calld->lb_policy, "pick_subchannel"); + GRPC_LB_POLICY_UNREF(exec_ctx, calld->lb_policy, "pick_subchannel"); calld->lb_policy = nullptr; - async_pick_done_locked(elem, GRPC_ERROR_REF(error)); + async_pick_done_locked(exec_ctx, elem, GRPC_ERROR_REF(error)); } // Takes a ref to chand->lb_policy and calls grpc_lb_policy_pick_locked(). // If the pick was completed synchronously, unrefs the LB policy and // returns true. -static bool pick_callback_start_locked(grpc_call_element* elem) { +static bool pick_callback_start_locked(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem) { channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; if (grpc_client_channel_trace.enabled()) { gpr_log(GPR_DEBUG, "chand=%p calld=%p: starting pick on lb_policy=%p", chand, calld, chand->lb_policy); } - apply_service_config_to_call_locked(elem); + apply_service_config_to_call_locked(exec_ctx, elem); // If the application explicitly set wait_for_ready, use that. // Otherwise, if the service config specified a value for this // method, use that. @@ -1132,7 +1178,7 @@ static bool pick_callback_start_locked(grpc_call_element* elem) { GRPC_CLOSURE_INIT(&calld->lb_pick_closure, pick_callback_done_locked, elem, grpc_combiner_scheduler(chand->combiner)); const bool pick_done = grpc_lb_policy_pick_locked( - chand->lb_policy, &inputs, &calld->connected_subchannel, + exec_ctx, chand->lb_policy, &inputs, &calld->connected_subchannel, calld->subchannel_call_context, nullptr, &calld->lb_pick_closure); if (pick_done) { /* synchronous grpc_lb_policy_pick call. Unref the LB policy. */ @@ -1140,12 +1186,12 @@ static bool pick_callback_start_locked(grpc_call_element* elem) { gpr_log(GPR_DEBUG, "chand=%p calld=%p: pick completed synchronously", chand, calld); } - GRPC_LB_POLICY_UNREF(calld->lb_policy, "pick_subchannel"); + GRPC_LB_POLICY_UNREF(exec_ctx, calld->lb_policy, "pick_subchannel"); calld->lb_policy = nullptr; } else { GRPC_CALL_STACK_REF(calld->owning_call, "pick_callback_cancel"); grpc_call_combiner_set_notify_on_cancel( - calld->call_combiner, + exec_ctx, calld->call_combiner, GRPC_CLOSURE_INIT(&calld->lb_pick_cancel_closure, pick_callback_cancel_locked, elem, grpc_combiner_scheduler(chand->combiner))); @@ -1162,7 +1208,8 @@ typedef struct { // Note: This runs under the client_channel combiner, but will NOT be // holding the call combiner. -static void pick_after_resolver_result_cancel_locked(void* arg, +static void pick_after_resolver_result_cancel_locked(grpc_exec_ctx* exec_ctx, + void* arg, grpc_error* error) { pick_after_resolver_result_args* args = (pick_after_resolver_result_args*)arg; if (args->finished) { @@ -1190,13 +1237,16 @@ static void pick_after_resolver_result_cancel_locked(void* arg, // it's safe to call async_pick_done_locked() here -- we are // essentially calling it here instead of calling it in // pick_after_resolver_result_done_locked(). - async_pick_done_locked(elem, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Pick cancelled", &error, 1)); + async_pick_done_locked(exec_ctx, elem, + GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Pick cancelled", &error, 1)); } -static void pick_after_resolver_result_start_locked(grpc_call_element* elem); +static void pick_after_resolver_result_start_locked(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem); -static void pick_after_resolver_result_done_locked(void* arg, +static void pick_after_resolver_result_done_locked(grpc_exec_ctx* exec_ctx, + void* arg, grpc_error* error) { pick_after_resolver_result_args* args = (pick_after_resolver_result_args*)arg; if (args->finished) { @@ -1216,19 +1266,19 @@ static void pick_after_resolver_result_done_locked(void* arg, gpr_log(GPR_DEBUG, "chand=%p calld=%p: resolver failed to return data", chand, calld); } - async_pick_done_locked(elem, GRPC_ERROR_REF(error)); + async_pick_done_locked(exec_ctx, elem, GRPC_ERROR_REF(error)); } else if (chand->lb_policy != nullptr) { if (grpc_client_channel_trace.enabled()) { gpr_log(GPR_DEBUG, "chand=%p calld=%p: resolver returned, doing pick", chand, calld); } - if (pick_callback_start_locked(elem)) { + if (pick_callback_start_locked(exec_ctx, elem)) { // Even if the LB policy returns a result synchronously, we have // already added our polling entity to chand->interested_parties // in order to wait for the resolver result, so we need to // remove it here. Therefore, we call async_pick_done_locked() // instead of pick_done_locked(). - async_pick_done_locked(elem, GRPC_ERROR_NONE); + async_pick_done_locked(exec_ctx, elem, GRPC_ERROR_NONE); } } // TODO(roth): It should be impossible for chand->lb_policy to be NULL @@ -1246,18 +1296,19 @@ static void pick_after_resolver_result_done_locked(void* arg, "trying again", chand, calld); } - pick_after_resolver_result_start_locked(elem); + pick_after_resolver_result_start_locked(exec_ctx, elem); } else { if (grpc_client_channel_trace.enabled()) { gpr_log(GPR_DEBUG, "chand=%p calld=%p: resolver disconnected", chand, calld); } async_pick_done_locked( - elem, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Disconnected")); + exec_ctx, elem, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Disconnected")); } } -static void pick_after_resolver_result_start_locked(grpc_call_element* elem) { +static void pick_after_resolver_result_start_locked(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem) { channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; if (grpc_client_channel_trace.enabled()) { @@ -1273,46 +1324,47 @@ static void pick_after_resolver_result_start_locked(grpc_call_element* elem) { grpc_closure_list_append(&chand->waiting_for_resolver_result_closures, &args->closure, GRPC_ERROR_NONE); grpc_call_combiner_set_notify_on_cancel( - calld->call_combiner, + exec_ctx, calld->call_combiner, GRPC_CLOSURE_INIT(&args->cancel_closure, pick_after_resolver_result_cancel_locked, args, grpc_combiner_scheduler(chand->combiner))); } -static void start_pick_locked(void* arg, grpc_error* ignored) { +static void start_pick_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* ignored) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; GPR_ASSERT(calld->connected_subchannel == nullptr); if (chand->lb_policy != nullptr) { // We already have an LB policy, so ask it for a pick. - if (pick_callback_start_locked(elem)) { + if (pick_callback_start_locked(exec_ctx, elem)) { // Pick completed synchronously. - pick_done_locked(elem, GRPC_ERROR_NONE); + pick_done_locked(exec_ctx, elem, GRPC_ERROR_NONE); return; } } else { // We do not yet have an LB policy, so wait for a resolver result. if (chand->resolver == nullptr) { - pick_done_locked(elem, + pick_done_locked(exec_ctx, elem, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Disconnected")); return; } if (!chand->started_resolving) { - start_resolving_locked(chand); + start_resolving_locked(exec_ctx, chand); } - pick_after_resolver_result_start_locked(elem); + pick_after_resolver_result_start_locked(exec_ctx, elem); } // We need to wait for either a resolver result or for an async result // from the LB policy. Add the polling entity from call_data to the // channel_data's interested_parties, so that the I/O of the LB policy // and resolver can be done under it. The polling entity will be // removed in async_pick_done_locked(). - grpc_polling_entity_add_to_pollset_set(calld->pollent, + grpc_polling_entity_add_to_pollset_set(exec_ctx, calld->pollent, chand->interested_parties); } -static void on_complete(void* arg, grpc_error* error) { +static void on_complete(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; if (calld->retry_throttle_data != nullptr) { @@ -1328,15 +1380,18 @@ static void on_complete(void* arg, grpc_error* error) { calld->retry_throttle_data); } } - GRPC_CLOSURE_RUN(calld->original_on_complete, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(exec_ctx, calld->original_on_complete, + GRPC_ERROR_REF(error)); } static void cc_start_transport_stream_op_batch( - grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_transport_stream_op_batch* batch) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; if (chand->deadline_checking_enabled) { - grpc_deadline_state_client_start_transport_stream_op_batch(elem, batch); + grpc_deadline_state_client_start_transport_stream_op_batch(exec_ctx, elem, + batch); } GPR_TIMER_BEGIN("cc_start_transport_stream_op_batch", 0); // If we've previously been cancelled, immediately fail any new batches. @@ -1346,7 +1401,7 @@ static void cc_start_transport_stream_op_batch( chand, calld, grpc_error_string(calld->error)); } grpc_transport_stream_op_batch_finish_with_failure( - batch, GRPC_ERROR_REF(calld->error), calld->call_combiner); + exec_ctx, batch, GRPC_ERROR_REF(calld->error), calld->call_combiner); goto done; } if (batch->cancel_stream) { @@ -1364,10 +1419,11 @@ static void cc_start_transport_stream_op_batch( // If we have a subchannel call, send the cancellation batch down. // Otherwise, fail all pending batches. if (calld->subchannel_call != nullptr) { - grpc_subchannel_call_process_op(calld->subchannel_call, batch); + grpc_subchannel_call_process_op(exec_ctx, calld->subchannel_call, batch); } else { waiting_for_pick_batches_add(calld, batch); - waiting_for_pick_batches_fail(elem, GRPC_ERROR_REF(calld->error)); + waiting_for_pick_batches_fail(exec_ctx, elem, + GRPC_ERROR_REF(calld->error)); } goto done; } @@ -1390,7 +1446,7 @@ static void cc_start_transport_stream_op_batch( "chand=%p calld=%p: sending batch to subchannel_call=%p", chand, calld, calld->subchannel_call); } - grpc_subchannel_call_process_op(calld->subchannel_call, batch); + grpc_subchannel_call_process_op(exec_ctx, calld->subchannel_call, batch); goto done; } // We do not yet have a subchannel call. @@ -1404,6 +1460,7 @@ static void cc_start_transport_stream_op_batch( chand, calld); } GRPC_CLOSURE_SCHED( + exec_ctx, GRPC_CLOSURE_INIT(&batch->handler_private.closure, start_pick_locked, elem, grpc_combiner_scheduler(chand->combiner)), GRPC_ERROR_NONE); @@ -1414,7 +1471,7 @@ static void cc_start_transport_stream_op_batch( "chand=%p calld=%p: saved batch, yeilding call combiner", chand, calld); } - GRPC_CALL_COMBINER_STOP(calld->call_combiner, + GRPC_CALL_COMBINER_STOP(exec_ctx, calld->call_combiner, "batch does not include send_initial_metadata"); } done: @@ -1422,7 +1479,8 @@ done: } /* Constructor for call_data */ -static grpc_error* cc_init_call_elem(grpc_call_element* elem, +static grpc_error* cc_init_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; @@ -1434,22 +1492,23 @@ static grpc_error* cc_init_call_elem(grpc_call_element* elem, calld->owning_call = args->call_stack; calld->call_combiner = args->call_combiner; if (chand->deadline_checking_enabled) { - grpc_deadline_state_init(elem, args->call_stack, args->call_combiner, - calld->deadline); + grpc_deadline_state_init(exec_ctx, elem, args->call_stack, + args->call_combiner, calld->deadline); } return GRPC_ERROR_NONE; } /* Destructor for call_data */ -static void cc_destroy_call_elem(grpc_call_element* elem, +static void cc_destroy_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_schedule_closure) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; if (chand->deadline_checking_enabled) { - grpc_deadline_state_destroy(elem); + grpc_deadline_state_destroy(exec_ctx, elem); } - grpc_slice_unref_internal(calld->path); + grpc_slice_unref_internal(exec_ctx, calld->path); if (calld->method_params != nullptr) { method_parameters_unref(calld->method_params); } @@ -1458,13 +1517,14 @@ static void cc_destroy_call_elem(grpc_call_element* elem, grpc_subchannel_call_set_cleanup_closure(calld->subchannel_call, then_schedule_closure); then_schedule_closure = nullptr; - GRPC_SUBCHANNEL_CALL_UNREF(calld->subchannel_call, + GRPC_SUBCHANNEL_CALL_UNREF(exec_ctx, calld->subchannel_call, "client_channel_destroy_call"); } GPR_ASSERT(calld->lb_policy == nullptr); GPR_ASSERT(calld->waiting_for_pick_batches_count == 0); if (calld->connected_subchannel != nullptr) { - GRPC_CONNECTED_SUBCHANNEL_UNREF(calld->connected_subchannel, "picked"); + GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, calld->connected_subchannel, + "picked"); } for (size_t i = 0; i < GRPC_CONTEXT_COUNT; ++i) { if (calld->subchannel_call_context[i].value != nullptr) { @@ -1472,10 +1532,11 @@ static void cc_destroy_call_elem(grpc_call_element* elem, calld->subchannel_call_context[i].value); } } - GRPC_CLOSURE_SCHED(then_schedule_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, then_schedule_closure, GRPC_ERROR_NONE); } -static void cc_set_pollset_or_pollset_set(grpc_call_element* elem, +static void cc_set_pollset_or_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_polling_entity* pollent) { call_data* calld = (call_data*)elem->call_data; calld->pollent = pollent; @@ -1499,27 +1560,29 @@ const grpc_channel_filter grpc_client_channel_filter = { "client-channel", }; -static void try_to_connect_locked(void* arg, grpc_error* error_ignored) { +static void try_to_connect_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error_ignored) { channel_data* chand = (channel_data*)arg; if (chand->lb_policy != nullptr) { - grpc_lb_policy_exit_idle_locked(chand->lb_policy); + grpc_lb_policy_exit_idle_locked(exec_ctx, chand->lb_policy); } else { chand->exit_idle_when_lb_policy_arrives = true; if (!chand->started_resolving && chand->resolver != nullptr) { - start_resolving_locked(chand); + start_resolving_locked(exec_ctx, chand); } } - GRPC_CHANNEL_STACK_UNREF(chand->owning_stack, "try_to_connect"); + GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->owning_stack, "try_to_connect"); } grpc_connectivity_state grpc_client_channel_check_connectivity_state( - grpc_channel_element* elem, int try_to_connect) { + grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, int try_to_connect) { channel_data* chand = (channel_data*)elem->channel_data; grpc_connectivity_state out = grpc_connectivity_state_check(&chand->state_tracker); if (out == GRPC_CHANNEL_IDLE && try_to_connect) { GRPC_CHANNEL_STACK_REF(chand->owning_stack, "try_to_connect"); GRPC_CLOSURE_SCHED( + exec_ctx, GRPC_CLOSURE_CREATE(try_to_connect_locked, chand, grpc_combiner_scheduler(chand->combiner)), GRPC_ERROR_NONE); @@ -1600,49 +1663,50 @@ int grpc_client_channel_num_external_connectivity_watchers( return count; } -static void on_external_watch_complete_locked(void* arg, grpc_error* error) { +static void on_external_watch_complete_locked(grpc_exec_ctx* exec_ctx, + void* arg, grpc_error* error) { external_connectivity_watcher* w = (external_connectivity_watcher*)arg; grpc_closure* follow_up = w->on_complete; - grpc_polling_entity_del_from_pollset_set(&w->pollent, + grpc_polling_entity_del_from_pollset_set(exec_ctx, &w->pollent, w->chand->interested_parties); - GRPC_CHANNEL_STACK_UNREF(w->chand->owning_stack, + GRPC_CHANNEL_STACK_UNREF(exec_ctx, w->chand->owning_stack, "external_connectivity_watcher"); external_connectivity_watcher_list_remove(w->chand, w); gpr_free(w); - GRPC_CLOSURE_RUN(follow_up, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(exec_ctx, follow_up, GRPC_ERROR_REF(error)); } -static void watch_connectivity_state_locked(void* arg, +static void watch_connectivity_state_locked(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error_ignored) { external_connectivity_watcher* w = (external_connectivity_watcher*)arg; external_connectivity_watcher* found = nullptr; if (w->state != nullptr) { external_connectivity_watcher_list_append(w->chand, w); - GRPC_CLOSURE_RUN(w->watcher_timer_init, GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN(exec_ctx, w->watcher_timer_init, GRPC_ERROR_NONE); GRPC_CLOSURE_INIT(&w->my_closure, on_external_watch_complete_locked, w, grpc_combiner_scheduler(w->chand->combiner)); - grpc_connectivity_state_notify_on_state_change(&w->chand->state_tracker, - w->state, &w->my_closure); + grpc_connectivity_state_notify_on_state_change( + exec_ctx, &w->chand->state_tracker, w->state, &w->my_closure); } else { GPR_ASSERT(w->watcher_timer_init == nullptr); found = lookup_external_connectivity_watcher(w->chand, w->on_complete); if (found) { GPR_ASSERT(found->on_complete == w->on_complete); grpc_connectivity_state_notify_on_state_change( - &found->chand->state_tracker, nullptr, &found->my_closure); + exec_ctx, &found->chand->state_tracker, nullptr, &found->my_closure); } - grpc_polling_entity_del_from_pollset_set(&w->pollent, + grpc_polling_entity_del_from_pollset_set(exec_ctx, &w->pollent, w->chand->interested_parties); - GRPC_CHANNEL_STACK_UNREF(w->chand->owning_stack, + GRPC_CHANNEL_STACK_UNREF(exec_ctx, w->chand->owning_stack, "external_connectivity_watcher"); gpr_free(w); } } void grpc_client_channel_watch_connectivity_state( - grpc_channel_element* elem, grpc_polling_entity pollent, - grpc_connectivity_state* state, grpc_closure* closure, - grpc_closure* watcher_timer_init) { + grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, + grpc_polling_entity pollent, grpc_connectivity_state* state, + grpc_closure* closure, grpc_closure* watcher_timer_init) { channel_data* chand = (channel_data*)elem->channel_data; external_connectivity_watcher* w = (external_connectivity_watcher*)gpr_zalloc(sizeof(*w)); @@ -1651,11 +1715,12 @@ void grpc_client_channel_watch_connectivity_state( w->on_complete = closure; w->state = state; w->watcher_timer_init = watcher_timer_init; - grpc_polling_entity_add_to_pollset_set(&w->pollent, + grpc_polling_entity_add_to_pollset_set(exec_ctx, &w->pollent, chand->interested_parties); GRPC_CHANNEL_STACK_REF(w->chand->owning_stack, "external_connectivity_watcher"); GRPC_CLOSURE_SCHED( + exec_ctx, GRPC_CLOSURE_INIT(&w->my_closure, watch_connectivity_state_locked, w, grpc_combiner_scheduler(chand->combiner)), GRPC_ERROR_NONE); diff --git a/src/core/ext/filters/client_channel/client_channel.h b/src/core/ext/filters/client_channel/client_channel.h index 9670405cbe8..48e4637a82b 100644 --- a/src/core/ext/filters/client_channel/client_channel.h +++ b/src/core/ext/filters/client_channel/client_channel.h @@ -38,15 +38,15 @@ extern grpc_core::TraceFlag grpc_client_channel_trace; extern const grpc_channel_filter grpc_client_channel_filter; grpc_connectivity_state grpc_client_channel_check_connectivity_state( - grpc_channel_element* elem, int try_to_connect); + grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, int try_to_connect); int grpc_client_channel_num_external_connectivity_watchers( grpc_channel_element* elem); void grpc_client_channel_watch_connectivity_state( - grpc_channel_element* elem, grpc_polling_entity pollent, - grpc_connectivity_state* state, grpc_closure* on_complete, - grpc_closure* watcher_timer_init); + grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, + grpc_polling_entity pollent, grpc_connectivity_state* state, + grpc_closure* on_complete, grpc_closure* watcher_timer_init); /* Debug helper: pull the subchannel call from a call stack element */ grpc_subchannel_call* grpc_client_channel_get_subchannel_call( diff --git a/src/core/ext/filters/client_channel/client_channel_factory.cc b/src/core/ext/filters/client_channel/client_channel_factory.cc index 60c95d7dc90..57eac8f8757 100644 --- a/src/core/ext/filters/client_channel/client_channel_factory.cc +++ b/src/core/ext/filters/client_channel/client_channel_factory.cc @@ -23,19 +23,23 @@ void grpc_client_channel_factory_ref(grpc_client_channel_factory* factory) { factory->vtable->ref(factory); } -void grpc_client_channel_factory_unref(grpc_client_channel_factory* factory) { - factory->vtable->unref(factory); +void grpc_client_channel_factory_unref(grpc_exec_ctx* exec_ctx, + grpc_client_channel_factory* factory) { + factory->vtable->unref(exec_ctx, factory); } grpc_subchannel* grpc_client_channel_factory_create_subchannel( - grpc_client_channel_factory* factory, const grpc_subchannel_args* args) { - return factory->vtable->create_subchannel(factory, args); + grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* factory, + const grpc_subchannel_args* args) { + return factory->vtable->create_subchannel(exec_ctx, factory, args); } grpc_channel* grpc_client_channel_factory_create_channel( - grpc_client_channel_factory* factory, const char* target, - grpc_client_channel_type type, const grpc_channel_args* args) { - return factory->vtable->create_client_channel(factory, target, type, args); + grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* factory, + const char* target, grpc_client_channel_type type, + const grpc_channel_args* args) { + return factory->vtable->create_client_channel(exec_ctx, factory, target, type, + args); } static void* factory_arg_copy(void* factory) { @@ -43,8 +47,9 @@ static void* factory_arg_copy(void* factory) { return factory; } -static void factory_arg_destroy(void* factory) { - grpc_client_channel_factory_unref((grpc_client_channel_factory*)factory); +static void factory_arg_destroy(grpc_exec_ctx* exec_ctx, void* factory) { + grpc_client_channel_factory_unref(exec_ctx, + (grpc_client_channel_factory*)factory); } static int factory_arg_cmp(void* factory1, void* factory2) { diff --git a/src/core/ext/filters/client_channel/client_channel_factory.h b/src/core/ext/filters/client_channel/client_channel_factory.h index 766ebb9389d..db82b733cee 100644 --- a/src/core/ext/filters/client_channel/client_channel_factory.h +++ b/src/core/ext/filters/client_channel/client_channel_factory.h @@ -45,26 +45,31 @@ struct grpc_client_channel_factory { struct grpc_client_channel_factory_vtable { void (*ref)(grpc_client_channel_factory* factory); - void (*unref)(grpc_client_channel_factory* factory); - grpc_subchannel* (*create_subchannel)(grpc_client_channel_factory* factory, + 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, const grpc_subchannel_args* args); - grpc_channel* (*create_client_channel)(grpc_client_channel_factory* factory, + grpc_channel* (*create_client_channel)(grpc_exec_ctx* exec_ctx, + grpc_client_channel_factory* factory, const char* target, grpc_client_channel_type type, const grpc_channel_args* args); }; void grpc_client_channel_factory_ref(grpc_client_channel_factory* factory); -void grpc_client_channel_factory_unref(grpc_client_channel_factory* factory); +void grpc_client_channel_factory_unref(grpc_exec_ctx* exec_ctx, + grpc_client_channel_factory* factory); /** Create a new grpc_subchannel */ grpc_subchannel* grpc_client_channel_factory_create_subchannel( - grpc_client_channel_factory* factory, const grpc_subchannel_args* args); + grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* factory, + const grpc_subchannel_args* args); /** Create a new grpc_channel */ grpc_channel* grpc_client_channel_factory_create_channel( - grpc_client_channel_factory* factory, const char* target, - grpc_client_channel_type type, const grpc_channel_args* args); + grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* factory, + const char* target, grpc_client_channel_type type, + const grpc_channel_args* args); grpc_arg grpc_client_channel_factory_create_channel_arg( grpc_client_channel_factory* factory); diff --git a/src/core/ext/filters/client_channel/client_channel_plugin.cc b/src/core/ext/filters/client_channel/client_channel_plugin.cc index ea630d29174..7a5bb181578 100644 --- a/src/core/ext/filters/client_channel/client_channel_plugin.cc +++ b/src/core/ext/filters/client_channel/client_channel_plugin.cc @@ -34,12 +34,14 @@ #include "src/core/ext/filters/client_channel/subchannel_index.h" #include "src/core/lib/surface/channel_init.h" -static bool append_filter(grpc_channel_stack_builder* builder, void* arg) { +static bool append_filter(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, void* arg) { return grpc_channel_stack_builder_append_filter( builder, (const grpc_channel_filter*)arg, nullptr, nullptr); } -static bool set_default_host_if_unset(grpc_channel_stack_builder* builder, +static bool set_default_host_if_unset(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, void* unused) { const grpc_channel_args* args = grpc_channel_stack_builder_get_channel_arguments(builder); @@ -50,14 +52,15 @@ static bool set_default_host_if_unset(grpc_channel_stack_builder* builder, } } char* default_authority = grpc_get_default_authority( - grpc_channel_stack_builder_get_target(builder)); + exec_ctx, grpc_channel_stack_builder_get_target(builder)); if (default_authority != nullptr) { grpc_arg arg = grpc_channel_arg_string_create( (char*)GRPC_ARG_DEFAULT_AUTHORITY, default_authority); grpc_channel_args* new_args = grpc_channel_args_copy_and_add(args, &arg, 1); - grpc_channel_stack_builder_set_channel_arguments(builder, new_args); + grpc_channel_stack_builder_set_channel_arguments(exec_ctx, builder, + new_args); gpr_free(default_authority); - grpc_channel_args_destroy(new_args); + grpc_channel_args_destroy(exec_ctx, new_args); } return true; } diff --git a/src/core/ext/filters/client_channel/connector.cc b/src/core/ext/filters/client_channel/connector.cc index c8bf2f3e1c0..c258468e589 100644 --- a/src/core/ext/filters/client_channel/connector.cc +++ b/src/core/ext/filters/client_channel/connector.cc @@ -23,17 +23,18 @@ grpc_connector* grpc_connector_ref(grpc_connector* connector) { return connector; } -void grpc_connector_unref(grpc_connector* connector) { - connector->vtable->unref(connector); +void grpc_connector_unref(grpc_exec_ctx* exec_ctx, grpc_connector* connector) { + connector->vtable->unref(exec_ctx, connector); } -void grpc_connector_connect(grpc_connector* connector, +void grpc_connector_connect(grpc_exec_ctx* exec_ctx, grpc_connector* connector, const grpc_connect_in_args* in_args, grpc_connect_out_args* out_args, grpc_closure* notify) { - connector->vtable->connect(connector, in_args, out_args, notify); + connector->vtable->connect(exec_ctx, connector, in_args, out_args, notify); } -void grpc_connector_shutdown(grpc_connector* connector, grpc_error* why) { - connector->vtable->shutdown(connector, why); +void grpc_connector_shutdown(grpc_exec_ctx* exec_ctx, grpc_connector* connector, + grpc_error* why) { + connector->vtable->shutdown(exec_ctx, connector, why); } diff --git a/src/core/ext/filters/client_channel/connector.h b/src/core/ext/filters/client_channel/connector.h index d657658d671..239ed8a8bd1 100644 --- a/src/core/ext/filters/client_channel/connector.h +++ b/src/core/ext/filters/client_channel/connector.h @@ -49,23 +49,25 @@ typedef struct { struct grpc_connector_vtable { void (*ref)(grpc_connector* connector); - void (*unref)(grpc_connector* connector); + void (*unref)(grpc_exec_ctx* exec_ctx, grpc_connector* connector); /** Implementation of grpc_connector_shutdown */ - void (*shutdown)(grpc_connector* connector, grpc_error* why); + void (*shutdown)(grpc_exec_ctx* exec_ctx, grpc_connector* connector, + grpc_error* why); /** Implementation of grpc_connector_connect */ - void (*connect)(grpc_connector* connector, + void (*connect)(grpc_exec_ctx* exec_ctx, grpc_connector* connector, const grpc_connect_in_args* in_args, grpc_connect_out_args* out_args, grpc_closure* notify); }; grpc_connector* grpc_connector_ref(grpc_connector* connector); -void grpc_connector_unref(grpc_connector* connector); +void grpc_connector_unref(grpc_exec_ctx* exec_ctx, grpc_connector* connector); /** Connect using the connector: max one outstanding call at a time */ -void grpc_connector_connect(grpc_connector* connector, +void grpc_connector_connect(grpc_exec_ctx* exec_ctx, grpc_connector* connector, const grpc_connect_in_args* in_args, grpc_connect_out_args* out_args, grpc_closure* notify); /** Cancel any pending connection */ -void grpc_connector_shutdown(grpc_connector* connector, grpc_error* why); +void grpc_connector_shutdown(grpc_exec_ctx* exec_ctx, grpc_connector* connector, + grpc_error* why); #endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CONNECTOR_H */ diff --git a/src/core/ext/filters/client_channel/http_connect_handshaker.cc b/src/core/ext/filters/client_channel/http_connect_handshaker.cc index 556a3bc6a18..b7cb2e3eba7 100644 --- a/src/core/ext/filters/client_channel/http_connect_handshaker.cc +++ b/src/core/ext/filters/client_channel/http_connect_handshaker.cc @@ -61,38 +61,41 @@ typedef struct http_connect_handshaker { } http_connect_handshaker; // Unref and clean up handshaker. -static void http_connect_handshaker_unref(http_connect_handshaker* handshaker) { +static void http_connect_handshaker_unref(grpc_exec_ctx* exec_ctx, + http_connect_handshaker* handshaker) { if (gpr_unref(&handshaker->refcount)) { gpr_mu_destroy(&handshaker->mu); if (handshaker->endpoint_to_destroy != nullptr) { - grpc_endpoint_destroy(handshaker->endpoint_to_destroy); + grpc_endpoint_destroy(exec_ctx, handshaker->endpoint_to_destroy); } if (handshaker->read_buffer_to_destroy != nullptr) { - grpc_slice_buffer_destroy_internal(handshaker->read_buffer_to_destroy); + grpc_slice_buffer_destroy_internal(exec_ctx, + handshaker->read_buffer_to_destroy); gpr_free(handshaker->read_buffer_to_destroy); } - grpc_slice_buffer_destroy_internal(&handshaker->write_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, &handshaker->write_buffer); grpc_http_parser_destroy(&handshaker->http_parser); grpc_http_response_destroy(&handshaker->http_response); gpr_free(handshaker); } } -// Set args fields to nullptr, saving the endpoint and read buffer for +// Set args fields to NULL, saving the endpoint and read buffer for // later destruction. static void cleanup_args_for_failure_locked( - http_connect_handshaker* handshaker) { + grpc_exec_ctx* exec_ctx, http_connect_handshaker* handshaker) { handshaker->endpoint_to_destroy = handshaker->args->endpoint; handshaker->args->endpoint = nullptr; handshaker->read_buffer_to_destroy = handshaker->args->read_buffer; handshaker->args->read_buffer = nullptr; - grpc_channel_args_destroy(handshaker->args->args); + grpc_channel_args_destroy(exec_ctx, handshaker->args->args); handshaker->args->args = nullptr; } // If the handshake failed or we're shutting down, clean up and invoke the // callback with the error. -static void handshake_failed_locked(http_connect_handshaker* handshaker, +static void handshake_failed_locked(grpc_exec_ctx* exec_ctx, + http_connect_handshaker* handshaker, grpc_error* error) { if (error == GRPC_ERROR_NONE) { // If we were shut down after an endpoint operation succeeded but @@ -105,32 +108,34 @@ static void handshake_failed_locked(http_connect_handshaker* handshaker, // before destroying them, even if we know that there are no // pending read/write callbacks. This should be fixed, at which // point this can be removed. - grpc_endpoint_shutdown(handshaker->args->endpoint, GRPC_ERROR_REF(error)); + grpc_endpoint_shutdown(exec_ctx, handshaker->args->endpoint, + GRPC_ERROR_REF(error)); // Not shutting down, so the handshake failed. Clean up before // invoking the callback. - cleanup_args_for_failure_locked(handshaker); + cleanup_args_for_failure_locked(exec_ctx, handshaker); // Set shutdown to true so that subsequent calls to // http_connect_handshaker_shutdown() do nothing. handshaker->shutdown = true; } // Invoke callback. - GRPC_CLOSURE_SCHED(handshaker->on_handshake_done, error); + GRPC_CLOSURE_SCHED(exec_ctx, handshaker->on_handshake_done, error); } // Callback invoked when finished writing HTTP CONNECT request. -static void on_write_done(void* arg, grpc_error* error) { +static void on_write_done(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { http_connect_handshaker* handshaker = (http_connect_handshaker*)arg; gpr_mu_lock(&handshaker->mu); if (error != GRPC_ERROR_NONE || handshaker->shutdown) { // If the write failed or we're shutting down, clean up and invoke the // callback with the error. - handshake_failed_locked(handshaker, GRPC_ERROR_REF(error)); + handshake_failed_locked(exec_ctx, handshaker, GRPC_ERROR_REF(error)); gpr_mu_unlock(&handshaker->mu); - http_connect_handshaker_unref(handshaker); + http_connect_handshaker_unref(exec_ctx, handshaker); } else { // Otherwise, read the response. // The read callback inherits our ref to the handshaker. - grpc_endpoint_read(handshaker->args->endpoint, + grpc_endpoint_read(exec_ctx, handshaker->args->endpoint, handshaker->args->read_buffer, &handshaker->response_read_closure); gpr_mu_unlock(&handshaker->mu); @@ -138,13 +143,14 @@ static void on_write_done(void* arg, grpc_error* error) { } // Callback invoked for reading HTTP CONNECT response. -static void on_read_done(void* arg, grpc_error* error) { +static void on_read_done(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { http_connect_handshaker* handshaker = (http_connect_handshaker*)arg; gpr_mu_lock(&handshaker->mu); if (error != GRPC_ERROR_NONE || handshaker->shutdown) { // If the read failed or we're shutting down, clean up and invoke the // callback with the error. - handshake_failed_locked(handshaker, GRPC_ERROR_REF(error)); + handshake_failed_locked(exec_ctx, handshaker, GRPC_ERROR_REF(error)); goto done; } // Add buffer to parser. @@ -155,7 +161,7 @@ static void on_read_done(void* arg, grpc_error* error) { handshaker->args->read_buffer->slices[i], &body_start_offset); if (error != GRPC_ERROR_NONE) { - handshake_failed_locked(handshaker, error); + handshake_failed_locked(exec_ctx, handshaker, error); goto done; } if (handshaker->http_parser.state == GRPC_HTTP_BODY) { @@ -174,7 +180,7 @@ static void on_read_done(void* arg, grpc_error* error) { &handshaker->args->read_buffer->slices[i + 1], handshaker->args->read_buffer->count - i - 1); grpc_slice_buffer_swap(handshaker->args->read_buffer, &tmp_buffer); - grpc_slice_buffer_destroy_internal(&tmp_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, &tmp_buffer); break; } } @@ -191,8 +197,9 @@ static void on_read_done(void* arg, grpc_error* error) { // complete (e.g., handling chunked transfer encoding or looking // at the Content-Length: header). if (handshaker->http_parser.state != GRPC_HTTP_BODY) { - grpc_slice_buffer_reset_and_unref_internal(handshaker->args->read_buffer); - grpc_endpoint_read(handshaker->args->endpoint, + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, + handshaker->args->read_buffer); + grpc_endpoint_read(exec_ctx, handshaker->args->endpoint, handshaker->args->read_buffer, &handshaker->response_read_closure); gpr_mu_unlock(&handshaker->mu); @@ -206,44 +213,48 @@ static void on_read_done(void* arg, grpc_error* error) { handshaker->http_response.status); error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - handshake_failed_locked(handshaker, error); + handshake_failed_locked(exec_ctx, handshaker, error); goto done; } // Success. Invoke handshake-done callback. - GRPC_CLOSURE_SCHED(handshaker->on_handshake_done, error); + GRPC_CLOSURE_SCHED(exec_ctx, handshaker->on_handshake_done, error); done: // Set shutdown to true so that subsequent calls to // http_connect_handshaker_shutdown() do nothing. handshaker->shutdown = true; gpr_mu_unlock(&handshaker->mu); - http_connect_handshaker_unref(handshaker); + http_connect_handshaker_unref(exec_ctx, handshaker); } // // Public handshaker methods // -static void http_connect_handshaker_destroy(grpc_handshaker* handshaker_in) { +static void http_connect_handshaker_destroy(grpc_exec_ctx* exec_ctx, + grpc_handshaker* handshaker_in) { http_connect_handshaker* handshaker = (http_connect_handshaker*)handshaker_in; - http_connect_handshaker_unref(handshaker); + http_connect_handshaker_unref(exec_ctx, handshaker); } -static void http_connect_handshaker_shutdown(grpc_handshaker* handshaker_in, +static void http_connect_handshaker_shutdown(grpc_exec_ctx* exec_ctx, + grpc_handshaker* handshaker_in, grpc_error* why) { http_connect_handshaker* handshaker = (http_connect_handshaker*)handshaker_in; gpr_mu_lock(&handshaker->mu); if (!handshaker->shutdown) { handshaker->shutdown = true; - grpc_endpoint_shutdown(handshaker->args->endpoint, GRPC_ERROR_REF(why)); - cleanup_args_for_failure_locked(handshaker); + grpc_endpoint_shutdown(exec_ctx, handshaker->args->endpoint, + GRPC_ERROR_REF(why)); + cleanup_args_for_failure_locked(exec_ctx, handshaker); } gpr_mu_unlock(&handshaker->mu); GRPC_ERROR_UNREF(why); } static void http_connect_handshaker_do_handshake( - grpc_handshaker* handshaker_in, grpc_tcp_server_acceptor* acceptor, - grpc_closure* on_handshake_done, grpc_handshaker_args* args) { + grpc_exec_ctx* exec_ctx, grpc_handshaker* handshaker_in, + grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, + grpc_handshaker_args* args) { http_connect_handshaker* handshaker = (http_connect_handshaker*)handshaker_in; // Check for HTTP CONNECT channel arg. // If not found, invoke on_handshake_done without doing anything. @@ -255,7 +266,7 @@ static void http_connect_handshaker_do_handshake( gpr_mu_lock(&handshaker->mu); handshaker->shutdown = true; gpr_mu_unlock(&handshaker->mu); - GRPC_CLOSURE_SCHED(on_handshake_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, on_handshake_done, GRPC_ERROR_NONE); return; } GPR_ASSERT(arg->type == GRPC_ARG_STRING); @@ -313,7 +324,7 @@ static void http_connect_handshaker_do_handshake( gpr_free(header_strings); // Take a new ref to be held by the write callback. gpr_ref(&handshaker->refcount); - grpc_endpoint_write(args->endpoint, &handshaker->write_buffer, + grpc_endpoint_write(exec_ctx, args->endpoint, &handshaker->write_buffer, &handshaker->request_done_closure); gpr_mu_unlock(&handshaker->mu); } @@ -344,13 +355,14 @@ static grpc_handshaker* grpc_http_connect_handshaker_create() { // static void handshaker_factory_add_handshakers( - grpc_handshaker_factory* factory, const grpc_channel_args* args, - grpc_handshake_manager* handshake_mgr) { + grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* factory, + const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr) { grpc_handshake_manager_add(handshake_mgr, grpc_http_connect_handshaker_create()); } -static void handshaker_factory_destroy(grpc_handshaker_factory* factory) {} +static void handshaker_factory_destroy(grpc_exec_ctx* exec_ctx, + grpc_handshaker_factory* factory) {} static const grpc_handshaker_factory_vtable handshaker_factory_vtable = { handshaker_factory_add_handshakers, handshaker_factory_destroy}; diff --git a/src/core/ext/filters/client_channel/http_proxy.cc b/src/core/ext/filters/client_channel/http_proxy.cc index 2eafeee7026..405d8c0e559 100644 --- a/src/core/ext/filters/client_channel/http_proxy.cc +++ b/src/core/ext/filters/client_channel/http_proxy.cc @@ -36,18 +36,19 @@ /** * Parses the 'http_proxy' env var and returns the proxy hostname to resolve or - * nullptr on error. Also sets 'user_cred' to user credentials if present in the + * NULL on error. Also sets 'user_cred' to user credentials if present in the * 'http_proxy' env var, otherwise leaves it unchanged. It is caller's * responsibility to gpr_free user_cred. */ -static char* get_http_proxy_server(char** user_cred) { +static char* get_http_proxy_server(grpc_exec_ctx* exec_ctx, char** user_cred) { GPR_ASSERT(user_cred != nullptr); char* proxy_name = nullptr; char* uri_str = gpr_getenv("http_proxy"); char** authority_strs = nullptr; size_t authority_nstrs; if (uri_str == nullptr) return nullptr; - grpc_uri* uri = grpc_uri_parse(uri_str, false /* suppress_errors */); + grpc_uri* uri = + grpc_uri_parse(exec_ctx, uri_str, false /* suppress_errors */); if (uri == nullptr || uri->authority == nullptr) { gpr_log(GPR_ERROR, "cannot parse value of 'http_proxy' env var"); goto done; @@ -81,16 +82,18 @@ done: return proxy_name; } -static bool proxy_mapper_map_name(grpc_proxy_mapper* mapper, +static bool proxy_mapper_map_name(grpc_exec_ctx* exec_ctx, + grpc_proxy_mapper* mapper, const char* server_uri, const grpc_channel_args* args, char** name_to_resolve, grpc_channel_args** new_args) { char* user_cred = nullptr; - *name_to_resolve = get_http_proxy_server(&user_cred); + *name_to_resolve = get_http_proxy_server(exec_ctx, &user_cred); if (*name_to_resolve == nullptr) return false; char* no_proxy_str = nullptr; - grpc_uri* uri = grpc_uri_parse(server_uri, false /* suppress_errors */); + grpc_uri* uri = + grpc_uri_parse(exec_ctx, server_uri, false /* suppress_errors */); if (uri == nullptr || uri->path[0] == '\0') { gpr_log(GPR_ERROR, "'http_proxy' environment variable set, but cannot " @@ -171,7 +174,8 @@ no_use_proxy: return false; } -static bool proxy_mapper_map_address(grpc_proxy_mapper* mapper, +static bool proxy_mapper_map_address(grpc_exec_ctx* exec_ctx, + grpc_proxy_mapper* mapper, const grpc_resolved_address* address, const grpc_channel_args* args, grpc_resolved_address** new_address, diff --git a/src/core/ext/filters/client_channel/lb_policy.cc b/src/core/ext/filters/client_channel/lb_policy.cc index b97aa319f7e..db566f1b562 100644 --- a/src/core/ext/filters/client_channel/lb_policy.cc +++ b/src/core/ext/filters/client_channel/lb_policy.cc @@ -63,13 +63,15 @@ void grpc_lb_policy_ref(grpc_lb_policy* policy REF_FUNC_EXTRA_ARGS) { ref_mutate(policy, 1 << WEAK_REF_BITS, 0 REF_MUTATE_PASS_ARGS("STRONG_REF")); } -static void shutdown_locked(void* arg, grpc_error* error) { +static void shutdown_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_lb_policy* policy = (grpc_lb_policy*)arg; - policy->vtable->shutdown_locked(policy); - GRPC_LB_POLICY_WEAK_UNREF(policy, "strong-unref"); + policy->vtable->shutdown_locked(exec_ctx, policy); + GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, policy, "strong-unref"); } -void grpc_lb_policy_unref(grpc_lb_policy* policy REF_FUNC_EXTRA_ARGS) { +void grpc_lb_policy_unref(grpc_exec_ctx* exec_ctx, + grpc_lb_policy* policy REF_FUNC_EXTRA_ARGS) { gpr_atm old_val = ref_mutate(policy, (gpr_atm)1 - (gpr_atm)(1 << WEAK_REF_BITS), 1 REF_MUTATE_PASS_ARGS("STRONG_UNREF")); @@ -77,11 +79,13 @@ void grpc_lb_policy_unref(grpc_lb_policy* policy REF_FUNC_EXTRA_ARGS) { gpr_atm check = 1 << WEAK_REF_BITS; if ((old_val & mask) == check) { GRPC_CLOSURE_SCHED( + exec_ctx, GRPC_CLOSURE_CREATE(shutdown_locked, policy, grpc_combiner_scheduler(policy->combiner)), GRPC_ERROR_NONE); } else { - grpc_lb_policy_weak_unref(policy REF_FUNC_PASS_ARGS("strong-unref")); + grpc_lb_policy_weak_unref(exec_ctx, + policy REF_FUNC_PASS_ARGS("strong-unref")); } } @@ -89,75 +93,88 @@ void grpc_lb_policy_weak_ref(grpc_lb_policy* policy REF_FUNC_EXTRA_ARGS) { ref_mutate(policy, 1, 0 REF_MUTATE_PASS_ARGS("WEAK_REF")); } -void grpc_lb_policy_weak_unref(grpc_lb_policy* policy REF_FUNC_EXTRA_ARGS) { +void grpc_lb_policy_weak_unref(grpc_exec_ctx* exec_ctx, + grpc_lb_policy* policy REF_FUNC_EXTRA_ARGS) { gpr_atm old_val = ref_mutate(policy, -(gpr_atm)1, 1 REF_MUTATE_PASS_ARGS("WEAK_UNREF")); if (old_val == 1) { - grpc_pollset_set_destroy(policy->interested_parties); + grpc_pollset_set_destroy(exec_ctx, policy->interested_parties); grpc_combiner* combiner = policy->combiner; - policy->vtable->destroy(policy); - GRPC_COMBINER_UNREF(combiner, "lb_policy"); + policy->vtable->destroy(exec_ctx, policy); + GRPC_COMBINER_UNREF(exec_ctx, combiner, "lb_policy"); } } -int grpc_lb_policy_pick_locked(grpc_lb_policy* policy, +int grpc_lb_policy_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, const grpc_lb_policy_pick_args* pick_args, grpc_connected_subchannel** target, grpc_call_context_element* context, void** user_data, grpc_closure* on_complete) { - return policy->vtable->pick_locked(policy, pick_args, target, context, - user_data, on_complete); + return policy->vtable->pick_locked(exec_ctx, policy, pick_args, target, + context, user_data, on_complete); } -void grpc_lb_policy_cancel_pick_locked(grpc_lb_policy* policy, +void grpc_lb_policy_cancel_pick_locked(grpc_exec_ctx* exec_ctx, + grpc_lb_policy* policy, grpc_connected_subchannel** target, grpc_error* error) { - policy->vtable->cancel_pick_locked(policy, target, error); + policy->vtable->cancel_pick_locked(exec_ctx, policy, target, error); } -void grpc_lb_policy_cancel_picks_locked(grpc_lb_policy* policy, +void grpc_lb_policy_cancel_picks_locked(grpc_exec_ctx* exec_ctx, + grpc_lb_policy* policy, uint32_t initial_metadata_flags_mask, uint32_t initial_metadata_flags_eq, grpc_error* error) { - policy->vtable->cancel_picks_locked(policy, initial_metadata_flags_mask, + policy->vtable->cancel_picks_locked(exec_ctx, policy, + initial_metadata_flags_mask, initial_metadata_flags_eq, error); } -void grpc_lb_policy_exit_idle_locked(grpc_lb_policy* policy) { - policy->vtable->exit_idle_locked(policy); +void grpc_lb_policy_exit_idle_locked(grpc_exec_ctx* exec_ctx, + grpc_lb_policy* policy) { + policy->vtable->exit_idle_locked(exec_ctx, policy); } -void grpc_lb_policy_ping_one_locked(grpc_lb_policy* policy, +void grpc_lb_policy_ping_one_locked(grpc_exec_ctx* exec_ctx, + grpc_lb_policy* policy, grpc_closure* closure) { - policy->vtable->ping_one_locked(policy, closure); + policy->vtable->ping_one_locked(exec_ctx, policy, closure); } void grpc_lb_policy_notify_on_state_change_locked( - grpc_lb_policy* policy, grpc_connectivity_state* state, - grpc_closure* closure) { - policy->vtable->notify_on_state_change_locked(policy, state, closure); + grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, + grpc_connectivity_state* state, grpc_closure* closure) { + policy->vtable->notify_on_state_change_locked(exec_ctx, policy, state, + closure); } grpc_connectivity_state grpc_lb_policy_check_connectivity_locked( - grpc_lb_policy* policy, grpc_error** connectivity_error) { - return policy->vtable->check_connectivity_locked(policy, connectivity_error); + grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, + grpc_error** connectivity_error) { + return policy->vtable->check_connectivity_locked(exec_ctx, policy, + connectivity_error); } -void grpc_lb_policy_update_locked(grpc_lb_policy* policy, +void grpc_lb_policy_update_locked(grpc_exec_ctx* exec_ctx, + grpc_lb_policy* policy, const grpc_lb_policy_args* lb_policy_args) { - policy->vtable->update_locked(policy, lb_policy_args); + policy->vtable->update_locked(exec_ctx, policy, lb_policy_args); } void grpc_lb_policy_set_reresolve_closure_locked( - grpc_lb_policy* policy, grpc_closure* request_reresolution) { - policy->vtable->set_reresolve_closure_locked(policy, request_reresolution); + grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, + grpc_closure* request_reresolution) { + policy->vtable->set_reresolve_closure_locked(exec_ctx, policy, + request_reresolution); } -void grpc_lb_policy_try_reresolve(grpc_lb_policy* policy, +void grpc_lb_policy_try_reresolve(grpc_exec_ctx* exec_ctx, + grpc_lb_policy* policy, grpc_core::TraceFlag* grpc_lb_trace, grpc_error* error) { if (policy->request_reresolution != nullptr) { - GRPC_CLOSURE_SCHED(policy->request_reresolution, error); + GRPC_CLOSURE_SCHED(exec_ctx, policy->request_reresolution, error); policy->request_reresolution = nullptr; if (grpc_lb_trace->enabled()) { gpr_log(GPR_DEBUG, diff --git a/src/core/ext/filters/client_channel/lb_policy.h b/src/core/ext/filters/client_channel/lb_policy.h index fd28a2b623c..d3159eebf3b 100644 --- a/src/core/ext/filters/client_channel/lb_policy.h +++ b/src/core/ext/filters/client_channel/lb_policy.h @@ -55,49 +55,53 @@ typedef struct grpc_lb_policy_pick_args { } grpc_lb_policy_pick_args; struct grpc_lb_policy_vtable { - void (*destroy)(grpc_lb_policy* policy); - void (*shutdown_locked)(grpc_lb_policy* policy); + void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy); + void (*shutdown_locked)(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy); /** \see grpc_lb_policy_pick */ - int (*pick_locked)(grpc_lb_policy* policy, + int (*pick_locked)(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, const grpc_lb_policy_pick_args* pick_args, grpc_connected_subchannel** target, grpc_call_context_element* context, void** user_data, grpc_closure* on_complete); /** \see grpc_lb_policy_cancel_pick */ - void (*cancel_pick_locked)(grpc_lb_policy* policy, + void (*cancel_pick_locked)(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, grpc_connected_subchannel** target, grpc_error* error); /** \see grpc_lb_policy_cancel_picks */ - void (*cancel_picks_locked)(grpc_lb_policy* policy, + void (*cancel_picks_locked)(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, uint32_t initial_metadata_flags_mask, uint32_t initial_metadata_flags_eq, grpc_error* error); /** \see grpc_lb_policy_ping_one */ - void (*ping_one_locked)(grpc_lb_policy* policy, grpc_closure* closure); + void (*ping_one_locked)(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, + grpc_closure* closure); /** Try to enter a READY connectivity state */ - void (*exit_idle_locked)(grpc_lb_policy* policy); + void (*exit_idle_locked)(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy); /** check the current connectivity of the lb_policy */ grpc_connectivity_state (*check_connectivity_locked)( - grpc_lb_policy* policy, grpc_error** connectivity_error); + grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, + grpc_error** connectivity_error); /** call notify when the connectivity state of a channel changes from *state. Updates *state with the new state of the policy. Calling with a NULL \a state cancels the subscription. */ - void (*notify_on_state_change_locked)(grpc_lb_policy* policy, + void (*notify_on_state_change_locked)(grpc_exec_ctx* exec_ctx, + grpc_lb_policy* policy, grpc_connectivity_state* state, grpc_closure* closure); - void (*update_locked)(grpc_lb_policy* policy, + void (*update_locked)(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, const grpc_lb_policy_args* args); /** \see grpc_lb_policy_set_reresolve_closure */ - void (*set_reresolve_closure_locked)(grpc_lb_policy* policy, + void (*set_reresolve_closure_locked)(grpc_exec_ctx* exec_ctx, + grpc_lb_policy* policy, grpc_closure* request_reresolution); }; @@ -106,33 +110,33 @@ struct grpc_lb_policy_vtable { /* Strong references: the policy will shutdown when they reach zero */ #define GRPC_LB_POLICY_REF(p, r) \ grpc_lb_policy_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_LB_POLICY_UNREF(p, r) \ - grpc_lb_policy_unref((p), __FILE__, __LINE__, (r)) +#define GRPC_LB_POLICY_UNREF(exec_ctx, p, r) \ + grpc_lb_policy_unref((exec_ctx), (p), __FILE__, __LINE__, (r)) /* Weak references: they don't prevent the shutdown of the LB policy. When no * strong references are left but there are still weak ones, shutdown is called. * Once the weak reference also reaches zero, the LB policy is destroyed. */ #define GRPC_LB_POLICY_WEAK_REF(p, r) \ grpc_lb_policy_weak_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_LB_POLICY_WEAK_UNREF(p, r) \ - grpc_lb_policy_weak_unref((p), __FILE__, __LINE__, (r)) +#define GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, p, r) \ + grpc_lb_policy_weak_unref((exec_ctx), (p), __FILE__, __LINE__, (r)) void grpc_lb_policy_ref(grpc_lb_policy* policy, const char* file, int line, const char* reason); -void grpc_lb_policy_unref(grpc_lb_policy* policy, const char* file, int line, - const char* reason); +void grpc_lb_policy_unref(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, + const char* file, int line, const char* reason); void grpc_lb_policy_weak_ref(grpc_lb_policy* policy, const char* file, int line, const char* reason); -void grpc_lb_policy_weak_unref(grpc_lb_policy* policy, const char* file, - int line, const char* reason); +void grpc_lb_policy_weak_unref(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, + const char* file, int line, const char* reason); #else #define GRPC_LB_POLICY_REF(p, r) grpc_lb_policy_ref((p)) -#define GRPC_LB_POLICY_UNREF(p, r) grpc_lb_policy_unref((p)) +#define GRPC_LB_POLICY_UNREF(cl, p, r) grpc_lb_policy_unref((cl), (p)) #define GRPC_LB_POLICY_WEAK_REF(p, r) grpc_lb_policy_weak_ref((p)) -#define GRPC_LB_POLICY_WEAK_UNREF(p, r) grpc_lb_policy_weak_unref((p)) +#define GRPC_LB_POLICY_WEAK_UNREF(cl, p, r) grpc_lb_policy_weak_unref((cl), (p)) void grpc_lb_policy_ref(grpc_lb_policy* policy); -void grpc_lb_policy_unref(grpc_lb_policy* policy); +void grpc_lb_policy_unref(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy); void grpc_lb_policy_weak_ref(grpc_lb_policy* policy); -void grpc_lb_policy_weak_unref(grpc_lb_policy* policy); +void grpc_lb_policy_weak_unref(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy); #endif /** called by concrete implementations to initialize the base struct */ @@ -157,7 +161,7 @@ void grpc_lb_policy_init(grpc_lb_policy* policy, Any IO should be done under the \a interested_parties \a grpc_pollset_set in the \a grpc_lb_policy struct. */ -int grpc_lb_policy_pick_locked(grpc_lb_policy* policy, +int grpc_lb_policy_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, const grpc_lb_policy_pick_args* pick_args, grpc_connected_subchannel** target, grpc_call_context_element* context, @@ -165,47 +169,55 @@ int grpc_lb_policy_pick_locked(grpc_lb_policy* policy, /** Perform a connected subchannel ping (see \a grpc_connected_subchannel_ping) against one of the connected subchannels managed by \a policy. */ -void grpc_lb_policy_ping_one_locked(grpc_lb_policy* policy, +void grpc_lb_policy_ping_one_locked(grpc_exec_ctx* exec_ctx, + grpc_lb_policy* policy, grpc_closure* closure); /** Cancel picks for \a target. The \a on_complete callback of the pending picks will be invoked with \a *target set to NULL. */ -void grpc_lb_policy_cancel_pick_locked(grpc_lb_policy* policy, +void grpc_lb_policy_cancel_pick_locked(grpc_exec_ctx* exec_ctx, + grpc_lb_policy* policy, grpc_connected_subchannel** target, grpc_error* error); /** Cancel all pending picks for which their \a initial_metadata_flags (as given in the call to \a grpc_lb_policy_pick) matches \a initial_metadata_flags_eq when AND'd with \a initial_metadata_flags_mask */ -void grpc_lb_policy_cancel_picks_locked(grpc_lb_policy* policy, +void grpc_lb_policy_cancel_picks_locked(grpc_exec_ctx* exec_ctx, + grpc_lb_policy* policy, uint32_t initial_metadata_flags_mask, uint32_t initial_metadata_flags_eq, grpc_error* error); /** Try to enter a READY connectivity state */ -void grpc_lb_policy_exit_idle_locked(grpc_lb_policy* policy); +void grpc_lb_policy_exit_idle_locked(grpc_exec_ctx* exec_ctx, + grpc_lb_policy* policy); /* Call notify when the connectivity state of a channel changes from \a *state. * Updates \a *state with the new state of the policy */ void grpc_lb_policy_notify_on_state_change_locked( - grpc_lb_policy* policy, grpc_connectivity_state* state, - grpc_closure* closure); + grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, + grpc_connectivity_state* state, grpc_closure* closure); grpc_connectivity_state grpc_lb_policy_check_connectivity_locked( - grpc_lb_policy* policy, grpc_error** connectivity_error); + grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, + grpc_error** connectivity_error); /** Update \a policy with \a lb_policy_args. */ -void grpc_lb_policy_update_locked(grpc_lb_policy* policy, +void grpc_lb_policy_update_locked(grpc_exec_ctx* exec_ctx, + grpc_lb_policy* policy, const grpc_lb_policy_args* lb_policy_args); /** Set the re-resolution closure to \a request_reresolution. */ void grpc_lb_policy_set_reresolve_closure_locked( - grpc_lb_policy* policy, grpc_closure* request_reresolution); + grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, + grpc_closure* request_reresolution); /** Try to request a re-resolution. It's NOT a public API; it's only for use by the LB policy implementations. */ -void grpc_lb_policy_try_reresolve(grpc_lb_policy* policy, +void grpc_lb_policy_try_reresolve(grpc_exec_ctx* exec_ctx, + grpc_lb_policy* policy, grpc_core::TraceFlag* grpc_lb_trace, grpc_error* error); diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc index 3eedb08ecc0..6d9fadaf306 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc @@ -25,12 +25,14 @@ #include "src/core/lib/iomgr/error.h" #include "src/core/lib/profiling/timers.h" -static grpc_error* init_channel_elem(grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) {} typedef struct { // Stats object to update. @@ -45,24 +47,28 @@ typedef struct { bool recv_initial_metadata_succeeded; } call_data; -static void on_complete_for_send(void* arg, grpc_error* error) { +static void on_complete_for_send(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { call_data* calld = (call_data*)arg; if (error == GRPC_ERROR_NONE) { calld->send_initial_metadata_succeeded = true; } - GRPC_CLOSURE_RUN(calld->original_on_complete_for_send, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(exec_ctx, calld->original_on_complete_for_send, + GRPC_ERROR_REF(error)); } -static void recv_initial_metadata_ready(void* arg, grpc_error* error) { +static void recv_initial_metadata_ready(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { call_data* calld = (call_data*)arg; if (error == GRPC_ERROR_NONE) { calld->recv_initial_metadata_succeeded = true; } - GRPC_CLOSURE_RUN(calld->original_recv_initial_metadata_ready, + GRPC_CLOSURE_RUN(exec_ctx, calld->original_recv_initial_metadata_ready, GRPC_ERROR_REF(error)); } -static grpc_error* init_call_elem(grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; // Get stats object from context and take a ref. @@ -75,7 +81,7 @@ static grpc_error* init_call_elem(grpc_call_element* elem, return GRPC_ERROR_NONE; } -static void destroy_call_elem(grpc_call_element* elem, +static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { call_data* calld = (call_data*)elem->call_data; @@ -90,7 +96,8 @@ static void destroy_call_elem(grpc_call_element* elem, } static void start_transport_stream_op_batch( - grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_transport_stream_op_batch* batch) { call_data* calld = (call_data*)elem->call_data; GPR_TIMER_BEGIN("clr_start_transport_stream_op_batch", 0); // Intercept send_initial_metadata. @@ -111,7 +118,7 @@ static void start_transport_stream_op_batch( &calld->recv_initial_metadata_ready; } // Chain to next filter. - grpc_call_next_op(elem, batch); + grpc_call_next_op(exec_ctx, elem, batch); GPR_TIMER_END("clr_start_transport_stream_op_batch", 0); } diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index eadeea03684..db06fc20b60 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -131,12 +131,12 @@ grpc_core::TraceFlag grpc_lb_glb_trace(false, "glb"); /* add lb_token of selected subchannel (address) to the call's initial * metadata */ static grpc_error* initial_metadata_add_lb_token( - grpc_metadata_batch* initial_metadata, + grpc_exec_ctx* exec_ctx, grpc_metadata_batch* initial_metadata, grpc_linked_mdelem* lb_token_mdelem_storage, grpc_mdelem lb_token) { GPR_ASSERT(lb_token_mdelem_storage != nullptr); GPR_ASSERT(!GRPC_MDISNULL(lb_token)); - return grpc_metadata_batch_add_tail(initial_metadata, lb_token_mdelem_storage, - lb_token); + return grpc_metadata_batch_add_tail(exec_ctx, initial_metadata, + lb_token_mdelem_storage, lb_token); } static void destroy_client_stats(void* arg) { @@ -186,19 +186,20 @@ typedef struct wrapped_rr_closure_arg { /* The \a on_complete closure passed as part of the pick requires keeping a * reference to its associated round robin instance. We wrap this closure in * order to unref the round robin instance upon its invocation */ -static void wrapped_rr_closure(void* arg, grpc_error* error) { +static void wrapped_rr_closure(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { wrapped_rr_closure_arg* wc_arg = (wrapped_rr_closure_arg*)arg; GPR_ASSERT(wc_arg->wrapped_closure != nullptr); - GRPC_CLOSURE_SCHED(wc_arg->wrapped_closure, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(exec_ctx, wc_arg->wrapped_closure, GRPC_ERROR_REF(error)); if (wc_arg->rr_policy != nullptr) { - /* if *target is nullptr, no pick has been made by the RR policy (eg, all + /* if *target is NULL, no pick has been made by the RR policy (eg, all * addresses failed to connect). There won't be any user_data/token * available */ if (*wc_arg->target != nullptr) { if (!GRPC_MDISNULL(wc_arg->lb_token)) { - initial_metadata_add_lb_token(wc_arg->initial_metadata, + initial_metadata_add_lb_token(exec_ctx, wc_arg->initial_metadata, wc_arg->lb_token_mdelem_storage, GRPC_MDELEM_REF(wc_arg->lb_token)); } else { @@ -220,7 +221,7 @@ static void wrapped_rr_closure(void* arg, grpc_error* error) { gpr_log(GPR_INFO, "[grpclb %p] Unreffing RR %p", wc_arg->glb_policy, wc_arg->rr_policy); } - GRPC_LB_POLICY_UNREF(wc_arg->rr_policy, "wrapped_rr_closure"); + GRPC_LB_POLICY_UNREF(exec_ctx, wc_arg->rr_policy, "wrapped_rr_closure"); } GPR_ASSERT(wc_arg->free_when_done != nullptr); gpr_free(wc_arg->free_when_done); @@ -240,8 +241,8 @@ typedef struct pending_pick { /* original pick()'s arguments */ grpc_lb_policy_pick_args pick_args; - /* output argument where to store the pick()ed connected subchannel, or - * nullptr upon error. */ + /* output argument where to store the pick()ed connected subchannel, or NULL + * upon error. */ grpc_connected_subchannel** target; /* args for wrapped_on_complete */ @@ -327,8 +328,8 @@ typedef struct glb_lb_policy { /** connectivity state of the LB channel */ grpc_connectivity_state lb_channel_connectivity; - /** stores the deserialized response from the LB. May be nullptr until one - * such response has arrived. */ + /** stores the deserialized response from the LB. May be NULL until one such + * response has arrived. */ grpc_grpclb_serverlist* serverlist; /** Index into serverlist for next pick. @@ -458,9 +459,9 @@ static void* lb_token_copy(void* token) { ? nullptr : (void*)GRPC_MDELEM_REF(grpc_mdelem{(uintptr_t)token}).payload; } -static void lb_token_destroy(void* token) { +static void lb_token_destroy(grpc_exec_ctx* exec_ctx, void* token) { if (token != nullptr) { - GRPC_MDELEM_UNREF(grpc_mdelem{(uintptr_t)token}); + GRPC_MDELEM_UNREF(exec_ctx, grpc_mdelem{(uintptr_t)token}); } } static int lb_token_cmp(void* token1, void* token2) { @@ -496,7 +497,7 @@ static void parse_server(const grpc_grpclb_server* server, /* Returns addresses extracted from \a serverlist. */ static grpc_lb_addresses* process_serverlist_locked( - const grpc_grpclb_serverlist* serverlist) { + grpc_exec_ctx* exec_ctx, const grpc_grpclb_serverlist* serverlist) { size_t num_valid = 0; /* first pass: count how many are valid in order to allocate the necessary * memory in a single block */ @@ -527,9 +528,9 @@ static grpc_lb_addresses* process_serverlist_locked( strnlen(server->load_balance_token, lb_token_max_length); grpc_slice lb_token_mdstr = grpc_slice_from_copied_buffer( server->load_balance_token, lb_token_length); - user_data = - (void*)grpc_mdelem_from_slices(GRPC_MDSTR_LB_TOKEN, lb_token_mdstr) - .payload; + user_data = (void*)grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_LB_TOKEN, + lb_token_mdstr) + .payload; } else { char* uri = grpc_sockaddr_to_uri(&addr); gpr_log(GPR_INFO, @@ -551,7 +552,7 @@ static grpc_lb_addresses* process_serverlist_locked( /* Returns the backend addresses extracted from the given addresses */ static grpc_lb_addresses* extract_backend_addresses_locked( - const grpc_lb_addresses* addresses) { + grpc_exec_ctx* exec_ctx, const grpc_lb_addresses* addresses) { /* first pass: count the number of backend addresses */ size_t num_backends = 0; for (size_t i = 0; i < addresses->num_addresses; ++i) { @@ -576,8 +577,8 @@ static grpc_lb_addresses* extract_backend_addresses_locked( } static void update_lb_connectivity_status_locked( - glb_lb_policy* glb_policy, grpc_connectivity_state rr_state, - grpc_error* rr_state_error) { + grpc_exec_ctx* exec_ctx, glb_lb_policy* glb_policy, + grpc_connectivity_state rr_state, grpc_error* rr_state_error) { const grpc_connectivity_state curr_glb_state = grpc_connectivity_state_check(&glb_policy->state_tracker); @@ -629,7 +630,7 @@ static void update_lb_connectivity_status_locked( glb_policy, grpc_connectivity_state_name(rr_state), glb_policy->rr_policy); } - grpc_connectivity_state_set(&glb_policy->state_tracker, rr_state, + grpc_connectivity_state_set(exec_ctx, &glb_policy->state_tracker, rr_state, rr_state_error, "update_lb_connectivity_status_locked"); } @@ -640,9 +641,9 @@ static void update_lb_connectivity_status_locked( * If \a force_async is true, then we will manually schedule the * completion callback even if the pick is available immediately. */ static bool pick_from_internal_rr_locked( - glb_lb_policy* glb_policy, const grpc_lb_policy_pick_args* pick_args, - bool force_async, grpc_connected_subchannel** target, - wrapped_rr_closure_arg* wc_arg) { + grpc_exec_ctx* exec_ctx, glb_lb_policy* glb_policy, + const grpc_lb_policy_pick_args* pick_args, bool force_async, + grpc_connected_subchannel** target, wrapped_rr_closure_arg* wc_arg) { // Check for drops if we are not using fallback backend addresses. if (glb_policy->serverlist != nullptr) { // Look at the index into the serverlist to see if we should drop this call. @@ -657,7 +658,7 @@ static bool pick_from_internal_rr_locked( gpr_log(GPR_INFO, "[grpclb %p] Unreffing RR %p for drop", glb_policy, wc_arg->rr_policy); } - GRPC_LB_POLICY_UNREF(wc_arg->rr_policy, "glb_pick_sync"); + GRPC_LB_POLICY_UNREF(exec_ctx, wc_arg->rr_policy, "glb_pick_sync"); // Update client load reporting stats to indicate the number of // dropped calls. Note that we have to do this here instead of in // the client_load_reporting filter, because we do not create a @@ -669,7 +670,7 @@ static bool pick_from_internal_rr_locked( grpc_grpclb_client_stats_unref(wc_arg->client_stats); if (force_async) { GPR_ASSERT(wc_arg->wrapped_closure != nullptr); - GRPC_CLOSURE_SCHED(wc_arg->wrapped_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, wc_arg->wrapped_closure, GRPC_ERROR_NONE); gpr_free(wc_arg->free_when_done); return false; } @@ -679,7 +680,7 @@ static bool pick_from_internal_rr_locked( } // Pick via the RR policy. const bool pick_done = grpc_lb_policy_pick_locked( - wc_arg->rr_policy, pick_args, target, wc_arg->context, + exec_ctx, wc_arg->rr_policy, pick_args, target, wc_arg->context, (void**)&wc_arg->lb_token, &wc_arg->wrapper_closure); if (pick_done) { /* synchronous grpc_lb_policy_pick call. Unref the RR policy. */ @@ -687,9 +688,9 @@ static bool pick_from_internal_rr_locked( gpr_log(GPR_INFO, "[grpclb %p] Unreffing RR %p", glb_policy, wc_arg->rr_policy); } - GRPC_LB_POLICY_UNREF(wc_arg->rr_policy, "glb_pick_sync"); + GRPC_LB_POLICY_UNREF(exec_ctx, wc_arg->rr_policy, "glb_pick_sync"); /* add the load reporting initial metadata */ - initial_metadata_add_lb_token(pick_args->initial_metadata, + initial_metadata_add_lb_token(exec_ctx, pick_args->initial_metadata, pick_args->lb_token_mdelem_storage, GRPC_MDELEM_REF(wc_arg->lb_token)); // Pass on client stats via context. Passes ownership of the reference. @@ -698,7 +699,7 @@ static bool pick_from_internal_rr_locked( wc_arg->context[GRPC_GRPCLB_CLIENT_STATS].destroy = destroy_client_stats; if (force_async) { GPR_ASSERT(wc_arg->wrapped_closure != nullptr); - GRPC_CLOSURE_SCHED(wc_arg->wrapped_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, wc_arg->wrapped_closure, GRPC_ERROR_NONE); gpr_free(wc_arg->free_when_done); return false; } @@ -711,11 +712,12 @@ static bool pick_from_internal_rr_locked( return pick_done; } -static grpc_lb_policy_args* lb_policy_args_create(glb_lb_policy* glb_policy) { +static grpc_lb_policy_args* lb_policy_args_create(grpc_exec_ctx* exec_ctx, + glb_lb_policy* glb_policy) { grpc_lb_addresses* addresses; if (glb_policy->serverlist != nullptr) { GPR_ASSERT(glb_policy->serverlist->num_servers > 0); - addresses = process_serverlist_locked(glb_policy->serverlist); + addresses = process_serverlist_locked(exec_ctx, glb_policy->serverlist); } else { // If rr_handover_locked() is invoked when we haven't received any // serverlist from the balancer, we use the fallback backends returned by @@ -735,21 +737,24 @@ static grpc_lb_policy_args* lb_policy_args_create(glb_lb_policy* glb_policy) { args->args = grpc_channel_args_copy_and_add_and_remove( glb_policy->args, keys_to_remove, GPR_ARRAY_SIZE(keys_to_remove), &arg, 1); - grpc_lb_addresses_destroy(addresses); + grpc_lb_addresses_destroy(exec_ctx, addresses); return args; } -static void lb_policy_args_destroy(grpc_lb_policy_args* args) { - grpc_channel_args_destroy(args->args); +static void lb_policy_args_destroy(grpc_exec_ctx* exec_ctx, + grpc_lb_policy_args* args) { + grpc_channel_args_destroy(exec_ctx, args->args); gpr_free(args); } -static void glb_rr_connectivity_changed_locked(void* arg, grpc_error* error); -static void create_rr_locked(glb_lb_policy* glb_policy, +static void glb_rr_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, + void* arg, grpc_error* error); +static void create_rr_locked(grpc_exec_ctx* exec_ctx, glb_lb_policy* glb_policy, grpc_lb_policy_args* args) { GPR_ASSERT(glb_policy->rr_policy == nullptr); - grpc_lb_policy* new_rr_policy = grpc_lb_policy_create("round_robin", args); + grpc_lb_policy* new_rr_policy = + grpc_lb_policy_create(exec_ctx, "round_robin", args); if (new_rr_policy == nullptr) { gpr_log(GPR_ERROR, "[grpclb %p] Failure creating a RoundRobin policy for serverlist " @@ -762,19 +767,21 @@ static void create_rr_locked(glb_lb_policy* glb_policy, return; } grpc_lb_policy_set_reresolve_closure_locked( - new_rr_policy, glb_policy->base.request_reresolution); + exec_ctx, new_rr_policy, glb_policy->base.request_reresolution); glb_policy->base.request_reresolution = nullptr; glb_policy->rr_policy = new_rr_policy; grpc_error* rr_state_error = nullptr; const grpc_connectivity_state rr_state = - grpc_lb_policy_check_connectivity_locked(glb_policy->rr_policy, + grpc_lb_policy_check_connectivity_locked(exec_ctx, glb_policy->rr_policy, &rr_state_error); /* Connectivity state is a function of the RR policy updated/created */ - update_lb_connectivity_status_locked(glb_policy, rr_state, rr_state_error); + update_lb_connectivity_status_locked(exec_ctx, glb_policy, rr_state, + rr_state_error); /* Add the gRPC LB's interested_parties pollset_set to that of the newly * created RR policy. This will make the RR policy progress upon activity on * gRPC LB, which in turn is tied to the application's call */ - grpc_pollset_set_add_pollset_set(glb_policy->rr_policy->interested_parties, + grpc_pollset_set_add_pollset_set(exec_ctx, + glb_policy->rr_policy->interested_parties, glb_policy->base.interested_parties); /* Allocate the data for the tracking of the new RR policy's connectivity. @@ -789,10 +796,10 @@ static void create_rr_locked(glb_lb_policy* glb_policy, /* Subscribe to changes to the connectivity of the new RR */ GRPC_LB_POLICY_WEAK_REF(&glb_policy->base, "glb_rr_connectivity_cb"); - grpc_lb_policy_notify_on_state_change_locked(glb_policy->rr_policy, + grpc_lb_policy_notify_on_state_change_locked(exec_ctx, glb_policy->rr_policy, &rr_connectivity->state, &rr_connectivity->on_change); - grpc_lb_policy_exit_idle_locked(glb_policy->rr_policy); + grpc_lb_policy_exit_idle_locked(exec_ctx, glb_policy->rr_policy); /* Update picks and pings in wait */ pending_pick* pp; @@ -807,7 +814,7 @@ static void create_rr_locked(glb_lb_policy* glb_policy, "[grpclb %p] Pending pick about to (async) PICK from RR %p", glb_policy, glb_policy->rr_policy); } - pick_from_internal_rr_locked(glb_policy, &pp->pick_args, + pick_from_internal_rr_locked(exec_ctx, glb_policy, &pp->pick_args, true /* force_async */, pp->target, &pp->wrapped_on_complete_arg); } @@ -821,37 +828,40 @@ static void create_rr_locked(glb_lb_policy* glb_policy, gpr_log(GPR_INFO, "[grpclb %p] Pending ping about to PING from RR %p", glb_policy, glb_policy->rr_policy); } - grpc_lb_policy_ping_one_locked(glb_policy->rr_policy, + grpc_lb_policy_ping_one_locked(exec_ctx, glb_policy->rr_policy, &pping->wrapped_notify_arg.wrapper_closure); } } -/* glb_policy->rr_policy may be nullptr (initial handover) */ -static void rr_handover_locked(glb_lb_policy* glb_policy) { +/* glb_policy->rr_policy may be NULL (initial handover) */ +static void rr_handover_locked(grpc_exec_ctx* exec_ctx, + glb_lb_policy* glb_policy) { if (glb_policy->shutting_down) return; - grpc_lb_policy_args* args = lb_policy_args_create(glb_policy); + grpc_lb_policy_args* args = lb_policy_args_create(exec_ctx, glb_policy); GPR_ASSERT(args != nullptr); if (glb_policy->rr_policy != nullptr) { if (grpc_lb_glb_trace.enabled()) { gpr_log(GPR_DEBUG, "[grpclb %p] Updating RR policy %p", glb_policy, glb_policy->rr_policy); } - grpc_lb_policy_update_locked(glb_policy->rr_policy, args); + grpc_lb_policy_update_locked(exec_ctx, glb_policy->rr_policy, args); } else { - create_rr_locked(glb_policy, args); + create_rr_locked(exec_ctx, glb_policy, args); if (grpc_lb_glb_trace.enabled()) { gpr_log(GPR_DEBUG, "[grpclb %p] Created new RR policy %p", glb_policy, glb_policy->rr_policy); } } - lb_policy_args_destroy(args); + lb_policy_args_destroy(exec_ctx, args); } -static void glb_rr_connectivity_changed_locked(void* arg, grpc_error* error) { +static void glb_rr_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, + void* arg, grpc_error* error) { rr_connectivity_data* rr_connectivity = (rr_connectivity_data*)arg; glb_lb_policy* glb_policy = rr_connectivity->glb_policy; if (glb_policy->shutting_down) { - GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "glb_rr_connectivity_cb"); + GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, + "glb_rr_connectivity_cb"); gpr_free(rr_connectivity); return; } @@ -859,22 +869,25 @@ static void glb_rr_connectivity_changed_locked(void* arg, grpc_error* error) { /* An RR policy that has transitioned into the SHUTDOWN connectivity state * should not be considered for picks or updates: the SHUTDOWN state is a * sink, policies can't transition back from it. .*/ - GRPC_LB_POLICY_UNREF(glb_policy->rr_policy, "rr_connectivity_shutdown"); + GRPC_LB_POLICY_UNREF(exec_ctx, glb_policy->rr_policy, + "rr_connectivity_shutdown"); glb_policy->rr_policy = nullptr; - GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "glb_rr_connectivity_cb"); + GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, + "glb_rr_connectivity_cb"); gpr_free(rr_connectivity); return; } /* rr state != SHUTDOWN && !glb_policy->shutting down: biz as usual */ - update_lb_connectivity_status_locked(glb_policy, rr_connectivity->state, - GRPC_ERROR_REF(error)); + update_lb_connectivity_status_locked( + exec_ctx, glb_policy, rr_connectivity->state, GRPC_ERROR_REF(error)); /* Resubscribe. Reuse the "glb_rr_connectivity_cb" weak ref. */ - grpc_lb_policy_notify_on_state_change_locked(glb_policy->rr_policy, + grpc_lb_policy_notify_on_state_change_locked(exec_ctx, glb_policy->rr_policy, &rr_connectivity->state, &rr_connectivity->on_change); } -static void destroy_balancer_name(void* balancer_name) { +static void destroy_balancer_name(grpc_exec_ctx* exec_ctx, + void* balancer_name) { gpr_free(balancer_name); } @@ -901,7 +914,7 @@ static int balancer_name_cmp_fn(void* a, void* b) { * above the grpclb policy. * - \a args: other args inherited from the grpclb policy. */ static grpc_channel_args* build_lb_channel_args( - const grpc_lb_addresses* addresses, + grpc_exec_ctx* exec_ctx, const grpc_lb_addresses* addresses, grpc_fake_resolver_response_generator* response_generator, const grpc_channel_args* args) { size_t num_grpclb_addrs = 0; @@ -944,7 +957,7 @@ static grpc_channel_args* build_lb_channel_args( gpr_free(targets_info_entries); grpc_channel_args* lb_channel_args = - grpc_lb_policy_grpclb_build_lb_channel_args(targets_info, + grpc_lb_policy_grpclb_build_lb_channel_args(exec_ctx, targets_info, response_generator, args); grpc_arg lb_channel_addresses_arg = @@ -952,34 +965,34 @@ static grpc_channel_args* build_lb_channel_args( grpc_channel_args* result = grpc_channel_args_copy_and_add( lb_channel_args, &lb_channel_addresses_arg, 1); - grpc_slice_hash_table_unref(targets_info); - grpc_channel_args_destroy(lb_channel_args); - grpc_lb_addresses_destroy(lb_addresses); + grpc_slice_hash_table_unref(exec_ctx, targets_info); + grpc_channel_args_destroy(exec_ctx, lb_channel_args); + grpc_lb_addresses_destroy(exec_ctx, lb_addresses); return result; } -static void glb_destroy(grpc_lb_policy* pol) { +static void glb_destroy(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { glb_lb_policy* glb_policy = (glb_lb_policy*)pol; GPR_ASSERT(glb_policy->pending_picks == nullptr); GPR_ASSERT(glb_policy->pending_pings == nullptr); gpr_free((void*)glb_policy->server_name); - grpc_channel_args_destroy(glb_policy->args); + grpc_channel_args_destroy(exec_ctx, glb_policy->args); if (glb_policy->client_stats != nullptr) { grpc_grpclb_client_stats_unref(glb_policy->client_stats); } - grpc_connectivity_state_destroy(&glb_policy->state_tracker); + grpc_connectivity_state_destroy(exec_ctx, &glb_policy->state_tracker); if (glb_policy->serverlist != nullptr) { grpc_grpclb_destroy_serverlist(glb_policy->serverlist); } if (glb_policy->fallback_backend_addresses != nullptr) { - grpc_lb_addresses_destroy(glb_policy->fallback_backend_addresses); + grpc_lb_addresses_destroy(exec_ctx, glb_policy->fallback_backend_addresses); } grpc_fake_resolver_response_generator_unref(glb_policy->response_generator); grpc_subchannel_index_unref(); gpr_free(glb_policy); } -static void glb_shutdown_locked(grpc_lb_policy* pol) { +static void glb_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { glb_lb_policy* glb_policy = (glb_lb_policy*)pol; grpc_error* error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Channel shutdown"); glb_policy->shutting_down = true; @@ -998,11 +1011,11 @@ static void glb_shutdown_locked(grpc_lb_policy* pol) { /* lb_on_server_status_received will pick up the cancel and clean up */ } if (glb_policy->retry_timer_active) { - grpc_timer_cancel(&glb_policy->lb_call_retry_timer); + grpc_timer_cancel(exec_ctx, &glb_policy->lb_call_retry_timer); glb_policy->retry_timer_active = false; } if (glb_policy->fallback_timer_active) { - grpc_timer_cancel(&glb_policy->lb_fallback_timer); + grpc_timer_cancel(exec_ctx, &glb_policy->lb_fallback_timer); glb_policy->fallback_timer_active = false; } @@ -1011,9 +1024,10 @@ static void glb_shutdown_locked(grpc_lb_policy* pol) { pending_ping* pping = glb_policy->pending_pings; glb_policy->pending_pings = nullptr; if (glb_policy->rr_policy != nullptr) { - GRPC_LB_POLICY_UNREF(glb_policy->rr_policy, "glb_shutdown"); + GRPC_LB_POLICY_UNREF(exec_ctx, glb_policy->rr_policy, "glb_shutdown"); } else { - grpc_lb_policy_try_reresolve(pol, &grpc_lb_glb_trace, GRPC_ERROR_CANCELLED); + grpc_lb_policy_try_reresolve(exec_ctx, pol, &grpc_lb_glb_trace, + GRPC_ERROR_CANCELLED); } // We destroy the LB channel here because // glb_lb_channel_on_connectivity_changed_cb needs a valid glb_policy @@ -1023,13 +1037,14 @@ static void glb_shutdown_locked(grpc_lb_policy* pol) { grpc_channel_destroy(glb_policy->lb_channel); glb_policy->lb_channel = nullptr; } - grpc_connectivity_state_set(&glb_policy->state_tracker, GRPC_CHANNEL_SHUTDOWN, - GRPC_ERROR_REF(error), "glb_shutdown"); + grpc_connectivity_state_set(exec_ctx, &glb_policy->state_tracker, + GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_REF(error), + "glb_shutdown"); while (pp != nullptr) { pending_pick* next = pp->next; *pp->target = nullptr; - GRPC_CLOSURE_SCHED(&pp->wrapped_on_complete_arg.wrapper_closure, + GRPC_CLOSURE_SCHED(exec_ctx, &pp->wrapped_on_complete_arg.wrapper_closure, GRPC_ERROR_REF(error)); gpr_free(pp); pp = next; @@ -1037,7 +1052,7 @@ static void glb_shutdown_locked(grpc_lb_policy* pol) { while (pping != nullptr) { pending_ping* next = pping->next; - GRPC_CLOSURE_SCHED(&pping->wrapped_notify_arg.wrapper_closure, + GRPC_CLOSURE_SCHED(exec_ctx, &pping->wrapped_notify_arg.wrapper_closure, GRPC_ERROR_REF(error)); gpr_free(pping); pping = next; @@ -1054,8 +1069,8 @@ static void glb_shutdown_locked(grpc_lb_policy* pol) { // pick needs also be cancelled by the RR instance. // - Otherwise, without an RR instance, picks stay pending at this policy's // level (grpclb), inside the glb_policy->pending_picks list. To cancel these, -// we invoke the completion closure and set *target to nullptr right here. -static void glb_cancel_pick_locked(grpc_lb_policy* pol, +// we invoke the completion closure and set *target to NULL right here. +static void glb_cancel_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, grpc_connected_subchannel** target, grpc_error* error) { glb_lb_policy* glb_policy = (glb_lb_policy*)pol; @@ -1065,7 +1080,7 @@ static void glb_cancel_pick_locked(grpc_lb_policy* pol, pending_pick* next = pp->next; if (pp->target == target) { *target = nullptr; - GRPC_CLOSURE_SCHED(&pp->wrapped_on_complete_arg.wrapper_closure, + GRPC_CLOSURE_SCHED(exec_ctx, &pp->wrapped_on_complete_arg.wrapper_closure, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Pick Cancelled", &error, 1)); } else { @@ -1075,7 +1090,7 @@ static void glb_cancel_pick_locked(grpc_lb_policy* pol, pp = next; } if (glb_policy->rr_policy != nullptr) { - grpc_lb_policy_cancel_pick_locked(glb_policy->rr_policy, target, + grpc_lb_policy_cancel_pick_locked(exec_ctx, glb_policy->rr_policy, target, GRPC_ERROR_REF(error)); } GRPC_ERROR_UNREF(error); @@ -1090,8 +1105,9 @@ static void glb_cancel_pick_locked(grpc_lb_policy* pol, // pick needs also be cancelled by the RR instance. // - Otherwise, without an RR instance, picks stay pending at this policy's // level (grpclb), inside the glb_policy->pending_picks list. To cancel these, -// we invoke the completion closure and set *target to nullptr right here. -static void glb_cancel_picks_locked(grpc_lb_policy* pol, +// we invoke the completion closure and set *target to NULL right here. +static void glb_cancel_picks_locked(grpc_exec_ctx* exec_ctx, + grpc_lb_policy* pol, uint32_t initial_metadata_flags_mask, uint32_t initial_metadata_flags_eq, grpc_error* error) { @@ -1102,7 +1118,7 @@ static void glb_cancel_picks_locked(grpc_lb_policy* pol, pending_pick* next = pp->next; if ((pp->pick_args.initial_metadata_flags & initial_metadata_flags_mask) == initial_metadata_flags_eq) { - GRPC_CLOSURE_SCHED(&pp->wrapped_on_complete_arg.wrapper_closure, + GRPC_CLOSURE_SCHED(exec_ctx, &pp->wrapped_on_complete_arg.wrapper_closure, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Pick Cancelled", &error, 1)); } else { @@ -1113,49 +1129,52 @@ static void glb_cancel_picks_locked(grpc_lb_policy* pol, } if (glb_policy->rr_policy != nullptr) { grpc_lb_policy_cancel_picks_locked( - glb_policy->rr_policy, initial_metadata_flags_mask, + exec_ctx, glb_policy->rr_policy, initial_metadata_flags_mask, initial_metadata_flags_eq, GRPC_ERROR_REF(error)); } GRPC_ERROR_UNREF(error); } -static void lb_on_fallback_timer_locked(void* arg, grpc_error* error); -static void query_for_backends_locked(glb_lb_policy* glb_policy); -static void start_picking_locked(glb_lb_policy* glb_policy) { +static void lb_on_fallback_timer_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error); +static void query_for_backends_locked(grpc_exec_ctx* exec_ctx, + glb_lb_policy* glb_policy); +static void start_picking_locked(grpc_exec_ctx* exec_ctx, + glb_lb_policy* glb_policy) { /* start a timer to fall back */ if (glb_policy->lb_fallback_timeout_ms > 0 && glb_policy->serverlist == nullptr && !glb_policy->fallback_timer_active) { grpc_millis deadline = - grpc_core::ExecCtx::Get()->Now() + glb_policy->lb_fallback_timeout_ms; + grpc_exec_ctx_now(exec_ctx) + glb_policy->lb_fallback_timeout_ms; GRPC_LB_POLICY_WEAK_REF(&glb_policy->base, "grpclb_fallback_timer"); GRPC_CLOSURE_INIT(&glb_policy->lb_on_fallback, lb_on_fallback_timer_locked, glb_policy, grpc_combiner_scheduler(glb_policy->base.combiner)); glb_policy->fallback_timer_active = true; - grpc_timer_init(&glb_policy->lb_fallback_timer, deadline, + grpc_timer_init(exec_ctx, &glb_policy->lb_fallback_timer, deadline, &glb_policy->lb_on_fallback); } glb_policy->started_picking = true; grpc_backoff_reset(&glb_policy->lb_call_backoff_state); - query_for_backends_locked(glb_policy); + query_for_backends_locked(exec_ctx, glb_policy); } -static void glb_exit_idle_locked(grpc_lb_policy* pol) { +static void glb_exit_idle_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { glb_lb_policy* glb_policy = (glb_lb_policy*)pol; if (!glb_policy->started_picking) { - start_picking_locked(glb_policy); + start_picking_locked(exec_ctx, glb_policy); } } -static int glb_pick_locked(grpc_lb_policy* pol, +static int glb_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, const grpc_lb_policy_pick_args* pick_args, grpc_connected_subchannel** target, grpc_call_context_element* context, void** user_data, grpc_closure* on_complete) { if (pick_args->lb_token_mdelem_storage == nullptr) { *target = nullptr; - GRPC_CLOSURE_SCHED(on_complete, + GRPC_CLOSURE_SCHED(exec_ctx, on_complete, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "No mdelem storage for the LB token. Load reporting " "won't work without it. Failing")); @@ -1165,8 +1184,8 @@ static int glb_pick_locked(grpc_lb_policy* pol, bool pick_done = false; if (glb_policy->rr_policy != nullptr) { const grpc_connectivity_state rr_connectivity_state = - grpc_lb_policy_check_connectivity_locked(glb_policy->rr_policy, - nullptr); + grpc_lb_policy_check_connectivity_locked( + exec_ctx, glb_policy->rr_policy, nullptr); // The glb_policy->rr_policy may have transitioned to SHUTDOWN but the // callback registered to capture this event // (glb_rr_connectivity_changed_locked) may not have been invoked yet. We @@ -1203,8 +1222,9 @@ static int glb_pick_locked(grpc_lb_policy* pol, wc_arg->initial_metadata = pick_args->initial_metadata; wc_arg->free_when_done = wc_arg; wc_arg->glb_policy = pol; - pick_done = pick_from_internal_rr_locked( - glb_policy, pick_args, false /* force_async */, target, wc_arg); + pick_done = + pick_from_internal_rr_locked(exec_ctx, glb_policy, pick_args, + false /* force_async */, target, wc_arg); } } else { // glb_policy->rr_policy == NULL if (grpc_lb_glb_trace.enabled()) { @@ -1215,7 +1235,7 @@ static int glb_pick_locked(grpc_lb_policy* pol, add_pending_pick(&glb_policy->pending_picks, pick_args, target, context, on_complete); if (!glb_policy->started_picking) { - start_picking_locked(glb_policy); + start_picking_locked(exec_ctx, glb_policy); } pick_done = false; } @@ -1223,33 +1243,37 @@ static int glb_pick_locked(grpc_lb_policy* pol, } static grpc_connectivity_state glb_check_connectivity_locked( - grpc_lb_policy* pol, grpc_error** connectivity_error) { + grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, + grpc_error** connectivity_error) { glb_lb_policy* glb_policy = (glb_lb_policy*)pol; return grpc_connectivity_state_get(&glb_policy->state_tracker, connectivity_error); } -static void glb_ping_one_locked(grpc_lb_policy* pol, grpc_closure* closure) { +static void glb_ping_one_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, + grpc_closure* closure) { glb_lb_policy* glb_policy = (glb_lb_policy*)pol; if (glb_policy->rr_policy) { - grpc_lb_policy_ping_one_locked(glb_policy->rr_policy, closure); + grpc_lb_policy_ping_one_locked(exec_ctx, glb_policy->rr_policy, closure); } else { add_pending_ping(&glb_policy->pending_pings, closure); if (!glb_policy->started_picking) { - start_picking_locked(glb_policy); + start_picking_locked(exec_ctx, glb_policy); } } } -static void glb_notify_on_state_change_locked(grpc_lb_policy* pol, +static void glb_notify_on_state_change_locked(grpc_exec_ctx* exec_ctx, + grpc_lb_policy* pol, grpc_connectivity_state* current, grpc_closure* notify) { glb_lb_policy* glb_policy = (glb_lb_policy*)pol; - grpc_connectivity_state_notify_on_state_change(&glb_policy->state_tracker, - current, notify); + grpc_connectivity_state_notify_on_state_change( + exec_ctx, &glb_policy->state_tracker, current, notify); } -static void lb_call_on_retry_timer_locked(void* arg, grpc_error* error) { +static void lb_call_on_retry_timer_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { glb_lb_policy* glb_policy = (glb_lb_policy*)arg; glb_policy->retry_timer_active = false; if (!glb_policy->shutting_down && glb_policy->lb_call == nullptr && @@ -1257,26 +1281,28 @@ static void lb_call_on_retry_timer_locked(void* arg, grpc_error* error) { if (grpc_lb_glb_trace.enabled()) { gpr_log(GPR_INFO, "[grpclb %p] Restarting call to LB server", glb_policy); } - query_for_backends_locked(glb_policy); + query_for_backends_locked(exec_ctx, glb_policy); } - GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "grpclb_retry_timer"); + GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, "grpclb_retry_timer"); } -static void maybe_restart_lb_call(glb_lb_policy* glb_policy) { +static void maybe_restart_lb_call(grpc_exec_ctx* exec_ctx, + glb_lb_policy* glb_policy) { if (glb_policy->started_picking && glb_policy->updating_lb_call) { if (glb_policy->retry_timer_active) { - grpc_timer_cancel(&glb_policy->lb_call_retry_timer); + grpc_timer_cancel(exec_ctx, &glb_policy->lb_call_retry_timer); } - if (!glb_policy->shutting_down) start_picking_locked(glb_policy); + if (!glb_policy->shutting_down) start_picking_locked(exec_ctx, glb_policy); glb_policy->updating_lb_call = false; } else if (!glb_policy->shutting_down) { /* if we aren't shutting down, restart the LB client call after some time */ - grpc_millis next_try = grpc_backoff_step(&glb_policy->lb_call_backoff_state) - .next_attempt_start_time; + grpc_millis next_try = + grpc_backoff_step(exec_ctx, &glb_policy->lb_call_backoff_state) + .next_attempt_start_time; if (grpc_lb_glb_trace.enabled()) { gpr_log(GPR_DEBUG, "[grpclb %p] Connection to LB server lost...", glb_policy); - grpc_millis timeout = next_try - grpc_core::ExecCtx::Get()->Now(); + grpc_millis timeout = next_try - grpc_exec_ctx_now(exec_ctx); if (timeout > 0) { gpr_log(GPR_DEBUG, "[grpclb %p] ... retry_timer_active in %" PRIuPTR "ms.", @@ -1291,40 +1317,43 @@ static void maybe_restart_lb_call(glb_lb_policy* glb_policy) { lb_call_on_retry_timer_locked, glb_policy, grpc_combiner_scheduler(glb_policy->base.combiner)); glb_policy->retry_timer_active = true; - grpc_timer_init(&glb_policy->lb_call_retry_timer, next_try, + grpc_timer_init(exec_ctx, &glb_policy->lb_call_retry_timer, next_try, &glb_policy->lb_on_call_retry); } - GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, + GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, "lb_on_server_status_received_locked"); } -static void send_client_load_report_locked(void* arg, grpc_error* error); +static void send_client_load_report_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error); -static void schedule_next_client_load_report(glb_lb_policy* glb_policy) { +static void schedule_next_client_load_report(grpc_exec_ctx* exec_ctx, + glb_lb_policy* glb_policy) { const grpc_millis next_client_load_report_time = - grpc_core::ExecCtx::Get()->Now() + - glb_policy->client_stats_report_interval; + grpc_exec_ctx_now(exec_ctx) + glb_policy->client_stats_report_interval; GRPC_CLOSURE_INIT(&glb_policy->client_load_report_closure, send_client_load_report_locked, glb_policy, grpc_combiner_scheduler(glb_policy->base.combiner)); - grpc_timer_init(&glb_policy->client_load_report_timer, + grpc_timer_init(exec_ctx, &glb_policy->client_load_report_timer, next_client_load_report_time, &glb_policy->client_load_report_closure); } -static void client_load_report_done_locked(void* arg, grpc_error* error) { +static void client_load_report_done_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { glb_lb_policy* glb_policy = (glb_lb_policy*)arg; grpc_byte_buffer_destroy(glb_policy->client_load_report_payload); glb_policy->client_load_report_payload = nullptr; if (error != GRPC_ERROR_NONE || glb_policy->lb_call == nullptr) { glb_policy->client_load_report_timer_pending = false; - GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "client_load_report"); + GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, + "client_load_report"); if (glb_policy->lb_call == nullptr) { - maybe_restart_lb_call(glb_policy); + maybe_restart_lb_call(exec_ctx, glb_policy); } return; } - schedule_next_client_load_report(glb_policy); + schedule_next_client_load_report(exec_ctx, glb_policy); } static bool load_report_counters_are_zero(grpc_grpclb_request* request) { @@ -1339,13 +1368,15 @@ static bool load_report_counters_are_zero(grpc_grpclb_request* request) { (drop_entries == nullptr || drop_entries->num_entries == 0); } -static void send_client_load_report_locked(void* arg, grpc_error* error) { +static void send_client_load_report_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { glb_lb_policy* glb_policy = (glb_lb_policy*)arg; if (error == GRPC_ERROR_CANCELLED || glb_policy->lb_call == nullptr) { glb_policy->client_load_report_timer_pending = false; - GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "client_load_report"); + GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, + "client_load_report"); if (glb_policy->lb_call == nullptr) { - maybe_restart_lb_call(glb_policy); + maybe_restart_lb_call(exec_ctx, glb_policy); } return; } @@ -1358,7 +1389,7 @@ static void send_client_load_report_locked(void* arg, grpc_error* error) { if (load_report_counters_are_zero(request)) { if (glb_policy->last_client_load_report_counters_were_zero) { grpc_grpclb_request_destroy(request); - schedule_next_client_load_report(glb_policy); + schedule_next_client_load_report(exec_ctx, glb_policy); return; } glb_policy->last_client_load_report_counters_were_zero = true; @@ -1368,7 +1399,7 @@ static void send_client_load_report_locked(void* arg, grpc_error* error) { grpc_slice request_payload_slice = grpc_grpclb_request_encode(request); glb_policy->client_load_report_payload = grpc_raw_byte_buffer_create(&request_payload_slice, 1); - grpc_slice_unref_internal(request_payload_slice); + grpc_slice_unref_internal(exec_ctx, request_payload_slice); grpc_grpclb_request_destroy(request); // Send load report message. grpc_op op; @@ -1379,16 +1410,20 @@ static void send_client_load_report_locked(void* arg, grpc_error* error) { client_load_report_done_locked, glb_policy, grpc_combiner_scheduler(glb_policy->base.combiner)); grpc_call_error call_error = grpc_call_start_batch_and_execute( - glb_policy->lb_call, &op, 1, &glb_policy->client_load_report_closure); + exec_ctx, glb_policy->lb_call, &op, 1, + &glb_policy->client_load_report_closure); if (call_error != GRPC_CALL_OK) { gpr_log(GPR_ERROR, "[grpclb %p] call_error=%d", glb_policy, call_error); GPR_ASSERT(GRPC_CALL_OK == call_error); } } -static void lb_on_server_status_received_locked(void* arg, grpc_error* error); -static void lb_on_response_received_locked(void* arg, grpc_error* error); -static void lb_call_init_locked(glb_lb_policy* glb_policy) { +static void lb_on_server_status_received_locked(grpc_exec_ctx* exec_ctx, + void* arg, grpc_error* error); +static void lb_on_response_received_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error); +static void lb_call_init_locked(grpc_exec_ctx* exec_ctx, + glb_lb_policy* glb_policy) { GPR_ASSERT(glb_policy->server_name != nullptr); GPR_ASSERT(glb_policy->server_name[0] != '\0'); GPR_ASSERT(glb_policy->lb_call == nullptr); @@ -1401,13 +1436,13 @@ static void lb_call_init_locked(glb_lb_policy* glb_policy) { grpc_millis deadline = glb_policy->lb_call_timeout_ms == 0 ? GRPC_MILLIS_INF_FUTURE - : grpc_core::ExecCtx::Get()->Now() + glb_policy->lb_call_timeout_ms; + : grpc_exec_ctx_now(exec_ctx) + glb_policy->lb_call_timeout_ms; glb_policy->lb_call = grpc_channel_create_pollset_set_call( - glb_policy->lb_channel, nullptr, GRPC_PROPAGATE_DEFAULTS, + exec_ctx, glb_policy->lb_channel, nullptr, GRPC_PROPAGATE_DEFAULTS, glb_policy->base.interested_parties, GRPC_MDSTR_SLASH_GRPC_DOT_LB_DOT_V1_DOT_LOADBALANCER_SLASH_BALANCELOAD, &host, deadline, nullptr); - grpc_slice_unref_internal(host); + grpc_slice_unref_internal(exec_ctx, host); if (glb_policy->client_stats != nullptr) { grpc_grpclb_client_stats_unref(glb_policy->client_stats); @@ -1422,7 +1457,7 @@ static void lb_call_init_locked(glb_lb_policy* glb_policy) { grpc_slice request_payload_slice = grpc_grpclb_request_encode(request); glb_policy->lb_request_payload = grpc_raw_byte_buffer_create(&request_payload_slice, 1); - grpc_slice_unref_internal(request_payload_slice); + grpc_slice_unref_internal(exec_ctx, request_payload_slice); grpc_grpclb_request_destroy(request); GRPC_CLOSURE_INIT(&glb_policy->lb_on_server_status_received, @@ -1443,7 +1478,8 @@ static void lb_call_init_locked(glb_lb_policy* glb_policy) { glb_policy->last_client_load_report_counters_were_zero = false; } -static void lb_call_destroy_locked(glb_lb_policy* glb_policy) { +static void lb_call_destroy_locked(grpc_exec_ctx* exec_ctx, + glb_lb_policy* glb_policy) { GPR_ASSERT(glb_policy->lb_call != nullptr); grpc_call_unref(glb_policy->lb_call); glb_policy->lb_call = nullptr; @@ -1452,21 +1488,22 @@ static void lb_call_destroy_locked(glb_lb_policy* glb_policy) { grpc_metadata_array_destroy(&glb_policy->lb_trailing_metadata_recv); grpc_byte_buffer_destroy(glb_policy->lb_request_payload); - grpc_slice_unref_internal(glb_policy->lb_call_status_details); + grpc_slice_unref_internal(exec_ctx, glb_policy->lb_call_status_details); if (glb_policy->client_load_report_timer_pending) { - grpc_timer_cancel(&glb_policy->client_load_report_timer); + grpc_timer_cancel(exec_ctx, &glb_policy->client_load_report_timer); } } /* * Auxiliary functions and LB client callbacks. */ -static void query_for_backends_locked(glb_lb_policy* glb_policy) { +static void query_for_backends_locked(grpc_exec_ctx* exec_ctx, + glb_lb_policy* glb_policy) { GPR_ASSERT(glb_policy->lb_channel != nullptr); if (glb_policy->shutting_down) return; - lb_call_init_locked(glb_policy); + lb_call_init_locked(exec_ctx, glb_policy); if (grpc_lb_glb_trace.enabled()) { gpr_log(GPR_INFO, @@ -1497,8 +1534,8 @@ static void query_for_backends_locked(glb_lb_policy* glb_policy) { op->flags = 0; op->reserved = nullptr; op++; - call_error = grpc_call_start_batch_and_execute(glb_policy->lb_call, ops, - (size_t)(op - ops), nullptr); + call_error = grpc_call_start_batch_and_execute( + exec_ctx, glb_policy->lb_call, ops, (size_t)(op - ops), nullptr); GPR_ASSERT(GRPC_CALL_OK == call_error); op = ops; @@ -1516,7 +1553,7 @@ static void query_for_backends_locked(glb_lb_policy* glb_policy) { GRPC_LB_POLICY_WEAK_REF(&glb_policy->base, "lb_on_server_status_received_locked"); call_error = grpc_call_start_batch_and_execute( - glb_policy->lb_call, ops, (size_t)(op - ops), + exec_ctx, glb_policy->lb_call, ops, (size_t)(op - ops), &glb_policy->lb_on_server_status_received); GPR_ASSERT(GRPC_CALL_OK == call_error); @@ -1530,12 +1567,13 @@ static void query_for_backends_locked(glb_lb_policy* glb_policy) { * lb_on_response_received_locked */ GRPC_LB_POLICY_WEAK_REF(&glb_policy->base, "lb_on_response_received_locked"); call_error = grpc_call_start_batch_and_execute( - glb_policy->lb_call, ops, (size_t)(op - ops), + exec_ctx, glb_policy->lb_call, ops, (size_t)(op - ops), &glb_policy->lb_on_response_received); GPR_ASSERT(GRPC_CALL_OK == call_error); } -static void lb_on_response_received_locked(void* arg, grpc_error* error) { +static void lb_on_response_received_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { glb_lb_policy* glb_policy = (glb_lb_policy*)arg; grpc_op ops[2]; memset(ops, 0, sizeof(ops)); @@ -1569,7 +1607,7 @@ static void lb_on_response_received_locked(void* arg, grpc_error* error) { * send_client_load_report_locked() */ glb_policy->client_load_report_timer_pending = true; GRPC_LB_POLICY_WEAK_REF(&glb_policy->base, "client_load_report"); - schedule_next_client_load_report(glb_policy); + schedule_next_client_load_report(exec_ctx, glb_policy); } else if (grpc_lb_glb_trace.enabled()) { gpr_log(GPR_INFO, "[grpclb %p] Received initial LB response message; client load " @@ -1614,10 +1652,11 @@ static void lb_on_response_received_locked(void* arg, grpc_error* error) { grpc_grpclb_destroy_serverlist(glb_policy->serverlist); } else { /* or dispose of the fallback */ - grpc_lb_addresses_destroy(glb_policy->fallback_backend_addresses); + grpc_lb_addresses_destroy(exec_ctx, + glb_policy->fallback_backend_addresses); glb_policy->fallback_backend_addresses = nullptr; if (glb_policy->fallback_timer_active) { - grpc_timer_cancel(&glb_policy->lb_fallback_timer); + grpc_timer_cancel(exec_ctx, &glb_policy->lb_fallback_timer); glb_policy->fallback_timer_active = false; } } @@ -1626,7 +1665,7 @@ static void lb_on_response_received_locked(void* arg, grpc_error* error) { * update or in glb_destroy() */ glb_policy->serverlist = serverlist; glb_policy->serverlist_index = 0; - rr_handover_locked(glb_policy); + rr_handover_locked(exec_ctx, glb_policy); } } else { if (grpc_lb_glb_trace.enabled()) { @@ -1636,14 +1675,14 @@ static void lb_on_response_received_locked(void* arg, grpc_error* error) { } grpc_grpclb_destroy_serverlist(serverlist); } - } else { /* serverlist == nullptr */ + } else { /* serverlist == NULL */ gpr_log(GPR_ERROR, "[grpclb %p] Invalid LB response received: '%s'. Ignoring.", glb_policy, grpc_dump_slice(response_slice, GPR_DUMP_ASCII | GPR_DUMP_HEX)); } } - grpc_slice_unref_internal(response_slice); + grpc_slice_unref_internal(exec_ctx, response_slice); if (!glb_policy->shutting_down) { /* keep listening for serverlist updates */ op->op = GRPC_OP_RECV_MESSAGE; @@ -1654,22 +1693,23 @@ static void lb_on_response_received_locked(void* arg, grpc_error* error) { /* reuse the "lb_on_response_received_locked" weak ref taken in * query_for_backends_locked() */ const grpc_call_error call_error = grpc_call_start_batch_and_execute( - glb_policy->lb_call, ops, (size_t)(op - ops), + exec_ctx, glb_policy->lb_call, ops, (size_t)(op - ops), &glb_policy->lb_on_response_received); /* loop */ GPR_ASSERT(GRPC_CALL_OK == call_error); } else { - GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, + GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, "lb_on_response_received_locked_shutdown"); } } else { /* empty payload: call cancelled. */ /* dispose of the "lb_on_response_received_locked" weak ref taken in * query_for_backends_locked() and reused in every reception loop */ - GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, + GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, "lb_on_response_received_locked_empty_payload"); } } -static void lb_on_fallback_timer_locked(void* arg, grpc_error* error) { +static void lb_on_fallback_timer_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { glb_lb_policy* glb_policy = (glb_lb_policy*)arg; glb_policy->fallback_timer_active = false; /* If we receive a serverlist after the timer fires but before this callback @@ -1682,13 +1722,15 @@ static void lb_on_fallback_timer_locked(void* arg, grpc_error* error) { glb_policy); } GPR_ASSERT(glb_policy->fallback_backend_addresses != nullptr); - rr_handover_locked(glb_policy); + rr_handover_locked(exec_ctx, glb_policy); } } - GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "grpclb_fallback_timer"); + GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, + "grpclb_fallback_timer"); } -static void lb_on_server_status_received_locked(void* arg, grpc_error* error) { +static void lb_on_server_status_received_locked(grpc_exec_ctx* exec_ctx, + void* arg, grpc_error* error) { glb_lb_policy* glb_policy = (glb_lb_policy*)arg; GPR_ASSERT(glb_policy->lb_call != nullptr); if (grpc_lb_glb_trace.enabled()) { @@ -1702,28 +1744,29 @@ static void lb_on_server_status_received_locked(void* arg, grpc_error* error) { gpr_free(status_details); } /* We need to perform cleanups no matter what. */ - lb_call_destroy_locked(glb_policy); + lb_call_destroy_locked(exec_ctx, glb_policy); // If the load report timer is still pending, we wait for it to be // called before restarting the call. Otherwise, we restart the call // here. if (!glb_policy->client_load_report_timer_pending) { - maybe_restart_lb_call(glb_policy); + maybe_restart_lb_call(exec_ctx, glb_policy); } } -static void fallback_update_locked(glb_lb_policy* glb_policy, +static void fallback_update_locked(grpc_exec_ctx* exec_ctx, + glb_lb_policy* glb_policy, const grpc_lb_addresses* addresses) { GPR_ASSERT(glb_policy->fallback_backend_addresses != nullptr); - grpc_lb_addresses_destroy(glb_policy->fallback_backend_addresses); + grpc_lb_addresses_destroy(exec_ctx, glb_policy->fallback_backend_addresses); glb_policy->fallback_backend_addresses = - extract_backend_addresses_locked(addresses); + extract_backend_addresses_locked(exec_ctx, addresses); if (glb_policy->lb_fallback_timeout_ms > 0 && glb_policy->rr_policy != nullptr) { - rr_handover_locked(glb_policy); + rr_handover_locked(exec_ctx, glb_policy); } } -static void glb_update_locked(grpc_lb_policy* policy, +static void glb_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, const grpc_lb_policy_args* args) { glb_lb_policy* glb_policy = (glb_lb_policy*)policy; const grpc_arg* arg = @@ -1733,7 +1776,7 @@ static void glb_update_locked(grpc_lb_policy* policy, // If we don't have a current channel to the LB, go into TRANSIENT // FAILURE. grpc_connectivity_state_set( - &glb_policy->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + exec_ctx, &glb_policy->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Missing update in args"), "glb_update_missing"); } else { @@ -1750,16 +1793,16 @@ static void glb_update_locked(grpc_lb_policy* policy, // If a non-empty serverlist hasn't been received from the balancer, // propagate the update to fallback_backend_addresses. if (glb_policy->serverlist == nullptr) { - fallback_update_locked(glb_policy, addresses); + fallback_update_locked(exec_ctx, glb_policy, addresses); } GPR_ASSERT(glb_policy->lb_channel != nullptr); // Propagate updates to the LB channel (pick_first) through the fake // resolver. grpc_channel_args* lb_channel_args = build_lb_channel_args( - addresses, glb_policy->response_generator, args->args); + exec_ctx, addresses, glb_policy->response_generator, args->args); grpc_fake_resolver_response_generator_set_response( - glb_policy->response_generator, lb_channel_args); - grpc_channel_args_destroy(lb_channel_args); + exec_ctx, glb_policy->response_generator, lb_channel_args); + grpc_channel_args_destroy(exec_ctx, lb_channel_args); // Start watching the LB channel connectivity for connection, if not // already doing so. if (!glb_policy->watching_lb_channel) { @@ -1771,7 +1814,7 @@ static void glb_update_locked(grpc_lb_policy* policy, glb_policy->watching_lb_channel = true; GRPC_LB_POLICY_WEAK_REF(&glb_policy->base, "watch_lb_channel_connectivity"); grpc_client_channel_watch_connectivity_state( - client_channel_elem, + exec_ctx, client_channel_elem, grpc_polling_entity_create_from_pollset_set( glb_policy->base.interested_parties), &glb_policy->lb_channel_connectivity, @@ -1782,7 +1825,8 @@ static void glb_update_locked(grpc_lb_policy* policy, // Invoked as part of the update process. It continues watching the LB channel // until it shuts down or becomes READY. It's invoked even if the LB channel // stayed READY throughout the update (for example if the update is identical). -static void glb_lb_channel_on_connectivity_changed_cb(void* arg, +static void glb_lb_channel_on_connectivity_changed_cb(grpc_exec_ctx* exec_ctx, + void* arg, grpc_error* error) { glb_lb_policy* glb_policy = (glb_lb_policy*)arg; if (glb_policy->shutting_down) goto done; @@ -1798,7 +1842,7 @@ static void glb_lb_channel_on_connectivity_changed_cb(void* arg, grpc_channel_get_channel_stack(glb_policy->lb_channel)); GPR_ASSERT(client_channel_elem->filter == &grpc_client_channel_filter); grpc_client_channel_watch_connectivity_state( - client_channel_elem, + exec_ctx, client_channel_elem, grpc_polling_entity_create_from_pollset_set( glb_policy->base.interested_parties), &glb_policy->lb_channel_connectivity, @@ -1817,28 +1861,29 @@ static void glb_lb_channel_on_connectivity_changed_cb(void* arg, // lb_call. } else if (glb_policy->started_picking) { if (glb_policy->retry_timer_active) { - grpc_timer_cancel(&glb_policy->lb_call_retry_timer); + grpc_timer_cancel(exec_ctx, &glb_policy->lb_call_retry_timer); glb_policy->retry_timer_active = false; } - start_picking_locked(glb_policy); + start_picking_locked(exec_ctx, glb_policy); } /* fallthrough */ case GRPC_CHANNEL_SHUTDOWN: done: glb_policy->watching_lb_channel = false; - GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, + GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, "watch_lb_channel_connectivity_cb_shutdown"); break; } } static void glb_set_reresolve_closure_locked( - grpc_lb_policy* policy, grpc_closure* request_reresolution) { + grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, + grpc_closure* request_reresolution) { glb_lb_policy* glb_policy = (glb_lb_policy*)policy; GPR_ASSERT(!glb_policy->shutting_down); GPR_ASSERT(glb_policy->base.request_reresolution == nullptr); if (glb_policy->rr_policy != nullptr) { - grpc_lb_policy_set_reresolve_closure_locked(glb_policy->rr_policy, + grpc_lb_policy_set_reresolve_closure_locked(exec_ctx, glb_policy->rr_policy, request_reresolution); } else { glb_policy->base.request_reresolution = request_reresolution; @@ -1859,7 +1904,8 @@ static const grpc_lb_policy_vtable glb_lb_policy_vtable = { glb_update_locked, glb_set_reresolve_closure_locked}; -static grpc_lb_policy* glb_create(grpc_lb_policy_factory* factory, +static grpc_lb_policy* glb_create(grpc_exec_ctx* exec_ctx, + grpc_lb_policy_factory* factory, grpc_lb_policy_args* args) { /* Count the number of gRPC-LB addresses. There must be at least one. */ const grpc_arg* arg = @@ -1880,7 +1926,7 @@ static grpc_lb_policy* glb_create(grpc_lb_policy_factory* factory, arg = grpc_channel_args_find(args->args, GRPC_ARG_SERVER_URI); GPR_ASSERT(arg != nullptr); GPR_ASSERT(arg->type == GRPC_ARG_STRING); - grpc_uri* uri = grpc_uri_parse(arg->value.string, true); + grpc_uri* uri = grpc_uri_parse(exec_ctx, arg->value.string, true); GPR_ASSERT(uri->path[0] != '\0'); glb_policy->server_name = gpr_strdup(uri->path[0] == '/' ? uri->path + 1 : uri->path); @@ -1913,26 +1959,26 @@ static grpc_lb_policy* glb_create(grpc_lb_policy_factory* factory, /* Extract the backend addresses (may be empty) from the resolver for * fallback. */ glb_policy->fallback_backend_addresses = - extract_backend_addresses_locked(addresses); + extract_backend_addresses_locked(exec_ctx, addresses); /* Create a client channel over them to communicate with a LB service */ glb_policy->response_generator = grpc_fake_resolver_response_generator_create(); grpc_channel_args* lb_channel_args = build_lb_channel_args( - addresses, glb_policy->response_generator, args->args); + exec_ctx, addresses, glb_policy->response_generator, args->args); char* uri_str; gpr_asprintf(&uri_str, "fake:///%s", glb_policy->server_name); glb_policy->lb_channel = grpc_lb_policy_grpclb_create_lb_channel( - uri_str, args->client_channel_factory, lb_channel_args); + exec_ctx, uri_str, args->client_channel_factory, lb_channel_args); /* Propagate initial resolution */ grpc_fake_resolver_response_generator_set_response( - glb_policy->response_generator, lb_channel_args); - grpc_channel_args_destroy(lb_channel_args); + exec_ctx, glb_policy->response_generator, lb_channel_args); + grpc_channel_args_destroy(exec_ctx, lb_channel_args); gpr_free(uri_str); if (glb_policy->lb_channel == nullptr) { gpr_free((void*)glb_policy->server_name); - grpc_channel_args_destroy(glb_policy->args); + grpc_channel_args_destroy(exec_ctx, glb_policy->args); gpr_free(glb_policy); return nullptr; } @@ -1963,7 +2009,7 @@ grpc_lb_policy_factory* grpc_glb_lb_factory_create() { // Only add client_load_reporting filter if the grpclb LB policy is used. static bool maybe_add_client_load_reporting_filter( - grpc_channel_stack_builder* builder, void* arg) { + grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, void* arg) { const grpc_channel_args* args = grpc_channel_stack_builder_get_channel_arguments(builder); const grpc_arg* channel_arg = diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc index a8ecea42125..aacaec197dc 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc @@ -26,17 +26,17 @@ #include "src/core/lib/support/string.h" grpc_channel* grpc_lb_policy_grpclb_create_lb_channel( - const char* lb_service_target_addresses, + grpc_exec_ctx* exec_ctx, const char* lb_service_target_addresses, grpc_client_channel_factory* client_channel_factory, grpc_channel_args* args) { grpc_channel* lb_channel = grpc_client_channel_factory_create_channel( - client_channel_factory, lb_service_target_addresses, + exec_ctx, client_channel_factory, lb_service_target_addresses, GRPC_CLIENT_CHANNEL_TYPE_LOAD_BALANCING, args); return lb_channel; } grpc_channel_args* grpc_lb_policy_grpclb_build_lb_channel_args( - grpc_slice_hash_table* targets_info, + grpc_exec_ctx* exec_ctx, grpc_slice_hash_table* targets_info, grpc_fake_resolver_response_generator* response_generator, const grpc_channel_args* args) { const grpc_arg to_add[] = { diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h index 56104b2ec05..70b1c28b0da 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h @@ -31,12 +31,12 @@ * \a client_channel_factory will be used for the creation of the LB channel, * alongside the channel args passed in \a args. */ grpc_channel* grpc_lb_policy_grpclb_create_lb_channel( - const char* lb_service_target_addresses, + grpc_exec_ctx* exec_ctx, const char* lb_service_target_addresses, grpc_client_channel_factory* client_channel_factory, grpc_channel_args* args); grpc_channel_args* grpc_lb_policy_grpclb_build_lb_channel_args( - grpc_slice_hash_table* targets_info, + grpc_exec_ctx* exec_ctx, grpc_slice_hash_table* targets_info, grpc_fake_resolver_response_generator* response_generator, const grpc_channel_args* args); diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc index 76bcddf9453..8eaa90e97b6 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc @@ -29,7 +29,7 @@ #include "src/core/lib/support/string.h" grpc_channel* grpc_lb_policy_grpclb_create_lb_channel( - const char* lb_service_target_addresses, + grpc_exec_ctx* exec_ctx, const char* lb_service_target_addresses, grpc_client_channel_factory* client_channel_factory, grpc_channel_args* args) { grpc_channel_args* new_args = args; @@ -50,19 +50,19 @@ grpc_channel* grpc_lb_policy_grpclb_create_lb_channel( new_args = grpc_channel_args_copy_and_add_and_remove( args, keys_to_remove, GPR_ARRAY_SIZE(keys_to_remove), args_to_add, GPR_ARRAY_SIZE(args_to_add)); - grpc_channel_credentials_unref(creds_sans_call_creds); + grpc_channel_credentials_unref(exec_ctx, creds_sans_call_creds); } grpc_channel* lb_channel = grpc_client_channel_factory_create_channel( - client_channel_factory, lb_service_target_addresses, + exec_ctx, client_channel_factory, lb_service_target_addresses, GRPC_CLIENT_CHANNEL_TYPE_LOAD_BALANCING, new_args); if (channel_credentials != nullptr) { - grpc_channel_args_destroy(new_args); + grpc_channel_args_destroy(exec_ctx, new_args); } return lb_channel; } grpc_channel_args* grpc_lb_policy_grpclb_build_lb_channel_args( - grpc_slice_hash_table* targets_info, + grpc_exec_ctx* exec_ctx, grpc_slice_hash_table* targets_info, grpc_fake_resolver_response_generator* response_generator, const grpc_channel_args* args) { const grpc_arg to_add[] = { diff --git a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc index 5e75b64843b..228a77d9db7 100644 --- a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +++ b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc @@ -57,12 +57,12 @@ typedef struct { grpc_connectivity_state_tracker state_tracker; } pick_first_lb_policy; -static void pf_destroy(grpc_lb_policy* pol) { +static void pf_destroy(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { pick_first_lb_policy* p = (pick_first_lb_policy*)pol; GPR_ASSERT(p->subchannel_list == nullptr); GPR_ASSERT(p->latest_pending_subchannel_list == nullptr); GPR_ASSERT(p->pending_picks == nullptr); - grpc_connectivity_state_destroy(&p->state_tracker); + grpc_connectivity_state_destroy(exec_ctx, &p->state_tracker); gpr_free(p); grpc_subchannel_index_unref(); if (grpc_lb_pick_first_trace.enabled()) { @@ -70,7 +70,7 @@ static void pf_destroy(grpc_lb_policy* pol) { } } -static void pf_shutdown_locked(grpc_lb_policy* pol) { +static void pf_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { pick_first_lb_policy* p = (pick_first_lb_policy*)pol; grpc_error* error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Channel shutdown"); if (grpc_lb_pick_first_trace.enabled()) { @@ -81,27 +81,28 @@ static void pf_shutdown_locked(grpc_lb_policy* pol) { while ((pp = p->pending_picks) != nullptr) { p->pending_picks = pp->next; *pp->target = nullptr; - GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, GRPC_ERROR_REF(error)); gpr_free(pp); } - grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_SHUTDOWN, - GRPC_ERROR_REF(error), "shutdown"); + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_REF(error), + "shutdown"); if (p->subchannel_list != nullptr) { - grpc_lb_subchannel_list_shutdown_and_unref(p->subchannel_list, + grpc_lb_subchannel_list_shutdown_and_unref(exec_ctx, p->subchannel_list, "pf_shutdown"); p->subchannel_list = nullptr; } if (p->latest_pending_subchannel_list != nullptr) { grpc_lb_subchannel_list_shutdown_and_unref( - p->latest_pending_subchannel_list, "pf_shutdown"); + exec_ctx, p->latest_pending_subchannel_list, "pf_shutdown"); p->latest_pending_subchannel_list = nullptr; } - grpc_lb_policy_try_reresolve(&p->base, &grpc_lb_pick_first_trace, + grpc_lb_policy_try_reresolve(exec_ctx, &p->base, &grpc_lb_pick_first_trace, GRPC_ERROR_CANCELLED); GRPC_ERROR_UNREF(error); } -static void pf_cancel_pick_locked(grpc_lb_policy* pol, +static void pf_cancel_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, grpc_connected_subchannel** target, grpc_error* error) { pick_first_lb_policy* p = (pick_first_lb_policy*)pol; @@ -111,7 +112,7 @@ static void pf_cancel_pick_locked(grpc_lb_policy* pol, pending_pick* next = pp->next; if (pp->target == target) { *target = nullptr; - GRPC_CLOSURE_SCHED(pp->on_complete, + GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Pick Cancelled", &error, 1)); gpr_free(pp); @@ -124,7 +125,7 @@ static void pf_cancel_pick_locked(grpc_lb_policy* pol, GRPC_ERROR_UNREF(error); } -static void pf_cancel_picks_locked(grpc_lb_policy* pol, +static void pf_cancel_picks_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, uint32_t initial_metadata_flags_mask, uint32_t initial_metadata_flags_eq, grpc_error* error) { @@ -135,7 +136,7 @@ static void pf_cancel_picks_locked(grpc_lb_policy* pol, pending_pick* next = pp->next; if ((pp->initial_metadata_flags & initial_metadata_flags_mask) == initial_metadata_flags_eq) { - GRPC_CLOSURE_SCHED(pp->on_complete, + GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Pick Cancelled", &error, 1)); gpr_free(pp); @@ -148,7 +149,8 @@ static void pf_cancel_picks_locked(grpc_lb_policy* pol, GRPC_ERROR_UNREF(error); } -static void start_picking_locked(pick_first_lb_policy* p) { +static void start_picking_locked(grpc_exec_ctx* exec_ctx, + pick_first_lb_policy* p) { p->started_picking = true; if (p->subchannel_list != nullptr && p->subchannel_list->num_subchannels > 0) { @@ -158,21 +160,21 @@ static void start_picking_locked(pick_first_lb_policy* p) { grpc_lb_subchannel_list_ref_for_connectivity_watch( p->subchannel_list, "connectivity_watch+start_picking"); grpc_lb_subchannel_data_start_connectivity_watch( - &p->subchannel_list->subchannels[i]); + exec_ctx, &p->subchannel_list->subchannels[i]); break; } } } } -static void pf_exit_idle_locked(grpc_lb_policy* pol) { +static void pf_exit_idle_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { pick_first_lb_policy* p = (pick_first_lb_policy*)pol; if (!p->started_picking) { - start_picking_locked(p); + start_picking_locked(exec_ctx, p); } } -static int pf_pick_locked(grpc_lb_policy* pol, +static int pf_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, const grpc_lb_policy_pick_args* pick_args, grpc_connected_subchannel** target, grpc_call_context_element* context, void** user_data, @@ -186,7 +188,7 @@ static int pf_pick_locked(grpc_lb_policy* pol, } // No subchannel selected yet, so handle asynchronously. if (!p->started_picking) { - start_picking_locked(p); + start_picking_locked(exec_ctx, p); } pending_pick* pp = (pending_pick*)gpr_malloc(sizeof(*pp)); pp->next = p->pending_picks; @@ -197,43 +199,48 @@ static int pf_pick_locked(grpc_lb_policy* pol, return 0; } -static void destroy_unselected_subchannels_locked(pick_first_lb_policy* p) { +static void destroy_unselected_subchannels_locked(grpc_exec_ctx* exec_ctx, + pick_first_lb_policy* p) { for (size_t i = 0; i < p->subchannel_list->num_subchannels; ++i) { grpc_lb_subchannel_data* sd = &p->subchannel_list->subchannels[i]; if (p->selected != sd) { - grpc_lb_subchannel_data_unref_subchannel(sd, + grpc_lb_subchannel_data_unref_subchannel(exec_ctx, sd, "selected_different_subchannel"); } } } static grpc_connectivity_state pf_check_connectivity_locked( - grpc_lb_policy* pol, grpc_error** error) { + grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, grpc_error** error) { pick_first_lb_policy* p = (pick_first_lb_policy*)pol; return grpc_connectivity_state_get(&p->state_tracker, error); } -static void pf_notify_on_state_change_locked(grpc_lb_policy* pol, +static void pf_notify_on_state_change_locked(grpc_exec_ctx* exec_ctx, + grpc_lb_policy* pol, grpc_connectivity_state* current, grpc_closure* notify) { pick_first_lb_policy* p = (pick_first_lb_policy*)pol; - grpc_connectivity_state_notify_on_state_change(&p->state_tracker, current, - notify); + grpc_connectivity_state_notify_on_state_change(exec_ctx, &p->state_tracker, + current, notify); } -static void pf_ping_one_locked(grpc_lb_policy* pol, grpc_closure* closure) { +static void pf_ping_one_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, + grpc_closure* closure) { pick_first_lb_policy* p = (pick_first_lb_policy*)pol; if (p->selected) { - grpc_connected_subchannel_ping(p->selected->connected_subchannel, closure); + grpc_connected_subchannel_ping(exec_ctx, p->selected->connected_subchannel, + closure); } else { - GRPC_CLOSURE_SCHED(closure, + GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Not connected")); } } -static void pf_connectivity_changed_locked(void* arg, grpc_error* error); +static void pf_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error); -static void pf_update_locked(grpc_lb_policy* policy, +static void pf_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, const grpc_lb_policy_args* args) { pick_first_lb_policy* p = (pick_first_lb_policy*)policy; const grpc_arg* arg = @@ -242,7 +249,7 @@ static void pf_update_locked(grpc_lb_policy* policy, if (p->subchannel_list == nullptr) { // If we don't have a current subchannel list, go into TRANSIENT FAILURE. grpc_connectivity_state_set( - &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Missing update in args"), "pf_update_missing"); } else { @@ -261,17 +268,17 @@ static void pf_update_locked(grpc_lb_policy* policy, (void*)p, (unsigned long)addresses->num_addresses); } grpc_lb_subchannel_list* subchannel_list = grpc_lb_subchannel_list_create( - &p->base, &grpc_lb_pick_first_trace, addresses, args, + exec_ctx, &p->base, &grpc_lb_pick_first_trace, addresses, args, pf_connectivity_changed_locked); if (subchannel_list->num_subchannels == 0) { // Empty update or no valid subchannels. Unsubscribe from all current // subchannels and put the channel in TRANSIENT_FAILURE. grpc_connectivity_state_set( - &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Empty update"), "pf_update_empty"); if (p->subchannel_list != nullptr) { - grpc_lb_subchannel_list_shutdown_and_unref(p->subchannel_list, + grpc_lb_subchannel_list_shutdown_and_unref(exec_ctx, p->subchannel_list, "sl_shutdown_empty_update"); } p->subchannel_list = subchannel_list; // Empty list. @@ -282,7 +289,7 @@ static void pf_update_locked(grpc_lb_policy* policy, // We don't yet have a selected subchannel, so replace the current // subchannel list immediately. if (p->subchannel_list != nullptr) { - grpc_lb_subchannel_list_shutdown_and_unref(p->subchannel_list, + grpc_lb_subchannel_list_shutdown_and_unref(exec_ctx, p->subchannel_list, "pf_update_before_selected"); } p->subchannel_list = subchannel_list; @@ -307,19 +314,19 @@ static void pf_update_locked(grpc_lb_policy* policy, p->selected = sd; if (p->subchannel_list != nullptr) { grpc_lb_subchannel_list_shutdown_and_unref( - p->subchannel_list, "pf_update_includes_selected"); + exec_ctx, p->subchannel_list, "pf_update_includes_selected"); } p->subchannel_list = subchannel_list; - destroy_unselected_subchannels_locked(p); + destroy_unselected_subchannels_locked(exec_ctx, p); grpc_lb_subchannel_list_ref_for_connectivity_watch( subchannel_list, "connectivity_watch+replace_selected"); - grpc_lb_subchannel_data_start_connectivity_watch(sd); + grpc_lb_subchannel_data_start_connectivity_watch(exec_ctx, sd); // If there was a previously pending update (which may or may // not have contained the currently selected subchannel), drop // it, so that it doesn't override what we've done here. if (p->latest_pending_subchannel_list != nullptr) { grpc_lb_subchannel_list_shutdown_and_unref( - p->latest_pending_subchannel_list, + exec_ctx, p->latest_pending_subchannel_list, "pf_update_includes_selected+outdated"); p->latest_pending_subchannel_list = nullptr; } @@ -339,7 +346,8 @@ static void pf_update_locked(grpc_lb_policy* policy, (void*)subchannel_list); } grpc_lb_subchannel_list_shutdown_and_unref( - p->latest_pending_subchannel_list, "sl_outdated_dont_smash"); + exec_ctx, p->latest_pending_subchannel_list, + "sl_outdated_dont_smash"); } p->latest_pending_subchannel_list = subchannel_list; } @@ -349,11 +357,12 @@ static void pf_update_locked(grpc_lb_policy* policy, grpc_lb_subchannel_list_ref_for_connectivity_watch( subchannel_list, "connectivity_watch+update"); grpc_lb_subchannel_data_start_connectivity_watch( - &subchannel_list->subchannels[0]); + exec_ctx, &subchannel_list->subchannels[0]); } } -static void pf_connectivity_changed_locked(void* arg, grpc_error* error) { +static void pf_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_lb_subchannel_data* sd = (grpc_lb_subchannel_data*)arg; pick_first_lb_policy* p = (pick_first_lb_policy*)sd->subchannel_list->policy; if (grpc_lb_pick_first_trace.enabled()) { @@ -371,18 +380,18 @@ static void pf_connectivity_changed_locked(void* arg, grpc_error* error) { } // If the policy is shutting down, unref and return. if (p->shutdown) { - grpc_lb_subchannel_data_stop_connectivity_watch(sd); - grpc_lb_subchannel_data_unref_subchannel(sd, "pf_shutdown"); - grpc_lb_subchannel_list_unref_for_connectivity_watch(sd->subchannel_list, - "pf_shutdown"); + grpc_lb_subchannel_data_stop_connectivity_watch(exec_ctx, sd); + grpc_lb_subchannel_data_unref_subchannel(exec_ctx, sd, "pf_shutdown"); + grpc_lb_subchannel_list_unref_for_connectivity_watch( + exec_ctx, sd->subchannel_list, "pf_shutdown"); return; } // If the subchannel list is shutting down, stop watching. if (sd->subchannel_list->shutting_down || error == GRPC_ERROR_CANCELLED) { - grpc_lb_subchannel_data_stop_connectivity_watch(sd); - grpc_lb_subchannel_data_unref_subchannel(sd, "pf_sl_shutdown"); - grpc_lb_subchannel_list_unref_for_connectivity_watch(sd->subchannel_list, - "pf_sl_shutdown"); + grpc_lb_subchannel_data_stop_connectivity_watch(exec_ctx, sd); + grpc_lb_subchannel_data_unref_subchannel(exec_ctx, sd, "pf_sl_shutdown"); + grpc_lb_subchannel_list_unref_for_connectivity_watch( + exec_ctx, sd->subchannel_list, "pf_sl_shutdown"); return; } // If we're still here, the notification must be for a subchannel in @@ -398,15 +407,15 @@ static void pf_connectivity_changed_locked(void* arg, grpc_error* error) { if (sd->curr_connectivity_state != GRPC_CHANNEL_READY && p->latest_pending_subchannel_list != nullptr) { p->selected = nullptr; - grpc_lb_subchannel_data_stop_connectivity_watch(sd); + grpc_lb_subchannel_data_stop_connectivity_watch(exec_ctx, sd); grpc_lb_subchannel_list_unref_for_connectivity_watch( - sd->subchannel_list, "selected_not_ready+switch_to_update"); + exec_ctx, sd->subchannel_list, "selected_not_ready+switch_to_update"); grpc_lb_subchannel_list_shutdown_and_unref( - p->subchannel_list, "selected_not_ready+switch_to_update"); + exec_ctx, p->subchannel_list, "selected_not_ready+switch_to_update"); p->subchannel_list = p->latest_pending_subchannel_list; p->latest_pending_subchannel_list = nullptr; grpc_connectivity_state_set( - &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_REF(error), "selected_not_ready+switch_to_update"); } else { // TODO(juanlishen): we re-resolve when the selected subchannel goes to @@ -417,26 +426,27 @@ static void pf_connectivity_changed_locked(void* arg, grpc_error* error) { if (sd->curr_connectivity_state == GRPC_CHANNEL_SHUTDOWN || sd->curr_connectivity_state == GRPC_CHANNEL_TRANSIENT_FAILURE) { // If the selected channel goes bad, request a re-resolution. - grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_IDLE, - GRPC_ERROR_NONE, + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + GRPC_CHANNEL_IDLE, GRPC_ERROR_NONE, "selected_changed+reresolve"); p->started_picking = false; - grpc_lb_policy_try_reresolve(&p->base, &grpc_lb_pick_first_trace, - GRPC_ERROR_NONE); + grpc_lb_policy_try_reresolve( + exec_ctx, &p->base, &grpc_lb_pick_first_trace, GRPC_ERROR_NONE); } else { - grpc_connectivity_state_set(&p->state_tracker, + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, sd->curr_connectivity_state, GRPC_ERROR_REF(error), "selected_changed"); } if (sd->curr_connectivity_state != GRPC_CHANNEL_SHUTDOWN) { // Renew notification. - grpc_lb_subchannel_data_start_connectivity_watch(sd); + grpc_lb_subchannel_data_start_connectivity_watch(exec_ctx, sd); } else { p->selected = nullptr; - grpc_lb_subchannel_data_stop_connectivity_watch(sd); + grpc_lb_subchannel_data_stop_connectivity_watch(exec_ctx, sd); grpc_lb_subchannel_list_unref_for_connectivity_watch( - sd->subchannel_list, "pf_selected_shutdown"); - grpc_lb_subchannel_data_unref_subchannel(sd, "pf_selected_shutdown"); + exec_ctx, sd->subchannel_list, "pf_selected_shutdown"); + grpc_lb_subchannel_data_unref_subchannel(exec_ctx, sd, + "pf_selected_shutdown"); } } return; @@ -456,14 +466,15 @@ static void pf_connectivity_changed_locked(void* arg, grpc_error* error) { // p->subchannel_list. if (sd->subchannel_list == p->latest_pending_subchannel_list) { GPR_ASSERT(p->subchannel_list != nullptr); - grpc_lb_subchannel_list_shutdown_and_unref(p->subchannel_list, + grpc_lb_subchannel_list_shutdown_and_unref(exec_ctx, p->subchannel_list, "finish_update"); p->subchannel_list = p->latest_pending_subchannel_list; p->latest_pending_subchannel_list = nullptr; } // Cases 1 and 2. - grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_READY, - GRPC_ERROR_NONE, "connecting_ready"); + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + GRPC_CHANNEL_READY, GRPC_ERROR_NONE, + "connecting_ready"); sd->connected_subchannel = GRPC_CONNECTED_SUBCHANNEL_REF( grpc_subchannel_get_connected_subchannel(sd->subchannel), "connected"); @@ -473,7 +484,7 @@ static void pf_connectivity_changed_locked(void* arg, grpc_error* error) { (void*)sd->subchannel); } // Drop all other subchannels, since we are now connected. - destroy_unselected_subchannels_locked(p); + destroy_unselected_subchannels_locked(exec_ctx, p); // Update any calls that were waiting for a pick. pending_pick* pp; while ((pp = p->pending_picks)) { @@ -485,15 +496,15 @@ static void pf_connectivity_changed_locked(void* arg, grpc_error* error) { "Servicing pending pick with selected subchannel %p", (void*)p->selected); } - GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, GRPC_ERROR_NONE); gpr_free(pp); } // Renew notification. - grpc_lb_subchannel_data_start_connectivity_watch(sd); + grpc_lb_subchannel_data_start_connectivity_watch(exec_ctx, sd); break; } case GRPC_CHANNEL_TRANSIENT_FAILURE: { - grpc_lb_subchannel_data_stop_connectivity_watch(sd); + grpc_lb_subchannel_data_stop_connectivity_watch(exec_ctx, sd); do { sd->subchannel_list->checking_subchannel = (sd->subchannel_list->checking_subchannel + 1) % @@ -506,28 +517,29 @@ static void pf_connectivity_changed_locked(void* arg, grpc_error* error) { if (sd->subchannel_list->checking_subchannel == 0 && sd->subchannel_list == p->subchannel_list) { grpc_connectivity_state_set( - &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_REF(error), "connecting_transient_failure"); } // Reuses the connectivity refs from the previous watch. - grpc_lb_subchannel_data_start_connectivity_watch(sd); + grpc_lb_subchannel_data_start_connectivity_watch(exec_ctx, sd); break; } case GRPC_CHANNEL_CONNECTING: case GRPC_CHANNEL_IDLE: { // Only update connectivity state in case 1. if (sd->subchannel_list == p->subchannel_list) { - grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_CONNECTING, - GRPC_ERROR_REF(error), - "connecting_changed"); + grpc_connectivity_state_set( + exec_ctx, &p->state_tracker, GRPC_CHANNEL_CONNECTING, + GRPC_ERROR_REF(error), "connecting_changed"); } // Renew notification. - grpc_lb_subchannel_data_start_connectivity_watch(sd); + grpc_lb_subchannel_data_start_connectivity_watch(exec_ctx, sd); break; } case GRPC_CHANNEL_SHUTDOWN: { - grpc_lb_subchannel_data_stop_connectivity_watch(sd); - grpc_lb_subchannel_data_unref_subchannel(sd, "pf_candidate_shutdown"); + grpc_lb_subchannel_data_stop_connectivity_watch(exec_ctx, sd); + grpc_lb_subchannel_data_unref_subchannel(exec_ctx, sd, + "pf_candidate_shutdown"); // Advance to next subchannel and check its state. grpc_lb_subchannel_data* original_sd = sd; do { @@ -539,30 +551,31 @@ static void pf_connectivity_changed_locked(void* arg, grpc_error* error) { } while (sd->subchannel == nullptr && sd != original_sd); if (sd == original_sd) { grpc_lb_subchannel_list_unref_for_connectivity_watch( - sd->subchannel_list, "pf_exhausted_subchannels"); + exec_ctx, sd->subchannel_list, "pf_exhausted_subchannels"); if (sd->subchannel_list == p->subchannel_list) { - grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_IDLE, - GRPC_ERROR_NONE, + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + GRPC_CHANNEL_IDLE, GRPC_ERROR_NONE, "exhausted_subchannels+reresolve"); p->started_picking = false; - grpc_lb_policy_try_reresolve(&p->base, &grpc_lb_pick_first_trace, - GRPC_ERROR_NONE); + grpc_lb_policy_try_reresolve( + exec_ctx, &p->base, &grpc_lb_pick_first_trace, GRPC_ERROR_NONE); } } else { if (sd->subchannel_list == p->subchannel_list) { grpc_connectivity_state_set( - &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_REF(error), "subchannel_failed"); } // Reuses the connectivity refs from the previous watch. - grpc_lb_subchannel_data_start_connectivity_watch(sd); + grpc_lb_subchannel_data_start_connectivity_watch(exec_ctx, sd); } } } } static void pf_set_reresolve_closure_locked( - grpc_lb_policy* policy, grpc_closure* request_reresolution) { + grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, + grpc_closure* request_reresolution) { pick_first_lb_policy* p = (pick_first_lb_policy*)policy; GPR_ASSERT(!p->shutdown); GPR_ASSERT(policy->request_reresolution == nullptr); @@ -586,14 +599,15 @@ static void pick_first_factory_ref(grpc_lb_policy_factory* factory) {} static void pick_first_factory_unref(grpc_lb_policy_factory* factory) {} -static grpc_lb_policy* create_pick_first(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->client_channel_factory != nullptr); pick_first_lb_policy* p = (pick_first_lb_policy*)gpr_zalloc(sizeof(*p)); if (grpc_lb_pick_first_trace.enabled()) { gpr_log(GPR_DEBUG, "Pick First %p created.", (void*)p); } - pf_update_locked(&p->base, args); + pf_update_locked(exec_ctx, &p->base, args); grpc_lb_policy_init(&p->base, &pick_first_lb_policy_vtable, args->combiner); grpc_subchannel_index_ref(); return &p->base; diff --git a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc index 6958b726935..f68daba474c 100644 --- a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +++ b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc @@ -154,7 +154,7 @@ static void update_last_ready_subchannel_index_locked(round_robin_lb_policy* p, } } -static void rr_destroy(grpc_lb_policy* pol) { +static void rr_destroy(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { round_robin_lb_policy* p = (round_robin_lb_policy*)pol; if (grpc_lb_round_robin_trace.enabled()) { gpr_log(GPR_DEBUG, "[RR %p] Destroying Round Robin policy at %p", @@ -162,12 +162,12 @@ static void rr_destroy(grpc_lb_policy* pol) { } GPR_ASSERT(p->subchannel_list == nullptr); GPR_ASSERT(p->latest_pending_subchannel_list == nullptr); - grpc_connectivity_state_destroy(&p->state_tracker); + grpc_connectivity_state_destroy(exec_ctx, &p->state_tracker); grpc_subchannel_index_unref(); gpr_free(p); } -static void rr_shutdown_locked(grpc_lb_policy* pol) { +static void rr_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { round_robin_lb_policy* p = (round_robin_lb_policy*)pol; grpc_error* error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Channel shutdown"); if (grpc_lb_round_robin_trace.enabled()) { @@ -178,27 +178,29 @@ static void rr_shutdown_locked(grpc_lb_policy* pol) { while ((pp = p->pending_picks) != nullptr) { p->pending_picks = pp->next; *pp->target = nullptr; - GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, GRPC_ERROR_REF(error)); gpr_free(pp); } - grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_SHUTDOWN, - GRPC_ERROR_REF(error), "rr_shutdown"); + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_REF(error), + "rr_shutdown"); if (p->subchannel_list != nullptr) { - grpc_lb_subchannel_list_shutdown_and_unref(p->subchannel_list, + grpc_lb_subchannel_list_shutdown_and_unref(exec_ctx, p->subchannel_list, "sl_shutdown_rr_shutdown"); p->subchannel_list = nullptr; } if (p->latest_pending_subchannel_list != nullptr) { grpc_lb_subchannel_list_shutdown_and_unref( - p->latest_pending_subchannel_list, "sl_shutdown_pending_rr_shutdown"); + exec_ctx, p->latest_pending_subchannel_list, + "sl_shutdown_pending_rr_shutdown"); p->latest_pending_subchannel_list = nullptr; } - grpc_lb_policy_try_reresolve(&p->base, &grpc_lb_round_robin_trace, + grpc_lb_policy_try_reresolve(exec_ctx, &p->base, &grpc_lb_round_robin_trace, GRPC_ERROR_CANCELLED); GRPC_ERROR_UNREF(error); } -static void rr_cancel_pick_locked(grpc_lb_policy* pol, +static void rr_cancel_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, grpc_connected_subchannel** target, grpc_error* error) { round_robin_lb_policy* p = (round_robin_lb_policy*)pol; @@ -208,7 +210,7 @@ static void rr_cancel_pick_locked(grpc_lb_policy* pol, pending_pick* next = pp->next; if (pp->target == target) { *target = nullptr; - GRPC_CLOSURE_SCHED(pp->on_complete, + GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Pick cancelled", &error, 1)); gpr_free(pp); @@ -221,7 +223,7 @@ static void rr_cancel_pick_locked(grpc_lb_policy* pol, GRPC_ERROR_UNREF(error); } -static void rr_cancel_picks_locked(grpc_lb_policy* pol, +static void rr_cancel_picks_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, uint32_t initial_metadata_flags_mask, uint32_t initial_metadata_flags_eq, grpc_error* error) { @@ -233,7 +235,7 @@ static void rr_cancel_picks_locked(grpc_lb_policy* pol, if ((pp->initial_metadata_flags & initial_metadata_flags_mask) == initial_metadata_flags_eq) { *pp->target = nullptr; - GRPC_CLOSURE_SCHED(pp->on_complete, + GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Pick cancelled", &error, 1)); gpr_free(pp); @@ -246,26 +248,27 @@ static void rr_cancel_picks_locked(grpc_lb_policy* pol, GRPC_ERROR_UNREF(error); } -static void start_picking_locked(round_robin_lb_policy* p) { +static void start_picking_locked(grpc_exec_ctx* exec_ctx, + round_robin_lb_policy* p) { p->started_picking = true; for (size_t i = 0; i < p->subchannel_list->num_subchannels; i++) { if (p->subchannel_list->subchannels[i].subchannel != nullptr) { grpc_lb_subchannel_list_ref_for_connectivity_watch(p->subchannel_list, "connectivity_watch"); grpc_lb_subchannel_data_start_connectivity_watch( - &p->subchannel_list->subchannels[i]); + exec_ctx, &p->subchannel_list->subchannels[i]); } } } -static void rr_exit_idle_locked(grpc_lb_policy* pol) { +static void rr_exit_idle_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { round_robin_lb_policy* p = (round_robin_lb_policy*)pol; if (!p->started_picking) { - start_picking_locked(p); + start_picking_locked(exec_ctx, p); } } -static int rr_pick_locked(grpc_lb_policy* pol, +static int rr_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, const grpc_lb_policy_pick_args* pick_args, grpc_connected_subchannel** target, grpc_call_context_element* context, void** user_data, @@ -302,7 +305,7 @@ static int rr_pick_locked(grpc_lb_policy* pol, } /* no pick currently available. Save for later in list of pending picks */ if (!p->started_picking) { - start_picking_locked(p); + start_picking_locked(exec_ctx, p); } pending_pick* pp = (pending_pick*)gpr_malloc(sizeof(*pp)); pp->next = p->pending_picks; @@ -345,7 +348,8 @@ static void update_state_counters_locked(grpc_lb_subchannel_data* sd) { * (the grpc_lb_subchannel_data associated with the updated subchannel) and the * subchannel list \a sd belongs to (sd->subchannel_list). \a error will be used * only if the policy transitions to state TRANSIENT_FAILURE. */ -static void update_lb_connectivity_status_locked(grpc_lb_subchannel_data* sd, +static void update_lb_connectivity_status_locked(grpc_exec_ctx* exec_ctx, + grpc_lb_subchannel_data* sd, grpc_error* error) { /* In priority order. The first rule to match terminates the search (ie, if we * are on rule n, all previous rules were unfulfilled). @@ -378,36 +382,38 @@ static void update_lb_connectivity_status_locked(grpc_lb_subchannel_data* sd, round_robin_lb_policy* p = (round_robin_lb_policy*)subchannel_list->policy; if (subchannel_list->num_ready > 0) { /* 1) READY */ - grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_READY, + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, GRPC_CHANNEL_READY, GRPC_ERROR_NONE, "rr_ready"); } else if (sd->curr_connectivity_state == GRPC_CHANNEL_CONNECTING) { /* 2) CONNECTING */ - grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_CONNECTING, - GRPC_ERROR_NONE, "rr_connecting"); + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + GRPC_CHANNEL_CONNECTING, GRPC_ERROR_NONE, + "rr_connecting"); } else if (subchannel_list->num_shutdown == subchannel_list->num_subchannels) { /* 3) IDLE and re-resolve */ - grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_IDLE, + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, GRPC_CHANNEL_IDLE, GRPC_ERROR_NONE, "rr_exhausted_subchannels+reresolve"); p->started_picking = false; - grpc_lb_policy_try_reresolve(&p->base, &grpc_lb_round_robin_trace, + grpc_lb_policy_try_reresolve(exec_ctx, &p->base, &grpc_lb_round_robin_trace, GRPC_ERROR_NONE); } else if (subchannel_list->num_transient_failures == subchannel_list->num_subchannels) { /* 4) TRANSIENT_FAILURE */ - grpc_connectivity_state_set(&p->state_tracker, + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_REF(error), "rr_transient_failure"); } else if (subchannel_list->num_idle == subchannel_list->num_subchannels) { /* 5) IDLE */ - grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_IDLE, + grpc_connectivity_state_set(exec_ctx, &p->state_tracker, GRPC_CHANNEL_IDLE, GRPC_ERROR_NONE, "rr_idle"); } GRPC_ERROR_UNREF(error); } -static void rr_connectivity_changed_locked(void* arg, grpc_error* error) { +static void rr_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_lb_subchannel_data* sd = (grpc_lb_subchannel_data*)arg; round_robin_lb_policy* p = (round_robin_lb_policy*)sd->subchannel_list->policy; @@ -425,18 +431,18 @@ static void rr_connectivity_changed_locked(void* arg, grpc_error* error) { } // If the policy is shutting down, unref and return. if (p->shutdown) { - grpc_lb_subchannel_data_stop_connectivity_watch(sd); - grpc_lb_subchannel_data_unref_subchannel(sd, "rr_shutdown"); - grpc_lb_subchannel_list_unref_for_connectivity_watch(sd->subchannel_list, - "rr_shutdown"); + grpc_lb_subchannel_data_stop_connectivity_watch(exec_ctx, sd); + grpc_lb_subchannel_data_unref_subchannel(exec_ctx, sd, "rr_shutdown"); + grpc_lb_subchannel_list_unref_for_connectivity_watch( + exec_ctx, sd->subchannel_list, "rr_shutdown"); return; } // If the subchannel list is shutting down, stop watching. if (sd->subchannel_list->shutting_down || error == GRPC_ERROR_CANCELLED) { - grpc_lb_subchannel_data_stop_connectivity_watch(sd); - grpc_lb_subchannel_data_unref_subchannel(sd, "rr_sl_shutdown"); - grpc_lb_subchannel_list_unref_for_connectivity_watch(sd->subchannel_list, - "rr_sl_shutdown"); + grpc_lb_subchannel_data_stop_connectivity_watch(exec_ctx, sd); + grpc_lb_subchannel_data_unref_subchannel(exec_ctx, sd, "rr_sl_shutdown"); + grpc_lb_subchannel_list_unref_for_connectivity_watch( + exec_ctx, sd->subchannel_list, "rr_sl_shutdown"); return; } // If we're still here, the notification must be for a subchannel in @@ -449,13 +455,14 @@ static void rr_connectivity_changed_locked(void* arg, grpc_error* error) { sd->curr_connectivity_state = sd->pending_connectivity_state_unsafe; // Update state counters and new overall state. update_state_counters_locked(sd); - update_lb_connectivity_status_locked(sd, GRPC_ERROR_REF(error)); + update_lb_connectivity_status_locked(exec_ctx, sd, GRPC_ERROR_REF(error)); // If the sd's new state is SHUTDOWN, unref the subchannel. if (sd->curr_connectivity_state == GRPC_CHANNEL_SHUTDOWN) { - grpc_lb_subchannel_data_stop_connectivity_watch(sd); - grpc_lb_subchannel_data_unref_subchannel(sd, "rr_connectivity_shutdown"); + grpc_lb_subchannel_data_stop_connectivity_watch(exec_ctx, sd); + grpc_lb_subchannel_data_unref_subchannel(exec_ctx, sd, + "rr_connectivity_shutdown"); grpc_lb_subchannel_list_unref_for_connectivity_watch( - sd->subchannel_list, "rr_connectivity_shutdown"); + exec_ctx, sd->subchannel_list, "rr_connectivity_shutdown"); } else { // sd not in SHUTDOWN if (sd->curr_connectivity_state == GRPC_CHANNEL_READY) { if (sd->connected_subchannel == nullptr) { @@ -483,8 +490,8 @@ static void rr_connectivity_changed_locked(void* arg, grpc_error* error) { } if (p->subchannel_list != nullptr) { // dispose of the current subchannel_list - grpc_lb_subchannel_list_shutdown_and_unref(p->subchannel_list, - "sl_phase_out_shutdown"); + grpc_lb_subchannel_list_shutdown_and_unref( + exec_ctx, p->subchannel_list, "sl_phase_out_shutdown"); } p->subchannel_list = p->latest_pending_subchannel_list; p->latest_pending_subchannel_list = nullptr; @@ -516,30 +523,32 @@ static void rr_connectivity_changed_locked(void* arg, grpc_error* error) { (void*)p, (void*)selected->subchannel, (void*)p->subchannel_list, (unsigned long)next_ready_index); } - GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, GRPC_ERROR_NONE); gpr_free(pp); } } // Renew notification. - grpc_lb_subchannel_data_start_connectivity_watch(sd); + grpc_lb_subchannel_data_start_connectivity_watch(exec_ctx, sd); } } static grpc_connectivity_state rr_check_connectivity_locked( - grpc_lb_policy* pol, grpc_error** error) { + grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, grpc_error** error) { round_robin_lb_policy* p = (round_robin_lb_policy*)pol; return grpc_connectivity_state_get(&p->state_tracker, error); } -static void rr_notify_on_state_change_locked(grpc_lb_policy* pol, +static void rr_notify_on_state_change_locked(grpc_exec_ctx* exec_ctx, + grpc_lb_policy* pol, grpc_connectivity_state* current, grpc_closure* notify) { round_robin_lb_policy* p = (round_robin_lb_policy*)pol; - grpc_connectivity_state_notify_on_state_change(&p->state_tracker, current, - notify); + grpc_connectivity_state_notify_on_state_change(exec_ctx, &p->state_tracker, + current, notify); } -static void rr_ping_one_locked(grpc_lb_policy* pol, grpc_closure* closure) { +static void rr_ping_one_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, + grpc_closure* closure) { round_robin_lb_policy* p = (round_robin_lb_policy*)pol; const size_t next_ready_index = get_next_ready_subchannel_index_locked(p); if (next_ready_index < p->subchannel_list->num_subchannels) { @@ -547,15 +556,16 @@ static void rr_ping_one_locked(grpc_lb_policy* pol, grpc_closure* closure) { &p->subchannel_list->subchannels[next_ready_index]; grpc_connected_subchannel* target = GRPC_CONNECTED_SUBCHANNEL_REF( selected->connected_subchannel, "rr_ping"); - grpc_connected_subchannel_ping(target, closure); - GRPC_CONNECTED_SUBCHANNEL_UNREF(target, "rr_ping"); + grpc_connected_subchannel_ping(exec_ctx, target, closure); + GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, target, "rr_ping"); } else { - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Round Robin not connected")); + GRPC_CLOSURE_SCHED( + exec_ctx, closure, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Round Robin not connected")); } } -static void rr_update_locked(grpc_lb_policy* policy, +static void rr_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, const grpc_lb_policy_args* args) { round_robin_lb_policy* p = (round_robin_lb_policy*)policy; const grpc_arg* arg = @@ -566,7 +576,7 @@ static void rr_update_locked(grpc_lb_policy* policy, // Otherwise, keep using the current subchannel list (ignore this update). if (p->subchannel_list == nullptr) { grpc_connectivity_state_set( - &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Missing update in args"), "rr_update_missing"); } @@ -578,15 +588,15 @@ static void rr_update_locked(grpc_lb_policy* policy, addresses->num_addresses); } grpc_lb_subchannel_list* subchannel_list = grpc_lb_subchannel_list_create( - &p->base, &grpc_lb_round_robin_trace, addresses, args, + exec_ctx, &p->base, &grpc_lb_round_robin_trace, addresses, args, rr_connectivity_changed_locked); if (subchannel_list->num_subchannels == 0) { grpc_connectivity_state_set( - &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Empty update"), "rr_update_empty"); if (p->subchannel_list != nullptr) { - grpc_lb_subchannel_list_shutdown_and_unref(p->subchannel_list, + grpc_lb_subchannel_list_shutdown_and_unref(exec_ctx, p->subchannel_list, "sl_shutdown_empty_update"); } p->subchannel_list = subchannel_list; // empty list @@ -602,7 +612,7 @@ static void rr_update_locked(grpc_lb_policy* policy, (void*)subchannel_list); } grpc_lb_subchannel_list_shutdown_and_unref( - p->latest_pending_subchannel_list, "sl_outdated"); + exec_ctx, p->latest_pending_subchannel_list, "sl_outdated"); } p->latest_pending_subchannel_list = subchannel_list; for (size_t i = 0; i < subchannel_list->num_subchannels; ++i) { @@ -613,21 +623,22 @@ static void rr_update_locked(grpc_lb_policy* policy, grpc_lb_subchannel_list_ref_for_connectivity_watch(subchannel_list, "connectivity_watch"); grpc_lb_subchannel_data_start_connectivity_watch( - &subchannel_list->subchannels[i]); + exec_ctx, &subchannel_list->subchannels[i]); } } else { // The policy isn't picking yet. Save the update for later, disposing of // previous version if any. if (p->subchannel_list != nullptr) { grpc_lb_subchannel_list_shutdown_and_unref( - p->subchannel_list, "rr_update_before_started_picking"); + exec_ctx, p->subchannel_list, "rr_update_before_started_picking"); } p->subchannel_list = subchannel_list; } } static void rr_set_reresolve_closure_locked( - grpc_lb_policy* policy, grpc_closure* request_reresolution) { + grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, + grpc_closure* request_reresolution) { round_robin_lb_policy* p = (round_robin_lb_policy*)policy; GPR_ASSERT(!p->shutdown); GPR_ASSERT(policy->request_reresolution == nullptr); @@ -651,7 +662,8 @@ static void round_robin_factory_ref(grpc_lb_policy_factory* factory) {} static void round_robin_factory_unref(grpc_lb_policy_factory* factory) {} -static grpc_lb_policy* round_robin_create(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->client_channel_factory != nullptr); round_robin_lb_policy* p = (round_robin_lb_policy*)gpr_zalloc(sizeof(*p)); @@ -659,7 +671,7 @@ static grpc_lb_policy* round_robin_create(grpc_lb_policy_factory* factory, grpc_subchannel_index_ref(); grpc_connectivity_state_init(&p->state_tracker, GRPC_CHANNEL_IDLE, "round_robin"); - rr_update_locked(&p->base, args); + rr_update_locked(exec_ctx, &p->base, args); if (grpc_lb_round_robin_trace.enabled()) { gpr_log(GPR_DEBUG, "[RR %p] Created with %lu subchannels", (void*)p, (unsigned long)p->subchannel_list->num_subchannels); diff --git a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc index a3b4c8e524d..b6fce4d2075 100644 --- a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc +++ b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc @@ -28,7 +28,8 @@ #include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/transport/connectivity_state.h" -void grpc_lb_subchannel_data_unref_subchannel(grpc_lb_subchannel_data* sd, +void grpc_lb_subchannel_data_unref_subchannel(grpc_exec_ctx* exec_ctx, + grpc_lb_subchannel_data* sd, const char* reason) { if (sd->subchannel != nullptr) { if (sd->subchannel_list->tracer->enabled()) { @@ -40,22 +41,23 @@ void grpc_lb_subchannel_data_unref_subchannel(grpc_lb_subchannel_data* sd, (size_t)(sd - sd->subchannel_list->subchannels), sd->subchannel_list->num_subchannels, sd->subchannel); } - GRPC_SUBCHANNEL_UNREF(sd->subchannel, reason); + GRPC_SUBCHANNEL_UNREF(exec_ctx, sd->subchannel, reason); sd->subchannel = nullptr; if (sd->connected_subchannel != nullptr) { - GRPC_CONNECTED_SUBCHANNEL_UNREF(sd->connected_subchannel, reason); + GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, sd->connected_subchannel, + reason); sd->connected_subchannel = nullptr; } if (sd->user_data != nullptr) { GPR_ASSERT(sd->user_data_vtable != nullptr); - sd->user_data_vtable->destroy(sd->user_data); + sd->user_data_vtable->destroy(exec_ctx, sd->user_data); sd->user_data = nullptr; } } } void grpc_lb_subchannel_data_start_connectivity_watch( - grpc_lb_subchannel_data* sd) { + grpc_exec_ctx* exec_ctx, grpc_lb_subchannel_data* sd) { if (sd->subchannel_list->tracer->enabled()) { gpr_log(GPR_DEBUG, "[%s %p] subchannel list %p index %" PRIuPTR " of %" PRIuPTR @@ -67,13 +69,13 @@ void grpc_lb_subchannel_data_start_connectivity_watch( } sd->connectivity_notification_pending = true; grpc_subchannel_notify_on_state_change( - sd->subchannel, sd->subchannel_list->policy->interested_parties, + exec_ctx, sd->subchannel, sd->subchannel_list->policy->interested_parties, &sd->pending_connectivity_state_unsafe, &sd->connectivity_changed_closure); } void grpc_lb_subchannel_data_stop_connectivity_watch( - grpc_lb_subchannel_data* sd) { + grpc_exec_ctx* exec_ctx, grpc_lb_subchannel_data* sd) { if (sd->subchannel_list->tracer->enabled()) { gpr_log(GPR_DEBUG, "[%s %p] subchannel list %p index %" PRIuPTR " of %" PRIuPTR @@ -88,7 +90,7 @@ void grpc_lb_subchannel_data_stop_connectivity_watch( } grpc_lb_subchannel_list* grpc_lb_subchannel_list_create( - grpc_lb_policy* p, grpc_core::TraceFlag* tracer, + grpc_exec_ctx* exec_ctx, grpc_lb_policy* p, grpc_core::TraceFlag* tracer, const grpc_lb_addresses* addresses, const grpc_lb_policy_args* args, grpc_iomgr_cb_func connectivity_changed_cb) { grpc_lb_subchannel_list* subchannel_list = @@ -122,8 +124,8 @@ grpc_lb_subchannel_list* grpc_lb_subchannel_list_create( gpr_free(addr_arg.value.string); sc_args.args = new_args; grpc_subchannel* subchannel = grpc_client_channel_factory_create_subchannel( - args->client_channel_factory, &sc_args); - grpc_channel_args_destroy(new_args); + exec_ctx, args->client_channel_factory, &sc_args); + grpc_channel_args_destroy(exec_ctx, new_args); if (subchannel == nullptr) { // Subchannel could not be created. if (tracer->enabled()) { @@ -170,7 +172,8 @@ grpc_lb_subchannel_list* grpc_lb_subchannel_list_create( return subchannel_list; } -static void subchannel_list_destroy(grpc_lb_subchannel_list* subchannel_list) { +static void subchannel_list_destroy(grpc_exec_ctx* exec_ctx, + grpc_lb_subchannel_list* subchannel_list) { if (subchannel_list->tracer->enabled()) { gpr_log(GPR_DEBUG, "[%s %p] Destroying subchannel_list %p", subchannel_list->tracer->name(), subchannel_list->policy, @@ -178,7 +181,8 @@ static void subchannel_list_destroy(grpc_lb_subchannel_list* subchannel_list) { } for (size_t i = 0; i < subchannel_list->num_subchannels; i++) { grpc_lb_subchannel_data* sd = &subchannel_list->subchannels[i]; - grpc_lb_subchannel_data_unref_subchannel(sd, "subchannel_list_destroy"); + grpc_lb_subchannel_data_unref_subchannel(exec_ctx, sd, + "subchannel_list_destroy"); } gpr_free(subchannel_list->subchannels); gpr_free(subchannel_list); @@ -196,7 +200,8 @@ void grpc_lb_subchannel_list_ref(grpc_lb_subchannel_list* subchannel_list, } } -void grpc_lb_subchannel_list_unref(grpc_lb_subchannel_list* subchannel_list, +void grpc_lb_subchannel_list_unref(grpc_exec_ctx* exec_ctx, + grpc_lb_subchannel_list* subchannel_list, const char* reason) { const bool done = gpr_unref(&subchannel_list->refcount); if (subchannel_list->tracer->enabled()) { @@ -207,7 +212,7 @@ void grpc_lb_subchannel_list_unref(grpc_lb_subchannel_list* subchannel_list, reason); } if (done) { - subchannel_list_destroy(subchannel_list); + subchannel_list_destroy(exec_ctx, subchannel_list); } } @@ -218,13 +223,14 @@ void grpc_lb_subchannel_list_ref_for_connectivity_watch( } void grpc_lb_subchannel_list_unref_for_connectivity_watch( - grpc_lb_subchannel_list* subchannel_list, const char* reason) { - GRPC_LB_POLICY_WEAK_UNREF(subchannel_list->policy, reason); - grpc_lb_subchannel_list_unref(subchannel_list, reason); + grpc_exec_ctx* exec_ctx, grpc_lb_subchannel_list* subchannel_list, + const char* reason) { + GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, subchannel_list->policy, reason); + grpc_lb_subchannel_list_unref(exec_ctx, subchannel_list, reason); } static void subchannel_data_cancel_connectivity_watch( - grpc_lb_subchannel_data* sd, const char* reason) { + grpc_exec_ctx* exec_ctx, grpc_lb_subchannel_data* sd, const char* reason) { if (sd->subchannel_list->tracer->enabled()) { gpr_log(GPR_DEBUG, "[%s %p] subchannel list %p index %" PRIuPTR " of %" PRIuPTR @@ -234,12 +240,14 @@ static void subchannel_data_cancel_connectivity_watch( (size_t)(sd - sd->subchannel_list->subchannels), sd->subchannel_list->num_subchannels, sd->subchannel, reason); } - grpc_subchannel_notify_on_state_change(sd->subchannel, nullptr, nullptr, + grpc_subchannel_notify_on_state_change(exec_ctx, sd->subchannel, nullptr, + nullptr, &sd->connectivity_changed_closure); } void grpc_lb_subchannel_list_shutdown_and_unref( - grpc_lb_subchannel_list* subchannel_list, const char* reason) { + grpc_exec_ctx* exec_ctx, grpc_lb_subchannel_list* subchannel_list, + const char* reason) { if (subchannel_list->tracer->enabled()) { gpr_log(GPR_DEBUG, "[%s %p] Shutting down subchannel_list %p (%s)", subchannel_list->tracer->name(), subchannel_list->policy, @@ -253,10 +261,10 @@ void grpc_lb_subchannel_list_shutdown_and_unref( // the callback is responsible for unreffing the subchannel. // Otherwise, unref the subchannel directly. if (sd->connectivity_notification_pending) { - subchannel_data_cancel_connectivity_watch(sd, reason); + subchannel_data_cancel_connectivity_watch(exec_ctx, sd, reason); } else if (sd->subchannel != nullptr) { - grpc_lb_subchannel_data_unref_subchannel(sd, reason); + grpc_lb_subchannel_data_unref_subchannel(exec_ctx, sd, reason); } } - grpc_lb_subchannel_list_unref(subchannel_list, reason); + grpc_lb_subchannel_list_unref(exec_ctx, subchannel_list, reason); } diff --git a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h index 0f8cea9347e..e3e5eba56a5 100644 --- a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +++ b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h @@ -65,7 +65,8 @@ typedef struct { } grpc_lb_subchannel_data; /// Unrefs the subchannel contained in sd. -void grpc_lb_subchannel_data_unref_subchannel(grpc_lb_subchannel_data* sd, +void grpc_lb_subchannel_data_unref_subchannel(grpc_exec_ctx* exec_ctx, + grpc_lb_subchannel_data* sd, const char* reason); /// Starts watching the connectivity state of the subchannel. @@ -73,11 +74,11 @@ void grpc_lb_subchannel_data_unref_subchannel(grpc_lb_subchannel_data* sd, /// grpc_lb_subchannel_data_stop_connectivity_watch() or again call /// grpc_lb_subchannel_data_start_connectivity_watch(). void grpc_lb_subchannel_data_start_connectivity_watch( - grpc_lb_subchannel_data* sd); + grpc_exec_ctx* exec_ctx, grpc_lb_subchannel_data* sd); /// Stops watching the connectivity state of the subchannel. void grpc_lb_subchannel_data_stop_connectivity_watch( - grpc_lb_subchannel_data* sd); + grpc_exec_ctx* exec_ctx, grpc_lb_subchannel_data* sd); struct grpc_lb_subchannel_list { /** backpointer to owning policy */ @@ -116,14 +117,15 @@ struct grpc_lb_subchannel_list { }; grpc_lb_subchannel_list* grpc_lb_subchannel_list_create( - grpc_lb_policy* p, grpc_core::TraceFlag* tracer, + grpc_exec_ctx* exec_ctx, grpc_lb_policy* p, grpc_core::TraceFlag* tracer, const grpc_lb_addresses* addresses, const grpc_lb_policy_args* args, grpc_iomgr_cb_func connectivity_changed_cb); void grpc_lb_subchannel_list_ref(grpc_lb_subchannel_list* subchannel_list, const char* reason); -void grpc_lb_subchannel_list_unref(grpc_lb_subchannel_list* subchannel_list, +void grpc_lb_subchannel_list_unref(grpc_exec_ctx* exec_ctx, + grpc_lb_subchannel_list* subchannel_list, const char* reason); /// Takes and releases refs needed for a connectivity notification. @@ -131,11 +133,13 @@ void grpc_lb_subchannel_list_unref(grpc_lb_subchannel_list* subchannel_list, void grpc_lb_subchannel_list_ref_for_connectivity_watch( grpc_lb_subchannel_list* subchannel_list, const char* reason); void grpc_lb_subchannel_list_unref_for_connectivity_watch( - grpc_lb_subchannel_list* subchannel_list, const char* reason); + grpc_exec_ctx* exec_ctx, grpc_lb_subchannel_list* subchannel_list, + const char* reason); /// Mark subchannel_list as discarded. Unsubscribes all its subchannels. The /// connectivity state notification callback will ultimately unref it. void grpc_lb_subchannel_list_shutdown_and_unref( - grpc_lb_subchannel_list* subchannel_list, const char* reason); + grpc_exec_ctx* exec_ctx, grpc_lb_subchannel_list* subchannel_list, + const char* reason); #endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_SUBCHANNEL_LIST_H */ diff --git a/src/core/ext/filters/client_channel/lb_policy_factory.cc b/src/core/ext/filters/client_channel/lb_policy_factory.cc index dbf69fdcba4..d43f9fd1b92 100644 --- a/src/core/ext/filters/client_channel/lb_policy_factory.cc +++ b/src/core/ext/filters/client_channel/lb_policy_factory.cc @@ -112,11 +112,13 @@ int grpc_lb_addresses_cmp(const grpc_lb_addresses* addresses1, return 0; } -void grpc_lb_addresses_destroy(grpc_lb_addresses* addresses) { +void grpc_lb_addresses_destroy(grpc_exec_ctx* exec_ctx, + grpc_lb_addresses* addresses) { for (size_t i = 0; i < addresses->num_addresses; ++i) { gpr_free(addresses->addresses[i].balancer_name); if (addresses->addresses[i].user_data != nullptr) { - addresses->user_data_vtable->destroy(addresses->addresses[i].user_data); + addresses->user_data_vtable->destroy(exec_ctx, + addresses->addresses[i].user_data); } } gpr_free(addresses->addresses); @@ -126,8 +128,8 @@ void grpc_lb_addresses_destroy(grpc_lb_addresses* addresses) { static void* lb_addresses_copy(void* addresses) { return grpc_lb_addresses_copy((grpc_lb_addresses*)addresses); } -static void lb_addresses_destroy(void* addresses) { - grpc_lb_addresses_destroy((grpc_lb_addresses*)addresses); +static void lb_addresses_destroy(grpc_exec_ctx* exec_ctx, void* addresses) { + grpc_lb_addresses_destroy(exec_ctx, (grpc_lb_addresses*)addresses); } static int lb_addresses_cmp(void* addresses1, void* addresses2) { return grpc_lb_addresses_cmp((grpc_lb_addresses*)addresses1, @@ -160,7 +162,8 @@ void grpc_lb_policy_factory_unref(grpc_lb_policy_factory* factory) { } grpc_lb_policy* grpc_lb_policy_factory_create_lb_policy( - grpc_lb_policy_factory* factory, grpc_lb_policy_args* args) { + grpc_exec_ctx* exec_ctx, grpc_lb_policy_factory* factory, + grpc_lb_policy_args* args) { if (factory == nullptr) return nullptr; - return factory->vtable->create_lb_policy(factory, args); + return factory->vtable->create_lb_policy(exec_ctx, factory, args); } diff --git a/src/core/ext/filters/client_channel/lb_policy_factory.h b/src/core/ext/filters/client_channel/lb_policy_factory.h index 9da231b657b..8f6d8c1b082 100644 --- a/src/core/ext/filters/client_channel/lb_policy_factory.h +++ b/src/core/ext/filters/client_channel/lb_policy_factory.h @@ -50,7 +50,7 @@ typedef struct grpc_lb_address { typedef struct grpc_lb_user_data_vtable { void* (*copy)(void*); - void (*destroy)(void*); + void (*destroy)(grpc_exec_ctx* exec_ctx, void*); int (*cmp)(void*, void*); } grpc_lb_user_data_vtable; @@ -91,7 +91,8 @@ int grpc_lb_addresses_cmp(const grpc_lb_addresses* addresses1, const grpc_lb_addresses* addresses2); /** Destroys \a addresses. */ -void grpc_lb_addresses_destroy(grpc_lb_addresses* addresses); +void grpc_lb_addresses_destroy(grpc_exec_ctx* exec_ctx, + grpc_lb_addresses* addresses); /** Returns a channel arg containing \a addresses. */ grpc_arg grpc_lb_addresses_create_channel_arg( @@ -113,7 +114,8 @@ struct grpc_lb_policy_factory_vtable { void (*unref)(grpc_lb_policy_factory* factory); /** Implementation of grpc_lb_policy_factory_create_lb_policy */ - grpc_lb_policy* (*create_lb_policy)(grpc_lb_policy_factory* factory, + grpc_lb_policy* (*create_lb_policy)(grpc_exec_ctx* exec_ctx, + grpc_lb_policy_factory* factory, grpc_lb_policy_args* args); /** Name for the LB policy this factory implements */ @@ -125,6 +127,7 @@ void grpc_lb_policy_factory_unref(grpc_lb_policy_factory* factory); /** Create a lb_policy instance. */ grpc_lb_policy* grpc_lb_policy_factory_create_lb_policy( - grpc_lb_policy_factory* factory, grpc_lb_policy_args* args); + grpc_exec_ctx* exec_ctx, grpc_lb_policy_factory* factory, + grpc_lb_policy_args* args); #endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_FACTORY_H */ diff --git a/src/core/ext/filters/client_channel/lb_policy_registry.cc b/src/core/ext/filters/client_channel/lb_policy_registry.cc index edd0330c6a7..6e710e86d95 100644 --- a/src/core/ext/filters/client_channel/lb_policy_registry.cc +++ b/src/core/ext/filters/client_channel/lb_policy_registry.cc @@ -61,10 +61,10 @@ static grpc_lb_policy_factory* lookup_factory(const char* name) { return nullptr; } -grpc_lb_policy* grpc_lb_policy_create(const char* name, +grpc_lb_policy* grpc_lb_policy_create(grpc_exec_ctx* exec_ctx, const char* name, grpc_lb_policy_args* args) { grpc_lb_policy_factory* factory = lookup_factory(name); grpc_lb_policy* lb_policy = - grpc_lb_policy_factory_create_lb_policy(factory, args); + grpc_lb_policy_factory_create_lb_policy(exec_ctx, factory, args); return lb_policy; } diff --git a/src/core/ext/filters/client_channel/lb_policy_registry.h b/src/core/ext/filters/client_channel/lb_policy_registry.h index 5aff79376b5..acddc90fddc 100644 --- a/src/core/ext/filters/client_channel/lb_policy_registry.h +++ b/src/core/ext/filters/client_channel/lb_policy_registry.h @@ -34,7 +34,7 @@ void grpc_register_lb_policy(grpc_lb_policy_factory* factory); * * If \a name is NULL, the default factory from \a grpc_lb_policy_registry_init * will be returned. */ -grpc_lb_policy* grpc_lb_policy_create(const char* name, +grpc_lb_policy* grpc_lb_policy_create(grpc_exec_ctx* exec_ctx, const char* name, grpc_lb_policy_args* args); #endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_REGISTRY_H */ diff --git a/src/core/ext/filters/client_channel/proxy_mapper.cc b/src/core/ext/filters/client_channel/proxy_mapper.cc index be85cfcced9..c6ea5fc680b 100644 --- a/src/core/ext/filters/client_channel/proxy_mapper.cc +++ b/src/core/ext/filters/client_channel/proxy_mapper.cc @@ -23,22 +23,24 @@ void grpc_proxy_mapper_init(const grpc_proxy_mapper_vtable* vtable, mapper->vtable = vtable; } -bool grpc_proxy_mapper_map_name(grpc_proxy_mapper* mapper, +bool grpc_proxy_mapper_map_name(grpc_exec_ctx* exec_ctx, + grpc_proxy_mapper* mapper, const char* server_uri, const grpc_channel_args* args, char** name_to_resolve, grpc_channel_args** new_args) { - return mapper->vtable->map_name(mapper, server_uri, args, name_to_resolve, - new_args); + return mapper->vtable->map_name(exec_ctx, mapper, server_uri, args, + name_to_resolve, new_args); } -bool grpc_proxy_mapper_map_address(grpc_proxy_mapper* mapper, +bool grpc_proxy_mapper_map_address(grpc_exec_ctx* exec_ctx, + grpc_proxy_mapper* mapper, const grpc_resolved_address* address, const grpc_channel_args* args, grpc_resolved_address** new_address, grpc_channel_args** new_args) { - return mapper->vtable->map_address(mapper, address, args, new_address, - new_args); + return mapper->vtable->map_address(exec_ctx, mapper, address, args, + new_address, new_args); } void grpc_proxy_mapper_destroy(grpc_proxy_mapper* mapper) { diff --git a/src/core/ext/filters/client_channel/proxy_mapper.h b/src/core/ext/filters/client_channel/proxy_mapper.h index ce3e65ee466..a13861ccaf9 100644 --- a/src/core/ext/filters/client_channel/proxy_mapper.h +++ b/src/core/ext/filters/client_channel/proxy_mapper.h @@ -32,14 +32,14 @@ typedef struct { /// If no proxy is needed, returns false. /// Otherwise, sets \a name_to_resolve, optionally sets \a new_args, /// and returns true. - bool (*map_name)(grpc_proxy_mapper* mapper, const char* server_uri, - const grpc_channel_args* args, char** name_to_resolve, - grpc_channel_args** new_args); + bool (*map_name)(grpc_exec_ctx* exec_ctx, grpc_proxy_mapper* mapper, + const char* server_uri, const grpc_channel_args* args, + char** name_to_resolve, grpc_channel_args** new_args); /// Determines the proxy address to use to contact \a address. /// If no proxy is needed, returns false. /// Otherwise, sets \a new_address, optionally sets \a new_args, and /// returns true. - bool (*map_address)(grpc_proxy_mapper* mapper, + bool (*map_address)(grpc_exec_ctx* exec_ctx, grpc_proxy_mapper* mapper, const grpc_resolved_address* address, const grpc_channel_args* args, grpc_resolved_address** new_address, @@ -55,13 +55,15 @@ struct grpc_proxy_mapper { void grpc_proxy_mapper_init(const grpc_proxy_mapper_vtable* vtable, grpc_proxy_mapper* mapper); -bool grpc_proxy_mapper_map_name(grpc_proxy_mapper* mapper, +bool grpc_proxy_mapper_map_name(grpc_exec_ctx* exec_ctx, + grpc_proxy_mapper* mapper, const char* server_uri, const grpc_channel_args* args, char** name_to_resolve, grpc_channel_args** new_args); -bool grpc_proxy_mapper_map_address(grpc_proxy_mapper* mapper, +bool grpc_proxy_mapper_map_address(grpc_exec_ctx* exec_ctx, + grpc_proxy_mapper* mapper, const grpc_resolved_address* address, const grpc_channel_args* args, grpc_resolved_address** new_address, diff --git a/src/core/ext/filters/client_channel/proxy_mapper_registry.cc b/src/core/ext/filters/client_channel/proxy_mapper_registry.cc index 51778a20cc5..09967eea3c0 100644 --- a/src/core/ext/filters/client_channel/proxy_mapper_registry.cc +++ b/src/core/ext/filters/client_channel/proxy_mapper_registry.cc @@ -46,13 +46,14 @@ static void grpc_proxy_mapper_list_register(grpc_proxy_mapper_list* list, ++list->num_mappers; } -static bool grpc_proxy_mapper_list_map_name(grpc_proxy_mapper_list* list, +static bool grpc_proxy_mapper_list_map_name(grpc_exec_ctx* exec_ctx, + grpc_proxy_mapper_list* list, const char* server_uri, const grpc_channel_args* args, char** name_to_resolve, grpc_channel_args** new_args) { for (size_t i = 0; i < list->num_mappers; ++i) { - if (grpc_proxy_mapper_map_name(list->list[i], server_uri, args, + if (grpc_proxy_mapper_map_name(exec_ctx, list->list[i], server_uri, args, name_to_resolve, new_args)) { return true; } @@ -61,12 +62,12 @@ static bool grpc_proxy_mapper_list_map_name(grpc_proxy_mapper_list* list, } static bool grpc_proxy_mapper_list_map_address( - grpc_proxy_mapper_list* list, const grpc_resolved_address* address, - const grpc_channel_args* args, grpc_resolved_address** new_address, - grpc_channel_args** new_args) { + grpc_exec_ctx* exec_ctx, grpc_proxy_mapper_list* list, + const grpc_resolved_address* address, const grpc_channel_args* args, + grpc_resolved_address** new_address, grpc_channel_args** new_args) { for (size_t i = 0; i < list->num_mappers; ++i) { - if (grpc_proxy_mapper_map_address(list->list[i], address, args, new_address, - new_args)) { + if (grpc_proxy_mapper_map_address(exec_ctx, list->list[i], address, args, + new_address, new_args)) { return true; } } @@ -104,17 +105,20 @@ void grpc_proxy_mapper_register(bool at_start, grpc_proxy_mapper* mapper) { grpc_proxy_mapper_list_register(&g_proxy_mapper_list, at_start, mapper); } -bool grpc_proxy_mappers_map_name(const char* server_uri, +bool grpc_proxy_mappers_map_name(grpc_exec_ctx* exec_ctx, + const char* server_uri, const grpc_channel_args* args, char** name_to_resolve, grpc_channel_args** new_args) { - return grpc_proxy_mapper_list_map_name(&g_proxy_mapper_list, server_uri, args, - name_to_resolve, new_args); + return grpc_proxy_mapper_list_map_name(exec_ctx, &g_proxy_mapper_list, + server_uri, args, name_to_resolve, + new_args); } -bool grpc_proxy_mappers_map_address(const grpc_resolved_address* address, +bool grpc_proxy_mappers_map_address(grpc_exec_ctx* exec_ctx, + const grpc_resolved_address* address, const grpc_channel_args* args, grpc_resolved_address** new_address, grpc_channel_args** new_args) { - return grpc_proxy_mapper_list_map_address(&g_proxy_mapper_list, address, args, - new_address, new_args); + return grpc_proxy_mapper_list_map_address( + exec_ctx, &g_proxy_mapper_list, address, args, new_address, new_args); } diff --git a/src/core/ext/filters/client_channel/proxy_mapper_registry.h b/src/core/ext/filters/client_channel/proxy_mapper_registry.h index 2ad6c04e1d1..99e54d1a78b 100644 --- a/src/core/ext/filters/client_channel/proxy_mapper_registry.h +++ b/src/core/ext/filters/client_channel/proxy_mapper_registry.h @@ -29,12 +29,14 @@ void grpc_proxy_mapper_registry_shutdown(); /// the list. Otherwise, it will be added to the end. void grpc_proxy_mapper_register(bool at_start, grpc_proxy_mapper* mapper); -bool grpc_proxy_mappers_map_name(const char* server_uri, +bool grpc_proxy_mappers_map_name(grpc_exec_ctx* exec_ctx, + const char* server_uri, const grpc_channel_args* args, char** name_to_resolve, grpc_channel_args** new_args); -bool grpc_proxy_mappers_map_address(const grpc_resolved_address* address, +bool grpc_proxy_mappers_map_address(grpc_exec_ctx* exec_ctx, + const grpc_resolved_address* address, const grpc_channel_args* args, grpc_resolved_address** new_address, grpc_channel_args** new_args); diff --git a/src/core/ext/filters/client_channel/resolver.cc b/src/core/ext/filters/client_channel/resolver.cc index ff54e7179da..c16b1515c7c 100644 --- a/src/core/ext/filters/client_channel/resolver.cc +++ b/src/core/ext/filters/client_channel/resolver.cc @@ -46,8 +46,8 @@ void grpc_resolver_ref(grpc_resolver* resolver) { } #ifndef NDEBUG -void grpc_resolver_unref(grpc_resolver* resolver, const char* file, int line, - const char* reason) { +void grpc_resolver_unref(grpc_exec_ctx* exec_ctx, grpc_resolver* resolver, + const char* file, int line, const char* reason) { if (grpc_trace_resolver_refcount.enabled()) { gpr_atm old_refs = gpr_atm_no_barrier_load(&resolver->refs.count); gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, @@ -55,25 +55,27 @@ void grpc_resolver_unref(grpc_resolver* resolver, const char* file, int line, old_refs, old_refs - 1, reason); } #else -void grpc_resolver_unref(grpc_resolver* resolver) { +void grpc_resolver_unref(grpc_exec_ctx* exec_ctx, grpc_resolver* resolver) { #endif if (gpr_unref(&resolver->refs)) { grpc_combiner* combiner = resolver->combiner; - resolver->vtable->destroy(resolver); - GRPC_COMBINER_UNREF(combiner, "resolver"); + resolver->vtable->destroy(exec_ctx, resolver); + GRPC_COMBINER_UNREF(exec_ctx, combiner, "resolver"); } } -void grpc_resolver_shutdown_locked(grpc_resolver* resolver) { - resolver->vtable->shutdown_locked(resolver); +void grpc_resolver_shutdown_locked(grpc_exec_ctx* exec_ctx, + grpc_resolver* resolver) { + resolver->vtable->shutdown_locked(exec_ctx, resolver); } -void grpc_resolver_channel_saw_error_locked(grpc_resolver* resolver) { - resolver->vtable->channel_saw_error_locked(resolver); +void grpc_resolver_channel_saw_error_locked(grpc_exec_ctx* exec_ctx, + grpc_resolver* resolver) { + resolver->vtable->channel_saw_error_locked(exec_ctx, resolver); } -void grpc_resolver_next_locked(grpc_resolver* resolver, +void grpc_resolver_next_locked(grpc_exec_ctx* exec_ctx, grpc_resolver* resolver, grpc_channel_args** result, grpc_closure* on_complete) { - resolver->vtable->next_locked(resolver, result, on_complete); + resolver->vtable->next_locked(exec_ctx, resolver, result, on_complete); } diff --git a/src/core/ext/filters/client_channel/resolver.h b/src/core/ext/filters/client_channel/resolver.h index f6a4af01d67..4e8cfbe4170 100644 --- a/src/core/ext/filters/client_channel/resolver.h +++ b/src/core/ext/filters/client_channel/resolver.h @@ -35,40 +35,43 @@ struct grpc_resolver { }; struct grpc_resolver_vtable { - void (*destroy)(grpc_resolver* resolver); - void (*shutdown_locked)(grpc_resolver* resolver); - void (*channel_saw_error_locked)(grpc_resolver* resolver); - void (*next_locked)(grpc_resolver* resolver, grpc_channel_args** result, - grpc_closure* on_complete); + void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_resolver* resolver); + void (*shutdown_locked)(grpc_exec_ctx* exec_ctx, grpc_resolver* resolver); + void (*channel_saw_error_locked)(grpc_exec_ctx* exec_ctx, + grpc_resolver* resolver); + void (*next_locked)(grpc_exec_ctx* exec_ctx, grpc_resolver* resolver, + grpc_channel_args** result, grpc_closure* on_complete); }; #ifndef NDEBUG #define GRPC_RESOLVER_REF(p, r) grpc_resolver_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_RESOLVER_UNREF(p, r) \ - grpc_resolver_unref((p), __FILE__, __LINE__, (r)) +#define GRPC_RESOLVER_UNREF(e, p, r) \ + grpc_resolver_unref((e), (p), __FILE__, __LINE__, (r)) void grpc_resolver_ref(grpc_resolver* policy, const char* file, int line, const char* reason); -void grpc_resolver_unref(grpc_resolver* policy, const char* file, int line, - const char* reason); +void grpc_resolver_unref(grpc_exec_ctx* exec_ctx, grpc_resolver* policy, + const char* file, int line, const char* reason); #else #define GRPC_RESOLVER_REF(p, r) grpc_resolver_ref((p)) -#define GRPC_RESOLVER_UNREF(p, r) grpc_resolver_unref((p)) +#define GRPC_RESOLVER_UNREF(e, p, r) grpc_resolver_unref((e), (p)) void grpc_resolver_ref(grpc_resolver* policy); -void grpc_resolver_unref(grpc_resolver* policy); +void grpc_resolver_unref(grpc_exec_ctx* exec_ctx, grpc_resolver* policy); #endif void grpc_resolver_init(grpc_resolver* resolver, const grpc_resolver_vtable* vtable, grpc_combiner* combiner); -void grpc_resolver_shutdown_locked(grpc_resolver* resolver); +void grpc_resolver_shutdown_locked(grpc_exec_ctx* exec_ctx, + grpc_resolver* resolver); /** Notification that the channel has seen an error on some address. Can be used as a hint that re-resolution is desirable soon. Must be called from the combiner passed as a resolver_arg at construction time.*/ -void grpc_resolver_channel_saw_error_locked(grpc_resolver* resolver); +void grpc_resolver_channel_saw_error_locked(grpc_exec_ctx* exec_ctx, + grpc_resolver* resolver); /** Get the next result from the resolver. Expected to set \a *result with new channel args and then schedule \a on_complete for execution. @@ -78,7 +81,7 @@ void grpc_resolver_channel_saw_error_locked(grpc_resolver* resolver); Must be called from the combiner passed as a resolver_arg at construction time.*/ -void grpc_resolver_next_locked(grpc_resolver* resolver, +void grpc_resolver_next_locked(grpc_exec_ctx* exec_ctx, grpc_resolver* resolver, grpc_channel_args** result, grpc_closure* on_complete); diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc index 4ec4477c828..3a16b3492d1 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc @@ -97,14 +97,17 @@ typedef struct { char* service_config_json; } ares_dns_resolver; -static void dns_ares_destroy(grpc_resolver* r); +static void dns_ares_destroy(grpc_exec_ctx* exec_ctx, grpc_resolver* r); -static void dns_ares_start_resolving_locked(ares_dns_resolver* r); -static void dns_ares_maybe_finish_next_locked(ares_dns_resolver* r); +static void dns_ares_start_resolving_locked(grpc_exec_ctx* exec_ctx, + ares_dns_resolver* r); +static void dns_ares_maybe_finish_next_locked(grpc_exec_ctx* exec_ctx, + ares_dns_resolver* r); -static void dns_ares_shutdown_locked(grpc_resolver* r); -static void dns_ares_channel_saw_error_locked(grpc_resolver* r); -static void dns_ares_next_locked(grpc_resolver* r, +static void dns_ares_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_resolver* r); +static void dns_ares_channel_saw_error_locked(grpc_exec_ctx* exec_ctx, + grpc_resolver* r); +static void dns_ares_next_locked(grpc_exec_ctx* exec_ctx, grpc_resolver* r, grpc_channel_args** target_result, grpc_closure* on_complete); @@ -112,39 +115,43 @@ static const grpc_resolver_vtable dns_ares_resolver_vtable = { dns_ares_destroy, dns_ares_shutdown_locked, dns_ares_channel_saw_error_locked, dns_ares_next_locked}; -static void dns_ares_shutdown_locked(grpc_resolver* resolver) { +static void dns_ares_shutdown_locked(grpc_exec_ctx* exec_ctx, + grpc_resolver* resolver) { ares_dns_resolver* r = (ares_dns_resolver*)resolver; if (r->have_retry_timer) { - grpc_timer_cancel(&r->retry_timer); + grpc_timer_cancel(exec_ctx, &r->retry_timer); } if (r->pending_request != nullptr) { - grpc_cancel_ares_request(r->pending_request); + grpc_cancel_ares_request(exec_ctx, r->pending_request); } if (r->next_completion != nullptr) { *r->target_result = nullptr; - GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Resolver Shutdown")); + GRPC_CLOSURE_SCHED( + exec_ctx, r->next_completion, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resolver Shutdown")); r->next_completion = nullptr; } } -static void dns_ares_channel_saw_error_locked(grpc_resolver* resolver) { +static void dns_ares_channel_saw_error_locked(grpc_exec_ctx* exec_ctx, + grpc_resolver* resolver) { ares_dns_resolver* r = (ares_dns_resolver*)resolver; if (!r->resolving) { grpc_backoff_reset(&r->backoff_state); - dns_ares_start_resolving_locked(r); + dns_ares_start_resolving_locked(exec_ctx, r); } } -static void dns_ares_on_retry_timer_locked(void* arg, grpc_error* error) { +static void dns_ares_on_retry_timer_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { ares_dns_resolver* r = (ares_dns_resolver*)arg; r->have_retry_timer = false; if (error == GRPC_ERROR_NONE) { if (!r->resolving) { - dns_ares_start_resolving_locked(r); + dns_ares_start_resolving_locked(exec_ctx, r); } } - GRPC_RESOLVER_UNREF(&r->base, "retry-timer"); + GRPC_RESOLVER_UNREF(exec_ctx, &r->base, "retry-timer"); } static bool value_in_json_array(grpc_json* array, const char* value) { @@ -219,7 +226,8 @@ static char* choose_service_config(char* service_config_choice_json) { return service_config; } -static void dns_ares_on_resolved_locked(void* arg, grpc_error* error) { +static void dns_ares_on_resolved_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { ares_dns_resolver* r = (ares_dns_resolver*)arg; grpc_channel_args* result = nullptr; GPR_ASSERT(r->resolving); @@ -260,13 +268,13 @@ static void dns_ares_on_resolved_locked(void* arg, grpc_error* error) { num_args_to_add); if (service_config != nullptr) grpc_service_config_destroy(service_config); gpr_free(service_config_string); - grpc_lb_addresses_destroy(r->lb_addresses); + grpc_lb_addresses_destroy(exec_ctx, r->lb_addresses); } else { const char* msg = grpc_error_string(error); gpr_log(GPR_DEBUG, "dns resolution failed: %s", msg); grpc_millis next_try = - grpc_backoff_step(&r->backoff_state).next_attempt_start_time; - grpc_millis timeout = next_try - grpc_core::ExecCtx::Get()->Now(); + grpc_backoff_step(exec_ctx, &r->backoff_state).next_attempt_start_time; + grpc_millis timeout = next_try - grpc_exec_ctx_now(exec_ctx); gpr_log(GPR_INFO, "dns resolution failed (will retry): %s", grpc_error_string(error)); GPR_ASSERT(!r->have_retry_timer); @@ -277,19 +285,20 @@ static void dns_ares_on_resolved_locked(void* arg, grpc_error* error) { } else { gpr_log(GPR_DEBUG, "retrying immediately"); } - grpc_timer_init(&r->retry_timer, next_try, + grpc_timer_init(exec_ctx, &r->retry_timer, next_try, &r->dns_ares_on_retry_timer_locked); } if (r->resolved_result != nullptr) { - grpc_channel_args_destroy(r->resolved_result); + grpc_channel_args_destroy(exec_ctx, r->resolved_result); } r->resolved_result = result; r->resolved_version++; - dns_ares_maybe_finish_next_locked(r); - GRPC_RESOLVER_UNREF(&r->base, "dns-resolving"); + dns_ares_maybe_finish_next_locked(exec_ctx, r); + GRPC_RESOLVER_UNREF(exec_ctx, &r->base, "dns-resolving"); } -static void dns_ares_next_locked(grpc_resolver* resolver, +static void dns_ares_next_locked(grpc_exec_ctx* exec_ctx, + grpc_resolver* resolver, grpc_channel_args** target_result, grpc_closure* on_complete) { gpr_log(GPR_DEBUG, "dns_ares_next is called."); @@ -299,53 +308,56 @@ static void dns_ares_next_locked(grpc_resolver* resolver, r->target_result = target_result; if (r->resolved_version == 0 && !r->resolving) { grpc_backoff_reset(&r->backoff_state); - dns_ares_start_resolving_locked(r); + dns_ares_start_resolving_locked(exec_ctx, r); } else { - dns_ares_maybe_finish_next_locked(r); + dns_ares_maybe_finish_next_locked(exec_ctx, r); } } -static void dns_ares_start_resolving_locked(ares_dns_resolver* r) { +static void dns_ares_start_resolving_locked(grpc_exec_ctx* exec_ctx, + ares_dns_resolver* r) { GRPC_RESOLVER_REF(&r->base, "dns-resolving"); GPR_ASSERT(!r->resolving); r->resolving = true; r->lb_addresses = nullptr; r->service_config_json = nullptr; r->pending_request = grpc_dns_lookup_ares( - r->dns_server, r->name_to_resolve, r->default_port, r->interested_parties, - &r->dns_ares_on_resolved_locked, &r->lb_addresses, + exec_ctx, r->dns_server, r->name_to_resolve, r->default_port, + r->interested_parties, &r->dns_ares_on_resolved_locked, &r->lb_addresses, true /* check_grpclb */, r->request_service_config ? &r->service_config_json : nullptr); } -static void dns_ares_maybe_finish_next_locked(ares_dns_resolver* r) { +static void dns_ares_maybe_finish_next_locked(grpc_exec_ctx* exec_ctx, + ares_dns_resolver* r) { if (r->next_completion != nullptr && r->resolved_version != r->published_version) { *r->target_result = r->resolved_result == nullptr ? nullptr : grpc_channel_args_copy(r->resolved_result); gpr_log(GPR_DEBUG, "dns_ares_maybe_finish_next_locked"); - GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, r->next_completion, GRPC_ERROR_NONE); r->next_completion = nullptr; r->published_version = r->resolved_version; } } -static void dns_ares_destroy(grpc_resolver* gr) { +static void dns_ares_destroy(grpc_exec_ctx* exec_ctx, grpc_resolver* gr) { gpr_log(GPR_DEBUG, "dns_ares_destroy"); ares_dns_resolver* r = (ares_dns_resolver*)gr; if (r->resolved_result != nullptr) { - grpc_channel_args_destroy(r->resolved_result); + grpc_channel_args_destroy(exec_ctx, r->resolved_result); } - grpc_pollset_set_destroy(r->interested_parties); + grpc_pollset_set_destroy(exec_ctx, r->interested_parties); gpr_free(r->dns_server); gpr_free(r->name_to_resolve); gpr_free(r->default_port); - grpc_channel_args_destroy(r->channel_args); + grpc_channel_args_destroy(exec_ctx, r->channel_args); gpr_free(r); } -static grpc_resolver* dns_ares_create(grpc_resolver_args* args, +static grpc_resolver* dns_ares_create(grpc_exec_ctx* exec_ctx, + grpc_resolver_args* args, const char* default_port) { /* Get name from args. */ const char* path = args->uri->path; @@ -366,7 +378,8 @@ static grpc_resolver* dns_ares_create(grpc_resolver_args* args, arg, (grpc_integer_options){false, false, true}); r->interested_parties = grpc_pollset_set_create(); if (args->pollset_set != nullptr) { - grpc_pollset_set_add_pollset_set(r->interested_parties, args->pollset_set); + grpc_pollset_set_add_pollset_set(exec_ctx, r->interested_parties, + args->pollset_set); } grpc_backoff_init( &r->backoff_state, GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS * 1000, @@ -391,8 +404,9 @@ static void dns_ares_factory_ref(grpc_resolver_factory* factory) {} static void dns_ares_factory_unref(grpc_resolver_factory* factory) {} static grpc_resolver* dns_factory_create_resolver( - grpc_resolver_factory* factory, grpc_resolver_args* args) { - return dns_ares_create(args, "https"); + grpc_exec_ctx* exec_ctx, grpc_resolver_factory* factory, + grpc_resolver_args* args) { + return dns_ares_create(exec_ctx, args, "https"); } static char* dns_ares_factory_get_default_host_name( diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h index ba7dad63cfa..03ea36bfcc4 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h @@ -28,7 +28,8 @@ typedef struct grpc_ares_ev_driver grpc_ares_ev_driver; /* Start \a ev_driver. It will keep working until all IO on its ares_channel is done, or grpc_ares_ev_driver_destroy() is called. It may notify the callbacks bound to its ares_channel when necessary. */ -void grpc_ares_ev_driver_start(grpc_ares_ev_driver* ev_driver); +void grpc_ares_ev_driver_start(grpc_exec_ctx* exec_ctx, + grpc_ares_ev_driver* ev_driver); /* Returns the ares_channel owned by \a ev_driver. To bind a c-ares query to \a ev_driver, use the ares_channel owned by \a ev_driver as the arg of the @@ -46,7 +47,8 @@ grpc_error* grpc_ares_ev_driver_create(grpc_ares_ev_driver** ev_driver, void grpc_ares_ev_driver_destroy(grpc_ares_ev_driver* ev_driver); /* Shutdown all the grpc_fds used by \a ev_driver */ -void grpc_ares_ev_driver_shutdown(grpc_ares_ev_driver* ev_driver); +void grpc_ares_ev_driver_shutdown(grpc_exec_ctx* exec_ctx, + grpc_ares_ev_driver* ev_driver); #endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H \ */ diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc index 40e264504cf..4cb068a41dd 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc @@ -77,7 +77,8 @@ struct grpc_ares_ev_driver { bool shutting_down; }; -static void grpc_ares_notify_on_event_locked(grpc_ares_ev_driver* ev_driver); +static void grpc_ares_notify_on_event_locked(grpc_exec_ctx* exec_ctx, + grpc_ares_ev_driver* ev_driver); static grpc_ares_ev_driver* grpc_ares_ev_driver_ref( grpc_ares_ev_driver* ev_driver) { @@ -97,7 +98,7 @@ static void grpc_ares_ev_driver_unref(grpc_ares_ev_driver* ev_driver) { } } -static void fd_node_destroy(fd_node* fdn) { +static void fd_node_destroy(grpc_exec_ctx* exec_ctx, fd_node* fdn) { gpr_log(GPR_DEBUG, "delete fd: %d", grpc_fd_wrapped_fd(fdn->fd)); GPR_ASSERT(!fdn->readable_registered); GPR_ASSERT(!fdn->writable_registered); @@ -105,20 +106,21 @@ static void fd_node_destroy(fd_node* fdn) { /* c-ares library has closed the fd inside grpc_fd. This fd may be picked up immediately by another thread, and should not be closed by the following grpc_fd_orphan. */ - grpc_fd_orphan(fdn->fd, nullptr, nullptr, true /* already_closed */, + grpc_fd_orphan(exec_ctx, fdn->fd, nullptr, nullptr, true /* already_closed */, "c-ares query finished"); gpr_free(fdn); } -static void fd_node_shutdown(fd_node* fdn) { +static void fd_node_shutdown(grpc_exec_ctx* exec_ctx, fd_node* fdn) { gpr_mu_lock(&fdn->mu); fdn->shutting_down = true; if (!fdn->readable_registered && !fdn->writable_registered) { gpr_mu_unlock(&fdn->mu); - fd_node_destroy(fdn); + fd_node_destroy(exec_ctx, fdn); } else { grpc_fd_shutdown( - fdn->fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("c-ares fd shutdown")); + exec_ctx, fdn->fd, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("c-ares fd shutdown")); gpr_mu_unlock(&fdn->mu); } } @@ -158,13 +160,15 @@ void grpc_ares_ev_driver_destroy(grpc_ares_ev_driver* ev_driver) { grpc_ares_ev_driver_unref(ev_driver); } -void grpc_ares_ev_driver_shutdown(grpc_ares_ev_driver* ev_driver) { +void grpc_ares_ev_driver_shutdown(grpc_exec_ctx* exec_ctx, + grpc_ares_ev_driver* ev_driver) { gpr_mu_lock(&ev_driver->mu); ev_driver->shutting_down = true; fd_node* fn = ev_driver->fds; while (fn != nullptr) { - grpc_fd_shutdown(fn->fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "grpc_ares_ev_driver_shutdown")); + grpc_fd_shutdown( + exec_ctx, fn->fd, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("grpc_ares_ev_driver_shutdown")); fn = fn->next; } gpr_mu_unlock(&ev_driver->mu); @@ -195,7 +199,8 @@ static bool grpc_ares_is_fd_still_readable(grpc_ares_ev_driver* ev_driver, return ioctl(fd, FIONREAD, &bytes_available) == 0 && bytes_available > 0; } -static void on_readable_cb(void* arg, grpc_error* error) { +static void on_readable_cb(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { fd_node* fdn = (fd_node*)arg; grpc_ares_ev_driver* ev_driver = fdn->ev_driver; gpr_mu_lock(&fdn->mu); @@ -203,7 +208,7 @@ static void on_readable_cb(void* arg, grpc_error* error) { fdn->readable_registered = false; if (fdn->shutting_down && !fdn->writable_registered) { gpr_mu_unlock(&fdn->mu); - fd_node_destroy(fdn); + fd_node_destroy(exec_ctx, fdn); grpc_ares_ev_driver_unref(ev_driver); return; } @@ -224,12 +229,13 @@ static void on_readable_cb(void* arg, grpc_error* error) { ares_cancel(ev_driver->channel); } gpr_mu_lock(&ev_driver->mu); - grpc_ares_notify_on_event_locked(ev_driver); + grpc_ares_notify_on_event_locked(exec_ctx, ev_driver); gpr_mu_unlock(&ev_driver->mu); grpc_ares_ev_driver_unref(ev_driver); } -static void on_writable_cb(void* arg, grpc_error* error) { +static void on_writable_cb(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { fd_node* fdn = (fd_node*)arg; grpc_ares_ev_driver* ev_driver = fdn->ev_driver; gpr_mu_lock(&fdn->mu); @@ -237,7 +243,7 @@ static void on_writable_cb(void* arg, grpc_error* error) { fdn->writable_registered = false; if (fdn->shutting_down && !fdn->readable_registered) { gpr_mu_unlock(&fdn->mu); - fd_node_destroy(fdn); + fd_node_destroy(exec_ctx, fdn); grpc_ares_ev_driver_unref(ev_driver); return; } @@ -256,7 +262,7 @@ static void on_writable_cb(void* arg, grpc_error* error) { ares_cancel(ev_driver->channel); } gpr_mu_lock(&ev_driver->mu); - grpc_ares_notify_on_event_locked(ev_driver); + grpc_ares_notify_on_event_locked(exec_ctx, ev_driver); gpr_mu_unlock(&ev_driver->mu); grpc_ares_ev_driver_unref(ev_driver); } @@ -267,7 +273,8 @@ ares_channel* grpc_ares_ev_driver_get_channel(grpc_ares_ev_driver* ev_driver) { // Get the file descriptors used by the ev_driver's ares channel, register // driver_closure with these filedescriptors. -static void grpc_ares_notify_on_event_locked(grpc_ares_ev_driver* ev_driver) { +static void grpc_ares_notify_on_event_locked(grpc_exec_ctx* exec_ctx, + grpc_ares_ev_driver* ev_driver) { fd_node* new_list = nullptr; if (!ev_driver->shutting_down) { ares_socket_t socks[ARES_GETSOCK_MAXNUM]; @@ -293,7 +300,7 @@ static void grpc_ares_notify_on_event_locked(grpc_ares_ev_driver* ev_driver) { grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&fdn->write_closure, on_writable_cb, fdn, grpc_schedule_on_exec_ctx); - grpc_pollset_set_add_fd(ev_driver->pollset_set, fdn->fd); + grpc_pollset_set_add_fd(exec_ctx, ev_driver->pollset_set, fdn->fd); gpr_free(fd_name); } fdn->next = new_list; @@ -305,7 +312,7 @@ static void grpc_ares_notify_on_event_locked(grpc_ares_ev_driver* ev_driver) { !fdn->readable_registered) { grpc_ares_ev_driver_ref(ev_driver); gpr_log(GPR_DEBUG, "notify read on: %d", grpc_fd_wrapped_fd(fdn->fd)); - grpc_fd_notify_on_read(fdn->fd, &fdn->read_closure); + grpc_fd_notify_on_read(exec_ctx, fdn->fd, &fdn->read_closure); fdn->readable_registered = true; } // Register write_closure if the socket is writable and write_closure @@ -315,7 +322,7 @@ static void grpc_ares_notify_on_event_locked(grpc_ares_ev_driver* ev_driver) { gpr_log(GPR_DEBUG, "notify write on: %d", grpc_fd_wrapped_fd(fdn->fd)); grpc_ares_ev_driver_ref(ev_driver); - grpc_fd_notify_on_write(fdn->fd, &fdn->write_closure); + grpc_fd_notify_on_write(exec_ctx, fdn->fd, &fdn->write_closure); fdn->writable_registered = true; } gpr_mu_unlock(&fdn->mu); @@ -328,7 +335,7 @@ static void grpc_ares_notify_on_event_locked(grpc_ares_ev_driver* ev_driver) { while (ev_driver->fds != nullptr) { fd_node* cur = ev_driver->fds; ev_driver->fds = ev_driver->fds->next; - fd_node_shutdown(cur); + fd_node_shutdown(exec_ctx, cur); } ev_driver->fds = new_list; // If the ev driver has no working fd, all the tasks are done. @@ -338,11 +345,12 @@ static void grpc_ares_notify_on_event_locked(grpc_ares_ev_driver* ev_driver) { } } -void grpc_ares_ev_driver_start(grpc_ares_ev_driver* ev_driver) { +void grpc_ares_ev_driver_start(grpc_exec_ctx* exec_ctx, + grpc_ares_ev_driver* ev_driver) { gpr_mu_lock(&ev_driver->mu); if (!ev_driver->working) { ev_driver->working = true; - grpc_ares_notify_on_event_locked(ev_driver); + grpc_ares_notify_on_event_locked(exec_ctx, ev_driver); } gpr_mu_unlock(&ev_driver->mu); } diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc index 3a870b2d061..7846576c116 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -96,12 +96,24 @@ static void grpc_ares_request_ref(grpc_ares_request* r) { gpr_ref(&r->pending_queries); } -static void grpc_ares_request_unref(grpc_ares_request* r) { +static void grpc_ares_request_unref(grpc_exec_ctx* exec_ctx, + grpc_ares_request* r) { /* If there are no pending queries, invoke on_done callback and destroy the request */ if (gpr_unref(&r->pending_queries)) { /* TODO(zyc): Sort results with RFC6724 before invoking on_done. */ - GRPC_CLOSURE_SCHED(r->on_done, r->error); + if (exec_ctx == nullptr) { + /* A new exec_ctx is created here, as the c-ares interface does not + provide one in ares_host_callback. It's safe to schedule on_done with + the newly created exec_ctx, since the caller has been warned not to + acquire locks in on_done. ares_dns_resolver is using combiner to + protect resources needed by on_done. */ + grpc_exec_ctx new_exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_CLOSURE_SCHED(&new_exec_ctx, r->on_done, r->error); + grpc_exec_ctx_finish(&new_exec_ctx); + } else { + GRPC_CLOSURE_SCHED(exec_ctx, r->on_done, r->error); + } gpr_mu_destroy(&r->mu); grpc_ares_ev_driver_destroy(r->ev_driver); gpr_free(r); @@ -121,8 +133,9 @@ static grpc_ares_hostbyname_request* create_hostbyname_request( return hr; } -static void destroy_hostbyname_request(grpc_ares_hostbyname_request* hr) { - grpc_ares_request_unref(hr->parent_request); +static void destroy_hostbyname_request(grpc_exec_ctx* exec_ctx, + grpc_ares_hostbyname_request* hr) { + grpc_ares_request_unref(exec_ctx, hr->parent_request); gpr_free(hr->host); gpr_free(hr); } @@ -207,13 +220,13 @@ static void on_hostbyname_done_cb(void* arg, int status, int timeouts, } } gpr_mu_unlock(&r->mu); - destroy_hostbyname_request(hr); + destroy_hostbyname_request(nullptr, hr); } static void on_srv_query_done_cb(void* arg, int status, int timeouts, unsigned char* abuf, int alen) { grpc_ares_request* r = (grpc_ares_request*)arg; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_DEBUG, "on_query_srv_done_cb"); if (status == ARES_SUCCESS) { gpr_log(GPR_DEBUG, "on_query_srv_done_cb ARES_SUCCESS"); @@ -233,7 +246,7 @@ static void on_srv_query_done_cb(void* arg, int status, int timeouts, r, srv_it->host, htons(srv_it->port), true /* is_balancer */); ares_gethostbyname(*channel, hr->host, AF_INET, on_hostbyname_done_cb, hr); - grpc_ares_ev_driver_start(r->ev_driver); + grpc_ares_ev_driver_start(&exec_ctx, r->ev_driver); } } if (reply != nullptr) { @@ -251,7 +264,8 @@ static void on_srv_query_done_cb(void* arg, int status, int timeouts, r->error = grpc_error_add_child(error, r->error); } } - grpc_ares_request_unref(r); + grpc_ares_request_unref(&exec_ctx, r); + grpc_exec_ctx_finish(&exec_ctx); } static const char g_service_config_attribute_prefix[] = "grpc_config="; @@ -309,13 +323,14 @@ fail: } done: gpr_mu_unlock(&r->mu); - grpc_ares_request_unref(r); + grpc_ares_request_unref(nullptr, r); } static grpc_ares_request* grpc_dns_lookup_ares_impl( - const char* dns_server, const char* name, const char* default_port, - grpc_pollset_set* interested_parties, grpc_closure* on_done, - grpc_lb_addresses** addrs, bool check_grpclb, char** service_config_json) { + grpc_exec_ctx* exec_ctx, const char* dns_server, const char* name, + const char* default_port, grpc_pollset_set* interested_parties, + grpc_closure* on_done, grpc_lb_addresses** addrs, bool check_grpclb, + char** service_config_json) { grpc_error* error = GRPC_ERROR_NONE; grpc_ares_hostbyname_request* hr = nullptr; grpc_ares_request* r = nullptr; @@ -422,28 +437,28 @@ static grpc_ares_request* grpc_dns_lookup_ares_impl( gpr_free(config_name); } /* TODO(zyc): Handle CNAME records here. */ - grpc_ares_ev_driver_start(r->ev_driver); - grpc_ares_request_unref(r); + grpc_ares_ev_driver_start(exec_ctx, r->ev_driver); + grpc_ares_request_unref(exec_ctx, r); gpr_free(host); gpr_free(port); return r; error_cleanup: - GRPC_CLOSURE_SCHED(on_done, error); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, error); gpr_free(host); gpr_free(port); return nullptr; } grpc_ares_request* (*grpc_dns_lookup_ares)( - const char* dns_server, const char* name, const char* default_port, - grpc_pollset_set* interested_parties, grpc_closure* on_done, - grpc_lb_addresses** addrs, bool check_grpclb, + grpc_exec_ctx* exec_ctx, const char* dns_server, const char* name, + const char* default_port, grpc_pollset_set* interested_parties, + grpc_closure* on_done, grpc_lb_addresses** addrs, bool check_grpclb, char** service_config_json) = grpc_dns_lookup_ares_impl; -void grpc_cancel_ares_request(grpc_ares_request* r) { +void grpc_cancel_ares_request(grpc_exec_ctx* exec_ctx, grpc_ares_request* r) { if (grpc_dns_lookup_ares == grpc_dns_lookup_ares_impl) { - grpc_ares_ev_driver_shutdown(r->ev_driver); + grpc_ares_ev_driver_shutdown(exec_ctx, r->ev_driver); } } @@ -486,7 +501,8 @@ typedef struct grpc_resolve_address_ares_request { grpc_closure on_dns_lookup_done; } grpc_resolve_address_ares_request; -static void on_dns_lookup_done_cb(void* arg, grpc_error* error) { +static void on_dns_lookup_done_cb(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_resolve_address_ares_request* r = (grpc_resolve_address_ares_request*)arg; grpc_resolved_addresses** resolved_addresses = r->addrs_out; @@ -504,12 +520,14 @@ static void on_dns_lookup_done_cb(void* arg, grpc_error* error) { &r->lb_addrs->addresses[i].address, sizeof(grpc_resolved_address)); } } - GRPC_CLOSURE_SCHED(r->on_resolve_address_done, GRPC_ERROR_REF(error)); - grpc_lb_addresses_destroy(r->lb_addrs); + GRPC_CLOSURE_SCHED(exec_ctx, r->on_resolve_address_done, + GRPC_ERROR_REF(error)); + grpc_lb_addresses_destroy(exec_ctx, r->lb_addrs); gpr_free(r); } -static void grpc_resolve_address_ares_impl(const char* name, +static void grpc_resolve_address_ares_impl(grpc_exec_ctx* exec_ctx, + const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, @@ -521,14 +539,14 @@ static void grpc_resolve_address_ares_impl(const char* name, r->on_resolve_address_done = on_done; GRPC_CLOSURE_INIT(&r->on_dns_lookup_done, on_dns_lookup_done_cb, r, grpc_schedule_on_exec_ctx); - grpc_dns_lookup_ares(nullptr /* dns_server */, name, default_port, + grpc_dns_lookup_ares(exec_ctx, nullptr /* dns_server */, name, default_port, interested_parties, &r->on_dns_lookup_done, &r->lb_addrs, false /* check_grpclb */, nullptr /* service_config_json */); } void (*grpc_resolve_address_ares)( - const char* name, const char* default_port, + grpc_exec_ctx* exec_ctx, const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addrs) = grpc_resolve_address_ares_impl; diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h index 86d870e0a6d..72db6229544 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h @@ -32,7 +32,8 @@ typedef struct grpc_ares_request grpc_ares_request; must be called at least once before this function. \a on_done may be called directly in this function without being scheduled with \a exec_ctx, so it must not try to acquire locks that are being held by the caller. */ -extern void (*grpc_resolve_address_ares)(const char* name, +extern void (*grpc_resolve_address_ares)(grpc_exec_ctx* exec_ctx, + const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, @@ -46,13 +47,14 @@ extern void (*grpc_resolve_address_ares)(const char* name, scheduled with \a exec_ctx, so it must not try to acquire locks that are being held by the caller. */ extern grpc_ares_request* (*grpc_dns_lookup_ares)( - const char* dns_server, const char* name, const char* default_port, - grpc_pollset_set* interested_parties, grpc_closure* on_done, - grpc_lb_addresses** addresses, bool check_grpclb, + grpc_exec_ctx* exec_ctx, const char* dns_server, const char* name, + const char* default_port, grpc_pollset_set* interested_parties, + grpc_closure* on_done, grpc_lb_addresses** addresses, bool check_grpclb, char** service_config_json); /* Cancel the pending grpc_ares_request \a request */ -void grpc_cancel_ares_request(grpc_ares_request* request); +void grpc_cancel_ares_request(grpc_exec_ctx* exec_ctx, + grpc_ares_request* request); /* Initialize gRPC ares wrapper. Must be called at least once before grpc_resolve_address_ares(). */ diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc index a184cf2d57d..a68a7c47fb6 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc @@ -26,32 +26,34 @@ struct grpc_ares_request { }; static grpc_ares_request* grpc_dns_lookup_ares_impl( - const char* dns_server, const char* name, const char* default_port, - grpc_pollset_set* interested_parties, grpc_closure* on_done, - grpc_lb_addresses** addrs, bool check_grpclb, char** service_config_json) { + grpc_exec_ctx* exec_ctx, const char* dns_server, const char* name, + const char* default_port, grpc_pollset_set* interested_parties, + grpc_closure* on_done, grpc_lb_addresses** addrs, bool check_grpclb, + char** service_config_json) { return NULL; } grpc_ares_request* (*grpc_dns_lookup_ares)( - const char* dns_server, const char* name, const char* default_port, - grpc_pollset_set* interested_parties, grpc_closure* on_done, - grpc_lb_addresses** addrs, bool check_grpclb, + grpc_exec_ctx* exec_ctx, const char* dns_server, const char* name, + const char* default_port, grpc_pollset_set* interested_parties, + grpc_closure* on_done, grpc_lb_addresses** addrs, bool check_grpclb, char** service_config_json) = grpc_dns_lookup_ares_impl; -void grpc_cancel_ares_request(grpc_ares_request* r) {} +void grpc_cancel_ares_request(grpc_exec_ctx* exec_ctx, grpc_ares_request* r) {} grpc_error* grpc_ares_init(void) { return GRPC_ERROR_NONE; } void grpc_ares_cleanup(void) {} -static void grpc_resolve_address_ares_impl(const char* name, +static void grpc_resolve_address_ares_impl(grpc_exec_ctx* exec_ctx, + const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addrs) {} void (*grpc_resolve_address_ares)( - const char* name, const char* default_port, + grpc_exec_ctx* exec_ctx, const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addrs) = grpc_resolve_address_ares_impl; diff --git a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc index 77698e97aa5..fc40ce69668 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc @@ -76,42 +76,49 @@ typedef struct { grpc_resolved_addresses* addresses; } dns_resolver; -static void dns_destroy(grpc_resolver* r); +static void dns_destroy(grpc_exec_ctx* exec_ctx, grpc_resolver* r); -static void dns_start_resolving_locked(dns_resolver* r); -static void dns_maybe_finish_next_locked(dns_resolver* r); +static void dns_start_resolving_locked(grpc_exec_ctx* exec_ctx, + dns_resolver* r); +static void dns_maybe_finish_next_locked(grpc_exec_ctx* exec_ctx, + dns_resolver* r); -static void dns_shutdown_locked(grpc_resolver* r); -static void dns_channel_saw_error_locked(grpc_resolver* r); -static void dns_next_locked(grpc_resolver* r, grpc_channel_args** target_result, +static void dns_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_resolver* r); +static void dns_channel_saw_error_locked(grpc_exec_ctx* exec_ctx, + grpc_resolver* r); +static void dns_next_locked(grpc_exec_ctx* exec_ctx, grpc_resolver* r, + grpc_channel_args** target_result, grpc_closure* on_complete); static const grpc_resolver_vtable dns_resolver_vtable = { dns_destroy, dns_shutdown_locked, dns_channel_saw_error_locked, dns_next_locked}; -static void dns_shutdown_locked(grpc_resolver* resolver) { +static void dns_shutdown_locked(grpc_exec_ctx* exec_ctx, + grpc_resolver* resolver) { dns_resolver* r = (dns_resolver*)resolver; if (r->have_retry_timer) { - grpc_timer_cancel(&r->retry_timer); + grpc_timer_cancel(exec_ctx, &r->retry_timer); } if (r->next_completion != nullptr) { *r->target_result = nullptr; - GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Resolver Shutdown")); + GRPC_CLOSURE_SCHED( + exec_ctx, r->next_completion, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resolver Shutdown")); r->next_completion = nullptr; } } -static void dns_channel_saw_error_locked(grpc_resolver* resolver) { +static void dns_channel_saw_error_locked(grpc_exec_ctx* exec_ctx, + grpc_resolver* resolver) { dns_resolver* r = (dns_resolver*)resolver; if (!r->resolving) { grpc_backoff_reset(&r->backoff_state); - dns_start_resolving_locked(r); + dns_start_resolving_locked(exec_ctx, r); } } -static void dns_next_locked(grpc_resolver* resolver, +static void dns_next_locked(grpc_exec_ctx* exec_ctx, grpc_resolver* resolver, grpc_channel_args** target_result, grpc_closure* on_complete) { dns_resolver* r = (dns_resolver*)resolver; @@ -120,26 +127,28 @@ static void dns_next_locked(grpc_resolver* resolver, r->target_result = target_result; if (r->resolved_version == 0 && !r->resolving) { grpc_backoff_reset(&r->backoff_state); - dns_start_resolving_locked(r); + dns_start_resolving_locked(exec_ctx, r); } else { - dns_maybe_finish_next_locked(r); + dns_maybe_finish_next_locked(exec_ctx, r); } } -static void dns_on_retry_timer_locked(void* arg, grpc_error* error) { +static void dns_on_retry_timer_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { dns_resolver* r = (dns_resolver*)arg; r->have_retry_timer = false; if (error == GRPC_ERROR_NONE) { if (!r->resolving) { - dns_start_resolving_locked(r); + dns_start_resolving_locked(exec_ctx, r); } } - GRPC_RESOLVER_UNREF(&r->base, "retry-timer"); + GRPC_RESOLVER_UNREF(exec_ctx, &r->base, "retry-timer"); } -static void dns_on_resolved_locked(void* arg, grpc_error* error) { +static void dns_on_resolved_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { dns_resolver* r = (dns_resolver*)arg; grpc_channel_args* result = nullptr; GPR_ASSERT(r->resolving); @@ -159,11 +168,11 @@ static void dns_on_resolved_locked(void* arg, grpc_error* error) { 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); - grpc_lb_addresses_destroy(addresses); + grpc_lb_addresses_destroy(exec_ctx, addresses); } else { grpc_millis next_try = - grpc_backoff_step(&r->backoff_state).next_attempt_start_time; - grpc_millis timeout = next_try - grpc_core::ExecCtx::Get()->Now(); + grpc_backoff_step(exec_ctx, &r->backoff_state).next_attempt_start_time; + grpc_millis timeout = next_try - grpc_exec_ctx_now(exec_ctx); gpr_log(GPR_INFO, "dns resolution failed (will retry): %s", grpc_error_string(error)); GPR_ASSERT(!r->have_retry_timer); @@ -176,56 +185,59 @@ static void dns_on_resolved_locked(void* arg, grpc_error* error) { } GRPC_CLOSURE_INIT(&r->on_retry, dns_on_retry_timer_locked, r, grpc_combiner_scheduler(r->base.combiner)); - grpc_timer_init(&r->retry_timer, next_try, &r->on_retry); + grpc_timer_init(exec_ctx, &r->retry_timer, next_try, &r->on_retry); } if (r->resolved_result != nullptr) { - grpc_channel_args_destroy(r->resolved_result); + grpc_channel_args_destroy(exec_ctx, r->resolved_result); } r->resolved_result = result; r->resolved_version++; - dns_maybe_finish_next_locked(r); + dns_maybe_finish_next_locked(exec_ctx, r); GRPC_ERROR_UNREF(error); - GRPC_RESOLVER_UNREF(&r->base, "dns-resolving"); + GRPC_RESOLVER_UNREF(exec_ctx, &r->base, "dns-resolving"); } -static void dns_start_resolving_locked(dns_resolver* r) { +static void dns_start_resolving_locked(grpc_exec_ctx* exec_ctx, + dns_resolver* r) { GRPC_RESOLVER_REF(&r->base, "dns-resolving"); GPR_ASSERT(!r->resolving); r->resolving = true; r->addresses = nullptr; grpc_resolve_address( - r->name_to_resolve, r->default_port, r->interested_parties, + exec_ctx, r->name_to_resolve, r->default_port, r->interested_parties, GRPC_CLOSURE_CREATE(dns_on_resolved_locked, r, grpc_combiner_scheduler(r->base.combiner)), &r->addresses); } -static void dns_maybe_finish_next_locked(dns_resolver* r) { +static void dns_maybe_finish_next_locked(grpc_exec_ctx* exec_ctx, + dns_resolver* r) { if (r->next_completion != nullptr && r->resolved_version != r->published_version) { *r->target_result = r->resolved_result == nullptr ? nullptr : grpc_channel_args_copy(r->resolved_result); - GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, r->next_completion, GRPC_ERROR_NONE); r->next_completion = nullptr; r->published_version = r->resolved_version; } } -static void dns_destroy(grpc_resolver* gr) { +static void dns_destroy(grpc_exec_ctx* exec_ctx, grpc_resolver* gr) { dns_resolver* r = (dns_resolver*)gr; if (r->resolved_result != nullptr) { - grpc_channel_args_destroy(r->resolved_result); + grpc_channel_args_destroy(exec_ctx, r->resolved_result); } - grpc_pollset_set_destroy(r->interested_parties); + grpc_pollset_set_destroy(exec_ctx, r->interested_parties); gpr_free(r->name_to_resolve); gpr_free(r->default_port); - grpc_channel_args_destroy(r->channel_args); + grpc_channel_args_destroy(exec_ctx, r->channel_args); gpr_free(r); } -static grpc_resolver* dns_create(grpc_resolver_args* args, +static grpc_resolver* dns_create(grpc_exec_ctx* exec_ctx, + grpc_resolver_args* args, const char* default_port) { if (0 != strcmp(args->uri->authority, "")) { gpr_log(GPR_ERROR, "authority based dns uri's not supported"); @@ -242,7 +254,8 @@ static grpc_resolver* dns_create(grpc_resolver_args* args, r->channel_args = grpc_channel_args_copy(args->args); r->interested_parties = grpc_pollset_set_create(); if (args->pollset_set != nullptr) { - grpc_pollset_set_add_pollset_set(r->interested_parties, args->pollset_set); + grpc_pollset_set_add_pollset_set(exec_ctx, r->interested_parties, + args->pollset_set); } grpc_backoff_init( &r->backoff_state, GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS * 1000, @@ -261,8 +274,9 @@ static void dns_factory_ref(grpc_resolver_factory* factory) {} static void dns_factory_unref(grpc_resolver_factory* factory) {} static grpc_resolver* dns_factory_create_resolver( - grpc_resolver_factory* factory, grpc_resolver_args* args) { - return dns_create(args, "https"); + grpc_exec_ctx* exec_ctx, grpc_resolver_factory* factory, + grpc_resolver_args* args) { + return dns_create(exec_ctx, args, "https"); } static char* dns_factory_get_default_host_name(grpc_resolver_factory* factory, diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc index fe3ad1403c2..44798ca434e 100644 --- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc @@ -67,52 +67,57 @@ typedef struct { grpc_channel_args** target_result; } fake_resolver; -static void fake_resolver_destroy(grpc_resolver* gr) { +static void fake_resolver_destroy(grpc_exec_ctx* exec_ctx, grpc_resolver* gr) { fake_resolver* r = (fake_resolver*)gr; - grpc_channel_args_destroy(r->next_results); - grpc_channel_args_destroy(r->results_upon_error); - grpc_channel_args_destroy(r->channel_args); + grpc_channel_args_destroy(exec_ctx, r->next_results); + grpc_channel_args_destroy(exec_ctx, r->results_upon_error); + grpc_channel_args_destroy(exec_ctx, r->channel_args); gpr_free(r); } -static void fake_resolver_shutdown_locked(grpc_resolver* resolver) { +static void fake_resolver_shutdown_locked(grpc_exec_ctx* exec_ctx, + grpc_resolver* resolver) { fake_resolver* r = (fake_resolver*)resolver; if (r->next_completion != nullptr) { *r->target_result = nullptr; - GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Resolver Shutdown")); + GRPC_CLOSURE_SCHED( + exec_ctx, r->next_completion, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resolver Shutdown")); r->next_completion = nullptr; } } -static void fake_resolver_maybe_finish_next_locked(fake_resolver* r) { +static void fake_resolver_maybe_finish_next_locked(grpc_exec_ctx* exec_ctx, + fake_resolver* r) { if (r->next_completion != nullptr && r->next_results != nullptr) { *r->target_result = grpc_channel_args_union(r->next_results, r->channel_args); - grpc_channel_args_destroy(r->next_results); + grpc_channel_args_destroy(exec_ctx, r->next_results); r->next_results = nullptr; - GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, r->next_completion, GRPC_ERROR_NONE); r->next_completion = nullptr; } } -static void fake_resolver_channel_saw_error_locked(grpc_resolver* resolver) { +static void fake_resolver_channel_saw_error_locked(grpc_exec_ctx* exec_ctx, + grpc_resolver* resolver) { fake_resolver* r = (fake_resolver*)resolver; if (r->next_results == nullptr && r->results_upon_error != nullptr) { // Pretend we re-resolved. r->next_results = grpc_channel_args_copy(r->results_upon_error); } - fake_resolver_maybe_finish_next_locked(r); + fake_resolver_maybe_finish_next_locked(exec_ctx, r); } -static void fake_resolver_next_locked(grpc_resolver* resolver, +static void fake_resolver_next_locked(grpc_exec_ctx* exec_ctx, + grpc_resolver* resolver, grpc_channel_args** target_result, grpc_closure* on_complete) { fake_resolver* r = (fake_resolver*)resolver; GPR_ASSERT(!r->next_completion); r->next_completion = on_complete; r->target_result = target_result; - fake_resolver_maybe_finish_next_locked(r); + fake_resolver_maybe_finish_next_locked(exec_ctx, r); } static const grpc_resolver_vtable fake_resolver_vtable = { @@ -152,31 +157,33 @@ typedef struct set_response_closure_arg { grpc_channel_args* next_response; } set_response_closure_arg; -static void set_response_closure_fn(void* arg, grpc_error* error) { +static void set_response_closure_fn(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { set_response_closure_arg* closure_arg = (set_response_closure_arg*)arg; grpc_fake_resolver_response_generator* generator = closure_arg->generator; fake_resolver* r = generator->resolver; if (r->next_results != nullptr) { - grpc_channel_args_destroy(r->next_results); + grpc_channel_args_destroy(exec_ctx, r->next_results); } r->next_results = closure_arg->next_response; if (r->results_upon_error != nullptr) { - grpc_channel_args_destroy(r->results_upon_error); + grpc_channel_args_destroy(exec_ctx, r->results_upon_error); } r->results_upon_error = grpc_channel_args_copy(closure_arg->next_response); gpr_free(closure_arg); - fake_resolver_maybe_finish_next_locked(r); + fake_resolver_maybe_finish_next_locked(exec_ctx, r); } void grpc_fake_resolver_response_generator_set_response( - grpc_fake_resolver_response_generator* generator, + grpc_exec_ctx* exec_ctx, grpc_fake_resolver_response_generator* generator, grpc_channel_args* next_response) { GPR_ASSERT(generator->resolver != nullptr); set_response_closure_arg* closure_arg = (set_response_closure_arg*)gpr_zalloc(sizeof(*closure_arg)); closure_arg->generator = generator; closure_arg->next_response = grpc_channel_args_copy(next_response); - GRPC_CLOSURE_SCHED(GRPC_CLOSURE_INIT(&closure_arg->set_response_closure, + GRPC_CLOSURE_SCHED(exec_ctx, + GRPC_CLOSURE_INIT(&closure_arg->set_response_closure, set_response_closure_fn, closure_arg, grpc_combiner_scheduler( generator->resolver->base.combiner)), @@ -188,7 +195,7 @@ static void* response_generator_arg_copy(void* p) { (grpc_fake_resolver_response_generator*)p); } -static void response_generator_arg_destroy(void* p) { +static void response_generator_arg_destroy(grpc_exec_ctx* exec_ctx, void* p) { grpc_fake_resolver_response_generator_unref( (grpc_fake_resolver_response_generator*)p); } @@ -225,7 +232,8 @@ static void fake_resolver_factory_ref(grpc_resolver_factory* factory) {} static void fake_resolver_factory_unref(grpc_resolver_factory* factory) {} -static grpc_resolver* fake_resolver_create(grpc_resolver_factory* factory, +static grpc_resolver* fake_resolver_create(grpc_exec_ctx* exec_ctx, + grpc_resolver_factory* factory, grpc_resolver_args* args) { fake_resolver* r = (fake_resolver*)gpr_zalloc(sizeof(*r)); r->channel_args = grpc_channel_args_copy(args->args); diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h index a8977e5980f..7035cdda019 100644 --- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h +++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h @@ -39,7 +39,7 @@ grpc_fake_resolver_response_generator_create(); // Instruct the fake resolver associated with the \a response_generator instance // to trigger a new resolution for \a uri and \a args. void grpc_fake_resolver_response_generator_set_response( - grpc_fake_resolver_response_generator* generator, + grpc_exec_ctx* exec_ctx, grpc_fake_resolver_response_generator* generator, grpc_channel_args* next_response); // Return a \a grpc_arg for a \a grpc_fake_resolver_response_generator instance. diff --git a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc b/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc index 7d1e283fa3a..f0934b5943b 100644 --- a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc @@ -52,13 +52,15 @@ typedef struct { grpc_channel_args** target_result; } sockaddr_resolver; -static void sockaddr_destroy(grpc_resolver* r); +static void sockaddr_destroy(grpc_exec_ctx* exec_ctx, grpc_resolver* r); -static void sockaddr_maybe_finish_next_locked(sockaddr_resolver* r); +static void sockaddr_maybe_finish_next_locked(grpc_exec_ctx* exec_ctx, + sockaddr_resolver* r); -static void sockaddr_shutdown_locked(grpc_resolver* r); -static void sockaddr_channel_saw_error_locked(grpc_resolver* r); -static void sockaddr_next_locked(grpc_resolver* r, +static void sockaddr_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_resolver* r); +static void sockaddr_channel_saw_error_locked(grpc_exec_ctx* exec_ctx, + grpc_resolver* r); +static void sockaddr_next_locked(grpc_exec_ctx* exec_ctx, grpc_resolver* r, grpc_channel_args** target_result, grpc_closure* on_complete); @@ -66,47 +68,52 @@ static const grpc_resolver_vtable sockaddr_resolver_vtable = { sockaddr_destroy, sockaddr_shutdown_locked, sockaddr_channel_saw_error_locked, sockaddr_next_locked}; -static void sockaddr_shutdown_locked(grpc_resolver* resolver) { +static void sockaddr_shutdown_locked(grpc_exec_ctx* exec_ctx, + grpc_resolver* resolver) { sockaddr_resolver* r = (sockaddr_resolver*)resolver; if (r->next_completion != nullptr) { *r->target_result = nullptr; - GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Resolver Shutdown")); + GRPC_CLOSURE_SCHED( + exec_ctx, r->next_completion, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resolver Shutdown")); r->next_completion = nullptr; } } -static void sockaddr_channel_saw_error_locked(grpc_resolver* resolver) { +static void sockaddr_channel_saw_error_locked(grpc_exec_ctx* exec_ctx, + grpc_resolver* resolver) { sockaddr_resolver* r = (sockaddr_resolver*)resolver; r->published = false; - sockaddr_maybe_finish_next_locked(r); + sockaddr_maybe_finish_next_locked(exec_ctx, r); } -static void sockaddr_next_locked(grpc_resolver* resolver, +static void sockaddr_next_locked(grpc_exec_ctx* exec_ctx, + grpc_resolver* resolver, grpc_channel_args** target_result, grpc_closure* on_complete) { sockaddr_resolver* r = (sockaddr_resolver*)resolver; GPR_ASSERT(!r->next_completion); r->next_completion = on_complete; r->target_result = target_result; - sockaddr_maybe_finish_next_locked(r); + sockaddr_maybe_finish_next_locked(exec_ctx, r); } -static void sockaddr_maybe_finish_next_locked(sockaddr_resolver* r) { +static void sockaddr_maybe_finish_next_locked(grpc_exec_ctx* exec_ctx, + sockaddr_resolver* r) { if (r->next_completion != nullptr && !r->published) { r->published = true; grpc_arg arg = grpc_lb_addresses_create_channel_arg(r->addresses); *r->target_result = grpc_channel_args_copy_and_add(r->channel_args, &arg, 1); - GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, r->next_completion, GRPC_ERROR_NONE); r->next_completion = nullptr; } } -static void sockaddr_destroy(grpc_resolver* gr) { +static void sockaddr_destroy(grpc_exec_ctx* exec_ctx, grpc_resolver* gr) { sockaddr_resolver* r = (sockaddr_resolver*)gr; - grpc_lb_addresses_destroy(r->addresses); - grpc_channel_args_destroy(r->channel_args); + grpc_lb_addresses_destroy(exec_ctx, r->addresses); + grpc_channel_args_destroy(exec_ctx, r->channel_args); gpr_free(r); } @@ -135,7 +142,8 @@ char* unix_get_default_authority(grpc_resolver_factory* factory, static void do_nothing(void* ignored) {} -static grpc_resolver* sockaddr_create(grpc_resolver_args* args, +static grpc_resolver* sockaddr_create(grpc_exec_ctx* exec_ctx, + grpc_resolver_args* args, bool parse(const grpc_uri* uri, grpc_resolved_address* dst)) { if (0 != strcmp(args->uri->authority, "")) { @@ -162,10 +170,10 @@ static grpc_resolver* sockaddr_create(grpc_resolver_args* args, gpr_free(part_str); if (errors_found) break; } - grpc_slice_buffer_destroy_internal(&path_parts); - grpc_slice_unref_internal(path_slice); + grpc_slice_buffer_destroy_internal(exec_ctx, &path_parts); + grpc_slice_unref_internal(exec_ctx, path_slice); if (errors_found) { - grpc_lb_addresses_destroy(addresses); + grpc_lb_addresses_destroy(exec_ctx, addresses); return nullptr; } /* Instantiate resolver. */ @@ -187,8 +195,9 @@ static void sockaddr_factory_unref(grpc_resolver_factory* factory) {} #define DECL_FACTORY(name) \ static grpc_resolver* name##_factory_create_resolver( \ - grpc_resolver_factory* factory, grpc_resolver_args* args) { \ - return sockaddr_create(args, grpc_parse_##name); \ + grpc_exec_ctx* exec_ctx, grpc_resolver_factory* factory, \ + grpc_resolver_args* args) { \ + return sockaddr_create(exec_ctx, args, grpc_parse_##name); \ } \ static const grpc_resolver_factory_vtable name##_factory_vtable = { \ sockaddr_factory_ref, sockaddr_factory_unref, \ diff --git a/src/core/ext/filters/client_channel/resolver_factory.cc b/src/core/ext/filters/client_channel/resolver_factory.cc index 9b3ec2f1c41..1a289d9771a 100644 --- a/src/core/ext/filters/client_channel/resolver_factory.cc +++ b/src/core/ext/filters/client_channel/resolver_factory.cc @@ -28,9 +28,10 @@ void grpc_resolver_factory_unref(grpc_resolver_factory* factory) { /** Create a resolver instance for a name */ grpc_resolver* grpc_resolver_factory_create_resolver( - grpc_resolver_factory* factory, grpc_resolver_args* args) { + grpc_exec_ctx* exec_ctx, grpc_resolver_factory* factory, + grpc_resolver_args* args) { if (factory == nullptr) return nullptr; - return factory->vtable->create_resolver(factory, args); + return factory->vtable->create_resolver(exec_ctx, factory, args); } char* grpc_resolver_factory_get_default_authority( diff --git a/src/core/ext/filters/client_channel/resolver_factory.h b/src/core/ext/filters/client_channel/resolver_factory.h index 170ecc0b489..fcf8ec425ec 100644 --- a/src/core/ext/filters/client_channel/resolver_factory.h +++ b/src/core/ext/filters/client_channel/resolver_factory.h @@ -43,7 +43,8 @@ struct grpc_resolver_factory_vtable { void (*unref)(grpc_resolver_factory* factory); /** Implementation of grpc_resolver_factory_create_resolver */ - grpc_resolver* (*create_resolver)(grpc_resolver_factory* factory, + grpc_resolver* (*create_resolver)(grpc_exec_ctx* exec_ctx, + grpc_resolver_factory* factory, grpc_resolver_args* args); /** Implementation of grpc_resolver_factory_get_default_authority */ @@ -58,7 +59,8 @@ void grpc_resolver_factory_unref(grpc_resolver_factory* resolver); /** Create a resolver instance for a name */ grpc_resolver* grpc_resolver_factory_create_resolver( - grpc_resolver_factory* factory, grpc_resolver_args* args); + grpc_exec_ctx* exec_ctx, grpc_resolver_factory* factory, + grpc_resolver_args* args); /** Return a (freshly allocated with gpr_malloc) string representing the default authority to use for this scheme. */ diff --git a/src/core/ext/filters/client_channel/resolver_registry.cc b/src/core/ext/filters/client_channel/resolver_registry.cc index 3f8451de6b4..5da6114a3d0 100644 --- a/src/core/ext/filters/client_channel/resolver_registry.cc +++ b/src/core/ext/filters/client_channel/resolver_registry.cc @@ -92,22 +92,23 @@ static grpc_resolver_factory* lookup_factory_by_uri(grpc_uri* uri) { return lookup_factory(uri->scheme); } -static grpc_resolver_factory* resolve_factory(const char* target, +static grpc_resolver_factory* resolve_factory(grpc_exec_ctx* exec_ctx, + const char* target, grpc_uri** uri, char** canonical_target) { grpc_resolver_factory* factory = nullptr; GPR_ASSERT(uri != nullptr); - *uri = grpc_uri_parse(target, 1); + *uri = grpc_uri_parse(exec_ctx, target, 1); factory = lookup_factory_by_uri(*uri); if (factory == nullptr) { grpc_uri_destroy(*uri); gpr_asprintf(canonical_target, "%s%s", g_default_resolver_prefix, target); - *uri = grpc_uri_parse(*canonical_target, 1); + *uri = grpc_uri_parse(exec_ctx, *canonical_target, 1); factory = lookup_factory_by_uri(*uri); if (factory == nullptr) { - grpc_uri_destroy(grpc_uri_parse(target, 0)); - grpc_uri_destroy(grpc_uri_parse(*canonical_target, 0)); + grpc_uri_destroy(grpc_uri_parse(exec_ctx, target, 0)); + grpc_uri_destroy(grpc_uri_parse(exec_ctx, *canonical_target, 0)); gpr_log(GPR_ERROR, "don't know how to resolve '%s' or '%s'", target, *canonical_target); } @@ -115,14 +116,14 @@ static grpc_resolver_factory* resolve_factory(const char* target, return factory; } -grpc_resolver* grpc_resolver_create(const char* target, +grpc_resolver* grpc_resolver_create(grpc_exec_ctx* exec_ctx, const char* target, const grpc_channel_args* args, grpc_pollset_set* pollset_set, grpc_combiner* combiner) { grpc_uri* uri = nullptr; char* canonical_target = nullptr; grpc_resolver_factory* factory = - resolve_factory(target, &uri, &canonical_target); + resolve_factory(exec_ctx, target, &uri, &canonical_target); grpc_resolver* resolver; grpc_resolver_args resolver_args; memset(&resolver_args, 0, sizeof(resolver_args)); @@ -130,27 +131,29 @@ grpc_resolver* grpc_resolver_create(const char* target, resolver_args.args = args; resolver_args.pollset_set = pollset_set; resolver_args.combiner = combiner; - resolver = grpc_resolver_factory_create_resolver(factory, &resolver_args); + resolver = + grpc_resolver_factory_create_resolver(exec_ctx, factory, &resolver_args); grpc_uri_destroy(uri); gpr_free(canonical_target); return resolver; } -char* grpc_get_default_authority(const char* target) { +char* grpc_get_default_authority(grpc_exec_ctx* exec_ctx, const char* target) { grpc_uri* uri = nullptr; char* canonical_target = nullptr; grpc_resolver_factory* factory = - resolve_factory(target, &uri, &canonical_target); + resolve_factory(exec_ctx, target, &uri, &canonical_target); char* authority = grpc_resolver_factory_get_default_authority(factory, uri); grpc_uri_destroy(uri); gpr_free(canonical_target); return authority; } -char* grpc_resolver_factory_add_default_prefix_if_needed(const char* target) { +char* grpc_resolver_factory_add_default_prefix_if_needed( + grpc_exec_ctx* exec_ctx, const char* target) { grpc_uri* uri = nullptr; char* canonical_target = nullptr; - resolve_factory(target, &uri, &canonical_target); + resolve_factory(exec_ctx, target, &uri, &canonical_target); grpc_uri_destroy(uri); return canonical_target == nullptr ? gpr_strdup(target) : canonical_target; } diff --git a/src/core/ext/filters/client_channel/resolver_registry.h b/src/core/ext/filters/client_channel/resolver_registry.h index bbd30df8da3..ecc9f824e8b 100644 --- a/src/core/ext/filters/client_channel/resolver_registry.h +++ b/src/core/ext/filters/client_channel/resolver_registry.h @@ -48,7 +48,7 @@ void grpc_register_resolver_type(grpc_resolver_factory* factory); (typically the set of arguments passed in from the client API). \a pollset_set is used to drive IO in the name resolution process, it should not be NULL. */ -grpc_resolver* grpc_resolver_create(const char* target, +grpc_resolver* grpc_resolver_create(grpc_exec_ctx* exec_ctx, const char* target, const grpc_channel_args* args, grpc_pollset_set* pollset_set, grpc_combiner* combiner); @@ -59,10 +59,11 @@ grpc_resolver_factory* grpc_resolver_factory_lookup(const char* name); /** Given a target, return a (freshly allocated with gpr_malloc) string representing the default authority to pass from a client. */ -char* grpc_get_default_authority(const char* target); +char* grpc_get_default_authority(grpc_exec_ctx* exec_ctx, const char* target); /** Returns a newly allocated string containing \a target, adding the default prefix if needed. */ -char* grpc_resolver_factory_add_default_prefix_if_needed(const char* target); +char* grpc_resolver_factory_add_default_prefix_if_needed( + grpc_exec_ctx* exec_ctx, const char* target); #endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_REGISTRY_H */ diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc index 0d2be2a3f73..58e294d597f 100644 --- a/src/core/ext/filters/client_channel/subchannel.cc +++ b/src/core/ext/filters/client_channel/subchannel.cc @@ -139,7 +139,8 @@ struct grpc_subchannel_call { #define CALLSTACK_TO_SUBCHANNEL_CALL(callstack) \ (((grpc_subchannel_call*)(callstack)) - 1) -static void subchannel_connected(void* subchannel, grpc_error* error); +static void subchannel_connected(grpc_exec_ctx* exec_ctx, void* subchannel, + grpc_error* error); #ifndef NDEBUG #define REF_REASON reason @@ -156,9 +157,10 @@ static void subchannel_connected(void* subchannel, grpc_error* error); * connection implementation */ -static void connection_destroy(void* arg, grpc_error* error) { +static void connection_destroy(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_connected_subchannel* c = (grpc_connected_subchannel*)arg; - grpc_channel_stack_destroy(CHANNEL_STACK_FROM_CONNECTION(c)); + grpc_channel_stack_destroy(exec_ctx, CHANNEL_STACK_FROM_CONNECTION(c)); gpr_free(c); } @@ -168,23 +170,26 @@ grpc_connected_subchannel* grpc_connected_subchannel_ref( return c; } -void grpc_connected_subchannel_unref( - grpc_connected_subchannel* c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { - GRPC_CHANNEL_STACK_UNREF(CHANNEL_STACK_FROM_CONNECTION(c), REF_REASON); +void grpc_connected_subchannel_unref(grpc_exec_ctx* exec_ctx, + grpc_connected_subchannel* c + GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { + GRPC_CHANNEL_STACK_UNREF(exec_ctx, CHANNEL_STACK_FROM_CONNECTION(c), + REF_REASON); } /* * grpc_subchannel implementation */ -static void subchannel_destroy(void* arg, grpc_error* error) { +static void subchannel_destroy(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_subchannel* c = (grpc_subchannel*)arg; gpr_free((void*)c->filters); - grpc_channel_args_destroy(c->args); - grpc_connectivity_state_destroy(&c->state_tracker); - grpc_connector_unref(c->connector); - grpc_pollset_set_destroy(c->pollset_set); - grpc_subchannel_key_destroy(c->key); + grpc_channel_args_destroy(exec_ctx, c->args); + grpc_connectivity_state_destroy(exec_ctx, &c->state_tracker); + grpc_connector_unref(exec_ctx, c->connector); + grpc_pollset_set_destroy(exec_ctx, c->pollset_set); + grpc_subchannel_key_destroy(exec_ctx, c->key); gpr_mu_destroy(&c->mu); gpr_free(c); } @@ -236,54 +241,59 @@ grpc_subchannel* grpc_subchannel_ref_from_weak_ref( } } -static void disconnect(grpc_subchannel* c) { +static void disconnect(grpc_exec_ctx* exec_ctx, grpc_subchannel* c) { grpc_connected_subchannel* con; - grpc_subchannel_index_unregister(c->key, c); + grpc_subchannel_index_unregister(exec_ctx, c->key, c); gpr_mu_lock(&c->mu); GPR_ASSERT(!c->disconnected); c->disconnected = true; - grpc_connector_shutdown(c->connector, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Subchannel disconnected")); + grpc_connector_shutdown( + exec_ctx, c->connector, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Subchannel disconnected")); con = GET_CONNECTED_SUBCHANNEL(c, no_barrier); if (con != nullptr) { - GRPC_CONNECTED_SUBCHANNEL_UNREF(con, "connection"); + GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, con, "connection"); gpr_atm_no_barrier_store(&c->connected_subchannel, (gpr_atm)0xdeadbeef); } gpr_mu_unlock(&c->mu); } -void grpc_subchannel_unref(grpc_subchannel* c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { +void grpc_subchannel_unref(grpc_exec_ctx* exec_ctx, + grpc_subchannel* c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { gpr_atm old_refs; // add a weak ref and subtract a strong ref (atomically) old_refs = ref_mutate(c, (gpr_atm)1 - (gpr_atm)(1 << INTERNAL_REF_BITS), 1 REF_MUTATE_PURPOSE("STRONG_UNREF")); if ((old_refs & STRONG_REF_MASK) == (1 << INTERNAL_REF_BITS)) { - disconnect(c); + disconnect(exec_ctx, c); } - GRPC_SUBCHANNEL_WEAK_UNREF(c, "strong-unref"); + GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "strong-unref"); } -void grpc_subchannel_weak_unref( - grpc_subchannel* c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { +void grpc_subchannel_weak_unref(grpc_exec_ctx* exec_ctx, + grpc_subchannel* c + GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { gpr_atm old_refs; old_refs = ref_mutate(c, -(gpr_atm)1, 1 REF_MUTATE_PURPOSE("WEAK_UNREF")); if (old_refs == 1) { GRPC_CLOSURE_SCHED( + exec_ctx, GRPC_CLOSURE_CREATE(subchannel_destroy, c, grpc_schedule_on_exec_ctx), GRPC_ERROR_NONE); } } -grpc_subchannel* grpc_subchannel_create(grpc_connector* connector, +grpc_subchannel* grpc_subchannel_create(grpc_exec_ctx* exec_ctx, + grpc_connector* connector, const grpc_subchannel_args* args) { grpc_subchannel_key* key = grpc_subchannel_key_create(args); - grpc_subchannel* c = grpc_subchannel_index_find(key); + grpc_subchannel* c = grpc_subchannel_index_find(exec_ctx, key); if (c) { - grpc_subchannel_key_destroy(key); + grpc_subchannel_key_destroy(exec_ctx, key); return c; } - GRPC_STATS_INC_CLIENT_SUBCHANNELS_CREATED(); + GRPC_STATS_INC_CLIENT_SUBCHANNELS_CREATED(exec_ctx); c = (grpc_subchannel*)gpr_zalloc(sizeof(*c)); c->key = key; gpr_atm_no_barrier_store(&c->ref_pair, 1 << INTERNAL_REF_BITS); @@ -301,10 +311,10 @@ grpc_subchannel* grpc_subchannel_create(grpc_connector* connector, c->pollset_set = grpc_pollset_set_create(); grpc_resolved_address* addr = (grpc_resolved_address*)gpr_malloc(sizeof(*addr)); - grpc_get_subchannel_address_arg(args->args, addr); + grpc_get_subchannel_address_arg(exec_ctx, args->args, addr); grpc_resolved_address* new_address = nullptr; grpc_channel_args* new_args = nullptr; - if (grpc_proxy_mappers_map_address(addr, args->args, &new_address, + if (grpc_proxy_mappers_map_address(exec_ctx, addr, args->args, &new_address, &new_args)) { GPR_ASSERT(new_address != nullptr); gpr_free(addr); @@ -317,7 +327,7 @@ grpc_subchannel* grpc_subchannel_create(grpc_connector* connector, new_args != nullptr ? new_args : args->args, keys_to_remove, GPR_ARRAY_SIZE(keys_to_remove), &new_arg, 1); gpr_free(new_arg.value.string); - if (new_args != nullptr) grpc_channel_args_destroy(new_args); + if (new_args != nullptr) grpc_channel_args_destroy(exec_ctx, new_args); c->root_external_state_watcher.next = c->root_external_state_watcher.prev = &c->root_external_state_watcher; GRPC_CLOSURE_INIT(&c->connected, subchannel_connected, c, @@ -363,19 +373,21 @@ grpc_subchannel* grpc_subchannel_create(grpc_connector* connector, min_backoff_ms, max_backoff_ms); gpr_mu_init(&c->mu); - return grpc_subchannel_index_register(key, c); + return grpc_subchannel_index_register(exec_ctx, key, c); } -static void continue_connect_locked(grpc_subchannel* c) { +static void continue_connect_locked(grpc_exec_ctx* exec_ctx, + grpc_subchannel* c) { grpc_connect_in_args args; args.interested_parties = c->pollset_set; args.deadline = c->backoff_result.current_deadline; args.channel_args = c->args; - grpc_connectivity_state_set(&c->state_tracker, GRPC_CHANNEL_CONNECTING, - GRPC_ERROR_NONE, "state_change"); - grpc_connector_connect(c->connector, &args, &c->connecting_result, + grpc_connectivity_state_set(exec_ctx, &c->state_tracker, + GRPC_CHANNEL_CONNECTING, GRPC_ERROR_NONE, + "state_change"); + grpc_connector_connect(exec_ctx, c->connector, &args, &c->connecting_result, &c->connected); } @@ -388,23 +400,24 @@ grpc_connectivity_state grpc_subchannel_check_connectivity(grpc_subchannel* c, return state; } -static void on_external_state_watcher_done(void* arg, grpc_error* error) { +static void on_external_state_watcher_done(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { external_state_watcher* w = (external_state_watcher*)arg; grpc_closure* follow_up = w->notify; if (w->pollset_set != nullptr) { - grpc_pollset_set_del_pollset_set(w->subchannel->pollset_set, + grpc_pollset_set_del_pollset_set(exec_ctx, w->subchannel->pollset_set, w->pollset_set); } gpr_mu_lock(&w->subchannel->mu); w->next->prev = w->prev; w->prev->next = w->next; gpr_mu_unlock(&w->subchannel->mu); - GRPC_SUBCHANNEL_WEAK_UNREF(w->subchannel, "external_state_watcher"); + GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, w->subchannel, "external_state_watcher"); gpr_free(w); - GRPC_CLOSURE_RUN(follow_up, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(exec_ctx, follow_up, GRPC_ERROR_REF(error)); } -static void on_alarm(void* arg, grpc_error* error) { +static void on_alarm(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { grpc_subchannel* c = (grpc_subchannel*)arg; gpr_mu_lock(&c->mu); c->have_alarm = false; @@ -416,17 +429,18 @@ static void on_alarm(void* arg, grpc_error* error) { } if (error == GRPC_ERROR_NONE) { gpr_log(GPR_INFO, "Failed to connect to channel, retrying"); - c->backoff_result = grpc_backoff_step(&c->backoff_state); - continue_connect_locked(c); + c->backoff_result = grpc_backoff_step(exec_ctx, &c->backoff_state); + continue_connect_locked(exec_ctx, c); gpr_mu_unlock(&c->mu); } else { gpr_mu_unlock(&c->mu); - GRPC_SUBCHANNEL_WEAK_UNREF(c, "connecting"); + GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "connecting"); } GRPC_ERROR_UNREF(error); } -static void maybe_start_connecting_locked(grpc_subchannel* c) { +static void maybe_start_connecting_locked(grpc_exec_ctx* exec_ctx, + grpc_subchannel* c) { if (c->disconnected) { /* Don't try to connect if we're already disconnected */ return; @@ -452,28 +466,28 @@ static void maybe_start_connecting_locked(grpc_subchannel* c) { if (!c->backoff_begun) { c->backoff_begun = true; - c->backoff_result = grpc_backoff_begin(&c->backoff_state); - continue_connect_locked(c); + c->backoff_result = grpc_backoff_begin(exec_ctx, &c->backoff_state); + continue_connect_locked(exec_ctx, c); } else { GPR_ASSERT(!c->have_alarm); c->have_alarm = true; const grpc_millis time_til_next = - c->backoff_result.next_attempt_start_time - - grpc_core::ExecCtx::Get()->Now(); + c->backoff_result.next_attempt_start_time - grpc_exec_ctx_now(exec_ctx); if (time_til_next <= 0) { gpr_log(GPR_INFO, "Retry immediately"); } else { gpr_log(GPR_INFO, "Retry in %" PRIdPTR " milliseconds", time_til_next); } GRPC_CLOSURE_INIT(&c->on_alarm, on_alarm, c, grpc_schedule_on_exec_ctx); - grpc_timer_init(&c->alarm, c->backoff_result.next_attempt_start_time, - &c->on_alarm); + grpc_timer_init(exec_ctx, &c->alarm, + c->backoff_result.next_attempt_start_time, &c->on_alarm); } } void grpc_subchannel_notify_on_state_change( - grpc_subchannel* c, grpc_pollset_set* interested_parties, - grpc_connectivity_state* state, grpc_closure* notify) { + grpc_exec_ctx* exec_ctx, grpc_subchannel* c, + grpc_pollset_set* interested_parties, grpc_connectivity_state* state, + grpc_closure* notify) { external_state_watcher* w; if (state == nullptr) { @@ -481,8 +495,8 @@ void grpc_subchannel_notify_on_state_change( for (w = c->root_external_state_watcher.next; w != &c->root_external_state_watcher; w = w->next) { if (w->notify == notify) { - grpc_connectivity_state_notify_on_state_change(&c->state_tracker, - nullptr, &w->closure); + grpc_connectivity_state_notify_on_state_change( + exec_ctx, &c->state_tracker, nullptr, &w->closure); } } gpr_mu_unlock(&c->mu); @@ -494,28 +508,31 @@ void grpc_subchannel_notify_on_state_change( GRPC_CLOSURE_INIT(&w->closure, on_external_state_watcher_done, w, grpc_schedule_on_exec_ctx); if (interested_parties != nullptr) { - grpc_pollset_set_add_pollset_set(c->pollset_set, interested_parties); + grpc_pollset_set_add_pollset_set(exec_ctx, c->pollset_set, + interested_parties); } GRPC_SUBCHANNEL_WEAK_REF(c, "external_state_watcher"); gpr_mu_lock(&c->mu); w->next = &c->root_external_state_watcher; w->prev = w->next->prev; w->next->prev = w->prev->next = w; - grpc_connectivity_state_notify_on_state_change(&c->state_tracker, state, - &w->closure); - maybe_start_connecting_locked(c); + grpc_connectivity_state_notify_on_state_change(exec_ctx, &c->state_tracker, + state, &w->closure); + maybe_start_connecting_locked(exec_ctx, c); gpr_mu_unlock(&c->mu); } } void grpc_connected_subchannel_process_transport_op( - grpc_connected_subchannel* con, grpc_transport_op* op) { + grpc_exec_ctx* exec_ctx, grpc_connected_subchannel* con, + grpc_transport_op* op) { grpc_channel_stack* channel_stack = CHANNEL_STACK_FROM_CONNECTION(con); grpc_channel_element* top_elem = grpc_channel_stack_element(channel_stack, 0); - top_elem->filter->start_transport_op(top_elem, op); + top_elem->filter->start_transport_op(exec_ctx, top_elem, op); } -static void subchannel_on_child_state_changed(void* p, grpc_error* error) { +static void subchannel_on_child_state_changed(grpc_exec_ctx* exec_ctx, void* p, + grpc_error* error) { state_watcher* sw = (state_watcher*)p; grpc_subchannel* c = sw->subchannel; gpr_mu* mu = &c->mu; @@ -527,22 +544,24 @@ static void subchannel_on_child_state_changed(void* p, grpc_error* error) { /* any errors on a subchannel ==> we're done, create a new one */ sw->connectivity_state = GRPC_CHANNEL_SHUTDOWN; } - grpc_connectivity_state_set(&c->state_tracker, sw->connectivity_state, - GRPC_ERROR_REF(error), "reflect_child"); + grpc_connectivity_state_set(exec_ctx, &c->state_tracker, + sw->connectivity_state, GRPC_ERROR_REF(error), + "reflect_child"); if (sw->connectivity_state != GRPC_CHANNEL_SHUTDOWN) { grpc_connected_subchannel_notify_on_state_change( - GET_CONNECTED_SUBCHANNEL(c, no_barrier), nullptr, + exec_ctx, GET_CONNECTED_SUBCHANNEL(c, no_barrier), nullptr, &sw->connectivity_state, &sw->closure); GRPC_SUBCHANNEL_WEAK_REF(c, "state_watcher"); sw = nullptr; } gpr_mu_unlock(mu); - GRPC_SUBCHANNEL_WEAK_UNREF(c, "state_watcher"); + GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "state_watcher"); gpr_free(sw); } -static void connected_subchannel_state_op(grpc_connected_subchannel* con, +static void connected_subchannel_state_op(grpc_exec_ctx* exec_ctx, + grpc_connected_subchannel* con, grpc_pollset_set* interested_parties, grpc_connectivity_state* state, grpc_closure* closure) { @@ -552,25 +571,29 @@ static void connected_subchannel_state_op(grpc_connected_subchannel* con, op->on_connectivity_state_change = closure; op->bind_pollset_set = interested_parties; elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CONNECTION(con), 0); - elem->filter->start_transport_op(elem, op); + elem->filter->start_transport_op(exec_ctx, elem, op); } void grpc_connected_subchannel_notify_on_state_change( - grpc_connected_subchannel* con, grpc_pollset_set* interested_parties, - grpc_connectivity_state* state, grpc_closure* closure) { - connected_subchannel_state_op(con, interested_parties, state, closure); + grpc_exec_ctx* exec_ctx, grpc_connected_subchannel* con, + grpc_pollset_set* interested_parties, grpc_connectivity_state* state, + grpc_closure* closure) { + connected_subchannel_state_op(exec_ctx, con, interested_parties, state, + closure); } -void grpc_connected_subchannel_ping(grpc_connected_subchannel* con, +void grpc_connected_subchannel_ping(grpc_exec_ctx* exec_ctx, + grpc_connected_subchannel* con, grpc_closure* closure) { grpc_transport_op* op = grpc_make_transport_op(nullptr); grpc_channel_element* elem; op->send_ping = closure; elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CONNECTION(con), 0); - elem->filter->start_transport_op(elem, op); + elem->filter->start_transport_op(exec_ctx, elem, op); } -static bool publish_transport_locked(grpc_subchannel* c) { +static bool publish_transport_locked(grpc_exec_ctx* exec_ctx, + grpc_subchannel* c) { grpc_connected_subchannel* con; grpc_channel_stack* stk; state_watcher* sw_subchannel; @@ -578,18 +601,19 @@ static bool publish_transport_locked(grpc_subchannel* c) { /* construct channel stack */ grpc_channel_stack_builder* builder = grpc_channel_stack_builder_create(); grpc_channel_stack_builder_set_channel_arguments( - builder, c->connecting_result.channel_args); + exec_ctx, builder, c->connecting_result.channel_args); grpc_channel_stack_builder_set_transport(builder, c->connecting_result.transport); - if (!grpc_channel_init_create_stack(builder, GRPC_CLIENT_SUBCHANNEL)) { - grpc_channel_stack_builder_destroy(builder); + if (!grpc_channel_init_create_stack(exec_ctx, builder, + GRPC_CLIENT_SUBCHANNEL)) { + grpc_channel_stack_builder_destroy(exec_ctx, builder); return false; } grpc_error* error = grpc_channel_stack_builder_finish( - builder, 0, 1, connection_destroy, nullptr, (void**)&con); + exec_ctx, builder, 0, 1, connection_destroy, nullptr, (void**)&con); if (error != GRPC_ERROR_NONE) { - grpc_transport_destroy(c->connecting_result.transport); + grpc_transport_destroy(exec_ctx, c->connecting_result.transport); gpr_log(GPR_ERROR, "error initializing subchannel stack: %s", grpc_error_string(error)); GRPC_ERROR_UNREF(error); @@ -607,7 +631,7 @@ static bool publish_transport_locked(grpc_subchannel* c) { if (c->disconnected) { gpr_free(sw_subchannel); - grpc_channel_stack_destroy(stk); + grpc_channel_stack_destroy(exec_ctx, stk); gpr_free(con); return false; } @@ -623,18 +647,19 @@ static bool publish_transport_locked(grpc_subchannel* c) { /* setup subchannel watching connected subchannel for changes; subchannel ref for connecting is donated to the state watcher */ GRPC_SUBCHANNEL_WEAK_REF(c, "state_watcher"); - GRPC_SUBCHANNEL_WEAK_UNREF(c, "connecting"); + GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "connecting"); grpc_connected_subchannel_notify_on_state_change( - con, c->pollset_set, &sw_subchannel->connectivity_state, + exec_ctx, con, c->pollset_set, &sw_subchannel->connectivity_state, &sw_subchannel->closure); /* signal completion */ - grpc_connectivity_state_set(&c->state_tracker, GRPC_CHANNEL_READY, + grpc_connectivity_state_set(exec_ctx, &c->state_tracker, GRPC_CHANNEL_READY, GRPC_ERROR_NONE, "connected"); return true; } -static void subchannel_connected(void* arg, grpc_error* error) { +static void subchannel_connected(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_subchannel* c = (grpc_subchannel*)arg; grpc_channel_args* delete_channel_args = c->connecting_result.channel_args; @@ -642,13 +667,13 @@ static void subchannel_connected(void* arg, grpc_error* error) { gpr_mu_lock(&c->mu); c->connecting = false; if (c->connecting_result.transport != nullptr && - publish_transport_locked(c)) { + publish_transport_locked(exec_ctx, c)) { /* do nothing, transport was published */ } else if (c->disconnected) { - GRPC_SUBCHANNEL_WEAK_UNREF(c, "connecting"); + GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "connecting"); } else { grpc_connectivity_state_set( - &c->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + exec_ctx, &c->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, grpc_error_set_int(GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Connect Failed", &error, 1), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE), @@ -657,26 +682,27 @@ static void subchannel_connected(void* arg, grpc_error* error) { const char* errmsg = grpc_error_string(error); gpr_log(GPR_INFO, "Connect failed: %s", errmsg); - maybe_start_connecting_locked(c); - GRPC_SUBCHANNEL_WEAK_UNREF(c, "connecting"); + maybe_start_connecting_locked(exec_ctx, c); + GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "connecting"); } gpr_mu_unlock(&c->mu); - GRPC_SUBCHANNEL_WEAK_UNREF(c, "connected"); - grpc_channel_args_destroy(delete_channel_args); + GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "connected"); + grpc_channel_args_destroy(exec_ctx, delete_channel_args); } /* * grpc_subchannel_call implementation */ -static void subchannel_call_destroy(void* call, grpc_error* error) { +static void subchannel_call_destroy(grpc_exec_ctx* exec_ctx, void* call, + grpc_error* error) { grpc_subchannel_call* c = (grpc_subchannel_call*)call; GPR_ASSERT(c->schedule_closure_after_destroy != nullptr); GPR_TIMER_BEGIN("grpc_subchannel_call_unref.destroy", 0); grpc_connected_subchannel* connection = c->connection; - grpc_call_stack_destroy(SUBCHANNEL_CALL_TO_CALL_STACK(c), nullptr, + grpc_call_stack_destroy(exec_ctx, SUBCHANNEL_CALL_TO_CALL_STACK(c), nullptr, c->schedule_closure_after_destroy); - GRPC_CONNECTED_SUBCHANNEL_UNREF(connection, "subchannel_call"); + GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, connection, "subchannel_call"); GPR_TIMER_END("grpc_subchannel_call_unref.destroy", 0); } @@ -692,18 +718,20 @@ void grpc_subchannel_call_ref( GRPC_CALL_STACK_REF(SUBCHANNEL_CALL_TO_CALL_STACK(c), REF_REASON); } -void grpc_subchannel_call_unref( - grpc_subchannel_call* c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { - GRPC_CALL_STACK_UNREF(SUBCHANNEL_CALL_TO_CALL_STACK(c), REF_REASON); +void grpc_subchannel_call_unref(grpc_exec_ctx* exec_ctx, + grpc_subchannel_call* c + GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { + GRPC_CALL_STACK_UNREF(exec_ctx, SUBCHANNEL_CALL_TO_CALL_STACK(c), REF_REASON); } -void grpc_subchannel_call_process_op(grpc_subchannel_call* call, +void grpc_subchannel_call_process_op(grpc_exec_ctx* exec_ctx, + grpc_subchannel_call* call, grpc_transport_stream_op_batch* batch) { GPR_TIMER_BEGIN("grpc_subchannel_call_process_op", 0); grpc_call_stack* call_stack = SUBCHANNEL_CALL_TO_CALL_STACK(call); grpc_call_element* top_elem = grpc_call_stack_element(call_stack, 0); GRPC_CALL_LOG_OP(GPR_INFO, top_elem, batch); - top_elem->filter->start_transport_stream_op_batch(top_elem, batch); + top_elem->filter->start_transport_stream_op_batch(exec_ctx, top_elem, batch); GPR_TIMER_END("grpc_subchannel_call_process_op", 0); } @@ -718,7 +746,7 @@ const grpc_subchannel_key* grpc_subchannel_get_key( } grpc_error* grpc_connected_subchannel_create_call( - grpc_connected_subchannel* con, + grpc_exec_ctx* exec_ctx, grpc_connected_subchannel* con, const grpc_connected_subchannel_call_args* args, grpc_subchannel_call** call) { grpc_channel_stack* chanstk = CHANNEL_STACK_FROM_CONNECTION(con); @@ -736,14 +764,14 @@ grpc_error* grpc_connected_subchannel_create_call( args->arena, /* arena */ args->call_combiner /* call_combiner */ }; - grpc_error* error = grpc_call_stack_init(chanstk, 1, subchannel_call_destroy, - *call, &call_args); + grpc_error* error = grpc_call_stack_init( + exec_ctx, chanstk, 1, subchannel_call_destroy, *call, &call_args); if (error != GRPC_ERROR_NONE) { const char* error_string = grpc_error_string(error); gpr_log(GPR_ERROR, "error: %s", error_string); return error; } - grpc_call_stack_set_pollset_or_pollset_set(callstk, args->pollent); + grpc_call_stack_set_pollset_or_pollset_set(exec_ctx, callstk, args->pollent); return GRPC_ERROR_NONE; } @@ -752,20 +780,21 @@ grpc_call_stack* grpc_subchannel_call_get_call_stack( return SUBCHANNEL_CALL_TO_CALL_STACK(subchannel_call); } -static void grpc_uri_to_sockaddr(const char* uri_str, +static void grpc_uri_to_sockaddr(grpc_exec_ctx* exec_ctx, const char* uri_str, grpc_resolved_address* addr) { - grpc_uri* uri = grpc_uri_parse(uri_str, 0 /* suppress_errors */); + grpc_uri* uri = grpc_uri_parse(exec_ctx, uri_str, 0 /* suppress_errors */); GPR_ASSERT(uri != nullptr); if (!grpc_parse_uri(uri, addr)) memset(addr, 0, sizeof(*addr)); grpc_uri_destroy(uri); } -void grpc_get_subchannel_address_arg(const grpc_channel_args* args, +void grpc_get_subchannel_address_arg(grpc_exec_ctx* exec_ctx, + const grpc_channel_args* args, grpc_resolved_address* addr) { const char* addr_uri_str = grpc_get_subchannel_address_uri_arg(args); memset(addr, 0, sizeof(*addr)); if (*addr_uri_str != '\0') { - grpc_uri_to_sockaddr(addr_uri_str, addr); + grpc_uri_to_sockaddr(exec_ctx, addr_uri_str, addr); } } diff --git a/src/core/ext/filters/client_channel/subchannel.h b/src/core/ext/filters/client_channel/subchannel.h index 84d9fa27a1b..1f326fc1d20 100644 --- a/src/core/ext/filters/client_channel/subchannel.h +++ b/src/core/ext/filters/client_channel/subchannel.h @@ -42,34 +42,36 @@ typedef struct grpc_subchannel_key grpc_subchannel_key; grpc_subchannel_ref((p), __FILE__, __LINE__, (r)) #define GRPC_SUBCHANNEL_REF_FROM_WEAK_REF(p, r) \ grpc_subchannel_ref_from_weak_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_SUBCHANNEL_UNREF(p, r) \ - grpc_subchannel_unref((p), __FILE__, __LINE__, (r)) +#define GRPC_SUBCHANNEL_UNREF(cl, p, r) \ + grpc_subchannel_unref((cl), (p), __FILE__, __LINE__, (r)) #define GRPC_SUBCHANNEL_WEAK_REF(p, r) \ grpc_subchannel_weak_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_SUBCHANNEL_WEAK_UNREF(p, r) \ - grpc_subchannel_weak_unref((p), __FILE__, __LINE__, (r)) +#define GRPC_SUBCHANNEL_WEAK_UNREF(cl, p, r) \ + grpc_subchannel_weak_unref((cl), (p), __FILE__, __LINE__, (r)) #define GRPC_CONNECTED_SUBCHANNEL_REF(p, r) \ grpc_connected_subchannel_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_CONNECTED_SUBCHANNEL_UNREF(p, r) \ - grpc_connected_subchannel_unref((p), __FILE__, __LINE__, (r)) +#define GRPC_CONNECTED_SUBCHANNEL_UNREF(cl, p, r) \ + grpc_connected_subchannel_unref((cl), (p), __FILE__, __LINE__, (r)) #define GRPC_SUBCHANNEL_CALL_REF(p, r) \ grpc_subchannel_call_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_SUBCHANNEL_CALL_UNREF(p, r) \ - grpc_subchannel_call_unref((p), __FILE__, __LINE__, (r)) +#define GRPC_SUBCHANNEL_CALL_UNREF(cl, p, r) \ + grpc_subchannel_call_unref((cl), (p), __FILE__, __LINE__, (r)) #define GRPC_SUBCHANNEL_REF_EXTRA_ARGS \ , const char *file, int line, const char *reason #else #define GRPC_SUBCHANNEL_REF(p, r) grpc_subchannel_ref((p)) #define GRPC_SUBCHANNEL_REF_FROM_WEAK_REF(p, r) \ grpc_subchannel_ref_from_weak_ref((p)) -#define GRPC_SUBCHANNEL_UNREF(p, r) grpc_subchannel_unref((p)) +#define GRPC_SUBCHANNEL_UNREF(cl, p, r) grpc_subchannel_unref((cl), (p)) #define GRPC_SUBCHANNEL_WEAK_REF(p, r) grpc_subchannel_weak_ref((p)) -#define GRPC_SUBCHANNEL_WEAK_UNREF(p, r) grpc_subchannel_weak_unref((p)) +#define GRPC_SUBCHANNEL_WEAK_UNREF(cl, p, r) \ + grpc_subchannel_weak_unref((cl), (p)) #define GRPC_CONNECTED_SUBCHANNEL_REF(p, r) grpc_connected_subchannel_ref((p)) -#define GRPC_CONNECTED_SUBCHANNEL_UNREF(p, r) \ - grpc_connected_subchannel_unref((p)) +#define GRPC_CONNECTED_SUBCHANNEL_UNREF(cl, p, r) \ + grpc_connected_subchannel_unref((cl), (p)) #define GRPC_SUBCHANNEL_CALL_REF(p, r) grpc_subchannel_call_ref((p)) -#define GRPC_SUBCHANNEL_CALL_UNREF(p, r) grpc_subchannel_call_unref((p)) +#define GRPC_SUBCHANNEL_CALL_UNREF(cl, p, r) \ + grpc_subchannel_call_unref((cl), (p)) #define GRPC_SUBCHANNEL_REF_EXTRA_ARGS #endif @@ -77,20 +79,24 @@ grpc_subchannel* grpc_subchannel_ref( grpc_subchannel* channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); grpc_subchannel* grpc_subchannel_ref_from_weak_ref( grpc_subchannel* channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); -void grpc_subchannel_unref( - grpc_subchannel* channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); +void grpc_subchannel_unref(grpc_exec_ctx* exec_ctx, + grpc_subchannel* channel + GRPC_SUBCHANNEL_REF_EXTRA_ARGS); grpc_subchannel* grpc_subchannel_weak_ref( grpc_subchannel* channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); -void grpc_subchannel_weak_unref( - grpc_subchannel* channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); +void grpc_subchannel_weak_unref(grpc_exec_ctx* exec_ctx, + grpc_subchannel* channel + GRPC_SUBCHANNEL_REF_EXTRA_ARGS); grpc_connected_subchannel* grpc_connected_subchannel_ref( grpc_connected_subchannel* channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); -void grpc_connected_subchannel_unref( - grpc_connected_subchannel* channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); +void grpc_connected_subchannel_unref(grpc_exec_ctx* exec_ctx, + grpc_connected_subchannel* channel + GRPC_SUBCHANNEL_REF_EXTRA_ARGS); void grpc_subchannel_call_ref( grpc_subchannel_call* call GRPC_SUBCHANNEL_REF_EXTRA_ARGS); -void grpc_subchannel_call_unref( - grpc_subchannel_call* call GRPC_SUBCHANNEL_REF_EXTRA_ARGS); +void grpc_subchannel_call_unref(grpc_exec_ctx* exec_ctx, + grpc_subchannel_call* call + GRPC_SUBCHANNEL_REF_EXTRA_ARGS); /** construct a subchannel call */ typedef struct { @@ -104,13 +110,14 @@ typedef struct { } grpc_connected_subchannel_call_args; grpc_error* grpc_connected_subchannel_create_call( - grpc_connected_subchannel* connected_subchannel, + grpc_exec_ctx* exec_ctx, grpc_connected_subchannel* connected_subchannel, const grpc_connected_subchannel_call_args* args, grpc_subchannel_call** subchannel_call); /** process a transport level op */ void grpc_connected_subchannel_process_transport_op( - grpc_connected_subchannel* subchannel, grpc_transport_op* op); + grpc_exec_ctx* exec_ctx, grpc_connected_subchannel* subchannel, + grpc_transport_op* op); /** poll the current connectivity state of a channel */ grpc_connectivity_state grpc_subchannel_check_connectivity( @@ -119,12 +126,15 @@ grpc_connectivity_state grpc_subchannel_check_connectivity( /** Calls notify when the connectivity state of a channel becomes different from *state. Updates *state with the new state of the channel. */ void grpc_subchannel_notify_on_state_change( - grpc_subchannel* channel, grpc_pollset_set* interested_parties, - grpc_connectivity_state* state, grpc_closure* notify); + grpc_exec_ctx* exec_ctx, grpc_subchannel* channel, + grpc_pollset_set* interested_parties, grpc_connectivity_state* state, + grpc_closure* notify); void grpc_connected_subchannel_notify_on_state_change( - grpc_connected_subchannel* channel, grpc_pollset_set* interested_parties, - grpc_connectivity_state* state, grpc_closure* notify); -void grpc_connected_subchannel_ping(grpc_connected_subchannel* channel, + grpc_exec_ctx* exec_ctx, grpc_connected_subchannel* channel, + grpc_pollset_set* interested_parties, grpc_connectivity_state* state, + grpc_closure* notify); +void grpc_connected_subchannel_ping(grpc_exec_ctx* exec_ctx, + grpc_connected_subchannel* channel, grpc_closure* notify); /** retrieve the grpc_connected_subchannel - or NULL if called before @@ -137,7 +147,8 @@ const grpc_subchannel_key* grpc_subchannel_get_key( const grpc_subchannel* subchannel); /** continue processing a transport op */ -void grpc_subchannel_call_process_op(grpc_subchannel_call* subchannel_call, +void grpc_subchannel_call_process_op(grpc_exec_ctx* exec_ctx, + grpc_subchannel_call* subchannel_call, grpc_transport_stream_op_batch* op); /** Must be called once per call. Sets the 'then_schedule_closure' argument for @@ -161,11 +172,13 @@ struct grpc_subchannel_args { }; /** create a subchannel given a connector */ -grpc_subchannel* grpc_subchannel_create(grpc_connector* connector, +grpc_subchannel* grpc_subchannel_create(grpc_exec_ctx* exec_ctx, + grpc_connector* connector, const grpc_subchannel_args* args); /// Sets \a addr from \a args. -void grpc_get_subchannel_address_arg(const grpc_channel_args* args, +void grpc_get_subchannel_address_arg(grpc_exec_ctx* exec_ctx, + const grpc_channel_args* args, grpc_resolved_address* addr); /// Returns the URI string for the address to connect to. diff --git a/src/core/ext/filters/client_channel/subchannel_index.cc b/src/core/ext/filters/client_channel/subchannel_index.cc index 052b047f432..1624643d0b4 100644 --- a/src/core/ext/filters/client_channel/subchannel_index.cc +++ b/src/core/ext/filters/client_channel/subchannel_index.cc @@ -81,14 +81,16 @@ int grpc_subchannel_key_compare(const grpc_subchannel_key* a, return grpc_channel_args_compare(a->args.args, b->args.args); } -void grpc_subchannel_key_destroy(grpc_subchannel_key* k) { +void grpc_subchannel_key_destroy(grpc_exec_ctx* exec_ctx, + grpc_subchannel_key* k) { gpr_free((grpc_channel_args*)k->args.filters); - grpc_channel_args_destroy((grpc_channel_args*)k->args.args); + grpc_channel_args_destroy(exec_ctx, (grpc_channel_args*)k->args.args); gpr_free(k); } static void sck_avl_destroy(void* p, void* user_data) { - grpc_subchannel_key_destroy((grpc_subchannel_key*)p); + grpc_exec_ctx* exec_ctx = (grpc_exec_ctx*)user_data; + grpc_subchannel_key_destroy(exec_ctx, (grpc_subchannel_key*)p); } static void* sck_avl_copy(void* p, void* unused) { @@ -101,7 +103,8 @@ static long sck_avl_compare(void* a, void* b, void* unused) { } static void scv_avl_destroy(void* p, void* user_data) { - GRPC_SUBCHANNEL_WEAK_UNREF((grpc_subchannel*)p, "subchannel_index"); + grpc_exec_ctx* exec_ctx = (grpc_exec_ctx*)user_data; + GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, (grpc_subchannel*)p, "subchannel_index"); } static void* scv_avl_copy(void* p, void* unused) { @@ -132,29 +135,32 @@ void grpc_subchannel_index_shutdown(void) { void grpc_subchannel_index_unref(void) { if (gpr_unref(&g_refcount)) { + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_mu_destroy(&g_mu); - gpr_avl_unref(g_subchannel_index, grpc_core::ExecCtx::Get()); + gpr_avl_unref(g_subchannel_index, &exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); } } void grpc_subchannel_index_ref(void) { gpr_ref_non_zero(&g_refcount); } -grpc_subchannel* grpc_subchannel_index_find(grpc_subchannel_key* key) { +grpc_subchannel* grpc_subchannel_index_find(grpc_exec_ctx* exec_ctx, + grpc_subchannel_key* key) { // Lock, and take a reference to the subchannel index. // We don't need to do the search under a lock as avl's are immutable. gpr_mu_lock(&g_mu); - gpr_avl index = gpr_avl_ref(g_subchannel_index, grpc_core::ExecCtx::Get()); + gpr_avl index = gpr_avl_ref(g_subchannel_index, exec_ctx); gpr_mu_unlock(&g_mu); grpc_subchannel* c = GRPC_SUBCHANNEL_REF_FROM_WEAK_REF( - (grpc_subchannel*)gpr_avl_get(index, key, grpc_core::ExecCtx::Get()), - "index_find"); - gpr_avl_unref(index, grpc_core::ExecCtx::Get()); + (grpc_subchannel*)gpr_avl_get(index, key, exec_ctx), "index_find"); + gpr_avl_unref(index, exec_ctx); return c; } -grpc_subchannel* grpc_subchannel_index_register(grpc_subchannel_key* key, +grpc_subchannel* grpc_subchannel_index_register(grpc_exec_ctx* exec_ctx, + grpc_subchannel_key* key, grpc_subchannel* constructed) { grpc_subchannel* c = nullptr; bool need_to_unref_constructed = false; @@ -165,11 +171,11 @@ grpc_subchannel* grpc_subchannel_index_register(grpc_subchannel_key* key, // Compare and swap loop: // - take a reference to the current index gpr_mu_lock(&g_mu); - gpr_avl index = gpr_avl_ref(g_subchannel_index, grpc_core::ExecCtx::Get()); + gpr_avl index = gpr_avl_ref(g_subchannel_index, exec_ctx); gpr_mu_unlock(&g_mu); // - Check to see if a subchannel already exists - c = (grpc_subchannel*)gpr_avl_get(index, key, grpc_core::ExecCtx::Get()); + c = (grpc_subchannel*)gpr_avl_get(index, key, exec_ctx); if (c != nullptr) { c = GRPC_SUBCHANNEL_REF_FROM_WEAK_REF(c, "index_register"); } @@ -178,11 +184,9 @@ grpc_subchannel* grpc_subchannel_index_register(grpc_subchannel_key* key, need_to_unref_constructed = true; } else { // no -> update the avl and compare/swap - gpr_avl updated = - gpr_avl_add(gpr_avl_ref(index, grpc_core::ExecCtx::Get()), - subchannel_key_copy(key), - GRPC_SUBCHANNEL_WEAK_REF(constructed, "index_register"), - grpc_core::ExecCtx::Get()); + gpr_avl updated = gpr_avl_add( + gpr_avl_ref(index, exec_ctx), subchannel_key_copy(key), + GRPC_SUBCHANNEL_WEAK_REF(constructed, "index_register"), exec_ctx); // it may happen (but it's expected to be unlikely) // that some other thread has changed the index: @@ -194,42 +198,41 @@ grpc_subchannel* grpc_subchannel_index_register(grpc_subchannel_key* key, } gpr_mu_unlock(&g_mu); - gpr_avl_unref(updated, grpc_core::ExecCtx::Get()); + gpr_avl_unref(updated, exec_ctx); } - gpr_avl_unref(index, grpc_core::ExecCtx::Get()); + gpr_avl_unref(index, exec_ctx); } if (need_to_unref_constructed) { - GRPC_SUBCHANNEL_UNREF(constructed, "index_register"); + GRPC_SUBCHANNEL_UNREF(exec_ctx, constructed, "index_register"); } return c; } -void grpc_subchannel_index_unregister(grpc_subchannel_key* key, +void grpc_subchannel_index_unregister(grpc_exec_ctx* exec_ctx, + grpc_subchannel_key* key, grpc_subchannel* constructed) { bool done = false; while (!done) { // Compare and swap loop: // - take a reference to the current index gpr_mu_lock(&g_mu); - gpr_avl index = gpr_avl_ref(g_subchannel_index, grpc_core::ExecCtx::Get()); + gpr_avl index = gpr_avl_ref(g_subchannel_index, exec_ctx); gpr_mu_unlock(&g_mu); // Check to see if this key still refers to the previously // registered subchannel - grpc_subchannel* c = - (grpc_subchannel*)gpr_avl_get(index, key, grpc_core::ExecCtx::Get()); + grpc_subchannel* c = (grpc_subchannel*)gpr_avl_get(index, key, exec_ctx); if (c != constructed) { - gpr_avl_unref(index, grpc_core::ExecCtx::Get()); + gpr_avl_unref(index, exec_ctx); break; } // compare and swap the update (some other thread may have // mutated the index behind us) gpr_avl updated = - gpr_avl_remove(gpr_avl_ref(index, grpc_core::ExecCtx::Get()), key, - grpc_core::ExecCtx::Get()); + gpr_avl_remove(gpr_avl_ref(index, exec_ctx), key, exec_ctx); gpr_mu_lock(&g_mu); if (index.root == g_subchannel_index.root) { @@ -238,8 +241,8 @@ void grpc_subchannel_index_unregister(grpc_subchannel_key* key, } gpr_mu_unlock(&g_mu); - gpr_avl_unref(updated, grpc_core::ExecCtx::Get()); - gpr_avl_unref(index, grpc_core::ExecCtx::Get()); + gpr_avl_unref(updated, exec_ctx); + gpr_avl_unref(index, exec_ctx); } } diff --git a/src/core/ext/filters/client_channel/subchannel_index.h b/src/core/ext/filters/client_channel/subchannel_index.h index bd160a3b133..6a4d06ef8ff 100644 --- a/src/core/ext/filters/client_channel/subchannel_index.h +++ b/src/core/ext/filters/client_channel/subchannel_index.h @@ -29,22 +29,26 @@ grpc_subchannel_key* grpc_subchannel_key_create( const grpc_subchannel_args* args); /** Destroy a subchannel key */ -void grpc_subchannel_key_destroy(grpc_subchannel_key* key); +void grpc_subchannel_key_destroy(grpc_exec_ctx* exec_ctx, + grpc_subchannel_key* key); /** Given a subchannel key, find the subchannel registered for it. Returns NULL if no such channel exists. Thread-safe. */ -grpc_subchannel* grpc_subchannel_index_find(grpc_subchannel_key* key); +grpc_subchannel* grpc_subchannel_index_find(grpc_exec_ctx* exec_ctx, + grpc_subchannel_key* key); /** Register a subchannel against a key. Takes ownership of \a constructed. Returns the registered subchannel. This may be different from \a constructed in the case of a registration race. */ -grpc_subchannel* grpc_subchannel_index_register(grpc_subchannel_key* key, +grpc_subchannel* grpc_subchannel_index_register(grpc_exec_ctx* exec_ctx, + grpc_subchannel_key* key, grpc_subchannel* constructed); /** Remove \a constructed as the registered subchannel for \a key. */ -void grpc_subchannel_index_unregister(grpc_subchannel_key* key, +void grpc_subchannel_index_unregister(grpc_exec_ctx* exec_ctx, + grpc_subchannel_key* key, grpc_subchannel* constructed); int grpc_subchannel_key_compare(const grpc_subchannel_key* a, diff --git a/src/core/ext/filters/client_channel/uri_parser.cc b/src/core/ext/filters/client_channel/uri_parser.cc index 3428f4b54c5..b76dcbe4e3b 100644 --- a/src/core/ext/filters/client_channel/uri_parser.cc +++ b/src/core/ext/filters/client_channel/uri_parser.cc @@ -56,8 +56,8 @@ static grpc_uri* bad_uri(const char* uri_text, size_t pos, const char* section, } /** Returns a copy of percent decoded \a src[begin, end) */ -static char* decode_and_copy_component(const char* src, size_t begin, - size_t end) { +static char* decode_and_copy_component(grpc_exec_ctx* exec_ctx, const char* src, + size_t begin, size_t end) { grpc_slice component = (begin == NOT_SET || end == NOT_SET) ? grpc_empty_slice() @@ -65,8 +65,8 @@ static char* decode_and_copy_component(const char* src, size_t begin, grpc_slice decoded_component = grpc_permissive_percent_decode_slice(component); char* out = grpc_dump_slice(decoded_component, GPR_DUMP_ASCII); - grpc_slice_unref_internal(component); - grpc_slice_unref_internal(decoded_component); + grpc_slice_unref_internal(exec_ctx, component); + grpc_slice_unref_internal(exec_ctx, decoded_component); return out; } @@ -184,7 +184,8 @@ static void parse_query_parts(grpc_uri* uri) { } } -grpc_uri* grpc_uri_parse(const char* uri_text, bool suppress_errors) { +grpc_uri* grpc_uri_parse(grpc_exec_ctx* exec_ctx, const char* uri_text, + bool suppress_errors) { grpc_uri* uri; size_t scheme_begin = 0; size_t scheme_end = NOT_SET; @@ -272,13 +273,16 @@ grpc_uri* grpc_uri_parse(const char* uri_text, bool suppress_errors) { } uri = (grpc_uri*)gpr_zalloc(sizeof(*uri)); - uri->scheme = decode_and_copy_component(uri_text, scheme_begin, scheme_end); - uri->authority = - decode_and_copy_component(uri_text, authority_begin, authority_end); - uri->path = decode_and_copy_component(uri_text, path_begin, path_end); - uri->query = decode_and_copy_component(uri_text, query_begin, query_end); - uri->fragment = - decode_and_copy_component(uri_text, fragment_begin, fragment_end); + uri->scheme = + decode_and_copy_component(exec_ctx, uri_text, scheme_begin, scheme_end); + uri->authority = decode_and_copy_component(exec_ctx, uri_text, + authority_begin, authority_end); + uri->path = + decode_and_copy_component(exec_ctx, uri_text, path_begin, path_end); + uri->query = + decode_and_copy_component(exec_ctx, uri_text, query_begin, query_end); + uri->fragment = decode_and_copy_component(exec_ctx, uri_text, fragment_begin, + fragment_end); parse_query_parts(uri); return uri; diff --git a/src/core/ext/filters/client_channel/uri_parser.h b/src/core/ext/filters/client_channel/uri_parser.h index 24ff06c0b5a..84752905e8f 100644 --- a/src/core/ext/filters/client_channel/uri_parser.h +++ b/src/core/ext/filters/client_channel/uri_parser.h @@ -37,7 +37,8 @@ typedef struct { } grpc_uri; /** parse a uri, return NULL on failure */ -grpc_uri* grpc_uri_parse(const char* uri_text, bool suppress_errors); +grpc_uri* grpc_uri_parse(grpc_exec_ctx* exec_ctx, const char* uri_text, + bool suppress_errors); /** return the part of a query string after the '=' in "?key=xxx&...", or NULL * if key is not present */ diff --git a/src/core/ext/filters/deadline/deadline_filter.cc b/src/core/ext/filters/deadline/deadline_filter.cc index c430f3d2d49..5db7584a59d 100644 --- a/src/core/ext/filters/deadline/deadline_filter.cc +++ b/src/core/ext/filters/deadline/deadline_filter.cc @@ -36,16 +36,18 @@ // The on_complete callback used when sending a cancel_error batch down the // filter stack. Yields the call combiner when the batch returns. -static void yield_call_combiner(void* arg, grpc_error* ignored) { +static void yield_call_combiner(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* ignored) { grpc_deadline_state* deadline_state = (grpc_deadline_state*)arg; - GRPC_CALL_COMBINER_STOP(deadline_state->call_combiner, + GRPC_CALL_COMBINER_STOP(exec_ctx, deadline_state->call_combiner, "got on_complete from cancel_stream batch"); - GRPC_CALL_STACK_UNREF(deadline_state->call_stack, "deadline_timer"); + GRPC_CALL_STACK_UNREF(exec_ctx, deadline_state->call_stack, "deadline_timer"); } // This is called via the call combiner, so access to deadline_state is // synchronized. -static void send_cancel_op_in_call_combiner(void* arg, grpc_error* error) { +static void send_cancel_op_in_call_combiner(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; grpc_deadline_state* deadline_state = (grpc_deadline_state*)elem->call_data; grpc_transport_stream_op_batch* batch = grpc_make_transport_stream_op( @@ -53,34 +55,37 @@ static void send_cancel_op_in_call_combiner(void* arg, grpc_error* error) { deadline_state, grpc_schedule_on_exec_ctx)); batch->cancel_stream = true; batch->payload->cancel_stream.cancel_error = GRPC_ERROR_REF(error); - elem->filter->start_transport_stream_op_batch(elem, batch); + elem->filter->start_transport_stream_op_batch(exec_ctx, elem, batch); } // Timer callback. -static void timer_callback(void* arg, grpc_error* error) { +static void timer_callback(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; grpc_deadline_state* deadline_state = (grpc_deadline_state*)elem->call_data; if (error != GRPC_ERROR_CANCELLED) { error = grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Deadline Exceeded"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_DEADLINE_EXCEEDED); - grpc_call_combiner_cancel(deadline_state->call_combiner, + grpc_call_combiner_cancel(exec_ctx, deadline_state->call_combiner, GRPC_ERROR_REF(error)); GRPC_CLOSURE_INIT(&deadline_state->timer_callback, send_cancel_op_in_call_combiner, elem, grpc_schedule_on_exec_ctx); - GRPC_CALL_COMBINER_START(deadline_state->call_combiner, + GRPC_CALL_COMBINER_START(exec_ctx, deadline_state->call_combiner, &deadline_state->timer_callback, error, "deadline exceeded -- sending cancel_stream op"); } else { - GRPC_CALL_STACK_UNREF(deadline_state->call_stack, "deadline_timer"); + GRPC_CALL_STACK_UNREF(exec_ctx, deadline_state->call_stack, + "deadline_timer"); } } // Starts the deadline timer. // This is called via the call combiner, so access to deadline_state is // synchronized. -static void start_timer_if_needed(grpc_call_element* elem, +static void start_timer_if_needed(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_millis deadline) { if (deadline == GRPC_MILLIS_INF_FUTURE) { return; @@ -108,16 +113,17 @@ static void start_timer_if_needed(grpc_call_element* elem, } GPR_ASSERT(closure != nullptr); GRPC_CALL_STACK_REF(deadline_state->call_stack, "deadline_timer"); - grpc_timer_init(&deadline_state->timer, deadline, closure); + grpc_timer_init(exec_ctx, &deadline_state->timer, deadline, closure); } // Cancels the deadline timer. // This is called via the call combiner, so access to deadline_state is // synchronized. -static void cancel_timer_if_needed(grpc_deadline_state* deadline_state) { +static void cancel_timer_if_needed(grpc_exec_ctx* exec_ctx, + grpc_deadline_state* deadline_state) { if (deadline_state->timer_state == GRPC_DEADLINE_STATE_PENDING) { deadline_state->timer_state = GRPC_DEADLINE_STATE_FINISHED; - grpc_timer_cancel(&deadline_state->timer); + grpc_timer_cancel(exec_ctx, &deadline_state->timer); } else { // timer was either in STATE_INITAL (nothing to cancel) // OR in STATE_FINISHED (again nothing to cancel) @@ -125,11 +131,12 @@ static void cancel_timer_if_needed(grpc_deadline_state* deadline_state) { } // Callback run when the call is complete. -static void on_complete(void* arg, grpc_error* error) { +static void on_complete(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { grpc_deadline_state* deadline_state = (grpc_deadline_state*)arg; - cancel_timer_if_needed(deadline_state); + cancel_timer_if_needed(exec_ctx, deadline_state); // Invoke the next callback. - GRPC_CLOSURE_RUN(deadline_state->next_on_complete, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(exec_ctx, deadline_state->next_on_complete, + GRPC_ERROR_REF(error)); } // Inject our own on_complete callback into op. @@ -149,7 +156,8 @@ struct start_timer_after_init_state { grpc_millis deadline; grpc_closure closure; }; -static void start_timer_after_init(void* arg, grpc_error* error) { +static void start_timer_after_init(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { struct start_timer_after_init_state* state = (struct start_timer_after_init_state*)arg; grpc_deadline_state* deadline_state = @@ -158,18 +166,18 @@ static void start_timer_after_init(void* arg, grpc_error* error) { // We are initially called without holding the call combiner, so we // need to bounce ourselves into it. state->in_call_combiner = true; - GRPC_CALL_COMBINER_START(deadline_state->call_combiner, &state->closure, - GRPC_ERROR_REF(error), + GRPC_CALL_COMBINER_START(exec_ctx, deadline_state->call_combiner, + &state->closure, GRPC_ERROR_REF(error), "scheduling deadline timer"); return; } - start_timer_if_needed(state->elem, state->deadline); + start_timer_if_needed(exec_ctx, state->elem, state->deadline); gpr_free(state); - GRPC_CALL_COMBINER_STOP(deadline_state->call_combiner, + GRPC_CALL_COMBINER_STOP(exec_ctx, deadline_state->call_combiner, "done scheduling deadline timer"); } -void grpc_deadline_state_init(grpc_call_element* elem, +void grpc_deadline_state_init(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, grpc_call_stack* call_stack, grpc_call_combiner* call_combiner, grpc_millis deadline) { @@ -192,27 +200,29 @@ void grpc_deadline_state_init(grpc_call_element* elem, state->deadline = deadline; GRPC_CLOSURE_INIT(&state->closure, start_timer_after_init, state, grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(&state->closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &state->closure, GRPC_ERROR_NONE); } } -void grpc_deadline_state_destroy(grpc_call_element* elem) { +void grpc_deadline_state_destroy(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem) { grpc_deadline_state* deadline_state = (grpc_deadline_state*)elem->call_data; - cancel_timer_if_needed(deadline_state); + cancel_timer_if_needed(exec_ctx, deadline_state); } -void grpc_deadline_state_reset(grpc_call_element* elem, +void grpc_deadline_state_reset(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, grpc_millis new_deadline) { grpc_deadline_state* deadline_state = (grpc_deadline_state*)elem->call_data; - cancel_timer_if_needed(deadline_state); - start_timer_if_needed(elem, new_deadline); + cancel_timer_if_needed(exec_ctx, deadline_state); + start_timer_if_needed(exec_ctx, elem, new_deadline); } void grpc_deadline_state_client_start_transport_stream_op_batch( - grpc_call_element* elem, grpc_transport_stream_op_batch* op) { + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_transport_stream_op_batch* op) { grpc_deadline_state* deadline_state = (grpc_deadline_state*)elem->call_data; if (op->cancel_stream) { - cancel_timer_if_needed(deadline_state); + cancel_timer_if_needed(exec_ctx, deadline_state); } else { // Make sure we know when the call is complete, so that we can cancel // the timer. @@ -227,14 +237,16 @@ void grpc_deadline_state_client_start_transport_stream_op_batch( // // Constructor for channel_data. Used for both client and server filters. -static grpc_error* init_channel_elem(grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { GPR_ASSERT(!args->is_last); return GRPC_ERROR_NONE; } // Destructor for channel_data. Used for both client and server filters. -static void destroy_channel_elem(grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) {} // Call data used for both client and server filter. typedef struct base_call_data { @@ -254,45 +266,50 @@ typedef struct server_call_data { } server_call_data; // Constructor for call_data. Used for both client and server filters. -static grpc_error* init_call_elem(grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { - grpc_deadline_state_init(elem, args->call_stack, args->call_combiner, - args->deadline); + grpc_deadline_state_init(exec_ctx, elem, args->call_stack, + args->call_combiner, args->deadline); return GRPC_ERROR_NONE; } // Destructor for call_data. Used for both client and server filters. -static void destroy_call_elem(grpc_call_element* elem, +static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { - grpc_deadline_state_destroy(elem); + grpc_deadline_state_destroy(exec_ctx, elem); } // Method for starting a call op for client filter. static void client_start_transport_stream_op_batch( - grpc_call_element* elem, grpc_transport_stream_op_batch* op) { - grpc_deadline_state_client_start_transport_stream_op_batch(elem, op); + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_transport_stream_op_batch* op) { + grpc_deadline_state_client_start_transport_stream_op_batch(exec_ctx, elem, + op); // Chain to next filter. - grpc_call_next_op(elem, op); + grpc_call_next_op(exec_ctx, elem, op); } // Callback for receiving initial metadata on the server. -static void recv_initial_metadata_ready(void* arg, grpc_error* error) { +static void recv_initial_metadata_ready(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; server_call_data* calld = (server_call_data*)elem->call_data; // Get deadline from metadata and start the timer if needed. - start_timer_if_needed(elem, calld->recv_initial_metadata->deadline); + start_timer_if_needed(exec_ctx, elem, calld->recv_initial_metadata->deadline); // Invoke the next callback. calld->next_recv_initial_metadata_ready->cb( - calld->next_recv_initial_metadata_ready->cb_arg, error); + exec_ctx, calld->next_recv_initial_metadata_ready->cb_arg, error); } // Method for starting a call op for server filter. static void server_start_transport_stream_op_batch( - grpc_call_element* elem, grpc_transport_stream_op_batch* op) { + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_transport_stream_op_batch* op) { server_call_data* calld = (server_call_data*)elem->call_data; if (op->cancel_stream) { - cancel_timer_if_needed(&calld->base.deadline_state); + cancel_timer_if_needed(exec_ctx, &calld->base.deadline_state); } else { // If we're receiving initial metadata, we need to get the deadline // from the recv_initial_metadata_ready callback. So we inject our @@ -318,7 +335,7 @@ static void server_start_transport_stream_op_batch( } } // Chain to next filter. - grpc_call_next_op(elem, op); + grpc_call_next_op(exec_ctx, elem, op); } const grpc_channel_filter grpc_client_deadline_filter = { @@ -355,7 +372,8 @@ bool grpc_deadline_checking_enabled(const grpc_channel_args* channel_args) { !grpc_channel_args_want_minimal_stack(channel_args)); } -static bool maybe_add_deadline_filter(grpc_channel_stack_builder* builder, +static bool maybe_add_deadline_filter(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, void* arg) { return grpc_deadline_checking_enabled( grpc_channel_stack_builder_get_channel_arguments(builder)) diff --git a/src/core/ext/filters/deadline/deadline_filter.h b/src/core/ext/filters/deadline/deadline_filter.h index 4de817ef54a..8d835d03820 100644 --- a/src/core/ext/filters/deadline/deadline_filter.h +++ b/src/core/ext/filters/deadline/deadline_filter.h @@ -49,12 +49,13 @@ typedef struct grpc_deadline_state { // // assumes elem->call_data is zero'd -void grpc_deadline_state_init(grpc_call_element* elem, +void grpc_deadline_state_init(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, grpc_call_stack* call_stack, grpc_call_combiner* call_combiner, grpc_millis deadline); -void grpc_deadline_state_destroy(grpc_call_element* elem); +void grpc_deadline_state_destroy(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem); // Cancels the existing timer and starts a new one with new_deadline. // @@ -65,7 +66,7 @@ void grpc_deadline_state_destroy(grpc_call_element* elem); // deadline may result in the timer being called twice. // // Note: Must be called while holding the call combiner. -void grpc_deadline_state_reset(grpc_call_element* elem, +void grpc_deadline_state_reset(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, grpc_millis new_deadline); // To be called from the client-side filter's start_transport_stream_op_batch() @@ -77,7 +78,8 @@ void grpc_deadline_state_reset(grpc_call_element* elem, // // Note: Must be called while holding the call combiner. void grpc_deadline_state_client_start_transport_stream_op_batch( - grpc_call_element* elem, grpc_transport_stream_op_batch* op); + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_transport_stream_op_batch* op); // Should deadline checking be performed (according to channel args) bool grpc_deadline_checking_enabled(const grpc_channel_args* args); diff --git a/src/core/ext/filters/http/client/http_client_filter.cc b/src/core/ext/filters/http/client/http_client_filter.cc index a1fb10f5b87..a625369b029 100644 --- a/src/core/ext/filters/http/client/http_client_filter.cc +++ b/src/core/ext/filters/http/client/http_client_filter.cc @@ -68,11 +68,12 @@ typedef struct channel_data { size_t max_payload_size_for_get; } channel_data; -static grpc_error* client_filter_incoming_metadata(grpc_call_element* elem, +static grpc_error* client_filter_incoming_metadata(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_metadata_batch* b) { if (b->idx.named.status != nullptr) { if (grpc_mdelem_eq(b->idx.named.status->md, GRPC_MDELEM_STATUS_200)) { - grpc_metadata_batch_remove(b, b->idx.named.status); + grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.status); } else { char* val = grpc_dump_slice(GRPC_MDVALUE(b->idx.named.status->md), GPR_DUMP_ASCII); @@ -97,9 +98,10 @@ static grpc_error* client_filter_incoming_metadata(grpc_call_element* elem, GRPC_MDVALUE(b->idx.named.grpc_message->md)); if (grpc_slice_is_equivalent(pct_decoded_msg, GRPC_MDVALUE(b->idx.named.grpc_message->md))) { - grpc_slice_unref_internal(pct_decoded_msg); + grpc_slice_unref_internal(exec_ctx, pct_decoded_msg); } else { - grpc_metadata_batch_set_value(b->idx.named.grpc_message, pct_decoded_msg); + grpc_metadata_batch_set_value(exec_ctx, b->idx.named.grpc_message, + pct_decoded_msg); } } @@ -129,53 +131,60 @@ static grpc_error* client_filter_incoming_metadata(grpc_call_element* elem, gpr_free(val); } } - grpc_metadata_batch_remove(b, b->idx.named.content_type); + grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.content_type); } return GRPC_ERROR_NONE; } -static void recv_initial_metadata_ready(void* user_data, grpc_error* error) { +static void recv_initial_metadata_ready(grpc_exec_ctx* exec_ctx, + void* user_data, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; if (error == GRPC_ERROR_NONE) { - error = client_filter_incoming_metadata(elem, calld->recv_initial_metadata); + error = client_filter_incoming_metadata(exec_ctx, elem, + calld->recv_initial_metadata); } else { GRPC_ERROR_REF(error); } - GRPC_CLOSURE_RUN(calld->original_recv_initial_metadata_ready, error); + GRPC_CLOSURE_RUN(exec_ctx, calld->original_recv_initial_metadata_ready, + error); } -static void recv_trailing_metadata_on_complete(void* user_data, +static void recv_trailing_metadata_on_complete(grpc_exec_ctx* exec_ctx, + void* user_data, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; if (error == GRPC_ERROR_NONE) { - error = - client_filter_incoming_metadata(elem, calld->recv_trailing_metadata); + error = client_filter_incoming_metadata(exec_ctx, elem, + calld->recv_trailing_metadata); } else { GRPC_ERROR_REF(error); } - GRPC_CLOSURE_RUN(calld->original_recv_trailing_metadata_on_complete, error); + GRPC_CLOSURE_RUN(exec_ctx, calld->original_recv_trailing_metadata_on_complete, + error); } -static void send_message_on_complete(void* arg, grpc_error* error) { +static void send_message_on_complete(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; - grpc_byte_stream_cache_destroy(&calld->send_message_cache); - GRPC_CLOSURE_RUN(calld->original_send_message_on_complete, + grpc_byte_stream_cache_destroy(exec_ctx, &calld->send_message_cache); + GRPC_CLOSURE_RUN(exec_ctx, calld->original_send_message_on_complete, GRPC_ERROR_REF(error)); } // Pulls a slice from the send_message byte stream, updating // calld->send_message_bytes_read. -static grpc_error* pull_slice_from_send_message(call_data* calld) { +static grpc_error* pull_slice_from_send_message(grpc_exec_ctx* exec_ctx, + call_data* calld) { grpc_slice incoming_slice; grpc_error* error = grpc_byte_stream_pull( - &calld->send_message_caching_stream.base, &incoming_slice); + exec_ctx, &calld->send_message_caching_stream.base, &incoming_slice); if (error == GRPC_ERROR_NONE) { calld->send_message_bytes_read += GRPC_SLICE_LENGTH(incoming_slice); - grpc_slice_unref_internal(incoming_slice); + grpc_slice_unref_internal(exec_ctx, incoming_slice); } return error; } @@ -185,10 +194,12 @@ static grpc_error* pull_slice_from_send_message(call_data* calld) { // calld->send_message_caching_stream.base.length, then we have completed // reading from the byte stream; otherwise, an async read has been dispatched // and on_send_message_next_done() will be invoked when it is complete. -static grpc_error* read_all_available_send_message_data(call_data* calld) { - while (grpc_byte_stream_next(&calld->send_message_caching_stream.base, +static grpc_error* read_all_available_send_message_data(grpc_exec_ctx* exec_ctx, + call_data* calld) { + while (grpc_byte_stream_next(exec_ctx, + &calld->send_message_caching_stream.base, ~(size_t)0, &calld->on_send_message_next_done)) { - grpc_error* error = pull_slice_from_send_message(calld); + grpc_error* error = pull_slice_from_send_message(exec_ctx, calld); if (error != GRPC_ERROR_NONE) return error; if (calld->send_message_bytes_read == calld->send_message_caching_stream.base.length) { @@ -199,18 +210,19 @@ static grpc_error* read_all_available_send_message_data(call_data* calld) { } // Async callback for grpc_byte_stream_next(). -static void on_send_message_next_done(void* arg, grpc_error* error) { +static void on_send_message_next_done(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; if (error != GRPC_ERROR_NONE) { grpc_transport_stream_op_batch_finish_with_failure( - calld->send_message_batch, error, calld->call_combiner); + exec_ctx, calld->send_message_batch, error, calld->call_combiner); return; } - error = pull_slice_from_send_message(calld); + error = pull_slice_from_send_message(exec_ctx, calld); if (error != GRPC_ERROR_NONE) { grpc_transport_stream_op_batch_finish_with_failure( - calld->send_message_batch, error, calld->call_combiner); + exec_ctx, calld->send_message_batch, error, calld->call_combiner); return; } // There may or may not be more to read, but we don't care. If we got @@ -218,7 +230,7 @@ static void on_send_message_next_done(void* arg, grpc_error* error) { // synchronously, so we were not able to do a cached call. Instead, // we just reset the byte stream and then send down the batch as-is. grpc_caching_byte_stream_reset(&calld->send_message_caching_stream); - grpc_call_next_op(elem, calld->send_message_batch); + grpc_call_next_op(exec_ctx, elem, calld->send_message_batch); } static char* slice_buffer_to_string(grpc_slice_buffer* slice_buffer) { @@ -236,7 +248,8 @@ static char* slice_buffer_to_string(grpc_slice_buffer* slice_buffer) { // Modifies the path entry in the batch's send_initial_metadata to // append the base64-encoded query for a GET request. -static grpc_error* update_path_for_get(grpc_call_element* elem, +static grpc_error* update_path_for_get(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { call_data* calld = (call_data*)elem->call_data; grpc_slice path_slice = @@ -269,22 +282,24 @@ static grpc_error* update_path_for_get(grpc_call_element* elem, grpc_slice_sub_no_ref(path_with_query_slice, 0, strlen(t)); /* substitute previous path with the new path+query */ grpc_mdelem mdelem_path_and_query = - grpc_mdelem_from_slices(GRPC_MDSTR_PATH, path_with_query_slice); + grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_PATH, path_with_query_slice); grpc_metadata_batch* b = batch->payload->send_initial_metadata.send_initial_metadata; - return grpc_metadata_batch_substitute(b, b->idx.named.path, + return grpc_metadata_batch_substitute(exec_ctx, b, b->idx.named.path, mdelem_path_and_query); } -static void remove_if_present(grpc_metadata_batch* batch, +static void remove_if_present(grpc_exec_ctx* exec_ctx, + grpc_metadata_batch* batch, grpc_metadata_batch_callouts_index idx) { if (batch->idx.array[idx] != nullptr) { - grpc_metadata_batch_remove(batch, batch->idx.array[idx]); + grpc_metadata_batch_remove(exec_ctx, batch, batch->idx.array[idx]); } } static void hc_start_transport_stream_op_batch( - grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_transport_stream_op_batch* batch) { call_data* calld = (call_data*)elem->call_data; channel_data* channeld = (channel_data*)elem->channel_data; GPR_TIMER_BEGIN("hc_start_transport_stream_op_batch", 0); @@ -330,16 +345,17 @@ static void hc_start_transport_stream_op_batch( calld->original_send_message_on_complete = batch->on_complete; batch->on_complete = &calld->send_message_on_complete; calld->send_message_batch = batch; - error = read_all_available_send_message_data(calld); + error = read_all_available_send_message_data(exec_ctx, calld); if (error != GRPC_ERROR_NONE) goto done; // If all the data has been read, then we can use GET. if (calld->send_message_bytes_read == calld->send_message_caching_stream.base.length) { method = GRPC_MDELEM_METHOD_GET; - error = update_path_for_get(elem, batch); + error = update_path_for_get(exec_ctx, elem, batch); if (error != GRPC_ERROR_NONE) goto done; batch->send_message = false; - grpc_byte_stream_destroy(&calld->send_message_caching_stream.base); + grpc_byte_stream_destroy(exec_ctx, + &calld->send_message_caching_stream.base); } else { // Not all data is available. The batch will be sent down // asynchronously in on_send_message_next_done(). @@ -356,41 +372,41 @@ static void hc_start_transport_stream_op_batch( } remove_if_present( - batch->payload->send_initial_metadata.send_initial_metadata, + exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, GRPC_BATCH_METHOD); remove_if_present( - batch->payload->send_initial_metadata.send_initial_metadata, + exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, GRPC_BATCH_SCHEME); remove_if_present( - batch->payload->send_initial_metadata.send_initial_metadata, + exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, GRPC_BATCH_TE); remove_if_present( - batch->payload->send_initial_metadata.send_initial_metadata, + exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, GRPC_BATCH_CONTENT_TYPE); remove_if_present( - batch->payload->send_initial_metadata.send_initial_metadata, + exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, GRPC_BATCH_USER_AGENT); /* Send : prefixed headers, which have to be before any application layer headers. */ error = grpc_metadata_batch_add_head( - batch->payload->send_initial_metadata.send_initial_metadata, + exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, &calld->method, method); if (error != GRPC_ERROR_NONE) goto done; error = grpc_metadata_batch_add_head( - batch->payload->send_initial_metadata.send_initial_metadata, + exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, &calld->scheme, channeld->static_scheme); if (error != GRPC_ERROR_NONE) goto done; error = grpc_metadata_batch_add_tail( - batch->payload->send_initial_metadata.send_initial_metadata, + exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, &calld->te_trailers, GRPC_MDELEM_TE_TRAILERS); if (error != GRPC_ERROR_NONE) goto done; error = grpc_metadata_batch_add_tail( - batch->payload->send_initial_metadata.send_initial_metadata, + exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, &calld->content_type, GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC); if (error != GRPC_ERROR_NONE) goto done; error = grpc_metadata_batch_add_tail( - batch->payload->send_initial_metadata.send_initial_metadata, + exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, &calld->user_agent, GRPC_MDELEM_REF(channeld->user_agent)); if (error != GRPC_ERROR_NONE) goto done; } @@ -398,15 +414,16 @@ static void hc_start_transport_stream_op_batch( done: if (error != GRPC_ERROR_NONE) { grpc_transport_stream_op_batch_finish_with_failure( - calld->send_message_batch, error, calld->call_combiner); + exec_ctx, calld->send_message_batch, error, calld->call_combiner); } else if (!batch_will_be_handled_asynchronously) { - grpc_call_next_op(elem, batch); + grpc_call_next_op(exec_ctx, elem, batch); } GPR_TIMER_END("hc_start_transport_stream_op_batch", 0); } /* Constructor for call_data */ -static grpc_error* init_call_elem(grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; calld->call_combiner = args->call_combiner; @@ -424,7 +441,7 @@ static grpc_error* init_call_elem(grpc_call_element* elem, } /* Destructor for call_data */ -static void destroy_call_elem(grpc_call_element* elem, +static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) {} @@ -516,7 +533,8 @@ static grpc_slice user_agent_from_args(const grpc_channel_args* args, } /* Constructor for channel_data */ -static grpc_error* init_channel_elem(grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { channel_data* chand = (channel_data*)elem->channel_data; GPR_ASSERT(!args->is_last); @@ -525,16 +543,17 @@ static grpc_error* init_channel_elem(grpc_channel_element* elem, chand->max_payload_size_for_get = max_payload_size_from_args(args->channel_args); chand->user_agent = grpc_mdelem_from_slices( - GRPC_MDSTR_USER_AGENT, + exec_ctx, GRPC_MDSTR_USER_AGENT, user_agent_from_args(args->channel_args, args->optional_transport->vtable->name)); return GRPC_ERROR_NONE; } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_channel_element* elem) { +static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) { channel_data* chand = (channel_data*)elem->channel_data; - GRPC_MDELEM_UNREF(chand->user_agent); + GRPC_MDELEM_UNREF(exec_ctx, chand->user_agent); } const grpc_channel_filter grpc_http_client_filter = { diff --git a/src/core/ext/filters/http/http_filters_plugin.cc b/src/core/ext/filters/http/http_filters_plugin.cc index deec77c96f3..483eb021e8d 100644 --- a/src/core/ext/filters/http/http_filters_plugin.cc +++ b/src/core/ext/filters/http/http_filters_plugin.cc @@ -40,7 +40,8 @@ static bool is_building_http_like_transport( return t != nullptr && strstr(t->vtable->name, "http"); } -static bool maybe_add_optional_filter(grpc_channel_stack_builder* builder, +static bool maybe_add_optional_filter(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, void* arg) { if (!is_building_http_like_transport(builder)) return true; optional_filter* filtarg = (optional_filter*)arg; @@ -54,7 +55,8 @@ static bool maybe_add_optional_filter(grpc_channel_stack_builder* builder, : true; } -static bool maybe_add_required_filter(grpc_channel_stack_builder* builder, +static bool maybe_add_required_filter(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, void* arg) { return is_building_http_like_transport(builder) ? grpc_channel_stack_builder_prepend_filter( diff --git a/src/core/ext/filters/http/message_compress/message_compress_filter.cc b/src/core/ext/filters/http/message_compress/message_compress_filter.cc index 9ae13d2ed27..d070b56b6a5 100644 --- a/src/core/ext/filters/http/message_compress/message_compress_filter.cc +++ b/src/core/ext/filters/http/message_compress/message_compress_filter.cc @@ -100,11 +100,12 @@ static bool skip_compression(grpc_call_element* elem, uint32_t flags, /** Filter initial metadata */ static grpc_error* process_send_initial_metadata( - grpc_call_element* elem, grpc_metadata_batch* initial_metadata, + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_metadata_batch* initial_metadata, bool* has_compression_algorithm) GRPC_MUST_USE_RESULT; static grpc_error* process_send_initial_metadata( - grpc_call_element* elem, grpc_metadata_batch* initial_metadata, - bool* has_compression_algorithm) { + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_metadata_batch* initial_metadata, bool* has_compression_algorithm) { call_data* calld = (call_data*)elem->call_data; channel_data* channeld = (channel_data*)elem->channel_data; *has_compression_algorithm = false; @@ -136,13 +137,13 @@ static grpc_error* process_send_initial_metadata( } *has_compression_algorithm = true; grpc_metadata_batch_remove( - initial_metadata, + exec_ctx, initial_metadata, initial_metadata->idx.named.grpc_internal_stream_encoding_request); /* Disable message-wise compression */ calld->compression_algorithm = GRPC_COMPRESS_NONE; if (initial_metadata->idx.named.grpc_internal_encoding_request != nullptr) { grpc_metadata_batch_remove( - initial_metadata, + exec_ctx, initial_metadata, initial_metadata->idx.named.grpc_internal_encoding_request); } } else if (initial_metadata->idx.named.grpc_internal_encoding_request != @@ -159,7 +160,7 @@ static grpc_error* process_send_initial_metadata( } *has_compression_algorithm = true; grpc_metadata_batch_remove( - initial_metadata, + exec_ctx, initial_metadata, initial_metadata->idx.named.grpc_internal_encoding_request); } else { /* If no algorithm was found in the metadata and we aren't @@ -180,11 +181,12 @@ static grpc_error* process_send_initial_metadata( /* hint compression algorithm */ if (stream_compression_algorithm != GRPC_STREAM_COMPRESS_NONE) { error = grpc_metadata_batch_add_tail( - initial_metadata, &calld->stream_compression_algorithm_storage, + exec_ctx, initial_metadata, + &calld->stream_compression_algorithm_storage, grpc_stream_compression_encoding_mdelem(stream_compression_algorithm)); } else if (calld->compression_algorithm != GRPC_COMPRESS_NONE) { error = grpc_metadata_batch_add_tail( - initial_metadata, &calld->compression_algorithm_storage, + exec_ctx, initial_metadata, &calld->compression_algorithm_storage, grpc_compression_encoding_mdelem(calld->compression_algorithm)); } @@ -192,7 +194,7 @@ static grpc_error* process_send_initial_metadata( /* convey supported compression algorithms */ error = grpc_metadata_batch_add_tail( - initial_metadata, &calld->accept_encoding_storage, + exec_ctx, initial_metadata, &calld->accept_encoding_storage, GRPC_MDELEM_ACCEPT_ENCODING_FOR_ALGORITHMS( channeld->supported_compression_algorithms)); @@ -201,7 +203,7 @@ static grpc_error* process_send_initial_metadata( /* Do not overwrite accept-encoding header if it already presents. */ if (!initial_metadata->idx.named.accept_encoding) { error = grpc_metadata_batch_add_tail( - initial_metadata, &calld->accept_stream_encoding_storage, + exec_ctx, initial_metadata, &calld->accept_stream_encoding_storage, GRPC_MDELEM_ACCEPT_STREAM_ENCODING_FOR_ALGORITHMS( channeld->supported_stream_compression_algorithms)); } @@ -209,15 +211,17 @@ static grpc_error* process_send_initial_metadata( return error; } -static void send_message_on_complete(void* arg, grpc_error* error) { +static void send_message_on_complete(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; - grpc_slice_buffer_reset_and_unref_internal(&calld->slices); - GRPC_CLOSURE_RUN(calld->original_send_message_on_complete, + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &calld->slices); + GRPC_CLOSURE_RUN(exec_ctx, calld->original_send_message_on_complete, GRPC_ERROR_REF(error)); } -static void send_message_batch_continue(grpc_call_element* elem) { +static void send_message_batch_continue(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem) { call_data* calld = (call_data*)elem->call_data; // Note: The call to grpc_call_next_op() results in yielding the // call combiner, so we need to clear calld->send_message_batch @@ -225,18 +229,19 @@ static void send_message_batch_continue(grpc_call_element* elem) { grpc_transport_stream_op_batch* send_message_batch = calld->send_message_batch; calld->send_message_batch = nullptr; - grpc_call_next_op(elem, send_message_batch); + grpc_call_next_op(exec_ctx, elem, send_message_batch); } -static void finish_send_message(grpc_call_element* elem) { +static void finish_send_message(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem) { call_data* calld = (call_data*)elem->call_data; // Compress the data if appropriate. grpc_slice_buffer tmp; grpc_slice_buffer_init(&tmp); uint32_t send_flags = calld->send_message_batch->payload->send_message.send_message->flags; - bool did_compress = - grpc_msg_compress(calld->compression_algorithm, &calld->slices, &tmp); + bool did_compress = grpc_msg_compress(exec_ctx, calld->compression_algorithm, + &calld->slices, &tmp); if (did_compress) { if (grpc_compression_trace.enabled()) { const char* algo_name; @@ -263,11 +268,11 @@ static void finish_send_message(grpc_call_element* elem) { algo_name, calld->slices.length); } } - grpc_slice_buffer_destroy_internal(&tmp); + grpc_slice_buffer_destroy_internal(exec_ctx, &tmp); // Swap out the original byte stream with our new one and send the // batch down. grpc_byte_stream_destroy( - calld->send_message_batch->payload->send_message.send_message); + exec_ctx, calld->send_message_batch->payload->send_message.send_message); grpc_slice_buffer_stream_init(&calld->replacement_stream, &calld->slices, send_flags); calld->send_message_batch->payload->send_message.send_message = @@ -275,24 +280,27 @@ static void finish_send_message(grpc_call_element* elem) { calld->original_send_message_on_complete = calld->send_message_batch->on_complete; calld->send_message_batch->on_complete = &calld->send_message_on_complete; - send_message_batch_continue(elem); + send_message_batch_continue(exec_ctx, elem); } -static void fail_send_message_batch_in_call_combiner(void* arg, +static void fail_send_message_batch_in_call_combiner(grpc_exec_ctx* exec_ctx, + void* arg, grpc_error* error) { call_data* calld = (call_data*)arg; if (calld->send_message_batch != nullptr) { grpc_transport_stream_op_batch_finish_with_failure( - calld->send_message_batch, GRPC_ERROR_REF(error), calld->call_combiner); + exec_ctx, calld->send_message_batch, GRPC_ERROR_REF(error), + calld->call_combiner); calld->send_message_batch = nullptr; } } // Pulls a slice from the send_message byte stream and adds it to calld->slices. -static grpc_error* pull_slice_from_send_message(call_data* calld) { +static grpc_error* pull_slice_from_send_message(grpc_exec_ctx* exec_ctx, + call_data* calld) { grpc_slice incoming_slice; grpc_error* error = grpc_byte_stream_pull( - calld->send_message_batch->payload->send_message.send_message, + exec_ctx, calld->send_message_batch->payload->send_message.send_message, &incoming_slice); if (error == GRPC_ERROR_NONE) { grpc_slice_buffer_add(&calld->slices, incoming_slice); @@ -304,65 +312,69 @@ static grpc_error* pull_slice_from_send_message(call_data* calld) { // If all data has been read, invokes finish_send_message(). Otherwise, // an async call to grpc_byte_stream_next() has been started, which will // eventually result in calling on_send_message_next_done(). -static void continue_reading_send_message(grpc_call_element* elem) { +static void continue_reading_send_message(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem) { call_data* calld = (call_data*)elem->call_data; while (grpc_byte_stream_next( - calld->send_message_batch->payload->send_message.send_message, ~(size_t)0, - &calld->on_send_message_next_done)) { - grpc_error* error = pull_slice_from_send_message(calld); + exec_ctx, calld->send_message_batch->payload->send_message.send_message, + ~(size_t)0, &calld->on_send_message_next_done)) { + grpc_error* error = pull_slice_from_send_message(exec_ctx, calld); if (error != GRPC_ERROR_NONE) { // Closure callback; does not take ownership of error. - fail_send_message_batch_in_call_combiner(calld, error); + fail_send_message_batch_in_call_combiner(exec_ctx, calld, error); GRPC_ERROR_UNREF(error); return; } if (calld->slices.length == calld->send_message_batch->payload->send_message.send_message->length) { - finish_send_message(elem); + finish_send_message(exec_ctx, elem); break; } } } // Async callback for grpc_byte_stream_next(). -static void on_send_message_next_done(void* arg, grpc_error* error) { +static void on_send_message_next_done(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; if (error != GRPC_ERROR_NONE) { // Closure callback; does not take ownership of error. - fail_send_message_batch_in_call_combiner(calld, error); + fail_send_message_batch_in_call_combiner(exec_ctx, calld, error); return; } - error = pull_slice_from_send_message(calld); + error = pull_slice_from_send_message(exec_ctx, calld); if (error != GRPC_ERROR_NONE) { // Closure callback; does not take ownership of error. - fail_send_message_batch_in_call_combiner(calld, error); + fail_send_message_batch_in_call_combiner(exec_ctx, calld, error); GRPC_ERROR_UNREF(error); return; } if (calld->slices.length == calld->send_message_batch->payload->send_message.send_message->length) { - finish_send_message(elem); + finish_send_message(exec_ctx, elem); } else { - continue_reading_send_message(elem); + continue_reading_send_message(exec_ctx, elem); } } -static void start_send_message_batch(void* arg, grpc_error* unused) { +static void start_send_message_batch(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* unused) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; if (skip_compression( elem, calld->send_message_batch->payload->send_message.send_message->flags, calld->send_initial_metadata_state == HAS_COMPRESSION_ALGORITHM)) { - send_message_batch_continue(elem); + send_message_batch_continue(exec_ctx, elem); } else { - continue_reading_send_message(elem); + continue_reading_send_message(exec_ctx, elem); } } static void compress_start_transport_stream_op_batch( - grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_transport_stream_op_batch* batch) { call_data* calld = (call_data*)elem->call_data; GPR_TIMER_BEGIN("compress_start_transport_stream_op_batch", 0); // Handle cancel_stream. @@ -373,19 +385,21 @@ static void compress_start_transport_stream_op_batch( if (calld->send_message_batch != nullptr) { if (calld->send_initial_metadata_state == INITIAL_METADATA_UNSEEN) { GRPC_CALL_COMBINER_START( - calld->call_combiner, + exec_ctx, calld->call_combiner, GRPC_CLOSURE_CREATE(fail_send_message_batch_in_call_combiner, calld, grpc_schedule_on_exec_ctx), GRPC_ERROR_REF(calld->cancel_error), "failing send_message op"); } else { grpc_byte_stream_shutdown( + exec_ctx, calld->send_message_batch->payload->send_message.send_message, GRPC_ERROR_REF(calld->cancel_error)); } } } else if (calld->cancel_error != GRPC_ERROR_NONE) { grpc_transport_stream_op_batch_finish_with_failure( - batch, GRPC_ERROR_REF(calld->cancel_error), calld->call_combiner); + exec_ctx, batch, GRPC_ERROR_REF(calld->cancel_error), + calld->call_combiner); goto done; } // Handle send_initial_metadata. @@ -393,10 +407,11 @@ static void compress_start_transport_stream_op_batch( GPR_ASSERT(calld->send_initial_metadata_state == INITIAL_METADATA_UNSEEN); bool has_compression_algorithm; grpc_error* error = process_send_initial_metadata( - elem, batch->payload->send_initial_metadata.send_initial_metadata, + exec_ctx, elem, + batch->payload->send_initial_metadata.send_initial_metadata, &has_compression_algorithm); if (error != GRPC_ERROR_NONE) { - grpc_transport_stream_op_batch_finish_with_failure(batch, error, + grpc_transport_stream_op_batch_finish_with_failure(exec_ctx, batch, error, calld->call_combiner); goto done; } @@ -410,7 +425,7 @@ static void compress_start_transport_stream_op_batch( // the call stack) will release the call combiner for each batch it sees. if (calld->send_message_batch != nullptr) { GRPC_CALL_COMBINER_START( - calld->call_combiner, + exec_ctx, calld->call_combiner, &calld->start_send_message_batch_in_call_combiner, GRPC_ERROR_NONE, "starting send_message after send_initial_metadata"); } @@ -425,21 +440,22 @@ static void compress_start_transport_stream_op_batch( // send_initial_metadata. if (calld->send_initial_metadata_state == INITIAL_METADATA_UNSEEN) { GRPC_CALL_COMBINER_STOP( - calld->call_combiner, + exec_ctx, calld->call_combiner, "send_message batch pending send_initial_metadata"); goto done; } - start_send_message_batch(elem, GRPC_ERROR_NONE); + start_send_message_batch(exec_ctx, elem, GRPC_ERROR_NONE); } else { // Pass control down the stack. - grpc_call_next_op(elem, batch); + grpc_call_next_op(exec_ctx, elem, batch); } done: GPR_TIMER_END("compress_start_transport_stream_op_batch", 0); } /* Constructor for call_data */ -static grpc_error* init_call_elem(grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; calld->call_combiner = args->call_combiner; @@ -455,16 +471,17 @@ static grpc_error* init_call_elem(grpc_call_element* elem, } /* Destructor for call_data */ -static void destroy_call_elem(grpc_call_element* elem, +static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { call_data* calld = (call_data*)elem->call_data; - grpc_slice_buffer_destroy_internal(&calld->slices); + grpc_slice_buffer_destroy_internal(exec_ctx, &calld->slices); GRPC_ERROR_UNREF(calld->cancel_error); } /* Constructor for channel_data */ -static grpc_error* init_channel_elem(grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { channel_data* channeld = (channel_data*)elem->channel_data; @@ -514,7 +531,8 @@ static grpc_error* init_channel_elem(grpc_channel_element* elem, } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) {} const grpc_channel_filter grpc_message_compress_filter = { compress_start_transport_stream_op_batch, diff --git a/src/core/ext/filters/http/server/http_server_filter.cc b/src/core/ext/filters/http/server/http_server_filter.cc index b872dc98f59..4f3897915c0 100644 --- a/src/core/ext/filters/http/server/http_server_filter.cc +++ b/src/core/ext/filters/http/server/http_server_filter.cc @@ -66,7 +66,8 @@ typedef struct channel_data { uint8_t unused; } channel_data; -static grpc_error* server_filter_outgoing_metadata(grpc_call_element* elem, +static grpc_error* server_filter_outgoing_metadata(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_metadata_batch* b) { if (b->idx.named.grpc_message != nullptr) { grpc_slice pct_encoded_msg = grpc_percent_encode_slice( @@ -74,9 +75,10 @@ static grpc_error* server_filter_outgoing_metadata(grpc_call_element* elem, grpc_compatible_percent_encoding_unreserved_bytes); if (grpc_slice_is_equivalent(pct_encoded_msg, GRPC_MDVALUE(b->idx.named.grpc_message->md))) { - grpc_slice_unref_internal(pct_encoded_msg); + grpc_slice_unref_internal(exec_ctx, pct_encoded_msg); } else { - grpc_metadata_batch_set_value(b->idx.named.grpc_message, pct_encoded_msg); + grpc_metadata_batch_set_value(exec_ctx, b->idx.named.grpc_message, + pct_encoded_msg); } } return GRPC_ERROR_NONE; @@ -91,7 +93,8 @@ static void add_error(const char* error_name, grpc_error** cumulative, *cumulative = grpc_error_add_child(*cumulative, new_err); } -static grpc_error* server_filter_incoming_metadata(grpc_call_element* elem, +static grpc_error* server_filter_incoming_metadata(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_metadata_batch* b) { call_data* calld = (call_data*)elem->call_data; grpc_error* error = GRPC_ERROR_NONE; @@ -120,7 +123,7 @@ static grpc_error* server_filter_incoming_metadata(grpc_call_element* elem, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Bad header"), b->idx.named.method->md)); } - grpc_metadata_batch_remove(b, b->idx.named.method); + grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.method); } else { add_error( error_name, &error, @@ -136,7 +139,7 @@ static grpc_error* server_filter_incoming_metadata(grpc_call_element* elem, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Bad header"), b->idx.named.te->md)); } - grpc_metadata_batch_remove(b, b->idx.named.te); + grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.te); } else { add_error(error_name, &error, grpc_error_set_str( @@ -153,7 +156,7 @@ static grpc_error* server_filter_incoming_metadata(grpc_call_element* elem, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Bad header"), b->idx.named.scheme->md)); } - grpc_metadata_batch_remove(b, b->idx.named.scheme); + grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.scheme); } else { add_error( error_name, &error, @@ -188,7 +191,7 @@ static grpc_error* server_filter_incoming_metadata(grpc_call_element* elem, gpr_free(val); } } - grpc_metadata_batch_remove(b, b->idx.named.content_type); + grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.content_type); } if (b->idx.named.path == nullptr) { @@ -215,21 +218,22 @@ static grpc_error* server_filter_incoming_metadata(grpc_call_element* elem, /* substitute path metadata with just the path (not query) */ grpc_mdelem mdelem_path_without_query = grpc_mdelem_from_slices( - GRPC_MDSTR_PATH, grpc_slice_sub(path_slice, 0, offset)); + exec_ctx, GRPC_MDSTR_PATH, grpc_slice_sub(path_slice, 0, offset)); - grpc_metadata_batch_substitute(b, b->idx.named.path, + grpc_metadata_batch_substitute(exec_ctx, b, b->idx.named.path, mdelem_path_without_query); /* decode payload from query and add to the slice buffer to be returned */ const int k_url_safe = 1; - grpc_slice_buffer_add(&calld->read_slice_buffer, - grpc_base64_decode_with_len( - (const char*)GRPC_SLICE_START_PTR(query_slice), - GRPC_SLICE_LENGTH(query_slice), k_url_safe)); + grpc_slice_buffer_add( + &calld->read_slice_buffer, + grpc_base64_decode_with_len( + exec_ctx, (const char*)GRPC_SLICE_START_PTR(query_slice), + GRPC_SLICE_LENGTH(query_slice), k_url_safe)); grpc_slice_buffer_stream_init(&calld->read_stream, &calld->read_slice_buffer, 0); calld->seen_path_with_query = true; - grpc_slice_unref_internal(query_slice); + grpc_slice_unref_internal(exec_ctx, query_slice); } else { gpr_log(GPR_ERROR, "GET request without QUERY"); } @@ -238,14 +242,14 @@ static grpc_error* server_filter_incoming_metadata(grpc_call_element* elem, if (b->idx.named.host != nullptr && b->idx.named.authority == nullptr) { grpc_linked_mdelem* el = b->idx.named.host; grpc_mdelem md = GRPC_MDELEM_REF(el->md); - grpc_metadata_batch_remove(b, el); + grpc_metadata_batch_remove(exec_ctx, b, el); add_error(error_name, &error, grpc_metadata_batch_add_head( - b, el, + exec_ctx, b, el, grpc_mdelem_from_slices( - GRPC_MDSTR_AUTHORITY, + exec_ctx, GRPC_MDSTR_AUTHORITY, grpc_slice_ref_internal(GRPC_MDVALUE(md))))); - GRPC_MDELEM_UNREF(md); + GRPC_MDELEM_UNREF(exec_ctx, md); } if (b->idx.named.authority == nullptr) { @@ -259,18 +263,21 @@ static grpc_error* server_filter_incoming_metadata(grpc_call_element* elem, return error; } -static void hs_on_recv(void* user_data, grpc_error* err) { +static void hs_on_recv(grpc_exec_ctx* exec_ctx, void* user_data, + grpc_error* err) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; if (err == GRPC_ERROR_NONE) { - err = server_filter_incoming_metadata(elem, calld->recv_initial_metadata); + err = server_filter_incoming_metadata(exec_ctx, elem, + calld->recv_initial_metadata); } else { GRPC_ERROR_REF(err); } - GRPC_CLOSURE_RUN(calld->on_done_recv, err); + GRPC_CLOSURE_RUN(exec_ctx, calld->on_done_recv, err); } -static void hs_on_complete(void* user_data, grpc_error* err) { +static void hs_on_complete(grpc_exec_ctx* exec_ctx, void* user_data, + grpc_error* err) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; /* Call recv_message_ready if we got the payload via the path field */ @@ -280,16 +287,17 @@ static void hs_on_complete(void* user_data, grpc_error* err) { : (grpc_byte_stream*)&calld->read_stream; // Re-enter call combiner for recv_message_ready, since the surface // code will release the call combiner for each callback it receives. - GRPC_CALL_COMBINER_START(calld->call_combiner, calld->recv_message_ready, - GRPC_ERROR_REF(err), + GRPC_CALL_COMBINER_START(exec_ctx, calld->call_combiner, + calld->recv_message_ready, GRPC_ERROR_REF(err), "resuming recv_message_ready from on_complete"); calld->recv_message_ready = nullptr; calld->payload_bin_delivered = true; } - GRPC_CLOSURE_RUN(calld->on_complete, GRPC_ERROR_REF(err)); + GRPC_CLOSURE_RUN(exec_ctx, calld->on_complete, GRPC_ERROR_REF(err)); } -static void hs_recv_message_ready(void* user_data, grpc_error* err) { +static void hs_recv_message_ready(grpc_exec_ctx* exec_ctx, void* user_data, + grpc_error* err) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; if (calld->seen_path_with_query) { @@ -297,14 +305,15 @@ static void hs_recv_message_ready(void* user_data, grpc_error* err) { // returned in hs_on_complete callback. // Note that we release the call combiner here, so that other // callbacks can run. - GRPC_CALL_COMBINER_STOP(calld->call_combiner, + GRPC_CALL_COMBINER_STOP(exec_ctx, calld->call_combiner, "pausing recv_message_ready until on_complete"); } else { - GRPC_CLOSURE_RUN(calld->recv_message_ready, GRPC_ERROR_REF(err)); + GRPC_CLOSURE_RUN(exec_ctx, calld->recv_message_ready, GRPC_ERROR_REF(err)); } } -static grpc_error* hs_mutate_op(grpc_call_element* elem, +static grpc_error* hs_mutate_op(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_transport_stream_op_batch* op) { /* grab pointers to our data from the call element */ call_data* calld = (call_data*)elem->call_data; @@ -312,19 +321,21 @@ static grpc_error* hs_mutate_op(grpc_call_element* elem, if (op->send_initial_metadata) { grpc_error* error = GRPC_ERROR_NONE; static const char* error_name = "Failed sending initial metadata"; - add_error(error_name, &error, - grpc_metadata_batch_add_head( - op->payload->send_initial_metadata.send_initial_metadata, - &calld->status, GRPC_MDELEM_STATUS_200)); - add_error(error_name, &error, - grpc_metadata_batch_add_tail( - op->payload->send_initial_metadata.send_initial_metadata, - &calld->content_type, - GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC)); add_error( error_name, &error, - server_filter_outgoing_metadata( - elem, op->payload->send_initial_metadata.send_initial_metadata)); + grpc_metadata_batch_add_head( + exec_ctx, op->payload->send_initial_metadata.send_initial_metadata, + &calld->status, GRPC_MDELEM_STATUS_200)); + add_error( + error_name, &error, + grpc_metadata_batch_add_tail( + exec_ctx, op->payload->send_initial_metadata.send_initial_metadata, + &calld->content_type, + GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC)); + add_error(error_name, &error, + server_filter_outgoing_metadata( + exec_ctx, elem, + op->payload->send_initial_metadata.send_initial_metadata)); if (error != GRPC_ERROR_NONE) return error; } @@ -356,7 +367,8 @@ static grpc_error* hs_mutate_op(grpc_call_element* elem, if (op->send_trailing_metadata) { grpc_error* error = server_filter_outgoing_metadata( - elem, op->payload->send_trailing_metadata.send_trailing_metadata); + exec_ctx, elem, + op->payload->send_trailing_metadata.send_trailing_metadata); if (error != GRPC_ERROR_NONE) return error; } @@ -364,21 +376,23 @@ static grpc_error* hs_mutate_op(grpc_call_element* elem, } static void hs_start_transport_stream_op_batch( - grpc_call_element* elem, grpc_transport_stream_op_batch* op) { + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_transport_stream_op_batch* op) { call_data* calld = (call_data*)elem->call_data; GPR_TIMER_BEGIN("hs_start_transport_stream_op_batch", 0); - grpc_error* error = hs_mutate_op(elem, op); + grpc_error* error = hs_mutate_op(exec_ctx, elem, op); if (error != GRPC_ERROR_NONE) { - grpc_transport_stream_op_batch_finish_with_failure(op, error, + grpc_transport_stream_op_batch_finish_with_failure(exec_ctx, op, error, calld->call_combiner); } else { - grpc_call_next_op(elem, op); + grpc_call_next_op(exec_ctx, elem, op); } GPR_TIMER_END("hs_start_transport_stream_op_batch", 0); } /* Constructor for call_data */ -static grpc_error* init_call_elem(grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { /* grab pointers to our data from the call element */ call_data* calld = (call_data*)elem->call_data; @@ -395,22 +409,24 @@ static grpc_error* init_call_elem(grpc_call_element* elem, } /* Destructor for call_data */ -static void destroy_call_elem(grpc_call_element* elem, +static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { call_data* calld = (call_data*)elem->call_data; - grpc_slice_buffer_destroy_internal(&calld->read_slice_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, &calld->read_slice_buffer); } /* Constructor for channel_data */ -static grpc_error* init_channel_elem(grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { GPR_ASSERT(!args->is_last); return GRPC_ERROR_NONE; } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) {} const grpc_channel_filter grpc_http_server_filter = { hs_start_transport_stream_op_batch, diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc index f50a928fcd9..762198f0347 100644 --- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc +++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc @@ -54,7 +54,8 @@ typedef struct channel_data { intptr_t id; /**< an id unique to the channel */ } channel_data; -static void on_initial_md_ready(void* user_data, grpc_error* err) { +static void on_initial_md_ready(grpc_exec_ctx* exec_ctx, void* user_data, + grpc_error* err) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; @@ -72,19 +73,20 @@ static void on_initial_md_ready(void* user_data, grpc_error* err) { GRPC_MDVALUE(calld->recv_initial_metadata->idx.named.lb_token->md)); calld->have_initial_md_string = true; grpc_metadata_batch_remove( - calld->recv_initial_metadata, + exec_ctx, calld->recv_initial_metadata, calld->recv_initial_metadata->idx.named.lb_token); } } else { GRPC_ERROR_REF(err); } calld->ops_recv_initial_metadata_ready->cb( - calld->ops_recv_initial_metadata_ready->cb_arg, err); + exec_ctx, calld->ops_recv_initial_metadata_ready->cb_arg, err); GRPC_ERROR_UNREF(err); } /* Constructor for call_data */ -static grpc_error* init_call_elem(grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; calld->id = (intptr_t)args->call_stack; @@ -106,7 +108,7 @@ static grpc_error* init_call_elem(grpc_call_element* elem, } /* Destructor for call_data */ -static void destroy_call_elem(grpc_call_element* elem, +static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { call_data* calld = (call_data*)elem->call_data; @@ -123,18 +125,19 @@ static void destroy_call_elem(grpc_call_element* elem, */ if (calld->have_initial_md_string) { - grpc_slice_unref_internal(calld->initial_md_string); + grpc_slice_unref_internal(exec_ctx, calld->initial_md_string); } if (calld->have_trailing_md_string) { - grpc_slice_unref_internal(calld->trailing_md_string); + grpc_slice_unref_internal(exec_ctx, calld->trailing_md_string); } if (calld->have_service_method) { - grpc_slice_unref_internal(calld->service_method); + grpc_slice_unref_internal(exec_ctx, calld->service_method); } } /* Constructor for channel_data */ -static grpc_error* init_channel_elem(grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { GPR_ASSERT(!args->is_last); @@ -155,7 +158,8 @@ static grpc_error* init_channel_elem(grpc_channel_element* elem, } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_channel_element* elem) { +static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) { /* TODO(dgq): do something with the data channel_data *chand = elem->channel_data; grpc_load_reporting_call_data lr_call_data = { @@ -169,7 +173,8 @@ static void destroy_channel_elem(grpc_channel_element* elem) { */ } -static grpc_filtered_mdelem lr_trailing_md_filter(void* user_data, +static grpc_filtered_mdelem lr_trailing_md_filter(grpc_exec_ctx* exec_ctx, + void* user_data, grpc_mdelem md) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; @@ -181,7 +186,8 @@ static grpc_filtered_mdelem lr_trailing_md_filter(void* user_data, } static void lr_start_transport_stream_op_batch( - grpc_call_element* elem, grpc_transport_stream_op_batch* op) { + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_transport_stream_op_batch* op) { GPR_TIMER_BEGIN("lr_start_transport_stream_op_batch", 0); call_data* calld = (call_data*)elem->call_data; @@ -197,11 +203,12 @@ static void lr_start_transport_stream_op_batch( GRPC_LOG_IF_ERROR( "grpc_metadata_batch_filter", grpc_metadata_batch_filter( + exec_ctx, op->payload->send_trailing_metadata.send_trailing_metadata, lr_trailing_md_filter, elem, "LR trailing metadata filtering error")); } - grpc_call_next_op(elem, op); + grpc_call_next_op(exec_ctx, elem, op); GPR_TIMER_END("lr_start_transport_stream_op_batch", 0); } diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc b/src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc index 9d1dfcbb4cd..accb7797dd5 100644 --- a/src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc +++ b/src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc @@ -38,7 +38,7 @@ static bool is_load_reporting_enabled(const grpc_channel_args* a) { } static bool maybe_add_server_load_reporting_filter( - grpc_channel_stack_builder* builder, void* arg) { + grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, void* arg) { const grpc_channel_args* args = grpc_channel_stack_builder_get_channel_arguments(builder); const grpc_channel_filter* filter = (const grpc_channel_filter*)arg; diff --git a/src/core/ext/filters/max_age/max_age_filter.cc b/src/core/ext/filters/max_age/max_age_filter.cc index 0499c6ecfc7..917fbd9198f 100644 --- a/src/core/ext/filters/max_age/max_age_filter.cc +++ b/src/core/ext/filters/max_age/max_age_filter.cc @@ -88,69 +88,73 @@ typedef struct channel_data { /* Increase the nubmer of active calls. Before the increasement, if there are no calls, the max_idle_timer should be cancelled. */ -static void increase_call_count(channel_data* chand) { +static void increase_call_count(grpc_exec_ctx* exec_ctx, channel_data* chand) { if (gpr_atm_full_fetch_add(&chand->call_count, 1) == 0) { - grpc_timer_cancel(&chand->max_idle_timer); + grpc_timer_cancel(exec_ctx, &chand->max_idle_timer); } } /* Decrease the nubmer of active calls. After the decrement, if there are no calls, the max_idle_timer should be started. */ -static void decrease_call_count(channel_data* chand) { +static void decrease_call_count(grpc_exec_ctx* exec_ctx, channel_data* chand) { if (gpr_atm_full_fetch_add(&chand->call_count, -1) == 1) { GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age max_idle_timer"); - grpc_timer_init( - &chand->max_idle_timer, - grpc_core::ExecCtx::Get()->Now() + chand->max_connection_idle, - &chand->close_max_idle_channel); + grpc_timer_init(exec_ctx, &chand->max_idle_timer, + grpc_exec_ctx_now(exec_ctx) + chand->max_connection_idle, + &chand->close_max_idle_channel); } } -static void start_max_idle_timer_after_init(void* arg, grpc_error* error) { +static void start_max_idle_timer_after_init(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { channel_data* chand = (channel_data*)arg; /* Decrease call_count. If there are no active calls at this time, max_idle_timer will start here. If the number of active calls is not 0, max_idle_timer will start after all the active calls end. */ - decrease_call_count(chand); - GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, + decrease_call_count(exec_ctx, chand); + GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->channel_stack, "max_age start_max_idle_timer_after_init"); } -static void start_max_age_timer_after_init(void* arg, grpc_error* error) { +static void start_max_age_timer_after_init(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { channel_data* chand = (channel_data*)arg; gpr_mu_lock(&chand->max_age_timer_mu); chand->max_age_timer_pending = true; GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age max_age_timer"); - grpc_timer_init(&chand->max_age_timer, - grpc_core::ExecCtx::Get()->Now() + chand->max_connection_age, + grpc_timer_init(exec_ctx, &chand->max_age_timer, + grpc_exec_ctx_now(exec_ctx) + chand->max_connection_age, &chand->close_max_age_channel); gpr_mu_unlock(&chand->max_age_timer_mu); grpc_transport_op* op = grpc_make_transport_op(nullptr); op->on_connectivity_state_change = &chand->channel_connectivity_changed; op->connectivity_state = &chand->connectivity_state; - grpc_channel_next_op(grpc_channel_stack_element(chand->channel_stack, 0), op); - GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, + grpc_channel_next_op(exec_ctx, + grpc_channel_stack_element(chand->channel_stack, 0), op); + GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->channel_stack, "max_age start_max_age_timer_after_init"); } -static void start_max_age_grace_timer_after_goaway_op(void* arg, +static void start_max_age_grace_timer_after_goaway_op(grpc_exec_ctx* exec_ctx, + void* arg, grpc_error* error) { channel_data* chand = (channel_data*)arg; gpr_mu_lock(&chand->max_age_timer_mu); chand->max_age_grace_timer_pending = true; GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age max_age_grace_timer"); grpc_timer_init( - &chand->max_age_grace_timer, + exec_ctx, &chand->max_age_grace_timer, chand->max_connection_age_grace == GRPC_MILLIS_INF_FUTURE ? GRPC_MILLIS_INF_FUTURE - : grpc_core::ExecCtx::Get()->Now() + chand->max_connection_age_grace, + : grpc_exec_ctx_now(exec_ctx) + chand->max_connection_age_grace, &chand->force_close_max_age_channel); gpr_mu_unlock(&chand->max_age_timer_mu); - GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, + GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->channel_stack, "max_age start_max_age_grace_timer_after_goaway_op"); } -static void close_max_idle_channel(void* arg, grpc_error* error) { +static void close_max_idle_channel(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { channel_data* chand = (channel_data*)arg; if (error == GRPC_ERROR_NONE) { /* Prevent the max idle timer from being set again */ @@ -161,14 +165,16 @@ static void close_max_idle_channel(void* arg, grpc_error* error) { GRPC_ERROR_INT_HTTP2_ERROR, GRPC_HTTP2_NO_ERROR); grpc_channel_element* elem = grpc_channel_stack_element(chand->channel_stack, 0); - elem->filter->start_transport_op(elem, op); + elem->filter->start_transport_op(exec_ctx, elem, op); } else if (error != GRPC_ERROR_CANCELLED) { GRPC_LOG_IF_ERROR("close_max_idle_channel", error); } - GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, "max_age max_idle_timer"); + GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->channel_stack, + "max_age max_idle_timer"); } -static void close_max_age_channel(void* arg, grpc_error* error) { +static void close_max_age_channel(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { channel_data* chand = (channel_data*)arg; gpr_mu_lock(&chand->max_age_timer_mu); chand->max_age_timer_pending = false; @@ -183,14 +189,16 @@ static void close_max_age_channel(void* arg, grpc_error* error) { GRPC_ERROR_INT_HTTP2_ERROR, GRPC_HTTP2_NO_ERROR); grpc_channel_element* elem = grpc_channel_stack_element(chand->channel_stack, 0); - elem->filter->start_transport_op(elem, op); + elem->filter->start_transport_op(exec_ctx, elem, op); } else if (error != GRPC_ERROR_CANCELLED) { GRPC_LOG_IF_ERROR("close_max_age_channel", error); } - GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, "max_age max_age_timer"); + GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->channel_stack, + "max_age max_age_timer"); } -static void force_close_max_age_channel(void* arg, grpc_error* error) { +static void force_close_max_age_channel(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { channel_data* chand = (channel_data*)arg; gpr_mu_lock(&chand->max_age_timer_mu); chand->max_age_grace_timer_pending = false; @@ -201,36 +209,38 @@ static void force_close_max_age_channel(void* arg, grpc_error* error) { GRPC_ERROR_CREATE_FROM_STATIC_STRING("Channel reaches max age"); grpc_channel_element* elem = grpc_channel_stack_element(chand->channel_stack, 0); - elem->filter->start_transport_op(elem, op); + elem->filter->start_transport_op(exec_ctx, elem, op); } else if (error != GRPC_ERROR_CANCELLED) { GRPC_LOG_IF_ERROR("force_close_max_age_channel", error); } - GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, "max_age max_age_grace_timer"); + GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->channel_stack, + "max_age max_age_grace_timer"); } -static void channel_connectivity_changed(void* arg, grpc_error* error) { +static void channel_connectivity_changed(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { channel_data* chand = (channel_data*)arg; if (chand->connectivity_state != GRPC_CHANNEL_SHUTDOWN) { grpc_transport_op* op = grpc_make_transport_op(nullptr); op->on_connectivity_state_change = &chand->channel_connectivity_changed; op->connectivity_state = &chand->connectivity_state; - grpc_channel_next_op(grpc_channel_stack_element(chand->channel_stack, 0), - op); + grpc_channel_next_op( + exec_ctx, grpc_channel_stack_element(chand->channel_stack, 0), op); } else { gpr_mu_lock(&chand->max_age_timer_mu); if (chand->max_age_timer_pending) { - grpc_timer_cancel(&chand->max_age_timer); + grpc_timer_cancel(exec_ctx, &chand->max_age_timer); chand->max_age_timer_pending = false; } if (chand->max_age_grace_timer_pending) { - grpc_timer_cancel(&chand->max_age_grace_timer); + grpc_timer_cancel(exec_ctx, &chand->max_age_grace_timer); chand->max_age_grace_timer_pending = false; } gpr_mu_unlock(&chand->max_age_timer_mu); /* If there are no active calls, this increasement will cancel max_idle_timer, and prevent max_idle_timer from being started in the future. */ - increase_call_count(chand); + increase_call_count(exec_ctx, chand); } } @@ -253,23 +263,25 @@ add_random_max_connection_age_jitter_and_convert_to_grpc_millis(int value) { } /* Constructor for call_data. */ -static grpc_error* init_call_elem(grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { channel_data* chand = (channel_data*)elem->channel_data; - increase_call_count(chand); + increase_call_count(exec_ctx, chand); return GRPC_ERROR_NONE; } /* Destructor for call_data. */ -static void destroy_call_elem(grpc_call_element* elem, +static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { channel_data* chand = (channel_data*)elem->channel_data; - decrease_call_count(chand); + decrease_call_count(exec_ctx, chand); } /* Constructor for channel_data. */ -static grpc_error* init_channel_elem(grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { channel_data* chand = (channel_data*)elem->channel_data; gpr_mu_init(&chand->max_age_timer_mu); @@ -339,7 +351,8 @@ static grpc_error* init_channel_elem(grpc_channel_element* elem, initialization is done. */ GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age start_max_age_timer_after_init"); - GRPC_CLOSURE_SCHED(&chand->start_max_age_timer_after_init, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &chand->start_max_age_timer_after_init, + GRPC_ERROR_NONE); } /* Initialize the number of calls as 1, so that the max_idle_timer will not @@ -348,14 +361,15 @@ static grpc_error* init_channel_elem(grpc_channel_element* elem, if (chand->max_connection_idle != GRPC_MILLIS_INF_FUTURE) { GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age start_max_idle_timer_after_init"); - GRPC_CLOSURE_SCHED(&chand->start_max_idle_timer_after_init, + GRPC_CLOSURE_SCHED(exec_ctx, &chand->start_max_idle_timer_after_init, GRPC_ERROR_NONE); } return GRPC_ERROR_NONE; } /* Destructor for channel_data. */ -static void destroy_channel_elem(grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) {} const grpc_channel_filter grpc_max_age_filter = { grpc_call_next_op, @@ -370,7 +384,8 @@ const grpc_channel_filter grpc_max_age_filter = { grpc_channel_next_get_info, "max_age"}; -static bool maybe_add_max_age_filter(grpc_channel_stack_builder* builder, +static bool maybe_add_max_age_filter(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, void* arg) { const grpc_channel_args* channel_args = grpc_channel_stack_builder_get_channel_arguments(builder); diff --git a/src/core/ext/filters/message_size/message_size_filter.cc b/src/core/ext/filters/message_size/message_size_filter.cc index f8487f9a9e9..3d2252af2e6 100644 --- a/src/core/ext/filters/message_size/message_size_filter.cc +++ b/src/core/ext/filters/message_size/message_size_filter.cc @@ -47,7 +47,8 @@ static void* refcounted_message_size_limits_ref(void* value) { return value; } -static void refcounted_message_size_limits_unref(void* value) { +static void refcounted_message_size_limits_unref(grpc_exec_ctx* exec_ctx, + void* value) { refcounted_message_size_limits* limits = (refcounted_message_size_limits*)value; if (gpr_unref(&limits->refs)) { @@ -107,7 +108,8 @@ typedef struct channel_data { // Callback invoked when we receive a message. Here we check the max // receive message size. -static void recv_message_ready(void* user_data, grpc_error* error) { +static void recv_message_ready(grpc_exec_ctx* exec_ctx, void* user_data, + grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; if (*calld->recv_message != nullptr && calld->limits.max_recv_size >= 0 && @@ -130,12 +132,13 @@ static void recv_message_ready(void* user_data, grpc_error* error) { GRPC_ERROR_REF(error); } // Invoke the next callback. - GRPC_CLOSURE_RUN(calld->next_recv_message_ready, error); + GRPC_CLOSURE_RUN(exec_ctx, calld->next_recv_message_ready, error); } // Start transport stream op. static void start_transport_stream_op_batch( - grpc_call_element* elem, grpc_transport_stream_op_batch* op) { + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_transport_stream_op_batch* op) { call_data* calld = (call_data*)elem->call_data; // Check max send message size. if (op->send_message && calld->limits.max_send_size >= 0 && @@ -146,7 +149,7 @@ static void start_transport_stream_op_batch( op->payload->send_message.send_message->length, calld->limits.max_send_size); grpc_transport_stream_op_batch_finish_with_failure( - op, + exec_ctx, op, grpc_error_set_int(GRPC_ERROR_CREATE_FROM_COPIED_STRING(message_string), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_RESOURCE_EXHAUSTED), @@ -162,11 +165,12 @@ static void start_transport_stream_op_batch( op->payload->recv_message.recv_message_ready = &calld->recv_message_ready; } // Chain to the next filter. - grpc_call_next_op(elem, op); + grpc_call_next_op(exec_ctx, elem, op); } // Constructor for call_data. -static grpc_error* init_call_elem(grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; @@ -182,7 +186,7 @@ static grpc_error* init_call_elem(grpc_call_element* elem, if (chand->method_limit_table != nullptr) { refcounted_message_size_limits* limits = (refcounted_message_size_limits*)grpc_method_config_table_get( - chand->method_limit_table, args->path); + exec_ctx, chand->method_limit_table, args->path); if (limits != nullptr) { if (limits->limits.max_send_size >= 0 && (limits->limits.max_send_size < calld->limits.max_send_size || @@ -200,7 +204,7 @@ static grpc_error* init_call_elem(grpc_call_element* elem, } // Destructor for call_data. -static void destroy_call_elem(grpc_call_element* elem, +static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) {} @@ -237,7 +241,8 @@ message_size_limits get_message_size_limits( } // Constructor for channel_data. -static grpc_error* init_channel_elem(grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { GPR_ASSERT(!args->is_last); channel_data* chand = (channel_data*)elem->channel_data; @@ -252,7 +257,8 @@ static grpc_error* init_channel_elem(grpc_channel_element* elem, if (service_config != nullptr) { chand->method_limit_table = grpc_service_config_create_method_config_table( - service_config, refcounted_message_size_limits_create_from_json, + exec_ctx, service_config, + refcounted_message_size_limits_create_from_json, refcounted_message_size_limits_ref, refcounted_message_size_limits_unref); grpc_service_config_destroy(service_config); @@ -262,9 +268,10 @@ static grpc_error* init_channel_elem(grpc_channel_element* elem, } // Destructor for channel_data. -static void destroy_channel_elem(grpc_channel_element* elem) { +static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) { channel_data* chand = (channel_data*)elem->channel_data; - grpc_slice_hash_table_unref(chand->method_limit_table); + grpc_slice_hash_table_unref(exec_ctx, chand->method_limit_table); } const grpc_channel_filter grpc_message_size_filter = { @@ -280,7 +287,8 @@ const grpc_channel_filter grpc_message_size_filter = { grpc_channel_next_get_info, "message_size"}; -static bool maybe_add_message_size_filter(grpc_channel_stack_builder* builder, +static bool maybe_add_message_size_filter(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, void* arg) { const grpc_channel_args* channel_args = grpc_channel_stack_builder_get_channel_arguments(builder); diff --git a/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc b/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc index 555a9134a21..4ab1ee4e79c 100644 --- a/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc +++ b/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc @@ -50,7 +50,8 @@ static bool get_user_agent_mdelem(const grpc_metadata_batch* batch, } // Callback invoked when we receive an initial metadata. -static void recv_initial_metadata_ready(void* user_data, grpc_error* error) { +static void recv_initial_metadata_ready(grpc_exec_ctx* exec_ctx, + void* user_data, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; @@ -66,13 +67,14 @@ static void recv_initial_metadata_ready(void* user_data, grpc_error* error) { } // Invoke the next callback. - GRPC_CLOSURE_RUN(calld->next_recv_initial_metadata_ready, + GRPC_CLOSURE_RUN(exec_ctx, calld->next_recv_initial_metadata_ready, GRPC_ERROR_REF(error)); } // Start transport stream op. static void start_transport_stream_op_batch( - grpc_call_element* elem, grpc_transport_stream_op_batch* op) { + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_transport_stream_op_batch* op) { call_data* calld = (call_data*)elem->call_data; // Inject callback for receiving initial metadata @@ -94,11 +96,12 @@ static void start_transport_stream_op_batch( } // Chain to the next filter. - grpc_call_next_op(elem, op); + grpc_call_next_op(exec_ctx, elem, op); } // Constructor for call_data. -static grpc_error* init_call_elem(grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; calld->next_recv_initial_metadata_ready = nullptr; @@ -110,18 +113,20 @@ static grpc_error* init_call_elem(grpc_call_element* elem, } // Destructor for call_data. -static void destroy_call_elem(grpc_call_element* elem, +static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) {} // Constructor for channel_data. -static grpc_error* init_channel_elem(grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } // Destructor for channel_data. -static void destroy_channel_elem(grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) {} // Parse the user agent static bool parse_user_agent(grpc_mdelem md) { @@ -176,7 +181,7 @@ const grpc_channel_filter grpc_workaround_cronet_compression_filter = { "workaround_cronet_compression"}; static bool register_workaround_cronet_compression( - grpc_channel_stack_builder* builder, void* arg) { + grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, void* arg) { const grpc_channel_args* channel_args = grpc_channel_stack_builder_get_channel_arguments(builder); const grpc_arg* a = grpc_channel_args_find( diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.cc b/src/core/ext/transport/chttp2/client/chttp2_connector.cc index db5962e7fd4..819f66aec34 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.cc +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.cc @@ -61,34 +61,38 @@ static void chttp2_connector_ref(grpc_connector* con) { gpr_ref(&c->refs); } -static void chttp2_connector_unref(grpc_connector* con) { +static void chttp2_connector_unref(grpc_exec_ctx* exec_ctx, + grpc_connector* con) { chttp2_connector* c = (chttp2_connector*)con; if (gpr_unref(&c->refs)) { gpr_mu_destroy(&c->mu); // If handshaking is not yet in progress, destroy the endpoint. // Otherwise, the handshaker will do this for us. - if (c->endpoint != nullptr) grpc_endpoint_destroy(c->endpoint); + if (c->endpoint != nullptr) grpc_endpoint_destroy(exec_ctx, c->endpoint); gpr_free(c); } } -static void chttp2_connector_shutdown(grpc_connector* con, grpc_error* why) { +static void chttp2_connector_shutdown(grpc_exec_ctx* exec_ctx, + grpc_connector* con, grpc_error* why) { chttp2_connector* c = (chttp2_connector*)con; gpr_mu_lock(&c->mu); c->shutdown = true; if (c->handshake_mgr != nullptr) { - grpc_handshake_manager_shutdown(c->handshake_mgr, GRPC_ERROR_REF(why)); + grpc_handshake_manager_shutdown(exec_ctx, c->handshake_mgr, + GRPC_ERROR_REF(why)); } // If handshaking is not yet in progress, shutdown the endpoint. // Otherwise, the handshaker will do this for us. if (!c->connecting && c->endpoint != nullptr) { - grpc_endpoint_shutdown(c->endpoint, GRPC_ERROR_REF(why)); + grpc_endpoint_shutdown(exec_ctx, c->endpoint, GRPC_ERROR_REF(why)); } gpr_mu_unlock(&c->mu); GRPC_ERROR_UNREF(why); } -static void on_handshake_done(void* arg, grpc_error* error) { +static void on_handshake_done(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_handshaker_args* args = (grpc_handshaker_args*)arg; chttp2_connector* c = (chttp2_connector*)args->user_data; gpr_mu_lock(&c->mu); @@ -101,20 +105,20 @@ static void on_handshake_done(void* arg, grpc_error* error) { // before destroying them, even if we know that there are no // pending read/write callbacks. This should be fixed, at which // point this can be removed. - grpc_endpoint_shutdown(args->endpoint, GRPC_ERROR_REF(error)); - grpc_endpoint_destroy(args->endpoint); - grpc_channel_args_destroy(args->args); - grpc_slice_buffer_destroy_internal(args->read_buffer); + grpc_endpoint_shutdown(exec_ctx, args->endpoint, GRPC_ERROR_REF(error)); + grpc_endpoint_destroy(exec_ctx, args->endpoint); + grpc_channel_args_destroy(exec_ctx, args->args); + grpc_slice_buffer_destroy_internal(exec_ctx, args->read_buffer); gpr_free(args->read_buffer); } else { error = GRPC_ERROR_REF(error); } memset(c->result, 0, sizeof(*c->result)); } else { - grpc_endpoint_delete_from_pollset_set(args->endpoint, + grpc_endpoint_delete_from_pollset_set(exec_ctx, args->endpoint, c->args.interested_parties); - c->result->transport = - grpc_create_chttp2_transport(args->args, args->endpoint, true); + c->result->transport = grpc_create_chttp2_transport(exec_ctx, args->args, + args->endpoint, true); GPR_ASSERT(c->result->transport); // TODO(roth): We ideally want to wait until we receive HTTP/2 // settings from the server before we consider the connection @@ -140,32 +144,34 @@ static void on_handshake_done(void* arg, grpc_error* error) { // so until after transparent retries is implemented. Otherwise, any // RPC that we attempt to send on the connection before the timeout // would fail instead of being retried on a subsequent attempt. - grpc_chttp2_transport_start_reading(c->result->transport, args->read_buffer, - nullptr); + grpc_chttp2_transport_start_reading(exec_ctx, c->result->transport, + args->read_buffer, nullptr); c->result->channel_args = args->args; } grpc_closure* notify = c->notify; c->notify = nullptr; - GRPC_CLOSURE_SCHED(notify, error); - grpc_handshake_manager_destroy(c->handshake_mgr); + GRPC_CLOSURE_SCHED(exec_ctx, notify, error); + grpc_handshake_manager_destroy(exec_ctx, c->handshake_mgr); c->handshake_mgr = nullptr; gpr_mu_unlock(&c->mu); - chttp2_connector_unref((grpc_connector*)c); + chttp2_connector_unref(exec_ctx, (grpc_connector*)c); } -static void start_handshake_locked(chttp2_connector* c) { +static void start_handshake_locked(grpc_exec_ctx* exec_ctx, + chttp2_connector* c) { c->handshake_mgr = grpc_handshake_manager_create(); - grpc_handshakers_add(HANDSHAKER_CLIENT, c->args.channel_args, + grpc_handshakers_add(exec_ctx, HANDSHAKER_CLIENT, c->args.channel_args, c->handshake_mgr); - grpc_endpoint_add_to_pollset_set(c->endpoint, c->args.interested_parties); + grpc_endpoint_add_to_pollset_set(exec_ctx, c->endpoint, + c->args.interested_parties); grpc_handshake_manager_do_handshake( - c->handshake_mgr, c->args.interested_parties, c->endpoint, + exec_ctx, c->handshake_mgr, c->args.interested_parties, c->endpoint, c->args.channel_args, c->args.deadline, nullptr /* acceptor */, on_handshake_done, c); c->endpoint = nullptr; // Endpoint handed off to handshake manager. } -static void connected(void* arg, grpc_error* error) { +static void connected(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { chttp2_connector* c = (chttp2_connector*)arg; gpr_mu_lock(&c->mu); GPR_ASSERT(c->connecting); @@ -179,26 +185,27 @@ static void connected(void* arg, grpc_error* error) { memset(c->result, 0, sizeof(*c->result)); grpc_closure* notify = c->notify; c->notify = nullptr; - GRPC_CLOSURE_SCHED(notify, error); + GRPC_CLOSURE_SCHED(exec_ctx, notify, error); if (c->endpoint != nullptr) { - grpc_endpoint_shutdown(c->endpoint, GRPC_ERROR_REF(error)); + grpc_endpoint_shutdown(exec_ctx, c->endpoint, GRPC_ERROR_REF(error)); } gpr_mu_unlock(&c->mu); - chttp2_connector_unref((grpc_connector*)arg); + chttp2_connector_unref(exec_ctx, (grpc_connector*)arg); } else { GPR_ASSERT(c->endpoint != nullptr); - start_handshake_locked(c); + start_handshake_locked(exec_ctx, c); gpr_mu_unlock(&c->mu); } } -static void chttp2_connector_connect(grpc_connector* con, +static void chttp2_connector_connect(grpc_exec_ctx* exec_ctx, + grpc_connector* con, const grpc_connect_in_args* args, grpc_connect_out_args* result, grpc_closure* notify) { chttp2_connector* c = (chttp2_connector*)con; grpc_resolved_address addr; - grpc_get_subchannel_address_arg(args->channel_args, &addr); + grpc_get_subchannel_address_arg(exec_ctx, args->channel_args, &addr); gpr_mu_lock(&c->mu); GPR_ASSERT(c->notify == nullptr); c->notify = notify; @@ -209,8 +216,9 @@ static void chttp2_connector_connect(grpc_connector* con, GRPC_CLOSURE_INIT(&c->connected, connected, c, grpc_schedule_on_exec_ctx); GPR_ASSERT(!c->connecting); c->connecting = true; - grpc_tcp_client_connect(&c->connected, &c->endpoint, args->interested_parties, - args->channel_args, &addr, args->deadline); + grpc_tcp_client_connect(exec_ctx, &c->connected, &c->endpoint, + args->interested_parties, args->channel_args, &addr, + args->deadline); gpr_mu_unlock(&c->mu); } diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc index 6a1b70964d7..028b69e5ff9 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc @@ -34,19 +34,21 @@ static void client_channel_factory_ref( grpc_client_channel_factory* cc_factory) {} static void client_channel_factory_unref( - grpc_client_channel_factory* cc_factory) {} + grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* cc_factory) {} static grpc_subchannel* client_channel_factory_create_subchannel( - grpc_client_channel_factory* cc_factory, const grpc_subchannel_args* args) { + grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* cc_factory, + const grpc_subchannel_args* args) { grpc_connector* connector = grpc_chttp2_connector_create(); - grpc_subchannel* s = grpc_subchannel_create(connector, args); - grpc_connector_unref(connector); + grpc_subchannel* s = grpc_subchannel_create(exec_ctx, connector, args); + grpc_connector_unref(exec_ctx, connector); return s; } static grpc_channel* client_channel_factory_create_channel( - grpc_client_channel_factory* cc_factory, const char* target, - grpc_client_channel_type type, const grpc_channel_args* args) { + grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* cc_factory, + const char* target, grpc_client_channel_type type, + const grpc_channel_args* args) { if (target == nullptr) { gpr_log(GPR_ERROR, "cannot create channel with NULL target name"); return nullptr; @@ -54,14 +56,14 @@ static grpc_channel* client_channel_factory_create_channel( // Add channel arg containing the server URI. grpc_arg arg = grpc_channel_arg_string_create( (char*)GRPC_ARG_SERVER_URI, - grpc_resolver_factory_add_default_prefix_if_needed(target)); + grpc_resolver_factory_add_default_prefix_if_needed(exec_ctx, target)); const char* to_remove[] = {GRPC_ARG_SERVER_URI}; grpc_channel_args* new_args = grpc_channel_args_copy_and_add_and_remove(args, to_remove, 1, &arg, 1); gpr_free(arg.value.string); - grpc_channel* channel = - grpc_channel_create(target, new_args, GRPC_CLIENT_CHANNEL, nullptr); - grpc_channel_args_destroy(new_args); + grpc_channel* channel = grpc_channel_create(exec_ctx, target, new_args, + GRPC_CLIENT_CHANNEL, nullptr); + grpc_channel_args_destroy(exec_ctx, new_args); return channel; } @@ -80,7 +82,7 @@ static grpc_client_channel_factory client_channel_factory = { grpc_channel* grpc_insecure_channel_create(const char* target, const grpc_channel_args* args, void* reserved) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GRPC_API_TRACE( "grpc_insecure_channel_create(target=%s, args=%p, reserved=%p)", 3, (target, args, reserved)); @@ -91,11 +93,11 @@ grpc_channel* grpc_insecure_channel_create(const char* target, grpc_channel_args* new_args = grpc_channel_args_copy_and_add(args, &arg, 1); // Create channel. grpc_channel* channel = client_channel_factory_create_channel( - &client_channel_factory, target, GRPC_CLIENT_CHANNEL_TYPE_REGULAR, - new_args); + &exec_ctx, &client_channel_factory, target, + GRPC_CLIENT_CHANNEL_TYPE_REGULAR, new_args); // Clean up. - grpc_channel_args_destroy(new_args); - + grpc_channel_args_destroy(&exec_ctx, new_args); + grpc_exec_ctx_finish(&exec_ctx); return channel != nullptr ? channel : grpc_lame_client_channel_create( target, GRPC_STATUS_INTERNAL, diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc b/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc index 0cdea5a94e8..c6b149d0b1d 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc @@ -37,7 +37,7 @@ grpc_channel* grpc_insecure_channel_create_from_fd( const char* target, int fd, const grpc_channel_args* args) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GRPC_API_TRACE("grpc_insecure_channel_create(target=%p, fd=%d, args=%p)", 3, (target, fd, args)); @@ -50,17 +50,17 @@ grpc_channel* grpc_insecure_channel_create_from_fd( GPR_ASSERT(fcntl(fd, F_SETFL, flags | O_NONBLOCK) == 0); grpc_endpoint* client = grpc_tcp_client_create_from_fd( - grpc_fd_create(fd, "client"), args, "fd-client"); + &exec_ctx, grpc_fd_create(fd, "client"), args, "fd-client"); grpc_transport* transport = - grpc_create_chttp2_transport(final_args, client, true); + grpc_create_chttp2_transport(&exec_ctx, final_args, client, true); GPR_ASSERT(transport); grpc_channel* channel = grpc_channel_create( - target, final_args, GRPC_CLIENT_DIRECT_CHANNEL, transport); - grpc_channel_args_destroy(final_args); - grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); + &exec_ctx, target, final_args, GRPC_CLIENT_DIRECT_CHANNEL, transport); + grpc_channel_args_destroy(&exec_ctx, final_args); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_finish(&exec_ctx); return channel != nullptr ? channel : grpc_lame_client_channel_create( @@ -73,7 +73,7 @@ grpc_channel* grpc_insecure_channel_create_from_fd( grpc_channel* grpc_insecure_channel_create_from_fd( const char* target, int fd, const grpc_channel_args* args) { GPR_ASSERT(0); - return nullptr; + return NULL; } #endif // GPR_SUPPORT_CHANNELS_FROM_FD diff --git a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc index 27c5b96a4ce..dd2bc427a7b 100644 --- a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc +++ b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc @@ -41,10 +41,10 @@ static void client_channel_factory_ref( grpc_client_channel_factory* cc_factory) {} static void client_channel_factory_unref( - grpc_client_channel_factory* cc_factory) {} + grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* cc_factory) {} static grpc_subchannel_args* get_secure_naming_subchannel_args( - const grpc_subchannel_args* args) { + grpc_exec_ctx* exec_ctx, const grpc_subchannel_args* args) { grpc_channel_credentials* channel_credentials = grpc_channel_credentials_find_in_args(args->args); if (channel_credentials == nullptr) { @@ -68,7 +68,7 @@ static grpc_subchannel_args* get_secure_naming_subchannel_args( const char* server_uri_str = server_uri_arg->value.string; GPR_ASSERT(server_uri_str != nullptr); grpc_uri* server_uri = - grpc_uri_parse(server_uri_str, true /* supress errors */); + grpc_uri_parse(exec_ctx, server_uri_str, true /* supress errors */); GPR_ASSERT(server_uri != nullptr); const char* server_uri_path; server_uri_path = @@ -81,7 +81,7 @@ static grpc_subchannel_args* get_secure_naming_subchannel_args( const char* target_uri_str = grpc_get_subchannel_address_uri_arg(args->args); grpc_uri* target_uri = - grpc_uri_parse(target_uri_str, false /* suppress errors */); + grpc_uri_parse(exec_ctx, target_uri_str, false /* suppress errors */); GPR_ASSERT(target_uri != nullptr); if (target_uri->path[0] != '\0') { // "path" may be empty const grpc_slice key = grpc_slice_from_static_string( @@ -89,7 +89,7 @@ static grpc_subchannel_args* get_secure_naming_subchannel_args( const char* value = (const char*)grpc_slice_hash_table_get(targets_info, key); if (value != nullptr) target_name_to_check = gpr_strdup(value); - grpc_slice_unref_internal(key); + grpc_slice_unref_internal(exec_ctx, key); } if (target_name_to_check == nullptr) { // If the target name to check hasn't already been set, fall back to using @@ -107,7 +107,7 @@ static grpc_subchannel_args* get_secure_naming_subchannel_args( grpc_channel_args* new_args_from_connector = nullptr; const grpc_security_status security_status = grpc_channel_credentials_create_security_connector( - channel_credentials, target_name_to_check, args->args, + exec_ctx, channel_credentials, target_name_to_check, args->args, &subchannel_security_connector, &new_args_from_connector); if (security_status != GRPC_SECURITY_OK) { gpr_log(GPR_ERROR, @@ -123,10 +123,10 @@ static grpc_subchannel_args* get_secure_naming_subchannel_args( grpc_channel_args* new_args = grpc_channel_args_copy_and_add( new_args_from_connector != nullptr ? new_args_from_connector : args->args, &new_security_connector_arg, 1); - GRPC_SECURITY_CONNECTOR_UNREF(&subchannel_security_connector->base, + GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, &subchannel_security_connector->base, "lb_channel_create"); if (new_args_from_connector != nullptr) { - grpc_channel_args_destroy(new_args_from_connector); + grpc_channel_args_destroy(exec_ctx, new_args_from_connector); } grpc_subchannel_args* final_sc_args = (grpc_subchannel_args*)gpr_malloc(sizeof(*final_sc_args)); @@ -136,9 +136,10 @@ static grpc_subchannel_args* get_secure_naming_subchannel_args( } static grpc_subchannel* client_channel_factory_create_subchannel( - grpc_client_channel_factory* cc_factory, const grpc_subchannel_args* args) { + grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* cc_factory, + const grpc_subchannel_args* args) { grpc_subchannel_args* subchannel_args = - get_secure_naming_subchannel_args(args); + get_secure_naming_subchannel_args(exec_ctx, args); if (subchannel_args == nullptr) { gpr_log( GPR_ERROR, @@ -146,16 +147,19 @@ static grpc_subchannel* client_channel_factory_create_subchannel( return nullptr; } grpc_connector* connector = grpc_chttp2_connector_create(); - grpc_subchannel* s = grpc_subchannel_create(connector, subchannel_args); - grpc_connector_unref(connector); - grpc_channel_args_destroy((grpc_channel_args*)subchannel_args->args); + grpc_subchannel* s = + grpc_subchannel_create(exec_ctx, connector, subchannel_args); + grpc_connector_unref(exec_ctx, connector); + grpc_channel_args_destroy(exec_ctx, + (grpc_channel_args*)subchannel_args->args); gpr_free(subchannel_args); return s; } static grpc_channel* client_channel_factory_create_channel( - grpc_client_channel_factory* cc_factory, const char* target, - grpc_client_channel_type type, const grpc_channel_args* args) { + grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* cc_factory, + const char* target, grpc_client_channel_type type, + const grpc_channel_args* args) { if (target == nullptr) { gpr_log(GPR_ERROR, "cannot create channel with NULL target name"); return nullptr; @@ -163,14 +167,14 @@ static grpc_channel* client_channel_factory_create_channel( // Add channel arg containing the server URI. grpc_arg arg = grpc_channel_arg_string_create( (char*)GRPC_ARG_SERVER_URI, - grpc_resolver_factory_add_default_prefix_if_needed(target)); + grpc_resolver_factory_add_default_prefix_if_needed(exec_ctx, target)); const char* to_remove[] = {GRPC_ARG_SERVER_URI}; grpc_channel_args* new_args = grpc_channel_args_copy_and_add_and_remove(args, to_remove, 1, &arg, 1); gpr_free(arg.value.string); - grpc_channel* channel = - grpc_channel_create(target, new_args, GRPC_CLIENT_CHANNEL, nullptr); - grpc_channel_args_destroy(new_args); + grpc_channel* channel = grpc_channel_create(exec_ctx, target, new_args, + GRPC_CLIENT_CHANNEL, nullptr); + grpc_channel_args_destroy(exec_ctx, new_args); return channel; } @@ -190,7 +194,7 @@ grpc_channel* grpc_secure_channel_create(grpc_channel_credentials* creds, const char* target, const grpc_channel_args* args, void* reserved) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GRPC_API_TRACE( "grpc_secure_channel_create(creds=%p, target=%s, args=%p, " "reserved=%p)", @@ -207,10 +211,11 @@ grpc_channel* grpc_secure_channel_create(grpc_channel_credentials* creds, args, args_to_add, GPR_ARRAY_SIZE(args_to_add)); // Create channel. channel = client_channel_factory_create_channel( - &client_channel_factory, target, GRPC_CLIENT_CHANNEL_TYPE_REGULAR, - new_args); + &exec_ctx, &client_channel_factory, target, + GRPC_CLIENT_CHANNEL_TYPE_REGULAR, new_args); // Clean up. - grpc_channel_args_destroy(new_args); + grpc_channel_args_destroy(&exec_ctx, new_args); + grpc_exec_ctx_finish(&exec_ctx); } return channel != nullptr ? channel : grpc_lame_client_channel_create( diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index 5669fa40901..49ee6774640 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -69,17 +69,17 @@ typedef struct { } server_connection_state; static void server_connection_state_unref( - server_connection_state* connection_state) { + grpc_exec_ctx* exec_ctx, server_connection_state* connection_state) { if (gpr_unref(&connection_state->refs)) { if (connection_state->transport != nullptr) { - GRPC_CHTTP2_UNREF_TRANSPORT(connection_state->transport, + GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, connection_state->transport, "receive settings timeout"); } gpr_free(connection_state); } } -static void on_timeout(void* arg, grpc_error* error) { +static void on_timeout(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { server_connection_state* connection_state = (server_connection_state*)arg; // Note that we may be called with GRPC_ERROR_NONE when the timer fires // or with an error indicating that the timer system is being shut down. @@ -87,20 +87,22 @@ static void on_timeout(void* arg, grpc_error* error) { grpc_transport_op* op = grpc_make_transport_op(nullptr); op->disconnect_with_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Did not receive HTTP/2 settings before handshake timeout"); - grpc_transport_perform_op(&connection_state->transport->base, op); + grpc_transport_perform_op(exec_ctx, &connection_state->transport->base, op); } - server_connection_state_unref(connection_state); + server_connection_state_unref(exec_ctx, connection_state); } -static void on_receive_settings(void* arg, grpc_error* error) { +static void on_receive_settings(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { server_connection_state* connection_state = (server_connection_state*)arg; if (error == GRPC_ERROR_NONE) { - grpc_timer_cancel(&connection_state->timer); + grpc_timer_cancel(exec_ctx, &connection_state->timer); } - server_connection_state_unref(connection_state); + server_connection_state_unref(exec_ctx, connection_state); } -static void on_handshake_done(void* arg, grpc_error* error) { +static void on_handshake_done(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_handshaker_args* args = (grpc_handshaker_args*)arg; server_connection_state* connection_state = (server_connection_state*)args->user_data; @@ -115,10 +117,10 @@ static void on_handshake_done(void* arg, grpc_error* error) { // before destroying them, even if we know that there are no // pending read/write callbacks. This should be fixed, at which // point this can be removed. - grpc_endpoint_shutdown(args->endpoint, GRPC_ERROR_NONE); - grpc_endpoint_destroy(args->endpoint); - grpc_channel_args_destroy(args->args); - grpc_slice_buffer_destroy_internal(args->read_buffer); + grpc_endpoint_shutdown(exec_ctx, args->endpoint, GRPC_ERROR_NONE); + grpc_endpoint_destroy(exec_ctx, args->endpoint); + grpc_channel_args_destroy(exec_ctx, args->args); + grpc_slice_buffer_destroy_internal(exec_ctx, args->read_buffer); gpr_free(args->read_buffer); } } else { @@ -126,10 +128,10 @@ static void on_handshake_done(void* arg, grpc_error* error) { // handshaker may have handed off the connection to some external // code, so we can just clean up here without creating a transport. if (args->endpoint != nullptr) { - grpc_transport* transport = - grpc_create_chttp2_transport(args->args, args->endpoint, false); + grpc_transport* transport = grpc_create_chttp2_transport( + exec_ctx, args->args, args->endpoint, false); grpc_server_setup_transport( - connection_state->svr_state->server, transport, + exec_ctx, connection_state->svr_state->server, transport, connection_state->accepting_pollset, args->args); // Use notify_on_receive_settings callback to enforce the // handshake deadline. @@ -139,14 +141,16 @@ static void on_handshake_done(void* arg, grpc_error* error) { on_receive_settings, connection_state, grpc_schedule_on_exec_ctx); grpc_chttp2_transport_start_reading( - transport, args->read_buffer, &connection_state->on_receive_settings); - grpc_channel_args_destroy(args->args); + exec_ctx, transport, args->read_buffer, + &connection_state->on_receive_settings); + grpc_channel_args_destroy(exec_ctx, args->args); gpr_ref(&connection_state->refs); GRPC_CHTTP2_REF_TRANSPORT((grpc_chttp2_transport*)transport, "receive settings timeout"); GRPC_CLOSURE_INIT(&connection_state->on_timeout, on_timeout, connection_state, grpc_schedule_on_exec_ctx); - grpc_timer_init(&connection_state->timer, connection_state->deadline, + grpc_timer_init(exec_ctx, &connection_state->timer, + connection_state->deadline, &connection_state->on_timeout); } } @@ -154,21 +158,21 @@ static void on_handshake_done(void* arg, grpc_error* error) { &connection_state->svr_state->pending_handshake_mgrs, connection_state->handshake_mgr); gpr_mu_unlock(&connection_state->svr_state->mu); - grpc_handshake_manager_destroy(connection_state->handshake_mgr); + grpc_handshake_manager_destroy(exec_ctx, connection_state->handshake_mgr); gpr_free(connection_state->acceptor); - grpc_tcp_server_unref(connection_state->svr_state->tcp_server); - server_connection_state_unref(connection_state); + grpc_tcp_server_unref(exec_ctx, connection_state->svr_state->tcp_server); + server_connection_state_unref(exec_ctx, connection_state); } -static void on_accept(void* arg, grpc_endpoint* tcp, +static void on_accept(grpc_exec_ctx* exec_ctx, void* arg, grpc_endpoint* tcp, grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor) { server_state* state = (server_state*)arg; gpr_mu_lock(&state->mu); if (state->shutdown) { gpr_mu_unlock(&state->mu); - grpc_endpoint_shutdown(tcp, GRPC_ERROR_NONE); - grpc_endpoint_destroy(tcp); + grpc_endpoint_shutdown(exec_ctx, tcp, GRPC_ERROR_NONE); + grpc_endpoint_destroy(exec_ctx, tcp); gpr_free(acceptor); return; } @@ -184,56 +188,59 @@ static void on_accept(void* arg, grpc_endpoint* tcp, connection_state->accepting_pollset = accepting_pollset; connection_state->acceptor = acceptor; connection_state->handshake_mgr = handshake_mgr; - grpc_handshakers_add(HANDSHAKER_SERVER, state->args, + grpc_handshakers_add(exec_ctx, HANDSHAKER_SERVER, state->args, connection_state->handshake_mgr); const grpc_arg* timeout_arg = grpc_channel_args_find(state->args, GRPC_ARG_SERVER_HANDSHAKE_TIMEOUT_MS); connection_state->deadline = - grpc_core::ExecCtx::Get()->Now() + + grpc_exec_ctx_now(exec_ctx) + grpc_channel_arg_get_integer(timeout_arg, {120 * GPR_MS_PER_SEC, 1, INT_MAX}); - grpc_handshake_manager_do_handshake( - connection_state->handshake_mgr, nullptr /* interested_parties */, tcp, - state->args, connection_state->deadline, acceptor, on_handshake_done, - connection_state); + grpc_handshake_manager_do_handshake(exec_ctx, connection_state->handshake_mgr, + nullptr /* interested_parties */, tcp, + state->args, connection_state->deadline, + acceptor, on_handshake_done, + connection_state); } /* Server callback: start listening on our ports */ -static void server_start_listener(grpc_server* server, void* arg, - grpc_pollset** pollsets, +static void server_start_listener(grpc_exec_ctx* exec_ctx, grpc_server* server, + void* arg, grpc_pollset** pollsets, size_t pollset_count) { server_state* state = (server_state*)arg; gpr_mu_lock(&state->mu); state->shutdown = false; gpr_mu_unlock(&state->mu); - grpc_tcp_server_start(state->tcp_server, pollsets, pollset_count, on_accept, - state); + grpc_tcp_server_start(exec_ctx, state->tcp_server, pollsets, pollset_count, + on_accept, state); } -static void tcp_server_shutdown_complete(void* arg, grpc_error* error) { +static void tcp_server_shutdown_complete(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { server_state* state = (server_state*)arg; /* ensure all threads have unlocked */ gpr_mu_lock(&state->mu); grpc_closure* destroy_done = state->server_destroy_listener_done; GPR_ASSERT(state->shutdown); grpc_handshake_manager_pending_list_shutdown_all( - state->pending_handshake_mgrs, GRPC_ERROR_REF(error)); + exec_ctx, state->pending_handshake_mgrs, GRPC_ERROR_REF(error)); gpr_mu_unlock(&state->mu); // Flush queued work before destroying handshaker factory, since that // may do a synchronous unref. - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(exec_ctx); if (destroy_done != nullptr) { - destroy_done->cb(destroy_done->cb_arg, GRPC_ERROR_REF(error)); - grpc_core::ExecCtx::Get()->Flush(); + destroy_done->cb(exec_ctx, destroy_done->cb_arg, GRPC_ERROR_REF(error)); + grpc_exec_ctx_flush(exec_ctx); } - grpc_channel_args_destroy(state->args); + grpc_channel_args_destroy(exec_ctx, state->args); gpr_mu_destroy(&state->mu); gpr_free(state); } /* Server callback: destroy the tcp listener (so we don't generate further callbacks) */ -static void server_destroy_listener(grpc_server* server, void* arg, +static void server_destroy_listener(grpc_exec_ctx* exec_ctx, + grpc_server* server, void* arg, grpc_closure* destroy_done) { server_state* state = (server_state*)arg; gpr_mu_lock(&state->mu); @@ -241,11 +248,12 @@ static void server_destroy_listener(grpc_server* server, void* arg, state->server_destroy_listener_done = destroy_done; grpc_tcp_server* tcp_server = state->tcp_server; gpr_mu_unlock(&state->mu); - grpc_tcp_server_shutdown_listeners(tcp_server); - grpc_tcp_server_unref(tcp_server); + grpc_tcp_server_shutdown_listeners(exec_ctx, tcp_server); + grpc_tcp_server_unref(exec_ctx, tcp_server); } -grpc_error* grpc_chttp2_server_add_port(grpc_server* server, const char* addr, +grpc_error* grpc_chttp2_server_add_port(grpc_exec_ctx* exec_ctx, + grpc_server* server, const char* addr, grpc_channel_args* args, int* port_num) { grpc_resolved_addresses* resolved = nullptr; @@ -269,8 +277,8 @@ grpc_error* grpc_chttp2_server_add_port(grpc_server* server, const char* addr, GRPC_CLOSURE_INIT(&state->tcp_server_shutdown_complete, tcp_server_shutdown_complete, state, grpc_schedule_on_exec_ctx); - err = grpc_tcp_server_create(&state->tcp_server_shutdown_complete, args, - &tcp_server); + err = grpc_tcp_server_create(exec_ctx, &state->tcp_server_shutdown_complete, + args, &tcp_server); if (err != GRPC_ERROR_NONE) { goto error; } @@ -319,7 +327,7 @@ grpc_error* grpc_chttp2_server_add_port(grpc_server* server, const char* addr, grpc_resolved_addresses_destroy(resolved); /* Register with the server only upon success */ - grpc_server_add_listener(server, state, server_start_listener, + grpc_server_add_listener(exec_ctx, server, state, server_start_listener, server_destroy_listener); goto done; @@ -330,9 +338,9 @@ error: grpc_resolved_addresses_destroy(resolved); } if (tcp_server) { - grpc_tcp_server_unref(tcp_server); + grpc_tcp_server_unref(exec_ctx, tcp_server); } else { - grpc_channel_args_destroy(args); + grpc_channel_args_destroy(exec_ctx, args); gpr_free(state); } *port_num = 0; diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.h b/src/core/ext/transport/chttp2/server/chttp2_server.h index 7de859da420..68304fd4f7e 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.h +++ b/src/core/ext/transport/chttp2/server/chttp2_server.h @@ -25,7 +25,8 @@ /// Adds a port to \a server. Sets \a port_num to the port number. /// Takes ownership of \a args. -grpc_error* grpc_chttp2_server_add_port(grpc_server* server, const char* addr, +grpc_error* grpc_chttp2_server_add_port(grpc_exec_ctx* exec_ctx, + grpc_server* server, const char* addr, grpc_channel_args* args, int* port_num); #endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_SERVER_CHTTP2_SERVER_H */ diff --git a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc index 52c42d056c6..89848965384 100644 --- a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc +++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc @@ -26,12 +26,12 @@ #include "src/core/lib/surface/server.h" int grpc_server_add_insecure_http2_port(grpc_server* server, const char* addr) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; int port_num = 0; GRPC_API_TRACE("grpc_server_add_insecure_http2_port(server=%p, addr=%s)", 2, (server, addr)); grpc_error* err = grpc_chttp2_server_add_port( - server, addr, + &exec_ctx, server, addr, grpc_channel_args_copy(grpc_server_get_channel_args(server)), &port_num); if (err != GRPC_ERROR_NONE) { const char* msg = grpc_error_string(err); @@ -39,6 +39,6 @@ int grpc_server_add_insecure_http2_port(grpc_server* server, const char* addr) { GRPC_ERROR_UNREF(err); } - + grpc_exec_ctx_finish(&exec_ctx); return port_num; } diff --git a/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc b/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc index dafd4af6cef..3fe05ce4ef9 100644 --- a/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc +++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc @@ -38,29 +38,32 @@ void grpc_server_add_insecure_channel_from_fd(grpc_server* server, void* reserved, int fd) { GPR_ASSERT(reserved == nullptr); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; char* name; gpr_asprintf(&name, "fd:%d", fd); - grpc_endpoint* server_endpoint = grpc_tcp_create( - grpc_fd_create(fd, name), grpc_server_get_channel_args(server), name); + grpc_endpoint* server_endpoint = + grpc_tcp_create(&exec_ctx, grpc_fd_create(fd, name), + grpc_server_get_channel_args(server), name); gpr_free(name); const grpc_channel_args* server_args = grpc_server_get_channel_args(server); grpc_transport* transport = grpc_create_chttp2_transport( - server_args, server_endpoint, false /* is_client */); + &exec_ctx, server_args, server_endpoint, false /* is_client */); grpc_pollset** pollsets; size_t num_pollsets = 0; grpc_server_get_pollsets(server, &pollsets, &num_pollsets); for (size_t i = 0; i < num_pollsets; i++) { - grpc_endpoint_add_to_pollset(server_endpoint, pollsets[i]); + grpc_endpoint_add_to_pollset(&exec_ctx, server_endpoint, pollsets[i]); } - grpc_server_setup_transport(server, transport, nullptr, server_args); - grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); + grpc_server_setup_transport(&exec_ctx, server, transport, nullptr, + server_args); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); + grpc_exec_ctx_finish(&exec_ctx); } #else // !GPR_SUPPORT_CHANNELS_FROM_FD diff --git a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc index 723af97ff08..ac3ea40f478 100644 --- a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc +++ b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc @@ -36,7 +36,7 @@ int grpc_server_add_secure_http2_port(grpc_server* server, const char* addr, grpc_server_credentials* creds) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_error* err = GRPC_ERROR_NONE; grpc_server_security_connector* sc = nullptr; int port_num = 0; @@ -52,7 +52,8 @@ int grpc_server_add_secure_http2_port(grpc_server* server, const char* addr, "No credentials specified for secure server port (creds==NULL)"); goto done; } - status = grpc_server_credentials_create_security_connector(creds, &sc); + status = + grpc_server_credentials_create_security_connector(&exec_ctx, creds, &sc); if (status != GRPC_SECURITY_OK) { char* msg; gpr_asprintf(&msg, @@ -71,12 +72,12 @@ int grpc_server_add_secure_http2_port(grpc_server* server, const char* addr, grpc_channel_args_copy_and_add(grpc_server_get_channel_args(server), args_to_add, GPR_ARRAY_SIZE(args_to_add)); // Add server port. - err = grpc_chttp2_server_add_port(server, addr, args, &port_num); + err = grpc_chttp2_server_add_port(&exec_ctx, server, addr, args, &port_num); done: if (sc != nullptr) { - GRPC_SECURITY_CONNECTOR_UNREF(&sc->base, "server"); + GRPC_SECURITY_CONNECTOR_UNREF(&exec_ctx, &sc->base, "server"); } - + grpc_exec_ctx_finish(&exec_ctx); if (err != GRPC_ERROR_NONE) { const char* msg = grpc_error_string(err); gpr_log(GPR_ERROR, "%s", msg); diff --git a/src/core/ext/transport/chttp2/transport/bin_decoder.cc b/src/core/ext/transport/chttp2/transport/bin_decoder.cc index 984cd4ca78c..3ccae7afc35 100644 --- a/src/core/ext/transport/chttp2/transport/bin_decoder.cc +++ b/src/core/ext/transport/chttp2/transport/bin_decoder.cc @@ -130,7 +130,8 @@ bool grpc_base64_decode_partial(struct grpc_base64_decode_context* ctx) { return true; } -grpc_slice grpc_chttp2_base64_decode(grpc_slice input) { +grpc_slice grpc_chttp2_base64_decode(grpc_exec_ctx* exec_ctx, + grpc_slice input) { size_t input_length = GRPC_SLICE_LENGTH(input); size_t output_length = input_length / 4 * 3; struct grpc_base64_decode_context ctx; @@ -166,7 +167,7 @@ grpc_slice grpc_chttp2_base64_decode(grpc_slice input) { char* s = grpc_slice_to_c_string(input); gpr_log(GPR_ERROR, "Base64 decoding failed, input string:\n%s\n", s); gpr_free(s); - grpc_slice_unref_internal(output); + grpc_slice_unref_internal(exec_ctx, output); return grpc_empty_slice(); } GPR_ASSERT(ctx.output_cur == GRPC_SLICE_END_PTR(output)); @@ -174,7 +175,8 @@ grpc_slice grpc_chttp2_base64_decode(grpc_slice input) { return output; } -grpc_slice grpc_chttp2_base64_decode_with_length(grpc_slice input, +grpc_slice grpc_chttp2_base64_decode_with_length(grpc_exec_ctx* exec_ctx, + grpc_slice input, size_t output_length) { size_t input_length = GRPC_SLICE_LENGTH(input); grpc_slice output = GRPC_SLICE_MALLOC(output_length); @@ -187,7 +189,7 @@ grpc_slice grpc_chttp2_base64_decode_with_length(grpc_slice input, "grpc_chttp2_base64_decode_with_length has a length of %d, which " "has a tail of 1 byte.\n", (int)input_length); - grpc_slice_unref_internal(output); + grpc_slice_unref_internal(exec_ctx, output); return grpc_empty_slice(); } @@ -197,7 +199,7 @@ grpc_slice grpc_chttp2_base64_decode_with_length(grpc_slice input, "than the max possible output length %d.\n", (int)output_length, (int)(input_length / 4 * 3 + tail_xtra[input_length % 4])); - grpc_slice_unref_internal(output); + grpc_slice_unref_internal(exec_ctx, output); return grpc_empty_slice(); } @@ -211,7 +213,7 @@ grpc_slice grpc_chttp2_base64_decode_with_length(grpc_slice input, char* s = grpc_slice_to_c_string(input); gpr_log(GPR_ERROR, "Base64 decoding failed, input string:\n%s\n", s); gpr_free(s); - grpc_slice_unref_internal(output); + grpc_slice_unref_internal(exec_ctx, output); return grpc_empty_slice(); } GPR_ASSERT(ctx.output_cur == GRPC_SLICE_END_PTR(output)); diff --git a/src/core/ext/transport/chttp2/transport/bin_decoder.h b/src/core/ext/transport/chttp2/transport/bin_decoder.h index 9cb75ccd816..a78c305766e 100644 --- a/src/core/ext/transport/chttp2/transport/bin_decoder.h +++ b/src/core/ext/transport/chttp2/transport/bin_decoder.h @@ -40,12 +40,13 @@ bool grpc_base64_decode_partial(struct grpc_base64_decode_context* ctx); /* base64 decode a slice with pad chars. Returns a new slice, does not take ownership of the input. Returns an empty slice if decoding is failed. */ -grpc_slice grpc_chttp2_base64_decode(grpc_slice input); +grpc_slice grpc_chttp2_base64_decode(grpc_exec_ctx* exec_ctx, grpc_slice input); /* base64 decode a slice without pad chars, data length is needed. Returns a new slice, does not take ownership of the input. Returns an empty slice if decoding is failed. */ -grpc_slice grpc_chttp2_base64_decode_with_length(grpc_slice input, +grpc_slice grpc_chttp2_base64_decode_with_length(grpc_exec_ctx* exec_ctx, + grpc_slice input, size_t output_length); #endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_DECODER_H */ diff --git a/src/core/ext/transport/chttp2/transport/bin_encoder.h b/src/core/ext/transport/chttp2/transport/bin_encoder.h index 93ad0dfdea2..a8f36a345ad 100644 --- a/src/core/ext/transport/chttp2/transport/bin_encoder.h +++ b/src/core/ext/transport/chttp2/transport/bin_encoder.h @@ -32,7 +32,7 @@ grpc_slice grpc_chttp2_huffman_compress(grpc_slice input); /* equivalent to: grpc_slice x = grpc_chttp2_base64_encode(input); grpc_slice y = grpc_chttp2_huffman_compress(x); - grpc_slice_unref_internal( x); + grpc_slice_unref_internal(exec_ctx, x); return y; */ grpc_slice grpc_chttp2_base64_encode_and_huffman_compress(grpc_slice input); diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index f537fb09c2d..63ac65ac788 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -95,77 +95,105 @@ grpc_core::DebugOnlyTraceFlag grpc_trace_chttp2_refcount(false, "chttp2_refcount"); /* forward declarations of various callbacks that we'll build closures around */ -static void write_action_begin_locked(void* t, grpc_error* error); -static void write_action(void* t, grpc_error* error); -static void write_action_end_locked(void* t, grpc_error* error); +static void write_action_begin_locked(grpc_exec_ctx* exec_ctx, void* t, + grpc_error* error); +static void write_action(grpc_exec_ctx* exec_ctx, void* t, grpc_error* error); +static void write_action_end_locked(grpc_exec_ctx* exec_ctx, void* t, + grpc_error* error); -static void read_action_locked(void* t, grpc_error* error); +static void read_action_locked(grpc_exec_ctx* exec_ctx, void* t, + grpc_error* error); -static void complete_fetch_locked(void* gs, grpc_error* error); +static void complete_fetch_locked(grpc_exec_ctx* exec_ctx, void* gs, + grpc_error* error); /** Set a transport level setting, and push it to our peer */ -static void queue_setting_update(grpc_chttp2_transport* t, +static void queue_setting_update(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_setting_id id, uint32_t value); -static void close_from_api(grpc_chttp2_transport* t, grpc_chttp2_stream* s, - grpc_error* error); +static void close_from_api(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, + grpc_chttp2_stream* s, grpc_error* error); /** Start new streams that have been created if we can */ -static void maybe_start_some_streams(grpc_chttp2_transport* t); +static void maybe_start_some_streams(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t); -static void connectivity_state_set(grpc_chttp2_transport* t, +static void connectivity_state_set(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_connectivity_state state, grpc_error* error, const char* reason); -static void incoming_byte_stream_destroy_locked(void* byte_stream, +static void incoming_byte_stream_destroy_locked(grpc_exec_ctx* exec_ctx, + void* byte_stream, grpc_error* error_ignored); static void incoming_byte_stream_publish_error( - grpc_chttp2_incoming_byte_stream* bs, grpc_error* error); -static void incoming_byte_stream_unref(grpc_chttp2_incoming_byte_stream* bs); - -static void benign_reclaimer_locked(void* t, grpc_error* error); -static void destructive_reclaimer_locked(void* t, grpc_error* error); - -static void post_benign_reclaimer(grpc_chttp2_transport* t); -static void post_destructive_reclaimer(grpc_chttp2_transport* t); - -static void close_transport_locked(grpc_chttp2_transport* t, grpc_error* error); -static void end_all_the_calls(grpc_chttp2_transport* t, grpc_error* error); - -static void schedule_bdp_ping_locked(grpc_chttp2_transport* t); -static void start_bdp_ping_locked(void* tp, grpc_error* error); -static void finish_bdp_ping_locked(void* tp, grpc_error* error); -static void next_bdp_ping_timer_expired_locked(void* tp, grpc_error* error); - -static void cancel_pings(grpc_chttp2_transport* t, grpc_error* error); -static void send_ping_locked(grpc_chttp2_transport* t, + grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_byte_stream* bs, + grpc_error* error); +static void incoming_byte_stream_unref(grpc_exec_ctx* exec_ctx, + grpc_chttp2_incoming_byte_stream* bs); + +static void benign_reclaimer_locked(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, + grpc_error* error); + +static void schedule_bdp_ping_locked(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t); +static void start_bdp_ping_locked(grpc_exec_ctx* exec_ctx, void* tp, + grpc_error* error); +static void finish_bdp_ping_locked(grpc_exec_ctx* exec_ctx, void* tp, + grpc_error* error); +static void next_bdp_ping_timer_expired_locked(grpc_exec_ctx* exec_ctx, + void* tp, grpc_error* error); + +static void cancel_pings(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, + grpc_error* error); +static void send_ping_locked(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, grpc_closure* on_initiate, grpc_closure* on_complete); -static void retry_initiate_ping_locked(void* tp, grpc_error* error); +static void retry_initiate_ping_locked(grpc_exec_ctx* exec_ctx, void* tp, + grpc_error* error); /** keepalive-relevant functions */ -static void init_keepalive_ping_locked(void* arg, grpc_error* error); -static void start_keepalive_ping_locked(void* arg, grpc_error* error); -static void finish_keepalive_ping_locked(void* arg, grpc_error* error); -static void keepalive_watchdog_fired_locked(void* arg, grpc_error* error); - -static void reset_byte_stream(void* arg, grpc_error* error); +static void init_keepalive_ping_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error); +static void start_keepalive_ping_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error); +static void finish_keepalive_ping_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error); +static void keepalive_watchdog_fired_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error); + +static void reset_byte_stream(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error); /******************************************************************************* * CONSTRUCTION/DESTRUCTION/REFCOUNTING */ -static void destruct_transport(grpc_chttp2_transport* t) { +static void destruct_transport(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t) { size_t i; - grpc_endpoint_destroy(t->ep); + grpc_endpoint_destroy(exec_ctx, t->ep); - grpc_slice_buffer_destroy_internal(&t->qbuf); + grpc_slice_buffer_destroy_internal(exec_ctx, &t->qbuf); - grpc_slice_buffer_destroy_internal(&t->outbuf); - grpc_chttp2_hpack_compressor_destroy(&t->hpack_compressor); + grpc_slice_buffer_destroy_internal(exec_ctx, &t->outbuf); + grpc_chttp2_hpack_compressor_destroy(exec_ctx, &t->hpack_compressor); - grpc_slice_buffer_destroy_internal(&t->read_buffer); - grpc_chttp2_hpack_parser_destroy(&t->hpack_parser); + grpc_slice_buffer_destroy_internal(exec_ctx, &t->read_buffer); + grpc_chttp2_hpack_parser_destroy(exec_ctx, &t->hpack_parser); grpc_chttp2_goaway_parser_destroy(&t->goaway_parser); for (i = 0; i < STREAM_LIST_COUNT; i++) { @@ -178,11 +206,12 @@ static void destruct_transport(grpc_chttp2_transport* t) { GPR_ASSERT(grpc_chttp2_stream_map_size(&t->stream_map) == 0); grpc_chttp2_stream_map_destroy(&t->stream_map); - grpc_connectivity_state_destroy(&t->channel_callback.state_tracker); + grpc_connectivity_state_destroy(exec_ctx, &t->channel_callback.state_tracker); - GRPC_COMBINER_UNREF(t->combiner, "chttp2_transport"); + GRPC_COMBINER_UNREF(exec_ctx, t->combiner, "chttp2_transport"); - cancel_pings(t, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Transport destroyed")); + cancel_pings(exec_ctx, t, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Transport destroyed")); while (t->write_cb_pool) { grpc_chttp2_write_cb* next = t->write_cb_pool->next; @@ -199,7 +228,8 @@ static void destruct_transport(grpc_chttp2_transport* t) { } #ifndef NDEBUG -void grpc_chttp2_unref_transport(grpc_chttp2_transport* t, const char* reason, +void grpc_chttp2_unref_transport(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, const char* reason, const char* file, int line) { if (grpc_trace_chttp2_refcount.enabled()) { gpr_atm val = gpr_atm_no_barrier_load(&t->refs.count); @@ -207,7 +237,7 @@ void grpc_chttp2_unref_transport(grpc_chttp2_transport* t, const char* reason, t, val, val - 1, reason, file, line); } if (!gpr_unref(&t->refs)) return; - destruct_transport(t); + destruct_transport(exec_ctx, t); } void grpc_chttp2_ref_transport(grpc_chttp2_transport* t, const char* reason, @@ -220,9 +250,10 @@ void grpc_chttp2_ref_transport(grpc_chttp2_transport* t, const char* reason, gpr_ref(&t->refs); } #else -void grpc_chttp2_unref_transport(grpc_chttp2_transport* t) { +void grpc_chttp2_unref_transport(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t) { if (!gpr_unref(&t->refs)) return; - destruct_transport(t); + destruct_transport(exec_ctx, t); } void grpc_chttp2_ref_transport(grpc_chttp2_transport* t) { gpr_ref(&t->refs); } @@ -230,7 +261,7 @@ void grpc_chttp2_ref_transport(grpc_chttp2_transport* t) { gpr_ref(&t->refs); } static const grpc_transport_vtable* get_vtable(void); -static void init_transport(grpc_chttp2_transport* t, +static void init_transport(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, const grpc_channel_args* channel_args, grpc_endpoint* ep, bool is_client) { size_t i; @@ -289,7 +320,7 @@ static void init_transport(grpc_chttp2_transport* t, t->goaway_error = GRPC_ERROR_NONE; grpc_chttp2_goaway_parser_init(&t->goaway_parser); - grpc_chttp2_hpack_parser_init(&t->hpack_parser); + grpc_chttp2_hpack_parser_init(exec_ctx, &t->hpack_parser); grpc_slice_buffer_init(&t->read_buffer); @@ -320,13 +351,14 @@ static void init_transport(grpc_chttp2_transport* t, /* configure http2 the way we like it */ if (is_client) { - queue_setting_update(t, GRPC_CHTTP2_SETTINGS_ENABLE_PUSH, 0); - queue_setting_update(t, GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 0); + queue_setting_update(exec_ctx, t, GRPC_CHTTP2_SETTINGS_ENABLE_PUSH, 0); + queue_setting_update(exec_ctx, t, + GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 0); } - queue_setting_update(t, GRPC_CHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE, + queue_setting_update(exec_ctx, t, GRPC_CHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE, DEFAULT_MAX_HEADER_LIST_SIZE); - queue_setting_update(t, GRPC_CHTTP2_SETTINGS_GRPC_ALLOW_TRUE_BINARY_METADATA, - 1); + queue_setting_update(exec_ctx, t, + GRPC_CHTTP2_SETTINGS_GRPC_ALLOW_TRUE_BINARY_METADATA, 1); t->ping_policy.max_pings_without_data = g_default_max_pings_without_data; t->ping_policy.min_sent_ping_interval_without_data = @@ -501,7 +533,7 @@ static void init_transport(grpc_chttp2_transport* t, int value = grpc_channel_arg_get_integer( &channel_args->args[i], settings_map[j].integer_options); if (value >= 0) { - queue_setting_update(t, settings_map[j].setting_id, + queue_setting_update(exec_ctx, t, settings_map[j].setting_id, (uint32_t)value); } } @@ -512,7 +544,7 @@ static void init_transport(grpc_chttp2_transport* t, } } - t->flow_control.Init(t, enable_bdp); + t->flow_control.Init(exec_ctx, t, enable_bdp); /* No pings allowed before receiving a header or data frame. */ t->ping_state.pings_before_data_required = 0; @@ -526,8 +558,8 @@ static void init_transport(grpc_chttp2_transport* t, if (t->keepalive_time != GRPC_MILLIS_INF_FUTURE) { t->keepalive_state = GRPC_CHTTP2_KEEPALIVE_STATE_WAITING; GRPC_CHTTP2_REF_TRANSPORT(t, "init keepalive ping"); - grpc_timer_init(&t->keepalive_ping_timer, - grpc_core::ExecCtx::Get()->Now() + t->keepalive_time, + grpc_timer_init(exec_ctx, &t->keepalive_ping_timer, + grpc_exec_ctx_now(exec_ctx) + t->keepalive_time, &t->init_keepalive_ping_locked); } else { /* Use GRPC_CHTTP2_KEEPALIVE_STATE_DISABLED to indicate there are no @@ -537,37 +569,42 @@ static void init_transport(grpc_chttp2_transport* t, if (enable_bdp) { GRPC_CHTTP2_REF_TRANSPORT(t, "bdp_ping"); - schedule_bdp_ping_locked(t); + schedule_bdp_ping_locked(exec_ctx, t); - grpc_chttp2_act_on_flowctl_action(t->flow_control->PeriodicUpdate(), t, - nullptr); + grpc_chttp2_act_on_flowctl_action( + exec_ctx, t->flow_control->PeriodicUpdate(exec_ctx), t, nullptr); } - grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_INITIAL_WRITE); - post_benign_reclaimer(t); + grpc_chttp2_initiate_write(exec_ctx, t, + GRPC_CHTTP2_INITIATE_WRITE_INITIAL_WRITE); + post_benign_reclaimer(exec_ctx, t); } -static void destroy_transport_locked(void* tp, grpc_error* error) { +static void destroy_transport_locked(grpc_exec_ctx* exec_ctx, void* tp, + grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)tp; t->destroying = 1; close_transport_locked( - t, grpc_error_set_int( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Transport destroyed"), - GRPC_ERROR_INT_OCCURRED_DURING_WRITE, t->write_state)); - GRPC_CHTTP2_UNREF_TRANSPORT(t, "destroy"); + exec_ctx, t, + grpc_error_set_int( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Transport destroyed"), + GRPC_ERROR_INT_OCCURRED_DURING_WRITE, t->write_state)); + GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "destroy"); } -static void destroy_transport(grpc_transport* gt) { +static void destroy_transport(grpc_exec_ctx* exec_ctx, grpc_transport* gt) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)gt; - GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(destroy_transport_locked, t, + GRPC_CLOSURE_SCHED(exec_ctx, + GRPC_CLOSURE_CREATE(destroy_transport_locked, t, grpc_combiner_scheduler(t->combiner)), GRPC_ERROR_NONE); } -static void close_transport_locked(grpc_chttp2_transport* t, +static void close_transport_locked(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_error* error) { - end_all_the_calls(t, GRPC_ERROR_REF(error)); - cancel_pings(t, GRPC_ERROR_REF(error)); + end_all_the_calls(exec_ctx, t, GRPC_ERROR_REF(error)); + cancel_pings(exec_ctx, t, GRPC_ERROR_REF(error)); if (t->closed_with_error == GRPC_ERROR_NONE) { if (!grpc_error_has_clear_grpc_status(error)) { error = grpc_error_set_int(error, GRPC_ERROR_INT_GRPC_STATUS, @@ -585,21 +622,21 @@ static void close_transport_locked(grpc_chttp2_transport* t, } GPR_ASSERT(error != GRPC_ERROR_NONE); t->closed_with_error = GRPC_ERROR_REF(error); - connectivity_state_set(t, GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_REF(error), - "close_transport"); + connectivity_state_set(exec_ctx, t, GRPC_CHANNEL_SHUTDOWN, + GRPC_ERROR_REF(error), "close_transport"); if (t->ping_state.is_delayed_ping_timer_set) { - grpc_timer_cancel(&t->ping_state.delayed_ping_timer); + grpc_timer_cancel(exec_ctx, &t->ping_state.delayed_ping_timer); } if (t->have_next_bdp_ping_timer) { - grpc_timer_cancel(&t->next_bdp_ping_timer); + grpc_timer_cancel(exec_ctx, &t->next_bdp_ping_timer); } switch (t->keepalive_state) { case GRPC_CHTTP2_KEEPALIVE_STATE_WAITING: - grpc_timer_cancel(&t->keepalive_ping_timer); + grpc_timer_cancel(exec_ctx, &t->keepalive_ping_timer); break; case GRPC_CHTTP2_KEEPALIVE_STATE_PINGING: - grpc_timer_cancel(&t->keepalive_ping_timer); - grpc_timer_cancel(&t->keepalive_watchdog_timer); + grpc_timer_cancel(exec_ctx, &t->keepalive_ping_timer); + grpc_timer_cancel(exec_ctx, &t->keepalive_watchdog_timer); break; case GRPC_CHTTP2_KEEPALIVE_STATE_DYING: case GRPC_CHTTP2_KEEPALIVE_STATE_DISABLED: @@ -610,13 +647,14 @@ static void close_transport_locked(grpc_chttp2_transport* t, /* flush writable stream list to avoid dangling references */ grpc_chttp2_stream* s; while (grpc_chttp2_list_pop_writable_stream(t, &s)) { - GRPC_CHTTP2_STREAM_UNREF(s, "chttp2_writing:close"); + GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "chttp2_writing:close"); } GPR_ASSERT(t->write_state == GRPC_CHTTP2_WRITE_STATE_IDLE); - grpc_endpoint_shutdown(t->ep, GRPC_ERROR_REF(error)); + grpc_endpoint_shutdown(exec_ctx, t->ep, GRPC_ERROR_REF(error)); } if (t->notify_on_receive_settings != nullptr) { - GRPC_CLOSURE_SCHED(t->notify_on_receive_settings, GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(exec_ctx, t->notify_on_receive_settings, + GRPC_ERROR_CANCELLED); t->notify_on_receive_settings = nullptr; } GRPC_ERROR_UNREF(error); @@ -626,21 +664,22 @@ static void close_transport_locked(grpc_chttp2_transport* t, void grpc_chttp2_stream_ref(grpc_chttp2_stream* s, const char* reason) { grpc_stream_ref(s->refcount, reason); } -void grpc_chttp2_stream_unref(grpc_chttp2_stream* s, const char* reason) { - grpc_stream_unref(s->refcount, reason); +void grpc_chttp2_stream_unref(grpc_exec_ctx* exec_ctx, grpc_chttp2_stream* s, + const char* reason) { + grpc_stream_unref(exec_ctx, s->refcount, reason); } #else void grpc_chttp2_stream_ref(grpc_chttp2_stream* s) { grpc_stream_ref(s->refcount); } -void grpc_chttp2_stream_unref(grpc_chttp2_stream* s) { - grpc_stream_unref(s->refcount); +void grpc_chttp2_stream_unref(grpc_exec_ctx* exec_ctx, grpc_chttp2_stream* s) { + grpc_stream_unref(exec_ctx, s->refcount); } #endif -static int init_stream(grpc_transport* gt, grpc_stream* gs, - grpc_stream_refcount* refcount, const void* server_data, - gpr_arena* arena) { +static int init_stream(grpc_exec_ctx* exec_ctx, grpc_transport* gt, + grpc_stream* gs, grpc_stream_refcount* refcount, + const void* server_data, gpr_arena* arena) { GPR_TIMER_BEGIN("init_stream", 0); grpc_chttp2_transport* t = (grpc_chttp2_transport*)gt; grpc_chttp2_stream* s = (grpc_chttp2_stream*)gs; @@ -674,7 +713,7 @@ static int init_stream(grpc_transport* gt, grpc_stream* gs, s->id = (uint32_t)(uintptr_t)server_data; *t->accepting_stream = s; grpc_chttp2_stream_map_add(&t->stream_map, s->id, s); - post_destructive_reclaimer(t); + post_destructive_reclaimer(exec_ctx, t); } s->flow_control.Init(t->flow_control.get(), s); @@ -683,7 +722,8 @@ static int init_stream(grpc_transport* gt, grpc_stream* gs, return 0; } -static void destroy_stream_locked(void* sp, grpc_error* error) { +static void destroy_stream_locked(grpc_exec_ctx* exec_ctx, void* sp, + grpc_error* error) { grpc_chttp2_stream* s = (grpc_chttp2_stream*)sp; grpc_chttp2_transport* t = s->t; @@ -694,10 +734,11 @@ static void destroy_stream_locked(void* sp, grpc_error* error) { GPR_ASSERT(grpc_chttp2_stream_map_find(&t->stream_map, s->id) == nullptr); } - grpc_slice_buffer_destroy_internal(&s->unprocessed_incoming_frames_buffer); - grpc_slice_buffer_destroy_internal(&s->frame_storage); - grpc_slice_buffer_destroy_internal(&s->compressed_data_buffer); - grpc_slice_buffer_destroy_internal(&s->decompressed_data_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, + &s->unprocessed_incoming_frames_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, &s->frame_storage); + grpc_slice_buffer_destroy_internal(exec_ctx, &s->compressed_data_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, &s->decompressed_data_buffer); grpc_chttp2_list_remove_stalled_by_transport(t, s); grpc_chttp2_list_remove_stalled_by_stream(t, s); @@ -716,24 +757,27 @@ static void destroy_stream_locked(void* sp, grpc_error* error) { GPR_ASSERT(s->recv_initial_metadata_ready == nullptr); GPR_ASSERT(s->recv_message_ready == nullptr); GPR_ASSERT(s->recv_trailing_metadata_finished == nullptr); - grpc_chttp2_data_parser_destroy(&s->data_parser); - grpc_chttp2_incoming_metadata_buffer_destroy(&s->metadata_buffer[0]); - grpc_chttp2_incoming_metadata_buffer_destroy(&s->metadata_buffer[1]); - grpc_slice_buffer_destroy_internal(&s->flow_controlled_buffer); + grpc_chttp2_data_parser_destroy(exec_ctx, &s->data_parser); + grpc_chttp2_incoming_metadata_buffer_destroy(exec_ctx, + &s->metadata_buffer[0]); + grpc_chttp2_incoming_metadata_buffer_destroy(exec_ctx, + &s->metadata_buffer[1]); + grpc_slice_buffer_destroy_internal(exec_ctx, &s->flow_controlled_buffer); GRPC_ERROR_UNREF(s->read_closed_error); GRPC_ERROR_UNREF(s->write_closed_error); GRPC_ERROR_UNREF(s->byte_stream_error); s->flow_control.Destroy(); - GRPC_CHTTP2_UNREF_TRANSPORT(t, "stream"); + GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "stream"); GPR_TIMER_END("destroy_stream", 0); - GRPC_CLOSURE_SCHED(s->destroy_stream_arg, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, s->destroy_stream_arg, GRPC_ERROR_NONE); } -static void destroy_stream(grpc_transport* gt, grpc_stream* gs, +static void destroy_stream(grpc_exec_ctx* exec_ctx, grpc_transport* gt, + grpc_stream* gs, grpc_closure* then_schedule_closure) { GPR_TIMER_BEGIN("destroy_stream", 0); grpc_chttp2_transport* t = (grpc_chttp2_transport*)gt; @@ -750,6 +794,7 @@ static void destroy_stream(grpc_transport* gt, grpc_stream* gs, s->destroy_stream_arg = then_schedule_closure; GRPC_CLOSURE_SCHED( + exec_ctx, GRPC_CLOSURE_INIT(&s->destroy_stream, destroy_stream_locked, s, grpc_combiner_scheduler(t->combiner)), GRPC_ERROR_NONE); @@ -761,7 +806,8 @@ grpc_chttp2_stream* grpc_chttp2_parsing_lookup_stream(grpc_chttp2_transport* t, return (grpc_chttp2_stream*)grpc_chttp2_stream_map_find(&t->stream_map, id); } -grpc_chttp2_stream* grpc_chttp2_parsing_accept_stream(grpc_chttp2_transport* t, +grpc_chttp2_stream* grpc_chttp2_parsing_accept_stream(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, uint32_t id) { if (t->channel_callback.accept_stream == nullptr) { return nullptr; @@ -769,7 +815,8 @@ grpc_chttp2_stream* grpc_chttp2_parsing_accept_stream(grpc_chttp2_transport* t, grpc_chttp2_stream* accepting; GPR_ASSERT(t->accepting_stream == nullptr); t->accepting_stream = &accepting; - t->channel_callback.accept_stream(t->channel_callback.accept_stream_user_data, + t->channel_callback.accept_stream(exec_ctx, + t->channel_callback.accept_stream_user_data, &t->base, (void*)(uintptr_t)id); t->accepting_stream = nullptr; return accepting; @@ -791,7 +838,7 @@ static const char* write_state_name(grpc_chttp2_write_state st) { GPR_UNREACHABLE_CODE(return "UNKNOWN"); } -static void set_write_state(grpc_chttp2_transport* t, +static void set_write_state(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, grpc_chttp2_write_state st, const char* reason) { GRPC_CHTTP2_IF_TRACING(gpr_log(GPR_DEBUG, "W:%p %s state %s -> %s [%s]", t, t->is_client ? "CLIENT" : "SERVER", @@ -799,100 +846,108 @@ static void set_write_state(grpc_chttp2_transport* t, write_state_name(st), reason)); t->write_state = st; if (st == GRPC_CHTTP2_WRITE_STATE_IDLE) { - GRPC_CLOSURE_LIST_SCHED(&t->run_after_write); + GRPC_CLOSURE_LIST_SCHED(exec_ctx, &t->run_after_write); if (t->close_transport_on_writes_finished != nullptr) { grpc_error* err = t->close_transport_on_writes_finished; t->close_transport_on_writes_finished = nullptr; - close_transport_locked(t, err); + close_transport_locked(exec_ctx, t, err); } } } static void inc_initiate_write_reason( - grpc_chttp2_initiate_write_reason reason) { + grpc_exec_ctx* exec_ctx, grpc_chttp2_initiate_write_reason reason) { switch (reason) { case GRPC_CHTTP2_INITIATE_WRITE_INITIAL_WRITE: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_INITIAL_WRITE(); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_INITIAL_WRITE(exec_ctx); break; case GRPC_CHTTP2_INITIATE_WRITE_START_NEW_STREAM: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_START_NEW_STREAM(); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_START_NEW_STREAM(exec_ctx); break; case GRPC_CHTTP2_INITIATE_WRITE_SEND_MESSAGE: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_MESSAGE(); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_MESSAGE(exec_ctx); break; case GRPC_CHTTP2_INITIATE_WRITE_SEND_INITIAL_METADATA: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_INITIAL_METADATA(); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_INITIAL_METADATA( + exec_ctx); break; case GRPC_CHTTP2_INITIATE_WRITE_SEND_TRAILING_METADATA: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_TRAILING_METADATA(); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_TRAILING_METADATA( + exec_ctx); break; case GRPC_CHTTP2_INITIATE_WRITE_RETRY_SEND_PING: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RETRY_SEND_PING(); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RETRY_SEND_PING(exec_ctx); break; case GRPC_CHTTP2_INITIATE_WRITE_CONTINUE_PINGS: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CONTINUE_PINGS(); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CONTINUE_PINGS(exec_ctx); break; case GRPC_CHTTP2_INITIATE_WRITE_GOAWAY_SENT: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_GOAWAY_SENT(); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_GOAWAY_SENT(exec_ctx); break; case GRPC_CHTTP2_INITIATE_WRITE_RST_STREAM: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RST_STREAM(); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RST_STREAM(exec_ctx); break; case GRPC_CHTTP2_INITIATE_WRITE_CLOSE_FROM_API: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CLOSE_FROM_API(); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CLOSE_FROM_API(exec_ctx); break; case GRPC_CHTTP2_INITIATE_WRITE_STREAM_FLOW_CONTROL: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_STREAM_FLOW_CONTROL(); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_STREAM_FLOW_CONTROL(exec_ctx); break; case GRPC_CHTTP2_INITIATE_WRITE_TRANSPORT_FLOW_CONTROL: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL(); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL( + exec_ctx); break; case GRPC_CHTTP2_INITIATE_WRITE_SEND_SETTINGS: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_SETTINGS(); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_SETTINGS(exec_ctx); break; case GRPC_CHTTP2_INITIATE_WRITE_FLOW_CONTROL_UNSTALLED_BY_SETTING: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_SETTING(); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_SETTING( + exec_ctx); break; case GRPC_CHTTP2_INITIATE_WRITE_FLOW_CONTROL_UNSTALLED_BY_UPDATE: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_UPDATE(); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_UPDATE( + exec_ctx); break; case GRPC_CHTTP2_INITIATE_WRITE_APPLICATION_PING: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_APPLICATION_PING(); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_APPLICATION_PING(exec_ctx); break; case GRPC_CHTTP2_INITIATE_WRITE_KEEPALIVE_PING: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_KEEPALIVE_PING(); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_KEEPALIVE_PING(exec_ctx); break; case GRPC_CHTTP2_INITIATE_WRITE_TRANSPORT_FLOW_CONTROL_UNSTALLED: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL_UNSTALLED(); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL_UNSTALLED( + exec_ctx); break; case GRPC_CHTTP2_INITIATE_WRITE_PING_RESPONSE: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_PING_RESPONSE(); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_PING_RESPONSE(exec_ctx); break; case GRPC_CHTTP2_INITIATE_WRITE_FORCE_RST_STREAM: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FORCE_RST_STREAM(); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FORCE_RST_STREAM(exec_ctx); break; } } -void grpc_chttp2_initiate_write(grpc_chttp2_transport* t, +void grpc_chttp2_initiate_write(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_initiate_write_reason reason) { GPR_TIMER_BEGIN("grpc_chttp2_initiate_write", 0); switch (t->write_state) { case GRPC_CHTTP2_WRITE_STATE_IDLE: - inc_initiate_write_reason(reason); - set_write_state(t, GRPC_CHTTP2_WRITE_STATE_WRITING, + inc_initiate_write_reason(exec_ctx, reason); + set_write_state(exec_ctx, t, GRPC_CHTTP2_WRITE_STATE_WRITING, grpc_chttp2_initiate_write_reason_string(reason)); t->is_first_write_in_batch = true; GRPC_CHTTP2_REF_TRANSPORT(t, "writing"); GRPC_CLOSURE_SCHED( + exec_ctx, GRPC_CLOSURE_INIT(&t->write_action_begin_locked, write_action_begin_locked, t, grpc_combiner_finally_scheduler(t->combiner)), GRPC_ERROR_NONE); break; case GRPC_CHTTP2_WRITE_STATE_WRITING: - set_write_state(t, GRPC_CHTTP2_WRITE_STATE_WRITING_WITH_MORE, + set_write_state(exec_ctx, t, GRPC_CHTTP2_WRITE_STATE_WRITING_WITH_MORE, grpc_chttp2_initiate_write_reason_string(reason)); break; case GRPC_CHTTP2_WRITE_STATE_WRITING_WITH_MORE: @@ -901,7 +956,8 @@ void grpc_chttp2_initiate_write(grpc_chttp2_transport* t, GPR_TIMER_END("grpc_chttp2_initiate_write", 0); } -void grpc_chttp2_mark_stream_writable(grpc_chttp2_transport* t, +void grpc_chttp2_mark_stream_writable(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s) { if (t->closed_with_error == GRPC_ERROR_NONE && grpc_chttp2_list_add_writable_stream(t, s)) { @@ -951,7 +1007,8 @@ static const char* begin_writing_desc(bool partial, bool inlined) { GPR_UNREACHABLE_CODE(return "bad state tuple"); } -static void write_action_begin_locked(void* gt, grpc_error* error_ignored) { +static void write_action_begin_locked(grpc_exec_ctx* exec_ctx, void* gt, + grpc_error* error_ignored) { GPR_TIMER_BEGIN("write_action_begin_locked", 0); grpc_chttp2_transport* t = (grpc_chttp2_transport*)gt; GPR_ASSERT(t->write_state != GRPC_CHTTP2_WRITE_STATE_IDLE); @@ -959,59 +1016,62 @@ static void write_action_begin_locked(void* gt, grpc_error* error_ignored) { if (t->closed_with_error != GRPC_ERROR_NONE) { r.writing = false; } else { - r = grpc_chttp2_begin_write(t); + r = grpc_chttp2_begin_write(exec_ctx, t); } if (r.writing) { if (r.partial) { - GRPC_STATS_INC_HTTP2_PARTIAL_WRITES(); + GRPC_STATS_INC_HTTP2_PARTIAL_WRITES(exec_ctx); } if (!t->is_first_write_in_batch) { - GRPC_STATS_INC_HTTP2_WRITES_CONTINUED(); + GRPC_STATS_INC_HTTP2_WRITES_CONTINUED(exec_ctx); } grpc_closure_scheduler* scheduler = write_scheduler(t, r.early_results_scheduled, r.partial); if (scheduler != grpc_schedule_on_exec_ctx) { - GRPC_STATS_INC_HTTP2_WRITES_OFFLOADED(); + GRPC_STATS_INC_HTTP2_WRITES_OFFLOADED(exec_ctx); } set_write_state( - t, + exec_ctx, t, r.partial ? GRPC_CHTTP2_WRITE_STATE_WRITING_WITH_MORE : GRPC_CHTTP2_WRITE_STATE_WRITING, begin_writing_desc(r.partial, scheduler == grpc_schedule_on_exec_ctx)); GRPC_CLOSURE_SCHED( + exec_ctx, GRPC_CLOSURE_INIT(&t->write_action, write_action, t, scheduler), GRPC_ERROR_NONE); } else { - GRPC_STATS_INC_HTTP2_SPURIOUS_WRITES_BEGUN(); - set_write_state(t, GRPC_CHTTP2_WRITE_STATE_IDLE, "begin writing nothing"); - GRPC_CHTTP2_UNREF_TRANSPORT(t, "writing"); + GRPC_STATS_INC_HTTP2_SPURIOUS_WRITES_BEGUN(exec_ctx); + set_write_state(exec_ctx, t, GRPC_CHTTP2_WRITE_STATE_IDLE, + "begin writing nothing"); + GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "writing"); } GPR_TIMER_END("write_action_begin_locked", 0); } -static void write_action(void* gt, grpc_error* error) { +static void write_action(grpc_exec_ctx* exec_ctx, void* gt, grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)gt; GPR_TIMER_BEGIN("write_action", 0); grpc_endpoint_write( - t->ep, &t->outbuf, + exec_ctx, t->ep, &t->outbuf, GRPC_CLOSURE_INIT(&t->write_action_end_locked, write_action_end_locked, t, grpc_combiner_scheduler(t->combiner))); GPR_TIMER_END("write_action", 0); } -static void write_action_end_locked(void* tp, grpc_error* error) { +static void write_action_end_locked(grpc_exec_ctx* exec_ctx, void* tp, + grpc_error* error) { GPR_TIMER_BEGIN("terminate_writing_with_lock", 0); grpc_chttp2_transport* t = (grpc_chttp2_transport*)tp; if (error != GRPC_ERROR_NONE) { - close_transport_locked(t, GRPC_ERROR_REF(error)); + 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( - t, GRPC_ERROR_CREATE_FROM_STATIC_STRING("goaway sent")); + exec_ctx, t, GRPC_ERROR_CREATE_FROM_STATIC_STRING("goaway sent")); } } @@ -1020,14 +1080,17 @@ static void write_action_end_locked(void* tp, grpc_error* error) { GPR_UNREACHABLE_CODE(break); case GRPC_CHTTP2_WRITE_STATE_WRITING: GPR_TIMER_MARK("state=writing", 0); - set_write_state(t, GRPC_CHTTP2_WRITE_STATE_IDLE, "finish writing"); + set_write_state(exec_ctx, t, GRPC_CHTTP2_WRITE_STATE_IDLE, + "finish writing"); break; case GRPC_CHTTP2_WRITE_STATE_WRITING_WITH_MORE: GPR_TIMER_MARK("state=writing_stale_no_poller", 0); - set_write_state(t, GRPC_CHTTP2_WRITE_STATE_WRITING, "continue writing"); + set_write_state(exec_ctx, t, GRPC_CHTTP2_WRITE_STATE_WRITING, + "continue writing"); t->is_first_write_in_batch = false; GRPC_CHTTP2_REF_TRANSPORT(t, "writing"); GRPC_CLOSURE_RUN( + exec_ctx, GRPC_CLOSURE_INIT(&t->write_action_begin_locked, write_action_begin_locked, t, grpc_combiner_finally_scheduler(t->combiner)), @@ -1035,15 +1098,16 @@ static void write_action_end_locked(void* tp, grpc_error* error) { break; } - grpc_chttp2_end_write(t, GRPC_ERROR_REF(error)); + grpc_chttp2_end_write(exec_ctx, t, GRPC_ERROR_REF(error)); - GRPC_CHTTP2_UNREF_TRANSPORT(t, "writing"); + GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "writing"); GPR_TIMER_END("terminate_writing_with_lock", 0); } // Dirties an HTTP2 setting to be sent out next time a writing path occurs. // If the change needs to occur immediately, manually initiate a write. -static void queue_setting_update(grpc_chttp2_transport* t, +static void queue_setting_update(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_setting_id id, uint32_t value) { const grpc_chttp2_setting_parameters* sp = &grpc_chttp2_settings_parameters[id]; @@ -1058,7 +1122,8 @@ static void queue_setting_update(grpc_chttp2_transport* t, } } -void grpc_chttp2_add_incoming_goaway(grpc_chttp2_transport* t, +void grpc_chttp2_add_incoming_goaway(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, uint32_t goaway_error, grpc_slice goaway_text) { // GRPC_CHTTP2_IF_TRACING( @@ -1093,11 +1158,12 @@ void grpc_chttp2_add_incoming_goaway(grpc_chttp2_transport* t, /* lie: use transient failure from the transport to indicate goaway has been * received */ - connectivity_state_set(t, GRPC_CHANNEL_TRANSIENT_FAILURE, + connectivity_state_set(exec_ctx, t, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_REF(t->goaway_error), "got_goaway"); } -static void maybe_start_some_streams(grpc_chttp2_transport* t) { +static void maybe_start_some_streams(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t) { grpc_chttp2_stream* s; /* start streams where we have free grpc_chttp2_stream ids and free * concurrency */ @@ -1117,21 +1183,22 @@ static void maybe_start_some_streams(grpc_chttp2_transport* t) { if (t->next_stream_id >= MAX_CLIENT_STREAM_ID) { connectivity_state_set( - t, GRPC_CHANNEL_TRANSIENT_FAILURE, + exec_ctx, t, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Stream IDs exhausted"), "no_more_stream_ids"); } grpc_chttp2_stream_map_add(&t->stream_map, s->id, s); - post_destructive_reclaimer(t); - grpc_chttp2_mark_stream_writable(t, s); - grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_START_NEW_STREAM); + post_destructive_reclaimer(exec_ctx, t); + grpc_chttp2_mark_stream_writable(exec_ctx, t, s); + grpc_chttp2_initiate_write(exec_ctx, t, + GRPC_CHTTP2_INITIATE_WRITE_START_NEW_STREAM); } /* cancel out streams that will never be started */ while (t->next_stream_id >= MAX_CLIENT_STREAM_ID && grpc_chttp2_list_pop_waiting_for_concurrency(t, &s)) { grpc_chttp2_cancel_stream( - t, s, + exec_ctx, t, s, grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Stream IDs exhausted"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE)); @@ -1153,13 +1220,15 @@ static grpc_closure* add_closure_barrier(grpc_closure* closure) { return closure; } -static void null_then_run_closure(grpc_closure** closure, grpc_error* error) { +static void null_then_run_closure(grpc_exec_ctx* exec_ctx, + grpc_closure** closure, grpc_error* error) { grpc_closure* c = *closure; *closure = nullptr; - GRPC_CLOSURE_RUN(c, error); + GRPC_CLOSURE_RUN(exec_ctx, c, error); } -void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t, +void grpc_chttp2_complete_closure_step(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_closure** pclosure, grpc_error* error, const char* desc) { @@ -1199,7 +1268,7 @@ void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t, } if ((t->write_state == GRPC_CHTTP2_WRITE_STATE_IDLE) || !(closure->next_data.scratch & CLOSURE_BARRIER_MAY_COVER_WRITE)) { - GRPC_CLOSURE_RUN(closure, closure->error_data.error); + GRPC_CLOSURE_RUN(exec_ctx, closure, closure->error_data.error); } else { grpc_closure_list_append(&t->run_after_write, closure, closure->error_data.error); @@ -1215,24 +1284,28 @@ static bool contains_non_ok_status(grpc_metadata_batch* batch) { return false; } -static void maybe_become_writable_due_to_send_msg(grpc_chttp2_transport* t, +static void maybe_become_writable_due_to_send_msg(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s) { if (s->id != 0 && (!s->write_buffering || s->flow_controlled_buffer.length > t->write_buffer_size)) { - grpc_chttp2_mark_stream_writable(t, s); - grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_SEND_MESSAGE); + grpc_chttp2_mark_stream_writable(exec_ctx, t, s); + grpc_chttp2_initiate_write(exec_ctx, t, + GRPC_CHTTP2_INITIATE_WRITE_SEND_MESSAGE); } } -static void add_fetched_slice_locked(grpc_chttp2_transport* t, +static void add_fetched_slice_locked(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s) { s->fetched_send_message_length += (uint32_t)GRPC_SLICE_LENGTH(s->fetching_slice); grpc_slice_buffer_add(&s->flow_controlled_buffer, s->fetching_slice); - maybe_become_writable_due_to_send_msg(t, s); + maybe_become_writable_due_to_send_msg(exec_ctx, t, s); } -static void continue_fetching_send_locked(grpc_chttp2_transport* t, +static void continue_fetching_send_locked(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s) { for (;;) { if (s->fetching_send_message == nullptr) { @@ -1241,11 +1314,11 @@ static void continue_fetching_send_locked(grpc_chttp2_transport* t, return; /* early out */ } if (s->fetched_send_message_length == s->fetching_send_message->length) { - grpc_byte_stream_destroy(s->fetching_send_message); + grpc_byte_stream_destroy(exec_ctx, s->fetching_send_message); int64_t notify_offset = s->next_message_end_offset; if (notify_offset <= s->flow_controlled_bytes_written) { grpc_chttp2_complete_closure_step( - t, s, &s->fetching_send_message_finished, GRPC_ERROR_NONE, + exec_ctx, t, s, &s->fetching_send_message_finished, GRPC_ERROR_NONE, "fetching_send_message_finished"); } else { grpc_chttp2_write_cb* cb = t->write_cb_pool; @@ -1266,37 +1339,39 @@ static void continue_fetching_send_locked(grpc_chttp2_transport* t, } s->fetching_send_message = nullptr; return; /* early out */ - } else if (grpc_byte_stream_next(s->fetching_send_message, UINT32_MAX, - &s->complete_fetch_locked)) { - grpc_error* error = - grpc_byte_stream_pull(s->fetching_send_message, &s->fetching_slice); + } else if (grpc_byte_stream_next(exec_ctx, s->fetching_send_message, + UINT32_MAX, &s->complete_fetch_locked)) { + grpc_error* error = grpc_byte_stream_pull( + exec_ctx, s->fetching_send_message, &s->fetching_slice); if (error != GRPC_ERROR_NONE) { - grpc_byte_stream_destroy(s->fetching_send_message); - grpc_chttp2_cancel_stream(t, s, error); + grpc_byte_stream_destroy(exec_ctx, s->fetching_send_message); + grpc_chttp2_cancel_stream(exec_ctx, t, s, error); } else { - add_fetched_slice_locked(t, s); + add_fetched_slice_locked(exec_ctx, t, s); } } } } -static void complete_fetch_locked(void* gs, grpc_error* error) { +static void complete_fetch_locked(grpc_exec_ctx* exec_ctx, void* gs, + grpc_error* error) { grpc_chttp2_stream* s = (grpc_chttp2_stream*)gs; grpc_chttp2_transport* t = s->t; if (error == GRPC_ERROR_NONE) { - error = grpc_byte_stream_pull(s->fetching_send_message, &s->fetching_slice); + error = grpc_byte_stream_pull(exec_ctx, s->fetching_send_message, + &s->fetching_slice); if (error == GRPC_ERROR_NONE) { - add_fetched_slice_locked(t, s); - continue_fetching_send_locked(t, s); + add_fetched_slice_locked(exec_ctx, t, s); + continue_fetching_send_locked(exec_ctx, t, s); } } if (error != GRPC_ERROR_NONE) { - grpc_byte_stream_destroy(s->fetching_send_message); - grpc_chttp2_cancel_stream(t, s, error); + grpc_byte_stream_destroy(exec_ctx, s->fetching_send_message); + grpc_chttp2_cancel_stream(exec_ctx, t, s, error); } } -static void do_nothing(void* arg, grpc_error* error) {} +static void do_nothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} static void log_metadata(const grpc_metadata_batch* md_batch, uint32_t id, bool is_client, bool is_initial) { @@ -1311,7 +1386,7 @@ static void log_metadata(const grpc_metadata_batch* md_batch, uint32_t id, } } -static void perform_stream_op_locked(void* stream_op, +static void perform_stream_op_locked(grpc_exec_ctx* exec_ctx, void* stream_op, grpc_error* error_ignored) { GPR_TIMER_BEGIN("perform_stream_op_locked", 0); @@ -1321,7 +1396,7 @@ static void perform_stream_op_locked(void* stream_op, grpc_transport_stream_op_batch_payload* op_payload = op->payload; grpc_chttp2_transport* t = s->t; - GRPC_STATS_INC_HTTP2_OP_BATCHES(); + GRPC_STATS_INC_HTTP2_OP_BATCHES(exec_ctx); if (grpc_http_trace.enabled()) { char* str = grpc_transport_stream_op_batch_string(op); @@ -1356,12 +1431,13 @@ static void perform_stream_op_locked(void* stream_op, } if (op->cancel_stream) { - GRPC_STATS_INC_HTTP2_OP_CANCEL(); - grpc_chttp2_cancel_stream(t, s, op_payload->cancel_stream.cancel_error); + GRPC_STATS_INC_HTTP2_OP_CANCEL(exec_ctx); + grpc_chttp2_cancel_stream(exec_ctx, t, s, + op_payload->cancel_stream.cancel_error); } if (op->send_initial_metadata) { - GRPC_STATS_INC_HTTP2_OP_SEND_INITIAL_METADATA(); + GRPC_STATS_INC_HTTP2_OP_SEND_INITIAL_METADATA(exec_ctx); GPR_ASSERT(s->send_initial_metadata_finished == nullptr); on_complete->next_data.scratch |= CLOSURE_BARRIER_MAY_COVER_WRITE; @@ -1389,7 +1465,7 @@ static void perform_stream_op_locked(void* stream_op, } if (metadata_size > metadata_peer_limit) { grpc_chttp2_cancel_stream( - t, s, + exec_ctx, t, s, grpc_error_set_int( grpc_error_set_int( grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING( @@ -1408,10 +1484,10 @@ static void perform_stream_op_locked(void* stream_op, if (t->closed_with_error == GRPC_ERROR_NONE) { GPR_ASSERT(s->id == 0); grpc_chttp2_list_add_waiting_for_concurrency(t, s); - maybe_start_some_streams(t); + maybe_start_some_streams(exec_ctx, t); } else { grpc_chttp2_cancel_stream( - t, s, + exec_ctx, t, s, grpc_error_set_int( GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Transport closed", &t->closed_with_error, 1), @@ -1419,18 +1495,18 @@ static void perform_stream_op_locked(void* stream_op, } } else { GPR_ASSERT(s->id != 0); - grpc_chttp2_mark_stream_writable(t, s); + grpc_chttp2_mark_stream_writable(exec_ctx, t, s); if (!(op->send_message && (op->payload->send_message.send_message->flags & GRPC_WRITE_BUFFER_HINT))) { grpc_chttp2_initiate_write( - t, GRPC_CHTTP2_INITIATE_WRITE_SEND_INITIAL_METADATA); + exec_ctx, t, GRPC_CHTTP2_INITIATE_WRITE_SEND_INITIAL_METADATA); } } } else { s->send_initial_metadata = nullptr; grpc_chttp2_complete_closure_step( - t, s, &s->send_initial_metadata_finished, + exec_ctx, t, s, &s->send_initial_metadata_finished, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Attempt to send initial metadata after stream was closed", &s->write_closed_error, 1), @@ -1444,9 +1520,9 @@ static void perform_stream_op_locked(void* stream_op, } if (op->send_message) { - GRPC_STATS_INC_HTTP2_OP_SEND_MESSAGE(); + GRPC_STATS_INC_HTTP2_OP_SEND_MESSAGE(exec_ctx); GRPC_STATS_INC_HTTP2_SEND_MESSAGE_SIZE( - op->payload->send_message.send_message->length); + exec_ctx, op->payload->send_message.send_message->length); on_complete->next_data.scratch |= CLOSURE_BARRIER_MAY_COVER_WRITE; s->fetching_send_message_finished = add_closure_barrier(op->on_complete); if (s->write_closed) { @@ -1456,7 +1532,7 @@ static void perform_stream_op_locked(void* stream_op, // recv_message failure, breaking out of its loop, and then // starting recv_trailing_metadata. grpc_chttp2_complete_closure_step( - t, s, &s->fetching_send_message_finished, + exec_ctx, t, s, &s->fetching_send_message_finished, t->is_client && s->received_trailing_metadata ? GRPC_ERROR_NONE : GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( @@ -1485,13 +1561,13 @@ static void perform_stream_op_locked(void* stream_op, } else { s->write_buffering = false; } - continue_fetching_send_locked(t, s); - maybe_become_writable_due_to_send_msg(t, s); + continue_fetching_send_locked(exec_ctx, t, s); + maybe_become_writable_due_to_send_msg(exec_ctx, t, s); } } if (op->send_trailing_metadata) { - GRPC_STATS_INC_HTTP2_OP_SEND_TRAILING_METADATA(); + GRPC_STATS_INC_HTTP2_OP_SEND_TRAILING_METADATA(exec_ctx); GPR_ASSERT(s->send_trailing_metadata_finished == nullptr); on_complete->next_data.scratch |= CLOSURE_BARRIER_MAY_COVER_WRITE; s->send_trailing_metadata_finished = add_closure_barrier(on_complete); @@ -1505,7 +1581,7 @@ static void perform_stream_op_locked(void* stream_op, [GRPC_CHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE]; if (metadata_size > metadata_peer_limit) { grpc_chttp2_cancel_stream( - t, s, + exec_ctx, t, s, grpc_error_set_int( grpc_error_set_int( grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING( @@ -1522,7 +1598,7 @@ static void perform_stream_op_locked(void* stream_op, if (s->write_closed) { s->send_trailing_metadata = nullptr; grpc_chttp2_complete_closure_step( - t, s, &s->send_trailing_metadata_finished, + exec_ctx, t, s, &s->send_trailing_metadata_finished, grpc_metadata_batch_is_empty( op->payload->send_trailing_metadata.send_trailing_metadata) ? GRPC_ERROR_NONE @@ -1533,15 +1609,15 @@ static void perform_stream_op_locked(void* stream_op, } else if (s->id != 0) { /* TODO(ctiller): check if there's flow control for any outstanding bytes before going writable */ - grpc_chttp2_mark_stream_writable(t, s); + grpc_chttp2_mark_stream_writable(exec_ctx, t, s); grpc_chttp2_initiate_write( - t, GRPC_CHTTP2_INITIATE_WRITE_SEND_TRAILING_METADATA); + exec_ctx, t, GRPC_CHTTP2_INITIATE_WRITE_SEND_TRAILING_METADATA); } } } if (op->recv_initial_metadata) { - GRPC_STATS_INC_HTTP2_OP_RECV_INITIAL_METADATA(); + GRPC_STATS_INC_HTTP2_OP_RECV_INITIAL_METADATA(exec_ctx); GPR_ASSERT(s->recv_initial_metadata_ready == nullptr); s->recv_initial_metadata_ready = op_payload->recv_initial_metadata.recv_initial_metadata_ready; @@ -1553,11 +1629,11 @@ static void perform_stream_op_locked(void* stream_op, gpr_atm_rel_store(op_payload->recv_initial_metadata.peer_string, (gpr_atm)gpr_strdup(t->peer_string)); } - grpc_chttp2_maybe_complete_recv_initial_metadata(t, s); + grpc_chttp2_maybe_complete_recv_initial_metadata(exec_ctx, t, s); } if (op->recv_message) { - GRPC_STATS_INC_HTTP2_OP_RECV_MESSAGE(); + GRPC_STATS_INC_HTTP2_OP_RECV_MESSAGE(exec_ctx); size_t already_received; GPR_ASSERT(s->recv_message_ready == nullptr); GPR_ASSERT(!s->pending_byte_stream); @@ -1568,30 +1644,32 @@ static void perform_stream_op_locked(void* stream_op, already_received = s->frame_storage.length; s->flow_control->IncomingByteStreamUpdate(GRPC_HEADER_SIZE_IN_BYTES, already_received); - grpc_chttp2_act_on_flowctl_action(s->flow_control->MakeAction(), t, s); + grpc_chttp2_act_on_flowctl_action(exec_ctx, + s->flow_control->MakeAction(), t, s); } } - grpc_chttp2_maybe_complete_recv_message(t, s); + grpc_chttp2_maybe_complete_recv_message(exec_ctx, t, s); } if (op->recv_trailing_metadata) { - GRPC_STATS_INC_HTTP2_OP_RECV_TRAILING_METADATA(); + GRPC_STATS_INC_HTTP2_OP_RECV_TRAILING_METADATA(exec_ctx); GPR_ASSERT(s->recv_trailing_metadata_finished == nullptr); s->recv_trailing_metadata_finished = add_closure_barrier(on_complete); s->recv_trailing_metadata = op_payload->recv_trailing_metadata.recv_trailing_metadata; s->final_metadata_requested = true; - grpc_chttp2_maybe_complete_recv_trailing_metadata(t, s); + grpc_chttp2_maybe_complete_recv_trailing_metadata(exec_ctx, t, s); } - grpc_chttp2_complete_closure_step(t, s, &on_complete, GRPC_ERROR_NONE, - "op->on_complete"); + grpc_chttp2_complete_closure_step(exec_ctx, t, s, &on_complete, + GRPC_ERROR_NONE, "op->on_complete"); GPR_TIMER_END("perform_stream_op_locked", 0); - GRPC_CHTTP2_STREAM_UNREF(s, "perform_stream_op"); + GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "perform_stream_op"); } -static void perform_stream_op(grpc_transport* gt, grpc_stream* gs, +static void perform_stream_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, + grpc_stream* gs, grpc_transport_stream_op_batch* op) { GPR_TIMER_BEGIN("perform_stream_op", 0); grpc_chttp2_transport* t = (grpc_chttp2_transport*)gt; @@ -1619,29 +1697,32 @@ static void perform_stream_op(grpc_transport* gt, grpc_stream* gs, op->handler_private.extra_arg = gs; GRPC_CHTTP2_STREAM_REF(s, "perform_stream_op"); GRPC_CLOSURE_SCHED( + exec_ctx, GRPC_CLOSURE_INIT(&op->handler_private.closure, perform_stream_op_locked, op, grpc_combiner_scheduler(t->combiner)), GRPC_ERROR_NONE); GPR_TIMER_END("perform_stream_op", 0); } -static void cancel_pings(grpc_chttp2_transport* t, grpc_error* error) { +static void cancel_pings(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, + grpc_error* error) { /* callback remaining pings: they're not allowed to call into the transpot, and maybe they hold resources that need to be freed */ grpc_chttp2_ping_queue* pq = &t->ping_queue; GPR_ASSERT(error != GRPC_ERROR_NONE); for (size_t j = 0; j < GRPC_CHTTP2_PCL_COUNT; j++) { grpc_closure_list_fail_all(&pq->lists[j], GRPC_ERROR_REF(error)); - GRPC_CLOSURE_LIST_SCHED(&pq->lists[j]); + GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pq->lists[j]); } GRPC_ERROR_UNREF(error); } -static void send_ping_locked(grpc_chttp2_transport* t, +static void send_ping_locked(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, grpc_closure* on_initiate, grpc_closure* on_ack) { if (t->closed_with_error != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(on_initiate, GRPC_ERROR_REF(t->closed_with_error)); - GRPC_CLOSURE_SCHED(on_ack, GRPC_ERROR_REF(t->closed_with_error)); + GRPC_CLOSURE_SCHED(exec_ctx, on_initiate, + GRPC_ERROR_REF(t->closed_with_error)); + GRPC_CLOSURE_SCHED(exec_ctx, on_ack, GRPC_ERROR_REF(t->closed_with_error)); return; } grpc_chttp2_ping_queue* pq = &t->ping_queue; @@ -1651,15 +1732,18 @@ static void send_ping_locked(grpc_chttp2_transport* t, GRPC_ERROR_NONE); } -static void retry_initiate_ping_locked(void* tp, grpc_error* error) { +static void retry_initiate_ping_locked(grpc_exec_ctx* exec_ctx, void* tp, + grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)tp; t->ping_state.is_delayed_ping_timer_set = false; if (error == GRPC_ERROR_NONE) { - grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_RETRY_SEND_PING); + grpc_chttp2_initiate_write(exec_ctx, t, + GRPC_CHTTP2_INITIATE_WRITE_RETRY_SEND_PING); } } -void grpc_chttp2_ack_ping(grpc_chttp2_transport* t, uint64_t id) { +void grpc_chttp2_ack_ping(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, + uint64_t id) { grpc_chttp2_ping_queue* pq = &t->ping_queue; if (pq->inflight_id != id) { char* from = grpc_endpoint_get_peer(t->ep); @@ -1667,48 +1751,54 @@ void grpc_chttp2_ack_ping(grpc_chttp2_transport* t, uint64_t id) { gpr_free(from); return; } - GRPC_CLOSURE_LIST_SCHED(&pq->lists[GRPC_CHTTP2_PCL_INFLIGHT]); + GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pq->lists[GRPC_CHTTP2_PCL_INFLIGHT]); if (!grpc_closure_list_empty(pq->lists[GRPC_CHTTP2_PCL_NEXT])) { - grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_CONTINUE_PINGS); + grpc_chttp2_initiate_write(exec_ctx, t, + GRPC_CHTTP2_INITIATE_WRITE_CONTINUE_PINGS); } } -static void send_goaway(grpc_chttp2_transport* t, grpc_error* error) { +static void send_goaway(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, + grpc_error* error) { t->sent_goaway_state = GRPC_CHTTP2_GOAWAY_SEND_SCHEDULED; grpc_http2_error_code http_error; grpc_slice slice; - grpc_error_get_status(error, GRPC_MILLIS_INF_FUTURE, nullptr, &slice, - &http_error, nullptr); + grpc_error_get_status(exec_ctx, error, GRPC_MILLIS_INF_FUTURE, nullptr, + &slice, &http_error, nullptr); grpc_chttp2_goaway_append(t->last_new_stream_id, (uint32_t)http_error, grpc_slice_ref_internal(slice), &t->qbuf); - grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_GOAWAY_SENT); + grpc_chttp2_initiate_write(exec_ctx, t, + GRPC_CHTTP2_INITIATE_WRITE_GOAWAY_SENT); GRPC_ERROR_UNREF(error); } -void grpc_chttp2_add_ping_strike(grpc_chttp2_transport* t) { +void grpc_chttp2_add_ping_strike(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t) { t->ping_recv_state.ping_strikes++; if (++t->ping_recv_state.ping_strikes > t->ping_policy.max_ping_strikes && t->ping_policy.max_ping_strikes != 0) { - send_goaway(t, + send_goaway(exec_ctx, t, grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("too_many_pings"), GRPC_ERROR_INT_HTTP2_ERROR, GRPC_HTTP2_ENHANCE_YOUR_CALM)); /*The transport will be closed after the write is done */ close_transport_locked( - t, grpc_error_set_int( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Too many pings"), - GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE)); + exec_ctx, t, + grpc_error_set_int( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Too many pings"), + GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE)); } } -static void perform_transport_op_locked(void* stream_op, +static void perform_transport_op_locked(grpc_exec_ctx* exec_ctx, + void* stream_op, grpc_error* error_ignored) { grpc_transport_op* op = (grpc_transport_op*)stream_op; grpc_chttp2_transport* t = (grpc_chttp2_transport*)op->handler_private.extra_arg; if (op->goaway_error) { - send_goaway(t, op->goaway_error); + send_goaway(exec_ctx, t, op->goaway_error); } if (op->set_accept_stream) { @@ -1718,40 +1808,43 @@ static void perform_transport_op_locked(void* stream_op, } if (op->bind_pollset) { - grpc_endpoint_add_to_pollset(t->ep, op->bind_pollset); + grpc_endpoint_add_to_pollset(exec_ctx, t->ep, op->bind_pollset); } if (op->bind_pollset_set) { - grpc_endpoint_add_to_pollset_set(t->ep, op->bind_pollset_set); + grpc_endpoint_add_to_pollset_set(exec_ctx, t->ep, op->bind_pollset_set); } if (op->send_ping) { - send_ping_locked(t, nullptr, op->send_ping); - grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_APPLICATION_PING); + send_ping_locked(exec_ctx, t, nullptr, op->send_ping); + grpc_chttp2_initiate_write(exec_ctx, t, + GRPC_CHTTP2_INITIATE_WRITE_APPLICATION_PING); } if (op->on_connectivity_state_change != nullptr) { grpc_connectivity_state_notify_on_state_change( - &t->channel_callback.state_tracker, op->connectivity_state, + exec_ctx, &t->channel_callback.state_tracker, op->connectivity_state, op->on_connectivity_state_change); } if (op->disconnect_with_error != GRPC_ERROR_NONE) { - close_transport_locked(t, op->disconnect_with_error); + close_transport_locked(exec_ctx, t, op->disconnect_with_error); } - GRPC_CLOSURE_RUN(op->on_consumed, GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN(exec_ctx, op->on_consumed, GRPC_ERROR_NONE); - GRPC_CHTTP2_UNREF_TRANSPORT(t, "transport_op"); + GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "transport_op"); } -static void perform_transport_op(grpc_transport* gt, grpc_transport_op* op) { +static void perform_transport_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, + grpc_transport_op* op) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)gt; char* msg = grpc_transport_op_string(op); gpr_free(msg); op->handler_private.extra_arg = gt; GRPC_CHTTP2_REF_TRANSPORT(t, "transport_op"); - GRPC_CLOSURE_SCHED(GRPC_CLOSURE_INIT(&op->handler_private.closure, + GRPC_CLOSURE_SCHED(exec_ctx, + GRPC_CLOSURE_INIT(&op->handler_private.closure, perform_transport_op_locked, op, grpc_combiner_scheduler(t->combiner)), GRPC_ERROR_NONE); @@ -1761,33 +1854,36 @@ static void perform_transport_op(grpc_transport* gt, grpc_transport_op* op) { * INPUT PROCESSING - GENERAL */ -void grpc_chttp2_maybe_complete_recv_initial_metadata(grpc_chttp2_transport* t, +void grpc_chttp2_maybe_complete_recv_initial_metadata(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s) { if (s->recv_initial_metadata_ready != nullptr && s->published_metadata[0] != GRPC_METADATA_NOT_PUBLISHED) { if (s->seen_error) { - grpc_slice_buffer_reset_and_unref_internal(&s->frame_storage); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &s->frame_storage); if (!s->pending_byte_stream) { grpc_slice_buffer_reset_and_unref_internal( - &s->unprocessed_incoming_frames_buffer); + exec_ctx, &s->unprocessed_incoming_frames_buffer); } } - grpc_chttp2_incoming_metadata_buffer_publish(&s->metadata_buffer[0], - s->recv_initial_metadata); - null_then_run_closure(&s->recv_initial_metadata_ready, GRPC_ERROR_NONE); + grpc_chttp2_incoming_metadata_buffer_publish( + exec_ctx, &s->metadata_buffer[0], s->recv_initial_metadata); + null_then_run_closure(exec_ctx, &s->recv_initial_metadata_ready, + GRPC_ERROR_NONE); } } -void grpc_chttp2_maybe_complete_recv_message(grpc_chttp2_transport* t, +void grpc_chttp2_maybe_complete_recv_message(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s) { grpc_error* error = GRPC_ERROR_NONE; if (s->recv_message_ready != nullptr) { *s->recv_message = nullptr; if (s->final_metadata_requested && s->seen_error) { - grpc_slice_buffer_reset_and_unref_internal(&s->frame_storage); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &s->frame_storage); if (!s->pending_byte_stream) { grpc_slice_buffer_reset_and_unref_internal( - &s->unprocessed_incoming_frames_buffer); + exec_ctx, &s->unprocessed_incoming_frames_buffer); } } if (!s->pending_byte_stream) { @@ -1814,9 +1910,10 @@ void grpc_chttp2_maybe_complete_recv_message(grpc_chttp2_transport* t, &s->decompressed_data_buffer, nullptr, GRPC_HEADER_SIZE_IN_BYTES - s->decompressed_header_bytes, &end_of_context)) { - grpc_slice_buffer_reset_and_unref_internal(&s->frame_storage); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, + &s->frame_storage); grpc_slice_buffer_reset_and_unref_internal( - &s->unprocessed_incoming_frames_buffer); + exec_ctx, &s->unprocessed_incoming_frames_buffer); error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Stream decompression error."); } else { @@ -1825,8 +1922,8 @@ void grpc_chttp2_maybe_complete_recv_message(grpc_chttp2_transport* t, s->decompressed_header_bytes = 0; } error = grpc_deframe_unprocessed_incoming_frames( - &s->data_parser, s, &s->decompressed_data_buffer, nullptr, - s->recv_message); + exec_ctx, &s->data_parser, s, &s->decompressed_data_buffer, + nullptr, s->recv_message); if (end_of_context) { grpc_stream_compression_context_destroy( s->stream_decompression_ctx); @@ -1835,14 +1932,15 @@ void grpc_chttp2_maybe_complete_recv_message(grpc_chttp2_transport* t, } } else { error = grpc_deframe_unprocessed_incoming_frames( - &s->data_parser, s, &s->unprocessed_incoming_frames_buffer, - nullptr, s->recv_message); + exec_ctx, &s->data_parser, s, + &s->unprocessed_incoming_frames_buffer, nullptr, s->recv_message); } if (error != GRPC_ERROR_NONE) { s->seen_error = true; - grpc_slice_buffer_reset_and_unref_internal(&s->frame_storage); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, + &s->frame_storage); grpc_slice_buffer_reset_and_unref_internal( - &s->unprocessed_incoming_frames_buffer); + exec_ctx, &s->unprocessed_incoming_frames_buffer); break; } else if (*s->recv_message != nullptr) { break; @@ -1850,25 +1948,26 @@ void grpc_chttp2_maybe_complete_recv_message(grpc_chttp2_transport* t, } } if (error == GRPC_ERROR_NONE && *s->recv_message != nullptr) { - null_then_run_closure(&s->recv_message_ready, GRPC_ERROR_NONE); + null_then_run_closure(exec_ctx, &s->recv_message_ready, GRPC_ERROR_NONE); } else if (s->published_metadata[1] != GRPC_METADATA_NOT_PUBLISHED) { *s->recv_message = nullptr; - null_then_run_closure(&s->recv_message_ready, GRPC_ERROR_NONE); + null_then_run_closure(exec_ctx, &s->recv_message_ready, GRPC_ERROR_NONE); } GRPC_ERROR_UNREF(error); } } -void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_chttp2_transport* t, +void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s) { - grpc_chttp2_maybe_complete_recv_message(t, s); + grpc_chttp2_maybe_complete_recv_message(exec_ctx, t, s); if (s->recv_trailing_metadata_finished != nullptr && s->read_closed && s->write_closed) { if (s->seen_error) { - grpc_slice_buffer_reset_and_unref_internal(&s->frame_storage); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &s->frame_storage); if (!s->pending_byte_stream) { grpc_slice_buffer_reset_and_unref_internal( - &s->unprocessed_incoming_frames_buffer); + exec_ctx, &s->unprocessed_incoming_frames_buffer); } } bool pending_data = s->pending_byte_stream || @@ -1886,9 +1985,9 @@ void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_chttp2_transport* t, s->stream_decompression_ctx, &s->frame_storage, &s->unprocessed_incoming_frames_buffer, nullptr, GRPC_HEADER_SIZE_IN_BYTES, &end_of_context)) { - grpc_slice_buffer_reset_and_unref_internal(&s->frame_storage); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &s->frame_storage); grpc_slice_buffer_reset_and_unref_internal( - &s->unprocessed_incoming_frames_buffer); + exec_ctx, &s->unprocessed_incoming_frames_buffer); s->seen_error = true; } else { if (s->unprocessed_incoming_frames_buffer.length > 0) { @@ -1903,23 +2002,23 @@ void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_chttp2_transport* t, } if (s->read_closed && s->frame_storage.length == 0 && !pending_data && s->recv_trailing_metadata_finished != nullptr) { - grpc_chttp2_incoming_metadata_buffer_publish(&s->metadata_buffer[1], - s->recv_trailing_metadata); + grpc_chttp2_incoming_metadata_buffer_publish( + exec_ctx, &s->metadata_buffer[1], s->recv_trailing_metadata); grpc_chttp2_complete_closure_step( - t, s, &s->recv_trailing_metadata_finished, GRPC_ERROR_NONE, + exec_ctx, t, s, &s->recv_trailing_metadata_finished, GRPC_ERROR_NONE, "recv_trailing_metadata_finished"); } } } -static void remove_stream(grpc_chttp2_transport* t, uint32_t id, - grpc_error* error) { +static void remove_stream(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, + uint32_t id, grpc_error* error) { grpc_chttp2_stream* s = (grpc_chttp2_stream*)grpc_chttp2_stream_map_delete(&t->stream_map, id); GPR_ASSERT(s); if (t->incoming_stream == s) { t->incoming_stream = nullptr; - grpc_chttp2_parsing_become_skip_parser(t); + grpc_chttp2_parsing_become_skip_parser(exec_ctx, t); } if (s->pending_byte_stream) { if (s->on_next != nullptr) { @@ -1927,8 +2026,8 @@ static void remove_stream(grpc_chttp2_transport* t, uint32_t id, if (error == GRPC_ERROR_NONE) { error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Truncated message"); } - incoming_byte_stream_publish_error(bs, error); - incoming_byte_stream_unref(bs); + incoming_byte_stream_publish_error(exec_ctx, bs, error); + incoming_byte_stream_unref(exec_ctx, bs); s->data_parser.parsing_frame = nullptr; } else { GRPC_ERROR_UNREF(s->byte_stream_error); @@ -1937,52 +2036,56 @@ static void remove_stream(grpc_chttp2_transport* t, uint32_t id, } if (grpc_chttp2_stream_map_size(&t->stream_map) == 0) { - post_benign_reclaimer(t); + post_benign_reclaimer(exec_ctx, t); if (t->sent_goaway_state == GRPC_CHTTP2_GOAWAY_SENT) { close_transport_locked( - t, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Last stream closed after sending GOAWAY", &error, 1)); + exec_ctx, t, + GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Last stream closed after sending GOAWAY", &error, 1)); } } if (grpc_chttp2_list_remove_writable_stream(t, s)) { - GRPC_CHTTP2_STREAM_UNREF(s, "chttp2_writing:remove_stream"); + GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "chttp2_writing:remove_stream"); } GRPC_ERROR_UNREF(error); - maybe_start_some_streams(t); + maybe_start_some_streams(exec_ctx, t); } -void grpc_chttp2_cancel_stream(grpc_chttp2_transport* t, grpc_chttp2_stream* s, +void grpc_chttp2_cancel_stream(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_error* due_to_error) { if (!t->is_client && !s->sent_trailing_metadata && grpc_error_has_clear_grpc_status(due_to_error)) { - close_from_api(t, s, due_to_error); + close_from_api(exec_ctx, t, s, due_to_error); return; } if (!s->read_closed || !s->write_closed) { if (s->id != 0) { grpc_http2_error_code http_error; - grpc_error_get_status(due_to_error, s->deadline, nullptr, nullptr, - &http_error, nullptr); + grpc_error_get_status(exec_ctx, due_to_error, s->deadline, nullptr, + nullptr, &http_error, nullptr); grpc_slice_buffer_add( &t->qbuf, grpc_chttp2_rst_stream_create(s->id, (uint32_t)http_error, &s->stats.outgoing)); - grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_RST_STREAM); + grpc_chttp2_initiate_write(exec_ctx, t, + GRPC_CHTTP2_INITIATE_WRITE_RST_STREAM); } } if (due_to_error != GRPC_ERROR_NONE && !s->seen_error) { s->seen_error = true; } - grpc_chttp2_mark_stream_closed(t, s, 1, 1, due_to_error); + grpc_chttp2_mark_stream_closed(exec_ctx, t, s, 1, 1, due_to_error); } -void grpc_chttp2_fake_status(grpc_chttp2_transport* t, grpc_chttp2_stream* s, - grpc_error* error) { +void grpc_chttp2_fake_status(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, + grpc_chttp2_stream* s, grpc_error* error) { grpc_status_code status; grpc_slice slice; - grpc_error_get_status(error, s->deadline, &status, &slice, nullptr, nullptr); + grpc_error_get_status(exec_ctx, error, s->deadline, &status, &slice, nullptr, + nullptr); if (status != GRPC_STATUS_OK) { s->seen_error = true; } @@ -1998,20 +2101,20 @@ void grpc_chttp2_fake_status(grpc_chttp2_transport* t, grpc_chttp2_stream* s, gpr_ltoa(status, status_string); GRPC_LOG_IF_ERROR("add_status", grpc_chttp2_incoming_metadata_buffer_replace_or_add( - &s->metadata_buffer[1], + exec_ctx, &s->metadata_buffer[1], grpc_mdelem_from_slices( - GRPC_MDSTR_GRPC_STATUS, + exec_ctx, GRPC_MDSTR_GRPC_STATUS, grpc_slice_from_copied_string(status_string)))); if (!GRPC_SLICE_IS_EMPTY(slice)) { GRPC_LOG_IF_ERROR( "add_status_message", grpc_chttp2_incoming_metadata_buffer_replace_or_add( - &s->metadata_buffer[1], - grpc_mdelem_from_slices(GRPC_MDSTR_GRPC_MESSAGE, + exec_ctx, &s->metadata_buffer[1], + grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_GRPC_MESSAGE, grpc_slice_ref_internal(slice)))); } s->published_metadata[1] = GRPC_METADATA_SYNTHESIZED_FROM_FAKE; - grpc_chttp2_maybe_complete_recv_trailing_metadata(t, s); + grpc_chttp2_maybe_complete_recv_trailing_metadata(exec_ctx, t, s); } GRPC_ERROR_UNREF(error); @@ -2044,12 +2147,14 @@ static grpc_error* removal_error(grpc_error* extra_error, grpc_chttp2_stream* s, return error; } -static void flush_write_list(grpc_chttp2_transport* t, grpc_chttp2_stream* s, - grpc_chttp2_write_cb** list, grpc_error* error) { +static void flush_write_list(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, + grpc_chttp2_stream* s, grpc_chttp2_write_cb** list, + grpc_error* error) { while (*list) { grpc_chttp2_write_cb* cb = *list; *list = cb->next; - grpc_chttp2_complete_closure_step(t, s, &cb->closure, GRPC_ERROR_REF(error), + grpc_chttp2_complete_closure_step(exec_ctx, t, s, &cb->closure, + GRPC_ERROR_REF(error), "on_write_finished_cb"); cb->next = t->write_cb_pool; t->write_cb_pool = cb; @@ -2057,34 +2162,37 @@ static void flush_write_list(grpc_chttp2_transport* t, grpc_chttp2_stream* s, GRPC_ERROR_UNREF(error); } -void grpc_chttp2_fail_pending_writes(grpc_chttp2_transport* t, +void grpc_chttp2_fail_pending_writes(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_error* error) { error = removal_error(error, s, "Pending writes failed due to stream closure"); s->send_initial_metadata = nullptr; - grpc_chttp2_complete_closure_step(t, s, &s->send_initial_metadata_finished, - GRPC_ERROR_REF(error), - "send_initial_metadata_finished"); + grpc_chttp2_complete_closure_step( + exec_ctx, t, s, &s->send_initial_metadata_finished, GRPC_ERROR_REF(error), + "send_initial_metadata_finished"); s->send_trailing_metadata = nullptr; - grpc_chttp2_complete_closure_step(t, s, &s->send_trailing_metadata_finished, - GRPC_ERROR_REF(error), - "send_trailing_metadata_finished"); + grpc_chttp2_complete_closure_step( + exec_ctx, t, s, &s->send_trailing_metadata_finished, + GRPC_ERROR_REF(error), "send_trailing_metadata_finished"); s->fetching_send_message = nullptr; - grpc_chttp2_complete_closure_step(t, s, &s->fetching_send_message_finished, - GRPC_ERROR_REF(error), - "fetching_send_message_finished"); - flush_write_list(t, s, &s->on_write_finished_cbs, GRPC_ERROR_REF(error)); - flush_write_list(t, s, &s->on_flow_controlled_cbs, error); + grpc_chttp2_complete_closure_step( + exec_ctx, t, s, &s->fetching_send_message_finished, GRPC_ERROR_REF(error), + "fetching_send_message_finished"); + flush_write_list(exec_ctx, t, s, &s->on_write_finished_cbs, + GRPC_ERROR_REF(error)); + flush_write_list(exec_ctx, t, s, &s->on_flow_controlled_cbs, error); } -void grpc_chttp2_mark_stream_closed(grpc_chttp2_transport* t, +void grpc_chttp2_mark_stream_closed(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s, int close_reads, int close_writes, grpc_error* error) { if (s->read_closed && s->write_closed) { /* already closed */ - grpc_chttp2_maybe_complete_recv_trailing_metadata(t, s); + grpc_chttp2_maybe_complete_recv_trailing_metadata(exec_ctx, t, s); GRPC_ERROR_UNREF(error); return; } @@ -2098,20 +2206,20 @@ void grpc_chttp2_mark_stream_closed(grpc_chttp2_transport* t, if (close_writes && !s->write_closed) { s->write_closed_error = GRPC_ERROR_REF(error); s->write_closed = true; - grpc_chttp2_fail_pending_writes(t, s, GRPC_ERROR_REF(error)); + grpc_chttp2_fail_pending_writes(exec_ctx, t, s, GRPC_ERROR_REF(error)); } if (s->read_closed && s->write_closed) { became_closed = true; grpc_error* overall_error = removal_error(GRPC_ERROR_REF(error), s, "Stream removed"); if (s->id != 0) { - remove_stream(t, s->id, GRPC_ERROR_REF(overall_error)); + remove_stream(exec_ctx, t, s->id, GRPC_ERROR_REF(overall_error)); } else { /* Purge streams waiting on concurrency still waiting for id assignment */ grpc_chttp2_list_remove_waiting_for_concurrency(t, s); } if (overall_error != GRPC_ERROR_NONE) { - grpc_chttp2_fake_status(t, s, overall_error); + grpc_chttp2_fake_status(exec_ctx, t, s, overall_error); } } if (closed_read) { @@ -2120,18 +2228,18 @@ void grpc_chttp2_mark_stream_closed(grpc_chttp2_transport* t, s->published_metadata[i] = GPRC_METADATA_PUBLISHED_AT_CLOSE; } } - grpc_chttp2_maybe_complete_recv_initial_metadata(t, s); - grpc_chttp2_maybe_complete_recv_message(t, s); + grpc_chttp2_maybe_complete_recv_initial_metadata(exec_ctx, t, s); + grpc_chttp2_maybe_complete_recv_message(exec_ctx, t, s); } if (became_closed) { - grpc_chttp2_maybe_complete_recv_trailing_metadata(t, s); - GRPC_CHTTP2_STREAM_UNREF(s, "chttp2"); + grpc_chttp2_maybe_complete_recv_trailing_metadata(exec_ctx, t, s); + GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "chttp2"); } GRPC_ERROR_UNREF(error); } -static void close_from_api(grpc_chttp2_transport* t, grpc_chttp2_stream* s, - grpc_error* error) { +static void close_from_api(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, + grpc_chttp2_stream* s, grpc_error* error) { grpc_slice hdr; grpc_slice status_hdr; grpc_slice http_status_hdr; @@ -2141,8 +2249,8 @@ static void close_from_api(grpc_chttp2_transport* t, grpc_chttp2_stream* s, uint32_t len = 0; grpc_status_code grpc_status; grpc_slice slice; - grpc_error_get_status(error, s->deadline, &grpc_status, &slice, nullptr, - nullptr); + grpc_error_get_status(exec_ctx, error, s->deadline, &grpc_status, &slice, + nullptr, nullptr); GPR_ASSERT(grpc_status >= 0 && (int)grpc_status < 100); @@ -2284,11 +2392,13 @@ static void close_from_api(grpc_chttp2_transport* t, grpc_chttp2_stream* s, &t->qbuf, grpc_chttp2_rst_stream_create(s->id, GRPC_HTTP2_NO_ERROR, &s->stats.outgoing)); - grpc_chttp2_mark_stream_closed(t, s, 1, 1, error); - grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_CLOSE_FROM_API); + grpc_chttp2_mark_stream_closed(exec_ctx, t, s, 1, 1, error); + grpc_chttp2_initiate_write(exec_ctx, t, + GRPC_CHTTP2_INITIATE_WRITE_CLOSE_FROM_API); } typedef struct { + grpc_exec_ctx* exec_ctx; grpc_error* error; grpc_chttp2_transport* t; } cancel_stream_cb_args; @@ -2296,11 +2406,13 @@ typedef struct { static void cancel_stream_cb(void* user_data, uint32_t key, void* stream) { cancel_stream_cb_args* args = (cancel_stream_cb_args*)user_data; grpc_chttp2_stream* s = (grpc_chttp2_stream*)stream; - grpc_chttp2_cancel_stream(args->t, s, GRPC_ERROR_REF(args->error)); + grpc_chttp2_cancel_stream(args->exec_ctx, args->t, s, + GRPC_ERROR_REF(args->error)); } -static void end_all_the_calls(grpc_chttp2_transport* t, grpc_error* error) { - cancel_stream_cb_args args = {error, t}; +static void end_all_the_calls(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, + grpc_error* error) { + cancel_stream_cb_args args = {exec_ctx, error, t}; grpc_chttp2_stream_map_for_each(&t->stream_map, cancel_stream_cb, &args); GRPC_ERROR_UNREF(error); } @@ -2310,14 +2422,14 @@ static void end_all_the_calls(grpc_chttp2_transport* t, grpc_error* error) { */ template -static void WithUrgency(grpc_chttp2_transport* t, +static void WithUrgency(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, grpc_core::chttp2::FlowControlAction::Urgency urgency, grpc_chttp2_initiate_write_reason reason, F action) { switch (urgency) { case grpc_core::chttp2::FlowControlAction::Urgency::NO_ACTION_NEEDED: break; case grpc_core::chttp2::FlowControlAction::Urgency::UPDATE_IMMEDIATELY: - grpc_chttp2_initiate_write(t, reason); + grpc_chttp2_initiate_write(exec_ctx, t, reason); // fallthrough case grpc_core::chttp2::FlowControlAction::Urgency::QUEUE_UPDATE: action(); @@ -2326,27 +2438,31 @@ static void WithUrgency(grpc_chttp2_transport* t, } void grpc_chttp2_act_on_flowctl_action( - const grpc_core::chttp2::FlowControlAction& action, + grpc_exec_ctx* exec_ctx, const grpc_core::chttp2::FlowControlAction& action, grpc_chttp2_transport* t, grpc_chttp2_stream* s) { - WithUrgency(t, action.send_stream_update(), - GRPC_CHTTP2_INITIATE_WRITE_STREAM_FLOW_CONTROL, - [t, s]() { grpc_chttp2_mark_stream_writable(t, s); }); - WithUrgency(t, action.send_transport_update(), + WithUrgency( + exec_ctx, t, action.send_stream_update(), + GRPC_CHTTP2_INITIATE_WRITE_STREAM_FLOW_CONTROL, + [exec_ctx, t, s]() { grpc_chttp2_mark_stream_writable(exec_ctx, t, s); }); + WithUrgency(exec_ctx, t, action.send_transport_update(), GRPC_CHTTP2_INITIATE_WRITE_TRANSPORT_FLOW_CONTROL, []() {}); - WithUrgency(t, action.send_initial_window_update(), - GRPC_CHTTP2_INITIATE_WRITE_SEND_SETTINGS, [t, &action]() { - queue_setting_update(t, + WithUrgency(exec_ctx, t, action.send_initial_window_update(), + GRPC_CHTTP2_INITIATE_WRITE_SEND_SETTINGS, + [exec_ctx, t, &action]() { + queue_setting_update(exec_ctx, t, GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE, action.initial_window_size()); }); - WithUrgency(t, action.send_max_frame_size_update(), - GRPC_CHTTP2_INITIATE_WRITE_SEND_SETTINGS, [t, &action]() { - queue_setting_update(t, GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE, - action.max_frame_size()); - }); + WithUrgency( + exec_ctx, t, action.send_max_frame_size_update(), + GRPC_CHTTP2_INITIATE_WRITE_SEND_SETTINGS, [exec_ctx, t, &action]() { + queue_setting_update(exec_ctx, t, GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE, + action.max_frame_size()); + }); } -static grpc_error* try_http_parsing(grpc_chttp2_transport* t) { +static grpc_error* try_http_parsing(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t) { grpc_http_parser parser; size_t i = 0; grpc_error* error = GRPC_ERROR_NONE; @@ -2375,7 +2491,8 @@ static grpc_error* try_http_parsing(grpc_chttp2_transport* t) { return error; } -static void read_action_locked(void* tp, grpc_error* error) { +static void read_action_locked(grpc_exec_ctx* exec_ctx, void* tp, + grpc_error* error) { GPR_TIMER_BEGIN("reading_action_locked", 0); grpc_chttp2_transport* t = (grpc_chttp2_transport*)tp; @@ -2399,10 +2516,11 @@ static void read_action_locked(void* tp, grpc_error* error) { for (; i < t->read_buffer.count && errors[1] == GRPC_ERROR_NONE; i++) { t->flow_control->bdp_estimator()->AddIncomingBytes( (int64_t)GRPC_SLICE_LENGTH(t->read_buffer.slices[i])); - errors[1] = grpc_chttp2_perform_read(t, t->read_buffer.slices[i]); + errors[1] = + grpc_chttp2_perform_read(exec_ctx, t, t->read_buffer.slices[i]); } if (errors[1] != GRPC_ERROR_NONE) { - errors[2] = try_http_parsing(t); + errors[2] = try_http_parsing(exec_ctx, t); GRPC_ERROR_UNREF(error); error = GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Failed parsing HTTP/2", errors, GPR_ARRAY_SIZE(errors)); @@ -2417,9 +2535,10 @@ static void read_action_locked(void* tp, grpc_error* error) { if (t->initial_window_update > 0) { grpc_chttp2_stream* s; while (grpc_chttp2_list_pop_stalled_by_stream(t, &s)) { - grpc_chttp2_mark_stream_writable(t, s); + grpc_chttp2_mark_stream_writable(exec_ctx, t, s); grpc_chttp2_initiate_write( - t, GRPC_CHTTP2_INITIATE_WRITE_FLOW_CONTROL_UNSTALLED_BY_SETTING); + exec_ctx, t, + GRPC_CHTTP2_INITIATE_WRITE_FLOW_CONTROL_UNSTALLED_BY_SETTING); } } t->initial_window_update = 0; @@ -2440,21 +2559,22 @@ static void read_action_locked(void* tp, grpc_error* error) { error = grpc_error_add_child(error, GRPC_ERROR_REF(t->goaway_error)); } - close_transport_locked(t, GRPC_ERROR_REF(error)); + close_transport_locked(exec_ctx, t, GRPC_ERROR_REF(error)); t->endpoint_reading = 0; } else if (t->closed_with_error == GRPC_ERROR_NONE) { keep_reading = true; GRPC_CHTTP2_REF_TRANSPORT(t, "keep_reading"); } - grpc_slice_buffer_reset_and_unref_internal(&t->read_buffer); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &t->read_buffer); if (keep_reading) { - grpc_endpoint_read(t->ep, &t->read_buffer, &t->read_action_locked); - grpc_chttp2_act_on_flowctl_action(t->flow_control->MakeAction(), t, - nullptr); - GRPC_CHTTP2_UNREF_TRANSPORT(t, "keep_reading"); + grpc_endpoint_read(exec_ctx, t->ep, &t->read_buffer, + &t->read_action_locked); + grpc_chttp2_act_on_flowctl_action(exec_ctx, t->flow_control->MakeAction(), + t, nullptr); + GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "keep_reading"); } else { - GRPC_CHTTP2_UNREF_TRANSPORT(t, "reading_action"); + GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "reading_action"); } GPR_TIMER_END("post_reading_action_locked", 0); @@ -2466,12 +2586,15 @@ static void read_action_locked(void* tp, grpc_error* error) { // t is reffed prior to calling the first time, and once the callback chain // that kicks off finishes, it's unreffed -static void schedule_bdp_ping_locked(grpc_chttp2_transport* t) { +static void schedule_bdp_ping_locked(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t) { t->flow_control->bdp_estimator()->SchedulePing(); - send_ping_locked(t, &t->start_bdp_ping_locked, &t->finish_bdp_ping_locked); + send_ping_locked(exec_ctx, t, &t->start_bdp_ping_locked, + &t->finish_bdp_ping_locked); } -static void start_bdp_ping_locked(void* tp, grpc_error* error) { +static void start_bdp_ping_locked(grpc_exec_ctx* exec_ctx, void* tp, + grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)tp; if (grpc_http_trace.enabled()) { gpr_log(GPR_DEBUG, "%s: Start BDP ping err=%s", t->peer_string, @@ -2479,39 +2602,42 @@ static void start_bdp_ping_locked(void* tp, grpc_error* error) { } /* Reset the keepalive ping timer */ if (t->keepalive_state == GRPC_CHTTP2_KEEPALIVE_STATE_WAITING) { - grpc_timer_cancel(&t->keepalive_ping_timer); + grpc_timer_cancel(exec_ctx, &t->keepalive_ping_timer); } t->flow_control->bdp_estimator()->StartPing(); } -static void finish_bdp_ping_locked(void* tp, grpc_error* error) { +static void finish_bdp_ping_locked(grpc_exec_ctx* exec_ctx, void* tp, + grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)tp; if (grpc_http_trace.enabled()) { gpr_log(GPR_DEBUG, "%s: Complete BDP ping err=%s", t->peer_string, grpc_error_string(error)); } if (error != GRPC_ERROR_NONE) { - GRPC_CHTTP2_UNREF_TRANSPORT(t, "bdp_ping"); + GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "bdp_ping"); return; } - grpc_millis next_ping = t->flow_control->bdp_estimator()->CompletePing(); - grpc_chttp2_act_on_flowctl_action(t->flow_control->PeriodicUpdate(), t, - nullptr); + grpc_millis next_ping = + t->flow_control->bdp_estimator()->CompletePing(exec_ctx); + grpc_chttp2_act_on_flowctl_action( + exec_ctx, t->flow_control->PeriodicUpdate(exec_ctx), t, nullptr); GPR_ASSERT(!t->have_next_bdp_ping_timer); t->have_next_bdp_ping_timer = true; - grpc_timer_init(&t->next_bdp_ping_timer, next_ping, + grpc_timer_init(exec_ctx, &t->next_bdp_ping_timer, next_ping, &t->next_bdp_ping_timer_expired_locked); } -static void next_bdp_ping_timer_expired_locked(void* tp, grpc_error* error) { +static void next_bdp_ping_timer_expired_locked(grpc_exec_ctx* exec_ctx, + void* tp, grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)tp; GPR_ASSERT(t->have_next_bdp_ping_timer); t->have_next_bdp_ping_timer = false; if (error != GRPC_ERROR_NONE) { - GRPC_CHTTP2_UNREF_TRANSPORT(t, "bdp_ping"); + GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "bdp_ping"); return; } - schedule_bdp_ping_locked(t); + schedule_bdp_ping_locked(exec_ctx, t); } void grpc_chttp2_config_default_keepalive_args(grpc_channel_args* args, @@ -2572,7 +2698,8 @@ void grpc_chttp2_config_default_keepalive_args(grpc_channel_args* args, } } -static void init_keepalive_ping_locked(void* arg, grpc_error* error) { +static void init_keepalive_ping_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)arg; GPR_ASSERT(t->keepalive_state == GRPC_CHTTP2_KEEPALIVE_STATE_WAITING); if (t->destroying || t->closed_with_error != GRPC_ERROR_NONE) { @@ -2582,55 +2709,59 @@ static void init_keepalive_ping_locked(void* arg, grpc_error* error) { grpc_chttp2_stream_map_size(&t->stream_map) > 0) { t->keepalive_state = GRPC_CHTTP2_KEEPALIVE_STATE_PINGING; GRPC_CHTTP2_REF_TRANSPORT(t, "keepalive ping end"); - send_ping_locked(t, &t->start_keepalive_ping_locked, + send_ping_locked(exec_ctx, t, &t->start_keepalive_ping_locked, &t->finish_keepalive_ping_locked); - grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_KEEPALIVE_PING); + grpc_chttp2_initiate_write(exec_ctx, t, + GRPC_CHTTP2_INITIATE_WRITE_KEEPALIVE_PING); } else { GRPC_CHTTP2_REF_TRANSPORT(t, "init keepalive ping"); - grpc_timer_init(&t->keepalive_ping_timer, - grpc_core::ExecCtx::Get()->Now() + t->keepalive_time, + grpc_timer_init(exec_ctx, &t->keepalive_ping_timer, + grpc_exec_ctx_now(exec_ctx) + t->keepalive_time, &t->init_keepalive_ping_locked); } } else if (error == GRPC_ERROR_CANCELLED) { /* The keepalive ping timer may be cancelled by bdp */ GRPC_CHTTP2_REF_TRANSPORT(t, "init keepalive ping"); - grpc_timer_init(&t->keepalive_ping_timer, - grpc_core::ExecCtx::Get()->Now() + t->keepalive_time, + grpc_timer_init(exec_ctx, &t->keepalive_ping_timer, + grpc_exec_ctx_now(exec_ctx) + t->keepalive_time, &t->init_keepalive_ping_locked); } - GRPC_CHTTP2_UNREF_TRANSPORT(t, "init keepalive ping"); + GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "init keepalive ping"); } -static void start_keepalive_ping_locked(void* arg, grpc_error* error) { +static void start_keepalive_ping_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)arg; GRPC_CHTTP2_REF_TRANSPORT(t, "keepalive watchdog"); - grpc_timer_init(&t->keepalive_watchdog_timer, - grpc_core::ExecCtx::Get()->Now() + t->keepalive_time, + grpc_timer_init(exec_ctx, &t->keepalive_watchdog_timer, + grpc_exec_ctx_now(exec_ctx) + t->keepalive_time, &t->keepalive_watchdog_fired_locked); } -static void finish_keepalive_ping_locked(void* arg, grpc_error* error) { +static void finish_keepalive_ping_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)arg; if (t->keepalive_state == GRPC_CHTTP2_KEEPALIVE_STATE_PINGING) { if (error == GRPC_ERROR_NONE) { t->keepalive_state = GRPC_CHTTP2_KEEPALIVE_STATE_WAITING; - grpc_timer_cancel(&t->keepalive_watchdog_timer); + grpc_timer_cancel(exec_ctx, &t->keepalive_watchdog_timer); GRPC_CHTTP2_REF_TRANSPORT(t, "init keepalive ping"); - grpc_timer_init(&t->keepalive_ping_timer, - grpc_core::ExecCtx::Get()->Now() + t->keepalive_time, + grpc_timer_init(exec_ctx, &t->keepalive_ping_timer, + grpc_exec_ctx_now(exec_ctx) + t->keepalive_time, &t->init_keepalive_ping_locked); } } - GRPC_CHTTP2_UNREF_TRANSPORT(t, "keepalive ping end"); + GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "keepalive ping end"); } -static void keepalive_watchdog_fired_locked(void* arg, grpc_error* error) { +static void keepalive_watchdog_fired_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)arg; if (t->keepalive_state == GRPC_CHTTP2_KEEPALIVE_STATE_PINGING) { if (error == GRPC_ERROR_NONE) { t->keepalive_state = GRPC_CHTTP2_KEEPALIVE_STATE_DYING; close_transport_locked( - t, + exec_ctx, t, grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "keepalive watchdog timeout"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_INTERNAL)); @@ -2643,67 +2774,71 @@ static void keepalive_watchdog_fired_locked(void* arg, grpc_error* error) { t->keepalive_state, GRPC_CHTTP2_KEEPALIVE_STATE_PINGING); } } - GRPC_CHTTP2_UNREF_TRANSPORT(t, "keepalive watchdog"); + GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "keepalive watchdog"); } /******************************************************************************* * CALLBACK LOOP */ -static void connectivity_state_set(grpc_chttp2_transport* t, +static void connectivity_state_set(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_connectivity_state state, grpc_error* error, const char* reason) { GRPC_CHTTP2_IF_TRACING( gpr_log(GPR_DEBUG, "set connectivity_state=%d", state)); - grpc_connectivity_state_set(&t->channel_callback.state_tracker, state, error, - reason); + grpc_connectivity_state_set(exec_ctx, &t->channel_callback.state_tracker, + state, error, reason); } /******************************************************************************* * POLLSET STUFF */ -static void set_pollset(grpc_transport* gt, grpc_stream* gs, - grpc_pollset* pollset) { +static void set_pollset(grpc_exec_ctx* exec_ctx, grpc_transport* gt, + grpc_stream* gs, grpc_pollset* pollset) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)gt; - grpc_endpoint_add_to_pollset(t->ep, pollset); + grpc_endpoint_add_to_pollset(exec_ctx, t->ep, pollset); } -static void set_pollset_set(grpc_transport* gt, grpc_stream* gs, - grpc_pollset_set* pollset_set) { +static void set_pollset_set(grpc_exec_ctx* exec_ctx, grpc_transport* gt, + grpc_stream* gs, grpc_pollset_set* pollset_set) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)gt; - grpc_endpoint_add_to_pollset_set(t->ep, pollset_set); + grpc_endpoint_add_to_pollset_set(exec_ctx, t->ep, pollset_set); } /******************************************************************************* * BYTE STREAM */ -static void reset_byte_stream(void* arg, grpc_error* error) { +static void reset_byte_stream(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_chttp2_stream* s = (grpc_chttp2_stream*)arg; s->pending_byte_stream = false; if (error == GRPC_ERROR_NONE) { - grpc_chttp2_maybe_complete_recv_message(s->t, s); - grpc_chttp2_maybe_complete_recv_trailing_metadata(s->t, s); + grpc_chttp2_maybe_complete_recv_message(exec_ctx, s->t, s); + grpc_chttp2_maybe_complete_recv_trailing_metadata(exec_ctx, s->t, s); } else { GPR_ASSERT(error != GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(s->on_next, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(exec_ctx, s->on_next, GRPC_ERROR_REF(error)); s->on_next = nullptr; GRPC_ERROR_UNREF(s->byte_stream_error); s->byte_stream_error = GRPC_ERROR_NONE; - grpc_chttp2_cancel_stream(s->t, s, GRPC_ERROR_REF(error)); + grpc_chttp2_cancel_stream(exec_ctx, s->t, s, GRPC_ERROR_REF(error)); s->byte_stream_error = GRPC_ERROR_REF(error); } } -static void incoming_byte_stream_unref(grpc_chttp2_incoming_byte_stream* bs) { +static void incoming_byte_stream_unref(grpc_exec_ctx* exec_ctx, + grpc_chttp2_incoming_byte_stream* bs) { if (gpr_unref(&bs->refs)) { gpr_free(bs); } } -static void incoming_byte_stream_next_locked(void* argp, +static void incoming_byte_stream_next_locked(grpc_exec_ctx* exec_ctx, + void* argp, grpc_error* error_ignored) { grpc_chttp2_incoming_byte_stream* bs = (grpc_chttp2_incoming_byte_stream*)argp; @@ -2714,29 +2849,30 @@ static void incoming_byte_stream_next_locked(void* argp, if (!s->read_closed) { s->flow_control->IncomingByteStreamUpdate(bs->next_action.max_size_hint, cur_length); - grpc_chttp2_act_on_flowctl_action(s->flow_control->MakeAction(), t, s); + grpc_chttp2_act_on_flowctl_action(exec_ctx, s->flow_control->MakeAction(), + t, s); } GPR_ASSERT(s->unprocessed_incoming_frames_buffer.length == 0); if (s->frame_storage.length > 0) { grpc_slice_buffer_swap(&s->frame_storage, &s->unprocessed_incoming_frames_buffer); s->unprocessed_incoming_frames_decompressed = false; - GRPC_CLOSURE_SCHED(bs->next_action.on_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, bs->next_action.on_complete, GRPC_ERROR_NONE); } else if (s->byte_stream_error != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(bs->next_action.on_complete, + GRPC_CLOSURE_SCHED(exec_ctx, bs->next_action.on_complete, GRPC_ERROR_REF(s->byte_stream_error)); if (s->data_parser.parsing_frame != nullptr) { - incoming_byte_stream_unref(s->data_parser.parsing_frame); + incoming_byte_stream_unref(exec_ctx, s->data_parser.parsing_frame); s->data_parser.parsing_frame = nullptr; } } else if (s->read_closed) { if (bs->remaining_bytes != 0) { s->byte_stream_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Truncated message"); - GRPC_CLOSURE_SCHED(bs->next_action.on_complete, + GRPC_CLOSURE_SCHED(exec_ctx, bs->next_action.on_complete, GRPC_ERROR_REF(s->byte_stream_error)); if (s->data_parser.parsing_frame != nullptr) { - incoming_byte_stream_unref(s->data_parser.parsing_frame); + incoming_byte_stream_unref(exec_ctx, s->data_parser.parsing_frame); s->data_parser.parsing_frame = nullptr; } } else { @@ -2746,10 +2882,11 @@ static void incoming_byte_stream_next_locked(void* argp, } else { s->on_next = bs->next_action.on_complete; } - incoming_byte_stream_unref(bs); + incoming_byte_stream_unref(exec_ctx, bs); } -static bool incoming_byte_stream_next(grpc_byte_stream* byte_stream, +static bool incoming_byte_stream_next(grpc_exec_ctx* exec_ctx, + grpc_byte_stream* byte_stream, size_t max_size_hint, grpc_closure* on_complete) { GPR_TIMER_BEGIN("incoming_byte_stream_next", 0); @@ -2764,6 +2901,7 @@ static bool incoming_byte_stream_next(grpc_byte_stream* byte_stream, bs->next_action.max_size_hint = max_size_hint; bs->next_action.on_complete = on_complete; GRPC_CLOSURE_SCHED( + exec_ctx, GRPC_CLOSURE_INIT(&bs->next_action.closure, incoming_byte_stream_next_locked, bs, grpc_combiner_scheduler(bs->transport->combiner)), @@ -2773,7 +2911,8 @@ static bool incoming_byte_stream_next(grpc_byte_stream* byte_stream, } } -static grpc_error* incoming_byte_stream_pull(grpc_byte_stream* byte_stream, +static grpc_error* incoming_byte_stream_pull(grpc_exec_ctx* exec_ctx, + grpc_byte_stream* byte_stream, grpc_slice* slice) { GPR_TIMER_BEGIN("incoming_byte_stream_pull", 0); grpc_chttp2_incoming_byte_stream* bs = @@ -2809,28 +2948,31 @@ static grpc_error* incoming_byte_stream_pull(grpc_byte_stream* byte_stream, } } error = grpc_deframe_unprocessed_incoming_frames( - &s->data_parser, s, &s->unprocessed_incoming_frames_buffer, slice, - nullptr); + exec_ctx, &s->data_parser, s, &s->unprocessed_incoming_frames_buffer, + slice, nullptr); if (error != GRPC_ERROR_NONE) { return error; } } else { error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Truncated message"); - GRPC_CLOSURE_SCHED(&s->reset_byte_stream, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(exec_ctx, &s->reset_byte_stream, GRPC_ERROR_REF(error)); return error; } GPR_TIMER_END("incoming_byte_stream_pull", 0); return GRPC_ERROR_NONE; } -static void incoming_byte_stream_destroy_locked(void* byte_stream, +static void incoming_byte_stream_destroy_locked(grpc_exec_ctx* exec_ctx, + void* byte_stream, grpc_error* error_ignored); -static void incoming_byte_stream_destroy(grpc_byte_stream* byte_stream) { +static void incoming_byte_stream_destroy(grpc_exec_ctx* exec_ctx, + grpc_byte_stream* byte_stream) { GPR_TIMER_BEGIN("incoming_byte_stream_destroy", 0); grpc_chttp2_incoming_byte_stream* bs = (grpc_chttp2_incoming_byte_stream*)byte_stream; GRPC_CLOSURE_SCHED( + exec_ctx, GRPC_CLOSURE_INIT(&bs->destroy_action, incoming_byte_stream_destroy_locked, bs, grpc_combiner_scheduler(bs->transport->combiner)), @@ -2839,28 +2981,30 @@ static void incoming_byte_stream_destroy(grpc_byte_stream* byte_stream) { } static void incoming_byte_stream_publish_error( - grpc_chttp2_incoming_byte_stream* bs, grpc_error* error) { + grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_byte_stream* bs, + grpc_error* error) { grpc_chttp2_stream* s = bs->stream; GPR_ASSERT(error != GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(s->on_next, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(exec_ctx, s->on_next, GRPC_ERROR_REF(error)); s->on_next = nullptr; GRPC_ERROR_UNREF(s->byte_stream_error); s->byte_stream_error = GRPC_ERROR_REF(error); - grpc_chttp2_cancel_stream(bs->transport, bs->stream, GRPC_ERROR_REF(error)); + grpc_chttp2_cancel_stream(exec_ctx, bs->transport, bs->stream, + GRPC_ERROR_REF(error)); } grpc_error* grpc_chttp2_incoming_byte_stream_push( - grpc_chttp2_incoming_byte_stream* bs, grpc_slice slice, - grpc_slice* slice_out) { + grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_byte_stream* bs, + grpc_slice slice, grpc_slice* slice_out) { grpc_chttp2_stream* s = bs->stream; if (bs->remaining_bytes < GRPC_SLICE_LENGTH(slice)) { grpc_error* error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Too many bytes in stream"); - GRPC_CLOSURE_SCHED(&s->reset_byte_stream, GRPC_ERROR_REF(error)); - grpc_slice_unref_internal(slice); + GRPC_CLOSURE_SCHED(exec_ctx, &s->reset_byte_stream, GRPC_ERROR_REF(error)); + grpc_slice_unref_internal(exec_ctx, slice); return error; } else { bs->remaining_bytes -= (uint32_t)GRPC_SLICE_LENGTH(slice); @@ -2872,8 +3016,8 @@ grpc_error* grpc_chttp2_incoming_byte_stream_push( } grpc_error* grpc_chttp2_incoming_byte_stream_finished( - grpc_chttp2_incoming_byte_stream* bs, grpc_error* error, - bool reset_on_error) { + grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_byte_stream* bs, + grpc_error* error, bool reset_on_error) { grpc_chttp2_stream* s = bs->stream; if (error == GRPC_ERROR_NONE) { @@ -2882,25 +3026,27 @@ grpc_error* grpc_chttp2_incoming_byte_stream_finished( } } if (error != GRPC_ERROR_NONE && reset_on_error) { - GRPC_CLOSURE_SCHED(&s->reset_byte_stream, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(exec_ctx, &s->reset_byte_stream, GRPC_ERROR_REF(error)); } - incoming_byte_stream_unref(bs); + incoming_byte_stream_unref(exec_ctx, bs); return error; } -static void incoming_byte_stream_shutdown(grpc_byte_stream* byte_stream, +static void incoming_byte_stream_shutdown(grpc_exec_ctx* exec_ctx, + grpc_byte_stream* byte_stream, grpc_error* error) { grpc_chttp2_incoming_byte_stream* bs = (grpc_chttp2_incoming_byte_stream*)byte_stream; GRPC_ERROR_UNREF(grpc_chttp2_incoming_byte_stream_finished( - bs, error, true /* reset_on_error */)); + exec_ctx, bs, error, true /* reset_on_error */)); } static const grpc_byte_stream_vtable grpc_chttp2_incoming_byte_stream_vtable = { incoming_byte_stream_next, incoming_byte_stream_pull, incoming_byte_stream_shutdown, incoming_byte_stream_destroy}; -static void incoming_byte_stream_destroy_locked(void* byte_stream, +static void incoming_byte_stream_destroy_locked(grpc_exec_ctx* exec_ctx, + void* byte_stream, grpc_error* error_ignored) { grpc_chttp2_incoming_byte_stream* bs = (grpc_chttp2_incoming_byte_stream*)byte_stream; @@ -2908,15 +3054,15 @@ static void incoming_byte_stream_destroy_locked(void* byte_stream, grpc_chttp2_transport* t = s->t; GPR_ASSERT(bs->base.vtable == &grpc_chttp2_incoming_byte_stream_vtable); - incoming_byte_stream_unref(bs); + incoming_byte_stream_unref(exec_ctx, bs); s->pending_byte_stream = false; - grpc_chttp2_maybe_complete_recv_message(t, s); - grpc_chttp2_maybe_complete_recv_trailing_metadata(t, s); + grpc_chttp2_maybe_complete_recv_message(exec_ctx, t, s); + grpc_chttp2_maybe_complete_recv_trailing_metadata(exec_ctx, t, s); } grpc_chttp2_incoming_byte_stream* grpc_chttp2_incoming_byte_stream_create( - grpc_chttp2_transport* t, grpc_chttp2_stream* s, uint32_t frame_size, - uint32_t flags) { + grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, grpc_chttp2_stream* s, + uint32_t frame_size, uint32_t flags) { grpc_chttp2_incoming_byte_stream* incoming_byte_stream = (grpc_chttp2_incoming_byte_stream*)gpr_malloc( sizeof(*incoming_byte_stream)); @@ -2936,25 +3082,30 @@ grpc_chttp2_incoming_byte_stream* grpc_chttp2_incoming_byte_stream_create( * RESOURCE QUOTAS */ -static void post_benign_reclaimer(grpc_chttp2_transport* t) { +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(grpc_endpoint_get_resource_user(t->ep), + grpc_resource_user_post_reclaimer(exec_ctx, + grpc_endpoint_get_resource_user(t->ep), false, &t->benign_reclaimer_locked); } } -static void post_destructive_reclaimer(grpc_chttp2_transport* t) { +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(grpc_endpoint_get_resource_user(t->ep), + grpc_resource_user_post_reclaimer(exec_ctx, + grpc_endpoint_get_resource_user(t->ep), true, &t->destructive_reclaimer_locked); } } -static void benign_reclaimer_locked(void* arg, grpc_error* error) { +static void benign_reclaimer_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)arg; if (error == GRPC_ERROR_NONE && grpc_chttp2_stream_map_size(&t->stream_map) == 0) { @@ -2964,7 +3115,7 @@ static void benign_reclaimer_locked(void* arg, grpc_error* error) { gpr_log(GPR_DEBUG, "HTTP2: %s - send goaway to free memory", t->peer_string); } - send_goaway(t, + send_goaway(exec_ctx, t, grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Buffers full"), GRPC_ERROR_INT_HTTP2_ERROR, GRPC_HTTP2_ENHANCE_YOUR_CALM)); @@ -2977,12 +3128,13 @@ static void benign_reclaimer_locked(void* arg, grpc_error* error) { t->benign_reclaimer_registered = false; if (error != GRPC_ERROR_CANCELLED) { grpc_resource_user_finish_reclamation( - grpc_endpoint_get_resource_user(t->ep)); + exec_ctx, grpc_endpoint_get_resource_user(t->ep)); } - GRPC_CHTTP2_UNREF_TRANSPORT(t, "benign_reclaimer"); + GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "benign_reclaimer"); } -static void destructive_reclaimer_locked(void* arg, grpc_error* error) { +static void destructive_reclaimer_locked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)arg; size_t n = grpc_chttp2_stream_map_size(&t->stream_map); t->destructive_reclaimer_registered = false; @@ -2994,7 +3146,7 @@ static void destructive_reclaimer_locked(void* arg, grpc_error* error) { s->id); } grpc_chttp2_cancel_stream( - t, s, + exec_ctx, t, s, grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING("Buffers full"), GRPC_ERROR_INT_HTTP2_ERROR, GRPC_HTTP2_ENHANCE_YOUR_CALM)); @@ -3003,14 +3155,14 @@ static void destructive_reclaimer_locked(void* arg, grpc_error* error) { 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(t); + post_destructive_reclaimer(exec_ctx, t); } } if (error != GRPC_ERROR_CANCELLED) { grpc_resource_user_finish_reclamation( - grpc_endpoint_get_resource_user(t->ep)); + exec_ctx, grpc_endpoint_get_resource_user(t->ep)); } - GRPC_CHTTP2_UNREF_TRANSPORT(t, "destructive_reclaimer"); + GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "destructive_reclaimer"); } /******************************************************************************* @@ -3064,7 +3216,8 @@ const char* grpc_chttp2_initiate_write_reason_string( GPR_UNREACHABLE_CODE(return "unknown"); } -static grpc_endpoint* chttp2_get_endpoint(grpc_transport* t) { +static grpc_endpoint* chttp2_get_endpoint(grpc_exec_ctx* exec_ctx, + grpc_transport* t) { return ((grpc_chttp2_transport*)t)->ep; } @@ -3082,16 +3235,17 @@ static const grpc_transport_vtable vtable = {sizeof(grpc_chttp2_stream), static const grpc_transport_vtable* get_vtable(void) { return &vtable; } grpc_transport* grpc_create_chttp2_transport( - const grpc_channel_args* channel_args, grpc_endpoint* ep, bool is_client) { + grpc_exec_ctx* exec_ctx, const grpc_channel_args* channel_args, + grpc_endpoint* ep, bool is_client) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)gpr_zalloc(sizeof(grpc_chttp2_transport)); - init_transport(t, channel_args, ep, is_client); + init_transport(exec_ctx, t, channel_args, ep, is_client); return &t->base; } void grpc_chttp2_transport_start_reading( - grpc_transport* transport, grpc_slice_buffer* read_buffer, - grpc_closure* notify_on_receive_settings) { + grpc_exec_ctx* exec_ctx, grpc_transport* transport, + grpc_slice_buffer* read_buffer, grpc_closure* notify_on_receive_settings) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)transport; GRPC_CHTTP2_REF_TRANSPORT( t, "reading_action"); /* matches unref inside reading_action */ @@ -3100,5 +3254,5 @@ void grpc_chttp2_transport_start_reading( gpr_free(read_buffer); } t->notify_on_receive_settings = notify_on_receive_settings; - GRPC_CLOSURE_SCHED(&t->read_action_locked, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &t->read_action_locked, GRPC_ERROR_NONE); } diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.h b/src/core/ext/transport/chttp2/transport/chttp2_transport.h index 596ababb194..bd72e07babe 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.h +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.h @@ -28,14 +28,15 @@ extern grpc_core::TraceFlag grpc_trace_http2_stream_state; extern grpc_core::DebugOnlyTraceFlag grpc_trace_chttp2_refcount; grpc_transport* grpc_create_chttp2_transport( - const grpc_channel_args* channel_args, grpc_endpoint* ep, bool is_client); + grpc_exec_ctx* exec_ctx, const grpc_channel_args* channel_args, + grpc_endpoint* ep, bool is_client); /// Takes ownership of \a read_buffer, which (if non-NULL) contains /// leftover bytes previously read from the endpoint (e.g., by handshakers). /// If non-null, \a notify_on_receive_settings will be scheduled when /// HTTP/2 settings are received from the peer. void grpc_chttp2_transport_start_reading( - grpc_transport* transport, grpc_slice_buffer* read_buffer, - grpc_closure* notify_on_receive_settings); + grpc_exec_ctx* exec_ctx, grpc_transport* transport, + grpc_slice_buffer* read_buffer, grpc_closure* notify_on_receive_settings); #endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CHTTP2_TRANSPORT_H */ diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc index ca48cc7e0a9..8a057bd9ff4 100644 --- a/src/core/ext/transport/chttp2/transport/flow_control.cc +++ b/src/core/ext/transport/chttp2/transport/flow_control.cc @@ -149,7 +149,8 @@ void FlowControlAction::Trace(grpc_chttp2_transport* t) const { gpr_free(mf_str); } -TransportFlowControl::TransportFlowControl(const grpc_chttp2_transport* t, +TransportFlowControl::TransportFlowControl(grpc_exec_ctx* exec_ctx, + const grpc_chttp2_transport* t, bool enable_bdp_probe) : t_(t), enable_bdp_probe_(enable_bdp_probe), @@ -162,7 +163,7 @@ TransportFlowControl::TransportFlowControl(const grpc_chttp2_transport* t, .set_min_control_value(-1) .set_max_control_value(25) .set_integral_range(10)), - last_pid_update_(grpc_core::ExecCtx::Get()->Now()) {} + last_pid_update_(grpc_exec_ctx_now(exec_ctx)) {} uint32_t TransportFlowControl::MaybeSendUpdate(bool writing_anyway) { FlowControlTrace trace("t updt sent", this, nullptr); @@ -307,8 +308,9 @@ double TransportFlowControl::TargetLogBdp() { 1 + log2(bdp_estimator_.EstimateBdp())); } -double TransportFlowControl::SmoothLogBdp(double value) { - grpc_millis now = grpc_core::ExecCtx::Get()->Now(); +double TransportFlowControl::SmoothLogBdp(grpc_exec_ctx* exec_ctx, + double value) { + grpc_millis now = grpc_exec_ctx_now(exec_ctx); double bdp_error = value - pid_controller_.last_control_value(); const double dt = (double)(now - last_pid_update_) * 1e-3; last_pid_update_ = now; @@ -329,14 +331,15 @@ FlowControlAction::Urgency TransportFlowControl::DeltaUrgency( } } -FlowControlAction TransportFlowControl::PeriodicUpdate() { +FlowControlAction TransportFlowControl::PeriodicUpdate( + grpc_exec_ctx* exec_ctx) { FlowControlAction action; if (enable_bdp_probe_) { // get bdp estimate and update initial_window accordingly. // target might change based on how much memory pressure we are under // TODO(ncteisen): experiment with setting target to be huge under low // memory pressure. - const double target = pow(2, SmoothLogBdp(TargetLogBdp())); + const double target = pow(2, SmoothLogBdp(exec_ctx, TargetLogBdp())); // Though initial window 'could' drop to 0, we keep the floor at 128 target_initial_window_size_ = (int32_t)GPR_CLAMP(target, 128, INT32_MAX); diff --git a/src/core/ext/transport/chttp2/transport/flow_control.h b/src/core/ext/transport/chttp2/transport/flow_control.h index 8306047dbc3..2515c94309a 100644 --- a/src/core/ext/transport/chttp2/transport/flow_control.h +++ b/src/core/ext/transport/chttp2/transport/flow_control.h @@ -134,7 +134,8 @@ class FlowControlTrace { class TransportFlowControl { public: - TransportFlowControl(const grpc_chttp2_transport* t, bool enable_bdp_probe); + TransportFlowControl(grpc_exec_ctx* exec_ctx, const grpc_chttp2_transport* t, + bool enable_bdp_probe); ~TransportFlowControl() {} bool bdp_probe() const { return enable_bdp_probe_; } @@ -152,7 +153,7 @@ class TransportFlowControl { // Call periodically (at a low-ish rate, 100ms - 10s makes sense) // to perform more complex flow control calculations and return an action // to let chttp2 change its parameters - FlowControlAction PeriodicUpdate(); + FlowControlAction PeriodicUpdate(grpc_exec_ctx* exec_ctx); void StreamSentData(int64_t size) { remote_window_ -= size; } @@ -211,7 +212,7 @@ class TransportFlowControl { private: friend class ::grpc::testing::TrickledCHTTP2; double TargetLogBdp(); - double SmoothLogBdp(double value); + double SmoothLogBdp(grpc_exec_ctx* exec_ctx, double value); FlowControlAction::Urgency DeltaUrgency(int32_t value, grpc_chttp2_setting_id setting_id); diff --git a/src/core/ext/transport/chttp2/transport/frame_data.cc b/src/core/ext/transport/chttp2/transport/frame_data.cc index 9b3a6acc9e4..f0c3b557922 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.cc +++ b/src/core/ext/transport/chttp2/transport/frame_data.cc @@ -36,10 +36,11 @@ grpc_error* grpc_chttp2_data_parser_init(grpc_chttp2_data_parser* parser) { return GRPC_ERROR_NONE; } -void grpc_chttp2_data_parser_destroy(grpc_chttp2_data_parser* parser) { +void grpc_chttp2_data_parser_destroy(grpc_exec_ctx* exec_ctx, + grpc_chttp2_data_parser* parser) { if (parser->parsing_frame != nullptr) { GRPC_ERROR_UNREF(grpc_chttp2_incoming_byte_stream_finished( - parser->parsing_frame, + exec_ctx, parser->parsing_frame, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Parser destroyed"), false)); } GRPC_ERROR_UNREF(parser->error); @@ -97,7 +98,7 @@ void grpc_chttp2_encode_data(uint32_t id, grpc_slice_buffer* inbuf, } grpc_error* grpc_deframe_unprocessed_incoming_frames( - grpc_chttp2_data_parser* p, grpc_chttp2_stream* s, + grpc_exec_ctx* exec_ctx, grpc_chttp2_data_parser* p, grpc_chttp2_stream* s, grpc_slice_buffer* slices, grpc_slice* slice_out, grpc_byte_stream** stream_out) { grpc_error* error = GRPC_ERROR_NONE; @@ -117,14 +118,14 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( char* msg; if (cur == end) { - grpc_slice_unref_internal(slice); + grpc_slice_unref_internal(exec_ctx, slice); continue; } switch (p->state) { case GRPC_CHTTP2_DATA_ERROR: p->state = GRPC_CHTTP2_DATA_ERROR; - grpc_slice_unref_internal(slice); + grpc_slice_unref_internal(exec_ctx, slice); return GRPC_ERROR_REF(p->error); case GRPC_CHTTP2_DATA_FH_0: s->stats.incoming.framing_bytes++; @@ -149,12 +150,12 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( p->error = grpc_error_set_int(p->error, GRPC_ERROR_INT_OFFSET, cur - beg); p->state = GRPC_CHTTP2_DATA_ERROR; - grpc_slice_unref_internal(slice); + grpc_slice_unref_internal(exec_ctx, slice); return GRPC_ERROR_REF(p->error); } if (++cur == end) { p->state = GRPC_CHTTP2_DATA_FH_1; - grpc_slice_unref_internal(slice); + grpc_slice_unref_internal(exec_ctx, slice); continue; } /* fallthrough */ @@ -163,7 +164,7 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( p->frame_size = ((uint32_t)*cur) << 24; if (++cur == end) { p->state = GRPC_CHTTP2_DATA_FH_2; - grpc_slice_unref_internal(slice); + grpc_slice_unref_internal(exec_ctx, slice); continue; } /* fallthrough */ @@ -172,7 +173,7 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( p->frame_size |= ((uint32_t)*cur) << 16; if (++cur == end) { p->state = GRPC_CHTTP2_DATA_FH_3; - grpc_slice_unref_internal(slice); + grpc_slice_unref_internal(exec_ctx, slice); continue; } /* fallthrough */ @@ -181,7 +182,7 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( p->frame_size |= ((uint32_t)*cur) << 8; if (++cur == end) { p->state = GRPC_CHTTP2_DATA_FH_4; - grpc_slice_unref_internal(slice); + grpc_slice_unref_internal(exec_ctx, slice); continue; } /* fallthrough */ @@ -197,11 +198,11 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( message_flags |= GRPC_WRITE_INTERNAL_COMPRESS; } p->parsing_frame = grpc_chttp2_incoming_byte_stream_create( - t, s, p->frame_size, message_flags); + exec_ctx, t, s, p->frame_size, message_flags); *stream_out = &p->parsing_frame->base; if (p->parsing_frame->remaining_bytes == 0) { GRPC_ERROR_UNREF(grpc_chttp2_incoming_byte_stream_finished( - p->parsing_frame, GRPC_ERROR_NONE, true)); + exec_ctx, p->parsing_frame, GRPC_ERROR_NONE, true)); p->parsing_frame = nullptr; p->state = GRPC_CHTTP2_DATA_FH_0; } @@ -212,64 +213,64 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( slices, grpc_slice_sub(slice, (size_t)(cur - beg), (size_t)(end - beg))); } - grpc_slice_unref_internal(slice); + grpc_slice_unref_internal(exec_ctx, slice); return GRPC_ERROR_NONE; case GRPC_CHTTP2_DATA_FRAME: { GPR_ASSERT(p->parsing_frame != nullptr); GPR_ASSERT(slice_out != nullptr); if (cur == end) { - grpc_slice_unref_internal(slice); + grpc_slice_unref_internal(exec_ctx, slice); continue; } uint32_t remaining = (uint32_t)(end - cur); if (remaining == p->frame_size) { s->stats.incoming.data_bytes += remaining; if (GRPC_ERROR_NONE != (error = grpc_chttp2_incoming_byte_stream_push( - p->parsing_frame, + exec_ctx, p->parsing_frame, grpc_slice_sub(slice, (size_t)(cur - beg), (size_t)(end - beg)), slice_out))) { - grpc_slice_unref_internal(slice); + grpc_slice_unref_internal(exec_ctx, slice); return error; } if (GRPC_ERROR_NONE != (error = grpc_chttp2_incoming_byte_stream_finished( - p->parsing_frame, GRPC_ERROR_NONE, true))) { - grpc_slice_unref_internal(slice); + exec_ctx, p->parsing_frame, GRPC_ERROR_NONE, true))) { + grpc_slice_unref_internal(exec_ctx, slice); return error; } p->parsing_frame = nullptr; p->state = GRPC_CHTTP2_DATA_FH_0; - grpc_slice_unref_internal(slice); + grpc_slice_unref_internal(exec_ctx, slice); return GRPC_ERROR_NONE; } else if (remaining < p->frame_size) { s->stats.incoming.data_bytes += remaining; if (GRPC_ERROR_NONE != (error = grpc_chttp2_incoming_byte_stream_push( - p->parsing_frame, + exec_ctx, p->parsing_frame, grpc_slice_sub(slice, (size_t)(cur - beg), (size_t)(end - beg)), slice_out))) { return error; } p->frame_size -= remaining; - grpc_slice_unref_internal(slice); + grpc_slice_unref_internal(exec_ctx, slice); return GRPC_ERROR_NONE; } else { GPR_ASSERT(remaining > p->frame_size); s->stats.incoming.data_bytes += p->frame_size; if (GRPC_ERROR_NONE != (grpc_chttp2_incoming_byte_stream_push( - p->parsing_frame, + exec_ctx, p->parsing_frame, grpc_slice_sub(slice, (size_t)(cur - beg), (size_t)(cur + p->frame_size - beg)), slice_out))) { - grpc_slice_unref_internal(slice); + grpc_slice_unref_internal(exec_ctx, slice); return error; } if (GRPC_ERROR_NONE != (error = grpc_chttp2_incoming_byte_stream_finished( - p->parsing_frame, GRPC_ERROR_NONE, true))) { - grpc_slice_unref_internal(slice); + exec_ctx, p->parsing_frame, GRPC_ERROR_NONE, true))) { + grpc_slice_unref_internal(exec_ctx, slice); return error; } p->parsing_frame = nullptr; @@ -278,7 +279,7 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( grpc_slice_buffer_undo_take_first( slices, grpc_slice_sub(slice, (size_t)(cur - beg), (size_t)(end - beg))); - grpc_slice_unref_internal(slice); + grpc_slice_unref_internal(exec_ctx, slice); return GRPC_ERROR_NONE; } } @@ -288,19 +289,19 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( return GRPC_ERROR_NONE; } -grpc_error* grpc_chttp2_data_parser_parse(void* parser, +grpc_error* grpc_chttp2_data_parser_parse(grpc_exec_ctx* exec_ctx, void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last) { if (!s->pending_byte_stream) { grpc_slice_ref_internal(slice); grpc_slice_buffer_add(&s->frame_storage, slice); - grpc_chttp2_maybe_complete_recv_message(t, s); + grpc_chttp2_maybe_complete_recv_message(exec_ctx, t, s); } else if (s->on_next) { GPR_ASSERT(s->frame_storage.length == 0); grpc_slice_ref_internal(slice); grpc_slice_buffer_add(&s->unprocessed_incoming_frames_buffer, slice); - GRPC_CLOSURE_SCHED(s->on_next, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, s->on_next, GRPC_ERROR_NONE); s->on_next = nullptr; s->unprocessed_incoming_frames_decompressed = false; } else { @@ -309,7 +310,8 @@ grpc_error* grpc_chttp2_data_parser_parse(void* parser, } if (is_last && s->received_last_frame) { - grpc_chttp2_mark_stream_closed(t, s, true, false, GRPC_ERROR_NONE); + grpc_chttp2_mark_stream_closed(exec_ctx, t, s, true, false, + GRPC_ERROR_NONE); } return GRPC_ERROR_NONE; diff --git a/src/core/ext/transport/chttp2/transport/frame_data.h b/src/core/ext/transport/chttp2/transport/frame_data.h index 964cc59b1bd..4de553ea426 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.h +++ b/src/core/ext/transport/chttp2/transport/frame_data.h @@ -54,7 +54,8 @@ typedef struct { /* initialize per-stream state for data frame parsing */ grpc_error* grpc_chttp2_data_parser_init(grpc_chttp2_data_parser* parser); -void grpc_chttp2_data_parser_destroy(grpc_chttp2_data_parser* parser); +void grpc_chttp2_data_parser_destroy(grpc_exec_ctx* exec_ctx, + grpc_chttp2_data_parser* parser); /* start processing a new data frame */ grpc_error* grpc_chttp2_data_parser_begin_frame(grpc_chttp2_data_parser* parser, @@ -64,7 +65,7 @@ grpc_error* grpc_chttp2_data_parser_begin_frame(grpc_chttp2_data_parser* parser, /* handle a slice of a data frame - is_last indicates the last slice of a frame */ -grpc_error* grpc_chttp2_data_parser_parse(void* parser, +grpc_error* grpc_chttp2_data_parser_parse(grpc_exec_ctx* exec_ctx, void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last); @@ -75,7 +76,7 @@ void grpc_chttp2_encode_data(uint32_t id, grpc_slice_buffer* inbuf, grpc_slice_buffer* outbuf); grpc_error* grpc_deframe_unprocessed_incoming_frames( - grpc_chttp2_data_parser* p, grpc_chttp2_stream* s, + grpc_exec_ctx* exec_ctx, grpc_chttp2_data_parser* p, grpc_chttp2_stream* s, grpc_slice_buffer* slices, grpc_slice* slice_out, grpc_byte_stream** stream_out); diff --git a/src/core/ext/transport/chttp2/transport/frame_goaway.cc b/src/core/ext/transport/chttp2/transport/frame_goaway.cc index b60b4227fef..a2ce709a2e4 100644 --- a/src/core/ext/transport/chttp2/transport/frame_goaway.cc +++ b/src/core/ext/transport/chttp2/transport/frame_goaway.cc @@ -52,7 +52,8 @@ grpc_error* grpc_chttp2_goaway_parser_begin_frame(grpc_chttp2_goaway_parser* p, return GRPC_ERROR_NONE; } -grpc_error* grpc_chttp2_goaway_parser_parse(void* parser, +grpc_error* grpc_chttp2_goaway_parser_parse(grpc_exec_ctx* exec_ctx, + void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last) { @@ -134,7 +135,7 @@ grpc_error* grpc_chttp2_goaway_parser_parse(void* parser, p->state = GRPC_CHTTP2_GOAWAY_DEBUG; if (is_last) { grpc_chttp2_add_incoming_goaway( - t, (uint32_t)p->error_code, + exec_ctx, t, (uint32_t)p->error_code, grpc_slice_new(p->debug_data, p->debug_length, gpr_free)); p->debug_data = nullptr; } diff --git a/src/core/ext/transport/chttp2/transport/frame_goaway.h b/src/core/ext/transport/chttp2/transport/frame_goaway.h index 064d39ac595..743e763342d 100644 --- a/src/core/ext/transport/chttp2/transport/frame_goaway.h +++ b/src/core/ext/transport/chttp2/transport/frame_goaway.h @@ -50,7 +50,8 @@ void grpc_chttp2_goaway_parser_init(grpc_chttp2_goaway_parser* p); void grpc_chttp2_goaway_parser_destroy(grpc_chttp2_goaway_parser* p); grpc_error* grpc_chttp2_goaway_parser_begin_frame( grpc_chttp2_goaway_parser* parser, uint32_t length, uint8_t flags); -grpc_error* grpc_chttp2_goaway_parser_parse(void* parser, +grpc_error* grpc_chttp2_goaway_parser_parse(grpc_exec_ctx* exec_ctx, + void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last); diff --git a/src/core/ext/transport/chttp2/transport/frame_ping.cc b/src/core/ext/transport/chttp2/transport/frame_ping.cc index 298a56721a3..d0feb519225 100644 --- a/src/core/ext/transport/chttp2/transport/frame_ping.cc +++ b/src/core/ext/transport/chttp2/transport/frame_ping.cc @@ -68,7 +68,7 @@ grpc_error* grpc_chttp2_ping_parser_begin_frame(grpc_chttp2_ping_parser* parser, return GRPC_ERROR_NONE; } -grpc_error* grpc_chttp2_ping_parser_parse(void* parser, +grpc_error* grpc_chttp2_ping_parser_parse(grpc_exec_ctx* exec_ctx, void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last) { @@ -86,10 +86,10 @@ grpc_error* grpc_chttp2_ping_parser_parse(void* parser, if (p->byte == 8) { GPR_ASSERT(is_last); if (p->is_ack) { - grpc_chttp2_ack_ping(t, p->opaque_8bytes); + grpc_chttp2_ack_ping(exec_ctx, t, p->opaque_8bytes); } else { if (!t->is_client) { - grpc_millis now = grpc_core::ExecCtx::Get()->Now(); + grpc_millis now = grpc_exec_ctx_now(exec_ctx); grpc_millis next_allowed_ping = t->ping_recv_state.last_ping_recv_time + t->ping_policy.min_recv_ping_interval_without_data; @@ -104,7 +104,7 @@ grpc_error* grpc_chttp2_ping_parser_parse(void* parser, } if (next_allowed_ping > now) { - grpc_chttp2_add_ping_strike(t); + grpc_chttp2_add_ping_strike(exec_ctx, t); } t->ping_recv_state.last_ping_recv_time = now; @@ -116,7 +116,8 @@ grpc_error* grpc_chttp2_ping_parser_parse(void* parser, t->ping_acks, t->ping_ack_capacity * sizeof(*t->ping_acks)); } t->ping_acks[t->ping_ack_count++] = p->opaque_8bytes; - grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_PING_RESPONSE); + grpc_chttp2_initiate_write(exec_ctx, t, + GRPC_CHTTP2_INITIATE_WRITE_PING_RESPONSE); } } } diff --git a/src/core/ext/transport/chttp2/transport/frame_ping.h b/src/core/ext/transport/chttp2/transport/frame_ping.h index 75bacfb1d4f..76ca3977091 100644 --- a/src/core/ext/transport/chttp2/transport/frame_ping.h +++ b/src/core/ext/transport/chttp2/transport/frame_ping.h @@ -33,7 +33,7 @@ grpc_slice grpc_chttp2_ping_create(uint8_t ack, uint64_t opaque_8bytes); grpc_error* grpc_chttp2_ping_parser_begin_frame(grpc_chttp2_ping_parser* parser, uint32_t length, uint8_t flags); -grpc_error* grpc_chttp2_ping_parser_parse(void* parser, +grpc_error* grpc_chttp2_ping_parser_parse(grpc_exec_ctx* exec_ctx, void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last); diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc index fee576678dd..05a7f056a44 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc @@ -69,7 +69,8 @@ grpc_error* grpc_chttp2_rst_stream_parser_begin_frame( return GRPC_ERROR_NONE; } -grpc_error* grpc_chttp2_rst_stream_parser_parse(void* parser, +grpc_error* grpc_chttp2_rst_stream_parser_parse(grpc_exec_ctx* exec_ctx, + void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last) { @@ -102,7 +103,7 @@ grpc_error* grpc_chttp2_rst_stream_parser_parse(void* parser, GRPC_ERROR_INT_HTTP2_ERROR, (intptr_t)reason); gpr_free(message); } - grpc_chttp2_mark_stream_closed(t, s, true, true, error); + grpc_chttp2_mark_stream_closed(exec_ctx, t, s, true, true, error); } return GRPC_ERROR_NONE; diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.h b/src/core/ext/transport/chttp2/transport/frame_rst_stream.h index e76a3ca8415..7dfc5d4578b 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.h +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.h @@ -34,7 +34,8 @@ grpc_slice grpc_chttp2_rst_stream_create(uint32_t stream_id, uint32_t code, grpc_error* grpc_chttp2_rst_stream_parser_begin_frame( grpc_chttp2_rst_stream_parser* parser, uint32_t length, uint8_t flags); -grpc_error* grpc_chttp2_rst_stream_parser_parse(void* parser, +grpc_error* grpc_chttp2_rst_stream_parser_parse(grpc_exec_ctx* exec_ctx, + void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last); diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.cc b/src/core/ext/transport/chttp2/transport/frame_settings.cc index c6c2a6c301b..de4340fea50 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.cc +++ b/src/core/ext/transport/chttp2/transport/frame_settings.cc @@ -108,7 +108,8 @@ grpc_error* grpc_chttp2_settings_parser_begin_frame( } } -grpc_error* grpc_chttp2_settings_parser_parse(void* p, grpc_chttp2_transport* t, +grpc_error* grpc_chttp2_settings_parser_parse(grpc_exec_ctx* exec_ctx, void* p, + grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last) { grpc_chttp2_settings_parser* parser = (grpc_chttp2_settings_parser*)p; @@ -131,7 +132,7 @@ grpc_error* grpc_chttp2_settings_parser_parse(void* p, grpc_chttp2_transport* t, GRPC_CHTTP2_NUM_SETTINGS * sizeof(uint32_t)); grpc_slice_buffer_add(&t->qbuf, grpc_chttp2_settings_ack_create()); if (t->notify_on_receive_settings != nullptr) { - GRPC_CLOSURE_SCHED(t->notify_on_receive_settings, + GRPC_CLOSURE_SCHED(exec_ctx, t->notify_on_receive_settings, GRPC_ERROR_NONE); t->notify_on_receive_settings = nullptr; } diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.h b/src/core/ext/transport/chttp2/transport/frame_settings.h index ce654028152..36e2ca83a0f 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.h +++ b/src/core/ext/transport/chttp2/transport/frame_settings.h @@ -52,7 +52,8 @@ grpc_slice grpc_chttp2_settings_ack_create(void); grpc_error* grpc_chttp2_settings_parser_begin_frame( grpc_chttp2_settings_parser* parser, uint32_t length, uint8_t flags, uint32_t* settings); -grpc_error* grpc_chttp2_settings_parser_parse(void* parser, +grpc_error* grpc_chttp2_settings_parser_parse(grpc_exec_ctx* exec_ctx, + void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last); diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.cc b/src/core/ext/transport/chttp2/transport/frame_window_update.cc index 418ca144cec..08407a8e671 100644 --- a/src/core/ext/transport/chttp2/transport/frame_window_update.cc +++ b/src/core/ext/transport/chttp2/transport/frame_window_update.cc @@ -64,11 +64,9 @@ grpc_error* grpc_chttp2_window_update_parser_begin_frame( return GRPC_ERROR_NONE; } -grpc_error* grpc_chttp2_window_update_parser_parse(void* parser, - grpc_chttp2_transport* t, - grpc_chttp2_stream* s, - grpc_slice slice, - int is_last) { +grpc_error* grpc_chttp2_window_update_parser_parse( + grpc_exec_ctx* exec_ctx, void* parser, grpc_chttp2_transport* t, + grpc_chttp2_stream* s, grpc_slice slice, int is_last) { uint8_t* const beg = GRPC_SLICE_START_PTR(slice); uint8_t* const end = GRPC_SLICE_END_PTR(slice); uint8_t* cur = beg; @@ -100,9 +98,10 @@ grpc_error* grpc_chttp2_window_update_parser_parse(void* parser, if (s != nullptr) { s->flow_control->RecvUpdate(received_update); if (grpc_chttp2_list_remove_stalled_by_stream(t, s)) { - grpc_chttp2_mark_stream_writable(t, s); + grpc_chttp2_mark_stream_writable(exec_ctx, t, s); grpc_chttp2_initiate_write( - t, GRPC_CHTTP2_INITIATE_WRITE_FLOW_CONTROL_UNSTALLED_BY_UPDATE); + exec_ctx, t, + GRPC_CHTTP2_INITIATE_WRITE_FLOW_CONTROL_UNSTALLED_BY_UPDATE); } } } else { @@ -111,7 +110,8 @@ grpc_error* grpc_chttp2_window_update_parser_parse(void* parser, bool is_zero = t->flow_control->remote_window() <= 0; if (was_zero && !is_zero) { grpc_chttp2_initiate_write( - t, GRPC_CHTTP2_INITIATE_WRITE_TRANSPORT_FLOW_CONTROL_UNSTALLED); + exec_ctx, t, + GRPC_CHTTP2_INITIATE_WRITE_TRANSPORT_FLOW_CONTROL_UNSTALLED); } } } diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.h b/src/core/ext/transport/chttp2/transport/frame_window_update.h index a32f1a9d11e..e031b585faa 100644 --- a/src/core/ext/transport/chttp2/transport/frame_window_update.h +++ b/src/core/ext/transport/chttp2/transport/frame_window_update.h @@ -35,10 +35,8 @@ grpc_slice grpc_chttp2_window_update_create( grpc_error* grpc_chttp2_window_update_parser_begin_frame( grpc_chttp2_window_update_parser* parser, uint32_t length, uint8_t flags); -grpc_error* grpc_chttp2_window_update_parser_parse(void* parser, - grpc_chttp2_transport* t, - grpc_chttp2_stream* s, - grpc_slice slice, - int is_last); +grpc_error* grpc_chttp2_window_update_parser_parse( + grpc_exec_ctx* exec_ctx, void* parser, grpc_chttp2_transport* t, + grpc_chttp2_stream* s, grpc_slice slice, int is_last); #endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_WINDOW_UPDATE_H */ diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc index 3a5692a6949..e76d92e31d4 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc @@ -206,12 +206,14 @@ static uint32_t prepare_space_for_new_elem(grpc_chttp2_hpack_compressor* c, } /* dummy function */ -static void add_nothing(grpc_chttp2_hpack_compressor* c, grpc_mdelem elem, +static void add_nothing(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_compressor* c, grpc_mdelem elem, size_t elem_size) {} // Add a key to the dynamic table. Both key and value will be added to table at // the decoder. -static void add_key_with_index(grpc_chttp2_hpack_compressor* c, +static void add_key_with_index(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_compressor* c, grpc_mdelem elem, uint32_t new_index) { if (new_index == 0) { return; @@ -238,12 +240,14 @@ static void add_key_with_index(grpc_chttp2_hpack_compressor* c, c->indices_keys[HASH_FRAGMENT_3(key_hash)] = new_index; } else if (c->indices_keys[HASH_FRAGMENT_2(key_hash)] < c->indices_keys[HASH_FRAGMENT_3(key_hash)]) { - grpc_slice_unref_internal(c->entries_keys[HASH_FRAGMENT_2(key_hash)]); + grpc_slice_unref_internal(exec_ctx, + c->entries_keys[HASH_FRAGMENT_2(key_hash)]); c->entries_keys[HASH_FRAGMENT_2(key_hash)] = grpc_slice_ref_internal(GRPC_MDKEY(elem)); c->indices_keys[HASH_FRAGMENT_2(key_hash)] = new_index; } else { - grpc_slice_unref_internal(c->entries_keys[HASH_FRAGMENT_3(key_hash)]); + grpc_slice_unref_internal(exec_ctx, + c->entries_keys[HASH_FRAGMENT_3(key_hash)]); c->entries_keys[HASH_FRAGMENT_3(key_hash)] = grpc_slice_ref_internal(GRPC_MDKEY(elem)); c->indices_keys[HASH_FRAGMENT_3(key_hash)] = new_index; @@ -251,7 +255,8 @@ static void add_key_with_index(grpc_chttp2_hpack_compressor* c, } /* add an element to the decoder table */ -static void add_elem_with_index(grpc_chttp2_hpack_compressor* c, +static void add_elem_with_index(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_compressor* c, grpc_mdelem elem, uint32_t new_index) { if (new_index == 0) { return; @@ -281,34 +286,35 @@ static void add_elem_with_index(grpc_chttp2_hpack_compressor* c, } else if (c->indices_elems[HASH_FRAGMENT_2(elem_hash)] < c->indices_elems[HASH_FRAGMENT_3(elem_hash)]) { /* not there: replace oldest */ - GRPC_MDELEM_UNREF(c->entries_elems[HASH_FRAGMENT_2(elem_hash)]); + GRPC_MDELEM_UNREF(exec_ctx, c->entries_elems[HASH_FRAGMENT_2(elem_hash)]); c->entries_elems[HASH_FRAGMENT_2(elem_hash)] = GRPC_MDELEM_REF(elem); c->indices_elems[HASH_FRAGMENT_2(elem_hash)] = new_index; } else { /* not there: replace oldest */ - GRPC_MDELEM_UNREF(c->entries_elems[HASH_FRAGMENT_3(elem_hash)]); + GRPC_MDELEM_UNREF(exec_ctx, c->entries_elems[HASH_FRAGMENT_3(elem_hash)]); c->entries_elems[HASH_FRAGMENT_3(elem_hash)] = GRPC_MDELEM_REF(elem); c->indices_elems[HASH_FRAGMENT_3(elem_hash)] = new_index; } - add_key_with_index(c, elem, new_index); + add_key_with_index(exec_ctx, c, elem, new_index); } -static void add_elem(grpc_chttp2_hpack_compressor* c, grpc_mdelem elem, - size_t elem_size) { +static void add_elem(grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_compressor* c, + grpc_mdelem elem, size_t elem_size) { uint32_t new_index = prepare_space_for_new_elem(c, elem_size); - add_elem_with_index(c, elem, new_index); + add_elem_with_index(exec_ctx, c, elem, new_index); } -static void add_key(grpc_chttp2_hpack_compressor* c, grpc_mdelem elem, - size_t elem_size) { +static void add_key(grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_compressor* c, + grpc_mdelem elem, size_t elem_size) { uint32_t new_index = prepare_space_for_new_elem(c, elem_size); - add_key_with_index(c, elem, new_index); + add_key_with_index(exec_ctx, c, elem, new_index); } -static void emit_indexed(grpc_chttp2_hpack_compressor* c, uint32_t elem_index, +static void emit_indexed(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_compressor* c, uint32_t elem_index, framer_state* st) { - GRPC_STATS_INC_HPACK_SEND_INDEXED(); + GRPC_STATS_INC_HPACK_SEND_INDEXED(exec_ctx); uint32_t len = GRPC_CHTTP2_VARINT_LENGTH(elem_index, 1); GRPC_CHTTP2_WRITE_VARINT(elem_index, 1, 0x80, add_tiny_header_data(st, len), len); @@ -320,17 +326,18 @@ typedef struct { bool insert_null_before_wire_value; } wire_value; -static wire_value get_wire_value(grpc_mdelem elem, bool true_binary_enabled) { +static wire_value get_wire_value(grpc_exec_ctx* exec_ctx, grpc_mdelem elem, + bool true_binary_enabled) { wire_value wire_val; if (grpc_is_binary_header(GRPC_MDKEY(elem))) { if (true_binary_enabled) { - GRPC_STATS_INC_HPACK_SEND_BINARY(); + GRPC_STATS_INC_HPACK_SEND_BINARY(exec_ctx); wire_val.huffman_prefix = 0x00; wire_val.insert_null_before_wire_value = true; wire_val.data = grpc_slice_ref_internal(GRPC_MDVALUE(elem)); } else { - GRPC_STATS_INC_HPACK_SEND_BINARY_BASE64(); + GRPC_STATS_INC_HPACK_SEND_BINARY_BASE64(exec_ctx); wire_val.huffman_prefix = 0x80; wire_val.insert_null_before_wire_value = false; wire_val.data = @@ -338,7 +345,7 @@ static wire_value get_wire_value(grpc_mdelem elem, bool true_binary_enabled) { } } else { /* TODO(ctiller): opportunistically compress non-binary headers */ - GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(); + GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(exec_ctx); wire_val.huffman_prefix = 0x00; wire_val.insert_null_before_wire_value = false; wire_val.data = grpc_slice_ref_internal(GRPC_MDVALUE(elem)); @@ -355,12 +362,14 @@ static void add_wire_value(framer_state* st, wire_value v) { add_header_data(st, v.data); } -static void emit_lithdr_incidx(grpc_chttp2_hpack_compressor* c, +static void emit_lithdr_incidx(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_compressor* c, uint32_t key_index, grpc_mdelem elem, framer_state* st) { - GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX(); + GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX(exec_ctx); uint32_t len_pfx = GRPC_CHTTP2_VARINT_LENGTH(key_index, 2); - wire_value value = get_wire_value(elem, st->use_true_binary_metadata); + wire_value value = + get_wire_value(exec_ctx, elem, st->use_true_binary_metadata); size_t len_val = wire_value_length(value); uint32_t len_val_len; GPR_ASSERT(len_val <= UINT32_MAX); @@ -372,12 +381,14 @@ static void emit_lithdr_incidx(grpc_chttp2_hpack_compressor* c, add_wire_value(st, value); } -static void emit_lithdr_noidx(grpc_chttp2_hpack_compressor* c, +static void emit_lithdr_noidx(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_compressor* c, uint32_t key_index, grpc_mdelem elem, framer_state* st) { - GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX(); + GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX(exec_ctx); uint32_t len_pfx = GRPC_CHTTP2_VARINT_LENGTH(key_index, 4); - wire_value value = get_wire_value(elem, st->use_true_binary_metadata); + wire_value value = + get_wire_value(exec_ctx, elem, st->use_true_binary_metadata); size_t len_val = wire_value_length(value); uint32_t len_val_len; GPR_ASSERT(len_val <= UINT32_MAX); @@ -389,14 +400,16 @@ static void emit_lithdr_noidx(grpc_chttp2_hpack_compressor* c, add_wire_value(st, value); } -static void emit_lithdr_incidx_v(grpc_chttp2_hpack_compressor* c, +static void emit_lithdr_incidx_v(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_compressor* c, uint32_t unused_index, grpc_mdelem elem, framer_state* st) { GPR_ASSERT(unused_index == 0); - GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX_V(); - GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(); + GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX_V(exec_ctx); + GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(exec_ctx); uint32_t len_key = (uint32_t)GRPC_SLICE_LENGTH(GRPC_MDKEY(elem)); - wire_value value = get_wire_value(elem, st->use_true_binary_metadata); + wire_value value = + get_wire_value(exec_ctx, elem, st->use_true_binary_metadata); uint32_t len_val = (uint32_t)wire_value_length(value); uint32_t len_key_len = GRPC_CHTTP2_VARINT_LENGTH(len_key, 1); uint32_t len_val_len = GRPC_CHTTP2_VARINT_LENGTH(len_val, 1); @@ -411,14 +424,16 @@ static void emit_lithdr_incidx_v(grpc_chttp2_hpack_compressor* c, add_wire_value(st, value); } -static void emit_lithdr_noidx_v(grpc_chttp2_hpack_compressor* c, +static void emit_lithdr_noidx_v(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_compressor* c, uint32_t unused_index, grpc_mdelem elem, framer_state* st) { GPR_ASSERT(unused_index == 0); - GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX_V(); - GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(); + GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX_V(exec_ctx); + GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(exec_ctx); uint32_t len_key = (uint32_t)GRPC_SLICE_LENGTH(GRPC_MDKEY(elem)); - wire_value value = get_wire_value(elem, st->use_true_binary_metadata); + wire_value value = + get_wire_value(exec_ctx, elem, st->use_true_binary_metadata); uint32_t len_val = (uint32_t)wire_value_length(value); uint32_t len_key_len = GRPC_CHTTP2_VARINT_LENGTH(len_key, 1); uint32_t len_val_len = GRPC_CHTTP2_VARINT_LENGTH(len_val, 1); @@ -447,8 +462,8 @@ static uint32_t dynidx(grpc_chttp2_hpack_compressor* c, uint32_t elem_index) { } /* encode an mdelem */ -static void hpack_enc(grpc_chttp2_hpack_compressor* c, grpc_mdelem elem, - framer_state* st) { +static void hpack_enc(grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_compressor* c, + grpc_mdelem elem, framer_state* st) { GPR_ASSERT(GRPC_SLICE_LENGTH(GRPC_MDKEY(elem)) > 0); if (GRPC_SLICE_START_PTR(GRPC_MDKEY(elem))[0] != ':') { /* regular header */ st->seen_regular_header = 1; @@ -481,7 +496,7 @@ static void hpack_enc(grpc_chttp2_hpack_compressor* c, grpc_mdelem elem, // Key is not interned, emit literals. if (!key_interned) { - emit_lithdr_noidx_v(c, 0, elem, st); + emit_lithdr_noidx_v(exec_ctx, c, 0, elem, st); return; } @@ -500,16 +515,16 @@ static void hpack_enc(grpc_chttp2_hpack_compressor* c, grpc_mdelem elem, if (grpc_mdelem_eq(c->entries_elems[HASH_FRAGMENT_2(elem_hash)], elem) && c->indices_elems[HASH_FRAGMENT_2(elem_hash)] > c->tail_remote_index) { /* HIT: complete element (first cuckoo hash) */ - emit_indexed(c, dynidx(c, c->indices_elems[HASH_FRAGMENT_2(elem_hash)]), - st); + emit_indexed(exec_ctx, c, + dynidx(c, c->indices_elems[HASH_FRAGMENT_2(elem_hash)]), st); return; } if (grpc_mdelem_eq(c->entries_elems[HASH_FRAGMENT_3(elem_hash)], elem) && c->indices_elems[HASH_FRAGMENT_3(elem_hash)] > c->tail_remote_index) { /* HIT: complete element (second cuckoo hash) */ - emit_indexed(c, dynidx(c, c->indices_elems[HASH_FRAGMENT_3(elem_hash)]), - st); + emit_indexed(exec_ctx, c, + dynidx(c, c->indices_elems[HASH_FRAGMENT_3(elem_hash)]), st); return; } } @@ -523,10 +538,10 @@ static void hpack_enc(grpc_chttp2_hpack_compressor* c, grpc_mdelem elem, decoder_space_usage < MAX_DECODER_SPACE_USAGE && c->filter_elems[HASH_FRAGMENT_1(elem_hash)] >= c->filter_elems_sum / ONE_ON_ADD_PROBABILITY; - void (*maybe_add)(grpc_chttp2_hpack_compressor*, grpc_mdelem, size_t) = - should_add_elem ? add_elem : add_nothing; - void (*emit)(grpc_chttp2_hpack_compressor*, uint32_t, grpc_mdelem, - framer_state*) = + void (*maybe_add)(grpc_exec_ctx*, grpc_chttp2_hpack_compressor*, grpc_mdelem, + size_t) = should_add_elem ? add_elem : add_nothing; + void (*emit)(grpc_exec_ctx*, grpc_chttp2_hpack_compressor*, uint32_t, + grpc_mdelem, framer_state*) = should_add_elem ? emit_lithdr_incidx : emit_lithdr_noidx; /* no hits for the elem... maybe there's a key? */ @@ -535,8 +550,8 @@ static void hpack_enc(grpc_chttp2_hpack_compressor* c, grpc_mdelem elem, GRPC_MDKEY(elem)) && indices_key > c->tail_remote_index) { /* HIT: key (first cuckoo hash) */ - emit(c, dynidx(c, indices_key), elem, st); - maybe_add(c, elem, decoder_space_usage); + emit(exec_ctx, c, dynidx(c, indices_key), elem, st); + maybe_add(exec_ctx, c, elem, decoder_space_usage); return; } @@ -545,8 +560,8 @@ static void hpack_enc(grpc_chttp2_hpack_compressor* c, grpc_mdelem elem, GRPC_MDKEY(elem)) && indices_key > c->tail_remote_index) { /* HIT: key (first cuckoo hash) */ - emit(c, dynidx(c, indices_key), elem, st); - maybe_add(c, elem, decoder_space_usage); + emit(exec_ctx, c, dynidx(c, indices_key), elem, st); + maybe_add(exec_ctx, c, elem, decoder_space_usage); return; } @@ -557,23 +572,24 @@ static void hpack_enc(grpc_chttp2_hpack_compressor* c, grpc_mdelem elem, : emit_lithdr_noidx_v; maybe_add = should_add_elem ? add_elem : (should_add_key ? add_key : add_nothing); - emit(c, 0, elem, st); - maybe_add(c, elem, decoder_space_usage); + emit(exec_ctx, c, 0, elem, st); + maybe_add(exec_ctx, c, elem, decoder_space_usage); } #define STRLEN_LIT(x) (sizeof(x) - 1) #define TIMEOUT_KEY "grpc-timeout" -static void deadline_enc(grpc_chttp2_hpack_compressor* c, grpc_millis deadline, +static void deadline_enc(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_compressor* c, grpc_millis deadline, framer_state* st) { char timeout_str[GRPC_HTTP2_TIMEOUT_ENCODE_MIN_BUFSIZE]; grpc_mdelem mdelem; - grpc_http2_encode_timeout(deadline - grpc_core::ExecCtx::Get()->Now(), + grpc_http2_encode_timeout(deadline - grpc_exec_ctx_now(exec_ctx), timeout_str); - mdelem = grpc_mdelem_from_slices(GRPC_MDSTR_GRPC_TIMEOUT, + mdelem = grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_GRPC_TIMEOUT, grpc_slice_from_copied_string(timeout_str)); - hpack_enc(c, mdelem, st); - GRPC_MDELEM_UNREF(mdelem); + hpack_enc(exec_ctx, c, mdelem, st); + GRPC_MDELEM_UNREF(exec_ctx, mdelem); } static uint32_t elems_for_bytes(uint32_t bytes) { return (bytes + 31) / 32; } @@ -593,13 +609,14 @@ void grpc_chttp2_hpack_compressor_init(grpc_chttp2_hpack_compressor* c) { } } -void grpc_chttp2_hpack_compressor_destroy(grpc_chttp2_hpack_compressor* c) { +void grpc_chttp2_hpack_compressor_destroy(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_compressor* c) { int i; for (i = 0; i < GRPC_CHTTP2_HPACKC_NUM_VALUES; i++) { if (c->entries_keys[i].refcount != &terminal_slice_refcount) { - grpc_slice_unref_internal(c->entries_keys[i]); + grpc_slice_unref_internal(exec_ctx, c->entries_keys[i]); } - GRPC_MDELEM_UNREF(c->entries_elems[i]); + GRPC_MDELEM_UNREF(exec_ctx, c->entries_elems[i]); } gpr_free(c->table_elem_size); } @@ -655,7 +672,8 @@ void grpc_chttp2_hpack_compressor_set_max_table_size( } } -void grpc_chttp2_encode_header(grpc_chttp2_hpack_compressor* c, +void grpc_chttp2_encode_header(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_compressor* c, grpc_mdelem** extra_headers, size_t extra_headers_size, grpc_metadata_batch* metadata, @@ -681,15 +699,15 @@ void grpc_chttp2_encode_header(grpc_chttp2_hpack_compressor* c, emit_advertise_table_size_change(c, &st); } for (size_t i = 0; i < extra_headers_size; ++i) { - hpack_enc(c, *extra_headers[i], &st); + hpack_enc(exec_ctx, c, *extra_headers[i], &st); } grpc_metadata_batch_assert_ok(metadata); for (grpc_linked_mdelem* l = metadata->list.head; l; l = l->next) { - hpack_enc(c, l->md, &st); + hpack_enc(exec_ctx, c, l->md, &st); } grpc_millis deadline = metadata->deadline; if (deadline != GRPC_MILLIS_INF_FUTURE) { - deadline_enc(c, deadline, &st); + deadline_enc(exec_ctx, c, deadline, &st); } finish_frame(&st, 1, options->is_eof); diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.h b/src/core/ext/transport/chttp2/transport/hpack_encoder.h index a26514cab08..08921b19ec7 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.h +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.h @@ -70,7 +70,8 @@ typedef struct { } grpc_chttp2_hpack_compressor; void grpc_chttp2_hpack_compressor_init(grpc_chttp2_hpack_compressor* c); -void grpc_chttp2_hpack_compressor_destroy(grpc_chttp2_hpack_compressor* c); +void grpc_chttp2_hpack_compressor_destroy(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_compressor* c); void grpc_chttp2_hpack_compressor_set_max_table_size( grpc_chttp2_hpack_compressor* c, uint32_t max_table_size); void grpc_chttp2_hpack_compressor_set_max_usable_size( @@ -84,7 +85,8 @@ typedef struct { grpc_transport_one_way_stats* stats; } grpc_encode_header_options; -void grpc_chttp2_encode_header(grpc_chttp2_hpack_compressor* c, +void grpc_chttp2_encode_header(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_compressor* c, grpc_mdelem** extra_headers, size_t extra_headers_size, grpc_metadata_batch* metadata, diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc index a395ab234c0..18cb27f199c 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc @@ -61,69 +61,96 @@ typedef enum { a set of indirect jumps, and so not waste stack space. */ /* forward declarations for parsing states */ -static grpc_error* parse_begin(grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_begin(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_error(grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_error(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end, grpc_error* error); -static grpc_error* still_parse_error(grpc_chttp2_hpack_parser* p, +static grpc_error* still_parse_error(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_illegal_op(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_illegal_op(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_string_prefix(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_string_prefix(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_key_string(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_key_string(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); static grpc_error* parse_value_string_with_indexed_key( - grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); + grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_parser* p, const uint8_t* cur, + const uint8_t* end); static grpc_error* parse_value_string_with_literal_key( - grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); + grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_parser* p, const uint8_t* cur, + const uint8_t* end); -static grpc_error* parse_value0(grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_value0(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_value1(grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_value1(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_value2(grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_value2(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_value3(grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_value3(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_value4(grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_value4(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_value5up(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_value5up(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_indexed_field(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_indexed_field(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_indexed_field_x(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_indexed_field_x(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_incidx(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_incidx(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_incidx_x(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_incidx_x(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_incidx_v(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_incidx_v(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_notidx(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_notidx(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_notidx_x(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_notidx_x(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_notidx_v(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_notidx_v(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_nvridx(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_nvridx(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_nvridx_x(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_nvridx_x(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_nvridx_v(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_nvridx_v(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_max_tbl_size(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_max_tbl_size(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_max_tbl_size_x(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_max_tbl_size_x(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); /* we translate the first byte of a hpack field into one of these decoding @@ -622,8 +649,8 @@ static const uint8_t inverse_base64[256] = { }; /* emission helpers */ -static grpc_error* on_hdr(grpc_chttp2_hpack_parser* p, grpc_mdelem md, - int add_to_table) { +static grpc_error* on_hdr(grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_parser* p, + grpc_mdelem md, int add_to_table) { if (grpc_http_trace.enabled()) { char* k = grpc_slice_to_c_string(GRPC_MDKEY(md)); char* v = nullptr; @@ -644,25 +671,26 @@ static grpc_error* on_hdr(grpc_chttp2_hpack_parser* p, grpc_mdelem md, if (add_to_table) { GPR_ASSERT(GRPC_MDELEM_STORAGE(md) == GRPC_MDELEM_STORAGE_INTERNED || GRPC_MDELEM_STORAGE(md) == GRPC_MDELEM_STORAGE_STATIC); - grpc_error* err = grpc_chttp2_hptbl_add(&p->table, md); + grpc_error* err = grpc_chttp2_hptbl_add(exec_ctx, &p->table, md); if (err != GRPC_ERROR_NONE) return err; } if (p->on_header == nullptr) { - GRPC_MDELEM_UNREF(md); + GRPC_MDELEM_UNREF(exec_ctx, md); return GRPC_ERROR_CREATE_FROM_STATIC_STRING("on_header callback not set"); } - p->on_header(p->on_header_user_data, md); + p->on_header(exec_ctx, p->on_header_user_data, md); return GRPC_ERROR_NONE; } -static grpc_slice take_string(grpc_chttp2_hpack_parser* p, +static grpc_slice take_string(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, grpc_chttp2_hpack_parser_string* str, bool intern) { grpc_slice s; if (!str->copied) { if (intern) { s = grpc_slice_intern(str->data.referenced); - grpc_slice_unref_internal(str->data.referenced); + grpc_slice_unref_internal(exec_ctx, str->data.referenced); } else { s = str->data.referenced; } @@ -680,77 +708,85 @@ static grpc_slice take_string(grpc_chttp2_hpack_parser* p, } /* jump to the next state */ -static grpc_error* parse_next(grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_next(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { p->state = *p->next_state++; - return p->state(p, cur, end); + return p->state(exec_ctx, p, cur, end); } /* begin parsing a header: all functionality is encoded into lookup tables above */ -static grpc_error* parse_begin(grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_begin(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_begin; return GRPC_ERROR_NONE; } - return first_byte_action[first_byte_lut[*cur]](p, cur, end); + return first_byte_action[first_byte_lut[*cur]](exec_ctx, p, cur, end); } /* stream dependency and prioritization data: we just skip it */ -static grpc_error* parse_stream_weight(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_stream_weight(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_stream_weight; return GRPC_ERROR_NONE; } - return p->after_prioritization(p, cur + 1, end); + return p->after_prioritization(exec_ctx, p, cur + 1, end); } -static grpc_error* parse_stream_dep3(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_stream_dep3(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_stream_dep3; return GRPC_ERROR_NONE; } - return parse_stream_weight(p, cur + 1, end); + return parse_stream_weight(exec_ctx, p, cur + 1, end); } -static grpc_error* parse_stream_dep2(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_stream_dep2(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_stream_dep2; return GRPC_ERROR_NONE; } - return parse_stream_dep3(p, cur + 1, end); + return parse_stream_dep3(exec_ctx, p, cur + 1, end); } -static grpc_error* parse_stream_dep1(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_stream_dep1(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_stream_dep1; return GRPC_ERROR_NONE; } - return parse_stream_dep2(p, cur + 1, end); + return parse_stream_dep2(exec_ctx, p, cur + 1, end); } -static grpc_error* parse_stream_dep0(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_stream_dep0(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_stream_dep0; return GRPC_ERROR_NONE; } - return parse_stream_dep1(p, cur + 1, end); + return parse_stream_dep1(exec_ctx, p, cur + 1, end); } /* emit an indexed field; jumps to begin the next field on completion */ -static grpc_error* finish_indexed_field(grpc_chttp2_hpack_parser* p, +static grpc_error* finish_indexed_field(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { grpc_mdelem md = grpc_chttp2_hptbl_lookup(&p->table, p->index); @@ -762,22 +798,24 @@ static grpc_error* finish_indexed_field(grpc_chttp2_hpack_parser* p, GRPC_ERROR_INT_SIZE, (intptr_t)p->table.num_ents); } GRPC_MDELEM_REF(md); - GRPC_STATS_INC_HPACK_RECV_INDEXED(); - grpc_error* err = on_hdr(p, md, 0); + GRPC_STATS_INC_HPACK_RECV_INDEXED(exec_ctx); + grpc_error* err = on_hdr(exec_ctx, p, md, 0); if (err != GRPC_ERROR_NONE) return err; - return parse_begin(p, cur, end); + return parse_begin(exec_ctx, p, cur, end); } /* parse an indexed field with index < 127 */ -static grpc_error* parse_indexed_field(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_indexed_field(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { p->dynamic_table_update_allowed = 0; p->index = (*cur) & 0x7f; - return finish_indexed_field(p, cur + 1, end); + return finish_indexed_field(exec_ctx, p, cur + 1, end); } /* parse an indexed field with index >= 127 */ -static grpc_error* parse_indexed_field_x(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_indexed_field_x(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -786,52 +824,56 @@ static grpc_error* parse_indexed_field_x(grpc_chttp2_hpack_parser* p, p->next_state = and_then; p->index = 0x7f; p->parsing.value = &p->index; - return parse_value0(p, cur + 1, end); + return parse_value0(exec_ctx, p, cur + 1, end); } /* finish a literal header with incremental indexing */ -static grpc_error* finish_lithdr_incidx(grpc_chttp2_hpack_parser* p, +static grpc_error* finish_lithdr_incidx(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { grpc_mdelem md = grpc_chttp2_hptbl_lookup(&p->table, p->index); GPR_ASSERT(!GRPC_MDISNULL(md)); /* handled in string parsing */ - GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX(); - grpc_error* err = - on_hdr(p, - grpc_mdelem_from_slices(grpc_slice_ref_internal(GRPC_MDKEY(md)), - take_string(p, &p->value, true)), - 1); - if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); - return parse_begin(p, cur, end); + GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX(exec_ctx); + grpc_error* err = on_hdr( + exec_ctx, p, + grpc_mdelem_from_slices(exec_ctx, grpc_slice_ref_internal(GRPC_MDKEY(md)), + take_string(exec_ctx, p, &p->value, true)), + 1); + if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); + return parse_begin(exec_ctx, p, cur, end); } /* finish a literal header with incremental indexing with no index */ -static grpc_error* finish_lithdr_incidx_v(grpc_chttp2_hpack_parser* p, +static grpc_error* finish_lithdr_incidx_v(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { - GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX_V(); - grpc_error* err = - on_hdr(p, - grpc_mdelem_from_slices(take_string(p, &p->key, true), - take_string(p, &p->value, true)), - 1); - if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); - return parse_begin(p, cur, end); + GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX_V(exec_ctx); + grpc_error* err = on_hdr( + exec_ctx, p, + grpc_mdelem_from_slices(exec_ctx, take_string(exec_ctx, p, &p->key, true), + take_string(exec_ctx, p, &p->value, true)), + 1); + if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); + return parse_begin(exec_ctx, p, cur, end); } /* parse a literal header with incremental indexing; index < 63 */ -static grpc_error* parse_lithdr_incidx(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_incidx(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { parse_value_string_with_indexed_key, finish_lithdr_incidx}; p->dynamic_table_update_allowed = 0; p->next_state = and_then; p->index = (*cur) & 0x3f; - return parse_string_prefix(p, cur + 1, end); + return parse_string_prefix(exec_ctx, p, cur + 1, end); } /* parse a literal header with incremental indexing; index >= 63 */ -static grpc_error* parse_lithdr_incidx_x(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_incidx_x(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -841,11 +883,12 @@ static grpc_error* parse_lithdr_incidx_x(grpc_chttp2_hpack_parser* p, p->next_state = and_then; p->index = 0x3f; p->parsing.value = &p->index; - return parse_value0(p, cur + 1, end); + return parse_value0(exec_ctx, p, cur + 1, end); } /* parse a literal header with incremental indexing; index = 0 */ -static grpc_error* parse_lithdr_incidx_v(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_incidx_v(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -853,52 +896,56 @@ static grpc_error* parse_lithdr_incidx_v(grpc_chttp2_hpack_parser* p, parse_value_string_with_literal_key, finish_lithdr_incidx_v}; p->dynamic_table_update_allowed = 0; p->next_state = and_then; - return parse_string_prefix(p, cur + 1, end); + return parse_string_prefix(exec_ctx, p, cur + 1, end); } /* finish a literal header without incremental indexing */ -static grpc_error* finish_lithdr_notidx(grpc_chttp2_hpack_parser* p, +static grpc_error* finish_lithdr_notidx(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { grpc_mdelem md = grpc_chttp2_hptbl_lookup(&p->table, p->index); GPR_ASSERT(!GRPC_MDISNULL(md)); /* handled in string parsing */ - GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX(); - grpc_error* err = - on_hdr(p, - grpc_mdelem_from_slices(grpc_slice_ref_internal(GRPC_MDKEY(md)), - take_string(p, &p->value, false)), - 0); - if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); - return parse_begin(p, cur, end); + GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX(exec_ctx); + grpc_error* err = on_hdr( + exec_ctx, p, + grpc_mdelem_from_slices(exec_ctx, grpc_slice_ref_internal(GRPC_MDKEY(md)), + take_string(exec_ctx, p, &p->value, false)), + 0); + if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); + return parse_begin(exec_ctx, p, cur, end); } /* finish a literal header without incremental indexing with index = 0 */ -static grpc_error* finish_lithdr_notidx_v(grpc_chttp2_hpack_parser* p, +static grpc_error* finish_lithdr_notidx_v(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { - GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX_V(); - grpc_error* err = - on_hdr(p, - grpc_mdelem_from_slices(take_string(p, &p->key, true), - take_string(p, &p->value, false)), - 0); - if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); - return parse_begin(p, cur, end); + GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX_V(exec_ctx); + grpc_error* err = on_hdr( + exec_ctx, p, + grpc_mdelem_from_slices(exec_ctx, take_string(exec_ctx, p, &p->key, true), + take_string(exec_ctx, p, &p->value, false)), + 0); + if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); + return parse_begin(exec_ctx, p, cur, end); } /* parse a literal header without incremental indexing; index < 15 */ -static grpc_error* parse_lithdr_notidx(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_notidx(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { parse_value_string_with_indexed_key, finish_lithdr_notidx}; p->dynamic_table_update_allowed = 0; p->next_state = and_then; p->index = (*cur) & 0xf; - return parse_string_prefix(p, cur + 1, end); + return parse_string_prefix(exec_ctx, p, cur + 1, end); } /* parse a literal header without incremental indexing; index >= 15 */ -static grpc_error* parse_lithdr_notidx_x(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_notidx_x(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -908,11 +955,12 @@ static grpc_error* parse_lithdr_notidx_x(grpc_chttp2_hpack_parser* p, p->next_state = and_then; p->index = 0xf; p->parsing.value = &p->index; - return parse_value0(p, cur + 1, end); + return parse_value0(exec_ctx, p, cur + 1, end); } /* parse a literal header without incremental indexing; index == 0 */ -static grpc_error* parse_lithdr_notidx_v(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_notidx_v(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -920,52 +968,56 @@ static grpc_error* parse_lithdr_notidx_v(grpc_chttp2_hpack_parser* p, parse_value_string_with_literal_key, finish_lithdr_notidx_v}; p->dynamic_table_update_allowed = 0; p->next_state = and_then; - return parse_string_prefix(p, cur + 1, end); + return parse_string_prefix(exec_ctx, p, cur + 1, end); } /* finish a literal header that is never indexed */ -static grpc_error* finish_lithdr_nvridx(grpc_chttp2_hpack_parser* p, +static grpc_error* finish_lithdr_nvridx(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { grpc_mdelem md = grpc_chttp2_hptbl_lookup(&p->table, p->index); GPR_ASSERT(!GRPC_MDISNULL(md)); /* handled in string parsing */ - GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX(); - grpc_error* err = - on_hdr(p, - grpc_mdelem_from_slices(grpc_slice_ref_internal(GRPC_MDKEY(md)), - take_string(p, &p->value, false)), - 0); - if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); - return parse_begin(p, cur, end); + GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX(exec_ctx); + grpc_error* err = on_hdr( + exec_ctx, p, + grpc_mdelem_from_slices(exec_ctx, grpc_slice_ref_internal(GRPC_MDKEY(md)), + take_string(exec_ctx, p, &p->value, false)), + 0); + if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); + return parse_begin(exec_ctx, p, cur, end); } /* finish a literal header that is never indexed with an extra value */ -static grpc_error* finish_lithdr_nvridx_v(grpc_chttp2_hpack_parser* p, +static grpc_error* finish_lithdr_nvridx_v(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { - GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX_V(); - grpc_error* err = - on_hdr(p, - grpc_mdelem_from_slices(take_string(p, &p->key, true), - take_string(p, &p->value, false)), - 0); - if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); - return parse_begin(p, cur, end); + GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX_V(exec_ctx); + grpc_error* err = on_hdr( + exec_ctx, p, + grpc_mdelem_from_slices(exec_ctx, take_string(exec_ctx, p, &p->key, true), + take_string(exec_ctx, p, &p->value, false)), + 0); + if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); + return parse_begin(exec_ctx, p, cur, end); } /* parse a literal header that is never indexed; index < 15 */ -static grpc_error* parse_lithdr_nvridx(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_nvridx(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { parse_value_string_with_indexed_key, finish_lithdr_nvridx}; p->dynamic_table_update_allowed = 0; p->next_state = and_then; p->index = (*cur) & 0xf; - return parse_string_prefix(p, cur + 1, end); + return parse_string_prefix(exec_ctx, p, cur + 1, end); } /* parse a literal header that is never indexed; index >= 15 */ -static grpc_error* parse_lithdr_nvridx_x(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_nvridx_x(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -975,11 +1027,12 @@ static grpc_error* parse_lithdr_nvridx_x(grpc_chttp2_hpack_parser* p, p->next_state = and_then; p->index = 0xf; p->parsing.value = &p->index; - return parse_value0(p, cur + 1, end); + return parse_value0(exec_ctx, p, cur + 1, end); } /* parse a literal header that is never indexed; index == 0 */ -static grpc_error* parse_lithdr_nvridx_v(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_nvridx_v(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -987,44 +1040,47 @@ static grpc_error* parse_lithdr_nvridx_v(grpc_chttp2_hpack_parser* p, parse_value_string_with_literal_key, finish_lithdr_nvridx_v}; p->dynamic_table_update_allowed = 0; p->next_state = and_then; - return parse_string_prefix(p, cur + 1, end); + return parse_string_prefix(exec_ctx, p, cur + 1, end); } /* finish parsing a max table size change */ -static grpc_error* finish_max_tbl_size(grpc_chttp2_hpack_parser* p, +static grpc_error* finish_max_tbl_size(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (grpc_http_trace.enabled()) { gpr_log(GPR_INFO, "MAX TABLE SIZE: %d", p->index); } grpc_error* err = - grpc_chttp2_hptbl_set_current_table_size(&p->table, p->index); - if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); - return parse_begin(p, cur, end); + grpc_chttp2_hptbl_set_current_table_size(exec_ctx, &p->table, p->index); + if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); + return parse_begin(exec_ctx, p, cur, end); } /* parse a max table size change, max size < 15 */ -static grpc_error* parse_max_tbl_size(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_max_tbl_size(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (p->dynamic_table_update_allowed == 0) { return parse_error( - p, cur, end, + exec_ctx, p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "More than two max table size changes in a single frame")); } p->dynamic_table_update_allowed--; p->index = (*cur) & 0x1f; - return finish_max_tbl_size(p, cur + 1, end); + return finish_max_tbl_size(exec_ctx, p, cur + 1, end); } /* parse a max table size change, max size >= 15 */ -static grpc_error* parse_max_tbl_size_x(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_max_tbl_size_x(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { finish_max_tbl_size}; if (p->dynamic_table_update_allowed == 0) { return parse_error( - p, cur, end, + exec_ctx, p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "More than two max table size changes in a single frame")); } @@ -1032,11 +1088,12 @@ static grpc_error* parse_max_tbl_size_x(grpc_chttp2_hpack_parser* p, p->next_state = and_then; p->index = 0x1f; p->parsing.value = &p->index; - return parse_value0(p, cur + 1, end); + return parse_value0(exec_ctx, p, cur + 1, end); } /* a parse error: jam the parse state into parse_error, and return error */ -static grpc_error* parse_error(grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_error(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end, grpc_error* err) { GPR_ASSERT(err != GRPC_ERROR_NONE); if (p->last_error == GRPC_ERROR_NONE) { @@ -1046,24 +1103,27 @@ static grpc_error* parse_error(grpc_chttp2_hpack_parser* p, const uint8_t* cur, return err; } -static grpc_error* still_parse_error(grpc_chttp2_hpack_parser* p, +static grpc_error* still_parse_error(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { return GRPC_ERROR_REF(p->last_error); } -static grpc_error* parse_illegal_op(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_illegal_op(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { GPR_ASSERT(cur != end); char* msg; gpr_asprintf(&msg, "Illegal hpack op code %d", *cur); grpc_error* err = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - return parse_error(p, cur, end, err); + return parse_error(exec_ctx, p, cur, end, err); } /* parse the 1st byte of a varint into p->parsing.value no overflow is possible */ -static grpc_error* parse_value0(grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_value0(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_value0; @@ -1073,15 +1133,16 @@ static grpc_error* parse_value0(grpc_chttp2_hpack_parser* p, const uint8_t* cur, *p->parsing.value += (*cur) & 0x7f; if ((*cur) & 0x80) { - return parse_value1(p, cur + 1, end); + return parse_value1(exec_ctx, p, cur + 1, end); } else { - return parse_next(p, cur + 1, end); + return parse_next(exec_ctx, p, cur + 1, end); } } /* parse the 2nd byte of a varint into p->parsing.value no overflow is possible */ -static grpc_error* parse_value1(grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_value1(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_value1; @@ -1091,15 +1152,16 @@ static grpc_error* parse_value1(grpc_chttp2_hpack_parser* p, const uint8_t* cur, *p->parsing.value += (((uint32_t)*cur) & 0x7f) << 7; if ((*cur) & 0x80) { - return parse_value2(p, cur + 1, end); + return parse_value2(exec_ctx, p, cur + 1, end); } else { - return parse_next(p, cur + 1, end); + return parse_next(exec_ctx, p, cur + 1, end); } } /* parse the 3rd byte of a varint into p->parsing.value no overflow is possible */ -static grpc_error* parse_value2(grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_value2(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_value2; @@ -1109,15 +1171,16 @@ static grpc_error* parse_value2(grpc_chttp2_hpack_parser* p, const uint8_t* cur, *p->parsing.value += (((uint32_t)*cur) & 0x7f) << 14; if ((*cur) & 0x80) { - return parse_value3(p, cur + 1, end); + return parse_value3(exec_ctx, p, cur + 1, end); } else { - return parse_next(p, cur + 1, end); + return parse_next(exec_ctx, p, cur + 1, end); } } /* parse the 4th byte of a varint into p->parsing.value no overflow is possible */ -static grpc_error* parse_value3(grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_value3(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_value3; @@ -1127,15 +1190,16 @@ static grpc_error* parse_value3(grpc_chttp2_hpack_parser* p, const uint8_t* cur, *p->parsing.value += (((uint32_t)*cur) & 0x7f) << 21; if ((*cur) & 0x80) { - return parse_value4(p, cur + 1, end); + return parse_value4(exec_ctx, p, cur + 1, end); } else { - return parse_next(p, cur + 1, end); + return parse_next(exec_ctx, p, cur + 1, end); } } /* parse the 5th byte of a varint into p->parsing.value depending on the byte, we may overflow, and care must be taken */ -static grpc_error* parse_value4(grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_value4(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { uint8_t c; uint32_t cur_value; @@ -1161,9 +1225,9 @@ static grpc_error* parse_value4(grpc_chttp2_hpack_parser* p, const uint8_t* cur, *p->parsing.value = cur_value + add_value; if ((*cur) & 0x80) { - return parse_value5up(p, cur + 1, end); + return parse_value5up(exec_ctx, p, cur + 1, end); } else { - return parse_next(p, cur + 1, end); + return parse_next(exec_ctx, p, cur + 1, end); } error: @@ -1173,13 +1237,14 @@ error: *p->parsing.value, *cur); grpc_error* err = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - return parse_error(p, cur, end, err); + return parse_error(exec_ctx, p, cur, end, err); } /* parse any trailing bytes in a varint: it's possible to append an arbitrary number of 0x80's and not affect the value - a zero will terminate - and anything else will overflow */ -static grpc_error* parse_value5up(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_value5up(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { while (cur != end && *cur == 0x80) { ++cur; @@ -1191,7 +1256,7 @@ static grpc_error* parse_value5up(grpc_chttp2_hpack_parser* p, } if (*cur == 0) { - return parse_next(p, cur + 1, end); + return parse_next(exec_ctx, p, cur + 1, end); } char* msg; @@ -1201,11 +1266,12 @@ static grpc_error* parse_value5up(grpc_chttp2_hpack_parser* p, *p->parsing.value, *cur); grpc_error* err = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - return parse_error(p, cur, end, err); + return parse_error(exec_ctx, p, cur, end, err); } /* parse a string prefix */ -static grpc_error* parse_string_prefix(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_string_prefix(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_string_prefix; @@ -1216,9 +1282,9 @@ static grpc_error* parse_string_prefix(grpc_chttp2_hpack_parser* p, p->huff = (*cur) >> 7; if (p->strlen == 0x7f) { p->parsing.value = &p->strlen; - return parse_value0(p, cur + 1, end); + return parse_value0(exec_ctx, p, cur + 1, end); } else { - return parse_next(p, cur + 1, end); + return parse_next(exec_ctx, p, cur + 1, end); } } @@ -1237,7 +1303,8 @@ static void append_bytes(grpc_chttp2_hpack_parser_string* str, str->data.copied.length += (uint32_t)length; } -static grpc_error* append_string(grpc_chttp2_hpack_parser* p, +static grpc_error* append_string(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { grpc_chttp2_hpack_parser_string* str = p->parsing.str; uint32_t bits; @@ -1255,11 +1322,11 @@ static grpc_error* append_string(grpc_chttp2_hpack_parser* p, /* 'true-binary' case */ ++cur; p->binary = NOT_BINARY; - GRPC_STATS_INC_HPACK_RECV_BINARY(); + GRPC_STATS_INC_HPACK_RECV_BINARY(exec_ctx); append_bytes(str, cur, (size_t)(end - cur)); return GRPC_ERROR_NONE; } - GRPC_STATS_INC_HPACK_RECV_BINARY_BASE64(); + GRPC_STATS_INC_HPACK_RECV_BINARY_BASE64(exec_ctx); /* fallthrough */ b64_byte0: case B64_BYTE0: @@ -1271,7 +1338,7 @@ static grpc_error* append_string(grpc_chttp2_hpack_parser* p, ++cur; if (bits == 255) return parse_error( - p, cur, end, + exec_ctx, p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Illegal base64 character")); else if (bits == 64) goto b64_byte0; @@ -1287,7 +1354,7 @@ static grpc_error* append_string(grpc_chttp2_hpack_parser* p, ++cur; if (bits == 255) return parse_error( - p, cur, end, + exec_ctx, p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Illegal base64 character")); else if (bits == 64) goto b64_byte1; @@ -1303,7 +1370,7 @@ static grpc_error* append_string(grpc_chttp2_hpack_parser* p, ++cur; if (bits == 255) return parse_error( - p, cur, end, + exec_ctx, p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Illegal base64 character")); else if (bits == 64) goto b64_byte2; @@ -1319,7 +1386,7 @@ static grpc_error* append_string(grpc_chttp2_hpack_parser* p, ++cur; if (bits == 255) return parse_error( - p, cur, end, + exec_ctx, p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Illegal base64 character")); else if (bits == 64) goto b64_byte3; @@ -1332,11 +1399,12 @@ static grpc_error* append_string(grpc_chttp2_hpack_parser* p, goto b64_byte0; } GPR_UNREACHABLE_CODE(return parse_error( - p, cur, end, + exec_ctx, p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Should never reach here"))); } -static grpc_error* finish_str(grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* finish_str(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { uint8_t decoded[2]; uint32_t bits; @@ -1349,7 +1417,7 @@ static grpc_error* finish_str(grpc_chttp2_hpack_parser* p, const uint8_t* cur, case B64_BYTE0: break; case B64_BYTE1: - return parse_error(p, cur, end, + return parse_error(exec_ctx, p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "illegal base64 encoding")); /* illegal encoding */ case B64_BYTE2: @@ -1360,7 +1428,7 @@ static grpc_error* finish_str(grpc_chttp2_hpack_parser* p, const uint8_t* cur, bits & 0xffff); grpc_error* err = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - return parse_error(p, cur, end, err); + return parse_error(exec_ctx, p, cur, end, err); } decoded[0] = (uint8_t)(bits >> 16); append_bytes(str, decoded, 1); @@ -1373,7 +1441,7 @@ static grpc_error* finish_str(grpc_chttp2_hpack_parser* p, const uint8_t* cur, bits & 0xff); grpc_error* err = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - return parse_error(p, cur, end, err); + return parse_error(exec_ctx, p, cur, end, err); } decoded[0] = (uint8_t)(bits >> 16); decoded[1] = (uint8_t)(bits >> 8); @@ -1384,13 +1452,14 @@ static grpc_error* finish_str(grpc_chttp2_hpack_parser* p, const uint8_t* cur, } /* decode a nibble from a huffman encoded stream */ -static grpc_error* huff_nibble(grpc_chttp2_hpack_parser* p, uint8_t nibble) { +static grpc_error* huff_nibble(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, uint8_t nibble) { int16_t emit = emit_sub_tbl[16 * emit_tbl[p->huff_state] + nibble]; int16_t next = next_sub_tbl[16 * next_tbl[p->huff_state] + nibble]; if (emit != -1) { if (emit >= 0 && emit < 256) { uint8_t c = (uint8_t)emit; - grpc_error* err = append_string(p, &c, (&c) + 1); + grpc_error* err = append_string(exec_ctx, p, &c, (&c) + 1); if (err != GRPC_ERROR_NONE) return err; } else { assert(emit == 256); @@ -1401,42 +1470,45 @@ static grpc_error* huff_nibble(grpc_chttp2_hpack_parser* p, uint8_t nibble) { } /* decode full bytes from a huffman encoded stream */ -static grpc_error* add_huff_bytes(grpc_chttp2_hpack_parser* p, +static grpc_error* add_huff_bytes(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { for (; cur != end; ++cur) { - grpc_error* err = huff_nibble(p, *cur >> 4); - if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); - err = huff_nibble(p, *cur & 0xf); - if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + grpc_error* err = huff_nibble(exec_ctx, p, *cur >> 4); + if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); + err = huff_nibble(exec_ctx, p, *cur & 0xf); + if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); } return GRPC_ERROR_NONE; } /* decode some string bytes based on the current decoding mode (huffman or not) */ -static grpc_error* add_str_bytes(grpc_chttp2_hpack_parser* p, +static grpc_error* add_str_bytes(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (p->huff) { - return add_huff_bytes(p, cur, end); + return add_huff_bytes(exec_ctx, p, cur, end); } else { - return append_string(p, cur, end); + return append_string(exec_ctx, p, cur, end); } } /* parse a string - tries to do large chunks at a time */ -static grpc_error* parse_string(grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_string(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { size_t remaining = p->strlen - p->strgot; size_t given = (size_t)(end - cur); if (remaining <= given) { - grpc_error* err = add_str_bytes(p, cur, cur + remaining); - if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); - err = finish_str(p, cur + remaining, end); - if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); - return parse_next(p, cur + remaining, end); + grpc_error* err = add_str_bytes(exec_ctx, p, cur, cur + remaining); + if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); + err = finish_str(exec_ctx, p, cur + remaining, end); + if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); + return parse_next(exec_ctx, p, cur + remaining, end); } else { - grpc_error* err = add_str_bytes(p, cur, cur + given); - if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + grpc_error* err = add_str_bytes(exec_ctx, p, cur, cur + given); + if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); GPR_ASSERT(given <= UINT32_MAX - p->strgot); p->strgot += (uint32_t)given; p->state = parse_string; @@ -1445,19 +1517,20 @@ static grpc_error* parse_string(grpc_chttp2_hpack_parser* p, const uint8_t* cur, } /* begin parsing a string - performs setup, calls parse_string */ -static grpc_error* begin_parse_string(grpc_chttp2_hpack_parser* p, +static grpc_error* begin_parse_string(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end, uint8_t binary, grpc_chttp2_hpack_parser_string* str) { if (!p->huff && binary == NOT_BINARY && (end - cur) >= (intptr_t)p->strlen && p->current_slice_refcount != nullptr) { - GRPC_STATS_INC_HPACK_RECV_UNCOMPRESSED(); + GRPC_STATS_INC_HPACK_RECV_UNCOMPRESSED(exec_ctx); str->copied = false; str->data.referenced.refcount = p->current_slice_refcount; str->data.referenced.data.refcounted.bytes = (uint8_t*)cur; str->data.referenced.data.refcounted.length = p->strlen; grpc_slice_ref_internal(str->data.referenced); - return parse_next(p, cur + p->strlen, end); + return parse_next(exec_ctx, p, cur + p->strlen, end); } p->strgot = 0; str->copied = true; @@ -1468,9 +1541,9 @@ static grpc_error* begin_parse_string(grpc_chttp2_hpack_parser* p, switch (p->binary) { case NOT_BINARY: if (p->huff) { - GRPC_STATS_INC_HPACK_RECV_HUFFMAN(); + GRPC_STATS_INC_HPACK_RECV_HUFFMAN(exec_ctx); } else { - GRPC_STATS_INC_HPACK_RECV_UNCOMPRESSED(); + GRPC_STATS_INC_HPACK_RECV_UNCOMPRESSED(exec_ctx); } break; case BINARY_BEGIN: @@ -1479,13 +1552,14 @@ static grpc_error* begin_parse_string(grpc_chttp2_hpack_parser* p, default: abort(); } - return parse_string(p, cur, end); + return parse_string(exec_ctx, p, cur, end); } /* parse the key string */ -static grpc_error* parse_key_string(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_key_string(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { - return begin_parse_string(p, cur, end, NOT_BINARY, &p->key); + return begin_parse_string(exec_ctx, p, cur, end, NOT_BINARY, &p->key); } /* check if a key represents a binary header or not */ @@ -1512,29 +1586,33 @@ static grpc_error* is_binary_indexed_header(grpc_chttp2_hpack_parser* p, } /* parse the value string */ -static grpc_error* parse_value_string(grpc_chttp2_hpack_parser* p, +static grpc_error* parse_value_string(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end, bool is_binary) { - return begin_parse_string(p, cur, end, is_binary ? BINARY_BEGIN : NOT_BINARY, - &p->value); + return begin_parse_string(exec_ctx, p, cur, end, + is_binary ? BINARY_BEGIN : NOT_BINARY, &p->value); } static grpc_error* parse_value_string_with_indexed_key( - grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { + grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_parser* p, const uint8_t* cur, + const uint8_t* end) { bool is_binary = false; grpc_error* err = is_binary_indexed_header(p, &is_binary); - if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); - return parse_value_string(p, cur, end, is_binary); + if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); + return parse_value_string(exec_ctx, p, cur, end, is_binary); } static grpc_error* parse_value_string_with_literal_key( - grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { - return parse_value_string(p, cur, end, is_binary_literal_header(p)); + grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_parser* p, const uint8_t* cur, + const uint8_t* end) { + return parse_value_string(exec_ctx, p, cur, end, is_binary_literal_header(p)); } /* PUBLIC INTERFACE */ -void grpc_chttp2_hpack_parser_init(grpc_chttp2_hpack_parser* p) { +void grpc_chttp2_hpack_parser_init(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p) { p->on_header = nullptr; p->on_header_user_data = nullptr; p->state = parse_begin; @@ -1548,7 +1626,7 @@ void grpc_chttp2_hpack_parser_init(grpc_chttp2_hpack_parser* p) { p->value.data.copied.length = 0; p->dynamic_table_update_allowed = 2; p->last_error = GRPC_ERROR_NONE; - grpc_chttp2_hptbl_init(&p->table); + grpc_chttp2_hptbl_init(exec_ctx, &p->table); } void grpc_chttp2_hpack_parser_set_has_priority(grpc_chttp2_hpack_parser* p) { @@ -1556,16 +1634,18 @@ void grpc_chttp2_hpack_parser_set_has_priority(grpc_chttp2_hpack_parser* p) { p->state = parse_stream_dep0; } -void grpc_chttp2_hpack_parser_destroy(grpc_chttp2_hpack_parser* p) { - grpc_chttp2_hptbl_destroy(&p->table); +void grpc_chttp2_hpack_parser_destroy(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p) { + grpc_chttp2_hptbl_destroy(exec_ctx, &p->table); GRPC_ERROR_UNREF(p->last_error); - grpc_slice_unref_internal(p->key.data.referenced); - grpc_slice_unref_internal(p->value.data.referenced); + grpc_slice_unref_internal(exec_ctx, p->key.data.referenced); + grpc_slice_unref_internal(exec_ctx, p->value.data.referenced); gpr_free(p->key.data.copied.str); gpr_free(p->value.data.copied.str); } -grpc_error* grpc_chttp2_hpack_parser_parse(grpc_chttp2_hpack_parser* p, +grpc_error* grpc_chttp2_hpack_parser_parse(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, grpc_slice slice) { /* max number of bytes to parse at a time... limits call stack depth on * compilers without TCO */ @@ -1576,33 +1656,37 @@ grpc_error* grpc_chttp2_hpack_parser_parse(grpc_chttp2_hpack_parser* p, grpc_error* error = GRPC_ERROR_NONE; while (start != end && error == GRPC_ERROR_NONE) { uint8_t* target = start + GPR_MIN(MAX_PARSE_LENGTH, end - start); - error = p->state(p, start, target); + error = p->state(exec_ctx, p, start, target); start = target; } p->current_slice_refcount = nullptr; return error; } -typedef void (*maybe_complete_func_type)(grpc_chttp2_transport* t, +typedef void (*maybe_complete_func_type)(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s); static const maybe_complete_func_type maybe_complete_funcs[] = { grpc_chttp2_maybe_complete_recv_initial_metadata, grpc_chttp2_maybe_complete_recv_trailing_metadata}; -static void force_client_rst_stream(void* sp, grpc_error* error) { +static void force_client_rst_stream(grpc_exec_ctx* exec_ctx, void* sp, + grpc_error* error) { grpc_chttp2_stream* s = (grpc_chttp2_stream*)sp; grpc_chttp2_transport* t = s->t; if (!s->write_closed) { grpc_slice_buffer_add( &t->qbuf, grpc_chttp2_rst_stream_create(s->id, GRPC_HTTP2_NO_ERROR, &s->stats.outgoing)); - grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_FORCE_RST_STREAM); - grpc_chttp2_mark_stream_closed(t, s, true, true, GRPC_ERROR_NONE); + grpc_chttp2_initiate_write(exec_ctx, t, + GRPC_CHTTP2_INITIATE_WRITE_FORCE_RST_STREAM); + grpc_chttp2_mark_stream_closed(exec_ctx, t, s, true, true, GRPC_ERROR_NONE); } - GRPC_CHTTP2_STREAM_UNREF(s, "final_rst"); + GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "final_rst"); } -static void parse_stream_compression_md(grpc_chttp2_transport* t, +static void parse_stream_compression_md(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_metadata_batch* initial_metadata) { if (initial_metadata->idx.named.content_encoding == nullptr || @@ -1614,7 +1698,8 @@ static void parse_stream_compression_md(grpc_chttp2_transport* t, } } -grpc_error* grpc_chttp2_header_parser_parse(void* hpack_parser, +grpc_error* grpc_chttp2_header_parser_parse(grpc_exec_ctx* exec_ctx, + void* hpack_parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last) { @@ -1623,7 +1708,7 @@ grpc_error* grpc_chttp2_header_parser_parse(void* hpack_parser, if (s != nullptr) { s->stats.incoming.header_bytes += GRPC_SLICE_LENGTH(slice); } - grpc_error* error = grpc_chttp2_hpack_parser_parse(parser, slice); + grpc_error* error = grpc_chttp2_hpack_parser_parse(exec_ctx, parser, slice); if (error != GRPC_ERROR_NONE) { GPR_TIMER_END("grpc_chttp2_hpack_parser_parse", 0); return error; @@ -1646,11 +1731,12 @@ grpc_error* grpc_chttp2_header_parser_parse(void* hpack_parser, /* Process stream compression md element if it exists */ if (s->header_frames_received == 0) { /* Only acts on initial metadata */ - parse_stream_compression_md(t, s, &s->metadata_buffer[0].batch); + parse_stream_compression_md(exec_ctx, t, s, + &s->metadata_buffer[0].batch); } s->published_metadata[s->header_frames_received] = GRPC_METADATA_PUBLISHED_FROM_WIRE; - maybe_complete_funcs[s->header_frames_received](t, s); + maybe_complete_funcs[s->header_frames_received](exec_ctx, t, s); s->header_frames_received++; } if (parser->is_eof) { @@ -1661,11 +1747,13 @@ grpc_error* grpc_chttp2_header_parser_parse(void* hpack_parser, and can avoid the extra write */ GRPC_CHTTP2_STREAM_REF(s, "final_rst"); GRPC_CLOSURE_SCHED( + exec_ctx, GRPC_CLOSURE_CREATE(force_client_rst_stream, s, grpc_combiner_finally_scheduler(t->combiner)), GRPC_ERROR_NONE); } - grpc_chttp2_mark_stream_closed(t, s, true, false, GRPC_ERROR_NONE); + grpc_chttp2_mark_stream_closed(exec_ctx, t, s, true, false, + GRPC_ERROR_NONE); } } parser->on_header = nullptr; diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.h b/src/core/ext/transport/chttp2/transport/hpack_parser.h index 060bc5ce9d6..b4a2b14bdb7 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.h @@ -30,7 +30,8 @@ typedef struct grpc_chttp2_hpack_parser grpc_chttp2_hpack_parser; typedef grpc_error* (*grpc_chttp2_hpack_parser_state)( - grpc_chttp2_hpack_parser* p, const uint8_t* beg, const uint8_t* end); + grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_parser* p, const uint8_t* beg, + const uint8_t* end); typedef struct { bool copied; @@ -46,7 +47,7 @@ typedef struct { struct grpc_chttp2_hpack_parser { /* user specified callback for each header output */ - void (*on_header)(void* user_data, grpc_mdelem md); + void (*on_header)(grpc_exec_ctx* exec_ctx, void* user_data, grpc_mdelem md); void* on_header_user_data; grpc_error* last_error; @@ -91,17 +92,21 @@ struct grpc_chttp2_hpack_parser { grpc_chttp2_hptbl table; }; -void grpc_chttp2_hpack_parser_init(grpc_chttp2_hpack_parser* p); -void grpc_chttp2_hpack_parser_destroy(grpc_chttp2_hpack_parser* p); +void grpc_chttp2_hpack_parser_init(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p); +void grpc_chttp2_hpack_parser_destroy(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p); void grpc_chttp2_hpack_parser_set_has_priority(grpc_chttp2_hpack_parser* p); -grpc_error* grpc_chttp2_hpack_parser_parse(grpc_chttp2_hpack_parser* p, +grpc_error* grpc_chttp2_hpack_parser_parse(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hpack_parser* p, grpc_slice slice); /* wraps grpc_chttp2_hpack_parser_parse to provide a frame level parser for the transport */ -grpc_error* grpc_chttp2_header_parser_parse(void* hpack_parser, +grpc_error* grpc_chttp2_header_parser_parse(grpc_exec_ctx* exec_ctx, + void* hpack_parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last); diff --git a/src/core/ext/transport/chttp2/transport/hpack_table.cc b/src/core/ext/transport/chttp2/transport/hpack_table.cc index c325465daab..75b83b80b67 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_table.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_table.cc @@ -165,7 +165,7 @@ static uint32_t entries_for_bytes(uint32_t bytes) { GRPC_CHTTP2_HPACK_ENTRY_OVERHEAD; } -void grpc_chttp2_hptbl_init(grpc_chttp2_hptbl* tbl) { +void grpc_chttp2_hptbl_init(grpc_exec_ctx* exec_ctx, grpc_chttp2_hptbl* tbl) { size_t i; memset(tbl, 0, sizeof(*tbl)); @@ -177,19 +177,22 @@ void grpc_chttp2_hptbl_init(grpc_chttp2_hptbl* tbl) { memset(tbl->ents, 0, sizeof(*tbl->ents) * tbl->cap_entries); for (i = 1; i <= GRPC_CHTTP2_LAST_STATIC_ENTRY; i++) { tbl->static_ents[i - 1] = grpc_mdelem_from_slices( + exec_ctx, grpc_slice_intern(grpc_slice_from_static_string(static_table[i].key)), grpc_slice_intern( grpc_slice_from_static_string(static_table[i].value))); } } -void grpc_chttp2_hptbl_destroy(grpc_chttp2_hptbl* tbl) { +void grpc_chttp2_hptbl_destroy(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hptbl* tbl) { size_t i; for (i = 0; i < GRPC_CHTTP2_LAST_STATIC_ENTRY; i++) { - GRPC_MDELEM_UNREF(tbl->static_ents[i]); + GRPC_MDELEM_UNREF(exec_ctx, tbl->static_ents[i]); } for (i = 0; i < tbl->num_ents; i++) { - GRPC_MDELEM_UNREF(tbl->ents[(tbl->first_ent + i) % tbl->cap_entries]); + GRPC_MDELEM_UNREF(exec_ctx, + tbl->ents[(tbl->first_ent + i) % tbl->cap_entries]); } gpr_free(tbl->ents); } @@ -212,7 +215,7 @@ grpc_mdelem grpc_chttp2_hptbl_lookup(const grpc_chttp2_hptbl* tbl, } /* Evict one element from the table */ -static void evict1(grpc_chttp2_hptbl* tbl) { +static void evict1(grpc_exec_ctx* exec_ctx, grpc_chttp2_hptbl* tbl) { grpc_mdelem first_ent = tbl->ents[tbl->first_ent]; size_t elem_bytes = GRPC_SLICE_LENGTH(GRPC_MDKEY(first_ent)) + GRPC_SLICE_LENGTH(GRPC_MDVALUE(first_ent)) + @@ -221,7 +224,7 @@ static void evict1(grpc_chttp2_hptbl* tbl) { tbl->mem_used -= (uint32_t)elem_bytes; tbl->first_ent = ((tbl->first_ent + 1) % tbl->cap_entries); tbl->num_ents--; - GRPC_MDELEM_UNREF(first_ent); + GRPC_MDELEM_UNREF(exec_ctx, first_ent); } static void rebuild_ents(grpc_chttp2_hptbl* tbl, uint32_t new_cap) { @@ -237,7 +240,8 @@ static void rebuild_ents(grpc_chttp2_hptbl* tbl, uint32_t new_cap) { tbl->first_ent = 0; } -void grpc_chttp2_hptbl_set_max_bytes(grpc_chttp2_hptbl* tbl, +void grpc_chttp2_hptbl_set_max_bytes(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hptbl* tbl, uint32_t max_bytes) { if (tbl->max_bytes == max_bytes) { return; @@ -246,12 +250,13 @@ void grpc_chttp2_hptbl_set_max_bytes(grpc_chttp2_hptbl* tbl, gpr_log(GPR_DEBUG, "Update hpack parser max size to %d", max_bytes); } while (tbl->mem_used > max_bytes) { - evict1(tbl); + evict1(exec_ctx, tbl); } tbl->max_bytes = max_bytes; } -grpc_error* grpc_chttp2_hptbl_set_current_table_size(grpc_chttp2_hptbl* tbl, +grpc_error* grpc_chttp2_hptbl_set_current_table_size(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hptbl* tbl, uint32_t bytes) { if (tbl->current_table_bytes == bytes) { return GRPC_ERROR_NONE; @@ -269,7 +274,7 @@ grpc_error* grpc_chttp2_hptbl_set_current_table_size(grpc_chttp2_hptbl* tbl, gpr_log(GPR_DEBUG, "Update hpack parser table size to %d", bytes); } while (tbl->mem_used > bytes) { - evict1(tbl); + evict1(exec_ctx, tbl); } tbl->current_table_bytes = bytes; tbl->max_entries = entries_for_bytes(bytes); @@ -284,7 +289,8 @@ grpc_error* grpc_chttp2_hptbl_set_current_table_size(grpc_chttp2_hptbl* tbl, return GRPC_ERROR_NONE; } -grpc_error* grpc_chttp2_hptbl_add(grpc_chttp2_hptbl* tbl, grpc_mdelem md) { +grpc_error* grpc_chttp2_hptbl_add(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hptbl* tbl, grpc_mdelem md) { /* determine how many bytes of buffer this entry represents */ size_t elem_bytes = GRPC_SLICE_LENGTH(GRPC_MDKEY(md)) + GRPC_SLICE_LENGTH(GRPC_MDVALUE(md)) + @@ -314,14 +320,14 @@ grpc_error* grpc_chttp2_hptbl_add(grpc_chttp2_hptbl* tbl, grpc_mdelem md) { * empty table. */ while (tbl->num_ents) { - evict1(tbl); + evict1(exec_ctx, tbl); } return GRPC_ERROR_NONE; } /* evict entries to ensure no overflow */ while (elem_bytes > (size_t)tbl->current_table_bytes - tbl->mem_used) { - evict1(tbl); + evict1(exec_ctx, tbl); } /* copy the finalized entry in */ diff --git a/src/core/ext/transport/chttp2/transport/hpack_table.h b/src/core/ext/transport/chttp2/transport/hpack_table.h index 189ad1c697f..aed7b13f0be 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_table.h +++ b/src/core/ext/transport/chttp2/transport/hpack_table.h @@ -69,18 +69,21 @@ typedef struct { } grpc_chttp2_hptbl; /* initialize a hpack table */ -void grpc_chttp2_hptbl_init(grpc_chttp2_hptbl* tbl); -void grpc_chttp2_hptbl_destroy(grpc_chttp2_hptbl* tbl); -void grpc_chttp2_hptbl_set_max_bytes(grpc_chttp2_hptbl* tbl, +void grpc_chttp2_hptbl_init(grpc_exec_ctx* exec_ctx, grpc_chttp2_hptbl* tbl); +void grpc_chttp2_hptbl_destroy(grpc_exec_ctx* exec_ctx, grpc_chttp2_hptbl* tbl); +void grpc_chttp2_hptbl_set_max_bytes(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hptbl* tbl, uint32_t max_bytes); -grpc_error* grpc_chttp2_hptbl_set_current_table_size(grpc_chttp2_hptbl* tbl, +grpc_error* grpc_chttp2_hptbl_set_current_table_size(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hptbl* tbl, uint32_t bytes); /* lookup a table entry based on its hpack index */ grpc_mdelem grpc_chttp2_hptbl_lookup(const grpc_chttp2_hptbl* tbl, uint32_t index); /* add a table entry to the index */ -grpc_error* grpc_chttp2_hptbl_add(grpc_chttp2_hptbl* tbl, +grpc_error* grpc_chttp2_hptbl_add(grpc_exec_ctx* exec_ctx, + grpc_chttp2_hptbl* tbl, grpc_mdelem md) GRPC_MUST_USE_RESULT; /* Find a key/value pair in the table... returns the index in the table of the most similar entry, or 0 if the value was not found */ diff --git a/src/core/ext/transport/chttp2/transport/incoming_metadata.cc b/src/core/ext/transport/chttp2/transport/incoming_metadata.cc index ef0c9ed230d..4461f8c12c5 100644 --- a/src/core/ext/transport/chttp2/transport/incoming_metadata.cc +++ b/src/core/ext/transport/chttp2/transport/incoming_metadata.cc @@ -33,31 +33,33 @@ void grpc_chttp2_incoming_metadata_buffer_init( } void grpc_chttp2_incoming_metadata_buffer_destroy( - grpc_chttp2_incoming_metadata_buffer* buffer) { - grpc_metadata_batch_destroy(&buffer->batch); + grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_metadata_buffer* buffer) { + grpc_metadata_batch_destroy(exec_ctx, &buffer->batch); } grpc_error* grpc_chttp2_incoming_metadata_buffer_add( - grpc_chttp2_incoming_metadata_buffer* buffer, grpc_mdelem elem) { + grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_metadata_buffer* buffer, + grpc_mdelem elem) { buffer->size += GRPC_MDELEM_LENGTH(elem); return grpc_metadata_batch_add_tail( - &buffer->batch, + exec_ctx, &buffer->batch, (grpc_linked_mdelem*)gpr_arena_alloc(buffer->arena, sizeof(grpc_linked_mdelem)), elem); } grpc_error* grpc_chttp2_incoming_metadata_buffer_replace_or_add( - grpc_chttp2_incoming_metadata_buffer* buffer, grpc_mdelem elem) { + grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_metadata_buffer* buffer, + grpc_mdelem elem) { for (grpc_linked_mdelem* l = buffer->batch.list.head; l != nullptr; l = l->next) { if (grpc_slice_eq(GRPC_MDKEY(l->md), GRPC_MDKEY(elem))) { - GRPC_MDELEM_UNREF(l->md); + GRPC_MDELEM_UNREF(exec_ctx, l->md); l->md = elem; return GRPC_ERROR_NONE; } } - return grpc_chttp2_incoming_metadata_buffer_add(buffer, elem); + return grpc_chttp2_incoming_metadata_buffer_add(exec_ctx, buffer, elem); } void grpc_chttp2_incoming_metadata_buffer_set_deadline( @@ -66,7 +68,8 @@ void grpc_chttp2_incoming_metadata_buffer_set_deadline( } void grpc_chttp2_incoming_metadata_buffer_publish( - grpc_chttp2_incoming_metadata_buffer* buffer, grpc_metadata_batch* batch) { + grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_metadata_buffer* buffer, + grpc_metadata_batch* batch) { *batch = buffer->batch; grpc_metadata_batch_init(&buffer->batch); } diff --git a/src/core/ext/transport/chttp2/transport/incoming_metadata.h b/src/core/ext/transport/chttp2/transport/incoming_metadata.h index b84cd484c4d..6f2b81ef6ce 100644 --- a/src/core/ext/transport/chttp2/transport/incoming_metadata.h +++ b/src/core/ext/transport/chttp2/transport/incoming_metadata.h @@ -31,15 +31,16 @@ typedef struct { void grpc_chttp2_incoming_metadata_buffer_init( grpc_chttp2_incoming_metadata_buffer* buffer, gpr_arena* arena); void grpc_chttp2_incoming_metadata_buffer_destroy( - grpc_chttp2_incoming_metadata_buffer* buffer); + grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_metadata_buffer* buffer); void grpc_chttp2_incoming_metadata_buffer_publish( - grpc_chttp2_incoming_metadata_buffer* buffer, grpc_metadata_batch* batch); + grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_metadata_buffer* buffer, + grpc_metadata_batch* batch); grpc_error* grpc_chttp2_incoming_metadata_buffer_add( - grpc_chttp2_incoming_metadata_buffer* buffer, + grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_metadata_buffer* buffer, grpc_mdelem elem) GRPC_MUST_USE_RESULT; grpc_error* grpc_chttp2_incoming_metadata_buffer_replace_or_add( - grpc_chttp2_incoming_metadata_buffer* buffer, + grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_metadata_buffer* buffer, grpc_mdelem elem) GRPC_MUST_USE_RESULT; void grpc_chttp2_incoming_metadata_buffer_set_deadline( grpc_chttp2_incoming_metadata_buffer* buffer, grpc_millis deadline); diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h index 932f5ba83d0..f6fd6795d0a 100644 --- a/src/core/ext/transport/chttp2/transport/internal.h +++ b/src/core/ext/transport/chttp2/transport/internal.h @@ -282,8 +282,8 @@ struct grpc_chttp2_transport { struct { /* accept stream callback */ - void (*accept_stream)(void* user_data, grpc_transport* transport, - const void* server_data); + void (*accept_stream)(grpc_exec_ctx* exec_ctx, void* user_data, + grpc_transport* transport, const void* server_data); void* accept_stream_user_data; /** connectivity tracking */ @@ -371,8 +371,9 @@ struct grpc_chttp2_transport { /* active parser */ void* parser_data; grpc_chttp2_stream* incoming_stream; - grpc_error* (*parser)(void* parser_user_data, grpc_chttp2_transport* t, - grpc_chttp2_stream* s, grpc_slice slice, int is_last); + grpc_error* (*parser)(grpc_exec_ctx* exec_ctx, void* parser_user_data, + grpc_chttp2_transport* t, grpc_chttp2_stream* s, + grpc_slice slice, int is_last); grpc_chttp2_write_cb* write_cb_pool; @@ -570,7 +571,8 @@ struct grpc_chttp2_stream { The actual call chain is documented in the implementation of this function. */ -void grpc_chttp2_initiate_write(grpc_chttp2_transport* t, +void grpc_chttp2_initiate_write(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_initiate_write_reason reason); typedef struct { @@ -583,12 +585,14 @@ typedef struct { } grpc_chttp2_begin_write_result; grpc_chttp2_begin_write_result grpc_chttp2_begin_write( - grpc_chttp2_transport* t); -void grpc_chttp2_end_write(grpc_chttp2_transport* t, grpc_error* error); + grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t); +void grpc_chttp2_end_write(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, + grpc_error* error); /** Process one slice of incoming data; return 1 if the connection is still viable after reading, or 0 if the connection should be torn down */ -grpc_error* grpc_chttp2_perform_read(grpc_chttp2_transport* t, +grpc_error* grpc_chttp2_perform_read(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_slice slice); bool grpc_chttp2_list_add_writable_stream(grpc_chttp2_transport* t, @@ -636,23 +640,27 @@ bool grpc_chttp2_list_remove_stalled_by_stream(grpc_chttp2_transport* t, // Takes in a flow control action and performs all the needed operations. void grpc_chttp2_act_on_flowctl_action( - const grpc_core::chttp2::FlowControlAction& action, + grpc_exec_ctx* exec_ctx, const grpc_core::chttp2::FlowControlAction& action, grpc_chttp2_transport* t, grpc_chttp2_stream* s); /********* End of Flow Control ***************/ grpc_chttp2_stream* grpc_chttp2_parsing_lookup_stream(grpc_chttp2_transport* t, uint32_t id); -grpc_chttp2_stream* grpc_chttp2_parsing_accept_stream(grpc_chttp2_transport* t, +grpc_chttp2_stream* grpc_chttp2_parsing_accept_stream(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, uint32_t id); -void grpc_chttp2_add_incoming_goaway(grpc_chttp2_transport* t, +void grpc_chttp2_add_incoming_goaway(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, uint32_t goaway_error, grpc_slice goaway_text); -void grpc_chttp2_parsing_become_skip_parser(grpc_chttp2_transport* t); +void grpc_chttp2_parsing_become_skip_parser(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t); -void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t, +void grpc_chttp2_complete_closure_step(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_closure** pclosure, grpc_error* error, const char* desc); @@ -673,80 +681,94 @@ void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t, else \ stmt -void grpc_chttp2_fake_status(grpc_chttp2_transport* t, +void grpc_chttp2_fake_status(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, grpc_chttp2_stream* stream, grpc_error* error); -void grpc_chttp2_mark_stream_closed(grpc_chttp2_transport* t, +void grpc_chttp2_mark_stream_closed(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s, int close_reads, int close_writes, grpc_error* error); -void grpc_chttp2_start_writing(grpc_chttp2_transport* t); +void grpc_chttp2_start_writing(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t); #ifndef NDEBUG #define GRPC_CHTTP2_STREAM_REF(stream, reason) \ grpc_chttp2_stream_ref(stream, reason) -#define GRPC_CHTTP2_STREAM_UNREF(stream, reason) \ - grpc_chttp2_stream_unref(stream, reason) +#define GRPC_CHTTP2_STREAM_UNREF(exec_ctx, stream, reason) \ + grpc_chttp2_stream_unref(exec_ctx, stream, reason) void grpc_chttp2_stream_ref(grpc_chttp2_stream* s, const char* reason); -void grpc_chttp2_stream_unref(grpc_chttp2_stream* s, const char* reason); +void grpc_chttp2_stream_unref(grpc_exec_ctx* exec_ctx, grpc_chttp2_stream* s, + const char* reason); #else #define GRPC_CHTTP2_STREAM_REF(stream, reason) grpc_chttp2_stream_ref(stream) -#define GRPC_CHTTP2_STREAM_UNREF(stream, reason) \ - grpc_chttp2_stream_unref(stream) +#define GRPC_CHTTP2_STREAM_UNREF(exec_ctx, stream, reason) \ + grpc_chttp2_stream_unref(exec_ctx, stream) void grpc_chttp2_stream_ref(grpc_chttp2_stream* s); -void grpc_chttp2_stream_unref(grpc_chttp2_stream* s); +void grpc_chttp2_stream_unref(grpc_exec_ctx* exec_ctx, grpc_chttp2_stream* s); #endif #ifndef NDEBUG #define GRPC_CHTTP2_REF_TRANSPORT(t, r) \ grpc_chttp2_ref_transport(t, r, __FILE__, __LINE__) -#define GRPC_CHTTP2_UNREF_TRANSPORT(t, r) \ - grpc_chttp2_unref_transport(t, r, __FILE__, __LINE__) -void grpc_chttp2_unref_transport(grpc_chttp2_transport* t, const char* reason, +#define GRPC_CHTTP2_UNREF_TRANSPORT(cl, t, r) \ + grpc_chttp2_unref_transport(cl, t, r, __FILE__, __LINE__) +void grpc_chttp2_unref_transport(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, const char* reason, const char* file, int line); void grpc_chttp2_ref_transport(grpc_chttp2_transport* t, const char* reason, const char* file, int line); #else #define GRPC_CHTTP2_REF_TRANSPORT(t, r) grpc_chttp2_ref_transport(t) -#define GRPC_CHTTP2_UNREF_TRANSPORT(t, r) grpc_chttp2_unref_transport(t) -void grpc_chttp2_unref_transport(grpc_chttp2_transport* t); +#define GRPC_CHTTP2_UNREF_TRANSPORT(cl, t, r) grpc_chttp2_unref_transport(cl, t) +void grpc_chttp2_unref_transport(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t); void grpc_chttp2_ref_transport(grpc_chttp2_transport* t); #endif grpc_chttp2_incoming_byte_stream* grpc_chttp2_incoming_byte_stream_create( - grpc_chttp2_transport* t, grpc_chttp2_stream* s, uint32_t frame_size, - uint32_t flags); + grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, grpc_chttp2_stream* s, + uint32_t frame_size, uint32_t flags); grpc_error* grpc_chttp2_incoming_byte_stream_push( - grpc_chttp2_incoming_byte_stream* bs, grpc_slice slice, - grpc_slice* slice_out); + grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_byte_stream* bs, + grpc_slice slice, grpc_slice* slice_out); grpc_error* grpc_chttp2_incoming_byte_stream_finished( - grpc_chttp2_incoming_byte_stream* bs, grpc_error* error, - bool reset_on_error); + grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_byte_stream* bs, + grpc_error* error, bool reset_on_error); void grpc_chttp2_incoming_byte_stream_notify( - grpc_chttp2_incoming_byte_stream* bs, grpc_error* error); + grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_byte_stream* bs, + grpc_error* error); -void grpc_chttp2_ack_ping(grpc_chttp2_transport* t, uint64_t id); +void grpc_chttp2_ack_ping(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, + uint64_t id); /** Add a new ping strike to ping_recv_state.ping_strikes. If ping_recv_state.ping_strikes > ping_policy.max_ping_strikes, it sends GOAWAY with error code ENHANCE_YOUR_CALM and additional debug data resembling "too_many_pings" followed by immediately closing the connection. */ -void grpc_chttp2_add_ping_strike(grpc_chttp2_transport* t); +void grpc_chttp2_add_ping_strike(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t); /** add a ref to the stream and add it to the writable list; ref will be dropped in writing.c */ -void grpc_chttp2_mark_stream_writable(grpc_chttp2_transport* t, +void grpc_chttp2_mark_stream_writable(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s); -void grpc_chttp2_cancel_stream(grpc_chttp2_transport* t, grpc_chttp2_stream* s, +void grpc_chttp2_cancel_stream(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_error* due_to_error); -void grpc_chttp2_maybe_complete_recv_initial_metadata(grpc_chttp2_transport* t, +void grpc_chttp2_maybe_complete_recv_initial_metadata(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s); -void grpc_chttp2_maybe_complete_recv_message(grpc_chttp2_transport* t, +void grpc_chttp2_maybe_complete_recv_message(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s); -void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_chttp2_transport* t, +void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s); -void grpc_chttp2_fail_pending_writes(grpc_chttp2_transport* t, +void grpc_chttp2_fail_pending_writes(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_error* error); /** Set the default keepalive configurations, must only be called at diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index a56f89cc752..46ec3fbaa61 100644 --- a/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/src/core/ext/transport/chttp2/transport/parsing.cc @@ -31,22 +31,33 @@ #include "src/core/lib/transport/status_conversion.h" #include "src/core/lib/transport/timeout_encoding.h" -static grpc_error* init_frame_parser(grpc_chttp2_transport* t); -static grpc_error* init_header_frame_parser(grpc_chttp2_transport* t, +static grpc_error* init_frame_parser(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t); +static grpc_error* init_header_frame_parser(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, int is_continuation); -static grpc_error* init_data_frame_parser(grpc_chttp2_transport* t); -static grpc_error* init_rst_stream_parser(grpc_chttp2_transport* t); -static grpc_error* init_settings_frame_parser(grpc_chttp2_transport* t); -static grpc_error* init_window_update_frame_parser(grpc_chttp2_transport* t); -static grpc_error* init_ping_parser(grpc_chttp2_transport* t); -static grpc_error* init_goaway_parser(grpc_chttp2_transport* t); -static grpc_error* init_skip_frame_parser(grpc_chttp2_transport* t, +static grpc_error* init_data_frame_parser(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t); +static grpc_error* init_rst_stream_parser(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t); +static grpc_error* init_settings_frame_parser(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t); +static grpc_error* init_window_update_frame_parser(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t); +static grpc_error* init_ping_parser(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t); +static grpc_error* init_goaway_parser(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t); +static grpc_error* init_skip_frame_parser(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, int is_header); -static grpc_error* parse_frame_slice(grpc_chttp2_transport* t, grpc_slice slice, +static grpc_error* parse_frame_slice(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_slice slice, int is_last); -grpc_error* grpc_chttp2_perform_read(grpc_chttp2_transport* t, +grpc_error* grpc_chttp2_perform_read(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_slice slice) { uint8_t* beg = GRPC_SLICE_START_PTR(slice); uint8_t* end = GRPC_SLICE_END_PTR(slice); @@ -171,12 +182,12 @@ grpc_error* grpc_chttp2_perform_read(grpc_chttp2_transport* t, GPR_ASSERT(cur < end); t->incoming_stream_id |= ((uint32_t)*cur); t->deframe_state = GRPC_DTS_FRAME; - err = init_frame_parser(t); + err = init_frame_parser(exec_ctx, t); if (err != GRPC_ERROR_NONE) { return err; } if (t->incoming_frame_size == 0) { - err = parse_frame_slice(t, grpc_empty_slice(), 1); + err = parse_frame_slice(exec_ctx, t, grpc_empty_slice(), 1); if (err != GRPC_ERROR_NONE) { return err; } @@ -206,7 +217,7 @@ grpc_error* grpc_chttp2_perform_read(grpc_chttp2_transport* t, GPR_ASSERT(cur < end); if ((uint32_t)(end - cur) == t->incoming_frame_size) { err = - parse_frame_slice(t, + parse_frame_slice(exec_ctx, t, grpc_slice_sub_no_ref(slice, (size_t)(cur - beg), (size_t)(end - beg)), 1); @@ -219,7 +230,7 @@ grpc_error* grpc_chttp2_perform_read(grpc_chttp2_transport* t, } else if ((uint32_t)(end - cur) > t->incoming_frame_size) { size_t cur_offset = (size_t)(cur - beg); err = parse_frame_slice( - t, + exec_ctx, t, grpc_slice_sub_no_ref(slice, cur_offset, cur_offset + t->incoming_frame_size), 1); @@ -231,7 +242,7 @@ grpc_error* grpc_chttp2_perform_read(grpc_chttp2_transport* t, goto dts_fh_0; /* loop */ } else { err = - parse_frame_slice(t, + parse_frame_slice(exec_ctx, t, grpc_slice_sub_no_ref(slice, (size_t)(cur - beg), (size_t)(end - beg)), 0); @@ -247,7 +258,8 @@ grpc_error* grpc_chttp2_perform_read(grpc_chttp2_transport* t, GPR_UNREACHABLE_CODE(return nullptr); } -static grpc_error* init_frame_parser(grpc_chttp2_transport* t) { +static grpc_error* init_frame_parser(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t) { if (t->is_first_frame && t->incoming_frame_type != GRPC_CHTTP2_FRAME_SETTINGS) { char* msg; @@ -279,43 +291,46 @@ static grpc_error* init_frame_parser(grpc_chttp2_transport* t) { gpr_free(msg); return err; } - return init_header_frame_parser(t, 1); + return init_header_frame_parser(exec_ctx, t, 1); } switch (t->incoming_frame_type) { case GRPC_CHTTP2_FRAME_DATA: - return init_data_frame_parser(t); + return init_data_frame_parser(exec_ctx, t); case GRPC_CHTTP2_FRAME_HEADER: - return init_header_frame_parser(t, 0); + return init_header_frame_parser(exec_ctx, t, 0); case GRPC_CHTTP2_FRAME_CONTINUATION: return GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Unexpected CONTINUATION frame"); case GRPC_CHTTP2_FRAME_RST_STREAM: - return init_rst_stream_parser(t); + return init_rst_stream_parser(exec_ctx, t); case GRPC_CHTTP2_FRAME_SETTINGS: - return init_settings_frame_parser(t); + return init_settings_frame_parser(exec_ctx, t); case GRPC_CHTTP2_FRAME_WINDOW_UPDATE: - return init_window_update_frame_parser(t); + return init_window_update_frame_parser(exec_ctx, t); case GRPC_CHTTP2_FRAME_PING: - return init_ping_parser(t); + return init_ping_parser(exec_ctx, t); case GRPC_CHTTP2_FRAME_GOAWAY: - return init_goaway_parser(t); + return init_goaway_parser(exec_ctx, t); default: if (grpc_http_trace.enabled()) { gpr_log(GPR_ERROR, "Unknown frame type %02x", t->incoming_frame_type); } - return init_skip_frame_parser(t, 0); + return init_skip_frame_parser(exec_ctx, t, 0); } } -static grpc_error* skip_parser(void* parser, grpc_chttp2_transport* t, - grpc_chttp2_stream* s, grpc_slice slice, - int is_last) { +static grpc_error* skip_parser(grpc_exec_ctx* exec_ctx, void* parser, + grpc_chttp2_transport* t, grpc_chttp2_stream* s, + grpc_slice slice, int is_last) { return GRPC_ERROR_NONE; } -static void skip_header(void* tp, grpc_mdelem md) { GRPC_MDELEM_UNREF(md); } +static void skip_header(grpc_exec_ctx* exec_ctx, void* tp, grpc_mdelem md) { + GRPC_MDELEM_UNREF(exec_ctx, md); +} -static grpc_error* init_skip_frame_parser(grpc_chttp2_transport* t, +static grpc_error* init_skip_frame_parser(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, int is_header) { if (is_header) { uint8_t is_eoh = t->expect_continuation_stream_id != 0; @@ -331,11 +346,14 @@ static grpc_error* init_skip_frame_parser(grpc_chttp2_transport* t, return GRPC_ERROR_NONE; } -void grpc_chttp2_parsing_become_skip_parser(grpc_chttp2_transport* t) { - init_skip_frame_parser(t, t->parser == grpc_chttp2_header_parser_parse); +void grpc_chttp2_parsing_become_skip_parser(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t) { + init_skip_frame_parser(exec_ctx, t, + t->parser == grpc_chttp2_header_parser_parse); } -static grpc_error* init_data_frame_parser(grpc_chttp2_transport* t) { +static grpc_error* init_data_frame_parser(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t) { grpc_chttp2_stream* s = grpc_chttp2_parsing_lookup_stream(t, t->incoming_stream_id); grpc_error* err = GRPC_ERROR_NONE; @@ -347,17 +365,17 @@ static grpc_error* init_data_frame_parser(grpc_chttp2_transport* t) { err = s->flow_control->RecvData(t->incoming_frame_size); action = s->flow_control->MakeAction(); } - grpc_chttp2_act_on_flowctl_action(action, t, s); + grpc_chttp2_act_on_flowctl_action(exec_ctx, action, t, s); if (err != GRPC_ERROR_NONE) { goto error_handler; } if (s == nullptr) { - return init_skip_frame_parser(t, 0); + return init_skip_frame_parser(exec_ctx, t, 0); } s->received_bytes += t->incoming_frame_size; s->stats.incoming.framing_bytes += 9; if (err == GRPC_ERROR_NONE && s->read_closed) { - return init_skip_frame_parser(t, 0); + return init_skip_frame_parser(exec_ctx, t, 0); } if (err == GRPC_ERROR_NONE) { err = grpc_chttp2_data_parser_begin_frame( @@ -376,13 +394,13 @@ error_handler: } else if (grpc_error_get_int(err, GRPC_ERROR_INT_STREAM_ID, nullptr)) { /* handle stream errors by closing the stream */ if (s != nullptr) { - grpc_chttp2_mark_stream_closed(t, s, true, false, err); + grpc_chttp2_mark_stream_closed(exec_ctx, t, s, true, false, err); } grpc_slice_buffer_add( &t->qbuf, grpc_chttp2_rst_stream_create(t->incoming_stream_id, GRPC_HTTP2_PROTOCOL_ERROR, &s->stats.outgoing)); - return init_skip_frame_parser(t, 0); + return init_skip_frame_parser(exec_ctx, t, 0); } else { return err; } @@ -390,7 +408,8 @@ error_handler: static void free_timeout(void* p) { gpr_free(p); } -static void on_initial_header(void* tp, grpc_mdelem md) { +static void on_initial_header(grpc_exec_ctx* exec_ctx, void* tp, + grpc_mdelem md) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)tp; grpc_chttp2_stream* s = t->incoming_stream; @@ -436,9 +455,9 @@ static void on_initial_header(void* tp, grpc_mdelem md) { } if (timeout != GRPC_MILLIS_INF_FUTURE) { grpc_chttp2_incoming_metadata_buffer_set_deadline( - &s->metadata_buffer[0], grpc_core::ExecCtx::Get()->Now() + timeout); + &s->metadata_buffer[0], grpc_exec_ctx_now(exec_ctx) + timeout); } - GRPC_MDELEM_UNREF(md); + GRPC_MDELEM_UNREF(exec_ctx, md); } else { const size_t new_size = s->metadata_buffer[0].size + GRPC_MDELEM_LENGTH(md); const size_t metadata_size_limit = @@ -450,22 +469,22 @@ static void on_initial_header(void* tp, grpc_mdelem md) { " vs. %" PRIuPTR ")", new_size, metadata_size_limit); grpc_chttp2_cancel_stream( - t, s, + exec_ctx, t, s, grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "received initial metadata size exceeds limit"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_RESOURCE_EXHAUSTED)); - grpc_chttp2_parsing_become_skip_parser(t); + grpc_chttp2_parsing_become_skip_parser(exec_ctx, t); s->seen_error = true; - GRPC_MDELEM_UNREF(md); + GRPC_MDELEM_UNREF(exec_ctx, md); } else { - grpc_error* error = - grpc_chttp2_incoming_metadata_buffer_add(&s->metadata_buffer[0], md); + grpc_error* error = grpc_chttp2_incoming_metadata_buffer_add( + exec_ctx, &s->metadata_buffer[0], md); if (error != GRPC_ERROR_NONE) { - grpc_chttp2_cancel_stream(t, s, error); - grpc_chttp2_parsing_become_skip_parser(t); + grpc_chttp2_cancel_stream(exec_ctx, t, s, error); + grpc_chttp2_parsing_become_skip_parser(exec_ctx, t); s->seen_error = true; - GRPC_MDELEM_UNREF(md); + GRPC_MDELEM_UNREF(exec_ctx, md); } } } @@ -473,7 +492,8 @@ static void on_initial_header(void* tp, grpc_mdelem md) { GPR_TIMER_END("on_initial_header", 0); } -static void on_trailing_header(void* tp, grpc_mdelem md) { +static void on_trailing_header(grpc_exec_ctx* exec_ctx, void* tp, + grpc_mdelem md) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)tp; grpc_chttp2_stream* s = t->incoming_stream; @@ -507,29 +527,30 @@ static void on_trailing_header(void* tp, grpc_mdelem md) { " vs. %" PRIuPTR ")", new_size, metadata_size_limit); grpc_chttp2_cancel_stream( - t, s, + exec_ctx, t, s, grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "received trailing metadata size exceeds limit"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_RESOURCE_EXHAUSTED)); - grpc_chttp2_parsing_become_skip_parser(t); + grpc_chttp2_parsing_become_skip_parser(exec_ctx, t); s->seen_error = true; - GRPC_MDELEM_UNREF(md); + GRPC_MDELEM_UNREF(exec_ctx, md); } else { - grpc_error* error = - grpc_chttp2_incoming_metadata_buffer_add(&s->metadata_buffer[1], md); + grpc_error* error = grpc_chttp2_incoming_metadata_buffer_add( + exec_ctx, &s->metadata_buffer[1], md); if (error != GRPC_ERROR_NONE) { - grpc_chttp2_cancel_stream(t, s, error); - grpc_chttp2_parsing_become_skip_parser(t); + grpc_chttp2_cancel_stream(exec_ctx, t, s, error); + grpc_chttp2_parsing_become_skip_parser(exec_ctx, t); s->seen_error = true; - GRPC_MDELEM_UNREF(md); + GRPC_MDELEM_UNREF(exec_ctx, md); } } GPR_TIMER_END("on_trailing_header", 0); } -static grpc_error* init_header_frame_parser(grpc_chttp2_transport* t, +static grpc_error* init_header_frame_parser(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, int is_continuation) { uint8_t is_eoh = (t->incoming_frame_flags & GRPC_CHTTP2_DATA_FLAG_END_HEADERS) != 0; @@ -559,7 +580,7 @@ static grpc_error* init_header_frame_parser(grpc_chttp2_transport* t, GRPC_CHTTP2_IF_TRACING( gpr_log(GPR_ERROR, "grpc_chttp2_stream disbanded before CONTINUATION received")); - return init_skip_frame_parser(t, 1); + return init_skip_frame_parser(exec_ctx, t, 1); } if (t->is_client) { if ((t->incoming_stream_id & 1) && @@ -569,7 +590,7 @@ static grpc_error* init_header_frame_parser(grpc_chttp2_transport* t, GRPC_CHTTP2_IF_TRACING(gpr_log( GPR_ERROR, "ignoring new grpc_chttp2_stream creation on client")); } - grpc_error* err = init_skip_frame_parser(t, 1); + grpc_error* err = init_skip_frame_parser(exec_ctx, t, 1); if (t->incoming_frame_flags & GRPC_CHTTP2_FLAG_HAS_PRIORITY) { grpc_chttp2_hpack_parser_set_has_priority(&t->hpack_parser); } @@ -581,13 +602,13 @@ static grpc_error* init_header_frame_parser(grpc_chttp2_transport* t, "last grpc_chttp2_stream " "id=%d, new grpc_chttp2_stream id=%d", t->last_new_stream_id, t->incoming_stream_id)); - return init_skip_frame_parser(t, 1); + return init_skip_frame_parser(exec_ctx, t, 1); } else if ((t->incoming_stream_id & 1) == 0) { GRPC_CHTTP2_IF_TRACING(gpr_log( GPR_ERROR, "ignoring grpc_chttp2_stream with non-client generated index %d", t->incoming_stream_id)); - return init_skip_frame_parser(t, 1); + return init_skip_frame_parser(exec_ctx, t, 1); } else if (grpc_chttp2_stream_map_size(&t->stream_map) >= t->settings[GRPC_ACKED_SETTINGS] [GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS]) { @@ -595,11 +616,11 @@ static grpc_error* init_header_frame_parser(grpc_chttp2_transport* t, } t->last_new_stream_id = t->incoming_stream_id; s = t->incoming_stream = - grpc_chttp2_parsing_accept_stream(t, t->incoming_stream_id); + grpc_chttp2_parsing_accept_stream(exec_ctx, t, t->incoming_stream_id); if (s == nullptr) { GRPC_CHTTP2_IF_TRACING( gpr_log(GPR_ERROR, "grpc_chttp2_stream not accepted")); - return init_skip_frame_parser(t, 1); + return init_skip_frame_parser(exec_ctx, t, 1); } } else { t->incoming_stream = s; @@ -610,7 +631,7 @@ static grpc_error* init_header_frame_parser(grpc_chttp2_transport* t, GRPC_CHTTP2_IF_TRACING(gpr_log( GPR_ERROR, "skipping already closed grpc_chttp2_stream header")); t->incoming_stream = nullptr; - return init_skip_frame_parser(t, 1); + return init_skip_frame_parser(exec_ctx, t, 1); } t->parser = grpc_chttp2_header_parser_parse; t->parser_data = &t->hpack_parser; @@ -635,7 +656,7 @@ static grpc_error* init_header_frame_parser(grpc_chttp2_transport* t, break; case 2: gpr_log(GPR_ERROR, "too many header frames received"); - return init_skip_frame_parser(t, 1); + return init_skip_frame_parser(exec_ctx, t, 1); } t->hpack_parser.on_header_user_data = t; t->hpack_parser.is_boundary = is_eoh; @@ -647,7 +668,8 @@ static grpc_error* init_header_frame_parser(grpc_chttp2_transport* t, return GRPC_ERROR_NONE; } -static grpc_error* init_window_update_frame_parser(grpc_chttp2_transport* t) { +static grpc_error* init_window_update_frame_parser(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t) { grpc_error* err = grpc_chttp2_window_update_parser_begin_frame( &t->simple.window_update, t->incoming_frame_size, t->incoming_frame_flags); @@ -656,7 +678,7 @@ static grpc_error* init_window_update_frame_parser(grpc_chttp2_transport* t) { grpc_chttp2_stream* s = t->incoming_stream = grpc_chttp2_parsing_lookup_stream(t, t->incoming_stream_id); if (s == nullptr) { - return init_skip_frame_parser(t, 0); + return init_skip_frame_parser(exec_ctx, t, 0); } s->stats.incoming.framing_bytes += 9; } @@ -665,7 +687,8 @@ static grpc_error* init_window_update_frame_parser(grpc_chttp2_transport* t) { return GRPC_ERROR_NONE; } -static grpc_error* init_ping_parser(grpc_chttp2_transport* t) { +static grpc_error* init_ping_parser(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t) { grpc_error* err = grpc_chttp2_ping_parser_begin_frame( &t->simple.ping, t->incoming_frame_size, t->incoming_frame_flags); if (err != GRPC_ERROR_NONE) return err; @@ -674,14 +697,15 @@ static grpc_error* init_ping_parser(grpc_chttp2_transport* t) { return GRPC_ERROR_NONE; } -static grpc_error* init_rst_stream_parser(grpc_chttp2_transport* t) { +static grpc_error* init_rst_stream_parser(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t) { grpc_error* err = grpc_chttp2_rst_stream_parser_begin_frame( &t->simple.rst_stream, t->incoming_frame_size, t->incoming_frame_flags); if (err != GRPC_ERROR_NONE) return err; grpc_chttp2_stream* s = t->incoming_stream = grpc_chttp2_parsing_lookup_stream(t, t->incoming_stream_id); if (!t->incoming_stream) { - return init_skip_frame_parser(t, 0); + return init_skip_frame_parser(exec_ctx, t, 0); } s->stats.incoming.framing_bytes += 9; t->parser = grpc_chttp2_rst_stream_parser_parse; @@ -689,7 +713,8 @@ static grpc_error* init_rst_stream_parser(grpc_chttp2_transport* t) { return GRPC_ERROR_NONE; } -static grpc_error* init_goaway_parser(grpc_chttp2_transport* t) { +static grpc_error* init_goaway_parser(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t) { grpc_error* err = grpc_chttp2_goaway_parser_begin_frame( &t->goaway_parser, t->incoming_frame_size, t->incoming_frame_flags); if (err != GRPC_ERROR_NONE) return err; @@ -698,7 +723,8 @@ static grpc_error* init_goaway_parser(grpc_chttp2_transport* t) { return GRPC_ERROR_NONE; } -static grpc_error* init_settings_frame_parser(grpc_chttp2_transport* t) { +static grpc_error* init_settings_frame_parser(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t) { if (t->incoming_stream_id != 0) { return GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Settings frame received for grpc_chttp2_stream"); @@ -714,7 +740,7 @@ static grpc_error* init_settings_frame_parser(grpc_chttp2_transport* t) { memcpy(t->settings[GRPC_ACKED_SETTINGS], t->settings[GRPC_SENT_SETTINGS], GRPC_CHTTP2_NUM_SETTINGS * sizeof(uint32_t)); grpc_chttp2_hptbl_set_max_bytes( - &t->hpack_parser.table, + exec_ctx, &t->hpack_parser.table, t->settings[GRPC_ACKED_SETTINGS] [GRPC_CHTTP2_SETTINGS_HEADER_TABLE_SIZE]); t->sent_local_settings = 0; @@ -724,10 +750,11 @@ static grpc_error* init_settings_frame_parser(grpc_chttp2_transport* t) { return GRPC_ERROR_NONE; } -static grpc_error* parse_frame_slice(grpc_chttp2_transport* t, grpc_slice slice, +static grpc_error* parse_frame_slice(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t, grpc_slice slice, int is_last) { grpc_chttp2_stream* s = t->incoming_stream; - grpc_error* err = t->parser(t->parser_data, t, s, slice, is_last); + grpc_error* err = t->parser(exec_ctx, t->parser_data, t, s, slice, is_last); if (err == GRPC_ERROR_NONE) { return err; } else if (grpc_error_get_int(err, GRPC_ERROR_INT_STREAM_ID, nullptr)) { @@ -735,7 +762,7 @@ static grpc_error* parse_frame_slice(grpc_chttp2_transport* t, grpc_slice slice, const char* msg = grpc_error_string(err); gpr_log(GPR_ERROR, "%s", msg); } - grpc_chttp2_parsing_become_skip_parser(t); + grpc_chttp2_parsing_become_skip_parser(exec_ctx, t); if (s) { s->forced_close_error = err; grpc_slice_buffer_add( diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc index 3310f35f5fe..204b5a77087 100644 --- a/src/core/ext/transport/chttp2/transport/writing.cc +++ b/src/core/ext/transport/chttp2/transport/writing.cc @@ -33,15 +33,17 @@ static void add_to_write_list(grpc_chttp2_write_cb** list, *list = cb; } -static void finish_write_cb(grpc_chttp2_transport* t, grpc_chttp2_stream* s, - grpc_chttp2_write_cb* cb, grpc_error* error) { - grpc_chttp2_complete_closure_step(t, s, &cb->closure, error, +static void finish_write_cb(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, + grpc_chttp2_stream* s, grpc_chttp2_write_cb* cb, + grpc_error* error) { + grpc_chttp2_complete_closure_step(exec_ctx, t, s, &cb->closure, error, "finish_write_cb"); cb->next = t->write_cb_pool; t->write_cb_pool = cb; } -static void maybe_initiate_ping(grpc_chttp2_transport* t) { +static void maybe_initiate_ping(grpc_exec_ctx* exec_ctx, + grpc_chttp2_transport* t) { grpc_chttp2_ping_queue* pq = &t->ping_queue; if (grpc_closure_list_empty(pq->lists[GRPC_CHTTP2_PCL_NEXT])) { /* no ping needed: wait */ @@ -66,7 +68,7 @@ static void maybe_initiate_ping(grpc_chttp2_transport* t) { } return; } - grpc_millis now = grpc_core::ExecCtx::Get()->Now(); + grpc_millis now = grpc_exec_ctx_now(exec_ctx); grpc_millis next_allowed_ping = t->ping_state.last_ping_sent_time + t->ping_policy.min_sent_ping_interval_without_data; @@ -87,20 +89,20 @@ static void maybe_initiate_ping(grpc_chttp2_transport* t) { } if (!t->ping_state.is_delayed_ping_timer_set) { t->ping_state.is_delayed_ping_timer_set = true; - grpc_timer_init(&t->ping_state.delayed_ping_timer, next_allowed_ping, - &t->retry_initiate_ping_locked); + grpc_timer_init(exec_ctx, &t->ping_state.delayed_ping_timer, + next_allowed_ping, &t->retry_initiate_ping_locked); } return; } pq->inflight_id = t->ping_ctr; t->ping_ctr++; - GRPC_CLOSURE_LIST_SCHED(&pq->lists[GRPC_CHTTP2_PCL_INITIATE]); + GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pq->lists[GRPC_CHTTP2_PCL_INITIATE]); grpc_closure_list_move(&pq->lists[GRPC_CHTTP2_PCL_NEXT], &pq->lists[GRPC_CHTTP2_PCL_INFLIGHT]); grpc_slice_buffer_add(&t->outbuf, grpc_chttp2_ping_create(false, pq->inflight_id)); - GRPC_STATS_INC_HTTP2_PINGS_SENT(); + GRPC_STATS_INC_HTTP2_PINGS_SENT(exec_ctx); t->ping_state.last_ping_sent_time = now; if (grpc_http_trace.enabled() || grpc_bdp_estimator_trace.enabled()) { gpr_log(GPR_DEBUG, "%s: Ping sent [%p]: %d/%d", @@ -112,9 +114,10 @@ static void maybe_initiate_ping(grpc_chttp2_transport* t) { (t->ping_state.pings_before_data_required != 0); } -static bool update_list(grpc_chttp2_transport* t, grpc_chttp2_stream* s, - int64_t send_bytes, grpc_chttp2_write_cb** list, - int64_t* ctr, grpc_error* error) { +static bool update_list(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, + grpc_chttp2_stream* s, int64_t send_bytes, + grpc_chttp2_write_cb** list, int64_t* ctr, + grpc_error* error) { bool sched_any = false; grpc_chttp2_write_cb* cb = *list; *list = nullptr; @@ -123,7 +126,7 @@ static bool update_list(grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_chttp2_write_cb* next = cb->next; if (cb->call_at_byte <= *ctr) { sched_any = true; - finish_write_cb(t, s, cb, GRPC_ERROR_REF(error)); + finish_write_cb(exec_ctx, t, s, cb, GRPC_ERROR_REF(error)); } else { add_to_write_list(list, cb); } @@ -176,22 +179,22 @@ class StreamWriteContext; class WriteContext { public: - WriteContext(grpc_chttp2_transport* t) : t_(t) { - GRPC_STATS_INC_HTTP2_WRITES_BEGUN(); + WriteContext(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t) : t_(t) { + GRPC_STATS_INC_HTTP2_WRITES_BEGUN(exec_ctx); GPR_TIMER_BEGIN("grpc_chttp2_begin_write", 0); } // TODO(ctiller): make this the destructor - void FlushStats() { + void FlushStats(grpc_exec_ctx* exec_ctx) { GRPC_STATS_INC_HTTP2_SEND_INITIAL_METADATA_PER_WRITE( - initial_metadata_writes_); - GRPC_STATS_INC_HTTP2_SEND_MESSAGE_PER_WRITE(message_writes_); + exec_ctx, initial_metadata_writes_); + GRPC_STATS_INC_HTTP2_SEND_MESSAGE_PER_WRITE(exec_ctx, message_writes_); GRPC_STATS_INC_HTTP2_SEND_TRAILING_METADATA_PER_WRITE( - trailing_metadata_writes_); - GRPC_STATS_INC_HTTP2_SEND_FLOWCTL_PER_WRITE(flow_control_writes_); + exec_ctx, trailing_metadata_writes_); + GRPC_STATS_INC_HTTP2_SEND_FLOWCTL_PER_WRITE(exec_ctx, flow_control_writes_); } - void FlushSettings() { + void FlushSettings(grpc_exec_ctx* exec_ctx) { if (t_->dirtied_local_settings && !t_->sent_local_settings) { grpc_slice_buffer_add( &t_->outbuf, grpc_chttp2_settings_create( @@ -201,17 +204,17 @@ class WriteContext { t_->force_send_settings = false; t_->dirtied_local_settings = false; t_->sent_local_settings = true; - GRPC_STATS_INC_HTTP2_SETTINGS_WRITES(); + GRPC_STATS_INC_HTTP2_SETTINGS_WRITES(exec_ctx); } } - void FlushQueuedBuffers() { + void FlushQueuedBuffers(grpc_exec_ctx* exec_ctx) { /* simple writes are queued to qbuf, and flushed here */ grpc_slice_buffer_move_into(&t_->qbuf, &t_->outbuf); GPR_ASSERT(t_->qbuf.count == 0); } - void FlushWindowUpdates() { + void FlushWindowUpdates(grpc_exec_ctx* exec_ctx) { uint32_t transport_announce = t_->flow_control->MaybeSendUpdate(t_->outbuf.count > 0); if (transport_announce) { @@ -231,7 +234,7 @@ class WriteContext { t_->ping_ack_count = 0; } - void EnactHpackSettings() { + void EnactHpackSettings(grpc_exec_ctx* exec_ctx) { grpc_chttp2_hpack_compressor_set_max_table_size( &t_->hpack_compressor, t_->settings[GRPC_PEER_SETTINGS] @@ -371,8 +374,8 @@ class DataSendContext { bool is_last_frame() const { return is_last_frame_; } - void CallCallbacks() { - if (update_list(t_, s_, + void CallCallbacks(grpc_exec_ctx* exec_ctx) { + if (update_list(exec_ctx, t_, s_, (int64_t)(s_->sending_bytes - sending_bytes_before_), &s_->on_flow_controlled_cbs, &s_->flow_controlled_bytes_flowed, GRPC_ERROR_NONE)) { @@ -400,7 +403,7 @@ class StreamWriteContext { s->flow_control->announced_window_delta()))); } - void FlushInitialMetadata() { + void FlushInitialMetadata(grpc_exec_ctx* exec_ctx) { /* send initial metadata if it's available */ if (s_->sent_initial_metadata) return; if (s_->send_initial_metadata == nullptr) return; @@ -427,7 +430,7 @@ class StreamWriteContext { [GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE], // max_frame_size &s_->stats.outgoing // stats }; - grpc_chttp2_encode_header(&t_->hpack_compressor, nullptr, 0, + grpc_chttp2_encode_header(exec_ctx, &t_->hpack_compressor, nullptr, 0, s_->send_initial_metadata, &hopt, &t_->outbuf); write_context_->ResetPingRecvClock(); write_context_->IncInitialMetadataWrites(); @@ -437,11 +440,11 @@ class StreamWriteContext { s_->sent_initial_metadata = true; write_context_->NoteScheduledResults(); grpc_chttp2_complete_closure_step( - t_, s_, &s_->send_initial_metadata_finished, GRPC_ERROR_NONE, + exec_ctx, t_, s_, &s_->send_initial_metadata_finished, GRPC_ERROR_NONE, "send_initial_metadata_finished"); } - void FlushWindowUpdates() { + void FlushWindowUpdates(grpc_exec_ctx* exec_ctx) { /* send any window updates */ const uint32_t stream_announce = s_->flow_control->MaybeSendUpdate(); if (stream_announce == 0) return; @@ -453,7 +456,7 @@ class StreamWriteContext { write_context_->IncWindowUpdateWrites(); } - void FlushData() { + void FlushData(grpc_exec_ctx* exec_ctx) { if (!s_->sent_initial_metadata) return; if (s_->flow_controlled_buffer.length == 0 && @@ -485,9 +488,9 @@ class StreamWriteContext { } write_context_->ResetPingRecvClock(); if (data_send_context.is_last_frame()) { - SentLastFrame(); + SentLastFrame(exec_ctx); } - data_send_context.CallCallbacks(); + data_send_context.CallCallbacks(exec_ctx); stream_became_writable_ = true; if (s_->flow_controlled_buffer.length > 0 || s_->compressed_data_buffer.length > 0) { @@ -497,7 +500,7 @@ class StreamWriteContext { write_context_->IncMessageWrites(); } - void FlushTrailingMetadata() { + void FlushTrailingMetadata(grpc_exec_ctx* exec_ctx) { if (!s_->sent_initial_metadata) return; if (s_->send_trailing_metadata == nullptr) return; @@ -518,18 +521,18 @@ class StreamWriteContext { t_->settings[GRPC_PEER_SETTINGS][GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE], &s_->stats.outgoing}; - grpc_chttp2_encode_header(&t_->hpack_compressor, + grpc_chttp2_encode_header(exec_ctx, &t_->hpack_compressor, extra_headers_for_trailing_metadata_, num_extra_headers_for_trailing_metadata_, s_->send_trailing_metadata, &hopt, &t_->outbuf); } write_context_->IncTrailingMetadataWrites(); write_context_->ResetPingRecvClock(); - SentLastFrame(); + SentLastFrame(exec_ctx); write_context_->NoteScheduledResults(); grpc_chttp2_complete_closure_step( - t_, s_, &s_->send_trailing_metadata_finished, GRPC_ERROR_NONE, + exec_ctx, t_, s_, &s_->send_trailing_metadata_finished, GRPC_ERROR_NONE, "send_trailing_metadata_finished"); } @@ -553,7 +556,7 @@ class StreamWriteContext { } } - void SentLastFrame() { + void SentLastFrame(grpc_exec_ctx* exec_ctx) { s_->send_trailing_metadata = nullptr; s_->sent_trailing_metadata = true; @@ -562,7 +565,7 @@ class StreamWriteContext { &t_->outbuf, grpc_chttp2_rst_stream_create( s_->id, GRPC_HTTP2_NO_ERROR, &s_->stats.outgoing)); } - grpc_chttp2_mark_stream_closed(t_, s_, !t_->is_client, true, + grpc_chttp2_mark_stream_closed(exec_ctx, t_, s_, !t_->is_client, true, GRPC_ERROR_NONE); } @@ -576,12 +579,12 @@ class StreamWriteContext { } // namespace grpc_chttp2_begin_write_result grpc_chttp2_begin_write( - grpc_chttp2_transport* t) { - WriteContext ctx(t); - ctx.FlushSettings(); + grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t) { + WriteContext ctx(exec_ctx, t); + ctx.FlushSettings(exec_ctx); ctx.FlushPingAcks(); - ctx.FlushQueuedBuffers(); - ctx.EnactHpackSettings(); + ctx.FlushQueuedBuffers(exec_ctx); + ctx.EnactHpackSettings(exec_ctx); if (t->flow_control->remote_window() > 0) { ctx.UpdateStreamsNoLongerStalled(); @@ -591,45 +594,47 @@ grpc_chttp2_begin_write_result grpc_chttp2_begin_write( (according to available window sizes) and add to the output buffer */ while (grpc_chttp2_stream* s = ctx.NextStream()) { StreamWriteContext stream_ctx(&ctx, s); - stream_ctx.FlushInitialMetadata(); - stream_ctx.FlushWindowUpdates(); - stream_ctx.FlushData(); - stream_ctx.FlushTrailingMetadata(); + stream_ctx.FlushInitialMetadata(exec_ctx); + stream_ctx.FlushWindowUpdates(exec_ctx); + stream_ctx.FlushData(exec_ctx); + stream_ctx.FlushTrailingMetadata(exec_ctx); if (stream_ctx.stream_became_writable()) { if (!grpc_chttp2_list_add_writing_stream(t, s)) { /* already in writing list: drop ref */ - GRPC_CHTTP2_STREAM_UNREF(s, "chttp2_writing:already_writing"); + GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "chttp2_writing:already_writing"); } else { /* ref will be dropped at end of write */ } } else { - GRPC_CHTTP2_STREAM_UNREF(s, "chttp2_writing:no_write"); + GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "chttp2_writing:no_write"); } } - ctx.FlushWindowUpdates(); + ctx.FlushWindowUpdates(exec_ctx); - maybe_initiate_ping(t); + maybe_initiate_ping(exec_ctx, t); GPR_TIMER_END("grpc_chttp2_begin_write", 0); return ctx.Result(); } -void grpc_chttp2_end_write(grpc_chttp2_transport* t, grpc_error* error) { +void grpc_chttp2_end_write(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, + grpc_error* error) { GPR_TIMER_BEGIN("grpc_chttp2_end_write", 0); grpc_chttp2_stream* s; while (grpc_chttp2_list_pop_writing_stream(t, &s)) { if (s->sending_bytes != 0) { - update_list(t, s, (int64_t)s->sending_bytes, &s->on_write_finished_cbs, - &s->flow_controlled_bytes_written, GRPC_ERROR_REF(error)); + update_list(exec_ctx, t, s, (int64_t)s->sending_bytes, + &s->on_write_finished_cbs, &s->flow_controlled_bytes_written, + GRPC_ERROR_REF(error)); s->sending_bytes = 0; } - GRPC_CHTTP2_STREAM_UNREF(s, "chttp2_writing:end"); + GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "chttp2_writing:end"); } - grpc_slice_buffer_reset_and_unref_internal(&t->outbuf); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &t->outbuf); GRPC_ERROR_UNREF(error); GPR_TIMER_END("grpc_chttp2_end_write", 0); } diff --git a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc index 40a30e4a31d..d590ba03711 100644 --- a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc +++ b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc @@ -49,6 +49,7 @@ GRPCAPI grpc_channel* grpc_cronet_secure_channel_create( grpc_transport* ct = grpc_create_cronet_transport(engine, target, args, reserved); - grpc_core::ExecCtx exec_ctx; - return grpc_channel_create(target, args, GRPC_CLIENT_DIRECT_CHANNEL, ct); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + return grpc_channel_create(&exec_ctx, target, args, + GRPC_CLIENT_DIRECT_CHANNEL, ct); } diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index c9fd94176bd..4d24efe47b1 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -197,23 +197,27 @@ typedef struct stream_obj stream_obj; #ifndef NDEBUG #define GRPC_CRONET_STREAM_REF(stream, reason) \ grpc_cronet_stream_ref((stream), (reason)) -#define GRPC_CRONET_STREAM_UNREF(stream, reason) \ - grpc_cronet_stream_unref((stream), (reason)) +#define GRPC_CRONET_STREAM_UNREF(exec_ctx, stream, reason) \ + grpc_cronet_stream_unref((exec_ctx), (stream), (reason)) void grpc_cronet_stream_ref(stream_obj* s, const char* reason) { grpc_stream_ref(s->refcount, reason); } -void grpc_cronet_stream_unref(stream_obj* s, const char* reason) { - grpc_stream_unref(s->refcount, reason); +void grpc_cronet_stream_unref(grpc_exec_ctx* exec_ctx, stream_obj* s, + const char* reason) { + grpc_stream_unref(exec_ctx, s->refcount, reason); } #else #define GRPC_CRONET_STREAM_REF(stream, reason) grpc_cronet_stream_ref((stream)) -#define GRPC_CRONET_STREAM_UNREF(stream, reason) \ - grpc_cronet_stream_unref((stream)) +#define GRPC_CRONET_STREAM_UNREF(exec_ctx, stream, reason) \ + grpc_cronet_stream_unref((exec_ctx), (stream)) void grpc_cronet_stream_ref(stream_obj* s) { grpc_stream_ref(s->refcount); } -void grpc_cronet_stream_unref(stream_obj* s) { grpc_stream_unref(s->refcount); } +void grpc_cronet_stream_unref(grpc_exec_ctx* exec_ctx, stream_obj* s) { + grpc_stream_unref(exec_ctx, s->refcount); +} #endif -static enum e_op_result execute_stream_op(struct op_and_state* oas); +static enum e_op_result execute_stream_op(grpc_exec_ctx* exec_ctx, + struct op_and_state* oas); /* Utility function to translate enum into string for printing @@ -369,12 +373,12 @@ static void remove_from_storage(struct stream_obj* s, This can get executed from the Cronet network thread via cronet callback or on the application supplied thread via the perform_stream_op function. */ -static void execute_from_storage(stream_obj* s) { +static void execute_from_storage(grpc_exec_ctx* exec_ctx, stream_obj* s) { gpr_mu_lock(&s->mu); for (struct op_and_state* curr = s->storage.head; curr != nullptr;) { CRONET_LOG(GPR_DEBUG, "calling op at %p. done = %d", curr, curr->done); GPR_ASSERT(curr->done == 0); - enum e_op_result result = execute_stream_op(curr); + enum e_op_result result = execute_stream_op(exec_ctx, curr); CRONET_LOG(GPR_DEBUG, "execute_stream_op[%p] returns %s", curr, op_result_string(result)); /* if this op is done, then remove it and free memory */ @@ -398,7 +402,7 @@ static void execute_from_storage(stream_obj* s) { */ static void on_failed(bidirectional_stream* stream, int net_error) { CRONET_LOG(GPR_DEBUG, "on_failed(%p, %d)", stream, net_error); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; stream_obj* s = (stream_obj*)stream->annotation; gpr_mu_lock(&s->mu); @@ -415,8 +419,9 @@ static void on_failed(bidirectional_stream* stream, int net_error) { } null_and_maybe_free_read_buffer(s); gpr_mu_unlock(&s->mu); - execute_from_storage(s); - GRPC_CRONET_STREAM_UNREF(s, "cronet transport"); + execute_from_storage(&exec_ctx, s); + GRPC_CRONET_STREAM_UNREF(&exec_ctx, s, "cronet transport"); + grpc_exec_ctx_finish(&exec_ctx); } /* @@ -424,7 +429,7 @@ static void on_failed(bidirectional_stream* stream, int net_error) { */ static void on_canceled(bidirectional_stream* stream) { CRONET_LOG(GPR_DEBUG, "on_canceled(%p)", stream); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; stream_obj* s = (stream_obj*)stream->annotation; gpr_mu_lock(&s->mu); @@ -441,8 +446,9 @@ static void on_canceled(bidirectional_stream* stream) { } null_and_maybe_free_read_buffer(s); gpr_mu_unlock(&s->mu); - execute_from_storage(s); - GRPC_CRONET_STREAM_UNREF(s, "cronet transport"); + execute_from_storage(&exec_ctx, s); + GRPC_CRONET_STREAM_UNREF(&exec_ctx, s, "cronet transport"); + grpc_exec_ctx_finish(&exec_ctx); } /* @@ -450,7 +456,7 @@ static void on_canceled(bidirectional_stream* stream) { */ static void on_succeeded(bidirectional_stream* stream) { CRONET_LOG(GPR_DEBUG, "on_succeeded(%p)", stream); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; stream_obj* s = (stream_obj*)stream->annotation; gpr_mu_lock(&s->mu); @@ -459,8 +465,9 @@ static void on_succeeded(bidirectional_stream* stream) { s->cbs = nullptr; null_and_maybe_free_read_buffer(s); gpr_mu_unlock(&s->mu); - execute_from_storage(s); - GRPC_CRONET_STREAM_UNREF(s, "cronet transport"); + execute_from_storage(&exec_ctx, s); + GRPC_CRONET_STREAM_UNREF(&exec_ctx, s, "cronet transport"); + grpc_exec_ctx_finish(&exec_ctx); } /* @@ -468,7 +475,7 @@ static void on_succeeded(bidirectional_stream* stream) { */ static void on_stream_ready(bidirectional_stream* stream) { CRONET_LOG(GPR_DEBUG, "W: on_stream_ready(%p)", stream); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; stream_obj* s = (stream_obj*)stream->annotation; grpc_cronet_transport* t = (grpc_cronet_transport*)s->curr_ct; gpr_mu_lock(&s->mu); @@ -488,7 +495,8 @@ static void on_stream_ready(bidirectional_stream* stream) { } } gpr_mu_unlock(&s->mu); - execute_from_storage(s); + execute_from_storage(&exec_ctx, s); + grpc_exec_ctx_finish(&exec_ctx); } /* @@ -498,7 +506,7 @@ static void on_response_headers_received( bidirectional_stream* stream, const bidirectional_stream_header_array* headers, const char* negotiated_protocol) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; CRONET_LOG(GPR_DEBUG, "R: on_response_headers_received(%p, %p, %s)", stream, headers, negotiated_protocol); stream_obj* s = (stream_obj*)stream->annotation; @@ -520,8 +528,9 @@ static void on_response_headers_received( for (size_t i = 0; i < headers->count; i++) { GRPC_LOG_IF_ERROR("on_response_headers_received", grpc_chttp2_incoming_metadata_buffer_add( - &s->state.rs.initial_metadata, + &exec_ctx, &s->state.rs.initial_metadata, grpc_mdelem_from_slices( + &exec_ctx, grpc_slice_intern(grpc_slice_from_static_string( headers->headers[i].key)), grpc_slice_intern(grpc_slice_from_static_string( @@ -543,14 +552,15 @@ static void on_response_headers_received( s->state.pending_read_from_cronet = true; } gpr_mu_unlock(&s->mu); - execute_from_storage(s); + execute_from_storage(&exec_ctx, s); + grpc_exec_ctx_finish(&exec_ctx); } /* Cronet callback */ static void on_write_completed(bidirectional_stream* stream, const char* data) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; stream_obj* s = (stream_obj*)stream->annotation; CRONET_LOG(GPR_DEBUG, "W: on_write_completed(%p, %s)", stream, data); gpr_mu_lock(&s->mu); @@ -560,7 +570,8 @@ static void on_write_completed(bidirectional_stream* stream, const char* data) { } s->state.state_callback_received[OP_SEND_MESSAGE] = true; gpr_mu_unlock(&s->mu); - execute_from_storage(s); + execute_from_storage(&exec_ctx, s); + grpc_exec_ctx_finish(&exec_ctx); } /* @@ -568,7 +579,7 @@ static void on_write_completed(bidirectional_stream* stream, const char* data) { */ static void on_read_completed(bidirectional_stream* stream, char* data, int count) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; stream_obj* s = (stream_obj*)stream->annotation; CRONET_LOG(GPR_DEBUG, "R: on_read_completed(%p, %p, %d)", stream, data, count); @@ -594,14 +605,15 @@ static void on_read_completed(bidirectional_stream* stream, char* data, gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - execute_from_storage(s); + execute_from_storage(&exec_ctx, s); } } else { null_and_maybe_free_read_buffer(s); s->state.rs.read_stream_closed = true; gpr_mu_unlock(&s->mu); - execute_from_storage(s); + execute_from_storage(&exec_ctx, s); } + grpc_exec_ctx_finish(&exec_ctx); } /* @@ -610,7 +622,7 @@ static void on_read_completed(bidirectional_stream* stream, char* data, static void on_response_trailers_received( bidirectional_stream* stream, const bidirectional_stream_header_array* trailers) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; CRONET_LOG(GPR_DEBUG, "R: on_response_trailers_received(%p,%p)", stream, trailers); stream_obj* s = (stream_obj*)stream->annotation; @@ -626,8 +638,9 @@ static void on_response_trailers_received( trailers->headers[i].value); GRPC_LOG_IF_ERROR("on_response_trailers_received", grpc_chttp2_incoming_metadata_buffer_add( - &s->state.rs.trailing_metadata, + &exec_ctx, &s->state.rs.trailing_metadata, grpc_mdelem_from_slices( + &exec_ctx, grpc_slice_intern(grpc_slice_from_static_string( trailers->headers[i].key)), grpc_slice_intern(grpc_slice_from_static_string( @@ -657,15 +670,17 @@ static void on_response_trailers_received( gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - execute_from_storage(s); + execute_from_storage(&exec_ctx, s); } + grpc_exec_ctx_finish(&exec_ctx); } /* Utility function that takes the data from s->write_slice_buffer and assembles into a contiguous byte stream with 5 byte gRPC header prepended. */ -static void create_grpc_frame(grpc_slice_buffer* write_slice_buffer, +static void create_grpc_frame(grpc_exec_ctx* exec_ctx, + grpc_slice_buffer* write_slice_buffer, char** pp_write_buffer, size_t* p_write_buffer_size, uint32_t flags) { grpc_slice slice = grpc_slice_buffer_take_first(write_slice_buffer); @@ -685,7 +700,7 @@ static void create_grpc_frame(grpc_slice_buffer* write_slice_buffer, *p++ = (uint8_t)(length); /* append actual data */ memcpy(p, GRPC_SLICE_START_PTR(slice), length); - grpc_slice_unref_internal(slice); + grpc_slice_unref_internal(exec_ctx, slice); } /* @@ -966,7 +981,8 @@ static bool op_can_be_run(grpc_transport_stream_op_batch* curr_op, /* TODO (makdharma): Break down this function in smaller chunks for readability. */ -static enum e_op_result execute_stream_op(struct op_and_state* oas) { +static enum e_op_result execute_stream_op(grpc_exec_ctx* exec_ctx, + struct op_and_state* oas) { grpc_transport_stream_op_batch* stream_op = &oas->op; struct stream_obj* s = oas->s; grpc_cronet_transport* t = (grpc_cronet_transport*)s->curr_ct; @@ -1024,14 +1040,15 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { grpc_slice slice; grpc_slice_buffer_init(&write_slice_buffer); if (1 != grpc_byte_stream_next( - stream_op->payload->send_message.send_message, + exec_ctx, stream_op->payload->send_message.send_message, stream_op->payload->send_message.send_message->length, nullptr)) { /* Should never reach here */ GPR_ASSERT(false); } if (GRPC_ERROR_NONE != - grpc_byte_stream_pull(stream_op->payload->send_message.send_message, + grpc_byte_stream_pull(exec_ctx, + stream_op->payload->send_message.send_message, &slice)) { /* Should never reach here */ GPR_ASSERT(false); @@ -1044,15 +1061,15 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { } if (write_slice_buffer.count > 0) { size_t write_buffer_size; - create_grpc_frame(&write_slice_buffer, &stream_state->ws.write_buffer, - &write_buffer_size, + create_grpc_frame(exec_ctx, &write_slice_buffer, + &stream_state->ws.write_buffer, &write_buffer_size, stream_op->payload->send_message.send_message->flags); CRONET_LOG(GPR_DEBUG, "bidirectional_stream_write (%p, %p)", s->cbs, stream_state->ws.write_buffer); stream_state->state_callback_received[OP_SEND_MESSAGE] = false; bidirectional_stream_write(s->cbs, stream_state->ws.write_buffer, (int)write_buffer_size, false); - grpc_slice_buffer_destroy_internal(&write_slice_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, &write_slice_buffer); if (t->use_packet_coalescing) { if (!stream_op->send_trailing_metadata) { CRONET_LOG(GPR_DEBUG, "bidirectional_stream_flush (%p)", s->cbs); @@ -1095,21 +1112,25 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { CRONET_LOG(GPR_DEBUG, "running: %p OP_RECV_INITIAL_METADATA", oas); if (stream_state->state_op_done[OP_CANCEL_ERROR]) { GRPC_CLOSURE_SCHED( + exec_ctx, stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_NONE); } else if (stream_state->state_callback_received[OP_FAILED]) { GRPC_CLOSURE_SCHED( + exec_ctx, stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_NONE); } else if (stream_state->state_op_done[OP_RECV_TRAILING_METADATA]) { GRPC_CLOSURE_SCHED( + exec_ctx, stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_NONE); } else { grpc_chttp2_incoming_metadata_buffer_publish( - &oas->s->state.rs.initial_metadata, + exec_ctx, &oas->s->state.rs.initial_metadata, stream_op->payload->recv_initial_metadata.recv_initial_metadata); GRPC_CLOSURE_SCHED( + exec_ctx, stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_NONE); } @@ -1120,14 +1141,16 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { CRONET_LOG(GPR_DEBUG, "running: %p OP_RECV_MESSAGE", oas); if (stream_state->state_op_done[OP_CANCEL_ERROR]) { CRONET_LOG(GPR_DEBUG, "Stream is cancelled."); - GRPC_CLOSURE_SCHED(stream_op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(exec_ctx, + stream_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; result = ACTION_TAKEN_NO_CALLBACK; } else if (stream_state->state_callback_received[OP_FAILED]) { CRONET_LOG(GPR_DEBUG, "Stream failed."); - GRPC_CLOSURE_SCHED(stream_op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(exec_ctx, + stream_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; @@ -1135,14 +1158,16 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { } else if (stream_state->rs.read_stream_closed == true) { /* No more data will be received */ CRONET_LOG(GPR_DEBUG, "read stream closed"); - GRPC_CLOSURE_SCHED(stream_op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(exec_ctx, + stream_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; result = ACTION_TAKEN_NO_CALLBACK; } else if (stream_state->flush_read) { CRONET_LOG(GPR_DEBUG, "flush read"); - GRPC_CLOSURE_SCHED(stream_op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(exec_ctx, + stream_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; @@ -1175,7 +1200,7 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { CRONET_LOG(GPR_DEBUG, "read operation complete. Empty response."); /* Clean up read_slice_buffer in case there is unread data. */ grpc_slice_buffer_destroy_internal( - &stream_state->rs.read_slice_buffer); + exec_ctx, &stream_state->rs.read_slice_buffer); grpc_slice_buffer_init(&stream_state->rs.read_slice_buffer); grpc_slice_buffer_stream_init(&stream_state->rs.sbs, &stream_state->rs.read_slice_buffer, 0); @@ -1185,7 +1210,7 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { *((grpc_byte_buffer**)stream_op->payload->recv_message.recv_message) = (grpc_byte_buffer*)&stream_state->rs.sbs; GRPC_CLOSURE_SCHED( - stream_op->payload->recv_message.recv_message_ready, + exec_ctx, stream_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; @@ -1229,7 +1254,8 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { (size_t)stream_state->rs.length_field); null_and_maybe_free_read_buffer(s); /* Clean up read_slice_buffer in case there is unread data. */ - grpc_slice_buffer_destroy_internal(&stream_state->rs.read_slice_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, + &stream_state->rs.read_slice_buffer); grpc_slice_buffer_init(&stream_state->rs.read_slice_buffer); grpc_slice_buffer_add(&stream_state->rs.read_slice_buffer, read_data_slice); @@ -1240,7 +1266,8 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { } *((grpc_byte_buffer**)stream_op->payload->recv_message.recv_message) = (grpc_byte_buffer*)&stream_state->rs.sbs; - GRPC_CLOSURE_SCHED(stream_op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(exec_ctx, + stream_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; @@ -1263,7 +1290,7 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { CRONET_LOG(GPR_DEBUG, "running: %p OP_RECV_TRAILING_METADATA", oas); if (oas->s->state.rs.trailing_metadata_valid) { grpc_chttp2_incoming_metadata_buffer_publish( - &oas->s->state.rs.trailing_metadata, + exec_ctx, &oas->s->state.rs.trailing_metadata, stream_op->payload->recv_trailing_metadata.recv_trailing_metadata); stream_state->rs.trailing_metadata_valid = false; } @@ -1288,17 +1315,17 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { op_can_be_run(stream_op, s, &oas->state, OP_ON_COMPLETE)) { CRONET_LOG(GPR_DEBUG, "running: %p OP_ON_COMPLETE", oas); if (stream_state->state_op_done[OP_CANCEL_ERROR]) { - GRPC_CLOSURE_SCHED(stream_op->on_complete, + GRPC_CLOSURE_SCHED(exec_ctx, stream_op->on_complete, GRPC_ERROR_REF(stream_state->cancel_error)); } else if (stream_state->state_callback_received[OP_FAILED]) { GRPC_CLOSURE_SCHED( - stream_op->on_complete, + exec_ctx, stream_op->on_complete, make_error_with_desc(GRPC_STATUS_UNAVAILABLE, "Unavailable.")); } else { /* All actions in this stream_op are complete. Call the on_complete * callback */ - GRPC_CLOSURE_SCHED(stream_op->on_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, stream_op->on_complete, GRPC_ERROR_NONE); } oas->state.state_op_done[OP_ON_COMPLETE] = true; oas->done = true; @@ -1323,9 +1350,9 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { Functions used by upper layers to access transport functionality. */ -static int init_stream(grpc_transport* gt, grpc_stream* gs, - grpc_stream_refcount* refcount, const void* server_data, - gpr_arena* arena) { +static int init_stream(grpc_exec_ctx* exec_ctx, grpc_transport* gt, + grpc_stream* gs, grpc_stream_refcount* refcount, + const void* server_data, gpr_arena* arena) { stream_obj* s = (stream_obj*)gs; s->refcount = refcount; @@ -1356,13 +1383,15 @@ static int init_stream(grpc_transport* gt, grpc_stream* gs, return 0; } -static void set_pollset_do_nothing(grpc_transport* gt, grpc_stream* gs, - grpc_pollset* pollset) {} +static void set_pollset_do_nothing(grpc_exec_ctx* exec_ctx, grpc_transport* gt, + grpc_stream* gs, grpc_pollset* pollset) {} -static void set_pollset_set_do_nothing(grpc_transport* gt, grpc_stream* gs, +static void set_pollset_set_do_nothing(grpc_exec_ctx* exec_ctx, + grpc_transport* gt, grpc_stream* gs, grpc_pollset_set* pollset_set) {} -static void perform_stream_op(grpc_transport* gt, grpc_stream* gs, +static void perform_stream_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, + grpc_stream* gs, grpc_transport_stream_op_batch* op) { CRONET_LOG(GPR_DEBUG, "perform_stream_op"); if (op->send_initial_metadata && @@ -1372,36 +1401,42 @@ static void perform_stream_op(grpc_transport* gt, grpc_stream* gs, this field is present in metadata */ if (op->recv_initial_metadata) { GRPC_CLOSURE_SCHED( + exec_ctx, op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_CANCELLED); } if (op->recv_message) { - GRPC_CLOSURE_SCHED(op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(exec_ctx, op->payload->recv_message.recv_message_ready, GRPC_ERROR_CANCELLED); } - GRPC_CLOSURE_SCHED(op->on_complete, GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(exec_ctx, op->on_complete, GRPC_ERROR_CANCELLED); return; } stream_obj* s = (stream_obj*)gs; add_to_storage(s, op); - execute_from_storage(s); + execute_from_storage(exec_ctx, s); } -static void destroy_stream(grpc_transport* gt, grpc_stream* gs, +static void destroy_stream(grpc_exec_ctx* exec_ctx, grpc_transport* gt, + grpc_stream* gs, grpc_closure* then_schedule_closure) { stream_obj* s = (stream_obj*)gs; null_and_maybe_free_read_buffer(s); /* Clean up read_slice_buffer in case there is unread data. */ - grpc_slice_buffer_destroy_internal(&s->state.rs.read_slice_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, &s->state.rs.read_slice_buffer); GRPC_ERROR_UNREF(s->state.cancel_error); - GRPC_CLOSURE_SCHED(then_schedule_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, then_schedule_closure, GRPC_ERROR_NONE); } -static void destroy_transport(grpc_transport* gt) {} +static void destroy_transport(grpc_exec_ctx* exec_ctx, grpc_transport* gt) {} -static grpc_endpoint* get_endpoint(grpc_transport* gt) { return nullptr; } +static grpc_endpoint* get_endpoint(grpc_exec_ctx* exec_ctx, + grpc_transport* gt) { + return nullptr; +} -static void perform_op(grpc_transport* gt, grpc_transport_op* op) {} +static void perform_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, + grpc_transport_op* op) {} static const grpc_transport_vtable grpc_cronet_vtable = { sizeof(stream_obj), diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index 8dd0b7dce24..d8d753e4591 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/src/core/ext/transport/inproc/inproc_transport.cc @@ -54,8 +54,8 @@ typedef struct inproc_transport { gpr_refcount refs; bool is_client; grpc_connectivity_state_tracker connectivity; - void (*accept_stream_cb)(void* user_data, grpc_transport* transport, - const void* server_data); + void (*accept_stream_cb)(grpc_exec_ctx* exec_ctx, void* user_data, + grpc_transport* transport, const void* server_data); void* accept_stream_data; bool is_closed; struct inproc_transport* other_side; @@ -118,36 +118,39 @@ typedef struct inproc_stream { } inproc_stream; static grpc_closure do_nothing_closure; -static bool cancel_stream_locked(inproc_stream* s, grpc_error* error); -static void op_state_machine(void* arg, grpc_error* error); +static bool cancel_stream_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s, + grpc_error* error); +static void op_state_machine(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error); static void ref_transport(inproc_transport* t) { INPROC_LOG(GPR_DEBUG, "ref_transport %p", t); gpr_ref(&t->refs); } -static void really_destroy_transport(inproc_transport* t) { +static void really_destroy_transport(grpc_exec_ctx* exec_ctx, + inproc_transport* t) { INPROC_LOG(GPR_DEBUG, "really_destroy_transport %p", t); - grpc_connectivity_state_destroy(&t->connectivity); + grpc_connectivity_state_destroy(exec_ctx, &t->connectivity); if (gpr_unref(&t->mu->refs)) { gpr_free(t->mu); } gpr_free(t); } -static void unref_transport(inproc_transport* t) { +static void unref_transport(grpc_exec_ctx* exec_ctx, inproc_transport* t) { INPROC_LOG(GPR_DEBUG, "unref_transport %p", t); if (gpr_unref(&t->refs)) { - really_destroy_transport(t); + really_destroy_transport(exec_ctx, t); } } #ifndef NDEBUG #define STREAM_REF(refs, reason) grpc_stream_ref(refs, reason) -#define STREAM_UNREF(refs, reason) grpc_stream_unref(refs, reason) +#define STREAM_UNREF(e, refs, reason) grpc_stream_unref(e, refs, reason) #else #define STREAM_REF(refs, reason) grpc_stream_ref(refs) -#define STREAM_UNREF(refs, reason) grpc_stream_unref(refs) +#define STREAM_UNREF(e, refs, reason) grpc_stream_unref(e, refs) #endif static void ref_stream(inproc_stream* s, const char* reason) { @@ -155,12 +158,13 @@ static void ref_stream(inproc_stream* s, const char* reason) { STREAM_REF(s->refs, reason); } -static void unref_stream(inproc_stream* s, const char* reason) { +static void unref_stream(grpc_exec_ctx* exec_ctx, inproc_stream* s, + const char* reason) { INPROC_LOG(GPR_DEBUG, "unref_stream %p %s", s, reason); - STREAM_UNREF(s->refs, reason); + STREAM_UNREF(exec_ctx, s->refs, reason); } -static void really_destroy_stream(inproc_stream* s) { +static void really_destroy_stream(grpc_exec_ctx* exec_ctx, inproc_stream* s) { INPROC_LOG(GPR_DEBUG, "really_destroy_stream %p", s); GRPC_ERROR_UNREF(s->write_buffer_cancel_error); @@ -168,13 +172,13 @@ static void really_destroy_stream(inproc_stream* s) { GRPC_ERROR_UNREF(s->cancel_other_error); if (s->recv_inited) { - grpc_slice_buffer_destroy_internal(&s->recv_message); + grpc_slice_buffer_destroy_internal(exec_ctx, &s->recv_message); } - unref_transport(s->t); + unref_transport(exec_ctx, s->t); if (s->closure_at_destroy) { - GRPC_CLOSURE_SCHED(s->closure_at_destroy, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, s->closure_at_destroy, GRPC_ERROR_NONE); } } @@ -191,7 +195,7 @@ static void log_metadata(const grpc_metadata_batch* md_batch, bool is_client, } } -static grpc_error* fill_in_metadata(inproc_stream* s, +static grpc_error* fill_in_metadata(grpc_exec_ctx* exec_ctx, inproc_stream* s, const grpc_metadata_batch* metadata, uint32_t flags, grpc_metadata_batch* out_md, uint32_t* outflags, bool* markfilled) { @@ -210,18 +214,18 @@ static grpc_error* fill_in_metadata(inproc_stream* s, (elem != nullptr) && (error == GRPC_ERROR_NONE); elem = elem->next) { grpc_linked_mdelem* nelem = (grpc_linked_mdelem*)gpr_arena_alloc(s->arena, sizeof(*nelem)); - nelem->md = - grpc_mdelem_from_slices(grpc_slice_intern(GRPC_MDKEY(elem->md)), - grpc_slice_intern(GRPC_MDVALUE(elem->md))); + nelem->md = grpc_mdelem_from_slices( + exec_ctx, grpc_slice_intern(GRPC_MDKEY(elem->md)), + grpc_slice_intern(GRPC_MDVALUE(elem->md))); - error = grpc_metadata_batch_link_tail(out_md, nelem); + error = grpc_metadata_batch_link_tail(exec_ctx, out_md, nelem); } return error; } -static int init_stream(grpc_transport* gt, grpc_stream* gs, - grpc_stream_refcount* refcount, const void* server_data, - gpr_arena* arena) { +static int init_stream(grpc_exec_ctx* exec_ctx, grpc_transport* gt, + grpc_stream* gs, grpc_stream_refcount* refcount, + const void* server_data, gpr_arena* arena) { INPROC_LOG(GPR_DEBUG, "init_stream %p %p %p", gt, gs, server_data); inproc_transport* t = (inproc_transport*)gt; inproc_stream* s = (inproc_stream*)gs; @@ -281,7 +285,8 @@ static int init_stream(grpc_transport* gt, grpc_stream* gs, // side to avoid destruction INPROC_LOG(GPR_DEBUG, "calling accept stream cb %p %p", st->accept_stream_cb, st->accept_stream_data); - (*st->accept_stream_cb)(st->accept_stream_data, &st->base, (void*)s); + (*st->accept_stream_cb)(exec_ctx, st->accept_stream_data, &st->base, + (void*)s); } else { // This is the server-side and is being called through accept_stream_cb inproc_stream* cs = (inproc_stream*)server_data; @@ -296,19 +301,19 @@ static int init_stream(grpc_transport* gt, grpc_stream* gs, // Now transfer from the other side's write_buffer if any to the to_read // buffer if (cs->write_buffer_initial_md_filled) { - fill_in_metadata(s, &cs->write_buffer_initial_md, + fill_in_metadata(exec_ctx, s, &cs->write_buffer_initial_md, cs->write_buffer_initial_md_flags, &s->to_read_initial_md, &s->to_read_initial_md_flags, &s->to_read_initial_md_filled); s->deadline = GPR_MIN(s->deadline, cs->write_buffer_deadline); - grpc_metadata_batch_clear(&cs->write_buffer_initial_md); + grpc_metadata_batch_clear(exec_ctx, &cs->write_buffer_initial_md); cs->write_buffer_initial_md_filled = false; } if (cs->write_buffer_trailing_md_filled) { - fill_in_metadata(s, &cs->write_buffer_trailing_md, 0, + fill_in_metadata(exec_ctx, s, &cs->write_buffer_trailing_md, 0, &s->to_read_trailing_md, nullptr, &s->to_read_trailing_md_filled); - grpc_metadata_batch_clear(&cs->write_buffer_trailing_md); + grpc_metadata_batch_clear(exec_ctx, &cs->write_buffer_trailing_md); cs->write_buffer_trailing_md_filled = false; } if (cs->write_buffer_cancel_error != GRPC_ERROR_NONE) { @@ -321,11 +326,11 @@ static int init_stream(grpc_transport* gt, grpc_stream* gs, return 0; // return value is not important } -static void close_stream_locked(inproc_stream* s) { +static void close_stream_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s) { if (!s->closed) { // Release the metadata that we would have written out - grpc_metadata_batch_destroy(&s->write_buffer_initial_md); - grpc_metadata_batch_destroy(&s->write_buffer_trailing_md); + grpc_metadata_batch_destroy(exec_ctx, &s->write_buffer_initial_md); + grpc_metadata_batch_destroy(exec_ctx, &s->write_buffer_trailing_md); if (s->listed) { inproc_stream* p = s->stream_list_prev; @@ -339,21 +344,22 @@ static void close_stream_locked(inproc_stream* s) { n->stream_list_prev = p; } s->listed = false; - unref_stream(s, "close_stream:list"); + unref_stream(exec_ctx, s, "close_stream:list"); } s->closed = true; - unref_stream(s, "close_stream:closing"); + unref_stream(exec_ctx, s, "close_stream:closing"); } } // This function means that we are done talking/listening to the other side -static void close_other_side_locked(inproc_stream* s, const char* reason) { +static void close_other_side_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s, + const char* reason) { if (s->other_side != nullptr) { // First release the metadata that came from the other side's arena - grpc_metadata_batch_destroy(&s->to_read_initial_md); - grpc_metadata_batch_destroy(&s->to_read_trailing_md); + grpc_metadata_batch_destroy(exec_ctx, &s->to_read_initial_md); + grpc_metadata_batch_destroy(exec_ctx, &s->to_read_trailing_md); - unref_stream(s->other_side, reason); + unref_stream(exec_ctx, s->other_side, reason); s->other_side_closed = true; s->other_side = nullptr; } else if (!s->other_side_closed) { @@ -365,7 +371,8 @@ static void close_other_side_locked(inproc_stream* s, const char* reason) { // this stream_op_batch is only one of the pending operations for this // stream. This is called when one of the pending operations for the stream // is done and about to be NULLed out -static void complete_if_batch_end_locked(inproc_stream* s, grpc_error* error, +static void complete_if_batch_end_locked(grpc_exec_ctx* exec_ctx, + inproc_stream* s, grpc_error* error, grpc_transport_stream_op_batch* op, const char* msg) { int is_sm = (int)(op == s->send_message_op); @@ -376,20 +383,22 @@ static void complete_if_batch_end_locked(inproc_stream* s, grpc_error* error, if ((is_sm + is_stm + is_rim + is_rm + is_rtm) == 1) { INPROC_LOG(GPR_DEBUG, "%s %p %p %p", msg, s, op, error); - GRPC_CLOSURE_SCHED(op->on_complete, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(exec_ctx, op->on_complete, GRPC_ERROR_REF(error)); } } -static void maybe_schedule_op_closure_locked(inproc_stream* s, +static void maybe_schedule_op_closure_locked(grpc_exec_ctx* exec_ctx, + inproc_stream* s, grpc_error* error) { if (s && s->ops_needed && !s->op_closure_scheduled) { - GRPC_CLOSURE_SCHED(&s->op_closure, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(exec_ctx, &s->op_closure, GRPC_ERROR_REF(error)); s->op_closure_scheduled = true; s->ops_needed = false; } } -static void fail_helper_locked(inproc_stream* s, grpc_error* error) { +static void fail_helper_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s, + grpc_error* error) { INPROC_LOG(GPR_DEBUG, "op_state_machine %p fail_helper", s); // If we're failing this side, we need to make sure that // we also send or have already sent trailing metadata @@ -406,14 +415,14 @@ static void fail_helper_locked(inproc_stream* s, grpc_error* error) { : &other->to_read_trailing_md; bool* destfilled = (other == nullptr) ? &s->write_buffer_trailing_md_filled : &other->to_read_trailing_md_filled; - fill_in_metadata(s, &fake_md, 0, dest, nullptr, destfilled); - grpc_metadata_batch_destroy(&fake_md); + fill_in_metadata(exec_ctx, s, &fake_md, 0, dest, nullptr, destfilled); + grpc_metadata_batch_destroy(exec_ctx, &fake_md); if (other != nullptr) { if (other->cancel_other_error == GRPC_ERROR_NONE) { other->cancel_other_error = GRPC_ERROR_REF(error); } - maybe_schedule_op_closure_locked(other, error); + maybe_schedule_op_closure_locked(exec_ctx, other, error); } else if (s->write_buffer_cancel_error == GRPC_ERROR_NONE) { s->write_buffer_cancel_error = GRPC_ERROR_REF(error); } @@ -427,22 +436,24 @@ static void fail_helper_locked(inproc_stream* s, grpc_error* error) { grpc_metadata_batch_init(&fake_md); grpc_linked_mdelem* path_md = (grpc_linked_mdelem*)gpr_arena_alloc(s->arena, sizeof(*path_md)); - path_md->md = grpc_mdelem_from_slices(g_fake_path_key, g_fake_path_value); - GPR_ASSERT(grpc_metadata_batch_link_tail(&fake_md, path_md) == + path_md->md = + grpc_mdelem_from_slices(exec_ctx, g_fake_path_key, g_fake_path_value); + GPR_ASSERT(grpc_metadata_batch_link_tail(exec_ctx, &fake_md, path_md) == GRPC_ERROR_NONE); grpc_linked_mdelem* auth_md = (grpc_linked_mdelem*)gpr_arena_alloc(s->arena, sizeof(*auth_md)); - auth_md->md = grpc_mdelem_from_slices(g_fake_auth_key, g_fake_auth_value); - GPR_ASSERT(grpc_metadata_batch_link_tail(&fake_md, auth_md) == + auth_md->md = + grpc_mdelem_from_slices(exec_ctx, g_fake_auth_key, g_fake_auth_value); + GPR_ASSERT(grpc_metadata_batch_link_tail(exec_ctx, &fake_md, auth_md) == GRPC_ERROR_NONE); fill_in_metadata( - s, &fake_md, 0, + exec_ctx, s, &fake_md, 0, s->recv_initial_md_op->payload->recv_initial_metadata .recv_initial_metadata, s->recv_initial_md_op->payload->recv_initial_metadata.recv_flags, nullptr); - grpc_metadata_batch_destroy(&fake_md); + grpc_metadata_batch_destroy(exec_ctx, &fake_md); err = GRPC_ERROR_NONE; } else { err = GRPC_ERROR_REF(error); @@ -458,13 +469,14 @@ static void fail_helper_locked(inproc_stream* s, grpc_error* error) { INPROC_LOG(GPR_DEBUG, "fail_helper %p scheduling initial-metadata-ready %p %p", s, error, err); - GRPC_CLOSURE_SCHED(s->recv_initial_md_op->payload->recv_initial_metadata + GRPC_CLOSURE_SCHED(exec_ctx, + s->recv_initial_md_op->payload->recv_initial_metadata .recv_initial_metadata_ready, err); // Last use of err so no need to REF and then UNREF it complete_if_batch_end_locked( - s, error, s->recv_initial_md_op, + exec_ctx, s, error, s->recv_initial_md_op, "fail_helper scheduling recv-initial-metadata-on-complete"); s->recv_initial_md_op = nullptr; } @@ -472,22 +484,22 @@ static void fail_helper_locked(inproc_stream* s, grpc_error* error) { INPROC_LOG(GPR_DEBUG, "fail_helper %p scheduling message-ready %p", s, error); GRPC_CLOSURE_SCHED( - s->recv_message_op->payload->recv_message.recv_message_ready, + exec_ctx, s->recv_message_op->payload->recv_message.recv_message_ready, GRPC_ERROR_REF(error)); complete_if_batch_end_locked( - s, error, s->recv_message_op, + exec_ctx, s, error, s->recv_message_op, "fail_helper scheduling recv-message-on-complete"); s->recv_message_op = nullptr; } if (s->send_message_op) { complete_if_batch_end_locked( - s, error, s->send_message_op, + exec_ctx, s, error, s->send_message_op, "fail_helper scheduling send-message-on-complete"); s->send_message_op = nullptr; } if (s->send_trailing_md_op) { complete_if_batch_end_locked( - s, error, s->send_trailing_md_op, + exec_ctx, s, error, s->send_trailing_md_op, "fail_helper scheduling send-trailng-md-on-complete"); s->send_trailing_md_op = nullptr; } @@ -496,22 +508,23 @@ static void fail_helper_locked(inproc_stream* s, grpc_error* error) { "fail_helper %p scheduling trailing-md-on-complete %p", s, error); complete_if_batch_end_locked( - s, error, s->recv_trailing_md_op, + exec_ctx, s, error, s->recv_trailing_md_op, "fail_helper scheduling recv-trailing-metadata-on-complete"); s->recv_trailing_md_op = nullptr; } - close_other_side_locked(s, "fail_helper:other_side"); - close_stream_locked(s); + close_other_side_locked(exec_ctx, s, "fail_helper:other_side"); + close_stream_locked(exec_ctx, s); GRPC_ERROR_UNREF(error); } -static void message_transfer_locked(inproc_stream* sender, +static void message_transfer_locked(grpc_exec_ctx* exec_ctx, + inproc_stream* sender, inproc_stream* receiver) { size_t remaining = sender->send_message_op->payload->send_message.send_message->length; if (receiver->recv_inited) { - grpc_slice_buffer_destroy_internal(&receiver->recv_message); + grpc_slice_buffer_destroy_internal(exec_ctx, &receiver->recv_message); } grpc_slice_buffer_init(&receiver->recv_message); receiver->recv_inited = true; @@ -519,13 +532,13 @@ static void message_transfer_locked(inproc_stream* sender, grpc_slice message_slice; grpc_closure unused; GPR_ASSERT(grpc_byte_stream_next( - sender->send_message_op->payload->send_message.send_message, SIZE_MAX, - &unused)); + exec_ctx, sender->send_message_op->payload->send_message.send_message, + SIZE_MAX, &unused)); grpc_error* error = grpc_byte_stream_pull( - sender->send_message_op->payload->send_message.send_message, + exec_ctx, sender->send_message_op->payload->send_message.send_message, &message_slice); if (error != GRPC_ERROR_NONE) { - cancel_stream_locked(sender, GRPC_ERROR_REF(error)); + cancel_stream_locked(exec_ctx, sender, GRPC_ERROR_REF(error)); break; } GPR_ASSERT(error == GRPC_ERROR_NONE); @@ -540,20 +553,22 @@ static void message_transfer_locked(inproc_stream* sender, INPROC_LOG(GPR_DEBUG, "message_transfer_locked %p scheduling message-ready", receiver); GRPC_CLOSURE_SCHED( + exec_ctx, receiver->recv_message_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); complete_if_batch_end_locked( - sender, GRPC_ERROR_NONE, sender->send_message_op, + exec_ctx, sender, GRPC_ERROR_NONE, sender->send_message_op, "message_transfer scheduling sender on_complete"); complete_if_batch_end_locked( - receiver, GRPC_ERROR_NONE, receiver->recv_message_op, + exec_ctx, receiver, GRPC_ERROR_NONE, receiver->recv_message_op, "message_transfer scheduling receiver on_complete"); receiver->recv_message_op = nullptr; sender->send_message_op = nullptr; } -static void op_state_machine(void* arg, grpc_error* error) { +static void op_state_machine(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { // This function gets called when we have contents in the unprocessed reads // Get what we want based on our ops wanted // Schedule our appropriate closures @@ -574,26 +589,26 @@ static void op_state_machine(void* arg, grpc_error* error) { inproc_stream* other = s->other_side; if (s->cancel_self_error != GRPC_ERROR_NONE) { - fail_helper_locked(s, GRPC_ERROR_REF(s->cancel_self_error)); + fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(s->cancel_self_error)); goto done; } else if (s->cancel_other_error != GRPC_ERROR_NONE) { - fail_helper_locked(s, GRPC_ERROR_REF(s->cancel_other_error)); + fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(s->cancel_other_error)); goto done; } else if (error != GRPC_ERROR_NONE) { - fail_helper_locked(s, GRPC_ERROR_REF(error)); + fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(error)); goto done; } if (s->send_message_op && other) { if (other->recv_message_op) { - message_transfer_locked(s, other); - maybe_schedule_op_closure_locked(other, GRPC_ERROR_NONE); + message_transfer_locked(exec_ctx, s, other); + maybe_schedule_op_closure_locked(exec_ctx, other, GRPC_ERROR_NONE); } else if (!s->t->is_client && (s->trailing_md_sent || other->recv_trailing_md_op)) { // A server send will never be matched if the client is waiting // for trailing metadata already complete_if_batch_end_locked( - s, GRPC_ERROR_NONE, s->send_message_op, + exec_ctx, s, GRPC_ERROR_NONE, s->send_message_op, "op_state_machine scheduling send-message-on-complete"); s->send_message_op = nullptr; } @@ -615,11 +630,11 @@ static void op_state_machine(void* arg, grpc_error* error) { // The buffer is already in use; that's an error! INPROC_LOG(GPR_DEBUG, "Extra trailing metadata %p", s); new_err = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Extra trailing metadata"); - fail_helper_locked(s, GRPC_ERROR_REF(new_err)); + fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(new_err)); goto done; } else { if (!other || !other->closed) { - fill_in_metadata(s, + fill_in_metadata(exec_ctx, s, s->send_trailing_md_op->payload->send_trailing_metadata .send_trailing_metadata, 0, dest, nullptr, destfilled); @@ -628,15 +643,15 @@ static void op_state_machine(void* arg, grpc_error* error) { if (!s->t->is_client && s->trailing_md_recvd && s->recv_trailing_md_op) { INPROC_LOG(GPR_DEBUG, "op_state_machine %p scheduling trailing-md-on-complete", s); - GRPC_CLOSURE_SCHED(s->recv_trailing_md_op->on_complete, + GRPC_CLOSURE_SCHED(exec_ctx, s->recv_trailing_md_op->on_complete, GRPC_ERROR_NONE); s->recv_trailing_md_op = nullptr; needs_close = true; } } - maybe_schedule_op_closure_locked(other, GRPC_ERROR_NONE); + maybe_schedule_op_closure_locked(exec_ctx, other, GRPC_ERROR_NONE); complete_if_batch_end_locked( - s, GRPC_ERROR_NONE, s->send_trailing_md_op, + exec_ctx, s, GRPC_ERROR_NONE, s->send_trailing_md_op, "op_state_machine scheduling send-trailing-metadata-on-complete"); s->send_trailing_md_op = nullptr; } @@ -649,14 +664,14 @@ static void op_state_machine(void* arg, grpc_error* error) { "op_state_machine %p scheduling on_complete errors for already " "recvd initial md %p", s, new_err); - fail_helper_locked(s, GRPC_ERROR_REF(new_err)); + fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(new_err)); goto done; } if (s->to_read_initial_md_filled) { s->initial_md_recvd = true; new_err = fill_in_metadata( - s, &s->to_read_initial_md, s->to_read_initial_md_flags, + exec_ctx, s, &s->to_read_initial_md, s->to_read_initial_md_flags, s->recv_initial_md_op->payload->recv_initial_metadata .recv_initial_metadata, s->recv_initial_md_op->payload->recv_initial_metadata.recv_flags, @@ -669,16 +684,17 @@ static void op_state_machine(void* arg, grpc_error* error) { .trailing_metadata_available = (other != nullptr && other->send_trailing_md_op != nullptr); } - grpc_metadata_batch_clear(&s->to_read_initial_md); + grpc_metadata_batch_clear(exec_ctx, &s->to_read_initial_md); s->to_read_initial_md_filled = false; INPROC_LOG(GPR_DEBUG, "op_state_machine %p scheduling initial-metadata-ready %p", s, new_err); - GRPC_CLOSURE_SCHED(s->recv_initial_md_op->payload->recv_initial_metadata + GRPC_CLOSURE_SCHED(exec_ctx, + s->recv_initial_md_op->payload->recv_initial_metadata .recv_initial_metadata_ready, GRPC_ERROR_REF(new_err)); complete_if_batch_end_locked( - s, new_err, s->recv_initial_md_op, + exec_ctx, s, new_err, s->recv_initial_md_op, "op_state_machine scheduling recv-initial-metadata-on-complete"); s->recv_initial_md_op = nullptr; @@ -686,20 +702,20 @@ static void op_state_machine(void* arg, grpc_error* error) { INPROC_LOG(GPR_DEBUG, "op_state_machine %p scheduling on_complete errors2 %p", s, new_err); - fail_helper_locked(s, GRPC_ERROR_REF(new_err)); + fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(new_err)); goto done; } } } if (s->recv_message_op) { if (other && other->send_message_op) { - message_transfer_locked(other, s); - maybe_schedule_op_closure_locked(other, GRPC_ERROR_NONE); + message_transfer_locked(exec_ctx, other, s); + maybe_schedule_op_closure_locked(exec_ctx, other, GRPC_ERROR_NONE); } } if (s->recv_trailing_md_op && s->t->is_client && other && other->send_message_op) { - maybe_schedule_op_closure_locked(other, GRPC_ERROR_NONE); + maybe_schedule_op_closure_locked(exec_ctx, other, GRPC_ERROR_NONE); } if (s->to_read_trailing_md_filled) { if (s->trailing_md_recvd) { @@ -710,7 +726,7 @@ static void op_state_machine(void* arg, grpc_error* error) { "op_state_machine %p scheduling on_complete errors for already " "recvd trailing md %p", s, new_err); - fail_helper_locked(s, GRPC_ERROR_REF(new_err)); + fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(new_err)); goto done; } if (s->recv_message_op != nullptr) { @@ -718,10 +734,11 @@ static void op_state_machine(void* arg, grpc_error* error) { // satisfied INPROC_LOG(GPR_DEBUG, "op_state_machine %p scheduling message-ready", s); GRPC_CLOSURE_SCHED( + exec_ctx, s->recv_message_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); complete_if_batch_end_locked( - s, new_err, s->recv_message_op, + exec_ctx, s, new_err, s->recv_message_op, "op_state_machine scheduling recv-message-on-complete"); s->recv_message_op = nullptr; } @@ -729,7 +746,7 @@ static void op_state_machine(void* arg, grpc_error* error) { // Nothing further will try to receive from this stream, so finish off // any outstanding send_message op complete_if_batch_end_locked( - s, new_err, s->send_message_op, + exec_ctx, s, new_err, s->send_message_op, "op_state_machine scheduling send-message-on-complete"); s->send_message_op = nullptr; } @@ -737,11 +754,11 @@ static void op_state_machine(void* arg, grpc_error* error) { // We wanted trailing metadata and we got it s->trailing_md_recvd = true; new_err = - fill_in_metadata(s, &s->to_read_trailing_md, 0, + fill_in_metadata(exec_ctx, s, &s->to_read_trailing_md, 0, s->recv_trailing_md_op->payload ->recv_trailing_metadata.recv_trailing_metadata, nullptr, nullptr); - grpc_metadata_batch_clear(&s->to_read_trailing_md); + grpc_metadata_batch_clear(exec_ctx, &s->to_read_trailing_md); s->to_read_trailing_md_filled = false; // We should schedule the recv_trailing_md_op completion if @@ -753,7 +770,7 @@ static void op_state_machine(void* arg, grpc_error* error) { INPROC_LOG(GPR_DEBUG, "op_state_machine %p scheduling trailing-md-on-complete %p", s, new_err); - GRPC_CLOSURE_SCHED(s->recv_trailing_md_op->on_complete, + GRPC_CLOSURE_SCHED(exec_ctx, s->recv_trailing_md_op->on_complete, GRPC_ERROR_REF(new_err)); s->recv_trailing_md_op = nullptr; needs_close = true; @@ -774,10 +791,10 @@ static void op_state_machine(void* arg, grpc_error* error) { // recv_message_op INPROC_LOG(GPR_DEBUG, "op_state_machine %p scheduling message-ready", s); GRPC_CLOSURE_SCHED( - s->recv_message_op->payload->recv_message.recv_message_ready, + exec_ctx, s->recv_message_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); complete_if_batch_end_locked( - s, new_err, s->recv_message_op, + exec_ctx, s, new_err, s->recv_message_op, "op_state_machine scheduling recv-message-on-complete"); s->recv_message_op = nullptr; } @@ -786,7 +803,7 @@ static void op_state_machine(void* arg, grpc_error* error) { // Nothing further will try to receive from this stream, so finish off // any outstanding send_message op complete_if_batch_end_locked( - s, new_err, s->send_message_op, + exec_ctx, s, new_err, s->send_message_op, "op_state_machine scheduling send-message-on-complete"); s->send_message_op = nullptr; } @@ -802,21 +819,22 @@ static void op_state_machine(void* arg, grpc_error* error) { } done: if (needs_close) { - close_other_side_locked(s, "op_state_machine"); - close_stream_locked(s); + close_other_side_locked(exec_ctx, s, "op_state_machine"); + close_stream_locked(exec_ctx, s); } gpr_mu_unlock(mu); GRPC_ERROR_UNREF(new_err); } -static bool cancel_stream_locked(inproc_stream* s, grpc_error* error) { +static bool cancel_stream_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s, + grpc_error* error) { bool ret = false; // was the cancel accepted INPROC_LOG(GPR_DEBUG, "cancel_stream %p with %s", s, grpc_error_string(error)); if (s->cancel_self_error == GRPC_ERROR_NONE) { ret = true; s->cancel_self_error = GRPC_ERROR_REF(error); - maybe_schedule_op_closure_locked(s, s->cancel_self_error); + maybe_schedule_op_closure_locked(exec_ctx, s, s->cancel_self_error); // Send trailing md to the other side indicating cancellation, even if we // already have s->trailing_md_sent = true; @@ -830,14 +848,15 @@ static bool cancel_stream_locked(inproc_stream* s, grpc_error* error) { : &other->to_read_trailing_md; bool* destfilled = (other == nullptr) ? &s->write_buffer_trailing_md_filled : &other->to_read_trailing_md_filled; - fill_in_metadata(s, &cancel_md, 0, dest, nullptr, destfilled); - grpc_metadata_batch_destroy(&cancel_md); + fill_in_metadata(exec_ctx, s, &cancel_md, 0, dest, nullptr, destfilled); + grpc_metadata_batch_destroy(exec_ctx, &cancel_md); if (other != nullptr) { if (other->cancel_other_error == GRPC_ERROR_NONE) { other->cancel_other_error = GRPC_ERROR_REF(s->cancel_self_error); } - maybe_schedule_op_closure_locked(other, other->cancel_other_error); + maybe_schedule_op_closure_locked(exec_ctx, other, + other->cancel_other_error); } else if (s->write_buffer_cancel_error == GRPC_ERROR_NONE) { s->write_buffer_cancel_error = GRPC_ERROR_REF(s->cancel_self_error); } @@ -847,20 +866,21 @@ static bool cancel_stream_locked(inproc_stream* s, grpc_error* error) { // md, now's the chance if (!s->t->is_client && s->trailing_md_recvd && s->recv_trailing_md_op) { complete_if_batch_end_locked( - s, s->cancel_self_error, s->recv_trailing_md_op, + exec_ctx, s, s->cancel_self_error, s->recv_trailing_md_op, "cancel_stream scheduling trailing-md-on-complete"); s->recv_trailing_md_op = nullptr; } } - close_other_side_locked(s, "cancel_stream:other_side"); - close_stream_locked(s); + close_other_side_locked(exec_ctx, s, "cancel_stream:other_side"); + close_stream_locked(exec_ctx, s); GRPC_ERROR_UNREF(error); return ret; } -static void perform_stream_op(grpc_transport* gt, grpc_stream* gs, +static void perform_stream_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, + grpc_stream* gs, grpc_transport_stream_op_batch* op) { INPROC_LOG(GPR_DEBUG, "perform_stream_op %p %p %p", gt, gs, op); inproc_stream* s = (inproc_stream*)gs; @@ -886,7 +906,7 @@ static void perform_stream_op(grpc_transport* gt, grpc_stream* gs, if (op->cancel_stream) { // Call cancel_stream_locked without ref'ing the cancel_error because // this function is responsible to make sure that that field gets unref'ed - cancel_stream_locked(s, op->payload->cancel_stream.cancel_error); + cancel_stream_locked(exec_ctx, s, op->payload->cancel_stream.cancel_error); // this op can complete without an error } else if (s->cancel_self_error != GRPC_ERROR_NONE) { // already self-canceled so still give it an error @@ -926,7 +946,8 @@ static void perform_stream_op(grpc_transport* gt, grpc_stream* gs, } else { if (!other || !other->closed) { fill_in_metadata( - s, op->payload->send_initial_metadata.send_initial_metadata, + exec_ctx, s, + op->payload->send_initial_metadata.send_initial_metadata, op->payload->send_initial_metadata.send_initial_metadata_flags, dest, destflags, destfilled); } @@ -938,7 +959,7 @@ static void perform_stream_op(grpc_transport* gt, grpc_stream* gs, s->initial_md_sent = true; } } - maybe_schedule_op_closure_locked(other, error); + maybe_schedule_op_closure_locked(exec_ctx, other, error); } } @@ -978,7 +999,7 @@ static void perform_stream_op(grpc_transport* gt, grpc_stream* gs, (op->recv_message && other && (other->send_message_op != nullptr)) || (s->to_read_trailing_md_filled || s->trailing_md_recvd)) { if (!s->op_closure_scheduled) { - GRPC_CLOSURE_SCHED(&s->op_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &s->op_closure, GRPC_ERROR_NONE); s->op_closure_scheduled = true; } } else { @@ -1002,6 +1023,7 @@ static void perform_stream_op(grpc_transport* gt, grpc_stream* gs, "perform_stream_op error %p scheduling initial-metadata-ready %p", s, error); GRPC_CLOSURE_SCHED( + exec_ctx, op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_REF(error)); } @@ -1010,26 +1032,28 @@ static void perform_stream_op(grpc_transport* gt, grpc_stream* gs, GPR_DEBUG, "perform_stream_op error %p scheduling recv message-ready %p", s, error); - GRPC_CLOSURE_SCHED(op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(exec_ctx, + op->payload->recv_message.recv_message_ready, GRPC_ERROR_REF(error)); } } INPROC_LOG(GPR_DEBUG, "perform_stream_op %p scheduling on_complete %p", s, error); - GRPC_CLOSURE_SCHED(on_complete, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(exec_ctx, on_complete, GRPC_ERROR_REF(error)); } if (needs_close) { - close_other_side_locked(s, "perform_stream_op:other_side"); - close_stream_locked(s); + close_other_side_locked(exec_ctx, s, "perform_stream_op:other_side"); + close_stream_locked(exec_ctx, s); } gpr_mu_unlock(mu); GRPC_ERROR_UNREF(error); } -static void close_transport_locked(inproc_transport* t) { +static void close_transport_locked(grpc_exec_ctx* exec_ctx, + inproc_transport* t) { INPROC_LOG(GPR_DEBUG, "close_transport %p %d", t, t->is_closed); grpc_connectivity_state_set( - &t->connectivity, GRPC_CHANNEL_SHUTDOWN, + exec_ctx, &t->connectivity, GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Closing transport."), "close transport"); if (!t->is_closed) { @@ -1038,7 +1062,7 @@ static void close_transport_locked(inproc_transport* t) { while (t->stream_list != nullptr) { // cancel_stream_locked also adjusts stream list cancel_stream_locked( - t->stream_list, + exec_ctx, t->stream_list, grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Transport closed"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE)); @@ -1046,13 +1070,14 @@ static void close_transport_locked(inproc_transport* t) { } } -static void perform_transport_op(grpc_transport* gt, grpc_transport_op* op) { +static void perform_transport_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, + grpc_transport_op* op) { inproc_transport* t = (inproc_transport*)gt; INPROC_LOG(GPR_DEBUG, "perform_transport_op %p %p", t, op); gpr_mu_lock(&t->mu->mu); if (op->on_connectivity_state_change) { grpc_connectivity_state_notify_on_state_change( - &t->connectivity, op->connectivity_state, + exec_ctx, &t->connectivity, op->connectivity_state, op->on_connectivity_state_change); } if (op->set_accept_stream) { @@ -1060,7 +1085,7 @@ static void perform_transport_op(grpc_transport* gt, grpc_transport_op* op) { t->accept_stream_data = op->set_accept_stream_user_data; } if (op->on_consumed) { - GRPC_CLOSURE_SCHED(op->on_consumed, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, op->on_consumed, GRPC_ERROR_NONE); } bool do_close = false; @@ -1074,67 +1099,71 @@ static void perform_transport_op(grpc_transport* gt, grpc_transport_op* op) { } if (do_close) { - close_transport_locked(t); + close_transport_locked(exec_ctx, t); } gpr_mu_unlock(&t->mu->mu); } -static void destroy_stream(grpc_transport* gt, grpc_stream* gs, +static void destroy_stream(grpc_exec_ctx* exec_ctx, grpc_transport* gt, + grpc_stream* gs, grpc_closure* then_schedule_closure) { INPROC_LOG(GPR_DEBUG, "destroy_stream %p %p", gs, then_schedule_closure); inproc_stream* s = (inproc_stream*)gs; s->closure_at_destroy = then_schedule_closure; - really_destroy_stream(s); + really_destroy_stream(exec_ctx, s); } -static void destroy_transport(grpc_transport* gt) { +static void destroy_transport(grpc_exec_ctx* exec_ctx, grpc_transport* gt) { inproc_transport* t = (inproc_transport*)gt; INPROC_LOG(GPR_DEBUG, "destroy_transport %p", t); gpr_mu_lock(&t->mu->mu); - close_transport_locked(t); + close_transport_locked(exec_ctx, t); gpr_mu_unlock(&t->mu->mu); - unref_transport(t->other_side); - unref_transport(t); + unref_transport(exec_ctx, t->other_side); + unref_transport(exec_ctx, t); } /******************************************************************************* * INTEGRATION GLUE */ -static void set_pollset(grpc_transport* gt, grpc_stream* gs, - grpc_pollset* pollset) { +static void set_pollset(grpc_exec_ctx* exec_ctx, grpc_transport* gt, + grpc_stream* gs, grpc_pollset* pollset) { // Nothing to do here } -static void set_pollset_set(grpc_transport* gt, grpc_stream* gs, - grpc_pollset_set* pollset_set) { +static void set_pollset_set(grpc_exec_ctx* exec_ctx, grpc_transport* gt, + grpc_stream* gs, grpc_pollset_set* pollset_set) { // Nothing to do here } -static grpc_endpoint* get_endpoint(grpc_transport* t) { return nullptr; } +static grpc_endpoint* get_endpoint(grpc_exec_ctx* exec_ctx, grpc_transport* t) { + return nullptr; +} /******************************************************************************* * GLOBAL INIT AND DESTROY */ -static void do_nothing(void* arg, grpc_error* error) {} +static void do_nothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} void grpc_inproc_transport_init(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GRPC_CLOSURE_INIT(&do_nothing_closure, do_nothing, nullptr, grpc_schedule_on_exec_ctx); g_empty_slice = grpc_slice_from_static_buffer(nullptr, 0); grpc_slice key_tmp = grpc_slice_from_static_string(":path"); g_fake_path_key = grpc_slice_intern(key_tmp); - grpc_slice_unref_internal(key_tmp); + grpc_slice_unref_internal(&exec_ctx, key_tmp); g_fake_path_value = grpc_slice_from_static_string("/"); grpc_slice auth_tmp = grpc_slice_from_static_string(":authority"); g_fake_auth_key = grpc_slice_intern(auth_tmp); - grpc_slice_unref_internal(auth_tmp); + grpc_slice_unref_internal(&exec_ctx, auth_tmp); g_fake_auth_value = grpc_slice_from_static_string("inproc-fail"); + grpc_exec_ctx_finish(&exec_ctx); } static const grpc_transport_vtable inproc_vtable = { @@ -1146,7 +1175,8 @@ static const grpc_transport_vtable inproc_vtable = { /******************************************************************************* * Main inproc transport functions */ -static void inproc_transports_create(grpc_transport** server_transport, +static void inproc_transports_create(grpc_exec_ctx* exec_ctx, + grpc_transport** server_transport, const grpc_channel_args* server_args, grpc_transport** client_transport, const grpc_channel_args* client_args) { @@ -1183,7 +1213,7 @@ grpc_channel* grpc_inproc_channel_create(grpc_server* server, GRPC_API_TRACE("grpc_inproc_channel_create(server=%p, args=%p)", 2, (server, args)); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; const grpc_channel_args* server_args = grpc_server_get_channel_args(server); @@ -1198,26 +1228,30 @@ grpc_channel* grpc_inproc_channel_create(grpc_server* server, grpc_transport* server_transport; grpc_transport* client_transport; - inproc_transports_create(&server_transport, server_args, &client_transport, - client_args); + inproc_transports_create(&exec_ctx, &server_transport, server_args, + &client_transport, client_args); - grpc_server_setup_transport(server, server_transport, nullptr, server_args); - grpc_channel* channel = grpc_channel_create( - "inproc", client_args, GRPC_CLIENT_DIRECT_CHANNEL, client_transport); + grpc_server_setup_transport(&exec_ctx, server, server_transport, nullptr, + server_args); + grpc_channel* channel = + grpc_channel_create(&exec_ctx, "inproc", client_args, + GRPC_CLIENT_DIRECT_CHANNEL, client_transport); // Free up created channel args - grpc_channel_args_destroy(client_args); + grpc_channel_args_destroy(&exec_ctx, client_args); // Now finish scheduled operations + grpc_exec_ctx_finish(&exec_ctx); return channel; } void grpc_inproc_transport_shutdown(void) { - grpc_core::ExecCtx exec_ctx; - grpc_slice_unref_internal(g_empty_slice); - grpc_slice_unref_internal(g_fake_path_key); - grpc_slice_unref_internal(g_fake_path_value); - grpc_slice_unref_internal(g_fake_auth_key); - grpc_slice_unref_internal(g_fake_auth_value); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice_unref_internal(&exec_ctx, g_empty_slice); + grpc_slice_unref_internal(&exec_ctx, g_fake_path_key); + grpc_slice_unref_internal(&exec_ctx, g_fake_path_value); + grpc_slice_unref_internal(&exec_ctx, g_fake_auth_key); + grpc_slice_unref_internal(&exec_ctx, g_fake_auth_value); + grpc_exec_ctx_finish(&exec_ctx); } diff --git a/src/core/lib/backoff/backoff.cc b/src/core/lib/backoff/backoff.cc index da3b9b1b2d2..dc754ddd821 100644 --- a/src/core/lib/backoff/backoff.cc +++ b/src/core/lib/backoff/backoff.cc @@ -32,11 +32,12 @@ void grpc_backoff_init(grpc_backoff* backoff, grpc_millis initial_backoff, backoff->rng_state = (uint32_t)gpr_now(GPR_CLOCK_REALTIME).tv_nsec; } -grpc_backoff_result grpc_backoff_begin(grpc_backoff* backoff) { +grpc_backoff_result grpc_backoff_begin(grpc_exec_ctx* exec_ctx, + grpc_backoff* backoff) { backoff->current_backoff = backoff->initial_backoff; const grpc_millis initial_timeout = GPR_MAX(backoff->initial_backoff, backoff->min_connect_timeout); - const grpc_millis now = grpc_core::ExecCtx::Get()->Now(); + const grpc_millis now = grpc_exec_ctx_now(exec_ctx); const grpc_backoff_result result = {now + initial_timeout, now + backoff->current_backoff}; return result; @@ -56,7 +57,8 @@ static double generate_uniform_random_number_between(uint32_t* rng_state, return a + generate_uniform_random_number(rng_state) * range; } -grpc_backoff_result grpc_backoff_step(grpc_backoff* backoff) { +grpc_backoff_result grpc_backoff_step(grpc_exec_ctx* exec_ctx, + grpc_backoff* backoff) { backoff->current_backoff = (grpc_millis)(GPR_MIN( backoff->current_backoff * backoff->multiplier, backoff->max_backoff)); const double jitter = generate_uniform_random_number_between( @@ -67,7 +69,7 @@ grpc_backoff_result grpc_backoff_step(grpc_backoff* backoff) { backoff->min_connect_timeout); const grpc_millis next_timeout = GPR_MIN( (grpc_millis)(backoff->current_backoff + jitter), backoff->max_backoff); - const grpc_millis now = grpc_core::ExecCtx::Get()->Now(); + const grpc_millis now = grpc_exec_ctx_now(exec_ctx); const grpc_backoff_result result = {now + current_timeout, now + next_timeout}; return result; diff --git a/src/core/lib/backoff/backoff.h b/src/core/lib/backoff/backoff.h index f61d14ec950..0da9082e702 100644 --- a/src/core/lib/backoff/backoff.h +++ b/src/core/lib/backoff/backoff.h @@ -60,11 +60,13 @@ void grpc_backoff_init(grpc_backoff* backoff, grpc_millis initial_backoff, /// Begin retry loop: returns the deadlines to be used for the current attempt /// and the subsequent retry, if any. -grpc_backoff_result grpc_backoff_begin(grpc_backoff* backoff); +grpc_backoff_result grpc_backoff_begin(grpc_exec_ctx* exec_ctx, + grpc_backoff* backoff); /// Step a retry loop: returns the deadlines to be used for the current attempt /// and the subsequent retry, if any. -grpc_backoff_result grpc_backoff_step(grpc_backoff* backoff); +grpc_backoff_result grpc_backoff_step(grpc_exec_ctx* exec_ctx, + grpc_backoff* backoff); /// Reset the backoff, so the next grpc_backoff_step will be a /// grpc_backoff_begin. diff --git a/src/core/lib/channel/channel_args.cc b/src/core/lib/channel/channel_args.cc index 578475b2484..735fcbe405c 100644 --- a/src/core/lib/channel/channel_args.cc +++ b/src/core/lib/channel/channel_args.cc @@ -188,7 +188,7 @@ grpc_channel_args* grpc_channel_args_normalize(const grpc_channel_args* a) { return b; } -void grpc_channel_args_destroy(grpc_channel_args* a) { +void grpc_channel_args_destroy(grpc_exec_ctx* exec_ctx, grpc_channel_args* a) { size_t i; if (!a) return; for (i = 0; i < a->num_args; i++) { @@ -199,7 +199,8 @@ void grpc_channel_args_destroy(grpc_channel_args* a) { case GRPC_ARG_INTEGER: break; case GRPC_ARG_POINTER: - a->args[i].value.pointer.vtable->destroy(a->args[i].value.pointer.p); + a->args[i].value.pointer.vtable->destroy(exec_ctx, + a->args[i].value.pointer.p); break; } gpr_free(a->args[i].key); @@ -298,7 +299,8 @@ static int find_stream_compression_algorithm_states_bitset( } grpc_channel_args* grpc_channel_args_compression_algorithm_set_state( - grpc_channel_args** a, grpc_compression_algorithm algorithm, int state) { + grpc_exec_ctx* exec_ctx, grpc_channel_args** a, + grpc_compression_algorithm algorithm, int state) { int* states_arg = nullptr; grpc_channel_args* result = *a; const int states_arg_found = @@ -331,15 +333,15 @@ grpc_channel_args* grpc_channel_args_compression_algorithm_set_state( GPR_BITCLEAR((unsigned*)&tmp.value.integer, algorithm); } result = grpc_channel_args_copy_and_add(*a, &tmp, 1); - grpc_channel_args_destroy(*a); + grpc_channel_args_destroy(exec_ctx, *a); *a = result; } return result; } grpc_channel_args* grpc_channel_args_stream_compression_algorithm_set_state( - grpc_channel_args** a, grpc_stream_compression_algorithm algorithm, - int state) { + grpc_exec_ctx* exec_ctx, grpc_channel_args** a, + grpc_stream_compression_algorithm algorithm, int state) { int* states_arg = nullptr; grpc_channel_args* result = *a; const int states_arg_found = @@ -373,7 +375,7 @@ grpc_channel_args* grpc_channel_args_stream_compression_algorithm_set_state( GPR_BITCLEAR((unsigned*)&tmp.value.integer, algorithm); } result = grpc_channel_args_copy_and_add(*a, &tmp, 1); - grpc_channel_args_destroy(*a); + grpc_channel_args_destroy(exec_ctx, *a); *a = result; } return result; diff --git a/src/core/lib/channel/channel_args.h b/src/core/lib/channel/channel_args.h index 9c7d06f34e4..f6cb7fa73db 100644 --- a/src/core/lib/channel/channel_args.h +++ b/src/core/lib/channel/channel_args.h @@ -53,7 +53,7 @@ grpc_channel_args* grpc_channel_args_union(const grpc_channel_args* a, const grpc_channel_args* b); /** Destroy arguments created by \a grpc_channel_args_copy */ -void grpc_channel_args_destroy(grpc_channel_args* a); +void grpc_channel_args_destroy(grpc_exec_ctx* exec_ctx, grpc_channel_args* a); /** Returns the compression algorithm set in \a a. */ grpc_compression_algorithm grpc_channel_args_get_compression_algorithm( @@ -85,7 +85,8 @@ grpc_channel_args* grpc_channel_args_set_stream_compression_algorithm( * modified to point to the returned instance (which may be different from the * input value of \a a). */ grpc_channel_args* grpc_channel_args_compression_algorithm_set_state( - grpc_channel_args** a, grpc_compression_algorithm algorithm, int enabled); + grpc_exec_ctx* exec_ctx, grpc_channel_args** a, + grpc_compression_algorithm algorithm, int enabled); /** Sets the support for the given stream compression algorithm. By default, all * stream compression algorithms are enabled. It's an error to disable an @@ -95,8 +96,8 @@ grpc_channel_args* grpc_channel_args_compression_algorithm_set_state( * modified to point to the returned instance (which may be different from the * input value of \a a). */ grpc_channel_args* grpc_channel_args_stream_compression_algorithm_set_state( - grpc_channel_args** a, grpc_stream_compression_algorithm algorithm, - int enabled); + grpc_exec_ctx* exec_ctx, grpc_channel_args** a, + grpc_stream_compression_algorithm algorithm, int enabled); /** Returns the bitset representing the support state (true for enabled, false * for disabled) for compression algorithms. diff --git a/src/core/lib/channel/channel_stack.cc b/src/core/lib/channel/channel_stack.cc index 195fe0b195c..7629d18789d 100644 --- a/src/core/lib/channel/channel_stack.cc +++ b/src/core/lib/channel/channel_stack.cc @@ -88,8 +88,8 @@ grpc_call_element* grpc_call_stack_element(grpc_call_stack* call_stack, } grpc_error* grpc_channel_stack_init( - int initial_refs, grpc_iomgr_cb_func destroy, void* destroy_arg, - const grpc_channel_filter** filters, size_t filter_count, + grpc_exec_ctx* exec_ctx, int initial_refs, grpc_iomgr_cb_func destroy, + void* destroy_arg, const grpc_channel_filter** filters, size_t filter_count, const grpc_channel_args* channel_args, grpc_transport* optional_transport, const char* name, grpc_channel_stack* stack) { size_t call_size = @@ -117,7 +117,8 @@ grpc_error* grpc_channel_stack_init( args.is_last = i == (filter_count - 1); elems[i].filter = filters[i]; elems[i].channel_data = user_data; - grpc_error* error = elems[i].filter->init_channel_elem(&elems[i], &args); + grpc_error* error = + elems[i].filter->init_channel_elem(exec_ctx, &elems[i], &args); if (error != GRPC_ERROR_NONE) { if (first_error == GRPC_ERROR_NONE) { first_error = error; @@ -137,18 +138,20 @@ grpc_error* grpc_channel_stack_init( return first_error; } -void grpc_channel_stack_destroy(grpc_channel_stack* stack) { +void grpc_channel_stack_destroy(grpc_exec_ctx* exec_ctx, + grpc_channel_stack* stack) { grpc_channel_element* channel_elems = CHANNEL_ELEMS_FROM_STACK(stack); size_t count = stack->count; size_t i; /* destroy per-filter data */ for (i = 0; i < count; i++) { - channel_elems[i].filter->destroy_channel_elem(&channel_elems[i]); + channel_elems[i].filter->destroy_channel_elem(exec_ctx, &channel_elems[i]); } } -grpc_error* grpc_call_stack_init(grpc_channel_stack* channel_stack, +grpc_error* grpc_call_stack_init(grpc_exec_ctx* exec_ctx, + grpc_channel_stack* channel_stack, int initial_refs, grpc_iomgr_cb_func destroy, void* destroy_arg, const grpc_call_element_args* elem_args) { @@ -171,8 +174,8 @@ grpc_error* grpc_call_stack_init(grpc_channel_stack* channel_stack, call_elems[i].filter = channel_elems[i].filter; call_elems[i].channel_data = channel_elems[i].channel_data; call_elems[i].call_data = user_data; - grpc_error* error = - call_elems[i].filter->init_call_elem(&call_elems[i], elem_args); + grpc_error* error = call_elems[i].filter->init_call_elem( + exec_ctx, &call_elems[i], elem_args); if (error != GRPC_ERROR_NONE) { if (first_error == GRPC_ERROR_NONE) { first_error = error; @@ -186,7 +189,8 @@ grpc_error* grpc_call_stack_init(grpc_channel_stack* channel_stack, return first_error; } -void grpc_call_stack_set_pollset_or_pollset_set(grpc_call_stack* call_stack, +void grpc_call_stack_set_pollset_or_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_call_stack* call_stack, grpc_polling_entity* pollent) { size_t count = call_stack->count; grpc_call_element* call_elems; @@ -199,16 +203,18 @@ void grpc_call_stack_set_pollset_or_pollset_set(grpc_call_stack* call_stack, /* init per-filter data */ for (i = 0; i < count; i++) { - call_elems[i].filter->set_pollset_or_pollset_set(&call_elems[i], pollent); + call_elems[i].filter->set_pollset_or_pollset_set(exec_ctx, &call_elems[i], + pollent); user_data += ROUND_UP_TO_ALIGNMENT_SIZE(call_elems[i].filter->sizeof_call_data); } } void grpc_call_stack_ignore_set_pollset_or_pollset_set( - grpc_call_element* elem, grpc_polling_entity* pollent) {} + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_polling_entity* pollent) {} -void grpc_call_stack_destroy(grpc_call_stack* stack, +void grpc_call_stack_destroy(grpc_exec_ctx* exec_ctx, grpc_call_stack* stack, const grpc_call_final_info* final_info, grpc_closure* then_schedule_closure) { grpc_call_element* elems = CALL_ELEMS_FROM_STACK(stack); @@ -218,27 +224,29 @@ void grpc_call_stack_destroy(grpc_call_stack* stack, /* destroy per-filter data */ for (i = 0; i < count; i++) { elems[i].filter->destroy_call_elem( - &elems[i], final_info, + exec_ctx, &elems[i], final_info, i == count - 1 ? then_schedule_closure : nullptr); } } -void grpc_call_next_op(grpc_call_element* elem, +void grpc_call_next_op(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, grpc_transport_stream_op_batch* op) { grpc_call_element* next_elem = elem + 1; GRPC_CALL_LOG_OP(GPR_INFO, next_elem, op); - next_elem->filter->start_transport_stream_op_batch(next_elem, op); + next_elem->filter->start_transport_stream_op_batch(exec_ctx, next_elem, op); } -void grpc_channel_next_get_info(grpc_channel_element* elem, +void grpc_channel_next_get_info(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, const grpc_channel_info* channel_info) { grpc_channel_element* next_elem = elem + 1; - next_elem->filter->get_channel_info(next_elem, channel_info); + next_elem->filter->get_channel_info(exec_ctx, next_elem, channel_info); } -void grpc_channel_next_op(grpc_channel_element* elem, grpc_transport_op* op) { +void grpc_channel_next_op(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, + grpc_transport_op* op) { grpc_channel_element* next_elem = elem + 1; - next_elem->filter->start_transport_op(next_elem, op); + next_elem->filter->start_transport_op(exec_ctx, next_elem, op); } grpc_channel_stack* grpc_channel_stack_from_top_element( diff --git a/src/core/lib/channel/channel_stack.h b/src/core/lib/channel/channel_stack.h index 716866be26a..1b6e5396a56 100644 --- a/src/core/lib/channel/channel_stack.h +++ b/src/core/lib/channel/channel_stack.h @@ -96,12 +96,14 @@ typedef struct { typedef struct { /* Called to eg. send/receive data on a call. See grpc_call_next_op on how to call the next element in the stack */ - void (*start_transport_stream_op_batch)(grpc_call_element* elem, + void (*start_transport_stream_op_batch)(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_transport_stream_op_batch* op); /* Called to handle channel level operations - e.g. new calls, or transport closure. See grpc_channel_next_op on how to call the next element in the stack */ - void (*start_transport_op)(grpc_channel_element* elem, grpc_transport_op* op); + void (*start_transport_op)(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_transport_op* op); /* sizeof(per call data) */ size_t sizeof_call_data; @@ -114,9 +116,11 @@ typedef struct { transport and is on the server. Most filters want to ignore this argument. Implementations may assume that elem->call_data is all zeros. */ - grpc_error* (*init_call_elem)(grpc_call_element* elem, + grpc_error* (*init_call_elem)(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args); - void (*set_pollset_or_pollset_set)(grpc_call_element* elem, + void (*set_pollset_or_pollset_set)(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_polling_entity* pollent); /* Destroy per call data. The filter does not need to do any chaining. @@ -124,7 +128,7 @@ typedef struct { \a then_schedule_closure that should be passed to GRPC_CLOSURE_SCHED when destruction is complete. \a final_info contains data about the completed call, mainly for reporting purposes. */ - void (*destroy_call_elem)(grpc_call_element* elem, + void (*destroy_call_elem)(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_schedule_closure); @@ -137,14 +141,16 @@ typedef struct { useful for asserting correct configuration by upper layer code. The filter does not need to do any chaining. Implementations may assume that elem->call_data is all zeros. */ - grpc_error* (*init_channel_elem)(grpc_channel_element* elem, + grpc_error* (*init_channel_elem)(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args); /* Destroy per channel data. The filter does not need to do any chaining */ - void (*destroy_channel_elem)(grpc_channel_element* elem); + void (*destroy_channel_elem)(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem); /* Implement grpc_channel_get_info() */ - void (*get_channel_info)(grpc_channel_element* elem, + void (*get_channel_info)(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, const grpc_channel_info* channel_info); /* The name of this filter */ @@ -202,62 +208,68 @@ size_t grpc_channel_stack_size(const grpc_channel_filter** filters, size_t filter_count); /* Initialize a channel stack given some filters */ grpc_error* grpc_channel_stack_init( - int initial_refs, grpc_iomgr_cb_func destroy, void* destroy_arg, - const grpc_channel_filter** filters, size_t filter_count, + grpc_exec_ctx* exec_ctx, int initial_refs, grpc_iomgr_cb_func destroy, + void* destroy_arg, const grpc_channel_filter** filters, size_t filter_count, const grpc_channel_args* args, grpc_transport* optional_transport, const char* name, grpc_channel_stack* stack); /* Destroy a channel stack */ -void grpc_channel_stack_destroy(grpc_channel_stack* stack); +void grpc_channel_stack_destroy(grpc_exec_ctx* exec_ctx, + grpc_channel_stack* stack); /* Initialize a call stack given a channel stack. transport_server_data is expected to be NULL on a client, or an opaque transport owned pointer on the server. */ -grpc_error* grpc_call_stack_init(grpc_channel_stack* channel_stack, +grpc_error* grpc_call_stack_init(grpc_exec_ctx* exec_ctx, + grpc_channel_stack* channel_stack, int initial_refs, grpc_iomgr_cb_func destroy, void* destroy_arg, const grpc_call_element_args* elem_args); /* Set a pollset or a pollset_set for a call stack: must occur before the first * op is started */ -void grpc_call_stack_set_pollset_or_pollset_set(grpc_call_stack* call_stack, +void grpc_call_stack_set_pollset_or_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_call_stack* call_stack, grpc_polling_entity* pollent); #ifndef NDEBUG #define GRPC_CALL_STACK_REF(call_stack, reason) \ grpc_stream_ref(&(call_stack)->refcount, reason) -#define GRPC_CALL_STACK_UNREF(call_stack, reason) \ - grpc_stream_unref(&(call_stack)->refcount, reason) +#define GRPC_CALL_STACK_UNREF(exec_ctx, call_stack, reason) \ + grpc_stream_unref(exec_ctx, &(call_stack)->refcount, reason) #define GRPC_CHANNEL_STACK_REF(channel_stack, reason) \ grpc_stream_ref(&(channel_stack)->refcount, reason) -#define GRPC_CHANNEL_STACK_UNREF(channel_stack, reason) \ - grpc_stream_unref(&(channel_stack)->refcount, reason) +#define GRPC_CHANNEL_STACK_UNREF(exec_ctx, channel_stack, reason) \ + grpc_stream_unref(exec_ctx, &(channel_stack)->refcount, reason) #else #define GRPC_CALL_STACK_REF(call_stack, reason) \ grpc_stream_ref(&(call_stack)->refcount) -#define GRPC_CALL_STACK_UNREF(call_stack, reason) \ - grpc_stream_unref(&(call_stack)->refcount) +#define GRPC_CALL_STACK_UNREF(exec_ctx, call_stack, reason) \ + grpc_stream_unref(exec_ctx, &(call_stack)->refcount) #define GRPC_CHANNEL_STACK_REF(channel_stack, reason) \ grpc_stream_ref(&(channel_stack)->refcount) -#define GRPC_CHANNEL_STACK_UNREF(channel_stack, reason) \ - grpc_stream_unref(&(channel_stack)->refcount) +#define GRPC_CHANNEL_STACK_UNREF(exec_ctx, channel_stack, reason) \ + grpc_stream_unref(exec_ctx, &(channel_stack)->refcount) #endif /* Destroy a call stack */ -void grpc_call_stack_destroy(grpc_call_stack* stack, +void grpc_call_stack_destroy(grpc_exec_ctx* exec_ctx, grpc_call_stack* stack, const grpc_call_final_info* final_info, grpc_closure* then_schedule_closure); /* Ignore set pollset{_set} - used by filters if they don't care about pollsets * at all. Does nothing. */ void grpc_call_stack_ignore_set_pollset_or_pollset_set( - grpc_call_element* elem, grpc_polling_entity* pollent); + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_polling_entity* pollent); /* Call the next operation in a call stack */ -void grpc_call_next_op(grpc_call_element* elem, +void grpc_call_next_op(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, grpc_transport_stream_op_batch* op); /* Call the next operation (depending on call directionality) in a channel stack */ -void grpc_channel_next_op(grpc_channel_element* elem, grpc_transport_op* op); +void grpc_channel_next_op(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, + grpc_transport_op* op); /* Pass through a request to get_channel_info() to the next child element */ -void grpc_channel_next_get_info(grpc_channel_element* elem, +void grpc_channel_next_get_info(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, const grpc_channel_info* channel_info); /* Given the top element of a channel stack, get the channel stack itself */ diff --git a/src/core/lib/channel/channel_stack_builder.cc b/src/core/lib/channel/channel_stack_builder.cc index fcba826644e..77b7854f94d 100644 --- a/src/core/lib/channel/channel_stack_builder.cc +++ b/src/core/lib/channel/channel_stack_builder.cc @@ -150,9 +150,10 @@ void grpc_channel_stack_builder_set_name(grpc_channel_stack_builder* builder, } void grpc_channel_stack_builder_set_channel_arguments( - grpc_channel_stack_builder* builder, const grpc_channel_args* args) { + grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, + const grpc_channel_args* args) { if (builder->args != nullptr) { - grpc_channel_args_destroy(builder->args); + grpc_channel_args_destroy(exec_ctx, builder->args); } builder->args = grpc_channel_args_copy(args); } @@ -240,7 +241,8 @@ bool grpc_channel_stack_builder_add_filter_after( return true; } -void grpc_channel_stack_builder_destroy(grpc_channel_stack_builder* builder) { +void grpc_channel_stack_builder_destroy(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder) { filter_node* p = builder->begin.next; while (p != &builder->end) { filter_node* next = p->next; @@ -248,15 +250,16 @@ void grpc_channel_stack_builder_destroy(grpc_channel_stack_builder* builder) { p = next; } if (builder->args != nullptr) { - grpc_channel_args_destroy(builder->args); + grpc_channel_args_destroy(exec_ctx, builder->args); } gpr_free(builder->target); gpr_free(builder); } grpc_error* grpc_channel_stack_builder_finish( - grpc_channel_stack_builder* builder, size_t prefix_bytes, int initial_refs, - grpc_iomgr_cb_func destroy, void* destroy_arg, void** result) { + grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, + size_t prefix_bytes, int initial_refs, grpc_iomgr_cb_func destroy, + void* destroy_arg, void** result) { // count the number of filters size_t num_filters = 0; for (filter_node* p = builder->begin.next; p != &builder->end; p = p->next) { @@ -281,12 +284,12 @@ grpc_error* grpc_channel_stack_builder_finish( (grpc_channel_stack*)((char*)(*result) + prefix_bytes); // and initialize it grpc_error* error = grpc_channel_stack_init( - initial_refs, destroy, destroy_arg == nullptr ? *result : destroy_arg, - filters, num_filters, builder->args, builder->transport, builder->name, - channel_stack); + exec_ctx, initial_refs, destroy, + destroy_arg == nullptr ? *result : destroy_arg, filters, num_filters, + builder->args, builder->transport, builder->name, channel_stack); if (error != GRPC_ERROR_NONE) { - grpc_channel_stack_destroy(channel_stack); + grpc_channel_stack_destroy(exec_ctx, channel_stack); gpr_free(*result); *result = nullptr; } else { @@ -302,7 +305,7 @@ grpc_error* grpc_channel_stack_builder_finish( } } - grpc_channel_stack_builder_destroy(builder); + grpc_channel_stack_builder_destroy(exec_ctx, builder); gpr_free((grpc_channel_filter**)filters); return error; diff --git a/src/core/lib/channel/channel_stack_builder.h b/src/core/lib/channel/channel_stack_builder.h index d00ddc698c6..10019542b18 100644 --- a/src/core/lib/channel/channel_stack_builder.h +++ b/src/core/lib/channel/channel_stack_builder.h @@ -54,7 +54,8 @@ grpc_transport* grpc_channel_stack_builder_get_transport( /// Set channel arguments: copies args void grpc_channel_stack_builder_set_channel_arguments( - grpc_channel_stack_builder* builder, const grpc_channel_args* args); + grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, + const grpc_channel_args* args); /// Return a borrowed pointer to the channel arguments const grpc_channel_args* grpc_channel_stack_builder_get_channel_arguments( @@ -147,11 +148,13 @@ void grpc_channel_stack_builder_iterator_destroy( /// \a initial_refs, \a destroy, \a destroy_arg are as per /// grpc_channel_stack_init grpc_error* grpc_channel_stack_builder_finish( - grpc_channel_stack_builder* builder, size_t prefix_bytes, int initial_refs, - grpc_iomgr_cb_func destroy, void* destroy_arg, void** result); + grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, + size_t prefix_bytes, int initial_refs, grpc_iomgr_cb_func destroy, + void* destroy_arg, void** result); /// Destroy the builder without creating a channel stack -void grpc_channel_stack_builder_destroy(grpc_channel_stack_builder* builder); +void grpc_channel_stack_builder_destroy(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder); extern grpc_core::TraceFlag grpc_trace_channel_stack_builder; diff --git a/src/core/lib/channel/connected_channel.cc b/src/core/lib/channel/connected_channel.cc index 9d07cfff4e5..af2f88ab2e4 100644 --- a/src/core/lib/channel/connected_channel.cc +++ b/src/core/lib/channel/connected_channel.cc @@ -51,14 +51,17 @@ typedef struct connected_channel_call_data { callback_state recv_message_ready; } call_data; -static void run_in_call_combiner(void* arg, grpc_error* error) { +static void run_in_call_combiner(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { callback_state* state = (callback_state*)arg; - GRPC_CALL_COMBINER_START(state->call_combiner, state->original_closure, - GRPC_ERROR_REF(error), state->reason); + GRPC_CALL_COMBINER_START(exec_ctx, state->call_combiner, + state->original_closure, GRPC_ERROR_REF(error), + state->reason); } -static void run_cancel_in_call_combiner(void* arg, grpc_error* error) { - run_in_call_combiner(arg, error); +static void run_cancel_in_call_combiner(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { + run_in_call_combiner(exec_ctx, arg, error); gpr_free(arg); } @@ -95,7 +98,8 @@ static callback_state* get_state_for_batch( /* Intercept a call operation and either push it directly up or translate it into transport stream operations */ static void con_start_transport_stream_op_batch( - grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_transport_stream_op_batch* batch) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; if (batch->recv_initial_metadata) { @@ -122,52 +126,58 @@ static void con_start_transport_stream_op_batch( callback_state* state = get_state_for_batch(calld, batch); intercept_callback(calld, state, false, "on_complete", &batch->on_complete); } - grpc_transport_perform_stream_op( - chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), batch); - GRPC_CALL_COMBINER_STOP(calld->call_combiner, "passed batch to transport"); + grpc_transport_perform_stream_op(exec_ctx, chand->transport, + TRANSPORT_STREAM_FROM_CALL_DATA(calld), + batch); + GRPC_CALL_COMBINER_STOP(exec_ctx, calld->call_combiner, + "passed batch to transport"); } -static void con_start_transport_op(grpc_channel_element* elem, +static void con_start_transport_op(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_transport_op* op) { channel_data* chand = (channel_data*)elem->channel_data; - grpc_transport_perform_op(chand->transport, op); + grpc_transport_perform_op(exec_ctx, chand->transport, op); } /* Constructor for call_data */ -static grpc_error* init_call_elem(grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; calld->call_combiner = args->call_combiner; int r = grpc_transport_init_stream( - chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), + exec_ctx, chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), &args->call_stack->refcount, args->server_transport_data, args->arena); return r == 0 ? GRPC_ERROR_NONE : GRPC_ERROR_CREATE_FROM_STATIC_STRING( "transport stream initialization failed"); } -static void set_pollset_or_pollset_set(grpc_call_element* elem, +static void set_pollset_or_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_polling_entity* pollent) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; - grpc_transport_set_pops(chand->transport, + grpc_transport_set_pops(exec_ctx, chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), pollent); } /* Destructor for call_data */ -static void destroy_call_elem(grpc_call_element* elem, +static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_schedule_closure) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; - grpc_transport_destroy_stream(chand->transport, + grpc_transport_destroy_stream(exec_ctx, chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), then_schedule_closure); } /* Constructor for channel_data */ -static grpc_error* init_channel_elem(grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { channel_data* cd = (channel_data*)elem->channel_data; GPR_ASSERT(args->is_last); @@ -176,15 +186,17 @@ static grpc_error* init_channel_elem(grpc_channel_element* elem, } /* Destructor for channel_data */ -static void destroy_channel_elem(grpc_channel_element* elem) { +static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) { channel_data* cd = (channel_data*)elem->channel_data; if (cd->transport) { - grpc_transport_destroy(cd->transport); + grpc_transport_destroy(exec_ctx, cd->transport); } } /* No-op. */ -static void con_get_channel_info(grpc_channel_element* elem, +static void con_get_channel_info(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, const grpc_channel_info* channel_info) {} const grpc_channel_filter grpc_connected_filter = { @@ -218,7 +230,8 @@ static void bind_transport(grpc_channel_stack* channel_stack, grpc_transport_stream_size((grpc_transport*)t); } -bool grpc_add_connected_filter(grpc_channel_stack_builder* builder, +bool grpc_add_connected_filter(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, void* arg_must_be_null) { GPR_ASSERT(arg_must_be_null == nullptr); grpc_transport* t = grpc_channel_stack_builder_get_transport(builder); diff --git a/src/core/lib/channel/connected_channel.h b/src/core/lib/channel/connected_channel.h index 91de8022db5..cab8aad1543 100644 --- a/src/core/lib/channel/connected_channel.h +++ b/src/core/lib/channel/connected_channel.h @@ -23,7 +23,8 @@ extern const grpc_channel_filter grpc_connected_filter; -bool grpc_add_connected_filter(grpc_channel_stack_builder* builder, +bool grpc_add_connected_filter(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, void* arg_must_be_null); /* Debug helper to dig the transport stream out of a call element */ diff --git a/src/core/lib/channel/handshaker.cc b/src/core/lib/channel/handshaker.cc index dcb149c03ef..58c30b165b6 100644 --- a/src/core/lib/channel/handshaker.cc +++ b/src/core/lib/channel/handshaker.cc @@ -34,20 +34,23 @@ void grpc_handshaker_init(const grpc_handshaker_vtable* vtable, handshaker->vtable = vtable; } -void grpc_handshaker_destroy(grpc_handshaker* handshaker) { - handshaker->vtable->destroy(handshaker); +void grpc_handshaker_destroy(grpc_exec_ctx* exec_ctx, + grpc_handshaker* handshaker) { + handshaker->vtable->destroy(exec_ctx, handshaker); } -void grpc_handshaker_shutdown(grpc_handshaker* handshaker, grpc_error* why) { - handshaker->vtable->shutdown(handshaker, why); +void grpc_handshaker_shutdown(grpc_exec_ctx* exec_ctx, + grpc_handshaker* handshaker, grpc_error* why) { + handshaker->vtable->shutdown(exec_ctx, handshaker, why); } -void grpc_handshaker_do_handshake(grpc_handshaker* handshaker, +void grpc_handshaker_do_handshake(grpc_exec_ctx* exec_ctx, + grpc_handshaker* handshaker, grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, grpc_handshaker_args* args) { - handshaker->vtable->do_handshake(handshaker, acceptor, on_handshake_done, - args); + handshaker->vtable->do_handshake(exec_ctx, handshaker, acceptor, + on_handshake_done, args); } // @@ -113,9 +116,9 @@ void grpc_handshake_manager_pending_list_remove(grpc_handshake_manager** head, } void grpc_handshake_manager_pending_list_shutdown_all( - grpc_handshake_manager* head, grpc_error* why) { + grpc_exec_ctx* exec_ctx, grpc_handshake_manager* head, grpc_error* why) { while (head != nullptr) { - grpc_handshake_manager_shutdown(head, GRPC_ERROR_REF(why)); + grpc_handshake_manager_shutdown(exec_ctx, head, GRPC_ERROR_REF(why)); head = head->next; } GRPC_ERROR_UNREF(why); @@ -142,10 +145,11 @@ void grpc_handshake_manager_add(grpc_handshake_manager* mgr, gpr_mu_unlock(&mgr->mu); } -static void grpc_handshake_manager_unref(grpc_handshake_manager* mgr) { +static void grpc_handshake_manager_unref(grpc_exec_ctx* exec_ctx, + grpc_handshake_manager* mgr) { if (gpr_unref(&mgr->refs)) { for (size_t i = 0; i < mgr->count; ++i) { - grpc_handshaker_destroy(mgr->handshakers[i]); + grpc_handshaker_destroy(exec_ctx, mgr->handshakers[i]); } gpr_free(mgr->handshakers); gpr_mu_destroy(&mgr->mu); @@ -153,17 +157,19 @@ static void grpc_handshake_manager_unref(grpc_handshake_manager* mgr) { } } -void grpc_handshake_manager_destroy(grpc_handshake_manager* mgr) { - grpc_handshake_manager_unref(mgr); +void grpc_handshake_manager_destroy(grpc_exec_ctx* exec_ctx, + grpc_handshake_manager* mgr) { + grpc_handshake_manager_unref(exec_ctx, mgr); } -void grpc_handshake_manager_shutdown(grpc_handshake_manager* mgr, +void grpc_handshake_manager_shutdown(grpc_exec_ctx* exec_ctx, + grpc_handshake_manager* mgr, grpc_error* why) { gpr_mu_lock(&mgr->mu); // Shutdown the handshaker that's currently in progress, if any. if (!mgr->shutdown && mgr->index > 0) { mgr->shutdown = true; - grpc_handshaker_shutdown(mgr->handshakers[mgr->index - 1], + grpc_handshaker_shutdown(exec_ctx, mgr->handshakers[mgr->index - 1], GRPC_ERROR_REF(why)); } gpr_mu_unlock(&mgr->mu); @@ -173,7 +179,8 @@ void grpc_handshake_manager_shutdown(grpc_handshake_manager* mgr, // Helper function to call either the next handshaker or the // on_handshake_done callback. // Returns true if we've scheduled the on_handshake_done callback. -static bool call_next_handshaker_locked(grpc_handshake_manager* mgr, +static bool call_next_handshaker_locked(grpc_exec_ctx* exec_ctx, + grpc_handshake_manager* mgr, grpc_error* error) { GPR_ASSERT(mgr->index <= mgr->count); // If we got an error or we've been shut down or we're exiting early or @@ -183,12 +190,13 @@ static bool call_next_handshaker_locked(grpc_handshake_manager* mgr, mgr->index == mgr->count) { // Cancel deadline timer, since we're invoking the on_handshake_done // callback now. - grpc_timer_cancel(&mgr->deadline_timer); - GRPC_CLOSURE_SCHED(&mgr->on_handshake_done, error); + grpc_timer_cancel(exec_ctx, &mgr->deadline_timer); + GRPC_CLOSURE_SCHED(exec_ctx, &mgr->on_handshake_done, error); mgr->shutdown = true; } else { - grpc_handshaker_do_handshake(mgr->handshakers[mgr->index], mgr->acceptor, - &mgr->call_next_handshaker, &mgr->args); + grpc_handshaker_do_handshake(exec_ctx, mgr->handshakers[mgr->index], + mgr->acceptor, &mgr->call_next_handshaker, + &mgr->args); } ++mgr->index; return mgr->shutdown; @@ -196,34 +204,37 @@ static bool call_next_handshaker_locked(grpc_handshake_manager* mgr, // A function used as the handshaker-done callback when chaining // handshakers together. -static void call_next_handshaker(void* arg, grpc_error* error) { +static void call_next_handshaker(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_handshake_manager* mgr = (grpc_handshake_manager*)arg; gpr_mu_lock(&mgr->mu); - bool done = call_next_handshaker_locked(mgr, GRPC_ERROR_REF(error)); + bool done = call_next_handshaker_locked(exec_ctx, mgr, GRPC_ERROR_REF(error)); gpr_mu_unlock(&mgr->mu); // If we're invoked the final callback, we won't be coming back // to this function, so we can release our reference to the // handshake manager. if (done) { - grpc_handshake_manager_unref(mgr); + grpc_handshake_manager_unref(exec_ctx, mgr); } } // Callback invoked when deadline is exceeded. -static void on_timeout(void* arg, grpc_error* error) { +static void on_timeout(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { grpc_handshake_manager* mgr = (grpc_handshake_manager*)arg; if (error == GRPC_ERROR_NONE) { // Timer fired, rather than being cancelled. grpc_handshake_manager_shutdown( - mgr, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Handshake timed out")); + exec_ctx, mgr, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Handshake timed out")); } - grpc_handshake_manager_unref(mgr); + grpc_handshake_manager_unref(exec_ctx, mgr); } void grpc_handshake_manager_do_handshake( - grpc_handshake_manager* mgr, grpc_pollset_set* interested_parties, - grpc_endpoint* endpoint, const grpc_channel_args* channel_args, - grpc_millis deadline, grpc_tcp_server_acceptor* acceptor, - grpc_iomgr_cb_func on_handshake_done, void* user_data) { + grpc_exec_ctx* exec_ctx, grpc_handshake_manager* mgr, + grpc_pollset_set* interested_parties, grpc_endpoint* endpoint, + const grpc_channel_args* channel_args, grpc_millis deadline, + grpc_tcp_server_acceptor* acceptor, grpc_iomgr_cb_func on_handshake_done, + void* user_data) { gpr_mu_lock(&mgr->mu); GPR_ASSERT(mgr->index == 0); GPR_ASSERT(!mgr->shutdown); @@ -246,12 +257,12 @@ void grpc_handshake_manager_do_handshake( gpr_ref(&mgr->refs); GRPC_CLOSURE_INIT(&mgr->on_timeout, on_timeout, mgr, grpc_schedule_on_exec_ctx); - grpc_timer_init(&mgr->deadline_timer, deadline, &mgr->on_timeout); + grpc_timer_init(exec_ctx, &mgr->deadline_timer, deadline, &mgr->on_timeout); // Start first handshaker, which also owns a ref. gpr_ref(&mgr->refs); - bool done = call_next_handshaker_locked(mgr, GRPC_ERROR_NONE); + bool done = call_next_handshaker_locked(exec_ctx, mgr, GRPC_ERROR_NONE); gpr_mu_unlock(&mgr->mu); if (done) { - grpc_handshake_manager_unref(mgr); + grpc_handshake_manager_unref(exec_ctx, mgr); } } diff --git a/src/core/lib/channel/handshaker.h b/src/core/lib/channel/handshaker.h index 68e54631230..8e4114dc64c 100644 --- a/src/core/lib/channel/handshaker.h +++ b/src/core/lib/channel/handshaker.h @@ -68,17 +68,18 @@ typedef struct { typedef struct { /// Destroys the handshaker. - void (*destroy)(grpc_handshaker* handshaker); + void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_handshaker* handshaker); /// Shuts down the handshaker (e.g., to clean up when the operation is /// aborted in the middle). - void (*shutdown)(grpc_handshaker* handshaker, grpc_error* why); + void (*shutdown)(grpc_exec_ctx* exec_ctx, grpc_handshaker* handshaker, + grpc_error* why); /// Performs handshaking, modifying \a args as needed (e.g., to /// replace \a endpoint with a wrapped endpoint). /// When finished, invokes \a on_handshake_done. /// \a acceptor will be NULL for client-side handshakers. - void (*do_handshake)(grpc_handshaker* handshaker, + void (*do_handshake)(grpc_exec_ctx* exec_ctx, grpc_handshaker* handshaker, grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, grpc_handshaker_args* args); @@ -94,9 +95,12 @@ struct grpc_handshaker { void grpc_handshaker_init(const grpc_handshaker_vtable* vtable, grpc_handshaker* handshaker); -void grpc_handshaker_destroy(grpc_handshaker* handshaker); -void grpc_handshaker_shutdown(grpc_handshaker* handshaker, grpc_error* why); -void grpc_handshaker_do_handshake(grpc_handshaker* handshaker, +void grpc_handshaker_destroy(grpc_exec_ctx* exec_ctx, + grpc_handshaker* handshaker); +void grpc_handshaker_shutdown(grpc_exec_ctx* exec_ctx, + grpc_handshaker* handshaker, grpc_error* why); +void grpc_handshaker_do_handshake(grpc_exec_ctx* exec_ctx, + grpc_handshaker* handshaker, grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, grpc_handshaker_args* args); @@ -116,13 +120,15 @@ void grpc_handshake_manager_add(grpc_handshake_manager* mgr, grpc_handshaker* handshaker); /// Destroys the handshake manager. -void grpc_handshake_manager_destroy(grpc_handshake_manager* mgr); +void grpc_handshake_manager_destroy(grpc_exec_ctx* exec_ctx, + grpc_handshake_manager* mgr); /// Shuts down the handshake manager (e.g., to clean up when the operation is /// aborted in the middle). /// The caller must still call grpc_handshake_manager_destroy() after /// calling this function. -void grpc_handshake_manager_shutdown(grpc_handshake_manager* mgr, +void grpc_handshake_manager_shutdown(grpc_exec_ctx* exec_ctx, + grpc_handshake_manager* mgr, grpc_error* why); /// Invokes handshakers in the order they were added. @@ -140,10 +146,11 @@ void grpc_handshake_manager_shutdown(grpc_handshake_manager* mgr, /// the necessary clean-up. Otherwise, the callback takes ownership of /// the arguments. void grpc_handshake_manager_do_handshake( - grpc_handshake_manager* mgr, grpc_pollset_set* interested_parties, - grpc_endpoint* endpoint, const grpc_channel_args* channel_args, - grpc_millis deadline, grpc_tcp_server_acceptor* acceptor, - grpc_iomgr_cb_func on_handshake_done, void* user_data); + grpc_exec_ctx* exec_ctx, grpc_handshake_manager* mgr, + grpc_pollset_set* interested_parties, grpc_endpoint* endpoint, + const grpc_channel_args* channel_args, grpc_millis deadline, + grpc_tcp_server_acceptor* acceptor, grpc_iomgr_cb_func on_handshake_done, + void* user_data); /// Add \a mgr to the server side list of all pending handshake managers, the /// list starts with \a *head. @@ -159,6 +166,6 @@ void grpc_handshake_manager_pending_list_remove(grpc_handshake_manager** head, /// Shutdown all pending handshake managers on the server side. // Not thread-safe. Caller needs to synchronize. void grpc_handshake_manager_pending_list_shutdown_all( - grpc_handshake_manager* head, grpc_error* why); + grpc_exec_ctx* exec_ctx, grpc_handshake_manager* head, grpc_error* why); #endif /* GRPC_CORE_LIB_CHANNEL_HANDSHAKER_H */ diff --git a/src/core/lib/channel/handshaker_factory.cc b/src/core/lib/channel/handshaker_factory.cc index 2380d98300f..015006ade0e 100644 --- a/src/core/lib/channel/handshaker_factory.cc +++ b/src/core/lib/channel/handshaker_factory.cc @@ -21,19 +21,19 @@ #include void grpc_handshaker_factory_add_handshakers( - grpc_handshaker_factory* handshaker_factory, const grpc_channel_args* args, - grpc_handshake_manager* handshake_mgr) { + grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* handshaker_factory, + const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr) { if (handshaker_factory != nullptr) { GPR_ASSERT(handshaker_factory->vtable != nullptr); - handshaker_factory->vtable->add_handshakers(handshaker_factory, args, - handshake_mgr); + handshaker_factory->vtable->add_handshakers(exec_ctx, handshaker_factory, + args, handshake_mgr); } } void grpc_handshaker_factory_destroy( - grpc_handshaker_factory* handshaker_factory) { + grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* handshaker_factory) { if (handshaker_factory != nullptr) { GPR_ASSERT(handshaker_factory->vtable != nullptr); - handshaker_factory->vtable->destroy(handshaker_factory); + handshaker_factory->vtable->destroy(exec_ctx, handshaker_factory); } } diff --git a/src/core/lib/channel/handshaker_factory.h b/src/core/lib/channel/handshaker_factory.h index 8a7c0157e8b..ca7c26b50a2 100644 --- a/src/core/lib/channel/handshaker_factory.h +++ b/src/core/lib/channel/handshaker_factory.h @@ -29,10 +29,12 @@ typedef struct grpc_handshaker_factory grpc_handshaker_factory; typedef struct { - void (*add_handshakers)(grpc_handshaker_factory* handshaker_factory, + void (*add_handshakers)(grpc_exec_ctx* exec_ctx, + grpc_handshaker_factory* handshaker_factory, const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr); - void (*destroy)(grpc_handshaker_factory* handshaker_factory); + void (*destroy)(grpc_exec_ctx* exec_ctx, + grpc_handshaker_factory* handshaker_factory); } grpc_handshaker_factory_vtable; struct grpc_handshaker_factory { @@ -40,10 +42,10 @@ struct grpc_handshaker_factory { }; void grpc_handshaker_factory_add_handshakers( - grpc_handshaker_factory* handshaker_factory, const grpc_channel_args* args, - grpc_handshake_manager* handshake_mgr); + grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* handshaker_factory, + const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr); void grpc_handshaker_factory_destroy( - grpc_handshaker_factory* handshaker_factory); + grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* handshaker_factory); #endif /* GRPC_CORE_LIB_CHANNEL_HANDSHAKER_FACTORY_H */ diff --git a/src/core/lib/channel/handshaker_registry.cc b/src/core/lib/channel/handshaker_registry.cc index 098eabf084f..c6bc87d704c 100644 --- a/src/core/lib/channel/handshaker_registry.cc +++ b/src/core/lib/channel/handshaker_registry.cc @@ -47,17 +47,18 @@ static void grpc_handshaker_factory_list_register( } static void grpc_handshaker_factory_list_add_handshakers( - grpc_handshaker_factory_list* list, const grpc_channel_args* args, - grpc_handshake_manager* handshake_mgr) { + grpc_exec_ctx* exec_ctx, grpc_handshaker_factory_list* list, + const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr) { for (size_t i = 0; i < list->num_factories; ++i) { - grpc_handshaker_factory_add_handshakers(list->list[i], args, handshake_mgr); + grpc_handshaker_factory_add_handshakers(exec_ctx, list->list[i], args, + handshake_mgr); } } static void grpc_handshaker_factory_list_destroy( - grpc_handshaker_factory_list* list) { + grpc_exec_ctx* exec_ctx, grpc_handshaker_factory_list* list) { for (size_t i = 0; i < list->num_factories; ++i) { - grpc_handshaker_factory_destroy(list->list[i]); + grpc_handshaker_factory_destroy(exec_ctx, list->list[i]); } gpr_free(list->list); } @@ -73,9 +74,10 @@ void grpc_handshaker_factory_registry_init() { memset(g_handshaker_factory_lists, 0, sizeof(g_handshaker_factory_lists)); } -void grpc_handshaker_factory_registry_shutdown() { +void grpc_handshaker_factory_registry_shutdown(grpc_exec_ctx* exec_ctx) { for (size_t i = 0; i < NUM_HANDSHAKER_TYPES; ++i) { - grpc_handshaker_factory_list_destroy(&g_handshaker_factory_lists[i]); + grpc_handshaker_factory_list_destroy(exec_ctx, + &g_handshaker_factory_lists[i]); } } @@ -86,9 +88,11 @@ void grpc_handshaker_factory_register(bool at_start, &g_handshaker_factory_lists[handshaker_type], at_start, factory); } -void grpc_handshakers_add(grpc_handshaker_type handshaker_type, +void grpc_handshakers_add(grpc_exec_ctx* exec_ctx, + grpc_handshaker_type handshaker_type, const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr) { grpc_handshaker_factory_list_add_handshakers( - &g_handshaker_factory_lists[handshaker_type], args, handshake_mgr); + exec_ctx, &g_handshaker_factory_lists[handshaker_type], args, + handshake_mgr); } diff --git a/src/core/lib/channel/handshaker_registry.h b/src/core/lib/channel/handshaker_registry.h index 0b05531b7ef..a3b2ac1dc73 100644 --- a/src/core/lib/channel/handshaker_registry.h +++ b/src/core/lib/channel/handshaker_registry.h @@ -31,7 +31,7 @@ typedef enum { } grpc_handshaker_type; void grpc_handshaker_factory_registry_init(); -void grpc_handshaker_factory_registry_shutdown(); +void grpc_handshaker_factory_registry_shutdown(grpc_exec_ctx* exec_ctx); /// Registers a new handshaker factory. Takes ownership. /// If \a at_start is true, the new handshaker will be at the beginning of @@ -40,7 +40,8 @@ void grpc_handshaker_factory_register(bool at_start, grpc_handshaker_type handshaker_type, grpc_handshaker_factory* factory); -void grpc_handshakers_add(grpc_handshaker_type handshaker_type, +void grpc_handshakers_add(grpc_exec_ctx* exec_ctx, + grpc_handshaker_type handshaker_type, const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr); diff --git a/src/core/lib/compression/message_compress.cc b/src/core/lib/compression/message_compress.cc index aa43a53f2b7..c051e28864f 100644 --- a/src/core/lib/compression/message_compress.cc +++ b/src/core/lib/compression/message_compress.cc @@ -29,8 +29,8 @@ #define OUTPUT_BLOCK_SIZE 1024 -static int zlib_body(z_stream* zs, grpc_slice_buffer* input, - grpc_slice_buffer* output, +static int zlib_body(grpc_exec_ctx* exec_ctx, z_stream* zs, + grpc_slice_buffer* input, grpc_slice_buffer* output, int (*flate)(z_stream* zs, int flush)) { int r; int flush; @@ -74,7 +74,7 @@ static int zlib_body(z_stream* zs, grpc_slice_buffer* input, return 1; error: - grpc_slice_unref_internal(outbuf); + grpc_slice_unref_internal(exec_ctx, outbuf); return 0; } @@ -84,8 +84,8 @@ static void* zalloc_gpr(void* opaque, unsigned int items, unsigned int size) { static void zfree_gpr(void* opaque, void* address) { gpr_free(address); } -static int zlib_compress(grpc_slice_buffer* input, grpc_slice_buffer* output, - int gzip) { +static int zlib_compress(grpc_exec_ctx* exec_ctx, grpc_slice_buffer* input, + grpc_slice_buffer* output, int gzip) { z_stream zs; int r; size_t i; @@ -97,10 +97,11 @@ static int zlib_compress(grpc_slice_buffer* input, grpc_slice_buffer* output, r = deflateInit2(&zs, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 15 | (gzip ? 16 : 0), 8, Z_DEFAULT_STRATEGY); GPR_ASSERT(r == Z_OK); - r = zlib_body(&zs, input, output, deflate) && output->length < input->length; + r = zlib_body(exec_ctx, &zs, input, output, deflate) && + output->length < input->length; if (!r) { for (i = count_before; i < output->count; i++) { - grpc_slice_unref_internal(output->slices[i]); + grpc_slice_unref_internal(exec_ctx, output->slices[i]); } output->count = count_before; output->length = length_before; @@ -109,8 +110,8 @@ static int zlib_compress(grpc_slice_buffer* input, grpc_slice_buffer* output, return r; } -static int zlib_decompress(grpc_slice_buffer* input, grpc_slice_buffer* output, - int gzip) { +static int zlib_decompress(grpc_exec_ctx* exec_ctx, grpc_slice_buffer* input, + grpc_slice_buffer* output, int gzip) { z_stream zs; int r; size_t i; @@ -121,10 +122,10 @@ static int zlib_decompress(grpc_slice_buffer* input, grpc_slice_buffer* output, zs.zfree = zfree_gpr; r = inflateInit2(&zs, 15 | (gzip ? 16 : 0)); GPR_ASSERT(r == Z_OK); - r = zlib_body(&zs, input, output, inflate); + r = zlib_body(exec_ctx, &zs, input, output, inflate); if (!r) { for (i = count_before; i < output->count; i++) { - grpc_slice_unref_internal(output->slices[i]); + grpc_slice_unref_internal(exec_ctx, output->slices[i]); } output->count = count_before; output->length = length_before; @@ -141,7 +142,8 @@ static int copy(grpc_slice_buffer* input, grpc_slice_buffer* output) { return 1; } -static int compress_inner(grpc_compression_algorithm algorithm, +static int compress_inner(grpc_exec_ctx* exec_ctx, + grpc_compression_algorithm algorithm, grpc_slice_buffer* input, grpc_slice_buffer* output) { switch (algorithm) { case GRPC_COMPRESS_NONE: @@ -149,9 +151,9 @@ static int compress_inner(grpc_compression_algorithm algorithm, rely on that here */ return 0; case GRPC_COMPRESS_DEFLATE: - return zlib_compress(input, output, 0); + return zlib_compress(exec_ctx, input, output, 0); case GRPC_COMPRESS_GZIP: - return zlib_compress(input, output, 1); + return zlib_compress(exec_ctx, input, output, 1); case GRPC_COMPRESS_ALGORITHMS_COUNT: break; } @@ -159,24 +161,26 @@ static int compress_inner(grpc_compression_algorithm algorithm, return 0; } -int grpc_msg_compress(grpc_compression_algorithm algorithm, +int grpc_msg_compress(grpc_exec_ctx* exec_ctx, + grpc_compression_algorithm algorithm, grpc_slice_buffer* input, grpc_slice_buffer* output) { - if (!compress_inner(algorithm, input, output)) { + if (!compress_inner(exec_ctx, algorithm, input, output)) { copy(input, output); return 0; } return 1; } -int grpc_msg_decompress(grpc_compression_algorithm algorithm, +int grpc_msg_decompress(grpc_exec_ctx* exec_ctx, + grpc_compression_algorithm algorithm, grpc_slice_buffer* input, grpc_slice_buffer* output) { switch (algorithm) { case GRPC_COMPRESS_NONE: return copy(input, output); case GRPC_COMPRESS_DEFLATE: - return zlib_decompress(input, output, 0); + return zlib_decompress(exec_ctx, input, output, 0); case GRPC_COMPRESS_GZIP: - return zlib_decompress(input, output, 1); + return zlib_decompress(exec_ctx, input, output, 1); case GRPC_COMPRESS_ALGORITHMS_COUNT: break; } diff --git a/src/core/lib/compression/message_compress.h b/src/core/lib/compression/message_compress.h index c963fccc73b..ca8ca37f8e3 100644 --- a/src/core/lib/compression/message_compress.h +++ b/src/core/lib/compression/message_compress.h @@ -25,13 +25,15 @@ /* compress 'input' to 'output' using 'algorithm'. On success, appends compressed slices to output and returns 1. On failure, appends uncompressed slices to output and returns 0. */ -int grpc_msg_compress(grpc_compression_algorithm algorithm, +int grpc_msg_compress(grpc_exec_ctx* exec_ctx, + grpc_compression_algorithm algorithm, grpc_slice_buffer* input, grpc_slice_buffer* output); /* decompress 'input' to 'output' using 'algorithm'. On success, appends slices to output and returns 1. On failure, output is unchanged, and returns 0. */ -int grpc_msg_decompress(grpc_compression_algorithm algorithm, +int grpc_msg_decompress(grpc_exec_ctx* exec_ctx, + grpc_compression_algorithm algorithm, grpc_slice_buffer* input, grpc_slice_buffer* output); #endif /* GRPC_CORE_LIB_COMPRESSION_MESSAGE_COMPRESS_H */ diff --git a/src/core/lib/compression/stream_compression_gzip.cc b/src/core/lib/compression/stream_compression_gzip.cc index 9d829b31dbf..0c3fdd12698 100644 --- a/src/core/lib/compression/stream_compression_gzip.cc +++ b/src/core/lib/compression/stream_compression_gzip.cc @@ -40,7 +40,7 @@ static bool gzip_flate(grpc_stream_compression_context_gzip* ctx, /* Full flush is not allowed when inflating. */ GPR_ASSERT(!(ctx->flate == inflate && (flush == Z_FINISH))); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; int r; bool eoc = false; size_t original_max_output_size = max_output_size; @@ -57,8 +57,8 @@ static bool gzip_flate(grpc_stream_compression_context_gzip* ctx, r = ctx->flate(&ctx->zs, Z_NO_FLUSH); if (r < 0 && r != Z_BUF_ERROR) { gpr_log(GPR_ERROR, "zlib error (%d)", r); - grpc_slice_unref_internal(slice_out); - + grpc_slice_unref_internal(&exec_ctx, slice_out); + grpc_exec_ctx_finish(&exec_ctx); return false; } else if (r == Z_STREAM_END && ctx->flate == inflate) { eoc = true; @@ -69,7 +69,7 @@ static bool gzip_flate(grpc_stream_compression_context_gzip* ctx, grpc_slice_sub(slice, GRPC_SLICE_LENGTH(slice) - ctx->zs.avail_in, GRPC_SLICE_LENGTH(slice))); } - grpc_slice_unref_internal(slice); + grpc_slice_unref_internal(&exec_ctx, slice); } if (flush != 0 && ctx->zs.avail_out > 0 && !eoc) { GPR_ASSERT(in->length == 0); @@ -88,8 +88,8 @@ static bool gzip_flate(grpc_stream_compression_context_gzip* ctx, break; default: gpr_log(GPR_ERROR, "zlib error (%d)", r); - grpc_slice_unref_internal(slice_out); - + grpc_slice_unref_internal(&exec_ctx, slice_out); + grpc_exec_ctx_finish(&exec_ctx); return false; } } else if (flush == Z_FINISH) { @@ -104,8 +104,8 @@ static bool gzip_flate(grpc_stream_compression_context_gzip* ctx, break; default: gpr_log(GPR_ERROR, "zlib error (%d)", r); - grpc_slice_unref_internal(slice_out); - + grpc_slice_unref_internal(&exec_ctx, slice_out); + grpc_exec_ctx_finish(&exec_ctx); return false; } } @@ -117,11 +117,11 @@ static bool gzip_flate(grpc_stream_compression_context_gzip* ctx, slice_out.data.refcounted.length -= ctx->zs.avail_out; grpc_slice_buffer_add(out, slice_out); } else { - grpc_slice_unref_internal(slice_out); + grpc_slice_unref_internal(&exec_ctx, slice_out); } max_output_size -= (slice_size - ctx->zs.avail_out); } - + grpc_exec_ctx_finish(&exec_ctx); if (end_of_context) { *end_of_context = eoc; } diff --git a/src/core/lib/debug/stats.cc b/src/core/lib/debug/stats.cc index 0b39b2b1e71..7d2af71c475 100644 --- a/src/core/lib/debug/stats.cc +++ b/src/core/lib/debug/stats.cc @@ -62,9 +62,9 @@ void grpc_stats_diff(const grpc_stats_data* b, const grpc_stats_data* a, } } -int grpc_stats_histo_find_bucket_slow(int value, const int* table, - int table_size) { - GRPC_STATS_INC_HISTOGRAM_SLOW_LOOKUPS(); +int grpc_stats_histo_find_bucket_slow(grpc_exec_ctx* exec_ctx, int value, + const int* table, int table_size) { + GRPC_STATS_INC_HISTOGRAM_SLOW_LOOKUPS(exec_ctx); const int* const start = table; while (table_size > 0) { int step = table_size / 2; diff --git a/src/core/lib/debug/stats.h b/src/core/lib/debug/stats.h index 02eed5e844f..55db44e0c28 100644 --- a/src/core/lib/debug/stats.h +++ b/src/core/lib/debug/stats.h @@ -30,15 +30,17 @@ typedef struct grpc_stats_data { extern grpc_stats_data* grpc_stats_per_cpu_storage; -#define GRPC_THREAD_STATS_DATA() \ - (&grpc_stats_per_cpu_storage[grpc_core::ExecCtx::Get()->starting_cpu()]) +#define GRPC_THREAD_STATS_DATA(exec_ctx) \ + (&grpc_stats_per_cpu_storage[(exec_ctx)->starting_cpu]) -#define GRPC_STATS_INC_COUNTER(ctr) \ - (gpr_atm_no_barrier_fetch_add(&GRPC_THREAD_STATS_DATA()->counters[(ctr)], 1)) +#define GRPC_STATS_INC_COUNTER(exec_ctx, ctr) \ + (gpr_atm_no_barrier_fetch_add( \ + &GRPC_THREAD_STATS_DATA((exec_ctx))->counters[(ctr)], 1)) -#define GRPC_STATS_INC_HISTOGRAM(histogram, index) \ - (gpr_atm_no_barrier_fetch_add( \ - &GRPC_THREAD_STATS_DATA()->histograms[histogram##_FIRST_SLOT + (index)], \ +#define GRPC_STATS_INC_HISTOGRAM(exec_ctx, histogram, index) \ + (gpr_atm_no_barrier_fetch_add( \ + &GRPC_THREAD_STATS_DATA((exec_ctx)) \ + ->histograms[histogram##_FIRST_SLOT + (index)], \ 1)) void grpc_stats_init(void); @@ -48,8 +50,8 @@ void grpc_stats_collect(grpc_stats_data* output); void grpc_stats_diff(const grpc_stats_data* b, const grpc_stats_data* a, grpc_stats_data* c); char* grpc_stats_data_as_json(const grpc_stats_data* data); -int grpc_stats_histo_find_bucket_slow(int value, const int* table, - int table_size); +int grpc_stats_histo_find_bucket_slow(grpc_exec_ctx* exec_ctx, int value, + const int* table, int table_size); double grpc_stats_histo_percentile(const grpc_stats_data* data, grpc_stats_histograms histogram, double percentile); diff --git a/src/core/lib/debug/stats_data.cc b/src/core/lib/debug/stats_data.cc index 996ed3de9a2..17e15f4cfbe 100644 --- a/src/core/lib/debug/stats_data.cc +++ b/src/core/lib/debug/stats_data.cc @@ -342,10 +342,11 @@ const uint8_t grpc_stats_table_7[102] = { 42, 42, 43, 44, 44, 45, 46, 46, 47, 48, 48, 49, 49, 50, 50, 51, 51}; const int grpc_stats_table_8[9] = {0, 1, 2, 4, 7, 13, 23, 39, 64}; const uint8_t grpc_stats_table_9[9] = {0, 0, 1, 2, 2, 3, 4, 4, 5}; -void grpc_stats_inc_call_initial_size(int value) { +void grpc_stats_inc_call_initial_size(grpc_exec_ctx* exec_ctx, int value) { value = GPR_CLAMP(value, 0, 262144); if (value < 6) { - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_CALL_INITIAL_SIZE, value); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_CALL_INITIAL_SIZE, + value); return; } union { @@ -358,17 +359,19 @@ void grpc_stats_inc_call_initial_size(int value) { grpc_stats_table_1[((_val.uint - 4618441417868443648ull) >> 49)] + 6; _bkt.dbl = grpc_stats_table_0[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_CALL_INITIAL_SIZE, bucket); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_CALL_INITIAL_SIZE, + bucket); return; } - GRPC_STATS_INC_HISTOGRAM( - GRPC_STATS_HISTOGRAM_CALL_INITIAL_SIZE, - grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_0, 64)); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_CALL_INITIAL_SIZE, + grpc_stats_histo_find_bucket_slow( + (exec_ctx), value, grpc_stats_table_0, 64)); } -void grpc_stats_inc_poll_events_returned(int value) { +void grpc_stats_inc_poll_events_returned(grpc_exec_ctx* exec_ctx, int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 29) { - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_POLL_EVENTS_RETURNED, value); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), + GRPC_STATS_HISTOGRAM_POLL_EVENTS_RETURNED, value); return; } union { @@ -381,17 +384,20 @@ void grpc_stats_inc_poll_events_returned(int value) { grpc_stats_table_3[((_val.uint - 4628855992006737920ull) >> 47)] + 29; _bkt.dbl = grpc_stats_table_2[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_POLL_EVENTS_RETURNED, bucket); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), + GRPC_STATS_HISTOGRAM_POLL_EVENTS_RETURNED, bucket); return; } - GRPC_STATS_INC_HISTOGRAM( - GRPC_STATS_HISTOGRAM_POLL_EVENTS_RETURNED, - grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_2, 128)); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), + GRPC_STATS_HISTOGRAM_POLL_EVENTS_RETURNED, + grpc_stats_histo_find_bucket_slow( + (exec_ctx), value, grpc_stats_table_2, 128)); } -void grpc_stats_inc_tcp_write_size(int value) { +void grpc_stats_inc_tcp_write_size(grpc_exec_ctx* exec_ctx, int value) { value = GPR_CLAMP(value, 0, 16777216); if (value < 5) { - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_WRITE_SIZE, value); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_WRITE_SIZE, + value); return; } union { @@ -404,17 +410,19 @@ void grpc_stats_inc_tcp_write_size(int value) { grpc_stats_table_5[((_val.uint - 4617315517961601024ull) >> 50)] + 5; _bkt.dbl = grpc_stats_table_4[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_WRITE_SIZE, bucket); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_WRITE_SIZE, + bucket); return; } - GRPC_STATS_INC_HISTOGRAM( - GRPC_STATS_HISTOGRAM_TCP_WRITE_SIZE, - grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_4, 64)); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_WRITE_SIZE, + grpc_stats_histo_find_bucket_slow( + (exec_ctx), value, grpc_stats_table_4, 64)); } -void grpc_stats_inc_tcp_write_iov_size(int value) { +void grpc_stats_inc_tcp_write_iov_size(grpc_exec_ctx* exec_ctx, int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 13) { - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_WRITE_IOV_SIZE, value); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), + GRPC_STATS_HISTOGRAM_TCP_WRITE_IOV_SIZE, value); return; } union { @@ -427,17 +435,19 @@ void grpc_stats_inc_tcp_write_iov_size(int value) { grpc_stats_table_7[((_val.uint - 4623507967449235456ull) >> 48)] + 13; _bkt.dbl = grpc_stats_table_6[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_WRITE_IOV_SIZE, bucket); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), + GRPC_STATS_HISTOGRAM_TCP_WRITE_IOV_SIZE, bucket); return; } - GRPC_STATS_INC_HISTOGRAM( - GRPC_STATS_HISTOGRAM_TCP_WRITE_IOV_SIZE, - grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_6, 64)); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_WRITE_IOV_SIZE, + grpc_stats_histo_find_bucket_slow( + (exec_ctx), value, grpc_stats_table_6, 64)); } -void grpc_stats_inc_tcp_read_size(int value) { +void grpc_stats_inc_tcp_read_size(grpc_exec_ctx* exec_ctx, int value) { value = GPR_CLAMP(value, 0, 16777216); if (value < 5) { - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_READ_SIZE, value); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_SIZE, + value); return; } union { @@ -450,17 +460,19 @@ void grpc_stats_inc_tcp_read_size(int value) { grpc_stats_table_5[((_val.uint - 4617315517961601024ull) >> 50)] + 5; _bkt.dbl = grpc_stats_table_4[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_READ_SIZE, bucket); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_SIZE, + bucket); return; } - GRPC_STATS_INC_HISTOGRAM( - GRPC_STATS_HISTOGRAM_TCP_READ_SIZE, - grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_4, 64)); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_SIZE, + grpc_stats_histo_find_bucket_slow( + (exec_ctx), value, grpc_stats_table_4, 64)); } -void grpc_stats_inc_tcp_read_offer(int value) { +void grpc_stats_inc_tcp_read_offer(grpc_exec_ctx* exec_ctx, int value) { value = GPR_CLAMP(value, 0, 16777216); if (value < 5) { - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_READ_OFFER, value); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_OFFER, + value); return; } union { @@ -473,18 +485,20 @@ void grpc_stats_inc_tcp_read_offer(int value) { grpc_stats_table_5[((_val.uint - 4617315517961601024ull) >> 50)] + 5; _bkt.dbl = grpc_stats_table_4[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_READ_OFFER, bucket); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_OFFER, + bucket); return; } - GRPC_STATS_INC_HISTOGRAM( - GRPC_STATS_HISTOGRAM_TCP_READ_OFFER, - grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_4, 64)); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_OFFER, + grpc_stats_histo_find_bucket_slow( + (exec_ctx), value, grpc_stats_table_4, 64)); } -void grpc_stats_inc_tcp_read_offer_iov_size(int value) { +void grpc_stats_inc_tcp_read_offer_iov_size(grpc_exec_ctx* exec_ctx, + int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 13) { - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_READ_OFFER_IOV_SIZE, - value); + GRPC_STATS_INC_HISTOGRAM( + (exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_OFFER_IOV_SIZE, value); return; } union { @@ -497,19 +511,21 @@ void grpc_stats_inc_tcp_read_offer_iov_size(int value) { grpc_stats_table_7[((_val.uint - 4623507967449235456ull) >> 48)] + 13; _bkt.dbl = grpc_stats_table_6[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_READ_OFFER_IOV_SIZE, - bucket); + GRPC_STATS_INC_HISTOGRAM( + (exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_OFFER_IOV_SIZE, bucket); return; } - GRPC_STATS_INC_HISTOGRAM( - GRPC_STATS_HISTOGRAM_TCP_READ_OFFER_IOV_SIZE, - grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_6, 64)); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), + GRPC_STATS_HISTOGRAM_TCP_READ_OFFER_IOV_SIZE, + grpc_stats_histo_find_bucket_slow( + (exec_ctx), value, grpc_stats_table_6, 64)); } -void grpc_stats_inc_http2_send_message_size(int value) { +void grpc_stats_inc_http2_send_message_size(grpc_exec_ctx* exec_ctx, + int value) { value = GPR_CLAMP(value, 0, 16777216); if (value < 5) { - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_SIZE, - value); + GRPC_STATS_INC_HISTOGRAM( + (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_SIZE, value); return; } union { @@ -522,19 +538,22 @@ void grpc_stats_inc_http2_send_message_size(int value) { grpc_stats_table_5[((_val.uint - 4617315517961601024ull) >> 50)] + 5; _bkt.dbl = grpc_stats_table_4[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_SIZE, - bucket); + GRPC_STATS_INC_HISTOGRAM( + (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_SIZE, bucket); return; } - GRPC_STATS_INC_HISTOGRAM( - GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_SIZE, - grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_4, 64)); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), + GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_SIZE, + grpc_stats_histo_find_bucket_slow( + (exec_ctx), value, grpc_stats_table_4, 64)); } -void grpc_stats_inc_http2_send_initial_metadata_per_write(int value) { +void grpc_stats_inc_http2_send_initial_metadata_per_write( + grpc_exec_ctx* exec_ctx, int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 13) { GRPC_STATS_INC_HISTOGRAM( - GRPC_STATS_HISTOGRAM_HTTP2_SEND_INITIAL_METADATA_PER_WRITE, value); + (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_INITIAL_METADATA_PER_WRITE, + value); return; } union { @@ -548,18 +567,21 @@ void grpc_stats_inc_http2_send_initial_metadata_per_write(int value) { _bkt.dbl = grpc_stats_table_6[bucket]; bucket -= (_val.uint < _bkt.uint); GRPC_STATS_INC_HISTOGRAM( - GRPC_STATS_HISTOGRAM_HTTP2_SEND_INITIAL_METADATA_PER_WRITE, bucket); + (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_INITIAL_METADATA_PER_WRITE, + bucket); return; } GRPC_STATS_INC_HISTOGRAM( - GRPC_STATS_HISTOGRAM_HTTP2_SEND_INITIAL_METADATA_PER_WRITE, - grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_6, 64)); + (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_INITIAL_METADATA_PER_WRITE, + grpc_stats_histo_find_bucket_slow((exec_ctx), value, grpc_stats_table_6, + 64)); } -void grpc_stats_inc_http2_send_message_per_write(int value) { +void grpc_stats_inc_http2_send_message_per_write(grpc_exec_ctx* exec_ctx, + int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 13) { - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_PER_WRITE, - value); + GRPC_STATS_INC_HISTOGRAM( + (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_PER_WRITE, value); return; } union { @@ -572,19 +594,22 @@ void grpc_stats_inc_http2_send_message_per_write(int value) { grpc_stats_table_7[((_val.uint - 4623507967449235456ull) >> 48)] + 13; _bkt.dbl = grpc_stats_table_6[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_PER_WRITE, - bucket); + GRPC_STATS_INC_HISTOGRAM( + (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_PER_WRITE, bucket); return; } - GRPC_STATS_INC_HISTOGRAM( - GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_PER_WRITE, - grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_6, 64)); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), + GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_PER_WRITE, + grpc_stats_histo_find_bucket_slow( + (exec_ctx), value, grpc_stats_table_6, 64)); } -void grpc_stats_inc_http2_send_trailing_metadata_per_write(int value) { +void grpc_stats_inc_http2_send_trailing_metadata_per_write( + grpc_exec_ctx* exec_ctx, int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 13) { GRPC_STATS_INC_HISTOGRAM( - GRPC_STATS_HISTOGRAM_HTTP2_SEND_TRAILING_METADATA_PER_WRITE, value); + (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_TRAILING_METADATA_PER_WRITE, + value); return; } union { @@ -598,18 +623,21 @@ void grpc_stats_inc_http2_send_trailing_metadata_per_write(int value) { _bkt.dbl = grpc_stats_table_6[bucket]; bucket -= (_val.uint < _bkt.uint); GRPC_STATS_INC_HISTOGRAM( - GRPC_STATS_HISTOGRAM_HTTP2_SEND_TRAILING_METADATA_PER_WRITE, bucket); + (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_TRAILING_METADATA_PER_WRITE, + bucket); return; } GRPC_STATS_INC_HISTOGRAM( - GRPC_STATS_HISTOGRAM_HTTP2_SEND_TRAILING_METADATA_PER_WRITE, - grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_6, 64)); + (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_TRAILING_METADATA_PER_WRITE, + grpc_stats_histo_find_bucket_slow((exec_ctx), value, grpc_stats_table_6, + 64)); } -void grpc_stats_inc_http2_send_flowctl_per_write(int value) { +void grpc_stats_inc_http2_send_flowctl_per_write(grpc_exec_ctx* exec_ctx, + int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 13) { - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_HTTP2_SEND_FLOWCTL_PER_WRITE, - value); + GRPC_STATS_INC_HISTOGRAM( + (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_FLOWCTL_PER_WRITE, value); return; } union { @@ -622,18 +650,20 @@ void grpc_stats_inc_http2_send_flowctl_per_write(int value) { grpc_stats_table_7[((_val.uint - 4623507967449235456ull) >> 48)] + 13; _bkt.dbl = grpc_stats_table_6[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_HTTP2_SEND_FLOWCTL_PER_WRITE, - bucket); + GRPC_STATS_INC_HISTOGRAM( + (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_FLOWCTL_PER_WRITE, bucket); return; } - GRPC_STATS_INC_HISTOGRAM( - GRPC_STATS_HISTOGRAM_HTTP2_SEND_FLOWCTL_PER_WRITE, - grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_6, 64)); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), + GRPC_STATS_HISTOGRAM_HTTP2_SEND_FLOWCTL_PER_WRITE, + grpc_stats_histo_find_bucket_slow( + (exec_ctx), value, grpc_stats_table_6, 64)); } -void grpc_stats_inc_server_cqs_checked(int value) { +void grpc_stats_inc_server_cqs_checked(grpc_exec_ctx* exec_ctx, int value) { value = GPR_CLAMP(value, 0, 64); if (value < 3) { - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED, value); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), + GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED, value); return; } union { @@ -646,12 +676,13 @@ void grpc_stats_inc_server_cqs_checked(int value) { grpc_stats_table_9[((_val.uint - 4613937818241073152ull) >> 51)] + 3; _bkt.dbl = grpc_stats_table_8[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED, bucket); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), + GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED, bucket); return; } - GRPC_STATS_INC_HISTOGRAM( - GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED, - grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_8, 8)); + GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED, + grpc_stats_histo_find_bucket_slow( + (exec_ctx), value, grpc_stats_table_8, 8)); } const int grpc_stats_histo_buckets[13] = {64, 128, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 8}; @@ -663,7 +694,7 @@ const int* const grpc_stats_histo_bucket_boundaries[13] = { grpc_stats_table_6, grpc_stats_table_4, grpc_stats_table_6, grpc_stats_table_6, grpc_stats_table_6, grpc_stats_table_6, grpc_stats_table_8}; -void (*const grpc_stats_inc_histogram[13])(int x) = { +void (*const grpc_stats_inc_histogram[13])(grpc_exec_ctx* exec_ctx, int x) = { grpc_stats_inc_call_initial_size, grpc_stats_inc_poll_events_returned, grpc_stats_inc_tcp_write_size, diff --git a/src/core/lib/debug/stats_data.h b/src/core/lib/debug/stats_data.h index 4504be33e7e..8a5bc973899 100644 --- a/src/core/lib/debug/stats_data.h +++ b/src/core/lib/debug/stats_data.h @@ -172,262 +172,330 @@ typedef enum { GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED_BUCKETS = 8, GRPC_STATS_HISTOGRAM_BUCKETS = 840 } grpc_stats_histogram_constants; -#define GRPC_STATS_INC_CLIENT_CALLS_CREATED() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CLIENT_CALLS_CREATED) -#define GRPC_STATS_INC_SERVER_CALLS_CREATED() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SERVER_CALLS_CREATED) -#define GRPC_STATS_INC_CQS_CREATED() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CQS_CREATED) -#define GRPC_STATS_INC_CLIENT_CHANNELS_CREATED() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CLIENT_CHANNELS_CREATED) -#define GRPC_STATS_INC_CLIENT_SUBCHANNELS_CREATED() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CLIENT_SUBCHANNELS_CREATED) -#define GRPC_STATS_INC_SERVER_CHANNELS_CREATED() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SERVER_CHANNELS_CREATED) -#define GRPC_STATS_INC_SYSCALL_POLL() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SYSCALL_POLL) -#define GRPC_STATS_INC_SYSCALL_WAIT() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SYSCALL_WAIT) -#define GRPC_STATS_INC_POLLSET_KICK() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_POLLSET_KICK) -#define GRPC_STATS_INC_POLLSET_KICKED_WITHOUT_POLLER() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_POLLSET_KICKED_WITHOUT_POLLER) -#define GRPC_STATS_INC_POLLSET_KICKED_AGAIN() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_POLLSET_KICKED_AGAIN) -#define GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_POLLSET_KICK_WAKEUP_FD) -#define GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_POLLSET_KICK_WAKEUP_CV) -#define GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_POLLSET_KICK_OWN_THREAD) -#define GRPC_STATS_INC_HISTOGRAM_SLOW_LOOKUPS() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HISTOGRAM_SLOW_LOOKUPS) -#define GRPC_STATS_INC_SYSCALL_WRITE() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SYSCALL_WRITE) -#define GRPC_STATS_INC_SYSCALL_READ() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SYSCALL_READ) -#define GRPC_STATS_INC_TCP_BACKUP_POLLERS_CREATED() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_TCP_BACKUP_POLLERS_CREATED) -#define GRPC_STATS_INC_TCP_BACKUP_POLLER_POLLS() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_TCP_BACKUP_POLLER_POLLS) -#define GRPC_STATS_INC_HTTP2_OP_BATCHES() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_BATCHES) -#define GRPC_STATS_INC_HTTP2_OP_CANCEL() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_CANCEL) -#define GRPC_STATS_INC_HTTP2_OP_SEND_INITIAL_METADATA() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_SEND_INITIAL_METADATA) -#define GRPC_STATS_INC_HTTP2_OP_SEND_MESSAGE() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_SEND_MESSAGE) -#define GRPC_STATS_INC_HTTP2_OP_SEND_TRAILING_METADATA() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_SEND_TRAILING_METADATA) -#define GRPC_STATS_INC_HTTP2_OP_RECV_INITIAL_METADATA() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_RECV_INITIAL_METADATA) -#define GRPC_STATS_INC_HTTP2_OP_RECV_MESSAGE() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_RECV_MESSAGE) -#define GRPC_STATS_INC_HTTP2_OP_RECV_TRAILING_METADATA() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_RECV_TRAILING_METADATA) -#define GRPC_STATS_INC_HTTP2_SETTINGS_WRITES() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_SETTINGS_WRITES) -#define GRPC_STATS_INC_HTTP2_PINGS_SENT() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_PINGS_SENT) -#define GRPC_STATS_INC_HTTP2_WRITES_BEGUN() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_WRITES_BEGUN) -#define GRPC_STATS_INC_HTTP2_WRITES_OFFLOADED() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_WRITES_OFFLOADED) -#define GRPC_STATS_INC_HTTP2_WRITES_CONTINUED() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_WRITES_CONTINUED) -#define GRPC_STATS_INC_HTTP2_PARTIAL_WRITES() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_PARTIAL_WRITES) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_INITIAL_WRITE() \ - GRPC_STATS_INC_COUNTER( \ +#define GRPC_STATS_INC_CLIENT_CALLS_CREATED(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_CLIENT_CALLS_CREATED) +#define GRPC_STATS_INC_SERVER_CALLS_CREATED(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SERVER_CALLS_CREATED) +#define GRPC_STATS_INC_CQS_CREATED(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_CQS_CREATED) +#define GRPC_STATS_INC_CLIENT_CHANNELS_CREATED(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_CLIENT_CHANNELS_CREATED) +#define GRPC_STATS_INC_CLIENT_SUBCHANNELS_CREATED(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_CLIENT_SUBCHANNELS_CREATED) +#define GRPC_STATS_INC_SERVER_CHANNELS_CREATED(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SERVER_CHANNELS_CREATED) +#define GRPC_STATS_INC_SYSCALL_POLL(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SYSCALL_POLL) +#define GRPC_STATS_INC_SYSCALL_WAIT(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SYSCALL_WAIT) +#define GRPC_STATS_INC_POLLSET_KICK(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_POLLSET_KICK) +#define GRPC_STATS_INC_POLLSET_KICKED_WITHOUT_POLLER(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_POLLSET_KICKED_WITHOUT_POLLER) +#define GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_POLLSET_KICKED_AGAIN) +#define GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_POLLSET_KICK_WAKEUP_FD) +#define GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_POLLSET_KICK_WAKEUP_CV) +#define GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_POLLSET_KICK_OWN_THREAD) +#define GRPC_STATS_INC_HISTOGRAM_SLOW_LOOKUPS(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HISTOGRAM_SLOW_LOOKUPS) +#define GRPC_STATS_INC_SYSCALL_WRITE(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SYSCALL_WRITE) +#define GRPC_STATS_INC_SYSCALL_READ(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SYSCALL_READ) +#define GRPC_STATS_INC_TCP_BACKUP_POLLERS_CREATED(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_TCP_BACKUP_POLLERS_CREATED) +#define GRPC_STATS_INC_TCP_BACKUP_POLLER_POLLS(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_TCP_BACKUP_POLLER_POLLS) +#define GRPC_STATS_INC_HTTP2_OP_BATCHES(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_OP_BATCHES) +#define GRPC_STATS_INC_HTTP2_OP_CANCEL(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_OP_CANCEL) +#define GRPC_STATS_INC_HTTP2_OP_SEND_INITIAL_METADATA(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_HTTP2_OP_SEND_INITIAL_METADATA) +#define GRPC_STATS_INC_HTTP2_OP_SEND_MESSAGE(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_OP_SEND_MESSAGE) +#define GRPC_STATS_INC_HTTP2_OP_SEND_TRAILING_METADATA(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_HTTP2_OP_SEND_TRAILING_METADATA) +#define GRPC_STATS_INC_HTTP2_OP_RECV_INITIAL_METADATA(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_HTTP2_OP_RECV_INITIAL_METADATA) +#define GRPC_STATS_INC_HTTP2_OP_RECV_MESSAGE(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_OP_RECV_MESSAGE) +#define GRPC_STATS_INC_HTTP2_OP_RECV_TRAILING_METADATA(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_HTTP2_OP_RECV_TRAILING_METADATA) +#define GRPC_STATS_INC_HTTP2_SETTINGS_WRITES(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_SETTINGS_WRITES) +#define GRPC_STATS_INC_HTTP2_PINGS_SENT(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_PINGS_SENT) +#define GRPC_STATS_INC_HTTP2_WRITES_BEGUN(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_WRITES_BEGUN) +#define GRPC_STATS_INC_HTTP2_WRITES_OFFLOADED(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_WRITES_OFFLOADED) +#define GRPC_STATS_INC_HTTP2_WRITES_CONTINUED(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_WRITES_CONTINUED) +#define GRPC_STATS_INC_HTTP2_PARTIAL_WRITES(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_PARTIAL_WRITES) +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_INITIAL_WRITE(exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_INITIAL_WRITE) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_START_NEW_STREAM() \ - GRPC_STATS_INC_COUNTER( \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_START_NEW_STREAM(exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_START_NEW_STREAM) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_MESSAGE() \ - GRPC_STATS_INC_COUNTER( \ - GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_SEND_MESSAGE) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_INITIAL_METADATA() \ - GRPC_STATS_INC_COUNTER( \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_MESSAGE(exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_SEND_MESSAGE) +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_INITIAL_METADATA( \ + exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_SEND_INITIAL_METADATA) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_TRAILING_METADATA() \ - GRPC_STATS_INC_COUNTER( \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_TRAILING_METADATA( \ + exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_SEND_TRAILING_METADATA) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RETRY_SEND_PING() \ - GRPC_STATS_INC_COUNTER( \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RETRY_SEND_PING(exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_RETRY_SEND_PING) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CONTINUE_PINGS() \ - GRPC_STATS_INC_COUNTER( \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CONTINUE_PINGS(exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_CONTINUE_PINGS) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_GOAWAY_SENT() \ - GRPC_STATS_INC_COUNTER( \ - GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_GOAWAY_SENT) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RST_STREAM() \ - GRPC_STATS_INC_COUNTER( \ - GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_RST_STREAM) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CLOSE_FROM_API() \ - GRPC_STATS_INC_COUNTER( \ - GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_CLOSE_FROM_API) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_STREAM_FLOW_CONTROL() \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_GOAWAY_SENT(exec_ctx) \ GRPC_STATS_INC_COUNTER( \ - GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_STREAM_FLOW_CONTROL) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL() \ + (exec_ctx), GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_GOAWAY_SENT) +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RST_STREAM(exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_RST_STREAM) +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CLOSE_FROM_API(exec_ctx) \ GRPC_STATS_INC_COUNTER( \ + (exec_ctx), \ + GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_CLOSE_FROM_API) +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_STREAM_FLOW_CONTROL( \ + exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), \ + GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_STREAM_FLOW_CONTROL) +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL( \ + exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_SETTINGS() \ - GRPC_STATS_INC_COUNTER( \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_SETTINGS(exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_SEND_SETTINGS) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_BDP_ESTIMATOR_PING() \ - GRPC_STATS_INC_COUNTER( \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_BDP_ESTIMATOR_PING( \ + exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_BDP_ESTIMATOR_PING) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_SETTING() \ - GRPC_STATS_INC_COUNTER( \ - GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_SETTING) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_UPDATE() \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_SETTING( \ + exec_ctx) \ GRPC_STATS_INC_COUNTER( \ + (exec_ctx), \ + GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_SETTING) +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_UPDATE( \ + exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_UPDATE) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_APPLICATION_PING() \ - GRPC_STATS_INC_COUNTER( \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_APPLICATION_PING(exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_APPLICATION_PING) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_KEEPALIVE_PING() \ - GRPC_STATS_INC_COUNTER( \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_KEEPALIVE_PING(exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_KEEPALIVE_PING) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL_UNSTALLED() \ - GRPC_STATS_INC_COUNTER( \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL_UNSTALLED( \ + exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL_UNSTALLED) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_PING_RESPONSE() \ - GRPC_STATS_INC_COUNTER( \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_PING_RESPONSE(exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_PING_RESPONSE) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FORCE_RST_STREAM() \ - GRPC_STATS_INC_COUNTER( \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FORCE_RST_STREAM(exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_FORCE_RST_STREAM) -#define GRPC_STATS_INC_HTTP2_SPURIOUS_WRITES_BEGUN() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_SPURIOUS_WRITES_BEGUN) -#define GRPC_STATS_INC_HPACK_RECV_INDEXED() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_INDEXED) -#define GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_INCIDX) -#define GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX_V() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_INCIDX_V) -#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NOTIDX) -#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX_V() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NOTIDX_V) -#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NVRIDX) -#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX_V() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NVRIDX_V) -#define GRPC_STATS_INC_HPACK_RECV_UNCOMPRESSED() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_UNCOMPRESSED) -#define GRPC_STATS_INC_HPACK_RECV_HUFFMAN() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_HUFFMAN) -#define GRPC_STATS_INC_HPACK_RECV_BINARY() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_BINARY) -#define GRPC_STATS_INC_HPACK_RECV_BINARY_BASE64() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_BINARY_BASE64) -#define GRPC_STATS_INC_HPACK_SEND_INDEXED() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_INDEXED) -#define GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_INCIDX) -#define GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX_V() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_INCIDX_V) -#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NOTIDX) -#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX_V() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NOTIDX_V) -#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NVRIDX() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NVRIDX) -#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NVRIDX_V() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NVRIDX_V) -#define GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_UNCOMPRESSED) -#define GRPC_STATS_INC_HPACK_SEND_HUFFMAN() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_HUFFMAN) -#define GRPC_STATS_INC_HPACK_SEND_BINARY() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_BINARY) -#define GRPC_STATS_INC_HPACK_SEND_BINARY_BASE64() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_BINARY_BASE64) -#define GRPC_STATS_INC_COMBINER_LOCKS_INITIATED() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_COMBINER_LOCKS_INITIATED) -#define GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_ITEMS() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_COMBINER_LOCKS_SCHEDULED_ITEMS) -#define GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS() \ - GRPC_STATS_INC_COUNTER( \ - GRPC_STATS_COUNTER_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS) -#define GRPC_STATS_INC_COMBINER_LOCKS_OFFLOADED() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_COMBINER_LOCKS_OFFLOADED) -#define GRPC_STATS_INC_CALL_COMBINER_LOCKS_INITIATED() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CALL_COMBINER_LOCKS_INITIATED) -#define GRPC_STATS_INC_CALL_COMBINER_LOCKS_SCHEDULED_ITEMS() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CALL_COMBINER_LOCKS_SCHEDULED_ITEMS) -#define GRPC_STATS_INC_CALL_COMBINER_SET_NOTIFY_ON_CANCEL() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CALL_COMBINER_SET_NOTIFY_ON_CANCEL) -#define GRPC_STATS_INC_CALL_COMBINER_CANCELLED() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CALL_COMBINER_CANCELLED) -#define GRPC_STATS_INC_EXECUTOR_SCHEDULED_SHORT_ITEMS() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_EXECUTOR_SCHEDULED_SHORT_ITEMS) -#define GRPC_STATS_INC_EXECUTOR_SCHEDULED_LONG_ITEMS() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_EXECUTOR_SCHEDULED_LONG_ITEMS) -#define GRPC_STATS_INC_EXECUTOR_SCHEDULED_TO_SELF() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_EXECUTOR_SCHEDULED_TO_SELF) -#define GRPC_STATS_INC_EXECUTOR_WAKEUP_INITIATED() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_EXECUTOR_WAKEUP_INITIATED) -#define GRPC_STATS_INC_EXECUTOR_QUEUE_DRAINED() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_EXECUTOR_QUEUE_DRAINED) -#define GRPC_STATS_INC_EXECUTOR_PUSH_RETRIES() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_EXECUTOR_PUSH_RETRIES) -#define GRPC_STATS_INC_SERVER_REQUESTED_CALLS() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SERVER_REQUESTED_CALLS) -#define GRPC_STATS_INC_SERVER_SLOWPATH_REQUESTS_QUEUED() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SERVER_SLOWPATH_REQUESTS_QUEUED) -#define GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_FAILURES() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CQ_EV_QUEUE_TRYLOCK_FAILURES) -#define GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_SUCCESSES() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CQ_EV_QUEUE_TRYLOCK_SUCCESSES) -#define GRPC_STATS_INC_CQ_EV_QUEUE_TRANSIENT_POP_FAILURES() \ - GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CQ_EV_QUEUE_TRANSIENT_POP_FAILURES) -#define GRPC_STATS_INC_CALL_INITIAL_SIZE(value) \ - grpc_stats_inc_call_initial_size((int)(value)) -void grpc_stats_inc_call_initial_size(int x); -#define GRPC_STATS_INC_POLL_EVENTS_RETURNED(value) \ - grpc_stats_inc_poll_events_returned((int)(value)) -void grpc_stats_inc_poll_events_returned(int x); -#define GRPC_STATS_INC_TCP_WRITE_SIZE(value) \ - grpc_stats_inc_tcp_write_size((int)(value)) -void grpc_stats_inc_tcp_write_size(int x); -#define GRPC_STATS_INC_TCP_WRITE_IOV_SIZE(value) \ - grpc_stats_inc_tcp_write_iov_size((int)(value)) -void grpc_stats_inc_tcp_write_iov_size(int x); -#define GRPC_STATS_INC_TCP_READ_SIZE(value) \ - grpc_stats_inc_tcp_read_size((int)(value)) -void grpc_stats_inc_tcp_read_size(int x); -#define GRPC_STATS_INC_TCP_READ_OFFER(value) \ - grpc_stats_inc_tcp_read_offer((int)(value)) -void grpc_stats_inc_tcp_read_offer(int x); -#define GRPC_STATS_INC_TCP_READ_OFFER_IOV_SIZE(value) \ - grpc_stats_inc_tcp_read_offer_iov_size((int)(value)) -void grpc_stats_inc_tcp_read_offer_iov_size(int x); -#define GRPC_STATS_INC_HTTP2_SEND_MESSAGE_SIZE(value) \ - grpc_stats_inc_http2_send_message_size((int)(value)) -void grpc_stats_inc_http2_send_message_size(int x); -#define GRPC_STATS_INC_HTTP2_SEND_INITIAL_METADATA_PER_WRITE(value) \ - grpc_stats_inc_http2_send_initial_metadata_per_write((int)(value)) -void grpc_stats_inc_http2_send_initial_metadata_per_write(int x); -#define GRPC_STATS_INC_HTTP2_SEND_MESSAGE_PER_WRITE(value) \ - grpc_stats_inc_http2_send_message_per_write((int)(value)) -void grpc_stats_inc_http2_send_message_per_write(int x); -#define GRPC_STATS_INC_HTTP2_SEND_TRAILING_METADATA_PER_WRITE(value) \ - grpc_stats_inc_http2_send_trailing_metadata_per_write((int)(value)) -void grpc_stats_inc_http2_send_trailing_metadata_per_write(int x); -#define GRPC_STATS_INC_HTTP2_SEND_FLOWCTL_PER_WRITE(value) \ - grpc_stats_inc_http2_send_flowctl_per_write((int)(value)) -void grpc_stats_inc_http2_send_flowctl_per_write(int x); -#define GRPC_STATS_INC_SERVER_CQS_CHECKED(value) \ - grpc_stats_inc_server_cqs_checked((int)(value)) -void grpc_stats_inc_server_cqs_checked(int x); +#define GRPC_STATS_INC_HTTP2_SPURIOUS_WRITES_BEGUN(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_HTTP2_SPURIOUS_WRITES_BEGUN) +#define GRPC_STATS_INC_HPACK_RECV_INDEXED(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_RECV_INDEXED) +#define GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_INCIDX) +#define GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX_V(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_INCIDX_V) +#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NOTIDX) +#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX_V(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NOTIDX_V) +#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NVRIDX) +#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX_V(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NVRIDX_V) +#define GRPC_STATS_INC_HPACK_RECV_UNCOMPRESSED(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_RECV_UNCOMPRESSED) +#define GRPC_STATS_INC_HPACK_RECV_HUFFMAN(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_RECV_HUFFMAN) +#define GRPC_STATS_INC_HPACK_RECV_BINARY(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_RECV_BINARY) +#define GRPC_STATS_INC_HPACK_RECV_BINARY_BASE64(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_HPACK_RECV_BINARY_BASE64) +#define GRPC_STATS_INC_HPACK_SEND_INDEXED(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_SEND_INDEXED) +#define GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_INCIDX) +#define GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX_V(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_INCIDX_V) +#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NOTIDX) +#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX_V(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NOTIDX_V) +#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NVRIDX(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NVRIDX) +#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NVRIDX_V(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NVRIDX_V) +#define GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_SEND_UNCOMPRESSED) +#define GRPC_STATS_INC_HPACK_SEND_HUFFMAN(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_SEND_HUFFMAN) +#define GRPC_STATS_INC_HPACK_SEND_BINARY(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_SEND_BINARY) +#define GRPC_STATS_INC_HPACK_SEND_BINARY_BASE64(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_HPACK_SEND_BINARY_BASE64) +#define GRPC_STATS_INC_COMBINER_LOCKS_INITIATED(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_COMBINER_LOCKS_INITIATED) +#define GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_ITEMS(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_COMBINER_LOCKS_SCHEDULED_ITEMS) +#define GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS(exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), GRPC_STATS_COUNTER_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS) +#define GRPC_STATS_INC_COMBINER_LOCKS_OFFLOADED(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_COMBINER_LOCKS_OFFLOADED) +#define GRPC_STATS_INC_CALL_COMBINER_LOCKS_INITIATED(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_CALL_COMBINER_LOCKS_INITIATED) +#define GRPC_STATS_INC_CALL_COMBINER_LOCKS_SCHEDULED_ITEMS(exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), GRPC_STATS_COUNTER_CALL_COMBINER_LOCKS_SCHEDULED_ITEMS) +#define GRPC_STATS_INC_CALL_COMBINER_SET_NOTIFY_ON_CANCEL(exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), GRPC_STATS_COUNTER_CALL_COMBINER_SET_NOTIFY_ON_CANCEL) +#define GRPC_STATS_INC_CALL_COMBINER_CANCELLED(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_CALL_COMBINER_CANCELLED) +#define GRPC_STATS_INC_EXECUTOR_SCHEDULED_SHORT_ITEMS(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_EXECUTOR_SCHEDULED_SHORT_ITEMS) +#define GRPC_STATS_INC_EXECUTOR_SCHEDULED_LONG_ITEMS(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_EXECUTOR_SCHEDULED_LONG_ITEMS) +#define GRPC_STATS_INC_EXECUTOR_SCHEDULED_TO_SELF(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_EXECUTOR_SCHEDULED_TO_SELF) +#define GRPC_STATS_INC_EXECUTOR_WAKEUP_INITIATED(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_EXECUTOR_WAKEUP_INITIATED) +#define GRPC_STATS_INC_EXECUTOR_QUEUE_DRAINED(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_EXECUTOR_QUEUE_DRAINED) +#define GRPC_STATS_INC_EXECUTOR_PUSH_RETRIES(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_EXECUTOR_PUSH_RETRIES) +#define GRPC_STATS_INC_SERVER_REQUESTED_CALLS(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SERVER_REQUESTED_CALLS) +#define GRPC_STATS_INC_SERVER_SLOWPATH_REQUESTS_QUEUED(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_SERVER_SLOWPATH_REQUESTS_QUEUED) +#define GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_FAILURES(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_CQ_EV_QUEUE_TRYLOCK_FAILURES) +#define GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_SUCCESSES(exec_ctx) \ + GRPC_STATS_INC_COUNTER((exec_ctx), \ + GRPC_STATS_COUNTER_CQ_EV_QUEUE_TRYLOCK_SUCCESSES) +#define GRPC_STATS_INC_CQ_EV_QUEUE_TRANSIENT_POP_FAILURES(exec_ctx) \ + GRPC_STATS_INC_COUNTER( \ + (exec_ctx), GRPC_STATS_COUNTER_CQ_EV_QUEUE_TRANSIENT_POP_FAILURES) +#define GRPC_STATS_INC_CALL_INITIAL_SIZE(exec_ctx, value) \ + grpc_stats_inc_call_initial_size((exec_ctx), (int)(value)) +void grpc_stats_inc_call_initial_size(grpc_exec_ctx* exec_ctx, int x); +#define GRPC_STATS_INC_POLL_EVENTS_RETURNED(exec_ctx, value) \ + grpc_stats_inc_poll_events_returned((exec_ctx), (int)(value)) +void grpc_stats_inc_poll_events_returned(grpc_exec_ctx* exec_ctx, int x); +#define GRPC_STATS_INC_TCP_WRITE_SIZE(exec_ctx, value) \ + grpc_stats_inc_tcp_write_size((exec_ctx), (int)(value)) +void grpc_stats_inc_tcp_write_size(grpc_exec_ctx* exec_ctx, int x); +#define GRPC_STATS_INC_TCP_WRITE_IOV_SIZE(exec_ctx, value) \ + grpc_stats_inc_tcp_write_iov_size((exec_ctx), (int)(value)) +void grpc_stats_inc_tcp_write_iov_size(grpc_exec_ctx* exec_ctx, int x); +#define GRPC_STATS_INC_TCP_READ_SIZE(exec_ctx, value) \ + grpc_stats_inc_tcp_read_size((exec_ctx), (int)(value)) +void grpc_stats_inc_tcp_read_size(grpc_exec_ctx* exec_ctx, int x); +#define GRPC_STATS_INC_TCP_READ_OFFER(exec_ctx, value) \ + grpc_stats_inc_tcp_read_offer((exec_ctx), (int)(value)) +void grpc_stats_inc_tcp_read_offer(grpc_exec_ctx* exec_ctx, int x); +#define GRPC_STATS_INC_TCP_READ_OFFER_IOV_SIZE(exec_ctx, value) \ + grpc_stats_inc_tcp_read_offer_iov_size((exec_ctx), (int)(value)) +void grpc_stats_inc_tcp_read_offer_iov_size(grpc_exec_ctx* exec_ctx, int x); +#define GRPC_STATS_INC_HTTP2_SEND_MESSAGE_SIZE(exec_ctx, value) \ + grpc_stats_inc_http2_send_message_size((exec_ctx), (int)(value)) +void grpc_stats_inc_http2_send_message_size(grpc_exec_ctx* exec_ctx, int x); +#define GRPC_STATS_INC_HTTP2_SEND_INITIAL_METADATA_PER_WRITE(exec_ctx, value) \ + grpc_stats_inc_http2_send_initial_metadata_per_write((exec_ctx), (int)(value)) +void grpc_stats_inc_http2_send_initial_metadata_per_write( + grpc_exec_ctx* exec_ctx, int x); +#define GRPC_STATS_INC_HTTP2_SEND_MESSAGE_PER_WRITE(exec_ctx, value) \ + grpc_stats_inc_http2_send_message_per_write((exec_ctx), (int)(value)) +void grpc_stats_inc_http2_send_message_per_write(grpc_exec_ctx* exec_ctx, + int x); +#define GRPC_STATS_INC_HTTP2_SEND_TRAILING_METADATA_PER_WRITE(exec_ctx, value) \ + grpc_stats_inc_http2_send_trailing_metadata_per_write((exec_ctx), \ + (int)(value)) +void grpc_stats_inc_http2_send_trailing_metadata_per_write( + grpc_exec_ctx* exec_ctx, int x); +#define GRPC_STATS_INC_HTTP2_SEND_FLOWCTL_PER_WRITE(exec_ctx, value) \ + grpc_stats_inc_http2_send_flowctl_per_write((exec_ctx), (int)(value)) +void grpc_stats_inc_http2_send_flowctl_per_write(grpc_exec_ctx* exec_ctx, + int x); +#define GRPC_STATS_INC_SERVER_CQS_CHECKED(exec_ctx, value) \ + grpc_stats_inc_server_cqs_checked((exec_ctx), (int)(value)) +void grpc_stats_inc_server_cqs_checked(grpc_exec_ctx* exec_ctx, int x); extern const int grpc_stats_histo_buckets[13]; extern const int grpc_stats_histo_start[13]; extern const int* const grpc_stats_histo_bucket_boundaries[13]; -extern void (*const grpc_stats_inc_histogram[13])(int x); +extern void (*const grpc_stats_inc_histogram[13])(grpc_exec_ctx* exec_ctx, + int x); #endif /* GRPC_CORE_LIB_DEBUG_STATS_DATA_H */ diff --git a/src/core/lib/http/httpcli.cc b/src/core/lib/http/httpcli.cc index ed874c4265c..73b484b06d7 100644 --- a/src/core/lib/http/httpcli.cc +++ b/src/core/lib/http/httpcli.cc @@ -63,11 +63,13 @@ typedef struct { static grpc_httpcli_get_override g_get_override = nullptr; static grpc_httpcli_post_override g_post_override = nullptr; -static void plaintext_handshake(void* arg, grpc_endpoint* endpoint, - const char* host, grpc_millis deadline, - void (*on_done)(void* arg, +static void plaintext_handshake(grpc_exec_ctx* exec_ctx, void* arg, + grpc_endpoint* endpoint, const char* host, + grpc_millis deadline, + void (*on_done)(grpc_exec_ctx* exec_ctx, + void* arg, grpc_endpoint* endpoint)) { - on_done(arg, endpoint); + on_done(exec_ctx, arg, endpoint); } const grpc_httpcli_handshaker grpc_httpcli_plaintext = {"http", @@ -77,31 +79,34 @@ void grpc_httpcli_context_init(grpc_httpcli_context* context) { context->pollset_set = grpc_pollset_set_create(); } -void grpc_httpcli_context_destroy(grpc_httpcli_context* context) { - grpc_pollset_set_destroy(context->pollset_set); +void grpc_httpcli_context_destroy(grpc_exec_ctx* exec_ctx, + grpc_httpcli_context* context) { + grpc_pollset_set_destroy(exec_ctx, context->pollset_set); } -static void next_address(internal_request* req, grpc_error* due_to_error); +static void next_address(grpc_exec_ctx* exec_ctx, internal_request* req, + grpc_error* due_to_error); -static void finish(internal_request* req, grpc_error* error) { - grpc_polling_entity_del_from_pollset_set(req->pollent, +static void finish(grpc_exec_ctx* exec_ctx, internal_request* req, + grpc_error* error) { + grpc_polling_entity_del_from_pollset_set(exec_ctx, req->pollent, req->context->pollset_set); - GRPC_CLOSURE_SCHED(req->on_done, error); + GRPC_CLOSURE_SCHED(exec_ctx, req->on_done, error); grpc_http_parser_destroy(&req->parser); if (req->addresses != nullptr) { grpc_resolved_addresses_destroy(req->addresses); } if (req->ep != nullptr) { - grpc_endpoint_destroy(req->ep); + grpc_endpoint_destroy(exec_ctx, req->ep); } - grpc_slice_unref_internal(req->request_text); + grpc_slice_unref_internal(exec_ctx, req->request_text); gpr_free(req->host); gpr_free(req->ssl_host_override); grpc_iomgr_unregister_object(&req->iomgr_obj); - grpc_slice_buffer_destroy_internal(&req->incoming); - grpc_slice_buffer_destroy_internal(&req->outgoing); + grpc_slice_buffer_destroy_internal(exec_ctx, &req->incoming); + grpc_slice_buffer_destroy_internal(exec_ctx, &req->outgoing); GRPC_ERROR_UNREF(req->overall_error); - grpc_resource_quota_unref_internal(req->resource_quota); + grpc_resource_quota_unref_internal(exec_ctx, req->resource_quota); gpr_free(req); } @@ -119,11 +124,12 @@ static void append_error(internal_request* req, grpc_error* error) { gpr_free(addr_text); } -static void do_read(internal_request* req) { - grpc_endpoint_read(req->ep, &req->incoming, &req->on_read); +static void do_read(grpc_exec_ctx* exec_ctx, internal_request* req) { + grpc_endpoint_read(exec_ctx, req->ep, &req->incoming, &req->on_read); } -static void on_read(void* user_data, grpc_error* error) { +static void on_read(grpc_exec_ctx* exec_ctx, void* user_data, + grpc_error* error) { internal_request* req = (internal_request*)user_data; size_t i; @@ -133,70 +139,77 @@ static void on_read(void* user_data, grpc_error* error) { grpc_error* err = grpc_http_parser_parse( &req->parser, req->incoming.slices[i], nullptr); if (err != GRPC_ERROR_NONE) { - finish(req, err); + finish(exec_ctx, req, err); return; } } } if (error == GRPC_ERROR_NONE) { - do_read(req); + do_read(exec_ctx, req); } else if (!req->have_read_byte) { - next_address(req, GRPC_ERROR_REF(error)); + next_address(exec_ctx, req, GRPC_ERROR_REF(error)); } else { - finish(req, grpc_http_parser_eof(&req->parser)); + finish(exec_ctx, req, grpc_http_parser_eof(&req->parser)); } } -static void on_written(internal_request* req) { do_read(req); } +static void on_written(grpc_exec_ctx* exec_ctx, internal_request* req) { + do_read(exec_ctx, req); +} -static void done_write(void* arg, grpc_error* error) { +static void done_write(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { internal_request* req = (internal_request*)arg; if (error == GRPC_ERROR_NONE) { - on_written(req); + on_written(exec_ctx, req); } else { - next_address(req, GRPC_ERROR_REF(error)); + next_address(exec_ctx, req, GRPC_ERROR_REF(error)); } } -static void start_write(internal_request* req) { +static void start_write(grpc_exec_ctx* exec_ctx, internal_request* req) { grpc_slice_ref_internal(req->request_text); grpc_slice_buffer_add(&req->outgoing, req->request_text); - grpc_endpoint_write(req->ep, &req->outgoing, &req->done_write); + grpc_endpoint_write(exec_ctx, req->ep, &req->outgoing, &req->done_write); } -static void on_handshake_done(void* arg, grpc_endpoint* ep) { +static void on_handshake_done(grpc_exec_ctx* exec_ctx, void* arg, + grpc_endpoint* ep) { internal_request* req = (internal_request*)arg; if (!ep) { - next_address(req, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Unexplained handshake failure")); + next_address( + exec_ctx, req, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Unexplained handshake failure")); return; } req->ep = ep; - start_write(req); + start_write(exec_ctx, req); } -static void on_connected(void* arg, grpc_error* error) { +static void on_connected(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { internal_request* req = (internal_request*)arg; if (!req->ep) { - next_address(req, GRPC_ERROR_REF(error)); + next_address(exec_ctx, req, GRPC_ERROR_REF(error)); return; } req->handshaker->handshake( - req, req->ep, req->ssl_host_override ? req->ssl_host_override : req->host, + exec_ctx, req, req->ep, + req->ssl_host_override ? req->ssl_host_override : req->host, req->deadline, on_handshake_done); } -static void next_address(internal_request* req, grpc_error* error) { +static void next_address(grpc_exec_ctx* exec_ctx, internal_request* req, + grpc_error* error) { grpc_resolved_address* addr; if (error != GRPC_ERROR_NONE) { append_error(req, error); } if (req->next_address == req->addresses->naddrs) { - finish(req, + finish(exec_ctx, req, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Failed HTTP requests to all targets", &req->overall_error, 1)); return; @@ -208,21 +221,23 @@ static void next_address(internal_request* req, grpc_error* error) { (char*)GRPC_ARG_RESOURCE_QUOTA, req->resource_quota, grpc_resource_quota_arg_vtable()); grpc_channel_args args = {1, &arg}; - grpc_tcp_client_connect(&req->connected, &req->ep, req->context->pollset_set, - &args, addr, req->deadline); + grpc_tcp_client_connect(exec_ctx, &req->connected, &req->ep, + req->context->pollset_set, &args, addr, + req->deadline); } -static void on_resolved(void* arg, grpc_error* error) { +static void on_resolved(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { internal_request* req = (internal_request*)arg; if (error != GRPC_ERROR_NONE) { - finish(req, GRPC_ERROR_REF(error)); + finish(exec_ctx, req, GRPC_ERROR_REF(error)); return; } req->next_address = 0; - next_address(req, GRPC_ERROR_NONE); + next_address(exec_ctx, req, GRPC_ERROR_NONE); } -static void internal_request_begin(grpc_httpcli_context* context, +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, @@ -252,31 +267,33 @@ static void internal_request_begin(grpc_httpcli_context* context, req->ssl_host_override = gpr_strdup(request->ssl_host_override); GPR_ASSERT(pollent); - grpc_polling_entity_add_to_pollset_set(req->pollent, + grpc_polling_entity_add_to_pollset_set(exec_ctx, req->pollent, req->context->pollset_set); grpc_resolve_address( - request->host, req->handshaker->default_port, req->context->pollset_set, + exec_ctx, request->host, req->handshaker->default_port, + req->context->pollset_set, GRPC_CLOSURE_CREATE(on_resolved, req, grpc_schedule_on_exec_ctx), &req->addresses); } -void grpc_httpcli_get(grpc_httpcli_context* context, +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, grpc_millis deadline, grpc_closure* on_done, grpc_httpcli_response* response) { char* name; - if (g_get_override && g_get_override(request, deadline, on_done, response)) { + if (g_get_override && + g_get_override(exec_ctx, request, deadline, on_done, response)) { return; } gpr_asprintf(&name, "HTTP:GET:%s:%s", request->host, request->http.path); - internal_request_begin(context, pollent, resource_quota, request, deadline, - on_done, response, name, + internal_request_begin(exec_ctx, context, pollent, resource_quota, request, + deadline, on_done, response, name, grpc_httpcli_format_get_request(request)); gpr_free(name); } -void grpc_httpcli_post(grpc_httpcli_context* context, +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, @@ -284,14 +301,16 @@ void grpc_httpcli_post(grpc_httpcli_context* context, grpc_millis deadline, grpc_closure* on_done, grpc_httpcli_response* response) { char* name; - if (g_post_override && g_post_override(request, body_bytes, body_size, - deadline, on_done, response)) { + if (g_post_override && + g_post_override(exec_ctx, request, body_bytes, body_size, deadline, + on_done, response)) { return; } gpr_asprintf(&name, "HTTP:POST:%s:%s", request->host, request->http.path); internal_request_begin( - context, pollent, resource_quota, request, deadline, on_done, response, - name, grpc_httpcli_format_post_request(request, body_bytes, body_size)); + 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); } diff --git a/src/core/lib/http/httpcli.h b/src/core/lib/http/httpcli.h index 72d20cc7a34..6f675568bd0 100644 --- a/src/core/lib/http/httpcli.h +++ b/src/core/lib/http/httpcli.h @@ -41,9 +41,10 @@ typedef struct grpc_httpcli_context { typedef struct { const char* default_port; - void (*handshake)(void* arg, grpc_endpoint* endpoint, const char* host, - grpc_millis deadline, - void (*on_done)(void* arg, grpc_endpoint* endpoint)); + void (*handshake)(grpc_exec_ctx* exec_ctx, void* arg, grpc_endpoint* endpoint, + const char* host, grpc_millis deadline, + void (*on_done)(grpc_exec_ctx* exec_ctx, void* arg, + grpc_endpoint* endpoint)); } grpc_httpcli_handshaker; extern const grpc_httpcli_handshaker grpc_httpcli_plaintext; @@ -67,7 +68,8 @@ typedef struct grpc_httpcli_request { typedef struct grpc_http_response grpc_httpcli_response; void grpc_httpcli_context_init(grpc_httpcli_context* context); -void grpc_httpcli_context_destroy(grpc_httpcli_context* context); +void grpc_httpcli_context_destroy(grpc_exec_ctx* exec_ctx, + grpc_httpcli_context* context); /* Asynchronously perform a HTTP GET. 'context' specifies the http context under which to do the get @@ -78,7 +80,7 @@ void grpc_httpcli_context_destroy(grpc_httpcli_context* context); destroyed once the call returns 'deadline' contains a deadline for the request (or gpr_inf_future) 'on_response' is a callback to report results to */ -void grpc_httpcli_get(grpc_httpcli_context* context, +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, grpc_millis deadline, @@ -99,7 +101,7 @@ void grpc_httpcli_get(grpc_httpcli_context* context, lifetime of the request 'on_response' is a callback to report results to Does not support ?var1=val1&var2=val2 in the path. */ -void grpc_httpcli_post(grpc_httpcli_context* context, +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, @@ -108,16 +110,15 @@ void grpc_httpcli_post(grpc_httpcli_context* context, grpc_httpcli_response* response); /* override functions return 1 if they handled the request, 0 otherwise */ -typedef int (*grpc_httpcli_get_override)(const grpc_httpcli_request* request, +typedef int (*grpc_httpcli_get_override)(grpc_exec_ctx* exec_ctx, + const grpc_httpcli_request* request, grpc_millis deadline, grpc_closure* on_complete, grpc_httpcli_response* response); -typedef int (*grpc_httpcli_post_override)(const grpc_httpcli_request* request, - const char* body_bytes, - size_t body_size, - grpc_millis deadline, - grpc_closure* on_complete, - grpc_httpcli_response* response); +typedef int (*grpc_httpcli_post_override)( + grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, + const char* body_bytes, size_t body_size, grpc_millis deadline, + grpc_closure* on_complete, grpc_httpcli_response* response); void grpc_httpcli_set_override(grpc_httpcli_get_override get, grpc_httpcli_post_override post); diff --git a/src/core/lib/http/httpcli_security_connector.cc b/src/core/lib/http/httpcli_security_connector.cc index bfb536a9211..dfcaee702ba 100644 --- a/src/core/lib/http/httpcli_security_connector.cc +++ b/src/core/lib/http/httpcli_security_connector.cc @@ -38,7 +38,8 @@ typedef struct { char* secure_peer_name; } grpc_httpcli_ssl_channel_security_connector; -static void httpcli_ssl_destroy(grpc_security_connector* sc) { +static void httpcli_ssl_destroy(grpc_exec_ctx* exec_ctx, + grpc_security_connector* sc) { grpc_httpcli_ssl_channel_security_connector* c = (grpc_httpcli_ssl_channel_security_connector*)sc; if (c->handshaker_factory != nullptr) { @@ -49,7 +50,8 @@ static void httpcli_ssl_destroy(grpc_security_connector* sc) { gpr_free(sc); } -static void httpcli_ssl_add_handshakers(grpc_channel_security_connector* sc, +static void httpcli_ssl_add_handshakers(grpc_exec_ctx* exec_ctx, + grpc_channel_security_connector* sc, grpc_handshake_manager* handshake_mgr) { grpc_httpcli_ssl_channel_security_connector* c = (grpc_httpcli_ssl_channel_security_connector*)sc; @@ -63,11 +65,13 @@ static void httpcli_ssl_add_handshakers(grpc_channel_security_connector* sc, } } grpc_handshake_manager_add( - handshake_mgr, grpc_security_handshaker_create( - tsi_create_adapter_handshaker(handshaker), &sc->base)); + handshake_mgr, + grpc_security_handshaker_create( + exec_ctx, tsi_create_adapter_handshaker(handshaker), &sc->base)); } -static void httpcli_ssl_check_peer(grpc_security_connector* sc, tsi_peer peer, +static void httpcli_ssl_check_peer(grpc_exec_ctx* exec_ctx, + grpc_security_connector* sc, tsi_peer peer, grpc_auth_context** auth_context, grpc_closure* on_peer_checked) { grpc_httpcli_ssl_channel_security_connector* c = @@ -83,7 +87,7 @@ static void httpcli_ssl_check_peer(grpc_security_connector* sc, tsi_peer peer, error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); } - GRPC_CLOSURE_SCHED(on_peer_checked, error); + GRPC_CLOSURE_SCHED(exec_ctx, on_peer_checked, error); tsi_peer_destruct(&peer); } @@ -100,8 +104,8 @@ static grpc_security_connector_vtable httpcli_ssl_vtable = { httpcli_ssl_destroy, httpcli_ssl_check_peer, httpcli_ssl_cmp}; static grpc_security_status httpcli_ssl_channel_security_connector_create( - const char* pem_root_certs, const char* secure_peer_name, - grpc_channel_security_connector** sc) { + grpc_exec_ctx* exec_ctx, const char* pem_root_certs, + const char* secure_peer_name, grpc_channel_security_connector** sc) { tsi_result result = TSI_OK; grpc_httpcli_ssl_channel_security_connector* c; @@ -124,12 +128,12 @@ static grpc_security_status httpcli_ssl_channel_security_connector_create( if (result != TSI_OK) { gpr_log(GPR_ERROR, "Handshaker factory creation failed with %s.", tsi_result_to_string(result)); - httpcli_ssl_destroy(&c->base.base); + httpcli_ssl_destroy(exec_ctx, &c->base.base); *sc = nullptr; return GRPC_SECURITY_ERROR; } // We don't actually need a channel credentials object in this case, - // but we set it to a non-nullptr address so that we don't trigger + // but we set it to a non-NULL address so that we don't trigger // assertions in grpc_channel_security_connector_cmp(). c->base.channel_creds = (grpc_channel_credentials*)1; c->base.add_handshakers = httpcli_ssl_add_handshakers; @@ -140,37 +144,40 @@ static grpc_security_status httpcli_ssl_channel_security_connector_create( /* handshaker */ typedef struct { - void (*func)(void* arg, grpc_endpoint* endpoint); + void (*func)(grpc_exec_ctx* exec_ctx, void* arg, grpc_endpoint* endpoint); void* arg; grpc_handshake_manager* handshake_mgr; } on_done_closure; -static void on_handshake_done(void* arg, grpc_error* error) { +static void on_handshake_done(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_handshaker_args* args = (grpc_handshaker_args*)arg; on_done_closure* c = (on_done_closure*)args->user_data; if (error != GRPC_ERROR_NONE) { const char* msg = grpc_error_string(error); gpr_log(GPR_ERROR, "Secure transport setup failed: %s", msg); - c->func(c->arg, nullptr); + c->func(exec_ctx, c->arg, nullptr); } else { - grpc_channel_args_destroy(args->args); - grpc_slice_buffer_destroy_internal(args->read_buffer); + grpc_channel_args_destroy(exec_ctx, args->args); + grpc_slice_buffer_destroy_internal(exec_ctx, args->read_buffer); gpr_free(args->read_buffer); - c->func(c->arg, args->endpoint); + c->func(exec_ctx, c->arg, args->endpoint); } - grpc_handshake_manager_destroy(c->handshake_mgr); + grpc_handshake_manager_destroy(exec_ctx, c->handshake_mgr); gpr_free(c); } -static void ssl_handshake(void* arg, grpc_endpoint* tcp, const char* host, +static void ssl_handshake(grpc_exec_ctx* exec_ctx, void* arg, + grpc_endpoint* tcp, const char* host, grpc_millis deadline, - void (*on_done)(void* arg, grpc_endpoint* endpoint)) { + void (*on_done)(grpc_exec_ctx* exec_ctx, void* arg, + grpc_endpoint* endpoint)) { on_done_closure* c = (on_done_closure*)gpr_malloc(sizeof(*c)); const char* pem_root_certs = grpc_get_default_ssl_roots(); if (pem_root_certs == nullptr) { gpr_log(GPR_ERROR, "Could not get default pem root certs."); - on_done(arg, nullptr); + on_done(exec_ctx, arg, nullptr); gpr_free(c); return; } @@ -178,16 +185,16 @@ static void ssl_handshake(void* arg, grpc_endpoint* tcp, const char* host, c->arg = arg; grpc_channel_security_connector* sc = nullptr; GPR_ASSERT(httpcli_ssl_channel_security_connector_create( - pem_root_certs, host, &sc) == GRPC_SECURITY_OK); + exec_ctx, pem_root_certs, host, &sc) == GRPC_SECURITY_OK); grpc_arg channel_arg = grpc_security_connector_to_arg(&sc->base); grpc_channel_args args = {1, &channel_arg}; c->handshake_mgr = grpc_handshake_manager_create(); - grpc_handshakers_add(HANDSHAKER_CLIENT, &args, c->handshake_mgr); + grpc_handshakers_add(exec_ctx, HANDSHAKER_CLIENT, &args, c->handshake_mgr); grpc_handshake_manager_do_handshake( - c->handshake_mgr, nullptr /* interested_parties */, tcp, + exec_ctx, c->handshake_mgr, nullptr /* interested_parties */, tcp, nullptr /* channel_args */, deadline, nullptr /* acceptor */, on_handshake_done, c /* user_data */); - GRPC_SECURITY_CONNECTOR_UNREF(&sc->base, "httpcli"); + GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, &sc->base, "httpcli"); } const grpc_httpcli_handshaker grpc_httpcli_ssl = {"https", ssl_handshake}; diff --git a/src/core/lib/iomgr/block_annotate.h b/src/core/lib/iomgr/block_annotate.h index a57873aabb2..340ebcb1afa 100644 --- a/src/core/lib/iomgr/block_annotate.h +++ b/src/core/lib/iomgr/block_annotate.h @@ -31,27 +31,26 @@ void gpr_thd_end_blocking_region(); do { \ gpr_thd_start_blocking_region(); \ } while (0) -#define GRPC_SCHEDULING_END_BLOCKING_REGION \ - do { \ - gpr_thd_end_blocking_region(); \ - grpc_core::ExecCtx::Get()->InvalidateNow(); \ - } while (0) #define GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX \ do { \ gpr_thd_end_blocking_region(); \ } while (0) - +#define GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(ec) \ + do { \ + gpr_thd_end_blocking_region(); \ + grpc_exec_ctx_invalidate_now((ec)); \ + } while (0) #else #define GRPC_SCHEDULING_START_BLOCKING_REGION \ do { \ } while (0) -#define GRPC_SCHEDULING_END_BLOCKING_REGION \ - do { \ - grpc_core::ExecCtx::Get()->InvalidateNow(); \ - } while (0) #define GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX \ do { \ } while (0) +#define GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(ec) \ + do { \ + grpc_exec_ctx_invalidate_now((ec)); \ + } while (0) #endif #endif /* GRPC_CORE_LIB_IOMGR_BLOCK_ANNOTATE_H */ diff --git a/src/core/lib/iomgr/call_combiner.cc b/src/core/lib/iomgr/call_combiner.cc index a9f48fb3c2d..b5910b42e42 100644 --- a/src/core/lib/iomgr/call_combiner.cc +++ b/src/core/lib/iomgr/call_combiner.cc @@ -56,7 +56,8 @@ void grpc_call_combiner_destroy(grpc_call_combiner* call_combiner) { #define DEBUG_FMT_ARGS #endif -void grpc_call_combiner_start(grpc_call_combiner* call_combiner, +void grpc_call_combiner_start(grpc_exec_ctx* exec_ctx, + grpc_call_combiner* call_combiner, grpc_closure* closure, grpc_error* error DEBUG_ARGS, const char* reason) { @@ -74,16 +75,15 @@ void grpc_call_combiner_start(grpc_call_combiner* call_combiner, gpr_log(GPR_DEBUG, " size: %" PRIdPTR " -> %" PRIdPTR, prev_size, prev_size + 1); } - GRPC_STATS_INC_CALL_COMBINER_LOCKS_SCHEDULED_ITEMS(); + GRPC_STATS_INC_CALL_COMBINER_LOCKS_SCHEDULED_ITEMS(exec_ctx); if (prev_size == 0) { - GRPC_STATS_INC_CALL_COMBINER_LOCKS_INITIATED(); - + GRPC_STATS_INC_CALL_COMBINER_LOCKS_INITIATED(exec_ctx); GPR_TIMER_MARK("call_combiner_initiate", 0); if (grpc_call_combiner_trace.enabled()) { gpr_log(GPR_DEBUG, " EXECUTING IMMEDIATELY"); } // Queue was empty, so execute this closure immediately. - GRPC_CLOSURE_SCHED(closure, error); + GRPC_CLOSURE_SCHED(exec_ctx, closure, error); } else { if (grpc_call_combiner_trace.enabled()) { gpr_log(GPR_INFO, " QUEUING"); @@ -95,7 +95,8 @@ void grpc_call_combiner_start(grpc_call_combiner* call_combiner, GPR_TIMER_END("call_combiner_start", 0); } -void grpc_call_combiner_stop(grpc_call_combiner* call_combiner DEBUG_ARGS, +void grpc_call_combiner_stop(grpc_exec_ctx* exec_ctx, + grpc_call_combiner* call_combiner DEBUG_ARGS, const char* reason) { GPR_TIMER_BEGIN("call_combiner_stop", 0); if (grpc_call_combiner_trace.enabled()) { @@ -130,7 +131,7 @@ void grpc_call_combiner_stop(grpc_call_combiner* call_combiner DEBUG_ARGS, gpr_log(GPR_DEBUG, " EXECUTING FROM QUEUE: closure=%p error=%s", closure, grpc_error_string(closure->error_data.error)); } - GRPC_CLOSURE_SCHED(closure, closure->error_data.error); + GRPC_CLOSURE_SCHED(exec_ctx, closure, closure->error_data.error); break; } } else if (grpc_call_combiner_trace.enabled()) { @@ -139,9 +140,10 @@ void grpc_call_combiner_stop(grpc_call_combiner* call_combiner DEBUG_ARGS, GPR_TIMER_END("call_combiner_stop", 0); } -void grpc_call_combiner_set_notify_on_cancel(grpc_call_combiner* call_combiner, +void grpc_call_combiner_set_notify_on_cancel(grpc_exec_ctx* exec_ctx, + grpc_call_combiner* call_combiner, grpc_closure* closure) { - GRPC_STATS_INC_CALL_COMBINER_SET_NOTIFY_ON_CANCEL(); + GRPC_STATS_INC_CALL_COMBINER_SET_NOTIFY_ON_CANCEL(exec_ctx); while (true) { // Decode original state. gpr_atm original_state = gpr_atm_acq_load(&call_combiner->cancel_state); @@ -155,7 +157,7 @@ void grpc_call_combiner_set_notify_on_cancel(grpc_call_combiner* call_combiner, "for pre-existing cancellation", call_combiner, closure); } - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_REF(original_error)); + GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_REF(original_error)); break; } else { if (gpr_atm_full_cas(&call_combiner->cancel_state, original_state, @@ -174,7 +176,7 @@ void grpc_call_combiner_set_notify_on_cancel(grpc_call_combiner* call_combiner, "call_combiner=%p: scheduling old cancel callback=%p", call_combiner, closure); } - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); } break; } @@ -183,9 +185,10 @@ void grpc_call_combiner_set_notify_on_cancel(grpc_call_combiner* call_combiner, } } -void grpc_call_combiner_cancel(grpc_call_combiner* call_combiner, +void grpc_call_combiner_cancel(grpc_exec_ctx* exec_ctx, + grpc_call_combiner* call_combiner, grpc_error* error) { - GRPC_STATS_INC_CALL_COMBINER_CANCELLED(); + GRPC_STATS_INC_CALL_COMBINER_CANCELLED(exec_ctx); while (true) { gpr_atm original_state = gpr_atm_acq_load(&call_combiner->cancel_state); grpc_error* original_error = decode_cancel_state_error(original_state); @@ -202,7 +205,7 @@ void grpc_call_combiner_cancel(grpc_call_combiner* call_combiner, "call_combiner=%p: scheduling notify_on_cancel callback=%p", call_combiner, notify_on_cancel); } - GRPC_CLOSURE_SCHED(notify_on_cancel, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(exec_ctx, notify_on_cancel, GRPC_ERROR_REF(error)); } break; } diff --git a/src/core/lib/iomgr/call_combiner.h b/src/core/lib/iomgr/call_combiner.h index 9f7e6ce1c94..c07af51c917 100644 --- a/src/core/lib/iomgr/call_combiner.h +++ b/src/core/lib/iomgr/call_combiner.h @@ -53,29 +53,37 @@ void grpc_call_combiner_init(grpc_call_combiner* call_combiner); void grpc_call_combiner_destroy(grpc_call_combiner* call_combiner); #ifndef NDEBUG -#define GRPC_CALL_COMBINER_START(call_combiner, closure, error, reason) \ - grpc_call_combiner_start((call_combiner), (closure), (error), __FILE__, \ - __LINE__, (reason)) -#define GRPC_CALL_COMBINER_STOP(call_combiner, reason) \ - grpc_call_combiner_stop((call_combiner), __FILE__, __LINE__, (reason)) +#define GRPC_CALL_COMBINER_START(exec_ctx, call_combiner, closure, error, \ + reason) \ + grpc_call_combiner_start((exec_ctx), (call_combiner), (closure), (error), \ + __FILE__, __LINE__, (reason)) +#define GRPC_CALL_COMBINER_STOP(exec_ctx, call_combiner, reason) \ + grpc_call_combiner_stop((exec_ctx), (call_combiner), __FILE__, __LINE__, \ + (reason)) /// Starts processing \a closure on \a call_combiner. -void grpc_call_combiner_start(grpc_call_combiner* call_combiner, +void grpc_call_combiner_start(grpc_exec_ctx* exec_ctx, + grpc_call_combiner* call_combiner, grpc_closure* closure, grpc_error* error, const char* file, int line, const char* reason); /// Yields the call combiner to the next closure in the queue, if any. -void grpc_call_combiner_stop(grpc_call_combiner* call_combiner, +void grpc_call_combiner_stop(grpc_exec_ctx* exec_ctx, + grpc_call_combiner* call_combiner, const char* file, int line, const char* reason); #else -#define GRPC_CALL_COMBINER_START(call_combiner, closure, error, reason) \ - grpc_call_combiner_start((call_combiner), (closure), (error), (reason)) -#define GRPC_CALL_COMBINER_STOP(call_combiner, reason) \ - grpc_call_combiner_stop((call_combiner), (reason)) +#define GRPC_CALL_COMBINER_START(exec_ctx, call_combiner, closure, error, \ + reason) \ + grpc_call_combiner_start((exec_ctx), (call_combiner), (closure), (error), \ + (reason)) +#define GRPC_CALL_COMBINER_STOP(exec_ctx, call_combiner, reason) \ + grpc_call_combiner_stop((exec_ctx), (call_combiner), (reason)) /// Starts processing \a closure on \a call_combiner. -void grpc_call_combiner_start(grpc_call_combiner* call_combiner, +void grpc_call_combiner_start(grpc_exec_ctx* exec_ctx, + grpc_call_combiner* call_combiner, grpc_closure* closure, grpc_error* error, const char* reason); /// Yields the call combiner to the next closure in the queue, if any. -void grpc_call_combiner_stop(grpc_call_combiner* call_combiner, +void grpc_call_combiner_stop(grpc_exec_ctx* exec_ctx, + grpc_call_combiner* call_combiner, const char* reason); #endif @@ -101,11 +109,13 @@ void grpc_call_combiner_stop(grpc_call_combiner* call_combiner, /// cancellation; this effectively unregisters the previously set closure. /// However, most filters will not need to explicitly unregister their /// callbacks, as this is done automatically when the call is destroyed. -void grpc_call_combiner_set_notify_on_cancel(grpc_call_combiner* call_combiner, +void grpc_call_combiner_set_notify_on_cancel(grpc_exec_ctx* exec_ctx, + grpc_call_combiner* call_combiner, grpc_closure* closure); /// Indicates that the call has been cancelled. -void grpc_call_combiner_cancel(grpc_call_combiner* call_combiner, +void grpc_call_combiner_cancel(grpc_exec_ctx* exec_ctx, + grpc_call_combiner* call_combiner, grpc_error* error); #endif /* GRPC_CORE_LIB_IOMGR_CALL_COMBINER_H */ diff --git a/src/core/lib/iomgr/closure.h b/src/core/lib/iomgr/closure.h index 88af76006aa..46793dd2c5d 100644 --- a/src/core/lib/iomgr/closure.h +++ b/src/core/lib/iomgr/closure.h @@ -47,15 +47,18 @@ typedef struct grpc_closure_list { * describing what went wrong. * Error contract: it is not the cb's job to unref this error; * the closure scheduler will do that after the cb returns */ -typedef void (*grpc_iomgr_cb_func)(void* arg, grpc_error* error); +typedef void (*grpc_iomgr_cb_func)(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error); typedef struct grpc_closure_scheduler grpc_closure_scheduler; typedef struct grpc_closure_scheduler_vtable { /* NOTE: for all these functions, closure->scheduler == the scheduler that was used to find this vtable */ - void (*run)(grpc_closure* closure, grpc_error* error); - void (*sched)(grpc_closure* closure, grpc_error* error); + void (*run)(grpc_exec_ctx* exec_ctx, grpc_closure* closure, + grpc_error* error); + void (*sched)(grpc_exec_ctx* exec_ctx, grpc_closure* closure, + grpc_error* error); const char* name; } grpc_closure_scheduler_vtable; @@ -143,12 +146,13 @@ typedef struct { grpc_closure wrapper; } wrapped_closure; -inline void closure_wrapper(void* arg, grpc_error* error) { +inline void closure_wrapper(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { wrapped_closure* wc = (wrapped_closure*)arg; grpc_iomgr_cb_func cb = wc->cb; void* cb_arg = wc->cb_arg; gpr_free(wc); - cb(cb_arg, error); + cb(exec_ctx, cb_arg, error); } } // namespace closure_impl @@ -243,10 +247,12 @@ inline bool grpc_closure_list_empty(grpc_closure_list closure_list) { } #ifndef NDEBUG -inline void grpc_closure_run(const char* file, int line, grpc_closure* c, +inline void grpc_closure_run(const char* file, int line, + grpc_exec_ctx* exec_ctx, grpc_closure* c, grpc_error* error) { #else -inline void grpc_closure_run(grpc_closure* c, grpc_error* error) { +inline void grpc_closure_run(grpc_exec_ctx* exec_ctx, grpc_closure* c, + grpc_error* error) { #endif GPR_TIMER_BEGIN("grpc_closure_run", 0); if (c != nullptr) { @@ -256,7 +262,7 @@ inline void grpc_closure_run(grpc_closure* c, grpc_error* error) { c->run = true; #endif assert(c->cb); - c->scheduler->vtable->run(c, error); + c->scheduler->vtable->run(exec_ctx, c, error); } else { GRPC_ERROR_UNREF(error); } @@ -267,17 +273,20 @@ inline void grpc_closure_run(grpc_closure* c, grpc_error* error) { * Note that calling this at the end of a closure callback function itself is * by definition safe. */ #ifndef NDEBUG -#define GRPC_CLOSURE_RUN(closure, error) \ - grpc_closure_run(__FILE__, __LINE__, closure, error) +#define GRPC_CLOSURE_RUN(exec_ctx, closure, error) \ + grpc_closure_run(__FILE__, __LINE__, exec_ctx, closure, error) #else -#define GRPC_CLOSURE_RUN(closure, error) grpc_closure_run(closure, error) +#define GRPC_CLOSURE_RUN(exec_ctx, closure, error) \ + grpc_closure_run(exec_ctx, closure, error) #endif #ifndef NDEBUG -inline void grpc_closure_sched(const char* file, int line, grpc_closure* c, +inline void grpc_closure_sched(const char* file, int line, + grpc_exec_ctx* exec_ctx, grpc_closure* c, grpc_error* error) { #else -inline void grpc_closure_sched(grpc_closure* c, grpc_error* error) { +inline void grpc_closure_sched(grpc_exec_ctx* exec_ctx, grpc_closure* c, + grpc_error* error) { #endif GPR_TIMER_BEGIN("grpc_closure_sched", 0); if (c != nullptr) { @@ -296,7 +305,7 @@ inline void grpc_closure_sched(grpc_closure* c, grpc_error* error) { c->run = false; #endif assert(c->cb); - c->scheduler->vtable->sched(c, error); + c->scheduler->vtable->sched(exec_ctx, c, error); } else { GRPC_ERROR_UNREF(error); } @@ -305,17 +314,20 @@ inline void grpc_closure_sched(grpc_closure* c, grpc_error* error) { /** Schedule a closure to be run. Does not need to be run from a safe point. */ #ifndef NDEBUG -#define GRPC_CLOSURE_SCHED(closure, error) \ - grpc_closure_sched(__FILE__, __LINE__, closure, error) +#define GRPC_CLOSURE_SCHED(exec_ctx, closure, error) \ + grpc_closure_sched(__FILE__, __LINE__, exec_ctx, closure, error) #else -#define GRPC_CLOSURE_SCHED(closure, error) grpc_closure_sched(closure, error) +#define GRPC_CLOSURE_SCHED(exec_ctx, closure, error) \ + grpc_closure_sched(exec_ctx, closure, error) #endif #ifndef NDEBUG inline void grpc_closure_list_sched(const char* file, int line, + grpc_exec_ctx* exec_ctx, grpc_closure_list* list) { #else -inline void grpc_closure_list_sched(grpc_closure_list* list) { +inline void grpc_closure_list_sched(grpc_exec_ctx* exec_ctx, + grpc_closure_list* list) { #endif grpc_closure* c = list->head; while (c != nullptr) { @@ -335,7 +347,7 @@ inline void grpc_closure_list_sched(grpc_closure_list* list) { c->run = false; #endif assert(c->cb); - c->scheduler->vtable->sched(c, c->error_data.error); + c->scheduler->vtable->sched(exec_ctx, c, c->error_data.error); c = next; } list->head = list->tail = nullptr; @@ -344,11 +356,11 @@ inline void grpc_closure_list_sched(grpc_closure_list* list) { /** Schedule all closures in a list to be run. Does not need to be run from a * safe point. */ #ifndef NDEBUG -#define GRPC_CLOSURE_LIST_SCHED(closure_list) \ - grpc_closure_list_sched(__FILE__, __LINE__, closure_list) +#define GRPC_CLOSURE_LIST_SCHED(exec_ctx, closure_list) \ + grpc_closure_list_sched(__FILE__, __LINE__, exec_ctx, closure_list) #else -#define GRPC_CLOSURE_LIST_SCHED(closure_list) \ - grpc_closure_list_sched(closure_list) +#define GRPC_CLOSURE_LIST_SCHED(exec_ctx, closure_list) \ + grpc_closure_list_sched(exec_ctx, closure_list) #endif #endif /* GRPC_CORE_LIB_IOMGR_CLOSURE_H */ diff --git a/src/core/lib/iomgr/combiner.cc b/src/core/lib/iomgr/combiner.cc index e4d7a6abd81..15c009dd779 100644 --- a/src/core/lib/iomgr/combiner.cc +++ b/src/core/lib/iomgr/combiner.cc @@ -61,15 +61,17 @@ struct grpc_combiner { gpr_refcount refs; }; -static void combiner_exec(grpc_closure* closure, grpc_error* error); -static void combiner_finally_exec(grpc_closure* closure, grpc_error* error); +static void combiner_exec(grpc_exec_ctx* exec_ctx, grpc_closure* closure, + grpc_error* error); +static void combiner_finally_exec(grpc_exec_ctx* exec_ctx, + grpc_closure* closure, grpc_error* error); static const grpc_closure_scheduler_vtable scheduler = { combiner_exec, combiner_exec, "combiner:immediately"}; static const grpc_closure_scheduler_vtable finally_scheduler = { combiner_finally_exec, combiner_finally_exec, "combiner:finally"}; -static void offload(void* arg, grpc_error* error); +static void offload(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error); grpc_combiner* grpc_combiner_create(void) { grpc_combiner* lock = (grpc_combiner*)gpr_zalloc(sizeof(*lock)); @@ -85,19 +87,19 @@ grpc_combiner* grpc_combiner_create(void) { return lock; } -static void really_destroy(grpc_combiner* lock) { +static void really_destroy(grpc_exec_ctx* exec_ctx, grpc_combiner* lock) { GRPC_COMBINER_TRACE(gpr_log(GPR_DEBUG, "C:%p really_destroy", lock)); GPR_ASSERT(gpr_atm_no_barrier_load(&lock->state) == 0); gpr_mpscq_destroy(&lock->queue); gpr_free(lock); } -static void start_destroy(grpc_combiner* lock) { +static void start_destroy(grpc_exec_ctx* exec_ctx, grpc_combiner* lock) { gpr_atm old_state = gpr_atm_full_fetch_add(&lock->state, -STATE_UNORPHANED); GRPC_COMBINER_TRACE(gpr_log( GPR_DEBUG, "C:%p really_destroy old_state=%" PRIdPTR, lock, old_state)); if (old_state == 1) { - really_destroy(lock); + really_destroy(exec_ctx, lock); } } @@ -113,10 +115,11 @@ static void start_destroy(grpc_combiner* lock) { #define GRPC_COMBINER_DEBUG_SPAM(op, delta) #endif -void grpc_combiner_unref(grpc_combiner* lock GRPC_COMBINER_DEBUG_ARGS) { +void grpc_combiner_unref(grpc_exec_ctx* exec_ctx, + grpc_combiner* lock GRPC_COMBINER_DEBUG_ARGS) { GRPC_COMBINER_DEBUG_SPAM("UNREF", -1); if (gpr_unref(&lock->refs)) { - start_destroy(lock); + start_destroy(exec_ctx, lock); } } @@ -126,25 +129,23 @@ grpc_combiner* grpc_combiner_ref(grpc_combiner* lock GRPC_COMBINER_DEBUG_ARGS) { return lock; } -static void push_last_on_exec_ctx(grpc_combiner* lock) { +static void push_last_on_exec_ctx(grpc_exec_ctx* exec_ctx, + grpc_combiner* lock) { lock->next_combiner_on_this_exec_ctx = nullptr; - if (grpc_core::ExecCtx::Get()->combiner_data()->active_combiner == nullptr) { - grpc_core::ExecCtx::Get()->combiner_data()->active_combiner = - grpc_core::ExecCtx::Get()->combiner_data()->last_combiner = lock; + if (exec_ctx->active_combiner == nullptr) { + exec_ctx->active_combiner = exec_ctx->last_combiner = lock; } else { - grpc_core::ExecCtx::Get() - ->combiner_data() - ->last_combiner->next_combiner_on_this_exec_ctx = lock; - grpc_core::ExecCtx::Get()->combiner_data()->last_combiner = lock; + exec_ctx->last_combiner->next_combiner_on_this_exec_ctx = lock; + exec_ctx->last_combiner = lock; } } -static void push_first_on_exec_ctx(grpc_combiner* lock) { - lock->next_combiner_on_this_exec_ctx = - grpc_core::ExecCtx::Get()->combiner_data()->active_combiner; - grpc_core::ExecCtx::Get()->combiner_data()->active_combiner = lock; +static void push_first_on_exec_ctx(grpc_exec_ctx* exec_ctx, + grpc_combiner* lock) { + lock->next_combiner_on_this_exec_ctx = exec_ctx->active_combiner; + exec_ctx->active_combiner = lock; if (lock->next_combiner_on_this_exec_ctx == nullptr) { - grpc_core::ExecCtx::Get()->combiner_data()->last_combiner = lock; + exec_ctx->last_combiner = lock; } } @@ -152,8 +153,9 @@ static void push_first_on_exec_ctx(grpc_combiner* lock) { ((grpc_combiner*)(((char*)((closure)->scheduler)) - \ offsetof(grpc_combiner, scheduler_name))) -static void combiner_exec(grpc_closure* cl, grpc_error* error) { - GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_ITEMS(); +static void combiner_exec(grpc_exec_ctx* exec_ctx, grpc_closure* cl, + grpc_error* error) { + GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_ITEMS(exec_ctx); GPR_TIMER_BEGIN("combiner.execute", 0); grpc_combiner* lock = COMBINER_FROM_CLOSURE_SCHEDULER(cl, scheduler); gpr_atm last = gpr_atm_full_fetch_add(&lock->state, STATE_ELEM_COUNT_LOW_BIT); @@ -161,19 +163,19 @@ static void combiner_exec(grpc_closure* cl, grpc_error* error) { "C:%p grpc_combiner_execute c=%p last=%" PRIdPTR, lock, cl, last)); if (last == 1) { - GRPC_STATS_INC_COMBINER_LOCKS_INITIATED(); + GRPC_STATS_INC_COMBINER_LOCKS_INITIATED(exec_ctx); GPR_TIMER_MARK("combiner.initiated", 0); gpr_atm_no_barrier_store(&lock->initiating_exec_ctx_or_null, - (gpr_atm)grpc_core::ExecCtx::Get()); + (gpr_atm)exec_ctx); // first element on this list: add it to the list of combiner locks // executing within this exec_ctx - push_last_on_exec_ctx(lock); + push_last_on_exec_ctx(exec_ctx, lock); } else { // there may be a race with setting here: if that happens, we may delay // offload for one or two actions, and that's fine gpr_atm initiator = gpr_atm_no_barrier_load(&lock->initiating_exec_ctx_or_null); - if (initiator != 0 && initiator != (gpr_atm)grpc_core::ExecCtx::Get()) { + if (initiator != 0 && initiator != (gpr_atm)exec_ctx) { gpr_atm_no_barrier_store(&lock->initiating_exec_ctx_or_null, 0); } } @@ -184,32 +186,29 @@ static void combiner_exec(grpc_closure* cl, grpc_error* error) { GPR_TIMER_END("combiner.execute", 0); } -static void move_next() { - grpc_core::ExecCtx::Get()->combiner_data()->active_combiner = - grpc_core::ExecCtx::Get() - ->combiner_data() - ->active_combiner->next_combiner_on_this_exec_ctx; - if (grpc_core::ExecCtx::Get()->combiner_data()->active_combiner == nullptr) { - grpc_core::ExecCtx::Get()->combiner_data()->last_combiner = nullptr; +static void move_next(grpc_exec_ctx* exec_ctx) { + exec_ctx->active_combiner = + exec_ctx->active_combiner->next_combiner_on_this_exec_ctx; + if (exec_ctx->active_combiner == nullptr) { + exec_ctx->last_combiner = nullptr; } } -static void offload(void* arg, grpc_error* error) { +static void offload(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { grpc_combiner* lock = (grpc_combiner*)arg; - push_last_on_exec_ctx(lock); + push_last_on_exec_ctx(exec_ctx, lock); } -static void queue_offload(grpc_combiner* lock) { - GRPC_STATS_INC_COMBINER_LOCKS_OFFLOADED(); - move_next(); +static void queue_offload(grpc_exec_ctx* exec_ctx, grpc_combiner* lock) { + GRPC_STATS_INC_COMBINER_LOCKS_OFFLOADED(exec_ctx); + move_next(exec_ctx); GRPC_COMBINER_TRACE(gpr_log(GPR_DEBUG, "C:%p queue_offload", lock)); - GRPC_CLOSURE_SCHED(&lock->offload, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &lock->offload, GRPC_ERROR_NONE); } -bool grpc_combiner_continue_exec_ctx() { +bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx* exec_ctx) { GPR_TIMER_BEGIN("combiner.continue_exec_ctx", 0); - grpc_combiner* lock = - grpc_core::ExecCtx::Get()->combiner_data()->active_combiner; + grpc_combiner* lock = exec_ctx->active_combiner; if (lock == nullptr) { GPR_TIMER_END("combiner.continue_exec_ctx", 0); return false; @@ -224,15 +223,15 @@ bool grpc_combiner_continue_exec_ctx() { "exec_ctx_ready_to_finish=%d " "time_to_execute_final_list=%d", lock, contended, - grpc_core::ExecCtx::Get()->IsReadyToFinish(), + grpc_exec_ctx_ready_to_finish(exec_ctx), lock->time_to_execute_final_list)); - if (contended && grpc_core::ExecCtx::Get()->IsReadyToFinish() && + if (contended && grpc_exec_ctx_ready_to_finish(exec_ctx) && grpc_executor_is_threaded()) { GPR_TIMER_MARK("offload_from_finished_exec_ctx", 0); // this execution context wants to move on: schedule remaining work to be // picked up on the executor - queue_offload(lock); + queue_offload(exec_ctx, lock); GPR_TIMER_END("combiner.continue_exec_ctx", 0); return true; } @@ -248,7 +247,7 @@ bool grpc_combiner_continue_exec_ctx() { // queue is in an inconsistent state: use this as a cue that we should // go off and do something else for a while (and come back later) GPR_TIMER_MARK("delay_busy", 0); - queue_offload(lock); + queue_offload(exec_ctx, lock); GPR_TIMER_END("combiner.continue_exec_ctx", 0); return true; } @@ -258,7 +257,7 @@ bool grpc_combiner_continue_exec_ctx() { #ifndef NDEBUG cl->scheduled = false; #endif - cl->cb(cl->cb_arg, cl_err); + cl->cb(exec_ctx, cl->cb_arg, cl_err); GRPC_ERROR_UNREF(cl_err); GPR_TIMER_END("combiner.exec1", 0); } else { @@ -275,7 +274,7 @@ bool grpc_combiner_continue_exec_ctx() { #ifndef NDEBUG c->scheduled = false; #endif - c->cb(c->cb_arg, error); + c->cb(exec_ctx, c->cb_arg, error); GRPC_ERROR_UNREF(error); c = next; GPR_TIMER_END("combiner.exec_1final", 0); @@ -283,7 +282,7 @@ bool grpc_combiner_continue_exec_ctx() { } GPR_TIMER_MARK("unref", 0); - move_next(); + move_next(exec_ctx); lock->time_to_execute_final_list = false; gpr_atm old_state = gpr_atm_full_fetch_add(&lock->state, -STATE_ELEM_COUNT_LOW_BIT); @@ -312,7 +311,7 @@ bool grpc_combiner_continue_exec_ctx() { return true; case OLD_STATE_WAS(true, 1): // and one count, one orphaned --> unlocked and orphaned - really_destroy(lock); + really_destroy(exec_ctx, lock); GPR_TIMER_END("combiner.continue_exec_ctx", 0); return true; case OLD_STATE_WAS(false, 0): @@ -322,24 +321,27 @@ bool grpc_combiner_continue_exec_ctx() { GPR_TIMER_END("combiner.continue_exec_ctx", 0); GPR_UNREACHABLE_CODE(return true); } - push_first_on_exec_ctx(lock); + push_first_on_exec_ctx(exec_ctx, lock); GPR_TIMER_END("combiner.continue_exec_ctx", 0); return true; } -static void enqueue_finally(void* closure, grpc_error* error); +static void enqueue_finally(grpc_exec_ctx* exec_ctx, void* closure, + grpc_error* error); -static void combiner_finally_exec(grpc_closure* closure, grpc_error* error) { - GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS(); +static void combiner_finally_exec(grpc_exec_ctx* exec_ctx, + grpc_closure* closure, grpc_error* error) { + GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS(exec_ctx); grpc_combiner* lock = COMBINER_FROM_CLOSURE_SCHEDULER(closure, finally_scheduler); - GRPC_COMBINER_TRACE(gpr_log( - GPR_DEBUG, "C:%p grpc_combiner_execute_finally c=%p; ac=%p", lock, - closure, grpc_core::ExecCtx::Get()->combiner_data()->active_combiner)); + GRPC_COMBINER_TRACE(gpr_log(GPR_DEBUG, + "C:%p grpc_combiner_execute_finally c=%p; ac=%p", + lock, closure, exec_ctx->active_combiner)); GPR_TIMER_BEGIN("combiner.execute_finally", 0); - if (grpc_core::ExecCtx::Get()->combiner_data()->active_combiner != lock) { + if (exec_ctx->active_combiner != lock) { GPR_TIMER_MARK("slowpath", 0); - GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(enqueue_finally, closure, + GRPC_CLOSURE_SCHED(exec_ctx, + GRPC_CLOSURE_CREATE(enqueue_finally, closure, grpc_combiner_scheduler(lock)), error); GPR_TIMER_END("combiner.execute_finally", 0); @@ -353,8 +355,10 @@ static void combiner_finally_exec(grpc_closure* closure, grpc_error* error) { GPR_TIMER_END("combiner.execute_finally", 0); } -static void enqueue_finally(void* closure, grpc_error* error) { - combiner_finally_exec((grpc_closure*)closure, GRPC_ERROR_REF(error)); +static void enqueue_finally(grpc_exec_ctx* exec_ctx, void* closure, + grpc_error* error) { + combiner_finally_exec(exec_ctx, (grpc_closure*)closure, + GRPC_ERROR_REF(error)); } grpc_closure_scheduler* grpc_combiner_scheduler(grpc_combiner* combiner) { diff --git a/src/core/lib/iomgr/combiner.h b/src/core/lib/iomgr/combiner.h index 46b9ac58be4..0c055113317 100644 --- a/src/core/lib/iomgr/combiner.h +++ b/src/core/lib/iomgr/combiner.h @@ -40,24 +40,26 @@ grpc_combiner* grpc_combiner_create(void); , const char *file, int line, const char *reason #define GRPC_COMBINER_REF(combiner, reason) \ grpc_combiner_ref((combiner), __FILE__, __LINE__, (reason)) -#define GRPC_COMBINER_UNREF(combiner, reason) \ - grpc_combiner_unref((combiner), __FILE__, __LINE__, (reason)) +#define GRPC_COMBINER_UNREF(exec_ctx, combiner, reason) \ + grpc_combiner_unref((exec_ctx), (combiner), __FILE__, __LINE__, (reason)) #else #define GRPC_COMBINER_DEBUG_ARGS #define GRPC_COMBINER_REF(combiner, reason) grpc_combiner_ref((combiner)) -#define GRPC_COMBINER_UNREF(combiner, reason) grpc_combiner_unref((combiner)) +#define GRPC_COMBINER_UNREF(exec_ctx, combiner, reason) \ + grpc_combiner_unref((exec_ctx), (combiner)) #endif // Ref/unref the lock, for when we're sharing the lock ownership // Prefer to use the macros above grpc_combiner* grpc_combiner_ref(grpc_combiner* lock GRPC_COMBINER_DEBUG_ARGS); -void grpc_combiner_unref(grpc_combiner* lock GRPC_COMBINER_DEBUG_ARGS); +void grpc_combiner_unref(grpc_exec_ctx* exec_ctx, + grpc_combiner* lock GRPC_COMBINER_DEBUG_ARGS); // Fetch a scheduler to schedule closures against grpc_closure_scheduler* grpc_combiner_scheduler(grpc_combiner* lock); // Scheduler to execute \a action within the lock just prior to unlocking. grpc_closure_scheduler* grpc_combiner_finally_scheduler(grpc_combiner* lock); -bool grpc_combiner_continue_exec_ctx(); +bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx* exec_ctx); extern grpc_core::TraceFlag grpc_combiner_trace; diff --git a/src/core/lib/iomgr/endpoint.cc b/src/core/lib/iomgr/endpoint.cc index 9d4b1028227..5eab1d31588 100644 --- a/src/core/lib/iomgr/endpoint.cc +++ b/src/core/lib/iomgr/endpoint.cc @@ -18,35 +18,41 @@ #include "src/core/lib/iomgr/endpoint.h" -void grpc_endpoint_read(grpc_endpoint* ep, grpc_slice_buffer* slices, - grpc_closure* cb) { - ep->vtable->read(ep, slices, cb); +void grpc_endpoint_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_slice_buffer* slices, grpc_closure* cb) { + ep->vtable->read(exec_ctx, ep, slices, cb); } -void grpc_endpoint_write(grpc_endpoint* ep, grpc_slice_buffer* slices, - grpc_closure* cb) { - ep->vtable->write(ep, slices, cb); +void grpc_endpoint_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_slice_buffer* slices, grpc_closure* cb) { + ep->vtable->write(exec_ctx, ep, slices, cb); } -void grpc_endpoint_add_to_pollset(grpc_endpoint* ep, grpc_pollset* pollset) { - ep->vtable->add_to_pollset(ep, pollset); +void grpc_endpoint_add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_pollset* pollset) { + ep->vtable->add_to_pollset(exec_ctx, ep, pollset); } -void grpc_endpoint_add_to_pollset_set(grpc_endpoint* ep, +void grpc_endpoint_add_to_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_endpoint* ep, grpc_pollset_set* pollset_set) { - ep->vtable->add_to_pollset_set(ep, pollset_set); + ep->vtable->add_to_pollset_set(exec_ctx, ep, pollset_set); } -void grpc_endpoint_delete_from_pollset_set(grpc_endpoint* ep, +void grpc_endpoint_delete_from_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_endpoint* ep, grpc_pollset_set* pollset_set) { - ep->vtable->delete_from_pollset_set(ep, pollset_set); + ep->vtable->delete_from_pollset_set(exec_ctx, ep, pollset_set); } -void grpc_endpoint_shutdown(grpc_endpoint* ep, grpc_error* why) { - ep->vtable->shutdown(ep, why); +void grpc_endpoint_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_error* why) { + ep->vtable->shutdown(exec_ctx, ep, why); } -void grpc_endpoint_destroy(grpc_endpoint* ep) { ep->vtable->destroy(ep); } +void grpc_endpoint_destroy(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep) { + ep->vtable->destroy(exec_ctx, ep); +} char* grpc_endpoint_get_peer(grpc_endpoint* ep) { return ep->vtable->get_peer(ep); diff --git a/src/core/lib/iomgr/endpoint.h b/src/core/lib/iomgr/endpoint.h index cd530993342..6ab0a6591cc 100644 --- a/src/core/lib/iomgr/endpoint.h +++ b/src/core/lib/iomgr/endpoint.h @@ -33,13 +33,18 @@ typedef struct grpc_endpoint grpc_endpoint; typedef struct grpc_endpoint_vtable grpc_endpoint_vtable; struct grpc_endpoint_vtable { - void (*read)(grpc_endpoint* ep, grpc_slice_buffer* slices, grpc_closure* cb); - void (*write)(grpc_endpoint* ep, grpc_slice_buffer* slices, grpc_closure* cb); - void (*add_to_pollset)(grpc_endpoint* ep, grpc_pollset* pollset); - void (*add_to_pollset_set)(grpc_endpoint* ep, grpc_pollset_set* pollset); - void (*delete_from_pollset_set)(grpc_endpoint* ep, grpc_pollset_set* pollset); - void (*shutdown)(grpc_endpoint* ep, grpc_error* why); - void (*destroy)(grpc_endpoint* ep); + void (*read)(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_slice_buffer* slices, grpc_closure* cb); + void (*write)(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_slice_buffer* slices, grpc_closure* cb); + void (*add_to_pollset)(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_pollset* pollset); + void (*add_to_pollset_set)(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_pollset_set* pollset); + void (*delete_from_pollset_set)(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_pollset_set* pollset); + void (*shutdown)(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, grpc_error* why); + 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); int (*get_fd)(grpc_endpoint* ep); @@ -50,8 +55,8 @@ struct grpc_endpoint_vtable { indicates the endpoint is closed. Valid slices may be placed into \a slices even when the callback is invoked with error != GRPC_ERROR_NONE. */ -void grpc_endpoint_read(grpc_endpoint* ep, grpc_slice_buffer* slices, - grpc_closure* cb); +void grpc_endpoint_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_slice_buffer* slices, grpc_closure* cb); char* grpc_endpoint_get_peer(grpc_endpoint* ep); @@ -69,22 +74,26 @@ int grpc_endpoint_get_fd(grpc_endpoint* ep); No guarantee is made to the content of slices after a write EXCEPT that it is a valid slice buffer. */ -void grpc_endpoint_write(grpc_endpoint* ep, grpc_slice_buffer* slices, - grpc_closure* cb); +void grpc_endpoint_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_slice_buffer* slices, grpc_closure* cb); /* Causes any pending and future read/write callbacks to run immediately with success==0 */ -void grpc_endpoint_shutdown(grpc_endpoint* ep, grpc_error* why); -void grpc_endpoint_destroy(grpc_endpoint* ep); +void grpc_endpoint_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_error* why); +void grpc_endpoint_destroy(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep); /* Add an endpoint to a pollset or pollset_set, so that when the pollset is polled, events from this endpoint are considered */ -void grpc_endpoint_add_to_pollset(grpc_endpoint* ep, grpc_pollset* pollset); -void grpc_endpoint_add_to_pollset_set(grpc_endpoint* ep, +void grpc_endpoint_add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_pollset* pollset); +void grpc_endpoint_add_to_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_endpoint* ep, grpc_pollset_set* pollset_set); /* Delete an endpoint from a pollset_set */ -void grpc_endpoint_delete_from_pollset_set(grpc_endpoint* ep, +void grpc_endpoint_delete_from_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); diff --git a/src/core/lib/iomgr/endpoint_pair_posix.cc b/src/core/lib/iomgr/endpoint_pair_posix.cc index 0b4aefd1b70..f5f59f99173 100644 --- a/src/core/lib/iomgr/endpoint_pair_posix.cc +++ b/src/core/lib/iomgr/endpoint_pair_posix.cc @@ -54,17 +54,18 @@ grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char* name, char* final_name; create_sockets(sv); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_asprintf(&final_name, "%s:client", name); - p.client = grpc_tcp_create(grpc_fd_create(sv[1], final_name), args, + p.client = grpc_tcp_create(&exec_ctx, grpc_fd_create(sv[1], final_name), args, "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), args, + p.server = grpc_tcp_create(&exec_ctx, grpc_fd_create(sv[0], final_name), args, "socketpair-client"); gpr_free(final_name); + grpc_exec_ctx_finish(&exec_ctx); return p; } diff --git a/src/core/lib/iomgr/endpoint_pair_windows.cc b/src/core/lib/iomgr/endpoint_pair_windows.cc index cc07ac07081..afa995a1c72 100644 --- a/src/core/lib/iomgr/endpoint_pair_windows.cc +++ b/src/core/lib/iomgr/endpoint_pair_windows.cc @@ -72,12 +72,14 @@ grpc_endpoint_pair grpc_iomgr_create_endpoint_pair( SOCKET sv[2]; grpc_endpoint_pair p; create_sockets(sv); - grpc_core::ExecCtx exec_ctx; - p.client = grpc_tcp_create(grpc_winsocket_create(sv[1], "endpoint:client"), + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + p.client = grpc_tcp_create(&exec_ctx, + grpc_winsocket_create(sv[1], "endpoint:client"), channel_args, "endpoint:server"); - p.server = grpc_tcp_create(grpc_winsocket_create(sv[0], "endpoint:server"), + p.server = grpc_tcp_create(&exec_ctx, + grpc_winsocket_create(sv[0], "endpoint:server"), channel_args, "endpoint:client"); - + grpc_exec_ctx_finish(&exec_ctx); return p; } diff --git a/src/core/lib/iomgr/error.cc b/src/core/lib/iomgr/error.cc index 42cd7c455df..e6d640c106b 100644 --- a/src/core/lib/iomgr/error.cc +++ b/src/core/lib/iomgr/error.cc @@ -156,7 +156,11 @@ static void unref_errs(grpc_error* err) { } } -static void unref_slice(grpc_slice slice) { grpc_slice_unref_internal(slice); } +static void unref_slice(grpc_slice slice) { + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice_unref_internal(&exec_ctx, slice); + grpc_exec_ctx_finish(&exec_ctx); +} static void unref_strs(grpc_error* err) { for (size_t which = 0; which < GRPC_ERROR_STR_MAX; ++which) { diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc index d9e8a30f5e3..0dda1d924c3 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -299,29 +299,31 @@ static int fd_wrapped_fd(grpc_fd* fd) { return fd->fd; } /* if 'releasing_fd' is true, it means that we are going to detach the internal * fd from grpc_fd structure (i.e which means we should not be calling * shutdown() syscall on that fd) */ -static void fd_shutdown_internal(grpc_fd* fd, grpc_error* why, - bool releasing_fd) { - if (fd->read_closure->SetShutdown(GRPC_ERROR_REF(why))) { +static void fd_shutdown_internal(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_error* why, bool releasing_fd) { + if (fd->read_closure->SetShutdown(exec_ctx, GRPC_ERROR_REF(why))) { if (!releasing_fd) { shutdown(fd->fd, SHUT_RDWR); } - fd->write_closure->SetShutdown(GRPC_ERROR_REF(why)); + fd->write_closure->SetShutdown(exec_ctx, GRPC_ERROR_REF(why)); } GRPC_ERROR_UNREF(why); } /* Might be called multiple times */ -static void fd_shutdown(grpc_fd* fd, grpc_error* why) { - fd_shutdown_internal(fd, why, false); +static void fd_shutdown(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_error* why) { + fd_shutdown_internal(exec_ctx, fd, why, false); } -static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, +static void fd_orphan(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_closure* on_done, int* release_fd, bool already_closed, const char* reason) { grpc_error* error = GRPC_ERROR_NONE; bool is_release_fd = (release_fd != nullptr); if (!fd->read_closure->IsShutdown()) { - fd_shutdown_internal(fd, GRPC_ERROR_CREATE_FROM_COPIED_STRING(reason), + fd_shutdown_internal(exec_ctx, fd, + GRPC_ERROR_CREATE_FROM_COPIED_STRING(reason), is_release_fd); } @@ -333,7 +335,7 @@ static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, close(fd->fd); } - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_REF(error)); grpc_iomgr_unregister_object(&fd->iomgr_object); fd->read_closure->DestroyEvent(); @@ -345,7 +347,8 @@ static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, gpr_mu_unlock(&fd_freelist_mu); } -static grpc_pollset* fd_get_read_notifier_pollset(grpc_fd* fd) { +static grpc_pollset* fd_get_read_notifier_pollset(grpc_exec_ctx* exec_ctx, + grpc_fd* fd) { gpr_atm notifier = gpr_atm_acq_load(&fd->read_notifier_pollset); return (grpc_pollset*)notifier; } @@ -354,21 +357,26 @@ static bool fd_is_shutdown(grpc_fd* fd) { return fd->read_closure->IsShutdown(); } -static void fd_notify_on_read(grpc_fd* fd, grpc_closure* closure) { - fd->read_closure->NotifyOn(closure); +static void fd_notify_on_read(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_closure* closure) { + fd->read_closure->NotifyOn(exec_ctx, closure); } -static void fd_notify_on_write(grpc_fd* fd, grpc_closure* closure) { - fd->write_closure->NotifyOn(closure); +static void fd_notify_on_write(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_closure* closure) { + fd->write_closure->NotifyOn(exec_ctx, closure); } -static void fd_become_readable(grpc_fd* fd, grpc_pollset* notifier) { - fd->read_closure->SetReady(); +static void fd_become_readable(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_pollset* notifier) { + fd->read_closure->SetReady(exec_ctx); /* Use release store to match with acquire load in fd_get_read_notifier */ gpr_atm_rel_store(&fd->read_notifier_pollset, (gpr_atm)notifier); } -static void fd_become_writable(grpc_fd* fd) { fd->write_closure->SetReady(); } +static void fd_become_writable(grpc_exec_ctx* exec_ctx, grpc_fd* fd) { + fd->write_closure->SetReady(exec_ctx); +} /******************************************************************************* * Pollset Definitions @@ -471,7 +479,7 @@ static void pollset_init(grpc_pollset* pollset, gpr_mu** mu) { pollset->next = pollset->prev = nullptr; } -static void pollset_destroy(grpc_pollset* pollset) { +static void pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset) { gpr_mu_lock(&pollset->mu); if (!pollset->seen_inactive) { pollset_neighborhood* neighborhood = pollset->neighborhood; @@ -499,26 +507,27 @@ static void pollset_destroy(grpc_pollset* pollset) { gpr_mu_destroy(&pollset->mu); } -static grpc_error* pollset_kick_all(grpc_pollset* pollset) { +static grpc_error* pollset_kick_all(grpc_exec_ctx* exec_ctx, + grpc_pollset* pollset) { GPR_TIMER_BEGIN("pollset_kick_all", 0); grpc_error* error = GRPC_ERROR_NONE; if (pollset->root_worker != nullptr) { grpc_pollset_worker* worker = pollset->root_worker; do { - GRPC_STATS_INC_POLLSET_KICK(); + GRPC_STATS_INC_POLLSET_KICK(exec_ctx); switch (worker->state) { case KICKED: - GRPC_STATS_INC_POLLSET_KICKED_AGAIN(); + GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx); break; case UNKICKED: SET_KICK_STATE(worker, KICKED); if (worker->initialized_cv) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx); gpr_cv_signal(&worker->cv); } break; case DESIGNATED_POLLER: - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(exec_ctx); SET_KICK_STATE(worker, KICKED); append_error(&error, grpc_wakeup_fd_wakeup(&global_wakeup_fd), "pollset_kick_all"); @@ -534,29 +543,32 @@ static grpc_error* pollset_kick_all(grpc_pollset* pollset) { return error; } -static void pollset_maybe_finish_shutdown(grpc_pollset* pollset) { +static void pollset_maybe_finish_shutdown(grpc_exec_ctx* exec_ctx, + grpc_pollset* pollset) { if (pollset->shutdown_closure != nullptr && pollset->root_worker == nullptr && pollset->begin_refs == 0) { GPR_TIMER_MARK("pollset_finish_shutdown", 0); - GRPC_CLOSURE_SCHED(pollset->shutdown_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, pollset->shutdown_closure, GRPC_ERROR_NONE); pollset->shutdown_closure = nullptr; } } -static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { +static void pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_closure* closure) { GPR_TIMER_BEGIN("pollset_shutdown", 0); GPR_ASSERT(pollset->shutdown_closure == nullptr); GPR_ASSERT(!pollset->shutting_down); pollset->shutdown_closure = closure; pollset->shutting_down = true; - GRPC_LOG_IF_ERROR("pollset_shutdown", pollset_kick_all(pollset)); - pollset_maybe_finish_shutdown(pollset); + GRPC_LOG_IF_ERROR("pollset_shutdown", pollset_kick_all(exec_ctx, pollset)); + pollset_maybe_finish_shutdown(exec_ctx, pollset); GPR_TIMER_END("pollset_shutdown", 0); } -static int poll_deadline_to_millis_timeout(grpc_millis millis) { +static int poll_deadline_to_millis_timeout(grpc_exec_ctx* exec_ctx, + grpc_millis millis) { if (millis == GRPC_MILLIS_INF_FUTURE) return -1; - grpc_millis delta = millis - grpc_core::ExecCtx::Get()->Now(); + grpc_millis delta = millis - grpc_exec_ctx_now(exec_ctx); if (delta > INT_MAX) { return INT_MAX; } else if (delta < 0) { @@ -574,7 +586,8 @@ static int poll_deadline_to_millis_timeout(grpc_millis millis) { NOTE ON SYNCRHONIZATION: Similar to do_epoll_wait(), this function is only called by g_active_poller thread. So there is no need for synchronization when accessing fields in g_epoll_set */ -static grpc_error* process_epoll_events(grpc_pollset* pollset) { +static grpc_error* process_epoll_events(grpc_exec_ctx* exec_ctx, + grpc_pollset* pollset) { static const char* err_desc = "process_events"; grpc_error* error = GRPC_ERROR_NONE; @@ -598,11 +611,11 @@ static grpc_error* process_epoll_events(grpc_pollset* pollset) { bool write_ev = (ev->events & EPOLLOUT) != 0; if (read_ev || cancel) { - fd_become_readable(fd, pollset); + fd_become_readable(exec_ctx, fd, pollset); } if (write_ev || cancel) { - fd_become_writable(fd); + fd_become_writable(exec_ctx, fd); } } } @@ -618,26 +631,27 @@ static grpc_error* process_epoll_events(grpc_pollset* pollset) { NOTE ON SYNCHRONIZATION: At any point of time, only the g_active_poller (i.e the designated poller thread) will be calling this function. So there is no need for any synchronization when accesing fields in g_epoll_set */ -static grpc_error* do_epoll_wait(grpc_pollset* ps, grpc_millis deadline) { +static grpc_error* do_epoll_wait(grpc_exec_ctx* exec_ctx, grpc_pollset* ps, + grpc_millis deadline) { GPR_TIMER_BEGIN("do_epoll_wait", 0); int r; - int timeout = poll_deadline_to_millis_timeout(deadline); + int timeout = poll_deadline_to_millis_timeout(exec_ctx, deadline); if (timeout != 0) { GRPC_SCHEDULING_START_BLOCKING_REGION; } do { - GRPC_STATS_INC_SYSCALL_POLL(); + GRPC_STATS_INC_SYSCALL_POLL(exec_ctx); r = epoll_wait(g_epoll_set.epfd, g_epoll_set.events, MAX_EPOLL_EVENTS, timeout); } while (r < 0 && errno == EINTR); if (timeout != 0) { - GRPC_SCHEDULING_END_BLOCKING_REGION; + GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(exec_ctx); } if (r < 0) return GRPC_OS_ERROR(errno, "epoll_wait"); - GRPC_STATS_INC_POLL_EVENTS_RETURNED(r); + GRPC_STATS_INC_POLL_EVENTS_RETURNED(exec_ctx, r); if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "ps: %p poll got %d events", ps, r); @@ -650,7 +664,8 @@ static grpc_error* do_epoll_wait(grpc_pollset* ps, grpc_millis deadline) { return GRPC_ERROR_NONE; } -static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, +static bool begin_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_pollset_worker* worker, grpc_pollset_worker** worker_hdl, grpc_millis deadline) { GPR_TIMER_BEGIN("begin_worker", 0); @@ -745,7 +760,7 @@ static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, SET_KICK_STATE(worker, KICKED); } } - grpc_core::ExecCtx::Get()->InvalidateNow(); + grpc_exec_ctx_invalidate_now(exec_ctx); } if (grpc_polling_trace.enabled()) { @@ -776,7 +791,7 @@ static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, } static bool check_neighborhood_for_available_poller( - pollset_neighborhood* neighborhood) { + grpc_exec_ctx* exec_ctx, pollset_neighborhood* neighborhood) { GPR_TIMER_BEGIN("check_neighborhood_for_available_poller", 0); bool found_worker = false; do { @@ -800,7 +815,7 @@ static bool check_neighborhood_for_available_poller( SET_KICK_STATE(inspect_worker, DESIGNATED_POLLER); if (inspect_worker->initialized_cv) { GPR_TIMER_MARK("signal worker", 0); - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx); gpr_cv_signal(&inspect_worker->cv); } } else { @@ -840,7 +855,8 @@ static bool check_neighborhood_for_available_poller( return found_worker; } -static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, +static void end_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_pollset_worker* worker, grpc_pollset_worker** worker_hdl) { GPR_TIMER_BEGIN("end_worker", 0); if (grpc_polling_trace.enabled()) { @@ -850,7 +866,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, /* Make sure we appear kicked */ SET_KICK_STATE(worker, KICKED); grpc_closure_list_move(&worker->schedule_on_end_work, - grpc_core::ExecCtx::Get()->closure_list()); + &exec_ctx->closure_list); if (gpr_atm_no_barrier_load(&g_active_poller) == (gpr_atm)worker) { if (worker->next != worker && worker->next->state == UNKICKED) { if (grpc_polling_trace.enabled()) { @@ -859,11 +875,11 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, GPR_ASSERT(worker->next->initialized_cv); gpr_atm_no_barrier_store(&g_active_poller, (gpr_atm)worker->next); SET_KICK_STATE(worker->next, DESIGNATED_POLLER); - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx); gpr_cv_signal(&worker->next->cv); - if (grpc_core::ExecCtx::Get()->HasWork()) { + if (grpc_exec_ctx_has_work(exec_ctx)) { gpr_mu_unlock(&pollset->mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(exec_ctx); gpr_mu_lock(&pollset->mu); } } else { @@ -878,7 +894,8 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, &g_neighborhoods[(poller_neighborhood_idx + i) % g_num_neighborhoods]; if (gpr_mu_trylock(&neighborhood->mu)) { - found_worker = check_neighborhood_for_available_poller(neighborhood); + found_worker = + check_neighborhood_for_available_poller(exec_ctx, neighborhood); gpr_mu_unlock(&neighborhood->mu); scan_state[i] = true; } else { @@ -891,15 +908,16 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, &g_neighborhoods[(poller_neighborhood_idx + i) % g_num_neighborhoods]; gpr_mu_lock(&neighborhood->mu); - found_worker = check_neighborhood_for_available_poller(neighborhood); + found_worker = + check_neighborhood_for_available_poller(exec_ctx, neighborhood); gpr_mu_unlock(&neighborhood->mu); } - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(exec_ctx); gpr_mu_lock(&pollset->mu); } - } else if (grpc_core::ExecCtx::Get()->HasWork()) { + } else if (grpc_exec_ctx_has_work(exec_ctx)) { gpr_mu_unlock(&pollset->mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(exec_ctx); gpr_mu_lock(&pollset->mu); } if (worker->initialized_cv) { @@ -909,7 +927,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, gpr_log(GPR_DEBUG, " .. remove worker"); } if (EMPTIED == worker_remove(pollset, worker)) { - pollset_maybe_finish_shutdown(pollset); + pollset_maybe_finish_shutdown(exec_ctx, pollset); } GPR_ASSERT(gpr_atm_no_barrier_load(&g_active_poller) != (gpr_atm)worker); GPR_TIMER_END("end_worker", 0); @@ -919,7 +937,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, The function pollset_work() may temporarily release the lock (pollset->po.mu) during the course of its execution but it will always re-acquire the lock and ensure that it is held by the time the function returns */ -static grpc_error* pollset_work(grpc_pollset* ps, +static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* ps, grpc_pollset_worker** worker_hdl, grpc_millis deadline) { grpc_pollset_worker worker; @@ -932,7 +950,7 @@ static grpc_error* pollset_work(grpc_pollset* ps, return GRPC_ERROR_NONE; } - if (begin_worker(ps, &worker, worker_hdl, deadline)) { + if (begin_worker(exec_ctx, ps, &worker, worker_hdl, deadline)) { gpr_tls_set(&g_current_thread_pollset, (intptr_t)ps); gpr_tls_set(&g_current_thread_worker, (intptr_t)&worker); GPR_ASSERT(!ps->shutting_down); @@ -950,14 +968,14 @@ static grpc_error* pollset_work(grpc_pollset* ps, process_epoll_events() returns very quickly: It just queues the work on exec_ctx but does not execute it (the actual exectution or more - accurately grpc_core::ExecCtx::Get()->Flush() happens in end_worker() - AFTER selecting a designated poller). So we are not waiting long periods - without a designated poller */ + accurately grpc_exec_ctx_flush() happens in end_worker() AFTER selecting + a designated poller). So we are not waiting long periods without a + designated poller */ if (gpr_atm_acq_load(&g_epoll_set.cursor) == gpr_atm_acq_load(&g_epoll_set.num_events)) { - append_error(&error, do_epoll_wait(ps, deadline), err_desc); + append_error(&error, do_epoll_wait(exec_ctx, ps, deadline), err_desc); } - append_error(&error, process_epoll_events(ps), err_desc); + append_error(&error, process_epoll_events(exec_ctx, ps), err_desc); gpr_mu_lock(&ps->mu); /* lock */ @@ -965,17 +983,17 @@ static grpc_error* pollset_work(grpc_pollset* ps, } else { gpr_tls_set(&g_current_thread_pollset, (intptr_t)ps); } - end_worker(ps, &worker, worker_hdl); + end_worker(exec_ctx, ps, &worker, worker_hdl); gpr_tls_set(&g_current_thread_pollset, 0); GPR_TIMER_END("pollset_work", 0); return error; } -static grpc_error* pollset_kick(grpc_pollset* pollset, +static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, grpc_pollset_worker* specific_worker) { GPR_TIMER_BEGIN("pollset_kick", 0); - GRPC_STATS_INC_POLLSET_KICK(); + GRPC_STATS_INC_POLLSET_KICK(exec_ctx); grpc_error* ret_err = GRPC_ERROR_NONE; if (grpc_polling_trace.enabled()) { gpr_strvec log; @@ -1008,7 +1026,7 @@ static grpc_error* pollset_kick(grpc_pollset* pollset, if (gpr_tls_get(&g_current_thread_pollset) != (intptr_t)pollset) { grpc_pollset_worker* root_worker = pollset->root_worker; if (root_worker == nullptr) { - GRPC_STATS_INC_POLLSET_KICKED_WITHOUT_POLLER(); + GRPC_STATS_INC_POLLSET_KICKED_WITHOUT_POLLER(exec_ctx); pollset->kicked_without_poller = true; if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. kicked_without_poller"); @@ -1017,14 +1035,14 @@ static grpc_error* pollset_kick(grpc_pollset* pollset, } grpc_pollset_worker* next_worker = root_worker->next; if (root_worker->state == KICKED) { - GRPC_STATS_INC_POLLSET_KICKED_AGAIN(); + GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx); if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. already kicked %p", root_worker); } SET_KICK_STATE(root_worker, KICKED); goto done; } else if (next_worker->state == KICKED) { - GRPC_STATS_INC_POLLSET_KICKED_AGAIN(); + GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx); if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. already kicked %p", next_worker); } @@ -1035,7 +1053,7 @@ static grpc_error* pollset_kick(grpc_pollset* pollset, // there is no next worker root_worker == (grpc_pollset_worker*)gpr_atm_no_barrier_load( &g_active_poller)) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(exec_ctx); if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. kicked %p", root_worker); } @@ -1043,7 +1061,7 @@ static grpc_error* pollset_kick(grpc_pollset* pollset, ret_err = grpc_wakeup_fd_wakeup(&global_wakeup_fd); goto done; } else if (next_worker->state == UNKICKED) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx); if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. kicked %p", next_worker); } @@ -1061,12 +1079,12 @@ static grpc_error* pollset_kick(grpc_pollset* pollset, } SET_KICK_STATE(root_worker, KICKED); if (root_worker->initialized_cv) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx); gpr_cv_signal(&root_worker->cv); } goto done; } else { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(exec_ctx); if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. non-root poller %p (root=%p)", next_worker, root_worker); @@ -1076,13 +1094,13 @@ static grpc_error* pollset_kick(grpc_pollset* pollset, goto done; } } else { - GRPC_STATS_INC_POLLSET_KICKED_AGAIN(); + GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx); GPR_ASSERT(next_worker->state == KICKED); SET_KICK_STATE(next_worker, KICKED); goto done; } } else { - GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(); + GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(exec_ctx); if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. kicked while waking up"); } @@ -1099,7 +1117,7 @@ static grpc_error* pollset_kick(grpc_pollset* pollset, goto done; } else if (gpr_tls_get(&g_current_thread_worker) == (intptr_t)specific_worker) { - GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(); + GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(exec_ctx); if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. mark %p kicked", specific_worker); } @@ -1107,7 +1125,7 @@ static grpc_error* pollset_kick(grpc_pollset* pollset, goto done; } else if (specific_worker == (grpc_pollset_worker*)gpr_atm_no_barrier_load(&g_active_poller)) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(exec_ctx); if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. kick active poller"); } @@ -1115,7 +1133,7 @@ static grpc_error* pollset_kick(grpc_pollset* pollset, ret_err = grpc_wakeup_fd_wakeup(&global_wakeup_fd); goto done; } else if (specific_worker->initialized_cv) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx); if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. kick waiting worker"); } @@ -1123,7 +1141,7 @@ static grpc_error* pollset_kick(grpc_pollset* pollset, gpr_cv_signal(&specific_worker->cv); goto done; } else { - GRPC_STATS_INC_POLLSET_KICKED_AGAIN(); + GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx); if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. kick non-waiting worker"); } @@ -1135,7 +1153,8 @@ done: return ret_err; } -static void pollset_add_fd(grpc_pollset* pollset, grpc_fd* fd) {} +static void pollset_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_fd* fd) {} /******************************************************************************* * Pollset-set Definitions @@ -1145,20 +1164,27 @@ static grpc_pollset_set* pollset_set_create(void) { return (grpc_pollset_set*)((intptr_t)0xdeafbeef); } -static void pollset_set_destroy(grpc_pollset_set* pss) {} +static void pollset_set_destroy(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pss) {} -static void pollset_set_add_fd(grpc_pollset_set* pss, grpc_fd* fd) {} +static void pollset_set_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset_set* pss, + grpc_fd* fd) {} -static void pollset_set_del_fd(grpc_pollset_set* pss, grpc_fd* fd) {} +static void pollset_set_del_fd(grpc_exec_ctx* exec_ctx, grpc_pollset_set* pss, + grpc_fd* fd) {} -static void pollset_set_add_pollset(grpc_pollset_set* pss, grpc_pollset* ps) {} +static void pollset_set_add_pollset(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pss, grpc_pollset* ps) {} -static void pollset_set_del_pollset(grpc_pollset_set* pss, grpc_pollset* ps) {} +static void pollset_set_del_pollset(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pss, grpc_pollset* ps) {} -static void pollset_set_add_pollset_set(grpc_pollset_set* bag, +static void pollset_set_add_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* bag, grpc_pollset_set* item) {} -static void pollset_set_del_pollset_set(grpc_pollset_set* bag, +static void pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* bag, grpc_pollset_set* item) {} /******************************************************************************* @@ -1234,7 +1260,7 @@ const grpc_event_engine_vtable* grpc_init_epoll1_linux(bool explicit_request) { const grpc_event_engine_vtable* grpc_init_epoll1_linux(bool explicit_request) { gpr_log(GPR_ERROR, "Skipping epoll1 becuase GRPC_LINUX_EPOLL is not defined."); - return nullptr; + return NULL; } #endif /* defined(GRPC_POSIX_SOCKET) */ #endif /* !defined(GRPC_LINUX_EPOLL) */ diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc index b2817156a82..62643df697d 100644 --- a/src/core/lib/iomgr/ev_epollex_linux.cc +++ b/src/core/lib/iomgr/ev_epollex_linux.cc @@ -257,7 +257,8 @@ static gpr_mu fd_freelist_mu; #ifndef NDEBUG #define REF_BY(fd, n, reason) ref_by(fd, n, reason, __FILE__, __LINE__) -#define UNREF_BY(fd, n, reason) unref_by(fd, n, reason, __FILE__, __LINE__) +#define UNREF_BY(ec, fd, n, reason) \ + unref_by(ec, fd, n, reason, __FILE__, __LINE__) static void ref_by(grpc_fd* fd, int n, const char* reason, const char* file, int line) { if (grpc_trace_fd_refcount.enabled()) { @@ -268,13 +269,13 @@ static void ref_by(grpc_fd* fd, int n, const char* reason, const char* file, } #else #define REF_BY(fd, n, reason) ref_by(fd, n) -#define UNREF_BY(fd, n, reason) unref_by(fd, n) +#define UNREF_BY(ec, fd, n, reason) unref_by(ec, fd, n) static void ref_by(grpc_fd* fd, int n) { #endif GPR_ASSERT(gpr_atm_no_barrier_fetch_add(&fd->refst, n) > 0); } -static void fd_destroy(void* arg, grpc_error* error) { +static void fd_destroy(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { grpc_fd* fd = (grpc_fd*)arg; /* Add the fd to the freelist */ grpc_iomgr_unregister_object(&fd->iomgr_object); @@ -292,8 +293,8 @@ static void fd_destroy(void* arg, grpc_error* error) { } #ifndef NDEBUG -static void unref_by(grpc_fd* fd, int n, const char* reason, const char* file, - int line) { +static void unref_by(grpc_exec_ctx* exec_ctx, grpc_fd* fd, int n, + const char* reason, const char* file, int line) { if (grpc_trace_fd_refcount.enabled()) { gpr_log(GPR_DEBUG, "FD %d %p unref %d %" PRIdPTR " -> %" PRIdPTR " [%s; %s:%d]", @@ -301,11 +302,12 @@ static void unref_by(grpc_fd* fd, int n, const char* reason, const char* file, gpr_atm_no_barrier_load(&fd->refst) - n, reason, file, line); } #else -static void unref_by(grpc_fd* fd, int n) { +static void unref_by(grpc_exec_ctx* exec_ctx, grpc_fd* fd, int n) { #endif gpr_atm old = gpr_atm_full_fetch_add(&fd->refst, -n); if (old == n) { GRPC_CLOSURE_SCHED( + exec_ctx, GRPC_CLOSURE_CREATE(fd_destroy, fd, grpc_schedule_on_exec_ctx), GRPC_ERROR_NONE); } else { @@ -371,7 +373,8 @@ static int fd_wrapped_fd(grpc_fd* fd) { return (gpr_atm_acq_load(&fd->refst) & 1) ? ret_fd : -1; } -static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, +static void fd_orphan(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_closure* on_done, int* release_fd, bool already_closed, const char* reason) { bool is_fd_closed = already_closed; @@ -396,14 +399,15 @@ static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, to be alive (and not added to freelist) until the end of this function */ REF_BY(fd, 1, reason); - GRPC_CLOSURE_SCHED(fd->on_done_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, fd->on_done_closure, GRPC_ERROR_NONE); gpr_mu_unlock(&fd->orphan_mu); - UNREF_BY(fd, 2, reason); /* Drop the reference */ + UNREF_BY(exec_ctx, fd, 2, reason); /* Drop the reference */ } -static grpc_pollset* fd_get_read_notifier_pollset(grpc_fd* fd) { +static grpc_pollset* fd_get_read_notifier_pollset(grpc_exec_ctx* exec_ctx, + grpc_fd* fd) { gpr_atm notifier = gpr_atm_acq_load(&fd->read_notifier_pollset); return (grpc_pollset*)notifier; } @@ -413,20 +417,22 @@ static bool fd_is_shutdown(grpc_fd* fd) { } /* Might be called multiple times */ -static void fd_shutdown(grpc_fd* fd, grpc_error* why) { - if (fd->read_closure->SetShutdown(GRPC_ERROR_REF(why))) { +static void fd_shutdown(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_error* why) { + if (fd->read_closure->SetShutdown(exec_ctx, GRPC_ERROR_REF(why))) { shutdown(fd->fd, SHUT_RDWR); - fd->write_closure->SetShutdown(GRPC_ERROR_REF(why)); + fd->write_closure->SetShutdown(exec_ctx, GRPC_ERROR_REF(why)); } GRPC_ERROR_UNREF(why); } -static void fd_notify_on_read(grpc_fd* fd, grpc_closure* closure) { - fd->read_closure->NotifyOn(closure); +static void fd_notify_on_read(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_closure* closure) { + fd->read_closure->NotifyOn(exec_ctx, closure); } -static void fd_notify_on_write(grpc_fd* fd, grpc_closure* closure) { - fd->write_closure->NotifyOn(closure); +static void fd_notify_on_write(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_closure* closure) { + fd->write_closure->NotifyOn(exec_ctx, closure); } /******************************************************************************* @@ -550,7 +556,8 @@ static void pollset_global_shutdown(void) { } /* pollset->mu must be held while calling this function */ -static void pollset_maybe_finish_shutdown(grpc_pollset* pollset) { +static void pollset_maybe_finish_shutdown(grpc_exec_ctx* exec_ctx, + grpc_pollset* pollset) { if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PS:%p (pollable:%p) maybe_finish_shutdown sc=%p (target:!NULL) " @@ -560,7 +567,7 @@ static void pollset_maybe_finish_shutdown(grpc_pollset* pollset) { } if (pollset->shutdown_closure != nullptr && pollset->root_worker == nullptr && pollset->containing_pollset_set_count == 0) { - GRPC_CLOSURE_SCHED(pollset->shutdown_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, pollset->shutdown_closure, GRPC_ERROR_NONE); pollset->shutdown_closure = nullptr; } } @@ -568,7 +575,8 @@ static void pollset_maybe_finish_shutdown(grpc_pollset* pollset) { /* pollset->mu must be held before calling this function, * pollset->active_pollable->mu & specific_worker->pollable_obj->mu must not be * held */ -static grpc_error* kick_one_worker(grpc_pollset_worker* specific_worker) { +static grpc_error* kick_one_worker(grpc_exec_ctx* exec_ctx, + grpc_pollset_worker* specific_worker) { pollable* p = specific_worker->pollable_obj; grpc_core::mu_guard lock(&p->mu); GPR_ASSERT(specific_worker != nullptr); @@ -576,19 +584,19 @@ static grpc_error* kick_one_worker(grpc_pollset_worker* specific_worker) { if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PS:%p kicked_specific_but_already_kicked", p); } - GRPC_STATS_INC_POLLSET_KICKED_AGAIN(); + GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx); return GRPC_ERROR_NONE; } if (gpr_tls_get(&g_current_thread_worker) == (intptr_t)specific_worker) { if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PS:%p kicked_specific_but_awake", p); } - GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(); + GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(exec_ctx); specific_worker->kicked = true; return GRPC_ERROR_NONE; } if (specific_worker == p->root_worker) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(exec_ctx); if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PS:%p kicked_specific_via_wakeup_fd", p); } @@ -597,7 +605,7 @@ static grpc_error* kick_one_worker(grpc_pollset_worker* specific_worker) { return error; } if (specific_worker->initialized_cv) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx); if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PS:%p kicked_specific_via_cv", p); } @@ -610,9 +618,9 @@ static grpc_error* kick_one_worker(grpc_pollset_worker* specific_worker) { return GRPC_ERROR_NONE; } -static grpc_error* pollset_kick(grpc_pollset* pollset, +static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, grpc_pollset_worker* specific_worker) { - GRPC_STATS_INC_POLLSET_KICK(); + GRPC_STATS_INC_POLLSET_KICK(exec_ctx); if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PS:%p kick %p tls_pollset=%p tls_worker=%p pollset.root_worker=%p", @@ -626,7 +634,7 @@ static grpc_error* pollset_kick(grpc_pollset* pollset, if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PS:%p kicked_any_without_poller", pollset); } - GRPC_STATS_INC_POLLSET_KICKED_WITHOUT_POLLER(); + GRPC_STATS_INC_POLLSET_KICKED_WITHOUT_POLLER(exec_ctx); pollset->kicked_without_poller = true; return GRPC_ERROR_NONE; } else { @@ -646,28 +654,29 @@ static grpc_error* pollset_kick(grpc_pollset* pollset, // so we take our chances and choose the SECOND worker enqueued against // the pollset as a worker that's likely to be in cv_wait return kick_one_worker( - pollset->root_worker->links[PWLINK_POLLSET].next); + exec_ctx, pollset->root_worker->links[PWLINK_POLLSET].next); } } else { if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PS:%p kicked_any_but_awake", pollset); } - GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(); + GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(exec_ctx); return GRPC_ERROR_NONE; } } else { - return kick_one_worker(specific_worker); + return kick_one_worker(exec_ctx, specific_worker); } } -static grpc_error* pollset_kick_all(grpc_pollset* pollset) { +static grpc_error* pollset_kick_all(grpc_exec_ctx* exec_ctx, + grpc_pollset* pollset) { grpc_error* error = GRPC_ERROR_NONE; const char* err_desc = "pollset_kick_all"; grpc_pollset_worker* w = pollset->root_worker; if (w != nullptr) { do { - GRPC_STATS_INC_POLLSET_KICK(); - append_error(&error, kick_one_worker(w), err_desc); + GRPC_STATS_INC_POLLSET_KICK(exec_ctx); + append_error(&error, kick_one_worker(exec_ctx, w), err_desc); w = w->links[PWLINK_POLLSET].next; } while (w != pollset->root_worker); } @@ -680,9 +689,10 @@ static void pollset_init(grpc_pollset* pollset, gpr_mu** mu) { *mu = &pollset->mu; } -static int poll_deadline_to_millis_timeout(grpc_millis millis) { +static int poll_deadline_to_millis_timeout(grpc_exec_ctx* exec_ctx, + grpc_millis millis) { if (millis == GRPC_MILLIS_INF_FUTURE) return -1; - grpc_millis delta = millis - grpc_core::ExecCtx::Get()->Now(); + grpc_millis delta = millis - grpc_exec_ctx_now(exec_ctx); if (delta > INT_MAX) return INT_MAX; else if (delta < 0) @@ -691,8 +701,9 @@ static int poll_deadline_to_millis_timeout(grpc_millis millis) { return (int)delta; } -static void fd_become_readable(grpc_fd* fd, grpc_pollset* notifier) { - fd->read_closure->SetReady(); +static void fd_become_readable(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_pollset* notifier) { + fd->read_closure->SetReady(exec_ctx); /* Note, it is possible that fd_become_readable might be called twice with different 'notifier's when an fd becomes readable and it is in two epoll @@ -703,7 +714,9 @@ static void fd_become_readable(grpc_fd* fd, grpc_pollset* notifier) { gpr_atm_rel_store(&fd->read_notifier_pollset, (gpr_atm)notifier); } -static void fd_become_writable(grpc_fd* fd) { fd->write_closure->SetReady(); } +static void fd_become_writable(grpc_exec_ctx* exec_ctx, grpc_fd* fd) { + fd->write_closure->SetReady(exec_ctx); +} static grpc_error* fd_get_or_become_pollable(grpc_fd* fd, pollable** p) { gpr_mu_lock(&fd->pollable_mu); @@ -732,14 +745,16 @@ static grpc_error* fd_get_or_become_pollable(grpc_fd* fd, pollable** p) { } /* pollset->po.mu lock must be held by the caller before calling this */ -static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { +static void pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_closure* closure) { GPR_ASSERT(pollset->shutdown_closure == nullptr); pollset->shutdown_closure = closure; - GRPC_LOG_IF_ERROR("pollset_shutdown", pollset_kick_all(pollset)); - pollset_maybe_finish_shutdown(pollset); + GRPC_LOG_IF_ERROR("pollset_shutdown", pollset_kick_all(exec_ctx, pollset)); + pollset_maybe_finish_shutdown(exec_ctx, pollset); } -static grpc_error* pollable_process_events(grpc_pollset* pollset, +static grpc_error* pollable_process_events(grpc_exec_ctx* exec_ctx, + grpc_pollset* pollset, pollable* pollable_obj, bool drain) { static const char* err_desc = "pollset_process_events"; grpc_error* error = GRPC_ERROR_NONE; @@ -769,10 +784,10 @@ static grpc_error* pollable_process_events(grpc_pollset* pollset, pollset, fd, cancel, read_ev, write_ev); } if (read_ev || cancel) { - fd_become_readable(fd, pollset); + fd_become_readable(exec_ctx, fd, pollset); } if (write_ev || cancel) { - fd_become_writable(fd); + fd_become_writable(exec_ctx, fd); } } } @@ -781,13 +796,14 @@ static grpc_error* pollable_process_events(grpc_pollset* pollset, } /* pollset_shutdown is guaranteed to be called before pollset_destroy. */ -static void pollset_destroy(grpc_pollset* pollset) { +static void pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset) { POLLABLE_UNREF(pollset->active_pollable, "pollset"); pollset->active_pollable = nullptr; } -static grpc_error* pollable_epoll(pollable* p, grpc_millis deadline) { - int timeout = poll_deadline_to_millis_timeout(deadline); +static grpc_error* pollable_epoll(grpc_exec_ctx* exec_ctx, pollable* p, + grpc_millis deadline) { + int timeout = poll_deadline_to_millis_timeout(exec_ctx, deadline); if (grpc_polling_trace.enabled()) { char* desc = pollable_desc(p); @@ -800,11 +816,11 @@ static grpc_error* pollable_epoll(pollable* p, grpc_millis deadline) { } int r; do { - GRPC_STATS_INC_SYSCALL_POLL(); + GRPC_STATS_INC_SYSCALL_POLL(exec_ctx); r = epoll_wait(p->epfd, p->events, MAX_EPOLL_EVENTS, timeout); } while (r < 0 && errno == EINTR); if (timeout != 0) { - GRPC_SCHEDULING_END_BLOCKING_REGION; + GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(exec_ctx); } if (r < 0) return GRPC_OS_ERROR(errno, "epoll_wait"); @@ -859,7 +875,8 @@ static worker_remove_result worker_remove(grpc_pollset_worker** root_worker, } /* Return true if this thread should poll */ -static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, +static bool begin_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_pollset_worker* worker, grpc_pollset_worker** worker_hdl, grpc_millis deadline) { bool do_poll = (pollset->shutdown_closure == nullptr); @@ -880,7 +897,7 @@ static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, worker->pollable_obj->root_worker != worker) { gpr_log(GPR_DEBUG, "PS:%p wait %p w=%p for %dms", pollset, worker->pollable_obj, worker, - poll_deadline_to_millis_timeout(deadline)); + poll_deadline_to_millis_timeout(exec_ctx, deadline)); } while (do_poll && worker->pollable_obj->root_worker != worker) { if (gpr_cv_wait(&worker->cv, &worker->pollable_obj->mu, @@ -902,7 +919,7 @@ static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, worker->pollable_obj, worker); } } - grpc_core::ExecCtx::Get()->InvalidateNow(); + grpc_exec_ctx_invalidate_now(exec_ctx); } else { gpr_mu_unlock(&pollset->mu); } @@ -911,7 +928,8 @@ static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, return do_poll; } -static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, +static void end_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_pollset_worker* worker, grpc_pollset_worker** worker_hdl) { gpr_mu_lock(&pollset->mu); gpr_mu_lock(&worker->pollable_obj->mu); @@ -927,7 +945,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, case WRR_EMPTIED: if (pollset->active_pollable != worker->pollable_obj) { // pollable no longer being polled: flush events - pollable_process_events(pollset, worker->pollable_obj, true); + pollable_process_events(exec_ctx, pollset, worker->pollable_obj, true); } break; case WRR_REMOVED: @@ -937,7 +955,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, POLLABLE_UNREF(worker->pollable_obj, "pollset_worker"); if (worker_remove(&pollset->root_worker, worker, PWLINK_POLLSET) == WRR_EMPTIED) { - pollset_maybe_finish_shutdown(pollset); + pollset_maybe_finish_shutdown(exec_ctx, pollset); } if (worker->initialized_cv) { gpr_cv_destroy(&worker->cv); @@ -952,7 +970,7 @@ static long gettid(void) { return syscall(__NR_gettid); } The function pollset_work() may temporarily release the lock (pollset->po.mu) during the course of its execution but it will always re-acquire the lock and ensure that it is held by the time the function returns */ -static grpc_error* pollset_work(grpc_pollset* pollset, +static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, grpc_pollset_worker** worker_hdl, grpc_millis deadline) { #ifdef GRPC_EPOLLEX_CREATE_WORKERS_ON_HEAP @@ -970,7 +988,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, gpr_log(GPR_DEBUG, "PS:%p work hdl=%p worker=%p now=%" PRIdPTR " deadline=%" PRIdPTR " kwp=%d pollable=%p", - pollset, worker_hdl, WORKER_PTR, grpc_core::ExecCtx::Get()->Now(), + pollset, worker_hdl, WORKER_PTR, grpc_exec_ctx_now(exec_ctx), deadline, pollset->kicked_without_poller, pollset->active_pollable); } static const char* err_desc = "pollset_work"; @@ -978,23 +996,25 @@ static grpc_error* pollset_work(grpc_pollset* pollset, if (pollset->kicked_without_poller) { pollset->kicked_without_poller = false; } else { - if (begin_worker(pollset, WORKER_PTR, worker_hdl, deadline)) { + if (begin_worker(exec_ctx, pollset, WORKER_PTR, worker_hdl, deadline)) { gpr_tls_set(&g_current_thread_pollset, (intptr_t)pollset); gpr_tls_set(&g_current_thread_worker, (intptr_t)WORKER_PTR); if (WORKER_PTR->pollable_obj->event_cursor == WORKER_PTR->pollable_obj->event_count) { - append_error(&error, pollable_epoll(WORKER_PTR->pollable_obj, deadline), - err_desc); + append_error( + &error, + pollable_epoll(exec_ctx, WORKER_PTR->pollable_obj, deadline), + err_desc); } - append_error( - &error, - pollable_process_events(pollset, WORKER_PTR->pollable_obj, false), - err_desc); - grpc_core::ExecCtx::Get()->Flush(); + append_error(&error, + pollable_process_events(exec_ctx, pollset, + WORKER_PTR->pollable_obj, false), + err_desc); + grpc_exec_ctx_flush(exec_ctx); gpr_tls_set(&g_current_thread_pollset, 0); gpr_tls_set(&g_current_thread_worker, 0); } - end_worker(pollset, WORKER_PTR, worker_hdl); + end_worker(exec_ctx, pollset, WORKER_PTR, worker_hdl); } #ifdef GRPC_EPOLLEX_CREATE_WORKERS_ON_HEAP gpr_free(worker); @@ -1004,7 +1024,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, } static grpc_error* pollset_transition_pollable_from_empty_to_fd_locked( - grpc_pollset* pollset, grpc_fd* fd) { + grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, grpc_fd* fd) { static const char* err_desc = "pollset_transition_pollable_from_empty_to_fd"; grpc_error* error = GRPC_ERROR_NONE; if (grpc_polling_trace.enabled()) { @@ -1012,7 +1032,7 @@ static grpc_error* pollset_transition_pollable_from_empty_to_fd_locked( "PS:%p add fd %p (%d); transition pollable from empty to fd", pollset, fd, fd->fd); } - append_error(&error, pollset_kick_all(pollset), err_desc); + append_error(&error, pollset_kick_all(exec_ctx, pollset), err_desc); POLLABLE_UNREF(pollset->active_pollable, "pollset"); append_error(&error, fd_get_or_become_pollable(fd, &pollset->active_pollable), err_desc); @@ -1020,7 +1040,7 @@ static grpc_error* pollset_transition_pollable_from_empty_to_fd_locked( } static grpc_error* pollset_transition_pollable_from_fd_to_multi_locked( - grpc_pollset* pollset, grpc_fd* and_add_fd) { + grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, grpc_fd* and_add_fd) { static const char* err_desc = "pollset_transition_pollable_from_fd_to_multi"; grpc_error* error = GRPC_ERROR_NONE; if (grpc_polling_trace.enabled()) { @@ -1030,7 +1050,7 @@ static grpc_error* pollset_transition_pollable_from_fd_to_multi_locked( pollset, and_add_fd, and_add_fd ? and_add_fd->fd : -1, pollset->active_pollable->owner_fd); } - append_error(&error, pollset_kick_all(pollset), err_desc); + append_error(&error, pollset_kick_all(exec_ctx, pollset), err_desc); grpc_fd* initial_fd = pollset->active_pollable->owner_fd; POLLABLE_UNREF(pollset->active_pollable, "pollset"); pollset->active_pollable = nullptr; @@ -1048,25 +1068,27 @@ static grpc_error* pollset_transition_pollable_from_fd_to_multi_locked( } /* expects pollsets locked, flag whether fd is locked or not */ -static grpc_error* pollset_add_fd_locked(grpc_pollset* pollset, grpc_fd* fd) { +static grpc_error* pollset_add_fd_locked(grpc_exec_ctx* exec_ctx, + grpc_pollset* pollset, grpc_fd* fd) { grpc_error* error = GRPC_ERROR_NONE; pollable* po_at_start = POLLABLE_REF(pollset->active_pollable, "pollset_add_fd"); switch (pollset->active_pollable->type) { case PO_EMPTY: /* empty pollable --> single fd pollable */ - error = pollset_transition_pollable_from_empty_to_fd_locked(pollset, fd); + error = pollset_transition_pollable_from_empty_to_fd_locked(exec_ctx, + pollset, fd); break; case PO_FD: gpr_mu_lock(&po_at_start->owner_fd->orphan_mu); if ((gpr_atm_no_barrier_load(&pollset->active_pollable->owner_fd->refst) & 1) == 0) { - error = - pollset_transition_pollable_from_empty_to_fd_locked(pollset, fd); + error = pollset_transition_pollable_from_empty_to_fd_locked( + exec_ctx, pollset, fd); } else { /* fd --> multipoller */ - error = - pollset_transition_pollable_from_fd_to_multi_locked(pollset, fd); + error = pollset_transition_pollable_from_fd_to_multi_locked( + exec_ctx, pollset, fd); } gpr_mu_unlock(&po_at_start->owner_fd->orphan_mu); break; @@ -1083,7 +1105,8 @@ static grpc_error* pollset_add_fd_locked(grpc_pollset* pollset, grpc_fd* fd) { return error; } -static grpc_error* pollset_as_multipollable_locked(grpc_pollset* pollset, +static grpc_error* pollset_as_multipollable_locked(grpc_exec_ctx* exec_ctx, + grpc_pollset* pollset, pollable** pollable_obj) { grpc_error* error = GRPC_ERROR_NONE; pollable* po_at_start = @@ -1100,8 +1123,8 @@ static grpc_error* pollset_as_multipollable_locked(grpc_pollset* pollset, POLLABLE_UNREF(pollset->active_pollable, "pollset"); error = pollable_create(PO_MULTI, &pollset->active_pollable); } else { - error = pollset_transition_pollable_from_fd_to_multi_locked(pollset, - nullptr); + error = pollset_transition_pollable_from_fd_to_multi_locked( + exec_ctx, pollset, nullptr); } gpr_mu_unlock(&po_at_start->owner_fd->orphan_mu); break; @@ -1119,9 +1142,10 @@ static grpc_error* pollset_as_multipollable_locked(grpc_pollset* pollset, return error; } -static void pollset_add_fd(grpc_pollset* pollset, grpc_fd* fd) { +static void pollset_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_fd* fd) { gpr_mu_lock(&pollset->mu); - grpc_error* error = pollset_add_fd_locked(pollset, fd); + grpc_error* error = pollset_add_fd_locked(exec_ctx, pollset, fd); gpr_mu_unlock(&pollset->mu); GRPC_LOG_IF_ERROR("pollset_add_fd", error); } @@ -1147,27 +1171,28 @@ static grpc_pollset_set* pollset_set_create(void) { return pss; } -static void pollset_set_unref(grpc_pollset_set* pss) { +static void pollset_set_unref(grpc_exec_ctx* exec_ctx, grpc_pollset_set* pss) { if (pss == nullptr) return; if (!gpr_unref(&pss->refs)) return; - pollset_set_unref(pss->parent); + pollset_set_unref(exec_ctx, pss->parent); gpr_mu_destroy(&pss->mu); for (size_t i = 0; i < pss->pollset_count; i++) { gpr_mu_lock(&pss->pollsets[i]->mu); if (0 == --pss->pollsets[i]->containing_pollset_set_count) { - pollset_maybe_finish_shutdown(pss->pollsets[i]); + pollset_maybe_finish_shutdown(exec_ctx, pss->pollsets[i]); } gpr_mu_unlock(&pss->pollsets[i]->mu); } for (size_t i = 0; i < pss->fd_count; i++) { - UNREF_BY(pss->fds[i], 2, "pollset_set"); + UNREF_BY(exec_ctx, pss->fds[i], 2, "pollset_set"); } gpr_free(pss->pollsets); gpr_free(pss->fds); gpr_free(pss); } -static void pollset_set_add_fd(grpc_pollset_set* pss, grpc_fd* fd) { +static void pollset_set_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset_set* pss, + grpc_fd* fd) { if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PSS:%p: add fd %p (%d)", pss, fd, fd->fd); } @@ -1190,7 +1215,8 @@ static void pollset_set_add_fd(grpc_pollset_set* pss, grpc_fd* fd) { GRPC_LOG_IF_ERROR(err_desc, error); } -static void pollset_set_del_fd(grpc_pollset_set* pss, grpc_fd* fd) { +static void pollset_set_del_fd(grpc_exec_ctx* exec_ctx, grpc_pollset_set* pss, + grpc_fd* fd) { if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PSS:%p: del fd %p", pss, fd); } @@ -1198,7 +1224,7 @@ static void pollset_set_del_fd(grpc_pollset_set* pss, grpc_fd* fd) { size_t i; for (i = 0; i < pss->fd_count; i++) { if (pss->fds[i] == fd) { - UNREF_BY(fd, 2, "pollset_set"); + UNREF_BY(exec_ctx, fd, 2, "pollset_set"); break; } } @@ -1210,7 +1236,8 @@ static void pollset_set_del_fd(grpc_pollset_set* pss, grpc_fd* fd) { gpr_mu_unlock(&pss->mu); } -static void pollset_set_del_pollset(grpc_pollset_set* pss, grpc_pollset* ps) { +static void pollset_set_del_pollset(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pss, grpc_pollset* ps) { if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PSS:%p: del pollset %p", pss, ps); } @@ -1229,15 +1256,15 @@ static void pollset_set_del_pollset(grpc_pollset_set* pss, grpc_pollset* ps) { gpr_mu_unlock(&pss->mu); gpr_mu_lock(&ps->mu); if (0 == --ps->containing_pollset_set_count) { - pollset_maybe_finish_shutdown(ps); + pollset_maybe_finish_shutdown(exec_ctx, ps); } gpr_mu_unlock(&ps->mu); } // add all fds to pollables, and output a new array of unorphaned out_fds // assumes pollsets are multipollable -static grpc_error* add_fds_to_pollsets(grpc_fd** fds, size_t fd_count, - grpc_pollset** pollsets, +static grpc_error* add_fds_to_pollsets(grpc_exec_ctx* exec_ctx, grpc_fd** fds, + size_t fd_count, grpc_pollset** pollsets, size_t pollset_count, const char* err_desc, grpc_fd** out_fds, size_t* out_fd_count) { @@ -1246,7 +1273,7 @@ static grpc_error* add_fds_to_pollsets(grpc_fd** fds, size_t fd_count, gpr_mu_lock(&fds[i]->orphan_mu); if ((gpr_atm_no_barrier_load(&fds[i]->refst) & 1) == 0) { gpr_mu_unlock(&fds[i]->orphan_mu); - UNREF_BY(fds[i], 2, "pollset_set"); + UNREF_BY(exec_ctx, fds[i], 2, "pollset_set"); } else { for (size_t j = 0; j < pollset_count; j++) { append_error(&error, @@ -1260,7 +1287,8 @@ static grpc_error* add_fds_to_pollsets(grpc_fd** fds, size_t fd_count, return error; } -static void pollset_set_add_pollset(grpc_pollset_set* pss, grpc_pollset* ps) { +static void pollset_set_add_pollset(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pss, grpc_pollset* ps) { if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PSS:%p: add pollset %p", pss, ps); } @@ -1268,8 +1296,8 @@ static void pollset_set_add_pollset(grpc_pollset_set* pss, grpc_pollset* ps) { static const char* err_desc = "pollset_set_add_pollset"; pollable* pollable_obj = nullptr; gpr_mu_lock(&ps->mu); - if (!GRPC_LOG_IF_ERROR(err_desc, - pollset_as_multipollable_locked(ps, &pollable_obj))) { + if (!GRPC_LOG_IF_ERROR(err_desc, pollset_as_multipollable_locked( + exec_ctx, ps, &pollable_obj))) { GPR_ASSERT(pollable_obj == nullptr); gpr_mu_unlock(&ps->mu); return; @@ -1280,8 +1308,8 @@ static void pollset_set_add_pollset(grpc_pollset_set* pss, grpc_pollset* ps) { size_t initial_fd_count = pss->fd_count; pss->fd_count = 0; append_error(&error, - add_fds_to_pollsets(pss->fds, initial_fd_count, &ps, 1, err_desc, - pss->fds, &pss->fd_count), + add_fds_to_pollsets(exec_ctx, pss->fds, initial_fd_count, &ps, 1, + err_desc, pss->fds, &pss->fd_count), err_desc); if (pss->pollset_count == pss->pollset_capacity) { pss->pollset_capacity = GPR_MAX(pss->pollset_capacity * 2, 8); @@ -1295,7 +1323,8 @@ static void pollset_set_add_pollset(grpc_pollset_set* pss, grpc_pollset* ps) { GRPC_LOG_IF_ERROR(err_desc, error); } -static void pollset_set_add_pollset_set(grpc_pollset_set* a, +static void pollset_set_add_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* a, grpc_pollset_set* b) { if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PSS: merge (%p, %p)", a, b); @@ -1344,13 +1373,13 @@ static void pollset_set_add_pollset_set(grpc_pollset_set* a, a->fd_count = 0; append_error( &error, - add_fds_to_pollsets(a->fds, initial_a_fd_count, b->pollsets, + add_fds_to_pollsets(exec_ctx, a->fds, initial_a_fd_count, b->pollsets, b->pollset_count, "merge_a2b", a->fds, &a->fd_count), err_desc); append_error( &error, - add_fds_to_pollsets(b->fds, b->fd_count, a->pollsets, a->pollset_count, - "merge_b2a", a->fds, &a->fd_count), + add_fds_to_pollsets(exec_ctx, b->fds, b->fd_count, a->pollsets, + a->pollset_count, "merge_b2a", a->fds, &a->fd_count), err_desc); if (a->pollset_capacity < a->pollset_count + b->pollset_count) { a->pollset_capacity = @@ -1372,7 +1401,8 @@ static void pollset_set_add_pollset_set(grpc_pollset_set* a, gpr_mu_unlock(&b->mu); } -static void pollset_set_del_pollset_set(grpc_pollset_set* bag, +static void pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* bag, grpc_pollset_set* item) {} /******************************************************************************* @@ -1451,7 +1481,7 @@ const grpc_event_engine_vtable* grpc_init_epollex_linux( bool explicitly_requested) { gpr_log(GPR_ERROR, "Skipping epollex becuase GRPC_LINUX_EPOLL is not defined."); - return nullptr; + return NULL; } #endif /* defined(GRPC_POSIX_SOCKET) */ diff --git a/src/core/lib/iomgr/ev_epollsig_linux.cc b/src/core/lib/iomgr/ev_epollsig_linux.cc index 7a8962f4a87..12c8483b8ee 100644 --- a/src/core/lib/iomgr/ev_epollsig_linux.cc +++ b/src/core/lib/iomgr/ev_epollsig_linux.cc @@ -165,12 +165,13 @@ static void fd_global_shutdown(void); #ifndef NDEBUG #define PI_ADD_REF(p, r) pi_add_ref_dbg((p), (r), __FILE__, __LINE__) -#define PI_UNREF(p, r) pi_unref_dbg((p), (r), __FILE__, __LINE__) +#define PI_UNREF(exec_ctx, p, r) \ + pi_unref_dbg((exec_ctx), (p), (r), __FILE__, __LINE__) #else #define PI_ADD_REF(p, r) pi_add_ref((p)) -#define PI_UNREF(p, r) pi_unref((p)) +#define PI_UNREF(exec_ctx, p, r) pi_unref((exec_ctx), (p)) #endif @@ -269,7 +270,7 @@ static grpc_wakeup_fd polling_island_wakeup_fd; static __thread polling_island* g_current_thread_polling_island; /* Forward declaration */ -static void polling_island_delete(polling_island* pi); +static void polling_island_delete(grpc_exec_ctx* exec_ctx, polling_island* pi); #ifdef GRPC_TSAN /* Currently TSAN may incorrectly flag data races between epoll_ctl and @@ -283,7 +284,7 @@ gpr_atm g_epoll_sync; #endif /* defined(GRPC_TSAN) */ static void pi_add_ref(polling_island* pi); -static void pi_unref(polling_island* pi); +static void pi_unref(grpc_exec_ctx* exec_ctx, polling_island* pi); #ifndef NDEBUG static void pi_add_ref_dbg(polling_island* pi, const char* reason, @@ -298,8 +299,8 @@ static void pi_add_ref_dbg(polling_island* pi, const char* reason, pi_add_ref(pi); } -static void pi_unref_dbg(polling_island* pi, const char* reason, - const char* file, int line) { +static void pi_unref_dbg(grpc_exec_ctx* exec_ctx, polling_island* pi, + const char* reason, const char* file, int line) { if (grpc_polling_trace.enabled()) { gpr_atm old_cnt = gpr_atm_acq_load(&pi->ref_count); gpr_log(GPR_DEBUG, @@ -307,7 +308,7 @@ static void pi_unref_dbg(polling_island* pi, const char* reason, " (%s) - (%s, %d)", pi, old_cnt, (old_cnt - 1), reason, file, line); } - pi_unref(pi); + pi_unref(exec_ctx, pi); } #endif @@ -315,7 +316,7 @@ static void pi_add_ref(polling_island* pi) { gpr_atm_no_barrier_fetch_add(&pi->ref_count, 1); } -static void pi_unref(polling_island* pi) { +static void pi_unref(grpc_exec_ctx* exec_ctx, polling_island* pi) { /* If ref count went to zero, delete the polling island. Note that this deletion not be done under a lock. Once the ref count goes to zero, we are guaranteed that no one else holds a reference to the @@ -326,9 +327,9 @@ static void pi_unref(polling_island* pi) { */ if (1 == gpr_atm_full_fetch_add(&pi->ref_count, -1)) { polling_island* next = (polling_island*)gpr_atm_acq_load(&pi->merged_to); - polling_island_delete(pi); + polling_island_delete(exec_ctx, pi); if (next != nullptr) { - PI_UNREF(next, "pi_delete"); /* Recursive call */ + PI_UNREF(exec_ctx, next, "pi_delete"); /* Recursive call */ } } } @@ -464,7 +465,8 @@ static void polling_island_remove_fd_locked(polling_island* pi, grpc_fd* fd, } /* Might return NULL in case of an error */ -static polling_island* polling_island_create(grpc_fd* initial_fd, +static polling_island* polling_island_create(grpc_exec_ctx* exec_ctx, + grpc_fd* initial_fd, grpc_error** error) { polling_island* pi = nullptr; const char* err_desc = "polling_island_create"; @@ -480,7 +482,7 @@ static polling_island* polling_island_create(grpc_fd* initial_fd, gpr_atm_rel_store(&pi->ref_count, 0); gpr_atm_rel_store(&pi->poller_count, 0); - gpr_atm_rel_store(&pi->merged_to, (gpr_atm) nullptr); + gpr_atm_rel_store(&pi->merged_to, (gpr_atm)NULL); pi->epoll_fd = epoll_create1(EPOLL_CLOEXEC); @@ -495,13 +497,13 @@ static polling_island* polling_island_create(grpc_fd* initial_fd, done: if (*error != GRPC_ERROR_NONE) { - polling_island_delete(pi); + polling_island_delete(exec_ctx, pi); pi = nullptr; } return pi; } -static void polling_island_delete(polling_island* pi) { +static void polling_island_delete(grpc_exec_ctx* exec_ctx, polling_island* pi) { GPR_ASSERT(pi->fd_cnt == 0); if (pi->epoll_fd >= 0) { @@ -860,7 +862,8 @@ static int fd_wrapped_fd(grpc_fd* fd) { return ret_fd; } -static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, +static void fd_orphan(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_closure* on_done, int* release_fd, bool already_closed, const char* reason) { grpc_error* error = GRPC_ERROR_NONE; polling_island* unref_pi = nullptr; @@ -899,7 +902,7 @@ static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, fd->orphaned = true; - GRPC_CLOSURE_SCHED(fd->on_done_closure, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(exec_ctx, fd->on_done_closure, GRPC_ERROR_REF(error)); gpr_mu_unlock(&fd->po.mu); UNREF_BY(fd, 2, reason); /* Drop the reference */ @@ -908,7 +911,7 @@ static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, The polling island owns a workqueue which owns an fd, and unreffing inside the lock can cause an eventual lock loop that makes TSAN very unhappy. */ - PI_UNREF(unref_pi, "fd_orphan"); + PI_UNREF(exec_ctx, unref_pi, "fd_orphan"); } if (error != GRPC_ERROR_NONE) { const char* msg = grpc_error_string(error); @@ -917,7 +920,8 @@ static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, GRPC_ERROR_UNREF(error); } -static grpc_pollset* fd_get_read_notifier_pollset(grpc_fd* fd) { +static grpc_pollset* fd_get_read_notifier_pollset(grpc_exec_ctx* exec_ctx, + grpc_fd* fd) { gpr_atm notifier = gpr_atm_acq_load(&fd->read_notifier_pollset); return (grpc_pollset*)notifier; } @@ -927,20 +931,22 @@ static bool fd_is_shutdown(grpc_fd* fd) { } /* Might be called multiple times */ -static void fd_shutdown(grpc_fd* fd, grpc_error* why) { - if (fd->read_closure->SetShutdown(GRPC_ERROR_REF(why))) { +static void fd_shutdown(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_error* why) { + if (fd->read_closure->SetShutdown(exec_ctx, GRPC_ERROR_REF(why))) { shutdown(fd->fd, SHUT_RDWR); - fd->write_closure->SetShutdown(GRPC_ERROR_REF(why)); + fd->write_closure->SetShutdown(exec_ctx, GRPC_ERROR_REF(why)); } GRPC_ERROR_UNREF(why); } -static void fd_notify_on_read(grpc_fd* fd, grpc_closure* closure) { - fd->read_closure->NotifyOn(closure); +static void fd_notify_on_read(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_closure* closure) { + fd->read_closure->NotifyOn(exec_ctx, closure); } -static void fd_notify_on_write(grpc_fd* fd, grpc_closure* closure) { - fd->write_closure->NotifyOn(closure); +static void fd_notify_on_write(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_closure* closure) { + fd->write_closure->NotifyOn(exec_ctx, closure); } /******************************************************************************* @@ -1022,11 +1028,11 @@ static void push_front_worker(grpc_pollset* p, grpc_pollset_worker* worker) { } /* p->mu must be held before calling this function */ -static grpc_error* pollset_kick(grpc_pollset* p, +static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* p, grpc_pollset_worker* specific_worker) { GPR_TIMER_BEGIN("pollset_kick", 0); grpc_error* error = GRPC_ERROR_NONE; - GRPC_STATS_INC_POLLSET_KICK(); + GRPC_STATS_INC_POLLSET_KICK(exec_ctx); const char* err_desc = "Kick Failure"; grpc_pollset_worker* worker = specific_worker; if (worker != nullptr) { @@ -1090,9 +1096,10 @@ static void pollset_init(grpc_pollset* pollset, gpr_mu** mu) { pollset->shutdown_done = nullptr; } -static int poll_deadline_to_millis_timeout(grpc_millis millis) { +static int poll_deadline_to_millis_timeout(grpc_exec_ctx* exec_ctx, + grpc_millis millis) { if (millis == GRPC_MILLIS_INF_FUTURE) return -1; - grpc_millis delta = millis - grpc_core::ExecCtx::Get()->Now(); + grpc_millis delta = millis - grpc_exec_ctx_now(exec_ctx); if (delta > INT_MAX) return INT_MAX; else if (delta < 0) @@ -1101,8 +1108,9 @@ static int poll_deadline_to_millis_timeout(grpc_millis millis) { return (int)delta; } -static void fd_become_readable(grpc_fd* fd, grpc_pollset* notifier) { - fd->read_closure->SetReady(); +static void fd_become_readable(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_pollset* notifier) { + fd->read_closure->SetReady(exec_ctx); /* Note, it is possible that fd_become_readable might be called twice with different 'notifier's when an fd becomes readable and it is in two epoll @@ -1113,34 +1121,39 @@ static void fd_become_readable(grpc_fd* fd, grpc_pollset* notifier) { gpr_atm_rel_store(&fd->read_notifier_pollset, (gpr_atm)notifier); } -static void fd_become_writable(grpc_fd* fd) { fd->write_closure->SetReady(); } +static void fd_become_writable(grpc_exec_ctx* exec_ctx, grpc_fd* fd) { + fd->write_closure->SetReady(exec_ctx); +} -static void pollset_release_polling_island(grpc_pollset* ps, +static void pollset_release_polling_island(grpc_exec_ctx* exec_ctx, + grpc_pollset* ps, const char* reason) { if (ps->po.pi != nullptr) { - PI_UNREF(ps->po.pi, reason); + PI_UNREF(exec_ctx, ps->po.pi, reason); } ps->po.pi = nullptr; } -static void finish_shutdown_locked(grpc_pollset* pollset) { +static void finish_shutdown_locked(grpc_exec_ctx* exec_ctx, + grpc_pollset* pollset) { /* The pollset cannot have any workers if we are at this stage */ GPR_ASSERT(!pollset_has_workers(pollset)); pollset->finish_shutdown_called = true; /* Release the ref and set pollset->po.pi to NULL */ - pollset_release_polling_island(pollset, "ps_shutdown"); - GRPC_CLOSURE_SCHED(pollset->shutdown_done, GRPC_ERROR_NONE); + pollset_release_polling_island(exec_ctx, pollset, "ps_shutdown"); + GRPC_CLOSURE_SCHED(exec_ctx, pollset->shutdown_done, GRPC_ERROR_NONE); } /* pollset->po.mu lock must be held by the caller before calling this */ -static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { +static void pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_closure* closure) { GPR_TIMER_BEGIN("pollset_shutdown", 0); GPR_ASSERT(!pollset->shutting_down); pollset->shutting_down = true; pollset->shutdown_done = closure; - pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); + pollset_kick(exec_ctx, pollset, GRPC_POLLSET_KICK_BROADCAST); /* If the pollset has any workers, we cannot call finish_shutdown_locked() because it would release the underlying polling island. In such a case, we @@ -1148,7 +1161,7 @@ static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { if (!pollset_has_workers(pollset)) { GPR_ASSERT(!pollset->finish_shutdown_called); GPR_TIMER_MARK("pollset_shutdown.finish_shutdown_locked", 0); - finish_shutdown_locked(pollset); + finish_shutdown_locked(exec_ctx, pollset); } GPR_TIMER_END("pollset_shutdown", 0); } @@ -1156,14 +1169,15 @@ static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { /* pollset_shutdown is guaranteed to be called before pollset_destroy. So other * than destroying the mutexes, there is nothing special that needs to be done * here */ -static void pollset_destroy(grpc_pollset* pollset) { +static void pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset) { GPR_ASSERT(!pollset_has_workers(pollset)); gpr_mu_destroy(&pollset->po.mu); } #define GRPC_EPOLL_MAX_EVENTS 100 /* Note: sig_mask contains the signal mask to use *during* epoll_wait() */ -static void pollset_work_and_unlock(grpc_pollset* pollset, +static void pollset_work_and_unlock(grpc_exec_ctx* exec_ctx, + grpc_pollset* pollset, grpc_pollset_worker* worker, int timeout_ms, sigset_t* sig_mask, grpc_error** error) { struct epoll_event ep_ev[GRPC_EPOLL_MAX_EVENTS]; @@ -1185,7 +1199,7 @@ static void pollset_work_and_unlock(grpc_pollset* pollset, this function (i.e pollset_work_and_unlock()) is called */ if (pollset->po.pi == nullptr) { - pollset->po.pi = polling_island_create(nullptr, error); + pollset->po.pi = polling_island_create(exec_ctx, nullptr, error); if (pollset->po.pi == nullptr) { GPR_TIMER_END("pollset_work_and_unlock", 0); return; /* Fatal error. We cannot continue */ @@ -1205,7 +1219,7 @@ static void pollset_work_and_unlock(grpc_pollset* pollset, /* Always do PI_ADD_REF before PI_UNREF because PI_UNREF may cause the polling island to be deleted */ PI_ADD_REF(pi, "ps"); - PI_UNREF(pollset->po.pi, "ps"); + PI_UNREF(exec_ctx, pollset->po.pi, "ps"); pollset->po.pi = pi; } @@ -1219,10 +1233,10 @@ static void pollset_work_and_unlock(grpc_pollset* pollset, g_current_thread_polling_island = pi; GRPC_SCHEDULING_START_BLOCKING_REGION; - GRPC_STATS_INC_SYSCALL_POLL(); + GRPC_STATS_INC_SYSCALL_POLL(exec_ctx); ep_rv = epoll_pwait(epoll_fd, ep_ev, GRPC_EPOLL_MAX_EVENTS, timeout_ms, sig_mask); - GRPC_SCHEDULING_END_BLOCKING_REGION; + GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(exec_ctx); if (ep_rv < 0) { if (errno != EINTR) { gpr_asprintf(&err_msg, @@ -1260,10 +1274,10 @@ static void pollset_work_and_unlock(grpc_pollset* pollset, int read_ev = ep_ev[i].events & (EPOLLIN | EPOLLPRI); int write_ev = ep_ev[i].events & EPOLLOUT; if (read_ev || cancel) { - fd_become_readable(fd, pollset); + fd_become_readable(exec_ctx, fd, pollset); } if (write_ev || cancel) { - fd_become_writable(fd); + fd_become_writable(exec_ctx, fd); } } } @@ -1278,7 +1292,7 @@ static void pollset_work_and_unlock(grpc_pollset* pollset, that we got before releasing the polling island lock). This is because pollset->po.pi pointer might get udpated in other parts of the code when there is an island merge while we are doing epoll_wait() above */ - PI_UNREF(pi, "ps_work"); + PI_UNREF(exec_ctx, pi, "ps_work"); GPR_TIMER_END("pollset_work_and_unlock", 0); } @@ -1287,12 +1301,12 @@ static void pollset_work_and_unlock(grpc_pollset* pollset, The function pollset_work() may temporarily release the lock (pollset->po.mu) during the course of its execution but it will always re-acquire the lock and ensure that it is held by the time the function returns */ -static grpc_error* pollset_work(grpc_pollset* pollset, +static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, grpc_pollset_worker** worker_hdl, grpc_millis deadline) { GPR_TIMER_BEGIN("pollset_work", 0); grpc_error* error = GRPC_ERROR_NONE; - int timeout_ms = poll_deadline_to_millis_timeout(deadline); + int timeout_ms = poll_deadline_to_millis_timeout(exec_ctx, deadline); sigset_t new_mask; @@ -1350,9 +1364,9 @@ static grpc_error* pollset_work(grpc_pollset* pollset, push_front_worker(pollset, &worker); /* Add worker to pollset */ - pollset_work_and_unlock(pollset, &worker, timeout_ms, &g_orig_sigmask, - &error); - grpc_core::ExecCtx::Get()->Flush(); + pollset_work_and_unlock(exec_ctx, pollset, &worker, timeout_ms, + &g_orig_sigmask, &error); + grpc_exec_ctx_flush(exec_ctx); gpr_mu_lock(&pollset->po.mu); @@ -1372,10 +1386,10 @@ static grpc_error* pollset_work(grpc_pollset* pollset, if (pollset->shutting_down && !pollset_has_workers(pollset) && !pollset->finish_shutdown_called) { GPR_TIMER_MARK("pollset_work.finish_shutdown_locked", 0); - finish_shutdown_locked(pollset); + finish_shutdown_locked(exec_ctx, pollset); gpr_mu_unlock(&pollset->po.mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(exec_ctx); gpr_mu_lock(&pollset->po.mu); } @@ -1390,8 +1404,9 @@ static grpc_error* pollset_work(grpc_pollset* pollset, return error; } -static void add_poll_object(poll_obj* bag, poll_obj_type bag_type, - poll_obj* item, poll_obj_type item_type) { +static void add_poll_object(grpc_exec_ctx* exec_ctx, poll_obj* bag, + poll_obj_type bag_type, poll_obj* item, + poll_obj_type item_type) { GPR_TIMER_BEGIN("add_poll_object", 0); #ifndef NDEBUG @@ -1441,7 +1456,7 @@ retry: keeping TSAN happy outweigh any performance advantage we might have by keeping the lock held. */ gpr_mu_unlock(&item->mu); - pi_new = polling_island_create(FD_FROM_PO(item), &error); + pi_new = polling_island_create(exec_ctx, FD_FROM_PO(item), &error); gpr_mu_lock(&item->mu); /* Need to reverify any assumptions made between the initial lock and @@ -1460,11 +1475,11 @@ retry: /* Ref and unref so that the polling island gets deleted during unref */ PI_ADD_REF(pi_new, "dance_of_destruction"); - PI_UNREF(pi_new, "dance_of_destruction"); + PI_UNREF(exec_ctx, pi_new, "dance_of_destruction"); goto retry; } } else { - pi_new = polling_island_create(nullptr, &error); + pi_new = polling_island_create(exec_ctx, nullptr, &error); } GRPC_POLLING_TRACE( @@ -1518,7 +1533,7 @@ retry: if (item->pi != pi_new) { PI_ADD_REF(pi_new, poll_obj_string(item_type)); if (item->pi != nullptr) { - PI_UNREF(item->pi, poll_obj_string(item_type)); + PI_UNREF(exec_ctx, item->pi, poll_obj_string(item_type)); } item->pi = pi_new; } @@ -1526,7 +1541,7 @@ retry: if (bag->pi != pi_new) { PI_ADD_REF(pi_new, poll_obj_string(bag_type)); if (bag->pi != nullptr) { - PI_UNREF(bag->pi, poll_obj_string(bag_type)); + PI_UNREF(exec_ctx, bag->pi, poll_obj_string(bag_type)); } bag->pi = pi_new; } @@ -1538,8 +1553,10 @@ retry: GPR_TIMER_END("add_poll_object", 0); } -static void pollset_add_fd(grpc_pollset* pollset, grpc_fd* fd) { - add_poll_object(&pollset->po, POLL_OBJ_POLLSET, &fd->po, POLL_OBJ_FD); +static void pollset_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_fd* fd) { + add_poll_object(exec_ctx, &pollset->po, POLL_OBJ_POLLSET, &fd->po, + POLL_OBJ_FD); } /******************************************************************************* @@ -1556,39 +1573,48 @@ static grpc_pollset_set* pollset_set_create(void) { return pss; } -static void pollset_set_destroy(grpc_pollset_set* pss) { +static void pollset_set_destroy(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pss) { gpr_mu_destroy(&pss->po.mu); if (pss->po.pi != nullptr) { - PI_UNREF(pss->po.pi, "pss_destroy"); + PI_UNREF(exec_ctx, pss->po.pi, "pss_destroy"); } gpr_free(pss); } -static void pollset_set_add_fd(grpc_pollset_set* pss, grpc_fd* fd) { - add_poll_object(&pss->po, POLL_OBJ_POLLSET_SET, &fd->po, POLL_OBJ_FD); +static void pollset_set_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset_set* pss, + grpc_fd* fd) { + add_poll_object(exec_ctx, &pss->po, POLL_OBJ_POLLSET_SET, &fd->po, + POLL_OBJ_FD); } -static void pollset_set_del_fd(grpc_pollset_set* pss, grpc_fd* fd) { +static void pollset_set_del_fd(grpc_exec_ctx* exec_ctx, grpc_pollset_set* pss, + grpc_fd* fd) { /* Nothing to do */ } -static void pollset_set_add_pollset(grpc_pollset_set* pss, grpc_pollset* ps) { - add_poll_object(&pss->po, POLL_OBJ_POLLSET_SET, &ps->po, POLL_OBJ_POLLSET); +static void pollset_set_add_pollset(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pss, grpc_pollset* ps) { + add_poll_object(exec_ctx, &pss->po, POLL_OBJ_POLLSET_SET, &ps->po, + POLL_OBJ_POLLSET); } -static void pollset_set_del_pollset(grpc_pollset_set* pss, grpc_pollset* ps) { +static void pollset_set_del_pollset(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pss, grpc_pollset* ps) { /* Nothing to do */ } -static void pollset_set_add_pollset_set(grpc_pollset_set* bag, +static void pollset_set_add_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* bag, grpc_pollset_set* item) { - add_poll_object(&bag->po, POLL_OBJ_POLLSET_SET, &item->po, + add_poll_object(exec_ctx, &bag->po, POLL_OBJ_POLLSET_SET, &item->po, POLL_OBJ_POLLSET_SET); } -static void pollset_set_del_pollset_set(grpc_pollset_set* bag, +static void pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* bag, grpc_pollset_set* item) { /* Nothing to do */ } @@ -1734,7 +1760,7 @@ const grpc_event_engine_vtable* grpc_init_epollsig_linux( bool explicit_request) { gpr_log(GPR_ERROR, "Skipping epollsig becuase GRPC_LINUX_EPOLL is not defined."); - return nullptr; + return NULL; } #endif /* defined(GRPC_POSIX_SOCKET) */ diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index 006e3ddd2f3..e32e1ba42a9 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -128,7 +128,8 @@ static uint32_t fd_begin_poll(grpc_fd* fd, grpc_pollset* pollset, MUST NOT be called with a pollset lock taken if got_read or got_write are 1, also does the become_{readable,writable} as appropriate. */ -static void fd_end_poll(grpc_fd_watcher* rec, int got_read, int got_write, +static void fd_end_poll(grpc_exec_ctx* exec_ctx, grpc_fd_watcher* rec, + int got_read, int got_write, grpc_pollset* read_notifier_pollset); /* Return 1 if this fd is orphaned, 0 otherwise */ @@ -185,9 +186,11 @@ struct grpc_pollset { }; /* Add an fd to a pollset */ -static void pollset_add_fd(grpc_pollset* pollset, struct grpc_fd* fd); +static void pollset_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + struct grpc_fd* fd); -static void pollset_set_add_fd(grpc_pollset_set* pollset_set, grpc_fd* fd); +static void pollset_set_add_fd(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set, grpc_fd* fd); /* Convert a timespec to milliseconds: - very small or negative poll times are clamped to zero to do a @@ -196,7 +199,8 @@ static void pollset_set_add_fd(grpc_pollset_set* pollset_set, grpc_fd* fd); - longer than a millisecond polls are rounded up to the next nearest millisecond to avoid spinning - infinite timeouts are converted to -1 */ -static int poll_deadline_to_millis_timeout(grpc_millis deadline); +static int poll_deadline_to_millis_timeout(grpc_exec_ctx* exec_ctx, + grpc_millis deadline); /* Allow kick to wakeup the currently polling worker */ #define GRPC_POLLSET_CAN_KICK_SELF 1 @@ -204,7 +208,7 @@ static int poll_deadline_to_millis_timeout(grpc_millis deadline); #define GRPC_POLLSET_REEVALUATE_POLLING_ON_WAKEUP 2 /* As per pollset_kick, with an extended set of flags (defined above) -- mostly for fd_posix's use. */ -static grpc_error* pollset_kick_ext(grpc_pollset* p, +static grpc_error* pollset_kick_ext(grpc_exec_ctx* exec_ctx, grpc_pollset* p, grpc_pollset_worker* specific_worker, uint32_t flags) GRPC_MUST_USE_RESULT; @@ -349,7 +353,8 @@ static bool fd_is_orphaned(grpc_fd* fd) { } /* Return the read-notifier pollset */ -static grpc_pollset* fd_get_read_notifier_pollset(grpc_fd* fd) { +static grpc_pollset* fd_get_read_notifier_pollset(grpc_exec_ctx* exec_ctx, + grpc_fd* fd) { grpc_pollset* notifier = nullptr; gpr_mu_lock(&fd->mu); @@ -359,36 +364,39 @@ static grpc_pollset* fd_get_read_notifier_pollset(grpc_fd* fd) { return notifier; } -static grpc_error* pollset_kick_locked(grpc_fd_watcher* watcher) { +static grpc_error* pollset_kick_locked(grpc_exec_ctx* exec_ctx, + grpc_fd_watcher* watcher) { gpr_mu_lock(&watcher->pollset->mu); GPR_ASSERT(watcher->worker); - grpc_error* err = pollset_kick_ext(watcher->pollset, watcher->worker, - GRPC_POLLSET_REEVALUATE_POLLING_ON_WAKEUP); + grpc_error* err = + pollset_kick_ext(exec_ctx, watcher->pollset, watcher->worker, + GRPC_POLLSET_REEVALUATE_POLLING_ON_WAKEUP); gpr_mu_unlock(&watcher->pollset->mu); return err; } -static void maybe_wake_one_watcher_locked(grpc_fd* fd) { +static void maybe_wake_one_watcher_locked(grpc_exec_ctx* exec_ctx, + grpc_fd* fd) { if (fd->inactive_watcher_root.next != &fd->inactive_watcher_root) { - pollset_kick_locked(fd->inactive_watcher_root.next); + pollset_kick_locked(exec_ctx, fd->inactive_watcher_root.next); } else if (fd->read_watcher) { - pollset_kick_locked(fd->read_watcher); + pollset_kick_locked(exec_ctx, fd->read_watcher); } else if (fd->write_watcher) { - pollset_kick_locked(fd->write_watcher); + pollset_kick_locked(exec_ctx, fd->write_watcher); } } -static void wake_all_watchers_locked(grpc_fd* fd) { +static void wake_all_watchers_locked(grpc_exec_ctx* exec_ctx, grpc_fd* fd) { grpc_fd_watcher* watcher; for (watcher = fd->inactive_watcher_root.next; watcher != &fd->inactive_watcher_root; watcher = watcher->next) { - pollset_kick_locked(watcher); + pollset_kick_locked(exec_ctx, watcher); } if (fd->read_watcher) { - pollset_kick_locked(fd->read_watcher); + pollset_kick_locked(exec_ctx, fd->read_watcher); } if (fd->write_watcher && fd->write_watcher != fd->read_watcher) { - pollset_kick_locked(fd->write_watcher); + pollset_kick_locked(exec_ctx, fd->write_watcher); } } @@ -397,12 +405,12 @@ static int has_watchers(grpc_fd* fd) { fd->inactive_watcher_root.next != &fd->inactive_watcher_root; } -static void close_fd_locked(grpc_fd* fd) { +static void close_fd_locked(grpc_exec_ctx* exec_ctx, grpc_fd* fd) { fd->closed = 1; if (!fd->released) { close(fd->fd); } - GRPC_CLOSURE_SCHED(fd->on_done_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, fd->on_done_closure, GRPC_ERROR_NONE); } static int fd_wrapped_fd(grpc_fd* fd) { @@ -413,7 +421,8 @@ static int fd_wrapped_fd(grpc_fd* fd) { } } -static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, +static void fd_orphan(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_closure* on_done, int* release_fd, bool already_closed, const char* reason) { fd->on_done_closure = on_done; fd->released = release_fd != nullptr; @@ -426,9 +435,9 @@ static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, gpr_mu_lock(&fd->mu); REF_BY(fd, 1, reason); /* remove active status, but keep referenced */ if (!has_watchers(fd)) { - close_fd_locked(fd); + close_fd_locked(exec_ctx, fd); } else { - wake_all_watchers_locked(fd); + wake_all_watchers_locked(exec_ctx, fd); } gpr_mu_unlock(&fd->mu); UNREF_BY(fd, 2, reason); /* drop the reference */ @@ -460,10 +469,10 @@ static grpc_error* fd_shutdown_error(grpc_fd* fd) { } } -static void notify_on_locked(grpc_fd* fd, grpc_closure** st, - grpc_closure* closure) { +static void notify_on_locked(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_closure** st, grpc_closure* closure) { if (fd->shutdown) { - GRPC_CLOSURE_SCHED(closure, + GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_CREATE_FROM_STATIC_STRING("FD shutdown")); } else if (*st == CLOSURE_NOT_READY) { /* not ready ==> switch to a waiting state by setting the closure */ @@ -471,8 +480,8 @@ static void notify_on_locked(grpc_fd* fd, grpc_closure** st, } else if (*st == CLOSURE_READY) { /* already ready ==> queue the closure to run immediately */ *st = CLOSURE_NOT_READY; - GRPC_CLOSURE_SCHED(closure, fd_shutdown_error(fd)); - maybe_wake_one_watcher_locked(fd); + GRPC_CLOSURE_SCHED(exec_ctx, closure, fd_shutdown_error(fd)); + maybe_wake_one_watcher_locked(exec_ctx, fd); } else { /* upcallptr was set to a different closure. This is an error! */ gpr_log(GPR_ERROR, @@ -483,7 +492,8 @@ static void notify_on_locked(grpc_fd* fd, grpc_closure** st, } /* returns 1 if state becomes not ready */ -static int set_ready_locked(grpc_fd* fd, grpc_closure** st) { +static int set_ready_locked(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_closure** st) { if (*st == CLOSURE_READY) { /* duplicate ready ==> ignore */ return 0; @@ -493,18 +503,18 @@ static int set_ready_locked(grpc_fd* fd, grpc_closure** st) { return 0; } else { /* waiting ==> queue closure */ - GRPC_CLOSURE_SCHED(*st, fd_shutdown_error(fd)); + GRPC_CLOSURE_SCHED(exec_ctx, *st, fd_shutdown_error(fd)); *st = CLOSURE_NOT_READY; return 1; } } static void set_read_notifier_pollset_locked( - grpc_fd* fd, grpc_pollset* read_notifier_pollset) { + grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_pollset* read_notifier_pollset) { fd->read_notifier_pollset = read_notifier_pollset; } -static void fd_shutdown(grpc_fd* fd, grpc_error* why) { +static void fd_shutdown(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_error* why) { gpr_mu_lock(&fd->mu); /* only shutdown once */ if (!fd->shutdown) { @@ -512,8 +522,8 @@ static void fd_shutdown(grpc_fd* fd, grpc_error* why) { fd->shutdown_error = why; /* signal read/write closed to OS so that future operations fail */ shutdown(fd->fd, SHUT_RDWR); - set_ready_locked(fd, &fd->read_closure); - set_ready_locked(fd, &fd->write_closure); + set_ready_locked(exec_ctx, fd, &fd->read_closure); + set_ready_locked(exec_ctx, fd, &fd->write_closure); } else { GRPC_ERROR_UNREF(why); } @@ -527,15 +537,17 @@ static bool fd_is_shutdown(grpc_fd* fd) { return r; } -static void fd_notify_on_read(grpc_fd* fd, grpc_closure* closure) { +static void fd_notify_on_read(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_closure* closure) { gpr_mu_lock(&fd->mu); - notify_on_locked(fd, &fd->read_closure, closure); + notify_on_locked(exec_ctx, fd, &fd->read_closure, closure); gpr_mu_unlock(&fd->mu); } -static void fd_notify_on_write(grpc_fd* fd, grpc_closure* closure) { +static void fd_notify_on_write(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_closure* closure) { gpr_mu_lock(&fd->mu); - notify_on_locked(fd, &fd->write_closure, closure); + notify_on_locked(exec_ctx, fd, &fd->write_closure, closure); gpr_mu_unlock(&fd->mu); } @@ -590,7 +602,8 @@ static uint32_t fd_begin_poll(grpc_fd* fd, grpc_pollset* pollset, return mask; } -static void fd_end_poll(grpc_fd_watcher* watcher, int got_read, int got_write, +static void fd_end_poll(grpc_exec_ctx* exec_ctx, grpc_fd_watcher* watcher, + int got_read, int got_write, grpc_pollset* read_notifier_pollset) { int was_polling = 0; int kick = 0; @@ -624,23 +637,23 @@ static void fd_end_poll(grpc_fd_watcher* watcher, int got_read, int got_write, watcher->prev->next = watcher->next; } if (got_read) { - if (set_ready_locked(fd, &fd->read_closure)) { + if (set_ready_locked(exec_ctx, fd, &fd->read_closure)) { kick = 1; } if (read_notifier_pollset != nullptr) { - set_read_notifier_pollset_locked(fd, read_notifier_pollset); + set_read_notifier_pollset_locked(exec_ctx, fd, read_notifier_pollset); } } if (got_write) { - if (set_ready_locked(fd, &fd->write_closure)) { + if (set_ready_locked(exec_ctx, fd, &fd->write_closure)) { kick = 1; } } if (kick) { - maybe_wake_one_watcher_locked(fd); + maybe_wake_one_watcher_locked(exec_ctx, fd); } if (fd_is_orphaned(fd) && !has_watchers(fd) && !fd->closed) { - close_fd_locked(fd); + close_fd_locked(exec_ctx, fd); } gpr_mu_unlock(&fd->mu); @@ -701,12 +714,12 @@ static void kick_append_error(grpc_error** composite, grpc_error* error) { *composite = grpc_error_add_child(*composite, error); } -static grpc_error* pollset_kick_ext(grpc_pollset* p, +static grpc_error* pollset_kick_ext(grpc_exec_ctx* exec_ctx, grpc_pollset* p, grpc_pollset_worker* specific_worker, uint32_t flags) { GPR_TIMER_BEGIN("pollset_kick_ext", 0); grpc_error* error = GRPC_ERROR_NONE; - GRPC_STATS_INC_POLLSET_KICK(); + GRPC_STATS_INC_POLLSET_KICK(exec_ctx); /* pollset->mu already held */ if (specific_worker != nullptr) { @@ -772,9 +785,9 @@ static grpc_error* pollset_kick_ext(grpc_pollset* p, return error; } -static grpc_error* pollset_kick(grpc_pollset* p, +static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* p, grpc_pollset_worker* specific_worker) { - return pollset_kick_ext(p, specific_worker, 0); + return pollset_kick_ext(exec_ctx, p, specific_worker, 0); } /* global state management */ @@ -808,7 +821,7 @@ static void pollset_init(grpc_pollset* pollset, gpr_mu** mu) { pollset->pollset_set_count = 0; } -static void pollset_destroy(grpc_pollset* pollset) { +static void pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset) { GPR_ASSERT(!pollset_has_workers(pollset)); GPR_ASSERT(pollset->idle_jobs.head == pollset->idle_jobs.tail); while (pollset->local_wakeup_cache) { @@ -821,7 +834,8 @@ static void pollset_destroy(grpc_pollset* pollset) { gpr_mu_destroy(&pollset->mu); } -static void pollset_add_fd(grpc_pollset* pollset, grpc_fd* fd) { +static void pollset_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_fd* fd) { gpr_mu_lock(&pollset->mu); size_t i; /* TODO(ctiller): this is O(num_fds^2); maybe switch to a hash set here */ @@ -836,19 +850,19 @@ static void pollset_add_fd(grpc_pollset* pollset, grpc_fd* fd) { } pollset->fds[pollset->fd_count++] = fd; GRPC_FD_REF(fd, "multipoller"); - pollset_kick(pollset, nullptr); + pollset_kick(exec_ctx, pollset, nullptr); exit: gpr_mu_unlock(&pollset->mu); } -static void finish_shutdown(grpc_pollset* pollset) { +static void finish_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset) { GPR_ASSERT(grpc_closure_list_empty(pollset->idle_jobs)); size_t i; for (i = 0; i < pollset->fd_count; i++) { GRPC_FD_UNREF(pollset->fds[i], "multipoller"); } pollset->fd_count = 0; - GRPC_CLOSURE_SCHED(pollset->shutdown_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, pollset->shutdown_done, GRPC_ERROR_NONE); } static void work_combine_error(grpc_error** composite, grpc_error* error) { @@ -859,7 +873,7 @@ static void work_combine_error(grpc_error** composite, grpc_error* error) { *composite = grpc_error_add_child(*composite, error); } -static grpc_error* pollset_work(grpc_pollset* pollset, +static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, grpc_pollset_worker** worker_hdl, grpc_millis deadline) { grpc_pollset_worker worker; @@ -898,7 +912,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, if (!pollset_has_workers(pollset) && !grpc_closure_list_empty(pollset->idle_jobs)) { GPR_TIMER_MARK("pollset_work.idle_jobs", 0); - GRPC_CLOSURE_LIST_SCHED(&pollset->idle_jobs); + GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pollset->idle_jobs); goto done; } /* If we're shutting down then we don't execute any extended work */ @@ -930,7 +944,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, grpc_fd_watcher* watchers; struct pollfd* pfds; - timeout = poll_deadline_to_millis_timeout(deadline); + timeout = poll_deadline_to_millis_timeout(exec_ctx, deadline); if (pollset->fd_count + 2 <= inline_elements) { pfds = pollfd_space; @@ -974,9 +988,9 @@ static grpc_error* pollset_work(grpc_pollset* pollset, /* TODO(vpai): Consider first doing a 0 timeout poll here to avoid even going into the blocking annotation if possible */ GRPC_SCHEDULING_START_BLOCKING_REGION; - GRPC_STATS_INC_SYSCALL_POLL(); + GRPC_STATS_INC_SYSCALL_POLL(exec_ctx); r = grpc_poll_function(pfds, pfd_count, timeout); - GRPC_SCHEDULING_END_BLOCKING_REGION; + GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(exec_ctx); if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "%p poll=%d", pollset, r); @@ -989,16 +1003,16 @@ static grpc_error* pollset_work(grpc_pollset* pollset, for (i = 1; i < pfd_count; i++) { if (watchers[i].fd == nullptr) { - fd_end_poll(&watchers[i], 0, 0, nullptr); + fd_end_poll(exec_ctx, &watchers[i], 0, 0, nullptr); } else { // Wake up all the file descriptors, if we have an invalid one // we can identify it on the next pollset_work() - fd_end_poll(&watchers[i], 1, 1, pollset); + fd_end_poll(exec_ctx, &watchers[i], 1, 1, pollset); } } } else if (r == 0) { for (i = 1; i < pfd_count; i++) { - fd_end_poll(&watchers[i], 0, 0, nullptr); + fd_end_poll(exec_ctx, &watchers[i], 0, 0, nullptr); } } else { if (pfds[0].revents & POLLIN_CHECK) { @@ -1010,14 +1024,14 @@ static grpc_error* pollset_work(grpc_pollset* pollset, } for (i = 1; i < pfd_count; i++) { if (watchers[i].fd == nullptr) { - fd_end_poll(&watchers[i], 0, 0, nullptr); + fd_end_poll(exec_ctx, &watchers[i], 0, 0, nullptr); } else { if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "%p got_event: %d r:%d w:%d [%d]", pollset, pfds[i].fd, (pfds[i].revents & POLLIN_CHECK) != 0, (pfds[i].revents & POLLOUT_CHECK) != 0, pfds[i].revents); } - fd_end_poll(&watchers[i], pfds[i].revents & POLLIN_CHECK, + fd_end_poll(exec_ctx, &watchers[i], pfds[i].revents & POLLIN_CHECK, pfds[i].revents & POLLOUT_CHECK, pollset); } } @@ -1040,7 +1054,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, worker list, which means nobody could ask us to re-evaluate polling). */ done: if (!locked) { - queued_work |= grpc_core::ExecCtx::Get()->Flush(); + queued_work |= grpc_exec_ctx_flush(exec_ctx); gpr_mu_lock(&pollset->mu); locked = 1; } @@ -1069,21 +1083,21 @@ static grpc_error* pollset_work(grpc_pollset* pollset, /* check shutdown conditions */ if (pollset->shutting_down) { if (pollset_has_workers(pollset)) { - pollset_kick(pollset, nullptr); + pollset_kick(exec_ctx, pollset, nullptr); } else if (!pollset->called_shutdown && !pollset_has_observers(pollset)) { pollset->called_shutdown = 1; gpr_mu_unlock(&pollset->mu); - finish_shutdown(pollset); - grpc_core::ExecCtx::Get()->Flush(); + finish_shutdown(exec_ctx, pollset); + grpc_exec_ctx_flush(exec_ctx); /* Continuing to access pollset here is safe -- it is the caller's * responsibility to not destroy when it has outstanding calls to * pollset_work. * TODO(dklempner): Can we refactor the shutdown logic to avoid this? */ gpr_mu_lock(&pollset->mu); } else if (!grpc_closure_list_empty(pollset->idle_jobs)) { - GRPC_CLOSURE_LIST_SCHED(&pollset->idle_jobs); + GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pollset->idle_jobs); gpr_mu_unlock(&pollset->mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(exec_ctx); gpr_mu_lock(&pollset->mu); } } @@ -1093,24 +1107,26 @@ static grpc_error* pollset_work(grpc_pollset* pollset, return error; } -static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { +static void pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_closure* closure) { GPR_ASSERT(!pollset->shutting_down); pollset->shutting_down = 1; pollset->shutdown_done = closure; - pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); + pollset_kick(exec_ctx, pollset, GRPC_POLLSET_KICK_BROADCAST); if (!pollset_has_workers(pollset)) { - GRPC_CLOSURE_LIST_SCHED(&pollset->idle_jobs); + GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pollset->idle_jobs); } if (!pollset->called_shutdown && !pollset_has_observers(pollset)) { pollset->called_shutdown = 1; - finish_shutdown(pollset); + finish_shutdown(exec_ctx, pollset); } } -static int poll_deadline_to_millis_timeout(grpc_millis deadline) { +static int poll_deadline_to_millis_timeout(grpc_exec_ctx* exec_ctx, + grpc_millis deadline) { if (deadline == GRPC_MILLIS_INF_FUTURE) return -1; if (deadline == 0) return 0; - grpc_millis n = deadline - grpc_core::ExecCtx::Get()->Now(); + grpc_millis n = deadline - grpc_exec_ctx_now(exec_ctx); if (n < 0) return 0; if (n > INT_MAX) return -1; return (int)n; @@ -1127,7 +1143,8 @@ static grpc_pollset_set* pollset_set_create(void) { return pollset_set; } -static void pollset_set_destroy(grpc_pollset_set* pollset_set) { +static void pollset_set_destroy(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set) { size_t i; gpr_mu_destroy(&pollset_set->mu); for (i = 0; i < pollset_set->fd_count; i++) { @@ -1142,7 +1159,7 @@ static void pollset_set_destroy(grpc_pollset_set* pollset_set) { !pollset_has_observers(pollset)) { pollset->called_shutdown = 1; gpr_mu_unlock(&pollset->mu); - finish_shutdown(pollset); + finish_shutdown(exec_ctx, pollset); } else { gpr_mu_unlock(&pollset->mu); } @@ -1153,7 +1170,8 @@ static void pollset_set_destroy(grpc_pollset_set* pollset_set) { gpr_free(pollset_set); } -static void pollset_set_add_pollset(grpc_pollset_set* pollset_set, +static void pollset_set_add_pollset(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set, grpc_pollset* pollset) { size_t i, j; gpr_mu_lock(&pollset->mu); @@ -1172,7 +1190,7 @@ static void pollset_set_add_pollset(grpc_pollset_set* pollset_set, if (fd_is_orphaned(pollset_set->fds[i])) { GRPC_FD_UNREF(pollset_set->fds[i], "pollset_set"); } else { - pollset_add_fd(pollset, pollset_set->fds[i]); + pollset_add_fd(exec_ctx, pollset, pollset_set->fds[i]); pollset_set->fds[j++] = pollset_set->fds[i]; } } @@ -1180,7 +1198,8 @@ static void pollset_set_add_pollset(grpc_pollset_set* pollset_set, gpr_mu_unlock(&pollset_set->mu); } -static void pollset_set_del_pollset(grpc_pollset_set* pollset_set, +static void pollset_set_del_pollset(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set, grpc_pollset* pollset) { size_t i; gpr_mu_lock(&pollset_set->mu); @@ -1200,13 +1219,14 @@ static void pollset_set_del_pollset(grpc_pollset_set* pollset_set, !pollset_has_observers(pollset)) { pollset->called_shutdown = 1; gpr_mu_unlock(&pollset->mu); - finish_shutdown(pollset); + finish_shutdown(exec_ctx, pollset); } else { gpr_mu_unlock(&pollset->mu); } } -static void pollset_set_add_pollset_set(grpc_pollset_set* bag, +static void pollset_set_add_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* bag, grpc_pollset_set* item) { size_t i, j; gpr_mu_lock(&bag->mu); @@ -1221,7 +1241,7 @@ static void pollset_set_add_pollset_set(grpc_pollset_set* bag, if (fd_is_orphaned(bag->fds[i])) { GRPC_FD_UNREF(bag->fds[i], "pollset_set"); } else { - pollset_set_add_fd(item, bag->fds[i]); + pollset_set_add_fd(exec_ctx, item, bag->fds[i]); bag->fds[j++] = bag->fds[i]; } } @@ -1229,7 +1249,8 @@ static void pollset_set_add_pollset_set(grpc_pollset_set* bag, gpr_mu_unlock(&bag->mu); } -static void pollset_set_del_pollset_set(grpc_pollset_set* bag, +static void pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* bag, grpc_pollset_set* item) { size_t i; gpr_mu_lock(&bag->mu); @@ -1244,7 +1265,8 @@ static void pollset_set_del_pollset_set(grpc_pollset_set* bag, gpr_mu_unlock(&bag->mu); } -static void pollset_set_add_fd(grpc_pollset_set* pollset_set, grpc_fd* fd) { +static void pollset_set_add_fd(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set, grpc_fd* fd) { size_t i; gpr_mu_lock(&pollset_set->mu); if (pollset_set->fd_count == pollset_set->fd_capacity) { @@ -1255,15 +1277,16 @@ static void pollset_set_add_fd(grpc_pollset_set* pollset_set, grpc_fd* fd) { GRPC_FD_REF(fd, "pollset_set"); pollset_set->fds[pollset_set->fd_count++] = fd; for (i = 0; i < pollset_set->pollset_count; i++) { - pollset_add_fd(pollset_set->pollsets[i], fd); + pollset_add_fd(exec_ctx, pollset_set->pollsets[i], fd); } for (i = 0; i < pollset_set->pollset_set_count; i++) { - pollset_set_add_fd(pollset_set->pollset_sets[i], fd); + pollset_set_add_fd(exec_ctx, pollset_set->pollset_sets[i], fd); } gpr_mu_unlock(&pollset_set->mu); } -static void pollset_set_del_fd(grpc_pollset_set* pollset_set, grpc_fd* fd) { +static void pollset_set_del_fd(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set, grpc_fd* fd) { size_t i; gpr_mu_lock(&pollset_set->mu); for (i = 0; i < pollset_set->fd_count; i++) { @@ -1276,7 +1299,7 @@ static void pollset_set_del_fd(grpc_pollset_set* pollset_set, grpc_fd* fd) { } } for (i = 0; i < pollset_set->pollset_set_count; i++) { - pollset_set_del_fd(pollset_set->pollset_sets[i], fd); + pollset_set_del_fd(exec_ctx, pollset_set->pollset_sets[i], fd); } gpr_mu_unlock(&pollset_set->mu); } diff --git a/src/core/lib/iomgr/ev_posix.cc b/src/core/lib/iomgr/ev_posix.cc index b516f93058a..031c97564a5 100644 --- a/src/core/lib/iomgr/ev_posix.cc +++ b/src/core/lib/iomgr/ev_posix.cc @@ -46,7 +46,7 @@ grpc_poll_function_type grpc_poll_function = poll; grpc_wakeup_fd grpc_global_wakeup_fd; -static const grpc_event_engine_vtable* g_event_engine = nullptr; +static const grpc_event_engine_vtable* g_event_engine; static const char* g_poll_strategy_name = nullptr; typedef const grpc_event_engine_vtable* (*event_engine_factory_fn)( @@ -184,25 +184,28 @@ int grpc_fd_wrapped_fd(grpc_fd* fd) { return g_event_engine->fd_wrapped_fd(fd); } -void grpc_fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, - bool already_closed, const char* reason) { - g_event_engine->fd_orphan(fd, on_done, release_fd, already_closed, reason); +void grpc_fd_orphan(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_closure* on_done, + int* release_fd, bool already_closed, const char* reason) { + g_event_engine->fd_orphan(exec_ctx, fd, on_done, release_fd, already_closed, + reason); } -void grpc_fd_shutdown(grpc_fd* fd, grpc_error* why) { - g_event_engine->fd_shutdown(fd, why); +void grpc_fd_shutdown(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_error* why) { + g_event_engine->fd_shutdown(exec_ctx, fd, why); } bool grpc_fd_is_shutdown(grpc_fd* fd) { return g_event_engine->fd_is_shutdown(fd); } -void grpc_fd_notify_on_read(grpc_fd* fd, grpc_closure* closure) { - g_event_engine->fd_notify_on_read(fd, closure); +void grpc_fd_notify_on_read(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_closure* closure) { + g_event_engine->fd_notify_on_read(exec_ctx, fd, closure); } -void grpc_fd_notify_on_write(grpc_fd* fd, grpc_closure* closure) { - g_event_engine->fd_notify_on_write(fd, closure); +void grpc_fd_notify_on_write(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_closure* closure) { + g_event_engine->fd_notify_on_write(exec_ctx, fd, closure); } size_t grpc_pollset_size(void) { return g_event_engine->pollset_size; } @@ -211,63 +214,72 @@ void grpc_pollset_init(grpc_pollset* pollset, gpr_mu** mu) { g_event_engine->pollset_init(pollset, mu); } -void grpc_pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { - g_event_engine->pollset_shutdown(pollset, closure); +void grpc_pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_closure* closure) { + g_event_engine->pollset_shutdown(exec_ctx, pollset, closure); } -void grpc_pollset_destroy(grpc_pollset* pollset) { - g_event_engine->pollset_destroy(pollset); +void grpc_pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset) { + g_event_engine->pollset_destroy(exec_ctx, pollset); } -grpc_error* grpc_pollset_work(grpc_pollset* pollset, +grpc_error* grpc_pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, grpc_pollset_worker** worker, grpc_millis deadline) { - return g_event_engine->pollset_work(pollset, worker, deadline); + return g_event_engine->pollset_work(exec_ctx, pollset, worker, deadline); } -grpc_error* grpc_pollset_kick(grpc_pollset* pollset, +grpc_error* grpc_pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, grpc_pollset_worker* specific_worker) { - return g_event_engine->pollset_kick(pollset, specific_worker); + return g_event_engine->pollset_kick(exec_ctx, pollset, specific_worker); } -void grpc_pollset_add_fd(grpc_pollset* pollset, struct grpc_fd* fd) { - g_event_engine->pollset_add_fd(pollset, fd); +void grpc_pollset_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + struct grpc_fd* fd) { + g_event_engine->pollset_add_fd(exec_ctx, pollset, fd); } grpc_pollset_set* grpc_pollset_set_create(void) { return g_event_engine->pollset_set_create(); } -void grpc_pollset_set_destroy(grpc_pollset_set* pollset_set) { - g_event_engine->pollset_set_destroy(pollset_set); +void grpc_pollset_set_destroy(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set) { + g_event_engine->pollset_set_destroy(exec_ctx, pollset_set); } -void grpc_pollset_set_add_pollset(grpc_pollset_set* pollset_set, +void grpc_pollset_set_add_pollset(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set, grpc_pollset* pollset) { - g_event_engine->pollset_set_add_pollset(pollset_set, pollset); + g_event_engine->pollset_set_add_pollset(exec_ctx, pollset_set, pollset); } -void grpc_pollset_set_del_pollset(grpc_pollset_set* pollset_set, +void grpc_pollset_set_del_pollset(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set, grpc_pollset* pollset) { - g_event_engine->pollset_set_del_pollset(pollset_set, pollset); + g_event_engine->pollset_set_del_pollset(exec_ctx, pollset_set, pollset); } -void grpc_pollset_set_add_pollset_set(grpc_pollset_set* bag, +void grpc_pollset_set_add_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* bag, grpc_pollset_set* item) { - g_event_engine->pollset_set_add_pollset_set(bag, item); + g_event_engine->pollset_set_add_pollset_set(exec_ctx, bag, item); } -void grpc_pollset_set_del_pollset_set(grpc_pollset_set* bag, +void grpc_pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* bag, grpc_pollset_set* item) { - g_event_engine->pollset_set_del_pollset_set(bag, item); + g_event_engine->pollset_set_del_pollset_set(exec_ctx, bag, item); } -void grpc_pollset_set_add_fd(grpc_pollset_set* pollset_set, grpc_fd* fd) { - g_event_engine->pollset_set_add_fd(pollset_set, fd); +void grpc_pollset_set_add_fd(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set, grpc_fd* fd) { + g_event_engine->pollset_set_add_fd(exec_ctx, pollset_set, fd); } -void grpc_pollset_set_del_fd(grpc_pollset_set* pollset_set, grpc_fd* fd) { - g_event_engine->pollset_set_del_fd(pollset_set, fd); +void grpc_pollset_set_del_fd(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set, grpc_fd* fd) { + g_event_engine->pollset_set_del_fd(exec_ctx, pollset_set, fd); } #endif // GRPC_POSIX_SOCKET diff --git a/src/core/lib/iomgr/ev_posix.h b/src/core/lib/iomgr/ev_posix.h index 62f1162a23f..16fa10ca568 100644 --- a/src/core/lib/iomgr/ev_posix.h +++ b/src/core/lib/iomgr/ev_posix.h @@ -36,36 +36,48 @@ typedef struct grpc_event_engine_vtable { grpc_fd* (*fd_create)(int fd, const char* name); int (*fd_wrapped_fd)(grpc_fd* fd); - void (*fd_orphan)(grpc_fd* fd, grpc_closure* on_done, int* release_fd, - bool already_closed, const char* reason); - void (*fd_shutdown)(grpc_fd* fd, grpc_error* why); - void (*fd_notify_on_read)(grpc_fd* fd, grpc_closure* closure); - void (*fd_notify_on_write)(grpc_fd* fd, grpc_closure* closure); + void (*fd_orphan)(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_closure* on_done, + int* release_fd, bool already_closed, const char* reason); + void (*fd_shutdown)(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_error* why); + void (*fd_notify_on_read)(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_closure* closure); + void (*fd_notify_on_write)(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_closure* closure); bool (*fd_is_shutdown)(grpc_fd* fd); - grpc_pollset* (*fd_get_read_notifier_pollset)(grpc_fd* fd); + grpc_pollset* (*fd_get_read_notifier_pollset)(grpc_exec_ctx* exec_ctx, + grpc_fd* fd); void (*pollset_init)(grpc_pollset* pollset, gpr_mu** mu); - void (*pollset_shutdown)(grpc_pollset* pollset, grpc_closure* closure); - void (*pollset_destroy)(grpc_pollset* pollset); - grpc_error* (*pollset_work)(grpc_pollset* pollset, + void (*pollset_shutdown)(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_closure* closure); + void (*pollset_destroy)(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset); + grpc_error* (*pollset_work)(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, grpc_pollset_worker** worker, grpc_millis deadline); - grpc_error* (*pollset_kick)(grpc_pollset* pollset, + grpc_error* (*pollset_kick)(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, grpc_pollset_worker* specific_worker); - void (*pollset_add_fd)(grpc_pollset* pollset, struct grpc_fd* fd); + void (*pollset_add_fd)(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + struct grpc_fd* fd); grpc_pollset_set* (*pollset_set_create)(void); - void (*pollset_set_destroy)(grpc_pollset_set* pollset_set); - void (*pollset_set_add_pollset)(grpc_pollset_set* pollset_set, + void (*pollset_set_destroy)(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set); + void (*pollset_set_add_pollset)(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set, grpc_pollset* pollset); - void (*pollset_set_del_pollset)(grpc_pollset_set* pollset_set, + void (*pollset_set_del_pollset)(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set, grpc_pollset* pollset); - void (*pollset_set_add_pollset_set)(grpc_pollset_set* bag, + void (*pollset_set_add_pollset_set)(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* bag, grpc_pollset_set* item); - void (*pollset_set_del_pollset_set)(grpc_pollset_set* bag, + void (*pollset_set_del_pollset_set)(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* bag, grpc_pollset_set* item); - void (*pollset_set_add_fd)(grpc_pollset_set* pollset_set, grpc_fd* fd); - void (*pollset_set_del_fd)(grpc_pollset_set* pollset_set, grpc_fd* fd); + void (*pollset_set_add_fd)(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set, grpc_fd* fd); + void (*pollset_set_del_fd)(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set, grpc_fd* fd); void (*shutdown_engine)(void); } grpc_event_engine_vtable; @@ -91,14 +103,14 @@ int grpc_fd_wrapped_fd(grpc_fd* fd); Requires: *fd initialized; no outstanding notify_on_read or notify_on_write. MUST NOT be called with a pollset lock taken */ -void grpc_fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, - bool already_closed, const char* reason); +void grpc_fd_orphan(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_closure* on_done, + int* release_fd, bool already_closed, const char* reason); /* Has grpc_fd_shutdown been called on an fd? */ bool grpc_fd_is_shutdown(grpc_fd* fd); /* Cause any current and future callbacks to fail. */ -void grpc_fd_shutdown(grpc_fd* fd, grpc_error* why); +void grpc_fd_shutdown(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_error* why); /* Register read interest, causing read_cb to be called once when fd becomes readable, on deadline specified by deadline, or on shutdown triggered by @@ -113,23 +125,29 @@ void grpc_fd_shutdown(grpc_fd* fd, grpc_error* why); underlying platform. This means that users must drain fd in read_cb before calling notify_on_read again. Users are also expected to handle spurious events, i.e read_cb is called while nothing can be readable from fd */ -void grpc_fd_notify_on_read(grpc_fd* fd, grpc_closure* closure); +void grpc_fd_notify_on_read(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_closure* closure); /* Exactly the same semantics as above, except based on writable events. */ -void grpc_fd_notify_on_write(grpc_fd* fd, grpc_closure* closure); +void grpc_fd_notify_on_write(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + grpc_closure* closure); /* Return the read notifier pollset from the fd */ -grpc_pollset* grpc_fd_get_read_notifier_pollset(grpc_fd* fd); +grpc_pollset* grpc_fd_get_read_notifier_pollset(grpc_exec_ctx* exec_ctx, + grpc_fd* fd); /* pollset_posix functions */ /* Add an fd to a pollset */ -void grpc_pollset_add_fd(grpc_pollset* pollset, struct grpc_fd* fd); +void grpc_pollset_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + struct grpc_fd* fd); /* pollset_set_posix functions */ -void grpc_pollset_set_add_fd(grpc_pollset_set* pollset_set, grpc_fd* fd); -void grpc_pollset_set_del_fd(grpc_pollset_set* pollset_set, grpc_fd* fd); +void grpc_pollset_set_add_fd(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set, grpc_fd* fd); +void grpc_pollset_set_del_fd(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set, grpc_fd* fd); /* override to allow tests to hook poll() usage */ typedef int (*grpc_poll_function_type)(struct pollfd*, nfds_t, int); diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index e005437e0a8..17774563421 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -25,7 +25,39 @@ #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/profiling/timers.h" -static void exec_ctx_run(grpc_closure* closure, grpc_error* error) { +bool grpc_exec_ctx_ready_to_finish(grpc_exec_ctx* exec_ctx) { + if ((exec_ctx->flags & GRPC_EXEC_CTX_FLAG_IS_FINISHED) == 0) { + if (exec_ctx->check_ready_to_finish(exec_ctx, + exec_ctx->check_ready_to_finish_arg)) { + exec_ctx->flags |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; + return true; + } + return false; + } else { + return true; + } +} + +bool grpc_never_ready_to_finish(grpc_exec_ctx* exec_ctx, void* arg_ignored) { + return false; +} + +bool grpc_always_ready_to_finish(grpc_exec_ctx* exec_ctx, void* arg_ignored) { + return true; +} + +bool grpc_exec_ctx_has_work(grpc_exec_ctx* exec_ctx) { + return exec_ctx->active_combiner != nullptr || + !grpc_closure_list_empty(exec_ctx->closure_list); +} + +void grpc_exec_ctx_finish(grpc_exec_ctx* exec_ctx) { + exec_ctx->flags |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; + grpc_exec_ctx_flush(exec_ctx); +} + +static void exec_ctx_run(grpc_exec_ctx* exec_ctx, grpc_closure* closure, + grpc_error* error) { #ifndef NDEBUG closure->scheduled = false; if (grpc_trace_closure.enabled()) { @@ -35,7 +67,7 @@ static void exec_ctx_run(grpc_closure* closure, grpc_error* error) { closure->line_initiated); } #endif - closure->cb(closure->cb_arg, error); + closure->cb(exec_ctx, closure->cb_arg, error); #ifndef NDEBUG if (grpc_trace_closure.enabled()) { gpr_log(GPR_DEBUG, "closure %p finished", closure); @@ -44,13 +76,42 @@ static void exec_ctx_run(grpc_closure* closure, grpc_error* error) { GRPC_ERROR_UNREF(error); } -static void exec_ctx_sched(grpc_closure* closure, grpc_error* error) { - grpc_closure_list_append(grpc_core::ExecCtx::Get()->closure_list(), closure, - error); +bool grpc_exec_ctx_flush(grpc_exec_ctx* exec_ctx) { + bool did_something = 0; + GPR_TIMER_BEGIN("grpc_exec_ctx_flush", 0); + for (;;) { + if (!grpc_closure_list_empty(exec_ctx->closure_list)) { + grpc_closure* c = exec_ctx->closure_list.head; + exec_ctx->closure_list.head = exec_ctx->closure_list.tail = nullptr; + while (c != nullptr) { + grpc_closure* next = c->next_data.next; + grpc_error* error = c->error_data.error; + did_something = true; + exec_ctx_run(exec_ctx, c, error); + c = next; + } + } else if (!grpc_combiner_continue_exec_ctx(exec_ctx)) { + break; + } + } + GPR_ASSERT(exec_ctx->active_combiner == nullptr); + GPR_TIMER_END("grpc_exec_ctx_flush", 0); + return did_something; +} + +static void exec_ctx_sched(grpc_exec_ctx* exec_ctx, grpc_closure* closure, + grpc_error* error) { + grpc_closure_list_append(&exec_ctx->closure_list, closure, error); } static gpr_timespec g_start_time; +void grpc_exec_ctx_global_init(void) { + g_start_time = gpr_now(GPR_CLOCK_MONOTONIC); +} + +void grpc_exec_ctx_global_shutdown(void) {} + static gpr_atm timespec_to_atm_round_down(gpr_timespec ts) { ts = gpr_time_sub(ts, g_start_time); double x = @@ -70,6 +131,18 @@ static gpr_atm timespec_to_atm_round_up(gpr_timespec ts) { return (gpr_atm)x; } +grpc_millis grpc_exec_ctx_now(grpc_exec_ctx* exec_ctx) { + if (!exec_ctx->now_is_valid) { + exec_ctx->now = timespec_to_atm_round_down(gpr_now(GPR_CLOCK_MONOTONIC)); + exec_ctx->now_is_valid = true; + } + return exec_ctx->now; +} + +void grpc_exec_ctx_invalidate_now(grpc_exec_ctx* exec_ctx) { + exec_ctx->now_is_valid = false; +} + gpr_timespec grpc_millis_to_timespec(grpc_millis millis, gpr_clock_type clock_type) { // special-case infinities as grpc_millis can be 32bit on some platforms @@ -102,44 +175,3 @@ static const grpc_closure_scheduler_vtable exec_ctx_scheduler_vtable = { exec_ctx_run, exec_ctx_sched, "exec_ctx"}; static grpc_closure_scheduler exec_ctx_scheduler = {&exec_ctx_scheduler_vtable}; grpc_closure_scheduler* grpc_schedule_on_exec_ctx = &exec_ctx_scheduler; - -namespace grpc_core { -GPR_TLS_CLASS_DEF(ExecCtx::exec_ctx_); - -void ExecCtx::GlobalInit(void) { - g_start_time = gpr_now(GPR_CLOCK_MONOTONIC); - gpr_tls_init(&exec_ctx_); -} - -bool ExecCtx::Flush() { - bool did_something = 0; - GPR_TIMER_BEGIN("grpc_exec_ctx_flush", 0); - for (;;) { - if (!grpc_closure_list_empty(closure_list_)) { - grpc_closure* c = closure_list_.head; - closure_list_.head = closure_list_.tail = nullptr; - while (c != nullptr) { - grpc_closure* next = c->next_data.next; - grpc_error* error = c->error_data.error; - did_something = true; - exec_ctx_run(c, error); - c = next; - } - } else if (!grpc_combiner_continue_exec_ctx()) { - break; - } - } - GPR_ASSERT(combiner_data_.active_combiner == nullptr); - GPR_TIMER_END("grpc_exec_ctx_flush", 0); - return did_something; -} - -grpc_millis ExecCtx::Now() { - if (!now_is_valid_) { - now_ = timespec_to_atm_round_down(gpr_now(GPR_CLOCK_MONOTONIC)); - now_is_valid_ = true; - } - return now_; -} - -} // namespace grpc_core diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index b0c1740155f..b415d2c2556 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -21,8 +21,6 @@ #include #include -#include -#include #include "src/core/lib/iomgr/closure.h" @@ -43,13 +41,6 @@ typedef struct grpc_combiner grpc_combiner; should be given to not delete said call/channel from this exec_ctx */ #define GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP 2 -extern grpc_closure_scheduler* grpc_schedule_on_exec_ctx; - -gpr_timespec grpc_millis_to_timespec(grpc_millis millis, gpr_clock_type clock); -grpc_millis grpc_timespec_to_millis_round_down(gpr_timespec timespec); -grpc_millis grpc_timespec_to_millis_round_up(gpr_timespec timespec); - -namespace grpc_core { /** Execution context. * A bag of data that collects information along a callstack. * Generally created at public API entry points, and passed down as @@ -70,130 +61,63 @@ namespace grpc_core { * - Instances are always passed as the first argument to a function that * takes it, and always as a pointer (grpc_exec_ctx is never copied). */ -class ExecCtx { - public: - /** Default Constructor */ - - ExecCtx() : flags_(GRPC_EXEC_CTX_FLAG_IS_FINISHED) { Set(this); } - - /** Parameterised Constructor */ - ExecCtx(uintptr_t fl) : flags_(fl) { Set(this); } - - /** Destructor */ - ~ExecCtx() { - flags_ |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; - Flush(); - Set(last_exec_ctx_); - } - - /** Disallow copy and assignment operators */ - ExecCtx(const ExecCtx&) = delete; - ExecCtx& operator=(const ExecCtx&) = delete; - - /** Return starting_cpu */ - unsigned starting_cpu() const { return starting_cpu_; } - - struct CombinerData { - /* currently active combiner: updated only via combiner.c */ - grpc_combiner* active_combiner; - /* last active combiner in the active combiner list */ - grpc_combiner* last_combiner; - }; - - /** Only to be used by grpc-combiner code */ - CombinerData* combiner_data() { return &combiner_data_; } - - /** Return pointer to grpc_closure_list */ - grpc_closure_list* closure_list() { return &closure_list_; } - - /** Return flags */ - uintptr_t flags() { return flags_; } - - /** Checks if there is work to be done */ - bool HasWork() { - return combiner_data_.active_combiner != NULL || - !grpc_closure_list_empty(closure_list_); - } - - /** Flush any work that has been enqueued onto this grpc_exec_ctx. - * Caller must guarantee that no interfering locks are held. - * Returns true if work was performed, false otherwise. */ - bool Flush(); - - /** Returns true if we'd like to leave this execution context as soon as -possible: useful for deciding whether to do something more or not depending -on outside context */ - bool IsReadyToFinish() { - if ((flags_ & GRPC_EXEC_CTX_FLAG_IS_FINISHED) == 0) { - if (CheckReadyToFinish()) { - flags_ |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; - return true; - } - return false; - } else { - return true; - } - } - - /** Returns the stored current time relative to start if valid, - * otherwise refreshes the stored time, sets it valid and returns the new - * value */ - grpc_millis Now(); - - /** Invalidates the stored time value. A new time value will be set on calling - * Now() */ - void InvalidateNow() { now_is_valid_ = false; } - - /** To be used only by shutdown code in iomgr */ - void SetNowIomgrShutdown() { - now_ = GRPC_MILLIS_INF_FUTURE; - now_is_valid_ = true; - } - - /** To be used only for testing. - * Sets the now value - */ - void TestOnlySetNow(grpc_millis new_val) { - now_ = new_val; - now_is_valid_ = true; - } - - /** Finish any pending work for a grpc_exec_ctx. Must be called before - * the instance is destroyed, or work may be lost. */ - void Finish(); - - /** Global initialization for ExecCtx. Called by iomgr */ - static void GlobalInit(void); - - /** Global shutdown for ExecCtx. Called by iomgr */ - static void GlobalShutdown(void) { gpr_tls_destroy(&exec_ctx_); } - - /** Gets pointer to current exec_ctx */ - static ExecCtx* Get() { - return reinterpret_cast(gpr_tls_get(&exec_ctx_)); - } - - protected: - /** Check if ready to finish */ - virtual bool CheckReadyToFinish() { return false; } +struct grpc_exec_ctx { + grpc_closure_list closure_list; + /** currently active combiner: updated only via combiner.c */ + grpc_combiner* active_combiner; + /** last active combiner in the active combiner list */ + grpc_combiner* last_combiner; + uintptr_t flags; + unsigned starting_cpu; + void* check_ready_to_finish_arg; + bool (*check_ready_to_finish)(grpc_exec_ctx* exec_ctx, void* arg); + + bool now_is_valid; + grpc_millis now; +}; - private: - /** Set exec_ctx_ to exec_ctx */ - void Set(ExecCtx* exec_ctx) { - gpr_tls_set(&exec_ctx_, reinterpret_cast(exec_ctx)); +/* initializer for grpc_exec_ctx: + prefer to use GRPC_EXEC_CTX_INIT whenever possible */ +#define GRPC_EXEC_CTX_INITIALIZER(flags, finish_check, finish_check_arg) \ + { \ + GRPC_CLOSURE_LIST_INIT, NULL, NULL, flags, gpr_cpu_current_cpu(), \ + finish_check_arg, finish_check, false, 0 \ } - grpc_closure_list closure_list_ = GRPC_CLOSURE_LIST_INIT; - CombinerData combiner_data_ = {nullptr, nullptr}; - uintptr_t flags_; - unsigned starting_cpu_ = gpr_cpu_current_cpu(); +/* initialize an execution context at the top level of an API call into grpc + (this is safe to use elsewhere, though possibly not as efficient) */ +#define GRPC_EXEC_CTX_INIT \ + GRPC_EXEC_CTX_INITIALIZER(GRPC_EXEC_CTX_FLAG_IS_FINISHED, NULL, NULL) - bool now_is_valid_ = false; - grpc_millis now_ = 0; +extern grpc_closure_scheduler* grpc_schedule_on_exec_ctx; - GPR_TLS_CLASS_DECL(exec_ctx_); - ExecCtx* last_exec_ctx_ = Get(); -}; -} // namespace grpc_core +bool grpc_exec_ctx_has_work(grpc_exec_ctx* exec_ctx); + +/** Flush any work that has been enqueued onto this grpc_exec_ctx. + * Caller must guarantee that no interfering locks are held. + * Returns true if work was performed, false otherwise. */ +bool grpc_exec_ctx_flush(grpc_exec_ctx* exec_ctx); +/** Finish any pending work for a grpc_exec_ctx. Must be called before + * the instance is destroyed, or work may be lost. */ +void grpc_exec_ctx_finish(grpc_exec_ctx* exec_ctx); +/** Returns true if we'd like to leave this execution context as soon as + possible: useful for deciding whether to do something more or not depending + on outside context */ +bool grpc_exec_ctx_ready_to_finish(grpc_exec_ctx* exec_ctx); +/** A finish check that is never ready to finish */ +bool grpc_never_ready_to_finish(grpc_exec_ctx* exec_ctx, void* arg_ignored); +/** A finish check that is always ready to finish */ +bool grpc_always_ready_to_finish(grpc_exec_ctx* exec_ctx, void* arg_ignored); + +void grpc_exec_ctx_global_init(void); + +void grpc_exec_ctx_global_init(void); +void grpc_exec_ctx_global_shutdown(void); + +grpc_millis grpc_exec_ctx_now(grpc_exec_ctx* exec_ctx); +void grpc_exec_ctx_invalidate_now(grpc_exec_ctx* exec_ctx); +gpr_timespec grpc_millis_to_timespec(grpc_millis millis, gpr_clock_type clock); +grpc_millis grpc_timespec_to_millis_round_down(gpr_timespec timespec); +grpc_millis grpc_timespec_to_millis_round_up(gpr_timespec timespec); #endif /* GRPC_CORE_LIB_IOMGR_EXEC_CTX_H */ diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index b45223ce16d..fabdbdf934f 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -55,7 +55,7 @@ grpc_core::TraceFlag executor_trace(false, "executor"); static void executor_thread(void* arg); -static size_t run_closures(grpc_closure_list list) { +static size_t run_closures(grpc_exec_ctx* exec_ctx, grpc_closure_list list) { size_t n = 0; grpc_closure* c = list.head; @@ -73,11 +73,11 @@ static size_t run_closures(grpc_closure_list list) { #ifndef NDEBUG c->scheduled = false; #endif - c->cb(c->cb_arg, error); + c->cb(exec_ctx, c->cb_arg, error); GRPC_ERROR_UNREF(error); c = next; n++; - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(exec_ctx); } return n; @@ -87,7 +87,7 @@ bool grpc_executor_is_threaded() { return gpr_atm_no_barrier_load(&g_cur_threads) > 0; } -void grpc_executor_set_threading(bool threading) { +void grpc_executor_set_threading(grpc_exec_ctx* exec_ctx, bool threading) { gpr_atm cur_threads = gpr_atm_no_barrier_load(&g_cur_threads); if (threading) { if (cur_threads > 0) return; @@ -125,25 +125,28 @@ void grpc_executor_set_threading(bool threading) { for (size_t i = 0; i < g_max_threads; i++) { gpr_mu_destroy(&g_thread_state[i].mu); gpr_cv_destroy(&g_thread_state[i].cv); - run_closures(g_thread_state[i].elems); + run_closures(exec_ctx, g_thread_state[i].elems); } gpr_free(g_thread_state); gpr_tls_destroy(&g_this_thread_state); } } -void grpc_executor_init() { +void grpc_executor_init(grpc_exec_ctx* exec_ctx) { gpr_atm_no_barrier_store(&g_cur_threads, 0); - grpc_executor_set_threading(true); + grpc_executor_set_threading(exec_ctx, true); } -void grpc_executor_shutdown() { grpc_executor_set_threading(false); } +void grpc_executor_shutdown(grpc_exec_ctx* exec_ctx) { + grpc_executor_set_threading(exec_ctx, false); +} static void executor_thread(void* arg) { thread_state* ts = (thread_state*)arg; gpr_tls_set(&g_this_thread_state, (intptr_t)ts); - grpc_core::ExecCtx exec_ctx(0); + grpc_exec_ctx exec_ctx = + GRPC_EXEC_CTX_INITIALIZER(0, grpc_never_ready_to_finish, nullptr); size_t subtract_depth = 0; for (;;) { @@ -165,7 +168,7 @@ static void executor_thread(void* arg) { gpr_mu_unlock(&ts->mu); break; } - GRPC_STATS_INC_EXECUTOR_QUEUE_DRAINED(); + GRPC_STATS_INC_EXECUTOR_QUEUE_DRAINED(&exec_ctx); grpc_closure_list exec = ts->elems; ts->elems = GRPC_CLOSURE_LIST_INIT; gpr_mu_unlock(&ts->mu); @@ -173,18 +176,19 @@ static void executor_thread(void* arg) { gpr_log(GPR_DEBUG, "EXECUTOR[%d]: execute", (int)(ts - g_thread_state)); } - grpc_core::ExecCtx::Get()->InvalidateNow(); - subtract_depth = run_closures(exec); + grpc_exec_ctx_invalidate_now(&exec_ctx); + subtract_depth = run_closures(&exec_ctx, exec); } + grpc_exec_ctx_finish(&exec_ctx); } -static void executor_push(grpc_closure* closure, grpc_error* error, - bool is_short) { +static void executor_push(grpc_exec_ctx* exec_ctx, grpc_closure* closure, + grpc_error* error, bool is_short) { bool retry_push; if (is_short) { - GRPC_STATS_INC_EXECUTOR_SCHEDULED_SHORT_ITEMS(); + GRPC_STATS_INC_EXECUTOR_SCHEDULED_SHORT_ITEMS(exec_ctx); } else { - GRPC_STATS_INC_EXECUTOR_SCHEDULED_LONG_ITEMS(); + GRPC_STATS_INC_EXECUTOR_SCHEDULED_LONG_ITEMS(exec_ctx); } do { retry_push = false; @@ -198,16 +202,14 @@ static void executor_push(grpc_closure* closure, grpc_error* error, gpr_log(GPR_DEBUG, "EXECUTOR: schedule %p inline", closure); #endif } - grpc_closure_list_append(grpc_core::ExecCtx::Get()->closure_list(), - closure, error); + grpc_closure_list_append(&exec_ctx->closure_list, closure, error); return; } thread_state* ts = (thread_state*)gpr_tls_get(&g_this_thread_state); if (ts == nullptr) { - ts = &g_thread_state[GPR_HASH_POINTER(grpc_core::ExecCtx::Get(), - cur_thread_count)]; + ts = &g_thread_state[GPR_HASH_POINTER(exec_ctx, cur_thread_count)]; } else { - GRPC_STATS_INC_EXECUTOR_SCHEDULED_TO_SELF(); + GRPC_STATS_INC_EXECUTOR_SCHEDULED_TO_SELF(exec_ctx); } thread_state* orig_ts = ts; @@ -243,7 +245,7 @@ static void executor_push(grpc_closure* closure, grpc_error* error, continue; } if (grpc_closure_list_empty(ts->elems)) { - GRPC_STATS_INC_EXECUTOR_WAKEUP_INITIATED(); + GRPC_STATS_INC_EXECUTOR_WAKEUP_INITIATED(exec_ctx); gpr_cv_signal(&ts->cv); } grpc_closure_list_append(&ts->elems, closure, error); @@ -267,17 +269,19 @@ static void executor_push(grpc_closure* closure, grpc_error* error, gpr_spinlock_unlock(&g_adding_thread_lock); } if (retry_push) { - GRPC_STATS_INC_EXECUTOR_PUSH_RETRIES(); + GRPC_STATS_INC_EXECUTOR_PUSH_RETRIES(exec_ctx); } } while (retry_push); } -static void executor_push_short(grpc_closure* closure, grpc_error* error) { - executor_push(closure, error, true); +static void executor_push_short(grpc_exec_ctx* exec_ctx, grpc_closure* closure, + grpc_error* error) { + executor_push(exec_ctx, closure, error, true); } -static void executor_push_long(grpc_closure* closure, grpc_error* error) { - executor_push(closure, error, false); +static void executor_push_long(grpc_exec_ctx* exec_ctx, grpc_closure* closure, + grpc_error* error) { + executor_push(exec_ctx, closure, error, false); } static const grpc_closure_scheduler_vtable executor_vtable_short = { diff --git a/src/core/lib/iomgr/executor.h b/src/core/lib/iomgr/executor.h index e16f11aa215..d349083eebe 100644 --- a/src/core/lib/iomgr/executor.h +++ b/src/core/lib/iomgr/executor.h @@ -31,18 +31,18 @@ typedef enum { * This mechanism is meant to outsource work (grpc_closure instances) to a * thread, for those cases where blocking isn't an option but there isn't a * non-blocking solution available. */ -void grpc_executor_init(); +void grpc_executor_init(grpc_exec_ctx* exec_ctx); grpc_closure_scheduler* grpc_executor_scheduler(grpc_executor_job_length); /** Shutdown the executor, running all pending work as part of the call */ -void grpc_executor_shutdown(); +void grpc_executor_shutdown(grpc_exec_ctx* exec_ctx); /** Is the executor multi-threaded? */ bool grpc_executor_is_threaded(); /* enable/disable threading - must be called after grpc_executor_init and before grpc_executor_shutdown */ -void grpc_executor_set_threading(bool enable); +void grpc_executor_set_threading(grpc_exec_ctx* exec_ctx, bool enable); #endif /* GRPC_CORE_LIB_IOMGR_EXECUTOR_H */ diff --git a/src/core/lib/iomgr/fork_posix.cc b/src/core/lib/iomgr/fork_posix.cc index cc131408af7..f3cfd141b6a 100644 --- a/src/core/lib/iomgr/fork_posix.cc +++ b/src/core/lib/iomgr/fork_posix.cc @@ -49,10 +49,10 @@ void grpc_prefork() { return; } if (grpc_is_initialized()) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_timer_manager_set_threading(false); - grpc_executor_set_threading(false); - grpc_core::ExecCtx::Get()->Flush(); + grpc_executor_set_threading(&exec_ctx, false); + grpc_exec_ctx_finish(&exec_ctx); if (!gpr_await_threads( gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_seconds(3, GPR_TIMESPAN)))) { @@ -64,17 +64,18 @@ void grpc_prefork() { void grpc_postfork_parent() { if (grpc_is_initialized()) { grpc_timer_manager_set_threading(true); - grpc_core::ExecCtx exec_ctx; - grpc_executor_set_threading(true); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_executor_set_threading(&exec_ctx, true); + grpc_exec_ctx_finish(&exec_ctx); } } void grpc_postfork_child() { if (grpc_is_initialized()) { grpc_timer_manager_set_threading(true); - grpc_core::ExecCtx exec_ctx; - grpc_executor_set_threading(true); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_executor_set_threading(&exec_ctx, true); + grpc_exec_ctx_finish(&exec_ctx); } } diff --git a/src/core/lib/iomgr/iocp_windows.cc b/src/core/lib/iomgr/iocp_windows.cc index 0b6e6823b3f..6bbe5669c7c 100644 --- a/src/core/lib/iomgr/iocp_windows.cc +++ b/src/core/lib/iomgr/iocp_windows.cc @@ -42,18 +42,20 @@ static gpr_atm g_custom_events = 0; static HANDLE g_iocp; -static DWORD deadline_to_millis_timeout(grpc_millis deadline) { +static DWORD deadline_to_millis_timeout(grpc_exec_ctx* exec_ctx, + grpc_millis deadline) { if (deadline == GRPC_MILLIS_INF_FUTURE) { return INFINITE; } - grpc_millis now = grpc_core::ExecCtx::Get()->Now(); + grpc_millis now = grpc_exec_ctx_now(exec_ctx); if (deadline < now) return 0; grpc_millis timeout = deadline - now; if (timeout > std::numeric_limits::max()) return INFINITE; return static_cast(deadline - now); } -grpc_iocp_work_status grpc_iocp_work(grpc_millis deadline) { +grpc_iocp_work_status grpc_iocp_work(grpc_exec_ctx* exec_ctx, + grpc_millis deadline) { BOOL success; DWORD bytes = 0; DWORD flags = 0; @@ -61,11 +63,11 @@ grpc_iocp_work_status grpc_iocp_work(grpc_millis deadline) { LPOVERLAPPED overlapped; grpc_winsocket* socket; grpc_winsocket_callback_info* info; - GRPC_STATS_INC_SYSCALL_POLL(); + GRPC_STATS_INC_SYSCALL_POLL(exec_ctx); success = GetQueuedCompletionStatus(g_iocp, &bytes, &completion_key, &overlapped, - deadline_to_millis_timeout(deadline)); - grpc_core::ExecCtx::Get()->InvalidateNow(); + deadline_to_millis_timeout(exec_ctx, deadline)); + grpc_exec_ctx_invalidate_now(exec_ctx); if (success == 0 && overlapped == NULL) { return GRPC_IOCP_WORK_TIMEOUT; } @@ -93,7 +95,7 @@ grpc_iocp_work_status grpc_iocp_work(grpc_millis deadline) { info->bytes_transfered = bytes; info->wsa_error = success ? 0 : WSAGetLastError(); GPR_ASSERT(overlapped == &info->overlapped); - grpc_socket_become_ready(socket, info); + grpc_socket_become_ready(exec_ctx, socket, info); return GRPC_IOCP_WORK_WORK; } @@ -113,22 +115,22 @@ void grpc_iocp_kick(void) { } void grpc_iocp_flush(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_iocp_work_status work_status; do { - work_status = grpc_iocp_work(GRPC_MILLIS_INF_PAST); + work_status = grpc_iocp_work(&exec_ctx, GRPC_MILLIS_INF_PAST); } while (work_status == GRPC_IOCP_WORK_KICK || - grpc_core::ExecCtx::Get()->Flush()); + grpc_exec_ctx_flush(&exec_ctx)); } void grpc_iocp_shutdown(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (gpr_atm_acq_load(&g_custom_events)) { - grpc_iocp_work(GRPC_MILLIS_INF_FUTURE); - grpc_core::ExecCtx::Get()->Flush(); + grpc_iocp_work(&exec_ctx, GRPC_MILLIS_INF_FUTURE); + grpc_exec_ctx_flush(&exec_ctx); } - + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(CloseHandle(g_iocp)); } diff --git a/src/core/lib/iomgr/iocp_windows.h b/src/core/lib/iomgr/iocp_windows.h index 75b0ff4a922..0e9c3481f7e 100644 --- a/src/core/lib/iomgr/iocp_windows.h +++ b/src/core/lib/iomgr/iocp_windows.h @@ -33,7 +33,8 @@ typedef enum { GRPC_IOCP_WORK_KICK } grpc_iocp_work_status; -grpc_iocp_work_status grpc_iocp_work(grpc_millis deadline); +grpc_iocp_work_status grpc_iocp_work(grpc_exec_ctx* exec_ctx, + grpc_millis deadline); void grpc_iocp_init(void); void grpc_iocp_kick(void); void grpc_iocp_flush(void); diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index dacf08ea9eb..e077b35014f 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -45,20 +45,20 @@ static gpr_cv g_rcv; static int g_shutdown; static grpc_iomgr_object g_root_object; -void grpc_iomgr_init() { - grpc_core::ExecCtx exec_ctx; +void grpc_iomgr_init(grpc_exec_ctx* exec_ctx) { g_shutdown = 0; gpr_mu_init(&g_mu); gpr_cv_init(&g_rcv); - grpc_executor_init(); - grpc_timer_list_init(); + grpc_exec_ctx_global_init(); + grpc_executor_init(exec_ctx); + grpc_timer_list_init(exec_ctx); g_root_object.next = g_root_object.prev = &g_root_object; g_root_object.name = (char*)"root"; grpc_network_status_init(); grpc_iomgr_platform_init(); } -void grpc_iomgr_start() { grpc_timer_manager_init(); } +void grpc_iomgr_start(grpc_exec_ctx* exec_ctx) { grpc_timer_manager_init(); } static size_t count_objects(void) { grpc_iomgr_object* obj; @@ -76,76 +76,75 @@ static void dump_objects(const char* kind) { } } -void grpc_iomgr_shutdown() { +void grpc_iomgr_shutdown(grpc_exec_ctx* exec_ctx) { gpr_timespec shutdown_deadline = gpr_time_add( gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_seconds(10, GPR_TIMESPAN)); gpr_timespec last_warning_time = gpr_now(GPR_CLOCK_REALTIME); - { - grpc_timer_manager_shutdown(); - grpc_iomgr_platform_flush(); - grpc_executor_shutdown(); - - gpr_mu_lock(&g_mu); - g_shutdown = 1; - while (g_root_object.next != &g_root_object) { - if (gpr_time_cmp( - gpr_time_sub(gpr_now(GPR_CLOCK_REALTIME), last_warning_time), - gpr_time_from_seconds(1, GPR_TIMESPAN)) >= 0) { - if (g_root_object.next != &g_root_object) { - gpr_log(GPR_DEBUG, - "Waiting for %" PRIuPTR " iomgr objects to be destroyed", - count_objects()); - } - last_warning_time = gpr_now(GPR_CLOCK_REALTIME); + grpc_timer_manager_shutdown(); + grpc_iomgr_platform_flush(); + grpc_executor_shutdown(exec_ctx); + + gpr_mu_lock(&g_mu); + g_shutdown = 1; + while (g_root_object.next != &g_root_object) { + if (gpr_time_cmp( + gpr_time_sub(gpr_now(GPR_CLOCK_REALTIME), last_warning_time), + gpr_time_from_seconds(1, GPR_TIMESPAN)) >= 0) { + if (g_root_object.next != &g_root_object) { + gpr_log(GPR_DEBUG, + "Waiting for %" PRIuPTR " iomgr objects to be destroyed", + count_objects()); } - grpc_core::ExecCtx::Get()->SetNowIomgrShutdown(); - if (grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED) { - gpr_mu_unlock(&g_mu); - grpc_core::ExecCtx::Get()->Flush(); - grpc_iomgr_platform_flush(); - gpr_mu_lock(&g_mu); - continue; + last_warning_time = gpr_now(GPR_CLOCK_REALTIME); + } + exec_ctx->now_is_valid = true; + exec_ctx->now = GRPC_MILLIS_INF_FUTURE; + if (grpc_timer_check(exec_ctx, nullptr) == GRPC_TIMERS_FIRED) { + gpr_mu_unlock(&g_mu); + grpc_exec_ctx_flush(exec_ctx); + grpc_iomgr_platform_flush(); + gpr_mu_lock(&g_mu); + continue; + } + if (g_root_object.next != &g_root_object) { + if (grpc_iomgr_abort_on_leaks()) { + gpr_log(GPR_DEBUG, + "Failed to free %" PRIuPTR + " iomgr objects before shutdown deadline: " + "memory leaks are likely", + count_objects()); + dump_objects("LEAKED"); + abort(); } - if (g_root_object.next != &g_root_object) { - if (grpc_iomgr_abort_on_leaks()) { - gpr_log(GPR_DEBUG, - "Failed to free %" PRIuPTR - " iomgr objects before shutdown deadline: " - "memory leaks are likely", - count_objects()); - dump_objects("LEAKED"); - abort(); - } - gpr_timespec short_deadline = - gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), - gpr_time_from_millis(100, GPR_TIMESPAN)); - if (gpr_cv_wait(&g_rcv, &g_mu, short_deadline)) { - if (gpr_time_cmp(gpr_now(GPR_CLOCK_REALTIME), shutdown_deadline) > - 0) { - if (g_root_object.next != &g_root_object) { - gpr_log(GPR_DEBUG, - "Failed to free %" PRIuPTR - " iomgr objects before shutdown deadline: " - "memory leaks are likely", - count_objects()); - dump_objects("LEAKED"); - } - break; + gpr_timespec short_deadline = gpr_time_add( + gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_millis(100, GPR_TIMESPAN)); + if (gpr_cv_wait(&g_rcv, &g_mu, short_deadline)) { + if (gpr_time_cmp(gpr_now(GPR_CLOCK_REALTIME), shutdown_deadline) > 0) { + if (g_root_object.next != &g_root_object) { + gpr_log(GPR_DEBUG, + "Failed to free %" PRIuPTR + " iomgr objects before shutdown deadline: " + "memory leaks are likely", + count_objects()); + dump_objects("LEAKED"); } + break; } } } - gpr_mu_unlock(&g_mu); - grpc_timer_list_shutdown(); - grpc_core::ExecCtx::Get()->Flush(); } + gpr_mu_unlock(&g_mu); + + grpc_timer_list_shutdown(exec_ctx); + grpc_exec_ctx_flush(exec_ctx); /* ensure all threads have left g_mu */ gpr_mu_lock(&g_mu); gpr_mu_unlock(&g_mu); grpc_iomgr_platform_shutdown(); + grpc_exec_ctx_global_shutdown(); grpc_network_status_shutdown(); gpr_mu_destroy(&g_mu); gpr_cv_destroy(&g_rcv); diff --git a/src/core/lib/iomgr/iomgr.h b/src/core/lib/iomgr/iomgr.h index 3f238c660a7..2f00c0343de 100644 --- a/src/core/lib/iomgr/iomgr.h +++ b/src/core/lib/iomgr/iomgr.h @@ -23,13 +23,13 @@ #include "src/core/lib/iomgr/port.h" /** Initializes the iomgr. */ -void grpc_iomgr_init(); +void grpc_iomgr_init(grpc_exec_ctx* exec_ctx); /** Starts any background threads for iomgr. */ -void grpc_iomgr_start(); +void grpc_iomgr_start(grpc_exec_ctx* exec_ctx); /** Signals the intention to shutdown the iomgr. Expects to be able to flush * exec_ctx. */ -void grpc_iomgr_shutdown(); +void grpc_iomgr_shutdown(grpc_exec_ctx* exec_ctx); #endif /* GRPC_CORE_LIB_IOMGR_IOMGR_H */ diff --git a/src/core/lib/iomgr/iomgr_uv.cc b/src/core/lib/iomgr/iomgr_uv.cc index 9614c2e664a..b8a10f2ae88 100644 --- a/src/core/lib/iomgr/iomgr_uv.cc +++ b/src/core/lib/iomgr/iomgr_uv.cc @@ -29,11 +29,12 @@ gpr_thd_id g_init_thread; void grpc_iomgr_platform_init(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_pollset_global_init(); - grpc_executor_set_threading(false); + grpc_executor_set_threading(&exec_ctx, false); g_init_thread = gpr_thd_currentid(); + grpc_exec_ctx_finish(&exec_ctx); } void grpc_iomgr_platform_flush(void) {} void grpc_iomgr_platform_shutdown(void) { grpc_pollset_global_shutdown(); } diff --git a/src/core/lib/iomgr/lockfree_event.cc b/src/core/lib/iomgr/lockfree_event.cc index 7b194e3db5f..f0e798e8d8a 100644 --- a/src/core/lib/iomgr/lockfree_event.cc +++ b/src/core/lib/iomgr/lockfree_event.cc @@ -85,7 +85,7 @@ void LockfreeEvent::DestroyEvent() { kShutdownBit /* shutdown, no error */)); } -void LockfreeEvent::NotifyOn(grpc_closure* closure) { +void LockfreeEvent::NotifyOn(grpc_exec_ctx* exec_ctx, grpc_closure* closure) { while (true) { gpr_atm curr = gpr_atm_no_barrier_load(&state_); if (grpc_polling_trace.enabled()) { @@ -118,7 +118,7 @@ void LockfreeEvent::NotifyOn(grpc_closure* closure) { closure when transitioning out of CLOSURE_NO_READY state (i.e there is no other code that needs to 'happen-after' this) */ if (gpr_atm_no_barrier_cas(&state_, kClosureReady, kClosureNotReady)) { - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); return; /* Successful. Return */ } @@ -131,7 +131,7 @@ void LockfreeEvent::NotifyOn(grpc_closure* closure) { schedule the closure with the shutdown error */ if ((curr & kShutdownBit) > 0) { grpc_error* shutdown_err = (grpc_error*)(curr & ~kShutdownBit); - GRPC_CLOSURE_SCHED(closure, + GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "FD Shutdown", &shutdown_err, 1)); return; @@ -149,7 +149,8 @@ void LockfreeEvent::NotifyOn(grpc_closure* closure) { GPR_UNREACHABLE_CODE(return ); } -bool LockfreeEvent::SetShutdown(grpc_error* shutdown_err) { +bool LockfreeEvent::SetShutdown(grpc_exec_ctx* exec_ctx, + grpc_error* shutdown_err) { gpr_atm new_state = (gpr_atm)shutdown_err | kShutdownBit; while (true) { @@ -183,7 +184,7 @@ bool LockfreeEvent::SetShutdown(grpc_error* shutdown_err) { happens-after on that edge), and a release to pair with anything loading the shutdown state. */ if (gpr_atm_full_cas(&state_, curr, new_state)) { - GRPC_CLOSURE_SCHED((grpc_closure*)curr, + GRPC_CLOSURE_SCHED(exec_ctx, (grpc_closure*)curr, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "FD Shutdown", &shutdown_err, 1)); return true; @@ -199,7 +200,7 @@ bool LockfreeEvent::SetShutdown(grpc_error* shutdown_err) { GPR_UNREACHABLE_CODE(return false); } -void LockfreeEvent::SetReady() { +void LockfreeEvent::SetReady(grpc_exec_ctx* exec_ctx) { while (true) { gpr_atm curr = gpr_atm_no_barrier_load(&state_); @@ -233,7 +234,7 @@ void LockfreeEvent::SetReady() { spurious set_ready; release pairs with this or the acquire in notify_on (or set_shutdown) */ else if (gpr_atm_full_cas(&state_, curr, kClosureNotReady)) { - GRPC_CLOSURE_SCHED((grpc_closure*)curr, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, (grpc_closure*)curr, GRPC_ERROR_NONE); return; } /* else the state changed again (only possible by either a racing diff --git a/src/core/lib/iomgr/lockfree_event.h b/src/core/lib/iomgr/lockfree_event.h index 3bd3fd72f1a..aec67a3399a 100644 --- a/src/core/lib/iomgr/lockfree_event.h +++ b/src/core/lib/iomgr/lockfree_event.h @@ -44,9 +44,9 @@ class LockfreeEvent { return (gpr_atm_no_barrier_load(&state_) & kShutdownBit) != 0; } - void NotifyOn(grpc_closure* closure); - bool SetShutdown(grpc_error* error); - void SetReady(); + void NotifyOn(grpc_exec_ctx* exec_ctx, grpc_closure* closure); + bool SetShutdown(grpc_exec_ctx* exec_ctx, grpc_error* error); + void SetReady(grpc_exec_ctx* exec_ctx); private: enum State { kClosureNotReady = 0, kClosureReady = 2, kShutdownBit = 1 }; diff --git a/src/core/lib/iomgr/polling_entity.cc b/src/core/lib/iomgr/polling_entity.cc index 126f6f45d6e..0ee4ea1255b 100644 --- a/src/core/lib/iomgr/polling_entity.cc +++ b/src/core/lib/iomgr/polling_entity.cc @@ -56,28 +56,32 @@ bool grpc_polling_entity_is_empty(const grpc_polling_entity* pollent) { return pollent->tag == GRPC_POLLS_NONE; } -void grpc_polling_entity_add_to_pollset_set(grpc_polling_entity* pollent, +void grpc_polling_entity_add_to_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_polling_entity* pollent, grpc_pollset_set* pss_dst) { if (pollent->tag == GRPC_POLLS_POLLSET) { GPR_ASSERT(pollent->pollent.pollset != nullptr); - grpc_pollset_set_add_pollset(pss_dst, pollent->pollent.pollset); + grpc_pollset_set_add_pollset(exec_ctx, pss_dst, pollent->pollent.pollset); } else if (pollent->tag == GRPC_POLLS_POLLSET_SET) { GPR_ASSERT(pollent->pollent.pollset_set != nullptr); - grpc_pollset_set_add_pollset_set(pss_dst, pollent->pollent.pollset_set); + grpc_pollset_set_add_pollset_set(exec_ctx, pss_dst, + pollent->pollent.pollset_set); } else { gpr_log(GPR_ERROR, "Invalid grpc_polling_entity tag '%d'", pollent->tag); abort(); } } -void grpc_polling_entity_del_from_pollset_set(grpc_polling_entity* pollent, +void grpc_polling_entity_del_from_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_polling_entity* pollent, grpc_pollset_set* pss_dst) { if (pollent->tag == GRPC_POLLS_POLLSET) { GPR_ASSERT(pollent->pollent.pollset != nullptr); - grpc_pollset_set_del_pollset(pss_dst, pollent->pollent.pollset); + grpc_pollset_set_del_pollset(exec_ctx, pss_dst, pollent->pollent.pollset); } else if (pollent->tag == GRPC_POLLS_POLLSET_SET) { GPR_ASSERT(pollent->pollent.pollset_set != nullptr); - grpc_pollset_set_del_pollset_set(pss_dst, pollent->pollent.pollset_set); + grpc_pollset_set_del_pollset_set(exec_ctx, pss_dst, + pollent->pollent.pollset_set); } else { gpr_log(GPR_ERROR, "Invalid grpc_polling_entity tag '%d'", pollent->tag); abort(); diff --git a/src/core/lib/iomgr/polling_entity.h b/src/core/lib/iomgr/polling_entity.h index 0102d32c11d..dbe579e60d9 100644 --- a/src/core/lib/iomgr/polling_entity.h +++ b/src/core/lib/iomgr/polling_entity.h @@ -55,12 +55,14 @@ bool grpc_polling_entity_is_empty(const grpc_polling_entity* pollent); /** Add the pollset or pollset_set in \a pollent to the destination pollset_set * \a * pss_dst */ -void grpc_polling_entity_add_to_pollset_set(grpc_polling_entity* pollent, +void grpc_polling_entity_add_to_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_polling_entity* pollent, grpc_pollset_set* pss_dst); /** Delete the pollset or pollset_set in \a pollent from the destination * pollset_set \a * pss_dst */ -void grpc_polling_entity_del_from_pollset_set(grpc_polling_entity* pollent, +void grpc_polling_entity_del_from_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_polling_entity* pollent, grpc_pollset_set* pss_dst); #endif /* GRPC_CORE_LIB_IOMGR_POLLING_ENTITY_H */ diff --git a/src/core/lib/iomgr/pollset.h b/src/core/lib/iomgr/pollset.h index 6bb3cd3e0c0..d5d78f3101f 100644 --- a/src/core/lib/iomgr/pollset.h +++ b/src/core/lib/iomgr/pollset.h @@ -42,8 +42,9 @@ size_t grpc_pollset_size(void); void grpc_pollset_init(grpc_pollset* pollset, gpr_mu** mu); /* Begin shutting down the pollset, and call closure when done. * pollset's mutex must be held */ -void grpc_pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure); -void grpc_pollset_destroy(grpc_pollset* pollset); +void grpc_pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_closure* closure); +void grpc_pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset); /* Do some work on a pollset. May involve invoking asynchronous callbacks, or actually polling file @@ -67,13 +68,13 @@ void grpc_pollset_destroy(grpc_pollset* pollset); May call grpc_closure_list_run on grpc_closure_list, without holding the pollset lock */ -grpc_error* grpc_pollset_work(grpc_pollset* pollset, +grpc_error* grpc_pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, grpc_pollset_worker** worker, grpc_millis deadline) GRPC_MUST_USE_RESULT; /* Break one polling thread out of polling work for this pollset. If specific_worker is non-NULL, then kick that worker. */ -grpc_error* grpc_pollset_kick(grpc_pollset* pollset, +grpc_error* grpc_pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, grpc_pollset_worker* specific_worker) GRPC_MUST_USE_RESULT; diff --git a/src/core/lib/iomgr/pollset_set.h b/src/core/lib/iomgr/pollset_set.h index a94d0afe757..089c15cc949 100644 --- a/src/core/lib/iomgr/pollset_set.h +++ b/src/core/lib/iomgr/pollset_set.h @@ -29,14 +29,19 @@ typedef struct grpc_pollset_set grpc_pollset_set; grpc_pollset_set* grpc_pollset_set_create(void); -void grpc_pollset_set_destroy(grpc_pollset_set* pollset_set); -void grpc_pollset_set_add_pollset(grpc_pollset_set* pollset_set, +void grpc_pollset_set_destroy(grpc_exec_ctx* exec_ctx, + 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_pollset_set* pollset_set, +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_pollset_set* bag, +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_pollset_set* bag, +void grpc_pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* bag, grpc_pollset_set* item); #endif /* GRPC_CORE_LIB_IOMGR_POLLSET_SET_H */ diff --git a/src/core/lib/iomgr/pollset_set_uv.cc b/src/core/lib/iomgr/pollset_set_uv.cc index ac5dade8a50..90186edbb73 100644 --- a/src/core/lib/iomgr/pollset_set_uv.cc +++ b/src/core/lib/iomgr/pollset_set_uv.cc @@ -26,18 +26,23 @@ 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_destroy(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set) {} -void grpc_pollset_set_add_pollset(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_pollset_set* pollset_set, +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_pollset_set* bag, +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_pollset_set* bag, +void grpc_pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* bag, grpc_pollset_set* item) {} #endif /* GRPC_UV */ diff --git a/src/core/lib/iomgr/pollset_set_windows.cc b/src/core/lib/iomgr/pollset_set_windows.cc index 85edc9dee12..2105a47ad47 100644 --- a/src/core/lib/iomgr/pollset_set_windows.cc +++ b/src/core/lib/iomgr/pollset_set_windows.cc @@ -27,18 +27,23 @@ 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_destroy(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* pollset_set) {} -void grpc_pollset_set_add_pollset(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_pollset_set* pollset_set, +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_pollset_set* bag, +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_pollset_set* bag, +void grpc_pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_pollset_set* bag, grpc_pollset_set* item) {} #endif /* GRPC_WINSOCK_SOCKET */ diff --git a/src/core/lib/iomgr/pollset_uv.cc b/src/core/lib/iomgr/pollset_uv.cc index d9e5ad81be4..16132f3a809 100644 --- a/src/core/lib/iomgr/pollset_uv.cc +++ b/src/core/lib/iomgr/pollset_uv.cc @@ -88,7 +88,8 @@ void grpc_pollset_init(grpc_pollset* pollset, gpr_mu** mu) { pollset->shutting_down = 0; } -void grpc_pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { +void grpc_pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_closure* closure) { GPR_ASSERT(!pollset->shutting_down); GRPC_UV_ASSERT_SAME_THREAD(); pollset->shutting_down = 1; @@ -99,10 +100,10 @@ void grpc_pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { // kick the loop once uv_timer_start(dummy_uv_handle, dummy_timer_cb, 0, 0); } - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); } -void grpc_pollset_destroy(grpc_pollset* pollset) { +void grpc_pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset) { GRPC_UV_ASSERT_SAME_THREAD(); uv_close((uv_handle_t*)pollset->timer, timer_close_cb); // timer.data is a boolean indicating that the timer has finished closing @@ -114,14 +115,14 @@ void grpc_pollset_destroy(grpc_pollset* pollset) { } } -grpc_error* grpc_pollset_work(grpc_pollset* pollset, +grpc_error* grpc_pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, grpc_pollset_worker** worker_hdl, grpc_millis deadline) { uint64_t timeout; GRPC_UV_ASSERT_SAME_THREAD(); gpr_mu_unlock(&grpc_polling_mu); if (grpc_pollset_work_run_loop) { - grpc_millis now = grpc_core::ExecCtx::Get()->Now(); + grpc_millis now = grpc_exec_ctx_now(exec_ctx); if (deadline >= now) { timeout = deadline - now; } else { @@ -139,14 +140,14 @@ grpc_error* grpc_pollset_work(grpc_pollset* pollset, uv_run(uv_default_loop(), UV_RUN_NOWAIT); } } - if (!grpc_closure_list_empty(*grpc_core::ExecCtx::Get()->closure_list())) { - grpc_core::ExecCtx::Get()->Flush(); + 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_error* grpc_pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, grpc_pollset_worker* specific_worker) { GRPC_UV_ASSERT_SAME_THREAD(); uv_timer_start(dummy_uv_handle, dummy_timer_cb, 0, 0); diff --git a/src/core/lib/iomgr/pollset_windows.cc b/src/core/lib/iomgr/pollset_windows.cc index 6ef949aad70..95dd7d7ddda 100644 --- a/src/core/lib/iomgr/pollset_windows.cc +++ b/src/core/lib/iomgr/pollset_windows.cc @@ -92,19 +92,20 @@ void grpc_pollset_init(grpc_pollset* pollset, gpr_mu** mu) { &pollset->root_worker; } -void grpc_pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { +void grpc_pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_closure* closure) { pollset->shutting_down = 1; - grpc_pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); + grpc_pollset_kick(exec_ctx, pollset, GRPC_POLLSET_KICK_BROADCAST); if (!pollset->is_iocp_worker) { - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); } else { pollset->on_shutdown = closure; } } -void grpc_pollset_destroy(grpc_pollset* pollset) {} +void grpc_pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset) {} -grpc_error* grpc_pollset_work(grpc_pollset* pollset, +grpc_error* grpc_pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, grpc_pollset_worker** worker_hdl, grpc_millis deadline) { grpc_pollset_worker worker; @@ -125,8 +126,8 @@ grpc_error* grpc_pollset_work(grpc_pollset* pollset, pollset->is_iocp_worker = 1; g_active_poller = &worker; gpr_mu_unlock(&grpc_polling_mu); - grpc_iocp_work(deadline); - grpc_core::ExecCtx::Get()->Flush(); + grpc_iocp_work(exec_ctx, deadline); + grpc_exec_ctx_flush(exec_ctx); gpr_mu_lock(&grpc_polling_mu); pollset->is_iocp_worker = 0; g_active_poller = NULL; @@ -144,7 +145,7 @@ grpc_error* grpc_pollset_work(grpc_pollset* pollset, } if (pollset->shutting_down && pollset->on_shutdown != NULL) { - GRPC_CLOSURE_SCHED(pollset->on_shutdown, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, pollset->on_shutdown, GRPC_ERROR_NONE); pollset->on_shutdown = NULL; } goto done; @@ -157,18 +158,18 @@ grpc_error* grpc_pollset_work(grpc_pollset* pollset, while (!worker.kicked) { if (gpr_cv_wait(&worker.cv, &grpc_polling_mu, grpc_millis_to_timespec(deadline, GPR_CLOCK_REALTIME))) { - grpc_core::ExecCtx::Get()->InvalidateNow(); + grpc_exec_ctx_invalidate_now(exec_ctx); break; } - grpc_core::ExecCtx::Get()->InvalidateNow(); + grpc_exec_ctx_invalidate_now(exec_ctx); } } else { pollset->kicked_without_pollers = 0; } done: - if (!grpc_closure_list_empty(*grpc_core::ExecCtx::Get()->closure_list())) { + if (!grpc_closure_list_empty(exec_ctx->closure_list)) { gpr_mu_unlock(&grpc_polling_mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(exec_ctx); gpr_mu_lock(&grpc_polling_mu); } if (added_worker) { @@ -180,7 +181,7 @@ done: return GRPC_ERROR_NONE; } -grpc_error* grpc_pollset_kick(grpc_pollset* p, +grpc_error* grpc_pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* p, grpc_pollset_worker* specific_worker) { if (specific_worker != NULL) { if (specific_worker == GRPC_POLLSET_KICK_BROADCAST) { @@ -208,7 +209,7 @@ grpc_error* grpc_pollset_kick(grpc_pollset* p, specific_worker = pop_front_worker(&p->root_worker, GRPC_POLLSET_WORKER_LINK_POLLSET); if (specific_worker != NULL) { - grpc_pollset_kick(p, specific_worker); + grpc_pollset_kick(exec_ctx, p, specific_worker); } else if (p->is_iocp_worker) { grpc_iocp_kick(); } else { diff --git a/src/core/lib/iomgr/resolve_address.h b/src/core/lib/iomgr/resolve_address.h index 12fc2ed088f..5105020404b 100644 --- a/src/core/lib/iomgr/resolve_address.h +++ b/src/core/lib/iomgr/resolve_address.h @@ -38,7 +38,8 @@ typedef struct { /* Asynchronously resolve addr. Use default_port if a port isn't designated in addr, otherwise use the port in addr. */ /* TODO(ctiller): add a timeout here */ -extern void (*grpc_resolve_address)(const char* addr, const char* default_port, +extern void (*grpc_resolve_address)(grpc_exec_ctx* exec_ctx, const char* addr, + const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addresses); diff --git a/src/core/lib/iomgr/resolve_address_posix.cc b/src/core/lib/iomgr/resolve_address_posix.cc index cc3d4fd7cfa..fb5fa9d4226 100644 --- a/src/core/lib/iomgr/resolve_address_posix.cc +++ b/src/core/lib/iomgr/resolve_address_posix.cc @@ -42,7 +42,6 @@ static grpc_error* blocking_resolve_address_impl( const char* name, const char* default_port, grpc_resolved_addresses** addresses) { - grpc_core::ExecCtx exec_ctx; struct addrinfo hints; struct addrinfo *result = nullptr, *resp; char* host; @@ -82,7 +81,7 @@ static grpc_error* blocking_resolve_address_impl( GRPC_SCHEDULING_START_BLOCKING_REGION; s = getaddrinfo(host, port, &hints, &result); - GRPC_SCHEDULING_END_BLOCKING_REGION; + GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX; if (s != 0) { /* Retry if well-known service name is recognized */ @@ -91,7 +90,7 @@ static grpc_error* blocking_resolve_address_impl( if (strcmp(port, svc[i][0]) == 0) { GRPC_SCHEDULING_START_BLOCKING_REGION; s = getaddrinfo(host, svc[i][1], &hints, &result); - GRPC_SCHEDULING_END_BLOCKING_REGION; + GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX; break; } } @@ -153,10 +152,12 @@ typedef struct { /* Callback to be passed to grpc_executor to asynch-ify * grpc_blocking_resolve_address */ -static void do_request_thread(void* rp, grpc_error* error) { +static void do_request_thread(grpc_exec_ctx* exec_ctx, void* rp, + grpc_error* error) { request* r = (request*)rp; - GRPC_CLOSURE_SCHED(r->on_done, grpc_blocking_resolve_address( - r->name, r->default_port, r->addrs_out)); + GRPC_CLOSURE_SCHED( + exec_ctx, r->on_done, + grpc_blocking_resolve_address(r->name, r->default_port, r->addrs_out)); gpr_free(r->name); gpr_free(r->default_port); gpr_free(r); @@ -169,7 +170,8 @@ void grpc_resolved_addresses_destroy(grpc_resolved_addresses* addrs) { gpr_free(addrs); } -static void resolve_address_impl(const char* name, const char* default_port, +static void resolve_address_impl(grpc_exec_ctx* exec_ctx, const char* name, + const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addrs) { @@ -180,11 +182,11 @@ static void resolve_address_impl(const char* name, const char* default_port, r->default_port = gpr_strdup(default_port); r->on_done = on_done; r->addrs_out = addrs; - GRPC_CLOSURE_SCHED(&r->request_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &r->request_closure, GRPC_ERROR_NONE); } void (*grpc_resolve_address)( - const char* name, const char* default_port, + grpc_exec_ctx* exec_ctx, const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addrs) = resolve_address_impl; diff --git a/src/core/lib/iomgr/resolve_address_uv.cc b/src/core/lib/iomgr/resolve_address_uv.cc index 3eab04f3de0..6d09fd1d022 100644 --- a/src/core/lib/iomgr/resolve_address_uv.cc +++ b/src/core/lib/iomgr/resolve_address_uv.cc @@ -114,7 +114,7 @@ static grpc_error* handle_addrinfo_result(int status, struct addrinfo* result, static void getaddrinfo_callback(uv_getaddrinfo_t* req, int status, struct addrinfo* res) { request* r = (request*)req->data; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_error* error; int retry_status; char* port = r->port; @@ -130,8 +130,8 @@ static void getaddrinfo_callback(uv_getaddrinfo_t* req, int status, /* Either no retry was attempted, or the retry failed. Either way, the original error probably has more interesting information */ error = handle_addrinfo_result(status, res, r->addresses); - GRPC_CLOSURE_SCHED(r->on_done, error); - + GRPC_CLOSURE_SCHED(&exec_ctx, r->on_done, error); + grpc_exec_ctx_finish(&exec_ctx); gpr_free(r->hints); gpr_free(r->host); gpr_free(r->port); @@ -224,7 +224,8 @@ void grpc_resolved_addresses_destroy(grpc_resolved_addresses* addrs) { gpr_free(addrs); } -static void resolve_address_impl(const char* name, const char* default_port, +static void resolve_address_impl(grpc_exec_ctx* exec_ctx, const char* name, + const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addrs) { @@ -238,7 +239,7 @@ static void resolve_address_impl(const char* name, const char* default_port, GRPC_UV_ASSERT_SAME_THREAD(); err = try_split_host_port(name, default_port, &host, &port); if (err != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(on_done, err); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, err); gpr_free(host); gpr_free(port); return; @@ -267,7 +268,7 @@ static void resolve_address_impl(const char* name, const char* default_port, err = GRPC_ERROR_CREATE_FROM_STATIC_STRING("getaddrinfo failed"); err = grpc_error_set_str(err, GRPC_ERROR_STR_OS_ERROR, grpc_slice_from_static_string(uv_strerror(s))); - GRPC_CLOSURE_SCHED(on_done, err); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, err); gpr_free(r); gpr_free(req); gpr_free(hints); @@ -277,7 +278,7 @@ static void resolve_address_impl(const char* name, const char* default_port, } void (*grpc_resolve_address)( - const char* name, const char* default_port, + grpc_exec_ctx* exec_ctx, const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addrs) = resolve_address_impl; diff --git a/src/core/lib/iomgr/resolve_address_windows.cc b/src/core/lib/iomgr/resolve_address_windows.cc index ccb1dae689c..d9fc17a9f40 100644 --- a/src/core/lib/iomgr/resolve_address_windows.cc +++ b/src/core/lib/iomgr/resolve_address_windows.cc @@ -51,7 +51,6 @@ typedef struct { static grpc_error* blocking_resolve_address_impl( const char* name, const char* default_port, grpc_resolved_addresses** addresses) { - grpc_core::ExecCtx exec_ctx; struct addrinfo hints; struct addrinfo *result = NULL, *resp; char* host; @@ -88,7 +87,7 @@ static grpc_error* blocking_resolve_address_impl( GRPC_SCHEDULING_START_BLOCKING_REGION; s = getaddrinfo(host, port, &hints, &result); - GRPC_SCHEDULING_END_BLOCKING_REGION; + GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX; if (s != 0) { error = GRPC_WSA_ERROR(WSAGetLastError(), "getaddrinfo"); goto done; @@ -133,7 +132,8 @@ grpc_error* (*grpc_blocking_resolve_address)( /* Callback to be passed to grpc_executor to asynch-ify * grpc_blocking_resolve_address */ -static void do_request_thread(void* rp, grpc_error* error) { +static void do_request_thread(grpc_exec_ctx* exec_ctx, void* rp, + grpc_error* error) { request* r = (request*)rp; if (error == GRPC_ERROR_NONE) { error = @@ -141,7 +141,7 @@ static void do_request_thread(void* rp, grpc_error* error) { } else { GRPC_ERROR_REF(error); } - GRPC_CLOSURE_SCHED(r->on_done, error); + GRPC_CLOSURE_SCHED(exec_ctx, r->on_done, error); gpr_free(r->name); gpr_free(r->default_port); gpr_free(r); @@ -154,7 +154,8 @@ void grpc_resolved_addresses_destroy(grpc_resolved_addresses* addrs) { gpr_free(addrs); } -static void resolve_address_impl(const char* name, const char* default_port, +static void resolve_address_impl(grpc_exec_ctx* exec_ctx, const char* name, + const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addresses) { @@ -165,11 +166,11 @@ static void resolve_address_impl(const char* name, const char* default_port, r->default_port = gpr_strdup(default_port); r->on_done = on_done; r->addresses = addresses; - GRPC_CLOSURE_SCHED(&r->request_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &r->request_closure, GRPC_ERROR_NONE); } void (*grpc_resolve_address)( - const char* name, const char* default_port, + grpc_exec_ctx* exec_ctx, const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addresses) = resolve_address_impl; diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc index cabe28e4e6d..ccd8d9f379c 100644 --- a/src/core/lib/iomgr/resource_quota.cc +++ b/src/core/lib/iomgr/resource_quota.cc @@ -154,7 +154,8 @@ struct grpc_resource_quota { char* name; }; -static void ru_unref_by(grpc_resource_user* resource_user, gpr_atm amount); +static void ru_unref_by(grpc_exec_ctx* exec_ctx, + grpc_resource_user* resource_user, gpr_atm amount); /******************************************************************************* * list management @@ -238,31 +239,35 @@ static void rulist_remove(grpc_resource_user* resource_user, grpc_rulist list) { * resource quota state machine */ -static bool rq_alloc(grpc_resource_quota* resource_quota); +static bool rq_alloc(grpc_exec_ctx* exec_ctx, + grpc_resource_quota* resource_quota); static bool rq_reclaim_from_per_user_free_pool( - grpc_resource_quota* resource_quota); -static bool rq_reclaim(grpc_resource_quota* resource_quota, bool destructive); + grpc_exec_ctx* exec_ctx, grpc_resource_quota* resource_quota); +static bool rq_reclaim(grpc_exec_ctx* exec_ctx, + grpc_resource_quota* resource_quota, bool destructive); -static void rq_step(void* rq, grpc_error* error) { +static void rq_step(grpc_exec_ctx* exec_ctx, void* rq, grpc_error* error) { grpc_resource_quota* resource_quota = (grpc_resource_quota*)rq; resource_quota->step_scheduled = false; do { - if (rq_alloc(resource_quota)) goto done; - } while (rq_reclaim_from_per_user_free_pool(resource_quota)); + if (rq_alloc(exec_ctx, resource_quota)) goto done; + } while (rq_reclaim_from_per_user_free_pool(exec_ctx, resource_quota)); - if (!rq_reclaim(resource_quota, false)) { - rq_reclaim(resource_quota, true); + if (!rq_reclaim(exec_ctx, resource_quota, false)) { + rq_reclaim(exec_ctx, resource_quota, true); } done: - grpc_resource_quota_unref_internal(resource_quota); + grpc_resource_quota_unref_internal(exec_ctx, resource_quota); } -static void rq_step_sched(grpc_resource_quota* resource_quota) { +static void rq_step_sched(grpc_exec_ctx* exec_ctx, + grpc_resource_quota* resource_quota) { if (resource_quota->step_scheduled) return; resource_quota->step_scheduled = true; grpc_resource_quota_ref_internal(resource_quota); - GRPC_CLOSURE_SCHED(&resource_quota->rq_step_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &resource_quota->rq_step_closure, + GRPC_ERROR_NONE); } /* update the atomically available resource estimate - use no barriers since @@ -281,7 +286,8 @@ static void rq_update_estimate(grpc_resource_quota* resource_quota) { } /* returns true if all allocations are completed */ -static bool rq_alloc(grpc_resource_quota* resource_quota) { +static bool rq_alloc(grpc_exec_ctx* exec_ctx, + grpc_resource_quota* resource_quota) { grpc_resource_user* resource_user; while ((resource_user = rulist_pop_head(resource_quota, GRPC_RULIST_AWAITING_ALLOCATION))) { @@ -301,9 +307,9 @@ static bool rq_alloc(grpc_resource_quota* resource_quota) { int64_t aborted_allocations = resource_user->outstanding_allocations; resource_user->outstanding_allocations = 0; resource_user->free_pool += aborted_allocations; - GRPC_CLOSURE_LIST_SCHED(&resource_user->on_allocated); + GRPC_CLOSURE_LIST_SCHED(exec_ctx, &resource_user->on_allocated); gpr_mu_unlock(&resource_user->mu); - ru_unref_by(resource_user, (gpr_atm)aborted_allocations); + ru_unref_by(exec_ctx, resource_user, (gpr_atm)aborted_allocations); continue; } if (resource_user->free_pool < 0 && @@ -327,7 +333,7 @@ static bool rq_alloc(grpc_resource_quota* resource_quota) { if (resource_user->free_pool >= 0) { resource_user->allocating = false; resource_user->outstanding_allocations = 0; - GRPC_CLOSURE_LIST_SCHED(&resource_user->on_allocated); + GRPC_CLOSURE_LIST_SCHED(exec_ctx, &resource_user->on_allocated); gpr_mu_unlock(&resource_user->mu); } else { rulist_add_head(resource_user, GRPC_RULIST_AWAITING_ALLOCATION); @@ -340,7 +346,7 @@ static bool rq_alloc(grpc_resource_quota* resource_quota) { /* returns true if any memory could be reclaimed from buffers */ static bool rq_reclaim_from_per_user_free_pool( - grpc_resource_quota* resource_quota) { + grpc_exec_ctx* exec_ctx, grpc_resource_quota* resource_quota) { grpc_resource_user* resource_user; while ((resource_user = rulist_pop_head(resource_quota, GRPC_RULIST_NON_EMPTY_FREE_POOL))) { @@ -367,7 +373,8 @@ static bool rq_reclaim_from_per_user_free_pool( } /* returns true if reclamation is proceeding */ -static bool rq_reclaim(grpc_resource_quota* resource_quota, bool destructive) { +static bool rq_reclaim(grpc_exec_ctx* exec_ctx, + grpc_resource_quota* resource_quota, bool destructive) { if (resource_quota->reclaiming) return true; grpc_rulist list = destructive ? GRPC_RULIST_RECLAIMER_DESTRUCTIVE : GRPC_RULIST_RECLAIMER_BENIGN; @@ -385,7 +392,7 @@ static bool rq_reclaim(grpc_resource_quota* resource_quota, bool destructive) { resource_quota->debug_only_last_reclaimer_resource_user = resource_user; resource_quota->debug_only_last_initiated_reclaimer = c; resource_user->reclaimers[destructive] = nullptr; - GRPC_CLOSURE_RUN(c, GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN(exec_ctx, c, GRPC_ERROR_NONE); return true; } @@ -405,10 +412,10 @@ static void ru_slice_ref(void* p) { gpr_ref(&rc->refs); } -static void ru_slice_unref(void* p) { +static void ru_slice_unref(grpc_exec_ctx* exec_ctx, void* p) { ru_slice_refcount* rc = (ru_slice_refcount*)p; if (gpr_unref(&rc->refs)) { - grpc_resource_user_free(rc->resource_user, rc->size); + grpc_resource_user_free(exec_ctx, rc->resource_user, rc->size); gpr_free(rc); } } @@ -438,57 +445,61 @@ static grpc_slice ru_slice_create(grpc_resource_user* resource_user, * the combiner */ -static void ru_allocate(void* ru, grpc_error* error) { +static void ru_allocate(grpc_exec_ctx* exec_ctx, void* ru, grpc_error* error) { grpc_resource_user* resource_user = (grpc_resource_user*)ru; if (rulist_empty(resource_user->resource_quota, GRPC_RULIST_AWAITING_ALLOCATION)) { - rq_step_sched(resource_user->resource_quota); + rq_step_sched(exec_ctx, resource_user->resource_quota); } rulist_add_tail(resource_user, GRPC_RULIST_AWAITING_ALLOCATION); } -static void ru_add_to_free_pool(void* ru, grpc_error* error) { +static void ru_add_to_free_pool(grpc_exec_ctx* exec_ctx, void* ru, + grpc_error* error) { grpc_resource_user* resource_user = (grpc_resource_user*)ru; if (!rulist_empty(resource_user->resource_quota, GRPC_RULIST_AWAITING_ALLOCATION) && rulist_empty(resource_user->resource_quota, GRPC_RULIST_NON_EMPTY_FREE_POOL)) { - rq_step_sched(resource_user->resource_quota); + rq_step_sched(exec_ctx, resource_user->resource_quota); } rulist_add_tail(resource_user, GRPC_RULIST_NON_EMPTY_FREE_POOL); } -static bool ru_post_reclaimer(grpc_resource_user* resource_user, +static bool ru_post_reclaimer(grpc_exec_ctx* exec_ctx, + grpc_resource_user* resource_user, bool destructive) { grpc_closure* closure = resource_user->new_reclaimers[destructive]; GPR_ASSERT(closure != nullptr); resource_user->new_reclaimers[destructive] = nullptr; GPR_ASSERT(resource_user->reclaimers[destructive] == nullptr); if (gpr_atm_acq_load(&resource_user->shutdown) > 0) { - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_CANCELLED); return false; } resource_user->reclaimers[destructive] = closure; return true; } -static void ru_post_benign_reclaimer(void* ru, grpc_error* error) { +static void ru_post_benign_reclaimer(grpc_exec_ctx* exec_ctx, void* ru, + grpc_error* error) { grpc_resource_user* resource_user = (grpc_resource_user*)ru; - if (!ru_post_reclaimer(resource_user, false)) return; + if (!ru_post_reclaimer(exec_ctx, resource_user, false)) return; if (!rulist_empty(resource_user->resource_quota, GRPC_RULIST_AWAITING_ALLOCATION) && rulist_empty(resource_user->resource_quota, GRPC_RULIST_NON_EMPTY_FREE_POOL) && rulist_empty(resource_user->resource_quota, GRPC_RULIST_RECLAIMER_BENIGN)) { - rq_step_sched(resource_user->resource_quota); + rq_step_sched(exec_ctx, resource_user->resource_quota); } rulist_add_tail(resource_user, GRPC_RULIST_RECLAIMER_BENIGN); } -static void ru_post_destructive_reclaimer(void* ru, grpc_error* error) { +static void ru_post_destructive_reclaimer(grpc_exec_ctx* exec_ctx, void* ru, + grpc_error* error) { grpc_resource_user* resource_user = (grpc_resource_user*)ru; - if (!ru_post_reclaimer(resource_user, true)) return; + if (!ru_post_reclaimer(exec_ctx, resource_user, true)) return; if (!rulist_empty(resource_user->resource_quota, GRPC_RULIST_AWAITING_ALLOCATION) && rulist_empty(resource_user->resource_quota, @@ -497,46 +508,51 @@ static void ru_post_destructive_reclaimer(void* ru, grpc_error* error) { GRPC_RULIST_RECLAIMER_BENIGN) && rulist_empty(resource_user->resource_quota, GRPC_RULIST_RECLAIMER_DESTRUCTIVE)) { - rq_step_sched(resource_user->resource_quota); + rq_step_sched(exec_ctx, resource_user->resource_quota); } rulist_add_tail(resource_user, GRPC_RULIST_RECLAIMER_DESTRUCTIVE); } -static void ru_shutdown(void* ru, grpc_error* error) { +static void ru_shutdown(grpc_exec_ctx* exec_ctx, void* ru, grpc_error* error) { if (grpc_resource_quota_trace.enabled()) { gpr_log(GPR_DEBUG, "RU shutdown %p", ru); } grpc_resource_user* resource_user = (grpc_resource_user*)ru; - GRPC_CLOSURE_SCHED(resource_user->reclaimers[0], GRPC_ERROR_CANCELLED); - GRPC_CLOSURE_SCHED(resource_user->reclaimers[1], GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(exec_ctx, resource_user->reclaimers[0], + GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(exec_ctx, resource_user->reclaimers[1], + GRPC_ERROR_CANCELLED); resource_user->reclaimers[0] = nullptr; resource_user->reclaimers[1] = nullptr; rulist_remove(resource_user, GRPC_RULIST_RECLAIMER_BENIGN); rulist_remove(resource_user, GRPC_RULIST_RECLAIMER_DESTRUCTIVE); if (resource_user->allocating) { - rq_step_sched(resource_user->resource_quota); + rq_step_sched(exec_ctx, resource_user->resource_quota); } } -static void ru_destroy(void* ru, grpc_error* error) { +static void ru_destroy(grpc_exec_ctx* exec_ctx, void* ru, grpc_error* error) { grpc_resource_user* resource_user = (grpc_resource_user*)ru; GPR_ASSERT(gpr_atm_no_barrier_load(&resource_user->refs) == 0); for (int i = 0; i < GRPC_RULIST_COUNT; i++) { rulist_remove(resource_user, (grpc_rulist)i); } - GRPC_CLOSURE_SCHED(resource_user->reclaimers[0], GRPC_ERROR_CANCELLED); - GRPC_CLOSURE_SCHED(resource_user->reclaimers[1], GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(exec_ctx, resource_user->reclaimers[0], + GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(exec_ctx, resource_user->reclaimers[1], + GRPC_ERROR_CANCELLED); if (resource_user->free_pool != 0) { resource_user->resource_quota->free_pool += resource_user->free_pool; - rq_step_sched(resource_user->resource_quota); + rq_step_sched(exec_ctx, resource_user->resource_quota); } - grpc_resource_quota_unref_internal(resource_user->resource_quota); + grpc_resource_quota_unref_internal(exec_ctx, resource_user->resource_quota); gpr_mu_destroy(&resource_user->mu); gpr_free(resource_user->name); gpr_free(resource_user); } -static void ru_allocated_slices(void* arg, grpc_error* error) { +static void ru_allocated_slices(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_resource_user_slice_allocator* slice_allocator = (grpc_resource_user_slice_allocator*)arg; if (error == GRPC_ERROR_NONE) { @@ -546,7 +562,7 @@ static void ru_allocated_slices(void* arg, grpc_error* error) { slice_allocator->length)); } } - GRPC_CLOSURE_RUN(&slice_allocator->on_done, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(exec_ctx, &slice_allocator->on_done, GRPC_ERROR_REF(error)); } /******************************************************************************* @@ -560,22 +576,23 @@ typedef struct { grpc_closure closure; } rq_resize_args; -static void rq_resize(void* args, grpc_error* error) { +static void rq_resize(grpc_exec_ctx* exec_ctx, void* args, grpc_error* error) { rq_resize_args* a = (rq_resize_args*)args; int64_t delta = a->size - a->resource_quota->size; a->resource_quota->size += delta; a->resource_quota->free_pool += delta; rq_update_estimate(a->resource_quota); - rq_step_sched(a->resource_quota); - grpc_resource_quota_unref_internal(a->resource_quota); + rq_step_sched(exec_ctx, a->resource_quota); + grpc_resource_quota_unref_internal(exec_ctx, a->resource_quota); gpr_free(a); } -static void rq_reclamation_done(void* rq, grpc_error* error) { +static void rq_reclamation_done(grpc_exec_ctx* exec_ctx, void* rq, + grpc_error* error) { grpc_resource_quota* resource_quota = (grpc_resource_quota*)rq; resource_quota->reclaiming = false; - rq_step_sched(resource_quota); - grpc_resource_quota_unref_internal(resource_quota); + rq_step_sched(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(exec_ctx, resource_quota); } /******************************************************************************* @@ -611,9 +628,10 @@ grpc_resource_quota* grpc_resource_quota_create(const char* name) { return resource_quota; } -void grpc_resource_quota_unref_internal(grpc_resource_quota* resource_quota) { +void grpc_resource_quota_unref_internal(grpc_exec_ctx* exec_ctx, + grpc_resource_quota* resource_quota) { if (gpr_unref(&resource_quota->refs)) { - GRPC_COMBINER_UNREF(resource_quota->combiner, "resource_quota"); + GRPC_COMBINER_UNREF(exec_ctx, resource_quota->combiner, "resource_quota"); gpr_free(resource_quota->name); gpr_free(resource_quota); } @@ -621,8 +639,9 @@ void grpc_resource_quota_unref_internal(grpc_resource_quota* resource_quota) { /* Public API */ void grpc_resource_quota_unref(grpc_resource_quota* resource_quota) { - grpc_core::ExecCtx exec_ctx; - grpc_resource_quota_unref_internal(resource_quota); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); + grpc_exec_ctx_finish(&exec_ctx); } grpc_resource_quota* grpc_resource_quota_ref_internal( @@ -646,14 +665,15 @@ double grpc_resource_quota_get_memory_pressure( /* Public API */ void grpc_resource_quota_resize(grpc_resource_quota* resource_quota, size_t size) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; rq_resize_args* a = (rq_resize_args*)gpr_malloc(sizeof(*a)); a->resource_quota = grpc_resource_quota_ref_internal(resource_quota); a->size = (int64_t)size; gpr_atm_no_barrier_store(&resource_quota->last_size, (gpr_atm)GPR_MIN((size_t)GPR_ATM_MAX, size)); GRPC_CLOSURE_INIT(&a->closure, rq_resize, a, grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(&a->closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&exec_ctx, &a->closure, GRPC_ERROR_NONE); + grpc_exec_ctx_finish(&exec_ctx); } size_t grpc_resource_quota_peek_size(grpc_resource_quota* resource_quota) { @@ -684,8 +704,8 @@ static void* rq_copy(void* rq) { return rq; } -static void rq_destroy(void* rq) { - grpc_resource_quota_unref_internal((grpc_resource_quota*)rq); +static void rq_destroy(grpc_exec_ctx* exec_ctx, void* rq) { + grpc_resource_quota_unref_internal(exec_ctx, (grpc_resource_quota*)rq); } static int rq_cmp(void* a, void* b) { return GPR_ICMP(a, b); } @@ -753,12 +773,14 @@ static void ru_ref_by(grpc_resource_user* resource_user, gpr_atm amount) { GPR_ASSERT(gpr_atm_no_barrier_fetch_add(&resource_user->refs, amount) != 0); } -static void ru_unref_by(grpc_resource_user* resource_user, gpr_atm amount) { +static void ru_unref_by(grpc_exec_ctx* exec_ctx, + grpc_resource_user* resource_user, gpr_atm amount) { GPR_ASSERT(amount > 0); gpr_atm old = gpr_atm_full_fetch_add(&resource_user->refs, -amount); GPR_ASSERT(old >= amount); if (old == amount) { - GRPC_CLOSURE_SCHED(&resource_user->destroy_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &resource_user->destroy_closure, + GRPC_ERROR_NONE); } } @@ -766,13 +788,16 @@ void grpc_resource_user_ref(grpc_resource_user* resource_user) { ru_ref_by(resource_user, 1); } -void grpc_resource_user_unref(grpc_resource_user* resource_user) { - ru_unref_by(resource_user, 1); +void grpc_resource_user_unref(grpc_exec_ctx* exec_ctx, + grpc_resource_user* resource_user) { + ru_unref_by(exec_ctx, resource_user, 1); } -void grpc_resource_user_shutdown(grpc_resource_user* resource_user) { +void grpc_resource_user_shutdown(grpc_exec_ctx* exec_ctx, + grpc_resource_user* resource_user) { if (gpr_atm_full_fetch_add(&resource_user->shutdown, 1) == 0) { GRPC_CLOSURE_SCHED( + exec_ctx, GRPC_CLOSURE_CREATE( ru_shutdown, resource_user, grpc_combiner_scheduler(resource_user->resource_quota->combiner)), @@ -780,7 +805,8 @@ void grpc_resource_user_shutdown(grpc_resource_user* resource_user) { } } -void grpc_resource_user_alloc(grpc_resource_user* resource_user, size_t size, +void grpc_resource_user_alloc(grpc_exec_ctx* exec_ctx, + grpc_resource_user* resource_user, size_t size, grpc_closure* optional_on_done) { gpr_mu_lock(&resource_user->mu); ru_ref_by(resource_user, (gpr_atm)size); @@ -796,16 +822,18 @@ void grpc_resource_user_alloc(grpc_resource_user* resource_user, size_t size, GRPC_ERROR_NONE); if (!resource_user->allocating) { resource_user->allocating = true; - GRPC_CLOSURE_SCHED(&resource_user->allocate_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &resource_user->allocate_closure, + GRPC_ERROR_NONE); } } else { resource_user->outstanding_allocations -= (int64_t)size; - GRPC_CLOSURE_SCHED(optional_on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, optional_on_done, GRPC_ERROR_NONE); } gpr_mu_unlock(&resource_user->mu); } -void grpc_resource_user_free(grpc_resource_user* resource_user, size_t size) { +void grpc_resource_user_free(grpc_exec_ctx* exec_ctx, + grpc_resource_user* resource_user, size_t size) { gpr_mu_lock(&resource_user->mu); bool was_zero_or_negative = resource_user->free_pool <= 0; resource_user->free_pool += (int64_t)size; @@ -818,29 +846,32 @@ void grpc_resource_user_free(grpc_resource_user* resource_user, size_t size) { if (is_bigger_than_zero && was_zero_or_negative && !resource_user->added_to_free_pool) { resource_user->added_to_free_pool = true; - GRPC_CLOSURE_SCHED(&resource_user->add_to_free_pool_closure, + GRPC_CLOSURE_SCHED(exec_ctx, &resource_user->add_to_free_pool_closure, GRPC_ERROR_NONE); } gpr_mu_unlock(&resource_user->mu); - ru_unref_by(resource_user, (gpr_atm)size); + ru_unref_by(exec_ctx, resource_user, (gpr_atm)size); } -void grpc_resource_user_post_reclaimer(grpc_resource_user* resource_user, +void grpc_resource_user_post_reclaimer(grpc_exec_ctx* exec_ctx, + grpc_resource_user* resource_user, bool destructive, grpc_closure* closure) { GPR_ASSERT(resource_user->new_reclaimers[destructive] == nullptr); resource_user->new_reclaimers[destructive] = closure; - GRPC_CLOSURE_SCHED(&resource_user->post_reclaimer_closure[destructive], + GRPC_CLOSURE_SCHED(exec_ctx, + &resource_user->post_reclaimer_closure[destructive], GRPC_ERROR_NONE); } -void grpc_resource_user_finish_reclamation(grpc_resource_user* resource_user) { +void grpc_resource_user_finish_reclamation(grpc_exec_ctx* exec_ctx, + grpc_resource_user* resource_user) { if (grpc_resource_quota_trace.enabled()) { gpr_log(GPR_DEBUG, "RQ %s %s: reclamation complete", resource_user->resource_quota->name, resource_user->name); } GRPC_CLOSURE_SCHED( - &resource_user->resource_quota->rq_reclamation_done_closure, + exec_ctx, &resource_user->resource_quota->rq_reclamation_done_closure, GRPC_ERROR_NONE); } @@ -855,11 +886,12 @@ void grpc_resource_user_slice_allocator_init( } void grpc_resource_user_alloc_slices( + grpc_exec_ctx* exec_ctx, grpc_resource_user_slice_allocator* slice_allocator, size_t length, size_t count, grpc_slice_buffer* dest) { slice_allocator->length = length; slice_allocator->count = count; slice_allocator->dest = dest; - grpc_resource_user_alloc(slice_allocator->resource_user, count * length, - &slice_allocator->on_allocated); + grpc_resource_user_alloc(exec_ctx, slice_allocator->resource_user, + count * length, &slice_allocator->on_allocated); } diff --git a/src/core/lib/iomgr/resource_quota.h b/src/core/lib/iomgr/resource_quota.h index 39e3aabf189..787370307a8 100644 --- a/src/core/lib/iomgr/resource_quota.h +++ b/src/core/lib/iomgr/resource_quota.h @@ -65,7 +65,8 @@ extern grpc_core::TraceFlag grpc_resource_quota_trace; grpc_resource_quota* grpc_resource_quota_ref_internal( grpc_resource_quota* resource_quota); -void grpc_resource_quota_unref_internal(grpc_resource_quota* resource_quota); +void grpc_resource_quota_unref_internal(grpc_exec_ctx* exec_ctx, + grpc_resource_quota* resource_quota); grpc_resource_quota* grpc_resource_quota_from_channel_args( const grpc_channel_args* channel_args); @@ -88,26 +89,32 @@ grpc_resource_quota* grpc_resource_user_quota( grpc_resource_user* resource_user); void grpc_resource_user_ref(grpc_resource_user* resource_user); -void grpc_resource_user_unref(grpc_resource_user* resource_user); -void grpc_resource_user_shutdown(grpc_resource_user* resource_user); +void grpc_resource_user_unref(grpc_exec_ctx* exec_ctx, + grpc_resource_user* resource_user); +void grpc_resource_user_shutdown(grpc_exec_ctx* exec_ctx, + grpc_resource_user* resource_user); /* Allocate from the resource user (and its quota). If optional_on_done is NULL, then allocate immediately. This may push the quota over-limit, at which point reclamation will kick in. If optional_on_done is non-NULL, it will be scheduled when the allocation has been granted by the quota. */ -void grpc_resource_user_alloc(grpc_resource_user* resource_user, size_t size, +void grpc_resource_user_alloc(grpc_exec_ctx* exec_ctx, + grpc_resource_user* resource_user, size_t size, grpc_closure* optional_on_done); /* Release memory back to the quota */ -void grpc_resource_user_free(grpc_resource_user* resource_user, size_t size); +void grpc_resource_user_free(grpc_exec_ctx* exec_ctx, + grpc_resource_user* resource_user, size_t size); /* Post a memory reclaimer to the resource user. Only one benign and one destructive reclaimer can be posted at once. When executed, the reclaimer MUST call grpc_resource_user_finish_reclamation before it completes, to return control to the resource quota. */ -void grpc_resource_user_post_reclaimer(grpc_resource_user* resource_user, +void grpc_resource_user_post_reclaimer(grpc_exec_ctx* exec_ctx, + grpc_resource_user* resource_user, bool destructive, grpc_closure* closure); /* Finish a reclamation step */ -void grpc_resource_user_finish_reclamation(grpc_resource_user* resource_user); +void grpc_resource_user_finish_reclamation(grpc_exec_ctx* exec_ctx, + grpc_resource_user* resource_user); /* Helper to allocate slices from a resource user */ typedef struct grpc_resource_user_slice_allocator { @@ -134,11 +141,13 @@ void grpc_resource_user_slice_allocator_init( /* Allocate \a count slices of length \a length into \a dest. Only one request can be outstanding at a time. */ void grpc_resource_user_alloc_slices( + grpc_exec_ctx* exec_ctx, grpc_resource_user_slice_allocator* slice_allocator, size_t length, size_t count, grpc_slice_buffer* dest); /* Allocate one slice of length \a size synchronously. */ -grpc_slice grpc_resource_user_slice_malloc(grpc_resource_user* resource_user, +grpc_slice grpc_resource_user_slice_malloc(grpc_exec_ctx* exec_ctx, + grpc_resource_user* resource_user, size_t size); #endif /* GRPC_CORE_LIB_IOMGR_RESOURCE_QUOTA_H */ diff --git a/src/core/lib/iomgr/socket_factory_posix.cc b/src/core/lib/iomgr/socket_factory_posix.cc index bc7d0b12f3b..40bfecd4c25 100644 --- a/src/core/lib/iomgr/socket_factory_posix.cc +++ b/src/core/lib/iomgr/socket_factory_posix.cc @@ -72,7 +72,7 @@ static void* socket_factory_arg_copy(void* p) { return grpc_socket_factory_ref((grpc_socket_factory*)p); } -static void socket_factory_arg_destroy(void* p) { +static void socket_factory_arg_destroy(grpc_exec_ctx* exec_ctx, void* p) { grpc_socket_factory_unref((grpc_socket_factory*)p); } diff --git a/src/core/lib/iomgr/socket_mutator.cc b/src/core/lib/iomgr/socket_mutator.cc index 9d30e46b6bd..ff6c0c70d8d 100644 --- a/src/core/lib/iomgr/socket_mutator.cc +++ b/src/core/lib/iomgr/socket_mutator.cc @@ -63,7 +63,7 @@ static void* socket_mutator_arg_copy(void* p) { return grpc_socket_mutator_ref((grpc_socket_mutator*)p); } -static void socket_mutator_arg_destroy(void* p) { +static void socket_mutator_arg_destroy(grpc_exec_ctx* exec_ctx, void* p) { grpc_socket_mutator_unref((grpc_socket_mutator*)p); } diff --git a/src/core/lib/iomgr/socket_windows.cc b/src/core/lib/iomgr/socket_windows.cc index 9bb6a75dd8c..aee80f4b4c0 100644 --- a/src/core/lib/iomgr/socket_windows.cc +++ b/src/core/lib/iomgr/socket_windows.cc @@ -109,34 +109,37 @@ void grpc_winsocket_destroy(grpc_winsocket* winsocket) { -) The IOCP already completed in the background, and we need to call the callback now. -) The IOCP hasn't completed yet, and we're queuing it for later. */ -static void socket_notify_on_iocp(grpc_winsocket* socket, grpc_closure* closure, +static void socket_notify_on_iocp(grpc_exec_ctx* exec_ctx, + grpc_winsocket* socket, grpc_closure* closure, grpc_winsocket_callback_info* info) { GPR_ASSERT(info->closure == NULL); gpr_mu_lock(&socket->state_mu); if (info->has_pending_iocp) { info->has_pending_iocp = 0; - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); } else { info->closure = closure; } gpr_mu_unlock(&socket->state_mu); } -void grpc_socket_notify_on_write(grpc_winsocket* socket, +void grpc_socket_notify_on_write(grpc_exec_ctx* exec_ctx, + grpc_winsocket* socket, grpc_closure* closure) { - socket_notify_on_iocp(socket, closure, &socket->write_info); + socket_notify_on_iocp(exec_ctx, socket, closure, &socket->write_info); } -void grpc_socket_notify_on_read(grpc_winsocket* socket, grpc_closure* closure) { - socket_notify_on_iocp(socket, closure, &socket->read_info); +void grpc_socket_notify_on_read(grpc_exec_ctx* exec_ctx, grpc_winsocket* socket, + grpc_closure* closure) { + socket_notify_on_iocp(exec_ctx, socket, closure, &socket->read_info); } -void grpc_socket_become_ready(grpc_winsocket* socket, +void grpc_socket_become_ready(grpc_exec_ctx* exec_ctx, grpc_winsocket* socket, grpc_winsocket_callback_info* info) { GPR_ASSERT(!info->has_pending_iocp); gpr_mu_lock(&socket->state_mu); if (info->closure) { - GRPC_CLOSURE_SCHED(info->closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, info->closure, GRPC_ERROR_NONE); info->closure = NULL; } else { info->has_pending_iocp = 1; diff --git a/src/core/lib/iomgr/socket_windows.h b/src/core/lib/iomgr/socket_windows.h index cb28f2b8df1..04e0a89d703 100644 --- a/src/core/lib/iomgr/socket_windows.h +++ b/src/core/lib/iomgr/socket_windows.h @@ -98,13 +98,16 @@ void grpc_winsocket_shutdown(grpc_winsocket* socket); /* Destroy a socket. Should only be called if there's no pending operation. */ void grpc_winsocket_destroy(grpc_winsocket* socket); -void grpc_socket_notify_on_write(grpc_winsocket* winsocket, +void grpc_socket_notify_on_write(grpc_exec_ctx* exec_ctx, + grpc_winsocket* winsocket, grpc_closure* closure); -void grpc_socket_notify_on_read(grpc_winsocket* winsocket, +void grpc_socket_notify_on_read(grpc_exec_ctx* exec_ctx, + grpc_winsocket* winsocket, grpc_closure* closure); -void grpc_socket_become_ready(grpc_winsocket* winsocket, +void grpc_socket_become_ready(grpc_exec_ctx* exec_ctx, + grpc_winsocket* winsocket, grpc_winsocket_callback_info* ci); #endif diff --git a/src/core/lib/iomgr/tcp_client.h b/src/core/lib/iomgr/tcp_client.h index 5f55d309553..75e2fe0f36c 100644 --- a/src/core/lib/iomgr/tcp_client.h +++ b/src/core/lib/iomgr/tcp_client.h @@ -30,7 +30,8 @@ NULL on failure). interested_parties points to a set of pollsets that would be interested in this connection being established (in order to continue their work) */ -void grpc_tcp_client_connect(grpc_closure* on_connect, grpc_endpoint** endpoint, +void grpc_tcp_client_connect(grpc_exec_ctx* exec_ctx, grpc_closure* on_connect, + grpc_endpoint** endpoint, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, diff --git a/src/core/lib/iomgr/tcp_client_posix.cc b/src/core/lib/iomgr/tcp_client_posix.cc index 15062a52cda..4cb2ac49d5d 100644 --- a/src/core/lib/iomgr/tcp_client_posix.cc +++ b/src/core/lib/iomgr/tcp_client_posix.cc @@ -96,7 +96,7 @@ done: return err; } -static void tc_on_alarm(void* acp, grpc_error* error) { +static void tc_on_alarm(grpc_exec_ctx* exec_ctx, void* acp, grpc_error* error) { int done; async_connect* ac = (async_connect*)acp; if (grpc_tcp_trace.enabled()) { @@ -107,24 +107,26 @@ static void tc_on_alarm(void* acp, grpc_error* error) { gpr_mu_lock(&ac->mu); if (ac->fd != nullptr) { grpc_fd_shutdown( - ac->fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("connect() timed out")); + exec_ctx, ac->fd, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("connect() timed out")); } done = (--ac->refs == 0); gpr_mu_unlock(&ac->mu); if (done) { gpr_mu_destroy(&ac->mu); gpr_free(ac->addr_str); - grpc_channel_args_destroy(ac->channel_args); + grpc_channel_args_destroy(exec_ctx, ac->channel_args); gpr_free(ac); } } grpc_endpoint* grpc_tcp_client_create_from_fd( - grpc_fd* fd, const grpc_channel_args* channel_args, const char* addr_str) { - return grpc_tcp_create(fd, channel_args, addr_str); + grpc_exec_ctx* exec_ctx, grpc_fd* fd, const grpc_channel_args* channel_args, + const char* addr_str) { + return grpc_tcp_create(exec_ctx, fd, channel_args, addr_str); } -static void on_writable(void* acp, grpc_error* error) { +static void on_writable(grpc_exec_ctx* exec_ctx, void* acp, grpc_error* error) { async_connect* ac = (async_connect*)acp; int so_error = 0; socklen_t so_error_size; @@ -148,7 +150,7 @@ static void on_writable(void* acp, grpc_error* error) { ac->fd = nullptr; gpr_mu_unlock(&ac->mu); - grpc_timer_cancel(&ac->alarm); + grpc_timer_cancel(exec_ctx, &ac->alarm); gpr_mu_lock(&ac->mu); if (error != GRPC_ERROR_NONE) { @@ -170,8 +172,9 @@ static void on_writable(void* acp, grpc_error* error) { switch (so_error) { case 0: - grpc_pollset_set_del_fd(ac->interested_parties, fd); - *ep = grpc_tcp_client_create_from_fd(fd, ac->channel_args, ac->addr_str); + grpc_pollset_set_del_fd(exec_ctx, ac->interested_parties, fd); + *ep = grpc_tcp_client_create_from_fd(exec_ctx, fd, ac->channel_args, + ac->addr_str); fd = nullptr; break; case ENOBUFS: @@ -191,7 +194,7 @@ static void on_writable(void* acp, grpc_error* error) { don't do that! */ gpr_log(GPR_ERROR, "kernel out of buffers"); gpr_mu_unlock(&ac->mu); - grpc_fd_notify_on_write(fd, &ac->write_closure); + grpc_fd_notify_on_write(exec_ctx, fd, &ac->write_closure); return; case ECONNREFUSED: /* This error shouldn't happen for anything other than connect(). */ @@ -206,8 +209,8 @@ static void on_writable(void* acp, grpc_error* error) { finish: if (fd != nullptr) { - grpc_pollset_set_del_fd(ac->interested_parties, fd); - grpc_fd_orphan(fd, nullptr, nullptr, false /* already_closed */, + grpc_pollset_set_del_fd(exec_ctx, ac->interested_parties, fd); + grpc_fd_orphan(exec_ctx, fd, nullptr, nullptr, false /* already_closed */, "tcp_client_orphan"); fd = nullptr; } @@ -230,13 +233,14 @@ finish: if (done) { gpr_mu_destroy(&ac->mu); gpr_free(ac->addr_str); - grpc_channel_args_destroy(ac->channel_args); + grpc_channel_args_destroy(exec_ctx, ac->channel_args); gpr_free(ac); } - GRPC_CLOSURE_SCHED(closure, error); + GRPC_CLOSURE_SCHED(exec_ctx, closure, error); } -static void tcp_client_connect_impl(grpc_closure* closure, grpc_endpoint** ep, +static void tcp_client_connect_impl(grpc_exec_ctx* exec_ctx, + grpc_closure* closure, grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, @@ -261,7 +265,7 @@ static void tcp_client_connect_impl(grpc_closure* closure, grpc_endpoint** ep, error = grpc_create_dualstack_socket(addr, SOCK_STREAM, 0, &dsmode, &fd); if (error != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(closure, error); + GRPC_CLOSURE_SCHED(exec_ctx, closure, error); return; } if (dsmode == GRPC_DSMODE_IPV4) { @@ -270,7 +274,7 @@ static void tcp_client_connect_impl(grpc_closure* closure, grpc_endpoint** ep, addr = &addr4_copy; } if ((error = prepare_socket(addr, fd, channel_args)) != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(closure, error); + GRPC_CLOSURE_SCHED(exec_ctx, closure, error); return; } @@ -285,19 +289,20 @@ static void tcp_client_connect_impl(grpc_closure* closure, grpc_endpoint** ep, fdobj = grpc_fd_create(fd, name); if (err >= 0) { - *ep = grpc_tcp_client_create_from_fd(fdobj, channel_args, addr_str); - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); + *ep = + grpc_tcp_client_create_from_fd(exec_ctx, fdobj, channel_args, addr_str); + GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); goto done; } if (errno != EWOULDBLOCK && errno != EINPROGRESS) { - grpc_fd_orphan(fdobj, nullptr, nullptr, false /* already_closed */, - "tcp_client_connect_error"); - GRPC_CLOSURE_SCHED(closure, GRPC_OS_ERROR(errno, "connect")); + grpc_fd_orphan(exec_ctx, fdobj, nullptr, nullptr, + false /* already_closed */, "tcp_client_connect_error"); + GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_OS_ERROR(errno, "connect")); goto done; } - grpc_pollset_set_add_fd(interested_parties, fdobj); + grpc_pollset_set_add_fd(exec_ctx, interested_parties, fdobj); ac = (async_connect*)gpr_malloc(sizeof(async_connect)); ac->closure = closure; @@ -319,8 +324,8 @@ static void tcp_client_connect_impl(grpc_closure* closure, grpc_endpoint** ep, gpr_mu_lock(&ac->mu); GRPC_CLOSURE_INIT(&ac->on_alarm, tc_on_alarm, ac, grpc_schedule_on_exec_ctx); - grpc_timer_init(&ac->alarm, deadline, &ac->on_alarm); - grpc_fd_notify_on_write(ac->fd, &ac->write_closure); + grpc_timer_init(exec_ctx, &ac->alarm, deadline, &ac->on_alarm); + grpc_fd_notify_on_write(exec_ctx, ac->fd, &ac->write_closure); gpr_mu_unlock(&ac->mu); done: @@ -330,18 +335,19 @@ done: // overridden by api_fuzzer.c void (*grpc_tcp_client_connect_impl)( - grpc_closure* closure, grpc_endpoint** ep, + grpc_exec_ctx* exec_ctx, grpc_closure* closure, grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, grpc_millis deadline) = tcp_client_connect_impl; -void grpc_tcp_client_connect(grpc_closure* closure, grpc_endpoint** ep, +void grpc_tcp_client_connect(grpc_exec_ctx* exec_ctx, grpc_closure* closure, + grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, grpc_millis deadline) { - grpc_tcp_client_connect_impl(closure, ep, interested_parties, channel_args, - addr, deadline); + grpc_tcp_client_connect_impl(exec_ctx, closure, ep, interested_parties, + channel_args, addr, deadline); } #endif diff --git a/src/core/lib/iomgr/tcp_client_posix.h b/src/core/lib/iomgr/tcp_client_posix.h index 7d0f133a6b4..2b1fe79e902 100644 --- a/src/core/lib/iomgr/tcp_client_posix.h +++ b/src/core/lib/iomgr/tcp_client_posix.h @@ -24,6 +24,7 @@ #include "src/core/lib/iomgr/tcp_client.h" grpc_endpoint* grpc_tcp_client_create_from_fd( - grpc_fd* fd, const grpc_channel_args* channel_args, const char* addr_str); + grpc_exec_ctx* exec_ctx, grpc_fd* fd, const grpc_channel_args* channel_args, + const char* addr_str); #endif /* GRPC_CORE_LIB_IOMGR_TCP_CLIENT_POSIX_H */ diff --git a/src/core/lib/iomgr/tcp_client_uv.cc b/src/core/lib/iomgr/tcp_client_uv.cc index 4e9c7cc11d9..5cca0c9936d 100644 --- a/src/core/lib/iomgr/tcp_client_uv.cc +++ b/src/core/lib/iomgr/tcp_client_uv.cc @@ -46,15 +46,17 @@ typedef struct grpc_uv_tcp_connect { grpc_resource_quota* resource_quota; } grpc_uv_tcp_connect; -static void uv_tcp_connect_cleanup(grpc_uv_tcp_connect* connect) { - grpc_resource_quota_unref_internal(connect->resource_quota); +static void uv_tcp_connect_cleanup(grpc_exec_ctx* exec_ctx, + grpc_uv_tcp_connect* connect) { + grpc_resource_quota_unref_internal(exec_ctx, connect->resource_quota); gpr_free(connect->addr_name); gpr_free(connect); } static void tcp_close_callback(uv_handle_t* handle) { gpr_free(handle); } -static void uv_tc_on_alarm(void* acp, grpc_error* error) { +static void uv_tc_on_alarm(grpc_exec_ctx* exec_ctx, void* acp, + grpc_error* error) { int done; grpc_uv_tcp_connect* connect = (grpc_uv_tcp_connect*)acp; if (grpc_tcp_trace.enabled()) { @@ -70,17 +72,17 @@ static void uv_tc_on_alarm(void* acp, grpc_error* error) { } done = (--connect->refs == 0); if (done) { - uv_tcp_connect_cleanup(connect); + uv_tcp_connect_cleanup(exec_ctx, connect); } } static void uv_tc_on_connect(uv_connect_t* req, int status) { grpc_uv_tcp_connect* connect = (grpc_uv_tcp_connect*)req->data; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_error* error = GRPC_ERROR_NONE; int done; grpc_closure* closure = connect->closure; - grpc_timer_cancel(&connect->alarm); + grpc_timer_cancel(&exec_ctx, &connect->alarm); if (status == 0) { *connect->endpoint = grpc_tcp_create( connect->tcp_handle, connect->resource_quota, connect->addr_name); @@ -105,13 +107,15 @@ static void uv_tc_on_connect(uv_connect_t* req, int status) { } done = (--connect->refs == 0); if (done) { - grpc_core::ExecCtx::Get()->Flush(); - uv_tcp_connect_cleanup(connect); + grpc_exec_ctx_flush(&exec_ctx); + uv_tcp_connect_cleanup(&exec_ctx, connect); } - GRPC_CLOSURE_SCHED(closure, error); + GRPC_CLOSURE_SCHED(&exec_ctx, closure, error); + grpc_exec_ctx_finish(&exec_ctx); } -static void tcp_client_connect_impl(grpc_closure* closure, grpc_endpoint** ep, +static void tcp_client_connect_impl(grpc_exec_ctx* exec_ctx, + grpc_closure* closure, grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* resolved_addr, @@ -126,7 +130,7 @@ static void tcp_client_connect_impl(grpc_closure* closure, grpc_endpoint** ep, if (channel_args != NULL) { for (size_t i = 0; i < channel_args->num_args; i++) { if (0 == strcmp(channel_args->args[i].key, GRPC_ARG_RESOURCE_QUOTA)) { - grpc_resource_quota_unref_internal(resource_quota); + grpc_resource_quota_unref_internal(exec_ctx, resource_quota); resource_quota = grpc_resource_quota_ref_internal( (grpc_resource_quota*)channel_args->args[i].value.pointer.p); } @@ -153,23 +157,24 @@ static void tcp_client_connect_impl(grpc_closure* closure, grpc_endpoint** ep, (const struct sockaddr*)resolved_addr->addr, uv_tc_on_connect); GRPC_CLOSURE_INIT(&connect->on_alarm, uv_tc_on_alarm, connect, grpc_schedule_on_exec_ctx); - grpc_timer_init(&connect->alarm, deadline, &connect->on_alarm); + grpc_timer_init(exec_ctx, &connect->alarm, deadline, &connect->on_alarm); } // overridden by api_fuzzer.c void (*grpc_tcp_client_connect_impl)( - grpc_closure* closure, grpc_endpoint** ep, + grpc_exec_ctx* exec_ctx, grpc_closure* closure, grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, grpc_millis deadline) = tcp_client_connect_impl; -void grpc_tcp_client_connect(grpc_closure* closure, grpc_endpoint** ep, +void grpc_tcp_client_connect(grpc_exec_ctx* exec_ctx, grpc_closure* closure, + grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, grpc_millis deadline) { - grpc_tcp_client_connect_impl(closure, ep, interested_parties, channel_args, - addr, deadline); + grpc_tcp_client_connect_impl(exec_ctx, closure, ep, interested_parties, + channel_args, addr, deadline); } #endif /* GRPC_UV */ diff --git a/src/core/lib/iomgr/tcp_client_windows.cc b/src/core/lib/iomgr/tcp_client_windows.cc index 5521a0a9aef..5e30725e904 100644 --- a/src/core/lib/iomgr/tcp_client_windows.cc +++ b/src/core/lib/iomgr/tcp_client_windows.cc @@ -52,12 +52,13 @@ typedef struct { grpc_channel_args* channel_args; } async_connect; -static void async_connect_unlock_and_cleanup(async_connect* ac, +static void async_connect_unlock_and_cleanup(grpc_exec_ctx* exec_ctx, + async_connect* ac, grpc_winsocket* socket) { int done = (--ac->refs == 0); gpr_mu_unlock(&ac->mu); if (done) { - grpc_channel_args_destroy(ac->channel_args); + grpc_channel_args_destroy(exec_ctx, ac->channel_args); gpr_mu_destroy(&ac->mu); gpr_free(ac->addr_name); gpr_free(ac); @@ -65,7 +66,7 @@ static void async_connect_unlock_and_cleanup(async_connect* ac, if (socket != NULL) grpc_winsocket_destroy(socket); } -static void on_alarm(void* acp, grpc_error* error) { +static void on_alarm(grpc_exec_ctx* exec_ctx, void* acp, grpc_error* error) { async_connect* ac = (async_connect*)acp; gpr_mu_lock(&ac->mu); grpc_winsocket* socket = ac->socket; @@ -73,10 +74,10 @@ static void on_alarm(void* acp, grpc_error* error) { if (socket != NULL) { grpc_winsocket_shutdown(socket); } - async_connect_unlock_and_cleanup(ac, socket); + async_connect_unlock_and_cleanup(exec_ctx, ac, socket); } -static void on_connect(void* acp, grpc_error* error) { +static void on_connect(grpc_exec_ctx* exec_ctx, void* acp, grpc_error* error) { async_connect* ac = (async_connect*)acp; grpc_endpoint** ep = ac->endpoint; GPR_ASSERT(*ep == NULL); @@ -89,7 +90,7 @@ static void on_connect(void* acp, grpc_error* error) { ac->socket = NULL; gpr_mu_unlock(&ac->mu); - grpc_timer_cancel(&ac->alarm); + grpc_timer_cancel(exec_ctx, &ac->alarm); gpr_mu_lock(&ac->mu); @@ -104,7 +105,8 @@ static void on_connect(void* acp, grpc_error* error) { if (!wsa_success) { error = GRPC_WSA_ERROR(WSAGetLastError(), "ConnectEx"); } else { - *ep = grpc_tcp_create(socket, ac->channel_args, ac->addr_name); + *ep = + grpc_tcp_create(exec_ctx, socket, ac->channel_args, ac->addr_name); socket = NULL; } } else { @@ -112,20 +114,18 @@ static void on_connect(void* acp, grpc_error* error) { } } - async_connect_unlock_and_cleanup(ac, socket); + async_connect_unlock_and_cleanup(exec_ctx, ac, socket); /* If the connection was aborted, the callback was already called when the deadline was met. */ - GRPC_CLOSURE_SCHED(on_done, error); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, error); } /* Tries to issue one async connection, then schedules both an IOCP notification request for the connection, and one timeout alert. */ -static void tcp_client_connect_impl(grpc_closure* on_done, - grpc_endpoint** endpoint, - grpc_pollset_set* interested_parties, - const grpc_channel_args* channel_args, - const grpc_resolved_address* addr, - grpc_millis deadline) { +static void tcp_client_connect_impl( + grpc_exec_ctx* exec_ctx, grpc_closure* on_done, grpc_endpoint** endpoint, + grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, + const grpc_resolved_address* addr, grpc_millis deadline) { SOCKET sock = INVALID_SOCKET; BOOL success; int status; @@ -205,8 +205,8 @@ static void tcp_client_connect_impl(grpc_closure* on_done, GRPC_CLOSURE_INIT(&ac->on_connect, on_connect, ac, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&ac->on_alarm, on_alarm, ac, grpc_schedule_on_exec_ctx); - grpc_timer_init(&ac->alarm, deadline, &ac->on_alarm); - grpc_socket_notify_on_write(socket, &ac->on_connect); + grpc_timer_init(exec_ctx, &ac->alarm, deadline, &ac->on_alarm); + grpc_socket_notify_on_write(exec_ctx, socket, &ac->on_connect); return; failure: @@ -222,23 +222,24 @@ failure: } else if (sock != INVALID_SOCKET) { closesocket(sock); } - GRPC_CLOSURE_SCHED(on_done, final_error); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, final_error); } // overridden by api_fuzzer.c void (*grpc_tcp_client_connect_impl)( - grpc_closure* closure, grpc_endpoint** ep, + grpc_exec_ctx* exec_ctx, grpc_closure* closure, grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, grpc_millis deadline) = tcp_client_connect_impl; -void grpc_tcp_client_connect(grpc_closure* closure, grpc_endpoint** ep, +void grpc_tcp_client_connect(grpc_exec_ctx* exec_ctx, grpc_closure* closure, + grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, grpc_millis deadline) { - grpc_tcp_client_connect_impl(closure, ep, interested_parties, channel_args, - addr, deadline); + grpc_tcp_client_connect_impl(exec_ctx, closure, ep, interested_parties, + channel_args, addr, deadline); } #endif /* GRPC_WINSOCK_SOCKET */ diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index 155329d2e83..d09cfca9af4 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -108,31 +108,36 @@ typedef struct backup_poller { static gpr_atm g_uncovered_notifications_pending; static gpr_atm g_backup_poller; /* backup_poller* */ -static void tcp_handle_read(void* arg /* grpc_tcp */, grpc_error* error); -static void tcp_handle_write(void* arg /* grpc_tcp */, grpc_error* error); -static void tcp_drop_uncovered_then_handle_write(void* arg /* grpc_tcp */, +static void tcp_handle_read(grpc_exec_ctx* exec_ctx, void* arg /* grpc_tcp */, + grpc_error* error); +static void tcp_handle_write(grpc_exec_ctx* exec_ctx, void* arg /* grpc_tcp */, + grpc_error* error); +static void tcp_drop_uncovered_then_handle_write(grpc_exec_ctx* exec_ctx, + void* arg /* grpc_tcp */, grpc_error* error); -static void done_poller(void* bp, grpc_error* error_ignored) { +static void done_poller(grpc_exec_ctx* exec_ctx, void* bp, + grpc_error* error_ignored) { backup_poller* p = (backup_poller*)bp; if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p destroy", p); } - grpc_pollset_destroy(BACKUP_POLLER_POLLSET(p)); + grpc_pollset_destroy(exec_ctx, BACKUP_POLLER_POLLSET(p)); gpr_free(p); } -static void run_poller(void* bp, grpc_error* error_ignored) { +static void run_poller(grpc_exec_ctx* exec_ctx, void* bp, + grpc_error* error_ignored) { backup_poller* p = (backup_poller*)bp; if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p run", p); } gpr_mu_lock(p->pollset_mu); - grpc_millis deadline = grpc_core::ExecCtx::Get()->Now() + 13 * GPR_MS_PER_SEC; - GRPC_STATS_INC_TCP_BACKUP_POLLER_POLLS(); + grpc_millis deadline = grpc_exec_ctx_now(exec_ctx) + 13 * GPR_MS_PER_SEC; + GRPC_STATS_INC_TCP_BACKUP_POLLER_POLLS(exec_ctx); GRPC_LOG_IF_ERROR( "backup_poller:pollset_work", - grpc_pollset_work(BACKUP_POLLER_POLLSET(p), nullptr, deadline)); + grpc_pollset_work(exec_ctx, BACKUP_POLLER_POLLSET(p), nullptr, deadline)); gpr_mu_unlock(p->pollset_mu); /* last "uncovered" notification is the ref that keeps us polling, if we get * there try a cas to release it */ @@ -147,18 +152,18 @@ static void run_poller(void* bp, grpc_error* error_ignored) { if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p shutdown", p); } - grpc_pollset_shutdown(BACKUP_POLLER_POLLSET(p), + grpc_pollset_shutdown(exec_ctx, BACKUP_POLLER_POLLSET(p), GRPC_CLOSURE_INIT(&p->run_poller, done_poller, p, grpc_schedule_on_exec_ctx)); } else { if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p reschedule", p); } - GRPC_CLOSURE_SCHED(&p->run_poller, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &p->run_poller, GRPC_ERROR_NONE); } } -static void drop_uncovered(grpc_tcp* tcp) { +static void drop_uncovered(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { backup_poller* p = (backup_poller*)gpr_atm_acq_load(&g_backup_poller); gpr_atm old_count = gpr_atm_no_barrier_fetch_add(&g_uncovered_notifications_pending, -1); @@ -169,7 +174,7 @@ static void drop_uncovered(grpc_tcp* tcp) { GPR_ASSERT(old_count != 1); } -static void cover_self(grpc_tcp* tcp) { +static void cover_self(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { backup_poller* p; gpr_atm old_count = gpr_atm_no_barrier_fetch_add(&g_uncovered_notifications_pending, 2); @@ -178,7 +183,7 @@ static void cover_self(grpc_tcp* tcp) { 2 + (int)old_count); } if (old_count == 0) { - GRPC_STATS_INC_TCP_BACKUP_POLLERS_CREATED(); + GRPC_STATS_INC_TCP_BACKUP_POLLERS_CREATED(exec_ctx); p = (backup_poller*)gpr_zalloc(sizeof(*p) + grpc_pollset_size()); if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p create", p); @@ -186,6 +191,7 @@ static void cover_self(grpc_tcp* tcp) { grpc_pollset_init(BACKUP_POLLER_POLLSET(p), &p->pollset_mu); gpr_atm_rel_store(&g_backup_poller, (gpr_atm)p); GRPC_CLOSURE_SCHED( + exec_ctx, GRPC_CLOSURE_INIT(&p->run_poller, run_poller, p, grpc_executor_scheduler(GRPC_EXECUTOR_LONG)), GRPC_ERROR_NONE); @@ -198,38 +204,39 @@ static void cover_self(grpc_tcp* tcp) { if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p add %p", p, tcp); } - grpc_pollset_add_fd(BACKUP_POLLER_POLLSET(p), tcp->em_fd); + grpc_pollset_add_fd(exec_ctx, BACKUP_POLLER_POLLSET(p), tcp->em_fd); if (old_count != 0) { - drop_uncovered(tcp); + drop_uncovered(exec_ctx, tcp); } } -static void notify_on_read(grpc_tcp* tcp) { +static void notify_on_read(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "TCP:%p notify_on_read", tcp); } GRPC_CLOSURE_INIT(&tcp->read_done_closure, tcp_handle_read, tcp, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(tcp->em_fd, &tcp->read_done_closure); + grpc_fd_notify_on_read(exec_ctx, tcp->em_fd, &tcp->read_done_closure); } -static void notify_on_write(grpc_tcp* tcp) { +static void notify_on_write(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "TCP:%p notify_on_write", tcp); } - cover_self(tcp); + cover_self(exec_ctx, tcp); GRPC_CLOSURE_INIT(&tcp->write_done_closure, tcp_drop_uncovered_then_handle_write, tcp, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_write(tcp->em_fd, &tcp->write_done_closure); + grpc_fd_notify_on_write(exec_ctx, tcp->em_fd, &tcp->write_done_closure); } -static void tcp_drop_uncovered_then_handle_write(void* arg, grpc_error* error) { +static void tcp_drop_uncovered_then_handle_write(grpc_exec_ctx* exec_ctx, + void* arg, grpc_error* error) { if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "TCP:%p got_write: %s", arg, grpc_error_string(error)); } - drop_uncovered((grpc_tcp*)arg); - tcp_handle_write(arg, error); + drop_uncovered(exec_ctx, (grpc_tcp*)arg); + tcp_handle_write(exec_ctx, arg, error); } static void add_to_estimate(grpc_tcp* tcp, size_t bytes) { @@ -275,29 +282,33 @@ static grpc_error* tcp_annotate_error(grpc_error* src_error, grpc_tcp* tcp) { grpc_slice_from_copied_string(tcp->peer_string)); } -static void tcp_handle_read(void* arg /* grpc_tcp */, grpc_error* error); -static void tcp_handle_write(void* arg /* grpc_tcp */, grpc_error* error); +static void tcp_handle_read(grpc_exec_ctx* exec_ctx, void* arg /* grpc_tcp */, + grpc_error* error); +static void tcp_handle_write(grpc_exec_ctx* exec_ctx, void* arg /* grpc_tcp */, + grpc_error* error); -static void tcp_shutdown(grpc_endpoint* ep, grpc_error* why) { +static void tcp_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_error* why) { grpc_tcp* tcp = (grpc_tcp*)ep; - grpc_fd_shutdown(tcp->em_fd, why); - grpc_resource_user_shutdown(tcp->resource_user); + grpc_fd_shutdown(exec_ctx, tcp->em_fd, why); + grpc_resource_user_shutdown(exec_ctx, tcp->resource_user); } -static void tcp_free(grpc_tcp* tcp) { - grpc_fd_orphan(tcp->em_fd, tcp->release_fd_cb, tcp->release_fd, +static void tcp_free(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { + grpc_fd_orphan(exec_ctx, tcp->em_fd, tcp->release_fd_cb, tcp->release_fd, false /* already_closed */, "tcp_unref_orphan"); - grpc_slice_buffer_destroy_internal(&tcp->last_read_buffer); - grpc_resource_user_unref(tcp->resource_user); + grpc_slice_buffer_destroy_internal(exec_ctx, &tcp->last_read_buffer); + grpc_resource_user_unref(exec_ctx, tcp->resource_user); gpr_free(tcp->peer_string); gpr_free(tcp); } #ifndef NDEBUG -#define TCP_UNREF(tcp, reason) tcp_unref((tcp), (reason), __FILE__, __LINE__) +#define TCP_UNREF(cl, tcp, reason) \ + tcp_unref((cl), (tcp), (reason), __FILE__, __LINE__) #define TCP_REF(tcp, reason) tcp_ref((tcp), (reason), __FILE__, __LINE__) -static void tcp_unref(grpc_tcp* tcp, const char* reason, const char* file, - int line) { +static void tcp_unref(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, + const char* reason, const char* file, int line) { if (grpc_tcp_trace.enabled()) { gpr_atm val = gpr_atm_no_barrier_load(&tcp->refcount.count); gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, @@ -305,7 +316,7 @@ static void tcp_unref(grpc_tcp* tcp, const char* reason, const char* file, val - 1); } if (gpr_unref(&tcp->refcount)) { - tcp_free(tcp); + tcp_free(exec_ctx, tcp); } } @@ -320,25 +331,26 @@ static void tcp_ref(grpc_tcp* tcp, const char* reason, const char* file, gpr_ref(&tcp->refcount); } #else -#define TCP_UNREF(tcp, reason) tcp_unref((tcp)) +#define TCP_UNREF(cl, tcp, reason) tcp_unref((cl), (tcp)) #define TCP_REF(tcp, reason) tcp_ref((tcp)) -static void tcp_unref(grpc_tcp* tcp) { +static void tcp_unref(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { if (gpr_unref(&tcp->refcount)) { - tcp_free(tcp); + tcp_free(exec_ctx, tcp); } } static void tcp_ref(grpc_tcp* tcp) { gpr_ref(&tcp->refcount); } #endif -static void tcp_destroy(grpc_endpoint* ep) { +static void tcp_destroy(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep) { grpc_network_status_unregister_endpoint(ep); grpc_tcp* tcp = (grpc_tcp*)ep; - grpc_slice_buffer_reset_and_unref_internal(&tcp->last_read_buffer); - TCP_UNREF(tcp, "destroy"); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &tcp->last_read_buffer); + TCP_UNREF(exec_ctx, tcp, "destroy"); } -static void call_read_cb(grpc_tcp* tcp, grpc_error* error) { +static void call_read_cb(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, + grpc_error* error) { grpc_closure* cb = tcp->read_cb; if (grpc_tcp_trace.enabled()) { @@ -357,11 +369,11 @@ static void call_read_cb(grpc_tcp* tcp, grpc_error* error) { tcp->read_cb = nullptr; tcp->incoming_buffer = nullptr; - GRPC_CLOSURE_RUN(cb, error); + GRPC_CLOSURE_RUN(exec_ctx, cb, error); } #define MAX_READ_IOVEC 4 -static void tcp_do_read(grpc_tcp* tcp) { +static void tcp_do_read(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { struct msghdr msg; struct iovec iov[MAX_READ_IOVEC]; ssize_t read_bytes; @@ -384,12 +396,12 @@ static void tcp_do_read(grpc_tcp* tcp) { msg.msg_controllen = 0; msg.msg_flags = 0; - GRPC_STATS_INC_TCP_READ_OFFER(tcp->incoming_buffer->length); - GRPC_STATS_INC_TCP_READ_OFFER_IOV_SIZE(tcp->incoming_buffer->count); + GRPC_STATS_INC_TCP_READ_OFFER(exec_ctx, tcp->incoming_buffer->length); + GRPC_STATS_INC_TCP_READ_OFFER_IOV_SIZE(exec_ctx, tcp->incoming_buffer->count); GPR_TIMER_BEGIN("recvmsg", 0); do { - GRPC_STATS_INC_SYSCALL_READ(); + GRPC_STATS_INC_SYSCALL_READ(exec_ctx); read_bytes = recvmsg(tcp->fd, &msg, 0); } while (read_bytes < 0 && errno == EINTR); GPR_TIMER_END("recvmsg", read_bytes >= 0); @@ -400,22 +412,24 @@ static void tcp_do_read(grpc_tcp* tcp) { if (errno == EAGAIN) { finish_estimate(tcp); /* We've consumed the edge, request a new one */ - notify_on_read(tcp); + notify_on_read(exec_ctx, tcp); } else { - grpc_slice_buffer_reset_and_unref_internal(tcp->incoming_buffer); - call_read_cb(tcp, + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, + tcp->incoming_buffer); + call_read_cb(exec_ctx, tcp, tcp_annotate_error(GRPC_OS_ERROR(errno, "recvmsg"), tcp)); - TCP_UNREF(tcp, "read"); + TCP_UNREF(exec_ctx, tcp, "read"); } } else if (read_bytes == 0) { /* 0 read size ==> end of stream */ - grpc_slice_buffer_reset_and_unref_internal(tcp->incoming_buffer); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, tcp->incoming_buffer); call_read_cb( - tcp, tcp_annotate_error( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Socket closed"), tcp)); - TCP_UNREF(tcp, "read"); + exec_ctx, tcp, + tcp_annotate_error( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Socket closed"), tcp)); + TCP_UNREF(exec_ctx, tcp, "read"); } else { - GRPC_STATS_INC_TCP_READ_SIZE(read_bytes); + GRPC_STATS_INC_TCP_READ_SIZE(exec_ctx, read_bytes); add_to_estimate(tcp, (size_t)read_bytes); GPR_ASSERT((size_t)read_bytes <= tcp->incoming_buffer->length); if ((size_t)read_bytes < tcp->incoming_buffer->length) { @@ -425,47 +439,50 @@ static void tcp_do_read(grpc_tcp* tcp) { &tcp->last_read_buffer); } GPR_ASSERT((size_t)read_bytes == tcp->incoming_buffer->length); - call_read_cb(tcp, GRPC_ERROR_NONE); - TCP_UNREF(tcp, "read"); + call_read_cb(exec_ctx, tcp, GRPC_ERROR_NONE); + TCP_UNREF(exec_ctx, tcp, "read"); } GPR_TIMER_END("tcp_continue_read", 0); } -static void tcp_read_allocation_done(void* tcpp, grpc_error* error) { +static void tcp_read_allocation_done(grpc_exec_ctx* exec_ctx, void* tcpp, + grpc_error* error) { grpc_tcp* tcp = (grpc_tcp*)tcpp; if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "TCP:%p read_allocation_done: %s", tcp, grpc_error_string(error)); } if (error != GRPC_ERROR_NONE) { - grpc_slice_buffer_reset_and_unref_internal(tcp->incoming_buffer); - grpc_slice_buffer_reset_and_unref_internal(&tcp->last_read_buffer); - call_read_cb(tcp, GRPC_ERROR_REF(error)); - TCP_UNREF(tcp, "read"); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, tcp->incoming_buffer); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, + &tcp->last_read_buffer); + call_read_cb(exec_ctx, tcp, GRPC_ERROR_REF(error)); + TCP_UNREF(exec_ctx, tcp, "read"); } else { - tcp_do_read(tcp); + tcp_do_read(exec_ctx, tcp); } } -static void tcp_continue_read(grpc_tcp* tcp) { +static void tcp_continue_read(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { size_t target_read_size = get_target_read_size(tcp); if (tcp->incoming_buffer->length < target_read_size && tcp->incoming_buffer->count < MAX_READ_IOVEC) { if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "TCP:%p alloc_slices", tcp); } - grpc_resource_user_alloc_slices(&tcp->slice_allocator, target_read_size, 1, - tcp->incoming_buffer); + grpc_resource_user_alloc_slices(exec_ctx, &tcp->slice_allocator, + target_read_size, 1, tcp->incoming_buffer); } else { if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "TCP:%p do_read", tcp); } - tcp_do_read(tcp); + tcp_do_read(exec_ctx, tcp); } } -static void tcp_handle_read(void* arg /* grpc_tcp */, grpc_error* error) { +static void tcp_handle_read(grpc_exec_ctx* exec_ctx, void* arg /* grpc_tcp */, + grpc_error* error) { grpc_tcp* tcp = (grpc_tcp*)arg; GPR_ASSERT(!tcp->finished_edge); if (grpc_tcp_trace.enabled()) { @@ -473,35 +490,37 @@ static void tcp_handle_read(void* arg /* grpc_tcp */, grpc_error* error) { } if (error != GRPC_ERROR_NONE) { - grpc_slice_buffer_reset_and_unref_internal(tcp->incoming_buffer); - grpc_slice_buffer_reset_and_unref_internal(&tcp->last_read_buffer); - call_read_cb(tcp, GRPC_ERROR_REF(error)); - TCP_UNREF(tcp, "read"); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, tcp->incoming_buffer); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, + &tcp->last_read_buffer); + call_read_cb(exec_ctx, tcp, GRPC_ERROR_REF(error)); + TCP_UNREF(exec_ctx, tcp, "read"); } else { - tcp_continue_read(tcp); + tcp_continue_read(exec_ctx, tcp); } } -static void tcp_read(grpc_endpoint* ep, grpc_slice_buffer* incoming_buffer, - grpc_closure* cb) { +static void tcp_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_slice_buffer* incoming_buffer, grpc_closure* cb) { grpc_tcp* tcp = (grpc_tcp*)ep; GPR_ASSERT(tcp->read_cb == nullptr); tcp->read_cb = cb; tcp->incoming_buffer = incoming_buffer; - grpc_slice_buffer_reset_and_unref_internal(incoming_buffer); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, incoming_buffer); grpc_slice_buffer_swap(incoming_buffer, &tcp->last_read_buffer); TCP_REF(tcp, "read"); if (tcp->finished_edge) { tcp->finished_edge = false; - notify_on_read(tcp); + notify_on_read(exec_ctx, tcp); } else { - GRPC_CLOSURE_SCHED(&tcp->read_done_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &tcp->read_done_closure, GRPC_ERROR_NONE); } } /* returns true if done, false if pending; if returning true, *error is set */ #define MAX_WRITE_IOVEC 1000 -static bool tcp_flush(grpc_tcp* tcp, grpc_error** error) { +static bool tcp_flush(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, + grpc_error** error) { struct msghdr msg; struct iovec iov[MAX_WRITE_IOVEC]; msg_iovlen_type iov_size; @@ -543,13 +562,13 @@ static bool tcp_flush(grpc_tcp* tcp, grpc_error** error) { msg.msg_controllen = 0; msg.msg_flags = 0; - GRPC_STATS_INC_TCP_WRITE_SIZE(sending_length); - GRPC_STATS_INC_TCP_WRITE_IOV_SIZE(iov_size); + GRPC_STATS_INC_TCP_WRITE_SIZE(exec_ctx, sending_length); + GRPC_STATS_INC_TCP_WRITE_IOV_SIZE(exec_ctx, iov_size); GPR_TIMER_BEGIN("sendmsg", 1); do { /* TODO(klempner): Cork if this is a partial write */ - GRPC_STATS_INC_SYSCALL_WRITE(); + GRPC_STATS_INC_SYSCALL_WRITE(exec_ctx); sent_length = sendmsg(tcp->fd, &msg, SENDMSG_FLAGS); } while (sent_length < 0 && errno == EINTR); GPR_TIMER_END("sendmsg", 0); @@ -561,18 +580,20 @@ static bool tcp_flush(grpc_tcp* tcp, grpc_error** error) { // point for (size_t idx = 0; idx < unwind_slice_idx; ++idx) { grpc_slice_unref_internal( - grpc_slice_buffer_take_first(tcp->outgoing_buffer)); + exec_ctx, grpc_slice_buffer_take_first(tcp->outgoing_buffer)); } return false; } else if (errno == EPIPE) { *error = grpc_error_set_int(GRPC_OS_ERROR(errno, "sendmsg"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE); - grpc_slice_buffer_reset_and_unref_internal(tcp->outgoing_buffer); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, + tcp->outgoing_buffer); return true; } else { *error = tcp_annotate_error(GRPC_OS_ERROR(errno, "sendmsg"), tcp); - grpc_slice_buffer_reset_and_unref_internal(tcp->outgoing_buffer); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, + tcp->outgoing_buffer); return true; } } @@ -595,29 +616,31 @@ static bool tcp_flush(grpc_tcp* tcp, grpc_error** error) { if (outgoing_slice_idx == tcp->outgoing_buffer->count) { *error = GRPC_ERROR_NONE; - grpc_slice_buffer_reset_and_unref_internal(tcp->outgoing_buffer); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, + tcp->outgoing_buffer); return true; } } } -static void tcp_handle_write(void* arg /* grpc_tcp */, grpc_error* error) { +static void tcp_handle_write(grpc_exec_ctx* exec_ctx, void* arg /* grpc_tcp */, + grpc_error* error) { grpc_tcp* tcp = (grpc_tcp*)arg; grpc_closure* cb; if (error != GRPC_ERROR_NONE) { cb = tcp->write_cb; tcp->write_cb = nullptr; - cb->cb(cb->cb_arg, error); - TCP_UNREF(tcp, "write"); + cb->cb(exec_ctx, cb->cb_arg, error); + TCP_UNREF(exec_ctx, tcp, "write"); return; } - if (!tcp_flush(tcp, &error)) { + if (!tcp_flush(exec_ctx, tcp, &error)) { if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "write: delayed"); } - notify_on_write(tcp); + notify_on_write(exec_ctx, tcp); } else { cb = tcp->write_cb; tcp->write_cb = nullptr; @@ -626,13 +649,13 @@ static void tcp_handle_write(void* arg /* grpc_tcp */, grpc_error* error) { gpr_log(GPR_DEBUG, "write: %s", str); } - GRPC_CLOSURE_RUN(cb, error); - TCP_UNREF(tcp, "write"); + GRPC_CLOSURE_RUN(exec_ctx, cb, error); + TCP_UNREF(exec_ctx, tcp, "write"); } } -static void tcp_write(grpc_endpoint* ep, grpc_slice_buffer* buf, - grpc_closure* cb) { +static void tcp_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_slice_buffer* buf, grpc_closure* cb) { grpc_tcp* tcp = (grpc_tcp*)ep; grpc_error* error = GRPC_ERROR_NONE; @@ -653,48 +676,51 @@ static void tcp_write(grpc_endpoint* ep, grpc_slice_buffer* buf, if (buf->length == 0) { GPR_TIMER_END("tcp_write", 0); GRPC_CLOSURE_SCHED( - cb, grpc_fd_is_shutdown(tcp->em_fd) - ? tcp_annotate_error( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("EOF"), tcp) - : GRPC_ERROR_NONE); + exec_ctx, cb, + grpc_fd_is_shutdown(tcp->em_fd) + ? tcp_annotate_error(GRPC_ERROR_CREATE_FROM_STATIC_STRING("EOF"), + tcp) + : GRPC_ERROR_NONE); return; } tcp->outgoing_buffer = buf; tcp->outgoing_byte_idx = 0; - if (!tcp_flush(tcp, &error)) { + if (!tcp_flush(exec_ctx, tcp, &error)) { TCP_REF(tcp, "write"); tcp->write_cb = cb; if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "write: delayed"); } - notify_on_write(tcp); + notify_on_write(exec_ctx, tcp); } else { if (grpc_tcp_trace.enabled()) { const char* str = grpc_error_string(error); gpr_log(GPR_DEBUG, "write: %s", str); } - GRPC_CLOSURE_SCHED(cb, error); + GRPC_CLOSURE_SCHED(exec_ctx, cb, error); } GPR_TIMER_END("tcp_write", 0); } -static void tcp_add_to_pollset(grpc_endpoint* ep, grpc_pollset* pollset) { +static void tcp_add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_pollset* pollset) { grpc_tcp* tcp = (grpc_tcp*)ep; - grpc_pollset_add_fd(pollset, tcp->em_fd); + grpc_pollset_add_fd(exec_ctx, pollset, tcp->em_fd); } -static void tcp_add_to_pollset_set(grpc_endpoint* ep, +static void tcp_add_to_pollset_set(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, grpc_pollset_set* pollset_set) { grpc_tcp* tcp = (grpc_tcp*)ep; - grpc_pollset_set_add_fd(pollset_set, tcp->em_fd); + grpc_pollset_set_add_fd(exec_ctx, pollset_set, tcp->em_fd); } -static void tcp_delete_from_pollset_set(grpc_endpoint* ep, +static void tcp_delete_from_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_endpoint* ep, grpc_pollset_set* pollset_set) { grpc_tcp* tcp = (grpc_tcp*)ep; - grpc_pollset_set_del_fd(pollset_set, tcp->em_fd); + grpc_pollset_set_del_fd(exec_ctx, pollset_set, tcp->em_fd); } static char* tcp_get_peer(grpc_endpoint* ep) { @@ -725,7 +751,7 @@ static const grpc_endpoint_vtable vtable = {tcp_read, #define MAX_CHUNK_SIZE 32 * 1024 * 1024 -grpc_endpoint* grpc_tcp_create(grpc_fd* em_fd, +grpc_endpoint* grpc_tcp_create(grpc_exec_ctx* exec_ctx, grpc_fd* em_fd, const grpc_channel_args* channel_args, const char* peer_string) { int tcp_read_chunk_size = GRPC_TCP_DEFAULT_READ_SLICE_SIZE; @@ -754,7 +780,7 @@ grpc_endpoint* grpc_tcp_create(grpc_fd* em_fd, grpc_channel_arg_get_integer(&channel_args->args[i], options); } else if (0 == strcmp(channel_args->args[i].key, GRPC_ARG_RESOURCE_QUOTA)) { - grpc_resource_quota_unref_internal(resource_quota); + grpc_resource_quota_unref_internal(exec_ctx, resource_quota); resource_quota = grpc_resource_quota_ref_internal( (grpc_resource_quota*)channel_args->args[i].value.pointer.p); } @@ -791,7 +817,7 @@ grpc_endpoint* grpc_tcp_create(grpc_fd* em_fd, &tcp->slice_allocator, tcp->resource_user, tcp_read_allocation_done, tcp); /* Tell network status tracker about new endpoint */ grpc_network_status_register_endpoint(&tcp->base); - grpc_resource_quota_unref_internal(resource_quota); + grpc_resource_quota_unref_internal(exec_ctx, resource_quota); return &tcp->base; } @@ -802,15 +828,15 @@ int grpc_tcp_fd(grpc_endpoint* ep) { return grpc_fd_wrapped_fd(tcp->em_fd); } -void grpc_tcp_destroy_and_release_fd(grpc_endpoint* ep, int* fd, - grpc_closure* done) { +void grpc_tcp_destroy_and_release_fd(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + int* fd, grpc_closure* done) { grpc_network_status_unregister_endpoint(ep); grpc_tcp* tcp = (grpc_tcp*)ep; GPR_ASSERT(ep->vtable == &vtable); tcp->release_fd = fd; tcp->release_fd_cb = done; - grpc_slice_buffer_reset_and_unref_internal(&tcp->last_read_buffer); - TCP_UNREF(tcp, "destroy"); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &tcp->last_read_buffer); + TCP_UNREF(exec_ctx, tcp, "destroy"); } #endif diff --git a/src/core/lib/iomgr/tcp_posix.h b/src/core/lib/iomgr/tcp_posix.h index 4529c02beb3..09051b7ed65 100644 --- a/src/core/lib/iomgr/tcp_posix.h +++ b/src/core/lib/iomgr/tcp_posix.h @@ -37,7 +37,8 @@ extern grpc_core::TraceFlag grpc_tcp_trace; /* Create a tcp endpoint given a file desciptor and a read slice size. Takes ownership of fd. */ -grpc_endpoint* grpc_tcp_create(grpc_fd* fd, const grpc_channel_args* args, +grpc_endpoint* grpc_tcp_create(grpc_exec_ctx* exec_ctx, grpc_fd* fd, + const grpc_channel_args* args, const char* peer_string); /* Return the tcp endpoint's fd, or -1 if this is not available. Does not @@ -49,7 +50,7 @@ int grpc_tcp_fd(grpc_endpoint* ep); /* Destroy the tcp endpoint without closing its fd. *fd will be set and done * will be called when the endpoint is destroyed. * Requires: ep must be a tcp endpoint and fd must not be NULL. */ -void grpc_tcp_destroy_and_release_fd(grpc_endpoint* ep, int* fd, - grpc_closure* done); +void grpc_tcp_destroy_and_release_fd(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + int* fd, grpc_closure* done); #endif /* GRPC_CORE_LIB_IOMGR_TCP_POSIX_H */ diff --git a/src/core/lib/iomgr/tcp_server.h b/src/core/lib/iomgr/tcp_server.h index 038c765c6cc..a1757a2b3ee 100644 --- a/src/core/lib/iomgr/tcp_server.h +++ b/src/core/lib/iomgr/tcp_server.h @@ -39,20 +39,22 @@ typedef struct grpc_tcp_server_acceptor { /* Called for newly connected TCP connections. Takes ownership of acceptor. */ -typedef void (*grpc_tcp_server_cb)(void* arg, grpc_endpoint* ep, +typedef void (*grpc_tcp_server_cb)(grpc_exec_ctx* exec_ctx, void* arg, + grpc_endpoint* ep, grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor); /* Create a server, initially not bound to any ports. The caller owns one ref. If shutdown_complete is not NULL, it will be used by grpc_tcp_server_unref() when the ref count reaches zero. */ -grpc_error* grpc_tcp_server_create(grpc_closure* shutdown_complete, +grpc_error* grpc_tcp_server_create(grpc_exec_ctx* exec_ctx, + grpc_closure* shutdown_complete, const grpc_channel_args* args, grpc_tcp_server** server); /* Start listening to bound ports */ -void grpc_tcp_server_start(grpc_tcp_server* server, grpc_pollset** pollsets, - size_t pollset_count, +void grpc_tcp_server_start(grpc_exec_ctx* exec_ctx, grpc_tcp_server* server, + grpc_pollset** pollsets, size_t pollset_count, grpc_tcp_server_cb on_accept_cb, void* cb_arg); /* Add a port to the server, returning the newly allocated port on success, or @@ -90,9 +92,10 @@ void grpc_tcp_server_shutdown_starting_add(grpc_tcp_server* s, /* If the refcount drops to zero, enqueue calls on exec_ctx to shutdown_listeners and delete s. */ -void grpc_tcp_server_unref(grpc_tcp_server* s); +void grpc_tcp_server_unref(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s); /* Shutdown the fds of listeners. */ -void grpc_tcp_server_shutdown_listeners(grpc_tcp_server* s); +void grpc_tcp_server_shutdown_listeners(grpc_exec_ctx* exec_ctx, + grpc_tcp_server* s); #endif /* GRPC_CORE_LIB_IOMGR_TCP_SERVER_H */ diff --git a/src/core/lib/iomgr/tcp_server_posix.cc b/src/core/lib/iomgr/tcp_server_posix.cc index 99e1c6cd069..6fed13c6c75 100644 --- a/src/core/lib/iomgr/tcp_server_posix.cc +++ b/src/core/lib/iomgr/tcp_server_posix.cc @@ -68,7 +68,8 @@ static void init(void) { #endif } -grpc_error* grpc_tcp_server_create(grpc_closure* shutdown_complete, +grpc_error* grpc_tcp_server_create(grpc_exec_ctx* exec_ctx, + grpc_closure* shutdown_complete, const grpc_channel_args* args, grpc_tcp_server** server) { gpr_once_init(&check_init, init); @@ -115,12 +116,12 @@ grpc_error* grpc_tcp_server_create(grpc_closure* shutdown_complete, return GRPC_ERROR_NONE; } -static void finish_shutdown(grpc_tcp_server* s) { +static void finish_shutdown(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { gpr_mu_lock(&s->mu); GPR_ASSERT(s->shutdown); gpr_mu_unlock(&s->mu); if (s->shutdown_complete != nullptr) { - GRPC_CLOSURE_SCHED(s->shutdown_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, s->shutdown_complete, GRPC_ERROR_NONE); } gpr_mu_destroy(&s->mu); @@ -130,18 +131,19 @@ static void finish_shutdown(grpc_tcp_server* s) { s->head = sp->next; gpr_free(sp); } - grpc_channel_args_destroy(s->channel_args); + grpc_channel_args_destroy(exec_ctx, s->channel_args); gpr_free(s); } -static void destroyed_port(void* server, grpc_error* error) { +static void destroyed_port(grpc_exec_ctx* exec_ctx, void* server, + grpc_error* error) { grpc_tcp_server* s = (grpc_tcp_server*)server; gpr_mu_lock(&s->mu); s->destroyed_ports++; if (s->destroyed_ports == s->nports) { gpr_mu_unlock(&s->mu); - finish_shutdown(s); + finish_shutdown(exec_ctx, s); } else { GPR_ASSERT(s->destroyed_ports < s->nports); gpr_mu_unlock(&s->mu); @@ -151,7 +153,7 @@ static void destroyed_port(void* server, grpc_error* error) { /* called when all listening endpoints have been shutdown, so no further events will be received on them - at this point it's safe to destroy things */ -static void deactivated_all_ports(grpc_tcp_server* s) { +static void deactivated_all_ports(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { /* delete ALL the things */ gpr_mu_lock(&s->mu); @@ -163,17 +165,17 @@ static void deactivated_all_ports(grpc_tcp_server* s) { grpc_unlink_if_unix_domain_socket(&sp->addr); GRPC_CLOSURE_INIT(&sp->destroyed_closure, destroyed_port, s, grpc_schedule_on_exec_ctx); - grpc_fd_orphan(sp->emfd, &sp->destroyed_closure, nullptr, + grpc_fd_orphan(exec_ctx, sp->emfd, &sp->destroyed_closure, nullptr, false /* already_closed */, "tcp_listener_shutdown"); } gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - finish_shutdown(s); + finish_shutdown(exec_ctx, s); } } -static void tcp_server_destroy(grpc_tcp_server* s) { +static void tcp_server_destroy(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { gpr_mu_lock(&s->mu); GPR_ASSERT(!s->shutdown); @@ -184,17 +186,18 @@ static void tcp_server_destroy(grpc_tcp_server* s) { grpc_tcp_listener* sp; for (sp = s->head; sp; sp = sp->next) { grpc_fd_shutdown( - sp->emfd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server destroyed")); + exec_ctx, sp->emfd, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server destroyed")); } gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - deactivated_all_ports(s); + deactivated_all_ports(exec_ctx, s); } } /* event manager callback when reads are ready */ -static void on_read(void* arg, grpc_error* err) { +static void on_read(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* err) { grpc_tcp_listener* sp = (grpc_tcp_listener*)arg; grpc_pollset* read_notifier_pollset; if (err != GRPC_ERROR_NONE) { @@ -220,7 +223,7 @@ static void on_read(void* arg, grpc_error* err) { case EINTR: continue; case EAGAIN: - grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); + grpc_fd_notify_on_read(exec_ctx, sp->emfd, &sp->read_closure); return; default: gpr_mu_lock(&sp->server->mu); @@ -246,7 +249,7 @@ static void on_read(void* arg, grpc_error* err) { grpc_fd* fdobj = grpc_fd_create(fd, name); - grpc_pollset_add_fd(read_notifier_pollset, fdobj); + grpc_pollset_add_fd(exec_ctx, read_notifier_pollset, fdobj); // Create acceptor. grpc_tcp_server_acceptor* acceptor = @@ -256,8 +259,8 @@ static void on_read(void* arg, grpc_error* err) { acceptor->fd_index = sp->fd_index; sp->server->on_accept_cb( - sp->server->on_accept_cb_arg, - grpc_tcp_create(fdobj, sp->server->channel_args, addr_str), + exec_ctx, sp->server->on_accept_cb_arg, + grpc_tcp_create(exec_ctx, fdobj, sp->server->channel_args, addr_str), read_notifier_pollset, acceptor); gpr_free(name); @@ -270,7 +273,7 @@ error: gpr_mu_lock(&sp->server->mu); if (0 == --sp->server->active_ports && sp->server->shutdown) { gpr_mu_unlock(&sp->server->mu); - deactivated_all_ports(sp->server); + deactivated_all_ports(exec_ctx, sp->server); } else { gpr_mu_unlock(&sp->server->mu); } @@ -480,8 +483,8 @@ int grpc_tcp_server_port_fd(grpc_tcp_server* s, unsigned port_index, return -1; } -void grpc_tcp_server_start(grpc_tcp_server* s, grpc_pollset** pollsets, - size_t pollset_count, +void grpc_tcp_server_start(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s, + grpc_pollset** pollsets, size_t pollset_count, grpc_tcp_server_cb on_accept_cb, void* on_accept_cb_arg) { size_t i; @@ -501,20 +504,20 @@ void grpc_tcp_server_start(grpc_tcp_server* s, grpc_pollset** pollsets, GPR_ASSERT(GRPC_LOG_IF_ERROR( "clone_port", clone_port(sp, (unsigned)(pollset_count - 1)))); for (i = 0; i < pollset_count; i++) { - grpc_pollset_add_fd(pollsets[i], sp->emfd); + grpc_pollset_add_fd(exec_ctx, pollsets[i], sp->emfd); GRPC_CLOSURE_INIT(&sp->read_closure, on_read, sp, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); + grpc_fd_notify_on_read(exec_ctx, sp->emfd, &sp->read_closure); s->active_ports++; sp = sp->next; } } else { for (i = 0; i < pollset_count; i++) { - grpc_pollset_add_fd(pollsets[i], sp->emfd); + grpc_pollset_add_fd(exec_ctx, pollsets[i], sp->emfd); } GRPC_CLOSURE_INIT(&sp->read_closure, on_read, sp, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); + grpc_fd_notify_on_read(exec_ctx, sp->emfd, &sp->read_closure); s->active_ports++; sp = sp->next; } @@ -535,24 +538,25 @@ void grpc_tcp_server_shutdown_starting_add(grpc_tcp_server* s, gpr_mu_unlock(&s->mu); } -void grpc_tcp_server_unref(grpc_tcp_server* s) { +void grpc_tcp_server_unref(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { if (gpr_unref(&s->refs)) { - grpc_tcp_server_shutdown_listeners(s); + grpc_tcp_server_shutdown_listeners(exec_ctx, s); gpr_mu_lock(&s->mu); - GRPC_CLOSURE_LIST_SCHED(&s->shutdown_starting); + GRPC_CLOSURE_LIST_SCHED(exec_ctx, &s->shutdown_starting); gpr_mu_unlock(&s->mu); - tcp_server_destroy(s); + tcp_server_destroy(exec_ctx, s); } } -void grpc_tcp_server_shutdown_listeners(grpc_tcp_server* s) { +void grpc_tcp_server_shutdown_listeners(grpc_exec_ctx* exec_ctx, + grpc_tcp_server* s) { gpr_mu_lock(&s->mu); s->shutdown_listeners = true; /* shutdown all fd's */ if (s->active_ports) { grpc_tcp_listener* sp; for (sp = s->head; sp; sp = sp->next) { - grpc_fd_shutdown(sp->emfd, + grpc_fd_shutdown(exec_ctx, sp->emfd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server shutdown")); } } diff --git a/src/core/lib/iomgr/tcp_server_uv.cc b/src/core/lib/iomgr/tcp_server_uv.cc index 1ac49190fb4..ffadf0b1abd 100644 --- a/src/core/lib/iomgr/tcp_server_uv.cc +++ b/src/core/lib/iomgr/tcp_server_uv.cc @@ -73,7 +73,8 @@ struct grpc_tcp_server { grpc_resource_quota* resource_quota; }; -grpc_error* grpc_tcp_server_create(grpc_closure* shutdown_complete, +grpc_error* grpc_tcp_server_create(grpc_exec_ctx* exec_ctx, + grpc_closure* shutdown_complete, const grpc_channel_args* args, grpc_tcp_server** server) { grpc_tcp_server* s = (grpc_tcp_server*)gpr_malloc(sizeof(grpc_tcp_server)); @@ -81,11 +82,11 @@ grpc_error* grpc_tcp_server_create(grpc_closure* shutdown_complete, for (size_t i = 0; i < (args == NULL ? 0 : args->num_args); i++) { if (0 == strcmp(GRPC_ARG_RESOURCE_QUOTA, args->args[i].key)) { if (args->args[i].type == GRPC_ARG_POINTER) { - grpc_resource_quota_unref_internal(s->resource_quota); + grpc_resource_quota_unref_internal(exec_ctx, s->resource_quota); s->resource_quota = grpc_resource_quota_ref_internal( (grpc_resource_quota*)args->args[i].value.pointer.p); } else { - grpc_resource_quota_unref_internal(s->resource_quota); + grpc_resource_quota_unref_internal(exec_ctx, s->resource_quota); gpr_free(s); return GRPC_ERROR_CREATE_FROM_STATIC_STRING( GRPC_ARG_RESOURCE_QUOTA " must be a pointer to a buffer pool"); @@ -118,10 +119,10 @@ void grpc_tcp_server_shutdown_starting_add(grpc_tcp_server* s, GRPC_ERROR_NONE); } -static void finish_shutdown(grpc_tcp_server* s) { +static void finish_shutdown(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { GPR_ASSERT(s->shutdown); if (s->shutdown_complete != NULL) { - GRPC_CLOSURE_SCHED(s->shutdown_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, s->shutdown_complete, GRPC_ERROR_NONE); } while (s->head) { @@ -131,17 +132,18 @@ static void finish_shutdown(grpc_tcp_server* s) { gpr_free(sp->handle); gpr_free(sp); } - grpc_resource_quota_unref_internal(s->resource_quota); + grpc_resource_quota_unref_internal(exec_ctx, s->resource_quota); gpr_free(s); } static void handle_close_callback(uv_handle_t* handle) { grpc_tcp_listener* sp = (grpc_tcp_listener*)handle->data; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; sp->server->open_ports--; if (sp->server->open_ports == 0 && sp->server->shutdown) { - finish_shutdown(sp->server); + finish_shutdown(&exec_ctx, sp->server); } + grpc_exec_ctx_finish(&exec_ctx); } static void close_listener(grpc_tcp_listener* sp) { @@ -151,7 +153,7 @@ static void close_listener(grpc_tcp_listener* sp) { } } -static void tcp_server_destroy(grpc_tcp_server* s) { +static void tcp_server_destroy(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { int immediately_done = 0; grpc_tcp_listener* sp; @@ -166,22 +168,28 @@ static void tcp_server_destroy(grpc_tcp_server* s) { } if (immediately_done) { - finish_shutdown(s); + finish_shutdown(exec_ctx, s); } } -void grpc_tcp_server_unref(grpc_tcp_server* s) { +void grpc_tcp_server_unref(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { GRPC_UV_ASSERT_SAME_THREAD(); if (gpr_unref(&s->refs)) { /* Complete shutdown_starting work before destroying. */ - grpc_core::ExecCtx exec_ctx; - GRPC_CLOSURE_LIST_SCHED(&s->shutdown_starting); - grpc_core::ExecCtx::Get()->Flush(); - tcp_server_destroy(s); + grpc_exec_ctx local_exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_CLOSURE_LIST_SCHED(&local_exec_ctx, &s->shutdown_starting); + if (exec_ctx == NULL) { + grpc_exec_ctx_flush(&local_exec_ctx); + tcp_server_destroy(&local_exec_ctx, s); + grpc_exec_ctx_finish(&local_exec_ctx); + } else { + grpc_exec_ctx_finish(&local_exec_ctx); + tcp_server_destroy(exec_ctx, s); + } } } -static void finish_accept(grpc_tcp_listener* sp) { +static void finish_accept(grpc_exec_ctx* exec_ctx, grpc_tcp_listener* sp) { grpc_tcp_server_acceptor* acceptor = (grpc_tcp_server_acceptor*)gpr_malloc(sizeof(*acceptor)); uv_tcp_t* client = NULL; @@ -217,13 +225,14 @@ static void finish_accept(grpc_tcp_listener* sp) { acceptor->from_server = sp->server; acceptor->port_index = sp->port_index; acceptor->fd_index = 0; - sp->server->on_accept_cb(sp->server->on_accept_cb_arg, ep, NULL, acceptor); + sp->server->on_accept_cb(exec_ctx, sp->server->on_accept_cb_arg, ep, NULL, + acceptor); gpr_free(peer_name_string); } static void on_connect(uv_stream_t* server, int status) { grpc_tcp_listener* sp = (grpc_tcp_listener*)server->data; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; if (status < 0) { switch (status) { @@ -244,10 +253,11 @@ static void on_connect(uv_stream_t* server, int status) { // Create acceptor. if (sp->server->on_accept_cb) { - finish_accept(sp); + finish_accept(&exec_ctx, sp); } else { sp->has_pending_connection = true; } + grpc_exec_ctx_finish(&exec_ctx); } static grpc_error* add_addr_to_server(grpc_tcp_server* s, @@ -444,8 +454,8 @@ grpc_error* grpc_tcp_server_add_port(grpc_tcp_server* s, return error; } -void grpc_tcp_server_start(grpc_tcp_server* server, grpc_pollset** pollsets, - size_t pollset_count, +void grpc_tcp_server_start(grpc_exec_ctx* exec_ctx, grpc_tcp_server* server, + grpc_pollset** pollsets, size_t pollset_count, grpc_tcp_server_cb on_accept_cb, void* cb_arg) { grpc_tcp_listener* sp; (void)pollsets; @@ -460,12 +470,13 @@ void grpc_tcp_server_start(grpc_tcp_server* server, grpc_pollset** pollsets, server->on_accept_cb_arg = cb_arg; for (sp = server->head; sp; sp = sp->next) { if (sp->has_pending_connection) { - finish_accept(sp); + finish_accept(exec_ctx, sp); sp->has_pending_connection = false; } } } -void grpc_tcp_server_shutdown_listeners(grpc_tcp_server* s) {} +void grpc_tcp_server_shutdown_listeners(grpc_exec_ctx* exec_ctx, + grpc_tcp_server* s) {} #endif /* GRPC_UV */ diff --git a/src/core/lib/iomgr/tcp_server_windows.cc b/src/core/lib/iomgr/tcp_server_windows.cc index 8a30dfde433..f538194895e 100644 --- a/src/core/lib/iomgr/tcp_server_windows.cc +++ b/src/core/lib/iomgr/tcp_server_windows.cc @@ -94,7 +94,8 @@ struct grpc_tcp_server { /* Public function. Allocates the proper data structures to hold a grpc_tcp_server. */ -grpc_error* grpc_tcp_server_create(grpc_closure* shutdown_complete, +grpc_error* grpc_tcp_server_create(grpc_exec_ctx* exec_ctx, + grpc_closure* shutdown_complete, const grpc_channel_args* args, grpc_tcp_server** server) { grpc_tcp_server* s = (grpc_tcp_server*)gpr_malloc(sizeof(grpc_tcp_server)); @@ -113,7 +114,8 @@ grpc_error* grpc_tcp_server_create(grpc_closure* shutdown_complete, return GRPC_ERROR_NONE; } -static void destroy_server(void* arg, grpc_error* error) { +static void destroy_server(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_tcp_server* s = (grpc_tcp_server*)arg; /* Now that the accepts have been aborted, we can destroy the sockets. @@ -126,16 +128,18 @@ static void destroy_server(void* arg, grpc_error* error) { grpc_winsocket_destroy(sp->socket); gpr_free(sp); } - grpc_channel_args_destroy(s->channel_args); + grpc_channel_args_destroy(exec_ctx, s->channel_args); gpr_free(s); } -static void finish_shutdown_locked(grpc_tcp_server* s) { +static void finish_shutdown_locked(grpc_exec_ctx* exec_ctx, + grpc_tcp_server* s) { if (s->shutdown_complete != NULL) { - GRPC_CLOSURE_SCHED(s->shutdown_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, s->shutdown_complete, GRPC_ERROR_NONE); } GRPC_CLOSURE_SCHED( + exec_ctx, GRPC_CLOSURE_CREATE(destroy_server, s, grpc_schedule_on_exec_ctx), GRPC_ERROR_NONE); } @@ -153,14 +157,14 @@ void grpc_tcp_server_shutdown_starting_add(grpc_tcp_server* s, gpr_mu_unlock(&s->mu); } -static void tcp_server_destroy(grpc_tcp_server* s) { +static void tcp_server_destroy(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { grpc_tcp_listener* sp; gpr_mu_lock(&s->mu); /* First, shutdown all fd's. This will queue abortion calls for all of the pending accepts due to the normal operation mechanism. */ if (s->active_ports == 0) { - finish_shutdown_locked(s); + finish_shutdown_locked(exec_ctx, s); } else { for (sp = s->head; sp; sp = sp->next) { sp->shutting_down = 1; @@ -170,13 +174,13 @@ static void tcp_server_destroy(grpc_tcp_server* s) { gpr_mu_unlock(&s->mu); } -void grpc_tcp_server_unref(grpc_tcp_server* s) { +void grpc_tcp_server_unref(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { if (gpr_unref(&s->refs)) { - grpc_tcp_server_shutdown_listeners(s); + grpc_tcp_server_shutdown_listeners(exec_ctx, s); gpr_mu_lock(&s->mu); - GRPC_CLOSURE_LIST_SCHED(&s->shutdown_starting); + GRPC_CLOSURE_LIST_SCHED(exec_ctx, &s->shutdown_starting); gpr_mu_unlock(&s->mu); - tcp_server_destroy(s); + tcp_server_destroy(exec_ctx, s); } } @@ -230,17 +234,19 @@ failure: return error; } -static void decrement_active_ports_and_notify_locked(grpc_tcp_listener* sp) { +static void decrement_active_ports_and_notify_locked(grpc_exec_ctx* exec_ctx, + grpc_tcp_listener* sp) { sp->shutting_down = 0; GPR_ASSERT(sp->server->active_ports > 0); if (0 == --sp->server->active_ports) { - finish_shutdown_locked(sp->server); + finish_shutdown_locked(exec_ctx, sp->server); } } /* In order to do an async accept, we need to create a socket first which will be the one assigned to the new incoming connection. */ -static grpc_error* start_accept_locked(grpc_tcp_listener* port) { +static grpc_error* start_accept_locked(grpc_exec_ctx* exec_ctx, + grpc_tcp_listener* port) { SOCKET sock = INVALID_SOCKET; BOOL success; DWORD addrlen = sizeof(struct sockaddr_in6) + 16; @@ -279,7 +285,7 @@ static grpc_error* start_accept_locked(grpc_tcp_listener* port) { /* We're ready to do the accept. Calling grpc_socket_notify_on_read may immediately process an accept that happened in the meantime. */ port->new_socket = sock; - grpc_socket_notify_on_read(port->socket, &port->on_accept); + grpc_socket_notify_on_read(exec_ctx, port->socket, &port->on_accept); port->outstanding_calls++; return error; @@ -290,7 +296,7 @@ failure: } /* Event manager callback when reads are ready. */ -static void on_accept(void* arg, grpc_error* error) { +static void on_accept(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { grpc_tcp_listener* sp = (grpc_tcp_listener*)arg; SOCKET sock = sp->new_socket; grpc_winsocket_callback_info* info = &sp->socket->read_info; @@ -351,7 +357,7 @@ static void on_accept(void* arg, grpc_error* error) { gpr_free(utf8_message); } gpr_asprintf(&fd_name, "tcp_server:%s", peer_name_string); - ep = grpc_tcp_create(grpc_winsocket_create(sock, fd_name), + ep = grpc_tcp_create(exec_ctx, grpc_winsocket_create(sock, fd_name), sp->server->channel_args, peer_name_string); gpr_free(fd_name); gpr_free(peer_name_string); @@ -369,15 +375,17 @@ static void on_accept(void* arg, grpc_error* error) { acceptor->from_server = sp->server; acceptor->port_index = sp->port_index; acceptor->fd_index = 0; - sp->server->on_accept_cb(sp->server->on_accept_cb_arg, ep, NULL, acceptor); + sp->server->on_accept_cb(exec_ctx, sp->server->on_accept_cb_arg, ep, NULL, + acceptor); } /* As we were notified from the IOCP of one and exactly one accept, the former socked we created has now either been destroy or assigned to the new connection. We need to create a new one for the next connection. */ - GPR_ASSERT(GRPC_LOG_IF_ERROR("start_accept", start_accept_locked(sp))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("start_accept", start_accept_locked(exec_ctx, sp))); if (0 == --sp->outstanding_calls) { - decrement_active_ports_and_notify_locked(sp); + decrement_active_ports_and_notify_locked(exec_ctx, sp); } gpr_mu_unlock(&sp->server->mu); } @@ -514,8 +522,8 @@ done: return error; } -void grpc_tcp_server_start(grpc_tcp_server* s, grpc_pollset** pollset, - size_t pollset_count, +void grpc_tcp_server_start(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s, + grpc_pollset** pollset, size_t pollset_count, grpc_tcp_server_cb on_accept_cb, void* on_accept_cb_arg) { grpc_tcp_listener* sp; @@ -526,12 +534,14 @@ void grpc_tcp_server_start(grpc_tcp_server* s, grpc_pollset** pollset, s->on_accept_cb = on_accept_cb; s->on_accept_cb_arg = on_accept_cb_arg; for (sp = s->head; sp; sp = sp->next) { - GPR_ASSERT(GRPC_LOG_IF_ERROR("start_accept", start_accept_locked(sp))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("start_accept", start_accept_locked(exec_ctx, sp))); s->active_ports++; } gpr_mu_unlock(&s->mu); } -void grpc_tcp_server_shutdown_listeners(grpc_tcp_server* s) {} +void grpc_tcp_server_shutdown_listeners(grpc_exec_ctx* exec_ctx, + grpc_tcp_server* s) {} #endif /* GRPC_WINSOCK_SOCKET */ diff --git a/src/core/lib/iomgr/tcp_uv.cc b/src/core/lib/iomgr/tcp_uv.cc index 2c26b60511d..40f4006203e 100644 --- a/src/core/lib/iomgr/tcp_uv.cc +++ b/src/core/lib/iomgr/tcp_uv.cc @@ -65,18 +65,19 @@ typedef struct { grpc_pollset* pollset; } grpc_tcp; -static void tcp_free(grpc_tcp* tcp) { - grpc_resource_user_unref(tcp->resource_user); +static void tcp_free(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { + grpc_resource_user_unref(exec_ctx, tcp->resource_user); gpr_free(tcp->handle); gpr_free(tcp->peer_string); gpr_free(tcp); } #ifndef NDEBUG -#define TCP_UNREF(tcp, reason) tcp_unref((tcp), (reason), __FILE__, __LINE__) +#define TCP_UNREF(exec_ctx, tcp, reason) \ + tcp_unref((exec_ctx), (tcp), (reason), __FILE__, __LINE__) #define TCP_REF(tcp, reason) tcp_ref((tcp), (reason), __FILE__, __LINE__) -static void tcp_unref(grpc_tcp* tcp, const char* reason, const char* file, - int line) { +static void tcp_unref(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, + const char* reason, const char* file, int line) { if (grpc_tcp_trace.enabled()) { gpr_atm val = gpr_atm_no_barrier_load(&tcp->refcount.count); gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, @@ -84,7 +85,7 @@ static void tcp_unref(grpc_tcp* tcp, const char* reason, const char* file, val - 1); } if (gpr_unref(&tcp->refcount)) { - tcp_free(tcp); + tcp_free(exec_ctx, tcp); } } @@ -99,11 +100,11 @@ static void tcp_ref(grpc_tcp* tcp, const char* reason, const char* file, gpr_ref(&tcp->refcount); } #else -#define TCP_UNREF(tcp, reason) tcp_unref((tcp)) +#define TCP_UNREF(exec_ctx, tcp, reason) tcp_unref((exec_ctx), (tcp)) #define TCP_REF(tcp, reason) tcp_ref((tcp)) -static void tcp_unref(grpc_tcp* tcp) { +static void tcp_unref(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { if (gpr_unref(&tcp->refcount)) { - tcp_free(tcp); + tcp_free(exec_ctx, tcp); } } @@ -111,14 +112,15 @@ static void tcp_ref(grpc_tcp* tcp) { gpr_ref(&tcp->refcount); } #endif static void uv_close_callback(uv_handle_t* handle) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_tcp* tcp = (grpc_tcp*)handle->data; - TCP_UNREF(tcp, "destroy"); + TCP_UNREF(&exec_ctx, tcp, "destroy"); + grpc_exec_ctx_finish(&exec_ctx); } static void alloc_uv_buf(uv_handle_t* handle, size_t suggested_size, uv_buf_t* buf) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_tcp* tcp = (grpc_tcp*)handle->data; (void)suggested_size; /* Before calling uv_read_start, we allocate a buffer with exactly one slice @@ -126,9 +128,11 @@ static void alloc_uv_buf(uv_handle_t* handle, size_t suggested_size, * allocation was successful. So slices[0] should always exist here */ buf->base = (char*)GRPC_SLICE_START_PTR(tcp->read_slices->slices[0]); buf->len = GRPC_SLICE_LENGTH(tcp->read_slices->slices[0]); + grpc_exec_ctx_finish(&exec_ctx); } -static void call_read_cb(grpc_tcp* tcp, grpc_error* error) { +static void call_read_cb(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, + grpc_error* error) { grpc_closure* cb = tcp->read_cb; if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "TCP:%p call_cb %p %p:%p", tcp, cb, cb->cb, cb->cb_arg); @@ -145,25 +149,25 @@ static void call_read_cb(grpc_tcp* tcp, grpc_error* error) { } tcp->read_slices = NULL; tcp->read_cb = NULL; - GRPC_CLOSURE_RUN(cb, error); + GRPC_CLOSURE_RUN(exec_ctx, cb, error); } static void read_callback(uv_stream_t* stream, ssize_t nread, const uv_buf_t* buf) { grpc_error* error; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_tcp* tcp = (grpc_tcp*)stream->data; grpc_slice_buffer garbage; if (nread == 0) { // Nothing happened. Wait for the next callback return; } - TCP_UNREF(tcp, "read"); + TCP_UNREF(&exec_ctx, tcp, "read"); // TODO(murgatroid99): figure out what the return value here means uv_read_stop(stream); if (nread == UV_EOF) { error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("EOF"); - grpc_slice_buffer_reset_and_unref_internal(tcp->read_slices); + grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, tcp->read_slices); } else if (nread > 0) { // Successful read error = GRPC_ERROR_NONE; @@ -173,17 +177,19 @@ static void read_callback(uv_stream_t* stream, ssize_t nread, grpc_slice_buffer_init(&garbage); grpc_slice_buffer_trim_end( tcp->read_slices, tcp->read_slices->length - (size_t)nread, &garbage); - grpc_slice_buffer_reset_and_unref_internal(&garbage); + grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, &garbage); } } else { // nread < 0: Error error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("TCP Read failed"); - grpc_slice_buffer_reset_and_unref_internal(tcp->read_slices); + grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, tcp->read_slices); } - call_read_cb(tcp, error); + call_read_cb(&exec_ctx, tcp, error); + grpc_exec_ctx_finish(&exec_ctx); } -static void tcp_read_allocation_done(void* tcpp, grpc_error* error) { +static void tcp_read_allocation_done(grpc_exec_ctx* exec_ctx, void* tcpp, + grpc_error* error) { int status; grpc_tcp* tcp = (grpc_tcp*)tcpp; if (grpc_tcp_trace.enabled()) { @@ -201,9 +207,9 @@ static void tcp_read_allocation_done(void* tcpp, grpc_error* error) { } } if (error != GRPC_ERROR_NONE) { - grpc_slice_buffer_reset_and_unref_internal(tcp->read_slices); - call_read_cb(tcp, GRPC_ERROR_REF(error)); - TCP_UNREF(tcp, "read"); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, tcp->read_slices); + call_read_cb(exec_ctx, tcp, GRPC_ERROR_REF(error)); + TCP_UNREF(exec_ctx, tcp, "read"); } if (grpc_tcp_trace.enabled()) { const char* str = grpc_error_string(error); @@ -211,16 +217,16 @@ static void tcp_read_allocation_done(void* tcpp, grpc_error* error) { } } -static void uv_endpoint_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, - grpc_closure* cb) { +static void uv_endpoint_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_slice_buffer* read_slices, grpc_closure* cb) { grpc_tcp* tcp = (grpc_tcp*)ep; GRPC_UV_ASSERT_SAME_THREAD(); GPR_ASSERT(tcp->read_cb == NULL); tcp->read_cb = cb; tcp->read_slices = read_slices; - grpc_slice_buffer_reset_and_unref_internal(read_slices); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, read_slices); TCP_REF(tcp, "read"); - grpc_resource_user_alloc_slices(&tcp->slice_allocator, + grpc_resource_user_alloc_slices(exec_ctx, &tcp->slice_allocator, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, 1, tcp->read_slices); } @@ -228,10 +234,10 @@ static void uv_endpoint_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, static void write_callback(uv_write_t* req, int status) { grpc_tcp* tcp = (grpc_tcp*)req->data; grpc_error* error; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_closure* cb = tcp->write_cb; tcp->write_cb = NULL; - TCP_UNREF(tcp, "write"); + TCP_UNREF(&exec_ctx, tcp, "write"); if (status == 0) { error = GRPC_ERROR_NONE; } else { @@ -242,10 +248,11 @@ static void write_callback(uv_write_t* req, int status) { gpr_log(GPR_DEBUG, "write complete on %p: error=%s", tcp, str); } gpr_free(tcp->write_buffers); - GRPC_CLOSURE_SCHED(cb, error); + GRPC_CLOSURE_SCHED(&exec_ctx, cb, error); + grpc_exec_ctx_finish(&exec_ctx); } -static void uv_endpoint_write(grpc_endpoint* ep, +static void uv_endpoint_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, grpc_slice_buffer* write_slices, grpc_closure* cb) { grpc_tcp* tcp = (grpc_tcp*)ep; @@ -268,8 +275,9 @@ static void uv_endpoint_write(grpc_endpoint* ep, } if (tcp->shutting_down) { - GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "TCP socket is shutting down")); + GRPC_CLOSURE_SCHED( + exec_ctx, cb, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("TCP socket is shutting down")); return; } @@ -279,7 +287,7 @@ static void uv_endpoint_write(grpc_endpoint* ep, if (tcp->write_slices->count == 0) { // No slices means we don't have to do anything, // and libuv doesn't like empty writes - GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); return; } @@ -300,31 +308,37 @@ static void uv_endpoint_write(grpc_endpoint* ep, write_callback); } -static void uv_add_to_pollset(grpc_endpoint* ep, grpc_pollset* pollset) { +static void uv_add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_pollset* pollset) { // No-op. We're ignoring pollsets currently + (void)exec_ctx; (void)ep; (void)pollset; grpc_tcp* tcp = (grpc_tcp*)ep; tcp->pollset = pollset; } -static void uv_add_to_pollset_set(grpc_endpoint* ep, +static void uv_add_to_pollset_set(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, grpc_pollset_set* pollset) { // No-op. We're ignoring pollsets currently + (void)exec_ctx; (void)ep; (void)pollset; } -static void uv_delete_from_pollset_set(grpc_endpoint* ep, +static void uv_delete_from_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_endpoint* ep, grpc_pollset_set* pollset) { // No-op. We're ignoring pollsets currently + (void)exec_ctx; (void)ep; (void)pollset; } static void shutdown_callback(uv_shutdown_t* req, int status) {} -static void uv_endpoint_shutdown(grpc_endpoint* ep, grpc_error* why) { +static void uv_endpoint_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_error* why) { grpc_tcp* tcp = (grpc_tcp*)ep; if (!tcp->shutting_down) { if (grpc_tcp_trace.enabled()) { @@ -334,12 +348,12 @@ static void uv_endpoint_shutdown(grpc_endpoint* ep, grpc_error* why) { tcp->shutting_down = true; uv_shutdown_t* req = &tcp->shutdown_req; uv_shutdown(req, (uv_stream_t*)tcp->handle, shutdown_callback); - grpc_resource_user_shutdown(tcp->resource_user); + grpc_resource_user_shutdown(exec_ctx, tcp->resource_user); } GRPC_ERROR_UNREF(why); } -static void uv_destroy(grpc_endpoint* ep) { +static void uv_destroy(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep) { grpc_network_status_unregister_endpoint(ep); grpc_tcp* tcp = (grpc_tcp*)ep; uv_close((uv_handle_t*)tcp->handle, uv_close_callback); @@ -372,7 +386,7 @@ grpc_endpoint* grpc_tcp_create(uv_tcp_t* handle, grpc_resource_quota* resource_quota, char* peer_string) { grpc_tcp* tcp = (grpc_tcp*)gpr_malloc(sizeof(grpc_tcp)); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "Creating TCP endpoint %p", tcp); @@ -399,6 +413,7 @@ grpc_endpoint* grpc_tcp_create(uv_tcp_t* handle, uv_unref((uv_handle_t*)handle); #endif + grpc_exec_ctx_finish(&exec_ctx); return &tcp->base; } diff --git a/src/core/lib/iomgr/tcp_windows.cc b/src/core/lib/iomgr/tcp_windows.cc index 6d091b77bb2..33868cdc7a7 100644 --- a/src/core/lib/iomgr/tcp_windows.cc +++ b/src/core/lib/iomgr/tcp_windows.cc @@ -109,20 +109,21 @@ typedef struct grpc_tcp { char* peer_string; } grpc_tcp; -static void tcp_free(grpc_tcp* tcp) { +static void tcp_free(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { grpc_winsocket_destroy(tcp->socket); gpr_mu_destroy(&tcp->mu); gpr_free(tcp->peer_string); - grpc_resource_user_unref(tcp->resource_user); + grpc_resource_user_unref(exec_ctx, tcp->resource_user); if (tcp->shutting_down) GRPC_ERROR_UNREF(tcp->shutdown_error); gpr_free(tcp); } #ifndef NDEBUG -#define TCP_UNREF(tcp, reason) tcp_unref((tcp), (reason), __FILE__, __LINE__) +#define TCP_UNREF(exec_ctx, tcp, reason) \ + tcp_unref((exec_ctx), (tcp), (reason), __FILE__, __LINE__) #define TCP_REF(tcp, reason) tcp_ref((tcp), (reason), __FILE__, __LINE__) -static void tcp_unref(grpc_tcp* tcp, const char* reason, const char* file, - int line) { +static void tcp_unref(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, + const char* reason, const char* file, int line) { if (grpc_tcp_trace.enabled()) { gpr_atm val = gpr_atm_no_barrier_load(&tcp->refcount.count); gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, @@ -130,7 +131,7 @@ static void tcp_unref(grpc_tcp* tcp, const char* reason, const char* file, val - 1); } if (gpr_unref(&tcp->refcount)) { - tcp_free(tcp); + tcp_free(exec_ctx, tcp); } } @@ -145,11 +146,11 @@ static void tcp_ref(grpc_tcp* tcp, const char* reason, const char* file, gpr_ref(&tcp->refcount); } #else -#define TCP_UNREF(tcp, reason) tcp_unref((tcp)) +#define TCP_UNREF(exec_ctx, tcp, reason) tcp_unref((exec_ctx), (tcp)) #define TCP_REF(tcp, reason) tcp_ref((tcp)) -static void tcp_unref(grpc_tcp* tcp) { +static void tcp_unref(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { if (gpr_unref(&tcp->refcount)) { - tcp_free(tcp); + tcp_free(exec_ctx, tcp); } } @@ -157,7 +158,7 @@ static void tcp_ref(grpc_tcp* tcp) { gpr_ref(&tcp->refcount); } #endif /* Asynchronous callback from the IOCP, or the background thread. */ -static void on_read(void* tcpp, grpc_error* error) { +static void on_read(grpc_exec_ctx* exec_ctx, void* tcpp, grpc_error* error) { grpc_tcp* tcp = (grpc_tcp*)tcpp; grpc_closure* cb = tcp->read_cb; grpc_winsocket* socket = tcp->socket; @@ -171,13 +172,13 @@ static void on_read(void* tcpp, grpc_error* error) { char* utf8_message = gpr_format_message(info->wsa_error); error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(utf8_message); gpr_free(utf8_message); - grpc_slice_unref_internal(tcp->read_slice); + grpc_slice_unref_internal(exec_ctx, tcp->read_slice); } else { if (info->bytes_transfered != 0 && !tcp->shutting_down) { sub = grpc_slice_sub_no_ref(tcp->read_slice, 0, info->bytes_transfered); grpc_slice_buffer_add(tcp->read_slices, sub); } else { - grpc_slice_unref_internal(tcp->read_slice); + grpc_slice_unref_internal(exec_ctx, tcp->read_slice); error = tcp->shutting_down ? GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "TCP stream shutting down", &tcp->shutdown_error, 1) @@ -187,12 +188,12 @@ static void on_read(void* tcpp, grpc_error* error) { } tcp->read_cb = NULL; - TCP_UNREF(tcp, "read"); - GRPC_CLOSURE_SCHED(cb, error); + TCP_UNREF(exec_ctx, tcp, "read"); + GRPC_CLOSURE_SCHED(exec_ctx, cb, error); } -static void win_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, - grpc_closure* cb) { +static void win_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_slice_buffer* read_slices, grpc_closure* cb) { grpc_tcp* tcp = (grpc_tcp*)ep; grpc_winsocket* handle = tcp->socket; grpc_winsocket_callback_info* info = &handle->read_info; @@ -203,14 +204,15 @@ static void win_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, if (tcp->shutting_down) { GRPC_CLOSURE_SCHED( - cb, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "TCP socket is shutting down", &tcp->shutdown_error, 1)); + exec_ctx, cb, + GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "TCP socket is shutting down", &tcp->shutdown_error, 1)); return; } tcp->read_cb = cb; tcp->read_slices = read_slices; - grpc_slice_buffer_reset_and_unref_internal(read_slices); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, read_slices); tcp->read_slice = GRPC_SLICE_MALLOC(8192); @@ -228,7 +230,7 @@ static void win_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, /* Did we get data immediately ? Yay. */ if (info->wsa_error != WSAEWOULDBLOCK) { info->bytes_transfered = bytes_read; - GRPC_CLOSURE_SCHED(&tcp->on_read, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &tcp->on_read, GRPC_ERROR_NONE); return; } @@ -241,17 +243,17 @@ static void win_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, int wsa_error = WSAGetLastError(); if (wsa_error != WSA_IO_PENDING) { info->wsa_error = wsa_error; - GRPC_CLOSURE_SCHED(&tcp->on_read, + GRPC_CLOSURE_SCHED(exec_ctx, &tcp->on_read, GRPC_WSA_ERROR(info->wsa_error, "WSARecv")); return; } } - grpc_socket_notify_on_read(tcp->socket, &tcp->on_read); + grpc_socket_notify_on_read(exec_ctx, tcp->socket, &tcp->on_read); } /* Asynchronous callback from the IOCP, or the background thread. */ -static void on_write(void* tcpp, grpc_error* error) { +static void on_write(grpc_exec_ctx* exec_ctx, void* tcpp, grpc_error* error) { grpc_tcp* tcp = (grpc_tcp*)tcpp; grpc_winsocket* handle = tcp->socket; grpc_winsocket_callback_info* info = &handle->write_info; @@ -272,13 +274,13 @@ static void on_write(void* tcpp, grpc_error* error) { } } - TCP_UNREF(tcp, "write"); - GRPC_CLOSURE_SCHED(cb, error); + TCP_UNREF(exec_ctx, tcp, "write"); + GRPC_CLOSURE_SCHED(exec_ctx, cb, error); } /* Initiates a write. */ -static void win_write(grpc_endpoint* ep, grpc_slice_buffer* slices, - grpc_closure* cb) { +static void win_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_slice_buffer* slices, grpc_closure* cb) { grpc_tcp* tcp = (grpc_tcp*)ep; grpc_winsocket* socket = tcp->socket; grpc_winsocket_callback_info* info = &socket->write_info; @@ -292,8 +294,9 @@ static void win_write(grpc_endpoint* ep, grpc_slice_buffer* slices, if (tcp->shutting_down) { GRPC_CLOSURE_SCHED( - cb, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "TCP socket is shutting down", &tcp->shutdown_error, 1)); + exec_ctx, cb, + GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "TCP socket is shutting down", &tcp->shutdown_error, 1)); return; } @@ -324,7 +327,7 @@ static void win_write(grpc_endpoint* ep, grpc_slice_buffer* slices, grpc_error* error = status == 0 ? GRPC_ERROR_NONE : GRPC_WSA_ERROR(info->wsa_error, "WSASend"); - GRPC_CLOSURE_SCHED(cb, error); + GRPC_CLOSURE_SCHED(exec_ctx, cb, error); if (allocated) gpr_free(allocated); return; } @@ -341,32 +344,35 @@ static void win_write(grpc_endpoint* ep, grpc_slice_buffer* slices, if (status != 0) { int wsa_error = WSAGetLastError(); if (wsa_error != WSA_IO_PENDING) { - TCP_UNREF(tcp, "write"); - GRPC_CLOSURE_SCHED(cb, GRPC_WSA_ERROR(wsa_error, "WSASend")); + TCP_UNREF(exec_ctx, tcp, "write"); + GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_WSA_ERROR(wsa_error, "WSASend")); return; } } /* As all is now setup, we can now ask for the IOCP notification. It may trigger the callback immediately however, but no matter. */ - grpc_socket_notify_on_write(socket, &tcp->on_write); + grpc_socket_notify_on_write(exec_ctx, socket, &tcp->on_write); } -static void win_add_to_pollset(grpc_endpoint* ep, grpc_pollset* ps) { +static void win_add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_pollset* ps) { grpc_tcp* tcp; (void)ps; tcp = (grpc_tcp*)ep; grpc_iocp_add_socket(tcp->socket); } -static void win_add_to_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pss) { +static void win_add_to_pollset_set(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_pollset_set* pss) { grpc_tcp* tcp; (void)pss; tcp = (grpc_tcp*)ep; grpc_iocp_add_socket(tcp->socket); } -static void win_delete_from_pollset_set(grpc_endpoint* ep, +static void win_delete_from_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_endpoint* ep, grpc_pollset_set* pss) {} /* Initiates a shutdown of the TCP endpoint. This will queue abort callbacks @@ -375,7 +381,8 @@ static void win_delete_from_pollset_set(grpc_endpoint* ep, we're not going to protect against these. However the IO Completion Port callback will happen from another thread, so we need to protect against concurrent access of the data structure in that regard. */ -static void win_shutdown(grpc_endpoint* ep, grpc_error* why) { +static void win_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_error* why) { grpc_tcp* tcp = (grpc_tcp*)ep; gpr_mu_lock(&tcp->mu); /* At that point, what may happen is that we're already inside the IOCP @@ -388,13 +395,13 @@ static void win_shutdown(grpc_endpoint* ep, grpc_error* why) { } grpc_winsocket_shutdown(tcp->socket); gpr_mu_unlock(&tcp->mu); - grpc_resource_user_shutdown(tcp->resource_user); + grpc_resource_user_shutdown(exec_ctx, tcp->resource_user); } -static void win_destroy(grpc_endpoint* ep) { +static void win_destroy(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep) { grpc_network_status_unregister_endpoint(ep); grpc_tcp* tcp = (grpc_tcp*)ep; - TCP_UNREF(tcp, "destroy"); + TCP_UNREF(exec_ctx, tcp, "destroy"); } static char* win_get_peer(grpc_endpoint* ep) { @@ -420,14 +427,14 @@ static grpc_endpoint_vtable vtable = {win_read, win_get_peer, win_get_fd}; -grpc_endpoint* grpc_tcp_create(grpc_winsocket* socket, +grpc_endpoint* grpc_tcp_create(grpc_exec_ctx* exec_ctx, grpc_winsocket* socket, grpc_channel_args* channel_args, const char* peer_string) { grpc_resource_quota* resource_quota = grpc_resource_quota_create(NULL); if (channel_args != NULL) { for (size_t i = 0; i < channel_args->num_args; i++) { if (0 == strcmp(channel_args->args[i].key, GRPC_ARG_RESOURCE_QUOTA)) { - grpc_resource_quota_unref_internal(resource_quota); + grpc_resource_quota_unref_internal(exec_ctx, resource_quota); resource_quota = grpc_resource_quota_ref_internal( (grpc_resource_quota*)channel_args->args[i].value.pointer.p); } @@ -445,7 +452,7 @@ grpc_endpoint* grpc_tcp_create(grpc_winsocket* socket, tcp->resource_user = grpc_resource_user_create(resource_quota, peer_string); /* Tell network status tracking code about the new endpoint */ grpc_network_status_register_endpoint(&tcp->base); - grpc_resource_quota_unref_internal(resource_quota); + grpc_resource_quota_unref_internal(exec_ctx, resource_quota); return &tcp->base; } diff --git a/src/core/lib/iomgr/tcp_windows.h b/src/core/lib/iomgr/tcp_windows.h index 8578a358ea8..28287e27950 100644 --- a/src/core/lib/iomgr/tcp_windows.h +++ b/src/core/lib/iomgr/tcp_windows.h @@ -38,7 +38,7 @@ /* Create a tcp endpoint given a winsock handle. * Takes ownership of the handle. */ -grpc_endpoint* grpc_tcp_create(grpc_winsocket* socket, +grpc_endpoint* grpc_tcp_create(grpc_exec_ctx* exec_ctx, grpc_winsocket* socket, grpc_channel_args* channel_args, const char* peer_string); diff --git a/src/core/lib/iomgr/timer.h b/src/core/lib/iomgr/timer.h index 82049859c5b..b9acce229ec 100644 --- a/src/core/lib/iomgr/timer.h +++ b/src/core/lib/iomgr/timer.h @@ -40,8 +40,8 @@ typedef struct grpc_timer grpc_timer; application code should check the error to determine how it was invoked. The application callback is also responsible for maintaining information about when to free up any user-level state. */ -void grpc_timer_init(grpc_timer* timer, grpc_millis deadline, - grpc_closure* closure); +void grpc_timer_init(grpc_exec_ctx* exec_ctx, grpc_timer* timer, + grpc_millis deadline, grpc_closure* closure); /* Initialize *timer without setting it. This can later be passed through the regular init or cancel */ @@ -73,7 +73,7 @@ void grpc_timer_init_unset(grpc_timer* timer); matches this aim. Requires: cancel() must happen after init() on a given timer */ -void grpc_timer_cancel(grpc_timer* timer); +void grpc_timer_cancel(grpc_exec_ctx* exec_ctx, grpc_timer* timer); /* iomgr internal api for dealing with timers */ @@ -90,9 +90,10 @@ typedef enum { *next is never guaranteed to be updated on any given execution; however, with high probability at least one thread in the system will see an update at any time slice. */ -grpc_timer_check_result grpc_timer_check(grpc_millis* next); -void grpc_timer_list_init(); -void grpc_timer_list_shutdown(); +grpc_timer_check_result grpc_timer_check(grpc_exec_ctx* exec_ctx, + grpc_millis* next); +void grpc_timer_list_init(grpc_exec_ctx* exec_ctx); +void grpc_timer_list_shutdown(grpc_exec_ctx* exec_ctx); /* Consume a kick issued by grpc_kick_poller */ void grpc_timer_consume_kick(void); diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index 103144eb3bf..fa95c43dbe3 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -225,7 +225,8 @@ static gpr_atm saturating_add(gpr_atm a, gpr_atm b) { return a + b; } -static grpc_timer_check_result run_some_expired_timers(gpr_atm now, +static grpc_timer_check_result run_some_expired_timers(grpc_exec_ctx* exec_ctx, + gpr_atm now, gpr_atm* next, grpc_error* error); @@ -235,7 +236,7 @@ static gpr_atm compute_min_deadline(timer_shard* shard) { : grpc_timer_heap_top(&shard->heap)->deadline; } -void grpc_timer_list_init() { +void grpc_timer_list_init(grpc_exec_ctx* exec_ctx) { uint32_t i; g_num_shards = GPR_MIN(1, 2 * gpr_cpu_num_cores()); @@ -246,7 +247,7 @@ void grpc_timer_list_init() { g_shared_mutables.initialized = true; g_shared_mutables.checker_mu = GPR_SPINLOCK_INITIALIZER; gpr_mu_init(&g_shared_mutables.mu); - g_shared_mutables.min_timer = grpc_core::ExecCtx::Get()->Now(); + g_shared_mutables.min_timer = grpc_exec_ctx_now(exec_ctx); gpr_tls_init(&g_last_seen_min_timer); gpr_tls_set(&g_last_seen_min_timer, 0); @@ -266,10 +267,10 @@ void grpc_timer_list_init() { INIT_TIMER_HASH_TABLE(); } -void grpc_timer_list_shutdown() { +void grpc_timer_list_shutdown(grpc_exec_ctx* exec_ctx) { size_t i; run_some_expired_timers( - GPR_ATM_MAX, nullptr, + exec_ctx, GPR_ATM_MAX, nullptr, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Timer list shutdown")); for (i = 0; i < g_num_shards; i++) { timer_shard* shard = &g_shards[i]; @@ -322,8 +323,8 @@ static void note_deadline_change(timer_shard* shard) { void grpc_timer_init_unset(grpc_timer* timer) { timer->pending = false; } -void grpc_timer_init(grpc_timer* timer, grpc_millis deadline, - grpc_closure* closure) { +void grpc_timer_init(grpc_exec_ctx* exec_ctx, grpc_timer* timer, + grpc_millis deadline, grpc_closure* closure) { int is_first_timer = 0; timer_shard* shard = &g_shards[GPR_HASH_POINTER(timer, g_num_shards)]; timer->closure = closure; @@ -336,12 +337,12 @@ void grpc_timer_init(grpc_timer* timer, grpc_millis deadline, if (grpc_timer_trace.enabled()) { gpr_log(GPR_DEBUG, "TIMER %p: SET %" PRIdPTR " now %" PRIdPTR " call %p[%p]", timer, - deadline, grpc_core::ExecCtx::Get()->Now(), closure, closure->cb); + deadline, grpc_exec_ctx_now(exec_ctx), closure, closure->cb); } if (!g_shared_mutables.initialized) { timer->pending = false; - GRPC_CLOSURE_SCHED(timer->closure, + GRPC_CLOSURE_SCHED(exec_ctx, timer->closure, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Attempt to create timer before initialization")); return; @@ -349,10 +350,10 @@ void grpc_timer_init(grpc_timer* timer, grpc_millis deadline, gpr_mu_lock(&shard->mu); timer->pending = true; - grpc_millis now = grpc_core::ExecCtx::Get()->Now(); + grpc_millis now = grpc_exec_ctx_now(exec_ctx); if (deadline <= now) { timer->pending = false; - GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, timer->closure, GRPC_ERROR_NONE); gpr_mu_unlock(&shard->mu); /* early out */ return; @@ -413,7 +414,7 @@ void grpc_timer_consume_kick(void) { gpr_tls_set(&g_last_seen_min_timer, 0); } -void grpc_timer_cancel(grpc_timer* timer) { +void grpc_timer_cancel(grpc_exec_ctx* exec_ctx, grpc_timer* timer) { if (!g_shared_mutables.initialized) { /* must have already been cancelled, also the shard mutex is invalid */ return; @@ -429,7 +430,7 @@ void grpc_timer_cancel(grpc_timer* timer) { if (timer->pending) { REMOVE_FROM_HASH_TABLE(timer); - GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(exec_ctx, timer->closure, GRPC_ERROR_CANCELLED); timer->pending = false; if (timer->heap_index == INVALID_HEAP_INDEX) { list_remove(timer); @@ -515,14 +516,15 @@ static grpc_timer* pop_one(timer_shard* shard, gpr_atm now) { } /* REQUIRES: shard->mu unlocked */ -static size_t pop_timers(timer_shard* shard, gpr_atm now, - gpr_atm* new_min_deadline, grpc_error* error) { +static size_t pop_timers(grpc_exec_ctx* exec_ctx, timer_shard* shard, + gpr_atm now, gpr_atm* new_min_deadline, + grpc_error* error) { size_t n = 0; grpc_timer* timer; gpr_mu_lock(&shard->mu); while ((timer = pop_one(shard, now))) { REMOVE_FROM_HASH_TABLE(timer); - GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(exec_ctx, timer->closure, GRPC_ERROR_REF(error)); n++; } *new_min_deadline = compute_min_deadline(shard); @@ -534,7 +536,8 @@ static size_t pop_timers(timer_shard* shard, gpr_atm now, return n; } -static grpc_timer_check_result run_some_expired_timers(gpr_atm now, +static grpc_timer_check_result run_some_expired_timers(grpc_exec_ctx* exec_ctx, + gpr_atm now, gpr_atm* next, grpc_error* error) { grpc_timer_check_result result = GRPC_TIMERS_NOT_CHECKED; @@ -563,7 +566,8 @@ static grpc_timer_check_result run_some_expired_timers(gpr_atm now, /* For efficiency, we pop as many available timers as we can from the shard. This may violate perfect timer deadline ordering, but that shouldn't be a big deal because we don't make ordering guarantees. */ - if (pop_timers(g_shard_queue[0], now, &new_min_deadline, error) > 0) { + if (pop_timers(exec_ctx, g_shard_queue[0], now, &new_min_deadline, + error) > 0) { result = GRPC_TIMERS_FIRED; } @@ -600,9 +604,10 @@ static grpc_timer_check_result run_some_expired_timers(gpr_atm now, return result; } -grpc_timer_check_result grpc_timer_check(grpc_millis* next) { +grpc_timer_check_result grpc_timer_check(grpc_exec_ctx* exec_ctx, + grpc_millis* next) { // prelude - grpc_millis now = grpc_core::ExecCtx::Get()->Now(); + grpc_millis now = grpc_exec_ctx_now(exec_ctx); /* fetch from a thread-local first: this avoids contention on a globally mutable cacheline in the common case */ @@ -641,7 +646,7 @@ grpc_timer_check_result grpc_timer_check(grpc_millis* next) { } // actual code grpc_timer_check_result r = - run_some_expired_timers(now, next, shutdown_error); + run_some_expired_timers(exec_ctx, now, next, shutdown_error); // tracing if (grpc_timer_check_trace.enabled()) { char* next_str; diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc index 8ca6a3c23e1..87ed0e05dcd 100644 --- a/src/core/lib/iomgr/timer_manager.cc +++ b/src/core/lib/iomgr/timer_manager.cc @@ -98,12 +98,13 @@ static void start_timer_thread_and_unlock(void) { } void grpc_timer_manager_tick() { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_millis next = GRPC_MILLIS_INF_FUTURE; - grpc_timer_check(&next); + grpc_timer_check(&exec_ctx, &next); + grpc_exec_ctx_finish(&exec_ctx); } -static void run_some_timers() { +static void run_some_timers(grpc_exec_ctx* exec_ctx) { // if there's something to execute... gpr_mu_lock(&g_mu); // remove a waiter from the pool, and start another thread if necessary @@ -125,7 +126,7 @@ static void run_some_timers() { if (grpc_timer_check_trace.enabled()) { gpr_log(GPR_DEBUG, "flush exec_ctx"); } - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(exec_ctx); gpr_mu_lock(&g_mu); // garbage collect any threads hanging out that are dead gc_completed_threads(); @@ -137,7 +138,7 @@ static void run_some_timers() { // wait until 'next' (or forever if there is already a timed waiter in the pool) // returns true if the thread should continue executing (false if it should // shutdown) -static bool wait_until(grpc_millis next) { +static bool wait_until(grpc_exec_ctx* exec_ctx, grpc_millis next) { gpr_mu_lock(&g_mu); // if we're not threaded anymore, leave if (!g_threaded) { @@ -178,7 +179,7 @@ static bool wait_until(grpc_millis next) { g_timed_waiter_deadline = next; if (grpc_timer_check_trace.enabled()) { - grpc_millis wait_time = next - grpc_core::ExecCtx::Get()->Now(); + grpc_millis wait_time = next - grpc_exec_ctx_now(exec_ctx); gpr_log(GPR_DEBUG, "sleep for a %" PRIdPTR " milliseconds", wait_time); } @@ -219,15 +220,15 @@ static bool wait_until(grpc_millis next) { return true; } -static void timer_main_loop() { +static void timer_main_loop(grpc_exec_ctx* exec_ctx) { for (;;) { grpc_millis next = GRPC_MILLIS_INF_FUTURE; - grpc_core::ExecCtx::Get()->InvalidateNow(); + grpc_exec_ctx_invalidate_now(exec_ctx); // check timer state, updates next to the next time to run a check - switch (grpc_timer_check(&next)) { + switch (grpc_timer_check(exec_ctx, &next)) { case GRPC_TIMERS_FIRED: - run_some_timers(); + run_some_timers(exec_ctx); break; case GRPC_TIMERS_NOT_CHECKED: /* This case only happens under contention, meaning more than one timer @@ -245,7 +246,7 @@ static void timer_main_loop() { next = GRPC_MILLIS_INF_FUTURE; /* fall through */ case GRPC_TIMERS_CHECKED_AND_EMPTY: - if (!wait_until(next)) { + if (!wait_until(exec_ctx, next)) { return; } break; @@ -273,9 +274,10 @@ static void timer_thread_cleanup(completed_thread* ct) { static void timer_thread(void* completed_thread_ptr) { // this threads exec_ctx: we try to run things through to completion here // since it's easy to spin up new threads - grpc_core::ExecCtx exec_ctx(0); - timer_main_loop(); - + grpc_exec_ctx exec_ctx = + GRPC_EXEC_CTX_INITIALIZER(0, grpc_never_ready_to_finish, nullptr); + timer_main_loop(&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); timer_thread_cleanup((completed_thread*)completed_thread_ptr); } diff --git a/src/core/lib/iomgr/timer_uv.cc b/src/core/lib/iomgr/timer_uv.cc index 5d238da0892..fac2026fa93 100644 --- a/src/core/lib/iomgr/timer_uv.cc +++ b/src/core/lib/iomgr/timer_uv.cc @@ -42,27 +42,28 @@ static void stop_uv_timer(uv_timer_t* handle) { void run_expired_timer(uv_timer_t* handle) { grpc_timer* timer = (grpc_timer*)handle->data; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GRPC_UV_ASSERT_SAME_THREAD(); GPR_ASSERT(timer->pending); timer->pending = 0; - GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&exec_ctx, timer->closure, GRPC_ERROR_NONE); stop_uv_timer(handle); + grpc_exec_ctx_finish(&exec_ctx); } -void grpc_timer_init(grpc_timer* timer, grpc_millis deadline, - grpc_closure* closure) { +void grpc_timer_init(grpc_exec_ctx* exec_ctx, grpc_timer* timer, + grpc_millis deadline, grpc_closure* closure) { uint64_t timeout; uv_timer_t* uv_timer; GRPC_UV_ASSERT_SAME_THREAD(); timer->closure = closure; - if (deadline <= grpc_core::ExecCtx::Get()->Now()) { + if (deadline <= grpc_exec_ctx_now(exec_ctx)) { timer->pending = 0; - GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, timer->closure, GRPC_ERROR_NONE); return; } timer->pending = 1; - timeout = (uint64_t)(deadline - grpc_core::ExecCtx::Get()->Now()); + timeout = (uint64_t)(deadline - grpc_exec_ctx_now(exec_ctx)); uv_timer = (uv_timer_t*)gpr_malloc(sizeof(uv_timer_t)); uv_timer_init(uv_default_loop(), uv_timer); uv_timer->data = timer; @@ -76,21 +77,22 @@ void grpc_timer_init(grpc_timer* timer, grpc_millis deadline, void grpc_timer_init_unset(grpc_timer* timer) { timer->pending = 0; } -void grpc_timer_cancel(grpc_timer* timer) { +void grpc_timer_cancel(grpc_exec_ctx* exec_ctx, grpc_timer* timer) { GRPC_UV_ASSERT_SAME_THREAD(); if (timer->pending) { timer->pending = 0; - GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(exec_ctx, timer->closure, GRPC_ERROR_CANCELLED); stop_uv_timer((uv_timer_t*)timer->uv_timer); } } -grpc_timer_check_result grpc_timer_check(grpc_millis* next) { +grpc_timer_check_result grpc_timer_check(grpc_exec_ctx* exec_ctx, + grpc_millis* next) { return GRPC_TIMERS_NOT_CHECKED; } -void grpc_timer_list_init() {} -void grpc_timer_list_shutdown() {} +void grpc_timer_list_init(grpc_exec_ctx* exec_ctx) {} +void grpc_timer_list_shutdown(grpc_exec_ctx* exec_ctx) {} void grpc_timer_consume_kick(void) {} diff --git a/src/core/lib/iomgr/udp_server.cc b/src/core/lib/iomgr/udp_server.cc index 55e0b165ec0..7b7d6946b12 100644 --- a/src/core/lib/iomgr/udp_server.cc +++ b/src/core/lib/iomgr/udp_server.cc @@ -150,30 +150,31 @@ grpc_udp_server* grpc_udp_server_create(const grpc_channel_args* args) { return s; } -static void shutdown_fd(void* args, grpc_error* error) { +static void shutdown_fd(grpc_exec_ctx* exec_ctx, void* args, + grpc_error* error) { struct shutdown_fd_args* shutdown_args = (struct shutdown_fd_args*)args; grpc_udp_listener* sp = shutdown_args->sp; gpr_log(GPR_DEBUG, "shutdown fd %d", sp->fd); gpr_mu_lock(shutdown_args->server_mu); - grpc_fd_shutdown(sp->emfd, GRPC_ERROR_REF(error)); + grpc_fd_shutdown(exec_ctx, sp->emfd, GRPC_ERROR_REF(error)); sp->already_shutdown = true; if (!sp->notify_on_write_armed) { // Re-arm write notification to notify listener with error. This is // necessary to decrement active_ports. sp->notify_on_write_armed = true; - grpc_fd_notify_on_write(sp->emfd, &sp->write_closure); + grpc_fd_notify_on_write(exec_ctx, sp->emfd, &sp->write_closure); } gpr_mu_unlock(shutdown_args->server_mu); gpr_free(shutdown_args); } -static void dummy_cb(void* arg, grpc_error* error) { +static void dummy_cb(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { // No-op. } -static void finish_shutdown(grpc_udp_server* s) { +static void finish_shutdown(grpc_exec_ctx* exec_ctx, grpc_udp_server* s) { if (s->shutdown_complete != nullptr) { - GRPC_CLOSURE_SCHED(s->shutdown_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, s->shutdown_complete, GRPC_ERROR_NONE); } gpr_mu_destroy(&s->mu); @@ -192,13 +193,14 @@ static void finish_shutdown(grpc_udp_server* s) { gpr_free(s); } -static void destroyed_port(void* server, grpc_error* error) { +static void destroyed_port(grpc_exec_ctx* exec_ctx, void* server, + grpc_error* error) { grpc_udp_server* s = (grpc_udp_server*)server; gpr_mu_lock(&s->mu); s->destroyed_ports++; if (s->destroyed_ports == s->nports) { gpr_mu_unlock(&s->mu); - finish_shutdown(s); + finish_shutdown(exec_ctx, s); } else { gpr_mu_unlock(&s->mu); } @@ -207,7 +209,7 @@ static void destroyed_port(void* server, grpc_error* error) { /* called when all listening endpoints have been shutdown, so no further events will be received on them - at this point it's safe to destroy things */ -static void deactivated_all_ports(grpc_udp_server* s) { +static void deactivated_all_ports(grpc_exec_ctx* exec_ctx, grpc_udp_server* s) { /* delete ALL the things */ gpr_mu_lock(&s->mu); @@ -228,19 +230,21 @@ static void deactivated_all_ports(grpc_udp_server* s) { grpc_schedule_on_exec_ctx); GPR_ASSERT(sp->orphan_cb); gpr_log(GPR_DEBUG, "Orphan fd %d", sp->fd); - sp->orphan_cb(sp->emfd, &sp->orphan_fd_closure, sp->server->user_data); + sp->orphan_cb(exec_ctx, sp->emfd, &sp->orphan_fd_closure, + sp->server->user_data); } - grpc_fd_orphan(sp->emfd, &sp->destroyed_closure, nullptr, + grpc_fd_orphan(exec_ctx, sp->emfd, &sp->destroyed_closure, nullptr, false /* already_closed */, "udp_listener_shutdown"); } gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - finish_shutdown(s); + finish_shutdown(exec_ctx, s); } } -void grpc_udp_server_destroy(grpc_udp_server* s, grpc_closure* on_done) { +void grpc_udp_server_destroy(grpc_exec_ctx* exec_ctx, grpc_udp_server* s, + grpc_closure* on_done) { grpc_udp_listener* sp; gpr_mu_lock(&s->mu); @@ -260,13 +264,14 @@ void grpc_udp_server_destroy(grpc_udp_server* s, grpc_closure* on_done) { args->server_mu = &s->mu; GRPC_CLOSURE_INIT(&sp->orphan_fd_closure, shutdown_fd, args, grpc_schedule_on_exec_ctx); - sp->orphan_cb(sp->emfd, &sp->orphan_fd_closure, sp->server->user_data); + sp->orphan_cb(exec_ctx, sp->emfd, &sp->orphan_fd_closure, + sp->server->user_data); sp->orphan_notified = true; } gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - deactivated_all_ports(s); + deactivated_all_ports(exec_ctx, s); } } @@ -345,7 +350,7 @@ error: return -1; } -static void do_read(void* arg, grpc_error* error) { +static void do_read(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { grpc_udp_listener* sp = reinterpret_cast(arg); GPR_ASSERT(sp->read_cb && error == GRPC_ERROR_NONE); /* TODO: the reason we hold server->mu here is merely to prevent fd @@ -353,28 +358,29 @@ static void do_read(void* arg, grpc_error* error) { * read lock if available. */ gpr_mu_lock(&sp->server->mu); /* Tell the registered callback that data is available to read. */ - if (!sp->already_shutdown && sp->read_cb(sp->emfd, sp->server->user_data)) { + if (!sp->already_shutdown && + sp->read_cb(exec_ctx, sp->emfd, sp->server->user_data)) { /* There maybe more packets to read. Schedule read_more_cb_ closure to run * after finishing this event loop. */ - GRPC_CLOSURE_SCHED(&sp->do_read_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &sp->do_read_closure, GRPC_ERROR_NONE); } else { /* Finish reading all the packets, re-arm the notification event so we can * get another chance to read. Or fd already shutdown, re-arm to get a * notification with shutdown error. */ - grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); + grpc_fd_notify_on_read(exec_ctx, sp->emfd, &sp->read_closure); } gpr_mu_unlock(&sp->server->mu); } /* event manager callback when reads are ready */ -static void on_read(void* arg, grpc_error* error) { +static void on_read(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { grpc_udp_listener* sp = (grpc_udp_listener*)arg; gpr_mu_lock(&sp->server->mu); if (error != GRPC_ERROR_NONE) { if (0 == --sp->server->active_ports && sp->server->shutdown) { gpr_mu_unlock(&sp->server->mu); - deactivated_all_ports(sp->server); + deactivated_all_ports(exec_ctx, sp->server); } else { gpr_mu_unlock(&sp->server->mu); } @@ -383,57 +389,59 @@ static void on_read(void* arg, grpc_error* error) { /* Read once. If there is more data to read, off load the work to another * thread to finish. */ GPR_ASSERT(sp->read_cb); - if (sp->read_cb(sp->emfd, sp->server->user_data)) { + if (sp->read_cb(exec_ctx, sp->emfd, sp->server->user_data)) { /* There maybe more packets to read. Schedule read_more_cb_ closure to run * after finishing this event loop. */ GRPC_CLOSURE_INIT(&sp->do_read_closure, do_read, arg, grpc_executor_scheduler(GRPC_EXECUTOR_LONG)); - GRPC_CLOSURE_SCHED(&sp->do_read_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &sp->do_read_closure, GRPC_ERROR_NONE); } else { /* Finish reading all the packets, re-arm the notification event so we can * get another chance to read. Or fd already shutdown, re-arm to get a * notification with shutdown error. */ - grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); + grpc_fd_notify_on_read(exec_ctx, sp->emfd, &sp->read_closure); } gpr_mu_unlock(&sp->server->mu); } // Wrapper of grpc_fd_notify_on_write() with a grpc_closure callback interface. -void fd_notify_on_write_wrapper(void* arg, grpc_error* error) { +void fd_notify_on_write_wrapper(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_udp_listener* sp = reinterpret_cast(arg); gpr_mu_lock(&sp->server->mu); if (!sp->notify_on_write_armed) { - grpc_fd_notify_on_write(sp->emfd, &sp->write_closure); + grpc_fd_notify_on_write(exec_ctx, sp->emfd, &sp->write_closure); sp->notify_on_write_armed = true; } gpr_mu_unlock(&sp->server->mu); } -static void do_write(void* arg, grpc_error* error) { +static void do_write(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { grpc_udp_listener* sp = reinterpret_cast(arg); gpr_mu_lock(&(sp->server->mu)); if (sp->already_shutdown) { // If fd has been shutdown, don't write any more and re-arm notification. - grpc_fd_notify_on_write(sp->emfd, &sp->write_closure); + grpc_fd_notify_on_write(exec_ctx, sp->emfd, &sp->write_closure); } else { sp->notify_on_write_armed = false; /* Tell the registered callback that the socket is writeable. */ GPR_ASSERT(sp->write_cb && error == GRPC_ERROR_NONE); GRPC_CLOSURE_INIT(&sp->notify_on_write_closure, fd_notify_on_write_wrapper, arg, grpc_schedule_on_exec_ctx); - sp->write_cb(sp->emfd, sp->server->user_data, &sp->notify_on_write_closure); + sp->write_cb(exec_ctx, sp->emfd, sp->server->user_data, + &sp->notify_on_write_closure); } gpr_mu_unlock(&sp->server->mu); } -static void on_write(void* arg, grpc_error* error) { +static void on_write(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { grpc_udp_listener* sp = (grpc_udp_listener*)arg; gpr_mu_lock(&(sp->server->mu)); if (error != GRPC_ERROR_NONE) { if (0 == --sp->server->active_ports && sp->server->shutdown) { gpr_mu_unlock(&sp->server->mu); - deactivated_all_ports(sp->server); + deactivated_all_ports(exec_ctx, sp->server); } else { gpr_mu_unlock(&sp->server->mu); } @@ -444,7 +452,7 @@ static void on_write(void* arg, grpc_error* error) { GRPC_CLOSURE_INIT(&sp->do_write_closure, do_write, arg, grpc_executor_scheduler(GRPC_EXECUTOR_LONG)); - GRPC_CLOSURE_SCHED(&sp->do_write_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &sp->do_write_closure, GRPC_ERROR_NONE); gpr_mu_unlock(&sp->server->mu); } @@ -585,8 +593,9 @@ int grpc_udp_server_get_fd(grpc_udp_server* s, unsigned port_index) { return sp->fd; } -void grpc_udp_server_start(grpc_udp_server* s, grpc_pollset** pollsets, - size_t pollset_count, void* user_data) { +void grpc_udp_server_start(grpc_exec_ctx* exec_ctx, grpc_udp_server* s, + grpc_pollset** pollsets, size_t pollset_count, + void* user_data) { size_t i; gpr_mu_lock(&s->mu); grpc_udp_listener* sp; @@ -597,16 +606,16 @@ void grpc_udp_server_start(grpc_udp_server* s, grpc_pollset** pollsets, sp = s->head; while (sp != nullptr) { for (i = 0; i < pollset_count; i++) { - grpc_pollset_add_fd(pollsets[i], sp->emfd); + grpc_pollset_add_fd(exec_ctx, pollsets[i], sp->emfd); } GRPC_CLOSURE_INIT(&sp->read_closure, on_read, sp, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); + grpc_fd_notify_on_read(exec_ctx, sp->emfd, &sp->read_closure); GRPC_CLOSURE_INIT(&sp->write_closure, on_write, sp, grpc_schedule_on_exec_ctx); sp->notify_on_write_armed = true; - grpc_fd_notify_on_write(sp->emfd, &sp->write_closure); + grpc_fd_notify_on_write(exec_ctx, sp->emfd, &sp->write_closure); /* Registered for both read and write callbacks: increment active_ports * twice to account for this, and delay free-ing of memory until both diff --git a/src/core/lib/iomgr/udp_server.h b/src/core/lib/iomgr/udp_server.h index 02e3acb7f5f..1bd6922de66 100644 --- a/src/core/lib/iomgr/udp_server.h +++ b/src/core/lib/iomgr/udp_server.h @@ -32,15 +32,18 @@ typedef struct grpc_udp_server grpc_udp_server; /* Called when data is available to read from the socket. * Return true if there is more data to read from fd. */ -typedef bool (*grpc_udp_server_read_cb)(grpc_fd* emfd, void* user_data); +typedef bool (*grpc_udp_server_read_cb)(grpc_exec_ctx* exec_ctx, grpc_fd* emfd, + void* user_data); /* Called when the socket is writeable. The given closure should be scheduled * when the socket becomes blocked next time. */ -typedef void (*grpc_udp_server_write_cb)(grpc_fd* emfd, void* user_data, +typedef void (*grpc_udp_server_write_cb)(grpc_exec_ctx* exec_ctx, grpc_fd* emfd, + void* user_data, grpc_closure* notify_on_write_closure); /* Called when the grpc_fd is about to be orphaned (and the FD closed). */ -typedef void (*grpc_udp_server_orphan_cb)(grpc_fd* emfd, +typedef void (*grpc_udp_server_orphan_cb)(grpc_exec_ctx* exec_ctx, + grpc_fd* emfd, grpc_closure* shutdown_fd_callback, void* user_data); @@ -48,8 +51,9 @@ typedef void (*grpc_udp_server_orphan_cb)(grpc_fd* emfd, grpc_udp_server* grpc_udp_server_create(const grpc_channel_args* args); /* Start listening to bound ports. user_data is passed to callbacks. */ -void grpc_udp_server_start(grpc_udp_server* udp_server, grpc_pollset** pollsets, - size_t pollset_count, void* user_data); +void grpc_udp_server_start(grpc_exec_ctx* exec_ctx, grpc_udp_server* udp_server, + grpc_pollset** pollsets, size_t pollset_count, + void* user_data); int grpc_udp_server_get_fd(grpc_udp_server* s, unsigned port_index); @@ -69,6 +73,7 @@ int grpc_udp_server_add_port(grpc_udp_server* s, grpc_udp_server_write_cb write_cb, grpc_udp_server_orphan_cb orphan_cb); -void grpc_udp_server_destroy(grpc_udp_server* server, grpc_closure* on_done); +void grpc_udp_server_destroy(grpc_exec_ctx* exec_ctx, grpc_udp_server* server, + grpc_closure* on_done); #endif /* GRPC_CORE_LIB_IOMGR_UDP_SERVER_H */ diff --git a/src/core/lib/security/context/security_context.cc b/src/core/lib/security/context/security_context.cc index 03710279948..19c6148e434 100644 --- a/src/core/lib/security/context/security_context.cc +++ b/src/core/lib/security/context/security_context.cc @@ -36,7 +36,7 @@ grpc_core::DebugOnlyTraceFlag grpc_trace_auth_context_refcount( grpc_call_error grpc_call_set_credentials(grpc_call* call, grpc_call_credentials* creds) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_client_security_context* ctx = nullptr; GRPC_API_TRACE("grpc_call_set_credentials(call=%p, creds=%p)", 2, (call, creds)); @@ -52,10 +52,10 @@ grpc_call_error grpc_call_set_credentials(grpc_call* call, grpc_call_context_set(call, GRPC_CONTEXT_SECURITY, ctx, grpc_client_security_context_destroy); } else { - grpc_call_credentials_unref(ctx->creds); + grpc_call_credentials_unref(&exec_ctx, ctx->creds); ctx->creds = grpc_call_credentials_ref(creds); } - + grpc_exec_ctx_finish(&exec_ctx); return GRPC_CALL_OK; } @@ -85,14 +85,15 @@ grpc_client_security_context* grpc_client_security_context_create(void) { } void grpc_client_security_context_destroy(void* ctx) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_client_security_context* c = (grpc_client_security_context*)ctx; - grpc_call_credentials_unref(c->creds); + grpc_call_credentials_unref(&exec_ctx, c->creds); GRPC_AUTH_CONTEXT_UNREF(c->auth_context, "client_security_context"); if (c->extension.instance != nullptr && c->extension.destroy != nullptr) { c->extension.destroy(c->extension.instance); } gpr_free(ctx); + grpc_exec_ctx_finish(&exec_ctx); } /* --- grpc_server_security_context --- */ @@ -140,7 +141,7 @@ grpc_auth_context* grpc_auth_context_ref(grpc_auth_context* ctx, } #else grpc_auth_context* grpc_auth_context_ref(grpc_auth_context* ctx) { - if (ctx == nullptr) return nullptr; + if (ctx == NULL) return NULL; #endif gpr_ref(&ctx->refcount); return ctx; @@ -158,7 +159,7 @@ void grpc_auth_context_unref(grpc_auth_context* ctx, const char* file, int line, } #else void grpc_auth_context_unref(grpc_auth_context* ctx) { - if (ctx == nullptr) return; + if (ctx == NULL) return; #endif if (gpr_unref(&ctx->refcount)) { size_t i; @@ -302,7 +303,7 @@ void grpc_auth_property_reset(grpc_auth_property* property) { memset(property, 0, sizeof(grpc_auth_property)); } -static void auth_context_pointer_arg_destroy(void* p) { +static void auth_context_pointer_arg_destroy(grpc_exec_ctx* exec_ctx, void* p) { GRPC_AUTH_CONTEXT_UNREF((grpc_auth_context*)p, "auth_context_pointer_arg"); } diff --git a/src/core/lib/security/credentials/composite/composite_credentials.cc b/src/core/lib/security/credentials/composite/composite_credentials.cc index e4c1604795f..93dd721240c 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.cc +++ b/src/core/lib/security/credentials/composite/composite_credentials.cc @@ -39,15 +39,17 @@ typedef struct { grpc_closure internal_on_request_metadata; } grpc_composite_call_credentials_metadata_context; -static void composite_call_destruct(grpc_call_credentials* creds) { +static void composite_call_destruct(grpc_exec_ctx* exec_ctx, + grpc_call_credentials* creds) { grpc_composite_call_credentials* c = (grpc_composite_call_credentials*)creds; for (size_t i = 0; i < c->inner.num_creds; i++) { - grpc_call_credentials_unref(c->inner.creds_array[i]); + grpc_call_credentials_unref(exec_ctx, c->inner.creds_array[i]); } gpr_free(c->inner.creds_array); } -static void composite_call_metadata_cb(void* arg, grpc_error* error) { +static void composite_call_metadata_cb(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_composite_call_credentials_metadata_context* ctx = (grpc_composite_call_credentials_metadata_context*)arg; if (error == GRPC_ERROR_NONE) { @@ -56,23 +58,23 @@ static void composite_call_metadata_cb(void* arg, grpc_error* error) { grpc_call_credentials* inner_creds = ctx->composite_creds->inner.creds_array[ctx->creds_index++]; if (grpc_call_credentials_get_request_metadata( - inner_creds, ctx->pollent, ctx->auth_md_context, ctx->md_array, - &ctx->internal_on_request_metadata, &error)) { + exec_ctx, inner_creds, ctx->pollent, ctx->auth_md_context, + ctx->md_array, &ctx->internal_on_request_metadata, &error)) { // Synchronous response, so call ourselves recursively. - composite_call_metadata_cb(arg, error); + composite_call_metadata_cb(exec_ctx, arg, error); GRPC_ERROR_UNREF(error); } return; } // We're done! } - GRPC_CLOSURE_SCHED(ctx->on_request_metadata, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(exec_ctx, ctx->on_request_metadata, GRPC_ERROR_REF(error)); gpr_free(ctx); } static bool composite_call_get_request_metadata( - grpc_call_credentials* creds, grpc_polling_entity* pollent, - grpc_auth_metadata_context auth_md_context, + grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, + grpc_polling_entity* pollent, grpc_auth_metadata_context auth_md_context, grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, grpc_error** error) { grpc_composite_call_credentials* c = (grpc_composite_call_credentials*)creds; @@ -91,8 +93,8 @@ static bool composite_call_get_request_metadata( grpc_call_credentials* inner_creds = ctx->composite_creds->inner.creds_array[ctx->creds_index++]; if (grpc_call_credentials_get_request_metadata( - inner_creds, ctx->pollent, ctx->auth_md_context, ctx->md_array, - &ctx->internal_on_request_metadata, error)) { + exec_ctx, inner_creds, ctx->pollent, ctx->auth_md_context, + ctx->md_array, &ctx->internal_on_request_metadata, error)) { if (*error != GRPC_ERROR_NONE) break; } else { synchronous = false; // Async return. @@ -104,12 +106,12 @@ static bool composite_call_get_request_metadata( } static void composite_call_cancel_get_request_metadata( - grpc_call_credentials* creds, grpc_credentials_mdelem_array* md_array, - grpc_error* error) { + grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, + grpc_credentials_mdelem_array* md_array, grpc_error* error) { grpc_composite_call_credentials* c = (grpc_composite_call_credentials*)creds; for (size_t i = 0; i < c->inner.num_creds; ++i) { grpc_call_credentials_cancel_get_request_metadata( - c->inner.creds_array[i], md_array, GRPC_ERROR_REF(error)); + exec_ctx, c->inner.creds_array[i], md_array, GRPC_ERROR_REF(error)); } GRPC_ERROR_UNREF(error); } @@ -198,17 +200,19 @@ grpc_call_credentials* grpc_credentials_contains_type( /* -- Composite channel credentials. -- */ -static void composite_channel_destruct(grpc_channel_credentials* creds) { +static void composite_channel_destruct(grpc_exec_ctx* exec_ctx, + grpc_channel_credentials* creds) { grpc_composite_channel_credentials* c = (grpc_composite_channel_credentials*)creds; - grpc_channel_credentials_unref(c->inner_creds); - grpc_call_credentials_unref(c->call_creds); + grpc_channel_credentials_unref(exec_ctx, c->inner_creds); + grpc_call_credentials_unref(exec_ctx, c->call_creds); } static grpc_security_status composite_channel_create_security_connector( - grpc_channel_credentials* creds, grpc_call_credentials* call_creds, - const char* target, const grpc_channel_args* args, - grpc_channel_security_connector** sc, grpc_channel_args** new_args) { + grpc_exec_ctx* exec_ctx, grpc_channel_credentials* creds, + grpc_call_credentials* call_creds, const char* target, + const grpc_channel_args* args, grpc_channel_security_connector** sc, + grpc_channel_args** new_args) { grpc_composite_channel_credentials* c = (grpc_composite_channel_credentials*)creds; grpc_security_status status = GRPC_SECURITY_ERROR; @@ -223,11 +227,12 @@ static grpc_security_status composite_channel_create_security_connector( grpc_composite_call_credentials_create(c->call_creds, call_creds, nullptr); status = c->inner_creds->vtable->create_security_connector( - c->inner_creds, composite_call_creds, target, args, sc, new_args); - grpc_call_credentials_unref(composite_call_creds); + exec_ctx, c->inner_creds, composite_call_creds, target, args, sc, + new_args); + grpc_call_credentials_unref(exec_ctx, composite_call_creds); } else { status = c->inner_creds->vtable->create_security_connector( - c->inner_creds, c->call_creds, target, args, sc, new_args); + exec_ctx, c->inner_creds, c->call_creds, target, args, sc, new_args); } return status; } diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index 48b459e1be9..90576e69b91 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -47,8 +47,8 @@ grpc_credentials_metadata_request* grpc_credentials_metadata_request_create( } void grpc_credentials_metadata_request_destroy( - grpc_credentials_metadata_request* r) { - grpc_call_credentials_unref(r->creds); + grpc_exec_ctx* exec_ctx, grpc_credentials_metadata_request* r) { + grpc_call_credentials_unref(exec_ctx, r->creds); grpc_http_response_destroy(&r->response); gpr_free(r); } @@ -60,11 +60,12 @@ grpc_channel_credentials* grpc_channel_credentials_ref( return creds; } -void grpc_channel_credentials_unref(grpc_channel_credentials* creds) { +void grpc_channel_credentials_unref(grpc_exec_ctx* exec_ctx, + grpc_channel_credentials* creds) { if (creds == nullptr) return; if (gpr_unref(&creds->refcount)) { if (creds->vtable->destruct != nullptr) { - creds->vtable->destruct(creds); + creds->vtable->destruct(exec_ctx, creds); } gpr_free(creds); } @@ -72,8 +73,9 @@ void grpc_channel_credentials_unref(grpc_channel_credentials* creds) { void grpc_channel_credentials_release(grpc_channel_credentials* creds) { GRPC_API_TRACE("grpc_channel_credentials_release(creds=%p)", 1, (creds)); - grpc_core::ExecCtx exec_ctx; - grpc_channel_credentials_unref(creds); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_credentials_unref(&exec_ctx, creds); + grpc_exec_ctx_finish(&exec_ctx); } grpc_call_credentials* grpc_call_credentials_ref(grpc_call_credentials* creds) { @@ -82,11 +84,12 @@ grpc_call_credentials* grpc_call_credentials_ref(grpc_call_credentials* creds) { return creds; } -void grpc_call_credentials_unref(grpc_call_credentials* creds) { +void grpc_call_credentials_unref(grpc_exec_ctx* exec_ctx, + grpc_call_credentials* creds) { if (creds == nullptr) return; if (gpr_unref(&creds->refcount)) { if (creds->vtable->destruct != nullptr) { - creds->vtable->destruct(creds); + creds->vtable->destruct(exec_ctx, creds); } gpr_free(creds); } @@ -94,42 +97,44 @@ void grpc_call_credentials_unref(grpc_call_credentials* creds) { void grpc_call_credentials_release(grpc_call_credentials* creds) { GRPC_API_TRACE("grpc_call_credentials_release(creds=%p)", 1, (creds)); - grpc_core::ExecCtx exec_ctx; - grpc_call_credentials_unref(creds); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_call_credentials_unref(&exec_ctx, creds); + grpc_exec_ctx_finish(&exec_ctx); } bool grpc_call_credentials_get_request_metadata( - grpc_call_credentials* creds, grpc_polling_entity* pollent, - grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, - grpc_closure* on_request_metadata, grpc_error** error) { + grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, + grpc_polling_entity* pollent, grpc_auth_metadata_context context, + grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, + grpc_error** error) { if (creds == nullptr || creds->vtable->get_request_metadata == nullptr) { return true; } - return creds->vtable->get_request_metadata(creds, pollent, context, md_array, - on_request_metadata, error); + return creds->vtable->get_request_metadata( + exec_ctx, creds, pollent, context, md_array, on_request_metadata, error); } void grpc_call_credentials_cancel_get_request_metadata( - grpc_call_credentials* creds, grpc_credentials_mdelem_array* md_array, - grpc_error* error) { + grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, + grpc_credentials_mdelem_array* md_array, grpc_error* error) { if (creds == nullptr || creds->vtable->cancel_get_request_metadata == nullptr) { return; } - creds->vtable->cancel_get_request_metadata(creds, md_array, error); + creds->vtable->cancel_get_request_metadata(exec_ctx, creds, md_array, error); } grpc_security_status grpc_channel_credentials_create_security_connector( - grpc_channel_credentials* channel_creds, const char* target, - const grpc_channel_args* args, grpc_channel_security_connector** sc, - grpc_channel_args** new_args) { + grpc_exec_ctx* exec_ctx, grpc_channel_credentials* channel_creds, + const char* target, const grpc_channel_args* args, + grpc_channel_security_connector** sc, grpc_channel_args** new_args) { *new_args = nullptr; if (channel_creds == nullptr) { return GRPC_SECURITY_ERROR; } GPR_ASSERT(channel_creds->vtable->create_security_connector != nullptr); return channel_creds->vtable->create_security_connector( - channel_creds, nullptr, target, args, sc, new_args); + exec_ctx, channel_creds, nullptr, target, args, sc, new_args); } grpc_channel_credentials* @@ -144,8 +149,8 @@ grpc_channel_credentials_duplicate_without_call_credentials( } } -static void credentials_pointer_arg_destroy(void* p) { - grpc_channel_credentials_unref((grpc_channel_credentials*)p); +static void credentials_pointer_arg_destroy(grpc_exec_ctx* exec_ctx, void* p) { + grpc_channel_credentials_unref(exec_ctx, (grpc_channel_credentials*)p); } static void* credentials_pointer_arg_copy(void* p) { @@ -195,11 +200,12 @@ grpc_server_credentials* grpc_server_credentials_ref( return creds; } -void grpc_server_credentials_unref(grpc_server_credentials* creds) { +void grpc_server_credentials_unref(grpc_exec_ctx* exec_ctx, + grpc_server_credentials* creds) { if (creds == nullptr) return; if (gpr_unref(&creds->refcount)) { if (creds->vtable->destruct != nullptr) { - creds->vtable->destruct(creds); + creds->vtable->destruct(exec_ctx, creds); } if (creds->processor.destroy != nullptr && creds->processor.state != nullptr) { @@ -211,17 +217,19 @@ void grpc_server_credentials_unref(grpc_server_credentials* creds) { void grpc_server_credentials_release(grpc_server_credentials* creds) { GRPC_API_TRACE("grpc_server_credentials_release(creds=%p)", 1, (creds)); - grpc_core::ExecCtx exec_ctx; - grpc_server_credentials_unref(creds); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_server_credentials_unref(&exec_ctx, creds); + grpc_exec_ctx_finish(&exec_ctx); } grpc_security_status grpc_server_credentials_create_security_connector( - grpc_server_credentials* creds, grpc_server_security_connector** sc) { + grpc_exec_ctx* exec_ctx, grpc_server_credentials* creds, + grpc_server_security_connector** sc) { if (creds == nullptr || creds->vtable->create_security_connector == nullptr) { gpr_log(GPR_ERROR, "Server credentials cannot create security context."); return GRPC_SECURITY_ERROR; } - return creds->vtable->create_security_connector(creds, sc); + return creds->vtable->create_security_connector(exec_ctx, creds, sc); } void grpc_server_credentials_set_auth_metadata_processor( @@ -239,8 +247,9 @@ void grpc_server_credentials_set_auth_metadata_processor( creds->processor = processor; } -static void server_credentials_pointer_arg_destroy(void* p) { - grpc_server_credentials_unref((grpc_server_credentials*)p); +static void server_credentials_pointer_arg_destroy(grpc_exec_ctx* exec_ctx, + void* p) { + grpc_server_credentials_unref(exec_ctx, (grpc_server_credentials*)p); } static void* server_credentials_pointer_arg_copy(void* p) { diff --git a/src/core/lib/security/credentials/credentials.h b/src/core/lib/security/credentials/credentials.h index 4825b657205..bc1bd11c77d 100644 --- a/src/core/lib/security/credentials/credentials.h +++ b/src/core/lib/security/credentials/credentials.h @@ -88,12 +88,13 @@ void grpc_override_well_known_credentials_path_getter( #define GRPC_ARG_CHANNEL_CREDENTIALS "grpc.channel_credentials" typedef struct { - void (*destruct)(grpc_channel_credentials* c); + void (*destruct)(grpc_exec_ctx* exec_ctx, grpc_channel_credentials* c); grpc_security_status (*create_security_connector)( - grpc_channel_credentials* c, grpc_call_credentials* call_creds, - const char* target, const grpc_channel_args* args, - grpc_channel_security_connector** sc, grpc_channel_args** new_args); + grpc_exec_ctx* exec_ctx, grpc_channel_credentials* c, + grpc_call_credentials* call_creds, const char* target, + const grpc_channel_args* args, grpc_channel_security_connector** sc, + grpc_channel_args** new_args); grpc_channel_credentials* (*duplicate_without_call_credentials)( grpc_channel_credentials* c); @@ -107,16 +108,17 @@ struct grpc_channel_credentials { grpc_channel_credentials* grpc_channel_credentials_ref( grpc_channel_credentials* creds); -void grpc_channel_credentials_unref(grpc_channel_credentials* creds); +void grpc_channel_credentials_unref(grpc_exec_ctx* exec_ctx, + grpc_channel_credentials* creds); /* Creates a security connector for the channel. May also create new channel args for the channel to be used in place of the passed in const args if returned non NULL. In that case the caller is responsible for destroying new_args after channel creation. */ grpc_security_status grpc_channel_credentials_create_security_connector( - grpc_channel_credentials* creds, const char* target, - const grpc_channel_args* args, grpc_channel_security_connector** sc, - grpc_channel_args** new_args); + grpc_exec_ctx* exec_ctx, grpc_channel_credentials* creds, + const char* target, const grpc_channel_args* args, + grpc_channel_security_connector** sc, grpc_channel_args** new_args); /* Creates a version of the channel credentials without any attached call credentials. This can be used in order to open a channel to a non-trusted @@ -151,19 +153,22 @@ void grpc_credentials_mdelem_array_add(grpc_credentials_mdelem_array* list, void grpc_credentials_mdelem_array_append(grpc_credentials_mdelem_array* dst, grpc_credentials_mdelem_array* src); -void grpc_credentials_mdelem_array_destroy(grpc_credentials_mdelem_array* list); +void grpc_credentials_mdelem_array_destroy(grpc_exec_ctx* exec_ctx, + grpc_credentials_mdelem_array* list); /* --- grpc_call_credentials. --- */ typedef struct { - void (*destruct)(grpc_call_credentials* c); - bool (*get_request_metadata)(grpc_call_credentials* c, + void (*destruct)(grpc_exec_ctx* exec_ctx, grpc_call_credentials* c); + bool (*get_request_metadata)(grpc_exec_ctx* exec_ctx, + grpc_call_credentials* c, grpc_polling_entity* pollent, grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, grpc_error** error); - void (*cancel_get_request_metadata)(grpc_call_credentials* c, + void (*cancel_get_request_metadata)(grpc_exec_ctx* exec_ctx, + grpc_call_credentials* c, grpc_credentials_mdelem_array* md_array, grpc_error* error); } grpc_call_credentials_vtable; @@ -175,35 +180,39 @@ struct grpc_call_credentials { }; grpc_call_credentials* grpc_call_credentials_ref(grpc_call_credentials* creds); -void grpc_call_credentials_unref(grpc_call_credentials* creds); +void grpc_call_credentials_unref(grpc_exec_ctx* exec_ctx, + grpc_call_credentials* creds); /// Returns true if completed synchronously, in which case \a error will /// be set to indicate the result. Otherwise, \a on_request_metadata will /// be invoked asynchronously when complete. \a md_array will be populated /// with the resulting metadata once complete. bool grpc_call_credentials_get_request_metadata( - grpc_call_credentials* creds, grpc_polling_entity* pollent, - grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, - grpc_closure* on_request_metadata, grpc_error** error); + grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, + grpc_polling_entity* pollent, grpc_auth_metadata_context context, + grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, + grpc_error** error); /// Cancels a pending asynchronous operation started by /// grpc_call_credentials_get_request_metadata() with the corresponding /// value of \a md_array. void grpc_call_credentials_cancel_get_request_metadata( - grpc_call_credentials* c, grpc_credentials_mdelem_array* md_array, - grpc_error* error); + grpc_exec_ctx* exec_ctx, grpc_call_credentials* c, + grpc_credentials_mdelem_array* md_array, grpc_error* error); /* Metadata-only credentials with the specified key and value where asynchronicity can be simulated for testing. */ grpc_call_credentials* grpc_md_only_test_credentials_create( - const char* md_key, const char* md_value, bool is_async); + grpc_exec_ctx* exec_ctx, const char* md_key, const char* md_value, + bool is_async); /* --- grpc_server_credentials. --- */ typedef struct { - void (*destruct)(grpc_server_credentials* c); + void (*destruct)(grpc_exec_ctx* exec_ctx, grpc_server_credentials* c); grpc_security_status (*create_security_connector)( - grpc_server_credentials* c, grpc_server_security_connector** sc); + grpc_exec_ctx* exec_ctx, grpc_server_credentials* c, + grpc_server_security_connector** sc); } grpc_server_credentials_vtable; struct grpc_server_credentials { @@ -214,12 +223,14 @@ struct grpc_server_credentials { }; grpc_security_status grpc_server_credentials_create_security_connector( - grpc_server_credentials* creds, grpc_server_security_connector** sc); + grpc_exec_ctx* exec_ctx, grpc_server_credentials* creds, + grpc_server_security_connector** sc); grpc_server_credentials* grpc_server_credentials_ref( grpc_server_credentials* creds); -void grpc_server_credentials_unref(grpc_server_credentials* creds); +void grpc_server_credentials_unref(grpc_exec_ctx* exec_ctx, + grpc_server_credentials* creds); #define GRPC_SERVER_CREDENTIALS_ARG "grpc.server_credentials" @@ -239,6 +250,6 @@ grpc_credentials_metadata_request* grpc_credentials_metadata_request_create( grpc_call_credentials* creds); void grpc_credentials_metadata_request_destroy( - grpc_credentials_metadata_request* r); + grpc_exec_ctx* exec_ctx, grpc_credentials_metadata_request* r); #endif /* GRPC_CORE_LIB_SECURITY_CREDENTIALS_CREDENTIALS_H */ diff --git a/src/core/lib/security/credentials/credentials_metadata.cc b/src/core/lib/security/credentials/credentials_metadata.cc index 9ceaf211392..a3623fa1d68 100644 --- a/src/core/lib/security/credentials/credentials_metadata.cc +++ b/src/core/lib/security/credentials/credentials_metadata.cc @@ -52,9 +52,9 @@ void grpc_credentials_mdelem_array_append(grpc_credentials_mdelem_array* dst, } void grpc_credentials_mdelem_array_destroy( - grpc_credentials_mdelem_array* list) { + grpc_exec_ctx* exec_ctx, grpc_credentials_mdelem_array* list) { for (size_t i = 0; i < list->size; ++i) { - GRPC_MDELEM_UNREF(list->md[i]); + GRPC_MDELEM_UNREF(exec_ctx, list->md[i]); } gpr_free(list->md); } diff --git a/src/core/lib/security/credentials/fake/fake_credentials.cc b/src/core/lib/security/credentials/fake/fake_credentials.cc index 99b1214951d..a535a317eec 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.cc +++ b/src/core/lib/security/credentials/fake/fake_credentials.cc @@ -34,9 +34,10 @@ "grpc.fake_security.expected_targets" static grpc_security_status fake_transport_security_create_security_connector( - grpc_channel_credentials* c, grpc_call_credentials* call_creds, - const char* target, const grpc_channel_args* args, - grpc_channel_security_connector** sc, grpc_channel_args** new_args) { + grpc_exec_ctx* exec_ctx, grpc_channel_credentials* c, + grpc_call_credentials* call_creds, const char* target, + const grpc_channel_args* args, grpc_channel_security_connector** sc, + grpc_channel_args** new_args) { *sc = grpc_fake_channel_security_connector_create(c, call_creds, target, args); return GRPC_SECURITY_OK; @@ -44,7 +45,8 @@ static grpc_security_status fake_transport_security_create_security_connector( static grpc_security_status fake_transport_security_server_create_security_connector( - grpc_server_credentials* c, grpc_server_security_connector** sc) { + grpc_exec_ctx* exec_ctx, grpc_server_credentials* c, + grpc_server_security_connector** sc) { *sc = grpc_fake_server_security_connector_create(c); return GRPC_SECURITY_OK; } @@ -96,27 +98,29 @@ const char* grpc_fake_transport_get_expected_targets( /* -- Metadata-only test credentials. -- */ -static void md_only_test_destruct(grpc_call_credentials* creds) { +static void md_only_test_destruct(grpc_exec_ctx* exec_ctx, + grpc_call_credentials* creds) { grpc_md_only_test_credentials* c = (grpc_md_only_test_credentials*)creds; - GRPC_MDELEM_UNREF(c->md); + GRPC_MDELEM_UNREF(exec_ctx, c->md); } static bool md_only_test_get_request_metadata( - grpc_call_credentials* creds, grpc_polling_entity* pollent, - grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, - grpc_closure* on_request_metadata, grpc_error** error) { + grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, + grpc_polling_entity* pollent, grpc_auth_metadata_context context, + grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, + grpc_error** error) { grpc_md_only_test_credentials* c = (grpc_md_only_test_credentials*)creds; grpc_credentials_mdelem_array_add(md_array, c->md); if (c->is_async) { - GRPC_CLOSURE_SCHED(on_request_metadata, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, on_request_metadata, GRPC_ERROR_NONE); return false; } return true; } static void md_only_test_cancel_get_request_metadata( - grpc_call_credentials* c, grpc_credentials_mdelem_array* md_array, - grpc_error* error) { + grpc_exec_ctx* exec_ctx, grpc_call_credentials* c, + grpc_credentials_mdelem_array* md_array, grpc_error* error) { GRPC_ERROR_UNREF(error); } @@ -125,14 +129,16 @@ static grpc_call_credentials_vtable md_only_test_vtable = { md_only_test_cancel_get_request_metadata}; grpc_call_credentials* grpc_md_only_test_credentials_create( - const char* md_key, const char* md_value, bool is_async) { + grpc_exec_ctx* exec_ctx, const char* md_key, const char* md_value, + bool is_async) { grpc_md_only_test_credentials* c = (grpc_md_only_test_credentials*)gpr_zalloc( sizeof(grpc_md_only_test_credentials)); c->base.type = GRPC_CALL_CREDENTIALS_TYPE_OAUTH2; c->base.vtable = &md_only_test_vtable; gpr_ref_init(&c->base.refcount, 1); - c->md = grpc_mdelem_from_slices(grpc_slice_from_copied_string(md_key), - grpc_slice_from_copied_string(md_value)); + c->md = + grpc_mdelem_from_slices(exec_ctx, grpc_slice_from_copied_string(md_key), + grpc_slice_from_copied_string(md_value)); c->is_async = is_async; return &c->base; } diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc index 03d52850d90..f586c7b6045 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc @@ -58,7 +58,8 @@ typedef struct { grpc_http_response response; } compute_engine_detector; -static void on_compute_engine_detection_http_response(void* user_data, +static void on_compute_engine_detection_http_response(grpc_exec_ctx* exec_ctx, + void* user_data, grpc_error* error) { compute_engine_detector* detector = (compute_engine_detector*)user_data; if (error == GRPC_ERROR_NONE && detector->response.status == 200 && @@ -79,16 +80,16 @@ static void on_compute_engine_detection_http_response(void* user_data, detector->is_done = 1; GRPC_LOG_IF_ERROR( "Pollset kick", - grpc_pollset_kick(grpc_polling_entity_pollset(&detector->pollent), - nullptr)); + grpc_pollset_kick( + exec_ctx, grpc_polling_entity_pollset(&detector->pollent), nullptr)); gpr_mu_unlock(g_polling_mu); } -static void destroy_pollset(void* p, grpc_error* e) { - grpc_pollset_destroy((grpc_pollset*)p); +static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, grpc_error* e) { + grpc_pollset_destroy(exec_ctx, (grpc_pollset*)p); } -static int is_stack_running_on_compute_engine() { +static int is_stack_running_on_compute_engine(grpc_exec_ctx* exec_ctx) { compute_engine_detector detector; grpc_httpcli_request request; grpc_httpcli_context context; @@ -114,14 +115,14 @@ static int is_stack_running_on_compute_engine() { grpc_resource_quota* resource_quota = grpc_resource_quota_create("google_default_credentials"); grpc_httpcli_get( - &context, &detector.pollent, resource_quota, &request, - grpc_core::ExecCtx::Get()->Now() + max_detection_delay, + exec_ctx, &context, &detector.pollent, resource_quota, &request, + grpc_exec_ctx_now(exec_ctx) + max_detection_delay, GRPC_CLOSURE_CREATE(on_compute_engine_detection_http_response, &detector, grpc_schedule_on_exec_ctx), &detector.response); - grpc_resource_quota_unref_internal(resource_quota); + grpc_resource_quota_unref_internal(exec_ctx, resource_quota); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(exec_ctx); /* Block until we get the response. This is not ideal but this should only be called once for the lifetime of the process by the default credentials. */ @@ -130,7 +131,8 @@ static int is_stack_running_on_compute_engine() { grpc_pollset_worker* worker = nullptr; if (!GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(grpc_polling_entity_pollset(&detector.pollent), + grpc_pollset_work(exec_ctx, + grpc_polling_entity_pollset(&detector.pollent), &worker, GRPC_MILLIS_INF_FUTURE))) { detector.is_done = 1; detector.success = 0; @@ -138,14 +140,15 @@ static int is_stack_running_on_compute_engine() { } gpr_mu_unlock(g_polling_mu); - grpc_httpcli_context_destroy(&context); + grpc_httpcli_context_destroy(exec_ctx, &context); GRPC_CLOSURE_INIT(&destroy_closure, destroy_pollset, grpc_polling_entity_pollset(&detector.pollent), grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(grpc_polling_entity_pollset(&detector.pollent), + grpc_pollset_shutdown(exec_ctx, + grpc_polling_entity_pollset(&detector.pollent), &destroy_closure); g_polling_mu = nullptr; - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(exec_ctx); gpr_free(grpc_polling_entity_pollset(&detector.pollent)); grpc_http_response_destroy(&detector.response); @@ -155,7 +158,7 @@ static int is_stack_running_on_compute_engine() { /* Takes ownership of creds_path if not NULL. */ static grpc_error* create_default_creds_from_path( - char* creds_path, grpc_call_credentials** creds) { + grpc_exec_ctx* exec_ctx, char* creds_path, grpc_call_credentials** creds) { grpc_json* json = nullptr; grpc_auth_json_key key; grpc_auth_refresh_token token; @@ -184,7 +187,7 @@ static grpc_error* create_default_creds_from_path( if (grpc_auth_json_key_is_valid(&key)) { result = grpc_service_account_jwt_access_credentials_create_from_auth_json_key( - key, grpc_max_auth_token_lifetime()); + exec_ctx, key, grpc_max_auth_token_lifetime()); if (result == nullptr) { error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "grpc_service_account_jwt_access_credentials_create_from_auth_json_" @@ -209,7 +212,7 @@ static grpc_error* create_default_creds_from_path( end: GPR_ASSERT((result == nullptr) + (error == GRPC_ERROR_NONE) == 1); if (creds_path != nullptr) gpr_free(creds_path); - grpc_slice_unref_internal(creds_data); + grpc_slice_unref_internal(exec_ctx, creds_data); if (json != nullptr) grpc_json_destroy(json); *creds = result; return error; @@ -221,7 +224,7 @@ grpc_channel_credentials* grpc_google_default_credentials_create(void) { grpc_error* error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Failed to create Google credentials"); grpc_error* err; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GRPC_API_TRACE("grpc_google_default_credentials_create(void)", 0, ()); @@ -236,20 +239,22 @@ grpc_channel_credentials* grpc_google_default_credentials_create(void) { /* First, try the environment variable. */ err = create_default_creds_from_path( - gpr_getenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR), &call_creds); + &exec_ctx, gpr_getenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR), &call_creds); if (err == GRPC_ERROR_NONE) goto end; error = grpc_error_add_child(error, err); /* Then the well-known file. */ err = create_default_creds_from_path( - grpc_get_well_known_google_credentials_file_path(), &call_creds); + &exec_ctx, grpc_get_well_known_google_credentials_file_path(), + &call_creds); if (err == GRPC_ERROR_NONE) goto end; error = grpc_error_add_child(error, err); /* At last try to see if we're on compute engine (do the detection only once since it requires a network test). */ if (!compute_engine_detection_done) { - int need_compute_engine_creds = is_stack_running_on_compute_engine(); + int need_compute_engine_creds = + is_stack_running_on_compute_engine(&exec_ctx); compute_engine_detection_done = 1; if (need_compute_engine_creds) { call_creds = grpc_google_compute_engine_credentials_create(nullptr); @@ -273,8 +278,8 @@ end: grpc_composite_channel_credentials_create(ssl_creds, call_creds, nullptr)); GPR_ASSERT(default_credentials != nullptr); - grpc_channel_credentials_unref(ssl_creds); - grpc_call_credentials_unref(call_creds); + grpc_channel_credentials_unref(&exec_ctx, ssl_creds); + grpc_call_credentials_unref(&exec_ctx, call_creds); result = default_credentials; } else { gpr_log(GPR_ERROR, "Could not create google default credentials."); @@ -286,20 +291,21 @@ end: } else { GRPC_ERROR_UNREF(error); } - + grpc_exec_ctx_finish(&exec_ctx); return result; } void grpc_flush_cached_google_default_credentials(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_once_init(&g_once, init_default_credentials); gpr_mu_lock(&g_state_mu); if (default_credentials != nullptr) { - grpc_channel_credentials_unref(default_credentials); + grpc_channel_credentials_unref(&exec_ctx, default_credentials); default_credentials = nullptr; } compute_engine_detection_done = 0; gpr_mu_unlock(&g_state_mu); + grpc_exec_ctx_finish(&exec_ctx); } /* -- Well known credentials path. -- */ diff --git a/src/core/lib/security/credentials/iam/iam_credentials.cc b/src/core/lib/security/credentials/iam/iam_credentials.cc index 75acb2a58e6..1741bf3068c 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.cc +++ b/src/core/lib/security/credentials/iam/iam_credentials.cc @@ -27,12 +27,14 @@ #include #include -static void iam_destruct(grpc_call_credentials* creds) { +static void iam_destruct(grpc_exec_ctx* exec_ctx, + grpc_call_credentials* creds) { grpc_google_iam_credentials* c = (grpc_google_iam_credentials*)creds; - grpc_credentials_mdelem_array_destroy(&c->md_array); + grpc_credentials_mdelem_array_destroy(exec_ctx, &c->md_array); } -static bool iam_get_request_metadata(grpc_call_credentials* creds, +static bool iam_get_request_metadata(grpc_exec_ctx* exec_ctx, + grpc_call_credentials* creds, grpc_polling_entity* pollent, grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, @@ -44,8 +46,8 @@ static bool iam_get_request_metadata(grpc_call_credentials* creds, } static void iam_cancel_get_request_metadata( - grpc_call_credentials* c, grpc_credentials_mdelem_array* md_array, - grpc_error* error) { + grpc_exec_ctx* exec_ctx, grpc_call_credentials* c, + grpc_credentials_mdelem_array* md_array, grpc_error* error) { GRPC_ERROR_UNREF(error); } @@ -54,7 +56,7 @@ static grpc_call_credentials_vtable iam_vtable = { grpc_call_credentials* grpc_google_iam_credentials_create( const char* token, const char* authority_selector, void* reserved) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GRPC_API_TRACE( "grpc_iam_credentials_create(token=%s, authority_selector=%s, " "reserved=%p)", @@ -68,15 +70,17 @@ grpc_call_credentials* grpc_google_iam_credentials_create( c->base.vtable = &iam_vtable; gpr_ref_init(&c->base.refcount, 1); grpc_mdelem md = grpc_mdelem_from_slices( + &exec_ctx, grpc_slice_from_static_string(GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY), grpc_slice_from_copied_string(token)); grpc_credentials_mdelem_array_add(&c->md_array, md); - GRPC_MDELEM_UNREF(md); + GRPC_MDELEM_UNREF(&exec_ctx, md); md = grpc_mdelem_from_slices( + &exec_ctx, grpc_slice_from_static_string(GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY), grpc_slice_from_copied_string(authority_selector)); grpc_credentials_mdelem_array_add(&c->md_array, md); - GRPC_MDELEM_UNREF(md); - + GRPC_MDELEM_UNREF(&exec_ctx, md); + grpc_exec_ctx_finish(&exec_ctx); return &c->base; } diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.cc b/src/core/lib/security/credentials/jwt/jwt_credentials.cc index 2404e860e42..77163c0cc17 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.cc +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.cc @@ -30,8 +30,9 @@ #include #include -static void jwt_reset_cache(grpc_service_account_jwt_access_credentials* c) { - GRPC_MDELEM_UNREF(c->cached.jwt_md); +static void jwt_reset_cache(grpc_exec_ctx* exec_ctx, + grpc_service_account_jwt_access_credentials* c) { + GRPC_MDELEM_UNREF(exec_ctx, c->cached.jwt_md); c->cached.jwt_md = GRPC_MDNULL; if (c->cached.service_url != nullptr) { gpr_free(c->cached.service_url); @@ -40,15 +41,17 @@ static void jwt_reset_cache(grpc_service_account_jwt_access_credentials* c) { c->cached.jwt_expiration = gpr_inf_past(GPR_CLOCK_REALTIME); } -static void jwt_destruct(grpc_call_credentials* creds) { +static void jwt_destruct(grpc_exec_ctx* exec_ctx, + grpc_call_credentials* creds) { grpc_service_account_jwt_access_credentials* c = (grpc_service_account_jwt_access_credentials*)creds; grpc_auth_json_key_destruct(&c->key); - jwt_reset_cache(c); + jwt_reset_cache(exec_ctx, c); gpr_mu_destroy(&c->cache_mu); } -static bool jwt_get_request_metadata(grpc_call_credentials* creds, +static bool jwt_get_request_metadata(grpc_exec_ctx* exec_ctx, + grpc_call_credentials* creds, grpc_polling_entity* pollent, grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, @@ -78,7 +81,7 @@ static bool jwt_get_request_metadata(grpc_call_credentials* creds, char* jwt = nullptr; /* Generate a new jwt. */ gpr_mu_lock(&c->cache_mu); - jwt_reset_cache(c); + jwt_reset_cache(exec_ctx, c); jwt = grpc_jwt_encode_and_sign(&c->key, context.service_url, c->jwt_lifetime, nullptr); if (jwt != nullptr) { @@ -89,6 +92,7 @@ static bool jwt_get_request_metadata(grpc_call_credentials* creds, gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), c->jwt_lifetime); c->cached.service_url = gpr_strdup(context.service_url); c->cached.jwt_md = grpc_mdelem_from_slices( + exec_ctx, grpc_slice_from_static_string(GRPC_AUTHORIZATION_METADATA_KEY), grpc_slice_from_copied_string(md_value)); gpr_free(md_value); @@ -99,7 +103,7 @@ static bool jwt_get_request_metadata(grpc_call_credentials* creds, if (!GRPC_MDISNULL(jwt_md)) { grpc_credentials_mdelem_array_add(md_array, jwt_md); - GRPC_MDELEM_UNREF(jwt_md); + GRPC_MDELEM_UNREF(exec_ctx, jwt_md); } else { *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Could not generate JWT."); } @@ -107,8 +111,8 @@ static bool jwt_get_request_metadata(grpc_call_credentials* creds, } static void jwt_cancel_get_request_metadata( - grpc_call_credentials* c, grpc_credentials_mdelem_array* md_array, - grpc_error* error) { + grpc_exec_ctx* exec_ctx, grpc_call_credentials* c, + grpc_credentials_mdelem_array* md_array, grpc_error* error) { GRPC_ERROR_UNREF(error); } @@ -117,7 +121,8 @@ static grpc_call_credentials_vtable jwt_vtable = { grpc_call_credentials* grpc_service_account_jwt_access_credentials_create_from_auth_json_key( - grpc_auth_json_key key, gpr_timespec token_lifetime) { + grpc_exec_ctx* exec_ctx, grpc_auth_json_key key, + gpr_timespec token_lifetime) { grpc_service_account_jwt_access_credentials* c; if (!grpc_auth_json_key_is_valid(&key)) { gpr_log(GPR_ERROR, "Invalid input for jwt credentials creation"); @@ -138,7 +143,7 @@ grpc_service_account_jwt_access_credentials_create_from_auth_json_key( } c->jwt_lifetime = token_lifetime; gpr_mu_init(&c->cache_mu); - jwt_reset_cache(c); + jwt_reset_cache(exec_ctx, c); return &c->base; } @@ -181,10 +186,11 @@ grpc_call_credentials* grpc_service_account_jwt_access_credentials_create( gpr_free(clean_json); } GPR_ASSERT(reserved == nullptr); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_call_credentials* creds = grpc_service_account_jwt_access_credentials_create_from_auth_json_key( - grpc_auth_json_key_create_from_string(json_key), token_lifetime); - + &exec_ctx, grpc_auth_json_key_create_from_string(json_key), + token_lifetime); + grpc_exec_ctx_finish(&exec_ctx); return creds; } diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.h b/src/core/lib/security/credentials/jwt/jwt_credentials.h index f58a8b67bad..85f068aac84 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.h +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.h @@ -42,6 +42,7 @@ typedef struct { // Takes ownership of the key. grpc_call_credentials* grpc_service_account_jwt_access_credentials_create_from_auth_json_key( - grpc_auth_json_key key, gpr_timespec token_lifetime); + grpc_exec_ctx* exec_ctx, grpc_auth_json_key key, + gpr_timespec token_lifetime); #endif /* GRPC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_CREDENTIALS_H */ diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.cc b/src/core/lib/security/credentials/jwt/jwt_verifier.cc index 39339f07d73..3709b83c4e8 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.cc +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.cc @@ -74,11 +74,12 @@ static const EVP_MD* evp_md_from_alg(const char* alg) { } } -static grpc_json* parse_json_part_from_jwt(const char* str, size_t len, +static grpc_json* parse_json_part_from_jwt(grpc_exec_ctx* exec_ctx, + const char* str, size_t len, grpc_slice* buffer) { grpc_json* json; - *buffer = grpc_base64_decode_with_len(str, len, 1); + *buffer = grpc_base64_decode_with_len(exec_ctx, str, len, 1); if (GRPC_SLICE_IS_EMPTY(*buffer)) { gpr_log(GPR_ERROR, "Invalid base64."); return nullptr; @@ -86,7 +87,7 @@ static grpc_json* parse_json_part_from_jwt(const char* str, size_t len, json = grpc_json_parse_string_with_len((char*)GRPC_SLICE_START_PTR(*buffer), GRPC_SLICE_LENGTH(*buffer)); if (json == nullptr) { - grpc_slice_unref_internal(*buffer); + grpc_slice_unref_internal(exec_ctx, *buffer); gpr_log(GPR_ERROR, "JSON parsing error."); } return json; @@ -122,13 +123,14 @@ typedef struct { grpc_slice buffer; } jose_header; -static void jose_header_destroy(jose_header* h) { - grpc_slice_unref_internal(h->buffer); +static void jose_header_destroy(grpc_exec_ctx* exec_ctx, jose_header* h) { + grpc_slice_unref_internal(exec_ctx, h->buffer); gpr_free(h); } /* Takes ownership of json and buffer. */ -static jose_header* jose_header_from_json(grpc_json* json, grpc_slice buffer) { +static jose_header* jose_header_from_json(grpc_exec_ctx* exec_ctx, + grpc_json* json, grpc_slice buffer) { grpc_json* cur; jose_header* h = (jose_header*)gpr_zalloc(sizeof(jose_header)); h->buffer = buffer; @@ -162,7 +164,7 @@ static jose_header* jose_header_from_json(grpc_json* json, grpc_slice buffer) { error: grpc_json_destroy(json); - jose_header_destroy(h); + jose_header_destroy(exec_ctx, h); return nullptr; } @@ -182,9 +184,9 @@ struct grpc_jwt_claims { grpc_slice buffer; }; -void grpc_jwt_claims_destroy(grpc_jwt_claims* claims) { +void grpc_jwt_claims_destroy(grpc_exec_ctx* exec_ctx, grpc_jwt_claims* claims) { grpc_json_destroy(claims->json); - grpc_slice_unref_internal(claims->buffer); + grpc_slice_unref_internal(exec_ctx, claims->buffer); gpr_free(claims); } @@ -229,7 +231,8 @@ gpr_timespec grpc_jwt_claims_not_before(const grpc_jwt_claims* claims) { } /* Takes ownership of json and buffer even in case of failure. */ -grpc_jwt_claims* grpc_jwt_claims_from_json(grpc_json* json, grpc_slice buffer) { +grpc_jwt_claims* grpc_jwt_claims_from_json(grpc_exec_ctx* exec_ctx, + grpc_json* json, grpc_slice buffer) { grpc_json* cur; grpc_jwt_claims* claims = (grpc_jwt_claims*)gpr_malloc(sizeof(grpc_jwt_claims)); @@ -271,7 +274,7 @@ grpc_jwt_claims* grpc_jwt_claims_from_json(grpc_json* json, grpc_slice buffer) { return claims; error: - grpc_jwt_claims_destroy(claims); + grpc_jwt_claims_destroy(exec_ctx, claims); return nullptr; } @@ -347,7 +350,7 @@ static verifier_cb_ctx* verifier_cb_ctx_create( grpc_jwt_claims* claims, const char* audience, grpc_slice signature, const char* signed_jwt, size_t signed_jwt_len, void* user_data, grpc_jwt_verification_done_cb cb) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; verifier_cb_ctx* ctx = (verifier_cb_ctx*)gpr_zalloc(sizeof(verifier_cb_ctx)); ctx->verifier = verifier; ctx->pollent = grpc_polling_entity_create_from_pollset(pollset); @@ -358,16 +361,16 @@ static verifier_cb_ctx* verifier_cb_ctx_create( ctx->signed_data = grpc_slice_from_copied_buffer(signed_jwt, signed_jwt_len); ctx->user_data = user_data; ctx->user_cb = cb; - + grpc_exec_ctx_finish(&exec_ctx); return ctx; } -void verifier_cb_ctx_destroy(verifier_cb_ctx* ctx) { +void verifier_cb_ctx_destroy(grpc_exec_ctx* exec_ctx, verifier_cb_ctx* ctx) { if (ctx->audience != nullptr) gpr_free(ctx->audience); - if (ctx->claims != nullptr) grpc_jwt_claims_destroy(ctx->claims); - grpc_slice_unref_internal(ctx->signature); - grpc_slice_unref_internal(ctx->signed_data); - jose_header_destroy(ctx->header); + if (ctx->claims != nullptr) grpc_jwt_claims_destroy(exec_ctx, ctx->claims); + grpc_slice_unref_internal(exec_ctx, ctx->signature); + grpc_slice_unref_internal(exec_ctx, ctx->signed_data); + jose_header_destroy(exec_ctx, ctx->header); for (size_t i = 0; i < HTTP_RESPONSE_COUNT; i++) { grpc_http_response_destroy(&ctx->responses[i]); } @@ -447,19 +450,19 @@ end: return result; } -static BIGNUM* bignum_from_base64(const char* b64) { +static BIGNUM* bignum_from_base64(grpc_exec_ctx* exec_ctx, const char* b64) { BIGNUM* result = nullptr; grpc_slice bin; if (b64 == nullptr) return nullptr; - bin = grpc_base64_decode(b64, 1); + bin = grpc_base64_decode(exec_ctx, b64, 1); if (GRPC_SLICE_IS_EMPTY(bin)) { gpr_log(GPR_ERROR, "Invalid base64 for big num."); return nullptr; } result = BN_bin2bn(GRPC_SLICE_START_PTR(bin), TSI_SIZE_AS_SIZE(GRPC_SLICE_LENGTH(bin)), nullptr); - grpc_slice_unref_internal(bin); + grpc_slice_unref_internal(exec_ctx, bin); return result; } @@ -492,7 +495,8 @@ static int RSA_set0_key(RSA* r, BIGNUM* n, BIGNUM* e, BIGNUM* d) { } #endif // OPENSSL_VERSION_NUMBER < 0x10100000L -static EVP_PKEY* pkey_from_jwk(const grpc_json* json, const char* kty) { +static EVP_PKEY* pkey_from_jwk(grpc_exec_ctx* exec_ctx, const grpc_json* json, + const char* kty) { const grpc_json* key_prop; RSA* rsa = nullptr; EVP_PKEY* result = nullptr; @@ -511,10 +515,12 @@ static EVP_PKEY* pkey_from_jwk(const grpc_json* json, const char* kty) { } for (key_prop = json->child; key_prop != nullptr; key_prop = key_prop->next) { if (strcmp(key_prop->key, "n") == 0) { - tmp_n = bignum_from_base64(validate_string_field(key_prop, "n")); + tmp_n = + bignum_from_base64(exec_ctx, validate_string_field(key_prop, "n")); if (tmp_n == nullptr) goto end; } else if (strcmp(key_prop->key, "e") == 0) { - tmp_e = bignum_from_base64(validate_string_field(key_prop, "e")); + tmp_e = + bignum_from_base64(exec_ctx, validate_string_field(key_prop, "e")); if (tmp_e == nullptr) goto end; } } @@ -539,7 +545,8 @@ end: return result; } -static EVP_PKEY* find_verification_key(const grpc_json* json, +static EVP_PKEY* find_verification_key(grpc_exec_ctx* exec_ctx, + const grpc_json* json, const char* header_alg, const char* header_kid) { const grpc_json* jkey; @@ -584,7 +591,7 @@ static EVP_PKEY* find_verification_key(const grpc_json* json, } if (alg != nullptr && kid != nullptr && kty != nullptr && strcmp(kid, header_kid) == 0 && strcmp(alg, header_alg) == 0) { - return pkey_from_jwk(jkey, kty); + return pkey_from_jwk(exec_ctx, jkey, kty); } } gpr_log(GPR_ERROR, @@ -625,7 +632,8 @@ end: return result; } -static void on_keys_retrieved(void* user_data, grpc_error* error) { +static void on_keys_retrieved(grpc_exec_ctx* exec_ctx, void* user_data, + grpc_error* error) { verifier_cb_ctx* ctx = (verifier_cb_ctx*)user_data; grpc_json* json = json_from_http(&ctx->responses[HTTP_RESPONSE_KEYS]); EVP_PKEY* verification_key = nullptr; @@ -637,7 +645,7 @@ static void on_keys_retrieved(void* user_data, grpc_error* error) { goto end; } verification_key = - find_verification_key(json, ctx->header->alg, ctx->header->kid); + find_verification_key(exec_ctx, json, ctx->header->alg, ctx->header->kid); if (verification_key == nullptr) { gpr_log(GPR_ERROR, "Could not find verification key with kid %s.", ctx->header->kid); @@ -661,11 +669,12 @@ static void on_keys_retrieved(void* user_data, grpc_error* error) { end: if (json != nullptr) grpc_json_destroy(json); EVP_PKEY_free(verification_key); - ctx->user_cb(ctx->user_data, status, claims); - verifier_cb_ctx_destroy(ctx); + ctx->user_cb(exec_ctx, ctx->user_data, status, claims); + verifier_cb_ctx_destroy(exec_ctx, ctx); } -static void on_openid_config_retrieved(void* user_data, grpc_error* error) { +static void on_openid_config_retrieved(grpc_exec_ctx* exec_ctx, void* user_data, + grpc_error* error) { const grpc_json* cur; verifier_cb_ctx* ctx = (verifier_cb_ctx*)user_data; const grpc_http_response* response = &ctx->responses[HTTP_RESPONSE_OPENID]; @@ -702,19 +711,20 @@ static void on_openid_config_retrieved(void* user_data, grpc_error* error) { extreme memory pressure. */ resource_quota = grpc_resource_quota_create("jwt_verifier"); grpc_httpcli_get( - &ctx->verifier->http_ctx, &ctx->pollent, resource_quota, &req, - grpc_core::ExecCtx::Get()->Now() + grpc_jwt_verifier_max_delay, + exec_ctx, &ctx->verifier->http_ctx, &ctx->pollent, resource_quota, &req, + grpc_exec_ctx_now(exec_ctx) + grpc_jwt_verifier_max_delay, GRPC_CLOSURE_CREATE(on_keys_retrieved, ctx, grpc_schedule_on_exec_ctx), &ctx->responses[HTTP_RESPONSE_KEYS]); - grpc_resource_quota_unref_internal(resource_quota); + grpc_resource_quota_unref_internal(exec_ctx, resource_quota); grpc_json_destroy(json); gpr_free(req.host); return; error: if (json != nullptr) grpc_json_destroy(json); - ctx->user_cb(ctx->user_data, GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR, nullptr); - verifier_cb_ctx_destroy(ctx); + ctx->user_cb(exec_ctx, ctx->user_data, GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR, + nullptr); + verifier_cb_ctx_destroy(exec_ctx, ctx); } static email_key_mapping* verifier_get_mapping(grpc_jwt_verifier* v, @@ -762,7 +772,8 @@ const char* grpc_jwt_issuer_email_domain(const char* issuer) { } /* Takes ownership of ctx. */ -static void retrieve_key_and_verify(verifier_cb_ctx* ctx) { +static void retrieve_key_and_verify(grpc_exec_ctx* exec_ctx, + verifier_cb_ctx* ctx) { const char* email_domain; grpc_closure* http_cb; char* path_prefix = nullptr; @@ -829,21 +840,23 @@ static void retrieve_key_and_verify(verifier_cb_ctx* ctx) { channel. This would allow us to cancel an authentication query when under extreme memory pressure. */ resource_quota = grpc_resource_quota_create("jwt_verifier"); - grpc_httpcli_get( - &ctx->verifier->http_ctx, &ctx->pollent, resource_quota, &req, - grpc_core::ExecCtx::Get()->Now() + grpc_jwt_verifier_max_delay, http_cb, - &ctx->responses[rsp_idx]); - grpc_resource_quota_unref_internal(resource_quota); + grpc_httpcli_get(exec_ctx, &ctx->verifier->http_ctx, &ctx->pollent, + resource_quota, &req, + grpc_exec_ctx_now(exec_ctx) + grpc_jwt_verifier_max_delay, + http_cb, &ctx->responses[rsp_idx]); + grpc_resource_quota_unref_internal(exec_ctx, resource_quota); gpr_free(req.host); gpr_free(req.http.path); return; error: - ctx->user_cb(ctx->user_data, GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR, nullptr); - verifier_cb_ctx_destroy(ctx); + ctx->user_cb(exec_ctx, ctx->user_data, GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR, + nullptr); + verifier_cb_ctx_destroy(exec_ctx, ctx); } -void grpc_jwt_verifier_verify(grpc_jwt_verifier* verifier, +void grpc_jwt_verifier_verify(grpc_exec_ctx* exec_ctx, + grpc_jwt_verifier* verifier, grpc_pollset* pollset, const char* jwt, const char* audience, grpc_jwt_verification_done_cb cb, @@ -862,32 +875,35 @@ void grpc_jwt_verifier_verify(grpc_jwt_verifier* verifier, cb != nullptr); dot = strchr(cur, '.'); if (dot == nullptr) goto error; - json = parse_json_part_from_jwt(cur, (size_t)(dot - cur), &header_buffer); + json = parse_json_part_from_jwt(exec_ctx, cur, (size_t)(dot - cur), + &header_buffer); if (json == nullptr) goto error; - header = jose_header_from_json(json, header_buffer); + header = jose_header_from_json(exec_ctx, json, header_buffer); if (header == nullptr) goto error; cur = dot + 1; dot = strchr(cur, '.'); if (dot == nullptr) goto error; - json = parse_json_part_from_jwt(cur, (size_t)(dot - cur), &claims_buffer); + json = parse_json_part_from_jwt(exec_ctx, cur, (size_t)(dot - cur), + &claims_buffer); if (json == nullptr) goto error; - claims = grpc_jwt_claims_from_json(json, claims_buffer); + claims = grpc_jwt_claims_from_json(exec_ctx, json, claims_buffer); if (claims == nullptr) goto error; signed_jwt_len = (size_t)(dot - jwt); cur = dot + 1; - signature = grpc_base64_decode(cur, 1); + signature = grpc_base64_decode(exec_ctx, cur, 1); if (GRPC_SLICE_IS_EMPTY(signature)) goto error; retrieve_key_and_verify( + exec_ctx, verifier_cb_ctx_create(verifier, pollset, header, claims, audience, signature, jwt, signed_jwt_len, user_data, cb)); return; error: - if (header != nullptr) jose_header_destroy(header); - if (claims != nullptr) grpc_jwt_claims_destroy(claims); - cb(user_data, GRPC_JWT_VERIFIER_BAD_FORMAT, nullptr); + if (header != nullptr) jose_header_destroy(exec_ctx, header); + if (claims != nullptr) grpc_jwt_claims_destroy(exec_ctx, claims); + cb(exec_ctx, user_data, GRPC_JWT_VERIFIER_BAD_FORMAT, nullptr); } grpc_jwt_verifier* grpc_jwt_verifier_create( @@ -914,10 +930,10 @@ grpc_jwt_verifier* grpc_jwt_verifier_create( return v; } -void grpc_jwt_verifier_destroy(grpc_jwt_verifier* v) { +void grpc_jwt_verifier_destroy(grpc_exec_ctx* exec_ctx, grpc_jwt_verifier* v) { size_t i; if (v == nullptr) return; - grpc_httpcli_context_destroy(&v->http_ctx); + grpc_httpcli_context_destroy(exec_ctx, &v->http_ctx); if (v->mappings != nullptr) { for (i = 0; i < v->num_mappings; i++) { gpr_free(v->mappings[i].email_domain); diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.h b/src/core/lib/security/credentials/jwt/jwt_verifier.h index b3805e75cda..2aacd497c7f 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.h +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.h @@ -51,7 +51,7 @@ const char* grpc_jwt_verifier_status_to_string(grpc_jwt_verifier_status status); typedef struct grpc_jwt_claims grpc_jwt_claims; -void grpc_jwt_claims_destroy(grpc_jwt_claims* claims); +void grpc_jwt_claims_destroy(grpc_exec_ctx* exec_ctx, grpc_jwt_claims* claims); /* Returns the whole JSON tree of the claims. */ const grpc_json* grpc_jwt_claims_json(const grpc_jwt_claims* claims); @@ -94,18 +94,21 @@ grpc_jwt_verifier* grpc_jwt_verifier_create( size_t num_mappings); /*The verifier must not be destroyed if there are still outstanding callbacks.*/ -void grpc_jwt_verifier_destroy(grpc_jwt_verifier* verifier); +void grpc_jwt_verifier_destroy(grpc_exec_ctx* exec_ctx, + grpc_jwt_verifier* verifier); /* User provided callback that will be called when the verification of the JWT is done (maybe in another thread). It is the responsibility of the callee to call grpc_jwt_claims_destroy on the claims. */ -typedef void (*grpc_jwt_verification_done_cb)(void* user_data, +typedef void (*grpc_jwt_verification_done_cb)(grpc_exec_ctx* exec_ctx, + void* user_data, grpc_jwt_verifier_status status, grpc_jwt_claims* claims); /* Verifies for the JWT for the given expected audience. */ -void grpc_jwt_verifier_verify(grpc_jwt_verifier* verifier, +void grpc_jwt_verifier_verify(grpc_exec_ctx* exec_ctx, + grpc_jwt_verifier* verifier, grpc_pollset* pollset, const char* jwt, const char* audience, grpc_jwt_verification_done_cb cb, @@ -113,7 +116,8 @@ void grpc_jwt_verifier_verify(grpc_jwt_verifier* verifier, /* --- TESTING ONLY exposed functions. --- */ -grpc_jwt_claims* grpc_jwt_claims_from_json(grpc_json* json, grpc_slice buffer); +grpc_jwt_claims* grpc_jwt_claims_from_json(grpc_exec_ctx* exec_ctx, + grpc_json* json, grpc_slice buffer); grpc_jwt_verifier_status grpc_jwt_claims_check(const grpc_jwt_claims* claims, const char* audience); const char* grpc_jwt_issuer_email_domain(const char* issuer); diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index e243ea52c62..ccefb4db9cf 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -103,19 +103,21 @@ void grpc_auth_refresh_token_destruct(grpc_auth_refresh_token* refresh_token) { // Oauth2 Token Fetcher credentials. // -static void oauth2_token_fetcher_destruct(grpc_call_credentials* creds) { +static void oauth2_token_fetcher_destruct(grpc_exec_ctx* exec_ctx, + grpc_call_credentials* creds) { grpc_oauth2_token_fetcher_credentials* c = (grpc_oauth2_token_fetcher_credentials*)creds; - GRPC_MDELEM_UNREF(c->access_token_md); + GRPC_MDELEM_UNREF(exec_ctx, c->access_token_md); gpr_mu_destroy(&c->mu); - grpc_pollset_set_destroy(grpc_polling_entity_pollset_set(&c->pollent)); - grpc_httpcli_context_destroy(&c->httpcli_context); + grpc_pollset_set_destroy(exec_ctx, + grpc_polling_entity_pollset_set(&c->pollent)); + grpc_httpcli_context_destroy(exec_ctx, &c->httpcli_context); } grpc_credentials_status grpc_oauth2_token_fetcher_credentials_parse_server_response( - const grpc_http_response* response, grpc_mdelem* token_md, - grpc_millis* token_lifetime) { + grpc_exec_ctx* exec_ctx, const grpc_http_response* response, + grpc_mdelem* token_md, grpc_millis* token_lifetime) { char* null_terminated_body = nullptr; char* new_access_token = nullptr; grpc_credentials_status status = GRPC_CREDENTIALS_OK; @@ -182,8 +184,9 @@ grpc_oauth2_token_fetcher_credentials_parse_server_response( gpr_asprintf(&new_access_token, "%s %s", token_type->value, access_token->value); *token_lifetime = strtol(expires_in->value, nullptr, 10) * GPR_MS_PER_SEC; - if (!GRPC_MDISNULL(*token_md)) GRPC_MDELEM_UNREF(*token_md); + if (!GRPC_MDISNULL(*token_md)) GRPC_MDELEM_UNREF(exec_ctx, *token_md); *token_md = grpc_mdelem_from_slices( + exec_ctx, grpc_slice_from_static_string(GRPC_AUTHORIZATION_METADATA_KEY), grpc_slice_from_copied_string(new_access_token)); status = GRPC_CREDENTIALS_OK; @@ -191,7 +194,7 @@ grpc_oauth2_token_fetcher_credentials_parse_server_response( end: if (status != GRPC_CREDENTIALS_OK && !GRPC_MDISNULL(*token_md)) { - GRPC_MDELEM_UNREF(*token_md); + GRPC_MDELEM_UNREF(exec_ctx, *token_md); *token_md = GRPC_MDNULL; } if (null_terminated_body != nullptr) gpr_free(null_terminated_body); @@ -200,7 +203,8 @@ end: return status; } -static void on_oauth2_token_fetcher_http_response(void* user_data, +static void on_oauth2_token_fetcher_http_response(grpc_exec_ctx* exec_ctx, + void* user_data, grpc_error* error) { GRPC_LOG_IF_ERROR("oauth_fetch", GRPC_ERROR_REF(error)); grpc_credentials_metadata_request* r = @@ -211,13 +215,13 @@ static void on_oauth2_token_fetcher_http_response(void* user_data, grpc_millis token_lifetime; grpc_credentials_status status = grpc_oauth2_token_fetcher_credentials_parse_server_response( - &r->response, &access_token_md, &token_lifetime); + exec_ctx, &r->response, &access_token_md, &token_lifetime); // Update cache and grab list of pending requests. gpr_mu_lock(&c->mu); c->token_fetch_pending = false; c->access_token_md = GRPC_MDELEM_REF(access_token_md); c->token_expiration = status == GRPC_CREDENTIALS_OK - ? grpc_core::ExecCtx::Get()->Now() + token_lifetime + ? grpc_exec_ctx_now(exec_ctx) + token_lifetime : 0; grpc_oauth2_pending_get_request_metadata* pending_request = c->pending_requests; @@ -232,22 +236,24 @@ static void on_oauth2_token_fetcher_http_response(void* user_data, error = GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Error occured when fetching oauth2 token.", &error, 1); } - GRPC_CLOSURE_SCHED(pending_request->on_request_metadata, error); + GRPC_CLOSURE_SCHED(exec_ctx, pending_request->on_request_metadata, error); grpc_polling_entity_del_from_pollset_set( - pending_request->pollent, grpc_polling_entity_pollset_set(&c->pollent)); + exec_ctx, pending_request->pollent, + grpc_polling_entity_pollset_set(&c->pollent)); grpc_oauth2_pending_get_request_metadata* prev = pending_request; pending_request = pending_request->next; gpr_free(prev); } - GRPC_MDELEM_UNREF(access_token_md); - grpc_call_credentials_unref(r->creds); - grpc_credentials_metadata_request_destroy(r); + GRPC_MDELEM_UNREF(exec_ctx, access_token_md); + grpc_call_credentials_unref(exec_ctx, r->creds); + grpc_credentials_metadata_request_destroy(exec_ctx, r); } static bool oauth2_token_fetcher_get_request_metadata( - grpc_call_credentials* creds, grpc_polling_entity* pollent, - grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, - grpc_closure* on_request_metadata, grpc_error** error) { + grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, + grpc_polling_entity* pollent, grpc_auth_metadata_context context, + grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, + grpc_error** error) { grpc_oauth2_token_fetcher_credentials* c = (grpc_oauth2_token_fetcher_credentials*)creds; // Check if we can use the cached token. @@ -256,14 +262,13 @@ static bool oauth2_token_fetcher_get_request_metadata( grpc_mdelem cached_access_token_md = GRPC_MDNULL; gpr_mu_lock(&c->mu); if (!GRPC_MDISNULL(c->access_token_md) && - (c->token_expiration - grpc_core::ExecCtx::Get()->Now() > - refresh_threshold)) { + (c->token_expiration - grpc_exec_ctx_now(exec_ctx) > refresh_threshold)) { cached_access_token_md = GRPC_MDELEM_REF(c->access_token_md); } if (!GRPC_MDISNULL(cached_access_token_md)) { gpr_mu_unlock(&c->mu); grpc_credentials_mdelem_array_add(md_array, cached_access_token_md); - GRPC_MDELEM_UNREF(cached_access_token_md); + GRPC_MDELEM_UNREF(exec_ctx, cached_access_token_md); return true; } // Couldn't get the token from the cache. @@ -275,7 +280,7 @@ static bool oauth2_token_fetcher_get_request_metadata( pending_request->on_request_metadata = on_request_metadata; pending_request->pollent = pollent; grpc_polling_entity_add_to_pollset_set( - pollent, grpc_polling_entity_pollset_set(&c->pollent)); + exec_ctx, pollent, grpc_polling_entity_pollset_set(&c->pollent)); pending_request->next = c->pending_requests; c->pending_requests = pending_request; bool start_fetch = false; @@ -286,17 +291,17 @@ static bool oauth2_token_fetcher_get_request_metadata( gpr_mu_unlock(&c->mu); if (start_fetch) { grpc_call_credentials_ref(creds); - c->fetch_func(grpc_credentials_metadata_request_create(creds), + c->fetch_func(exec_ctx, grpc_credentials_metadata_request_create(creds), &c->httpcli_context, &c->pollent, on_oauth2_token_fetcher_http_response, - grpc_core::ExecCtx::Get()->Now() + refresh_threshold); + grpc_exec_ctx_now(exec_ctx) + refresh_threshold); } return false; } static void oauth2_token_fetcher_cancel_get_request_metadata( - grpc_call_credentials* creds, grpc_credentials_mdelem_array* md_array, - grpc_error* error) { + grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, + grpc_credentials_mdelem_array* md_array, grpc_error* error) { grpc_oauth2_token_fetcher_credentials* c = (grpc_oauth2_token_fetcher_credentials*)creds; gpr_mu_lock(&c->mu); @@ -312,7 +317,7 @@ static void oauth2_token_fetcher_cancel_get_request_metadata( c->pending_requests = pending_request->next; } // Invoke the callback immediately with an error. - GRPC_CLOSURE_SCHED(pending_request->on_request_metadata, + GRPC_CLOSURE_SCHED(exec_ctx, pending_request->on_request_metadata, GRPC_ERROR_REF(error)); gpr_free(pending_request); break; @@ -346,7 +351,7 @@ static grpc_call_credentials_vtable compute_engine_vtable = { oauth2_token_fetcher_cancel_get_request_metadata}; static void compute_engine_fetch_oauth2( - grpc_credentials_metadata_request* metadata_req, + grpc_exec_ctx* exec_ctx, grpc_credentials_metadata_request* metadata_req, grpc_httpcli_context* httpcli_context, grpc_polling_entity* pollent, grpc_iomgr_cb_func response_cb, grpc_millis deadline) { grpc_http_header header = {(char*)"Metadata-Flavor", (char*)"Google"}; @@ -362,10 +367,10 @@ static void compute_engine_fetch_oauth2( grpc_resource_quota* resource_quota = grpc_resource_quota_create("oauth2_credentials"); grpc_httpcli_get( - httpcli_context, pollent, resource_quota, &request, deadline, + exec_ctx, httpcli_context, pollent, resource_quota, &request, deadline, GRPC_CLOSURE_CREATE(response_cb, metadata_req, grpc_schedule_on_exec_ctx), &metadata_req->response); - grpc_resource_quota_unref_internal(resource_quota); + grpc_resource_quota_unref_internal(exec_ctx, resource_quota); } grpc_call_credentials* grpc_google_compute_engine_credentials_create( @@ -385,11 +390,12 @@ grpc_call_credentials* grpc_google_compute_engine_credentials_create( // Google Refresh Token credentials. // -static void refresh_token_destruct(grpc_call_credentials* creds) { +static void refresh_token_destruct(grpc_exec_ctx* exec_ctx, + grpc_call_credentials* creds) { grpc_google_refresh_token_credentials* c = (grpc_google_refresh_token_credentials*)creds; grpc_auth_refresh_token_destruct(&c->refresh_token); - oauth2_token_fetcher_destruct(&c->base.base); + oauth2_token_fetcher_destruct(exec_ctx, &c->base.base); } static grpc_call_credentials_vtable refresh_token_vtable = { @@ -397,7 +403,7 @@ static grpc_call_credentials_vtable refresh_token_vtable = { oauth2_token_fetcher_cancel_get_request_metadata}; static void refresh_token_fetch_oauth2( - grpc_credentials_metadata_request* metadata_req, + grpc_exec_ctx* exec_ctx, grpc_credentials_metadata_request* metadata_req, grpc_httpcli_context* httpcli_context, grpc_polling_entity* pollent, grpc_iomgr_cb_func response_cb, grpc_millis deadline) { grpc_google_refresh_token_credentials* c = @@ -421,11 +427,11 @@ static void refresh_token_fetch_oauth2( grpc_resource_quota* resource_quota = grpc_resource_quota_create("oauth2_credentials_refresh"); grpc_httpcli_post( - httpcli_context, pollent, resource_quota, &request, body, strlen(body), - deadline, + exec_ctx, httpcli_context, pollent, resource_quota, &request, body, + strlen(body), deadline, GRPC_CLOSURE_CREATE(response_cb, metadata_req, grpc_schedule_on_exec_ctx), &metadata_req->response); - grpc_resource_quota_unref_internal(resource_quota); + grpc_resource_quota_unref_internal(exec_ctx, resource_quota); gpr_free(body); } @@ -477,23 +483,25 @@ grpc_call_credentials* grpc_google_refresh_token_credentials_create( // Oauth2 Access Token credentials. // -static void access_token_destruct(grpc_call_credentials* creds) { +static void access_token_destruct(grpc_exec_ctx* exec_ctx, + grpc_call_credentials* creds) { grpc_access_token_credentials* c = (grpc_access_token_credentials*)creds; - GRPC_MDELEM_UNREF(c->access_token_md); + GRPC_MDELEM_UNREF(exec_ctx, c->access_token_md); } static bool access_token_get_request_metadata( - grpc_call_credentials* creds, grpc_polling_entity* pollent, - grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, - grpc_closure* on_request_metadata, grpc_error** error) { + grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, + grpc_polling_entity* pollent, grpc_auth_metadata_context context, + grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, + grpc_error** error) { grpc_access_token_credentials* c = (grpc_access_token_credentials*)creds; grpc_credentials_mdelem_array_add(md_array, c->access_token_md); return true; } static void access_token_cancel_get_request_metadata( - grpc_call_credentials* c, grpc_credentials_mdelem_array* md_array, - grpc_error* error) { + grpc_exec_ctx* exec_ctx, grpc_call_credentials* c, + grpc_credentials_mdelem_array* md_array, grpc_error* error) { GRPC_ERROR_UNREF(error); } @@ -515,11 +523,11 @@ grpc_call_credentials* grpc_access_token_credentials_create( gpr_ref_init(&c->base.refcount, 1); char* token_md_value; gpr_asprintf(&token_md_value, "Bearer %s", access_token); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; c->access_token_md = grpc_mdelem_from_slices( - grpc_slice_from_static_string(GRPC_AUTHORIZATION_METADATA_KEY), + &exec_ctx, grpc_slice_from_static_string(GRPC_AUTHORIZATION_METADATA_KEY), grpc_slice_from_copied_string(token_md_value)); - + grpc_exec_ctx_finish(&exec_ctx); gpr_free(token_md_value); return &c->base; } diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h index e5b8df8eb94..627783d648f 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h @@ -52,7 +52,8 @@ void grpc_auth_refresh_token_destruct(grpc_auth_refresh_token* refresh_token); // This object is a base for credentials that need to acquire an oauth2 token // from an http service. -typedef void (*grpc_fetch_oauth2_func)(grpc_credentials_metadata_request* req, +typedef void (*grpc_fetch_oauth2_func)(grpc_exec_ctx* exec_ctx, + grpc_credentials_metadata_request* req, grpc_httpcli_context* http_context, grpc_polling_entity* pollent, grpc_iomgr_cb_func cb, @@ -98,7 +99,7 @@ grpc_refresh_token_credentials_create_from_auth_refresh_token( // Exposed for testing only. grpc_credentials_status grpc_oauth2_token_fetcher_credentials_parse_server_response( - const struct grpc_http_response* response, grpc_mdelem* token_md, - grpc_millis* token_lifetime); + grpc_exec_ctx* exec_ctx, const struct grpc_http_response* response, + grpc_mdelem* token_md, grpc_millis* token_lifetime); #endif /* GRPC_CORE_LIB_SECURITY_CREDENTIALS_OAUTH2_OAUTH2_CREDENTIALS_H */ diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.cc b/src/core/lib/security/credentials/plugin/plugin_credentials.cc index 203ba58c671..1f1efd078d6 100644 --- a/src/core/lib/security/credentials/plugin/plugin_credentials.cc +++ b/src/core/lib/security/credentials/plugin/plugin_credentials.cc @@ -33,7 +33,8 @@ grpc_core::TraceFlag grpc_plugin_credentials_trace(false, "plugin_credentials"); -static void plugin_destruct(grpc_call_credentials* creds) { +static void plugin_destruct(grpc_exec_ctx* exec_ctx, + grpc_call_credentials* creds) { grpc_plugin_credentials* c = (grpc_plugin_credentials*)creds; gpr_mu_destroy(&c->mu); if (c->plugin.state != nullptr && c->plugin.destroy != nullptr) { @@ -60,17 +61,18 @@ static void pending_request_remove_locked( // When this returns, r->cancelled indicates whether the request was // cancelled before completion. static void pending_request_complete( - grpc_plugin_credentials_pending_request* r) { + grpc_exec_ctx* exec_ctx, grpc_plugin_credentials_pending_request* r) { gpr_mu_lock(&r->creds->mu); if (!r->cancelled) pending_request_remove_locked(r->creds, r); gpr_mu_unlock(&r->creds->mu); // Ref to credentials not needed anymore. - grpc_call_credentials_unref(&r->creds->base); + grpc_call_credentials_unref(exec_ctx, &r->creds->base); } static grpc_error* process_plugin_result( - grpc_plugin_credentials_pending_request* r, const grpc_metadata* md, - size_t num_md, grpc_status_code status, const char* error_details) { + grpc_exec_ctx* exec_ctx, grpc_plugin_credentials_pending_request* r, + const grpc_metadata* md, size_t num_md, grpc_status_code status, + const char* error_details) { grpc_error* error = GRPC_ERROR_NONE; if (status != GRPC_STATUS_OK) { char* msg; @@ -98,11 +100,11 @@ static grpc_error* process_plugin_result( error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Illegal metadata"); } else { for (size_t i = 0; i < num_md; ++i) { - grpc_mdelem mdelem = - grpc_mdelem_from_slices(grpc_slice_ref_internal(md[i].key), - grpc_slice_ref_internal(md[i].value)); + grpc_mdelem mdelem = grpc_mdelem_from_slices( + exec_ctx, grpc_slice_ref_internal(md[i].key), + grpc_slice_ref_internal(md[i].value)); grpc_credentials_mdelem_array_add(r->md_array, mdelem); - GRPC_MDELEM_UNREF(mdelem); + GRPC_MDELEM_UNREF(exec_ctx, mdelem); } } } @@ -115,8 +117,9 @@ static void plugin_md_request_metadata_ready(void* request, grpc_status_code status, const char* error_details) { /* called from application code */ - grpc_core::ExecCtx exec_ctx(GRPC_EXEC_CTX_FLAG_IS_FINISHED | - GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INITIALIZER( + GRPC_EXEC_CTX_FLAG_IS_FINISHED | GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP, + nullptr, nullptr); grpc_plugin_credentials_pending_request* r = (grpc_plugin_credentials_pending_request*)request; if (grpc_plugin_credentials_trace.enabled()) { @@ -126,12 +129,12 @@ static void plugin_md_request_metadata_ready(void* request, r->creds, r); } // Remove request from pending list if not previously cancelled. - pending_request_complete(r); + pending_request_complete(&exec_ctx, r); // If it has not been cancelled, process it. if (!r->cancelled) { grpc_error* error = - process_plugin_result(r, md, num_md, status, error_details); - GRPC_CLOSURE_SCHED(r->on_request_metadata, error); + process_plugin_result(&exec_ctx, r, md, num_md, status, error_details); + GRPC_CLOSURE_SCHED(&exec_ctx, r->on_request_metadata, error); } else if (grpc_plugin_credentials_trace.enabled()) { gpr_log(GPR_INFO, "plugin_credentials[%p]: request %p: plugin was previously " @@ -139,9 +142,11 @@ static void plugin_md_request_metadata_ready(void* request, r->creds, r); } gpr_free(r); + grpc_exec_ctx_finish(&exec_ctx); } -static bool plugin_get_request_metadata(grpc_call_credentials* creds, +static bool plugin_get_request_metadata(grpc_exec_ctx* exec_ctx, + grpc_call_credentials* creds, grpc_polling_entity* pollent, grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, @@ -189,7 +194,7 @@ static bool plugin_get_request_metadata(grpc_call_credentials* creds, } // Returned synchronously. // Remove request from pending list if not previously cancelled. - pending_request_complete(pending_request); + pending_request_complete(exec_ctx, pending_request); // If the request was cancelled, the error will have been returned // asynchronously by plugin_cancel_get_request_metadata(), so return // false. Otherwise, process the result. @@ -208,13 +213,13 @@ static bool plugin_get_request_metadata(grpc_call_credentials* creds, "synchronously", c, pending_request); } - *error = process_plugin_result(pending_request, creds_md, num_creds_md, - status, error_details); + *error = process_plugin_result(exec_ctx, pending_request, creds_md, + num_creds_md, status, error_details); } // Clean up. for (size_t i = 0; i < num_creds_md; ++i) { - grpc_slice_unref_internal(creds_md[i].key); - grpc_slice_unref_internal(creds_md[i].value); + grpc_slice_unref_internal(exec_ctx, creds_md[i].key); + grpc_slice_unref_internal(exec_ctx, creds_md[i].value); } gpr_free((void*)error_details); gpr_free(pending_request); @@ -223,8 +228,8 @@ static bool plugin_get_request_metadata(grpc_call_credentials* creds, } static void plugin_cancel_get_request_metadata( - grpc_call_credentials* creds, grpc_credentials_mdelem_array* md_array, - grpc_error* error) { + grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, + grpc_credentials_mdelem_array* md_array, grpc_error* error) { grpc_plugin_credentials* c = (grpc_plugin_credentials*)creds; gpr_mu_lock(&c->mu); for (grpc_plugin_credentials_pending_request* pending_request = @@ -236,7 +241,7 @@ static void plugin_cancel_get_request_metadata( pending_request); } pending_request->cancelled = true; - GRPC_CLOSURE_SCHED(pending_request->on_request_metadata, + GRPC_CLOSURE_SCHED(exec_ctx, pending_request->on_request_metadata, GRPC_ERROR_REF(error)); pending_request_remove_locked(c, pending_request); break; diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.cc b/src/core/lib/security/credentials/ssl/ssl_credentials.cc index d8546441c95..39dd38cf889 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.cc +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.cc @@ -41,16 +41,18 @@ void grpc_tsi_ssl_pem_key_cert_pairs_destroy(tsi_ssl_pem_key_cert_pair* kp, gpr_free(kp); } -static void ssl_destruct(grpc_channel_credentials* creds) { +static void ssl_destruct(grpc_exec_ctx* exec_ctx, + grpc_channel_credentials* creds) { grpc_ssl_credentials* c = (grpc_ssl_credentials*)creds; gpr_free(c->config.pem_root_certs); grpc_tsi_ssl_pem_key_cert_pairs_destroy(c->config.pem_key_cert_pair, 1); } static grpc_security_status ssl_create_security_connector( - grpc_channel_credentials* creds, grpc_call_credentials* call_creds, - const char* target, const grpc_channel_args* args, - grpc_channel_security_connector** sc, grpc_channel_args** new_args) { + grpc_exec_ctx* exec_ctx, grpc_channel_credentials* creds, + grpc_call_credentials* call_creds, const char* target, + const grpc_channel_args* args, grpc_channel_security_connector** sc, + grpc_channel_args** new_args) { grpc_ssl_credentials* c = (grpc_ssl_credentials*)creds; grpc_security_status status = GRPC_SECURITY_OK; const char* overridden_target_name = nullptr; @@ -63,7 +65,8 @@ static grpc_security_status ssl_create_security_connector( } } status = grpc_ssl_channel_security_connector_create( - creds, call_creds, &c->config, target, overridden_target_name, sc); + exec_ctx, creds, call_creds, &c->config, target, overridden_target_name, + sc); if (status != GRPC_SECURITY_OK) { return status; } @@ -122,7 +125,8 @@ struct grpc_ssl_server_credentials_options { grpc_ssl_server_certificate_config_fetcher* certificate_config_fetcher; }; -static void ssl_server_destruct(grpc_server_credentials* creds) { +static void ssl_server_destruct(grpc_exec_ctx* exec_ctx, + grpc_server_credentials* creds) { grpc_ssl_server_credentials* c = (grpc_ssl_server_credentials*)creds; grpc_tsi_ssl_pem_key_cert_pairs_destroy(c->config.pem_key_cert_pairs, c->config.num_key_cert_pairs); @@ -130,8 +134,9 @@ static void ssl_server_destruct(grpc_server_credentials* creds) { } static grpc_security_status ssl_server_create_security_connector( - grpc_server_credentials* creds, grpc_server_security_connector** sc) { - return grpc_ssl_server_security_connector_create(creds, sc); + grpc_exec_ctx* exec_ctx, grpc_server_credentials* creds, + grpc_server_security_connector** sc) { + return grpc_ssl_server_security_connector_create(exec_ctx, creds, sc); } static grpc_server_credentials_vtable ssl_server_vtable = { diff --git a/src/core/lib/security/transport/client_auth_filter.cc b/src/core/lib/security/transport/client_auth_filter.cc index cd3c2e3f19d..326f4d77732 100644 --- a/src/core/lib/security/transport/client_auth_filter.cc +++ b/src/core/lib/security/transport/client_auth_filter.cc @@ -90,7 +90,8 @@ static void add_error(grpc_error** combined, grpc_error* error) { *combined = grpc_error_add_child(*combined, error); } -static void on_credentials_metadata(void* arg, grpc_error* input_error) { +static void on_credentials_metadata(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* input_error) { grpc_transport_stream_op_batch* batch = (grpc_transport_stream_op_batch*)arg; grpc_call_element* elem = (grpc_call_element*)batch->handler_private.extra_arg; @@ -104,16 +105,16 @@ static void on_credentials_metadata(void* arg, grpc_error* input_error) { batch->payload->send_initial_metadata.send_initial_metadata; for (size_t i = 0; i < calld->md_array.size; ++i) { add_error(&error, grpc_metadata_batch_add_tail( - mdb, &calld->md_links[i], + exec_ctx, mdb, &calld->md_links[i], GRPC_MDELEM_REF(calld->md_array.md[i]))); } } if (error == GRPC_ERROR_NONE) { - grpc_call_next_op(elem, batch); + grpc_call_next_op(exec_ctx, elem, batch); } else { error = grpc_error_set_int(error, GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAUTHENTICATED); - grpc_transport_stream_op_batch_finish_with_failure(batch, error, + grpc_transport_stream_op_batch_finish_with_failure(exec_ctx, batch, error, calld->call_combiner); } } @@ -155,17 +156,20 @@ void grpc_auth_metadata_context_build( gpr_free(host_and_port); } -static void cancel_get_request_metadata(void* arg, grpc_error* error) { +static void cancel_get_request_metadata(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; if (error != GRPC_ERROR_NONE) { grpc_call_credentials_cancel_get_request_metadata( - calld->creds, &calld->md_array, GRPC_ERROR_REF(error)); + exec_ctx, calld->creds, &calld->md_array, GRPC_ERROR_REF(error)); } - GRPC_CALL_STACK_UNREF(calld->owning_call, "cancel_get_request_metadata"); + GRPC_CALL_STACK_UNREF(exec_ctx, calld->owning_call, + "cancel_get_request_metadata"); } -static void send_security_metadata(grpc_call_element* elem, +static void send_security_metadata(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; @@ -179,7 +183,7 @@ static void send_security_metadata(grpc_call_element* elem, if (channel_call_creds == nullptr && !call_creds_has_md) { /* Skip sending metadata altogether. */ - grpc_call_next_op(elem, batch); + grpc_call_next_op(exec_ctx, elem, batch); return; } @@ -188,7 +192,7 @@ static void send_security_metadata(grpc_call_element* elem, ctx->creds, nullptr); if (calld->creds == nullptr) { grpc_transport_stream_op_batch_finish_with_failure( - batch, + exec_ctx, batch, grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Incompatible credentials set on channel and call."), @@ -211,29 +215,30 @@ static void send_security_metadata(grpc_call_element* elem, batch, grpc_schedule_on_exec_ctx); grpc_error* error = GRPC_ERROR_NONE; if (grpc_call_credentials_get_request_metadata( - calld->creds, calld->pollent, calld->auth_md_context, + exec_ctx, calld->creds, calld->pollent, calld->auth_md_context, &calld->md_array, &calld->async_result_closure, &error)) { // Synchronous return; invoke on_credentials_metadata() directly. - on_credentials_metadata(batch, error); + on_credentials_metadata(exec_ctx, batch, error); GRPC_ERROR_UNREF(error); } else { // Async return; register cancellation closure with call combiner. GRPC_CALL_STACK_REF(calld->owning_call, "cancel_get_request_metadata"); grpc_call_combiner_set_notify_on_cancel( - calld->call_combiner, + exec_ctx, calld->call_combiner, GRPC_CLOSURE_INIT(&calld->get_request_metadata_cancel_closure, cancel_get_request_metadata, elem, grpc_schedule_on_exec_ctx)); } } -static void on_host_checked(void* arg, grpc_error* error) { +static void on_host_checked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_transport_stream_op_batch* batch = (grpc_transport_stream_op_batch*)arg; grpc_call_element* elem = (grpc_call_element*)batch->handler_private.extra_arg; call_data* calld = (call_data*)elem->call_data; if (error == GRPC_ERROR_NONE) { - send_security_metadata(elem, batch); + send_security_metadata(exec_ctx, elem, batch); } else { char* error_msg; char* host = grpc_slice_to_c_string(calld->host); @@ -241,7 +246,7 @@ static void on_host_checked(void* arg, grpc_error* error) { host); gpr_free(host); grpc_transport_stream_op_batch_finish_with_failure( - batch, + exec_ctx, batch, grpc_error_set_int(GRPC_ERROR_CREATE_FROM_COPIED_STRING(error_msg), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAUTHENTICATED), @@ -250,20 +255,22 @@ static void on_host_checked(void* arg, grpc_error* error) { } } -static void cancel_check_call_host(void* arg, grpc_error* error) { +static void cancel_check_call_host(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; if (error != GRPC_ERROR_NONE) { grpc_channel_security_connector_cancel_check_call_host( - chand->security_connector, &calld->async_result_closure, + exec_ctx, chand->security_connector, &calld->async_result_closure, GRPC_ERROR_REF(error)); } - GRPC_CALL_STACK_UNREF(calld->owning_call, "cancel_check_call_host"); + GRPC_CALL_STACK_UNREF(exec_ctx, calld->owning_call, "cancel_check_call_host"); } static void auth_start_transport_stream_op_batch( - grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_transport_stream_op_batch* batch) { GPR_TIMER_BEGIN("auth_start_transport_stream_op_batch", 0); /* grab pointers to our data from the call element */ @@ -296,13 +303,13 @@ static void auth_start_transport_stream_op_batch( */ if (grpc_slice_eq(GRPC_MDKEY(md), GRPC_MDSTR_AUTHORITY)) { if (calld->have_host) { - grpc_slice_unref_internal(calld->host); + grpc_slice_unref_internal(exec_ctx, calld->host); } calld->host = grpc_slice_ref_internal(GRPC_MDVALUE(md)); calld->have_host = true; } else if (grpc_slice_eq(GRPC_MDKEY(md), GRPC_MDSTR_PATH)) { if (calld->have_method) { - grpc_slice_unref_internal(calld->method); + grpc_slice_unref_internal(exec_ctx, calld->method); } calld->method = grpc_slice_ref_internal(GRPC_MDVALUE(md)); calld->have_method = true; @@ -315,16 +322,16 @@ static void auth_start_transport_stream_op_batch( char* call_host = grpc_slice_to_c_string(calld->host); grpc_error* error = GRPC_ERROR_NONE; if (grpc_channel_security_connector_check_call_host( - chand->security_connector, call_host, chand->auth_context, - &calld->async_result_closure, &error)) { + exec_ctx, chand->security_connector, call_host, + chand->auth_context, &calld->async_result_closure, &error)) { // Synchronous return; invoke on_host_checked() directly. - on_host_checked(batch, error); + on_host_checked(exec_ctx, batch, error); GRPC_ERROR_UNREF(error); } else { // Async return; register cancellation closure with call combiner. GRPC_CALL_STACK_REF(calld->owning_call, "cancel_check_call_host"); grpc_call_combiner_set_notify_on_cancel( - calld->call_combiner, + exec_ctx, calld->call_combiner, GRPC_CLOSURE_INIT(&calld->check_call_host_cancel_closure, cancel_check_call_host, elem, grpc_schedule_on_exec_ctx)); @@ -336,12 +343,13 @@ static void auth_start_transport_stream_op_batch( } /* pass control down the stack */ - grpc_call_next_op(elem, batch); + grpc_call_next_op(exec_ctx, elem, batch); GPR_TIMER_END("auth_start_transport_stream_op_batch", 0); } /* Constructor for call_data */ -static grpc_error* init_call_elem(grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; calld->owning_call = args->call_stack; @@ -349,30 +357,32 @@ static grpc_error* init_call_elem(grpc_call_element* elem, return GRPC_ERROR_NONE; } -static void set_pollset_or_pollset_set(grpc_call_element* elem, +static void set_pollset_or_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_polling_entity* pollent) { call_data* calld = (call_data*)elem->call_data; calld->pollent = pollent; } /* Destructor for call_data */ -static void destroy_call_elem(grpc_call_element* elem, +static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { call_data* calld = (call_data*)elem->call_data; - grpc_credentials_mdelem_array_destroy(&calld->md_array); - grpc_call_credentials_unref(calld->creds); + grpc_credentials_mdelem_array_destroy(exec_ctx, &calld->md_array); + grpc_call_credentials_unref(exec_ctx, calld->creds); if (calld->have_host) { - grpc_slice_unref_internal(calld->host); + grpc_slice_unref_internal(exec_ctx, calld->host); } if (calld->have_method) { - grpc_slice_unref_internal(calld->method); + grpc_slice_unref_internal(exec_ctx, calld->method); } grpc_auth_metadata_context_reset(&calld->auth_md_context); } /* Constructor for channel_data */ -static grpc_error* init_channel_elem(grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { grpc_security_connector* sc = grpc_security_connector_find_in_args(args->channel_args); @@ -405,12 +415,13 @@ static grpc_error* init_channel_elem(grpc_channel_element* elem, } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_channel_element* elem) { +static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) { /* grab pointers to our data from the channel element */ channel_data* chand = (channel_data*)elem->channel_data; grpc_channel_security_connector* sc = chand->security_connector; if (sc != nullptr) { - GRPC_SECURITY_CONNECTOR_UNREF(&sc->base, "client_auth_filter"); + GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, &sc->base, "client_auth_filter"); } GRPC_AUTH_CONTEXT_UNREF(chand->auth_context, "client_auth_filter"); } diff --git a/src/core/lib/security/transport/lb_targets_info.cc b/src/core/lib/security/transport/lb_targets_info.cc index 183b1ebf356..c07be358404 100644 --- a/src/core/lib/security/transport/lb_targets_info.cc +++ b/src/core/lib/security/transport/lb_targets_info.cc @@ -28,8 +28,8 @@ static void* targets_info_copy(void* p) { return grpc_slice_hash_table_ref((grpc_slice_hash_table*)p); } -static void targets_info_destroy(void* p) { - grpc_slice_hash_table_unref((grpc_slice_hash_table*)p); +static void targets_info_destroy(grpc_exec_ctx* exec_ctx, void* p) { + grpc_slice_hash_table_unref(exec_ctx, (grpc_slice_hash_table*)p); } static int targets_info_cmp(void* a, void* b) { return grpc_slice_hash_table_cmp((const grpc_slice_hash_table*)a, diff --git a/src/core/lib/security/transport/secure_endpoint.cc b/src/core/lib/security/transport/secure_endpoint.cc index e5c089de9ca..4cd317a06d7 100644 --- a/src/core/lib/security/transport/secure_endpoint.cc +++ b/src/core/lib/security/transport/secure_endpoint.cc @@ -63,27 +63,28 @@ typedef struct { grpc_core::TraceFlag grpc_trace_secure_endpoint(false, "secure_endpoint"); -static void destroy(secure_endpoint* secure_ep) { +static void destroy(grpc_exec_ctx* exec_ctx, secure_endpoint* secure_ep) { secure_endpoint* ep = secure_ep; - grpc_endpoint_destroy(ep->wrapped_ep); + grpc_endpoint_destroy(exec_ctx, ep->wrapped_ep); tsi_frame_protector_destroy(ep->protector); - tsi_zero_copy_grpc_protector_destroy(ep->zero_copy_protector); - grpc_slice_buffer_destroy_internal(&ep->leftover_bytes); - grpc_slice_unref_internal(ep->read_staging_buffer); - grpc_slice_unref_internal(ep->write_staging_buffer); - grpc_slice_buffer_destroy_internal(&ep->output_buffer); - grpc_slice_buffer_destroy_internal(&ep->source_buffer); + tsi_zero_copy_grpc_protector_destroy(exec_ctx, ep->zero_copy_protector); + grpc_slice_buffer_destroy_internal(exec_ctx, &ep->leftover_bytes); + grpc_slice_unref_internal(exec_ctx, ep->read_staging_buffer); + grpc_slice_unref_internal(exec_ctx, ep->write_staging_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, &ep->output_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, &ep->source_buffer); gpr_mu_destroy(&ep->protector_mu); gpr_free(ep); } #ifndef NDEBUG -#define SECURE_ENDPOINT_UNREF(ep, reason) \ - secure_endpoint_unref((ep), (reason), __FILE__, __LINE__) +#define SECURE_ENDPOINT_UNREF(exec_ctx, ep, reason) \ + secure_endpoint_unref((exec_ctx), (ep), (reason), __FILE__, __LINE__) #define SECURE_ENDPOINT_REF(ep, reason) \ secure_endpoint_ref((ep), (reason), __FILE__, __LINE__) -static void secure_endpoint_unref(secure_endpoint* ep, const char* reason, - const char* file, int line) { +static void secure_endpoint_unref(grpc_exec_ctx* exec_ctx, secure_endpoint* ep, + const char* reason, const char* file, + int line) { if (grpc_trace_secure_endpoint.enabled()) { gpr_atm val = gpr_atm_no_barrier_load(&ep->ref.count); gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, @@ -91,7 +92,7 @@ static void secure_endpoint_unref(secure_endpoint* ep, const char* reason, val - 1); } if (gpr_unref(&ep->ref)) { - destroy(ep); + destroy(exec_ctx, ep); } } @@ -106,11 +107,13 @@ static void secure_endpoint_ref(secure_endpoint* ep, const char* reason, gpr_ref(&ep->ref); } #else -#define SECURE_ENDPOINT_UNREF(ep, reason) secure_endpoint_unref((ep)) +#define SECURE_ENDPOINT_UNREF(exec_ctx, ep, reason) \ + secure_endpoint_unref((exec_ctx), (ep)) #define SECURE_ENDPOINT_REF(ep, reason) secure_endpoint_ref((ep)) -static void secure_endpoint_unref(secure_endpoint* ep) { +static void secure_endpoint_unref(grpc_exec_ctx* exec_ctx, + secure_endpoint* ep) { if (gpr_unref(&ep->ref)) { - destroy(ep); + destroy(exec_ctx, ep); } } @@ -125,7 +128,8 @@ static void flush_read_staging_buffer(secure_endpoint* ep, uint8_t** cur, *end = GRPC_SLICE_END_PTR(ep->read_staging_buffer); } -static void call_read_cb(secure_endpoint* ep, grpc_error* error) { +static void call_read_cb(grpc_exec_ctx* exec_ctx, secure_endpoint* ep, + grpc_error* error) { if (grpc_trace_secure_endpoint.enabled()) { size_t i; for (i = 0; i < ep->read_buffer->count; i++) { @@ -136,11 +140,12 @@ static void call_read_cb(secure_endpoint* ep, grpc_error* error) { } } ep->read_buffer = nullptr; - GRPC_CLOSURE_SCHED(ep->read_cb, error); - SECURE_ENDPOINT_UNREF(ep, "read"); + GRPC_CLOSURE_SCHED(exec_ctx, ep->read_cb, error); + SECURE_ENDPOINT_UNREF(exec_ctx, ep, "read"); } -static void on_read(void* user_data, grpc_error* error) { +static void on_read(grpc_exec_ctx* exec_ctx, void* user_data, + grpc_error* error) { unsigned i; uint8_t keep_looping = 0; tsi_result result = TSI_OK; @@ -149,16 +154,17 @@ static void on_read(void* user_data, grpc_error* error) { uint8_t* end = GRPC_SLICE_END_PTR(ep->read_staging_buffer); if (error != GRPC_ERROR_NONE) { - grpc_slice_buffer_reset_and_unref_internal(ep->read_buffer); - call_read_cb(ep, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Secure read failed", &error, 1)); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, ep->read_buffer); + call_read_cb(exec_ctx, ep, + GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Secure read failed", &error, 1)); return; } if (ep->zero_copy_protector != nullptr) { // Use zero-copy grpc protector to unprotect. result = tsi_zero_copy_grpc_protector_unprotect( - ep->zero_copy_protector, &ep->source_buffer, ep->read_buffer); + exec_ctx, ep->zero_copy_protector, &ep->source_buffer, ep->read_buffer); } else { // Use frame protector to unprotect. /* TODO(yangg) check error, maybe bail out early */ @@ -211,35 +217,37 @@ static void on_read(void* user_data, grpc_error* error) { /* TODO(yangg) experiment with moving this block after read_cb to see if it helps latency */ - grpc_slice_buffer_reset_and_unref_internal(&ep->source_buffer); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &ep->source_buffer); if (result != TSI_OK) { - grpc_slice_buffer_reset_and_unref_internal(ep->read_buffer); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, ep->read_buffer); call_read_cb( - ep, grpc_set_tsi_error_result( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Unwrap failed"), result)); + exec_ctx, ep, + grpc_set_tsi_error_result( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Unwrap failed"), result)); return; } - call_read_cb(ep, GRPC_ERROR_NONE); + call_read_cb(exec_ctx, ep, GRPC_ERROR_NONE); } -static void endpoint_read(grpc_endpoint* secure_ep, grpc_slice_buffer* slices, - grpc_closure* cb) { +static void endpoint_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* secure_ep, + grpc_slice_buffer* slices, grpc_closure* cb) { secure_endpoint* ep = (secure_endpoint*)secure_ep; ep->read_cb = cb; ep->read_buffer = slices; - grpc_slice_buffer_reset_and_unref_internal(ep->read_buffer); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, ep->read_buffer); SECURE_ENDPOINT_REF(ep, "read"); if (ep->leftover_bytes.count) { grpc_slice_buffer_swap(&ep->leftover_bytes, &ep->source_buffer); GPR_ASSERT(ep->leftover_bytes.count == 0); - on_read(ep, GRPC_ERROR_NONE); + on_read(exec_ctx, ep, GRPC_ERROR_NONE); return; } - grpc_endpoint_read(ep->wrapped_ep, &ep->source_buffer, &ep->on_read); + grpc_endpoint_read(exec_ctx, ep->wrapped_ep, &ep->source_buffer, + &ep->on_read); } static void flush_write_staging_buffer(secure_endpoint* ep, uint8_t** cur, @@ -250,8 +258,8 @@ static void flush_write_staging_buffer(secure_endpoint* ep, uint8_t** cur, *end = GRPC_SLICE_END_PTR(ep->write_staging_buffer); } -static void endpoint_write(grpc_endpoint* secure_ep, grpc_slice_buffer* slices, - grpc_closure* cb) { +static void endpoint_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* secure_ep, + grpc_slice_buffer* slices, grpc_closure* cb) { GPR_TIMER_BEGIN("secure_endpoint.endpoint_write", 0); unsigned i; @@ -260,7 +268,7 @@ static void endpoint_write(grpc_endpoint* secure_ep, grpc_slice_buffer* slices, uint8_t* cur = GRPC_SLICE_START_PTR(ep->write_staging_buffer); uint8_t* end = GRPC_SLICE_END_PTR(ep->write_staging_buffer); - grpc_slice_buffer_reset_and_unref_internal(&ep->output_buffer); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &ep->output_buffer); if (grpc_trace_secure_endpoint.enabled()) { for (i = 0; i < slices->count; i++) { @@ -273,8 +281,8 @@ static void endpoint_write(grpc_endpoint* secure_ep, grpc_slice_buffer* slices, if (ep->zero_copy_protector != nullptr) { // Use zero-copy grpc protector to protect. - result = tsi_zero_copy_grpc_protector_protect(ep->zero_copy_protector, - slices, &ep->output_buffer); + result = tsi_zero_copy_grpc_protector_protect( + exec_ctx, ep->zero_copy_protector, slices, &ep->output_buffer); } else { // Use frame protector to protect. for (i = 0; i < slices->count; i++) { @@ -332,44 +340,50 @@ static void endpoint_write(grpc_endpoint* secure_ep, grpc_slice_buffer* slices, if (result != TSI_OK) { /* TODO(yangg) do different things according to the error type? */ - grpc_slice_buffer_reset_and_unref_internal(&ep->output_buffer); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &ep->output_buffer); GRPC_CLOSURE_SCHED( - cb, grpc_set_tsi_error_result( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Wrap failed"), result)); + exec_ctx, cb, + grpc_set_tsi_error_result( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Wrap failed"), result)); GPR_TIMER_END("secure_endpoint.endpoint_write", 0); return; } - grpc_endpoint_write(ep->wrapped_ep, &ep->output_buffer, cb); + grpc_endpoint_write(exec_ctx, ep->wrapped_ep, &ep->output_buffer, cb); GPR_TIMER_END("secure_endpoint.endpoint_write", 0); } -static void endpoint_shutdown(grpc_endpoint* secure_ep, grpc_error* why) { +static void endpoint_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* secure_ep, + grpc_error* why) { secure_endpoint* ep = (secure_endpoint*)secure_ep; - grpc_endpoint_shutdown(ep->wrapped_ep, why); + grpc_endpoint_shutdown(exec_ctx, ep->wrapped_ep, why); } -static void endpoint_destroy(grpc_endpoint* secure_ep) { +static void endpoint_destroy(grpc_exec_ctx* exec_ctx, + grpc_endpoint* secure_ep) { secure_endpoint* ep = (secure_endpoint*)secure_ep; - SECURE_ENDPOINT_UNREF(ep, "destroy"); + SECURE_ENDPOINT_UNREF(exec_ctx, ep, "destroy"); } -static void endpoint_add_to_pollset(grpc_endpoint* secure_ep, +static void endpoint_add_to_pollset(grpc_exec_ctx* exec_ctx, + grpc_endpoint* secure_ep, grpc_pollset* pollset) { secure_endpoint* ep = (secure_endpoint*)secure_ep; - grpc_endpoint_add_to_pollset(ep->wrapped_ep, pollset); + grpc_endpoint_add_to_pollset(exec_ctx, ep->wrapped_ep, pollset); } -static void endpoint_add_to_pollset_set(grpc_endpoint* secure_ep, +static void endpoint_add_to_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_endpoint* secure_ep, grpc_pollset_set* pollset_set) { secure_endpoint* ep = (secure_endpoint*)secure_ep; - grpc_endpoint_add_to_pollset_set(ep->wrapped_ep, pollset_set); + grpc_endpoint_add_to_pollset_set(exec_ctx, ep->wrapped_ep, pollset_set); } -static void endpoint_delete_from_pollset_set(grpc_endpoint* secure_ep, +static void endpoint_delete_from_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_endpoint* secure_ep, grpc_pollset_set* pollset_set) { secure_endpoint* ep = (secure_endpoint*)secure_ep; - grpc_endpoint_delete_from_pollset_set(ep->wrapped_ep, pollset_set); + grpc_endpoint_delete_from_pollset_set(exec_ctx, ep->wrapped_ep, pollset_set); } static char* endpoint_get_peer(grpc_endpoint* secure_ep) { diff --git a/src/core/lib/security/transport/security_connector.cc b/src/core/lib/security/transport/security_connector.cc index fd139714da2..c56e459aebd 100644 --- a/src/core/lib/security/transport/security_connector.cc +++ b/src/core/lib/security/transport/security_connector.cc @@ -105,32 +105,33 @@ const tsi_peer_property* tsi_peer_get_property_by_name(const tsi_peer* peer, } void grpc_channel_security_connector_add_handshakers( - grpc_channel_security_connector* connector, + grpc_exec_ctx* exec_ctx, grpc_channel_security_connector* connector, grpc_handshake_manager* handshake_mgr) { if (connector != nullptr) { - connector->add_handshakers(connector, handshake_mgr); + connector->add_handshakers(exec_ctx, connector, handshake_mgr); } } void grpc_server_security_connector_add_handshakers( - grpc_server_security_connector* connector, + grpc_exec_ctx* exec_ctx, grpc_server_security_connector* connector, grpc_handshake_manager* handshake_mgr) { if (connector != nullptr) { - connector->add_handshakers(connector, handshake_mgr); + connector->add_handshakers(exec_ctx, connector, handshake_mgr); } } -void grpc_security_connector_check_peer(grpc_security_connector* sc, +void grpc_security_connector_check_peer(grpc_exec_ctx* exec_ctx, + grpc_security_connector* sc, tsi_peer peer, grpc_auth_context** auth_context, grpc_closure* on_peer_checked) { if (sc == nullptr) { - GRPC_CLOSURE_SCHED(on_peer_checked, + GRPC_CLOSURE_SCHED(exec_ctx, on_peer_checked, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "cannot check peer -- no security connector")); tsi_peer_destruct(&peer); } else { - sc->vtable->check_peer(sc, peer, auth_context, on_peer_checked); + sc->vtable->check_peer(exec_ctx, sc, peer, auth_context, on_peer_checked); } } @@ -168,26 +169,26 @@ int grpc_server_security_connector_cmp(grpc_server_security_connector* sc1, } bool grpc_channel_security_connector_check_call_host( - grpc_channel_security_connector* sc, const char* host, - grpc_auth_context* auth_context, grpc_closure* on_call_host_checked, - grpc_error** error) { + grpc_exec_ctx* exec_ctx, grpc_channel_security_connector* sc, + const char* host, grpc_auth_context* auth_context, + grpc_closure* on_call_host_checked, grpc_error** error) { if (sc == nullptr || sc->check_call_host == nullptr) { *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "cannot check call host -- no security connector"); return true; } - return sc->check_call_host(sc, host, auth_context, on_call_host_checked, - error); + return sc->check_call_host(exec_ctx, sc, host, auth_context, + on_call_host_checked, error); } void grpc_channel_security_connector_cancel_check_call_host( - grpc_channel_security_connector* sc, grpc_closure* on_call_host_checked, - grpc_error* error) { + grpc_exec_ctx* exec_ctx, grpc_channel_security_connector* sc, + grpc_closure* on_call_host_checked, grpc_error* error) { if (sc == nullptr || sc->cancel_check_call_host == nullptr) { GRPC_ERROR_UNREF(error); return; } - sc->cancel_check_call_host(sc, on_call_host_checked, error); + sc->cancel_check_call_host(exec_ctx, sc, on_call_host_checked, error); } #ifndef NDEBUG @@ -204,14 +205,15 @@ grpc_security_connector* grpc_security_connector_ref( #else grpc_security_connector* grpc_security_connector_ref( grpc_security_connector* sc) { - if (sc == nullptr) return nullptr; + if (sc == NULL) return NULL; #endif gpr_ref(&sc->refcount); return sc; } #ifndef NDEBUG -void grpc_security_connector_unref(grpc_security_connector* sc, +void grpc_security_connector_unref(grpc_exec_ctx* exec_ctx, + grpc_security_connector* sc, const char* file, int line, const char* reason) { if (sc == nullptr) return; @@ -222,14 +224,15 @@ void grpc_security_connector_unref(grpc_security_connector* sc, val, val - 1, reason); } #else -void grpc_security_connector_unref(grpc_security_connector* sc) { - if (sc == nullptr) return; +void grpc_security_connector_unref(grpc_exec_ctx* exec_ctx, + grpc_security_connector* sc) { + if (sc == NULL) return; #endif - if (gpr_unref(&sc->refcount)) sc->vtable->destroy(sc); + if (gpr_unref(&sc->refcount)) sc->vtable->destroy(exec_ctx, sc); } -static void connector_arg_destroy(void* p) { - GRPC_SECURITY_CONNECTOR_UNREF((grpc_security_connector*)p, +static void connector_arg_destroy(grpc_exec_ctx* exec_ctx, void* p) { + GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, (grpc_security_connector*)p, "connector_arg_destroy"); } @@ -306,16 +309,20 @@ typedef struct { bool is_lb_channel; } grpc_fake_channel_security_connector; -static void fake_channel_destroy(grpc_security_connector* sc) { +static void fake_channel_destroy(grpc_exec_ctx* exec_ctx, + grpc_security_connector* sc) { grpc_fake_channel_security_connector* c = (grpc_fake_channel_security_connector*)sc; - grpc_call_credentials_unref(c->base.request_metadata_creds); + grpc_call_credentials_unref(exec_ctx, c->base.request_metadata_creds); gpr_free(c->target); gpr_free(c->expected_targets); gpr_free(c); } -static void fake_server_destroy(grpc_security_connector* sc) { gpr_free(sc); } +static void fake_server_destroy(grpc_exec_ctx* exec_ctx, + grpc_security_connector* sc) { + gpr_free(sc); +} static bool fake_check_target(const char* target_type, const char* target, const char* set_str) { @@ -379,7 +386,8 @@ done: if (!success) abort(); } -static void fake_check_peer(grpc_security_connector* sc, tsi_peer peer, +static void fake_check_peer(grpc_exec_ctx* exec_ctx, + grpc_security_connector* sc, tsi_peer peer, grpc_auth_context** auth_context, grpc_closure* on_peer_checked) { const char* prop_name; @@ -411,23 +419,25 @@ static void fake_check_peer(grpc_security_connector* sc, tsi_peer peer, *auth_context, GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME, GRPC_FAKE_TRANSPORT_SECURITY_TYPE); end: - GRPC_CLOSURE_SCHED(on_peer_checked, error); + GRPC_CLOSURE_SCHED(exec_ctx, on_peer_checked, error); tsi_peer_destruct(&peer); } -static void fake_channel_check_peer(grpc_security_connector* sc, tsi_peer peer, +static void fake_channel_check_peer(grpc_exec_ctx* exec_ctx, + grpc_security_connector* sc, tsi_peer peer, grpc_auth_context** auth_context, grpc_closure* on_peer_checked) { - fake_check_peer(sc, peer, auth_context, on_peer_checked); + fake_check_peer(exec_ctx, sc, peer, auth_context, on_peer_checked); grpc_fake_channel_security_connector* c = (grpc_fake_channel_security_connector*)sc; fake_secure_name_check(c->target, c->expected_targets, c->is_lb_channel); } -static void fake_server_check_peer(grpc_security_connector* sc, tsi_peer peer, +static void fake_server_check_peer(grpc_exec_ctx* exec_ctx, + grpc_security_connector* sc, tsi_peer peer, grpc_auth_context** auth_context, grpc_closure* on_peer_checked) { - fake_check_peer(sc, peer, auth_context, on_peer_checked); + fake_check_peer(exec_ctx, sc, peer, auth_context, on_peer_checked); } static int fake_channel_cmp(grpc_security_connector* sc1, @@ -456,7 +466,8 @@ static int fake_server_cmp(grpc_security_connector* sc1, (grpc_server_security_connector*)sc2); } -static bool fake_channel_check_call_host(grpc_channel_security_connector* sc, +static bool fake_channel_check_call_host(grpc_exec_ctx* exec_ctx, + grpc_channel_security_connector* sc, const char* host, grpc_auth_context* auth_context, grpc_closure* on_call_host_checked, @@ -465,26 +476,29 @@ static bool fake_channel_check_call_host(grpc_channel_security_connector* sc, } static void fake_channel_cancel_check_call_host( - grpc_channel_security_connector* sc, grpc_closure* on_call_host_checked, - grpc_error* error) { + grpc_exec_ctx* exec_ctx, grpc_channel_security_connector* sc, + grpc_closure* on_call_host_checked, grpc_error* error) { GRPC_ERROR_UNREF(error); } static void fake_channel_add_handshakers( - grpc_channel_security_connector* sc, + grpc_exec_ctx* exec_ctx, grpc_channel_security_connector* sc, grpc_handshake_manager* handshake_mgr) { grpc_handshake_manager_add( handshake_mgr, grpc_security_handshaker_create( - tsi_create_fake_handshaker(true /* is_client */), &sc->base)); + exec_ctx, tsi_create_fake_handshaker(true /* is_client */), + &sc->base)); } -static void fake_server_add_handshakers(grpc_server_security_connector* sc, +static void fake_server_add_handshakers(grpc_exec_ctx* exec_ctx, + grpc_server_security_connector* sc, grpc_handshake_manager* handshake_mgr) { grpc_handshake_manager_add( handshake_mgr, grpc_security_handshaker_create( - tsi_create_fake_handshaker(false /* is_client */), &sc->base)); + exec_ctx, tsi_create_fake_handshaker(false /* is_client */), + &sc->base)); } static grpc_security_connector_vtable fake_channel_vtable = { @@ -551,11 +565,12 @@ static bool server_connector_has_cert_config_fetcher( return server_creds->certificate_config_fetcher.cb != nullptr; } -static void ssl_channel_destroy(grpc_security_connector* sc) { +static void ssl_channel_destroy(grpc_exec_ctx* exec_ctx, + grpc_security_connector* sc) { grpc_ssl_channel_security_connector* c = (grpc_ssl_channel_security_connector*)sc; - grpc_channel_credentials_unref(c->base.channel_creds); - grpc_call_credentials_unref(c->base.request_metadata_creds); + grpc_channel_credentials_unref(exec_ctx, c->base.channel_creds); + grpc_call_credentials_unref(exec_ctx, c->base.request_metadata_creds); tsi_ssl_client_handshaker_factory_unref(c->client_handshaker_factory); c->client_handshaker_factory = nullptr; if (c->target_name != nullptr) gpr_free(c->target_name); @@ -563,16 +578,18 @@ static void ssl_channel_destroy(grpc_security_connector* sc) { gpr_free(sc); } -static void ssl_server_destroy(grpc_security_connector* sc) { +static void ssl_server_destroy(grpc_exec_ctx* exec_ctx, + grpc_security_connector* sc) { grpc_ssl_server_security_connector* c = (grpc_ssl_server_security_connector*)sc; - grpc_server_credentials_unref(c->base.server_creds); + grpc_server_credentials_unref(exec_ctx, c->base.server_creds); tsi_ssl_server_handshaker_factory_unref(c->server_handshaker_factory); c->server_handshaker_factory = nullptr; gpr_free(sc); } -static void ssl_channel_add_handshakers(grpc_channel_security_connector* sc, +static void ssl_channel_add_handshakers(grpc_exec_ctx* exec_ctx, + grpc_channel_security_connector* sc, grpc_handshake_manager* handshake_mgr) { grpc_ssl_channel_security_connector* c = (grpc_ssl_channel_security_connector*)sc; @@ -590,8 +607,9 @@ static void ssl_channel_add_handshakers(grpc_channel_security_connector* sc, } // Create handshakers. grpc_handshake_manager_add( - handshake_mgr, grpc_security_handshaker_create( - tsi_create_adapter_handshaker(tsi_hs), &sc->base)); + handshake_mgr, + grpc_security_handshaker_create( + exec_ctx, tsi_create_adapter_handshaker(tsi_hs), &sc->base)); } static const char** fill_alpn_protocol_strings(size_t* num_alpn_protocols) { @@ -683,7 +701,8 @@ static bool try_fetch_ssl_server_credentials( return status; } -static void ssl_server_add_handshakers(grpc_server_security_connector* sc, +static void ssl_server_add_handshakers(grpc_exec_ctx* exec_ctx, + grpc_server_security_connector* sc, grpc_handshake_manager* handshake_mgr) { grpc_ssl_server_security_connector* c = (grpc_ssl_server_security_connector*)sc; @@ -699,8 +718,9 @@ static void ssl_server_add_handshakers(grpc_server_security_connector* sc, } // Create handshakers. grpc_handshake_manager_add( - handshake_mgr, grpc_security_handshaker_create( - tsi_create_adapter_handshaker(tsi_hs), &sc->base)); + handshake_mgr, + grpc_security_handshaker_create( + exec_ctx, tsi_create_adapter_handshaker(tsi_hs), &sc->base)); } static int ssl_host_matches_name(const tsi_peer* peer, const char* peer_name) { @@ -784,7 +804,8 @@ static grpc_error* ssl_check_peer(grpc_security_connector* sc, return GRPC_ERROR_NONE; } -static void ssl_channel_check_peer(grpc_security_connector* sc, tsi_peer peer, +static void ssl_channel_check_peer(grpc_exec_ctx* exec_ctx, + grpc_security_connector* sc, tsi_peer peer, grpc_auth_context** auth_context, grpc_closure* on_peer_checked) { grpc_ssl_channel_security_connector* c = @@ -794,16 +815,17 @@ static void ssl_channel_check_peer(grpc_security_connector* sc, tsi_peer peer, ? c->overridden_target_name : c->target_name, &peer, auth_context); - GRPC_CLOSURE_SCHED(on_peer_checked, error); + GRPC_CLOSURE_SCHED(exec_ctx, on_peer_checked, error); tsi_peer_destruct(&peer); } -static void ssl_server_check_peer(grpc_security_connector* sc, tsi_peer peer, +static void ssl_server_check_peer(grpc_exec_ctx* exec_ctx, + grpc_security_connector* sc, tsi_peer peer, grpc_auth_context** auth_context, grpc_closure* on_peer_checked) { grpc_error* error = ssl_check_peer(sc, nullptr, &peer, auth_context); tsi_peer_destruct(&peer); - GRPC_CLOSURE_SCHED(on_peer_checked, error); + GRPC_CLOSURE_SCHED(exec_ctx, on_peer_checked, error); } static int ssl_channel_cmp(grpc_security_connector* sc1, @@ -873,7 +895,8 @@ void tsi_shallow_peer_destruct(tsi_peer* peer) { if (peer->properties != nullptr) gpr_free(peer->properties); } -static bool ssl_channel_check_call_host(grpc_channel_security_connector* sc, +static bool ssl_channel_check_call_host(grpc_exec_ctx* exec_ctx, + grpc_channel_security_connector* sc, const char* host, grpc_auth_context* auth_context, grpc_closure* on_call_host_checked, @@ -899,8 +922,8 @@ static bool ssl_channel_check_call_host(grpc_channel_security_connector* sc, } static void ssl_channel_cancel_check_call_host( - grpc_channel_security_connector* sc, grpc_closure* on_call_host_checked, - grpc_error* error) { + grpc_exec_ctx* exec_ctx, grpc_channel_security_connector* sc, + grpc_closure* on_call_host_checked, grpc_error* error) { GRPC_ERROR_UNREF(error); } @@ -967,7 +990,7 @@ const char* grpc_get_default_ssl_roots(void) { } grpc_security_status grpc_ssl_channel_security_connector_create( - grpc_channel_credentials* channel_creds, + grpc_exec_ctx* exec_ctx, grpc_channel_credentials* channel_creds, grpc_call_credentials* request_metadata_creds, const grpc_ssl_config* config, const char* target_name, const char* overridden_target_name, grpc_channel_security_connector** sc) { @@ -1022,7 +1045,7 @@ grpc_security_status grpc_ssl_channel_security_connector_create( if (result != TSI_OK) { gpr_log(GPR_ERROR, "Handshaker factory creation failed with %s.", tsi_result_to_string(result)); - ssl_channel_destroy(&c->base.base); + ssl_channel_destroy(exec_ctx, &c->base.base); *sc = nullptr; goto error; } @@ -1050,7 +1073,8 @@ grpc_ssl_server_security_connector_initialize( } grpc_security_status grpc_ssl_server_security_connector_create( - grpc_server_credentials* gsc, grpc_server_security_connector** sc) { + grpc_exec_ctx* exec_ctx, grpc_server_credentials* gsc, + grpc_server_security_connector** sc) { tsi_result result = TSI_OK; grpc_ssl_server_credentials* server_credentials = (grpc_ssl_server_credentials*)gsc; @@ -1090,7 +1114,7 @@ grpc_security_status grpc_ssl_server_security_connector_create( if (retval == GRPC_SECURITY_OK) { *sc = &c->base; } else { - if (c != nullptr) ssl_server_destroy(&c->base.base); + if (c != nullptr) ssl_server_destroy(exec_ctx, &c->base.base); if (sc != nullptr) *sc = nullptr; } return retval; diff --git a/src/core/lib/security/transport/security_connector.h b/src/core/lib/security/transport/security_connector.h index 495821d2470..03daba3a180 100644 --- a/src/core/lib/security/transport/security_connector.h +++ b/src/core/lib/security/transport/security_connector.h @@ -50,9 +50,9 @@ typedef struct grpc_security_connector grpc_security_connector; #define GRPC_ARG_SECURITY_CONNECTOR "grpc.security_connector" typedef struct { - void (*destroy)(grpc_security_connector* sc); - void (*check_peer)(grpc_security_connector* sc, tsi_peer peer, - grpc_auth_context** auth_context, + void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_security_connector* sc); + void (*check_peer)(grpc_exec_ctx* exec_ctx, grpc_security_connector* sc, + tsi_peer peer, grpc_auth_context** auth_context, grpc_closure* on_peer_checked); int (*cmp)(grpc_security_connector* sc, grpc_security_connector* other); } grpc_security_connector_vtable; @@ -67,25 +67,29 @@ struct grpc_security_connector { #ifndef NDEBUG #define GRPC_SECURITY_CONNECTOR_REF(p, r) \ grpc_security_connector_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_SECURITY_CONNECTOR_UNREF(p, r) \ - grpc_security_connector_unref((p), __FILE__, __LINE__, (r)) +#define GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, p, r) \ + grpc_security_connector_unref((exec_ctx), (p), __FILE__, __LINE__, (r)) grpc_security_connector* grpc_security_connector_ref( grpc_security_connector* policy, const char* file, int line, const char* reason); -void grpc_security_connector_unref(grpc_security_connector* policy, +void grpc_security_connector_unref(grpc_exec_ctx* exec_ctx, + grpc_security_connector* policy, const char* file, int line, const char* reason); #else #define GRPC_SECURITY_CONNECTOR_REF(p, r) grpc_security_connector_ref((p)) -#define GRPC_SECURITY_CONNECTOR_UNREF(p, r) grpc_security_connector_unref((p)) +#define GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, p, r) \ + grpc_security_connector_unref((exec_ctx), (p)) grpc_security_connector* grpc_security_connector_ref( grpc_security_connector* policy); -void grpc_security_connector_unref(grpc_security_connector* policy); +void grpc_security_connector_unref(grpc_exec_ctx* exec_ctx, + grpc_security_connector* policy); #endif /* Check the peer. Callee takes ownership of the peer object. When done, sets *auth_context and invokes on_peer_checked. */ -void grpc_security_connector_check_peer(grpc_security_connector* sc, +void grpc_security_connector_check_peer(grpc_exec_ctx* exec_ctx, + grpc_security_connector* sc, tsi_peer peer, grpc_auth_context** auth_context, grpc_closure* on_peer_checked); @@ -115,14 +119,17 @@ struct grpc_channel_security_connector { grpc_security_connector base; grpc_channel_credentials* channel_creds; grpc_call_credentials* request_metadata_creds; - bool (*check_call_host)(grpc_channel_security_connector* sc, const char* host, + bool (*check_call_host)(grpc_exec_ctx* exec_ctx, + grpc_channel_security_connector* sc, const char* host, grpc_auth_context* auth_context, grpc_closure* on_call_host_checked, grpc_error** error); - void (*cancel_check_call_host)(grpc_channel_security_connector* sc, + void (*cancel_check_call_host)(grpc_exec_ctx* exec_ctx, + grpc_channel_security_connector* sc, grpc_closure* on_call_host_checked, grpc_error* error); - void (*add_handshakers)(grpc_channel_security_connector* sc, + void (*add_handshakers)(grpc_exec_ctx* exec_ctx, + grpc_channel_security_connector* sc, grpc_handshake_manager* handshake_mgr); }; @@ -135,20 +142,20 @@ int grpc_channel_security_connector_cmp(grpc_channel_security_connector* sc1, /// be set to indicate the result. Otherwise, \a on_call_host_checked /// will be invoked when complete. bool grpc_channel_security_connector_check_call_host( - grpc_channel_security_connector* sc, const char* host, - grpc_auth_context* auth_context, grpc_closure* on_call_host_checked, - grpc_error** error); + grpc_exec_ctx* exec_ctx, grpc_channel_security_connector* sc, + const char* host, grpc_auth_context* auth_context, + grpc_closure* on_call_host_checked, grpc_error** error); /// Cancels a pending asychronous call to /// grpc_channel_security_connector_check_call_host() with /// \a on_call_host_checked as its callback. void grpc_channel_security_connector_cancel_check_call_host( - grpc_channel_security_connector* sc, grpc_closure* on_call_host_checked, - grpc_error* error); + grpc_exec_ctx* exec_ctx, grpc_channel_security_connector* sc, + grpc_closure* on_call_host_checked, grpc_error* error); /* Registers handshakers with \a handshake_mgr. */ void grpc_channel_security_connector_add_handshakers( - grpc_channel_security_connector* connector, + grpc_exec_ctx* exec_ctx, grpc_channel_security_connector* connector, grpc_handshake_manager* handshake_mgr); /* --- server_security_connector object. --- @@ -161,7 +168,8 @@ typedef struct grpc_server_security_connector grpc_server_security_connector; struct grpc_server_security_connector { grpc_security_connector base; grpc_server_credentials* server_creds; - void (*add_handshakers)(grpc_server_security_connector* sc, + void (*add_handshakers)(grpc_exec_ctx* exec_ctx, + grpc_server_security_connector* sc, grpc_handshake_manager* handshake_mgr); }; @@ -170,7 +178,8 @@ int grpc_server_security_connector_cmp(grpc_server_security_connector* sc1, grpc_server_security_connector* sc2); void grpc_server_security_connector_add_handshakers( - grpc_server_security_connector* sc, grpc_handshake_manager* handshake_mgr); + grpc_exec_ctx* exec_ctx, grpc_server_security_connector* sc, + grpc_handshake_manager* handshake_mgr); /* --- Creation security connectors. --- */ @@ -207,7 +216,7 @@ typedef struct { specific error code otherwise. */ grpc_security_status grpc_ssl_channel_security_connector_create( - grpc_channel_credentials* channel_creds, + grpc_exec_ctx* exec_ctx, grpc_channel_credentials* channel_creds, grpc_call_credentials* request_metadata_creds, const grpc_ssl_config* config, const char* target_name, const char* overridden_target_name, grpc_channel_security_connector** sc); @@ -233,7 +242,7 @@ typedef struct { specific error code otherwise. */ grpc_security_status grpc_ssl_server_security_connector_create( - grpc_server_credentials* server_credentials, + grpc_exec_ctx* exec_ctx, grpc_server_credentials* server_credentials, grpc_server_security_connector** sc); /* Util. */ diff --git a/src/core/lib/security/transport/security_handshaker.cc b/src/core/lib/security/transport/security_handshaker.cc index 7623fbfd5b3..7067b70cb6a 100644 --- a/src/core/lib/security/transport/security_handshaker.cc +++ b/src/core/lib/security/transport/security_handshaker.cc @@ -65,7 +65,8 @@ typedef struct { tsi_handshaker_result* handshaker_result; } security_handshaker; -static size_t move_read_buffer_into_handshake_buffer(security_handshaker* h) { +static size_t move_read_buffer_into_handshake_buffer(grpc_exec_ctx* exec_ctx, + security_handshaker* h) { size_t bytes_in_read_buffer = h->args->read_buffer->length; if (h->handshake_buffer_size < bytes_in_read_buffer) { h->handshake_buffer = @@ -78,45 +79,48 @@ static size_t move_read_buffer_into_handshake_buffer(security_handshaker* h) { memcpy(h->handshake_buffer + offset, GRPC_SLICE_START_PTR(next_slice), GRPC_SLICE_LENGTH(next_slice)); offset += GRPC_SLICE_LENGTH(next_slice); - grpc_slice_unref_internal(next_slice); + grpc_slice_unref_internal(exec_ctx, next_slice); } return bytes_in_read_buffer; } -static void security_handshaker_unref(security_handshaker* h) { +static void security_handshaker_unref(grpc_exec_ctx* exec_ctx, + security_handshaker* h) { if (gpr_unref(&h->refs)) { gpr_mu_destroy(&h->mu); tsi_handshaker_destroy(h->handshaker); tsi_handshaker_result_destroy(h->handshaker_result); if (h->endpoint_to_destroy != nullptr) { - grpc_endpoint_destroy(h->endpoint_to_destroy); + grpc_endpoint_destroy(exec_ctx, h->endpoint_to_destroy); } if (h->read_buffer_to_destroy != nullptr) { - grpc_slice_buffer_destroy_internal(h->read_buffer_to_destroy); + grpc_slice_buffer_destroy_internal(exec_ctx, h->read_buffer_to_destroy); gpr_free(h->read_buffer_to_destroy); } gpr_free(h->handshake_buffer); - grpc_slice_buffer_destroy_internal(&h->outgoing); + grpc_slice_buffer_destroy_internal(exec_ctx, &h->outgoing); GRPC_AUTH_CONTEXT_UNREF(h->auth_context, "handshake"); - GRPC_SECURITY_CONNECTOR_UNREF(h->connector, "handshake"); + GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, h->connector, "handshake"); gpr_free(h); } } // Set args fields to NULL, saving the endpoint and read buffer for // later destruction. -static void cleanup_args_for_failure_locked(security_handshaker* h) { +static void cleanup_args_for_failure_locked(grpc_exec_ctx* exec_ctx, + security_handshaker* h) { h->endpoint_to_destroy = h->args->endpoint; h->args->endpoint = nullptr; h->read_buffer_to_destroy = h->args->read_buffer; h->args->read_buffer = nullptr; - grpc_channel_args_destroy(h->args->args); + grpc_channel_args_destroy(exec_ctx, h->args->args); h->args->args = nullptr; } // If the handshake failed or we're shutting down, clean up and invoke the // callback with the error. -static void security_handshake_failed_locked(security_handshaker* h, +static void security_handshake_failed_locked(grpc_exec_ctx* exec_ctx, + security_handshaker* h, grpc_error* error) { if (error == GRPC_ERROR_NONE) { // If we were shut down after the handshake succeeded but before an @@ -131,33 +135,34 @@ static void security_handshake_failed_locked(security_handshaker* h, // before destroying them, even if we know that there are no // pending read/write callbacks. This should be fixed, at which // point this can be removed. - grpc_endpoint_shutdown(h->args->endpoint, GRPC_ERROR_REF(error)); + grpc_endpoint_shutdown(exec_ctx, h->args->endpoint, GRPC_ERROR_REF(error)); // Not shutting down, so the write failed. Clean up before // invoking the callback. - cleanup_args_for_failure_locked(h); + cleanup_args_for_failure_locked(exec_ctx, h); // Set shutdown to true so that subsequent calls to // security_handshaker_shutdown() do nothing. h->shutdown = true; } // Invoke callback. - GRPC_CLOSURE_SCHED(h->on_handshake_done, error); + GRPC_CLOSURE_SCHED(exec_ctx, h->on_handshake_done, error); } -static void on_peer_checked_inner(security_handshaker* h, grpc_error* error) { +static void on_peer_checked_inner(grpc_exec_ctx* exec_ctx, + security_handshaker* h, grpc_error* error) { if (error != GRPC_ERROR_NONE || h->shutdown) { - security_handshake_failed_locked(h, GRPC_ERROR_REF(error)); + security_handshake_failed_locked(exec_ctx, h, GRPC_ERROR_REF(error)); return; } // Create zero-copy frame protector, if implemented. tsi_zero_copy_grpc_protector* zero_copy_protector = nullptr; tsi_result result = tsi_handshaker_result_create_zero_copy_grpc_protector( - h->handshaker_result, nullptr, &zero_copy_protector); + exec_ctx, h->handshaker_result, nullptr, &zero_copy_protector); if (result != TSI_OK && result != TSI_UNIMPLEMENTED) { error = grpc_set_tsi_error_result( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Zero-copy frame protector creation failed"), result); - security_handshake_failed_locked(h, error); + security_handshake_failed_locked(exec_ctx, h, error); return; } // Create frame protector if zero-copy frame protector is NULL. @@ -169,7 +174,7 @@ static void on_peer_checked_inner(security_handshaker* h, grpc_error* error) { error = grpc_set_tsi_error_result(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Frame protector creation failed"), result); - security_handshake_failed_locked(h, error); + security_handshake_failed_locked(exec_ctx, h, error); return; } } @@ -184,7 +189,7 @@ static void on_peer_checked_inner(security_handshaker* h, grpc_error* error) { grpc_slice_from_copied_buffer((char*)unused_bytes, unused_bytes_size); h->args->endpoint = grpc_secure_endpoint_create( protector, zero_copy_protector, h->args->endpoint, &slice, 1); - grpc_slice_unref_internal(slice); + grpc_slice_unref_internal(exec_ctx, slice); } else { h->args->endpoint = grpc_secure_endpoint_create( protector, zero_copy_protector, h->args->endpoint, nullptr, 0); @@ -196,23 +201,25 @@ static void on_peer_checked_inner(security_handshaker* h, grpc_error* error) { grpc_channel_args* tmp_args = h->args->args; h->args->args = grpc_channel_args_copy_and_add(tmp_args, &auth_context_arg, 1); - grpc_channel_args_destroy(tmp_args); + grpc_channel_args_destroy(exec_ctx, tmp_args); // Invoke callback. - GRPC_CLOSURE_SCHED(h->on_handshake_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, h->on_handshake_done, GRPC_ERROR_NONE); // Set shutdown to true so that subsequent calls to // security_handshaker_shutdown() do nothing. h->shutdown = true; } -static void on_peer_checked(void* arg, grpc_error* error) { +static void on_peer_checked(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { security_handshaker* h = (security_handshaker*)arg; gpr_mu_lock(&h->mu); - on_peer_checked_inner(h, error); + on_peer_checked_inner(exec_ctx, h, error); gpr_mu_unlock(&h->mu); - security_handshaker_unref(h); + security_handshaker_unref(exec_ctx, h); } -static grpc_error* check_peer_locked(security_handshaker* h) { +static grpc_error* check_peer_locked(grpc_exec_ctx* exec_ctx, + security_handshaker* h) { tsi_peer peer; tsi_result result = tsi_handshaker_result_extract_peer(h->handshaker_result, &peer); @@ -220,20 +227,20 @@ static grpc_error* check_peer_locked(security_handshaker* h) { return grpc_set_tsi_error_result( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Peer extraction failed"), result); } - grpc_security_connector_check_peer(h->connector, peer, &h->auth_context, - &h->on_peer_checked); + grpc_security_connector_check_peer(exec_ctx, h->connector, peer, + &h->auth_context, &h->on_peer_checked); return GRPC_ERROR_NONE; } static grpc_error* on_handshake_next_done_locked( - security_handshaker* h, tsi_result result, + grpc_exec_ctx* exec_ctx, security_handshaker* h, tsi_result result, const unsigned char* bytes_to_send, size_t bytes_to_send_size, tsi_handshaker_result* handshaker_result) { grpc_error* error = GRPC_ERROR_NONE; // Read more if we need to. if (result == TSI_INCOMPLETE_DATA) { GPR_ASSERT(bytes_to_send_size == 0); - grpc_endpoint_read(h->args->endpoint, h->args->read_buffer, + grpc_endpoint_read(exec_ctx, h->args->endpoint, h->args->read_buffer, &h->on_handshake_data_received_from_peer); return error; } @@ -250,17 +257,17 @@ static grpc_error* on_handshake_next_done_locked( // Send data to peer, if needed. grpc_slice to_send = grpc_slice_from_copied_buffer( (const char*)bytes_to_send, bytes_to_send_size); - grpc_slice_buffer_reset_and_unref_internal(&h->outgoing); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &h->outgoing); grpc_slice_buffer_add(&h->outgoing, to_send); - grpc_endpoint_write(h->args->endpoint, &h->outgoing, + grpc_endpoint_write(exec_ctx, h->args->endpoint, &h->outgoing, &h->on_handshake_data_sent_to_peer); } else if (handshaker_result == nullptr) { // There is nothing to send, but need to read from peer. - grpc_endpoint_read(h->args->endpoint, h->args->read_buffer, + grpc_endpoint_read(exec_ctx, h->args->endpoint, h->args->read_buffer, &h->on_handshake_data_received_from_peer); } else { // Handshake has finished, check peer and so on. - error = check_peer_locked(h); + error = check_peer_locked(exec_ctx, h); } return error; } @@ -271,22 +278,24 @@ static void on_handshake_next_done_grpc_wrapper( security_handshaker* h = (security_handshaker*)user_data; // This callback will be invoked by TSI in a non-grpc thread, so it's // safe to create our own exec_ctx here. - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_mu_lock(&h->mu); - grpc_error* error = on_handshake_next_done_locked( - h, result, bytes_to_send, bytes_to_send_size, handshaker_result); + grpc_error* error = + on_handshake_next_done_locked(&exec_ctx, h, result, bytes_to_send, + bytes_to_send_size, handshaker_result); if (error != GRPC_ERROR_NONE) { - security_handshake_failed_locked(h, error); + security_handshake_failed_locked(&exec_ctx, h, error); gpr_mu_unlock(&h->mu); - security_handshaker_unref(h); + security_handshaker_unref(&exec_ctx, h); } else { gpr_mu_unlock(&h->mu); } + grpc_exec_ctx_finish(&exec_ctx); } static grpc_error* do_handshaker_next_locked( - security_handshaker* h, const unsigned char* bytes_received, - size_t bytes_received_size) { + grpc_exec_ctx* exec_ctx, security_handshaker* h, + const unsigned char* bytes_received, size_t bytes_received_size) { // Invoke TSI handshaker. const unsigned char* bytes_to_send = nullptr; size_t bytes_to_send_size = 0; @@ -302,57 +311,62 @@ static grpc_error* do_handshaker_next_locked( } // Handshaker returned synchronously. Invoke callback directly in // this thread with our existing exec_ctx. - return on_handshake_next_done_locked(h, result, bytes_to_send, + return on_handshake_next_done_locked(exec_ctx, h, result, bytes_to_send, bytes_to_send_size, handshaker_result); } -static void on_handshake_data_received_from_peer(void* arg, grpc_error* error) { +static void on_handshake_data_received_from_peer(grpc_exec_ctx* exec_ctx, + void* arg, grpc_error* error) { security_handshaker* h = (security_handshaker*)arg; gpr_mu_lock(&h->mu); if (error != GRPC_ERROR_NONE || h->shutdown) { security_handshake_failed_locked( - h, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Handshake read failed", &error, 1)); + exec_ctx, h, + GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Handshake read failed", &error, 1)); gpr_mu_unlock(&h->mu); - security_handshaker_unref(h); + security_handshaker_unref(exec_ctx, h); return; } // Copy all slices received. - size_t bytes_received_size = move_read_buffer_into_handshake_buffer(h); + size_t bytes_received_size = + move_read_buffer_into_handshake_buffer(exec_ctx, h); // Call TSI handshaker. - error = - do_handshaker_next_locked(h, h->handshake_buffer, bytes_received_size); + error = do_handshaker_next_locked(exec_ctx, h, h->handshake_buffer, + bytes_received_size); if (error != GRPC_ERROR_NONE) { - security_handshake_failed_locked(h, error); + security_handshake_failed_locked(exec_ctx, h, error); gpr_mu_unlock(&h->mu); - security_handshaker_unref(h); + security_handshaker_unref(exec_ctx, h); } else { gpr_mu_unlock(&h->mu); } } -static void on_handshake_data_sent_to_peer(void* arg, grpc_error* error) { +static void on_handshake_data_sent_to_peer(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { security_handshaker* h = (security_handshaker*)arg; gpr_mu_lock(&h->mu); if (error != GRPC_ERROR_NONE || h->shutdown) { security_handshake_failed_locked( - h, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Handshake write failed", &error, 1)); + exec_ctx, h, + GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Handshake write failed", &error, 1)); gpr_mu_unlock(&h->mu); - security_handshaker_unref(h); + security_handshaker_unref(exec_ctx, h); return; } // We may be done. if (h->handshaker_result == nullptr) { - grpc_endpoint_read(h->args->endpoint, h->args->read_buffer, + grpc_endpoint_read(exec_ctx, h->args->endpoint, h->args->read_buffer, &h->on_handshake_data_received_from_peer); } else { - error = check_peer_locked(h); + error = check_peer_locked(exec_ctx, h); if (error != GRPC_ERROR_NONE) { - security_handshake_failed_locked(h, error); + security_handshake_failed_locked(exec_ctx, h, error); gpr_mu_unlock(&h->mu); - security_handshaker_unref(h); + security_handshaker_unref(exec_ctx, h); return; } } @@ -363,25 +377,28 @@ static void on_handshake_data_sent_to_peer(void* arg, grpc_error* error) { // public handshaker API // -static void security_handshaker_destroy(grpc_handshaker* handshaker) { +static void security_handshaker_destroy(grpc_exec_ctx* exec_ctx, + grpc_handshaker* handshaker) { security_handshaker* h = (security_handshaker*)handshaker; - security_handshaker_unref(h); + security_handshaker_unref(exec_ctx, h); } -static void security_handshaker_shutdown(grpc_handshaker* handshaker, +static void security_handshaker_shutdown(grpc_exec_ctx* exec_ctx, + grpc_handshaker* handshaker, grpc_error* why) { security_handshaker* h = (security_handshaker*)handshaker; gpr_mu_lock(&h->mu); if (!h->shutdown) { h->shutdown = true; - grpc_endpoint_shutdown(h->args->endpoint, GRPC_ERROR_REF(why)); - cleanup_args_for_failure_locked(h); + grpc_endpoint_shutdown(exec_ctx, h->args->endpoint, GRPC_ERROR_REF(why)); + cleanup_args_for_failure_locked(exec_ctx, h); } gpr_mu_unlock(&h->mu); GRPC_ERROR_UNREF(why); } -static void security_handshaker_do_handshake(grpc_handshaker* handshaker, +static void security_handshaker_do_handshake(grpc_exec_ctx* exec_ctx, + grpc_handshaker* handshaker, grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, grpc_handshaker_args* args) { @@ -390,13 +407,14 @@ static void security_handshaker_do_handshake(grpc_handshaker* handshaker, h->args = args; h->on_handshake_done = on_handshake_done; gpr_ref(&h->refs); - size_t bytes_received_size = move_read_buffer_into_handshake_buffer(h); - grpc_error* error = - do_handshaker_next_locked(h, h->handshake_buffer, bytes_received_size); + size_t bytes_received_size = + move_read_buffer_into_handshake_buffer(exec_ctx, h); + grpc_error* error = do_handshaker_next_locked( + exec_ctx, h, h->handshake_buffer, bytes_received_size); if (error != GRPC_ERROR_NONE) { - security_handshake_failed_locked(h, error); + security_handshake_failed_locked(exec_ctx, h, error); gpr_mu_unlock(&h->mu); - security_handshaker_unref(h); + security_handshaker_unref(exec_ctx, h); return; } gpr_mu_unlock(&h->mu); @@ -407,7 +425,8 @@ static const grpc_handshaker_vtable security_handshaker_vtable = { security_handshaker_do_handshake}; static grpc_handshaker* security_handshaker_create( - tsi_handshaker* handshaker, grpc_security_connector* connector) { + grpc_exec_ctx* exec_ctx, tsi_handshaker* handshaker, + grpc_security_connector* connector) { security_handshaker* h = (security_handshaker*)gpr_zalloc(sizeof(security_handshaker)); grpc_handshaker_init(&security_handshaker_vtable, &h->base); @@ -433,20 +452,23 @@ static grpc_handshaker* security_handshaker_create( // fail_handshaker // -static void fail_handshaker_destroy(grpc_handshaker* handshaker) { +static void fail_handshaker_destroy(grpc_exec_ctx* exec_ctx, + grpc_handshaker* handshaker) { gpr_free(handshaker); } -static void fail_handshaker_shutdown(grpc_handshaker* handshaker, +static void fail_handshaker_shutdown(grpc_exec_ctx* exec_ctx, + grpc_handshaker* handshaker, grpc_error* why) { GRPC_ERROR_UNREF(why); } -static void fail_handshaker_do_handshake(grpc_handshaker* handshaker, +static void fail_handshaker_do_handshake(grpc_exec_ctx* exec_ctx, + grpc_handshaker* handshaker, grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, grpc_handshaker_args* args) { - GRPC_CLOSURE_SCHED(on_handshake_done, + GRPC_CLOSURE_SCHED(exec_ctx, on_handshake_done, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Failed to create security handshaker")); } @@ -466,27 +488,27 @@ static grpc_handshaker* fail_handshaker_create() { // static void client_handshaker_factory_add_handshakers( - grpc_handshaker_factory* handshaker_factory, const grpc_channel_args* args, - grpc_handshake_manager* handshake_mgr) { + grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* handshaker_factory, + const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr) { grpc_channel_security_connector* security_connector = (grpc_channel_security_connector*)grpc_security_connector_find_in_args( args); - grpc_channel_security_connector_add_handshakers(security_connector, + grpc_channel_security_connector_add_handshakers(exec_ctx, security_connector, handshake_mgr); } static void server_handshaker_factory_add_handshakers( - grpc_handshaker_factory* hf, const grpc_channel_args* args, - grpc_handshake_manager* handshake_mgr) { + grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* hf, + const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr) { grpc_server_security_connector* security_connector = (grpc_server_security_connector*)grpc_security_connector_find_in_args( args); - grpc_server_security_connector_add_handshakers(security_connector, + grpc_server_security_connector_add_handshakers(exec_ctx, security_connector, handshake_mgr); } static void handshaker_factory_destroy( - grpc_handshaker_factory* handshaker_factory) {} + grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* handshaker_factory) {} static const grpc_handshaker_factory_vtable client_handshaker_factory_vtable = { client_handshaker_factory_add_handshakers, handshaker_factory_destroy}; @@ -505,13 +527,14 @@ static grpc_handshaker_factory server_handshaker_factory = { // grpc_handshaker* grpc_security_handshaker_create( - tsi_handshaker* handshaker, grpc_security_connector* connector) { + grpc_exec_ctx* exec_ctx, tsi_handshaker* handshaker, + grpc_security_connector* connector) { // If no TSI handshaker was created, return a handshaker that always fails. // Otherwise, return a real security handshaker. if (handshaker == nullptr) { return fail_handshaker_create(); } else { - return security_handshaker_create(handshaker, connector); + return security_handshaker_create(exec_ctx, handshaker, connector); } } diff --git a/src/core/lib/security/transport/security_handshaker.h b/src/core/lib/security/transport/security_handshaker.h index 6cd6446b5a5..6c3a0510cee 100644 --- a/src/core/lib/security/transport/security_handshaker.h +++ b/src/core/lib/security/transport/security_handshaker.h @@ -25,7 +25,8 @@ /// Creates a security handshaker using \a handshaker. grpc_handshaker* grpc_security_handshaker_create( - tsi_handshaker* handshaker, grpc_security_connector* connector); + grpc_exec_ctx* exec_ctx, tsi_handshaker* handshaker, + grpc_security_connector* connector); /// Registers security handshaker factories. void grpc_security_register_handshaker_factories(); diff --git a/src/core/lib/security/transport/server_auth_filter.cc b/src/core/lib/security/transport/server_auth_filter.cc index 73653f2a668..9cf368acd01 100644 --- a/src/core/lib/security/transport/server_auth_filter.cc +++ b/src/core/lib/security/transport/server_auth_filter.cc @@ -73,7 +73,8 @@ static grpc_metadata_array metadata_batch_to_md_array( return result; } -static grpc_filtered_mdelem remove_consumed_md(void* user_data, +static grpc_filtered_mdelem remove_consumed_md(grpc_exec_ctx* exec_ctx, + void* user_data, grpc_mdelem md) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; @@ -87,7 +88,8 @@ static grpc_filtered_mdelem remove_consumed_md(void* user_data, return GRPC_FILTERED_MDELEM(md); } -static void on_md_processing_done_inner(grpc_call_element* elem, +static void on_md_processing_done_inner(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_metadata* consumed_md, size_t num_consumed_md, const grpc_metadata* response_md, @@ -105,10 +107,11 @@ static void on_md_processing_done_inner(grpc_call_element* elem, calld->consumed_md = consumed_md; calld->num_consumed_md = num_consumed_md; error = grpc_metadata_batch_filter( - batch->payload->recv_initial_metadata.recv_initial_metadata, + exec_ctx, batch->payload->recv_initial_metadata.recv_initial_metadata, remove_consumed_md, elem, "Response metadata filtering error"); } - GRPC_CLOSURE_SCHED(calld->original_recv_initial_metadata_ready, error); + GRPC_CLOSURE_SCHED(exec_ctx, calld->original_recv_initial_metadata_ready, + error); } // Called from application code. @@ -118,7 +121,7 @@ static void on_md_processing_done( grpc_status_code status, const char* error_details) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; // If the call was not cancelled while we were in flight, process the result. if (gpr_atm_full_cas(&calld->state, (gpr_atm)STATE_INIT, (gpr_atm)STATE_DONE)) { @@ -131,32 +134,34 @@ static void on_md_processing_done( GRPC_ERROR_CREATE_FROM_COPIED_STRING(error_details), GRPC_ERROR_INT_GRPC_STATUS, status); } - on_md_processing_done_inner(elem, consumed_md, num_consumed_md, response_md, - num_response_md, error); + on_md_processing_done_inner(&exec_ctx, elem, consumed_md, num_consumed_md, + response_md, num_response_md, error); } // Clean up. for (size_t i = 0; i < calld->md.count; i++) { - grpc_slice_unref_internal(calld->md.metadata[i].key); - grpc_slice_unref_internal(calld->md.metadata[i].value); + grpc_slice_unref_internal(&exec_ctx, calld->md.metadata[i].key); + grpc_slice_unref_internal(&exec_ctx, calld->md.metadata[i].value); } grpc_metadata_array_destroy(&calld->md); - GRPC_CALL_STACK_UNREF(calld->owning_call, "server_auth_metadata"); + GRPC_CALL_STACK_UNREF(&exec_ctx, calld->owning_call, "server_auth_metadata"); + grpc_exec_ctx_finish(&exec_ctx); } -static void cancel_call(void* arg, grpc_error* error) { +static void cancel_call(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; // If the result was not already processed, invoke the callback now. if (error != GRPC_ERROR_NONE && gpr_atm_full_cas(&calld->state, (gpr_atm)STATE_INIT, (gpr_atm)STATE_CANCELLED)) { - on_md_processing_done_inner(elem, nullptr, 0, nullptr, 0, + on_md_processing_done_inner(exec_ctx, elem, nullptr, 0, nullptr, 0, GRPC_ERROR_REF(error)); } - GRPC_CALL_STACK_UNREF(calld->owning_call, "cancel_call"); + GRPC_CALL_STACK_UNREF(exec_ctx, calld->owning_call, "cancel_call"); } -static void recv_initial_metadata_ready(void* arg, grpc_error* error) { +static void recv_initial_metadata_ready(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; @@ -168,7 +173,7 @@ static void recv_initial_metadata_ready(void* arg, grpc_error* error) { GRPC_CALL_STACK_REF(calld->owning_call, "cancel_call"); GRPC_CLOSURE_INIT(&calld->cancel_closure, cancel_call, elem, grpc_schedule_on_exec_ctx); - grpc_call_combiner_set_notify_on_cancel(calld->call_combiner, + grpc_call_combiner_set_notify_on_cancel(exec_ctx, calld->call_combiner, &calld->cancel_closure); GRPC_CALL_STACK_REF(calld->owning_call, "server_auth_metadata"); calld->md = metadata_batch_to_md_array( @@ -179,12 +184,13 @@ static void recv_initial_metadata_ready(void* arg, grpc_error* error) { return; } } - GRPC_CLOSURE_RUN(calld->original_recv_initial_metadata_ready, + GRPC_CLOSURE_RUN(exec_ctx, calld->original_recv_initial_metadata_ready, GRPC_ERROR_REF(error)); } static void auth_start_transport_stream_op_batch( - grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_transport_stream_op_batch* batch) { call_data* calld = (call_data*)elem->call_data; if (batch->recv_initial_metadata) { // Inject our callback. @@ -194,11 +200,12 @@ static void auth_start_transport_stream_op_batch( batch->payload->recv_initial_metadata.recv_initial_metadata_ready = &calld->recv_initial_metadata_ready; } - grpc_call_next_op(elem, batch); + grpc_call_next_op(exec_ctx, elem, batch); } /* Constructor for call_data */ -static grpc_error* init_call_elem(grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; @@ -224,12 +231,13 @@ static grpc_error* init_call_elem(grpc_call_element* elem, } /* Destructor for call_data */ -static void destroy_call_elem(grpc_call_element* elem, +static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) {} /* Constructor for channel_data */ -static grpc_error* init_channel_elem(grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { GPR_ASSERT(!args->is_last); channel_data* chand = (channel_data*)elem->channel_data; @@ -245,10 +253,11 @@ static grpc_error* init_channel_elem(grpc_channel_element* elem, } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_channel_element* elem) { +static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) { channel_data* chand = (channel_data*)elem->channel_data; GRPC_AUTH_CONTEXT_UNREF(chand->auth_context, "server_auth_filter"); - grpc_server_credentials_unref(chand->creds); + grpc_server_credentials_unref(exec_ctx, chand->creds); } const grpc_channel_filter grpc_server_auth_filter = { diff --git a/src/core/lib/slice/b64.cc b/src/core/lib/slice/b64.cc index f36b13ef1b1..fe7a86ef842 100644 --- a/src/core/lib/slice/b64.cc +++ b/src/core/lib/slice/b64.cc @@ -122,8 +122,9 @@ void grpc_base64_encode_core(char* result, const void* vdata, size_t data_size, result[current - result] = '\0'; } -grpc_slice grpc_base64_decode(const char* b64, int url_safe) { - return grpc_base64_decode_with_len(b64, strlen(b64), url_safe); +grpc_slice grpc_base64_decode(grpc_exec_ctx* exec_ctx, const char* b64, + int url_safe) { + return grpc_base64_decode_with_len(exec_ctx, b64, strlen(b64), url_safe); } static void decode_one_char(const unsigned char* codes, unsigned char* result, @@ -184,8 +185,8 @@ static int decode_group(const unsigned char* codes, size_t num_codes, return 1; } -grpc_slice grpc_base64_decode_with_len(const char* b64, size_t b64_len, - int url_safe) { +grpc_slice grpc_base64_decode_with_len(grpc_exec_ctx* exec_ctx, const char* b64, + size_t b64_len, int url_safe) { grpc_slice result = GRPC_SLICE_MALLOC(b64_len); unsigned char* current = GRPC_SLICE_START_PTR(result); size_t result_size = 0; @@ -230,6 +231,6 @@ grpc_slice grpc_base64_decode_with_len(const char* b64, size_t b64_len, return result; fail: - grpc_slice_unref_internal(result); + grpc_slice_unref_internal(exec_ctx, result); return grpc_empty_slice(); } diff --git a/src/core/lib/slice/b64.h b/src/core/lib/slice/b64.h index 17e7306303d..f86c1d99010 100644 --- a/src/core/lib/slice/b64.h +++ b/src/core/lib/slice/b64.h @@ -40,10 +40,11 @@ void grpc_base64_encode_core(char* result, const void* vdata, size_t data_size, /* Decodes data according to the base64 specification. Returns an empty slice in case of failure. */ -grpc_slice grpc_base64_decode(const char* b64, int url_safe); +grpc_slice grpc_base64_decode(grpc_exec_ctx* exec_ctx, const char* b64, + int url_safe); /* Same as above except that the length is provided by the caller. */ -grpc_slice grpc_base64_decode_with_len(const char* b64, size_t b64_len, - int url_safe); +grpc_slice grpc_base64_decode_with_len(grpc_exec_ctx* exec_ctx, const char* b64, + size_t b64_len, int url_safe); #endif /* GRPC_CORE_LIB_SLICE_B64_H */ diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc index 1eb15290eb0..bbaf87ba23d 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc @@ -54,9 +54,9 @@ grpc_slice grpc_slice_ref_internal(grpc_slice slice) { return slice; } -void grpc_slice_unref_internal(grpc_slice slice) { +void grpc_slice_unref_internal(grpc_exec_ctx* exec_ctx, grpc_slice slice) { if (slice.refcount) { - slice.refcount->vtable->unref(slice.refcount); + slice.refcount->vtable->unref(exec_ctx, slice.refcount); } } @@ -67,14 +67,15 @@ grpc_slice grpc_slice_ref(grpc_slice slice) { /* Public API */ void grpc_slice_unref(grpc_slice slice) { - grpc_core::ExecCtx exec_ctx; - grpc_slice_unref_internal(slice); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice_unref_internal(&exec_ctx, slice); + grpc_exec_ctx_finish(&exec_ctx); } /* grpc_slice_from_static_string support structure - a refcount that does nothing */ static void noop_ref(void* unused) {} -static void noop_unref(void* unused) {} +static void noop_unref(grpc_exec_ctx* exec_ctx, void* unused) {} static const grpc_slice_refcount_vtable noop_refcount_vtable = { noop_ref, noop_unref, grpc_slice_default_eq_impl, @@ -108,7 +109,7 @@ static void new_slice_ref(void* p) { gpr_ref(&r->refs); } -static void new_slice_unref(void* p) { +static void new_slice_unref(grpc_exec_ctx* exec_ctx, void* p) { new_slice_refcount* r = (new_slice_refcount*)p; if (gpr_unref(&r->refs)) { r->user_destroy(r->user_data); @@ -158,7 +159,7 @@ static void new_with_len_ref(void* p) { gpr_ref(&r->refs); } -static void new_with_len_unref(void* p) { +static void new_with_len_unref(grpc_exec_ctx* exec_ctx, void* p) { new_with_len_slice_refcount* r = (new_with_len_slice_refcount*)p; if (gpr_unref(&r->refs)) { r->user_destroy(r->user_data, r->user_length); @@ -209,7 +210,7 @@ static void malloc_ref(void* p) { gpr_ref(&r->refs); } -static void malloc_unref(void* p) { +static void malloc_unref(grpc_exec_ctx* exec_ctx, void* p) { malloc_refcount* r = (malloc_refcount*)p; if (gpr_unref(&r->refs)) { gpr_free(r); diff --git a/src/core/lib/slice/slice_buffer.cc b/src/core/lib/slice/slice_buffer.cc index 33ec2af683c..5db54dad91e 100644 --- a/src/core/lib/slice/slice_buffer.cc +++ b/src/core/lib/slice/slice_buffer.cc @@ -65,16 +65,18 @@ void grpc_slice_buffer_init(grpc_slice_buffer* sb) { sb->base_slices = sb->slices = sb->inlined; } -void grpc_slice_buffer_destroy_internal(grpc_slice_buffer* sb) { - grpc_slice_buffer_reset_and_unref_internal(sb); +void grpc_slice_buffer_destroy_internal(grpc_exec_ctx* exec_ctx, + grpc_slice_buffer* sb) { + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, sb); if (sb->base_slices != sb->inlined) { gpr_free(sb->base_slices); } } void grpc_slice_buffer_destroy(grpc_slice_buffer* sb) { - grpc_core::ExecCtx exec_ctx; - grpc_slice_buffer_destroy_internal(sb); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice_buffer_destroy_internal(&exec_ctx, sb); + grpc_exec_ctx_finish(&exec_ctx); } uint8_t* grpc_slice_buffer_tiny_add(grpc_slice_buffer* sb, size_t n) { @@ -161,10 +163,11 @@ void grpc_slice_buffer_pop(grpc_slice_buffer* sb) { } } -void grpc_slice_buffer_reset_and_unref_internal(grpc_slice_buffer* sb) { +void grpc_slice_buffer_reset_and_unref_internal(grpc_exec_ctx* exec_ctx, + grpc_slice_buffer* sb) { size_t i; for (i = 0; i < sb->count; i++) { - grpc_slice_unref_internal(sb->slices[i]); + grpc_slice_unref_internal(exec_ctx, sb->slices[i]); } sb->count = 0; @@ -172,8 +175,9 @@ void grpc_slice_buffer_reset_and_unref_internal(grpc_slice_buffer* sb) { } void grpc_slice_buffer_reset_and_unref(grpc_slice_buffer* sb) { - grpc_core::ExecCtx exec_ctx; - grpc_slice_buffer_reset_and_unref_internal(sb); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, sb); + grpc_exec_ctx_finish(&exec_ctx); } void grpc_slice_buffer_swap(grpc_slice_buffer* a, grpc_slice_buffer* b) { @@ -285,7 +289,8 @@ void grpc_slice_buffer_move_first_no_ref(grpc_slice_buffer* src, size_t n, slice_buffer_move_first_maybe_ref(src, n, dst, false); } -void grpc_slice_buffer_move_first_into_buffer(grpc_slice_buffer* src, size_t n, +void grpc_slice_buffer_move_first_into_buffer(grpc_exec_ctx* exec_ctx, + grpc_slice_buffer* src, size_t n, void* dst) { char* dstp = (char*)dst; GPR_ASSERT(src->length >= n); @@ -300,13 +305,13 @@ void grpc_slice_buffer_move_first_into_buffer(grpc_slice_buffer* src, size_t n, n = 0; } else if (slice_len == n) { memcpy(dstp, GRPC_SLICE_START_PTR(slice), n); - grpc_slice_unref_internal(slice); + grpc_slice_unref_internal(exec_ctx, slice); n = 0; } else { memcpy(dstp, GRPC_SLICE_START_PTR(slice), slice_len); dstp += slice_len; n -= slice_len; - grpc_slice_unref_internal(slice); + grpc_slice_unref_internal(exec_ctx, slice); } } } diff --git a/src/core/lib/slice/slice_hash_table.cc b/src/core/lib/slice/slice_hash_table.cc index 89340eff846..8f8e5a6b34a 100644 --- a/src/core/lib/slice/slice_hash_table.cc +++ b/src/core/lib/slice/slice_hash_table.cc @@ -27,7 +27,7 @@ struct grpc_slice_hash_table { gpr_refcount refs; - void (*destroy_value)(void* value); + void (*destroy_value)(grpc_exec_ctx* exec_ctx, void* value); int (*value_cmp)(void* a, void* b); size_t size; size_t max_num_probes; @@ -58,7 +58,8 @@ static void grpc_slice_hash_table_add(grpc_slice_hash_table* table, grpc_slice_hash_table* grpc_slice_hash_table_create( size_t num_entries, grpc_slice_hash_table_entry* entries, - void (*destroy_value)(void* value), int (*value_cmp)(void* a, void* b)) { + void (*destroy_value)(grpc_exec_ctx* exec_ctx, void* value), + int (*value_cmp)(void* a, void* b)) { grpc_slice_hash_table* table = (grpc_slice_hash_table*)gpr_zalloc(sizeof(*table)); gpr_ref_init(&table->refs, 1); @@ -80,13 +81,14 @@ grpc_slice_hash_table* grpc_slice_hash_table_ref(grpc_slice_hash_table* table) { return table; } -void grpc_slice_hash_table_unref(grpc_slice_hash_table* table) { +void grpc_slice_hash_table_unref(grpc_exec_ctx* exec_ctx, + grpc_slice_hash_table* table) { if (table != nullptr && gpr_unref(&table->refs)) { for (size_t i = 0; i < table->size; ++i) { grpc_slice_hash_table_entry* entry = &table->entries[i]; if (!is_empty(entry)) { - grpc_slice_unref_internal(entry->key); - table->destroy_value(entry->value); + grpc_slice_unref_internal(exec_ctx, entry->key); + table->destroy_value(exec_ctx, entry->value); } } gpr_free(table->entries); diff --git a/src/core/lib/slice/slice_hash_table.h b/src/core/lib/slice/slice_hash_table.h index db69da662a0..85102bd67d7 100644 --- a/src/core/lib/slice/slice_hash_table.h +++ b/src/core/lib/slice/slice_hash_table.h @@ -46,10 +46,12 @@ typedef struct grpc_slice_hash_table_entry { will be used. */ grpc_slice_hash_table* grpc_slice_hash_table_create( size_t num_entries, grpc_slice_hash_table_entry* entries, - void (*destroy_value)(void* value), int (*value_cmp)(void* a, void* b)); + void (*destroy_value)(grpc_exec_ctx* exec_ctx, void* value), + int (*value_cmp)(void* a, void* b)); grpc_slice_hash_table* grpc_slice_hash_table_ref(grpc_slice_hash_table* table); -void grpc_slice_hash_table_unref(grpc_slice_hash_table* table); +void grpc_slice_hash_table_unref(grpc_exec_ctx* exec_ctx, + grpc_slice_hash_table* table); /** Returns the value from \a table associated with \a key. Returns NULL if \a key is not found. */ diff --git a/src/core/lib/slice/slice_intern.cc b/src/core/lib/slice/slice_intern.cc index c578c6d9de1..e8949135c08 100644 --- a/src/core/lib/slice/slice_intern.cc +++ b/src/core/lib/slice/slice_intern.cc @@ -90,7 +90,7 @@ static void interned_slice_destroy(interned_slice_refcount* s) { gpr_mu_unlock(&shard->mu); } -static void interned_slice_unref(void* p) { +static void interned_slice_unref(grpc_exec_ctx* exec_ctx, void* p) { interned_slice_refcount* s = (interned_slice_refcount*)p; if (1 == gpr_atm_full_fetch_add(&s->refcnt, -1)) { interned_slice_destroy(s); @@ -101,8 +101,9 @@ static void interned_slice_sub_ref(void* p) { interned_slice_ref(((char*)p) - offsetof(interned_slice_refcount, sub)); } -static void interned_slice_sub_unref(void* p) { - interned_slice_unref(((char*)p) - offsetof(interned_slice_refcount, sub)); +static void interned_slice_sub_unref(grpc_exec_ctx* exec_ctx, void* p) { + interned_slice_unref(exec_ctx, + ((char*)p) - offsetof(interned_slice_refcount, sub)); } static uint32_t interned_slice_hash(grpc_slice slice) { diff --git a/src/core/lib/slice/slice_internal.h b/src/core/lib/slice/slice_internal.h index 4e9ab802611..ed0070d375c 100644 --- a/src/core/lib/slice/slice_internal.h +++ b/src/core/lib/slice/slice_internal.h @@ -25,11 +25,14 @@ #include "src/core/lib/iomgr/exec_ctx.h" grpc_slice grpc_slice_ref_internal(grpc_slice slice); -void grpc_slice_unref_internal(grpc_slice slice); -void grpc_slice_buffer_reset_and_unref_internal(grpc_slice_buffer* sb); -void grpc_slice_buffer_partial_unref_internal(grpc_slice_buffer* sb, +void grpc_slice_unref_internal(grpc_exec_ctx* exec_ctx, grpc_slice slice); +void grpc_slice_buffer_reset_and_unref_internal(grpc_exec_ctx* exec_ctx, + grpc_slice_buffer* sb); +void grpc_slice_buffer_partial_unref_internal(grpc_exec_ctx* exec_ctx, + grpc_slice_buffer* sb, size_t idx); -void grpc_slice_buffer_destroy_internal(grpc_slice_buffer* sb); +void grpc_slice_buffer_destroy_internal(grpc_exec_ctx* exec_ctx, + grpc_slice_buffer* sb); /* Check if a slice is interned */ bool grpc_slice_is_interned(grpc_slice slice); diff --git a/src/core/lib/surface/alarm.cc b/src/core/lib/surface/alarm.cc index f6ea016c333..b1c9f7b1640 100644 --- a/src/core/lib/surface/alarm.cc +++ b/src/core/lib/surface/alarm.cc @@ -45,11 +45,11 @@ static void alarm_ref(grpc_alarm* alarm) { gpr_ref(&alarm->refs); } static void alarm_unref(grpc_alarm* alarm) { if (gpr_unref(&alarm->refs)) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; if (alarm->cq != nullptr) { - GRPC_CQ_INTERNAL_UNREF(alarm->cq, "alarm"); + GRPC_CQ_INTERNAL_UNREF(&exec_ctx, alarm->cq, "alarm"); } - + grpc_exec_ctx_finish(&exec_ctx); gpr_free(alarm); } } @@ -80,19 +80,20 @@ static void alarm_unref_dbg(grpc_alarm* alarm, const char* reason, } #endif -static void alarm_end_completion(void* arg, grpc_cq_completion* c) { +static void alarm_end_completion(grpc_exec_ctx* exec_ctx, void* arg, + grpc_cq_completion* c) { grpc_alarm* alarm = (grpc_alarm*)arg; GRPC_ALARM_UNREF(alarm, "dequeue-end-op"); } -static void alarm_cb(void* arg, grpc_error* error) { +static void alarm_cb(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { grpc_alarm* alarm = (grpc_alarm*)arg; /* We are queuing an op on completion queue. This means, the alarm's structure cannot be destroyed until the op is dequeued. Adding an extra ref here and unref'ing when the op is dequeued will achieve this */ GRPC_ALARM_REF(alarm, "queue-end-op"); - grpc_cq_end_op(alarm->cq, alarm->tag, error, alarm_end_completion, + grpc_cq_end_op(exec_ctx, alarm->cq, alarm->tag, error, alarm_end_completion, (void*)alarm, &alarm->completion); } @@ -115,20 +116,22 @@ grpc_alarm* grpc_alarm_create(void* reserved) { void grpc_alarm_set(grpc_alarm* alarm, grpc_completion_queue* cq, gpr_timespec deadline, void* tag, void* reserved) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GRPC_CQ_INTERNAL_REF(cq, "alarm"); alarm->cq = cq; alarm->tag = tag; GPR_ASSERT(grpc_cq_begin_op(cq, tag)); - grpc_timer_init(&alarm->alarm, grpc_timespec_to_millis_round_up(deadline), - &alarm->on_alarm); + grpc_timer_init(&exec_ctx, &alarm->alarm, + grpc_timespec_to_millis_round_up(deadline), &alarm->on_alarm); + grpc_exec_ctx_finish(&exec_ctx); } void grpc_alarm_cancel(grpc_alarm* alarm, void* reserved) { - grpc_core::ExecCtx exec_ctx; - grpc_timer_cancel(&alarm->alarm); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_timer_cancel(&exec_ctx, &alarm->alarm); + grpc_exec_ctx_finish(&exec_ctx); } void grpc_alarm_destroy(grpc_alarm* alarm, void* reserved) { diff --git a/src/core/lib/surface/byte_buffer.cc b/src/core/lib/surface/byte_buffer.cc index e4c2a4a4c22..9e0636b4cea 100644 --- a/src/core/lib/surface/byte_buffer.cc +++ b/src/core/lib/surface/byte_buffer.cc @@ -71,13 +71,14 @@ grpc_byte_buffer* grpc_byte_buffer_copy(grpc_byte_buffer* bb) { void grpc_byte_buffer_destroy(grpc_byte_buffer* bb) { if (!bb) return; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; switch (bb->type) { case GRPC_BB_RAW: - grpc_slice_buffer_destroy_internal(&bb->data.raw.slice_buffer); + grpc_slice_buffer_destroy_internal(&exec_ctx, &bb->data.raw.slice_buffer); break; } gpr_free(bb); + grpc_exec_ctx_finish(&exec_ctx); } size_t grpc_byte_buffer_length(grpc_byte_buffer* bb) { diff --git a/src/core/lib/surface/byte_buffer_reader.cc b/src/core/lib/surface/byte_buffer_reader.cc index 81a48e95fcc..001227a2aa0 100644 --- a/src/core/lib/surface/byte_buffer_reader.cc +++ b/src/core/lib/surface/byte_buffer_reader.cc @@ -42,14 +42,15 @@ static int is_compressed(grpc_byte_buffer* buffer) { int grpc_byte_buffer_reader_init(grpc_byte_buffer_reader* reader, grpc_byte_buffer* buffer) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_slice_buffer decompressed_slices_buffer; reader->buffer_in = buffer; switch (reader->buffer_in->type) { case GRPC_BB_RAW: grpc_slice_buffer_init(&decompressed_slices_buffer); if (is_compressed(reader->buffer_in)) { - if (grpc_msg_decompress(reader->buffer_in->data.raw.compression, + if (grpc_msg_decompress(&exec_ctx, + reader->buffer_in->data.raw.compression, &reader->buffer_in->data.raw.slice_buffer, &decompressed_slices_buffer) == 0) { gpr_log(GPR_ERROR, @@ -63,14 +64,15 @@ int grpc_byte_buffer_reader_init(grpc_byte_buffer_reader* reader, grpc_raw_byte_buffer_create(decompressed_slices_buffer.slices, decompressed_slices_buffer.count); } - grpc_slice_buffer_destroy_internal(&decompressed_slices_buffer); + grpc_slice_buffer_destroy_internal(&exec_ctx, + &decompressed_slices_buffer); } else { /* not compressed, use the input buffer as output */ reader->buffer_out = reader->buffer_in; } reader->current.index = 0; break; } - + grpc_exec_ctx_finish(&exec_ctx); return 1; } @@ -110,14 +112,14 @@ grpc_slice grpc_byte_buffer_reader_readall(grpc_byte_buffer_reader* reader) { grpc_slice out_slice = GRPC_SLICE_MALLOC(input_size); uint8_t* const outbuf = GRPC_SLICE_START_PTR(out_slice); /* just an alias */ - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (grpc_byte_buffer_reader_next(reader, &in_slice) != 0) { const size_t slice_length = GRPC_SLICE_LENGTH(in_slice); memcpy(&(outbuf[bytes_read]), GRPC_SLICE_START_PTR(in_slice), slice_length); bytes_read += slice_length; - grpc_slice_unref_internal(in_slice); + grpc_slice_unref_internal(&exec_ctx, in_slice); GPR_ASSERT(bytes_read <= input_size); } - + grpc_exec_ctx_finish(&exec_ctx); return out_slice; } diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index a457aaa7a2f..a2eb02bd857 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -270,25 +270,30 @@ grpc_core::TraceFlag grpc_compression_trace(false, "compression"); #define CALL_FROM_TOP_ELEM(top_elem) \ CALL_FROM_CALL_STACK(grpc_call_stack_from_top_element(top_elem)) -static void execute_batch(grpc_call* call, grpc_transport_stream_op_batch* op, +static void execute_batch(grpc_exec_ctx* exec_ctx, grpc_call* call, + grpc_transport_stream_op_batch* op, grpc_closure* start_batch_closure); -static void cancel_with_status(grpc_call* c, status_source source, - grpc_status_code status, +static void cancel_with_status(grpc_exec_ctx* exec_ctx, grpc_call* c, + status_source source, grpc_status_code status, const char* description); -static void cancel_with_error(grpc_call* c, status_source source, - grpc_error* error); -static void destroy_call(void* call_stack, grpc_error* error); -static void receiving_slice_ready(void* bctlp, grpc_error* error); -static void get_final_status( - grpc_call* call, void (*set_value)(grpc_status_code code, void* user_data), - void* set_value_user_data, grpc_slice* details, const char** error_string); -static void set_status_value_directly(grpc_status_code status, void* dest); -static void set_status_from_error(grpc_call* call, status_source source, +static void cancel_with_error(grpc_exec_ctx* exec_ctx, grpc_call* c, + status_source source, grpc_error* error); +static void destroy_call(grpc_exec_ctx* exec_ctx, void* call_stack, + grpc_error* error); +static void receiving_slice_ready(grpc_exec_ctx* exec_ctx, void* bctlp, grpc_error* error); -static void process_data_after_md(batch_control* bctl); -static void post_batch_completion(batch_control* bctl); -static void add_batch_error(batch_control* bctl, grpc_error* error, - bool has_cancelled); +static void get_final_status(grpc_exec_ctx* exec_ctx, grpc_call* call, + void (*set_value)(grpc_status_code code, + void* user_data), + void* set_value_user_data, grpc_slice* details, + const char** error_string); +static void set_status_value_directly(grpc_status_code status, void* dest); +static void set_status_from_error(grpc_exec_ctx* exec_ctx, grpc_call* call, + status_source source, grpc_error* error); +static void process_data_after_md(grpc_exec_ctx* exec_ctx, batch_control* bctl); +static void post_batch_completion(grpc_exec_ctx* exec_ctx, batch_control* bctl); +static void add_batch_error(grpc_exec_ctx* exec_ctx, batch_control* bctl, + grpc_error* error, bool has_cancelled); static void add_init_error(grpc_error** composite, grpc_error* new_err) { if (new_err == GRPC_ERROR_NONE) return; @@ -306,8 +311,7 @@ static parent_call* get_or_create_parent_call(grpc_call* call) { if (p == nullptr) { p = (parent_call*)gpr_arena_alloc(call->arena, sizeof(*p)); gpr_mu_init(&p->child_list_mu); - if (!gpr_atm_rel_cas(&call->parent_call_atm, (gpr_atm) nullptr, - (gpr_atm)p)) { + if (!gpr_atm_rel_cas(&call->parent_call_atm, (gpr_atm)NULL, (gpr_atm)p)) { gpr_mu_destroy(&p->child_list_mu); p = (parent_call*)gpr_atm_acq_load(&call->parent_call_atm); } @@ -319,7 +323,8 @@ static parent_call* get_parent_call(grpc_call* call) { return (parent_call*)gpr_atm_acq_load(&call->parent_call_atm); } -grpc_error* grpc_call_create(const grpc_call_create_args* args, +grpc_error* grpc_call_create(grpc_exec_ctx* exec_ctx, + const grpc_call_create_args* args, grpc_call** out_call) { size_t i, j; grpc_error* error = GRPC_ERROR_NONE; @@ -328,7 +333,7 @@ grpc_error* grpc_call_create(const grpc_call_create_args* args, grpc_call* call; GPR_TIMER_BEGIN("grpc_call_create", 0); size_t initial_size = grpc_channel_get_call_size_estimate(args->channel); - GRPC_STATS_INC_CALL_INITIAL_SIZE(initial_size); + GRPC_STATS_INC_CALL_INITIAL_SIZE(exec_ctx, initial_size); gpr_arena* arena = gpr_arena_create(initial_size); call = (grpc_call*)gpr_arena_alloc( arena, sizeof(grpc_call) + channel_stack->call_stack_size); @@ -343,9 +348,9 @@ grpc_error* grpc_call_create(const grpc_call_create_args* args, GPR_BITSET(&call->encodings_accepted_by_peer, GRPC_COMPRESS_NONE); call->is_client = args->server_transport_data == nullptr; if (call->is_client) { - GRPC_STATS_INC_CLIENT_CALLS_CREATED(); + GRPC_STATS_INC_CLIENT_CALLS_CREATED(exec_ctx); } else { - GRPC_STATS_INC_SERVER_CALLS_CREATED(); + GRPC_STATS_INC_SERVER_CALLS_CREATED(exec_ctx); } call->stream_op_payload.context = call->context; grpc_slice path = grpc_empty_slice(); @@ -440,13 +445,15 @@ grpc_error* grpc_call_create(const grpc_call_create_args* args, send_deadline, call->arena, &call->call_combiner}; - add_init_error(&error, grpc_call_stack_init(channel_stack, 1, destroy_call, - call, &call_args)); + add_init_error(&error, grpc_call_stack_init(exec_ctx, channel_stack, 1, + destroy_call, call, &call_args)); if (error != GRPC_ERROR_NONE) { - cancel_with_error(call, STATUS_FROM_SURFACE, GRPC_ERROR_REF(error)); + cancel_with_error(exec_ctx, call, STATUS_FROM_SURFACE, + GRPC_ERROR_REF(error)); } if (immediately_cancel) { - cancel_with_error(call, STATUS_FROM_API_OVERRIDE, GRPC_ERROR_CANCELLED); + cancel_with_error(exec_ctx, call, STATUS_FROM_API_OVERRIDE, + GRPC_ERROR_CANCELLED); } if (args->cq != nullptr) { GPR_ASSERT( @@ -461,17 +468,17 @@ grpc_error* grpc_call_create(const grpc_call_create_args* args, args->pollset_set_alternative); } if (!grpc_polling_entity_is_empty(&call->pollent)) { - grpc_call_stack_set_pollset_or_pollset_set(CALL_STACK_FROM_CALL(call), - &call->pollent); + grpc_call_stack_set_pollset_or_pollset_set( + exec_ctx, CALL_STACK_FROM_CALL(call), &call->pollent); } - grpc_slice_unref_internal(path); + grpc_slice_unref_internal(exec_ctx, path); GPR_TIMER_END("grpc_call_create", 0); return error; } -void grpc_call_set_completion_queue(grpc_call* call, +void grpc_call_set_completion_queue(grpc_exec_ctx* exec_ctx, grpc_call* call, grpc_completion_queue* cq) { GPR_ASSERT(cq); @@ -482,8 +489,8 @@ void grpc_call_set_completion_queue(grpc_call* call, call->cq = cq; GRPC_CQ_INTERNAL_REF(cq, "bind"); call->pollent = grpc_polling_entity_create_from_pollset(grpc_cq_pollset(cq)); - grpc_call_stack_set_pollset_or_pollset_set(CALL_STACK_FROM_CALL(call), - &call->pollent); + grpc_call_stack_set_pollset_or_pollset_set( + exec_ctx, CALL_STACK_FROM_CALL(call), &call->pollent); } #ifndef NDEBUG @@ -496,38 +503,40 @@ void grpc_call_set_completion_queue(grpc_call* call, void grpc_call_internal_ref(grpc_call* c REF_ARG) { GRPC_CALL_STACK_REF(CALL_STACK_FROM_CALL(c), REF_REASON); } -void grpc_call_internal_unref(grpc_call* c REF_ARG) { - GRPC_CALL_STACK_UNREF(CALL_STACK_FROM_CALL(c), REF_REASON); +void grpc_call_internal_unref(grpc_exec_ctx* exec_ctx, grpc_call* c REF_ARG) { + GRPC_CALL_STACK_UNREF(exec_ctx, CALL_STACK_FROM_CALL(c), REF_REASON); } -static void release_call(void* call, grpc_error* error) { +static void release_call(grpc_exec_ctx* exec_ctx, void* call, + grpc_error* error) { grpc_call* c = (grpc_call*)call; grpc_channel* channel = c->channel; grpc_call_combiner_destroy(&c->call_combiner); gpr_free((char*)c->peer_string); grpc_channel_update_call_size_estimate(channel, gpr_arena_destroy(c->arena)); - GRPC_CHANNEL_INTERNAL_UNREF(channel, "call"); + GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, channel, "call"); } static void set_status_value_directly(grpc_status_code status, void* dest); -static void destroy_call(void* call, grpc_error* error) { +static void destroy_call(grpc_exec_ctx* exec_ctx, void* call, + grpc_error* error) { size_t i; int ii; grpc_call* c = (grpc_call*)call; GPR_TIMER_BEGIN("destroy_call", 0); for (i = 0; i < 2; i++) { grpc_metadata_batch_destroy( - &c->metadata_batch[1 /* is_receiving */][i /* is_initial */]); + exec_ctx, &c->metadata_batch[1 /* is_receiving */][i /* is_initial */]); } if (c->receiving_stream != nullptr) { - grpc_byte_stream_destroy(c->receiving_stream); + grpc_byte_stream_destroy(exec_ctx, c->receiving_stream); } parent_call* pc = get_parent_call(c); if (pc != nullptr) { gpr_mu_destroy(&pc->child_list_mu); } for (ii = 0; ii < c->send_extra_metadata_count; ii++) { - GRPC_MDELEM_UNREF(c->send_extra_metadata[ii].md); + GRPC_MDELEM_UNREF(exec_ctx, c->send_extra_metadata[ii].md); } for (i = 0; i < GRPC_CONTEXT_COUNT; i++) { if (c->context[i].destroy) { @@ -535,11 +544,12 @@ static void destroy_call(void* call, grpc_error* error) { } } if (c->cq) { - GRPC_CQ_INTERNAL_UNREF(c->cq, "bind"); + GRPC_CQ_INTERNAL_UNREF(exec_ctx, c->cq, "bind"); } - get_final_status(c, set_status_value_directly, &c->final_info.final_status, - nullptr, c->final_info.error_string); + get_final_status(exec_ctx, c, set_status_value_directly, + &c->final_info.final_status, nullptr, + c->final_info.error_string); c->final_info.stats.latency = gpr_time_sub(gpr_now(GPR_CLOCK_MONOTONIC), c->start_time); @@ -548,7 +558,7 @@ static void destroy_call(void* call, grpc_error* error) { unpack_received_status(gpr_atm_acq_load(&c->status[i])).error); } - grpc_call_stack_destroy(CALL_STACK_FROM_CALL(c), &c->final_info, + grpc_call_stack_destroy(exec_ctx, CALL_STACK_FROM_CALL(c), &c->final_info, GRPC_CLOSURE_INIT(&c->release_call, release_call, c, grpc_schedule_on_exec_ctx)); GPR_TIMER_END("destroy_call", 0); @@ -560,7 +570,7 @@ void grpc_call_unref(grpc_call* c) { if (!gpr_unref(&c->ext_ref)) return; child_call* cc = c->child; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GPR_TIMER_BEGIN("grpc_call_unref", 0); GRPC_API_TRACE("grpc_call_unref(c=%p)", 1, (c)); @@ -577,7 +587,7 @@ void grpc_call_unref(grpc_call* c) { cc->sibling_prev->child->sibling_next = cc->sibling_next; cc->sibling_next->child->sibling_prev = cc->sibling_prev; gpr_mu_unlock(&pc->child_list_mu); - GRPC_CALL_INTERNAL_UNREF(cc->parent, "child"); + GRPC_CALL_INTERNAL_UNREF(&exec_ctx, cc->parent, "child"); } GPR_ASSERT(!c->destroy_called); @@ -585,49 +595,53 @@ void grpc_call_unref(grpc_call* c) { bool cancel = gpr_atm_acq_load(&c->any_ops_sent_atm) != 0 && gpr_atm_acq_load(&c->received_final_op_atm) == 0; if (cancel) { - cancel_with_error(c, STATUS_FROM_API_OVERRIDE, GRPC_ERROR_CANCELLED); + cancel_with_error(&exec_ctx, c, STATUS_FROM_API_OVERRIDE, + GRPC_ERROR_CANCELLED); } else { // Unset the call combiner cancellation closure. This has the // effect of scheduling the previously set cancellation closure, if // any, so that it can release any internal references it may be // holding to the call stack. - grpc_call_combiner_set_notify_on_cancel(&c->call_combiner, nullptr); + grpc_call_combiner_set_notify_on_cancel(&exec_ctx, &c->call_combiner, + nullptr); } - GRPC_CALL_INTERNAL_UNREF(c, "destroy"); - + GRPC_CALL_INTERNAL_UNREF(&exec_ctx, c, "destroy"); + grpc_exec_ctx_finish(&exec_ctx); GPR_TIMER_END("grpc_call_unref", 0); } grpc_call_error grpc_call_cancel(grpc_call* call, void* reserved) { GRPC_API_TRACE("grpc_call_cancel(call=%p, reserved=%p)", 2, (call, reserved)); GPR_ASSERT(!reserved); - grpc_core::ExecCtx exec_ctx; - cancel_with_error(call, STATUS_FROM_API_OVERRIDE, GRPC_ERROR_CANCELLED); - + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + cancel_with_error(&exec_ctx, call, STATUS_FROM_API_OVERRIDE, + GRPC_ERROR_CANCELLED); + grpc_exec_ctx_finish(&exec_ctx); return GRPC_CALL_OK; } // This is called via the call combiner to start sending a batch down // the filter stack. -static void execute_batch_in_call_combiner(void* arg, grpc_error* ignored) { +static void execute_batch_in_call_combiner(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* ignored) { grpc_transport_stream_op_batch* batch = (grpc_transport_stream_op_batch*)arg; grpc_call* call = (grpc_call*)batch->handler_private.extra_arg; GPR_TIMER_BEGIN("execute_batch", 0); grpc_call_element* elem = CALL_ELEM_FROM_CALL(call, 0); GRPC_CALL_LOG_OP(GPR_INFO, elem, batch); - elem->filter->start_transport_stream_op_batch(elem, batch); + elem->filter->start_transport_stream_op_batch(exec_ctx, elem, batch); GPR_TIMER_END("execute_batch", 0); } // start_batch_closure points to a caller-allocated closure to be used // for entering the call combiner. -static void execute_batch(grpc_call* call, +static void execute_batch(grpc_exec_ctx* exec_ctx, grpc_call* call, grpc_transport_stream_op_batch* batch, grpc_closure* start_batch_closure) { batch->handler_private.extra_arg = call; GRPC_CLOSURE_INIT(start_batch_closure, execute_batch_in_call_combiner, batch, grpc_schedule_on_exec_ctx); - GRPC_CALL_COMBINER_START(&call->call_combiner, start_batch_closure, + GRPC_CALL_COMBINER_START(exec_ctx, &call->call_combiner, start_batch_closure, GRPC_ERROR_NONE, "executing batch"); } @@ -651,14 +665,15 @@ grpc_call_error grpc_call_cancel_with_status(grpc_call* c, grpc_status_code status, const char* description, void* reserved) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GRPC_API_TRACE( "grpc_call_cancel_with_status(" "c=%p, status=%d, description=%s, reserved=%p)", 4, (c, (int)status, description, reserved)); GPR_ASSERT(reserved == nullptr); - cancel_with_status(c, STATUS_FROM_API_OVERRIDE, status, description); - + cancel_with_status(&exec_ctx, c, STATUS_FROM_API_OVERRIDE, status, + description); + grpc_exec_ctx_finish(&exec_ctx); return GRPC_CALL_OK; } @@ -670,23 +685,24 @@ typedef struct { // The on_complete callback used when sending a cancel_stream batch down // the filter stack. Yields the call combiner when the batch is done. -static void done_termination(void* arg, grpc_error* error) { +static void done_termination(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { cancel_state* state = (cancel_state*)arg; - GRPC_CALL_COMBINER_STOP(&state->call->call_combiner, + GRPC_CALL_COMBINER_STOP(exec_ctx, &state->call->call_combiner, "on_complete for cancel_stream op"); - GRPC_CALL_INTERNAL_UNREF(state->call, "termination"); + GRPC_CALL_INTERNAL_UNREF(exec_ctx, state->call, "termination"); gpr_free(state); } -static void cancel_with_error(grpc_call* c, status_source source, - grpc_error* error) { +static void cancel_with_error(grpc_exec_ctx* exec_ctx, grpc_call* c, + status_source source, grpc_error* error) { GRPC_CALL_INTERNAL_REF(c, "termination"); // Inform the call combiner of the cancellation, so that it can cancel // any in-flight asynchronous actions that may be holding the call // combiner. This ensures that the cancel_stream batch can be sent // down the filter stack in a timely manner. - grpc_call_combiner_cancel(&c->call_combiner, GRPC_ERROR_REF(error)); - set_status_from_error(c, source, GRPC_ERROR_REF(error)); + grpc_call_combiner_cancel(exec_ctx, &c->call_combiner, GRPC_ERROR_REF(error)); + set_status_from_error(exec_ctx, c, source, GRPC_ERROR_REF(error)); cancel_state* state = (cancel_state*)gpr_malloc(sizeof(*state)); state->call = c; GRPC_CLOSURE_INIT(&state->finish_batch, done_termination, state, @@ -695,7 +711,7 @@ static void cancel_with_error(grpc_call* c, status_source source, grpc_make_transport_stream_op(&state->finish_batch); op->cancel_stream = true; op->payload->cancel_stream.cancel_error = error; - execute_batch(c, op, &state->start_batch); + execute_batch(exec_ctx, c, op, &state->start_batch); } static grpc_error* error_from_status(grpc_status_code status, @@ -709,10 +725,11 @@ static grpc_error* error_from_status(grpc_status_code status, GRPC_ERROR_INT_GRPC_STATUS, status); } -static void cancel_with_status(grpc_call* c, status_source source, - grpc_status_code status, +static void cancel_with_status(grpc_exec_ctx* exec_ctx, grpc_call* c, + status_source source, grpc_status_code status, const char* description) { - cancel_with_error(c, source, error_from_status(status, description)); + cancel_with_error(exec_ctx, c, source, + error_from_status(status, description)); } /******************************************************************************* @@ -720,13 +737,14 @@ static void cancel_with_status(grpc_call* c, status_source source, */ static bool get_final_status_from( - grpc_call* call, grpc_error* error, bool allow_ok_status, + grpc_exec_ctx* exec_ctx, grpc_call* call, grpc_error* error, + bool allow_ok_status, void (*set_value)(grpc_status_code code, void* user_data), void* set_value_user_data, grpc_slice* details, const char** error_string) { grpc_status_code code; grpc_slice slice = grpc_empty_slice(); - grpc_error_get_status(error, call->send_deadline, &code, &slice, nullptr, - error_string); + grpc_error_get_status(exec_ctx, error, call->send_deadline, &code, &slice, + nullptr, error_string); if (code == GRPC_STATUS_OK && !allow_ok_status) { return false; } @@ -738,9 +756,11 @@ static bool get_final_status_from( return true; } -static void get_final_status( - grpc_call* call, void (*set_value)(grpc_status_code code, void* user_data), - void* set_value_user_data, grpc_slice* details, const char** error_string) { +static void get_final_status(grpc_exec_ctx* exec_ctx, grpc_call* call, + void (*set_value)(grpc_status_code code, + void* user_data), + void* set_value_user_data, grpc_slice* details, + const char** error_string) { int i; received_status status[STATUS_SOURCE_COUNT]; for (i = 0; i < STATUS_SOURCE_COUNT; i++) { @@ -762,9 +782,9 @@ static void get_final_status( for (i = 0; i < STATUS_SOURCE_COUNT; i++) { if (status[i].is_set && grpc_error_has_clear_grpc_status(status[i].error)) { - if (get_final_status_from(call, status[i].error, allow_ok_status != 0, - set_value, set_value_user_data, details, - error_string)) { + if (get_final_status_from(exec_ctx, call, status[i].error, + allow_ok_status != 0, set_value, + set_value_user_data, details, error_string)) { return; } } @@ -772,9 +792,9 @@ static void get_final_status( /* If no clearly defined status exists, search for 'anything' */ for (i = 0; i < STATUS_SOURCE_COUNT; i++) { if (status[i].is_set) { - if (get_final_status_from(call, status[i].error, allow_ok_status != 0, - set_value, set_value_user_data, details, - error_string)) { + if (get_final_status_from(exec_ctx, call, status[i].error, + allow_ok_status != 0, set_value, + set_value_user_data, details, error_string)) { return; } } @@ -788,8 +808,8 @@ static void get_final_status( } } -static void set_status_from_error(grpc_call* call, status_source source, - grpc_error* error) { +static void set_status_from_error(grpc_exec_ctx* exec_ctx, grpc_call* call, + status_source source, grpc_error* error) { if (!gpr_atm_rel_cas(&call->status[source], pack_received_status({false, GRPC_ERROR_NONE}), pack_received_status({true, error}))) { @@ -841,7 +861,8 @@ uint32_t grpc_call_test_only_get_message_flags(grpc_call* call) { static void destroy_encodings_accepted_by_peer(void* p) { return; } -static void set_encodings_accepted_by_peer(grpc_call* call, grpc_mdelem mdel) { +static void set_encodings_accepted_by_peer(grpc_exec_ctx* exec_ctx, + grpc_call* call, grpc_mdelem mdel) { size_t i; grpc_compression_algorithm algorithm; grpc_slice_buffer accept_encoding_parts; @@ -879,14 +900,15 @@ static void set_encodings_accepted_by_peer(grpc_call* call, grpc_mdelem mdel) { } } - grpc_slice_buffer_destroy_internal(&accept_encoding_parts); + grpc_slice_buffer_destroy_internal(exec_ctx, &accept_encoding_parts); grpc_mdelem_set_user_data( mdel, destroy_encodings_accepted_by_peer, (void*)(((uintptr_t)call->encodings_accepted_by_peer) + 1)); } -static void set_stream_encodings_accepted_by_peer(grpc_call* call, +static void set_stream_encodings_accepted_by_peer(grpc_exec_ctx* exec_ctx, + grpc_call* call, grpc_mdelem mdel) { size_t i; grpc_stream_compression_algorithm algorithm; @@ -924,7 +946,7 @@ static void set_stream_encodings_accepted_by_peer(grpc_call* call, } } - grpc_slice_buffer_destroy_internal(&accept_encoding_parts); + grpc_slice_buffer_destroy_internal(exec_ctx, &accept_encoding_parts); grpc_mdelem_set_user_data( mdel, destroy_encodings_accepted_by_peer, @@ -962,12 +984,10 @@ static grpc_metadata* get_md_elem(grpc_metadata* metadata, return res; } -static int prepare_application_metadata(grpc_call* call, int count, - grpc_metadata* metadata, - int is_trailing, - int prepend_extra_metadata, - grpc_metadata* additional_metadata, - int additional_metadata_count) { +static int prepare_application_metadata( + grpc_exec_ctx* exec_ctx, grpc_call* call, int count, + grpc_metadata* metadata, int is_trailing, int prepend_extra_metadata, + grpc_metadata* additional_metadata, int additional_metadata_count) { int total_count = count + additional_metadata_count; int i; grpc_metadata_batch* batch = @@ -986,14 +1006,14 @@ static int prepare_application_metadata(grpc_call* call, int count, grpc_validate_header_nonbin_value_is_legal(md->value))) { break; } - l->md = grpc_mdelem_from_grpc_metadata((grpc_metadata*)md); + l->md = grpc_mdelem_from_grpc_metadata(exec_ctx, (grpc_metadata*)md); } if (i != total_count) { for (int j = 0; j < i; j++) { const grpc_metadata* md = get_md_elem(metadata, additional_metadata, j, count); grpc_linked_mdelem* l = linked_from_md(md); - GRPC_MDELEM_UNREF(l->md); + GRPC_MDELEM_UNREF(exec_ctx, l->md); } return 0; } @@ -1004,16 +1024,16 @@ static int prepare_application_metadata(grpc_call* call, int count, for (i = 0; i < call->send_extra_metadata_count; i++) { GRPC_LOG_IF_ERROR("prepare_application_metadata", grpc_metadata_batch_link_tail( - batch, &call->send_extra_metadata[i])); + exec_ctx, batch, &call->send_extra_metadata[i])); } } } for (i = 0; i < total_count; i++) { grpc_metadata* md = get_md_elem(metadata, additional_metadata, i, count); grpc_linked_mdelem* l = linked_from_md(md); - grpc_error* error = grpc_metadata_batch_link_tail(batch, l); + grpc_error* error = grpc_metadata_batch_link_tail(exec_ctx, batch, l); if (error != GRPC_ERROR_NONE) { - GRPC_MDELEM_UNREF(l->md); + GRPC_MDELEM_UNREF(exec_ctx, l->md); } GRPC_LOG_IF_ERROR("prepare_application_metadata", error); } @@ -1100,43 +1120,46 @@ static void publish_app_metadata(grpc_call* call, grpc_metadata_batch* b, GPR_TIMER_END("publish_app_metadata", 0); } -static void recv_initial_filter(grpc_call* call, grpc_metadata_batch* b) { +static void recv_initial_filter(grpc_exec_ctx* exec_ctx, grpc_call* call, + grpc_metadata_batch* b) { if (b->idx.named.content_encoding != nullptr) { if (b->idx.named.grpc_encoding != nullptr) { gpr_log(GPR_ERROR, "Received both content-encoding and grpc-encoding header. " "Ignoring grpc-encoding."); - grpc_metadata_batch_remove(b, b->idx.named.grpc_encoding); + grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.grpc_encoding); } GPR_TIMER_BEGIN("incoming_stream_compression_algorithm", 0); set_incoming_stream_compression_algorithm( call, decode_stream_compression(b->idx.named.content_encoding->md)); GPR_TIMER_END("incoming_stream_compression_algorithm", 0); - grpc_metadata_batch_remove(b, b->idx.named.content_encoding); + grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.content_encoding); } else if (b->idx.named.grpc_encoding != nullptr) { GPR_TIMER_BEGIN("incoming_compression_algorithm", 0); set_incoming_compression_algorithm( call, decode_compression(b->idx.named.grpc_encoding->md)); GPR_TIMER_END("incoming_compression_algorithm", 0); - grpc_metadata_batch_remove(b, b->idx.named.grpc_encoding); + grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.grpc_encoding); } if (b->idx.named.grpc_accept_encoding != nullptr) { GPR_TIMER_BEGIN("encodings_accepted_by_peer", 0); - set_encodings_accepted_by_peer(call, b->idx.named.grpc_accept_encoding->md); - grpc_metadata_batch_remove(b, b->idx.named.grpc_accept_encoding); + set_encodings_accepted_by_peer(exec_ctx, call, + b->idx.named.grpc_accept_encoding->md); + grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.grpc_accept_encoding); GPR_TIMER_END("encodings_accepted_by_peer", 0); } if (b->idx.named.accept_encoding != nullptr) { GPR_TIMER_BEGIN("stream_encodings_accepted_by_peer", 0); - set_stream_encodings_accepted_by_peer(call, + set_stream_encodings_accepted_by_peer(exec_ctx, call, b->idx.named.accept_encoding->md); - grpc_metadata_batch_remove(b, b->idx.named.accept_encoding); + grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.accept_encoding); GPR_TIMER_END("stream_encodings_accepted_by_peer", 0); } publish_app_metadata(call, b, false); } -static void recv_trailing_filter(void* args, grpc_metadata_batch* b) { +static void recv_trailing_filter(grpc_exec_ctx* exec_ctx, void* args, + grpc_metadata_batch* b) { grpc_call* call = (grpc_call*)args; if (b->idx.named.grpc_status != nullptr) { uint32_t status_code = decode_status(b->idx.named.grpc_status->md); @@ -1151,13 +1174,13 @@ static void recv_trailing_filter(void* args, grpc_metadata_batch* b) { error = grpc_error_set_str( error, GRPC_ERROR_STR_GRPC_MESSAGE, grpc_slice_ref_internal(GRPC_MDVALUE(b->idx.named.grpc_message->md))); - grpc_metadata_batch_remove(b, b->idx.named.grpc_message); + grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.grpc_message); } else if (error != GRPC_ERROR_NONE) { error = grpc_error_set_str(error, GRPC_ERROR_STR_GRPC_MESSAGE, grpc_empty_slice()); } - set_status_from_error(call, STATUS_FROM_WIRE, error); - grpc_metadata_batch_remove(b, b->idx.named.grpc_status); + set_status_from_error(exec_ctx, call, STATUS_FROM_WIRE, error); + grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.grpc_status); } publish_app_metadata(call, b, true); } @@ -1234,12 +1257,12 @@ static batch_control* allocate_batch_control(grpc_call* call, return bctl; } -static void finish_batch_completion(void* user_data, +static void finish_batch_completion(grpc_exec_ctx* exec_ctx, void* user_data, grpc_cq_completion* storage) { batch_control* bctl = (batch_control*)user_data; grpc_call* call = bctl->call; bctl->call = nullptr; - GRPC_CALL_INTERNAL_UNREF(call, "completion"); + GRPC_CALL_INTERNAL_UNREF(exec_ctx, call, "completion"); } static grpc_error* consolidate_batch_errors(batch_control* bctl) { @@ -1263,13 +1286,15 @@ static grpc_error* consolidate_batch_errors(batch_control* bctl) { } } -static void post_batch_completion(batch_control* bctl) { +static void post_batch_completion(grpc_exec_ctx* exec_ctx, + batch_control* bctl) { grpc_call* next_child_call; grpc_call* call = bctl->call; grpc_error* error = consolidate_batch_errors(bctl); if (bctl->op.send_initial_metadata) { grpc_metadata_batch_destroy( + exec_ctx, &call->metadata_batch[0 /* is_receiving */][0 /* is_trailing */]); } if (bctl->op.send_message) { @@ -1277,12 +1302,13 @@ static void post_batch_completion(batch_control* bctl) { } if (bctl->op.send_trailing_metadata) { grpc_metadata_batch_destroy( + exec_ctx, &call->metadata_batch[0 /* is_receiving */][1 /* is_trailing */]); } if (bctl->op.recv_trailing_metadata) { grpc_metadata_batch* md = &call->metadata_batch[1 /* is_receiving */][1 /* is_trailing */]; - recv_trailing_filter(call, md); + recv_trailing_filter(exec_ctx, call, md); /* propagate cancellation to any interested children */ gpr_atm_rel_store(&call->received_final_op_atm, 1); @@ -1296,9 +1322,9 @@ static void post_batch_completion(batch_control* bctl) { next_child_call = child->child->sibling_next; if (child->cancellation_is_inherited) { GRPC_CALL_INTERNAL_REF(child, "propagate_cancel"); - cancel_with_error(child, STATUS_FROM_API_OVERRIDE, + cancel_with_error(exec_ctx, child, STATUS_FROM_API_OVERRIDE, GRPC_ERROR_CANCELLED); - GRPC_CALL_INTERNAL_UNREF(child, "propagate_cancel"); + GRPC_CALL_INTERNAL_UNREF(exec_ctx, child, "propagate_cancel"); } child = next_child_call; } while (child != pc->first_child); @@ -1307,12 +1333,12 @@ static void post_batch_completion(batch_control* bctl) { } if (call->is_client) { - get_final_status(call, set_status_value_directly, + get_final_status(exec_ctx, call, set_status_value_directly, call->final_op.client.status, call->final_op.client.status_details, call->final_op.client.error_string); } else { - get_final_status(call, set_cancelled_value, + get_final_status(exec_ctx, call, set_cancelled_value, call->final_op.server.cancelled, nullptr, nullptr); } @@ -1328,24 +1354,25 @@ static void post_batch_completion(batch_control* bctl) { if (bctl->completion_data.notify_tag.is_closure) { /* unrefs bctl->error */ bctl->call = nullptr; - GRPC_CLOSURE_RUN((grpc_closure*)bctl->completion_data.notify_tag.tag, - error); - GRPC_CALL_INTERNAL_UNREF(call, "completion"); + GRPC_CLOSURE_RUN( + exec_ctx, (grpc_closure*)bctl->completion_data.notify_tag.tag, error); + GRPC_CALL_INTERNAL_UNREF(exec_ctx, call, "completion"); } else { /* unrefs bctl->error */ - grpc_cq_end_op(bctl->call->cq, bctl->completion_data.notify_tag.tag, error, - finish_batch_completion, bctl, - &bctl->completion_data.cq_completion); + grpc_cq_end_op( + exec_ctx, bctl->call->cq, bctl->completion_data.notify_tag.tag, error, + finish_batch_completion, bctl, &bctl->completion_data.cq_completion); } } -static void finish_batch_step(batch_control* bctl) { +static void finish_batch_step(grpc_exec_ctx* exec_ctx, batch_control* bctl) { if (gpr_unref(&bctl->steps_to_complete)) { - post_batch_completion(bctl); + post_batch_completion(exec_ctx, bctl); } } -static void continue_receiving_slices(batch_control* bctl) { +static void continue_receiving_slices(grpc_exec_ctx* exec_ctx, + batch_control* bctl) { grpc_error* error; grpc_call* call = bctl->call; for (;;) { @@ -1353,25 +1380,25 @@ static void continue_receiving_slices(batch_control* bctl) { (*call->receiving_buffer)->data.raw.slice_buffer.length; if (remaining == 0) { call->receiving_message = 0; - grpc_byte_stream_destroy(call->receiving_stream); + grpc_byte_stream_destroy(exec_ctx, call->receiving_stream); call->receiving_stream = nullptr; - finish_batch_step(bctl); + finish_batch_step(exec_ctx, bctl); return; } - if (grpc_byte_stream_next(call->receiving_stream, remaining, + if (grpc_byte_stream_next(exec_ctx, call->receiving_stream, remaining, &call->receiving_slice_ready)) { - error = - grpc_byte_stream_pull(call->receiving_stream, &call->receiving_slice); + error = grpc_byte_stream_pull(exec_ctx, call->receiving_stream, + &call->receiving_slice); if (error == GRPC_ERROR_NONE) { grpc_slice_buffer_add(&(*call->receiving_buffer)->data.raw.slice_buffer, call->receiving_slice); } else { - grpc_byte_stream_destroy(call->receiving_stream); + grpc_byte_stream_destroy(exec_ctx, call->receiving_stream); call->receiving_stream = nullptr; grpc_byte_buffer_destroy(*call->receiving_buffer); *call->receiving_buffer = nullptr; call->receiving_message = 0; - finish_batch_step(bctl); + finish_batch_step(exec_ctx, bctl); return; } } else { @@ -1380,7 +1407,8 @@ static void continue_receiving_slices(batch_control* bctl) { } } -static void receiving_slice_ready(void* bctlp, grpc_error* error) { +static void receiving_slice_ready(grpc_exec_ctx* exec_ctx, void* bctlp, + grpc_error* error) { batch_control* bctl = (batch_control*)bctlp; grpc_call* call = bctl->call; grpc_byte_stream* bs = call->receiving_stream; @@ -1388,11 +1416,11 @@ static void receiving_slice_ready(void* bctlp, grpc_error* error) { if (error == GRPC_ERROR_NONE) { grpc_slice slice; - error = grpc_byte_stream_pull(bs, &slice); + error = grpc_byte_stream_pull(exec_ctx, bs, &slice); if (error == GRPC_ERROR_NONE) { grpc_slice_buffer_add(&(*call->receiving_buffer)->data.raw.slice_buffer, slice); - continue_receiving_slices(bctl); + continue_receiving_slices(exec_ctx, bctl); } else { /* Error returned by grpc_byte_stream_pull needs to be released manually */ @@ -1404,24 +1432,25 @@ static void receiving_slice_ready(void* bctlp, grpc_error* error) { if (grpc_trace_operation_failures.enabled()) { GRPC_LOG_IF_ERROR("receiving_slice_ready", GRPC_ERROR_REF(error)); } - grpc_byte_stream_destroy(call->receiving_stream); + grpc_byte_stream_destroy(exec_ctx, call->receiving_stream); call->receiving_stream = nullptr; grpc_byte_buffer_destroy(*call->receiving_buffer); *call->receiving_buffer = nullptr; call->receiving_message = 0; - finish_batch_step(bctl); + finish_batch_step(exec_ctx, bctl); if (release_error) { GRPC_ERROR_UNREF(error); } } } -static void process_data_after_md(batch_control* bctl) { +static void process_data_after_md(grpc_exec_ctx* exec_ctx, + batch_control* bctl) { grpc_call* call = bctl->call; if (call->receiving_stream == nullptr) { *call->receiving_buffer = nullptr; call->receiving_message = 0; - finish_batch_step(bctl); + finish_batch_step(exec_ctx, bctl); } else { call->test_only_last_message_flags = call->receiving_stream->flags; if ((call->receiving_stream->flags & GRPC_WRITE_INTERNAL_COMPRESS) && @@ -1433,42 +1462,46 @@ static void process_data_after_md(batch_control* bctl) { } GRPC_CLOSURE_INIT(&call->receiving_slice_ready, receiving_slice_ready, bctl, grpc_schedule_on_exec_ctx); - continue_receiving_slices(bctl); + continue_receiving_slices(exec_ctx, bctl); } } -static void receiving_stream_ready(void* bctlp, grpc_error* error) { +static void receiving_stream_ready(grpc_exec_ctx* exec_ctx, void* bctlp, + grpc_error* error) { batch_control* bctl = (batch_control*)bctlp; grpc_call* call = bctl->call; if (error != GRPC_ERROR_NONE) { if (call->receiving_stream != nullptr) { - grpc_byte_stream_destroy(call->receiving_stream); + grpc_byte_stream_destroy(exec_ctx, call->receiving_stream); call->receiving_stream = nullptr; } - add_batch_error(bctl, GRPC_ERROR_REF(error), true); - cancel_with_error(call, STATUS_FROM_SURFACE, GRPC_ERROR_REF(error)); + add_batch_error(exec_ctx, bctl, GRPC_ERROR_REF(error), true); + cancel_with_error(exec_ctx, call, STATUS_FROM_SURFACE, + GRPC_ERROR_REF(error)); } /* If recv_state is RECV_NONE, we will save the batch_control * object with rel_cas, and will not use it after the cas. Its corresponding * acq_load is in receiving_initial_metadata_ready() */ if (error != GRPC_ERROR_NONE || call->receiving_stream == nullptr || !gpr_atm_rel_cas(&call->recv_state, RECV_NONE, (gpr_atm)bctlp)) { - process_data_after_md(bctl); + process_data_after_md(exec_ctx, bctl); } } // The recv_message_ready callback used when sending a batch containing // a recv_message op down the filter stack. Yields the call combiner // before processing the received message. -static void receiving_stream_ready_in_call_combiner(void* bctlp, +static void receiving_stream_ready_in_call_combiner(grpc_exec_ctx* exec_ctx, + void* bctlp, grpc_error* error) { batch_control* bctl = (batch_control*)bctlp; grpc_call* call = bctl->call; - GRPC_CALL_COMBINER_STOP(&call->call_combiner, "recv_message_ready"); - receiving_stream_ready(bctlp, error); + GRPC_CALL_COMBINER_STOP(exec_ctx, &call->call_combiner, "recv_message_ready"); + receiving_stream_ready(exec_ctx, bctlp, error); } -static void validate_filtered_metadata(batch_control* bctl) { +static void validate_filtered_metadata(grpc_exec_ctx* exec_ctx, + batch_control* bctl) { grpc_call* call = bctl->call; /* validate compression algorithms */ if (call->incoming_stream_compression_algorithm != @@ -1482,8 +1515,8 @@ static void validate_filtered_metadata(batch_control* bctl) { gpr_asprintf(&error_msg, "Invalid stream compression algorithm value '%d'.", algo); gpr_log(GPR_ERROR, "%s", error_msg); - cancel_with_status(call, STATUS_FROM_SURFACE, GRPC_STATUS_UNIMPLEMENTED, - error_msg); + cancel_with_status(exec_ctx, call, STATUS_FROM_SURFACE, + GRPC_STATUS_UNIMPLEMENTED, error_msg); } else if (grpc_compression_options_is_stream_compression_algorithm_enabled( &compression_options, algo) == 0) { /* check if algorithm is supported by current channel config */ @@ -1492,8 +1525,8 @@ static void validate_filtered_metadata(batch_control* bctl) { gpr_asprintf(&error_msg, "Stream compression algorithm '%s' is disabled.", algo_name); gpr_log(GPR_ERROR, "%s", error_msg); - cancel_with_status(call, STATUS_FROM_SURFACE, GRPC_STATUS_UNIMPLEMENTED, - error_msg); + cancel_with_status(exec_ctx, call, STATUS_FROM_SURFACE, + GRPC_STATUS_UNIMPLEMENTED, error_msg); } gpr_free(error_msg); @@ -1523,8 +1556,8 @@ static void validate_filtered_metadata(batch_control* bctl) { gpr_asprintf(&error_msg, "Invalid compression algorithm value '%d'.", algo); gpr_log(GPR_ERROR, "%s", error_msg); - cancel_with_status(call, STATUS_FROM_SURFACE, GRPC_STATUS_UNIMPLEMENTED, - error_msg); + cancel_with_status(exec_ctx, call, STATUS_FROM_SURFACE, + GRPC_STATUS_UNIMPLEMENTED, error_msg); } else if (grpc_compression_options_is_algorithm_enabled( &compression_options, algo) == 0) { /* check if algorithm is supported by current channel config */ @@ -1533,8 +1566,8 @@ static void validate_filtered_metadata(batch_control* bctl) { gpr_asprintf(&error_msg, "Compression algorithm '%s' is disabled.", algo_name); gpr_log(GPR_ERROR, "%s", error_msg); - cancel_with_status(call, STATUS_FROM_SURFACE, GRPC_STATUS_UNIMPLEMENTED, - error_msg); + cancel_with_status(exec_ctx, call, STATUS_FROM_SURFACE, + GRPC_STATUS_UNIMPLEMENTED, error_msg); } else { call->incoming_compression_algorithm = algo; } @@ -1557,31 +1590,34 @@ static void validate_filtered_metadata(batch_control* bctl) { } } -static void add_batch_error(batch_control* bctl, grpc_error* error, - bool has_cancelled) { +static void add_batch_error(grpc_exec_ctx* exec_ctx, batch_control* bctl, + grpc_error* error, bool has_cancelled) { if (error == GRPC_ERROR_NONE) return; int idx = (int)gpr_atm_full_fetch_add(&bctl->num_errors, 1); if (idx == 0 && !has_cancelled) { - cancel_with_error(bctl->call, STATUS_FROM_CORE, GRPC_ERROR_REF(error)); + cancel_with_error(exec_ctx, bctl->call, STATUS_FROM_CORE, + GRPC_ERROR_REF(error)); } bctl->errors[idx] = error; } -static void receiving_initial_metadata_ready(void* bctlp, grpc_error* error) { +static void receiving_initial_metadata_ready(grpc_exec_ctx* exec_ctx, + void* bctlp, grpc_error* error) { batch_control* bctl = (batch_control*)bctlp; grpc_call* call = bctl->call; - GRPC_CALL_COMBINER_STOP(&call->call_combiner, "recv_initial_metadata_ready"); + GRPC_CALL_COMBINER_STOP(exec_ctx, &call->call_combiner, + "recv_initial_metadata_ready"); - add_batch_error(bctl, GRPC_ERROR_REF(error), false); + add_batch_error(exec_ctx, bctl, GRPC_ERROR_REF(error), false); if (error == GRPC_ERROR_NONE) { grpc_metadata_batch* md = &call->metadata_batch[1 /* is_receiving */][0 /* is_trailing */]; - recv_initial_filter(call, md); + recv_initial_filter(exec_ctx, call, md); /* TODO(ctiller): this could be moved into recv_initial_filter now */ GPR_TIMER_BEGIN("validate_filtered_metadata", 0); - validate_filtered_metadata(bctl); + validate_filtered_metadata(exec_ctx, bctl); GPR_TIMER_END("validate_filtered_metadata", 0); if (md->deadline != GRPC_MILLIS_INF_FUTURE && !call->is_client) { @@ -1614,25 +1650,28 @@ static void receiving_initial_metadata_ready(void* bctlp, grpc_error* error) { } } if (saved_rsr_closure != nullptr) { - GRPC_CLOSURE_RUN(saved_rsr_closure, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(exec_ctx, saved_rsr_closure, GRPC_ERROR_REF(error)); } - finish_batch_step(bctl); + finish_batch_step(exec_ctx, bctl); } -static void finish_batch(void* bctlp, grpc_error* error) { +static void finish_batch(grpc_exec_ctx* exec_ctx, void* bctlp, + grpc_error* error) { batch_control* bctl = (batch_control*)bctlp; grpc_call* call = bctl->call; - GRPC_CALL_COMBINER_STOP(&call->call_combiner, "on_complete"); - add_batch_error(bctl, GRPC_ERROR_REF(error), false); - finish_batch_step(bctl); + GRPC_CALL_COMBINER_STOP(exec_ctx, &call->call_combiner, "on_complete"); + add_batch_error(exec_ctx, bctl, GRPC_ERROR_REF(error), false); + finish_batch_step(exec_ctx, bctl); } -static void free_no_op_completion(void* p, grpc_cq_completion* completion) { +static void free_no_op_completion(grpc_exec_ctx* exec_ctx, void* p, + grpc_cq_completion* completion) { gpr_free(completion); } -static grpc_call_error call_start_batch(grpc_call* call, const grpc_op* ops, +static grpc_call_error call_start_batch(grpc_exec_ctx* exec_ctx, + grpc_call* call, const grpc_op* ops, size_t nops, void* notify_tag, int is_notify_tag_closure) { size_t i; @@ -1650,10 +1689,11 @@ static grpc_call_error call_start_batch(grpc_call* call, const grpc_op* ops, if (!is_notify_tag_closure) { GPR_ASSERT(grpc_cq_begin_op(call->cq, notify_tag)); grpc_cq_end_op( - call->cq, notify_tag, GRPC_ERROR_NONE, free_no_op_completion, nullptr, + exec_ctx, call->cq, notify_tag, GRPC_ERROR_NONE, + free_no_op_completion, nullptr, (grpc_cq_completion*)gpr_malloc(sizeof(grpc_cq_completion))); } else { - GRPC_CLOSURE_SCHED((grpc_closure*)notify_tag, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, (grpc_closure*)notify_tag, GRPC_ERROR_NONE); } error = GRPC_CALL_OK; goto done; @@ -1753,7 +1793,7 @@ static grpc_call_error call_start_batch(grpc_call* call, const grpc_op* ops, stream_op->send_initial_metadata = true; call->sent_initial_metadata = true; if (!prepare_application_metadata( - call, (int)op->data.send_initial_metadata.count, + exec_ctx, call, (int)op->data.send_initial_metadata.count, op->data.send_initial_metadata.metadata, 0, call->is_client, &call->compression_md, (int)additional_metadata_count)) { error = GRPC_CALL_ERROR_INVALID_METADATA; @@ -1847,7 +1887,7 @@ static grpc_call_error call_start_batch(grpc_call* call, const grpc_op* ops, GPR_ASSERT(call->send_extra_metadata_count == 0); call->send_extra_metadata_count = 1; call->send_extra_metadata[0].md = grpc_channel_get_reffed_status_elem( - call->channel, op->data.send_status_from_server.status); + exec_ctx, call->channel, op->data.send_status_from_server.status); { grpc_error* override_error = GRPC_ERROR_NONE; if (op->data.send_status_from_server.status != GRPC_STATUS_OK) { @@ -1856,7 +1896,7 @@ static grpc_call_error call_start_batch(grpc_call* call, const grpc_op* ops, } if (op->data.send_status_from_server.status_details != nullptr) { call->send_extra_metadata[1].md = grpc_mdelem_from_slices( - GRPC_MDSTR_GRPC_MESSAGE, + exec_ctx, GRPC_MDSTR_GRPC_MESSAGE, grpc_slice_ref_internal( *op->data.send_status_from_server.status_details)); call->send_extra_metadata_count++; @@ -1867,15 +1907,16 @@ static grpc_call_error call_start_batch(grpc_call* call, const grpc_op* ops, grpc_slice_from_copied_string(msg)); gpr_free(msg); } - set_status_from_error(call, STATUS_FROM_API_OVERRIDE, override_error); + set_status_from_error(exec_ctx, call, STATUS_FROM_API_OVERRIDE, + override_error); } if (!prepare_application_metadata( - call, + exec_ctx, call, (int)op->data.send_status_from_server.trailing_metadata_count, op->data.send_status_from_server.trailing_metadata, 1, 1, nullptr, 0)) { for (int n = 0; n < call->send_extra_metadata_count; n++) { - GRPC_MDELEM_UNREF(call->send_extra_metadata[n].md); + GRPC_MDELEM_UNREF(exec_ctx, call->send_extra_metadata[n].md); } call->send_extra_metadata_count = 0; error = GRPC_CALL_ERROR_INVALID_METADATA; @@ -2004,7 +2045,7 @@ static grpc_call_error call_start_batch(grpc_call* call, const grpc_op* ops, stream_op->on_complete = &bctl->finish_batch; gpr_atm_rel_store(&call->any_ops_sent_atm, 1); - execute_batch(call, stream_op, &bctl->start_batch); + execute_batch(exec_ctx, call, stream_op, &bctl->start_batch); done: GPR_TIMER_END("grpc_call_start_batch", 0); @@ -2014,15 +2055,15 @@ done_with_error: /* reverse any mutations that occured */ if (stream_op->send_initial_metadata) { call->sent_initial_metadata = false; - grpc_metadata_batch_clear(&call->metadata_batch[0][0]); + grpc_metadata_batch_clear(exec_ctx, &call->metadata_batch[0][0]); } if (stream_op->send_message) { call->sending_message = false; - grpc_byte_stream_destroy(&call->sending_stream.base); + grpc_byte_stream_destroy(exec_ctx, &call->sending_stream.base); } if (stream_op->send_trailing_metadata) { call->sent_final_op = false; - grpc_metadata_batch_clear(&call->metadata_batch[0][1]); + grpc_metadata_batch_clear(exec_ctx, &call->metadata_batch[0][1]); } if (stream_op->recv_initial_metadata) { call->received_initial_metadata = false; @@ -2038,7 +2079,7 @@ done_with_error: grpc_call_error grpc_call_start_batch(grpc_call* call, const grpc_op* ops, size_t nops, void* tag, void* reserved) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_call_error err; GRPC_API_TRACE( @@ -2049,17 +2090,19 @@ grpc_call_error grpc_call_start_batch(grpc_call* call, const grpc_op* ops, if (reserved != nullptr) { err = GRPC_CALL_ERROR; } else { - err = call_start_batch(call, ops, nops, tag, 0); + err = call_start_batch(&exec_ctx, call, ops, nops, tag, 0); } + grpc_exec_ctx_finish(&exec_ctx); return err; } -grpc_call_error grpc_call_start_batch_and_execute(grpc_call* call, +grpc_call_error grpc_call_start_batch_and_execute(grpc_exec_ctx* exec_ctx, + grpc_call* call, const grpc_op* ops, size_t nops, grpc_closure* closure) { - return call_start_batch(call, ops, nops, closure, 1); + return call_start_batch(exec_ctx, call, ops, nops, closure, 1); } void grpc_call_context_set(grpc_call* call, grpc_context_index elem, diff --git a/src/core/lib/surface/call.h b/src/core/lib/surface/call.h index 189329ccc40..1d2e266717f 100644 --- a/src/core/lib/surface/call.h +++ b/src/core/lib/surface/call.h @@ -26,7 +26,8 @@ #include #include -typedef void (*grpc_ioreq_completion_func)(grpc_call* call, int success, +typedef void (*grpc_ioreq_completion_func)(grpc_exec_ctx* exec_ctx, + grpc_call* call, int success, void* user_data); typedef struct grpc_call_create_args { @@ -50,28 +51,33 @@ typedef struct grpc_call_create_args { /* Create a new call based on \a args. Regardless of success or failure, always returns a valid new call into *call */ -grpc_error* grpc_call_create(const grpc_call_create_args* args, +grpc_error* grpc_call_create(grpc_exec_ctx* exec_ctx, + const grpc_call_create_args* args, grpc_call** call); -void grpc_call_set_completion_queue(grpc_call* call, grpc_completion_queue* cq); +void grpc_call_set_completion_queue(grpc_exec_ctx* exec_ctx, grpc_call* call, + grpc_completion_queue* cq); #ifndef NDEBUG void grpc_call_internal_ref(grpc_call* call, const char* reason); -void grpc_call_internal_unref(grpc_call* call, const char* reason); +void grpc_call_internal_unref(grpc_exec_ctx* exec_ctx, grpc_call* call, + const char* reason); #define GRPC_CALL_INTERNAL_REF(call, reason) \ grpc_call_internal_ref(call, reason) -#define GRPC_CALL_INTERNAL_UNREF(call, reason) \ - grpc_call_internal_unref(call, reason) +#define GRPC_CALL_INTERNAL_UNREF(exec_ctx, call, reason) \ + grpc_call_internal_unref(exec_ctx, call, reason) #else void grpc_call_internal_ref(grpc_call* call); -void grpc_call_internal_unref(grpc_call* call); +void grpc_call_internal_unref(grpc_exec_ctx* exec_ctx, grpc_call* call); #define GRPC_CALL_INTERNAL_REF(call, reason) grpc_call_internal_ref(call) -#define GRPC_CALL_INTERNAL_UNREF(call, reason) grpc_call_internal_unref(call) +#define GRPC_CALL_INTERNAL_UNREF(exec_ctx, call, reason) \ + grpc_call_internal_unref(exec_ctx, call) #endif grpc_call_stack* grpc_call_get_call_stack(grpc_call* call); -grpc_call_error grpc_call_start_batch_and_execute(grpc_call* call, +grpc_call_error grpc_call_start_batch_and_execute(grpc_exec_ctx* exec_ctx, + grpc_call* call, const grpc_op* ops, size_t nops, grpc_closure* closure); diff --git a/src/core/lib/surface/call_details.cc b/src/core/lib/surface/call_details.cc index cd0b14586a3..ea9208c7e32 100644 --- a/src/core/lib/surface/call_details.cc +++ b/src/core/lib/surface/call_details.cc @@ -34,7 +34,8 @@ void grpc_call_details_init(grpc_call_details* cd) { void grpc_call_details_destroy(grpc_call_details* cd) { GRPC_API_TRACE("grpc_call_details_destroy(cd=%p)", 1, (cd)); - grpc_core::ExecCtx exec_ctx; - grpc_slice_unref_internal(cd->method); - grpc_slice_unref_internal(cd->host); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice_unref_internal(&exec_ctx, cd->method); + grpc_slice_unref_internal(&exec_ctx, cd->host); + grpc_exec_ctx_finish(&exec_ctx); } diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc index cf5e8c2150d..1be734cdb78 100644 --- a/src/core/lib/surface/channel.cc +++ b/src/core/lib/surface/channel.cc @@ -69,22 +69,23 @@ struct grpc_channel { #define CHANNEL_FROM_TOP_ELEM(top_elem) \ CHANNEL_FROM_CHANNEL_STACK(grpc_channel_stack_from_top_element(top_elem)) -static void destroy_channel(void* arg, grpc_error* error); +static void destroy_channel(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error); grpc_channel* grpc_channel_create_with_builder( - grpc_channel_stack_builder* builder, + grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, grpc_channel_stack_type channel_stack_type) { char* target = gpr_strdup(grpc_channel_stack_builder_get_target(builder)); grpc_channel_args* args = grpc_channel_args_copy( grpc_channel_stack_builder_get_channel_arguments(builder)); grpc_channel* channel; if (channel_stack_type == GRPC_SERVER_CHANNEL) { - GRPC_STATS_INC_SERVER_CHANNELS_CREATED(); + GRPC_STATS_INC_SERVER_CHANNELS_CREATED(exec_ctx); } else { - GRPC_STATS_INC_CLIENT_CHANNELS_CREATED(); + GRPC_STATS_INC_CLIENT_CHANNELS_CREATED(exec_ctx); } grpc_error* error = grpc_channel_stack_builder_finish( - builder, sizeof(grpc_channel), 1, destroy_channel, nullptr, + exec_ctx, builder, sizeof(grpc_channel), 1, destroy_channel, nullptr, (void**)&channel); if (error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "channel stack builder failed: %s", @@ -113,10 +114,10 @@ grpc_channel* grpc_channel_create_with_builder( } else { if (!GRPC_MDISNULL(channel->default_authority)) { /* setting this takes precedence over anything else */ - GRPC_MDELEM_UNREF(channel->default_authority); + GRPC_MDELEM_UNREF(exec_ctx, channel->default_authority); } channel->default_authority = grpc_mdelem_from_slices( - GRPC_MDSTR_AUTHORITY, + exec_ctx, GRPC_MDSTR_AUTHORITY, grpc_slice_intern( grpc_slice_from_static_string(args->args[i].value.string))); } @@ -133,7 +134,7 @@ grpc_channel* grpc_channel_create_with_builder( GRPC_SSL_TARGET_NAME_OVERRIDE_ARG); } else { channel->default_authority = grpc_mdelem_from_slices( - GRPC_MDSTR_AUTHORITY, + exec_ctx, GRPC_MDSTR_AUTHORITY, grpc_slice_intern( grpc_slice_from_static_string(args->args[i].value.string))); } @@ -190,23 +191,25 @@ grpc_channel* grpc_channel_create_with_builder( } done: - grpc_channel_args_destroy(args); + grpc_channel_args_destroy(exec_ctx, args); return channel; } -grpc_channel* grpc_channel_create(const char* target, +grpc_channel* grpc_channel_create(grpc_exec_ctx* exec_ctx, const char* target, const grpc_channel_args* input_args, grpc_channel_stack_type channel_stack_type, grpc_transport* optional_transport) { grpc_channel_stack_builder* builder = grpc_channel_stack_builder_create(); - grpc_channel_stack_builder_set_channel_arguments(builder, input_args); + grpc_channel_stack_builder_set_channel_arguments(exec_ctx, builder, + input_args); grpc_channel_stack_builder_set_target(builder, target); grpc_channel_stack_builder_set_transport(builder, optional_transport); - if (!grpc_channel_init_create_stack(builder, channel_stack_type)) { - grpc_channel_stack_builder_destroy(builder); + if (!grpc_channel_init_create_stack(exec_ctx, builder, channel_stack_type)) { + grpc_channel_stack_builder_destroy(exec_ctx, builder); return nullptr; } - return grpc_channel_create_with_builder(builder, channel_stack_type); + return grpc_channel_create_with_builder(exec_ctx, builder, + channel_stack_type); } size_t grpc_channel_get_call_size_estimate(grpc_channel* channel) { @@ -248,17 +251,18 @@ char* grpc_channel_get_target(grpc_channel* channel) { void grpc_channel_get_info(grpc_channel* channel, const grpc_channel_info* channel_info) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_channel_element* elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CHANNEL(channel), 0); - elem->filter->get_channel_info(elem, channel_info); + elem->filter->get_channel_info(&exec_ctx, elem, channel_info); + grpc_exec_ctx_finish(&exec_ctx); } static grpc_call* grpc_channel_create_call_internal( - grpc_channel* channel, grpc_call* parent_call, uint32_t propagation_mask, - grpc_completion_queue* cq, grpc_pollset_set* pollset_set_alternative, - grpc_mdelem path_mdelem, grpc_mdelem authority_mdelem, - grpc_millis deadline) { + grpc_exec_ctx* exec_ctx, grpc_channel* channel, grpc_call* parent_call, + uint32_t propagation_mask, grpc_completion_queue* cq, + grpc_pollset_set* pollset_set_alternative, grpc_mdelem path_mdelem, + grpc_mdelem authority_mdelem, grpc_millis deadline) { grpc_mdelem send_metadata[2]; size_t num_metadata = 0; @@ -285,7 +289,7 @@ static grpc_call* grpc_channel_create_call_internal( args.send_deadline = deadline; grpc_call* call; - GRPC_LOG_IF_ERROR("call_create", grpc_call_create(&args, &call)); + GRPC_LOG_IF_ERROR("call_create", grpc_call_create(exec_ctx, &args, &call)); return call; } @@ -296,27 +300,29 @@ grpc_call* grpc_channel_create_call(grpc_channel* channel, grpc_slice method, const grpc_slice* host, gpr_timespec deadline, void* reserved) { GPR_ASSERT(!reserved); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_call* call = grpc_channel_create_call_internal( - channel, parent_call, propagation_mask, cq, nullptr, - grpc_mdelem_from_slices(GRPC_MDSTR_PATH, grpc_slice_ref_internal(method)), - host != nullptr ? grpc_mdelem_from_slices(GRPC_MDSTR_AUTHORITY, + &exec_ctx, channel, parent_call, propagation_mask, cq, nullptr, + grpc_mdelem_from_slices(&exec_ctx, GRPC_MDSTR_PATH, + grpc_slice_ref_internal(method)), + host != nullptr ? grpc_mdelem_from_slices(&exec_ctx, GRPC_MDSTR_AUTHORITY, grpc_slice_ref_internal(*host)) : GRPC_MDNULL, grpc_timespec_to_millis_round_up(deadline)); - + grpc_exec_ctx_finish(&exec_ctx); return call; } grpc_call* grpc_channel_create_pollset_set_call( - grpc_channel* channel, grpc_call* parent_call, uint32_t propagation_mask, - grpc_pollset_set* pollset_set, grpc_slice method, const grpc_slice* host, - grpc_millis deadline, void* reserved) { + grpc_exec_ctx* exec_ctx, grpc_channel* channel, grpc_call* parent_call, + uint32_t propagation_mask, grpc_pollset_set* pollset_set, grpc_slice method, + const grpc_slice* host, grpc_millis deadline, void* reserved) { GPR_ASSERT(!reserved); return grpc_channel_create_call_internal( - channel, parent_call, propagation_mask, nullptr, pollset_set, - grpc_mdelem_from_slices(GRPC_MDSTR_PATH, grpc_slice_ref_internal(method)), - host != nullptr ? grpc_mdelem_from_slices(GRPC_MDSTR_AUTHORITY, + exec_ctx, channel, parent_call, propagation_mask, nullptr, pollset_set, + grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_PATH, + grpc_slice_ref_internal(method)), + host != nullptr ? grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_AUTHORITY, grpc_slice_ref_internal(*host)) : GRPC_MDNULL, deadline); @@ -329,21 +335,21 @@ void* grpc_channel_register_call(grpc_channel* channel, const char* method, "grpc_channel_register_call(channel=%p, method=%s, host=%s, reserved=%p)", 4, (channel, method, host, reserved)); GPR_ASSERT(!reserved); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; rc->path = grpc_mdelem_from_slices( - GRPC_MDSTR_PATH, + &exec_ctx, GRPC_MDSTR_PATH, grpc_slice_intern(grpc_slice_from_static_string(method))); rc->authority = host ? grpc_mdelem_from_slices( - GRPC_MDSTR_AUTHORITY, + &exec_ctx, GRPC_MDSTR_AUTHORITY, grpc_slice_intern(grpc_slice_from_static_string(host))) : GRPC_MDNULL; gpr_mu_lock(&channel->registered_call_mu); rc->next = channel->registered_calls; channel->registered_calls = rc; gpr_mu_unlock(&channel->registered_call_mu); - + grpc_exec_ctx_finish(&exec_ctx); return rc; } @@ -364,12 +370,12 @@ grpc_call* grpc_channel_create_registered_call( registered_call_handle, deadline.tv_sec, deadline.tv_nsec, (int)deadline.clock_type, reserved)); GPR_ASSERT(!reserved); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_call* call = grpc_channel_create_call_internal( - channel, parent_call, propagation_mask, completion_queue, nullptr, - GRPC_MDELEM_REF(rc->path), GRPC_MDELEM_REF(rc->authority), + &exec_ctx, channel, parent_call, propagation_mask, completion_queue, + nullptr, GRPC_MDELEM_REF(rc->path), GRPC_MDELEM_REF(rc->authority), grpc_timespec_to_millis_round_up(deadline)); - + grpc_exec_ctx_finish(&exec_ctx); return call; } @@ -384,21 +390,23 @@ void grpc_channel_internal_ref(grpc_channel* c REF_ARG) { GRPC_CHANNEL_STACK_REF(CHANNEL_STACK_FROM_CHANNEL(c), REF_REASON); } -void grpc_channel_internal_unref(grpc_channel* c REF_ARG) { - GRPC_CHANNEL_STACK_UNREF(CHANNEL_STACK_FROM_CHANNEL(c), REF_REASON); +void grpc_channel_internal_unref(grpc_exec_ctx* exec_ctx, + grpc_channel* c REF_ARG) { + GRPC_CHANNEL_STACK_UNREF(exec_ctx, CHANNEL_STACK_FROM_CHANNEL(c), REF_REASON); } -static void destroy_channel(void* arg, grpc_error* error) { +static void destroy_channel(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_channel* channel = (grpc_channel*)arg; - grpc_channel_stack_destroy(CHANNEL_STACK_FROM_CHANNEL(channel)); + grpc_channel_stack_destroy(exec_ctx, CHANNEL_STACK_FROM_CHANNEL(channel)); while (channel->registered_calls) { registered_call* rc = channel->registered_calls; channel->registered_calls = rc->next; - GRPC_MDELEM_UNREF(rc->path); - GRPC_MDELEM_UNREF(rc->authority); + GRPC_MDELEM_UNREF(exec_ctx, rc->path); + GRPC_MDELEM_UNREF(exec_ctx, rc->authority); gpr_free(rc); } - GRPC_MDELEM_UNREF(channel->default_authority); + GRPC_MDELEM_UNREF(exec_ctx, channel->default_authority); gpr_mu_destroy(&channel->registered_call_mu); gpr_free(channel->target); gpr_free(channel); @@ -407,14 +415,16 @@ static void destroy_channel(void* arg, grpc_error* error) { void grpc_channel_destroy(grpc_channel* channel) { grpc_transport_op* op = grpc_make_transport_op(nullptr); grpc_channel_element* elem; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GRPC_API_TRACE("grpc_channel_destroy(channel=%p)", 1, (channel)); op->disconnect_with_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Channel Destroyed"); elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CHANNEL(channel), 0); - elem->filter->start_transport_op(elem, op); + elem->filter->start_transport_op(&exec_ctx, elem, op); + + GRPC_CHANNEL_INTERNAL_UNREF(&exec_ctx, channel, "channel"); - GRPC_CHANNEL_INTERNAL_UNREF(channel, "channel"); + grpc_exec_ctx_finish(&exec_ctx); } grpc_channel_stack* grpc_channel_get_channel_stack(grpc_channel* channel) { @@ -426,7 +436,8 @@ grpc_compression_options grpc_channel_compression_options( return channel->compression_options; } -grpc_mdelem grpc_channel_get_reffed_status_elem(grpc_channel* channel, int i) { +grpc_mdelem grpc_channel_get_reffed_status_elem(grpc_exec_ctx* exec_ctx, + grpc_channel* channel, int i) { char tmp[GPR_LTOA_MIN_BUFSIZE]; switch (i) { case 0: @@ -437,6 +448,6 @@ grpc_mdelem grpc_channel_get_reffed_status_elem(grpc_channel* channel, int i) { return GRPC_MDELEM_GRPC_STATUS_2; } gpr_ltoa(i, tmp); - return grpc_mdelem_from_slices(GRPC_MDSTR_GRPC_STATUS, + return grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_GRPC_STATUS, grpc_slice_from_copied_string(tmp)); } diff --git a/src/core/lib/surface/channel.h b/src/core/lib/surface/channel.h index 26d8fceb2f8..a2e53c777d6 100644 --- a/src/core/lib/surface/channel.h +++ b/src/core/lib/surface/channel.h @@ -23,13 +23,13 @@ #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/surface/channel_stack_type.h" -grpc_channel* grpc_channel_create(const char* target, +grpc_channel* grpc_channel_create(grpc_exec_ctx* exec_ctx, const char* target, const grpc_channel_args* args, grpc_channel_stack_type channel_stack_type, grpc_transport* optional_transport); grpc_channel* grpc_channel_create_with_builder( - grpc_channel_stack_builder* builder, + grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, grpc_channel_stack_type channel_stack_type); /** Create a call given a grpc_channel, in order to call \a method. @@ -41,9 +41,9 @@ grpc_channel* grpc_channel_create_with_builder( properties from the server call to this new client call, depending on the value of \a propagation_mask (see propagation_bits.h for possible values) */ grpc_call* grpc_channel_create_pollset_set_call( - grpc_channel* channel, grpc_call* parent_call, uint32_t propagation_mask, - grpc_pollset_set* pollset_set, grpc_slice method, const grpc_slice* host, - grpc_millis deadline, void* reserved); + grpc_exec_ctx* exec_ctx, grpc_channel* channel, grpc_call* parent_call, + uint32_t propagation_mask, grpc_pollset_set* pollset_set, grpc_slice method, + const grpc_slice* host, grpc_millis deadline, void* reserved); /** Get a (borrowed) pointer to this channels underlying channel stack */ grpc_channel_stack* grpc_channel_get_channel_stack(grpc_channel* channel); @@ -52,7 +52,8 @@ grpc_channel_stack* grpc_channel_get_channel_stack(grpc_channel* channel); status_code. The returned elem is owned by the caller. */ -grpc_mdelem grpc_channel_get_reffed_status_elem(grpc_channel* channel, +grpc_mdelem grpc_channel_get_reffed_status_elem(grpc_exec_ctx* exec_ctx, + grpc_channel* channel, int status_code); size_t grpc_channel_get_call_size_estimate(grpc_channel* channel); @@ -60,18 +61,20 @@ void grpc_channel_update_call_size_estimate(grpc_channel* channel, size_t size); #ifndef NDEBUG void grpc_channel_internal_ref(grpc_channel* channel, const char* reason); -void grpc_channel_internal_unref(grpc_channel* channel, const char* reason); +void grpc_channel_internal_unref(grpc_exec_ctx* exec_ctx, grpc_channel* channel, + const char* reason); #define GRPC_CHANNEL_INTERNAL_REF(channel, reason) \ grpc_channel_internal_ref(channel, reason) -#define GRPC_CHANNEL_INTERNAL_UNREF(channel, reason) \ - grpc_channel_internal_unref(channel, reason) +#define GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, channel, reason) \ + grpc_channel_internal_unref(exec_ctx, channel, reason) #else void grpc_channel_internal_ref(grpc_channel* channel); -void grpc_channel_internal_unref(grpc_channel* channel); +void grpc_channel_internal_unref(grpc_exec_ctx* exec_ctx, + grpc_channel* channel); #define GRPC_CHANNEL_INTERNAL_REF(channel, reason) \ grpc_channel_internal_ref(channel) -#define GRPC_CHANNEL_INTERNAL_UNREF(channel, reason) \ - grpc_channel_internal_unref(channel) +#define GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, channel, reason) \ + grpc_channel_internal_unref(exec_ctx, channel) #endif /** Return the channel's compression options. */ diff --git a/src/core/lib/surface/channel_init.cc b/src/core/lib/surface/channel_init.cc index 95cbbbd037f..b563537f357 100644 --- a/src/core/lib/surface/channel_init.cc +++ b/src/core/lib/surface/channel_init.cc @@ -89,7 +89,8 @@ void grpc_channel_init_shutdown(void) { } } -bool grpc_channel_init_create_stack(grpc_channel_stack_builder* builder, +bool grpc_channel_init_create_stack(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, grpc_channel_stack_type type) { GPR_ASSERT(g_finalized); @@ -98,7 +99,7 @@ bool grpc_channel_init_create_stack(grpc_channel_stack_builder* builder, for (size_t i = 0; i < g_slots[type].num_slots; i++) { const stage_slot* slot = &g_slots[type].slots[i]; - if (!slot->fn(builder, slot->arg)) { + if (!slot->fn(exec_ctx, builder, slot->arg)) { return false; } } diff --git a/src/core/lib/surface/channel_init.h b/src/core/lib/surface/channel_init.h index d702f0f325c..556ecc4147e 100644 --- a/src/core/lib/surface/channel_init.h +++ b/src/core/lib/surface/channel_init.h @@ -32,7 +32,8 @@ /// One stage of mutation: call functions against \a builder to influence the /// finally constructed channel stack -typedef bool (*grpc_channel_init_stage)(grpc_channel_stack_builder* builder, +typedef bool (*grpc_channel_init_stage)(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, void* arg); /// Global initialization of the system @@ -65,7 +66,8 @@ void grpc_channel_init_shutdown(void); /// \a optional_transport is either NULL or a constructed transport object /// Returns a pointer to the base of the memory allocated (the actual channel /// stack object will be prefix_bytes past that pointer) -bool grpc_channel_init_create_stack(grpc_channel_stack_builder* builder, +bool grpc_channel_init_create_stack(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, grpc_channel_stack_type type); #endif /* GRPC_CORE_LIB_SURFACE_CHANNEL_INIT_H */ diff --git a/src/core/lib/surface/channel_ping.cc b/src/core/lib/surface/channel_ping.cc index 616ba9e0ac5..e8f47f01cf4 100644 --- a/src/core/lib/surface/channel_ping.cc +++ b/src/core/lib/surface/channel_ping.cc @@ -33,14 +33,15 @@ typedef struct { grpc_cq_completion completion_storage; } ping_result; -static void ping_destroy(void* arg, grpc_cq_completion* storage) { +static void ping_destroy(grpc_exec_ctx* exec_ctx, void* arg, + grpc_cq_completion* storage) { gpr_free(arg); } -static void ping_done(void* arg, grpc_error* error) { +static void ping_done(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { ping_result* pr = (ping_result*)arg; - grpc_cq_end_op(pr->cq, pr->tag, GRPC_ERROR_REF(error), ping_destroy, pr, - &pr->completion_storage); + grpc_cq_end_op(exec_ctx, pr->cq, pr->tag, GRPC_ERROR_REF(error), ping_destroy, + pr, &pr->completion_storage); } void grpc_channel_ping(grpc_channel* channel, grpc_completion_queue* cq, @@ -51,7 +52,7 @@ void grpc_channel_ping(grpc_channel* channel, grpc_completion_queue* cq, ping_result* pr = (ping_result*)gpr_malloc(sizeof(*pr)); grpc_channel_element* top_elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GPR_ASSERT(reserved == nullptr); pr->tag = tag; pr->cq = cq; @@ -59,5 +60,6 @@ void grpc_channel_ping(grpc_channel* channel, grpc_completion_queue* cq, op->send_ping = &pr->closure; op->bind_pollset = grpc_cq_pollset(cq); GPR_ASSERT(grpc_cq_begin_op(cq, tag)); - top_elem->filter->start_transport_op(top_elem, op); + top_elem->filter->start_transport_op(&exec_ctx, top_elem, op); + grpc_exec_ctx_finish(&exec_ctx); } diff --git a/src/core/lib/surface/completion_queue.cc b/src/core/lib/surface/completion_queue.cc index 12385b71304..98d7e359437 100644 --- a/src/core/lib/surface/completion_queue.cc +++ b/src/core/lib/surface/completion_queue.cc @@ -62,12 +62,13 @@ typedef struct { bool can_listen; size_t (*size)(void); void (*init)(grpc_pollset* pollset, gpr_mu** mu); - grpc_error* (*kick)(grpc_pollset* pollset, + grpc_error* (*kick)(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, grpc_pollset_worker* specific_worker); - grpc_error* (*work)(grpc_pollset* pollset, grpc_pollset_worker** worker, - grpc_millis deadline); - void (*shutdown)(grpc_pollset* pollset, grpc_closure* closure); - void (*destroy)(grpc_pollset* pollset); + grpc_error* (*work)(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_pollset_worker** worker, grpc_millis deadline); + void (*shutdown)(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_closure* closure); + void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset); } cq_poller_vtable; typedef struct non_polling_worker { @@ -93,12 +94,14 @@ static void non_polling_poller_init(grpc_pollset* pollset, gpr_mu** mu) { *mu = &npp->mu; } -static void non_polling_poller_destroy(grpc_pollset* pollset) { +static void non_polling_poller_destroy(grpc_exec_ctx* exec_ctx, + grpc_pollset* pollset) { non_polling_poller* npp = (non_polling_poller*)pollset; gpr_mu_destroy(&npp->mu); } -static grpc_error* non_polling_poller_work(grpc_pollset* pollset, +static grpc_error* non_polling_poller_work(grpc_exec_ctx* exec_ctx, + grpc_pollset* pollset, grpc_pollset_worker** worker, grpc_millis deadline) { non_polling_poller* npp = (non_polling_poller*)pollset; @@ -119,12 +122,12 @@ static grpc_error* non_polling_poller_work(grpc_pollset* pollset, while (!npp->shutdown && !w.kicked && !gpr_cv_wait(&w.cv, &npp->mu, deadline_ts)) ; - grpc_core::ExecCtx::Get()->InvalidateNow(); + grpc_exec_ctx_invalidate_now(exec_ctx); if (&w == npp->root) { npp->root = w.next; if (&w == npp->root) { if (npp->shutdown) { - GRPC_CLOSURE_SCHED(npp->shutdown, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, npp->shutdown, GRPC_ERROR_NONE); } npp->root = nullptr; } @@ -137,7 +140,8 @@ static grpc_error* non_polling_poller_work(grpc_pollset* pollset, } static grpc_error* non_polling_poller_kick( - grpc_pollset* pollset, grpc_pollset_worker* specific_worker) { + grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_pollset_worker* specific_worker) { non_polling_poller* p = (non_polling_poller*)pollset; if (specific_worker == nullptr) specific_worker = (grpc_pollset_worker*)p->root; @@ -151,13 +155,14 @@ static grpc_error* non_polling_poller_kick( return GRPC_ERROR_NONE; } -static void non_polling_poller_shutdown(grpc_pollset* pollset, +static void non_polling_poller_shutdown(grpc_exec_ctx* exec_ctx, + grpc_pollset* pollset, grpc_closure* closure) { non_polling_poller* p = (non_polling_poller*)pollset; GPR_ASSERT(closure != nullptr); p->shutdown = closure; if (p->root == nullptr) { - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); } else { non_polling_worker* w = p->root; do { @@ -184,11 +189,13 @@ typedef struct cq_vtable { grpc_cq_completion_type cq_completion_type; size_t data_size; void (*init)(void* data); - void (*shutdown)(grpc_completion_queue* cq); + void (*shutdown)(grpc_exec_ctx* exec_ctx, grpc_completion_queue* cq); void (*destroy)(void* data); bool (*begin_op)(grpc_completion_queue* cq, void* tag); - void (*end_op)(grpc_completion_queue* cq, void* tag, grpc_error* error, - void (*done)(void* done_arg, grpc_cq_completion* storage), + void (*end_op)(grpc_exec_ctx* exec_ctx, grpc_completion_queue* cq, void* tag, + grpc_error* error, + void (*done)(grpc_exec_ctx* exec_ctx, void* done_arg, + grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage); grpc_event (*next)(grpc_completion_queue* cq, gpr_timespec deadline, void* reserved); @@ -273,23 +280,31 @@ struct grpc_completion_queue { }; /* Forward declarations */ -static void cq_finish_shutdown_next(grpc_completion_queue* cq); -static void cq_finish_shutdown_pluck(grpc_completion_queue* cq); -static void cq_shutdown_next(grpc_completion_queue* cq); -static void cq_shutdown_pluck(grpc_completion_queue* cq); +static void cq_finish_shutdown_next(grpc_exec_ctx* exec_ctx, + grpc_completion_queue* cq); +static void cq_finish_shutdown_pluck(grpc_exec_ctx* exec_ctx, + grpc_completion_queue* cq); +static void cq_shutdown_next(grpc_exec_ctx* exec_ctx, + grpc_completion_queue* cq); +static void cq_shutdown_pluck(grpc_exec_ctx* exec_ctx, + grpc_completion_queue* cq); static bool cq_begin_op_for_next(grpc_completion_queue* cq, void* tag); static bool cq_begin_op_for_pluck(grpc_completion_queue* cq, void* tag); -static void cq_end_op_for_next(grpc_completion_queue* cq, void* tag, +static void cq_end_op_for_next(grpc_exec_ctx* exec_ctx, + grpc_completion_queue* cq, void* tag, grpc_error* error, - void (*done)(void* done_arg, + void (*done)(grpc_exec_ctx* exec_ctx, + void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage); -static void cq_end_op_for_pluck(grpc_completion_queue* cq, void* tag, +static void cq_end_op_for_pluck(grpc_exec_ctx* exec_ctx, + grpc_completion_queue* cq, void* tag, grpc_error* error, - void (*done)(void* done_arg, + void (*done)(grpc_exec_ctx* exec_ctx, + void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage); @@ -331,7 +346,8 @@ grpc_core::TraceFlag grpc_cq_event_timeout_trace(true, "queue_timeout"); gpr_free(_ev); \ } -static void on_pollset_shutdown_done(void* cq, grpc_error* error); +static void on_pollset_shutdown_done(grpc_exec_ctx* exec_ctx, void* cq, + grpc_error* error); void grpc_cq_global_init() { gpr_tls_init(&g_cached_event); @@ -353,18 +369,19 @@ int grpc_completion_queue_thread_local_cache_flush(grpc_completion_queue* cq, if (storage != nullptr && (grpc_completion_queue*)gpr_tls_get(&g_cached_cq) == cq) { *tag = storage->tag; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; *ok = (storage->next & (uintptr_t)(1)) == 1; - storage->done(storage->done_arg, storage); + storage->done(&exec_ctx, storage->done_arg, storage); ret = 1; cq_next_data* cqd = (cq_next_data*)DATA_FROM_CQ(cq); if (gpr_atm_full_fetch_add(&cqd->pending_events, -1) == 1) { GRPC_CQ_INTERNAL_REF(cq, "shutting_down"); gpr_mu_lock(cq->mu); - cq_finish_shutdown_next(cq); + cq_finish_shutdown_next(&exec_ctx, cq); gpr_mu_unlock(cq->mu); - GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down"); + GRPC_CQ_INTERNAL_UNREF(&exec_ctx, cq, "shutting_down"); } + grpc_exec_ctx_finish(&exec_ctx); } gpr_tls_set(&g_cached_event, (intptr_t)0); gpr_tls_set(&g_cached_cq, (intptr_t)0); @@ -389,22 +406,24 @@ static bool cq_event_queue_push(grpc_cq_event_queue* q, grpc_cq_completion* c) { static grpc_cq_completion* cq_event_queue_pop(grpc_cq_event_queue* q) { grpc_cq_completion* c = nullptr; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; if (gpr_spinlock_trylock(&q->queue_lock)) { - GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_SUCCESSES(); + GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_SUCCESSES(&exec_ctx); bool is_empty = false; c = (grpc_cq_completion*)gpr_mpscq_pop_and_check_end(&q->queue, &is_empty); gpr_spinlock_unlock(&q->queue_lock); if (c == nullptr && !is_empty) { - GRPC_STATS_INC_CQ_EV_QUEUE_TRANSIENT_POP_FAILURES(); + GRPC_STATS_INC_CQ_EV_QUEUE_TRANSIENT_POP_FAILURES(&exec_ctx); } } else { - GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_FAILURES(); + GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_FAILURES(&exec_ctx); } + grpc_exec_ctx_finish(&exec_ctx); + if (c) { gpr_atm_no_barrier_fetch_add(&q->num_queue_items, -1); } @@ -434,8 +453,9 @@ grpc_completion_queue* grpc_completion_queue_create_internal( const cq_poller_vtable* poller_vtable = &g_poller_vtable_by_poller_type[polling_type]; - grpc_core::ExecCtx exec_ctx; - GRPC_STATS_INC_CQS_CREATED(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_STATS_INC_CQS_CREATED(&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); cq = (grpc_completion_queue*)gpr_zalloc(sizeof(grpc_completion_queue) + vtable->data_size + @@ -517,14 +537,15 @@ void grpc_cq_internal_ref(grpc_completion_queue* cq) { gpr_ref(&cq->owning_refs); } -static void on_pollset_shutdown_done(void* arg, grpc_error* error) { +static void on_pollset_shutdown_done(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_completion_queue* cq = (grpc_completion_queue*)arg; - GRPC_CQ_INTERNAL_UNREF(cq, "pollset_destroy"); + GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "pollset_destroy"); } #ifndef NDEBUG -void grpc_cq_internal_unref(grpc_completion_queue* cq, const char* reason, - const char* file, int line) { +void grpc_cq_internal_unref(grpc_exec_ctx* exec_ctx, grpc_completion_queue* cq, + const char* reason, const char* file, int line) { if (grpc_trace_cq_refcount.enabled()) { gpr_atm val = gpr_atm_no_barrier_load(&cq->owning_refs.count); gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, @@ -532,11 +553,12 @@ void grpc_cq_internal_unref(grpc_completion_queue* cq, const char* reason, reason); } #else -void grpc_cq_internal_unref(grpc_completion_queue* cq) { +void grpc_cq_internal_unref(grpc_exec_ctx* exec_ctx, + grpc_completion_queue* cq) { #endif if (gpr_unref(&cq->owning_refs)) { cq->vtable->destroy(DATA_FROM_CQ(cq)); - cq->poller_vtable->destroy(POLLSET_FROM_CQ(cq)); + cq->poller_vtable->destroy(exec_ctx, POLLSET_FROM_CQ(cq)); #ifndef NDEBUG gpr_free(cq->outstanding_tags); #endif @@ -617,9 +639,11 @@ bool grpc_cq_begin_op(grpc_completion_queue* cq, void* tag) { /* Queue a GRPC_OP_COMPLETED operation to a completion queue (with a * completion * type of GRPC_CQ_NEXT) */ -static void cq_end_op_for_next(grpc_completion_queue* cq, void* tag, +static void cq_end_op_for_next(grpc_exec_ctx* exec_ctx, + grpc_completion_queue* cq, void* tag, grpc_error* error, - void (*done)(void* done_arg, + void (*done)(grpc_exec_ctx* exec_ctx, + void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage) { GPR_TIMER_BEGIN("cq_end_op_for_next", 0); @@ -628,9 +652,9 @@ static void cq_end_op_for_next(grpc_completion_queue* cq, void* tag, (grpc_trace_operation_failures.enabled() && error != GRPC_ERROR_NONE)) { const char* errmsg = grpc_error_string(error); GRPC_API_TRACE( - "cq_end_op_for_next(cq=%p, tag=%p, error=%s, " + "cq_end_op_for_next(exec_ctx=%p, cq=%p, tag=%p, error=%s, " "done=%p, done_arg=%p, storage=%p)", - 6, (cq, tag, errmsg, done, done_arg, storage)); + 7, (exec_ctx, cq, tag, errmsg, done, done_arg, storage)); if (grpc_trace_operation_failures.enabled() && error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "Operation failed: tag=%p, error=%s", tag, errmsg); } @@ -665,7 +689,7 @@ static void cq_end_op_for_next(grpc_completion_queue* cq, void* tag, if (is_first) { gpr_mu_lock(cq->mu); grpc_error* kick_error = - cq->poller_vtable->kick(POLLSET_FROM_CQ(cq), nullptr); + cq->poller_vtable->kick(exec_ctx, POLLSET_FROM_CQ(cq), nullptr); gpr_mu_unlock(cq->mu); if (kick_error != GRPC_ERROR_NONE) { @@ -677,17 +701,17 @@ static void cq_end_op_for_next(grpc_completion_queue* cq, void* tag, if (gpr_atm_full_fetch_add(&cqd->pending_events, -1) == 1) { GRPC_CQ_INTERNAL_REF(cq, "shutting_down"); gpr_mu_lock(cq->mu); - cq_finish_shutdown_next(cq); + cq_finish_shutdown_next(exec_ctx, cq); gpr_mu_unlock(cq->mu); - GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down"); + GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "shutting_down"); } } else { GRPC_CQ_INTERNAL_REF(cq, "shutting_down"); gpr_atm_rel_store(&cqd->pending_events, 0); gpr_mu_lock(cq->mu); - cq_finish_shutdown_next(cq); + cq_finish_shutdown_next(exec_ctx, cq); gpr_mu_unlock(cq->mu); - GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down"); + GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "shutting_down"); } } @@ -699,9 +723,11 @@ static void cq_end_op_for_next(grpc_completion_queue* cq, void* tag, /* Queue a GRPC_OP_COMPLETED operation to a completion queue (with a * completion * type of GRPC_CQ_PLUCK) */ -static void cq_end_op_for_pluck(grpc_completion_queue* cq, void* tag, +static void cq_end_op_for_pluck(grpc_exec_ctx* exec_ctx, + grpc_completion_queue* cq, void* tag, grpc_error* error, - void (*done)(void* done_arg, + void (*done)(grpc_exec_ctx* exec_ctx, + void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage) { cq_pluck_data* cqd = (cq_pluck_data*)DATA_FROM_CQ(cq); @@ -713,9 +739,9 @@ static void cq_end_op_for_pluck(grpc_completion_queue* cq, void* tag, (grpc_trace_operation_failures.enabled() && error != GRPC_ERROR_NONE)) { const char* errmsg = grpc_error_string(error); GRPC_API_TRACE( - "cq_end_op_for_pluck(cq=%p, tag=%p, error=%s, " + "cq_end_op_for_pluck(exec_ctx=%p, cq=%p, tag=%p, error=%s, " "done=%p, done_arg=%p, storage=%p)", - 6, (cq, tag, errmsg, done, done_arg, storage)); + 7, (exec_ctx, cq, tag, errmsg, done, done_arg, storage)); if (grpc_trace_operation_failures.enabled() && error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "Operation failed: tag=%p, error=%s", tag, errmsg); } @@ -736,7 +762,7 @@ static void cq_end_op_for_pluck(grpc_completion_queue* cq, void* tag, cqd->completed_tail = storage; if (gpr_atm_full_fetch_add(&cqd->pending_events, -1) == 1) { - cq_finish_shutdown_pluck(cq); + cq_finish_shutdown_pluck(exec_ctx, cq); gpr_mu_unlock(cq->mu); } else { grpc_pollset_worker* pluck_worker = nullptr; @@ -748,7 +774,7 @@ static void cq_end_op_for_pluck(grpc_completion_queue* cq, void* tag, } grpc_error* kick_error = - cq->poller_vtable->kick(POLLSET_FROM_CQ(cq), pluck_worker); + cq->poller_vtable->kick(exec_ctx, POLLSET_FROM_CQ(cq), pluck_worker); gpr_mu_unlock(cq->mu); @@ -765,10 +791,12 @@ static void cq_end_op_for_pluck(grpc_completion_queue* cq, void* tag, GRPC_ERROR_UNREF(error); } -void grpc_cq_end_op(grpc_completion_queue* cq, void* tag, grpc_error* error, - void (*done)(void* done_arg, grpc_cq_completion* storage), +void grpc_cq_end_op(grpc_exec_ctx* exec_ctx, grpc_completion_queue* cq, + void* tag, grpc_error* error, + void (*done)(grpc_exec_ctx* exec_ctx, void* done_arg, + grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage) { - cq->vtable->end_op(cq, tag, error, done, done_arg, storage); + cq->vtable->end_op(exec_ctx, cq, tag, error, done, done_arg, storage); } typedef struct { @@ -780,40 +808,31 @@ typedef struct { bool first_loop; } cq_is_finished_arg; -class ExecCtxNext : public grpc_core::ExecCtx { - public: - ExecCtxNext(void* arg) : ExecCtx(0), check_ready_to_finish_arg_(arg) {} +static bool cq_is_next_finished(grpc_exec_ctx* exec_ctx, void* arg) { + cq_is_finished_arg* a = (cq_is_finished_arg*)arg; + grpc_completion_queue* cq = a->cq; + cq_next_data* cqd = (cq_next_data*)DATA_FROM_CQ(cq); + GPR_ASSERT(a->stolen_completion == nullptr); - bool CheckReadyToFinish() override { - cq_is_finished_arg* a = (cq_is_finished_arg*)check_ready_to_finish_arg_; - grpc_completion_queue* cq = a->cq; - cq_next_data* cqd = (cq_next_data*)DATA_FROM_CQ(cq); - GPR_ASSERT(a->stolen_completion == nullptr); + gpr_atm current_last_seen_things_queued_ever = + gpr_atm_no_barrier_load(&cqd->things_queued_ever); - gpr_atm current_last_seen_things_queued_ever = + if (current_last_seen_things_queued_ever != a->last_seen_things_queued_ever) { + a->last_seen_things_queued_ever = gpr_atm_no_barrier_load(&cqd->things_queued_ever); - if (current_last_seen_things_queued_ever != - a->last_seen_things_queued_ever) { - a->last_seen_things_queued_ever = - gpr_atm_no_barrier_load(&cqd->things_queued_ever); - - /* Pop a cq_completion from the queue. Returns NULL if the queue is empty - * might return NULL in some cases even if the queue is not empty; but - * that - * is ok and doesn't affect correctness. Might effect the tail latencies a - * bit) */ - a->stolen_completion = cq_event_queue_pop(&cqd->queue); - if (a->stolen_completion != nullptr) { - return true; - } + /* Pop a cq_completion from the queue. Returns NULL if the queue is empty + * might return NULL in some cases even if the queue is not empty; but + * that + * is ok and doesn't affect correctness. Might effect the tail latencies a + * bit) */ + a->stolen_completion = cq_event_queue_pop(&cqd->queue); + if (a->stolen_completion != nullptr) { + return true; } - return !a->first_loop && a->deadline < grpc_core::ExecCtx::Get()->Now(); } - - private: - void* check_ready_to_finish_arg_; -}; + return !a->first_loop && a->deadline < grpc_exec_ctx_now(exec_ctx); +} #ifndef NDEBUG static void dump_pending_tags(grpc_completion_queue* cq) { @@ -868,7 +887,8 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline, nullptr, nullptr, true}; - ExecCtxNext exec_ctx(&is_finished_arg); + grpc_exec_ctx exec_ctx = + GRPC_EXEC_CTX_INITIALIZER(0, cq_is_next_finished, &is_finished_arg); for (;;) { grpc_millis iteration_deadline = deadline_millis; @@ -878,7 +898,7 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline, ret.type = GRPC_OP_COMPLETE; ret.success = c->next & 1u; ret.tag = c->tag; - c->done(c->done_arg, c); + c->done(&exec_ctx, c->done_arg, c); break; } @@ -888,7 +908,7 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline, ret.type = GRPC_OP_COMPLETE; ret.success = c->next & 1u; ret.tag = c->tag; - c->done(c->done_arg, c); + c->done(&exec_ctx, c->done_arg, c); break; } else { /* If c == NULL it means either the queue is empty OR in an transient @@ -919,7 +939,7 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline, } if (!is_finished_arg.first_loop && - grpc_core::ExecCtx::Get()->Now() >= deadline_millis) { + grpc_exec_ctx_now(&exec_ctx) >= deadline_millis) { memset(&ret, 0, sizeof(ret)); ret.type = GRPC_QUEUE_TIMEOUT; dump_pending_tags(cq); @@ -929,8 +949,8 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline, /* The main polling work happens in grpc_pollset_work */ gpr_mu_lock(cq->mu); cq->num_polls++; - grpc_error* err = cq->poller_vtable->work(POLLSET_FROM_CQ(cq), nullptr, - iteration_deadline); + grpc_error* err = cq->poller_vtable->work(&exec_ctx, POLLSET_FROM_CQ(cq), + nullptr, iteration_deadline); gpr_mu_unlock(cq->mu); if (err != GRPC_ERROR_NONE) { @@ -949,13 +969,13 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline, if (cq_event_queue_num_items(&cqd->queue) > 0 && gpr_atm_acq_load(&cqd->pending_events) > 0) { gpr_mu_lock(cq->mu); - cq->poller_vtable->kick(POLLSET_FROM_CQ(cq), nullptr); + cq->poller_vtable->kick(&exec_ctx, POLLSET_FROM_CQ(cq), nullptr); gpr_mu_unlock(cq->mu); } GRPC_SURFACE_TRACE_RETURNED_EVENT(cq, &ret); - GRPC_CQ_INTERNAL_UNREF(cq, "next"); - + GRPC_CQ_INTERNAL_UNREF(&exec_ctx, cq, "next"); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(is_finished_arg.stolen_completion == nullptr); GPR_TIMER_END("grpc_completion_queue_next", 0); @@ -969,16 +989,19 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline, - Must be called only once in completion queue's lifetime - grpc_completion_queue_shutdown() MUST have been called before calling this function */ -static void cq_finish_shutdown_next(grpc_completion_queue* cq) { +static void cq_finish_shutdown_next(grpc_exec_ctx* exec_ctx, + grpc_completion_queue* cq) { cq_next_data* cqd = (cq_next_data*)DATA_FROM_CQ(cq); GPR_ASSERT(cqd->shutdown_called); GPR_ASSERT(gpr_atm_no_barrier_load(&cqd->pending_events) == 0); - cq->poller_vtable->shutdown(POLLSET_FROM_CQ(cq), &cq->pollset_shutdown_done); + cq->poller_vtable->shutdown(exec_ctx, POLLSET_FROM_CQ(cq), + &cq->pollset_shutdown_done); } -static void cq_shutdown_next(grpc_completion_queue* cq) { +static void cq_shutdown_next(grpc_exec_ctx* exec_ctx, + grpc_completion_queue* cq) { cq_next_data* cqd = (cq_next_data*)DATA_FROM_CQ(cq); /* Need an extra ref for cq here because: @@ -991,7 +1014,7 @@ static void cq_shutdown_next(grpc_completion_queue* cq) { gpr_mu_lock(cq->mu); if (cqd->shutdown_called) { gpr_mu_unlock(cq->mu); - GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down"); + GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "shutting_down"); return; } cqd->shutdown_called = true; @@ -999,10 +1022,10 @@ static void cq_shutdown_next(grpc_completion_queue* cq) { * cq_begin_op_for_next and and cq_end_op_for_next functions which read/write * on this counter without necessarily holding a lock on cq */ if (gpr_atm_full_fetch_add(&cqd->pending_events, -1) == 1) { - cq_finish_shutdown_next(cq); + cq_finish_shutdown_next(exec_ctx, cq); } gpr_mu_unlock(cq->mu); - GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down"); + GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "shutting_down"); } grpc_event grpc_completion_queue_next(grpc_completion_queue* cq, @@ -1035,46 +1058,37 @@ static void del_plucker(grpc_completion_queue* cq, void* tag, GPR_UNREACHABLE_CODE(return ); } -class ExecCtxPluck : public grpc_core::ExecCtx { - public: - ExecCtxPluck(void* arg) : ExecCtx(0), check_ready_to_finish_arg_(arg) {} - - bool CheckReadyToFinish() override { - cq_is_finished_arg* a = (cq_is_finished_arg*)check_ready_to_finish_arg_; - grpc_completion_queue* cq = a->cq; - cq_pluck_data* cqd = (cq_pluck_data*)DATA_FROM_CQ(cq); +static bool cq_is_pluck_finished(grpc_exec_ctx* exec_ctx, void* arg) { + cq_is_finished_arg* a = (cq_is_finished_arg*)arg; + grpc_completion_queue* cq = a->cq; + cq_pluck_data* cqd = (cq_pluck_data*)DATA_FROM_CQ(cq); - GPR_ASSERT(a->stolen_completion == nullptr); - gpr_atm current_last_seen_things_queued_ever = + GPR_ASSERT(a->stolen_completion == nullptr); + gpr_atm current_last_seen_things_queued_ever = + gpr_atm_no_barrier_load(&cqd->things_queued_ever); + if (current_last_seen_things_queued_ever != a->last_seen_things_queued_ever) { + gpr_mu_lock(cq->mu); + a->last_seen_things_queued_ever = gpr_atm_no_barrier_load(&cqd->things_queued_ever); - if (current_last_seen_things_queued_ever != - a->last_seen_things_queued_ever) { - gpr_mu_lock(cq->mu); - a->last_seen_things_queued_ever = - gpr_atm_no_barrier_load(&cqd->things_queued_ever); - grpc_cq_completion* c; - grpc_cq_completion* prev = &cqd->completed_head; - while ((c = (grpc_cq_completion*)(prev->next & ~(uintptr_t)1)) != - &cqd->completed_head) { - if (c->tag == a->tag) { - prev->next = (prev->next & (uintptr_t)1) | (c->next & ~(uintptr_t)1); - if (c == cqd->completed_tail) { - cqd->completed_tail = prev; - } - gpr_mu_unlock(cq->mu); - a->stolen_completion = c; - return true; + grpc_cq_completion* c; + grpc_cq_completion* prev = &cqd->completed_head; + while ((c = (grpc_cq_completion*)(prev->next & ~(uintptr_t)1)) != + &cqd->completed_head) { + if (c->tag == a->tag) { + prev->next = (prev->next & (uintptr_t)1) | (c->next & ~(uintptr_t)1); + if (c == cqd->completed_tail) { + cqd->completed_tail = prev; } - prev = c; + gpr_mu_unlock(cq->mu); + a->stolen_completion = c; + return true; } - gpr_mu_unlock(cq->mu); + prev = c; } - return !a->first_loop && a->deadline < grpc_core::ExecCtx::Get()->Now(); + gpr_mu_unlock(cq->mu); } - - private: - void* check_ready_to_finish_arg_; -}; + return !a->first_loop && a->deadline < grpc_exec_ctx_now(exec_ctx); +} static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, gpr_timespec deadline, void* reserved) { @@ -1111,7 +1125,8 @@ static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, nullptr, tag, true}; - ExecCtxPluck exec_ctx(&is_finished_arg); + grpc_exec_ctx exec_ctx = + GRPC_EXEC_CTX_INITIALIZER(0, cq_is_pluck_finished, &is_finished_arg); for (;;) { if (is_finished_arg.stolen_completion != nullptr) { gpr_mu_unlock(cq->mu); @@ -1120,7 +1135,7 @@ static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, ret.type = GRPC_OP_COMPLETE; ret.success = c->next & 1u; ret.tag = c->tag; - c->done(c->done_arg, c); + c->done(&exec_ctx, c->done_arg, c); break; } prev = &cqd->completed_head; @@ -1135,7 +1150,7 @@ static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, ret.type = GRPC_OP_COMPLETE; ret.success = c->next & 1u; ret.tag = c->tag; - c->done(c->done_arg, c); + c->done(&exec_ctx, c->done_arg, c); goto done; } prev = c; @@ -1159,7 +1174,7 @@ static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, break; } if (!is_finished_arg.first_loop && - grpc_core::ExecCtx::Get()->Now() >= deadline_millis) { + grpc_exec_ctx_now(&exec_ctx) >= deadline_millis) { del_plucker(cq, tag, &worker); gpr_mu_unlock(cq->mu); memset(&ret, 0, sizeof(ret)); @@ -1168,8 +1183,8 @@ static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, break; } cq->num_polls++; - grpc_error* err = - cq->poller_vtable->work(POLLSET_FROM_CQ(cq), &worker, deadline_millis); + grpc_error* err = cq->poller_vtable->work(&exec_ctx, POLLSET_FROM_CQ(cq), + &worker, deadline_millis); if (err != GRPC_ERROR_NONE) { del_plucker(cq, tag, &worker); gpr_mu_unlock(cq->mu); @@ -1187,8 +1202,8 @@ static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, } done: GRPC_SURFACE_TRACE_RETURNED_EVENT(cq, &ret); - GRPC_CQ_INTERNAL_UNREF(cq, "pluck"); - + GRPC_CQ_INTERNAL_UNREF(&exec_ctx, cq, "pluck"); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(is_finished_arg.stolen_completion == nullptr); GPR_TIMER_END("grpc_completion_queue_pluck", 0); @@ -1201,19 +1216,22 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue* cq, void* tag, return cq->vtable->pluck(cq, tag, deadline, reserved); } -static void cq_finish_shutdown_pluck(grpc_completion_queue* cq) { +static void cq_finish_shutdown_pluck(grpc_exec_ctx* exec_ctx, + grpc_completion_queue* cq) { cq_pluck_data* cqd = (cq_pluck_data*)DATA_FROM_CQ(cq); GPR_ASSERT(cqd->shutdown_called); GPR_ASSERT(!gpr_atm_no_barrier_load(&cqd->shutdown)); gpr_atm_no_barrier_store(&cqd->shutdown, 1); - cq->poller_vtable->shutdown(POLLSET_FROM_CQ(cq), &cq->pollset_shutdown_done); + cq->poller_vtable->shutdown(exec_ctx, POLLSET_FROM_CQ(cq), + &cq->pollset_shutdown_done); } /* NOTE: This function is almost exactly identical to cq_shutdown_next() but * merging them is a bit tricky and probably not worth it */ -static void cq_shutdown_pluck(grpc_completion_queue* cq) { +static void cq_shutdown_pluck(grpc_exec_ctx* exec_ctx, + grpc_completion_queue* cq) { cq_pluck_data* cqd = (cq_pluck_data*)DATA_FROM_CQ(cq); /* Need an extra ref for cq here because: @@ -1226,25 +1244,25 @@ static void cq_shutdown_pluck(grpc_completion_queue* cq) { gpr_mu_lock(cq->mu); if (cqd->shutdown_called) { gpr_mu_unlock(cq->mu); - GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down (pluck cq)"); + GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "shutting_down (pluck cq)"); return; } cqd->shutdown_called = true; if (gpr_atm_full_fetch_add(&cqd->pending_events, -1) == 1) { - cq_finish_shutdown_pluck(cq); + cq_finish_shutdown_pluck(exec_ctx, cq); } gpr_mu_unlock(cq->mu); - GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down (pluck cq)"); + GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "shutting_down (pluck cq)"); } /* Shutdown simply drops a ref that we reserved at creation time; if we drop to zero here, then enter shutdown mode and wake up any waiters */ void grpc_completion_queue_shutdown(grpc_completion_queue* cq) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GPR_TIMER_BEGIN("grpc_completion_queue_shutdown", 0); GRPC_API_TRACE("grpc_completion_queue_shutdown(cq=%p)", 1, (cq)); - cq->vtable->shutdown(cq); - + cq->vtable->shutdown(&exec_ctx, cq); + grpc_exec_ctx_finish(&exec_ctx); GPR_TIMER_END("grpc_completion_queue_shutdown", 0); } @@ -1253,9 +1271,9 @@ void grpc_completion_queue_destroy(grpc_completion_queue* cq) { GPR_TIMER_BEGIN("grpc_completion_queue_destroy", 0); grpc_completion_queue_shutdown(cq); - grpc_core::ExecCtx exec_ctx; - GRPC_CQ_INTERNAL_UNREF(cq, "destroy"); - + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_CQ_INTERNAL_UNREF(&exec_ctx, cq, "destroy"); + grpc_exec_ctx_finish(&exec_ctx); GPR_TIMER_END("grpc_completion_queue_destroy", 0); } diff --git a/src/core/lib/surface/completion_queue.h b/src/core/lib/surface/completion_queue.h index aea47afaf52..13d3e5807df 100644 --- a/src/core/lib/surface/completion_queue.h +++ b/src/core/lib/surface/completion_queue.h @@ -40,7 +40,8 @@ typedef struct grpc_cq_completion { void* tag; /** done callback - called when this queue element is no longer needed by the completion queue */ - void (*done)(void* done_arg, struct grpc_cq_completion* c); + void (*done)(grpc_exec_ctx* exec_ctx, void* done_arg, + struct grpc_cq_completion* c); void* done_arg; /** next pointer; low bit is used to indicate success or not */ uintptr_t next; @@ -49,17 +50,17 @@ typedef struct grpc_cq_completion { #ifndef NDEBUG void grpc_cq_internal_ref(grpc_completion_queue* cc, const char* reason, const char* file, int line); -void grpc_cq_internal_unref(grpc_completion_queue* cc, const char* reason, - const char* file, int line); +void grpc_cq_internal_unref(grpc_exec_ctx* exec_ctx, grpc_completion_queue* cc, + const char* reason, const char* file, int line); #define GRPC_CQ_INTERNAL_REF(cc, reason) \ grpc_cq_internal_ref(cc, reason, __FILE__, __LINE__) -#define GRPC_CQ_INTERNAL_UNREF(cc, reason) \ - grpc_cq_internal_unref(cc, reason, __FILE__, __LINE__) +#define GRPC_CQ_INTERNAL_UNREF(ec, cc, reason) \ + grpc_cq_internal_unref(ec, cc, reason, __FILE__, __LINE__) #else void grpc_cq_internal_ref(grpc_completion_queue* cc); -void grpc_cq_internal_unref(grpc_completion_queue* cc); +void grpc_cq_internal_unref(grpc_exec_ctx* exec_ctx, grpc_completion_queue* cc); #define GRPC_CQ_INTERNAL_REF(cc, reason) grpc_cq_internal_ref(cc) -#define GRPC_CQ_INTERNAL_UNREF(cc, reason) grpc_cq_internal_unref(cc) +#define GRPC_CQ_INTERNAL_UNREF(ec, cc, reason) grpc_cq_internal_unref(ec, cc) #endif /* Initializes global variables used by completion queues */ @@ -73,8 +74,10 @@ bool grpc_cq_begin_op(grpc_completion_queue* cc, void* tag); /* Queue a GRPC_OP_COMPLETED operation; tag must correspond to the tag passed to grpc_cq_begin_op */ -void grpc_cq_end_op(grpc_completion_queue* cc, void* tag, grpc_error* error, - void (*done)(void* done_arg, grpc_cq_completion* storage), +void grpc_cq_end_op(grpc_exec_ctx* exec_ctx, grpc_completion_queue* cc, + void* tag, grpc_error* error, + void (*done)(grpc_exec_ctx* exec_ctx, void* done_arg, + grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage); grpc_pollset* grpc_cq_pollset(grpc_completion_queue* cc); diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index c6ce235da7f..8ee1383fb8b 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -73,12 +73,14 @@ static void do_basic_init(void) { grpc_fork_handlers_auto_register(); } -static bool append_filter(grpc_channel_stack_builder* builder, void* arg) { +static bool append_filter(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, void* arg) { return grpc_channel_stack_builder_append_filter( builder, (const grpc_channel_filter*)arg, nullptr, nullptr); } -static bool prepend_filter(grpc_channel_stack_builder* builder, void* arg) { +static bool prepend_filter(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, void* arg) { return grpc_channel_stack_builder_prepend_filter( builder, (const grpc_channel_filter*)arg, nullptr, nullptr); } @@ -121,6 +123,7 @@ void grpc_init(void) { int i; gpr_once_init(&g_basic_init, do_basic_init); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_mu_lock(&g_init_mu); if (++g_initializations == 1) { gpr_time_init(); @@ -130,8 +133,7 @@ void grpc_init(void) { grpc_mdctx_global_init(); grpc_channel_init_init(); grpc_security_pre_init(); - grpc_core::ExecCtx::GlobalInit(); - grpc_iomgr_init(); + grpc_iomgr_init(&exec_ctx); gpr_timers_global_init(); grpc_handshaker_factory_registry_init(); grpc_security_init(); @@ -147,44 +149,37 @@ void grpc_init(void) { grpc_tracer_init("GRPC_TRACE"); /* no more changes to channel init pipelines */ grpc_channel_init_finalize(); - grpc_iomgr_start(); + grpc_iomgr_start(&exec_ctx); } gpr_mu_unlock(&g_init_mu); - + grpc_exec_ctx_finish(&exec_ctx); GRPC_API_TRACE("grpc_init(void)", 0, ()); } void grpc_shutdown(void) { int i; GRPC_API_TRACE("grpc_shutdown(void)", 0, ()); - if (grpc_core::ExecCtx::Get()) { - grpc_core::ExecCtx::Get()->Flush(); - } + grpc_exec_ctx exec_ctx = + GRPC_EXEC_CTX_INITIALIZER(0, grpc_never_ready_to_finish, nullptr); gpr_mu_lock(&g_init_mu); if (--g_initializations == 0) { - { - grpc_core::ExecCtx exec_ctx(0); - { - grpc_executor_shutdown(); - grpc_timer_manager_set_threading( - false); // shutdown timer_manager thread - for (i = g_number_of_plugins; i >= 0; i--) { - if (g_all_of_the_plugins[i].destroy != nullptr) { - g_all_of_the_plugins[i].destroy(); - } - } + grpc_executor_shutdown(&exec_ctx); + grpc_timer_manager_set_threading(false); // shutdown timer_manager thread + for (i = g_number_of_plugins; i >= 0; i--) { + if (g_all_of_the_plugins[i].destroy != nullptr) { + g_all_of_the_plugins[i].destroy(); } - grpc_iomgr_shutdown(); - gpr_timers_global_destroy(); - grpc_tracer_shutdown(); - grpc_mdctx_global_shutdown(); - grpc_handshaker_factory_registry_shutdown(); - grpc_slice_intern_shutdown(); - grpc_stats_shutdown(); } - grpc_core::ExecCtx::GlobalShutdown(); + grpc_iomgr_shutdown(&exec_ctx); + gpr_timers_global_destroy(); + grpc_tracer_shutdown(); + grpc_mdctx_global_shutdown(&exec_ctx); + grpc_handshaker_factory_registry_shutdown(&exec_ctx); + grpc_slice_intern_shutdown(); + grpc_stats_shutdown(); } gpr_mu_unlock(&g_init_mu); + grpc_exec_ctx_finish(&exec_ctx); } int grpc_is_initialized(void) { diff --git a/src/core/lib/surface/init_secure.cc b/src/core/lib/surface/init_secure.cc index 75ed9faef06..3eee570fc26 100644 --- a/src/core/lib/surface/init_secure.cc +++ b/src/core/lib/surface/init_secure.cc @@ -37,7 +37,7 @@ void grpc_security_pre_init(void) {} static bool maybe_prepend_client_auth_filter( - grpc_channel_stack_builder* builder, void* arg) { + grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, void* arg) { const grpc_channel_args* args = grpc_channel_stack_builder_get_channel_arguments(builder); if (args) { @@ -52,7 +52,7 @@ static bool maybe_prepend_client_auth_filter( } static bool maybe_prepend_server_auth_filter( - grpc_channel_stack_builder* builder, void* arg) { + grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, void* arg) { const grpc_channel_args* args = grpc_channel_stack_builder_get_channel_arguments(builder); if (args) { diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index 29b4e3f0c70..c32c9af50e5 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/src/core/lib/surface/lame_client.cc @@ -49,7 +49,8 @@ struct ChannelData { const char* error_message; }; -static void fill_metadata(grpc_call_element* elem, grpc_metadata_batch* mdb) { +static void fill_metadata(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_metadata_batch* mdb) { CallData* calld = reinterpret_cast(elem->call_data); bool expected = false; if (!calld->filled_metadata.compare_exchange_strong( @@ -61,9 +62,9 @@ static void fill_metadata(grpc_call_element* elem, grpc_metadata_batch* mdb) { char tmp[GPR_LTOA_MIN_BUFSIZE]; gpr_ltoa(chand->error_code, tmp); calld->status.md = grpc_mdelem_from_slices( - GRPC_MDSTR_GRPC_STATUS, grpc_slice_from_copied_string(tmp)); + exec_ctx, GRPC_MDSTR_GRPC_STATUS, grpc_slice_from_copied_string(tmp)); calld->details.md = grpc_mdelem_from_slices( - GRPC_MDSTR_GRPC_MESSAGE, + exec_ctx, GRPC_MDSTR_GRPC_MESSAGE, grpc_slice_from_copied_string(chand->error_message)); calld->status.prev = calld->details.next = nullptr; calld->status.next = &calld->details; @@ -75,61 +76,69 @@ static void fill_metadata(grpc_call_element* elem, grpc_metadata_batch* mdb) { } static void lame_start_transport_stream_op_batch( - grpc_call_element* elem, grpc_transport_stream_op_batch* op) { + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_transport_stream_op_batch* op) { CallData* calld = reinterpret_cast(elem->call_data); if (op->recv_initial_metadata) { - fill_metadata(elem, + fill_metadata(exec_ctx, elem, op->payload->recv_initial_metadata.recv_initial_metadata); } else if (op->recv_trailing_metadata) { - fill_metadata(elem, + fill_metadata(exec_ctx, elem, op->payload->recv_trailing_metadata.recv_trailing_metadata); } grpc_transport_stream_op_batch_finish_with_failure( - op, GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel"), + exec_ctx, op, GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel"), calld->call_combiner); } -static void lame_get_channel_info(grpc_channel_element* elem, +static void lame_get_channel_info(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, const grpc_channel_info* channel_info) {} -static void lame_start_transport_op(grpc_channel_element* elem, +static void lame_start_transport_op(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_transport_op* op) { if (op->on_connectivity_state_change) { GPR_ASSERT(*op->connectivity_state != GRPC_CHANNEL_SHUTDOWN); *op->connectivity_state = GRPC_CHANNEL_SHUTDOWN; - GRPC_CLOSURE_SCHED(op->on_connectivity_state_change, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, op->on_connectivity_state_change, + GRPC_ERROR_NONE); } if (op->send_ping != nullptr) { - GRPC_CLOSURE_SCHED(op->send_ping, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "lame client channel")); + GRPC_CLOSURE_SCHED( + exec_ctx, op->send_ping, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel")); } GRPC_ERROR_UNREF(op->disconnect_with_error); if (op->on_consumed != nullptr) { - GRPC_CLOSURE_SCHED(op->on_consumed, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, op->on_consumed, GRPC_ERROR_NONE); } } -static grpc_error* init_call_elem(grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { CallData* calld = reinterpret_cast(elem->call_data); calld->call_combiner = args->call_combiner; return GRPC_ERROR_NONE; } -static void destroy_call_elem(grpc_call_element* elem, +static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_schedule_closure) { - GRPC_CLOSURE_SCHED(then_schedule_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, then_schedule_closure, GRPC_ERROR_NONE); } -static grpc_error* init_channel_elem(grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { GPR_ASSERT(args->is_first); GPR_ASSERT(args->is_last); return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) {} } // namespace @@ -154,10 +163,10 @@ const grpc_channel_filter grpc_lame_filter = { grpc_channel* grpc_lame_client_channel_create(const char* target, grpc_status_code error_code, const char* error_message) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_channel_element* elem; - grpc_channel* channel = - grpc_channel_create(target, nullptr, GRPC_CLIENT_LAME_CHANNEL, nullptr); + grpc_channel* channel = grpc_channel_create( + &exec_ctx, target, nullptr, GRPC_CLIENT_LAME_CHANNEL, nullptr); elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); GRPC_API_TRACE( "grpc_lame_client_channel_create(target=%s, error_code=%d, " @@ -167,6 +176,6 @@ grpc_channel* grpc_lame_client_channel_create(const char* target, auto chand = reinterpret_cast(elem->channel_data); chand->error_code = error_code; chand->error_message = error_message; - + grpc_exec_ctx_finish(&exec_ctx); return channel; } diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc index 4f071831801..0f8a057f315 100644 --- a/src/core/lib/surface/server.cc +++ b/src/core/lib/surface/server.cc @@ -46,9 +46,10 @@ typedef struct listener { void* arg; - void (*start)(grpc_server* server, void* arg, grpc_pollset** pollsets, - size_t pollset_count); - void (*destroy)(grpc_server* server, void* arg, grpc_closure* closure); + void (*start)(grpc_exec_ctx* exec_ctx, grpc_server* server, void* arg, + grpc_pollset** pollsets, size_t pollset_count); + void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_server* server, void* arg, + grpc_closure* closure); struct listener* next; grpc_closure destroy_done; } listener; @@ -223,12 +224,13 @@ struct grpc_server { #define SERVER_FROM_CALL_ELEM(elem) \ (((channel_data*)(elem)->channel_data)->server) -static void publish_new_rpc(void* calld, grpc_error* error); -static void fail_call(grpc_server* server, size_t cq_idx, requested_call* rc, - grpc_error* error); +static void publish_new_rpc(grpc_exec_ctx* exec_ctx, void* calld, + grpc_error* error); +static void fail_call(grpc_exec_ctx* exec_ctx, grpc_server* server, + size_t cq_idx, requested_call* rc, grpc_error* error); /* Before calling maybe_finish_shutdown, we must hold mu_global and not hold mu_call */ -static void maybe_finish_shutdown(grpc_server* server); +static void maybe_finish_shutdown(grpc_exec_ctx* exec_ctx, grpc_server* server); /* * channel broadcaster @@ -256,14 +258,15 @@ struct shutdown_cleanup_args { grpc_slice slice; }; -static void shutdown_cleanup(void* arg, grpc_error* error) { +static void shutdown_cleanup(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { struct shutdown_cleanup_args* a = (struct shutdown_cleanup_args*)arg; - grpc_slice_unref_internal(a->slice); + grpc_slice_unref_internal(exec_ctx, a->slice); gpr_free(a); } -static void send_shutdown(grpc_channel* channel, bool send_goaway, - grpc_error* send_disconnect) { +static void send_shutdown(grpc_exec_ctx* exec_ctx, grpc_channel* channel, + bool send_goaway, grpc_error* send_disconnect) { struct shutdown_cleanup_args* sc = (struct shutdown_cleanup_args*)gpr_malloc(sizeof(*sc)); GRPC_CLOSURE_INIT(&sc->closure, shutdown_cleanup, sc, @@ -281,18 +284,19 @@ static void send_shutdown(grpc_channel* channel, bool send_goaway, op->disconnect_with_error = send_disconnect; elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); - elem->filter->start_transport_op(elem, op); + elem->filter->start_transport_op(exec_ctx, elem, op); } -static void channel_broadcaster_shutdown(channel_broadcaster* cb, +static void channel_broadcaster_shutdown(grpc_exec_ctx* exec_ctx, + channel_broadcaster* cb, bool send_goaway, grpc_error* force_disconnect) { size_t i; for (i = 0; i < cb->num_channels; i++) { - send_shutdown(cb->channels[i], send_goaway, + send_shutdown(exec_ctx, cb->channels[i], send_goaway, GRPC_ERROR_REF(force_disconnect)); - GRPC_CHANNEL_INTERNAL_UNREF(cb->channels[i], "broadcast"); + GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, cb->channels[i], "broadcast"); } gpr_free(cb->channels); GRPC_ERROR_UNREF(force_disconnect); @@ -320,11 +324,13 @@ static void request_matcher_destroy(request_matcher* rm) { gpr_free(rm->requests_per_cq); } -static void kill_zombie(void* elem, grpc_error* error) { +static void kill_zombie(grpc_exec_ctx* exec_ctx, void* elem, + grpc_error* error) { grpc_call_unref(grpc_call_from_top_element((grpc_call_element*)elem)); } -static void request_matcher_zombify_all_pending_calls(request_matcher* rm) { +static void request_matcher_zombify_all_pending_calls(grpc_exec_ctx* exec_ctx, + request_matcher* rm) { while (rm->pending_head) { call_data* calld = rm->pending_head; rm->pending_head = calld->pending_next; @@ -333,18 +339,19 @@ static void request_matcher_zombify_all_pending_calls(request_matcher* rm) { &calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0), grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(&calld->kill_zombie_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &calld->kill_zombie_closure, GRPC_ERROR_NONE); } } -static void request_matcher_kill_requests(grpc_server* server, +static void request_matcher_kill_requests(grpc_exec_ctx* exec_ctx, + grpc_server* server, request_matcher* rm, grpc_error* error) { requested_call* rc; for (size_t i = 0; i < server->cq_count; i++) { while ((rc = (requested_call*)gpr_locked_mpscq_pop( &rm->requests_per_cq[i])) != nullptr) { - fail_call(server, i, rc, GRPC_ERROR_REF(error)); + fail_call(exec_ctx, server, i, rc, GRPC_ERROR_REF(error)); } } GRPC_ERROR_UNREF(error); @@ -358,10 +365,10 @@ static void server_ref(grpc_server* server) { gpr_ref(&server->internal_refcount); } -static void server_delete(grpc_server* server) { +static void server_delete(grpc_exec_ctx* exec_ctx, grpc_server* server) { registered_method* rm; size_t i; - grpc_channel_args_destroy(server->channel_args); + grpc_channel_args_destroy(exec_ctx, server->channel_args); gpr_mu_destroy(&server->mu_global); gpr_mu_destroy(&server->mu_call); gpr_cv_destroy(&server->starting_cv); @@ -378,7 +385,7 @@ static void server_delete(grpc_server* server) { request_matcher_destroy(&server->unregistered_request_matcher); } for (i = 0; i < server->cq_count; i++) { - GRPC_CQ_INTERNAL_UNREF(server->cqs[i], "server"); + GRPC_CQ_INTERNAL_UNREF(exec_ctx, server->cqs[i], "server"); } gpr_free(server->cqs); gpr_free(server->pollsets); @@ -386,9 +393,9 @@ static void server_delete(grpc_server* server) { gpr_free(server); } -static void server_unref(grpc_server* server) { +static void server_unref(grpc_exec_ctx* exec_ctx, grpc_server* server) { if (gpr_unref(&server->internal_refcount)) { - server_delete(server); + server_delete(exec_ctx, server); } } @@ -402,19 +409,21 @@ static void orphan_channel(channel_data* chand) { chand->next = chand->prev = chand; } -static void finish_destroy_channel(void* cd, grpc_error* error) { +static void finish_destroy_channel(grpc_exec_ctx* exec_ctx, void* cd, + grpc_error* error) { channel_data* chand = (channel_data*)cd; grpc_server* server = chand->server; - GRPC_CHANNEL_INTERNAL_UNREF(chand->channel, "server"); - server_unref(server); + GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, chand->channel, "server"); + server_unref(exec_ctx, server); } -static void destroy_channel(channel_data* chand, grpc_error* error) { +static void destroy_channel(grpc_exec_ctx* exec_ctx, channel_data* chand, + grpc_error* error) { if (is_channel_orphaned(chand)) return; GPR_ASSERT(chand->server != nullptr); orphan_channel(chand); server_ref(chand->server); - maybe_finish_shutdown(chand->server); + maybe_finish_shutdown(exec_ctx, chand->server); GRPC_CLOSURE_INIT(&chand->finish_destroy_channel_closure, finish_destroy_channel, chand, grpc_schedule_on_exec_ctx); @@ -427,18 +436,20 @@ static void destroy_channel(channel_data* chand, grpc_error* error) { grpc_transport_op* op = grpc_make_transport_op(&chand->finish_destroy_channel_closure); op->set_accept_stream = true; - grpc_channel_next_op(grpc_channel_stack_element( + grpc_channel_next_op(exec_ctx, + grpc_channel_stack_element( grpc_channel_get_channel_stack(chand->channel), 0), op); } -static void done_request_event(void* req, grpc_cq_completion* c) { +static void done_request_event(grpc_exec_ctx* exec_ctx, void* req, + grpc_cq_completion* c) { gpr_free(req); } -static void publish_call(grpc_server* server, call_data* calld, size_t cq_idx, - requested_call* rc) { - grpc_call_set_completion_queue(calld->call, rc->cq_bound_to_call); +static void publish_call(grpc_exec_ctx* exec_ctx, grpc_server* server, + call_data* calld, size_t cq_idx, requested_call* rc) { + grpc_call_set_completion_queue(exec_ctx, calld->call, rc->cq_bound_to_call); grpc_call* call = calld->call; *rc->call = call; calld->cq_new = server->cqs[cq_idx]; @@ -465,11 +476,12 @@ static void publish_call(grpc_server* server, call_data* calld, size_t cq_idx, GPR_UNREACHABLE_CODE(return ); } - grpc_cq_end_op(calld->cq_new, rc->tag, GRPC_ERROR_NONE, done_request_event, - rc, &rc->completion); + grpc_cq_end_op(exec_ctx, calld->cq_new, rc->tag, GRPC_ERROR_NONE, + done_request_event, rc, &rc->completion); } -static void publish_new_rpc(void* arg, grpc_error* error) { +static void publish_new_rpc(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_call_element* call_elem = (grpc_call_element*)arg; call_data* calld = (call_data*)call_elem->call_data; channel_data* chand = (channel_data*)call_elem->channel_data; @@ -482,7 +494,8 @@ static void publish_new_rpc(void* arg, grpc_error* error) { &calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0), grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(&calld->kill_zombie_closure, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(exec_ctx, &calld->kill_zombie_closure, + GRPC_ERROR_REF(error)); return; } @@ -493,15 +506,15 @@ static void publish_new_rpc(void* arg, grpc_error* error) { if (rc == nullptr) { continue; } else { - GRPC_STATS_INC_SERVER_CQS_CHECKED(i); + GRPC_STATS_INC_SERVER_CQS_CHECKED(exec_ctx, i); gpr_atm_no_barrier_store(&calld->state, ACTIVATED); - publish_call(server, calld, cq_idx, rc); + publish_call(exec_ctx, server, calld, cq_idx, rc); return; /* early out */ } } /* no cq to take the request found: queue it on the slow list */ - GRPC_STATS_INC_SERVER_SLOWPATH_REQUESTS_QUEUED(); + GRPC_STATS_INC_SERVER_SLOWPATH_REQUESTS_QUEUED(exec_ctx); gpr_mu_lock(&server->mu_call); // We need to ensure that all the queues are empty. We do this under @@ -516,9 +529,9 @@ static void publish_new_rpc(void* arg, grpc_error* error) { continue; } else { gpr_mu_unlock(&server->mu_call); - GRPC_STATS_INC_SERVER_CQS_CHECKED(i + server->cq_count); + GRPC_STATS_INC_SERVER_CQS_CHECKED(exec_ctx, i + server->cq_count); gpr_atm_no_barrier_store(&calld->state, ACTIVATED); - publish_call(server, calld, cq_idx, rc); + publish_call(exec_ctx, server, calld, cq_idx, rc); return; /* early out */ } } @@ -535,7 +548,8 @@ static void publish_new_rpc(void* arg, grpc_error* error) { } static void finish_start_new_rpc( - grpc_server* server, grpc_call_element* elem, request_matcher* rm, + grpc_exec_ctx* exec_ctx, grpc_server* server, grpc_call_element* elem, + request_matcher* rm, grpc_server_register_method_payload_handling payload_handling) { call_data* calld = (call_data*)elem->call_data; @@ -543,7 +557,7 @@ static void finish_start_new_rpc( gpr_atm_no_barrier_store(&calld->state, ZOMBIED); GRPC_CLOSURE_INIT(&calld->kill_zombie_closure, kill_zombie, elem, grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(&calld->kill_zombie_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &calld->kill_zombie_closure, GRPC_ERROR_NONE); return; } @@ -551,7 +565,7 @@ static void finish_start_new_rpc( switch (payload_handling) { case GRPC_SRM_PAYLOAD_NONE: - publish_new_rpc(elem, GRPC_ERROR_NONE); + publish_new_rpc(exec_ctx, elem, GRPC_ERROR_NONE); break; case GRPC_SRM_PAYLOAD_READ_INITIAL_BYTE_BUFFER: { grpc_op op; @@ -560,13 +574,14 @@ static void finish_start_new_rpc( op.data.recv_message.recv_message = &calld->payload; GRPC_CLOSURE_INIT(&calld->publish, publish_new_rpc, elem, grpc_schedule_on_exec_ctx); - grpc_call_start_batch_and_execute(calld->call, &op, 1, &calld->publish); + grpc_call_start_batch_and_execute(exec_ctx, calld->call, &op, 1, + &calld->publish); break; } } } -static void start_new_rpc(grpc_call_element* elem) { +static void start_new_rpc(grpc_exec_ctx* exec_ctx, grpc_call_element* elem) { channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; grpc_server* server = chand->server; @@ -591,7 +606,8 @@ static void start_new_rpc(grpc_call_element* elem) { GRPC_INITIAL_METADATA_IDEMPOTENT_REQUEST)) { continue; } - finish_start_new_rpc(server, elem, &rm->server_registered_method->matcher, + finish_start_new_rpc(exec_ctx, server, elem, + &rm->server_registered_method->matcher, rm->server_registered_method->payload_handling); return; } @@ -608,12 +624,14 @@ static void start_new_rpc(grpc_call_element* elem) { GRPC_INITIAL_METADATA_IDEMPOTENT_REQUEST)) { continue; } - finish_start_new_rpc(server, elem, &rm->server_registered_method->matcher, + finish_start_new_rpc(exec_ctx, server, elem, + &rm->server_registered_method->matcher, rm->server_registered_method->payload_handling); return; } } - finish_start_new_rpc(server, elem, &server->unregistered_request_matcher, + finish_start_new_rpc(exec_ctx, server, elem, + &server->unregistered_request_matcher, GRPC_SRM_PAYLOAD_NONE); } @@ -626,8 +644,9 @@ static int num_listeners(grpc_server* server) { return n; } -static void done_shutdown_event(void* server, grpc_cq_completion* completion) { - server_unref((grpc_server*)server); +static void done_shutdown_event(grpc_exec_ctx* exec_ctx, void* server, + grpc_cq_completion* completion) { + server_unref(exec_ctx, (grpc_server*)server); } static int num_channels(grpc_server* server) { @@ -640,30 +659,34 @@ static int num_channels(grpc_server* server) { return n; } -static void kill_pending_work_locked(grpc_server* server, grpc_error* error) { +static void kill_pending_work_locked(grpc_exec_ctx* exec_ctx, + grpc_server* server, grpc_error* error) { if (server->started) { - request_matcher_kill_requests(server, &server->unregistered_request_matcher, + request_matcher_kill_requests(exec_ctx, server, + &server->unregistered_request_matcher, GRPC_ERROR_REF(error)); request_matcher_zombify_all_pending_calls( - &server->unregistered_request_matcher); + exec_ctx, &server->unregistered_request_matcher); for (registered_method* rm = server->registered_methods; rm; rm = rm->next) { - request_matcher_kill_requests(server, &rm->matcher, + request_matcher_kill_requests(exec_ctx, server, &rm->matcher, GRPC_ERROR_REF(error)); - request_matcher_zombify_all_pending_calls(&rm->matcher); + request_matcher_zombify_all_pending_calls(exec_ctx, &rm->matcher); } } GRPC_ERROR_UNREF(error); } -static void maybe_finish_shutdown(grpc_server* server) { +static void maybe_finish_shutdown(grpc_exec_ctx* exec_ctx, + grpc_server* server) { size_t i; if (!gpr_atm_acq_load(&server->shutdown_flag) || server->shutdown_published) { return; } kill_pending_work_locked( - server, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); + exec_ctx, server, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); if (server->root_channel_data.next != &server->root_channel_data || server->listeners_destroyed < num_listeners(server)) { @@ -683,13 +706,15 @@ static void maybe_finish_shutdown(grpc_server* server) { server->shutdown_published = 1; for (i = 0; i < server->num_shutdown_tags; i++) { server_ref(server); - grpc_cq_end_op(server->shutdown_tags[i].cq, server->shutdown_tags[i].tag, - GRPC_ERROR_NONE, done_shutdown_event, server, + grpc_cq_end_op(exec_ctx, server->shutdown_tags[i].cq, + server->shutdown_tags[i].tag, GRPC_ERROR_NONE, + done_shutdown_event, server, &server->shutdown_tags[i].completion); } } -static void server_on_recv_initial_metadata(void* ptr, grpc_error* error) { +static void server_on_recv_initial_metadata(grpc_exec_ctx* exec_ctx, void* ptr, + grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)ptr; call_data* calld = (call_data*)elem->call_data; grpc_millis op_deadline; @@ -703,10 +728,10 @@ static void server_on_recv_initial_metadata(void* ptr, grpc_error* error) { GRPC_MDVALUE(calld->recv_initial_metadata->idx.named.authority->md)); calld->path_set = true; calld->host_set = true; - grpc_metadata_batch_remove(calld->recv_initial_metadata, + grpc_metadata_batch_remove(exec_ctx, calld->recv_initial_metadata, calld->recv_initial_metadata->idx.named.path); grpc_metadata_batch_remove( - calld->recv_initial_metadata, + exec_ctx, calld->recv_initial_metadata, calld->recv_initial_metadata->idx.named.authority); } else { GRPC_ERROR_REF(error); @@ -724,7 +749,7 @@ static void server_on_recv_initial_metadata(void* ptr, grpc_error* error) { GRPC_ERROR_UNREF(src_error); } - GRPC_CLOSURE_RUN(calld->on_done_recv_initial_metadata, error); + GRPC_CLOSURE_RUN(exec_ctx, calld->on_done_recv_initial_metadata, error); } static void server_mutate_op(grpc_call_element* elem, @@ -745,21 +770,24 @@ static void server_mutate_op(grpc_call_element* elem, } static void server_start_transport_stream_op_batch( - grpc_call_element* elem, grpc_transport_stream_op_batch* op) { + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_transport_stream_op_batch* op) { server_mutate_op(elem, op); - grpc_call_next_op(elem, op); + grpc_call_next_op(exec_ctx, elem, op); } -static void got_initial_metadata(void* ptr, grpc_error* error) { +static void got_initial_metadata(grpc_exec_ctx* exec_ctx, void* ptr, + grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)ptr; call_data* calld = (call_data*)elem->call_data; if (error == GRPC_ERROR_NONE) { - start_new_rpc(elem); + start_new_rpc(exec_ctx, elem); } else { if (gpr_atm_full_cas(&calld->state, NOT_STARTED, ZOMBIED)) { GRPC_CLOSURE_INIT(&calld->kill_zombie_closure, kill_zombie, elem, grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(&calld->kill_zombie_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &calld->kill_zombie_closure, + GRPC_ERROR_NONE); } else if (gpr_atm_full_cas(&calld->state, PENDING, ZOMBIED)) { /* zombied call will be destroyed when it's removed from the pending queue... later */ @@ -767,7 +795,8 @@ static void got_initial_metadata(void* ptr, grpc_error* error) { } } -static void accept_stream(void* cd, grpc_transport* transport, +static void accept_stream(grpc_exec_ctx* exec_ctx, void* cd, + grpc_transport* transport, const void* transport_server_data) { channel_data* chand = (channel_data*)cd; /* create a call */ @@ -777,11 +806,11 @@ static void accept_stream(void* cd, grpc_transport* transport, args.server_transport_data = transport_server_data; args.send_deadline = GRPC_MILLIS_INF_FUTURE; grpc_call* call; - grpc_error* error = grpc_call_create(&args, &call); + grpc_error* error = grpc_call_create(exec_ctx, &args, &call); grpc_call_element* elem = grpc_call_stack_element(grpc_call_get_call_stack(call), 0); if (error != GRPC_ERROR_NONE) { - got_initial_metadata(elem, error); + got_initial_metadata(exec_ctx, elem, error); GRPC_ERROR_UNREF(error); return; } @@ -793,28 +822,32 @@ static void accept_stream(void* cd, grpc_transport* transport, &calld->initial_metadata; GRPC_CLOSURE_INIT(&calld->got_initial_metadata, got_initial_metadata, elem, grpc_schedule_on_exec_ctx); - grpc_call_start_batch_and_execute(call, &op, 1, &calld->got_initial_metadata); + grpc_call_start_batch_and_execute(exec_ctx, call, &op, 1, + &calld->got_initial_metadata); } -static void channel_connectivity_changed(void* cd, grpc_error* error) { +static void channel_connectivity_changed(grpc_exec_ctx* exec_ctx, void* cd, + grpc_error* error) { channel_data* chand = (channel_data*)cd; grpc_server* server = chand->server; if (chand->connectivity_state != GRPC_CHANNEL_SHUTDOWN) { grpc_transport_op* op = grpc_make_transport_op(nullptr); op->on_connectivity_state_change = &chand->channel_connectivity_changed; op->connectivity_state = &chand->connectivity_state; - grpc_channel_next_op(grpc_channel_stack_element( + grpc_channel_next_op(exec_ctx, + grpc_channel_stack_element( grpc_channel_get_channel_stack(chand->channel), 0), op); } else { gpr_mu_lock(&server->mu_global); - destroy_channel(chand, GRPC_ERROR_REF(error)); + destroy_channel(exec_ctx, chand, GRPC_ERROR_REF(error)); gpr_mu_unlock(&server->mu_global); - GRPC_CHANNEL_INTERNAL_UNREF(chand->channel, "connectivity"); + GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, chand->channel, "connectivity"); } } -static grpc_error* init_call_elem(grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; @@ -830,7 +863,7 @@ static grpc_error* init_call_elem(grpc_call_element* elem, return GRPC_ERROR_NONE; } -static void destroy_call_elem(grpc_call_element* elem, +static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { channel_data* chand = (channel_data*)elem->channel_data; @@ -839,18 +872,19 @@ static void destroy_call_elem(grpc_call_element* elem, GPR_ASSERT(calld->state != PENDING); if (calld->host_set) { - grpc_slice_unref_internal(calld->host); + grpc_slice_unref_internal(exec_ctx, calld->host); } if (calld->path_set) { - grpc_slice_unref_internal(calld->path); + grpc_slice_unref_internal(exec_ctx, calld->path); } grpc_metadata_array_destroy(&calld->initial_metadata); grpc_byte_buffer_destroy(calld->payload); - server_unref(chand->server); + server_unref(exec_ctx, chand->server); } -static grpc_error* init_channel_elem(grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { channel_data* chand = (channel_data*)elem->channel_data; GPR_ASSERT(args->is_first); @@ -866,14 +900,15 @@ static grpc_error* init_channel_elem(grpc_channel_element* elem, return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_channel_element* elem) { +static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) { size_t i; channel_data* chand = (channel_data*)elem->channel_data; if (chand->registered_methods) { for (i = 0; i < chand->registered_method_slots; i++) { - grpc_slice_unref_internal(chand->registered_methods[i].method); + grpc_slice_unref_internal(exec_ctx, chand->registered_methods[i].method); if (chand->registered_methods[i].has_host) { - grpc_slice_unref_internal(chand->registered_methods[i].host); + grpc_slice_unref_internal(exec_ctx, chand->registered_methods[i].host); } } gpr_free(chand->registered_methods); @@ -883,9 +918,9 @@ static void destroy_channel_elem(grpc_channel_element* elem) { chand->next->prev = chand->prev; chand->prev->next = chand->next; chand->next = chand->prev = chand; - maybe_finish_shutdown(chand->server); + maybe_finish_shutdown(exec_ctx, chand->server); gpr_mu_unlock(&chand->server->mu_global); - server_unref(chand->server); + server_unref(exec_ctx, chand->server); } } @@ -999,10 +1034,11 @@ void* grpc_server_register_method( return m; } -static void start_listeners(void* s, grpc_error* error) { +static void start_listeners(grpc_exec_ctx* exec_ctx, void* s, + grpc_error* error) { grpc_server* server = (grpc_server*)s; for (listener* l = server->listeners; l; l = l->next) { - l->start(server, l->arg, server->pollsets, server->pollset_count); + l->start(exec_ctx, server, l->arg, server->pollsets, server->pollset_count); } gpr_mu_lock(&server->mu_global); @@ -1010,12 +1046,12 @@ static void start_listeners(void* s, grpc_error* error) { gpr_cv_signal(&server->starting_cv); gpr_mu_unlock(&server->mu_global); - server_unref(server); + server_unref(exec_ctx, server); } void grpc_server_start(grpc_server* server) { size_t i; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GRPC_API_TRACE("grpc_server_start(server=%p)", 1, (server)); @@ -1037,9 +1073,12 @@ void grpc_server_start(grpc_server* server) { server_ref(server); server->starting = true; GRPC_CLOSURE_SCHED( + &exec_ctx, GRPC_CLOSURE_CREATE(start_listeners, server, grpc_executor_scheduler(GRPC_EXECUTOR_SHORT)), GRPC_ERROR_NONE); + + grpc_exec_ctx_finish(&exec_ctx); } void grpc_server_get_pollsets(grpc_server* server, grpc_pollset*** pollsets, @@ -1048,7 +1087,8 @@ void grpc_server_get_pollsets(grpc_server* server, grpc_pollset*** pollsets, *pollsets = server->pollsets; } -void grpc_server_setup_transport(grpc_server* s, grpc_transport* transport, +void grpc_server_setup_transport(grpc_exec_ctx* exec_ctx, grpc_server* s, + grpc_transport* transport, grpc_pollset* accepting_pollset, const grpc_channel_args* args) { size_t num_registered_methods; @@ -1063,7 +1103,8 @@ void grpc_server_setup_transport(grpc_server* s, grpc_transport* transport, uint32_t max_probes = 0; grpc_transport_op* op = nullptr; - channel = grpc_channel_create(nullptr, args, GRPC_SERVER_CHANNEL, transport); + channel = grpc_channel_create(exec_ctx, nullptr, args, GRPC_SERVER_CHANNEL, + transport); chand = (channel_data*)grpc_channel_stack_element( grpc_channel_get_channel_stack(channel), 0) ->channel_data; @@ -1140,19 +1181,21 @@ void grpc_server_setup_transport(grpc_server* s, grpc_transport* transport, op->disconnect_with_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server shutdown"); } - grpc_transport_perform_op(transport, op); + grpc_transport_perform_op(exec_ctx, transport, op); } -void done_published_shutdown(void* done_arg, grpc_cq_completion* storage) { +void done_published_shutdown(grpc_exec_ctx* exec_ctx, void* done_arg, + grpc_cq_completion* storage) { (void)done_arg; gpr_free(storage); } -static void listener_destroy_done(void* s, grpc_error* error) { +static void listener_destroy_done(grpc_exec_ctx* exec_ctx, void* s, + grpc_error* error) { grpc_server* server = (grpc_server*)s; gpr_mu_lock(&server->mu_global); server->listeners_destroyed++; - maybe_finish_shutdown(server); + maybe_finish_shutdown(exec_ctx, server); gpr_mu_unlock(&server->mu_global); } @@ -1161,7 +1204,7 @@ void grpc_server_shutdown_and_notify(grpc_server* server, listener* l; shutdown_tag* sdt; channel_broadcaster broadcaster; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GRPC_API_TRACE("grpc_server_shutdown_and_notify(server=%p, cq=%p, tag=%p)", 3, (server, cq, tag)); @@ -1176,10 +1219,11 @@ void grpc_server_shutdown_and_notify(grpc_server* server, /* stay locked, and gather up some stuff to do */ GPR_ASSERT(grpc_cq_begin_op(cq, tag)); if (server->shutdown_published) { - grpc_cq_end_op(cq, tag, GRPC_ERROR_NONE, done_published_shutdown, nullptr, + grpc_cq_end_op(&exec_ctx, cq, tag, GRPC_ERROR_NONE, done_published_shutdown, + nullptr, (grpc_cq_completion*)gpr_malloc(sizeof(grpc_cq_completion))); gpr_mu_unlock(&server->mu_global); - return; + goto done; } server->shutdown_tags = (shutdown_tag*)gpr_realloc( server->shutdown_tags, @@ -1189,7 +1233,7 @@ void grpc_server_shutdown_and_notify(grpc_server* server, sdt->cq = cq; if (gpr_atm_acq_load(&server->shutdown_flag)) { gpr_mu_unlock(&server->mu_global); - return; + goto done; } server->last_shutdown_message_time = gpr_now(GPR_CLOCK_REALTIME); @@ -1201,26 +1245,30 @@ void grpc_server_shutdown_and_notify(grpc_server* server, /* collect all unregistered then registered calls */ gpr_mu_lock(&server->mu_call); kill_pending_work_locked( - server, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); + &exec_ctx, server, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); gpr_mu_unlock(&server->mu_call); - maybe_finish_shutdown(server); + maybe_finish_shutdown(&exec_ctx, server); gpr_mu_unlock(&server->mu_global); /* Shutdown listeners */ for (l = server->listeners; l; l = l->next) { GRPC_CLOSURE_INIT(&l->destroy_done, listener_destroy_done, server, grpc_schedule_on_exec_ctx); - l->destroy(server, l->arg, &l->destroy_done); + l->destroy(&exec_ctx, server, l->arg, &l->destroy_done); } - channel_broadcaster_shutdown(&broadcaster, true /* send_goaway */, + channel_broadcaster_shutdown(&exec_ctx, &broadcaster, true /* send_goaway */, GRPC_ERROR_NONE); + +done: + grpc_exec_ctx_finish(&exec_ctx); } void grpc_server_cancel_all_calls(grpc_server* server) { channel_broadcaster broadcaster; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GRPC_API_TRACE("grpc_server_cancel_all_calls(server=%p)", 1, (server)); @@ -1229,13 +1277,14 @@ void grpc_server_cancel_all_calls(grpc_server* server) { gpr_mu_unlock(&server->mu_global); channel_broadcaster_shutdown( - &broadcaster, false /* send_goaway */, + &exec_ctx, &broadcaster, false /* send_goaway */, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Cancelling all calls")); + grpc_exec_ctx_finish(&exec_ctx); } void grpc_server_destroy(grpc_server* server) { listener* l; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GRPC_API_TRACE("grpc_server_destroy(server=%p)", 1, (server)); @@ -1251,15 +1300,16 @@ void grpc_server_destroy(grpc_server* server) { gpr_mu_unlock(&server->mu_global); - server_unref(server); + server_unref(&exec_ctx, server); + grpc_exec_ctx_finish(&exec_ctx); } -void grpc_server_add_listener(grpc_server* server, void* arg, - void (*start)(grpc_server* server, void* arg, - grpc_pollset** pollsets, - size_t pollset_count), - void (*destroy)(grpc_server* server, void* arg, - grpc_closure* on_done)) { +void grpc_server_add_listener( + grpc_exec_ctx* exec_ctx, grpc_server* server, void* arg, + void (*start)(grpc_exec_ctx* exec_ctx, grpc_server* server, void* arg, + grpc_pollset** pollsets, size_t pollset_count), + void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_server* server, void* arg, + grpc_closure* on_done)) { listener* l = (listener*)gpr_malloc(sizeof(listener)); l->arg = arg; l->start = start; @@ -1268,12 +1318,13 @@ void grpc_server_add_listener(grpc_server* server, void* arg, server->listeners = l; } -static grpc_call_error queue_call_request(grpc_server* server, size_t cq_idx, +static grpc_call_error queue_call_request(grpc_exec_ctx* exec_ctx, + grpc_server* server, size_t cq_idx, requested_call* rc) { call_data* calld = nullptr; request_matcher* rm = nullptr; if (gpr_atm_acq_load(&server->shutdown_flag)) { - fail_call(server, cq_idx, rc, + fail_call(exec_ctx, server, cq_idx, rc, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); return GRPC_CALL_OK; } @@ -1300,9 +1351,10 @@ static grpc_call_error queue_call_request(grpc_server* server, size_t cq_idx, &calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0), grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(&calld->kill_zombie_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &calld->kill_zombie_closure, + GRPC_ERROR_NONE); } else { - publish_call(server, calld, cq_idx, rc); + publish_call(exec_ctx, server, calld, cq_idx, rc); } gpr_mu_lock(&server->mu_call); } @@ -1317,9 +1369,9 @@ grpc_call_error grpc_server_request_call( grpc_completion_queue* cq_bound_to_call, grpc_completion_queue* cq_for_notification, void* tag) { grpc_call_error error; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; requested_call* rc = (requested_call*)gpr_malloc(sizeof(*rc)); - GRPC_STATS_INC_SERVER_REQUESTED_CALLS(); + GRPC_STATS_INC_SERVER_REQUESTED_CALLS(&exec_ctx); GRPC_API_TRACE( "grpc_server_request_call(" "server=%p, call=%p, details=%p, initial_metadata=%p, " @@ -1352,9 +1404,9 @@ grpc_call_error grpc_server_request_call( rc->call = call; rc->data.batch.details = details; rc->initial_metadata = initial_metadata; - error = queue_call_request(server, cq_idx, rc); + error = queue_call_request(&exec_ctx, server, cq_idx, rc); done: - + grpc_exec_ctx_finish(&exec_ctx); return error; } @@ -1364,10 +1416,10 @@ grpc_call_error grpc_server_request_registered_call( grpc_completion_queue* cq_bound_to_call, grpc_completion_queue* cq_for_notification, void* tag) { grpc_call_error error; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; requested_call* rc = (requested_call*)gpr_malloc(sizeof(*rc)); registered_method* rm = (registered_method*)rmp; - GRPC_STATS_INC_SERVER_REQUESTED_CALLS(); + GRPC_STATS_INC_SERVER_REQUESTED_CALLS(&exec_ctx); GRPC_API_TRACE( "grpc_server_request_registered_call(" "server=%p, rmp=%p, call=%p, deadline=%p, initial_metadata=%p, " @@ -1409,20 +1461,20 @@ grpc_call_error grpc_server_request_registered_call( rc->data.registered.deadline = deadline; rc->initial_metadata = initial_metadata; rc->data.registered.optional_payload = optional_payload; - error = queue_call_request(server, cq_idx, rc); + error = queue_call_request(&exec_ctx, server, cq_idx, rc); done: - + grpc_exec_ctx_finish(&exec_ctx); return error; } -static void fail_call(grpc_server* server, size_t cq_idx, requested_call* rc, - grpc_error* error) { +static void fail_call(grpc_exec_ctx* exec_ctx, grpc_server* server, + size_t cq_idx, requested_call* rc, grpc_error* error) { *rc->call = nullptr; rc->initial_metadata->count = 0; GPR_ASSERT(error != GRPC_ERROR_NONE); - grpc_cq_end_op(server->cqs[cq_idx], rc->tag, error, done_request_event, rc, - &rc->completion); + grpc_cq_end_op(exec_ctx, server->cqs[cq_idx], rc->tag, error, + done_request_event, rc, &rc->completion); } const grpc_channel_args* grpc_server_get_channel_args(grpc_server* server) { diff --git a/src/core/lib/surface/server.h b/src/core/lib/surface/server.h index 63b6dff16b8..d7ec025d954 100644 --- a/src/core/lib/surface/server.h +++ b/src/core/lib/surface/server.h @@ -31,16 +31,17 @@ extern grpc_core::TraceFlag grpc_server_channel_trace; /* Add a listener to the server: when the server starts, it will call start, and when it shuts down, it will call destroy */ -void grpc_server_add_listener(grpc_server* server, void* listener, - void (*start)(grpc_server* server, void* arg, - grpc_pollset** pollsets, - size_t npollsets), - void (*destroy)(grpc_server* server, void* arg, - grpc_closure* on_done)); +void grpc_server_add_listener( + grpc_exec_ctx* exec_ctx, grpc_server* server, void* listener, + void (*start)(grpc_exec_ctx* exec_ctx, grpc_server* server, void* arg, + grpc_pollset** pollsets, size_t npollsets), + void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_server* server, void* arg, + grpc_closure* on_done)); /* Setup a transport - creates a channel stack, binds the transport to the server */ -void grpc_server_setup_transport(grpc_server* server, grpc_transport* transport, +void grpc_server_setup_transport(grpc_exec_ctx* exec_ctx, grpc_server* server, + grpc_transport* transport, grpc_pollset* accepting_pollset, const grpc_channel_args* args); diff --git a/src/core/lib/transport/bdp_estimator.cc b/src/core/lib/transport/bdp_estimator.cc index 5fcc62ec432..bb0e583045a 100644 --- a/src/core/lib/transport/bdp_estimator.cc +++ b/src/core/lib/transport/bdp_estimator.cc @@ -37,7 +37,7 @@ BdpEstimator::BdpEstimator(const char* name) bw_est_(0), name_(name) {} -grpc_millis BdpEstimator::CompletePing() { +grpc_millis BdpEstimator::CompletePing(grpc_exec_ctx* exec_ctx) { gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); gpr_timespec dt_ts = gpr_time_sub(now, ping_start_time_); double dt = (double)dt_ts.tv_sec + 1e-9 * (double)dt_ts.tv_nsec; @@ -78,7 +78,7 @@ grpc_millis BdpEstimator::CompletePing() { } ping_state_ = PingState::UNSCHEDULED; accumulator_ = 0; - return grpc_core::ExecCtx::Get()->Now() + inter_ping_delay_; + return grpc_exec_ctx_now(exec_ctx) + inter_ping_delay_; } } // namespace grpc_core diff --git a/src/core/lib/transport/bdp_estimator.h b/src/core/lib/transport/bdp_estimator.h index e703af121cf..df3a86c5f17 100644 --- a/src/core/lib/transport/bdp_estimator.h +++ b/src/core/lib/transport/bdp_estimator.h @@ -73,7 +73,7 @@ class BdpEstimator { } // Completes a previously started ping, returns when to schedule the next one - grpc_millis CompletePing(); + grpc_millis CompletePing(grpc_exec_ctx* exec_ctx); private: enum class PingState { UNSCHEDULED, SCHEDULED, STARTED }; diff --git a/src/core/lib/transport/byte_stream.cc b/src/core/lib/transport/byte_stream.cc index 8dcb1e0bdb7..b8720250e77 100644 --- a/src/core/lib/transport/byte_stream.cc +++ b/src/core/lib/transport/byte_stream.cc @@ -25,28 +25,34 @@ #include "src/core/lib/slice/slice_internal.h" -bool grpc_byte_stream_next(grpc_byte_stream* byte_stream, size_t max_size_hint, +bool grpc_byte_stream_next(grpc_exec_ctx* exec_ctx, + grpc_byte_stream* byte_stream, size_t max_size_hint, grpc_closure* on_complete) { - return byte_stream->vtable->next(byte_stream, max_size_hint, on_complete); + return byte_stream->vtable->next(exec_ctx, byte_stream, max_size_hint, + on_complete); } -grpc_error* grpc_byte_stream_pull(grpc_byte_stream* byte_stream, +grpc_error* grpc_byte_stream_pull(grpc_exec_ctx* exec_ctx, + grpc_byte_stream* byte_stream, grpc_slice* slice) { - return byte_stream->vtable->pull(byte_stream, slice); + return byte_stream->vtable->pull(exec_ctx, byte_stream, slice); } -void grpc_byte_stream_shutdown(grpc_byte_stream* byte_stream, +void grpc_byte_stream_shutdown(grpc_exec_ctx* exec_ctx, + grpc_byte_stream* byte_stream, grpc_error* error) { - byte_stream->vtable->shutdown(byte_stream, error); + byte_stream->vtable->shutdown(exec_ctx, byte_stream, error); } -void grpc_byte_stream_destroy(grpc_byte_stream* byte_stream) { - byte_stream->vtable->destroy(byte_stream); +void grpc_byte_stream_destroy(grpc_exec_ctx* exec_ctx, + grpc_byte_stream* byte_stream) { + byte_stream->vtable->destroy(exec_ctx, byte_stream); } // grpc_slice_buffer_stream -static bool slice_buffer_stream_next(grpc_byte_stream* byte_stream, +static bool slice_buffer_stream_next(grpc_exec_ctx* exec_ctx, + grpc_byte_stream* byte_stream, size_t max_size_hint, grpc_closure* on_complete) { grpc_slice_buffer_stream* stream = (grpc_slice_buffer_stream*)byte_stream; @@ -54,7 +60,8 @@ static bool slice_buffer_stream_next(grpc_byte_stream* byte_stream, return true; } -static grpc_error* slice_buffer_stream_pull(grpc_byte_stream* byte_stream, +static grpc_error* slice_buffer_stream_pull(grpc_exec_ctx* exec_ctx, + grpc_byte_stream* byte_stream, grpc_slice* slice) { grpc_slice_buffer_stream* stream = (grpc_slice_buffer_stream*)byte_stream; if (stream->shutdown_error != GRPC_ERROR_NONE) { @@ -67,16 +74,18 @@ static grpc_error* slice_buffer_stream_pull(grpc_byte_stream* byte_stream, return GRPC_ERROR_NONE; } -static void slice_buffer_stream_shutdown(grpc_byte_stream* byte_stream, +static void slice_buffer_stream_shutdown(grpc_exec_ctx* exec_ctx, + grpc_byte_stream* byte_stream, grpc_error* error) { grpc_slice_buffer_stream* stream = (grpc_slice_buffer_stream*)byte_stream; GRPC_ERROR_UNREF(stream->shutdown_error); stream->shutdown_error = error; } -static void slice_buffer_stream_destroy(grpc_byte_stream* byte_stream) { +static void slice_buffer_stream_destroy(grpc_exec_ctx* exec_ctx, + grpc_byte_stream* byte_stream) { grpc_slice_buffer_stream* stream = (grpc_slice_buffer_stream*)byte_stream; - grpc_slice_buffer_reset_and_unref_internal(stream->backing_buffer); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, stream->backing_buffer); GRPC_ERROR_UNREF(stream->shutdown_error); } @@ -104,22 +113,25 @@ void grpc_byte_stream_cache_init(grpc_byte_stream_cache* cache, grpc_slice_buffer_init(&cache->cache_buffer); } -void grpc_byte_stream_cache_destroy(grpc_byte_stream_cache* cache) { - grpc_byte_stream_destroy(cache->underlying_stream); - grpc_slice_buffer_destroy_internal(&cache->cache_buffer); +void grpc_byte_stream_cache_destroy(grpc_exec_ctx* exec_ctx, + grpc_byte_stream_cache* cache) { + grpc_byte_stream_destroy(exec_ctx, cache->underlying_stream); + grpc_slice_buffer_destroy_internal(exec_ctx, &cache->cache_buffer); } -static bool caching_byte_stream_next(grpc_byte_stream* byte_stream, +static bool caching_byte_stream_next(grpc_exec_ctx* exec_ctx, + grpc_byte_stream* byte_stream, size_t max_size_hint, grpc_closure* on_complete) { grpc_caching_byte_stream* stream = (grpc_caching_byte_stream*)byte_stream; if (stream->shutdown_error != GRPC_ERROR_NONE) return true; if (stream->cursor < stream->cache->cache_buffer.count) return true; - return grpc_byte_stream_next(stream->cache->underlying_stream, max_size_hint, - on_complete); + return grpc_byte_stream_next(exec_ctx, stream->cache->underlying_stream, + max_size_hint, on_complete); } -static grpc_error* caching_byte_stream_pull(grpc_byte_stream* byte_stream, +static grpc_error* caching_byte_stream_pull(grpc_exec_ctx* exec_ctx, + grpc_byte_stream* byte_stream, grpc_slice* slice) { grpc_caching_byte_stream* stream = (grpc_caching_byte_stream*)byte_stream; if (stream->shutdown_error != GRPC_ERROR_NONE) { @@ -132,7 +144,7 @@ static grpc_error* caching_byte_stream_pull(grpc_byte_stream* byte_stream, return GRPC_ERROR_NONE; } grpc_error* error = - grpc_byte_stream_pull(stream->cache->underlying_stream, slice); + grpc_byte_stream_pull(exec_ctx, stream->cache->underlying_stream, slice); if (error == GRPC_ERROR_NONE) { ++stream->cursor; grpc_slice_buffer_add(&stream->cache->cache_buffer, @@ -141,15 +153,17 @@ static grpc_error* caching_byte_stream_pull(grpc_byte_stream* byte_stream, return error; } -static void caching_byte_stream_shutdown(grpc_byte_stream* byte_stream, +static void caching_byte_stream_shutdown(grpc_exec_ctx* exec_ctx, + grpc_byte_stream* byte_stream, grpc_error* error) { grpc_caching_byte_stream* stream = (grpc_caching_byte_stream*)byte_stream; GRPC_ERROR_UNREF(stream->shutdown_error); stream->shutdown_error = GRPC_ERROR_REF(error); - grpc_byte_stream_shutdown(stream->cache->underlying_stream, error); + grpc_byte_stream_shutdown(exec_ctx, stream->cache->underlying_stream, error); } -static void caching_byte_stream_destroy(grpc_byte_stream* byte_stream) { +static void caching_byte_stream_destroy(grpc_exec_ctx* exec_ctx, + grpc_byte_stream* byte_stream) { grpc_caching_byte_stream* stream = (grpc_caching_byte_stream*)byte_stream; GRPC_ERROR_UNREF(stream->shutdown_error); } diff --git a/src/core/lib/transport/byte_stream.h b/src/core/lib/transport/byte_stream.h index 52c7a07f568..6bca154cb57 100644 --- a/src/core/lib/transport/byte_stream.h +++ b/src/core/lib/transport/byte_stream.h @@ -31,11 +31,13 @@ typedef struct grpc_byte_stream grpc_byte_stream; typedef struct { - bool (*next)(grpc_byte_stream* byte_stream, size_t max_size_hint, - grpc_closure* on_complete); - grpc_error* (*pull)(grpc_byte_stream* byte_stream, grpc_slice* slice); - void (*shutdown)(grpc_byte_stream* byte_stream, grpc_error* error); - void (*destroy)(grpc_byte_stream* byte_stream); + bool (*next)(grpc_exec_ctx* exec_ctx, grpc_byte_stream* byte_stream, + size_t max_size_hint, grpc_closure* on_complete); + grpc_error* (*pull)(grpc_exec_ctx* exec_ctx, grpc_byte_stream* byte_stream, + grpc_slice* slice); + void (*shutdown)(grpc_exec_ctx* exec_ctx, grpc_byte_stream* byte_stream, + grpc_error* error); + void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_byte_stream* byte_stream); } grpc_byte_stream_vtable; struct grpc_byte_stream { @@ -50,7 +52,8 @@ struct grpc_byte_stream { // // max_size_hint can be set as a hint as to the maximum number // of bytes that would be acceptable to read. -bool grpc_byte_stream_next(grpc_byte_stream* byte_stream, size_t max_size_hint, +bool grpc_byte_stream_next(grpc_exec_ctx* exec_ctx, + grpc_byte_stream* byte_stream, size_t max_size_hint, grpc_closure* on_complete); // Returns the next slice in the byte stream when it is ready (indicated by @@ -58,7 +61,8 @@ bool grpc_byte_stream_next(grpc_byte_stream* byte_stream, size_t max_size_hint, // grpc_byte_stream_next is called). // // Once a slice is returned into *slice, it is owned by the caller. -grpc_error* grpc_byte_stream_pull(grpc_byte_stream* byte_stream, +grpc_error* grpc_byte_stream_pull(grpc_exec_ctx* exec_ctx, + grpc_byte_stream* byte_stream, grpc_slice* slice); // Shuts down the byte stream. @@ -68,10 +72,12 @@ grpc_error* grpc_byte_stream_pull(grpc_byte_stream* byte_stream, // // The next call to grpc_byte_stream_pull() (if any) will return the error // passed to grpc_byte_stream_shutdown(). -void grpc_byte_stream_shutdown(grpc_byte_stream* byte_stream, +void grpc_byte_stream_shutdown(grpc_exec_ctx* exec_ctx, + grpc_byte_stream* byte_stream, grpc_error* error); -void grpc_byte_stream_destroy(grpc_byte_stream* byte_stream); +void grpc_byte_stream_destroy(grpc_exec_ctx* exec_ctx, + grpc_byte_stream* byte_stream); // grpc_slice_buffer_stream // @@ -113,7 +119,8 @@ void grpc_byte_stream_cache_init(grpc_byte_stream_cache* cache, grpc_byte_stream* underlying_stream); // Must not be called while still in use by a grpc_caching_byte_stream. -void grpc_byte_stream_cache_destroy(grpc_byte_stream_cache* cache); +void grpc_byte_stream_cache_destroy(grpc_exec_ctx* exec_ctx, + grpc_byte_stream_cache* cache); typedef struct { grpc_byte_stream base; diff --git a/src/core/lib/transport/connectivity_state.cc b/src/core/lib/transport/connectivity_state.cc index c42cc9c8d05..e7e5dbd1f15 100644 --- a/src/core/lib/transport/connectivity_state.cc +++ b/src/core/lib/transport/connectivity_state.cc @@ -51,7 +51,8 @@ void grpc_connectivity_state_init(grpc_connectivity_state_tracker* tracker, tracker->name = gpr_strdup(name); } -void grpc_connectivity_state_destroy(grpc_connectivity_state_tracker* tracker) { +void grpc_connectivity_state_destroy(grpc_exec_ctx* exec_ctx, + grpc_connectivity_state_tracker* tracker) { grpc_error* error; grpc_connectivity_state_watcher* w; while ((w = tracker->watchers)) { @@ -64,7 +65,7 @@ void grpc_connectivity_state_destroy(grpc_connectivity_state_tracker* tracker) { error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Shutdown connectivity owner"); } - GRPC_CLOSURE_SCHED(w->notify, error); + GRPC_CLOSURE_SCHED(exec_ctx, w->notify, error); gpr_free(w); } GRPC_ERROR_UNREF(tracker->current_error); @@ -104,8 +105,8 @@ bool grpc_connectivity_state_has_watchers( } bool grpc_connectivity_state_notify_on_state_change( - grpc_connectivity_state_tracker* tracker, grpc_connectivity_state* current, - grpc_closure* notify) { + grpc_exec_ctx* exec_ctx, grpc_connectivity_state_tracker* tracker, + grpc_connectivity_state* current, grpc_closure* notify) { grpc_connectivity_state cur = (grpc_connectivity_state)gpr_atm_no_barrier_load( &tracker->current_state_atm); @@ -122,7 +123,7 @@ bool grpc_connectivity_state_notify_on_state_change( if (current == nullptr) { grpc_connectivity_state_watcher* w = tracker->watchers; if (w != nullptr && w->notify == notify) { - GRPC_CLOSURE_SCHED(notify, GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(exec_ctx, notify, GRPC_ERROR_CANCELLED); tracker->watchers = w->next; gpr_free(w); return false; @@ -130,7 +131,7 @@ bool grpc_connectivity_state_notify_on_state_change( while (w != nullptr) { grpc_connectivity_state_watcher* rm_candidate = w->next; if (rm_candidate != nullptr && rm_candidate->notify == notify) { - GRPC_CLOSURE_SCHED(notify, GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(exec_ctx, notify, GRPC_ERROR_CANCELLED); w->next = w->next->next; gpr_free(rm_candidate); return false; @@ -141,7 +142,8 @@ bool grpc_connectivity_state_notify_on_state_change( } else { if (cur != *current) { *current = cur; - GRPC_CLOSURE_SCHED(notify, GRPC_ERROR_REF(tracker->current_error)); + GRPC_CLOSURE_SCHED(exec_ctx, notify, + GRPC_ERROR_REF(tracker->current_error)); } else { grpc_connectivity_state_watcher* w = (grpc_connectivity_state_watcher*)gpr_malloc(sizeof(*w)); @@ -154,7 +156,8 @@ bool grpc_connectivity_state_notify_on_state_change( } } -void grpc_connectivity_state_set(grpc_connectivity_state_tracker* tracker, +void grpc_connectivity_state_set(grpc_exec_ctx* exec_ctx, + grpc_connectivity_state_tracker* tracker, grpc_connectivity_state state, grpc_error* error, const char* reason) { grpc_connectivity_state cur = @@ -192,7 +195,8 @@ void grpc_connectivity_state_set(grpc_connectivity_state_tracker* tracker, gpr_log(GPR_DEBUG, "NOTIFY: %p %s: %p", tracker, tracker->name, w->notify); } - GRPC_CLOSURE_SCHED(w->notify, GRPC_ERROR_REF(tracker->current_error)); + GRPC_CLOSURE_SCHED(exec_ctx, w->notify, + GRPC_ERROR_REF(tracker->current_error)); gpr_free(w); } } diff --git a/src/core/lib/transport/connectivity_state.h b/src/core/lib/transport/connectivity_state.h index c3a50f3211f..653637ebea6 100644 --- a/src/core/lib/transport/connectivity_state.h +++ b/src/core/lib/transport/connectivity_state.h @@ -51,11 +51,13 @@ const char* grpc_connectivity_state_name(grpc_connectivity_state state); void grpc_connectivity_state_init(grpc_connectivity_state_tracker* tracker, grpc_connectivity_state init_state, const char* name); -void grpc_connectivity_state_destroy(grpc_connectivity_state_tracker* tracker); +void grpc_connectivity_state_destroy(grpc_exec_ctx* exec_ctx, + grpc_connectivity_state_tracker* tracker); /** Set connectivity state; not thread safe; access must be serialized with an * external lock */ -void grpc_connectivity_state_set(grpc_connectivity_state_tracker* tracker, +void grpc_connectivity_state_set(grpc_exec_ctx* exec_ctx, + grpc_connectivity_state_tracker* tracker, grpc_connectivity_state state, grpc_error* associated_error, const char* reason); @@ -79,7 +81,7 @@ grpc_connectivity_state grpc_connectivity_state_get( case). Access must be serialized with an external lock. */ bool grpc_connectivity_state_notify_on_state_change( - grpc_connectivity_state_tracker* tracker, grpc_connectivity_state* current, - grpc_closure* notify); + grpc_exec_ctx* exec_ctx, grpc_connectivity_state_tracker* tracker, + grpc_connectivity_state* current, grpc_closure* notify); #endif /* GRPC_CORE_LIB_TRANSPORT_CONNECTIVITY_STATE_H */ diff --git a/src/core/lib/transport/error_utils.cc b/src/core/lib/transport/error_utils.cc index ffaf327081f..69c8ae6de36 100644 --- a/src/core/lib/transport/error_utils.cc +++ b/src/core/lib/transport/error_utils.cc @@ -40,9 +40,9 @@ static grpc_error* recursively_find_error_with_field(grpc_error* error, return nullptr; } -void grpc_error_get_status(grpc_error* error, grpc_millis deadline, - grpc_status_code* code, grpc_slice* slice, - grpc_http2_error_code* http_error, +void grpc_error_get_status(grpc_exec_ctx* exec_ctx, grpc_error* error, + grpc_millis deadline, grpc_status_code* code, + grpc_slice* slice, grpc_http2_error_code* http_error, const char** error_string) { // Start with the parent error and recurse through the tree of children // until we find the first one that has a status code. @@ -65,8 +65,8 @@ void grpc_error_get_status(grpc_error* error, grpc_millis deadline, status = (grpc_status_code)integer; } else if (grpc_error_get_int(found_error, GRPC_ERROR_INT_HTTP2_ERROR, &integer)) { - status = grpc_http2_error_to_grpc_status((grpc_http2_error_code)integer, - deadline); + status = grpc_http2_error_to_grpc_status( + exec_ctx, (grpc_http2_error_code)integer, deadline); } if (code != nullptr) *code = status; diff --git a/src/core/lib/transport/error_utils.h b/src/core/lib/transport/error_utils.h index 4100f65d6d1..8b006ae9921 100644 --- a/src/core/lib/transport/error_utils.h +++ b/src/core/lib/transport/error_utils.h @@ -30,8 +30,9 @@ /// be populated with the entire error string. If any of the attributes (code, /// msg, http_status, error_string) are unneeded, they can be passed as /// NULL. -void grpc_error_get_status(grpc_error* error, grpc_millis deadline, - grpc_status_code* code, grpc_slice* slice, +void grpc_error_get_status(grpc_exec_ctx* exec_ctx, grpc_error* error, + grpc_millis deadline, grpc_status_code* code, + grpc_slice* slice, grpc_http2_error_code* http_status, const char** error_string); diff --git a/src/core/lib/transport/metadata.cc b/src/core/lib/transport/metadata.cc index 5f0673e0142..0f30c7533db 100644 --- a/src/core/lib/transport/metadata.cc +++ b/src/core/lib/transport/metadata.cc @@ -108,7 +108,7 @@ typedef struct mdtab_shard { static mdtab_shard g_shards[SHARD_COUNT]; -static void gc_mdtab(mdtab_shard* shard); +static void gc_mdtab(grpc_exec_ctx* exec_ctx, mdtab_shard* shard); void grpc_mdctx_global_init(void) { /* initialize shards */ @@ -123,11 +123,11 @@ void grpc_mdctx_global_init(void) { } } -void grpc_mdctx_global_shutdown() { +void grpc_mdctx_global_shutdown(grpc_exec_ctx* exec_ctx) { for (size_t i = 0; i < SHARD_COUNT; i++) { mdtab_shard* shard = &g_shards[i]; gpr_mu_destroy(&shard->mu); - gc_mdtab(shard); + gc_mdtab(exec_ctx, shard); /* TODO(ctiller): GPR_ASSERT(shard->count == 0); */ if (shard->count != 0) { gpr_log(GPR_DEBUG, "WARNING: %" PRIuPTR " metadata elements were leaked", @@ -165,7 +165,7 @@ static void ref_md_locked(mdtab_shard* shard, } } -static void gc_mdtab(mdtab_shard* shard) { +static void gc_mdtab(grpc_exec_ctx* exec_ctx, mdtab_shard* shard) { size_t i; interned_metadata** prev_next; interned_metadata *md, *next; @@ -178,8 +178,8 @@ static void gc_mdtab(mdtab_shard* shard) { void* user_data = (void*)gpr_atm_no_barrier_load(&md->user_data); next = md->bucket_next; if (gpr_atm_acq_load(&md->refcnt) == 0) { - grpc_slice_unref_internal(md->key); - grpc_slice_unref_internal(md->value); + grpc_slice_unref_internal(exec_ctx, md->key); + grpc_slice_unref_internal(exec_ctx, md->value); if (md->user_data) { ((destroy_user_data_func)gpr_atm_no_barrier_load( &md->destroy_user_data))(user_data); @@ -228,17 +228,17 @@ static void grow_mdtab(mdtab_shard* shard) { GPR_TIMER_END("grow_mdtab", 0); } -static void rehash_mdtab(mdtab_shard* shard) { +static void rehash_mdtab(grpc_exec_ctx* exec_ctx, mdtab_shard* shard) { if (gpr_atm_no_barrier_load(&shard->free_estimate) > (gpr_atm)(shard->capacity / 4)) { - gc_mdtab(shard); + gc_mdtab(exec_ctx, shard); } else { grow_mdtab(shard); } } grpc_mdelem grpc_mdelem_create( - grpc_slice key, grpc_slice value, + grpc_exec_ctx* exec_ctx, grpc_slice key, grpc_slice value, grpc_mdelem_data* compatible_external_backing_store) { if (!grpc_slice_is_interned(key) || !grpc_slice_is_interned(value)) { if (compatible_external_backing_store != nullptr) { @@ -318,7 +318,7 @@ grpc_mdelem grpc_mdelem_create( shard->count++; if (shard->count > shard->capacity * 2) { - rehash_mdtab(shard); + rehash_mdtab(exec_ctx, shard); } gpr_mu_unlock(&shard->mu); @@ -328,20 +328,22 @@ grpc_mdelem grpc_mdelem_create( return GRPC_MAKE_MDELEM(md, GRPC_MDELEM_STORAGE_INTERNED); } -grpc_mdelem grpc_mdelem_from_slices(grpc_slice key, grpc_slice value) { - grpc_mdelem out = grpc_mdelem_create(key, value, nullptr); - grpc_slice_unref_internal(key); - grpc_slice_unref_internal(value); +grpc_mdelem grpc_mdelem_from_slices(grpc_exec_ctx* exec_ctx, grpc_slice key, + grpc_slice value) { + grpc_mdelem out = grpc_mdelem_create(exec_ctx, key, value, nullptr); + grpc_slice_unref_internal(exec_ctx, key); + grpc_slice_unref_internal(exec_ctx, value); return out; } -grpc_mdelem grpc_mdelem_from_grpc_metadata(grpc_metadata* metadata) { +grpc_mdelem grpc_mdelem_from_grpc_metadata(grpc_exec_ctx* exec_ctx, + grpc_metadata* metadata) { bool changed = false; grpc_slice key_slice = grpc_slice_maybe_static_intern(metadata->key, &changed); grpc_slice value_slice = grpc_slice_maybe_static_intern(metadata->value, &changed); - return grpc_mdelem_create(key_slice, value_slice, + return grpc_mdelem_create(exec_ctx, key_slice, value_slice, changed ? nullptr : (grpc_mdelem_data*)metadata); } @@ -415,7 +417,7 @@ grpc_mdelem grpc_mdelem_ref(grpc_mdelem gmd DEBUG_ARGS) { return gmd; } -void grpc_mdelem_unref(grpc_mdelem gmd DEBUG_ARGS) { +void grpc_mdelem_unref(grpc_exec_ctx* exec_ctx, grpc_mdelem gmd DEBUG_ARGS) { switch (GRPC_MDELEM_STORAGE(gmd)) { case GRPC_MDELEM_STORAGE_EXTERNAL: case GRPC_MDELEM_STORAGE_STATIC: @@ -463,8 +465,8 @@ void grpc_mdelem_unref(grpc_mdelem gmd DEBUG_ARGS) { const gpr_atm prev_refcount = gpr_atm_full_fetch_add(&md->refcnt, -1); GPR_ASSERT(prev_refcount >= 1); if (1 == prev_refcount) { - grpc_slice_unref_internal(md->key); - grpc_slice_unref_internal(md->value); + grpc_slice_unref_internal(exec_ctx, md->key); + grpc_slice_unref_internal(exec_ctx, md->value); gpr_free(md); } break; diff --git a/src/core/lib/transport/metadata.h b/src/core/lib/transport/metadata.h index 78e6beff9bf..8d4868d0316 100644 --- a/src/core/lib/transport/metadata.h +++ b/src/core/lib/transport/metadata.h @@ -107,18 +107,20 @@ struct grpc_mdelem { (uintptr_t)GRPC_MDELEM_STORAGE_INTERNED_BIT)) /* Unrefs the slices. */ -grpc_mdelem grpc_mdelem_from_slices(grpc_slice key, grpc_slice value); +grpc_mdelem grpc_mdelem_from_slices(grpc_exec_ctx* exec_ctx, grpc_slice key, + grpc_slice value); /* Cheaply convert a grpc_metadata to a grpc_mdelem; may use the grpc_metadata object as backing storage (so lifetimes should align) */ -grpc_mdelem grpc_mdelem_from_grpc_metadata(grpc_metadata* metadata); +grpc_mdelem grpc_mdelem_from_grpc_metadata(grpc_exec_ctx* exec_ctx, + grpc_metadata* metadata); /* Does not unref the slices; if a new non-interned mdelem is needed, allocates one if compatible_external_backing_store is NULL, or uses compatible_external_backing_store if it is non-NULL (in which case it's the users responsibility to ensure that it outlives usage) */ grpc_mdelem grpc_mdelem_create( - grpc_slice key, grpc_slice value, + grpc_exec_ctx* exec_ctx, grpc_slice key, grpc_slice value, grpc_mdelem_data* compatible_external_backing_store); bool grpc_mdelem_eq(grpc_mdelem a, grpc_mdelem b); @@ -134,14 +136,16 @@ void* grpc_mdelem_set_user_data(grpc_mdelem md, void (*destroy_func)(void*), #ifndef NDEBUG #define GRPC_MDELEM_REF(s) grpc_mdelem_ref((s), __FILE__, __LINE__) -#define GRPC_MDELEM_UNREF(s) grpc_mdelem_unref((s), __FILE__, __LINE__) +#define GRPC_MDELEM_UNREF(exec_ctx, s) \ + grpc_mdelem_unref((exec_ctx), (s), __FILE__, __LINE__) grpc_mdelem grpc_mdelem_ref(grpc_mdelem md, const char* file, int line); -void grpc_mdelem_unref(grpc_mdelem md, const char* file, int line); +void grpc_mdelem_unref(grpc_exec_ctx* exec_ctx, grpc_mdelem md, + const char* file, int line); #else #define GRPC_MDELEM_REF(s) grpc_mdelem_ref((s)) -#define GRPC_MDELEM_UNREF(s) grpc_mdelem_unref((s)) +#define GRPC_MDELEM_UNREF(exec_ctx, s) grpc_mdelem_unref((exec_ctx), (s)) grpc_mdelem grpc_mdelem_ref(grpc_mdelem md); -void grpc_mdelem_unref(grpc_mdelem md); +void grpc_mdelem_unref(grpc_exec_ctx* exec_ctx, grpc_mdelem md); #endif #define GRPC_MDKEY(md) (GRPC_MDELEM_DATA(md)->key) @@ -158,6 +162,6 @@ void grpc_mdelem_unref(grpc_mdelem md); #define GRPC_MDSTR_KV_HASH(k_hash, v_hash) (GPR_ROTL((k_hash), 2) ^ (v_hash)) void grpc_mdctx_global_init(void); -void grpc_mdctx_global_shutdown(); +void grpc_mdctx_global_shutdown(grpc_exec_ctx* exec_ctx); #endif /* GRPC_CORE_LIB_TRANSPORT_METADATA_H */ diff --git a/src/core/lib/transport/metadata_batch.cc b/src/core/lib/transport/metadata_batch.cc index 9c95339ba06..5817765aa39 100644 --- a/src/core/lib/transport/metadata_batch.cc +++ b/src/core/lib/transport/metadata_batch.cc @@ -51,7 +51,8 @@ static void assert_valid_list(grpc_mdelem_list* list) { #endif /* NDEBUG */ } -static void assert_valid_callouts(grpc_metadata_batch* batch) { +static void assert_valid_callouts(grpc_exec_ctx* exec_ctx, + grpc_metadata_batch* batch) { #ifndef NDEBUG for (grpc_linked_mdelem* l = batch->list.head; l != nullptr; l = l->next) { grpc_slice key_interned = grpc_slice_intern(GRPC_MDKEY(l->md)); @@ -60,7 +61,7 @@ static void assert_valid_callouts(grpc_metadata_batch* batch) { if (callout_idx != GRPC_BATCH_CALLOUTS_COUNT) { GPR_ASSERT(batch->idx.array[callout_idx] == l); } - grpc_slice_unref_internal(key_interned); + grpc_slice_unref_internal(exec_ctx, key_interned); } #endif } @@ -76,10 +77,11 @@ void grpc_metadata_batch_init(grpc_metadata_batch* batch) { batch->deadline = GRPC_MILLIS_INF_FUTURE; } -void grpc_metadata_batch_destroy(grpc_metadata_batch* batch) { +void grpc_metadata_batch_destroy(grpc_exec_ctx* exec_ctx, + grpc_metadata_batch* batch) { grpc_linked_mdelem* l; for (l = batch->list.head; l; l = l->next) { - GRPC_MDELEM_UNREF(l->md); + GRPC_MDELEM_UNREF(exec_ctx, l->md); } } @@ -124,12 +126,13 @@ static void maybe_unlink_callout(grpc_metadata_batch* batch, batch->idx.array[idx] = nullptr; } -grpc_error* grpc_metadata_batch_add_head(grpc_metadata_batch* batch, +grpc_error* grpc_metadata_batch_add_head(grpc_exec_ctx* exec_ctx, + grpc_metadata_batch* batch, grpc_linked_mdelem* storage, grpc_mdelem elem_to_add) { GPR_ASSERT(!GRPC_MDISNULL(elem_to_add)); storage->md = elem_to_add; - return grpc_metadata_batch_link_head(batch, storage); + return grpc_metadata_batch_link_head(exec_ctx, batch, storage); } static void link_head(grpc_mdelem_list* list, grpc_linked_mdelem* storage) { @@ -147,25 +150,27 @@ static void link_head(grpc_mdelem_list* list, grpc_linked_mdelem* storage) { assert_valid_list(list); } -grpc_error* grpc_metadata_batch_link_head(grpc_metadata_batch* batch, +grpc_error* grpc_metadata_batch_link_head(grpc_exec_ctx* exec_ctx, + grpc_metadata_batch* batch, grpc_linked_mdelem* storage) { - assert_valid_callouts(batch); + assert_valid_callouts(exec_ctx, batch); grpc_error* err = maybe_link_callout(batch, storage); if (err != GRPC_ERROR_NONE) { - assert_valid_callouts(batch); + assert_valid_callouts(exec_ctx, batch); return err; } link_head(&batch->list, storage); - assert_valid_callouts(batch); + assert_valid_callouts(exec_ctx, batch); return GRPC_ERROR_NONE; } -grpc_error* grpc_metadata_batch_add_tail(grpc_metadata_batch* batch, +grpc_error* grpc_metadata_batch_add_tail(grpc_exec_ctx* exec_ctx, + grpc_metadata_batch* batch, grpc_linked_mdelem* storage, grpc_mdelem elem_to_add) { GPR_ASSERT(!GRPC_MDISNULL(elem_to_add)); storage->md = elem_to_add; - return grpc_metadata_batch_link_tail(batch, storage); + return grpc_metadata_batch_link_tail(exec_ctx, batch, storage); } static void link_tail(grpc_mdelem_list* list, grpc_linked_mdelem* storage) { @@ -184,16 +189,17 @@ static void link_tail(grpc_mdelem_list* list, grpc_linked_mdelem* storage) { assert_valid_list(list); } -grpc_error* grpc_metadata_batch_link_tail(grpc_metadata_batch* batch, +grpc_error* grpc_metadata_batch_link_tail(grpc_exec_ctx* exec_ctx, + grpc_metadata_batch* batch, grpc_linked_mdelem* storage) { - assert_valid_callouts(batch); + assert_valid_callouts(exec_ctx, batch); grpc_error* err = maybe_link_callout(batch, storage); if (err != GRPC_ERROR_NONE) { - assert_valid_callouts(batch); + assert_valid_callouts(exec_ctx, batch); return err; } link_tail(&batch->list, storage); - assert_valid_callouts(batch); + assert_valid_callouts(exec_ctx, batch); return GRPC_ERROR_NONE; } @@ -214,28 +220,31 @@ static void unlink_storage(grpc_mdelem_list* list, assert_valid_list(list); } -void grpc_metadata_batch_remove(grpc_metadata_batch* batch, +void grpc_metadata_batch_remove(grpc_exec_ctx* exec_ctx, + grpc_metadata_batch* batch, grpc_linked_mdelem* storage) { - assert_valid_callouts(batch); + assert_valid_callouts(exec_ctx, batch); maybe_unlink_callout(batch, storage); unlink_storage(&batch->list, storage); - GRPC_MDELEM_UNREF(storage->md); - assert_valid_callouts(batch); + GRPC_MDELEM_UNREF(exec_ctx, storage->md); + assert_valid_callouts(exec_ctx, batch); } -void grpc_metadata_batch_set_value(grpc_linked_mdelem* storage, +void grpc_metadata_batch_set_value(grpc_exec_ctx* exec_ctx, + grpc_linked_mdelem* storage, grpc_slice value) { grpc_mdelem old_mdelem = storage->md; grpc_mdelem new_mdelem = grpc_mdelem_from_slices( - grpc_slice_ref_internal(GRPC_MDKEY(old_mdelem)), value); + exec_ctx, grpc_slice_ref_internal(GRPC_MDKEY(old_mdelem)), value); storage->md = new_mdelem; - GRPC_MDELEM_UNREF(old_mdelem); + GRPC_MDELEM_UNREF(exec_ctx, old_mdelem); } -grpc_error* grpc_metadata_batch_substitute(grpc_metadata_batch* batch, +grpc_error* grpc_metadata_batch_substitute(grpc_exec_ctx* exec_ctx, + grpc_metadata_batch* batch, grpc_linked_mdelem* storage, grpc_mdelem new_mdelem) { - assert_valid_callouts(batch); + assert_valid_callouts(exec_ctx, batch); grpc_error* error = GRPC_ERROR_NONE; grpc_mdelem old_mdelem = storage->md; if (!grpc_slice_eq(GRPC_MDKEY(new_mdelem), GRPC_MDKEY(old_mdelem))) { @@ -244,18 +253,19 @@ grpc_error* grpc_metadata_batch_substitute(grpc_metadata_batch* batch, error = maybe_link_callout(batch, storage); if (error != GRPC_ERROR_NONE) { unlink_storage(&batch->list, storage); - GRPC_MDELEM_UNREF(storage->md); + GRPC_MDELEM_UNREF(exec_ctx, storage->md); } } else { storage->md = new_mdelem; } - GRPC_MDELEM_UNREF(old_mdelem); - assert_valid_callouts(batch); + GRPC_MDELEM_UNREF(exec_ctx, old_mdelem); + assert_valid_callouts(exec_ctx, batch); return error; } -void grpc_metadata_batch_clear(grpc_metadata_batch* batch) { - grpc_metadata_batch_destroy(batch); +void grpc_metadata_batch_clear(grpc_exec_ctx* exec_ctx, + grpc_metadata_batch* batch) { + grpc_metadata_batch_destroy(exec_ctx, batch); grpc_metadata_batch_init(batch); } @@ -282,7 +292,8 @@ static void add_error(grpc_error** composite, grpc_error* error, *composite = grpc_error_add_child(*composite, error); } -grpc_error* grpc_metadata_batch_filter(grpc_metadata_batch* batch, +grpc_error* grpc_metadata_batch_filter(grpc_exec_ctx* exec_ctx, + grpc_metadata_batch* batch, grpc_metadata_batch_filter_func func, void* user_data, const char* composite_error_string) { @@ -290,12 +301,12 @@ grpc_error* grpc_metadata_batch_filter(grpc_metadata_batch* batch, grpc_error* error = GRPC_ERROR_NONE; while (l) { grpc_linked_mdelem* next = l->next; - grpc_filtered_mdelem new_mdelem = func(user_data, l->md); + grpc_filtered_mdelem new_mdelem = func(exec_ctx, user_data, l->md); add_error(&error, new_mdelem.error, composite_error_string); if (GRPC_MDISNULL(new_mdelem.md)) { - grpc_metadata_batch_remove(batch, l); + grpc_metadata_batch_remove(exec_ctx, batch, l); } else if (new_mdelem.md.payload != l->md.payload) { - grpc_metadata_batch_substitute(batch, l, new_mdelem.md); + grpc_metadata_batch_substitute(exec_ctx, batch, l, new_mdelem.md); } l = next; } diff --git a/src/core/lib/transport/metadata_batch.h b/src/core/lib/transport/metadata_batch.h index 8353a426f83..adfb2d80694 100644 --- a/src/core/lib/transport/metadata_batch.h +++ b/src/core/lib/transport/metadata_batch.h @@ -53,23 +53,28 @@ typedef struct grpc_metadata_batch { } grpc_metadata_batch; void grpc_metadata_batch_init(grpc_metadata_batch* batch); -void grpc_metadata_batch_destroy(grpc_metadata_batch* batch); -void grpc_metadata_batch_clear(grpc_metadata_batch* batch); +void grpc_metadata_batch_destroy(grpc_exec_ctx* exec_ctx, + grpc_metadata_batch* batch); +void grpc_metadata_batch_clear(grpc_exec_ctx* exec_ctx, + grpc_metadata_batch* batch); bool grpc_metadata_batch_is_empty(grpc_metadata_batch* batch); /* Returns the transport size of the batch. */ size_t grpc_metadata_batch_size(grpc_metadata_batch* batch); /** Remove \a storage from the batch, unreffing the mdelem contained */ -void grpc_metadata_batch_remove(grpc_metadata_batch* batch, +void grpc_metadata_batch_remove(grpc_exec_ctx* exec_ctx, + grpc_metadata_batch* batch, grpc_linked_mdelem* storage); /** Substitute a new mdelem for an old value */ -grpc_error* grpc_metadata_batch_substitute(grpc_metadata_batch* batch, +grpc_error* grpc_metadata_batch_substitute(grpc_exec_ctx* exec_ctx, + grpc_metadata_batch* batch, grpc_linked_mdelem* storage, grpc_mdelem new_value); -void grpc_metadata_batch_set_value(grpc_linked_mdelem* storage, +void grpc_metadata_batch_set_value(grpc_exec_ctx* exec_ctx, + grpc_linked_mdelem* storage, grpc_slice value); /** Add \a storage to the beginning of \a batch. storage->md is @@ -77,17 +82,17 @@ void grpc_metadata_batch_set_value(grpc_linked_mdelem* storage, \a storage is owned by the caller and must survive for the lifetime of batch. This usually means it should be around for the lifetime of the call. */ -grpc_error* grpc_metadata_batch_link_head(grpc_metadata_batch* batch, - grpc_linked_mdelem* storage) - GRPC_MUST_USE_RESULT; +grpc_error* grpc_metadata_batch_link_head( + grpc_exec_ctx* exec_ctx, grpc_metadata_batch* batch, + grpc_linked_mdelem* storage) GRPC_MUST_USE_RESULT; /** Add \a storage to the end of \a batch. storage->md is assumed to be valid. \a storage is owned by the caller and must survive for the lifetime of batch. This usually means it should be around for the lifetime of the call. */ -grpc_error* grpc_metadata_batch_link_tail(grpc_metadata_batch* batch, - grpc_linked_mdelem* storage) - GRPC_MUST_USE_RESULT; +grpc_error* grpc_metadata_batch_link_tail( + grpc_exec_ctx* exec_ctx, grpc_metadata_batch* batch, + grpc_linked_mdelem* storage) GRPC_MUST_USE_RESULT; /** Add \a elem_to_add as the first element in \a batch, using \a storage as backing storage for the linked list element. @@ -96,8 +101,8 @@ grpc_error* grpc_metadata_batch_link_tail(grpc_metadata_batch* batch, for the lifetime of the call. Takes ownership of \a elem_to_add */ grpc_error* grpc_metadata_batch_add_head( - grpc_metadata_batch* batch, grpc_linked_mdelem* storage, - grpc_mdelem elem_to_add) GRPC_MUST_USE_RESULT; + grpc_exec_ctx* exec_ctx, grpc_metadata_batch* batch, + grpc_linked_mdelem* storage, grpc_mdelem elem_to_add) GRPC_MUST_USE_RESULT; /** Add \a elem_to_add as the last element in \a batch, using \a storage as backing storage for the linked list element. \a storage is owned by the caller and must survive for the @@ -105,8 +110,8 @@ grpc_error* grpc_metadata_batch_add_head( for the lifetime of the call. Takes ownership of \a elem_to_add */ grpc_error* grpc_metadata_batch_add_tail( - grpc_metadata_batch* batch, grpc_linked_mdelem* storage, - grpc_mdelem elem_to_add) GRPC_MUST_USE_RESULT; + grpc_exec_ctx* exec_ctx, grpc_metadata_batch* batch, + grpc_linked_mdelem* storage, grpc_mdelem elem_to_add) GRPC_MUST_USE_RESULT; grpc_error* grpc_attach_md_to_error(grpc_error* src, grpc_mdelem md); @@ -123,10 +128,11 @@ typedef struct { { GRPC_ERROR_NONE, GRPC_MDNULL } typedef grpc_filtered_mdelem (*grpc_metadata_batch_filter_func)( - void* user_data, grpc_mdelem elem); + grpc_exec_ctx* exec_ctx, void* user_data, grpc_mdelem elem); grpc_error* grpc_metadata_batch_filter( - grpc_metadata_batch* batch, grpc_metadata_batch_filter_func func, - void* user_data, const char* composite_error_string) GRPC_MUST_USE_RESULT; + grpc_exec_ctx* exec_ctx, grpc_metadata_batch* batch, + grpc_metadata_batch_filter_func func, void* user_data, + const char* composite_error_string) GRPC_MUST_USE_RESULT; #ifndef NDEBUG void grpc_metadata_batch_assert_ok(grpc_metadata_batch* comd); diff --git a/src/core/lib/transport/service_config.cc b/src/core/lib/transport/service_config.cc index cbafc338404..adcec8c4448 100644 --- a/src/core/lib/transport/service_config.cc +++ b/src/core/lib/transport/service_config.cc @@ -152,8 +152,10 @@ static char* parse_json_method_name(grpc_json* json) { // each name found, incrementing \a idx for each entry added. // Returns false on error. static bool parse_json_method_config( - grpc_json* json, void* (*create_value)(const grpc_json* method_config_json), - void* (*ref_value)(void* value), void (*unref_value)(void* value), + grpc_exec_ctx* exec_ctx, grpc_json* json, + void* (*create_value)(const grpc_json* method_config_json), + void* (*ref_value)(void* value), + void (*unref_value)(grpc_exec_ctx* exec_ctx, void* value), grpc_slice_hash_table_entry* entries, size_t* idx) { // Construct value. void* method_config = create_value(json); @@ -182,15 +184,16 @@ static bool parse_json_method_config( } success = true; done: - unref_value(method_config); + unref_value(exec_ctx, method_config); gpr_strvec_destroy(&paths); return success; } grpc_slice_hash_table* grpc_service_config_create_method_config_table( - const grpc_service_config* service_config, + grpc_exec_ctx* exec_ctx, const grpc_service_config* service_config, void* (*create_value)(const grpc_json* method_config_json), - void* (*ref_value)(void* value), void (*unref_value)(void* value)) { + void* (*ref_value)(void* value), + void (*unref_value)(grpc_exec_ctx* exec_ctx, void* value)) { const grpc_json* json = service_config->json_tree; // Traverse parsed JSON tree. if (json->type != GRPC_JSON_OBJECT || json->key != nullptr) return nullptr; @@ -214,11 +217,11 @@ grpc_slice_hash_table* grpc_service_config_create_method_config_table( size_t idx = 0; for (grpc_json* method = field->child; method != nullptr; method = method->next) { - if (!parse_json_method_config(method, create_value, ref_value, + if (!parse_json_method_config(exec_ctx, method, create_value, ref_value, unref_value, entries, &idx)) { for (size_t i = 0; i < idx; ++i) { - grpc_slice_unref_internal(entries[i].key); - unref_value(entries[i].value); + grpc_slice_unref_internal(exec_ctx, entries[i].key); + unref_value(exec_ctx, entries[i].value); } gpr_free(entries); return nullptr; @@ -237,7 +240,8 @@ grpc_slice_hash_table* grpc_service_config_create_method_config_table( return method_config_table; } -void* grpc_method_config_table_get(const grpc_slice_hash_table* table, +void* grpc_method_config_table_get(grpc_exec_ctx* exec_ctx, + const grpc_slice_hash_table* table, grpc_slice path) { void* value = grpc_slice_hash_table_get(table, path); // If we didn't find a match for the path, try looking for a wildcard @@ -253,7 +257,7 @@ void* grpc_method_config_table_get(const grpc_slice_hash_table* table, grpc_slice wildcard_path = grpc_slice_from_copied_string(buf); gpr_free(buf); value = grpc_slice_hash_table_get(table, wildcard_path); - grpc_slice_unref_internal(wildcard_path); + grpc_slice_unref_internal(exec_ctx, wildcard_path); gpr_free(path_str); } return value; diff --git a/src/core/lib/transport/service_config.h b/src/core/lib/transport/service_config.h index 98554b9f0fc..75a290bfd80 100644 --- a/src/core/lib/transport/service_config.h +++ b/src/core/lib/transport/service_config.h @@ -45,9 +45,10 @@ const char* grpc_service_config_get_lb_policy_name( /// \a ref_value() and \a unref_value() are used to ref and unref values. /// Returns NULL on error. grpc_slice_hash_table* grpc_service_config_create_method_config_table( - const grpc_service_config* service_config, + grpc_exec_ctx* exec_ctx, const grpc_service_config* service_config, void* (*create_value)(const grpc_json* method_config_json), - void* (*ref_value)(void* value), void (*unref_value)(void* value)); + void* (*ref_value)(void* value), + void (*unref_value)(grpc_exec_ctx* exec_ctx, void* value)); /// A helper function for looking up values in the table returned by /// \a grpc_service_config_create_method_config_table(). @@ -55,7 +56,8 @@ grpc_slice_hash_table* grpc_service_config_create_method_config_table( /// the form "/service/method". /// Returns NULL if the method has no config. /// Caller does NOT own a reference to the result. -void* grpc_method_config_table_get(const grpc_slice_hash_table* table, +void* grpc_method_config_table_get(grpc_exec_ctx* exec_ctx, + const grpc_slice_hash_table* table, grpc_slice path); #endif /* GRPC_CORE_LIB_TRANSPORT_SERVICE_CONFIG_H */ diff --git a/src/core/lib/transport/static_metadata.cc b/src/core/lib/transport/static_metadata.cc index 2213b30f564..844724cbeb5 100644 --- a/src/core/lib/transport/static_metadata.cc +++ b/src/core/lib/transport/static_metadata.cc @@ -104,7 +104,7 @@ static uint8_t g_bytes[] = { 101, 44, 103, 122, 105, 112}; static void static_ref(void* unused) {} -static void static_unref(void* unused) {} +static void static_unref(grpc_exec_ctx* exec_ctx, void* unused) {} static const grpc_slice_refcount_vtable static_sub_vtable = { static_ref, static_unref, grpc_slice_default_eq_impl, grpc_slice_default_hash_impl}; diff --git a/src/core/lib/transport/status_conversion.cc b/src/core/lib/transport/status_conversion.cc index 46cba4292b4..a0a5f1ba4bf 100644 --- a/src/core/lib/transport/status_conversion.cc +++ b/src/core/lib/transport/status_conversion.cc @@ -37,7 +37,8 @@ grpc_http2_error_code grpc_status_to_http2_error(grpc_status_code status) { } } -grpc_status_code grpc_http2_error_to_grpc_status(grpc_http2_error_code error, +grpc_status_code grpc_http2_error_to_grpc_status(grpc_exec_ctx* exec_ctx, + grpc_http2_error_code error, grpc_millis deadline) { switch (error) { case GRPC_HTTP2_NO_ERROR: @@ -46,7 +47,7 @@ grpc_status_code grpc_http2_error_to_grpc_status(grpc_http2_error_code error, case GRPC_HTTP2_CANCEL: /* http2 cancel translates to STATUS_CANCELLED iff deadline hasn't been * exceeded */ - return grpc_core::ExecCtx::Get()->Now() > deadline + return grpc_exec_ctx_now(exec_ctx) > deadline ? GRPC_STATUS_DEADLINE_EXCEEDED : GRPC_STATUS_CANCELLED; case GRPC_HTTP2_ENHANCE_YOUR_CALM: diff --git a/src/core/lib/transport/status_conversion.h b/src/core/lib/transport/status_conversion.h index 107eb92a53d..3637b828019 100644 --- a/src/core/lib/transport/status_conversion.h +++ b/src/core/lib/transport/status_conversion.h @@ -25,7 +25,8 @@ /* Conversion of grpc status codes to http2 error codes (for RST_STREAM) */ grpc_http2_error_code grpc_status_to_http2_error(grpc_status_code status); -grpc_status_code grpc_http2_error_to_grpc_status(grpc_http2_error_code error, +grpc_status_code grpc_http2_error_to_grpc_status(grpc_exec_ctx* exec_ctx, + grpc_http2_error_code error, grpc_millis deadline); /* Conversion of HTTP status codes (:status) to grpc status codes */ diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc index 08aee04ac94..5bda1541a6d 100644 --- a/src/core/lib/transport/transport.cc +++ b/src/core/lib/transport/transport.cc @@ -49,7 +49,8 @@ void grpc_stream_ref(grpc_stream_refcount* refcount) { } #ifndef NDEBUG -void grpc_stream_unref(grpc_stream_refcount* refcount, const char* reason) { +void grpc_stream_unref(grpc_exec_ctx* exec_ctx, grpc_stream_refcount* refcount, + const char* reason) { if (grpc_trace_stream_refcount.enabled()) { gpr_atm val = gpr_atm_no_barrier_load(&refcount->refs.count); gpr_log(GPR_DEBUG, "%s %p:%p UNREF %" PRIdPTR "->%" PRIdPTR " %s", @@ -57,11 +58,11 @@ void grpc_stream_unref(grpc_stream_refcount* refcount, const char* reason) { val - 1, reason); } #else -void grpc_stream_unref(grpc_stream_refcount* refcount) { +void grpc_stream_unref(grpc_exec_ctx* exec_ctx, + grpc_stream_refcount* refcount) { #endif if (gpr_unref(&refcount->refs)) { - if (grpc_core::ExecCtx::Get()->flags() & - GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP) { + if (exec_ctx->flags & GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP) { /* Ick. The thread we're running on MAY be owned (indirectly) by a call-stack. If that's the case, destroying the call-stack MAY try to destroy the @@ -72,7 +73,7 @@ void grpc_stream_unref(grpc_stream_refcount* refcount) { refcount->destroy.scheduler = grpc_executor_scheduler(GRPC_EXECUTOR_SHORT); } - GRPC_CLOSURE_SCHED(&refcount->destroy, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &refcount->destroy, GRPC_ERROR_NONE); } } @@ -88,11 +89,11 @@ static void slice_stream_ref(void* p) { #endif } -static void slice_stream_unref(void* p) { +static void slice_stream_unref(grpc_exec_ctx* exec_ctx, void* p) { #ifndef NDEBUG - grpc_stream_unref(STREAM_REF_FROM_SLICE_REF(p), "slice"); + grpc_stream_unref(exec_ctx, STREAM_REF_FROM_SLICE_REF(p), "slice"); #else - grpc_stream_unref(STREAM_REF_FROM_SLICE_REF(p)); + grpc_stream_unref(exec_ctx, STREAM_REF_FROM_SLICE_REF(p)); #endif } @@ -150,50 +151,59 @@ size_t grpc_transport_stream_size(grpc_transport* transport) { return transport->vtable->sizeof_stream; } -void grpc_transport_destroy(grpc_transport* transport) { - transport->vtable->destroy(transport); +void grpc_transport_destroy(grpc_exec_ctx* exec_ctx, + grpc_transport* transport) { + transport->vtable->destroy(exec_ctx, transport); } -int grpc_transport_init_stream(grpc_transport* transport, grpc_stream* stream, +int grpc_transport_init_stream(grpc_exec_ctx* exec_ctx, + grpc_transport* transport, grpc_stream* stream, grpc_stream_refcount* refcount, const void* server_data, gpr_arena* arena) { - return transport->vtable->init_stream(transport, stream, refcount, + return transport->vtable->init_stream(exec_ctx, transport, stream, refcount, server_data, arena); } -void grpc_transport_perform_stream_op(grpc_transport* transport, +void grpc_transport_perform_stream_op(grpc_exec_ctx* exec_ctx, + grpc_transport* transport, grpc_stream* stream, grpc_transport_stream_op_batch* op) { - transport->vtable->perform_stream_op(transport, stream, op); + transport->vtable->perform_stream_op(exec_ctx, transport, stream, op); } -void grpc_transport_perform_op(grpc_transport* transport, +void grpc_transport_perform_op(grpc_exec_ctx* exec_ctx, + grpc_transport* transport, grpc_transport_op* op) { - transport->vtable->perform_op(transport, op); + transport->vtable->perform_op(exec_ctx, transport, op); } -void grpc_transport_set_pops(grpc_transport* transport, grpc_stream* stream, +void grpc_transport_set_pops(grpc_exec_ctx* exec_ctx, grpc_transport* transport, + grpc_stream* stream, grpc_polling_entity* pollent) { grpc_pollset* pollset; grpc_pollset_set* pollset_set; if ((pollset = grpc_polling_entity_pollset(pollent)) != nullptr) { - transport->vtable->set_pollset(transport, stream, pollset); + transport->vtable->set_pollset(exec_ctx, transport, stream, pollset); } else if ((pollset_set = grpc_polling_entity_pollset_set(pollent)) != nullptr) { - transport->vtable->set_pollset_set(transport, stream, pollset_set); + transport->vtable->set_pollset_set(exec_ctx, transport, stream, + pollset_set); } else { abort(); } } -void grpc_transport_destroy_stream(grpc_transport* transport, +void grpc_transport_destroy_stream(grpc_exec_ctx* exec_ctx, + grpc_transport* transport, grpc_stream* stream, grpc_closure* then_schedule_closure) { - transport->vtable->destroy_stream(transport, stream, then_schedule_closure); + transport->vtable->destroy_stream(exec_ctx, transport, stream, + then_schedule_closure); } -grpc_endpoint* grpc_transport_get_endpoint(grpc_transport* transport) { - return transport->vtable->get_endpoint(transport); +grpc_endpoint* grpc_transport_get_endpoint(grpc_exec_ctx* exec_ctx, + grpc_transport* transport) { + return transport->vtable->get_endpoint(exec_ctx, transport); } // This comment should be sung to the tune of @@ -204,23 +214,25 @@ grpc_endpoint* grpc_transport_get_endpoint(grpc_transport* transport) { // though it lives in lib, it handles transport stream ops sure // it's grpc_transport_stream_op_batch_finish_with_failure void grpc_transport_stream_op_batch_finish_with_failure( - grpc_transport_stream_op_batch* batch, grpc_error* error, - grpc_call_combiner* call_combiner) { + grpc_exec_ctx* exec_ctx, grpc_transport_stream_op_batch* batch, + grpc_error* error, grpc_call_combiner* call_combiner) { if (batch->send_message) { - grpc_byte_stream_destroy(batch->payload->send_message.send_message); + grpc_byte_stream_destroy(exec_ctx, + batch->payload->send_message.send_message); } if (batch->recv_message) { - GRPC_CALL_COMBINER_START( - call_combiner, batch->payload->recv_message.recv_message_ready, - GRPC_ERROR_REF(error), "failing recv_message_ready"); + GRPC_CALL_COMBINER_START(exec_ctx, call_combiner, + batch->payload->recv_message.recv_message_ready, + GRPC_ERROR_REF(error), + "failing recv_message_ready"); } if (batch->recv_initial_metadata) { GRPC_CALL_COMBINER_START( - call_combiner, + exec_ctx, call_combiner, batch->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_REF(error), "failing recv_initial_metadata_ready"); } - GRPC_CLOSURE_SCHED(batch->on_complete, error); + GRPC_CLOSURE_SCHED(exec_ctx, batch->on_complete, error); if (batch->cancel_stream) { GRPC_ERROR_UNREF(batch->payload->cancel_stream.cancel_error); } @@ -232,9 +244,10 @@ typedef struct { grpc_transport_op op; } made_transport_op; -static void destroy_made_transport_op(void* arg, grpc_error* error) { +static void destroy_made_transport_op(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { made_transport_op* op = (made_transport_op*)arg; - GRPC_CLOSURE_SCHED(op->inner_on_complete, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(exec_ctx, op->inner_on_complete, GRPC_ERROR_REF(error)); gpr_free(op); } @@ -255,11 +268,12 @@ typedef struct { grpc_transport_stream_op_batch_payload payload; } made_transport_stream_op; -static void destroy_made_transport_stream_op(void* arg, grpc_error* error) { +static void destroy_made_transport_stream_op(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { made_transport_stream_op* op = (made_transport_stream_op*)arg; grpc_closure* c = op->inner_on_complete; gpr_free(op); - GRPC_CLOSURE_RUN(c, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(exec_ctx, c, GRPC_ERROR_REF(error)); } grpc_transport_stream_op_batch* grpc_make_transport_stream_op( diff --git a/src/core/lib/transport/transport.h b/src/core/lib/transport/transport.h index b03c0218dc8..b3cf04c22da 100644 --- a/src/core/lib/transport/transport.h +++ b/src/core/lib/transport/transport.h @@ -55,14 +55,15 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount, int initial_refs, grpc_iomgr_cb_func cb, void* cb_arg, const char* object_type); void grpc_stream_ref(grpc_stream_refcount* refcount, const char* reason); -void grpc_stream_unref(grpc_stream_refcount* refcount, const char* reason); +void grpc_stream_unref(grpc_exec_ctx* exec_ctx, grpc_stream_refcount* refcount, + const char* reason); #define GRPC_STREAM_REF_INIT(rc, ir, cb, cb_arg, objtype) \ grpc_stream_ref_init(rc, ir, cb, cb_arg, objtype) #else void grpc_stream_ref_init(grpc_stream_refcount* refcount, int initial_refs, grpc_iomgr_cb_func cb, void* cb_arg); void grpc_stream_ref(grpc_stream_refcount* refcount); -void grpc_stream_unref(grpc_stream_refcount* refcount); +void grpc_stream_unref(grpc_exec_ctx* exec_ctx, grpc_stream_refcount* refcount); #define GRPC_STREAM_REF_INIT(rc, ir, cb, cb_arg, objtype) \ grpc_stream_ref_init(rc, ir, cb, cb_arg) #endif @@ -236,7 +237,8 @@ typedef struct grpc_transport_op { If true, the callback is set to set_accept_stream_fn, with its user_data argument set to set_accept_stream_user_data */ bool set_accept_stream; - void (*set_accept_stream_fn)(void* user_data, grpc_transport* transport, + void (*set_accept_stream_fn)(grpc_exec_ctx* exec_ctx, void* user_data, + grpc_transport* transport, const void* server_data); void* set_accept_stream_user_data; /** add this transport to a pollset */ @@ -267,12 +269,13 @@ size_t grpc_transport_stream_size(grpc_transport* transport); stream - a pointer to uninitialized memory to initialize server_data - either NULL for a client initiated stream, or a pointer supplied from the accept_stream callback function */ -int grpc_transport_init_stream(grpc_transport* transport, grpc_stream* stream, +int grpc_transport_init_stream(grpc_exec_ctx* exec_ctx, + grpc_transport* transport, grpc_stream* stream, grpc_stream_refcount* refcount, const void* server_data, gpr_arena* arena); -void grpc_transport_set_pops(grpc_transport* transport, grpc_stream* stream, - grpc_polling_entity* pollent); +void grpc_transport_set_pops(grpc_exec_ctx* exec_ctx, grpc_transport* transport, + grpc_stream* stream, grpc_polling_entity* pollent); /* Destroy transport data for a stream. @@ -284,13 +287,14 @@ void grpc_transport_set_pops(grpc_transport* transport, grpc_stream* stream, transport - the transport on which to create this stream stream - the grpc_stream to destroy (memory is still owned by the caller, but any child memory must be cleaned up) */ -void grpc_transport_destroy_stream(grpc_transport* transport, +void grpc_transport_destroy_stream(grpc_exec_ctx* exec_ctx, + grpc_transport* transport, grpc_stream* stream, grpc_closure* then_schedule_closure); void grpc_transport_stream_op_batch_finish_with_failure( - grpc_transport_stream_op_batch* op, grpc_error* error, - grpc_call_combiner* call_combiner); + grpc_exec_ctx* exec_ctx, grpc_transport_stream_op_batch* op, + grpc_error* error, grpc_call_combiner* call_combiner); char* grpc_transport_stream_op_batch_string(grpc_transport_stream_op_batch* op); char* grpc_transport_op_string(grpc_transport_op* op); @@ -305,11 +309,13 @@ char* grpc_transport_op_string(grpc_transport_op* op); non-NULL and previously initialized by the same transport. op - a grpc_transport_stream_op_batch specifying the op to perform */ -void grpc_transport_perform_stream_op(grpc_transport* transport, +void grpc_transport_perform_stream_op(grpc_exec_ctx* exec_ctx, + grpc_transport* transport, grpc_stream* stream, grpc_transport_stream_op_batch* op); -void grpc_transport_perform_op(grpc_transport* transport, +void grpc_transport_perform_op(grpc_exec_ctx* exec_ctx, + grpc_transport* transport, grpc_transport_op* op); /* Send a ping on a transport @@ -322,10 +328,11 @@ void grpc_transport_goaway(grpc_transport* transport, grpc_status_code status, grpc_slice debug_data); /* Destroy the transport */ -void grpc_transport_destroy(grpc_transport* transport); +void grpc_transport_destroy(grpc_exec_ctx* exec_ctx, grpc_transport* transport); /* Get the endpoint used by \a transport */ -grpc_endpoint* grpc_transport_get_endpoint(grpc_transport* transport); +grpc_endpoint* grpc_transport_get_endpoint(grpc_exec_ctx* exec_ctx, + grpc_transport* transport); /* Allocate a grpc_transport_op, and preconfigure the on_consumed closure to \a on_consumed and then delete the returned transport op */ diff --git a/src/core/lib/transport/transport_impl.h b/src/core/lib/transport/transport_impl.h index 50b8a5f9b7f..46be61427e5 100644 --- a/src/core/lib/transport/transport_impl.h +++ b/src/core/lib/transport/transport_impl.h @@ -30,34 +30,37 @@ typedef struct grpc_transport_vtable { const char* name; /* implementation of grpc_transport_init_stream */ - int (*init_stream)(grpc_transport* self, grpc_stream* stream, - grpc_stream_refcount* refcount, const void* server_data, - gpr_arena* arena); + int (*init_stream)(grpc_exec_ctx* exec_ctx, grpc_transport* self, + grpc_stream* stream, grpc_stream_refcount* refcount, + const void* server_data, gpr_arena* arena); /* implementation of grpc_transport_set_pollset */ - void (*set_pollset)(grpc_transport* self, grpc_stream* stream, - grpc_pollset* pollset); + void (*set_pollset)(grpc_exec_ctx* exec_ctx, grpc_transport* self, + grpc_stream* stream, grpc_pollset* pollset); /* implementation of grpc_transport_set_pollset */ - void (*set_pollset_set)(grpc_transport* self, grpc_stream* stream, - grpc_pollset_set* pollset_set); + void (*set_pollset_set)(grpc_exec_ctx* exec_ctx, grpc_transport* self, + grpc_stream* stream, grpc_pollset_set* pollset_set); /* implementation of grpc_transport_perform_stream_op */ - void (*perform_stream_op)(grpc_transport* self, grpc_stream* stream, + void (*perform_stream_op)(grpc_exec_ctx* exec_ctx, grpc_transport* self, + grpc_stream* stream, grpc_transport_stream_op_batch* op); /* implementation of grpc_transport_perform_op */ - void (*perform_op)(grpc_transport* self, grpc_transport_op* op); + void (*perform_op)(grpc_exec_ctx* exec_ctx, grpc_transport* self, + grpc_transport_op* op); /* implementation of grpc_transport_destroy_stream */ - void (*destroy_stream)(grpc_transport* self, grpc_stream* stream, + void (*destroy_stream)(grpc_exec_ctx* exec_ctx, grpc_transport* self, + grpc_stream* stream, grpc_closure* then_schedule_closure); /* implementation of grpc_transport_destroy */ - void (*destroy)(grpc_transport* self); + void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_transport* self); /* implementation of grpc_transport_get_endpoint */ - grpc_endpoint* (*get_endpoint)(grpc_transport* self); + grpc_endpoint* (*get_endpoint)(grpc_exec_ctx* exec_ctx, grpc_transport* self); } grpc_transport_vtable; /* an instance of a grpc transport */ diff --git a/src/core/tsi/fake_transport_security.cc b/src/core/tsi/fake_transport_security.cc index b907636f9d5..f2f365fc0fe 100644 --- a/src/core/tsi/fake_transport_security.cc +++ b/src/core/tsi/fake_transport_security.cc @@ -399,7 +399,8 @@ static const tsi_frame_protector_vtable frame_protector_vtable = { /* --- tsi_zero_copy_grpc_protector methods implementation. ---*/ static tsi_result fake_zero_copy_grpc_protector_protect( - tsi_zero_copy_grpc_protector* self, grpc_slice_buffer* unprotected_slices, + grpc_exec_ctx* exec_ctx, tsi_zero_copy_grpc_protector* self, + grpc_slice_buffer* unprotected_slices, grpc_slice_buffer* protected_slices) { if (self == nullptr || unprotected_slices == nullptr || protected_slices == nullptr) { @@ -423,7 +424,8 @@ static tsi_result fake_zero_copy_grpc_protector_protect( } static tsi_result fake_zero_copy_grpc_protector_unprotect( - tsi_zero_copy_grpc_protector* self, grpc_slice_buffer* protected_slices, + grpc_exec_ctx* exec_ctx, tsi_zero_copy_grpc_protector* self, + grpc_slice_buffer* protected_slices, grpc_slice_buffer* unprotected_slices) { if (self == nullptr || unprotected_slices == nullptr || protected_slices == nullptr) { @@ -452,18 +454,18 @@ static tsi_result fake_zero_copy_grpc_protector_unprotect( impl->parsed_frame_size - TSI_FAKE_FRAME_HEADER_SIZE, unprotected_slices); impl->parsed_frame_size = 0; - grpc_slice_buffer_reset_and_unref_internal(&impl->header_sb); + grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &impl->header_sb); } return TSI_OK; } static void fake_zero_copy_grpc_protector_destroy( - tsi_zero_copy_grpc_protector* self) { + grpc_exec_ctx* exec_ctx, tsi_zero_copy_grpc_protector* self) { if (self == nullptr) return; tsi_fake_zero_copy_grpc_protector* impl = (tsi_fake_zero_copy_grpc_protector*)self; - grpc_slice_buffer_destroy_internal(&impl->header_sb); - grpc_slice_buffer_destroy_internal(&impl->protected_sb); + grpc_slice_buffer_destroy_internal(exec_ctx, &impl->header_sb); + grpc_slice_buffer_destroy_internal(exec_ctx, &impl->protected_sb); gpr_free(impl); } @@ -495,7 +497,8 @@ static tsi_result fake_handshaker_result_extract_peer( } static tsi_result fake_handshaker_result_create_zero_copy_grpc_protector( - const tsi_handshaker_result* self, size_t* max_output_protected_frame_size, + void* exec_ctx, const tsi_handshaker_result* self, + size_t* max_output_protected_frame_size, tsi_zero_copy_grpc_protector** protector) { *protector = tsi_create_fake_zero_copy_grpc_protector(max_output_protected_frame_size); diff --git a/src/core/tsi/transport_security.h b/src/core/tsi/transport_security.h index ed662d48af5..bf3a776b112 100644 --- a/src/core/tsi/transport_security.h +++ b/src/core/tsi/transport_security.h @@ -90,7 +90,7 @@ struct tsi_handshaker { typedef struct { tsi_result (*extract_peer)(const tsi_handshaker_result* self, tsi_peer* peer); tsi_result (*create_zero_copy_grpc_protector)( - const tsi_handshaker_result* self, + void* exec_ctx, const tsi_handshaker_result* self, size_t* max_output_protected_frame_size, tsi_zero_copy_grpc_protector** protector); tsi_result (*create_frame_protector)(const tsi_handshaker_result* self, diff --git a/src/core/tsi/transport_security_grpc.cc b/src/core/tsi/transport_security_grpc.cc index 76f7ae782f2..875d3672182 100644 --- a/src/core/tsi/transport_security_grpc.cc +++ b/src/core/tsi/transport_security_grpc.cc @@ -20,16 +20,18 @@ /* This method creates a tsi_zero_copy_grpc_protector object. */ tsi_result tsi_handshaker_result_create_zero_copy_grpc_protector( - const tsi_handshaker_result* self, size_t* max_output_protected_frame_size, + grpc_exec_ctx* exec_ctx, const tsi_handshaker_result* self, + size_t* max_output_protected_frame_size, tsi_zero_copy_grpc_protector** protector) { - if (self == nullptr || self->vtable == nullptr || protector == nullptr) { + if (exec_ctx == nullptr || self == nullptr || self->vtable == nullptr || + protector == nullptr) { return TSI_INVALID_ARGUMENT; } if (self->vtable->create_zero_copy_grpc_protector == nullptr) { return TSI_UNIMPLEMENTED; } return self->vtable->create_zero_copy_grpc_protector( - self, max_output_protected_frame_size, protector); + exec_ctx, self, max_output_protected_frame_size, protector); } /* --- tsi_zero_copy_grpc_protector common implementation. --- @@ -37,28 +39,33 @@ tsi_result tsi_handshaker_result_create_zero_copy_grpc_protector( Calls specific implementation after state/input validation. */ tsi_result tsi_zero_copy_grpc_protector_protect( - tsi_zero_copy_grpc_protector* self, grpc_slice_buffer* unprotected_slices, + grpc_exec_ctx* exec_ctx, tsi_zero_copy_grpc_protector* self, + grpc_slice_buffer* unprotected_slices, grpc_slice_buffer* protected_slices) { - if (self == nullptr || self->vtable == nullptr || + if (exec_ctx == nullptr || self == nullptr || self->vtable == nullptr || unprotected_slices == nullptr || protected_slices == nullptr) { return TSI_INVALID_ARGUMENT; } if (self->vtable->protect == nullptr) return TSI_UNIMPLEMENTED; - return self->vtable->protect(self, unprotected_slices, protected_slices); + return self->vtable->protect(exec_ctx, self, unprotected_slices, + protected_slices); } tsi_result tsi_zero_copy_grpc_protector_unprotect( - tsi_zero_copy_grpc_protector* self, grpc_slice_buffer* protected_slices, + grpc_exec_ctx* exec_ctx, tsi_zero_copy_grpc_protector* self, + grpc_slice_buffer* protected_slices, grpc_slice_buffer* unprotected_slices) { - if (self == nullptr || self->vtable == nullptr || + if (exec_ctx == nullptr || self == nullptr || self->vtable == nullptr || protected_slices == nullptr || unprotected_slices == nullptr) { return TSI_INVALID_ARGUMENT; } if (self->vtable->unprotect == nullptr) return TSI_UNIMPLEMENTED; - return self->vtable->unprotect(self, protected_slices, unprotected_slices); + return self->vtable->unprotect(exec_ctx, self, protected_slices, + unprotected_slices); } -void tsi_zero_copy_grpc_protector_destroy(tsi_zero_copy_grpc_protector* self) { +void tsi_zero_copy_grpc_protector_destroy(grpc_exec_ctx* exec_ctx, + tsi_zero_copy_grpc_protector* self) { if (self == nullptr) return; - self->vtable->destroy(self); + self->vtable->destroy(exec_ctx, self); } diff --git a/src/core/tsi/transport_security_grpc.h b/src/core/tsi/transport_security_grpc.h index 0156ff1c68a..9fccfd79dd7 100644 --- a/src/core/tsi/transport_security_grpc.h +++ b/src/core/tsi/transport_security_grpc.h @@ -26,7 +26,8 @@ assuming there is no fatal error. The caller is responsible for destroying the protector. */ tsi_result tsi_handshaker_result_create_zero_copy_grpc_protector( - const tsi_handshaker_result* self, size_t* max_output_protected_frame_size, + grpc_exec_ctx* exec_ctx, const tsi_handshaker_result* self, + size_t* max_output_protected_frame_size, tsi_zero_copy_grpc_protector** protector); /* -- tsi_zero_copy_grpc_protector object -- */ @@ -38,8 +39,8 @@ tsi_result tsi_handshaker_result_create_zero_copy_grpc_protector( - This method returns TSI_OK in case of success or a specific error code in case of failure. */ tsi_result tsi_zero_copy_grpc_protector_protect( - tsi_zero_copy_grpc_protector* self, grpc_slice_buffer* unprotected_slices, - grpc_slice_buffer* protected_slices); + grpc_exec_ctx* exec_ctx, tsi_zero_copy_grpc_protector* self, + grpc_slice_buffer* unprotected_slices, grpc_slice_buffer* protected_slices); /* Outputs unprotected bytes. - protected_slices is the bytes of protected frames. @@ -48,21 +49,24 @@ tsi_result tsi_zero_copy_grpc_protector_protect( there is not enough data to output in which case unprotected_slices has 0 bytes. */ tsi_result tsi_zero_copy_grpc_protector_unprotect( - tsi_zero_copy_grpc_protector* self, grpc_slice_buffer* protected_slices, - grpc_slice_buffer* unprotected_slices); + grpc_exec_ctx* exec_ctx, tsi_zero_copy_grpc_protector* self, + grpc_slice_buffer* protected_slices, grpc_slice_buffer* unprotected_slices); /* Destroys the tsi_zero_copy_grpc_protector object. */ -void tsi_zero_copy_grpc_protector_destroy(tsi_zero_copy_grpc_protector* self); +void tsi_zero_copy_grpc_protector_destroy(grpc_exec_ctx* exec_ctx, + tsi_zero_copy_grpc_protector* self); /* Base for tsi_zero_copy_grpc_protector implementations. */ typedef struct { - tsi_result (*protect)(tsi_zero_copy_grpc_protector* self, + tsi_result (*protect)(grpc_exec_ctx* exec_ctx, + tsi_zero_copy_grpc_protector* self, grpc_slice_buffer* unprotected_slices, grpc_slice_buffer* protected_slices); - tsi_result (*unprotect)(tsi_zero_copy_grpc_protector* self, + tsi_result (*unprotect)(grpc_exec_ctx* exec_ctx, + tsi_zero_copy_grpc_protector* self, grpc_slice_buffer* protected_slices, grpc_slice_buffer* unprotected_slices); - void (*destroy)(tsi_zero_copy_grpc_protector* self); + void (*destroy)(grpc_exec_ctx* exec_ctx, tsi_zero_copy_grpc_protector* self); } tsi_zero_copy_grpc_protector_vtable; struct tsi_zero_copy_grpc_protector { diff --git a/src/cpp/common/channel_arguments.cc b/src/cpp/common/channel_arguments.cc index b6967742439..cae9ef953ad 100644 --- a/src/cpp/common/channel_arguments.cc +++ b/src/cpp/common/channel_arguments.cc @@ -66,12 +66,13 @@ ChannelArguments::ChannelArguments(const ChannelArguments& other) } ChannelArguments::~ChannelArguments() { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; for (auto it = args_.begin(); it != args_.end(); ++it) { if (it->type == GRPC_ARG_POINTER) { - it->value.pointer.vtable->destroy(it->value.pointer.p); + it->value.pointer.vtable->destroy(&exec_ctx, it->value.pointer.p); } } + grpc_exec_ctx_finish(&exec_ctx); } void ChannelArguments::Swap(ChannelArguments& other) { @@ -94,17 +95,17 @@ void ChannelArguments::SetSocketMutator(grpc_socket_mutator* mutator) { } grpc_arg mutator_arg = grpc_socket_mutator_to_arg(mutator); bool replaced = false; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; for (auto it = args_.begin(); it != args_.end(); ++it) { if (it->type == mutator_arg.type && grpc::string(it->key) == grpc::string(mutator_arg.key)) { GPR_ASSERT(!replaced); - it->value.pointer.vtable->destroy(it->value.pointer.p); + it->value.pointer.vtable->destroy(&exec_ctx, it->value.pointer.p); it->value.pointer = mutator_arg.value.pointer; replaced = true; } } - + grpc_exec_ctx_finish(&exec_ctx); if (!replaced) { args_.push_back(mutator_arg); } diff --git a/src/cpp/common/channel_filter.cc b/src/cpp/common/channel_filter.cc index cbe2a209f5e..274079f8dd1 100644 --- a/src/cpp/common/channel_filter.cc +++ b/src/cpp/common/channel_filter.cc @@ -27,39 +27,43 @@ namespace grpc { // MetadataBatch -grpc_linked_mdelem* MetadataBatch::AddMetadata(const string& key, +grpc_linked_mdelem* MetadataBatch::AddMetadata(grpc_exec_ctx* exec_ctx, + const string& key, const string& value) { grpc_linked_mdelem* storage = new grpc_linked_mdelem; memset(storage, 0, sizeof(grpc_linked_mdelem)); - storage->md = grpc_mdelem_from_slices(SliceFromCopiedString(key), + storage->md = grpc_mdelem_from_slices(exec_ctx, SliceFromCopiedString(key), SliceFromCopiedString(value)); GRPC_LOG_IF_ERROR("MetadataBatch::AddMetadata", - grpc_metadata_batch_link_head(batch_, storage)); + grpc_metadata_batch_link_head(exec_ctx, batch_, storage)); return storage; } // ChannelData -void ChannelData::StartTransportOp(grpc_channel_element* elem, +void ChannelData::StartTransportOp(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, TransportOp* op) { - grpc_channel_next_op(elem, op->op()); + grpc_channel_next_op(exec_ctx, elem, op->op()); } -void ChannelData::GetInfo(grpc_channel_element* elem, +void ChannelData::GetInfo(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, const grpc_channel_info* channel_info) { - grpc_channel_next_get_info(elem, channel_info); + grpc_channel_next_get_info(exec_ctx, elem, channel_info); } // CallData -void CallData::StartTransportStreamOpBatch(grpc_call_element* elem, +void CallData::StartTransportStreamOpBatch(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, TransportStreamOpBatch* op) { - grpc_call_next_op(elem, op->op()); + grpc_call_next_op(exec_ctx, elem, op->op()); } -void CallData::SetPollsetOrPollsetSet(grpc_call_element* elem, +void CallData::SetPollsetOrPollsetSet(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_polling_entity* pollent) { - grpc_call_stack_ignore_set_pollset_or_pollset_set(elem, pollent); + grpc_call_stack_ignore_set_pollset_or_pollset_set(exec_ctx, elem, pollent); } // internal code used by RegisterChannelFilter() @@ -71,7 +75,8 @@ std::vector* channel_filters; namespace { -bool MaybeAddFilter(grpc_channel_stack_builder* builder, void* arg) { +bool MaybeAddFilter(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, void* arg) { const FilterRecord& filter = *(FilterRecord*)arg; if (filter.include_filter) { const grpc_channel_args* args = diff --git a/src/cpp/common/channel_filter.h b/src/cpp/common/channel_filter.h index a1f42c0b323..9fe9cf0aea4 100644 --- a/src/cpp/common/channel_filter.h +++ b/src/cpp/common/channel_filter.h @@ -54,7 +54,8 @@ class MetadataBatch { /// Adds metadata and returns the newly allocated storage. /// The caller takes ownership of the result, which must exist for the /// lifetime of the gRPC call. - grpc_linked_mdelem* AddMetadata(const string& key, const string& value); + grpc_linked_mdelem* AddMetadata(grpc_exec_ctx* exec_ctx, const string& key, + const string& value); class const_iterator : public std::iterator { @@ -221,17 +222,18 @@ class ChannelData { // TODO(roth): Come up with a more C++-like API for the channel element. /// Initializes the channel data. - virtual grpc_error* Init(grpc_channel_element* elem, + virtual grpc_error* Init(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } // Called before destruction. - virtual void Destroy(grpc_channel_element* elem) {} + virtual void Destroy(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem) {} - virtual void StartTransportOp(grpc_channel_element* elem, TransportOp* op); + virtual void StartTransportOp(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, TransportOp* op); - virtual void GetInfo(grpc_channel_element* elem, + virtual void GetInfo(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, const grpc_channel_info* channel_info); }; @@ -244,22 +246,24 @@ class CallData { // TODO(roth): Come up with a more C++-like API for the call element. /// Initializes the call data. - virtual grpc_error* Init(grpc_call_element* elem, + virtual grpc_error* Init(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_element_args* args) { return GRPC_ERROR_NONE; } // Called before destruction. - virtual void Destroy(grpc_call_element* elem, + virtual void Destroy(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_call_closure) {} /// Starts a new stream operation. - virtual void StartTransportStreamOpBatch(grpc_call_element* elem, + virtual void StartTransportStreamOpBatch(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, TransportStreamOpBatch* op); /// Sets a pollset or pollset set. - virtual void SetPollsetOrPollsetSet(grpc_call_element* elem, + virtual void SetPollsetOrPollsetSet(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_polling_entity* pollent); }; @@ -273,63 +277,71 @@ class ChannelFilter final { public: static const size_t channel_data_size = sizeof(ChannelDataType); - static grpc_error* InitChannelElement(grpc_channel_element* elem, + static grpc_error* InitChannelElement(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { // Construct the object in the already-allocated memory. ChannelDataType* channel_data = new (elem->channel_data) ChannelDataType(); - return channel_data->Init(elem, args); + return channel_data->Init(exec_ctx, elem, args); } - static void DestroyChannelElement(grpc_channel_element* elem) { + static void DestroyChannelElement(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) { ChannelDataType* channel_data = reinterpret_cast(elem->channel_data); - channel_data->Destroy(elem); + channel_data->Destroy(exec_ctx, elem); channel_data->~ChannelDataType(); } - static void StartTransportOp(grpc_channel_element* elem, + static void StartTransportOp(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_transport_op* op) { ChannelDataType* channel_data = reinterpret_cast(elem->channel_data); TransportOp op_wrapper(op); - channel_data->StartTransportOp(elem, &op_wrapper); + channel_data->StartTransportOp(exec_ctx, elem, &op_wrapper); } - static void GetChannelInfo(grpc_channel_element* elem, + static void GetChannelInfo(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, const grpc_channel_info* channel_info) { ChannelDataType* channel_data = reinterpret_cast(elem->channel_data); - channel_data->GetInfo(elem, channel_info); + channel_data->GetInfo(exec_ctx, elem, channel_info); } static const size_t call_data_size = sizeof(CallDataType); - static grpc_error* InitCallElement(grpc_call_element* elem, + static grpc_error* InitCallElement(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { // Construct the object in the already-allocated memory. CallDataType* call_data = new (elem->call_data) CallDataType(); - return call_data->Init(elem, args); + return call_data->Init(exec_ctx, elem, args); } - static void DestroyCallElement(grpc_call_element* elem, + static void DestroyCallElement(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_call_closure) { CallDataType* call_data = reinterpret_cast(elem->call_data); - call_data->Destroy(elem, final_info, then_call_closure); + call_data->Destroy(exec_ctx, elem, final_info, then_call_closure); call_data->~CallDataType(); } - static void StartTransportStreamOpBatch(grpc_call_element* elem, + static void StartTransportStreamOpBatch(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_transport_stream_op_batch* op) { CallDataType* call_data = reinterpret_cast(elem->call_data); TransportStreamOpBatch op_wrapper(op); - call_data->StartTransportStreamOpBatch(elem, &op_wrapper); + call_data->StartTransportStreamOpBatch(exec_ctx, elem, &op_wrapper); } - static void SetPollsetOrPollsetSet(grpc_call_element* elem, + static void SetPollsetOrPollsetSet(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_polling_entity* pollent) { CallDataType* call_data = reinterpret_cast(elem->call_data); - call_data->SetPollsetOrPollsetSet(elem, pollent); + call_data->SetPollsetOrPollsetSet(exec_ctx, elem, pollent); } }; diff --git a/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm b/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm index d1309713644..d5e668a858a 100644 --- a/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm +++ b/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm @@ -110,12 +110,13 @@ static void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { static void cronet_init_client_simple_ssl_secure_fullstack( grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx ctx = GRPC_EXEC_CTX_INIT; stream_engine *cronetEngine = [Cronet getGlobalEngine]; grpc_channel_args *new_client_args = grpc_channel_args_copy(client_args); cronet_init_client_secure_fullstack(f, new_client_args, cronetEngine); - grpc_channel_args_destroy(new_client_args); + grpc_channel_args_destroy(&ctx, new_client_args); + grpc_exec_ctx_finish(&ctx); } static int fail_server_auth_check(grpc_channel_args *server_args) { diff --git a/src/ruby/ext/grpc/rb_grpc_imports.generated.h b/src/ruby/ext/grpc/rb_grpc_imports.generated.h index 6377008a3b6..fae77843f03 100644 --- a/src/ruby/ext/grpc/rb_grpc_imports.generated.h +++ b/src/ruby/ext/grpc/rb_grpc_imports.generated.h @@ -558,7 +558,7 @@ extern grpc_slice_buffer_move_first_type grpc_slice_buffer_move_first_import; typedef void(*grpc_slice_buffer_move_first_no_ref_type)(grpc_slice_buffer* src, size_t n, grpc_slice_buffer* dst); extern grpc_slice_buffer_move_first_no_ref_type grpc_slice_buffer_move_first_no_ref_import; #define grpc_slice_buffer_move_first_no_ref grpc_slice_buffer_move_first_no_ref_import -typedef void(*grpc_slice_buffer_move_first_into_buffer_type)(grpc_slice_buffer* src, size_t n, void* dst); +typedef void(*grpc_slice_buffer_move_first_into_buffer_type)(grpc_exec_ctx* exec_ctx, grpc_slice_buffer* src, size_t n, void* dst); extern grpc_slice_buffer_move_first_into_buffer_type grpc_slice_buffer_move_first_into_buffer_import; #define grpc_slice_buffer_move_first_into_buffer grpc_slice_buffer_move_first_into_buffer_import typedef grpc_slice(*grpc_slice_buffer_take_first_type)(grpc_slice_buffer* src); diff --git a/test/core/backoff/backoff_test.cc b/test/core/backoff/backoff_test.cc index d3115fe1ddc..ef2de8d6388 100644 --- a/test/core/backoff/backoff_test.cc +++ b/test/core/backoff/backoff_test.cc @@ -18,7 +18,6 @@ #include "src/core/lib/backoff/backoff.h" -#include #include #include @@ -33,24 +32,23 @@ static void test_constant_backoff(void) { const grpc_millis max_backoff = 1000; grpc_backoff_init(&backoff, initial_backoff, multiplier, jitter, min_connect_timeout, max_backoff); - grpc_core::ExecCtx exec_ctx; - grpc_backoff_result next_deadlines = grpc_backoff_begin(&backoff); - GPR_ASSERT(next_deadlines.current_deadline - - grpc_core::ExecCtx::Get()->Now() == + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_backoff_result next_deadlines = grpc_backoff_begin(&exec_ctx, &backoff); + GPR_ASSERT(next_deadlines.current_deadline - grpc_exec_ctx_now(&exec_ctx) == initial_backoff); GPR_ASSERT(next_deadlines.next_attempt_start_time - - grpc_core::ExecCtx::Get()->Now() == + grpc_exec_ctx_now(&exec_ctx) == initial_backoff); for (int i = 0; i < 10000; i++) { - next_deadlines = grpc_backoff_step(&backoff); - GPR_ASSERT(next_deadlines.current_deadline - - grpc_core::ExecCtx::Get()->Now() == + next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); + GPR_ASSERT(next_deadlines.current_deadline - grpc_exec_ctx_now(&exec_ctx) == initial_backoff); GPR_ASSERT(next_deadlines.next_attempt_start_time - - grpc_core::ExecCtx::Get()->Now() == + grpc_exec_ctx_now(&exec_ctx) == initial_backoff); - grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); + exec_ctx.now = next_deadlines.current_deadline; } + grpc_exec_ctx_finish(&exec_ctx); } static void test_min_connect(void) { @@ -62,16 +60,17 @@ static void test_min_connect(void) { const grpc_millis max_backoff = 1000; grpc_backoff_init(&backoff, initial_backoff, multiplier, jitter, min_connect_timeout, max_backoff); - grpc_core::ExecCtx exec_ctx; - grpc_backoff_result next = grpc_backoff_begin(&backoff); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_backoff_result next = grpc_backoff_begin(&exec_ctx, &backoff); // Because the min_connect_timeout > initial_backoff, current_deadline is used // as the deadline for the current attempt. - GPR_ASSERT(next.current_deadline - grpc_core::ExecCtx::Get()->Now() == + GPR_ASSERT(next.current_deadline - grpc_exec_ctx_now(&exec_ctx) == min_connect_timeout); // ... while, if the current attempt fails, the next one will happen after // initial_backoff. - GPR_ASSERT(next.next_attempt_start_time - grpc_core::ExecCtx::Get()->Now() == + GPR_ASSERT(next.next_attempt_start_time - grpc_exec_ctx_now(&exec_ctx) == initial_backoff); + grpc_exec_ctx_finish(&exec_ctx); } static void test_no_jitter_backoff(void) { @@ -85,47 +84,49 @@ static void test_no_jitter_backoff(void) { min_connect_timeout, max_backoff); // x_1 = 2 // x_n = 2**i + x_{i-1} ( = 2**(n+1) - 2 ) - grpc_core::ExecCtx exec_ctx; - grpc_core::ExecCtx::Get()->TestOnlySetNow(0); - grpc_backoff_result next_deadlines = grpc_backoff_begin(&backoff); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + exec_ctx.now = 0; + exec_ctx.now_is_valid = true; + grpc_backoff_result next_deadlines = grpc_backoff_begin(&exec_ctx, &backoff); GPR_ASSERT(next_deadlines.current_deadline == next_deadlines.next_attempt_start_time); GPR_ASSERT(next_deadlines.current_deadline == 2); - grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); - next_deadlines = grpc_backoff_step(&backoff); + exec_ctx.now = next_deadlines.current_deadline; + next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); GPR_ASSERT(next_deadlines.current_deadline == 6); - grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); - next_deadlines = grpc_backoff_step(&backoff); + exec_ctx.now = next_deadlines.current_deadline; + next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); GPR_ASSERT(next_deadlines.current_deadline == 14); - grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); - next_deadlines = grpc_backoff_step(&backoff); + exec_ctx.now = next_deadlines.current_deadline; + next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); GPR_ASSERT(next_deadlines.current_deadline == 30); - grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); - next_deadlines = grpc_backoff_step(&backoff); + exec_ctx.now = next_deadlines.current_deadline; + next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); GPR_ASSERT(next_deadlines.current_deadline == 62); - grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); - next_deadlines = grpc_backoff_step(&backoff); + exec_ctx.now = next_deadlines.current_deadline; + next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); GPR_ASSERT(next_deadlines.current_deadline == 126); - grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); - next_deadlines = grpc_backoff_step(&backoff); + exec_ctx.now = next_deadlines.current_deadline; + next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); GPR_ASSERT(next_deadlines.current_deadline == 254); - grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); - next_deadlines = grpc_backoff_step(&backoff); + exec_ctx.now = next_deadlines.current_deadline; + next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); GPR_ASSERT(next_deadlines.current_deadline == 510); - grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); - next_deadlines = grpc_backoff_step(&backoff); + exec_ctx.now = next_deadlines.current_deadline; + next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); GPR_ASSERT(next_deadlines.current_deadline == 1022); - grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); - next_deadlines = grpc_backoff_step(&backoff); + exec_ctx.now = next_deadlines.current_deadline; + next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); // Hit the maximum timeout. From this point onwards, retries will increase // only by max timeout. GPR_ASSERT(next_deadlines.current_deadline == 1535); - grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); - next_deadlines = grpc_backoff_step(&backoff); + exec_ctx.now = next_deadlines.current_deadline; + next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); GPR_ASSERT(next_deadlines.current_deadline == 2048); - grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); - next_deadlines = grpc_backoff_step(&backoff); + exec_ctx.now = next_deadlines.current_deadline; + next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); GPR_ASSERT(next_deadlines.current_deadline == 2561); + grpc_exec_ctx_finish(&exec_ctx); } static void test_jitter_backoff(void) { @@ -141,13 +142,12 @@ static void test_jitter_backoff(void) { backoff.rng_state = 0; // force consistent PRNG - grpc_core::ExecCtx exec_ctx; - grpc_backoff_result next_deadlines = grpc_backoff_begin(&backoff); - GPR_ASSERT(next_deadlines.current_deadline - - grpc_core::ExecCtx::Get()->Now() == + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_backoff_result next_deadlines = grpc_backoff_begin(&exec_ctx, &backoff); + GPR_ASSERT(next_deadlines.current_deadline - grpc_exec_ctx_now(&exec_ctx) == initial_backoff); GPR_ASSERT(next_deadlines.next_attempt_start_time - - grpc_core::ExecCtx::Get()->Now() == + grpc_exec_ctx_now(&exec_ctx) == initial_backoff); grpc_millis expected_next_lower_bound = @@ -156,11 +156,11 @@ static void test_jitter_backoff(void) { (grpc_millis)((double)current_backoff * (1 + jitter)); for (int i = 0; i < 10000; i++) { - next_deadlines = grpc_backoff_step(&backoff); + next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); // next-now must be within (jitter*100)% of the current backoff (which // increases by * multiplier up to max_backoff). const grpc_millis timeout_millis = - next_deadlines.current_deadline - grpc_core::ExecCtx::Get()->Now(); + next_deadlines.current_deadline - grpc_exec_ctx_now(&exec_ctx); GPR_ASSERT(timeout_millis >= expected_next_lower_bound); GPR_ASSERT(timeout_millis <= expected_next_upper_bound); current_backoff = GPR_MIN( @@ -169,13 +169,13 @@ static void test_jitter_backoff(void) { (grpc_millis)((double)current_backoff * (1 - jitter)); expected_next_upper_bound = (grpc_millis)((double)current_backoff * (1 + jitter)); - grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); + exec_ctx.now = next_deadlines.current_deadline; } + grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); gpr_time_init(); test_constant_backoff(); @@ -183,6 +183,5 @@ int main(int argc, char** argv) { test_no_jitter_backoff(); test_jitter_backoff(); - grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/bad_client.cc b/test/core/bad_client/bad_client.cc index 4c1642aa5d4..d8bb092e14f 100644 --- a/test/core/bad_client/bad_client.cc +++ b/test/core/bad_client/bad_client.cc @@ -50,19 +50,20 @@ static void thd_func(void* arg) { gpr_event_set(&a->done_thd, (void*)1); } -static void done_write(void* arg, grpc_error* error) { +static void done_write(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { thd_args* a = (thd_args*)arg; gpr_event_set(&a->done_write, (void*)1); } static void server_setup_transport(void* ts, grpc_transport* transport) { thd_args* a = (thd_args*)ts; - grpc_core::ExecCtx exec_ctx; - grpc_server_setup_transport(a->server, transport, nullptr, + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_server_setup_transport(&exec_ctx, a->server, transport, nullptr, grpc_server_get_channel_args(a->server)); + grpc_exec_ctx_finish(&exec_ctx); } -static void read_done(void* arg, grpc_error* error) { +static void read_done(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { gpr_event* read_done = (gpr_event*)arg; gpr_event_set(read_done, (void*)1); } @@ -80,7 +81,7 @@ void grpc_run_bad_client_test( grpc_slice_from_copied_buffer(client_payload, client_payload_length); grpc_slice_buffer outgoing; grpc_closure done_write_closure; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_completion_queue* shutdown_cq; if (client_payload_length < 4 * 1024) { @@ -114,13 +115,15 @@ void grpc_run_bad_client_test( GRPC_BAD_CLIENT_REGISTERED_HOST, GRPC_SRM_PAYLOAD_READ_INITIAL_BYTE_BUFFER, 0); grpc_server_start(a.server); - transport = grpc_create_chttp2_transport(nullptr, sfd.server, false); + transport = + grpc_create_chttp2_transport(&exec_ctx, nullptr, sfd.server, false); server_setup_transport(&a, transport); - grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); + grpc_exec_ctx_finish(&exec_ctx); /* Bind everything into the same pollset */ - grpc_endpoint_add_to_pollset(sfd.client, grpc_cq_pollset(a.cq)); - grpc_endpoint_add_to_pollset(sfd.server, grpc_cq_pollset(a.cq)); + grpc_endpoint_add_to_pollset(&exec_ctx, sfd.client, grpc_cq_pollset(a.cq)); + grpc_endpoint_add_to_pollset(&exec_ctx, sfd.server, grpc_cq_pollset(a.cq)); /* Check a ground truth */ GPR_ASSERT(grpc_server_has_open_connections(a.server)); @@ -134,8 +137,8 @@ void grpc_run_bad_client_test( grpc_schedule_on_exec_ctx); /* Write data */ - grpc_endpoint_write(sfd.client, &outgoing, &done_write_closure); - grpc_core::ExecCtx::Get()->Flush(); + grpc_endpoint_write(&exec_ctx, sfd.client, &outgoing, &done_write_closure); + grpc_exec_ctx_finish(&exec_ctx); /* Await completion, unless the request is large and write may not finish * before the peer shuts down. */ @@ -146,9 +149,10 @@ void grpc_run_bad_client_test( if (flags & GRPC_BAD_CLIENT_DISCONNECT) { grpc_endpoint_shutdown( - sfd.client, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Forced Disconnect")); - grpc_endpoint_destroy(sfd.client); - grpc_core::ExecCtx::Get()->Flush(); + &exec_ctx, sfd.client, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Forced Disconnect")); + grpc_endpoint_destroy(&exec_ctx, sfd.client); + grpc_exec_ctx_finish(&exec_ctx); sfd.client = nullptr; } @@ -167,8 +171,9 @@ void grpc_run_bad_client_test( grpc_closure read_done_closure; GRPC_CLOSURE_INIT(&read_done_closure, read_done, &read_done_event, grpc_schedule_on_exec_ctx); - grpc_endpoint_read(sfd.client, &incoming, &read_done_closure); - grpc_core::ExecCtx::Get()->Flush(); + grpc_endpoint_read(&exec_ctx, sfd.client, &incoming, + &read_done_closure); + grpc_exec_ctx_finish(&exec_ctx); do { GPR_ASSERT(gpr_time_cmp(deadline, gpr_now(deadline.clock_type)) > 0); GPR_ASSERT( @@ -181,13 +186,14 @@ void grpc_run_bad_client_test( "client validator failed; trying additional read " "in case we didn't get all the data"); } - grpc_slice_buffer_destroy_internal(&incoming); + grpc_slice_buffer_destroy_internal(&exec_ctx, &incoming); } // Shutdown. grpc_endpoint_shutdown( - sfd.client, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); - grpc_endpoint_destroy(sfd.client); - grpc_core::ExecCtx::Get()->Flush(); + &exec_ctx, sfd.client, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); + grpc_endpoint_destroy(&exec_ctx, sfd.client); + grpc_exec_ctx_finish(&exec_ctx); } GPR_ASSERT( @@ -201,7 +207,8 @@ void grpc_run_bad_client_test( grpc_completion_queue_destroy(shutdown_cq); grpc_server_destroy(a.server); grpc_completion_queue_destroy(a.cq); - grpc_slice_buffer_destroy_internal(&outgoing); + grpc_slice_buffer_destroy_internal(&exec_ctx, &outgoing); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); } diff --git a/test/core/bad_client/tests/badreq.cc b/test/core/bad_client/tests/badreq.cc index eeaf4c99748..c30244e0cdd 100644 --- a/test/core/bad_client/tests/badreq.cc +++ b/test/core/bad_client/tests/badreq.cc @@ -20,8 +20,6 @@ #include -#include - #include "src/core/lib/surface/server.h" #include "test/core/end2end/cq_verifier.h" @@ -40,7 +38,6 @@ static void verifier(grpc_server* server, grpc_completion_queue* cq, int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); /* invalid content type */ GRPC_RUN_BAD_CLIENT_TEST( @@ -129,6 +126,5 @@ int main(int argc, char** argv) { "\x10\x0auser-agent\"bad-client grpc-c/0.12.0.0 (linux)", GRPC_BAD_CLIENT_DISCONNECT); - grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/connection_prefix.cc b/test/core/bad_client/tests/connection_prefix.cc index 4aab234d3e5..47252f9f105 100644 --- a/test/core/bad_client/tests/connection_prefix.cc +++ b/test/core/bad_client/tests/connection_prefix.cc @@ -30,7 +30,6 @@ static void verifier(grpc_server* server, grpc_completion_queue* cq, int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, "X", 0); GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, "PX", 0); @@ -58,7 +57,5 @@ int main(int argc, char** argv) { 0); GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, "PRI * HTTP/2.0\r\n\r\nSM\r\n\rX", 0); - - grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/head_of_line_blocking.cc b/test/core/bad_client/tests/head_of_line_blocking.cc index f56c4d71dd6..bbc56119914 100644 --- a/test/core/bad_client/tests/head_of_line_blocking.cc +++ b/test/core/bad_client/tests/head_of_line_blocking.cc @@ -20,7 +20,6 @@ #include -#include #include #include "src/core/lib/surface/server.h" @@ -110,7 +109,6 @@ static void addbuf(const void* data, size_t len) { int main(int argc, char** argv) { int i; grpc_test_init(argc, argv); - grpc_init(); #define NUM_FRAMES 10 #define FRAME_SIZE 1000 @@ -133,7 +131,6 @@ int main(int argc, char** argv) { } grpc_run_bad_client_test(verifier, nullptr, g_buffer, g_count, 0); gpr_free(g_buffer); - grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/headers.cc b/test/core/bad_client/tests/headers.cc index 2aa1b280cee..50bb72c493a 100644 --- a/test/core/bad_client/tests/headers.cc +++ b/test/core/bad_client/tests/headers.cc @@ -34,7 +34,6 @@ static void verifier(grpc_server* server, grpc_completion_queue* cq, int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); /* partial http2 header prefixes */ GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, PFX_STR "\x00", @@ -336,6 +335,5 @@ int main(int argc, char** argv) { "15 seconds", GRPC_BAD_CLIENT_DISCONNECT); - grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/initial_settings_frame.cc b/test/core/bad_client/tests/initial_settings_frame.cc index 0220000ecea..edc52f503e5 100644 --- a/test/core/bad_client/tests/initial_settings_frame.cc +++ b/test/core/bad_client/tests/initial_settings_frame.cc @@ -33,7 +33,6 @@ static void verifier(grpc_server* server, grpc_completion_queue* cq, int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); /* various partial prefixes */ GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, PFX_STR "\x00", @@ -107,6 +106,5 @@ int main(int argc, char** argv) { PFX_STR ONE_SETTING_HDR "\x00\x99\x00\x00\x00\x00", GRPC_BAD_CLIENT_DISCONNECT); - grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/server_registered_method.cc b/test/core/bad_client/tests/server_registered_method.cc index c2dc9c66af1..6613c94b419 100644 --- a/test/core/bad_client/tests/server_registered_method.cc +++ b/test/core/bad_client/tests/server_registered_method.cc @@ -77,7 +77,6 @@ static void verifier_fails(grpc_server* server, grpc_completion_queue* cq, int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); /* body generated with * tools/codegen/core/gen_server_registered_method_bad_client_test_body.py */ @@ -124,6 +123,5 @@ int main(int argc, char** argv) { "\x00\x00\x07\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\x02\x00\x00", 0); - grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/simple_request.cc b/test/core/bad_client/tests/simple_request.cc index c80fc5cb4af..9f4a03e69b3 100644 --- a/test/core/bad_client/tests/simple_request.cc +++ b/test/core/bad_client/tests/simple_request.cc @@ -20,8 +20,6 @@ #include -#include - #include "src/core/lib/surface/server.h" #include "test/core/end2end/cq_verifier.h" @@ -124,7 +122,6 @@ static void failure_verifier(grpc_server* server, grpc_completion_queue* cq, int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); /* basic request: check that things are working */ GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, PFX_STR, 0); @@ -167,6 +164,5 @@ int main(int argc, char** argv) { GRPC_RUN_BAD_CLIENT_TEST(failure_verifier, nullptr, PFX_STR "\x00\x00\x00\x03\x10\x00\x00\x00\x01", 0); - grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/unknown_frame.cc b/test/core/bad_client/tests/unknown_frame.cc index b1b618a43f3..d962a4244d0 100644 --- a/test/core/bad_client/tests/unknown_frame.cc +++ b/test/core/bad_client/tests/unknown_frame.cc @@ -33,7 +33,6 @@ static void verifier(grpc_server* server, grpc_completion_queue* cq, } int main(int argc, char** argv) { - grpc_init(); grpc_test_init(argc, argv); /* test adding prioritization data */ @@ -41,6 +40,5 @@ int main(int argc, char** argv) { PFX_STR "\x00\x00\x00\x88\x00\x00\x00\x00\x01", GRPC_BAD_CLIENT_DISCONNECT); - grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/window_overflow.cc b/test/core/bad_client/tests/window_overflow.cc index ed8279c9519..f4bd81828be 100644 --- a/test/core/bad_client/tests/window_overflow.cc +++ b/test/core/bad_client/tests/window_overflow.cc @@ -20,7 +20,6 @@ #include -#include #include #include "src/core/lib/surface/server.h" @@ -73,7 +72,6 @@ int main(int argc, char** argv) { #define SEND_SIZE (6 * 1024 * 1024) #define NUM_FRAMES (SEND_SIZE / FRAME_SIZE + 1) grpc_test_init(argc, argv); - grpc_init(); addbuf(PFX_STR, sizeof(PFX_STR) - 1); for (i = 0; i < NUM_FRAMES; i++) { @@ -95,7 +93,6 @@ int main(int argc, char** argv) { grpc_run_bad_client_test(verifier, nullptr, g_buffer, g_count, GRPC_BAD_CLIENT_LARGE_REQUEST); gpr_free(g_buffer); - grpc_shutdown(); return 0; } diff --git a/test/core/channel/channel_args_test.cc b/test/core/channel/channel_args_test.cc index 4a8195e984e..e8b33341851 100644 --- a/test/core/channel/channel_args_test.cc +++ b/test/core/channel/channel_args_test.cc @@ -26,7 +26,7 @@ #include "test/core/util/test_config.h" static void test_create(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_arg arg_int; grpc_arg arg_string; @@ -55,11 +55,12 @@ static void test_create(void) { GPR_ASSERT(strcmp(ch_args->args[1].value.string, arg_string.value.string) == 0); - grpc_channel_args_destroy(ch_args); + grpc_channel_args_destroy(&exec_ctx, ch_args); + grpc_exec_ctx_finish(&exec_ctx); } static void test_set_compression_algorithm(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_channel_args* ch_args; ch_args = @@ -69,11 +70,12 @@ static void test_set_compression_algorithm(void) { GRPC_COMPRESSION_CHANNEL_DEFAULT_ALGORITHM) == 0); GPR_ASSERT(ch_args->args[0].type == GRPC_ARG_INTEGER); - grpc_channel_args_destroy(ch_args); + grpc_channel_args_destroy(&exec_ctx, ch_args); + grpc_exec_ctx_finish(&exec_ctx); } static void test_compression_algorithm_states(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_channel_args *ch_args, *ch_args_wo_gzip, *ch_args_wo_gzip_deflate; unsigned states_bitset; size_t i; @@ -89,10 +91,10 @@ static void test_compression_algorithm_states(void) { /* disable gzip and deflate */ ch_args_wo_gzip = grpc_channel_args_compression_algorithm_set_state( - &ch_args, GRPC_COMPRESS_GZIP, 0); + &exec_ctx, &ch_args, GRPC_COMPRESS_GZIP, 0); GPR_ASSERT(ch_args == ch_args_wo_gzip); ch_args_wo_gzip_deflate = grpc_channel_args_compression_algorithm_set_state( - &ch_args_wo_gzip, GRPC_COMPRESS_DEFLATE, 0); + &exec_ctx, &ch_args_wo_gzip, GRPC_COMPRESS_DEFLATE, 0); GPR_ASSERT(ch_args_wo_gzip == ch_args_wo_gzip_deflate); states_bitset = (unsigned)grpc_channel_args_compression_algorithm_get_states( @@ -107,7 +109,7 @@ static void test_compression_algorithm_states(void) { /* re-enabled gzip only */ ch_args_wo_gzip = grpc_channel_args_compression_algorithm_set_state( - &ch_args_wo_gzip_deflate, GRPC_COMPRESS_GZIP, 1); + &exec_ctx, &ch_args_wo_gzip_deflate, GRPC_COMPRESS_GZIP, 1); GPR_ASSERT(ch_args_wo_gzip == ch_args_wo_gzip_deflate); states_bitset = (unsigned)grpc_channel_args_compression_algorithm_get_states( @@ -120,7 +122,8 @@ static void test_compression_algorithm_states(void) { } } - grpc_channel_args_destroy(ch_args); + grpc_channel_args_destroy(&exec_ctx, ch_args); + grpc_exec_ctx_finish(&exec_ctx); } static void test_set_socket_mutator(void) { @@ -134,8 +137,9 @@ static void test_set_socket_mutator(void) { GPR_ASSERT(ch_args->args[0].type == GRPC_ARG_POINTER); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(ch_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, ch_args); + grpc_exec_ctx_finish(&exec_ctx); } } diff --git a/test/core/channel/channel_stack_builder_test.cc b/test/core/channel/channel_stack_builder_test.cc index ef6db81b0b4..a67f0efafeb 100644 --- a/test/core/channel/channel_stack_builder_test.cc +++ b/test/core/channel/channel_stack_builder_test.cc @@ -29,30 +29,34 @@ #include "src/core/lib/surface/channel_init.h" #include "test/core/util/test_config.h" -static grpc_error* channel_init_func(grpc_channel_element* elem, +static grpc_error* channel_init_func(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } -static grpc_error* call_init_func(grpc_call_element* elem, +static grpc_error* call_init_func(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { return GRPC_ERROR_NONE; } -static void channel_destroy_func(grpc_channel_element* elem) {} +static void channel_destroy_func(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) {} -static void call_destroy_func(grpc_call_element* elem, +static void call_destroy_func(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) {} -static void call_func(grpc_call_element* elem, +static void call_func(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, grpc_transport_stream_op_batch* op) {} -static void channel_func(grpc_channel_element* elem, grpc_transport_op* op) { +static void channel_func(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, + grpc_transport_op* op) { if (op->disconnect_with_error != GRPC_ERROR_NONE) { GRPC_ERROR_UNREF(op->disconnect_with_error); } - GRPC_CLOSURE_SCHED(op->on_consumed, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, op->on_consumed, GRPC_ERROR_NONE); } bool g_replacement_fn_called = false; @@ -102,7 +106,8 @@ const grpc_channel_filter original_filter = { grpc_channel_next_get_info, "filter_name"}; -static bool add_replacement_filter(grpc_channel_stack_builder* builder, +static bool add_replacement_filter(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, void* arg) { const grpc_channel_filter* filter = static_cast(arg); @@ -113,7 +118,8 @@ static bool add_replacement_filter(grpc_channel_stack_builder* builder, builder, filter, set_arg_once_fn, &g_replacement_fn_called); } -static bool add_original_filter(grpc_channel_stack_builder* builder, +static bool add_original_filter(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, void* arg) { return grpc_channel_stack_builder_prepend_filter( builder, (const grpc_channel_filter*)arg, set_arg_once_fn, diff --git a/test/core/channel/channel_stack_test.cc b/test/core/channel/channel_stack_test.cc index ef43facd6ed..988ea9bac9d 100644 --- a/test/core/channel/channel_stack_test.cc +++ b/test/core/channel/channel_stack_test.cc @@ -27,7 +27,8 @@ #include "src/core/lib/slice/slice_internal.h" #include "test/core/util/test_config.h" -static grpc_error* channel_init_func(grpc_channel_element* elem, +static grpc_error* channel_init_func(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { GPR_ASSERT(args->channel_args->num_args == 1); GPR_ASSERT(args->channel_args->args[0].type == GRPC_ARG_INTEGER); @@ -39,37 +40,42 @@ static grpc_error* channel_init_func(grpc_channel_element* elem, return GRPC_ERROR_NONE; } -static grpc_error* call_init_func(grpc_call_element* elem, +static grpc_error* call_init_func(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { ++*(int*)(elem->channel_data); *(int*)(elem->call_data) = 0; return GRPC_ERROR_NONE; } -static void channel_destroy_func(grpc_channel_element* elem) {} +static void channel_destroy_func(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) {} -static void call_destroy_func(grpc_call_element* elem, +static void call_destroy_func(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { ++*(int*)(elem->channel_data); } -static void call_func(grpc_call_element* elem, +static void call_func(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, grpc_transport_stream_op_batch* op) { ++*(int*)(elem->call_data); } -static void channel_func(grpc_channel_element* elem, grpc_transport_op* op) { +static void channel_func(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, + grpc_transport_op* op) { ++*(int*)(elem->channel_data); } -static void free_channel(void* arg, grpc_error* error) { - grpc_channel_stack_destroy(static_cast(arg)); +static void free_channel(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { + grpc_channel_stack_destroy(exec_ctx, static_cast(arg)); gpr_free(arg); } -static void free_call(void* arg, grpc_error* error) { - grpc_call_stack_destroy(static_cast(arg), nullptr, nullptr); +static void free_call(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { + grpc_call_stack_destroy(exec_ctx, static_cast(arg), nullptr, + nullptr); gpr_free(arg); } @@ -95,7 +101,7 @@ static void test_create_channel_stack(void) { grpc_channel_args chan_args; int* channel_data; int* call_data; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_slice path = grpc_slice_from_static_string("/service/method"); arg.type = GRPC_ARG_INTEGER; @@ -107,8 +113,8 @@ static void test_create_channel_stack(void) { channel_stack = static_cast( gpr_malloc(grpc_channel_stack_size(&filters, 1))); - grpc_channel_stack_init(1, free_channel, channel_stack, &filters, 1, - &chan_args, nullptr, "test", channel_stack); + grpc_channel_stack_init(&exec_ctx, 1, free_channel, channel_stack, &filters, + 1, &chan_args, nullptr, "test", channel_stack); GPR_ASSERT(channel_stack->count == 1); channel_elem = grpc_channel_stack_element(channel_stack, 0); channel_data = (int*)channel_elem->channel_data; @@ -126,8 +132,8 @@ static void test_create_channel_stack(void) { nullptr, /* arena */ nullptr /* call_combiner */ }; - grpc_error* error = - grpc_call_stack_init(channel_stack, 1, free_call, call_stack, &args); + grpc_error* error = grpc_call_stack_init(&exec_ctx, channel_stack, 1, + free_call, call_stack, &args); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(call_stack->count == 1); call_elem = grpc_call_stack_element(call_stack, 0); @@ -137,13 +143,14 @@ static void test_create_channel_stack(void) { GPR_ASSERT(*call_data == 0); GPR_ASSERT(*channel_data == 1); - GRPC_CALL_STACK_UNREF(call_stack, "done"); - grpc_core::ExecCtx::Get()->Flush(); + GRPC_CALL_STACK_UNREF(&exec_ctx, call_stack, "done"); + grpc_exec_ctx_flush(&exec_ctx); GPR_ASSERT(*channel_data == 2); - GRPC_CHANNEL_STACK_UNREF(channel_stack, "done"); + GRPC_CHANNEL_STACK_UNREF(&exec_ctx, channel_stack, "done"); - grpc_slice_unref_internal(path); + grpc_slice_unref_internal(&exec_ctx, path); + grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { diff --git a/test/core/channel/minimal_stack_is_minimal_test.cc b/test/core/channel/minimal_stack_is_minimal_test.cc index 3495f603e4f..e0cffa39a87 100644 --- a/test/core/channel/minimal_stack_is_minimal_test.cc +++ b/test/core/channel/minimal_stack_is_minimal_test.cc @@ -125,10 +125,12 @@ static int check_stack(const char* file, int line, const char* transport_name, grpc_channel_stack_builder_set_transport(builder, &fake_transport); } { - grpc_core::ExecCtx exec_ctx; - grpc_channel_stack_builder_set_channel_arguments(builder, channel_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_stack_builder_set_channel_arguments(&exec_ctx, builder, + channel_args); GPR_ASSERT(grpc_channel_init_create_stack( - builder, (grpc_channel_stack_type)channel_stack_type)); + &exec_ctx, builder, (grpc_channel_stack_type)channel_stack_type)); + grpc_exec_ctx_finish(&exec_ctx); } // build up our expectation list @@ -210,9 +212,10 @@ static int check_stack(const char* file, int line, const char* transport_name, gpr_free(expect); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_stack_builder_destroy(builder); - grpc_channel_args_destroy(channel_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_stack_builder_destroy(&exec_ctx, builder); + grpc_channel_args_destroy(&exec_ctx, channel_args); + grpc_exec_ctx_finish(&exec_ctx); } return result; diff --git a/test/core/client_channel/lb_policies_test.cc b/test/core/client_channel/lb_policies_test.cc index 847ea0066ba..5f8d3b84ccb 100644 --- a/test/core/client_channel/lb_policies_test.cc +++ b/test/core/client_channel/lb_policies_test.cc @@ -651,8 +651,9 @@ static void test_get_channel_info() { grpc_channel_args* args = grpc_channel_args_copy_and_add(nullptr, &arg, 1); channel = grpc_insecure_channel_create("ipv4:127.0.0.1:1234", args, nullptr); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, args); + grpc_exec_ctx_finish(&exec_ctx); } // Ensures that resolver returns. grpc_channel_check_connectivity_state(channel, true /* try_to_connect */); @@ -958,7 +959,7 @@ static void verify_rebirth_round_robin(const servers_fixture* f, } int main(int argc, char** argv) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; test_spec* spec; size_t i; const size_t NUM_ITERS = 10; @@ -968,9 +969,9 @@ int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_tracer_set_enabled("round_robin", 1); - GPR_ASSERT(grpc_lb_policy_create("this-lb-policy-does-not-exist", nullptr) == - nullptr); - GPR_ASSERT(grpc_lb_policy_create(nullptr, nullptr) == nullptr); + GPR_ASSERT(grpc_lb_policy_create(&exec_ctx, "this-lb-policy-does-not-exist", + nullptr) == nullptr); + GPR_ASSERT(grpc_lb_policy_create(&exec_ctx, nullptr, nullptr) == nullptr); spec = test_spec_create(NUM_ITERS, NUM_SERVERS); /* everything is fine, all servers stay up the whole time and life's peachy @@ -1024,6 +1025,7 @@ int main(int argc, char** argv) { test_ping(); test_get_channel_info(); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); return 0; } diff --git a/test/core/client_channel/parse_address_test.cc b/test/core/client_channel/parse_address_test.cc index 6d56961d84a..94f76da920a 100644 --- a/test/core/client_channel/parse_address_test.cc +++ b/test/core/client_channel/parse_address_test.cc @@ -24,7 +24,6 @@ #include #endif -#include #include #include "src/core/lib/iomgr/exec_ctx.h" @@ -34,8 +33,8 @@ #ifdef GRPC_HAVE_UNIX_SOCKET static void test_grpc_parse_unix(const char* uri_text, const char* pathname) { - grpc_core::ExecCtx exec_ctx; - grpc_uri* uri = grpc_uri_parse(uri_text, 0); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_uri* uri = grpc_uri_parse(&exec_ctx, uri_text, 0); grpc_resolved_address addr; GPR_ASSERT(1 == grpc_parse_unix(uri, &addr)); @@ -44,6 +43,7 @@ static void test_grpc_parse_unix(const char* uri_text, const char* pathname) { GPR_ASSERT(0 == strcmp(addr_un->sun_path, pathname)); grpc_uri_destroy(uri); + grpc_exec_ctx_finish(&exec_ctx); } #else /* GRPC_HAVE_UNIX_SOCKET */ @@ -54,8 +54,8 @@ static void test_grpc_parse_unix(const char* uri_text, const char* pathname) {} static void test_grpc_parse_ipv4(const char* uri_text, const char* host, unsigned short port) { - grpc_core::ExecCtx exec_ctx; - grpc_uri* uri = grpc_uri_parse(uri_text, 0); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_uri* uri = grpc_uri_parse(&exec_ctx, uri_text, 0); grpc_resolved_address addr; char ntop_buf[INET_ADDRSTRLEN]; @@ -68,12 +68,13 @@ static void test_grpc_parse_ipv4(const char* uri_text, const char* host, GPR_ASSERT(ntohs(addr_in->sin_port) == port); grpc_uri_destroy(uri); + grpc_exec_ctx_finish(&exec_ctx); } static void test_grpc_parse_ipv6(const char* uri_text, const char* host, unsigned short port, uint32_t scope_id) { - grpc_core::ExecCtx exec_ctx; - grpc_uri* uri = grpc_uri_parse(uri_text, 0); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_uri* uri = grpc_uri_parse(&exec_ctx, uri_text, 0); grpc_resolved_address addr; char ntop_buf[INET6_ADDRSTRLEN]; @@ -87,16 +88,14 @@ static void test_grpc_parse_ipv6(const char* uri_text, const char* host, GPR_ASSERT(addr_in6->sin6_scope_id == scope_id); grpc_uri_destroy(uri); + grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); test_grpc_parse_unix("unix:/path/name", "/path/name"); test_grpc_parse_ipv4("ipv4:192.0.2.1:12345", "192.0.2.1", 12345); test_grpc_parse_ipv6("ipv6:[2001:db8::1]:12345", "2001:db8::1", 12345, 0); test_grpc_parse_ipv6("ipv6:[2001:db8::1%252]:12345", "2001:db8::1", 12345, 2); - - grpc_shutdown(); } diff --git a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc index 18a795fbcb2..dcf315eba5a 100644 --- a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc @@ -35,7 +35,8 @@ static gpr_mu g_mu; static bool g_fail_resolution = true; static grpc_combiner* g_combiner; -static void my_resolve_address(const char* addr, const char* default_port, +static void my_resolve_address(grpc_exec_ctx* exec_ctx, const char* addr, + const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addrs) { @@ -54,13 +55,13 @@ static void my_resolve_address(const char* addr, const char* default_port, gpr_malloc(sizeof(*(*addrs)->addrs))); (*addrs)->addrs[0].len = 123; } - GRPC_CLOSURE_SCHED(on_done, error); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, error); } static grpc_ares_request* my_dns_lookup_ares( - const char* dns_server, const char* addr, const char* default_port, - grpc_pollset_set* interested_parties, grpc_closure* on_done, - grpc_lb_addresses** lb_addrs, bool check_grpclb, + grpc_exec_ctx* exec_ctx, const char* dns_server, const char* addr, + const char* default_port, grpc_pollset_set* interested_parties, + grpc_closure* on_done, grpc_lb_addresses** lb_addrs, bool check_grpclb, char** service_config_json) { gpr_mu_lock(&g_mu); GPR_ASSERT(0 == strcmp("test", addr)); @@ -75,26 +76,27 @@ static grpc_ares_request* my_dns_lookup_ares( grpc_lb_addresses_set_address(*lb_addrs, 0, nullptr, 0, false, nullptr, nullptr); } - GRPC_CLOSURE_SCHED(on_done, error); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, error); return nullptr; } -static grpc_resolver* create_resolver(const char* name) { +static grpc_resolver* create_resolver(grpc_exec_ctx* exec_ctx, + const char* name) { grpc_resolver_factory* factory = grpc_resolver_factory_lookup("dns"); - grpc_uri* uri = grpc_uri_parse(name, 0); + grpc_uri* uri = grpc_uri_parse(exec_ctx, name, 0); GPR_ASSERT(uri); grpc_resolver_args args; memset(&args, 0, sizeof(args)); args.uri = uri; args.combiner = g_combiner; grpc_resolver* resolver = - grpc_resolver_factory_create_resolver(factory, &args); + grpc_resolver_factory_create_resolver(exec_ctx, factory, &args); grpc_resolver_factory_unref(factory); grpc_uri_destroy(uri); return resolver; } -static void on_done(void* ev, grpc_error* error) { +static void on_done(grpc_exec_ctx* exec_ctx, void* ev, grpc_error* error) { gpr_event_set((gpr_event*)ev, (void*)1); } @@ -105,8 +107,9 @@ static bool wait_loop(int deadline_seconds, gpr_event* ev) { if (gpr_event_wait(ev, grpc_timeout_seconds_to_deadline(1))) return true; deadline_seconds--; - grpc_core::ExecCtx exec_ctx; - grpc_timer_check(nullptr); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_timer_check(&exec_ctx, nullptr); + grpc_exec_ctx_finish(&exec_ctx); } return false; } @@ -117,14 +120,16 @@ typedef struct next_args { grpc_closure* on_complete; } next_args; -static void call_resolver_next_now_lock_taken(void* arg, +static void call_resolver_next_now_lock_taken(grpc_exec_ctx* exec_ctx, + void* arg, grpc_error* error_unused) { next_args* a = static_cast(arg); - grpc_resolver_next_locked(a->resolver, a->result, a->on_complete); + grpc_resolver_next_locked(exec_ctx, a->resolver, a->result, a->on_complete); gpr_free(a); } -static void call_resolver_next_after_locking(grpc_resolver* resolver, +static void call_resolver_next_after_locking(grpc_exec_ctx* exec_ctx, + grpc_resolver* resolver, grpc_channel_args** result, grpc_closure* on_complete) { next_args* a = static_cast(gpr_malloc(sizeof(*a))); @@ -132,6 +137,7 @@ static void call_resolver_next_after_locking(grpc_resolver* resolver, a->result = result; a->on_complete = on_complete; GRPC_CLOSURE_SCHED( + exec_ctx, GRPC_CLOSURE_CREATE(call_resolver_next_now_lock_taken, a, grpc_combiner_scheduler(resolver->combiner)), GRPC_ERROR_NONE); @@ -147,31 +153,30 @@ int main(int argc, char** argv) { grpc_dns_lookup_ares = my_dns_lookup_ares; grpc_channel_args* result = (grpc_channel_args*)1; - { - grpc_core::ExecCtx exec_ctx; - grpc_resolver* resolver = create_resolver("dns:test"); - gpr_event ev1; - gpr_event_init(&ev1); - call_resolver_next_after_locking( - resolver, &result, - GRPC_CLOSURE_CREATE(on_done, &ev1, grpc_schedule_on_exec_ctx)); - grpc_core::ExecCtx::Get()->Flush(); - GPR_ASSERT(wait_loop(5, &ev1)); - GPR_ASSERT(result == nullptr); - - gpr_event ev2; - gpr_event_init(&ev2); - call_resolver_next_after_locking( - resolver, &result, - GRPC_CLOSURE_CREATE(on_done, &ev2, grpc_schedule_on_exec_ctx)); - grpc_core::ExecCtx::Get()->Flush(); - GPR_ASSERT(wait_loop(30, &ev2)); - GPR_ASSERT(result != nullptr); - - grpc_channel_args_destroy(result); - GRPC_RESOLVER_UNREF(resolver, "test"); - GRPC_COMBINER_UNREF(g_combiner, "test"); - } + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resolver* resolver = create_resolver(&exec_ctx, "dns:test"); + gpr_event ev1; + gpr_event_init(&ev1); + call_resolver_next_after_locking( + &exec_ctx, resolver, &result, + GRPC_CLOSURE_CREATE(on_done, &ev1, grpc_schedule_on_exec_ctx)); + grpc_exec_ctx_flush(&exec_ctx); + GPR_ASSERT(wait_loop(5, &ev1)); + GPR_ASSERT(result == nullptr); + + gpr_event ev2; + gpr_event_init(&ev2); + call_resolver_next_after_locking( + &exec_ctx, resolver, &result, + GRPC_CLOSURE_CREATE(on_done, &ev2, grpc_schedule_on_exec_ctx)); + grpc_exec_ctx_flush(&exec_ctx); + GPR_ASSERT(wait_loop(30, &ev2)); + GPR_ASSERT(result != nullptr); + + grpc_channel_args_destroy(&exec_ctx, result); + GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "test"); + GRPC_COMBINER_UNREF(&exec_ctx, g_combiner, "test"); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); gpr_mu_destroy(&g_mu); diff --git a/test/core/client_channel/resolvers/dns_resolver_test.cc b/test/core/client_channel/resolvers/dns_resolver_test.cc index 80667908ef2..4c040caeb92 100644 --- a/test/core/client_channel/resolvers/dns_resolver_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_test.cc @@ -28,8 +28,8 @@ static grpc_combiner* g_combiner; static void test_succeeds(grpc_resolver_factory* factory, const char* string) { - grpc_core::ExecCtx exec_ctx; - grpc_uri* uri = grpc_uri_parse(string, 0); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_uri* uri = grpc_uri_parse(&exec_ctx, string, 0); grpc_resolver_args args; grpc_resolver* resolver; gpr_log(GPR_DEBUG, "test: '%s' should be valid for '%s'", string, @@ -38,15 +38,16 @@ static void test_succeeds(grpc_resolver_factory* factory, const char* string) { memset(&args, 0, sizeof(args)); args.uri = uri; args.combiner = g_combiner; - resolver = grpc_resolver_factory_create_resolver(factory, &args); + resolver = grpc_resolver_factory_create_resolver(&exec_ctx, factory, &args); GPR_ASSERT(resolver != nullptr); - GRPC_RESOLVER_UNREF(resolver, "test_succeeds"); + GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "test_succeeds"); grpc_uri_destroy(uri); + grpc_exec_ctx_finish(&exec_ctx); } static void test_fails(grpc_resolver_factory* factory, const char* string) { - grpc_core::ExecCtx exec_ctx; - grpc_uri* uri = grpc_uri_parse(string, 0); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_uri* uri = grpc_uri_parse(&exec_ctx, string, 0); grpc_resolver_args args; grpc_resolver* resolver; gpr_log(GPR_DEBUG, "test: '%s' should be invalid for '%s'", string, @@ -55,9 +56,10 @@ static void test_fails(grpc_resolver_factory* factory, const char* string) { memset(&args, 0, sizeof(args)); args.uri = uri; args.combiner = g_combiner; - resolver = grpc_resolver_factory_create_resolver(factory, &args); + resolver = grpc_resolver_factory_create_resolver(&exec_ctx, factory, &args); GPR_ASSERT(resolver == nullptr); grpc_uri_destroy(uri); + grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { @@ -80,8 +82,9 @@ int main(int argc, char** argv) { grpc_resolver_factory_unref(dns); { - grpc_core::ExecCtx exec_ctx; - GRPC_COMBINER_UNREF(g_combiner, "test"); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_COMBINER_UNREF(&exec_ctx, g_combiner, "test"); + grpc_exec_ctx_finish(&exec_ctx); } grpc_shutdown(); diff --git a/test/core/client_channel/resolvers/fake_resolver_test.cc b/test/core/client_channel/resolvers/fake_resolver_test.cc index d85cbb1d036..d5538e96217 100644 --- a/test/core/client_channel/resolvers/fake_resolver_test.cc +++ b/test/core/client_channel/resolvers/fake_resolver_test.cc @@ -33,7 +33,7 @@ #include "test/core/util/test_config.h" static grpc_resolver* build_fake_resolver( - grpc_combiner* combiner, + grpc_exec_ctx* exec_ctx, grpc_combiner* combiner, grpc_fake_resolver_response_generator* response_generator) { grpc_resolver_factory* factory = grpc_resolver_factory_lookup("fake"); grpc_arg generator_arg = @@ -44,7 +44,7 @@ static grpc_resolver* build_fake_resolver( args.args = &channel_args; args.combiner = combiner; grpc_resolver* resolver = - grpc_resolver_factory_create_resolver(factory, &args); + grpc_resolver_factory_create_resolver(exec_ctx, factory, &args); grpc_resolver_factory_unref(factory); return resolver; } @@ -55,7 +55,7 @@ typedef struct on_resolution_arg { gpr_event ev; } on_resolution_arg; -void on_resolution_cb(void* arg, grpc_error* error) { +void on_resolution_cb(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { on_resolution_arg* res = static_cast(arg); // We only check the addresses channel arg because that's the only one // explicitly set by the test via @@ -66,23 +66,24 @@ void on_resolution_cb(void* arg, grpc_error* error) { grpc_lb_addresses_find_channel_arg(res->expected_resolver_result); GPR_ASSERT( grpc_lb_addresses_cmp(actual_lb_addresses, expected_lb_addresses) == 0); - grpc_channel_args_destroy(res->resolver_result); - grpc_channel_args_destroy(res->expected_resolver_result); + grpc_channel_args_destroy(exec_ctx, res->resolver_result); + grpc_channel_args_destroy(exec_ctx, res->expected_resolver_result); gpr_event_set(&res->ev, (void*)1); } static void test_fake_resolver() { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_combiner* combiner = grpc_combiner_create(); // Create resolver. grpc_fake_resolver_response_generator* response_generator = grpc_fake_resolver_response_generator_create(); - grpc_resolver* resolver = build_fake_resolver(combiner, response_generator); + grpc_resolver* resolver = + build_fake_resolver(&exec_ctx, combiner, response_generator); GPR_ASSERT(resolver != nullptr); // Setup expectations. - grpc_uri* uris[] = {grpc_uri_parse("ipv4:10.2.1.1:1234", true), - grpc_uri_parse("ipv4:127.0.0.1:4321", true)}; + grpc_uri* uris[] = {grpc_uri_parse(&exec_ctx, "ipv4:10.2.1.1:1234", true), + grpc_uri_parse(&exec_ctx, "ipv4:127.0.0.1:4321", true)}; const char* balancer_names[] = {"name1", "name2"}; const bool is_balancer[] = {true, false}; grpc_lb_addresses* addresses = grpc_lb_addresses_create(3, nullptr); @@ -95,7 +96,7 @@ static void test_fake_resolver() { grpc_lb_addresses_create_channel_arg(addresses); grpc_channel_args* results = grpc_channel_args_copy_and_add(nullptr, &addresses_arg, 1); - grpc_lb_addresses_destroy(addresses); + grpc_lb_addresses_destroy(&exec_ctx, addresses); on_resolution_arg on_res_arg; memset(&on_res_arg, 0, sizeof(on_res_arg)); on_res_arg.expected_resolver_result = results; @@ -105,16 +106,17 @@ static void test_fake_resolver() { // Set resolver results and trigger first resolution. on_resolution_cb // performs the checks. - grpc_fake_resolver_response_generator_set_response(response_generator, - results); - grpc_resolver_next_locked(resolver, &on_res_arg.resolver_result, + grpc_fake_resolver_response_generator_set_response( + &exec_ctx, response_generator, results); + grpc_resolver_next_locked(&exec_ctx, resolver, &on_res_arg.resolver_result, on_resolution); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); GPR_ASSERT(gpr_event_wait(&on_res_arg.ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); // Setup update. - grpc_uri* uris_update[] = {grpc_uri_parse("ipv4:192.168.1.0:31416", true)}; + grpc_uri* uris_update[] = { + grpc_uri_parse(&exec_ctx, "ipv4:192.168.1.0:31416", true)}; const char* balancer_names_update[] = {"name3"}; const bool is_balancer_update[] = {false}; grpc_lb_addresses* addresses_update = grpc_lb_addresses_create(1, nullptr); @@ -129,7 +131,7 @@ static void test_fake_resolver() { grpc_lb_addresses_create_channel_arg(addresses_update); grpc_channel_args* results_update = grpc_channel_args_copy_and_add(nullptr, &addresses_update_arg, 1); - grpc_lb_addresses_destroy(addresses_update); + grpc_lb_addresses_destroy(&exec_ctx, addresses_update); // Setup expectations for the update. on_resolution_arg on_res_arg_update; @@ -140,27 +142,27 @@ static void test_fake_resolver() { grpc_combiner_scheduler(combiner)); // Set updated resolver results and trigger a second resolution. - grpc_fake_resolver_response_generator_set_response(response_generator, - results_update); - grpc_resolver_next_locked(resolver, &on_res_arg_update.resolver_result, - on_resolution); - grpc_core::ExecCtx::Get()->Flush(); + grpc_fake_resolver_response_generator_set_response( + &exec_ctx, response_generator, results_update); + grpc_resolver_next_locked(&exec_ctx, resolver, + &on_res_arg_update.resolver_result, on_resolution); + grpc_exec_ctx_flush(&exec_ctx); GPR_ASSERT(gpr_event_wait(&on_res_arg_update.ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); // Requesting a new resolution without re-senting the response shouldn't // trigger the resolution callback. memset(&on_res_arg, 0, sizeof(on_res_arg)); - grpc_resolver_next_locked(resolver, &on_res_arg.resolver_result, + grpc_resolver_next_locked(&exec_ctx, resolver, &on_res_arg.resolver_result, on_resolution); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); GPR_ASSERT(gpr_event_wait(&on_res_arg.ev, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); - GRPC_COMBINER_UNREF(combiner, "test_fake_resolver"); - GRPC_RESOLVER_UNREF(resolver, "test_fake_resolver"); - + GRPC_COMBINER_UNREF(&exec_ctx, combiner, "test_fake_resolver"); + GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "test_fake_resolver"); + grpc_exec_ctx_finish(&exec_ctx); grpc_fake_resolver_response_generator_unref(response_generator); } diff --git a/test/core/client_channel/resolvers/sockaddr_resolver_test.cc b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc index 4d16a779245..dfa2d12b5e8 100644 --- a/test/core/client_channel/resolvers/sockaddr_resolver_test.cc +++ b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc @@ -35,14 +35,14 @@ typedef struct on_resolution_arg { grpc_channel_args* resolver_result; } on_resolution_arg; -void on_resolution_cb(void* arg, grpc_error* error) { +void on_resolution_cb(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { on_resolution_arg* res = static_cast(arg); - grpc_channel_args_destroy(res->resolver_result); + grpc_channel_args_destroy(exec_ctx, res->resolver_result); } static void test_succeeds(grpc_resolver_factory* factory, const char* string) { - grpc_core::ExecCtx exec_ctx; - grpc_uri* uri = grpc_uri_parse(string, 0); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_uri* uri = grpc_uri_parse(&exec_ctx, string, 0); grpc_resolver_args args; grpc_resolver* resolver; gpr_log(GPR_DEBUG, "test: '%s' should be valid for '%s'", string, @@ -51,7 +51,7 @@ static void test_succeeds(grpc_resolver_factory* factory, const char* string) { memset(&args, 0, sizeof(args)); args.uri = uri; args.combiner = g_combiner; - resolver = grpc_resolver_factory_create_resolver(factory, &args); + resolver = grpc_resolver_factory_create_resolver(&exec_ctx, factory, &args); GPR_ASSERT(resolver != nullptr); on_resolution_arg on_res_arg; @@ -60,16 +60,16 @@ static void test_succeeds(grpc_resolver_factory* factory, const char* string) { grpc_closure* on_resolution = GRPC_CLOSURE_CREATE( on_resolution_cb, &on_res_arg, grpc_schedule_on_exec_ctx); - grpc_resolver_next_locked(resolver, &on_res_arg.resolver_result, + grpc_resolver_next_locked(&exec_ctx, resolver, &on_res_arg.resolver_result, on_resolution); - GRPC_RESOLVER_UNREF(resolver, "test_succeeds"); - + GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "test_succeeds"); + grpc_exec_ctx_finish(&exec_ctx); grpc_uri_destroy(uri); } static void test_fails(grpc_resolver_factory* factory, const char* string) { - grpc_core::ExecCtx exec_ctx; - grpc_uri* uri = grpc_uri_parse(string, 0); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_uri* uri = grpc_uri_parse(&exec_ctx, string, 0); grpc_resolver_args args; grpc_resolver* resolver; gpr_log(GPR_DEBUG, "test: '%s' should be invalid for '%s'", string, @@ -78,9 +78,10 @@ static void test_fails(grpc_resolver_factory* factory, const char* string) { memset(&args, 0, sizeof(args)); args.uri = uri; args.combiner = g_combiner; - resolver = grpc_resolver_factory_create_resolver(factory, &args); + resolver = grpc_resolver_factory_create_resolver(&exec_ctx, factory, &args); GPR_ASSERT(resolver == nullptr); grpc_uri_destroy(uri); + grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { @@ -111,8 +112,9 @@ int main(int argc, char** argv) { grpc_resolver_factory_unref(ipv6); { - grpc_core::ExecCtx exec_ctx; - GRPC_COMBINER_UNREF(g_combiner, "test"); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_COMBINER_UNREF(&exec_ctx, g_combiner, "test"); + grpc_exec_ctx_finish(&exec_ctx); } grpc_shutdown(); diff --git a/test/core/client_channel/uri_fuzzer_test.cc b/test/core/client_channel/uri_fuzzer_test.cc index ee384531661..ba31793ff3b 100644 --- a/test/core/client_channel/uri_fuzzer_test.cc +++ b/test/core/client_channel/uri_fuzzer_test.cc @@ -20,7 +20,6 @@ #include #include -#include #include #include "src/core/ext/filters/client_channel/uri_parser.h" @@ -34,18 +33,12 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { memcpy(s, data, size); s[size] = 0; - grpc_init(); - - { - grpc_core::ExecCtx exec_ctx; - grpc_uri* x; - if ((x = grpc_uri_parse(s, 1))) { - grpc_uri_destroy(x); - } - - gpr_free(s); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_uri* x; + if ((x = grpc_uri_parse(&exec_ctx, s, 1))) { + grpc_uri_destroy(x); } - - grpc_shutdown(); + grpc_exec_ctx_finish(&exec_ctx); + gpr_free(s); return 0; } diff --git a/test/core/client_channel/uri_parser_test.cc b/test/core/client_channel/uri_parser_test.cc index 254bfddfb3c..30183f9f578 100644 --- a/test/core/client_channel/uri_parser_test.cc +++ b/test/core/client_channel/uri_parser_test.cc @@ -20,7 +20,6 @@ #include -#include #include #include "src/core/lib/iomgr/exec_ctx.h" @@ -29,28 +28,29 @@ static void test_succeeds(const char* uri_text, const char* scheme, const char* authority, const char* path, const char* query, const char* fragment) { - grpc_core::ExecCtx exec_ctx; - grpc_uri* uri = grpc_uri_parse(uri_text, 0); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_uri* uri = grpc_uri_parse(&exec_ctx, uri_text, 0); GPR_ASSERT(uri); GPR_ASSERT(0 == strcmp(scheme, uri->scheme)); GPR_ASSERT(0 == strcmp(authority, uri->authority)); GPR_ASSERT(0 == strcmp(path, uri->path)); GPR_ASSERT(0 == strcmp(query, uri->query)); GPR_ASSERT(0 == strcmp(fragment, uri->fragment)); - + grpc_exec_ctx_finish(&exec_ctx); grpc_uri_destroy(uri); } static void test_fails(const char* uri_text) { - grpc_core::ExecCtx exec_ctx; - GPR_ASSERT(nullptr == grpc_uri_parse(uri_text, 0)); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT(nullptr == grpc_uri_parse(&exec_ctx, uri_text, 0)); + grpc_exec_ctx_finish(&exec_ctx); } static void test_query_parts() { { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; const char* uri_text = "http://foo/path?a&b=B&c=&#frag"; - grpc_uri* uri = grpc_uri_parse(uri_text, 0); + grpc_uri* uri = grpc_uri_parse(&exec_ctx, uri_text, 0); GPR_ASSERT(uri); GPR_ASSERT(0 == strcmp("http", uri->scheme)); @@ -77,14 +77,14 @@ static void test_query_parts() { GPR_ASSERT(nullptr == grpc_uri_get_query_arg(uri, "")); GPR_ASSERT(0 == strcmp("frag", uri->fragment)); - + grpc_exec_ctx_finish(&exec_ctx); grpc_uri_destroy(uri); } { /* test the current behavior of multiple query part values */ - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; const char* uri_text = "http://auth/path?foo=bar=baz&foobar=="; - grpc_uri* uri = grpc_uri_parse(uri_text, 0); + grpc_uri* uri = grpc_uri_parse(&exec_ctx, uri_text, 0); GPR_ASSERT(uri); GPR_ASSERT(0 == strcmp("http", uri->scheme)); @@ -96,13 +96,14 @@ static void test_query_parts() { GPR_ASSERT(0 == strcmp("bar", grpc_uri_get_query_arg(uri, "foo"))); GPR_ASSERT(0 == strcmp("", grpc_uri_get_query_arg(uri, "foobar"))); + grpc_exec_ctx_finish(&exec_ctx); grpc_uri_destroy(uri); } { /* empty query */ - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; const char* uri_text = "http://foo/path"; - grpc_uri* uri = grpc_uri_parse(uri_text, 0); + grpc_uri* uri = grpc_uri_parse(&exec_ctx, uri_text, 0); GPR_ASSERT(uri); GPR_ASSERT(0 == strcmp("http", uri->scheme)); @@ -113,14 +114,13 @@ static void test_query_parts() { GPR_ASSERT(nullptr == uri->query_parts); GPR_ASSERT(nullptr == uri->query_parts_values); GPR_ASSERT(0 == strcmp("", uri->fragment)); - + grpc_exec_ctx_finish(&exec_ctx); grpc_uri_destroy(uri); } } int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); test_succeeds("http://www.google.com", "http", "www.google.com", "", "", ""); test_succeeds("dns:///foo", "dns", "", "/foo", "", ""); test_succeeds("http://www.google.com:90", "http", "www.google.com:90", "", "", @@ -148,6 +148,5 @@ int main(int argc, char** argv) { test_fails("http://foo?bar#lol#"); test_query_parts(); - grpc_shutdown(); return 0; } diff --git a/test/core/compression/algorithm_test.cc b/test/core/compression/algorithm_test.cc index 9e811e9af19..2f1d8bc8ebb 100644 --- a/test/core/compression/algorithm_test.cc +++ b/test/core/compression/algorithm_test.cc @@ -39,7 +39,7 @@ static void test_algorithm_mesh(void) { grpc_compression_algorithm parsed; grpc_slice mdstr; grpc_mdelem mdelem; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GPR_ASSERT( grpc_compression_algorithm_name((grpc_compression_algorithm)i, &name)); GPR_ASSERT(grpc_compression_algorithm_parse( @@ -51,8 +51,9 @@ static void test_algorithm_mesh(void) { mdelem = grpc_compression_encoding_mdelem(parsed); GPR_ASSERT(grpc_slice_eq(GRPC_MDVALUE(mdelem), mdstr)); GPR_ASSERT(grpc_slice_eq(GRPC_MDKEY(mdelem), GRPC_MDSTR_GRPC_ENCODING)); - grpc_slice_unref_internal(mdstr); - GRPC_MDELEM_UNREF(mdelem); + grpc_slice_unref_internal(&exec_ctx, mdstr); + GRPC_MDELEM_UNREF(&exec_ctx, mdelem); + grpc_exec_ctx_finish(&exec_ctx); } /* test failure */ @@ -61,7 +62,7 @@ static void test_algorithm_mesh(void) { } static void test_algorithm_failure(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_slice mdstr; gpr_log(GPR_DEBUG, "test_algorithm_failure"); @@ -82,7 +83,8 @@ static void test_algorithm_failure(void) { grpc_compression_algorithm_slice(static_cast( static_cast(GRPC_COMPRESS_ALGORITHMS_COUNT) + 1)), grpc_empty_slice())); - grpc_slice_unref_internal(mdstr); + grpc_slice_unref_internal(&exec_ctx, mdstr); + grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { diff --git a/test/core/compression/message_compress_test.cc b/test/core/compression/message_compress_test.cc index 6ca07b70c4f..676415ba9d9 100644 --- a/test/core/compression/message_compress_test.cc +++ b/test/core/compression/message_compress_test.cc @@ -70,8 +70,10 @@ static void assert_passthrough(grpc_slice value, grpc_split_slices_to_buffer(uncompressed_split_mode, &value, 1, &input); { - grpc_core::ExecCtx exec_ctx; - was_compressed = grpc_msg_compress(algorithm, &input, &compressed_raw); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + was_compressed = + grpc_msg_compress(&exec_ctx, algorithm, &input, &compressed_raw); + grpc_exec_ctx_finish(&exec_ctx); } GPR_ASSERT(input.count > 0); @@ -90,9 +92,11 @@ static void assert_passthrough(grpc_slice value, grpc_split_slice_buffer(compressed_split_mode, &compressed_raw, &compressed); { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GPR_ASSERT(grpc_msg_decompress( - was_compressed ? algorithm : GRPC_COMPRESS_NONE, &compressed, &output)); + &exec_ctx, was_compressed ? algorithm : GRPC_COMPRESS_NONE, &compressed, + &output)); + grpc_exec_ctx_finish(&exec_ctx); } final = grpc_slice_merge(output.slices, output.count); @@ -152,11 +156,11 @@ static void test_tiny_data_compress(void) { for (int i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { if (i == GRPC_COMPRESS_NONE) continue; - grpc_core::ExecCtx exec_ctx; - GPR_ASSERT(0 == - grpc_msg_compress(static_cast(i), - &input, &output)); - + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT(0 == grpc_msg_compress( + &exec_ctx, static_cast(i), + &input, &output)); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(1 == output.count); } @@ -176,9 +180,9 @@ static void test_bad_decompression_data_crc(void) { grpc_slice_buffer_init(&output); grpc_slice_buffer_add(&input, create_test_value(ONE_MB_A)); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; /* compress it */ - grpc_msg_compress(GRPC_COMPRESS_GZIP, &input, &corrupted); + grpc_msg_compress(&exec_ctx, GRPC_COMPRESS_GZIP, &input, &corrupted); /* corrupt the output by smashing the CRC */ GPR_ASSERT(corrupted.count > 1); GPR_ASSERT(GRPC_SLICE_LENGTH(corrupted.slices[1]) > 8); @@ -186,7 +190,9 @@ static void test_bad_decompression_data_crc(void) { memcpy(GRPC_SLICE_START_PTR(corrupted.slices[1]) + idx, &bad, 4); /* try (and fail) to decompress the corrupted compresed buffer */ - GPR_ASSERT(0 == grpc_msg_decompress(GRPC_COMPRESS_GZIP, &corrupted, &output)); + GPR_ASSERT(0 == grpc_msg_decompress(&exec_ctx, GRPC_COMPRESS_GZIP, &corrupted, + &output)); + grpc_exec_ctx_finish(&exec_ctx); grpc_slice_buffer_destroy(&input); grpc_slice_buffer_destroy(&corrupted); @@ -205,8 +211,10 @@ static void test_bad_decompression_data_trailing_garbage(void) { "\x78\xda\x63\x60\x60\x60\x00\x00\x00\x04\x00\x01\x99", 13)); /* try (and fail) to decompress the invalid compresed buffer */ - grpc_core::ExecCtx exec_ctx; - GPR_ASSERT(0 == grpc_msg_decompress(GRPC_COMPRESS_DEFLATE, &input, &output)); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT(0 == grpc_msg_decompress(&exec_ctx, GRPC_COMPRESS_DEFLATE, &input, + &output)); + grpc_exec_ctx_finish(&exec_ctx); grpc_slice_buffer_destroy(&input); grpc_slice_buffer_destroy(&output); @@ -222,8 +230,10 @@ static void test_bad_decompression_data_stream(void) { grpc_slice_from_copied_buffer("\x78\xda\xff\xff", 4)); /* try (and fail) to decompress the invalid compresed buffer */ - grpc_core::ExecCtx exec_ctx; - GPR_ASSERT(0 == grpc_msg_decompress(GRPC_COMPRESS_DEFLATE, &input, &output)); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT(0 == grpc_msg_decompress(&exec_ctx, GRPC_COMPRESS_DEFLATE, &input, + &output)); + grpc_exec_ctx_finish(&exec_ctx); grpc_slice_buffer_destroy(&input); grpc_slice_buffer_destroy(&output); @@ -239,15 +249,17 @@ static void test_bad_compression_algorithm(void) { grpc_slice_buffer_add( &input, grpc_slice_from_copied_string("Never gonna give you up")); - grpc_core::ExecCtx exec_ctx; - was_compressed = - grpc_msg_compress(GRPC_COMPRESS_ALGORITHMS_COUNT, &input, &output); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + was_compressed = grpc_msg_compress(&exec_ctx, GRPC_COMPRESS_ALGORITHMS_COUNT, + &input, &output); GPR_ASSERT(0 == was_compressed); - was_compressed = grpc_msg_compress(static_cast( + was_compressed = grpc_msg_compress(&exec_ctx, + static_cast( GRPC_COMPRESS_ALGORITHMS_COUNT + 123), &input, &output); GPR_ASSERT(0 == was_compressed); + grpc_exec_ctx_finish(&exec_ctx); grpc_slice_buffer_destroy(&input); grpc_slice_buffer_destroy(&output); @@ -263,16 +275,18 @@ static void test_bad_decompression_algorithm(void) { grpc_slice_buffer_add(&input, grpc_slice_from_copied_string( "I'm not really compressed but it doesn't matter")); - grpc_core::ExecCtx exec_ctx; - was_decompressed = - grpc_msg_decompress(GRPC_COMPRESS_ALGORITHMS_COUNT, &input, &output); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + was_decompressed = grpc_msg_decompress( + &exec_ctx, GRPC_COMPRESS_ALGORITHMS_COUNT, &input, &output); GPR_ASSERT(0 == was_decompressed); was_decompressed = - grpc_msg_decompress(static_cast( + grpc_msg_decompress(&exec_ctx, + static_cast( GRPC_COMPRESS_ALGORITHMS_COUNT + 123), &input, &output); GPR_ASSERT(0 == was_decompressed); + grpc_exec_ctx_finish(&exec_ctx); grpc_slice_buffer_destroy(&input); grpc_slice_buffer_destroy(&output); diff --git a/test/core/debug/stats_test.cc b/test/core/debug/stats_test.cc index e60e54b2fdc..5fae61f8f67 100644 --- a/test/core/debug/stats_test.cc +++ b/test/core/debug/stats_test.cc @@ -49,8 +49,9 @@ TEST(StatsTest, IncCounters) { for (int i = 0; i < GRPC_STATS_COUNTER_COUNT; i++) { Snapshot snapshot; - grpc_core::ExecCtx exec_ctx; - GRPC_STATS_INC_COUNTER((grpc_stats_counters)i); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_STATS_INC_COUNTER(&exec_ctx, (grpc_stats_counters)i); + grpc_exec_ctx_finish(&exec_ctx); EXPECT_EQ(snapshot.delta().counters[i], 1); } @@ -59,8 +60,9 @@ TEST(StatsTest, IncCounters) { TEST(StatsTest, IncSpecificCounter) { Snapshot snapshot; - grpc_core::ExecCtx exec_ctx; - GRPC_STATS_INC_SYSCALL_POLL(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_STATS_INC_SYSCALL_POLL(&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); EXPECT_EQ(snapshot.delta().counters[GRPC_STATS_COUNTER_SYSCALL_POLL], 1); } @@ -92,8 +94,9 @@ TEST_P(HistogramTest, IncHistogram) { for (auto j : test_values) { Snapshot snapshot; - grpc_core::ExecCtx exec_ctx; - grpc_stats_inc_histogram[kHistogram](j); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_stats_inc_histogram[kHistogram](&exec_ctx, j); + grpc_exec_ctx_finish(&exec_ctx); auto delta = snapshot.delta(); diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc index 93809ac37a6..0fdb637eadd 100644 --- a/test/core/end2end/bad_server_response_test.cc +++ b/test/core/end2end/bad_server_response_test.cc @@ -91,22 +91,22 @@ static grpc_closure on_write; static void* tag(intptr_t t) { return (void*)t; } -static void done_write(void* arg, grpc_error* error) { +static void done_write(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { GPR_ASSERT(error == GRPC_ERROR_NONE); gpr_atm_rel_store(&state.done_atm, 1); } -static void handle_write() { +static void handle_write(grpc_exec_ctx* exec_ctx) { grpc_slice slice = grpc_slice_from_copied_buffer( state.response_payload, state.response_payload_length); grpc_slice_buffer_reset_and_unref(&state.outgoing_buffer); grpc_slice_buffer_add(&state.outgoing_buffer, slice); - grpc_endpoint_write(state.tcp, &state.outgoing_buffer, &on_write); + grpc_endpoint_write(exec_ctx, state.tcp, &state.outgoing_buffer, &on_write); } -static void handle_read(void* arg, grpc_error* error) { +static void handle_read(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { GPR_ASSERT(error == GRPC_ERROR_NONE); state.incoming_data_length += state.temp_incoming_buffer.length; @@ -123,13 +123,14 @@ static void handle_read(void* arg, grpc_error* error) { SERVER_INCOMING_DATA_LENGTH_LOWER_THRESHOLD); if (state.incoming_data_length >= SERVER_INCOMING_DATA_LENGTH_LOWER_THRESHOLD) { - handle_write(); + handle_write(exec_ctx); } else { - grpc_endpoint_read(state.tcp, &state.temp_incoming_buffer, &on_read); + grpc_endpoint_read(exec_ctx, state.tcp, &state.temp_incoming_buffer, + &on_read); } } -static void on_connect(void* arg, grpc_endpoint* tcp, +static void on_connect(grpc_exec_ctx* exec_ctx, void* arg, grpc_endpoint* tcp, grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor) { gpr_free(acceptor); @@ -140,8 +141,8 @@ static void on_connect(void* arg, grpc_endpoint* tcp, grpc_slice_buffer_init(&state.outgoing_buffer); state.tcp = tcp; state.incoming_data_length = 0; - grpc_endpoint_add_to_pollset(tcp, server->pollset); - grpc_endpoint_read(tcp, &state.temp_incoming_buffer, &on_read); + grpc_endpoint_add_to_pollset(exec_ctx, tcp, server->pollset); + grpc_endpoint_read(exec_ctx, tcp, &state.temp_incoming_buffer, &on_read); } static gpr_timespec n_sec_deadline(int seconds) { @@ -216,10 +217,10 @@ static void start_rpc(int target_port, grpc_status_code expected_status, cq_verifier_destroy(cqv); } -static void cleanup_rpc() { +static void cleanup_rpc(grpc_exec_ctx* exec_ctx) { grpc_event ev; - grpc_slice_buffer_destroy_internal(&state.temp_incoming_buffer); - grpc_slice_buffer_destroy_internal(&state.outgoing_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, &state.temp_incoming_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, &state.outgoing_buffer); grpc_call_unref(state.call); grpc_completion_queue_shutdown(state.cq); do { @@ -269,7 +270,7 @@ static void run_test(const char* response_payload, grpc_status_code expected_status, const char* expected_detail) { test_tcp_server test_server; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_event ev; grpc_init(); @@ -286,11 +287,11 @@ static void run_test(const char* response_payload, gpr_event_wait(&ev, gpr_inf_future(GPR_CLOCK_REALTIME)); /* clean up */ - grpc_endpoint_shutdown(state.tcp, + grpc_endpoint_shutdown(&exec_ctx, state.tcp, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); - grpc_endpoint_destroy(state.tcp); - cleanup_rpc(); - grpc_core::ExecCtx::Get()->Flush(); + grpc_endpoint_destroy(&exec_ctx, state.tcp); + cleanup_rpc(&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); test_tcp_server_destroy(&test_server); grpc_shutdown(); @@ -298,7 +299,6 @@ static void run_test(const char* response_payload, int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); /* status defined in hpack static table */ run_test(HTTP2_RESP(204), sizeof(HTTP2_RESP(204)) - 1, GRPC_STATUS_CANCELLED, @@ -337,6 +337,5 @@ int main(int argc, char** argv) { run_test(HTTP1_RESP, sizeof(HTTP1_RESP) - 1, GRPC_STATUS_UNAVAILABLE, HTTP1_DETAIL_MSG); - grpc_shutdown(); return 0; } diff --git a/test/core/end2end/connection_refused_test.cc b/test/core/end2end/connection_refused_test.cc index ca6d17e7c89..f3f2dda91df 100644 --- a/test/core/end2end/connection_refused_test.cc +++ b/test/core/end2end/connection_refused_test.cc @@ -133,8 +133,9 @@ static void run_test(bool wait_for_ready, bool use_service_config) { grpc_metadata_array_destroy(&trailing_metadata_recv); { - grpc_core::ExecCtx exec_ctx; - if (args != nullptr) grpc_channel_args_destroy(args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + if (args != nullptr) grpc_channel_args_destroy(&exec_ctx, args); + grpc_exec_ctx_finish(&exec_ctx); } grpc_shutdown(); diff --git a/test/core/end2end/fixtures/h2_census.cc b/test/core/end2end/fixtures/h2_census.cc index 75c80aa1ffd..fed8ead5c8a 100644 --- a/test/core/end2end/fixtures/h2_census.cc +++ b/test/core/end2end/fixtures/h2_census.cc @@ -75,8 +75,9 @@ void chttp2_init_client_fullstack(grpc_end2end_test_fixture* f, grpc_insecure_channel_create(ffd->localaddr, client_args, nullptr); GPR_ASSERT(f->client); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(client_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, client_args); + grpc_exec_ctx_finish(&exec_ctx); } } @@ -91,8 +92,9 @@ void chttp2_init_server_fullstack(grpc_end2end_test_fixture* f, server_args = grpc_channel_args_copy_and_add(server_args, &arg, 1); f->server = grpc_server_create(server_args, nullptr); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(server_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, server_args); + grpc_exec_ctx_finish(&exec_ctx); } grpc_server_register_completion_queue(f->server, f->cq, nullptr); GPR_ASSERT(grpc_server_add_insecure_http2_port(f->server, ffd->localaddr)); diff --git a/test/core/end2end/fixtures/h2_compress.cc b/test/core/end2end/fixtures/h2_compress.cc index 5b9181586cb..ea8990fd0a6 100644 --- a/test/core/end2end/fixtures/h2_compress.cc +++ b/test/core/end2end/fixtures/h2_compress.cc @@ -66,8 +66,9 @@ void chttp2_init_client_fullstack_compression(grpc_end2end_test_fixture* f, fullstack_compression_fixture_data* ffd = static_cast(f->fixture_data); if (ffd->client_args_compression != nullptr) { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(ffd->client_args_compression); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, ffd->client_args_compression); + grpc_exec_ctx_finish(&exec_ctx); } ffd->client_args_compression = grpc_channel_args_set_compression_algorithm( client_args, GRPC_COMPRESS_GZIP); @@ -80,8 +81,9 @@ void chttp2_init_server_fullstack_compression(grpc_end2end_test_fixture* f, fullstack_compression_fixture_data* ffd = static_cast(f->fixture_data); if (ffd->server_args_compression != nullptr) { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(ffd->server_args_compression); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, ffd->server_args_compression); + grpc_exec_ctx_finish(&exec_ctx); } ffd->server_args_compression = grpc_channel_args_set_compression_algorithm( server_args, GRPC_COMPRESS_GZIP); @@ -95,13 +97,14 @@ void chttp2_init_server_fullstack_compression(grpc_end2end_test_fixture* f, } void chttp2_tear_down_fullstack_compression(grpc_end2end_test_fixture* f) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; fullstack_compression_fixture_data* ffd = static_cast(f->fixture_data); - grpc_channel_args_destroy(ffd->client_args_compression); - grpc_channel_args_destroy(ffd->server_args_compression); + grpc_channel_args_destroy(&exec_ctx, ffd->client_args_compression); + grpc_channel_args_destroy(&exec_ctx, ffd->server_args_compression); gpr_free(ffd->localaddr); gpr_free(ffd); + grpc_exec_ctx_finish(&exec_ctx); } /* All test configurations */ diff --git a/test/core/end2end/fixtures/h2_fd.cc b/test/core/end2end/fixtures/h2_fd.cc index 9157ab04d0d..97f4b71bf01 100644 --- a/test/core/end2end/fixtures/h2_fd.cc +++ b/test/core/end2end/fixtures/h2_fd.cc @@ -68,18 +68,20 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* client_args) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; sp_fixture_data* sfd = static_cast(f->fixture_data); GPR_ASSERT(!f->client); f->client = grpc_insecure_channel_create_from_fd( "fixture_client", sfd->fd_pair[0], client_args); GPR_ASSERT(f->client); + + grpc_exec_ctx_finish(&exec_ctx); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* server_args) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; sp_fixture_data* sfd = static_cast(f->fixture_data); GPR_ASSERT(!f->server); f->server = grpc_server_create(server_args, nullptr); @@ -88,6 +90,8 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, grpc_server_start(f->server); grpc_server_add_insecure_channel_from_fd(f->server, nullptr, sfd->fd_pair[1]); + + grpc_exec_ctx_finish(&exec_ctx); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture* f) { diff --git a/test/core/end2end/fixtures/h2_full+workarounds.cc b/test/core/end2end/fixtures/h2_full+workarounds.cc index 237841d1854..71a497d796d 100644 --- a/test/core/end2end/fixtures/h2_full+workarounds.cc +++ b/test/core/end2end/fixtures/h2_full+workarounds.cc @@ -72,7 +72,7 @@ void chttp2_init_client_fullstack(grpc_end2end_test_fixture* f, void chttp2_init_server_fullstack(grpc_end2end_test_fixture* f, grpc_channel_args* server_args) { int i; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; fullstack_fixture_data* ffd = static_cast(f->fixture_data); grpc_arg args[GRPC_MAX_WORKAROUND_ID]; @@ -90,7 +90,8 @@ void chttp2_init_server_fullstack(grpc_end2end_test_fixture* f, grpc_server_register_completion_queue(f->server, f->cq, nullptr); GPR_ASSERT(grpc_server_add_insecure_http2_port(f->server, ffd->localaddr)); grpc_server_start(f->server); - grpc_channel_args_destroy(server_args_new); + grpc_channel_args_destroy(&exec_ctx, server_args_new); + grpc_exec_ctx_finish(&exec_ctx); } void chttp2_tear_down_fullstack(grpc_end2end_test_fixture* f) { diff --git a/test/core/end2end/fixtures/h2_load_reporting.cc b/test/core/end2end/fixtures/h2_load_reporting.cc index fda5f4b052b..7486b6af781 100644 --- a/test/core/end2end/fixtures/h2_load_reporting.cc +++ b/test/core/end2end/fixtures/h2_load_reporting.cc @@ -78,8 +78,9 @@ void chttp2_init_server_load_reporting(grpc_end2end_test_fixture* f, server_args = grpc_channel_args_copy_and_add(server_args, &arg, 1); f->server = grpc_server_create(server_args, nullptr); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(server_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, server_args); + grpc_exec_ctx_finish(&exec_ctx); } grpc_server_register_completion_queue(f->server, f->cq, nullptr); GPR_ASSERT(grpc_server_add_insecure_http2_port(f->server, ffd->localaddr)); diff --git a/test/core/end2end/fixtures/h2_oauth2.cc b/test/core/end2end/fixtures/h2_oauth2.cc index 5fed4434dec..1642cb0db97 100644 --- a/test/core/end2end/fixtures/h2_oauth2.cc +++ b/test/core/end2end/fixtures/h2_oauth2.cc @@ -143,11 +143,11 @@ void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture* f) { static void chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack( grpc_end2end_test_fixture* f, grpc_channel_args* client_args) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_channel_credentials* ssl_creds = grpc_ssl_credentials_create(test_root_cert, nullptr, nullptr); grpc_call_credentials* oauth2_creds = grpc_md_only_test_credentials_create( - "authorization", oauth2_md, true /* is_async */); + &exec_ctx, "authorization", oauth2_md, true /* is_async */); grpc_channel_credentials* ssl_oauth2_creds = grpc_composite_channel_credentials_create(ssl_creds, oauth2_creds, nullptr); @@ -158,9 +158,10 @@ static void chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack( grpc_channel_args* new_client_args = grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); chttp2_init_client_secure_fullstack(f, new_client_args, ssl_oauth2_creds); - grpc_channel_args_destroy(new_client_args); + grpc_channel_args_destroy(&exec_ctx, new_client_args); grpc_channel_credentials_release(ssl_creds); grpc_call_credentials_release(oauth2_creds); + grpc_exec_ctx_finish(&exec_ctx); } static int fail_server_auth_check(grpc_channel_args* server_args) { diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.cc b/test/core/end2end/fixtures/h2_sockpair+trace.cc index 9807e929af6..9319c401dcb 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.cc +++ b/test/core/end2end/fixtures/h2_sockpair+trace.cc @@ -50,11 +50,12 @@ static void server_setup_transport(void* ts, grpc_transport* transport) { grpc_end2end_test_fixture* f = static_cast(ts); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); - grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq)); - grpc_server_setup_transport(f->server, transport, nullptr, + grpc_endpoint_add_to_pollset(&exec_ctx, sfd->server, grpc_cq_pollset(f->cq)); + grpc_server_setup_transport(&exec_ctx, f->server, transport, nullptr, grpc_server_get_channel_args(f->server)); + grpc_exec_ctx_finish(&exec_ctx); } typedef struct { @@ -62,11 +63,13 @@ typedef struct { grpc_channel_args* client_args; } sp_client_setup; -static void client_setup_transport(void* ts, grpc_transport* transport) { +static void client_setup_transport(grpc_exec_ctx* exec_ctx, void* ts, + grpc_transport* transport) { sp_client_setup* cs = static_cast(ts); - cs->f->client = grpc_channel_create("socketpair-target", cs->client_args, - GRPC_CLIENT_DIRECT_CHANNEL, transport); + cs->f->client = + grpc_channel_create(exec_ctx, "socketpair-target", cs->client_args, + GRPC_CLIENT_DIRECT_CHANNEL, transport); } static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( @@ -87,30 +90,34 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* client_args) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport(client_args, sfd->client, true); - client_setup_transport(&cs, transport); + transport = + grpc_create_chttp2_transport(&exec_ctx, client_args, sfd->client, true); + client_setup_transport(&exec_ctx, &cs, transport); GPR_ASSERT(f->client); - grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); + grpc_exec_ctx_finish(&exec_ctx); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* server_args) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; GPR_ASSERT(!f->server); f->server = grpc_server_create(server_args, nullptr); grpc_server_register_completion_queue(f->server, f->cq, nullptr); grpc_server_start(f->server); - transport = grpc_create_chttp2_transport(server_args, sfd->server, false); + transport = + grpc_create_chttp2_transport(&exec_ctx, server_args, sfd->server, false); server_setup_transport(f, transport); - grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); + grpc_exec_ctx_finish(&exec_ctx); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture* f) { @@ -126,6 +133,7 @@ static grpc_end2end_test_config configs[] = { int main(int argc, char** argv) { size_t i; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; /* force tracing on, with a value to force many code paths in trace.c to be taken */ @@ -139,6 +147,7 @@ int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_end2end_tests_pre_init(); grpc_init(); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(0 == grpc_tracer_set_enabled("also-doesnt-exist", 0)); GPR_ASSERT(1 == grpc_tracer_set_enabled("http", 1)); diff --git a/test/core/end2end/fixtures/h2_sockpair.cc b/test/core/end2end/fixtures/h2_sockpair.cc index b68279fd715..03566aada2b 100644 --- a/test/core/end2end/fixtures/h2_sockpair.cc +++ b/test/core/end2end/fixtures/h2_sockpair.cc @@ -44,11 +44,12 @@ static void server_setup_transport(void* ts, grpc_transport* transport) { grpc_end2end_test_fixture* f = static_cast(ts); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); - grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq)); - grpc_server_setup_transport(f->server, transport, nullptr, + grpc_endpoint_add_to_pollset(&exec_ctx, sfd->server, grpc_cq_pollset(f->cq)); + grpc_server_setup_transport(&exec_ctx, f->server, transport, nullptr, grpc_server_get_channel_args(f->server)); + grpc_exec_ctx_finish(&exec_ctx); } typedef struct { @@ -56,11 +57,13 @@ typedef struct { grpc_channel_args* client_args; } sp_client_setup; -static void client_setup_transport(void* ts, grpc_transport* transport) { +static void client_setup_transport(grpc_exec_ctx* exec_ctx, void* ts, + grpc_transport* transport) { sp_client_setup* cs = static_cast(ts); - cs->f->client = grpc_channel_create("socketpair-target", cs->client_args, - GRPC_CLIENT_DIRECT_CHANNEL, transport); + cs->f->client = + grpc_channel_create(exec_ctx, "socketpair-target", cs->client_args, + GRPC_CLIENT_DIRECT_CHANNEL, transport); } static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( @@ -81,30 +84,34 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* client_args) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport(client_args, sfd->client, true); - client_setup_transport(&cs, transport); + transport = + grpc_create_chttp2_transport(&exec_ctx, client_args, sfd->client, true); + client_setup_transport(&exec_ctx, &cs, transport); GPR_ASSERT(f->client); - grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); + grpc_exec_ctx_finish(&exec_ctx); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* server_args) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; GPR_ASSERT(!f->server); f->server = grpc_server_create(server_args, nullptr); grpc_server_register_completion_queue(f->server, f->cq, nullptr); grpc_server_start(f->server); - transport = grpc_create_chttp2_transport(server_args, sfd->server, false); + transport = + grpc_create_chttp2_transport(&exec_ctx, server_args, sfd->server, false); server_setup_transport(f, transport); - grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); + grpc_exec_ctx_finish(&exec_ctx); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture* f) { diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.cc b/test/core/end2end/fixtures/h2_sockpair_1byte.cc index 350be138ca8..9adba002045 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.cc +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.cc @@ -44,11 +44,12 @@ static void server_setup_transport(void* ts, grpc_transport* transport) { grpc_end2end_test_fixture* f = static_cast(ts); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); - grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq)); - grpc_server_setup_transport(f->server, transport, nullptr, + grpc_endpoint_add_to_pollset(&exec_ctx, sfd->server, grpc_cq_pollset(f->cq)); + grpc_server_setup_transport(&exec_ctx, f->server, transport, nullptr, grpc_server_get_channel_args(f->server)); + grpc_exec_ctx_finish(&exec_ctx); } typedef struct { @@ -56,11 +57,13 @@ typedef struct { grpc_channel_args* client_args; } sp_client_setup; -static void client_setup_transport(void* ts, grpc_transport* transport) { +static void client_setup_transport(grpc_exec_ctx* exec_ctx, void* ts, + grpc_transport* transport) { sp_client_setup* cs = static_cast(ts); - cs->f->client = grpc_channel_create("socketpair-target", cs->client_args, - GRPC_CLIENT_DIRECT_CHANNEL, transport); + cs->f->client = + grpc_channel_create(exec_ctx, "socketpair-target", cs->client_args, + GRPC_CLIENT_DIRECT_CHANNEL, transport); } static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( @@ -92,30 +95,34 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* client_args) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = grpc_create_chttp2_transport(client_args, sfd->client, true); - client_setup_transport(&cs, transport); + transport = + grpc_create_chttp2_transport(&exec_ctx, client_args, sfd->client, true); + client_setup_transport(&exec_ctx, &cs, transport); GPR_ASSERT(f->client); - grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); + grpc_exec_ctx_finish(&exec_ctx); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* server_args) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; GPR_ASSERT(!f->server); f->server = grpc_server_create(server_args, nullptr); grpc_server_register_completion_queue(f->server, f->cq, nullptr); grpc_server_start(f->server); - transport = grpc_create_chttp2_transport(server_args, sfd->server, false); + transport = + grpc_create_chttp2_transport(&exec_ctx, server_args, sfd->server, false); server_setup_transport(f, transport); - grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); + grpc_exec_ctx_finish(&exec_ctx); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture* f) { diff --git a/test/core/end2end/fixtures/h2_ssl.cc b/test/core/end2end/fixtures/h2_ssl.cc index 9a0680c40ef..3d7e2e327ea 100644 --- a/test/core/end2end/fixtures/h2_ssl.cc +++ b/test/core/end2end/fixtures/h2_ssl.cc @@ -110,8 +110,9 @@ static void chttp2_init_client_simple_ssl_secure_fullstack( grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); chttp2_init_client_secure_fullstack(f, new_client_args, ssl_creds); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(new_client_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, new_client_args); + grpc_exec_ctx_finish(&exec_ctx); } } diff --git a/test/core/end2end/fixtures/h2_ssl_proxy.cc b/test/core/end2end/fixtures/h2_ssl_proxy.cc index 5ddbdefc8c3..f8d5a699e4a 100644 --- a/test/core/end2end/fixtures/h2_ssl_proxy.cc +++ b/test/core/end2end/fixtures/h2_ssl_proxy.cc @@ -66,8 +66,9 @@ static grpc_channel* create_proxy_client(const char* target, grpc_secure_channel_create(ssl_creds, target, new_client_args, nullptr); grpc_channel_credentials_release(ssl_creds); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(new_client_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, new_client_args); + grpc_exec_ctx_finish(&exec_ctx); } return channel; } @@ -147,8 +148,9 @@ static void chttp2_init_client_simple_ssl_secure_fullstack( grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); chttp2_init_client_secure_fullstack(f, new_client_args, ssl_creds); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(new_client_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, new_client_args); + grpc_exec_ctx_finish(&exec_ctx); } } diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc index 137f7c9fa37..39048870268 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.cc +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -116,21 +116,24 @@ static void proxy_connection_ref(proxy_connection* conn, const char* reason) { } // Helper function to destroy the proxy connection. -static void proxy_connection_unref(proxy_connection* conn, const char* reason) { +static void proxy_connection_unref(grpc_exec_ctx* exec_ctx, + proxy_connection* conn, const char* reason) { if (gpr_unref(&conn->refcount)) { gpr_log(GPR_DEBUG, "endpoints: %p %p", conn->client_endpoint, conn->server_endpoint); - grpc_endpoint_destroy(conn->client_endpoint); + grpc_endpoint_destroy(exec_ctx, conn->client_endpoint); if (conn->server_endpoint != nullptr) { - grpc_endpoint_destroy(conn->server_endpoint); + grpc_endpoint_destroy(exec_ctx, conn->server_endpoint); } - grpc_pollset_set_destroy(conn->pollset_set); - grpc_slice_buffer_destroy_internal(&conn->client_read_buffer); - grpc_slice_buffer_destroy_internal(&conn->client_deferred_write_buffer); - grpc_slice_buffer_destroy_internal(&conn->client_write_buffer); - grpc_slice_buffer_destroy_internal(&conn->server_read_buffer); - grpc_slice_buffer_destroy_internal(&conn->server_deferred_write_buffer); - grpc_slice_buffer_destroy_internal(&conn->server_write_buffer); + grpc_pollset_set_destroy(exec_ctx, conn->pollset_set); + grpc_slice_buffer_destroy_internal(exec_ctx, &conn->client_read_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, + &conn->client_deferred_write_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, &conn->client_write_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, &conn->server_read_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, + &conn->server_deferred_write_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, &conn->server_write_buffer); grpc_http_parser_destroy(&conn->http_parser); grpc_http_request_destroy(&conn->http_request); gpr_unref(&conn->proxy->users); @@ -147,7 +150,8 @@ enum failure_type { }; // Helper function to shut down the proxy connection. -static void proxy_connection_failed(proxy_connection* conn, +static void proxy_connection_failed(grpc_exec_ctx* exec_ctx, + proxy_connection* conn, failure_type failure, const char* prefix, grpc_error* error) { gpr_log(GPR_INFO, "%s: %s", prefix, grpc_error_string(error)); @@ -171,25 +175,28 @@ static void proxy_connection_failed(proxy_connection* conn, } // If we decided to shut down either one and have not yet done so, do so. if (shutdown_client && !conn->client_shutdown) { - grpc_endpoint_shutdown(conn->client_endpoint, GRPC_ERROR_REF(error)); + grpc_endpoint_shutdown(exec_ctx, conn->client_endpoint, + GRPC_ERROR_REF(error)); conn->client_shutdown = true; } if (shutdown_server && !conn->server_shutdown && (conn->server_endpoint != nullptr)) { - grpc_endpoint_shutdown(conn->server_endpoint, GRPC_ERROR_REF(error)); + grpc_endpoint_shutdown(exec_ctx, conn->server_endpoint, + GRPC_ERROR_REF(error)); conn->server_shutdown = true; } // Unref the connection. - proxy_connection_unref(conn, "conn_failed"); + proxy_connection_unref(exec_ctx, conn, "conn_failed"); GRPC_ERROR_UNREF(error); } // Callback for writing proxy data to the client. -static void on_client_write_done(void* arg, grpc_error* error) { +static void on_client_write_done(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; conn->client_is_writing = false; if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(conn, CLIENT_WRITE_FAILED, + proxy_connection_failed(exec_ctx, conn, CLIENT_WRITE_FAILED, "HTTP proxy client write", GRPC_ERROR_REF(error)); return; } @@ -201,20 +208,22 @@ static void on_client_write_done(void* arg, grpc_error* error) { grpc_slice_buffer_move_into(&conn->client_deferred_write_buffer, &conn->client_write_buffer); conn->client_is_writing = true; - grpc_endpoint_write(conn->client_endpoint, &conn->client_write_buffer, + grpc_endpoint_write(exec_ctx, conn->client_endpoint, + &conn->client_write_buffer, &conn->on_client_write_done); } else { // No more writes. Unref the connection. - proxy_connection_unref(conn, "write_done"); + proxy_connection_unref(exec_ctx, conn, "write_done"); } } // Callback for writing proxy data to the backend server. -static void on_server_write_done(void* arg, grpc_error* error) { +static void on_server_write_done(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; conn->server_is_writing = false; if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(conn, SERVER_WRITE_FAILED, + proxy_connection_failed(exec_ctx, conn, SERVER_WRITE_FAILED, "HTTP proxy server write", GRPC_ERROR_REF(error)); return; } @@ -226,21 +235,23 @@ static void on_server_write_done(void* arg, grpc_error* error) { grpc_slice_buffer_move_into(&conn->server_deferred_write_buffer, &conn->server_write_buffer); conn->server_is_writing = true; - grpc_endpoint_write(conn->server_endpoint, &conn->server_write_buffer, + grpc_endpoint_write(exec_ctx, conn->server_endpoint, + &conn->server_write_buffer, &conn->on_server_write_done); } else { // No more writes. Unref the connection. - proxy_connection_unref(conn, "server_write"); + proxy_connection_unref(exec_ctx, conn, "server_write"); } } // Callback for reading data from the client, which will be proxied to // the backend server. -static void on_client_read_done(void* arg, grpc_error* error) { +static void on_client_read_done(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(conn, CLIENT_READ_FAILED, "HTTP proxy client read", - GRPC_ERROR_REF(error)); + proxy_connection_failed(exec_ctx, conn, CLIENT_READ_FAILED, + "HTTP proxy client read", GRPC_ERROR_REF(error)); return; } // If there is already a pending write (i.e., server_write_buffer is @@ -257,21 +268,23 @@ static void on_client_read_done(void* arg, grpc_error* error) { &conn->server_write_buffer); proxy_connection_ref(conn, "client_read"); conn->server_is_writing = true; - grpc_endpoint_write(conn->server_endpoint, &conn->server_write_buffer, + grpc_endpoint_write(exec_ctx, conn->server_endpoint, + &conn->server_write_buffer, &conn->on_server_write_done); } // Read more data. - grpc_endpoint_read(conn->client_endpoint, &conn->client_read_buffer, + grpc_endpoint_read(exec_ctx, conn->client_endpoint, &conn->client_read_buffer, &conn->on_client_read_done); } // Callback for reading data from the backend server, which will be // proxied to the client. -static void on_server_read_done(void* arg, grpc_error* error) { +static void on_server_read_done(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(conn, SERVER_READ_FAILED, "HTTP proxy server read", - GRPC_ERROR_REF(error)); + proxy_connection_failed(exec_ctx, conn, SERVER_READ_FAILED, + "HTTP proxy server read", GRPC_ERROR_REF(error)); return; } // If there is already a pending write (i.e., client_write_buffer is @@ -288,21 +301,23 @@ static void on_server_read_done(void* arg, grpc_error* error) { &conn->client_write_buffer); proxy_connection_ref(conn, "server_read"); conn->client_is_writing = true; - grpc_endpoint_write(conn->client_endpoint, &conn->client_write_buffer, + grpc_endpoint_write(exec_ctx, conn->client_endpoint, + &conn->client_write_buffer, &conn->on_client_write_done); } // Read more data. - grpc_endpoint_read(conn->server_endpoint, &conn->server_read_buffer, + grpc_endpoint_read(exec_ctx, conn->server_endpoint, &conn->server_read_buffer, &conn->on_server_read_done); } // Callback to write the HTTP response for the CONNECT request. -static void on_write_response_done(void* arg, grpc_error* error) { +static void on_write_response_done(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; conn->client_is_writing = false; if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(conn, SETUP_FAILED, "HTTP proxy write response", - GRPC_ERROR_REF(error)); + proxy_connection_failed(exec_ctx, conn, SETUP_FAILED, + "HTTP proxy write response", GRPC_ERROR_REF(error)); return; } // Clear write buffer. @@ -312,16 +327,17 @@ static void on_write_response_done(void* arg, grpc_error* error) { // for the other one. proxy_connection_ref(conn, "client_read"); proxy_connection_ref(conn, "server_read"); - proxy_connection_unref(conn, "write_response"); - grpc_endpoint_read(conn->client_endpoint, &conn->client_read_buffer, + proxy_connection_unref(exec_ctx, conn, "write_response"); + grpc_endpoint_read(exec_ctx, conn->client_endpoint, &conn->client_read_buffer, &conn->on_client_read_done); - grpc_endpoint_read(conn->server_endpoint, &conn->server_read_buffer, + grpc_endpoint_read(exec_ctx, conn->server_endpoint, &conn->server_read_buffer, &conn->on_server_read_done); } // Callback to connect to the backend server specified by the HTTP // CONNECT request. -static void on_server_connect_done(void* arg, grpc_error* error) { +static void on_server_connect_done(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; if (error != GRPC_ERROR_NONE) { // TODO(roth): Technically, in this case, we should handle the error @@ -329,8 +345,8 @@ static void on_server_connect_done(void* arg, grpc_error* error) { // connection failed. However, for the purposes of this test code, // it's fine to pretend this is a client-side error, which will // cause the client connection to be dropped. - proxy_connection_failed(conn, SETUP_FAILED, "HTTP proxy server connect", - GRPC_ERROR_REF(error)); + proxy_connection_failed(exec_ctx, conn, SETUP_FAILED, + "HTTP proxy server connect", GRPC_ERROR_REF(error)); return; } // We've established a connection, so send back a 200 response code to @@ -340,7 +356,8 @@ static void on_server_connect_done(void* arg, grpc_error* error) { grpc_slice_from_copied_string("HTTP/1.0 200 connected\r\n\r\n"); grpc_slice_buffer_add(&conn->client_write_buffer, slice); conn->client_is_writing = true; - grpc_endpoint_write(conn->client_endpoint, &conn->client_write_buffer, + grpc_endpoint_write(exec_ctx, conn->client_endpoint, + &conn->client_write_buffer, &conn->on_write_response_done); } @@ -349,7 +366,8 @@ static void on_server_connect_done(void* arg, grpc_error* error) { * Basic * Returns true if it matches, false otherwise */ -static bool proxy_auth_header_matches(char* proxy_auth_header_val, +static bool proxy_auth_header_matches(grpc_exec_ctx* exec_ctx, + char* proxy_auth_header_val, char* expected_cred) { GPR_ASSERT(proxy_auth_header_val != nullptr); GPR_ASSERT(expected_cred != nullptr); @@ -357,10 +375,11 @@ static bool proxy_auth_header_matches(char* proxy_auth_header_val, return false; } proxy_auth_header_val += 6; - grpc_slice decoded_slice = grpc_base64_decode(proxy_auth_header_val, 0); + grpc_slice decoded_slice = + grpc_base64_decode(exec_ctx, proxy_auth_header_val, 0); const bool header_matches = grpc_slice_str_cmp(decoded_slice, expected_cred) == 0; - grpc_slice_unref_internal(decoded_slice); + grpc_slice_unref_internal(exec_ctx, decoded_slice); return header_matches; } @@ -370,13 +389,14 @@ static bool proxy_auth_header_matches(char* proxy_auth_header_val, // the client indicating that the request failed. However, for the purposes // of this test code, it's fine to pretend this is a client-side error, // which will cause the client connection to be dropped. -static void on_read_request_done(void* arg, grpc_error* error) { +static void on_read_request_done(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; gpr_log(GPR_DEBUG, "on_read_request_done: %p %s", conn, grpc_error_string(error)); if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(conn, SETUP_FAILED, "HTTP proxy read request", - GRPC_ERROR_REF(error)); + proxy_connection_failed(exec_ctx, conn, SETUP_FAILED, + "HTTP proxy read request", GRPC_ERROR_REF(error)); return; } // Read request and feed it to the parser. @@ -385,7 +405,8 @@ static void on_read_request_done(void* arg, grpc_error* error) { error = grpc_http_parser_parse( &conn->http_parser, conn->client_read_buffer.slices[i], nullptr); if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(conn, SETUP_FAILED, "HTTP proxy request parse", + proxy_connection_failed(exec_ctx, conn, SETUP_FAILED, + "HTTP proxy request parse", GRPC_ERROR_REF(error)); GRPC_ERROR_UNREF(error); return; @@ -395,8 +416,8 @@ static void on_read_request_done(void* arg, grpc_error* error) { grpc_slice_buffer_reset_and_unref(&conn->client_read_buffer); // If we're not done reading the request, read more data. if (conn->http_parser.state != GRPC_HTTP_BODY) { - grpc_endpoint_read(conn->client_endpoint, &conn->client_read_buffer, - &conn->on_read_request_done); + grpc_endpoint_read(exec_ctx, conn->client_endpoint, + &conn->client_read_buffer, &conn->on_read_request_done); return; } // Make sure we got a CONNECT request. @@ -406,8 +427,8 @@ static void on_read_request_done(void* arg, grpc_error* error) { conn->http_request.method); error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - proxy_connection_failed(conn, SETUP_FAILED, "HTTP proxy read request", - GRPC_ERROR_REF(error)); + proxy_connection_failed(exec_ctx, conn, SETUP_FAILED, + "HTTP proxy read request", GRPC_ERROR_REF(error)); GRPC_ERROR_UNREF(error); return; } @@ -419,15 +440,16 @@ static void on_read_request_done(void* arg, grpc_error* error) { for (size_t i = 0; i < conn->http_request.hdr_count; i++) { if (strcmp(conn->http_request.hdrs[i].key, "Proxy-Authorization") == 0) { client_authenticated = proxy_auth_header_matches( - conn->http_request.hdrs[i].value, proxy_auth_arg->value.string); + exec_ctx, conn->http_request.hdrs[i].value, + proxy_auth_arg->value.string); break; } } if (!client_authenticated) { const char* msg = "HTTP Connect could not verify authentication"; error = GRPC_ERROR_CREATE_FROM_STATIC_STRING(msg); - proxy_connection_failed(conn, SETUP_FAILED, "HTTP proxy read request", - GRPC_ERROR_REF(error)); + proxy_connection_failed(exec_ctx, conn, SETUP_FAILED, + "HTTP proxy read request", GRPC_ERROR_REF(error)); GRPC_ERROR_UNREF(error); return; } @@ -437,8 +459,8 @@ static void on_read_request_done(void* arg, grpc_error* error) { error = grpc_blocking_resolve_address(conn->http_request.path, "80", &resolved_addresses); if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(conn, SETUP_FAILED, "HTTP proxy DNS lookup", - GRPC_ERROR_REF(error)); + proxy_connection_failed(exec_ctx, conn, SETUP_FAILED, + "HTTP proxy DNS lookup", GRPC_ERROR_REF(error)); GRPC_ERROR_UNREF(error); return; } @@ -446,15 +468,15 @@ static void on_read_request_done(void* arg, grpc_error* error) { // Connect to requested address. // The connection callback inherits our reference to conn. const grpc_millis deadline = - grpc_core::ExecCtx::Get()->Now() + 10 * GPR_MS_PER_SEC; - grpc_tcp_client_connect(&conn->on_server_connect_done, &conn->server_endpoint, - conn->pollset_set, nullptr, + grpc_exec_ctx_now(exec_ctx) + 10 * GPR_MS_PER_SEC; + grpc_tcp_client_connect(exec_ctx, &conn->on_server_connect_done, + &conn->server_endpoint, conn->pollset_set, nullptr, &resolved_addresses->addrs[0], deadline); grpc_resolved_addresses_destroy(resolved_addresses); } -static void on_accept(void* arg, grpc_endpoint* endpoint, - grpc_pollset* accepting_pollset, +static void on_accept(grpc_exec_ctx* exec_ctx, void* arg, + grpc_endpoint* endpoint, grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor) { gpr_free(acceptor); grpc_end2end_http_proxy* proxy = (grpc_end2end_http_proxy*)arg; @@ -465,8 +487,8 @@ static void on_accept(void* arg, grpc_endpoint* endpoint, conn->proxy = proxy; gpr_ref_init(&conn->refcount, 1); conn->pollset_set = grpc_pollset_set_create(); - grpc_pollset_set_add_pollset(conn->pollset_set, proxy->pollset); - grpc_endpoint_add_to_pollset_set(endpoint, conn->pollset_set); + grpc_pollset_set_add_pollset(exec_ctx, conn->pollset_set, proxy->pollset); + grpc_endpoint_add_to_pollset_set(exec_ctx, endpoint, conn->pollset_set); GRPC_CLOSURE_INIT(&conn->on_read_request_done, on_read_request_done, conn, grpc_combiner_scheduler(conn->proxy->combiner)); GRPC_CLOSURE_INIT(&conn->on_server_connect_done, on_server_connect_done, conn, @@ -491,7 +513,7 @@ static void on_accept(void* arg, grpc_endpoint* endpoint, grpc_slice_buffer_init(&conn->server_write_buffer); grpc_http_parser_init(&conn->http_parser, GRPC_HTTP_REQUEST, &conn->http_request); - grpc_endpoint_read(conn->client_endpoint, &conn->client_read_buffer, + grpc_endpoint_read(exec_ctx, conn->client_endpoint, &conn->client_read_buffer, &conn->on_read_request_done); } @@ -501,23 +523,24 @@ static void on_accept(void* arg, grpc_endpoint* endpoint, static void thread_main(void* arg) { grpc_end2end_http_proxy* proxy = (grpc_end2end_http_proxy*)arg; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; do { gpr_ref(&proxy->users); grpc_pollset_worker* worker = nullptr; gpr_mu_lock(proxy->mu); GRPC_LOG_IF_ERROR( "grpc_pollset_work", - grpc_pollset_work(proxy->pollset, &worker, - grpc_core::ExecCtx::Get()->Now() + GPR_MS_PER_SEC)); + grpc_pollset_work(&exec_ctx, proxy->pollset, &worker, + grpc_exec_ctx_now(&exec_ctx) + GPR_MS_PER_SEC)); gpr_mu_unlock(proxy->mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); } while (!gpr_unref(&proxy->users)); + grpc_exec_ctx_finish(&exec_ctx); } grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( grpc_channel_args* args) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_end2end_http_proxy* proxy = (grpc_end2end_http_proxy*)gpr_malloc(sizeof(*proxy)); memset(proxy, 0, sizeof(*proxy)); @@ -529,8 +552,8 @@ grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( gpr_log(GPR_INFO, "Proxy address: %s", proxy->proxy_name); // Create TCP server. proxy->channel_args = grpc_channel_args_copy(args); - grpc_error* error = - grpc_tcp_server_create(nullptr, proxy->channel_args, &proxy->server); + grpc_error* error = grpc_tcp_server_create( + &exec_ctx, nullptr, proxy->channel_args, &proxy->server); GPR_ASSERT(error == GRPC_ERROR_NONE); // Bind to port. grpc_resolved_address resolved_addr; @@ -545,8 +568,9 @@ grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( // Start server. proxy->pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); grpc_pollset_init(proxy->pollset, &proxy->mu); - grpc_tcp_server_start(proxy->server, &proxy->pollset, 1, on_accept, proxy); - + grpc_tcp_server_start(&exec_ctx, proxy->server, &proxy->pollset, 1, on_accept, + proxy); + grpc_exec_ctx_finish(&exec_ctx); // Start proxy thread. gpr_thd_options opt = gpr_thd_options_default(); gpr_thd_options_set_joinable(&opt); @@ -555,25 +579,27 @@ grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( return proxy; } -static void destroy_pollset(void* arg, grpc_error* error) { +static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_pollset* pollset = (grpc_pollset*)arg; - grpc_pollset_destroy(pollset); + grpc_pollset_destroy(exec_ctx, pollset); gpr_free(pollset); } void grpc_end2end_http_proxy_destroy(grpc_end2end_http_proxy* proxy) { gpr_unref(&proxy->users); // Signal proxy thread to shutdown. - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_thd_join(proxy->thd); - grpc_tcp_server_shutdown_listeners(proxy->server); - grpc_tcp_server_unref(proxy->server); + grpc_tcp_server_shutdown_listeners(&exec_ctx, proxy->server); + grpc_tcp_server_unref(&exec_ctx, proxy->server); gpr_free(proxy->proxy_name); - grpc_channel_args_destroy(proxy->channel_args); - grpc_pollset_shutdown(proxy->pollset, + grpc_channel_args_destroy(&exec_ctx, proxy->channel_args); + grpc_pollset_shutdown(&exec_ctx, proxy->pollset, GRPC_CLOSURE_CREATE(destroy_pollset, proxy->pollset, grpc_schedule_on_exec_ctx)); - GRPC_COMBINER_UNREF(proxy->combiner, "test"); + GRPC_COMBINER_UNREF(&exec_ctx, proxy->combiner, "test"); gpr_free(proxy); + grpc_exec_ctx_finish(&exec_ctx); } const char* grpc_end2end_http_proxy_get_proxy_name( diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index 967a6d560f3..75117218e48 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -376,7 +376,8 @@ typedef struct addr_req { grpc_lb_addresses** lb_addrs; } addr_req; -static void finish_resolve(void* arg, grpc_error* error) { +static void finish_resolve(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { addr_req* r = static_cast(arg); if (error == GRPC_ERROR_NONE && 0 == strcmp(r->addr, "server")) { @@ -394,9 +395,9 @@ static void finish_resolve(void* arg, grpc_error* error) { nullptr); *r->lb_addrs = lb_addrs; } - GRPC_CLOSURE_SCHED(r->on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, r->on_done, GRPC_ERROR_NONE); } else { - GRPC_CLOSURE_SCHED(r->on_done, + GRPC_CLOSURE_SCHED(exec_ctx, r->on_done, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Resolution failed", &error, 1)); } @@ -405,7 +406,8 @@ static void finish_resolve(void* arg, grpc_error* error) { gpr_free(r); } -void my_resolve_address(const char* addr, const char* default_port, +void my_resolve_address(grpc_exec_ctx* exec_ctx, const char* addr, + const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addresses) { @@ -415,24 +417,22 @@ void my_resolve_address(const char* addr, const char* default_port, r->addrs = addresses; r->lb_addrs = nullptr; grpc_timer_init( - &r->timer, GPR_MS_PER_SEC + grpc_core::ExecCtx::Get()->Now(), + exec_ctx, &r->timer, GPR_MS_PER_SEC + grpc_exec_ctx_now(exec_ctx), GRPC_CLOSURE_CREATE(finish_resolve, r, grpc_schedule_on_exec_ctx)); } -grpc_ares_request* my_dns_lookup_ares(const char* dns_server, const char* addr, - const char* default_port, - grpc_pollset_set* interested_parties, - grpc_closure* on_done, - grpc_lb_addresses** lb_addrs, - bool check_grpclb, - char** service_config_json) { +grpc_ares_request* my_dns_lookup_ares( + grpc_exec_ctx* exec_ctx, const char* dns_server, const char* addr, + const char* default_port, grpc_pollset_set* interested_parties, + grpc_closure* on_done, grpc_lb_addresses** lb_addrs, bool check_grpclb, + char** service_config_json) { addr_req* r = static_cast(gpr_malloc(sizeof(*r))); r->addr = gpr_strdup(addr); r->on_done = on_done; r->addrs = nullptr; r->lb_addrs = lb_addrs; grpc_timer_init( - &r->timer, GPR_MS_PER_SEC + grpc_core::ExecCtx::Get()->Now(), + exec_ctx, &r->timer, GPR_MS_PER_SEC + grpc_exec_ctx_now(exec_ctx), GRPC_CLOSURE_CREATE(finish_resolve, r, grpc_schedule_on_exec_ctx)); return nullptr; } @@ -442,12 +442,12 @@ grpc_ares_request* my_dns_lookup_ares(const char* dns_server, const char* addr, // defined in tcp_client_posix.c extern void (*grpc_tcp_client_connect_impl)( - grpc_closure* closure, grpc_endpoint** ep, + grpc_exec_ctx* exec_ctx, grpc_closure* closure, grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, grpc_millis deadline); -static void sched_connect(grpc_closure* closure, grpc_endpoint** ep, - gpr_timespec deadline); +static void sched_connect(grpc_exec_ctx* exec_ctx, grpc_closure* closure, + grpc_endpoint** ep, gpr_timespec deadline); typedef struct { grpc_timer timer; @@ -456,11 +456,11 @@ typedef struct { gpr_timespec deadline; } future_connect; -static void do_connect(void* arg, grpc_error* error) { +static void do_connect(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { future_connect* fc = static_cast(arg); if (error != GRPC_ERROR_NONE) { *fc->ep = nullptr; - GRPC_CLOSURE_SCHED(fc->closure, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(exec_ctx, fc->closure, GRPC_ERROR_REF(error)); } else if (g_server != nullptr) { grpc_endpoint* client; grpc_endpoint* server; @@ -468,23 +468,25 @@ static void do_connect(void* arg, grpc_error* error) { *fc->ep = client; grpc_transport* transport = - grpc_create_chttp2_transport(nullptr, server, false); - grpc_server_setup_transport(g_server, transport, nullptr, nullptr); - grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); + grpc_create_chttp2_transport(exec_ctx, nullptr, server, false); + grpc_server_setup_transport(exec_ctx, g_server, transport, nullptr, + nullptr); + grpc_chttp2_transport_start_reading(exec_ctx, transport, nullptr, nullptr); - GRPC_CLOSURE_SCHED(fc->closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, fc->closure, GRPC_ERROR_NONE); } else { - sched_connect(fc->closure, fc->ep, fc->deadline); + sched_connect(exec_ctx, fc->closure, fc->ep, fc->deadline); } gpr_free(fc); } -static void sched_connect(grpc_closure* closure, grpc_endpoint** ep, - gpr_timespec deadline) { +static void sched_connect(grpc_exec_ctx* exec_ctx, grpc_closure* closure, + grpc_endpoint** ep, gpr_timespec deadline) { if (gpr_time_cmp(deadline, gpr_now(deadline.clock_type)) < 0) { *ep = nullptr; - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Connect deadline exceeded")); + GRPC_CLOSURE_SCHED( + exec_ctx, closure, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Connect deadline exceeded")); return; } @@ -493,16 +495,17 @@ static void sched_connect(grpc_closure* closure, grpc_endpoint** ep, fc->ep = ep; fc->deadline = deadline; grpc_timer_init( - &fc->timer, GPR_MS_PER_SEC + grpc_core::ExecCtx::Get()->Now(), + exec_ctx, &fc->timer, GPR_MS_PER_SEC + grpc_exec_ctx_now(exec_ctx), GRPC_CLOSURE_CREATE(do_connect, fc, grpc_schedule_on_exec_ctx)); } -static void my_tcp_client_connect(grpc_closure* closure, grpc_endpoint** ep, +static void my_tcp_client_connect(grpc_exec_ctx* exec_ctx, + grpc_closure* closure, grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, grpc_millis deadline) { - sched_connect(closure, ep, + sched_connect(exec_ctx, closure, ep, grpc_millis_to_timespec(deadline, GPR_CLOCK_MONOTONIC)); } @@ -748,8 +751,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_init(); grpc_timer_manager_set_threading(false); { - grpc_core::ExecCtx exec_ctx; - grpc_executor_set_threading(false); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_executor_set_threading(&exec_ctx, false); + grpc_exec_ctx_finish(&exec_ctx); } grpc_resolve_address = my_resolve_address; grpc_dns_lookup_ares = my_dns_lookup_ares; @@ -842,8 +846,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { g_channel = grpc_insecure_channel_create(target_uri, args, nullptr); GPR_ASSERT(g_channel != nullptr); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, args); + grpc_exec_ctx_finish(&exec_ctx); } gpr_free(target_uri); gpr_free(target); @@ -869,8 +874,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { g_server = grpc_server_create(args, nullptr); GPR_ASSERT(g_server != nullptr); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, args); + grpc_exec_ctx_finish(&exec_ctx); } grpc_server_register_completion_queue(g_server, cq, nullptr); grpc_server_start(g_server); @@ -1199,8 +1205,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_secure_channel_create(creds, target_uri, args, nullptr); GPR_ASSERT(g_channel != nullptr); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, args); + grpc_exec_ctx_finish(&exec_ctx); } gpr_free(target_uri); gpr_free(target); diff --git a/test/core/end2end/fuzzers/client_fuzzer.cc b/test/core/end2end/fuzzers/client_fuzzer.cc index c17d581d8b7..5871f0f43ef 100644 --- a/test/core/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/end2end/fuzzers/client_fuzzer.cc @@ -43,114 +43,112 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (squelch) gpr_set_log_function(dont_log); if (leak_check) grpc_memory_counters_init(); grpc_init(); - { - grpc_core::ExecCtx exec_ctx; - grpc_executor_set_threading(false); - - grpc_resource_quota* resource_quota = - grpc_resource_quota_create("client_fuzzer"); - grpc_endpoint* mock_endpoint = - grpc_mock_endpoint_create(discard_write, resource_quota); - grpc_resource_quota_unref_internal(resource_quota); - - grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr); - grpc_transport* transport = - grpc_create_chttp2_transport(nullptr, mock_endpoint, true); - grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); - - grpc_channel* channel = grpc_channel_create( - "test-target", nullptr, GRPC_CLIENT_DIRECT_CHANNEL, transport); - grpc_slice host = grpc_slice_from_static_string("localhost"); - grpc_call* call = grpc_channel_create_call( - channel, nullptr, 0, cq, grpc_slice_from_static_string("/foo"), &host, - gpr_inf_future(GPR_CLOCK_REALTIME), nullptr); - - grpc_metadata_array initial_metadata_recv; - grpc_metadata_array_init(&initial_metadata_recv); - grpc_byte_buffer* response_payload_recv = nullptr; - grpc_metadata_array trailing_metadata_recv; - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_status_code status; - grpc_slice details = grpc_empty_slice(); - - grpc_op ops[6]; - memset(ops, 0, sizeof(ops)); - grpc_op* op = ops; - op->op = GRPC_OP_SEND_INITIAL_METADATA; - op->data.send_initial_metadata.count = 0; - op->flags = 0; - op->reserved = nullptr; - op++; - op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT; - op->flags = 0; - op->reserved = nullptr; - op++; - op->op = GRPC_OP_RECV_INITIAL_METADATA; - op->data.recv_initial_metadata.recv_initial_metadata = - &initial_metadata_recv; - op->flags = 0; - op->reserved = nullptr; - op++; - op->op = GRPC_OP_RECV_MESSAGE; - op->data.recv_message.recv_message = &response_payload_recv; - op->flags = 0; - op->reserved = nullptr; - op++; - op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; - op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv; - op->data.recv_status_on_client.status = &status; - op->data.recv_status_on_client.status_details = &details; - op->flags = 0; - op->reserved = nullptr; - op++; - grpc_call_error error = - grpc_call_start_batch(call, ops, (size_t)(op - ops), tag(1), nullptr); - int requested_calls = 1; - GPR_ASSERT(GRPC_CALL_OK == error); - - grpc_mock_endpoint_put_read( - mock_endpoint, grpc_slice_from_copied_buffer((const char*)data, size)); - - grpc_event ev; - while (1) { - grpc_core::ExecCtx::Get()->Flush(); - ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), - nullptr); - switch (ev.type) { - case GRPC_QUEUE_TIMEOUT: - goto done; - case GRPC_QUEUE_SHUTDOWN: - break; - case GRPC_OP_COMPLETE: - requested_calls--; - break; - } + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_executor_set_threading(&exec_ctx, false); + + grpc_resource_quota* resource_quota = + grpc_resource_quota_create("client_fuzzer"); + grpc_endpoint* mock_endpoint = + grpc_mock_endpoint_create(discard_write, resource_quota); + grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); + + grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr); + grpc_transport* transport = + grpc_create_chttp2_transport(&exec_ctx, nullptr, mock_endpoint, true); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); + + grpc_channel* channel = grpc_channel_create( + &exec_ctx, "test-target", nullptr, GRPC_CLIENT_DIRECT_CHANNEL, transport); + grpc_slice host = grpc_slice_from_static_string("localhost"); + grpc_call* call = grpc_channel_create_call( + channel, nullptr, 0, cq, grpc_slice_from_static_string("/foo"), &host, + gpr_inf_future(GPR_CLOCK_REALTIME), nullptr); + + grpc_metadata_array initial_metadata_recv; + grpc_metadata_array_init(&initial_metadata_recv); + grpc_byte_buffer* response_payload_recv = nullptr; + grpc_metadata_array trailing_metadata_recv; + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_status_code status; + grpc_slice details = grpc_empty_slice(); + + grpc_op ops[6]; + memset(ops, 0, sizeof(ops)); + grpc_op* op = ops; + op->op = GRPC_OP_SEND_INITIAL_METADATA; + op->data.send_initial_metadata.count = 0; + op->flags = 0; + op->reserved = nullptr; + op++; + op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT; + op->flags = 0; + op->reserved = nullptr; + op++; + op->op = GRPC_OP_RECV_INITIAL_METADATA; + op->data.recv_initial_metadata.recv_initial_metadata = &initial_metadata_recv; + op->flags = 0; + op->reserved = nullptr; + op++; + op->op = GRPC_OP_RECV_MESSAGE; + op->data.recv_message.recv_message = &response_payload_recv; + op->flags = 0; + op->reserved = nullptr; + op++; + op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; + op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv; + op->data.recv_status_on_client.status = &status; + op->data.recv_status_on_client.status_details = &details; + op->flags = 0; + op->reserved = nullptr; + op++; + grpc_call_error error = + grpc_call_start_batch(call, ops, (size_t)(op - ops), tag(1), nullptr); + int requested_calls = 1; + GPR_ASSERT(GRPC_CALL_OK == error); + + grpc_mock_endpoint_put_read( + &exec_ctx, mock_endpoint, + grpc_slice_from_copied_buffer((const char*)data, size)); + + grpc_event ev; + while (1) { + grpc_exec_ctx_flush(&exec_ctx); + ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), + nullptr); + switch (ev.type) { + case GRPC_QUEUE_TIMEOUT: + goto done; + case GRPC_QUEUE_SHUTDOWN: + break; + case GRPC_OP_COMPLETE: + requested_calls--; + break; } + } - done: - if (requested_calls) { - grpc_call_cancel(call, nullptr); - } - for (int i = 0; i < requested_calls; i++) { - ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), - nullptr); - GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); - } - grpc_completion_queue_shutdown(cq); - for (int i = 0; i < requested_calls; i++) { - ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), - nullptr); - GPR_ASSERT(ev.type == GRPC_QUEUE_SHUTDOWN); - } - grpc_call_unref(call); - grpc_completion_queue_destroy(cq); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_slice_unref(details); - grpc_channel_destroy(channel); - if (response_payload_recv != nullptr) { - grpc_byte_buffer_destroy(response_payload_recv); - } +done: + if (requested_calls) { + grpc_call_cancel(call, nullptr); + } + for (int i = 0; i < requested_calls; i++) { + ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), + nullptr); + GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); + } + grpc_completion_queue_shutdown(cq); + for (int i = 0; i < requested_calls; i++) { + ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), + nullptr); + GPR_ASSERT(ev.type == GRPC_QUEUE_SHUTDOWN); + } + grpc_call_unref(call); + grpc_completion_queue_destroy(cq); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_slice_unref(details); + grpc_channel_destroy(channel); + if (response_payload_recv != nullptr) { + grpc_byte_buffer_destroy(response_payload_recv); } grpc_shutdown(); if (leak_check) { diff --git a/test/core/end2end/fuzzers/server_fuzzer.cc b/test/core/end2end/fuzzers/server_fuzzer.cc index 61c55e0afde..67caf4e720c 100644 --- a/test/core/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/end2end/fuzzers/server_fuzzer.cc @@ -41,82 +41,81 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (squelch) gpr_set_log_function(dont_log); if (leak_check) grpc_memory_counters_init(); grpc_init(); - { - grpc_core::ExecCtx exec_ctx; - grpc_executor_set_threading(false); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_executor_set_threading(&exec_ctx, false); - grpc_resource_quota* resource_quota = - grpc_resource_quota_create("server_fuzzer"); - grpc_endpoint* mock_endpoint = - grpc_mock_endpoint_create(discard_write, resource_quota); - grpc_resource_quota_unref_internal(resource_quota); - grpc_mock_endpoint_put_read( - mock_endpoint, grpc_slice_from_copied_buffer((const char*)data, size)); + grpc_resource_quota* resource_quota = + grpc_resource_quota_create("server_fuzzer"); + grpc_endpoint* mock_endpoint = + grpc_mock_endpoint_create(discard_write, resource_quota); + grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); + grpc_mock_endpoint_put_read( + &exec_ctx, mock_endpoint, + grpc_slice_from_copied_buffer((const char*)data, size)); - grpc_server* server = grpc_server_create(nullptr, nullptr); - grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr); - grpc_server_register_completion_queue(server, cq, nullptr); - // TODO(ctiller): add registered methods (one for POST, one for PUT) - // void *registered_method = - // grpc_server_register_method(server, "/reg", NULL, 0); - grpc_server_start(server); - grpc_transport* transport = - grpc_create_chttp2_transport(nullptr, mock_endpoint, false); - grpc_server_setup_transport(server, transport, nullptr, nullptr); - grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); + grpc_server* server = grpc_server_create(nullptr, nullptr); + grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr); + grpc_server_register_completion_queue(server, cq, nullptr); + // TODO(ctiller): add registered methods (one for POST, one for PUT) + // void *registered_method = + // grpc_server_register_method(server, "/reg", NULL, 0); + grpc_server_start(server); + grpc_transport* transport = + grpc_create_chttp2_transport(&exec_ctx, nullptr, mock_endpoint, false); + grpc_server_setup_transport(&exec_ctx, server, transport, nullptr, nullptr); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); - grpc_call* call1 = nullptr; - grpc_call_details call_details1; - grpc_metadata_array request_metadata1; - grpc_call_details_init(&call_details1); - grpc_metadata_array_init(&request_metadata1); - int requested_calls = 0; + grpc_call* call1 = nullptr; + grpc_call_details call_details1; + grpc_metadata_array request_metadata1; + grpc_call_details_init(&call_details1); + grpc_metadata_array_init(&request_metadata1); + int requested_calls = 0; - GPR_ASSERT(GRPC_CALL_OK == - grpc_server_request_call(server, &call1, &call_details1, - &request_metadata1, cq, cq, tag(1))); - requested_calls++; + GPR_ASSERT(GRPC_CALL_OK == + grpc_server_request_call(server, &call1, &call_details1, + &request_metadata1, cq, cq, tag(1))); + requested_calls++; - grpc_event ev; - while (1) { - grpc_core::ExecCtx::Get()->Flush(); - ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), - nullptr); - switch (ev.type) { - case GRPC_QUEUE_TIMEOUT: - goto done; - case GRPC_QUEUE_SHUTDOWN: - break; - case GRPC_OP_COMPLETE: - switch (detag(ev.tag)) { - case 1: - requested_calls--; - // TODO(ctiller): keep reading that call! - break; - } - } + grpc_event ev; + while (1) { + grpc_exec_ctx_flush(&exec_ctx); + ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), + nullptr); + switch (ev.type) { + case GRPC_QUEUE_TIMEOUT: + goto done; + case GRPC_QUEUE_SHUTDOWN: + break; + case GRPC_OP_COMPLETE: + switch (detag(ev.tag)) { + case 1: + requested_calls--; + // TODO(ctiller): keep reading that call! + break; + } } + } - done: - if (call1 != nullptr) grpc_call_unref(call1); - grpc_call_details_destroy(&call_details1); - grpc_metadata_array_destroy(&request_metadata1); - grpc_server_shutdown_and_notify(server, cq, tag(0xdead)); - grpc_server_cancel_all_calls(server); - for (int i = 0; i <= requested_calls; i++) { - ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), - nullptr); - GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); - } - grpc_completion_queue_shutdown(cq); - for (int i = 0; i <= requested_calls; i++) { - ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), - nullptr); - GPR_ASSERT(ev.type == GRPC_QUEUE_SHUTDOWN); - } - grpc_server_destroy(server); - grpc_completion_queue_destroy(cq); +done: + if (call1 != nullptr) grpc_call_unref(call1); + grpc_call_details_destroy(&call_details1); + grpc_metadata_array_destroy(&request_metadata1); + grpc_server_shutdown_and_notify(server, cq, tag(0xdead)); + grpc_server_cancel_all_calls(server); + for (int i = 0; i <= requested_calls; i++) { + ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), + nullptr); + GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); + } + grpc_completion_queue_shutdown(cq); + for (int i = 0; i <= requested_calls; i++) { + ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), + nullptr); + GPR_ASSERT(ev.type == GRPC_QUEUE_SHUTDOWN); } + grpc_server_destroy(server); + grpc_completion_queue_destroy(cq); grpc_shutdown(); if (leak_check) { counters = grpc_memory_counters_snapshot(); diff --git a/test/core/end2end/goaway_server_test.cc b/test/core/end2end/goaway_server_test.cc index 94cfbdda7ee..2d0db967c31 100644 --- a/test/core/end2end/goaway_server_test.cc +++ b/test/core/end2end/goaway_server_test.cc @@ -39,15 +39,16 @@ static void* tag(intptr_t i) { return (void*)i; } static gpr_mu g_mu; static int g_resolve_port = -1; -static void (*iomgr_resolve_address)(const char* addr, const char* default_port, +static void (*iomgr_resolve_address)(grpc_exec_ctx* exec_ctx, const char* addr, + const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addresses); static grpc_ares_request* (*iomgr_dns_lookup_ares)( - const char* dns_server, const char* addr, const char* default_port, - grpc_pollset_set* interested_parties, grpc_closure* on_done, - grpc_lb_addresses** addresses, bool check_grpclb, + grpc_exec_ctx* exec_ctx, const char* dns_server, const char* addr, + const char* default_port, grpc_pollset_set* interested_parties, + grpc_closure* on_done, grpc_lb_addresses** addresses, bool check_grpclb, char** service_config_json); static void set_resolve_port(int port) { @@ -56,13 +57,14 @@ static void set_resolve_port(int port) { gpr_mu_unlock(&g_mu); } -static void my_resolve_address(const char* addr, const char* default_port, +static void my_resolve_address(grpc_exec_ctx* exec_ctx, const char* addr, + const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addrs) { if (0 != strcmp(addr, "test")) { - iomgr_resolve_address(addr, default_port, interested_parties, on_done, - addrs); + iomgr_resolve_address(exec_ctx, addr, default_port, interested_parties, + on_done, addrs); return; } @@ -84,16 +86,16 @@ static void my_resolve_address(const char* addr, const char* default_port, (*addrs)->addrs[0].len = sizeof(*sa); gpr_mu_unlock(&g_mu); } - GRPC_CLOSURE_SCHED(on_done, error); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, error); } static grpc_ares_request* my_dns_lookup_ares( - const char* dns_server, const char* addr, const char* default_port, - grpc_pollset_set* interested_parties, grpc_closure* on_done, - grpc_lb_addresses** lb_addrs, bool check_grpclb, + grpc_exec_ctx* exec_ctx, const char* dns_server, const char* addr, + const char* default_port, grpc_pollset_set* interested_parties, + grpc_closure* on_done, grpc_lb_addresses** lb_addrs, bool check_grpclb, char** service_config_json) { if (0 != strcmp(addr, "test")) { - return iomgr_dns_lookup_ares(dns_server, addr, default_port, + return iomgr_dns_lookup_ares(exec_ctx, dns_server, addr, default_port, interested_parties, on_done, lb_addrs, check_grpclb, service_config_json); } @@ -115,7 +117,7 @@ static grpc_ares_request* my_dns_lookup_ares( gpr_free(sa); gpr_mu_unlock(&g_mu); } - GRPC_CLOSURE_SCHED(on_done, error); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, error); return nullptr; } diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc index d50d1f4d81e..9a98c071585 100644 --- a/test/core/end2end/h2_ssl_cert_test.cc +++ b/test/core/end2end/h2_ssl_cert_test.cc @@ -181,8 +181,9 @@ typedef enum { NONE, SELF_SIGNED, SIGNED, BAD_CERT_PAIR } certtype; grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); \ chttp2_init_client_secure_fullstack(f, new_client_args, ssl_creds); \ { \ - grpc_core::ExecCtx exec_ctx; \ - grpc_channel_args_destroy(new_client_args); \ + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; \ + grpc_channel_args_destroy(&exec_ctx, new_client_args); \ + grpc_exec_ctx_finish(&exec_ctx); \ } \ } diff --git a/test/core/end2end/tests/cancel_after_accept.cc b/test/core/end2end/tests/cancel_after_accept.cc index f59caf7e35a..83439d71d22 100644 --- a/test/core/end2end/tests/cancel_after_accept.cc +++ b/test/core/end2end/tests/cancel_after_accept.cc @@ -245,8 +245,9 @@ static void test_cancel_after_accept(grpc_end2end_test_config config, grpc_call_unref(s); if (args != nullptr) { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, args); + grpc_exec_ctx_finish(&exec_ctx); } cq_verifier_destroy(cqv); diff --git a/test/core/end2end/tests/cancel_after_round_trip.cc b/test/core/end2end/tests/cancel_after_round_trip.cc index b10b93978d1..ddcec67de5a 100644 --- a/test/core/end2end/tests/cancel_after_round_trip.cc +++ b/test/core/end2end/tests/cancel_after_round_trip.cc @@ -278,8 +278,9 @@ static void test_cancel_after_round_trip(grpc_end2end_test_config config, grpc_call_unref(s); if (args != nullptr) { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, args); + grpc_exec_ctx_finish(&exec_ctx); } cq_verifier_destroy(cqv); diff --git a/test/core/end2end/tests/compressed_payload.cc b/test/core/end2end/tests/compressed_payload.cc index 944edc7a70f..a8ea0ff2e0c 100644 --- a/test/core/end2end/tests/compressed_payload.cc +++ b/test/core/end2end/tests/compressed_payload.cc @@ -129,9 +129,10 @@ static void request_for_disabled_algorithm( server_args = grpc_channel_args_set_compression_algorithm(nullptr, GRPC_COMPRESS_NONE); { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; server_args = grpc_channel_args_compression_algorithm_set_state( - &server_args, algorithm_to_disable, false); + &exec_ctx, &server_args, algorithm_to_disable, false); + grpc_exec_ctx_finish(&exec_ctx); } f = begin_test(config, test_name, client_args, server_args); @@ -256,9 +257,10 @@ static void request_for_disabled_algorithm( grpc_byte_buffer_destroy(request_payload_recv); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(client_args); - grpc_channel_args_destroy(server_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, client_args); + grpc_channel_args_destroy(&exec_ctx, server_args); + grpc_exec_ctx_finish(&exec_ctx); } end_test(&f); @@ -537,9 +539,10 @@ static void request_with_payload_template( cq_verifier_destroy(cqv); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(client_args); - grpc_channel_args_destroy(server_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, client_args); + grpc_channel_args_destroy(&exec_ctx, server_args); + grpc_exec_ctx_finish(&exec_ctx); } end_test(&f); diff --git a/test/core/end2end/tests/filter_call_init_fails.cc b/test/core/end2end/tests/filter_call_init_fails.cc index 8f46f0bb913..6eed68a2f9f 100644 --- a/test/core/end2end/tests/filter_call_init_fails.cc +++ b/test/core/end2end/tests/filter_call_init_fails.cc @@ -399,23 +399,26 @@ static void test_client_subchannel_filter(grpc_end2end_test_config config) { * Test filter - always fails to initialize a call */ -static grpc_error* init_call_elem(grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { return grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("access denied"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_PERMISSION_DENIED); } -static void destroy_call_elem(grpc_call_element* elem, +static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) {} -static grpc_error* init_channel_elem(grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) {} static const grpc_channel_filter test_filter = { grpc_call_next_op, @@ -434,7 +437,8 @@ static const grpc_channel_filter test_filter = { * Registration */ -static bool maybe_add_server_channel_filter(grpc_channel_stack_builder* builder, +static bool maybe_add_server_channel_filter(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, void* arg) { if (g_enable_server_channel_filter) { // Want to add the filter as close to the end as possible, to make @@ -453,7 +457,8 @@ static bool maybe_add_server_channel_filter(grpc_channel_stack_builder* builder, } } -static bool maybe_add_client_channel_filter(grpc_channel_stack_builder* builder, +static bool maybe_add_client_channel_filter(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, void* arg) { if (g_enable_client_channel_filter) { // Want to add the filter as close to the end as possible, to make @@ -473,7 +478,7 @@ static bool maybe_add_client_channel_filter(grpc_channel_stack_builder* builder, } static bool maybe_add_client_subchannel_filter( - grpc_channel_stack_builder* builder, void* arg) { + grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, void* arg) { if (g_enable_client_subchannel_filter) { // Want to add the filter as close to the end as possible, to make // sure that all of the filters work well together. However, we diff --git a/test/core/end2end/tests/filter_causes_close.cc b/test/core/end2end/tests/filter_causes_close.cc index ec8f9dbe009..793f5906866 100644 --- a/test/core/end2end/tests/filter_causes_close.cc +++ b/test/core/end2end/tests/filter_causes_close.cc @@ -197,11 +197,12 @@ typedef struct { uint8_t unused; } channel_data; -static void recv_im_ready(void* arg, grpc_error* error) { +static void recv_im_ready(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; GRPC_CLOSURE_RUN( - calld->recv_im_ready, + exec_ctx, calld->recv_im_ready, grpc_error_set_int(GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Failure that's not preventable.", &error, 1), GRPC_ERROR_INT_GRPC_STATUS, @@ -209,7 +210,8 @@ static void recv_im_ready(void* arg, grpc_error* error) { } static void start_transport_stream_op_batch( - grpc_call_element* elem, grpc_transport_stream_op_batch* op) { + grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_transport_stream_op_batch* op) { call_data* calld = (call_data*)elem->call_data; if (op->recv_initial_metadata) { calld->recv_im_ready = @@ -217,24 +219,27 @@ static void start_transport_stream_op_batch( op->payload->recv_initial_metadata.recv_initial_metadata_ready = GRPC_CLOSURE_CREATE(recv_im_ready, elem, grpc_schedule_on_exec_ctx); } - grpc_call_next_op(elem, op); + grpc_call_next_op(exec_ctx, elem, op); } -static grpc_error* init_call_elem(grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { return GRPC_ERROR_NONE; } -static void destroy_call_elem(grpc_call_element* elem, +static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) {} -static grpc_error* init_channel_elem(grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) {} static const grpc_channel_filter test_filter = { start_transport_stream_op_batch, @@ -253,7 +258,8 @@ static const grpc_channel_filter test_filter = { * Registration */ -static bool maybe_add_filter(grpc_channel_stack_builder* builder, void* arg) { +static bool maybe_add_filter(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, void* arg) { if (g_enable_filter) { return grpc_channel_stack_builder_prepend_filter(builder, &test_filter, nullptr, nullptr); diff --git a/test/core/end2end/tests/filter_latency.cc b/test/core/end2end/tests/filter_latency.cc index 845cbc01cfa..c4d96ebfe21 100644 --- a/test/core/end2end/tests/filter_latency.cc +++ b/test/core/end2end/tests/filter_latency.cc @@ -247,12 +247,14 @@ static void test_request(grpc_end2end_test_config config) { * Test latency filter */ -static grpc_error* init_call_elem(grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { return GRPC_ERROR_NONE; } -static void client_destroy_call_elem(grpc_call_element* elem, +static void client_destroy_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { gpr_mu_lock(&g_mu); @@ -260,7 +262,8 @@ static void client_destroy_call_elem(grpc_call_element* elem, gpr_mu_unlock(&g_mu); } -static void server_destroy_call_elem(grpc_call_element* elem, +static void server_destroy_call_elem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { gpr_mu_lock(&g_mu); @@ -268,12 +271,14 @@ static void server_destroy_call_elem(grpc_call_element* elem, gpr_mu_unlock(&g_mu); } -static grpc_error* init_channel_elem(grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem) {} static const grpc_channel_filter test_client_filter = { grpc_call_next_op, @@ -305,7 +310,8 @@ static const grpc_channel_filter test_server_filter = { * Registration */ -static bool maybe_add_filter(grpc_channel_stack_builder* builder, void* arg) { +static bool maybe_add_filter(grpc_exec_ctx* exec_ctx, + grpc_channel_stack_builder* builder, void* arg) { grpc_channel_filter* filter = (grpc_channel_filter*)arg; if (g_enable_filter) { // Want to add the filter as close to the end as possible, to make diff --git a/test/core/end2end/tests/load_reporting_hook.cc b/test/core/end2end/tests/load_reporting_hook.cc index e056bd547b8..faabec34cb6 100644 --- a/test/core/end2end/tests/load_reporting_hook.cc +++ b/test/core/end2end/tests/load_reporting_hook.cc @@ -300,8 +300,9 @@ static void test_load_reporting_hook(grpc_end2end_test_config config) { &trailing_lr_metadata); end_test(&f); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(lr_server_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, lr_server_args); + grpc_exec_ctx_finish(&exec_ctx); } config.tear_down_data(&f); } diff --git a/test/core/end2end/tests/max_message_length.cc b/test/core/end2end/tests/max_message_length.cc index e581f1fc20e..f1ac27fa7c1 100644 --- a/test/core/end2end/tests/max_message_length.cc +++ b/test/core/end2end/tests/max_message_length.cc @@ -173,9 +173,12 @@ static void test_max_message_length_on_request(grpc_end2end_test_config config, f = begin_test(config, "test_max_request_message_length", client_args, server_args); { - grpc_core::ExecCtx exec_ctx; - if (client_args != nullptr) grpc_channel_args_destroy(client_args); - if (server_args != nullptr) grpc_channel_args_destroy(server_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + if (client_args != nullptr) + grpc_channel_args_destroy(&exec_ctx, client_args); + if (server_args != nullptr) + grpc_channel_args_destroy(&exec_ctx, server_args); + grpc_exec_ctx_finish(&exec_ctx); } cqv = cq_verifier_create(f.cq); @@ -363,9 +366,12 @@ static void test_max_message_length_on_response(grpc_end2end_test_config config, f = begin_test(config, "test_max_response_message_length", client_args, server_args); { - grpc_core::ExecCtx exec_ctx; - if (client_args != nullptr) grpc_channel_args_destroy(client_args); - if (server_args != nullptr) grpc_channel_args_destroy(server_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + if (client_args != nullptr) + grpc_channel_args_destroy(&exec_ctx, client_args); + if (server_args != nullptr) + grpc_channel_args_destroy(&exec_ctx, server_args); + grpc_exec_ctx_finish(&exec_ctx); } cqv = cq_verifier_create(f.cq); diff --git a/test/core/end2end/tests/stream_compression_compressed_payload.cc b/test/core/end2end/tests/stream_compression_compressed_payload.cc index ec3050ad45f..d73346468a4 100644 --- a/test/core/end2end/tests/stream_compression_compressed_payload.cc +++ b/test/core/end2end/tests/stream_compression_compressed_payload.cc @@ -129,9 +129,10 @@ static void request_for_disabled_algorithm( server_args = grpc_channel_args_set_stream_compression_algorithm( nullptr, GRPC_STREAM_COMPRESS_NONE); { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; server_args = grpc_channel_args_stream_compression_algorithm_set_state( - &server_args, algorithm_to_disable, false); + &exec_ctx, &server_args, algorithm_to_disable, false); + grpc_exec_ctx_finish(&exec_ctx); } f = begin_test(config, test_name, client_args, server_args); @@ -257,9 +258,10 @@ static void request_for_disabled_algorithm( grpc_byte_buffer_destroy(request_payload_recv); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(client_args); - grpc_channel_args_destroy(server_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, client_args); + grpc_channel_args_destroy(&exec_ctx, server_args); + grpc_exec_ctx_finish(&exec_ctx); } end_test(&f); @@ -545,9 +547,10 @@ static void request_with_payload_template( cq_verifier_destroy(cqv); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(client_args); - grpc_channel_args_destroy(server_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, client_args); + grpc_channel_args_destroy(&exec_ctx, server_args); + grpc_exec_ctx_finish(&exec_ctx); } end_test(&f); diff --git a/test/core/end2end/tests/stream_compression_payload.cc b/test/core/end2end/tests/stream_compression_payload.cc index b95e6528cde..924961ea551 100644 --- a/test/core/end2end/tests/stream_compression_payload.cc +++ b/test/core/end2end/tests/stream_compression_payload.cc @@ -277,9 +277,10 @@ static void test_invoke_request_response_with_payload( end_test(&f); config.tear_down_data(&f); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(client_args); - grpc_channel_args_destroy(server_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, client_args); + grpc_channel_args_destroy(&exec_ctx, server_args); + grpc_exec_ctx_finish(&exec_ctx); } } diff --git a/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc b/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc index 2a8799ee67b..d3b526f04ed 100644 --- a/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc +++ b/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc @@ -275,9 +275,10 @@ static void test_pingpong_streaming(grpc_end2end_test_config config, end_test(&f); config.tear_down_data(&f); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(client_args); - grpc_channel_args_destroy(server_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, client_args); + grpc_channel_args_destroy(&exec_ctx, server_args); + grpc_exec_ctx_finish(&exec_ctx); } } diff --git a/test/core/end2end/tests/workaround_cronet_compression.cc b/test/core/end2end/tests/workaround_cronet_compression.cc index d4decce0aa1..bc4d5079d83 100644 --- a/test/core/end2end/tests/workaround_cronet_compression.cc +++ b/test/core/end2end/tests/workaround_cronet_compression.cc @@ -142,14 +142,15 @@ static void request_with_payload_template( nullptr, default_server_channel_compression_algorithm); if (user_agent_override) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_channel_args* client_args_old = client_args; grpc_arg arg; arg.key = const_cast(GRPC_ARG_PRIMARY_USER_AGENT_STRING); arg.type = GRPC_ARG_STRING; arg.value.string = user_agent_override; client_args = grpc_channel_args_copy_and_add(client_args_old, &arg, 1); - grpc_channel_args_destroy(client_args_old); + grpc_channel_args_destroy(&exec_ctx, client_args_old); + grpc_exec_ctx_finish(&exec_ctx); } f = begin_test(config, test_name, client_args, server_args); @@ -350,9 +351,10 @@ static void request_with_payload_template( cq_verifier_destroy(cqv); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(client_args); - grpc_channel_args_destroy(server_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, client_args); + grpc_channel_args_destroy(&exec_ctx, server_args); + grpc_exec_ctx_finish(&exec_ctx); } end_test(&f); diff --git a/test/core/handshake/readahead_handshaker_server_ssl.cc b/test/core/handshake/readahead_handshaker_server_ssl.cc index 599e0e16e2d..2810082837b 100644 --- a/test/core/handshake/readahead_handshaker_server_ssl.cc +++ b/test/core/handshake/readahead_handshaker_server_ssl.cc @@ -49,37 +49,41 @@ * to the security_handshaker). This test is meant to protect code relying on * this functionality that lives outside of this repo. */ -static void readahead_handshaker_destroy(grpc_handshaker* handshaker) { +static void readahead_handshaker_destroy(grpc_exec_ctx* ctx, + grpc_handshaker* handshaker) { gpr_free(handshaker); } -static void readahead_handshaker_shutdown(grpc_handshaker* handshaker, +static void readahead_handshaker_shutdown(grpc_exec_ctx* ctx, + grpc_handshaker* handshaker, grpc_error* error) {} static void readahead_handshaker_do_handshake( - grpc_handshaker* handshaker, grpc_tcp_server_acceptor* acceptor, - grpc_closure* on_handshake_done, grpc_handshaker_args* args) { - grpc_endpoint_read(args->endpoint, args->read_buffer, on_handshake_done); + grpc_exec_ctx* ctx, grpc_handshaker* handshaker, + grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, + grpc_handshaker_args* args) { + grpc_endpoint_read(ctx, args->endpoint, args->read_buffer, on_handshake_done); } const grpc_handshaker_vtable readahead_handshaker_vtable = { readahead_handshaker_destroy, readahead_handshaker_shutdown, readahead_handshaker_do_handshake}; -static grpc_handshaker* readahead_handshaker_create() { +static grpc_handshaker* readahead_handshaker_create(grpc_exec_ctx* ctx) { grpc_handshaker* h = (grpc_handshaker*)gpr_zalloc(sizeof(grpc_handshaker)); grpc_handshaker_init(&readahead_handshaker_vtable, h); return h; } static void readahead_handshaker_factory_add_handshakers( - grpc_handshaker_factory* hf, const grpc_channel_args* args, - grpc_handshake_manager* handshake_mgr) { - grpc_handshake_manager_add(handshake_mgr, readahead_handshaker_create()); + grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* hf, + const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr) { + grpc_handshake_manager_add(handshake_mgr, + readahead_handshaker_create(exec_ctx)); } static void readahead_handshaker_factory_destroy( - grpc_handshaker_factory* handshaker_factory) {} + grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* handshaker_factory) {} static const grpc_handshaker_factory_vtable readahead_handshaker_factory_vtable = { diff --git a/test/core/http/format_request_test.cc b/test/core/http/format_request_test.cc index 353e138b2a1..684738a9973 100644 --- a/test/core/http/format_request_test.cc +++ b/test/core/http/format_request_test.cc @@ -139,13 +139,11 @@ static void test_format_post_request_content_type_override(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); test_format_get_request(); test_format_post_request(); test_format_post_request_no_body(); test_format_post_request_content_type_override(); - grpc_shutdown(); return 0; } diff --git a/test/core/http/httpcli_test.cc b/test/core/http/httpcli_test.cc index 259e3aa463e..81e9374819d 100644 --- a/test/core/http/httpcli_test.cc +++ b/test/core/http/httpcli_test.cc @@ -40,7 +40,7 @@ static grpc_millis n_seconds_time(int seconds) { grpc_timeout_seconds_to_deadline(seconds)); } -static void on_finish(void* arg, grpc_error* error) { +static void on_finish(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { const char* expect = "Hello world!" "

    This is a test

    "; @@ -53,14 +53,15 @@ static void on_finish(void* arg, grpc_error* error) { g_done = 1; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(grpc_polling_entity_pollset(&g_pops), nullptr))); + grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&g_pops), + nullptr))); gpr_mu_unlock(g_mu); } static void test_get(int port) { grpc_httpcli_request req; char* host; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; g_done = 0; gpr_log(GPR_INFO, "test_get"); @@ -77,18 +78,19 @@ static void test_get(int port) { memset(&response, 0, sizeof(response)); grpc_resource_quota* resource_quota = grpc_resource_quota_create("test_get"); grpc_httpcli_get( - &g_context, &g_pops, resource_quota, &req, n_seconds_time(15), + &exec_ctx, &g_context, &g_pops, resource_quota, &req, n_seconds_time(15), GRPC_CLOSURE_CREATE(on_finish, &response, grpc_schedule_on_exec_ctx), &response); - grpc_resource_quota_unref_internal(resource_quota); + grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); gpr_mu_lock(g_mu); while (!g_done) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&g_pops), - &worker, n_seconds_time(1)))); + "pollset_work", + grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), + &worker, n_seconds_time(1)))); gpr_mu_unlock(g_mu); - + grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -99,7 +101,7 @@ static void test_get(int port) { static void test_post(int port) { grpc_httpcli_request req; char* host; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; g_done = 0; gpr_log(GPR_INFO, "test_post"); @@ -116,18 +118,20 @@ static void test_post(int port) { memset(&response, 0, sizeof(response)); grpc_resource_quota* resource_quota = grpc_resource_quota_create("test_post"); grpc_httpcli_post( - &g_context, &g_pops, resource_quota, &req, "hello", 5, n_seconds_time(15), + &exec_ctx, &g_context, &g_pops, resource_quota, &req, "hello", 5, + n_seconds_time(15), GRPC_CLOSURE_CREATE(on_finish, &response, grpc_schedule_on_exec_ctx), &response); - grpc_resource_quota_unref_internal(resource_quota); + grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); gpr_mu_lock(g_mu); while (!g_done) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&g_pops), - &worker, n_seconds_time(1)))); + "pollset_work", + grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), + &worker, n_seconds_time(1)))); gpr_mu_unlock(g_mu); - + grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -135,69 +139,69 @@ static void test_post(int port) { grpc_http_response_destroy(&response); } -static void destroy_pops(void* p, grpc_error* error) { - grpc_pollset_destroy( - grpc_polling_entity_pollset(static_cast(p))); +static void destroy_pops(grpc_exec_ctx* exec_ctx, void* p, grpc_error* error) { + grpc_pollset_destroy(exec_ctx, grpc_polling_entity_pollset( + static_cast(p))); } int main(int argc, char** argv) { + grpc_closure destroyed; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_subprocess* server; + char* me = argv[0]; + char* lslash = strrchr(me, '/'); + char* args[4]; + int port = grpc_pick_unused_port_or_die(); + int arg_shift = 0; + /* figure out where we are */ + char* root; + if (lslash) { + root = static_cast(gpr_malloc((size_t)(lslash - me + 1))); + memcpy(root, me, (size_t)(lslash - me)); + root[lslash - me] = 0; + } else { + root = gpr_strdup("."); + } + + GPR_ASSERT(argc <= 2); + if (argc == 2) { + args[0] = gpr_strdup(argv[1]); + } else { + arg_shift = 1; + gpr_asprintf(&args[0], "%s/../../tools/distrib/python_wrapper.sh", root); + gpr_asprintf(&args[1], "%s/../../test/core/http/test_server.py", root); + } + + /* start the server */ + args[1 + arg_shift] = const_cast("--port"); + gpr_asprintf(&args[2 + arg_shift], "%d", port); + server = gpr_subprocess_create(3 + arg_shift, (const char**)args); + GPR_ASSERT(server); + gpr_free(args[0]); + if (arg_shift) gpr_free(args[1]); + gpr_free(args[2 + arg_shift]); + gpr_free(root); + + gpr_sleep_until(gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), + gpr_time_from_seconds(5, GPR_TIMESPAN))); + grpc_test_init(argc, argv); grpc_init(); - { - grpc_closure destroyed; - grpc_core::ExecCtx exec_ctx; - char* me = argv[0]; - char* lslash = strrchr(me, '/'); - char* args[4]; - int port = grpc_pick_unused_port_or_die(); - int arg_shift = 0; - /* figure out where we are */ - char* root; - if (lslash) { - root = static_cast(gpr_malloc((size_t)(lslash - me + 1))); - memcpy(root, me, (size_t)(lslash - me)); - root[lslash - me] = 0; - } else { - root = gpr_strdup("."); - } - - GPR_ASSERT(argc <= 2); - if (argc == 2) { - args[0] = gpr_strdup(argv[1]); - } else { - arg_shift = 1; - gpr_asprintf(&args[0], "%s/../../tools/distrib/python_wrapper.sh", root); - gpr_asprintf(&args[1], "%s/../../test/core/http/test_server.py", root); - } - - /* start the server */ - args[1 + arg_shift] = const_cast("--port"); - gpr_asprintf(&args[2 + arg_shift], "%d", port); - server = gpr_subprocess_create(3 + arg_shift, (const char**)args); - GPR_ASSERT(server); - gpr_free(args[0]); - if (arg_shift) gpr_free(args[1]); - gpr_free(args[2 + arg_shift]); - gpr_free(root); - - gpr_sleep_until(gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), - gpr_time_from_seconds(5, GPR_TIMESPAN))); - - grpc_httpcli_context_init(&g_context); - grpc_pollset* pollset = - static_cast(gpr_zalloc(grpc_pollset_size())); - grpc_pollset_init(pollset, &g_mu); - g_pops = grpc_polling_entity_create_from_pollset(pollset); - - test_get(port); - test_post(port); - - grpc_httpcli_context_destroy(&g_context); - GRPC_CLOSURE_INIT(&destroyed, destroy_pops, &g_pops, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(grpc_polling_entity_pollset(&g_pops), &destroyed); - } + grpc_httpcli_context_init(&g_context); + grpc_pollset* pollset = + static_cast(gpr_zalloc(grpc_pollset_size())); + grpc_pollset_init(pollset, &g_mu); + g_pops = grpc_polling_entity_create_from_pollset(pollset); + + test_get(port); + test_post(port); + + grpc_httpcli_context_destroy(&exec_ctx, &g_context); + GRPC_CLOSURE_INIT(&destroyed, destroy_pops, &g_pops, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&g_pops), + &destroyed); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); gpr_free(grpc_polling_entity_pollset(&g_pops)); diff --git a/test/core/http/httpscli_test.cc b/test/core/http/httpscli_test.cc index adf69f1b16f..da8405c0492 100644 --- a/test/core/http/httpscli_test.cc +++ b/test/core/http/httpscli_test.cc @@ -40,7 +40,7 @@ static grpc_millis n_seconds_time(int seconds) { grpc_timeout_seconds_to_deadline(seconds)); } -static void on_finish(void* arg, grpc_error* error) { +static void on_finish(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { const char* expect = "Hello world!" "

    This is a test

    "; @@ -53,14 +53,15 @@ static void on_finish(void* arg, grpc_error* error) { g_done = 1; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(grpc_polling_entity_pollset(&g_pops), nullptr))); + grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&g_pops), + nullptr))); gpr_mu_unlock(g_mu); } static void test_get(int port) { grpc_httpcli_request req; char* host; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; g_done = 0; gpr_log(GPR_INFO, "test_get"); @@ -78,18 +79,19 @@ static void test_get(int port) { memset(&response, 0, sizeof(response)); grpc_resource_quota* resource_quota = grpc_resource_quota_create("test_get"); grpc_httpcli_get( - &g_context, &g_pops, resource_quota, &req, n_seconds_time(15), + &exec_ctx, &g_context, &g_pops, resource_quota, &req, n_seconds_time(15), GRPC_CLOSURE_CREATE(on_finish, &response, grpc_schedule_on_exec_ctx), &response); - grpc_resource_quota_unref_internal(resource_quota); + grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); gpr_mu_lock(g_mu); while (!g_done) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&g_pops), - &worker, n_seconds_time(1)))); + "pollset_work", + grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), + &worker, n_seconds_time(1)))); gpr_mu_unlock(g_mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -100,7 +102,7 @@ static void test_get(int port) { static void test_post(int port) { grpc_httpcli_request req; char* host; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; g_done = 0; gpr_log(GPR_INFO, "test_post"); @@ -118,18 +120,20 @@ static void test_post(int port) { memset(&response, 0, sizeof(response)); grpc_resource_quota* resource_quota = grpc_resource_quota_create("test_post"); grpc_httpcli_post( - &g_context, &g_pops, resource_quota, &req, "hello", 5, n_seconds_time(15), + &exec_ctx, &g_context, &g_pops, resource_quota, &req, "hello", 5, + n_seconds_time(15), GRPC_CLOSURE_CREATE(on_finish, &response, grpc_schedule_on_exec_ctx), &response); - grpc_resource_quota_unref_internal(resource_quota); + grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); gpr_mu_lock(g_mu); while (!g_done) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&g_pops), - &worker, n_seconds_time(1)))); + "pollset_work", + grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), + &worker, n_seconds_time(1)))); gpr_mu_unlock(g_mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -137,13 +141,14 @@ static void test_post(int port) { grpc_http_response_destroy(&response); } -static void destroy_pops(void* p, grpc_error* error) { - grpc_pollset_destroy( - grpc_polling_entity_pollset(static_cast(p))); +static void destroy_pops(grpc_exec_ctx* exec_ctx, void* p, grpc_error* error) { + grpc_pollset_destroy(exec_ctx, grpc_polling_entity_pollset( + static_cast(p))); } int main(int argc, char** argv) { grpc_closure destroyed; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_subprocess* server; char* me = argv[0]; char* lslash = strrchr(me, '/'); @@ -194,13 +199,12 @@ int main(int argc, char** argv) { test_get(port); test_post(port); - { - grpc_core::ExecCtx exec_ctx; - grpc_httpcli_context_destroy(&g_context); - GRPC_CLOSURE_INIT(&destroyed, destroy_pops, &g_pops, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(grpc_polling_entity_pollset(&g_pops), &destroyed); - } + grpc_httpcli_context_destroy(&exec_ctx, &g_context); + GRPC_CLOSURE_INIT(&destroyed, destroy_pops, &g_pops, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&g_pops), + &destroyed); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); gpr_free(grpc_polling_entity_pollset(&g_pops)); diff --git a/test/core/http/parser_test.cc b/test/core/http/parser_test.cc index 18f19856bd9..0b60e369b79 100644 --- a/test/core/http/parser_test.cc +++ b/test/core/http/parser_test.cc @@ -21,7 +21,6 @@ #include #include -#include #include #include #include @@ -218,7 +217,6 @@ int main(int argc, char** argv) { char *tmp1, *tmp2; grpc_test_init(argc, argv); - grpc_init(); for (i = 0; i < GPR_ARRAY_SIZE(split_modes); i++) { test_succeeds(split_modes[i], @@ -302,6 +300,5 @@ int main(int argc, char** argv) { gpr_free(tmp2); } - grpc_shutdown(); return 0; } diff --git a/test/core/http/request_fuzzer.cc b/test/core/http/request_fuzzer.cc index 9798cfb33c7..368ac1b49db 100644 --- a/test/core/http/request_fuzzer.cc +++ b/test/core/http/request_fuzzer.cc @@ -20,7 +20,6 @@ #include #include -#include #include #include "src/core/lib/http/parser.h" @@ -31,7 +30,6 @@ bool leak_check = true; extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_http_parser parser; grpc_http_request request; - grpc_init(); memset(&request, 0, sizeof(request)); grpc_http_parser_init(&parser, GRPC_HTTP_REQUEST, &request); grpc_slice slice = grpc_slice_from_copied_buffer((const char*)data, size); @@ -40,6 +38,5 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_slice_unref(slice); grpc_http_parser_destroy(&parser); grpc_http_request_destroy(&request); - grpc_shutdown(); return 0; } diff --git a/test/core/http/response_fuzzer.cc b/test/core/http/response_fuzzer.cc index fc0904b1db7..2a793fddd4b 100644 --- a/test/core/http/response_fuzzer.cc +++ b/test/core/http/response_fuzzer.cc @@ -19,7 +19,6 @@ #include #include -#include #include #include "src/core/lib/http/parser.h" @@ -30,7 +29,6 @@ bool leak_check = true; extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_http_parser parser; grpc_http_response response; - grpc_init(); memset(&response, 0, sizeof(response)); grpc_http_parser_init(&parser, GRPC_HTTP_RESPONSE, &response); grpc_slice slice = grpc_slice_from_copied_buffer((const char*)data, size); @@ -39,6 +37,5 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_slice_unref(slice); grpc_http_parser_destroy(&parser); grpc_http_response_destroy(&response); - grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/combiner_test.cc b/test/core/iomgr/combiner_test.cc index 891008c7741..33d892fa06a 100644 --- a/test/core/iomgr/combiner_test.cc +++ b/test/core/iomgr/combiner_test.cc @@ -28,11 +28,13 @@ static void test_no_op(void) { gpr_log(GPR_DEBUG, "test_no_op"); - grpc_core::ExecCtx exec_ctx; - GRPC_COMBINER_UNREF(grpc_combiner_create(), "test_no_op"); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_COMBINER_UNREF(&exec_ctx, grpc_combiner_create(), "test_no_op"); + grpc_exec_ctx_finish(&exec_ctx); } -static void set_event_to_true(void* value, grpc_error* error) { +static void set_event_to_true(grpc_exec_ctx* exec_ctx, void* value, + grpc_error* error) { gpr_event_set(static_cast(value), (void*)1); } @@ -42,14 +44,16 @@ static void test_execute_one(void) { grpc_combiner* lock = grpc_combiner_create(); gpr_event done; gpr_event_init(&done); - grpc_core::ExecCtx exec_ctx; - GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(set_event_to_true, &done, + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_CLOSURE_SCHED(&exec_ctx, + GRPC_CLOSURE_CREATE(set_event_to_true, &done, grpc_combiner_scheduler(lock)), GRPC_ERROR_NONE); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); GPR_ASSERT(gpr_event_wait(&done, grpc_timeout_seconds_to_deadline(5)) != nullptr); - GRPC_COMBINER_UNREF(lock, "test_execute_one"); + GRPC_COMBINER_UNREF(&exec_ctx, lock, "test_execute_one"); + grpc_exec_ctx_finish(&exec_ctx); } typedef struct { @@ -63,7 +67,7 @@ typedef struct { size_t value; } ex_args; -static void check_one(void* a, grpc_error* error) { +static void check_one(grpc_exec_ctx* exec_ctx, void* a, grpc_error* error) { ex_args* args = static_cast(a); GPR_ASSERT(*args->ctr == args->value - 1); *args->ctr = args->value; @@ -72,25 +76,28 @@ static void check_one(void* a, grpc_error* error) { static void execute_many_loop(void* a) { thd_args* args = static_cast(a); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; size_t n = 1; for (size_t i = 0; i < 10; i++) { for (size_t j = 0; j < 10000; j++) { ex_args* c = static_cast(gpr_malloc(sizeof(*c))); c->ctr = &args->ctr; c->value = n++; - GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE( + GRPC_CLOSURE_SCHED(&exec_ctx, + GRPC_CLOSURE_CREATE( check_one, c, grpc_combiner_scheduler(args->lock)), GRPC_ERROR_NONE); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); } // sleep for a little bit, to test a combiner draining and another thread // picking it up gpr_sleep_until(grpc_timeout_milliseconds_to_deadline(100)); } - GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(set_event_to_true, &args->done, + GRPC_CLOSURE_SCHED(&exec_ctx, + GRPC_CLOSURE_CREATE(set_event_to_true, &args->done, grpc_combiner_scheduler(args->lock)), GRPC_ERROR_NONE); + grpc_exec_ctx_finish(&exec_ctx); } static void test_execute_many(void) { @@ -113,18 +120,20 @@ static void test_execute_many(void) { gpr_inf_future(GPR_CLOCK_REALTIME)) != nullptr); gpr_thd_join(thds[i]); } - grpc_core::ExecCtx exec_ctx; - GRPC_COMBINER_UNREF(lock, "test_execute_many"); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_COMBINER_UNREF(&exec_ctx, lock, "test_execute_many"); + grpc_exec_ctx_finish(&exec_ctx); } static gpr_event got_in_finally; -static void in_finally(void* arg, grpc_error* error) { +static void in_finally(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { gpr_event_set(&got_in_finally, (void*)1); } -static void add_finally(void* arg, grpc_error* error) { - GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(in_finally, arg, +static void add_finally(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { + GRPC_CLOSURE_SCHED(exec_ctx, + GRPC_CLOSURE_CREATE(in_finally, arg, grpc_combiner_finally_scheduler( static_cast(arg))), GRPC_ERROR_NONE); @@ -134,15 +143,17 @@ static void test_execute_finally(void) { gpr_log(GPR_DEBUG, "test_execute_finally"); grpc_combiner* lock = grpc_combiner_create(); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_event_init(&got_in_finally); GRPC_CLOSURE_SCHED( + &exec_ctx, GRPC_CLOSURE_CREATE(add_finally, lock, grpc_combiner_scheduler(lock)), GRPC_ERROR_NONE); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); GPR_ASSERT(gpr_event_wait(&got_in_finally, grpc_timeout_seconds_to_deadline(5)) != nullptr); - GRPC_COMBINER_UNREF(lock, "test_execute_finally"); + GRPC_COMBINER_UNREF(&exec_ctx, lock, "test_execute_finally"); + grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { diff --git a/test/core/iomgr/endpoint_pair_test.cc b/test/core/iomgr/endpoint_pair_test.cc index 90dd40d9c48..30a0cb5924a 100644 --- a/test/core/iomgr/endpoint_pair_test.cc +++ b/test/core/iomgr/endpoint_pair_test.cc @@ -32,7 +32,7 @@ static void clean_up(void) {} static grpc_endpoint_test_fixture create_fixture_endpoint_pair( size_t slice_size) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_endpoint_test_fixture f; grpc_arg a[1]; a[0].key = const_cast(GRPC_ARG_TCP_READ_CHUNK_SIZE); @@ -43,8 +43,9 @@ static grpc_endpoint_test_fixture create_fixture_endpoint_pair( f.client_ep = p.client; f.server_ep = p.server; - grpc_endpoint_add_to_pollset(f.client_ep, g_pollset); - grpc_endpoint_add_to_pollset(f.server_ep, g_pollset); + grpc_endpoint_add_to_pollset(&exec_ctx, f.client_ep, g_pollset); + grpc_endpoint_add_to_pollset(&exec_ctx, f.server_ep, g_pollset); + grpc_exec_ctx_finish(&exec_ctx); return f; } @@ -53,23 +54,23 @@ static grpc_endpoint_test_config configs[] = { {"tcp/tcp_socketpair", create_fixture_endpoint_pair, clean_up}, }; -static void destroy_pollset(void* p, grpc_error* error) { - grpc_pollset_destroy(static_cast(p)); +static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, + grpc_error* error) { + grpc_pollset_destroy(exec_ctx, static_cast(p)); } int main(int argc, char** argv) { grpc_closure destroyed; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); - { - grpc_core::ExecCtx exec_ctx; - g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); - grpc_pollset_init(g_pollset, &g_mu); - grpc_endpoint_tests(configs[0], g_pollset, g_mu); - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(g_pollset, &destroyed); - } + g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); + grpc_pollset_init(g_pollset, &g_mu); + grpc_endpoint_tests(configs[0], g_pollset, g_mu); + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); gpr_free(g_pollset); diff --git a/test/core/iomgr/endpoint_tests.cc b/test/core/iomgr/endpoint_tests.cc index 8ccae520670..026e34105d8 100644 --- a/test/core/iomgr/endpoint_tests.cc +++ b/test/core/iomgr/endpoint_tests.cc @@ -115,7 +115,8 @@ struct read_and_write_test_state { grpc_closure done_write; }; -static void read_and_write_test_read_handler(void* data, grpc_error* error) { +static void read_and_write_test_read_handler(grpc_exec_ctx* exec_ctx, + void* data, grpc_error* error) { struct read_and_write_test_state* state = (struct read_and_write_test_state*)data; @@ -125,14 +126,17 @@ static void read_and_write_test_read_handler(void* data, grpc_error* error) { gpr_log(GPR_INFO, "Read handler done"); gpr_mu_lock(g_mu); state->read_done = 1 + (error == GRPC_ERROR_NONE); - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr)); + GRPC_LOG_IF_ERROR("pollset_kick", + grpc_pollset_kick(exec_ctx, g_pollset, nullptr)); gpr_mu_unlock(g_mu); } else if (error == GRPC_ERROR_NONE) { - grpc_endpoint_read(state->read_ep, &state->incoming, &state->done_read); + grpc_endpoint_read(exec_ctx, state->read_ep, &state->incoming, + &state->done_read); } } -static void read_and_write_test_write_handler(void* data, grpc_error* error) { +static void read_and_write_test_write_handler(grpc_exec_ctx* exec_ctx, + void* data, grpc_error* error) { struct read_and_write_test_state* state = (struct read_and_write_test_state*)data; grpc_slice* slices = nullptr; @@ -149,7 +153,7 @@ static void read_and_write_test_write_handler(void* data, grpc_error* error) { &state->current_write_data); grpc_slice_buffer_reset_and_unref(&state->outgoing); grpc_slice_buffer_addn(&state->outgoing, slices, nslices); - grpc_endpoint_write(state->write_ep, &state->outgoing, + grpc_endpoint_write(exec_ctx, state->write_ep, &state->outgoing, &state->done_write); gpr_free(slices); return; @@ -159,7 +163,8 @@ static void read_and_write_test_write_handler(void* data, grpc_error* error) { gpr_log(GPR_INFO, "Write handler done"); gpr_mu_lock(g_mu); state->write_done = 1 + (error == GRPC_ERROR_NONE); - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr)); + GRPC_LOG_IF_ERROR("pollset_kick", + grpc_pollset_kick(exec_ctx, g_pollset, nullptr)); gpr_mu_unlock(g_mu); } @@ -173,7 +178,7 @@ static void read_and_write_test(grpc_endpoint_test_config config, struct read_and_write_test_state state; grpc_endpoint_test_fixture f = begin_test(config, "read_and_write_test", slice_size); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); gpr_log(GPR_DEBUG, @@ -212,57 +217,66 @@ static void read_and_write_test(grpc_endpoint_test_config config, for the first iteration as for later iterations. It does the right thing even when bytes_written is unsigned. */ state.bytes_written -= state.current_write_size; - read_and_write_test_write_handler(&state, GRPC_ERROR_NONE); - grpc_core::ExecCtx::Get()->Flush(); + read_and_write_test_write_handler(&exec_ctx, &state, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(&exec_ctx); - grpc_endpoint_read(state.read_ep, &state.incoming, &state.done_read); + grpc_endpoint_read(&exec_ctx, state.read_ep, &state.incoming, + &state.done_read); if (shutdown) { gpr_log(GPR_DEBUG, "shutdown read"); grpc_endpoint_shutdown( - state.read_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); + &exec_ctx, state.read_ep, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); gpr_log(GPR_DEBUG, "shutdown write"); grpc_endpoint_shutdown( - state.write_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); + &exec_ctx, state.write_ep, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); } - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); gpr_mu_lock(g_mu); while (!state.read_done || !state.write_done) { grpc_pollset_worker* worker = nullptr; - GPR_ASSERT(grpc_core::ExecCtx::Get()->Now() < deadline); + GPR_ASSERT(grpc_exec_ctx_now(&exec_ctx) < deadline); GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); + "pollset_work", + grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); } gpr_mu_unlock(g_mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); end_test(config); - grpc_slice_buffer_destroy_internal(&state.outgoing); - grpc_slice_buffer_destroy_internal(&state.incoming); - grpc_endpoint_destroy(state.read_ep); - grpc_endpoint_destroy(state.write_ep); + grpc_slice_buffer_destroy_internal(&exec_ctx, &state.outgoing); + grpc_slice_buffer_destroy_internal(&exec_ctx, &state.incoming); + grpc_endpoint_destroy(&exec_ctx, state.read_ep); + grpc_endpoint_destroy(&exec_ctx, state.write_ep); + grpc_exec_ctx_finish(&exec_ctx); } -static void inc_on_failure(void* arg, grpc_error* error) { +static void inc_on_failure(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { gpr_mu_lock(g_mu); *(int*)arg += (error != GRPC_ERROR_NONE); - GPR_ASSERT(GRPC_LOG_IF_ERROR("kick", grpc_pollset_kick(g_pollset, nullptr))); + GPR_ASSERT(GRPC_LOG_IF_ERROR( + "kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); gpr_mu_unlock(g_mu); } -static void wait_for_fail_count(int* fail_count, int want_fail_count) { - grpc_core::ExecCtx::Get()->Flush(); +static void wait_for_fail_count(grpc_exec_ctx* exec_ctx, int* fail_count, + int want_fail_count) { + grpc_exec_ctx_flush(exec_ctx); gpr_mu_lock(g_mu); grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(10)); - while (grpc_core::ExecCtx::Get()->Now() < deadline && + while (grpc_exec_ctx_now(exec_ctx) < deadline && *fail_count < want_fail_count) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); + "pollset_work", + grpc_pollset_work(exec_ctx, g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(exec_ctx); gpr_mu_lock(g_mu); } GPR_ASSERT(*fail_count == want_fail_count); @@ -277,32 +291,33 @@ static void multiple_shutdown_test(grpc_endpoint_test_config config) { grpc_slice_buffer slice_buffer; grpc_slice_buffer_init(&slice_buffer); - grpc_core::ExecCtx exec_ctx; - grpc_endpoint_add_to_pollset(f.client_ep, g_pollset); - grpc_endpoint_read(f.client_ep, &slice_buffer, + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_endpoint_add_to_pollset(&exec_ctx, f.client_ep, g_pollset); + grpc_endpoint_read(&exec_ctx, f.client_ep, &slice_buffer, GRPC_CLOSURE_CREATE(inc_on_failure, &fail_count, grpc_schedule_on_exec_ctx)); - wait_for_fail_count(&fail_count, 0); - grpc_endpoint_shutdown(f.client_ep, + wait_for_fail_count(&exec_ctx, &fail_count, 0); + grpc_endpoint_shutdown(&exec_ctx, f.client_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); - wait_for_fail_count(&fail_count, 1); - grpc_endpoint_read(f.client_ep, &slice_buffer, + wait_for_fail_count(&exec_ctx, &fail_count, 1); + grpc_endpoint_read(&exec_ctx, f.client_ep, &slice_buffer, GRPC_CLOSURE_CREATE(inc_on_failure, &fail_count, grpc_schedule_on_exec_ctx)); - wait_for_fail_count(&fail_count, 2); + wait_for_fail_count(&exec_ctx, &fail_count, 2); grpc_slice_buffer_add(&slice_buffer, grpc_slice_from_copied_string("a")); - grpc_endpoint_write(f.client_ep, &slice_buffer, + grpc_endpoint_write(&exec_ctx, f.client_ep, &slice_buffer, GRPC_CLOSURE_CREATE(inc_on_failure, &fail_count, grpc_schedule_on_exec_ctx)); - wait_for_fail_count(&fail_count, 3); - grpc_endpoint_shutdown(f.client_ep, + wait_for_fail_count(&exec_ctx, &fail_count, 3); + grpc_endpoint_shutdown(&exec_ctx, f.client_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); - wait_for_fail_count(&fail_count, 3); + wait_for_fail_count(&exec_ctx, &fail_count, 3); - grpc_slice_buffer_destroy_internal(&slice_buffer); + grpc_slice_buffer_destroy_internal(&exec_ctx, &slice_buffer); - grpc_endpoint_destroy(f.client_ep); - grpc_endpoint_destroy(f.server_ep); + grpc_endpoint_destroy(&exec_ctx, f.client_ep); + grpc_endpoint_destroy(&exec_ctx, f.server_ep); + grpc_exec_ctx_finish(&exec_ctx); } void grpc_endpoint_tests(grpc_endpoint_test_config config, diff --git a/test/core/iomgr/ev_epollsig_linux_test.cc b/test/core/iomgr/ev_epollsig_linux_test.cc index e767e01f219..94f387164a8 100644 --- a/test/core/iomgr/ev_epollsig_linux_test.cc +++ b/test/core/iomgr/ev_epollsig_linux_test.cc @@ -70,18 +70,19 @@ static void test_fd_init(test_fd* tfds, int* fds, int num_fds) { } } -static void test_fd_cleanup(test_fd* tfds, int num_fds) { +static void test_fd_cleanup(grpc_exec_ctx* exec_ctx, test_fd* tfds, + int num_fds) { int release_fd; int i; for (i = 0; i < num_fds; i++) { - grpc_fd_shutdown(tfds[i].fd, + grpc_fd_shutdown(exec_ctx, tfds[i].fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("test_fd_cleanup")); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(exec_ctx); - grpc_fd_orphan(tfds[i].fd, nullptr, &release_fd, false /* already_closed */, - "test_fd_cleanup"); - grpc_core::ExecCtx::Get()->Flush(); + grpc_fd_orphan(exec_ctx, tfds[i].fd, nullptr, &release_fd, + false /* already_closed */, "test_fd_cleanup"); + grpc_exec_ctx_flush(exec_ctx); GPR_ASSERT(release_fd == tfds[i].inner_fd); close(tfds[i].inner_fd); @@ -97,20 +98,22 @@ static void test_pollset_init(test_pollset* pollsets, int num_pollsets) { } } -static void destroy_pollset(void* p, grpc_error* error) { - grpc_pollset_destroy((grpc_pollset*)p); +static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, + grpc_error* error) { + grpc_pollset_destroy(exec_ctx, (grpc_pollset*)p); } -static void test_pollset_cleanup(test_pollset* pollsets, int num_pollsets) { +static void test_pollset_cleanup(grpc_exec_ctx* exec_ctx, + test_pollset* pollsets, int num_pollsets) { grpc_closure destroyed; int i; for (i = 0; i < num_pollsets; i++) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, pollsets[i].pollset, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(pollsets[i].pollset, &destroyed); + grpc_pollset_shutdown(exec_ctx, pollsets[i].pollset, &destroyed); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(exec_ctx); gpr_free(pollsets[i].pollset); } } @@ -130,7 +133,7 @@ static void test_pollset_cleanup(test_pollset* pollsets, int num_pollsets) { #define NUM_POLLSETS 4 static void test_add_fd_to_pollset() { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; test_fd tfds[NUM_FDS]; int fds[NUM_FDS]; test_pollset pollsets[NUM_POLLSETS]; @@ -167,33 +170,33 @@ static void test_add_fd_to_pollset() { /* == Step 1 == */ for (i = 0; i <= 2; i++) { - grpc_pollset_add_fd(pollsets[0].pollset, tfds[i].fd); - grpc_core::ExecCtx::Get()->Flush(); + grpc_pollset_add_fd(&exec_ctx, pollsets[0].pollset, tfds[i].fd); + grpc_exec_ctx_flush(&exec_ctx); } for (i = 3; i <= 4; i++) { - grpc_pollset_add_fd(pollsets[1].pollset, tfds[i].fd); - grpc_core::ExecCtx::Get()->Flush(); + grpc_pollset_add_fd(&exec_ctx, pollsets[1].pollset, tfds[i].fd); + grpc_exec_ctx_flush(&exec_ctx); } for (i = 5; i <= 7; i++) { - grpc_pollset_add_fd(pollsets[2].pollset, tfds[i].fd); - grpc_core::ExecCtx::Get()->Flush(); + grpc_pollset_add_fd(&exec_ctx, pollsets[2].pollset, tfds[i].fd); + grpc_exec_ctx_flush(&exec_ctx); } /* == Step 2 == */ for (i = 0; i <= 1; i++) { - grpc_pollset_add_fd(pollsets[3].pollset, tfds[i].fd); - grpc_core::ExecCtx::Get()->Flush(); + grpc_pollset_add_fd(&exec_ctx, pollsets[3].pollset, tfds[i].fd); + grpc_exec_ctx_flush(&exec_ctx); } /* == Step 3 == */ - grpc_pollset_add_fd(pollsets[1].pollset, tfds[0].fd); - grpc_core::ExecCtx::Get()->Flush(); + grpc_pollset_add_fd(&exec_ctx, pollsets[1].pollset, tfds[0].fd); + grpc_exec_ctx_flush(&exec_ctx); /* == Step 4 == */ - grpc_pollset_add_fd(pollsets[2].pollset, tfds[3].fd); - grpc_core::ExecCtx::Get()->Flush(); + grpc_pollset_add_fd(&exec_ctx, pollsets[2].pollset, tfds[3].fd); + grpc_exec_ctx_flush(&exec_ctx); /* All polling islands are merged at this point */ @@ -210,8 +213,9 @@ static void test_add_fd_to_pollset() { expected_pi, grpc_pollset_get_polling_island(pollsets[i].pollset))); } - test_fd_cleanup(tfds, NUM_FDS); - test_pollset_cleanup(pollsets, NUM_POLLSETS); + test_fd_cleanup(&exec_ctx, tfds, NUM_FDS); + test_pollset_cleanup(&exec_ctx, pollsets, NUM_POLLSETS); + grpc_exec_ctx_finish(&exec_ctx); } #undef NUM_FDS @@ -231,24 +235,26 @@ static __thread int thread_wakeups = 0; static void test_threading_loop(void* arg) { threading_shared* shared = static_cast(arg); while (thread_wakeups < 1000000) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_pollset_worker* worker; gpr_mu_lock(shared->mu); GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(shared->pollset, &worker, GRPC_MILLIS_INF_FUTURE))); + "pollset_work", grpc_pollset_work(&exec_ctx, shared->pollset, &worker, + GRPC_MILLIS_INF_FUTURE))); gpr_mu_unlock(shared->mu); + grpc_exec_ctx_finish(&exec_ctx); } } -static void test_threading_wakeup(void* arg, grpc_error* error) { +static void test_threading_wakeup(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { threading_shared* shared = static_cast(arg); ++shared->wakeups; ++thread_wakeups; if (error == GRPC_ERROR_NONE) { GPR_ASSERT(GRPC_LOG_IF_ERROR( "consume_wakeup", grpc_wakeup_fd_consume_wakeup(shared->wakeup_fd))); - grpc_fd_notify_on_read(shared->wakeup_desc, &shared->on_wakeup); + grpc_fd_notify_on_read(exec_ctx, shared->wakeup_desc, &shared->on_wakeup); GPR_ASSERT(GRPC_LOG_IF_ERROR("wakeup_next", grpc_wakeup_fd_wakeup(shared->wakeup_fd))); } @@ -271,12 +277,13 @@ static void test_threading(void) { shared.wakeup_desc = grpc_fd_create(fd.read_fd, "wakeup"); shared.wakeups = 0; { - grpc_core::ExecCtx exec_ctx; - grpc_pollset_add_fd(shared.pollset, shared.wakeup_desc); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_pollset_add_fd(&exec_ctx, shared.pollset, shared.wakeup_desc); grpc_fd_notify_on_read( - shared.wakeup_desc, + &exec_ctx, shared.wakeup_desc, GRPC_CLOSURE_INIT(&shared.on_wakeup, test_threading_wakeup, &shared, grpc_schedule_on_exec_ctx)); + grpc_exec_ctx_finish(&exec_ctx); } GPR_ASSERT(GRPC_LOG_IF_ERROR("wakeup_first", grpc_wakeup_fd_wakeup(shared.wakeup_fd))); @@ -286,13 +293,14 @@ static void test_threading(void) { fd.read_fd = 0; grpc_wakeup_fd_destroy(&fd); { - grpc_core::ExecCtx exec_ctx; - grpc_fd_shutdown(shared.wakeup_desc, GRPC_ERROR_CANCELLED); - grpc_fd_orphan(shared.wakeup_desc, nullptr, nullptr, + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_fd_shutdown(&exec_ctx, shared.wakeup_desc, GRPC_ERROR_CANCELLED); + grpc_fd_orphan(&exec_ctx, shared.wakeup_desc, nullptr, nullptr, false /* already_closed */, "done"); - grpc_pollset_shutdown(shared.pollset, + grpc_pollset_shutdown(&exec_ctx, shared.pollset, GRPC_CLOSURE_CREATE(destroy_pollset, shared.pollset, grpc_schedule_on_exec_ctx)); + grpc_exec_ctx_finish(&exec_ctx); } gpr_free(shared.pollset); } @@ -301,21 +309,20 @@ int main(int argc, char** argv) { const char* poll_strategy = nullptr; grpc_test_init(argc, argv); grpc_init(); - { - grpc_core::ExecCtx exec_ctx; - - poll_strategy = grpc_get_poll_strategy_name(); - if (poll_strategy != nullptr && strcmp(poll_strategy, "epollsig") == 0) { - test_add_fd_to_pollset(); - test_threading(); - } else { - gpr_log(GPR_INFO, - "Skipping the test. The test is only relevant for 'epollsig' " - "strategy. and the current strategy is: '%s'", - poll_strategy); - } + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + + poll_strategy = grpc_get_poll_strategy_name(); + if (poll_strategy != nullptr && strcmp(poll_strategy, "epollsig") == 0) { + test_add_fd_to_pollset(); + test_threading(); + } else { + gpr_log(GPR_INFO, + "Skipping the test. The test is only relevant for 'epollsig' " + "strategy. and the current strategy is: '%s'", + poll_strategy); } + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/fd_conservation_posix_test.cc b/test/core/iomgr/fd_conservation_posix_test.cc index aaa14010f8d..f46430c6116 100644 --- a/test/core/iomgr/fd_conservation_posix_test.cc +++ b/test/core/iomgr/fd_conservation_posix_test.cc @@ -31,27 +31,26 @@ int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); - { - grpc_core::ExecCtx exec_ctx; - - /* set max # of file descriptors to a low value, and - verify we can create and destroy many more than this number - of descriptors */ - rlim.rlim_cur = rlim.rlim_max = 10; - GPR_ASSERT(0 == setrlimit(RLIMIT_NOFILE, &rlim)); - grpc_resource_quota* resource_quota = - grpc_resource_quota_create("fd_conservation_posix_test"); - - for (i = 0; i < 100; i++) { - p = grpc_iomgr_create_endpoint_pair("test", NULL); - grpc_endpoint_destroy(p.client); - grpc_endpoint_destroy(p.server); - grpc_core::ExecCtx::Get()->Flush(); - } - - grpc_resource_quota_unref(resource_quota); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + + /* set max # of file descriptors to a low value, and + verify we can create and destroy many more than this number + of descriptors */ + rlim.rlim_cur = rlim.rlim_max = 10; + GPR_ASSERT(0 == setrlimit(RLIMIT_NOFILE, &rlim)); + grpc_resource_quota* resource_quota = + grpc_resource_quota_create("fd_conservation_posix_test"); + + for (i = 0; i < 100; i++) { + p = grpc_iomgr_create_endpoint_pair("test", nullptr); + grpc_endpoint_destroy(&exec_ctx, p.client); + grpc_endpoint_destroy(&exec_ctx, p.server); + grpc_exec_ctx_flush(&exec_ctx); } + grpc_resource_quota_unref(resource_quota); + + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/fd_posix_test.cc b/test/core/iomgr/fd_posix_test.cc index cf75517538a..a03d841ecd2 100644 --- a/test/core/iomgr/fd_posix_test.cc +++ b/test/core/iomgr/fd_posix_test.cc @@ -111,19 +111,20 @@ typedef struct { /* Called when an upload session can be safely shutdown. Close session FD and start to shutdown listen FD. */ -static void session_shutdown_cb(void* arg, /*session */ +static void session_shutdown_cb(grpc_exec_ctx* exec_ctx, void* arg, /*session */ bool success) { session* se = static_cast(arg); server* sv = se->sv; - grpc_fd_orphan(se->em_fd, nullptr, nullptr, false /* already_closed */, "a"); + grpc_fd_orphan(exec_ctx, se->em_fd, nullptr, nullptr, + false /* already_closed */, "a"); gpr_free(se); /* Start to shutdown listen fd. */ - grpc_fd_shutdown(sv->em_fd, + grpc_fd_shutdown(exec_ctx, sv->em_fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("session_shutdown_cb")); } /* Called when data become readable in a session. */ -static void session_read_cb(void* arg, /*session */ +static void session_read_cb(grpc_exec_ctx* exec_ctx, void* arg, /*session */ grpc_error* error) { session* se = static_cast(arg); int fd = grpc_fd_wrapped_fd(se->em_fd); @@ -132,7 +133,7 @@ static void session_read_cb(void* arg, /*session */ ssize_t read_total = 0; if (error != GRPC_ERROR_NONE) { - session_shutdown_cb(arg, 1); + session_shutdown_cb(exec_ctx, arg, 1); return; } @@ -147,7 +148,7 @@ static void session_read_cb(void* arg, /*session */ It is possible to read nothing due to spurious edge event or data has been drained, In such a case, read() returns -1 and set errno to EAGAIN. */ if (read_once == 0) { - session_shutdown_cb(arg, 1); + session_shutdown_cb(exec_ctx, arg, 1); } else if (read_once == -1) { if (errno == EAGAIN) { /* An edge triggered event is cached in the kernel until next poll. @@ -158,7 +159,7 @@ static void session_read_cb(void* arg, /*session */ TODO(chenw): in multi-threaded version, callback and polling can be run in different threads. polling may catch a persist read edge event before notify_on_read is called. */ - grpc_fd_notify_on_read(se->em_fd, &se->session_read_closure); + grpc_fd_notify_on_read(exec_ctx, se->em_fd, &se->session_read_closure); } else { gpr_log(GPR_ERROR, "Unhandled read error %s", strerror(errno)); abort(); @@ -168,20 +169,22 @@ static void session_read_cb(void* arg, /*session */ /* Called when the listen FD can be safely shutdown. Close listen FD and signal that server can be shutdown. */ -static void listen_shutdown_cb(void* arg /*server */, int success) { +static void listen_shutdown_cb(grpc_exec_ctx* exec_ctx, void* arg /*server */, + int success) { server* sv = static_cast(arg); - grpc_fd_orphan(sv->em_fd, nullptr, nullptr, false /* already_closed */, "b"); + grpc_fd_orphan(exec_ctx, sv->em_fd, nullptr, nullptr, + false /* already_closed */, "b"); gpr_mu_lock(g_mu); sv->done = 1; - GPR_ASSERT( - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); + GPR_ASSERT(GRPC_LOG_IF_ERROR( + "pollset_kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); gpr_mu_unlock(g_mu); } /* Called when a new TCP connection request arrives in the listening port. */ -static void listen_cb(void* arg, /*=sv_arg*/ +static void listen_cb(grpc_exec_ctx* exec_ctx, void* arg, /*=sv_arg*/ grpc_error* error) { server* sv = static_cast(arg); int fd; @@ -192,7 +195,7 @@ static void listen_cb(void* arg, /*=sv_arg*/ grpc_fd* listen_em_fd = sv->em_fd; if (error != GRPC_ERROR_NONE) { - listen_shutdown_cb(arg, 1); + listen_shutdown_cb(exec_ctx, arg, 1); return; } @@ -204,12 +207,12 @@ static void listen_cb(void* arg, /*=sv_arg*/ se = static_cast(gpr_malloc(sizeof(*se))); se->sv = sv; se->em_fd = grpc_fd_create(fd, "listener"); - grpc_pollset_add_fd(g_pollset, se->em_fd); + grpc_pollset_add_fd(exec_ctx, g_pollset, se->em_fd); GRPC_CLOSURE_INIT(&se->session_read_closure, session_read_cb, se, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(se->em_fd, &se->session_read_closure); + grpc_fd_notify_on_read(exec_ctx, se->em_fd, &se->session_read_closure); - grpc_fd_notify_on_read(listen_em_fd, &sv->listen_closure); + grpc_fd_notify_on_read(exec_ctx, listen_em_fd, &sv->listen_closure); } /* Max number of connections pending to be accepted by listen(). */ @@ -219,7 +222,7 @@ static void listen_cb(void* arg, /*=sv_arg*/ listen_cb() is registered to be interested in reading from listen_fd. When connection request arrives, listen_cb() is called to accept the connection request. */ -static int server_start(server* sv) { +static int server_start(grpc_exec_ctx* exec_ctx, server* sv) { int port = 0; int fd; struct sockaddr_in sin; @@ -233,11 +236,11 @@ static int server_start(server* sv) { GPR_ASSERT(listen(fd, MAX_NUM_FD) == 0); sv->em_fd = grpc_fd_create(fd, "server"); - grpc_pollset_add_fd(g_pollset, sv->em_fd); + grpc_pollset_add_fd(exec_ctx, g_pollset, sv->em_fd); /* Register to be interested in reading from listen_fd. */ GRPC_CLOSURE_INIT(&sv->listen_closure, listen_cb, sv, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(sv->em_fd, &sv->listen_closure); + grpc_fd_notify_on_read(exec_ctx, sv->em_fd, &sv->listen_closure); return port; } @@ -246,13 +249,13 @@ static int server_start(server* sv) { static void server_wait_and_shutdown(server* sv) { gpr_mu_lock(g_mu); while (!sv->done) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE))); + "pollset_work", grpc_pollset_work(&exec_ctx, g_pollset, &worker, + GRPC_MILLIS_INF_FUTURE))); gpr_mu_unlock(g_mu); - + grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -286,16 +289,18 @@ static void client_init(client* cl) { } /* Called when a client upload session is ready to shutdown. */ -static void client_session_shutdown_cb(void* arg /*client */, int success) { +static void client_session_shutdown_cb(grpc_exec_ctx* exec_ctx, + void* arg /*client */, int success) { client* cl = static_cast(arg); - grpc_fd_orphan(cl->em_fd, nullptr, nullptr, false /* already_closed */, "c"); + grpc_fd_orphan(exec_ctx, cl->em_fd, nullptr, nullptr, + false /* already_closed */, "c"); cl->done = 1; - GPR_ASSERT( - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); + GPR_ASSERT(GRPC_LOG_IF_ERROR( + "pollset_kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); } /* Write as much as possible, then register notify_on_write. */ -static void client_session_write(void* arg, /*client */ +static void client_session_write(grpc_exec_ctx* exec_ctx, void* arg, /*client */ grpc_error* error) { client* cl = static_cast(arg); int fd = grpc_fd_wrapped_fd(cl->em_fd); @@ -303,7 +308,7 @@ static void client_session_write(void* arg, /*client */ if (error != GRPC_ERROR_NONE) { gpr_mu_lock(g_mu); - client_session_shutdown_cb(arg, 1); + client_session_shutdown_cb(exec_ctx, arg, 1); gpr_mu_unlock(g_mu); return; } @@ -318,10 +323,10 @@ static void client_session_write(void* arg, /*client */ if (cl->client_write_cnt < CLIENT_TOTAL_WRITE_CNT) { GRPC_CLOSURE_INIT(&cl->write_closure, client_session_write, cl, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_write(cl->em_fd, &cl->write_closure); + grpc_fd_notify_on_write(exec_ctx, cl->em_fd, &cl->write_closure); cl->client_write_cnt++; } else { - client_session_shutdown_cb(arg, 1); + client_session_shutdown_cb(exec_ctx, arg, 1); } gpr_mu_unlock(g_mu); } else { @@ -331,7 +336,7 @@ static void client_session_write(void* arg, /*client */ } /* Start a client to send a stream of bytes. */ -static void client_start(client* cl, int port) { +static void client_start(grpc_exec_ctx* exec_ctx, client* cl, int port) { int fd; struct sockaddr_in sin; create_test_socket(port, &fd, &sin); @@ -352,9 +357,9 @@ static void client_start(client* cl, int port) { } cl->em_fd = grpc_fd_create(fd, "client"); - grpc_pollset_add_fd(g_pollset, cl->em_fd); + grpc_pollset_add_fd(exec_ctx, g_pollset, cl->em_fd); - client_session_write(cl, GRPC_ERROR_NONE); + client_session_write(exec_ctx, cl, GRPC_ERROR_NONE); } /* Wait for the signal to shutdown a client. */ @@ -362,12 +367,12 @@ static void client_wait_and_shutdown(client* cl) { gpr_mu_lock(g_mu); while (!cl->done) { grpc_pollset_worker* worker = nullptr; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE))); + "pollset_work", grpc_pollset_work(&exec_ctx, g_pollset, &worker, + GRPC_MILLIS_INF_FUTURE))); gpr_mu_unlock(g_mu); - + grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -380,13 +385,13 @@ static void test_grpc_fd(void) { server sv; client cl; int port; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; server_init(&sv); - port = server_start(&sv); + port = server_start(&exec_ctx, &sv); client_init(&cl); - client_start(&cl, port); - + client_start(&exec_ctx, &cl, port); + grpc_exec_ctx_finish(&exec_ctx); client_wait_and_shutdown(&cl); server_wait_and_shutdown(&sv); GPR_ASSERT(sv.read_bytes_total == cl.write_bytes_total); @@ -401,25 +406,27 @@ void init_change_data(fd_change_data* fdc) { fdc->cb_that_ran = nullptr; } void destroy_change_data(fd_change_data* fdc) {} -static void first_read_callback(void* arg /* fd_change_data */, +static void first_read_callback(grpc_exec_ctx* exec_ctx, + void* arg /* fd_change_data */, grpc_error* error) { fd_change_data* fdc = static_cast(arg); gpr_mu_lock(g_mu); fdc->cb_that_ran = first_read_callback; - GPR_ASSERT( - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); + GPR_ASSERT(GRPC_LOG_IF_ERROR( + "pollset_kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); gpr_mu_unlock(g_mu); } -static void second_read_callback(void* arg /* fd_change_data */, +static void second_read_callback(grpc_exec_ctx* exec_ctx, + void* arg /* fd_change_data */, grpc_error* error) { fd_change_data* fdc = static_cast(arg); gpr_mu_lock(g_mu); fdc->cb_that_ran = second_read_callback; - GPR_ASSERT( - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); + GPR_ASSERT(GRPC_LOG_IF_ERROR( + "pollset_kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); gpr_mu_unlock(g_mu); } @@ -436,7 +443,7 @@ static void test_grpc_fd_change(void) { ssize_t result; grpc_closure first_closure; grpc_closure second_closure; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GRPC_CLOSURE_INIT(&first_closure, first_read_callback, &a, grpc_schedule_on_exec_ctx); @@ -453,10 +460,10 @@ static void test_grpc_fd_change(void) { GPR_ASSERT(fcntl(sv[1], F_SETFL, flags | O_NONBLOCK) == 0); em_fd = grpc_fd_create(sv[0], "test_grpc_fd_change"); - grpc_pollset_add_fd(g_pollset, em_fd); + grpc_pollset_add_fd(&exec_ctx, g_pollset, em_fd); /* Register the first callback, then make its FD readable */ - grpc_fd_notify_on_read(em_fd, &first_closure); + grpc_fd_notify_on_read(&exec_ctx, em_fd, &first_closure); data = 0; result = write(sv[1], &data, 1); GPR_ASSERT(result == 1); @@ -466,10 +473,10 @@ static void test_grpc_fd_change(void) { while (a.cb_that_ran == nullptr) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE))); + "pollset_work", grpc_pollset_work(&exec_ctx, g_pollset, &worker, + GRPC_MILLIS_INF_FUTURE))); gpr_mu_unlock(g_mu); - + grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(g_mu); } GPR_ASSERT(a.cb_that_ran == first_read_callback); @@ -481,7 +488,7 @@ static void test_grpc_fd_change(void) { /* Now register a second callback with distinct change data, and do the same thing again. */ - grpc_fd_notify_on_read(em_fd, &second_closure); + grpc_fd_notify_on_read(&exec_ctx, em_fd, &second_closure); data = 0; result = write(sv[1], &data, 1); GPR_ASSERT(result == 1); @@ -490,43 +497,44 @@ static void test_grpc_fd_change(void) { while (b.cb_that_ran == nullptr) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE))); + "pollset_work", grpc_pollset_work(&exec_ctx, g_pollset, &worker, + GRPC_MILLIS_INF_FUTURE))); gpr_mu_unlock(g_mu); - + grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(g_mu); } /* Except now we verify that second_read_callback ran instead */ GPR_ASSERT(b.cb_that_ran == second_read_callback); gpr_mu_unlock(g_mu); - grpc_fd_orphan(em_fd, nullptr, nullptr, false /* already_closed */, "d"); - + grpc_fd_orphan(&exec_ctx, em_fd, nullptr, nullptr, false /* already_closed */, + "d"); + grpc_exec_ctx_finish(&exec_ctx); destroy_change_data(&a); destroy_change_data(&b); close(sv[1]); } -static void destroy_pollset(void* p, grpc_error* error) { - grpc_pollset_destroy(static_cast(p)); +static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, + grpc_error* error) { + grpc_pollset_destroy(exec_ctx, static_cast(p)); } int main(int argc, char** argv) { grpc_closure destroyed; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); - { - grpc_core::ExecCtx exec_ctx; - g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); - grpc_pollset_init(g_pollset, &g_mu); - test_grpc_fd(); - test_grpc_fd_change(); - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(g_pollset, &destroyed); - grpc_core::ExecCtx::Get()->Flush(); - gpr_free(g_pollset); - } + g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); + grpc_pollset_init(g_pollset, &g_mu); + test_grpc_fd(); + test_grpc_fd_change(); + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); + grpc_exec_ctx_flush(&exec_ctx); + gpr_free(g_pollset); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/load_file_test.cc b/test/core/iomgr/load_file_test.cc index 797d0ef1a4d..9f360badcc3 100644 --- a/test/core/iomgr/load_file_test.cc +++ b/test/core/iomgr/load_file_test.cc @@ -19,7 +19,6 @@ #include #include -#include #include #include #include @@ -153,11 +152,9 @@ static void test_load_big_file(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); test_load_empty_file(); test_load_failure(); test_load_small_file(); test_load_big_file(); - grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/pollset_set_test.cc b/test/core/iomgr/pollset_set_test.cc index f27079134b8..719eab91fef 100644 --- a/test/core/iomgr/pollset_set_test.cc +++ b/test/core/iomgr/pollset_set_test.cc @@ -47,10 +47,11 @@ void init_test_pollset_sets(test_pollset_set* pollset_sets, const int num_pss) { } } -void cleanup_test_pollset_sets(test_pollset_set* pollset_sets, +void cleanup_test_pollset_sets(grpc_exec_ctx* exec_ctx, + test_pollset_set* pollset_sets, const int num_pss) { for (int i = 0; i < num_pss; i++) { - grpc_pollset_set_destroy(pollset_sets[i].pss); + grpc_pollset_set_destroy(exec_ctx, pollset_sets[i].pss); pollset_sets[i].pss = nullptr; } } @@ -72,19 +73,21 @@ static void init_test_pollsets(test_pollset* pollsets, const int num_pollsets) { } } -static void destroy_pollset(void* p, grpc_error* error) { - grpc_pollset_destroy(static_cast(p)); +static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, + grpc_error* error) { + grpc_pollset_destroy(exec_ctx, static_cast(p)); } -static void cleanup_test_pollsets(test_pollset* pollsets, +static void cleanup_test_pollsets(grpc_exec_ctx* exec_ctx, + test_pollset* pollsets, const int num_pollsets) { grpc_closure destroyed; for (int i = 0; i < num_pollsets; i++) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, pollsets[i].ps, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(pollsets[i].ps, &destroyed); + grpc_pollset_shutdown(exec_ctx, pollsets[i].ps, &destroyed); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(exec_ctx); gpr_free(pollsets[i].ps); pollsets[i].ps = nullptr; } @@ -102,43 +105,45 @@ typedef struct test_fd { grpc_closure on_readable; /* Closure to call when this fd is readable */ } test_fd; -void on_readable(void* tfd, grpc_error* error) { +void on_readable(grpc_exec_ctx* exec_ctx, void* tfd, grpc_error* error) { ((test_fd*)tfd)->is_on_readable_called = true; } -static void reset_test_fd(test_fd* tfd) { +static void reset_test_fd(grpc_exec_ctx* exec_ctx, test_fd* tfd) { tfd->is_on_readable_called = false; GRPC_CLOSURE_INIT(&tfd->on_readable, on_readable, tfd, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(tfd->fd, &tfd->on_readable); + grpc_fd_notify_on_read(exec_ctx, tfd->fd, &tfd->on_readable); } -static void init_test_fds(test_fd* tfds, const int num_fds) { +static void init_test_fds(grpc_exec_ctx* exec_ctx, test_fd* tfds, + const int num_fds) { for (int i = 0; i < num_fds; i++) { GPR_ASSERT(GRPC_ERROR_NONE == grpc_wakeup_fd_init(&tfds[i].wakeup_fd)); tfds[i].fd = grpc_fd_create(GRPC_WAKEUP_FD_GET_READ_FD(&tfds[i].wakeup_fd), "test_fd"); - reset_test_fd(&tfds[i]); + reset_test_fd(exec_ctx, &tfds[i]); } } -static void cleanup_test_fds(test_fd* tfds, const int num_fds) { +static void cleanup_test_fds(grpc_exec_ctx* exec_ctx, test_fd* tfds, + const int num_fds) { int release_fd; for (int i = 0; i < num_fds; i++) { - grpc_fd_shutdown(tfds[i].fd, + grpc_fd_shutdown(exec_ctx, tfds[i].fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("fd cleanup")); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(exec_ctx); /* grpc_fd_orphan frees the memory allocated for grpc_fd. Normally it also * calls close() on the underlying fd. In our case, we are using * grpc_wakeup_fd and we would like to destroy it ourselves (by calling * grpc_wakeup_fd_destroy). To prevent grpc_fd from calling close() on the * underlying fd, call it with a non-NULL 'release_fd' parameter */ - grpc_fd_orphan(tfds[i].fd, nullptr, &release_fd, false /* already_closed */, - "test_fd_cleanup"); - grpc_core::ExecCtx::Get()->Flush(); + grpc_fd_orphan(exec_ctx, tfds[i].fd, nullptr, &release_fd, + false /* already_closed */, "test_fd_cleanup"); + grpc_exec_ctx_flush(exec_ctx); grpc_wakeup_fd_destroy(&tfds[i].wakeup_fd); } @@ -150,7 +155,8 @@ static void make_test_fds_readable(test_fd* tfds, const int num_fds) { } } -static void verify_readable_and_reset(test_fd* tfds, const int num_fds) { +static void verify_readable_and_reset(grpc_exec_ctx* exec_ctx, test_fd* tfds, + const int num_fds) { for (int i = 0; i < num_fds; i++) { /* Verify that the on_readable callback was called */ GPR_ASSERT(tfds[i].is_on_readable_called); @@ -158,7 +164,7 @@ static void verify_readable_and_reset(test_fd* tfds, const int num_fds) { /* Reset the tfd[i] structure */ GPR_ASSERT(GRPC_ERROR_NONE == grpc_wakeup_fd_consume_wakeup(&tfds[i].wakeup_fd)); - reset_test_fd(&tfds[i]); + reset_test_fd(exec_ctx, &tfds[i]); } } @@ -199,7 +205,7 @@ static void pollset_set_test_basic() { * | * +---> FD9 (Added after PS2 is added to PSS0) */ - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_pollset_worker* worker; grpc_millis deadline; @@ -210,33 +216,34 @@ static void pollset_set_test_basic() { const int num_ps = GPR_ARRAY_SIZE(pollsets); const int num_pss = GPR_ARRAY_SIZE(pollset_sets); - init_test_fds(tfds, num_fds); + init_test_fds(&exec_ctx, tfds, num_fds); init_test_pollsets(pollsets, num_ps); init_test_pollset_sets(pollset_sets, num_pss); /* Construct the pollset_set/pollset/fd tree (see diagram above) */ - grpc_pollset_set_add_fd(pollset_sets[0].pss, tfds[0].fd); - grpc_pollset_set_add_fd(pollset_sets[1].pss, tfds[1].fd); + grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[0].pss, tfds[0].fd); + grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[1].pss, tfds[1].fd); - grpc_pollset_add_fd(pollsets[0].ps, tfds[2].fd); - grpc_pollset_add_fd(pollsets[1].ps, tfds[3].fd); - grpc_pollset_add_fd(pollsets[2].ps, tfds[4].fd); + grpc_pollset_add_fd(&exec_ctx, pollsets[0].ps, tfds[2].fd); + grpc_pollset_add_fd(&exec_ctx, pollsets[1].ps, tfds[3].fd); + grpc_pollset_add_fd(&exec_ctx, pollsets[2].ps, tfds[4].fd); - grpc_pollset_set_add_pollset_set(pollset_sets[0].pss, pollset_sets[1].pss); + grpc_pollset_set_add_pollset_set(&exec_ctx, pollset_sets[0].pss, + pollset_sets[1].pss); - grpc_pollset_set_add_pollset(pollset_sets[1].pss, pollsets[0].ps); - grpc_pollset_set_add_pollset(pollset_sets[0].pss, pollsets[1].ps); - grpc_pollset_set_add_pollset(pollset_sets[0].pss, pollsets[2].ps); + grpc_pollset_set_add_pollset(&exec_ctx, pollset_sets[1].pss, pollsets[0].ps); + grpc_pollset_set_add_pollset(&exec_ctx, pollset_sets[0].pss, pollsets[1].ps); + grpc_pollset_set_add_pollset(&exec_ctx, pollset_sets[0].pss, pollsets[2].ps); - grpc_pollset_set_add_fd(pollset_sets[0].pss, tfds[5].fd); - grpc_pollset_set_add_fd(pollset_sets[1].pss, tfds[6].fd); + grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[0].pss, tfds[5].fd); + grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[1].pss, tfds[6].fd); - grpc_pollset_add_fd(pollsets[0].ps, tfds[7].fd); - grpc_pollset_add_fd(pollsets[1].ps, tfds[8].fd); - grpc_pollset_add_fd(pollsets[2].ps, tfds[9].fd); + grpc_pollset_add_fd(&exec_ctx, pollsets[0].ps, tfds[7].fd); + grpc_pollset_add_fd(&exec_ctx, pollsets[1].ps, tfds[8].fd); + grpc_pollset_add_fd(&exec_ctx, pollsets[2].ps, tfds[9].fd); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); /* Test that if any FD in the above structure is readable, it is observable by * doing grpc_pollset_work on any pollset @@ -256,32 +263,34 @@ static void pollset_set_test_basic() { deadline = grpc_timespec_to_millis_round_up( grpc_timeout_milliseconds_to_deadline(2)); GPR_ASSERT(GRPC_ERROR_NONE == - grpc_pollset_work(pollsets[i].ps, &worker, deadline)); + grpc_pollset_work(&exec_ctx, pollsets[i].ps, &worker, deadline)); gpr_mu_unlock(pollsets[i].mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); - verify_readable_and_reset(tfds, num_fds); - grpc_core::ExecCtx::Get()->Flush(); + verify_readable_and_reset(&exec_ctx, tfds, num_fds); + grpc_exec_ctx_flush(&exec_ctx); } /* Test tear down */ - grpc_pollset_set_del_fd(pollset_sets[0].pss, tfds[0].fd); - grpc_pollset_set_del_fd(pollset_sets[0].pss, tfds[5].fd); - grpc_pollset_set_del_fd(pollset_sets[1].pss, tfds[1].fd); - grpc_pollset_set_del_fd(pollset_sets[1].pss, tfds[6].fd); - grpc_core::ExecCtx::Get()->Flush(); - - grpc_pollset_set_del_pollset(pollset_sets[1].pss, pollsets[0].ps); - grpc_pollset_set_del_pollset(pollset_sets[0].pss, pollsets[1].ps); - grpc_pollset_set_del_pollset(pollset_sets[0].pss, pollsets[2].ps); - - grpc_pollset_set_del_pollset_set(pollset_sets[0].pss, pollset_sets[1].pss); - grpc_core::ExecCtx::Get()->Flush(); - - cleanup_test_fds(tfds, num_fds); - cleanup_test_pollsets(pollsets, num_ps); - cleanup_test_pollset_sets(pollset_sets, num_pss); + grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[0].pss, tfds[0].fd); + grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[0].pss, tfds[5].fd); + grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[1].pss, tfds[1].fd); + grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[1].pss, tfds[6].fd); + grpc_exec_ctx_flush(&exec_ctx); + + grpc_pollset_set_del_pollset(&exec_ctx, pollset_sets[1].pss, pollsets[0].ps); + grpc_pollset_set_del_pollset(&exec_ctx, pollset_sets[0].pss, pollsets[1].ps); + grpc_pollset_set_del_pollset(&exec_ctx, pollset_sets[0].pss, pollsets[2].ps); + + grpc_pollset_set_del_pollset_set(&exec_ctx, pollset_sets[0].pss, + pollset_sets[1].pss); + grpc_exec_ctx_flush(&exec_ctx); + + cleanup_test_fds(&exec_ctx, tfds, num_fds); + cleanup_test_pollsets(&exec_ctx, pollsets, num_ps); + cleanup_test_pollset_sets(&exec_ctx, pollset_sets, num_pss); + grpc_exec_ctx_finish(&exec_ctx); } /* Same FD added multiple times to the pollset_set tree */ @@ -301,7 +310,7 @@ void pollset_set_test_dup_fds() { * | +--> FD2 * +---> FD1 */ - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_pollset_worker* worker; grpc_millis deadline; @@ -312,20 +321,21 @@ void pollset_set_test_dup_fds() { const int num_ps = 1; const int num_pss = GPR_ARRAY_SIZE(pollset_sets); - init_test_fds(tfds, num_fds); + init_test_fds(&exec_ctx, tfds, num_fds); init_test_pollsets(&pollset, num_ps); init_test_pollset_sets(pollset_sets, num_pss); /* Construct the structure */ - grpc_pollset_set_add_fd(pollset_sets[0].pss, tfds[0].fd); - grpc_pollset_set_add_fd(pollset_sets[1].pss, tfds[0].fd); - grpc_pollset_set_add_fd(pollset_sets[1].pss, tfds[1].fd); + grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[0].pss, tfds[0].fd); + grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[1].pss, tfds[0].fd); + grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[1].pss, tfds[1].fd); - grpc_pollset_add_fd(pollset.ps, tfds[1].fd); - grpc_pollset_add_fd(pollset.ps, tfds[2].fd); + grpc_pollset_add_fd(&exec_ctx, pollset.ps, tfds[1].fd); + grpc_pollset_add_fd(&exec_ctx, pollset.ps, tfds[2].fd); - grpc_pollset_set_add_pollset(pollset_sets[1].pss, pollset.ps); - grpc_pollset_set_add_pollset_set(pollset_sets[0].pss, pollset_sets[1].pss); + grpc_pollset_set_add_pollset(&exec_ctx, pollset_sets[1].pss, pollset.ps); + grpc_pollset_set_add_pollset_set(&exec_ctx, pollset_sets[0].pss, + pollset_sets[1].pss); /* Test. Make all FDs readable and make sure that can be observed by doing a * grpc_pollset_work on the pollset 'PS' */ @@ -335,25 +345,27 @@ void pollset_set_test_dup_fds() { deadline = grpc_timespec_to_millis_round_up( grpc_timeout_milliseconds_to_deadline(2)); GPR_ASSERT(GRPC_ERROR_NONE == - grpc_pollset_work(pollset.ps, &worker, deadline)); + grpc_pollset_work(&exec_ctx, pollset.ps, &worker, deadline)); gpr_mu_unlock(pollset.mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); - verify_readable_and_reset(tfds, num_fds); - grpc_core::ExecCtx::Get()->Flush(); + verify_readable_and_reset(&exec_ctx, tfds, num_fds); + grpc_exec_ctx_flush(&exec_ctx); /* Tear down */ - grpc_pollset_set_del_fd(pollset_sets[0].pss, tfds[0].fd); - grpc_pollset_set_del_fd(pollset_sets[1].pss, tfds[0].fd); - grpc_pollset_set_del_fd(pollset_sets[1].pss, tfds[1].fd); - - grpc_pollset_set_del_pollset(pollset_sets[1].pss, pollset.ps); - grpc_pollset_set_del_pollset_set(pollset_sets[0].pss, pollset_sets[1].pss); - grpc_core::ExecCtx::Get()->Flush(); - - cleanup_test_fds(tfds, num_fds); - cleanup_test_pollsets(&pollset, num_ps); - cleanup_test_pollset_sets(pollset_sets, num_pss); + grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[0].pss, tfds[0].fd); + grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[1].pss, tfds[0].fd); + grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[1].pss, tfds[1].fd); + + grpc_pollset_set_del_pollset(&exec_ctx, pollset_sets[1].pss, pollset.ps); + grpc_pollset_set_del_pollset_set(&exec_ctx, pollset_sets[0].pss, + pollset_sets[1].pss); + grpc_exec_ctx_flush(&exec_ctx); + + cleanup_test_fds(&exec_ctx, tfds, num_fds); + cleanup_test_pollsets(&exec_ctx, &pollset, num_ps); + cleanup_test_pollset_sets(&exec_ctx, pollset_sets, num_pss); + grpc_exec_ctx_finish(&exec_ctx); } /* Pollset_set with an empty pollset */ @@ -371,7 +383,7 @@ void pollset_set_test_empty_pollset() { * | * +---> FD2 */ - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_pollset_worker* worker; grpc_millis deadline; @@ -382,17 +394,17 @@ void pollset_set_test_empty_pollset() { const int num_ps = GPR_ARRAY_SIZE(pollsets); const int num_pss = 1; - init_test_fds(tfds, num_fds); + init_test_fds(&exec_ctx, tfds, num_fds); init_test_pollsets(pollsets, num_ps); init_test_pollset_sets(&pollset_set, num_pss); /* Construct the structure */ - grpc_pollset_set_add_fd(pollset_set.pss, tfds[0].fd); - grpc_pollset_add_fd(pollsets[1].ps, tfds[1].fd); - grpc_pollset_add_fd(pollsets[1].ps, tfds[2].fd); + grpc_pollset_set_add_fd(&exec_ctx, pollset_set.pss, tfds[0].fd); + grpc_pollset_add_fd(&exec_ctx, pollsets[1].ps, tfds[1].fd); + grpc_pollset_add_fd(&exec_ctx, pollsets[1].ps, tfds[2].fd); - grpc_pollset_set_add_pollset(pollset_set.pss, pollsets[0].ps); - grpc_pollset_set_add_pollset(pollset_set.pss, pollsets[1].ps); + grpc_pollset_set_add_pollset(&exec_ctx, pollset_set.pss, pollsets[0].ps); + grpc_pollset_set_add_pollset(&exec_ctx, pollset_set.pss, pollsets[1].ps); /* Test. Make all FDs readable and make sure that can be observed by doing * grpc_pollset_work on the empty pollset 'PS0' */ @@ -402,44 +414,45 @@ void pollset_set_test_empty_pollset() { deadline = grpc_timespec_to_millis_round_up( grpc_timeout_milliseconds_to_deadline(2)); GPR_ASSERT(GRPC_ERROR_NONE == - grpc_pollset_work(pollsets[0].ps, &worker, deadline)); + grpc_pollset_work(&exec_ctx, pollsets[0].ps, &worker, deadline)); gpr_mu_unlock(pollsets[0].mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); - verify_readable_and_reset(tfds, num_fds); - grpc_core::ExecCtx::Get()->Flush(); + verify_readable_and_reset(&exec_ctx, tfds, num_fds); + grpc_exec_ctx_flush(&exec_ctx); /* Tear down */ - grpc_pollset_set_del_fd(pollset_set.pss, tfds[0].fd); - grpc_pollset_set_del_pollset(pollset_set.pss, pollsets[0].ps); - grpc_pollset_set_del_pollset(pollset_set.pss, pollsets[1].ps); - grpc_core::ExecCtx::Get()->Flush(); - - cleanup_test_fds(tfds, num_fds); - cleanup_test_pollsets(pollsets, num_ps); - cleanup_test_pollset_sets(&pollset_set, num_pss); + grpc_pollset_set_del_fd(&exec_ctx, pollset_set.pss, tfds[0].fd); + grpc_pollset_set_del_pollset(&exec_ctx, pollset_set.pss, pollsets[0].ps); + grpc_pollset_set_del_pollset(&exec_ctx, pollset_set.pss, pollsets[1].ps); + grpc_exec_ctx_flush(&exec_ctx); + + cleanup_test_fds(&exec_ctx, tfds, num_fds); + cleanup_test_pollsets(&exec_ctx, pollsets, num_ps); + cleanup_test_pollset_sets(&exec_ctx, &pollset_set, num_pss); + grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); - { - grpc_core::ExecCtx exec_ctx; - const char* poll_strategy = grpc_get_poll_strategy_name(); - - if (poll_strategy != nullptr && - (strcmp(poll_strategy, "epollsig") == 0 || - strcmp(poll_strategy, "epoll-threadpool") == 0)) { - pollset_set_test_basic(); - pollset_set_test_dup_fds(); - pollset_set_test_empty_pollset(); - } else { - gpr_log(GPR_INFO, - "Skipping the test. The test is only relevant for 'epoll' " - "strategy. and the current strategy is: '%s'", - poll_strategy); - } + const char* poll_strategy = grpc_get_poll_strategy_name(); + + if (poll_strategy != nullptr && + (strcmp(poll_strategy, "epollsig") == 0 || + strcmp(poll_strategy, "epoll-threadpool") == 0)) { + pollset_set_test_basic(); + pollset_set_test_dup_fds(); + pollset_set_test_empty_pollset(); + } else { + gpr_log(GPR_INFO, + "Skipping the test. The test is only relevant for 'epoll' " + "strategy. and the current strategy is: '%s'", + poll_strategy); } + + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index e36315333c8..836de423bd8 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -46,29 +46,29 @@ typedef struct args_struct { grpc_pollset_set* pollset_set; } args_struct; -static void do_nothing(void* arg, grpc_error* error) {} +static void do_nothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} -void args_init(args_struct* args) { +void args_init(grpc_exec_ctx* exec_ctx, args_struct* args) { gpr_event_init(&args->ev); args->pollset = static_cast(gpr_zalloc(grpc_pollset_size())); grpc_pollset_init(args->pollset, &args->mu); args->pollset_set = grpc_pollset_set_create(); - grpc_pollset_set_add_pollset(args->pollset_set, args->pollset); + grpc_pollset_set_add_pollset(exec_ctx, args->pollset_set, args->pollset); args->addrs = nullptr; } -void args_finish(args_struct* args) { +void args_finish(grpc_exec_ctx* exec_ctx, args_struct* args) { GPR_ASSERT(gpr_event_wait(&args->ev, test_deadline())); grpc_resolved_addresses_destroy(args->addrs); - grpc_pollset_set_del_pollset(args->pollset_set, args->pollset); - grpc_pollset_set_destroy(args->pollset_set); + grpc_pollset_set_del_pollset(exec_ctx, args->pollset_set, args->pollset); + grpc_pollset_set_destroy(exec_ctx, args->pollset_set); grpc_closure do_nothing_cb; GRPC_CLOSURE_INIT(&do_nothing_cb, do_nothing, nullptr, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(args->pollset, &do_nothing_cb); + grpc_pollset_shutdown(exec_ctx, args->pollset, &do_nothing_cb); // exec_ctx needs to be flushed before calling grpc_pollset_destroy() - grpc_core::ExecCtx::Get()->Flush(); - grpc_pollset_destroy(args->pollset); + grpc_exec_ctx_flush(exec_ctx); + grpc_pollset_destroy(exec_ctx, args->pollset); gpr_free(args->pollset); } @@ -79,24 +79,26 @@ static grpc_millis n_sec_deadline(int seconds) { static void actually_poll(void* argsp) { args_struct* args = static_cast(argsp); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_millis deadline = n_sec_deadline(10); while (true) { - grpc_core::ExecCtx exec_ctx; bool done = gpr_atm_acq_load(&args->done_atm) != 0; if (done) { break; } - grpc_millis time_left = deadline - grpc_core::ExecCtx::Get()->Now(); + grpc_millis time_left = deadline - grpc_exec_ctx_now(&exec_ctx); gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRIdPTR, done, time_left); GPR_ASSERT(time_left >= 0); grpc_pollset_worker* worker = nullptr; gpr_mu_lock(args->mu); - GRPC_LOG_IF_ERROR("pollset_work", grpc_pollset_work(args->pollset, &worker, - n_sec_deadline(1))); + GRPC_LOG_IF_ERROR("pollset_work", + grpc_pollset_work(&exec_ctx, args->pollset, &worker, + n_sec_deadline(1))); gpr_mu_unlock(args->mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); } gpr_event_set(&args->ev, (void*)1); + grpc_exec_ctx_finish(&exec_ctx); } static void poll_pollset_until_request_done(args_struct* args) { @@ -105,7 +107,8 @@ static void poll_pollset_until_request_done(args_struct* args) { gpr_thd_new(&id, "grpc_poll_pollset", actually_poll, args, nullptr); } -static void must_succeed(void* argsp, grpc_error* err) { +static void must_succeed(grpc_exec_ctx* exec_ctx, void* argsp, + grpc_error* err) { args_struct* args = static_cast(argsp); GPR_ASSERT(err == GRPC_ERROR_NONE); GPR_ASSERT(args->addrs != nullptr); @@ -113,28 +116,29 @@ static void must_succeed(void* argsp, grpc_error* err) { gpr_atm_rel_store(&args->done_atm, 1); } -static void must_fail(void* argsp, grpc_error* err) { +static void must_fail(grpc_exec_ctx* exec_ctx, void* argsp, grpc_error* err) { args_struct* args = static_cast(argsp); GPR_ASSERT(err != GRPC_ERROR_NONE); gpr_atm_rel_store(&args->done_atm, 1); } static void test_unix_socket(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; args_struct args; - args_init(&args); + args_init(&exec_ctx, &args); poll_pollset_until_request_done(&args); grpc_resolve_address( - "unix:/path/name", nullptr, args.pollset_set, + &exec_ctx, "unix:/path/name", nullptr, args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - args_finish(&args); + args_finish(&exec_ctx, &args); + grpc_exec_ctx_finish(&exec_ctx); } static void test_unix_socket_path_name_too_long(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; args_struct args; - args_init(&args); + args_init(&exec_ctx, &args); const char prefix[] = "unix:/path/name"; size_t path_name_length = GPR_ARRAY_SIZE(((struct sockaddr_un*)nullptr)->sun_path) + 6; @@ -146,23 +150,22 @@ static void test_unix_socket_path_name_too_long(void) { poll_pollset_until_request_done(&args); grpc_resolve_address( - path_name, nullptr, args.pollset_set, + &exec_ctx, path_name, nullptr, args.pollset_set, GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx), &args.addrs); gpr_free(path_name); - args_finish(&args); + args_finish(&exec_ctx, &args); + grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); - - { - grpc_core::ExecCtx exec_ctx; - test_unix_socket(); - test_unix_socket_path_name_too_long(); - } - + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + test_unix_socket(); + test_unix_socket_path_name_too_long(); + grpc_executor_shutdown(&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc index a0dc484f3e4..1c5aa38a95d 100644 --- a/test/core/iomgr/resolve_address_test.cc +++ b/test/core/iomgr/resolve_address_test.cc @@ -39,32 +39,32 @@ typedef struct args_struct { grpc_pollset_set* pollset_set; } args_struct; -static void do_nothing(void* arg, grpc_error* error) {} +static void do_nothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} -void args_init(args_struct* args) { +void args_init(grpc_exec_ctx* exec_ctx, args_struct* args) { gpr_event_init(&args->ev); args->pollset = static_cast(gpr_zalloc(grpc_pollset_size())); grpc_pollset_init(args->pollset, &args->mu); args->pollset_set = grpc_pollset_set_create(); - grpc_pollset_set_add_pollset(args->pollset_set, args->pollset); + grpc_pollset_set_add_pollset(exec_ctx, args->pollset_set, args->pollset); args->addrs = nullptr; gpr_atm_rel_store(&args->done_atm, 0); } -void args_finish(args_struct* args) { +void args_finish(grpc_exec_ctx* exec_ctx, args_struct* args) { GPR_ASSERT(gpr_event_wait(&args->ev, test_deadline())); grpc_resolved_addresses_destroy(args->addrs); - grpc_pollset_set_del_pollset(args->pollset_set, args->pollset); - grpc_pollset_set_destroy(args->pollset_set); + grpc_pollset_set_del_pollset(exec_ctx, args->pollset_set, args->pollset); + grpc_pollset_set_destroy(exec_ctx, args->pollset_set); grpc_closure do_nothing_cb; GRPC_CLOSURE_INIT(&do_nothing_cb, do_nothing, nullptr, grpc_schedule_on_exec_ctx); gpr_mu_lock(args->mu); - grpc_pollset_shutdown(args->pollset, &do_nothing_cb); + grpc_pollset_shutdown(exec_ctx, args->pollset, &do_nothing_cb); gpr_mu_unlock(args->mu); // exec_ctx needs to be flushed before calling grpc_pollset_destroy() - grpc_core::ExecCtx::Get()->Flush(); - grpc_pollset_destroy(args->pollset); + grpc_exec_ctx_flush(exec_ctx); + grpc_pollset_destroy(exec_ctx, args->pollset); gpr_free(args->pollset); } @@ -74,109 +74,119 @@ static grpc_millis n_sec_deadline(int seconds) { } static void poll_pollset_until_request_done(args_struct* args) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_millis deadline = n_sec_deadline(10); while (true) { bool done = gpr_atm_acq_load(&args->done_atm) != 0; if (done) { break; } - grpc_millis time_left = deadline - grpc_core::ExecCtx::Get()->Now(); + grpc_millis time_left = deadline - grpc_exec_ctx_now(&exec_ctx); gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRIdPTR, done, time_left); GPR_ASSERT(time_left >= 0); grpc_pollset_worker* worker = nullptr; gpr_mu_lock(args->mu); - GRPC_LOG_IF_ERROR("pollset_work", grpc_pollset_work(args->pollset, &worker, - n_sec_deadline(1))); + GRPC_LOG_IF_ERROR("pollset_work", + grpc_pollset_work(&exec_ctx, args->pollset, &worker, + n_sec_deadline(1))); gpr_mu_unlock(args->mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); } gpr_event_set(&args->ev, (void*)1); + grpc_exec_ctx_finish(&exec_ctx); } -static void must_succeed(void* argsp, grpc_error* err) { +static void must_succeed(grpc_exec_ctx* exec_ctx, void* argsp, + grpc_error* err) { args_struct* args = static_cast(argsp); GPR_ASSERT(err == GRPC_ERROR_NONE); GPR_ASSERT(args->addrs != nullptr); GPR_ASSERT(args->addrs->naddrs > 0); gpr_atm_rel_store(&args->done_atm, 1); gpr_mu_lock(args->mu); - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(args->pollset, nullptr)); + GRPC_LOG_IF_ERROR("pollset_kick", + grpc_pollset_kick(exec_ctx, args->pollset, nullptr)); gpr_mu_unlock(args->mu); } -static void must_fail(void* argsp, grpc_error* err) { +static void must_fail(grpc_exec_ctx* exec_ctx, void* argsp, grpc_error* err) { args_struct* args = static_cast(argsp); GPR_ASSERT(err != GRPC_ERROR_NONE); gpr_atm_rel_store(&args->done_atm, 1); gpr_mu_lock(args->mu); - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(args->pollset, nullptr)); + GRPC_LOG_IF_ERROR("pollset_kick", + grpc_pollset_kick(exec_ctx, args->pollset, nullptr)); gpr_mu_unlock(args->mu); } static void test_localhost(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; args_struct args; - args_init(&args); + args_init(&exec_ctx, &args); grpc_resolve_address( - "localhost:1", nullptr, args.pollset_set, + &exec_ctx, "localhost:1", nullptr, args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); poll_pollset_until_request_done(&args); - args_finish(&args); + args_finish(&exec_ctx, &args); + grpc_exec_ctx_finish(&exec_ctx); } static void test_default_port(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; args_struct args; - args_init(&args); + args_init(&exec_ctx, &args); grpc_resolve_address( - "localhost", "1", args.pollset_set, + &exec_ctx, "localhost", "1", args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); poll_pollset_until_request_done(&args); - args_finish(&args); + args_finish(&exec_ctx, &args); + grpc_exec_ctx_finish(&exec_ctx); } static void test_non_numeric_default_port(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; args_struct args; - args_init(&args); + args_init(&exec_ctx, &args); grpc_resolve_address( - "localhost", "https", args.pollset_set, + &exec_ctx, "localhost", "https", args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); poll_pollset_until_request_done(&args); - args_finish(&args); + args_finish(&exec_ctx, &args); + grpc_exec_ctx_finish(&exec_ctx); } static void test_missing_default_port(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; args_struct args; - args_init(&args); + args_init(&exec_ctx, &args); grpc_resolve_address( - "localhost", nullptr, args.pollset_set, + &exec_ctx, "localhost", nullptr, args.pollset_set, GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); poll_pollset_until_request_done(&args); - args_finish(&args); + args_finish(&exec_ctx, &args); + grpc_exec_ctx_finish(&exec_ctx); } static void test_ipv6_with_port(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; args_struct args; - args_init(&args); + args_init(&exec_ctx, &args); grpc_resolve_address( - "[2001:db8::1]:1", nullptr, args.pollset_set, + &exec_ctx, "[2001:db8::1]:1", nullptr, args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); poll_pollset_until_request_done(&args); - args_finish(&args); + args_finish(&exec_ctx, &args); + grpc_exec_ctx_finish(&exec_ctx); } static void test_ipv6_without_port(void) { @@ -187,16 +197,17 @@ static void test_ipv6_without_port(void) { }; unsigned i; for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; args_struct args; - args_init(&args); + args_init(&exec_ctx, &args); grpc_resolve_address( - kCases[i], "80", args.pollset_set, + &exec_ctx, kCases[i], "80", args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); poll_pollset_until_request_done(&args); - args_finish(&args); + args_finish(&exec_ctx, &args); + grpc_exec_ctx_finish(&exec_ctx); } } @@ -207,16 +218,17 @@ static void test_invalid_ip_addresses(void) { }; unsigned i; for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; args_struct args; - args_init(&args); + args_init(&exec_ctx, &args); grpc_resolve_address( - kCases[i], nullptr, args.pollset_set, + &exec_ctx, kCases[i], nullptr, args.pollset_set, GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); poll_pollset_until_request_done(&args); - args_finish(&args); + args_finish(&exec_ctx, &args); + grpc_exec_ctx_finish(&exec_ctx); } } @@ -226,35 +238,34 @@ static void test_unparseable_hostports(void) { }; unsigned i; for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; args_struct args; - args_init(&args); + args_init(&exec_ctx, &args); grpc_resolve_address( - kCases[i], "1", args.pollset_set, + &exec_ctx, kCases[i], "1", args.pollset_set, GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); poll_pollset_until_request_done(&args); - args_finish(&args); + args_finish(&exec_ctx, &args); + grpc_exec_ctx_finish(&exec_ctx); } } int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); - { - grpc_core::ExecCtx exec_ctx; - test_localhost(); - test_default_port(); - test_non_numeric_default_port(); - test_missing_default_port(); - test_ipv6_with_port(); - test_ipv6_without_port(); - test_invalid_ip_addresses(); - test_unparseable_hostports(); - grpc_executor_shutdown(); - } - + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + test_localhost(); + test_default_port(); + test_non_numeric_default_port(); + test_missing_default_port(); + test_ipv6_with_port(); + test_ipv6_without_port(); + test_invalid_ip_addresses(); + test_unparseable_hostports(); + grpc_executor_shutdown(&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/resource_quota_test.cc b/test/core/iomgr/resource_quota_test.cc index ae26f72701b..6851702e678 100644 --- a/test/core/iomgr/resource_quota_test.cc +++ b/test/core/iomgr/resource_quota_test.cc @@ -27,7 +27,7 @@ gpr_mu g_mu; gpr_cv g_cv; -static void inc_int_cb(void* a, grpc_error* error) { +static void inc_int_cb(grpc_exec_ctx* exec_ctx, void* a, grpc_error* error) { gpr_mu_lock(&g_mu); ++*(int*)a; gpr_cv_signal(&g_cv); @@ -43,7 +43,7 @@ static void assert_counter_becomes(int* ctr, int value) { gpr_mu_unlock(&g_mu); } -static void set_event_cb(void* a, grpc_error* error) { +static void set_event_cb(grpc_exec_ctx* exec_ctx, void* a, grpc_error* error) { gpr_event_set((gpr_event*)a, (void*)1); } grpc_closure* set_event(gpr_event* ev) { @@ -56,12 +56,13 @@ typedef struct { grpc_closure* then; } reclaimer_args; -static void reclaimer_cb(void* args, grpc_error* error) { +static void reclaimer_cb(grpc_exec_ctx* exec_ctx, void* args, + grpc_error* error) { GPR_ASSERT(error == GRPC_ERROR_NONE); reclaimer_args* a = static_cast(args); - grpc_resource_user_free(a->resource_user, a->size); - grpc_resource_user_finish_reclamation(a->resource_user); - GRPC_CLOSURE_RUN(a->then, GRPC_ERROR_NONE); + grpc_resource_user_free(exec_ctx, a->resource_user, a->size); + grpc_resource_user_finish_reclamation(exec_ctx, a->resource_user); + GRPC_CLOSURE_RUN(exec_ctx, a->then, GRPC_ERROR_NONE); gpr_free(a); } @@ -74,9 +75,10 @@ grpc_closure* make_reclaimer(grpc_resource_user* resource_user, size_t size, return GRPC_CLOSURE_CREATE(reclaimer_cb, a, grpc_schedule_on_exec_ctx); } -static void unused_reclaimer_cb(void* arg, grpc_error* error) { +static void unused_reclaimer_cb(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { GPR_ASSERT(error == GRPC_ERROR_CANCELLED); - GRPC_CLOSURE_RUN(static_cast(arg), GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN(exec_ctx, static_cast(arg), GRPC_ERROR_NONE); } grpc_closure* make_unused_reclaimer(grpc_closure* then) { return GRPC_CLOSURE_CREATE(unused_reclaimer_cb, then, @@ -84,8 +86,9 @@ grpc_closure* make_unused_reclaimer(grpc_closure* then) { } static void destroy_user(grpc_resource_user* usr) { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_unref(usr); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_unref(&exec_ctx, usr); + grpc_exec_ctx_finish(&exec_ctx); } static void test_no_op(void) { @@ -117,12 +120,14 @@ static void test_instant_alloc_then_free(void) { grpc_resource_quota_resize(q, 1024 * 1024); grpc_resource_user* usr = grpc_resource_user_create(q, "usr"); { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr, 1024, NULL); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr, 1024, nullptr); + grpc_exec_ctx_finish(&exec_ctx); } { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_free(usr, 1024); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(&exec_ctx, usr, 1024); + grpc_exec_ctx_finish(&exec_ctx); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -135,9 +140,10 @@ static void test_instant_alloc_free_pair(void) { grpc_resource_quota_resize(q, 1024 * 1024); grpc_resource_user* usr = grpc_resource_user_create(q, "usr"); { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr, 1024, NULL); - grpc_resource_user_free(usr, 1024); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr, 1024, nullptr); + grpc_resource_user_free(&exec_ctx, usr, 1024); + grpc_exec_ctx_finish(&exec_ctx); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -152,15 +158,16 @@ static void test_simple_async_alloc(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); } { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_free(usr, 1024); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(&exec_ctx, usr, 1024); + grpc_exec_ctx_finish(&exec_ctx); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -175,9 +182,9 @@ static void test_async_alloc_blocked_by_size(void) { gpr_event ev; gpr_event_init(&ev); { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait( &ev, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); } @@ -186,8 +193,9 @@ static void test_async_alloc_blocked_by_size(void) { nullptr); ; { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_free(usr, 1024); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(&exec_ctx, usr, 1024); + grpc_exec_ctx_finish(&exec_ctx); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -202,30 +210,32 @@ static void test_scavenge(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr1, 1024, set_event(&ev)); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; } { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_free(usr1, 1024); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(&exec_ctx, usr1, 1024); + grpc_exec_ctx_finish(&exec_ctx); } { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr2, 1024, set_event(&ev)); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; } { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_free(usr2, 1024); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(&exec_ctx, usr2, 1024); + grpc_exec_ctx_finish(&exec_ctx); } grpc_resource_quota_unref(q); destroy_user(usr1); @@ -241,32 +251,33 @@ static void test_scavenge_blocked(void) { gpr_event ev; { gpr_event_init(&ev); - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr1, 1024, set_event(&ev)); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; } { gpr_event_init(&ev); - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr2, 1024, set_event(&ev)); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait( &ev, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); } { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_free(usr1, 1024); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(&exec_ctx, usr1, 1024); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; } { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_free(usr2, 1024); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(&exec_ctx, usr2, 1024); + grpc_exec_ctx_finish(&exec_ctx); } grpc_resource_quota_unref(q); destroy_user(usr1); @@ -282,9 +293,9 @@ static void test_blocked_until_scheduled_reclaim(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; @@ -292,16 +303,18 @@ static void test_blocked_until_scheduled_reclaim(void) { gpr_event reclaim_done; gpr_event_init(&reclaim_done); { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resource_user_post_reclaimer( - usr, false, make_reclaimer(usr, 1024, set_event(&reclaim_done))); + &exec_ctx, usr, false, + make_reclaimer(usr, 1024, set_event(&reclaim_done))); + grpc_exec_ctx_finish(&exec_ctx); } { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&reclaim_done, grpc_timeout_seconds_to_deadline(5)) != nullptr); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -309,8 +322,9 @@ static void test_blocked_until_scheduled_reclaim(void) { ; } { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_free(usr, 1024); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(&exec_ctx, usr, 1024); + grpc_exec_ctx_finish(&exec_ctx); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -326,9 +340,9 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr1, 1024, set_event(&ev)); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; @@ -336,16 +350,18 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) { gpr_event reclaim_done; gpr_event_init(&reclaim_done); { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resource_user_post_reclaimer( - usr1, false, make_reclaimer(usr1, 1024, set_event(&reclaim_done))); + &exec_ctx, usr1, false, + make_reclaimer(usr1, 1024, set_event(&reclaim_done))); + grpc_exec_ctx_finish(&exec_ctx); } { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr2, 1024, set_event(&ev)); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&reclaim_done, grpc_timeout_seconds_to_deadline(5)) != nullptr); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -353,8 +369,9 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) { ; } { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_free(usr2, 1024); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(&exec_ctx, usr2, 1024); + grpc_exec_ctx_finish(&exec_ctx); } grpc_resource_quota_unref(q); destroy_user(usr1); @@ -370,9 +387,9 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; @@ -380,16 +397,18 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) { gpr_event reclaim_done; gpr_event_init(&reclaim_done); { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resource_user_post_reclaimer( - usr, true, make_reclaimer(usr, 1024, set_event(&reclaim_done))); + &exec_ctx, usr, true, + make_reclaimer(usr, 1024, set_event(&reclaim_done))); + grpc_exec_ctx_finish(&exec_ctx); } { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&reclaim_done, grpc_timeout_seconds_to_deadline(5)) != nullptr); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -397,8 +416,9 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) { ; } { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_free(usr, 1024); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(&exec_ctx, usr, 1024); + grpc_exec_ctx_finish(&exec_ctx); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -415,12 +435,13 @@ static void test_unused_reclaim_is_cancelled(void) { gpr_event destructive_done; gpr_event_init(&destructive_done); { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resource_user_post_reclaimer( - usr, false, make_unused_reclaimer(set_event(&benign_done))); + &exec_ctx, usr, false, make_unused_reclaimer(set_event(&benign_done))); grpc_resource_user_post_reclaimer( - usr, true, make_unused_reclaimer(set_event(&destructive_done))); - grpc_core::ExecCtx::Get()->Flush(); + &exec_ctx, usr, true, + make_unused_reclaimer(set_event(&destructive_done))); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); @@ -449,20 +470,22 @@ static void test_benign_reclaim_is_preferred(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; } { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resource_user_post_reclaimer( - usr, false, make_reclaimer(usr, 1024, set_event(&benign_done))); + &exec_ctx, usr, false, + make_reclaimer(usr, 1024, set_event(&benign_done))); grpc_resource_user_post_reclaimer( - usr, true, make_unused_reclaimer(set_event(&destructive_done))); - grpc_core::ExecCtx::Get()->Flush(); + &exec_ctx, usr, true, + make_unused_reclaimer(set_event(&destructive_done))); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); @@ -473,9 +496,9 @@ static void test_benign_reclaim_is_preferred(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_seconds_to_deadline(5)) != nullptr); GPR_ASSERT(gpr_event_wait(&destructive_done, @@ -485,8 +508,9 @@ static void test_benign_reclaim_is_preferred(void) { nullptr); } { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_free(usr, 1024); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(&exec_ctx, usr, 1024); + grpc_exec_ctx_finish(&exec_ctx); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -509,20 +533,22 @@ static void test_multiple_reclaims_can_be_triggered(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; } { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resource_user_post_reclaimer( - usr, false, make_reclaimer(usr, 512, set_event(&benign_done))); + &exec_ctx, usr, false, + make_reclaimer(usr, 512, set_event(&benign_done))); grpc_resource_user_post_reclaimer( - usr, true, make_reclaimer(usr, 512, set_event(&destructive_done))); - grpc_core::ExecCtx::Get()->Flush(); + &exec_ctx, usr, true, + make_reclaimer(usr, 512, set_event(&destructive_done))); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); @@ -533,9 +559,9 @@ static void test_multiple_reclaims_can_be_triggered(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr, 1024, set_event(&ev)); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_seconds_to_deadline(5)) != nullptr); GPR_ASSERT(gpr_event_wait(&destructive_done, @@ -545,8 +571,9 @@ static void test_multiple_reclaims_can_be_triggered(void) { ; } { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_free(usr, 1024); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(&exec_ctx, usr, 1024); + grpc_exec_ctx_finish(&exec_ctx); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -564,17 +591,20 @@ static void test_resource_user_stays_allocated_until_memory_released(void) { grpc_resource_quota_resize(q, 1024 * 1024); grpc_resource_user* usr = grpc_resource_user_create(q, "usr"); { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr, 1024, NULL); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr, 1024, nullptr); + grpc_exec_ctx_finish(&exec_ctx); } { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resource_quota_unref(q); - grpc_resource_user_unref(usr); + grpc_resource_user_unref(&exec_ctx, usr); + grpc_exec_ctx_finish(&exec_ctx); } { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_free(usr, 1024); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(&exec_ctx, usr, 1024); + grpc_exec_ctx_finish(&exec_ctx); } } @@ -594,10 +624,11 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( gpr_event reclaimer_cancelled; gpr_event_init(&reclaimer_cancelled); { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resource_user_post_reclaimer( - usr, false, make_unused_reclaimer(set_event(&reclaimer_cancelled))); - grpc_core::ExecCtx::Get()->Flush(); + &exec_ctx, usr, false, + make_unused_reclaimer(set_event(&reclaimer_cancelled))); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); @@ -605,27 +636,27 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( { gpr_event allocated; gpr_event_init(&allocated); - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); - grpc_core::ExecCtx::Get()->Flush(); - GPR_ASSERT(gpr_event_wait(&allocated, - grpc_timeout_seconds_to_deadline(5)) != NULL); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&allocated)); + grpc_exec_ctx_finish(&exec_ctx); + GPR_ASSERT(gpr_event_wait(&allocated, grpc_timeout_seconds_to_deadline( + 5)) != nullptr); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); } { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_unref(usr); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_unref(&exec_ctx, usr); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); } { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_free(usr, 1024); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(&exec_ctx, usr, 1024); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, grpc_timeout_seconds_to_deadline(5)) != nullptr); @@ -643,9 +674,9 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { { gpr_event allocated; gpr_event_init(&allocated); - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&allocated)); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&allocated, grpc_timeout_seconds_to_deadline(5)) != nullptr); } @@ -653,10 +684,11 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { gpr_event reclaimer_done; gpr_event_init(&reclaimer_done); { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resource_user_post_reclaimer( - usr, false, make_reclaimer(usr, 1024, set_event(&reclaimer_done))); - grpc_core::ExecCtx::Get()->Flush(); + &exec_ctx, usr, false, + make_reclaimer(usr, 1024, set_event(&reclaimer_done))); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&reclaimer_done, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); @@ -664,19 +696,20 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { { gpr_event allocated; gpr_event_init(&allocated); - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); - grpc_core::ExecCtx::Get()->Flush(); - GPR_ASSERT(gpr_event_wait(&allocated, - grpc_timeout_seconds_to_deadline(5)) != NULL); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&allocated)); + grpc_exec_ctx_finish(&exec_ctx); + GPR_ASSERT(gpr_event_wait(&allocated, grpc_timeout_seconds_to_deadline( + 5)) != nullptr); GPR_ASSERT(gpr_event_wait(&reclaimer_done, grpc_timeout_seconds_to_deadline(5)) != nullptr); } } { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_free(usr, 1024); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_free(&exec_ctx, usr, 1024); + grpc_exec_ctx_finish(&exec_ctx); } destroy_user(usr); grpc_resource_quota_unref(q); @@ -699,15 +732,16 @@ static void test_one_slice(void) { { const int start_allocs = num_allocs; - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc_slices(&exec_ctx, &alloc, 1024, 1, &buffer); + grpc_exec_ctx_finish(&exec_ctx); assert_counter_becomes(&num_allocs, start_allocs + 1); } { - grpc_core::ExecCtx exec_ctx; - grpc_slice_buffer_destroy_internal(&buffer); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); + grpc_exec_ctx_finish(&exec_ctx); } destroy_user(usr); grpc_resource_quota_unref(q); @@ -731,21 +765,23 @@ static void test_one_slice_deleted_late(void) { { const int start_allocs = num_allocs; - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc_slices(&exec_ctx, &alloc, 1024, 1, &buffer); + grpc_exec_ctx_finish(&exec_ctx); assert_counter_becomes(&num_allocs, start_allocs + 1); } { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_unref(usr); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_unref(&exec_ctx, usr); + grpc_exec_ctx_finish(&exec_ctx); } grpc_resource_quota_unref(q); { - grpc_core::ExecCtx exec_ctx; - grpc_slice_buffer_destroy_internal(&buffer); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); + grpc_exec_ctx_finish(&exec_ctx); } } @@ -773,9 +809,9 @@ static void test_negative_rq_free_pool(void) { { const int start_allocs = num_allocs; - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_alloc_slices(&exec_ctx, &alloc, 1024, 1, &buffer); + grpc_exec_ctx_finish(&exec_ctx); assert_counter_becomes(&num_allocs, start_allocs + 1); } @@ -786,14 +822,16 @@ static void test_negative_rq_free_pool(void) { GPR_ASSERT(grpc_resource_quota_get_memory_pressure(q) > 1 - eps); { - grpc_core::ExecCtx exec_ctx; - grpc_resource_user_unref(usr); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resource_user_unref(&exec_ctx, usr); + grpc_exec_ctx_finish(&exec_ctx); } grpc_resource_quota_unref(q); { - grpc_core::ExecCtx exec_ctx; - grpc_slice_buffer_destroy_internal(&buffer); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); + grpc_exec_ctx_finish(&exec_ctx); } } diff --git a/test/core/iomgr/tcp_client_posix_test.cc b/test/core/iomgr/tcp_client_posix_test.cc index 40a050ed9f6..9fb1a2d770b 100644 --- a/test/core/iomgr/tcp_client_posix_test.cc +++ b/test/core/iomgr/tcp_client_posix_test.cc @@ -53,24 +53,26 @@ static grpc_millis test_deadline(void) { static void finish_connection() { gpr_mu_lock(g_mu); g_connections_complete++; - grpc_core::ExecCtx exec_ctx; - GPR_ASSERT( - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); - + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT(GRPC_LOG_IF_ERROR( + "pollset_kick", grpc_pollset_kick(&exec_ctx, g_pollset, nullptr))); + grpc_exec_ctx_finish(&exec_ctx); gpr_mu_unlock(g_mu); } -static void must_succeed(void* arg, grpc_error* error) { +static void must_succeed(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { GPR_ASSERT(g_connecting != nullptr); GPR_ASSERT(error == GRPC_ERROR_NONE); - grpc_endpoint_shutdown(g_connecting, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "must_succeed called")); - grpc_endpoint_destroy(g_connecting); + grpc_endpoint_shutdown( + exec_ctx, g_connecting, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("must_succeed called")); + grpc_endpoint_destroy(exec_ctx, g_connecting); g_connecting = nullptr; finish_connection(); } -static void must_fail(void* arg, grpc_error* error) { +static void must_fail(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { GPR_ASSERT(g_connecting == nullptr); GPR_ASSERT(error != GRPC_ERROR_NONE); finish_connection(); @@ -83,7 +85,7 @@ void test_succeeds(void) { int r; int connections_complete_before; grpc_closure done; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_DEBUG, "test_succeeds"); @@ -106,8 +108,8 @@ void test_succeeds(void) { GPR_ASSERT(getsockname(svr_fd, (struct sockaddr*)addr, (socklen_t*)&resolved_addr.len) == 0); GRPC_CLOSURE_INIT(&done, must_succeed, nullptr, grpc_schedule_on_exec_ctx); - grpc_tcp_client_connect(&done, &g_connecting, g_pollset_set, nullptr, - &resolved_addr, GRPC_MILLIS_INF_FUTURE); + grpc_tcp_client_connect(&exec_ctx, &done, &g_connecting, g_pollset_set, + nullptr, &resolved_addr, GRPC_MILLIS_INF_FUTURE); /* await the connection */ do { @@ -123,15 +125,17 @@ void test_succeeds(void) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(g_pollset, &worker, + grpc_pollset_work(&exec_ctx, g_pollset, &worker, grpc_timespec_to_millis_round_up( grpc_timeout_seconds_to_deadline(5))))); gpr_mu_unlock(g_mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); + + grpc_exec_ctx_finish(&exec_ctx); } void test_fails(void) { @@ -139,7 +143,7 @@ void test_fails(void) { struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; int connections_complete_before; grpc_closure done; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_DEBUG, "test_fails"); @@ -153,8 +157,8 @@ void test_fails(void) { /* connect to a broken address */ GRPC_CLOSURE_INIT(&done, must_fail, nullptr, grpc_schedule_on_exec_ctx); - grpc_tcp_client_connect(&done, &g_connecting, g_pollset_set, nullptr, - &resolved_addr, GRPC_MILLIS_INF_FUTURE); + grpc_tcp_client_connect(&exec_ctx, &done, &g_connecting, g_pollset_set, + nullptr, &resolved_addr, GRPC_MILLIS_INF_FUTURE); gpr_mu_lock(g_mu); @@ -162,7 +166,7 @@ void test_fails(void) { while (g_connections_complete == connections_complete_before) { grpc_pollset_worker* worker = nullptr; grpc_millis polling_deadline = test_deadline(); - switch (grpc_timer_check(&polling_deadline)) { + switch (grpc_timer_check(&exec_ctx, &polling_deadline)) { case GRPC_TIMERS_FIRED: break; case GRPC_TIMERS_NOT_CHECKED: @@ -170,43 +174,42 @@ void test_fails(void) { /* fall through */ case GRPC_TIMERS_CHECKED_AND_EMPTY: GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(g_pollset, &worker, polling_deadline))); + "pollset_work", grpc_pollset_work(&exec_ctx, g_pollset, &worker, + polling_deadline))); break; } gpr_mu_unlock(g_mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); + grpc_exec_ctx_finish(&exec_ctx); } -static void destroy_pollset(void* p, grpc_error* error) { - grpc_pollset_destroy(static_cast(p)); +static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, + grpc_error* error) { + grpc_pollset_destroy(exec_ctx, static_cast(p)); } int main(int argc, char** argv) { grpc_closure destroyed; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); - - { - grpc_core::ExecCtx exec_ctx; - g_pollset_set = grpc_pollset_set_create(); - g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); - grpc_pollset_init(g_pollset, &g_mu); - grpc_pollset_set_add_pollset(g_pollset_set, g_pollset); - - test_succeeds(); - gpr_log(GPR_ERROR, "End of first test"); - test_fails(); - grpc_pollset_set_destroy(g_pollset_set); - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(g_pollset, &destroyed); - } - + g_pollset_set = grpc_pollset_set_create(); + g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); + grpc_pollset_init(g_pollset, &g_mu); + grpc_pollset_set_add_pollset(&exec_ctx, g_pollset_set, g_pollset); + grpc_exec_ctx_finish(&exec_ctx); + test_succeeds(); + gpr_log(GPR_ERROR, "End of first test"); + test_fails(); + grpc_pollset_set_destroy(&exec_ctx, g_pollset_set); + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); gpr_free(g_pollset); return 0; diff --git a/test/core/iomgr/tcp_client_uv_test.cc b/test/core/iomgr/tcp_client_uv_test.cc index 0c6250ed7f5..101d7bf6b5c 100644 --- a/test/core/iomgr/tcp_client_uv_test.cc +++ b/test/core/iomgr/tcp_client_uv_test.cc @@ -46,28 +46,30 @@ static grpc_millis test_deadline(void) { return grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(10)); } -static void finish_connection() { +static void finish_connection(grpc_exec_ctx* exec_ctx) { gpr_mu_lock(g_mu); g_connections_complete++; - GPR_ASSERT( - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); + GPR_ASSERT(GRPC_LOG_IF_ERROR("pollset_kick", + grpc_pollset_kick(exec_ctx, g_pollset, NULL))); gpr_mu_unlock(g_mu); } -static void must_succeed(void* arg, grpc_error* error) { +static void must_succeed(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { GPR_ASSERT(g_connecting != NULL); GPR_ASSERT(error == GRPC_ERROR_NONE); - grpc_endpoint_shutdown(g_connecting, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "must_succeed called")); - grpc_endpoint_destroy(g_connecting); + grpc_endpoint_shutdown( + exec_ctx, g_connecting, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("must_succeed called")); + grpc_endpoint_destroy(exec_ctx, g_connecting); g_connecting = NULL; - finish_connection(); + finish_connection(exec_ctx); } -static void must_fail(void* arg, grpc_error* error) { +static void must_fail(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { GPR_ASSERT(g_connecting == NULL); GPR_ASSERT(error != GRPC_ERROR_NONE); - finish_connection(); + finish_connection(exec_ctx); } static void close_cb(uv_handle_t* handle) { gpr_free(handle); } @@ -87,7 +89,7 @@ void test_succeeds(void) { uv_tcp_t* svr_handle = static_cast(gpr_malloc(sizeof(uv_tcp_t))); int connections_complete_before; grpc_closure done; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_DEBUG, "test_succeeds"); @@ -108,8 +110,8 @@ void test_succeeds(void) { GPR_ASSERT(uv_tcp_getsockname(svr_handle, (struct sockaddr*)addr, (int*)&resolved_addr.len) == 0); GRPC_CLOSURE_INIT(&done, must_succeed, NULL, grpc_schedule_on_exec_ctx); - grpc_tcp_client_connect(&done, &g_connecting, NULL, NULL, &resolved_addr, - GRPC_MILLIS_INF_FUTURE); + grpc_tcp_client_connect(&exec_ctx, &done, &g_connecting, NULL, NULL, + &resolved_addr, GRPC_MILLIS_INF_FUTURE); gpr_mu_lock(g_mu); @@ -117,11 +119,11 @@ void test_succeeds(void) { grpc_pollset_worker* worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(g_pollset, &worker, + grpc_pollset_work(&exec_ctx, g_pollset, &worker, grpc_timespec_to_millis_round_up( grpc_timeout_seconds_to_deadline(5))))); gpr_mu_unlock(g_mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); gpr_mu_lock(g_mu); } @@ -129,6 +131,8 @@ void test_succeeds(void) { uv_close((uv_handle_t*)svr_handle, close_cb); gpr_mu_unlock(g_mu); + + grpc_exec_ctx_finish(&exec_ctx); } void test_fails(void) { @@ -136,7 +140,7 @@ void test_fails(void) { struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; int connections_complete_before; grpc_closure done; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_DEBUG, "test_fails"); @@ -150,8 +154,8 @@ void test_fails(void) { /* connect to a broken address */ GRPC_CLOSURE_INIT(&done, must_fail, NULL, grpc_schedule_on_exec_ctx); - grpc_tcp_client_connect(&done, &g_connecting, NULL, NULL, &resolved_addr, - GRPC_MILLIS_INF_FUTURE); + grpc_tcp_client_connect(&exec_ctx, &done, &g_connecting, NULL, NULL, + &resolved_addr, GRPC_MILLIS_INF_FUTURE); gpr_mu_lock(g_mu); @@ -160,7 +164,7 @@ void test_fails(void) { grpc_pollset_worker* worker = NULL; gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); grpc_millis polling_deadline = test_deadline(); - switch (grpc_timer_check(&polling_deadline)) { + switch (grpc_timer_check(&exec_ctx, &polling_deadline)) { case GRPC_TIMERS_FIRED: break; case GRPC_TIMERS_NOT_CHECKED: @@ -168,37 +172,39 @@ void test_fails(void) { /* fall through */ case GRPC_TIMERS_CHECKED_AND_EMPTY: GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(g_pollset, &worker, polling_deadline))); + "pollset_work", grpc_pollset_work(&exec_ctx, g_pollset, &worker, + polling_deadline))); break; } gpr_mu_unlock(g_mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); + grpc_exec_ctx_finish(&exec_ctx); } -static void destroy_pollset(void* p, grpc_error* error) { - grpc_pollset_destroy(static_cast(p)); +static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, + grpc_error* error) { + grpc_pollset_destroy(exec_ctx, static_cast(p)); } int main(int argc, char** argv) { grpc_closure destroyed; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); g_pollset = static_cast(gpr_malloc(grpc_pollset_size())); grpc_pollset_init(g_pollset, &g_mu); - + grpc_exec_ctx_finish(&exec_ctx); test_succeeds(); gpr_log(GPR_ERROR, "End of first test"); test_fails(); GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(g_pollset, &destroyed); - + grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); gpr_free(g_pollset); return 0; diff --git a/test/core/iomgr/tcp_posix_test.cc b/test/core/iomgr/tcp_posix_test.cc index f4acba83025..7986dc2b198 100644 --- a/test/core/iomgr/tcp_posix_test.cc +++ b/test/core/iomgr/tcp_posix_test.cc @@ -131,7 +131,8 @@ static size_t count_slices(grpc_slice* slices, size_t nslices, return num_bytes; } -static void read_cb(void* user_data, grpc_error* error) { +static void read_cb(grpc_exec_ctx* exec_ctx, void* user_data, + grpc_error* error) { struct read_socket_state* state = (struct read_socket_state*)user_data; size_t read_bytes; int current_data; @@ -146,11 +147,11 @@ static void read_cb(void* user_data, grpc_error* error) { gpr_log(GPR_INFO, "Read %" PRIuPTR " bytes of %" PRIuPTR, read_bytes, state->target_read_bytes); if (state->read_bytes >= state->target_read_bytes) { - GPR_ASSERT( - GRPC_LOG_IF_ERROR("kick", grpc_pollset_kick(g_pollset, nullptr))); + GPR_ASSERT(GRPC_LOG_IF_ERROR( + "kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); gpr_mu_unlock(g_mu); } else { - grpc_endpoint_read(state->ep, &state->incoming, &state->read_cb); + grpc_endpoint_read(exec_ctx, state->ep, &state->incoming, &state->read_cb); gpr_mu_unlock(g_mu); } } @@ -163,7 +164,7 @@ static void read_test(size_t num_bytes, size_t slice_size) { size_t written_bytes; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_INFO, "Read test of size %" PRIuPTR ", slice size %" PRIuPTR, num_bytes, slice_size); @@ -174,8 +175,9 @@ static void read_test(size_t num_bytes, size_t slice_size) { a[0].key = const_cast(GRPC_ARG_TCP_READ_CHUNK_SIZE); a[0].type = GRPC_ARG_INTEGER, a[0].value.integer = (int)slice_size; grpc_channel_args args = {GPR_ARRAY_SIZE(a), a}; - ep = grpc_tcp_create(grpc_fd_create(sv[1], "read_test"), &args, "test"); - grpc_endpoint_add_to_pollset(ep, g_pollset); + ep = grpc_tcp_create(&exec_ctx, grpc_fd_create(sv[1], "read_test"), &args, + "test"); + grpc_endpoint_add_to_pollset(&exec_ctx, ep, g_pollset); written_bytes = fill_socket_partial(sv[0], num_bytes); gpr_log(GPR_INFO, "Wrote %" PRIuPTR " bytes", written_bytes); @@ -186,22 +188,24 @@ static void read_test(size_t num_bytes, size_t slice_size) { grpc_slice_buffer_init(&state.incoming); GRPC_CLOSURE_INIT(&state.read_cb, read_cb, &state, grpc_schedule_on_exec_ctx); - grpc_endpoint_read(ep, &state.incoming, &state.read_cb); + grpc_endpoint_read(&exec_ctx, ep, &state.incoming, &state.read_cb); gpr_mu_lock(g_mu); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); + "pollset_work", + grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - + grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(g_mu); } GPR_ASSERT(state.read_bytes == state.target_read_bytes); gpr_mu_unlock(g_mu); - grpc_slice_buffer_destroy_internal(&state.incoming); - grpc_endpoint_destroy(ep); + grpc_slice_buffer_destroy_internal(&exec_ctx, &state.incoming); + grpc_endpoint_destroy(&exec_ctx, ep); + grpc_exec_ctx_finish(&exec_ctx); } /* Write to a socket until it fills up, then read from it using the grpc_tcp @@ -213,7 +217,7 @@ static void large_read_test(size_t slice_size) { ssize_t written_bytes; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_INFO, "Start large read test, slice size %" PRIuPTR, slice_size); @@ -224,8 +228,9 @@ static void large_read_test(size_t slice_size) { a[0].type = GRPC_ARG_INTEGER; a[0].value.integer = (int)slice_size; grpc_channel_args args = {GPR_ARRAY_SIZE(a), a}; - ep = grpc_tcp_create(grpc_fd_create(sv[1], "large_read_test"), &args, "test"); - grpc_endpoint_add_to_pollset(ep, g_pollset); + ep = grpc_tcp_create(&exec_ctx, grpc_fd_create(sv[1], "large_read_test"), + &args, "test"); + grpc_endpoint_add_to_pollset(&exec_ctx, ep, g_pollset); written_bytes = fill_socket(sv[0]); gpr_log(GPR_INFO, "Wrote %" PRIuPTR " bytes", written_bytes); @@ -236,22 +241,24 @@ static void large_read_test(size_t slice_size) { grpc_slice_buffer_init(&state.incoming); GRPC_CLOSURE_INIT(&state.read_cb, read_cb, &state, grpc_schedule_on_exec_ctx); - grpc_endpoint_read(ep, &state.incoming, &state.read_cb); + grpc_endpoint_read(&exec_ctx, ep, &state.incoming, &state.read_cb); gpr_mu_lock(g_mu); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); + "pollset_work", + grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - + grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(g_mu); } GPR_ASSERT(state.read_bytes == state.target_read_bytes); gpr_mu_unlock(g_mu); - grpc_slice_buffer_destroy_internal(&state.incoming); - grpc_endpoint_destroy(ep); + grpc_slice_buffer_destroy_internal(&exec_ctx, &state.incoming); + grpc_endpoint_destroy(&exec_ctx, ep); + grpc_exec_ctx_finish(&exec_ctx); } struct write_socket_state { @@ -282,15 +289,16 @@ static grpc_slice* allocate_blocks(size_t num_bytes, size_t slice_size, return slices; } -static void write_done(void* user_data /* write_socket_state */, +static void write_done(grpc_exec_ctx* exec_ctx, + void* user_data /* write_socket_state */, grpc_error* error) { struct write_socket_state* state = (struct write_socket_state*)user_data; gpr_log(GPR_INFO, "Write done callback called"); gpr_mu_lock(g_mu); gpr_log(GPR_INFO, "Signalling write done"); state->write_done = 1; - GPR_ASSERT( - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); + GPR_ASSERT(GRPC_LOG_IF_ERROR( + "pollset_kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); gpr_mu_unlock(g_mu); } @@ -301,7 +309,7 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { int flags; int current = 0; int i; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; flags = fcntl(fd, F_GETFL, 0); GPR_ASSERT(fcntl(fd, F_SETFL, flags & ~O_NONBLOCK) == 0); @@ -311,11 +319,11 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { gpr_mu_lock(g_mu); GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(g_pollset, &worker, + grpc_pollset_work(&exec_ctx, g_pollset, &worker, grpc_timespec_to_millis_round_up( grpc_timeout_milliseconds_to_deadline(10))))); gpr_mu_unlock(g_mu); - + grpc_exec_ctx_finish(&exec_ctx); do { bytes_read = read(fd, buf, bytes_left > read_size ? read_size : bytes_left); @@ -348,7 +356,7 @@ static void write_test(size_t num_bytes, size_t slice_size) { grpc_closure write_done_closure; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_INFO, "Start write test with %" PRIuPTR " bytes, slice size %" PRIuPTR, @@ -360,8 +368,9 @@ static void write_test(size_t num_bytes, size_t slice_size) { a[0].key = const_cast(GRPC_ARG_TCP_READ_CHUNK_SIZE); a[0].type = GRPC_ARG_INTEGER, a[0].value.integer = (int)slice_size; grpc_channel_args args = {GPR_ARRAY_SIZE(a), a}; - ep = grpc_tcp_create(grpc_fd_create(sv[1], "write_test"), &args, "test"); - grpc_endpoint_add_to_pollset(ep, g_pollset); + ep = grpc_tcp_create(&exec_ctx, grpc_fd_create(sv[1], "write_test"), &args, + "test"); + grpc_endpoint_add_to_pollset(&exec_ctx, ep, g_pollset); state.ep = ep; state.write_done = 0; @@ -373,7 +382,7 @@ static void write_test(size_t num_bytes, size_t slice_size) { GRPC_CLOSURE_INIT(&write_done_closure, write_done, &state, grpc_schedule_on_exec_ctx); - grpc_endpoint_write(ep, &outgoing, &write_done_closure); + grpc_endpoint_write(&exec_ctx, ep, &outgoing, &write_done_closure); drain_socket_blocking(sv[0], num_bytes, num_bytes); gpr_mu_lock(g_mu); for (;;) { @@ -382,23 +391,25 @@ static void write_test(size_t num_bytes, size_t slice_size) { break; } GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); + "pollset_work", + grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - + grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); - grpc_slice_buffer_destroy_internal(&outgoing); - grpc_endpoint_destroy(ep); + grpc_slice_buffer_destroy_internal(&exec_ctx, &outgoing); + grpc_endpoint_destroy(&exec_ctx, ep); gpr_free(slices); + grpc_exec_ctx_finish(&exec_ctx); } -void on_fd_released(void* arg, grpc_error* errors) { +void on_fd_released(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* errors) { int* done = (int*)arg; *done = 1; - GPR_ASSERT( - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); + GPR_ASSERT(GRPC_LOG_IF_ERROR( + "pollset_kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); } /* Do a read_test, then release fd and try to read/write again. Verify that @@ -411,7 +422,7 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { int fd; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_closure fd_released_cb; int fd_released_done = 0; GRPC_CLOSURE_INIT(&fd_released_cb, &on_fd_released, &fd_released_done, @@ -428,9 +439,10 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { a[0].type = GRPC_ARG_INTEGER; a[0].value.integer = (int)slice_size; grpc_channel_args args = {GPR_ARRAY_SIZE(a), a}; - ep = grpc_tcp_create(grpc_fd_create(sv[1], "read_test"), &args, "test"); + ep = grpc_tcp_create(&exec_ctx, grpc_fd_create(sv[1], "read_test"), &args, + "test"); GPR_ASSERT(grpc_tcp_fd(ep) == sv[1] && sv[1] >= 0); - grpc_endpoint_add_to_pollset(ep, g_pollset); + grpc_endpoint_add_to_pollset(&exec_ctx, ep, g_pollset); written_bytes = fill_socket_partial(sv[0], num_bytes); gpr_log(GPR_INFO, "Wrote %" PRIuPTR " bytes", written_bytes); @@ -441,35 +453,38 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { grpc_slice_buffer_init(&state.incoming); GRPC_CLOSURE_INIT(&state.read_cb, read_cb, &state, grpc_schedule_on_exec_ctx); - grpc_endpoint_read(ep, &state.incoming, &state.read_cb); + grpc_endpoint_read(&exec_ctx, ep, &state.incoming, &state.read_cb); gpr_mu_lock(g_mu); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); + "pollset_work", + grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); gpr_log(GPR_DEBUG, "wakeup: read=%" PRIdPTR " target=%" PRIdPTR, state.read_bytes, state.target_read_bytes); gpr_mu_unlock(g_mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); gpr_mu_lock(g_mu); } GPR_ASSERT(state.read_bytes == state.target_read_bytes); gpr_mu_unlock(g_mu); - grpc_slice_buffer_destroy_internal(&state.incoming); - grpc_tcp_destroy_and_release_fd(ep, &fd, &fd_released_cb); - grpc_core::ExecCtx::Get()->Flush(); + grpc_slice_buffer_destroy_internal(&exec_ctx, &state.incoming); + grpc_tcp_destroy_and_release_fd(&exec_ctx, ep, &fd, &fd_released_cb); + grpc_exec_ctx_flush(&exec_ctx); gpr_mu_lock(g_mu); while (!fd_released_done) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); + "pollset_work", + grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); gpr_log(GPR_DEBUG, "wakeup: fd_released_done=%d", fd_released_done); } gpr_mu_unlock(g_mu); GPR_ASSERT(fd_released_done == 1); GPR_ASSERT(fd == sv[1]); + grpc_exec_ctx_finish(&exec_ctx); written_bytes = fill_socket_partial(sv[0], num_bytes); drain_socket_blocking(fd, written_bytes, written_bytes); @@ -507,7 +522,7 @@ static grpc_endpoint_test_fixture create_fixture_tcp_socketpair( size_t slice_size) { int sv[2]; grpc_endpoint_test_fixture f; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; create_sockets(sv); grpc_resource_quota* resource_quota = @@ -517,13 +532,15 @@ static grpc_endpoint_test_fixture create_fixture_tcp_socketpair( a[0].type = GRPC_ARG_INTEGER; a[0].value.integer = (int)slice_size; grpc_channel_args args = {GPR_ARRAY_SIZE(a), a}; - f.client_ep = - grpc_tcp_create(grpc_fd_create(sv[0], "fixture:client"), &args, "test"); - f.server_ep = - grpc_tcp_create(grpc_fd_create(sv[1], "fixture:server"), &args, "test"); - grpc_resource_quota_unref_internal(resource_quota); - grpc_endpoint_add_to_pollset(f.client_ep, g_pollset); - grpc_endpoint_add_to_pollset(f.server_ep, g_pollset); + f.client_ep = grpc_tcp_create( + &exec_ctx, grpc_fd_create(sv[0], "fixture:client"), &args, "test"); + f.server_ep = grpc_tcp_create( + &exec_ctx, grpc_fd_create(sv[1], "fixture:server"), &args, "test"); + grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); + grpc_endpoint_add_to_pollset(&exec_ctx, f.client_ep, g_pollset); + grpc_endpoint_add_to_pollset(&exec_ctx, f.server_ep, g_pollset); + + grpc_exec_ctx_finish(&exec_ctx); return f; } @@ -532,26 +549,24 @@ static grpc_endpoint_test_config configs[] = { {"tcp/tcp_socketpair", create_fixture_tcp_socketpair, clean_up}, }; -static void destroy_pollset(void* p, grpc_error* error) { - grpc_pollset_destroy((grpc_pollset*)p); +static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, + grpc_error* error) { + grpc_pollset_destroy(exec_ctx, (grpc_pollset*)p); } int main(int argc, char** argv) { grpc_closure destroyed; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); - { - grpc_core::ExecCtx exec_ctx; - g_pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); - grpc_pollset_init(g_pollset, &g_mu); - grpc_endpoint_tests(configs[0], g_pollset, g_mu); - run_tests(); - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(g_pollset, &destroyed); - - grpc_core::ExecCtx::Get()->Flush(); - } + g_pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); + grpc_pollset_init(g_pollset, &g_mu); + grpc_endpoint_tests(configs[0], g_pollset, g_mu); + run_tests(); + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); gpr_free(g_pollset); diff --git a/test/core/iomgr/tcp_server_posix_test.cc b/test/core/iomgr/tcp_server_posix_test.cc index 3c9ca2109ec..48d8d425a59 100644 --- a/test/core/iomgr/tcp_server_posix_test.cc +++ b/test/core/iomgr/tcp_server_posix_test.cc @@ -110,7 +110,8 @@ static void on_connect_result_set(on_connect_result* result, result->server, acceptor->port_index, acceptor->fd_index); } -static void server_weak_ref_shutdown(void* arg, grpc_error* error) { +static void server_weak_ref_shutdown(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { server_weak_ref* weak_ref = static_cast(arg); weak_ref->server = nullptr; } @@ -144,11 +145,12 @@ static void test_addr_init_str(test_addr* addr) { } } -static void on_connect(void* arg, grpc_endpoint* tcp, grpc_pollset* pollset, +static void on_connect(grpc_exec_ctx* exec_ctx, void* arg, grpc_endpoint* tcp, + grpc_pollset* pollset, grpc_tcp_server_acceptor* acceptor) { - grpc_endpoint_shutdown(tcp, + grpc_endpoint_shutdown(exec_ctx, tcp, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Connected")); - grpc_endpoint_destroy(tcp); + grpc_endpoint_destroy(exec_ctx, tcp); on_connect_result temp_result; on_connect_result_set(&temp_result, acceptor); @@ -157,33 +159,38 @@ static void on_connect(void* arg, grpc_endpoint* tcp, grpc_pollset* pollset, gpr_mu_lock(g_mu); g_result = temp_result; g_nconnects++; - GPR_ASSERT( - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); + GPR_ASSERT(GRPC_LOG_IF_ERROR( + "pollset_kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); gpr_mu_unlock(g_mu); } static void test_no_op(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_tcp_server* s; - GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(nullptr, nullptr, &s)); - grpc_tcp_server_unref(s); + GPR_ASSERT(GRPC_ERROR_NONE == + grpc_tcp_server_create(&exec_ctx, nullptr, nullptr, &s)); + grpc_tcp_server_unref(&exec_ctx, s); + grpc_exec_ctx_finish(&exec_ctx); } static void test_no_op_with_start(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_tcp_server* s; - GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(nullptr, nullptr, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == + grpc_tcp_server_create(&exec_ctx, nullptr, nullptr, &s)); LOG_TEST("test_no_op_with_start"); - grpc_tcp_server_start(s, nullptr, 0, on_connect, nullptr); - grpc_tcp_server_unref(s); + grpc_tcp_server_start(&exec_ctx, s, nullptr, 0, on_connect, nullptr); + grpc_tcp_server_unref(&exec_ctx, s); + grpc_exec_ctx_finish(&exec_ctx); } static void test_no_op_with_port(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_tcp_server* s; - GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(nullptr, nullptr, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == + grpc_tcp_server_create(&exec_ctx, nullptr, nullptr, &s)); LOG_TEST("test_no_op_with_port"); memset(&resolved_addr, 0, sizeof(resolved_addr)); @@ -194,15 +201,17 @@ static void test_no_op_with_port(void) { GRPC_ERROR_NONE && port > 0); - grpc_tcp_server_unref(s); + grpc_tcp_server_unref(&exec_ctx, s); + grpc_exec_ctx_finish(&exec_ctx); } static void test_no_op_with_port_and_start(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_tcp_server* s; - GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(nullptr, nullptr, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == + grpc_tcp_server_create(&exec_ctx, nullptr, nullptr, &s)); LOG_TEST("test_no_op_with_port_and_start"); int port = -1; @@ -213,12 +222,13 @@ static void test_no_op_with_port_and_start(void) { GRPC_ERROR_NONE && port > 0); - grpc_tcp_server_start(s, nullptr, 0, on_connect, nullptr); + grpc_tcp_server_start(&exec_ctx, s, nullptr, 0, on_connect, nullptr); - grpc_tcp_server_unref(s); + grpc_tcp_server_unref(&exec_ctx, s); + grpc_exec_ctx_finish(&exec_ctx); } -static grpc_error* tcp_connect(const test_addr* remote, +static grpc_error* tcp_connect(grpc_exec_ctx* exec_ctx, const test_addr* remote, on_connect_result* result) { grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(10)); @@ -244,17 +254,17 @@ static grpc_error* tcp_connect(const test_addr* remote, } gpr_log(GPR_DEBUG, "wait"); while (g_nconnects == nconnects_before && - deadline > grpc_core::ExecCtx::Get()->Now()) { + deadline > grpc_exec_ctx_now(exec_ctx)) { grpc_pollset_worker* worker = nullptr; grpc_error* err; - if ((err = grpc_pollset_work(g_pollset, &worker, deadline)) != + if ((err = grpc_pollset_work(exec_ctx, g_pollset, &worker, deadline)) != GRPC_ERROR_NONE) { gpr_mu_unlock(g_mu); close(clifd); return err; } gpr_mu_unlock(g_mu); - + grpc_exec_ctx_finish(exec_ctx); gpr_mu_lock(g_mu); } gpr_log(GPR_DEBUG, "wait done"); @@ -269,7 +279,7 @@ static grpc_error* tcp_connect(const test_addr* remote, gpr_mu_unlock(g_mu); gpr_log(GPR_INFO, "Result (%d, %d) fd %d", result->port_index, result->fd_index, result->server_fd); - grpc_tcp_server_unref(result->server); + grpc_tcp_server_unref(exec_ctx, result->server); return GRPC_ERROR_NONE; } @@ -282,7 +292,7 @@ static grpc_error* tcp_connect(const test_addr* remote, static void test_connect(size_t num_connects, const grpc_channel_args* channel_args, test_addrs* dst_addrs, bool test_dst_addrs) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; grpc_resolved_address resolved_addr1; struct sockaddr_storage* const addr = @@ -297,7 +307,7 @@ static void test_connect(size_t num_connects, grpc_tcp_server* s; const unsigned num_ports = 2; GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(nullptr, channel_args, &s)); + grpc_tcp_server_create(&exec_ctx, nullptr, channel_args, &s)); unsigned port_num; server_weak_ref weak_ref; server_weak_ref_init(&weak_ref); @@ -342,7 +352,7 @@ static void test_connect(size_t num_connects, svr1_fd_count = grpc_tcp_server_port_fd_count(s, 1); GPR_ASSERT(svr1_fd_count >= 1); - grpc_tcp_server_start(s, &g_pollset, 1, on_connect, nullptr); + grpc_tcp_server_start(&exec_ctx, s, &g_pollset, 1, on_connect, nullptr); if (dst_addrs != nullptr) { int ports[] = {svr_port, svr1_port}; @@ -362,7 +372,7 @@ static void test_connect(size_t num_connects, test_addr_init_str(&dst); ++num_tested; on_connect_result_init(&result); - if ((err = tcp_connect(&dst, &result)) == GRPC_ERROR_NONE && + if ((err = tcp_connect(&exec_ctx, &dst, &result)) == GRPC_ERROR_NONE && result.server_fd >= 0 && result.server == s) { continue; } @@ -393,8 +403,8 @@ static void test_connect(size_t num_connects, for (connect_num = 0; connect_num < num_connects; ++connect_num) { on_connect_result result; on_connect_result_init(&result); - GPR_ASSERT( - GRPC_LOG_IF_ERROR("tcp_connect", tcp_connect(&dst, &result))); + GPR_ASSERT(GRPC_LOG_IF_ERROR("tcp_connect", + tcp_connect(&exec_ctx, &dst, &result))); GPR_ASSERT(result.server_fd == fd); GPR_ASSERT(result.port_index == port_num); GPR_ASSERT(result.fd_index == fd_num); @@ -410,19 +420,21 @@ static void test_connect(size_t num_connects, GPR_ASSERT(weak_ref.server != nullptr); GPR_ASSERT(grpc_tcp_server_port_fd(s, 0, 0) >= 0); - grpc_tcp_server_unref(s); - grpc_core::ExecCtx::Get()->Flush(); + grpc_tcp_server_unref(&exec_ctx, s); + grpc_exec_ctx_finish(&exec_ctx); /* Weak ref lost. */ GPR_ASSERT(weak_ref.server == nullptr); } -static void destroy_pollset(void* p, grpc_error* error) { - grpc_pollset_destroy(static_cast(p)); +static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, + grpc_error* error) { + grpc_pollset_destroy(exec_ctx, static_cast(p)); } int main(int argc, char** argv) { grpc_closure destroyed; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_arg chan_args[1]; chan_args[0].type = GRPC_ARG_INTEGER; chan_args[0].key = const_cast(GRPC_ARG_EXPAND_WILDCARD_ADDRS); @@ -435,61 +447,58 @@ int main(int argc, char** argv) { static_cast(gpr_zalloc(sizeof(*dst_addrs))); grpc_test_init(argc, argv); grpc_init(); - { - grpc_core::ExecCtx exec_ctx; - g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); - grpc_pollset_init(g_pollset, &g_mu); - - test_no_op(); - test_no_op_with_start(); - test_no_op_with_port(); - test_no_op_with_port_and_start(); - - if (getifaddrs(&ifa) != 0 || ifa == nullptr) { - gpr_log(GPR_ERROR, "getifaddrs: %s", strerror(errno)); - return EXIT_FAILURE; - } - dst_addrs->naddrs = 0; - for (ifa_it = ifa; ifa_it != nullptr && dst_addrs->naddrs < MAX_ADDRS; - ifa_it = ifa_it->ifa_next) { - if (ifa_it->ifa_addr == nullptr) { - continue; - } else if (ifa_it->ifa_addr->sa_family == AF_INET) { - dst_addrs->addrs[dst_addrs->naddrs].addr.len = - sizeof(struct sockaddr_in); - } else if (ifa_it->ifa_addr->sa_family == AF_INET6) { - dst_addrs->addrs[dst_addrs->naddrs].addr.len = - sizeof(struct sockaddr_in6); - } else { - continue; - } - memcpy(dst_addrs->addrs[dst_addrs->naddrs].addr.addr, ifa_it->ifa_addr, - dst_addrs->addrs[dst_addrs->naddrs].addr.len); - GPR_ASSERT( - grpc_sockaddr_set_port(&dst_addrs->addrs[dst_addrs->naddrs].addr, 0)); - test_addr_init_str(&dst_addrs->addrs[dst_addrs->naddrs]); - ++dst_addrs->naddrs; - } - freeifaddrs(ifa); - ifa = nullptr; - - /* Connect to same addresses as listeners. */ - test_connect(1, nullptr, nullptr, false); - test_connect(10, nullptr, nullptr, false); + g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); + grpc_pollset_init(g_pollset, &g_mu); - /* Set dst_addrs->addrs[i].len=0 for dst_addrs that are unreachable with a - "::" listener. */ - test_connect(1, nullptr, dst_addrs, true); + test_no_op(); + test_no_op_with_start(); + test_no_op_with_port(); + test_no_op_with_port_and_start(); - /* Test connect(2) with dst_addrs. */ - test_connect(1, &channel_args, dst_addrs, false); - /* Test connect(2) with dst_addrs. */ - test_connect(10, &channel_args, dst_addrs, false); - - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(g_pollset, &destroyed); + if (getifaddrs(&ifa) != 0 || ifa == nullptr) { + gpr_log(GPR_ERROR, "getifaddrs: %s", strerror(errno)); + return EXIT_FAILURE; + } + dst_addrs->naddrs = 0; + for (ifa_it = ifa; ifa_it != nullptr && dst_addrs->naddrs < MAX_ADDRS; + ifa_it = ifa_it->ifa_next) { + if (ifa_it->ifa_addr == nullptr) { + continue; + } else if (ifa_it->ifa_addr->sa_family == AF_INET) { + dst_addrs->addrs[dst_addrs->naddrs].addr.len = sizeof(struct sockaddr_in); + } else if (ifa_it->ifa_addr->sa_family == AF_INET6) { + dst_addrs->addrs[dst_addrs->naddrs].addr.len = + sizeof(struct sockaddr_in6); + } else { + continue; + } + memcpy(dst_addrs->addrs[dst_addrs->naddrs].addr.addr, ifa_it->ifa_addr, + dst_addrs->addrs[dst_addrs->naddrs].addr.len); + GPR_ASSERT( + grpc_sockaddr_set_port(&dst_addrs->addrs[dst_addrs->naddrs].addr, 0)); + test_addr_init_str(&dst_addrs->addrs[dst_addrs->naddrs]); + ++dst_addrs->naddrs; } + freeifaddrs(ifa); + ifa = nullptr; + + /* Connect to same addresses as listeners. */ + test_connect(1, nullptr, nullptr, false); + test_connect(10, nullptr, nullptr, false); + + /* Set dst_addrs->addrs[i].len=0 for dst_addrs that are unreachable with a + "::" listener. */ + test_connect(1, nullptr, dst_addrs, true); + + /* Test connect(2) with dst_addrs. */ + test_connect(1, &channel_args, dst_addrs, false); + /* Test connect(2) with dst_addrs. */ + test_connect(10, &channel_args, dst_addrs, false); + + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); gpr_free(dst_addrs); gpr_free(g_pollset); diff --git a/test/core/iomgr/tcp_server_uv_test.cc b/test/core/iomgr/tcp_server_uv_test.cc index 35d62b51b76..dd047a04983 100644 --- a/test/core/iomgr/tcp_server_uv_test.cc +++ b/test/core/iomgr/tcp_server_uv_test.cc @@ -74,7 +74,8 @@ static void on_connect_result_set(on_connect_result* result, result->fd_index = acceptor->fd_index; } -static void server_weak_ref_shutdown(void* arg, grpc_error* error) { +static void server_weak_ref_shutdown(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { server_weak_ref* weak_ref = static_cast(arg); weak_ref->server = NULL; } @@ -96,11 +97,12 @@ static void server_weak_ref_set(server_weak_ref* weak_ref, weak_ref->server = server; } -static void on_connect(void* arg, grpc_endpoint* tcp, grpc_pollset* pollset, +static void on_connect(grpc_exec_ctx* exec_ctx, void* arg, grpc_endpoint* tcp, + grpc_pollset* pollset, grpc_tcp_server_acceptor* acceptor) { - grpc_endpoint_shutdown(tcp, + grpc_endpoint_shutdown(exec_ctx, tcp, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Connected")); - grpc_endpoint_destroy(tcp); + grpc_endpoint_destroy(exec_ctx, tcp); on_connect_result temp_result; on_connect_result_set(&temp_result, acceptor); @@ -109,33 +111,38 @@ static void on_connect(void* arg, grpc_endpoint* tcp, grpc_pollset* pollset, gpr_mu_lock(g_mu); g_result = temp_result; g_nconnects++; - GPR_ASSERT( - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); + GPR_ASSERT(GRPC_LOG_IF_ERROR("pollset_kick", + grpc_pollset_kick(exec_ctx, g_pollset, NULL))); gpr_mu_unlock(g_mu); } static void test_no_op(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_tcp_server* s; - GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); - grpc_tcp_server_unref(s); + GPR_ASSERT(GRPC_ERROR_NONE == + grpc_tcp_server_create(&exec_ctx, NULL, NULL, &s)); + grpc_tcp_server_unref(&exec_ctx, s); + grpc_exec_ctx_finish(&exec_ctx); } static void test_no_op_with_start(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_tcp_server* s; - GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == + grpc_tcp_server_create(&exec_ctx, NULL, NULL, &s)); LOG_TEST("test_no_op_with_start"); - grpc_tcp_server_start(s, NULL, 0, on_connect, NULL); - grpc_tcp_server_unref(s); + grpc_tcp_server_start(&exec_ctx, s, NULL, 0, on_connect, NULL); + grpc_tcp_server_unref(&exec_ctx, s); + grpc_exec_ctx_finish(&exec_ctx); } static void test_no_op_with_port(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_tcp_server* s; - GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == + grpc_tcp_server_create(&exec_ctx, NULL, NULL, &s)); LOG_TEST("test_no_op_with_port"); memset(&resolved_addr, 0, sizeof(resolved_addr)); @@ -146,15 +153,17 @@ static void test_no_op_with_port(void) { GRPC_ERROR_NONE && port > 0); - grpc_tcp_server_unref(s); + grpc_tcp_server_unref(&exec_ctx, s); + grpc_exec_ctx_finish(&exec_ctx); } static void test_no_op_with_port_and_start(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_tcp_server* s; - GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == + grpc_tcp_server_create(&exec_ctx, NULL, NULL, &s)); LOG_TEST("test_no_op_with_port_and_start"); int port; @@ -165,9 +174,10 @@ static void test_no_op_with_port_and_start(void) { GRPC_ERROR_NONE && port > 0); - grpc_tcp_server_start(s, NULL, 0, on_connect, NULL); + grpc_tcp_server_start(&exec_ctx, s, NULL, 0, on_connect, NULL); - grpc_tcp_server_unref(s); + grpc_tcp_server_unref(&exec_ctx, s); + grpc_exec_ctx_finish(&exec_ctx); } static void connect_cb(uv_connect_t* req, int status) { @@ -177,8 +187,8 @@ static void connect_cb(uv_connect_t* req, int status) { static void close_cb(uv_handle_t* handle) { gpr_free(handle); } -static void tcp_connect(const struct sockaddr* remote, socklen_t remote_len, - on_connect_result* result) { +static void tcp_connect(grpc_exec_ctx* exec_ctx, const struct sockaddr* remote, + socklen_t remote_len, on_connect_result* result) { gpr_timespec deadline = grpc_timeout_seconds_to_deadline(10); uv_tcp_t* client_handle = static_cast(gpr_malloc(sizeof(uv_tcp_t))); @@ -198,10 +208,10 @@ static void tcp_connect(const struct sockaddr* remote, socklen_t remote_len, grpc_pollset_worker* worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(g_pollset, &worker, + grpc_pollset_work(exec_ctx, g_pollset, &worker, grpc_timespec_to_millis_round_up(deadline)))); gpr_mu_unlock(g_mu); - + grpc_exec_ctx_finish(exec_ctx); gpr_mu_lock(g_mu); } gpr_log(GPR_DEBUG, "wait done"); @@ -214,7 +224,7 @@ static void tcp_connect(const struct sockaddr* remote, socklen_t remote_len, /* Tests a tcp server with multiple ports. */ static void test_connect(unsigned n) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; grpc_resolved_address resolved_addr1; struct sockaddr_storage* addr = (struct sockaddr_storage*)resolved_addr.addr; @@ -223,7 +233,8 @@ static void test_connect(unsigned n) { int svr_port; int svr1_port; grpc_tcp_server* s; - GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == + grpc_tcp_server_create(&exec_ctx, NULL, NULL, &s)); unsigned i; server_weak_ref weak_ref; server_weak_ref_init(&weak_ref); @@ -246,45 +257,48 @@ static void test_connect(unsigned n) { GRPC_ERROR_NONE && svr_port == svr1_port); - grpc_tcp_server_start(s, &g_pollset, 1, on_connect, NULL); + grpc_tcp_server_start(&exec_ctx, s, &g_pollset, 1, on_connect, NULL); GPR_ASSERT(uv_ip6_addr("::", svr_port, (struct sockaddr_in6*)addr1) == 0); for (i = 0; i < n; i++) { on_connect_result result; on_connect_result_init(&result); - tcp_connect((struct sockaddr*)addr, (socklen_t)resolved_addr.len, &result); + tcp_connect(&exec_ctx, (struct sockaddr*)addr, (socklen_t)resolved_addr.len, + &result); GPR_ASSERT(result.port_index == 0); GPR_ASSERT(result.server == s); if (weak_ref.server == NULL) { server_weak_ref_set(&weak_ref, result.server); } - grpc_tcp_server_unref(result.server); + grpc_tcp_server_unref(&exec_ctx, result.server); on_connect_result_init(&result); - tcp_connect((struct sockaddr*)addr1, (socklen_t)resolved_addr1.len, - &result); + tcp_connect(&exec_ctx, (struct sockaddr*)addr1, + (socklen_t)resolved_addr1.len, &result); GPR_ASSERT(result.port_index == 1); GPR_ASSERT(result.server == s); - grpc_tcp_server_unref(result.server); + grpc_tcp_server_unref(&exec_ctx, result.server); } /* Weak ref to server valid until final unref. */ GPR_ASSERT(weak_ref.server != NULL); - grpc_tcp_server_unref(s); + grpc_tcp_server_unref(&exec_ctx, s); + grpc_exec_ctx_finish(&exec_ctx); /* Weak ref lost. */ GPR_ASSERT(weak_ref.server == NULL); } -static void destroy_pollset(void* p, grpc_error* error) { - grpc_pollset_destroy(static_cast(p)); +static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, + grpc_error* error) { + grpc_pollset_destroy(exec_ctx, static_cast(p)); } int main(int argc, char** argv) { grpc_closure destroyed; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); g_pollset = static_cast(gpr_malloc(grpc_pollset_size())); @@ -299,8 +313,8 @@ int main(int argc, char** argv) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(g_pollset, &destroyed); - + grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); gpr_free(g_pollset); return 0; diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc index deb8c4d87e9..d74ea4fc96d 100644 --- a/test/core/iomgr/timer_list_test.cc +++ b/test/core/iomgr/timer_list_test.cc @@ -25,7 +25,6 @@ #include -#include #include #include "src/core/lib/debug/trace.h" #include "test/core/util/test_config.h" @@ -38,125 +37,127 @@ extern grpc_core::TraceFlag grpc_timer_check_trace; static int cb_called[MAX_CB][2]; -static void cb(void* arg, grpc_error* error) { +static void cb(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { cb_called[(intptr_t)arg][error == GRPC_ERROR_NONE]++; } static void add_test(void) { int i; grpc_timer timers[20]; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_INFO, "add_test"); - grpc_timer_list_init(); + grpc_timer_list_init(&exec_ctx); grpc_core::testing::grpc_tracer_enable_flag(&grpc_timer_trace); grpc_core::testing::grpc_tracer_enable_flag(&grpc_timer_check_trace); memset(cb_called, 0, sizeof(cb_called)); - grpc_millis start = grpc_core::ExecCtx::Get()->Now(); + grpc_millis start = grpc_exec_ctx_now(&exec_ctx); /* 10 ms timers. will expire in the current epoch */ for (i = 0; i < 10; i++) { grpc_timer_init( - &timers[i], start + 10, + &exec_ctx, &timers[i], start + 10, GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)i, grpc_schedule_on_exec_ctx)); } /* 1010 ms timers. will expire in the next epoch */ for (i = 10; i < 20; i++) { grpc_timer_init( - &timers[i], start + 1010, + &exec_ctx, &timers[i], start + 1010, GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)i, grpc_schedule_on_exec_ctx)); } /* collect timers. Only the first batch should be ready. */ - grpc_core::ExecCtx::Get()->TestOnlySetNow(start + 500); - GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); - grpc_core::ExecCtx::Get()->Flush(); + exec_ctx.now = start + 500; + GPR_ASSERT(grpc_timer_check(&exec_ctx, nullptr) == GRPC_TIMERS_FIRED); + grpc_exec_ctx_finish(&exec_ctx); for (i = 0; i < 20; i++) { GPR_ASSERT(cb_called[i][1] == (i < 10)); GPR_ASSERT(cb_called[i][0] == 0); } - grpc_core::ExecCtx::Get()->TestOnlySetNow(start + 600); - GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_CHECKED_AND_EMPTY); - grpc_core::ExecCtx::Get()->Flush(); + exec_ctx.now = start + 600; + GPR_ASSERT(grpc_timer_check(&exec_ctx, nullptr) == + GRPC_TIMERS_CHECKED_AND_EMPTY); + grpc_exec_ctx_finish(&exec_ctx); for (i = 0; i < 30; i++) { GPR_ASSERT(cb_called[i][1] == (i < 10)); GPR_ASSERT(cb_called[i][0] == 0); } /* collect the rest of the timers */ - grpc_core::ExecCtx::Get()->TestOnlySetNow(start + 1500); - GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); - grpc_core::ExecCtx::Get()->Flush(); + exec_ctx.now = start + 1500; + GPR_ASSERT(grpc_timer_check(&exec_ctx, nullptr) == GRPC_TIMERS_FIRED); + grpc_exec_ctx_finish(&exec_ctx); for (i = 0; i < 30; i++) { GPR_ASSERT(cb_called[i][1] == (i < 20)); GPR_ASSERT(cb_called[i][0] == 0); } - grpc_core::ExecCtx::Get()->TestOnlySetNow(start + 1600); - GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_CHECKED_AND_EMPTY); + exec_ctx.now = start + 1600; + GPR_ASSERT(grpc_timer_check(&exec_ctx, nullptr) == + GRPC_TIMERS_CHECKED_AND_EMPTY); for (i = 0; i < 30; i++) { GPR_ASSERT(cb_called[i][1] == (i < 20)); GPR_ASSERT(cb_called[i][0] == 0); } - grpc_timer_list_shutdown(); + grpc_timer_list_shutdown(&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); } /* Cleaning up a list with pending timers. */ void destruction_test(void) { grpc_timer timers[5]; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_INFO, "destruction_test"); - grpc_core::ExecCtx::Get()->TestOnlySetNow(0); - grpc_timer_list_init(); + exec_ctx.now_is_valid = true; + exec_ctx.now = 0; + grpc_timer_list_init(&exec_ctx); grpc_core::testing::grpc_tracer_enable_flag(&grpc_timer_trace); grpc_core::testing::grpc_tracer_enable_flag(&grpc_timer_check_trace); memset(cb_called, 0, sizeof(cb_called)); grpc_timer_init( - &timers[0], 100, + &exec_ctx, &timers[0], 100, GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)0, grpc_schedule_on_exec_ctx)); grpc_timer_init( - &timers[1], 3, + &exec_ctx, &timers[1], 3, GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)1, grpc_schedule_on_exec_ctx)); grpc_timer_init( - &timers[2], 100, + &exec_ctx, &timers[2], 100, GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)2, grpc_schedule_on_exec_ctx)); grpc_timer_init( - &timers[3], 3, + &exec_ctx, &timers[3], 3, GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)3, grpc_schedule_on_exec_ctx)); grpc_timer_init( - &timers[4], 1, + &exec_ctx, &timers[4], 1, GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)4, grpc_schedule_on_exec_ctx)); - grpc_core::ExecCtx::Get()->TestOnlySetNow(2); - GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); - grpc_core::ExecCtx::Get()->Flush(); + exec_ctx.now = 2; + GPR_ASSERT(grpc_timer_check(&exec_ctx, nullptr) == GRPC_TIMERS_FIRED); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(1 == cb_called[4][1]); - grpc_timer_cancel(&timers[0]); - grpc_timer_cancel(&timers[3]); - grpc_core::ExecCtx::Get()->Flush(); + grpc_timer_cancel(&exec_ctx, &timers[0]); + grpc_timer_cancel(&exec_ctx, &timers[3]); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(1 == cb_called[0][0]); GPR_ASSERT(1 == cb_called[3][0]); - grpc_timer_list_shutdown(); - grpc_core::ExecCtx::Get()->Flush(); + grpc_timer_list_shutdown(&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(1 == cb_called[1][0]); GPR_ASSERT(1 == cb_called[2][0]); } int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_core::ExecCtx::GlobalInit(); gpr_set_log_verbosity(GPR_LOG_SEVERITY_DEBUG); add_test(); destruction_test(); - grpc_core::ExecCtx::GlobalShutdown(); return 0; } diff --git a/test/core/iomgr/udp_server_test.cc b/test/core/iomgr/udp_server_test.cc index 0deb534abd0..6e17be9cd6d 100644 --- a/test/core/iomgr/udp_server_test.cc +++ b/test/core/iomgr/udp_server_test.cc @@ -50,7 +50,7 @@ static int g_number_of_writes = 0; static int g_number_of_bytes_read = 0; static int g_number_of_orphan_calls = 0; -static bool on_read(grpc_fd* emfd, void* user_data) { +static bool on_read(grpc_exec_ctx* exec_ctx, grpc_fd* emfd, void* user_data) { char read_buffer[512]; ssize_t byte_count; @@ -61,27 +61,27 @@ static bool on_read(grpc_fd* emfd, void* user_data) { g_number_of_reads++; g_number_of_bytes_read += (int)byte_count; - GPR_ASSERT( - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); + GPR_ASSERT(GRPC_LOG_IF_ERROR( + "pollset_kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); gpr_mu_unlock(g_mu); return false; } -static void on_write(grpc_fd* emfd, void* user_data, +static void on_write(grpc_exec_ctx* exec_ctx, grpc_fd* emfd, void* user_data, grpc_closure* notify_on_write_closure) { gpr_mu_lock(g_mu); g_number_of_writes++; - GPR_ASSERT( - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); + GPR_ASSERT(GRPC_LOG_IF_ERROR( + "pollset_kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); gpr_mu_unlock(g_mu); } -static void on_fd_orphaned(grpc_fd* emfd, grpc_closure* closure, - void* user_data) { +static void on_fd_orphaned(grpc_exec_ctx* exec_ctx, grpc_fd* emfd, + grpc_closure* closure, void* user_data) { gpr_log(GPR_INFO, "gRPC FD about to be orphaned: %d", grpc_fd_wrapped_fd(emfd)); - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); g_number_of_orphan_calls++; } @@ -130,22 +130,24 @@ static test_socket_factory* test_socket_factory_create(void) { } static void test_no_op(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_udp_server* s = grpc_udp_server_create(nullptr); - grpc_udp_server_destroy(s, nullptr); + grpc_udp_server_destroy(&exec_ctx, s, nullptr); + grpc_exec_ctx_finish(&exec_ctx); } static void test_no_op_with_start(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_udp_server* s = grpc_udp_server_create(nullptr); LOG_TEST("test_no_op_with_start"); - grpc_udp_server_start(s, nullptr, 0, nullptr); - grpc_udp_server_destroy(s, nullptr); + grpc_udp_server_start(&exec_ctx, s, nullptr, 0, nullptr); + grpc_udp_server_destroy(&exec_ctx, s, nullptr); + grpc_exec_ctx_finish(&exec_ctx); } static void test_no_op_with_port(void) { g_number_of_orphan_calls = 0; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_udp_server* s = grpc_udp_server_create(nullptr); @@ -157,7 +159,8 @@ static void test_no_op_with_port(void) { GPR_ASSERT(grpc_udp_server_add_port(s, &resolved_addr, on_read, on_write, on_fd_orphaned)); - grpc_udp_server_destroy(s, nullptr); + grpc_udp_server_destroy(&exec_ctx, s, nullptr); + grpc_exec_ctx_finish(&exec_ctx); /* The server had a single FD, which should have been orphaned. */ GPR_ASSERT(g_number_of_orphan_calls == 1); @@ -165,7 +168,7 @@ static void test_no_op_with_port(void) { static void test_no_op_with_port_and_socket_factory(void) { g_number_of_orphan_calls = 0; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; @@ -175,7 +178,7 @@ static void test_no_op_with_port_and_socket_factory(void) { grpc_channel_args* channel_args = grpc_channel_args_copy_and_add(nullptr, &socket_factory_arg, 1); grpc_udp_server* s = grpc_udp_server_create(channel_args); - grpc_channel_args_destroy(channel_args); + grpc_channel_args_destroy(&exec_ctx, channel_args); LOG_TEST("test_no_op_with_port_and_socket_factory"); @@ -187,8 +190,8 @@ static void test_no_op_with_port_and_socket_factory(void) { GPR_ASSERT(socket_factory->number_of_socket_calls == 1); GPR_ASSERT(socket_factory->number_of_bind_calls == 1); - grpc_udp_server_destroy(s, nullptr); - + grpc_udp_server_destroy(&exec_ctx, s, nullptr); + grpc_exec_ctx_finish(&exec_ctx); grpc_socket_factory_unref(&socket_factory->base); /* The server had a single FD, which should have been orphaned. */ @@ -197,7 +200,7 @@ static void test_no_op_with_port_and_socket_factory(void) { static void test_no_op_with_port_and_start(void) { g_number_of_orphan_calls = 0; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_udp_server* s = grpc_udp_server_create(nullptr); @@ -209,9 +212,10 @@ static void test_no_op_with_port_and_start(void) { GPR_ASSERT(grpc_udp_server_add_port(s, &resolved_addr, on_read, on_write, on_fd_orphaned)); - grpc_udp_server_start(s, nullptr, 0, nullptr); + grpc_udp_server_start(&exec_ctx, s, nullptr, 0, nullptr); - grpc_udp_server_destroy(s, nullptr); + grpc_udp_server_destroy(&exec_ctx, s, nullptr); + grpc_exec_ctx_finish(&exec_ctx); /* The server had a single FD, which is orphaned exactly once in * * grpc_udp_server_destroy. */ @@ -219,7 +223,7 @@ static void test_no_op_with_port_and_start(void) { } static void test_receive(int number_of_clients) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; struct sockaddr_storage* addr = (struct sockaddr_storage*)resolved_addr.addr; int clifd, svrfd; @@ -246,7 +250,7 @@ static void test_receive(int number_of_clients) { GPR_ASSERT(resolved_addr.len <= sizeof(struct sockaddr_storage)); pollsets[0] = g_pollset; - grpc_udp_server_start(s, pollsets, 1, nullptr); + grpc_udp_server_start(&exec_ctx, s, pollsets, 1, nullptr); gpr_mu_lock(g_mu); @@ -262,12 +266,13 @@ static void test_receive(int number_of_clients) { (socklen_t)resolved_addr.len) == 0); GPR_ASSERT(5 == write(clifd, "hello", 5)); while (g_number_of_bytes_read < (number_of_bytes_read_before + 5) && - deadline > grpc_core::ExecCtx::Get()->Now()) { + deadline > grpc_exec_ctx_now(&exec_ctx)) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); + "pollset_work", + grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); gpr_mu_lock(g_mu); } close(clifd); @@ -276,40 +281,40 @@ static void test_receive(int number_of_clients) { gpr_mu_unlock(g_mu); - grpc_udp_server_destroy(s, nullptr); + grpc_udp_server_destroy(&exec_ctx, s, nullptr); + grpc_exec_ctx_finish(&exec_ctx); /* The server had a single FD, which is orphaned exactly once in * * grpc_udp_server_destroy. */ GPR_ASSERT(g_number_of_orphan_calls == 1); } -static void destroy_pollset(void* p, grpc_error* error) { - grpc_pollset_destroy(static_cast(p)); +static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, + grpc_error* error) { + grpc_pollset_destroy(exec_ctx, static_cast(p)); } int main(int argc, char** argv) { grpc_closure destroyed; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); - { - grpc_core::ExecCtx exec_ctx; - g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); - grpc_pollset_init(g_pollset, &g_mu); - - test_no_op(); - test_no_op_with_start(); - test_no_op_with_port(); - test_no_op_with_port_and_socket_factory(); - test_no_op_with_port_and_start(); - test_receive(1); - test_receive(10); - - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(g_pollset, &destroyed); - grpc_core::ExecCtx::Get()->Flush(); - gpr_free(g_pollset); - } + g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); + grpc_pollset_init(g_pollset, &g_mu); + + test_no_op(); + test_no_op_with_start(); + test_no_op_with_port(); + test_no_op_with_port_and_socket_factory(); + test_no_op_with_port_and_start(); + test_receive(1); + test_receive(10); + + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); + grpc_exec_ctx_finish(&exec_ctx); + gpr_free(g_pollset); grpc_shutdown(); return 0; } diff --git a/test/core/nanopb/fuzzer_response.cc b/test/core/nanopb/fuzzer_response.cc index 3a70dea5e98..7039c801cb9 100644 --- a/test/core/nanopb/fuzzer_response.cc +++ b/test/core/nanopb/fuzzer_response.cc @@ -19,7 +19,6 @@ #include #include -#include #include #include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" @@ -30,7 +29,6 @@ bool leak_check = true; static void dont_log(gpr_log_func_args* args) {} extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { - grpc_init(); if (squelch) gpr_set_log_function(dont_log); grpc_slice slice = grpc_slice_from_copied_buffer((const char*)data, size); grpc_grpclb_initial_response* response; @@ -38,6 +36,5 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_grpclb_initial_response_destroy(response); } grpc_slice_unref(slice); - grpc_shutdown(); return 0; } diff --git a/test/core/nanopb/fuzzer_serverlist.cc b/test/core/nanopb/fuzzer_serverlist.cc index d0af117ef96..0a6b1767a1a 100644 --- a/test/core/nanopb/fuzzer_serverlist.cc +++ b/test/core/nanopb/fuzzer_serverlist.cc @@ -19,7 +19,6 @@ #include #include -#include #include #include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" @@ -30,7 +29,6 @@ bool leak_check = true; static void dont_log(gpr_log_func_args* args) {} extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { - grpc_init(); if (squelch) gpr_set_log_function(dont_log); grpc_slice slice = grpc_slice_from_copied_buffer((const char*)data, size); grpc_grpclb_serverlist* serverlist; @@ -38,6 +36,5 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_grpclb_destroy_serverlist(serverlist); } grpc_slice_unref(slice); - grpc_shutdown(); return 0; } diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc index ecc61928f59..64d383ad0a4 100644 --- a/test/core/security/credentials_test.cc +++ b/test/core/security/credentials_test.cc @@ -148,37 +148,41 @@ static grpc_httpcli_response http_response(int status, const char* body) { /* -- Tests. -- */ static void test_empty_md_array(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_credentials_mdelem_array md_array; memset(&md_array, 0, sizeof(md_array)); GPR_ASSERT(md_array.md == nullptr); GPR_ASSERT(md_array.size == 0); - grpc_credentials_mdelem_array_destroy(&md_array); + grpc_credentials_mdelem_array_destroy(&exec_ctx, &md_array); + grpc_exec_ctx_finish(&exec_ctx); } static void test_add_to_empty_md_array(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_credentials_mdelem_array md_array; memset(&md_array, 0, sizeof(md_array)); const char* key = "hello"; const char* value = "there blah blah blah blah blah blah blah"; - grpc_mdelem md = grpc_mdelem_from_slices( - grpc_slice_from_copied_string(key), grpc_slice_from_copied_string(value)); + grpc_mdelem md = + grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_copied_string(key), + grpc_slice_from_copied_string(value)); grpc_credentials_mdelem_array_add(&md_array, md); GPR_ASSERT(md_array.size == 1); GPR_ASSERT(grpc_mdelem_eq(md, md_array.md[0])); - GRPC_MDELEM_UNREF(md); - grpc_credentials_mdelem_array_destroy(&md_array); + GRPC_MDELEM_UNREF(&exec_ctx, md); + grpc_credentials_mdelem_array_destroy(&exec_ctx, &md_array); + grpc_exec_ctx_finish(&exec_ctx); } static void test_add_abunch_to_md_array(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_credentials_mdelem_array md_array; memset(&md_array, 0, sizeof(md_array)); const char* key = "hello"; const char* value = "there blah blah blah blah blah blah blah"; - grpc_mdelem md = grpc_mdelem_from_slices( - grpc_slice_from_copied_string(key), grpc_slice_from_copied_string(value)); + grpc_mdelem md = + grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_copied_string(key), + grpc_slice_from_copied_string(value)); size_t num_entries = 1000; for (size_t i = 0; i < num_entries; ++i) { grpc_credentials_mdelem_array_add(&md_array, md); @@ -186,52 +190,57 @@ static void test_add_abunch_to_md_array(void) { for (size_t i = 0; i < num_entries; ++i) { GPR_ASSERT(grpc_mdelem_eq(md_array.md[i], md)); } - GRPC_MDELEM_UNREF(md); - grpc_credentials_mdelem_array_destroy(&md_array); + GRPC_MDELEM_UNREF(&exec_ctx, md); + grpc_credentials_mdelem_array_destroy(&exec_ctx, &md_array); + grpc_exec_ctx_finish(&exec_ctx); } static void test_oauth2_token_fetcher_creds_parsing_ok(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = http_response(200, valid_oauth2_json_response); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_OK); + &exec_ctx, &response, &token_md, &token_lifetime) == + GRPC_CREDENTIALS_OK); GPR_ASSERT(token_lifetime == 3599 * GPR_MS_PER_SEC); GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDKEY(token_md), "authorization") == 0); GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDVALUE(token_md), "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_") == 0); - GRPC_MDELEM_UNREF(token_md); + GRPC_MDELEM_UNREF(&exec_ctx, token_md); grpc_http_response_destroy(&response); + grpc_exec_ctx_finish(&exec_ctx); } static void test_oauth2_token_fetcher_creds_parsing_bad_http_status(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = http_response(401, valid_oauth2_json_response); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &response, &token_md, &token_lifetime) == + &exec_ctx, &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); + grpc_exec_ctx_finish(&exec_ctx); } static void test_oauth2_token_fetcher_creds_parsing_empty_http_body(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = http_response(200, ""); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &response, &token_md, &token_lifetime) == + &exec_ctx, &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); + grpc_exec_ctx_finish(&exec_ctx); } static void test_oauth2_token_fetcher_creds_parsing_invalid_json(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = @@ -240,13 +249,14 @@ static void test_oauth2_token_fetcher_creds_parsing_invalid_json(void) { " \"expires_in\":3599, " " \"token_type\":\"Bearer\""); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &response, &token_md, &token_lifetime) == + &exec_ctx, &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); + grpc_exec_ctx_finish(&exec_ctx); } static void test_oauth2_token_fetcher_creds_parsing_missing_token(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = http_response(200, @@ -254,13 +264,14 @@ static void test_oauth2_token_fetcher_creds_parsing_missing_token(void) { " \"expires_in\":3599, " " \"token_type\":\"Bearer\"}"); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &response, &token_md, &token_lifetime) == + &exec_ctx, &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); + grpc_exec_ctx_finish(&exec_ctx); } static void test_oauth2_token_fetcher_creds_parsing_missing_token_type(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = @@ -269,14 +280,15 @@ static void test_oauth2_token_fetcher_creds_parsing_missing_token_type(void) { " \"expires_in\":3599, " "}"); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &response, &token_md, &token_lifetime) == + &exec_ctx, &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); + grpc_exec_ctx_finish(&exec_ctx); } static void test_oauth2_token_fetcher_creds_parsing_missing_token_lifetime( void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = @@ -284,9 +296,10 @@ static void test_oauth2_token_fetcher_creds_parsing_missing_token_lifetime( "{\"access_token\":\"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_\"," " \"token_type\":\"Bearer\"}"); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &response, &token_md, &token_lifetime) == + &exec_ctx, &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); + grpc_exec_ctx_finish(&exec_ctx); } typedef struct { @@ -323,7 +336,8 @@ static void check_metadata(const expected_md* expected, } } -static void check_request_metadata(void* arg, grpc_error* error) { +static void check_request_metadata(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { request_metadata_state* state = (request_metadata_state*)arg; gpr_log(GPR_INFO, "expected_error: %s", grpc_error_string(state->expected_error)); @@ -344,8 +358,9 @@ static void check_request_metadata(void* arg, grpc_error* error) { state->expected_size, state->md_array.size); GPR_ASSERT(state->md_array.size == state->expected_size); check_metadata(state->expected, &state->md_array); - grpc_credentials_mdelem_array_destroy(&state->md_array); - grpc_pollset_set_destroy(grpc_polling_entity_pollset_set(&state->pollent)); + grpc_credentials_mdelem_array_destroy(exec_ctx, &state->md_array); + grpc_pollset_set_destroy(exec_ctx, + grpc_polling_entity_pollset_set(&state->pollent)); gpr_free(state); } @@ -364,21 +379,22 @@ static request_metadata_state* make_request_metadata_state( return state; } -static void run_request_metadata_test(grpc_call_credentials* creds, +static void run_request_metadata_test(grpc_exec_ctx* exec_ctx, + grpc_call_credentials* creds, grpc_auth_metadata_context auth_md_ctx, request_metadata_state* state) { grpc_error* error = GRPC_ERROR_NONE; if (grpc_call_credentials_get_request_metadata( - creds, &state->pollent, auth_md_ctx, &state->md_array, + exec_ctx, creds, &state->pollent, auth_md_ctx, &state->md_array, &state->on_request_metadata, &error)) { // Synchronous result. Invoke the callback directly. - check_request_metadata(state, error); + check_request_metadata(exec_ctx, state, error); GRPC_ERROR_UNREF(error); } } static void test_google_iam_creds(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; expected_md emd[] = {{GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, test_google_iam_authorization_token}, {GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, @@ -390,12 +406,13 @@ static void test_google_iam_creds(void) { nullptr); grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, nullptr, nullptr}; - run_request_metadata_test(creds, auth_md_ctx, state); - grpc_call_credentials_unref(creds); + run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); + grpc_call_credentials_unref(&exec_ctx, creds); + grpc_exec_ctx_finish(&exec_ctx); } static void test_access_token_creds(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; expected_md emd[] = {{GRPC_AUTHORIZATION_METADATA_KEY, "Bearer blah"}}; request_metadata_state* state = make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); @@ -404,14 +421,16 @@ static void test_access_token_creds(void) { grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, nullptr, nullptr}; GPR_ASSERT(strcmp(creds->type, GRPC_CALL_CREDENTIALS_TYPE_OAUTH2) == 0); - run_request_metadata_test(creds, auth_md_ctx, state); - grpc_call_credentials_unref(creds); + run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); + grpc_call_credentials_unref(&exec_ctx, creds); + grpc_exec_ctx_finish(&exec_ctx); } static grpc_security_status check_channel_oauth2_create_security_connector( - grpc_channel_credentials* c, grpc_call_credentials* call_creds, - const char* target, const grpc_channel_args* args, - grpc_channel_security_connector** sc, grpc_channel_args** new_args) { + grpc_exec_ctx* exec_ctx, grpc_channel_credentials* c, + grpc_call_credentials* call_creds, const char* target, + const grpc_channel_args* args, grpc_channel_security_connector** sc, + grpc_channel_args** new_args) { GPR_ASSERT(strcmp(c->type, "mock") == 0); GPR_ASSERT(call_creds != nullptr); GPR_ASSERT(strcmp(call_creds->type, GRPC_CALL_CREDENTIALS_TYPE_OAUTH2) == 0); @@ -419,7 +438,7 @@ static grpc_security_status check_channel_oauth2_create_security_connector( } static void test_channel_oauth2_composite_creds(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_channel_args* new_args; grpc_channel_credentials_vtable vtable = { nullptr, check_channel_oauth2_create_security_connector, nullptr}; @@ -433,13 +452,14 @@ static void test_channel_oauth2_composite_creds(void) { grpc_channel_credentials_release(channel_creds); grpc_call_credentials_release(oauth2_creds); GPR_ASSERT(grpc_channel_credentials_create_security_connector( - channel_oauth2_creds, nullptr, nullptr, nullptr, &new_args) == - GRPC_SECURITY_OK); + &exec_ctx, channel_oauth2_creds, nullptr, nullptr, nullptr, + &new_args) == GRPC_SECURITY_OK); grpc_channel_credentials_release(channel_oauth2_creds); + grpc_exec_ctx_finish(&exec_ctx); } static void test_oauth2_google_iam_composite_creds(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; expected_md emd[] = { {GRPC_AUTHORIZATION_METADATA_KEY, test_oauth2_bearer_token}, {GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, @@ -451,15 +471,15 @@ static void test_oauth2_google_iam_composite_creds(void) { grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, nullptr, nullptr}; grpc_call_credentials* oauth2_creds = grpc_md_only_test_credentials_create( - "authorization", test_oauth2_bearer_token, 0); + &exec_ctx, "authorization", test_oauth2_bearer_token, 0); grpc_call_credentials* google_iam_creds = grpc_google_iam_credentials_create( test_google_iam_authorization_token, test_google_iam_authority_selector, nullptr); grpc_call_credentials* composite_creds = grpc_composite_call_credentials_create(oauth2_creds, google_iam_creds, nullptr); - grpc_call_credentials_unref(oauth2_creds); - grpc_call_credentials_unref(google_iam_creds); + grpc_call_credentials_unref(&exec_ctx, oauth2_creds); + grpc_call_credentials_unref(&exec_ctx, google_iam_creds); GPR_ASSERT( strcmp(composite_creds->type, GRPC_CALL_CREDENTIALS_TYPE_COMPOSITE) == 0); const grpc_call_credentials_array* creds_array = @@ -469,15 +489,17 @@ static void test_oauth2_google_iam_composite_creds(void) { GRPC_CALL_CREDENTIALS_TYPE_OAUTH2) == 0); GPR_ASSERT(strcmp(creds_array->creds_array[1]->type, GRPC_CALL_CREDENTIALS_TYPE_IAM) == 0); - run_request_metadata_test(composite_creds, auth_md_ctx, state); - grpc_call_credentials_unref(composite_creds); + run_request_metadata_test(&exec_ctx, composite_creds, auth_md_ctx, state); + grpc_call_credentials_unref(&exec_ctx, composite_creds); + grpc_exec_ctx_finish(&exec_ctx); } static grpc_security_status check_channel_oauth2_google_iam_create_security_connector( - grpc_channel_credentials* c, grpc_call_credentials* call_creds, - const char* target, const grpc_channel_args* args, - grpc_channel_security_connector** sc, grpc_channel_args** new_args) { + grpc_exec_ctx* exec_ctx, grpc_channel_credentials* c, + grpc_call_credentials* call_creds, const char* target, + const grpc_channel_args* args, grpc_channel_security_connector** sc, + grpc_channel_args** new_args) { const grpc_call_credentials_array* creds_array; GPR_ASSERT(strcmp(c->type, "mock") == 0); GPR_ASSERT(call_creds != nullptr); @@ -492,7 +514,7 @@ check_channel_oauth2_google_iam_create_security_connector( } static void test_channel_oauth2_google_iam_composite_creds(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_channel_args* new_args; grpc_channel_credentials_vtable vtable = { nullptr, check_channel_oauth2_google_iam_create_security_connector, @@ -516,10 +538,11 @@ static void test_channel_oauth2_google_iam_composite_creds(void) { grpc_call_credentials_release(google_iam_creds); GPR_ASSERT(grpc_channel_credentials_create_security_connector( - channel_oauth2_iam_creds, nullptr, nullptr, nullptr, + &exec_ctx, channel_oauth2_iam_creds, nullptr, nullptr, nullptr, &new_args) == GRPC_SECURITY_OK); grpc_channel_credentials_release(channel_oauth2_iam_creds); + grpc_exec_ctx_finish(&exec_ctx); } static void validate_compute_engine_http_request( @@ -536,32 +559,35 @@ static void validate_compute_engine_http_request( } static int compute_engine_httpcli_get_success_override( - const grpc_httpcli_request* request, grpc_millis deadline, - grpc_closure* on_done, grpc_httpcli_response* response) { + grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, + grpc_millis deadline, grpc_closure* on_done, + grpc_httpcli_response* response) { validate_compute_engine_http_request(request); *response = http_response(200, valid_oauth2_json_response); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); return 1; } static int compute_engine_httpcli_get_failure_override( - const grpc_httpcli_request* request, grpc_millis deadline, - grpc_closure* on_done, grpc_httpcli_response* response) { + grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, + grpc_millis deadline, grpc_closure* on_done, + grpc_httpcli_response* response) { validate_compute_engine_http_request(request); *response = http_response(403, "Not Authorized."); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); return 1; } static int httpcli_post_should_not_be_called( - const grpc_httpcli_request* request, const char* body_bytes, - size_t body_size, grpc_millis deadline, grpc_closure* on_done, - grpc_httpcli_response* response) { + grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, + const char* body_bytes, size_t body_size, grpc_millis deadline, + grpc_closure* on_done, grpc_httpcli_response* response) { GPR_ASSERT("HTTP POST should not be called" == nullptr); return 1; } -static int httpcli_get_should_not_be_called(const grpc_httpcli_request* request, +static int httpcli_get_should_not_be_called(grpc_exec_ctx* exec_ctx, + const grpc_httpcli_request* request, grpc_millis deadline, grpc_closure* on_done, grpc_httpcli_response* response) { @@ -570,7 +596,7 @@ static int httpcli_get_should_not_be_called(const grpc_httpcli_request* request, } static void test_compute_engine_creds_success(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; expected_md emd[] = { {"authorization", "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_"}}; grpc_call_credentials* creds = @@ -583,23 +609,24 @@ static void test_compute_engine_creds_success(void) { make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); grpc_httpcli_set_override(compute_engine_httpcli_get_success_override, httpcli_post_should_not_be_called); - run_request_metadata_test(creds, auth_md_ctx, state); - grpc_core::ExecCtx::Get()->Flush(); + run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); + grpc_exec_ctx_flush(&exec_ctx); /* Second request: the cached token should be served directly. */ state = make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); - run_request_metadata_test(creds, auth_md_ctx, state); - grpc_core::ExecCtx::Get()->Flush(); + run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); + grpc_exec_ctx_flush(&exec_ctx); - grpc_call_credentials_unref(creds); + grpc_call_credentials_unref(&exec_ctx, creds); grpc_httpcli_set_override(nullptr, nullptr); + grpc_exec_ctx_finish(&exec_ctx); } static void test_compute_engine_creds_failure(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; request_metadata_state* state = make_request_metadata_state( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Error occured when fetching oauth2 token."), @@ -610,9 +637,10 @@ static void test_compute_engine_creds_failure(void) { grpc_google_compute_engine_credentials_create(nullptr); grpc_httpcli_set_override(compute_engine_httpcli_get_failure_override, httpcli_post_should_not_be_called); - run_request_metadata_test(creds, auth_md_ctx, state); - grpc_call_credentials_unref(creds); + run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); + grpc_call_credentials_unref(&exec_ctx, creds); grpc_httpcli_set_override(nullptr, nullptr); + grpc_exec_ctx_finish(&exec_ctx); } static void validate_refresh_token_http_request( @@ -639,27 +667,27 @@ static void validate_refresh_token_http_request( } static int refresh_token_httpcli_post_success( - const grpc_httpcli_request* request, const char* body, size_t body_size, - grpc_millis deadline, grpc_closure* on_done, - grpc_httpcli_response* response) { + grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, + const char* body, size_t body_size, grpc_millis deadline, + grpc_closure* on_done, grpc_httpcli_response* response) { validate_refresh_token_http_request(request, body, body_size); *response = http_response(200, valid_oauth2_json_response); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); return 1; } static int refresh_token_httpcli_post_failure( - const grpc_httpcli_request* request, const char* body, size_t body_size, - grpc_millis deadline, grpc_closure* on_done, - grpc_httpcli_response* response) { + grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, + const char* body, size_t body_size, grpc_millis deadline, + grpc_closure* on_done, grpc_httpcli_response* response) { validate_refresh_token_http_request(request, body, body_size); *response = http_response(403, "Not Authorized."); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); return 1; } static void test_refresh_token_creds_success(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; expected_md emd[] = { {"authorization", "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_"}}; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, @@ -672,23 +700,24 @@ static void test_refresh_token_creds_success(void) { make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); grpc_httpcli_set_override(httpcli_get_should_not_be_called, refresh_token_httpcli_post_success); - run_request_metadata_test(creds, auth_md_ctx, state); - grpc_core::ExecCtx::Get()->Flush(); + run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); + grpc_exec_ctx_flush(&exec_ctx); /* Second request: the cached token should be served directly. */ state = make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); - run_request_metadata_test(creds, auth_md_ctx, state); - grpc_core::ExecCtx::Get()->Flush(); + run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); + grpc_exec_ctx_flush(&exec_ctx); - grpc_call_credentials_unref(creds); + grpc_call_credentials_unref(&exec_ctx, creds); grpc_httpcli_set_override(nullptr, nullptr); + grpc_exec_ctx_finish(&exec_ctx); } static void test_refresh_token_creds_failure(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; request_metadata_state* state = make_request_metadata_state( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Error occured when fetching oauth2 token."), @@ -699,9 +728,10 @@ static void test_refresh_token_creds_failure(void) { test_refresh_token_str, nullptr); grpc_httpcli_set_override(httpcli_get_should_not_be_called, refresh_token_httpcli_post_failure); - run_request_metadata_test(creds, auth_md_ctx, state); - grpc_call_credentials_unref(creds); + run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); + grpc_call_credentials_unref(&exec_ctx, creds); grpc_httpcli_set_override(nullptr, nullptr); + grpc_exec_ctx_finish(&exec_ctx); } static void validate_jwt_encode_and_sign_params( @@ -791,7 +821,7 @@ static void test_jwt_creds_lifetime(void) { static void test_jwt_creds_success(void) { char* json_key_string = test_json_key_str(); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, nullptr, nullptr}; char* expected_md_value; @@ -805,16 +835,16 @@ static void test_jwt_creds_success(void) { request_metadata_state* state = make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_success); - run_request_metadata_test(creds, auth_md_ctx, state); - grpc_core::ExecCtx::Get()->Flush(); + run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); + grpc_exec_ctx_flush(&exec_ctx); /* Second request: the cached token should be served directly. */ state = make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); grpc_jwt_encode_and_sign_set_override( encode_and_sign_jwt_should_not_be_called); - run_request_metadata_test(creds, auth_md_ctx, state); - grpc_core::ExecCtx::Get()->Flush(); + run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); + grpc_exec_ctx_flush(&exec_ctx); /* Third request: Different service url so jwt_encode_and_sign should be called again (no caching). */ @@ -822,18 +852,19 @@ static void test_jwt_creds_success(void) { make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); auth_md_ctx.service_url = other_test_service_url; grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_success); - run_request_metadata_test(creds, auth_md_ctx, state); - grpc_core::ExecCtx::Get()->Flush(); + run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); + grpc_exec_ctx_flush(&exec_ctx); - grpc_call_credentials_unref(creds); + grpc_call_credentials_unref(&exec_ctx, creds); gpr_free(json_key_string); gpr_free(expected_md_value); grpc_jwt_encode_and_sign_set_override(nullptr); + grpc_exec_ctx_finish(&exec_ctx); } static void test_jwt_creds_signing_failure(void) { char* json_key_string = test_json_key_str(); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, nullptr, nullptr}; request_metadata_state* state = make_request_metadata_state( @@ -844,11 +875,12 @@ static void test_jwt_creds_signing_failure(void) { json_key_string, grpc_max_auth_token_lifetime(), nullptr); grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_failure); - run_request_metadata_test(creds, auth_md_ctx, state); + run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); gpr_free(json_key_string); - grpc_call_credentials_unref(creds); + grpc_call_credentials_unref(&exec_ctx, creds); grpc_jwt_encode_and_sign_set_override(nullptr); + grpc_exec_ctx_finish(&exec_ctx); } static void set_google_default_creds_env_var_with_file_contents( @@ -865,7 +897,7 @@ static void set_google_default_creds_env_var_with_file_contents( } static void test_google_default_creds_auth_key(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_service_account_jwt_access_credentials* jwt; grpc_composite_channel_credentials* creds; char* json_key = test_json_key_str(); @@ -881,12 +913,13 @@ static void test_google_default_creds_auth_key(void) { strcmp(jwt->key.client_id, "777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent.com") == 0); - grpc_channel_credentials_unref(&creds->base); + grpc_channel_credentials_unref(&exec_ctx, &creds->base); gpr_setenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR, ""); /* Reset. */ + grpc_exec_ctx_finish(&exec_ctx); } static void test_google_default_creds_refresh_token(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_google_refresh_token_credentials* refresh; grpc_composite_channel_credentials* creds; grpc_flush_cached_google_default_credentials(); @@ -898,13 +931,15 @@ static void test_google_default_creds_refresh_token(void) { refresh = (grpc_google_refresh_token_credentials*)creds->call_creds; GPR_ASSERT(strcmp(refresh->refresh_token.client_id, "32555999999.apps.googleusercontent.com") == 0); - grpc_channel_credentials_unref(&creds->base); + grpc_channel_credentials_unref(&exec_ctx, &creds->base); gpr_setenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR, ""); /* Reset. */ + grpc_exec_ctx_finish(&exec_ctx); } static int default_creds_gce_detection_httpcli_get_success_override( - const grpc_httpcli_request* request, grpc_millis deadline, - grpc_closure* on_done, grpc_httpcli_response* response) { + grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, + grpc_millis deadline, grpc_closure* on_done, + grpc_httpcli_response* response) { *response = http_response(200, ""); grpc_http_header* headers = static_cast(gpr_malloc(sizeof(*headers) * 1)); @@ -914,14 +949,14 @@ static int default_creds_gce_detection_httpcli_get_success_override( response->hdrs = headers; GPR_ASSERT(strcmp(request->http.path, "/") == 0); GPR_ASSERT(strcmp(request->host, "metadata.google.internal") == 0); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); return 1; } static char* null_well_known_creds_path_getter(void) { return nullptr; } static void test_google_default_creds_gce(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; expected_md emd[] = { {"authorization", "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_"}}; request_metadata_state* state = @@ -946,8 +981,8 @@ static void test_google_default_creds_gce(void) { GPR_ASSERT(creds->call_creds != nullptr); grpc_httpcli_set_override(compute_engine_httpcli_get_success_override, httpcli_post_should_not_be_called); - run_request_metadata_test(creds->call_creds, auth_md_ctx, state); - grpc_core::ExecCtx::Get()->Flush(); + run_request_metadata_test(&exec_ctx, creds->call_creds, auth_md_ctx, state); + grpc_exec_ctx_flush(&exec_ctx); /* Check that we get a cached creds if we call grpc_google_default_credentials_create again. @@ -959,20 +994,22 @@ static void test_google_default_creds_gce(void) { GPR_ASSERT(cached_creds == &creds->base); /* Cleanup. */ - grpc_channel_credentials_unref(cached_creds); - grpc_channel_credentials_unref(&creds->base); + grpc_channel_credentials_unref(&exec_ctx, cached_creds); + grpc_channel_credentials_unref(&exec_ctx, &creds->base); grpc_httpcli_set_override(nullptr, nullptr); grpc_override_well_known_credentials_path_getter(nullptr); + grpc_exec_ctx_finish(&exec_ctx); } static int default_creds_gce_detection_httpcli_get_failure_override( - const grpc_httpcli_request* request, grpc_millis deadline, - grpc_closure* on_done, grpc_httpcli_response* response) { + grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, + grpc_millis deadline, grpc_closure* on_done, + grpc_httpcli_response* response) { /* No magic header. */ GPR_ASSERT(strcmp(request->http.path, "/") == 0); GPR_ASSERT(strcmp(request->host, "metadata.google.internal") == 0); *response = http_response(200, ""); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); return 1; } @@ -1056,7 +1093,7 @@ static void plugin_destroy(void* state) { static void test_metadata_plugin_success(void) { plugin_state state = PLUGIN_INITIAL_STATE; grpc_metadata_credentials_plugin plugin; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, nullptr, nullptr}; request_metadata_state* md_state = make_request_metadata_state( @@ -1069,17 +1106,17 @@ static void test_metadata_plugin_success(void) { grpc_call_credentials* creds = grpc_metadata_credentials_create_from_plugin(plugin, nullptr); GPR_ASSERT(state == PLUGIN_INITIAL_STATE); - run_request_metadata_test(creds, auth_md_ctx, md_state); + run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, md_state); GPR_ASSERT(state == PLUGIN_GET_METADATA_CALLED_STATE); - grpc_call_credentials_unref(creds); - + grpc_call_credentials_unref(&exec_ctx, creds); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(state == PLUGIN_DESTROY_CALLED_STATE); } static void test_metadata_plugin_failure(void) { plugin_state state = PLUGIN_INITIAL_STATE; grpc_metadata_credentials_plugin plugin; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, nullptr, nullptr}; char* expected_error; @@ -1097,10 +1134,10 @@ static void test_metadata_plugin_failure(void) { grpc_call_credentials* creds = grpc_metadata_credentials_create_from_plugin(plugin, nullptr); GPR_ASSERT(state == PLUGIN_INITIAL_STATE); - run_request_metadata_test(creds, auth_md_ctx, md_state); + run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, md_state); GPR_ASSERT(state == PLUGIN_GET_METADATA_CALLED_STATE); - grpc_call_credentials_unref(creds); - + grpc_call_credentials_unref(&exec_ctx, creds); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(state == PLUGIN_DESTROY_CALLED_STATE); } @@ -1121,7 +1158,7 @@ static void test_get_well_known_google_credentials_file_path(void) { } static void test_channel_creds_duplicate_without_call_creds(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_channel_credentials* channel_creds = grpc_fake_transport_security_credentials_create(); @@ -1130,21 +1167,23 @@ static void test_channel_creds_duplicate_without_call_creds(void) { grpc_channel_credentials_duplicate_without_call_credentials( channel_creds); GPR_ASSERT(dup == channel_creds); - grpc_channel_credentials_unref(dup); + grpc_channel_credentials_unref(&exec_ctx, dup); grpc_call_credentials* call_creds = grpc_access_token_credentials_create("blah", nullptr); grpc_channel_credentials* composite_creds = grpc_composite_channel_credentials_create(channel_creds, call_creds, nullptr); - grpc_call_credentials_unref(call_creds); + grpc_call_credentials_unref(&exec_ctx, call_creds); dup = grpc_channel_credentials_duplicate_without_call_credentials( composite_creds); GPR_ASSERT(dup == channel_creds); - grpc_channel_credentials_unref(dup); + grpc_channel_credentials_unref(&exec_ctx, dup); + + grpc_channel_credentials_unref(&exec_ctx, channel_creds); + grpc_channel_credentials_unref(&exec_ctx, composite_creds); - grpc_channel_credentials_unref(channel_creds); - grpc_channel_credentials_unref(composite_creds); + grpc_exec_ctx_finish(&exec_ctx); } typedef struct { diff --git a/test/core/security/json_token_test.cc b/test/core/security/json_token_test.cc index aac9cc00297..0b6ccd5e37d 100644 --- a/test/core/security/json_token_test.cc +++ b/test/core/security/json_token_test.cc @@ -207,7 +207,7 @@ static void test_parse_json_key_failure_no_private_key(void) { static grpc_json* parse_json_part_from_jwt(const char* str, size_t len, char** scratchpad) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; char* b64; char* decoded; grpc_json* json; @@ -215,7 +215,7 @@ static grpc_json* parse_json_part_from_jwt(const char* str, size_t len, b64 = static_cast(gpr_malloc(len + 1)); strncpy(b64, str, len); b64[len] = '\0'; - slice = grpc_base64_decode(b64, 1); + slice = grpc_base64_decode(&exec_ctx, b64, 1); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(slice)); decoded = static_cast(gpr_malloc(GRPC_SLICE_LENGTH(slice) + 1)); strncpy(decoded, (const char*)GRPC_SLICE_START_PTR(slice), @@ -225,7 +225,7 @@ static grpc_json* parse_json_part_from_jwt(const char* str, size_t len, gpr_free(b64); *scratchpad = decoded; grpc_slice_unref(slice); - + grpc_exec_ctx_finish(&exec_ctx); return json; } @@ -327,12 +327,12 @@ static void check_jwt_claim(grpc_json* claim, const char* expected_audience, static void check_jwt_signature(const char* b64_signature, RSA* rsa_key, const char* signed_data, size_t signed_data_size) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; EVP_MD_CTX* md_ctx = EVP_MD_CTX_create(); EVP_PKEY* key = EVP_PKEY_new(); - grpc_slice sig = grpc_base64_decode(b64_signature, 1); + grpc_slice sig = grpc_base64_decode(&exec_ctx, b64_signature, 1); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(sig)); GPR_ASSERT(GRPC_SLICE_LENGTH(sig) == 128); @@ -347,9 +347,11 @@ static void check_jwt_signature(const char* b64_signature, RSA* rsa_key, GPR_ASSERT(EVP_DigestVerifyFinal(md_ctx, GRPC_SLICE_START_PTR(sig), GRPC_SLICE_LENGTH(sig)) == 1); - grpc_slice_unref_internal(sig); + grpc_slice_unref_internal(&exec_ctx, sig); if (key != nullptr) EVP_PKEY_free(key); if (md_ctx != nullptr) EVP_MD_CTX_destroy(md_ctx); + + grpc_exec_ctx_finish(&exec_ctx); } static char* service_account_creds_jwt_encode_and_sign( @@ -483,7 +485,6 @@ static void test_parse_refresh_token_failure_no_refresh_token(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); test_parse_json_key_success(); test_parse_json_key_failure_bad_json(); test_parse_json_key_failure_no_type(); @@ -498,6 +499,5 @@ int main(int argc, char** argv) { test_parse_refresh_token_failure_no_client_id(); test_parse_refresh_token_failure_no_client_secret(); test_parse_refresh_token_failure_no_refresh_token(); - grpc_shutdown(); return 0; } diff --git a/test/core/security/jwt_verifier_test.cc b/test/core/security/jwt_verifier_test.cc index e219260b1d2..df0ebe56077 100644 --- a/test/core/security/jwt_verifier_test.cc +++ b/test/core/security/jwt_verifier_test.cc @@ -209,8 +209,8 @@ static void test_claims_success(void) { grpc_json* json = grpc_json_parse_string_with_len( (char*)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); GPR_ASSERT(json != nullptr); - grpc_core::ExecCtx exec_ctx; - claims = grpc_jwt_claims_from_json(json, s); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + claims = grpc_jwt_claims_from_json(&exec_ctx, json, s); GPR_ASSERT(claims != nullptr); GPR_ASSERT(grpc_jwt_claims_json(claims) == json); GPR_ASSERT(strcmp(grpc_jwt_claims_audience(claims), "https://foo.com") == 0); @@ -219,7 +219,8 @@ static void test_claims_success(void) { GPR_ASSERT(strcmp(grpc_jwt_claims_id(claims), "jwtuniqueid") == 0); GPR_ASSERT(grpc_jwt_claims_check(claims, "https://foo.com") == GRPC_JWT_VERIFIER_OK); - grpc_jwt_claims_destroy(claims); + grpc_jwt_claims_destroy(&exec_ctx, claims); + grpc_exec_ctx_finish(&exec_ctx); } static void test_expired_claims_failure(void) { @@ -231,8 +232,8 @@ static void test_expired_claims_failure(void) { gpr_timespec exp_exp = {120, 0, GPR_CLOCK_REALTIME}; gpr_timespec exp_nbf = {60, 0, GPR_CLOCK_REALTIME}; GPR_ASSERT(json != nullptr); - grpc_core::ExecCtx exec_ctx; - claims = grpc_jwt_claims_from_json(json, s); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + claims = grpc_jwt_claims_from_json(&exec_ctx, json, s); GPR_ASSERT(claims != nullptr); GPR_ASSERT(grpc_jwt_claims_json(claims) == json); GPR_ASSERT(strcmp(grpc_jwt_claims_audience(claims), "https://foo.com") == 0); @@ -245,15 +246,17 @@ static void test_expired_claims_failure(void) { GPR_ASSERT(grpc_jwt_claims_check(claims, "https://foo.com") == GRPC_JWT_VERIFIER_TIME_CONSTRAINT_FAILURE); - grpc_jwt_claims_destroy(claims); + grpc_jwt_claims_destroy(&exec_ctx, claims); + grpc_exec_ctx_finish(&exec_ctx); } static void test_invalid_claims_failure(void) { grpc_slice s = grpc_slice_from_copied_string(invalid_claims); grpc_json* json = grpc_json_parse_string_with_len( (char*)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); - grpc_core::ExecCtx exec_ctx; - GPR_ASSERT(grpc_jwt_claims_from_json(json, s) == nullptr); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT(grpc_jwt_claims_from_json(&exec_ctx, json, s) == nullptr); + grpc_exec_ctx_finish(&exec_ctx); } static void test_bad_audience_claims_failure(void) { @@ -262,12 +265,13 @@ static void test_bad_audience_claims_failure(void) { grpc_json* json = grpc_json_parse_string_with_len( (char*)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); GPR_ASSERT(json != nullptr); - grpc_core::ExecCtx exec_ctx; - claims = grpc_jwt_claims_from_json(json, s); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + claims = grpc_jwt_claims_from_json(&exec_ctx, json, s); GPR_ASSERT(claims != nullptr); GPR_ASSERT(grpc_jwt_claims_check(claims, "https://bar.com") == GRPC_JWT_VERIFIER_BAD_AUDIENCE); - grpc_jwt_claims_destroy(claims); + grpc_jwt_claims_destroy(&exec_ctx, claims); + grpc_exec_ctx_finish(&exec_ctx); } static void test_bad_subject_claims_failure(void) { @@ -276,12 +280,13 @@ static void test_bad_subject_claims_failure(void) { grpc_json* json = grpc_json_parse_string_with_len( (char*)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); GPR_ASSERT(json != nullptr); - grpc_core::ExecCtx exec_ctx; - claims = grpc_jwt_claims_from_json(json, s); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + claims = grpc_jwt_claims_from_json(&exec_ctx, json, s); GPR_ASSERT(claims != nullptr); GPR_ASSERT(grpc_jwt_claims_check(claims, "https://foo.com") == GRPC_JWT_VERIFIER_BAD_SUBJECT); - grpc_jwt_claims_destroy(claims); + grpc_jwt_claims_destroy(&exec_ctx, claims); + grpc_exec_ctx_finish(&exec_ctx); } static char* json_key_str(const char* last_part) { @@ -318,16 +323,17 @@ static grpc_httpcli_response http_response(int status, char* body) { } static int httpcli_post_should_not_be_called( - const grpc_httpcli_request* request, const char* body_bytes, - size_t body_size, grpc_millis deadline, grpc_closure* on_done, - grpc_httpcli_response* response) { + grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, + const char* body_bytes, size_t body_size, grpc_millis deadline, + grpc_closure* on_done, grpc_httpcli_response* response) { GPR_ASSERT("HTTP POST should not be called" == nullptr); return 1; } static int httpcli_get_google_keys_for_email( - const grpc_httpcli_request* request, grpc_millis deadline, - grpc_closure* on_done, grpc_httpcli_response* response) { + grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, + grpc_millis deadline, grpc_closure* on_done, + grpc_httpcli_response* response) { *response = http_response(200, good_google_email_keys()); GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); GPR_ASSERT(strcmp(request->host, "www.googleapis.com") == 0); @@ -335,22 +341,22 @@ static int httpcli_get_google_keys_for_email( "/robot/v1/metadata/x509/" "777-abaslkan11hlb6nmim3bpspl31ud@developer." "gserviceaccount.com") == 0); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); return 1; } -static void on_verification_success(void* user_data, +static void on_verification_success(grpc_exec_ctx* exec_ctx, void* user_data, grpc_jwt_verifier_status status, grpc_jwt_claims* claims) { GPR_ASSERT(status == GRPC_JWT_VERIFIER_OK); GPR_ASSERT(claims != nullptr); GPR_ASSERT(user_data == (void*)expected_user_data); GPR_ASSERT(strcmp(grpc_jwt_claims_audience(claims), expected_audience) == 0); - grpc_jwt_claims_destroy(claims); + grpc_jwt_claims_destroy(exec_ctx, claims); } static void test_jwt_verifier_google_email_issuer_success(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(nullptr, 0); char* jwt = nullptr; char* key_str = json_key_str(json_key_str_part3_for_google_email_issuer); @@ -363,27 +369,28 @@ static void test_jwt_verifier_google_email_issuer_success(void) { nullptr); grpc_auth_json_key_destruct(&key); GPR_ASSERT(jwt != nullptr); - grpc_jwt_verifier_verify(verifier, nullptr, jwt, expected_audience, + grpc_jwt_verifier_verify(&exec_ctx, verifier, nullptr, jwt, expected_audience, on_verification_success, (void*)expected_user_data); - grpc_jwt_verifier_destroy(verifier); - grpc_core::ExecCtx::Get()->Flush(); + grpc_jwt_verifier_destroy(&exec_ctx, verifier); + grpc_exec_ctx_finish(&exec_ctx); gpr_free(jwt); grpc_httpcli_set_override(nullptr, nullptr); } static int httpcli_get_custom_keys_for_email( - const grpc_httpcli_request* request, grpc_millis deadline, - grpc_closure* on_done, grpc_httpcli_response* response) { + grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, + grpc_millis deadline, grpc_closure* on_done, + grpc_httpcli_response* response) { *response = http_response(200, gpr_strdup(good_jwk_set)); GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); GPR_ASSERT(strcmp(request->host, "keys.bar.com") == 0); GPR_ASSERT(strcmp(request->http.path, "/jwk/foo@bar.com") == 0); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); return 1; } static void test_jwt_verifier_custom_email_issuer_success(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(&custom_mapping, 1); char* jwt = nullptr; char* key_str = json_key_str(json_key_str_part3_for_custom_email_issuer); @@ -396,26 +403,28 @@ static void test_jwt_verifier_custom_email_issuer_success(void) { nullptr); grpc_auth_json_key_destruct(&key); GPR_ASSERT(jwt != nullptr); - grpc_jwt_verifier_verify(verifier, nullptr, jwt, expected_audience, + grpc_jwt_verifier_verify(&exec_ctx, verifier, nullptr, jwt, expected_audience, on_verification_success, (void*)expected_user_data); - grpc_jwt_verifier_destroy(verifier); - grpc_core::ExecCtx::Get()->Flush(); + grpc_jwt_verifier_destroy(&exec_ctx, verifier); + grpc_exec_ctx_finish(&exec_ctx); gpr_free(jwt); grpc_httpcli_set_override(nullptr, nullptr); } -static int httpcli_get_jwk_set(const grpc_httpcli_request* request, +static int httpcli_get_jwk_set(grpc_exec_ctx* exec_ctx, + const grpc_httpcli_request* request, grpc_millis deadline, grpc_closure* on_done, grpc_httpcli_response* response) { *response = http_response(200, gpr_strdup(good_jwk_set)); GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); GPR_ASSERT(strcmp(request->host, "www.googleapis.com") == 0); GPR_ASSERT(strcmp(request->http.path, "/oauth2/v3/certs") == 0); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); return 1; } -static int httpcli_get_openid_config(const grpc_httpcli_request* request, +static int httpcli_get_openid_config(grpc_exec_ctx* exec_ctx, + const grpc_httpcli_request* request, grpc_millis deadline, grpc_closure* on_done, grpc_httpcli_response* response) { @@ -425,12 +434,12 @@ static int httpcli_get_openid_config(const grpc_httpcli_request* request, GPR_ASSERT(strcmp(request->http.path, GRPC_OPENID_CONFIG_URL_SUFFIX) == 0); grpc_httpcli_set_override(httpcli_get_jwk_set, httpcli_post_should_not_be_called); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); return 1; } static void test_jwt_verifier_url_issuer_success(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(nullptr, 0); char* jwt = nullptr; char* key_str = json_key_str(json_key_str_part3_for_url_issuer); @@ -443,15 +452,16 @@ static void test_jwt_verifier_url_issuer_success(void) { nullptr); grpc_auth_json_key_destruct(&key); GPR_ASSERT(jwt != nullptr); - grpc_jwt_verifier_verify(verifier, nullptr, jwt, expected_audience, + grpc_jwt_verifier_verify(&exec_ctx, verifier, nullptr, jwt, expected_audience, on_verification_success, (void*)expected_user_data); - grpc_jwt_verifier_destroy(verifier); - grpc_core::ExecCtx::Get()->Flush(); + grpc_jwt_verifier_destroy(&exec_ctx, verifier); + grpc_exec_ctx_finish(&exec_ctx); gpr_free(jwt); grpc_httpcli_set_override(nullptr, nullptr); } -static void on_verification_key_retrieval_error(void* user_data, +static void on_verification_key_retrieval_error(grpc_exec_ctx* exec_ctx, + void* user_data, grpc_jwt_verifier_status status, grpc_jwt_claims* claims) { GPR_ASSERT(status == GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR); @@ -459,17 +469,18 @@ static void on_verification_key_retrieval_error(void* user_data, GPR_ASSERT(user_data == (void*)expected_user_data); } -static int httpcli_get_bad_json(const grpc_httpcli_request* request, +static int httpcli_get_bad_json(grpc_exec_ctx* exec_ctx, + const grpc_httpcli_request* request, grpc_millis deadline, grpc_closure* on_done, grpc_httpcli_response* response) { *response = http_response(200, gpr_strdup("{\"bad\": \"stuff\"}")); GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); return 1; } static void test_jwt_verifier_url_issuer_bad_config(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(nullptr, 0); char* jwt = nullptr; char* key_str = json_key_str(json_key_str_part3_for_url_issuer); @@ -482,17 +493,17 @@ static void test_jwt_verifier_url_issuer_bad_config(void) { nullptr); grpc_auth_json_key_destruct(&key); GPR_ASSERT(jwt != nullptr); - grpc_jwt_verifier_verify(verifier, nullptr, jwt, expected_audience, + grpc_jwt_verifier_verify(&exec_ctx, verifier, nullptr, jwt, expected_audience, on_verification_key_retrieval_error, (void*)expected_user_data); - grpc_jwt_verifier_destroy(verifier); - grpc_core::ExecCtx::Get()->Flush(); + grpc_jwt_verifier_destroy(&exec_ctx, verifier); + grpc_exec_ctx_finish(&exec_ctx); gpr_free(jwt); grpc_httpcli_set_override(nullptr, nullptr); } static void test_jwt_verifier_bad_json_key(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(nullptr, 0); char* jwt = nullptr; char* key_str = json_key_str(json_key_str_part3_for_google_email_issuer); @@ -505,11 +516,11 @@ static void test_jwt_verifier_bad_json_key(void) { nullptr); grpc_auth_json_key_destruct(&key); GPR_ASSERT(jwt != nullptr); - grpc_jwt_verifier_verify(verifier, nullptr, jwt, expected_audience, + grpc_jwt_verifier_verify(&exec_ctx, verifier, nullptr, jwt, expected_audience, on_verification_key_retrieval_error, (void*)expected_user_data); - grpc_jwt_verifier_destroy(verifier); - grpc_core::ExecCtx::Get()->Flush(); + grpc_jwt_verifier_destroy(&exec_ctx, verifier); + grpc_exec_ctx_finish(&exec_ctx); gpr_free(jwt); grpc_httpcli_set_override(nullptr, nullptr); } @@ -521,8 +532,9 @@ static void corrupt_jwt_sig(char* jwt) { char* last_dot = strrchr(jwt, '.'); GPR_ASSERT(last_dot != nullptr); { - grpc_core::ExecCtx exec_ctx; - sig = grpc_base64_decode(last_dot + 1, 1); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + sig = grpc_base64_decode(&exec_ctx, last_dot + 1, 1); + grpc_exec_ctx_finish(&exec_ctx); } GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(sig)); sig_bytes = GRPC_SLICE_START_PTR(sig); @@ -534,7 +546,8 @@ static void corrupt_jwt_sig(char* jwt) { grpc_slice_unref(sig); } -static void on_verification_bad_signature(void* user_data, +static void on_verification_bad_signature(grpc_exec_ctx* exec_ctx, + void* user_data, grpc_jwt_verifier_status status, grpc_jwt_claims* claims) { GPR_ASSERT(status == GRPC_JWT_VERIFIER_BAD_SIGNATURE); @@ -543,7 +556,7 @@ static void on_verification_bad_signature(void* user_data, } static void test_jwt_verifier_bad_signature(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(nullptr, 0); char* jwt = nullptr; char* key_str = json_key_str(json_key_str_part3_for_url_issuer); @@ -557,16 +570,17 @@ static void test_jwt_verifier_bad_signature(void) { grpc_auth_json_key_destruct(&key); corrupt_jwt_sig(jwt); GPR_ASSERT(jwt != nullptr); - grpc_jwt_verifier_verify(verifier, nullptr, jwt, expected_audience, + grpc_jwt_verifier_verify(&exec_ctx, verifier, nullptr, jwt, expected_audience, on_verification_bad_signature, (void*)expected_user_data); gpr_free(jwt); - grpc_jwt_verifier_destroy(verifier); - grpc_core::ExecCtx::Get()->Flush(); + grpc_jwt_verifier_destroy(&exec_ctx, verifier); + grpc_exec_ctx_finish(&exec_ctx); grpc_httpcli_set_override(nullptr, nullptr); } -static int httpcli_get_should_not_be_called(const grpc_httpcli_request* request, +static int httpcli_get_should_not_be_called(grpc_exec_ctx* exec_ctx, + const grpc_httpcli_request* request, grpc_millis deadline, grpc_closure* on_done, grpc_httpcli_response* response) { @@ -574,7 +588,7 @@ static int httpcli_get_should_not_be_called(const grpc_httpcli_request* request, return 1; } -static void on_verification_bad_format(void* user_data, +static void on_verification_bad_format(grpc_exec_ctx* exec_ctx, void* user_data, grpc_jwt_verifier_status status, grpc_jwt_claims* claims) { GPR_ASSERT(status == GRPC_JWT_VERIFIER_BAD_FORMAT); @@ -583,15 +597,15 @@ static void on_verification_bad_format(void* user_data, } static void test_jwt_verifier_bad_format(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(nullptr, 0); grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); - grpc_jwt_verifier_verify(verifier, nullptr, "bad jwt", expected_audience, - on_verification_bad_format, + grpc_jwt_verifier_verify(&exec_ctx, verifier, nullptr, "bad jwt", + expected_audience, on_verification_bad_format, (void*)expected_user_data); - grpc_jwt_verifier_destroy(verifier); - grpc_core::ExecCtx::Get()->Flush(); + grpc_jwt_verifier_destroy(&exec_ctx, verifier); + grpc_exec_ctx_finish(&exec_ctx); grpc_httpcli_set_override(nullptr, nullptr); } diff --git a/test/core/security/oauth2_utils.cc b/test/core/security/oauth2_utils.cc index 0d3a1279af3..602041eecc3 100644 --- a/test/core/security/oauth2_utils.cc +++ b/test/core/security/oauth2_utils.cc @@ -39,7 +39,8 @@ typedef struct { grpc_closure closure; } oauth2_request; -static void on_oauth2_response(void* arg, grpc_error* error) { +static void on_oauth2_response(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { oauth2_request* request = (oauth2_request*)arg; char* token = nullptr; grpc_slice token_slice; @@ -53,23 +54,25 @@ static void on_oauth2_response(void* arg, grpc_error* error) { GRPC_SLICE_LENGTH(token_slice)); token[GRPC_SLICE_LENGTH(token_slice)] = '\0'; } - grpc_credentials_mdelem_array_destroy(&request->md_array); + grpc_credentials_mdelem_array_destroy(exec_ctx, &request->md_array); gpr_mu_lock(request->mu); request->is_done = true; request->token = token; GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(grpc_polling_entity_pollset(&request->pops), nullptr)); + grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&request->pops), + nullptr)); gpr_mu_unlock(request->mu); } -static void do_nothing(void* unused, grpc_error* error) {} +static void do_nothing(grpc_exec_ctx* exec_ctx, void* unused, + grpc_error* error) {} char* grpc_test_fetch_oauth2_token_with_credentials( grpc_call_credentials* creds) { oauth2_request request; memset(&request, 0, sizeof(request)); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_closure do_nothing_closure; grpc_auth_metadata_context null_ctx = {"", "", nullptr, nullptr}; @@ -85,30 +88,31 @@ char* grpc_test_fetch_oauth2_token_with_credentials( grpc_schedule_on_exec_ctx); grpc_error* error = GRPC_ERROR_NONE; - if (grpc_call_credentials_get_request_metadata(creds, &request.pops, null_ctx, - &request.md_array, - &request.closure, &error)) { + if (grpc_call_credentials_get_request_metadata( + &exec_ctx, creds, &request.pops, null_ctx, &request.md_array, + &request.closure, &error)) { // Synchronous result; invoke callback directly. - on_oauth2_response(&request, error); + on_oauth2_response(&exec_ctx, &request, error); GRPC_ERROR_UNREF(error); } - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); gpr_mu_lock(request.mu); while (!request.is_done) { grpc_pollset_worker* worker = nullptr; if (!GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(grpc_polling_entity_pollset(&request.pops), + grpc_pollset_work(&exec_ctx, + grpc_polling_entity_pollset(&request.pops), &worker, GRPC_MILLIS_INF_FUTURE))) { request.is_done = true; } } gpr_mu_unlock(request.mu); - grpc_pollset_shutdown(grpc_polling_entity_pollset(&request.pops), + grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&request.pops), &do_nothing_closure); - + grpc_exec_ctx_finish(&exec_ctx); gpr_free(grpc_polling_entity_pollset(&request.pops)); return request.token; } diff --git a/test/core/security/print_google_default_creds_token.cc b/test/core/security/print_google_default_creds_token.cc index b3742f58a89..f4acf023bd0 100644 --- a/test/core/security/print_google_default_creds_token.cc +++ b/test/core/security/print_google_default_creds_token.cc @@ -41,7 +41,8 @@ typedef struct { grpc_closure on_request_metadata; } synchronizer; -static void on_metadata_response(void* arg, grpc_error* error) { +static void on_metadata_response(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { synchronizer* sync = static_cast(arg); if (error != GRPC_ERROR_NONE) { fprintf(stderr, "Fetching token failed: %s\n", grpc_error_string(error)); @@ -56,13 +57,14 @@ static void on_metadata_response(void* arg, grpc_error* error) { sync->is_done = true; GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(grpc_polling_entity_pollset(&sync->pops), nullptr)); + grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&sync->pops), + nullptr)); gpr_mu_unlock(sync->mu); } int main(int argc, char** argv) { int result = 0; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; synchronizer sync; grpc_channel_credentials* creds = nullptr; const char* service_url = "https://test.foo.google.com/Foo"; @@ -95,10 +97,11 @@ int main(int argc, char** argv) { error = GRPC_ERROR_NONE; if (grpc_call_credentials_get_request_metadata( - ((grpc_composite_channel_credentials*)creds)->call_creds, &sync.pops, - context, &sync.md_array, &sync.on_request_metadata, &error)) { + &exec_ctx, ((grpc_composite_channel_credentials*)creds)->call_creds, + &sync.pops, context, &sync.md_array, &sync.on_request_metadata, + &error)) { // Synchronous response. Invoke callback directly. - on_metadata_response(&sync, error); + on_metadata_response(&exec_ctx, &sync, error); GRPC_ERROR_UNREF(error); } @@ -107,15 +110,18 @@ int main(int argc, char** argv) { grpc_pollset_worker* worker = nullptr; if (!GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(grpc_polling_entity_pollset(&sync.pops), &worker, + grpc_pollset_work(&exec_ctx, + grpc_polling_entity_pollset(&sync.pops), &worker, GRPC_MILLIS_INF_FUTURE))) sync.is_done = true; gpr_mu_unlock(sync.mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); gpr_mu_lock(sync.mu); } gpr_mu_unlock(sync.mu); + grpc_exec_ctx_finish(&exec_ctx); + grpc_channel_credentials_release(creds); gpr_free(grpc_polling_entity_pollset(&sync.pops)); diff --git a/test/core/security/secure_endpoint_test.cc b/test/core/security/secure_endpoint_test.cc index 38c78fed423..a12af024798 100644 --- a/test/core/security/secure_endpoint_test.cc +++ b/test/core/security/secure_endpoint_test.cc @@ -38,7 +38,7 @@ static grpc_pollset* g_pollset; static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( size_t slice_size, grpc_slice* leftover_slices, size_t leftover_nslices, bool use_zero_copy_protector) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; tsi_frame_protector* fake_read_protector = tsi_create_fake_frame_protector(nullptr); tsi_frame_protector* fake_write_protector = @@ -60,8 +60,8 @@ static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( a[0].value.integer = (int)slice_size; grpc_channel_args args = {GPR_ARRAY_SIZE(a), a}; tcp = grpc_iomgr_create_endpoint_pair("fixture", &args); - grpc_endpoint_add_to_pollset(tcp.client, g_pollset); - grpc_endpoint_add_to_pollset(tcp.server, g_pollset); + grpc_endpoint_add_to_pollset(&exec_ctx, tcp.client, g_pollset); + grpc_endpoint_add_to_pollset(&exec_ctx, tcp.server, g_pollset); if (leftover_nslices == 0) { f.client_ep = grpc_secure_endpoint_create(fake_read_protector, @@ -117,7 +117,7 @@ static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( f.server_ep = grpc_secure_endpoint_create(fake_write_protector, fake_write_zero_copy_protector, tcp.server, nullptr, 0); - + grpc_exec_ctx_finish(&exec_ctx); return f; } @@ -165,62 +165,65 @@ static grpc_endpoint_test_config configs[] = { clean_up}, }; -static void inc_call_ctr(void* arg, grpc_error* error) { ++*(int*)arg; } +static void inc_call_ctr(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { + ++*(int*)arg; +} static void test_leftover(grpc_endpoint_test_config config, size_t slice_size) { grpc_endpoint_test_fixture f = config.create_fixture(slice_size); grpc_slice_buffer incoming; grpc_slice s = grpc_slice_from_copied_string("hello world 12345678900987654321"); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; int n = 0; grpc_closure done_closure; gpr_log(GPR_INFO, "Start test left over"); grpc_slice_buffer_init(&incoming); GRPC_CLOSURE_INIT(&done_closure, inc_call_ctr, &n, grpc_schedule_on_exec_ctx); - grpc_endpoint_read(f.client_ep, &incoming, &done_closure); - - grpc_core::ExecCtx::Get()->Flush(); + grpc_endpoint_read(&exec_ctx, f.client_ep, &incoming, &done_closure); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(n == 1); GPR_ASSERT(incoming.count == 1); GPR_ASSERT(grpc_slice_eq(s, incoming.slices[0])); grpc_endpoint_shutdown( - f.client_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("test_leftover end")); + &exec_ctx, f.client_ep, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("test_leftover end")); grpc_endpoint_shutdown( - f.server_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("test_leftover end")); - grpc_endpoint_destroy(f.client_ep); - grpc_endpoint_destroy(f.server_ep); - - grpc_slice_unref_internal(s); - grpc_slice_buffer_destroy_internal(&incoming); + &exec_ctx, f.server_ep, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("test_leftover end")); + grpc_endpoint_destroy(&exec_ctx, f.client_ep); + grpc_endpoint_destroy(&exec_ctx, f.server_ep); + grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref_internal(&exec_ctx, s); + grpc_slice_buffer_destroy_internal(&exec_ctx, &incoming); clean_up(); } -static void destroy_pollset(void* p, grpc_error* error) { - grpc_pollset_destroy((grpc_pollset*)p); +static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, + grpc_error* error) { + grpc_pollset_destroy(exec_ctx, (grpc_pollset*)p); } int main(int argc, char** argv) { grpc_closure destroyed; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); - grpc_init(); - - { - grpc_core::ExecCtx exec_ctx; - g_pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); - grpc_pollset_init(g_pollset, &g_mu); - grpc_endpoint_tests(configs[0], g_pollset, g_mu); - grpc_endpoint_tests(configs[1], g_pollset, g_mu); - test_leftover(configs[2], 1); - test_leftover(configs[3], 1); - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(g_pollset, &destroyed); - } + grpc_init(); + g_pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); + grpc_pollset_init(g_pollset, &g_mu); + grpc_endpoint_tests(configs[0], g_pollset, g_mu); + grpc_endpoint_tests(configs[1], g_pollset, g_mu); + test_leftover(configs[2], 1); + test_leftover(configs[3], 1); + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); gpr_free(g_pollset); diff --git a/test/core/security/ssl_server_fuzzer.cc b/test/core/security/ssl_server_fuzzer.cc index 6e306985623..d83ebb18d21 100644 --- a/test/core/security/ssl_server_fuzzer.cc +++ b/test/core/security/ssl_server_fuzzer.cc @@ -40,7 +40,8 @@ struct handshake_state { bool done_callback_called; }; -static void on_handshake_done(void* arg, grpc_error* error) { +static void on_handshake_done(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_handshaker_args* args = static_cast(arg); struct handshake_state* state = static_cast(args->user_data); @@ -55,70 +56,67 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (squelch) gpr_set_log_function(dont_log); if (leak_check) grpc_memory_counters_init(); grpc_init(); - { - grpc_core::ExecCtx exec_ctx; - - grpc_resource_quota* resource_quota = - grpc_resource_quota_create("ssl_server_fuzzer"); - grpc_endpoint* mock_endpoint = - grpc_mock_endpoint_create(discard_write, resource_quota); - grpc_resource_quota_unref_internal(resource_quota); - - grpc_mock_endpoint_put_read( - mock_endpoint, grpc_slice_from_copied_buffer((const char*)data, size)); - - // Load key pair and establish server SSL credentials. - grpc_ssl_pem_key_cert_pair pem_key_cert_pair; - grpc_slice ca_slice, cert_slice, key_slice; - ca_slice = grpc_slice_from_static_string(test_root_cert); - cert_slice = grpc_slice_from_static_string(test_server1_cert); - key_slice = grpc_slice_from_static_string(test_server1_key); - const char* ca_cert = (const char*)GRPC_SLICE_START_PTR(ca_slice); - pem_key_cert_pair.private_key = - (const char*)GRPC_SLICE_START_PTR(key_slice); - pem_key_cert_pair.cert_chain = - (const char*)GRPC_SLICE_START_PTR(cert_slice); - grpc_server_credentials* creds = grpc_ssl_server_credentials_create( - ca_cert, &pem_key_cert_pair, 1, 0, nullptr); - - // Create security connector - grpc_server_security_connector* sc = nullptr; - grpc_security_status status = - grpc_server_credentials_create_security_connector(creds, &sc); - GPR_ASSERT(status == GRPC_SECURITY_OK); - grpc_millis deadline = GPR_MS_PER_SEC + grpc_core::ExecCtx::Get()->Now(); - - struct handshake_state state; - state.done_callback_called = false; - grpc_handshake_manager* handshake_mgr = grpc_handshake_manager_create(); - grpc_server_security_connector_add_handshakers(sc, handshake_mgr); - grpc_handshake_manager_do_handshake( - handshake_mgr, nullptr /* interested_parties */, mock_endpoint, - nullptr /* channel_args */, deadline, nullptr /* acceptor */, - on_handshake_done, &state); - grpc_core::ExecCtx::Get()->Flush(); - - // If the given string happens to be part of the correct client hello, the - // server will wait for more data. Explicitly fail the server by shutting - // down the endpoint. - if (!state.done_callback_called) { - grpc_endpoint_shutdown( - mock_endpoint, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Explicit close")); - grpc_core::ExecCtx::Get()->Flush(); - } - - GPR_ASSERT(state.done_callback_called); - - grpc_handshake_manager_destroy(handshake_mgr); - GRPC_SECURITY_CONNECTOR_UNREF(&sc->base, "test"); - grpc_server_credentials_release(creds); - grpc_slice_unref(cert_slice); - grpc_slice_unref(key_slice); - grpc_slice_unref(ca_slice); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + + grpc_resource_quota* resource_quota = + grpc_resource_quota_create("ssl_server_fuzzer"); + grpc_endpoint* mock_endpoint = + grpc_mock_endpoint_create(discard_write, resource_quota); + grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); + + grpc_mock_endpoint_put_read( + &exec_ctx, mock_endpoint, + grpc_slice_from_copied_buffer((const char*)data, size)); + + // Load key pair and establish server SSL credentials. + grpc_ssl_pem_key_cert_pair pem_key_cert_pair; + grpc_slice ca_slice, cert_slice, key_slice; + ca_slice = grpc_slice_from_static_string(test_root_cert); + cert_slice = grpc_slice_from_static_string(test_server1_cert); + key_slice = grpc_slice_from_static_string(test_server1_key); + const char* ca_cert = (const char*)GRPC_SLICE_START_PTR(ca_slice); + pem_key_cert_pair.private_key = (const char*)GRPC_SLICE_START_PTR(key_slice); + pem_key_cert_pair.cert_chain = (const char*)GRPC_SLICE_START_PTR(cert_slice); + grpc_server_credentials* creds = grpc_ssl_server_credentials_create( + ca_cert, &pem_key_cert_pair, 1, 0, nullptr); + + // Create security connector + grpc_server_security_connector* sc = nullptr; + grpc_security_status status = + grpc_server_credentials_create_security_connector(&exec_ctx, creds, &sc); + GPR_ASSERT(status == GRPC_SECURITY_OK); + grpc_millis deadline = GPR_MS_PER_SEC + grpc_exec_ctx_now(&exec_ctx); + + struct handshake_state state; + state.done_callback_called = false; + grpc_handshake_manager* handshake_mgr = grpc_handshake_manager_create(); + grpc_server_security_connector_add_handshakers(&exec_ctx, sc, handshake_mgr); + grpc_handshake_manager_do_handshake( + &exec_ctx, handshake_mgr, nullptr /* interested_parties */, mock_endpoint, + nullptr /* channel_args */, deadline, nullptr /* acceptor */, + on_handshake_done, &state); + grpc_exec_ctx_flush(&exec_ctx); + + // If the given string happens to be part of the correct client hello, the + // server will wait for more data. Explicitly fail the server by shutting down + // the endpoint. + if (!state.done_callback_called) { + grpc_endpoint_shutdown( + &exec_ctx, mock_endpoint, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Explicit close")); + grpc_exec_ctx_flush(&exec_ctx); } + GPR_ASSERT(state.done_callback_called); + + grpc_handshake_manager_destroy(&exec_ctx, handshake_mgr); + GRPC_SECURITY_CONNECTOR_UNREF(&exec_ctx, &sc->base, "test"); + grpc_server_credentials_release(creds); + grpc_slice_unref(cert_slice); + grpc_slice_unref(key_slice); + grpc_slice_unref(ca_slice); + grpc_exec_ctx_flush(&exec_ctx); + grpc_shutdown(); if (leak_check) { counters = grpc_memory_counters_snapshot(); diff --git a/test/core/security/verify_jwt.cc b/test/core/security/verify_jwt.cc index e039970c671..787d58bc377 100644 --- a/test/core/security/verify_jwt.cc +++ b/test/core/security/verify_jwt.cc @@ -44,7 +44,7 @@ static void print_usage_and_exit(gpr_cmdline* cl, const char* argv0) { exit(1); } -static void on_jwt_verification_done(void* user_data, +static void on_jwt_verification_done(grpc_exec_ctx* exec_ctx, void* user_data, grpc_jwt_verifier_status status, grpc_jwt_claims* claims) { synchronizer* sync = static_cast(user_data); @@ -57,7 +57,7 @@ static void on_jwt_verification_done(void* user_data, grpc_json_dump_to_string((grpc_json*)grpc_jwt_claims_json(claims), 2); printf("Claims: \n\n%s\n", claims_str); gpr_free(claims_str); - grpc_jwt_claims_destroy(claims); + grpc_jwt_claims_destroy(exec_ctx, claims); } else { GPR_ASSERT(claims == nullptr); fprintf(stderr, "Verification failed with error %s\n", @@ -66,7 +66,8 @@ static void on_jwt_verification_done(void* user_data, gpr_mu_lock(sync->mu); sync->is_done = 1; - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(sync->pollset, nullptr)); + GRPC_LOG_IF_ERROR("pollset_kick", + grpc_pollset_kick(exec_ctx, sync->pollset, nullptr)); gpr_mu_unlock(sync->mu); } @@ -76,7 +77,7 @@ int main(int argc, char** argv) { gpr_cmdline* cl; const char* jwt = nullptr; const char* aud = nullptr; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_init(); cl = gpr_cmdline_create("JWT verifier tool"); @@ -95,26 +96,26 @@ int main(int argc, char** argv) { grpc_pollset_init(sync.pollset, &sync.mu); sync.is_done = 0; - grpc_jwt_verifier_verify(verifier, sync.pollset, jwt, aud, + grpc_jwt_verifier_verify(&exec_ctx, verifier, sync.pollset, jwt, aud, on_jwt_verification_done, &sync); gpr_mu_lock(sync.mu); while (!sync.is_done) { grpc_pollset_worker* worker = nullptr; - if (!GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(sync.pollset, &worker, GRPC_MILLIS_INF_FUTURE))) + if (!GRPC_LOG_IF_ERROR("pollset_work", + grpc_pollset_work(&exec_ctx, sync.pollset, &worker, + GRPC_MILLIS_INF_FUTURE))) sync.is_done = true; gpr_mu_unlock(sync.mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); gpr_mu_lock(sync.mu); } gpr_mu_unlock(sync.mu); gpr_free(sync.pollset); - grpc_jwt_verifier_destroy(verifier); - + grpc_jwt_verifier_destroy(&exec_ctx, verifier); + grpc_exec_ctx_finish(&exec_ctx); gpr_cmdline_destroy(cl); grpc_shutdown(); return !sync.success; diff --git a/test/core/slice/b64_test.cc b/test/core/slice/b64_test.cc index 94785fd1e28..479198f9f9e 100644 --- a/test/core/slice/b64_test.cc +++ b/test/core/slice/b64_test.cc @@ -20,7 +20,6 @@ #include -#include #include #include #include @@ -45,14 +44,14 @@ static void test_simple_encode_decode_b64(int url_safe, int multiline) { const char* hello = "hello"; char* hello_b64 = grpc_base64_encode(hello, strlen(hello), url_safe, multiline); - grpc_core::ExecCtx exec_ctx; - grpc_slice hello_slice = grpc_base64_decode(hello_b64, url_safe); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice hello_slice = grpc_base64_decode(&exec_ctx, hello_b64, url_safe); GPR_ASSERT(GRPC_SLICE_LENGTH(hello_slice) == strlen(hello)); GPR_ASSERT(strncmp((const char*)GRPC_SLICE_START_PTR(hello_slice), hello, GRPC_SLICE_LENGTH(hello_slice)) == 0); - grpc_slice_unref_internal(hello_slice); - + grpc_slice_unref_internal(&exec_ctx, hello_slice); + grpc_exec_ctx_finish(&exec_ctx); gpr_free(hello_b64); } @@ -65,14 +64,15 @@ static void test_full_range_encode_decode_b64(int url_safe, int multiline) { /* Try all the different paddings. */ for (i = 0; i < 3; i++) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; b64 = grpc_base64_encode(orig, sizeof(orig) - i, url_safe, multiline); - orig_decoded = grpc_base64_decode(b64, url_safe); + orig_decoded = grpc_base64_decode(&exec_ctx, b64, url_safe); GPR_ASSERT(GRPC_SLICE_LENGTH(orig_decoded) == (sizeof(orig) - i)); GPR_ASSERT(buffers_are_equal(orig, GRPC_SLICE_START_PTR(orig_decoded), sizeof(orig) - i)); - grpc_slice_unref_internal(orig_decoded); + grpc_slice_unref_internal(&exec_ctx, orig_decoded); gpr_free(b64); + grpc_exec_ctx_finish(&exec_ctx); } } @@ -116,18 +116,19 @@ static void test_url_safe_unsafe_mismatch_failure(void) { int url_safe = 1; for (i = 0; i < sizeof(orig); i++) orig[i] = (uint8_t)i; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; b64 = grpc_base64_encode(orig, sizeof(orig), url_safe, 0); - orig_decoded = grpc_base64_decode(b64, !url_safe); + orig_decoded = grpc_base64_decode(&exec_ctx, b64, !url_safe); GPR_ASSERT(GRPC_SLICE_IS_EMPTY(orig_decoded)); gpr_free(b64); - grpc_slice_unref_internal(orig_decoded); + grpc_slice_unref_internal(&exec_ctx, orig_decoded); b64 = grpc_base64_encode(orig, sizeof(orig), !url_safe, 0); - orig_decoded = grpc_base64_decode(b64, url_safe); + orig_decoded = grpc_base64_decode(&exec_ctx, b64, url_safe); GPR_ASSERT(GRPC_SLICE_IS_EMPTY(orig_decoded)); gpr_free(b64); - grpc_slice_unref_internal(orig_decoded); + grpc_slice_unref_internal(&exec_ctx, orig_decoded); + grpc_exec_ctx_finish(&exec_ctx); } static void test_rfc4648_test_vectors(void) { @@ -165,44 +166,44 @@ static void test_rfc4648_test_vectors(void) { static void test_unpadded_decode(void) { grpc_slice decoded; - grpc_core::ExecCtx exec_ctx; - decoded = grpc_base64_decode("Zm9vYmFy", 0); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + decoded = grpc_base64_decode(&exec_ctx, "Zm9vYmFy", 0); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(decoded)); GPR_ASSERT(grpc_slice_str_cmp(decoded, "foobar") == 0); grpc_slice_unref(decoded); - decoded = grpc_base64_decode("Zm9vYmE", 0); + decoded = grpc_base64_decode(&exec_ctx, "Zm9vYmE", 0); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(decoded)); GPR_ASSERT(grpc_slice_str_cmp(decoded, "fooba") == 0); grpc_slice_unref(decoded); - decoded = grpc_base64_decode("Zm9vYg", 0); + decoded = grpc_base64_decode(&exec_ctx, "Zm9vYg", 0); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(decoded)); GPR_ASSERT(grpc_slice_str_cmp(decoded, "foob") == 0); grpc_slice_unref(decoded); - decoded = grpc_base64_decode("Zm9v", 0); + decoded = grpc_base64_decode(&exec_ctx, "Zm9v", 0); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(decoded)); GPR_ASSERT(grpc_slice_str_cmp(decoded, "foo") == 0); grpc_slice_unref(decoded); - decoded = grpc_base64_decode("Zm8", 0); + decoded = grpc_base64_decode(&exec_ctx, "Zm8", 0); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(decoded)); GPR_ASSERT(grpc_slice_str_cmp(decoded, "fo") == 0); grpc_slice_unref(decoded); - decoded = grpc_base64_decode("Zg", 0); + decoded = grpc_base64_decode(&exec_ctx, "Zg", 0); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(decoded)); GPR_ASSERT(grpc_slice_str_cmp(decoded, "f") == 0); grpc_slice_unref(decoded); - decoded = grpc_base64_decode("", 0); + decoded = grpc_base64_decode(&exec_ctx, "", 0); GPR_ASSERT(GRPC_SLICE_IS_EMPTY(decoded)); + grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); test_simple_encode_decode_b64_no_multiline(); test_simple_encode_decode_b64_multiline(); test_simple_encode_decode_b64_urlsafe_no_multiline(); @@ -214,6 +215,5 @@ int main(int argc, char** argv) { test_url_safe_unsafe_mismatch_failure(); test_rfc4648_test_vectors(); test_unpadded_decode(); - grpc_shutdown(); return 0; } diff --git a/test/core/slice/percent_decode_fuzzer.cc b/test/core/slice/percent_decode_fuzzer.cc index 81eb031014f..3603177c47f 100644 --- a/test/core/slice/percent_decode_fuzzer.cc +++ b/test/core/slice/percent_decode_fuzzer.cc @@ -20,7 +20,6 @@ #include #include -#include #include #include @@ -32,7 +31,6 @@ bool leak_check = true; extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { struct grpc_memory_counters counters; - grpc_init(); grpc_memory_counters_init(); grpc_slice input = grpc_slice_from_copied_buffer((const char*)data, size); grpc_slice output; @@ -48,7 +46,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_slice_unref(input); counters = grpc_memory_counters_snapshot(); grpc_memory_counters_destroy(); - grpc_shutdown(); GPR_ASSERT(counters.total_size_relative == 0); return 0; } diff --git a/test/core/slice/percent_encode_fuzzer.cc b/test/core/slice/percent_encode_fuzzer.cc index 201ae2790eb..c8e3849fc8e 100644 --- a/test/core/slice/percent_encode_fuzzer.cc +++ b/test/core/slice/percent_encode_fuzzer.cc @@ -20,7 +20,6 @@ #include #include -#include #include #include @@ -32,7 +31,6 @@ bool leak_check = true; static void test(const uint8_t* data, size_t size, const uint8_t* dict) { struct grpc_memory_counters counters; - grpc_init(); grpc_memory_counters_init(); grpc_slice input = grpc_slice_from_copied_buffer((const char*)data, size); grpc_slice output = grpc_percent_encode_slice(input, dict); @@ -50,7 +48,6 @@ static void test(const uint8_t* data, size_t size, const uint8_t* dict) { grpc_slice_unref(permissive_decoded_output); counters = grpc_memory_counters_snapshot(); grpc_memory_counters_destroy(); - grpc_shutdown(); GPR_ASSERT(counters.total_size_relative == 0); } diff --git a/test/core/slice/percent_encoding_test.cc b/test/core/slice/percent_encoding_test.cc index 11f3995f98e..253240faad4 100644 --- a/test/core/slice/percent_encoding_test.cc +++ b/test/core/slice/percent_encoding_test.cc @@ -18,7 +18,6 @@ #include "src/core/lib/slice/percent_encoding.h" -#include #include #include @@ -119,7 +118,6 @@ static void test_nonconformant_vector(const char* encoded, int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); TEST_VECTOR( "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.~", "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.~", @@ -142,6 +140,5 @@ int main(int argc, char** argv) { grpc_url_percent_encoding_unreserved_bytes); TEST_NONCONFORMANT_VECTOR("\0", "\0", grpc_url_percent_encoding_unreserved_bytes); - grpc_shutdown(); return 0; } diff --git a/test/core/slice/slice_buffer_test.cc b/test/core/slice/slice_buffer_test.cc index e59986730b8..338e8079dc8 100644 --- a/test/core/slice/slice_buffer_test.cc +++ b/test/core/slice/slice_buffer_test.cc @@ -16,7 +16,6 @@ * */ -#include #include #include #include "test/core/util/test_config.h" @@ -107,11 +106,9 @@ void test_slice_buffer_move_first() { int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); test_slice_buffer_add(); test_slice_buffer_move_first(); - grpc_shutdown(); return 0; } diff --git a/test/core/slice/slice_hash_table_test.cc b/test/core/slice/slice_hash_table_test.cc index 9fad9a614ea..0ee4e8617d2 100644 --- a/test/core/slice/slice_hash_table_test.cc +++ b/test/core/slice/slice_hash_table_test.cc @@ -59,7 +59,9 @@ static void check_non_existent_value(const char* key_string, grpc_slice_unref(key); } -static void destroy_string(void* value) { gpr_free(value); } +static void destroy_string(grpc_exec_ctx* exec_ctx, void* value) { + gpr_free(value); +} static grpc_slice_hash_table* create_table_from_entries( const test_entry* test_entries, size_t num_test_entries, @@ -119,8 +121,9 @@ static void test_slice_hash_table() { check_values(test_entries, num_entries, table); check_non_existent_value("XX", table); // Clean up. - grpc_core::ExecCtx exec_ctx; - grpc_slice_hash_table_unref(table); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice_hash_table_unref(&exec_ctx, table); + grpc_exec_ctx_finish(&exec_ctx); } static int value_cmp_fn(void* a, void* b) { @@ -146,9 +149,10 @@ static void test_slice_hash_table_eq() { create_table_from_entries(test_entries_b, num_entries_b, value_cmp_fn); GPR_ASSERT(grpc_slice_hash_table_cmp(table_a, table_b) == 0); - grpc_core::ExecCtx exec_ctx; - grpc_slice_hash_table_unref(table_a); - grpc_slice_hash_table_unref(table_b); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice_hash_table_unref(&exec_ctx, table_a); + grpc_slice_hash_table_unref(&exec_ctx, table_b); + grpc_exec_ctx_finish(&exec_ctx); } static void test_slice_hash_table_not_eq() { @@ -217,24 +221,23 @@ static void test_slice_hash_table_not_eq() { create_table_from_entries(test_entries_h, num_entries_h, pointer_cmp_fn); GPR_ASSERT(grpc_slice_hash_table_cmp(table_g, table_h) != 0); - grpc_core::ExecCtx exec_ctx; - grpc_slice_hash_table_unref(table_a); - grpc_slice_hash_table_unref(table_b_larger); - grpc_slice_hash_table_unref(table_b_smaller); - grpc_slice_hash_table_unref(table_c); - grpc_slice_hash_table_unref(table_d); - grpc_slice_hash_table_unref(table_e); - grpc_slice_hash_table_unref(table_f); - grpc_slice_hash_table_unref(table_g); - grpc_slice_hash_table_unref(table_h); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice_hash_table_unref(&exec_ctx, table_a); + grpc_slice_hash_table_unref(&exec_ctx, table_b_larger); + grpc_slice_hash_table_unref(&exec_ctx, table_b_smaller); + grpc_slice_hash_table_unref(&exec_ctx, table_c); + grpc_slice_hash_table_unref(&exec_ctx, table_d); + grpc_slice_hash_table_unref(&exec_ctx, table_e); + grpc_slice_hash_table_unref(&exec_ctx, table_f); + grpc_slice_hash_table_unref(&exec_ctx, table_g); + grpc_slice_hash_table_unref(&exec_ctx, table_h); + grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_core::ExecCtx::GlobalInit(); test_slice_hash_table(); test_slice_hash_table_eq(); test_slice_hash_table_not_eq(); - grpc_core::ExecCtx::GlobalShutdown(); return 0; } diff --git a/test/core/slice/slice_string_helpers_test.cc b/test/core/slice/slice_string_helpers_test.cc index f1d470461a4..260f8c80d5d 100644 --- a/test/core/slice/slice_string_helpers_test.cc +++ b/test/core/slice/slice_string_helpers_test.cc @@ -23,7 +23,6 @@ #include #include -#include #include #include #include @@ -131,9 +130,7 @@ static void test_strsplit(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); test_dump_slice(); test_strsplit(); - grpc_shutdown(); return 0; } diff --git a/test/core/slice/slice_test.cc b/test/core/slice/slice_test.cc index e40154dd0ee..02f6b1ea79c 100644 --- a/test/core/slice/slice_test.cc +++ b/test/core/slice/slice_test.cc @@ -292,7 +292,6 @@ static void test_static_slice_copy_interning(void) { int main(int argc, char** argv) { unsigned length; grpc_test_init(argc, argv); - grpc_init(); test_slice_malloc_returns_something_sensible(); test_slice_new_returns_something_sensible(); test_slice_new_with_user_data(); @@ -306,6 +305,5 @@ int main(int argc, char** argv) { test_slice_interning(); test_static_slice_interning(); test_static_slice_copy_interning(); - grpc_shutdown(); return 0; } diff --git a/test/core/surface/byte_buffer_reader_test.cc b/test/core/surface/byte_buffer_reader_test.cc index 94a8615b3cd..e5d2d7c78dd 100644 --- a/test/core/surface/byte_buffer_reader_test.cc +++ b/test/core/surface/byte_buffer_reader_test.cc @@ -132,8 +132,10 @@ static void read_compressed_slice(grpc_compression_algorithm algorithm, memset(GRPC_SLICE_START_PTR(input_slice), 'a', input_size); grpc_slice_buffer_add(&sliceb_in, input_slice); /* takes ownership */ { - grpc_core::ExecCtx exec_ctx; - GPR_ASSERT(grpc_msg_compress(algorithm, &sliceb_in, &sliceb_out)); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT( + grpc_msg_compress(&exec_ctx, algorithm, &sliceb_in, &sliceb_out)); + grpc_exec_ctx_finish(&exec_ctx); } buffer = grpc_raw_compressed_byte_buffer_create(sliceb_out.slices, @@ -265,7 +267,6 @@ static void test_byte_buffer_copy(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); test_read_one_slice(); test_read_one_slice_malloc(); test_read_none_compressed_slice(); @@ -275,6 +276,5 @@ int main(int argc, char** argv) { test_byte_buffer_from_reader(); test_byte_buffer_copy(); test_readall(); - grpc_shutdown(); return 0; } diff --git a/test/core/surface/channel_create_test.cc b/test/core/surface/channel_create_test.cc index 37247f89d01..f358b0fc8d4 100644 --- a/test/core/surface/channel_create_test.cc +++ b/test/core/surface/channel_create_test.cc @@ -35,10 +35,11 @@ void test_unknown_scheme_target(void) { chan = grpc_insecure_channel_create("blah://blah", nullptr, nullptr); GPR_ASSERT(chan != nullptr); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_channel_element* elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); + grpc_exec_ctx_finish(&exec_ctx); grpc_channel_destroy(chan); } diff --git a/test/core/surface/completion_queue_test.cc b/test/core/surface/completion_queue_test.cc index fefbb3c1854..c6e13d23860 100644 --- a/test/core/surface/completion_queue_test.cc +++ b/test/core/surface/completion_queue_test.cc @@ -121,7 +121,8 @@ static void test_wait_empty(void) { } } -static void do_nothing_end_completion(void* arg, grpc_cq_completion* c) {} +static void do_nothing_end_completion(grpc_exec_ctx* exec_ctx, void* arg, + grpc_cq_completion* c) {} static void test_cq_end_op(void) { grpc_event ev; @@ -130,6 +131,8 @@ static void test_cq_end_op(void) { grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; grpc_completion_queue_attributes attr; + grpc_exec_ctx init_exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_exec_ctx exec_ctx; void* tag = create_test_tag(); LOG_TEST("test_cq_end_op"); @@ -137,14 +140,14 @@ static void test_cq_end_op(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_NEXT; for (size_t i = 0; i < GPR_ARRAY_SIZE(polling_types); i++) { - grpc_core::ExecCtx exec_ctx; + exec_ctx = init_exec_ctx; // Reset exec_ctx attr.cq_polling_type = polling_types[i]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, nullptr); GPR_ASSERT(grpc_cq_begin_op(cc, tag)); - grpc_cq_end_op(cc, tag, GRPC_ERROR_NONE, do_nothing_end_completion, nullptr, - &completion); + grpc_cq_end_op(&exec_ctx, cc, tag, GRPC_ERROR_NONE, + do_nothing_end_completion, nullptr, &completion); ev = grpc_completion_queue_next(cc, gpr_inf_past(GPR_CLOCK_REALTIME), nullptr); @@ -153,6 +156,7 @@ static void test_cq_end_op(void) { GPR_ASSERT(ev.success); shutdown_and_destroy(cc); + grpc_exec_ctx_finish(&exec_ctx); } } @@ -163,6 +167,8 @@ static void test_cq_tls_cache_full(void) { grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; grpc_completion_queue_attributes attr; + grpc_exec_ctx init_exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_exec_ctx exec_ctx; void* tag = create_test_tag(); void* res_tag; int ok; @@ -172,15 +178,15 @@ static void test_cq_tls_cache_full(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_NEXT; for (size_t i = 0; i < GPR_ARRAY_SIZE(polling_types); i++) { - grpc_core::ExecCtx exec_ctx; // Reset exec_ctx + exec_ctx = init_exec_ctx; // Reset exec_ctx attr.cq_polling_type = polling_types[i]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, nullptr); grpc_completion_queue_thread_local_cache_init(cc); GPR_ASSERT(grpc_cq_begin_op(cc, tag)); - grpc_cq_end_op(cc, tag, GRPC_ERROR_NONE, do_nothing_end_completion, nullptr, - &completion); + grpc_cq_end_op(&exec_ctx, cc, tag, GRPC_ERROR_NONE, + do_nothing_end_completion, nullptr, &completion); ev = grpc_completion_queue_next(cc, gpr_inf_past(GPR_CLOCK_REALTIME), nullptr); @@ -196,6 +202,7 @@ static void test_cq_tls_cache_full(void) { GPR_ASSERT(ev.type == GRPC_QUEUE_TIMEOUT); shutdown_and_destroy(cc); + grpc_exec_ctx_finish(&exec_ctx); } } @@ -204,6 +211,8 @@ static void test_cq_tls_cache_empty(void) { grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; grpc_completion_queue_attributes attr; + grpc_exec_ctx init_exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_exec_ctx exec_ctx; void* res_tag; int ok; @@ -212,7 +221,7 @@ static void test_cq_tls_cache_empty(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_NEXT; for (size_t i = 0; i < GPR_ARRAY_SIZE(polling_types); i++) { - grpc_core::ExecCtx exec_ctx; // Reset exec_ctx + exec_ctx = init_exec_ctx; // Reset exec_ctx attr.cq_polling_type = polling_types[i]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, nullptr); @@ -223,6 +232,7 @@ static void test_cq_tls_cache_empty(void) { GPR_ASSERT( grpc_completion_queue_thread_local_cache_flush(cc, &res_tag, &ok) == 0); shutdown_and_destroy(cc); + grpc_exec_ctx_finish(&exec_ctx); } } @@ -279,6 +289,8 @@ static void test_pluck(void) { grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; grpc_completion_queue_attributes attr; + grpc_exec_ctx init_exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_exec_ctx exec_ctx; unsigned i, j; LOG_TEST("test_pluck"); @@ -293,15 +305,15 @@ static void test_pluck(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_PLUCK; for (size_t pidx = 0; pidx < GPR_ARRAY_SIZE(polling_types); pidx++) { - grpc_core::ExecCtx exec_ctx; // reset exec_ctx + exec_ctx = init_exec_ctx; // reset exec_ctx attr.cq_polling_type = polling_types[pidx]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, nullptr); for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { GPR_ASSERT(grpc_cq_begin_op(cc, tags[i])); - grpc_cq_end_op(cc, tags[i], GRPC_ERROR_NONE, do_nothing_end_completion, - nullptr, &completions[i]); + grpc_cq_end_op(&exec_ctx, cc, tags[i], GRPC_ERROR_NONE, + do_nothing_end_completion, nullptr, &completions[i]); } for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { @@ -312,8 +324,8 @@ static void test_pluck(void) { for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { GPR_ASSERT(grpc_cq_begin_op(cc, tags[i])); - grpc_cq_end_op(cc, tags[i], GRPC_ERROR_NONE, do_nothing_end_completion, - nullptr, &completions[i]); + grpc_cq_end_op(&exec_ctx, cc, tags[i], GRPC_ERROR_NONE, + do_nothing_end_completion, nullptr, &completions[i]); } for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { @@ -324,6 +336,7 @@ static void test_pluck(void) { } shutdown_and_destroy(cc); + grpc_exec_ctx_finish(&exec_ctx); } } diff --git a/test/core/surface/completion_queue_threading_test.cc b/test/core/surface/completion_queue_threading_test.cc index 4a9e818b45d..126d363f839 100644 --- a/test/core/surface/completion_queue_threading_test.cc +++ b/test/core/surface/completion_queue_threading_test.cc @@ -59,7 +59,8 @@ static void shutdown_and_destroy(grpc_completion_queue* cc) { grpc_completion_queue_destroy(cc); } -static void do_nothing_end_completion(void* arg, grpc_cq_completion* c) {} +static void do_nothing_end_completion(grpc_exec_ctx* exec_ctx, void* arg, + grpc_cq_completion* c) {} struct thread_state { grpc_completion_queue* cc; @@ -80,7 +81,7 @@ static void test_too_many_plucks(void) { gpr_thd_id thread_ids[GPR_ARRAY_SIZE(tags)]; struct thread_state thread_states[GPR_ARRAY_SIZE(tags)]; gpr_thd_options thread_options = gpr_thd_options_default(); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; unsigned i, j; LOG_TEST("test_too_many_plucks"); @@ -108,8 +109,8 @@ static void test_too_many_plucks(void) { for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { GPR_ASSERT(grpc_cq_begin_op(cc, tags[i])); - grpc_cq_end_op(cc, tags[i], GRPC_ERROR_NONE, do_nothing_end_completion, - nullptr, &completions[i]); + grpc_cq_end_op(&exec_ctx, cc, tags[i], GRPC_ERROR_NONE, + do_nothing_end_completion, nullptr, &completions[i]); } for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { @@ -117,6 +118,7 @@ static void test_too_many_plucks(void) { } shutdown_and_destroy(cc); + grpc_exec_ctx_finish(&exec_ctx); } #define TEST_THREAD_EVENTS 10000 @@ -136,13 +138,15 @@ gpr_timespec ten_seconds_time(void) { return grpc_timeout_seconds_to_deadline(10); } -static void free_completion(void* arg, grpc_cq_completion* completion) { +static void free_completion(grpc_exec_ctx* exec_ctx, void* arg, + grpc_cq_completion* completion) { gpr_free(completion); } static void producer_thread(void* arg) { test_thread_options* opt = static_cast(arg); int i; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_INFO, "producer %d started", opt->id); gpr_event_set(&opt->on_started, (void*)(intptr_t)1); @@ -159,16 +163,17 @@ static void producer_thread(void* arg) { gpr_log(GPR_INFO, "producer %d phase 2", opt->id); for (i = 0; i < TEST_THREAD_EVENTS; i++) { - grpc_core::ExecCtx exec_ctx; - grpc_cq_end_op(opt->cc, (void*)(intptr_t)1, GRPC_ERROR_NONE, + grpc_cq_end_op(&exec_ctx, opt->cc, (void*)(intptr_t)1, GRPC_ERROR_NONE, free_completion, nullptr, static_cast( gpr_malloc(sizeof(grpc_cq_completion)))); opt->events_triggered++; + grpc_exec_ctx_finish(&exec_ctx); } gpr_log(GPR_INFO, "producer %d phase 2 done", opt->id); gpr_event_set(&opt->on_finished, (void*)(intptr_t)1); + grpc_exec_ctx_finish(&exec_ctx); } static void consumer_thread(void* arg) { diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index 235d1363763..2ff1ca3d799 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -103,28 +103,29 @@ void server_thread(void* vargs) { GPR_ASSERT(detag(ev.tag) == 0xd1e); } -static void on_connect(void* vargs, grpc_endpoint* tcp, +static void on_connect(grpc_exec_ctx* exec_ctx, void* vargs, grpc_endpoint* tcp, grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor) { gpr_free(acceptor); struct server_thread_args* args = (struct server_thread_args*)vargs; - grpc_endpoint_shutdown(tcp, + grpc_endpoint_shutdown(exec_ctx, tcp, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Connected")); - grpc_endpoint_destroy(tcp); + grpc_endpoint_destroy(exec_ctx, tcp); gpr_mu_lock(args->mu); - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(args->pollset, nullptr)); + GRPC_LOG_IF_ERROR("pollset_kick", + grpc_pollset_kick(exec_ctx, args->pollset, nullptr)); gpr_mu_unlock(args->mu); } void bad_server_thread(void* vargs) { struct server_thread_args* args = (struct server_thread_args*)vargs; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_address resolved_addr; struct sockaddr_storage* addr = (struct sockaddr_storage*)resolved_addr.addr; int port; grpc_tcp_server* s; - grpc_error* error = grpc_tcp_server_create(nullptr, nullptr, &s); + grpc_error* error = grpc_tcp_server_create(&exec_ctx, nullptr, nullptr, &s); GPR_ASSERT(error == GRPC_ERROR_NONE); memset(&resolved_addr, 0, sizeof(resolved_addr)); addr->ss_family = AF_INET; @@ -133,32 +134,35 @@ void bad_server_thread(void* vargs) { GPR_ASSERT(port > 0); gpr_asprintf(&args->addr, "localhost:%d", port); - grpc_tcp_server_start(s, &args->pollset, 1, on_connect, args); + grpc_tcp_server_start(&exec_ctx, s, &args->pollset, 1, on_connect, args); gpr_event_set(&args->ready, (void*)1); gpr_mu_lock(args->mu); while (gpr_atm_acq_load(&args->stop) == 0) { - grpc_millis deadline = grpc_core::ExecCtx::Get()->Now() + 100; + grpc_millis deadline = grpc_exec_ctx_now(&exec_ctx) + 100; grpc_pollset_worker* worker = nullptr; if (!GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(args->pollset, &worker, deadline))) { + grpc_pollset_work(&exec_ctx, args->pollset, &worker, deadline))) { gpr_atm_rel_store(&args->stop, 1); } gpr_mu_unlock(args->mu); - + grpc_exec_ctx_finish(&exec_ctx); gpr_mu_lock(args->mu); } gpr_mu_unlock(args->mu); - grpc_tcp_server_unref(s); + grpc_tcp_server_unref(&exec_ctx, s); + + grpc_exec_ctx_finish(&exec_ctx); gpr_free(args->addr); } -static void done_pollset_shutdown(void* pollset, grpc_error* error) { - grpc_pollset_destroy(static_cast(pollset)); +static void done_pollset_shutdown(grpc_exec_ctx* exec_ctx, void* pollset, + grpc_error* error) { + grpc_pollset_destroy(exec_ctx, static_cast(pollset)); gpr_free(pollset); } @@ -230,12 +234,11 @@ int run_concurrent_connectivity_test() { gpr_atm_rel_store(&args.stop, 1); gpr_thd_join(server); - { - grpc_core::ExecCtx exec_ctx; - grpc_pollset_shutdown( - args.pollset, GRPC_CLOSURE_CREATE(done_pollset_shutdown, args.pollset, - grpc_schedule_on_exec_ctx)); - } + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_pollset_shutdown(&exec_ctx, args.pollset, + GRPC_CLOSURE_CREATE(done_pollset_shutdown, args.pollset, + grpc_schedule_on_exec_ctx)); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); return 0; diff --git a/test/core/surface/lame_client_test.cc b/test/core/surface/lame_client_test.cc index 4bf40569e64..f3df7f35a73 100644 --- a/test/core/surface/lame_client_test.cc +++ b/test/core/surface/lame_client_test.cc @@ -32,19 +32,20 @@ grpc_closure transport_op_cb; static void* tag(intptr_t x) { return (void*)x; } -void verify_connectivity(void* arg, grpc_error* error) { +void verify_connectivity(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_connectivity_state* state = static_cast(arg); GPR_ASSERT(GRPC_CHANNEL_SHUTDOWN == *state); GPR_ASSERT(error == GRPC_ERROR_NONE); } -void do_nothing(void* arg, grpc_error* error) {} +void do_nothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} void test_transport_op(grpc_channel* channel) { grpc_transport_op* op; grpc_channel_element* elem; grpc_connectivity_state state = GRPC_CHANNEL_IDLE; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GRPC_CLOSURE_INIT(&transport_op_cb, verify_connectivity, &state, grpc_schedule_on_exec_ctx); @@ -53,12 +54,14 @@ void test_transport_op(grpc_channel* channel) { op->on_connectivity_state_change = &transport_op_cb; op->connectivity_state = &state; elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); - elem->filter->start_transport_op(elem, op); + elem->filter->start_transport_op(&exec_ctx, elem, op); + grpc_exec_ctx_finish(&exec_ctx); GRPC_CLOSURE_INIT(&transport_op_cb, do_nothing, nullptr, grpc_schedule_on_exec_ctx); op = grpc_make_transport_op(&transport_op_cb); - elem->filter->start_transport_op(elem, op); + elem->filter->start_transport_op(&exec_ctx, elem, op); + grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { diff --git a/test/core/surface/num_external_connectivity_watchers_test.cc b/test/core/surface/num_external_connectivity_watchers_test.cc index 9cdd299ae3b..f78d3336734 100644 --- a/test/core/surface/num_external_connectivity_watchers_test.cc +++ b/test/core/surface/num_external_connectivity_watchers_test.cc @@ -178,8 +178,9 @@ static grpc_channel* secure_test_create_channel(const char* addr) { grpc_channel* channel = grpc_secure_channel_create(ssl_creds, addr, new_client_args, nullptr); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(new_client_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, new_client_args); + grpc_exec_ctx_finish(&exec_ctx); } grpc_channel_credentials_release(ssl_creds); return channel; diff --git a/test/core/surface/secure_channel_create_test.cc b/test/core/surface/secure_channel_create_test.cc index fa22cd68731..c31c61430cd 100644 --- a/test/core/surface/secure_channel_create_test.cc +++ b/test/core/surface/secure_channel_create_test.cc @@ -37,9 +37,10 @@ void test_unknown_scheme_target(void) { grpc_channel_element* elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); - grpc_core::ExecCtx exec_ctx; - GRPC_CHANNEL_INTERNAL_UNREF(chan, "test"); - grpc_channel_credentials_unref(creds); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_CHANNEL_INTERNAL_UNREF(&exec_ctx, chan, "test"); + grpc_channel_credentials_unref(&exec_ctx, creds); + grpc_exec_ctx_finish(&exec_ctx); } void test_security_connector_already_in_arg(void) { @@ -55,8 +56,9 @@ void test_security_connector_already_in_arg(void) { grpc_channel_element* elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); - grpc_core::ExecCtx exec_ctx; - GRPC_CHANNEL_INTERNAL_UNREF(chan, "test"); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_CHANNEL_INTERNAL_UNREF(&exec_ctx, chan, "test"); + grpc_exec_ctx_finish(&exec_ctx); } void test_null_creds(void) { @@ -65,8 +67,9 @@ void test_null_creds(void) { grpc_channel_element* elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); - grpc_core::ExecCtx exec_ctx; - GRPC_CHANNEL_INTERNAL_UNREF(chan, "test"); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GRPC_CHANNEL_INTERNAL_UNREF(&exec_ctx, chan, "test"); + grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { diff --git a/test/core/surface/sequential_connectivity_test.cc b/test/core/surface/sequential_connectivity_test.cc index ac49bd98233..11d0aa705d9 100644 --- a/test/core/surface/sequential_connectivity_test.cc +++ b/test/core/surface/sequential_connectivity_test.cc @@ -156,8 +156,9 @@ static grpc_channel* secure_test_create_channel(const char* addr) { grpc_channel* channel = grpc_secure_channel_create(ssl_creds, addr, new_client_args, nullptr); { - grpc_core::ExecCtx exec_ctx; - grpc_channel_args_destroy(new_client_args); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_channel_args_destroy(&exec_ctx, new_client_args); + grpc_exec_ctx_finish(&exec_ctx); } grpc_channel_credentials_release(ssl_creds); return channel; diff --git a/test/core/transport/bdp_estimator_test.cc b/test/core/transport/bdp_estimator_test.cc index 445823b628b..d1272607f2a 100644 --- a/test/core/transport/bdp_estimator_test.cc +++ b/test/core/transport/bdp_estimator_test.cc @@ -58,7 +58,7 @@ namespace { void AddSamples(BdpEstimator* estimator, int64_t* samples, size_t n) { estimator->AddIncomingBytes(1234567); inc_time(); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; estimator->SchedulePing(); estimator->StartPing(); for (size_t i = 0; i < n; i++) { @@ -66,8 +66,9 @@ void AddSamples(BdpEstimator* estimator, int64_t* samples, size_t n) { } gpr_sleep_until(gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_millis(1, GPR_TIMESPAN))); - grpc_core::ExecCtx::Get()->InvalidateNow(); - estimator->CompletePing(); + grpc_exec_ctx_invalidate_now(&exec_ctx); + estimator->CompletePing(&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); } void AddSample(BdpEstimator* estimator, int64_t sample) { diff --git a/test/core/transport/byte_stream_test.cc b/test/core/transport/byte_stream_test.cc index 2aab6e92628..0e34fd7651d 100644 --- a/test/core/transport/byte_stream_test.cc +++ b/test/core/transport/byte_stream_test.cc @@ -18,7 +18,6 @@ #include "src/core/lib/transport/byte_stream.h" -#include #include #include #include @@ -31,13 +30,14 @@ // grpc_slice_buffer_stream tests // -static void not_called_closure(void* arg, grpc_error* error) { +static void not_called_closure(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { GPR_ASSERT(false); } static void test_slice_buffer_stream_basic(void) { gpr_log(GPR_DEBUG, "test_slice_buffer_stream_basic"); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; // Create and populate slice buffer. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -57,21 +57,23 @@ static void test_slice_buffer_stream_basic(void) { grpc_schedule_on_exec_ctx); // Read each slice. Note that next() always returns synchronously. for (size_t i = 0; i < GPR_ARRAY_SIZE(input); ++i) { - GPR_ASSERT(grpc_byte_stream_next(&stream.base, ~(size_t)0, &closure)); + GPR_ASSERT( + grpc_byte_stream_next(&exec_ctx, &stream.base, ~(size_t)0, &closure)); grpc_slice output; - grpc_error* error = grpc_byte_stream_pull(&stream.base, &output); + grpc_error* error = grpc_byte_stream_pull(&exec_ctx, &stream.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[i], output)); - grpc_slice_unref_internal(output); + grpc_slice_unref_internal(&exec_ctx, output); } // Clean up. - grpc_byte_stream_destroy(&stream.base); - grpc_slice_buffer_destroy_internal(&buffer); + grpc_byte_stream_destroy(&exec_ctx, &stream.base); + grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); + grpc_exec_ctx_finish(&exec_ctx); } static void test_slice_buffer_stream_shutdown(void) { gpr_log(GPR_DEBUG, "test_slice_buffer_stream_shutdown"); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; // Create and populate slice buffer. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -90,25 +92,29 @@ static void test_slice_buffer_stream_shutdown(void) { GRPC_CLOSURE_INIT(&closure, not_called_closure, nullptr, grpc_schedule_on_exec_ctx); // Read the first slice. - GPR_ASSERT(grpc_byte_stream_next(&stream.base, ~(size_t)0, &closure)); + GPR_ASSERT( + grpc_byte_stream_next(&exec_ctx, &stream.base, ~(size_t)0, &closure)); grpc_slice output; - grpc_error* error = grpc_byte_stream_pull(&stream.base, &output); + grpc_error* error = grpc_byte_stream_pull(&exec_ctx, &stream.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[0], output)); - grpc_slice_unref_internal(output); + grpc_slice_unref_internal(&exec_ctx, output); // Now shutdown. grpc_error* shutdown_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("shutdown error"); - grpc_byte_stream_shutdown(&stream.base, GRPC_ERROR_REF(shutdown_error)); + grpc_byte_stream_shutdown(&exec_ctx, &stream.base, + GRPC_ERROR_REF(shutdown_error)); // After shutdown, the next pull() should return the error. - GPR_ASSERT(grpc_byte_stream_next(&stream.base, ~(size_t)0, &closure)); - error = grpc_byte_stream_pull(&stream.base, &output); + GPR_ASSERT( + grpc_byte_stream_next(&exec_ctx, &stream.base, ~(size_t)0, &closure)); + error = grpc_byte_stream_pull(&exec_ctx, &stream.base, &output); GPR_ASSERT(error == shutdown_error); GRPC_ERROR_UNREF(error); GRPC_ERROR_UNREF(shutdown_error); // Clean up. - grpc_byte_stream_destroy(&stream.base); - grpc_slice_buffer_destroy_internal(&buffer); + grpc_byte_stream_destroy(&exec_ctx, &stream.base); + grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); + grpc_exec_ctx_finish(&exec_ctx); } // @@ -117,7 +123,7 @@ static void test_slice_buffer_stream_shutdown(void) { static void test_caching_byte_stream_basic(void) { gpr_log(GPR_DEBUG, "test_caching_byte_stream_basic"); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; // Create and populate slice buffer byte stream. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -141,22 +147,24 @@ static void test_caching_byte_stream_basic(void) { // Read each slice. Note that next() always returns synchronously, // because the underlying byte stream always does. for (size_t i = 0; i < GPR_ARRAY_SIZE(input); ++i) { - GPR_ASSERT(grpc_byte_stream_next(&stream.base, ~(size_t)0, &closure)); + GPR_ASSERT( + grpc_byte_stream_next(&exec_ctx, &stream.base, ~(size_t)0, &closure)); grpc_slice output; - grpc_error* error = grpc_byte_stream_pull(&stream.base, &output); + grpc_error* error = grpc_byte_stream_pull(&exec_ctx, &stream.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[i], output)); - grpc_slice_unref_internal(output); + grpc_slice_unref_internal(&exec_ctx, output); } // Clean up. - grpc_byte_stream_destroy(&stream.base); - grpc_byte_stream_cache_destroy(&cache); - grpc_slice_buffer_destroy_internal(&buffer); + grpc_byte_stream_destroy(&exec_ctx, &stream.base); + grpc_byte_stream_cache_destroy(&exec_ctx, &cache); + grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); + grpc_exec_ctx_finish(&exec_ctx); } static void test_caching_byte_stream_reset(void) { gpr_log(GPR_DEBUG, "test_caching_byte_stream_reset"); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; // Create and populate slice buffer byte stream. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -178,31 +186,34 @@ static void test_caching_byte_stream_reset(void) { GRPC_CLOSURE_INIT(&closure, not_called_closure, nullptr, grpc_schedule_on_exec_ctx); // Read one slice. - GPR_ASSERT(grpc_byte_stream_next(&stream.base, ~(size_t)0, &closure)); + GPR_ASSERT( + grpc_byte_stream_next(&exec_ctx, &stream.base, ~(size_t)0, &closure)); grpc_slice output; - grpc_error* error = grpc_byte_stream_pull(&stream.base, &output); + grpc_error* error = grpc_byte_stream_pull(&exec_ctx, &stream.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[0], output)); - grpc_slice_unref_internal(output); + grpc_slice_unref_internal(&exec_ctx, output); // Reset the caching stream. The reads should start over from the // first slice. grpc_caching_byte_stream_reset(&stream); for (size_t i = 0; i < GPR_ARRAY_SIZE(input); ++i) { - GPR_ASSERT(grpc_byte_stream_next(&stream.base, ~(size_t)0, &closure)); - error = grpc_byte_stream_pull(&stream.base, &output); + GPR_ASSERT( + grpc_byte_stream_next(&exec_ctx, &stream.base, ~(size_t)0, &closure)); + error = grpc_byte_stream_pull(&exec_ctx, &stream.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[i], output)); - grpc_slice_unref_internal(output); + grpc_slice_unref_internal(&exec_ctx, output); } // Clean up. - grpc_byte_stream_destroy(&stream.base); - grpc_byte_stream_cache_destroy(&cache); - grpc_slice_buffer_destroy_internal(&buffer); + grpc_byte_stream_destroy(&exec_ctx, &stream.base); + grpc_byte_stream_cache_destroy(&exec_ctx, &cache); + grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); + grpc_exec_ctx_finish(&exec_ctx); } static void test_caching_byte_stream_shared_cache(void) { gpr_log(GPR_DEBUG, "test_caching_byte_stream_shared_cache"); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; // Create and populate slice buffer byte stream. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -226,41 +237,43 @@ static void test_caching_byte_stream_shared_cache(void) { GRPC_CLOSURE_INIT(&closure, not_called_closure, nullptr, grpc_schedule_on_exec_ctx); // Read one slice from stream1. - GPR_ASSERT(grpc_byte_stream_next(&stream1.base, ~(size_t)0, &closure)); + GPR_ASSERT( + grpc_byte_stream_next(&exec_ctx, &stream1.base, ~(size_t)0, &closure)); grpc_slice output; - grpc_error* error = grpc_byte_stream_pull(&stream1.base, &output); + grpc_error* error = grpc_byte_stream_pull(&exec_ctx, &stream1.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[0], output)); - grpc_slice_unref_internal(output); + grpc_slice_unref_internal(&exec_ctx, output); // Read all slices from stream2. for (size_t i = 0; i < GPR_ARRAY_SIZE(input); ++i) { - GPR_ASSERT(grpc_byte_stream_next(&stream2.base, ~(size_t)0, &closure)); - error = grpc_byte_stream_pull(&stream2.base, &output); + GPR_ASSERT( + grpc_byte_stream_next(&exec_ctx, &stream2.base, ~(size_t)0, &closure)); + error = grpc_byte_stream_pull(&exec_ctx, &stream2.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[i], output)); - grpc_slice_unref_internal(output); + grpc_slice_unref_internal(&exec_ctx, output); } // Now read the second slice from stream1. - GPR_ASSERT(grpc_byte_stream_next(&stream1.base, ~(size_t)0, &closure)); - error = grpc_byte_stream_pull(&stream1.base, &output); + GPR_ASSERT( + grpc_byte_stream_next(&exec_ctx, &stream1.base, ~(size_t)0, &closure)); + error = grpc_byte_stream_pull(&exec_ctx, &stream1.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[1], output)); - grpc_slice_unref_internal(output); + grpc_slice_unref_internal(&exec_ctx, output); // Clean up. - grpc_byte_stream_destroy(&stream1.base); - grpc_byte_stream_destroy(&stream2.base); - grpc_byte_stream_cache_destroy(&cache); - grpc_slice_buffer_destroy_internal(&buffer); + grpc_byte_stream_destroy(&exec_ctx, &stream1.base); + grpc_byte_stream_destroy(&exec_ctx, &stream2.base); + grpc_byte_stream_cache_destroy(&exec_ctx, &cache); + grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); + grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { - grpc_init(); grpc_test_init(argc, argv); test_slice_buffer_stream_basic(); test_slice_buffer_stream_shutdown(); test_caching_byte_stream_basic(); test_caching_byte_stream_reset(); test_caching_byte_stream_shared_cache(); - grpc_shutdown(); return 0; } diff --git a/test/core/transport/chttp2/bin_decoder_test.cc b/test/core/transport/chttp2/bin_decoder_test.cc index 6d70a4261b0..a29ec8a13fe 100644 --- a/test/core/transport/chttp2/bin_decoder_test.cc +++ b/test/core/transport/chttp2/bin_decoder_test.cc @@ -20,7 +20,6 @@ #include -#include #include #include #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" @@ -30,8 +29,8 @@ static int all_ok = 1; -static void expect_slice_eq(grpc_slice expected, grpc_slice slice, - const char* debug, int line) { +static void expect_slice_eq(grpc_exec_ctx* exec_ctx, grpc_slice expected, + grpc_slice slice, const char* debug, int line) { if (!grpc_slice_eq(slice, expected)) { char* hs = grpc_dump_slice(slice, GPR_DUMP_HEX | GPR_DUMP_ASCII); char* he = grpc_dump_slice(expected, GPR_DUMP_HEX | GPR_DUMP_ASCII); @@ -41,97 +40,104 @@ static void expect_slice_eq(grpc_slice expected, grpc_slice slice, gpr_free(he); all_ok = 0; } - grpc_slice_unref_internal(expected); - grpc_slice_unref_internal(slice); + grpc_slice_unref_internal(exec_ctx, expected); + grpc_slice_unref_internal(exec_ctx, slice); } -static grpc_slice base64_encode(const char* s) { +static grpc_slice base64_encode(grpc_exec_ctx* exec_ctx, const char* s) { grpc_slice ss = grpc_slice_from_copied_string(s); grpc_slice out = grpc_chttp2_base64_encode(ss); - grpc_slice_unref_internal(ss); + grpc_slice_unref_internal(exec_ctx, ss); return out; } -static grpc_slice base64_decode(const char* s) { +static grpc_slice base64_decode(grpc_exec_ctx* exec_ctx, const char* s) { grpc_slice ss = grpc_slice_from_copied_string(s); - grpc_slice out = grpc_chttp2_base64_decode(ss); - grpc_slice_unref_internal(ss); + grpc_slice out = grpc_chttp2_base64_decode(exec_ctx, ss); + grpc_slice_unref_internal(exec_ctx, ss); return out; } -static grpc_slice base64_decode_with_length(const char* s, +static grpc_slice base64_decode_with_length(grpc_exec_ctx* exec_ctx, + const char* s, size_t output_length) { grpc_slice ss = grpc_slice_from_copied_string(s); - grpc_slice out = grpc_chttp2_base64_decode_with_length(ss, output_length); - grpc_slice_unref_internal(ss); + grpc_slice out = + grpc_chttp2_base64_decode_with_length(exec_ctx, ss, output_length); + grpc_slice_unref_internal(exec_ctx, ss); return out; } -#define EXPECT_SLICE_EQ(expected, slice) \ - expect_slice_eq( \ - grpc_slice_from_copied_buffer(expected, sizeof(expected) - 1), slice, \ - #slice, __LINE__); +#define EXPECT_SLICE_EQ(exec_ctx, expected, slice) \ + expect_slice_eq( \ + exec_ctx, grpc_slice_from_copied_buffer(expected, sizeof(expected) - 1), \ + slice, #slice, __LINE__); -#define ENCODE_AND_DECODE(s) \ - EXPECT_SLICE_EQ( \ - s, grpc_chttp2_base64_decode_with_length(base64_encode(s), strlen(s))); +#define ENCODE_AND_DECODE(exec_ctx, s) \ + EXPECT_SLICE_EQ(exec_ctx, s, \ + grpc_chttp2_base64_decode_with_length( \ + exec_ctx, base64_encode(exec_ctx, s), strlen(s))); int main(int argc, char** argv) { - grpc_init(); - { - grpc_core::ExecCtx exec_ctx; - - /* ENCODE_AND_DECODE tests grpc_chttp2_base64_decode_with_length(), which - takes encoded base64 strings without pad chars, but output length is - required. */ - /* Base64 test vectors from RFC 4648 */ - ENCODE_AND_DECODE(""); - ENCODE_AND_DECODE("f"); - ENCODE_AND_DECODE("foo"); - ENCODE_AND_DECODE("fo"); - ENCODE_AND_DECODE("foob"); - ENCODE_AND_DECODE("fooba"); - ENCODE_AND_DECODE("foobar"); - - ENCODE_AND_DECODE("\xc0\xc1\xc2\xc3\xc4\xc5"); - - /* Base64 test vectors from RFC 4648, with pad chars */ - /* BASE64("") = "" */ - EXPECT_SLICE_EQ("", base64_decode("")); - /* BASE64("f") = "Zg==" */ - EXPECT_SLICE_EQ("f", base64_decode("Zg==")); - /* BASE64("fo") = "Zm8=" */ - EXPECT_SLICE_EQ("fo", base64_decode("Zm8=")); - /* BASE64("foo") = "Zm9v" */ - EXPECT_SLICE_EQ("foo", base64_decode("Zm9v")); - /* BASE64("foob") = "Zm9vYg==" */ - EXPECT_SLICE_EQ("foob", base64_decode("Zm9vYg==")); - /* BASE64("fooba") = "Zm9vYmE=" */ - EXPECT_SLICE_EQ("fooba", base64_decode("Zm9vYmE=")); - /* BASE64("foobar") = "Zm9vYmFy" */ - EXPECT_SLICE_EQ("foobar", base64_decode("Zm9vYmFy")); - - EXPECT_SLICE_EQ("\xc0\xc1\xc2\xc3\xc4\xc5", base64_decode("wMHCw8TF")); - - // Test illegal input length in grpc_chttp2_base64_decode - EXPECT_SLICE_EQ("", base64_decode("a")); - EXPECT_SLICE_EQ("", base64_decode("ab")); - EXPECT_SLICE_EQ("", base64_decode("abc")); - - // Test illegal charactors in grpc_chttp2_base64_decode - EXPECT_SLICE_EQ("", base64_decode("Zm:v")); - EXPECT_SLICE_EQ("", base64_decode("Zm=v")); - - // Test output_length longer than max possible output length in - // grpc_chttp2_base64_decode_with_length - EXPECT_SLICE_EQ("", base64_decode_with_length("Zg", 2)); - EXPECT_SLICE_EQ("", base64_decode_with_length("Zm8", 3)); - EXPECT_SLICE_EQ("", base64_decode_with_length("Zm9v", 4)); - - // Test illegal charactors in grpc_chttp2_base64_decode_with_length - EXPECT_SLICE_EQ("", base64_decode_with_length("Zm:v", 3)); - EXPECT_SLICE_EQ("", base64_decode_with_length("Zm=v", 3)); - } - grpc_shutdown(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + + /* ENCODE_AND_DECODE tests grpc_chttp2_base64_decode_with_length(), which + takes encoded base64 strings without pad chars, but output length is + required. */ + /* Base64 test vectors from RFC 4648 */ + ENCODE_AND_DECODE(&exec_ctx, ""); + ENCODE_AND_DECODE(&exec_ctx, "f"); + ENCODE_AND_DECODE(&exec_ctx, "foo"); + ENCODE_AND_DECODE(&exec_ctx, "fo"); + ENCODE_AND_DECODE(&exec_ctx, "foob"); + ENCODE_AND_DECODE(&exec_ctx, "fooba"); + ENCODE_AND_DECODE(&exec_ctx, "foobar"); + + ENCODE_AND_DECODE(&exec_ctx, "\xc0\xc1\xc2\xc3\xc4\xc5"); + + /* Base64 test vectors from RFC 4648, with pad chars */ + /* BASE64("") = "" */ + EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode(&exec_ctx, "")); + /* BASE64("f") = "Zg==" */ + EXPECT_SLICE_EQ(&exec_ctx, "f", base64_decode(&exec_ctx, "Zg==")); + /* BASE64("fo") = "Zm8=" */ + EXPECT_SLICE_EQ(&exec_ctx, "fo", base64_decode(&exec_ctx, "Zm8=")); + /* BASE64("foo") = "Zm9v" */ + EXPECT_SLICE_EQ(&exec_ctx, "foo", base64_decode(&exec_ctx, "Zm9v")); + /* BASE64("foob") = "Zm9vYg==" */ + EXPECT_SLICE_EQ(&exec_ctx, "foob", base64_decode(&exec_ctx, "Zm9vYg==")); + /* BASE64("fooba") = "Zm9vYmE=" */ + EXPECT_SLICE_EQ(&exec_ctx, "fooba", base64_decode(&exec_ctx, "Zm9vYmE=")); + /* BASE64("foobar") = "Zm9vYmFy" */ + EXPECT_SLICE_EQ(&exec_ctx, "foobar", base64_decode(&exec_ctx, "Zm9vYmFy")); + + EXPECT_SLICE_EQ(&exec_ctx, "\xc0\xc1\xc2\xc3\xc4\xc5", + base64_decode(&exec_ctx, "wMHCw8TF")); + + // Test illegal input length in grpc_chttp2_base64_decode + EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode(&exec_ctx, "a")); + EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode(&exec_ctx, "ab")); + EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode(&exec_ctx, "abc")); + + // Test illegal charactors in grpc_chttp2_base64_decode + EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode(&exec_ctx, "Zm:v")); + EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode(&exec_ctx, "Zm=v")); + + // Test output_length longer than max possible output length in + // grpc_chttp2_base64_decode_with_length + EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode_with_length(&exec_ctx, "Zg", 2)); + EXPECT_SLICE_EQ(&exec_ctx, "", + base64_decode_with_length(&exec_ctx, "Zm8", 3)); + EXPECT_SLICE_EQ(&exec_ctx, "", + base64_decode_with_length(&exec_ctx, "Zm9v", 4)); + + // Test illegal charactors in grpc_chttp2_base64_decode_with_length + EXPECT_SLICE_EQ(&exec_ctx, "", + base64_decode_with_length(&exec_ctx, "Zm:v", 3)); + EXPECT_SLICE_EQ(&exec_ctx, "", + base64_decode_with_length(&exec_ctx, "Zm=v", 3)); + + grpc_exec_ctx_finish(&exec_ctx); + return all_ok ? 0 : 1; } diff --git a/test/core/transport/chttp2/bin_encoder_test.cc b/test/core/transport/chttp2/bin_encoder_test.cc index 44f5de8a50d..78b8808c413 100644 --- a/test/core/transport/chttp2/bin_encoder_test.cc +++ b/test/core/transport/chttp2/bin_encoder_test.cc @@ -99,8 +99,6 @@ static void expect_binary_header(const char* hdr, int binary) { } int main(int argc, char** argv) { - grpc_init(); - /* Base64 test vectors from RFC 4648, with padding removed */ /* BASE64("") = "" */ EXPECT_SLICE_EQ("", B64("")); @@ -171,6 +169,5 @@ int main(int argc, char** argv) { expect_binary_header("foo-bar", 0); expect_binary_header("-bin", 0); - grpc_shutdown(); return all_ok ? 0 : 1; } diff --git a/test/core/transport/chttp2/hpack_encoder_test.cc b/test/core/transport/chttp2/hpack_encoder_test.cc index d2dbd4a7986..2d18b725042 100644 --- a/test/core/transport/chttp2/hpack_encoder_test.cc +++ b/test/core/transport/chttp2/hpack_encoder_test.cc @@ -51,8 +51,8 @@ typedef struct { /* verify that the output generated by encoding the stream matches the hexstring passed in */ -static void verify(const verify_params params, const char* expected, - size_t nheaders, ...) { +static void verify(grpc_exec_ctx* exec_ctx, const verify_params params, + const char* expected, size_t nheaders, ...) { grpc_slice_buffer output; grpc_slice merged; grpc_slice expect = parse_hexstring(expected); @@ -77,7 +77,8 @@ static void verify(const verify_params params, const char* expected, value_slice = grpc_slice_intern(value_slice); } e[i].md = grpc_mdelem_from_slices( - grpc_slice_intern(grpc_slice_from_static_string(key)), value_slice); + exec_ctx, grpc_slice_intern(grpc_slice_from_static_string(key)), + value_slice); } e[0].prev = nullptr; e[nheaders - 1].next = nullptr; @@ -105,10 +106,11 @@ static void verify(const verify_params params, const char* expected, 16384, /* max_frame_size */ &stats /* stats */ }; - grpc_chttp2_encode_header(&g_compressor, nullptr, 0, &b, &hopt, &output); + grpc_chttp2_encode_header(exec_ctx, &g_compressor, nullptr, 0, &b, &hopt, + &output); merged = grpc_slice_merge(output.slices, output.count); - grpc_slice_buffer_destroy_internal(&output); - grpc_metadata_batch_destroy(&b); + grpc_slice_buffer_destroy_internal(exec_ctx, &output); + grpc_metadata_batch_destroy(exec_ctx, &b); if (!grpc_slice_eq(merged, expect)) { char* expect_str = grpc_dump_slice(expect, GPR_DUMP_HEX | GPR_DUMP_ASCII); @@ -121,11 +123,11 @@ static void verify(const verify_params params, const char* expected, g_failure = 1; } - grpc_slice_unref_internal(merged); - grpc_slice_unref_internal(expect); + grpc_slice_unref_internal(exec_ctx, merged); + grpc_slice_unref_internal(exec_ctx, expect); } -static void test_basic_headers() { +static void test_basic_headers(grpc_exec_ctx* exec_ctx) { int i; verify_params params = { @@ -133,22 +135,24 @@ static void test_basic_headers() { false, false, }; - verify(params, "000005 0104 deadbeef 40 0161 0161", 1, "a", "a"); - verify(params, "000001 0104 deadbeef be", 1, "a", "a"); - verify(params, "000001 0104 deadbeef be", 1, "a", "a"); - verify(params, "000006 0104 deadbeef be 40 0162 0163", 2, "a", "a", "b", "c"); - verify(params, "000002 0104 deadbeef bf be", 2, "a", "a", "b", "c"); - verify(params, "000004 0104 deadbeef 7f 00 0164", 1, "a", "d"); + verify(exec_ctx, params, "000005 0104 deadbeef 40 0161 0161", 1, "a", "a"); + verify(exec_ctx, params, "000001 0104 deadbeef be", 1, "a", "a"); + verify(exec_ctx, params, "000001 0104 deadbeef be", 1, "a", "a"); + verify(exec_ctx, params, "000006 0104 deadbeef be 40 0162 0163", 2, "a", "a", + "b", "c"); + verify(exec_ctx, params, "000002 0104 deadbeef bf be", 2, "a", "a", "b", "c"); + verify(exec_ctx, params, "000004 0104 deadbeef 7f 00 0164", 1, "a", "d"); /* flush out what's there to make a few values look very popular */ for (i = 0; i < 350; i++) { - verify(params, "000003 0104 deadbeef c0 bf be", 3, "a", "a", "b", "c", "a", - "d"); + verify(exec_ctx, params, "000003 0104 deadbeef c0 bf be", 3, "a", "a", "b", + "c", "a", "d"); } - verify(params, "000006 0104 deadbeef c0 00 016b 0176", 2, "a", "a", "k", "v"); + verify(exec_ctx, params, "000006 0104 deadbeef c0 00 016b 0176", 2, "a", "a", + "k", "v"); /* this could be 000004 0104 deadbeef 0f 30 0176 also */ - verify(params, "000004 0104 deadbeef 0f 2f 0176", 1, "a", "v"); + verify(exec_ctx, params, "000004 0104 deadbeef 0f 2f 0176", 1, "a", "v"); } static void encode_int_to_str(int i, char* p) { @@ -159,7 +163,7 @@ static void encode_int_to_str(int i, char* p) { p[2] = 0; } -static void test_decode_table_overflow() { +static void test_decode_table_overflow(grpc_exec_ctx* exec_ctx) { int i; char key[3], value[3]; char* expect; @@ -188,24 +192,26 @@ static void test_decode_table_overflow() { } if (i > 0) { - verify(params, expect, 2, "aa", "ba", key, value); + verify(exec_ctx, params, expect, 2, "aa", "ba", key, value); } else { - verify(params, expect, 1, key, value); + verify(exec_ctx, params, expect, 1, key, value); } gpr_free(expect); } /* if the above passes, then we must have just knocked this pair out of the decoder stack, and so we'll be forced to re-encode it */ - verify(params, "000007 0104 deadbeef 40 026161 026261", 1, "aa", "ba"); + verify(exec_ctx, params, "000007 0104 deadbeef 40 026161 026261", 1, "aa", + "ba"); } -static void verify_table_size_change_match_elem_size(const char* key, +static void verify_table_size_change_match_elem_size(grpc_exec_ctx* exec_ctx, + const char* key, const char* value, bool use_true_binary) { grpc_slice_buffer output; grpc_mdelem elem = grpc_mdelem_from_slices( - grpc_slice_intern(grpc_slice_from_static_string(key)), + exec_ctx, grpc_slice_intern(grpc_slice_from_static_string(key)), grpc_slice_intern(grpc_slice_from_static_string(value))); size_t elem_size = grpc_mdelem_get_size_in_hpack_table(elem, use_true_binary); size_t initial_table_size = g_compressor.table_size; @@ -229,38 +235,41 @@ static void verify_table_size_change_match_elem_size(const char* key, use_true_binary, /* use_true_binary_metadata */ 16384, /* max_frame_size */ &stats /* stats */}; - grpc_chttp2_encode_header(&g_compressor, nullptr, 0, &b, &hopt, &output); - grpc_slice_buffer_destroy_internal(&output); - grpc_metadata_batch_destroy(&b); + grpc_chttp2_encode_header(exec_ctx, &g_compressor, nullptr, 0, &b, &hopt, + &output); + grpc_slice_buffer_destroy_internal(exec_ctx, &output); + grpc_metadata_batch_destroy(exec_ctx, &b); GPR_ASSERT(g_compressor.table_size == elem_size + initial_table_size); gpr_free(e); } -static void test_encode_header_size() { - verify_table_size_change_match_elem_size("hello", "world", false); - verify_table_size_change_match_elem_size("hello-bin", "world", false); - verify_table_size_change_match_elem_size("true-binary-bin", +static void test_encode_header_size(grpc_exec_ctx* exec_ctx) { + verify_table_size_change_match_elem_size(exec_ctx, "hello", "world", false); + verify_table_size_change_match_elem_size(exec_ctx, "hello-bin", "world", + false); + verify_table_size_change_match_elem_size(exec_ctx, "true-binary-bin", "I_am_true_binary_value", true); } -static void test_interned_key_indexed() { +static void test_interned_key_indexed(grpc_exec_ctx* exec_ctx) { int i; verify_params params = {false, false, true}; - verify(params, "000009 0104 deadbeef 40 0161 0162 0f2f 0163", 2, "a", "b", - "a", "c"); + verify(exec_ctx, params, "000009 0104 deadbeef 40 0161 0162 0f2f 0163", 2, + "a", "b", "a", "c"); for (i = 0; i < 10; i++) { - verify(params, "000008 0104 deadbeef 0f2f 0162 0f2f 0163", 2, "a", "b", "a", - "c"); + verify(exec_ctx, params, "000008 0104 deadbeef 0f2f 0162 0f2f 0163", 2, "a", + "b", "a", "c"); } } -static void run_test(void (*test)(), const char* name) { +static void run_test(void (*test)(grpc_exec_ctx* exec_ctx), const char* name) { gpr_log(GPR_INFO, "RUN TEST: %s", name); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_chttp2_hpack_compressor_init(&g_compressor); - test(); - grpc_chttp2_hpack_compressor_destroy(&g_compressor); + test(&exec_ctx); + grpc_chttp2_hpack_compressor_destroy(&exec_ctx, &g_compressor); + grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { diff --git a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc index 9a195daee0a..942f25e0b75 100644 --- a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc +++ b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc @@ -29,7 +29,9 @@ bool squelch = true; bool leak_check = true; -static void onhdr(void* ud, grpc_mdelem md) { GRPC_MDELEM_UNREF(md); } +static void onhdr(grpc_exec_ctx* exec_ctx, void* ud, grpc_mdelem md) { + GRPC_MDELEM_UNREF(exec_ctx, md); +} static void dont_log(gpr_log_func_args* args) {} extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { @@ -37,14 +39,13 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (squelch) gpr_set_log_function(dont_log); grpc_init(); grpc_chttp2_hpack_parser parser; - { - grpc_core::ExecCtx exec_ctx; - grpc_chttp2_hpack_parser_init(&parser); - parser.on_header = onhdr; - GRPC_ERROR_UNREF(grpc_chttp2_hpack_parser_parse( - &parser, grpc_slice_from_static_buffer(data, size))); - grpc_chttp2_hpack_parser_destroy(&parser); - } + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_chttp2_hpack_parser_init(&exec_ctx, &parser); + parser.on_header = onhdr; + GRPC_ERROR_UNREF(grpc_chttp2_hpack_parser_parse( + &exec_ctx, &parser, grpc_slice_from_static_buffer(data, size))); + grpc_chttp2_hpack_parser_destroy(&exec_ctx, &parser); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); return 0; } diff --git a/test/core/transport/chttp2/hpack_parser_test.cc b/test/core/transport/chttp2/hpack_parser_test.cc index 9d3456a873a..82fb20aced6 100644 --- a/test/core/transport/chttp2/hpack_parser_test.cc +++ b/test/core/transport/chttp2/hpack_parser_test.cc @@ -32,7 +32,7 @@ typedef struct { va_list args; } test_checker; -static void onhdr(void* ud, grpc_mdelem md) { +static void onhdr(grpc_exec_ctx* exec_ctx, void* ud, grpc_mdelem md) { const char *ekey, *evalue; test_checker* chk = static_cast(ud); ekey = va_arg(chk->args, char*); @@ -41,7 +41,7 @@ static void onhdr(void* ud, grpc_mdelem md) { GPR_ASSERT(evalue); GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDKEY(md), ekey) == 0); GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDVALUE(md), evalue) == 0); - GRPC_MDELEM_UNREF(md); + GRPC_MDELEM_UNREF(exec_ctx, md); } static void test_vector(grpc_chttp2_hpack_parser* parser, @@ -62,9 +62,10 @@ static void test_vector(grpc_chttp2_hpack_parser* parser, grpc_slice_unref(input); for (i = 0; i < nslices; i++) { - grpc_core::ExecCtx exec_ctx; - GPR_ASSERT(grpc_chttp2_hpack_parser_parse(parser, slices[i]) == + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT(grpc_chttp2_hpack_parser_parse(&exec_ctx, parser, slices[i]) == GRPC_ERROR_NONE); + grpc_exec_ctx_finish(&exec_ctx); } for (i = 0; i < nslices; i++) { @@ -79,9 +80,9 @@ static void test_vector(grpc_chttp2_hpack_parser* parser, static void test_vectors(grpc_slice_split_mode mode) { grpc_chttp2_hpack_parser parser; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_chttp2_hpack_parser_init(&parser); + grpc_chttp2_hpack_parser_init(&exec_ctx, &parser); /* D.2.1 */ test_vector(&parser, mode, "400a 6375 7374 6f6d 2d6b 6579 0d63 7573" @@ -97,9 +98,9 @@ static void test_vectors(grpc_slice_split_mode mode) { "password", "secret", NULL); /* D.2.4 */ test_vector(&parser, mode, "82", ":method", "GET", NULL); - grpc_chttp2_hpack_parser_destroy(&parser); + grpc_chttp2_hpack_parser_destroy(&exec_ctx, &parser); - grpc_chttp2_hpack_parser_init(&parser); + grpc_chttp2_hpack_parser_init(&exec_ctx, &parser); /* D.3.1 */ test_vector(&parser, mode, "8286 8441 0f77 7777 2e65 7861 6d70 6c65" @@ -117,9 +118,9 @@ static void test_vectors(grpc_slice_split_mode mode) { ":method", "GET", ":scheme", "https", ":path", "/index.html", ":authority", "www.example.com", "custom-key", "custom-value", NULL); - grpc_chttp2_hpack_parser_destroy(&parser); + grpc_chttp2_hpack_parser_destroy(&exec_ctx, &parser); - grpc_chttp2_hpack_parser_init(&parser); + grpc_chttp2_hpack_parser_init(&exec_ctx, &parser); /* D.4.1 */ test_vector(&parser, mode, "8286 8441 8cf1 e3c2 e5f2 3a6b a0ab 90f4" @@ -137,11 +138,11 @@ static void test_vectors(grpc_slice_split_mode mode) { ":method", "GET", ":scheme", "https", ":path", "/index.html", ":authority", "www.example.com", "custom-key", "custom-value", NULL); - grpc_chttp2_hpack_parser_destroy(&parser); + grpc_chttp2_hpack_parser_destroy(&exec_ctx, &parser); - grpc_chttp2_hpack_parser_init(&parser); - grpc_chttp2_hptbl_set_max_bytes(&parser.table, 256); - grpc_chttp2_hptbl_set_current_table_size(&parser.table, 256); + grpc_chttp2_hpack_parser_init(&exec_ctx, &parser); + grpc_chttp2_hptbl_set_max_bytes(&exec_ctx, &parser.table, 256); + grpc_chttp2_hptbl_set_current_table_size(&exec_ctx, &parser.table, 256); /* D.5.1 */ test_vector(&parser, mode, "4803 3330 3258 0770 7269 7661 7465 611d" @@ -171,11 +172,11 @@ static void test_vectors(grpc_slice_split_mode mode) { "https://www.example.com", "content-encoding", "gzip", "set-cookie", "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1", NULL); - grpc_chttp2_hpack_parser_destroy(&parser); + grpc_chttp2_hpack_parser_destroy(&exec_ctx, &parser); - grpc_chttp2_hpack_parser_init(&parser); - grpc_chttp2_hptbl_set_max_bytes(&parser.table, 256); - grpc_chttp2_hptbl_set_current_table_size(&parser.table, 256); + grpc_chttp2_hpack_parser_init(&exec_ctx, &parser); + grpc_chttp2_hptbl_set_max_bytes(&exec_ctx, &parser.table, 256); + grpc_chttp2_hptbl_set_current_table_size(&exec_ctx, &parser.table, 256); /* D.6.1 */ test_vector(&parser, mode, "4882 6402 5885 aec3 771a 4b61 96d0 7abe" @@ -202,7 +203,9 @@ static void test_vectors(grpc_slice_split_mode mode) { "https://www.example.com", "content-encoding", "gzip", "set-cookie", "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1", NULL); - grpc_chttp2_hpack_parser_destroy(&parser); + grpc_chttp2_hpack_parser_destroy(&exec_ctx, &parser); + + grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { diff --git a/test/core/transport/chttp2/hpack_table_test.cc b/test/core/transport/chttp2/hpack_table_test.cc index 3f3cb2ee9db..ff7c2de5380 100644 --- a/test/core/transport/chttp2/hpack_table_test.cc +++ b/test/core/transport/chttp2/hpack_table_test.cc @@ -44,10 +44,10 @@ static void assert_index(const grpc_chttp2_hptbl* tbl, uint32_t idx, } static void test_static_lookup(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_chttp2_hptbl tbl; - grpc_chttp2_hptbl_init(&tbl); + grpc_chttp2_hptbl_init(&exec_ctx, &tbl); LOG_TEST("test_static_lookup"); assert_index(&tbl, 1, ":authority", ""); @@ -112,7 +112,8 @@ static void test_static_lookup(void) { assert_index(&tbl, 60, "via", ""); assert_index(&tbl, 61, "www-authenticate", ""); - grpc_chttp2_hptbl_destroy(&tbl); + grpc_chttp2_hptbl_destroy(&exec_ctx, &tbl); + grpc_exec_ctx_finish(&exec_ctx); } static void test_many_additions(void) { @@ -123,17 +124,18 @@ static void test_many_additions(void) { LOG_TEST("test_many_additions"); - grpc_core::ExecCtx exec_ctx; - grpc_chttp2_hptbl_init(&tbl); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_chttp2_hptbl_init(&exec_ctx, &tbl); for (i = 0; i < 100000; i++) { grpc_mdelem elem; gpr_asprintf(&key, "K:%d", i); gpr_asprintf(&value, "VALUE:%d", i); - elem = grpc_mdelem_from_slices(grpc_slice_from_copied_string(key), - grpc_slice_from_copied_string(value)); - GPR_ASSERT(grpc_chttp2_hptbl_add(&tbl, elem) == GRPC_ERROR_NONE); - GRPC_MDELEM_UNREF(elem); + elem = + grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_copied_string(key), + grpc_slice_from_copied_string(value)); + GPR_ASSERT(grpc_chttp2_hptbl_add(&exec_ctx, &tbl, elem) == GRPC_ERROR_NONE); + GRPC_MDELEM_UNREF(&exec_ctx, elem); assert_index(&tbl, 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY, key, value); gpr_free(key); gpr_free(value); @@ -146,23 +148,25 @@ static void test_many_additions(void) { } } - grpc_chttp2_hptbl_destroy(&tbl); + grpc_chttp2_hptbl_destroy(&exec_ctx, &tbl); + grpc_exec_ctx_finish(&exec_ctx); } static grpc_chttp2_hptbl_find_result find_simple(grpc_chttp2_hptbl* tbl, const char* key, const char* value) { - grpc_core::ExecCtx exec_ctx; - grpc_mdelem md = grpc_mdelem_from_slices( - grpc_slice_from_copied_string(key), grpc_slice_from_copied_string(value)); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_mdelem md = + grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_copied_string(key), + grpc_slice_from_copied_string(value)); grpc_chttp2_hptbl_find_result r = grpc_chttp2_hptbl_find(tbl, md); - GRPC_MDELEM_UNREF(md); - + GRPC_MDELEM_UNREF(&exec_ctx, md); + grpc_exec_ctx_finish(&exec_ctx); return r; } static void test_find(void) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_chttp2_hptbl tbl; uint32_t i; char buffer[32]; @@ -171,19 +175,21 @@ static void test_find(void) { LOG_TEST("test_find"); - grpc_chttp2_hptbl_init(&tbl); - elem = grpc_mdelem_from_slices(grpc_slice_from_static_string("abc"), - grpc_slice_from_static_string("xyz")); - GPR_ASSERT(grpc_chttp2_hptbl_add(&tbl, elem) == GRPC_ERROR_NONE); - GRPC_MDELEM_UNREF(elem); - elem = grpc_mdelem_from_slices(grpc_slice_from_static_string("abc"), - grpc_slice_from_static_string("123")); - GPR_ASSERT(grpc_chttp2_hptbl_add(&tbl, elem) == GRPC_ERROR_NONE); - GRPC_MDELEM_UNREF(elem); - elem = grpc_mdelem_from_slices(grpc_slice_from_static_string("x"), + grpc_chttp2_hptbl_init(&exec_ctx, &tbl); + elem = + grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_static_string("abc"), + grpc_slice_from_static_string("xyz")); + GPR_ASSERT(grpc_chttp2_hptbl_add(&exec_ctx, &tbl, elem) == GRPC_ERROR_NONE); + GRPC_MDELEM_UNREF(&exec_ctx, elem); + elem = + grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_static_string("abc"), + grpc_slice_from_static_string("123")); + GPR_ASSERT(grpc_chttp2_hptbl_add(&exec_ctx, &tbl, elem) == GRPC_ERROR_NONE); + GRPC_MDELEM_UNREF(&exec_ctx, elem); + elem = grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_static_string("x"), grpc_slice_from_static_string("1")); - GPR_ASSERT(grpc_chttp2_hptbl_add(&tbl, elem) == GRPC_ERROR_NONE); - GRPC_MDELEM_UNREF(elem); + GPR_ASSERT(grpc_chttp2_hptbl_add(&exec_ctx, &tbl, elem) == GRPC_ERROR_NONE); + GRPC_MDELEM_UNREF(&exec_ctx, elem); r = find_simple(&tbl, "abc", "123"); GPR_ASSERT(r.index == 2 + GRPC_CHTTP2_LAST_STATIC_ENTRY); @@ -232,10 +238,11 @@ static void test_find(void) { /* overflow the string buffer, check find still works */ for (i = 0; i < 10000; i++) { int64_ttoa(i, buffer); - elem = grpc_mdelem_from_slices(grpc_slice_from_static_string("test"), + elem = grpc_mdelem_from_slices(&exec_ctx, + grpc_slice_from_static_string("test"), grpc_slice_from_copied_string(buffer)); - GPR_ASSERT(grpc_chttp2_hptbl_add(&tbl, elem) == GRPC_ERROR_NONE); - GRPC_MDELEM_UNREF(elem); + GPR_ASSERT(grpc_chttp2_hptbl_add(&exec_ctx, &tbl, elem) == GRPC_ERROR_NONE); + GRPC_MDELEM_UNREF(&exec_ctx, elem); } r = find_simple(&tbl, "abc", "123"); @@ -263,7 +270,8 @@ static void test_find(void) { GPR_ASSERT(r.index != 0); GPR_ASSERT(r.has_value == 0); - grpc_chttp2_hptbl_destroy(&tbl); + grpc_chttp2_hptbl_destroy(&exec_ctx, &tbl); + grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { diff --git a/test/core/transport/chttp2/settings_timeout_test.cc b/test/core/transport/chttp2/settings_timeout_test.cc index 08473c72b68..670eae1f792 100644 --- a/test/core/transport/chttp2/settings_timeout_test.cc +++ b/test/core/transport/chttp2/settings_timeout_test.cc @@ -97,7 +97,7 @@ class Client { : server_address_(server_address) {} void Connect() { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_addresses* server_addresses = nullptr; grpc_error* error = grpc_blocking_resolve_address(server_address_, "80", &server_addresses); @@ -106,53 +106,56 @@ class Client { pollset_ = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); grpc_pollset_init(pollset_, &mu_); grpc_pollset_set* pollset_set = grpc_pollset_set_create(); - grpc_pollset_set_add_pollset(pollset_set, pollset_); + grpc_pollset_set_add_pollset(&exec_ctx, pollset_set, pollset_); EventState state; - grpc_tcp_client_connect(state.closure(), &endpoint_, pollset_set, + grpc_tcp_client_connect(&exec_ctx, state.closure(), &endpoint_, pollset_set, nullptr /* channel_args */, server_addresses->addrs, 1000); ASSERT_TRUE(PollUntilDone( - &state, + &exec_ctx, &state, grpc_timespec_to_millis_round_up(gpr_inf_future(GPR_CLOCK_MONOTONIC)))); ASSERT_EQ(GRPC_ERROR_NONE, state.error()); - grpc_pollset_set_destroy(pollset_set); - grpc_endpoint_add_to_pollset(endpoint_, pollset_); + grpc_pollset_set_destroy(&exec_ctx, pollset_set); + grpc_endpoint_add_to_pollset(&exec_ctx, endpoint_, pollset_); grpc_resolved_addresses_destroy(server_addresses); + grpc_exec_ctx_finish(&exec_ctx); } // Reads until an error is returned. // Returns true if an error was encountered before the deadline. bool ReadUntilError() { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_slice_buffer read_buffer; grpc_slice_buffer_init(&read_buffer); bool retval = true; // Use a deadline of 3 seconds, which is a lot more than we should // need for a 1-second timeout, but this helps avoid flakes. - grpc_millis deadline = grpc_core::ExecCtx::Get()->Now() + 3000; + grpc_millis deadline = grpc_exec_ctx_now(&exec_ctx) + 3000; while (true) { EventState state; - grpc_endpoint_read(endpoint_, &read_buffer, state.closure()); - if (!PollUntilDone(&state, deadline)) { + grpc_endpoint_read(&exec_ctx, endpoint_, &read_buffer, state.closure()); + if (!PollUntilDone(&exec_ctx, &state, deadline)) { retval = false; break; } if (state.error() != GRPC_ERROR_NONE) break; gpr_log(GPR_INFO, "client read %" PRIuPTR " bytes", read_buffer.length); - grpc_slice_buffer_reset_and_unref_internal(&read_buffer); + grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, &read_buffer); } - grpc_endpoint_shutdown(endpoint_, + grpc_endpoint_shutdown(&exec_ctx, endpoint_, GRPC_ERROR_CREATE_FROM_STATIC_STRING("shutdown")); - grpc_slice_buffer_destroy_internal(&read_buffer); + grpc_slice_buffer_destroy_internal(&exec_ctx, &read_buffer); + grpc_exec_ctx_finish(&exec_ctx); return retval; } void Shutdown() { - grpc_core::ExecCtx exec_ctx; - grpc_endpoint_destroy(endpoint_); - grpc_pollset_shutdown(pollset_, + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_endpoint_destroy(&exec_ctx, endpoint_); + grpc_pollset_shutdown(&exec_ctx, pollset_, GRPC_CLOSURE_CREATE(&Client::PollsetDestroy, pollset_, grpc_schedule_on_exec_ctx)); + grpc_exec_ctx_finish(&exec_ctx); } private: @@ -174,7 +177,8 @@ class Client { grpc_error* error() const { return error_; } private: - static void OnEventDone(void* arg, grpc_error* error) { + static void OnEventDone(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { gpr_log(GPR_INFO, "OnEventDone(): %s", grpc_error_string(error)); EventState* state = (EventState*)arg; state->error_ = GRPC_ERROR_REF(error); @@ -187,23 +191,24 @@ class Client { }; // Returns true if done, or false if deadline exceeded. - bool PollUntilDone(EventState* state, grpc_millis deadline) { + bool PollUntilDone(grpc_exec_ctx* exec_ctx, EventState* state, + grpc_millis deadline) { while (true) { grpc_pollset_worker* worker = nullptr; gpr_mu_lock(mu_); - GRPC_LOG_IF_ERROR( - "grpc_pollset_work", - grpc_pollset_work(pollset_, &worker, - grpc_core::ExecCtx::Get()->Now() + 1000)); + GRPC_LOG_IF_ERROR("grpc_pollset_work", + grpc_pollset_work(exec_ctx, pollset_, &worker, + grpc_exec_ctx_now(exec_ctx) + 1000)); gpr_mu_unlock(mu_); if (state != nullptr && state->done()) return true; - if (grpc_core::ExecCtx::Get()->Now() >= deadline) return false; + if (grpc_exec_ctx_now(exec_ctx) >= deadline) return false; } } - static void PollsetDestroy(void* arg, grpc_error* error) { + static void PollsetDestroy(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { grpc_pollset* pollset = (grpc_pollset*)arg; - grpc_pollset_destroy(pollset); + grpc_pollset_destroy(exec_ctx, pollset); gpr_free(pollset); } diff --git a/test/core/transport/chttp2/varint_test.cc b/test/core/transport/chttp2/varint_test.cc index 36760d0c723..413b461b3af 100644 --- a/test/core/transport/chttp2/varint_test.cc +++ b/test/core/transport/chttp2/varint_test.cc @@ -18,7 +18,6 @@ #include "src/core/ext/transport/chttp2/transport/varint.h" -#include #include #include @@ -45,13 +44,11 @@ static void test_varint(uint32_t value, uint32_t prefix_bits, uint8_t prefix_or, int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); TEST_VARINT(0, 1, 0, "\x00"); TEST_VARINT(128, 1, 0, "\x7f\x01"); TEST_VARINT(16384, 1, 0, "\x7f\x81\x7f"); TEST_VARINT(2097152, 1, 0, "\x7f\x81\xff\x7f"); TEST_VARINT(268435456, 1, 0, "\x7f\x81\xff\xff\x7f"); TEST_VARINT(0xffffffff, 1, 0, "\x7f\x80\xff\xff\xff\x0f"); - grpc_shutdown(); return 0; } diff --git a/test/core/transport/connectivity_state_test.cc b/test/core/transport/connectivity_state_test.cc index f5894599e52..11046e126e9 100644 --- a/test/core/transport/connectivity_state_test.cc +++ b/test/core/transport/connectivity_state_test.cc @@ -29,13 +29,14 @@ int g_counter; -static void must_succeed(void* arg, grpc_error* error) { +static void must_succeed(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(arg == THE_ARG); g_counter++; } -static void must_fail(void* arg, grpc_error* error) { +static void must_fail(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { GPR_ASSERT(error != GRPC_ERROR_NONE); GPR_ASSERT(arg == THE_ARG); g_counter++; @@ -58,7 +59,7 @@ static void test_connectivity_state_name(void) { static void test_check(void) { grpc_connectivity_state_tracker tracker; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_error* error; gpr_log(GPR_DEBUG, "test_check"); grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx"); @@ -66,7 +67,8 @@ static void test_check(void) { GRPC_CHANNEL_IDLE); GPR_ASSERT(grpc_connectivity_state_check(&tracker) == GRPC_CHANNEL_IDLE); GPR_ASSERT(error == GRPC_ERROR_NONE); - grpc_connectivity_state_destroy(&tracker); + grpc_connectivity_state_destroy(&exec_ctx, &tracker); + grpc_exec_ctx_finish(&exec_ctx); } static void test_subscribe_then_unsubscribe(void) { @@ -74,21 +76,23 @@ static void test_subscribe_then_unsubscribe(void) { grpc_closure* closure = GRPC_CLOSURE_CREATE(must_fail, THE_ARG, grpc_schedule_on_exec_ctx); grpc_connectivity_state state = GRPC_CHANNEL_IDLE; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_DEBUG, "test_subscribe_then_unsubscribe"); g_counter = 0; grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx"); - GPR_ASSERT(grpc_connectivity_state_notify_on_state_change(&tracker, &state, - closure)); - grpc_core::ExecCtx::Get()->Flush(); + GPR_ASSERT(grpc_connectivity_state_notify_on_state_change(&exec_ctx, &tracker, + &state, closure)); + grpc_exec_ctx_flush(&exec_ctx); GPR_ASSERT(state == GRPC_CHANNEL_IDLE); GPR_ASSERT(g_counter == 0); - grpc_connectivity_state_notify_on_state_change(&tracker, nullptr, closure); - grpc_core::ExecCtx::Get()->Flush(); + grpc_connectivity_state_notify_on_state_change(&exec_ctx, &tracker, nullptr, + closure); + grpc_exec_ctx_flush(&exec_ctx); GPR_ASSERT(state == GRPC_CHANNEL_IDLE); GPR_ASSERT(g_counter == 1); - grpc_connectivity_state_destroy(&tracker); + grpc_connectivity_state_destroy(&exec_ctx, &tracker); + grpc_exec_ctx_finish(&exec_ctx); } static void test_subscribe_then_destroy(void) { @@ -96,18 +100,17 @@ static void test_subscribe_then_destroy(void) { grpc_closure* closure = GRPC_CLOSURE_CREATE(must_succeed, THE_ARG, grpc_schedule_on_exec_ctx); grpc_connectivity_state state = GRPC_CHANNEL_IDLE; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_DEBUG, "test_subscribe_then_destroy"); g_counter = 0; grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx"); - GPR_ASSERT(grpc_connectivity_state_notify_on_state_change(&tracker, &state, - closure)); - grpc_core::ExecCtx::Get()->Flush(); + GPR_ASSERT(grpc_connectivity_state_notify_on_state_change(&exec_ctx, &tracker, + &state, closure)); + grpc_exec_ctx_flush(&exec_ctx); GPR_ASSERT(state == GRPC_CHANNEL_IDLE); GPR_ASSERT(g_counter == 0); - grpc_connectivity_state_destroy(&tracker); - - grpc_core::ExecCtx::Get()->Flush(); + grpc_connectivity_state_destroy(&exec_ctx, &tracker); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(state == GRPC_CHANNEL_SHUTDOWN); GPR_ASSERT(g_counter == 1); } @@ -117,30 +120,28 @@ static void test_subscribe_with_failure_then_destroy(void) { grpc_closure* closure = GRPC_CLOSURE_CREATE(must_fail, THE_ARG, grpc_schedule_on_exec_ctx); grpc_connectivity_state state = GRPC_CHANNEL_SHUTDOWN; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_DEBUG, "test_subscribe_with_failure_then_destroy"); g_counter = 0; grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_SHUTDOWN, "xxx"); GPR_ASSERT(0 == grpc_connectivity_state_notify_on_state_change( - &tracker, &state, closure)); - grpc_core::ExecCtx::Get()->Flush(); + &exec_ctx, &tracker, &state, closure)); + grpc_exec_ctx_flush(&exec_ctx); GPR_ASSERT(state == GRPC_CHANNEL_SHUTDOWN); GPR_ASSERT(g_counter == 0); - grpc_connectivity_state_destroy(&tracker); - grpc_core::ExecCtx::Get()->Flush(); + grpc_connectivity_state_destroy(&exec_ctx, &tracker); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(state == GRPC_CHANNEL_SHUTDOWN); GPR_ASSERT(g_counter == 1); } int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); grpc_core::testing::grpc_tracer_enable_flag(&grpc_connectivity_state_trace); test_connectivity_state_name(); test_check(); test_subscribe_then_unsubscribe(); test_subscribe_then_destroy(); test_subscribe_with_failure_then_destroy(); - grpc_shutdown(); return 0; } diff --git a/test/core/transport/metadata_test.cc b/test/core/transport/metadata_test.cc index 5c52ae8d5f5..b60a9619fb4 100644 --- a/test/core/transport/metadata_test.cc +++ b/test/core/transport/metadata_test.cc @@ -60,15 +60,15 @@ static void test_create_metadata(bool intern_keys, bool intern_values) { intern_keys, intern_values); grpc_init(); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; m1 = grpc_mdelem_from_slices( - maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values)); m2 = grpc_mdelem_from_slices( - maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values)); m3 = grpc_mdelem_from_slices( - maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("c"), intern_values)); GPR_ASSERT(grpc_mdelem_eq(m1, m2)); GPR_ASSERT(!grpc_mdelem_eq(m3, m1)); @@ -77,10 +77,10 @@ static void test_create_metadata(bool intern_keys, bool intern_values) { GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDKEY(m1), "a") == 0); GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDVALUE(m1), "b") == 0); GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDVALUE(m3), "c") == 0); - GRPC_MDELEM_UNREF(m1); - GRPC_MDELEM_UNREF(m2); - GRPC_MDELEM_UNREF(m3); - + GRPC_MDELEM_UNREF(&exec_ctx, m1); + GRPC_MDELEM_UNREF(&exec_ctx, m2); + GRPC_MDELEM_UNREF(&exec_ctx, m3); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); } @@ -95,15 +95,19 @@ static void test_create_many_ephemeral_metadata(bool intern_keys, intern_keys, intern_values); grpc_init(); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; /* add, and immediately delete a bunch of different elements */ for (i = 0; i < MANY; i++) { gpr_ltoa(i, buffer); - GRPC_MDELEM_UNREF(grpc_mdelem_from_slices( - maybe_intern(grpc_slice_from_static_string("a"), intern_keys), - maybe_intern(grpc_slice_from_copied_string(buffer), intern_values))); + GRPC_MDELEM_UNREF( + &exec_ctx, + grpc_mdelem_from_slices( + &exec_ctx, + maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + maybe_intern(grpc_slice_from_copied_string(buffer), + intern_values))); } - + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); } @@ -117,28 +121,28 @@ static void test_create_many_persistant_metadata(void) { gpr_log(GPR_INFO, "test_create_many_persistant_metadata"); grpc_init(); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; /* add phase */ for (i = 0; i < MANY; i++) { gpr_ltoa(i, buffer); created[i] = grpc_mdelem_from_slices( - grpc_slice_intern(grpc_slice_from_static_string("a")), + &exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("a")), grpc_slice_intern(grpc_slice_from_static_string(buffer))); } /* verify phase */ for (i = 0; i < MANY; i++) { gpr_ltoa(i, buffer); md = grpc_mdelem_from_slices( - grpc_slice_intern(grpc_slice_from_static_string("a")), + &exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("a")), grpc_slice_intern(grpc_slice_from_static_string(buffer))); GPR_ASSERT(grpc_mdelem_eq(md, created[i])); - GRPC_MDELEM_UNREF(md); + GRPC_MDELEM_UNREF(&exec_ctx, md); } /* cleanup phase */ for (i = 0; i < MANY; i++) { - GRPC_MDELEM_UNREF(created[i]); + GRPC_MDELEM_UNREF(&exec_ctx, created[i]); } - + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); gpr_free(created); @@ -151,25 +155,31 @@ static void test_spin_creating_the_same_thing(bool intern_keys, intern_keys, intern_values); grpc_init(); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_mdelem a, b, c; GRPC_MDELEM_UNREF( + &exec_ctx, a = grpc_mdelem_from_slices( + &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values))); GRPC_MDELEM_UNREF( + &exec_ctx, b = grpc_mdelem_from_slices( + &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values))); GRPC_MDELEM_UNREF( + &exec_ctx, c = grpc_mdelem_from_slices( + &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values))); if (intern_keys && intern_values) { GPR_ASSERT(a.payload == b.payload); GPR_ASSERT(a.payload == c.payload); } - + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); } @@ -178,16 +188,16 @@ static void test_identity_laws(bool intern_keys, bool intern_values) { intern_keys, intern_values); grpc_init(); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_mdelem a, b, c; a = grpc_mdelem_from_slices( - maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values)); b = grpc_mdelem_from_slices( - maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values)); c = grpc_mdelem_from_slices( - maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values)); GPR_ASSERT(grpc_mdelem_eq(a, a)); GPR_ASSERT(grpc_mdelem_eq(b, b)); @@ -206,10 +216,10 @@ static void test_identity_laws(bool intern_keys, bool intern_values) { GPR_ASSERT(a.payload != c.payload); GPR_ASSERT(b.payload != c.payload); } - GRPC_MDELEM_UNREF(a); - GRPC_MDELEM_UNREF(b); - GRPC_MDELEM_UNREF(c); - + GRPC_MDELEM_UNREF(&exec_ctx, a); + GRPC_MDELEM_UNREF(&exec_ctx, b); + GRPC_MDELEM_UNREF(&exec_ctx, c); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); } @@ -225,7 +235,7 @@ static void test_things_stick_around(void) { gpr_log(GPR_INFO, "test_things_stick_around"); grpc_init(); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; for (i = 0; i < nstrs; i++) { gpr_asprintf(&buffer, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx%" PRIuPTR "x", i); @@ -236,7 +246,7 @@ static void test_things_stick_around(void) { for (i = 0; i < nstrs; i++) { grpc_slice_ref_internal(strs[i]); - grpc_slice_unref_internal(strs[i]); + grpc_slice_unref_internal(&exec_ctx, strs[i]); } for (i = 0; i < nstrs; i++) { @@ -248,17 +258,18 @@ static void test_things_stick_around(void) { } for (i = 0; i < nstrs; i++) { - grpc_slice_unref_internal(strs[shuf[i]]); + grpc_slice_unref_internal(&exec_ctx, strs[shuf[i]]); for (j = i + 1; j < nstrs; j++) { gpr_asprintf(&buffer, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx%" PRIuPTR "x", shuf[j]); test = grpc_slice_intern(grpc_slice_from_static_string(buffer)); GPR_ASSERT(grpc_slice_is_equivalent(test, strs[shuf[j]])); - grpc_slice_unref_internal(test); + grpc_slice_unref_internal(&exec_ctx, test); gpr_free(buffer); } } + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); gpr_free(strs); gpr_free(shuf); @@ -271,38 +282,39 @@ static void test_user_data_works(void) { gpr_log(GPR_INFO, "test_user_data_works"); grpc_init(); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; ud1 = static_cast(gpr_malloc(sizeof(int))); *ud1 = 1; ud2 = static_cast(gpr_malloc(sizeof(int))); *ud2 = 2; md = grpc_mdelem_from_slices( - grpc_slice_intern(grpc_slice_from_static_string("abc")), + &exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("abc")), grpc_slice_intern(grpc_slice_from_static_string("123"))); grpc_mdelem_set_user_data(md, gpr_free, ud1); grpc_mdelem_set_user_data(md, gpr_free, ud2); GPR_ASSERT(grpc_mdelem_get_user_data(md, gpr_free) == ud1); - GRPC_MDELEM_UNREF(md); - + GRPC_MDELEM_UNREF(&exec_ctx, md); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); } -static void verify_ascii_header_size(const char* key, const char* value, - bool intern_key, bool intern_value) { +static void verify_ascii_header_size(grpc_exec_ctx* exec_ctx, const char* key, + const char* value, bool intern_key, + bool intern_value) { grpc_mdelem elem = grpc_mdelem_from_slices( - maybe_intern(grpc_slice_from_static_string(key), intern_key), + exec_ctx, maybe_intern(grpc_slice_from_static_string(key), intern_key), maybe_intern(grpc_slice_from_static_string(value), intern_value)); size_t elem_size = grpc_mdelem_get_size_in_hpack_table(elem, false); size_t expected_size = 32 + strlen(key) + strlen(value); GPR_ASSERT(expected_size == elem_size); - GRPC_MDELEM_UNREF(elem); + GRPC_MDELEM_UNREF(exec_ctx, elem); } -static void verify_binary_header_size(const char* key, const uint8_t* value, - size_t value_len, bool intern_key, - bool intern_value) { +static void verify_binary_header_size(grpc_exec_ctx* exec_ctx, const char* key, + const uint8_t* value, size_t value_len, + bool intern_key, bool intern_value) { grpc_mdelem elem = grpc_mdelem_from_slices( - maybe_intern(grpc_slice_from_static_string(key), intern_key), + exec_ctx, maybe_intern(grpc_slice_from_static_string(key), intern_key), maybe_intern(grpc_slice_from_static_buffer(value, value_len), intern_value)); GPR_ASSERT(grpc_is_binary_header(GRPC_MDKEY(elem))); @@ -312,9 +324,9 @@ static void verify_binary_header_size(const char* key, const uint8_t* value, grpc_slice base64_encoded = grpc_chttp2_base64_encode(value_slice); size_t expected_size = 32 + strlen(key) + GRPC_SLICE_LENGTH(base64_encoded); GPR_ASSERT(expected_size == elem_size); - grpc_slice_unref_internal(value_slice); - grpc_slice_unref_internal(base64_encoded); - GRPC_MDELEM_UNREF(elem); + grpc_slice_unref_internal(exec_ctx, value_slice); + grpc_slice_unref_internal(exec_ctx, base64_encoded); + GRPC_MDELEM_UNREF(exec_ctx, elem); } #define BUFFER_SIZE 64 @@ -322,23 +334,27 @@ static void test_mdelem_sizes_in_hpack(bool intern_key, bool intern_value) { gpr_log(GPR_INFO, "test_mdelem_size: intern_key=%d intern_value=%d", intern_key, intern_value); grpc_init(); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; uint8_t binary_value[BUFFER_SIZE] = {0}; for (uint8_t i = 0; i < BUFFER_SIZE; i++) { binary_value[i] = i; } - verify_ascii_header_size("hello", "world", intern_key, intern_value); - verify_ascii_header_size("hello", "worldxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", - intern_key, intern_value); - verify_ascii_header_size(":scheme", "http", intern_key, intern_value); + verify_ascii_header_size(&exec_ctx, "hello", "world", intern_key, + intern_value); + verify_ascii_header_size(&exec_ctx, "hello", + "worldxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", intern_key, + intern_value); + verify_ascii_header_size(&exec_ctx, ":scheme", "http", intern_key, + intern_value); for (uint8_t i = 0; i < BUFFER_SIZE; i++) { - verify_binary_header_size("hello-bin", binary_value, i, intern_key, - intern_value); + verify_binary_header_size(&exec_ctx, "hello-bin", binary_value, i, + intern_key, intern_value); } + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); } @@ -346,13 +362,13 @@ static void test_copied_static_metadata(bool dup_key, bool dup_value) { gpr_log(GPR_INFO, "test_static_metadata: dup_key=%d dup_value=%d", dup_key, dup_value); grpc_init(); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; for (size_t i = 0; i < GRPC_STATIC_MDELEM_COUNT; i++) { grpc_mdelem p = GRPC_MAKE_MDELEM(&grpc_static_mdelem_table[i], GRPC_MDELEM_STORAGE_STATIC); grpc_mdelem q = - grpc_mdelem_from_slices(maybe_dup(GRPC_MDKEY(p), dup_key), + grpc_mdelem_from_slices(&exec_ctx, maybe_dup(GRPC_MDKEY(p), dup_key), maybe_dup(GRPC_MDVALUE(p), dup_value)); GPR_ASSERT(grpc_mdelem_eq(p, q)); if (dup_key || dup_value) { @@ -360,16 +376,16 @@ static void test_copied_static_metadata(bool dup_key, bool dup_value) { } else { GPR_ASSERT(p.payload == q.payload); } - GRPC_MDELEM_UNREF(p); - GRPC_MDELEM_UNREF(q); + GRPC_MDELEM_UNREF(&exec_ctx, p); + GRPC_MDELEM_UNREF(&exec_ctx, q); } + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); } int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); test_no_op(); for (int k = 0; k <= 1; k++) { for (int v = 0; v <= 1; v++) { @@ -384,6 +400,5 @@ int main(int argc, char** argv) { test_create_many_persistant_metadata(); test_things_stick_around(); test_user_data_works(); - grpc_shutdown(); return 0; } diff --git a/test/core/transport/status_conversion_test.cc b/test/core/transport/status_conversion_test.cc index 1ed6ccfba62..7af5d12cb7b 100644 --- a/test/core/transport/status_conversion_test.cc +++ b/test/core/transport/status_conversion_test.cc @@ -22,11 +22,12 @@ #define GRPC_STATUS_TO_HTTP2_ERROR(a, b) \ GPR_ASSERT(grpc_status_to_http2_error(a) == (b)) -#define HTTP2_ERROR_TO_GRPC_STATUS(a, deadline, b) \ - do { \ - grpc_core::ExecCtx exec_ctx; \ - GPR_ASSERT(grpc_http2_error_to_grpc_status(a, deadline) == (b)); \ - \ +#define HTTP2_ERROR_TO_GRPC_STATUS(a, deadline, b) \ + do { \ + grpc_exec_ctx my_exec_ctx = GRPC_EXEC_CTX_INIT; \ + GPR_ASSERT(grpc_http2_error_to_grpc_status(&my_exec_ctx, a, deadline) == \ + (b)); \ + grpc_exec_ctx_finish(&my_exec_ctx); \ } while (0) #define GRPC_STATUS_TO_HTTP2_STATUS(a, b) \ GPR_ASSERT(grpc_status_to_http2_status(a) == (b)) diff --git a/test/core/transport/stream_owned_slice_test.cc b/test/core/transport/stream_owned_slice_test.cc index 7831f67a048..e82df2117df 100644 --- a/test/core/transport/stream_owned_slice_test.cc +++ b/test/core/transport/stream_owned_slice_test.cc @@ -20,14 +20,12 @@ #include "test/core/util/test_config.h" -#include #include -static void do_nothing(void* arg, grpc_error* error) {} +static void do_nothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} int main(int argc, char** argv) { grpc_test_init(argc, argv); - grpc_init(); uint8_t buffer[] = "abc123"; grpc_stream_refcount r; @@ -41,6 +39,5 @@ int main(int argc, char** argv) { grpc_slice_unref(slice); GPR_ASSERT(r.refs.count == 1); - grpc_shutdown(); return 0; } diff --git a/test/core/util/mock_endpoint.cc b/test/core/util/mock_endpoint.cc index 4b35a581b10..d9545efa499 100644 --- a/test/core/util/mock_endpoint.cc +++ b/test/core/util/mock_endpoint.cc @@ -40,13 +40,13 @@ typedef struct grpc_mock_endpoint { grpc_resource_user* resource_user; } grpc_mock_endpoint; -static void me_read(grpc_endpoint* ep, grpc_slice_buffer* slices, - grpc_closure* cb) { +static void me_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_slice_buffer* slices, grpc_closure* cb) { grpc_mock_endpoint* m = (grpc_mock_endpoint*)ep; gpr_mu_lock(&m->mu); if (m->read_buffer.count > 0) { grpc_slice_buffer_swap(&m->read_buffer, slices); - GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); } else { m->on_read = cb; m->on_read_out = slices; @@ -54,41 +54,44 @@ static void me_read(grpc_endpoint* ep, grpc_slice_buffer* slices, gpr_mu_unlock(&m->mu); } -static void me_write(grpc_endpoint* ep, grpc_slice_buffer* slices, - grpc_closure* cb) { +static void me_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_slice_buffer* slices, grpc_closure* cb) { grpc_mock_endpoint* m = (grpc_mock_endpoint*)ep; for (size_t i = 0; i < slices->count; i++) { m->on_write(slices->slices[i]); } - GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); } -static void me_add_to_pollset(grpc_endpoint* ep, grpc_pollset* pollset) {} +static void me_add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_pollset* pollset) {} -static void me_add_to_pollset_set(grpc_endpoint* ep, +static void me_add_to_pollset_set(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, grpc_pollset_set* pollset) {} -static void me_delete_from_pollset_set(grpc_endpoint* ep, +static void me_delete_from_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_endpoint* ep, grpc_pollset_set* pollset) {} -static void me_shutdown(grpc_endpoint* ep, grpc_error* why) { +static void me_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_error* why) { grpc_mock_endpoint* m = (grpc_mock_endpoint*)ep; gpr_mu_lock(&m->mu); if (m->on_read) { - GRPC_CLOSURE_SCHED(m->on_read, + GRPC_CLOSURE_SCHED(exec_ctx, m->on_read, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Endpoint Shutdown", &why, 1)); m->on_read = nullptr; } gpr_mu_unlock(&m->mu); - grpc_resource_user_shutdown(m->resource_user); + grpc_resource_user_shutdown(exec_ctx, m->resource_user); GRPC_ERROR_UNREF(why); } -static void me_destroy(grpc_endpoint* ep) { +static void me_destroy(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep) { grpc_mock_endpoint* m = (grpc_mock_endpoint*)ep; grpc_slice_buffer_destroy(&m->read_buffer); - grpc_resource_user_unref(m->resource_user); + grpc_resource_user_unref(exec_ctx, m->resource_user); gpr_free(m); } @@ -131,12 +134,13 @@ grpc_endpoint* grpc_mock_endpoint_create(void (*on_write)(grpc_slice slice), return &m->base; } -void grpc_mock_endpoint_put_read(grpc_endpoint* ep, grpc_slice slice) { +void grpc_mock_endpoint_put_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_slice slice) { grpc_mock_endpoint* m = (grpc_mock_endpoint*)ep; gpr_mu_lock(&m->mu); if (m->on_read != nullptr) { grpc_slice_buffer_add(m->on_read_out, slice); - GRPC_CLOSURE_SCHED(m->on_read, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, m->on_read, GRPC_ERROR_NONE); m->on_read = nullptr; } else { grpc_slice_buffer_add(&m->read_buffer, slice); diff --git a/test/core/util/mock_endpoint.h b/test/core/util/mock_endpoint.h index 6521d3e8e81..ccabaf7c3b0 100644 --- a/test/core/util/mock_endpoint.h +++ b/test/core/util/mock_endpoint.h @@ -23,7 +23,8 @@ grpc_endpoint* grpc_mock_endpoint_create(void (*on_write)(grpc_slice slice), grpc_resource_quota* resource_quota); -void grpc_mock_endpoint_put_read(grpc_endpoint* mock_endpoint, +void grpc_mock_endpoint_put_read(grpc_exec_ctx* exec_ctx, + grpc_endpoint* mock_endpoint, grpc_slice slice); #endif diff --git a/test/core/util/one_corpus_entry_fuzzer.cc b/test/core/util/one_corpus_entry_fuzzer.cc index c745eb5dc65..c0b67da1e26 100644 --- a/test/core/util/one_corpus_entry_fuzzer.cc +++ b/test/core/util/one_corpus_entry_fuzzer.cc @@ -18,10 +18,7 @@ #include -#include - #include -#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/load_file.h" extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size); @@ -33,15 +30,10 @@ int main(int argc, char** argv) { grpc_slice buffer; squelch = false; leak_check = false; - /* TODO(yashkt) Calling grpc_init breaks tests. Fix the tests and replace - * grpc_core::ExecCtx::GlobalInit with grpc_init and GlobalShutdown with - * grpc_shutdown */ GPR_ASSERT( GRPC_LOG_IF_ERROR("load_file", grpc_load_file(argv[1], 0, &buffer))); LLVMFuzzerTestOneInput(GRPC_SLICE_START_PTR(buffer), GRPC_SLICE_LENGTH(buffer)); - grpc_core::ExecCtx::GlobalInit(); grpc_slice_unref(buffer); - grpc_core::ExecCtx::GlobalShutdown(); return 0; } diff --git a/test/core/util/passthru_endpoint.cc b/test/core/util/passthru_endpoint.cc index 5f127cb960f..a9efe22b696 100644 --- a/test/core/util/passthru_endpoint.cc +++ b/test/core/util/passthru_endpoint.cc @@ -49,22 +49,22 @@ struct passthru_endpoint { int halves; grpc_passthru_endpoint_stats* stats; grpc_passthru_endpoint_stats - dummy_stats; // used if constructor stats == nullptr + dummy_stats; // used if constructor stats == NULL bool shutdown; half client; half server; }; -static void me_read(grpc_endpoint* ep, grpc_slice_buffer* slices, - grpc_closure* cb) { +static void me_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_slice_buffer* slices, grpc_closure* cb) { half* m = (half*)ep; gpr_mu_lock(&m->parent->mu); if (m->parent->shutdown) { GRPC_CLOSURE_SCHED( - cb, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Already shutdown")); + exec_ctx, cb, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Already shutdown")); } else if (m->read_buffer.count > 0) { grpc_slice_buffer_swap(&m->read_buffer, slices); - GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); } else { m->on_read = cb; m->on_read_out = slices; @@ -77,8 +77,8 @@ static half* other_half(half* h) { return &h->parent->client; } -static void me_write(grpc_endpoint* ep, grpc_slice_buffer* slices, - grpc_closure* cb) { +static void me_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_slice_buffer* slices, grpc_closure* cb) { half* m = other_half((half*)ep); gpr_mu_lock(&m->parent->mu); grpc_error* error = GRPC_ERROR_NONE; @@ -89,7 +89,7 @@ static void me_write(grpc_endpoint* ep, grpc_slice_buffer* slices, for (size_t i = 0; i < slices->count; i++) { grpc_slice_buffer_add(m->on_read_out, grpc_slice_copy(slices->slices[i])); } - GRPC_CLOSURE_SCHED(m->on_read, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, m->on_read, GRPC_ERROR_NONE); m->on_read = nullptr; } else { for (size_t i = 0; i < slices->count; i++) { @@ -98,49 +98,52 @@ static void me_write(grpc_endpoint* ep, grpc_slice_buffer* slices, } } gpr_mu_unlock(&m->parent->mu); - GRPC_CLOSURE_SCHED(cb, error); + GRPC_CLOSURE_SCHED(exec_ctx, cb, error); } -static void me_add_to_pollset(grpc_endpoint* ep, grpc_pollset* pollset) {} +static void me_add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_pollset* pollset) {} -static void me_add_to_pollset_set(grpc_endpoint* ep, +static void me_add_to_pollset_set(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, grpc_pollset_set* pollset) {} -static void me_delete_from_pollset_set(grpc_endpoint* ep, +static void me_delete_from_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_endpoint* ep, grpc_pollset_set* pollset) {} -static void me_shutdown(grpc_endpoint* ep, grpc_error* why) { +static void me_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_error* why) { half* m = (half*)ep; gpr_mu_lock(&m->parent->mu); m->parent->shutdown = true; if (m->on_read) { GRPC_CLOSURE_SCHED( - m->on_read, + exec_ctx, m->on_read, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING("Shutdown", &why, 1)); m->on_read = nullptr; } m = other_half(m); if (m->on_read) { GRPC_CLOSURE_SCHED( - m->on_read, + exec_ctx, m->on_read, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING("Shutdown", &why, 1)); m->on_read = nullptr; } gpr_mu_unlock(&m->parent->mu); - grpc_resource_user_shutdown(m->resource_user); + grpc_resource_user_shutdown(exec_ctx, m->resource_user); GRPC_ERROR_UNREF(why); } -static void me_destroy(grpc_endpoint* ep) { +static void me_destroy(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep) { passthru_endpoint* p = ((half*)ep)->parent; gpr_mu_lock(&p->mu); if (0 == --p->halves) { gpr_mu_unlock(&p->mu); gpr_mu_destroy(&p->mu); - grpc_slice_buffer_destroy_internal(&p->client.read_buffer); - grpc_slice_buffer_destroy_internal(&p->server.read_buffer); - grpc_resource_user_unref(p->client.resource_user); - grpc_resource_user_unref(p->server.resource_user); + grpc_slice_buffer_destroy_internal(exec_ctx, &p->client.read_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, &p->server.read_buffer); + grpc_resource_user_unref(exec_ctx, p->client.resource_user); + grpc_resource_user_unref(exec_ctx, p->server.resource_user); gpr_free(p); } else { gpr_mu_unlock(&p->mu); diff --git a/test/core/util/port_server_client.cc b/test/core/util/port_server_client.cc index 7e76c8063f9..edec50b4240 100644 --- a/test/core/util/port_server_client.cc +++ b/test/core/util/port_server_client.cc @@ -40,19 +40,22 @@ typedef struct freereq { int done; } freereq; -static void destroy_pops_and_shutdown(void* p, grpc_error* error) { +static void destroy_pops_and_shutdown(grpc_exec_ctx* exec_ctx, void* p, + grpc_error* error) { grpc_pollset* pollset = grpc_polling_entity_pollset((grpc_polling_entity*)p); - grpc_pollset_destroy(pollset); + grpc_pollset_destroy(exec_ctx, pollset); gpr_free(pollset); } -static void freed_port_from_server(void* arg, grpc_error* error) { +static void freed_port_from_server(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { freereq* pr = (freereq*)arg; gpr_mu_lock(pr->mu); pr->done = 1; GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(grpc_polling_entity_pollset(&pr->pops), nullptr)); + grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&pr->pops), + nullptr)); gpr_mu_unlock(pr->mu); } @@ -62,7 +65,7 @@ void grpc_free_port_using_server(int port) { grpc_httpcli_response rsp; freereq pr; char* path; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_closure* shutdown_closure; grpc_init(); @@ -84,30 +87,30 @@ void grpc_free_port_using_server(int port) { grpc_httpcli_context_init(&context); grpc_resource_quota* resource_quota = grpc_resource_quota_create("port_server_client/free"); - grpc_httpcli_get(&context, &pr.pops, resource_quota, &req, - grpc_core::ExecCtx::Get()->Now() + 30 * GPR_MS_PER_SEC, + grpc_httpcli_get(&exec_ctx, &context, &pr.pops, resource_quota, &req, + grpc_exec_ctx_now(&exec_ctx) + 30 * GPR_MS_PER_SEC, GRPC_CLOSURE_CREATE(freed_port_from_server, &pr, grpc_schedule_on_exec_ctx), &rsp); - grpc_resource_quota_unref_internal(resource_quota); - grpc_core::ExecCtx::Get()->Flush(); + grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); + grpc_exec_ctx_flush(&exec_ctx); gpr_mu_lock(pr.mu); while (!pr.done) { grpc_pollset_worker* worker = nullptr; if (!GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work( - grpc_polling_entity_pollset(&pr.pops), &worker, - grpc_core::ExecCtx::Get()->Now() + GPR_MS_PER_SEC))) { + grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&pr.pops), + &worker, + grpc_exec_ctx_now(&exec_ctx) + GPR_MS_PER_SEC))) { pr.done = 1; } } gpr_mu_unlock(pr.mu); - grpc_httpcli_context_destroy(&context); - grpc_pollset_shutdown(grpc_polling_entity_pollset(&pr.pops), + grpc_httpcli_context_destroy(&exec_ctx, &context); + grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&pr.pops), shutdown_closure); - + grpc_exec_ctx_finish(&exec_ctx); gpr_free(path); grpc_http_response_destroy(&rsp); @@ -124,7 +127,8 @@ typedef struct portreq { grpc_httpcli_response response; } portreq; -static void got_port_from_server(void* arg, grpc_error* error) { +static void got_port_from_server(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { size_t i; int port = 0; portreq* pr = (portreq*)arg; @@ -150,7 +154,8 @@ static void got_port_from_server(void* arg, grpc_error* error) { pr->port = 0; GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(grpc_polling_entity_pollset(&pr->pops), nullptr)); + grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&pr->pops), + nullptr)); gpr_mu_unlock(pr->mu); return; } @@ -167,12 +172,12 @@ static void got_port_from_server(void* arg, grpc_error* error) { memset(&pr->response, 0, sizeof(pr->response)); grpc_resource_quota* resource_quota = grpc_resource_quota_create("port_server_client/pick_retry"); - grpc_httpcli_get(pr->ctx, &pr->pops, resource_quota, &req, - grpc_core::ExecCtx::Get()->Now() + 30 * GPR_MS_PER_SEC, + grpc_httpcli_get(exec_ctx, pr->ctx, &pr->pops, resource_quota, &req, + grpc_exec_ctx_now(exec_ctx) + 30 * GPR_MS_PER_SEC, GRPC_CLOSURE_CREATE(got_port_from_server, pr, grpc_schedule_on_exec_ctx), &pr->response); - grpc_resource_quota_unref_internal(resource_quota); + grpc_resource_quota_unref_internal(exec_ctx, resource_quota); return; } GPR_ASSERT(response); @@ -186,7 +191,8 @@ static void got_port_from_server(void* arg, grpc_error* error) { pr->port = port; GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(grpc_polling_entity_pollset(&pr->pops), nullptr)); + grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&pr->pops), + nullptr)); gpr_mu_unlock(pr->mu); } @@ -194,55 +200,53 @@ int grpc_pick_port_using_server(void) { grpc_httpcli_context context; grpc_httpcli_request req; portreq pr; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_closure* shutdown_closure; grpc_init(); - { - grpc_core::ExecCtx exec_ctx; - memset(&pr, 0, sizeof(pr)); - memset(&req, 0, sizeof(req)); - grpc_pollset* pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); - grpc_pollset_init(pollset, &pr.mu); - pr.pops = grpc_polling_entity_create_from_pollset(pollset); - shutdown_closure = GRPC_CLOSURE_CREATE(destroy_pops_and_shutdown, &pr.pops, - grpc_schedule_on_exec_ctx); - pr.port = -1; - pr.server = const_cast(GRPC_PORT_SERVER_ADDRESS); - pr.ctx = &context; - - req.host = const_cast(GRPC_PORT_SERVER_ADDRESS); - req.http.path = const_cast("/get"); - grpc_httpcli_context_init(&context); - grpc_resource_quota* resource_quota = - grpc_resource_quota_create("port_server_client/pick"); - grpc_httpcli_get(&context, &pr.pops, resource_quota, &req, - grpc_core::ExecCtx::Get()->Now() + 30 * GPR_MS_PER_SEC, - GRPC_CLOSURE_CREATE(got_port_from_server, &pr, - grpc_schedule_on_exec_ctx), - &pr.response); - grpc_resource_quota_unref_internal(resource_quota); - grpc_core::ExecCtx::Get()->Flush(); - gpr_mu_lock(pr.mu); - while (pr.port == -1) { - grpc_pollset_worker* worker = nullptr; - if (!GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work( - grpc_polling_entity_pollset(&pr.pops), &worker, - grpc_core::ExecCtx::Get()->Now() + GPR_MS_PER_SEC))) { - pr.port = 0; - } - } - gpr_mu_unlock(pr.mu); + memset(&pr, 0, sizeof(pr)); + memset(&req, 0, sizeof(req)); + grpc_pollset* pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); + grpc_pollset_init(pollset, &pr.mu); + pr.pops = grpc_polling_entity_create_from_pollset(pollset); + shutdown_closure = GRPC_CLOSURE_CREATE(destroy_pops_and_shutdown, &pr.pops, + grpc_schedule_on_exec_ctx); + pr.port = -1; + pr.server = const_cast(GRPC_PORT_SERVER_ADDRESS); + pr.ctx = &context; - grpc_http_response_destroy(&pr.response); - grpc_httpcli_context_destroy(&context); - grpc_pollset_shutdown(grpc_polling_entity_pollset(&pr.pops), - shutdown_closure); + req.host = const_cast(GRPC_PORT_SERVER_ADDRESS); + req.http.path = const_cast("/get"); - grpc_core::ExecCtx::Get()->Flush(); + grpc_httpcli_context_init(&context); + grpc_resource_quota* resource_quota = + grpc_resource_quota_create("port_server_client/pick"); + grpc_httpcli_get( + &exec_ctx, &context, &pr.pops, resource_quota, &req, + grpc_exec_ctx_now(&exec_ctx) + 30 * GPR_MS_PER_SEC, + GRPC_CLOSURE_CREATE(got_port_from_server, &pr, grpc_schedule_on_exec_ctx), + &pr.response); + grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); + grpc_exec_ctx_flush(&exec_ctx); + gpr_mu_lock(pr.mu); + while (pr.port == -1) { + grpc_pollset_worker* worker = nullptr; + if (!GRPC_LOG_IF_ERROR( + "pollset_work", + grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&pr.pops), + &worker, + grpc_exec_ctx_now(&exec_ctx) + GPR_MS_PER_SEC))) { + pr.port = 0; + } } + gpr_mu_unlock(pr.mu); + + grpc_http_response_destroy(&pr.response); + grpc_httpcli_context_destroy(&exec_ctx, &context); + grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&pr.pops), + shutdown_closure); + grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); return pr.port; diff --git a/test/core/util/reconnect_server.cc b/test/core/util/reconnect_server.cc index bcafc4e898e..4775b074eb5 100644 --- a/test/core/util/reconnect_server.cc +++ b/test/core/util/reconnect_server.cc @@ -55,7 +55,7 @@ static void pretty_print_backoffs(reconnect_server* server) { } } -static void on_connect(void* arg, grpc_endpoint* tcp, +static void on_connect(grpc_exec_ctx* exec_ctx, void* arg, grpc_endpoint* tcp, grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor) { gpr_free(acceptor); @@ -65,9 +65,9 @@ static void on_connect(void* arg, grpc_endpoint* tcp, gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); timestamp_list* new_tail; peer = grpc_endpoint_get_peer(tcp); - grpc_endpoint_shutdown(tcp, + grpc_endpoint_shutdown(exec_ctx, tcp, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Connected")); - grpc_endpoint_destroy(tcp); + grpc_endpoint_destroy(exec_ctx, tcp); if (peer) { last_colon = strrchr(peer, ':'); if (server->peer == nullptr) { diff --git a/test/core/util/test_tcp_server.cc b/test/core/util/test_tcp_server.cc index 5f6af4e7070..da34da6fd00 100644 --- a/test/core/util/test_tcp_server.cc +++ b/test/core/util/test_tcp_server.cc @@ -33,7 +33,8 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -static void on_server_destroyed(void* data, grpc_error* error) { +static void on_server_destroyed(grpc_exec_ctx* exec_ctx, void* data, + grpc_error* error) { test_tcp_server* server = static_cast(data); server->shutdown = 1; } @@ -55,46 +56,51 @@ void test_tcp_server_start(test_tcp_server* server, int port) { grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; int port_added; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; addr->sin_family = AF_INET; addr->sin_port = htons((uint16_t)port); memset(&addr->sin_addr, 0, sizeof(addr->sin_addr)); - grpc_error* error = grpc_tcp_server_create(&server->shutdown_complete, - nullptr, &server->tcp_server); + grpc_error* error = grpc_tcp_server_create( + &exec_ctx, &server->shutdown_complete, nullptr, &server->tcp_server); GPR_ASSERT(error == GRPC_ERROR_NONE); error = grpc_tcp_server_add_port(server->tcp_server, &resolved_addr, &port_added); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(port_added == port); - grpc_tcp_server_start(server->tcp_server, &server->pollset, 1, + grpc_tcp_server_start(&exec_ctx, server->tcp_server, &server->pollset, 1, server->on_connect, server->cb_data); gpr_log(GPR_INFO, "test tcp server listening on 0.0.0.0:%d", port); + + grpc_exec_ctx_finish(&exec_ctx); } void test_tcp_server_poll(test_tcp_server* server, int seconds) { grpc_pollset_worker* worker = nullptr; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_millis deadline = grpc_timespec_to_millis_round_up( grpc_timeout_seconds_to_deadline(seconds)); gpr_mu_lock(server->mu); - GRPC_LOG_IF_ERROR("pollset_work", - grpc_pollset_work(server->pollset, &worker, deadline)); + GRPC_LOG_IF_ERROR( + "pollset_work", + grpc_pollset_work(&exec_ctx, server->pollset, &worker, deadline)); gpr_mu_unlock(server->mu); + grpc_exec_ctx_finish(&exec_ctx); } -static void do_nothing(void* arg, grpc_error* error) {} -static void finish_pollset(void* arg, grpc_error* error) { - grpc_pollset_destroy(static_cast(arg)); +static void do_nothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} +static void finish_pollset(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { + grpc_pollset_destroy(exec_ctx, static_cast(arg)); } void test_tcp_server_destroy(test_tcp_server* server) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_timespec shutdown_deadline; grpc_closure do_nothing_cb; - grpc_tcp_server_unref(server->tcp_server); + grpc_tcp_server_unref(&exec_ctx, server->tcp_server); GRPC_CLOSURE_INIT(&do_nothing_cb, do_nothing, nullptr, grpc_schedule_on_exec_ctx); shutdown_deadline = gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), @@ -103,10 +109,10 @@ void test_tcp_server_destroy(test_tcp_server* server) { gpr_time_cmp(gpr_now(GPR_CLOCK_MONOTONIC), shutdown_deadline) < 0) { test_tcp_server_poll(server, 1); } - grpc_pollset_shutdown(server->pollset, + grpc_pollset_shutdown(&exec_ctx, server->pollset, GRPC_CLOSURE_CREATE(finish_pollset, server->pollset, grpc_schedule_on_exec_ctx)); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_finish(&exec_ctx); gpr_free(server->pollset); grpc_shutdown(); } diff --git a/test/core/util/trickle_endpoint.cc b/test/core/util/trickle_endpoint.cc index f95ed624632..4544fb7f49b 100644 --- a/test/core/util/trickle_endpoint.cc +++ b/test/core/util/trickle_endpoint.cc @@ -45,23 +45,24 @@ typedef struct { grpc_closure* write_cb; } trickle_endpoint; -static void te_read(grpc_endpoint* ep, grpc_slice_buffer* slices, - grpc_closure* cb) { +static void te_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_slice_buffer* slices, grpc_closure* cb) { trickle_endpoint* te = (trickle_endpoint*)ep; - grpc_endpoint_read(te->wrapped, slices, cb); + grpc_endpoint_read(exec_ctx, te->wrapped, slices, cb); } -static void maybe_call_write_cb_locked(trickle_endpoint* te) { +static void maybe_call_write_cb_locked(grpc_exec_ctx* exec_ctx, + trickle_endpoint* te) { if (te->write_cb != nullptr && (te->error != GRPC_ERROR_NONE || te->write_buffer.length <= WRITE_BUFFER_SIZE)) { - GRPC_CLOSURE_SCHED(te->write_cb, GRPC_ERROR_REF(te->error)); + GRPC_CLOSURE_SCHED(exec_ctx, te->write_cb, GRPC_ERROR_REF(te->error)); te->write_cb = nullptr; } } -static void te_write(grpc_endpoint* ep, grpc_slice_buffer* slices, - grpc_closure* cb) { +static void te_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_slice_buffer* slices, grpc_closure* cb) { trickle_endpoint* te = (trickle_endpoint*)ep; gpr_mu_lock(&te->mu); GPR_ASSERT(te->write_cb == nullptr); @@ -73,44 +74,47 @@ static void te_write(grpc_endpoint* ep, grpc_slice_buffer* slices, grpc_slice_copy(slices->slices[i])); } te->write_cb = cb; - maybe_call_write_cb_locked(te); + maybe_call_write_cb_locked(exec_ctx, te); gpr_mu_unlock(&te->mu); } -static void te_add_to_pollset(grpc_endpoint* ep, grpc_pollset* pollset) { +static void te_add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_pollset* pollset) { trickle_endpoint* te = (trickle_endpoint*)ep; - grpc_endpoint_add_to_pollset(te->wrapped, pollset); + grpc_endpoint_add_to_pollset(exec_ctx, te->wrapped, pollset); } -static void te_add_to_pollset_set(grpc_endpoint* ep, +static void te_add_to_pollset_set(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, grpc_pollset_set* pollset_set) { trickle_endpoint* te = (trickle_endpoint*)ep; - grpc_endpoint_add_to_pollset_set(te->wrapped, pollset_set); + grpc_endpoint_add_to_pollset_set(exec_ctx, te->wrapped, pollset_set); } -static void te_delete_from_pollset_set(grpc_endpoint* ep, +static void te_delete_from_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_endpoint* ep, grpc_pollset_set* pollset_set) { trickle_endpoint* te = (trickle_endpoint*)ep; - grpc_endpoint_delete_from_pollset_set(te->wrapped, pollset_set); + grpc_endpoint_delete_from_pollset_set(exec_ctx, te->wrapped, pollset_set); } -static void te_shutdown(grpc_endpoint* ep, grpc_error* why) { +static void te_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_error* why) { trickle_endpoint* te = (trickle_endpoint*)ep; gpr_mu_lock(&te->mu); if (te->error == GRPC_ERROR_NONE) { te->error = GRPC_ERROR_REF(why); } - maybe_call_write_cb_locked(te); + maybe_call_write_cb_locked(exec_ctx, te); gpr_mu_unlock(&te->mu); - grpc_endpoint_shutdown(te->wrapped, why); + grpc_endpoint_shutdown(exec_ctx, te->wrapped, why); } -static void te_destroy(grpc_endpoint* ep) { +static void te_destroy(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep) { trickle_endpoint* te = (trickle_endpoint*)ep; - grpc_endpoint_destroy(te->wrapped); + grpc_endpoint_destroy(exec_ctx, te->wrapped); gpr_mu_destroy(&te->mu); - grpc_slice_buffer_destroy_internal(&te->write_buffer); - grpc_slice_buffer_destroy_internal(&te->writing_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, &te->write_buffer); + grpc_slice_buffer_destroy_internal(exec_ctx, &te->writing_buffer); GRPC_ERROR_UNREF(te->error); gpr_free(te); } @@ -130,7 +134,8 @@ static int te_get_fd(grpc_endpoint* ep) { return grpc_endpoint_get_fd(te->wrapped); } -static void te_finish_write(void* arg, grpc_error* error) { +static void te_finish_write(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { trickle_endpoint* te = (trickle_endpoint*)arg; gpr_mu_lock(&te->mu); te->writing = false; @@ -168,7 +173,8 @@ static double ts2dbl(gpr_timespec s) { return (double)s.tv_sec + 1e-9 * (double)s.tv_nsec; } -size_t grpc_trickle_endpoint_trickle(grpc_endpoint* ep) { +size_t grpc_trickle_endpoint_trickle(grpc_exec_ctx* exec_ctx, + grpc_endpoint* ep) { trickle_endpoint* te = (trickle_endpoint*)ep; gpr_mu_lock(&te->mu); if (!te->writing && te->write_buffer.length > 0) { @@ -183,9 +189,9 @@ size_t grpc_trickle_endpoint_trickle(grpc_endpoint* ep) { te->writing = true; te->last_write = now; grpc_endpoint_write( - te->wrapped, &te->writing_buffer, + exec_ctx, te->wrapped, &te->writing_buffer, GRPC_CLOSURE_CREATE(te_finish_write, te, grpc_schedule_on_exec_ctx)); - maybe_call_write_cb_locked(te); + maybe_call_write_cb_locked(exec_ctx, te); } } size_t backlog = te->write_buffer.length; diff --git a/test/core/util/trickle_endpoint.h b/test/core/util/trickle_endpoint.h index cd07de905a7..11c113bda82 100644 --- a/test/core/util/trickle_endpoint.h +++ b/test/core/util/trickle_endpoint.h @@ -25,7 +25,8 @@ grpc_endpoint* grpc_trickle_endpoint_create(grpc_endpoint* wrap, double bytes_per_second); /* Allow up to \a bytes through the endpoint. Returns the new backlog. */ -size_t grpc_trickle_endpoint_trickle(grpc_endpoint* endpoint); +size_t grpc_trickle_endpoint_trickle(grpc_exec_ctx* exec_ctx, + grpc_endpoint* endpoint); size_t grpc_trickle_get_backlog(grpc_endpoint* endpoint); diff --git a/test/cpp/client/client_channel_stress_test.cc b/test/cpp/client/client_channel_stress_test.cc index e829d5278bd..0954b28df01 100644 --- a/test/cpp/client/client_channel_stress_test.cc +++ b/test/cpp/client/client_channel_stress_test.cc @@ -212,13 +212,13 @@ class ClientChannelStressTest { }; void SetNextResolution(const std::vector& address_data) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_lb_addresses* addresses = grpc_lb_addresses_create(address_data.size(), nullptr); for (size_t i = 0; i < address_data.size(); ++i) { char* lb_uri_str; gpr_asprintf(&lb_uri_str, "ipv4:127.0.0.1:%d", address_data[i].port); - grpc_uri* lb_uri = grpc_uri_parse(lb_uri_str, true); + grpc_uri* lb_uri = grpc_uri_parse(&exec_ctx, lb_uri_str, true); GPR_ASSERT(lb_uri != nullptr); grpc_lb_addresses_set_address_from_uri( addresses, i, lb_uri, address_data[i].is_balancer, @@ -228,9 +228,10 @@ class ClientChannelStressTest { } grpc_arg fake_addresses = grpc_lb_addresses_create_channel_arg(addresses); grpc_channel_args fake_result = {1, &fake_addresses}; - grpc_fake_resolver_response_generator_set_response(response_generator_, - &fake_result); - grpc_lb_addresses_destroy(addresses); + grpc_fake_resolver_response_generator_set_response( + &exec_ctx, response_generator_, &fake_result); + grpc_lb_addresses_destroy(&exec_ctx, addresses); + grpc_exec_ctx_finish(&exec_ctx); } void KeepSendingRequests() { diff --git a/test/cpp/common/channel_arguments_test.cc b/test/cpp/common/channel_arguments_test.cc index f330c01281e..d6ed2e5aa24 100644 --- a/test/cpp/common/channel_arguments_test.cc +++ b/test/cpp/common/channel_arguments_test.cc @@ -249,8 +249,5 @@ TEST_F(ChannelArgumentsTest, SetUserAgentPrefix) { int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - grpc_init(); - int ret = RUN_ALL_TESTS(); - grpc_shutdown(); - return ret; + return RUN_ALL_TESTS(); } diff --git a/test/cpp/common/channel_filter_test.cc b/test/cpp/common/channel_filter_test.cc index 7bdd53f9e7a..638518107bb 100644 --- a/test/cpp/common/channel_filter_test.cc +++ b/test/cpp/common/channel_filter_test.cc @@ -28,7 +28,7 @@ class MyChannelData : public ChannelData { public: MyChannelData() {} - grpc_error* Init(grpc_channel_element* elem, + grpc_error* Init(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, grpc_channel_element_args* args) override { (void)args->channel_args; // Make sure field is available. return GRPC_ERROR_NONE; @@ -39,7 +39,7 @@ class MyCallData : public CallData { public: MyCallData() {} - grpc_error* Init(grpc_call_element* elem, + grpc_error* Init(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_element_args* args) override { (void)args->path; // Make sure field is available. return GRPC_ERROR_NONE; diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index e6e6e71f422..f8bb12fde1b 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -112,13 +112,13 @@ class ClientLbEnd2endTest : public ::testing::Test { } void SetNextResolution(const std::vector& ports) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_lb_addresses* addresses = grpc_lb_addresses_create(ports.size(), nullptr); for (size_t i = 0; i < ports.size(); ++i) { char* lb_uri_str; gpr_asprintf(&lb_uri_str, "ipv4:127.0.0.1:%d", ports[i]); - grpc_uri* lb_uri = grpc_uri_parse(lb_uri_str, true); + grpc_uri* lb_uri = grpc_uri_parse(&exec_ctx, lb_uri_str, true); GPR_ASSERT(lb_uri != nullptr); grpc_lb_addresses_set_address_from_uri(addresses, i, lb_uri, false /* is balancer */, @@ -130,10 +130,11 @@ class ClientLbEnd2endTest : public ::testing::Test { grpc_lb_addresses_create_channel_arg(addresses); grpc_channel_args* fake_result = grpc_channel_args_copy_and_add(nullptr, &fake_addresses, 1); - grpc_fake_resolver_response_generator_set_response(response_generator_, - fake_result); - grpc_channel_args_destroy(fake_result); - grpc_lb_addresses_destroy(addresses); + grpc_fake_resolver_response_generator_set_response( + &exec_ctx, response_generator_, fake_result); + grpc_channel_args_destroy(&exec_ctx, fake_result); + grpc_lb_addresses_destroy(&exec_ctx, addresses); + grpc_exec_ctx_finish(&exec_ctx); } void ResetStub(const grpc::string& lb_policy_name = "") { diff --git a/test/cpp/end2end/filter_end2end_test.cc b/test/cpp/end2end/filter_end2end_test.cc index c4430379dbf..f260ea0016d 100644 --- a/test/cpp/end2end/filter_end2end_test.cc +++ b/test/cpp/end2end/filter_end2end_test.cc @@ -100,7 +100,7 @@ int GetCallCounterValue() { class ChannelDataImpl : public ChannelData { public: - grpc_error* Init(grpc_channel_element* elem, + grpc_error* Init(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, grpc_channel_element_args* args) { IncrementConnectionCounter(); return GRPC_ERROR_NONE; @@ -109,12 +109,13 @@ class ChannelDataImpl : public ChannelData { class CallDataImpl : public CallData { public: - void StartTransportStreamOpBatch(grpc_call_element* elem, + void StartTransportStreamOpBatch(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, TransportStreamOpBatch* op) override { // Incrementing the counter could be done from Init(), but we want // to test that the individual methods are actually called correctly. if (op->recv_initial_metadata() != nullptr) IncrementCallCounter(); - grpc_call_next_op(elem, op->op()); + grpc_call_next_op(exec_ctx, elem, op->op()); } }; diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index d4ee6b429f2..bbf3da4663a 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -454,13 +454,13 @@ class GrpclbEnd2endTest : public ::testing::Test { }; void SetNextResolution(const std::vector& address_data) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_lb_addresses* addresses = grpc_lb_addresses_create(address_data.size(), nullptr); for (size_t i = 0; i < address_data.size(); ++i) { char* lb_uri_str; gpr_asprintf(&lb_uri_str, "ipv4:127.0.0.1:%d", address_data[i].port); - grpc_uri* lb_uri = grpc_uri_parse(lb_uri_str, true); + grpc_uri* lb_uri = grpc_uri_parse(&exec_ctx, lb_uri_str, true); GPR_ASSERT(lb_uri != nullptr); grpc_lb_addresses_set_address_from_uri( addresses, i, lb_uri, address_data[i].is_balancer, @@ -470,9 +470,10 @@ class GrpclbEnd2endTest : public ::testing::Test { } grpc_arg fake_addresses = grpc_lb_addresses_create_channel_arg(addresses); grpc_channel_args fake_result = {1, &fake_addresses}; - grpc_fake_resolver_response_generator_set_response(response_generator_, - &fake_result); - grpc_lb_addresses_destroy(addresses); + grpc_fake_resolver_response_generator_set_response( + &exec_ctx, response_generator_, &fake_result); + grpc_lb_addresses_destroy(&exec_ctx, addresses); + grpc_exec_ctx_finish(&exec_ctx); } const std::vector GetBackendPorts(const size_t start_index = 0) const { diff --git a/test/cpp/grpclb/grpclb_api_test.cc b/test/cpp/grpclb/grpclb_api_test.cc index a494d6f5195..7b62080b497 100644 --- a/test/cpp/grpclb/grpclb_api_test.cc +++ b/test/cpp/grpclb/grpclb_api_test.cc @@ -17,7 +17,6 @@ */ #include -#include #include #include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" @@ -136,8 +135,5 @@ TEST_F(GrpclbTest, ParseResponseServerList) { int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - grpc_init(); - int ret = RUN_ALL_TESTS(); - grpc_shutdown(); - return ret; + return RUN_ALL_TESTS(); } diff --git a/test/cpp/grpclb/grpclb_test.cc b/test/cpp/grpclb/grpclb_test.cc index 64c53b14423..a469fbb7e3b 100644 --- a/test/cpp/grpclb/grpclb_test.cc +++ b/test/cpp/grpclb/grpclb_test.cc @@ -562,7 +562,7 @@ static void perform_request(client_fixture* cf) { #define BALANCERS_NAME "lb.name" static void setup_client(const server_fixture* lb_server, const server_fixture* backends, client_fixture* cf) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; char* expected_target_names = nullptr; const char* backends_name = lb_server->servers_hostport; @@ -574,7 +574,7 @@ static void setup_client(const server_fixture* lb_server, grpc_lb_addresses* addresses = grpc_lb_addresses_create(1, nullptr); char* lb_uri_str; gpr_asprintf(&lb_uri_str, "ipv4:%s", lb_server->servers_hostport); - grpc_uri* lb_uri = grpc_uri_parse(lb_uri_str, true); + grpc_uri* lb_uri = grpc_uri_parse(&exec_ctx, lb_uri_str, true); GPR_ASSERT(lb_uri != nullptr); grpc_lb_addresses_set_address_from_uri(addresses, 0, lb_uri, true, lb_server->balancer_name, nullptr); @@ -586,7 +586,7 @@ static void setup_client(const server_fixture* lb_server, grpc_lb_addresses_create_channel_arg(addresses); grpc_channel_args* fake_result = grpc_channel_args_copy_and_add(nullptr, &fake_addresses, 1); - grpc_lb_addresses_destroy(addresses); + grpc_lb_addresses_destroy(&exec_ctx, addresses); const grpc_arg new_args[] = { grpc_fake_transport_expected_targets_arg(expected_target_names), @@ -601,12 +601,13 @@ static void setup_client(const server_fixture* lb_server, grpc_fake_transport_security_credentials_create(); cf->client = grpc_secure_channel_create(fake_creds, cf->server_uri, args, nullptr); - grpc_fake_resolver_response_generator_set_response(response_generator, - fake_result); - grpc_channel_args_destroy(fake_result); - grpc_channel_credentials_unref(fake_creds); - grpc_channel_args_destroy(args); + grpc_fake_resolver_response_generator_set_response( + &exec_ctx, response_generator, fake_result); + grpc_channel_args_destroy(&exec_ctx, fake_result); + grpc_channel_credentials_unref(&exec_ctx, fake_creds); + grpc_channel_args_destroy(&exec_ctx, args); grpc_fake_resolver_response_generator_unref(response_generator); + grpc_exec_ctx_finish(&exec_ctx); } static void teardown_client(client_fixture* cf) { diff --git a/test/cpp/microbenchmarks/bm_call_create.cc b/test/cpp/microbenchmarks/bm_call_create.cc index 5c2c38c27dc..a45c577320d 100644 --- a/test/cpp/microbenchmarks/bm_call_create.cc +++ b/test/cpp/microbenchmarks/bm_call_create.cc @@ -311,9 +311,12 @@ static void BM_LameChannelCallCreateCoreSeparateBatch(benchmark::State& state) { } BENCHMARK(BM_LameChannelCallCreateCoreSeparateBatch); -static void FilterDestroy(void* arg, grpc_error* error) { gpr_free(arg); } +static void FilterDestroy(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { + gpr_free(arg); +} -static void DoNothing(void* arg, grpc_error* error) {} +static void DoNothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} class FakeClientChannelFactory : public grpc_client_channel_factory { public: @@ -321,12 +324,15 @@ class FakeClientChannelFactory : public grpc_client_channel_factory { private: static void NoRef(grpc_client_channel_factory* factory) {} - static void NoUnref(grpc_client_channel_factory* factory) {} - static grpc_subchannel* CreateSubchannel(grpc_client_channel_factory* factory, + static void NoUnref(grpc_exec_ctx* exec_ctx, + grpc_client_channel_factory* factory) {} + static grpc_subchannel* CreateSubchannel(grpc_exec_ctx* exec_ctx, + grpc_client_channel_factory* factory, const grpc_subchannel_args* args) { return nullptr; } - static grpc_channel* CreateClientChannel(grpc_client_channel_factory* factory, + static grpc_channel* CreateClientChannel(grpc_exec_ctx* exec_ctx, + grpc_client_channel_factory* factory, const char* target, grpc_client_channel_type type, const grpc_channel_args* args) { @@ -360,32 +366,36 @@ struct Fixture { namespace dummy_filter { -static void StartTransportStreamOp(grpc_call_element* elem, +static void StartTransportStreamOp(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_transport_stream_op_batch* op) {} -static void StartTransportOp(grpc_channel_element* elem, +static void StartTransportOp(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_transport_op* op) {} -static grpc_error* InitCallElem(grpc_call_element* elem, +static grpc_error* InitCallElem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { return GRPC_ERROR_NONE; } -static void SetPollsetOrPollsetSet(grpc_call_element* elem, +static void SetPollsetOrPollsetSet(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_polling_entity* pollent) {} -static void DestroyCallElem(grpc_call_element* elem, +static void DestroyCallElem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_sched_closure) {} -grpc_error* InitChannelElem(grpc_channel_element* elem, +grpc_error* InitChannelElem(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } -void DestroyChannelElem(grpc_channel_element* elem) {} +void DestroyChannelElem(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem) {} -void GetChannelInfo(grpc_channel_element* elem, +void GetChannelInfo(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, const grpc_channel_info* channel_info) {} static const grpc_channel_filter dummy_filter = {StartTransportStreamOp, @@ -412,38 +422,41 @@ size_t sizeof_stream; /* = sizeof(transport stream) */ const char* name; /* implementation of grpc_transport_init_stream */ -int InitStream(grpc_transport* self, grpc_stream* stream, - grpc_stream_refcount* refcount, const void* server_data, - gpr_arena* arena) { +int InitStream(grpc_exec_ctx* exec_ctx, grpc_transport* self, + grpc_stream* stream, grpc_stream_refcount* refcount, + const void* server_data, gpr_arena* arena) { return 0; } /* implementation of grpc_transport_set_pollset */ -void SetPollset(grpc_transport* self, grpc_stream* stream, - grpc_pollset* pollset) {} +void SetPollset(grpc_exec_ctx* exec_ctx, grpc_transport* self, + grpc_stream* stream, grpc_pollset* pollset) {} /* implementation of grpc_transport_set_pollset */ -void SetPollsetSet(grpc_transport* self, grpc_stream* stream, - grpc_pollset_set* pollset_set) {} +void SetPollsetSet(grpc_exec_ctx* exec_ctx, grpc_transport* self, + grpc_stream* stream, grpc_pollset_set* pollset_set) {} /* implementation of grpc_transport_perform_stream_op */ -void PerformStreamOp(grpc_transport* self, grpc_stream* stream, - grpc_transport_stream_op_batch* op) { - GRPC_CLOSURE_SCHED(op->on_complete, GRPC_ERROR_NONE); +void PerformStreamOp(grpc_exec_ctx* exec_ctx, grpc_transport* self, + grpc_stream* stream, grpc_transport_stream_op_batch* op) { + GRPC_CLOSURE_SCHED(exec_ctx, op->on_complete, GRPC_ERROR_NONE); } /* implementation of grpc_transport_perform_op */ -void PerformOp(grpc_transport* self, grpc_transport_op* op) {} +void PerformOp(grpc_exec_ctx* exec_ctx, grpc_transport* self, + grpc_transport_op* op) {} /* implementation of grpc_transport_destroy_stream */ -void DestroyStream(grpc_transport* self, grpc_stream* stream, - grpc_closure* then_sched_closure) {} +void DestroyStream(grpc_exec_ctx* exec_ctx, grpc_transport* self, + grpc_stream* stream, grpc_closure* then_sched_closure) {} /* implementation of grpc_transport_destroy */ -void Destroy(grpc_transport* self) {} +void Destroy(grpc_exec_ctx* exec_ctx, grpc_transport* self) {} /* implementation of grpc_transport_get_endpoint */ -grpc_endpoint* GetEndpoint(grpc_transport* self) { return nullptr; } +grpc_endpoint* GetEndpoint(grpc_exec_ctx* exec_ctx, grpc_transport* self) { + return nullptr; +} static const grpc_transport_vtable dummy_transport_vtable = { 0, "dummy_http2", InitStream, @@ -459,8 +472,8 @@ class NoOp { public: class Op { public: - Op(NoOp* p, grpc_call_stack* s) {} - void Finish() {} + Op(grpc_exec_ctx* exec_ctx, NoOp* p, grpc_call_stack* s) {} + void Finish(grpc_exec_ctx* exec_ctx) {} }; }; @@ -476,11 +489,13 @@ class SendEmptyMetadata { class Op { public: - Op(SendEmptyMetadata* p, grpc_call_stack* s) { + Op(grpc_exec_ctx* exec_ctx, SendEmptyMetadata* p, grpc_call_stack* s) { grpc_metadata_batch_init(&batch_); p->op_payload_.send_initial_metadata.send_initial_metadata = &batch_; } - void Finish() { grpc_metadata_batch_destroy(&batch_); } + void Finish(grpc_exec_ctx* exec_ctx) { + grpc_metadata_batch_destroy(exec_ctx, &batch_); + } private: grpc_metadata_batch batch_; @@ -521,20 +536,20 @@ static void BM_IsolatedFilter(benchmark::State& state) { label << " #has_dummy_filter"; } - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; size_t channel_size = grpc_channel_stack_size( filters.size() == 0 ? nullptr : &filters[0], filters.size()); grpc_channel_stack* channel_stack = static_cast(gpr_zalloc(channel_size)); GPR_ASSERT(GRPC_LOG_IF_ERROR( "channel_stack_init", - grpc_channel_stack_init(1, FilterDestroy, channel_stack, &filters[0], - filters.size(), &channel_args, + grpc_channel_stack_init(&exec_ctx, 1, FilterDestroy, channel_stack, + &filters[0], filters.size(), &channel_args, fixture.flags & REQUIRES_TRANSPORT ? &dummy_transport::dummy_transport : nullptr, "CHANNEL", channel_stack))); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); grpc_call_stack* call_stack = static_cast(gpr_zalloc(channel_stack->call_stack_size)); grpc_millis deadline = GRPC_MILLIS_INF_FUTURE; @@ -553,12 +568,12 @@ static void BM_IsolatedFilter(benchmark::State& state) { call_args.arena = gpr_arena_create(kArenaSize); while (state.KeepRunning()) { GPR_TIMER_SCOPE("BenchmarkCycle", 0); - GRPC_ERROR_UNREF( - grpc_call_stack_init(channel_stack, 1, DoNothing, nullptr, &call_args)); - typename TestOp::Op op(&test_op_data, call_stack); - grpc_call_stack_destroy(call_stack, &final_info, nullptr); - op.Finish(); - grpc_core::ExecCtx::Get()->Flush(); + GRPC_ERROR_UNREF(grpc_call_stack_init(&exec_ctx, channel_stack, 1, + DoNothing, nullptr, &call_args)); + typename TestOp::Op op(&exec_ctx, &test_op_data, call_stack); + grpc_call_stack_destroy(&exec_ctx, call_stack, &final_info, nullptr); + op.Finish(&exec_ctx); + grpc_exec_ctx_flush(&exec_ctx); // recreate arena every 64k iterations to avoid oom if (0 == (state.iterations() & 0xffff)) { gpr_arena_destroy(call_args.arena); @@ -566,8 +581,8 @@ static void BM_IsolatedFilter(benchmark::State& state) { } } gpr_arena_destroy(call_args.arena); - grpc_channel_stack_destroy(channel_stack); - + grpc_channel_stack_destroy(&exec_ctx, channel_stack); + grpc_exec_ctx_finish(&exec_ctx); gpr_free(channel_stack); gpr_free(call_stack); @@ -617,55 +632,59 @@ typedef struct { grpc_call_combiner* call_combiner; } call_data; -static void StartTransportStreamOp(grpc_call_element* elem, +static void StartTransportStreamOp(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_transport_stream_op_batch* op) { call_data* calld = static_cast(elem->call_data); if (op->recv_initial_metadata) { GRPC_CALL_COMBINER_START( - calld->call_combiner, + exec_ctx, calld->call_combiner, op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_NONE, "recv_initial_metadata"); } if (op->recv_message) { - GRPC_CALL_COMBINER_START(calld->call_combiner, + GRPC_CALL_COMBINER_START(exec_ctx, calld->call_combiner, op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE, "recv_message"); } - GRPC_CLOSURE_SCHED(op->on_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, op->on_complete, GRPC_ERROR_NONE); } -static void StartTransportOp(grpc_channel_element* elem, +static void StartTransportOp(grpc_exec_ctx* exec_ctx, + grpc_channel_element* elem, grpc_transport_op* op) { if (op->disconnect_with_error != GRPC_ERROR_NONE) { GRPC_ERROR_UNREF(op->disconnect_with_error); } - GRPC_CLOSURE_SCHED(op->on_consumed, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, op->on_consumed, GRPC_ERROR_NONE); } -static grpc_error* InitCallElem(grpc_call_element* elem, +static grpc_error* InitCallElem(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = static_cast(elem->call_data); calld->call_combiner = args->call_combiner; return GRPC_ERROR_NONE; } -static void SetPollsetOrPollsetSet(grpc_call_element* elem, +static void SetPollsetOrPollsetSet(grpc_exec_ctx* exec_ctx, + grpc_call_element* elem, grpc_polling_entity* pollent) {} -static void DestroyCallElem(grpc_call_element* elem, +static void DestroyCallElem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_sched_closure) { - GRPC_CLOSURE_SCHED(then_sched_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, then_sched_closure, GRPC_ERROR_NONE); } -grpc_error* InitChannelElem(grpc_channel_element* elem, +grpc_error* InitChannelElem(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } -void DestroyChannelElem(grpc_channel_element* elem) {} +void DestroyChannelElem(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem) {} -void GetChannelInfo(grpc_channel_element* elem, +void GetChannelInfo(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, const grpc_channel_info* channel_info) {} static const grpc_channel_filter isolated_call_filter = { @@ -692,8 +711,10 @@ class IsolatedCallFixture : public TrackCounters { builder, &isolated_call_filter::isolated_call_filter, nullptr, nullptr)); { - grpc_core::ExecCtx exec_ctx; - channel_ = grpc_channel_create_with_builder(builder, GRPC_CLIENT_CHANNEL); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + channel_ = grpc_channel_create_with_builder(&exec_ctx, builder, + GRPC_CLIENT_CHANNEL); + grpc_exec_ctx_finish(&exec_ctx); } cq_ = grpc_completion_queue_create_for_next(nullptr); } diff --git a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc index 4b7310389c4..3fff8b02d61 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc @@ -50,22 +50,22 @@ static grpc_slice MakeSlice(std::vector bytes) { static void BM_HpackEncoderInitDestroy(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_chttp2_hpack_compressor c; while (state.KeepRunning()) { grpc_chttp2_hpack_compressor_init(&c); - grpc_chttp2_hpack_compressor_destroy(&c); - grpc_core::ExecCtx::Get()->Flush(); + grpc_chttp2_hpack_compressor_destroy(&exec_ctx, &c); + grpc_exec_ctx_flush(&exec_ctx); } - + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_HpackEncoderInitDestroy); static void BM_HpackEncoderEncodeDeadline(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx exec_ctx; - grpc_millis saved_now = grpc_core::ExecCtx::Get()->Now(); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_millis saved_now = grpc_exec_ctx_now(&exec_ctx); grpc_metadata_batch b; grpc_metadata_batch_init(&b); @@ -85,13 +85,14 @@ static void BM_HpackEncoderEncodeDeadline(benchmark::State& state) { (size_t)1024, &stats, }; - grpc_chttp2_encode_header(&c, nullptr, 0, &b, &hopt, &outbuf); - grpc_slice_buffer_reset_and_unref_internal(&outbuf); - grpc_core::ExecCtx::Get()->Flush(); + grpc_chttp2_encode_header(&exec_ctx, &c, nullptr, 0, &b, &hopt, &outbuf); + grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, &outbuf); + grpc_exec_ctx_flush(&exec_ctx); } - grpc_metadata_batch_destroy(&b); - grpc_chttp2_hpack_compressor_destroy(&c); - grpc_slice_buffer_destroy_internal(&outbuf); + grpc_metadata_batch_destroy(&exec_ctx, &b); + grpc_chttp2_hpack_compressor_destroy(&exec_ctx, &c); + grpc_slice_buffer_destroy_internal(&exec_ctx, &outbuf); + grpc_exec_ctx_finish(&exec_ctx); std::ostringstream label; label << "framing_bytes/iter:" @@ -108,16 +109,17 @@ BENCHMARK(BM_HpackEncoderEncodeDeadline); template static void BM_HpackEncoderEncodeHeader(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; static bool logged_representative_output = false; grpc_metadata_batch b; grpc_metadata_batch_init(&b); - std::vector elems = Fixture::GetElems(); + std::vector elems = Fixture::GetElems(&exec_ctx); std::vector storage(elems.size()); for (size_t i = 0; i < elems.size(); i++) { GPR_ASSERT(GRPC_LOG_IF_ERROR( - "addmd", grpc_metadata_batch_add_tail(&b, &storage[i], elems[i]))); + "addmd", + grpc_metadata_batch_add_tail(&exec_ctx, &b, &storage[i], elems[i]))); } grpc_chttp2_hpack_compressor c; @@ -134,7 +136,7 @@ static void BM_HpackEncoderEncodeHeader(benchmark::State& state) { (size_t)state.range(1), &stats, }; - grpc_chttp2_encode_header(&c, nullptr, 0, &b, &hopt, &outbuf); + grpc_chttp2_encode_header(&exec_ctx, &c, nullptr, 0, &b, &hopt, &outbuf); if (!logged_representative_output && state.iterations() > 3) { logged_representative_output = true; for (size_t i = 0; i < outbuf.count; i++) { @@ -143,12 +145,13 @@ static void BM_HpackEncoderEncodeHeader(benchmark::State& state) { gpr_free(s); } } - grpc_slice_buffer_reset_and_unref_internal(&outbuf); - grpc_core::ExecCtx::Get()->Flush(); + grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, &outbuf); + grpc_exec_ctx_flush(&exec_ctx); } - grpc_metadata_batch_destroy(&b); - grpc_chttp2_hpack_compressor_destroy(&c); - grpc_slice_buffer_destroy_internal(&outbuf); + grpc_metadata_batch_destroy(&exec_ctx, &b); + grpc_chttp2_hpack_compressor_destroy(&exec_ctx, &c); + grpc_slice_buffer_destroy_internal(&exec_ctx, &outbuf); + grpc_exec_ctx_finish(&exec_ctx); std::ostringstream label; label << "framing_bytes/iter:" @@ -166,13 +169,15 @@ namespace hpack_encoder_fixtures { class EmptyBatch { public: static constexpr bool kEnableTrueBinary = false; - static std::vector GetElems() { return {}; } + static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + return {}; + } }; class SingleStaticElem { public: static constexpr bool kEnableTrueBinary = false; - static std::vector GetElems() { + static std::vector GetElems(grpc_exec_ctx* exec_ctx) { return {GRPC_MDELEM_GRPC_ACCEPT_ENCODING_IDENTITY_COMMA_DEFLATE}; } }; @@ -180,9 +185,9 @@ class SingleStaticElem { class SingleInternedElem { public: static constexpr bool kEnableTrueBinary = false; - static std::vector GetElems() { + static std::vector GetElems(grpc_exec_ctx* exec_ctx) { return {grpc_mdelem_from_slices( - grpc_slice_intern(grpc_slice_from_static_string("abc")), + exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("abc")), grpc_slice_intern(grpc_slice_from_static_string("def")))}; } }; @@ -191,10 +196,10 @@ template class SingleInternedBinaryElem { public: static constexpr bool kEnableTrueBinary = kTrueBinary; - static std::vector GetElems() { + static std::vector GetElems(grpc_exec_ctx* exec_ctx) { grpc_slice bytes = MakeBytes(); std::vector out = {grpc_mdelem_from_slices( - grpc_slice_intern(grpc_slice_from_static_string("abc-bin")), + exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("abc-bin")), grpc_slice_intern(bytes))}; grpc_slice_unref(bytes); return out; @@ -213,9 +218,9 @@ class SingleInternedBinaryElem { class SingleInternedKeyElem { public: static constexpr bool kEnableTrueBinary = false; - static std::vector GetElems() { + static std::vector GetElems(grpc_exec_ctx* exec_ctx) { return {grpc_mdelem_from_slices( - grpc_slice_intern(grpc_slice_from_static_string("abc")), + exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("abc")), grpc_slice_from_static_string("def"))}; } }; @@ -223,8 +228,9 @@ class SingleInternedKeyElem { class SingleNonInternedElem { public: static constexpr bool kEnableTrueBinary = false; - static std::vector GetElems() { - return {grpc_mdelem_from_slices(grpc_slice_from_static_string("abc"), + static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + return {grpc_mdelem_from_slices(exec_ctx, + grpc_slice_from_static_string("abc"), grpc_slice_from_static_string("def"))}; } }; @@ -233,9 +239,9 @@ template class SingleNonInternedBinaryElem { public: static constexpr bool kEnableTrueBinary = kTrueBinary; - static std::vector GetElems() { - return {grpc_mdelem_from_slices(grpc_slice_from_static_string("abc-bin"), - MakeBytes())}; + static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + return {grpc_mdelem_from_slices( + exec_ctx, grpc_slice_from_static_string("abc-bin"), MakeBytes())}; } private: @@ -251,21 +257,21 @@ class SingleNonInternedBinaryElem { class RepresentativeClientInitialMetadata { public: static constexpr bool kEnableTrueBinary = true; - static std::vector GetElems() { + static std::vector GetElems(grpc_exec_ctx* exec_ctx) { return { GRPC_MDELEM_SCHEME_HTTP, GRPC_MDELEM_METHOD_POST, grpc_mdelem_from_slices( - GRPC_MDSTR_PATH, + exec_ctx, GRPC_MDSTR_PATH, grpc_slice_intern(grpc_slice_from_static_string("/foo/bar"))), - grpc_mdelem_from_slices(GRPC_MDSTR_AUTHORITY, + grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_AUTHORITY, grpc_slice_intern(grpc_slice_from_static_string( "foo.test.google.fr:1234"))), GRPC_MDELEM_GRPC_ACCEPT_ENCODING_IDENTITY_COMMA_DEFLATE_COMMA_GZIP, GRPC_MDELEM_TE_TRAILERS, GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC, grpc_mdelem_from_slices( - GRPC_MDSTR_USER_AGENT, + exec_ctx, GRPC_MDSTR_USER_AGENT, grpc_slice_intern(grpc_slice_from_static_string( "grpc-c/3.0.0-dev (linux; chttp2; green)")))}; } @@ -277,18 +283,18 @@ class RepresentativeClientInitialMetadata { class MoreRepresentativeClientInitialMetadata { public: static constexpr bool kEnableTrueBinary = true; - static std::vector GetElems() { + static std::vector GetElems(grpc_exec_ctx* exec_ctx) { return { GRPC_MDELEM_SCHEME_HTTP, GRPC_MDELEM_METHOD_POST, - grpc_mdelem_from_slices(GRPC_MDSTR_PATH, + grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_PATH, grpc_slice_intern(grpc_slice_from_static_string( "/grpc.test.FooService/BarMethod"))), - grpc_mdelem_from_slices(GRPC_MDSTR_AUTHORITY, + grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_AUTHORITY, grpc_slice_intern(grpc_slice_from_static_string( "foo.test.google.fr:1234"))), grpc_mdelem_from_slices( - GRPC_MDSTR_GRPC_TRACE_BIN, + exec_ctx, GRPC_MDSTR_GRPC_TRACE_BIN, grpc_slice_from_static_string("\x00\x01\x02\x03\x04\x05\x06\x07\x08" "\x09\x0a\x0b\x0c\x0d\x0e\x0f" "\x10\x11\x12\x13\x14\x15\x16\x17\x18" @@ -297,7 +303,7 @@ class MoreRepresentativeClientInitialMetadata { "\x29\x2a\x2b\x2c\x2d\x2e\x2f" "\x30")), grpc_mdelem_from_slices( - GRPC_MDSTR_GRPC_TAGS_BIN, + exec_ctx, GRPC_MDSTR_GRPC_TAGS_BIN, grpc_slice_from_static_string("\x00\x01\x02\x03\x04\x05\x06\x07\x08" "\x09\x0a\x0b\x0c\x0d\x0e\x0f" "\x10\x11\x12\x13")), @@ -305,7 +311,7 @@ class MoreRepresentativeClientInitialMetadata { GRPC_MDELEM_TE_TRAILERS, GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC, grpc_mdelem_from_slices( - GRPC_MDSTR_USER_AGENT, + exec_ctx, GRPC_MDSTR_USER_AGENT, grpc_slice_intern(grpc_slice_from_static_string( "grpc-c/3.0.0-dev (linux; chttp2; green)")))}; } @@ -314,7 +320,7 @@ class MoreRepresentativeClientInitialMetadata { class RepresentativeServerInitialMetadata { public: static constexpr bool kEnableTrueBinary = true; - static std::vector GetElems() { + static std::vector GetElems(grpc_exec_ctx* exec_ctx) { return {GRPC_MDELEM_STATUS_200, GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC, GRPC_MDELEM_GRPC_ACCEPT_ENCODING_IDENTITY_COMMA_DEFLATE_COMMA_GZIP}; @@ -324,7 +330,7 @@ class RepresentativeServerInitialMetadata { class RepresentativeServerTrailingMetadata { public: static constexpr bool kEnableTrueBinary = true; - static std::vector GetElems() { + static std::vector GetElems(grpc_exec_ctx* exec_ctx) { return {GRPC_MDELEM_GRPC_STATUS_0}; } }; @@ -425,45 +431,48 @@ BENCHMARK_TEMPLATE(BM_HpackEncoderEncodeHeader, static void BM_HpackParserInitDestroy(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_chttp2_hpack_parser p; while (state.KeepRunning()) { - grpc_chttp2_hpack_parser_init(&p); - grpc_chttp2_hpack_parser_destroy(&p); - grpc_core::ExecCtx::Get()->Flush(); + grpc_chttp2_hpack_parser_init(&exec_ctx, &p); + grpc_chttp2_hpack_parser_destroy(&exec_ctx, &p); + grpc_exec_ctx_flush(&exec_ctx); } - + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_HpackParserInitDestroy); -static void UnrefHeader(void* user_data, grpc_mdelem md) { - GRPC_MDELEM_UNREF(md); +static void UnrefHeader(grpc_exec_ctx* exec_ctx, void* user_data, + grpc_mdelem md) { + GRPC_MDELEM_UNREF(exec_ctx, md); } -template +template static void BM_HpackParserParseHeader(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; std::vector init_slices = Fixture::GetInitSlices(); std::vector benchmark_slices = Fixture::GetBenchmarkSlices(); grpc_chttp2_hpack_parser p; - grpc_chttp2_hpack_parser_init(&p); + grpc_chttp2_hpack_parser_init(&exec_ctx, &p); p.on_header = OnHeader; p.on_header_user_data = nullptr; for (auto slice : init_slices) { - GPR_ASSERT(GRPC_ERROR_NONE == grpc_chttp2_hpack_parser_parse(&p, slice)); + GPR_ASSERT(GRPC_ERROR_NONE == + grpc_chttp2_hpack_parser_parse(&exec_ctx, &p, slice)); } while (state.KeepRunning()) { for (auto slice : benchmark_slices) { - GPR_ASSERT(GRPC_ERROR_NONE == grpc_chttp2_hpack_parser_parse(&p, slice)); + GPR_ASSERT(GRPC_ERROR_NONE == + grpc_chttp2_hpack_parser_parse(&exec_ctx, &p, slice)); } - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); } for (auto slice : init_slices) grpc_slice_unref(slice); for (auto slice : benchmark_slices) grpc_slice_unref(slice); - grpc_chttp2_hpack_parser_destroy(&p); - + grpc_chttp2_hpack_parser_destroy(&exec_ctx, &p); + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } @@ -760,7 +769,8 @@ class RepresentativeServerTrailingMetadata { static void free_timeout(void* p) { gpr_free(p); } // New implementation. -static void OnHeaderNew(void* user_data, grpc_mdelem md) { +static void OnHeaderNew(grpc_exec_ctx* exec_ctx, void* user_data, + grpc_mdelem md) { if (grpc_slice_eq(GRPC_MDKEY(md), GRPC_MDSTR_GRPC_TIMEOUT)) { grpc_millis* cached_timeout = static_cast(grpc_mdelem_get_user_data(md, free_timeout)); @@ -783,7 +793,7 @@ static void OnHeaderNew(void* user_data, grpc_mdelem md) { } } benchmark::DoNotOptimize(timeout); - GRPC_MDELEM_UNREF(md); + GRPC_MDELEM_UNREF(exec_ctx, md); } else { GPR_ASSERT(0); } diff --git a/test/cpp/microbenchmarks/bm_chttp2_transport.cc b/test/cpp/microbenchmarks/bm_chttp2_transport.cc index fcb1677d09f..be4da4d0bd7 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_transport.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_transport.cc @@ -58,7 +58,7 @@ class DummyEndpoint : public grpc_endpoint { ru_ = grpc_resource_user_create(Library::get().rq(), "dummy_endpoint"); } - void PushInput(grpc_slice slice) { + void PushInput(grpc_exec_ctx* exec_ctx, grpc_slice slice) { if (read_cb_ == nullptr) { GPR_ASSERT(!have_slice_); buffered_slice_ = slice; @@ -66,7 +66,7 @@ class DummyEndpoint : public grpc_endpoint { return; } grpc_slice_buffer_add(slices_, slice); - GRPC_CLOSURE_SCHED(read_cb_, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, read_cb_, GRPC_ERROR_NONE); read_cb_ = nullptr; } @@ -77,45 +77,50 @@ class DummyEndpoint : public grpc_endpoint { bool have_slice_ = false; grpc_slice buffered_slice_; - void QueueRead(grpc_slice_buffer* slices, grpc_closure* cb) { + void QueueRead(grpc_exec_ctx* exec_ctx, grpc_slice_buffer* slices, + grpc_closure* cb) { GPR_ASSERT(read_cb_ == nullptr); if (have_slice_) { have_slice_ = false; grpc_slice_buffer_add(slices, buffered_slice_); - GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); return; } read_cb_ = cb; slices_ = slices; } - static void read(grpc_endpoint* ep, grpc_slice_buffer* slices, - grpc_closure* cb) { - static_cast(ep)->QueueRead(slices, cb); + static void read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_slice_buffer* slices, grpc_closure* cb) { + static_cast(ep)->QueueRead(exec_ctx, slices, cb); } - static void write(grpc_endpoint* ep, grpc_slice_buffer* slices, - grpc_closure* cb) { - GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); + static void write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_slice_buffer* slices, grpc_closure* cb) { + GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); } static grpc_workqueue* get_workqueue(grpc_endpoint* ep) { return nullptr; } - static void add_to_pollset(grpc_endpoint* ep, grpc_pollset* pollset) {} + static void add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_pollset* pollset) {} - static void add_to_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset) { - } + static void add_to_pollset_set(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_pollset_set* pollset) {} - static void delete_from_pollset_set(grpc_endpoint* ep, + static void delete_from_pollset_set(grpc_exec_ctx* exec_ctx, + grpc_endpoint* ep, grpc_pollset_set* pollset) {} - static void shutdown(grpc_endpoint* ep, grpc_error* why) { - grpc_resource_user_shutdown(static_cast(ep)->ru_); - GRPC_CLOSURE_SCHED(static_cast(ep)->read_cb_, why); + static void shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, + grpc_error* why) { + grpc_resource_user_shutdown(exec_ctx, static_cast(ep)->ru_); + GRPC_CLOSURE_SCHED(exec_ctx, static_cast(ep)->read_cb_, + why); } - static void destroy(grpc_endpoint* ep) { - grpc_resource_user_unref(static_cast(ep)->ru_); + static void destroy(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep) { + grpc_resource_user_unref(exec_ctx, static_cast(ep)->ru_); delete static_cast(ep); } @@ -131,24 +136,29 @@ class Fixture { Fixture(const grpc::ChannelArguments& args, bool client) { grpc_channel_args c_args = args.c_channel_args(); ep_ = new DummyEndpoint; - t_ = grpc_create_chttp2_transport(&c_args, ep_, client); - grpc_chttp2_transport_start_reading(t_, nullptr, nullptr); + t_ = grpc_create_chttp2_transport(exec_ctx(), &c_args, ep_, client); + grpc_chttp2_transport_start_reading(exec_ctx(), t_, nullptr, nullptr); FlushExecCtx(); } - void FlushExecCtx() { grpc_core::ExecCtx::Get()->Flush(); } + void FlushExecCtx() { grpc_exec_ctx_flush(&exec_ctx_); } - ~Fixture() { grpc_transport_destroy(t_); } + ~Fixture() { + grpc_transport_destroy(&exec_ctx_, t_); + grpc_exec_ctx_finish(&exec_ctx_); + } grpc_chttp2_transport* chttp2_transport() { return reinterpret_cast(t_); } grpc_transport* transport() { return t_; } + grpc_exec_ctx* exec_ctx() { return &exec_ctx_; } - void PushInput(grpc_slice slice) { ep_->PushInput(slice); } + void PushInput(grpc_slice slice) { ep_->PushInput(exec_ctx(), slice); } private: DummyEndpoint* ep_; + grpc_exec_ctx exec_ctx_ = GRPC_EXEC_CTX_INIT; grpc_transport* t_; }; @@ -165,8 +175,8 @@ std::unique_ptr MakeClosure( GRPC_CLOSURE_INIT(this, Execute, this, sched); } F f_; - static void Execute(void* arg, grpc_error* error) { - static_cast(arg)->f_(error); + static void Execute(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { + static_cast(arg)->f_(exec_ctx, error); } }; return std::unique_ptr(new C(f, sched)); @@ -178,8 +188,8 @@ grpc_closure* MakeOnceClosure( struct C : public grpc_closure { C(const F& f) : f_(f) {} F f_; - static void Execute(void* arg, grpc_error* error) { - static_cast(arg)->f_(error); + static void Execute(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { + static_cast(arg)->f_(exec_ctx, error); delete static_cast(arg); } }; @@ -210,22 +220,22 @@ class Stream { gpr_arena_destroy(arena_); arena_ = gpr_arena_create(4096); } - grpc_transport_init_stream(f_->transport(), + grpc_transport_init_stream(f_->exec_ctx(), f_->transport(), static_cast(stream_), &refcount_, nullptr, arena_); } - void DestroyThen(grpc_closure* closure) { + void DestroyThen(grpc_exec_ctx* exec_ctx, grpc_closure* closure) { destroy_closure_ = closure; #ifndef NDEBUG - grpc_stream_unref(&refcount_, "DestroyThen"); + grpc_stream_unref(exec_ctx, &refcount_, "DestroyThen"); #else - grpc_stream_unref(&refcount_); + grpc_stream_unref(exec_ctx, &refcount_); #endif } - void Op(grpc_transport_stream_op_batch* op) { - grpc_transport_perform_stream_op(f_->transport(), + void Op(grpc_exec_ctx* exec_ctx, grpc_transport_stream_op_batch* op) { + grpc_transport_perform_stream_op(exec_ctx, f_->transport(), static_cast(stream_), op); } @@ -234,9 +244,10 @@ class Stream { } private: - static void FinishDestroy(void* arg, grpc_error* error) { + static void FinishDestroy(grpc_exec_ctx* exec_ctx, void* arg, + grpc_error* error) { auto stream = static_cast(arg); - grpc_transport_destroy_stream(stream->f_->transport(), + grpc_transport_destroy_stream(exec_ctx, stream->f_->transport(), static_cast(stream->stream_), stream->destroy_closure_); gpr_event_set(&stream->done_, (void*)1); @@ -257,7 +268,6 @@ class Stream { static void BM_StreamCreateDestroy(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx exec_ctx; Fixture f(grpc::ChannelArguments(), true); Stream s(&f); grpc_transport_stream_op_batch op; @@ -266,13 +276,14 @@ static void BM_StreamCreateDestroy(benchmark::State& state) { op.cancel_stream = true; op.payload = &op_payload; op_payload.cancel_stream.cancel_error = GRPC_ERROR_CANCELLED; - std::unique_ptr next = MakeClosure([&](grpc_error* error) { - if (!state.KeepRunning()) return; - s.Init(state); - s.Op(&op); - s.DestroyThen(next.get()); - }); - GRPC_CLOSURE_RUN(next.get(), GRPC_ERROR_NONE); + std::unique_ptr next = + MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { + if (!state.KeepRunning()) return; + s.Init(state); + s.Op(exec_ctx, &op); + s.DestroyThen(exec_ctx, next.get()); + }); + GRPC_CLOSURE_RUN(f.exec_ctx(), next.get(), GRPC_ERROR_NONE); f.FlushExecCtx(); track_counters.Finish(state); } @@ -280,21 +291,21 @@ BENCHMARK(BM_StreamCreateDestroy); class RepresentativeClientInitialMetadata { public: - static std::vector GetElems() { + static std::vector GetElems(grpc_exec_ctx* exec_ctx) { return { GRPC_MDELEM_SCHEME_HTTP, GRPC_MDELEM_METHOD_POST, grpc_mdelem_from_slices( - GRPC_MDSTR_PATH, + exec_ctx, GRPC_MDSTR_PATH, grpc_slice_intern(grpc_slice_from_static_string("/foo/bar"))), - grpc_mdelem_from_slices(GRPC_MDSTR_AUTHORITY, + grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_AUTHORITY, grpc_slice_intern(grpc_slice_from_static_string( "foo.test.google.fr:1234"))), GRPC_MDELEM_GRPC_ACCEPT_ENCODING_IDENTITY_COMMA_DEFLATE_COMMA_GZIP, GRPC_MDELEM_TE_TRAILERS, GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC, grpc_mdelem_from_slices( - GRPC_MDSTR_USER_AGENT, + exec_ctx, GRPC_MDSTR_USER_AGENT, grpc_slice_intern(grpc_slice_from_static_string( "grpc-c/3.0.0-dev (linux; chttp2; green)")))}; } @@ -303,7 +314,6 @@ class RepresentativeClientInitialMetadata { template static void BM_StreamCreateSendInitialMetadataDestroy(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx exec_ctx; Fixture f(grpc::ChannelArguments(), true); Stream s(&f); grpc_transport_stream_op_batch op; @@ -320,33 +330,34 @@ static void BM_StreamCreateSendInitialMetadataDestroy(benchmark::State& state) { grpc_metadata_batch b; grpc_metadata_batch_init(&b); b.deadline = GRPC_MILLIS_INF_FUTURE; - std::vector elems = Metadata::GetElems(); + std::vector elems = Metadata::GetElems(f.exec_ctx()); std::vector storage(elems.size()); for (size_t i = 0; i < elems.size(); i++) { GPR_ASSERT(GRPC_LOG_IF_ERROR( - "addmd", grpc_metadata_batch_add_tail(&b, &storage[i], elems[i]))); + "addmd", + grpc_metadata_batch_add_tail(f.exec_ctx(), &b, &storage[i], elems[i]))); } f.FlushExecCtx(); - start = MakeClosure([&](grpc_error* error) { + start = MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { if (!state.KeepRunning()) return; s.Init(state); reset_op(); op.on_complete = done.get(); op.send_initial_metadata = true; op.payload->send_initial_metadata.send_initial_metadata = &b; - s.Op(&op); + s.Op(exec_ctx, &op); }); - done = MakeClosure([&](grpc_error* error) { + done = MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { reset_op(); op.cancel_stream = true; op.payload->cancel_stream.cancel_error = GRPC_ERROR_CANCELLED; - s.Op(&op); - s.DestroyThen(start.get()); + s.Op(exec_ctx, &op); + s.DestroyThen(exec_ctx, start.get()); }); - GRPC_CLOSURE_SCHED(start.get(), GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(f.exec_ctx(), start.get(), GRPC_ERROR_NONE); f.FlushExecCtx(); - grpc_metadata_batch_destroy(&b); + grpc_metadata_batch_destroy(f.exec_ctx(), &b); track_counters.Finish(state); } BENCHMARK_TEMPLATE(BM_StreamCreateSendInitialMetadataDestroy, @@ -354,7 +365,6 @@ BENCHMARK_TEMPLATE(BM_StreamCreateSendInitialMetadataDestroy, static void BM_TransportEmptyOp(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx exec_ctx; Fixture f(grpc::ChannelArguments(), true); Stream s(&f); s.Init(state); @@ -365,19 +375,21 @@ static void BM_TransportEmptyOp(benchmark::State& state) { memset(&op, 0, sizeof(op)); op.payload = &op_payload; }; - std::unique_ptr c = MakeClosure([&](grpc_error* error) { - if (!state.KeepRunning()) return; - reset_op(); - op.on_complete = c.get(); - s.Op(&op); - }); - GRPC_CLOSURE_SCHED(c.get(), GRPC_ERROR_NONE); + std::unique_ptr c = + MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { + if (!state.KeepRunning()) return; + reset_op(); + op.on_complete = c.get(); + s.Op(exec_ctx, &op); + }); + GRPC_CLOSURE_SCHED(f.exec_ctx(), c.get(), GRPC_ERROR_NONE); f.FlushExecCtx(); reset_op(); op.cancel_stream = true; op_payload.cancel_stream.cancel_error = GRPC_ERROR_CANCELLED; - s.Op(&op); - s.DestroyThen(MakeOnceClosure([](grpc_error* error) {})); + s.Op(f.exec_ctx(), &op); + s.DestroyThen(f.exec_ctx(), MakeOnceClosure([](grpc_exec_ctx* exec_ctx, + grpc_error* error) {})); f.FlushExecCtx(); track_counters.Finish(state); } @@ -387,7 +399,6 @@ std::vector> done_events; static void BM_TransportStreamSend(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx exec_ctx; Fixture f(grpc::ChannelArguments(), true); auto s = std::unique_ptr(new Stream(&f)); s->Init(state); @@ -409,37 +420,39 @@ static void BM_TransportStreamSend(benchmark::State& state) { grpc_metadata_batch_init(&b); b.deadline = GRPC_MILLIS_INF_FUTURE; std::vector elems = - RepresentativeClientInitialMetadata::GetElems(); + RepresentativeClientInitialMetadata::GetElems(f.exec_ctx()); std::vector storage(elems.size()); for (size_t i = 0; i < elems.size(); i++) { GPR_ASSERT(GRPC_LOG_IF_ERROR( - "addmd", grpc_metadata_batch_add_tail(&b, &storage[i], elems[i]))); + "addmd", + grpc_metadata_batch_add_tail(f.exec_ctx(), &b, &storage[i], elems[i]))); } gpr_event* bm_done = new gpr_event; gpr_event_init(bm_done); - std::unique_ptr c = MakeClosure([&](grpc_error* error) { - if (!state.KeepRunning()) { - gpr_event_set(bm_done, (void*)1); - return; - } - // force outgoing window to be yuge - s->chttp2_stream()->flow_control->TestOnlyForceHugeWindow(); - f.chttp2_transport()->flow_control->TestOnlyForceHugeWindow(); - grpc_slice_buffer_stream_init(&send_stream, &send_buffer, 0); - reset_op(); - op.on_complete = c.get(); - op.send_message = true; - op.payload->send_message.send_message = &send_stream.base; - s->Op(&op); - }); + std::unique_ptr c = + MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { + if (!state.KeepRunning()) { + gpr_event_set(bm_done, (void*)1); + return; + } + // force outgoing window to be yuge + s->chttp2_stream()->flow_control->TestOnlyForceHugeWindow(); + f.chttp2_transport()->flow_control->TestOnlyForceHugeWindow(); + grpc_slice_buffer_stream_init(&send_stream, &send_buffer, 0); + reset_op(); + op.on_complete = c.get(); + op.send_message = true; + op.payload->send_message.send_message = &send_stream.base; + s->Op(exec_ctx, &op); + }); reset_op(); op.send_initial_metadata = true; op.payload->send_initial_metadata.send_initial_metadata = &b; op.on_complete = c.get(); - s->Op(&op); + s->Op(f.exec_ctx(), &op); f.FlushExecCtx(); gpr_event_wait(bm_done, gpr_inf_future(GPR_CLOCK_REALTIME)); @@ -448,12 +461,13 @@ static void BM_TransportStreamSend(benchmark::State& state) { reset_op(); op.cancel_stream = true; op.payload->cancel_stream.cancel_error = GRPC_ERROR_CANCELLED; - s->Op(&op); - s->DestroyThen(MakeOnceClosure([](grpc_error* error) {})); + s->Op(f.exec_ctx(), &op); + s->DestroyThen(f.exec_ctx(), MakeOnceClosure([](grpc_exec_ctx* exec_ctx, + grpc_error* error) {})); f.FlushExecCtx(); s.reset(); track_counters.Finish(state); - grpc_metadata_batch_destroy(&b); + grpc_metadata_batch_destroy(f.exec_ctx(), &b); grpc_slice_buffer_destroy(&send_buffer); } BENCHMARK(BM_TransportStreamSend)->Range(0, 128 * 1024 * 1024); @@ -517,7 +531,6 @@ static grpc_slice CreateIncomingDataSlice(size_t length, size_t frame_size) { static void BM_TransportStreamRecv(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx exec_ctx; Fixture f(grpc::ChannelArguments(), true); Stream s(&f); s.Init(state); @@ -538,14 +551,16 @@ static void BM_TransportStreamRecv(benchmark::State& state) { grpc_metadata_batch_init(&b_recv); b.deadline = GRPC_MILLIS_INF_FUTURE; std::vector elems = - RepresentativeClientInitialMetadata::GetElems(); + RepresentativeClientInitialMetadata::GetElems(f.exec_ctx()); std::vector storage(elems.size()); for (size_t i = 0; i < elems.size(); i++) { GPR_ASSERT(GRPC_LOG_IF_ERROR( - "addmd", grpc_metadata_batch_add_tail(&b, &storage[i], elems[i]))); + "addmd", + grpc_metadata_batch_add_tail(f.exec_ctx(), &b, &storage[i], elems[i]))); } - std::unique_ptr do_nothing = MakeClosure([](grpc_error* error) {}); + std::unique_ptr do_nothing = + MakeClosure([](grpc_exec_ctx* exec_ctx, grpc_error* error) {}); uint32_t received; @@ -554,49 +569,51 @@ static void BM_TransportStreamRecv(benchmark::State& state) { std::unique_ptr drain_continue; grpc_slice recv_slice; - std::unique_ptr c = MakeClosure([&](grpc_error* error) { - if (!state.KeepRunning()) return; - // force outgoing window to be yuge - s.chttp2_stream()->flow_control->TestOnlyForceHugeWindow(); - f.chttp2_transport()->flow_control->TestOnlyForceHugeWindow(); - received = 0; - reset_op(); - op.on_complete = do_nothing.get(); - op.recv_message = true; - op.payload->recv_message.recv_message = &recv_stream; - op.payload->recv_message.recv_message_ready = drain_start.get(); - s.Op(&op); - f.PushInput(grpc_slice_ref(incoming_data)); - }); - - drain_start = MakeClosure([&](grpc_error* error) { + std::unique_ptr c = + MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { + if (!state.KeepRunning()) return; + // force outgoing window to be yuge + s.chttp2_stream()->flow_control->TestOnlyForceHugeWindow(); + f.chttp2_transport()->flow_control->TestOnlyForceHugeWindow(); + received = 0; + reset_op(); + op.on_complete = do_nothing.get(); + op.recv_message = true; + op.payload->recv_message.recv_message = &recv_stream; + op.payload->recv_message.recv_message_ready = drain_start.get(); + s.Op(exec_ctx, &op); + f.PushInput(grpc_slice_ref(incoming_data)); + }); + + drain_start = MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { if (recv_stream == nullptr) { GPR_ASSERT(!state.KeepRunning()); return; } - GRPC_CLOSURE_RUN(drain.get(), GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN(exec_ctx, drain.get(), GRPC_ERROR_NONE); }); - drain = MakeClosure([&](grpc_error* error) { + drain = MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { do { if (received == recv_stream->length) { - grpc_byte_stream_destroy(recv_stream); - GRPC_CLOSURE_SCHED(c.get(), GRPC_ERROR_NONE); + grpc_byte_stream_destroy(exec_ctx, recv_stream); + GRPC_CLOSURE_SCHED(exec_ctx, c.get(), GRPC_ERROR_NONE); return; } - } while (grpc_byte_stream_next(recv_stream, recv_stream->length - received, + } while (grpc_byte_stream_next(exec_ctx, recv_stream, + recv_stream->length - received, drain_continue.get()) && GRPC_ERROR_NONE == - grpc_byte_stream_pull(recv_stream, &recv_slice) && + grpc_byte_stream_pull(exec_ctx, recv_stream, &recv_slice) && (received += GRPC_SLICE_LENGTH(recv_slice), - grpc_slice_unref_internal(recv_slice), true)); + grpc_slice_unref_internal(exec_ctx, recv_slice), true)); }); - drain_continue = MakeClosure([&](grpc_error* error) { - grpc_byte_stream_pull(recv_stream, &recv_slice); + drain_continue = MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { + grpc_byte_stream_pull(exec_ctx, recv_stream, &recv_slice); received += GRPC_SLICE_LENGTH(recv_slice); - grpc_slice_unref_internal(recv_slice); - GRPC_CLOSURE_RUN(drain.get(), GRPC_ERROR_NONE); + grpc_slice_unref_internal(exec_ctx, recv_slice); + GRPC_CLOSURE_RUN(exec_ctx, drain.get(), GRPC_ERROR_NONE); }); reset_op(); @@ -607,7 +624,7 @@ static void BM_TransportStreamRecv(benchmark::State& state) { op.payload->recv_initial_metadata.recv_initial_metadata_ready = do_nothing.get(); op.on_complete = c.get(); - s.Op(&op); + s.Op(f.exec_ctx(), &op); f.PushInput(SLICE_FROM_BUFFER( "\x00\x00\x00\x04\x00\x00\x00\x00\x00" // Generated using: @@ -625,12 +642,13 @@ static void BM_TransportStreamRecv(benchmark::State& state) { reset_op(); op.cancel_stream = true; op.payload->cancel_stream.cancel_error = GRPC_ERROR_CANCELLED; - s.Op(&op); - s.DestroyThen(MakeOnceClosure([](grpc_error* error) {})); + s.Op(f.exec_ctx(), &op); + s.DestroyThen(f.exec_ctx(), MakeOnceClosure([](grpc_exec_ctx* exec_ctx, + grpc_error* error) {})); f.FlushExecCtx(); track_counters.Finish(state); - grpc_metadata_batch_destroy(&b); - grpc_metadata_batch_destroy(&b_recv); + grpc_metadata_batch_destroy(f.exec_ctx(), &b); + grpc_metadata_batch_destroy(f.exec_ctx(), &b_recv); grpc_slice_unref(incoming_data); } BENCHMARK(BM_TransportStreamRecv)->Range(0, 128 * 1024 * 1024); diff --git a/test/cpp/microbenchmarks/bm_closure.cc b/test/cpp/microbenchmarks/bm_closure.cc index 4d5a82c3f67..2434d4e84ed 100644 --- a/test/cpp/microbenchmarks/bm_closure.cc +++ b/test/cpp/microbenchmarks/bm_closure.cc @@ -34,7 +34,8 @@ auto& force_library_initialization = Library::get(); static void BM_NoOpExecCtx(benchmark::State& state) { TrackCounters track_counters; while (state.KeepRunning()) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_exec_ctx_finish(&exec_ctx); } track_counters.Finish(state); } @@ -42,16 +43,16 @@ BENCHMARK(BM_NoOpExecCtx); static void BM_WellFlushed(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); } - + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_WellFlushed); -static void DoNothing(void* arg, grpc_error* error) {} +static void DoNothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} static void BM_ClosureInitAgainstExecCtx(benchmark::State& state) { TrackCounters track_counters; @@ -68,13 +69,13 @@ static void BM_ClosureInitAgainstCombiner(benchmark::State& state) { TrackCounters track_counters; grpc_combiner* combiner = grpc_combiner_create(); grpc_closure c; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { benchmark::DoNotOptimize(GRPC_CLOSURE_INIT( &c, DoNothing, nullptr, grpc_combiner_scheduler(combiner))); } - GRPC_COMBINER_UNREF(combiner, "finished"); - + GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_ClosureInitAgainstCombiner); @@ -83,39 +84,41 @@ static void BM_ClosureRunOnExecCtx(benchmark::State& state) { TrackCounters track_counters; grpc_closure c; GRPC_CLOSURE_INIT(&c, DoNothing, nullptr, grpc_schedule_on_exec_ctx); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { - GRPC_CLOSURE_RUN(&c, GRPC_ERROR_NONE); - grpc_core::ExecCtx::Get()->Flush(); + GRPC_CLOSURE_RUN(&exec_ctx, &c, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(&exec_ctx); } - + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_ClosureRunOnExecCtx); static void BM_ClosureCreateAndRun(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { GRPC_CLOSURE_RUN( + &exec_ctx, GRPC_CLOSURE_CREATE(DoNothing, nullptr, grpc_schedule_on_exec_ctx), GRPC_ERROR_NONE); } - + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_ClosureCreateAndRun); static void BM_ClosureInitAndRun(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_closure c; while (state.KeepRunning()) { GRPC_CLOSURE_RUN( + &exec_ctx, GRPC_CLOSURE_INIT(&c, DoNothing, nullptr, grpc_schedule_on_exec_ctx), GRPC_ERROR_NONE); } - + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_ClosureInitAndRun); @@ -124,12 +127,12 @@ static void BM_ClosureSchedOnExecCtx(benchmark::State& state) { TrackCounters track_counters; grpc_closure c; GRPC_CLOSURE_INIT(&c, DoNothing, nullptr, grpc_schedule_on_exec_ctx); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&c, GRPC_ERROR_NONE); - grpc_core::ExecCtx::Get()->Flush(); + GRPC_CLOSURE_SCHED(&exec_ctx, &c, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(&exec_ctx); } - + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_ClosureSchedOnExecCtx); @@ -140,13 +143,13 @@ static void BM_ClosureSched2OnExecCtx(benchmark::State& state) { grpc_closure c2; GRPC_CLOSURE_INIT(&c1, DoNothing, nullptr, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&c2, DoNothing, nullptr, grpc_schedule_on_exec_ctx); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); - grpc_core::ExecCtx::Get()->Flush(); + GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(&exec_ctx); } - + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_ClosureSched2OnExecCtx); @@ -159,14 +162,14 @@ static void BM_ClosureSched3OnExecCtx(benchmark::State& state) { GRPC_CLOSURE_INIT(&c1, DoNothing, nullptr, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&c2, DoNothing, nullptr, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&c3, DoNothing, nullptr, grpc_schedule_on_exec_ctx); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE); - grpc_core::ExecCtx::Get()->Flush(); + GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&exec_ctx, &c3, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(&exec_ctx); } - + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_ClosureSched3OnExecCtx); @@ -176,13 +179,13 @@ static void BM_AcquireMutex(benchmark::State& state) { // for comparison with the combiner stuff below gpr_mu mu; gpr_mu_init(&mu); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { gpr_mu_lock(&mu); - DoNothing(nullptr, GRPC_ERROR_NONE); + DoNothing(&exec_ctx, nullptr, GRPC_ERROR_NONE); gpr_mu_unlock(&mu); } - + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_AcquireMutex); @@ -192,16 +195,16 @@ static void BM_TryAcquireMutex(benchmark::State& state) { // for comparison with the combiner stuff below gpr_mu mu; gpr_mu_init(&mu); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { if (gpr_mu_trylock(&mu)) { - DoNothing(nullptr, GRPC_ERROR_NONE); + DoNothing(&exec_ctx, nullptr, GRPC_ERROR_NONE); gpr_mu_unlock(&mu); } else { abort(); } } - + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_TryAcquireMutex); @@ -210,13 +213,13 @@ static void BM_AcquireSpinlock(benchmark::State& state) { TrackCounters track_counters; // for comparison with the combiner stuff below gpr_spinlock mu = GPR_SPINLOCK_INITIALIZER; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { gpr_spinlock_lock(&mu); - DoNothing(nullptr, GRPC_ERROR_NONE); + DoNothing(&exec_ctx, nullptr, GRPC_ERROR_NONE); gpr_spinlock_unlock(&mu); } - + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_AcquireSpinlock); @@ -225,16 +228,16 @@ static void BM_TryAcquireSpinlock(benchmark::State& state) { TrackCounters track_counters; // for comparison with the combiner stuff below gpr_spinlock mu = GPR_SPINLOCK_INITIALIZER; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { if (gpr_spinlock_trylock(&mu)) { - DoNothing(nullptr, GRPC_ERROR_NONE); + DoNothing(&exec_ctx, nullptr, GRPC_ERROR_NONE); gpr_spinlock_unlock(&mu); } else { abort(); } } - + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_TryAcquireSpinlock); @@ -244,13 +247,13 @@ static void BM_ClosureSchedOnCombiner(benchmark::State& state) { grpc_combiner* combiner = grpc_combiner_create(); grpc_closure c; GRPC_CLOSURE_INIT(&c, DoNothing, nullptr, grpc_combiner_scheduler(combiner)); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&c, GRPC_ERROR_NONE); - grpc_core::ExecCtx::Get()->Flush(); + GRPC_CLOSURE_SCHED(&exec_ctx, &c, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(&exec_ctx); } - GRPC_COMBINER_UNREF(combiner, "finished"); - + GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_ClosureSchedOnCombiner); @@ -262,14 +265,14 @@ static void BM_ClosureSched2OnCombiner(benchmark::State& state) { grpc_closure c2; GRPC_CLOSURE_INIT(&c1, DoNothing, nullptr, grpc_combiner_scheduler(combiner)); GRPC_CLOSURE_INIT(&c2, DoNothing, nullptr, grpc_combiner_scheduler(combiner)); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); - grpc_core::ExecCtx::Get()->Flush(); + GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(&exec_ctx); } - GRPC_COMBINER_UNREF(combiner, "finished"); - + GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_ClosureSched2OnCombiner); @@ -283,15 +286,15 @@ static void BM_ClosureSched3OnCombiner(benchmark::State& state) { GRPC_CLOSURE_INIT(&c1, DoNothing, nullptr, grpc_combiner_scheduler(combiner)); GRPC_CLOSURE_INIT(&c2, DoNothing, nullptr, grpc_combiner_scheduler(combiner)); GRPC_CLOSURE_INIT(&c3, DoNothing, nullptr, grpc_combiner_scheduler(combiner)); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE); - grpc_core::ExecCtx::Get()->Flush(); + GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&exec_ctx, &c3, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(&exec_ctx); } - GRPC_COMBINER_UNREF(combiner, "finished"); - + GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_ClosureSched3OnCombiner); @@ -306,15 +309,15 @@ static void BM_ClosureSched2OnTwoCombiners(benchmark::State& state) { grpc_combiner_scheduler(combiner1)); GRPC_CLOSURE_INIT(&c2, DoNothing, nullptr, grpc_combiner_scheduler(combiner2)); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); - grpc_core::ExecCtx::Get()->Flush(); + GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(&exec_ctx); } - GRPC_COMBINER_UNREF(combiner1, "finished"); - GRPC_COMBINER_UNREF(combiner2, "finished"); - + GRPC_COMBINER_UNREF(&exec_ctx, combiner1, "finished"); + GRPC_COMBINER_UNREF(&exec_ctx, combiner2, "finished"); + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_ClosureSched2OnTwoCombiners); @@ -335,17 +338,17 @@ static void BM_ClosureSched4OnTwoCombiners(benchmark::State& state) { grpc_combiner_scheduler(combiner1)); GRPC_CLOSURE_INIT(&c4, DoNothing, nullptr, grpc_combiner_scheduler(combiner2)); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&c4, GRPC_ERROR_NONE); - grpc_core::ExecCtx::Get()->Flush(); + GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&exec_ctx, &c3, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&exec_ctx, &c4, GRPC_ERROR_NONE); + grpc_exec_ctx_flush(&exec_ctx); } - GRPC_COMBINER_UNREF(combiner1, "finished"); - GRPC_COMBINER_UNREF(combiner2, "finished"); - + GRPC_COMBINER_UNREF(&exec_ctx, combiner1, "finished"); + GRPC_COMBINER_UNREF(&exec_ctx, combiner2, "finished"); + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_ClosureSched4OnTwoCombiners); @@ -359,11 +362,13 @@ class Rescheduler { GRPC_CLOSURE_INIT(&closure_, Step, this, scheduler); } - void ScheduleFirst() { GRPC_CLOSURE_SCHED(&closure_, GRPC_ERROR_NONE); } + void ScheduleFirst(grpc_exec_ctx* exec_ctx) { + GRPC_CLOSURE_SCHED(exec_ctx, &closure_, GRPC_ERROR_NONE); + } void ScheduleFirstAgainstDifferentScheduler( - grpc_closure_scheduler* scheduler) { - GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(Step, this, scheduler), + grpc_exec_ctx* exec_ctx, grpc_closure_scheduler* scheduler) { + GRPC_CLOSURE_SCHED(exec_ctx, GRPC_CLOSURE_CREATE(Step, this, scheduler), GRPC_ERROR_NONE); } @@ -371,46 +376,47 @@ class Rescheduler { benchmark::State& state_; grpc_closure closure_; - static void Step(void* arg, grpc_error* error) { + static void Step(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { Rescheduler* self = static_cast(arg); if (self->state_.KeepRunning()) { - GRPC_CLOSURE_SCHED(&self->closure_, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(exec_ctx, &self->closure_, GRPC_ERROR_NONE); } } }; static void BM_ClosureReschedOnExecCtx(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; Rescheduler r(state, grpc_schedule_on_exec_ctx); - r.ScheduleFirst(); - + r.ScheduleFirst(&exec_ctx); + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_ClosureReschedOnExecCtx); static void BM_ClosureReschedOnCombiner(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_combiner* combiner = grpc_combiner_create(); Rescheduler r(state, grpc_combiner_scheduler(combiner)); - r.ScheduleFirst(); - grpc_core::ExecCtx::Get()->Flush(); - GRPC_COMBINER_UNREF(combiner, "finished"); - + r.ScheduleFirst(&exec_ctx); + grpc_exec_ctx_flush(&exec_ctx); + GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_ClosureReschedOnCombiner); static void BM_ClosureReschedOnCombinerFinally(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_combiner* combiner = grpc_combiner_create(); Rescheduler r(state, grpc_combiner_finally_scheduler(combiner)); - r.ScheduleFirstAgainstDifferentScheduler(grpc_combiner_scheduler(combiner)); - grpc_core::ExecCtx::Get()->Flush(); - GRPC_COMBINER_UNREF(combiner, "finished"); - + r.ScheduleFirstAgainstDifferentScheduler(&exec_ctx, + grpc_combiner_scheduler(combiner)); + grpc_exec_ctx_flush(&exec_ctx); + GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_ClosureReschedOnCombinerFinally); diff --git a/test/cpp/microbenchmarks/bm_cq.cc b/test/cpp/microbenchmarks/bm_cq.cc index 97242598f19..f0dede73331 100644 --- a/test/cpp/microbenchmarks/bm_cq.cc +++ b/test/cpp/microbenchmarks/bm_cq.cc @@ -66,7 +66,7 @@ static void BM_CreateDestroyCore(benchmark::State& state) { } BENCHMARK(BM_CreateDestroyCore); -static void DoneWithCompletionOnStack(void* arg, +static void DoneWithCompletionOnStack(grpc_exec_ctx* exec_ctx, void* arg, grpc_cq_completion* completion) {} class DummyTag final : public internal::CompletionQueueTag { @@ -81,11 +81,11 @@ static void BM_Pass1Cpp(benchmark::State& state) { while (state.KeepRunning()) { grpc_cq_completion completion; DummyTag dummy_tag; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GPR_ASSERT(grpc_cq_begin_op(c_cq, &dummy_tag)); - grpc_cq_end_op(c_cq, &dummy_tag, GRPC_ERROR_NONE, DoneWithCompletionOnStack, - nullptr, &completion); - + grpc_cq_end_op(&exec_ctx, c_cq, &dummy_tag, GRPC_ERROR_NONE, + DoneWithCompletionOnStack, nullptr, &completion); + grpc_exec_ctx_finish(&exec_ctx); void* tag; bool ok; cq.Next(&tag, &ok); @@ -101,11 +101,11 @@ static void BM_Pass1Core(benchmark::State& state) { gpr_timespec deadline = gpr_inf_future(GPR_CLOCK_MONOTONIC); while (state.KeepRunning()) { grpc_cq_completion completion; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GPR_ASSERT(grpc_cq_begin_op(cq, nullptr)); - grpc_cq_end_op(cq, nullptr, GRPC_ERROR_NONE, DoneWithCompletionOnStack, - nullptr, &completion); - + grpc_cq_end_op(&exec_ctx, cq, nullptr, GRPC_ERROR_NONE, + DoneWithCompletionOnStack, nullptr, &completion); + grpc_exec_ctx_finish(&exec_ctx); grpc_completion_queue_next(cq, deadline, nullptr); } grpc_completion_queue_destroy(cq); @@ -120,11 +120,11 @@ static void BM_Pluck1Core(benchmark::State& state) { gpr_timespec deadline = gpr_inf_future(GPR_CLOCK_MONOTONIC); while (state.KeepRunning()) { grpc_cq_completion completion; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GPR_ASSERT(grpc_cq_begin_op(cq, nullptr)); - grpc_cq_end_op(cq, nullptr, GRPC_ERROR_NONE, DoneWithCompletionOnStack, - nullptr, &completion); - + grpc_cq_end_op(&exec_ctx, cq, nullptr, GRPC_ERROR_NONE, + DoneWithCompletionOnStack, nullptr, &completion); + grpc_exec_ctx_finish(&exec_ctx); grpc_completion_queue_pluck(cq, nullptr, deadline, nullptr); } grpc_completion_queue_destroy(cq); diff --git a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc index 874c8349311..7ccebb55ee0 100644 --- a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc +++ b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc @@ -43,8 +43,9 @@ static grpc_completion_queue* g_cq; static grpc_event_engine_vtable g_vtable; static const grpc_event_engine_vtable* g_old_vtable; -static void pollset_shutdown(grpc_pollset* ps, grpc_closure* closure) { - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); +static void pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* ps, + grpc_closure* closure) { + GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); } static void pollset_init(grpc_pollset* ps, gpr_mu** mu) { @@ -52,20 +53,25 @@ static void pollset_init(grpc_pollset* ps, gpr_mu** mu) { *mu = &ps->mu; } -static void pollset_destroy(grpc_pollset* ps) { gpr_mu_destroy(&ps->mu); } +static void pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* ps) { + gpr_mu_destroy(&ps->mu); +} -static grpc_error* pollset_kick(grpc_pollset* p, grpc_pollset_worker* worker) { +static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* p, + grpc_pollset_worker* worker) { return GRPC_ERROR_NONE; } /* Callback when the tag is dequeued from the completion queue. Does nothing */ -static void cq_done_cb(void* done_arg, grpc_cq_completion* cq_completion) { +static void cq_done_cb(grpc_exec_ctx* exec_ctx, void* done_arg, + grpc_cq_completion* cq_completion) { gpr_free(cq_completion); } /* Queues a completion tag if deadline is > 0. * Does nothing if deadline is 0 (i.e gpr_time_0(GPR_CLOCK_MONOTONIC)) */ -static grpc_error* pollset_work(grpc_pollset* ps, grpc_pollset_worker** worker, +static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* ps, + grpc_pollset_worker** worker, grpc_millis deadline) { if (deadline == 0) { gpr_log(GPR_DEBUG, "no-op"); @@ -74,9 +80,9 @@ static grpc_error* pollset_work(grpc_pollset* ps, grpc_pollset_worker** worker, gpr_mu_unlock(&ps->mu); GPR_ASSERT(grpc_cq_begin_op(g_cq, g_tag)); - grpc_cq_end_op(g_cq, g_tag, GRPC_ERROR_NONE, cq_done_cb, nullptr, + grpc_cq_end_op(exec_ctx, g_cq, g_tag, GRPC_ERROR_NONE, cq_done_cb, nullptr, (grpc_cq_completion*)gpr_malloc(sizeof(grpc_cq_completion))); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(exec_ctx); gpr_mu_lock(&ps->mu); return GRPC_ERROR_NONE; } diff --git a/test/cpp/microbenchmarks/bm_error.cc b/test/cpp/microbenchmarks/bm_error.cc index d12f475a493..bbd8b3c339f 100644 --- a/test/cpp/microbenchmarks/bm_error.cc +++ b/test/cpp/microbenchmarks/bm_error.cc @@ -246,14 +246,14 @@ template static void BM_ErrorGetStatus(benchmark::State& state) { TrackCounters track_counters; Fixture fixture; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { grpc_status_code status; grpc_slice slice; - grpc_error_get_status(fixture.error(), fixture.deadline(), &status, &slice, - nullptr, nullptr); + grpc_error_get_status(&exec_ctx, fixture.error(), fixture.deadline(), + &status, &slice, nullptr, nullptr); } - + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } @@ -261,13 +261,13 @@ template static void BM_ErrorGetStatusCode(benchmark::State& state) { TrackCounters track_counters; Fixture fixture; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { grpc_status_code status; - grpc_error_get_status(fixture.error(), fixture.deadline(), &status, nullptr, - nullptr, nullptr); + grpc_error_get_status(&exec_ctx, fixture.error(), fixture.deadline(), + &status, nullptr, nullptr, nullptr); } - + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } @@ -275,13 +275,13 @@ template static void BM_ErrorHttpError(benchmark::State& state) { TrackCounters track_counters; Fixture fixture; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { grpc_http2_error_code error; - grpc_error_get_status(fixture.error(), fixture.deadline(), nullptr, nullptr, - &error, nullptr); + grpc_error_get_status(&exec_ctx, fixture.error(), fixture.deadline(), + nullptr, nullptr, &error, nullptr); } - + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } diff --git a/test/cpp/microbenchmarks/bm_fullstack_trickle.cc b/test/cpp/microbenchmarks/bm_fullstack_trickle.cc index d6d7d41e5e3..5e72213823c 100644 --- a/test/cpp/microbenchmarks/bm_fullstack_trickle.cc +++ b/test/cpp/microbenchmarks/bm_fullstack_trickle.cc @@ -177,13 +177,13 @@ class TrickledCHTTP2 : public EndpointPairFixture { } void Step(bool update_stats) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; inc_time(); size_t client_backlog = - grpc_trickle_endpoint_trickle(endpoint_pair_.client); + grpc_trickle_endpoint_trickle(&exec_ctx, endpoint_pair_.client); size_t server_backlog = - grpc_trickle_endpoint_trickle(endpoint_pair_.server); - + grpc_trickle_endpoint_trickle(&exec_ctx, endpoint_pair_.server); + grpc_exec_ctx_finish(&exec_ctx); if (update_stats) { UpdateStats((grpc_chttp2_transport*)client_transport_, &client_stats_, client_backlog); diff --git a/test/cpp/microbenchmarks/bm_metadata.cc b/test/cpp/microbenchmarks/bm_metadata.cc index f1e7890fc03..73bce084668 100644 --- a/test/cpp/microbenchmarks/bm_metadata.cc +++ b/test/cpp/microbenchmarks/bm_metadata.cc @@ -90,11 +90,11 @@ static void BM_MetadataFromNonInternedSlices(benchmark::State& state) { TrackCounters track_counters; gpr_slice k = grpc_slice_from_static_string("key"); gpr_slice v = grpc_slice_from_static_string("value"); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, nullptr)); + GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, nullptr)); } - + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_MetadataFromNonInternedSlices); @@ -103,11 +103,11 @@ static void BM_MetadataFromInternedSlices(benchmark::State& state) { TrackCounters track_counters; gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, nullptr)); + GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, nullptr)); } - + grpc_exec_ctx_finish(&exec_ctx); grpc_slice_unref(k); grpc_slice_unref(v); track_counters.Finish(state); @@ -119,13 +119,13 @@ static void BM_MetadataFromInternedSlicesAlreadyInIndex( TrackCounters track_counters; gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); - grpc_core::ExecCtx exec_ctx; - grpc_mdelem seed = grpc_mdelem_create(k, v, nullptr); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_mdelem seed = grpc_mdelem_create(&exec_ctx, k, v, nullptr); while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, nullptr)); + GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, nullptr)); } - GRPC_MDELEM_UNREF(seed); - + GRPC_MDELEM_UNREF(&exec_ctx, seed); + grpc_exec_ctx_finish(&exec_ctx); grpc_slice_unref(k); grpc_slice_unref(v); track_counters.Finish(state); @@ -136,11 +136,11 @@ static void BM_MetadataFromInternedKey(benchmark::State& state) { TrackCounters track_counters; gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_from_static_string("value"); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, nullptr)); + GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, nullptr)); } - + grpc_exec_ctx_finish(&exec_ctx); grpc_slice_unref(k); track_counters.Finish(state); } @@ -152,12 +152,14 @@ static void BM_MetadataFromNonInternedSlicesWithBackingStore( gpr_slice k = grpc_slice_from_static_string("key"); gpr_slice v = grpc_slice_from_static_string("value"); char backing_store[sizeof(grpc_mdelem_data)]; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(grpc_mdelem_create( - k, v, reinterpret_cast(backing_store))); + GRPC_MDELEM_UNREF( + &exec_ctx, + grpc_mdelem_create(&exec_ctx, k, v, + reinterpret_cast(backing_store))); } - + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_MetadataFromNonInternedSlicesWithBackingStore); @@ -168,12 +170,14 @@ static void BM_MetadataFromInternedSlicesWithBackingStore( gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); char backing_store[sizeof(grpc_mdelem_data)]; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(grpc_mdelem_create( - k, v, reinterpret_cast(backing_store))); + GRPC_MDELEM_UNREF( + &exec_ctx, + grpc_mdelem_create(&exec_ctx, k, v, + reinterpret_cast(backing_store))); } - + grpc_exec_ctx_finish(&exec_ctx); grpc_slice_unref(k); grpc_slice_unref(v); track_counters.Finish(state); @@ -186,12 +190,14 @@ static void BM_MetadataFromInternedKeyWithBackingStore( gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_from_static_string("value"); char backing_store[sizeof(grpc_mdelem_data)]; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(grpc_mdelem_create( - k, v, reinterpret_cast(backing_store))); + GRPC_MDELEM_UNREF( + &exec_ctx, + grpc_mdelem_create(&exec_ctx, k, v, + reinterpret_cast(backing_store))); } - + grpc_exec_ctx_finish(&exec_ctx); grpc_slice_unref(k); track_counters.Finish(state); } @@ -201,11 +207,11 @@ static void BM_MetadataFromStaticMetadataStrings(benchmark::State& state) { TrackCounters track_counters; gpr_slice k = GRPC_MDSTR_STATUS; gpr_slice v = GRPC_MDSTR_200; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, nullptr)); + GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, nullptr)); } - + grpc_exec_ctx_finish(&exec_ctx); grpc_slice_unref(k); track_counters.Finish(state); } @@ -216,11 +222,11 @@ static void BM_MetadataFromStaticMetadataStringsNotIndexed( TrackCounters track_counters; gpr_slice k = GRPC_MDSTR_STATUS; gpr_slice v = GRPC_MDSTR_GZIP; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, nullptr)); + GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, nullptr)); } - + grpc_exec_ctx_finish(&exec_ctx); grpc_slice_unref(k); track_counters.Finish(state); } @@ -229,15 +235,16 @@ BENCHMARK(BM_MetadataFromStaticMetadataStringsNotIndexed); static void BM_MetadataRefUnrefExternal(benchmark::State& state) { TrackCounters track_counters; char backing_store[sizeof(grpc_mdelem_data)]; - grpc_core::ExecCtx exec_ctx; - grpc_mdelem el = grpc_mdelem_create( - grpc_slice_from_static_string("a"), grpc_slice_from_static_string("b"), - reinterpret_cast(backing_store)); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_mdelem el = + grpc_mdelem_create(&exec_ctx, grpc_slice_from_static_string("a"), + grpc_slice_from_static_string("b"), + reinterpret_cast(backing_store)); while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); + GRPC_MDELEM_UNREF(&exec_ctx, GRPC_MDELEM_REF(el)); } - GRPC_MDELEM_UNREF(el); - + GRPC_MDELEM_UNREF(&exec_ctx, el); + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_MetadataRefUnrefExternal); @@ -245,47 +252,47 @@ BENCHMARK(BM_MetadataRefUnrefExternal); static void BM_MetadataRefUnrefInterned(benchmark::State& state) { TrackCounters track_counters; char backing_store[sizeof(grpc_mdelem_data)]; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); grpc_mdelem el = grpc_mdelem_create( - k, v, reinterpret_cast(backing_store)); + &exec_ctx, k, v, reinterpret_cast(backing_store)); grpc_slice_unref(k); grpc_slice_unref(v); while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); + GRPC_MDELEM_UNREF(&exec_ctx, GRPC_MDELEM_REF(el)); } - GRPC_MDELEM_UNREF(el); - + GRPC_MDELEM_UNREF(&exec_ctx, el); + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_MetadataRefUnrefInterned); static void BM_MetadataRefUnrefAllocated(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_mdelem el = - grpc_mdelem_create(grpc_slice_from_static_string("a"), + grpc_mdelem_create(&exec_ctx, grpc_slice_from_static_string("a"), grpc_slice_from_static_string("b"), nullptr); while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); + GRPC_MDELEM_UNREF(&exec_ctx, GRPC_MDELEM_REF(el)); } - GRPC_MDELEM_UNREF(el); - + GRPC_MDELEM_UNREF(&exec_ctx, el); + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_MetadataRefUnrefAllocated); static void BM_MetadataRefUnrefStatic(benchmark::State& state) { TrackCounters track_counters; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_mdelem el = - grpc_mdelem_create(GRPC_MDSTR_STATUS, GRPC_MDSTR_200, nullptr); + grpc_mdelem_create(&exec_ctx, GRPC_MDSTR_STATUS, GRPC_MDSTR_200, nullptr); while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); + GRPC_MDELEM_UNREF(&exec_ctx, GRPC_MDELEM_REF(el)); } - GRPC_MDELEM_UNREF(el); - + GRPC_MDELEM_UNREF(&exec_ctx, el); + grpc_exec_ctx_finish(&exec_ctx); track_counters.Finish(state); } BENCHMARK(BM_MetadataRefUnrefStatic); diff --git a/test/cpp/microbenchmarks/bm_pollset.cc b/test/cpp/microbenchmarks/bm_pollset.cc index d9d5164cce5..4da79693f1a 100644 --- a/test/cpp/microbenchmarks/bm_pollset.cc +++ b/test/cpp/microbenchmarks/bm_pollset.cc @@ -41,8 +41,8 @@ auto& force_library_initialization = Library::get(); -static void shutdown_ps(void* ps, grpc_error* error) { - grpc_pollset_destroy(static_cast(ps)); +static void shutdown_ps(grpc_exec_ctx* exec_ctx, void* ps, grpc_error* error) { + grpc_pollset_destroy(exec_ctx, static_cast(ps)); } static void BM_CreateDestroyPollset(benchmark::State& state) { @@ -50,7 +50,7 @@ static void BM_CreateDestroyPollset(benchmark::State& state) { size_t ps_sz = grpc_pollset_size(); grpc_pollset* ps = static_cast(gpr_malloc(ps_sz)); gpr_mu* mu; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_closure shutdown_ps_closure; GRPC_CLOSURE_INIT(&shutdown_ps_closure, shutdown_ps, ps, grpc_schedule_on_exec_ctx); @@ -58,11 +58,11 @@ static void BM_CreateDestroyPollset(benchmark::State& state) { memset(ps, 0, ps_sz); grpc_pollset_init(ps, &mu); gpr_mu_lock(mu); - grpc_pollset_shutdown(ps, &shutdown_ps_closure); + grpc_pollset_shutdown(&exec_ctx, ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); } - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_finish(&exec_ctx); gpr_free(ps); track_counters.Finish(state); } @@ -114,17 +114,17 @@ static void BM_PollEmptyPollset(benchmark::State& state) { grpc_pollset* ps = static_cast(gpr_zalloc(ps_sz)); gpr_mu* mu; grpc_pollset_init(ps, &mu); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_mu_lock(mu); while (state.KeepRunning()) { - GRPC_ERROR_UNREF(grpc_pollset_work(ps, nullptr, 0)); + GRPC_ERROR_UNREF(grpc_pollset_work(&exec_ctx, ps, nullptr, 0)); } grpc_closure shutdown_ps_closure; GRPC_CLOSURE_INIT(&shutdown_ps_closure, shutdown_ps, ps, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(ps, &shutdown_ps_closure); + grpc_pollset_shutdown(&exec_ctx, ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_finish(&exec_ctx); gpr_free(ps); track_counters.Finish(state); } @@ -136,23 +136,24 @@ static void BM_PollAddFd(benchmark::State& state) { grpc_pollset* ps = static_cast(gpr_zalloc(ps_sz)); gpr_mu* mu; grpc_pollset_init(ps, &mu); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_wakeup_fd wakeup_fd; GPR_ASSERT( GRPC_LOG_IF_ERROR("wakeup_fd_init", grpc_wakeup_fd_init(&wakeup_fd))); grpc_fd* fd = grpc_fd_create(wakeup_fd.read_fd, "xxx"); while (state.KeepRunning()) { - grpc_pollset_add_fd(ps, fd); - grpc_core::ExecCtx::Get()->Flush(); + grpc_pollset_add_fd(&exec_ctx, ps, fd); + grpc_exec_ctx_flush(&exec_ctx); } - grpc_fd_orphan(fd, nullptr, nullptr, false /* already_closed */, "xxx"); + grpc_fd_orphan(&exec_ctx, fd, nullptr, nullptr, false /* already_closed */, + "xxx"); grpc_closure shutdown_ps_closure; GRPC_CLOSURE_INIT(&shutdown_ps_closure, shutdown_ps, ps, grpc_schedule_on_exec_ctx); gpr_mu_lock(mu); - grpc_pollset_shutdown(ps, &shutdown_ps_closure); + grpc_pollset_shutdown(&exec_ctx, ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_finish(&exec_ctx); gpr_free(ps); track_counters.Finish(state); } @@ -169,7 +170,7 @@ Closure* MakeClosure(F f, grpc_closure_scheduler* scheduler) { C(F f, grpc_closure_scheduler* scheduler) : f_(f) { GRPC_CLOSURE_INIT(this, C::cbfn, this, scheduler); } - static void cbfn(void* arg, grpc_error* error) { + static void cbfn(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { C* p = static_cast(arg); p->f_(); } @@ -218,11 +219,11 @@ static void BM_SingleThreadPollOneFd(benchmark::State& state) { grpc_pollset* ps = static_cast(gpr_zalloc(ps_sz)); gpr_mu* mu; grpc_pollset_init(ps, &mu); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_wakeup_fd wakeup_fd; GRPC_ERROR_UNREF(grpc_wakeup_fd_init(&wakeup_fd)); grpc_fd* wakeup = grpc_fd_create(wakeup_fd.read_fd, "wakeup_read"); - grpc_pollset_add_fd(ps, wakeup); + grpc_pollset_add_fd(&exec_ctx, ps, wakeup); bool done = false; Closure* continue_closure = MakeClosure( [&]() { @@ -232,23 +233,25 @@ static void BM_SingleThreadPollOneFd(benchmark::State& state) { return; } GRPC_ERROR_UNREF(grpc_wakeup_fd_wakeup(&wakeup_fd)); - grpc_fd_notify_on_read(wakeup, continue_closure); + grpc_fd_notify_on_read(&exec_ctx, wakeup, continue_closure); }, grpc_schedule_on_exec_ctx); GRPC_ERROR_UNREF(grpc_wakeup_fd_wakeup(&wakeup_fd)); - grpc_fd_notify_on_read(wakeup, continue_closure); + grpc_fd_notify_on_read(&exec_ctx, wakeup, continue_closure); gpr_mu_lock(mu); while (!done) { - GRPC_ERROR_UNREF(grpc_pollset_work(ps, nullptr, GRPC_MILLIS_INF_FUTURE)); + GRPC_ERROR_UNREF( + grpc_pollset_work(&exec_ctx, ps, nullptr, GRPC_MILLIS_INF_FUTURE)); } - grpc_fd_orphan(wakeup, nullptr, nullptr, false /* already_closed */, "done"); + grpc_fd_orphan(&exec_ctx, wakeup, nullptr, nullptr, + false /* already_closed */, "done"); wakeup_fd.read_fd = 0; grpc_closure shutdown_ps_closure; GRPC_CLOSURE_INIT(&shutdown_ps_closure, shutdown_ps, ps, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(ps, &shutdown_ps_closure); + grpc_pollset_shutdown(&exec_ctx, ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_finish(&exec_ctx); grpc_wakeup_fd_destroy(&wakeup_fd); gpr_free(ps); track_counters.Finish(state); diff --git a/test/cpp/microbenchmarks/fullstack_fixtures.h b/test/cpp/microbenchmarks/fullstack_fixtures.h index d1ede755a58..7e20843875b 100644 --- a/test/cpp/microbenchmarks/fullstack_fixtures.h +++ b/test/cpp/microbenchmarks/fullstack_fixtures.h @@ -166,7 +166,7 @@ class EndpointPairFixture : public BaseFixture { fixture_configuration.ApplyCommonServerBuilderConfig(&b); server_ = b.BuildAndStart(); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; /* add server endpoint to server_ * */ @@ -174,19 +174,20 @@ class EndpointPairFixture : public BaseFixture { const grpc_channel_args* server_args = grpc_server_get_channel_args(server_->c_server()); server_transport_ = grpc_create_chttp2_transport( - server_args, endpoints.server, false /* is_client */); + &exec_ctx, server_args, endpoints.server, false /* is_client */); grpc_pollset** pollsets; size_t num_pollsets = 0; grpc_server_get_pollsets(server_->c_server(), &pollsets, &num_pollsets); for (size_t i = 0; i < num_pollsets; i++) { - grpc_endpoint_add_to_pollset(endpoints.server, pollsets[i]); + grpc_endpoint_add_to_pollset(&exec_ctx, endpoints.server, pollsets[i]); } - grpc_server_setup_transport(server_->c_server(), server_transport_, - nullptr, server_args); - grpc_chttp2_transport_start_reading(server_transport_, nullptr, nullptr); + grpc_server_setup_transport(&exec_ctx, server_->c_server(), + server_transport_, nullptr, server_args); + grpc_chttp2_transport_start_reading(&exec_ctx, server_transport_, nullptr, + nullptr); } /* create channel */ @@ -196,15 +197,19 @@ class EndpointPairFixture : public BaseFixture { fixture_configuration.ApplyCommonChannelArguments(&args); grpc_channel_args c_args = args.c_channel_args(); - client_transport_ = - grpc_create_chttp2_transport(&c_args, endpoints.client, true); + client_transport_ = grpc_create_chttp2_transport(&exec_ctx, &c_args, + endpoints.client, true); GPR_ASSERT(client_transport_); - grpc_channel* channel = grpc_channel_create( - "target", &c_args, GRPC_CLIENT_DIRECT_CHANNEL, client_transport_); - grpc_chttp2_transport_start_reading(client_transport_, nullptr, nullptr); + grpc_channel* channel = + grpc_channel_create(&exec_ctx, "target", &c_args, + GRPC_CLIENT_DIRECT_CHANNEL, client_transport_); + grpc_chttp2_transport_start_reading(&exec_ctx, client_transport_, nullptr, + nullptr); channel_ = CreateChannelInternal("", channel); } + + grpc_exec_ctx_finish(&exec_ctx); } virtual ~EndpointPairFixture() { diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc index 3481d9d1aaf..6f1f0c44b90 100644 --- a/test/cpp/naming/resolver_component_test.cc +++ b/test/cpp/naming/resolver_component_test.cc @@ -149,33 +149,33 @@ struct ArgsStruct { std::string expected_lb_policy; }; -void ArgsInit(ArgsStruct* args) { +void ArgsInit(grpc_exec_ctx* exec_ctx, ArgsStruct* args) { gpr_event_init(&args->ev); args->pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); grpc_pollset_init(args->pollset, &args->mu); args->pollset_set = grpc_pollset_set_create(); - grpc_pollset_set_add_pollset(args->pollset_set, args->pollset); + grpc_pollset_set_add_pollset(exec_ctx, args->pollset_set, args->pollset); args->lock = grpc_combiner_create(); gpr_atm_rel_store(&args->done_atm, 0); args->channel_args = nullptr; } -void DoNothing(void* arg, grpc_error* error) {} +void DoNothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} -void ArgsFinish(ArgsStruct* args) { +void ArgsFinish(grpc_exec_ctx* exec_ctx, ArgsStruct* args) { GPR_ASSERT(gpr_event_wait(&args->ev, TestDeadline())); - grpc_pollset_set_del_pollset(args->pollset_set, args->pollset); - grpc_pollset_set_destroy(args->pollset_set); + grpc_pollset_set_del_pollset(exec_ctx, args->pollset_set, args->pollset); + grpc_pollset_set_destroy(exec_ctx, args->pollset_set); grpc_closure DoNothing_cb; GRPC_CLOSURE_INIT(&DoNothing_cb, DoNothing, nullptr, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(args->pollset, &DoNothing_cb); + grpc_pollset_shutdown(exec_ctx, args->pollset, &DoNothing_cb); // exec_ctx needs to be flushed before calling grpc_pollset_destroy() - grpc_channel_args_destroy(args->channel_args); - grpc_core::ExecCtx::Get()->Flush(); - grpc_pollset_destroy(args->pollset); + grpc_channel_args_destroy(exec_ctx, args->channel_args); + grpc_exec_ctx_flush(exec_ctx); + grpc_pollset_destroy(exec_ctx, args->pollset); gpr_free(args->pollset); - GRPC_COMBINER_UNREF(args->lock, nullptr); + GRPC_COMBINER_UNREF(exec_ctx, args->lock, NULL); } gpr_timespec NSecondDeadline(int seconds) { @@ -196,13 +196,14 @@ void PollPollsetUntilRequestDone(ArgsStruct* args) { time_left.tv_sec, time_left.tv_nsec); GPR_ASSERT(gpr_time_cmp(time_left, gpr_time_0(GPR_TIMESPAN)) >= 0); grpc_pollset_worker* worker = nullptr; - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_mu_lock(args->mu); GRPC_LOG_IF_ERROR("pollset_work", - grpc_pollset_work(args->pollset, &worker, + grpc_pollset_work(&exec_ctx, args->pollset, &worker, grpc_timespec_to_millis_round_up( NSecondDeadline(1)))); gpr_mu_unlock(args->mu); + grpc_exec_ctx_finish(&exec_ctx); } gpr_event_set(&args->ev, (void*)1); } @@ -234,7 +235,8 @@ void CheckLBPolicyResultLocked(grpc_channel_args* channel_args, } } -void CheckResolverResultLocked(void* argsp, grpc_error* err) { +void CheckResolverResultLocked(grpc_exec_ctx* exec_ctx, void* argsp, + grpc_error* err) { ArgsStruct* args = (ArgsStruct*)argsp; grpc_channel_args* channel_args = args->channel_args; const grpc_arg* channel_arg = @@ -270,14 +272,15 @@ void CheckResolverResultLocked(void* argsp, grpc_error* err) { } gpr_atm_rel_store(&args->done_atm, 1); gpr_mu_lock(args->mu); - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(args->pollset, nullptr)); + GRPC_LOG_IF_ERROR("pollset_kick", + grpc_pollset_kick(exec_ctx, args->pollset, nullptr)); gpr_mu_unlock(args->mu); } TEST(ResolverComponentTest, TestResolvesRelevantRecords) { - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; ArgsStruct args; - ArgsInit(&args); + ArgsInit(&exec_ctx, &args); args.expected_addrs = ParseExpectedAddrs(FLAGS_expected_addrs); args.expected_service_config_string = FLAGS_expected_chosen_service_config; args.expected_lb_policy = FLAGS_expected_lb_policy; @@ -287,18 +290,19 @@ TEST(ResolverComponentTest, TestResolvesRelevantRecords) { FLAGS_local_dns_server_address.c_str(), FLAGS_target_name.c_str())); // create resolver and resolve - grpc_resolver* resolver = - grpc_resolver_create(whole_uri, nullptr, args.pollset_set, args.lock); + grpc_resolver* resolver = grpc_resolver_create(&exec_ctx, whole_uri, nullptr, + args.pollset_set, args.lock); gpr_free(whole_uri); grpc_closure on_resolver_result_changed; GRPC_CLOSURE_INIT(&on_resolver_result_changed, CheckResolverResultLocked, (void*)&args, grpc_combiner_scheduler(args.lock)); - grpc_resolver_next_locked(resolver, &args.channel_args, + grpc_resolver_next_locked(&exec_ctx, resolver, &args.channel_args, &on_resolver_result_changed); - grpc_core::ExecCtx::Get()->Flush(); + grpc_exec_ctx_flush(&exec_ctx); PollPollsetUntilRequestDone(&args); - GRPC_RESOLVER_UNREF(resolver, nullptr); - ArgsFinish(&args); + GRPC_RESOLVER_UNREF(&exec_ctx, resolver, NULL); + ArgsFinish(&exec_ctx, &args); + grpc_exec_ctx_finish(&exec_ctx); } } // namespace diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc index 0b9dc83f2b1..1c6f44dd7d0 100644 --- a/test/cpp/performance/writes_per_rpc_test.cc +++ b/test/cpp/performance/writes_per_rpc_test.cc @@ -82,26 +82,27 @@ class EndpointPairFixture { ApplyCommonServerBuilderConfig(&b); server_ = b.BuildAndStart(); - grpc_core::ExecCtx exec_ctx; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; /* add server endpoint to server_ */ { const grpc_channel_args* server_args = grpc_server_get_channel_args(server_->c_server()); grpc_transport* transport = grpc_create_chttp2_transport( - server_args, endpoints.server, false /* is_client */); + &exec_ctx, server_args, endpoints.server, false /* is_client */); grpc_pollset** pollsets; size_t num_pollsets = 0; grpc_server_get_pollsets(server_->c_server(), &pollsets, &num_pollsets); for (size_t i = 0; i < num_pollsets; i++) { - grpc_endpoint_add_to_pollset(endpoints.server, pollsets[i]); + grpc_endpoint_add_to_pollset(&exec_ctx, endpoints.server, pollsets[i]); } - grpc_server_setup_transport(server_->c_server(), transport, nullptr, - server_args); - grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); + grpc_server_setup_transport(&exec_ctx, server_->c_server(), transport, + nullptr, server_args); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, + nullptr); } /* create channel */ @@ -111,15 +112,18 @@ class EndpointPairFixture { ApplyCommonChannelArguments(&args); grpc_channel_args c_args = args.c_channel_args(); - grpc_transport* transport = - grpc_create_chttp2_transport(&c_args, endpoints.client, true); + grpc_transport* transport = grpc_create_chttp2_transport( + &exec_ctx, &c_args, endpoints.client, true); GPR_ASSERT(transport); grpc_channel* channel = grpc_channel_create( - "target", &c_args, GRPC_CLIENT_DIRECT_CHANNEL, transport); - grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); + &exec_ctx, "target", &c_args, GRPC_CLIENT_DIRECT_CHANNEL, transport); + grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, + nullptr); channel_ = CreateChannelInternal("", channel); } + + grpc_exec_ctx_finish(&exec_ctx); } virtual ~EndpointPairFixture() { diff --git a/test/cpp/server/server_builder_test.cc b/test/cpp/server/server_builder_test.cc index 694ce549c06..d18459cec9d 100644 --- a/test/cpp/server/server_builder_test.cc +++ b/test/cpp/server/server_builder_test.cc @@ -22,8 +22,6 @@ #include #include -#include - #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" @@ -79,8 +77,5 @@ TEST(ServerBuilderTest, CreateServerRepeatedPortWithDisallowedReusePort) { int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - grpc_init(); - int ret = RUN_ALL_TESTS(); - grpc_shutdown(); - return ret; + return RUN_ALL_TESTS(); } diff --git a/test/cpp/util/byte_buffer_test.cc b/test/cpp/util/byte_buffer_test.cc index d603b289c88..8fb51bc6635 100644 --- a/test/cpp/util/byte_buffer_test.cc +++ b/test/cpp/util/byte_buffer_test.cc @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -110,8 +109,5 @@ TEST_F(ByteBufferTest, SerializationMakesCopy) { int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - grpc_init(); - int ret = RUN_ALL_TESTS(); - grpc_shutdown(); - return ret; + return RUN_ALL_TESTS(); } diff --git a/test/cpp/util/slice_test.cc b/test/cpp/util/slice_test.cc index c2e55f3374f..8a8962d7ee0 100644 --- a/test/cpp/util/slice_test.cc +++ b/test/cpp/util/slice_test.cc @@ -18,7 +18,6 @@ #include -#include #include #include @@ -128,8 +127,5 @@ TEST_F(SliceTest, Cslice) { int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - grpc_init(); - int ret = RUN_ALL_TESTS(); - grpc_shutdown(); - return ret; + return RUN_ALL_TESTS(); } diff --git a/tools/codegen/core/gen_static_metadata.py b/tools/codegen/core/gen_static_metadata.py index 7847b8ed1de..355f3f4e232 100755 --- a/tools/codegen/core/gen_static_metadata.py +++ b/tools/codegen/core/gen_static_metadata.py @@ -395,7 +395,7 @@ print >> C, 'static uint8_t g_bytes[] = {%s};' % ( ','.join('%d' % ord(c) for c in ''.join(all_strs))) print >> C print >> C, 'static void static_ref(void *unused) {}' -print >> C, 'static void static_unref(void *unused) {}' +print >> C, 'static void static_unref(grpc_exec_ctx *exec_ctx, void *unused) {}' print >> C, ('static const grpc_slice_refcount_vtable static_sub_vtable = ' '{static_ref, static_unref, grpc_slice_default_eq_impl, ' 'grpc_slice_default_hash_impl};') diff --git a/tools/codegen/core/gen_stats_data.py b/tools/codegen/core/gen_stats_data.py index d439d99a8c6..072a6776152 100755 --- a/tools/codegen/core/gen_stats_data.py +++ b/tools/codegen/core/gen_stats_data.py @@ -150,11 +150,11 @@ def gen_bucket_code(histogram): code = 'value = GPR_CLAMP(value, 0, %d);\n' % histogram.max map_table = gen_map_table(code_bounds[first_nontrivial:], shift_data) if first_nontrivial is None: - code += ('GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_%s, value);\n' + code += ('GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_%s, value);\n' % histogram.name.upper()) else: code += 'if (value < %d) {\n' % first_nontrivial - code += ('GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_%s, value);\n' + code += ('GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_%s, value);\n' % histogram.name.upper()) code += 'return;\n' code += '}' @@ -168,11 +168,11 @@ def gen_bucket_code(histogram): code += 'grpc_stats_table_%d[((_val.uint - %dull) >> %d)] + %d;\n' % (map_table_idx, first_nontrivial_code, shift_data[0], first_nontrivial) code += '_bkt.dbl = grpc_stats_table_%d[bucket];\n' % bounds_idx code += 'bucket -= (_val.uint < _bkt.uint);\n' - code += 'GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_%s, bucket);\n' % histogram.name.upper() + code += 'GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_%s, bucket);\n' % histogram.name.upper() code += 'return;\n' code += '}\n' - code += 'GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_%s, '% histogram.name.upper() - code += 'grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_%d, %d));\n' % (bounds_idx, histogram.buckets) + code += 'GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_%s, '% histogram.name.upper() + code += 'grpc_stats_histo_find_bucket_slow((exec_ctx), value, grpc_stats_table_%d, %d));\n' % (bounds_idx, histogram.buckets) return (code, bounds_idx) # utility: print a big comment block into a set of files @@ -240,13 +240,13 @@ with open('src/core/lib/debug/stats_data.h', 'w') as H: print >>H, "} grpc_stats_histogram_constants;" for ctr in inst_map['Counter']: - print >>H, ("#define GRPC_STATS_INC_%s() " + - "GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_%s)") % ( + print >>H, ("#define GRPC_STATS_INC_%s(exec_ctx) " + + "GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_%s)") % ( ctr.name.upper(), ctr.name.upper()) for histogram in inst_map['Histogram']: - print >>H, "#define GRPC_STATS_INC_%s(value) grpc_stats_inc_%s( (int)(value))" % ( + print >>H, "#define GRPC_STATS_INC_%s(exec_ctx, value) grpc_stats_inc_%s((exec_ctx), (int)(value))" % ( histogram.name.upper(), histogram.name.lower()) - print >>H, "void grpc_stats_inc_%s(int x);" % histogram.name.lower() + print >>H, "void grpc_stats_inc_%s(grpc_exec_ctx *exec_ctx, int x);" % histogram.name.lower() for i, tbl in enumerate(static_tables): print >>H, "extern const %s grpc_stats_table_%d[%d];" % (tbl[0], i, len(tbl[1])) @@ -254,7 +254,7 @@ with open('src/core/lib/debug/stats_data.h', 'w') as H: print >>H, "extern const int grpc_stats_histo_buckets[%d];" % len(inst_map['Histogram']) print >>H, "extern const int grpc_stats_histo_start[%d];" % len(inst_map['Histogram']) print >>H, "extern const int *const grpc_stats_histo_bucket_boundaries[%d];" % len(inst_map['Histogram']) - print >>H, "extern void (*const grpc_stats_inc_histogram[%d])(int x);" % len(inst_map['Histogram']) + print >>H, "extern void (*const grpc_stats_inc_histogram[%d])(grpc_exec_ctx *exec_ctx, int x);" % len(inst_map['Histogram']) print >>H print >>H, "#ifdef __cplusplus" @@ -309,7 +309,7 @@ with open('src/core/lib/debug/stats_data.cc', 'w') as C: tbl[0], i, len(tbl[1]), ','.join('%s' % x for x in tbl[1])) for histogram, code in zip(inst_map['Histogram'], histo_code): - print >>C, ("void grpc_stats_inc_%s(int value) {%s}") % ( + print >>C, ("void grpc_stats_inc_%s(grpc_exec_ctx *exec_ctx, int value) {%s}") % ( histogram.name.lower(), code) @@ -319,7 +319,7 @@ with open('src/core/lib/debug/stats_data.cc', 'w') as C: len(inst_map['Histogram']), ','.join('%s' % x for x in histo_start)) print >>C, "const int *const grpc_stats_histo_bucket_boundaries[%d] = {%s};" % ( len(inst_map['Histogram']), ','.join('grpc_stats_table_%d' % x for x in histo_bucket_boundaries)) - print >>C, "void (*const grpc_stats_inc_histogram[%d])(int x) = {%s};" % ( + print >>C, "void (*const grpc_stats_inc_histogram[%d])(grpc_exec_ctx *exec_ctx, int x) = {%s};" % ( len(inst_map['Histogram']), ','.join('grpc_stats_inc_%s' % histogram.name.lower() for histogram in inst_map['Histogram'])) # patch qps_test bigquery schema From 8cf1470a51ea276ca84825e7495d4ee24743540d Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Wed, 6 Dec 2017 09:47:54 -0800 Subject: [PATCH 056/127] Revert "Revert "All instances of exec_ctx being passed around in src/core removed"" --- include/grpc++/support/channel_arguments.h | 2 +- include/grpc/impl/codegen/grpc_types.h | 2 +- include/grpc/impl/codegen/slice.h | 2 +- include/grpc/slice_buffer.h | 3 +- include/grpc/support/tls.h | 6 + include/grpc/support/tls_gcc.h | 5 + include/grpc/support/tls_msvc.h | 9 + include/grpc/support/tls_pthread.h | 9 + .../filters/client_channel/backup_poller.cc | 47 +- .../filters/client_channel/backup_poller.h | 4 +- .../client_channel/channel_connectivity.cc | 52 +- .../filters/client_channel/client_channel.cc | 409 +++---- .../filters/client_channel/client_channel.h | 8 +- .../client_channel/client_channel_factory.cc | 23 +- .../client_channel/client_channel_factory.h | 19 +- .../client_channel/client_channel_plugin.cc | 13 +- .../ext/filters/client_channel/connector.cc | 13 +- .../ext/filters/client_channel/connector.h | 14 +- .../client_channel/http_connect_handshaker.cc | 84 +- .../ext/filters/client_channel/http_proxy.cc | 18 +- .../ext/filters/client_channel/lb_policy.cc | 79 +- .../ext/filters/client_channel/lb_policy.h | 80 +- .../grpclb/client_load_reporting_filter.cc | 27 +- .../client_channel/lb_policy/grpclb/grpclb.cc | 434 +++---- .../lb_policy/grpclb/grpclb_channel.cc | 6 +- .../lb_policy/grpclb/grpclb_channel.h | 4 +- .../lb_policy/grpclb/grpclb_channel_secure.cc | 10 +- .../lb_policy/pick_first/pick_first.cc | 190 ++- .../lb_policy/round_robin/round_robin.cc | 140 +-- .../lb_policy/subchannel_list.cc | 54 +- .../lb_policy/subchannel_list.h | 18 +- .../client_channel/lb_policy_factory.cc | 15 +- .../client_channel/lb_policy_factory.h | 11 +- .../client_channel/lb_policy_registry.cc | 4 +- .../client_channel/lb_policy_registry.h | 2 +- .../filters/client_channel/proxy_mapper.cc | 14 +- .../ext/filters/client_channel/proxy_mapper.h | 14 +- .../client_channel/proxy_mapper_registry.cc | 30 +- .../client_channel/proxy_mapper_registry.h | 6 +- .../ext/filters/client_channel/resolver.cc | 24 +- .../ext/filters/client_channel/resolver.h | 31 +- .../resolver/dns/c_ares/dns_resolver_ares.cc | 94 +- .../resolver/dns/c_ares/grpc_ares_ev_driver.h | 6 +- .../dns/c_ares/grpc_ares_ev_driver_posix.cc | 52 +- .../resolver/dns/c_ares/grpc_ares_wrapper.cc | 70 +- .../resolver/dns/c_ares/grpc_ares_wrapper.h | 12 +- .../dns/c_ares/grpc_ares_wrapper_fallback.cc | 20 +- .../resolver/dns/native/dns_resolver.cc | 90 +- .../resolver/fake/fake_resolver.cc | 52 +- .../resolver/fake/fake_resolver.h | 2 +- .../resolver/sockaddr/sockaddr_resolver.cc | 55 +- .../client_channel/resolver_factory.cc | 5 +- .../filters/client_channel/resolver_factory.h | 6 +- .../client_channel/resolver_registry.cc | 27 +- .../client_channel/resolver_registry.h | 7 +- .../ext/filters/client_channel/subchannel.cc | 239 ++-- .../ext/filters/client_channel/subchannel.h | 75 +- .../client_channel/subchannel_index.cc | 63 +- .../filters/client_channel/subchannel_index.h | 12 +- .../ext/filters/client_channel/uri_parser.cc | 28 +- .../ext/filters/client_channel/uri_parser.h | 3 +- .../ext/filters/deadline/deadline_filter.cc | 112 +- .../ext/filters/deadline/deadline_filter.h | 10 +- .../filters/http/client/http_client_filter.cc | 125 +- .../ext/filters/http/http_filters_plugin.cc | 6 +- .../message_compress_filter.cc | 126 +- .../filters/http/server/http_server_filter.cc | 118 +- .../server_load_reporting_filter.cc | 33 +- .../server_load_reporting_plugin.cc | 2 +- .../ext/filters/max_age/max_age_filter.cc | 101 +- .../message_size/message_size_filter.cc | 36 +- .../workaround_cronet_compression_filter.cc | 23 +- .../chttp2/client/chttp2_connector.cc | 70 +- .../chttp2/client/insecure/channel_create.cc | 32 +- .../client/insecure/channel_create_posix.cc | 16 +- .../client/secure/secure_channel_create.cc | 51 +- .../transport/chttp2/server/chttp2_server.cc | 108 +- .../transport/chttp2/server/chttp2_server.h | 3 +- .../chttp2/server/insecure/server_chttp2.cc | 6 +- .../server/insecure/server_chttp2_posix.cc | 17 +- .../server/secure/server_secure_chttp2.cc | 11 +- .../transport/chttp2/transport/bin_decoder.cc | 14 +- .../transport/chttp2/transport/bin_decoder.h | 5 +- .../transport/chttp2/transport/bin_encoder.h | 2 +- .../chttp2/transport/chttp2_transport.cc | 1088 +++++++---------- .../chttp2/transport/chttp2_transport.h | 7 +- .../chttp2/transport/flow_control.cc | 15 +- .../transport/chttp2/transport/flow_control.h | 7 +- .../transport/chttp2/transport/frame_data.cc | 62 +- .../transport/chttp2/transport/frame_data.h | 7 +- .../chttp2/transport/frame_goaway.cc | 5 +- .../transport/chttp2/transport/frame_goaway.h | 3 +- .../transport/chttp2/transport/frame_ping.cc | 11 +- .../transport/chttp2/transport/frame_ping.h | 2 +- .../chttp2/transport/frame_rst_stream.cc | 5 +- .../chttp2/transport/frame_rst_stream.h | 3 +- .../chttp2/transport/frame_settings.cc | 5 +- .../chttp2/transport/frame_settings.h | 3 +- .../chttp2/transport/frame_window_update.cc | 16 +- .../chttp2/transport/frame_window_update.h | 8 +- .../chttp2/transport/hpack_encoder.cc | 144 +-- .../chttp2/transport/hpack_encoder.h | 6 +- .../chttp2/transport/hpack_parser.cc | 546 ++++----- .../transport/chttp2/transport/hpack_parser.h | 17 +- .../transport/chttp2/transport/hpack_table.cc | 32 +- .../transport/chttp2/transport/hpack_table.h | 13 +- .../chttp2/transport/incoming_metadata.cc | 19 +- .../chttp2/transport/incoming_metadata.h | 9 +- .../ext/transport/chttp2/transport/internal.h | 106 +- .../ext/transport/chttp2/transport/parsing.cc | 185 ++- .../ext/transport/chttp2/transport/writing.cc | 121 +- .../client/secure/cronet_channel_create.cc | 5 +- .../cronet/transport/cronet_transport.cc | 173 ++- .../ext/transport/inproc/inproc_transport.cc | 342 +++--- src/core/lib/backoff/backoff.cc | 10 +- src/core/lib/backoff/backoff.h | 6 +- src/core/lib/channel/channel_args.cc | 16 +- src/core/lib/channel/channel_args.h | 9 +- src/core/lib/channel/channel_stack.cc | 46 +- src/core/lib/channel/channel_stack.h | 64 +- src/core/lib/channel/channel_stack_builder.cc | 25 +- src/core/lib/channel/channel_stack_builder.h | 11 +- src/core/lib/channel/connected_channel.cc | 57 +- src/core/lib/channel/connected_channel.h | 3 +- src/core/lib/channel/handshaker.cc | 77 +- src/core/lib/channel/handshaker.h | 33 +- src/core/lib/channel/handshaker_factory.cc | 12 +- src/core/lib/channel/handshaker_factory.h | 12 +- src/core/lib/channel/handshaker_registry.cc | 22 +- src/core/lib/channel/handshaker_registry.h | 5 +- src/core/lib/compression/message_compress.cc | 42 +- src/core/lib/compression/message_compress.h | 6 +- .../compression/stream_compression_gzip.cc | 20 +- src/core/lib/debug/stats.cc | 6 +- src/core/lib/debug/stats.h | 20 +- src/core/lib/debug/stats_data.cc | 201 ++- src/core/lib/debug/stats_data.h | 540 ++++---- src/core/lib/http/httpcli.cc | 127 +- src/core/lib/http/httpcli.h | 27 +- .../lib/http/httpcli_security_connector.cc | 55 +- src/core/lib/iomgr/block_annotate.h | 19 +- src/core/lib/iomgr/call_combiner.cc | 31 +- src/core/lib/iomgr/call_combiner.h | 40 +- src/core/lib/iomgr/closure.h | 58 +- src/core/lib/iomgr/combiner.cc | 128 +- src/core/lib/iomgr/combiner.h | 12 +- src/core/lib/iomgr/endpoint.cc | 36 +- src/core/lib/iomgr/endpoint.h | 41 +- src/core/lib/iomgr/endpoint_pair_posix.cc | 7 +- src/core/lib/iomgr/endpoint_pair_windows.cc | 10 +- src/core/lib/iomgr/error.cc | 6 +- src/core/lib/iomgr/ev_epoll1_linux.cc | 196 ++- src/core/lib/iomgr/ev_epollex_linux.cc | 238 ++-- src/core/lib/iomgr/ev_epollsig_linux.cc | 180 ++- src/core/lib/iomgr/ev_poll_posix.cc | 199 ++- src/core/lib/iomgr/ev_posix.cc | 80 +- src/core/lib/iomgr/ev_posix.h | 72 +- src/core/lib/iomgr/exec_ctx.cc | 124 +- src/core/lib/iomgr/exec_ctx.h | 182 ++- src/core/lib/iomgr/executor.cc | 58 +- src/core/lib/iomgr/executor.h | 6 +- src/core/lib/iomgr/fork_posix.cc | 17 +- src/core/lib/iomgr/iocp_windows.cc | 30 +- src/core/lib/iomgr/iocp_windows.h | 3 +- src/core/lib/iomgr/iomgr.cc | 115 +- src/core/lib/iomgr/iomgr.h | 6 +- src/core/lib/iomgr/iomgr_uv.cc | 5 +- src/core/lib/iomgr/lockfree_event.cc | 15 +- src/core/lib/iomgr/lockfree_event.h | 6 +- src/core/lib/iomgr/polling_entity.cc | 16 +- src/core/lib/iomgr/polling_entity.h | 6 +- src/core/lib/iomgr/pollset.h | 9 +- src/core/lib/iomgr/pollset_set.h | 15 +- src/core/lib/iomgr/pollset_set_uv.cc | 15 +- src/core/lib/iomgr/pollset_set_windows.cc | 15 +- src/core/lib/iomgr/pollset_uv.cc | 17 +- src/core/lib/iomgr/pollset_windows.cc | 29 +- src/core/lib/iomgr/resolve_address.h | 3 +- src/core/lib/iomgr/resolve_address_posix.cc | 20 +- src/core/lib/iomgr/resolve_address_uv.cc | 15 +- src/core/lib/iomgr/resolve_address_windows.cc | 15 +- src/core/lib/iomgr/resource_quota.cc | 182 ++- src/core/lib/iomgr/resource_quota.h | 25 +- src/core/lib/iomgr/socket_factory_posix.cc | 2 +- src/core/lib/iomgr/socket_mutator.cc | 2 +- src/core/lib/iomgr/socket_windows.cc | 19 +- src/core/lib/iomgr/socket_windows.h | 9 +- src/core/lib/iomgr/tcp_client.h | 3 +- src/core/lib/iomgr/tcp_client_posix.cc | 64 +- src/core/lib/iomgr/tcp_client_posix.h | 3 +- src/core/lib/iomgr/tcp_client_uv.cc | 37 +- src/core/lib/iomgr/tcp_client_windows.cc | 45 +- src/core/lib/iomgr/tcp_posix.cc | 262 ++-- src/core/lib/iomgr/tcp_posix.h | 7 +- src/core/lib/iomgr/tcp_server.h | 15 +- src/core/lib/iomgr/tcp_server_posix.cc | 64 +- src/core/lib/iomgr/tcp_server_uv.cc | 57 +- src/core/lib/iomgr/tcp_server_windows.cc | 58 +- src/core/lib/iomgr/tcp_uv.cc | 99 +- src/core/lib/iomgr/tcp_windows.cc | 93 +- src/core/lib/iomgr/tcp_windows.h | 2 +- src/core/lib/iomgr/timer.h | 13 +- src/core/lib/iomgr/timer_generic.cc | 47 +- src/core/lib/iomgr/timer_manager.cc | 30 +- src/core/lib/iomgr/timer_uv.cc | 26 +- src/core/lib/iomgr/udp_server.cc | 83 +- src/core/lib/iomgr/udp_server.h | 17 +- .../lib/security/context/security_context.cc | 17 +- .../composite/composite_credentials.cc | 51 +- .../lib/security/credentials/credentials.cc | 73 +- .../lib/security/credentials/credentials.h | 59 +- .../credentials/credentials_metadata.cc | 4 +- .../credentials/fake/fake_credentials.cc | 36 +- .../google_default_credentials.cc | 58 +- .../credentials/iam/iam_credentials.cc | 22 +- .../credentials/jwt/jwt_credentials.cc | 34 +- .../credentials/jwt/jwt_credentials.h | 3 +- .../security/credentials/jwt/jwt_verifier.cc | 126 +- .../security/credentials/jwt/jwt_verifier.h | 14 +- .../credentials/oauth2/oauth2_credentials.cc | 102 +- .../credentials/oauth2/oauth2_credentials.h | 7 +- .../credentials/plugin/plugin_credentials.cc | 51 +- .../credentials/ssl/ssl_credentials.cc | 21 +- .../security/transport/client_auth_filter.cc | 85 +- .../lib/security/transport/lb_targets_info.cc | 4 +- .../lib/security/transport/secure_endpoint.cc | 120 +- .../security/transport/security_connector.cc | 144 +-- .../security/transport/security_connector.h | 53 +- .../security/transport/security_handshaker.cc | 189 ++- .../security/transport/security_handshaker.h | 3 +- .../security/transport/server_auth_filter.cc | 55 +- src/core/lib/slice/b64.cc | 11 +- src/core/lib/slice/b64.h | 7 +- src/core/lib/slice/slice.cc | 17 +- src/core/lib/slice/slice_buffer.cc | 27 +- src/core/lib/slice/slice_hash_table.cc | 12 +- src/core/lib/slice/slice_hash_table.h | 6 +- src/core/lib/slice/slice_intern.cc | 7 +- src/core/lib/slice/slice_internal.h | 11 +- src/core/lib/surface/alarm.cc | 25 +- src/core/lib/surface/byte_buffer.cc | 5 +- src/core/lib/surface/byte_buffer_reader.cc | 16 +- src/core/lib/surface/call.cc | 429 +++---- src/core/lib/surface/call.h | 24 +- src/core/lib/surface/call_details.cc | 7 +- src/core/lib/surface/channel.cc | 115 +- src/core/lib/surface/channel.h | 27 +- src/core/lib/surface/channel_init.cc | 5 +- src/core/lib/surface/channel_init.h | 6 +- src/core/lib/surface/channel_ping.cc | 14 +- src/core/lib/surface/completion_queue.cc | 328 +++-- src/core/lib/surface/completion_queue.h | 21 +- src/core/lib/surface/init.cc | 51 +- src/core/lib/surface/init_secure.cc | 4 +- src/core/lib/surface/lame_client.cc | 53 +- src/core/lib/surface/server.cc | 322 ++--- src/core/lib/surface/server.h | 15 +- src/core/lib/transport/bdp_estimator.cc | 4 +- src/core/lib/transport/bdp_estimator.h | 2 +- src/core/lib/transport/byte_stream.cc | 62 +- src/core/lib/transport/byte_stream.h | 27 +- src/core/lib/transport/connectivity_state.cc | 22 +- src/core/lib/transport/connectivity_state.h | 10 +- src/core/lib/transport/error_utils.cc | 10 +- src/core/lib/transport/error_utils.h | 5 +- src/core/lib/transport/metadata.cc | 40 +- src/core/lib/transport/metadata.h | 20 +- src/core/lib/transport/metadata_batch.cc | 79 +- src/core/lib/transport/metadata_batch.h | 42 +- src/core/lib/transport/service_config.cc | 24 +- src/core/lib/transport/service_config.h | 8 +- src/core/lib/transport/static_metadata.cc | 2 +- src/core/lib/transport/status_conversion.cc | 5 +- src/core/lib/transport/status_conversion.h | 3 +- src/core/lib/transport/transport.cc | 84 +- src/core/lib/transport/transport.h | 33 +- src/core/lib/transport/transport_impl.h | 27 +- src/core/tsi/fake_transport_security.cc | 17 +- src/core/tsi/transport_security.h | 2 +- src/core/tsi/transport_security_grpc.cc | 29 +- src/core/tsi/transport_security_grpc.h | 22 +- src/cpp/common/channel_arguments.cc | 11 +- src/cpp/common/channel_filter.cc | 29 +- src/cpp/common/channel_filter.h | 62 +- .../CoreCronetEnd2EndTests.mm | 5 +- src/ruby/ext/grpc/rb_grpc_imports.generated.h | 2 +- test/core/backoff/backoff_test.cc | 99 +- test/core/bad_client/bad_client.cc | 49 +- test/core/bad_client/tests/badreq.cc | 4 + .../bad_client/tests/connection_prefix.cc | 3 + .../bad_client/tests/head_of_line_blocking.cc | 3 + test/core/bad_client/tests/headers.cc | 2 + .../tests/initial_settings_frame.cc | 2 + .../tests/server_registered_method.cc | 2 + test/core/bad_client/tests/simple_request.cc | 4 + test/core/bad_client/tests/unknown_frame.cc | 2 + test/core/bad_client/tests/window_overflow.cc | 3 + test/core/channel/channel_args_test.cc | 26 +- .../channel/channel_stack_builder_test.cc | 24 +- test/core/channel/channel_stack_test.cc | 45 +- .../channel/minimal_stack_is_minimal_test.cc | 15 +- test/core/client_channel/lb_policies_test.cc | 14 +- .../core/client_channel/parse_address_test.cc | 19 +- .../dns_resolver_connectivity_test.cc | 85 +- .../resolvers/dns_resolver_test.cc | 21 +- .../resolvers/fake_resolver_test.cc | 54 +- .../resolvers/sockaddr_resolver_test.cc | 28 +- test/core/client_channel/uri_fuzzer_test.cc | 19 +- test/core/client_channel/uri_parser_test.cc | 31 +- test/core/compression/algorithm_test.cc | 12 +- .../core/compression/message_compress_test.cc | 62 +- test/core/debug/stats_test.cc | 15 +- test/core/end2end/bad_server_response_test.cc | 37 +- test/core/end2end/connection_refused_test.cc | 5 +- test/core/end2end/fixtures/h2_census.cc | 10 +- test/core/end2end/fixtures/h2_compress.cc | 17 +- test/core/end2end/fixtures/h2_fd.cc | 8 +- .../end2end/fixtures/h2_full+workarounds.cc | 5 +- .../end2end/fixtures/h2_load_reporting.cc | 5 +- test/core/end2end/fixtures/h2_oauth2.cc | 7 +- .../end2end/fixtures/h2_sockpair+trace.cc | 35 +- test/core/end2end/fixtures/h2_sockpair.cc | 33 +- .../end2end/fixtures/h2_sockpair_1byte.cc | 33 +- test/core/end2end/fixtures/h2_ssl.cc | 5 +- test/core/end2end/fixtures/h2_ssl_proxy.cc | 10 +- .../end2end/fixtures/http_proxy_fixture.cc | 192 ++- test/core/end2end/fuzzers/api_fuzzer.cc | 83 +- test/core/end2end/fuzzers/client_fuzzer.cc | 210 ++-- test/core/end2end/fuzzers/server_fuzzer.cc | 135 +- test/core/end2end/goaway_server_test.cc | 28 +- test/core/end2end/h2_ssl_cert_test.cc | 5 +- .../core/end2end/tests/cancel_after_accept.cc | 5 +- .../end2end/tests/cancel_after_round_trip.cc | 5 +- test/core/end2end/tests/compressed_payload.cc | 19 +- .../end2end/tests/filter_call_init_fails.cc | 19 +- .../core/end2end/tests/filter_causes_close.cc | 24 +- test/core/end2end/tests/filter_latency.cc | 18 +- .../core/end2end/tests/load_reporting_hook.cc | 5 +- test/core/end2end/tests/max_message_length.cc | 18 +- .../stream_compression_compressed_payload.cc | 19 +- .../tests/stream_compression_payload.cc | 7 +- .../stream_compression_ping_pong_streaming.cc | 7 +- .../tests/workaround_cronet_compression.cc | 12 +- .../readahead_handshaker_server_ssl.cc | 24 +- test/core/http/format_request_test.cc | 2 + test/core/http/httpcli_test.cc | 146 ++- test/core/http/httpscli_test.cc | 52 +- test/core/http/parser_test.cc | 3 + test/core/http/request_fuzzer.cc | 3 + test/core/http/response_fuzzer.cc | 3 + test/core/iomgr/combiner_test.cc | 51 +- test/core/iomgr/endpoint_pair_test.cc | 29 +- test/core/iomgr/endpoint_tests.cc | 99 +- test/core/iomgr/ev_epollsig_linux_test.cc | 109 +- test/core/iomgr/fd_conservation_posix_test.cc | 37 +- test/core/iomgr/fd_posix_test.cc | 156 ++- test/core/iomgr/load_file_test.cc | 3 + test/core/iomgr/pollset_set_test.cc | 245 ++-- test/core/iomgr/resolve_address_posix_test.cc | 65 +- test/core/iomgr/resolve_address_test.cc | 153 ++- test/core/iomgr/resource_quota_test.cc | 354 +++--- test/core/iomgr/tcp_client_posix_test.cc | 83 +- test/core/iomgr/tcp_client_uv_test.cc | 62 +- test/core/iomgr/tcp_posix_test.cc | 153 ++- test/core/iomgr/tcp_server_posix_test.cc | 183 ++- test/core/iomgr/tcp_server_uv_test.cc | 90 +- test/core/iomgr/timer_list_test.cc | 75 +- test/core/iomgr/udp_server_test.cc | 105 +- test/core/nanopb/fuzzer_response.cc | 3 + test/core/nanopb/fuzzer_serverlist.cc | 3 + test/core/security/credentials_test.cc | 303 ++--- test/core/security/json_token_test.cc | 16 +- test/core/security/jwt_verifier_test.cc | 146 +-- test/core/security/oauth2_utils.cc | 30 +- .../print_google_default_creds_token.cc | 22 +- test/core/security/secure_endpoint_test.cc | 67 +- test/core/security/ssl_server_fuzzer.cc | 124 +- test/core/security/verify_jwt.cc | 23 +- test/core/slice/b64_test.cc | 46 +- test/core/slice/percent_decode_fuzzer.cc | 3 + test/core/slice/percent_encode_fuzzer.cc | 3 + test/core/slice/percent_encoding_test.cc | 3 + test/core/slice/slice_buffer_test.cc | 3 + test/core/slice/slice_hash_table_test.cc | 39 +- test/core/slice/slice_string_helpers_test.cc | 3 + test/core/slice/slice_test.cc | 2 + test/core/surface/byte_buffer_reader_test.cc | 8 +- test/core/surface/channel_create_test.cc | 3 +- test/core/surface/completion_queue_test.cc | 39 +- .../completion_queue_threading_test.cc | 19 +- .../surface/concurrent_connectivity_test.cc | 41 +- test/core/surface/lame_client_test.cc | 13 +- ...num_external_connectivity_watchers_test.cc | 5 +- .../surface/secure_channel_create_test.cc | 17 +- .../surface/sequential_connectivity_test.cc | 5 +- test/core/transport/bdp_estimator_test.cc | 7 +- test/core/transport/byte_stream_test.cc | 113 +- .../core/transport/chttp2/bin_decoder_test.cc | 158 ++- .../core/transport/chttp2/bin_encoder_test.cc | 3 + .../transport/chttp2/hpack_encoder_test.cc | 91 +- .../chttp2/hpack_parser_fuzzer_test.cc | 19 +- .../transport/chttp2/hpack_parser_test.cc | 41 +- .../core/transport/chttp2/hpack_table_test.cc | 72 +- .../transport/chttp2/settings_timeout_test.cc | 55 +- test/core/transport/chttp2/varint_test.cc | 3 + .../core/transport/connectivity_state_test.cc | 51 +- test/core/transport/metadata_test.cc | 137 +-- test/core/transport/status_conversion_test.cc | 11 +- .../core/transport/stream_owned_slice_test.cc | 5 +- test/core/util/mock_endpoint.cc | 36 +- test/core/util/mock_endpoint.h | 3 +- test/core/util/one_corpus_entry_fuzzer.cc | 8 + test/core/util/passthru_endpoint.cc | 45 +- test/core/util/port_server_client.cc | 130 +- test/core/util/reconnect_server.cc | 6 +- test/core/util/test_tcp_server.cc | 36 +- test/core/util/trickle_endpoint.cc | 56 +- test/core/util/trickle_endpoint.h | 3 +- test/cpp/client/client_channel_stress_test.cc | 11 +- test/cpp/common/channel_arguments_test.cc | 5 +- test/cpp/common/channel_filter_test.cc | 4 +- test/cpp/end2end/client_lb_end2end_test.cc | 13 +- test/cpp/end2end/filter_end2end_test.cc | 7 +- test/cpp/end2end/grpclb_end2end_test.cc | 11 +- test/cpp/grpclb/grpclb_api_test.cc | 6 +- test/cpp/grpclb/grpclb_test.cc | 17 +- test/cpp/microbenchmarks/bm_call_create.cc | 139 +-- test/cpp/microbenchmarks/bm_chttp2_hpack.cc | 136 +-- .../microbenchmarks/bm_chttp2_transport.cc | 270 ++-- test/cpp/microbenchmarks/bm_closure.cc | 196 ++- test/cpp/microbenchmarks/bm_cq.cc | 26 +- .../microbenchmarks/bm_cq_multiple_threads.cc | 22 +- test/cpp/microbenchmarks/bm_error.cc | 24 +- .../microbenchmarks/bm_fullstack_trickle.cc | 8 +- test/cpp/microbenchmarks/bm_metadata.cc | 115 +- test/cpp/microbenchmarks/bm_pollset.cc | 53 +- test/cpp/microbenchmarks/fullstack_fixtures.h | 27 +- test/cpp/naming/resolver_component_test.cc | 50 +- test/cpp/performance/writes_per_rpc_test.cc | 24 +- test/cpp/server/server_builder_test.cc | 7 +- test/cpp/util/byte_buffer_test.cc | 6 +- test/cpp/util/slice_test.cc | 6 +- tools/codegen/core/gen_static_metadata.py | 2 +- tools/codegen/core/gen_stats_data.py | 24 +- 444 files changed, 10022 insertions(+), 12454 deletions(-) diff --git a/include/grpc++/support/channel_arguments.h b/include/grpc++/support/channel_arguments.h index 9dc505f0082..c9879d8a28d 100644 --- a/include/grpc++/support/channel_arguments.h +++ b/include/grpc++/support/channel_arguments.h @@ -122,7 +122,7 @@ class ChannelArguments { /// Default pointer argument operations. struct PointerVtableMembers { static void* Copy(void* in) { return in; } - static void Destroy(grpc_exec_ctx* exec_ctx, void* in) {} + static void Destroy(void* in) {} static int Compare(void* a, void* b) { if (a < b) return -1; if (a > b) return 1; diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h index 77844aa2afe..fcbc8ac5a1e 100644 --- a/include/grpc/impl/codegen/grpc_types.h +++ b/include/grpc/impl/codegen/grpc_types.h @@ -85,7 +85,7 @@ typedef enum { typedef struct grpc_arg_pointer_vtable { void* (*copy)(void* p); - void (*destroy)(grpc_exec_ctx* exec_ctx, void* p); + void (*destroy)(void* p); int (*cmp)(void* p, void* q); } grpc_arg_pointer_vtable; diff --git a/include/grpc/impl/codegen/slice.h b/include/grpc/impl/codegen/slice.h index 11997fcb563..ad026b685ed 100644 --- a/include/grpc/impl/codegen/slice.h +++ b/include/grpc/impl/codegen/slice.h @@ -43,7 +43,7 @@ typedef struct grpc_slice grpc_slice; typedef struct grpc_slice_refcount_vtable { void (*ref)(void*); - void (*unref)(grpc_exec_ctx* exec_ctx, void*); + void (*unref)(void*); int (*eq)(grpc_slice a, grpc_slice b); uint32_t (*hash)(grpc_slice slice); } grpc_slice_refcount_vtable; diff --git a/include/grpc/slice_buffer.h b/include/grpc/slice_buffer.h index 6510c151b3c..30833d02dbf 100644 --- a/include/grpc/slice_buffer.h +++ b/include/grpc/slice_buffer.h @@ -67,8 +67,7 @@ GPRAPI void grpc_slice_buffer_move_first_no_ref(grpc_slice_buffer* src, size_t n, grpc_slice_buffer* dst); /** move the first n bytes of src into dst (copying them) */ -GPRAPI void grpc_slice_buffer_move_first_into_buffer(grpc_exec_ctx* exec_ctx, - grpc_slice_buffer* src, +GPRAPI void grpc_slice_buffer_move_first_into_buffer(grpc_slice_buffer* src, size_t n, void* dst); /** take the first slice in the slice buffer */ GPRAPI grpc_slice grpc_slice_buffer_take_first(grpc_slice_buffer* src); diff --git a/include/grpc/support/tls.h b/include/grpc/support/tls.h index 8519a8350bc..4c9e79b6cff 100644 --- a/include/grpc/support/tls.h +++ b/include/grpc/support/tls.h @@ -32,6 +32,12 @@ GPR_TLS_DECL(foo); Thread locals always have static scope. + Declaring a thread local class variable 'foo': + GPR_TLS_CLASS_DECL(foo); + + Defining the thread local class variable: + GPR_TLS_CLASS_DEF(foo); + Initializing a thread local (must be done at library initialization time): gpr_tls_init(&foo); diff --git a/include/grpc/support/tls_gcc.h b/include/grpc/support/tls_gcc.h index 1b91d22be12..b44f0f1c8c2 100644 --- a/include/grpc/support/tls_gcc.h +++ b/include/grpc/support/tls_gcc.h @@ -33,6 +33,11 @@ struct gpr_gcc_thread_local { #define GPR_TLS_DECL(name) \ static __thread struct gpr_gcc_thread_local name = {0} +#define GPR_TLS_CLASS_DECL(name) \ + static __thread struct gpr_gcc_thread_local name + +#define GPR_TLS_CLASS_DEF(name) __thread struct gpr_gcc_thread_local name = {0} + #define gpr_tls_init(tls) \ do { \ } while (0) diff --git a/include/grpc/support/tls_msvc.h b/include/grpc/support/tls_msvc.h index e5f2205fc15..68a411f5d46 100644 --- a/include/grpc/support/tls_msvc.h +++ b/include/grpc/support/tls_msvc.h @@ -26,9 +26,18 @@ struct gpr_msvc_thread_local { intptr_t value; }; +/** Use GPR_TLS_DECL to declare tls static variables outside a class */ #define GPR_TLS_DECL(name) \ static __declspec(thread) struct gpr_msvc_thread_local name = {0} +/** Use GPR_TLS_CLASS_DECL to declare tls static variable members of a class. + * GPR_TLS_CLASS_DEF needs to be called to define this member. */ +#define GPR_TLS_CLASS_DECL(name) \ + static __declspec(thread) struct gpr_msvc_thread_local name + +#define GPR_TLS_CLASS_DEF(name) \ + __declspec(thread) struct gpr_msvc_thread_local name = {0} + #define gpr_tls_init(tls) \ do { \ } while (0) diff --git a/include/grpc/support/tls_pthread.h b/include/grpc/support/tls_pthread.h index fb0edd8e744..249c8b16f85 100644 --- a/include/grpc/support/tls_pthread.h +++ b/include/grpc/support/tls_pthread.h @@ -29,8 +29,17 @@ struct gpr_pthread_thread_local { pthread_key_t key; }; +/** Use GPR_TLS_DECL to declare tls static variables outside a class */ #define GPR_TLS_DECL(name) static struct gpr_pthread_thread_local name = {0} +/** Use GPR_TLS_CLASS_DECL to declare tls static variable members of a class. + * GPR_TLS_CLASS_DEF needs to be called to define this member. */ +#define GPR_TLS_CLASS_DECL(name) static struct gpr_pthread_thread_local name + +/** Use GPR_TLS_CLASS_DEF to declare tls static variable members of a class. + * GPR_TLS_CLASS_DEF needs to be called to define this member. */ +#define GPR_TLS_CLASS_DEF(name) struct gpr_pthread_thread_local name = {0} + #define gpr_tls_init(tls) GPR_ASSERT(0 == pthread_key_create(&(tls)->key, NULL)) #define gpr_tls_destroy(tls) pthread_key_delete((tls)->key) #define gpr_tls_get(tls) ((intptr_t)pthread_getspecific((tls)->key)) diff --git a/src/core/ext/filters/client_channel/backup_poller.cc b/src/core/ext/filters/client_channel/backup_poller.cc index ed437d255c9..339a79b0fb9 100644 --- a/src/core/ext/filters/client_channel/backup_poller.cc +++ b/src/core/ext/filters/client_channel/backup_poller.cc @@ -69,20 +69,19 @@ static void init_globals() { gpr_free(env); } -static void backup_poller_shutdown_unref(grpc_exec_ctx* exec_ctx, - backup_poller* p) { +static void backup_poller_shutdown_unref(backup_poller* p) { if (gpr_unref(&p->shutdown_refs)) { - grpc_pollset_destroy(exec_ctx, p->pollset); + grpc_pollset_destroy(p->pollset); gpr_free(p->pollset); gpr_free(p); } } -static void done_poller(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { - backup_poller_shutdown_unref(exec_ctx, (backup_poller*)arg); +static void done_poller(void* arg, grpc_error* error) { + backup_poller_shutdown_unref((backup_poller*)arg); } -static void g_poller_unref(grpc_exec_ctx* exec_ctx) { +static void g_poller_unref() { if (gpr_unref(&g_poller->refs)) { gpr_mu_lock(&g_poller_mu); backup_poller* p = g_poller; @@ -90,40 +89,40 @@ static void g_poller_unref(grpc_exec_ctx* exec_ctx) { gpr_mu_unlock(&g_poller_mu); gpr_mu_lock(p->pollset_mu); p->shutting_down = true; - grpc_pollset_shutdown(exec_ctx, p->pollset, - GRPC_CLOSURE_INIT(&p->shutdown_closure, done_poller, - p, grpc_schedule_on_exec_ctx)); + grpc_pollset_shutdown( + p->pollset, GRPC_CLOSURE_INIT(&p->shutdown_closure, done_poller, p, + grpc_schedule_on_exec_ctx)); gpr_mu_unlock(p->pollset_mu); - grpc_timer_cancel(exec_ctx, &p->polling_timer); + grpc_timer_cancel(&p->polling_timer); } } -static void run_poller(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void run_poller(void* arg, grpc_error* error) { backup_poller* p = (backup_poller*)arg; if (error != GRPC_ERROR_NONE) { if (error != GRPC_ERROR_CANCELLED) { GRPC_LOG_IF_ERROR("run_poller", GRPC_ERROR_REF(error)); } - backup_poller_shutdown_unref(exec_ctx, p); + backup_poller_shutdown_unref(p); return; } gpr_mu_lock(p->pollset_mu); if (p->shutting_down) { gpr_mu_unlock(p->pollset_mu); - backup_poller_shutdown_unref(exec_ctx, p); + backup_poller_shutdown_unref(p); return; } - grpc_error* err = grpc_pollset_work(exec_ctx, p->pollset, nullptr, - grpc_exec_ctx_now(exec_ctx)); + grpc_error* err = + grpc_pollset_work(p->pollset, nullptr, grpc_core::ExecCtx::Get()->Now()); gpr_mu_unlock(p->pollset_mu); GRPC_LOG_IF_ERROR("Run client channel backup poller", err); - grpc_timer_init(exec_ctx, &p->polling_timer, - grpc_exec_ctx_now(exec_ctx) + g_poll_interval_ms, + grpc_timer_init(&p->polling_timer, + grpc_core::ExecCtx::Get()->Now() + g_poll_interval_ms, &p->run_poller_closure); } void grpc_client_channel_start_backup_polling( - grpc_exec_ctx* exec_ctx, grpc_pollset_set* interested_parties) { + grpc_pollset_set* interested_parties) { gpr_once_init(&g_once, init_globals); if (g_poll_interval_ms == 0) { return; @@ -139,8 +138,8 @@ void grpc_client_channel_start_backup_polling( gpr_ref_init(&g_poller->shutdown_refs, 2); GRPC_CLOSURE_INIT(&g_poller->run_poller_closure, run_poller, g_poller, grpc_schedule_on_exec_ctx); - grpc_timer_init(exec_ctx, &g_poller->polling_timer, - grpc_exec_ctx_now(exec_ctx) + g_poll_interval_ms, + grpc_timer_init(&g_poller->polling_timer, + grpc_core::ExecCtx::Get()->Now() + g_poll_interval_ms, &g_poller->run_poller_closure); } @@ -152,14 +151,14 @@ void grpc_client_channel_start_backup_polling( grpc_pollset* pollset = g_poller->pollset; gpr_mu_unlock(&g_poller_mu); - grpc_pollset_set_add_pollset(exec_ctx, interested_parties, pollset); + grpc_pollset_set_add_pollset(interested_parties, pollset); } void grpc_client_channel_stop_backup_polling( - grpc_exec_ctx* exec_ctx, grpc_pollset_set* interested_parties) { + grpc_pollset_set* interested_parties) { if (g_poll_interval_ms == 0) { return; } - grpc_pollset_set_del_pollset(exec_ctx, interested_parties, g_poller->pollset); - g_poller_unref(exec_ctx); + grpc_pollset_set_del_pollset(interested_parties, g_poller->pollset); + g_poller_unref(); } diff --git a/src/core/ext/filters/client_channel/backup_poller.h b/src/core/ext/filters/client_channel/backup_poller.h index e993d506392..551e0331dcf 100644 --- a/src/core/ext/filters/client_channel/backup_poller.h +++ b/src/core/ext/filters/client_channel/backup_poller.h @@ -25,10 +25,10 @@ /* Start polling \a interested_parties periodically in the timer thread */ void grpc_client_channel_start_backup_polling( - grpc_exec_ctx* exec_ctx, grpc_pollset_set* interested_parties); + grpc_pollset_set* interested_parties); /* Stop polling \a interested_parties */ void grpc_client_channel_stop_backup_polling( - grpc_exec_ctx* exec_ctx, grpc_pollset_set* interested_parties); + grpc_pollset_set* interested_parties); #endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_BACKUP_POLLER_H */ diff --git a/src/core/ext/filters/client_channel/channel_connectivity.cc b/src/core/ext/filters/client_channel/channel_connectivity.cc index 7eaf5d98cd8..20693ba4190 100644 --- a/src/core/ext/filters/client_channel/channel_connectivity.cc +++ b/src/core/ext/filters/client_channel/channel_connectivity.cc @@ -33,22 +33,22 @@ grpc_connectivity_state grpc_channel_check_connectivity_state( /* forward through to the underlying client channel */ grpc_channel_element* client_channel_elem = grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_connectivity_state state; GRPC_API_TRACE( "grpc_channel_check_connectivity_state(channel=%p, try_to_connect=%d)", 2, (channel, try_to_connect)); if (client_channel_elem->filter == &grpc_client_channel_filter) { - state = grpc_client_channel_check_connectivity_state( - &exec_ctx, client_channel_elem, try_to_connect); - grpc_exec_ctx_finish(&exec_ctx); + state = grpc_client_channel_check_connectivity_state(client_channel_elem, + try_to_connect); + return state; } gpr_log(GPR_ERROR, "grpc_channel_check_connectivity_state called on something that is " "not a client channel, but '%s'", client_channel_elem->filter->name); - grpc_exec_ctx_finish(&exec_ctx); + return GRPC_CHANNEL_SHUTDOWN; } @@ -73,12 +73,11 @@ typedef struct { void* tag; } state_watcher; -static void delete_state_watcher(grpc_exec_ctx* exec_ctx, state_watcher* w) { +static void delete_state_watcher(state_watcher* w) { grpc_channel_element* client_channel_elem = grpc_channel_stack_last_element( grpc_channel_get_channel_stack(w->channel)); if (client_channel_elem->filter == &grpc_client_channel_filter) { - GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, w->channel, - "watch_channel_connectivity"); + GRPC_CHANNEL_INTERNAL_UNREF(w->channel, "watch_channel_connectivity"); } else { abort(); } @@ -86,8 +85,7 @@ static void delete_state_watcher(grpc_exec_ctx* exec_ctx, state_watcher* w) { gpr_free(w); } -static void finished_completion(grpc_exec_ctx* exec_ctx, void* pw, - grpc_cq_completion* ignored) { +static void finished_completion(void* pw, grpc_cq_completion* ignored) { bool should_delete = false; state_watcher* w = (state_watcher*)pw; gpr_mu_lock(&w->mu); @@ -102,19 +100,19 @@ static void finished_completion(grpc_exec_ctx* exec_ctx, void* pw, gpr_mu_unlock(&w->mu); if (should_delete) { - delete_state_watcher(exec_ctx, w); + delete_state_watcher(w); } } -static void partly_done(grpc_exec_ctx* exec_ctx, state_watcher* w, - bool due_to_completion, grpc_error* error) { +static void partly_done(state_watcher* w, bool due_to_completion, + grpc_error* error) { if (due_to_completion) { - grpc_timer_cancel(exec_ctx, &w->alarm); + grpc_timer_cancel(&w->alarm); } else { grpc_channel_element* client_channel_elem = grpc_channel_stack_last_element( grpc_channel_get_channel_stack(w->channel)); grpc_client_channel_watch_connectivity_state( - exec_ctx, client_channel_elem, + client_channel_elem, grpc_polling_entity_create_from_pollset(grpc_cq_pollset(w->cq)), nullptr, &w->on_complete, nullptr); } @@ -149,7 +147,7 @@ static void partly_done(grpc_exec_ctx* exec_ctx, state_watcher* w, w->error = error; } w->phase = CALLING_BACK_AND_FINISHED; - grpc_cq_end_op(exec_ctx, w->cq, w->tag, w->error, finished_completion, w, + grpc_cq_end_op(w->cq, w->tag, w->error, finished_completion, w, &w->completion_storage); break; case CALLING_BACK_AND_FINISHED: @@ -161,14 +159,12 @@ static void partly_done(grpc_exec_ctx* exec_ctx, state_watcher* w, GRPC_ERROR_UNREF(error); } -static void watch_complete(grpc_exec_ctx* exec_ctx, void* pw, - grpc_error* error) { - partly_done(exec_ctx, (state_watcher*)pw, true, GRPC_ERROR_REF(error)); +static void watch_complete(void* pw, grpc_error* error) { + partly_done((state_watcher*)pw, true, GRPC_ERROR_REF(error)); } -static void timeout_complete(grpc_exec_ctx* exec_ctx, void* pw, - grpc_error* error) { - partly_done(exec_ctx, (state_watcher*)pw, false, GRPC_ERROR_REF(error)); +static void timeout_complete(void* pw, grpc_error* error) { + partly_done((state_watcher*)pw, false, GRPC_ERROR_REF(error)); } int grpc_channel_num_external_connectivity_watchers(grpc_channel* channel) { @@ -183,12 +179,10 @@ typedef struct watcher_timer_init_arg { gpr_timespec deadline; } watcher_timer_init_arg; -static void watcher_timer_init(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error_ignored) { +static void watcher_timer_init(void* arg, grpc_error* error_ignored) { watcher_timer_init_arg* wa = (watcher_timer_init_arg*)arg; - grpc_timer_init(exec_ctx, &wa->w->alarm, - grpc_timespec_to_millis_round_up(wa->deadline), + grpc_timer_init(&wa->w->alarm, grpc_timespec_to_millis_round_up(wa->deadline), &wa->w->on_timeout); gpr_free(wa); } @@ -204,7 +198,7 @@ void grpc_channel_watch_connectivity_state( gpr_timespec deadline, grpc_completion_queue* cq, void* tag) { grpc_channel_element* client_channel_elem = grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; state_watcher* w = (state_watcher*)gpr_malloc(sizeof(*w)); GRPC_API_TRACE( @@ -241,12 +235,10 @@ void grpc_channel_watch_connectivity_state( if (client_channel_elem->filter == &grpc_client_channel_filter) { GRPC_CHANNEL_INTERNAL_REF(channel, "watch_channel_connectivity"); grpc_client_channel_watch_connectivity_state( - &exec_ctx, client_channel_elem, + client_channel_elem, grpc_polling_entity_create_from_pollset(grpc_cq_pollset(cq)), &w->state, &w->on_complete, &w->watcher_timer_init); } else { abort(); } - - grpc_exec_ctx_finish(&exec_ctx); } diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index aced9adf9f1..ba82c88eb72 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.cc @@ -91,8 +91,7 @@ static void method_parameters_unref(method_parameters* method_params) { static void* method_parameters_ref_wrapper(void* value) { return method_parameters_ref((method_parameters*)value); } -static void method_parameters_unref_wrapper(grpc_exec_ctx* exec_ctx, - void* value) { +static void method_parameters_unref_wrapper(void* value) { method_parameters_unref((method_parameters*)value); } @@ -228,12 +227,11 @@ typedef struct { grpc_lb_policy* lb_policy; } lb_policy_connectivity_watcher; -static void watch_lb_policy_locked(grpc_exec_ctx* exec_ctx, channel_data* chand, +static void watch_lb_policy_locked(channel_data* chand, grpc_lb_policy* lb_policy, grpc_connectivity_state current_state); -static void set_channel_connectivity_state_locked(grpc_exec_ctx* exec_ctx, - channel_data* chand, +static void set_channel_connectivity_state_locked(channel_data* chand, grpc_connectivity_state state, grpc_error* error, const char* reason) { @@ -245,12 +243,12 @@ static void set_channel_connectivity_state_locked(grpc_exec_ctx* exec_ctx, if (state == GRPC_CHANNEL_TRANSIENT_FAILURE) { /* cancel picks with wait_for_ready=false */ grpc_lb_policy_cancel_picks_locked( - exec_ctx, chand->lb_policy, + chand->lb_policy, /* mask= */ GRPC_INITIAL_METADATA_WAIT_FOR_READY, /* check= */ 0, GRPC_ERROR_REF(error)); } else if (state == GRPC_CHANNEL_SHUTDOWN) { /* cancel all picks */ - grpc_lb_policy_cancel_picks_locked(exec_ctx, chand->lb_policy, + grpc_lb_policy_cancel_picks_locked(chand->lb_policy, /* mask= */ 0, /* check= */ 0, GRPC_ERROR_REF(error)); } @@ -259,12 +257,10 @@ static void set_channel_connectivity_state_locked(grpc_exec_ctx* exec_ctx, gpr_log(GPR_DEBUG, "chand=%p: setting connectivity state to %s", chand, grpc_connectivity_state_name(state)); } - grpc_connectivity_state_set(exec_ctx, &chand->state_tracker, state, error, - reason); + grpc_connectivity_state_set(&chand->state_tracker, state, error, reason); } -static void on_lb_policy_state_changed_locked(grpc_exec_ctx* exec_ctx, - void* arg, grpc_error* error) { +static void on_lb_policy_state_changed_locked(void* arg, grpc_error* error) { lb_policy_connectivity_watcher* w = (lb_policy_connectivity_watcher*)arg; /* check if the notification is for the latest policy */ if (w->lb_policy == w->chand->lb_policy) { @@ -272,17 +268,17 @@ static void on_lb_policy_state_changed_locked(grpc_exec_ctx* exec_ctx, gpr_log(GPR_DEBUG, "chand=%p: lb_policy=%p state changed to %s", w->chand, w->lb_policy, grpc_connectivity_state_name(w->state)); } - set_channel_connectivity_state_locked(exec_ctx, w->chand, w->state, + set_channel_connectivity_state_locked(w->chand, w->state, GRPC_ERROR_REF(error), "lb_changed"); if (w->state != GRPC_CHANNEL_SHUTDOWN) { - watch_lb_policy_locked(exec_ctx, w->chand, w->lb_policy, w->state); + watch_lb_policy_locked(w->chand, w->lb_policy, w->state); } } - GRPC_CHANNEL_STACK_UNREF(exec_ctx, w->chand->owning_stack, "watch_lb_policy"); + GRPC_CHANNEL_STACK_UNREF(w->chand->owning_stack, "watch_lb_policy"); gpr_free(w); } -static void watch_lb_policy_locked(grpc_exec_ctx* exec_ctx, channel_data* chand, +static void watch_lb_policy_locked(channel_data* chand, grpc_lb_policy* lb_policy, grpc_connectivity_state current_state) { lb_policy_connectivity_watcher* w = @@ -293,19 +289,18 @@ static void watch_lb_policy_locked(grpc_exec_ctx* exec_ctx, channel_data* chand, grpc_combiner_scheduler(chand->combiner)); w->state = current_state; w->lb_policy = lb_policy; - grpc_lb_policy_notify_on_state_change_locked(exec_ctx, lb_policy, &w->state, + grpc_lb_policy_notify_on_state_change_locked(lb_policy, &w->state, &w->on_changed); } -static void start_resolving_locked(grpc_exec_ctx* exec_ctx, - channel_data* chand) { +static void start_resolving_locked(channel_data* chand) { if (grpc_client_channel_trace.enabled()) { gpr_log(GPR_DEBUG, "chand=%p: starting name resolution", chand); } GPR_ASSERT(!chand->started_resolving); chand->started_resolving = true; GRPC_CHANNEL_STACK_REF(chand->owning_stack, "resolver"); - grpc_resolver_next_locked(exec_ctx, chand->resolver, &chand->resolver_result, + grpc_resolver_next_locked(chand->resolver, &chand->resolver_result, &chand->on_resolver_result_changed); } @@ -369,29 +364,26 @@ static void parse_retry_throttle_params(const grpc_json* field, void* arg) { } } -static void request_reresolution_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void request_reresolution_locked(void* arg, grpc_error* error) { reresolution_request_args* args = (reresolution_request_args*)arg; channel_data* chand = args->chand; // If this invocation is for a stale LB policy, treat it as an LB shutdown // signal. if (args->lb_policy != chand->lb_policy || error != GRPC_ERROR_NONE || chand->resolver == nullptr) { - GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->owning_stack, "re-resolution"); + GRPC_CHANNEL_STACK_UNREF(chand->owning_stack, "re-resolution"); gpr_free(args); return; } if (grpc_client_channel_trace.enabled()) { gpr_log(GPR_DEBUG, "chand=%p: started name re-resolving", chand); } - grpc_resolver_channel_saw_error_locked(exec_ctx, chand->resolver); + grpc_resolver_channel_saw_error_locked(chand->resolver); // Give back the closure to the LB policy. - grpc_lb_policy_set_reresolve_closure_locked(exec_ctx, chand->lb_policy, - &args->closure); + grpc_lb_policy_set_reresolve_closure_locked(chand->lb_policy, &args->closure); } -static void on_resolver_result_changed_locked(grpc_exec_ctx* exec_ctx, - void* arg, grpc_error* error) { +static void on_resolver_result_changed_locked(void* arg, grpc_error* error) { channel_data* chand = (channel_data*)arg; if (grpc_client_channel_trace.enabled()) { gpr_log(GPR_DEBUG, "chand=%p: got resolver result: error=%s", chand, @@ -458,12 +450,10 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx* exec_ctx, if (chand->lb_policy != nullptr && !lb_policy_name_changed) { // Continue using the same LB policy. Update with new addresses. lb_policy_updated = true; - grpc_lb_policy_update_locked(exec_ctx, chand->lb_policy, - &lb_policy_args); + grpc_lb_policy_update_locked(chand->lb_policy, &lb_policy_args); } else { // Instantiate new LB policy. - new_lb_policy = - grpc_lb_policy_create(exec_ctx, lb_policy_name, &lb_policy_args); + new_lb_policy = grpc_lb_policy_create(lb_policy_name, &lb_policy_args); if (new_lb_policy == nullptr) { gpr_log(GPR_ERROR, "could not create LB policy \"%s\"", lb_policy_name); @@ -475,7 +465,7 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx* exec_ctx, GRPC_CLOSURE_INIT(&args->closure, request_reresolution_locked, args, grpc_combiner_scheduler(chand->combiner)); GRPC_CHANNEL_STACK_REF(chand->owning_stack, "re-resolution"); - grpc_lb_policy_set_reresolve_closure_locked(exec_ctx, new_lb_policy, + grpc_lb_policy_set_reresolve_closure_locked(new_lb_policy, &args->closure); } } @@ -492,8 +482,7 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx* exec_ctx, GRPC_ARG_SERVER_URI); GPR_ASSERT(channel_arg != nullptr); GPR_ASSERT(channel_arg->type == GRPC_ARG_STRING); - grpc_uri* uri = - grpc_uri_parse(exec_ctx, channel_arg->value.string, true); + grpc_uri* uri = grpc_uri_parse(channel_arg->value.string, true); GPR_ASSERT(uri->path[0] != '\0'); service_config_parsing_state parsing_state; memset(&parsing_state, 0, sizeof(parsing_state)); @@ -504,7 +493,7 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx* exec_ctx, grpc_uri_destroy(uri); retry_throttle_data = parsing_state.retry_throttle_data; method_params_table = grpc_service_config_create_method_config_table( - exec_ctx, service_config, method_parameters_create_from_json, + service_config, method_parameters_create_from_json, method_parameters_ref_wrapper, method_parameters_unref_wrapper); grpc_service_config_destroy(service_config); } @@ -514,7 +503,7 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx* exec_ctx, // The copy will be saved in chand->lb_policy_name below. lb_policy_name_dup = gpr_strdup(lb_policy_name); } - grpc_channel_args_destroy(exec_ctx, chand->resolver_result); + grpc_channel_args_destroy(chand->resolver_result); chand->resolver_result = nullptr; } if (grpc_client_channel_trace.enabled()) { @@ -546,7 +535,7 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx* exec_ctx, chand->retry_throttle_data = retry_throttle_data; // Swap out the method params table. if (chand->method_params_table != nullptr) { - grpc_slice_hash_table_unref(exec_ctx, chand->method_params_table); + grpc_slice_hash_table_unref(chand->method_params_table); } chand->method_params_table = method_params_table; // If we have a new LB policy or are shutting down (in which case @@ -562,10 +551,9 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx* exec_ctx, gpr_log(GPR_DEBUG, "chand=%p: unreffing lb_policy=%p", chand, chand->lb_policy); } - grpc_pollset_set_del_pollset_set(exec_ctx, - chand->lb_policy->interested_parties, + grpc_pollset_set_del_pollset_set(chand->lb_policy->interested_parties, chand->interested_parties); - GRPC_LB_POLICY_UNREF(exec_ctx, chand->lb_policy, "channel"); + GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel"); } chand->lb_policy = new_lb_policy; } @@ -579,21 +567,20 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx* exec_ctx, if (grpc_client_channel_trace.enabled()) { gpr_log(GPR_DEBUG, "chand=%p: shutting down resolver", chand); } - grpc_resolver_shutdown_locked(exec_ctx, chand->resolver); - GRPC_RESOLVER_UNREF(exec_ctx, chand->resolver, "channel"); + grpc_resolver_shutdown_locked(chand->resolver); + GRPC_RESOLVER_UNREF(chand->resolver, "channel"); chand->resolver = nullptr; } set_channel_connectivity_state_locked( - exec_ctx, chand, GRPC_CHANNEL_SHUTDOWN, + chand, GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Got resolver result after disconnection", &error, 1), "resolver_gone"); - GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->owning_stack, "resolver"); + GRPC_CHANNEL_STACK_UNREF(chand->owning_stack, "resolver"); grpc_closure_list_fail_all(&chand->waiting_for_resolver_result_closures, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Channel disconnected", &error, 1)); - GRPC_CLOSURE_LIST_SCHED(exec_ctx, - &chand->waiting_for_resolver_result_closures); + GRPC_CLOSURE_LIST_SCHED(&chand->waiting_for_resolver_result_closures); } else { // Not shutting down. grpc_connectivity_state state = GRPC_CHANNEL_TRANSIENT_FAILURE; grpc_error* state_error = @@ -603,33 +590,28 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx* exec_ctx, gpr_log(GPR_DEBUG, "chand=%p: initializing new LB policy", chand); } GRPC_ERROR_UNREF(state_error); - state = grpc_lb_policy_check_connectivity_locked(exec_ctx, new_lb_policy, - &state_error); - grpc_pollset_set_add_pollset_set(exec_ctx, - new_lb_policy->interested_parties, + state = + grpc_lb_policy_check_connectivity_locked(new_lb_policy, &state_error); + grpc_pollset_set_add_pollset_set(new_lb_policy->interested_parties, chand->interested_parties); - GRPC_CLOSURE_LIST_SCHED(exec_ctx, - &chand->waiting_for_resolver_result_closures); + GRPC_CLOSURE_LIST_SCHED(&chand->waiting_for_resolver_result_closures); if (chand->exit_idle_when_lb_policy_arrives) { - grpc_lb_policy_exit_idle_locked(exec_ctx, new_lb_policy); + grpc_lb_policy_exit_idle_locked(new_lb_policy); chand->exit_idle_when_lb_policy_arrives = false; } - watch_lb_policy_locked(exec_ctx, chand, new_lb_policy, state); + watch_lb_policy_locked(chand, new_lb_policy, state); } if (!lb_policy_updated) { - set_channel_connectivity_state_locked(exec_ctx, chand, state, - GRPC_ERROR_REF(state_error), - "new_lb+resolver"); + set_channel_connectivity_state_locked( + chand, state, GRPC_ERROR_REF(state_error), "new_lb+resolver"); } - grpc_resolver_next_locked(exec_ctx, chand->resolver, - &chand->resolver_result, + grpc_resolver_next_locked(chand->resolver, &chand->resolver_result, &chand->on_resolver_result_changed); GRPC_ERROR_UNREF(state_error); } } -static void start_transport_op_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error_ignored) { +static void start_transport_op_locked(void* arg, grpc_error* error_ignored) { grpc_transport_op* op = (grpc_transport_op*)arg; grpc_channel_element* elem = (grpc_channel_element*)op->handler_private.extra_arg; @@ -637,7 +619,7 @@ static void start_transport_op_locked(grpc_exec_ctx* exec_ctx, void* arg, if (op->on_connectivity_state_change != nullptr) { grpc_connectivity_state_notify_on_state_change( - exec_ctx, &chand->state_tracker, op->connectivity_state, + &chand->state_tracker, op->connectivity_state, op->on_connectivity_state_change); op->on_connectivity_state_change = nullptr; op->connectivity_state = nullptr; @@ -645,11 +627,10 @@ static void start_transport_op_locked(grpc_exec_ctx* exec_ctx, void* arg, if (op->send_ping != nullptr) { if (chand->lb_policy == nullptr) { - GRPC_CLOSURE_SCHED( - exec_ctx, op->send_ping, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Ping with no load balancing")); + GRPC_CLOSURE_SCHED(op->send_ping, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Ping with no load balancing")); } else { - grpc_lb_policy_ping_one_locked(exec_ctx, chand->lb_policy, op->send_ping); + grpc_lb_policy_ping_one_locked(chand->lb_policy, op->send_ping); op->bind_pollset = nullptr; } op->send_ping = nullptr; @@ -658,54 +639,48 @@ static void start_transport_op_locked(grpc_exec_ctx* exec_ctx, void* arg, if (op->disconnect_with_error != GRPC_ERROR_NONE) { if (chand->resolver != nullptr) { set_channel_connectivity_state_locked( - exec_ctx, chand, GRPC_CHANNEL_SHUTDOWN, + chand, GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_REF(op->disconnect_with_error), "disconnect"); - grpc_resolver_shutdown_locked(exec_ctx, chand->resolver); - GRPC_RESOLVER_UNREF(exec_ctx, chand->resolver, "channel"); + grpc_resolver_shutdown_locked(chand->resolver); + GRPC_RESOLVER_UNREF(chand->resolver, "channel"); chand->resolver = nullptr; if (!chand->started_resolving) { grpc_closure_list_fail_all(&chand->waiting_for_resolver_result_closures, GRPC_ERROR_REF(op->disconnect_with_error)); - GRPC_CLOSURE_LIST_SCHED(exec_ctx, - &chand->waiting_for_resolver_result_closures); + GRPC_CLOSURE_LIST_SCHED(&chand->waiting_for_resolver_result_closures); } if (chand->lb_policy != nullptr) { - grpc_pollset_set_del_pollset_set(exec_ctx, - chand->lb_policy->interested_parties, + grpc_pollset_set_del_pollset_set(chand->lb_policy->interested_parties, chand->interested_parties); - GRPC_LB_POLICY_UNREF(exec_ctx, chand->lb_policy, "channel"); + GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel"); chand->lb_policy = nullptr; } } GRPC_ERROR_UNREF(op->disconnect_with_error); } - GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->owning_stack, "start_transport_op"); + GRPC_CHANNEL_STACK_UNREF(chand->owning_stack, "start_transport_op"); - GRPC_CLOSURE_SCHED(exec_ctx, op->on_consumed, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(op->on_consumed, GRPC_ERROR_NONE); } -static void cc_start_transport_op(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static void cc_start_transport_op(grpc_channel_element* elem, grpc_transport_op* op) { channel_data* chand = (channel_data*)elem->channel_data; GPR_ASSERT(op->set_accept_stream == false); if (op->bind_pollset != nullptr) { - grpc_pollset_set_add_pollset(exec_ctx, chand->interested_parties, - op->bind_pollset); + grpc_pollset_set_add_pollset(chand->interested_parties, op->bind_pollset); } op->handler_private.extra_arg = elem; GRPC_CHANNEL_STACK_REF(chand->owning_stack, "start_transport_op"); GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_INIT(&op->handler_private.closure, start_transport_op_locked, op, grpc_combiner_scheduler(chand->combiner)), GRPC_ERROR_NONE); } -static void cc_get_channel_info(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static void cc_get_channel_info(grpc_channel_element* elem, const grpc_channel_info* info) { channel_data* chand = (channel_data*)elem->channel_data; gpr_mu_lock(&chand->info_mu); @@ -724,8 +699,7 @@ static void cc_get_channel_info(grpc_exec_ctx* exec_ctx, } /* Constructor for channel_data */ -static grpc_error* cc_init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* cc_init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { channel_data* chand = (channel_data*)elem->channel_data; GPR_ASSERT(args->is_last); @@ -746,7 +720,7 @@ static grpc_error* cc_init_channel_elem(grpc_exec_ctx* exec_ctx, chand->interested_parties = grpc_pollset_set_create(); grpc_connectivity_state_init(&chand->state_tracker, GRPC_CHANNEL_IDLE, "client_channel"); - grpc_client_channel_start_backup_polling(exec_ctx, chand->interested_parties); + grpc_client_channel_start_backup_polling(chand->interested_parties); // Record client channel factory. const grpc_arg* arg = grpc_channel_args_find(args->channel_args, GRPC_ARG_CLIENT_CHANNEL_FACTORY); @@ -774,15 +748,15 @@ static grpc_error* cc_init_channel_elem(grpc_exec_ctx* exec_ctx, } char* proxy_name = nullptr; grpc_channel_args* new_args = nullptr; - grpc_proxy_mappers_map_name(exec_ctx, arg->value.string, args->channel_args, + grpc_proxy_mappers_map_name(arg->value.string, args->channel_args, &proxy_name, &new_args); // Instantiate resolver. chand->resolver = grpc_resolver_create( - exec_ctx, proxy_name != nullptr ? proxy_name : arg->value.string, + proxy_name != nullptr ? proxy_name : arg->value.string, new_args != nullptr ? new_args : args->channel_args, chand->interested_parties, chand->combiner); if (proxy_name != nullptr) gpr_free(proxy_name); - if (new_args != nullptr) grpc_channel_args_destroy(exec_ctx, new_args); + if (new_args != nullptr) grpc_channel_args_destroy(new_args); if (chand->resolver == nullptr) { return GRPC_ERROR_CREATE_FROM_STATIC_STRING("resolver creation failed"); } @@ -791,32 +765,28 @@ static grpc_error* cc_init_channel_elem(grpc_exec_ctx* exec_ctx, return GRPC_ERROR_NONE; } -static void shutdown_resolver_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void shutdown_resolver_locked(void* arg, grpc_error* error) { grpc_resolver* resolver = (grpc_resolver*)arg; - grpc_resolver_shutdown_locked(exec_ctx, resolver); - GRPC_RESOLVER_UNREF(exec_ctx, resolver, "channel"); + grpc_resolver_shutdown_locked(resolver); + GRPC_RESOLVER_UNREF(resolver, "channel"); } /* Destructor for channel_data */ -static void cc_destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) { +static void cc_destroy_channel_elem(grpc_channel_element* elem) { channel_data* chand = (channel_data*)elem->channel_data; if (chand->resolver != nullptr) { GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_CREATE(shutdown_resolver_locked, chand->resolver, grpc_combiner_scheduler(chand->combiner)), GRPC_ERROR_NONE); } if (chand->client_channel_factory != nullptr) { - grpc_client_channel_factory_unref(exec_ctx, chand->client_channel_factory); + grpc_client_channel_factory_unref(chand->client_channel_factory); } if (chand->lb_policy != nullptr) { - grpc_pollset_set_del_pollset_set(exec_ctx, - chand->lb_policy->interested_parties, + grpc_pollset_set_del_pollset_set(chand->lb_policy->interested_parties, chand->interested_parties); - GRPC_LB_POLICY_UNREF(exec_ctx, chand->lb_policy, "channel"); + GRPC_LB_POLICY_UNREF(chand->lb_policy, "channel"); } gpr_free(chand->info_lb_policy_name); gpr_free(chand->info_service_config_json); @@ -824,12 +794,12 @@ static void cc_destroy_channel_elem(grpc_exec_ctx* exec_ctx, grpc_server_retry_throttle_data_unref(chand->retry_throttle_data); } if (chand->method_params_table != nullptr) { - grpc_slice_hash_table_unref(exec_ctx, chand->method_params_table); + grpc_slice_hash_table_unref(chand->method_params_table); } - grpc_client_channel_stop_backup_polling(exec_ctx, chand->interested_parties); - grpc_connectivity_state_destroy(exec_ctx, &chand->state_tracker); - grpc_pollset_set_destroy(exec_ctx, chand->interested_parties); - GRPC_COMBINER_UNREF(exec_ctx, chand->combiner, "client_channel"); + grpc_client_channel_stop_backup_polling(chand->interested_parties); + grpc_connectivity_state_destroy(&chand->state_tracker); + grpc_pollset_set_destroy(chand->interested_parties); + GRPC_COMBINER_UNREF(chand->combiner, "client_channel"); gpr_mu_destroy(&chand->info_mu); gpr_mu_destroy(&chand->external_connectivity_watcher_list_mu); } @@ -916,21 +886,18 @@ static void waiting_for_pick_batches_add( } // This is called via the call combiner, so access to calld is synchronized. -static void fail_pending_batch_in_call_combiner(grpc_exec_ctx* exec_ctx, - void* arg, grpc_error* error) { +static void fail_pending_batch_in_call_combiner(void* arg, grpc_error* error) { call_data* calld = (call_data*)arg; if (calld->waiting_for_pick_batches_count > 0) { --calld->waiting_for_pick_batches_count; grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, calld->waiting_for_pick_batches[calld->waiting_for_pick_batches_count], GRPC_ERROR_REF(error), calld->call_combiner); } } // This is called via the call combiner, so access to calld is synchronized. -static void waiting_for_pick_batches_fail(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static void waiting_for_pick_batches_fail(grpc_call_element* elem, grpc_error* error) { call_data* calld = (call_data*)elem->call_data; if (grpc_client_channel_trace.enabled()) { @@ -943,37 +910,34 @@ static void waiting_for_pick_batches_fail(grpc_exec_ctx* exec_ctx, GRPC_CLOSURE_INIT(&calld->handle_pending_batch_in_call_combiner[i], fail_pending_batch_in_call_combiner, calld, grpc_schedule_on_exec_ctx); - GRPC_CALL_COMBINER_START(exec_ctx, calld->call_combiner, - &calld->handle_pending_batch_in_call_combiner[i], - GRPC_ERROR_REF(error), - "waiting_for_pick_batches_fail"); + GRPC_CALL_COMBINER_START( + calld->call_combiner, &calld->handle_pending_batch_in_call_combiner[i], + GRPC_ERROR_REF(error), "waiting_for_pick_batches_fail"); } if (calld->initial_metadata_batch != nullptr) { grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, calld->initial_metadata_batch, GRPC_ERROR_REF(error), + calld->initial_metadata_batch, GRPC_ERROR_REF(error), calld->call_combiner); } else { - GRPC_CALL_COMBINER_STOP(exec_ctx, calld->call_combiner, + GRPC_CALL_COMBINER_STOP(calld->call_combiner, "waiting_for_pick_batches_fail"); } GRPC_ERROR_UNREF(error); } // This is called via the call combiner, so access to calld is synchronized. -static void run_pending_batch_in_call_combiner(grpc_exec_ctx* exec_ctx, - void* arg, grpc_error* ignored) { +static void run_pending_batch_in_call_combiner(void* arg, grpc_error* ignored) { call_data* calld = (call_data*)arg; if (calld->waiting_for_pick_batches_count > 0) { --calld->waiting_for_pick_batches_count; grpc_subchannel_call_process_op( - exec_ctx, calld->subchannel_call, + calld->subchannel_call, calld->waiting_for_pick_batches[calld->waiting_for_pick_batches_count]); } } // This is called via the call combiner, so access to calld is synchronized. -static void waiting_for_pick_batches_resume(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem) { +static void waiting_for_pick_batches_resume(grpc_call_element* elem) { channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; if (grpc_client_channel_trace.enabled()) { @@ -987,20 +951,18 @@ static void waiting_for_pick_batches_resume(grpc_exec_ctx* exec_ctx, GRPC_CLOSURE_INIT(&calld->handle_pending_batch_in_call_combiner[i], run_pending_batch_in_call_combiner, calld, grpc_schedule_on_exec_ctx); - GRPC_CALL_COMBINER_START(exec_ctx, calld->call_combiner, - &calld->handle_pending_batch_in_call_combiner[i], - GRPC_ERROR_NONE, - "waiting_for_pick_batches_resume"); + GRPC_CALL_COMBINER_START( + calld->call_combiner, &calld->handle_pending_batch_in_call_combiner[i], + GRPC_ERROR_NONE, "waiting_for_pick_batches_resume"); } GPR_ASSERT(calld->initial_metadata_batch != nullptr); - grpc_subchannel_call_process_op(exec_ctx, calld->subchannel_call, + grpc_subchannel_call_process_op(calld->subchannel_call, calld->initial_metadata_batch); } // Applies service config to the call. Must be invoked once we know // that the resolver has returned results to the channel. -static void apply_service_config_to_call_locked(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem) { +static void apply_service_config_to_call_locked(grpc_call_element* elem) { channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; if (grpc_client_channel_trace.enabled()) { @@ -1013,7 +975,7 @@ static void apply_service_config_to_call_locked(grpc_exec_ctx* exec_ctx, } if (chand->method_params_table != nullptr) { calld->method_params = (method_parameters*)grpc_method_config_table_get( - exec_ctx, chand->method_params_table, calld->path); + chand->method_params_table, calld->path); if (calld->method_params != nullptr) { method_parameters_ref(calld->method_params); // If the deadline from the service config is shorter than the one @@ -1025,15 +987,14 @@ static void apply_service_config_to_call_locked(grpc_exec_ctx* exec_ctx, calld->method_params->timeout; if (per_method_deadline < calld->deadline) { calld->deadline = per_method_deadline; - grpc_deadline_state_reset(exec_ctx, elem, calld->deadline); + grpc_deadline_state_reset(elem, calld->deadline); } } } } } -static void create_subchannel_call_locked(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static void create_subchannel_call_locked(grpc_call_element* elem, grpc_error* error) { channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; @@ -1047,24 +1008,22 @@ static void create_subchannel_call_locked(grpc_exec_ctx* exec_ctx, calld->call_combiner // call_combiner }; grpc_error* new_error = grpc_connected_subchannel_create_call( - exec_ctx, calld->connected_subchannel, &call_args, - &calld->subchannel_call); + calld->connected_subchannel, &call_args, &calld->subchannel_call); if (grpc_client_channel_trace.enabled()) { gpr_log(GPR_DEBUG, "chand=%p calld=%p: create subchannel_call=%p: error=%s", chand, calld, calld->subchannel_call, grpc_error_string(new_error)); } if (new_error != GRPC_ERROR_NONE) { new_error = grpc_error_add_child(new_error, error); - waiting_for_pick_batches_fail(exec_ctx, elem, new_error); + waiting_for_pick_batches_fail(elem, new_error); } else { - waiting_for_pick_batches_resume(exec_ctx, elem); + waiting_for_pick_batches_resume(elem); } GRPC_ERROR_UNREF(error); } // Invoked when a pick is completed, on both success or failure. -static void pick_done_locked(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_error* error) { +static void pick_done_locked(grpc_call_element* elem, grpc_error* error) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; if (calld->connected_subchannel == nullptr) { @@ -1080,10 +1039,10 @@ static void pick_done_locked(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, "chand=%p calld=%p: failed to create subchannel: error=%s", chand, calld, grpc_error_string(calld->error)); } - waiting_for_pick_batches_fail(exec_ctx, elem, GRPC_ERROR_REF(calld->error)); + waiting_for_pick_batches_fail(elem, GRPC_ERROR_REF(calld->error)); } else { /* Create call on subchannel. */ - create_subchannel_call_locked(exec_ctx, elem, GRPC_ERROR_REF(error)); + create_subchannel_call_locked(elem, GRPC_ERROR_REF(error)); } GRPC_ERROR_UNREF(error); } @@ -1092,19 +1051,17 @@ static void pick_done_locked(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, // either (a) the pick was deferred pending a resolver result or (b) the // pick was done asynchronously. Removes the call's polling entity from // chand->interested_parties before invoking pick_done_locked(). -static void async_pick_done_locked(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, grpc_error* error) { +static void async_pick_done_locked(grpc_call_element* elem, grpc_error* error) { channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; - grpc_polling_entity_del_from_pollset_set(exec_ctx, calld->pollent, + grpc_polling_entity_del_from_pollset_set(calld->pollent, chand->interested_parties); - pick_done_locked(exec_ctx, elem, error); + pick_done_locked(elem, error); } // Note: This runs under the client_channel combiner, but will NOT be // holding the call combiner. -static void pick_callback_cancel_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void pick_callback_cancel_locked(void* arg, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; @@ -1113,17 +1070,15 @@ static void pick_callback_cancel_locked(grpc_exec_ctx* exec_ctx, void* arg, gpr_log(GPR_DEBUG, "chand=%p calld=%p: cancelling pick from LB policy %p", chand, calld, calld->lb_policy); } - grpc_lb_policy_cancel_pick_locked(exec_ctx, calld->lb_policy, - &calld->connected_subchannel, - GRPC_ERROR_REF(error)); + grpc_lb_policy_cancel_pick_locked( + calld->lb_policy, &calld->connected_subchannel, GRPC_ERROR_REF(error)); } - GRPC_CALL_STACK_UNREF(exec_ctx, calld->owning_call, "pick_callback_cancel"); + GRPC_CALL_STACK_UNREF(calld->owning_call, "pick_callback_cancel"); } // Callback invoked by grpc_lb_policy_pick_locked() for async picks. // Unrefs the LB policy and invokes async_pick_done_locked(). -static void pick_callback_done_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void pick_callback_done_locked(void* arg, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; @@ -1132,23 +1087,22 @@ static void pick_callback_done_locked(grpc_exec_ctx* exec_ctx, void* arg, chand, calld); } GPR_ASSERT(calld->lb_policy != nullptr); - GRPC_LB_POLICY_UNREF(exec_ctx, calld->lb_policy, "pick_subchannel"); + GRPC_LB_POLICY_UNREF(calld->lb_policy, "pick_subchannel"); calld->lb_policy = nullptr; - async_pick_done_locked(exec_ctx, elem, GRPC_ERROR_REF(error)); + async_pick_done_locked(elem, GRPC_ERROR_REF(error)); } // Takes a ref to chand->lb_policy and calls grpc_lb_policy_pick_locked(). // If the pick was completed synchronously, unrefs the LB policy and // returns true. -static bool pick_callback_start_locked(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem) { +static bool pick_callback_start_locked(grpc_call_element* elem) { channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; if (grpc_client_channel_trace.enabled()) { gpr_log(GPR_DEBUG, "chand=%p calld=%p: starting pick on lb_policy=%p", chand, calld, chand->lb_policy); } - apply_service_config_to_call_locked(exec_ctx, elem); + apply_service_config_to_call_locked(elem); // If the application explicitly set wait_for_ready, use that. // Otherwise, if the service config specified a value for this // method, use that. @@ -1178,7 +1132,7 @@ static bool pick_callback_start_locked(grpc_exec_ctx* exec_ctx, GRPC_CLOSURE_INIT(&calld->lb_pick_closure, pick_callback_done_locked, elem, grpc_combiner_scheduler(chand->combiner)); const bool pick_done = grpc_lb_policy_pick_locked( - exec_ctx, chand->lb_policy, &inputs, &calld->connected_subchannel, + chand->lb_policy, &inputs, &calld->connected_subchannel, calld->subchannel_call_context, nullptr, &calld->lb_pick_closure); if (pick_done) { /* synchronous grpc_lb_policy_pick call. Unref the LB policy. */ @@ -1186,12 +1140,12 @@ static bool pick_callback_start_locked(grpc_exec_ctx* exec_ctx, gpr_log(GPR_DEBUG, "chand=%p calld=%p: pick completed synchronously", chand, calld); } - GRPC_LB_POLICY_UNREF(exec_ctx, calld->lb_policy, "pick_subchannel"); + GRPC_LB_POLICY_UNREF(calld->lb_policy, "pick_subchannel"); calld->lb_policy = nullptr; } else { GRPC_CALL_STACK_REF(calld->owning_call, "pick_callback_cancel"); grpc_call_combiner_set_notify_on_cancel( - exec_ctx, calld->call_combiner, + calld->call_combiner, GRPC_CLOSURE_INIT(&calld->lb_pick_cancel_closure, pick_callback_cancel_locked, elem, grpc_combiner_scheduler(chand->combiner))); @@ -1208,8 +1162,7 @@ typedef struct { // Note: This runs under the client_channel combiner, but will NOT be // holding the call combiner. -static void pick_after_resolver_result_cancel_locked(grpc_exec_ctx* exec_ctx, - void* arg, +static void pick_after_resolver_result_cancel_locked(void* arg, grpc_error* error) { pick_after_resolver_result_args* args = (pick_after_resolver_result_args*)arg; if (args->finished) { @@ -1237,16 +1190,13 @@ static void pick_after_resolver_result_cancel_locked(grpc_exec_ctx* exec_ctx, // it's safe to call async_pick_done_locked() here -- we are // essentially calling it here instead of calling it in // pick_after_resolver_result_done_locked(). - async_pick_done_locked(exec_ctx, elem, - GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Pick cancelled", &error, 1)); + async_pick_done_locked(elem, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Pick cancelled", &error, 1)); } -static void pick_after_resolver_result_start_locked(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem); +static void pick_after_resolver_result_start_locked(grpc_call_element* elem); -static void pick_after_resolver_result_done_locked(grpc_exec_ctx* exec_ctx, - void* arg, +static void pick_after_resolver_result_done_locked(void* arg, grpc_error* error) { pick_after_resolver_result_args* args = (pick_after_resolver_result_args*)arg; if (args->finished) { @@ -1266,19 +1216,19 @@ static void pick_after_resolver_result_done_locked(grpc_exec_ctx* exec_ctx, gpr_log(GPR_DEBUG, "chand=%p calld=%p: resolver failed to return data", chand, calld); } - async_pick_done_locked(exec_ctx, elem, GRPC_ERROR_REF(error)); + async_pick_done_locked(elem, GRPC_ERROR_REF(error)); } else if (chand->lb_policy != nullptr) { if (grpc_client_channel_trace.enabled()) { gpr_log(GPR_DEBUG, "chand=%p calld=%p: resolver returned, doing pick", chand, calld); } - if (pick_callback_start_locked(exec_ctx, elem)) { + if (pick_callback_start_locked(elem)) { // Even if the LB policy returns a result synchronously, we have // already added our polling entity to chand->interested_parties // in order to wait for the resolver result, so we need to // remove it here. Therefore, we call async_pick_done_locked() // instead of pick_done_locked(). - async_pick_done_locked(exec_ctx, elem, GRPC_ERROR_NONE); + async_pick_done_locked(elem, GRPC_ERROR_NONE); } } // TODO(roth): It should be impossible for chand->lb_policy to be NULL @@ -1296,19 +1246,18 @@ static void pick_after_resolver_result_done_locked(grpc_exec_ctx* exec_ctx, "trying again", chand, calld); } - pick_after_resolver_result_start_locked(exec_ctx, elem); + pick_after_resolver_result_start_locked(elem); } else { if (grpc_client_channel_trace.enabled()) { gpr_log(GPR_DEBUG, "chand=%p calld=%p: resolver disconnected", chand, calld); } async_pick_done_locked( - exec_ctx, elem, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Disconnected")); + elem, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Disconnected")); } } -static void pick_after_resolver_result_start_locked(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem) { +static void pick_after_resolver_result_start_locked(grpc_call_element* elem) { channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; if (grpc_client_channel_trace.enabled()) { @@ -1324,47 +1273,46 @@ static void pick_after_resolver_result_start_locked(grpc_exec_ctx* exec_ctx, grpc_closure_list_append(&chand->waiting_for_resolver_result_closures, &args->closure, GRPC_ERROR_NONE); grpc_call_combiner_set_notify_on_cancel( - exec_ctx, calld->call_combiner, + calld->call_combiner, GRPC_CLOSURE_INIT(&args->cancel_closure, pick_after_resolver_result_cancel_locked, args, grpc_combiner_scheduler(chand->combiner))); } -static void start_pick_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* ignored) { +static void start_pick_locked(void* arg, grpc_error* ignored) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; GPR_ASSERT(calld->connected_subchannel == nullptr); if (chand->lb_policy != nullptr) { // We already have an LB policy, so ask it for a pick. - if (pick_callback_start_locked(exec_ctx, elem)) { + if (pick_callback_start_locked(elem)) { // Pick completed synchronously. - pick_done_locked(exec_ctx, elem, GRPC_ERROR_NONE); + pick_done_locked(elem, GRPC_ERROR_NONE); return; } } else { // We do not yet have an LB policy, so wait for a resolver result. if (chand->resolver == nullptr) { - pick_done_locked(exec_ctx, elem, + pick_done_locked(elem, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Disconnected")); return; } if (!chand->started_resolving) { - start_resolving_locked(exec_ctx, chand); + start_resolving_locked(chand); } - pick_after_resolver_result_start_locked(exec_ctx, elem); + pick_after_resolver_result_start_locked(elem); } // We need to wait for either a resolver result or for an async result // from the LB policy. Add the polling entity from call_data to the // channel_data's interested_parties, so that the I/O of the LB policy // and resolver can be done under it. The polling entity will be // removed in async_pick_done_locked(). - grpc_polling_entity_add_to_pollset_set(exec_ctx, calld->pollent, + grpc_polling_entity_add_to_pollset_set(calld->pollent, chand->interested_parties); } -static void on_complete(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void on_complete(void* arg, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; if (calld->retry_throttle_data != nullptr) { @@ -1380,18 +1328,15 @@ static void on_complete(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { calld->retry_throttle_data); } } - GRPC_CLOSURE_RUN(exec_ctx, calld->original_on_complete, - GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(calld->original_on_complete, GRPC_ERROR_REF(error)); } static void cc_start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* batch) { + grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; if (chand->deadline_checking_enabled) { - grpc_deadline_state_client_start_transport_stream_op_batch(exec_ctx, elem, - batch); + grpc_deadline_state_client_start_transport_stream_op_batch(elem, batch); } GPR_TIMER_BEGIN("cc_start_transport_stream_op_batch", 0); // If we've previously been cancelled, immediately fail any new batches. @@ -1401,7 +1346,7 @@ static void cc_start_transport_stream_op_batch( chand, calld, grpc_error_string(calld->error)); } grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, batch, GRPC_ERROR_REF(calld->error), calld->call_combiner); + batch, GRPC_ERROR_REF(calld->error), calld->call_combiner); goto done; } if (batch->cancel_stream) { @@ -1419,11 +1364,10 @@ static void cc_start_transport_stream_op_batch( // If we have a subchannel call, send the cancellation batch down. // Otherwise, fail all pending batches. if (calld->subchannel_call != nullptr) { - grpc_subchannel_call_process_op(exec_ctx, calld->subchannel_call, batch); + grpc_subchannel_call_process_op(calld->subchannel_call, batch); } else { waiting_for_pick_batches_add(calld, batch); - waiting_for_pick_batches_fail(exec_ctx, elem, - GRPC_ERROR_REF(calld->error)); + waiting_for_pick_batches_fail(elem, GRPC_ERROR_REF(calld->error)); } goto done; } @@ -1446,7 +1390,7 @@ static void cc_start_transport_stream_op_batch( "chand=%p calld=%p: sending batch to subchannel_call=%p", chand, calld, calld->subchannel_call); } - grpc_subchannel_call_process_op(exec_ctx, calld->subchannel_call, batch); + grpc_subchannel_call_process_op(calld->subchannel_call, batch); goto done; } // We do not yet have a subchannel call. @@ -1460,7 +1404,6 @@ static void cc_start_transport_stream_op_batch( chand, calld); } GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_INIT(&batch->handler_private.closure, start_pick_locked, elem, grpc_combiner_scheduler(chand->combiner)), GRPC_ERROR_NONE); @@ -1471,7 +1414,7 @@ static void cc_start_transport_stream_op_batch( "chand=%p calld=%p: saved batch, yeilding call combiner", chand, calld); } - GRPC_CALL_COMBINER_STOP(exec_ctx, calld->call_combiner, + GRPC_CALL_COMBINER_STOP(calld->call_combiner, "batch does not include send_initial_metadata"); } done: @@ -1479,8 +1422,7 @@ done: } /* Constructor for call_data */ -static grpc_error* cc_init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* cc_init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; @@ -1492,23 +1434,22 @@ static grpc_error* cc_init_call_elem(grpc_exec_ctx* exec_ctx, calld->owning_call = args->call_stack; calld->call_combiner = args->call_combiner; if (chand->deadline_checking_enabled) { - grpc_deadline_state_init(exec_ctx, elem, args->call_stack, - args->call_combiner, calld->deadline); + grpc_deadline_state_init(elem, args->call_stack, args->call_combiner, + calld->deadline); } return GRPC_ERROR_NONE; } /* Destructor for call_data */ -static void cc_destroy_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static void cc_destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_schedule_closure) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; if (chand->deadline_checking_enabled) { - grpc_deadline_state_destroy(exec_ctx, elem); + grpc_deadline_state_destroy(elem); } - grpc_slice_unref_internal(exec_ctx, calld->path); + grpc_slice_unref_internal(calld->path); if (calld->method_params != nullptr) { method_parameters_unref(calld->method_params); } @@ -1517,14 +1458,13 @@ static void cc_destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_subchannel_call_set_cleanup_closure(calld->subchannel_call, then_schedule_closure); then_schedule_closure = nullptr; - GRPC_SUBCHANNEL_CALL_UNREF(exec_ctx, calld->subchannel_call, + GRPC_SUBCHANNEL_CALL_UNREF(calld->subchannel_call, "client_channel_destroy_call"); } GPR_ASSERT(calld->lb_policy == nullptr); GPR_ASSERT(calld->waiting_for_pick_batches_count == 0); if (calld->connected_subchannel != nullptr) { - GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, calld->connected_subchannel, - "picked"); + GRPC_CONNECTED_SUBCHANNEL_UNREF(calld->connected_subchannel, "picked"); } for (size_t i = 0; i < GRPC_CONTEXT_COUNT; ++i) { if (calld->subchannel_call_context[i].value != nullptr) { @@ -1532,11 +1472,10 @@ static void cc_destroy_call_elem(grpc_exec_ctx* exec_ctx, calld->subchannel_call_context[i].value); } } - GRPC_CLOSURE_SCHED(exec_ctx, then_schedule_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(then_schedule_closure, GRPC_ERROR_NONE); } -static void cc_set_pollset_or_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static void cc_set_pollset_or_pollset_set(grpc_call_element* elem, grpc_polling_entity* pollent) { call_data* calld = (call_data*)elem->call_data; calld->pollent = pollent; @@ -1560,29 +1499,27 @@ const grpc_channel_filter grpc_client_channel_filter = { "client-channel", }; -static void try_to_connect_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error_ignored) { +static void try_to_connect_locked(void* arg, grpc_error* error_ignored) { channel_data* chand = (channel_data*)arg; if (chand->lb_policy != nullptr) { - grpc_lb_policy_exit_idle_locked(exec_ctx, chand->lb_policy); + grpc_lb_policy_exit_idle_locked(chand->lb_policy); } else { chand->exit_idle_when_lb_policy_arrives = true; if (!chand->started_resolving && chand->resolver != nullptr) { - start_resolving_locked(exec_ctx, chand); + start_resolving_locked(chand); } } - GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->owning_stack, "try_to_connect"); + GRPC_CHANNEL_STACK_UNREF(chand->owning_stack, "try_to_connect"); } grpc_connectivity_state grpc_client_channel_check_connectivity_state( - grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, int try_to_connect) { + grpc_channel_element* elem, int try_to_connect) { channel_data* chand = (channel_data*)elem->channel_data; grpc_connectivity_state out = grpc_connectivity_state_check(&chand->state_tracker); if (out == GRPC_CHANNEL_IDLE && try_to_connect) { GRPC_CHANNEL_STACK_REF(chand->owning_stack, "try_to_connect"); GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_CREATE(try_to_connect_locked, chand, grpc_combiner_scheduler(chand->combiner)), GRPC_ERROR_NONE); @@ -1663,50 +1600,49 @@ int grpc_client_channel_num_external_connectivity_watchers( return count; } -static void on_external_watch_complete_locked(grpc_exec_ctx* exec_ctx, - void* arg, grpc_error* error) { +static void on_external_watch_complete_locked(void* arg, grpc_error* error) { external_connectivity_watcher* w = (external_connectivity_watcher*)arg; grpc_closure* follow_up = w->on_complete; - grpc_polling_entity_del_from_pollset_set(exec_ctx, &w->pollent, + grpc_polling_entity_del_from_pollset_set(&w->pollent, w->chand->interested_parties); - GRPC_CHANNEL_STACK_UNREF(exec_ctx, w->chand->owning_stack, + GRPC_CHANNEL_STACK_UNREF(w->chand->owning_stack, "external_connectivity_watcher"); external_connectivity_watcher_list_remove(w->chand, w); gpr_free(w); - GRPC_CLOSURE_RUN(exec_ctx, follow_up, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(follow_up, GRPC_ERROR_REF(error)); } -static void watch_connectivity_state_locked(grpc_exec_ctx* exec_ctx, void* arg, +static void watch_connectivity_state_locked(void* arg, grpc_error* error_ignored) { external_connectivity_watcher* w = (external_connectivity_watcher*)arg; external_connectivity_watcher* found = nullptr; if (w->state != nullptr) { external_connectivity_watcher_list_append(w->chand, w); - GRPC_CLOSURE_RUN(exec_ctx, w->watcher_timer_init, GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN(w->watcher_timer_init, GRPC_ERROR_NONE); GRPC_CLOSURE_INIT(&w->my_closure, on_external_watch_complete_locked, w, grpc_combiner_scheduler(w->chand->combiner)); - grpc_connectivity_state_notify_on_state_change( - exec_ctx, &w->chand->state_tracker, w->state, &w->my_closure); + grpc_connectivity_state_notify_on_state_change(&w->chand->state_tracker, + w->state, &w->my_closure); } else { GPR_ASSERT(w->watcher_timer_init == nullptr); found = lookup_external_connectivity_watcher(w->chand, w->on_complete); if (found) { GPR_ASSERT(found->on_complete == w->on_complete); grpc_connectivity_state_notify_on_state_change( - exec_ctx, &found->chand->state_tracker, nullptr, &found->my_closure); + &found->chand->state_tracker, nullptr, &found->my_closure); } - grpc_polling_entity_del_from_pollset_set(exec_ctx, &w->pollent, + grpc_polling_entity_del_from_pollset_set(&w->pollent, w->chand->interested_parties); - GRPC_CHANNEL_STACK_UNREF(exec_ctx, w->chand->owning_stack, + GRPC_CHANNEL_STACK_UNREF(w->chand->owning_stack, "external_connectivity_watcher"); gpr_free(w); } } void grpc_client_channel_watch_connectivity_state( - grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, - grpc_polling_entity pollent, grpc_connectivity_state* state, - grpc_closure* closure, grpc_closure* watcher_timer_init) { + grpc_channel_element* elem, grpc_polling_entity pollent, + grpc_connectivity_state* state, grpc_closure* closure, + grpc_closure* watcher_timer_init) { channel_data* chand = (channel_data*)elem->channel_data; external_connectivity_watcher* w = (external_connectivity_watcher*)gpr_zalloc(sizeof(*w)); @@ -1715,12 +1651,11 @@ void grpc_client_channel_watch_connectivity_state( w->on_complete = closure; w->state = state; w->watcher_timer_init = watcher_timer_init; - grpc_polling_entity_add_to_pollset_set(exec_ctx, &w->pollent, + grpc_polling_entity_add_to_pollset_set(&w->pollent, chand->interested_parties); GRPC_CHANNEL_STACK_REF(w->chand->owning_stack, "external_connectivity_watcher"); GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_INIT(&w->my_closure, watch_connectivity_state_locked, w, grpc_combiner_scheduler(chand->combiner)), GRPC_ERROR_NONE); diff --git a/src/core/ext/filters/client_channel/client_channel.h b/src/core/ext/filters/client_channel/client_channel.h index 48e4637a82b..9670405cbe8 100644 --- a/src/core/ext/filters/client_channel/client_channel.h +++ b/src/core/ext/filters/client_channel/client_channel.h @@ -38,15 +38,15 @@ extern grpc_core::TraceFlag grpc_client_channel_trace; extern const grpc_channel_filter grpc_client_channel_filter; grpc_connectivity_state grpc_client_channel_check_connectivity_state( - grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, int try_to_connect); + grpc_channel_element* elem, int try_to_connect); int grpc_client_channel_num_external_connectivity_watchers( grpc_channel_element* elem); void grpc_client_channel_watch_connectivity_state( - grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, - grpc_polling_entity pollent, grpc_connectivity_state* state, - grpc_closure* on_complete, grpc_closure* watcher_timer_init); + grpc_channel_element* elem, grpc_polling_entity pollent, + grpc_connectivity_state* state, grpc_closure* on_complete, + grpc_closure* watcher_timer_init); /* Debug helper: pull the subchannel call from a call stack element */ grpc_subchannel_call* grpc_client_channel_get_subchannel_call( diff --git a/src/core/ext/filters/client_channel/client_channel_factory.cc b/src/core/ext/filters/client_channel/client_channel_factory.cc index 57eac8f8757..60c95d7dc90 100644 --- a/src/core/ext/filters/client_channel/client_channel_factory.cc +++ b/src/core/ext/filters/client_channel/client_channel_factory.cc @@ -23,23 +23,19 @@ void grpc_client_channel_factory_ref(grpc_client_channel_factory* factory) { factory->vtable->ref(factory); } -void grpc_client_channel_factory_unref(grpc_exec_ctx* exec_ctx, - grpc_client_channel_factory* factory) { - factory->vtable->unref(exec_ctx, factory); +void grpc_client_channel_factory_unref(grpc_client_channel_factory* factory) { + factory->vtable->unref(factory); } grpc_subchannel* grpc_client_channel_factory_create_subchannel( - grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* factory, - const grpc_subchannel_args* args) { - return factory->vtable->create_subchannel(exec_ctx, factory, args); + grpc_client_channel_factory* factory, const grpc_subchannel_args* args) { + return factory->vtable->create_subchannel(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, - const grpc_channel_args* args) { - return factory->vtable->create_client_channel(exec_ctx, factory, target, type, - args); + grpc_client_channel_factory* factory, const char* target, + grpc_client_channel_type type, const grpc_channel_args* args) { + return factory->vtable->create_client_channel(factory, target, type, args); } static void* factory_arg_copy(void* factory) { @@ -47,9 +43,8 @@ static void* factory_arg_copy(void* factory) { return factory; } -static void factory_arg_destroy(grpc_exec_ctx* exec_ctx, void* factory) { - grpc_client_channel_factory_unref(exec_ctx, - (grpc_client_channel_factory*)factory); +static void factory_arg_destroy(void* factory) { + grpc_client_channel_factory_unref((grpc_client_channel_factory*)factory); } static int factory_arg_cmp(void* factory1, void* factory2) { diff --git a/src/core/ext/filters/client_channel/client_channel_factory.h b/src/core/ext/filters/client_channel/client_channel_factory.h index db82b733cee..766ebb9389d 100644 --- a/src/core/ext/filters/client_channel/client_channel_factory.h +++ b/src/core/ext/filters/client_channel/client_channel_factory.h @@ -45,31 +45,26 @@ struct grpc_client_channel_factory { struct grpc_client_channel_factory_vtable { void (*ref)(grpc_client_channel_factory* factory); - 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, + void (*unref)(grpc_client_channel_factory* factory); + grpc_subchannel* (*create_subchannel)(grpc_client_channel_factory* factory, const grpc_subchannel_args* args); - grpc_channel* (*create_client_channel)(grpc_exec_ctx* exec_ctx, - grpc_client_channel_factory* factory, + grpc_channel* (*create_client_channel)(grpc_client_channel_factory* factory, const char* target, grpc_client_channel_type type, const grpc_channel_args* args); }; void grpc_client_channel_factory_ref(grpc_client_channel_factory* factory); -void grpc_client_channel_factory_unref(grpc_exec_ctx* exec_ctx, - grpc_client_channel_factory* factory); +void grpc_client_channel_factory_unref(grpc_client_channel_factory* factory); /** Create a new grpc_subchannel */ grpc_subchannel* grpc_client_channel_factory_create_subchannel( - grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* factory, - const grpc_subchannel_args* args); + grpc_client_channel_factory* factory, 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, - const grpc_channel_args* args); + grpc_client_channel_factory* factory, const char* target, + grpc_client_channel_type type, const grpc_channel_args* args); grpc_arg grpc_client_channel_factory_create_channel_arg( grpc_client_channel_factory* factory); diff --git a/src/core/ext/filters/client_channel/client_channel_plugin.cc b/src/core/ext/filters/client_channel/client_channel_plugin.cc index 7a5bb181578..ea630d29174 100644 --- a/src/core/ext/filters/client_channel/client_channel_plugin.cc +++ b/src/core/ext/filters/client_channel/client_channel_plugin.cc @@ -34,14 +34,12 @@ #include "src/core/ext/filters/client_channel/subchannel_index.h" #include "src/core/lib/surface/channel_init.h" -static bool append_filter(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, void* arg) { +static bool append_filter(grpc_channel_stack_builder* builder, void* arg) { return grpc_channel_stack_builder_append_filter( builder, (const grpc_channel_filter*)arg, nullptr, nullptr); } -static bool set_default_host_if_unset(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, +static bool set_default_host_if_unset(grpc_channel_stack_builder* builder, void* unused) { const grpc_channel_args* args = grpc_channel_stack_builder_get_channel_arguments(builder); @@ -52,15 +50,14 @@ static bool set_default_host_if_unset(grpc_exec_ctx* exec_ctx, } } char* default_authority = grpc_get_default_authority( - exec_ctx, grpc_channel_stack_builder_get_target(builder)); + grpc_channel_stack_builder_get_target(builder)); if (default_authority != nullptr) { grpc_arg arg = grpc_channel_arg_string_create( (char*)GRPC_ARG_DEFAULT_AUTHORITY, default_authority); grpc_channel_args* new_args = grpc_channel_args_copy_and_add(args, &arg, 1); - grpc_channel_stack_builder_set_channel_arguments(exec_ctx, builder, - new_args); + grpc_channel_stack_builder_set_channel_arguments(builder, new_args); gpr_free(default_authority); - grpc_channel_args_destroy(exec_ctx, new_args); + grpc_channel_args_destroy(new_args); } return true; } diff --git a/src/core/ext/filters/client_channel/connector.cc b/src/core/ext/filters/client_channel/connector.cc index c258468e589..c8bf2f3e1c0 100644 --- a/src/core/ext/filters/client_channel/connector.cc +++ b/src/core/ext/filters/client_channel/connector.cc @@ -23,18 +23,17 @@ grpc_connector* grpc_connector_ref(grpc_connector* connector) { return connector; } -void grpc_connector_unref(grpc_exec_ctx* exec_ctx, grpc_connector* connector) { - connector->vtable->unref(exec_ctx, connector); +void grpc_connector_unref(grpc_connector* connector) { + connector->vtable->unref(connector); } -void grpc_connector_connect(grpc_exec_ctx* exec_ctx, grpc_connector* connector, +void grpc_connector_connect(grpc_connector* connector, const grpc_connect_in_args* in_args, grpc_connect_out_args* out_args, grpc_closure* notify) { - connector->vtable->connect(exec_ctx, connector, in_args, out_args, notify); + connector->vtable->connect(connector, in_args, out_args, notify); } -void grpc_connector_shutdown(grpc_exec_ctx* exec_ctx, grpc_connector* connector, - grpc_error* why) { - connector->vtable->shutdown(exec_ctx, connector, why); +void grpc_connector_shutdown(grpc_connector* connector, grpc_error* why) { + connector->vtable->shutdown(connector, why); } diff --git a/src/core/ext/filters/client_channel/connector.h b/src/core/ext/filters/client_channel/connector.h index 239ed8a8bd1..d657658d671 100644 --- a/src/core/ext/filters/client_channel/connector.h +++ b/src/core/ext/filters/client_channel/connector.h @@ -49,25 +49,23 @@ typedef struct { struct grpc_connector_vtable { void (*ref)(grpc_connector* connector); - void (*unref)(grpc_exec_ctx* exec_ctx, grpc_connector* connector); + void (*unref)(grpc_connector* connector); /** Implementation of grpc_connector_shutdown */ - void (*shutdown)(grpc_exec_ctx* exec_ctx, grpc_connector* connector, - grpc_error* why); + void (*shutdown)(grpc_connector* connector, grpc_error* why); /** Implementation of grpc_connector_connect */ - void (*connect)(grpc_exec_ctx* exec_ctx, grpc_connector* connector, + void (*connect)(grpc_connector* connector, const grpc_connect_in_args* in_args, grpc_connect_out_args* out_args, grpc_closure* notify); }; grpc_connector* grpc_connector_ref(grpc_connector* connector); -void grpc_connector_unref(grpc_exec_ctx* exec_ctx, grpc_connector* connector); +void grpc_connector_unref(grpc_connector* connector); /** Connect using the connector: max one outstanding call at a time */ -void grpc_connector_connect(grpc_exec_ctx* exec_ctx, grpc_connector* connector, +void grpc_connector_connect(grpc_connector* connector, const grpc_connect_in_args* in_args, grpc_connect_out_args* out_args, grpc_closure* notify); /** Cancel any pending connection */ -void grpc_connector_shutdown(grpc_exec_ctx* exec_ctx, grpc_connector* connector, - grpc_error* why); +void grpc_connector_shutdown(grpc_connector* connector, grpc_error* why); #endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CONNECTOR_H */ diff --git a/src/core/ext/filters/client_channel/http_connect_handshaker.cc b/src/core/ext/filters/client_channel/http_connect_handshaker.cc index b7cb2e3eba7..556a3bc6a18 100644 --- a/src/core/ext/filters/client_channel/http_connect_handshaker.cc +++ b/src/core/ext/filters/client_channel/http_connect_handshaker.cc @@ -61,41 +61,38 @@ typedef struct http_connect_handshaker { } http_connect_handshaker; // Unref and clean up handshaker. -static void http_connect_handshaker_unref(grpc_exec_ctx* exec_ctx, - http_connect_handshaker* handshaker) { +static void http_connect_handshaker_unref(http_connect_handshaker* handshaker) { if (gpr_unref(&handshaker->refcount)) { gpr_mu_destroy(&handshaker->mu); if (handshaker->endpoint_to_destroy != nullptr) { - grpc_endpoint_destroy(exec_ctx, handshaker->endpoint_to_destroy); + grpc_endpoint_destroy(handshaker->endpoint_to_destroy); } if (handshaker->read_buffer_to_destroy != nullptr) { - grpc_slice_buffer_destroy_internal(exec_ctx, - handshaker->read_buffer_to_destroy); + grpc_slice_buffer_destroy_internal(handshaker->read_buffer_to_destroy); gpr_free(handshaker->read_buffer_to_destroy); } - grpc_slice_buffer_destroy_internal(exec_ctx, &handshaker->write_buffer); + grpc_slice_buffer_destroy_internal(&handshaker->write_buffer); grpc_http_parser_destroy(&handshaker->http_parser); grpc_http_response_destroy(&handshaker->http_response); gpr_free(handshaker); } } -// Set args fields to NULL, saving the endpoint and read buffer for +// Set args fields to nullptr, saving the endpoint and read buffer for // later destruction. static void cleanup_args_for_failure_locked( - grpc_exec_ctx* exec_ctx, http_connect_handshaker* handshaker) { + http_connect_handshaker* handshaker) { handshaker->endpoint_to_destroy = handshaker->args->endpoint; handshaker->args->endpoint = nullptr; handshaker->read_buffer_to_destroy = handshaker->args->read_buffer; handshaker->args->read_buffer = nullptr; - grpc_channel_args_destroy(exec_ctx, handshaker->args->args); + grpc_channel_args_destroy(handshaker->args->args); handshaker->args->args = nullptr; } // If the handshake failed or we're shutting down, clean up and invoke the // callback with the error. -static void handshake_failed_locked(grpc_exec_ctx* exec_ctx, - http_connect_handshaker* handshaker, +static void handshake_failed_locked(http_connect_handshaker* handshaker, grpc_error* error) { if (error == GRPC_ERROR_NONE) { // If we were shut down after an endpoint operation succeeded but @@ -108,34 +105,32 @@ static void handshake_failed_locked(grpc_exec_ctx* exec_ctx, // before destroying them, even if we know that there are no // pending read/write callbacks. This should be fixed, at which // point this can be removed. - grpc_endpoint_shutdown(exec_ctx, handshaker->args->endpoint, - GRPC_ERROR_REF(error)); + grpc_endpoint_shutdown(handshaker->args->endpoint, GRPC_ERROR_REF(error)); // Not shutting down, so the handshake failed. Clean up before // invoking the callback. - cleanup_args_for_failure_locked(exec_ctx, handshaker); + cleanup_args_for_failure_locked(handshaker); // Set shutdown to true so that subsequent calls to // http_connect_handshaker_shutdown() do nothing. handshaker->shutdown = true; } // Invoke callback. - GRPC_CLOSURE_SCHED(exec_ctx, handshaker->on_handshake_done, error); + GRPC_CLOSURE_SCHED(handshaker->on_handshake_done, error); } // Callback invoked when finished writing HTTP CONNECT request. -static void on_write_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_write_done(void* arg, grpc_error* error) { http_connect_handshaker* handshaker = (http_connect_handshaker*)arg; gpr_mu_lock(&handshaker->mu); if (error != GRPC_ERROR_NONE || handshaker->shutdown) { // If the write failed or we're shutting down, clean up and invoke the // callback with the error. - handshake_failed_locked(exec_ctx, handshaker, GRPC_ERROR_REF(error)); + handshake_failed_locked(handshaker, GRPC_ERROR_REF(error)); gpr_mu_unlock(&handshaker->mu); - http_connect_handshaker_unref(exec_ctx, handshaker); + http_connect_handshaker_unref(handshaker); } else { // Otherwise, read the response. // The read callback inherits our ref to the handshaker. - grpc_endpoint_read(exec_ctx, handshaker->args->endpoint, + grpc_endpoint_read(handshaker->args->endpoint, handshaker->args->read_buffer, &handshaker->response_read_closure); gpr_mu_unlock(&handshaker->mu); @@ -143,14 +138,13 @@ static void on_write_done(grpc_exec_ctx* exec_ctx, void* arg, } // Callback invoked for reading HTTP CONNECT response. -static void on_read_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_read_done(void* arg, grpc_error* error) { http_connect_handshaker* handshaker = (http_connect_handshaker*)arg; gpr_mu_lock(&handshaker->mu); if (error != GRPC_ERROR_NONE || handshaker->shutdown) { // If the read failed or we're shutting down, clean up and invoke the // callback with the error. - handshake_failed_locked(exec_ctx, handshaker, GRPC_ERROR_REF(error)); + handshake_failed_locked(handshaker, GRPC_ERROR_REF(error)); goto done; } // Add buffer to parser. @@ -161,7 +155,7 @@ static void on_read_done(grpc_exec_ctx* exec_ctx, void* arg, handshaker->args->read_buffer->slices[i], &body_start_offset); if (error != GRPC_ERROR_NONE) { - handshake_failed_locked(exec_ctx, handshaker, error); + handshake_failed_locked(handshaker, error); goto done; } if (handshaker->http_parser.state == GRPC_HTTP_BODY) { @@ -180,7 +174,7 @@ static void on_read_done(grpc_exec_ctx* exec_ctx, void* arg, &handshaker->args->read_buffer->slices[i + 1], handshaker->args->read_buffer->count - i - 1); grpc_slice_buffer_swap(handshaker->args->read_buffer, &tmp_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &tmp_buffer); + grpc_slice_buffer_destroy_internal(&tmp_buffer); break; } } @@ -197,9 +191,8 @@ static void on_read_done(grpc_exec_ctx* exec_ctx, void* arg, // complete (e.g., handling chunked transfer encoding or looking // at the Content-Length: header). if (handshaker->http_parser.state != GRPC_HTTP_BODY) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, - handshaker->args->read_buffer); - grpc_endpoint_read(exec_ctx, handshaker->args->endpoint, + grpc_slice_buffer_reset_and_unref_internal(handshaker->args->read_buffer); + grpc_endpoint_read(handshaker->args->endpoint, handshaker->args->read_buffer, &handshaker->response_read_closure); gpr_mu_unlock(&handshaker->mu); @@ -213,48 +206,44 @@ static void on_read_done(grpc_exec_ctx* exec_ctx, void* arg, handshaker->http_response.status); error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - handshake_failed_locked(exec_ctx, handshaker, error); + handshake_failed_locked(handshaker, error); goto done; } // Success. Invoke handshake-done callback. - GRPC_CLOSURE_SCHED(exec_ctx, handshaker->on_handshake_done, error); + GRPC_CLOSURE_SCHED(handshaker->on_handshake_done, error); done: // Set shutdown to true so that subsequent calls to // http_connect_handshaker_shutdown() do nothing. handshaker->shutdown = true; gpr_mu_unlock(&handshaker->mu); - http_connect_handshaker_unref(exec_ctx, handshaker); + http_connect_handshaker_unref(handshaker); } // // Public handshaker methods // -static void http_connect_handshaker_destroy(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker_in) { +static void http_connect_handshaker_destroy(grpc_handshaker* handshaker_in) { http_connect_handshaker* handshaker = (http_connect_handshaker*)handshaker_in; - http_connect_handshaker_unref(exec_ctx, handshaker); + http_connect_handshaker_unref(handshaker); } -static void http_connect_handshaker_shutdown(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker_in, +static void http_connect_handshaker_shutdown(grpc_handshaker* handshaker_in, grpc_error* why) { http_connect_handshaker* handshaker = (http_connect_handshaker*)handshaker_in; gpr_mu_lock(&handshaker->mu); if (!handshaker->shutdown) { handshaker->shutdown = true; - grpc_endpoint_shutdown(exec_ctx, handshaker->args->endpoint, - GRPC_ERROR_REF(why)); - cleanup_args_for_failure_locked(exec_ctx, handshaker); + grpc_endpoint_shutdown(handshaker->args->endpoint, GRPC_ERROR_REF(why)); + cleanup_args_for_failure_locked(handshaker); } gpr_mu_unlock(&handshaker->mu); GRPC_ERROR_UNREF(why); } static void http_connect_handshaker_do_handshake( - grpc_exec_ctx* exec_ctx, grpc_handshaker* handshaker_in, - grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, - grpc_handshaker_args* args) { + grpc_handshaker* handshaker_in, grpc_tcp_server_acceptor* acceptor, + grpc_closure* on_handshake_done, grpc_handshaker_args* args) { http_connect_handshaker* handshaker = (http_connect_handshaker*)handshaker_in; // Check for HTTP CONNECT channel arg. // If not found, invoke on_handshake_done without doing anything. @@ -266,7 +255,7 @@ static void http_connect_handshaker_do_handshake( gpr_mu_lock(&handshaker->mu); handshaker->shutdown = true; gpr_mu_unlock(&handshaker->mu); - GRPC_CLOSURE_SCHED(exec_ctx, on_handshake_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_handshake_done, GRPC_ERROR_NONE); return; } GPR_ASSERT(arg->type == GRPC_ARG_STRING); @@ -324,7 +313,7 @@ static void http_connect_handshaker_do_handshake( gpr_free(header_strings); // Take a new ref to be held by the write callback. gpr_ref(&handshaker->refcount); - grpc_endpoint_write(exec_ctx, args->endpoint, &handshaker->write_buffer, + grpc_endpoint_write(args->endpoint, &handshaker->write_buffer, &handshaker->request_done_closure); gpr_mu_unlock(&handshaker->mu); } @@ -355,14 +344,13 @@ static grpc_handshaker* grpc_http_connect_handshaker_create() { // static void handshaker_factory_add_handshakers( - grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* factory, - const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr) { + grpc_handshaker_factory* factory, const grpc_channel_args* args, + grpc_handshake_manager* handshake_mgr) { grpc_handshake_manager_add(handshake_mgr, grpc_http_connect_handshaker_create()); } -static void handshaker_factory_destroy(grpc_exec_ctx* exec_ctx, - grpc_handshaker_factory* factory) {} +static void handshaker_factory_destroy(grpc_handshaker_factory* factory) {} static const grpc_handshaker_factory_vtable handshaker_factory_vtable = { handshaker_factory_add_handshakers, handshaker_factory_destroy}; diff --git a/src/core/ext/filters/client_channel/http_proxy.cc b/src/core/ext/filters/client_channel/http_proxy.cc index 405d8c0e559..2eafeee7026 100644 --- a/src/core/ext/filters/client_channel/http_proxy.cc +++ b/src/core/ext/filters/client_channel/http_proxy.cc @@ -36,19 +36,18 @@ /** * Parses the 'http_proxy' env var and returns the proxy hostname to resolve or - * NULL on error. Also sets 'user_cred' to user credentials if present in the + * nullptr on error. Also sets 'user_cred' to user credentials if present in the * 'http_proxy' env var, otherwise leaves it unchanged. It is caller's * responsibility to gpr_free user_cred. */ -static char* get_http_proxy_server(grpc_exec_ctx* exec_ctx, char** user_cred) { +static char* get_http_proxy_server(char** user_cred) { GPR_ASSERT(user_cred != nullptr); char* proxy_name = nullptr; char* uri_str = gpr_getenv("http_proxy"); char** authority_strs = nullptr; size_t authority_nstrs; if (uri_str == nullptr) return nullptr; - grpc_uri* uri = - grpc_uri_parse(exec_ctx, uri_str, false /* suppress_errors */); + grpc_uri* uri = grpc_uri_parse(uri_str, false /* suppress_errors */); if (uri == nullptr || uri->authority == nullptr) { gpr_log(GPR_ERROR, "cannot parse value of 'http_proxy' env var"); goto done; @@ -82,18 +81,16 @@ done: return proxy_name; } -static bool proxy_mapper_map_name(grpc_exec_ctx* exec_ctx, - grpc_proxy_mapper* mapper, +static bool proxy_mapper_map_name(grpc_proxy_mapper* mapper, const char* server_uri, const grpc_channel_args* args, char** name_to_resolve, grpc_channel_args** new_args) { char* user_cred = nullptr; - *name_to_resolve = get_http_proxy_server(exec_ctx, &user_cred); + *name_to_resolve = get_http_proxy_server(&user_cred); if (*name_to_resolve == nullptr) return false; char* no_proxy_str = nullptr; - grpc_uri* uri = - grpc_uri_parse(exec_ctx, server_uri, false /* suppress_errors */); + grpc_uri* uri = grpc_uri_parse(server_uri, false /* suppress_errors */); if (uri == nullptr || uri->path[0] == '\0') { gpr_log(GPR_ERROR, "'http_proxy' environment variable set, but cannot " @@ -174,8 +171,7 @@ no_use_proxy: return false; } -static bool proxy_mapper_map_address(grpc_exec_ctx* exec_ctx, - grpc_proxy_mapper* mapper, +static bool proxy_mapper_map_address(grpc_proxy_mapper* mapper, const grpc_resolved_address* address, const grpc_channel_args* args, grpc_resolved_address** new_address, diff --git a/src/core/ext/filters/client_channel/lb_policy.cc b/src/core/ext/filters/client_channel/lb_policy.cc index db566f1b562..b97aa319f7e 100644 --- a/src/core/ext/filters/client_channel/lb_policy.cc +++ b/src/core/ext/filters/client_channel/lb_policy.cc @@ -63,15 +63,13 @@ void grpc_lb_policy_ref(grpc_lb_policy* policy REF_FUNC_EXTRA_ARGS) { ref_mutate(policy, 1 << WEAK_REF_BITS, 0 REF_MUTATE_PASS_ARGS("STRONG_REF")); } -static void shutdown_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void shutdown_locked(void* arg, grpc_error* error) { grpc_lb_policy* policy = (grpc_lb_policy*)arg; - policy->vtable->shutdown_locked(exec_ctx, policy); - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, policy, "strong-unref"); + policy->vtable->shutdown_locked(policy); + GRPC_LB_POLICY_WEAK_UNREF(policy, "strong-unref"); } -void grpc_lb_policy_unref(grpc_exec_ctx* exec_ctx, - grpc_lb_policy* policy REF_FUNC_EXTRA_ARGS) { +void grpc_lb_policy_unref(grpc_lb_policy* policy REF_FUNC_EXTRA_ARGS) { gpr_atm old_val = ref_mutate(policy, (gpr_atm)1 - (gpr_atm)(1 << WEAK_REF_BITS), 1 REF_MUTATE_PASS_ARGS("STRONG_UNREF")); @@ -79,13 +77,11 @@ void grpc_lb_policy_unref(grpc_exec_ctx* exec_ctx, gpr_atm check = 1 << WEAK_REF_BITS; if ((old_val & mask) == check) { GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_CREATE(shutdown_locked, policy, grpc_combiner_scheduler(policy->combiner)), GRPC_ERROR_NONE); } else { - grpc_lb_policy_weak_unref(exec_ctx, - policy REF_FUNC_PASS_ARGS("strong-unref")); + grpc_lb_policy_weak_unref(policy REF_FUNC_PASS_ARGS("strong-unref")); } } @@ -93,88 +89,75 @@ void grpc_lb_policy_weak_ref(grpc_lb_policy* policy REF_FUNC_EXTRA_ARGS) { ref_mutate(policy, 1, 0 REF_MUTATE_PASS_ARGS("WEAK_REF")); } -void grpc_lb_policy_weak_unref(grpc_exec_ctx* exec_ctx, - grpc_lb_policy* policy REF_FUNC_EXTRA_ARGS) { +void grpc_lb_policy_weak_unref(grpc_lb_policy* policy REF_FUNC_EXTRA_ARGS) { gpr_atm old_val = ref_mutate(policy, -(gpr_atm)1, 1 REF_MUTATE_PASS_ARGS("WEAK_UNREF")); if (old_val == 1) { - grpc_pollset_set_destroy(exec_ctx, policy->interested_parties); + grpc_pollset_set_destroy(policy->interested_parties); grpc_combiner* combiner = policy->combiner; - policy->vtable->destroy(exec_ctx, policy); - GRPC_COMBINER_UNREF(exec_ctx, combiner, "lb_policy"); + policy->vtable->destroy(policy); + GRPC_COMBINER_UNREF(combiner, "lb_policy"); } } -int grpc_lb_policy_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, +int grpc_lb_policy_pick_locked(grpc_lb_policy* policy, const grpc_lb_policy_pick_args* pick_args, grpc_connected_subchannel** target, grpc_call_context_element* context, void** user_data, grpc_closure* on_complete) { - return policy->vtable->pick_locked(exec_ctx, policy, pick_args, target, - context, user_data, on_complete); + return policy->vtable->pick_locked(policy, pick_args, target, context, + user_data, on_complete); } -void grpc_lb_policy_cancel_pick_locked(grpc_exec_ctx* exec_ctx, - grpc_lb_policy* policy, +void grpc_lb_policy_cancel_pick_locked(grpc_lb_policy* policy, grpc_connected_subchannel** target, grpc_error* error) { - policy->vtable->cancel_pick_locked(exec_ctx, policy, target, error); + policy->vtable->cancel_pick_locked(policy, target, error); } -void grpc_lb_policy_cancel_picks_locked(grpc_exec_ctx* exec_ctx, - grpc_lb_policy* policy, +void grpc_lb_policy_cancel_picks_locked(grpc_lb_policy* policy, uint32_t initial_metadata_flags_mask, uint32_t initial_metadata_flags_eq, grpc_error* error) { - policy->vtable->cancel_picks_locked(exec_ctx, policy, - initial_metadata_flags_mask, + policy->vtable->cancel_picks_locked(policy, initial_metadata_flags_mask, initial_metadata_flags_eq, error); } -void grpc_lb_policy_exit_idle_locked(grpc_exec_ctx* exec_ctx, - grpc_lb_policy* policy) { - policy->vtable->exit_idle_locked(exec_ctx, policy); +void grpc_lb_policy_exit_idle_locked(grpc_lb_policy* policy) { + policy->vtable->exit_idle_locked(policy); } -void grpc_lb_policy_ping_one_locked(grpc_exec_ctx* exec_ctx, - grpc_lb_policy* policy, +void grpc_lb_policy_ping_one_locked(grpc_lb_policy* policy, grpc_closure* closure) { - policy->vtable->ping_one_locked(exec_ctx, policy, closure); + policy->vtable->ping_one_locked(policy, closure); } void grpc_lb_policy_notify_on_state_change_locked( - grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, - grpc_connectivity_state* state, grpc_closure* closure) { - policy->vtable->notify_on_state_change_locked(exec_ctx, policy, state, - closure); + grpc_lb_policy* policy, grpc_connectivity_state* state, + grpc_closure* closure) { + policy->vtable->notify_on_state_change_locked(policy, state, closure); } grpc_connectivity_state grpc_lb_policy_check_connectivity_locked( - grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, - grpc_error** connectivity_error) { - return policy->vtable->check_connectivity_locked(exec_ctx, policy, - connectivity_error); + grpc_lb_policy* policy, grpc_error** connectivity_error) { + return policy->vtable->check_connectivity_locked(policy, connectivity_error); } -void grpc_lb_policy_update_locked(grpc_exec_ctx* exec_ctx, - grpc_lb_policy* policy, +void grpc_lb_policy_update_locked(grpc_lb_policy* policy, const grpc_lb_policy_args* lb_policy_args) { - policy->vtable->update_locked(exec_ctx, policy, lb_policy_args); + policy->vtable->update_locked(policy, lb_policy_args); } void grpc_lb_policy_set_reresolve_closure_locked( - grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, - grpc_closure* request_reresolution) { - policy->vtable->set_reresolve_closure_locked(exec_ctx, policy, - request_reresolution); + grpc_lb_policy* policy, grpc_closure* request_reresolution) { + policy->vtable->set_reresolve_closure_locked(policy, request_reresolution); } -void grpc_lb_policy_try_reresolve(grpc_exec_ctx* exec_ctx, - grpc_lb_policy* policy, +void grpc_lb_policy_try_reresolve(grpc_lb_policy* policy, grpc_core::TraceFlag* grpc_lb_trace, grpc_error* error) { if (policy->request_reresolution != nullptr) { - GRPC_CLOSURE_SCHED(exec_ctx, policy->request_reresolution, error); + GRPC_CLOSURE_SCHED(policy->request_reresolution, error); policy->request_reresolution = nullptr; if (grpc_lb_trace->enabled()) { gpr_log(GPR_DEBUG, diff --git a/src/core/ext/filters/client_channel/lb_policy.h b/src/core/ext/filters/client_channel/lb_policy.h index d3159eebf3b..fd28a2b623c 100644 --- a/src/core/ext/filters/client_channel/lb_policy.h +++ b/src/core/ext/filters/client_channel/lb_policy.h @@ -55,53 +55,49 @@ typedef struct grpc_lb_policy_pick_args { } grpc_lb_policy_pick_args; struct grpc_lb_policy_vtable { - void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy); - void (*shutdown_locked)(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy); + void (*destroy)(grpc_lb_policy* policy); + void (*shutdown_locked)(grpc_lb_policy* policy); /** \see grpc_lb_policy_pick */ - int (*pick_locked)(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, + int (*pick_locked)(grpc_lb_policy* policy, const grpc_lb_policy_pick_args* pick_args, grpc_connected_subchannel** target, grpc_call_context_element* context, void** user_data, grpc_closure* on_complete); /** \see grpc_lb_policy_cancel_pick */ - void (*cancel_pick_locked)(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, + void (*cancel_pick_locked)(grpc_lb_policy* policy, grpc_connected_subchannel** target, grpc_error* error); /** \see grpc_lb_policy_cancel_picks */ - void (*cancel_picks_locked)(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, + void (*cancel_picks_locked)(grpc_lb_policy* policy, uint32_t initial_metadata_flags_mask, uint32_t initial_metadata_flags_eq, grpc_error* error); /** \see grpc_lb_policy_ping_one */ - void (*ping_one_locked)(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, - grpc_closure* closure); + void (*ping_one_locked)(grpc_lb_policy* policy, grpc_closure* closure); /** Try to enter a READY connectivity state */ - void (*exit_idle_locked)(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy); + void (*exit_idle_locked)(grpc_lb_policy* policy); /** check the current connectivity of the lb_policy */ grpc_connectivity_state (*check_connectivity_locked)( - grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, - grpc_error** connectivity_error); + grpc_lb_policy* policy, grpc_error** connectivity_error); /** call notify when the connectivity state of a channel changes from *state. Updates *state with the new state of the policy. Calling with a NULL \a state cancels the subscription. */ - void (*notify_on_state_change_locked)(grpc_exec_ctx* exec_ctx, - grpc_lb_policy* policy, + void (*notify_on_state_change_locked)(grpc_lb_policy* policy, grpc_connectivity_state* state, grpc_closure* closure); - void (*update_locked)(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, + void (*update_locked)(grpc_lb_policy* policy, const grpc_lb_policy_args* args); /** \see grpc_lb_policy_set_reresolve_closure */ - void (*set_reresolve_closure_locked)(grpc_exec_ctx* exec_ctx, - grpc_lb_policy* policy, + void (*set_reresolve_closure_locked)(grpc_lb_policy* policy, grpc_closure* request_reresolution); }; @@ -110,33 +106,33 @@ struct grpc_lb_policy_vtable { /* Strong references: the policy will shutdown when they reach zero */ #define GRPC_LB_POLICY_REF(p, r) \ grpc_lb_policy_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_LB_POLICY_UNREF(exec_ctx, p, r) \ - grpc_lb_policy_unref((exec_ctx), (p), __FILE__, __LINE__, (r)) +#define GRPC_LB_POLICY_UNREF(p, r) \ + grpc_lb_policy_unref((p), __FILE__, __LINE__, (r)) /* Weak references: they don't prevent the shutdown of the LB policy. When no * strong references are left but there are still weak ones, shutdown is called. * Once the weak reference also reaches zero, the LB policy is destroyed. */ #define GRPC_LB_POLICY_WEAK_REF(p, r) \ grpc_lb_policy_weak_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, p, r) \ - grpc_lb_policy_weak_unref((exec_ctx), (p), __FILE__, __LINE__, (r)) +#define GRPC_LB_POLICY_WEAK_UNREF(p, r) \ + grpc_lb_policy_weak_unref((p), __FILE__, __LINE__, (r)) void grpc_lb_policy_ref(grpc_lb_policy* policy, const char* file, int line, const char* reason); -void grpc_lb_policy_unref(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, - const char* file, int line, const char* reason); +void grpc_lb_policy_unref(grpc_lb_policy* policy, const char* file, int line, + const char* reason); void grpc_lb_policy_weak_ref(grpc_lb_policy* policy, const char* file, int line, const char* reason); -void grpc_lb_policy_weak_unref(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, - const char* file, int line, const char* reason); +void grpc_lb_policy_weak_unref(grpc_lb_policy* policy, const char* file, + int line, const char* reason); #else #define GRPC_LB_POLICY_REF(p, r) grpc_lb_policy_ref((p)) -#define GRPC_LB_POLICY_UNREF(cl, p, r) grpc_lb_policy_unref((cl), (p)) +#define GRPC_LB_POLICY_UNREF(p, r) grpc_lb_policy_unref((p)) #define GRPC_LB_POLICY_WEAK_REF(p, r) grpc_lb_policy_weak_ref((p)) -#define GRPC_LB_POLICY_WEAK_UNREF(cl, p, r) grpc_lb_policy_weak_unref((cl), (p)) +#define GRPC_LB_POLICY_WEAK_UNREF(p, r) grpc_lb_policy_weak_unref((p)) void grpc_lb_policy_ref(grpc_lb_policy* policy); -void grpc_lb_policy_unref(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy); +void grpc_lb_policy_unref(grpc_lb_policy* policy); void grpc_lb_policy_weak_ref(grpc_lb_policy* policy); -void grpc_lb_policy_weak_unref(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy); +void grpc_lb_policy_weak_unref(grpc_lb_policy* policy); #endif /** called by concrete implementations to initialize the base struct */ @@ -161,7 +157,7 @@ void grpc_lb_policy_init(grpc_lb_policy* policy, Any IO should be done under the \a interested_parties \a grpc_pollset_set in the \a grpc_lb_policy struct. */ -int grpc_lb_policy_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, +int grpc_lb_policy_pick_locked(grpc_lb_policy* policy, const grpc_lb_policy_pick_args* pick_args, grpc_connected_subchannel** target, grpc_call_context_element* context, @@ -169,55 +165,47 @@ int grpc_lb_policy_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, /** Perform a connected subchannel ping (see \a grpc_connected_subchannel_ping) against one of the connected subchannels managed by \a policy. */ -void grpc_lb_policy_ping_one_locked(grpc_exec_ctx* exec_ctx, - grpc_lb_policy* policy, +void grpc_lb_policy_ping_one_locked(grpc_lb_policy* policy, grpc_closure* closure); /** Cancel picks for \a target. The \a on_complete callback of the pending picks will be invoked with \a *target set to NULL. */ -void grpc_lb_policy_cancel_pick_locked(grpc_exec_ctx* exec_ctx, - grpc_lb_policy* policy, +void grpc_lb_policy_cancel_pick_locked(grpc_lb_policy* policy, grpc_connected_subchannel** target, grpc_error* error); /** Cancel all pending picks for which their \a initial_metadata_flags (as given in the call to \a grpc_lb_policy_pick) matches \a initial_metadata_flags_eq when AND'd with \a initial_metadata_flags_mask */ -void grpc_lb_policy_cancel_picks_locked(grpc_exec_ctx* exec_ctx, - grpc_lb_policy* policy, +void grpc_lb_policy_cancel_picks_locked(grpc_lb_policy* policy, uint32_t initial_metadata_flags_mask, uint32_t initial_metadata_flags_eq, grpc_error* error); /** Try to enter a READY connectivity state */ -void grpc_lb_policy_exit_idle_locked(grpc_exec_ctx* exec_ctx, - grpc_lb_policy* policy); +void grpc_lb_policy_exit_idle_locked(grpc_lb_policy* policy); /* Call notify when the connectivity state of a channel changes from \a *state. * Updates \a *state with the new state of the policy */ void grpc_lb_policy_notify_on_state_change_locked( - grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, - grpc_connectivity_state* state, grpc_closure* closure); + grpc_lb_policy* policy, grpc_connectivity_state* state, + grpc_closure* closure); grpc_connectivity_state grpc_lb_policy_check_connectivity_locked( - grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, - grpc_error** connectivity_error); + grpc_lb_policy* policy, grpc_error** connectivity_error); /** Update \a policy with \a lb_policy_args. */ -void grpc_lb_policy_update_locked(grpc_exec_ctx* exec_ctx, - grpc_lb_policy* policy, +void grpc_lb_policy_update_locked(grpc_lb_policy* policy, const grpc_lb_policy_args* lb_policy_args); /** Set the re-resolution closure to \a request_reresolution. */ void grpc_lb_policy_set_reresolve_closure_locked( - grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, - grpc_closure* request_reresolution); + grpc_lb_policy* policy, grpc_closure* request_reresolution); /** Try to request a re-resolution. It's NOT a public API; it's only for use by the LB policy implementations. */ -void grpc_lb_policy_try_reresolve(grpc_exec_ctx* exec_ctx, - grpc_lb_policy* policy, +void grpc_lb_policy_try_reresolve(grpc_lb_policy* policy, grpc_core::TraceFlag* grpc_lb_trace, grpc_error* error); diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc index 6d9fadaf306..3eedb08ecc0 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc @@ -25,14 +25,12 @@ #include "src/core/lib/iomgr/error.h" #include "src/core/lib/profiling/timers.h" -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_channel_element* elem) {} typedef struct { // Stats object to update. @@ -47,28 +45,24 @@ typedef struct { bool recv_initial_metadata_succeeded; } call_data; -static void on_complete_for_send(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_complete_for_send(void* arg, grpc_error* error) { call_data* calld = (call_data*)arg; if (error == GRPC_ERROR_NONE) { calld->send_initial_metadata_succeeded = true; } - GRPC_CLOSURE_RUN(exec_ctx, calld->original_on_complete_for_send, - GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(calld->original_on_complete_for_send, GRPC_ERROR_REF(error)); } -static void recv_initial_metadata_ready(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void recv_initial_metadata_ready(void* arg, grpc_error* error) { call_data* calld = (call_data*)arg; if (error == GRPC_ERROR_NONE) { calld->recv_initial_metadata_succeeded = true; } - GRPC_CLOSURE_RUN(exec_ctx, calld->original_recv_initial_metadata_ready, + GRPC_CLOSURE_RUN(calld->original_recv_initial_metadata_ready, GRPC_ERROR_REF(error)); } -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; // Get stats object from context and take a ref. @@ -81,7 +75,7 @@ static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, return GRPC_ERROR_NONE; } -static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { call_data* calld = (call_data*)elem->call_data; @@ -96,8 +90,7 @@ static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, } static void start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* batch) { + grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { call_data* calld = (call_data*)elem->call_data; GPR_TIMER_BEGIN("clr_start_transport_stream_op_batch", 0); // Intercept send_initial_metadata. @@ -118,7 +111,7 @@ static void start_transport_stream_op_batch( &calld->recv_initial_metadata_ready; } // Chain to next filter. - grpc_call_next_op(exec_ctx, elem, batch); + grpc_call_next_op(elem, batch); GPR_TIMER_END("clr_start_transport_stream_op_batch", 0); } diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index db06fc20b60..eadeea03684 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -131,12 +131,12 @@ grpc_core::TraceFlag grpc_lb_glb_trace(false, "glb"); /* add lb_token of selected subchannel (address) to the call's initial * metadata */ static grpc_error* initial_metadata_add_lb_token( - grpc_exec_ctx* exec_ctx, grpc_metadata_batch* initial_metadata, + grpc_metadata_batch* initial_metadata, grpc_linked_mdelem* lb_token_mdelem_storage, grpc_mdelem lb_token) { GPR_ASSERT(lb_token_mdelem_storage != nullptr); GPR_ASSERT(!GRPC_MDISNULL(lb_token)); - return grpc_metadata_batch_add_tail(exec_ctx, initial_metadata, - lb_token_mdelem_storage, lb_token); + return grpc_metadata_batch_add_tail(initial_metadata, lb_token_mdelem_storage, + lb_token); } static void destroy_client_stats(void* arg) { @@ -186,20 +186,19 @@ typedef struct wrapped_rr_closure_arg { /* The \a on_complete closure passed as part of the pick requires keeping a * reference to its associated round robin instance. We wrap this closure in * order to unref the round robin instance upon its invocation */ -static void wrapped_rr_closure(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void wrapped_rr_closure(void* arg, grpc_error* error) { wrapped_rr_closure_arg* wc_arg = (wrapped_rr_closure_arg*)arg; GPR_ASSERT(wc_arg->wrapped_closure != nullptr); - GRPC_CLOSURE_SCHED(exec_ctx, wc_arg->wrapped_closure, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(wc_arg->wrapped_closure, GRPC_ERROR_REF(error)); if (wc_arg->rr_policy != nullptr) { - /* if *target is NULL, no pick has been made by the RR policy (eg, all + /* if *target is nullptr, no pick has been made by the RR policy (eg, all * addresses failed to connect). There won't be any user_data/token * available */ if (*wc_arg->target != nullptr) { if (!GRPC_MDISNULL(wc_arg->lb_token)) { - initial_metadata_add_lb_token(exec_ctx, wc_arg->initial_metadata, + initial_metadata_add_lb_token(wc_arg->initial_metadata, wc_arg->lb_token_mdelem_storage, GRPC_MDELEM_REF(wc_arg->lb_token)); } else { @@ -221,7 +220,7 @@ static void wrapped_rr_closure(grpc_exec_ctx* exec_ctx, void* arg, gpr_log(GPR_INFO, "[grpclb %p] Unreffing RR %p", wc_arg->glb_policy, wc_arg->rr_policy); } - GRPC_LB_POLICY_UNREF(exec_ctx, wc_arg->rr_policy, "wrapped_rr_closure"); + GRPC_LB_POLICY_UNREF(wc_arg->rr_policy, "wrapped_rr_closure"); } GPR_ASSERT(wc_arg->free_when_done != nullptr); gpr_free(wc_arg->free_when_done); @@ -241,8 +240,8 @@ typedef struct pending_pick { /* original pick()'s arguments */ grpc_lb_policy_pick_args pick_args; - /* output argument where to store the pick()ed connected subchannel, or NULL - * upon error. */ + /* output argument where to store the pick()ed connected subchannel, or + * nullptr upon error. */ grpc_connected_subchannel** target; /* args for wrapped_on_complete */ @@ -328,8 +327,8 @@ typedef struct glb_lb_policy { /** connectivity state of the LB channel */ grpc_connectivity_state lb_channel_connectivity; - /** stores the deserialized response from the LB. May be NULL until one such - * response has arrived. */ + /** stores the deserialized response from the LB. May be nullptr until one + * such response has arrived. */ grpc_grpclb_serverlist* serverlist; /** Index into serverlist for next pick. @@ -459,9 +458,9 @@ static void* lb_token_copy(void* token) { ? nullptr : (void*)GRPC_MDELEM_REF(grpc_mdelem{(uintptr_t)token}).payload; } -static void lb_token_destroy(grpc_exec_ctx* exec_ctx, void* token) { +static void lb_token_destroy(void* token) { if (token != nullptr) { - GRPC_MDELEM_UNREF(exec_ctx, grpc_mdelem{(uintptr_t)token}); + GRPC_MDELEM_UNREF(grpc_mdelem{(uintptr_t)token}); } } static int lb_token_cmp(void* token1, void* token2) { @@ -497,7 +496,7 @@ static void parse_server(const grpc_grpclb_server* server, /* Returns addresses extracted from \a serverlist. */ static grpc_lb_addresses* process_serverlist_locked( - grpc_exec_ctx* exec_ctx, const grpc_grpclb_serverlist* serverlist) { + const grpc_grpclb_serverlist* serverlist) { size_t num_valid = 0; /* first pass: count how many are valid in order to allocate the necessary * memory in a single block */ @@ -528,9 +527,9 @@ static grpc_lb_addresses* process_serverlist_locked( strnlen(server->load_balance_token, lb_token_max_length); grpc_slice lb_token_mdstr = grpc_slice_from_copied_buffer( server->load_balance_token, lb_token_length); - user_data = (void*)grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_LB_TOKEN, - lb_token_mdstr) - .payload; + user_data = + (void*)grpc_mdelem_from_slices(GRPC_MDSTR_LB_TOKEN, lb_token_mdstr) + .payload; } else { char* uri = grpc_sockaddr_to_uri(&addr); gpr_log(GPR_INFO, @@ -552,7 +551,7 @@ static grpc_lb_addresses* process_serverlist_locked( /* Returns the backend addresses extracted from the given addresses */ static grpc_lb_addresses* extract_backend_addresses_locked( - grpc_exec_ctx* exec_ctx, const grpc_lb_addresses* addresses) { + const grpc_lb_addresses* addresses) { /* first pass: count the number of backend addresses */ size_t num_backends = 0; for (size_t i = 0; i < addresses->num_addresses; ++i) { @@ -577,8 +576,8 @@ static grpc_lb_addresses* extract_backend_addresses_locked( } static void update_lb_connectivity_status_locked( - grpc_exec_ctx* exec_ctx, glb_lb_policy* glb_policy, - grpc_connectivity_state rr_state, grpc_error* rr_state_error) { + glb_lb_policy* glb_policy, grpc_connectivity_state rr_state, + grpc_error* rr_state_error) { const grpc_connectivity_state curr_glb_state = grpc_connectivity_state_check(&glb_policy->state_tracker); @@ -630,7 +629,7 @@ static void update_lb_connectivity_status_locked( glb_policy, grpc_connectivity_state_name(rr_state), glb_policy->rr_policy); } - grpc_connectivity_state_set(exec_ctx, &glb_policy->state_tracker, rr_state, + grpc_connectivity_state_set(&glb_policy->state_tracker, rr_state, rr_state_error, "update_lb_connectivity_status_locked"); } @@ -641,9 +640,9 @@ static void update_lb_connectivity_status_locked( * If \a force_async is true, then we will manually schedule the * completion callback even if the pick is available immediately. */ static bool pick_from_internal_rr_locked( - grpc_exec_ctx* exec_ctx, glb_lb_policy* glb_policy, - const grpc_lb_policy_pick_args* pick_args, bool force_async, - grpc_connected_subchannel** target, wrapped_rr_closure_arg* wc_arg) { + glb_lb_policy* glb_policy, const grpc_lb_policy_pick_args* pick_args, + bool force_async, grpc_connected_subchannel** target, + wrapped_rr_closure_arg* wc_arg) { // Check for drops if we are not using fallback backend addresses. if (glb_policy->serverlist != nullptr) { // Look at the index into the serverlist to see if we should drop this call. @@ -658,7 +657,7 @@ static bool pick_from_internal_rr_locked( gpr_log(GPR_INFO, "[grpclb %p] Unreffing RR %p for drop", glb_policy, wc_arg->rr_policy); } - GRPC_LB_POLICY_UNREF(exec_ctx, wc_arg->rr_policy, "glb_pick_sync"); + GRPC_LB_POLICY_UNREF(wc_arg->rr_policy, "glb_pick_sync"); // Update client load reporting stats to indicate the number of // dropped calls. Note that we have to do this here instead of in // the client_load_reporting filter, because we do not create a @@ -670,7 +669,7 @@ static bool pick_from_internal_rr_locked( grpc_grpclb_client_stats_unref(wc_arg->client_stats); if (force_async) { GPR_ASSERT(wc_arg->wrapped_closure != nullptr); - GRPC_CLOSURE_SCHED(exec_ctx, wc_arg->wrapped_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(wc_arg->wrapped_closure, GRPC_ERROR_NONE); gpr_free(wc_arg->free_when_done); return false; } @@ -680,7 +679,7 @@ static bool pick_from_internal_rr_locked( } // Pick via the RR policy. const bool pick_done = grpc_lb_policy_pick_locked( - exec_ctx, wc_arg->rr_policy, pick_args, target, wc_arg->context, + wc_arg->rr_policy, pick_args, target, wc_arg->context, (void**)&wc_arg->lb_token, &wc_arg->wrapper_closure); if (pick_done) { /* synchronous grpc_lb_policy_pick call. Unref the RR policy. */ @@ -688,9 +687,9 @@ static bool pick_from_internal_rr_locked( gpr_log(GPR_INFO, "[grpclb %p] Unreffing RR %p", glb_policy, wc_arg->rr_policy); } - GRPC_LB_POLICY_UNREF(exec_ctx, wc_arg->rr_policy, "glb_pick_sync"); + GRPC_LB_POLICY_UNREF(wc_arg->rr_policy, "glb_pick_sync"); /* add the load reporting initial metadata */ - initial_metadata_add_lb_token(exec_ctx, pick_args->initial_metadata, + initial_metadata_add_lb_token(pick_args->initial_metadata, pick_args->lb_token_mdelem_storage, GRPC_MDELEM_REF(wc_arg->lb_token)); // Pass on client stats via context. Passes ownership of the reference. @@ -699,7 +698,7 @@ static bool pick_from_internal_rr_locked( wc_arg->context[GRPC_GRPCLB_CLIENT_STATS].destroy = destroy_client_stats; if (force_async) { GPR_ASSERT(wc_arg->wrapped_closure != nullptr); - GRPC_CLOSURE_SCHED(exec_ctx, wc_arg->wrapped_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(wc_arg->wrapped_closure, GRPC_ERROR_NONE); gpr_free(wc_arg->free_when_done); return false; } @@ -712,12 +711,11 @@ static bool pick_from_internal_rr_locked( return pick_done; } -static grpc_lb_policy_args* lb_policy_args_create(grpc_exec_ctx* exec_ctx, - glb_lb_policy* glb_policy) { +static grpc_lb_policy_args* lb_policy_args_create(glb_lb_policy* glb_policy) { grpc_lb_addresses* addresses; if (glb_policy->serverlist != nullptr) { GPR_ASSERT(glb_policy->serverlist->num_servers > 0); - addresses = process_serverlist_locked(exec_ctx, glb_policy->serverlist); + addresses = process_serverlist_locked(glb_policy->serverlist); } else { // If rr_handover_locked() is invoked when we haven't received any // serverlist from the balancer, we use the fallback backends returned by @@ -737,24 +735,21 @@ static grpc_lb_policy_args* lb_policy_args_create(grpc_exec_ctx* exec_ctx, args->args = grpc_channel_args_copy_and_add_and_remove( glb_policy->args, keys_to_remove, GPR_ARRAY_SIZE(keys_to_remove), &arg, 1); - grpc_lb_addresses_destroy(exec_ctx, addresses); + grpc_lb_addresses_destroy(addresses); return args; } -static void lb_policy_args_destroy(grpc_exec_ctx* exec_ctx, - grpc_lb_policy_args* args) { - grpc_channel_args_destroy(exec_ctx, args->args); +static void lb_policy_args_destroy(grpc_lb_policy_args* args) { + grpc_channel_args_destroy(args->args); gpr_free(args); } -static void glb_rr_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, - void* arg, grpc_error* error); -static void create_rr_locked(grpc_exec_ctx* exec_ctx, glb_lb_policy* glb_policy, +static void glb_rr_connectivity_changed_locked(void* arg, grpc_error* error); +static void create_rr_locked(glb_lb_policy* glb_policy, grpc_lb_policy_args* args) { GPR_ASSERT(glb_policy->rr_policy == nullptr); - grpc_lb_policy* new_rr_policy = - grpc_lb_policy_create(exec_ctx, "round_robin", args); + grpc_lb_policy* new_rr_policy = grpc_lb_policy_create("round_robin", args); if (new_rr_policy == nullptr) { gpr_log(GPR_ERROR, "[grpclb %p] Failure creating a RoundRobin policy for serverlist " @@ -767,21 +762,19 @@ static void create_rr_locked(grpc_exec_ctx* exec_ctx, glb_lb_policy* glb_policy, return; } grpc_lb_policy_set_reresolve_closure_locked( - exec_ctx, new_rr_policy, glb_policy->base.request_reresolution); + new_rr_policy, glb_policy->base.request_reresolution); glb_policy->base.request_reresolution = nullptr; glb_policy->rr_policy = new_rr_policy; grpc_error* rr_state_error = nullptr; const grpc_connectivity_state rr_state = - grpc_lb_policy_check_connectivity_locked(exec_ctx, glb_policy->rr_policy, + grpc_lb_policy_check_connectivity_locked(glb_policy->rr_policy, &rr_state_error); /* Connectivity state is a function of the RR policy updated/created */ - update_lb_connectivity_status_locked(exec_ctx, glb_policy, rr_state, - rr_state_error); + update_lb_connectivity_status_locked(glb_policy, rr_state, rr_state_error); /* Add the gRPC LB's interested_parties pollset_set to that of the newly * created RR policy. This will make the RR policy progress upon activity on * gRPC LB, which in turn is tied to the application's call */ - grpc_pollset_set_add_pollset_set(exec_ctx, - glb_policy->rr_policy->interested_parties, + grpc_pollset_set_add_pollset_set(glb_policy->rr_policy->interested_parties, glb_policy->base.interested_parties); /* Allocate the data for the tracking of the new RR policy's connectivity. @@ -796,10 +789,10 @@ static void create_rr_locked(grpc_exec_ctx* exec_ctx, glb_lb_policy* glb_policy, /* Subscribe to changes to the connectivity of the new RR */ GRPC_LB_POLICY_WEAK_REF(&glb_policy->base, "glb_rr_connectivity_cb"); - grpc_lb_policy_notify_on_state_change_locked(exec_ctx, glb_policy->rr_policy, + grpc_lb_policy_notify_on_state_change_locked(glb_policy->rr_policy, &rr_connectivity->state, &rr_connectivity->on_change); - grpc_lb_policy_exit_idle_locked(exec_ctx, glb_policy->rr_policy); + grpc_lb_policy_exit_idle_locked(glb_policy->rr_policy); /* Update picks and pings in wait */ pending_pick* pp; @@ -814,7 +807,7 @@ static void create_rr_locked(grpc_exec_ctx* exec_ctx, glb_lb_policy* glb_policy, "[grpclb %p] Pending pick about to (async) PICK from RR %p", glb_policy, glb_policy->rr_policy); } - pick_from_internal_rr_locked(exec_ctx, glb_policy, &pp->pick_args, + pick_from_internal_rr_locked(glb_policy, &pp->pick_args, true /* force_async */, pp->target, &pp->wrapped_on_complete_arg); } @@ -828,40 +821,37 @@ static void create_rr_locked(grpc_exec_ctx* exec_ctx, glb_lb_policy* glb_policy, gpr_log(GPR_INFO, "[grpclb %p] Pending ping about to PING from RR %p", glb_policy, glb_policy->rr_policy); } - grpc_lb_policy_ping_one_locked(exec_ctx, glb_policy->rr_policy, + grpc_lb_policy_ping_one_locked(glb_policy->rr_policy, &pping->wrapped_notify_arg.wrapper_closure); } } -/* glb_policy->rr_policy may be NULL (initial handover) */ -static void rr_handover_locked(grpc_exec_ctx* exec_ctx, - glb_lb_policy* glb_policy) { +/* glb_policy->rr_policy may be nullptr (initial handover) */ +static void rr_handover_locked(glb_lb_policy* glb_policy) { if (glb_policy->shutting_down) return; - grpc_lb_policy_args* args = lb_policy_args_create(exec_ctx, glb_policy); + grpc_lb_policy_args* args = lb_policy_args_create(glb_policy); GPR_ASSERT(args != nullptr); if (glb_policy->rr_policy != nullptr) { if (grpc_lb_glb_trace.enabled()) { gpr_log(GPR_DEBUG, "[grpclb %p] Updating RR policy %p", glb_policy, glb_policy->rr_policy); } - grpc_lb_policy_update_locked(exec_ctx, glb_policy->rr_policy, args); + grpc_lb_policy_update_locked(glb_policy->rr_policy, args); } else { - create_rr_locked(exec_ctx, glb_policy, args); + create_rr_locked(glb_policy, args); if (grpc_lb_glb_trace.enabled()) { gpr_log(GPR_DEBUG, "[grpclb %p] Created new RR policy %p", glb_policy, glb_policy->rr_policy); } } - lb_policy_args_destroy(exec_ctx, args); + lb_policy_args_destroy(args); } -static void glb_rr_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, - void* arg, grpc_error* error) { +static void glb_rr_connectivity_changed_locked(void* arg, grpc_error* error) { rr_connectivity_data* rr_connectivity = (rr_connectivity_data*)arg; glb_lb_policy* glb_policy = rr_connectivity->glb_policy; if (glb_policy->shutting_down) { - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, - "glb_rr_connectivity_cb"); + GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "glb_rr_connectivity_cb"); gpr_free(rr_connectivity); return; } @@ -869,25 +859,22 @@ static void glb_rr_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, /* An RR policy that has transitioned into the SHUTDOWN connectivity state * should not be considered for picks or updates: the SHUTDOWN state is a * sink, policies can't transition back from it. .*/ - GRPC_LB_POLICY_UNREF(exec_ctx, glb_policy->rr_policy, - "rr_connectivity_shutdown"); + GRPC_LB_POLICY_UNREF(glb_policy->rr_policy, "rr_connectivity_shutdown"); glb_policy->rr_policy = nullptr; - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, - "glb_rr_connectivity_cb"); + GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "glb_rr_connectivity_cb"); gpr_free(rr_connectivity); return; } /* rr state != SHUTDOWN && !glb_policy->shutting down: biz as usual */ - update_lb_connectivity_status_locked( - exec_ctx, glb_policy, rr_connectivity->state, GRPC_ERROR_REF(error)); + update_lb_connectivity_status_locked(glb_policy, rr_connectivity->state, + GRPC_ERROR_REF(error)); /* Resubscribe. Reuse the "glb_rr_connectivity_cb" weak ref. */ - grpc_lb_policy_notify_on_state_change_locked(exec_ctx, glb_policy->rr_policy, + grpc_lb_policy_notify_on_state_change_locked(glb_policy->rr_policy, &rr_connectivity->state, &rr_connectivity->on_change); } -static void destroy_balancer_name(grpc_exec_ctx* exec_ctx, - void* balancer_name) { +static void destroy_balancer_name(void* balancer_name) { gpr_free(balancer_name); } @@ -914,7 +901,7 @@ static int balancer_name_cmp_fn(void* a, void* b) { * above the grpclb policy. * - \a args: other args inherited from the grpclb policy. */ static grpc_channel_args* build_lb_channel_args( - grpc_exec_ctx* exec_ctx, const grpc_lb_addresses* addresses, + const grpc_lb_addresses* addresses, grpc_fake_resolver_response_generator* response_generator, const grpc_channel_args* args) { size_t num_grpclb_addrs = 0; @@ -957,7 +944,7 @@ static grpc_channel_args* build_lb_channel_args( gpr_free(targets_info_entries); grpc_channel_args* lb_channel_args = - grpc_lb_policy_grpclb_build_lb_channel_args(exec_ctx, targets_info, + grpc_lb_policy_grpclb_build_lb_channel_args(targets_info, response_generator, args); grpc_arg lb_channel_addresses_arg = @@ -965,34 +952,34 @@ static grpc_channel_args* build_lb_channel_args( grpc_channel_args* result = grpc_channel_args_copy_and_add( lb_channel_args, &lb_channel_addresses_arg, 1); - grpc_slice_hash_table_unref(exec_ctx, targets_info); - grpc_channel_args_destroy(exec_ctx, lb_channel_args); - grpc_lb_addresses_destroy(exec_ctx, lb_addresses); + grpc_slice_hash_table_unref(targets_info); + grpc_channel_args_destroy(lb_channel_args); + grpc_lb_addresses_destroy(lb_addresses); return result; } -static void glb_destroy(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { +static void glb_destroy(grpc_lb_policy* pol) { glb_lb_policy* glb_policy = (glb_lb_policy*)pol; GPR_ASSERT(glb_policy->pending_picks == nullptr); GPR_ASSERT(glb_policy->pending_pings == nullptr); gpr_free((void*)glb_policy->server_name); - grpc_channel_args_destroy(exec_ctx, glb_policy->args); + grpc_channel_args_destroy(glb_policy->args); if (glb_policy->client_stats != nullptr) { grpc_grpclb_client_stats_unref(glb_policy->client_stats); } - grpc_connectivity_state_destroy(exec_ctx, &glb_policy->state_tracker); + grpc_connectivity_state_destroy(&glb_policy->state_tracker); if (glb_policy->serverlist != nullptr) { grpc_grpclb_destroy_serverlist(glb_policy->serverlist); } if (glb_policy->fallback_backend_addresses != nullptr) { - grpc_lb_addresses_destroy(exec_ctx, glb_policy->fallback_backend_addresses); + grpc_lb_addresses_destroy(glb_policy->fallback_backend_addresses); } grpc_fake_resolver_response_generator_unref(glb_policy->response_generator); grpc_subchannel_index_unref(); gpr_free(glb_policy); } -static void glb_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { +static void glb_shutdown_locked(grpc_lb_policy* pol) { glb_lb_policy* glb_policy = (glb_lb_policy*)pol; grpc_error* error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Channel shutdown"); glb_policy->shutting_down = true; @@ -1011,11 +998,11 @@ static void glb_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { /* lb_on_server_status_received will pick up the cancel and clean up */ } if (glb_policy->retry_timer_active) { - grpc_timer_cancel(exec_ctx, &glb_policy->lb_call_retry_timer); + grpc_timer_cancel(&glb_policy->lb_call_retry_timer); glb_policy->retry_timer_active = false; } if (glb_policy->fallback_timer_active) { - grpc_timer_cancel(exec_ctx, &glb_policy->lb_fallback_timer); + grpc_timer_cancel(&glb_policy->lb_fallback_timer); glb_policy->fallback_timer_active = false; } @@ -1024,10 +1011,9 @@ static void glb_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { pending_ping* pping = glb_policy->pending_pings; glb_policy->pending_pings = nullptr; if (glb_policy->rr_policy != nullptr) { - GRPC_LB_POLICY_UNREF(exec_ctx, glb_policy->rr_policy, "glb_shutdown"); + GRPC_LB_POLICY_UNREF(glb_policy->rr_policy, "glb_shutdown"); } else { - grpc_lb_policy_try_reresolve(exec_ctx, pol, &grpc_lb_glb_trace, - GRPC_ERROR_CANCELLED); + grpc_lb_policy_try_reresolve(pol, &grpc_lb_glb_trace, GRPC_ERROR_CANCELLED); } // We destroy the LB channel here because // glb_lb_channel_on_connectivity_changed_cb needs a valid glb_policy @@ -1037,14 +1023,13 @@ static void glb_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { grpc_channel_destroy(glb_policy->lb_channel); glb_policy->lb_channel = nullptr; } - grpc_connectivity_state_set(exec_ctx, &glb_policy->state_tracker, - GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_REF(error), - "glb_shutdown"); + grpc_connectivity_state_set(&glb_policy->state_tracker, GRPC_CHANNEL_SHUTDOWN, + GRPC_ERROR_REF(error), "glb_shutdown"); while (pp != nullptr) { pending_pick* next = pp->next; *pp->target = nullptr; - GRPC_CLOSURE_SCHED(exec_ctx, &pp->wrapped_on_complete_arg.wrapper_closure, + GRPC_CLOSURE_SCHED(&pp->wrapped_on_complete_arg.wrapper_closure, GRPC_ERROR_REF(error)); gpr_free(pp); pp = next; @@ -1052,7 +1037,7 @@ static void glb_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { while (pping != nullptr) { pending_ping* next = pping->next; - GRPC_CLOSURE_SCHED(exec_ctx, &pping->wrapped_notify_arg.wrapper_closure, + GRPC_CLOSURE_SCHED(&pping->wrapped_notify_arg.wrapper_closure, GRPC_ERROR_REF(error)); gpr_free(pping); pping = next; @@ -1069,8 +1054,8 @@ static void glb_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { // pick needs also be cancelled by the RR instance. // - Otherwise, without an RR instance, picks stay pending at this policy's // level (grpclb), inside the glb_policy->pending_picks list. To cancel these, -// we invoke the completion closure and set *target to NULL right here. -static void glb_cancel_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, +// we invoke the completion closure and set *target to nullptr right here. +static void glb_cancel_pick_locked(grpc_lb_policy* pol, grpc_connected_subchannel** target, grpc_error* error) { glb_lb_policy* glb_policy = (glb_lb_policy*)pol; @@ -1080,7 +1065,7 @@ static void glb_cancel_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, pending_pick* next = pp->next; if (pp->target == target) { *target = nullptr; - GRPC_CLOSURE_SCHED(exec_ctx, &pp->wrapped_on_complete_arg.wrapper_closure, + GRPC_CLOSURE_SCHED(&pp->wrapped_on_complete_arg.wrapper_closure, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Pick Cancelled", &error, 1)); } else { @@ -1090,7 +1075,7 @@ static void glb_cancel_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, pp = next; } if (glb_policy->rr_policy != nullptr) { - grpc_lb_policy_cancel_pick_locked(exec_ctx, glb_policy->rr_policy, target, + grpc_lb_policy_cancel_pick_locked(glb_policy->rr_policy, target, GRPC_ERROR_REF(error)); } GRPC_ERROR_UNREF(error); @@ -1105,9 +1090,8 @@ static void glb_cancel_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, // pick needs also be cancelled by the RR instance. // - Otherwise, without an RR instance, picks stay pending at this policy's // level (grpclb), inside the glb_policy->pending_picks list. To cancel these, -// we invoke the completion closure and set *target to NULL right here. -static void glb_cancel_picks_locked(grpc_exec_ctx* exec_ctx, - grpc_lb_policy* pol, +// we invoke the completion closure and set *target to nullptr right here. +static void glb_cancel_picks_locked(grpc_lb_policy* pol, uint32_t initial_metadata_flags_mask, uint32_t initial_metadata_flags_eq, grpc_error* error) { @@ -1118,7 +1102,7 @@ static void glb_cancel_picks_locked(grpc_exec_ctx* exec_ctx, pending_pick* next = pp->next; if ((pp->pick_args.initial_metadata_flags & initial_metadata_flags_mask) == initial_metadata_flags_eq) { - GRPC_CLOSURE_SCHED(exec_ctx, &pp->wrapped_on_complete_arg.wrapper_closure, + GRPC_CLOSURE_SCHED(&pp->wrapped_on_complete_arg.wrapper_closure, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Pick Cancelled", &error, 1)); } else { @@ -1129,52 +1113,49 @@ static void glb_cancel_picks_locked(grpc_exec_ctx* exec_ctx, } if (glb_policy->rr_policy != nullptr) { grpc_lb_policy_cancel_picks_locked( - exec_ctx, glb_policy->rr_policy, initial_metadata_flags_mask, + glb_policy->rr_policy, initial_metadata_flags_mask, initial_metadata_flags_eq, GRPC_ERROR_REF(error)); } GRPC_ERROR_UNREF(error); } -static void lb_on_fallback_timer_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error); -static void query_for_backends_locked(grpc_exec_ctx* exec_ctx, - glb_lb_policy* glb_policy); -static void start_picking_locked(grpc_exec_ctx* exec_ctx, - glb_lb_policy* glb_policy) { +static void lb_on_fallback_timer_locked(void* arg, grpc_error* error); +static void query_for_backends_locked(glb_lb_policy* glb_policy); +static void start_picking_locked(glb_lb_policy* glb_policy) { /* start a timer to fall back */ if (glb_policy->lb_fallback_timeout_ms > 0 && glb_policy->serverlist == nullptr && !glb_policy->fallback_timer_active) { grpc_millis deadline = - grpc_exec_ctx_now(exec_ctx) + glb_policy->lb_fallback_timeout_ms; + grpc_core::ExecCtx::Get()->Now() + glb_policy->lb_fallback_timeout_ms; GRPC_LB_POLICY_WEAK_REF(&glb_policy->base, "grpclb_fallback_timer"); GRPC_CLOSURE_INIT(&glb_policy->lb_on_fallback, lb_on_fallback_timer_locked, glb_policy, grpc_combiner_scheduler(glb_policy->base.combiner)); glb_policy->fallback_timer_active = true; - grpc_timer_init(exec_ctx, &glb_policy->lb_fallback_timer, deadline, + grpc_timer_init(&glb_policy->lb_fallback_timer, deadline, &glb_policy->lb_on_fallback); } glb_policy->started_picking = true; grpc_backoff_reset(&glb_policy->lb_call_backoff_state); - query_for_backends_locked(exec_ctx, glb_policy); + query_for_backends_locked(glb_policy); } -static void glb_exit_idle_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { +static void glb_exit_idle_locked(grpc_lb_policy* pol) { glb_lb_policy* glb_policy = (glb_lb_policy*)pol; if (!glb_policy->started_picking) { - start_picking_locked(exec_ctx, glb_policy); + start_picking_locked(glb_policy); } } -static int glb_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, +static int glb_pick_locked(grpc_lb_policy* pol, const grpc_lb_policy_pick_args* pick_args, grpc_connected_subchannel** target, grpc_call_context_element* context, void** user_data, grpc_closure* on_complete) { if (pick_args->lb_token_mdelem_storage == nullptr) { *target = nullptr; - GRPC_CLOSURE_SCHED(exec_ctx, on_complete, + GRPC_CLOSURE_SCHED(on_complete, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "No mdelem storage for the LB token. Load reporting " "won't work without it. Failing")); @@ -1184,8 +1165,8 @@ static int glb_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, bool pick_done = false; if (glb_policy->rr_policy != nullptr) { const grpc_connectivity_state rr_connectivity_state = - grpc_lb_policy_check_connectivity_locked( - exec_ctx, glb_policy->rr_policy, nullptr); + grpc_lb_policy_check_connectivity_locked(glb_policy->rr_policy, + nullptr); // The glb_policy->rr_policy may have transitioned to SHUTDOWN but the // callback registered to capture this event // (glb_rr_connectivity_changed_locked) may not have been invoked yet. We @@ -1222,9 +1203,8 @@ static int glb_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, wc_arg->initial_metadata = pick_args->initial_metadata; wc_arg->free_when_done = wc_arg; wc_arg->glb_policy = pol; - pick_done = - pick_from_internal_rr_locked(exec_ctx, glb_policy, pick_args, - false /* force_async */, target, wc_arg); + pick_done = pick_from_internal_rr_locked( + glb_policy, pick_args, false /* force_async */, target, wc_arg); } } else { // glb_policy->rr_policy == NULL if (grpc_lb_glb_trace.enabled()) { @@ -1235,7 +1215,7 @@ static int glb_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, add_pending_pick(&glb_policy->pending_picks, pick_args, target, context, on_complete); if (!glb_policy->started_picking) { - start_picking_locked(exec_ctx, glb_policy); + start_picking_locked(glb_policy); } pick_done = false; } @@ -1243,37 +1223,33 @@ static int glb_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, } static grpc_connectivity_state glb_check_connectivity_locked( - grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, - grpc_error** connectivity_error) { + grpc_lb_policy* pol, grpc_error** connectivity_error) { glb_lb_policy* glb_policy = (glb_lb_policy*)pol; return grpc_connectivity_state_get(&glb_policy->state_tracker, connectivity_error); } -static void glb_ping_one_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, - grpc_closure* closure) { +static void glb_ping_one_locked(grpc_lb_policy* pol, grpc_closure* closure) { glb_lb_policy* glb_policy = (glb_lb_policy*)pol; if (glb_policy->rr_policy) { - grpc_lb_policy_ping_one_locked(exec_ctx, glb_policy->rr_policy, closure); + grpc_lb_policy_ping_one_locked(glb_policy->rr_policy, closure); } else { add_pending_ping(&glb_policy->pending_pings, closure); if (!glb_policy->started_picking) { - start_picking_locked(exec_ctx, glb_policy); + start_picking_locked(glb_policy); } } } -static void glb_notify_on_state_change_locked(grpc_exec_ctx* exec_ctx, - grpc_lb_policy* pol, +static void glb_notify_on_state_change_locked(grpc_lb_policy* pol, grpc_connectivity_state* current, grpc_closure* notify) { glb_lb_policy* glb_policy = (glb_lb_policy*)pol; - grpc_connectivity_state_notify_on_state_change( - exec_ctx, &glb_policy->state_tracker, current, notify); + grpc_connectivity_state_notify_on_state_change(&glb_policy->state_tracker, + current, notify); } -static void lb_call_on_retry_timer_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void lb_call_on_retry_timer_locked(void* arg, grpc_error* error) { glb_lb_policy* glb_policy = (glb_lb_policy*)arg; glb_policy->retry_timer_active = false; if (!glb_policy->shutting_down && glb_policy->lb_call == nullptr && @@ -1281,28 +1257,26 @@ static void lb_call_on_retry_timer_locked(grpc_exec_ctx* exec_ctx, void* arg, if (grpc_lb_glb_trace.enabled()) { gpr_log(GPR_INFO, "[grpclb %p] Restarting call to LB server", glb_policy); } - query_for_backends_locked(exec_ctx, glb_policy); + query_for_backends_locked(glb_policy); } - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, "grpclb_retry_timer"); + GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "grpclb_retry_timer"); } -static void maybe_restart_lb_call(grpc_exec_ctx* exec_ctx, - glb_lb_policy* glb_policy) { +static void maybe_restart_lb_call(glb_lb_policy* glb_policy) { if (glb_policy->started_picking && glb_policy->updating_lb_call) { if (glb_policy->retry_timer_active) { - grpc_timer_cancel(exec_ctx, &glb_policy->lb_call_retry_timer); + grpc_timer_cancel(&glb_policy->lb_call_retry_timer); } - if (!glb_policy->shutting_down) start_picking_locked(exec_ctx, glb_policy); + if (!glb_policy->shutting_down) start_picking_locked(glb_policy); glb_policy->updating_lb_call = false; } else if (!glb_policy->shutting_down) { /* if we aren't shutting down, restart the LB client call after some time */ - grpc_millis next_try = - grpc_backoff_step(exec_ctx, &glb_policy->lb_call_backoff_state) - .next_attempt_start_time; + grpc_millis next_try = grpc_backoff_step(&glb_policy->lb_call_backoff_state) + .next_attempt_start_time; if (grpc_lb_glb_trace.enabled()) { gpr_log(GPR_DEBUG, "[grpclb %p] Connection to LB server lost...", glb_policy); - grpc_millis timeout = next_try - grpc_exec_ctx_now(exec_ctx); + grpc_millis timeout = next_try - grpc_core::ExecCtx::Get()->Now(); if (timeout > 0) { gpr_log(GPR_DEBUG, "[grpclb %p] ... retry_timer_active in %" PRIuPTR "ms.", @@ -1317,43 +1291,40 @@ static void maybe_restart_lb_call(grpc_exec_ctx* exec_ctx, lb_call_on_retry_timer_locked, glb_policy, grpc_combiner_scheduler(glb_policy->base.combiner)); glb_policy->retry_timer_active = true; - grpc_timer_init(exec_ctx, &glb_policy->lb_call_retry_timer, next_try, + grpc_timer_init(&glb_policy->lb_call_retry_timer, next_try, &glb_policy->lb_on_call_retry); } - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, + GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "lb_on_server_status_received_locked"); } -static void send_client_load_report_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error); +static void send_client_load_report_locked(void* arg, grpc_error* error); -static void schedule_next_client_load_report(grpc_exec_ctx* exec_ctx, - glb_lb_policy* glb_policy) { +static void schedule_next_client_load_report(glb_lb_policy* glb_policy) { const grpc_millis next_client_load_report_time = - grpc_exec_ctx_now(exec_ctx) + glb_policy->client_stats_report_interval; + grpc_core::ExecCtx::Get()->Now() + + glb_policy->client_stats_report_interval; GRPC_CLOSURE_INIT(&glb_policy->client_load_report_closure, send_client_load_report_locked, glb_policy, grpc_combiner_scheduler(glb_policy->base.combiner)); - grpc_timer_init(exec_ctx, &glb_policy->client_load_report_timer, + grpc_timer_init(&glb_policy->client_load_report_timer, next_client_load_report_time, &glb_policy->client_load_report_closure); } -static void client_load_report_done_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void client_load_report_done_locked(void* arg, grpc_error* error) { glb_lb_policy* glb_policy = (glb_lb_policy*)arg; grpc_byte_buffer_destroy(glb_policy->client_load_report_payload); glb_policy->client_load_report_payload = nullptr; if (error != GRPC_ERROR_NONE || glb_policy->lb_call == nullptr) { glb_policy->client_load_report_timer_pending = false; - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, - "client_load_report"); + GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "client_load_report"); if (glb_policy->lb_call == nullptr) { - maybe_restart_lb_call(exec_ctx, glb_policy); + maybe_restart_lb_call(glb_policy); } return; } - schedule_next_client_load_report(exec_ctx, glb_policy); + schedule_next_client_load_report(glb_policy); } static bool load_report_counters_are_zero(grpc_grpclb_request* request) { @@ -1368,15 +1339,13 @@ static bool load_report_counters_are_zero(grpc_grpclb_request* request) { (drop_entries == nullptr || drop_entries->num_entries == 0); } -static void send_client_load_report_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void send_client_load_report_locked(void* arg, grpc_error* error) { glb_lb_policy* glb_policy = (glb_lb_policy*)arg; if (error == GRPC_ERROR_CANCELLED || glb_policy->lb_call == nullptr) { glb_policy->client_load_report_timer_pending = false; - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, - "client_load_report"); + GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "client_load_report"); if (glb_policy->lb_call == nullptr) { - maybe_restart_lb_call(exec_ctx, glb_policy); + maybe_restart_lb_call(glb_policy); } return; } @@ -1389,7 +1358,7 @@ static void send_client_load_report_locked(grpc_exec_ctx* exec_ctx, void* arg, if (load_report_counters_are_zero(request)) { if (glb_policy->last_client_load_report_counters_were_zero) { grpc_grpclb_request_destroy(request); - schedule_next_client_load_report(exec_ctx, glb_policy); + schedule_next_client_load_report(glb_policy); return; } glb_policy->last_client_load_report_counters_were_zero = true; @@ -1399,7 +1368,7 @@ static void send_client_load_report_locked(grpc_exec_ctx* exec_ctx, void* arg, grpc_slice request_payload_slice = grpc_grpclb_request_encode(request); glb_policy->client_load_report_payload = grpc_raw_byte_buffer_create(&request_payload_slice, 1); - grpc_slice_unref_internal(exec_ctx, request_payload_slice); + grpc_slice_unref_internal(request_payload_slice); grpc_grpclb_request_destroy(request); // Send load report message. grpc_op op; @@ -1410,20 +1379,16 @@ static void send_client_load_report_locked(grpc_exec_ctx* exec_ctx, void* arg, client_load_report_done_locked, glb_policy, grpc_combiner_scheduler(glb_policy->base.combiner)); grpc_call_error call_error = grpc_call_start_batch_and_execute( - exec_ctx, glb_policy->lb_call, &op, 1, - &glb_policy->client_load_report_closure); + glb_policy->lb_call, &op, 1, &glb_policy->client_load_report_closure); if (call_error != GRPC_CALL_OK) { gpr_log(GPR_ERROR, "[grpclb %p] call_error=%d", glb_policy, call_error); GPR_ASSERT(GRPC_CALL_OK == call_error); } } -static void lb_on_server_status_received_locked(grpc_exec_ctx* exec_ctx, - void* arg, grpc_error* error); -static void lb_on_response_received_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error); -static void lb_call_init_locked(grpc_exec_ctx* exec_ctx, - glb_lb_policy* glb_policy) { +static void lb_on_server_status_received_locked(void* arg, grpc_error* error); +static void lb_on_response_received_locked(void* arg, grpc_error* error); +static void lb_call_init_locked(glb_lb_policy* glb_policy) { GPR_ASSERT(glb_policy->server_name != nullptr); GPR_ASSERT(glb_policy->server_name[0] != '\0'); GPR_ASSERT(glb_policy->lb_call == nullptr); @@ -1436,13 +1401,13 @@ static void lb_call_init_locked(grpc_exec_ctx* exec_ctx, grpc_millis deadline = glb_policy->lb_call_timeout_ms == 0 ? GRPC_MILLIS_INF_FUTURE - : grpc_exec_ctx_now(exec_ctx) + glb_policy->lb_call_timeout_ms; + : grpc_core::ExecCtx::Get()->Now() + glb_policy->lb_call_timeout_ms; glb_policy->lb_call = grpc_channel_create_pollset_set_call( - exec_ctx, glb_policy->lb_channel, nullptr, GRPC_PROPAGATE_DEFAULTS, + glb_policy->lb_channel, nullptr, GRPC_PROPAGATE_DEFAULTS, glb_policy->base.interested_parties, GRPC_MDSTR_SLASH_GRPC_DOT_LB_DOT_V1_DOT_LOADBALANCER_SLASH_BALANCELOAD, &host, deadline, nullptr); - grpc_slice_unref_internal(exec_ctx, host); + grpc_slice_unref_internal(host); if (glb_policy->client_stats != nullptr) { grpc_grpclb_client_stats_unref(glb_policy->client_stats); @@ -1457,7 +1422,7 @@ static void lb_call_init_locked(grpc_exec_ctx* exec_ctx, grpc_slice request_payload_slice = grpc_grpclb_request_encode(request); glb_policy->lb_request_payload = grpc_raw_byte_buffer_create(&request_payload_slice, 1); - grpc_slice_unref_internal(exec_ctx, request_payload_slice); + grpc_slice_unref_internal(request_payload_slice); grpc_grpclb_request_destroy(request); GRPC_CLOSURE_INIT(&glb_policy->lb_on_server_status_received, @@ -1478,8 +1443,7 @@ static void lb_call_init_locked(grpc_exec_ctx* exec_ctx, glb_policy->last_client_load_report_counters_were_zero = false; } -static void lb_call_destroy_locked(grpc_exec_ctx* exec_ctx, - glb_lb_policy* glb_policy) { +static void lb_call_destroy_locked(glb_lb_policy* glb_policy) { GPR_ASSERT(glb_policy->lb_call != nullptr); grpc_call_unref(glb_policy->lb_call); glb_policy->lb_call = nullptr; @@ -1488,22 +1452,21 @@ static void lb_call_destroy_locked(grpc_exec_ctx* exec_ctx, grpc_metadata_array_destroy(&glb_policy->lb_trailing_metadata_recv); grpc_byte_buffer_destroy(glb_policy->lb_request_payload); - grpc_slice_unref_internal(exec_ctx, glb_policy->lb_call_status_details); + grpc_slice_unref_internal(glb_policy->lb_call_status_details); if (glb_policy->client_load_report_timer_pending) { - grpc_timer_cancel(exec_ctx, &glb_policy->client_load_report_timer); + grpc_timer_cancel(&glb_policy->client_load_report_timer); } } /* * Auxiliary functions and LB client callbacks. */ -static void query_for_backends_locked(grpc_exec_ctx* exec_ctx, - glb_lb_policy* glb_policy) { +static void query_for_backends_locked(glb_lb_policy* glb_policy) { GPR_ASSERT(glb_policy->lb_channel != nullptr); if (glb_policy->shutting_down) return; - lb_call_init_locked(exec_ctx, glb_policy); + lb_call_init_locked(glb_policy); if (grpc_lb_glb_trace.enabled()) { gpr_log(GPR_INFO, @@ -1534,8 +1497,8 @@ static void query_for_backends_locked(grpc_exec_ctx* exec_ctx, op->flags = 0; op->reserved = nullptr; op++; - call_error = grpc_call_start_batch_and_execute( - exec_ctx, glb_policy->lb_call, ops, (size_t)(op - ops), nullptr); + call_error = grpc_call_start_batch_and_execute(glb_policy->lb_call, ops, + (size_t)(op - ops), nullptr); GPR_ASSERT(GRPC_CALL_OK == call_error); op = ops; @@ -1553,7 +1516,7 @@ static void query_for_backends_locked(grpc_exec_ctx* exec_ctx, GRPC_LB_POLICY_WEAK_REF(&glb_policy->base, "lb_on_server_status_received_locked"); call_error = grpc_call_start_batch_and_execute( - exec_ctx, glb_policy->lb_call, ops, (size_t)(op - ops), + glb_policy->lb_call, ops, (size_t)(op - ops), &glb_policy->lb_on_server_status_received); GPR_ASSERT(GRPC_CALL_OK == call_error); @@ -1567,13 +1530,12 @@ static void query_for_backends_locked(grpc_exec_ctx* exec_ctx, * lb_on_response_received_locked */ GRPC_LB_POLICY_WEAK_REF(&glb_policy->base, "lb_on_response_received_locked"); call_error = grpc_call_start_batch_and_execute( - exec_ctx, glb_policy->lb_call, ops, (size_t)(op - ops), + glb_policy->lb_call, ops, (size_t)(op - ops), &glb_policy->lb_on_response_received); GPR_ASSERT(GRPC_CALL_OK == call_error); } -static void lb_on_response_received_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void lb_on_response_received_locked(void* arg, grpc_error* error) { glb_lb_policy* glb_policy = (glb_lb_policy*)arg; grpc_op ops[2]; memset(ops, 0, sizeof(ops)); @@ -1607,7 +1569,7 @@ static void lb_on_response_received_locked(grpc_exec_ctx* exec_ctx, void* arg, * send_client_load_report_locked() */ glb_policy->client_load_report_timer_pending = true; GRPC_LB_POLICY_WEAK_REF(&glb_policy->base, "client_load_report"); - schedule_next_client_load_report(exec_ctx, glb_policy); + schedule_next_client_load_report(glb_policy); } else if (grpc_lb_glb_trace.enabled()) { gpr_log(GPR_INFO, "[grpclb %p] Received initial LB response message; client load " @@ -1652,11 +1614,10 @@ static void lb_on_response_received_locked(grpc_exec_ctx* exec_ctx, void* arg, grpc_grpclb_destroy_serverlist(glb_policy->serverlist); } else { /* or dispose of the fallback */ - grpc_lb_addresses_destroy(exec_ctx, - glb_policy->fallback_backend_addresses); + grpc_lb_addresses_destroy(glb_policy->fallback_backend_addresses); glb_policy->fallback_backend_addresses = nullptr; if (glb_policy->fallback_timer_active) { - grpc_timer_cancel(exec_ctx, &glb_policy->lb_fallback_timer); + grpc_timer_cancel(&glb_policy->lb_fallback_timer); glb_policy->fallback_timer_active = false; } } @@ -1665,7 +1626,7 @@ static void lb_on_response_received_locked(grpc_exec_ctx* exec_ctx, void* arg, * update or in glb_destroy() */ glb_policy->serverlist = serverlist; glb_policy->serverlist_index = 0; - rr_handover_locked(exec_ctx, glb_policy); + rr_handover_locked(glb_policy); } } else { if (grpc_lb_glb_trace.enabled()) { @@ -1675,14 +1636,14 @@ static void lb_on_response_received_locked(grpc_exec_ctx* exec_ctx, void* arg, } grpc_grpclb_destroy_serverlist(serverlist); } - } else { /* serverlist == NULL */ + } else { /* serverlist == nullptr */ gpr_log(GPR_ERROR, "[grpclb %p] Invalid LB response received: '%s'. Ignoring.", glb_policy, grpc_dump_slice(response_slice, GPR_DUMP_ASCII | GPR_DUMP_HEX)); } } - grpc_slice_unref_internal(exec_ctx, response_slice); + grpc_slice_unref_internal(response_slice); if (!glb_policy->shutting_down) { /* keep listening for serverlist updates */ op->op = GRPC_OP_RECV_MESSAGE; @@ -1693,23 +1654,22 @@ static void lb_on_response_received_locked(grpc_exec_ctx* exec_ctx, void* arg, /* reuse the "lb_on_response_received_locked" weak ref taken in * query_for_backends_locked() */ const grpc_call_error call_error = grpc_call_start_batch_and_execute( - exec_ctx, glb_policy->lb_call, ops, (size_t)(op - ops), + glb_policy->lb_call, ops, (size_t)(op - ops), &glb_policy->lb_on_response_received); /* loop */ GPR_ASSERT(GRPC_CALL_OK == call_error); } else { - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, + GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "lb_on_response_received_locked_shutdown"); } } else { /* empty payload: call cancelled. */ /* dispose of the "lb_on_response_received_locked" weak ref taken in * query_for_backends_locked() and reused in every reception loop */ - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, + GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "lb_on_response_received_locked_empty_payload"); } } -static void lb_on_fallback_timer_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void lb_on_fallback_timer_locked(void* arg, grpc_error* error) { glb_lb_policy* glb_policy = (glb_lb_policy*)arg; glb_policy->fallback_timer_active = false; /* If we receive a serverlist after the timer fires but before this callback @@ -1722,15 +1682,13 @@ static void lb_on_fallback_timer_locked(grpc_exec_ctx* exec_ctx, void* arg, glb_policy); } GPR_ASSERT(glb_policy->fallback_backend_addresses != nullptr); - rr_handover_locked(exec_ctx, glb_policy); + rr_handover_locked(glb_policy); } } - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, - "grpclb_fallback_timer"); + GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "grpclb_fallback_timer"); } -static void lb_on_server_status_received_locked(grpc_exec_ctx* exec_ctx, - void* arg, grpc_error* error) { +static void lb_on_server_status_received_locked(void* arg, grpc_error* error) { glb_lb_policy* glb_policy = (glb_lb_policy*)arg; GPR_ASSERT(glb_policy->lb_call != nullptr); if (grpc_lb_glb_trace.enabled()) { @@ -1744,29 +1702,28 @@ static void lb_on_server_status_received_locked(grpc_exec_ctx* exec_ctx, gpr_free(status_details); } /* We need to perform cleanups no matter what. */ - lb_call_destroy_locked(exec_ctx, glb_policy); + lb_call_destroy_locked(glb_policy); // If the load report timer is still pending, we wait for it to be // called before restarting the call. Otherwise, we restart the call // here. if (!glb_policy->client_load_report_timer_pending) { - maybe_restart_lb_call(exec_ctx, glb_policy); + maybe_restart_lb_call(glb_policy); } } -static void fallback_update_locked(grpc_exec_ctx* exec_ctx, - glb_lb_policy* glb_policy, +static void fallback_update_locked(glb_lb_policy* glb_policy, const grpc_lb_addresses* addresses) { GPR_ASSERT(glb_policy->fallback_backend_addresses != nullptr); - grpc_lb_addresses_destroy(exec_ctx, glb_policy->fallback_backend_addresses); + grpc_lb_addresses_destroy(glb_policy->fallback_backend_addresses); glb_policy->fallback_backend_addresses = - extract_backend_addresses_locked(exec_ctx, addresses); + extract_backend_addresses_locked(addresses); if (glb_policy->lb_fallback_timeout_ms > 0 && glb_policy->rr_policy != nullptr) { - rr_handover_locked(exec_ctx, glb_policy); + rr_handover_locked(glb_policy); } } -static void glb_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, +static void glb_update_locked(grpc_lb_policy* policy, const grpc_lb_policy_args* args) { glb_lb_policy* glb_policy = (glb_lb_policy*)policy; const grpc_arg* arg = @@ -1776,7 +1733,7 @@ static void glb_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, // If we don't have a current channel to the LB, go into TRANSIENT // FAILURE. grpc_connectivity_state_set( - exec_ctx, &glb_policy->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + &glb_policy->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Missing update in args"), "glb_update_missing"); } else { @@ -1793,16 +1750,16 @@ static void glb_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, // If a non-empty serverlist hasn't been received from the balancer, // propagate the update to fallback_backend_addresses. if (glb_policy->serverlist == nullptr) { - fallback_update_locked(exec_ctx, glb_policy, addresses); + fallback_update_locked(glb_policy, addresses); } GPR_ASSERT(glb_policy->lb_channel != nullptr); // Propagate updates to the LB channel (pick_first) through the fake // resolver. grpc_channel_args* lb_channel_args = build_lb_channel_args( - exec_ctx, addresses, glb_policy->response_generator, args->args); + addresses, glb_policy->response_generator, args->args); grpc_fake_resolver_response_generator_set_response( - exec_ctx, glb_policy->response_generator, lb_channel_args); - grpc_channel_args_destroy(exec_ctx, lb_channel_args); + glb_policy->response_generator, lb_channel_args); + grpc_channel_args_destroy(lb_channel_args); // Start watching the LB channel connectivity for connection, if not // already doing so. if (!glb_policy->watching_lb_channel) { @@ -1814,7 +1771,7 @@ static void glb_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, glb_policy->watching_lb_channel = true; GRPC_LB_POLICY_WEAK_REF(&glb_policy->base, "watch_lb_channel_connectivity"); grpc_client_channel_watch_connectivity_state( - exec_ctx, client_channel_elem, + client_channel_elem, grpc_polling_entity_create_from_pollset_set( glb_policy->base.interested_parties), &glb_policy->lb_channel_connectivity, @@ -1825,8 +1782,7 @@ static void glb_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, // Invoked as part of the update process. It continues watching the LB channel // until it shuts down or becomes READY. It's invoked even if the LB channel // stayed READY throughout the update (for example if the update is identical). -static void glb_lb_channel_on_connectivity_changed_cb(grpc_exec_ctx* exec_ctx, - void* arg, +static void glb_lb_channel_on_connectivity_changed_cb(void* arg, grpc_error* error) { glb_lb_policy* glb_policy = (glb_lb_policy*)arg; if (glb_policy->shutting_down) goto done; @@ -1842,7 +1798,7 @@ static void glb_lb_channel_on_connectivity_changed_cb(grpc_exec_ctx* exec_ctx, grpc_channel_get_channel_stack(glb_policy->lb_channel)); GPR_ASSERT(client_channel_elem->filter == &grpc_client_channel_filter); grpc_client_channel_watch_connectivity_state( - exec_ctx, client_channel_elem, + client_channel_elem, grpc_polling_entity_create_from_pollset_set( glb_policy->base.interested_parties), &glb_policy->lb_channel_connectivity, @@ -1861,29 +1817,28 @@ static void glb_lb_channel_on_connectivity_changed_cb(grpc_exec_ctx* exec_ctx, // lb_call. } else if (glb_policy->started_picking) { if (glb_policy->retry_timer_active) { - grpc_timer_cancel(exec_ctx, &glb_policy->lb_call_retry_timer); + grpc_timer_cancel(&glb_policy->lb_call_retry_timer); glb_policy->retry_timer_active = false; } - start_picking_locked(exec_ctx, glb_policy); + start_picking_locked(glb_policy); } /* fallthrough */ case GRPC_CHANNEL_SHUTDOWN: done: glb_policy->watching_lb_channel = false; - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &glb_policy->base, + GRPC_LB_POLICY_WEAK_UNREF(&glb_policy->base, "watch_lb_channel_connectivity_cb_shutdown"); break; } } static void glb_set_reresolve_closure_locked( - grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, - grpc_closure* request_reresolution) { + grpc_lb_policy* policy, grpc_closure* request_reresolution) { glb_lb_policy* glb_policy = (glb_lb_policy*)policy; GPR_ASSERT(!glb_policy->shutting_down); GPR_ASSERT(glb_policy->base.request_reresolution == nullptr); if (glb_policy->rr_policy != nullptr) { - grpc_lb_policy_set_reresolve_closure_locked(exec_ctx, glb_policy->rr_policy, + grpc_lb_policy_set_reresolve_closure_locked(glb_policy->rr_policy, request_reresolution); } else { glb_policy->base.request_reresolution = request_reresolution; @@ -1904,8 +1859,7 @@ static const grpc_lb_policy_vtable glb_lb_policy_vtable = { glb_update_locked, glb_set_reresolve_closure_locked}; -static grpc_lb_policy* glb_create(grpc_exec_ctx* exec_ctx, - grpc_lb_policy_factory* factory, +static grpc_lb_policy* glb_create(grpc_lb_policy_factory* factory, grpc_lb_policy_args* args) { /* Count the number of gRPC-LB addresses. There must be at least one. */ const grpc_arg* arg = @@ -1926,7 +1880,7 @@ static grpc_lb_policy* glb_create(grpc_exec_ctx* exec_ctx, arg = grpc_channel_args_find(args->args, GRPC_ARG_SERVER_URI); GPR_ASSERT(arg != nullptr); GPR_ASSERT(arg->type == GRPC_ARG_STRING); - grpc_uri* uri = grpc_uri_parse(exec_ctx, arg->value.string, true); + grpc_uri* uri = grpc_uri_parse(arg->value.string, true); GPR_ASSERT(uri->path[0] != '\0'); glb_policy->server_name = gpr_strdup(uri->path[0] == '/' ? uri->path + 1 : uri->path); @@ -1959,26 +1913,26 @@ static grpc_lb_policy* glb_create(grpc_exec_ctx* exec_ctx, /* Extract the backend addresses (may be empty) from the resolver for * fallback. */ glb_policy->fallback_backend_addresses = - extract_backend_addresses_locked(exec_ctx, addresses); + extract_backend_addresses_locked(addresses); /* Create a client channel over them to communicate with a LB service */ glb_policy->response_generator = grpc_fake_resolver_response_generator_create(); grpc_channel_args* lb_channel_args = build_lb_channel_args( - exec_ctx, addresses, glb_policy->response_generator, args->args); + addresses, glb_policy->response_generator, args->args); char* uri_str; gpr_asprintf(&uri_str, "fake:///%s", glb_policy->server_name); glb_policy->lb_channel = grpc_lb_policy_grpclb_create_lb_channel( - exec_ctx, uri_str, args->client_channel_factory, lb_channel_args); + uri_str, args->client_channel_factory, lb_channel_args); /* Propagate initial resolution */ grpc_fake_resolver_response_generator_set_response( - exec_ctx, glb_policy->response_generator, lb_channel_args); - grpc_channel_args_destroy(exec_ctx, lb_channel_args); + glb_policy->response_generator, lb_channel_args); + grpc_channel_args_destroy(lb_channel_args); gpr_free(uri_str); if (glb_policy->lb_channel == nullptr) { gpr_free((void*)glb_policy->server_name); - grpc_channel_args_destroy(exec_ctx, glb_policy->args); + grpc_channel_args_destroy(glb_policy->args); gpr_free(glb_policy); return nullptr; } @@ -2009,7 +1963,7 @@ grpc_lb_policy_factory* grpc_glb_lb_factory_create() { // Only add client_load_reporting filter if the grpclb LB policy is used. static bool maybe_add_client_load_reporting_filter( - grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, void* arg) { + grpc_channel_stack_builder* builder, void* arg) { const grpc_channel_args* args = grpc_channel_stack_builder_get_channel_arguments(builder); const grpc_arg* channel_arg = diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc index aacaec197dc..a8ecea42125 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc @@ -26,17 +26,17 @@ #include "src/core/lib/support/string.h" grpc_channel* grpc_lb_policy_grpclb_create_lb_channel( - grpc_exec_ctx* exec_ctx, const char* lb_service_target_addresses, + const char* lb_service_target_addresses, grpc_client_channel_factory* client_channel_factory, grpc_channel_args* args) { grpc_channel* lb_channel = grpc_client_channel_factory_create_channel( - exec_ctx, client_channel_factory, lb_service_target_addresses, + client_channel_factory, lb_service_target_addresses, GRPC_CLIENT_CHANNEL_TYPE_LOAD_BALANCING, args); return lb_channel; } grpc_channel_args* grpc_lb_policy_grpclb_build_lb_channel_args( - grpc_exec_ctx* exec_ctx, grpc_slice_hash_table* targets_info, + grpc_slice_hash_table* targets_info, grpc_fake_resolver_response_generator* response_generator, const grpc_channel_args* args) { const grpc_arg to_add[] = { diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h index 70b1c28b0da..56104b2ec05 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h @@ -31,12 +31,12 @@ * \a client_channel_factory will be used for the creation of the LB channel, * alongside the channel args passed in \a args. */ grpc_channel* grpc_lb_policy_grpclb_create_lb_channel( - grpc_exec_ctx* exec_ctx, const char* lb_service_target_addresses, + const char* lb_service_target_addresses, grpc_client_channel_factory* client_channel_factory, grpc_channel_args* args); grpc_channel_args* grpc_lb_policy_grpclb_build_lb_channel_args( - grpc_exec_ctx* exec_ctx, grpc_slice_hash_table* targets_info, + grpc_slice_hash_table* targets_info, grpc_fake_resolver_response_generator* response_generator, const grpc_channel_args* args); diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc index 8eaa90e97b6..76bcddf9453 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc @@ -29,7 +29,7 @@ #include "src/core/lib/support/string.h" grpc_channel* grpc_lb_policy_grpclb_create_lb_channel( - grpc_exec_ctx* exec_ctx, const char* lb_service_target_addresses, + const char* lb_service_target_addresses, grpc_client_channel_factory* client_channel_factory, grpc_channel_args* args) { grpc_channel_args* new_args = args; @@ -50,19 +50,19 @@ grpc_channel* grpc_lb_policy_grpclb_create_lb_channel( new_args = grpc_channel_args_copy_and_add_and_remove( args, keys_to_remove, GPR_ARRAY_SIZE(keys_to_remove), args_to_add, GPR_ARRAY_SIZE(args_to_add)); - grpc_channel_credentials_unref(exec_ctx, creds_sans_call_creds); + grpc_channel_credentials_unref(creds_sans_call_creds); } grpc_channel* lb_channel = grpc_client_channel_factory_create_channel( - exec_ctx, client_channel_factory, lb_service_target_addresses, + client_channel_factory, lb_service_target_addresses, GRPC_CLIENT_CHANNEL_TYPE_LOAD_BALANCING, new_args); if (channel_credentials != nullptr) { - grpc_channel_args_destroy(exec_ctx, new_args); + grpc_channel_args_destroy(new_args); } return lb_channel; } grpc_channel_args* grpc_lb_policy_grpclb_build_lb_channel_args( - grpc_exec_ctx* exec_ctx, grpc_slice_hash_table* targets_info, + grpc_slice_hash_table* targets_info, grpc_fake_resolver_response_generator* response_generator, const grpc_channel_args* args) { const grpc_arg to_add[] = { diff --git a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc index 228a77d9db7..5e75b64843b 100644 --- a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +++ b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc @@ -57,12 +57,12 @@ typedef struct { grpc_connectivity_state_tracker state_tracker; } pick_first_lb_policy; -static void pf_destroy(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { +static void pf_destroy(grpc_lb_policy* pol) { pick_first_lb_policy* p = (pick_first_lb_policy*)pol; GPR_ASSERT(p->subchannel_list == nullptr); GPR_ASSERT(p->latest_pending_subchannel_list == nullptr); GPR_ASSERT(p->pending_picks == nullptr); - grpc_connectivity_state_destroy(exec_ctx, &p->state_tracker); + grpc_connectivity_state_destroy(&p->state_tracker); gpr_free(p); grpc_subchannel_index_unref(); if (grpc_lb_pick_first_trace.enabled()) { @@ -70,7 +70,7 @@ static void pf_destroy(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { } } -static void pf_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { +static void pf_shutdown_locked(grpc_lb_policy* pol) { pick_first_lb_policy* p = (pick_first_lb_policy*)pol; grpc_error* error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Channel shutdown"); if (grpc_lb_pick_first_trace.enabled()) { @@ -81,28 +81,27 @@ static void pf_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { while ((pp = p->pending_picks) != nullptr) { p->pending_picks = pp->next; *pp->target = nullptr; - GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_REF(error)); gpr_free(pp); } - grpc_connectivity_state_set(exec_ctx, &p->state_tracker, - GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_REF(error), - "shutdown"); + grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_SHUTDOWN, + GRPC_ERROR_REF(error), "shutdown"); if (p->subchannel_list != nullptr) { - grpc_lb_subchannel_list_shutdown_and_unref(exec_ctx, p->subchannel_list, + grpc_lb_subchannel_list_shutdown_and_unref(p->subchannel_list, "pf_shutdown"); p->subchannel_list = nullptr; } if (p->latest_pending_subchannel_list != nullptr) { grpc_lb_subchannel_list_shutdown_and_unref( - exec_ctx, p->latest_pending_subchannel_list, "pf_shutdown"); + p->latest_pending_subchannel_list, "pf_shutdown"); p->latest_pending_subchannel_list = nullptr; } - grpc_lb_policy_try_reresolve(exec_ctx, &p->base, &grpc_lb_pick_first_trace, + grpc_lb_policy_try_reresolve(&p->base, &grpc_lb_pick_first_trace, GRPC_ERROR_CANCELLED); GRPC_ERROR_UNREF(error); } -static void pf_cancel_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, +static void pf_cancel_pick_locked(grpc_lb_policy* pol, grpc_connected_subchannel** target, grpc_error* error) { pick_first_lb_policy* p = (pick_first_lb_policy*)pol; @@ -112,7 +111,7 @@ static void pf_cancel_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, pending_pick* next = pp->next; if (pp->target == target) { *target = nullptr; - GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, + GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Pick Cancelled", &error, 1)); gpr_free(pp); @@ -125,7 +124,7 @@ static void pf_cancel_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, GRPC_ERROR_UNREF(error); } -static void pf_cancel_picks_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, +static void pf_cancel_picks_locked(grpc_lb_policy* pol, uint32_t initial_metadata_flags_mask, uint32_t initial_metadata_flags_eq, grpc_error* error) { @@ -136,7 +135,7 @@ static void pf_cancel_picks_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, pending_pick* next = pp->next; if ((pp->initial_metadata_flags & initial_metadata_flags_mask) == initial_metadata_flags_eq) { - GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, + GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Pick Cancelled", &error, 1)); gpr_free(pp); @@ -149,8 +148,7 @@ static void pf_cancel_picks_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, GRPC_ERROR_UNREF(error); } -static void start_picking_locked(grpc_exec_ctx* exec_ctx, - pick_first_lb_policy* p) { +static void start_picking_locked(pick_first_lb_policy* p) { p->started_picking = true; if (p->subchannel_list != nullptr && p->subchannel_list->num_subchannels > 0) { @@ -160,21 +158,21 @@ static void start_picking_locked(grpc_exec_ctx* exec_ctx, grpc_lb_subchannel_list_ref_for_connectivity_watch( p->subchannel_list, "connectivity_watch+start_picking"); grpc_lb_subchannel_data_start_connectivity_watch( - exec_ctx, &p->subchannel_list->subchannels[i]); + &p->subchannel_list->subchannels[i]); break; } } } } -static void pf_exit_idle_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { +static void pf_exit_idle_locked(grpc_lb_policy* pol) { pick_first_lb_policy* p = (pick_first_lb_policy*)pol; if (!p->started_picking) { - start_picking_locked(exec_ctx, p); + start_picking_locked(p); } } -static int pf_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, +static int pf_pick_locked(grpc_lb_policy* pol, const grpc_lb_policy_pick_args* pick_args, grpc_connected_subchannel** target, grpc_call_context_element* context, void** user_data, @@ -188,7 +186,7 @@ static int pf_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, } // No subchannel selected yet, so handle asynchronously. if (!p->started_picking) { - start_picking_locked(exec_ctx, p); + start_picking_locked(p); } pending_pick* pp = (pending_pick*)gpr_malloc(sizeof(*pp)); pp->next = p->pending_picks; @@ -199,48 +197,43 @@ static int pf_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, return 0; } -static void destroy_unselected_subchannels_locked(grpc_exec_ctx* exec_ctx, - pick_first_lb_policy* p) { +static void destroy_unselected_subchannels_locked(pick_first_lb_policy* p) { for (size_t i = 0; i < p->subchannel_list->num_subchannels; ++i) { grpc_lb_subchannel_data* sd = &p->subchannel_list->subchannels[i]; if (p->selected != sd) { - grpc_lb_subchannel_data_unref_subchannel(exec_ctx, sd, + grpc_lb_subchannel_data_unref_subchannel(sd, "selected_different_subchannel"); } } } static grpc_connectivity_state pf_check_connectivity_locked( - grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, grpc_error** error) { + grpc_lb_policy* pol, grpc_error** error) { pick_first_lb_policy* p = (pick_first_lb_policy*)pol; return grpc_connectivity_state_get(&p->state_tracker, error); } -static void pf_notify_on_state_change_locked(grpc_exec_ctx* exec_ctx, - grpc_lb_policy* pol, +static void pf_notify_on_state_change_locked(grpc_lb_policy* pol, grpc_connectivity_state* current, grpc_closure* notify) { pick_first_lb_policy* p = (pick_first_lb_policy*)pol; - grpc_connectivity_state_notify_on_state_change(exec_ctx, &p->state_tracker, - current, notify); + grpc_connectivity_state_notify_on_state_change(&p->state_tracker, current, + notify); } -static void pf_ping_one_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, - grpc_closure* closure) { +static void pf_ping_one_locked(grpc_lb_policy* pol, grpc_closure* closure) { pick_first_lb_policy* p = (pick_first_lb_policy*)pol; if (p->selected) { - grpc_connected_subchannel_ping(exec_ctx, p->selected->connected_subchannel, - closure); + grpc_connected_subchannel_ping(p->selected->connected_subchannel, closure); } else { - GRPC_CLOSURE_SCHED(exec_ctx, closure, + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Not connected")); } } -static void pf_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error); +static void pf_connectivity_changed_locked(void* arg, grpc_error* error); -static void pf_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, +static void pf_update_locked(grpc_lb_policy* policy, const grpc_lb_policy_args* args) { pick_first_lb_policy* p = (pick_first_lb_policy*)policy; const grpc_arg* arg = @@ -249,7 +242,7 @@ static void pf_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, if (p->subchannel_list == nullptr) { // If we don't have a current subchannel list, go into TRANSIENT FAILURE. grpc_connectivity_state_set( - exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Missing update in args"), "pf_update_missing"); } else { @@ -268,17 +261,17 @@ static void pf_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, (void*)p, (unsigned long)addresses->num_addresses); } grpc_lb_subchannel_list* subchannel_list = grpc_lb_subchannel_list_create( - exec_ctx, &p->base, &grpc_lb_pick_first_trace, addresses, args, + &p->base, &grpc_lb_pick_first_trace, addresses, args, pf_connectivity_changed_locked); if (subchannel_list->num_subchannels == 0) { // Empty update or no valid subchannels. Unsubscribe from all current // subchannels and put the channel in TRANSIENT_FAILURE. grpc_connectivity_state_set( - exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Empty update"), "pf_update_empty"); if (p->subchannel_list != nullptr) { - grpc_lb_subchannel_list_shutdown_and_unref(exec_ctx, p->subchannel_list, + grpc_lb_subchannel_list_shutdown_and_unref(p->subchannel_list, "sl_shutdown_empty_update"); } p->subchannel_list = subchannel_list; // Empty list. @@ -289,7 +282,7 @@ static void pf_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, // We don't yet have a selected subchannel, so replace the current // subchannel list immediately. if (p->subchannel_list != nullptr) { - grpc_lb_subchannel_list_shutdown_and_unref(exec_ctx, p->subchannel_list, + grpc_lb_subchannel_list_shutdown_and_unref(p->subchannel_list, "pf_update_before_selected"); } p->subchannel_list = subchannel_list; @@ -314,19 +307,19 @@ static void pf_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, p->selected = sd; if (p->subchannel_list != nullptr) { grpc_lb_subchannel_list_shutdown_and_unref( - exec_ctx, p->subchannel_list, "pf_update_includes_selected"); + p->subchannel_list, "pf_update_includes_selected"); } p->subchannel_list = subchannel_list; - destroy_unselected_subchannels_locked(exec_ctx, p); + destroy_unselected_subchannels_locked(p); grpc_lb_subchannel_list_ref_for_connectivity_watch( subchannel_list, "connectivity_watch+replace_selected"); - grpc_lb_subchannel_data_start_connectivity_watch(exec_ctx, sd); + grpc_lb_subchannel_data_start_connectivity_watch(sd); // If there was a previously pending update (which may or may // not have contained the currently selected subchannel), drop // it, so that it doesn't override what we've done here. if (p->latest_pending_subchannel_list != nullptr) { grpc_lb_subchannel_list_shutdown_and_unref( - exec_ctx, p->latest_pending_subchannel_list, + p->latest_pending_subchannel_list, "pf_update_includes_selected+outdated"); p->latest_pending_subchannel_list = nullptr; } @@ -346,8 +339,7 @@ static void pf_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, (void*)subchannel_list); } grpc_lb_subchannel_list_shutdown_and_unref( - exec_ctx, p->latest_pending_subchannel_list, - "sl_outdated_dont_smash"); + p->latest_pending_subchannel_list, "sl_outdated_dont_smash"); } p->latest_pending_subchannel_list = subchannel_list; } @@ -357,12 +349,11 @@ static void pf_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, grpc_lb_subchannel_list_ref_for_connectivity_watch( subchannel_list, "connectivity_watch+update"); grpc_lb_subchannel_data_start_connectivity_watch( - exec_ctx, &subchannel_list->subchannels[0]); + &subchannel_list->subchannels[0]); } } -static void pf_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void pf_connectivity_changed_locked(void* arg, grpc_error* error) { grpc_lb_subchannel_data* sd = (grpc_lb_subchannel_data*)arg; pick_first_lb_policy* p = (pick_first_lb_policy*)sd->subchannel_list->policy; if (grpc_lb_pick_first_trace.enabled()) { @@ -380,18 +371,18 @@ static void pf_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, void* arg, } // If the policy is shutting down, unref and return. if (p->shutdown) { - grpc_lb_subchannel_data_stop_connectivity_watch(exec_ctx, sd); - grpc_lb_subchannel_data_unref_subchannel(exec_ctx, sd, "pf_shutdown"); - grpc_lb_subchannel_list_unref_for_connectivity_watch( - exec_ctx, sd->subchannel_list, "pf_shutdown"); + grpc_lb_subchannel_data_stop_connectivity_watch(sd); + grpc_lb_subchannel_data_unref_subchannel(sd, "pf_shutdown"); + grpc_lb_subchannel_list_unref_for_connectivity_watch(sd->subchannel_list, + "pf_shutdown"); return; } // If the subchannel list is shutting down, stop watching. if (sd->subchannel_list->shutting_down || error == GRPC_ERROR_CANCELLED) { - grpc_lb_subchannel_data_stop_connectivity_watch(exec_ctx, sd); - grpc_lb_subchannel_data_unref_subchannel(exec_ctx, sd, "pf_sl_shutdown"); - grpc_lb_subchannel_list_unref_for_connectivity_watch( - exec_ctx, sd->subchannel_list, "pf_sl_shutdown"); + grpc_lb_subchannel_data_stop_connectivity_watch(sd); + grpc_lb_subchannel_data_unref_subchannel(sd, "pf_sl_shutdown"); + grpc_lb_subchannel_list_unref_for_connectivity_watch(sd->subchannel_list, + "pf_sl_shutdown"); return; } // If we're still here, the notification must be for a subchannel in @@ -407,15 +398,15 @@ static void pf_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, void* arg, if (sd->curr_connectivity_state != GRPC_CHANNEL_READY && p->latest_pending_subchannel_list != nullptr) { p->selected = nullptr; - grpc_lb_subchannel_data_stop_connectivity_watch(exec_ctx, sd); + grpc_lb_subchannel_data_stop_connectivity_watch(sd); grpc_lb_subchannel_list_unref_for_connectivity_watch( - exec_ctx, sd->subchannel_list, "selected_not_ready+switch_to_update"); + sd->subchannel_list, "selected_not_ready+switch_to_update"); grpc_lb_subchannel_list_shutdown_and_unref( - exec_ctx, p->subchannel_list, "selected_not_ready+switch_to_update"); + p->subchannel_list, "selected_not_ready+switch_to_update"); p->subchannel_list = p->latest_pending_subchannel_list; p->latest_pending_subchannel_list = nullptr; grpc_connectivity_state_set( - exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_REF(error), "selected_not_ready+switch_to_update"); } else { // TODO(juanlishen): we re-resolve when the selected subchannel goes to @@ -426,27 +417,26 @@ static void pf_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, void* arg, if (sd->curr_connectivity_state == GRPC_CHANNEL_SHUTDOWN || sd->curr_connectivity_state == GRPC_CHANNEL_TRANSIENT_FAILURE) { // If the selected channel goes bad, request a re-resolution. - grpc_connectivity_state_set(exec_ctx, &p->state_tracker, - GRPC_CHANNEL_IDLE, GRPC_ERROR_NONE, + grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_IDLE, + GRPC_ERROR_NONE, "selected_changed+reresolve"); p->started_picking = false; - grpc_lb_policy_try_reresolve( - exec_ctx, &p->base, &grpc_lb_pick_first_trace, GRPC_ERROR_NONE); + grpc_lb_policy_try_reresolve(&p->base, &grpc_lb_pick_first_trace, + GRPC_ERROR_NONE); } else { - grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + grpc_connectivity_state_set(&p->state_tracker, sd->curr_connectivity_state, GRPC_ERROR_REF(error), "selected_changed"); } if (sd->curr_connectivity_state != GRPC_CHANNEL_SHUTDOWN) { // Renew notification. - grpc_lb_subchannel_data_start_connectivity_watch(exec_ctx, sd); + grpc_lb_subchannel_data_start_connectivity_watch(sd); } else { p->selected = nullptr; - grpc_lb_subchannel_data_stop_connectivity_watch(exec_ctx, sd); + grpc_lb_subchannel_data_stop_connectivity_watch(sd); grpc_lb_subchannel_list_unref_for_connectivity_watch( - exec_ctx, sd->subchannel_list, "pf_selected_shutdown"); - grpc_lb_subchannel_data_unref_subchannel(exec_ctx, sd, - "pf_selected_shutdown"); + sd->subchannel_list, "pf_selected_shutdown"); + grpc_lb_subchannel_data_unref_subchannel(sd, "pf_selected_shutdown"); } } return; @@ -466,15 +456,14 @@ static void pf_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, void* arg, // p->subchannel_list. if (sd->subchannel_list == p->latest_pending_subchannel_list) { GPR_ASSERT(p->subchannel_list != nullptr); - grpc_lb_subchannel_list_shutdown_and_unref(exec_ctx, p->subchannel_list, + grpc_lb_subchannel_list_shutdown_and_unref(p->subchannel_list, "finish_update"); p->subchannel_list = p->latest_pending_subchannel_list; p->latest_pending_subchannel_list = nullptr; } // Cases 1 and 2. - grpc_connectivity_state_set(exec_ctx, &p->state_tracker, - GRPC_CHANNEL_READY, GRPC_ERROR_NONE, - "connecting_ready"); + grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_READY, + GRPC_ERROR_NONE, "connecting_ready"); sd->connected_subchannel = GRPC_CONNECTED_SUBCHANNEL_REF( grpc_subchannel_get_connected_subchannel(sd->subchannel), "connected"); @@ -484,7 +473,7 @@ static void pf_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, void* arg, (void*)sd->subchannel); } // Drop all other subchannels, since we are now connected. - destroy_unselected_subchannels_locked(exec_ctx, p); + destroy_unselected_subchannels_locked(p); // Update any calls that were waiting for a pick. pending_pick* pp; while ((pp = p->pending_picks)) { @@ -496,15 +485,15 @@ static void pf_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, void* arg, "Servicing pending pick with selected subchannel %p", (void*)p->selected); } - GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_NONE); gpr_free(pp); } // Renew notification. - grpc_lb_subchannel_data_start_connectivity_watch(exec_ctx, sd); + grpc_lb_subchannel_data_start_connectivity_watch(sd); break; } case GRPC_CHANNEL_TRANSIENT_FAILURE: { - grpc_lb_subchannel_data_stop_connectivity_watch(exec_ctx, sd); + grpc_lb_subchannel_data_stop_connectivity_watch(sd); do { sd->subchannel_list->checking_subchannel = (sd->subchannel_list->checking_subchannel + 1) % @@ -517,29 +506,28 @@ static void pf_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, void* arg, if (sd->subchannel_list->checking_subchannel == 0 && sd->subchannel_list == p->subchannel_list) { grpc_connectivity_state_set( - exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_REF(error), "connecting_transient_failure"); } // Reuses the connectivity refs from the previous watch. - grpc_lb_subchannel_data_start_connectivity_watch(exec_ctx, sd); + grpc_lb_subchannel_data_start_connectivity_watch(sd); break; } case GRPC_CHANNEL_CONNECTING: case GRPC_CHANNEL_IDLE: { // Only update connectivity state in case 1. if (sd->subchannel_list == p->subchannel_list) { - grpc_connectivity_state_set( - exec_ctx, &p->state_tracker, GRPC_CHANNEL_CONNECTING, - GRPC_ERROR_REF(error), "connecting_changed"); + grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_CONNECTING, + GRPC_ERROR_REF(error), + "connecting_changed"); } // Renew notification. - grpc_lb_subchannel_data_start_connectivity_watch(exec_ctx, sd); + grpc_lb_subchannel_data_start_connectivity_watch(sd); break; } case GRPC_CHANNEL_SHUTDOWN: { - grpc_lb_subchannel_data_stop_connectivity_watch(exec_ctx, sd); - grpc_lb_subchannel_data_unref_subchannel(exec_ctx, sd, - "pf_candidate_shutdown"); + grpc_lb_subchannel_data_stop_connectivity_watch(sd); + grpc_lb_subchannel_data_unref_subchannel(sd, "pf_candidate_shutdown"); // Advance to next subchannel and check its state. grpc_lb_subchannel_data* original_sd = sd; do { @@ -551,31 +539,30 @@ static void pf_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, void* arg, } while (sd->subchannel == nullptr && sd != original_sd); if (sd == original_sd) { grpc_lb_subchannel_list_unref_for_connectivity_watch( - exec_ctx, sd->subchannel_list, "pf_exhausted_subchannels"); + sd->subchannel_list, "pf_exhausted_subchannels"); if (sd->subchannel_list == p->subchannel_list) { - grpc_connectivity_state_set(exec_ctx, &p->state_tracker, - GRPC_CHANNEL_IDLE, GRPC_ERROR_NONE, + grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_IDLE, + GRPC_ERROR_NONE, "exhausted_subchannels+reresolve"); p->started_picking = false; - grpc_lb_policy_try_reresolve( - exec_ctx, &p->base, &grpc_lb_pick_first_trace, GRPC_ERROR_NONE); + grpc_lb_policy_try_reresolve(&p->base, &grpc_lb_pick_first_trace, + GRPC_ERROR_NONE); } } else { if (sd->subchannel_list == p->subchannel_list) { grpc_connectivity_state_set( - exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_REF(error), "subchannel_failed"); } // Reuses the connectivity refs from the previous watch. - grpc_lb_subchannel_data_start_connectivity_watch(exec_ctx, sd); + grpc_lb_subchannel_data_start_connectivity_watch(sd); } } } } static void pf_set_reresolve_closure_locked( - grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, - grpc_closure* request_reresolution) { + grpc_lb_policy* policy, grpc_closure* request_reresolution) { pick_first_lb_policy* p = (pick_first_lb_policy*)policy; GPR_ASSERT(!p->shutdown); GPR_ASSERT(policy->request_reresolution == nullptr); @@ -599,15 +586,14 @@ static void pick_first_factory_ref(grpc_lb_policy_factory* factory) {} 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, +static grpc_lb_policy* create_pick_first(grpc_lb_policy_factory* factory, grpc_lb_policy_args* args) { GPR_ASSERT(args->client_channel_factory != nullptr); pick_first_lb_policy* p = (pick_first_lb_policy*)gpr_zalloc(sizeof(*p)); if (grpc_lb_pick_first_trace.enabled()) { gpr_log(GPR_DEBUG, "Pick First %p created.", (void*)p); } - pf_update_locked(exec_ctx, &p->base, args); + pf_update_locked(&p->base, args); grpc_lb_policy_init(&p->base, &pick_first_lb_policy_vtable, args->combiner); grpc_subchannel_index_ref(); return &p->base; diff --git a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc index f68daba474c..6958b726935 100644 --- a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +++ b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc @@ -154,7 +154,7 @@ static void update_last_ready_subchannel_index_locked(round_robin_lb_policy* p, } } -static void rr_destroy(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { +static void rr_destroy(grpc_lb_policy* pol) { round_robin_lb_policy* p = (round_robin_lb_policy*)pol; if (grpc_lb_round_robin_trace.enabled()) { gpr_log(GPR_DEBUG, "[RR %p] Destroying Round Robin policy at %p", @@ -162,12 +162,12 @@ static void rr_destroy(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { } GPR_ASSERT(p->subchannel_list == nullptr); GPR_ASSERT(p->latest_pending_subchannel_list == nullptr); - grpc_connectivity_state_destroy(exec_ctx, &p->state_tracker); + grpc_connectivity_state_destroy(&p->state_tracker); grpc_subchannel_index_unref(); gpr_free(p); } -static void rr_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { +static void rr_shutdown_locked(grpc_lb_policy* pol) { round_robin_lb_policy* p = (round_robin_lb_policy*)pol; grpc_error* error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Channel shutdown"); if (grpc_lb_round_robin_trace.enabled()) { @@ -178,29 +178,27 @@ static void rr_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { while ((pp = p->pending_picks) != nullptr) { p->pending_picks = pp->next; *pp->target = nullptr; - GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_REF(error)); gpr_free(pp); } - grpc_connectivity_state_set(exec_ctx, &p->state_tracker, - GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_REF(error), - "rr_shutdown"); + grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_SHUTDOWN, + GRPC_ERROR_REF(error), "rr_shutdown"); if (p->subchannel_list != nullptr) { - grpc_lb_subchannel_list_shutdown_and_unref(exec_ctx, p->subchannel_list, + grpc_lb_subchannel_list_shutdown_and_unref(p->subchannel_list, "sl_shutdown_rr_shutdown"); p->subchannel_list = nullptr; } if (p->latest_pending_subchannel_list != nullptr) { grpc_lb_subchannel_list_shutdown_and_unref( - exec_ctx, p->latest_pending_subchannel_list, - "sl_shutdown_pending_rr_shutdown"); + p->latest_pending_subchannel_list, "sl_shutdown_pending_rr_shutdown"); p->latest_pending_subchannel_list = nullptr; } - grpc_lb_policy_try_reresolve(exec_ctx, &p->base, &grpc_lb_round_robin_trace, + grpc_lb_policy_try_reresolve(&p->base, &grpc_lb_round_robin_trace, GRPC_ERROR_CANCELLED); GRPC_ERROR_UNREF(error); } -static void rr_cancel_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, +static void rr_cancel_pick_locked(grpc_lb_policy* pol, grpc_connected_subchannel** target, grpc_error* error) { round_robin_lb_policy* p = (round_robin_lb_policy*)pol; @@ -210,7 +208,7 @@ static void rr_cancel_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, pending_pick* next = pp->next; if (pp->target == target) { *target = nullptr; - GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, + GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Pick cancelled", &error, 1)); gpr_free(pp); @@ -223,7 +221,7 @@ static void rr_cancel_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, GRPC_ERROR_UNREF(error); } -static void rr_cancel_picks_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, +static void rr_cancel_picks_locked(grpc_lb_policy* pol, uint32_t initial_metadata_flags_mask, uint32_t initial_metadata_flags_eq, grpc_error* error) { @@ -235,7 +233,7 @@ static void rr_cancel_picks_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, if ((pp->initial_metadata_flags & initial_metadata_flags_mask) == initial_metadata_flags_eq) { *pp->target = nullptr; - GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, + GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Pick cancelled", &error, 1)); gpr_free(pp); @@ -248,27 +246,26 @@ static void rr_cancel_picks_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, GRPC_ERROR_UNREF(error); } -static void start_picking_locked(grpc_exec_ctx* exec_ctx, - round_robin_lb_policy* p) { +static void start_picking_locked(round_robin_lb_policy* p) { p->started_picking = true; for (size_t i = 0; i < p->subchannel_list->num_subchannels; i++) { if (p->subchannel_list->subchannels[i].subchannel != nullptr) { grpc_lb_subchannel_list_ref_for_connectivity_watch(p->subchannel_list, "connectivity_watch"); grpc_lb_subchannel_data_start_connectivity_watch( - exec_ctx, &p->subchannel_list->subchannels[i]); + &p->subchannel_list->subchannels[i]); } } } -static void rr_exit_idle_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { +static void rr_exit_idle_locked(grpc_lb_policy* pol) { round_robin_lb_policy* p = (round_robin_lb_policy*)pol; if (!p->started_picking) { - start_picking_locked(exec_ctx, p); + start_picking_locked(p); } } -static int rr_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, +static int rr_pick_locked(grpc_lb_policy* pol, const grpc_lb_policy_pick_args* pick_args, grpc_connected_subchannel** target, grpc_call_context_element* context, void** user_data, @@ -305,7 +302,7 @@ static int rr_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, } /* no pick currently available. Save for later in list of pending picks */ if (!p->started_picking) { - start_picking_locked(exec_ctx, p); + start_picking_locked(p); } pending_pick* pp = (pending_pick*)gpr_malloc(sizeof(*pp)); pp->next = p->pending_picks; @@ -348,8 +345,7 @@ static void update_state_counters_locked(grpc_lb_subchannel_data* sd) { * (the grpc_lb_subchannel_data associated with the updated subchannel) and the * subchannel list \a sd belongs to (sd->subchannel_list). \a error will be used * only if the policy transitions to state TRANSIENT_FAILURE. */ -static void update_lb_connectivity_status_locked(grpc_exec_ctx* exec_ctx, - grpc_lb_subchannel_data* sd, +static void update_lb_connectivity_status_locked(grpc_lb_subchannel_data* sd, grpc_error* error) { /* In priority order. The first rule to match terminates the search (ie, if we * are on rule n, all previous rules were unfulfilled). @@ -382,38 +378,36 @@ static void update_lb_connectivity_status_locked(grpc_exec_ctx* exec_ctx, round_robin_lb_policy* p = (round_robin_lb_policy*)subchannel_list->policy; if (subchannel_list->num_ready > 0) { /* 1) READY */ - grpc_connectivity_state_set(exec_ctx, &p->state_tracker, GRPC_CHANNEL_READY, + grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_READY, GRPC_ERROR_NONE, "rr_ready"); } else if (sd->curr_connectivity_state == GRPC_CHANNEL_CONNECTING) { /* 2) CONNECTING */ - grpc_connectivity_state_set(exec_ctx, &p->state_tracker, - GRPC_CHANNEL_CONNECTING, GRPC_ERROR_NONE, - "rr_connecting"); + grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_CONNECTING, + GRPC_ERROR_NONE, "rr_connecting"); } else if (subchannel_list->num_shutdown == subchannel_list->num_subchannels) { /* 3) IDLE and re-resolve */ - grpc_connectivity_state_set(exec_ctx, &p->state_tracker, GRPC_CHANNEL_IDLE, + grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_IDLE, GRPC_ERROR_NONE, "rr_exhausted_subchannels+reresolve"); p->started_picking = false; - grpc_lb_policy_try_reresolve(exec_ctx, &p->base, &grpc_lb_round_robin_trace, + grpc_lb_policy_try_reresolve(&p->base, &grpc_lb_round_robin_trace, GRPC_ERROR_NONE); } else if (subchannel_list->num_transient_failures == subchannel_list->num_subchannels) { /* 4) TRANSIENT_FAILURE */ - grpc_connectivity_state_set(exec_ctx, &p->state_tracker, + grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_REF(error), "rr_transient_failure"); } else if (subchannel_list->num_idle == subchannel_list->num_subchannels) { /* 5) IDLE */ - grpc_connectivity_state_set(exec_ctx, &p->state_tracker, GRPC_CHANNEL_IDLE, + grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_IDLE, GRPC_ERROR_NONE, "rr_idle"); } GRPC_ERROR_UNREF(error); } -static void rr_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void rr_connectivity_changed_locked(void* arg, grpc_error* error) { grpc_lb_subchannel_data* sd = (grpc_lb_subchannel_data*)arg; round_robin_lb_policy* p = (round_robin_lb_policy*)sd->subchannel_list->policy; @@ -431,18 +425,18 @@ static void rr_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, void* arg, } // If the policy is shutting down, unref and return. if (p->shutdown) { - grpc_lb_subchannel_data_stop_connectivity_watch(exec_ctx, sd); - grpc_lb_subchannel_data_unref_subchannel(exec_ctx, sd, "rr_shutdown"); - grpc_lb_subchannel_list_unref_for_connectivity_watch( - exec_ctx, sd->subchannel_list, "rr_shutdown"); + grpc_lb_subchannel_data_stop_connectivity_watch(sd); + grpc_lb_subchannel_data_unref_subchannel(sd, "rr_shutdown"); + grpc_lb_subchannel_list_unref_for_connectivity_watch(sd->subchannel_list, + "rr_shutdown"); return; } // If the subchannel list is shutting down, stop watching. if (sd->subchannel_list->shutting_down || error == GRPC_ERROR_CANCELLED) { - grpc_lb_subchannel_data_stop_connectivity_watch(exec_ctx, sd); - grpc_lb_subchannel_data_unref_subchannel(exec_ctx, sd, "rr_sl_shutdown"); - grpc_lb_subchannel_list_unref_for_connectivity_watch( - exec_ctx, sd->subchannel_list, "rr_sl_shutdown"); + grpc_lb_subchannel_data_stop_connectivity_watch(sd); + grpc_lb_subchannel_data_unref_subchannel(sd, "rr_sl_shutdown"); + grpc_lb_subchannel_list_unref_for_connectivity_watch(sd->subchannel_list, + "rr_sl_shutdown"); return; } // If we're still here, the notification must be for a subchannel in @@ -455,14 +449,13 @@ static void rr_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, void* arg, sd->curr_connectivity_state = sd->pending_connectivity_state_unsafe; // Update state counters and new overall state. update_state_counters_locked(sd); - update_lb_connectivity_status_locked(exec_ctx, sd, GRPC_ERROR_REF(error)); + update_lb_connectivity_status_locked(sd, GRPC_ERROR_REF(error)); // If the sd's new state is SHUTDOWN, unref the subchannel. if (sd->curr_connectivity_state == GRPC_CHANNEL_SHUTDOWN) { - grpc_lb_subchannel_data_stop_connectivity_watch(exec_ctx, sd); - grpc_lb_subchannel_data_unref_subchannel(exec_ctx, sd, - "rr_connectivity_shutdown"); + grpc_lb_subchannel_data_stop_connectivity_watch(sd); + grpc_lb_subchannel_data_unref_subchannel(sd, "rr_connectivity_shutdown"); grpc_lb_subchannel_list_unref_for_connectivity_watch( - exec_ctx, sd->subchannel_list, "rr_connectivity_shutdown"); + sd->subchannel_list, "rr_connectivity_shutdown"); } else { // sd not in SHUTDOWN if (sd->curr_connectivity_state == GRPC_CHANNEL_READY) { if (sd->connected_subchannel == nullptr) { @@ -490,8 +483,8 @@ static void rr_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, void* arg, } if (p->subchannel_list != nullptr) { // dispose of the current subchannel_list - grpc_lb_subchannel_list_shutdown_and_unref( - exec_ctx, p->subchannel_list, "sl_phase_out_shutdown"); + grpc_lb_subchannel_list_shutdown_and_unref(p->subchannel_list, + "sl_phase_out_shutdown"); } p->subchannel_list = p->latest_pending_subchannel_list; p->latest_pending_subchannel_list = nullptr; @@ -523,32 +516,30 @@ static void rr_connectivity_changed_locked(grpc_exec_ctx* exec_ctx, void* arg, (void*)p, (void*)selected->subchannel, (void*)p->subchannel_list, (unsigned long)next_ready_index); } - GRPC_CLOSURE_SCHED(exec_ctx, pp->on_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(pp->on_complete, GRPC_ERROR_NONE); gpr_free(pp); } } // Renew notification. - grpc_lb_subchannel_data_start_connectivity_watch(exec_ctx, sd); + grpc_lb_subchannel_data_start_connectivity_watch(sd); } } static grpc_connectivity_state rr_check_connectivity_locked( - grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, grpc_error** error) { + grpc_lb_policy* pol, grpc_error** error) { round_robin_lb_policy* p = (round_robin_lb_policy*)pol; return grpc_connectivity_state_get(&p->state_tracker, error); } -static void rr_notify_on_state_change_locked(grpc_exec_ctx* exec_ctx, - grpc_lb_policy* pol, +static void rr_notify_on_state_change_locked(grpc_lb_policy* pol, grpc_connectivity_state* current, grpc_closure* notify) { round_robin_lb_policy* p = (round_robin_lb_policy*)pol; - grpc_connectivity_state_notify_on_state_change(exec_ctx, &p->state_tracker, - current, notify); + grpc_connectivity_state_notify_on_state_change(&p->state_tracker, current, + notify); } -static void rr_ping_one_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, - grpc_closure* closure) { +static void rr_ping_one_locked(grpc_lb_policy* pol, grpc_closure* closure) { round_robin_lb_policy* p = (round_robin_lb_policy*)pol; const size_t next_ready_index = get_next_ready_subchannel_index_locked(p); if (next_ready_index < p->subchannel_list->num_subchannels) { @@ -556,16 +547,15 @@ static void rr_ping_one_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol, &p->subchannel_list->subchannels[next_ready_index]; grpc_connected_subchannel* target = GRPC_CONNECTED_SUBCHANNEL_REF( selected->connected_subchannel, "rr_ping"); - grpc_connected_subchannel_ping(exec_ctx, target, closure); - GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, target, "rr_ping"); + grpc_connected_subchannel_ping(target, closure); + GRPC_CONNECTED_SUBCHANNEL_UNREF(target, "rr_ping"); } else { - GRPC_CLOSURE_SCHED( - exec_ctx, closure, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Round Robin not connected")); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Round Robin not connected")); } } -static void rr_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, +static void rr_update_locked(grpc_lb_policy* policy, const grpc_lb_policy_args* args) { round_robin_lb_policy* p = (round_robin_lb_policy*)policy; const grpc_arg* arg = @@ -576,7 +566,7 @@ static void rr_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, // Otherwise, keep using the current subchannel list (ignore this update). if (p->subchannel_list == nullptr) { grpc_connectivity_state_set( - exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Missing update in args"), "rr_update_missing"); } @@ -588,15 +578,15 @@ static void rr_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, addresses->num_addresses); } grpc_lb_subchannel_list* subchannel_list = grpc_lb_subchannel_list_create( - exec_ctx, &p->base, &grpc_lb_round_robin_trace, addresses, args, + &p->base, &grpc_lb_round_robin_trace, addresses, args, rr_connectivity_changed_locked); if (subchannel_list->num_subchannels == 0) { grpc_connectivity_state_set( - exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Empty update"), "rr_update_empty"); if (p->subchannel_list != nullptr) { - grpc_lb_subchannel_list_shutdown_and_unref(exec_ctx, p->subchannel_list, + grpc_lb_subchannel_list_shutdown_and_unref(p->subchannel_list, "sl_shutdown_empty_update"); } p->subchannel_list = subchannel_list; // empty list @@ -612,7 +602,7 @@ static void rr_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, (void*)subchannel_list); } grpc_lb_subchannel_list_shutdown_and_unref( - exec_ctx, p->latest_pending_subchannel_list, "sl_outdated"); + p->latest_pending_subchannel_list, "sl_outdated"); } p->latest_pending_subchannel_list = subchannel_list; for (size_t i = 0; i < subchannel_list->num_subchannels; ++i) { @@ -623,22 +613,21 @@ static void rr_update_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, grpc_lb_subchannel_list_ref_for_connectivity_watch(subchannel_list, "connectivity_watch"); grpc_lb_subchannel_data_start_connectivity_watch( - exec_ctx, &subchannel_list->subchannels[i]); + &subchannel_list->subchannels[i]); } } else { // The policy isn't picking yet. Save the update for later, disposing of // previous version if any. if (p->subchannel_list != nullptr) { grpc_lb_subchannel_list_shutdown_and_unref( - exec_ctx, p->subchannel_list, "rr_update_before_started_picking"); + p->subchannel_list, "rr_update_before_started_picking"); } p->subchannel_list = subchannel_list; } } static void rr_set_reresolve_closure_locked( - grpc_exec_ctx* exec_ctx, grpc_lb_policy* policy, - grpc_closure* request_reresolution) { + grpc_lb_policy* policy, grpc_closure* request_reresolution) { round_robin_lb_policy* p = (round_robin_lb_policy*)policy; GPR_ASSERT(!p->shutdown); GPR_ASSERT(policy->request_reresolution == nullptr); @@ -662,8 +651,7 @@ static void round_robin_factory_ref(grpc_lb_policy_factory* factory) {} 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, +static grpc_lb_policy* round_robin_create(grpc_lb_policy_factory* factory, grpc_lb_policy_args* args) { GPR_ASSERT(args->client_channel_factory != nullptr); round_robin_lb_policy* p = (round_robin_lb_policy*)gpr_zalloc(sizeof(*p)); @@ -671,7 +659,7 @@ static grpc_lb_policy* round_robin_create(grpc_exec_ctx* exec_ctx, grpc_subchannel_index_ref(); grpc_connectivity_state_init(&p->state_tracker, GRPC_CHANNEL_IDLE, "round_robin"); - rr_update_locked(exec_ctx, &p->base, args); + rr_update_locked(&p->base, args); if (grpc_lb_round_robin_trace.enabled()) { gpr_log(GPR_DEBUG, "[RR %p] Created with %lu subchannels", (void*)p, (unsigned long)p->subchannel_list->num_subchannels); diff --git a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc index b6fce4d2075..a3b4c8e524d 100644 --- a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc +++ b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc @@ -28,8 +28,7 @@ #include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/transport/connectivity_state.h" -void grpc_lb_subchannel_data_unref_subchannel(grpc_exec_ctx* exec_ctx, - grpc_lb_subchannel_data* sd, +void grpc_lb_subchannel_data_unref_subchannel(grpc_lb_subchannel_data* sd, const char* reason) { if (sd->subchannel != nullptr) { if (sd->subchannel_list->tracer->enabled()) { @@ -41,23 +40,22 @@ void grpc_lb_subchannel_data_unref_subchannel(grpc_exec_ctx* exec_ctx, (size_t)(sd - sd->subchannel_list->subchannels), sd->subchannel_list->num_subchannels, sd->subchannel); } - GRPC_SUBCHANNEL_UNREF(exec_ctx, sd->subchannel, reason); + GRPC_SUBCHANNEL_UNREF(sd->subchannel, reason); sd->subchannel = nullptr; if (sd->connected_subchannel != nullptr) { - GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, sd->connected_subchannel, - reason); + GRPC_CONNECTED_SUBCHANNEL_UNREF(sd->connected_subchannel, reason); sd->connected_subchannel = nullptr; } if (sd->user_data != nullptr) { GPR_ASSERT(sd->user_data_vtable != nullptr); - sd->user_data_vtable->destroy(exec_ctx, sd->user_data); + sd->user_data_vtable->destroy(sd->user_data); sd->user_data = nullptr; } } } void grpc_lb_subchannel_data_start_connectivity_watch( - grpc_exec_ctx* exec_ctx, grpc_lb_subchannel_data* sd) { + grpc_lb_subchannel_data* sd) { if (sd->subchannel_list->tracer->enabled()) { gpr_log(GPR_DEBUG, "[%s %p] subchannel list %p index %" PRIuPTR " of %" PRIuPTR @@ -69,13 +67,13 @@ void grpc_lb_subchannel_data_start_connectivity_watch( } sd->connectivity_notification_pending = true; grpc_subchannel_notify_on_state_change( - exec_ctx, sd->subchannel, sd->subchannel_list->policy->interested_parties, + sd->subchannel, sd->subchannel_list->policy->interested_parties, &sd->pending_connectivity_state_unsafe, &sd->connectivity_changed_closure); } void grpc_lb_subchannel_data_stop_connectivity_watch( - grpc_exec_ctx* exec_ctx, grpc_lb_subchannel_data* sd) { + grpc_lb_subchannel_data* sd) { if (sd->subchannel_list->tracer->enabled()) { gpr_log(GPR_DEBUG, "[%s %p] subchannel list %p index %" PRIuPTR " of %" PRIuPTR @@ -90,7 +88,7 @@ void grpc_lb_subchannel_data_stop_connectivity_watch( } grpc_lb_subchannel_list* grpc_lb_subchannel_list_create( - grpc_exec_ctx* exec_ctx, grpc_lb_policy* p, grpc_core::TraceFlag* tracer, + grpc_lb_policy* p, grpc_core::TraceFlag* tracer, const grpc_lb_addresses* addresses, const grpc_lb_policy_args* args, grpc_iomgr_cb_func connectivity_changed_cb) { grpc_lb_subchannel_list* subchannel_list = @@ -124,8 +122,8 @@ grpc_lb_subchannel_list* grpc_lb_subchannel_list_create( gpr_free(addr_arg.value.string); sc_args.args = new_args; grpc_subchannel* subchannel = grpc_client_channel_factory_create_subchannel( - exec_ctx, args->client_channel_factory, &sc_args); - grpc_channel_args_destroy(exec_ctx, new_args); + args->client_channel_factory, &sc_args); + grpc_channel_args_destroy(new_args); if (subchannel == nullptr) { // Subchannel could not be created. if (tracer->enabled()) { @@ -172,8 +170,7 @@ grpc_lb_subchannel_list* grpc_lb_subchannel_list_create( return subchannel_list; } -static void subchannel_list_destroy(grpc_exec_ctx* exec_ctx, - grpc_lb_subchannel_list* subchannel_list) { +static void subchannel_list_destroy(grpc_lb_subchannel_list* subchannel_list) { if (subchannel_list->tracer->enabled()) { gpr_log(GPR_DEBUG, "[%s %p] Destroying subchannel_list %p", subchannel_list->tracer->name(), subchannel_list->policy, @@ -181,8 +178,7 @@ static void subchannel_list_destroy(grpc_exec_ctx* exec_ctx, } for (size_t i = 0; i < subchannel_list->num_subchannels; i++) { grpc_lb_subchannel_data* sd = &subchannel_list->subchannels[i]; - grpc_lb_subchannel_data_unref_subchannel(exec_ctx, sd, - "subchannel_list_destroy"); + grpc_lb_subchannel_data_unref_subchannel(sd, "subchannel_list_destroy"); } gpr_free(subchannel_list->subchannels); gpr_free(subchannel_list); @@ -200,8 +196,7 @@ void grpc_lb_subchannel_list_ref(grpc_lb_subchannel_list* subchannel_list, } } -void grpc_lb_subchannel_list_unref(grpc_exec_ctx* exec_ctx, - grpc_lb_subchannel_list* subchannel_list, +void grpc_lb_subchannel_list_unref(grpc_lb_subchannel_list* subchannel_list, const char* reason) { const bool done = gpr_unref(&subchannel_list->refcount); if (subchannel_list->tracer->enabled()) { @@ -212,7 +207,7 @@ void grpc_lb_subchannel_list_unref(grpc_exec_ctx* exec_ctx, reason); } if (done) { - subchannel_list_destroy(exec_ctx, subchannel_list); + subchannel_list_destroy(subchannel_list); } } @@ -223,14 +218,13 @@ void grpc_lb_subchannel_list_ref_for_connectivity_watch( } void grpc_lb_subchannel_list_unref_for_connectivity_watch( - grpc_exec_ctx* exec_ctx, grpc_lb_subchannel_list* subchannel_list, - const char* reason) { - GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, subchannel_list->policy, reason); - grpc_lb_subchannel_list_unref(exec_ctx, subchannel_list, reason); + grpc_lb_subchannel_list* subchannel_list, const char* reason) { + GRPC_LB_POLICY_WEAK_UNREF(subchannel_list->policy, reason); + grpc_lb_subchannel_list_unref(subchannel_list, reason); } static void subchannel_data_cancel_connectivity_watch( - grpc_exec_ctx* exec_ctx, grpc_lb_subchannel_data* sd, const char* reason) { + grpc_lb_subchannel_data* sd, const char* reason) { if (sd->subchannel_list->tracer->enabled()) { gpr_log(GPR_DEBUG, "[%s %p] subchannel list %p index %" PRIuPTR " of %" PRIuPTR @@ -240,14 +234,12 @@ static void subchannel_data_cancel_connectivity_watch( (size_t)(sd - sd->subchannel_list->subchannels), sd->subchannel_list->num_subchannels, sd->subchannel, reason); } - grpc_subchannel_notify_on_state_change(exec_ctx, sd->subchannel, nullptr, - nullptr, + grpc_subchannel_notify_on_state_change(sd->subchannel, nullptr, nullptr, &sd->connectivity_changed_closure); } void grpc_lb_subchannel_list_shutdown_and_unref( - grpc_exec_ctx* exec_ctx, grpc_lb_subchannel_list* subchannel_list, - const char* reason) { + grpc_lb_subchannel_list* subchannel_list, const char* reason) { if (subchannel_list->tracer->enabled()) { gpr_log(GPR_DEBUG, "[%s %p] Shutting down subchannel_list %p (%s)", subchannel_list->tracer->name(), subchannel_list->policy, @@ -261,10 +253,10 @@ void grpc_lb_subchannel_list_shutdown_and_unref( // the callback is responsible for unreffing the subchannel. // Otherwise, unref the subchannel directly. if (sd->connectivity_notification_pending) { - subchannel_data_cancel_connectivity_watch(exec_ctx, sd, reason); + subchannel_data_cancel_connectivity_watch(sd, reason); } else if (sd->subchannel != nullptr) { - grpc_lb_subchannel_data_unref_subchannel(exec_ctx, sd, reason); + grpc_lb_subchannel_data_unref_subchannel(sd, reason); } } - grpc_lb_subchannel_list_unref(exec_ctx, subchannel_list, reason); + grpc_lb_subchannel_list_unref(subchannel_list, reason); } diff --git a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h index e3e5eba56a5..0f8cea9347e 100644 --- a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +++ b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h @@ -65,8 +65,7 @@ typedef struct { } grpc_lb_subchannel_data; /// Unrefs the subchannel contained in sd. -void grpc_lb_subchannel_data_unref_subchannel(grpc_exec_ctx* exec_ctx, - grpc_lb_subchannel_data* sd, +void grpc_lb_subchannel_data_unref_subchannel(grpc_lb_subchannel_data* sd, const char* reason); /// Starts watching the connectivity state of the subchannel. @@ -74,11 +73,11 @@ void grpc_lb_subchannel_data_unref_subchannel(grpc_exec_ctx* exec_ctx, /// grpc_lb_subchannel_data_stop_connectivity_watch() or again call /// grpc_lb_subchannel_data_start_connectivity_watch(). void grpc_lb_subchannel_data_start_connectivity_watch( - grpc_exec_ctx* exec_ctx, grpc_lb_subchannel_data* sd); + grpc_lb_subchannel_data* sd); /// Stops watching the connectivity state of the subchannel. void grpc_lb_subchannel_data_stop_connectivity_watch( - grpc_exec_ctx* exec_ctx, grpc_lb_subchannel_data* sd); + grpc_lb_subchannel_data* sd); struct grpc_lb_subchannel_list { /** backpointer to owning policy */ @@ -117,15 +116,14 @@ struct grpc_lb_subchannel_list { }; grpc_lb_subchannel_list* grpc_lb_subchannel_list_create( - grpc_exec_ctx* exec_ctx, grpc_lb_policy* p, grpc_core::TraceFlag* tracer, + grpc_lb_policy* p, grpc_core::TraceFlag* tracer, const grpc_lb_addresses* addresses, const grpc_lb_policy_args* args, grpc_iomgr_cb_func connectivity_changed_cb); void grpc_lb_subchannel_list_ref(grpc_lb_subchannel_list* subchannel_list, const char* reason); -void grpc_lb_subchannel_list_unref(grpc_exec_ctx* exec_ctx, - grpc_lb_subchannel_list* subchannel_list, +void grpc_lb_subchannel_list_unref(grpc_lb_subchannel_list* subchannel_list, const char* reason); /// Takes and releases refs needed for a connectivity notification. @@ -133,13 +131,11 @@ void grpc_lb_subchannel_list_unref(grpc_exec_ctx* exec_ctx, void grpc_lb_subchannel_list_ref_for_connectivity_watch( grpc_lb_subchannel_list* subchannel_list, const char* reason); void grpc_lb_subchannel_list_unref_for_connectivity_watch( - grpc_exec_ctx* exec_ctx, grpc_lb_subchannel_list* subchannel_list, - const char* reason); + grpc_lb_subchannel_list* subchannel_list, const char* reason); /// Mark subchannel_list as discarded. Unsubscribes all its subchannels. The /// connectivity state notification callback will ultimately unref it. void grpc_lb_subchannel_list_shutdown_and_unref( - grpc_exec_ctx* exec_ctx, grpc_lb_subchannel_list* subchannel_list, - const char* reason); + grpc_lb_subchannel_list* subchannel_list, const char* reason); #endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_SUBCHANNEL_LIST_H */ diff --git a/src/core/ext/filters/client_channel/lb_policy_factory.cc b/src/core/ext/filters/client_channel/lb_policy_factory.cc index d43f9fd1b92..dbf69fdcba4 100644 --- a/src/core/ext/filters/client_channel/lb_policy_factory.cc +++ b/src/core/ext/filters/client_channel/lb_policy_factory.cc @@ -112,13 +112,11 @@ int grpc_lb_addresses_cmp(const grpc_lb_addresses* addresses1, return 0; } -void grpc_lb_addresses_destroy(grpc_exec_ctx* exec_ctx, - grpc_lb_addresses* addresses) { +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 (addresses->addresses[i].user_data != nullptr) { - addresses->user_data_vtable->destroy(exec_ctx, - addresses->addresses[i].user_data); + addresses->user_data_vtable->destroy(addresses->addresses[i].user_data); } } gpr_free(addresses->addresses); @@ -128,8 +126,8 @@ void grpc_lb_addresses_destroy(grpc_exec_ctx* exec_ctx, static void* lb_addresses_copy(void* addresses) { return grpc_lb_addresses_copy((grpc_lb_addresses*)addresses); } -static void lb_addresses_destroy(grpc_exec_ctx* exec_ctx, void* addresses) { - grpc_lb_addresses_destroy(exec_ctx, (grpc_lb_addresses*)addresses); +static void lb_addresses_destroy(void* addresses) { + grpc_lb_addresses_destroy((grpc_lb_addresses*)addresses); } static int lb_addresses_cmp(void* addresses1, void* addresses2) { return grpc_lb_addresses_cmp((grpc_lb_addresses*)addresses1, @@ -162,8 +160,7 @@ void grpc_lb_policy_factory_unref(grpc_lb_policy_factory* factory) { } grpc_lb_policy* grpc_lb_policy_factory_create_lb_policy( - grpc_exec_ctx* exec_ctx, grpc_lb_policy_factory* factory, - grpc_lb_policy_args* args) { + grpc_lb_policy_factory* factory, grpc_lb_policy_args* args) { if (factory == nullptr) return nullptr; - return factory->vtable->create_lb_policy(exec_ctx, factory, args); + return factory->vtable->create_lb_policy(factory, args); } diff --git a/src/core/ext/filters/client_channel/lb_policy_factory.h b/src/core/ext/filters/client_channel/lb_policy_factory.h index 8f6d8c1b082..9da231b657b 100644 --- a/src/core/ext/filters/client_channel/lb_policy_factory.h +++ b/src/core/ext/filters/client_channel/lb_policy_factory.h @@ -50,7 +50,7 @@ typedef struct grpc_lb_address { typedef struct grpc_lb_user_data_vtable { void* (*copy)(void*); - void (*destroy)(grpc_exec_ctx* exec_ctx, void*); + void (*destroy)(void*); int (*cmp)(void*, void*); } grpc_lb_user_data_vtable; @@ -91,8 +91,7 @@ int grpc_lb_addresses_cmp(const grpc_lb_addresses* addresses1, const grpc_lb_addresses* addresses2); /** Destroys \a addresses. */ -void grpc_lb_addresses_destroy(grpc_exec_ctx* exec_ctx, - grpc_lb_addresses* 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( @@ -114,8 +113,7 @@ struct grpc_lb_policy_factory_vtable { void (*unref)(grpc_lb_policy_factory* factory); /** Implementation of grpc_lb_policy_factory_create_lb_policy */ - grpc_lb_policy* (*create_lb_policy)(grpc_exec_ctx* exec_ctx, - grpc_lb_policy_factory* factory, + grpc_lb_policy* (*create_lb_policy)(grpc_lb_policy_factory* factory, grpc_lb_policy_args* args); /** Name for the LB policy this factory implements */ @@ -127,7 +125,6 @@ void grpc_lb_policy_factory_unref(grpc_lb_policy_factory* factory); /** Create a lb_policy instance. */ grpc_lb_policy* grpc_lb_policy_factory_create_lb_policy( - grpc_exec_ctx* exec_ctx, grpc_lb_policy_factory* factory, - grpc_lb_policy_args* args); + grpc_lb_policy_factory* factory, grpc_lb_policy_args* args); #endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_FACTORY_H */ diff --git a/src/core/ext/filters/client_channel/lb_policy_registry.cc b/src/core/ext/filters/client_channel/lb_policy_registry.cc index 6e710e86d95..edd0330c6a7 100644 --- a/src/core/ext/filters/client_channel/lb_policy_registry.cc +++ b/src/core/ext/filters/client_channel/lb_policy_registry.cc @@ -61,10 +61,10 @@ static grpc_lb_policy_factory* lookup_factory(const char* name) { return nullptr; } -grpc_lb_policy* grpc_lb_policy_create(grpc_exec_ctx* exec_ctx, const char* name, +grpc_lb_policy* grpc_lb_policy_create(const char* name, grpc_lb_policy_args* args) { grpc_lb_policy_factory* factory = lookup_factory(name); grpc_lb_policy* lb_policy = - grpc_lb_policy_factory_create_lb_policy(exec_ctx, factory, args); + grpc_lb_policy_factory_create_lb_policy(factory, args); return lb_policy; } diff --git a/src/core/ext/filters/client_channel/lb_policy_registry.h b/src/core/ext/filters/client_channel/lb_policy_registry.h index acddc90fddc..5aff79376b5 100644 --- a/src/core/ext/filters/client_channel/lb_policy_registry.h +++ b/src/core/ext/filters/client_channel/lb_policy_registry.h @@ -34,7 +34,7 @@ void grpc_register_lb_policy(grpc_lb_policy_factory* factory); * * If \a name is NULL, the default factory from \a grpc_lb_policy_registry_init * will be returned. */ -grpc_lb_policy* grpc_lb_policy_create(grpc_exec_ctx* exec_ctx, const char* name, +grpc_lb_policy* grpc_lb_policy_create(const char* name, grpc_lb_policy_args* args); #endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_REGISTRY_H */ diff --git a/src/core/ext/filters/client_channel/proxy_mapper.cc b/src/core/ext/filters/client_channel/proxy_mapper.cc index c6ea5fc680b..be85cfcced9 100644 --- a/src/core/ext/filters/client_channel/proxy_mapper.cc +++ b/src/core/ext/filters/client_channel/proxy_mapper.cc @@ -23,24 +23,22 @@ void grpc_proxy_mapper_init(const grpc_proxy_mapper_vtable* vtable, mapper->vtable = vtable; } -bool grpc_proxy_mapper_map_name(grpc_exec_ctx* exec_ctx, - grpc_proxy_mapper* mapper, +bool grpc_proxy_mapper_map_name(grpc_proxy_mapper* mapper, const char* server_uri, const grpc_channel_args* args, char** name_to_resolve, grpc_channel_args** new_args) { - return mapper->vtable->map_name(exec_ctx, mapper, server_uri, args, - name_to_resolve, new_args); + return mapper->vtable->map_name(mapper, server_uri, args, name_to_resolve, + new_args); } -bool grpc_proxy_mapper_map_address(grpc_exec_ctx* exec_ctx, - grpc_proxy_mapper* mapper, +bool grpc_proxy_mapper_map_address(grpc_proxy_mapper* mapper, const grpc_resolved_address* address, const grpc_channel_args* args, grpc_resolved_address** new_address, grpc_channel_args** new_args) { - return mapper->vtable->map_address(exec_ctx, mapper, address, args, - new_address, new_args); + return mapper->vtable->map_address(mapper, address, args, new_address, + new_args); } void grpc_proxy_mapper_destroy(grpc_proxy_mapper* mapper) { diff --git a/src/core/ext/filters/client_channel/proxy_mapper.h b/src/core/ext/filters/client_channel/proxy_mapper.h index a13861ccaf9..ce3e65ee466 100644 --- a/src/core/ext/filters/client_channel/proxy_mapper.h +++ b/src/core/ext/filters/client_channel/proxy_mapper.h @@ -32,14 +32,14 @@ typedef struct { /// If no proxy is needed, returns false. /// Otherwise, sets \a name_to_resolve, optionally sets \a new_args, /// and returns true. - bool (*map_name)(grpc_exec_ctx* exec_ctx, grpc_proxy_mapper* mapper, - const char* server_uri, const grpc_channel_args* args, - char** name_to_resolve, grpc_channel_args** new_args); + bool (*map_name)(grpc_proxy_mapper* mapper, const char* server_uri, + const grpc_channel_args* args, char** name_to_resolve, + grpc_channel_args** new_args); /// Determines the proxy address to use to contact \a address. /// If no proxy is needed, returns false. /// Otherwise, sets \a new_address, optionally sets \a new_args, and /// returns true. - bool (*map_address)(grpc_exec_ctx* exec_ctx, grpc_proxy_mapper* mapper, + bool (*map_address)(grpc_proxy_mapper* mapper, const grpc_resolved_address* address, const grpc_channel_args* args, grpc_resolved_address** new_address, @@ -55,15 +55,13 @@ struct grpc_proxy_mapper { void grpc_proxy_mapper_init(const grpc_proxy_mapper_vtable* vtable, grpc_proxy_mapper* mapper); -bool grpc_proxy_mapper_map_name(grpc_exec_ctx* exec_ctx, - grpc_proxy_mapper* mapper, +bool grpc_proxy_mapper_map_name(grpc_proxy_mapper* mapper, const char* server_uri, const grpc_channel_args* args, char** name_to_resolve, grpc_channel_args** new_args); -bool grpc_proxy_mapper_map_address(grpc_exec_ctx* exec_ctx, - grpc_proxy_mapper* mapper, +bool grpc_proxy_mapper_map_address(grpc_proxy_mapper* mapper, const grpc_resolved_address* address, const grpc_channel_args* args, grpc_resolved_address** new_address, diff --git a/src/core/ext/filters/client_channel/proxy_mapper_registry.cc b/src/core/ext/filters/client_channel/proxy_mapper_registry.cc index 09967eea3c0..51778a20cc5 100644 --- a/src/core/ext/filters/client_channel/proxy_mapper_registry.cc +++ b/src/core/ext/filters/client_channel/proxy_mapper_registry.cc @@ -46,14 +46,13 @@ static void grpc_proxy_mapper_list_register(grpc_proxy_mapper_list* list, ++list->num_mappers; } -static bool grpc_proxy_mapper_list_map_name(grpc_exec_ctx* exec_ctx, - grpc_proxy_mapper_list* list, +static bool grpc_proxy_mapper_list_map_name(grpc_proxy_mapper_list* list, const char* server_uri, const grpc_channel_args* args, char** name_to_resolve, grpc_channel_args** new_args) { for (size_t i = 0; i < list->num_mappers; ++i) { - if (grpc_proxy_mapper_map_name(exec_ctx, list->list[i], server_uri, args, + if (grpc_proxy_mapper_map_name(list->list[i], server_uri, args, name_to_resolve, new_args)) { return true; } @@ -62,12 +61,12 @@ static bool grpc_proxy_mapper_list_map_name(grpc_exec_ctx* exec_ctx, } static bool grpc_proxy_mapper_list_map_address( - grpc_exec_ctx* exec_ctx, grpc_proxy_mapper_list* list, - const grpc_resolved_address* address, const grpc_channel_args* args, - grpc_resolved_address** new_address, grpc_channel_args** new_args) { + grpc_proxy_mapper_list* list, const grpc_resolved_address* address, + const grpc_channel_args* args, grpc_resolved_address** new_address, + grpc_channel_args** new_args) { for (size_t i = 0; i < list->num_mappers; ++i) { - if (grpc_proxy_mapper_map_address(exec_ctx, list->list[i], address, args, - new_address, new_args)) { + if (grpc_proxy_mapper_map_address(list->list[i], address, args, new_address, + new_args)) { return true; } } @@ -105,20 +104,17 @@ void grpc_proxy_mapper_register(bool at_start, grpc_proxy_mapper* mapper) { grpc_proxy_mapper_list_register(&g_proxy_mapper_list, at_start, mapper); } -bool grpc_proxy_mappers_map_name(grpc_exec_ctx* exec_ctx, - const char* server_uri, +bool grpc_proxy_mappers_map_name(const char* server_uri, const grpc_channel_args* args, char** name_to_resolve, grpc_channel_args** new_args) { - return grpc_proxy_mapper_list_map_name(exec_ctx, &g_proxy_mapper_list, - server_uri, args, name_to_resolve, - new_args); + return grpc_proxy_mapper_list_map_name(&g_proxy_mapper_list, server_uri, args, + name_to_resolve, new_args); } -bool grpc_proxy_mappers_map_address(grpc_exec_ctx* exec_ctx, - const grpc_resolved_address* address, +bool grpc_proxy_mappers_map_address(const grpc_resolved_address* address, const grpc_channel_args* args, grpc_resolved_address** new_address, grpc_channel_args** new_args) { - return grpc_proxy_mapper_list_map_address( - exec_ctx, &g_proxy_mapper_list, address, args, new_address, new_args); + return grpc_proxy_mapper_list_map_address(&g_proxy_mapper_list, address, args, + new_address, new_args); } diff --git a/src/core/ext/filters/client_channel/proxy_mapper_registry.h b/src/core/ext/filters/client_channel/proxy_mapper_registry.h index 99e54d1a78b..2ad6c04e1d1 100644 --- a/src/core/ext/filters/client_channel/proxy_mapper_registry.h +++ b/src/core/ext/filters/client_channel/proxy_mapper_registry.h @@ -29,14 +29,12 @@ void grpc_proxy_mapper_registry_shutdown(); /// the list. Otherwise, it will be added to the end. void grpc_proxy_mapper_register(bool at_start, grpc_proxy_mapper* mapper); -bool grpc_proxy_mappers_map_name(grpc_exec_ctx* exec_ctx, - const char* server_uri, +bool grpc_proxy_mappers_map_name(const char* server_uri, const grpc_channel_args* args, char** name_to_resolve, grpc_channel_args** new_args); -bool grpc_proxy_mappers_map_address(grpc_exec_ctx* exec_ctx, - const grpc_resolved_address* address, +bool grpc_proxy_mappers_map_address(const grpc_resolved_address* address, const grpc_channel_args* args, grpc_resolved_address** new_address, grpc_channel_args** new_args); diff --git a/src/core/ext/filters/client_channel/resolver.cc b/src/core/ext/filters/client_channel/resolver.cc index c16b1515c7c..ff54e7179da 100644 --- a/src/core/ext/filters/client_channel/resolver.cc +++ b/src/core/ext/filters/client_channel/resolver.cc @@ -46,8 +46,8 @@ void grpc_resolver_ref(grpc_resolver* resolver) { } #ifndef NDEBUG -void grpc_resolver_unref(grpc_exec_ctx* exec_ctx, grpc_resolver* resolver, - const char* file, int line, const char* reason) { +void grpc_resolver_unref(grpc_resolver* resolver, const char* file, int line, + const char* reason) { if (grpc_trace_resolver_refcount.enabled()) { gpr_atm old_refs = gpr_atm_no_barrier_load(&resolver->refs.count); gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, @@ -55,27 +55,25 @@ void grpc_resolver_unref(grpc_exec_ctx* exec_ctx, grpc_resolver* resolver, old_refs, old_refs - 1, reason); } #else -void grpc_resolver_unref(grpc_exec_ctx* exec_ctx, grpc_resolver* resolver) { +void grpc_resolver_unref(grpc_resolver* resolver) { #endif if (gpr_unref(&resolver->refs)) { grpc_combiner* combiner = resolver->combiner; - resolver->vtable->destroy(exec_ctx, resolver); - GRPC_COMBINER_UNREF(exec_ctx, combiner, "resolver"); + resolver->vtable->destroy(resolver); + GRPC_COMBINER_UNREF(combiner, "resolver"); } } -void grpc_resolver_shutdown_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* resolver) { - resolver->vtable->shutdown_locked(exec_ctx, resolver); +void grpc_resolver_shutdown_locked(grpc_resolver* resolver) { + resolver->vtable->shutdown_locked(resolver); } -void grpc_resolver_channel_saw_error_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* resolver) { - resolver->vtable->channel_saw_error_locked(exec_ctx, resolver); +void grpc_resolver_channel_saw_error_locked(grpc_resolver* resolver) { + resolver->vtable->channel_saw_error_locked(resolver); } -void grpc_resolver_next_locked(grpc_exec_ctx* exec_ctx, grpc_resolver* resolver, +void grpc_resolver_next_locked(grpc_resolver* resolver, grpc_channel_args** result, grpc_closure* on_complete) { - resolver->vtable->next_locked(exec_ctx, resolver, result, on_complete); + resolver->vtable->next_locked(resolver, result, on_complete); } diff --git a/src/core/ext/filters/client_channel/resolver.h b/src/core/ext/filters/client_channel/resolver.h index 4e8cfbe4170..f6a4af01d67 100644 --- a/src/core/ext/filters/client_channel/resolver.h +++ b/src/core/ext/filters/client_channel/resolver.h @@ -35,43 +35,40 @@ struct grpc_resolver { }; struct grpc_resolver_vtable { - void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_resolver* resolver); - void (*shutdown_locked)(grpc_exec_ctx* exec_ctx, grpc_resolver* resolver); - void (*channel_saw_error_locked)(grpc_exec_ctx* exec_ctx, - grpc_resolver* resolver); - void (*next_locked)(grpc_exec_ctx* exec_ctx, grpc_resolver* resolver, - grpc_channel_args** result, grpc_closure* on_complete); + void (*destroy)(grpc_resolver* resolver); + void (*shutdown_locked)(grpc_resolver* resolver); + void (*channel_saw_error_locked)(grpc_resolver* resolver); + void (*next_locked)(grpc_resolver* resolver, grpc_channel_args** result, + grpc_closure* on_complete); }; #ifndef NDEBUG #define GRPC_RESOLVER_REF(p, r) grpc_resolver_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_RESOLVER_UNREF(e, p, r) \ - grpc_resolver_unref((e), (p), __FILE__, __LINE__, (r)) +#define GRPC_RESOLVER_UNREF(p, r) \ + grpc_resolver_unref((p), __FILE__, __LINE__, (r)) void grpc_resolver_ref(grpc_resolver* policy, const char* file, int line, const char* reason); -void grpc_resolver_unref(grpc_exec_ctx* exec_ctx, grpc_resolver* policy, - const char* file, int line, const char* reason); +void grpc_resolver_unref(grpc_resolver* policy, const char* file, int line, + const char* reason); #else #define GRPC_RESOLVER_REF(p, r) grpc_resolver_ref((p)) -#define GRPC_RESOLVER_UNREF(e, p, r) grpc_resolver_unref((e), (p)) +#define GRPC_RESOLVER_UNREF(p, r) grpc_resolver_unref((p)) void grpc_resolver_ref(grpc_resolver* policy); -void grpc_resolver_unref(grpc_exec_ctx* exec_ctx, grpc_resolver* policy); +void grpc_resolver_unref(grpc_resolver* policy); #endif void grpc_resolver_init(grpc_resolver* resolver, const grpc_resolver_vtable* vtable, grpc_combiner* combiner); -void grpc_resolver_shutdown_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* resolver); +void grpc_resolver_shutdown_locked(grpc_resolver* resolver); /** Notification that the channel has seen an error on some address. Can be used as a hint that re-resolution is desirable soon. Must be called from the combiner passed as a resolver_arg at construction time.*/ -void grpc_resolver_channel_saw_error_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* resolver); +void grpc_resolver_channel_saw_error_locked(grpc_resolver* resolver); /** Get the next result from the resolver. Expected to set \a *result with new channel args and then schedule \a on_complete for execution. @@ -81,7 +78,7 @@ void grpc_resolver_channel_saw_error_locked(grpc_exec_ctx* exec_ctx, Must be called from the combiner passed as a resolver_arg at construction time.*/ -void grpc_resolver_next_locked(grpc_exec_ctx* exec_ctx, grpc_resolver* resolver, +void grpc_resolver_next_locked(grpc_resolver* resolver, grpc_channel_args** result, grpc_closure* on_complete); diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc index 3a16b3492d1..4ec4477c828 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc @@ -97,17 +97,14 @@ typedef struct { char* service_config_json; } ares_dns_resolver; -static void dns_ares_destroy(grpc_exec_ctx* exec_ctx, grpc_resolver* r); +static void dns_ares_destroy(grpc_resolver* r); -static void dns_ares_start_resolving_locked(grpc_exec_ctx* exec_ctx, - ares_dns_resolver* r); -static void dns_ares_maybe_finish_next_locked(grpc_exec_ctx* exec_ctx, - ares_dns_resolver* r); +static void dns_ares_start_resolving_locked(ares_dns_resolver* r); +static void dns_ares_maybe_finish_next_locked(ares_dns_resolver* r); -static void dns_ares_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_resolver* r); -static void dns_ares_channel_saw_error_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* r); -static void dns_ares_next_locked(grpc_exec_ctx* exec_ctx, grpc_resolver* r, +static void dns_ares_shutdown_locked(grpc_resolver* r); +static void dns_ares_channel_saw_error_locked(grpc_resolver* r); +static void dns_ares_next_locked(grpc_resolver* r, grpc_channel_args** target_result, grpc_closure* on_complete); @@ -115,43 +112,39 @@ static const grpc_resolver_vtable dns_ares_resolver_vtable = { dns_ares_destroy, dns_ares_shutdown_locked, dns_ares_channel_saw_error_locked, dns_ares_next_locked}; -static void dns_ares_shutdown_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* resolver) { +static void dns_ares_shutdown_locked(grpc_resolver* resolver) { ares_dns_resolver* r = (ares_dns_resolver*)resolver; if (r->have_retry_timer) { - grpc_timer_cancel(exec_ctx, &r->retry_timer); + grpc_timer_cancel(&r->retry_timer); } if (r->pending_request != nullptr) { - grpc_cancel_ares_request(exec_ctx, r->pending_request); + grpc_cancel_ares_request(r->pending_request); } if (r->next_completion != nullptr) { *r->target_result = nullptr; - GRPC_CLOSURE_SCHED( - exec_ctx, r->next_completion, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resolver Shutdown")); + GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Resolver Shutdown")); r->next_completion = nullptr; } } -static void dns_ares_channel_saw_error_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* resolver) { +static void dns_ares_channel_saw_error_locked(grpc_resolver* resolver) { ares_dns_resolver* r = (ares_dns_resolver*)resolver; if (!r->resolving) { grpc_backoff_reset(&r->backoff_state); - dns_ares_start_resolving_locked(exec_ctx, r); + dns_ares_start_resolving_locked(r); } } -static void dns_ares_on_retry_timer_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void dns_ares_on_retry_timer_locked(void* arg, grpc_error* error) { ares_dns_resolver* r = (ares_dns_resolver*)arg; r->have_retry_timer = false; if (error == GRPC_ERROR_NONE) { if (!r->resolving) { - dns_ares_start_resolving_locked(exec_ctx, r); + dns_ares_start_resolving_locked(r); } } - GRPC_RESOLVER_UNREF(exec_ctx, &r->base, "retry-timer"); + GRPC_RESOLVER_UNREF(&r->base, "retry-timer"); } static bool value_in_json_array(grpc_json* array, const char* value) { @@ -226,8 +219,7 @@ static char* choose_service_config(char* service_config_choice_json) { return service_config; } -static void dns_ares_on_resolved_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void dns_ares_on_resolved_locked(void* arg, grpc_error* error) { ares_dns_resolver* r = (ares_dns_resolver*)arg; grpc_channel_args* result = nullptr; GPR_ASSERT(r->resolving); @@ -268,13 +260,13 @@ static void dns_ares_on_resolved_locked(grpc_exec_ctx* exec_ctx, void* arg, num_args_to_add); if (service_config != nullptr) grpc_service_config_destroy(service_config); gpr_free(service_config_string); - grpc_lb_addresses_destroy(exec_ctx, r->lb_addresses); + grpc_lb_addresses_destroy(r->lb_addresses); } else { const char* msg = grpc_error_string(error); gpr_log(GPR_DEBUG, "dns resolution failed: %s", msg); grpc_millis next_try = - grpc_backoff_step(exec_ctx, &r->backoff_state).next_attempt_start_time; - grpc_millis timeout = next_try - grpc_exec_ctx_now(exec_ctx); + grpc_backoff_step(&r->backoff_state).next_attempt_start_time; + grpc_millis timeout = next_try - grpc_core::ExecCtx::Get()->Now(); gpr_log(GPR_INFO, "dns resolution failed (will retry): %s", grpc_error_string(error)); GPR_ASSERT(!r->have_retry_timer); @@ -285,20 +277,19 @@ static void dns_ares_on_resolved_locked(grpc_exec_ctx* exec_ctx, void* arg, } else { gpr_log(GPR_DEBUG, "retrying immediately"); } - grpc_timer_init(exec_ctx, &r->retry_timer, next_try, + grpc_timer_init(&r->retry_timer, next_try, &r->dns_ares_on_retry_timer_locked); } if (r->resolved_result != nullptr) { - grpc_channel_args_destroy(exec_ctx, r->resolved_result); + grpc_channel_args_destroy(r->resolved_result); } r->resolved_result = result; r->resolved_version++; - dns_ares_maybe_finish_next_locked(exec_ctx, r); - GRPC_RESOLVER_UNREF(exec_ctx, &r->base, "dns-resolving"); + dns_ares_maybe_finish_next_locked(r); + GRPC_RESOLVER_UNREF(&r->base, "dns-resolving"); } -static void dns_ares_next_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* resolver, +static void dns_ares_next_locked(grpc_resolver* resolver, grpc_channel_args** target_result, grpc_closure* on_complete) { gpr_log(GPR_DEBUG, "dns_ares_next is called."); @@ -308,56 +299,53 @@ static void dns_ares_next_locked(grpc_exec_ctx* exec_ctx, r->target_result = target_result; if (r->resolved_version == 0 && !r->resolving) { grpc_backoff_reset(&r->backoff_state); - dns_ares_start_resolving_locked(exec_ctx, r); + dns_ares_start_resolving_locked(r); } else { - dns_ares_maybe_finish_next_locked(exec_ctx, r); + dns_ares_maybe_finish_next_locked(r); } } -static void dns_ares_start_resolving_locked(grpc_exec_ctx* exec_ctx, - ares_dns_resolver* r) { +static void dns_ares_start_resolving_locked(ares_dns_resolver* r) { GRPC_RESOLVER_REF(&r->base, "dns-resolving"); GPR_ASSERT(!r->resolving); r->resolving = true; r->lb_addresses = nullptr; r->service_config_json = nullptr; r->pending_request = grpc_dns_lookup_ares( - exec_ctx, r->dns_server, r->name_to_resolve, r->default_port, - r->interested_parties, &r->dns_ares_on_resolved_locked, &r->lb_addresses, + r->dns_server, r->name_to_resolve, r->default_port, r->interested_parties, + &r->dns_ares_on_resolved_locked, &r->lb_addresses, true /* check_grpclb */, r->request_service_config ? &r->service_config_json : nullptr); } -static void dns_ares_maybe_finish_next_locked(grpc_exec_ctx* exec_ctx, - ares_dns_resolver* r) { +static void dns_ares_maybe_finish_next_locked(ares_dns_resolver* r) { if (r->next_completion != nullptr && r->resolved_version != r->published_version) { *r->target_result = r->resolved_result == nullptr ? nullptr : grpc_channel_args_copy(r->resolved_result); gpr_log(GPR_DEBUG, "dns_ares_maybe_finish_next_locked"); - GRPC_CLOSURE_SCHED(exec_ctx, r->next_completion, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_NONE); r->next_completion = nullptr; r->published_version = r->resolved_version; } } -static void dns_ares_destroy(grpc_exec_ctx* exec_ctx, grpc_resolver* gr) { +static void dns_ares_destroy(grpc_resolver* gr) { gpr_log(GPR_DEBUG, "dns_ares_destroy"); ares_dns_resolver* r = (ares_dns_resolver*)gr; if (r->resolved_result != nullptr) { - grpc_channel_args_destroy(exec_ctx, r->resolved_result); + grpc_channel_args_destroy(r->resolved_result); } - grpc_pollset_set_destroy(exec_ctx, r->interested_parties); + grpc_pollset_set_destroy(r->interested_parties); gpr_free(r->dns_server); gpr_free(r->name_to_resolve); gpr_free(r->default_port); - grpc_channel_args_destroy(exec_ctx, r->channel_args); + grpc_channel_args_destroy(r->channel_args); gpr_free(r); } -static grpc_resolver* dns_ares_create(grpc_exec_ctx* exec_ctx, - grpc_resolver_args* args, +static grpc_resolver* dns_ares_create(grpc_resolver_args* args, const char* default_port) { /* Get name from args. */ const char* path = args->uri->path; @@ -378,8 +366,7 @@ static grpc_resolver* dns_ares_create(grpc_exec_ctx* exec_ctx, arg, (grpc_integer_options){false, false, true}); r->interested_parties = grpc_pollset_set_create(); if (args->pollset_set != nullptr) { - grpc_pollset_set_add_pollset_set(exec_ctx, r->interested_parties, - args->pollset_set); + grpc_pollset_set_add_pollset_set(r->interested_parties, args->pollset_set); } grpc_backoff_init( &r->backoff_state, GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS * 1000, @@ -404,9 +391,8 @@ static void dns_ares_factory_ref(grpc_resolver_factory* factory) {} static void dns_ares_factory_unref(grpc_resolver_factory* factory) {} static grpc_resolver* dns_factory_create_resolver( - grpc_exec_ctx* exec_ctx, grpc_resolver_factory* factory, - grpc_resolver_args* args) { - return dns_ares_create(exec_ctx, args, "https"); + grpc_resolver_factory* factory, grpc_resolver_args* args) { + return dns_ares_create(args, "https"); } static char* dns_ares_factory_get_default_host_name( diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h index 03ea36bfcc4..ba7dad63cfa 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h @@ -28,8 +28,7 @@ typedef struct grpc_ares_ev_driver grpc_ares_ev_driver; /* Start \a ev_driver. It will keep working until all IO on its ares_channel is done, or grpc_ares_ev_driver_destroy() is called. It may notify the callbacks bound to its ares_channel when necessary. */ -void grpc_ares_ev_driver_start(grpc_exec_ctx* exec_ctx, - grpc_ares_ev_driver* ev_driver); +void grpc_ares_ev_driver_start(grpc_ares_ev_driver* ev_driver); /* Returns the ares_channel owned by \a ev_driver. To bind a c-ares query to \a ev_driver, use the ares_channel owned by \a ev_driver as the arg of the @@ -47,8 +46,7 @@ grpc_error* grpc_ares_ev_driver_create(grpc_ares_ev_driver** ev_driver, void grpc_ares_ev_driver_destroy(grpc_ares_ev_driver* ev_driver); /* Shutdown all the grpc_fds used by \a ev_driver */ -void grpc_ares_ev_driver_shutdown(grpc_exec_ctx* exec_ctx, - grpc_ares_ev_driver* ev_driver); +void grpc_ares_ev_driver_shutdown(grpc_ares_ev_driver* ev_driver); #endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H \ */ diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc index 4cb068a41dd..40e264504cf 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc @@ -77,8 +77,7 @@ struct grpc_ares_ev_driver { bool shutting_down; }; -static void grpc_ares_notify_on_event_locked(grpc_exec_ctx* exec_ctx, - grpc_ares_ev_driver* ev_driver); +static void grpc_ares_notify_on_event_locked(grpc_ares_ev_driver* ev_driver); static grpc_ares_ev_driver* grpc_ares_ev_driver_ref( grpc_ares_ev_driver* ev_driver) { @@ -98,7 +97,7 @@ static void grpc_ares_ev_driver_unref(grpc_ares_ev_driver* ev_driver) { } } -static void fd_node_destroy(grpc_exec_ctx* exec_ctx, fd_node* fdn) { +static void fd_node_destroy(fd_node* fdn) { gpr_log(GPR_DEBUG, "delete fd: %d", grpc_fd_wrapped_fd(fdn->fd)); GPR_ASSERT(!fdn->readable_registered); GPR_ASSERT(!fdn->writable_registered); @@ -106,21 +105,20 @@ static void fd_node_destroy(grpc_exec_ctx* exec_ctx, fd_node* fdn) { /* c-ares library has closed the fd inside grpc_fd. This fd may be picked up immediately by another thread, and should not be closed by the following grpc_fd_orphan. */ - grpc_fd_orphan(exec_ctx, fdn->fd, nullptr, nullptr, true /* already_closed */, + grpc_fd_orphan(fdn->fd, nullptr, nullptr, true /* already_closed */, "c-ares query finished"); gpr_free(fdn); } -static void fd_node_shutdown(grpc_exec_ctx* exec_ctx, fd_node* fdn) { +static void fd_node_shutdown(fd_node* fdn) { gpr_mu_lock(&fdn->mu); fdn->shutting_down = true; if (!fdn->readable_registered && !fdn->writable_registered) { gpr_mu_unlock(&fdn->mu); - fd_node_destroy(exec_ctx, fdn); + fd_node_destroy(fdn); } else { grpc_fd_shutdown( - exec_ctx, fdn->fd, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("c-ares fd shutdown")); + fdn->fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("c-ares fd shutdown")); gpr_mu_unlock(&fdn->mu); } } @@ -160,15 +158,13 @@ void grpc_ares_ev_driver_destroy(grpc_ares_ev_driver* ev_driver) { grpc_ares_ev_driver_unref(ev_driver); } -void grpc_ares_ev_driver_shutdown(grpc_exec_ctx* exec_ctx, - grpc_ares_ev_driver* ev_driver) { +void grpc_ares_ev_driver_shutdown(grpc_ares_ev_driver* ev_driver) { gpr_mu_lock(&ev_driver->mu); ev_driver->shutting_down = true; fd_node* fn = ev_driver->fds; while (fn != nullptr) { - grpc_fd_shutdown( - exec_ctx, fn->fd, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("grpc_ares_ev_driver_shutdown")); + grpc_fd_shutdown(fn->fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "grpc_ares_ev_driver_shutdown")); fn = fn->next; } gpr_mu_unlock(&ev_driver->mu); @@ -199,8 +195,7 @@ static bool grpc_ares_is_fd_still_readable(grpc_ares_ev_driver* ev_driver, return ioctl(fd, FIONREAD, &bytes_available) == 0 && bytes_available > 0; } -static void on_readable_cb(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_readable_cb(void* arg, grpc_error* error) { fd_node* fdn = (fd_node*)arg; grpc_ares_ev_driver* ev_driver = fdn->ev_driver; gpr_mu_lock(&fdn->mu); @@ -208,7 +203,7 @@ static void on_readable_cb(grpc_exec_ctx* exec_ctx, void* arg, fdn->readable_registered = false; if (fdn->shutting_down && !fdn->writable_registered) { gpr_mu_unlock(&fdn->mu); - fd_node_destroy(exec_ctx, fdn); + fd_node_destroy(fdn); grpc_ares_ev_driver_unref(ev_driver); return; } @@ -229,13 +224,12 @@ static void on_readable_cb(grpc_exec_ctx* exec_ctx, void* arg, ares_cancel(ev_driver->channel); } gpr_mu_lock(&ev_driver->mu); - grpc_ares_notify_on_event_locked(exec_ctx, ev_driver); + grpc_ares_notify_on_event_locked(ev_driver); gpr_mu_unlock(&ev_driver->mu); grpc_ares_ev_driver_unref(ev_driver); } -static void on_writable_cb(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_writable_cb(void* arg, grpc_error* error) { fd_node* fdn = (fd_node*)arg; grpc_ares_ev_driver* ev_driver = fdn->ev_driver; gpr_mu_lock(&fdn->mu); @@ -243,7 +237,7 @@ static void on_writable_cb(grpc_exec_ctx* exec_ctx, void* arg, fdn->writable_registered = false; if (fdn->shutting_down && !fdn->readable_registered) { gpr_mu_unlock(&fdn->mu); - fd_node_destroy(exec_ctx, fdn); + fd_node_destroy(fdn); grpc_ares_ev_driver_unref(ev_driver); return; } @@ -262,7 +256,7 @@ static void on_writable_cb(grpc_exec_ctx* exec_ctx, void* arg, ares_cancel(ev_driver->channel); } gpr_mu_lock(&ev_driver->mu); - grpc_ares_notify_on_event_locked(exec_ctx, ev_driver); + grpc_ares_notify_on_event_locked(ev_driver); gpr_mu_unlock(&ev_driver->mu); grpc_ares_ev_driver_unref(ev_driver); } @@ -273,8 +267,7 @@ ares_channel* grpc_ares_ev_driver_get_channel(grpc_ares_ev_driver* ev_driver) { // Get the file descriptors used by the ev_driver's ares channel, register // driver_closure with these filedescriptors. -static void grpc_ares_notify_on_event_locked(grpc_exec_ctx* exec_ctx, - grpc_ares_ev_driver* ev_driver) { +static void grpc_ares_notify_on_event_locked(grpc_ares_ev_driver* ev_driver) { fd_node* new_list = nullptr; if (!ev_driver->shutting_down) { ares_socket_t socks[ARES_GETSOCK_MAXNUM]; @@ -300,7 +293,7 @@ static void grpc_ares_notify_on_event_locked(grpc_exec_ctx* exec_ctx, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&fdn->write_closure, on_writable_cb, fdn, grpc_schedule_on_exec_ctx); - grpc_pollset_set_add_fd(exec_ctx, ev_driver->pollset_set, fdn->fd); + grpc_pollset_set_add_fd(ev_driver->pollset_set, fdn->fd); gpr_free(fd_name); } fdn->next = new_list; @@ -312,7 +305,7 @@ static void grpc_ares_notify_on_event_locked(grpc_exec_ctx* exec_ctx, !fdn->readable_registered) { grpc_ares_ev_driver_ref(ev_driver); gpr_log(GPR_DEBUG, "notify read on: %d", grpc_fd_wrapped_fd(fdn->fd)); - grpc_fd_notify_on_read(exec_ctx, fdn->fd, &fdn->read_closure); + grpc_fd_notify_on_read(fdn->fd, &fdn->read_closure); fdn->readable_registered = true; } // Register write_closure if the socket is writable and write_closure @@ -322,7 +315,7 @@ static void grpc_ares_notify_on_event_locked(grpc_exec_ctx* exec_ctx, gpr_log(GPR_DEBUG, "notify write on: %d", grpc_fd_wrapped_fd(fdn->fd)); grpc_ares_ev_driver_ref(ev_driver); - grpc_fd_notify_on_write(exec_ctx, fdn->fd, &fdn->write_closure); + grpc_fd_notify_on_write(fdn->fd, &fdn->write_closure); fdn->writable_registered = true; } gpr_mu_unlock(&fdn->mu); @@ -335,7 +328,7 @@ static void grpc_ares_notify_on_event_locked(grpc_exec_ctx* exec_ctx, while (ev_driver->fds != nullptr) { fd_node* cur = ev_driver->fds; ev_driver->fds = ev_driver->fds->next; - fd_node_shutdown(exec_ctx, cur); + fd_node_shutdown(cur); } ev_driver->fds = new_list; // If the ev driver has no working fd, all the tasks are done. @@ -345,12 +338,11 @@ static void grpc_ares_notify_on_event_locked(grpc_exec_ctx* exec_ctx, } } -void grpc_ares_ev_driver_start(grpc_exec_ctx* exec_ctx, - grpc_ares_ev_driver* ev_driver) { +void grpc_ares_ev_driver_start(grpc_ares_ev_driver* ev_driver) { gpr_mu_lock(&ev_driver->mu); if (!ev_driver->working) { ev_driver->working = true; - grpc_ares_notify_on_event_locked(exec_ctx, ev_driver); + grpc_ares_notify_on_event_locked(ev_driver); } gpr_mu_unlock(&ev_driver->mu); } diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc index 7846576c116..3a870b2d061 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -96,24 +96,12 @@ static void grpc_ares_request_ref(grpc_ares_request* r) { gpr_ref(&r->pending_queries); } -static void grpc_ares_request_unref(grpc_exec_ctx* exec_ctx, - grpc_ares_request* r) { +static void grpc_ares_request_unref(grpc_ares_request* r) { /* If there are no pending queries, invoke on_done callback and destroy the request */ if (gpr_unref(&r->pending_queries)) { /* TODO(zyc): Sort results with RFC6724 before invoking on_done. */ - if (exec_ctx == nullptr) { - /* A new exec_ctx is created here, as the c-ares interface does not - provide one in ares_host_callback. It's safe to schedule on_done with - the newly created exec_ctx, since the caller has been warned not to - acquire locks in on_done. ares_dns_resolver is using combiner to - protect resources needed by on_done. */ - grpc_exec_ctx new_exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_CLOSURE_SCHED(&new_exec_ctx, r->on_done, r->error); - grpc_exec_ctx_finish(&new_exec_ctx); - } else { - GRPC_CLOSURE_SCHED(exec_ctx, r->on_done, r->error); - } + GRPC_CLOSURE_SCHED(r->on_done, r->error); gpr_mu_destroy(&r->mu); grpc_ares_ev_driver_destroy(r->ev_driver); gpr_free(r); @@ -133,9 +121,8 @@ static grpc_ares_hostbyname_request* create_hostbyname_request( return hr; } -static void destroy_hostbyname_request(grpc_exec_ctx* exec_ctx, - grpc_ares_hostbyname_request* hr) { - grpc_ares_request_unref(exec_ctx, hr->parent_request); +static void destroy_hostbyname_request(grpc_ares_hostbyname_request* hr) { + grpc_ares_request_unref(hr->parent_request); gpr_free(hr->host); gpr_free(hr); } @@ -220,13 +207,13 @@ static void on_hostbyname_done_cb(void* arg, int status, int timeouts, } } gpr_mu_unlock(&r->mu); - destroy_hostbyname_request(nullptr, hr); + destroy_hostbyname_request(hr); } static void on_srv_query_done_cb(void* arg, int status, int timeouts, unsigned char* abuf, int alen) { grpc_ares_request* r = (grpc_ares_request*)arg; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_DEBUG, "on_query_srv_done_cb"); if (status == ARES_SUCCESS) { gpr_log(GPR_DEBUG, "on_query_srv_done_cb ARES_SUCCESS"); @@ -246,7 +233,7 @@ static void on_srv_query_done_cb(void* arg, int status, int timeouts, r, srv_it->host, htons(srv_it->port), true /* is_balancer */); ares_gethostbyname(*channel, hr->host, AF_INET, on_hostbyname_done_cb, hr); - grpc_ares_ev_driver_start(&exec_ctx, r->ev_driver); + grpc_ares_ev_driver_start(r->ev_driver); } } if (reply != nullptr) { @@ -264,8 +251,7 @@ static void on_srv_query_done_cb(void* arg, int status, int timeouts, r->error = grpc_error_add_child(error, r->error); } } - grpc_ares_request_unref(&exec_ctx, r); - grpc_exec_ctx_finish(&exec_ctx); + grpc_ares_request_unref(r); } static const char g_service_config_attribute_prefix[] = "grpc_config="; @@ -323,14 +309,13 @@ fail: } done: gpr_mu_unlock(&r->mu); - grpc_ares_request_unref(nullptr, r); + grpc_ares_request_unref(r); } static grpc_ares_request* grpc_dns_lookup_ares_impl( - grpc_exec_ctx* exec_ctx, const char* dns_server, const char* name, - const char* default_port, grpc_pollset_set* interested_parties, - grpc_closure* on_done, grpc_lb_addresses** addrs, bool check_grpclb, - char** service_config_json) { + const char* dns_server, const char* name, const char* default_port, + grpc_pollset_set* interested_parties, grpc_closure* on_done, + grpc_lb_addresses** addrs, bool check_grpclb, char** service_config_json) { grpc_error* error = GRPC_ERROR_NONE; grpc_ares_hostbyname_request* hr = nullptr; grpc_ares_request* r = nullptr; @@ -437,28 +422,28 @@ static grpc_ares_request* grpc_dns_lookup_ares_impl( gpr_free(config_name); } /* TODO(zyc): Handle CNAME records here. */ - grpc_ares_ev_driver_start(exec_ctx, r->ev_driver); - grpc_ares_request_unref(exec_ctx, r); + grpc_ares_ev_driver_start(r->ev_driver); + grpc_ares_request_unref(r); gpr_free(host); gpr_free(port); return r; error_cleanup: - GRPC_CLOSURE_SCHED(exec_ctx, on_done, error); + GRPC_CLOSURE_SCHED(on_done, error); gpr_free(host); gpr_free(port); return nullptr; } grpc_ares_request* (*grpc_dns_lookup_ares)( - grpc_exec_ctx* exec_ctx, const char* dns_server, const char* name, - const char* default_port, grpc_pollset_set* interested_parties, - grpc_closure* on_done, grpc_lb_addresses** addrs, bool check_grpclb, + const char* dns_server, const char* name, const char* default_port, + grpc_pollset_set* interested_parties, grpc_closure* on_done, + grpc_lb_addresses** addrs, bool check_grpclb, char** service_config_json) = grpc_dns_lookup_ares_impl; -void grpc_cancel_ares_request(grpc_exec_ctx* exec_ctx, grpc_ares_request* r) { +void grpc_cancel_ares_request(grpc_ares_request* r) { if (grpc_dns_lookup_ares == grpc_dns_lookup_ares_impl) { - grpc_ares_ev_driver_shutdown(exec_ctx, r->ev_driver); + grpc_ares_ev_driver_shutdown(r->ev_driver); } } @@ -501,8 +486,7 @@ typedef struct grpc_resolve_address_ares_request { grpc_closure on_dns_lookup_done; } grpc_resolve_address_ares_request; -static void on_dns_lookup_done_cb(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_dns_lookup_done_cb(void* arg, grpc_error* error) { grpc_resolve_address_ares_request* r = (grpc_resolve_address_ares_request*)arg; grpc_resolved_addresses** resolved_addresses = r->addrs_out; @@ -520,14 +504,12 @@ static void on_dns_lookup_done_cb(grpc_exec_ctx* exec_ctx, void* arg, &r->lb_addrs->addresses[i].address, sizeof(grpc_resolved_address)); } } - GRPC_CLOSURE_SCHED(exec_ctx, r->on_resolve_address_done, - GRPC_ERROR_REF(error)); - grpc_lb_addresses_destroy(exec_ctx, r->lb_addrs); + GRPC_CLOSURE_SCHED(r->on_resolve_address_done, GRPC_ERROR_REF(error)); + grpc_lb_addresses_destroy(r->lb_addrs); gpr_free(r); } -static void grpc_resolve_address_ares_impl(grpc_exec_ctx* exec_ctx, - const char* name, +static void grpc_resolve_address_ares_impl(const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, @@ -539,14 +521,14 @@ static void grpc_resolve_address_ares_impl(grpc_exec_ctx* exec_ctx, r->on_resolve_address_done = on_done; GRPC_CLOSURE_INIT(&r->on_dns_lookup_done, on_dns_lookup_done_cb, r, grpc_schedule_on_exec_ctx); - grpc_dns_lookup_ares(exec_ctx, nullptr /* dns_server */, name, default_port, + grpc_dns_lookup_ares(nullptr /* dns_server */, name, default_port, interested_parties, &r->on_dns_lookup_done, &r->lb_addrs, false /* check_grpclb */, nullptr /* service_config_json */); } void (*grpc_resolve_address_ares)( - grpc_exec_ctx* exec_ctx, const char* name, const char* default_port, + const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addrs) = grpc_resolve_address_ares_impl; diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h index 72db6229544..86d870e0a6d 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h @@ -32,8 +32,7 @@ typedef struct grpc_ares_request grpc_ares_request; must be called at least once before this function. \a on_done may be called directly in this function without being scheduled with \a exec_ctx, so it must not try to acquire locks that are being held by the caller. */ -extern void (*grpc_resolve_address_ares)(grpc_exec_ctx* exec_ctx, - const char* name, +extern void (*grpc_resolve_address_ares)(const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, @@ -47,14 +46,13 @@ extern void (*grpc_resolve_address_ares)(grpc_exec_ctx* exec_ctx, scheduled with \a exec_ctx, so it must not try to acquire locks that are being held by the caller. */ extern grpc_ares_request* (*grpc_dns_lookup_ares)( - grpc_exec_ctx* exec_ctx, const char* dns_server, const char* name, - const char* default_port, grpc_pollset_set* interested_parties, - grpc_closure* on_done, grpc_lb_addresses** addresses, bool check_grpclb, + const char* dns_server, const char* name, const char* default_port, + grpc_pollset_set* interested_parties, grpc_closure* on_done, + grpc_lb_addresses** addresses, bool check_grpclb, char** service_config_json); /* Cancel the pending grpc_ares_request \a request */ -void grpc_cancel_ares_request(grpc_exec_ctx* exec_ctx, - grpc_ares_request* request); +void grpc_cancel_ares_request(grpc_ares_request* request); /* Initialize gRPC ares wrapper. Must be called at least once before grpc_resolve_address_ares(). */ diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc index a68a7c47fb6..a184cf2d57d 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc @@ -26,34 +26,32 @@ struct grpc_ares_request { }; static grpc_ares_request* grpc_dns_lookup_ares_impl( - grpc_exec_ctx* exec_ctx, const char* dns_server, const char* name, - const char* default_port, grpc_pollset_set* interested_parties, - grpc_closure* on_done, grpc_lb_addresses** addrs, bool check_grpclb, - char** service_config_json) { + const char* dns_server, const char* name, const char* default_port, + grpc_pollset_set* interested_parties, grpc_closure* on_done, + grpc_lb_addresses** addrs, bool check_grpclb, char** service_config_json) { return NULL; } grpc_ares_request* (*grpc_dns_lookup_ares)( - grpc_exec_ctx* exec_ctx, const char* dns_server, const char* name, - const char* default_port, grpc_pollset_set* interested_parties, - grpc_closure* on_done, grpc_lb_addresses** addrs, bool check_grpclb, + const char* dns_server, const char* name, const char* default_port, + grpc_pollset_set* interested_parties, grpc_closure* on_done, + grpc_lb_addresses** addrs, bool check_grpclb, char** service_config_json) = grpc_dns_lookup_ares_impl; -void grpc_cancel_ares_request(grpc_exec_ctx* exec_ctx, grpc_ares_request* r) {} +void grpc_cancel_ares_request(grpc_ares_request* r) {} grpc_error* grpc_ares_init(void) { return GRPC_ERROR_NONE; } void grpc_ares_cleanup(void) {} -static void grpc_resolve_address_ares_impl(grpc_exec_ctx* exec_ctx, - const char* name, +static void grpc_resolve_address_ares_impl(const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addrs) {} void (*grpc_resolve_address_ares)( - grpc_exec_ctx* exec_ctx, const char* name, const char* default_port, + const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addrs) = grpc_resolve_address_ares_impl; diff --git a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc index fc40ce69668..77698e97aa5 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc @@ -76,49 +76,42 @@ typedef struct { grpc_resolved_addresses* addresses; } dns_resolver; -static void dns_destroy(grpc_exec_ctx* exec_ctx, grpc_resolver* r); +static void dns_destroy(grpc_resolver* r); -static void dns_start_resolving_locked(grpc_exec_ctx* exec_ctx, - dns_resolver* r); -static void dns_maybe_finish_next_locked(grpc_exec_ctx* exec_ctx, - dns_resolver* r); +static void dns_start_resolving_locked(dns_resolver* r); +static void dns_maybe_finish_next_locked(dns_resolver* r); -static void dns_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_resolver* r); -static void dns_channel_saw_error_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* r); -static void dns_next_locked(grpc_exec_ctx* exec_ctx, grpc_resolver* r, - grpc_channel_args** target_result, +static void dns_shutdown_locked(grpc_resolver* r); +static void dns_channel_saw_error_locked(grpc_resolver* r); +static void dns_next_locked(grpc_resolver* r, grpc_channel_args** target_result, grpc_closure* on_complete); static const grpc_resolver_vtable dns_resolver_vtable = { dns_destroy, dns_shutdown_locked, dns_channel_saw_error_locked, dns_next_locked}; -static void dns_shutdown_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* resolver) { +static void dns_shutdown_locked(grpc_resolver* resolver) { dns_resolver* r = (dns_resolver*)resolver; if (r->have_retry_timer) { - grpc_timer_cancel(exec_ctx, &r->retry_timer); + grpc_timer_cancel(&r->retry_timer); } if (r->next_completion != nullptr) { *r->target_result = nullptr; - GRPC_CLOSURE_SCHED( - exec_ctx, r->next_completion, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resolver Shutdown")); + GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Resolver Shutdown")); r->next_completion = nullptr; } } -static void dns_channel_saw_error_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* resolver) { +static void dns_channel_saw_error_locked(grpc_resolver* resolver) { dns_resolver* r = (dns_resolver*)resolver; if (!r->resolving) { grpc_backoff_reset(&r->backoff_state); - dns_start_resolving_locked(exec_ctx, r); + dns_start_resolving_locked(r); } } -static void dns_next_locked(grpc_exec_ctx* exec_ctx, grpc_resolver* resolver, +static void dns_next_locked(grpc_resolver* resolver, grpc_channel_args** target_result, grpc_closure* on_complete) { dns_resolver* r = (dns_resolver*)resolver; @@ -127,28 +120,26 @@ static void dns_next_locked(grpc_exec_ctx* exec_ctx, grpc_resolver* resolver, r->target_result = target_result; if (r->resolved_version == 0 && !r->resolving) { grpc_backoff_reset(&r->backoff_state); - dns_start_resolving_locked(exec_ctx, r); + dns_start_resolving_locked(r); } else { - dns_maybe_finish_next_locked(exec_ctx, r); + dns_maybe_finish_next_locked(r); } } -static void dns_on_retry_timer_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void dns_on_retry_timer_locked(void* arg, grpc_error* error) { dns_resolver* r = (dns_resolver*)arg; r->have_retry_timer = false; if (error == GRPC_ERROR_NONE) { if (!r->resolving) { - dns_start_resolving_locked(exec_ctx, r); + dns_start_resolving_locked(r); } } - GRPC_RESOLVER_UNREF(exec_ctx, &r->base, "retry-timer"); + GRPC_RESOLVER_UNREF(&r->base, "retry-timer"); } -static void dns_on_resolved_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void dns_on_resolved_locked(void* arg, grpc_error* error) { dns_resolver* r = (dns_resolver*)arg; grpc_channel_args* result = nullptr; GPR_ASSERT(r->resolving); @@ -168,11 +159,11 @@ static void dns_on_resolved_locked(grpc_exec_ctx* exec_ctx, void* arg, 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); - grpc_lb_addresses_destroy(exec_ctx, addresses); + grpc_lb_addresses_destroy(addresses); } else { grpc_millis next_try = - grpc_backoff_step(exec_ctx, &r->backoff_state).next_attempt_start_time; - grpc_millis timeout = next_try - grpc_exec_ctx_now(exec_ctx); + grpc_backoff_step(&r->backoff_state).next_attempt_start_time; + grpc_millis timeout = next_try - grpc_core::ExecCtx::Get()->Now(); gpr_log(GPR_INFO, "dns resolution failed (will retry): %s", grpc_error_string(error)); GPR_ASSERT(!r->have_retry_timer); @@ -185,59 +176,56 @@ static void dns_on_resolved_locked(grpc_exec_ctx* exec_ctx, void* arg, } GRPC_CLOSURE_INIT(&r->on_retry, dns_on_retry_timer_locked, r, grpc_combiner_scheduler(r->base.combiner)); - grpc_timer_init(exec_ctx, &r->retry_timer, next_try, &r->on_retry); + grpc_timer_init(&r->retry_timer, next_try, &r->on_retry); } if (r->resolved_result != nullptr) { - grpc_channel_args_destroy(exec_ctx, r->resolved_result); + grpc_channel_args_destroy(r->resolved_result); } r->resolved_result = result; r->resolved_version++; - dns_maybe_finish_next_locked(exec_ctx, r); + dns_maybe_finish_next_locked(r); GRPC_ERROR_UNREF(error); - GRPC_RESOLVER_UNREF(exec_ctx, &r->base, "dns-resolving"); + GRPC_RESOLVER_UNREF(&r->base, "dns-resolving"); } -static void dns_start_resolving_locked(grpc_exec_ctx* exec_ctx, - dns_resolver* r) { +static void dns_start_resolving_locked(dns_resolver* r) { GRPC_RESOLVER_REF(&r->base, "dns-resolving"); GPR_ASSERT(!r->resolving); r->resolving = true; r->addresses = nullptr; grpc_resolve_address( - exec_ctx, r->name_to_resolve, r->default_port, r->interested_parties, + r->name_to_resolve, r->default_port, r->interested_parties, GRPC_CLOSURE_CREATE(dns_on_resolved_locked, r, grpc_combiner_scheduler(r->base.combiner)), &r->addresses); } -static void dns_maybe_finish_next_locked(grpc_exec_ctx* exec_ctx, - dns_resolver* r) { +static void dns_maybe_finish_next_locked(dns_resolver* r) { if (r->next_completion != nullptr && r->resolved_version != r->published_version) { *r->target_result = r->resolved_result == nullptr ? nullptr : grpc_channel_args_copy(r->resolved_result); - GRPC_CLOSURE_SCHED(exec_ctx, r->next_completion, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_NONE); r->next_completion = nullptr; r->published_version = r->resolved_version; } } -static void dns_destroy(grpc_exec_ctx* exec_ctx, grpc_resolver* gr) { +static void dns_destroy(grpc_resolver* gr) { dns_resolver* r = (dns_resolver*)gr; if (r->resolved_result != nullptr) { - grpc_channel_args_destroy(exec_ctx, r->resolved_result); + grpc_channel_args_destroy(r->resolved_result); } - grpc_pollset_set_destroy(exec_ctx, r->interested_parties); + grpc_pollset_set_destroy(r->interested_parties); gpr_free(r->name_to_resolve); gpr_free(r->default_port); - grpc_channel_args_destroy(exec_ctx, r->channel_args); + grpc_channel_args_destroy(r->channel_args); gpr_free(r); } -static grpc_resolver* dns_create(grpc_exec_ctx* exec_ctx, - grpc_resolver_args* args, +static grpc_resolver* dns_create(grpc_resolver_args* args, const char* default_port) { if (0 != strcmp(args->uri->authority, "")) { gpr_log(GPR_ERROR, "authority based dns uri's not supported"); @@ -254,8 +242,7 @@ static grpc_resolver* dns_create(grpc_exec_ctx* exec_ctx, r->channel_args = grpc_channel_args_copy(args->args); r->interested_parties = grpc_pollset_set_create(); if (args->pollset_set != nullptr) { - grpc_pollset_set_add_pollset_set(exec_ctx, r->interested_parties, - args->pollset_set); + grpc_pollset_set_add_pollset_set(r->interested_parties, args->pollset_set); } grpc_backoff_init( &r->backoff_state, GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS * 1000, @@ -274,9 +261,8 @@ static void dns_factory_ref(grpc_resolver_factory* factory) {} static void dns_factory_unref(grpc_resolver_factory* factory) {} static grpc_resolver* dns_factory_create_resolver( - grpc_exec_ctx* exec_ctx, grpc_resolver_factory* factory, - grpc_resolver_args* args) { - return dns_create(exec_ctx, args, "https"); + grpc_resolver_factory* factory, grpc_resolver_args* args) { + return dns_create(args, "https"); } static char* dns_factory_get_default_host_name(grpc_resolver_factory* factory, diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc index 44798ca434e..fe3ad1403c2 100644 --- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc @@ -67,57 +67,52 @@ typedef struct { grpc_channel_args** target_result; } fake_resolver; -static void fake_resolver_destroy(grpc_exec_ctx* exec_ctx, grpc_resolver* gr) { +static void fake_resolver_destroy(grpc_resolver* gr) { fake_resolver* r = (fake_resolver*)gr; - grpc_channel_args_destroy(exec_ctx, r->next_results); - grpc_channel_args_destroy(exec_ctx, r->results_upon_error); - grpc_channel_args_destroy(exec_ctx, r->channel_args); + grpc_channel_args_destroy(r->next_results); + grpc_channel_args_destroy(r->results_upon_error); + grpc_channel_args_destroy(r->channel_args); gpr_free(r); } -static void fake_resolver_shutdown_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* resolver) { +static void fake_resolver_shutdown_locked(grpc_resolver* resolver) { fake_resolver* r = (fake_resolver*)resolver; if (r->next_completion != nullptr) { *r->target_result = nullptr; - GRPC_CLOSURE_SCHED( - exec_ctx, r->next_completion, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resolver Shutdown")); + GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Resolver Shutdown")); r->next_completion = nullptr; } } -static void fake_resolver_maybe_finish_next_locked(grpc_exec_ctx* exec_ctx, - fake_resolver* r) { +static void fake_resolver_maybe_finish_next_locked(fake_resolver* r) { if (r->next_completion != nullptr && r->next_results != nullptr) { *r->target_result = grpc_channel_args_union(r->next_results, r->channel_args); - grpc_channel_args_destroy(exec_ctx, r->next_results); + grpc_channel_args_destroy(r->next_results); r->next_results = nullptr; - GRPC_CLOSURE_SCHED(exec_ctx, r->next_completion, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_NONE); r->next_completion = nullptr; } } -static void fake_resolver_channel_saw_error_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* resolver) { +static void fake_resolver_channel_saw_error_locked(grpc_resolver* resolver) { fake_resolver* r = (fake_resolver*)resolver; if (r->next_results == nullptr && r->results_upon_error != nullptr) { // Pretend we re-resolved. r->next_results = grpc_channel_args_copy(r->results_upon_error); } - fake_resolver_maybe_finish_next_locked(exec_ctx, r); + fake_resolver_maybe_finish_next_locked(r); } -static void fake_resolver_next_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* resolver, +static void fake_resolver_next_locked(grpc_resolver* resolver, grpc_channel_args** target_result, grpc_closure* on_complete) { fake_resolver* r = (fake_resolver*)resolver; GPR_ASSERT(!r->next_completion); r->next_completion = on_complete; r->target_result = target_result; - fake_resolver_maybe_finish_next_locked(exec_ctx, r); + fake_resolver_maybe_finish_next_locked(r); } static const grpc_resolver_vtable fake_resolver_vtable = { @@ -157,33 +152,31 @@ typedef struct set_response_closure_arg { grpc_channel_args* next_response; } set_response_closure_arg; -static void set_response_closure_fn(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void set_response_closure_fn(void* arg, grpc_error* error) { set_response_closure_arg* closure_arg = (set_response_closure_arg*)arg; grpc_fake_resolver_response_generator* generator = closure_arg->generator; fake_resolver* r = generator->resolver; if (r->next_results != nullptr) { - grpc_channel_args_destroy(exec_ctx, r->next_results); + grpc_channel_args_destroy(r->next_results); } r->next_results = closure_arg->next_response; if (r->results_upon_error != nullptr) { - grpc_channel_args_destroy(exec_ctx, r->results_upon_error); + grpc_channel_args_destroy(r->results_upon_error); } r->results_upon_error = grpc_channel_args_copy(closure_arg->next_response); gpr_free(closure_arg); - fake_resolver_maybe_finish_next_locked(exec_ctx, r); + fake_resolver_maybe_finish_next_locked(r); } void grpc_fake_resolver_response_generator_set_response( - grpc_exec_ctx* exec_ctx, grpc_fake_resolver_response_generator* generator, + grpc_fake_resolver_response_generator* generator, grpc_channel_args* next_response) { GPR_ASSERT(generator->resolver != nullptr); set_response_closure_arg* closure_arg = (set_response_closure_arg*)gpr_zalloc(sizeof(*closure_arg)); closure_arg->generator = generator; closure_arg->next_response = grpc_channel_args_copy(next_response); - GRPC_CLOSURE_SCHED(exec_ctx, - GRPC_CLOSURE_INIT(&closure_arg->set_response_closure, + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_INIT(&closure_arg->set_response_closure, set_response_closure_fn, closure_arg, grpc_combiner_scheduler( generator->resolver->base.combiner)), @@ -195,7 +188,7 @@ static void* response_generator_arg_copy(void* p) { (grpc_fake_resolver_response_generator*)p); } -static void response_generator_arg_destroy(grpc_exec_ctx* exec_ctx, void* p) { +static void response_generator_arg_destroy(void* p) { grpc_fake_resolver_response_generator_unref( (grpc_fake_resolver_response_generator*)p); } @@ -232,8 +225,7 @@ static void fake_resolver_factory_ref(grpc_resolver_factory* factory) {} static void fake_resolver_factory_unref(grpc_resolver_factory* factory) {} -static grpc_resolver* fake_resolver_create(grpc_exec_ctx* exec_ctx, - grpc_resolver_factory* factory, +static grpc_resolver* fake_resolver_create(grpc_resolver_factory* factory, grpc_resolver_args* args) { fake_resolver* r = (fake_resolver*)gpr_zalloc(sizeof(*r)); r->channel_args = grpc_channel_args_copy(args->args); diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h index 7035cdda019..a8977e5980f 100644 --- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h +++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h @@ -39,7 +39,7 @@ grpc_fake_resolver_response_generator_create(); // Instruct the fake resolver associated with the \a response_generator instance // to trigger a new resolution for \a uri and \a args. void grpc_fake_resolver_response_generator_set_response( - grpc_exec_ctx* exec_ctx, grpc_fake_resolver_response_generator* generator, + grpc_fake_resolver_response_generator* generator, grpc_channel_args* next_response); // Return a \a grpc_arg for a \a grpc_fake_resolver_response_generator instance. diff --git a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc b/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc index f0934b5943b..7d1e283fa3a 100644 --- a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc @@ -52,15 +52,13 @@ typedef struct { grpc_channel_args** target_result; } sockaddr_resolver; -static void sockaddr_destroy(grpc_exec_ctx* exec_ctx, grpc_resolver* r); +static void sockaddr_destroy(grpc_resolver* r); -static void sockaddr_maybe_finish_next_locked(grpc_exec_ctx* exec_ctx, - sockaddr_resolver* r); +static void sockaddr_maybe_finish_next_locked(sockaddr_resolver* r); -static void sockaddr_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_resolver* r); -static void sockaddr_channel_saw_error_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* r); -static void sockaddr_next_locked(grpc_exec_ctx* exec_ctx, grpc_resolver* r, +static void sockaddr_shutdown_locked(grpc_resolver* r); +static void sockaddr_channel_saw_error_locked(grpc_resolver* r); +static void sockaddr_next_locked(grpc_resolver* r, grpc_channel_args** target_result, grpc_closure* on_complete); @@ -68,52 +66,47 @@ static const grpc_resolver_vtable sockaddr_resolver_vtable = { sockaddr_destroy, sockaddr_shutdown_locked, sockaddr_channel_saw_error_locked, sockaddr_next_locked}; -static void sockaddr_shutdown_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* resolver) { +static void sockaddr_shutdown_locked(grpc_resolver* resolver) { sockaddr_resolver* r = (sockaddr_resolver*)resolver; if (r->next_completion != nullptr) { *r->target_result = nullptr; - GRPC_CLOSURE_SCHED( - exec_ctx, r->next_completion, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resolver Shutdown")); + GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Resolver Shutdown")); r->next_completion = nullptr; } } -static void sockaddr_channel_saw_error_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* resolver) { +static void sockaddr_channel_saw_error_locked(grpc_resolver* resolver) { sockaddr_resolver* r = (sockaddr_resolver*)resolver; r->published = false; - sockaddr_maybe_finish_next_locked(exec_ctx, r); + sockaddr_maybe_finish_next_locked(r); } -static void sockaddr_next_locked(grpc_exec_ctx* exec_ctx, - grpc_resolver* resolver, +static void sockaddr_next_locked(grpc_resolver* resolver, grpc_channel_args** target_result, grpc_closure* on_complete) { sockaddr_resolver* r = (sockaddr_resolver*)resolver; GPR_ASSERT(!r->next_completion); r->next_completion = on_complete; r->target_result = target_result; - sockaddr_maybe_finish_next_locked(exec_ctx, r); + sockaddr_maybe_finish_next_locked(r); } -static void sockaddr_maybe_finish_next_locked(grpc_exec_ctx* exec_ctx, - sockaddr_resolver* r) { +static void sockaddr_maybe_finish_next_locked(sockaddr_resolver* r) { if (r->next_completion != nullptr && !r->published) { r->published = true; grpc_arg arg = grpc_lb_addresses_create_channel_arg(r->addresses); *r->target_result = grpc_channel_args_copy_and_add(r->channel_args, &arg, 1); - GRPC_CLOSURE_SCHED(exec_ctx, r->next_completion, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(r->next_completion, GRPC_ERROR_NONE); r->next_completion = nullptr; } } -static void sockaddr_destroy(grpc_exec_ctx* exec_ctx, grpc_resolver* gr) { +static void sockaddr_destroy(grpc_resolver* gr) { sockaddr_resolver* r = (sockaddr_resolver*)gr; - grpc_lb_addresses_destroy(exec_ctx, r->addresses); - grpc_channel_args_destroy(exec_ctx, r->channel_args); + grpc_lb_addresses_destroy(r->addresses); + grpc_channel_args_destroy(r->channel_args); gpr_free(r); } @@ -142,8 +135,7 @@ char* unix_get_default_authority(grpc_resolver_factory* factory, static void do_nothing(void* ignored) {} -static grpc_resolver* sockaddr_create(grpc_exec_ctx* exec_ctx, - grpc_resolver_args* args, +static grpc_resolver* sockaddr_create(grpc_resolver_args* args, bool parse(const grpc_uri* uri, grpc_resolved_address* dst)) { if (0 != strcmp(args->uri->authority, "")) { @@ -170,10 +162,10 @@ static grpc_resolver* sockaddr_create(grpc_exec_ctx* exec_ctx, gpr_free(part_str); if (errors_found) break; } - grpc_slice_buffer_destroy_internal(exec_ctx, &path_parts); - grpc_slice_unref_internal(exec_ctx, path_slice); + grpc_slice_buffer_destroy_internal(&path_parts); + grpc_slice_unref_internal(path_slice); if (errors_found) { - grpc_lb_addresses_destroy(exec_ctx, addresses); + grpc_lb_addresses_destroy(addresses); return nullptr; } /* Instantiate resolver. */ @@ -195,9 +187,8 @@ static void sockaddr_factory_unref(grpc_resolver_factory* factory) {} #define DECL_FACTORY(name) \ static grpc_resolver* name##_factory_create_resolver( \ - grpc_exec_ctx* exec_ctx, grpc_resolver_factory* factory, \ - grpc_resolver_args* args) { \ - return sockaddr_create(exec_ctx, args, grpc_parse_##name); \ + grpc_resolver_factory* factory, grpc_resolver_args* args) { \ + return sockaddr_create(args, grpc_parse_##name); \ } \ static const grpc_resolver_factory_vtable name##_factory_vtable = { \ sockaddr_factory_ref, sockaddr_factory_unref, \ diff --git a/src/core/ext/filters/client_channel/resolver_factory.cc b/src/core/ext/filters/client_channel/resolver_factory.cc index 1a289d9771a..9b3ec2f1c41 100644 --- a/src/core/ext/filters/client_channel/resolver_factory.cc +++ b/src/core/ext/filters/client_channel/resolver_factory.cc @@ -28,10 +28,9 @@ void grpc_resolver_factory_unref(grpc_resolver_factory* factory) { /** Create a resolver instance for a name */ grpc_resolver* grpc_resolver_factory_create_resolver( - grpc_exec_ctx* exec_ctx, grpc_resolver_factory* factory, - grpc_resolver_args* args) { + grpc_resolver_factory* factory, grpc_resolver_args* args) { if (factory == nullptr) return nullptr; - return factory->vtable->create_resolver(exec_ctx, factory, args); + return factory->vtable->create_resolver(factory, args); } char* grpc_resolver_factory_get_default_authority( diff --git a/src/core/ext/filters/client_channel/resolver_factory.h b/src/core/ext/filters/client_channel/resolver_factory.h index fcf8ec425ec..170ecc0b489 100644 --- a/src/core/ext/filters/client_channel/resolver_factory.h +++ b/src/core/ext/filters/client_channel/resolver_factory.h @@ -43,8 +43,7 @@ struct grpc_resolver_factory_vtable { void (*unref)(grpc_resolver_factory* factory); /** Implementation of grpc_resolver_factory_create_resolver */ - grpc_resolver* (*create_resolver)(grpc_exec_ctx* exec_ctx, - grpc_resolver_factory* factory, + grpc_resolver* (*create_resolver)(grpc_resolver_factory* factory, grpc_resolver_args* args); /** Implementation of grpc_resolver_factory_get_default_authority */ @@ -59,8 +58,7 @@ void grpc_resolver_factory_unref(grpc_resolver_factory* resolver); /** Create a resolver instance for a name */ grpc_resolver* grpc_resolver_factory_create_resolver( - grpc_exec_ctx* exec_ctx, grpc_resolver_factory* factory, - grpc_resolver_args* args); + grpc_resolver_factory* factory, grpc_resolver_args* args); /** Return a (freshly allocated with gpr_malloc) string representing the default authority to use for this scheme. */ diff --git a/src/core/ext/filters/client_channel/resolver_registry.cc b/src/core/ext/filters/client_channel/resolver_registry.cc index 5da6114a3d0..3f8451de6b4 100644 --- a/src/core/ext/filters/client_channel/resolver_registry.cc +++ b/src/core/ext/filters/client_channel/resolver_registry.cc @@ -92,23 +92,22 @@ static grpc_resolver_factory* lookup_factory_by_uri(grpc_uri* uri) { return lookup_factory(uri->scheme); } -static grpc_resolver_factory* resolve_factory(grpc_exec_ctx* exec_ctx, - const char* target, +static grpc_resolver_factory* resolve_factory(const char* target, grpc_uri** uri, char** canonical_target) { grpc_resolver_factory* factory = nullptr; GPR_ASSERT(uri != nullptr); - *uri = grpc_uri_parse(exec_ctx, target, 1); + *uri = grpc_uri_parse(target, 1); factory = lookup_factory_by_uri(*uri); if (factory == nullptr) { grpc_uri_destroy(*uri); gpr_asprintf(canonical_target, "%s%s", g_default_resolver_prefix, target); - *uri = grpc_uri_parse(exec_ctx, *canonical_target, 1); + *uri = grpc_uri_parse(*canonical_target, 1); factory = lookup_factory_by_uri(*uri); if (factory == nullptr) { - grpc_uri_destroy(grpc_uri_parse(exec_ctx, target, 0)); - grpc_uri_destroy(grpc_uri_parse(exec_ctx, *canonical_target, 0)); + grpc_uri_destroy(grpc_uri_parse(target, 0)); + grpc_uri_destroy(grpc_uri_parse(*canonical_target, 0)); gpr_log(GPR_ERROR, "don't know how to resolve '%s' or '%s'", target, *canonical_target); } @@ -116,14 +115,14 @@ static grpc_resolver_factory* resolve_factory(grpc_exec_ctx* exec_ctx, return factory; } -grpc_resolver* grpc_resolver_create(grpc_exec_ctx* exec_ctx, const char* target, +grpc_resolver* grpc_resolver_create(const char* target, const grpc_channel_args* args, grpc_pollset_set* pollset_set, grpc_combiner* combiner) { grpc_uri* uri = nullptr; char* canonical_target = nullptr; grpc_resolver_factory* factory = - resolve_factory(exec_ctx, target, &uri, &canonical_target); + resolve_factory(target, &uri, &canonical_target); grpc_resolver* resolver; grpc_resolver_args resolver_args; memset(&resolver_args, 0, sizeof(resolver_args)); @@ -131,29 +130,27 @@ grpc_resolver* grpc_resolver_create(grpc_exec_ctx* exec_ctx, const char* target, resolver_args.args = args; resolver_args.pollset_set = pollset_set; resolver_args.combiner = combiner; - resolver = - grpc_resolver_factory_create_resolver(exec_ctx, factory, &resolver_args); + resolver = grpc_resolver_factory_create_resolver(factory, &resolver_args); grpc_uri_destroy(uri); gpr_free(canonical_target); return resolver; } -char* grpc_get_default_authority(grpc_exec_ctx* exec_ctx, const char* target) { +char* grpc_get_default_authority(const char* target) { grpc_uri* uri = nullptr; char* canonical_target = nullptr; grpc_resolver_factory* factory = - resolve_factory(exec_ctx, target, &uri, &canonical_target); + resolve_factory(target, &uri, &canonical_target); char* authority = grpc_resolver_factory_get_default_authority(factory, uri); grpc_uri_destroy(uri); gpr_free(canonical_target); return authority; } -char* grpc_resolver_factory_add_default_prefix_if_needed( - grpc_exec_ctx* exec_ctx, const char* target) { +char* grpc_resolver_factory_add_default_prefix_if_needed(const char* target) { grpc_uri* uri = nullptr; char* canonical_target = nullptr; - resolve_factory(exec_ctx, target, &uri, &canonical_target); + resolve_factory(target, &uri, &canonical_target); grpc_uri_destroy(uri); return canonical_target == nullptr ? gpr_strdup(target) : canonical_target; } diff --git a/src/core/ext/filters/client_channel/resolver_registry.h b/src/core/ext/filters/client_channel/resolver_registry.h index ecc9f824e8b..bbd30df8da3 100644 --- a/src/core/ext/filters/client_channel/resolver_registry.h +++ b/src/core/ext/filters/client_channel/resolver_registry.h @@ -48,7 +48,7 @@ void grpc_register_resolver_type(grpc_resolver_factory* factory); (typically the set of arguments passed in from the client API). \a pollset_set is used to drive IO in the name resolution process, it should not be NULL. */ -grpc_resolver* grpc_resolver_create(grpc_exec_ctx* exec_ctx, const char* target, +grpc_resolver* grpc_resolver_create(const char* target, const grpc_channel_args* args, grpc_pollset_set* pollset_set, grpc_combiner* combiner); @@ -59,11 +59,10 @@ grpc_resolver_factory* grpc_resolver_factory_lookup(const char* name); /** Given a target, return a (freshly allocated with gpr_malloc) string representing the default authority to pass from a client. */ -char* grpc_get_default_authority(grpc_exec_ctx* exec_ctx, const char* target); +char* grpc_get_default_authority(const char* target); /** Returns a newly allocated string containing \a target, adding the default prefix if needed. */ -char* grpc_resolver_factory_add_default_prefix_if_needed( - grpc_exec_ctx* exec_ctx, const char* target); +char* grpc_resolver_factory_add_default_prefix_if_needed(const char* target); #endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_REGISTRY_H */ diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc index 58e294d597f..0d2be2a3f73 100644 --- a/src/core/ext/filters/client_channel/subchannel.cc +++ b/src/core/ext/filters/client_channel/subchannel.cc @@ -139,8 +139,7 @@ struct grpc_subchannel_call { #define CALLSTACK_TO_SUBCHANNEL_CALL(callstack) \ (((grpc_subchannel_call*)(callstack)) - 1) -static void subchannel_connected(grpc_exec_ctx* exec_ctx, void* subchannel, - grpc_error* error); +static void subchannel_connected(void* subchannel, grpc_error* error); #ifndef NDEBUG #define REF_REASON reason @@ -157,10 +156,9 @@ static void subchannel_connected(grpc_exec_ctx* exec_ctx, void* subchannel, * connection implementation */ -static void connection_destroy(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void connection_destroy(void* arg, grpc_error* error) { grpc_connected_subchannel* c = (grpc_connected_subchannel*)arg; - grpc_channel_stack_destroy(exec_ctx, CHANNEL_STACK_FROM_CONNECTION(c)); + grpc_channel_stack_destroy(CHANNEL_STACK_FROM_CONNECTION(c)); gpr_free(c); } @@ -170,26 +168,23 @@ grpc_connected_subchannel* grpc_connected_subchannel_ref( return c; } -void grpc_connected_subchannel_unref(grpc_exec_ctx* exec_ctx, - grpc_connected_subchannel* c - GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { - GRPC_CHANNEL_STACK_UNREF(exec_ctx, CHANNEL_STACK_FROM_CONNECTION(c), - REF_REASON); +void grpc_connected_subchannel_unref( + grpc_connected_subchannel* c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { + GRPC_CHANNEL_STACK_UNREF(CHANNEL_STACK_FROM_CONNECTION(c), REF_REASON); } /* * grpc_subchannel implementation */ -static void subchannel_destroy(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void subchannel_destroy(void* arg, grpc_error* error) { grpc_subchannel* c = (grpc_subchannel*)arg; gpr_free((void*)c->filters); - grpc_channel_args_destroy(exec_ctx, c->args); - grpc_connectivity_state_destroy(exec_ctx, &c->state_tracker); - grpc_connector_unref(exec_ctx, c->connector); - grpc_pollset_set_destroy(exec_ctx, c->pollset_set); - grpc_subchannel_key_destroy(exec_ctx, c->key); + grpc_channel_args_destroy(c->args); + grpc_connectivity_state_destroy(&c->state_tracker); + grpc_connector_unref(c->connector); + grpc_pollset_set_destroy(c->pollset_set); + grpc_subchannel_key_destroy(c->key); gpr_mu_destroy(&c->mu); gpr_free(c); } @@ -241,59 +236,54 @@ grpc_subchannel* grpc_subchannel_ref_from_weak_ref( } } -static void disconnect(grpc_exec_ctx* exec_ctx, grpc_subchannel* c) { +static void disconnect(grpc_subchannel* c) { grpc_connected_subchannel* con; - grpc_subchannel_index_unregister(exec_ctx, c->key, c); + grpc_subchannel_index_unregister(c->key, c); gpr_mu_lock(&c->mu); GPR_ASSERT(!c->disconnected); c->disconnected = true; - grpc_connector_shutdown( - exec_ctx, c->connector, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Subchannel disconnected")); + grpc_connector_shutdown(c->connector, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Subchannel disconnected")); con = GET_CONNECTED_SUBCHANNEL(c, no_barrier); if (con != nullptr) { - GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, con, "connection"); + GRPC_CONNECTED_SUBCHANNEL_UNREF(con, "connection"); gpr_atm_no_barrier_store(&c->connected_subchannel, (gpr_atm)0xdeadbeef); } gpr_mu_unlock(&c->mu); } -void grpc_subchannel_unref(grpc_exec_ctx* exec_ctx, - grpc_subchannel* c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { +void grpc_subchannel_unref(grpc_subchannel* c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { gpr_atm old_refs; // add a weak ref and subtract a strong ref (atomically) old_refs = ref_mutate(c, (gpr_atm)1 - (gpr_atm)(1 << INTERNAL_REF_BITS), 1 REF_MUTATE_PURPOSE("STRONG_UNREF")); if ((old_refs & STRONG_REF_MASK) == (1 << INTERNAL_REF_BITS)) { - disconnect(exec_ctx, c); + disconnect(c); } - GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "strong-unref"); + GRPC_SUBCHANNEL_WEAK_UNREF(c, "strong-unref"); } -void grpc_subchannel_weak_unref(grpc_exec_ctx* exec_ctx, - grpc_subchannel* c - GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { +void grpc_subchannel_weak_unref( + grpc_subchannel* c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { gpr_atm old_refs; old_refs = ref_mutate(c, -(gpr_atm)1, 1 REF_MUTATE_PURPOSE("WEAK_UNREF")); if (old_refs == 1) { GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_CREATE(subchannel_destroy, c, grpc_schedule_on_exec_ctx), GRPC_ERROR_NONE); } } -grpc_subchannel* grpc_subchannel_create(grpc_exec_ctx* exec_ctx, - grpc_connector* connector, +grpc_subchannel* grpc_subchannel_create(grpc_connector* connector, const grpc_subchannel_args* args) { grpc_subchannel_key* key = grpc_subchannel_key_create(args); - grpc_subchannel* c = grpc_subchannel_index_find(exec_ctx, key); + grpc_subchannel* c = grpc_subchannel_index_find(key); if (c) { - grpc_subchannel_key_destroy(exec_ctx, key); + grpc_subchannel_key_destroy(key); return c; } - GRPC_STATS_INC_CLIENT_SUBCHANNELS_CREATED(exec_ctx); + GRPC_STATS_INC_CLIENT_SUBCHANNELS_CREATED(); c = (grpc_subchannel*)gpr_zalloc(sizeof(*c)); c->key = key; gpr_atm_no_barrier_store(&c->ref_pair, 1 << INTERNAL_REF_BITS); @@ -311,10 +301,10 @@ grpc_subchannel* grpc_subchannel_create(grpc_exec_ctx* exec_ctx, c->pollset_set = grpc_pollset_set_create(); grpc_resolved_address* addr = (grpc_resolved_address*)gpr_malloc(sizeof(*addr)); - grpc_get_subchannel_address_arg(exec_ctx, args->args, addr); + grpc_get_subchannel_address_arg(args->args, addr); grpc_resolved_address* new_address = nullptr; grpc_channel_args* new_args = nullptr; - if (grpc_proxy_mappers_map_address(exec_ctx, addr, args->args, &new_address, + if (grpc_proxy_mappers_map_address(addr, args->args, &new_address, &new_args)) { GPR_ASSERT(new_address != nullptr); gpr_free(addr); @@ -327,7 +317,7 @@ grpc_subchannel* grpc_subchannel_create(grpc_exec_ctx* exec_ctx, new_args != nullptr ? new_args : args->args, keys_to_remove, GPR_ARRAY_SIZE(keys_to_remove), &new_arg, 1); gpr_free(new_arg.value.string); - if (new_args != nullptr) grpc_channel_args_destroy(exec_ctx, new_args); + if (new_args != nullptr) grpc_channel_args_destroy(new_args); c->root_external_state_watcher.next = c->root_external_state_watcher.prev = &c->root_external_state_watcher; GRPC_CLOSURE_INIT(&c->connected, subchannel_connected, c, @@ -373,21 +363,19 @@ grpc_subchannel* grpc_subchannel_create(grpc_exec_ctx* exec_ctx, min_backoff_ms, max_backoff_ms); gpr_mu_init(&c->mu); - return grpc_subchannel_index_register(exec_ctx, key, c); + return grpc_subchannel_index_register(key, c); } -static void continue_connect_locked(grpc_exec_ctx* exec_ctx, - grpc_subchannel* c) { +static void continue_connect_locked(grpc_subchannel* c) { grpc_connect_in_args args; args.interested_parties = c->pollset_set; args.deadline = c->backoff_result.current_deadline; args.channel_args = c->args; - grpc_connectivity_state_set(exec_ctx, &c->state_tracker, - GRPC_CHANNEL_CONNECTING, GRPC_ERROR_NONE, - "state_change"); - grpc_connector_connect(exec_ctx, c->connector, &args, &c->connecting_result, + grpc_connectivity_state_set(&c->state_tracker, GRPC_CHANNEL_CONNECTING, + GRPC_ERROR_NONE, "state_change"); + grpc_connector_connect(c->connector, &args, &c->connecting_result, &c->connected); } @@ -400,24 +388,23 @@ grpc_connectivity_state grpc_subchannel_check_connectivity(grpc_subchannel* c, return state; } -static void on_external_state_watcher_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_external_state_watcher_done(void* arg, grpc_error* error) { external_state_watcher* w = (external_state_watcher*)arg; grpc_closure* follow_up = w->notify; if (w->pollset_set != nullptr) { - grpc_pollset_set_del_pollset_set(exec_ctx, w->subchannel->pollset_set, + grpc_pollset_set_del_pollset_set(w->subchannel->pollset_set, w->pollset_set); } gpr_mu_lock(&w->subchannel->mu); w->next->prev = w->prev; w->prev->next = w->next; gpr_mu_unlock(&w->subchannel->mu); - GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, w->subchannel, "external_state_watcher"); + GRPC_SUBCHANNEL_WEAK_UNREF(w->subchannel, "external_state_watcher"); gpr_free(w); - GRPC_CLOSURE_RUN(exec_ctx, follow_up, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(follow_up, GRPC_ERROR_REF(error)); } -static void on_alarm(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void on_alarm(void* arg, grpc_error* error) { grpc_subchannel* c = (grpc_subchannel*)arg; gpr_mu_lock(&c->mu); c->have_alarm = false; @@ -429,18 +416,17 @@ static void on_alarm(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { } if (error == GRPC_ERROR_NONE) { gpr_log(GPR_INFO, "Failed to connect to channel, retrying"); - c->backoff_result = grpc_backoff_step(exec_ctx, &c->backoff_state); - continue_connect_locked(exec_ctx, c); + c->backoff_result = grpc_backoff_step(&c->backoff_state); + continue_connect_locked(c); gpr_mu_unlock(&c->mu); } else { gpr_mu_unlock(&c->mu); - GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "connecting"); + GRPC_SUBCHANNEL_WEAK_UNREF(c, "connecting"); } GRPC_ERROR_UNREF(error); } -static void maybe_start_connecting_locked(grpc_exec_ctx* exec_ctx, - grpc_subchannel* c) { +static void maybe_start_connecting_locked(grpc_subchannel* c) { if (c->disconnected) { /* Don't try to connect if we're already disconnected */ return; @@ -466,28 +452,28 @@ static void maybe_start_connecting_locked(grpc_exec_ctx* exec_ctx, if (!c->backoff_begun) { c->backoff_begun = true; - c->backoff_result = grpc_backoff_begin(exec_ctx, &c->backoff_state); - continue_connect_locked(exec_ctx, c); + c->backoff_result = grpc_backoff_begin(&c->backoff_state); + continue_connect_locked(c); } else { GPR_ASSERT(!c->have_alarm); c->have_alarm = true; const grpc_millis time_til_next = - c->backoff_result.next_attempt_start_time - grpc_exec_ctx_now(exec_ctx); + c->backoff_result.next_attempt_start_time - + grpc_core::ExecCtx::Get()->Now(); if (time_til_next <= 0) { gpr_log(GPR_INFO, "Retry immediately"); } else { gpr_log(GPR_INFO, "Retry in %" PRIdPTR " milliseconds", time_til_next); } GRPC_CLOSURE_INIT(&c->on_alarm, on_alarm, c, grpc_schedule_on_exec_ctx); - grpc_timer_init(exec_ctx, &c->alarm, - c->backoff_result.next_attempt_start_time, &c->on_alarm); + grpc_timer_init(&c->alarm, c->backoff_result.next_attempt_start_time, + &c->on_alarm); } } void grpc_subchannel_notify_on_state_change( - grpc_exec_ctx* exec_ctx, grpc_subchannel* c, - grpc_pollset_set* interested_parties, grpc_connectivity_state* state, - grpc_closure* notify) { + grpc_subchannel* c, grpc_pollset_set* interested_parties, + grpc_connectivity_state* state, grpc_closure* notify) { external_state_watcher* w; if (state == nullptr) { @@ -495,8 +481,8 @@ void grpc_subchannel_notify_on_state_change( for (w = c->root_external_state_watcher.next; w != &c->root_external_state_watcher; w = w->next) { if (w->notify == notify) { - grpc_connectivity_state_notify_on_state_change( - exec_ctx, &c->state_tracker, nullptr, &w->closure); + grpc_connectivity_state_notify_on_state_change(&c->state_tracker, + nullptr, &w->closure); } } gpr_mu_unlock(&c->mu); @@ -508,31 +494,28 @@ void grpc_subchannel_notify_on_state_change( GRPC_CLOSURE_INIT(&w->closure, on_external_state_watcher_done, w, grpc_schedule_on_exec_ctx); if (interested_parties != nullptr) { - grpc_pollset_set_add_pollset_set(exec_ctx, c->pollset_set, - interested_parties); + grpc_pollset_set_add_pollset_set(c->pollset_set, interested_parties); } GRPC_SUBCHANNEL_WEAK_REF(c, "external_state_watcher"); gpr_mu_lock(&c->mu); w->next = &c->root_external_state_watcher; w->prev = w->next->prev; w->next->prev = w->prev->next = w; - grpc_connectivity_state_notify_on_state_change(exec_ctx, &c->state_tracker, - state, &w->closure); - maybe_start_connecting_locked(exec_ctx, c); + grpc_connectivity_state_notify_on_state_change(&c->state_tracker, state, + &w->closure); + maybe_start_connecting_locked(c); gpr_mu_unlock(&c->mu); } } void grpc_connected_subchannel_process_transport_op( - grpc_exec_ctx* exec_ctx, grpc_connected_subchannel* con, - grpc_transport_op* op) { + grpc_connected_subchannel* con, grpc_transport_op* op) { grpc_channel_stack* channel_stack = CHANNEL_STACK_FROM_CONNECTION(con); grpc_channel_element* top_elem = grpc_channel_stack_element(channel_stack, 0); - top_elem->filter->start_transport_op(exec_ctx, top_elem, op); + top_elem->filter->start_transport_op(top_elem, op); } -static void subchannel_on_child_state_changed(grpc_exec_ctx* exec_ctx, void* p, - grpc_error* error) { +static void subchannel_on_child_state_changed(void* p, grpc_error* error) { state_watcher* sw = (state_watcher*)p; grpc_subchannel* c = sw->subchannel; gpr_mu* mu = &c->mu; @@ -544,24 +527,22 @@ static void subchannel_on_child_state_changed(grpc_exec_ctx* exec_ctx, void* p, /* any errors on a subchannel ==> we're done, create a new one */ sw->connectivity_state = GRPC_CHANNEL_SHUTDOWN; } - grpc_connectivity_state_set(exec_ctx, &c->state_tracker, - sw->connectivity_state, GRPC_ERROR_REF(error), - "reflect_child"); + grpc_connectivity_state_set(&c->state_tracker, sw->connectivity_state, + GRPC_ERROR_REF(error), "reflect_child"); if (sw->connectivity_state != GRPC_CHANNEL_SHUTDOWN) { grpc_connected_subchannel_notify_on_state_change( - exec_ctx, GET_CONNECTED_SUBCHANNEL(c, no_barrier), nullptr, + GET_CONNECTED_SUBCHANNEL(c, no_barrier), nullptr, &sw->connectivity_state, &sw->closure); GRPC_SUBCHANNEL_WEAK_REF(c, "state_watcher"); sw = nullptr; } gpr_mu_unlock(mu); - GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "state_watcher"); + GRPC_SUBCHANNEL_WEAK_UNREF(c, "state_watcher"); gpr_free(sw); } -static void connected_subchannel_state_op(grpc_exec_ctx* exec_ctx, - grpc_connected_subchannel* con, +static void connected_subchannel_state_op(grpc_connected_subchannel* con, grpc_pollset_set* interested_parties, grpc_connectivity_state* state, grpc_closure* closure) { @@ -571,29 +552,25 @@ static void connected_subchannel_state_op(grpc_exec_ctx* exec_ctx, op->on_connectivity_state_change = closure; op->bind_pollset_set = interested_parties; elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CONNECTION(con), 0); - elem->filter->start_transport_op(exec_ctx, elem, op); + elem->filter->start_transport_op(elem, op); } void grpc_connected_subchannel_notify_on_state_change( - grpc_exec_ctx* exec_ctx, grpc_connected_subchannel* con, - grpc_pollset_set* interested_parties, grpc_connectivity_state* state, - grpc_closure* closure) { - connected_subchannel_state_op(exec_ctx, con, interested_parties, state, - closure); + grpc_connected_subchannel* con, grpc_pollset_set* interested_parties, + grpc_connectivity_state* state, grpc_closure* closure) { + connected_subchannel_state_op(con, interested_parties, state, closure); } -void grpc_connected_subchannel_ping(grpc_exec_ctx* exec_ctx, - grpc_connected_subchannel* con, +void grpc_connected_subchannel_ping(grpc_connected_subchannel* con, grpc_closure* closure) { grpc_transport_op* op = grpc_make_transport_op(nullptr); grpc_channel_element* elem; op->send_ping = closure; elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CONNECTION(con), 0); - elem->filter->start_transport_op(exec_ctx, elem, op); + elem->filter->start_transport_op(elem, op); } -static bool publish_transport_locked(grpc_exec_ctx* exec_ctx, - grpc_subchannel* c) { +static bool publish_transport_locked(grpc_subchannel* c) { grpc_connected_subchannel* con; grpc_channel_stack* stk; state_watcher* sw_subchannel; @@ -601,19 +578,18 @@ static bool publish_transport_locked(grpc_exec_ctx* exec_ctx, /* construct channel stack */ grpc_channel_stack_builder* builder = grpc_channel_stack_builder_create(); grpc_channel_stack_builder_set_channel_arguments( - exec_ctx, builder, c->connecting_result.channel_args); + builder, c->connecting_result.channel_args); grpc_channel_stack_builder_set_transport(builder, c->connecting_result.transport); - if (!grpc_channel_init_create_stack(exec_ctx, builder, - GRPC_CLIENT_SUBCHANNEL)) { - grpc_channel_stack_builder_destroy(exec_ctx, builder); + if (!grpc_channel_init_create_stack(builder, GRPC_CLIENT_SUBCHANNEL)) { + grpc_channel_stack_builder_destroy(builder); return false; } grpc_error* error = grpc_channel_stack_builder_finish( - exec_ctx, builder, 0, 1, connection_destroy, nullptr, (void**)&con); + builder, 0, 1, connection_destroy, nullptr, (void**)&con); if (error != GRPC_ERROR_NONE) { - grpc_transport_destroy(exec_ctx, c->connecting_result.transport); + grpc_transport_destroy(c->connecting_result.transport); gpr_log(GPR_ERROR, "error initializing subchannel stack: %s", grpc_error_string(error)); GRPC_ERROR_UNREF(error); @@ -631,7 +607,7 @@ static bool publish_transport_locked(grpc_exec_ctx* exec_ctx, if (c->disconnected) { gpr_free(sw_subchannel); - grpc_channel_stack_destroy(exec_ctx, stk); + grpc_channel_stack_destroy(stk); gpr_free(con); return false; } @@ -647,19 +623,18 @@ static bool publish_transport_locked(grpc_exec_ctx* exec_ctx, /* setup subchannel watching connected subchannel for changes; subchannel ref for connecting is donated to the state watcher */ GRPC_SUBCHANNEL_WEAK_REF(c, "state_watcher"); - GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "connecting"); + GRPC_SUBCHANNEL_WEAK_UNREF(c, "connecting"); grpc_connected_subchannel_notify_on_state_change( - exec_ctx, con, c->pollset_set, &sw_subchannel->connectivity_state, + con, c->pollset_set, &sw_subchannel->connectivity_state, &sw_subchannel->closure); /* signal completion */ - grpc_connectivity_state_set(exec_ctx, &c->state_tracker, GRPC_CHANNEL_READY, + grpc_connectivity_state_set(&c->state_tracker, GRPC_CHANNEL_READY, GRPC_ERROR_NONE, "connected"); return true; } -static void subchannel_connected(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void subchannel_connected(void* arg, grpc_error* error) { grpc_subchannel* c = (grpc_subchannel*)arg; grpc_channel_args* delete_channel_args = c->connecting_result.channel_args; @@ -667,13 +642,13 @@ static void subchannel_connected(grpc_exec_ctx* exec_ctx, void* arg, gpr_mu_lock(&c->mu); c->connecting = false; if (c->connecting_result.transport != nullptr && - publish_transport_locked(exec_ctx, c)) { + publish_transport_locked(c)) { /* do nothing, transport was published */ } else if (c->disconnected) { - GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "connecting"); + GRPC_SUBCHANNEL_WEAK_UNREF(c, "connecting"); } else { grpc_connectivity_state_set( - exec_ctx, &c->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, + &c->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, grpc_error_set_int(GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Connect Failed", &error, 1), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE), @@ -682,27 +657,26 @@ static void subchannel_connected(grpc_exec_ctx* exec_ctx, void* arg, const char* errmsg = grpc_error_string(error); gpr_log(GPR_INFO, "Connect failed: %s", errmsg); - maybe_start_connecting_locked(exec_ctx, c); - GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "connecting"); + maybe_start_connecting_locked(c); + GRPC_SUBCHANNEL_WEAK_UNREF(c, "connecting"); } gpr_mu_unlock(&c->mu); - GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, c, "connected"); - grpc_channel_args_destroy(exec_ctx, delete_channel_args); + GRPC_SUBCHANNEL_WEAK_UNREF(c, "connected"); + grpc_channel_args_destroy(delete_channel_args); } /* * grpc_subchannel_call implementation */ -static void subchannel_call_destroy(grpc_exec_ctx* exec_ctx, void* call, - grpc_error* error) { +static void subchannel_call_destroy(void* call, grpc_error* error) { grpc_subchannel_call* c = (grpc_subchannel_call*)call; GPR_ASSERT(c->schedule_closure_after_destroy != nullptr); GPR_TIMER_BEGIN("grpc_subchannel_call_unref.destroy", 0); grpc_connected_subchannel* connection = c->connection; - grpc_call_stack_destroy(exec_ctx, SUBCHANNEL_CALL_TO_CALL_STACK(c), nullptr, + grpc_call_stack_destroy(SUBCHANNEL_CALL_TO_CALL_STACK(c), nullptr, c->schedule_closure_after_destroy); - GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, connection, "subchannel_call"); + GRPC_CONNECTED_SUBCHANNEL_UNREF(connection, "subchannel_call"); GPR_TIMER_END("grpc_subchannel_call_unref.destroy", 0); } @@ -718,20 +692,18 @@ void grpc_subchannel_call_ref( GRPC_CALL_STACK_REF(SUBCHANNEL_CALL_TO_CALL_STACK(c), REF_REASON); } -void grpc_subchannel_call_unref(grpc_exec_ctx* exec_ctx, - grpc_subchannel_call* c - GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { - GRPC_CALL_STACK_UNREF(exec_ctx, SUBCHANNEL_CALL_TO_CALL_STACK(c), REF_REASON); +void grpc_subchannel_call_unref( + grpc_subchannel_call* c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { + GRPC_CALL_STACK_UNREF(SUBCHANNEL_CALL_TO_CALL_STACK(c), REF_REASON); } -void grpc_subchannel_call_process_op(grpc_exec_ctx* exec_ctx, - grpc_subchannel_call* call, +void grpc_subchannel_call_process_op(grpc_subchannel_call* call, grpc_transport_stream_op_batch* batch) { GPR_TIMER_BEGIN("grpc_subchannel_call_process_op", 0); grpc_call_stack* call_stack = SUBCHANNEL_CALL_TO_CALL_STACK(call); grpc_call_element* top_elem = grpc_call_stack_element(call_stack, 0); GRPC_CALL_LOG_OP(GPR_INFO, top_elem, batch); - top_elem->filter->start_transport_stream_op_batch(exec_ctx, top_elem, batch); + top_elem->filter->start_transport_stream_op_batch(top_elem, batch); GPR_TIMER_END("grpc_subchannel_call_process_op", 0); } @@ -746,7 +718,7 @@ const grpc_subchannel_key* grpc_subchannel_get_key( } grpc_error* grpc_connected_subchannel_create_call( - grpc_exec_ctx* exec_ctx, grpc_connected_subchannel* con, + grpc_connected_subchannel* con, const grpc_connected_subchannel_call_args* args, grpc_subchannel_call** call) { grpc_channel_stack* chanstk = CHANNEL_STACK_FROM_CONNECTION(con); @@ -764,14 +736,14 @@ grpc_error* grpc_connected_subchannel_create_call( args->arena, /* arena */ args->call_combiner /* call_combiner */ }; - grpc_error* error = grpc_call_stack_init( - exec_ctx, chanstk, 1, subchannel_call_destroy, *call, &call_args); + grpc_error* error = grpc_call_stack_init(chanstk, 1, subchannel_call_destroy, + *call, &call_args); if (error != GRPC_ERROR_NONE) { const char* error_string = grpc_error_string(error); gpr_log(GPR_ERROR, "error: %s", error_string); return error; } - grpc_call_stack_set_pollset_or_pollset_set(exec_ctx, callstk, args->pollent); + grpc_call_stack_set_pollset_or_pollset_set(callstk, args->pollent); return GRPC_ERROR_NONE; } @@ -780,21 +752,20 @@ grpc_call_stack* grpc_subchannel_call_get_call_stack( return SUBCHANNEL_CALL_TO_CALL_STACK(subchannel_call); } -static void grpc_uri_to_sockaddr(grpc_exec_ctx* exec_ctx, const char* uri_str, +static void grpc_uri_to_sockaddr(const char* uri_str, grpc_resolved_address* addr) { - grpc_uri* uri = grpc_uri_parse(exec_ctx, uri_str, 0 /* suppress_errors */); + grpc_uri* uri = grpc_uri_parse(uri_str, 0 /* suppress_errors */); GPR_ASSERT(uri != nullptr); if (!grpc_parse_uri(uri, addr)) memset(addr, 0, sizeof(*addr)); grpc_uri_destroy(uri); } -void grpc_get_subchannel_address_arg(grpc_exec_ctx* exec_ctx, - const grpc_channel_args* args, +void grpc_get_subchannel_address_arg(const grpc_channel_args* args, grpc_resolved_address* addr) { const char* addr_uri_str = grpc_get_subchannel_address_uri_arg(args); memset(addr, 0, sizeof(*addr)); if (*addr_uri_str != '\0') { - grpc_uri_to_sockaddr(exec_ctx, addr_uri_str, addr); + grpc_uri_to_sockaddr(addr_uri_str, addr); } } diff --git a/src/core/ext/filters/client_channel/subchannel.h b/src/core/ext/filters/client_channel/subchannel.h index 1f326fc1d20..84d9fa27a1b 100644 --- a/src/core/ext/filters/client_channel/subchannel.h +++ b/src/core/ext/filters/client_channel/subchannel.h @@ -42,36 +42,34 @@ typedef struct grpc_subchannel_key grpc_subchannel_key; grpc_subchannel_ref((p), __FILE__, __LINE__, (r)) #define GRPC_SUBCHANNEL_REF_FROM_WEAK_REF(p, r) \ grpc_subchannel_ref_from_weak_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_SUBCHANNEL_UNREF(cl, p, r) \ - grpc_subchannel_unref((cl), (p), __FILE__, __LINE__, (r)) +#define GRPC_SUBCHANNEL_UNREF(p, r) \ + grpc_subchannel_unref((p), __FILE__, __LINE__, (r)) #define GRPC_SUBCHANNEL_WEAK_REF(p, r) \ grpc_subchannel_weak_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_SUBCHANNEL_WEAK_UNREF(cl, p, r) \ - grpc_subchannel_weak_unref((cl), (p), __FILE__, __LINE__, (r)) +#define GRPC_SUBCHANNEL_WEAK_UNREF(p, r) \ + grpc_subchannel_weak_unref((p), __FILE__, __LINE__, (r)) #define GRPC_CONNECTED_SUBCHANNEL_REF(p, r) \ grpc_connected_subchannel_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_CONNECTED_SUBCHANNEL_UNREF(cl, p, r) \ - grpc_connected_subchannel_unref((cl), (p), __FILE__, __LINE__, (r)) +#define GRPC_CONNECTED_SUBCHANNEL_UNREF(p, r) \ + grpc_connected_subchannel_unref((p), __FILE__, __LINE__, (r)) #define GRPC_SUBCHANNEL_CALL_REF(p, r) \ grpc_subchannel_call_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_SUBCHANNEL_CALL_UNREF(cl, p, r) \ - grpc_subchannel_call_unref((cl), (p), __FILE__, __LINE__, (r)) +#define GRPC_SUBCHANNEL_CALL_UNREF(p, r) \ + grpc_subchannel_call_unref((p), __FILE__, __LINE__, (r)) #define GRPC_SUBCHANNEL_REF_EXTRA_ARGS \ , const char *file, int line, const char *reason #else #define GRPC_SUBCHANNEL_REF(p, r) grpc_subchannel_ref((p)) #define GRPC_SUBCHANNEL_REF_FROM_WEAK_REF(p, r) \ grpc_subchannel_ref_from_weak_ref((p)) -#define GRPC_SUBCHANNEL_UNREF(cl, p, r) grpc_subchannel_unref((cl), (p)) +#define GRPC_SUBCHANNEL_UNREF(p, r) grpc_subchannel_unref((p)) #define GRPC_SUBCHANNEL_WEAK_REF(p, r) grpc_subchannel_weak_ref((p)) -#define GRPC_SUBCHANNEL_WEAK_UNREF(cl, p, r) \ - grpc_subchannel_weak_unref((cl), (p)) +#define GRPC_SUBCHANNEL_WEAK_UNREF(p, r) grpc_subchannel_weak_unref((p)) #define GRPC_CONNECTED_SUBCHANNEL_REF(p, r) grpc_connected_subchannel_ref((p)) -#define GRPC_CONNECTED_SUBCHANNEL_UNREF(cl, p, r) \ - grpc_connected_subchannel_unref((cl), (p)) +#define GRPC_CONNECTED_SUBCHANNEL_UNREF(p, r) \ + grpc_connected_subchannel_unref((p)) #define GRPC_SUBCHANNEL_CALL_REF(p, r) grpc_subchannel_call_ref((p)) -#define GRPC_SUBCHANNEL_CALL_UNREF(cl, p, r) \ - grpc_subchannel_call_unref((cl), (p)) +#define GRPC_SUBCHANNEL_CALL_UNREF(p, r) grpc_subchannel_call_unref((p)) #define GRPC_SUBCHANNEL_REF_EXTRA_ARGS #endif @@ -79,24 +77,20 @@ grpc_subchannel* grpc_subchannel_ref( grpc_subchannel* channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); grpc_subchannel* grpc_subchannel_ref_from_weak_ref( grpc_subchannel* channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); -void grpc_subchannel_unref(grpc_exec_ctx* exec_ctx, - grpc_subchannel* channel - GRPC_SUBCHANNEL_REF_EXTRA_ARGS); +void grpc_subchannel_unref( + grpc_subchannel* channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); grpc_subchannel* grpc_subchannel_weak_ref( grpc_subchannel* channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); -void grpc_subchannel_weak_unref(grpc_exec_ctx* exec_ctx, - grpc_subchannel* channel - GRPC_SUBCHANNEL_REF_EXTRA_ARGS); +void grpc_subchannel_weak_unref( + grpc_subchannel* channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); 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 - GRPC_SUBCHANNEL_REF_EXTRA_ARGS); +void grpc_connected_subchannel_unref( + grpc_connected_subchannel* channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); void grpc_subchannel_call_ref( grpc_subchannel_call* call GRPC_SUBCHANNEL_REF_EXTRA_ARGS); -void grpc_subchannel_call_unref(grpc_exec_ctx* exec_ctx, - grpc_subchannel_call* call - GRPC_SUBCHANNEL_REF_EXTRA_ARGS); +void grpc_subchannel_call_unref( + grpc_subchannel_call* call GRPC_SUBCHANNEL_REF_EXTRA_ARGS); /** construct a subchannel call */ typedef struct { @@ -110,14 +104,13 @@ typedef struct { } grpc_connected_subchannel_call_args; grpc_error* grpc_connected_subchannel_create_call( - grpc_exec_ctx* exec_ctx, grpc_connected_subchannel* connected_subchannel, + grpc_connected_subchannel* connected_subchannel, const grpc_connected_subchannel_call_args* args, grpc_subchannel_call** subchannel_call); /** process a transport level op */ void grpc_connected_subchannel_process_transport_op( - grpc_exec_ctx* exec_ctx, grpc_connected_subchannel* subchannel, - grpc_transport_op* op); + grpc_connected_subchannel* subchannel, grpc_transport_op* op); /** poll the current connectivity state of a channel */ grpc_connectivity_state grpc_subchannel_check_connectivity( @@ -126,15 +119,12 @@ grpc_connectivity_state grpc_subchannel_check_connectivity( /** Calls notify when the connectivity state of a channel becomes different from *state. Updates *state with the new state of the channel. */ void grpc_subchannel_notify_on_state_change( - grpc_exec_ctx* exec_ctx, grpc_subchannel* channel, - grpc_pollset_set* interested_parties, grpc_connectivity_state* state, - grpc_closure* notify); + grpc_subchannel* channel, grpc_pollset_set* interested_parties, + grpc_connectivity_state* state, grpc_closure* notify); void grpc_connected_subchannel_notify_on_state_change( - grpc_exec_ctx* exec_ctx, grpc_connected_subchannel* channel, - grpc_pollset_set* interested_parties, grpc_connectivity_state* state, - grpc_closure* notify); -void grpc_connected_subchannel_ping(grpc_exec_ctx* exec_ctx, - grpc_connected_subchannel* channel, + grpc_connected_subchannel* channel, grpc_pollset_set* interested_parties, + grpc_connectivity_state* state, grpc_closure* notify); +void grpc_connected_subchannel_ping(grpc_connected_subchannel* channel, grpc_closure* notify); /** retrieve the grpc_connected_subchannel - or NULL if called before @@ -147,8 +137,7 @@ const grpc_subchannel_key* grpc_subchannel_get_key( const grpc_subchannel* subchannel); /** continue processing a transport op */ -void grpc_subchannel_call_process_op(grpc_exec_ctx* exec_ctx, - grpc_subchannel_call* subchannel_call, +void grpc_subchannel_call_process_op(grpc_subchannel_call* subchannel_call, grpc_transport_stream_op_batch* op); /** Must be called once per call. Sets the 'then_schedule_closure' argument for @@ -172,13 +161,11 @@ struct grpc_subchannel_args { }; /** create a subchannel given a connector */ -grpc_subchannel* grpc_subchannel_create(grpc_exec_ctx* exec_ctx, - grpc_connector* connector, +grpc_subchannel* grpc_subchannel_create(grpc_connector* connector, const grpc_subchannel_args* args); /// Sets \a addr from \a args. -void grpc_get_subchannel_address_arg(grpc_exec_ctx* exec_ctx, - const grpc_channel_args* args, +void grpc_get_subchannel_address_arg(const grpc_channel_args* args, grpc_resolved_address* addr); /// Returns the URI string for the address to connect to. diff --git a/src/core/ext/filters/client_channel/subchannel_index.cc b/src/core/ext/filters/client_channel/subchannel_index.cc index 1624643d0b4..052b047f432 100644 --- a/src/core/ext/filters/client_channel/subchannel_index.cc +++ b/src/core/ext/filters/client_channel/subchannel_index.cc @@ -81,16 +81,14 @@ int grpc_subchannel_key_compare(const grpc_subchannel_key* a, return grpc_channel_args_compare(a->args.args, b->args.args); } -void grpc_subchannel_key_destroy(grpc_exec_ctx* exec_ctx, - grpc_subchannel_key* k) { +void grpc_subchannel_key_destroy(grpc_subchannel_key* k) { gpr_free((grpc_channel_args*)k->args.filters); - grpc_channel_args_destroy(exec_ctx, (grpc_channel_args*)k->args.args); + grpc_channel_args_destroy((grpc_channel_args*)k->args.args); gpr_free(k); } static void sck_avl_destroy(void* p, void* user_data) { - grpc_exec_ctx* exec_ctx = (grpc_exec_ctx*)user_data; - grpc_subchannel_key_destroy(exec_ctx, (grpc_subchannel_key*)p); + grpc_subchannel_key_destroy((grpc_subchannel_key*)p); } static void* sck_avl_copy(void* p, void* unused) { @@ -103,8 +101,7 @@ static long sck_avl_compare(void* a, void* b, void* unused) { } static void scv_avl_destroy(void* p, void* user_data) { - grpc_exec_ctx* exec_ctx = (grpc_exec_ctx*)user_data; - GRPC_SUBCHANNEL_WEAK_UNREF(exec_ctx, (grpc_subchannel*)p, "subchannel_index"); + GRPC_SUBCHANNEL_WEAK_UNREF((grpc_subchannel*)p, "subchannel_index"); } static void* scv_avl_copy(void* p, void* unused) { @@ -135,32 +132,29 @@ void grpc_subchannel_index_shutdown(void) { void grpc_subchannel_index_unref(void) { if (gpr_unref(&g_refcount)) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_mu_destroy(&g_mu); - gpr_avl_unref(g_subchannel_index, &exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + gpr_avl_unref(g_subchannel_index, grpc_core::ExecCtx::Get()); } } void grpc_subchannel_index_ref(void) { gpr_ref_non_zero(&g_refcount); } -grpc_subchannel* grpc_subchannel_index_find(grpc_exec_ctx* exec_ctx, - grpc_subchannel_key* key) { +grpc_subchannel* grpc_subchannel_index_find(grpc_subchannel_key* key) { // Lock, and take a reference to the subchannel index. // We don't need to do the search under a lock as avl's are immutable. gpr_mu_lock(&g_mu); - gpr_avl index = gpr_avl_ref(g_subchannel_index, exec_ctx); + gpr_avl index = gpr_avl_ref(g_subchannel_index, grpc_core::ExecCtx::Get()); gpr_mu_unlock(&g_mu); grpc_subchannel* c = GRPC_SUBCHANNEL_REF_FROM_WEAK_REF( - (grpc_subchannel*)gpr_avl_get(index, key, exec_ctx), "index_find"); - gpr_avl_unref(index, exec_ctx); + (grpc_subchannel*)gpr_avl_get(index, key, grpc_core::ExecCtx::Get()), + "index_find"); + gpr_avl_unref(index, grpc_core::ExecCtx::Get()); return c; } -grpc_subchannel* grpc_subchannel_index_register(grpc_exec_ctx* exec_ctx, - grpc_subchannel_key* key, +grpc_subchannel* grpc_subchannel_index_register(grpc_subchannel_key* key, grpc_subchannel* constructed) { grpc_subchannel* c = nullptr; bool need_to_unref_constructed = false; @@ -171,11 +165,11 @@ grpc_subchannel* grpc_subchannel_index_register(grpc_exec_ctx* exec_ctx, // Compare and swap loop: // - take a reference to the current index gpr_mu_lock(&g_mu); - gpr_avl index = gpr_avl_ref(g_subchannel_index, exec_ctx); + gpr_avl index = gpr_avl_ref(g_subchannel_index, grpc_core::ExecCtx::Get()); gpr_mu_unlock(&g_mu); // - Check to see if a subchannel already exists - c = (grpc_subchannel*)gpr_avl_get(index, key, exec_ctx); + c = (grpc_subchannel*)gpr_avl_get(index, key, grpc_core::ExecCtx::Get()); if (c != nullptr) { c = GRPC_SUBCHANNEL_REF_FROM_WEAK_REF(c, "index_register"); } @@ -184,9 +178,11 @@ grpc_subchannel* grpc_subchannel_index_register(grpc_exec_ctx* exec_ctx, need_to_unref_constructed = true; } else { // no -> update the avl and compare/swap - gpr_avl updated = gpr_avl_add( - gpr_avl_ref(index, exec_ctx), subchannel_key_copy(key), - GRPC_SUBCHANNEL_WEAK_REF(constructed, "index_register"), exec_ctx); + gpr_avl updated = + gpr_avl_add(gpr_avl_ref(index, grpc_core::ExecCtx::Get()), + subchannel_key_copy(key), + GRPC_SUBCHANNEL_WEAK_REF(constructed, "index_register"), + grpc_core::ExecCtx::Get()); // it may happen (but it's expected to be unlikely) // that some other thread has changed the index: @@ -198,41 +194,42 @@ grpc_subchannel* grpc_subchannel_index_register(grpc_exec_ctx* exec_ctx, } gpr_mu_unlock(&g_mu); - gpr_avl_unref(updated, exec_ctx); + gpr_avl_unref(updated, grpc_core::ExecCtx::Get()); } - gpr_avl_unref(index, exec_ctx); + gpr_avl_unref(index, grpc_core::ExecCtx::Get()); } if (need_to_unref_constructed) { - GRPC_SUBCHANNEL_UNREF(exec_ctx, constructed, "index_register"); + GRPC_SUBCHANNEL_UNREF(constructed, "index_register"); } return c; } -void grpc_subchannel_index_unregister(grpc_exec_ctx* exec_ctx, - grpc_subchannel_key* key, +void grpc_subchannel_index_unregister(grpc_subchannel_key* key, grpc_subchannel* constructed) { bool done = false; while (!done) { // Compare and swap loop: // - take a reference to the current index gpr_mu_lock(&g_mu); - gpr_avl index = gpr_avl_ref(g_subchannel_index, exec_ctx); + gpr_avl index = gpr_avl_ref(g_subchannel_index, grpc_core::ExecCtx::Get()); gpr_mu_unlock(&g_mu); // Check to see if this key still refers to the previously // registered subchannel - grpc_subchannel* c = (grpc_subchannel*)gpr_avl_get(index, key, exec_ctx); + grpc_subchannel* c = + (grpc_subchannel*)gpr_avl_get(index, key, grpc_core::ExecCtx::Get()); if (c != constructed) { - gpr_avl_unref(index, exec_ctx); + gpr_avl_unref(index, grpc_core::ExecCtx::Get()); break; } // compare and swap the update (some other thread may have // mutated the index behind us) gpr_avl updated = - gpr_avl_remove(gpr_avl_ref(index, exec_ctx), key, exec_ctx); + gpr_avl_remove(gpr_avl_ref(index, grpc_core::ExecCtx::Get()), key, + grpc_core::ExecCtx::Get()); gpr_mu_lock(&g_mu); if (index.root == g_subchannel_index.root) { @@ -241,8 +238,8 @@ void grpc_subchannel_index_unregister(grpc_exec_ctx* exec_ctx, } gpr_mu_unlock(&g_mu); - gpr_avl_unref(updated, exec_ctx); - gpr_avl_unref(index, exec_ctx); + gpr_avl_unref(updated, grpc_core::ExecCtx::Get()); + gpr_avl_unref(index, grpc_core::ExecCtx::Get()); } } diff --git a/src/core/ext/filters/client_channel/subchannel_index.h b/src/core/ext/filters/client_channel/subchannel_index.h index 6a4d06ef8ff..bd160a3b133 100644 --- a/src/core/ext/filters/client_channel/subchannel_index.h +++ b/src/core/ext/filters/client_channel/subchannel_index.h @@ -29,26 +29,22 @@ grpc_subchannel_key* grpc_subchannel_key_create( const grpc_subchannel_args* args); /** Destroy a subchannel key */ -void grpc_subchannel_key_destroy(grpc_exec_ctx* exec_ctx, - grpc_subchannel_key* key); +void grpc_subchannel_key_destroy(grpc_subchannel_key* key); /** Given a subchannel key, find the subchannel registered for it. Returns NULL if no such channel exists. Thread-safe. */ -grpc_subchannel* grpc_subchannel_index_find(grpc_exec_ctx* exec_ctx, - grpc_subchannel_key* key); +grpc_subchannel* grpc_subchannel_index_find(grpc_subchannel_key* key); /** Register a subchannel against a key. Takes ownership of \a constructed. Returns the registered subchannel. This may be different from \a constructed in the case of a registration race. */ -grpc_subchannel* grpc_subchannel_index_register(grpc_exec_ctx* exec_ctx, - grpc_subchannel_key* key, +grpc_subchannel* grpc_subchannel_index_register(grpc_subchannel_key* key, grpc_subchannel* constructed); /** Remove \a constructed as the registered subchannel for \a key. */ -void grpc_subchannel_index_unregister(grpc_exec_ctx* exec_ctx, - grpc_subchannel_key* key, +void grpc_subchannel_index_unregister(grpc_subchannel_key* key, grpc_subchannel* constructed); int grpc_subchannel_key_compare(const grpc_subchannel_key* a, diff --git a/src/core/ext/filters/client_channel/uri_parser.cc b/src/core/ext/filters/client_channel/uri_parser.cc index b76dcbe4e3b..3428f4b54c5 100644 --- a/src/core/ext/filters/client_channel/uri_parser.cc +++ b/src/core/ext/filters/client_channel/uri_parser.cc @@ -56,8 +56,8 @@ static grpc_uri* bad_uri(const char* uri_text, size_t pos, const char* section, } /** Returns a copy of percent decoded \a src[begin, end) */ -static char* decode_and_copy_component(grpc_exec_ctx* exec_ctx, const char* src, - size_t begin, size_t end) { +static char* decode_and_copy_component(const char* src, size_t begin, + size_t end) { grpc_slice component = (begin == NOT_SET || end == NOT_SET) ? grpc_empty_slice() @@ -65,8 +65,8 @@ static char* decode_and_copy_component(grpc_exec_ctx* exec_ctx, const char* src, grpc_slice decoded_component = grpc_permissive_percent_decode_slice(component); char* out = grpc_dump_slice(decoded_component, GPR_DUMP_ASCII); - grpc_slice_unref_internal(exec_ctx, component); - grpc_slice_unref_internal(exec_ctx, decoded_component); + grpc_slice_unref_internal(component); + grpc_slice_unref_internal(decoded_component); return out; } @@ -184,8 +184,7 @@ static void parse_query_parts(grpc_uri* uri) { } } -grpc_uri* grpc_uri_parse(grpc_exec_ctx* exec_ctx, const char* uri_text, - bool suppress_errors) { +grpc_uri* grpc_uri_parse(const char* uri_text, bool suppress_errors) { grpc_uri* uri; size_t scheme_begin = 0; size_t scheme_end = NOT_SET; @@ -273,16 +272,13 @@ grpc_uri* grpc_uri_parse(grpc_exec_ctx* exec_ctx, const char* uri_text, } uri = (grpc_uri*)gpr_zalloc(sizeof(*uri)); - uri->scheme = - decode_and_copy_component(exec_ctx, uri_text, scheme_begin, scheme_end); - uri->authority = decode_and_copy_component(exec_ctx, uri_text, - authority_begin, authority_end); - uri->path = - decode_and_copy_component(exec_ctx, uri_text, path_begin, path_end); - uri->query = - decode_and_copy_component(exec_ctx, uri_text, query_begin, query_end); - uri->fragment = decode_and_copy_component(exec_ctx, uri_text, fragment_begin, - fragment_end); + uri->scheme = decode_and_copy_component(uri_text, scheme_begin, scheme_end); + uri->authority = + decode_and_copy_component(uri_text, authority_begin, authority_end); + uri->path = decode_and_copy_component(uri_text, path_begin, path_end); + uri->query = decode_and_copy_component(uri_text, query_begin, query_end); + uri->fragment = + decode_and_copy_component(uri_text, fragment_begin, fragment_end); parse_query_parts(uri); return uri; diff --git a/src/core/ext/filters/client_channel/uri_parser.h b/src/core/ext/filters/client_channel/uri_parser.h index 84752905e8f..24ff06c0b5a 100644 --- a/src/core/ext/filters/client_channel/uri_parser.h +++ b/src/core/ext/filters/client_channel/uri_parser.h @@ -37,8 +37,7 @@ typedef struct { } grpc_uri; /** parse a uri, return NULL on failure */ -grpc_uri* grpc_uri_parse(grpc_exec_ctx* exec_ctx, const char* uri_text, - bool suppress_errors); +grpc_uri* grpc_uri_parse(const char* uri_text, bool suppress_errors); /** return the part of a query string after the '=' in "?key=xxx&...", or NULL * if key is not present */ diff --git a/src/core/ext/filters/deadline/deadline_filter.cc b/src/core/ext/filters/deadline/deadline_filter.cc index 5db7584a59d..c430f3d2d49 100644 --- a/src/core/ext/filters/deadline/deadline_filter.cc +++ b/src/core/ext/filters/deadline/deadline_filter.cc @@ -36,18 +36,16 @@ // The on_complete callback used when sending a cancel_error batch down the // filter stack. Yields the call combiner when the batch returns. -static void yield_call_combiner(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* ignored) { +static void yield_call_combiner(void* arg, grpc_error* ignored) { grpc_deadline_state* deadline_state = (grpc_deadline_state*)arg; - GRPC_CALL_COMBINER_STOP(exec_ctx, deadline_state->call_combiner, + GRPC_CALL_COMBINER_STOP(deadline_state->call_combiner, "got on_complete from cancel_stream batch"); - GRPC_CALL_STACK_UNREF(exec_ctx, deadline_state->call_stack, "deadline_timer"); + GRPC_CALL_STACK_UNREF(deadline_state->call_stack, "deadline_timer"); } // This is called via the call combiner, so access to deadline_state is // synchronized. -static void send_cancel_op_in_call_combiner(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void send_cancel_op_in_call_combiner(void* arg, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; grpc_deadline_state* deadline_state = (grpc_deadline_state*)elem->call_data; grpc_transport_stream_op_batch* batch = grpc_make_transport_stream_op( @@ -55,37 +53,34 @@ static void send_cancel_op_in_call_combiner(grpc_exec_ctx* exec_ctx, void* arg, deadline_state, grpc_schedule_on_exec_ctx)); batch->cancel_stream = true; batch->payload->cancel_stream.cancel_error = GRPC_ERROR_REF(error); - elem->filter->start_transport_stream_op_batch(exec_ctx, elem, batch); + elem->filter->start_transport_stream_op_batch(elem, batch); } // Timer callback. -static void timer_callback(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void timer_callback(void* arg, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; grpc_deadline_state* deadline_state = (grpc_deadline_state*)elem->call_data; if (error != GRPC_ERROR_CANCELLED) { error = grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Deadline Exceeded"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_DEADLINE_EXCEEDED); - grpc_call_combiner_cancel(exec_ctx, deadline_state->call_combiner, + grpc_call_combiner_cancel(deadline_state->call_combiner, GRPC_ERROR_REF(error)); GRPC_CLOSURE_INIT(&deadline_state->timer_callback, send_cancel_op_in_call_combiner, elem, grpc_schedule_on_exec_ctx); - GRPC_CALL_COMBINER_START(exec_ctx, deadline_state->call_combiner, + GRPC_CALL_COMBINER_START(deadline_state->call_combiner, &deadline_state->timer_callback, error, "deadline exceeded -- sending cancel_stream op"); } else { - GRPC_CALL_STACK_UNREF(exec_ctx, deadline_state->call_stack, - "deadline_timer"); + GRPC_CALL_STACK_UNREF(deadline_state->call_stack, "deadline_timer"); } } // Starts the deadline timer. // This is called via the call combiner, so access to deadline_state is // synchronized. -static void start_timer_if_needed(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static void start_timer_if_needed(grpc_call_element* elem, grpc_millis deadline) { if (deadline == GRPC_MILLIS_INF_FUTURE) { return; @@ -113,17 +108,16 @@ static void start_timer_if_needed(grpc_exec_ctx* exec_ctx, } GPR_ASSERT(closure != nullptr); GRPC_CALL_STACK_REF(deadline_state->call_stack, "deadline_timer"); - grpc_timer_init(exec_ctx, &deadline_state->timer, deadline, closure); + grpc_timer_init(&deadline_state->timer, deadline, closure); } // Cancels the deadline timer. // This is called via the call combiner, so access to deadline_state is // synchronized. -static void cancel_timer_if_needed(grpc_exec_ctx* exec_ctx, - grpc_deadline_state* deadline_state) { +static void cancel_timer_if_needed(grpc_deadline_state* deadline_state) { if (deadline_state->timer_state == GRPC_DEADLINE_STATE_PENDING) { deadline_state->timer_state = GRPC_DEADLINE_STATE_FINISHED; - grpc_timer_cancel(exec_ctx, &deadline_state->timer); + grpc_timer_cancel(&deadline_state->timer); } else { // timer was either in STATE_INITAL (nothing to cancel) // OR in STATE_FINISHED (again nothing to cancel) @@ -131,12 +125,11 @@ static void cancel_timer_if_needed(grpc_exec_ctx* exec_ctx, } // Callback run when the call is complete. -static void on_complete(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void on_complete(void* arg, grpc_error* error) { grpc_deadline_state* deadline_state = (grpc_deadline_state*)arg; - cancel_timer_if_needed(exec_ctx, deadline_state); + cancel_timer_if_needed(deadline_state); // Invoke the next callback. - GRPC_CLOSURE_RUN(exec_ctx, deadline_state->next_on_complete, - GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(deadline_state->next_on_complete, GRPC_ERROR_REF(error)); } // Inject our own on_complete callback into op. @@ -156,8 +149,7 @@ struct start_timer_after_init_state { grpc_millis deadline; grpc_closure closure; }; -static void start_timer_after_init(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void start_timer_after_init(void* arg, grpc_error* error) { struct start_timer_after_init_state* state = (struct start_timer_after_init_state*)arg; grpc_deadline_state* deadline_state = @@ -166,18 +158,18 @@ static void start_timer_after_init(grpc_exec_ctx* exec_ctx, void* arg, // We are initially called without holding the call combiner, so we // need to bounce ourselves into it. state->in_call_combiner = true; - GRPC_CALL_COMBINER_START(exec_ctx, deadline_state->call_combiner, - &state->closure, GRPC_ERROR_REF(error), + GRPC_CALL_COMBINER_START(deadline_state->call_combiner, &state->closure, + GRPC_ERROR_REF(error), "scheduling deadline timer"); return; } - start_timer_if_needed(exec_ctx, state->elem, state->deadline); + start_timer_if_needed(state->elem, state->deadline); gpr_free(state); - GRPC_CALL_COMBINER_STOP(exec_ctx, deadline_state->call_combiner, + GRPC_CALL_COMBINER_STOP(deadline_state->call_combiner, "done scheduling deadline timer"); } -void grpc_deadline_state_init(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +void grpc_deadline_state_init(grpc_call_element* elem, grpc_call_stack* call_stack, grpc_call_combiner* call_combiner, grpc_millis deadline) { @@ -200,29 +192,27 @@ void grpc_deadline_state_init(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, state->deadline = deadline; GRPC_CLOSURE_INIT(&state->closure, start_timer_after_init, state, grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(exec_ctx, &state->closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&state->closure, GRPC_ERROR_NONE); } } -void grpc_deadline_state_destroy(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem) { +void grpc_deadline_state_destroy(grpc_call_element* elem) { grpc_deadline_state* deadline_state = (grpc_deadline_state*)elem->call_data; - cancel_timer_if_needed(exec_ctx, deadline_state); + cancel_timer_if_needed(deadline_state); } -void grpc_deadline_state_reset(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +void grpc_deadline_state_reset(grpc_call_element* elem, grpc_millis new_deadline) { grpc_deadline_state* deadline_state = (grpc_deadline_state*)elem->call_data; - cancel_timer_if_needed(exec_ctx, deadline_state); - start_timer_if_needed(exec_ctx, elem, new_deadline); + cancel_timer_if_needed(deadline_state); + start_timer_if_needed(elem, new_deadline); } void grpc_deadline_state_client_start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* op) { + grpc_call_element* elem, grpc_transport_stream_op_batch* op) { grpc_deadline_state* deadline_state = (grpc_deadline_state*)elem->call_data; if (op->cancel_stream) { - cancel_timer_if_needed(exec_ctx, deadline_state); + cancel_timer_if_needed(deadline_state); } else { // Make sure we know when the call is complete, so that we can cancel // the timer. @@ -237,16 +227,14 @@ void grpc_deadline_state_client_start_transport_stream_op_batch( // // Constructor for channel_data. Used for both client and server filters. -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { GPR_ASSERT(!args->is_last); return GRPC_ERROR_NONE; } // Destructor for channel_data. Used for both client and server filters. -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_channel_element* elem) {} // Call data used for both client and server filter. typedef struct base_call_data { @@ -266,50 +254,45 @@ typedef struct server_call_data { } server_call_data; // Constructor for call_data. Used for both client and server filters. -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { - grpc_deadline_state_init(exec_ctx, elem, args->call_stack, - args->call_combiner, args->deadline); + grpc_deadline_state_init(elem, args->call_stack, args->call_combiner, + args->deadline); return GRPC_ERROR_NONE; } // Destructor for call_data. Used for both client and server filters. -static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { - grpc_deadline_state_destroy(exec_ctx, elem); + grpc_deadline_state_destroy(elem); } // Method for starting a call op for client filter. static void client_start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* op) { - grpc_deadline_state_client_start_transport_stream_op_batch(exec_ctx, elem, - op); + grpc_call_element* elem, grpc_transport_stream_op_batch* op) { + grpc_deadline_state_client_start_transport_stream_op_batch(elem, op); // Chain to next filter. - grpc_call_next_op(exec_ctx, elem, op); + grpc_call_next_op(elem, op); } // Callback for receiving initial metadata on the server. -static void recv_initial_metadata_ready(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void recv_initial_metadata_ready(void* arg, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; server_call_data* calld = (server_call_data*)elem->call_data; // Get deadline from metadata and start the timer if needed. - start_timer_if_needed(exec_ctx, elem, calld->recv_initial_metadata->deadline); + start_timer_if_needed(elem, calld->recv_initial_metadata->deadline); // Invoke the next callback. calld->next_recv_initial_metadata_ready->cb( - exec_ctx, calld->next_recv_initial_metadata_ready->cb_arg, error); + calld->next_recv_initial_metadata_ready->cb_arg, error); } // Method for starting a call op for server filter. static void server_start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* op) { + grpc_call_element* elem, grpc_transport_stream_op_batch* op) { server_call_data* calld = (server_call_data*)elem->call_data; if (op->cancel_stream) { - cancel_timer_if_needed(exec_ctx, &calld->base.deadline_state); + cancel_timer_if_needed(&calld->base.deadline_state); } else { // If we're receiving initial metadata, we need to get the deadline // from the recv_initial_metadata_ready callback. So we inject our @@ -335,7 +318,7 @@ static void server_start_transport_stream_op_batch( } } // Chain to next filter. - grpc_call_next_op(exec_ctx, elem, op); + grpc_call_next_op(elem, op); } const grpc_channel_filter grpc_client_deadline_filter = { @@ -372,8 +355,7 @@ bool grpc_deadline_checking_enabled(const grpc_channel_args* channel_args) { !grpc_channel_args_want_minimal_stack(channel_args)); } -static bool maybe_add_deadline_filter(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, +static bool maybe_add_deadline_filter(grpc_channel_stack_builder* builder, void* arg) { return grpc_deadline_checking_enabled( grpc_channel_stack_builder_get_channel_arguments(builder)) diff --git a/src/core/ext/filters/deadline/deadline_filter.h b/src/core/ext/filters/deadline/deadline_filter.h index 8d835d03820..4de817ef54a 100644 --- a/src/core/ext/filters/deadline/deadline_filter.h +++ b/src/core/ext/filters/deadline/deadline_filter.h @@ -49,13 +49,12 @@ typedef struct grpc_deadline_state { // // assumes elem->call_data is zero'd -void grpc_deadline_state_init(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +void grpc_deadline_state_init(grpc_call_element* elem, grpc_call_stack* call_stack, grpc_call_combiner* call_combiner, grpc_millis deadline); -void grpc_deadline_state_destroy(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem); +void grpc_deadline_state_destroy(grpc_call_element* elem); // Cancels the existing timer and starts a new one with new_deadline. // @@ -66,7 +65,7 @@ void grpc_deadline_state_destroy(grpc_exec_ctx* exec_ctx, // deadline may result in the timer being called twice. // // Note: Must be called while holding the call combiner. -void grpc_deadline_state_reset(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +void grpc_deadline_state_reset(grpc_call_element* elem, grpc_millis new_deadline); // To be called from the client-side filter's start_transport_stream_op_batch() @@ -78,8 +77,7 @@ void grpc_deadline_state_reset(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, // // Note: Must be called while holding the call combiner. void grpc_deadline_state_client_start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* op); + grpc_call_element* elem, grpc_transport_stream_op_batch* op); // Should deadline checking be performed (according to channel args) bool grpc_deadline_checking_enabled(const grpc_channel_args* args); diff --git a/src/core/ext/filters/http/client/http_client_filter.cc b/src/core/ext/filters/http/client/http_client_filter.cc index a625369b029..a1fb10f5b87 100644 --- a/src/core/ext/filters/http/client/http_client_filter.cc +++ b/src/core/ext/filters/http/client/http_client_filter.cc @@ -68,12 +68,11 @@ typedef struct channel_data { size_t max_payload_size_for_get; } channel_data; -static grpc_error* client_filter_incoming_metadata(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* client_filter_incoming_metadata(grpc_call_element* elem, grpc_metadata_batch* b) { if (b->idx.named.status != nullptr) { if (grpc_mdelem_eq(b->idx.named.status->md, GRPC_MDELEM_STATUS_200)) { - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.status); + grpc_metadata_batch_remove(b, b->idx.named.status); } else { char* val = grpc_dump_slice(GRPC_MDVALUE(b->idx.named.status->md), GPR_DUMP_ASCII); @@ -98,10 +97,9 @@ static grpc_error* client_filter_incoming_metadata(grpc_exec_ctx* exec_ctx, GRPC_MDVALUE(b->idx.named.grpc_message->md)); if (grpc_slice_is_equivalent(pct_decoded_msg, GRPC_MDVALUE(b->idx.named.grpc_message->md))) { - grpc_slice_unref_internal(exec_ctx, pct_decoded_msg); + grpc_slice_unref_internal(pct_decoded_msg); } else { - grpc_metadata_batch_set_value(exec_ctx, b->idx.named.grpc_message, - pct_decoded_msg); + grpc_metadata_batch_set_value(b->idx.named.grpc_message, pct_decoded_msg); } } @@ -131,60 +129,53 @@ static grpc_error* client_filter_incoming_metadata(grpc_exec_ctx* exec_ctx, gpr_free(val); } } - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.content_type); + grpc_metadata_batch_remove(b, b->idx.named.content_type); } return GRPC_ERROR_NONE; } -static void recv_initial_metadata_ready(grpc_exec_ctx* exec_ctx, - void* user_data, grpc_error* error) { +static void recv_initial_metadata_ready(void* user_data, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; if (error == GRPC_ERROR_NONE) { - error = client_filter_incoming_metadata(exec_ctx, elem, - calld->recv_initial_metadata); + error = client_filter_incoming_metadata(elem, calld->recv_initial_metadata); } else { GRPC_ERROR_REF(error); } - GRPC_CLOSURE_RUN(exec_ctx, calld->original_recv_initial_metadata_ready, - error); + GRPC_CLOSURE_RUN(calld->original_recv_initial_metadata_ready, error); } -static void recv_trailing_metadata_on_complete(grpc_exec_ctx* exec_ctx, - void* user_data, +static void recv_trailing_metadata_on_complete(void* user_data, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; if (error == GRPC_ERROR_NONE) { - error = client_filter_incoming_metadata(exec_ctx, elem, - calld->recv_trailing_metadata); + error = + client_filter_incoming_metadata(elem, calld->recv_trailing_metadata); } else { GRPC_ERROR_REF(error); } - GRPC_CLOSURE_RUN(exec_ctx, calld->original_recv_trailing_metadata_on_complete, - error); + GRPC_CLOSURE_RUN(calld->original_recv_trailing_metadata_on_complete, error); } -static void send_message_on_complete(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void send_message_on_complete(void* arg, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; - grpc_byte_stream_cache_destroy(exec_ctx, &calld->send_message_cache); - GRPC_CLOSURE_RUN(exec_ctx, calld->original_send_message_on_complete, + grpc_byte_stream_cache_destroy(&calld->send_message_cache); + GRPC_CLOSURE_RUN(calld->original_send_message_on_complete, GRPC_ERROR_REF(error)); } // Pulls a slice from the send_message byte stream, updating // calld->send_message_bytes_read. -static grpc_error* pull_slice_from_send_message(grpc_exec_ctx* exec_ctx, - call_data* calld) { +static grpc_error* pull_slice_from_send_message(call_data* calld) { grpc_slice incoming_slice; grpc_error* error = grpc_byte_stream_pull( - exec_ctx, &calld->send_message_caching_stream.base, &incoming_slice); + &calld->send_message_caching_stream.base, &incoming_slice); if (error == GRPC_ERROR_NONE) { calld->send_message_bytes_read += GRPC_SLICE_LENGTH(incoming_slice); - grpc_slice_unref_internal(exec_ctx, incoming_slice); + grpc_slice_unref_internal(incoming_slice); } return error; } @@ -194,12 +185,10 @@ static grpc_error* pull_slice_from_send_message(grpc_exec_ctx* exec_ctx, // calld->send_message_caching_stream.base.length, then we have completed // reading from the byte stream; otherwise, an async read has been dispatched // and on_send_message_next_done() will be invoked when it is complete. -static grpc_error* read_all_available_send_message_data(grpc_exec_ctx* exec_ctx, - call_data* calld) { - while (grpc_byte_stream_next(exec_ctx, - &calld->send_message_caching_stream.base, +static grpc_error* read_all_available_send_message_data(call_data* calld) { + while (grpc_byte_stream_next(&calld->send_message_caching_stream.base, ~(size_t)0, &calld->on_send_message_next_done)) { - grpc_error* error = pull_slice_from_send_message(exec_ctx, calld); + grpc_error* error = pull_slice_from_send_message(calld); if (error != GRPC_ERROR_NONE) return error; if (calld->send_message_bytes_read == calld->send_message_caching_stream.base.length) { @@ -210,19 +199,18 @@ static grpc_error* read_all_available_send_message_data(grpc_exec_ctx* exec_ctx, } // Async callback for grpc_byte_stream_next(). -static void on_send_message_next_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_send_message_next_done(void* arg, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; if (error != GRPC_ERROR_NONE) { grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, calld->send_message_batch, error, calld->call_combiner); + calld->send_message_batch, error, calld->call_combiner); return; } - error = pull_slice_from_send_message(exec_ctx, calld); + error = pull_slice_from_send_message(calld); if (error != GRPC_ERROR_NONE) { grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, calld->send_message_batch, error, calld->call_combiner); + calld->send_message_batch, error, calld->call_combiner); return; } // There may or may not be more to read, but we don't care. If we got @@ -230,7 +218,7 @@ static void on_send_message_next_done(grpc_exec_ctx* exec_ctx, void* arg, // synchronously, so we were not able to do a cached call. Instead, // we just reset the byte stream and then send down the batch as-is. grpc_caching_byte_stream_reset(&calld->send_message_caching_stream); - grpc_call_next_op(exec_ctx, elem, calld->send_message_batch); + grpc_call_next_op(elem, calld->send_message_batch); } static char* slice_buffer_to_string(grpc_slice_buffer* slice_buffer) { @@ -248,8 +236,7 @@ static char* slice_buffer_to_string(grpc_slice_buffer* slice_buffer) { // Modifies the path entry in the batch's send_initial_metadata to // append the base64-encoded query for a GET request. -static grpc_error* update_path_for_get(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* update_path_for_get(grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { call_data* calld = (call_data*)elem->call_data; grpc_slice path_slice = @@ -282,24 +269,22 @@ static grpc_error* update_path_for_get(grpc_exec_ctx* exec_ctx, grpc_slice_sub_no_ref(path_with_query_slice, 0, strlen(t)); /* substitute previous path with the new path+query */ grpc_mdelem mdelem_path_and_query = - grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_PATH, path_with_query_slice); + grpc_mdelem_from_slices(GRPC_MDSTR_PATH, path_with_query_slice); grpc_metadata_batch* b = batch->payload->send_initial_metadata.send_initial_metadata; - return grpc_metadata_batch_substitute(exec_ctx, b, b->idx.named.path, + return grpc_metadata_batch_substitute(b, b->idx.named.path, mdelem_path_and_query); } -static void remove_if_present(grpc_exec_ctx* exec_ctx, - grpc_metadata_batch* batch, +static void remove_if_present(grpc_metadata_batch* batch, grpc_metadata_batch_callouts_index idx) { if (batch->idx.array[idx] != nullptr) { - grpc_metadata_batch_remove(exec_ctx, batch, batch->idx.array[idx]); + grpc_metadata_batch_remove(batch, batch->idx.array[idx]); } } static void hc_start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* batch) { + grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { call_data* calld = (call_data*)elem->call_data; channel_data* channeld = (channel_data*)elem->channel_data; GPR_TIMER_BEGIN("hc_start_transport_stream_op_batch", 0); @@ -345,17 +330,16 @@ static void hc_start_transport_stream_op_batch( calld->original_send_message_on_complete = batch->on_complete; batch->on_complete = &calld->send_message_on_complete; calld->send_message_batch = batch; - error = read_all_available_send_message_data(exec_ctx, calld); + error = read_all_available_send_message_data(calld); if (error != GRPC_ERROR_NONE) goto done; // If all the data has been read, then we can use GET. if (calld->send_message_bytes_read == calld->send_message_caching_stream.base.length) { method = GRPC_MDELEM_METHOD_GET; - error = update_path_for_get(exec_ctx, elem, batch); + error = update_path_for_get(elem, batch); if (error != GRPC_ERROR_NONE) goto done; batch->send_message = false; - grpc_byte_stream_destroy(exec_ctx, - &calld->send_message_caching_stream.base); + grpc_byte_stream_destroy(&calld->send_message_caching_stream.base); } else { // Not all data is available. The batch will be sent down // asynchronously in on_send_message_next_done(). @@ -372,41 +356,41 @@ static void hc_start_transport_stream_op_batch( } remove_if_present( - exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, + batch->payload->send_initial_metadata.send_initial_metadata, GRPC_BATCH_METHOD); remove_if_present( - exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, + batch->payload->send_initial_metadata.send_initial_metadata, GRPC_BATCH_SCHEME); remove_if_present( - exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, + batch->payload->send_initial_metadata.send_initial_metadata, GRPC_BATCH_TE); remove_if_present( - exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, + batch->payload->send_initial_metadata.send_initial_metadata, GRPC_BATCH_CONTENT_TYPE); remove_if_present( - exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, + batch->payload->send_initial_metadata.send_initial_metadata, GRPC_BATCH_USER_AGENT); /* Send : prefixed headers, which have to be before any application layer headers. */ error = grpc_metadata_batch_add_head( - exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, + batch->payload->send_initial_metadata.send_initial_metadata, &calld->method, method); if (error != GRPC_ERROR_NONE) goto done; error = grpc_metadata_batch_add_head( - exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, + batch->payload->send_initial_metadata.send_initial_metadata, &calld->scheme, channeld->static_scheme); if (error != GRPC_ERROR_NONE) goto done; error = grpc_metadata_batch_add_tail( - exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, + batch->payload->send_initial_metadata.send_initial_metadata, &calld->te_trailers, GRPC_MDELEM_TE_TRAILERS); if (error != GRPC_ERROR_NONE) goto done; error = grpc_metadata_batch_add_tail( - exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, + batch->payload->send_initial_metadata.send_initial_metadata, &calld->content_type, GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC); if (error != GRPC_ERROR_NONE) goto done; error = grpc_metadata_batch_add_tail( - exec_ctx, batch->payload->send_initial_metadata.send_initial_metadata, + batch->payload->send_initial_metadata.send_initial_metadata, &calld->user_agent, GRPC_MDELEM_REF(channeld->user_agent)); if (error != GRPC_ERROR_NONE) goto done; } @@ -414,16 +398,15 @@ static void hc_start_transport_stream_op_batch( done: if (error != GRPC_ERROR_NONE) { grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, calld->send_message_batch, error, calld->call_combiner); + calld->send_message_batch, error, calld->call_combiner); } else if (!batch_will_be_handled_asynchronously) { - grpc_call_next_op(exec_ctx, elem, batch); + grpc_call_next_op(elem, batch); } GPR_TIMER_END("hc_start_transport_stream_op_batch", 0); } /* Constructor for call_data */ -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; calld->call_combiner = args->call_combiner; @@ -441,7 +424,7 @@ static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, } /* Destructor for call_data */ -static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) {} @@ -533,8 +516,7 @@ static grpc_slice user_agent_from_args(const grpc_channel_args* args, } /* Constructor for channel_data */ -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { channel_data* chand = (channel_data*)elem->channel_data; GPR_ASSERT(!args->is_last); @@ -543,17 +525,16 @@ static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, chand->max_payload_size_for_get = max_payload_size_from_args(args->channel_args); chand->user_agent = grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_USER_AGENT, + GRPC_MDSTR_USER_AGENT, user_agent_from_args(args->channel_args, args->optional_transport->vtable->name)); return GRPC_ERROR_NONE; } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) { +static void destroy_channel_elem(grpc_channel_element* elem) { channel_data* chand = (channel_data*)elem->channel_data; - GRPC_MDELEM_UNREF(exec_ctx, chand->user_agent); + GRPC_MDELEM_UNREF(chand->user_agent); } const grpc_channel_filter grpc_http_client_filter = { diff --git a/src/core/ext/filters/http/http_filters_plugin.cc b/src/core/ext/filters/http/http_filters_plugin.cc index 483eb021e8d..deec77c96f3 100644 --- a/src/core/ext/filters/http/http_filters_plugin.cc +++ b/src/core/ext/filters/http/http_filters_plugin.cc @@ -40,8 +40,7 @@ static bool is_building_http_like_transport( return t != nullptr && strstr(t->vtable->name, "http"); } -static bool maybe_add_optional_filter(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, +static bool maybe_add_optional_filter(grpc_channel_stack_builder* builder, void* arg) { if (!is_building_http_like_transport(builder)) return true; optional_filter* filtarg = (optional_filter*)arg; @@ -55,8 +54,7 @@ static bool maybe_add_optional_filter(grpc_exec_ctx* exec_ctx, : true; } -static bool maybe_add_required_filter(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, +static bool maybe_add_required_filter(grpc_channel_stack_builder* builder, void* arg) { return is_building_http_like_transport(builder) ? grpc_channel_stack_builder_prepend_filter( diff --git a/src/core/ext/filters/http/message_compress/message_compress_filter.cc b/src/core/ext/filters/http/message_compress/message_compress_filter.cc index d070b56b6a5..9ae13d2ed27 100644 --- a/src/core/ext/filters/http/message_compress/message_compress_filter.cc +++ b/src/core/ext/filters/http/message_compress/message_compress_filter.cc @@ -100,12 +100,11 @@ static bool skip_compression(grpc_call_element* elem, uint32_t flags, /** Filter initial metadata */ static grpc_error* process_send_initial_metadata( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_metadata_batch* initial_metadata, + grpc_call_element* elem, grpc_metadata_batch* initial_metadata, bool* has_compression_algorithm) GRPC_MUST_USE_RESULT; static grpc_error* process_send_initial_metadata( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_metadata_batch* initial_metadata, bool* has_compression_algorithm) { + grpc_call_element* elem, grpc_metadata_batch* initial_metadata, + bool* has_compression_algorithm) { call_data* calld = (call_data*)elem->call_data; channel_data* channeld = (channel_data*)elem->channel_data; *has_compression_algorithm = false; @@ -137,13 +136,13 @@ static grpc_error* process_send_initial_metadata( } *has_compression_algorithm = true; grpc_metadata_batch_remove( - exec_ctx, initial_metadata, + initial_metadata, initial_metadata->idx.named.grpc_internal_stream_encoding_request); /* Disable message-wise compression */ calld->compression_algorithm = GRPC_COMPRESS_NONE; if (initial_metadata->idx.named.grpc_internal_encoding_request != nullptr) { grpc_metadata_batch_remove( - exec_ctx, initial_metadata, + initial_metadata, initial_metadata->idx.named.grpc_internal_encoding_request); } } else if (initial_metadata->idx.named.grpc_internal_encoding_request != @@ -160,7 +159,7 @@ static grpc_error* process_send_initial_metadata( } *has_compression_algorithm = true; grpc_metadata_batch_remove( - exec_ctx, initial_metadata, + initial_metadata, initial_metadata->idx.named.grpc_internal_encoding_request); } else { /* If no algorithm was found in the metadata and we aren't @@ -181,12 +180,11 @@ static grpc_error* process_send_initial_metadata( /* hint compression algorithm */ if (stream_compression_algorithm != GRPC_STREAM_COMPRESS_NONE) { error = grpc_metadata_batch_add_tail( - exec_ctx, initial_metadata, - &calld->stream_compression_algorithm_storage, + initial_metadata, &calld->stream_compression_algorithm_storage, grpc_stream_compression_encoding_mdelem(stream_compression_algorithm)); } else if (calld->compression_algorithm != GRPC_COMPRESS_NONE) { error = grpc_metadata_batch_add_tail( - exec_ctx, initial_metadata, &calld->compression_algorithm_storage, + initial_metadata, &calld->compression_algorithm_storage, grpc_compression_encoding_mdelem(calld->compression_algorithm)); } @@ -194,7 +192,7 @@ static grpc_error* process_send_initial_metadata( /* convey supported compression algorithms */ error = grpc_metadata_batch_add_tail( - exec_ctx, initial_metadata, &calld->accept_encoding_storage, + initial_metadata, &calld->accept_encoding_storage, GRPC_MDELEM_ACCEPT_ENCODING_FOR_ALGORITHMS( channeld->supported_compression_algorithms)); @@ -203,7 +201,7 @@ static grpc_error* process_send_initial_metadata( /* Do not overwrite accept-encoding header if it already presents. */ if (!initial_metadata->idx.named.accept_encoding) { error = grpc_metadata_batch_add_tail( - exec_ctx, initial_metadata, &calld->accept_stream_encoding_storage, + initial_metadata, &calld->accept_stream_encoding_storage, GRPC_MDELEM_ACCEPT_STREAM_ENCODING_FOR_ALGORITHMS( channeld->supported_stream_compression_algorithms)); } @@ -211,17 +209,15 @@ static grpc_error* process_send_initial_metadata( return error; } -static void send_message_on_complete(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void send_message_on_complete(void* arg, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &calld->slices); - GRPC_CLOSURE_RUN(exec_ctx, calld->original_send_message_on_complete, + grpc_slice_buffer_reset_and_unref_internal(&calld->slices); + GRPC_CLOSURE_RUN(calld->original_send_message_on_complete, GRPC_ERROR_REF(error)); } -static void send_message_batch_continue(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem) { +static void send_message_batch_continue(grpc_call_element* elem) { call_data* calld = (call_data*)elem->call_data; // Note: The call to grpc_call_next_op() results in yielding the // call combiner, so we need to clear calld->send_message_batch @@ -229,19 +225,18 @@ static void send_message_batch_continue(grpc_exec_ctx* exec_ctx, grpc_transport_stream_op_batch* send_message_batch = calld->send_message_batch; calld->send_message_batch = nullptr; - grpc_call_next_op(exec_ctx, elem, send_message_batch); + grpc_call_next_op(elem, send_message_batch); } -static void finish_send_message(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem) { +static void finish_send_message(grpc_call_element* elem) { call_data* calld = (call_data*)elem->call_data; // Compress the data if appropriate. grpc_slice_buffer tmp; grpc_slice_buffer_init(&tmp); uint32_t send_flags = calld->send_message_batch->payload->send_message.send_message->flags; - bool did_compress = grpc_msg_compress(exec_ctx, calld->compression_algorithm, - &calld->slices, &tmp); + bool did_compress = + grpc_msg_compress(calld->compression_algorithm, &calld->slices, &tmp); if (did_compress) { if (grpc_compression_trace.enabled()) { const char* algo_name; @@ -268,11 +263,11 @@ static void finish_send_message(grpc_exec_ctx* exec_ctx, algo_name, calld->slices.length); } } - grpc_slice_buffer_destroy_internal(exec_ctx, &tmp); + grpc_slice_buffer_destroy_internal(&tmp); // Swap out the original byte stream with our new one and send the // batch down. grpc_byte_stream_destroy( - exec_ctx, calld->send_message_batch->payload->send_message.send_message); + calld->send_message_batch->payload->send_message.send_message); grpc_slice_buffer_stream_init(&calld->replacement_stream, &calld->slices, send_flags); calld->send_message_batch->payload->send_message.send_message = @@ -280,27 +275,24 @@ static void finish_send_message(grpc_exec_ctx* exec_ctx, calld->original_send_message_on_complete = calld->send_message_batch->on_complete; calld->send_message_batch->on_complete = &calld->send_message_on_complete; - send_message_batch_continue(exec_ctx, elem); + send_message_batch_continue(elem); } -static void fail_send_message_batch_in_call_combiner(grpc_exec_ctx* exec_ctx, - void* arg, +static void fail_send_message_batch_in_call_combiner(void* arg, grpc_error* error) { call_data* calld = (call_data*)arg; if (calld->send_message_batch != nullptr) { grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, calld->send_message_batch, GRPC_ERROR_REF(error), - calld->call_combiner); + calld->send_message_batch, GRPC_ERROR_REF(error), calld->call_combiner); calld->send_message_batch = nullptr; } } // Pulls a slice from the send_message byte stream and adds it to calld->slices. -static grpc_error* pull_slice_from_send_message(grpc_exec_ctx* exec_ctx, - call_data* calld) { +static grpc_error* pull_slice_from_send_message(call_data* calld) { grpc_slice incoming_slice; grpc_error* error = grpc_byte_stream_pull( - exec_ctx, calld->send_message_batch->payload->send_message.send_message, + calld->send_message_batch->payload->send_message.send_message, &incoming_slice); if (error == GRPC_ERROR_NONE) { grpc_slice_buffer_add(&calld->slices, incoming_slice); @@ -312,69 +304,65 @@ static grpc_error* pull_slice_from_send_message(grpc_exec_ctx* exec_ctx, // If all data has been read, invokes finish_send_message(). Otherwise, // an async call to grpc_byte_stream_next() has been started, which will // eventually result in calling on_send_message_next_done(). -static void continue_reading_send_message(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem) { +static void continue_reading_send_message(grpc_call_element* elem) { call_data* calld = (call_data*)elem->call_data; while (grpc_byte_stream_next( - exec_ctx, calld->send_message_batch->payload->send_message.send_message, - ~(size_t)0, &calld->on_send_message_next_done)) { - grpc_error* error = pull_slice_from_send_message(exec_ctx, calld); + calld->send_message_batch->payload->send_message.send_message, ~(size_t)0, + &calld->on_send_message_next_done)) { + grpc_error* error = pull_slice_from_send_message(calld); if (error != GRPC_ERROR_NONE) { // Closure callback; does not take ownership of error. - fail_send_message_batch_in_call_combiner(exec_ctx, calld, error); + fail_send_message_batch_in_call_combiner(calld, error); GRPC_ERROR_UNREF(error); return; } if (calld->slices.length == calld->send_message_batch->payload->send_message.send_message->length) { - finish_send_message(exec_ctx, elem); + finish_send_message(elem); break; } } } // Async callback for grpc_byte_stream_next(). -static void on_send_message_next_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_send_message_next_done(void* arg, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; if (error != GRPC_ERROR_NONE) { // Closure callback; does not take ownership of error. - fail_send_message_batch_in_call_combiner(exec_ctx, calld, error); + fail_send_message_batch_in_call_combiner(calld, error); return; } - error = pull_slice_from_send_message(exec_ctx, calld); + error = pull_slice_from_send_message(calld); if (error != GRPC_ERROR_NONE) { // Closure callback; does not take ownership of error. - fail_send_message_batch_in_call_combiner(exec_ctx, calld, error); + fail_send_message_batch_in_call_combiner(calld, error); GRPC_ERROR_UNREF(error); return; } if (calld->slices.length == calld->send_message_batch->payload->send_message.send_message->length) { - finish_send_message(exec_ctx, elem); + finish_send_message(elem); } else { - continue_reading_send_message(exec_ctx, elem); + continue_reading_send_message(elem); } } -static void start_send_message_batch(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* unused) { +static void start_send_message_batch(void* arg, grpc_error* unused) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; if (skip_compression( elem, calld->send_message_batch->payload->send_message.send_message->flags, calld->send_initial_metadata_state == HAS_COMPRESSION_ALGORITHM)) { - send_message_batch_continue(exec_ctx, elem); + send_message_batch_continue(elem); } else { - continue_reading_send_message(exec_ctx, elem); + continue_reading_send_message(elem); } } static void compress_start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* batch) { + grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { call_data* calld = (call_data*)elem->call_data; GPR_TIMER_BEGIN("compress_start_transport_stream_op_batch", 0); // Handle cancel_stream. @@ -385,21 +373,19 @@ static void compress_start_transport_stream_op_batch( if (calld->send_message_batch != nullptr) { if (calld->send_initial_metadata_state == INITIAL_METADATA_UNSEEN) { GRPC_CALL_COMBINER_START( - exec_ctx, calld->call_combiner, + calld->call_combiner, GRPC_CLOSURE_CREATE(fail_send_message_batch_in_call_combiner, calld, grpc_schedule_on_exec_ctx), GRPC_ERROR_REF(calld->cancel_error), "failing send_message op"); } else { grpc_byte_stream_shutdown( - exec_ctx, calld->send_message_batch->payload->send_message.send_message, GRPC_ERROR_REF(calld->cancel_error)); } } } else if (calld->cancel_error != GRPC_ERROR_NONE) { grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, batch, GRPC_ERROR_REF(calld->cancel_error), - calld->call_combiner); + batch, GRPC_ERROR_REF(calld->cancel_error), calld->call_combiner); goto done; } // Handle send_initial_metadata. @@ -407,11 +393,10 @@ static void compress_start_transport_stream_op_batch( GPR_ASSERT(calld->send_initial_metadata_state == INITIAL_METADATA_UNSEEN); bool has_compression_algorithm; grpc_error* error = process_send_initial_metadata( - exec_ctx, elem, - batch->payload->send_initial_metadata.send_initial_metadata, + elem, batch->payload->send_initial_metadata.send_initial_metadata, &has_compression_algorithm); if (error != GRPC_ERROR_NONE) { - grpc_transport_stream_op_batch_finish_with_failure(exec_ctx, batch, error, + grpc_transport_stream_op_batch_finish_with_failure(batch, error, calld->call_combiner); goto done; } @@ -425,7 +410,7 @@ static void compress_start_transport_stream_op_batch( // the call stack) will release the call combiner for each batch it sees. if (calld->send_message_batch != nullptr) { GRPC_CALL_COMBINER_START( - exec_ctx, calld->call_combiner, + calld->call_combiner, &calld->start_send_message_batch_in_call_combiner, GRPC_ERROR_NONE, "starting send_message after send_initial_metadata"); } @@ -440,22 +425,21 @@ static void compress_start_transport_stream_op_batch( // send_initial_metadata. if (calld->send_initial_metadata_state == INITIAL_METADATA_UNSEEN) { GRPC_CALL_COMBINER_STOP( - exec_ctx, calld->call_combiner, + calld->call_combiner, "send_message batch pending send_initial_metadata"); goto done; } - start_send_message_batch(exec_ctx, elem, GRPC_ERROR_NONE); + start_send_message_batch(elem, GRPC_ERROR_NONE); } else { // Pass control down the stack. - grpc_call_next_op(exec_ctx, elem, batch); + grpc_call_next_op(elem, batch); } done: GPR_TIMER_END("compress_start_transport_stream_op_batch", 0); } /* Constructor for call_data */ -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; calld->call_combiner = args->call_combiner; @@ -471,17 +455,16 @@ static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, } /* Destructor for call_data */ -static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { call_data* calld = (call_data*)elem->call_data; - grpc_slice_buffer_destroy_internal(exec_ctx, &calld->slices); + grpc_slice_buffer_destroy_internal(&calld->slices); GRPC_ERROR_UNREF(calld->cancel_error); } /* Constructor for channel_data */ -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { channel_data* channeld = (channel_data*)elem->channel_data; @@ -531,8 +514,7 @@ static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_channel_element* elem) {} const grpc_channel_filter grpc_message_compress_filter = { compress_start_transport_stream_op_batch, diff --git a/src/core/ext/filters/http/server/http_server_filter.cc b/src/core/ext/filters/http/server/http_server_filter.cc index 4f3897915c0..b872dc98f59 100644 --- a/src/core/ext/filters/http/server/http_server_filter.cc +++ b/src/core/ext/filters/http/server/http_server_filter.cc @@ -66,8 +66,7 @@ typedef struct channel_data { uint8_t unused; } channel_data; -static grpc_error* server_filter_outgoing_metadata(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* server_filter_outgoing_metadata(grpc_call_element* elem, grpc_metadata_batch* b) { if (b->idx.named.grpc_message != nullptr) { grpc_slice pct_encoded_msg = grpc_percent_encode_slice( @@ -75,10 +74,9 @@ static grpc_error* server_filter_outgoing_metadata(grpc_exec_ctx* exec_ctx, grpc_compatible_percent_encoding_unreserved_bytes); if (grpc_slice_is_equivalent(pct_encoded_msg, GRPC_MDVALUE(b->idx.named.grpc_message->md))) { - grpc_slice_unref_internal(exec_ctx, pct_encoded_msg); + grpc_slice_unref_internal(pct_encoded_msg); } else { - grpc_metadata_batch_set_value(exec_ctx, b->idx.named.grpc_message, - pct_encoded_msg); + grpc_metadata_batch_set_value(b->idx.named.grpc_message, pct_encoded_msg); } } return GRPC_ERROR_NONE; @@ -93,8 +91,7 @@ static void add_error(const char* error_name, grpc_error** cumulative, *cumulative = grpc_error_add_child(*cumulative, new_err); } -static grpc_error* server_filter_incoming_metadata(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* server_filter_incoming_metadata(grpc_call_element* elem, grpc_metadata_batch* b) { call_data* calld = (call_data*)elem->call_data; grpc_error* error = GRPC_ERROR_NONE; @@ -123,7 +120,7 @@ static grpc_error* server_filter_incoming_metadata(grpc_exec_ctx* exec_ctx, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Bad header"), b->idx.named.method->md)); } - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.method); + grpc_metadata_batch_remove(b, b->idx.named.method); } else { add_error( error_name, &error, @@ -139,7 +136,7 @@ static grpc_error* server_filter_incoming_metadata(grpc_exec_ctx* exec_ctx, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Bad header"), b->idx.named.te->md)); } - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.te); + grpc_metadata_batch_remove(b, b->idx.named.te); } else { add_error(error_name, &error, grpc_error_set_str( @@ -156,7 +153,7 @@ static grpc_error* server_filter_incoming_metadata(grpc_exec_ctx* exec_ctx, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Bad header"), b->idx.named.scheme->md)); } - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.scheme); + grpc_metadata_batch_remove(b, b->idx.named.scheme); } else { add_error( error_name, &error, @@ -191,7 +188,7 @@ static grpc_error* server_filter_incoming_metadata(grpc_exec_ctx* exec_ctx, gpr_free(val); } } - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.content_type); + grpc_metadata_batch_remove(b, b->idx.named.content_type); } if (b->idx.named.path == nullptr) { @@ -218,22 +215,21 @@ static grpc_error* server_filter_incoming_metadata(grpc_exec_ctx* exec_ctx, /* substitute path metadata with just the path (not query) */ grpc_mdelem mdelem_path_without_query = grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_PATH, grpc_slice_sub(path_slice, 0, offset)); + GRPC_MDSTR_PATH, grpc_slice_sub(path_slice, 0, offset)); - grpc_metadata_batch_substitute(exec_ctx, b, b->idx.named.path, + grpc_metadata_batch_substitute(b, b->idx.named.path, mdelem_path_without_query); /* decode payload from query and add to the slice buffer to be returned */ const int k_url_safe = 1; - grpc_slice_buffer_add( - &calld->read_slice_buffer, - grpc_base64_decode_with_len( - exec_ctx, (const char*)GRPC_SLICE_START_PTR(query_slice), - GRPC_SLICE_LENGTH(query_slice), k_url_safe)); + grpc_slice_buffer_add(&calld->read_slice_buffer, + grpc_base64_decode_with_len( + (const char*)GRPC_SLICE_START_PTR(query_slice), + GRPC_SLICE_LENGTH(query_slice), k_url_safe)); grpc_slice_buffer_stream_init(&calld->read_stream, &calld->read_slice_buffer, 0); calld->seen_path_with_query = true; - grpc_slice_unref_internal(exec_ctx, query_slice); + grpc_slice_unref_internal(query_slice); } else { gpr_log(GPR_ERROR, "GET request without QUERY"); } @@ -242,14 +238,14 @@ static grpc_error* server_filter_incoming_metadata(grpc_exec_ctx* exec_ctx, if (b->idx.named.host != nullptr && b->idx.named.authority == nullptr) { grpc_linked_mdelem* el = b->idx.named.host; grpc_mdelem md = GRPC_MDELEM_REF(el->md); - grpc_metadata_batch_remove(exec_ctx, b, el); + grpc_metadata_batch_remove(b, el); add_error(error_name, &error, grpc_metadata_batch_add_head( - exec_ctx, b, el, + b, el, grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_AUTHORITY, + GRPC_MDSTR_AUTHORITY, grpc_slice_ref_internal(GRPC_MDVALUE(md))))); - GRPC_MDELEM_UNREF(exec_ctx, md); + GRPC_MDELEM_UNREF(md); } if (b->idx.named.authority == nullptr) { @@ -263,21 +259,18 @@ static grpc_error* server_filter_incoming_metadata(grpc_exec_ctx* exec_ctx, return error; } -static void hs_on_recv(grpc_exec_ctx* exec_ctx, void* user_data, - grpc_error* err) { +static void hs_on_recv(void* user_data, grpc_error* err) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; if (err == GRPC_ERROR_NONE) { - err = server_filter_incoming_metadata(exec_ctx, elem, - calld->recv_initial_metadata); + err = server_filter_incoming_metadata(elem, calld->recv_initial_metadata); } else { GRPC_ERROR_REF(err); } - GRPC_CLOSURE_RUN(exec_ctx, calld->on_done_recv, err); + GRPC_CLOSURE_RUN(calld->on_done_recv, err); } -static void hs_on_complete(grpc_exec_ctx* exec_ctx, void* user_data, - grpc_error* err) { +static void hs_on_complete(void* user_data, grpc_error* err) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; /* Call recv_message_ready if we got the payload via the path field */ @@ -287,17 +280,16 @@ static void hs_on_complete(grpc_exec_ctx* exec_ctx, void* user_data, : (grpc_byte_stream*)&calld->read_stream; // Re-enter call combiner for recv_message_ready, since the surface // code will release the call combiner for each callback it receives. - GRPC_CALL_COMBINER_START(exec_ctx, calld->call_combiner, - calld->recv_message_ready, GRPC_ERROR_REF(err), + GRPC_CALL_COMBINER_START(calld->call_combiner, calld->recv_message_ready, + GRPC_ERROR_REF(err), "resuming recv_message_ready from on_complete"); calld->recv_message_ready = nullptr; calld->payload_bin_delivered = true; } - GRPC_CLOSURE_RUN(exec_ctx, calld->on_complete, GRPC_ERROR_REF(err)); + GRPC_CLOSURE_RUN(calld->on_complete, GRPC_ERROR_REF(err)); } -static void hs_recv_message_ready(grpc_exec_ctx* exec_ctx, void* user_data, - grpc_error* err) { +static void hs_recv_message_ready(void* user_data, grpc_error* err) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; if (calld->seen_path_with_query) { @@ -305,15 +297,14 @@ static void hs_recv_message_ready(grpc_exec_ctx* exec_ctx, void* user_data, // returned in hs_on_complete callback. // Note that we release the call combiner here, so that other // callbacks can run. - GRPC_CALL_COMBINER_STOP(exec_ctx, calld->call_combiner, + GRPC_CALL_COMBINER_STOP(calld->call_combiner, "pausing recv_message_ready until on_complete"); } else { - GRPC_CLOSURE_RUN(exec_ctx, calld->recv_message_ready, GRPC_ERROR_REF(err)); + GRPC_CLOSURE_RUN(calld->recv_message_ready, GRPC_ERROR_REF(err)); } } -static grpc_error* hs_mutate_op(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* hs_mutate_op(grpc_call_element* elem, grpc_transport_stream_op_batch* op) { /* grab pointers to our data from the call element */ call_data* calld = (call_data*)elem->call_data; @@ -321,21 +312,19 @@ static grpc_error* hs_mutate_op(grpc_exec_ctx* exec_ctx, if (op->send_initial_metadata) { grpc_error* error = GRPC_ERROR_NONE; static const char* error_name = "Failed sending initial metadata"; + add_error(error_name, &error, + grpc_metadata_batch_add_head( + op->payload->send_initial_metadata.send_initial_metadata, + &calld->status, GRPC_MDELEM_STATUS_200)); + add_error(error_name, &error, + grpc_metadata_batch_add_tail( + op->payload->send_initial_metadata.send_initial_metadata, + &calld->content_type, + GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC)); add_error( error_name, &error, - grpc_metadata_batch_add_head( - exec_ctx, op->payload->send_initial_metadata.send_initial_metadata, - &calld->status, GRPC_MDELEM_STATUS_200)); - add_error( - error_name, &error, - grpc_metadata_batch_add_tail( - exec_ctx, op->payload->send_initial_metadata.send_initial_metadata, - &calld->content_type, - GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC)); - add_error(error_name, &error, - server_filter_outgoing_metadata( - exec_ctx, elem, - op->payload->send_initial_metadata.send_initial_metadata)); + server_filter_outgoing_metadata( + elem, op->payload->send_initial_metadata.send_initial_metadata)); if (error != GRPC_ERROR_NONE) return error; } @@ -367,8 +356,7 @@ static grpc_error* hs_mutate_op(grpc_exec_ctx* exec_ctx, if (op->send_trailing_metadata) { grpc_error* error = server_filter_outgoing_metadata( - exec_ctx, elem, - op->payload->send_trailing_metadata.send_trailing_metadata); + elem, op->payload->send_trailing_metadata.send_trailing_metadata); if (error != GRPC_ERROR_NONE) return error; } @@ -376,23 +364,21 @@ static grpc_error* hs_mutate_op(grpc_exec_ctx* exec_ctx, } static void hs_start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* op) { + grpc_call_element* elem, grpc_transport_stream_op_batch* op) { call_data* calld = (call_data*)elem->call_data; GPR_TIMER_BEGIN("hs_start_transport_stream_op_batch", 0); - grpc_error* error = hs_mutate_op(exec_ctx, elem, op); + grpc_error* error = hs_mutate_op(elem, op); if (error != GRPC_ERROR_NONE) { - grpc_transport_stream_op_batch_finish_with_failure(exec_ctx, op, error, + grpc_transport_stream_op_batch_finish_with_failure(op, error, calld->call_combiner); } else { - grpc_call_next_op(exec_ctx, elem, op); + grpc_call_next_op(elem, op); } GPR_TIMER_END("hs_start_transport_stream_op_batch", 0); } /* Constructor for call_data */ -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { /* grab pointers to our data from the call element */ call_data* calld = (call_data*)elem->call_data; @@ -409,24 +395,22 @@ static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, } /* Destructor for call_data */ -static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { call_data* calld = (call_data*)elem->call_data; - grpc_slice_buffer_destroy_internal(exec_ctx, &calld->read_slice_buffer); + grpc_slice_buffer_destroy_internal(&calld->read_slice_buffer); } /* Constructor for channel_data */ -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { GPR_ASSERT(!args->is_last); return GRPC_ERROR_NONE; } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_channel_element* elem) {} const grpc_channel_filter grpc_http_server_filter = { hs_start_transport_stream_op_batch, diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc index 762198f0347..f50a928fcd9 100644 --- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc +++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc @@ -54,8 +54,7 @@ typedef struct channel_data { intptr_t id; /**< an id unique to the channel */ } channel_data; -static void on_initial_md_ready(grpc_exec_ctx* exec_ctx, void* user_data, - grpc_error* err) { +static void on_initial_md_ready(void* user_data, grpc_error* err) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; @@ -73,20 +72,19 @@ static void on_initial_md_ready(grpc_exec_ctx* exec_ctx, void* user_data, GRPC_MDVALUE(calld->recv_initial_metadata->idx.named.lb_token->md)); calld->have_initial_md_string = true; grpc_metadata_batch_remove( - exec_ctx, calld->recv_initial_metadata, + calld->recv_initial_metadata, calld->recv_initial_metadata->idx.named.lb_token); } } else { GRPC_ERROR_REF(err); } calld->ops_recv_initial_metadata_ready->cb( - exec_ctx, calld->ops_recv_initial_metadata_ready->cb_arg, err); + calld->ops_recv_initial_metadata_ready->cb_arg, err); GRPC_ERROR_UNREF(err); } /* Constructor for call_data */ -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; calld->id = (intptr_t)args->call_stack; @@ -108,7 +106,7 @@ static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, } /* Destructor for call_data */ -static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { call_data* calld = (call_data*)elem->call_data; @@ -125,19 +123,18 @@ static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, */ if (calld->have_initial_md_string) { - grpc_slice_unref_internal(exec_ctx, calld->initial_md_string); + grpc_slice_unref_internal(calld->initial_md_string); } if (calld->have_trailing_md_string) { - grpc_slice_unref_internal(exec_ctx, calld->trailing_md_string); + grpc_slice_unref_internal(calld->trailing_md_string); } if (calld->have_service_method) { - grpc_slice_unref_internal(exec_ctx, calld->service_method); + grpc_slice_unref_internal(calld->service_method); } } /* Constructor for channel_data */ -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { GPR_ASSERT(!args->is_last); @@ -158,8 +155,7 @@ static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) { +static void destroy_channel_elem(grpc_channel_element* elem) { /* TODO(dgq): do something with the data channel_data *chand = elem->channel_data; grpc_load_reporting_call_data lr_call_data = { @@ -173,8 +169,7 @@ static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, */ } -static grpc_filtered_mdelem lr_trailing_md_filter(grpc_exec_ctx* exec_ctx, - void* user_data, +static grpc_filtered_mdelem lr_trailing_md_filter(void* user_data, grpc_mdelem md) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; @@ -186,8 +181,7 @@ static grpc_filtered_mdelem lr_trailing_md_filter(grpc_exec_ctx* exec_ctx, } static void lr_start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* op) { + grpc_call_element* elem, grpc_transport_stream_op_batch* op) { GPR_TIMER_BEGIN("lr_start_transport_stream_op_batch", 0); call_data* calld = (call_data*)elem->call_data; @@ -203,12 +197,11 @@ static void lr_start_transport_stream_op_batch( GRPC_LOG_IF_ERROR( "grpc_metadata_batch_filter", grpc_metadata_batch_filter( - exec_ctx, op->payload->send_trailing_metadata.send_trailing_metadata, lr_trailing_md_filter, elem, "LR trailing metadata filtering error")); } - grpc_call_next_op(exec_ctx, elem, op); + grpc_call_next_op(elem, op); GPR_TIMER_END("lr_start_transport_stream_op_batch", 0); } diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc b/src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc index accb7797dd5..9d1dfcbb4cd 100644 --- a/src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc +++ b/src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc @@ -38,7 +38,7 @@ static bool is_load_reporting_enabled(const grpc_channel_args* a) { } static bool maybe_add_server_load_reporting_filter( - grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, void* arg) { + grpc_channel_stack_builder* builder, void* arg) { const grpc_channel_args* args = grpc_channel_stack_builder_get_channel_arguments(builder); const grpc_channel_filter* filter = (const grpc_channel_filter*)arg; diff --git a/src/core/ext/filters/max_age/max_age_filter.cc b/src/core/ext/filters/max_age/max_age_filter.cc index 917fbd9198f..0499c6ecfc7 100644 --- a/src/core/ext/filters/max_age/max_age_filter.cc +++ b/src/core/ext/filters/max_age/max_age_filter.cc @@ -88,73 +88,69 @@ typedef struct channel_data { /* Increase the nubmer of active calls. Before the increasement, if there are no calls, the max_idle_timer should be cancelled. */ -static void increase_call_count(grpc_exec_ctx* exec_ctx, channel_data* chand) { +static void increase_call_count(channel_data* chand) { if (gpr_atm_full_fetch_add(&chand->call_count, 1) == 0) { - grpc_timer_cancel(exec_ctx, &chand->max_idle_timer); + grpc_timer_cancel(&chand->max_idle_timer); } } /* Decrease the nubmer of active calls. After the decrement, if there are no calls, the max_idle_timer should be started. */ -static void decrease_call_count(grpc_exec_ctx* exec_ctx, channel_data* chand) { +static void decrease_call_count(channel_data* chand) { if (gpr_atm_full_fetch_add(&chand->call_count, -1) == 1) { GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age max_idle_timer"); - grpc_timer_init(exec_ctx, &chand->max_idle_timer, - grpc_exec_ctx_now(exec_ctx) + chand->max_connection_idle, - &chand->close_max_idle_channel); + grpc_timer_init( + &chand->max_idle_timer, + grpc_core::ExecCtx::Get()->Now() + chand->max_connection_idle, + &chand->close_max_idle_channel); } } -static void start_max_idle_timer_after_init(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void start_max_idle_timer_after_init(void* arg, grpc_error* error) { channel_data* chand = (channel_data*)arg; /* Decrease call_count. If there are no active calls at this time, max_idle_timer will start here. If the number of active calls is not 0, max_idle_timer will start after all the active calls end. */ - decrease_call_count(exec_ctx, chand); - GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->channel_stack, + decrease_call_count(chand); + GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, "max_age start_max_idle_timer_after_init"); } -static void start_max_age_timer_after_init(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void start_max_age_timer_after_init(void* arg, grpc_error* error) { channel_data* chand = (channel_data*)arg; gpr_mu_lock(&chand->max_age_timer_mu); chand->max_age_timer_pending = true; GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age max_age_timer"); - grpc_timer_init(exec_ctx, &chand->max_age_timer, - grpc_exec_ctx_now(exec_ctx) + chand->max_connection_age, + grpc_timer_init(&chand->max_age_timer, + grpc_core::ExecCtx::Get()->Now() + chand->max_connection_age, &chand->close_max_age_channel); gpr_mu_unlock(&chand->max_age_timer_mu); grpc_transport_op* op = grpc_make_transport_op(nullptr); op->on_connectivity_state_change = &chand->channel_connectivity_changed; op->connectivity_state = &chand->connectivity_state; - grpc_channel_next_op(exec_ctx, - grpc_channel_stack_element(chand->channel_stack, 0), op); - GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->channel_stack, + grpc_channel_next_op(grpc_channel_stack_element(chand->channel_stack, 0), op); + GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, "max_age start_max_age_timer_after_init"); } -static void start_max_age_grace_timer_after_goaway_op(grpc_exec_ctx* exec_ctx, - void* arg, +static void start_max_age_grace_timer_after_goaway_op(void* arg, grpc_error* error) { channel_data* chand = (channel_data*)arg; gpr_mu_lock(&chand->max_age_timer_mu); chand->max_age_grace_timer_pending = true; GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age max_age_grace_timer"); grpc_timer_init( - exec_ctx, &chand->max_age_grace_timer, + &chand->max_age_grace_timer, chand->max_connection_age_grace == GRPC_MILLIS_INF_FUTURE ? GRPC_MILLIS_INF_FUTURE - : grpc_exec_ctx_now(exec_ctx) + chand->max_connection_age_grace, + : grpc_core::ExecCtx::Get()->Now() + chand->max_connection_age_grace, &chand->force_close_max_age_channel); gpr_mu_unlock(&chand->max_age_timer_mu); - GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->channel_stack, + GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, "max_age start_max_age_grace_timer_after_goaway_op"); } -static void close_max_idle_channel(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void close_max_idle_channel(void* arg, grpc_error* error) { channel_data* chand = (channel_data*)arg; if (error == GRPC_ERROR_NONE) { /* Prevent the max idle timer from being set again */ @@ -165,16 +161,14 @@ static void close_max_idle_channel(grpc_exec_ctx* exec_ctx, void* arg, GRPC_ERROR_INT_HTTP2_ERROR, GRPC_HTTP2_NO_ERROR); grpc_channel_element* elem = grpc_channel_stack_element(chand->channel_stack, 0); - elem->filter->start_transport_op(exec_ctx, elem, op); + elem->filter->start_transport_op(elem, op); } else if (error != GRPC_ERROR_CANCELLED) { GRPC_LOG_IF_ERROR("close_max_idle_channel", error); } - GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->channel_stack, - "max_age max_idle_timer"); + GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, "max_age max_idle_timer"); } -static void close_max_age_channel(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void close_max_age_channel(void* arg, grpc_error* error) { channel_data* chand = (channel_data*)arg; gpr_mu_lock(&chand->max_age_timer_mu); chand->max_age_timer_pending = false; @@ -189,16 +183,14 @@ static void close_max_age_channel(grpc_exec_ctx* exec_ctx, void* arg, GRPC_ERROR_INT_HTTP2_ERROR, GRPC_HTTP2_NO_ERROR); grpc_channel_element* elem = grpc_channel_stack_element(chand->channel_stack, 0); - elem->filter->start_transport_op(exec_ctx, elem, op); + elem->filter->start_transport_op(elem, op); } else if (error != GRPC_ERROR_CANCELLED) { GRPC_LOG_IF_ERROR("close_max_age_channel", error); } - GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->channel_stack, - "max_age max_age_timer"); + GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, "max_age max_age_timer"); } -static void force_close_max_age_channel(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void force_close_max_age_channel(void* arg, grpc_error* error) { channel_data* chand = (channel_data*)arg; gpr_mu_lock(&chand->max_age_timer_mu); chand->max_age_grace_timer_pending = false; @@ -209,38 +201,36 @@ static void force_close_max_age_channel(grpc_exec_ctx* exec_ctx, void* arg, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Channel reaches max age"); grpc_channel_element* elem = grpc_channel_stack_element(chand->channel_stack, 0); - elem->filter->start_transport_op(exec_ctx, elem, op); + elem->filter->start_transport_op(elem, op); } else if (error != GRPC_ERROR_CANCELLED) { GRPC_LOG_IF_ERROR("force_close_max_age_channel", error); } - GRPC_CHANNEL_STACK_UNREF(exec_ctx, chand->channel_stack, - "max_age max_age_grace_timer"); + GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, "max_age max_age_grace_timer"); } -static void channel_connectivity_changed(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void channel_connectivity_changed(void* arg, grpc_error* error) { channel_data* chand = (channel_data*)arg; if (chand->connectivity_state != GRPC_CHANNEL_SHUTDOWN) { grpc_transport_op* op = grpc_make_transport_op(nullptr); op->on_connectivity_state_change = &chand->channel_connectivity_changed; op->connectivity_state = &chand->connectivity_state; - grpc_channel_next_op( - exec_ctx, grpc_channel_stack_element(chand->channel_stack, 0), op); + grpc_channel_next_op(grpc_channel_stack_element(chand->channel_stack, 0), + op); } else { gpr_mu_lock(&chand->max_age_timer_mu); if (chand->max_age_timer_pending) { - grpc_timer_cancel(exec_ctx, &chand->max_age_timer); + grpc_timer_cancel(&chand->max_age_timer); chand->max_age_timer_pending = false; } if (chand->max_age_grace_timer_pending) { - grpc_timer_cancel(exec_ctx, &chand->max_age_grace_timer); + grpc_timer_cancel(&chand->max_age_grace_timer); chand->max_age_grace_timer_pending = false; } gpr_mu_unlock(&chand->max_age_timer_mu); /* If there are no active calls, this increasement will cancel max_idle_timer, and prevent max_idle_timer from being started in the future. */ - increase_call_count(exec_ctx, chand); + increase_call_count(chand); } } @@ -263,25 +253,23 @@ add_random_max_connection_age_jitter_and_convert_to_grpc_millis(int value) { } /* Constructor for call_data. */ -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { channel_data* chand = (channel_data*)elem->channel_data; - increase_call_count(exec_ctx, chand); + increase_call_count(chand); return GRPC_ERROR_NONE; } /* Destructor for call_data. */ -static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { channel_data* chand = (channel_data*)elem->channel_data; - decrease_call_count(exec_ctx, chand); + decrease_call_count(chand); } /* Constructor for channel_data. */ -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { channel_data* chand = (channel_data*)elem->channel_data; gpr_mu_init(&chand->max_age_timer_mu); @@ -351,8 +339,7 @@ static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, initialization is done. */ GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age start_max_age_timer_after_init"); - GRPC_CLOSURE_SCHED(exec_ctx, &chand->start_max_age_timer_after_init, - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&chand->start_max_age_timer_after_init, GRPC_ERROR_NONE); } /* Initialize the number of calls as 1, so that the max_idle_timer will not @@ -361,15 +348,14 @@ static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, if (chand->max_connection_idle != GRPC_MILLIS_INF_FUTURE) { GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age start_max_idle_timer_after_init"); - GRPC_CLOSURE_SCHED(exec_ctx, &chand->start_max_idle_timer_after_init, + GRPC_CLOSURE_SCHED(&chand->start_max_idle_timer_after_init, GRPC_ERROR_NONE); } return GRPC_ERROR_NONE; } /* Destructor for channel_data. */ -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_channel_element* elem) {} const grpc_channel_filter grpc_max_age_filter = { grpc_call_next_op, @@ -384,8 +370,7 @@ const grpc_channel_filter grpc_max_age_filter = { grpc_channel_next_get_info, "max_age"}; -static bool maybe_add_max_age_filter(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, +static bool maybe_add_max_age_filter(grpc_channel_stack_builder* builder, void* arg) { const grpc_channel_args* channel_args = grpc_channel_stack_builder_get_channel_arguments(builder); diff --git a/src/core/ext/filters/message_size/message_size_filter.cc b/src/core/ext/filters/message_size/message_size_filter.cc index 3d2252af2e6..f8487f9a9e9 100644 --- a/src/core/ext/filters/message_size/message_size_filter.cc +++ b/src/core/ext/filters/message_size/message_size_filter.cc @@ -47,8 +47,7 @@ static void* refcounted_message_size_limits_ref(void* value) { return value; } -static void refcounted_message_size_limits_unref(grpc_exec_ctx* exec_ctx, - void* value) { +static void refcounted_message_size_limits_unref(void* value) { refcounted_message_size_limits* limits = (refcounted_message_size_limits*)value; if (gpr_unref(&limits->refs)) { @@ -108,8 +107,7 @@ typedef struct channel_data { // Callback invoked when we receive a message. Here we check the max // receive message size. -static void recv_message_ready(grpc_exec_ctx* exec_ctx, void* user_data, - grpc_error* error) { +static void recv_message_ready(void* user_data, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; if (*calld->recv_message != nullptr && calld->limits.max_recv_size >= 0 && @@ -132,13 +130,12 @@ static void recv_message_ready(grpc_exec_ctx* exec_ctx, void* user_data, GRPC_ERROR_REF(error); } // Invoke the next callback. - GRPC_CLOSURE_RUN(exec_ctx, calld->next_recv_message_ready, error); + GRPC_CLOSURE_RUN(calld->next_recv_message_ready, error); } // Start transport stream op. static void start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* op) { + grpc_call_element* elem, grpc_transport_stream_op_batch* op) { call_data* calld = (call_data*)elem->call_data; // Check max send message size. if (op->send_message && calld->limits.max_send_size >= 0 && @@ -149,7 +146,7 @@ static void start_transport_stream_op_batch( op->payload->send_message.send_message->length, calld->limits.max_send_size); grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, op, + op, grpc_error_set_int(GRPC_ERROR_CREATE_FROM_COPIED_STRING(message_string), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_RESOURCE_EXHAUSTED), @@ -165,12 +162,11 @@ static void start_transport_stream_op_batch( op->payload->recv_message.recv_message_ready = &calld->recv_message_ready; } // Chain to the next filter. - grpc_call_next_op(exec_ctx, elem, op); + grpc_call_next_op(elem, op); } // Constructor for call_data. -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; @@ -186,7 +182,7 @@ static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, if (chand->method_limit_table != nullptr) { refcounted_message_size_limits* limits = (refcounted_message_size_limits*)grpc_method_config_table_get( - exec_ctx, chand->method_limit_table, args->path); + chand->method_limit_table, args->path); if (limits != nullptr) { if (limits->limits.max_send_size >= 0 && (limits->limits.max_send_size < calld->limits.max_send_size || @@ -204,7 +200,7 @@ static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, } // Destructor for call_data. -static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) {} @@ -241,8 +237,7 @@ message_size_limits get_message_size_limits( } // Constructor for channel_data. -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { GPR_ASSERT(!args->is_last); channel_data* chand = (channel_data*)elem->channel_data; @@ -257,8 +252,7 @@ static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, if (service_config != nullptr) { chand->method_limit_table = grpc_service_config_create_method_config_table( - exec_ctx, service_config, - refcounted_message_size_limits_create_from_json, + service_config, refcounted_message_size_limits_create_from_json, refcounted_message_size_limits_ref, refcounted_message_size_limits_unref); grpc_service_config_destroy(service_config); @@ -268,10 +262,9 @@ static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, } // Destructor for channel_data. -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) { +static void destroy_channel_elem(grpc_channel_element* elem) { channel_data* chand = (channel_data*)elem->channel_data; - grpc_slice_hash_table_unref(exec_ctx, chand->method_limit_table); + grpc_slice_hash_table_unref(chand->method_limit_table); } const grpc_channel_filter grpc_message_size_filter = { @@ -287,8 +280,7 @@ const grpc_channel_filter grpc_message_size_filter = { grpc_channel_next_get_info, "message_size"}; -static bool maybe_add_message_size_filter(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, +static bool maybe_add_message_size_filter(grpc_channel_stack_builder* builder, void* arg) { const grpc_channel_args* channel_args = grpc_channel_stack_builder_get_channel_arguments(builder); diff --git a/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc b/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc index 4ab1ee4e79c..555a9134a21 100644 --- a/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc +++ b/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc @@ -50,8 +50,7 @@ static bool get_user_agent_mdelem(const grpc_metadata_batch* batch, } // Callback invoked when we receive an initial metadata. -static void recv_initial_metadata_ready(grpc_exec_ctx* exec_ctx, - void* user_data, grpc_error* error) { +static void recv_initial_metadata_ready(void* user_data, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; @@ -67,14 +66,13 @@ static void recv_initial_metadata_ready(grpc_exec_ctx* exec_ctx, } // Invoke the next callback. - GRPC_CLOSURE_RUN(exec_ctx, calld->next_recv_initial_metadata_ready, + GRPC_CLOSURE_RUN(calld->next_recv_initial_metadata_ready, GRPC_ERROR_REF(error)); } // Start transport stream op. static void start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* op) { + grpc_call_element* elem, grpc_transport_stream_op_batch* op) { call_data* calld = (call_data*)elem->call_data; // Inject callback for receiving initial metadata @@ -96,12 +94,11 @@ static void start_transport_stream_op_batch( } // Chain to the next filter. - grpc_call_next_op(exec_ctx, elem, op); + grpc_call_next_op(elem, op); } // Constructor for call_data. -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; calld->next_recv_initial_metadata_ready = nullptr; @@ -113,20 +110,18 @@ static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, } // Destructor for call_data. -static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) {} // Constructor for channel_data. -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } // Destructor for channel_data. -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_channel_element* elem) {} // Parse the user agent static bool parse_user_agent(grpc_mdelem md) { @@ -181,7 +176,7 @@ const grpc_channel_filter grpc_workaround_cronet_compression_filter = { "workaround_cronet_compression"}; static bool register_workaround_cronet_compression( - grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, void* arg) { + grpc_channel_stack_builder* builder, void* arg) { const grpc_channel_args* channel_args = grpc_channel_stack_builder_get_channel_arguments(builder); const grpc_arg* a = grpc_channel_args_find( diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.cc b/src/core/ext/transport/chttp2/client/chttp2_connector.cc index 819f66aec34..db5962e7fd4 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.cc +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.cc @@ -61,38 +61,34 @@ static void chttp2_connector_ref(grpc_connector* con) { gpr_ref(&c->refs); } -static void chttp2_connector_unref(grpc_exec_ctx* exec_ctx, - grpc_connector* con) { +static void chttp2_connector_unref(grpc_connector* con) { chttp2_connector* c = (chttp2_connector*)con; if (gpr_unref(&c->refs)) { gpr_mu_destroy(&c->mu); // If handshaking is not yet in progress, destroy the endpoint. // Otherwise, the handshaker will do this for us. - if (c->endpoint != nullptr) grpc_endpoint_destroy(exec_ctx, c->endpoint); + if (c->endpoint != nullptr) grpc_endpoint_destroy(c->endpoint); gpr_free(c); } } -static void chttp2_connector_shutdown(grpc_exec_ctx* exec_ctx, - grpc_connector* con, grpc_error* why) { +static void chttp2_connector_shutdown(grpc_connector* con, grpc_error* why) { chttp2_connector* c = (chttp2_connector*)con; gpr_mu_lock(&c->mu); c->shutdown = true; if (c->handshake_mgr != nullptr) { - grpc_handshake_manager_shutdown(exec_ctx, c->handshake_mgr, - GRPC_ERROR_REF(why)); + grpc_handshake_manager_shutdown(c->handshake_mgr, GRPC_ERROR_REF(why)); } // If handshaking is not yet in progress, shutdown the endpoint. // Otherwise, the handshaker will do this for us. if (!c->connecting && c->endpoint != nullptr) { - grpc_endpoint_shutdown(exec_ctx, c->endpoint, GRPC_ERROR_REF(why)); + grpc_endpoint_shutdown(c->endpoint, GRPC_ERROR_REF(why)); } gpr_mu_unlock(&c->mu); GRPC_ERROR_UNREF(why); } -static void on_handshake_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_handshake_done(void* arg, grpc_error* error) { grpc_handshaker_args* args = (grpc_handshaker_args*)arg; chttp2_connector* c = (chttp2_connector*)args->user_data; gpr_mu_lock(&c->mu); @@ -105,20 +101,20 @@ static void on_handshake_done(grpc_exec_ctx* exec_ctx, void* arg, // before destroying them, even if we know that there are no // pending read/write callbacks. This should be fixed, at which // point this can be removed. - grpc_endpoint_shutdown(exec_ctx, args->endpoint, GRPC_ERROR_REF(error)); - grpc_endpoint_destroy(exec_ctx, args->endpoint); - grpc_channel_args_destroy(exec_ctx, args->args); - grpc_slice_buffer_destroy_internal(exec_ctx, args->read_buffer); + grpc_endpoint_shutdown(args->endpoint, GRPC_ERROR_REF(error)); + grpc_endpoint_destroy(args->endpoint); + grpc_channel_args_destroy(args->args); + grpc_slice_buffer_destroy_internal(args->read_buffer); gpr_free(args->read_buffer); } else { error = GRPC_ERROR_REF(error); } memset(c->result, 0, sizeof(*c->result)); } else { - grpc_endpoint_delete_from_pollset_set(exec_ctx, args->endpoint, + grpc_endpoint_delete_from_pollset_set(args->endpoint, c->args.interested_parties); - c->result->transport = grpc_create_chttp2_transport(exec_ctx, args->args, - args->endpoint, true); + c->result->transport = + grpc_create_chttp2_transport(args->args, args->endpoint, true); GPR_ASSERT(c->result->transport); // TODO(roth): We ideally want to wait until we receive HTTP/2 // settings from the server before we consider the connection @@ -144,34 +140,32 @@ static void on_handshake_done(grpc_exec_ctx* exec_ctx, void* arg, // so until after transparent retries is implemented. Otherwise, any // RPC that we attempt to send on the connection before the timeout // would fail instead of being retried on a subsequent attempt. - grpc_chttp2_transport_start_reading(exec_ctx, c->result->transport, - args->read_buffer, nullptr); + grpc_chttp2_transport_start_reading(c->result->transport, args->read_buffer, + nullptr); c->result->channel_args = args->args; } grpc_closure* notify = c->notify; c->notify = nullptr; - GRPC_CLOSURE_SCHED(exec_ctx, notify, error); - grpc_handshake_manager_destroy(exec_ctx, c->handshake_mgr); + GRPC_CLOSURE_SCHED(notify, error); + grpc_handshake_manager_destroy(c->handshake_mgr); c->handshake_mgr = nullptr; gpr_mu_unlock(&c->mu); - chttp2_connector_unref(exec_ctx, (grpc_connector*)c); + chttp2_connector_unref((grpc_connector*)c); } -static void start_handshake_locked(grpc_exec_ctx* exec_ctx, - chttp2_connector* c) { +static void start_handshake_locked(chttp2_connector* c) { c->handshake_mgr = grpc_handshake_manager_create(); - grpc_handshakers_add(exec_ctx, HANDSHAKER_CLIENT, c->args.channel_args, + grpc_handshakers_add(HANDSHAKER_CLIENT, c->args.channel_args, c->handshake_mgr); - grpc_endpoint_add_to_pollset_set(exec_ctx, c->endpoint, - c->args.interested_parties); + grpc_endpoint_add_to_pollset_set(c->endpoint, c->args.interested_parties); grpc_handshake_manager_do_handshake( - exec_ctx, c->handshake_mgr, c->args.interested_parties, c->endpoint, + c->handshake_mgr, c->args.interested_parties, c->endpoint, c->args.channel_args, c->args.deadline, nullptr /* acceptor */, on_handshake_done, c); c->endpoint = nullptr; // Endpoint handed off to handshake manager. } -static void connected(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void connected(void* arg, grpc_error* error) { chttp2_connector* c = (chttp2_connector*)arg; gpr_mu_lock(&c->mu); GPR_ASSERT(c->connecting); @@ -185,27 +179,26 @@ static void connected(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { memset(c->result, 0, sizeof(*c->result)); grpc_closure* notify = c->notify; c->notify = nullptr; - GRPC_CLOSURE_SCHED(exec_ctx, notify, error); + GRPC_CLOSURE_SCHED(notify, error); if (c->endpoint != nullptr) { - grpc_endpoint_shutdown(exec_ctx, c->endpoint, GRPC_ERROR_REF(error)); + grpc_endpoint_shutdown(c->endpoint, GRPC_ERROR_REF(error)); } gpr_mu_unlock(&c->mu); - chttp2_connector_unref(exec_ctx, (grpc_connector*)arg); + chttp2_connector_unref((grpc_connector*)arg); } else { GPR_ASSERT(c->endpoint != nullptr); - start_handshake_locked(exec_ctx, c); + start_handshake_locked(c); gpr_mu_unlock(&c->mu); } } -static void chttp2_connector_connect(grpc_exec_ctx* exec_ctx, - grpc_connector* con, +static void chttp2_connector_connect(grpc_connector* con, const grpc_connect_in_args* args, grpc_connect_out_args* result, grpc_closure* notify) { chttp2_connector* c = (chttp2_connector*)con; grpc_resolved_address addr; - grpc_get_subchannel_address_arg(exec_ctx, args->channel_args, &addr); + grpc_get_subchannel_address_arg(args->channel_args, &addr); gpr_mu_lock(&c->mu); GPR_ASSERT(c->notify == nullptr); c->notify = notify; @@ -216,9 +209,8 @@ static void chttp2_connector_connect(grpc_exec_ctx* exec_ctx, GRPC_CLOSURE_INIT(&c->connected, connected, c, grpc_schedule_on_exec_ctx); GPR_ASSERT(!c->connecting); c->connecting = true; - grpc_tcp_client_connect(exec_ctx, &c->connected, &c->endpoint, - args->interested_parties, args->channel_args, &addr, - args->deadline); + grpc_tcp_client_connect(&c->connected, &c->endpoint, args->interested_parties, + args->channel_args, &addr, args->deadline); gpr_mu_unlock(&c->mu); } diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc index 028b69e5ff9..6a1b70964d7 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc @@ -34,21 +34,19 @@ static void client_channel_factory_ref( grpc_client_channel_factory* cc_factory) {} static void client_channel_factory_unref( - grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* cc_factory) {} + grpc_client_channel_factory* cc_factory) {} static grpc_subchannel* client_channel_factory_create_subchannel( - grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* cc_factory, - const grpc_subchannel_args* args) { + grpc_client_channel_factory* cc_factory, const grpc_subchannel_args* args) { grpc_connector* connector = grpc_chttp2_connector_create(); - grpc_subchannel* s = grpc_subchannel_create(exec_ctx, connector, args); - grpc_connector_unref(exec_ctx, connector); + grpc_subchannel* s = grpc_subchannel_create(connector, args); + grpc_connector_unref(connector); 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, - const grpc_channel_args* args) { + grpc_client_channel_factory* cc_factory, const char* target, + grpc_client_channel_type type, const grpc_channel_args* args) { if (target == nullptr) { gpr_log(GPR_ERROR, "cannot create channel with NULL target name"); return nullptr; @@ -56,14 +54,14 @@ static grpc_channel* client_channel_factory_create_channel( // Add channel arg containing the server URI. grpc_arg arg = grpc_channel_arg_string_create( (char*)GRPC_ARG_SERVER_URI, - grpc_resolver_factory_add_default_prefix_if_needed(exec_ctx, target)); + grpc_resolver_factory_add_default_prefix_if_needed(target)); const char* to_remove[] = {GRPC_ARG_SERVER_URI}; grpc_channel_args* new_args = grpc_channel_args_copy_and_add_and_remove(args, to_remove, 1, &arg, 1); gpr_free(arg.value.string); - grpc_channel* channel = grpc_channel_create(exec_ctx, target, new_args, - GRPC_CLIENT_CHANNEL, nullptr); - grpc_channel_args_destroy(exec_ctx, new_args); + grpc_channel* channel = + grpc_channel_create(target, new_args, GRPC_CLIENT_CHANNEL, nullptr); + grpc_channel_args_destroy(new_args); return channel; } @@ -82,7 +80,7 @@ static grpc_client_channel_factory client_channel_factory = { grpc_channel* grpc_insecure_channel_create(const char* target, const grpc_channel_args* args, void* reserved) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE( "grpc_insecure_channel_create(target=%s, args=%p, reserved=%p)", 3, (target, args, reserved)); @@ -93,11 +91,11 @@ grpc_channel* grpc_insecure_channel_create(const char* target, grpc_channel_args* new_args = grpc_channel_args_copy_and_add(args, &arg, 1); // Create channel. grpc_channel* channel = client_channel_factory_create_channel( - &exec_ctx, &client_channel_factory, target, - GRPC_CLIENT_CHANNEL_TYPE_REGULAR, new_args); + &client_channel_factory, target, GRPC_CLIENT_CHANNEL_TYPE_REGULAR, + new_args); // Clean up. - grpc_channel_args_destroy(&exec_ctx, new_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_channel_args_destroy(new_args); + return channel != nullptr ? channel : grpc_lame_client_channel_create( target, GRPC_STATUS_INTERNAL, diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc b/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc index c6b149d0b1d..0cdea5a94e8 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc @@ -37,7 +37,7 @@ grpc_channel* grpc_insecure_channel_create_from_fd( const char* target, int fd, const grpc_channel_args* args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE("grpc_insecure_channel_create(target=%p, fd=%d, args=%p)", 3, (target, fd, args)); @@ -50,17 +50,17 @@ grpc_channel* grpc_insecure_channel_create_from_fd( GPR_ASSERT(fcntl(fd, F_SETFL, flags | O_NONBLOCK) == 0); grpc_endpoint* client = grpc_tcp_client_create_from_fd( - &exec_ctx, grpc_fd_create(fd, "client"), args, "fd-client"); + grpc_fd_create(fd, "client"), args, "fd-client"); grpc_transport* transport = - grpc_create_chttp2_transport(&exec_ctx, final_args, client, true); + grpc_create_chttp2_transport(final_args, client, true); GPR_ASSERT(transport); grpc_channel* channel = grpc_channel_create( - &exec_ctx, target, final_args, GRPC_CLIENT_DIRECT_CHANNEL, transport); - grpc_channel_args_destroy(&exec_ctx, final_args); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); + target, final_args, GRPC_CLIENT_DIRECT_CHANNEL, transport); + grpc_channel_args_destroy(final_args); + grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); return channel != nullptr ? channel : grpc_lame_client_channel_create( @@ -73,7 +73,7 @@ grpc_channel* grpc_insecure_channel_create_from_fd( grpc_channel* grpc_insecure_channel_create_from_fd( const char* target, int fd, const grpc_channel_args* args) { GPR_ASSERT(0); - return NULL; + return nullptr; } #endif // GPR_SUPPORT_CHANNELS_FROM_FD diff --git a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc index dd2bc427a7b..27c5b96a4ce 100644 --- a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc +++ b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc @@ -41,10 +41,10 @@ static void client_channel_factory_ref( grpc_client_channel_factory* cc_factory) {} static void client_channel_factory_unref( - grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* cc_factory) {} + grpc_client_channel_factory* cc_factory) {} static grpc_subchannel_args* get_secure_naming_subchannel_args( - grpc_exec_ctx* exec_ctx, const grpc_subchannel_args* args) { + const grpc_subchannel_args* args) { grpc_channel_credentials* channel_credentials = grpc_channel_credentials_find_in_args(args->args); if (channel_credentials == nullptr) { @@ -68,7 +68,7 @@ static grpc_subchannel_args* get_secure_naming_subchannel_args( const char* server_uri_str = server_uri_arg->value.string; GPR_ASSERT(server_uri_str != nullptr); grpc_uri* server_uri = - grpc_uri_parse(exec_ctx, server_uri_str, true /* supress errors */); + grpc_uri_parse(server_uri_str, true /* supress errors */); GPR_ASSERT(server_uri != nullptr); const char* server_uri_path; server_uri_path = @@ -81,7 +81,7 @@ static grpc_subchannel_args* get_secure_naming_subchannel_args( const char* target_uri_str = grpc_get_subchannel_address_uri_arg(args->args); grpc_uri* target_uri = - grpc_uri_parse(exec_ctx, target_uri_str, false /* suppress errors */); + grpc_uri_parse(target_uri_str, false /* suppress errors */); GPR_ASSERT(target_uri != nullptr); if (target_uri->path[0] != '\0') { // "path" may be empty const grpc_slice key = grpc_slice_from_static_string( @@ -89,7 +89,7 @@ static grpc_subchannel_args* get_secure_naming_subchannel_args( const char* value = (const char*)grpc_slice_hash_table_get(targets_info, key); if (value != nullptr) target_name_to_check = gpr_strdup(value); - grpc_slice_unref_internal(exec_ctx, key); + grpc_slice_unref_internal(key); } if (target_name_to_check == nullptr) { // If the target name to check hasn't already been set, fall back to using @@ -107,7 +107,7 @@ static grpc_subchannel_args* get_secure_naming_subchannel_args( grpc_channel_args* new_args_from_connector = nullptr; const grpc_security_status security_status = grpc_channel_credentials_create_security_connector( - exec_ctx, channel_credentials, target_name_to_check, args->args, + channel_credentials, target_name_to_check, args->args, &subchannel_security_connector, &new_args_from_connector); if (security_status != GRPC_SECURITY_OK) { gpr_log(GPR_ERROR, @@ -123,10 +123,10 @@ static grpc_subchannel_args* get_secure_naming_subchannel_args( grpc_channel_args* new_args = grpc_channel_args_copy_and_add( new_args_from_connector != nullptr ? new_args_from_connector : args->args, &new_security_connector_arg, 1); - GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, &subchannel_security_connector->base, + GRPC_SECURITY_CONNECTOR_UNREF(&subchannel_security_connector->base, "lb_channel_create"); if (new_args_from_connector != nullptr) { - grpc_channel_args_destroy(exec_ctx, new_args_from_connector); + grpc_channel_args_destroy(new_args_from_connector); } grpc_subchannel_args* final_sc_args = (grpc_subchannel_args*)gpr_malloc(sizeof(*final_sc_args)); @@ -136,10 +136,9 @@ static grpc_subchannel_args* get_secure_naming_subchannel_args( } static grpc_subchannel* client_channel_factory_create_subchannel( - grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* cc_factory, - const grpc_subchannel_args* args) { + grpc_client_channel_factory* cc_factory, const grpc_subchannel_args* args) { grpc_subchannel_args* subchannel_args = - get_secure_naming_subchannel_args(exec_ctx, args); + get_secure_naming_subchannel_args(args); if (subchannel_args == nullptr) { gpr_log( GPR_ERROR, @@ -147,19 +146,16 @@ static grpc_subchannel* client_channel_factory_create_subchannel( return nullptr; } grpc_connector* connector = grpc_chttp2_connector_create(); - grpc_subchannel* s = - grpc_subchannel_create(exec_ctx, connector, subchannel_args); - grpc_connector_unref(exec_ctx, connector); - grpc_channel_args_destroy(exec_ctx, - (grpc_channel_args*)subchannel_args->args); + grpc_subchannel* s = grpc_subchannel_create(connector, subchannel_args); + grpc_connector_unref(connector); + grpc_channel_args_destroy((grpc_channel_args*)subchannel_args->args); gpr_free(subchannel_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, - const grpc_channel_args* args) { + grpc_client_channel_factory* cc_factory, const char* target, + grpc_client_channel_type type, const grpc_channel_args* args) { if (target == nullptr) { gpr_log(GPR_ERROR, "cannot create channel with NULL target name"); return nullptr; @@ -167,14 +163,14 @@ static grpc_channel* client_channel_factory_create_channel( // Add channel arg containing the server URI. grpc_arg arg = grpc_channel_arg_string_create( (char*)GRPC_ARG_SERVER_URI, - grpc_resolver_factory_add_default_prefix_if_needed(exec_ctx, target)); + grpc_resolver_factory_add_default_prefix_if_needed(target)); const char* to_remove[] = {GRPC_ARG_SERVER_URI}; grpc_channel_args* new_args = grpc_channel_args_copy_and_add_and_remove(args, to_remove, 1, &arg, 1); gpr_free(arg.value.string); - grpc_channel* channel = grpc_channel_create(exec_ctx, target, new_args, - GRPC_CLIENT_CHANNEL, nullptr); - grpc_channel_args_destroy(exec_ctx, new_args); + grpc_channel* channel = + grpc_channel_create(target, new_args, GRPC_CLIENT_CHANNEL, nullptr); + grpc_channel_args_destroy(new_args); return channel; } @@ -194,7 +190,7 @@ grpc_channel* grpc_secure_channel_create(grpc_channel_credentials* creds, const char* target, const grpc_channel_args* args, void* reserved) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE( "grpc_secure_channel_create(creds=%p, target=%s, args=%p, " "reserved=%p)", @@ -211,11 +207,10 @@ grpc_channel* grpc_secure_channel_create(grpc_channel_credentials* creds, args, args_to_add, GPR_ARRAY_SIZE(args_to_add)); // Create channel. channel = client_channel_factory_create_channel( - &exec_ctx, &client_channel_factory, target, - GRPC_CLIENT_CHANNEL_TYPE_REGULAR, new_args); + &client_channel_factory, target, GRPC_CLIENT_CHANNEL_TYPE_REGULAR, + new_args); // Clean up. - grpc_channel_args_destroy(&exec_ctx, new_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_channel_args_destroy(new_args); } return channel != nullptr ? channel : grpc_lame_client_channel_create( diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index 49ee6774640..5669fa40901 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -69,17 +69,17 @@ typedef struct { } server_connection_state; static void server_connection_state_unref( - grpc_exec_ctx* exec_ctx, server_connection_state* connection_state) { + server_connection_state* connection_state) { if (gpr_unref(&connection_state->refs)) { if (connection_state->transport != nullptr) { - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, connection_state->transport, + GRPC_CHTTP2_UNREF_TRANSPORT(connection_state->transport, "receive settings timeout"); } gpr_free(connection_state); } } -static void on_timeout(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void on_timeout(void* arg, grpc_error* error) { server_connection_state* connection_state = (server_connection_state*)arg; // Note that we may be called with GRPC_ERROR_NONE when the timer fires // or with an error indicating that the timer system is being shut down. @@ -87,22 +87,20 @@ static void on_timeout(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { grpc_transport_op* op = grpc_make_transport_op(nullptr); op->disconnect_with_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Did not receive HTTP/2 settings before handshake timeout"); - grpc_transport_perform_op(exec_ctx, &connection_state->transport->base, op); + grpc_transport_perform_op(&connection_state->transport->base, op); } - server_connection_state_unref(exec_ctx, connection_state); + server_connection_state_unref(connection_state); } -static void on_receive_settings(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_receive_settings(void* arg, grpc_error* error) { server_connection_state* connection_state = (server_connection_state*)arg; if (error == GRPC_ERROR_NONE) { - grpc_timer_cancel(exec_ctx, &connection_state->timer); + grpc_timer_cancel(&connection_state->timer); } - server_connection_state_unref(exec_ctx, connection_state); + server_connection_state_unref(connection_state); } -static void on_handshake_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_handshake_done(void* arg, grpc_error* error) { grpc_handshaker_args* args = (grpc_handshaker_args*)arg; server_connection_state* connection_state = (server_connection_state*)args->user_data; @@ -117,10 +115,10 @@ static void on_handshake_done(grpc_exec_ctx* exec_ctx, void* arg, // before destroying them, even if we know that there are no // pending read/write callbacks. This should be fixed, at which // point this can be removed. - grpc_endpoint_shutdown(exec_ctx, args->endpoint, GRPC_ERROR_NONE); - grpc_endpoint_destroy(exec_ctx, args->endpoint); - grpc_channel_args_destroy(exec_ctx, args->args); - grpc_slice_buffer_destroy_internal(exec_ctx, args->read_buffer); + grpc_endpoint_shutdown(args->endpoint, GRPC_ERROR_NONE); + grpc_endpoint_destroy(args->endpoint); + grpc_channel_args_destroy(args->args); + grpc_slice_buffer_destroy_internal(args->read_buffer); gpr_free(args->read_buffer); } } else { @@ -128,10 +126,10 @@ static void on_handshake_done(grpc_exec_ctx* exec_ctx, void* arg, // handshaker may have handed off the connection to some external // code, so we can just clean up here without creating a transport. if (args->endpoint != nullptr) { - grpc_transport* transport = grpc_create_chttp2_transport( - exec_ctx, args->args, args->endpoint, false); + grpc_transport* transport = + grpc_create_chttp2_transport(args->args, args->endpoint, false); grpc_server_setup_transport( - exec_ctx, connection_state->svr_state->server, transport, + connection_state->svr_state->server, transport, connection_state->accepting_pollset, args->args); // Use notify_on_receive_settings callback to enforce the // handshake deadline. @@ -141,16 +139,14 @@ static void on_handshake_done(grpc_exec_ctx* exec_ctx, void* arg, on_receive_settings, connection_state, grpc_schedule_on_exec_ctx); grpc_chttp2_transport_start_reading( - exec_ctx, transport, args->read_buffer, - &connection_state->on_receive_settings); - grpc_channel_args_destroy(exec_ctx, args->args); + transport, args->read_buffer, &connection_state->on_receive_settings); + grpc_channel_args_destroy(args->args); gpr_ref(&connection_state->refs); GRPC_CHTTP2_REF_TRANSPORT((grpc_chttp2_transport*)transport, "receive settings timeout"); GRPC_CLOSURE_INIT(&connection_state->on_timeout, on_timeout, connection_state, grpc_schedule_on_exec_ctx); - grpc_timer_init(exec_ctx, &connection_state->timer, - connection_state->deadline, + grpc_timer_init(&connection_state->timer, connection_state->deadline, &connection_state->on_timeout); } } @@ -158,21 +154,21 @@ static void on_handshake_done(grpc_exec_ctx* exec_ctx, void* arg, &connection_state->svr_state->pending_handshake_mgrs, connection_state->handshake_mgr); gpr_mu_unlock(&connection_state->svr_state->mu); - grpc_handshake_manager_destroy(exec_ctx, connection_state->handshake_mgr); + grpc_handshake_manager_destroy(connection_state->handshake_mgr); gpr_free(connection_state->acceptor); - grpc_tcp_server_unref(exec_ctx, connection_state->svr_state->tcp_server); - server_connection_state_unref(exec_ctx, connection_state); + grpc_tcp_server_unref(connection_state->svr_state->tcp_server); + server_connection_state_unref(connection_state); } -static void on_accept(grpc_exec_ctx* exec_ctx, void* arg, grpc_endpoint* tcp, +static void on_accept(void* arg, grpc_endpoint* tcp, grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor) { server_state* state = (server_state*)arg; gpr_mu_lock(&state->mu); if (state->shutdown) { gpr_mu_unlock(&state->mu); - grpc_endpoint_shutdown(exec_ctx, tcp, GRPC_ERROR_NONE); - grpc_endpoint_destroy(exec_ctx, tcp); + grpc_endpoint_shutdown(tcp, GRPC_ERROR_NONE); + grpc_endpoint_destroy(tcp); gpr_free(acceptor); return; } @@ -188,59 +184,56 @@ static void on_accept(grpc_exec_ctx* exec_ctx, void* arg, grpc_endpoint* tcp, connection_state->accepting_pollset = accepting_pollset; connection_state->acceptor = acceptor; connection_state->handshake_mgr = handshake_mgr; - grpc_handshakers_add(exec_ctx, HANDSHAKER_SERVER, state->args, + grpc_handshakers_add(HANDSHAKER_SERVER, state->args, connection_state->handshake_mgr); const grpc_arg* timeout_arg = grpc_channel_args_find(state->args, GRPC_ARG_SERVER_HANDSHAKE_TIMEOUT_MS); connection_state->deadline = - grpc_exec_ctx_now(exec_ctx) + + grpc_core::ExecCtx::Get()->Now() + grpc_channel_arg_get_integer(timeout_arg, {120 * GPR_MS_PER_SEC, 1, INT_MAX}); - grpc_handshake_manager_do_handshake(exec_ctx, connection_state->handshake_mgr, - nullptr /* interested_parties */, tcp, - state->args, connection_state->deadline, - acceptor, on_handshake_done, - connection_state); + grpc_handshake_manager_do_handshake( + connection_state->handshake_mgr, nullptr /* interested_parties */, tcp, + state->args, connection_state->deadline, acceptor, on_handshake_done, + connection_state); } /* Server callback: start listening on our ports */ -static void server_start_listener(grpc_exec_ctx* exec_ctx, grpc_server* server, - void* arg, grpc_pollset** pollsets, +static void server_start_listener(grpc_server* server, void* arg, + grpc_pollset** pollsets, size_t pollset_count) { server_state* state = (server_state*)arg; gpr_mu_lock(&state->mu); state->shutdown = false; gpr_mu_unlock(&state->mu); - grpc_tcp_server_start(exec_ctx, state->tcp_server, pollsets, pollset_count, - on_accept, state); + grpc_tcp_server_start(state->tcp_server, pollsets, pollset_count, on_accept, + state); } -static void tcp_server_shutdown_complete(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void tcp_server_shutdown_complete(void* arg, grpc_error* error) { server_state* state = (server_state*)arg; /* ensure all threads have unlocked */ gpr_mu_lock(&state->mu); grpc_closure* destroy_done = state->server_destroy_listener_done; GPR_ASSERT(state->shutdown); grpc_handshake_manager_pending_list_shutdown_all( - exec_ctx, state->pending_handshake_mgrs, GRPC_ERROR_REF(error)); + state->pending_handshake_mgrs, GRPC_ERROR_REF(error)); gpr_mu_unlock(&state->mu); // Flush queued work before destroying handshaker factory, since that // may do a synchronous unref. - grpc_exec_ctx_flush(exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); if (destroy_done != nullptr) { - destroy_done->cb(exec_ctx, destroy_done->cb_arg, GRPC_ERROR_REF(error)); - grpc_exec_ctx_flush(exec_ctx); + destroy_done->cb(destroy_done->cb_arg, GRPC_ERROR_REF(error)); + grpc_core::ExecCtx::Get()->Flush(); } - grpc_channel_args_destroy(exec_ctx, state->args); + grpc_channel_args_destroy(state->args); gpr_mu_destroy(&state->mu); gpr_free(state); } /* Server callback: destroy the tcp listener (so we don't generate further callbacks) */ -static void server_destroy_listener(grpc_exec_ctx* exec_ctx, - grpc_server* server, void* arg, +static void server_destroy_listener(grpc_server* server, void* arg, grpc_closure* destroy_done) { server_state* state = (server_state*)arg; gpr_mu_lock(&state->mu); @@ -248,12 +241,11 @@ static void server_destroy_listener(grpc_exec_ctx* exec_ctx, state->server_destroy_listener_done = destroy_done; grpc_tcp_server* tcp_server = state->tcp_server; gpr_mu_unlock(&state->mu); - grpc_tcp_server_shutdown_listeners(exec_ctx, tcp_server); - grpc_tcp_server_unref(exec_ctx, tcp_server); + grpc_tcp_server_shutdown_listeners(tcp_server); + grpc_tcp_server_unref(tcp_server); } -grpc_error* grpc_chttp2_server_add_port(grpc_exec_ctx* exec_ctx, - grpc_server* server, const char* addr, +grpc_error* grpc_chttp2_server_add_port(grpc_server* server, const char* addr, grpc_channel_args* args, int* port_num) { grpc_resolved_addresses* resolved = nullptr; @@ -277,8 +269,8 @@ grpc_error* grpc_chttp2_server_add_port(grpc_exec_ctx* exec_ctx, GRPC_CLOSURE_INIT(&state->tcp_server_shutdown_complete, tcp_server_shutdown_complete, state, grpc_schedule_on_exec_ctx); - err = grpc_tcp_server_create(exec_ctx, &state->tcp_server_shutdown_complete, - args, &tcp_server); + err = grpc_tcp_server_create(&state->tcp_server_shutdown_complete, args, + &tcp_server); if (err != GRPC_ERROR_NONE) { goto error; } @@ -327,7 +319,7 @@ grpc_error* grpc_chttp2_server_add_port(grpc_exec_ctx* exec_ctx, grpc_resolved_addresses_destroy(resolved); /* Register with the server only upon success */ - grpc_server_add_listener(exec_ctx, server, state, server_start_listener, + grpc_server_add_listener(server, state, server_start_listener, server_destroy_listener); goto done; @@ -338,9 +330,9 @@ error: grpc_resolved_addresses_destroy(resolved); } if (tcp_server) { - grpc_tcp_server_unref(exec_ctx, tcp_server); + grpc_tcp_server_unref(tcp_server); } else { - grpc_channel_args_destroy(exec_ctx, args); + grpc_channel_args_destroy(args); gpr_free(state); } *port_num = 0; diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.h b/src/core/ext/transport/chttp2/server/chttp2_server.h index 68304fd4f7e..7de859da420 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.h +++ b/src/core/ext/transport/chttp2/server/chttp2_server.h @@ -25,8 +25,7 @@ /// Adds a port to \a server. Sets \a port_num to the port number. /// Takes ownership of \a args. -grpc_error* grpc_chttp2_server_add_port(grpc_exec_ctx* exec_ctx, - grpc_server* server, const char* addr, +grpc_error* grpc_chttp2_server_add_port(grpc_server* server, const char* addr, grpc_channel_args* args, int* port_num); #endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_SERVER_CHTTP2_SERVER_H */ diff --git a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc index 89848965384..52c42d056c6 100644 --- a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc +++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc @@ -26,12 +26,12 @@ #include "src/core/lib/surface/server.h" int grpc_server_add_insecure_http2_port(grpc_server* server, const char* addr) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; int port_num = 0; GRPC_API_TRACE("grpc_server_add_insecure_http2_port(server=%p, addr=%s)", 2, (server, addr)); grpc_error* err = grpc_chttp2_server_add_port( - &exec_ctx, server, addr, + server, addr, grpc_channel_args_copy(grpc_server_get_channel_args(server)), &port_num); if (err != GRPC_ERROR_NONE) { const char* msg = grpc_error_string(err); @@ -39,6 +39,6 @@ int grpc_server_add_insecure_http2_port(grpc_server* server, const char* addr) { GRPC_ERROR_UNREF(err); } - grpc_exec_ctx_finish(&exec_ctx); + return port_num; } diff --git a/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc b/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc index 3fe05ce4ef9..dafd4af6cef 100644 --- a/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc +++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc @@ -38,32 +38,29 @@ void grpc_server_add_insecure_channel_from_fd(grpc_server* server, void* reserved, int fd) { GPR_ASSERT(reserved == nullptr); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; char* name; gpr_asprintf(&name, "fd:%d", fd); - grpc_endpoint* server_endpoint = - grpc_tcp_create(&exec_ctx, grpc_fd_create(fd, name), - grpc_server_get_channel_args(server), name); + grpc_endpoint* server_endpoint = grpc_tcp_create( + grpc_fd_create(fd, name), grpc_server_get_channel_args(server), name); gpr_free(name); const grpc_channel_args* server_args = grpc_server_get_channel_args(server); grpc_transport* transport = grpc_create_chttp2_transport( - &exec_ctx, server_args, server_endpoint, false /* is_client */); + server_args, server_endpoint, false /* is_client */); grpc_pollset** pollsets; size_t num_pollsets = 0; grpc_server_get_pollsets(server, &pollsets, &num_pollsets); for (size_t i = 0; i < num_pollsets; i++) { - grpc_endpoint_add_to_pollset(&exec_ctx, server_endpoint, pollsets[i]); + grpc_endpoint_add_to_pollset(server_endpoint, pollsets[i]); } - grpc_server_setup_transport(&exec_ctx, server, transport, nullptr, - server_args); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_server_setup_transport(server, transport, nullptr, server_args); + grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); } #else // !GPR_SUPPORT_CHANNELS_FROM_FD diff --git a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc index ac3ea40f478..723af97ff08 100644 --- a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc +++ b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc @@ -36,7 +36,7 @@ int grpc_server_add_secure_http2_port(grpc_server* server, const char* addr, grpc_server_credentials* creds) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_error* err = GRPC_ERROR_NONE; grpc_server_security_connector* sc = nullptr; int port_num = 0; @@ -52,8 +52,7 @@ int grpc_server_add_secure_http2_port(grpc_server* server, const char* addr, "No credentials specified for secure server port (creds==NULL)"); goto done; } - status = - grpc_server_credentials_create_security_connector(&exec_ctx, creds, &sc); + status = grpc_server_credentials_create_security_connector(creds, &sc); if (status != GRPC_SECURITY_OK) { char* msg; gpr_asprintf(&msg, @@ -72,12 +71,12 @@ int grpc_server_add_secure_http2_port(grpc_server* server, const char* addr, grpc_channel_args_copy_and_add(grpc_server_get_channel_args(server), args_to_add, GPR_ARRAY_SIZE(args_to_add)); // Add server port. - err = grpc_chttp2_server_add_port(&exec_ctx, server, addr, args, &port_num); + err = grpc_chttp2_server_add_port(server, addr, args, &port_num); done: if (sc != nullptr) { - GRPC_SECURITY_CONNECTOR_UNREF(&exec_ctx, &sc->base, "server"); + GRPC_SECURITY_CONNECTOR_UNREF(&sc->base, "server"); } - grpc_exec_ctx_finish(&exec_ctx); + if (err != GRPC_ERROR_NONE) { const char* msg = grpc_error_string(err); gpr_log(GPR_ERROR, "%s", msg); diff --git a/src/core/ext/transport/chttp2/transport/bin_decoder.cc b/src/core/ext/transport/chttp2/transport/bin_decoder.cc index 3ccae7afc35..984cd4ca78c 100644 --- a/src/core/ext/transport/chttp2/transport/bin_decoder.cc +++ b/src/core/ext/transport/chttp2/transport/bin_decoder.cc @@ -130,8 +130,7 @@ bool grpc_base64_decode_partial(struct grpc_base64_decode_context* ctx) { return true; } -grpc_slice grpc_chttp2_base64_decode(grpc_exec_ctx* exec_ctx, - grpc_slice input) { +grpc_slice grpc_chttp2_base64_decode(grpc_slice input) { size_t input_length = GRPC_SLICE_LENGTH(input); size_t output_length = input_length / 4 * 3; struct grpc_base64_decode_context ctx; @@ -167,7 +166,7 @@ grpc_slice grpc_chttp2_base64_decode(grpc_exec_ctx* exec_ctx, char* s = grpc_slice_to_c_string(input); gpr_log(GPR_ERROR, "Base64 decoding failed, input string:\n%s\n", s); gpr_free(s); - grpc_slice_unref_internal(exec_ctx, output); + grpc_slice_unref_internal(output); return grpc_empty_slice(); } GPR_ASSERT(ctx.output_cur == GRPC_SLICE_END_PTR(output)); @@ -175,8 +174,7 @@ grpc_slice grpc_chttp2_base64_decode(grpc_exec_ctx* exec_ctx, return output; } -grpc_slice grpc_chttp2_base64_decode_with_length(grpc_exec_ctx* exec_ctx, - grpc_slice input, +grpc_slice grpc_chttp2_base64_decode_with_length(grpc_slice input, size_t output_length) { size_t input_length = GRPC_SLICE_LENGTH(input); grpc_slice output = GRPC_SLICE_MALLOC(output_length); @@ -189,7 +187,7 @@ grpc_slice grpc_chttp2_base64_decode_with_length(grpc_exec_ctx* exec_ctx, "grpc_chttp2_base64_decode_with_length has a length of %d, which " "has a tail of 1 byte.\n", (int)input_length); - grpc_slice_unref_internal(exec_ctx, output); + grpc_slice_unref_internal(output); return grpc_empty_slice(); } @@ -199,7 +197,7 @@ grpc_slice grpc_chttp2_base64_decode_with_length(grpc_exec_ctx* exec_ctx, "than the max possible output length %d.\n", (int)output_length, (int)(input_length / 4 * 3 + tail_xtra[input_length % 4])); - grpc_slice_unref_internal(exec_ctx, output); + grpc_slice_unref_internal(output); return grpc_empty_slice(); } @@ -213,7 +211,7 @@ grpc_slice grpc_chttp2_base64_decode_with_length(grpc_exec_ctx* exec_ctx, char* s = grpc_slice_to_c_string(input); gpr_log(GPR_ERROR, "Base64 decoding failed, input string:\n%s\n", s); gpr_free(s); - grpc_slice_unref_internal(exec_ctx, output); + grpc_slice_unref_internal(output); return grpc_empty_slice(); } GPR_ASSERT(ctx.output_cur == GRPC_SLICE_END_PTR(output)); diff --git a/src/core/ext/transport/chttp2/transport/bin_decoder.h b/src/core/ext/transport/chttp2/transport/bin_decoder.h index a78c305766e..9cb75ccd816 100644 --- a/src/core/ext/transport/chttp2/transport/bin_decoder.h +++ b/src/core/ext/transport/chttp2/transport/bin_decoder.h @@ -40,13 +40,12 @@ bool grpc_base64_decode_partial(struct grpc_base64_decode_context* ctx); /* base64 decode a slice with pad chars. Returns a new slice, does not take ownership of the input. Returns an empty slice if decoding is failed. */ -grpc_slice grpc_chttp2_base64_decode(grpc_exec_ctx* exec_ctx, grpc_slice input); +grpc_slice grpc_chttp2_base64_decode(grpc_slice input); /* base64 decode a slice without pad chars, data length is needed. Returns a new slice, does not take ownership of the input. Returns an empty slice if decoding is failed. */ -grpc_slice grpc_chttp2_base64_decode_with_length(grpc_exec_ctx* exec_ctx, - grpc_slice input, +grpc_slice grpc_chttp2_base64_decode_with_length(grpc_slice input, size_t output_length); #endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_DECODER_H */ diff --git a/src/core/ext/transport/chttp2/transport/bin_encoder.h b/src/core/ext/transport/chttp2/transport/bin_encoder.h index a8f36a345ad..93ad0dfdea2 100644 --- a/src/core/ext/transport/chttp2/transport/bin_encoder.h +++ b/src/core/ext/transport/chttp2/transport/bin_encoder.h @@ -32,7 +32,7 @@ grpc_slice grpc_chttp2_huffman_compress(grpc_slice input); /* equivalent to: grpc_slice x = grpc_chttp2_base64_encode(input); grpc_slice y = grpc_chttp2_huffman_compress(x); - grpc_slice_unref_internal(exec_ctx, x); + grpc_slice_unref_internal( x); return y; */ grpc_slice grpc_chttp2_base64_encode_and_huffman_compress(grpc_slice input); diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index 63ac65ac788..f537fb09c2d 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -95,105 +95,77 @@ grpc_core::DebugOnlyTraceFlag grpc_trace_chttp2_refcount(false, "chttp2_refcount"); /* forward declarations of various callbacks that we'll build closures around */ -static void write_action_begin_locked(grpc_exec_ctx* exec_ctx, void* t, - grpc_error* error); -static void write_action(grpc_exec_ctx* exec_ctx, void* t, grpc_error* error); -static void write_action_end_locked(grpc_exec_ctx* exec_ctx, void* t, - grpc_error* error); +static void write_action_begin_locked(void* t, grpc_error* error); +static void write_action(void* t, grpc_error* error); +static void write_action_end_locked(void* t, grpc_error* error); -static void read_action_locked(grpc_exec_ctx* exec_ctx, void* t, - grpc_error* error); +static void read_action_locked(void* t, grpc_error* error); -static void complete_fetch_locked(grpc_exec_ctx* exec_ctx, void* gs, - grpc_error* error); +static void complete_fetch_locked(void* gs, grpc_error* error); /** Set a transport level setting, and push it to our peer */ -static void queue_setting_update(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +static void queue_setting_update(grpc_chttp2_transport* t, grpc_chttp2_setting_id id, uint32_t value); -static void close_from_api(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, - grpc_chttp2_stream* s, grpc_error* error); +static void close_from_api(grpc_chttp2_transport* t, grpc_chttp2_stream* s, + grpc_error* error); /** Start new streams that have been created if we can */ -static void maybe_start_some_streams(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t); +static void maybe_start_some_streams(grpc_chttp2_transport* t); -static void connectivity_state_set(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +static void connectivity_state_set(grpc_chttp2_transport* t, grpc_connectivity_state state, grpc_error* error, const char* reason); -static void incoming_byte_stream_destroy_locked(grpc_exec_ctx* exec_ctx, - void* byte_stream, +static void incoming_byte_stream_destroy_locked(void* byte_stream, grpc_error* error_ignored); static void incoming_byte_stream_publish_error( - grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_byte_stream* bs, - grpc_error* error); -static void incoming_byte_stream_unref(grpc_exec_ctx* exec_ctx, - grpc_chttp2_incoming_byte_stream* bs); - -static void benign_reclaimer_locked(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, - grpc_error* error); - -static void schedule_bdp_ping_locked(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t); -static void start_bdp_ping_locked(grpc_exec_ctx* exec_ctx, void* tp, - grpc_error* error); -static void finish_bdp_ping_locked(grpc_exec_ctx* exec_ctx, void* tp, - grpc_error* error); -static void next_bdp_ping_timer_expired_locked(grpc_exec_ctx* exec_ctx, - void* tp, grpc_error* error); - -static void cancel_pings(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, - grpc_error* error); -static void send_ping_locked(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, + grpc_chttp2_incoming_byte_stream* bs, grpc_error* error); +static void incoming_byte_stream_unref(grpc_chttp2_incoming_byte_stream* bs); + +static void benign_reclaimer_locked(void* t, grpc_error* error); +static void destructive_reclaimer_locked(void* t, grpc_error* error); + +static void post_benign_reclaimer(grpc_chttp2_transport* t); +static void post_destructive_reclaimer(grpc_chttp2_transport* t); + +static void close_transport_locked(grpc_chttp2_transport* t, grpc_error* error); +static void end_all_the_calls(grpc_chttp2_transport* t, grpc_error* error); + +static void schedule_bdp_ping_locked(grpc_chttp2_transport* t); +static void start_bdp_ping_locked(void* tp, grpc_error* error); +static void finish_bdp_ping_locked(void* tp, grpc_error* error); +static void next_bdp_ping_timer_expired_locked(void* tp, grpc_error* error); + +static void cancel_pings(grpc_chttp2_transport* t, grpc_error* error); +static void send_ping_locked(grpc_chttp2_transport* t, grpc_closure* on_initiate, grpc_closure* on_complete); -static void retry_initiate_ping_locked(grpc_exec_ctx* exec_ctx, void* tp, - grpc_error* error); +static void retry_initiate_ping_locked(void* tp, grpc_error* error); /** keepalive-relevant functions */ -static void init_keepalive_ping_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error); -static void start_keepalive_ping_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error); -static void finish_keepalive_ping_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error); -static void keepalive_watchdog_fired_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error); - -static void reset_byte_stream(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error); +static void init_keepalive_ping_locked(void* arg, grpc_error* error); +static void start_keepalive_ping_locked(void* arg, grpc_error* error); +static void finish_keepalive_ping_locked(void* arg, grpc_error* error); +static void keepalive_watchdog_fired_locked(void* arg, grpc_error* error); + +static void reset_byte_stream(void* arg, grpc_error* error); /******************************************************************************* * CONSTRUCTION/DESTRUCTION/REFCOUNTING */ -static void destruct_transport(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t) { +static void destruct_transport(grpc_chttp2_transport* t) { size_t i; - grpc_endpoint_destroy(exec_ctx, t->ep); + grpc_endpoint_destroy(t->ep); - grpc_slice_buffer_destroy_internal(exec_ctx, &t->qbuf); + grpc_slice_buffer_destroy_internal(&t->qbuf); - grpc_slice_buffer_destroy_internal(exec_ctx, &t->outbuf); - grpc_chttp2_hpack_compressor_destroy(exec_ctx, &t->hpack_compressor); + grpc_slice_buffer_destroy_internal(&t->outbuf); + grpc_chttp2_hpack_compressor_destroy(&t->hpack_compressor); - grpc_slice_buffer_destroy_internal(exec_ctx, &t->read_buffer); - grpc_chttp2_hpack_parser_destroy(exec_ctx, &t->hpack_parser); + grpc_slice_buffer_destroy_internal(&t->read_buffer); + grpc_chttp2_hpack_parser_destroy(&t->hpack_parser); grpc_chttp2_goaway_parser_destroy(&t->goaway_parser); for (i = 0; i < STREAM_LIST_COUNT; i++) { @@ -206,12 +178,11 @@ static void destruct_transport(grpc_exec_ctx* exec_ctx, GPR_ASSERT(grpc_chttp2_stream_map_size(&t->stream_map) == 0); grpc_chttp2_stream_map_destroy(&t->stream_map); - grpc_connectivity_state_destroy(exec_ctx, &t->channel_callback.state_tracker); + grpc_connectivity_state_destroy(&t->channel_callback.state_tracker); - GRPC_COMBINER_UNREF(exec_ctx, t->combiner, "chttp2_transport"); + GRPC_COMBINER_UNREF(t->combiner, "chttp2_transport"); - cancel_pings(exec_ctx, t, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Transport destroyed")); + cancel_pings(t, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Transport destroyed")); while (t->write_cb_pool) { grpc_chttp2_write_cb* next = t->write_cb_pool->next; @@ -228,8 +199,7 @@ static void destruct_transport(grpc_exec_ctx* exec_ctx, } #ifndef NDEBUG -void grpc_chttp2_unref_transport(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, const char* reason, +void grpc_chttp2_unref_transport(grpc_chttp2_transport* t, const char* reason, const char* file, int line) { if (grpc_trace_chttp2_refcount.enabled()) { gpr_atm val = gpr_atm_no_barrier_load(&t->refs.count); @@ -237,7 +207,7 @@ void grpc_chttp2_unref_transport(grpc_exec_ctx* exec_ctx, t, val, val - 1, reason, file, line); } if (!gpr_unref(&t->refs)) return; - destruct_transport(exec_ctx, t); + destruct_transport(t); } void grpc_chttp2_ref_transport(grpc_chttp2_transport* t, const char* reason, @@ -250,10 +220,9 @@ void grpc_chttp2_ref_transport(grpc_chttp2_transport* t, const char* reason, gpr_ref(&t->refs); } #else -void grpc_chttp2_unref_transport(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t) { +void grpc_chttp2_unref_transport(grpc_chttp2_transport* t) { if (!gpr_unref(&t->refs)) return; - destruct_transport(exec_ctx, t); + destruct_transport(t); } void grpc_chttp2_ref_transport(grpc_chttp2_transport* t) { gpr_ref(&t->refs); } @@ -261,7 +230,7 @@ void grpc_chttp2_ref_transport(grpc_chttp2_transport* t) { gpr_ref(&t->refs); } static const grpc_transport_vtable* get_vtable(void); -static void init_transport(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, +static void init_transport(grpc_chttp2_transport* t, const grpc_channel_args* channel_args, grpc_endpoint* ep, bool is_client) { size_t i; @@ -320,7 +289,7 @@ static void init_transport(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, t->goaway_error = GRPC_ERROR_NONE; grpc_chttp2_goaway_parser_init(&t->goaway_parser); - grpc_chttp2_hpack_parser_init(exec_ctx, &t->hpack_parser); + grpc_chttp2_hpack_parser_init(&t->hpack_parser); grpc_slice_buffer_init(&t->read_buffer); @@ -351,14 +320,13 @@ static void init_transport(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, /* configure http2 the way we like it */ if (is_client) { - queue_setting_update(exec_ctx, t, GRPC_CHTTP2_SETTINGS_ENABLE_PUSH, 0); - queue_setting_update(exec_ctx, t, - GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 0); + queue_setting_update(t, GRPC_CHTTP2_SETTINGS_ENABLE_PUSH, 0); + queue_setting_update(t, GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 0); } - queue_setting_update(exec_ctx, t, GRPC_CHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE, + queue_setting_update(t, GRPC_CHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE, DEFAULT_MAX_HEADER_LIST_SIZE); - queue_setting_update(exec_ctx, t, - GRPC_CHTTP2_SETTINGS_GRPC_ALLOW_TRUE_BINARY_METADATA, 1); + queue_setting_update(t, GRPC_CHTTP2_SETTINGS_GRPC_ALLOW_TRUE_BINARY_METADATA, + 1); t->ping_policy.max_pings_without_data = g_default_max_pings_without_data; t->ping_policy.min_sent_ping_interval_without_data = @@ -533,7 +501,7 @@ static void init_transport(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, int value = grpc_channel_arg_get_integer( &channel_args->args[i], settings_map[j].integer_options); if (value >= 0) { - queue_setting_update(exec_ctx, t, settings_map[j].setting_id, + queue_setting_update(t, settings_map[j].setting_id, (uint32_t)value); } } @@ -544,7 +512,7 @@ static void init_transport(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, } } - t->flow_control.Init(exec_ctx, t, enable_bdp); + t->flow_control.Init(t, enable_bdp); /* No pings allowed before receiving a header or data frame. */ t->ping_state.pings_before_data_required = 0; @@ -558,8 +526,8 @@ static void init_transport(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, if (t->keepalive_time != GRPC_MILLIS_INF_FUTURE) { t->keepalive_state = GRPC_CHTTP2_KEEPALIVE_STATE_WAITING; GRPC_CHTTP2_REF_TRANSPORT(t, "init keepalive ping"); - grpc_timer_init(exec_ctx, &t->keepalive_ping_timer, - grpc_exec_ctx_now(exec_ctx) + t->keepalive_time, + grpc_timer_init(&t->keepalive_ping_timer, + grpc_core::ExecCtx::Get()->Now() + t->keepalive_time, &t->init_keepalive_ping_locked); } else { /* Use GRPC_CHTTP2_KEEPALIVE_STATE_DISABLED to indicate there are no @@ -569,42 +537,37 @@ static void init_transport(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, if (enable_bdp) { GRPC_CHTTP2_REF_TRANSPORT(t, "bdp_ping"); - schedule_bdp_ping_locked(exec_ctx, t); + schedule_bdp_ping_locked(t); - grpc_chttp2_act_on_flowctl_action( - exec_ctx, t->flow_control->PeriodicUpdate(exec_ctx), t, nullptr); + grpc_chttp2_act_on_flowctl_action(t->flow_control->PeriodicUpdate(), t, + nullptr); } - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_INITIAL_WRITE); - post_benign_reclaimer(exec_ctx, t); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_INITIAL_WRITE); + post_benign_reclaimer(t); } -static void destroy_transport_locked(grpc_exec_ctx* exec_ctx, void* tp, - grpc_error* error) { +static void destroy_transport_locked(void* tp, grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)tp; t->destroying = 1; close_transport_locked( - exec_ctx, t, - grpc_error_set_int( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Transport destroyed"), - GRPC_ERROR_INT_OCCURRED_DURING_WRITE, t->write_state)); - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "destroy"); + t, grpc_error_set_int( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Transport destroyed"), + GRPC_ERROR_INT_OCCURRED_DURING_WRITE, t->write_state)); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "destroy"); } -static void destroy_transport(grpc_exec_ctx* exec_ctx, grpc_transport* gt) { +static void destroy_transport(grpc_transport* gt) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)gt; - GRPC_CLOSURE_SCHED(exec_ctx, - GRPC_CLOSURE_CREATE(destroy_transport_locked, t, + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(destroy_transport_locked, t, grpc_combiner_scheduler(t->combiner)), GRPC_ERROR_NONE); } -static void close_transport_locked(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +static void close_transport_locked(grpc_chttp2_transport* t, grpc_error* error) { - end_all_the_calls(exec_ctx, t, GRPC_ERROR_REF(error)); - cancel_pings(exec_ctx, t, GRPC_ERROR_REF(error)); + end_all_the_calls(t, GRPC_ERROR_REF(error)); + cancel_pings(t, GRPC_ERROR_REF(error)); if (t->closed_with_error == GRPC_ERROR_NONE) { if (!grpc_error_has_clear_grpc_status(error)) { error = grpc_error_set_int(error, GRPC_ERROR_INT_GRPC_STATUS, @@ -622,21 +585,21 @@ static void close_transport_locked(grpc_exec_ctx* exec_ctx, } GPR_ASSERT(error != GRPC_ERROR_NONE); t->closed_with_error = GRPC_ERROR_REF(error); - connectivity_state_set(exec_ctx, t, GRPC_CHANNEL_SHUTDOWN, - GRPC_ERROR_REF(error), "close_transport"); + connectivity_state_set(t, GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_REF(error), + "close_transport"); if (t->ping_state.is_delayed_ping_timer_set) { - grpc_timer_cancel(exec_ctx, &t->ping_state.delayed_ping_timer); + grpc_timer_cancel(&t->ping_state.delayed_ping_timer); } if (t->have_next_bdp_ping_timer) { - grpc_timer_cancel(exec_ctx, &t->next_bdp_ping_timer); + grpc_timer_cancel(&t->next_bdp_ping_timer); } switch (t->keepalive_state) { case GRPC_CHTTP2_KEEPALIVE_STATE_WAITING: - grpc_timer_cancel(exec_ctx, &t->keepalive_ping_timer); + grpc_timer_cancel(&t->keepalive_ping_timer); break; case GRPC_CHTTP2_KEEPALIVE_STATE_PINGING: - grpc_timer_cancel(exec_ctx, &t->keepalive_ping_timer); - grpc_timer_cancel(exec_ctx, &t->keepalive_watchdog_timer); + grpc_timer_cancel(&t->keepalive_ping_timer); + grpc_timer_cancel(&t->keepalive_watchdog_timer); break; case GRPC_CHTTP2_KEEPALIVE_STATE_DYING: case GRPC_CHTTP2_KEEPALIVE_STATE_DISABLED: @@ -647,14 +610,13 @@ static void close_transport_locked(grpc_exec_ctx* exec_ctx, /* flush writable stream list to avoid dangling references */ grpc_chttp2_stream* s; while (grpc_chttp2_list_pop_writable_stream(t, &s)) { - GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "chttp2_writing:close"); + GRPC_CHTTP2_STREAM_UNREF(s, "chttp2_writing:close"); } GPR_ASSERT(t->write_state == GRPC_CHTTP2_WRITE_STATE_IDLE); - grpc_endpoint_shutdown(exec_ctx, t->ep, GRPC_ERROR_REF(error)); + grpc_endpoint_shutdown(t->ep, GRPC_ERROR_REF(error)); } if (t->notify_on_receive_settings != nullptr) { - GRPC_CLOSURE_SCHED(exec_ctx, t->notify_on_receive_settings, - GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(t->notify_on_receive_settings, GRPC_ERROR_CANCELLED); t->notify_on_receive_settings = nullptr; } GRPC_ERROR_UNREF(error); @@ -664,22 +626,21 @@ static void close_transport_locked(grpc_exec_ctx* exec_ctx, void grpc_chttp2_stream_ref(grpc_chttp2_stream* s, const char* reason) { grpc_stream_ref(s->refcount, reason); } -void grpc_chttp2_stream_unref(grpc_exec_ctx* exec_ctx, grpc_chttp2_stream* s, - const char* reason) { - grpc_stream_unref(exec_ctx, s->refcount, reason); +void grpc_chttp2_stream_unref(grpc_chttp2_stream* s, const char* reason) { + grpc_stream_unref(s->refcount, reason); } #else void grpc_chttp2_stream_ref(grpc_chttp2_stream* s) { grpc_stream_ref(s->refcount); } -void grpc_chttp2_stream_unref(grpc_exec_ctx* exec_ctx, grpc_chttp2_stream* s) { - grpc_stream_unref(exec_ctx, s->refcount); +void grpc_chttp2_stream_unref(grpc_chttp2_stream* s) { + grpc_stream_unref(s->refcount); } #endif -static int init_stream(grpc_exec_ctx* exec_ctx, grpc_transport* gt, - grpc_stream* gs, grpc_stream_refcount* refcount, - const void* server_data, gpr_arena* arena) { +static int init_stream(grpc_transport* gt, grpc_stream* gs, + grpc_stream_refcount* refcount, const void* server_data, + gpr_arena* arena) { GPR_TIMER_BEGIN("init_stream", 0); grpc_chttp2_transport* t = (grpc_chttp2_transport*)gt; grpc_chttp2_stream* s = (grpc_chttp2_stream*)gs; @@ -713,7 +674,7 @@ static int init_stream(grpc_exec_ctx* exec_ctx, grpc_transport* gt, s->id = (uint32_t)(uintptr_t)server_data; *t->accepting_stream = s; grpc_chttp2_stream_map_add(&t->stream_map, s->id, s); - post_destructive_reclaimer(exec_ctx, t); + post_destructive_reclaimer(t); } s->flow_control.Init(t->flow_control.get(), s); @@ -722,8 +683,7 @@ static int init_stream(grpc_exec_ctx* exec_ctx, grpc_transport* gt, return 0; } -static void destroy_stream_locked(grpc_exec_ctx* exec_ctx, void* sp, - grpc_error* error) { +static void destroy_stream_locked(void* sp, grpc_error* error) { grpc_chttp2_stream* s = (grpc_chttp2_stream*)sp; grpc_chttp2_transport* t = s->t; @@ -734,11 +694,10 @@ static void destroy_stream_locked(grpc_exec_ctx* exec_ctx, void* sp, GPR_ASSERT(grpc_chttp2_stream_map_find(&t->stream_map, s->id) == nullptr); } - grpc_slice_buffer_destroy_internal(exec_ctx, - &s->unprocessed_incoming_frames_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &s->frame_storage); - grpc_slice_buffer_destroy_internal(exec_ctx, &s->compressed_data_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &s->decompressed_data_buffer); + grpc_slice_buffer_destroy_internal(&s->unprocessed_incoming_frames_buffer); + grpc_slice_buffer_destroy_internal(&s->frame_storage); + grpc_slice_buffer_destroy_internal(&s->compressed_data_buffer); + grpc_slice_buffer_destroy_internal(&s->decompressed_data_buffer); grpc_chttp2_list_remove_stalled_by_transport(t, s); grpc_chttp2_list_remove_stalled_by_stream(t, s); @@ -757,27 +716,24 @@ static void destroy_stream_locked(grpc_exec_ctx* exec_ctx, void* sp, GPR_ASSERT(s->recv_initial_metadata_ready == nullptr); GPR_ASSERT(s->recv_message_ready == nullptr); GPR_ASSERT(s->recv_trailing_metadata_finished == nullptr); - grpc_chttp2_data_parser_destroy(exec_ctx, &s->data_parser); - grpc_chttp2_incoming_metadata_buffer_destroy(exec_ctx, - &s->metadata_buffer[0]); - grpc_chttp2_incoming_metadata_buffer_destroy(exec_ctx, - &s->metadata_buffer[1]); - grpc_slice_buffer_destroy_internal(exec_ctx, &s->flow_controlled_buffer); + grpc_chttp2_data_parser_destroy(&s->data_parser); + grpc_chttp2_incoming_metadata_buffer_destroy(&s->metadata_buffer[0]); + grpc_chttp2_incoming_metadata_buffer_destroy(&s->metadata_buffer[1]); + grpc_slice_buffer_destroy_internal(&s->flow_controlled_buffer); GRPC_ERROR_UNREF(s->read_closed_error); GRPC_ERROR_UNREF(s->write_closed_error); GRPC_ERROR_UNREF(s->byte_stream_error); s->flow_control.Destroy(); - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "stream"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "stream"); GPR_TIMER_END("destroy_stream", 0); - GRPC_CLOSURE_SCHED(exec_ctx, s->destroy_stream_arg, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(s->destroy_stream_arg, GRPC_ERROR_NONE); } -static void destroy_stream(grpc_exec_ctx* exec_ctx, grpc_transport* gt, - grpc_stream* gs, +static void destroy_stream(grpc_transport* gt, grpc_stream* gs, grpc_closure* then_schedule_closure) { GPR_TIMER_BEGIN("destroy_stream", 0); grpc_chttp2_transport* t = (grpc_chttp2_transport*)gt; @@ -794,7 +750,6 @@ static void destroy_stream(grpc_exec_ctx* exec_ctx, grpc_transport* gt, s->destroy_stream_arg = then_schedule_closure; GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_INIT(&s->destroy_stream, destroy_stream_locked, s, grpc_combiner_scheduler(t->combiner)), GRPC_ERROR_NONE); @@ -806,8 +761,7 @@ grpc_chttp2_stream* grpc_chttp2_parsing_lookup_stream(grpc_chttp2_transport* t, return (grpc_chttp2_stream*)grpc_chttp2_stream_map_find(&t->stream_map, id); } -grpc_chttp2_stream* grpc_chttp2_parsing_accept_stream(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +grpc_chttp2_stream* grpc_chttp2_parsing_accept_stream(grpc_chttp2_transport* t, uint32_t id) { if (t->channel_callback.accept_stream == nullptr) { return nullptr; @@ -815,8 +769,7 @@ grpc_chttp2_stream* grpc_chttp2_parsing_accept_stream(grpc_exec_ctx* exec_ctx, grpc_chttp2_stream* accepting; GPR_ASSERT(t->accepting_stream == nullptr); t->accepting_stream = &accepting; - t->channel_callback.accept_stream(exec_ctx, - t->channel_callback.accept_stream_user_data, + t->channel_callback.accept_stream(t->channel_callback.accept_stream_user_data, &t->base, (void*)(uintptr_t)id); t->accepting_stream = nullptr; return accepting; @@ -838,7 +791,7 @@ static const char* write_state_name(grpc_chttp2_write_state st) { GPR_UNREACHABLE_CODE(return "UNKNOWN"); } -static void set_write_state(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, +static void set_write_state(grpc_chttp2_transport* t, grpc_chttp2_write_state st, const char* reason) { GRPC_CHTTP2_IF_TRACING(gpr_log(GPR_DEBUG, "W:%p %s state %s -> %s [%s]", t, t->is_client ? "CLIENT" : "SERVER", @@ -846,108 +799,100 @@ static void set_write_state(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, write_state_name(st), reason)); t->write_state = st; if (st == GRPC_CHTTP2_WRITE_STATE_IDLE) { - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &t->run_after_write); + GRPC_CLOSURE_LIST_SCHED(&t->run_after_write); if (t->close_transport_on_writes_finished != nullptr) { grpc_error* err = t->close_transport_on_writes_finished; t->close_transport_on_writes_finished = nullptr; - close_transport_locked(exec_ctx, t, err); + close_transport_locked(t, err); } } } static void inc_initiate_write_reason( - grpc_exec_ctx* exec_ctx, grpc_chttp2_initiate_write_reason reason) { + grpc_chttp2_initiate_write_reason reason) { switch (reason) { case GRPC_CHTTP2_INITIATE_WRITE_INITIAL_WRITE: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_INITIAL_WRITE(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_INITIAL_WRITE(); break; case GRPC_CHTTP2_INITIATE_WRITE_START_NEW_STREAM: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_START_NEW_STREAM(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_START_NEW_STREAM(); break; case GRPC_CHTTP2_INITIATE_WRITE_SEND_MESSAGE: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_MESSAGE(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_MESSAGE(); break; case GRPC_CHTTP2_INITIATE_WRITE_SEND_INITIAL_METADATA: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_INITIAL_METADATA( - exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_INITIAL_METADATA(); break; case GRPC_CHTTP2_INITIATE_WRITE_SEND_TRAILING_METADATA: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_TRAILING_METADATA( - exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_TRAILING_METADATA(); break; case GRPC_CHTTP2_INITIATE_WRITE_RETRY_SEND_PING: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RETRY_SEND_PING(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RETRY_SEND_PING(); break; case GRPC_CHTTP2_INITIATE_WRITE_CONTINUE_PINGS: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CONTINUE_PINGS(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CONTINUE_PINGS(); break; case GRPC_CHTTP2_INITIATE_WRITE_GOAWAY_SENT: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_GOAWAY_SENT(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_GOAWAY_SENT(); break; case GRPC_CHTTP2_INITIATE_WRITE_RST_STREAM: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RST_STREAM(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RST_STREAM(); break; case GRPC_CHTTP2_INITIATE_WRITE_CLOSE_FROM_API: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CLOSE_FROM_API(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CLOSE_FROM_API(); break; case GRPC_CHTTP2_INITIATE_WRITE_STREAM_FLOW_CONTROL: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_STREAM_FLOW_CONTROL(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_STREAM_FLOW_CONTROL(); break; case GRPC_CHTTP2_INITIATE_WRITE_TRANSPORT_FLOW_CONTROL: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL( - exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL(); break; case GRPC_CHTTP2_INITIATE_WRITE_SEND_SETTINGS: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_SETTINGS(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_SETTINGS(); break; case GRPC_CHTTP2_INITIATE_WRITE_FLOW_CONTROL_UNSTALLED_BY_SETTING: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_SETTING( - exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_SETTING(); break; case GRPC_CHTTP2_INITIATE_WRITE_FLOW_CONTROL_UNSTALLED_BY_UPDATE: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_UPDATE( - exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_UPDATE(); break; case GRPC_CHTTP2_INITIATE_WRITE_APPLICATION_PING: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_APPLICATION_PING(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_APPLICATION_PING(); break; case GRPC_CHTTP2_INITIATE_WRITE_KEEPALIVE_PING: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_KEEPALIVE_PING(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_KEEPALIVE_PING(); break; case GRPC_CHTTP2_INITIATE_WRITE_TRANSPORT_FLOW_CONTROL_UNSTALLED: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL_UNSTALLED( - exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL_UNSTALLED(); break; case GRPC_CHTTP2_INITIATE_WRITE_PING_RESPONSE: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_PING_RESPONSE(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_PING_RESPONSE(); break; case GRPC_CHTTP2_INITIATE_WRITE_FORCE_RST_STREAM: - GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FORCE_RST_STREAM(exec_ctx); + GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FORCE_RST_STREAM(); break; } } -void grpc_chttp2_initiate_write(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +void grpc_chttp2_initiate_write(grpc_chttp2_transport* t, grpc_chttp2_initiate_write_reason reason) { GPR_TIMER_BEGIN("grpc_chttp2_initiate_write", 0); switch (t->write_state) { case GRPC_CHTTP2_WRITE_STATE_IDLE: - inc_initiate_write_reason(exec_ctx, reason); - set_write_state(exec_ctx, t, GRPC_CHTTP2_WRITE_STATE_WRITING, + inc_initiate_write_reason(reason); + set_write_state(t, GRPC_CHTTP2_WRITE_STATE_WRITING, grpc_chttp2_initiate_write_reason_string(reason)); t->is_first_write_in_batch = true; GRPC_CHTTP2_REF_TRANSPORT(t, "writing"); GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_INIT(&t->write_action_begin_locked, write_action_begin_locked, t, grpc_combiner_finally_scheduler(t->combiner)), GRPC_ERROR_NONE); break; case GRPC_CHTTP2_WRITE_STATE_WRITING: - set_write_state(exec_ctx, t, GRPC_CHTTP2_WRITE_STATE_WRITING_WITH_MORE, + set_write_state(t, GRPC_CHTTP2_WRITE_STATE_WRITING_WITH_MORE, grpc_chttp2_initiate_write_reason_string(reason)); break; case GRPC_CHTTP2_WRITE_STATE_WRITING_WITH_MORE: @@ -956,8 +901,7 @@ void grpc_chttp2_initiate_write(grpc_exec_ctx* exec_ctx, GPR_TIMER_END("grpc_chttp2_initiate_write", 0); } -void grpc_chttp2_mark_stream_writable(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +void grpc_chttp2_mark_stream_writable(grpc_chttp2_transport* t, grpc_chttp2_stream* s) { if (t->closed_with_error == GRPC_ERROR_NONE && grpc_chttp2_list_add_writable_stream(t, s)) { @@ -1007,8 +951,7 @@ static const char* begin_writing_desc(bool partial, bool inlined) { GPR_UNREACHABLE_CODE(return "bad state tuple"); } -static void write_action_begin_locked(grpc_exec_ctx* exec_ctx, void* gt, - grpc_error* error_ignored) { +static void write_action_begin_locked(void* gt, grpc_error* error_ignored) { GPR_TIMER_BEGIN("write_action_begin_locked", 0); grpc_chttp2_transport* t = (grpc_chttp2_transport*)gt; GPR_ASSERT(t->write_state != GRPC_CHTTP2_WRITE_STATE_IDLE); @@ -1016,62 +959,59 @@ static void write_action_begin_locked(grpc_exec_ctx* exec_ctx, void* gt, if (t->closed_with_error != GRPC_ERROR_NONE) { r.writing = false; } else { - r = grpc_chttp2_begin_write(exec_ctx, t); + r = grpc_chttp2_begin_write(t); } if (r.writing) { if (r.partial) { - GRPC_STATS_INC_HTTP2_PARTIAL_WRITES(exec_ctx); + GRPC_STATS_INC_HTTP2_PARTIAL_WRITES(); } if (!t->is_first_write_in_batch) { - GRPC_STATS_INC_HTTP2_WRITES_CONTINUED(exec_ctx); + GRPC_STATS_INC_HTTP2_WRITES_CONTINUED(); } grpc_closure_scheduler* scheduler = write_scheduler(t, r.early_results_scheduled, r.partial); if (scheduler != grpc_schedule_on_exec_ctx) { - GRPC_STATS_INC_HTTP2_WRITES_OFFLOADED(exec_ctx); + GRPC_STATS_INC_HTTP2_WRITES_OFFLOADED(); } set_write_state( - exec_ctx, t, + t, r.partial ? GRPC_CHTTP2_WRITE_STATE_WRITING_WITH_MORE : GRPC_CHTTP2_WRITE_STATE_WRITING, begin_writing_desc(r.partial, scheduler == grpc_schedule_on_exec_ctx)); GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_INIT(&t->write_action, write_action, t, scheduler), GRPC_ERROR_NONE); } else { - GRPC_STATS_INC_HTTP2_SPURIOUS_WRITES_BEGUN(exec_ctx); - set_write_state(exec_ctx, t, GRPC_CHTTP2_WRITE_STATE_IDLE, - "begin writing nothing"); - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "writing"); + GRPC_STATS_INC_HTTP2_SPURIOUS_WRITES_BEGUN(); + set_write_state(t, GRPC_CHTTP2_WRITE_STATE_IDLE, "begin writing nothing"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "writing"); } GPR_TIMER_END("write_action_begin_locked", 0); } -static void write_action(grpc_exec_ctx* exec_ctx, void* gt, grpc_error* error) { +static void write_action(void* gt, grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)gt; GPR_TIMER_BEGIN("write_action", 0); grpc_endpoint_write( - exec_ctx, t->ep, &t->outbuf, + t->ep, &t->outbuf, GRPC_CLOSURE_INIT(&t->write_action_end_locked, write_action_end_locked, t, grpc_combiner_scheduler(t->combiner))); GPR_TIMER_END("write_action", 0); } -static void write_action_end_locked(grpc_exec_ctx* exec_ctx, void* tp, - grpc_error* error) { +static void write_action_end_locked(void* tp, grpc_error* error) { GPR_TIMER_BEGIN("terminate_writing_with_lock", 0); grpc_chttp2_transport* t = (grpc_chttp2_transport*)tp; if (error != GRPC_ERROR_NONE) { - close_transport_locked(exec_ctx, t, GRPC_ERROR_REF(error)); + close_transport_locked(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_FROM_STATIC_STRING("goaway sent")); + t, GRPC_ERROR_CREATE_FROM_STATIC_STRING("goaway sent")); } } @@ -1080,17 +1020,14 @@ static void write_action_end_locked(grpc_exec_ctx* exec_ctx, void* tp, GPR_UNREACHABLE_CODE(break); case GRPC_CHTTP2_WRITE_STATE_WRITING: GPR_TIMER_MARK("state=writing", 0); - set_write_state(exec_ctx, t, GRPC_CHTTP2_WRITE_STATE_IDLE, - "finish writing"); + set_write_state(t, GRPC_CHTTP2_WRITE_STATE_IDLE, "finish writing"); break; case GRPC_CHTTP2_WRITE_STATE_WRITING_WITH_MORE: GPR_TIMER_MARK("state=writing_stale_no_poller", 0); - set_write_state(exec_ctx, t, GRPC_CHTTP2_WRITE_STATE_WRITING, - "continue writing"); + set_write_state(t, GRPC_CHTTP2_WRITE_STATE_WRITING, "continue writing"); t->is_first_write_in_batch = false; GRPC_CHTTP2_REF_TRANSPORT(t, "writing"); GRPC_CLOSURE_RUN( - exec_ctx, GRPC_CLOSURE_INIT(&t->write_action_begin_locked, write_action_begin_locked, t, grpc_combiner_finally_scheduler(t->combiner)), @@ -1098,16 +1035,15 @@ static void write_action_end_locked(grpc_exec_ctx* exec_ctx, void* tp, break; } - grpc_chttp2_end_write(exec_ctx, t, GRPC_ERROR_REF(error)); + grpc_chttp2_end_write(t, GRPC_ERROR_REF(error)); - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "writing"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "writing"); GPR_TIMER_END("terminate_writing_with_lock", 0); } // Dirties an HTTP2 setting to be sent out next time a writing path occurs. // If the change needs to occur immediately, manually initiate a write. -static void queue_setting_update(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +static void queue_setting_update(grpc_chttp2_transport* t, grpc_chttp2_setting_id id, uint32_t value) { const grpc_chttp2_setting_parameters* sp = &grpc_chttp2_settings_parameters[id]; @@ -1122,8 +1058,7 @@ static void queue_setting_update(grpc_exec_ctx* exec_ctx, } } -void grpc_chttp2_add_incoming_goaway(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +void grpc_chttp2_add_incoming_goaway(grpc_chttp2_transport* t, uint32_t goaway_error, grpc_slice goaway_text) { // GRPC_CHTTP2_IF_TRACING( @@ -1158,12 +1093,11 @@ void grpc_chttp2_add_incoming_goaway(grpc_exec_ctx* exec_ctx, /* lie: use transient failure from the transport to indicate goaway has been * received */ - connectivity_state_set(exec_ctx, t, GRPC_CHANNEL_TRANSIENT_FAILURE, + connectivity_state_set(t, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_REF(t->goaway_error), "got_goaway"); } -static void maybe_start_some_streams(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t) { +static void maybe_start_some_streams(grpc_chttp2_transport* t) { grpc_chttp2_stream* s; /* start streams where we have free grpc_chttp2_stream ids and free * concurrency */ @@ -1183,22 +1117,21 @@ static void maybe_start_some_streams(grpc_exec_ctx* exec_ctx, if (t->next_stream_id >= MAX_CLIENT_STREAM_ID) { connectivity_state_set( - exec_ctx, t, GRPC_CHANNEL_TRANSIENT_FAILURE, + t, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Stream IDs exhausted"), "no_more_stream_ids"); } grpc_chttp2_stream_map_add(&t->stream_map, s->id, s); - post_destructive_reclaimer(exec_ctx, t); - grpc_chttp2_mark_stream_writable(exec_ctx, t, s); - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_START_NEW_STREAM); + post_destructive_reclaimer(t); + grpc_chttp2_mark_stream_writable(t, s); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_START_NEW_STREAM); } /* cancel out streams that will never be started */ while (t->next_stream_id >= MAX_CLIENT_STREAM_ID && grpc_chttp2_list_pop_waiting_for_concurrency(t, &s)) { grpc_chttp2_cancel_stream( - exec_ctx, t, s, + t, s, grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Stream IDs exhausted"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE)); @@ -1220,15 +1153,13 @@ static grpc_closure* add_closure_barrier(grpc_closure* closure) { return closure; } -static void null_then_run_closure(grpc_exec_ctx* exec_ctx, - grpc_closure** closure, grpc_error* error) { +static void null_then_run_closure(grpc_closure** closure, grpc_error* error) { grpc_closure* c = *closure; *closure = nullptr; - GRPC_CLOSURE_RUN(exec_ctx, c, error); + GRPC_CLOSURE_RUN(c, error); } -void grpc_chttp2_complete_closure_step(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_closure** pclosure, grpc_error* error, const char* desc) { @@ -1268,7 +1199,7 @@ void grpc_chttp2_complete_closure_step(grpc_exec_ctx* exec_ctx, } if ((t->write_state == GRPC_CHTTP2_WRITE_STATE_IDLE) || !(closure->next_data.scratch & CLOSURE_BARRIER_MAY_COVER_WRITE)) { - GRPC_CLOSURE_RUN(exec_ctx, closure, closure->error_data.error); + GRPC_CLOSURE_RUN(closure, closure->error_data.error); } else { grpc_closure_list_append(&t->run_after_write, closure, closure->error_data.error); @@ -1284,28 +1215,24 @@ static bool contains_non_ok_status(grpc_metadata_batch* batch) { return false; } -static void maybe_become_writable_due_to_send_msg(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +static void maybe_become_writable_due_to_send_msg(grpc_chttp2_transport* t, grpc_chttp2_stream* s) { if (s->id != 0 && (!s->write_buffering || s->flow_controlled_buffer.length > t->write_buffer_size)) { - grpc_chttp2_mark_stream_writable(exec_ctx, t, s); - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_SEND_MESSAGE); + grpc_chttp2_mark_stream_writable(t, s); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_SEND_MESSAGE); } } -static void add_fetched_slice_locked(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +static void add_fetched_slice_locked(grpc_chttp2_transport* t, grpc_chttp2_stream* s) { s->fetched_send_message_length += (uint32_t)GRPC_SLICE_LENGTH(s->fetching_slice); grpc_slice_buffer_add(&s->flow_controlled_buffer, s->fetching_slice); - maybe_become_writable_due_to_send_msg(exec_ctx, t, s); + maybe_become_writable_due_to_send_msg(t, s); } -static void continue_fetching_send_locked(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +static void continue_fetching_send_locked(grpc_chttp2_transport* t, grpc_chttp2_stream* s) { for (;;) { if (s->fetching_send_message == nullptr) { @@ -1314,11 +1241,11 @@ static void continue_fetching_send_locked(grpc_exec_ctx* exec_ctx, return; /* early out */ } if (s->fetched_send_message_length == s->fetching_send_message->length) { - grpc_byte_stream_destroy(exec_ctx, s->fetching_send_message); + grpc_byte_stream_destroy(s->fetching_send_message); int64_t notify_offset = s->next_message_end_offset; if (notify_offset <= s->flow_controlled_bytes_written) { grpc_chttp2_complete_closure_step( - exec_ctx, t, s, &s->fetching_send_message_finished, GRPC_ERROR_NONE, + t, s, &s->fetching_send_message_finished, GRPC_ERROR_NONE, "fetching_send_message_finished"); } else { grpc_chttp2_write_cb* cb = t->write_cb_pool; @@ -1339,39 +1266,37 @@ static void continue_fetching_send_locked(grpc_exec_ctx* exec_ctx, } s->fetching_send_message = nullptr; return; /* early out */ - } else if (grpc_byte_stream_next(exec_ctx, s->fetching_send_message, - UINT32_MAX, &s->complete_fetch_locked)) { - grpc_error* error = grpc_byte_stream_pull( - exec_ctx, s->fetching_send_message, &s->fetching_slice); + } else if (grpc_byte_stream_next(s->fetching_send_message, UINT32_MAX, + &s->complete_fetch_locked)) { + grpc_error* error = + grpc_byte_stream_pull(s->fetching_send_message, &s->fetching_slice); if (error != GRPC_ERROR_NONE) { - grpc_byte_stream_destroy(exec_ctx, s->fetching_send_message); - grpc_chttp2_cancel_stream(exec_ctx, t, s, error); + grpc_byte_stream_destroy(s->fetching_send_message); + grpc_chttp2_cancel_stream(t, s, error); } else { - add_fetched_slice_locked(exec_ctx, t, s); + add_fetched_slice_locked(t, s); } } } } -static void complete_fetch_locked(grpc_exec_ctx* exec_ctx, void* gs, - grpc_error* error) { +static void complete_fetch_locked(void* gs, grpc_error* error) { grpc_chttp2_stream* s = (grpc_chttp2_stream*)gs; grpc_chttp2_transport* t = s->t; if (error == GRPC_ERROR_NONE) { - error = grpc_byte_stream_pull(exec_ctx, s->fetching_send_message, - &s->fetching_slice); + error = grpc_byte_stream_pull(s->fetching_send_message, &s->fetching_slice); if (error == GRPC_ERROR_NONE) { - add_fetched_slice_locked(exec_ctx, t, s); - continue_fetching_send_locked(exec_ctx, t, s); + add_fetched_slice_locked(t, s); + continue_fetching_send_locked(t, s); } } if (error != GRPC_ERROR_NONE) { - grpc_byte_stream_destroy(exec_ctx, s->fetching_send_message); - grpc_chttp2_cancel_stream(exec_ctx, t, s, error); + grpc_byte_stream_destroy(s->fetching_send_message); + grpc_chttp2_cancel_stream(t, s, error); } } -static void do_nothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} +static void do_nothing(void* arg, grpc_error* error) {} static void log_metadata(const grpc_metadata_batch* md_batch, uint32_t id, bool is_client, bool is_initial) { @@ -1386,7 +1311,7 @@ static void log_metadata(const grpc_metadata_batch* md_batch, uint32_t id, } } -static void perform_stream_op_locked(grpc_exec_ctx* exec_ctx, void* stream_op, +static void perform_stream_op_locked(void* stream_op, grpc_error* error_ignored) { GPR_TIMER_BEGIN("perform_stream_op_locked", 0); @@ -1396,7 +1321,7 @@ static void perform_stream_op_locked(grpc_exec_ctx* exec_ctx, void* stream_op, grpc_transport_stream_op_batch_payload* op_payload = op->payload; grpc_chttp2_transport* t = s->t; - GRPC_STATS_INC_HTTP2_OP_BATCHES(exec_ctx); + GRPC_STATS_INC_HTTP2_OP_BATCHES(); if (grpc_http_trace.enabled()) { char* str = grpc_transport_stream_op_batch_string(op); @@ -1431,13 +1356,12 @@ static void perform_stream_op_locked(grpc_exec_ctx* exec_ctx, void* stream_op, } if (op->cancel_stream) { - GRPC_STATS_INC_HTTP2_OP_CANCEL(exec_ctx); - grpc_chttp2_cancel_stream(exec_ctx, t, s, - op_payload->cancel_stream.cancel_error); + GRPC_STATS_INC_HTTP2_OP_CANCEL(); + grpc_chttp2_cancel_stream(t, s, op_payload->cancel_stream.cancel_error); } if (op->send_initial_metadata) { - GRPC_STATS_INC_HTTP2_OP_SEND_INITIAL_METADATA(exec_ctx); + GRPC_STATS_INC_HTTP2_OP_SEND_INITIAL_METADATA(); GPR_ASSERT(s->send_initial_metadata_finished == nullptr); on_complete->next_data.scratch |= CLOSURE_BARRIER_MAY_COVER_WRITE; @@ -1465,7 +1389,7 @@ static void perform_stream_op_locked(grpc_exec_ctx* exec_ctx, void* stream_op, } if (metadata_size > metadata_peer_limit) { grpc_chttp2_cancel_stream( - exec_ctx, t, s, + t, s, grpc_error_set_int( grpc_error_set_int( grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING( @@ -1484,10 +1408,10 @@ static void perform_stream_op_locked(grpc_exec_ctx* exec_ctx, void* stream_op, if (t->closed_with_error == GRPC_ERROR_NONE) { GPR_ASSERT(s->id == 0); grpc_chttp2_list_add_waiting_for_concurrency(t, s); - maybe_start_some_streams(exec_ctx, t); + maybe_start_some_streams(t); } else { grpc_chttp2_cancel_stream( - exec_ctx, t, s, + t, s, grpc_error_set_int( GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Transport closed", &t->closed_with_error, 1), @@ -1495,18 +1419,18 @@ static void perform_stream_op_locked(grpc_exec_ctx* exec_ctx, void* stream_op, } } else { GPR_ASSERT(s->id != 0); - grpc_chttp2_mark_stream_writable(exec_ctx, t, s); + grpc_chttp2_mark_stream_writable(t, s); if (!(op->send_message && (op->payload->send_message.send_message->flags & GRPC_WRITE_BUFFER_HINT))) { grpc_chttp2_initiate_write( - exec_ctx, t, GRPC_CHTTP2_INITIATE_WRITE_SEND_INITIAL_METADATA); + t, GRPC_CHTTP2_INITIATE_WRITE_SEND_INITIAL_METADATA); } } } else { s->send_initial_metadata = nullptr; grpc_chttp2_complete_closure_step( - exec_ctx, t, s, &s->send_initial_metadata_finished, + t, s, &s->send_initial_metadata_finished, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Attempt to send initial metadata after stream was closed", &s->write_closed_error, 1), @@ -1520,9 +1444,9 @@ static void perform_stream_op_locked(grpc_exec_ctx* exec_ctx, void* stream_op, } if (op->send_message) { - GRPC_STATS_INC_HTTP2_OP_SEND_MESSAGE(exec_ctx); + GRPC_STATS_INC_HTTP2_OP_SEND_MESSAGE(); GRPC_STATS_INC_HTTP2_SEND_MESSAGE_SIZE( - exec_ctx, op->payload->send_message.send_message->length); + op->payload->send_message.send_message->length); on_complete->next_data.scratch |= CLOSURE_BARRIER_MAY_COVER_WRITE; s->fetching_send_message_finished = add_closure_barrier(op->on_complete); if (s->write_closed) { @@ -1532,7 +1456,7 @@ static void perform_stream_op_locked(grpc_exec_ctx* exec_ctx, void* stream_op, // recv_message failure, breaking out of its loop, and then // starting recv_trailing_metadata. grpc_chttp2_complete_closure_step( - exec_ctx, t, s, &s->fetching_send_message_finished, + t, s, &s->fetching_send_message_finished, t->is_client && s->received_trailing_metadata ? GRPC_ERROR_NONE : GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( @@ -1561,13 +1485,13 @@ static void perform_stream_op_locked(grpc_exec_ctx* exec_ctx, void* stream_op, } else { s->write_buffering = false; } - continue_fetching_send_locked(exec_ctx, t, s); - maybe_become_writable_due_to_send_msg(exec_ctx, t, s); + continue_fetching_send_locked(t, s); + maybe_become_writable_due_to_send_msg(t, s); } } if (op->send_trailing_metadata) { - GRPC_STATS_INC_HTTP2_OP_SEND_TRAILING_METADATA(exec_ctx); + GRPC_STATS_INC_HTTP2_OP_SEND_TRAILING_METADATA(); GPR_ASSERT(s->send_trailing_metadata_finished == nullptr); on_complete->next_data.scratch |= CLOSURE_BARRIER_MAY_COVER_WRITE; s->send_trailing_metadata_finished = add_closure_barrier(on_complete); @@ -1581,7 +1505,7 @@ static void perform_stream_op_locked(grpc_exec_ctx* exec_ctx, void* stream_op, [GRPC_CHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE]; if (metadata_size > metadata_peer_limit) { grpc_chttp2_cancel_stream( - exec_ctx, t, s, + t, s, grpc_error_set_int( grpc_error_set_int( grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING( @@ -1598,7 +1522,7 @@ static void perform_stream_op_locked(grpc_exec_ctx* exec_ctx, void* stream_op, if (s->write_closed) { s->send_trailing_metadata = nullptr; grpc_chttp2_complete_closure_step( - exec_ctx, t, s, &s->send_trailing_metadata_finished, + t, s, &s->send_trailing_metadata_finished, grpc_metadata_batch_is_empty( op->payload->send_trailing_metadata.send_trailing_metadata) ? GRPC_ERROR_NONE @@ -1609,15 +1533,15 @@ static void perform_stream_op_locked(grpc_exec_ctx* exec_ctx, void* stream_op, } else if (s->id != 0) { /* TODO(ctiller): check if there's flow control for any outstanding bytes before going writable */ - grpc_chttp2_mark_stream_writable(exec_ctx, t, s); + grpc_chttp2_mark_stream_writable(t, s); grpc_chttp2_initiate_write( - exec_ctx, t, GRPC_CHTTP2_INITIATE_WRITE_SEND_TRAILING_METADATA); + t, GRPC_CHTTP2_INITIATE_WRITE_SEND_TRAILING_METADATA); } } } if (op->recv_initial_metadata) { - GRPC_STATS_INC_HTTP2_OP_RECV_INITIAL_METADATA(exec_ctx); + GRPC_STATS_INC_HTTP2_OP_RECV_INITIAL_METADATA(); GPR_ASSERT(s->recv_initial_metadata_ready == nullptr); s->recv_initial_metadata_ready = op_payload->recv_initial_metadata.recv_initial_metadata_ready; @@ -1629,11 +1553,11 @@ static void perform_stream_op_locked(grpc_exec_ctx* exec_ctx, void* stream_op, gpr_atm_rel_store(op_payload->recv_initial_metadata.peer_string, (gpr_atm)gpr_strdup(t->peer_string)); } - grpc_chttp2_maybe_complete_recv_initial_metadata(exec_ctx, t, s); + grpc_chttp2_maybe_complete_recv_initial_metadata(t, s); } if (op->recv_message) { - GRPC_STATS_INC_HTTP2_OP_RECV_MESSAGE(exec_ctx); + GRPC_STATS_INC_HTTP2_OP_RECV_MESSAGE(); size_t already_received; GPR_ASSERT(s->recv_message_ready == nullptr); GPR_ASSERT(!s->pending_byte_stream); @@ -1644,32 +1568,30 @@ static void perform_stream_op_locked(grpc_exec_ctx* exec_ctx, void* stream_op, already_received = s->frame_storage.length; s->flow_control->IncomingByteStreamUpdate(GRPC_HEADER_SIZE_IN_BYTES, already_received); - grpc_chttp2_act_on_flowctl_action(exec_ctx, - s->flow_control->MakeAction(), t, s); + grpc_chttp2_act_on_flowctl_action(s->flow_control->MakeAction(), t, s); } } - grpc_chttp2_maybe_complete_recv_message(exec_ctx, t, s); + grpc_chttp2_maybe_complete_recv_message(t, s); } if (op->recv_trailing_metadata) { - GRPC_STATS_INC_HTTP2_OP_RECV_TRAILING_METADATA(exec_ctx); + GRPC_STATS_INC_HTTP2_OP_RECV_TRAILING_METADATA(); GPR_ASSERT(s->recv_trailing_metadata_finished == nullptr); s->recv_trailing_metadata_finished = add_closure_barrier(on_complete); s->recv_trailing_metadata = op_payload->recv_trailing_metadata.recv_trailing_metadata; s->final_metadata_requested = true; - grpc_chttp2_maybe_complete_recv_trailing_metadata(exec_ctx, t, s); + grpc_chttp2_maybe_complete_recv_trailing_metadata(t, s); } - grpc_chttp2_complete_closure_step(exec_ctx, t, s, &on_complete, - GRPC_ERROR_NONE, "op->on_complete"); + grpc_chttp2_complete_closure_step(t, s, &on_complete, GRPC_ERROR_NONE, + "op->on_complete"); GPR_TIMER_END("perform_stream_op_locked", 0); - GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "perform_stream_op"); + GRPC_CHTTP2_STREAM_UNREF(s, "perform_stream_op"); } -static void perform_stream_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, - grpc_stream* gs, +static void perform_stream_op(grpc_transport* gt, grpc_stream* gs, grpc_transport_stream_op_batch* op) { GPR_TIMER_BEGIN("perform_stream_op", 0); grpc_chttp2_transport* t = (grpc_chttp2_transport*)gt; @@ -1697,32 +1619,29 @@ static void perform_stream_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, op->handler_private.extra_arg = gs; GRPC_CHTTP2_STREAM_REF(s, "perform_stream_op"); GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_INIT(&op->handler_private.closure, perform_stream_op_locked, op, grpc_combiner_scheduler(t->combiner)), GRPC_ERROR_NONE); GPR_TIMER_END("perform_stream_op", 0); } -static void cancel_pings(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, - grpc_error* error) { +static void cancel_pings(grpc_chttp2_transport* t, grpc_error* error) { /* callback remaining pings: they're not allowed to call into the transpot, and maybe they hold resources that need to be freed */ grpc_chttp2_ping_queue* pq = &t->ping_queue; GPR_ASSERT(error != GRPC_ERROR_NONE); for (size_t j = 0; j < GRPC_CHTTP2_PCL_COUNT; j++) { grpc_closure_list_fail_all(&pq->lists[j], GRPC_ERROR_REF(error)); - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pq->lists[j]); + GRPC_CLOSURE_LIST_SCHED(&pq->lists[j]); } GRPC_ERROR_UNREF(error); } -static void send_ping_locked(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, +static void send_ping_locked(grpc_chttp2_transport* t, grpc_closure* on_initiate, grpc_closure* on_ack) { if (t->closed_with_error != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(exec_ctx, on_initiate, - GRPC_ERROR_REF(t->closed_with_error)); - GRPC_CLOSURE_SCHED(exec_ctx, on_ack, GRPC_ERROR_REF(t->closed_with_error)); + GRPC_CLOSURE_SCHED(on_initiate, GRPC_ERROR_REF(t->closed_with_error)); + GRPC_CLOSURE_SCHED(on_ack, GRPC_ERROR_REF(t->closed_with_error)); return; } grpc_chttp2_ping_queue* pq = &t->ping_queue; @@ -1732,18 +1651,15 @@ static void send_ping_locked(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, GRPC_ERROR_NONE); } -static void retry_initiate_ping_locked(grpc_exec_ctx* exec_ctx, void* tp, - grpc_error* error) { +static void retry_initiate_ping_locked(void* tp, grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)tp; t->ping_state.is_delayed_ping_timer_set = false; if (error == GRPC_ERROR_NONE) { - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_RETRY_SEND_PING); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_RETRY_SEND_PING); } } -void grpc_chttp2_ack_ping(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, - uint64_t id) { +void grpc_chttp2_ack_ping(grpc_chttp2_transport* t, uint64_t id) { grpc_chttp2_ping_queue* pq = &t->ping_queue; if (pq->inflight_id != id) { char* from = grpc_endpoint_get_peer(t->ep); @@ -1751,54 +1667,48 @@ void grpc_chttp2_ack_ping(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, gpr_free(from); return; } - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pq->lists[GRPC_CHTTP2_PCL_INFLIGHT]); + GRPC_CLOSURE_LIST_SCHED(&pq->lists[GRPC_CHTTP2_PCL_INFLIGHT]); if (!grpc_closure_list_empty(pq->lists[GRPC_CHTTP2_PCL_NEXT])) { - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_CONTINUE_PINGS); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_CONTINUE_PINGS); } } -static void send_goaway(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, - grpc_error* error) { +static void send_goaway(grpc_chttp2_transport* t, grpc_error* error) { t->sent_goaway_state = GRPC_CHTTP2_GOAWAY_SEND_SCHEDULED; grpc_http2_error_code http_error; grpc_slice slice; - grpc_error_get_status(exec_ctx, error, GRPC_MILLIS_INF_FUTURE, nullptr, - &slice, &http_error, nullptr); + grpc_error_get_status(error, GRPC_MILLIS_INF_FUTURE, nullptr, &slice, + &http_error, nullptr); grpc_chttp2_goaway_append(t->last_new_stream_id, (uint32_t)http_error, grpc_slice_ref_internal(slice), &t->qbuf); - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_GOAWAY_SENT); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_GOAWAY_SENT); GRPC_ERROR_UNREF(error); } -void grpc_chttp2_add_ping_strike(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t) { +void grpc_chttp2_add_ping_strike(grpc_chttp2_transport* t) { t->ping_recv_state.ping_strikes++; if (++t->ping_recv_state.ping_strikes > t->ping_policy.max_ping_strikes && t->ping_policy.max_ping_strikes != 0) { - send_goaway(exec_ctx, t, + send_goaway(t, grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("too_many_pings"), GRPC_ERROR_INT_HTTP2_ERROR, GRPC_HTTP2_ENHANCE_YOUR_CALM)); /*The transport will be closed after the write is done */ close_transport_locked( - exec_ctx, t, - grpc_error_set_int( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Too many pings"), - GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE)); + t, grpc_error_set_int( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Too many pings"), + GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE)); } } -static void perform_transport_op_locked(grpc_exec_ctx* exec_ctx, - void* stream_op, +static void perform_transport_op_locked(void* stream_op, grpc_error* error_ignored) { grpc_transport_op* op = (grpc_transport_op*)stream_op; grpc_chttp2_transport* t = (grpc_chttp2_transport*)op->handler_private.extra_arg; if (op->goaway_error) { - send_goaway(exec_ctx, t, op->goaway_error); + send_goaway(t, op->goaway_error); } if (op->set_accept_stream) { @@ -1808,43 +1718,40 @@ static void perform_transport_op_locked(grpc_exec_ctx* exec_ctx, } if (op->bind_pollset) { - grpc_endpoint_add_to_pollset(exec_ctx, t->ep, op->bind_pollset); + grpc_endpoint_add_to_pollset(t->ep, op->bind_pollset); } if (op->bind_pollset_set) { - grpc_endpoint_add_to_pollset_set(exec_ctx, t->ep, op->bind_pollset_set); + grpc_endpoint_add_to_pollset_set(t->ep, op->bind_pollset_set); } if (op->send_ping) { - send_ping_locked(exec_ctx, t, nullptr, op->send_ping); - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_APPLICATION_PING); + send_ping_locked(t, nullptr, op->send_ping); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_APPLICATION_PING); } if (op->on_connectivity_state_change != nullptr) { grpc_connectivity_state_notify_on_state_change( - exec_ctx, &t->channel_callback.state_tracker, op->connectivity_state, + &t->channel_callback.state_tracker, op->connectivity_state, op->on_connectivity_state_change); } if (op->disconnect_with_error != GRPC_ERROR_NONE) { - close_transport_locked(exec_ctx, t, op->disconnect_with_error); + close_transport_locked(t, op->disconnect_with_error); } - GRPC_CLOSURE_RUN(exec_ctx, op->on_consumed, GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN(op->on_consumed, GRPC_ERROR_NONE); - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "transport_op"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "transport_op"); } -static void perform_transport_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, - grpc_transport_op* op) { +static void perform_transport_op(grpc_transport* gt, grpc_transport_op* op) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)gt; char* msg = grpc_transport_op_string(op); gpr_free(msg); op->handler_private.extra_arg = gt; GRPC_CHTTP2_REF_TRANSPORT(t, "transport_op"); - GRPC_CLOSURE_SCHED(exec_ctx, - GRPC_CLOSURE_INIT(&op->handler_private.closure, + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_INIT(&op->handler_private.closure, perform_transport_op_locked, op, grpc_combiner_scheduler(t->combiner)), GRPC_ERROR_NONE); @@ -1854,36 +1761,33 @@ static void perform_transport_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, * INPUT PROCESSING - GENERAL */ -void grpc_chttp2_maybe_complete_recv_initial_metadata(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +void grpc_chttp2_maybe_complete_recv_initial_metadata(grpc_chttp2_transport* t, grpc_chttp2_stream* s) { if (s->recv_initial_metadata_ready != nullptr && s->published_metadata[0] != GRPC_METADATA_NOT_PUBLISHED) { if (s->seen_error) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &s->frame_storage); + grpc_slice_buffer_reset_and_unref_internal(&s->frame_storage); if (!s->pending_byte_stream) { grpc_slice_buffer_reset_and_unref_internal( - exec_ctx, &s->unprocessed_incoming_frames_buffer); + &s->unprocessed_incoming_frames_buffer); } } - grpc_chttp2_incoming_metadata_buffer_publish( - exec_ctx, &s->metadata_buffer[0], s->recv_initial_metadata); - null_then_run_closure(exec_ctx, &s->recv_initial_metadata_ready, - GRPC_ERROR_NONE); + grpc_chttp2_incoming_metadata_buffer_publish(&s->metadata_buffer[0], + s->recv_initial_metadata); + null_then_run_closure(&s->recv_initial_metadata_ready, GRPC_ERROR_NONE); } } -void grpc_chttp2_maybe_complete_recv_message(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +void grpc_chttp2_maybe_complete_recv_message(grpc_chttp2_transport* t, grpc_chttp2_stream* s) { grpc_error* error = GRPC_ERROR_NONE; if (s->recv_message_ready != nullptr) { *s->recv_message = nullptr; if (s->final_metadata_requested && s->seen_error) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &s->frame_storage); + grpc_slice_buffer_reset_and_unref_internal(&s->frame_storage); if (!s->pending_byte_stream) { grpc_slice_buffer_reset_and_unref_internal( - exec_ctx, &s->unprocessed_incoming_frames_buffer); + &s->unprocessed_incoming_frames_buffer); } } if (!s->pending_byte_stream) { @@ -1910,10 +1814,9 @@ void grpc_chttp2_maybe_complete_recv_message(grpc_exec_ctx* exec_ctx, &s->decompressed_data_buffer, nullptr, GRPC_HEADER_SIZE_IN_BYTES - s->decompressed_header_bytes, &end_of_context)) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, - &s->frame_storage); + grpc_slice_buffer_reset_and_unref_internal(&s->frame_storage); grpc_slice_buffer_reset_and_unref_internal( - exec_ctx, &s->unprocessed_incoming_frames_buffer); + &s->unprocessed_incoming_frames_buffer); error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Stream decompression error."); } else { @@ -1922,8 +1825,8 @@ void grpc_chttp2_maybe_complete_recv_message(grpc_exec_ctx* exec_ctx, s->decompressed_header_bytes = 0; } error = grpc_deframe_unprocessed_incoming_frames( - exec_ctx, &s->data_parser, s, &s->decompressed_data_buffer, - nullptr, s->recv_message); + &s->data_parser, s, &s->decompressed_data_buffer, nullptr, + s->recv_message); if (end_of_context) { grpc_stream_compression_context_destroy( s->stream_decompression_ctx); @@ -1932,15 +1835,14 @@ void grpc_chttp2_maybe_complete_recv_message(grpc_exec_ctx* exec_ctx, } } else { error = grpc_deframe_unprocessed_incoming_frames( - exec_ctx, &s->data_parser, s, - &s->unprocessed_incoming_frames_buffer, nullptr, s->recv_message); + &s->data_parser, s, &s->unprocessed_incoming_frames_buffer, + nullptr, s->recv_message); } if (error != GRPC_ERROR_NONE) { s->seen_error = true; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, - &s->frame_storage); + grpc_slice_buffer_reset_and_unref_internal(&s->frame_storage); grpc_slice_buffer_reset_and_unref_internal( - exec_ctx, &s->unprocessed_incoming_frames_buffer); + &s->unprocessed_incoming_frames_buffer); break; } else if (*s->recv_message != nullptr) { break; @@ -1948,26 +1850,25 @@ void grpc_chttp2_maybe_complete_recv_message(grpc_exec_ctx* exec_ctx, } } if (error == GRPC_ERROR_NONE && *s->recv_message != nullptr) { - null_then_run_closure(exec_ctx, &s->recv_message_ready, GRPC_ERROR_NONE); + null_then_run_closure(&s->recv_message_ready, GRPC_ERROR_NONE); } else if (s->published_metadata[1] != GRPC_METADATA_NOT_PUBLISHED) { *s->recv_message = nullptr; - null_then_run_closure(exec_ctx, &s->recv_message_ready, GRPC_ERROR_NONE); + null_then_run_closure(&s->recv_message_ready, GRPC_ERROR_NONE); } GRPC_ERROR_UNREF(error); } } -void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_chttp2_transport* t, grpc_chttp2_stream* s) { - grpc_chttp2_maybe_complete_recv_message(exec_ctx, t, s); + grpc_chttp2_maybe_complete_recv_message(t, s); if (s->recv_trailing_metadata_finished != nullptr && s->read_closed && s->write_closed) { if (s->seen_error) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &s->frame_storage); + grpc_slice_buffer_reset_and_unref_internal(&s->frame_storage); if (!s->pending_byte_stream) { grpc_slice_buffer_reset_and_unref_internal( - exec_ctx, &s->unprocessed_incoming_frames_buffer); + &s->unprocessed_incoming_frames_buffer); } } bool pending_data = s->pending_byte_stream || @@ -1985,9 +1886,9 @@ void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_exec_ctx* exec_ctx, s->stream_decompression_ctx, &s->frame_storage, &s->unprocessed_incoming_frames_buffer, nullptr, GRPC_HEADER_SIZE_IN_BYTES, &end_of_context)) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &s->frame_storage); + grpc_slice_buffer_reset_and_unref_internal(&s->frame_storage); grpc_slice_buffer_reset_and_unref_internal( - exec_ctx, &s->unprocessed_incoming_frames_buffer); + &s->unprocessed_incoming_frames_buffer); s->seen_error = true; } else { if (s->unprocessed_incoming_frames_buffer.length > 0) { @@ -2002,23 +1903,23 @@ void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_exec_ctx* exec_ctx, } if (s->read_closed && s->frame_storage.length == 0 && !pending_data && s->recv_trailing_metadata_finished != nullptr) { - grpc_chttp2_incoming_metadata_buffer_publish( - exec_ctx, &s->metadata_buffer[1], s->recv_trailing_metadata); + grpc_chttp2_incoming_metadata_buffer_publish(&s->metadata_buffer[1], + s->recv_trailing_metadata); grpc_chttp2_complete_closure_step( - exec_ctx, t, s, &s->recv_trailing_metadata_finished, GRPC_ERROR_NONE, + t, s, &s->recv_trailing_metadata_finished, GRPC_ERROR_NONE, "recv_trailing_metadata_finished"); } } } -static void remove_stream(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, - uint32_t id, grpc_error* error) { +static void remove_stream(grpc_chttp2_transport* t, uint32_t id, + grpc_error* error) { grpc_chttp2_stream* s = (grpc_chttp2_stream*)grpc_chttp2_stream_map_delete(&t->stream_map, id); GPR_ASSERT(s); if (t->incoming_stream == s) { t->incoming_stream = nullptr; - grpc_chttp2_parsing_become_skip_parser(exec_ctx, t); + grpc_chttp2_parsing_become_skip_parser(t); } if (s->pending_byte_stream) { if (s->on_next != nullptr) { @@ -2026,8 +1927,8 @@ static void remove_stream(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, if (error == GRPC_ERROR_NONE) { error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Truncated message"); } - incoming_byte_stream_publish_error(exec_ctx, bs, error); - incoming_byte_stream_unref(exec_ctx, bs); + incoming_byte_stream_publish_error(bs, error); + incoming_byte_stream_unref(bs); s->data_parser.parsing_frame = nullptr; } else { GRPC_ERROR_UNREF(s->byte_stream_error); @@ -2036,56 +1937,52 @@ static void remove_stream(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, } if (grpc_chttp2_stream_map_size(&t->stream_map) == 0) { - post_benign_reclaimer(exec_ctx, t); + post_benign_reclaimer(t); if (t->sent_goaway_state == GRPC_CHTTP2_GOAWAY_SENT) { close_transport_locked( - exec_ctx, t, - GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Last stream closed after sending GOAWAY", &error, 1)); + t, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "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"); + GRPC_CHTTP2_STREAM_UNREF(s, "chttp2_writing:remove_stream"); } GRPC_ERROR_UNREF(error); - maybe_start_some_streams(exec_ctx, t); + maybe_start_some_streams(t); } -void grpc_chttp2_cancel_stream(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, grpc_chttp2_stream* s, +void grpc_chttp2_cancel_stream(grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_error* due_to_error) { if (!t->is_client && !s->sent_trailing_metadata && grpc_error_has_clear_grpc_status(due_to_error)) { - close_from_api(exec_ctx, t, s, due_to_error); + close_from_api(t, s, due_to_error); return; } if (!s->read_closed || !s->write_closed) { if (s->id != 0) { grpc_http2_error_code http_error; - grpc_error_get_status(exec_ctx, due_to_error, s->deadline, nullptr, - nullptr, &http_error, nullptr); + grpc_error_get_status(due_to_error, s->deadline, nullptr, nullptr, + &http_error, nullptr); grpc_slice_buffer_add( &t->qbuf, grpc_chttp2_rst_stream_create(s->id, (uint32_t)http_error, &s->stats.outgoing)); - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_RST_STREAM); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_RST_STREAM); } } if (due_to_error != GRPC_ERROR_NONE && !s->seen_error) { s->seen_error = true; } - grpc_chttp2_mark_stream_closed(exec_ctx, t, s, 1, 1, due_to_error); + grpc_chttp2_mark_stream_closed(t, s, 1, 1, due_to_error); } -void grpc_chttp2_fake_status(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, - grpc_chttp2_stream* s, grpc_error* error) { +void grpc_chttp2_fake_status(grpc_chttp2_transport* t, grpc_chttp2_stream* s, + grpc_error* error) { grpc_status_code status; grpc_slice slice; - grpc_error_get_status(exec_ctx, error, s->deadline, &status, &slice, nullptr, - nullptr); + grpc_error_get_status(error, s->deadline, &status, &slice, nullptr, nullptr); if (status != GRPC_STATUS_OK) { s->seen_error = true; } @@ -2101,20 +1998,20 @@ void grpc_chttp2_fake_status(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, gpr_ltoa(status, status_string); GRPC_LOG_IF_ERROR("add_status", grpc_chttp2_incoming_metadata_buffer_replace_or_add( - exec_ctx, &s->metadata_buffer[1], + &s->metadata_buffer[1], grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_GRPC_STATUS, + GRPC_MDSTR_GRPC_STATUS, grpc_slice_from_copied_string(status_string)))); if (!GRPC_SLICE_IS_EMPTY(slice)) { GRPC_LOG_IF_ERROR( "add_status_message", grpc_chttp2_incoming_metadata_buffer_replace_or_add( - exec_ctx, &s->metadata_buffer[1], - grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_GRPC_MESSAGE, + &s->metadata_buffer[1], + grpc_mdelem_from_slices(GRPC_MDSTR_GRPC_MESSAGE, grpc_slice_ref_internal(slice)))); } s->published_metadata[1] = GRPC_METADATA_SYNTHESIZED_FROM_FAKE; - grpc_chttp2_maybe_complete_recv_trailing_metadata(exec_ctx, t, s); + grpc_chttp2_maybe_complete_recv_trailing_metadata(t, s); } GRPC_ERROR_UNREF(error); @@ -2147,14 +2044,12 @@ static grpc_error* removal_error(grpc_error* extra_error, grpc_chttp2_stream* s, return error; } -static void flush_write_list(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, - grpc_chttp2_stream* s, grpc_chttp2_write_cb** list, - grpc_error* error) { +static void flush_write_list(grpc_chttp2_transport* t, grpc_chttp2_stream* s, + grpc_chttp2_write_cb** list, grpc_error* error) { while (*list) { grpc_chttp2_write_cb* cb = *list; *list = cb->next; - grpc_chttp2_complete_closure_step(exec_ctx, t, s, &cb->closure, - GRPC_ERROR_REF(error), + grpc_chttp2_complete_closure_step(t, s, &cb->closure, GRPC_ERROR_REF(error), "on_write_finished_cb"); cb->next = t->write_cb_pool; t->write_cb_pool = cb; @@ -2162,37 +2057,34 @@ static void flush_write_list(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, GRPC_ERROR_UNREF(error); } -void grpc_chttp2_fail_pending_writes(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +void grpc_chttp2_fail_pending_writes(grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_error* error) { error = removal_error(error, s, "Pending writes failed due to stream closure"); s->send_initial_metadata = nullptr; - grpc_chttp2_complete_closure_step( - exec_ctx, t, s, &s->send_initial_metadata_finished, GRPC_ERROR_REF(error), - "send_initial_metadata_finished"); + grpc_chttp2_complete_closure_step(t, s, &s->send_initial_metadata_finished, + GRPC_ERROR_REF(error), + "send_initial_metadata_finished"); s->send_trailing_metadata = nullptr; - grpc_chttp2_complete_closure_step( - exec_ctx, t, s, &s->send_trailing_metadata_finished, - GRPC_ERROR_REF(error), "send_trailing_metadata_finished"); + grpc_chttp2_complete_closure_step(t, s, &s->send_trailing_metadata_finished, + GRPC_ERROR_REF(error), + "send_trailing_metadata_finished"); s->fetching_send_message = nullptr; - grpc_chttp2_complete_closure_step( - exec_ctx, t, s, &s->fetching_send_message_finished, GRPC_ERROR_REF(error), - "fetching_send_message_finished"); - flush_write_list(exec_ctx, t, s, &s->on_write_finished_cbs, - GRPC_ERROR_REF(error)); - flush_write_list(exec_ctx, t, s, &s->on_flow_controlled_cbs, error); + grpc_chttp2_complete_closure_step(t, s, &s->fetching_send_message_finished, + GRPC_ERROR_REF(error), + "fetching_send_message_finished"); + flush_write_list(t, s, &s->on_write_finished_cbs, GRPC_ERROR_REF(error)); + flush_write_list(t, s, &s->on_flow_controlled_cbs, error); } -void grpc_chttp2_mark_stream_closed(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +void grpc_chttp2_mark_stream_closed(grpc_chttp2_transport* t, grpc_chttp2_stream* s, int close_reads, int close_writes, grpc_error* error) { if (s->read_closed && s->write_closed) { /* already closed */ - grpc_chttp2_maybe_complete_recv_trailing_metadata(exec_ctx, t, s); + grpc_chttp2_maybe_complete_recv_trailing_metadata(t, s); GRPC_ERROR_UNREF(error); return; } @@ -2206,20 +2098,20 @@ void grpc_chttp2_mark_stream_closed(grpc_exec_ctx* exec_ctx, if (close_writes && !s->write_closed) { s->write_closed_error = GRPC_ERROR_REF(error); s->write_closed = true; - grpc_chttp2_fail_pending_writes(exec_ctx, t, s, GRPC_ERROR_REF(error)); + grpc_chttp2_fail_pending_writes(t, s, GRPC_ERROR_REF(error)); } if (s->read_closed && s->write_closed) { became_closed = true; grpc_error* overall_error = removal_error(GRPC_ERROR_REF(error), s, "Stream removed"); if (s->id != 0) { - remove_stream(exec_ctx, t, s->id, GRPC_ERROR_REF(overall_error)); + remove_stream(t, s->id, GRPC_ERROR_REF(overall_error)); } else { /* Purge streams waiting on concurrency still waiting for id assignment */ grpc_chttp2_list_remove_waiting_for_concurrency(t, s); } if (overall_error != GRPC_ERROR_NONE) { - grpc_chttp2_fake_status(exec_ctx, t, s, overall_error); + grpc_chttp2_fake_status(t, s, overall_error); } } if (closed_read) { @@ -2228,18 +2120,18 @@ void grpc_chttp2_mark_stream_closed(grpc_exec_ctx* exec_ctx, s->published_metadata[i] = GPRC_METADATA_PUBLISHED_AT_CLOSE; } } - grpc_chttp2_maybe_complete_recv_initial_metadata(exec_ctx, t, s); - grpc_chttp2_maybe_complete_recv_message(exec_ctx, t, s); + grpc_chttp2_maybe_complete_recv_initial_metadata(t, s); + grpc_chttp2_maybe_complete_recv_message(t, s); } if (became_closed) { - grpc_chttp2_maybe_complete_recv_trailing_metadata(exec_ctx, t, s); - GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "chttp2"); + grpc_chttp2_maybe_complete_recv_trailing_metadata(t, s); + GRPC_CHTTP2_STREAM_UNREF(s, "chttp2"); } GRPC_ERROR_UNREF(error); } -static void close_from_api(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, - grpc_chttp2_stream* s, grpc_error* error) { +static void close_from_api(grpc_chttp2_transport* t, grpc_chttp2_stream* s, + grpc_error* error) { grpc_slice hdr; grpc_slice status_hdr; grpc_slice http_status_hdr; @@ -2249,8 +2141,8 @@ static void close_from_api(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, uint32_t len = 0; grpc_status_code grpc_status; grpc_slice slice; - grpc_error_get_status(exec_ctx, error, s->deadline, &grpc_status, &slice, - nullptr, nullptr); + grpc_error_get_status(error, s->deadline, &grpc_status, &slice, nullptr, + nullptr); GPR_ASSERT(grpc_status >= 0 && (int)grpc_status < 100); @@ -2392,13 +2284,11 @@ static void close_from_api(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, &t->qbuf, grpc_chttp2_rst_stream_create(s->id, GRPC_HTTP2_NO_ERROR, &s->stats.outgoing)); - grpc_chttp2_mark_stream_closed(exec_ctx, t, s, 1, 1, error); - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_CLOSE_FROM_API); + grpc_chttp2_mark_stream_closed(t, s, 1, 1, error); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_CLOSE_FROM_API); } typedef struct { - grpc_exec_ctx* exec_ctx; grpc_error* error; grpc_chttp2_transport* t; } cancel_stream_cb_args; @@ -2406,13 +2296,11 @@ typedef struct { static void cancel_stream_cb(void* user_data, uint32_t key, void* stream) { cancel_stream_cb_args* args = (cancel_stream_cb_args*)user_data; grpc_chttp2_stream* s = (grpc_chttp2_stream*)stream; - grpc_chttp2_cancel_stream(args->exec_ctx, args->t, s, - GRPC_ERROR_REF(args->error)); + grpc_chttp2_cancel_stream(args->t, s, GRPC_ERROR_REF(args->error)); } -static void end_all_the_calls(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, - grpc_error* error) { - cancel_stream_cb_args args = {exec_ctx, error, t}; +static void end_all_the_calls(grpc_chttp2_transport* t, grpc_error* error) { + cancel_stream_cb_args args = {error, t}; grpc_chttp2_stream_map_for_each(&t->stream_map, cancel_stream_cb, &args); GRPC_ERROR_UNREF(error); } @@ -2422,14 +2310,14 @@ static void end_all_the_calls(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, */ template -static void WithUrgency(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, +static void WithUrgency(grpc_chttp2_transport* t, grpc_core::chttp2::FlowControlAction::Urgency urgency, grpc_chttp2_initiate_write_reason reason, F action) { switch (urgency) { case grpc_core::chttp2::FlowControlAction::Urgency::NO_ACTION_NEEDED: break; case grpc_core::chttp2::FlowControlAction::Urgency::UPDATE_IMMEDIATELY: - grpc_chttp2_initiate_write(exec_ctx, t, reason); + grpc_chttp2_initiate_write(t, reason); // fallthrough case grpc_core::chttp2::FlowControlAction::Urgency::QUEUE_UPDATE: action(); @@ -2438,31 +2326,27 @@ static void WithUrgency(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, } void grpc_chttp2_act_on_flowctl_action( - grpc_exec_ctx* exec_ctx, const grpc_core::chttp2::FlowControlAction& action, + const grpc_core::chttp2::FlowControlAction& action, grpc_chttp2_transport* t, grpc_chttp2_stream* s) { - WithUrgency( - exec_ctx, t, action.send_stream_update(), - GRPC_CHTTP2_INITIATE_WRITE_STREAM_FLOW_CONTROL, - [exec_ctx, t, s]() { grpc_chttp2_mark_stream_writable(exec_ctx, t, s); }); - WithUrgency(exec_ctx, t, action.send_transport_update(), + WithUrgency(t, action.send_stream_update(), + GRPC_CHTTP2_INITIATE_WRITE_STREAM_FLOW_CONTROL, + [t, s]() { grpc_chttp2_mark_stream_writable(t, s); }); + WithUrgency(t, action.send_transport_update(), GRPC_CHTTP2_INITIATE_WRITE_TRANSPORT_FLOW_CONTROL, []() {}); - WithUrgency(exec_ctx, t, action.send_initial_window_update(), - GRPC_CHTTP2_INITIATE_WRITE_SEND_SETTINGS, - [exec_ctx, t, &action]() { - queue_setting_update(exec_ctx, t, + WithUrgency(t, action.send_initial_window_update(), + GRPC_CHTTP2_INITIATE_WRITE_SEND_SETTINGS, [t, &action]() { + queue_setting_update(t, GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE, action.initial_window_size()); }); - WithUrgency( - exec_ctx, t, action.send_max_frame_size_update(), - GRPC_CHTTP2_INITIATE_WRITE_SEND_SETTINGS, [exec_ctx, t, &action]() { - queue_setting_update(exec_ctx, t, GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE, - action.max_frame_size()); - }); + WithUrgency(t, action.send_max_frame_size_update(), + GRPC_CHTTP2_INITIATE_WRITE_SEND_SETTINGS, [t, &action]() { + queue_setting_update(t, GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE, + action.max_frame_size()); + }); } -static grpc_error* try_http_parsing(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t) { +static grpc_error* try_http_parsing(grpc_chttp2_transport* t) { grpc_http_parser parser; size_t i = 0; grpc_error* error = GRPC_ERROR_NONE; @@ -2491,8 +2375,7 @@ static grpc_error* try_http_parsing(grpc_exec_ctx* exec_ctx, return error; } -static void read_action_locked(grpc_exec_ctx* exec_ctx, void* tp, - grpc_error* error) { +static void read_action_locked(void* tp, grpc_error* error) { GPR_TIMER_BEGIN("reading_action_locked", 0); grpc_chttp2_transport* t = (grpc_chttp2_transport*)tp; @@ -2516,11 +2399,10 @@ static void read_action_locked(grpc_exec_ctx* exec_ctx, void* tp, for (; i < t->read_buffer.count && errors[1] == GRPC_ERROR_NONE; i++) { t->flow_control->bdp_estimator()->AddIncomingBytes( (int64_t)GRPC_SLICE_LENGTH(t->read_buffer.slices[i])); - errors[1] = - grpc_chttp2_perform_read(exec_ctx, t, t->read_buffer.slices[i]); + errors[1] = grpc_chttp2_perform_read(t, t->read_buffer.slices[i]); } if (errors[1] != GRPC_ERROR_NONE) { - errors[2] = try_http_parsing(exec_ctx, t); + errors[2] = try_http_parsing(t); GRPC_ERROR_UNREF(error); error = GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Failed parsing HTTP/2", errors, GPR_ARRAY_SIZE(errors)); @@ -2535,10 +2417,9 @@ static void read_action_locked(grpc_exec_ctx* exec_ctx, void* tp, if (t->initial_window_update > 0) { grpc_chttp2_stream* s; while (grpc_chttp2_list_pop_stalled_by_stream(t, &s)) { - grpc_chttp2_mark_stream_writable(exec_ctx, t, s); + grpc_chttp2_mark_stream_writable(t, s); grpc_chttp2_initiate_write( - exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_FLOW_CONTROL_UNSTALLED_BY_SETTING); + t, GRPC_CHTTP2_INITIATE_WRITE_FLOW_CONTROL_UNSTALLED_BY_SETTING); } } t->initial_window_update = 0; @@ -2559,22 +2440,21 @@ static void read_action_locked(grpc_exec_ctx* exec_ctx, void* tp, error = grpc_error_add_child(error, GRPC_ERROR_REF(t->goaway_error)); } - close_transport_locked(exec_ctx, t, GRPC_ERROR_REF(error)); + close_transport_locked(t, GRPC_ERROR_REF(error)); t->endpoint_reading = 0; } else if (t->closed_with_error == GRPC_ERROR_NONE) { keep_reading = true; GRPC_CHTTP2_REF_TRANSPORT(t, "keep_reading"); } - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &t->read_buffer); + grpc_slice_buffer_reset_and_unref_internal(&t->read_buffer); if (keep_reading) { - grpc_endpoint_read(exec_ctx, t->ep, &t->read_buffer, - &t->read_action_locked); - grpc_chttp2_act_on_flowctl_action(exec_ctx, t->flow_control->MakeAction(), - t, nullptr); - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "keep_reading"); + grpc_endpoint_read(t->ep, &t->read_buffer, &t->read_action_locked); + grpc_chttp2_act_on_flowctl_action(t->flow_control->MakeAction(), t, + nullptr); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "keep_reading"); } else { - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "reading_action"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "reading_action"); } GPR_TIMER_END("post_reading_action_locked", 0); @@ -2586,15 +2466,12 @@ static void read_action_locked(grpc_exec_ctx* exec_ctx, void* tp, // t is reffed prior to calling the first time, and once the callback chain // that kicks off finishes, it's unreffed -static void schedule_bdp_ping_locked(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t) { +static void schedule_bdp_ping_locked(grpc_chttp2_transport* t) { t->flow_control->bdp_estimator()->SchedulePing(); - send_ping_locked(exec_ctx, t, &t->start_bdp_ping_locked, - &t->finish_bdp_ping_locked); + send_ping_locked(t, &t->start_bdp_ping_locked, &t->finish_bdp_ping_locked); } -static void start_bdp_ping_locked(grpc_exec_ctx* exec_ctx, void* tp, - grpc_error* error) { +static void start_bdp_ping_locked(void* tp, grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)tp; if (grpc_http_trace.enabled()) { gpr_log(GPR_DEBUG, "%s: Start BDP ping err=%s", t->peer_string, @@ -2602,42 +2479,39 @@ static void start_bdp_ping_locked(grpc_exec_ctx* exec_ctx, void* tp, } /* Reset the keepalive ping timer */ if (t->keepalive_state == GRPC_CHTTP2_KEEPALIVE_STATE_WAITING) { - grpc_timer_cancel(exec_ctx, &t->keepalive_ping_timer); + grpc_timer_cancel(&t->keepalive_ping_timer); } t->flow_control->bdp_estimator()->StartPing(); } -static void finish_bdp_ping_locked(grpc_exec_ctx* exec_ctx, void* tp, - grpc_error* error) { +static void finish_bdp_ping_locked(void* tp, grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)tp; if (grpc_http_trace.enabled()) { gpr_log(GPR_DEBUG, "%s: Complete BDP ping err=%s", t->peer_string, grpc_error_string(error)); } if (error != GRPC_ERROR_NONE) { - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "bdp_ping"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "bdp_ping"); return; } - grpc_millis next_ping = - t->flow_control->bdp_estimator()->CompletePing(exec_ctx); - grpc_chttp2_act_on_flowctl_action( - exec_ctx, t->flow_control->PeriodicUpdate(exec_ctx), t, nullptr); + grpc_millis next_ping = t->flow_control->bdp_estimator()->CompletePing(); + grpc_chttp2_act_on_flowctl_action(t->flow_control->PeriodicUpdate(), t, + nullptr); GPR_ASSERT(!t->have_next_bdp_ping_timer); t->have_next_bdp_ping_timer = true; - grpc_timer_init(exec_ctx, &t->next_bdp_ping_timer, next_ping, + grpc_timer_init(&t->next_bdp_ping_timer, next_ping, &t->next_bdp_ping_timer_expired_locked); } -static void next_bdp_ping_timer_expired_locked(grpc_exec_ctx* exec_ctx, - void* tp, grpc_error* error) { +static void next_bdp_ping_timer_expired_locked(void* tp, grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)tp; GPR_ASSERT(t->have_next_bdp_ping_timer); t->have_next_bdp_ping_timer = false; if (error != GRPC_ERROR_NONE) { - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "bdp_ping"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "bdp_ping"); return; } - schedule_bdp_ping_locked(exec_ctx, t); + schedule_bdp_ping_locked(t); } void grpc_chttp2_config_default_keepalive_args(grpc_channel_args* args, @@ -2698,8 +2572,7 @@ void grpc_chttp2_config_default_keepalive_args(grpc_channel_args* args, } } -static void init_keepalive_ping_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void init_keepalive_ping_locked(void* arg, grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)arg; GPR_ASSERT(t->keepalive_state == GRPC_CHTTP2_KEEPALIVE_STATE_WAITING); if (t->destroying || t->closed_with_error != GRPC_ERROR_NONE) { @@ -2709,59 +2582,55 @@ static void init_keepalive_ping_locked(grpc_exec_ctx* exec_ctx, void* arg, grpc_chttp2_stream_map_size(&t->stream_map) > 0) { t->keepalive_state = GRPC_CHTTP2_KEEPALIVE_STATE_PINGING; GRPC_CHTTP2_REF_TRANSPORT(t, "keepalive ping end"); - send_ping_locked(exec_ctx, t, &t->start_keepalive_ping_locked, + send_ping_locked(t, &t->start_keepalive_ping_locked, &t->finish_keepalive_ping_locked); - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_KEEPALIVE_PING); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_KEEPALIVE_PING); } else { GRPC_CHTTP2_REF_TRANSPORT(t, "init keepalive ping"); - grpc_timer_init(exec_ctx, &t->keepalive_ping_timer, - grpc_exec_ctx_now(exec_ctx) + t->keepalive_time, + grpc_timer_init(&t->keepalive_ping_timer, + grpc_core::ExecCtx::Get()->Now() + t->keepalive_time, &t->init_keepalive_ping_locked); } } else if (error == GRPC_ERROR_CANCELLED) { /* The keepalive ping timer may be cancelled by bdp */ GRPC_CHTTP2_REF_TRANSPORT(t, "init keepalive ping"); - grpc_timer_init(exec_ctx, &t->keepalive_ping_timer, - grpc_exec_ctx_now(exec_ctx) + t->keepalive_time, + grpc_timer_init(&t->keepalive_ping_timer, + grpc_core::ExecCtx::Get()->Now() + t->keepalive_time, &t->init_keepalive_ping_locked); } - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "init keepalive ping"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "init keepalive ping"); } -static void start_keepalive_ping_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void start_keepalive_ping_locked(void* arg, grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)arg; GRPC_CHTTP2_REF_TRANSPORT(t, "keepalive watchdog"); - grpc_timer_init(exec_ctx, &t->keepalive_watchdog_timer, - grpc_exec_ctx_now(exec_ctx) + t->keepalive_time, + grpc_timer_init(&t->keepalive_watchdog_timer, + grpc_core::ExecCtx::Get()->Now() + t->keepalive_time, &t->keepalive_watchdog_fired_locked); } -static void finish_keepalive_ping_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void finish_keepalive_ping_locked(void* arg, grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)arg; if (t->keepalive_state == GRPC_CHTTP2_KEEPALIVE_STATE_PINGING) { if (error == GRPC_ERROR_NONE) { t->keepalive_state = GRPC_CHTTP2_KEEPALIVE_STATE_WAITING; - grpc_timer_cancel(exec_ctx, &t->keepalive_watchdog_timer); + grpc_timer_cancel(&t->keepalive_watchdog_timer); GRPC_CHTTP2_REF_TRANSPORT(t, "init keepalive ping"); - grpc_timer_init(exec_ctx, &t->keepalive_ping_timer, - grpc_exec_ctx_now(exec_ctx) + t->keepalive_time, + grpc_timer_init(&t->keepalive_ping_timer, + grpc_core::ExecCtx::Get()->Now() + t->keepalive_time, &t->init_keepalive_ping_locked); } } - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "keepalive ping end"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "keepalive ping end"); } -static void keepalive_watchdog_fired_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void keepalive_watchdog_fired_locked(void* arg, grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)arg; if (t->keepalive_state == GRPC_CHTTP2_KEEPALIVE_STATE_PINGING) { if (error == GRPC_ERROR_NONE) { t->keepalive_state = GRPC_CHTTP2_KEEPALIVE_STATE_DYING; close_transport_locked( - exec_ctx, t, + t, grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "keepalive watchdog timeout"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_INTERNAL)); @@ -2774,71 +2643,67 @@ static void keepalive_watchdog_fired_locked(grpc_exec_ctx* exec_ctx, void* arg, t->keepalive_state, GRPC_CHTTP2_KEEPALIVE_STATE_PINGING); } } - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "keepalive watchdog"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "keepalive watchdog"); } /******************************************************************************* * CALLBACK LOOP */ -static void connectivity_state_set(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +static void connectivity_state_set(grpc_chttp2_transport* t, grpc_connectivity_state state, grpc_error* error, const char* reason) { GRPC_CHTTP2_IF_TRACING( gpr_log(GPR_DEBUG, "set connectivity_state=%d", state)); - grpc_connectivity_state_set(exec_ctx, &t->channel_callback.state_tracker, - state, error, reason); + grpc_connectivity_state_set(&t->channel_callback.state_tracker, state, error, + reason); } /******************************************************************************* * POLLSET STUFF */ -static void set_pollset(grpc_exec_ctx* exec_ctx, grpc_transport* gt, - grpc_stream* gs, grpc_pollset* pollset) { +static void set_pollset(grpc_transport* gt, grpc_stream* gs, + grpc_pollset* pollset) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)gt; - grpc_endpoint_add_to_pollset(exec_ctx, t->ep, pollset); + grpc_endpoint_add_to_pollset(t->ep, pollset); } -static void set_pollset_set(grpc_exec_ctx* exec_ctx, grpc_transport* gt, - grpc_stream* gs, grpc_pollset_set* pollset_set) { +static void set_pollset_set(grpc_transport* gt, grpc_stream* gs, + grpc_pollset_set* pollset_set) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)gt; - grpc_endpoint_add_to_pollset_set(exec_ctx, t->ep, pollset_set); + grpc_endpoint_add_to_pollset_set(t->ep, pollset_set); } /******************************************************************************* * BYTE STREAM */ -static void reset_byte_stream(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void reset_byte_stream(void* arg, grpc_error* error) { grpc_chttp2_stream* s = (grpc_chttp2_stream*)arg; s->pending_byte_stream = false; if (error == GRPC_ERROR_NONE) { - grpc_chttp2_maybe_complete_recv_message(exec_ctx, s->t, s); - grpc_chttp2_maybe_complete_recv_trailing_metadata(exec_ctx, s->t, s); + grpc_chttp2_maybe_complete_recv_message(s->t, s); + grpc_chttp2_maybe_complete_recv_trailing_metadata(s->t, s); } else { GPR_ASSERT(error != GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(exec_ctx, s->on_next, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(s->on_next, GRPC_ERROR_REF(error)); s->on_next = nullptr; GRPC_ERROR_UNREF(s->byte_stream_error); s->byte_stream_error = GRPC_ERROR_NONE; - grpc_chttp2_cancel_stream(exec_ctx, s->t, s, GRPC_ERROR_REF(error)); + grpc_chttp2_cancel_stream(s->t, s, GRPC_ERROR_REF(error)); s->byte_stream_error = GRPC_ERROR_REF(error); } } -static void incoming_byte_stream_unref(grpc_exec_ctx* exec_ctx, - grpc_chttp2_incoming_byte_stream* bs) { +static void incoming_byte_stream_unref(grpc_chttp2_incoming_byte_stream* bs) { if (gpr_unref(&bs->refs)) { gpr_free(bs); } } -static void incoming_byte_stream_next_locked(grpc_exec_ctx* exec_ctx, - void* argp, +static void incoming_byte_stream_next_locked(void* argp, grpc_error* error_ignored) { grpc_chttp2_incoming_byte_stream* bs = (grpc_chttp2_incoming_byte_stream*)argp; @@ -2849,30 +2714,29 @@ static void incoming_byte_stream_next_locked(grpc_exec_ctx* exec_ctx, if (!s->read_closed) { s->flow_control->IncomingByteStreamUpdate(bs->next_action.max_size_hint, cur_length); - grpc_chttp2_act_on_flowctl_action(exec_ctx, s->flow_control->MakeAction(), - t, s); + grpc_chttp2_act_on_flowctl_action(s->flow_control->MakeAction(), t, s); } GPR_ASSERT(s->unprocessed_incoming_frames_buffer.length == 0); if (s->frame_storage.length > 0) { grpc_slice_buffer_swap(&s->frame_storage, &s->unprocessed_incoming_frames_buffer); s->unprocessed_incoming_frames_decompressed = false; - GRPC_CLOSURE_SCHED(exec_ctx, bs->next_action.on_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(bs->next_action.on_complete, GRPC_ERROR_NONE); } else if (s->byte_stream_error != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(exec_ctx, bs->next_action.on_complete, + GRPC_CLOSURE_SCHED(bs->next_action.on_complete, GRPC_ERROR_REF(s->byte_stream_error)); if (s->data_parser.parsing_frame != nullptr) { - incoming_byte_stream_unref(exec_ctx, s->data_parser.parsing_frame); + incoming_byte_stream_unref(s->data_parser.parsing_frame); s->data_parser.parsing_frame = nullptr; } } else if (s->read_closed) { if (bs->remaining_bytes != 0) { s->byte_stream_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Truncated message"); - GRPC_CLOSURE_SCHED(exec_ctx, bs->next_action.on_complete, + GRPC_CLOSURE_SCHED(bs->next_action.on_complete, GRPC_ERROR_REF(s->byte_stream_error)); if (s->data_parser.parsing_frame != nullptr) { - incoming_byte_stream_unref(exec_ctx, s->data_parser.parsing_frame); + incoming_byte_stream_unref(s->data_parser.parsing_frame); s->data_parser.parsing_frame = nullptr; } } else { @@ -2882,11 +2746,10 @@ static void incoming_byte_stream_next_locked(grpc_exec_ctx* exec_ctx, } else { s->on_next = bs->next_action.on_complete; } - incoming_byte_stream_unref(exec_ctx, bs); + incoming_byte_stream_unref(bs); } -static bool incoming_byte_stream_next(grpc_exec_ctx* exec_ctx, - grpc_byte_stream* byte_stream, +static bool incoming_byte_stream_next(grpc_byte_stream* byte_stream, size_t max_size_hint, grpc_closure* on_complete) { GPR_TIMER_BEGIN("incoming_byte_stream_next", 0); @@ -2901,7 +2764,6 @@ static bool incoming_byte_stream_next(grpc_exec_ctx* exec_ctx, bs->next_action.max_size_hint = max_size_hint; bs->next_action.on_complete = on_complete; GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_INIT(&bs->next_action.closure, incoming_byte_stream_next_locked, bs, grpc_combiner_scheduler(bs->transport->combiner)), @@ -2911,8 +2773,7 @@ static bool incoming_byte_stream_next(grpc_exec_ctx* exec_ctx, } } -static grpc_error* incoming_byte_stream_pull(grpc_exec_ctx* exec_ctx, - grpc_byte_stream* byte_stream, +static grpc_error* incoming_byte_stream_pull(grpc_byte_stream* byte_stream, grpc_slice* slice) { GPR_TIMER_BEGIN("incoming_byte_stream_pull", 0); grpc_chttp2_incoming_byte_stream* bs = @@ -2948,31 +2809,28 @@ static grpc_error* incoming_byte_stream_pull(grpc_exec_ctx* exec_ctx, } } error = grpc_deframe_unprocessed_incoming_frames( - exec_ctx, &s->data_parser, s, &s->unprocessed_incoming_frames_buffer, - slice, nullptr); + &s->data_parser, s, &s->unprocessed_incoming_frames_buffer, slice, + nullptr); if (error != GRPC_ERROR_NONE) { return error; } } else { error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Truncated message"); - GRPC_CLOSURE_SCHED(exec_ctx, &s->reset_byte_stream, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(&s->reset_byte_stream, GRPC_ERROR_REF(error)); return error; } GPR_TIMER_END("incoming_byte_stream_pull", 0); return GRPC_ERROR_NONE; } -static void incoming_byte_stream_destroy_locked(grpc_exec_ctx* exec_ctx, - void* byte_stream, +static void incoming_byte_stream_destroy_locked(void* byte_stream, grpc_error* error_ignored); -static void incoming_byte_stream_destroy(grpc_exec_ctx* exec_ctx, - grpc_byte_stream* byte_stream) { +static void incoming_byte_stream_destroy(grpc_byte_stream* byte_stream) { GPR_TIMER_BEGIN("incoming_byte_stream_destroy", 0); grpc_chttp2_incoming_byte_stream* bs = (grpc_chttp2_incoming_byte_stream*)byte_stream; GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_INIT(&bs->destroy_action, incoming_byte_stream_destroy_locked, bs, grpc_combiner_scheduler(bs->transport->combiner)), @@ -2981,30 +2839,28 @@ static void incoming_byte_stream_destroy(grpc_exec_ctx* exec_ctx, } static void incoming_byte_stream_publish_error( - grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_byte_stream* bs, - grpc_error* error) { + grpc_chttp2_incoming_byte_stream* bs, grpc_error* error) { grpc_chttp2_stream* s = bs->stream; GPR_ASSERT(error != GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(exec_ctx, s->on_next, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(s->on_next, GRPC_ERROR_REF(error)); s->on_next = nullptr; GRPC_ERROR_UNREF(s->byte_stream_error); s->byte_stream_error = GRPC_ERROR_REF(error); - grpc_chttp2_cancel_stream(exec_ctx, bs->transport, bs->stream, - GRPC_ERROR_REF(error)); + grpc_chttp2_cancel_stream(bs->transport, bs->stream, GRPC_ERROR_REF(error)); } grpc_error* grpc_chttp2_incoming_byte_stream_push( - grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_byte_stream* bs, - grpc_slice slice, grpc_slice* slice_out) { + grpc_chttp2_incoming_byte_stream* bs, grpc_slice slice, + grpc_slice* slice_out) { grpc_chttp2_stream* s = bs->stream; if (bs->remaining_bytes < GRPC_SLICE_LENGTH(slice)) { grpc_error* error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Too many bytes in stream"); - GRPC_CLOSURE_SCHED(exec_ctx, &s->reset_byte_stream, GRPC_ERROR_REF(error)); - grpc_slice_unref_internal(exec_ctx, slice); + GRPC_CLOSURE_SCHED(&s->reset_byte_stream, GRPC_ERROR_REF(error)); + grpc_slice_unref_internal(slice); return error; } else { bs->remaining_bytes -= (uint32_t)GRPC_SLICE_LENGTH(slice); @@ -3016,8 +2872,8 @@ grpc_error* grpc_chttp2_incoming_byte_stream_push( } grpc_error* grpc_chttp2_incoming_byte_stream_finished( - grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_byte_stream* bs, - grpc_error* error, bool reset_on_error) { + grpc_chttp2_incoming_byte_stream* bs, grpc_error* error, + bool reset_on_error) { grpc_chttp2_stream* s = bs->stream; if (error == GRPC_ERROR_NONE) { @@ -3026,27 +2882,25 @@ grpc_error* grpc_chttp2_incoming_byte_stream_finished( } } if (error != GRPC_ERROR_NONE && reset_on_error) { - GRPC_CLOSURE_SCHED(exec_ctx, &s->reset_byte_stream, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(&s->reset_byte_stream, GRPC_ERROR_REF(error)); } - incoming_byte_stream_unref(exec_ctx, bs); + incoming_byte_stream_unref(bs); return error; } -static void incoming_byte_stream_shutdown(grpc_exec_ctx* exec_ctx, - grpc_byte_stream* byte_stream, +static void incoming_byte_stream_shutdown(grpc_byte_stream* byte_stream, grpc_error* error) { grpc_chttp2_incoming_byte_stream* bs = (grpc_chttp2_incoming_byte_stream*)byte_stream; GRPC_ERROR_UNREF(grpc_chttp2_incoming_byte_stream_finished( - exec_ctx, bs, error, true /* reset_on_error */)); + bs, error, true /* reset_on_error */)); } static const grpc_byte_stream_vtable grpc_chttp2_incoming_byte_stream_vtable = { incoming_byte_stream_next, incoming_byte_stream_pull, incoming_byte_stream_shutdown, incoming_byte_stream_destroy}; -static void incoming_byte_stream_destroy_locked(grpc_exec_ctx* exec_ctx, - void* byte_stream, +static void incoming_byte_stream_destroy_locked(void* byte_stream, grpc_error* error_ignored) { grpc_chttp2_incoming_byte_stream* bs = (grpc_chttp2_incoming_byte_stream*)byte_stream; @@ -3054,15 +2908,15 @@ static void incoming_byte_stream_destroy_locked(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t = s->t; GPR_ASSERT(bs->base.vtable == &grpc_chttp2_incoming_byte_stream_vtable); - incoming_byte_stream_unref(exec_ctx, bs); + incoming_byte_stream_unref(bs); s->pending_byte_stream = false; - grpc_chttp2_maybe_complete_recv_message(exec_ctx, t, s); - grpc_chttp2_maybe_complete_recv_trailing_metadata(exec_ctx, t, s); + grpc_chttp2_maybe_complete_recv_message(t, s); + grpc_chttp2_maybe_complete_recv_trailing_metadata(t, s); } grpc_chttp2_incoming_byte_stream* grpc_chttp2_incoming_byte_stream_create( - grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, grpc_chttp2_stream* s, - uint32_t frame_size, uint32_t flags) { + grpc_chttp2_transport* t, grpc_chttp2_stream* s, uint32_t frame_size, + uint32_t flags) { grpc_chttp2_incoming_byte_stream* incoming_byte_stream = (grpc_chttp2_incoming_byte_stream*)gpr_malloc( sizeof(*incoming_byte_stream)); @@ -3082,30 +2936,25 @@ grpc_chttp2_incoming_byte_stream* grpc_chttp2_incoming_byte_stream_create( * RESOURCE QUOTAS */ -static void post_benign_reclaimer(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t) { +static void post_benign_reclaimer(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), + grpc_resource_user_post_reclaimer(grpc_endpoint_get_resource_user(t->ep), false, &t->benign_reclaimer_locked); } } -static void post_destructive_reclaimer(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t) { +static void post_destructive_reclaimer(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), + grpc_resource_user_post_reclaimer(grpc_endpoint_get_resource_user(t->ep), true, &t->destructive_reclaimer_locked); } } -static void benign_reclaimer_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void benign_reclaimer_locked(void* arg, grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)arg; if (error == GRPC_ERROR_NONE && grpc_chttp2_stream_map_size(&t->stream_map) == 0) { @@ -3115,7 +2964,7 @@ static void benign_reclaimer_locked(grpc_exec_ctx* exec_ctx, void* arg, gpr_log(GPR_DEBUG, "HTTP2: %s - send goaway to free memory", t->peer_string); } - send_goaway(exec_ctx, t, + send_goaway(t, grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Buffers full"), GRPC_ERROR_INT_HTTP2_ERROR, GRPC_HTTP2_ENHANCE_YOUR_CALM)); @@ -3128,13 +2977,12 @@ static void benign_reclaimer_locked(grpc_exec_ctx* exec_ctx, void* arg, 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_endpoint_get_resource_user(t->ep)); } - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "benign_reclaimer"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "benign_reclaimer"); } -static void destructive_reclaimer_locked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void destructive_reclaimer_locked(void* arg, grpc_error* error) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)arg; size_t n = grpc_chttp2_stream_map_size(&t->stream_map); t->destructive_reclaimer_registered = false; @@ -3146,7 +2994,7 @@ static void destructive_reclaimer_locked(grpc_exec_ctx* exec_ctx, void* arg, s->id); } grpc_chttp2_cancel_stream( - exec_ctx, t, s, + t, s, grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING("Buffers full"), GRPC_ERROR_INT_HTTP2_ERROR, GRPC_HTTP2_ENHANCE_YOUR_CALM)); @@ -3155,14 +3003,14 @@ static void destructive_reclaimer_locked(grpc_exec_ctx* exec_ctx, void* arg, 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); + post_destructive_reclaimer(t); } } if (error != GRPC_ERROR_CANCELLED) { grpc_resource_user_finish_reclamation( - exec_ctx, grpc_endpoint_get_resource_user(t->ep)); + grpc_endpoint_get_resource_user(t->ep)); } - GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "destructive_reclaimer"); + GRPC_CHTTP2_UNREF_TRANSPORT(t, "destructive_reclaimer"); } /******************************************************************************* @@ -3216,8 +3064,7 @@ const char* grpc_chttp2_initiate_write_reason_string( GPR_UNREACHABLE_CODE(return "unknown"); } -static grpc_endpoint* chttp2_get_endpoint(grpc_exec_ctx* exec_ctx, - grpc_transport* t) { +static grpc_endpoint* chttp2_get_endpoint(grpc_transport* t) { return ((grpc_chttp2_transport*)t)->ep; } @@ -3235,17 +3082,16 @@ static const grpc_transport_vtable vtable = {sizeof(grpc_chttp2_stream), static const grpc_transport_vtable* get_vtable(void) { return &vtable; } grpc_transport* grpc_create_chttp2_transport( - grpc_exec_ctx* exec_ctx, const grpc_channel_args* channel_args, - grpc_endpoint* ep, bool is_client) { + const grpc_channel_args* channel_args, grpc_endpoint* ep, bool is_client) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)gpr_zalloc(sizeof(grpc_chttp2_transport)); - init_transport(exec_ctx, t, channel_args, ep, is_client); + init_transport(t, channel_args, ep, is_client); return &t->base; } void grpc_chttp2_transport_start_reading( - grpc_exec_ctx* exec_ctx, grpc_transport* transport, - grpc_slice_buffer* read_buffer, grpc_closure* notify_on_receive_settings) { + grpc_transport* transport, grpc_slice_buffer* read_buffer, + grpc_closure* notify_on_receive_settings) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)transport; GRPC_CHTTP2_REF_TRANSPORT( t, "reading_action"); /* matches unref inside reading_action */ @@ -3254,5 +3100,5 @@ void grpc_chttp2_transport_start_reading( gpr_free(read_buffer); } t->notify_on_receive_settings = notify_on_receive_settings; - GRPC_CLOSURE_SCHED(exec_ctx, &t->read_action_locked, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&t->read_action_locked, GRPC_ERROR_NONE); } diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.h b/src/core/ext/transport/chttp2/transport/chttp2_transport.h index bd72e07babe..596ababb194 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.h +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.h @@ -28,15 +28,14 @@ extern grpc_core::TraceFlag grpc_trace_http2_stream_state; extern grpc_core::DebugOnlyTraceFlag grpc_trace_chttp2_refcount; grpc_transport* grpc_create_chttp2_transport( - grpc_exec_ctx* exec_ctx, const grpc_channel_args* channel_args, - grpc_endpoint* ep, bool is_client); + const grpc_channel_args* channel_args, grpc_endpoint* ep, bool is_client); /// Takes ownership of \a read_buffer, which (if non-NULL) contains /// leftover bytes previously read from the endpoint (e.g., by handshakers). /// If non-null, \a notify_on_receive_settings will be scheduled when /// HTTP/2 settings are received from the peer. void grpc_chttp2_transport_start_reading( - grpc_exec_ctx* exec_ctx, grpc_transport* transport, - grpc_slice_buffer* read_buffer, grpc_closure* notify_on_receive_settings); + grpc_transport* transport, grpc_slice_buffer* read_buffer, + grpc_closure* notify_on_receive_settings); #endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CHTTP2_TRANSPORT_H */ diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc index 8a057bd9ff4..ca48cc7e0a9 100644 --- a/src/core/ext/transport/chttp2/transport/flow_control.cc +++ b/src/core/ext/transport/chttp2/transport/flow_control.cc @@ -149,8 +149,7 @@ void FlowControlAction::Trace(grpc_chttp2_transport* t) const { gpr_free(mf_str); } -TransportFlowControl::TransportFlowControl(grpc_exec_ctx* exec_ctx, - const grpc_chttp2_transport* t, +TransportFlowControl::TransportFlowControl(const grpc_chttp2_transport* t, bool enable_bdp_probe) : t_(t), enable_bdp_probe_(enable_bdp_probe), @@ -163,7 +162,7 @@ TransportFlowControl::TransportFlowControl(grpc_exec_ctx* exec_ctx, .set_min_control_value(-1) .set_max_control_value(25) .set_integral_range(10)), - last_pid_update_(grpc_exec_ctx_now(exec_ctx)) {} + last_pid_update_(grpc_core::ExecCtx::Get()->Now()) {} uint32_t TransportFlowControl::MaybeSendUpdate(bool writing_anyway) { FlowControlTrace trace("t updt sent", this, nullptr); @@ -308,9 +307,8 @@ double TransportFlowControl::TargetLogBdp() { 1 + log2(bdp_estimator_.EstimateBdp())); } -double TransportFlowControl::SmoothLogBdp(grpc_exec_ctx* exec_ctx, - double value) { - grpc_millis now = grpc_exec_ctx_now(exec_ctx); +double TransportFlowControl::SmoothLogBdp(double value) { + grpc_millis now = grpc_core::ExecCtx::Get()->Now(); double bdp_error = value - pid_controller_.last_control_value(); const double dt = (double)(now - last_pid_update_) * 1e-3; last_pid_update_ = now; @@ -331,15 +329,14 @@ FlowControlAction::Urgency TransportFlowControl::DeltaUrgency( } } -FlowControlAction TransportFlowControl::PeriodicUpdate( - grpc_exec_ctx* exec_ctx) { +FlowControlAction TransportFlowControl::PeriodicUpdate() { FlowControlAction action; if (enable_bdp_probe_) { // get bdp estimate and update initial_window accordingly. // target might change based on how much memory pressure we are under // TODO(ncteisen): experiment with setting target to be huge under low // memory pressure. - const double target = pow(2, SmoothLogBdp(exec_ctx, TargetLogBdp())); + const double target = pow(2, SmoothLogBdp(TargetLogBdp())); // Though initial window 'could' drop to 0, we keep the floor at 128 target_initial_window_size_ = (int32_t)GPR_CLAMP(target, 128, INT32_MAX); diff --git a/src/core/ext/transport/chttp2/transport/flow_control.h b/src/core/ext/transport/chttp2/transport/flow_control.h index 2515c94309a..8306047dbc3 100644 --- a/src/core/ext/transport/chttp2/transport/flow_control.h +++ b/src/core/ext/transport/chttp2/transport/flow_control.h @@ -134,8 +134,7 @@ class FlowControlTrace { class TransportFlowControl { public: - TransportFlowControl(grpc_exec_ctx* exec_ctx, const grpc_chttp2_transport* t, - bool enable_bdp_probe); + TransportFlowControl(const grpc_chttp2_transport* t, bool enable_bdp_probe); ~TransportFlowControl() {} bool bdp_probe() const { return enable_bdp_probe_; } @@ -153,7 +152,7 @@ class TransportFlowControl { // Call periodically (at a low-ish rate, 100ms - 10s makes sense) // to perform more complex flow control calculations and return an action // to let chttp2 change its parameters - FlowControlAction PeriodicUpdate(grpc_exec_ctx* exec_ctx); + FlowControlAction PeriodicUpdate(); void StreamSentData(int64_t size) { remote_window_ -= size; } @@ -212,7 +211,7 @@ class TransportFlowControl { private: friend class ::grpc::testing::TrickledCHTTP2; double TargetLogBdp(); - double SmoothLogBdp(grpc_exec_ctx* exec_ctx, double value); + double SmoothLogBdp(double value); FlowControlAction::Urgency DeltaUrgency(int32_t value, grpc_chttp2_setting_id setting_id); diff --git a/src/core/ext/transport/chttp2/transport/frame_data.cc b/src/core/ext/transport/chttp2/transport/frame_data.cc index f0c3b557922..9b3a6acc9e4 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.cc +++ b/src/core/ext/transport/chttp2/transport/frame_data.cc @@ -36,11 +36,10 @@ grpc_error* grpc_chttp2_data_parser_init(grpc_chttp2_data_parser* parser) { return GRPC_ERROR_NONE; } -void grpc_chttp2_data_parser_destroy(grpc_exec_ctx* exec_ctx, - grpc_chttp2_data_parser* parser) { +void grpc_chttp2_data_parser_destroy(grpc_chttp2_data_parser* parser) { if (parser->parsing_frame != nullptr) { GRPC_ERROR_UNREF(grpc_chttp2_incoming_byte_stream_finished( - exec_ctx, parser->parsing_frame, + parser->parsing_frame, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Parser destroyed"), false)); } GRPC_ERROR_UNREF(parser->error); @@ -98,7 +97,7 @@ void grpc_chttp2_encode_data(uint32_t id, grpc_slice_buffer* inbuf, } grpc_error* grpc_deframe_unprocessed_incoming_frames( - grpc_exec_ctx* exec_ctx, grpc_chttp2_data_parser* p, grpc_chttp2_stream* s, + grpc_chttp2_data_parser* p, grpc_chttp2_stream* s, grpc_slice_buffer* slices, grpc_slice* slice_out, grpc_byte_stream** stream_out) { grpc_error* error = GRPC_ERROR_NONE; @@ -118,14 +117,14 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( char* msg; if (cur == end) { - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); continue; } switch (p->state) { case GRPC_CHTTP2_DATA_ERROR: p->state = GRPC_CHTTP2_DATA_ERROR; - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); return GRPC_ERROR_REF(p->error); case GRPC_CHTTP2_DATA_FH_0: s->stats.incoming.framing_bytes++; @@ -150,12 +149,12 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( p->error = grpc_error_set_int(p->error, GRPC_ERROR_INT_OFFSET, cur - beg); p->state = GRPC_CHTTP2_DATA_ERROR; - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); return GRPC_ERROR_REF(p->error); } if (++cur == end) { p->state = GRPC_CHTTP2_DATA_FH_1; - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); continue; } /* fallthrough */ @@ -164,7 +163,7 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( p->frame_size = ((uint32_t)*cur) << 24; if (++cur == end) { p->state = GRPC_CHTTP2_DATA_FH_2; - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); continue; } /* fallthrough */ @@ -173,7 +172,7 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( p->frame_size |= ((uint32_t)*cur) << 16; if (++cur == end) { p->state = GRPC_CHTTP2_DATA_FH_3; - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); continue; } /* fallthrough */ @@ -182,7 +181,7 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( p->frame_size |= ((uint32_t)*cur) << 8; if (++cur == end) { p->state = GRPC_CHTTP2_DATA_FH_4; - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); continue; } /* fallthrough */ @@ -198,11 +197,11 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( message_flags |= GRPC_WRITE_INTERNAL_COMPRESS; } p->parsing_frame = grpc_chttp2_incoming_byte_stream_create( - exec_ctx, t, s, p->frame_size, message_flags); + t, s, p->frame_size, message_flags); *stream_out = &p->parsing_frame->base; if (p->parsing_frame->remaining_bytes == 0) { GRPC_ERROR_UNREF(grpc_chttp2_incoming_byte_stream_finished( - exec_ctx, p->parsing_frame, GRPC_ERROR_NONE, true)); + p->parsing_frame, GRPC_ERROR_NONE, true)); p->parsing_frame = nullptr; p->state = GRPC_CHTTP2_DATA_FH_0; } @@ -213,64 +212,64 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( slices, grpc_slice_sub(slice, (size_t)(cur - beg), (size_t)(end - beg))); } - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); return GRPC_ERROR_NONE; case GRPC_CHTTP2_DATA_FRAME: { GPR_ASSERT(p->parsing_frame != nullptr); GPR_ASSERT(slice_out != nullptr); if (cur == end) { - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); continue; } uint32_t remaining = (uint32_t)(end - cur); if (remaining == p->frame_size) { s->stats.incoming.data_bytes += remaining; if (GRPC_ERROR_NONE != (error = grpc_chttp2_incoming_byte_stream_push( - exec_ctx, p->parsing_frame, + p->parsing_frame, grpc_slice_sub(slice, (size_t)(cur - beg), (size_t)(end - beg)), slice_out))) { - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); return error; } if (GRPC_ERROR_NONE != (error = grpc_chttp2_incoming_byte_stream_finished( - exec_ctx, p->parsing_frame, GRPC_ERROR_NONE, true))) { - grpc_slice_unref_internal(exec_ctx, slice); + p->parsing_frame, GRPC_ERROR_NONE, true))) { + grpc_slice_unref_internal(slice); return error; } p->parsing_frame = nullptr; p->state = GRPC_CHTTP2_DATA_FH_0; - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); return GRPC_ERROR_NONE; } else if (remaining < p->frame_size) { s->stats.incoming.data_bytes += remaining; if (GRPC_ERROR_NONE != (error = grpc_chttp2_incoming_byte_stream_push( - exec_ctx, p->parsing_frame, + p->parsing_frame, grpc_slice_sub(slice, (size_t)(cur - beg), (size_t)(end - beg)), slice_out))) { return error; } p->frame_size -= remaining; - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); return GRPC_ERROR_NONE; } else { GPR_ASSERT(remaining > p->frame_size); s->stats.incoming.data_bytes += p->frame_size; if (GRPC_ERROR_NONE != (grpc_chttp2_incoming_byte_stream_push( - exec_ctx, p->parsing_frame, + p->parsing_frame, grpc_slice_sub(slice, (size_t)(cur - beg), (size_t)(cur + p->frame_size - beg)), slice_out))) { - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); return error; } if (GRPC_ERROR_NONE != (error = grpc_chttp2_incoming_byte_stream_finished( - exec_ctx, p->parsing_frame, GRPC_ERROR_NONE, true))) { - grpc_slice_unref_internal(exec_ctx, slice); + p->parsing_frame, GRPC_ERROR_NONE, true))) { + grpc_slice_unref_internal(slice); return error; } p->parsing_frame = nullptr; @@ -279,7 +278,7 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( grpc_slice_buffer_undo_take_first( slices, grpc_slice_sub(slice, (size_t)(cur - beg), (size_t)(end - beg))); - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); return GRPC_ERROR_NONE; } } @@ -289,19 +288,19 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( return GRPC_ERROR_NONE; } -grpc_error* grpc_chttp2_data_parser_parse(grpc_exec_ctx* exec_ctx, void* parser, +grpc_error* grpc_chttp2_data_parser_parse(void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last) { if (!s->pending_byte_stream) { grpc_slice_ref_internal(slice); grpc_slice_buffer_add(&s->frame_storage, slice); - grpc_chttp2_maybe_complete_recv_message(exec_ctx, t, s); + grpc_chttp2_maybe_complete_recv_message(t, s); } else if (s->on_next) { GPR_ASSERT(s->frame_storage.length == 0); grpc_slice_ref_internal(slice); grpc_slice_buffer_add(&s->unprocessed_incoming_frames_buffer, slice); - GRPC_CLOSURE_SCHED(exec_ctx, s->on_next, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(s->on_next, GRPC_ERROR_NONE); s->on_next = nullptr; s->unprocessed_incoming_frames_decompressed = false; } else { @@ -310,8 +309,7 @@ grpc_error* grpc_chttp2_data_parser_parse(grpc_exec_ctx* exec_ctx, void* parser, } if (is_last && s->received_last_frame) { - grpc_chttp2_mark_stream_closed(exec_ctx, t, s, true, false, - GRPC_ERROR_NONE); + grpc_chttp2_mark_stream_closed(t, s, true, false, GRPC_ERROR_NONE); } return GRPC_ERROR_NONE; diff --git a/src/core/ext/transport/chttp2/transport/frame_data.h b/src/core/ext/transport/chttp2/transport/frame_data.h index 4de553ea426..964cc59b1bd 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.h +++ b/src/core/ext/transport/chttp2/transport/frame_data.h @@ -54,8 +54,7 @@ typedef struct { /* initialize per-stream state for data frame parsing */ grpc_error* grpc_chttp2_data_parser_init(grpc_chttp2_data_parser* parser); -void grpc_chttp2_data_parser_destroy(grpc_exec_ctx* exec_ctx, - grpc_chttp2_data_parser* parser); +void grpc_chttp2_data_parser_destroy(grpc_chttp2_data_parser* parser); /* start processing a new data frame */ grpc_error* grpc_chttp2_data_parser_begin_frame(grpc_chttp2_data_parser* parser, @@ -65,7 +64,7 @@ grpc_error* grpc_chttp2_data_parser_begin_frame(grpc_chttp2_data_parser* parser, /* handle a slice of a data frame - is_last indicates the last slice of a frame */ -grpc_error* grpc_chttp2_data_parser_parse(grpc_exec_ctx* exec_ctx, void* parser, +grpc_error* grpc_chttp2_data_parser_parse(void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last); @@ -76,7 +75,7 @@ void grpc_chttp2_encode_data(uint32_t id, grpc_slice_buffer* inbuf, grpc_slice_buffer* outbuf); grpc_error* grpc_deframe_unprocessed_incoming_frames( - grpc_exec_ctx* exec_ctx, grpc_chttp2_data_parser* p, grpc_chttp2_stream* s, + grpc_chttp2_data_parser* p, grpc_chttp2_stream* s, grpc_slice_buffer* slices, grpc_slice* slice_out, grpc_byte_stream** stream_out); diff --git a/src/core/ext/transport/chttp2/transport/frame_goaway.cc b/src/core/ext/transport/chttp2/transport/frame_goaway.cc index a2ce709a2e4..b60b4227fef 100644 --- a/src/core/ext/transport/chttp2/transport/frame_goaway.cc +++ b/src/core/ext/transport/chttp2/transport/frame_goaway.cc @@ -52,8 +52,7 @@ grpc_error* grpc_chttp2_goaway_parser_begin_frame(grpc_chttp2_goaway_parser* p, return GRPC_ERROR_NONE; } -grpc_error* grpc_chttp2_goaway_parser_parse(grpc_exec_ctx* exec_ctx, - void* parser, +grpc_error* grpc_chttp2_goaway_parser_parse(void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last) { @@ -135,7 +134,7 @@ grpc_error* grpc_chttp2_goaway_parser_parse(grpc_exec_ctx* exec_ctx, p->state = GRPC_CHTTP2_GOAWAY_DEBUG; if (is_last) { grpc_chttp2_add_incoming_goaway( - exec_ctx, t, (uint32_t)p->error_code, + t, (uint32_t)p->error_code, grpc_slice_new(p->debug_data, p->debug_length, gpr_free)); p->debug_data = nullptr; } diff --git a/src/core/ext/transport/chttp2/transport/frame_goaway.h b/src/core/ext/transport/chttp2/transport/frame_goaway.h index 743e763342d..064d39ac595 100644 --- a/src/core/ext/transport/chttp2/transport/frame_goaway.h +++ b/src/core/ext/transport/chttp2/transport/frame_goaway.h @@ -50,8 +50,7 @@ void grpc_chttp2_goaway_parser_init(grpc_chttp2_goaway_parser* p); void grpc_chttp2_goaway_parser_destroy(grpc_chttp2_goaway_parser* p); grpc_error* grpc_chttp2_goaway_parser_begin_frame( grpc_chttp2_goaway_parser* parser, uint32_t length, uint8_t flags); -grpc_error* grpc_chttp2_goaway_parser_parse(grpc_exec_ctx* exec_ctx, - void* parser, +grpc_error* grpc_chttp2_goaway_parser_parse(void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last); diff --git a/src/core/ext/transport/chttp2/transport/frame_ping.cc b/src/core/ext/transport/chttp2/transport/frame_ping.cc index d0feb519225..298a56721a3 100644 --- a/src/core/ext/transport/chttp2/transport/frame_ping.cc +++ b/src/core/ext/transport/chttp2/transport/frame_ping.cc @@ -68,7 +68,7 @@ grpc_error* grpc_chttp2_ping_parser_begin_frame(grpc_chttp2_ping_parser* parser, return GRPC_ERROR_NONE; } -grpc_error* grpc_chttp2_ping_parser_parse(grpc_exec_ctx* exec_ctx, void* parser, +grpc_error* grpc_chttp2_ping_parser_parse(void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last) { @@ -86,10 +86,10 @@ grpc_error* grpc_chttp2_ping_parser_parse(grpc_exec_ctx* exec_ctx, void* parser, if (p->byte == 8) { GPR_ASSERT(is_last); if (p->is_ack) { - grpc_chttp2_ack_ping(exec_ctx, t, p->opaque_8bytes); + grpc_chttp2_ack_ping(t, p->opaque_8bytes); } else { if (!t->is_client) { - grpc_millis now = grpc_exec_ctx_now(exec_ctx); + grpc_millis now = grpc_core::ExecCtx::Get()->Now(); grpc_millis next_allowed_ping = t->ping_recv_state.last_ping_recv_time + t->ping_policy.min_recv_ping_interval_without_data; @@ -104,7 +104,7 @@ grpc_error* grpc_chttp2_ping_parser_parse(grpc_exec_ctx* exec_ctx, void* parser, } if (next_allowed_ping > now) { - grpc_chttp2_add_ping_strike(exec_ctx, t); + grpc_chttp2_add_ping_strike(t); } t->ping_recv_state.last_ping_recv_time = now; @@ -116,8 +116,7 @@ grpc_error* grpc_chttp2_ping_parser_parse(grpc_exec_ctx* exec_ctx, void* parser, t->ping_acks, t->ping_ack_capacity * sizeof(*t->ping_acks)); } t->ping_acks[t->ping_ack_count++] = p->opaque_8bytes; - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_PING_RESPONSE); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_PING_RESPONSE); } } } diff --git a/src/core/ext/transport/chttp2/transport/frame_ping.h b/src/core/ext/transport/chttp2/transport/frame_ping.h index 76ca3977091..75bacfb1d4f 100644 --- a/src/core/ext/transport/chttp2/transport/frame_ping.h +++ b/src/core/ext/transport/chttp2/transport/frame_ping.h @@ -33,7 +33,7 @@ grpc_slice grpc_chttp2_ping_create(uint8_t ack, uint64_t opaque_8bytes); grpc_error* grpc_chttp2_ping_parser_begin_frame(grpc_chttp2_ping_parser* parser, uint32_t length, uint8_t flags); -grpc_error* grpc_chttp2_ping_parser_parse(grpc_exec_ctx* exec_ctx, void* parser, +grpc_error* grpc_chttp2_ping_parser_parse(void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last); diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc index 05a7f056a44..fee576678dd 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc @@ -69,8 +69,7 @@ grpc_error* grpc_chttp2_rst_stream_parser_begin_frame( return GRPC_ERROR_NONE; } -grpc_error* grpc_chttp2_rst_stream_parser_parse(grpc_exec_ctx* exec_ctx, - void* parser, +grpc_error* grpc_chttp2_rst_stream_parser_parse(void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last) { @@ -103,7 +102,7 @@ grpc_error* grpc_chttp2_rst_stream_parser_parse(grpc_exec_ctx* exec_ctx, GRPC_ERROR_INT_HTTP2_ERROR, (intptr_t)reason); gpr_free(message); } - grpc_chttp2_mark_stream_closed(exec_ctx, t, s, true, true, error); + grpc_chttp2_mark_stream_closed(t, s, true, true, error); } return GRPC_ERROR_NONE; diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.h b/src/core/ext/transport/chttp2/transport/frame_rst_stream.h index 7dfc5d4578b..e76a3ca8415 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.h +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.h @@ -34,8 +34,7 @@ grpc_slice grpc_chttp2_rst_stream_create(uint32_t stream_id, uint32_t code, grpc_error* grpc_chttp2_rst_stream_parser_begin_frame( grpc_chttp2_rst_stream_parser* parser, uint32_t length, uint8_t flags); -grpc_error* grpc_chttp2_rst_stream_parser_parse(grpc_exec_ctx* exec_ctx, - void* parser, +grpc_error* grpc_chttp2_rst_stream_parser_parse(void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last); diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.cc b/src/core/ext/transport/chttp2/transport/frame_settings.cc index de4340fea50..c6c2a6c301b 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.cc +++ b/src/core/ext/transport/chttp2/transport/frame_settings.cc @@ -108,8 +108,7 @@ grpc_error* grpc_chttp2_settings_parser_begin_frame( } } -grpc_error* grpc_chttp2_settings_parser_parse(grpc_exec_ctx* exec_ctx, void* p, - grpc_chttp2_transport* t, +grpc_error* grpc_chttp2_settings_parser_parse(void* p, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last) { grpc_chttp2_settings_parser* parser = (grpc_chttp2_settings_parser*)p; @@ -132,7 +131,7 @@ grpc_error* grpc_chttp2_settings_parser_parse(grpc_exec_ctx* exec_ctx, void* p, GRPC_CHTTP2_NUM_SETTINGS * sizeof(uint32_t)); grpc_slice_buffer_add(&t->qbuf, grpc_chttp2_settings_ack_create()); if (t->notify_on_receive_settings != nullptr) { - GRPC_CLOSURE_SCHED(exec_ctx, t->notify_on_receive_settings, + GRPC_CLOSURE_SCHED(t->notify_on_receive_settings, GRPC_ERROR_NONE); t->notify_on_receive_settings = nullptr; } diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.h b/src/core/ext/transport/chttp2/transport/frame_settings.h index 36e2ca83a0f..ce654028152 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.h +++ b/src/core/ext/transport/chttp2/transport/frame_settings.h @@ -52,8 +52,7 @@ grpc_slice grpc_chttp2_settings_ack_create(void); grpc_error* grpc_chttp2_settings_parser_begin_frame( grpc_chttp2_settings_parser* parser, uint32_t length, uint8_t flags, uint32_t* settings); -grpc_error* grpc_chttp2_settings_parser_parse(grpc_exec_ctx* exec_ctx, - void* parser, +grpc_error* grpc_chttp2_settings_parser_parse(void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last); diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.cc b/src/core/ext/transport/chttp2/transport/frame_window_update.cc index 08407a8e671..418ca144cec 100644 --- a/src/core/ext/transport/chttp2/transport/frame_window_update.cc +++ b/src/core/ext/transport/chttp2/transport/frame_window_update.cc @@ -64,9 +64,11 @@ grpc_error* grpc_chttp2_window_update_parser_begin_frame( return GRPC_ERROR_NONE; } -grpc_error* grpc_chttp2_window_update_parser_parse( - grpc_exec_ctx* exec_ctx, void* parser, grpc_chttp2_transport* t, - grpc_chttp2_stream* s, grpc_slice slice, int is_last) { +grpc_error* grpc_chttp2_window_update_parser_parse(void* parser, + grpc_chttp2_transport* t, + grpc_chttp2_stream* s, + grpc_slice slice, + int is_last) { uint8_t* const beg = GRPC_SLICE_START_PTR(slice); uint8_t* const end = GRPC_SLICE_END_PTR(slice); uint8_t* cur = beg; @@ -98,10 +100,9 @@ grpc_error* grpc_chttp2_window_update_parser_parse( if (s != nullptr) { s->flow_control->RecvUpdate(received_update); if (grpc_chttp2_list_remove_stalled_by_stream(t, s)) { - grpc_chttp2_mark_stream_writable(exec_ctx, t, s); + grpc_chttp2_mark_stream_writable(t, s); grpc_chttp2_initiate_write( - exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_FLOW_CONTROL_UNSTALLED_BY_UPDATE); + t, GRPC_CHTTP2_INITIATE_WRITE_FLOW_CONTROL_UNSTALLED_BY_UPDATE); } } } else { @@ -110,8 +111,7 @@ grpc_error* grpc_chttp2_window_update_parser_parse( bool is_zero = t->flow_control->remote_window() <= 0; if (was_zero && !is_zero) { grpc_chttp2_initiate_write( - exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_TRANSPORT_FLOW_CONTROL_UNSTALLED); + t, GRPC_CHTTP2_INITIATE_WRITE_TRANSPORT_FLOW_CONTROL_UNSTALLED); } } } diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.h b/src/core/ext/transport/chttp2/transport/frame_window_update.h index e031b585faa..a32f1a9d11e 100644 --- a/src/core/ext/transport/chttp2/transport/frame_window_update.h +++ b/src/core/ext/transport/chttp2/transport/frame_window_update.h @@ -35,8 +35,10 @@ grpc_slice grpc_chttp2_window_update_create( grpc_error* grpc_chttp2_window_update_parser_begin_frame( grpc_chttp2_window_update_parser* parser, uint32_t length, uint8_t flags); -grpc_error* grpc_chttp2_window_update_parser_parse( - grpc_exec_ctx* exec_ctx, void* parser, grpc_chttp2_transport* t, - grpc_chttp2_stream* s, grpc_slice slice, int is_last); +grpc_error* grpc_chttp2_window_update_parser_parse(void* parser, + grpc_chttp2_transport* t, + grpc_chttp2_stream* s, + grpc_slice slice, + int is_last); #endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_WINDOW_UPDATE_H */ diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc index e76d92e31d4..3a5692a6949 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc @@ -206,14 +206,12 @@ static uint32_t prepare_space_for_new_elem(grpc_chttp2_hpack_compressor* c, } /* dummy function */ -static void add_nothing(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_compressor* c, grpc_mdelem elem, +static void add_nothing(grpc_chttp2_hpack_compressor* c, grpc_mdelem elem, size_t elem_size) {} // Add a key to the dynamic table. Both key and value will be added to table at // the decoder. -static void add_key_with_index(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_compressor* c, +static void add_key_with_index(grpc_chttp2_hpack_compressor* c, grpc_mdelem elem, uint32_t new_index) { if (new_index == 0) { return; @@ -240,14 +238,12 @@ static void add_key_with_index(grpc_exec_ctx* exec_ctx, c->indices_keys[HASH_FRAGMENT_3(key_hash)] = new_index; } else if (c->indices_keys[HASH_FRAGMENT_2(key_hash)] < c->indices_keys[HASH_FRAGMENT_3(key_hash)]) { - grpc_slice_unref_internal(exec_ctx, - c->entries_keys[HASH_FRAGMENT_2(key_hash)]); + grpc_slice_unref_internal(c->entries_keys[HASH_FRAGMENT_2(key_hash)]); c->entries_keys[HASH_FRAGMENT_2(key_hash)] = grpc_slice_ref_internal(GRPC_MDKEY(elem)); c->indices_keys[HASH_FRAGMENT_2(key_hash)] = new_index; } else { - grpc_slice_unref_internal(exec_ctx, - c->entries_keys[HASH_FRAGMENT_3(key_hash)]); + grpc_slice_unref_internal(c->entries_keys[HASH_FRAGMENT_3(key_hash)]); c->entries_keys[HASH_FRAGMENT_3(key_hash)] = grpc_slice_ref_internal(GRPC_MDKEY(elem)); c->indices_keys[HASH_FRAGMENT_3(key_hash)] = new_index; @@ -255,8 +251,7 @@ static void add_key_with_index(grpc_exec_ctx* exec_ctx, } /* add an element to the decoder table */ -static void add_elem_with_index(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_compressor* c, +static void add_elem_with_index(grpc_chttp2_hpack_compressor* c, grpc_mdelem elem, uint32_t new_index) { if (new_index == 0) { return; @@ -286,35 +281,34 @@ static void add_elem_with_index(grpc_exec_ctx* exec_ctx, } else if (c->indices_elems[HASH_FRAGMENT_2(elem_hash)] < c->indices_elems[HASH_FRAGMENT_3(elem_hash)]) { /* not there: replace oldest */ - GRPC_MDELEM_UNREF(exec_ctx, c->entries_elems[HASH_FRAGMENT_2(elem_hash)]); + GRPC_MDELEM_UNREF(c->entries_elems[HASH_FRAGMENT_2(elem_hash)]); c->entries_elems[HASH_FRAGMENT_2(elem_hash)] = GRPC_MDELEM_REF(elem); c->indices_elems[HASH_FRAGMENT_2(elem_hash)] = new_index; } else { /* not there: replace oldest */ - GRPC_MDELEM_UNREF(exec_ctx, c->entries_elems[HASH_FRAGMENT_3(elem_hash)]); + GRPC_MDELEM_UNREF(c->entries_elems[HASH_FRAGMENT_3(elem_hash)]); c->entries_elems[HASH_FRAGMENT_3(elem_hash)] = GRPC_MDELEM_REF(elem); c->indices_elems[HASH_FRAGMENT_3(elem_hash)] = new_index; } - add_key_with_index(exec_ctx, c, elem, new_index); + add_key_with_index(c, elem, new_index); } -static void add_elem(grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_compressor* c, - grpc_mdelem elem, size_t elem_size) { +static void add_elem(grpc_chttp2_hpack_compressor* c, grpc_mdelem elem, + size_t elem_size) { uint32_t new_index = prepare_space_for_new_elem(c, elem_size); - add_elem_with_index(exec_ctx, c, elem, new_index); + add_elem_with_index(c, elem, new_index); } -static void add_key(grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_compressor* c, - grpc_mdelem elem, size_t elem_size) { +static void add_key(grpc_chttp2_hpack_compressor* c, grpc_mdelem elem, + size_t elem_size) { uint32_t new_index = prepare_space_for_new_elem(c, elem_size); - add_key_with_index(exec_ctx, c, elem, new_index); + add_key_with_index(c, elem, new_index); } -static void emit_indexed(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_compressor* c, uint32_t elem_index, +static void emit_indexed(grpc_chttp2_hpack_compressor* c, uint32_t elem_index, framer_state* st) { - GRPC_STATS_INC_HPACK_SEND_INDEXED(exec_ctx); + GRPC_STATS_INC_HPACK_SEND_INDEXED(); uint32_t len = GRPC_CHTTP2_VARINT_LENGTH(elem_index, 1); GRPC_CHTTP2_WRITE_VARINT(elem_index, 1, 0x80, add_tiny_header_data(st, len), len); @@ -326,18 +320,17 @@ typedef struct { bool insert_null_before_wire_value; } wire_value; -static wire_value get_wire_value(grpc_exec_ctx* exec_ctx, grpc_mdelem elem, - bool true_binary_enabled) { +static wire_value get_wire_value(grpc_mdelem elem, bool true_binary_enabled) { wire_value wire_val; if (grpc_is_binary_header(GRPC_MDKEY(elem))) { if (true_binary_enabled) { - GRPC_STATS_INC_HPACK_SEND_BINARY(exec_ctx); + GRPC_STATS_INC_HPACK_SEND_BINARY(); wire_val.huffman_prefix = 0x00; wire_val.insert_null_before_wire_value = true; wire_val.data = grpc_slice_ref_internal(GRPC_MDVALUE(elem)); } else { - GRPC_STATS_INC_HPACK_SEND_BINARY_BASE64(exec_ctx); + GRPC_STATS_INC_HPACK_SEND_BINARY_BASE64(); wire_val.huffman_prefix = 0x80; wire_val.insert_null_before_wire_value = false; wire_val.data = @@ -345,7 +338,7 @@ static wire_value get_wire_value(grpc_exec_ctx* exec_ctx, grpc_mdelem elem, } } else { /* TODO(ctiller): opportunistically compress non-binary headers */ - GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(exec_ctx); + GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(); wire_val.huffman_prefix = 0x00; wire_val.insert_null_before_wire_value = false; wire_val.data = grpc_slice_ref_internal(GRPC_MDVALUE(elem)); @@ -362,14 +355,12 @@ static void add_wire_value(framer_state* st, wire_value v) { add_header_data(st, v.data); } -static void emit_lithdr_incidx(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_compressor* c, +static void emit_lithdr_incidx(grpc_chttp2_hpack_compressor* c, uint32_t key_index, grpc_mdelem elem, framer_state* st) { - GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX(exec_ctx); + GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX(); uint32_t len_pfx = GRPC_CHTTP2_VARINT_LENGTH(key_index, 2); - wire_value value = - get_wire_value(exec_ctx, elem, st->use_true_binary_metadata); + wire_value value = get_wire_value(elem, st->use_true_binary_metadata); size_t len_val = wire_value_length(value); uint32_t len_val_len; GPR_ASSERT(len_val <= UINT32_MAX); @@ -381,14 +372,12 @@ static void emit_lithdr_incidx(grpc_exec_ctx* exec_ctx, add_wire_value(st, value); } -static void emit_lithdr_noidx(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_compressor* c, +static void emit_lithdr_noidx(grpc_chttp2_hpack_compressor* c, uint32_t key_index, grpc_mdelem elem, framer_state* st) { - GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX(exec_ctx); + GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX(); uint32_t len_pfx = GRPC_CHTTP2_VARINT_LENGTH(key_index, 4); - wire_value value = - get_wire_value(exec_ctx, elem, st->use_true_binary_metadata); + wire_value value = get_wire_value(elem, st->use_true_binary_metadata); size_t len_val = wire_value_length(value); uint32_t len_val_len; GPR_ASSERT(len_val <= UINT32_MAX); @@ -400,16 +389,14 @@ static void emit_lithdr_noidx(grpc_exec_ctx* exec_ctx, add_wire_value(st, value); } -static void emit_lithdr_incidx_v(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_compressor* c, +static void emit_lithdr_incidx_v(grpc_chttp2_hpack_compressor* c, uint32_t unused_index, grpc_mdelem elem, framer_state* st) { GPR_ASSERT(unused_index == 0); - GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX_V(exec_ctx); - GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(exec_ctx); + GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX_V(); + GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(); uint32_t len_key = (uint32_t)GRPC_SLICE_LENGTH(GRPC_MDKEY(elem)); - wire_value value = - get_wire_value(exec_ctx, elem, st->use_true_binary_metadata); + wire_value value = get_wire_value(elem, st->use_true_binary_metadata); uint32_t len_val = (uint32_t)wire_value_length(value); uint32_t len_key_len = GRPC_CHTTP2_VARINT_LENGTH(len_key, 1); uint32_t len_val_len = GRPC_CHTTP2_VARINT_LENGTH(len_val, 1); @@ -424,16 +411,14 @@ static void emit_lithdr_incidx_v(grpc_exec_ctx* exec_ctx, add_wire_value(st, value); } -static void emit_lithdr_noidx_v(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_compressor* c, +static void emit_lithdr_noidx_v(grpc_chttp2_hpack_compressor* c, uint32_t unused_index, grpc_mdelem elem, framer_state* st) { GPR_ASSERT(unused_index == 0); - GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX_V(exec_ctx); - GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(exec_ctx); + GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX_V(); + GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(); uint32_t len_key = (uint32_t)GRPC_SLICE_LENGTH(GRPC_MDKEY(elem)); - wire_value value = - get_wire_value(exec_ctx, elem, st->use_true_binary_metadata); + wire_value value = get_wire_value(elem, st->use_true_binary_metadata); uint32_t len_val = (uint32_t)wire_value_length(value); uint32_t len_key_len = GRPC_CHTTP2_VARINT_LENGTH(len_key, 1); uint32_t len_val_len = GRPC_CHTTP2_VARINT_LENGTH(len_val, 1); @@ -462,8 +447,8 @@ static uint32_t dynidx(grpc_chttp2_hpack_compressor* c, uint32_t elem_index) { } /* encode an mdelem */ -static void hpack_enc(grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_compressor* c, - grpc_mdelem elem, framer_state* st) { +static void hpack_enc(grpc_chttp2_hpack_compressor* c, grpc_mdelem elem, + framer_state* st) { GPR_ASSERT(GRPC_SLICE_LENGTH(GRPC_MDKEY(elem)) > 0); if (GRPC_SLICE_START_PTR(GRPC_MDKEY(elem))[0] != ':') { /* regular header */ st->seen_regular_header = 1; @@ -496,7 +481,7 @@ static void hpack_enc(grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_compressor* c, // Key is not interned, emit literals. if (!key_interned) { - emit_lithdr_noidx_v(exec_ctx, c, 0, elem, st); + emit_lithdr_noidx_v(c, 0, elem, st); return; } @@ -515,16 +500,16 @@ static void hpack_enc(grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_compressor* c, if (grpc_mdelem_eq(c->entries_elems[HASH_FRAGMENT_2(elem_hash)], elem) && c->indices_elems[HASH_FRAGMENT_2(elem_hash)] > c->tail_remote_index) { /* HIT: complete element (first cuckoo hash) */ - emit_indexed(exec_ctx, c, - dynidx(c, c->indices_elems[HASH_FRAGMENT_2(elem_hash)]), st); + emit_indexed(c, dynidx(c, c->indices_elems[HASH_FRAGMENT_2(elem_hash)]), + st); return; } if (grpc_mdelem_eq(c->entries_elems[HASH_FRAGMENT_3(elem_hash)], elem) && c->indices_elems[HASH_FRAGMENT_3(elem_hash)] > c->tail_remote_index) { /* HIT: complete element (second cuckoo hash) */ - emit_indexed(exec_ctx, c, - dynidx(c, c->indices_elems[HASH_FRAGMENT_3(elem_hash)]), st); + emit_indexed(c, dynidx(c, c->indices_elems[HASH_FRAGMENT_3(elem_hash)]), + st); return; } } @@ -538,10 +523,10 @@ static void hpack_enc(grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_compressor* c, decoder_space_usage < MAX_DECODER_SPACE_USAGE && c->filter_elems[HASH_FRAGMENT_1(elem_hash)] >= c->filter_elems_sum / ONE_ON_ADD_PROBABILITY; - void (*maybe_add)(grpc_exec_ctx*, grpc_chttp2_hpack_compressor*, grpc_mdelem, - size_t) = should_add_elem ? add_elem : add_nothing; - void (*emit)(grpc_exec_ctx*, grpc_chttp2_hpack_compressor*, uint32_t, - grpc_mdelem, framer_state*) = + void (*maybe_add)(grpc_chttp2_hpack_compressor*, grpc_mdelem, size_t) = + should_add_elem ? add_elem : add_nothing; + void (*emit)(grpc_chttp2_hpack_compressor*, uint32_t, grpc_mdelem, + framer_state*) = should_add_elem ? emit_lithdr_incidx : emit_lithdr_noidx; /* no hits for the elem... maybe there's a key? */ @@ -550,8 +535,8 @@ static void hpack_enc(grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_compressor* c, GRPC_MDKEY(elem)) && indices_key > c->tail_remote_index) { /* HIT: key (first cuckoo hash) */ - emit(exec_ctx, c, dynidx(c, indices_key), elem, st); - maybe_add(exec_ctx, c, elem, decoder_space_usage); + emit(c, dynidx(c, indices_key), elem, st); + maybe_add(c, elem, decoder_space_usage); return; } @@ -560,8 +545,8 @@ static void hpack_enc(grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_compressor* c, GRPC_MDKEY(elem)) && indices_key > c->tail_remote_index) { /* HIT: key (first cuckoo hash) */ - emit(exec_ctx, c, dynidx(c, indices_key), elem, st); - maybe_add(exec_ctx, c, elem, decoder_space_usage); + emit(c, dynidx(c, indices_key), elem, st); + maybe_add(c, elem, decoder_space_usage); return; } @@ -572,24 +557,23 @@ static void hpack_enc(grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_compressor* c, : emit_lithdr_noidx_v; maybe_add = should_add_elem ? add_elem : (should_add_key ? add_key : add_nothing); - emit(exec_ctx, c, 0, elem, st); - maybe_add(exec_ctx, c, elem, decoder_space_usage); + emit(c, 0, elem, st); + maybe_add(c, elem, decoder_space_usage); } #define STRLEN_LIT(x) (sizeof(x) - 1) #define TIMEOUT_KEY "grpc-timeout" -static void deadline_enc(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_compressor* c, grpc_millis deadline, +static void deadline_enc(grpc_chttp2_hpack_compressor* c, grpc_millis deadline, framer_state* st) { char timeout_str[GRPC_HTTP2_TIMEOUT_ENCODE_MIN_BUFSIZE]; grpc_mdelem mdelem; - grpc_http2_encode_timeout(deadline - grpc_exec_ctx_now(exec_ctx), + grpc_http2_encode_timeout(deadline - grpc_core::ExecCtx::Get()->Now(), timeout_str); - mdelem = grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_GRPC_TIMEOUT, + mdelem = grpc_mdelem_from_slices(GRPC_MDSTR_GRPC_TIMEOUT, grpc_slice_from_copied_string(timeout_str)); - hpack_enc(exec_ctx, c, mdelem, st); - GRPC_MDELEM_UNREF(exec_ctx, mdelem); + hpack_enc(c, mdelem, st); + GRPC_MDELEM_UNREF(mdelem); } static uint32_t elems_for_bytes(uint32_t bytes) { return (bytes + 31) / 32; } @@ -609,14 +593,13 @@ void grpc_chttp2_hpack_compressor_init(grpc_chttp2_hpack_compressor* c) { } } -void grpc_chttp2_hpack_compressor_destroy(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_compressor* c) { +void grpc_chttp2_hpack_compressor_destroy(grpc_chttp2_hpack_compressor* c) { int i; for (i = 0; i < GRPC_CHTTP2_HPACKC_NUM_VALUES; i++) { if (c->entries_keys[i].refcount != &terminal_slice_refcount) { - grpc_slice_unref_internal(exec_ctx, c->entries_keys[i]); + grpc_slice_unref_internal(c->entries_keys[i]); } - GRPC_MDELEM_UNREF(exec_ctx, c->entries_elems[i]); + GRPC_MDELEM_UNREF(c->entries_elems[i]); } gpr_free(c->table_elem_size); } @@ -672,8 +655,7 @@ void grpc_chttp2_hpack_compressor_set_max_table_size( } } -void grpc_chttp2_encode_header(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_compressor* c, +void grpc_chttp2_encode_header(grpc_chttp2_hpack_compressor* c, grpc_mdelem** extra_headers, size_t extra_headers_size, grpc_metadata_batch* metadata, @@ -699,15 +681,15 @@ void grpc_chttp2_encode_header(grpc_exec_ctx* exec_ctx, emit_advertise_table_size_change(c, &st); } for (size_t i = 0; i < extra_headers_size; ++i) { - hpack_enc(exec_ctx, c, *extra_headers[i], &st); + hpack_enc(c, *extra_headers[i], &st); } grpc_metadata_batch_assert_ok(metadata); for (grpc_linked_mdelem* l = metadata->list.head; l; l = l->next) { - hpack_enc(exec_ctx, c, l->md, &st); + hpack_enc(c, l->md, &st); } grpc_millis deadline = metadata->deadline; if (deadline != GRPC_MILLIS_INF_FUTURE) { - deadline_enc(exec_ctx, c, deadline, &st); + deadline_enc(c, deadline, &st); } finish_frame(&st, 1, options->is_eof); diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.h b/src/core/ext/transport/chttp2/transport/hpack_encoder.h index 08921b19ec7..a26514cab08 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.h +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.h @@ -70,8 +70,7 @@ typedef struct { } grpc_chttp2_hpack_compressor; void grpc_chttp2_hpack_compressor_init(grpc_chttp2_hpack_compressor* c); -void grpc_chttp2_hpack_compressor_destroy(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_compressor* c); +void grpc_chttp2_hpack_compressor_destroy(grpc_chttp2_hpack_compressor* c); void grpc_chttp2_hpack_compressor_set_max_table_size( grpc_chttp2_hpack_compressor* c, uint32_t max_table_size); void grpc_chttp2_hpack_compressor_set_max_usable_size( @@ -85,8 +84,7 @@ typedef struct { grpc_transport_one_way_stats* stats; } grpc_encode_header_options; -void grpc_chttp2_encode_header(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_compressor* c, +void grpc_chttp2_encode_header(grpc_chttp2_hpack_compressor* c, grpc_mdelem** extra_headers, size_t extra_headers_size, grpc_metadata_batch* metadata, diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc index 18cb27f199c..a395ab234c0 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc @@ -61,96 +61,69 @@ typedef enum { a set of indirect jumps, and so not waste stack space. */ /* forward declarations for parsing states */ -static grpc_error* parse_begin(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_begin(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_error(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_error(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end, grpc_error* error); -static grpc_error* still_parse_error(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* still_parse_error(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_illegal_op(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_illegal_op(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_string_prefix(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_string_prefix(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_key_string(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_key_string(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); static grpc_error* parse_value_string_with_indexed_key( - grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_parser* p, const uint8_t* cur, - const uint8_t* end); + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); static grpc_error* parse_value_string_with_literal_key( - grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_parser* p, const uint8_t* cur, - const uint8_t* end); + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_value0(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_value0(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_value1(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_value1(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_value2(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_value2(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_value3(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_value3(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_value4(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_value4(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_value5up(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_value5up(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_indexed_field(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_indexed_field(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_indexed_field_x(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_indexed_field_x(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_incidx(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_incidx(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_incidx_x(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_incidx_x(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_incidx_v(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_incidx_v(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_notidx(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_notidx(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_notidx_x(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_notidx_x(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_notidx_v(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_notidx_v(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_nvridx(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_nvridx(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_nvridx_x(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_nvridx_x(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_nvridx_v(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_nvridx_v(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_max_tbl_size(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_max_tbl_size(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_max_tbl_size_x(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_max_tbl_size_x(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); /* we translate the first byte of a hpack field into one of these decoding @@ -649,8 +622,8 @@ static const uint8_t inverse_base64[256] = { }; /* emission helpers */ -static grpc_error* on_hdr(grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_parser* p, - grpc_mdelem md, int add_to_table) { +static grpc_error* on_hdr(grpc_chttp2_hpack_parser* p, grpc_mdelem md, + int add_to_table) { if (grpc_http_trace.enabled()) { char* k = grpc_slice_to_c_string(GRPC_MDKEY(md)); char* v = nullptr; @@ -671,26 +644,25 @@ static grpc_error* on_hdr(grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_parser* p, if (add_to_table) { GPR_ASSERT(GRPC_MDELEM_STORAGE(md) == GRPC_MDELEM_STORAGE_INTERNED || GRPC_MDELEM_STORAGE(md) == GRPC_MDELEM_STORAGE_STATIC); - grpc_error* err = grpc_chttp2_hptbl_add(exec_ctx, &p->table, md); + grpc_error* err = grpc_chttp2_hptbl_add(&p->table, md); if (err != GRPC_ERROR_NONE) return err; } if (p->on_header == nullptr) { - GRPC_MDELEM_UNREF(exec_ctx, md); + GRPC_MDELEM_UNREF(md); return GRPC_ERROR_CREATE_FROM_STATIC_STRING("on_header callback not set"); } - p->on_header(exec_ctx, p->on_header_user_data, md); + p->on_header(p->on_header_user_data, md); return GRPC_ERROR_NONE; } -static grpc_slice take_string(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_slice take_string(grpc_chttp2_hpack_parser* p, grpc_chttp2_hpack_parser_string* str, bool intern) { grpc_slice s; if (!str->copied) { if (intern) { s = grpc_slice_intern(str->data.referenced); - grpc_slice_unref_internal(exec_ctx, str->data.referenced); + grpc_slice_unref_internal(str->data.referenced); } else { s = str->data.referenced; } @@ -708,85 +680,77 @@ static grpc_slice take_string(grpc_exec_ctx* exec_ctx, } /* jump to the next state */ -static grpc_error* parse_next(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_next(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { p->state = *p->next_state++; - return p->state(exec_ctx, p, cur, end); + return p->state(p, cur, end); } /* begin parsing a header: all functionality is encoded into lookup tables above */ -static grpc_error* parse_begin(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_begin(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_begin; return GRPC_ERROR_NONE; } - return first_byte_action[first_byte_lut[*cur]](exec_ctx, p, cur, end); + return first_byte_action[first_byte_lut[*cur]](p, cur, end); } /* stream dependency and prioritization data: we just skip it */ -static grpc_error* parse_stream_weight(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_stream_weight(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_stream_weight; return GRPC_ERROR_NONE; } - return p->after_prioritization(exec_ctx, p, cur + 1, end); + return p->after_prioritization(p, cur + 1, end); } -static grpc_error* parse_stream_dep3(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_stream_dep3(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_stream_dep3; return GRPC_ERROR_NONE; } - return parse_stream_weight(exec_ctx, p, cur + 1, end); + return parse_stream_weight(p, cur + 1, end); } -static grpc_error* parse_stream_dep2(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_stream_dep2(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_stream_dep2; return GRPC_ERROR_NONE; } - return parse_stream_dep3(exec_ctx, p, cur + 1, end); + return parse_stream_dep3(p, cur + 1, end); } -static grpc_error* parse_stream_dep1(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_stream_dep1(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_stream_dep1; return GRPC_ERROR_NONE; } - return parse_stream_dep2(exec_ctx, p, cur + 1, end); + return parse_stream_dep2(p, cur + 1, end); } -static grpc_error* parse_stream_dep0(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_stream_dep0(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_stream_dep0; return GRPC_ERROR_NONE; } - return parse_stream_dep1(exec_ctx, p, cur + 1, end); + return parse_stream_dep1(p, cur + 1, end); } /* emit an indexed field; jumps to begin the next field on completion */ -static grpc_error* finish_indexed_field(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* finish_indexed_field(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { grpc_mdelem md = grpc_chttp2_hptbl_lookup(&p->table, p->index); @@ -798,24 +762,22 @@ static grpc_error* finish_indexed_field(grpc_exec_ctx* exec_ctx, GRPC_ERROR_INT_SIZE, (intptr_t)p->table.num_ents); } GRPC_MDELEM_REF(md); - GRPC_STATS_INC_HPACK_RECV_INDEXED(exec_ctx); - grpc_error* err = on_hdr(exec_ctx, p, md, 0); + GRPC_STATS_INC_HPACK_RECV_INDEXED(); + grpc_error* err = on_hdr(p, md, 0); if (err != GRPC_ERROR_NONE) return err; - return parse_begin(exec_ctx, p, cur, end); + return parse_begin(p, cur, end); } /* parse an indexed field with index < 127 */ -static grpc_error* parse_indexed_field(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_indexed_field(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { p->dynamic_table_update_allowed = 0; p->index = (*cur) & 0x7f; - return finish_indexed_field(exec_ctx, p, cur + 1, end); + return finish_indexed_field(p, cur + 1, end); } /* parse an indexed field with index >= 127 */ -static grpc_error* parse_indexed_field_x(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_indexed_field_x(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -824,56 +786,52 @@ static grpc_error* parse_indexed_field_x(grpc_exec_ctx* exec_ctx, p->next_state = and_then; p->index = 0x7f; p->parsing.value = &p->index; - return parse_value0(exec_ctx, p, cur + 1, end); + return parse_value0(p, cur + 1, end); } /* finish a literal header with incremental indexing */ -static grpc_error* finish_lithdr_incidx(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* finish_lithdr_incidx(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { grpc_mdelem md = grpc_chttp2_hptbl_lookup(&p->table, p->index); GPR_ASSERT(!GRPC_MDISNULL(md)); /* handled in string parsing */ - GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX(exec_ctx); - grpc_error* err = on_hdr( - exec_ctx, p, - grpc_mdelem_from_slices(exec_ctx, grpc_slice_ref_internal(GRPC_MDKEY(md)), - take_string(exec_ctx, p, &p->value, true)), - 1); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - return parse_begin(exec_ctx, p, cur, end); + GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX(); + grpc_error* err = + on_hdr(p, + grpc_mdelem_from_slices(grpc_slice_ref_internal(GRPC_MDKEY(md)), + take_string(p, &p->value, true)), + 1); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + return parse_begin(p, cur, end); } /* finish a literal header with incremental indexing with no index */ -static grpc_error* finish_lithdr_incidx_v(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* finish_lithdr_incidx_v(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { - GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX_V(exec_ctx); - grpc_error* err = on_hdr( - exec_ctx, p, - grpc_mdelem_from_slices(exec_ctx, take_string(exec_ctx, p, &p->key, true), - take_string(exec_ctx, p, &p->value, true)), - 1); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - return parse_begin(exec_ctx, p, cur, end); + GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX_V(); + grpc_error* err = + on_hdr(p, + grpc_mdelem_from_slices(take_string(p, &p->key, true), + take_string(p, &p->value, true)), + 1); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + return parse_begin(p, cur, end); } /* parse a literal header with incremental indexing; index < 63 */ -static grpc_error* parse_lithdr_incidx(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_incidx(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { parse_value_string_with_indexed_key, finish_lithdr_incidx}; p->dynamic_table_update_allowed = 0; p->next_state = and_then; p->index = (*cur) & 0x3f; - return parse_string_prefix(exec_ctx, p, cur + 1, end); + return parse_string_prefix(p, cur + 1, end); } /* parse a literal header with incremental indexing; index >= 63 */ -static grpc_error* parse_lithdr_incidx_x(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_incidx_x(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -883,12 +841,11 @@ static grpc_error* parse_lithdr_incidx_x(grpc_exec_ctx* exec_ctx, p->next_state = and_then; p->index = 0x3f; p->parsing.value = &p->index; - return parse_value0(exec_ctx, p, cur + 1, end); + return parse_value0(p, cur + 1, end); } /* parse a literal header with incremental indexing; index = 0 */ -static grpc_error* parse_lithdr_incidx_v(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_incidx_v(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -896,56 +853,52 @@ static grpc_error* parse_lithdr_incidx_v(grpc_exec_ctx* exec_ctx, parse_value_string_with_literal_key, finish_lithdr_incidx_v}; p->dynamic_table_update_allowed = 0; p->next_state = and_then; - return parse_string_prefix(exec_ctx, p, cur + 1, end); + return parse_string_prefix(p, cur + 1, end); } /* finish a literal header without incremental indexing */ -static grpc_error* finish_lithdr_notidx(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* finish_lithdr_notidx(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { grpc_mdelem md = grpc_chttp2_hptbl_lookup(&p->table, p->index); GPR_ASSERT(!GRPC_MDISNULL(md)); /* handled in string parsing */ - GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX(exec_ctx); - grpc_error* err = on_hdr( - exec_ctx, p, - grpc_mdelem_from_slices(exec_ctx, grpc_slice_ref_internal(GRPC_MDKEY(md)), - take_string(exec_ctx, p, &p->value, false)), - 0); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - return parse_begin(exec_ctx, p, cur, end); + GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX(); + grpc_error* err = + on_hdr(p, + grpc_mdelem_from_slices(grpc_slice_ref_internal(GRPC_MDKEY(md)), + take_string(p, &p->value, false)), + 0); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + return parse_begin(p, cur, end); } /* finish a literal header without incremental indexing with index = 0 */ -static grpc_error* finish_lithdr_notidx_v(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* finish_lithdr_notidx_v(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { - GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX_V(exec_ctx); - grpc_error* err = on_hdr( - exec_ctx, p, - grpc_mdelem_from_slices(exec_ctx, take_string(exec_ctx, p, &p->key, true), - take_string(exec_ctx, p, &p->value, false)), - 0); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - return parse_begin(exec_ctx, p, cur, end); + GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX_V(); + grpc_error* err = + on_hdr(p, + grpc_mdelem_from_slices(take_string(p, &p->key, true), + take_string(p, &p->value, false)), + 0); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + return parse_begin(p, cur, end); } /* parse a literal header without incremental indexing; index < 15 */ -static grpc_error* parse_lithdr_notidx(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_notidx(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { parse_value_string_with_indexed_key, finish_lithdr_notidx}; p->dynamic_table_update_allowed = 0; p->next_state = and_then; p->index = (*cur) & 0xf; - return parse_string_prefix(exec_ctx, p, cur + 1, end); + return parse_string_prefix(p, cur + 1, end); } /* parse a literal header without incremental indexing; index >= 15 */ -static grpc_error* parse_lithdr_notidx_x(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_notidx_x(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -955,12 +908,11 @@ static grpc_error* parse_lithdr_notidx_x(grpc_exec_ctx* exec_ctx, p->next_state = and_then; p->index = 0xf; p->parsing.value = &p->index; - return parse_value0(exec_ctx, p, cur + 1, end); + return parse_value0(p, cur + 1, end); } /* parse a literal header without incremental indexing; index == 0 */ -static grpc_error* parse_lithdr_notidx_v(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_notidx_v(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -968,56 +920,52 @@ static grpc_error* parse_lithdr_notidx_v(grpc_exec_ctx* exec_ctx, parse_value_string_with_literal_key, finish_lithdr_notidx_v}; p->dynamic_table_update_allowed = 0; p->next_state = and_then; - return parse_string_prefix(exec_ctx, p, cur + 1, end); + return parse_string_prefix(p, cur + 1, end); } /* finish a literal header that is never indexed */ -static grpc_error* finish_lithdr_nvridx(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* finish_lithdr_nvridx(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { grpc_mdelem md = grpc_chttp2_hptbl_lookup(&p->table, p->index); GPR_ASSERT(!GRPC_MDISNULL(md)); /* handled in string parsing */ - GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX(exec_ctx); - grpc_error* err = on_hdr( - exec_ctx, p, - grpc_mdelem_from_slices(exec_ctx, grpc_slice_ref_internal(GRPC_MDKEY(md)), - take_string(exec_ctx, p, &p->value, false)), - 0); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - return parse_begin(exec_ctx, p, cur, end); + GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX(); + grpc_error* err = + on_hdr(p, + grpc_mdelem_from_slices(grpc_slice_ref_internal(GRPC_MDKEY(md)), + take_string(p, &p->value, false)), + 0); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + return parse_begin(p, cur, end); } /* finish a literal header that is never indexed with an extra value */ -static grpc_error* finish_lithdr_nvridx_v(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* finish_lithdr_nvridx_v(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { - GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX_V(exec_ctx); - grpc_error* err = on_hdr( - exec_ctx, p, - grpc_mdelem_from_slices(exec_ctx, take_string(exec_ctx, p, &p->key, true), - take_string(exec_ctx, p, &p->value, false)), - 0); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - return parse_begin(exec_ctx, p, cur, end); + GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX_V(); + grpc_error* err = + on_hdr(p, + grpc_mdelem_from_slices(take_string(p, &p->key, true), + take_string(p, &p->value, false)), + 0); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + return parse_begin(p, cur, end); } /* parse a literal header that is never indexed; index < 15 */ -static grpc_error* parse_lithdr_nvridx(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_nvridx(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { parse_value_string_with_indexed_key, finish_lithdr_nvridx}; p->dynamic_table_update_allowed = 0; p->next_state = and_then; p->index = (*cur) & 0xf; - return parse_string_prefix(exec_ctx, p, cur + 1, end); + return parse_string_prefix(p, cur + 1, end); } /* parse a literal header that is never indexed; index >= 15 */ -static grpc_error* parse_lithdr_nvridx_x(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_nvridx_x(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -1027,12 +975,11 @@ static grpc_error* parse_lithdr_nvridx_x(grpc_exec_ctx* exec_ctx, p->next_state = and_then; p->index = 0xf; p->parsing.value = &p->index; - return parse_value0(exec_ctx, p, cur + 1, end); + return parse_value0(p, cur + 1, end); } /* parse a literal header that is never indexed; index == 0 */ -static grpc_error* parse_lithdr_nvridx_v(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_lithdr_nvridx_v(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { @@ -1040,47 +987,44 @@ static grpc_error* parse_lithdr_nvridx_v(grpc_exec_ctx* exec_ctx, parse_value_string_with_literal_key, finish_lithdr_nvridx_v}; p->dynamic_table_update_allowed = 0; p->next_state = and_then; - return parse_string_prefix(exec_ctx, p, cur + 1, end); + return parse_string_prefix(p, cur + 1, end); } /* finish parsing a max table size change */ -static grpc_error* finish_max_tbl_size(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* finish_max_tbl_size(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (grpc_http_trace.enabled()) { gpr_log(GPR_INFO, "MAX TABLE SIZE: %d", p->index); } grpc_error* err = - grpc_chttp2_hptbl_set_current_table_size(exec_ctx, &p->table, p->index); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - return parse_begin(exec_ctx, p, cur, end); + grpc_chttp2_hptbl_set_current_table_size(&p->table, p->index); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + return parse_begin(p, cur, end); } /* parse a max table size change, max size < 15 */ -static grpc_error* parse_max_tbl_size(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_max_tbl_size(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (p->dynamic_table_update_allowed == 0) { return parse_error( - exec_ctx, p, cur, end, + p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "More than two max table size changes in a single frame")); } p->dynamic_table_update_allowed--; p->index = (*cur) & 0x1f; - return finish_max_tbl_size(exec_ctx, p, cur + 1, end); + return finish_max_tbl_size(p, cur + 1, end); } /* parse a max table size change, max size >= 15 */ -static grpc_error* parse_max_tbl_size_x(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_max_tbl_size_x(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { finish_max_tbl_size}; if (p->dynamic_table_update_allowed == 0) { return parse_error( - exec_ctx, p, cur, end, + p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "More than two max table size changes in a single frame")); } @@ -1088,12 +1032,11 @@ static grpc_error* parse_max_tbl_size_x(grpc_exec_ctx* exec_ctx, p->next_state = and_then; p->index = 0x1f; p->parsing.value = &p->index; - return parse_value0(exec_ctx, p, cur + 1, end); + return parse_value0(p, cur + 1, end); } /* a parse error: jam the parse state into parse_error, and return error */ -static grpc_error* parse_error(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_error(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end, grpc_error* err) { GPR_ASSERT(err != GRPC_ERROR_NONE); if (p->last_error == GRPC_ERROR_NONE) { @@ -1103,27 +1046,24 @@ static grpc_error* parse_error(grpc_exec_ctx* exec_ctx, return err; } -static grpc_error* still_parse_error(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* still_parse_error(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { return GRPC_ERROR_REF(p->last_error); } -static grpc_error* parse_illegal_op(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_illegal_op(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { GPR_ASSERT(cur != end); char* msg; gpr_asprintf(&msg, "Illegal hpack op code %d", *cur); grpc_error* err = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - return parse_error(exec_ctx, p, cur, end, err); + return parse_error(p, cur, end, err); } /* parse the 1st byte of a varint into p->parsing.value no overflow is possible */ -static grpc_error* parse_value0(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_value0(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_value0; @@ -1133,16 +1073,15 @@ static grpc_error* parse_value0(grpc_exec_ctx* exec_ctx, *p->parsing.value += (*cur) & 0x7f; if ((*cur) & 0x80) { - return parse_value1(exec_ctx, p, cur + 1, end); + return parse_value1(p, cur + 1, end); } else { - return parse_next(exec_ctx, p, cur + 1, end); + return parse_next(p, cur + 1, end); } } /* parse the 2nd byte of a varint into p->parsing.value no overflow is possible */ -static grpc_error* parse_value1(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_value1(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_value1; @@ -1152,16 +1091,15 @@ static grpc_error* parse_value1(grpc_exec_ctx* exec_ctx, *p->parsing.value += (((uint32_t)*cur) & 0x7f) << 7; if ((*cur) & 0x80) { - return parse_value2(exec_ctx, p, cur + 1, end); + return parse_value2(p, cur + 1, end); } else { - return parse_next(exec_ctx, p, cur + 1, end); + return parse_next(p, cur + 1, end); } } /* parse the 3rd byte of a varint into p->parsing.value no overflow is possible */ -static grpc_error* parse_value2(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_value2(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_value2; @@ -1171,16 +1109,15 @@ static grpc_error* parse_value2(grpc_exec_ctx* exec_ctx, *p->parsing.value += (((uint32_t)*cur) & 0x7f) << 14; if ((*cur) & 0x80) { - return parse_value3(exec_ctx, p, cur + 1, end); + return parse_value3(p, cur + 1, end); } else { - return parse_next(exec_ctx, p, cur + 1, end); + return parse_next(p, cur + 1, end); } } /* parse the 4th byte of a varint into p->parsing.value no overflow is possible */ -static grpc_error* parse_value3(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_value3(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_value3; @@ -1190,16 +1127,15 @@ static grpc_error* parse_value3(grpc_exec_ctx* exec_ctx, *p->parsing.value += (((uint32_t)*cur) & 0x7f) << 21; if ((*cur) & 0x80) { - return parse_value4(exec_ctx, p, cur + 1, end); + return parse_value4(p, cur + 1, end); } else { - return parse_next(exec_ctx, p, cur + 1, end); + return parse_next(p, cur + 1, end); } } /* parse the 5th byte of a varint into p->parsing.value depending on the byte, we may overflow, and care must be taken */ -static grpc_error* parse_value4(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_value4(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { uint8_t c; uint32_t cur_value; @@ -1225,9 +1161,9 @@ static grpc_error* parse_value4(grpc_exec_ctx* exec_ctx, *p->parsing.value = cur_value + add_value; if ((*cur) & 0x80) { - return parse_value5up(exec_ctx, p, cur + 1, end); + return parse_value5up(p, cur + 1, end); } else { - return parse_next(exec_ctx, p, cur + 1, end); + return parse_next(p, cur + 1, end); } error: @@ -1237,14 +1173,13 @@ error: *p->parsing.value, *cur); grpc_error* err = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - return parse_error(exec_ctx, p, cur, end, err); + return parse_error(p, cur, end, err); } /* parse any trailing bytes in a varint: it's possible to append an arbitrary number of 0x80's and not affect the value - a zero will terminate - and anything else will overflow */ -static grpc_error* parse_value5up(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_value5up(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { while (cur != end && *cur == 0x80) { ++cur; @@ -1256,7 +1191,7 @@ static grpc_error* parse_value5up(grpc_exec_ctx* exec_ctx, } if (*cur == 0) { - return parse_next(exec_ctx, p, cur + 1, end); + return parse_next(p, cur + 1, end); } char* msg; @@ -1266,12 +1201,11 @@ static grpc_error* parse_value5up(grpc_exec_ctx* exec_ctx, *p->parsing.value, *cur); grpc_error* err = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - return parse_error(exec_ctx, p, cur, end, err); + return parse_error(p, cur, end, err); } /* parse a string prefix */ -static grpc_error* parse_string_prefix(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_string_prefix(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_string_prefix; @@ -1282,9 +1216,9 @@ static grpc_error* parse_string_prefix(grpc_exec_ctx* exec_ctx, p->huff = (*cur) >> 7; if (p->strlen == 0x7f) { p->parsing.value = &p->strlen; - return parse_value0(exec_ctx, p, cur + 1, end); + return parse_value0(p, cur + 1, end); } else { - return parse_next(exec_ctx, p, cur + 1, end); + return parse_next(p, cur + 1, end); } } @@ -1303,8 +1237,7 @@ static void append_bytes(grpc_chttp2_hpack_parser_string* str, str->data.copied.length += (uint32_t)length; } -static grpc_error* append_string(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* append_string(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { grpc_chttp2_hpack_parser_string* str = p->parsing.str; uint32_t bits; @@ -1322,11 +1255,11 @@ static grpc_error* append_string(grpc_exec_ctx* exec_ctx, /* 'true-binary' case */ ++cur; p->binary = NOT_BINARY; - GRPC_STATS_INC_HPACK_RECV_BINARY(exec_ctx); + GRPC_STATS_INC_HPACK_RECV_BINARY(); append_bytes(str, cur, (size_t)(end - cur)); return GRPC_ERROR_NONE; } - GRPC_STATS_INC_HPACK_RECV_BINARY_BASE64(exec_ctx); + GRPC_STATS_INC_HPACK_RECV_BINARY_BASE64(); /* fallthrough */ b64_byte0: case B64_BYTE0: @@ -1338,7 +1271,7 @@ static grpc_error* append_string(grpc_exec_ctx* exec_ctx, ++cur; if (bits == 255) return parse_error( - exec_ctx, p, cur, end, + p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Illegal base64 character")); else if (bits == 64) goto b64_byte0; @@ -1354,7 +1287,7 @@ static grpc_error* append_string(grpc_exec_ctx* exec_ctx, ++cur; if (bits == 255) return parse_error( - exec_ctx, p, cur, end, + p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Illegal base64 character")); else if (bits == 64) goto b64_byte1; @@ -1370,7 +1303,7 @@ static grpc_error* append_string(grpc_exec_ctx* exec_ctx, ++cur; if (bits == 255) return parse_error( - exec_ctx, p, cur, end, + p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Illegal base64 character")); else if (bits == 64) goto b64_byte2; @@ -1386,7 +1319,7 @@ static grpc_error* append_string(grpc_exec_ctx* exec_ctx, ++cur; if (bits == 255) return parse_error( - exec_ctx, p, cur, end, + p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Illegal base64 character")); else if (bits == 64) goto b64_byte3; @@ -1399,12 +1332,11 @@ static grpc_error* append_string(grpc_exec_ctx* exec_ctx, goto b64_byte0; } GPR_UNREACHABLE_CODE(return parse_error( - exec_ctx, p, cur, end, + p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Should never reach here"))); } -static grpc_error* finish_str(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* finish_str(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { uint8_t decoded[2]; uint32_t bits; @@ -1417,7 +1349,7 @@ static grpc_error* finish_str(grpc_exec_ctx* exec_ctx, case B64_BYTE0: break; case B64_BYTE1: - return parse_error(exec_ctx, p, cur, end, + return parse_error(p, cur, end, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "illegal base64 encoding")); /* illegal encoding */ case B64_BYTE2: @@ -1428,7 +1360,7 @@ static grpc_error* finish_str(grpc_exec_ctx* exec_ctx, bits & 0xffff); grpc_error* err = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - return parse_error(exec_ctx, p, cur, end, err); + return parse_error(p, cur, end, err); } decoded[0] = (uint8_t)(bits >> 16); append_bytes(str, decoded, 1); @@ -1441,7 +1373,7 @@ static grpc_error* finish_str(grpc_exec_ctx* exec_ctx, bits & 0xff); grpc_error* err = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - return parse_error(exec_ctx, p, cur, end, err); + return parse_error(p, cur, end, err); } decoded[0] = (uint8_t)(bits >> 16); decoded[1] = (uint8_t)(bits >> 8); @@ -1452,14 +1384,13 @@ static grpc_error* finish_str(grpc_exec_ctx* exec_ctx, } /* decode a nibble from a huffman encoded stream */ -static grpc_error* huff_nibble(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, uint8_t nibble) { +static grpc_error* huff_nibble(grpc_chttp2_hpack_parser* p, uint8_t nibble) { int16_t emit = emit_sub_tbl[16 * emit_tbl[p->huff_state] + nibble]; int16_t next = next_sub_tbl[16 * next_tbl[p->huff_state] + nibble]; if (emit != -1) { if (emit >= 0 && emit < 256) { uint8_t c = (uint8_t)emit; - grpc_error* err = append_string(exec_ctx, p, &c, (&c) + 1); + grpc_error* err = append_string(p, &c, (&c) + 1); if (err != GRPC_ERROR_NONE) return err; } else { assert(emit == 256); @@ -1470,45 +1401,42 @@ static grpc_error* huff_nibble(grpc_exec_ctx* exec_ctx, } /* decode full bytes from a huffman encoded stream */ -static grpc_error* add_huff_bytes(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* add_huff_bytes(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { for (; cur != end; ++cur) { - grpc_error* err = huff_nibble(exec_ctx, p, *cur >> 4); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - err = huff_nibble(exec_ctx, p, *cur & 0xf); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); + grpc_error* err = huff_nibble(p, *cur >> 4); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + err = huff_nibble(p, *cur & 0xf); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); } return GRPC_ERROR_NONE; } /* decode some string bytes based on the current decoding mode (huffman or not) */ -static grpc_error* add_str_bytes(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* add_str_bytes(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { if (p->huff) { - return add_huff_bytes(exec_ctx, p, cur, end); + return add_huff_bytes(p, cur, end); } else { - return append_string(exec_ctx, p, cur, end); + return append_string(p, cur, end); } } /* parse a string - tries to do large chunks at a time */ -static grpc_error* parse_string(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, const uint8_t* cur, +static grpc_error* parse_string(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { size_t remaining = p->strlen - p->strgot; size_t given = (size_t)(end - cur); if (remaining <= given) { - grpc_error* err = add_str_bytes(exec_ctx, p, cur, cur + remaining); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - err = finish_str(exec_ctx, p, cur + remaining, end); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - return parse_next(exec_ctx, p, cur + remaining, end); + grpc_error* err = add_str_bytes(p, cur, cur + remaining); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + err = finish_str(p, cur + remaining, end); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + return parse_next(p, cur + remaining, end); } else { - grpc_error* err = add_str_bytes(exec_ctx, p, cur, cur + given); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); + grpc_error* err = add_str_bytes(p, cur, cur + given); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); GPR_ASSERT(given <= UINT32_MAX - p->strgot); p->strgot += (uint32_t)given; p->state = parse_string; @@ -1517,20 +1445,19 @@ static grpc_error* parse_string(grpc_exec_ctx* exec_ctx, } /* begin parsing a string - performs setup, calls parse_string */ -static grpc_error* begin_parse_string(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* begin_parse_string(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end, uint8_t binary, grpc_chttp2_hpack_parser_string* str) { if (!p->huff && binary == NOT_BINARY && (end - cur) >= (intptr_t)p->strlen && p->current_slice_refcount != nullptr) { - GRPC_STATS_INC_HPACK_RECV_UNCOMPRESSED(exec_ctx); + GRPC_STATS_INC_HPACK_RECV_UNCOMPRESSED(); str->copied = false; str->data.referenced.refcount = p->current_slice_refcount; str->data.referenced.data.refcounted.bytes = (uint8_t*)cur; str->data.referenced.data.refcounted.length = p->strlen; grpc_slice_ref_internal(str->data.referenced); - return parse_next(exec_ctx, p, cur + p->strlen, end); + return parse_next(p, cur + p->strlen, end); } p->strgot = 0; str->copied = true; @@ -1541,9 +1468,9 @@ static grpc_error* begin_parse_string(grpc_exec_ctx* exec_ctx, switch (p->binary) { case NOT_BINARY: if (p->huff) { - GRPC_STATS_INC_HPACK_RECV_HUFFMAN(exec_ctx); + GRPC_STATS_INC_HPACK_RECV_HUFFMAN(); } else { - GRPC_STATS_INC_HPACK_RECV_UNCOMPRESSED(exec_ctx); + GRPC_STATS_INC_HPACK_RECV_UNCOMPRESSED(); } break; case BINARY_BEGIN: @@ -1552,14 +1479,13 @@ static grpc_error* begin_parse_string(grpc_exec_ctx* exec_ctx, default: abort(); } - return parse_string(exec_ctx, p, cur, end); + return parse_string(p, cur, end); } /* parse the key string */ -static grpc_error* parse_key_string(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_key_string(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { - return begin_parse_string(exec_ctx, p, cur, end, NOT_BINARY, &p->key); + return begin_parse_string(p, cur, end, NOT_BINARY, &p->key); } /* check if a key represents a binary header or not */ @@ -1586,33 +1512,29 @@ static grpc_error* is_binary_indexed_header(grpc_chttp2_hpack_parser* p, } /* parse the value string */ -static grpc_error* parse_value_string(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +static grpc_error* parse_value_string(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end, bool is_binary) { - return begin_parse_string(exec_ctx, p, cur, end, - is_binary ? BINARY_BEGIN : NOT_BINARY, &p->value); + return begin_parse_string(p, cur, end, is_binary ? BINARY_BEGIN : NOT_BINARY, + &p->value); } static grpc_error* parse_value_string_with_indexed_key( - grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_parser* p, const uint8_t* cur, - const uint8_t* end) { + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { bool is_binary = false; grpc_error* err = is_binary_indexed_header(p, &is_binary); - if (err != GRPC_ERROR_NONE) return parse_error(exec_ctx, p, cur, end, err); - return parse_value_string(exec_ctx, p, cur, end, is_binary); + if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); + return parse_value_string(p, cur, end, is_binary); } static grpc_error* parse_value_string_with_literal_key( - grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_parser* p, const uint8_t* cur, - const uint8_t* end) { - return parse_value_string(exec_ctx, p, cur, end, is_binary_literal_header(p)); + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { + return parse_value_string(p, cur, end, is_binary_literal_header(p)); } /* PUBLIC INTERFACE */ -void grpc_chttp2_hpack_parser_init(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p) { +void grpc_chttp2_hpack_parser_init(grpc_chttp2_hpack_parser* p) { p->on_header = nullptr; p->on_header_user_data = nullptr; p->state = parse_begin; @@ -1626,7 +1548,7 @@ void grpc_chttp2_hpack_parser_init(grpc_exec_ctx* exec_ctx, p->value.data.copied.length = 0; p->dynamic_table_update_allowed = 2; p->last_error = GRPC_ERROR_NONE; - grpc_chttp2_hptbl_init(exec_ctx, &p->table); + grpc_chttp2_hptbl_init(&p->table); } void grpc_chttp2_hpack_parser_set_has_priority(grpc_chttp2_hpack_parser* p) { @@ -1634,18 +1556,16 @@ void grpc_chttp2_hpack_parser_set_has_priority(grpc_chttp2_hpack_parser* p) { p->state = parse_stream_dep0; } -void grpc_chttp2_hpack_parser_destroy(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p) { - grpc_chttp2_hptbl_destroy(exec_ctx, &p->table); +void grpc_chttp2_hpack_parser_destroy(grpc_chttp2_hpack_parser* p) { + grpc_chttp2_hptbl_destroy(&p->table); GRPC_ERROR_UNREF(p->last_error); - grpc_slice_unref_internal(exec_ctx, p->key.data.referenced); - grpc_slice_unref_internal(exec_ctx, p->value.data.referenced); + grpc_slice_unref_internal(p->key.data.referenced); + grpc_slice_unref_internal(p->value.data.referenced); gpr_free(p->key.data.copied.str); gpr_free(p->value.data.copied.str); } -grpc_error* grpc_chttp2_hpack_parser_parse(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +grpc_error* grpc_chttp2_hpack_parser_parse(grpc_chttp2_hpack_parser* p, grpc_slice slice) { /* max number of bytes to parse at a time... limits call stack depth on * compilers without TCO */ @@ -1656,37 +1576,33 @@ grpc_error* grpc_chttp2_hpack_parser_parse(grpc_exec_ctx* exec_ctx, grpc_error* error = GRPC_ERROR_NONE; while (start != end && error == GRPC_ERROR_NONE) { uint8_t* target = start + GPR_MIN(MAX_PARSE_LENGTH, end - start); - error = p->state(exec_ctx, p, start, target); + error = p->state(p, start, target); start = target; } p->current_slice_refcount = nullptr; return error; } -typedef void (*maybe_complete_func_type)(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +typedef void (*maybe_complete_func_type)(grpc_chttp2_transport* t, grpc_chttp2_stream* s); static const maybe_complete_func_type maybe_complete_funcs[] = { grpc_chttp2_maybe_complete_recv_initial_metadata, grpc_chttp2_maybe_complete_recv_trailing_metadata}; -static void force_client_rst_stream(grpc_exec_ctx* exec_ctx, void* sp, - grpc_error* error) { +static void force_client_rst_stream(void* sp, grpc_error* error) { grpc_chttp2_stream* s = (grpc_chttp2_stream*)sp; grpc_chttp2_transport* t = s->t; if (!s->write_closed) { grpc_slice_buffer_add( &t->qbuf, grpc_chttp2_rst_stream_create(s->id, GRPC_HTTP2_NO_ERROR, &s->stats.outgoing)); - grpc_chttp2_initiate_write(exec_ctx, t, - GRPC_CHTTP2_INITIATE_WRITE_FORCE_RST_STREAM); - grpc_chttp2_mark_stream_closed(exec_ctx, t, s, true, true, GRPC_ERROR_NONE); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_FORCE_RST_STREAM); + grpc_chttp2_mark_stream_closed(t, s, true, true, GRPC_ERROR_NONE); } - GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "final_rst"); + GRPC_CHTTP2_STREAM_UNREF(s, "final_rst"); } -static void parse_stream_compression_md(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +static void parse_stream_compression_md(grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_metadata_batch* initial_metadata) { if (initial_metadata->idx.named.content_encoding == nullptr || @@ -1698,8 +1614,7 @@ static void parse_stream_compression_md(grpc_exec_ctx* exec_ctx, } } -grpc_error* grpc_chttp2_header_parser_parse(grpc_exec_ctx* exec_ctx, - void* hpack_parser, +grpc_error* grpc_chttp2_header_parser_parse(void* hpack_parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last) { @@ -1708,7 +1623,7 @@ grpc_error* grpc_chttp2_header_parser_parse(grpc_exec_ctx* exec_ctx, if (s != nullptr) { s->stats.incoming.header_bytes += GRPC_SLICE_LENGTH(slice); } - grpc_error* error = grpc_chttp2_hpack_parser_parse(exec_ctx, parser, slice); + grpc_error* error = grpc_chttp2_hpack_parser_parse(parser, slice); if (error != GRPC_ERROR_NONE) { GPR_TIMER_END("grpc_chttp2_hpack_parser_parse", 0); return error; @@ -1731,12 +1646,11 @@ grpc_error* grpc_chttp2_header_parser_parse(grpc_exec_ctx* exec_ctx, /* Process stream compression md element if it exists */ if (s->header_frames_received == 0) { /* Only acts on initial metadata */ - parse_stream_compression_md(exec_ctx, t, s, - &s->metadata_buffer[0].batch); + parse_stream_compression_md(t, s, &s->metadata_buffer[0].batch); } s->published_metadata[s->header_frames_received] = GRPC_METADATA_PUBLISHED_FROM_WIRE; - maybe_complete_funcs[s->header_frames_received](exec_ctx, t, s); + maybe_complete_funcs[s->header_frames_received](t, s); s->header_frames_received++; } if (parser->is_eof) { @@ -1747,13 +1661,11 @@ grpc_error* grpc_chttp2_header_parser_parse(grpc_exec_ctx* exec_ctx, and can avoid the extra write */ GRPC_CHTTP2_STREAM_REF(s, "final_rst"); GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_CREATE(force_client_rst_stream, s, grpc_combiner_finally_scheduler(t->combiner)), GRPC_ERROR_NONE); } - grpc_chttp2_mark_stream_closed(exec_ctx, t, s, true, false, - GRPC_ERROR_NONE); + grpc_chttp2_mark_stream_closed(t, s, true, false, GRPC_ERROR_NONE); } } parser->on_header = nullptr; diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.h b/src/core/ext/transport/chttp2/transport/hpack_parser.h index b4a2b14bdb7..060bc5ce9d6 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.h @@ -30,8 +30,7 @@ typedef struct grpc_chttp2_hpack_parser grpc_chttp2_hpack_parser; typedef grpc_error* (*grpc_chttp2_hpack_parser_state)( - grpc_exec_ctx* exec_ctx, grpc_chttp2_hpack_parser* p, const uint8_t* beg, - const uint8_t* end); + grpc_chttp2_hpack_parser* p, const uint8_t* beg, const uint8_t* end); typedef struct { bool copied; @@ -47,7 +46,7 @@ typedef struct { struct grpc_chttp2_hpack_parser { /* user specified callback for each header output */ - void (*on_header)(grpc_exec_ctx* exec_ctx, void* user_data, grpc_mdelem md); + void (*on_header)(void* user_data, grpc_mdelem md); void* on_header_user_data; grpc_error* last_error; @@ -92,21 +91,17 @@ struct grpc_chttp2_hpack_parser { grpc_chttp2_hptbl table; }; -void grpc_chttp2_hpack_parser_init(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p); -void grpc_chttp2_hpack_parser_destroy(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p); +void grpc_chttp2_hpack_parser_init(grpc_chttp2_hpack_parser* p); +void grpc_chttp2_hpack_parser_destroy(grpc_chttp2_hpack_parser* p); void grpc_chttp2_hpack_parser_set_has_priority(grpc_chttp2_hpack_parser* p); -grpc_error* grpc_chttp2_hpack_parser_parse(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hpack_parser* p, +grpc_error* grpc_chttp2_hpack_parser_parse(grpc_chttp2_hpack_parser* p, grpc_slice slice); /* wraps grpc_chttp2_hpack_parser_parse to provide a frame level parser for the transport */ -grpc_error* grpc_chttp2_header_parser_parse(grpc_exec_ctx* exec_ctx, - void* hpack_parser, +grpc_error* grpc_chttp2_header_parser_parse(void* hpack_parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_slice slice, int is_last); diff --git a/src/core/ext/transport/chttp2/transport/hpack_table.cc b/src/core/ext/transport/chttp2/transport/hpack_table.cc index 75b83b80b67..c325465daab 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_table.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_table.cc @@ -165,7 +165,7 @@ static uint32_t entries_for_bytes(uint32_t bytes) { GRPC_CHTTP2_HPACK_ENTRY_OVERHEAD; } -void grpc_chttp2_hptbl_init(grpc_exec_ctx* exec_ctx, grpc_chttp2_hptbl* tbl) { +void grpc_chttp2_hptbl_init(grpc_chttp2_hptbl* tbl) { size_t i; memset(tbl, 0, sizeof(*tbl)); @@ -177,22 +177,19 @@ void grpc_chttp2_hptbl_init(grpc_exec_ctx* exec_ctx, grpc_chttp2_hptbl* tbl) { memset(tbl->ents, 0, sizeof(*tbl->ents) * tbl->cap_entries); for (i = 1; i <= GRPC_CHTTP2_LAST_STATIC_ENTRY; i++) { tbl->static_ents[i - 1] = grpc_mdelem_from_slices( - exec_ctx, grpc_slice_intern(grpc_slice_from_static_string(static_table[i].key)), grpc_slice_intern( grpc_slice_from_static_string(static_table[i].value))); } } -void grpc_chttp2_hptbl_destroy(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hptbl* tbl) { +void grpc_chttp2_hptbl_destroy(grpc_chttp2_hptbl* tbl) { size_t i; for (i = 0; i < GRPC_CHTTP2_LAST_STATIC_ENTRY; i++) { - GRPC_MDELEM_UNREF(exec_ctx, tbl->static_ents[i]); + GRPC_MDELEM_UNREF(tbl->static_ents[i]); } for (i = 0; i < tbl->num_ents; i++) { - GRPC_MDELEM_UNREF(exec_ctx, - tbl->ents[(tbl->first_ent + i) % tbl->cap_entries]); + GRPC_MDELEM_UNREF(tbl->ents[(tbl->first_ent + i) % tbl->cap_entries]); } gpr_free(tbl->ents); } @@ -215,7 +212,7 @@ grpc_mdelem grpc_chttp2_hptbl_lookup(const grpc_chttp2_hptbl* tbl, } /* Evict one element from the table */ -static void evict1(grpc_exec_ctx* exec_ctx, grpc_chttp2_hptbl* tbl) { +static void evict1(grpc_chttp2_hptbl* tbl) { grpc_mdelem first_ent = tbl->ents[tbl->first_ent]; size_t elem_bytes = GRPC_SLICE_LENGTH(GRPC_MDKEY(first_ent)) + GRPC_SLICE_LENGTH(GRPC_MDVALUE(first_ent)) + @@ -224,7 +221,7 @@ static void evict1(grpc_exec_ctx* exec_ctx, grpc_chttp2_hptbl* tbl) { tbl->mem_used -= (uint32_t)elem_bytes; tbl->first_ent = ((tbl->first_ent + 1) % tbl->cap_entries); tbl->num_ents--; - GRPC_MDELEM_UNREF(exec_ctx, first_ent); + GRPC_MDELEM_UNREF(first_ent); } static void rebuild_ents(grpc_chttp2_hptbl* tbl, uint32_t new_cap) { @@ -240,8 +237,7 @@ static void rebuild_ents(grpc_chttp2_hptbl* tbl, uint32_t new_cap) { tbl->first_ent = 0; } -void grpc_chttp2_hptbl_set_max_bytes(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hptbl* tbl, +void grpc_chttp2_hptbl_set_max_bytes(grpc_chttp2_hptbl* tbl, uint32_t max_bytes) { if (tbl->max_bytes == max_bytes) { return; @@ -250,13 +246,12 @@ void grpc_chttp2_hptbl_set_max_bytes(grpc_exec_ctx* exec_ctx, gpr_log(GPR_DEBUG, "Update hpack parser max size to %d", max_bytes); } while (tbl->mem_used > max_bytes) { - evict1(exec_ctx, tbl); + evict1(tbl); } tbl->max_bytes = max_bytes; } -grpc_error* grpc_chttp2_hptbl_set_current_table_size(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hptbl* tbl, +grpc_error* grpc_chttp2_hptbl_set_current_table_size(grpc_chttp2_hptbl* tbl, uint32_t bytes) { if (tbl->current_table_bytes == bytes) { return GRPC_ERROR_NONE; @@ -274,7 +269,7 @@ grpc_error* grpc_chttp2_hptbl_set_current_table_size(grpc_exec_ctx* exec_ctx, gpr_log(GPR_DEBUG, "Update hpack parser table size to %d", bytes); } while (tbl->mem_used > bytes) { - evict1(exec_ctx, tbl); + evict1(tbl); } tbl->current_table_bytes = bytes; tbl->max_entries = entries_for_bytes(bytes); @@ -289,8 +284,7 @@ grpc_error* grpc_chttp2_hptbl_set_current_table_size(grpc_exec_ctx* exec_ctx, return GRPC_ERROR_NONE; } -grpc_error* grpc_chttp2_hptbl_add(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hptbl* tbl, grpc_mdelem md) { +grpc_error* grpc_chttp2_hptbl_add(grpc_chttp2_hptbl* tbl, grpc_mdelem md) { /* determine how many bytes of buffer this entry represents */ size_t elem_bytes = GRPC_SLICE_LENGTH(GRPC_MDKEY(md)) + GRPC_SLICE_LENGTH(GRPC_MDVALUE(md)) + @@ -320,14 +314,14 @@ grpc_error* grpc_chttp2_hptbl_add(grpc_exec_ctx* exec_ctx, * empty table. */ while (tbl->num_ents) { - evict1(exec_ctx, tbl); + evict1(tbl); } return GRPC_ERROR_NONE; } /* evict entries to ensure no overflow */ while (elem_bytes > (size_t)tbl->current_table_bytes - tbl->mem_used) { - evict1(exec_ctx, tbl); + evict1(tbl); } /* copy the finalized entry in */ diff --git a/src/core/ext/transport/chttp2/transport/hpack_table.h b/src/core/ext/transport/chttp2/transport/hpack_table.h index aed7b13f0be..189ad1c697f 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_table.h +++ b/src/core/ext/transport/chttp2/transport/hpack_table.h @@ -69,21 +69,18 @@ typedef struct { } grpc_chttp2_hptbl; /* initialize a hpack table */ -void grpc_chttp2_hptbl_init(grpc_exec_ctx* exec_ctx, grpc_chttp2_hptbl* tbl); -void grpc_chttp2_hptbl_destroy(grpc_exec_ctx* exec_ctx, grpc_chttp2_hptbl* tbl); -void grpc_chttp2_hptbl_set_max_bytes(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hptbl* tbl, +void grpc_chttp2_hptbl_init(grpc_chttp2_hptbl* tbl); +void grpc_chttp2_hptbl_destroy(grpc_chttp2_hptbl* tbl); +void grpc_chttp2_hptbl_set_max_bytes(grpc_chttp2_hptbl* tbl, uint32_t max_bytes); -grpc_error* grpc_chttp2_hptbl_set_current_table_size(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hptbl* tbl, +grpc_error* grpc_chttp2_hptbl_set_current_table_size(grpc_chttp2_hptbl* tbl, uint32_t bytes); /* lookup a table entry based on its hpack index */ grpc_mdelem grpc_chttp2_hptbl_lookup(const grpc_chttp2_hptbl* tbl, uint32_t index); /* add a table entry to the index */ -grpc_error* grpc_chttp2_hptbl_add(grpc_exec_ctx* exec_ctx, - grpc_chttp2_hptbl* tbl, +grpc_error* grpc_chttp2_hptbl_add(grpc_chttp2_hptbl* tbl, grpc_mdelem md) GRPC_MUST_USE_RESULT; /* Find a key/value pair in the table... returns the index in the table of the most similar entry, or 0 if the value was not found */ diff --git a/src/core/ext/transport/chttp2/transport/incoming_metadata.cc b/src/core/ext/transport/chttp2/transport/incoming_metadata.cc index 4461f8c12c5..ef0c9ed230d 100644 --- a/src/core/ext/transport/chttp2/transport/incoming_metadata.cc +++ b/src/core/ext/transport/chttp2/transport/incoming_metadata.cc @@ -33,33 +33,31 @@ void grpc_chttp2_incoming_metadata_buffer_init( } void grpc_chttp2_incoming_metadata_buffer_destroy( - grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_metadata_buffer* buffer) { - grpc_metadata_batch_destroy(exec_ctx, &buffer->batch); + grpc_chttp2_incoming_metadata_buffer* buffer) { + grpc_metadata_batch_destroy(&buffer->batch); } grpc_error* grpc_chttp2_incoming_metadata_buffer_add( - grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_metadata_buffer* buffer, - grpc_mdelem elem) { + grpc_chttp2_incoming_metadata_buffer* buffer, grpc_mdelem elem) { buffer->size += GRPC_MDELEM_LENGTH(elem); return grpc_metadata_batch_add_tail( - exec_ctx, &buffer->batch, + &buffer->batch, (grpc_linked_mdelem*)gpr_arena_alloc(buffer->arena, sizeof(grpc_linked_mdelem)), elem); } grpc_error* grpc_chttp2_incoming_metadata_buffer_replace_or_add( - grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_metadata_buffer* buffer, - grpc_mdelem elem) { + grpc_chttp2_incoming_metadata_buffer* buffer, grpc_mdelem elem) { for (grpc_linked_mdelem* l = buffer->batch.list.head; l != nullptr; l = l->next) { if (grpc_slice_eq(GRPC_MDKEY(l->md), GRPC_MDKEY(elem))) { - GRPC_MDELEM_UNREF(exec_ctx, l->md); + GRPC_MDELEM_UNREF(l->md); l->md = elem; return GRPC_ERROR_NONE; } } - return grpc_chttp2_incoming_metadata_buffer_add(exec_ctx, buffer, elem); + return grpc_chttp2_incoming_metadata_buffer_add(buffer, elem); } void grpc_chttp2_incoming_metadata_buffer_set_deadline( @@ -68,8 +66,7 @@ void grpc_chttp2_incoming_metadata_buffer_set_deadline( } void grpc_chttp2_incoming_metadata_buffer_publish( - grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_metadata_buffer* buffer, - grpc_metadata_batch* batch) { + grpc_chttp2_incoming_metadata_buffer* buffer, grpc_metadata_batch* batch) { *batch = buffer->batch; grpc_metadata_batch_init(&buffer->batch); } diff --git a/src/core/ext/transport/chttp2/transport/incoming_metadata.h b/src/core/ext/transport/chttp2/transport/incoming_metadata.h index 6f2b81ef6ce..b84cd484c4d 100644 --- a/src/core/ext/transport/chttp2/transport/incoming_metadata.h +++ b/src/core/ext/transport/chttp2/transport/incoming_metadata.h @@ -31,16 +31,15 @@ typedef struct { void grpc_chttp2_incoming_metadata_buffer_init( grpc_chttp2_incoming_metadata_buffer* buffer, gpr_arena* arena); void grpc_chttp2_incoming_metadata_buffer_destroy( - grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_metadata_buffer* buffer); + grpc_chttp2_incoming_metadata_buffer* buffer); void grpc_chttp2_incoming_metadata_buffer_publish( - grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_metadata_buffer* buffer, - grpc_metadata_batch* batch); + grpc_chttp2_incoming_metadata_buffer* buffer, grpc_metadata_batch* batch); grpc_error* grpc_chttp2_incoming_metadata_buffer_add( - grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_metadata_buffer* buffer, + grpc_chttp2_incoming_metadata_buffer* buffer, grpc_mdelem elem) GRPC_MUST_USE_RESULT; grpc_error* grpc_chttp2_incoming_metadata_buffer_replace_or_add( - grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_metadata_buffer* buffer, + grpc_chttp2_incoming_metadata_buffer* buffer, grpc_mdelem elem) GRPC_MUST_USE_RESULT; void grpc_chttp2_incoming_metadata_buffer_set_deadline( grpc_chttp2_incoming_metadata_buffer* buffer, grpc_millis deadline); diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h index f6fd6795d0a..932f5ba83d0 100644 --- a/src/core/ext/transport/chttp2/transport/internal.h +++ b/src/core/ext/transport/chttp2/transport/internal.h @@ -282,8 +282,8 @@ struct grpc_chttp2_transport { struct { /* accept stream callback */ - void (*accept_stream)(grpc_exec_ctx* exec_ctx, void* user_data, - grpc_transport* transport, const void* server_data); + void (*accept_stream)(void* user_data, grpc_transport* transport, + const void* server_data); void* accept_stream_user_data; /** connectivity tracking */ @@ -371,9 +371,8 @@ struct grpc_chttp2_transport { /* active parser */ void* parser_data; grpc_chttp2_stream* incoming_stream; - grpc_error* (*parser)(grpc_exec_ctx* exec_ctx, void* parser_user_data, - grpc_chttp2_transport* t, grpc_chttp2_stream* s, - grpc_slice slice, int is_last); + grpc_error* (*parser)(void* parser_user_data, grpc_chttp2_transport* t, + grpc_chttp2_stream* s, grpc_slice slice, int is_last); grpc_chttp2_write_cb* write_cb_pool; @@ -571,8 +570,7 @@ struct grpc_chttp2_stream { The actual call chain is documented in the implementation of this function. */ -void grpc_chttp2_initiate_write(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +void grpc_chttp2_initiate_write(grpc_chttp2_transport* t, grpc_chttp2_initiate_write_reason reason); typedef struct { @@ -585,14 +583,12 @@ typedef struct { } grpc_chttp2_begin_write_result; grpc_chttp2_begin_write_result grpc_chttp2_begin_write( - grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t); -void grpc_chttp2_end_write(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, - grpc_error* error); + grpc_chttp2_transport* t); +void grpc_chttp2_end_write(grpc_chttp2_transport* t, grpc_error* error); /** Process one slice of incoming data; return 1 if the connection is still viable after reading, or 0 if the connection should be torn down */ -grpc_error* grpc_chttp2_perform_read(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +grpc_error* grpc_chttp2_perform_read(grpc_chttp2_transport* t, grpc_slice slice); bool grpc_chttp2_list_add_writable_stream(grpc_chttp2_transport* t, @@ -640,27 +636,23 @@ bool grpc_chttp2_list_remove_stalled_by_stream(grpc_chttp2_transport* t, // Takes in a flow control action and performs all the needed operations. void grpc_chttp2_act_on_flowctl_action( - grpc_exec_ctx* exec_ctx, const grpc_core::chttp2::FlowControlAction& action, + const grpc_core::chttp2::FlowControlAction& action, grpc_chttp2_transport* t, grpc_chttp2_stream* s); /********* End of Flow Control ***************/ grpc_chttp2_stream* grpc_chttp2_parsing_lookup_stream(grpc_chttp2_transport* t, uint32_t id); -grpc_chttp2_stream* grpc_chttp2_parsing_accept_stream(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +grpc_chttp2_stream* grpc_chttp2_parsing_accept_stream(grpc_chttp2_transport* t, uint32_t id); -void grpc_chttp2_add_incoming_goaway(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +void grpc_chttp2_add_incoming_goaway(grpc_chttp2_transport* t, uint32_t goaway_error, grpc_slice goaway_text); -void grpc_chttp2_parsing_become_skip_parser(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t); +void grpc_chttp2_parsing_become_skip_parser(grpc_chttp2_transport* t); -void grpc_chttp2_complete_closure_step(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_closure** pclosure, grpc_error* error, const char* desc); @@ -681,94 +673,80 @@ void grpc_chttp2_complete_closure_step(grpc_exec_ctx* exec_ctx, else \ stmt -void grpc_chttp2_fake_status(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, +void grpc_chttp2_fake_status(grpc_chttp2_transport* t, grpc_chttp2_stream* stream, grpc_error* error); -void grpc_chttp2_mark_stream_closed(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +void grpc_chttp2_mark_stream_closed(grpc_chttp2_transport* t, grpc_chttp2_stream* s, int close_reads, int close_writes, grpc_error* error); -void grpc_chttp2_start_writing(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t); +void grpc_chttp2_start_writing(grpc_chttp2_transport* t); #ifndef NDEBUG #define GRPC_CHTTP2_STREAM_REF(stream, reason) \ grpc_chttp2_stream_ref(stream, reason) -#define GRPC_CHTTP2_STREAM_UNREF(exec_ctx, stream, reason) \ - grpc_chttp2_stream_unref(exec_ctx, stream, reason) +#define GRPC_CHTTP2_STREAM_UNREF(stream, reason) \ + grpc_chttp2_stream_unref(stream, reason) void grpc_chttp2_stream_ref(grpc_chttp2_stream* s, const char* reason); -void grpc_chttp2_stream_unref(grpc_exec_ctx* exec_ctx, grpc_chttp2_stream* s, - const char* reason); +void grpc_chttp2_stream_unref(grpc_chttp2_stream* s, const char* reason); #else #define GRPC_CHTTP2_STREAM_REF(stream, reason) grpc_chttp2_stream_ref(stream) -#define GRPC_CHTTP2_STREAM_UNREF(exec_ctx, stream, reason) \ - grpc_chttp2_stream_unref(exec_ctx, stream) +#define GRPC_CHTTP2_STREAM_UNREF(stream, reason) \ + grpc_chttp2_stream_unref(stream) void grpc_chttp2_stream_ref(grpc_chttp2_stream* s); -void grpc_chttp2_stream_unref(grpc_exec_ctx* exec_ctx, grpc_chttp2_stream* s); +void grpc_chttp2_stream_unref(grpc_chttp2_stream* s); #endif #ifndef NDEBUG #define GRPC_CHTTP2_REF_TRANSPORT(t, r) \ grpc_chttp2_ref_transport(t, r, __FILE__, __LINE__) -#define GRPC_CHTTP2_UNREF_TRANSPORT(cl, t, r) \ - grpc_chttp2_unref_transport(cl, t, r, __FILE__, __LINE__) -void grpc_chttp2_unref_transport(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, const char* reason, +#define GRPC_CHTTP2_UNREF_TRANSPORT(t, r) \ + grpc_chttp2_unref_transport(t, r, __FILE__, __LINE__) +void grpc_chttp2_unref_transport(grpc_chttp2_transport* t, const char* reason, const char* file, int line); void grpc_chttp2_ref_transport(grpc_chttp2_transport* t, const char* reason, const char* file, int line); #else #define GRPC_CHTTP2_REF_TRANSPORT(t, r) grpc_chttp2_ref_transport(t) -#define GRPC_CHTTP2_UNREF_TRANSPORT(cl, t, r) grpc_chttp2_unref_transport(cl, t) -void grpc_chttp2_unref_transport(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t); +#define GRPC_CHTTP2_UNREF_TRANSPORT(t, r) grpc_chttp2_unref_transport(t) +void grpc_chttp2_unref_transport(grpc_chttp2_transport* t); void grpc_chttp2_ref_transport(grpc_chttp2_transport* t); #endif grpc_chttp2_incoming_byte_stream* grpc_chttp2_incoming_byte_stream_create( - grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, grpc_chttp2_stream* s, - uint32_t frame_size, uint32_t flags); + grpc_chttp2_transport* t, grpc_chttp2_stream* s, uint32_t frame_size, + uint32_t flags); grpc_error* grpc_chttp2_incoming_byte_stream_push( - grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_byte_stream* bs, - grpc_slice slice, grpc_slice* slice_out); + grpc_chttp2_incoming_byte_stream* bs, grpc_slice slice, + grpc_slice* slice_out); grpc_error* grpc_chttp2_incoming_byte_stream_finished( - grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_byte_stream* bs, - grpc_error* error, bool reset_on_error); + grpc_chttp2_incoming_byte_stream* bs, grpc_error* error, + bool reset_on_error); void grpc_chttp2_incoming_byte_stream_notify( - grpc_exec_ctx* exec_ctx, grpc_chttp2_incoming_byte_stream* bs, - grpc_error* error); + grpc_chttp2_incoming_byte_stream* bs, grpc_error* error); -void grpc_chttp2_ack_ping(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, - uint64_t id); +void grpc_chttp2_ack_ping(grpc_chttp2_transport* t, uint64_t id); /** Add a new ping strike to ping_recv_state.ping_strikes. If ping_recv_state.ping_strikes > ping_policy.max_ping_strikes, it sends GOAWAY with error code ENHANCE_YOUR_CALM and additional debug data resembling "too_many_pings" followed by immediately closing the connection. */ -void grpc_chttp2_add_ping_strike(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t); +void grpc_chttp2_add_ping_strike(grpc_chttp2_transport* t); /** add a ref to the stream and add it to the writable list; ref will be dropped in writing.c */ -void grpc_chttp2_mark_stream_writable(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +void grpc_chttp2_mark_stream_writable(grpc_chttp2_transport* t, grpc_chttp2_stream* s); -void grpc_chttp2_cancel_stream(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, grpc_chttp2_stream* s, +void grpc_chttp2_cancel_stream(grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_error* due_to_error); -void grpc_chttp2_maybe_complete_recv_initial_metadata(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +void grpc_chttp2_maybe_complete_recv_initial_metadata(grpc_chttp2_transport* t, grpc_chttp2_stream* s); -void grpc_chttp2_maybe_complete_recv_message(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +void grpc_chttp2_maybe_complete_recv_message(grpc_chttp2_transport* t, grpc_chttp2_stream* s); -void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_chttp2_transport* t, grpc_chttp2_stream* s); -void grpc_chttp2_fail_pending_writes(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +void grpc_chttp2_fail_pending_writes(grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_error* error); /** Set the default keepalive configurations, must only be called at diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index 46ec3fbaa61..a56f89cc752 100644 --- a/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/src/core/ext/transport/chttp2/transport/parsing.cc @@ -31,33 +31,22 @@ #include "src/core/lib/transport/status_conversion.h" #include "src/core/lib/transport/timeout_encoding.h" -static grpc_error* init_frame_parser(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t); -static grpc_error* init_header_frame_parser(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +static grpc_error* init_frame_parser(grpc_chttp2_transport* t); +static grpc_error* init_header_frame_parser(grpc_chttp2_transport* t, int is_continuation); -static grpc_error* init_data_frame_parser(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t); -static grpc_error* init_rst_stream_parser(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t); -static grpc_error* init_settings_frame_parser(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t); -static grpc_error* init_window_update_frame_parser(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t); -static grpc_error* init_ping_parser(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t); -static grpc_error* init_goaway_parser(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t); -static grpc_error* init_skip_frame_parser(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +static grpc_error* init_data_frame_parser(grpc_chttp2_transport* t); +static grpc_error* init_rst_stream_parser(grpc_chttp2_transport* t); +static grpc_error* init_settings_frame_parser(grpc_chttp2_transport* t); +static grpc_error* init_window_update_frame_parser(grpc_chttp2_transport* t); +static grpc_error* init_ping_parser(grpc_chttp2_transport* t); +static grpc_error* init_goaway_parser(grpc_chttp2_transport* t); +static grpc_error* init_skip_frame_parser(grpc_chttp2_transport* t, int is_header); -static grpc_error* parse_frame_slice(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, grpc_slice slice, +static grpc_error* parse_frame_slice(grpc_chttp2_transport* t, grpc_slice slice, int is_last); -grpc_error* grpc_chttp2_perform_read(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +grpc_error* grpc_chttp2_perform_read(grpc_chttp2_transport* t, grpc_slice slice) { uint8_t* beg = GRPC_SLICE_START_PTR(slice); uint8_t* end = GRPC_SLICE_END_PTR(slice); @@ -182,12 +171,12 @@ grpc_error* grpc_chttp2_perform_read(grpc_exec_ctx* exec_ctx, GPR_ASSERT(cur < end); t->incoming_stream_id |= ((uint32_t)*cur); t->deframe_state = GRPC_DTS_FRAME; - err = init_frame_parser(exec_ctx, t); + err = init_frame_parser(t); if (err != GRPC_ERROR_NONE) { return err; } if (t->incoming_frame_size == 0) { - err = parse_frame_slice(exec_ctx, t, grpc_empty_slice(), 1); + err = parse_frame_slice(t, grpc_empty_slice(), 1); if (err != GRPC_ERROR_NONE) { return err; } @@ -217,7 +206,7 @@ grpc_error* grpc_chttp2_perform_read(grpc_exec_ctx* exec_ctx, GPR_ASSERT(cur < end); if ((uint32_t)(end - cur) == t->incoming_frame_size) { err = - parse_frame_slice(exec_ctx, t, + parse_frame_slice(t, grpc_slice_sub_no_ref(slice, (size_t)(cur - beg), (size_t)(end - beg)), 1); @@ -230,7 +219,7 @@ grpc_error* grpc_chttp2_perform_read(grpc_exec_ctx* exec_ctx, } else if ((uint32_t)(end - cur) > t->incoming_frame_size) { size_t cur_offset = (size_t)(cur - beg); err = parse_frame_slice( - exec_ctx, t, + t, grpc_slice_sub_no_ref(slice, cur_offset, cur_offset + t->incoming_frame_size), 1); @@ -242,7 +231,7 @@ grpc_error* grpc_chttp2_perform_read(grpc_exec_ctx* exec_ctx, goto dts_fh_0; /* loop */ } else { err = - parse_frame_slice(exec_ctx, t, + parse_frame_slice(t, grpc_slice_sub_no_ref(slice, (size_t)(cur - beg), (size_t)(end - beg)), 0); @@ -258,8 +247,7 @@ grpc_error* grpc_chttp2_perform_read(grpc_exec_ctx* exec_ctx, GPR_UNREACHABLE_CODE(return nullptr); } -static grpc_error* init_frame_parser(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t) { +static grpc_error* init_frame_parser(grpc_chttp2_transport* t) { if (t->is_first_frame && t->incoming_frame_type != GRPC_CHTTP2_FRAME_SETTINGS) { char* msg; @@ -291,46 +279,43 @@ static grpc_error* init_frame_parser(grpc_exec_ctx* exec_ctx, gpr_free(msg); return err; } - return init_header_frame_parser(exec_ctx, t, 1); + return init_header_frame_parser(t, 1); } switch (t->incoming_frame_type) { case GRPC_CHTTP2_FRAME_DATA: - return init_data_frame_parser(exec_ctx, t); + return init_data_frame_parser(t); case GRPC_CHTTP2_FRAME_HEADER: - return init_header_frame_parser(exec_ctx, t, 0); + return init_header_frame_parser(t, 0); case GRPC_CHTTP2_FRAME_CONTINUATION: return GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Unexpected CONTINUATION frame"); case GRPC_CHTTP2_FRAME_RST_STREAM: - return init_rst_stream_parser(exec_ctx, t); + return init_rst_stream_parser(t); case GRPC_CHTTP2_FRAME_SETTINGS: - return init_settings_frame_parser(exec_ctx, t); + return init_settings_frame_parser(t); case GRPC_CHTTP2_FRAME_WINDOW_UPDATE: - return init_window_update_frame_parser(exec_ctx, t); + return init_window_update_frame_parser(t); case GRPC_CHTTP2_FRAME_PING: - return init_ping_parser(exec_ctx, t); + return init_ping_parser(t); case GRPC_CHTTP2_FRAME_GOAWAY: - return init_goaway_parser(exec_ctx, t); + return init_goaway_parser(t); default: if (grpc_http_trace.enabled()) { gpr_log(GPR_ERROR, "Unknown frame type %02x", t->incoming_frame_type); } - return init_skip_frame_parser(exec_ctx, t, 0); + return init_skip_frame_parser(t, 0); } } -static grpc_error* skip_parser(grpc_exec_ctx* exec_ctx, void* parser, - grpc_chttp2_transport* t, grpc_chttp2_stream* s, - grpc_slice slice, int is_last) { +static grpc_error* skip_parser(void* parser, grpc_chttp2_transport* t, + grpc_chttp2_stream* s, grpc_slice slice, + int is_last) { return GRPC_ERROR_NONE; } -static void skip_header(grpc_exec_ctx* exec_ctx, void* tp, grpc_mdelem md) { - GRPC_MDELEM_UNREF(exec_ctx, md); -} +static void skip_header(void* tp, grpc_mdelem md) { GRPC_MDELEM_UNREF(md); } -static grpc_error* init_skip_frame_parser(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +static grpc_error* init_skip_frame_parser(grpc_chttp2_transport* t, int is_header) { if (is_header) { uint8_t is_eoh = t->expect_continuation_stream_id != 0; @@ -346,14 +331,11 @@ static grpc_error* init_skip_frame_parser(grpc_exec_ctx* exec_ctx, return GRPC_ERROR_NONE; } -void grpc_chttp2_parsing_become_skip_parser(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t) { - init_skip_frame_parser(exec_ctx, t, - t->parser == grpc_chttp2_header_parser_parse); +void grpc_chttp2_parsing_become_skip_parser(grpc_chttp2_transport* t) { + init_skip_frame_parser(t, t->parser == grpc_chttp2_header_parser_parse); } -static grpc_error* init_data_frame_parser(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t) { +static grpc_error* init_data_frame_parser(grpc_chttp2_transport* t) { grpc_chttp2_stream* s = grpc_chttp2_parsing_lookup_stream(t, t->incoming_stream_id); grpc_error* err = GRPC_ERROR_NONE; @@ -365,17 +347,17 @@ static grpc_error* init_data_frame_parser(grpc_exec_ctx* exec_ctx, err = s->flow_control->RecvData(t->incoming_frame_size); action = s->flow_control->MakeAction(); } - grpc_chttp2_act_on_flowctl_action(exec_ctx, action, t, s); + grpc_chttp2_act_on_flowctl_action(action, t, s); if (err != GRPC_ERROR_NONE) { goto error_handler; } if (s == nullptr) { - return init_skip_frame_parser(exec_ctx, t, 0); + return init_skip_frame_parser(t, 0); } s->received_bytes += t->incoming_frame_size; s->stats.incoming.framing_bytes += 9; if (err == GRPC_ERROR_NONE && s->read_closed) { - return init_skip_frame_parser(exec_ctx, t, 0); + return init_skip_frame_parser(t, 0); } if (err == GRPC_ERROR_NONE) { err = grpc_chttp2_data_parser_begin_frame( @@ -394,13 +376,13 @@ error_handler: } else if (grpc_error_get_int(err, GRPC_ERROR_INT_STREAM_ID, nullptr)) { /* handle stream errors by closing the stream */ if (s != nullptr) { - grpc_chttp2_mark_stream_closed(exec_ctx, t, s, true, false, err); + grpc_chttp2_mark_stream_closed(t, s, true, false, err); } grpc_slice_buffer_add( &t->qbuf, grpc_chttp2_rst_stream_create(t->incoming_stream_id, GRPC_HTTP2_PROTOCOL_ERROR, &s->stats.outgoing)); - return init_skip_frame_parser(exec_ctx, t, 0); + return init_skip_frame_parser(t, 0); } else { return err; } @@ -408,8 +390,7 @@ error_handler: static void free_timeout(void* p) { gpr_free(p); } -static void on_initial_header(grpc_exec_ctx* exec_ctx, void* tp, - grpc_mdelem md) { +static void on_initial_header(void* tp, grpc_mdelem md) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)tp; grpc_chttp2_stream* s = t->incoming_stream; @@ -455,9 +436,9 @@ static void on_initial_header(grpc_exec_ctx* exec_ctx, void* tp, } if (timeout != GRPC_MILLIS_INF_FUTURE) { grpc_chttp2_incoming_metadata_buffer_set_deadline( - &s->metadata_buffer[0], grpc_exec_ctx_now(exec_ctx) + timeout); + &s->metadata_buffer[0], grpc_core::ExecCtx::Get()->Now() + timeout); } - GRPC_MDELEM_UNREF(exec_ctx, md); + GRPC_MDELEM_UNREF(md); } else { const size_t new_size = s->metadata_buffer[0].size + GRPC_MDELEM_LENGTH(md); const size_t metadata_size_limit = @@ -469,22 +450,22 @@ static void on_initial_header(grpc_exec_ctx* exec_ctx, void* tp, " vs. %" PRIuPTR ")", new_size, metadata_size_limit); grpc_chttp2_cancel_stream( - exec_ctx, t, s, + t, s, grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "received initial metadata size exceeds limit"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_RESOURCE_EXHAUSTED)); - grpc_chttp2_parsing_become_skip_parser(exec_ctx, t); + grpc_chttp2_parsing_become_skip_parser(t); s->seen_error = true; - GRPC_MDELEM_UNREF(exec_ctx, md); + GRPC_MDELEM_UNREF(md); } else { - grpc_error* error = grpc_chttp2_incoming_metadata_buffer_add( - exec_ctx, &s->metadata_buffer[0], md); + grpc_error* error = + grpc_chttp2_incoming_metadata_buffer_add(&s->metadata_buffer[0], md); if (error != GRPC_ERROR_NONE) { - grpc_chttp2_cancel_stream(exec_ctx, t, s, error); - grpc_chttp2_parsing_become_skip_parser(exec_ctx, t); + grpc_chttp2_cancel_stream(t, s, error); + grpc_chttp2_parsing_become_skip_parser(t); s->seen_error = true; - GRPC_MDELEM_UNREF(exec_ctx, md); + GRPC_MDELEM_UNREF(md); } } } @@ -492,8 +473,7 @@ static void on_initial_header(grpc_exec_ctx* exec_ctx, void* tp, GPR_TIMER_END("on_initial_header", 0); } -static void on_trailing_header(grpc_exec_ctx* exec_ctx, void* tp, - grpc_mdelem md) { +static void on_trailing_header(void* tp, grpc_mdelem md) { grpc_chttp2_transport* t = (grpc_chttp2_transport*)tp; grpc_chttp2_stream* s = t->incoming_stream; @@ -527,30 +507,29 @@ static void on_trailing_header(grpc_exec_ctx* exec_ctx, void* tp, " vs. %" PRIuPTR ")", new_size, metadata_size_limit); grpc_chttp2_cancel_stream( - exec_ctx, t, s, + t, s, grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "received trailing metadata size exceeds limit"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_RESOURCE_EXHAUSTED)); - grpc_chttp2_parsing_become_skip_parser(exec_ctx, t); + grpc_chttp2_parsing_become_skip_parser(t); s->seen_error = true; - GRPC_MDELEM_UNREF(exec_ctx, md); + GRPC_MDELEM_UNREF(md); } else { - grpc_error* error = grpc_chttp2_incoming_metadata_buffer_add( - exec_ctx, &s->metadata_buffer[1], md); + grpc_error* error = + grpc_chttp2_incoming_metadata_buffer_add(&s->metadata_buffer[1], md); if (error != GRPC_ERROR_NONE) { - grpc_chttp2_cancel_stream(exec_ctx, t, s, error); - grpc_chttp2_parsing_become_skip_parser(exec_ctx, t); + grpc_chttp2_cancel_stream(t, s, error); + grpc_chttp2_parsing_become_skip_parser(t); s->seen_error = true; - GRPC_MDELEM_UNREF(exec_ctx, md); + GRPC_MDELEM_UNREF(md); } } GPR_TIMER_END("on_trailing_header", 0); } -static grpc_error* init_header_frame_parser(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, +static grpc_error* init_header_frame_parser(grpc_chttp2_transport* t, int is_continuation) { uint8_t is_eoh = (t->incoming_frame_flags & GRPC_CHTTP2_DATA_FLAG_END_HEADERS) != 0; @@ -580,7 +559,7 @@ static grpc_error* init_header_frame_parser(grpc_exec_ctx* exec_ctx, GRPC_CHTTP2_IF_TRACING( gpr_log(GPR_ERROR, "grpc_chttp2_stream disbanded before CONTINUATION received")); - return init_skip_frame_parser(exec_ctx, t, 1); + return init_skip_frame_parser(t, 1); } if (t->is_client) { if ((t->incoming_stream_id & 1) && @@ -590,7 +569,7 @@ static grpc_error* init_header_frame_parser(grpc_exec_ctx* exec_ctx, GRPC_CHTTP2_IF_TRACING(gpr_log( GPR_ERROR, "ignoring new grpc_chttp2_stream creation on client")); } - grpc_error* err = init_skip_frame_parser(exec_ctx, t, 1); + grpc_error* err = init_skip_frame_parser(t, 1); if (t->incoming_frame_flags & GRPC_CHTTP2_FLAG_HAS_PRIORITY) { grpc_chttp2_hpack_parser_set_has_priority(&t->hpack_parser); } @@ -602,13 +581,13 @@ static grpc_error* init_header_frame_parser(grpc_exec_ctx* exec_ctx, "last grpc_chttp2_stream " "id=%d, new grpc_chttp2_stream id=%d", t->last_new_stream_id, t->incoming_stream_id)); - return init_skip_frame_parser(exec_ctx, t, 1); + return init_skip_frame_parser(t, 1); } else if ((t->incoming_stream_id & 1) == 0) { GRPC_CHTTP2_IF_TRACING(gpr_log( GPR_ERROR, "ignoring grpc_chttp2_stream with non-client generated index %d", t->incoming_stream_id)); - return init_skip_frame_parser(exec_ctx, t, 1); + return init_skip_frame_parser(t, 1); } else if (grpc_chttp2_stream_map_size(&t->stream_map) >= t->settings[GRPC_ACKED_SETTINGS] [GRPC_CHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS]) { @@ -616,11 +595,11 @@ static grpc_error* init_header_frame_parser(grpc_exec_ctx* exec_ctx, } t->last_new_stream_id = t->incoming_stream_id; s = t->incoming_stream = - grpc_chttp2_parsing_accept_stream(exec_ctx, t, t->incoming_stream_id); + grpc_chttp2_parsing_accept_stream(t, t->incoming_stream_id); if (s == nullptr) { GRPC_CHTTP2_IF_TRACING( gpr_log(GPR_ERROR, "grpc_chttp2_stream not accepted")); - return init_skip_frame_parser(exec_ctx, t, 1); + return init_skip_frame_parser(t, 1); } } else { t->incoming_stream = s; @@ -631,7 +610,7 @@ static grpc_error* init_header_frame_parser(grpc_exec_ctx* exec_ctx, GRPC_CHTTP2_IF_TRACING(gpr_log( GPR_ERROR, "skipping already closed grpc_chttp2_stream header")); t->incoming_stream = nullptr; - return init_skip_frame_parser(exec_ctx, t, 1); + return init_skip_frame_parser(t, 1); } t->parser = grpc_chttp2_header_parser_parse; t->parser_data = &t->hpack_parser; @@ -656,7 +635,7 @@ static grpc_error* init_header_frame_parser(grpc_exec_ctx* exec_ctx, break; case 2: gpr_log(GPR_ERROR, "too many header frames received"); - return init_skip_frame_parser(exec_ctx, t, 1); + return init_skip_frame_parser(t, 1); } t->hpack_parser.on_header_user_data = t; t->hpack_parser.is_boundary = is_eoh; @@ -668,8 +647,7 @@ static grpc_error* init_header_frame_parser(grpc_exec_ctx* exec_ctx, return GRPC_ERROR_NONE; } -static grpc_error* init_window_update_frame_parser(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t) { +static grpc_error* init_window_update_frame_parser(grpc_chttp2_transport* t) { grpc_error* err = grpc_chttp2_window_update_parser_begin_frame( &t->simple.window_update, t->incoming_frame_size, t->incoming_frame_flags); @@ -678,7 +656,7 @@ static grpc_error* init_window_update_frame_parser(grpc_exec_ctx* exec_ctx, grpc_chttp2_stream* s = t->incoming_stream = grpc_chttp2_parsing_lookup_stream(t, t->incoming_stream_id); if (s == nullptr) { - return init_skip_frame_parser(exec_ctx, t, 0); + return init_skip_frame_parser(t, 0); } s->stats.incoming.framing_bytes += 9; } @@ -687,8 +665,7 @@ static grpc_error* init_window_update_frame_parser(grpc_exec_ctx* exec_ctx, return GRPC_ERROR_NONE; } -static grpc_error* init_ping_parser(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t) { +static grpc_error* init_ping_parser(grpc_chttp2_transport* t) { grpc_error* err = grpc_chttp2_ping_parser_begin_frame( &t->simple.ping, t->incoming_frame_size, t->incoming_frame_flags); if (err != GRPC_ERROR_NONE) return err; @@ -697,15 +674,14 @@ static grpc_error* init_ping_parser(grpc_exec_ctx* exec_ctx, return GRPC_ERROR_NONE; } -static grpc_error* init_rst_stream_parser(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t) { +static grpc_error* init_rst_stream_parser(grpc_chttp2_transport* t) { grpc_error* err = grpc_chttp2_rst_stream_parser_begin_frame( &t->simple.rst_stream, t->incoming_frame_size, t->incoming_frame_flags); if (err != GRPC_ERROR_NONE) return err; grpc_chttp2_stream* s = t->incoming_stream = grpc_chttp2_parsing_lookup_stream(t, t->incoming_stream_id); if (!t->incoming_stream) { - return init_skip_frame_parser(exec_ctx, t, 0); + return init_skip_frame_parser(t, 0); } s->stats.incoming.framing_bytes += 9; t->parser = grpc_chttp2_rst_stream_parser_parse; @@ -713,8 +689,7 @@ static grpc_error* init_rst_stream_parser(grpc_exec_ctx* exec_ctx, return GRPC_ERROR_NONE; } -static grpc_error* init_goaway_parser(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t) { +static grpc_error* init_goaway_parser(grpc_chttp2_transport* t) { grpc_error* err = grpc_chttp2_goaway_parser_begin_frame( &t->goaway_parser, t->incoming_frame_size, t->incoming_frame_flags); if (err != GRPC_ERROR_NONE) return err; @@ -723,8 +698,7 @@ static grpc_error* init_goaway_parser(grpc_exec_ctx* exec_ctx, return GRPC_ERROR_NONE; } -static grpc_error* init_settings_frame_parser(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t) { +static grpc_error* init_settings_frame_parser(grpc_chttp2_transport* t) { if (t->incoming_stream_id != 0) { return GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Settings frame received for grpc_chttp2_stream"); @@ -740,7 +714,7 @@ static grpc_error* init_settings_frame_parser(grpc_exec_ctx* exec_ctx, memcpy(t->settings[GRPC_ACKED_SETTINGS], t->settings[GRPC_SENT_SETTINGS], GRPC_CHTTP2_NUM_SETTINGS * sizeof(uint32_t)); grpc_chttp2_hptbl_set_max_bytes( - exec_ctx, &t->hpack_parser.table, + &t->hpack_parser.table, t->settings[GRPC_ACKED_SETTINGS] [GRPC_CHTTP2_SETTINGS_HEADER_TABLE_SIZE]); t->sent_local_settings = 0; @@ -750,11 +724,10 @@ static grpc_error* init_settings_frame_parser(grpc_exec_ctx* exec_ctx, return GRPC_ERROR_NONE; } -static grpc_error* parse_frame_slice(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t, grpc_slice slice, +static grpc_error* parse_frame_slice(grpc_chttp2_transport* t, grpc_slice slice, int is_last) { grpc_chttp2_stream* s = t->incoming_stream; - grpc_error* err = t->parser(exec_ctx, t->parser_data, t, s, slice, is_last); + grpc_error* err = t->parser(t->parser_data, t, s, slice, is_last); if (err == GRPC_ERROR_NONE) { return err; } else if (grpc_error_get_int(err, GRPC_ERROR_INT_STREAM_ID, nullptr)) { @@ -762,7 +735,7 @@ static grpc_error* parse_frame_slice(grpc_exec_ctx* exec_ctx, const char* msg = grpc_error_string(err); gpr_log(GPR_ERROR, "%s", msg); } - grpc_chttp2_parsing_become_skip_parser(exec_ctx, t); + grpc_chttp2_parsing_become_skip_parser(t); if (s) { s->forced_close_error = err; grpc_slice_buffer_add( diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc index 204b5a77087..3310f35f5fe 100644 --- a/src/core/ext/transport/chttp2/transport/writing.cc +++ b/src/core/ext/transport/chttp2/transport/writing.cc @@ -33,17 +33,15 @@ static void add_to_write_list(grpc_chttp2_write_cb** list, *list = cb; } -static void finish_write_cb(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, - grpc_chttp2_stream* s, grpc_chttp2_write_cb* cb, - grpc_error* error) { - grpc_chttp2_complete_closure_step(exec_ctx, t, s, &cb->closure, error, +static void finish_write_cb(grpc_chttp2_transport* t, grpc_chttp2_stream* s, + grpc_chttp2_write_cb* cb, grpc_error* error) { + grpc_chttp2_complete_closure_step(t, s, &cb->closure, error, "finish_write_cb"); cb->next = t->write_cb_pool; t->write_cb_pool = cb; } -static void maybe_initiate_ping(grpc_exec_ctx* exec_ctx, - grpc_chttp2_transport* t) { +static void maybe_initiate_ping(grpc_chttp2_transport* t) { grpc_chttp2_ping_queue* pq = &t->ping_queue; if (grpc_closure_list_empty(pq->lists[GRPC_CHTTP2_PCL_NEXT])) { /* no ping needed: wait */ @@ -68,7 +66,7 @@ static void maybe_initiate_ping(grpc_exec_ctx* exec_ctx, } return; } - grpc_millis now = grpc_exec_ctx_now(exec_ctx); + grpc_millis now = grpc_core::ExecCtx::Get()->Now(); grpc_millis next_allowed_ping = t->ping_state.last_ping_sent_time + t->ping_policy.min_sent_ping_interval_without_data; @@ -89,20 +87,20 @@ static void maybe_initiate_ping(grpc_exec_ctx* exec_ctx, } if (!t->ping_state.is_delayed_ping_timer_set) { t->ping_state.is_delayed_ping_timer_set = true; - grpc_timer_init(exec_ctx, &t->ping_state.delayed_ping_timer, - next_allowed_ping, &t->retry_initiate_ping_locked); + grpc_timer_init(&t->ping_state.delayed_ping_timer, next_allowed_ping, + &t->retry_initiate_ping_locked); } return; } pq->inflight_id = t->ping_ctr; t->ping_ctr++; - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pq->lists[GRPC_CHTTP2_PCL_INITIATE]); + GRPC_CLOSURE_LIST_SCHED(&pq->lists[GRPC_CHTTP2_PCL_INITIATE]); grpc_closure_list_move(&pq->lists[GRPC_CHTTP2_PCL_NEXT], &pq->lists[GRPC_CHTTP2_PCL_INFLIGHT]); grpc_slice_buffer_add(&t->outbuf, grpc_chttp2_ping_create(false, pq->inflight_id)); - GRPC_STATS_INC_HTTP2_PINGS_SENT(exec_ctx); + GRPC_STATS_INC_HTTP2_PINGS_SENT(); t->ping_state.last_ping_sent_time = now; if (grpc_http_trace.enabled() || grpc_bdp_estimator_trace.enabled()) { gpr_log(GPR_DEBUG, "%s: Ping sent [%p]: %d/%d", @@ -114,10 +112,9 @@ static void maybe_initiate_ping(grpc_exec_ctx* exec_ctx, (t->ping_state.pings_before_data_required != 0); } -static bool update_list(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, - grpc_chttp2_stream* s, int64_t send_bytes, - grpc_chttp2_write_cb** list, int64_t* ctr, - grpc_error* error) { +static bool update_list(grpc_chttp2_transport* t, grpc_chttp2_stream* s, + int64_t send_bytes, grpc_chttp2_write_cb** list, + int64_t* ctr, grpc_error* error) { bool sched_any = false; grpc_chttp2_write_cb* cb = *list; *list = nullptr; @@ -126,7 +123,7 @@ static bool update_list(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, grpc_chttp2_write_cb* next = cb->next; if (cb->call_at_byte <= *ctr) { sched_any = true; - finish_write_cb(exec_ctx, t, s, cb, GRPC_ERROR_REF(error)); + finish_write_cb(t, s, cb, GRPC_ERROR_REF(error)); } else { add_to_write_list(list, cb); } @@ -179,22 +176,22 @@ class StreamWriteContext; class WriteContext { public: - WriteContext(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t) : t_(t) { - GRPC_STATS_INC_HTTP2_WRITES_BEGUN(exec_ctx); + WriteContext(grpc_chttp2_transport* t) : t_(t) { + GRPC_STATS_INC_HTTP2_WRITES_BEGUN(); GPR_TIMER_BEGIN("grpc_chttp2_begin_write", 0); } // TODO(ctiller): make this the destructor - void FlushStats(grpc_exec_ctx* exec_ctx) { + void FlushStats() { GRPC_STATS_INC_HTTP2_SEND_INITIAL_METADATA_PER_WRITE( - exec_ctx, initial_metadata_writes_); - GRPC_STATS_INC_HTTP2_SEND_MESSAGE_PER_WRITE(exec_ctx, message_writes_); + initial_metadata_writes_); + GRPC_STATS_INC_HTTP2_SEND_MESSAGE_PER_WRITE(message_writes_); GRPC_STATS_INC_HTTP2_SEND_TRAILING_METADATA_PER_WRITE( - exec_ctx, trailing_metadata_writes_); - GRPC_STATS_INC_HTTP2_SEND_FLOWCTL_PER_WRITE(exec_ctx, flow_control_writes_); + trailing_metadata_writes_); + GRPC_STATS_INC_HTTP2_SEND_FLOWCTL_PER_WRITE(flow_control_writes_); } - void FlushSettings(grpc_exec_ctx* exec_ctx) { + void FlushSettings() { if (t_->dirtied_local_settings && !t_->sent_local_settings) { grpc_slice_buffer_add( &t_->outbuf, grpc_chttp2_settings_create( @@ -204,17 +201,17 @@ class WriteContext { t_->force_send_settings = false; t_->dirtied_local_settings = false; t_->sent_local_settings = true; - GRPC_STATS_INC_HTTP2_SETTINGS_WRITES(exec_ctx); + GRPC_STATS_INC_HTTP2_SETTINGS_WRITES(); } } - void FlushQueuedBuffers(grpc_exec_ctx* exec_ctx) { + void FlushQueuedBuffers() { /* simple writes are queued to qbuf, and flushed here */ grpc_slice_buffer_move_into(&t_->qbuf, &t_->outbuf); GPR_ASSERT(t_->qbuf.count == 0); } - void FlushWindowUpdates(grpc_exec_ctx* exec_ctx) { + void FlushWindowUpdates() { uint32_t transport_announce = t_->flow_control->MaybeSendUpdate(t_->outbuf.count > 0); if (transport_announce) { @@ -234,7 +231,7 @@ class WriteContext { t_->ping_ack_count = 0; } - void EnactHpackSettings(grpc_exec_ctx* exec_ctx) { + void EnactHpackSettings() { grpc_chttp2_hpack_compressor_set_max_table_size( &t_->hpack_compressor, t_->settings[GRPC_PEER_SETTINGS] @@ -374,8 +371,8 @@ class DataSendContext { bool is_last_frame() const { return is_last_frame_; } - void CallCallbacks(grpc_exec_ctx* exec_ctx) { - if (update_list(exec_ctx, t_, s_, + void CallCallbacks() { + if (update_list(t_, s_, (int64_t)(s_->sending_bytes - sending_bytes_before_), &s_->on_flow_controlled_cbs, &s_->flow_controlled_bytes_flowed, GRPC_ERROR_NONE)) { @@ -403,7 +400,7 @@ class StreamWriteContext { s->flow_control->announced_window_delta()))); } - void FlushInitialMetadata(grpc_exec_ctx* exec_ctx) { + void FlushInitialMetadata() { /* send initial metadata if it's available */ if (s_->sent_initial_metadata) return; if (s_->send_initial_metadata == nullptr) return; @@ -430,7 +427,7 @@ class StreamWriteContext { [GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE], // max_frame_size &s_->stats.outgoing // stats }; - grpc_chttp2_encode_header(exec_ctx, &t_->hpack_compressor, nullptr, 0, + grpc_chttp2_encode_header(&t_->hpack_compressor, nullptr, 0, s_->send_initial_metadata, &hopt, &t_->outbuf); write_context_->ResetPingRecvClock(); write_context_->IncInitialMetadataWrites(); @@ -440,11 +437,11 @@ class StreamWriteContext { s_->sent_initial_metadata = true; write_context_->NoteScheduledResults(); grpc_chttp2_complete_closure_step( - exec_ctx, t_, s_, &s_->send_initial_metadata_finished, GRPC_ERROR_NONE, + t_, s_, &s_->send_initial_metadata_finished, GRPC_ERROR_NONE, "send_initial_metadata_finished"); } - void FlushWindowUpdates(grpc_exec_ctx* exec_ctx) { + void FlushWindowUpdates() { /* send any window updates */ const uint32_t stream_announce = s_->flow_control->MaybeSendUpdate(); if (stream_announce == 0) return; @@ -456,7 +453,7 @@ class StreamWriteContext { write_context_->IncWindowUpdateWrites(); } - void FlushData(grpc_exec_ctx* exec_ctx) { + void FlushData() { if (!s_->sent_initial_metadata) return; if (s_->flow_controlled_buffer.length == 0 && @@ -488,9 +485,9 @@ class StreamWriteContext { } write_context_->ResetPingRecvClock(); if (data_send_context.is_last_frame()) { - SentLastFrame(exec_ctx); + SentLastFrame(); } - data_send_context.CallCallbacks(exec_ctx); + data_send_context.CallCallbacks(); stream_became_writable_ = true; if (s_->flow_controlled_buffer.length > 0 || s_->compressed_data_buffer.length > 0) { @@ -500,7 +497,7 @@ class StreamWriteContext { write_context_->IncMessageWrites(); } - void FlushTrailingMetadata(grpc_exec_ctx* exec_ctx) { + void FlushTrailingMetadata() { if (!s_->sent_initial_metadata) return; if (s_->send_trailing_metadata == nullptr) return; @@ -521,18 +518,18 @@ class StreamWriteContext { t_->settings[GRPC_PEER_SETTINGS][GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE], &s_->stats.outgoing}; - grpc_chttp2_encode_header(exec_ctx, &t_->hpack_compressor, + grpc_chttp2_encode_header(&t_->hpack_compressor, extra_headers_for_trailing_metadata_, num_extra_headers_for_trailing_metadata_, s_->send_trailing_metadata, &hopt, &t_->outbuf); } write_context_->IncTrailingMetadataWrites(); write_context_->ResetPingRecvClock(); - SentLastFrame(exec_ctx); + SentLastFrame(); write_context_->NoteScheduledResults(); grpc_chttp2_complete_closure_step( - exec_ctx, t_, s_, &s_->send_trailing_metadata_finished, GRPC_ERROR_NONE, + t_, s_, &s_->send_trailing_metadata_finished, GRPC_ERROR_NONE, "send_trailing_metadata_finished"); } @@ -556,7 +553,7 @@ class StreamWriteContext { } } - void SentLastFrame(grpc_exec_ctx* exec_ctx) { + void SentLastFrame() { s_->send_trailing_metadata = nullptr; s_->sent_trailing_metadata = true; @@ -565,7 +562,7 @@ class StreamWriteContext { &t_->outbuf, grpc_chttp2_rst_stream_create( s_->id, GRPC_HTTP2_NO_ERROR, &s_->stats.outgoing)); } - grpc_chttp2_mark_stream_closed(exec_ctx, t_, s_, !t_->is_client, true, + grpc_chttp2_mark_stream_closed(t_, s_, !t_->is_client, true, GRPC_ERROR_NONE); } @@ -579,12 +576,12 @@ class StreamWriteContext { } // namespace grpc_chttp2_begin_write_result grpc_chttp2_begin_write( - grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t) { - WriteContext ctx(exec_ctx, t); - ctx.FlushSettings(exec_ctx); + grpc_chttp2_transport* t) { + WriteContext ctx(t); + ctx.FlushSettings(); ctx.FlushPingAcks(); - ctx.FlushQueuedBuffers(exec_ctx); - ctx.EnactHpackSettings(exec_ctx); + ctx.FlushQueuedBuffers(); + ctx.EnactHpackSettings(); if (t->flow_control->remote_window() > 0) { ctx.UpdateStreamsNoLongerStalled(); @@ -594,47 +591,45 @@ grpc_chttp2_begin_write_result grpc_chttp2_begin_write( (according to available window sizes) and add to the output buffer */ while (grpc_chttp2_stream* s = ctx.NextStream()) { StreamWriteContext stream_ctx(&ctx, s); - stream_ctx.FlushInitialMetadata(exec_ctx); - stream_ctx.FlushWindowUpdates(exec_ctx); - stream_ctx.FlushData(exec_ctx); - stream_ctx.FlushTrailingMetadata(exec_ctx); + stream_ctx.FlushInitialMetadata(); + stream_ctx.FlushWindowUpdates(); + stream_ctx.FlushData(); + stream_ctx.FlushTrailingMetadata(); if (stream_ctx.stream_became_writable()) { if (!grpc_chttp2_list_add_writing_stream(t, s)) { /* already in writing list: drop ref */ - GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "chttp2_writing:already_writing"); + GRPC_CHTTP2_STREAM_UNREF(s, "chttp2_writing:already_writing"); } else { /* ref will be dropped at end of write */ } } else { - GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "chttp2_writing:no_write"); + GRPC_CHTTP2_STREAM_UNREF(s, "chttp2_writing:no_write"); } } - ctx.FlushWindowUpdates(exec_ctx); + ctx.FlushWindowUpdates(); - maybe_initiate_ping(exec_ctx, t); + maybe_initiate_ping(t); GPR_TIMER_END("grpc_chttp2_begin_write", 0); return ctx.Result(); } -void grpc_chttp2_end_write(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t, - grpc_error* error) { +void grpc_chttp2_end_write(grpc_chttp2_transport* t, grpc_error* error) { GPR_TIMER_BEGIN("grpc_chttp2_end_write", 0); grpc_chttp2_stream* s; while (grpc_chttp2_list_pop_writing_stream(t, &s)) { if (s->sending_bytes != 0) { - update_list(exec_ctx, t, s, (int64_t)s->sending_bytes, - &s->on_write_finished_cbs, &s->flow_controlled_bytes_written, - GRPC_ERROR_REF(error)); + update_list(t, s, (int64_t)s->sending_bytes, &s->on_write_finished_cbs, + &s->flow_controlled_bytes_written, GRPC_ERROR_REF(error)); s->sending_bytes = 0; } - GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "chttp2_writing:end"); + GRPC_CHTTP2_STREAM_UNREF(s, "chttp2_writing:end"); } - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &t->outbuf); + grpc_slice_buffer_reset_and_unref_internal(&t->outbuf); GRPC_ERROR_UNREF(error); GPR_TIMER_END("grpc_chttp2_end_write", 0); } diff --git a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc index d590ba03711..40a30e4a31d 100644 --- a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc +++ b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc @@ -49,7 +49,6 @@ GRPCAPI grpc_channel* grpc_cronet_secure_channel_create( grpc_transport* ct = grpc_create_cronet_transport(engine, target, args, reserved); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - return grpc_channel_create(&exec_ctx, target, args, - GRPC_CLIENT_DIRECT_CHANNEL, ct); + grpc_core::ExecCtx exec_ctx; + return grpc_channel_create(target, args, GRPC_CLIENT_DIRECT_CHANNEL, ct); } diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index 4d24efe47b1..c9fd94176bd 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -197,27 +197,23 @@ typedef struct stream_obj stream_obj; #ifndef NDEBUG #define GRPC_CRONET_STREAM_REF(stream, reason) \ grpc_cronet_stream_ref((stream), (reason)) -#define GRPC_CRONET_STREAM_UNREF(exec_ctx, stream, reason) \ - grpc_cronet_stream_unref((exec_ctx), (stream), (reason)) +#define GRPC_CRONET_STREAM_UNREF(stream, reason) \ + grpc_cronet_stream_unref((stream), (reason)) void grpc_cronet_stream_ref(stream_obj* s, const char* reason) { grpc_stream_ref(s->refcount, reason); } -void grpc_cronet_stream_unref(grpc_exec_ctx* exec_ctx, stream_obj* s, - const char* reason) { - grpc_stream_unref(exec_ctx, s->refcount, reason); +void grpc_cronet_stream_unref(stream_obj* s, const char* reason) { + grpc_stream_unref(s->refcount, reason); } #else #define GRPC_CRONET_STREAM_REF(stream, reason) grpc_cronet_stream_ref((stream)) -#define GRPC_CRONET_STREAM_UNREF(exec_ctx, stream, reason) \ - grpc_cronet_stream_unref((exec_ctx), (stream)) +#define GRPC_CRONET_STREAM_UNREF(stream, reason) \ + grpc_cronet_stream_unref((stream)) void grpc_cronet_stream_ref(stream_obj* s) { grpc_stream_ref(s->refcount); } -void grpc_cronet_stream_unref(grpc_exec_ctx* exec_ctx, stream_obj* s) { - grpc_stream_unref(exec_ctx, s->refcount); -} +void grpc_cronet_stream_unref(stream_obj* s) { grpc_stream_unref(s->refcount); } #endif -static enum e_op_result execute_stream_op(grpc_exec_ctx* exec_ctx, - struct op_and_state* oas); +static enum e_op_result execute_stream_op(struct op_and_state* oas); /* Utility function to translate enum into string for printing @@ -373,12 +369,12 @@ static void remove_from_storage(struct stream_obj* s, This can get executed from the Cronet network thread via cronet callback or on the application supplied thread via the perform_stream_op function. */ -static void execute_from_storage(grpc_exec_ctx* exec_ctx, stream_obj* s) { +static void execute_from_storage(stream_obj* s) { gpr_mu_lock(&s->mu); for (struct op_and_state* curr = s->storage.head; curr != nullptr;) { CRONET_LOG(GPR_DEBUG, "calling op at %p. done = %d", curr, curr->done); GPR_ASSERT(curr->done == 0); - enum e_op_result result = execute_stream_op(exec_ctx, curr); + enum e_op_result result = execute_stream_op(curr); CRONET_LOG(GPR_DEBUG, "execute_stream_op[%p] returns %s", curr, op_result_string(result)); /* if this op is done, then remove it and free memory */ @@ -402,7 +398,7 @@ static void execute_from_storage(grpc_exec_ctx* exec_ctx, stream_obj* s) { */ static void on_failed(bidirectional_stream* stream, int net_error) { CRONET_LOG(GPR_DEBUG, "on_failed(%p, %d)", stream, net_error); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; stream_obj* s = (stream_obj*)stream->annotation; gpr_mu_lock(&s->mu); @@ -419,9 +415,8 @@ static void on_failed(bidirectional_stream* stream, int net_error) { } null_and_maybe_free_read_buffer(s); gpr_mu_unlock(&s->mu); - execute_from_storage(&exec_ctx, s); - GRPC_CRONET_STREAM_UNREF(&exec_ctx, s, "cronet transport"); - grpc_exec_ctx_finish(&exec_ctx); + execute_from_storage(s); + GRPC_CRONET_STREAM_UNREF(s, "cronet transport"); } /* @@ -429,7 +424,7 @@ static void on_failed(bidirectional_stream* stream, int net_error) { */ static void on_canceled(bidirectional_stream* stream) { CRONET_LOG(GPR_DEBUG, "on_canceled(%p)", stream); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; stream_obj* s = (stream_obj*)stream->annotation; gpr_mu_lock(&s->mu); @@ -446,9 +441,8 @@ static void on_canceled(bidirectional_stream* stream) { } null_and_maybe_free_read_buffer(s); gpr_mu_unlock(&s->mu); - execute_from_storage(&exec_ctx, s); - GRPC_CRONET_STREAM_UNREF(&exec_ctx, s, "cronet transport"); - grpc_exec_ctx_finish(&exec_ctx); + execute_from_storage(s); + GRPC_CRONET_STREAM_UNREF(s, "cronet transport"); } /* @@ -456,7 +450,7 @@ static void on_canceled(bidirectional_stream* stream) { */ static void on_succeeded(bidirectional_stream* stream) { CRONET_LOG(GPR_DEBUG, "on_succeeded(%p)", stream); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; stream_obj* s = (stream_obj*)stream->annotation; gpr_mu_lock(&s->mu); @@ -465,9 +459,8 @@ static void on_succeeded(bidirectional_stream* stream) { s->cbs = nullptr; null_and_maybe_free_read_buffer(s); gpr_mu_unlock(&s->mu); - execute_from_storage(&exec_ctx, s); - GRPC_CRONET_STREAM_UNREF(&exec_ctx, s, "cronet transport"); - grpc_exec_ctx_finish(&exec_ctx); + execute_from_storage(s); + GRPC_CRONET_STREAM_UNREF(s, "cronet transport"); } /* @@ -475,7 +468,7 @@ static void on_succeeded(bidirectional_stream* stream) { */ static void on_stream_ready(bidirectional_stream* stream) { CRONET_LOG(GPR_DEBUG, "W: on_stream_ready(%p)", stream); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; stream_obj* s = (stream_obj*)stream->annotation; grpc_cronet_transport* t = (grpc_cronet_transport*)s->curr_ct; gpr_mu_lock(&s->mu); @@ -495,8 +488,7 @@ static void on_stream_ready(bidirectional_stream* stream) { } } gpr_mu_unlock(&s->mu); - execute_from_storage(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + execute_from_storage(s); } /* @@ -506,7 +498,7 @@ static void on_response_headers_received( bidirectional_stream* stream, const bidirectional_stream_header_array* headers, const char* negotiated_protocol) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; CRONET_LOG(GPR_DEBUG, "R: on_response_headers_received(%p, %p, %s)", stream, headers, negotiated_protocol); stream_obj* s = (stream_obj*)stream->annotation; @@ -528,9 +520,8 @@ static void on_response_headers_received( for (size_t i = 0; i < headers->count; i++) { GRPC_LOG_IF_ERROR("on_response_headers_received", grpc_chttp2_incoming_metadata_buffer_add( - &exec_ctx, &s->state.rs.initial_metadata, + &s->state.rs.initial_metadata, grpc_mdelem_from_slices( - &exec_ctx, grpc_slice_intern(grpc_slice_from_static_string( headers->headers[i].key)), grpc_slice_intern(grpc_slice_from_static_string( @@ -552,15 +543,14 @@ static void on_response_headers_received( s->state.pending_read_from_cronet = true; } gpr_mu_unlock(&s->mu); - execute_from_storage(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + execute_from_storage(s); } /* Cronet callback */ static void on_write_completed(bidirectional_stream* stream, const char* data) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; stream_obj* s = (stream_obj*)stream->annotation; CRONET_LOG(GPR_DEBUG, "W: on_write_completed(%p, %s)", stream, data); gpr_mu_lock(&s->mu); @@ -570,8 +560,7 @@ static void on_write_completed(bidirectional_stream* stream, const char* data) { } s->state.state_callback_received[OP_SEND_MESSAGE] = true; gpr_mu_unlock(&s->mu); - execute_from_storage(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + execute_from_storage(s); } /* @@ -579,7 +568,7 @@ static void on_write_completed(bidirectional_stream* stream, const char* data) { */ static void on_read_completed(bidirectional_stream* stream, char* data, int count) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; stream_obj* s = (stream_obj*)stream->annotation; CRONET_LOG(GPR_DEBUG, "R: on_read_completed(%p, %p, %d)", stream, data, count); @@ -605,15 +594,14 @@ static void on_read_completed(bidirectional_stream* stream, char* data, gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - execute_from_storage(&exec_ctx, s); + execute_from_storage(s); } } else { null_and_maybe_free_read_buffer(s); s->state.rs.read_stream_closed = true; gpr_mu_unlock(&s->mu); - execute_from_storage(&exec_ctx, s); + execute_from_storage(s); } - grpc_exec_ctx_finish(&exec_ctx); } /* @@ -622,7 +610,7 @@ static void on_read_completed(bidirectional_stream* stream, char* data, static void on_response_trailers_received( bidirectional_stream* stream, const bidirectional_stream_header_array* trailers) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; CRONET_LOG(GPR_DEBUG, "R: on_response_trailers_received(%p,%p)", stream, trailers); stream_obj* s = (stream_obj*)stream->annotation; @@ -638,9 +626,8 @@ static void on_response_trailers_received( trailers->headers[i].value); GRPC_LOG_IF_ERROR("on_response_trailers_received", grpc_chttp2_incoming_metadata_buffer_add( - &exec_ctx, &s->state.rs.trailing_metadata, + &s->state.rs.trailing_metadata, grpc_mdelem_from_slices( - &exec_ctx, grpc_slice_intern(grpc_slice_from_static_string( trailers->headers[i].key)), grpc_slice_intern(grpc_slice_from_static_string( @@ -670,17 +657,15 @@ static void on_response_trailers_received( gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - execute_from_storage(&exec_ctx, s); + execute_from_storage(s); } - grpc_exec_ctx_finish(&exec_ctx); } /* Utility function that takes the data from s->write_slice_buffer and assembles into a contiguous byte stream with 5 byte gRPC header prepended. */ -static void create_grpc_frame(grpc_exec_ctx* exec_ctx, - grpc_slice_buffer* write_slice_buffer, +static void create_grpc_frame(grpc_slice_buffer* write_slice_buffer, char** pp_write_buffer, size_t* p_write_buffer_size, uint32_t flags) { grpc_slice slice = grpc_slice_buffer_take_first(write_slice_buffer); @@ -700,7 +685,7 @@ static void create_grpc_frame(grpc_exec_ctx* exec_ctx, *p++ = (uint8_t)(length); /* append actual data */ memcpy(p, GRPC_SLICE_START_PTR(slice), length); - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); } /* @@ -981,8 +966,7 @@ static bool op_can_be_run(grpc_transport_stream_op_batch* curr_op, /* TODO (makdharma): Break down this function in smaller chunks for readability. */ -static enum e_op_result execute_stream_op(grpc_exec_ctx* exec_ctx, - struct op_and_state* oas) { +static enum e_op_result execute_stream_op(struct op_and_state* oas) { grpc_transport_stream_op_batch* stream_op = &oas->op; struct stream_obj* s = oas->s; grpc_cronet_transport* t = (grpc_cronet_transport*)s->curr_ct; @@ -1040,15 +1024,14 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx* exec_ctx, grpc_slice slice; grpc_slice_buffer_init(&write_slice_buffer); if (1 != grpc_byte_stream_next( - exec_ctx, stream_op->payload->send_message.send_message, + stream_op->payload->send_message.send_message, stream_op->payload->send_message.send_message->length, nullptr)) { /* Should never reach here */ GPR_ASSERT(false); } if (GRPC_ERROR_NONE != - grpc_byte_stream_pull(exec_ctx, - stream_op->payload->send_message.send_message, + grpc_byte_stream_pull(stream_op->payload->send_message.send_message, &slice)) { /* Should never reach here */ GPR_ASSERT(false); @@ -1061,15 +1044,15 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx* exec_ctx, } if (write_slice_buffer.count > 0) { size_t write_buffer_size; - create_grpc_frame(exec_ctx, &write_slice_buffer, - &stream_state->ws.write_buffer, &write_buffer_size, + create_grpc_frame(&write_slice_buffer, &stream_state->ws.write_buffer, + &write_buffer_size, stream_op->payload->send_message.send_message->flags); CRONET_LOG(GPR_DEBUG, "bidirectional_stream_write (%p, %p)", s->cbs, stream_state->ws.write_buffer); stream_state->state_callback_received[OP_SEND_MESSAGE] = false; bidirectional_stream_write(s->cbs, stream_state->ws.write_buffer, (int)write_buffer_size, false); - grpc_slice_buffer_destroy_internal(exec_ctx, &write_slice_buffer); + grpc_slice_buffer_destroy_internal(&write_slice_buffer); if (t->use_packet_coalescing) { if (!stream_op->send_trailing_metadata) { CRONET_LOG(GPR_DEBUG, "bidirectional_stream_flush (%p)", s->cbs); @@ -1112,25 +1095,21 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx* exec_ctx, CRONET_LOG(GPR_DEBUG, "running: %p OP_RECV_INITIAL_METADATA", oas); if (stream_state->state_op_done[OP_CANCEL_ERROR]) { GRPC_CLOSURE_SCHED( - exec_ctx, stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_NONE); } else if (stream_state->state_callback_received[OP_FAILED]) { GRPC_CLOSURE_SCHED( - exec_ctx, stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_NONE); } else if (stream_state->state_op_done[OP_RECV_TRAILING_METADATA]) { GRPC_CLOSURE_SCHED( - exec_ctx, stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_NONE); } else { grpc_chttp2_incoming_metadata_buffer_publish( - exec_ctx, &oas->s->state.rs.initial_metadata, + &oas->s->state.rs.initial_metadata, stream_op->payload->recv_initial_metadata.recv_initial_metadata); GRPC_CLOSURE_SCHED( - exec_ctx, stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_NONE); } @@ -1141,16 +1120,14 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx* exec_ctx, CRONET_LOG(GPR_DEBUG, "running: %p OP_RECV_MESSAGE", oas); if (stream_state->state_op_done[OP_CANCEL_ERROR]) { CRONET_LOG(GPR_DEBUG, "Stream is cancelled."); - GRPC_CLOSURE_SCHED(exec_ctx, - stream_op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(stream_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; result = ACTION_TAKEN_NO_CALLBACK; } else if (stream_state->state_callback_received[OP_FAILED]) { CRONET_LOG(GPR_DEBUG, "Stream failed."); - GRPC_CLOSURE_SCHED(exec_ctx, - stream_op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(stream_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; @@ -1158,16 +1135,14 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx* exec_ctx, } else if (stream_state->rs.read_stream_closed == true) { /* No more data will be received */ CRONET_LOG(GPR_DEBUG, "read stream closed"); - GRPC_CLOSURE_SCHED(exec_ctx, - stream_op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(stream_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; result = ACTION_TAKEN_NO_CALLBACK; } else if (stream_state->flush_read) { CRONET_LOG(GPR_DEBUG, "flush read"); - GRPC_CLOSURE_SCHED(exec_ctx, - stream_op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(stream_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; @@ -1200,7 +1175,7 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx* exec_ctx, CRONET_LOG(GPR_DEBUG, "read operation complete. Empty response."); /* Clean up read_slice_buffer in case there is unread data. */ grpc_slice_buffer_destroy_internal( - exec_ctx, &stream_state->rs.read_slice_buffer); + &stream_state->rs.read_slice_buffer); grpc_slice_buffer_init(&stream_state->rs.read_slice_buffer); grpc_slice_buffer_stream_init(&stream_state->rs.sbs, &stream_state->rs.read_slice_buffer, 0); @@ -1210,7 +1185,7 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx* exec_ctx, *((grpc_byte_buffer**)stream_op->payload->recv_message.recv_message) = (grpc_byte_buffer*)&stream_state->rs.sbs; GRPC_CLOSURE_SCHED( - exec_ctx, stream_op->payload->recv_message.recv_message_ready, + stream_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; @@ -1254,8 +1229,7 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx* exec_ctx, (size_t)stream_state->rs.length_field); null_and_maybe_free_read_buffer(s); /* Clean up read_slice_buffer in case there is unread data. */ - grpc_slice_buffer_destroy_internal(exec_ctx, - &stream_state->rs.read_slice_buffer); + grpc_slice_buffer_destroy_internal(&stream_state->rs.read_slice_buffer); grpc_slice_buffer_init(&stream_state->rs.read_slice_buffer); grpc_slice_buffer_add(&stream_state->rs.read_slice_buffer, read_data_slice); @@ -1266,8 +1240,7 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx* exec_ctx, } *((grpc_byte_buffer**)stream_op->payload->recv_message.recv_message) = (grpc_byte_buffer*)&stream_state->rs.sbs; - GRPC_CLOSURE_SCHED(exec_ctx, - stream_op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(stream_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; @@ -1290,7 +1263,7 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx* exec_ctx, CRONET_LOG(GPR_DEBUG, "running: %p OP_RECV_TRAILING_METADATA", oas); if (oas->s->state.rs.trailing_metadata_valid) { grpc_chttp2_incoming_metadata_buffer_publish( - exec_ctx, &oas->s->state.rs.trailing_metadata, + &oas->s->state.rs.trailing_metadata, stream_op->payload->recv_trailing_metadata.recv_trailing_metadata); stream_state->rs.trailing_metadata_valid = false; } @@ -1315,17 +1288,17 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx* exec_ctx, op_can_be_run(stream_op, s, &oas->state, OP_ON_COMPLETE)) { CRONET_LOG(GPR_DEBUG, "running: %p OP_ON_COMPLETE", oas); if (stream_state->state_op_done[OP_CANCEL_ERROR]) { - GRPC_CLOSURE_SCHED(exec_ctx, stream_op->on_complete, + GRPC_CLOSURE_SCHED(stream_op->on_complete, GRPC_ERROR_REF(stream_state->cancel_error)); } else if (stream_state->state_callback_received[OP_FAILED]) { GRPC_CLOSURE_SCHED( - exec_ctx, stream_op->on_complete, + stream_op->on_complete, make_error_with_desc(GRPC_STATUS_UNAVAILABLE, "Unavailable.")); } else { /* All actions in this stream_op are complete. Call the on_complete * callback */ - GRPC_CLOSURE_SCHED(exec_ctx, stream_op->on_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(stream_op->on_complete, GRPC_ERROR_NONE); } oas->state.state_op_done[OP_ON_COMPLETE] = true; oas->done = true; @@ -1350,9 +1323,9 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx* exec_ctx, Functions used by upper layers to access transport functionality. */ -static int init_stream(grpc_exec_ctx* exec_ctx, grpc_transport* gt, - grpc_stream* gs, grpc_stream_refcount* refcount, - const void* server_data, gpr_arena* arena) { +static int init_stream(grpc_transport* gt, grpc_stream* gs, + grpc_stream_refcount* refcount, const void* server_data, + gpr_arena* arena) { stream_obj* s = (stream_obj*)gs; s->refcount = refcount; @@ -1383,15 +1356,13 @@ static int init_stream(grpc_exec_ctx* exec_ctx, grpc_transport* gt, return 0; } -static void set_pollset_do_nothing(grpc_exec_ctx* exec_ctx, grpc_transport* gt, - grpc_stream* gs, grpc_pollset* pollset) {} +static void set_pollset_do_nothing(grpc_transport* gt, grpc_stream* gs, + grpc_pollset* pollset) {} -static void set_pollset_set_do_nothing(grpc_exec_ctx* exec_ctx, - grpc_transport* gt, grpc_stream* gs, +static void set_pollset_set_do_nothing(grpc_transport* gt, grpc_stream* gs, grpc_pollset_set* pollset_set) {} -static void perform_stream_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, - grpc_stream* gs, +static void perform_stream_op(grpc_transport* gt, grpc_stream* gs, grpc_transport_stream_op_batch* op) { CRONET_LOG(GPR_DEBUG, "perform_stream_op"); if (op->send_initial_metadata && @@ -1401,42 +1372,36 @@ static void perform_stream_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, this field is present in metadata */ if (op->recv_initial_metadata) { GRPC_CLOSURE_SCHED( - exec_ctx, op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_CANCELLED); } if (op->recv_message) { - GRPC_CLOSURE_SCHED(exec_ctx, op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(op->payload->recv_message.recv_message_ready, GRPC_ERROR_CANCELLED); } - GRPC_CLOSURE_SCHED(exec_ctx, op->on_complete, GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(op->on_complete, GRPC_ERROR_CANCELLED); return; } stream_obj* s = (stream_obj*)gs; add_to_storage(s, op); - execute_from_storage(exec_ctx, s); + execute_from_storage(s); } -static void destroy_stream(grpc_exec_ctx* exec_ctx, grpc_transport* gt, - grpc_stream* gs, +static void destroy_stream(grpc_transport* gt, grpc_stream* gs, grpc_closure* then_schedule_closure) { stream_obj* s = (stream_obj*)gs; null_and_maybe_free_read_buffer(s); /* Clean up read_slice_buffer in case there is unread data. */ - grpc_slice_buffer_destroy_internal(exec_ctx, &s->state.rs.read_slice_buffer); + grpc_slice_buffer_destroy_internal(&s->state.rs.read_slice_buffer); GRPC_ERROR_UNREF(s->state.cancel_error); - GRPC_CLOSURE_SCHED(exec_ctx, then_schedule_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(then_schedule_closure, GRPC_ERROR_NONE); } -static void destroy_transport(grpc_exec_ctx* exec_ctx, grpc_transport* gt) {} +static void destroy_transport(grpc_transport* gt) {} -static grpc_endpoint* get_endpoint(grpc_exec_ctx* exec_ctx, - grpc_transport* gt) { - return nullptr; -} +static grpc_endpoint* get_endpoint(grpc_transport* gt) { return nullptr; } -static void perform_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, - grpc_transport_op* op) {} +static void perform_op(grpc_transport* gt, grpc_transport_op* op) {} static const grpc_transport_vtable grpc_cronet_vtable = { sizeof(stream_obj), diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index d8d753e4591..8dd0b7dce24 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/src/core/ext/transport/inproc/inproc_transport.cc @@ -54,8 +54,8 @@ typedef struct inproc_transport { gpr_refcount refs; bool is_client; grpc_connectivity_state_tracker connectivity; - void (*accept_stream_cb)(grpc_exec_ctx* exec_ctx, void* user_data, - grpc_transport* transport, const void* server_data); + void (*accept_stream_cb)(void* user_data, grpc_transport* transport, + const void* server_data); void* accept_stream_data; bool is_closed; struct inproc_transport* other_side; @@ -118,39 +118,36 @@ typedef struct inproc_stream { } inproc_stream; static grpc_closure do_nothing_closure; -static bool cancel_stream_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s, - grpc_error* error); -static void op_state_machine(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error); +static bool cancel_stream_locked(inproc_stream* s, grpc_error* error); +static void op_state_machine(void* arg, grpc_error* error); static void ref_transport(inproc_transport* t) { INPROC_LOG(GPR_DEBUG, "ref_transport %p", t); gpr_ref(&t->refs); } -static void really_destroy_transport(grpc_exec_ctx* exec_ctx, - inproc_transport* t) { +static void really_destroy_transport(inproc_transport* t) { INPROC_LOG(GPR_DEBUG, "really_destroy_transport %p", t); - grpc_connectivity_state_destroy(exec_ctx, &t->connectivity); + grpc_connectivity_state_destroy(&t->connectivity); if (gpr_unref(&t->mu->refs)) { gpr_free(t->mu); } gpr_free(t); } -static void unref_transport(grpc_exec_ctx* exec_ctx, inproc_transport* t) { +static void unref_transport(inproc_transport* t) { INPROC_LOG(GPR_DEBUG, "unref_transport %p", t); if (gpr_unref(&t->refs)) { - really_destroy_transport(exec_ctx, t); + really_destroy_transport(t); } } #ifndef NDEBUG #define STREAM_REF(refs, reason) grpc_stream_ref(refs, reason) -#define STREAM_UNREF(e, refs, reason) grpc_stream_unref(e, refs, reason) +#define STREAM_UNREF(refs, reason) grpc_stream_unref(refs, reason) #else #define STREAM_REF(refs, reason) grpc_stream_ref(refs) -#define STREAM_UNREF(e, refs, reason) grpc_stream_unref(e, refs) +#define STREAM_UNREF(refs, reason) grpc_stream_unref(refs) #endif static void ref_stream(inproc_stream* s, const char* reason) { @@ -158,13 +155,12 @@ static void ref_stream(inproc_stream* s, const char* reason) { STREAM_REF(s->refs, reason); } -static void unref_stream(grpc_exec_ctx* exec_ctx, inproc_stream* s, - const char* reason) { +static void unref_stream(inproc_stream* s, const char* reason) { INPROC_LOG(GPR_DEBUG, "unref_stream %p %s", s, reason); - STREAM_UNREF(exec_ctx, s->refs, reason); + STREAM_UNREF(s->refs, reason); } -static void really_destroy_stream(grpc_exec_ctx* exec_ctx, inproc_stream* s) { +static void really_destroy_stream(inproc_stream* s) { INPROC_LOG(GPR_DEBUG, "really_destroy_stream %p", s); GRPC_ERROR_UNREF(s->write_buffer_cancel_error); @@ -172,13 +168,13 @@ static void really_destroy_stream(grpc_exec_ctx* exec_ctx, inproc_stream* s) { GRPC_ERROR_UNREF(s->cancel_other_error); if (s->recv_inited) { - grpc_slice_buffer_destroy_internal(exec_ctx, &s->recv_message); + grpc_slice_buffer_destroy_internal(&s->recv_message); } - unref_transport(exec_ctx, s->t); + unref_transport(s->t); if (s->closure_at_destroy) { - GRPC_CLOSURE_SCHED(exec_ctx, s->closure_at_destroy, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(s->closure_at_destroy, GRPC_ERROR_NONE); } } @@ -195,7 +191,7 @@ static void log_metadata(const grpc_metadata_batch* md_batch, bool is_client, } } -static grpc_error* fill_in_metadata(grpc_exec_ctx* exec_ctx, inproc_stream* s, +static grpc_error* fill_in_metadata(inproc_stream* s, const grpc_metadata_batch* metadata, uint32_t flags, grpc_metadata_batch* out_md, uint32_t* outflags, bool* markfilled) { @@ -214,18 +210,18 @@ static grpc_error* fill_in_metadata(grpc_exec_ctx* exec_ctx, inproc_stream* s, (elem != nullptr) && (error == GRPC_ERROR_NONE); elem = elem->next) { grpc_linked_mdelem* nelem = (grpc_linked_mdelem*)gpr_arena_alloc(s->arena, sizeof(*nelem)); - nelem->md = grpc_mdelem_from_slices( - exec_ctx, grpc_slice_intern(GRPC_MDKEY(elem->md)), - grpc_slice_intern(GRPC_MDVALUE(elem->md))); + nelem->md = + grpc_mdelem_from_slices(grpc_slice_intern(GRPC_MDKEY(elem->md)), + grpc_slice_intern(GRPC_MDVALUE(elem->md))); - error = grpc_metadata_batch_link_tail(exec_ctx, out_md, nelem); + error = grpc_metadata_batch_link_tail(out_md, nelem); } return error; } -static int init_stream(grpc_exec_ctx* exec_ctx, grpc_transport* gt, - grpc_stream* gs, grpc_stream_refcount* refcount, - const void* server_data, gpr_arena* arena) { +static int init_stream(grpc_transport* gt, grpc_stream* gs, + grpc_stream_refcount* refcount, const void* server_data, + gpr_arena* arena) { INPROC_LOG(GPR_DEBUG, "init_stream %p %p %p", gt, gs, server_data); inproc_transport* t = (inproc_transport*)gt; inproc_stream* s = (inproc_stream*)gs; @@ -285,8 +281,7 @@ static int init_stream(grpc_exec_ctx* exec_ctx, grpc_transport* gt, // side to avoid destruction INPROC_LOG(GPR_DEBUG, "calling accept stream cb %p %p", st->accept_stream_cb, st->accept_stream_data); - (*st->accept_stream_cb)(exec_ctx, st->accept_stream_data, &st->base, - (void*)s); + (*st->accept_stream_cb)(st->accept_stream_data, &st->base, (void*)s); } else { // This is the server-side and is being called through accept_stream_cb inproc_stream* cs = (inproc_stream*)server_data; @@ -301,19 +296,19 @@ static int init_stream(grpc_exec_ctx* exec_ctx, grpc_transport* gt, // Now transfer from the other side's write_buffer if any to the to_read // buffer if (cs->write_buffer_initial_md_filled) { - fill_in_metadata(exec_ctx, s, &cs->write_buffer_initial_md, + fill_in_metadata(s, &cs->write_buffer_initial_md, cs->write_buffer_initial_md_flags, &s->to_read_initial_md, &s->to_read_initial_md_flags, &s->to_read_initial_md_filled); s->deadline = GPR_MIN(s->deadline, cs->write_buffer_deadline); - grpc_metadata_batch_clear(exec_ctx, &cs->write_buffer_initial_md); + grpc_metadata_batch_clear(&cs->write_buffer_initial_md); cs->write_buffer_initial_md_filled = false; } if (cs->write_buffer_trailing_md_filled) { - fill_in_metadata(exec_ctx, s, &cs->write_buffer_trailing_md, 0, + fill_in_metadata(s, &cs->write_buffer_trailing_md, 0, &s->to_read_trailing_md, nullptr, &s->to_read_trailing_md_filled); - grpc_metadata_batch_clear(exec_ctx, &cs->write_buffer_trailing_md); + grpc_metadata_batch_clear(&cs->write_buffer_trailing_md); cs->write_buffer_trailing_md_filled = false; } if (cs->write_buffer_cancel_error != GRPC_ERROR_NONE) { @@ -326,11 +321,11 @@ static int init_stream(grpc_exec_ctx* exec_ctx, grpc_transport* gt, return 0; // return value is not important } -static void close_stream_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s) { +static void close_stream_locked(inproc_stream* s) { if (!s->closed) { // Release the metadata that we would have written out - grpc_metadata_batch_destroy(exec_ctx, &s->write_buffer_initial_md); - grpc_metadata_batch_destroy(exec_ctx, &s->write_buffer_trailing_md); + grpc_metadata_batch_destroy(&s->write_buffer_initial_md); + grpc_metadata_batch_destroy(&s->write_buffer_trailing_md); if (s->listed) { inproc_stream* p = s->stream_list_prev; @@ -344,22 +339,21 @@ static void close_stream_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s) { n->stream_list_prev = p; } s->listed = false; - unref_stream(exec_ctx, s, "close_stream:list"); + unref_stream(s, "close_stream:list"); } s->closed = true; - unref_stream(exec_ctx, s, "close_stream:closing"); + unref_stream(s, "close_stream:closing"); } } // This function means that we are done talking/listening to the other side -static void close_other_side_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s, - const char* reason) { +static void close_other_side_locked(inproc_stream* s, const char* reason) { if (s->other_side != nullptr) { // First release the metadata that came from the other side's arena - grpc_metadata_batch_destroy(exec_ctx, &s->to_read_initial_md); - grpc_metadata_batch_destroy(exec_ctx, &s->to_read_trailing_md); + grpc_metadata_batch_destroy(&s->to_read_initial_md); + grpc_metadata_batch_destroy(&s->to_read_trailing_md); - unref_stream(exec_ctx, s->other_side, reason); + unref_stream(s->other_side, reason); s->other_side_closed = true; s->other_side = nullptr; } else if (!s->other_side_closed) { @@ -371,8 +365,7 @@ static void close_other_side_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s, // this stream_op_batch is only one of the pending operations for this // stream. This is called when one of the pending operations for the stream // is done and about to be NULLed out -static void complete_if_batch_end_locked(grpc_exec_ctx* exec_ctx, - inproc_stream* s, grpc_error* error, +static void complete_if_batch_end_locked(inproc_stream* s, grpc_error* error, grpc_transport_stream_op_batch* op, const char* msg) { int is_sm = (int)(op == s->send_message_op); @@ -383,22 +376,20 @@ static void complete_if_batch_end_locked(grpc_exec_ctx* exec_ctx, if ((is_sm + is_stm + is_rim + is_rm + is_rtm) == 1) { INPROC_LOG(GPR_DEBUG, "%s %p %p %p", msg, s, op, error); - GRPC_CLOSURE_SCHED(exec_ctx, op->on_complete, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(op->on_complete, GRPC_ERROR_REF(error)); } } -static void maybe_schedule_op_closure_locked(grpc_exec_ctx* exec_ctx, - inproc_stream* s, +static void maybe_schedule_op_closure_locked(inproc_stream* s, grpc_error* error) { if (s && s->ops_needed && !s->op_closure_scheduled) { - GRPC_CLOSURE_SCHED(exec_ctx, &s->op_closure, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(&s->op_closure, GRPC_ERROR_REF(error)); s->op_closure_scheduled = true; s->ops_needed = false; } } -static void fail_helper_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s, - grpc_error* error) { +static void fail_helper_locked(inproc_stream* s, grpc_error* error) { INPROC_LOG(GPR_DEBUG, "op_state_machine %p fail_helper", s); // If we're failing this side, we need to make sure that // we also send or have already sent trailing metadata @@ -415,14 +406,14 @@ static void fail_helper_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s, : &other->to_read_trailing_md; bool* destfilled = (other == nullptr) ? &s->write_buffer_trailing_md_filled : &other->to_read_trailing_md_filled; - fill_in_metadata(exec_ctx, s, &fake_md, 0, dest, nullptr, destfilled); - grpc_metadata_batch_destroy(exec_ctx, &fake_md); + fill_in_metadata(s, &fake_md, 0, dest, nullptr, destfilled); + grpc_metadata_batch_destroy(&fake_md); if (other != nullptr) { if (other->cancel_other_error == GRPC_ERROR_NONE) { other->cancel_other_error = GRPC_ERROR_REF(error); } - maybe_schedule_op_closure_locked(exec_ctx, other, error); + maybe_schedule_op_closure_locked(other, error); } else if (s->write_buffer_cancel_error == GRPC_ERROR_NONE) { s->write_buffer_cancel_error = GRPC_ERROR_REF(error); } @@ -436,24 +427,22 @@ static void fail_helper_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s, grpc_metadata_batch_init(&fake_md); grpc_linked_mdelem* path_md = (grpc_linked_mdelem*)gpr_arena_alloc(s->arena, sizeof(*path_md)); - path_md->md = - grpc_mdelem_from_slices(exec_ctx, g_fake_path_key, g_fake_path_value); - GPR_ASSERT(grpc_metadata_batch_link_tail(exec_ctx, &fake_md, path_md) == + path_md->md = grpc_mdelem_from_slices(g_fake_path_key, g_fake_path_value); + GPR_ASSERT(grpc_metadata_batch_link_tail(&fake_md, path_md) == GRPC_ERROR_NONE); grpc_linked_mdelem* auth_md = (grpc_linked_mdelem*)gpr_arena_alloc(s->arena, sizeof(*auth_md)); - auth_md->md = - grpc_mdelem_from_slices(exec_ctx, g_fake_auth_key, g_fake_auth_value); - GPR_ASSERT(grpc_metadata_batch_link_tail(exec_ctx, &fake_md, auth_md) == + auth_md->md = grpc_mdelem_from_slices(g_fake_auth_key, g_fake_auth_value); + GPR_ASSERT(grpc_metadata_batch_link_tail(&fake_md, auth_md) == GRPC_ERROR_NONE); fill_in_metadata( - exec_ctx, s, &fake_md, 0, + s, &fake_md, 0, s->recv_initial_md_op->payload->recv_initial_metadata .recv_initial_metadata, s->recv_initial_md_op->payload->recv_initial_metadata.recv_flags, nullptr); - grpc_metadata_batch_destroy(exec_ctx, &fake_md); + grpc_metadata_batch_destroy(&fake_md); err = GRPC_ERROR_NONE; } else { err = GRPC_ERROR_REF(error); @@ -469,14 +458,13 @@ static void fail_helper_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s, INPROC_LOG(GPR_DEBUG, "fail_helper %p scheduling initial-metadata-ready %p %p", s, error, err); - GRPC_CLOSURE_SCHED(exec_ctx, - s->recv_initial_md_op->payload->recv_initial_metadata + GRPC_CLOSURE_SCHED(s->recv_initial_md_op->payload->recv_initial_metadata .recv_initial_metadata_ready, err); // Last use of err so no need to REF and then UNREF it complete_if_batch_end_locked( - exec_ctx, s, error, s->recv_initial_md_op, + s, error, s->recv_initial_md_op, "fail_helper scheduling recv-initial-metadata-on-complete"); s->recv_initial_md_op = nullptr; } @@ -484,22 +472,22 @@ static void fail_helper_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s, INPROC_LOG(GPR_DEBUG, "fail_helper %p scheduling message-ready %p", s, error); GRPC_CLOSURE_SCHED( - exec_ctx, s->recv_message_op->payload->recv_message.recv_message_ready, + s->recv_message_op->payload->recv_message.recv_message_ready, GRPC_ERROR_REF(error)); complete_if_batch_end_locked( - exec_ctx, s, error, s->recv_message_op, + s, error, s->recv_message_op, "fail_helper scheduling recv-message-on-complete"); s->recv_message_op = nullptr; } if (s->send_message_op) { complete_if_batch_end_locked( - exec_ctx, s, error, s->send_message_op, + s, error, s->send_message_op, "fail_helper scheduling send-message-on-complete"); s->send_message_op = nullptr; } if (s->send_trailing_md_op) { complete_if_batch_end_locked( - exec_ctx, s, error, s->send_trailing_md_op, + s, error, s->send_trailing_md_op, "fail_helper scheduling send-trailng-md-on-complete"); s->send_trailing_md_op = nullptr; } @@ -508,23 +496,22 @@ static void fail_helper_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s, "fail_helper %p scheduling trailing-md-on-complete %p", s, error); complete_if_batch_end_locked( - exec_ctx, s, error, s->recv_trailing_md_op, + s, error, s->recv_trailing_md_op, "fail_helper scheduling recv-trailing-metadata-on-complete"); s->recv_trailing_md_op = nullptr; } - close_other_side_locked(exec_ctx, s, "fail_helper:other_side"); - close_stream_locked(exec_ctx, s); + close_other_side_locked(s, "fail_helper:other_side"); + close_stream_locked(s); GRPC_ERROR_UNREF(error); } -static void message_transfer_locked(grpc_exec_ctx* exec_ctx, - inproc_stream* sender, +static void message_transfer_locked(inproc_stream* sender, inproc_stream* receiver) { size_t remaining = sender->send_message_op->payload->send_message.send_message->length; if (receiver->recv_inited) { - grpc_slice_buffer_destroy_internal(exec_ctx, &receiver->recv_message); + grpc_slice_buffer_destroy_internal(&receiver->recv_message); } grpc_slice_buffer_init(&receiver->recv_message); receiver->recv_inited = true; @@ -532,13 +519,13 @@ static void message_transfer_locked(grpc_exec_ctx* exec_ctx, grpc_slice message_slice; grpc_closure unused; GPR_ASSERT(grpc_byte_stream_next( - exec_ctx, sender->send_message_op->payload->send_message.send_message, - SIZE_MAX, &unused)); + sender->send_message_op->payload->send_message.send_message, SIZE_MAX, + &unused)); grpc_error* error = grpc_byte_stream_pull( - exec_ctx, sender->send_message_op->payload->send_message.send_message, + sender->send_message_op->payload->send_message.send_message, &message_slice); if (error != GRPC_ERROR_NONE) { - cancel_stream_locked(exec_ctx, sender, GRPC_ERROR_REF(error)); + cancel_stream_locked(sender, GRPC_ERROR_REF(error)); break; } GPR_ASSERT(error == GRPC_ERROR_NONE); @@ -553,22 +540,20 @@ static void message_transfer_locked(grpc_exec_ctx* exec_ctx, INPROC_LOG(GPR_DEBUG, "message_transfer_locked %p scheduling message-ready", receiver); GRPC_CLOSURE_SCHED( - exec_ctx, receiver->recv_message_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); complete_if_batch_end_locked( - exec_ctx, sender, GRPC_ERROR_NONE, sender->send_message_op, + sender, GRPC_ERROR_NONE, sender->send_message_op, "message_transfer scheduling sender on_complete"); complete_if_batch_end_locked( - exec_ctx, receiver, GRPC_ERROR_NONE, receiver->recv_message_op, + receiver, GRPC_ERROR_NONE, receiver->recv_message_op, "message_transfer scheduling receiver on_complete"); receiver->recv_message_op = nullptr; sender->send_message_op = nullptr; } -static void op_state_machine(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void op_state_machine(void* arg, grpc_error* error) { // This function gets called when we have contents in the unprocessed reads // Get what we want based on our ops wanted // Schedule our appropriate closures @@ -589,26 +574,26 @@ static void op_state_machine(grpc_exec_ctx* exec_ctx, void* arg, inproc_stream* other = s->other_side; if (s->cancel_self_error != GRPC_ERROR_NONE) { - fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(s->cancel_self_error)); + fail_helper_locked(s, GRPC_ERROR_REF(s->cancel_self_error)); goto done; } else if (s->cancel_other_error != GRPC_ERROR_NONE) { - fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(s->cancel_other_error)); + fail_helper_locked(s, GRPC_ERROR_REF(s->cancel_other_error)); goto done; } else if (error != GRPC_ERROR_NONE) { - fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(error)); + fail_helper_locked(s, GRPC_ERROR_REF(error)); goto done; } if (s->send_message_op && other) { if (other->recv_message_op) { - message_transfer_locked(exec_ctx, s, other); - maybe_schedule_op_closure_locked(exec_ctx, other, GRPC_ERROR_NONE); + message_transfer_locked(s, other); + maybe_schedule_op_closure_locked(other, GRPC_ERROR_NONE); } else if (!s->t->is_client && (s->trailing_md_sent || other->recv_trailing_md_op)) { // A server send will never be matched if the client is waiting // for trailing metadata already complete_if_batch_end_locked( - exec_ctx, s, GRPC_ERROR_NONE, s->send_message_op, + s, GRPC_ERROR_NONE, s->send_message_op, "op_state_machine scheduling send-message-on-complete"); s->send_message_op = nullptr; } @@ -630,11 +615,11 @@ static void op_state_machine(grpc_exec_ctx* exec_ctx, void* arg, // The buffer is already in use; that's an error! INPROC_LOG(GPR_DEBUG, "Extra trailing metadata %p", s); new_err = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Extra trailing metadata"); - fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(new_err)); + fail_helper_locked(s, GRPC_ERROR_REF(new_err)); goto done; } else { if (!other || !other->closed) { - fill_in_metadata(exec_ctx, s, + fill_in_metadata(s, s->send_trailing_md_op->payload->send_trailing_metadata .send_trailing_metadata, 0, dest, nullptr, destfilled); @@ -643,15 +628,15 @@ static void op_state_machine(grpc_exec_ctx* exec_ctx, void* arg, if (!s->t->is_client && s->trailing_md_recvd && s->recv_trailing_md_op) { INPROC_LOG(GPR_DEBUG, "op_state_machine %p scheduling trailing-md-on-complete", s); - GRPC_CLOSURE_SCHED(exec_ctx, s->recv_trailing_md_op->on_complete, + GRPC_CLOSURE_SCHED(s->recv_trailing_md_op->on_complete, GRPC_ERROR_NONE); s->recv_trailing_md_op = nullptr; needs_close = true; } } - maybe_schedule_op_closure_locked(exec_ctx, other, GRPC_ERROR_NONE); + maybe_schedule_op_closure_locked(other, GRPC_ERROR_NONE); complete_if_batch_end_locked( - exec_ctx, s, GRPC_ERROR_NONE, s->send_trailing_md_op, + s, GRPC_ERROR_NONE, s->send_trailing_md_op, "op_state_machine scheduling send-trailing-metadata-on-complete"); s->send_trailing_md_op = nullptr; } @@ -664,14 +649,14 @@ static void op_state_machine(grpc_exec_ctx* exec_ctx, void* arg, "op_state_machine %p scheduling on_complete errors for already " "recvd initial md %p", s, new_err); - fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(new_err)); + fail_helper_locked(s, GRPC_ERROR_REF(new_err)); goto done; } if (s->to_read_initial_md_filled) { s->initial_md_recvd = true; new_err = fill_in_metadata( - exec_ctx, s, &s->to_read_initial_md, s->to_read_initial_md_flags, + s, &s->to_read_initial_md, s->to_read_initial_md_flags, s->recv_initial_md_op->payload->recv_initial_metadata .recv_initial_metadata, s->recv_initial_md_op->payload->recv_initial_metadata.recv_flags, @@ -684,17 +669,16 @@ static void op_state_machine(grpc_exec_ctx* exec_ctx, void* arg, .trailing_metadata_available = (other != nullptr && other->send_trailing_md_op != nullptr); } - grpc_metadata_batch_clear(exec_ctx, &s->to_read_initial_md); + grpc_metadata_batch_clear(&s->to_read_initial_md); s->to_read_initial_md_filled = false; INPROC_LOG(GPR_DEBUG, "op_state_machine %p scheduling initial-metadata-ready %p", s, new_err); - GRPC_CLOSURE_SCHED(exec_ctx, - s->recv_initial_md_op->payload->recv_initial_metadata + GRPC_CLOSURE_SCHED(s->recv_initial_md_op->payload->recv_initial_metadata .recv_initial_metadata_ready, GRPC_ERROR_REF(new_err)); complete_if_batch_end_locked( - exec_ctx, s, new_err, s->recv_initial_md_op, + s, new_err, s->recv_initial_md_op, "op_state_machine scheduling recv-initial-metadata-on-complete"); s->recv_initial_md_op = nullptr; @@ -702,20 +686,20 @@ static void op_state_machine(grpc_exec_ctx* exec_ctx, void* arg, INPROC_LOG(GPR_DEBUG, "op_state_machine %p scheduling on_complete errors2 %p", s, new_err); - fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(new_err)); + fail_helper_locked(s, GRPC_ERROR_REF(new_err)); goto done; } } } if (s->recv_message_op) { if (other && other->send_message_op) { - message_transfer_locked(exec_ctx, other, s); - maybe_schedule_op_closure_locked(exec_ctx, other, GRPC_ERROR_NONE); + message_transfer_locked(other, s); + maybe_schedule_op_closure_locked(other, GRPC_ERROR_NONE); } } if (s->recv_trailing_md_op && s->t->is_client && other && other->send_message_op) { - maybe_schedule_op_closure_locked(exec_ctx, other, GRPC_ERROR_NONE); + maybe_schedule_op_closure_locked(other, GRPC_ERROR_NONE); } if (s->to_read_trailing_md_filled) { if (s->trailing_md_recvd) { @@ -726,7 +710,7 @@ static void op_state_machine(grpc_exec_ctx* exec_ctx, void* arg, "op_state_machine %p scheduling on_complete errors for already " "recvd trailing md %p", s, new_err); - fail_helper_locked(exec_ctx, s, GRPC_ERROR_REF(new_err)); + fail_helper_locked(s, GRPC_ERROR_REF(new_err)); goto done; } if (s->recv_message_op != nullptr) { @@ -734,11 +718,10 @@ static void op_state_machine(grpc_exec_ctx* exec_ctx, void* arg, // satisfied INPROC_LOG(GPR_DEBUG, "op_state_machine %p scheduling message-ready", s); GRPC_CLOSURE_SCHED( - exec_ctx, s->recv_message_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); complete_if_batch_end_locked( - exec_ctx, s, new_err, s->recv_message_op, + s, new_err, s->recv_message_op, "op_state_machine scheduling recv-message-on-complete"); s->recv_message_op = nullptr; } @@ -746,7 +729,7 @@ static void op_state_machine(grpc_exec_ctx* exec_ctx, void* arg, // Nothing further will try to receive from this stream, so finish off // any outstanding send_message op complete_if_batch_end_locked( - exec_ctx, s, new_err, s->send_message_op, + s, new_err, s->send_message_op, "op_state_machine scheduling send-message-on-complete"); s->send_message_op = nullptr; } @@ -754,11 +737,11 @@ static void op_state_machine(grpc_exec_ctx* exec_ctx, void* arg, // We wanted trailing metadata and we got it s->trailing_md_recvd = true; new_err = - fill_in_metadata(exec_ctx, s, &s->to_read_trailing_md, 0, + fill_in_metadata(s, &s->to_read_trailing_md, 0, s->recv_trailing_md_op->payload ->recv_trailing_metadata.recv_trailing_metadata, nullptr, nullptr); - grpc_metadata_batch_clear(exec_ctx, &s->to_read_trailing_md); + grpc_metadata_batch_clear(&s->to_read_trailing_md); s->to_read_trailing_md_filled = false; // We should schedule the recv_trailing_md_op completion if @@ -770,7 +753,7 @@ static void op_state_machine(grpc_exec_ctx* exec_ctx, void* arg, INPROC_LOG(GPR_DEBUG, "op_state_machine %p scheduling trailing-md-on-complete %p", s, new_err); - GRPC_CLOSURE_SCHED(exec_ctx, s->recv_trailing_md_op->on_complete, + GRPC_CLOSURE_SCHED(s->recv_trailing_md_op->on_complete, GRPC_ERROR_REF(new_err)); s->recv_trailing_md_op = nullptr; needs_close = true; @@ -791,10 +774,10 @@ static void op_state_machine(grpc_exec_ctx* exec_ctx, void* arg, // recv_message_op INPROC_LOG(GPR_DEBUG, "op_state_machine %p scheduling message-ready", s); GRPC_CLOSURE_SCHED( - exec_ctx, s->recv_message_op->payload->recv_message.recv_message_ready, + s->recv_message_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); complete_if_batch_end_locked( - exec_ctx, s, new_err, s->recv_message_op, + s, new_err, s->recv_message_op, "op_state_machine scheduling recv-message-on-complete"); s->recv_message_op = nullptr; } @@ -803,7 +786,7 @@ static void op_state_machine(grpc_exec_ctx* exec_ctx, void* arg, // Nothing further will try to receive from this stream, so finish off // any outstanding send_message op complete_if_batch_end_locked( - exec_ctx, s, new_err, s->send_message_op, + s, new_err, s->send_message_op, "op_state_machine scheduling send-message-on-complete"); s->send_message_op = nullptr; } @@ -819,22 +802,21 @@ static void op_state_machine(grpc_exec_ctx* exec_ctx, void* arg, } done: if (needs_close) { - close_other_side_locked(exec_ctx, s, "op_state_machine"); - close_stream_locked(exec_ctx, s); + close_other_side_locked(s, "op_state_machine"); + close_stream_locked(s); } gpr_mu_unlock(mu); GRPC_ERROR_UNREF(new_err); } -static bool cancel_stream_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s, - grpc_error* error) { +static bool cancel_stream_locked(inproc_stream* s, grpc_error* error) { bool ret = false; // was the cancel accepted INPROC_LOG(GPR_DEBUG, "cancel_stream %p with %s", s, grpc_error_string(error)); if (s->cancel_self_error == GRPC_ERROR_NONE) { ret = true; s->cancel_self_error = GRPC_ERROR_REF(error); - maybe_schedule_op_closure_locked(exec_ctx, s, s->cancel_self_error); + maybe_schedule_op_closure_locked(s, s->cancel_self_error); // Send trailing md to the other side indicating cancellation, even if we // already have s->trailing_md_sent = true; @@ -848,15 +830,14 @@ static bool cancel_stream_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s, : &other->to_read_trailing_md; bool* destfilled = (other == nullptr) ? &s->write_buffer_trailing_md_filled : &other->to_read_trailing_md_filled; - fill_in_metadata(exec_ctx, s, &cancel_md, 0, dest, nullptr, destfilled); - grpc_metadata_batch_destroy(exec_ctx, &cancel_md); + fill_in_metadata(s, &cancel_md, 0, dest, nullptr, destfilled); + grpc_metadata_batch_destroy(&cancel_md); if (other != nullptr) { if (other->cancel_other_error == GRPC_ERROR_NONE) { other->cancel_other_error = GRPC_ERROR_REF(s->cancel_self_error); } - maybe_schedule_op_closure_locked(exec_ctx, other, - other->cancel_other_error); + maybe_schedule_op_closure_locked(other, other->cancel_other_error); } else if (s->write_buffer_cancel_error == GRPC_ERROR_NONE) { s->write_buffer_cancel_error = GRPC_ERROR_REF(s->cancel_self_error); } @@ -866,21 +847,20 @@ static bool cancel_stream_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s, // md, now's the chance if (!s->t->is_client && s->trailing_md_recvd && s->recv_trailing_md_op) { complete_if_batch_end_locked( - exec_ctx, s, s->cancel_self_error, s->recv_trailing_md_op, + s, s->cancel_self_error, s->recv_trailing_md_op, "cancel_stream scheduling trailing-md-on-complete"); s->recv_trailing_md_op = nullptr; } } - close_other_side_locked(exec_ctx, s, "cancel_stream:other_side"); - close_stream_locked(exec_ctx, s); + close_other_side_locked(s, "cancel_stream:other_side"); + close_stream_locked(s); GRPC_ERROR_UNREF(error); return ret; } -static void perform_stream_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, - grpc_stream* gs, +static void perform_stream_op(grpc_transport* gt, grpc_stream* gs, grpc_transport_stream_op_batch* op) { INPROC_LOG(GPR_DEBUG, "perform_stream_op %p %p %p", gt, gs, op); inproc_stream* s = (inproc_stream*)gs; @@ -906,7 +886,7 @@ static void perform_stream_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, if (op->cancel_stream) { // Call cancel_stream_locked without ref'ing the cancel_error because // this function is responsible to make sure that that field gets unref'ed - cancel_stream_locked(exec_ctx, s, op->payload->cancel_stream.cancel_error); + cancel_stream_locked(s, op->payload->cancel_stream.cancel_error); // this op can complete without an error } else if (s->cancel_self_error != GRPC_ERROR_NONE) { // already self-canceled so still give it an error @@ -946,8 +926,7 @@ static void perform_stream_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, } else { if (!other || !other->closed) { fill_in_metadata( - exec_ctx, s, - op->payload->send_initial_metadata.send_initial_metadata, + s, op->payload->send_initial_metadata.send_initial_metadata, op->payload->send_initial_metadata.send_initial_metadata_flags, dest, destflags, destfilled); } @@ -959,7 +938,7 @@ static void perform_stream_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, s->initial_md_sent = true; } } - maybe_schedule_op_closure_locked(exec_ctx, other, error); + maybe_schedule_op_closure_locked(other, error); } } @@ -999,7 +978,7 @@ static void perform_stream_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, (op->recv_message && other && (other->send_message_op != nullptr)) || (s->to_read_trailing_md_filled || s->trailing_md_recvd)) { if (!s->op_closure_scheduled) { - GRPC_CLOSURE_SCHED(exec_ctx, &s->op_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&s->op_closure, GRPC_ERROR_NONE); s->op_closure_scheduled = true; } } else { @@ -1023,7 +1002,6 @@ static void perform_stream_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, "perform_stream_op error %p scheduling initial-metadata-ready %p", s, error); GRPC_CLOSURE_SCHED( - exec_ctx, op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_REF(error)); } @@ -1032,28 +1010,26 @@ static void perform_stream_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, GPR_DEBUG, "perform_stream_op error %p scheduling recv message-ready %p", s, error); - GRPC_CLOSURE_SCHED(exec_ctx, - op->payload->recv_message.recv_message_ready, + GRPC_CLOSURE_SCHED(op->payload->recv_message.recv_message_ready, GRPC_ERROR_REF(error)); } } INPROC_LOG(GPR_DEBUG, "perform_stream_op %p scheduling on_complete %p", s, error); - GRPC_CLOSURE_SCHED(exec_ctx, on_complete, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(on_complete, GRPC_ERROR_REF(error)); } if (needs_close) { - close_other_side_locked(exec_ctx, s, "perform_stream_op:other_side"); - close_stream_locked(exec_ctx, s); + close_other_side_locked(s, "perform_stream_op:other_side"); + close_stream_locked(s); } gpr_mu_unlock(mu); GRPC_ERROR_UNREF(error); } -static void close_transport_locked(grpc_exec_ctx* exec_ctx, - inproc_transport* t) { +static void close_transport_locked(inproc_transport* t) { INPROC_LOG(GPR_DEBUG, "close_transport %p %d", t, t->is_closed); grpc_connectivity_state_set( - exec_ctx, &t->connectivity, GRPC_CHANNEL_SHUTDOWN, + &t->connectivity, GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Closing transport."), "close transport"); if (!t->is_closed) { @@ -1062,7 +1038,7 @@ static void close_transport_locked(grpc_exec_ctx* exec_ctx, while (t->stream_list != nullptr) { // cancel_stream_locked also adjusts stream list cancel_stream_locked( - exec_ctx, t->stream_list, + t->stream_list, grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Transport closed"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE)); @@ -1070,14 +1046,13 @@ static void close_transport_locked(grpc_exec_ctx* exec_ctx, } } -static void perform_transport_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, - grpc_transport_op* op) { +static void perform_transport_op(grpc_transport* gt, grpc_transport_op* op) { inproc_transport* t = (inproc_transport*)gt; INPROC_LOG(GPR_DEBUG, "perform_transport_op %p %p", t, op); gpr_mu_lock(&t->mu->mu); if (op->on_connectivity_state_change) { grpc_connectivity_state_notify_on_state_change( - exec_ctx, &t->connectivity, op->connectivity_state, + &t->connectivity, op->connectivity_state, op->on_connectivity_state_change); } if (op->set_accept_stream) { @@ -1085,7 +1060,7 @@ static void perform_transport_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, t->accept_stream_data = op->set_accept_stream_user_data; } if (op->on_consumed) { - GRPC_CLOSURE_SCHED(exec_ctx, op->on_consumed, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(op->on_consumed, GRPC_ERROR_NONE); } bool do_close = false; @@ -1099,71 +1074,67 @@ static void perform_transport_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt, } if (do_close) { - close_transport_locked(exec_ctx, t); + close_transport_locked(t); } gpr_mu_unlock(&t->mu->mu); } -static void destroy_stream(grpc_exec_ctx* exec_ctx, grpc_transport* gt, - grpc_stream* gs, +static void destroy_stream(grpc_transport* gt, grpc_stream* gs, grpc_closure* then_schedule_closure) { INPROC_LOG(GPR_DEBUG, "destroy_stream %p %p", gs, then_schedule_closure); inproc_stream* s = (inproc_stream*)gs; s->closure_at_destroy = then_schedule_closure; - really_destroy_stream(exec_ctx, s); + really_destroy_stream(s); } -static void destroy_transport(grpc_exec_ctx* exec_ctx, grpc_transport* gt) { +static void destroy_transport(grpc_transport* gt) { inproc_transport* t = (inproc_transport*)gt; INPROC_LOG(GPR_DEBUG, "destroy_transport %p", t); gpr_mu_lock(&t->mu->mu); - close_transport_locked(exec_ctx, t); + close_transport_locked(t); gpr_mu_unlock(&t->mu->mu); - unref_transport(exec_ctx, t->other_side); - unref_transport(exec_ctx, t); + unref_transport(t->other_side); + unref_transport(t); } /******************************************************************************* * INTEGRATION GLUE */ -static void set_pollset(grpc_exec_ctx* exec_ctx, grpc_transport* gt, - grpc_stream* gs, grpc_pollset* pollset) { +static void set_pollset(grpc_transport* gt, grpc_stream* gs, + grpc_pollset* pollset) { // Nothing to do here } -static void set_pollset_set(grpc_exec_ctx* exec_ctx, grpc_transport* gt, - grpc_stream* gs, grpc_pollset_set* pollset_set) { +static void set_pollset_set(grpc_transport* gt, grpc_stream* gs, + grpc_pollset_set* pollset_set) { // Nothing to do here } -static grpc_endpoint* get_endpoint(grpc_exec_ctx* exec_ctx, grpc_transport* t) { - return nullptr; -} +static grpc_endpoint* get_endpoint(grpc_transport* t) { return nullptr; } /******************************************************************************* * GLOBAL INIT AND DESTROY */ -static void do_nothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} +static void do_nothing(void* arg, grpc_error* error) {} void grpc_inproc_transport_init(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GRPC_CLOSURE_INIT(&do_nothing_closure, do_nothing, nullptr, grpc_schedule_on_exec_ctx); g_empty_slice = grpc_slice_from_static_buffer(nullptr, 0); grpc_slice key_tmp = grpc_slice_from_static_string(":path"); g_fake_path_key = grpc_slice_intern(key_tmp); - grpc_slice_unref_internal(&exec_ctx, key_tmp); + grpc_slice_unref_internal(key_tmp); g_fake_path_value = grpc_slice_from_static_string("/"); grpc_slice auth_tmp = grpc_slice_from_static_string(":authority"); g_fake_auth_key = grpc_slice_intern(auth_tmp); - grpc_slice_unref_internal(&exec_ctx, auth_tmp); + grpc_slice_unref_internal(auth_tmp); g_fake_auth_value = grpc_slice_from_static_string("inproc-fail"); - grpc_exec_ctx_finish(&exec_ctx); } static const grpc_transport_vtable inproc_vtable = { @@ -1175,8 +1146,7 @@ static const grpc_transport_vtable inproc_vtable = { /******************************************************************************* * Main inproc transport functions */ -static void inproc_transports_create(grpc_exec_ctx* exec_ctx, - grpc_transport** server_transport, +static void inproc_transports_create(grpc_transport** server_transport, const grpc_channel_args* server_args, grpc_transport** client_transport, const grpc_channel_args* client_args) { @@ -1213,7 +1183,7 @@ grpc_channel* grpc_inproc_channel_create(grpc_server* server, GRPC_API_TRACE("grpc_inproc_channel_create(server=%p, args=%p)", 2, (server, args)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; const grpc_channel_args* server_args = grpc_server_get_channel_args(server); @@ -1228,30 +1198,26 @@ grpc_channel* grpc_inproc_channel_create(grpc_server* server, grpc_transport* server_transport; grpc_transport* client_transport; - inproc_transports_create(&exec_ctx, &server_transport, server_args, - &client_transport, client_args); + inproc_transports_create(&server_transport, server_args, &client_transport, + client_args); - grpc_server_setup_transport(&exec_ctx, server, server_transport, nullptr, - server_args); - grpc_channel* channel = - grpc_channel_create(&exec_ctx, "inproc", client_args, - GRPC_CLIENT_DIRECT_CHANNEL, client_transport); + grpc_server_setup_transport(server, server_transport, nullptr, server_args); + grpc_channel* channel = grpc_channel_create( + "inproc", client_args, GRPC_CLIENT_DIRECT_CHANNEL, client_transport); // Free up created channel args - grpc_channel_args_destroy(&exec_ctx, client_args); + grpc_channel_args_destroy(client_args); // Now finish scheduled operations - grpc_exec_ctx_finish(&exec_ctx); return channel; } void grpc_inproc_transport_shutdown(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_unref_internal(&exec_ctx, g_empty_slice); - grpc_slice_unref_internal(&exec_ctx, g_fake_path_key); - grpc_slice_unref_internal(&exec_ctx, g_fake_path_value); - grpc_slice_unref_internal(&exec_ctx, g_fake_auth_key); - grpc_slice_unref_internal(&exec_ctx, g_fake_auth_value); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_slice_unref_internal(g_empty_slice); + grpc_slice_unref_internal(g_fake_path_key); + grpc_slice_unref_internal(g_fake_path_value); + grpc_slice_unref_internal(g_fake_auth_key); + grpc_slice_unref_internal(g_fake_auth_value); } diff --git a/src/core/lib/backoff/backoff.cc b/src/core/lib/backoff/backoff.cc index dc754ddd821..da3b9b1b2d2 100644 --- a/src/core/lib/backoff/backoff.cc +++ b/src/core/lib/backoff/backoff.cc @@ -32,12 +32,11 @@ void grpc_backoff_init(grpc_backoff* backoff, grpc_millis initial_backoff, backoff->rng_state = (uint32_t)gpr_now(GPR_CLOCK_REALTIME).tv_nsec; } -grpc_backoff_result grpc_backoff_begin(grpc_exec_ctx* exec_ctx, - grpc_backoff* backoff) { +grpc_backoff_result grpc_backoff_begin(grpc_backoff* backoff) { backoff->current_backoff = backoff->initial_backoff; const grpc_millis initial_timeout = GPR_MAX(backoff->initial_backoff, backoff->min_connect_timeout); - const grpc_millis now = grpc_exec_ctx_now(exec_ctx); + const grpc_millis now = grpc_core::ExecCtx::Get()->Now(); const grpc_backoff_result result = {now + initial_timeout, now + backoff->current_backoff}; return result; @@ -57,8 +56,7 @@ static double generate_uniform_random_number_between(uint32_t* rng_state, return a + generate_uniform_random_number(rng_state) * range; } -grpc_backoff_result grpc_backoff_step(grpc_exec_ctx* exec_ctx, - grpc_backoff* backoff) { +grpc_backoff_result grpc_backoff_step(grpc_backoff* backoff) { backoff->current_backoff = (grpc_millis)(GPR_MIN( backoff->current_backoff * backoff->multiplier, backoff->max_backoff)); const double jitter = generate_uniform_random_number_between( @@ -69,7 +67,7 @@ grpc_backoff_result grpc_backoff_step(grpc_exec_ctx* exec_ctx, backoff->min_connect_timeout); const grpc_millis next_timeout = GPR_MIN( (grpc_millis)(backoff->current_backoff + jitter), backoff->max_backoff); - const grpc_millis now = grpc_exec_ctx_now(exec_ctx); + const grpc_millis now = grpc_core::ExecCtx::Get()->Now(); const grpc_backoff_result result = {now + current_timeout, now + next_timeout}; return result; diff --git a/src/core/lib/backoff/backoff.h b/src/core/lib/backoff/backoff.h index 0da9082e702..f61d14ec950 100644 --- a/src/core/lib/backoff/backoff.h +++ b/src/core/lib/backoff/backoff.h @@ -60,13 +60,11 @@ void grpc_backoff_init(grpc_backoff* backoff, grpc_millis initial_backoff, /// Begin retry loop: returns the deadlines to be used for the current attempt /// and the subsequent retry, if any. -grpc_backoff_result grpc_backoff_begin(grpc_exec_ctx* exec_ctx, - grpc_backoff* backoff); +grpc_backoff_result grpc_backoff_begin(grpc_backoff* backoff); /// Step a retry loop: returns the deadlines to be used for the current attempt /// and the subsequent retry, if any. -grpc_backoff_result grpc_backoff_step(grpc_exec_ctx* exec_ctx, - grpc_backoff* backoff); +grpc_backoff_result grpc_backoff_step(grpc_backoff* backoff); /// Reset the backoff, so the next grpc_backoff_step will be a /// grpc_backoff_begin. diff --git a/src/core/lib/channel/channel_args.cc b/src/core/lib/channel/channel_args.cc index 735fcbe405c..578475b2484 100644 --- a/src/core/lib/channel/channel_args.cc +++ b/src/core/lib/channel/channel_args.cc @@ -188,7 +188,7 @@ grpc_channel_args* grpc_channel_args_normalize(const grpc_channel_args* a) { return b; } -void grpc_channel_args_destroy(grpc_exec_ctx* exec_ctx, grpc_channel_args* a) { +void grpc_channel_args_destroy(grpc_channel_args* a) { size_t i; if (!a) return; for (i = 0; i < a->num_args; i++) { @@ -199,8 +199,7 @@ void grpc_channel_args_destroy(grpc_exec_ctx* exec_ctx, grpc_channel_args* a) { case GRPC_ARG_INTEGER: break; case GRPC_ARG_POINTER: - a->args[i].value.pointer.vtable->destroy(exec_ctx, - a->args[i].value.pointer.p); + a->args[i].value.pointer.vtable->destroy(a->args[i].value.pointer.p); break; } gpr_free(a->args[i].key); @@ -299,8 +298,7 @@ static int find_stream_compression_algorithm_states_bitset( } grpc_channel_args* grpc_channel_args_compression_algorithm_set_state( - grpc_exec_ctx* exec_ctx, grpc_channel_args** a, - grpc_compression_algorithm algorithm, int state) { + grpc_channel_args** a, grpc_compression_algorithm algorithm, int state) { int* states_arg = nullptr; grpc_channel_args* result = *a; const int states_arg_found = @@ -333,15 +331,15 @@ grpc_channel_args* grpc_channel_args_compression_algorithm_set_state( GPR_BITCLEAR((unsigned*)&tmp.value.integer, algorithm); } result = grpc_channel_args_copy_and_add(*a, &tmp, 1); - grpc_channel_args_destroy(exec_ctx, *a); + grpc_channel_args_destroy(*a); *a = result; } return result; } grpc_channel_args* grpc_channel_args_stream_compression_algorithm_set_state( - grpc_exec_ctx* exec_ctx, grpc_channel_args** a, - grpc_stream_compression_algorithm algorithm, int state) { + grpc_channel_args** a, grpc_stream_compression_algorithm algorithm, + int state) { int* states_arg = nullptr; grpc_channel_args* result = *a; const int states_arg_found = @@ -375,7 +373,7 @@ grpc_channel_args* grpc_channel_args_stream_compression_algorithm_set_state( GPR_BITCLEAR((unsigned*)&tmp.value.integer, algorithm); } result = grpc_channel_args_copy_and_add(*a, &tmp, 1); - grpc_channel_args_destroy(exec_ctx, *a); + grpc_channel_args_destroy(*a); *a = result; } return result; diff --git a/src/core/lib/channel/channel_args.h b/src/core/lib/channel/channel_args.h index f6cb7fa73db..9c7d06f34e4 100644 --- a/src/core/lib/channel/channel_args.h +++ b/src/core/lib/channel/channel_args.h @@ -53,7 +53,7 @@ grpc_channel_args* grpc_channel_args_union(const grpc_channel_args* a, const grpc_channel_args* b); /** Destroy arguments created by \a grpc_channel_args_copy */ -void grpc_channel_args_destroy(grpc_exec_ctx* exec_ctx, grpc_channel_args* a); +void grpc_channel_args_destroy(grpc_channel_args* a); /** Returns the compression algorithm set in \a a. */ grpc_compression_algorithm grpc_channel_args_get_compression_algorithm( @@ -85,8 +85,7 @@ grpc_channel_args* grpc_channel_args_set_stream_compression_algorithm( * modified to point to the returned instance (which may be different from the * input value of \a a). */ grpc_channel_args* grpc_channel_args_compression_algorithm_set_state( - grpc_exec_ctx* exec_ctx, grpc_channel_args** a, - grpc_compression_algorithm algorithm, int enabled); + grpc_channel_args** a, grpc_compression_algorithm algorithm, int enabled); /** Sets the support for the given stream compression algorithm. By default, all * stream compression algorithms are enabled. It's an error to disable an @@ -96,8 +95,8 @@ grpc_channel_args* grpc_channel_args_compression_algorithm_set_state( * modified to point to the returned instance (which may be different from the * input value of \a a). */ grpc_channel_args* grpc_channel_args_stream_compression_algorithm_set_state( - grpc_exec_ctx* exec_ctx, grpc_channel_args** a, - grpc_stream_compression_algorithm algorithm, int enabled); + grpc_channel_args** a, grpc_stream_compression_algorithm algorithm, + int enabled); /** Returns the bitset representing the support state (true for enabled, false * for disabled) for compression algorithms. diff --git a/src/core/lib/channel/channel_stack.cc b/src/core/lib/channel/channel_stack.cc index 7629d18789d..195fe0b195c 100644 --- a/src/core/lib/channel/channel_stack.cc +++ b/src/core/lib/channel/channel_stack.cc @@ -88,8 +88,8 @@ grpc_call_element* grpc_call_stack_element(grpc_call_stack* call_stack, } grpc_error* grpc_channel_stack_init( - grpc_exec_ctx* exec_ctx, int initial_refs, grpc_iomgr_cb_func destroy, - void* destroy_arg, const grpc_channel_filter** filters, size_t filter_count, + int initial_refs, grpc_iomgr_cb_func destroy, void* destroy_arg, + const grpc_channel_filter** filters, size_t filter_count, const grpc_channel_args* channel_args, grpc_transport* optional_transport, const char* name, grpc_channel_stack* stack) { size_t call_size = @@ -117,8 +117,7 @@ grpc_error* grpc_channel_stack_init( args.is_last = i == (filter_count - 1); elems[i].filter = filters[i]; elems[i].channel_data = user_data; - grpc_error* error = - elems[i].filter->init_channel_elem(exec_ctx, &elems[i], &args); + grpc_error* error = elems[i].filter->init_channel_elem(&elems[i], &args); if (error != GRPC_ERROR_NONE) { if (first_error == GRPC_ERROR_NONE) { first_error = error; @@ -138,20 +137,18 @@ grpc_error* grpc_channel_stack_init( return first_error; } -void grpc_channel_stack_destroy(grpc_exec_ctx* exec_ctx, - grpc_channel_stack* stack) { +void grpc_channel_stack_destroy(grpc_channel_stack* stack) { grpc_channel_element* channel_elems = CHANNEL_ELEMS_FROM_STACK(stack); size_t count = stack->count; size_t i; /* destroy per-filter data */ for (i = 0; i < count; i++) { - channel_elems[i].filter->destroy_channel_elem(exec_ctx, &channel_elems[i]); + channel_elems[i].filter->destroy_channel_elem(&channel_elems[i]); } } -grpc_error* grpc_call_stack_init(grpc_exec_ctx* exec_ctx, - grpc_channel_stack* channel_stack, +grpc_error* grpc_call_stack_init(grpc_channel_stack* channel_stack, int initial_refs, grpc_iomgr_cb_func destroy, void* destroy_arg, const grpc_call_element_args* elem_args) { @@ -174,8 +171,8 @@ grpc_error* grpc_call_stack_init(grpc_exec_ctx* exec_ctx, call_elems[i].filter = channel_elems[i].filter; call_elems[i].channel_data = channel_elems[i].channel_data; call_elems[i].call_data = user_data; - grpc_error* error = call_elems[i].filter->init_call_elem( - exec_ctx, &call_elems[i], elem_args); + grpc_error* error = + call_elems[i].filter->init_call_elem(&call_elems[i], elem_args); if (error != GRPC_ERROR_NONE) { if (first_error == GRPC_ERROR_NONE) { first_error = error; @@ -189,8 +186,7 @@ grpc_error* grpc_call_stack_init(grpc_exec_ctx* exec_ctx, return first_error; } -void grpc_call_stack_set_pollset_or_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_call_stack* call_stack, +void grpc_call_stack_set_pollset_or_pollset_set(grpc_call_stack* call_stack, grpc_polling_entity* pollent) { size_t count = call_stack->count; grpc_call_element* call_elems; @@ -203,18 +199,16 @@ void grpc_call_stack_set_pollset_or_pollset_set(grpc_exec_ctx* exec_ctx, /* init per-filter data */ for (i = 0; i < count; i++) { - call_elems[i].filter->set_pollset_or_pollset_set(exec_ctx, &call_elems[i], - pollent); + call_elems[i].filter->set_pollset_or_pollset_set(&call_elems[i], pollent); user_data += ROUND_UP_TO_ALIGNMENT_SIZE(call_elems[i].filter->sizeof_call_data); } } void grpc_call_stack_ignore_set_pollset_or_pollset_set( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_polling_entity* pollent) {} + grpc_call_element* elem, grpc_polling_entity* pollent) {} -void grpc_call_stack_destroy(grpc_exec_ctx* exec_ctx, grpc_call_stack* stack, +void grpc_call_stack_destroy(grpc_call_stack* stack, const grpc_call_final_info* final_info, grpc_closure* then_schedule_closure) { grpc_call_element* elems = CALL_ELEMS_FROM_STACK(stack); @@ -224,29 +218,27 @@ void grpc_call_stack_destroy(grpc_exec_ctx* exec_ctx, grpc_call_stack* stack, /* destroy per-filter data */ for (i = 0; i < count; i++) { elems[i].filter->destroy_call_elem( - exec_ctx, &elems[i], final_info, + &elems[i], final_info, i == count - 1 ? then_schedule_closure : nullptr); } } -void grpc_call_next_op(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +void grpc_call_next_op(grpc_call_element* elem, grpc_transport_stream_op_batch* op) { grpc_call_element* next_elem = elem + 1; GRPC_CALL_LOG_OP(GPR_INFO, next_elem, op); - next_elem->filter->start_transport_stream_op_batch(exec_ctx, next_elem, op); + next_elem->filter->start_transport_stream_op_batch(next_elem, op); } -void grpc_channel_next_get_info(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +void grpc_channel_next_get_info(grpc_channel_element* elem, const grpc_channel_info* channel_info) { grpc_channel_element* next_elem = elem + 1; - next_elem->filter->get_channel_info(exec_ctx, next_elem, channel_info); + next_elem->filter->get_channel_info(next_elem, channel_info); } -void grpc_channel_next_op(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, - grpc_transport_op* op) { +void grpc_channel_next_op(grpc_channel_element* elem, grpc_transport_op* op) { grpc_channel_element* next_elem = elem + 1; - next_elem->filter->start_transport_op(exec_ctx, next_elem, op); + next_elem->filter->start_transport_op(next_elem, op); } grpc_channel_stack* grpc_channel_stack_from_top_element( diff --git a/src/core/lib/channel/channel_stack.h b/src/core/lib/channel/channel_stack.h index 1b6e5396a56..716866be26a 100644 --- a/src/core/lib/channel/channel_stack.h +++ b/src/core/lib/channel/channel_stack.h @@ -96,14 +96,12 @@ typedef struct { typedef struct { /* Called to eg. send/receive data on a call. See grpc_call_next_op on how to call the next element in the stack */ - void (*start_transport_stream_op_batch)(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, + void (*start_transport_stream_op_batch)(grpc_call_element* elem, grpc_transport_stream_op_batch* op); /* Called to handle channel level operations - e.g. new calls, or transport closure. See grpc_channel_next_op on how to call the next element in the stack */ - void (*start_transport_op)(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, grpc_transport_op* op); + void (*start_transport_op)(grpc_channel_element* elem, grpc_transport_op* op); /* sizeof(per call data) */ size_t sizeof_call_data; @@ -116,11 +114,9 @@ typedef struct { transport and is on the server. Most filters want to ignore this argument. Implementations may assume that elem->call_data is all zeros. */ - grpc_error* (*init_call_elem)(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, + grpc_error* (*init_call_elem)(grpc_call_element* elem, const grpc_call_element_args* args); - void (*set_pollset_or_pollset_set)(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, + void (*set_pollset_or_pollset_set)(grpc_call_element* elem, grpc_polling_entity* pollent); /* Destroy per call data. The filter does not need to do any chaining. @@ -128,7 +124,7 @@ typedef struct { \a then_schedule_closure that should be passed to GRPC_CLOSURE_SCHED when destruction is complete. \a final_info contains data about the completed call, mainly for reporting purposes. */ - void (*destroy_call_elem)(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + void (*destroy_call_elem)(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_schedule_closure); @@ -141,16 +137,14 @@ typedef struct { useful for asserting correct configuration by upper layer code. The filter does not need to do any chaining. Implementations may assume that elem->call_data is all zeros. */ - grpc_error* (*init_channel_elem)(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, + grpc_error* (*init_channel_elem)(grpc_channel_element* elem, grpc_channel_element_args* args); /* Destroy per channel data. The filter does not need to do any chaining */ - void (*destroy_channel_elem)(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem); + void (*destroy_channel_elem)(grpc_channel_element* elem); /* Implement grpc_channel_get_info() */ - void (*get_channel_info)(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, + void (*get_channel_info)(grpc_channel_element* elem, const grpc_channel_info* channel_info); /* The name of this filter */ @@ -208,68 +202,62 @@ size_t grpc_channel_stack_size(const grpc_channel_filter** filters, size_t filter_count); /* Initialize a channel stack given some filters */ grpc_error* grpc_channel_stack_init( - grpc_exec_ctx* exec_ctx, int initial_refs, grpc_iomgr_cb_func destroy, - void* destroy_arg, const grpc_channel_filter** filters, size_t filter_count, + int initial_refs, grpc_iomgr_cb_func destroy, void* destroy_arg, + const grpc_channel_filter** filters, size_t filter_count, const grpc_channel_args* args, grpc_transport* optional_transport, const char* name, grpc_channel_stack* stack); /* Destroy a channel stack */ -void grpc_channel_stack_destroy(grpc_exec_ctx* exec_ctx, - grpc_channel_stack* stack); +void grpc_channel_stack_destroy(grpc_channel_stack* stack); /* Initialize a call stack given a channel stack. transport_server_data is expected to be NULL on a client, or an opaque transport owned pointer on the server. */ -grpc_error* grpc_call_stack_init(grpc_exec_ctx* exec_ctx, - grpc_channel_stack* channel_stack, +grpc_error* grpc_call_stack_init(grpc_channel_stack* channel_stack, int initial_refs, grpc_iomgr_cb_func destroy, void* destroy_arg, const grpc_call_element_args* elem_args); /* Set a pollset or a pollset_set for a call stack: must occur before the first * op is started */ -void grpc_call_stack_set_pollset_or_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_call_stack* call_stack, +void grpc_call_stack_set_pollset_or_pollset_set(grpc_call_stack* call_stack, grpc_polling_entity* pollent); #ifndef NDEBUG #define GRPC_CALL_STACK_REF(call_stack, reason) \ grpc_stream_ref(&(call_stack)->refcount, reason) -#define GRPC_CALL_STACK_UNREF(exec_ctx, call_stack, reason) \ - grpc_stream_unref(exec_ctx, &(call_stack)->refcount, reason) +#define GRPC_CALL_STACK_UNREF(call_stack, reason) \ + grpc_stream_unref(&(call_stack)->refcount, reason) #define GRPC_CHANNEL_STACK_REF(channel_stack, reason) \ grpc_stream_ref(&(channel_stack)->refcount, reason) -#define GRPC_CHANNEL_STACK_UNREF(exec_ctx, channel_stack, reason) \ - grpc_stream_unref(exec_ctx, &(channel_stack)->refcount, reason) +#define GRPC_CHANNEL_STACK_UNREF(channel_stack, reason) \ + grpc_stream_unref(&(channel_stack)->refcount, reason) #else #define GRPC_CALL_STACK_REF(call_stack, reason) \ grpc_stream_ref(&(call_stack)->refcount) -#define GRPC_CALL_STACK_UNREF(exec_ctx, call_stack, reason) \ - grpc_stream_unref(exec_ctx, &(call_stack)->refcount) +#define GRPC_CALL_STACK_UNREF(call_stack, reason) \ + grpc_stream_unref(&(call_stack)->refcount) #define GRPC_CHANNEL_STACK_REF(channel_stack, reason) \ grpc_stream_ref(&(channel_stack)->refcount) -#define GRPC_CHANNEL_STACK_UNREF(exec_ctx, channel_stack, reason) \ - grpc_stream_unref(exec_ctx, &(channel_stack)->refcount) +#define GRPC_CHANNEL_STACK_UNREF(channel_stack, reason) \ + grpc_stream_unref(&(channel_stack)->refcount) #endif /* Destroy a call stack */ -void grpc_call_stack_destroy(grpc_exec_ctx* exec_ctx, grpc_call_stack* stack, +void grpc_call_stack_destroy(grpc_call_stack* stack, const grpc_call_final_info* final_info, grpc_closure* then_schedule_closure); /* Ignore set pollset{_set} - used by filters if they don't care about pollsets * at all. Does nothing. */ void grpc_call_stack_ignore_set_pollset_or_pollset_set( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_polling_entity* pollent); + grpc_call_element* elem, grpc_polling_entity* pollent); /* Call the next operation in a call stack */ -void grpc_call_next_op(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +void grpc_call_next_op(grpc_call_element* elem, grpc_transport_stream_op_batch* op); /* Call the next operation (depending on call directionality) in a channel stack */ -void grpc_channel_next_op(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, - grpc_transport_op* op); +void grpc_channel_next_op(grpc_channel_element* elem, grpc_transport_op* op); /* Pass through a request to get_channel_info() to the next child element */ -void grpc_channel_next_get_info(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +void grpc_channel_next_get_info(grpc_channel_element* elem, const grpc_channel_info* channel_info); /* Given the top element of a channel stack, get the channel stack itself */ diff --git a/src/core/lib/channel/channel_stack_builder.cc b/src/core/lib/channel/channel_stack_builder.cc index 77b7854f94d..fcba826644e 100644 --- a/src/core/lib/channel/channel_stack_builder.cc +++ b/src/core/lib/channel/channel_stack_builder.cc @@ -150,10 +150,9 @@ void grpc_channel_stack_builder_set_name(grpc_channel_stack_builder* builder, } void grpc_channel_stack_builder_set_channel_arguments( - grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, - const grpc_channel_args* args) { + grpc_channel_stack_builder* builder, const grpc_channel_args* args) { if (builder->args != nullptr) { - grpc_channel_args_destroy(exec_ctx, builder->args); + grpc_channel_args_destroy(builder->args); } builder->args = grpc_channel_args_copy(args); } @@ -241,8 +240,7 @@ bool grpc_channel_stack_builder_add_filter_after( return true; } -void grpc_channel_stack_builder_destroy(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder) { +void grpc_channel_stack_builder_destroy(grpc_channel_stack_builder* builder) { filter_node* p = builder->begin.next; while (p != &builder->end) { filter_node* next = p->next; @@ -250,16 +248,15 @@ void grpc_channel_stack_builder_destroy(grpc_exec_ctx* exec_ctx, p = next; } if (builder->args != nullptr) { - grpc_channel_args_destroy(exec_ctx, builder->args); + grpc_channel_args_destroy(builder->args); } gpr_free(builder->target); gpr_free(builder); } grpc_error* grpc_channel_stack_builder_finish( - grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, - size_t prefix_bytes, int initial_refs, grpc_iomgr_cb_func destroy, - void* destroy_arg, void** result) { + grpc_channel_stack_builder* builder, size_t prefix_bytes, int initial_refs, + grpc_iomgr_cb_func destroy, void* destroy_arg, void** result) { // count the number of filters size_t num_filters = 0; for (filter_node* p = builder->begin.next; p != &builder->end; p = p->next) { @@ -284,12 +281,12 @@ grpc_error* grpc_channel_stack_builder_finish( (grpc_channel_stack*)((char*)(*result) + prefix_bytes); // and initialize it grpc_error* error = grpc_channel_stack_init( - exec_ctx, initial_refs, destroy, - destroy_arg == nullptr ? *result : destroy_arg, filters, num_filters, - builder->args, builder->transport, builder->name, channel_stack); + initial_refs, destroy, destroy_arg == nullptr ? *result : destroy_arg, + filters, num_filters, builder->args, builder->transport, builder->name, + channel_stack); if (error != GRPC_ERROR_NONE) { - grpc_channel_stack_destroy(exec_ctx, channel_stack); + grpc_channel_stack_destroy(channel_stack); gpr_free(*result); *result = nullptr; } else { @@ -305,7 +302,7 @@ grpc_error* grpc_channel_stack_builder_finish( } } - grpc_channel_stack_builder_destroy(exec_ctx, builder); + grpc_channel_stack_builder_destroy(builder); gpr_free((grpc_channel_filter**)filters); return error; diff --git a/src/core/lib/channel/channel_stack_builder.h b/src/core/lib/channel/channel_stack_builder.h index 10019542b18..d00ddc698c6 100644 --- a/src/core/lib/channel/channel_stack_builder.h +++ b/src/core/lib/channel/channel_stack_builder.h @@ -54,8 +54,7 @@ grpc_transport* grpc_channel_stack_builder_get_transport( /// Set channel arguments: copies args void grpc_channel_stack_builder_set_channel_arguments( - grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, - const grpc_channel_args* args); + grpc_channel_stack_builder* builder, const grpc_channel_args* args); /// Return a borrowed pointer to the channel arguments const grpc_channel_args* grpc_channel_stack_builder_get_channel_arguments( @@ -148,13 +147,11 @@ void grpc_channel_stack_builder_iterator_destroy( /// \a initial_refs, \a destroy, \a destroy_arg are as per /// grpc_channel_stack_init grpc_error* grpc_channel_stack_builder_finish( - grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, - size_t prefix_bytes, int initial_refs, grpc_iomgr_cb_func destroy, - void* destroy_arg, void** result); + grpc_channel_stack_builder* builder, size_t prefix_bytes, int initial_refs, + grpc_iomgr_cb_func destroy, void* destroy_arg, void** result); /// Destroy the builder without creating a channel stack -void grpc_channel_stack_builder_destroy(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder); +void grpc_channel_stack_builder_destroy(grpc_channel_stack_builder* builder); extern grpc_core::TraceFlag grpc_trace_channel_stack_builder; diff --git a/src/core/lib/channel/connected_channel.cc b/src/core/lib/channel/connected_channel.cc index af2f88ab2e4..9d07cfff4e5 100644 --- a/src/core/lib/channel/connected_channel.cc +++ b/src/core/lib/channel/connected_channel.cc @@ -51,17 +51,14 @@ typedef struct connected_channel_call_data { callback_state recv_message_ready; } call_data; -static void run_in_call_combiner(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void run_in_call_combiner(void* arg, grpc_error* error) { callback_state* state = (callback_state*)arg; - GRPC_CALL_COMBINER_START(exec_ctx, state->call_combiner, - state->original_closure, GRPC_ERROR_REF(error), - state->reason); + GRPC_CALL_COMBINER_START(state->call_combiner, state->original_closure, + GRPC_ERROR_REF(error), state->reason); } -static void run_cancel_in_call_combiner(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { - run_in_call_combiner(exec_ctx, arg, error); +static void run_cancel_in_call_combiner(void* arg, grpc_error* error) { + run_in_call_combiner(arg, error); gpr_free(arg); } @@ -98,8 +95,7 @@ static callback_state* get_state_for_batch( /* Intercept a call operation and either push it directly up or translate it into transport stream operations */ static void con_start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* batch) { + grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; if (batch->recv_initial_metadata) { @@ -126,58 +122,52 @@ static void con_start_transport_stream_op_batch( callback_state* state = get_state_for_batch(calld, batch); intercept_callback(calld, state, false, "on_complete", &batch->on_complete); } - grpc_transport_perform_stream_op(exec_ctx, chand->transport, - TRANSPORT_STREAM_FROM_CALL_DATA(calld), - batch); - GRPC_CALL_COMBINER_STOP(exec_ctx, calld->call_combiner, - "passed batch to transport"); + grpc_transport_perform_stream_op( + chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), batch); + GRPC_CALL_COMBINER_STOP(calld->call_combiner, "passed batch to transport"); } -static void con_start_transport_op(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static void con_start_transport_op(grpc_channel_element* elem, grpc_transport_op* op) { channel_data* chand = (channel_data*)elem->channel_data; - grpc_transport_perform_op(exec_ctx, chand->transport, op); + grpc_transport_perform_op(chand->transport, op); } /* Constructor for call_data */ -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; calld->call_combiner = args->call_combiner; int r = grpc_transport_init_stream( - exec_ctx, chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), + chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), &args->call_stack->refcount, args->server_transport_data, args->arena); return r == 0 ? GRPC_ERROR_NONE : GRPC_ERROR_CREATE_FROM_STATIC_STRING( "transport stream initialization failed"); } -static void set_pollset_or_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static void set_pollset_or_pollset_set(grpc_call_element* elem, grpc_polling_entity* pollent) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; - grpc_transport_set_pops(exec_ctx, chand->transport, + grpc_transport_set_pops(chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), pollent); } /* Destructor for call_data */ -static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_schedule_closure) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; - grpc_transport_destroy_stream(exec_ctx, chand->transport, + grpc_transport_destroy_stream(chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), then_schedule_closure); } /* Constructor for channel_data */ -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { channel_data* cd = (channel_data*)elem->channel_data; GPR_ASSERT(args->is_last); @@ -186,17 +176,15 @@ static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, } /* Destructor for channel_data */ -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) { +static void destroy_channel_elem(grpc_channel_element* elem) { channel_data* cd = (channel_data*)elem->channel_data; if (cd->transport) { - grpc_transport_destroy(exec_ctx, cd->transport); + grpc_transport_destroy(cd->transport); } } /* No-op. */ -static void con_get_channel_info(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static void con_get_channel_info(grpc_channel_element* elem, const grpc_channel_info* channel_info) {} const grpc_channel_filter grpc_connected_filter = { @@ -230,8 +218,7 @@ static void bind_transport(grpc_channel_stack* channel_stack, grpc_transport_stream_size((grpc_transport*)t); } -bool grpc_add_connected_filter(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, +bool grpc_add_connected_filter(grpc_channel_stack_builder* builder, void* arg_must_be_null) { GPR_ASSERT(arg_must_be_null == nullptr); grpc_transport* t = grpc_channel_stack_builder_get_transport(builder); diff --git a/src/core/lib/channel/connected_channel.h b/src/core/lib/channel/connected_channel.h index cab8aad1543..91de8022db5 100644 --- a/src/core/lib/channel/connected_channel.h +++ b/src/core/lib/channel/connected_channel.h @@ -23,8 +23,7 @@ extern const grpc_channel_filter grpc_connected_filter; -bool grpc_add_connected_filter(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, +bool grpc_add_connected_filter(grpc_channel_stack_builder* builder, void* arg_must_be_null); /* Debug helper to dig the transport stream out of a call element */ diff --git a/src/core/lib/channel/handshaker.cc b/src/core/lib/channel/handshaker.cc index 58c30b165b6..dcb149c03ef 100644 --- a/src/core/lib/channel/handshaker.cc +++ b/src/core/lib/channel/handshaker.cc @@ -34,23 +34,20 @@ void grpc_handshaker_init(const grpc_handshaker_vtable* vtable, handshaker->vtable = vtable; } -void grpc_handshaker_destroy(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker) { - handshaker->vtable->destroy(exec_ctx, handshaker); +void grpc_handshaker_destroy(grpc_handshaker* handshaker) { + handshaker->vtable->destroy(handshaker); } -void grpc_handshaker_shutdown(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker, grpc_error* why) { - handshaker->vtable->shutdown(exec_ctx, handshaker, why); +void grpc_handshaker_shutdown(grpc_handshaker* handshaker, grpc_error* why) { + handshaker->vtable->shutdown(handshaker, why); } -void grpc_handshaker_do_handshake(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker, +void grpc_handshaker_do_handshake(grpc_handshaker* handshaker, grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, grpc_handshaker_args* args) { - handshaker->vtable->do_handshake(exec_ctx, handshaker, acceptor, - on_handshake_done, args); + handshaker->vtable->do_handshake(handshaker, acceptor, on_handshake_done, + args); } // @@ -116,9 +113,9 @@ void grpc_handshake_manager_pending_list_remove(grpc_handshake_manager** head, } void grpc_handshake_manager_pending_list_shutdown_all( - grpc_exec_ctx* exec_ctx, grpc_handshake_manager* head, grpc_error* why) { + grpc_handshake_manager* head, grpc_error* why) { while (head != nullptr) { - grpc_handshake_manager_shutdown(exec_ctx, head, GRPC_ERROR_REF(why)); + grpc_handshake_manager_shutdown(head, GRPC_ERROR_REF(why)); head = head->next; } GRPC_ERROR_UNREF(why); @@ -145,11 +142,10 @@ void grpc_handshake_manager_add(grpc_handshake_manager* mgr, gpr_mu_unlock(&mgr->mu); } -static void grpc_handshake_manager_unref(grpc_exec_ctx* exec_ctx, - grpc_handshake_manager* mgr) { +static void grpc_handshake_manager_unref(grpc_handshake_manager* mgr) { if (gpr_unref(&mgr->refs)) { for (size_t i = 0; i < mgr->count; ++i) { - grpc_handshaker_destroy(exec_ctx, mgr->handshakers[i]); + grpc_handshaker_destroy(mgr->handshakers[i]); } gpr_free(mgr->handshakers); gpr_mu_destroy(&mgr->mu); @@ -157,19 +153,17 @@ static void grpc_handshake_manager_unref(grpc_exec_ctx* exec_ctx, } } -void grpc_handshake_manager_destroy(grpc_exec_ctx* exec_ctx, - grpc_handshake_manager* mgr) { - grpc_handshake_manager_unref(exec_ctx, mgr); +void grpc_handshake_manager_destroy(grpc_handshake_manager* mgr) { + grpc_handshake_manager_unref(mgr); } -void grpc_handshake_manager_shutdown(grpc_exec_ctx* exec_ctx, - grpc_handshake_manager* mgr, +void grpc_handshake_manager_shutdown(grpc_handshake_manager* mgr, grpc_error* why) { gpr_mu_lock(&mgr->mu); // Shutdown the handshaker that's currently in progress, if any. if (!mgr->shutdown && mgr->index > 0) { mgr->shutdown = true; - grpc_handshaker_shutdown(exec_ctx, mgr->handshakers[mgr->index - 1], + grpc_handshaker_shutdown(mgr->handshakers[mgr->index - 1], GRPC_ERROR_REF(why)); } gpr_mu_unlock(&mgr->mu); @@ -179,8 +173,7 @@ void grpc_handshake_manager_shutdown(grpc_exec_ctx* exec_ctx, // Helper function to call either the next handshaker or the // on_handshake_done callback. // Returns true if we've scheduled the on_handshake_done callback. -static bool call_next_handshaker_locked(grpc_exec_ctx* exec_ctx, - grpc_handshake_manager* mgr, +static bool call_next_handshaker_locked(grpc_handshake_manager* mgr, grpc_error* error) { GPR_ASSERT(mgr->index <= mgr->count); // If we got an error or we've been shut down or we're exiting early or @@ -190,13 +183,12 @@ static bool call_next_handshaker_locked(grpc_exec_ctx* exec_ctx, mgr->index == mgr->count) { // Cancel deadline timer, since we're invoking the on_handshake_done // callback now. - grpc_timer_cancel(exec_ctx, &mgr->deadline_timer); - GRPC_CLOSURE_SCHED(exec_ctx, &mgr->on_handshake_done, error); + grpc_timer_cancel(&mgr->deadline_timer); + GRPC_CLOSURE_SCHED(&mgr->on_handshake_done, error); mgr->shutdown = true; } else { - grpc_handshaker_do_handshake(exec_ctx, mgr->handshakers[mgr->index], - mgr->acceptor, &mgr->call_next_handshaker, - &mgr->args); + grpc_handshaker_do_handshake(mgr->handshakers[mgr->index], mgr->acceptor, + &mgr->call_next_handshaker, &mgr->args); } ++mgr->index; return mgr->shutdown; @@ -204,37 +196,34 @@ static bool call_next_handshaker_locked(grpc_exec_ctx* exec_ctx, // A function used as the handshaker-done callback when chaining // handshakers together. -static void call_next_handshaker(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void call_next_handshaker(void* arg, grpc_error* error) { grpc_handshake_manager* mgr = (grpc_handshake_manager*)arg; gpr_mu_lock(&mgr->mu); - bool done = call_next_handshaker_locked(exec_ctx, mgr, GRPC_ERROR_REF(error)); + bool done = call_next_handshaker_locked(mgr, GRPC_ERROR_REF(error)); gpr_mu_unlock(&mgr->mu); // If we're invoked the final callback, we won't be coming back // to this function, so we can release our reference to the // handshake manager. if (done) { - grpc_handshake_manager_unref(exec_ctx, mgr); + grpc_handshake_manager_unref(mgr); } } // Callback invoked when deadline is exceeded. -static void on_timeout(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void on_timeout(void* arg, grpc_error* error) { grpc_handshake_manager* mgr = (grpc_handshake_manager*)arg; if (error == GRPC_ERROR_NONE) { // Timer fired, rather than being cancelled. grpc_handshake_manager_shutdown( - exec_ctx, mgr, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Handshake timed out")); + mgr, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Handshake timed out")); } - grpc_handshake_manager_unref(exec_ctx, mgr); + grpc_handshake_manager_unref(mgr); } void grpc_handshake_manager_do_handshake( - grpc_exec_ctx* exec_ctx, grpc_handshake_manager* mgr, - grpc_pollset_set* interested_parties, grpc_endpoint* endpoint, - const grpc_channel_args* channel_args, grpc_millis deadline, - grpc_tcp_server_acceptor* acceptor, grpc_iomgr_cb_func on_handshake_done, - void* user_data) { + grpc_handshake_manager* mgr, grpc_pollset_set* interested_parties, + grpc_endpoint* endpoint, const grpc_channel_args* channel_args, + grpc_millis deadline, grpc_tcp_server_acceptor* acceptor, + grpc_iomgr_cb_func on_handshake_done, void* user_data) { gpr_mu_lock(&mgr->mu); GPR_ASSERT(mgr->index == 0); GPR_ASSERT(!mgr->shutdown); @@ -257,12 +246,12 @@ void grpc_handshake_manager_do_handshake( gpr_ref(&mgr->refs); GRPC_CLOSURE_INIT(&mgr->on_timeout, on_timeout, mgr, grpc_schedule_on_exec_ctx); - grpc_timer_init(exec_ctx, &mgr->deadline_timer, deadline, &mgr->on_timeout); + grpc_timer_init(&mgr->deadline_timer, deadline, &mgr->on_timeout); // Start first handshaker, which also owns a ref. gpr_ref(&mgr->refs); - bool done = call_next_handshaker_locked(exec_ctx, mgr, GRPC_ERROR_NONE); + bool done = call_next_handshaker_locked(mgr, GRPC_ERROR_NONE); gpr_mu_unlock(&mgr->mu); if (done) { - grpc_handshake_manager_unref(exec_ctx, mgr); + grpc_handshake_manager_unref(mgr); } } diff --git a/src/core/lib/channel/handshaker.h b/src/core/lib/channel/handshaker.h index 8e4114dc64c..68e54631230 100644 --- a/src/core/lib/channel/handshaker.h +++ b/src/core/lib/channel/handshaker.h @@ -68,18 +68,17 @@ typedef struct { typedef struct { /// Destroys the handshaker. - void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_handshaker* handshaker); + void (*destroy)(grpc_handshaker* handshaker); /// Shuts down the handshaker (e.g., to clean up when the operation is /// aborted in the middle). - void (*shutdown)(grpc_exec_ctx* exec_ctx, grpc_handshaker* handshaker, - grpc_error* why); + void (*shutdown)(grpc_handshaker* handshaker, grpc_error* why); /// Performs handshaking, modifying \a args as needed (e.g., to /// replace \a endpoint with a wrapped endpoint). /// When finished, invokes \a on_handshake_done. /// \a acceptor will be NULL for client-side handshakers. - void (*do_handshake)(grpc_exec_ctx* exec_ctx, grpc_handshaker* handshaker, + void (*do_handshake)(grpc_handshaker* handshaker, grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, grpc_handshaker_args* args); @@ -95,12 +94,9 @@ struct grpc_handshaker { void grpc_handshaker_init(const grpc_handshaker_vtable* vtable, grpc_handshaker* handshaker); -void grpc_handshaker_destroy(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker); -void grpc_handshaker_shutdown(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker, grpc_error* why); -void grpc_handshaker_do_handshake(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker, +void grpc_handshaker_destroy(grpc_handshaker* handshaker); +void grpc_handshaker_shutdown(grpc_handshaker* handshaker, grpc_error* why); +void grpc_handshaker_do_handshake(grpc_handshaker* handshaker, grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, grpc_handshaker_args* args); @@ -120,15 +116,13 @@ void grpc_handshake_manager_add(grpc_handshake_manager* mgr, grpc_handshaker* handshaker); /// Destroys the handshake manager. -void grpc_handshake_manager_destroy(grpc_exec_ctx* exec_ctx, - grpc_handshake_manager* mgr); +void grpc_handshake_manager_destroy(grpc_handshake_manager* mgr); /// Shuts down the handshake manager (e.g., to clean up when the operation is /// aborted in the middle). /// The caller must still call grpc_handshake_manager_destroy() after /// calling this function. -void grpc_handshake_manager_shutdown(grpc_exec_ctx* exec_ctx, - grpc_handshake_manager* mgr, +void grpc_handshake_manager_shutdown(grpc_handshake_manager* mgr, grpc_error* why); /// Invokes handshakers in the order they were added. @@ -146,11 +140,10 @@ void grpc_handshake_manager_shutdown(grpc_exec_ctx* exec_ctx, /// the necessary clean-up. Otherwise, the callback takes ownership of /// the arguments. void grpc_handshake_manager_do_handshake( - grpc_exec_ctx* exec_ctx, grpc_handshake_manager* mgr, - grpc_pollset_set* interested_parties, grpc_endpoint* endpoint, - const grpc_channel_args* channel_args, grpc_millis deadline, - grpc_tcp_server_acceptor* acceptor, grpc_iomgr_cb_func on_handshake_done, - void* user_data); + grpc_handshake_manager* mgr, grpc_pollset_set* interested_parties, + grpc_endpoint* endpoint, const grpc_channel_args* channel_args, + grpc_millis deadline, grpc_tcp_server_acceptor* acceptor, + grpc_iomgr_cb_func on_handshake_done, void* user_data); /// Add \a mgr to the server side list of all pending handshake managers, the /// list starts with \a *head. @@ -166,6 +159,6 @@ void grpc_handshake_manager_pending_list_remove(grpc_handshake_manager** head, /// Shutdown all pending handshake managers on the server side. // Not thread-safe. Caller needs to synchronize. void grpc_handshake_manager_pending_list_shutdown_all( - grpc_exec_ctx* exec_ctx, grpc_handshake_manager* head, grpc_error* why); + grpc_handshake_manager* head, grpc_error* why); #endif /* GRPC_CORE_LIB_CHANNEL_HANDSHAKER_H */ diff --git a/src/core/lib/channel/handshaker_factory.cc b/src/core/lib/channel/handshaker_factory.cc index 015006ade0e..2380d98300f 100644 --- a/src/core/lib/channel/handshaker_factory.cc +++ b/src/core/lib/channel/handshaker_factory.cc @@ -21,19 +21,19 @@ #include void grpc_handshaker_factory_add_handshakers( - grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* handshaker_factory, - const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr) { + grpc_handshaker_factory* handshaker_factory, const grpc_channel_args* args, + grpc_handshake_manager* handshake_mgr) { if (handshaker_factory != nullptr) { GPR_ASSERT(handshaker_factory->vtable != nullptr); - handshaker_factory->vtable->add_handshakers(exec_ctx, handshaker_factory, - args, handshake_mgr); + handshaker_factory->vtable->add_handshakers(handshaker_factory, args, + handshake_mgr); } } void grpc_handshaker_factory_destroy( - grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* handshaker_factory) { + grpc_handshaker_factory* handshaker_factory) { if (handshaker_factory != nullptr) { GPR_ASSERT(handshaker_factory->vtable != nullptr); - handshaker_factory->vtable->destroy(exec_ctx, handshaker_factory); + handshaker_factory->vtable->destroy(handshaker_factory); } } diff --git a/src/core/lib/channel/handshaker_factory.h b/src/core/lib/channel/handshaker_factory.h index ca7c26b50a2..8a7c0157e8b 100644 --- a/src/core/lib/channel/handshaker_factory.h +++ b/src/core/lib/channel/handshaker_factory.h @@ -29,12 +29,10 @@ typedef struct grpc_handshaker_factory grpc_handshaker_factory; typedef struct { - void (*add_handshakers)(grpc_exec_ctx* exec_ctx, - grpc_handshaker_factory* handshaker_factory, + void (*add_handshakers)(grpc_handshaker_factory* handshaker_factory, const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr); - void (*destroy)(grpc_exec_ctx* exec_ctx, - grpc_handshaker_factory* handshaker_factory); + void (*destroy)(grpc_handshaker_factory* handshaker_factory); } grpc_handshaker_factory_vtable; struct grpc_handshaker_factory { @@ -42,10 +40,10 @@ struct grpc_handshaker_factory { }; void grpc_handshaker_factory_add_handshakers( - grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* handshaker_factory, - const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr); + grpc_handshaker_factory* handshaker_factory, const grpc_channel_args* args, + grpc_handshake_manager* handshake_mgr); void grpc_handshaker_factory_destroy( - grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* handshaker_factory); + grpc_handshaker_factory* handshaker_factory); #endif /* GRPC_CORE_LIB_CHANNEL_HANDSHAKER_FACTORY_H */ diff --git a/src/core/lib/channel/handshaker_registry.cc b/src/core/lib/channel/handshaker_registry.cc index c6bc87d704c..098eabf084f 100644 --- a/src/core/lib/channel/handshaker_registry.cc +++ b/src/core/lib/channel/handshaker_registry.cc @@ -47,18 +47,17 @@ static void grpc_handshaker_factory_list_register( } static void grpc_handshaker_factory_list_add_handshakers( - grpc_exec_ctx* exec_ctx, grpc_handshaker_factory_list* list, - const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr) { + grpc_handshaker_factory_list* list, const grpc_channel_args* args, + grpc_handshake_manager* handshake_mgr) { for (size_t i = 0; i < list->num_factories; ++i) { - grpc_handshaker_factory_add_handshakers(exec_ctx, list->list[i], args, - handshake_mgr); + grpc_handshaker_factory_add_handshakers(list->list[i], args, handshake_mgr); } } static void grpc_handshaker_factory_list_destroy( - grpc_exec_ctx* exec_ctx, grpc_handshaker_factory_list* list) { + grpc_handshaker_factory_list* list) { for (size_t i = 0; i < list->num_factories; ++i) { - grpc_handshaker_factory_destroy(exec_ctx, list->list[i]); + grpc_handshaker_factory_destroy(list->list[i]); } gpr_free(list->list); } @@ -74,10 +73,9 @@ void grpc_handshaker_factory_registry_init() { memset(g_handshaker_factory_lists, 0, sizeof(g_handshaker_factory_lists)); } -void grpc_handshaker_factory_registry_shutdown(grpc_exec_ctx* exec_ctx) { +void grpc_handshaker_factory_registry_shutdown() { for (size_t i = 0; i < NUM_HANDSHAKER_TYPES; ++i) { - grpc_handshaker_factory_list_destroy(exec_ctx, - &g_handshaker_factory_lists[i]); + grpc_handshaker_factory_list_destroy(&g_handshaker_factory_lists[i]); } } @@ -88,11 +86,9 @@ void grpc_handshaker_factory_register(bool at_start, &g_handshaker_factory_lists[handshaker_type], at_start, factory); } -void grpc_handshakers_add(grpc_exec_ctx* exec_ctx, - grpc_handshaker_type handshaker_type, +void grpc_handshakers_add(grpc_handshaker_type handshaker_type, const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr) { grpc_handshaker_factory_list_add_handshakers( - exec_ctx, &g_handshaker_factory_lists[handshaker_type], args, - handshake_mgr); + &g_handshaker_factory_lists[handshaker_type], args, handshake_mgr); } diff --git a/src/core/lib/channel/handshaker_registry.h b/src/core/lib/channel/handshaker_registry.h index a3b2ac1dc73..0b05531b7ef 100644 --- a/src/core/lib/channel/handshaker_registry.h +++ b/src/core/lib/channel/handshaker_registry.h @@ -31,7 +31,7 @@ typedef enum { } grpc_handshaker_type; void grpc_handshaker_factory_registry_init(); -void grpc_handshaker_factory_registry_shutdown(grpc_exec_ctx* exec_ctx); +void grpc_handshaker_factory_registry_shutdown(); /// Registers a new handshaker factory. Takes ownership. /// If \a at_start is true, the new handshaker will be at the beginning of @@ -40,8 +40,7 @@ void grpc_handshaker_factory_register(bool at_start, grpc_handshaker_type handshaker_type, grpc_handshaker_factory* factory); -void grpc_handshakers_add(grpc_exec_ctx* exec_ctx, - grpc_handshaker_type handshaker_type, +void grpc_handshakers_add(grpc_handshaker_type handshaker_type, const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr); diff --git a/src/core/lib/compression/message_compress.cc b/src/core/lib/compression/message_compress.cc index c051e28864f..aa43a53f2b7 100644 --- a/src/core/lib/compression/message_compress.cc +++ b/src/core/lib/compression/message_compress.cc @@ -29,8 +29,8 @@ #define OUTPUT_BLOCK_SIZE 1024 -static int zlib_body(grpc_exec_ctx* exec_ctx, z_stream* zs, - grpc_slice_buffer* input, grpc_slice_buffer* output, +static int zlib_body(z_stream* zs, grpc_slice_buffer* input, + grpc_slice_buffer* output, int (*flate)(z_stream* zs, int flush)) { int r; int flush; @@ -74,7 +74,7 @@ static int zlib_body(grpc_exec_ctx* exec_ctx, z_stream* zs, return 1; error: - grpc_slice_unref_internal(exec_ctx, outbuf); + grpc_slice_unref_internal(outbuf); return 0; } @@ -84,8 +84,8 @@ static void* zalloc_gpr(void* opaque, unsigned int items, unsigned int size) { static void zfree_gpr(void* opaque, void* address) { gpr_free(address); } -static int zlib_compress(grpc_exec_ctx* exec_ctx, grpc_slice_buffer* input, - grpc_slice_buffer* output, int gzip) { +static int zlib_compress(grpc_slice_buffer* input, grpc_slice_buffer* output, + int gzip) { z_stream zs; int r; size_t i; @@ -97,11 +97,10 @@ static int zlib_compress(grpc_exec_ctx* exec_ctx, grpc_slice_buffer* input, r = deflateInit2(&zs, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 15 | (gzip ? 16 : 0), 8, Z_DEFAULT_STRATEGY); GPR_ASSERT(r == Z_OK); - r = zlib_body(exec_ctx, &zs, input, output, deflate) && - output->length < input->length; + r = zlib_body(&zs, input, output, deflate) && output->length < input->length; if (!r) { for (i = count_before; i < output->count; i++) { - grpc_slice_unref_internal(exec_ctx, output->slices[i]); + grpc_slice_unref_internal(output->slices[i]); } output->count = count_before; output->length = length_before; @@ -110,8 +109,8 @@ static int zlib_compress(grpc_exec_ctx* exec_ctx, grpc_slice_buffer* input, return r; } -static int zlib_decompress(grpc_exec_ctx* exec_ctx, grpc_slice_buffer* input, - grpc_slice_buffer* output, int gzip) { +static int zlib_decompress(grpc_slice_buffer* input, grpc_slice_buffer* output, + int gzip) { z_stream zs; int r; size_t i; @@ -122,10 +121,10 @@ static int zlib_decompress(grpc_exec_ctx* exec_ctx, grpc_slice_buffer* input, zs.zfree = zfree_gpr; r = inflateInit2(&zs, 15 | (gzip ? 16 : 0)); GPR_ASSERT(r == Z_OK); - r = zlib_body(exec_ctx, &zs, input, output, inflate); + r = zlib_body(&zs, input, output, inflate); if (!r) { for (i = count_before; i < output->count; i++) { - grpc_slice_unref_internal(exec_ctx, output->slices[i]); + grpc_slice_unref_internal(output->slices[i]); } output->count = count_before; output->length = length_before; @@ -142,8 +141,7 @@ static int copy(grpc_slice_buffer* input, grpc_slice_buffer* output) { return 1; } -static int compress_inner(grpc_exec_ctx* exec_ctx, - grpc_compression_algorithm algorithm, +static int compress_inner(grpc_compression_algorithm algorithm, grpc_slice_buffer* input, grpc_slice_buffer* output) { switch (algorithm) { case GRPC_COMPRESS_NONE: @@ -151,9 +149,9 @@ static int compress_inner(grpc_exec_ctx* exec_ctx, rely on that here */ return 0; case GRPC_COMPRESS_DEFLATE: - return zlib_compress(exec_ctx, input, output, 0); + return zlib_compress(input, output, 0); case GRPC_COMPRESS_GZIP: - return zlib_compress(exec_ctx, input, output, 1); + return zlib_compress(input, output, 1); case GRPC_COMPRESS_ALGORITHMS_COUNT: break; } @@ -161,26 +159,24 @@ static int compress_inner(grpc_exec_ctx* exec_ctx, return 0; } -int grpc_msg_compress(grpc_exec_ctx* exec_ctx, - grpc_compression_algorithm algorithm, +int grpc_msg_compress(grpc_compression_algorithm algorithm, grpc_slice_buffer* input, grpc_slice_buffer* output) { - if (!compress_inner(exec_ctx, algorithm, input, output)) { + if (!compress_inner(algorithm, input, output)) { copy(input, output); return 0; } return 1; } -int grpc_msg_decompress(grpc_exec_ctx* exec_ctx, - grpc_compression_algorithm algorithm, +int grpc_msg_decompress(grpc_compression_algorithm algorithm, grpc_slice_buffer* input, grpc_slice_buffer* output) { switch (algorithm) { case GRPC_COMPRESS_NONE: return copy(input, output); case GRPC_COMPRESS_DEFLATE: - return zlib_decompress(exec_ctx, input, output, 0); + return zlib_decompress(input, output, 0); case GRPC_COMPRESS_GZIP: - return zlib_decompress(exec_ctx, input, output, 1); + return zlib_decompress(input, output, 1); case GRPC_COMPRESS_ALGORITHMS_COUNT: break; } diff --git a/src/core/lib/compression/message_compress.h b/src/core/lib/compression/message_compress.h index ca8ca37f8e3..c963fccc73b 100644 --- a/src/core/lib/compression/message_compress.h +++ b/src/core/lib/compression/message_compress.h @@ -25,15 +25,13 @@ /* compress 'input' to 'output' using 'algorithm'. On success, appends compressed slices to output and returns 1. On failure, appends uncompressed slices to output and returns 0. */ -int grpc_msg_compress(grpc_exec_ctx* exec_ctx, - grpc_compression_algorithm algorithm, +int grpc_msg_compress(grpc_compression_algorithm algorithm, grpc_slice_buffer* input, grpc_slice_buffer* output); /* decompress 'input' to 'output' using 'algorithm'. On success, appends slices to output and returns 1. On failure, output is unchanged, and returns 0. */ -int grpc_msg_decompress(grpc_exec_ctx* exec_ctx, - grpc_compression_algorithm algorithm, +int grpc_msg_decompress(grpc_compression_algorithm algorithm, grpc_slice_buffer* input, grpc_slice_buffer* output); #endif /* GRPC_CORE_LIB_COMPRESSION_MESSAGE_COMPRESS_H */ diff --git a/src/core/lib/compression/stream_compression_gzip.cc b/src/core/lib/compression/stream_compression_gzip.cc index 0c3fdd12698..9d829b31dbf 100644 --- a/src/core/lib/compression/stream_compression_gzip.cc +++ b/src/core/lib/compression/stream_compression_gzip.cc @@ -40,7 +40,7 @@ static bool gzip_flate(grpc_stream_compression_context_gzip* ctx, /* Full flush is not allowed when inflating. */ GPR_ASSERT(!(ctx->flate == inflate && (flush == Z_FINISH))); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; int r; bool eoc = false; size_t original_max_output_size = max_output_size; @@ -57,8 +57,8 @@ static bool gzip_flate(grpc_stream_compression_context_gzip* ctx, r = ctx->flate(&ctx->zs, Z_NO_FLUSH); if (r < 0 && r != Z_BUF_ERROR) { gpr_log(GPR_ERROR, "zlib error (%d)", r); - grpc_slice_unref_internal(&exec_ctx, slice_out); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref_internal(slice_out); + return false; } else if (r == Z_STREAM_END && ctx->flate == inflate) { eoc = true; @@ -69,7 +69,7 @@ static bool gzip_flate(grpc_stream_compression_context_gzip* ctx, grpc_slice_sub(slice, GRPC_SLICE_LENGTH(slice) - ctx->zs.avail_in, GRPC_SLICE_LENGTH(slice))); } - grpc_slice_unref_internal(&exec_ctx, slice); + grpc_slice_unref_internal(slice); } if (flush != 0 && ctx->zs.avail_out > 0 && !eoc) { GPR_ASSERT(in->length == 0); @@ -88,8 +88,8 @@ static bool gzip_flate(grpc_stream_compression_context_gzip* ctx, break; default: gpr_log(GPR_ERROR, "zlib error (%d)", r); - grpc_slice_unref_internal(&exec_ctx, slice_out); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref_internal(slice_out); + return false; } } else if (flush == Z_FINISH) { @@ -104,8 +104,8 @@ static bool gzip_flate(grpc_stream_compression_context_gzip* ctx, break; default: gpr_log(GPR_ERROR, "zlib error (%d)", r); - grpc_slice_unref_internal(&exec_ctx, slice_out); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref_internal(slice_out); + return false; } } @@ -117,11 +117,11 @@ static bool gzip_flate(grpc_stream_compression_context_gzip* ctx, slice_out.data.refcounted.length -= ctx->zs.avail_out; grpc_slice_buffer_add(out, slice_out); } else { - grpc_slice_unref_internal(&exec_ctx, slice_out); + grpc_slice_unref_internal(slice_out); } max_output_size -= (slice_size - ctx->zs.avail_out); } - grpc_exec_ctx_finish(&exec_ctx); + if (end_of_context) { *end_of_context = eoc; } diff --git a/src/core/lib/debug/stats.cc b/src/core/lib/debug/stats.cc index 7d2af71c475..0b39b2b1e71 100644 --- a/src/core/lib/debug/stats.cc +++ b/src/core/lib/debug/stats.cc @@ -62,9 +62,9 @@ void grpc_stats_diff(const grpc_stats_data* b, const grpc_stats_data* a, } } -int grpc_stats_histo_find_bucket_slow(grpc_exec_ctx* exec_ctx, int value, - const int* table, int table_size) { - GRPC_STATS_INC_HISTOGRAM_SLOW_LOOKUPS(exec_ctx); +int grpc_stats_histo_find_bucket_slow(int value, const int* table, + int table_size) { + GRPC_STATS_INC_HISTOGRAM_SLOW_LOOKUPS(); const int* const start = table; while (table_size > 0) { int step = table_size / 2; diff --git a/src/core/lib/debug/stats.h b/src/core/lib/debug/stats.h index 55db44e0c28..02eed5e844f 100644 --- a/src/core/lib/debug/stats.h +++ b/src/core/lib/debug/stats.h @@ -30,17 +30,15 @@ typedef struct grpc_stats_data { extern grpc_stats_data* grpc_stats_per_cpu_storage; -#define GRPC_THREAD_STATS_DATA(exec_ctx) \ - (&grpc_stats_per_cpu_storage[(exec_ctx)->starting_cpu]) +#define GRPC_THREAD_STATS_DATA() \ + (&grpc_stats_per_cpu_storage[grpc_core::ExecCtx::Get()->starting_cpu()]) -#define GRPC_STATS_INC_COUNTER(exec_ctx, ctr) \ - (gpr_atm_no_barrier_fetch_add( \ - &GRPC_THREAD_STATS_DATA((exec_ctx))->counters[(ctr)], 1)) +#define GRPC_STATS_INC_COUNTER(ctr) \ + (gpr_atm_no_barrier_fetch_add(&GRPC_THREAD_STATS_DATA()->counters[(ctr)], 1)) -#define GRPC_STATS_INC_HISTOGRAM(exec_ctx, histogram, index) \ - (gpr_atm_no_barrier_fetch_add( \ - &GRPC_THREAD_STATS_DATA((exec_ctx)) \ - ->histograms[histogram##_FIRST_SLOT + (index)], \ +#define GRPC_STATS_INC_HISTOGRAM(histogram, index) \ + (gpr_atm_no_barrier_fetch_add( \ + &GRPC_THREAD_STATS_DATA()->histograms[histogram##_FIRST_SLOT + (index)], \ 1)) void grpc_stats_init(void); @@ -50,8 +48,8 @@ void grpc_stats_collect(grpc_stats_data* output); void grpc_stats_diff(const grpc_stats_data* b, const grpc_stats_data* a, grpc_stats_data* c); char* grpc_stats_data_as_json(const grpc_stats_data* data); -int grpc_stats_histo_find_bucket_slow(grpc_exec_ctx* exec_ctx, int value, - const int* table, int table_size); +int grpc_stats_histo_find_bucket_slow(int value, const int* table, + int table_size); double grpc_stats_histo_percentile(const grpc_stats_data* data, grpc_stats_histograms histogram, double percentile); diff --git a/src/core/lib/debug/stats_data.cc b/src/core/lib/debug/stats_data.cc index 17e15f4cfbe..996ed3de9a2 100644 --- a/src/core/lib/debug/stats_data.cc +++ b/src/core/lib/debug/stats_data.cc @@ -342,11 +342,10 @@ const uint8_t grpc_stats_table_7[102] = { 42, 42, 43, 44, 44, 45, 46, 46, 47, 48, 48, 49, 49, 50, 50, 51, 51}; const int grpc_stats_table_8[9] = {0, 1, 2, 4, 7, 13, 23, 39, 64}; const uint8_t grpc_stats_table_9[9] = {0, 0, 1, 2, 2, 3, 4, 4, 5}; -void grpc_stats_inc_call_initial_size(grpc_exec_ctx* exec_ctx, int value) { +void grpc_stats_inc_call_initial_size(int value) { value = GPR_CLAMP(value, 0, 262144); if (value < 6) { - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_CALL_INITIAL_SIZE, - value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_CALL_INITIAL_SIZE, value); return; } union { @@ -359,19 +358,17 @@ void grpc_stats_inc_call_initial_size(grpc_exec_ctx* exec_ctx, int value) { grpc_stats_table_1[((_val.uint - 4618441417868443648ull) >> 49)] + 6; _bkt.dbl = grpc_stats_table_0[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_CALL_INITIAL_SIZE, - bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_CALL_INITIAL_SIZE, bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_CALL_INITIAL_SIZE, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_0, 64)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_CALL_INITIAL_SIZE, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_0, 64)); } -void grpc_stats_inc_poll_events_returned(grpc_exec_ctx* exec_ctx, int value) { +void grpc_stats_inc_poll_events_returned(int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 29) { - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_POLL_EVENTS_RETURNED, value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_POLL_EVENTS_RETURNED, value); return; } union { @@ -384,20 +381,17 @@ void grpc_stats_inc_poll_events_returned(grpc_exec_ctx* exec_ctx, int value) { grpc_stats_table_3[((_val.uint - 4628855992006737920ull) >> 47)] + 29; _bkt.dbl = grpc_stats_table_2[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_POLL_EVENTS_RETURNED, bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_POLL_EVENTS_RETURNED, bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_POLL_EVENTS_RETURNED, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_2, 128)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_POLL_EVENTS_RETURNED, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_2, 128)); } -void grpc_stats_inc_tcp_write_size(grpc_exec_ctx* exec_ctx, int value) { +void grpc_stats_inc_tcp_write_size(int value) { value = GPR_CLAMP(value, 0, 16777216); if (value < 5) { - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_WRITE_SIZE, - value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_WRITE_SIZE, value); return; } union { @@ -410,19 +404,17 @@ void grpc_stats_inc_tcp_write_size(grpc_exec_ctx* exec_ctx, int value) { grpc_stats_table_5[((_val.uint - 4617315517961601024ull) >> 50)] + 5; _bkt.dbl = grpc_stats_table_4[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_WRITE_SIZE, - bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_WRITE_SIZE, bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_WRITE_SIZE, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_4, 64)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_TCP_WRITE_SIZE, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_4, 64)); } -void grpc_stats_inc_tcp_write_iov_size(grpc_exec_ctx* exec_ctx, int value) { +void grpc_stats_inc_tcp_write_iov_size(int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 13) { - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_TCP_WRITE_IOV_SIZE, value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_WRITE_IOV_SIZE, value); return; } union { @@ -435,19 +427,17 @@ void grpc_stats_inc_tcp_write_iov_size(grpc_exec_ctx* exec_ctx, int value) { grpc_stats_table_7[((_val.uint - 4623507967449235456ull) >> 48)] + 13; _bkt.dbl = grpc_stats_table_6[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_TCP_WRITE_IOV_SIZE, bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_WRITE_IOV_SIZE, bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_WRITE_IOV_SIZE, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_6, 64)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_TCP_WRITE_IOV_SIZE, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_6, 64)); } -void grpc_stats_inc_tcp_read_size(grpc_exec_ctx* exec_ctx, int value) { +void grpc_stats_inc_tcp_read_size(int value) { value = GPR_CLAMP(value, 0, 16777216); if (value < 5) { - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_SIZE, - value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_READ_SIZE, value); return; } union { @@ -460,19 +450,17 @@ void grpc_stats_inc_tcp_read_size(grpc_exec_ctx* exec_ctx, int value) { grpc_stats_table_5[((_val.uint - 4617315517961601024ull) >> 50)] + 5; _bkt.dbl = grpc_stats_table_4[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_SIZE, - bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_READ_SIZE, bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_SIZE, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_4, 64)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_TCP_READ_SIZE, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_4, 64)); } -void grpc_stats_inc_tcp_read_offer(grpc_exec_ctx* exec_ctx, int value) { +void grpc_stats_inc_tcp_read_offer(int value) { value = GPR_CLAMP(value, 0, 16777216); if (value < 5) { - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_OFFER, - value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_READ_OFFER, value); return; } union { @@ -485,20 +473,18 @@ void grpc_stats_inc_tcp_read_offer(grpc_exec_ctx* exec_ctx, int value) { grpc_stats_table_5[((_val.uint - 4617315517961601024ull) >> 50)] + 5; _bkt.dbl = grpc_stats_table_4[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_OFFER, - bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_READ_OFFER, bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_OFFER, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_4, 64)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_TCP_READ_OFFER, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_4, 64)); } -void grpc_stats_inc_tcp_read_offer_iov_size(grpc_exec_ctx* exec_ctx, - int value) { +void grpc_stats_inc_tcp_read_offer_iov_size(int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 13) { - GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_OFFER_IOV_SIZE, value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_READ_OFFER_IOV_SIZE, + value); return; } union { @@ -511,21 +497,19 @@ void grpc_stats_inc_tcp_read_offer_iov_size(grpc_exec_ctx* exec_ctx, grpc_stats_table_7[((_val.uint - 4623507967449235456ull) >> 48)] + 13; _bkt.dbl = grpc_stats_table_6[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_TCP_READ_OFFER_IOV_SIZE, bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_TCP_READ_OFFER_IOV_SIZE, + bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_TCP_READ_OFFER_IOV_SIZE, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_6, 64)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_TCP_READ_OFFER_IOV_SIZE, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_6, 64)); } -void grpc_stats_inc_http2_send_message_size(grpc_exec_ctx* exec_ctx, - int value) { +void grpc_stats_inc_http2_send_message_size(int value) { value = GPR_CLAMP(value, 0, 16777216); if (value < 5) { - GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_SIZE, value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_SIZE, + value); return; } union { @@ -538,22 +522,19 @@ void grpc_stats_inc_http2_send_message_size(grpc_exec_ctx* exec_ctx, grpc_stats_table_5[((_val.uint - 4617315517961601024ull) >> 50)] + 5; _bkt.dbl = grpc_stats_table_4[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_SIZE, bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_SIZE, + bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_SIZE, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_4, 64)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_SIZE, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_4, 64)); } -void grpc_stats_inc_http2_send_initial_metadata_per_write( - grpc_exec_ctx* exec_ctx, int value) { +void grpc_stats_inc_http2_send_initial_metadata_per_write(int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 13) { GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_INITIAL_METADATA_PER_WRITE, - value); + GRPC_STATS_HISTOGRAM_HTTP2_SEND_INITIAL_METADATA_PER_WRITE, value); return; } union { @@ -567,21 +548,18 @@ void grpc_stats_inc_http2_send_initial_metadata_per_write( _bkt.dbl = grpc_stats_table_6[bucket]; bucket -= (_val.uint < _bkt.uint); GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_INITIAL_METADATA_PER_WRITE, - bucket); + GRPC_STATS_HISTOGRAM_HTTP2_SEND_INITIAL_METADATA_PER_WRITE, bucket); return; } GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_INITIAL_METADATA_PER_WRITE, - grpc_stats_histo_find_bucket_slow((exec_ctx), value, grpc_stats_table_6, - 64)); + GRPC_STATS_HISTOGRAM_HTTP2_SEND_INITIAL_METADATA_PER_WRITE, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_6, 64)); } -void grpc_stats_inc_http2_send_message_per_write(grpc_exec_ctx* exec_ctx, - int value) { +void grpc_stats_inc_http2_send_message_per_write(int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 13) { - GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_PER_WRITE, value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_PER_WRITE, + value); return; } union { @@ -594,22 +572,19 @@ void grpc_stats_inc_http2_send_message_per_write(grpc_exec_ctx* exec_ctx, grpc_stats_table_7[((_val.uint - 4623507967449235456ull) >> 48)] + 13; _bkt.dbl = grpc_stats_table_6[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_PER_WRITE, bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_PER_WRITE, + bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_PER_WRITE, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_6, 64)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_HTTP2_SEND_MESSAGE_PER_WRITE, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_6, 64)); } -void grpc_stats_inc_http2_send_trailing_metadata_per_write( - grpc_exec_ctx* exec_ctx, int value) { +void grpc_stats_inc_http2_send_trailing_metadata_per_write(int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 13) { GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_TRAILING_METADATA_PER_WRITE, - value); + GRPC_STATS_HISTOGRAM_HTTP2_SEND_TRAILING_METADATA_PER_WRITE, value); return; } union { @@ -623,21 +598,18 @@ void grpc_stats_inc_http2_send_trailing_metadata_per_write( _bkt.dbl = grpc_stats_table_6[bucket]; bucket -= (_val.uint < _bkt.uint); GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_TRAILING_METADATA_PER_WRITE, - bucket); + GRPC_STATS_HISTOGRAM_HTTP2_SEND_TRAILING_METADATA_PER_WRITE, bucket); return; } GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_TRAILING_METADATA_PER_WRITE, - grpc_stats_histo_find_bucket_slow((exec_ctx), value, grpc_stats_table_6, - 64)); + GRPC_STATS_HISTOGRAM_HTTP2_SEND_TRAILING_METADATA_PER_WRITE, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_6, 64)); } -void grpc_stats_inc_http2_send_flowctl_per_write(grpc_exec_ctx* exec_ctx, - int value) { +void grpc_stats_inc_http2_send_flowctl_per_write(int value) { value = GPR_CLAMP(value, 0, 1024); if (value < 13) { - GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_FLOWCTL_PER_WRITE, value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_HTTP2_SEND_FLOWCTL_PER_WRITE, + value); return; } union { @@ -650,20 +622,18 @@ void grpc_stats_inc_http2_send_flowctl_per_write(grpc_exec_ctx* exec_ctx, grpc_stats_table_7[((_val.uint - 4623507967449235456ull) >> 48)] + 13; _bkt.dbl = grpc_stats_table_6[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM( - (exec_ctx), GRPC_STATS_HISTOGRAM_HTTP2_SEND_FLOWCTL_PER_WRITE, bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_HTTP2_SEND_FLOWCTL_PER_WRITE, + bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_HTTP2_SEND_FLOWCTL_PER_WRITE, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_6, 64)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_HTTP2_SEND_FLOWCTL_PER_WRITE, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_6, 64)); } -void grpc_stats_inc_server_cqs_checked(grpc_exec_ctx* exec_ctx, int value) { +void grpc_stats_inc_server_cqs_checked(int value) { value = GPR_CLAMP(value, 0, 64); if (value < 3) { - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED, value); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED, value); return; } union { @@ -676,13 +646,12 @@ void grpc_stats_inc_server_cqs_checked(grpc_exec_ctx* exec_ctx, int value) { grpc_stats_table_9[((_val.uint - 4613937818241073152ull) >> 51)] + 3; _bkt.dbl = grpc_stats_table_8[bucket]; bucket -= (_val.uint < _bkt.uint); - GRPC_STATS_INC_HISTOGRAM((exec_ctx), - GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED, bucket); + GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED, bucket); return; } - GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED, - grpc_stats_histo_find_bucket_slow( - (exec_ctx), value, grpc_stats_table_8, 8)); + GRPC_STATS_INC_HISTOGRAM( + GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED, + grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_8, 8)); } const int grpc_stats_histo_buckets[13] = {64, 128, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 8}; @@ -694,7 +663,7 @@ const int* const grpc_stats_histo_bucket_boundaries[13] = { grpc_stats_table_6, grpc_stats_table_4, grpc_stats_table_6, grpc_stats_table_6, grpc_stats_table_6, grpc_stats_table_6, grpc_stats_table_8}; -void (*const grpc_stats_inc_histogram[13])(grpc_exec_ctx* exec_ctx, int x) = { +void (*const grpc_stats_inc_histogram[13])(int x) = { grpc_stats_inc_call_initial_size, grpc_stats_inc_poll_events_returned, grpc_stats_inc_tcp_write_size, diff --git a/src/core/lib/debug/stats_data.h b/src/core/lib/debug/stats_data.h index 8a5bc973899..4504be33e7e 100644 --- a/src/core/lib/debug/stats_data.h +++ b/src/core/lib/debug/stats_data.h @@ -172,330 +172,262 @@ typedef enum { GRPC_STATS_HISTOGRAM_SERVER_CQS_CHECKED_BUCKETS = 8, GRPC_STATS_HISTOGRAM_BUCKETS = 840 } grpc_stats_histogram_constants; -#define GRPC_STATS_INC_CLIENT_CALLS_CREATED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_CLIENT_CALLS_CREATED) -#define GRPC_STATS_INC_SERVER_CALLS_CREATED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SERVER_CALLS_CREATED) -#define GRPC_STATS_INC_CQS_CREATED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_CQS_CREATED) -#define GRPC_STATS_INC_CLIENT_CHANNELS_CREATED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_CLIENT_CHANNELS_CREATED) -#define GRPC_STATS_INC_CLIENT_SUBCHANNELS_CREATED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_CLIENT_SUBCHANNELS_CREATED) -#define GRPC_STATS_INC_SERVER_CHANNELS_CREATED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SERVER_CHANNELS_CREATED) -#define GRPC_STATS_INC_SYSCALL_POLL(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SYSCALL_POLL) -#define GRPC_STATS_INC_SYSCALL_WAIT(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SYSCALL_WAIT) -#define GRPC_STATS_INC_POLLSET_KICK(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_POLLSET_KICK) -#define GRPC_STATS_INC_POLLSET_KICKED_WITHOUT_POLLER(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_POLLSET_KICKED_WITHOUT_POLLER) -#define GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_POLLSET_KICKED_AGAIN) -#define GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_POLLSET_KICK_WAKEUP_FD) -#define GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_POLLSET_KICK_WAKEUP_CV) -#define GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_POLLSET_KICK_OWN_THREAD) -#define GRPC_STATS_INC_HISTOGRAM_SLOW_LOOKUPS(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HISTOGRAM_SLOW_LOOKUPS) -#define GRPC_STATS_INC_SYSCALL_WRITE(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SYSCALL_WRITE) -#define GRPC_STATS_INC_SYSCALL_READ(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SYSCALL_READ) -#define GRPC_STATS_INC_TCP_BACKUP_POLLERS_CREATED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_TCP_BACKUP_POLLERS_CREATED) -#define GRPC_STATS_INC_TCP_BACKUP_POLLER_POLLS(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_TCP_BACKUP_POLLER_POLLS) -#define GRPC_STATS_INC_HTTP2_OP_BATCHES(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_OP_BATCHES) -#define GRPC_STATS_INC_HTTP2_OP_CANCEL(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_OP_CANCEL) -#define GRPC_STATS_INC_HTTP2_OP_SEND_INITIAL_METADATA(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HTTP2_OP_SEND_INITIAL_METADATA) -#define GRPC_STATS_INC_HTTP2_OP_SEND_MESSAGE(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_OP_SEND_MESSAGE) -#define GRPC_STATS_INC_HTTP2_OP_SEND_TRAILING_METADATA(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HTTP2_OP_SEND_TRAILING_METADATA) -#define GRPC_STATS_INC_HTTP2_OP_RECV_INITIAL_METADATA(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HTTP2_OP_RECV_INITIAL_METADATA) -#define GRPC_STATS_INC_HTTP2_OP_RECV_MESSAGE(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_OP_RECV_MESSAGE) -#define GRPC_STATS_INC_HTTP2_OP_RECV_TRAILING_METADATA(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HTTP2_OP_RECV_TRAILING_METADATA) -#define GRPC_STATS_INC_HTTP2_SETTINGS_WRITES(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_SETTINGS_WRITES) -#define GRPC_STATS_INC_HTTP2_PINGS_SENT(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_PINGS_SENT) -#define GRPC_STATS_INC_HTTP2_WRITES_BEGUN(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_WRITES_BEGUN) -#define GRPC_STATS_INC_HTTP2_WRITES_OFFLOADED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_WRITES_OFFLOADED) -#define GRPC_STATS_INC_HTTP2_WRITES_CONTINUED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_WRITES_CONTINUED) -#define GRPC_STATS_INC_HTTP2_PARTIAL_WRITES(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HTTP2_PARTIAL_WRITES) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_INITIAL_WRITE(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_CLIENT_CALLS_CREATED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CLIENT_CALLS_CREATED) +#define GRPC_STATS_INC_SERVER_CALLS_CREATED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SERVER_CALLS_CREATED) +#define GRPC_STATS_INC_CQS_CREATED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CQS_CREATED) +#define GRPC_STATS_INC_CLIENT_CHANNELS_CREATED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CLIENT_CHANNELS_CREATED) +#define GRPC_STATS_INC_CLIENT_SUBCHANNELS_CREATED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CLIENT_SUBCHANNELS_CREATED) +#define GRPC_STATS_INC_SERVER_CHANNELS_CREATED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SERVER_CHANNELS_CREATED) +#define GRPC_STATS_INC_SYSCALL_POLL() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SYSCALL_POLL) +#define GRPC_STATS_INC_SYSCALL_WAIT() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SYSCALL_WAIT) +#define GRPC_STATS_INC_POLLSET_KICK() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_POLLSET_KICK) +#define GRPC_STATS_INC_POLLSET_KICKED_WITHOUT_POLLER() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_POLLSET_KICKED_WITHOUT_POLLER) +#define GRPC_STATS_INC_POLLSET_KICKED_AGAIN() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_POLLSET_KICKED_AGAIN) +#define GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_POLLSET_KICK_WAKEUP_FD) +#define GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_POLLSET_KICK_WAKEUP_CV) +#define GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_POLLSET_KICK_OWN_THREAD) +#define GRPC_STATS_INC_HISTOGRAM_SLOW_LOOKUPS() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HISTOGRAM_SLOW_LOOKUPS) +#define GRPC_STATS_INC_SYSCALL_WRITE() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SYSCALL_WRITE) +#define GRPC_STATS_INC_SYSCALL_READ() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SYSCALL_READ) +#define GRPC_STATS_INC_TCP_BACKUP_POLLERS_CREATED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_TCP_BACKUP_POLLERS_CREATED) +#define GRPC_STATS_INC_TCP_BACKUP_POLLER_POLLS() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_TCP_BACKUP_POLLER_POLLS) +#define GRPC_STATS_INC_HTTP2_OP_BATCHES() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_BATCHES) +#define GRPC_STATS_INC_HTTP2_OP_CANCEL() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_CANCEL) +#define GRPC_STATS_INC_HTTP2_OP_SEND_INITIAL_METADATA() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_SEND_INITIAL_METADATA) +#define GRPC_STATS_INC_HTTP2_OP_SEND_MESSAGE() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_SEND_MESSAGE) +#define GRPC_STATS_INC_HTTP2_OP_SEND_TRAILING_METADATA() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_SEND_TRAILING_METADATA) +#define GRPC_STATS_INC_HTTP2_OP_RECV_INITIAL_METADATA() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_RECV_INITIAL_METADATA) +#define GRPC_STATS_INC_HTTP2_OP_RECV_MESSAGE() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_RECV_MESSAGE) +#define GRPC_STATS_INC_HTTP2_OP_RECV_TRAILING_METADATA() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_OP_RECV_TRAILING_METADATA) +#define GRPC_STATS_INC_HTTP2_SETTINGS_WRITES() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_SETTINGS_WRITES) +#define GRPC_STATS_INC_HTTP2_PINGS_SENT() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_PINGS_SENT) +#define GRPC_STATS_INC_HTTP2_WRITES_BEGUN() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_WRITES_BEGUN) +#define GRPC_STATS_INC_HTTP2_WRITES_OFFLOADED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_WRITES_OFFLOADED) +#define GRPC_STATS_INC_HTTP2_WRITES_CONTINUED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_WRITES_CONTINUED) +#define GRPC_STATS_INC_HTTP2_PARTIAL_WRITES() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_PARTIAL_WRITES) +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_INITIAL_WRITE() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_INITIAL_WRITE) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_START_NEW_STREAM(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_START_NEW_STREAM() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_START_NEW_STREAM) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_MESSAGE(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_SEND_MESSAGE) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_INITIAL_METADATA( \ - exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ - GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_SEND_INITIAL_METADATA) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_TRAILING_METADATA( \ - exec_ctx) \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_MESSAGE() \ + GRPC_STATS_INC_COUNTER( \ + GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_SEND_MESSAGE) +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_INITIAL_METADATA() \ GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ + GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_SEND_INITIAL_METADATA) +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_TRAILING_METADATA() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_SEND_TRAILING_METADATA) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RETRY_SEND_PING(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RETRY_SEND_PING() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_RETRY_SEND_PING) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CONTINUE_PINGS(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CONTINUE_PINGS() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_CONTINUE_PINGS) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_GOAWAY_SENT(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_GOAWAY_SENT) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RST_STREAM(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_RST_STREAM) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CLOSE_FROM_API(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_GOAWAY_SENT() \ + GRPC_STATS_INC_COUNTER( \ + GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_GOAWAY_SENT) +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_RST_STREAM() \ + GRPC_STATS_INC_COUNTER( \ + GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_RST_STREAM) +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_CLOSE_FROM_API() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_CLOSE_FROM_API) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_STREAM_FLOW_CONTROL( \ - exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_STREAM_FLOW_CONTROL() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_STREAM_FLOW_CONTROL) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL( \ - exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_SETTINGS(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_SEND_SETTINGS() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_SEND_SETTINGS) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_BDP_ESTIMATOR_PING( \ - exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_BDP_ESTIMATOR_PING() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_BDP_ESTIMATOR_PING) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_SETTING( \ - exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_SETTING() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_SETTING) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_UPDATE( \ - exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_UPDATE() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_FLOW_CONTROL_UNSTALLED_BY_UPDATE) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_APPLICATION_PING(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_APPLICATION_PING() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_APPLICATION_PING) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_KEEPALIVE_PING(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_KEEPALIVE_PING() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_KEEPALIVE_PING) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL_UNSTALLED( \ - exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL_UNSTALLED() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_TRANSPORT_FLOW_CONTROL_UNSTALLED) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_PING_RESPONSE(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_PING_RESPONSE() \ + GRPC_STATS_INC_COUNTER( \ GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_PING_RESPONSE) -#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FORCE_RST_STREAM(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), \ - GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_FORCE_RST_STREAM) -#define GRPC_STATS_INC_HTTP2_SPURIOUS_WRITES_BEGUN(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HTTP2_SPURIOUS_WRITES_BEGUN) -#define GRPC_STATS_INC_HPACK_RECV_INDEXED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_RECV_INDEXED) -#define GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_INCIDX) -#define GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX_V(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_INCIDX_V) -#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NOTIDX) -#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX_V(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NOTIDX_V) -#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NVRIDX) -#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX_V(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NVRIDX_V) -#define GRPC_STATS_INC_HPACK_RECV_UNCOMPRESSED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_RECV_UNCOMPRESSED) -#define GRPC_STATS_INC_HPACK_RECV_HUFFMAN(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_RECV_HUFFMAN) -#define GRPC_STATS_INC_HPACK_RECV_BINARY(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_RECV_BINARY) -#define GRPC_STATS_INC_HPACK_RECV_BINARY_BASE64(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_RECV_BINARY_BASE64) -#define GRPC_STATS_INC_HPACK_SEND_INDEXED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_SEND_INDEXED) -#define GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_INCIDX) -#define GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX_V(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_INCIDX_V) -#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NOTIDX) -#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX_V(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NOTIDX_V) -#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NVRIDX(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NVRIDX) -#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NVRIDX_V(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NVRIDX_V) -#define GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_SEND_UNCOMPRESSED) -#define GRPC_STATS_INC_HPACK_SEND_HUFFMAN(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_SEND_HUFFMAN) -#define GRPC_STATS_INC_HPACK_SEND_BINARY(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_HPACK_SEND_BINARY) -#define GRPC_STATS_INC_HPACK_SEND_BINARY_BASE64(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_HPACK_SEND_BINARY_BASE64) -#define GRPC_STATS_INC_COMBINER_LOCKS_INITIATED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_COMBINER_LOCKS_INITIATED) -#define GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_ITEMS(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_COMBINER_LOCKS_SCHEDULED_ITEMS) -#define GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS(exec_ctx) \ +#define GRPC_STATS_INC_HTTP2_INITIATE_WRITE_DUE_TO_FORCE_RST_STREAM() \ GRPC_STATS_INC_COUNTER( \ - (exec_ctx), GRPC_STATS_COUNTER_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS) -#define GRPC_STATS_INC_COMBINER_LOCKS_OFFLOADED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_COMBINER_LOCKS_OFFLOADED) -#define GRPC_STATS_INC_CALL_COMBINER_LOCKS_INITIATED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_CALL_COMBINER_LOCKS_INITIATED) -#define GRPC_STATS_INC_CALL_COMBINER_LOCKS_SCHEDULED_ITEMS(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), GRPC_STATS_COUNTER_CALL_COMBINER_LOCKS_SCHEDULED_ITEMS) -#define GRPC_STATS_INC_CALL_COMBINER_SET_NOTIFY_ON_CANCEL(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), GRPC_STATS_COUNTER_CALL_COMBINER_SET_NOTIFY_ON_CANCEL) -#define GRPC_STATS_INC_CALL_COMBINER_CANCELLED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_CALL_COMBINER_CANCELLED) -#define GRPC_STATS_INC_EXECUTOR_SCHEDULED_SHORT_ITEMS(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_EXECUTOR_SCHEDULED_SHORT_ITEMS) -#define GRPC_STATS_INC_EXECUTOR_SCHEDULED_LONG_ITEMS(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_EXECUTOR_SCHEDULED_LONG_ITEMS) -#define GRPC_STATS_INC_EXECUTOR_SCHEDULED_TO_SELF(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_EXECUTOR_SCHEDULED_TO_SELF) -#define GRPC_STATS_INC_EXECUTOR_WAKEUP_INITIATED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_EXECUTOR_WAKEUP_INITIATED) -#define GRPC_STATS_INC_EXECUTOR_QUEUE_DRAINED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_EXECUTOR_QUEUE_DRAINED) -#define GRPC_STATS_INC_EXECUTOR_PUSH_RETRIES(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_EXECUTOR_PUSH_RETRIES) -#define GRPC_STATS_INC_SERVER_REQUESTED_CALLS(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_SERVER_REQUESTED_CALLS) -#define GRPC_STATS_INC_SERVER_SLOWPATH_REQUESTS_QUEUED(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_SERVER_SLOWPATH_REQUESTS_QUEUED) -#define GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_FAILURES(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_CQ_EV_QUEUE_TRYLOCK_FAILURES) -#define GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_SUCCESSES(exec_ctx) \ - GRPC_STATS_INC_COUNTER((exec_ctx), \ - GRPC_STATS_COUNTER_CQ_EV_QUEUE_TRYLOCK_SUCCESSES) -#define GRPC_STATS_INC_CQ_EV_QUEUE_TRANSIENT_POP_FAILURES(exec_ctx) \ - GRPC_STATS_INC_COUNTER( \ - (exec_ctx), GRPC_STATS_COUNTER_CQ_EV_QUEUE_TRANSIENT_POP_FAILURES) -#define GRPC_STATS_INC_CALL_INITIAL_SIZE(exec_ctx, value) \ - grpc_stats_inc_call_initial_size((exec_ctx), (int)(value)) -void grpc_stats_inc_call_initial_size(grpc_exec_ctx* exec_ctx, int x); -#define GRPC_STATS_INC_POLL_EVENTS_RETURNED(exec_ctx, value) \ - grpc_stats_inc_poll_events_returned((exec_ctx), (int)(value)) -void grpc_stats_inc_poll_events_returned(grpc_exec_ctx* exec_ctx, int x); -#define GRPC_STATS_INC_TCP_WRITE_SIZE(exec_ctx, value) \ - grpc_stats_inc_tcp_write_size((exec_ctx), (int)(value)) -void grpc_stats_inc_tcp_write_size(grpc_exec_ctx* exec_ctx, int x); -#define GRPC_STATS_INC_TCP_WRITE_IOV_SIZE(exec_ctx, value) \ - grpc_stats_inc_tcp_write_iov_size((exec_ctx), (int)(value)) -void grpc_stats_inc_tcp_write_iov_size(grpc_exec_ctx* exec_ctx, int x); -#define GRPC_STATS_INC_TCP_READ_SIZE(exec_ctx, value) \ - grpc_stats_inc_tcp_read_size((exec_ctx), (int)(value)) -void grpc_stats_inc_tcp_read_size(grpc_exec_ctx* exec_ctx, int x); -#define GRPC_STATS_INC_TCP_READ_OFFER(exec_ctx, value) \ - grpc_stats_inc_tcp_read_offer((exec_ctx), (int)(value)) -void grpc_stats_inc_tcp_read_offer(grpc_exec_ctx* exec_ctx, int x); -#define GRPC_STATS_INC_TCP_READ_OFFER_IOV_SIZE(exec_ctx, value) \ - grpc_stats_inc_tcp_read_offer_iov_size((exec_ctx), (int)(value)) -void grpc_stats_inc_tcp_read_offer_iov_size(grpc_exec_ctx* exec_ctx, int x); -#define GRPC_STATS_INC_HTTP2_SEND_MESSAGE_SIZE(exec_ctx, value) \ - grpc_stats_inc_http2_send_message_size((exec_ctx), (int)(value)) -void grpc_stats_inc_http2_send_message_size(grpc_exec_ctx* exec_ctx, int x); -#define GRPC_STATS_INC_HTTP2_SEND_INITIAL_METADATA_PER_WRITE(exec_ctx, value) \ - grpc_stats_inc_http2_send_initial_metadata_per_write((exec_ctx), (int)(value)) -void grpc_stats_inc_http2_send_initial_metadata_per_write( - grpc_exec_ctx* exec_ctx, int x); -#define GRPC_STATS_INC_HTTP2_SEND_MESSAGE_PER_WRITE(exec_ctx, value) \ - grpc_stats_inc_http2_send_message_per_write((exec_ctx), (int)(value)) -void grpc_stats_inc_http2_send_message_per_write(grpc_exec_ctx* exec_ctx, - int x); -#define GRPC_STATS_INC_HTTP2_SEND_TRAILING_METADATA_PER_WRITE(exec_ctx, value) \ - grpc_stats_inc_http2_send_trailing_metadata_per_write((exec_ctx), \ - (int)(value)) -void grpc_stats_inc_http2_send_trailing_metadata_per_write( - grpc_exec_ctx* exec_ctx, int x); -#define GRPC_STATS_INC_HTTP2_SEND_FLOWCTL_PER_WRITE(exec_ctx, value) \ - grpc_stats_inc_http2_send_flowctl_per_write((exec_ctx), (int)(value)) -void grpc_stats_inc_http2_send_flowctl_per_write(grpc_exec_ctx* exec_ctx, - int x); -#define GRPC_STATS_INC_SERVER_CQS_CHECKED(exec_ctx, value) \ - grpc_stats_inc_server_cqs_checked((exec_ctx), (int)(value)) -void grpc_stats_inc_server_cqs_checked(grpc_exec_ctx* exec_ctx, int x); + GRPC_STATS_COUNTER_HTTP2_INITIATE_WRITE_DUE_TO_FORCE_RST_STREAM) +#define GRPC_STATS_INC_HTTP2_SPURIOUS_WRITES_BEGUN() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HTTP2_SPURIOUS_WRITES_BEGUN) +#define GRPC_STATS_INC_HPACK_RECV_INDEXED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_INDEXED) +#define GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_INCIDX) +#define GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX_V() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_INCIDX_V) +#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NOTIDX) +#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX_V() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NOTIDX_V) +#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NVRIDX) +#define GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX_V() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_LITHDR_NVRIDX_V) +#define GRPC_STATS_INC_HPACK_RECV_UNCOMPRESSED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_UNCOMPRESSED) +#define GRPC_STATS_INC_HPACK_RECV_HUFFMAN() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_HUFFMAN) +#define GRPC_STATS_INC_HPACK_RECV_BINARY() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_BINARY) +#define GRPC_STATS_INC_HPACK_RECV_BINARY_BASE64() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_RECV_BINARY_BASE64) +#define GRPC_STATS_INC_HPACK_SEND_INDEXED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_INDEXED) +#define GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_INCIDX) +#define GRPC_STATS_INC_HPACK_SEND_LITHDR_INCIDX_V() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_INCIDX_V) +#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NOTIDX) +#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NOTIDX_V() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NOTIDX_V) +#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NVRIDX() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NVRIDX) +#define GRPC_STATS_INC_HPACK_SEND_LITHDR_NVRIDX_V() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_LITHDR_NVRIDX_V) +#define GRPC_STATS_INC_HPACK_SEND_UNCOMPRESSED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_UNCOMPRESSED) +#define GRPC_STATS_INC_HPACK_SEND_HUFFMAN() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_HUFFMAN) +#define GRPC_STATS_INC_HPACK_SEND_BINARY() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_BINARY) +#define GRPC_STATS_INC_HPACK_SEND_BINARY_BASE64() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_HPACK_SEND_BINARY_BASE64) +#define GRPC_STATS_INC_COMBINER_LOCKS_INITIATED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_COMBINER_LOCKS_INITIATED) +#define GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_ITEMS() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_COMBINER_LOCKS_SCHEDULED_ITEMS) +#define GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS() \ + GRPC_STATS_INC_COUNTER( \ + GRPC_STATS_COUNTER_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS) +#define GRPC_STATS_INC_COMBINER_LOCKS_OFFLOADED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_COMBINER_LOCKS_OFFLOADED) +#define GRPC_STATS_INC_CALL_COMBINER_LOCKS_INITIATED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CALL_COMBINER_LOCKS_INITIATED) +#define GRPC_STATS_INC_CALL_COMBINER_LOCKS_SCHEDULED_ITEMS() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CALL_COMBINER_LOCKS_SCHEDULED_ITEMS) +#define GRPC_STATS_INC_CALL_COMBINER_SET_NOTIFY_ON_CANCEL() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CALL_COMBINER_SET_NOTIFY_ON_CANCEL) +#define GRPC_STATS_INC_CALL_COMBINER_CANCELLED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CALL_COMBINER_CANCELLED) +#define GRPC_STATS_INC_EXECUTOR_SCHEDULED_SHORT_ITEMS() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_EXECUTOR_SCHEDULED_SHORT_ITEMS) +#define GRPC_STATS_INC_EXECUTOR_SCHEDULED_LONG_ITEMS() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_EXECUTOR_SCHEDULED_LONG_ITEMS) +#define GRPC_STATS_INC_EXECUTOR_SCHEDULED_TO_SELF() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_EXECUTOR_SCHEDULED_TO_SELF) +#define GRPC_STATS_INC_EXECUTOR_WAKEUP_INITIATED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_EXECUTOR_WAKEUP_INITIATED) +#define GRPC_STATS_INC_EXECUTOR_QUEUE_DRAINED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_EXECUTOR_QUEUE_DRAINED) +#define GRPC_STATS_INC_EXECUTOR_PUSH_RETRIES() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_EXECUTOR_PUSH_RETRIES) +#define GRPC_STATS_INC_SERVER_REQUESTED_CALLS() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SERVER_REQUESTED_CALLS) +#define GRPC_STATS_INC_SERVER_SLOWPATH_REQUESTS_QUEUED() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_SERVER_SLOWPATH_REQUESTS_QUEUED) +#define GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_FAILURES() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CQ_EV_QUEUE_TRYLOCK_FAILURES) +#define GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_SUCCESSES() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CQ_EV_QUEUE_TRYLOCK_SUCCESSES) +#define GRPC_STATS_INC_CQ_EV_QUEUE_TRANSIENT_POP_FAILURES() \ + GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_CQ_EV_QUEUE_TRANSIENT_POP_FAILURES) +#define GRPC_STATS_INC_CALL_INITIAL_SIZE(value) \ + grpc_stats_inc_call_initial_size((int)(value)) +void grpc_stats_inc_call_initial_size(int x); +#define GRPC_STATS_INC_POLL_EVENTS_RETURNED(value) \ + grpc_stats_inc_poll_events_returned((int)(value)) +void grpc_stats_inc_poll_events_returned(int x); +#define GRPC_STATS_INC_TCP_WRITE_SIZE(value) \ + grpc_stats_inc_tcp_write_size((int)(value)) +void grpc_stats_inc_tcp_write_size(int x); +#define GRPC_STATS_INC_TCP_WRITE_IOV_SIZE(value) \ + grpc_stats_inc_tcp_write_iov_size((int)(value)) +void grpc_stats_inc_tcp_write_iov_size(int x); +#define GRPC_STATS_INC_TCP_READ_SIZE(value) \ + grpc_stats_inc_tcp_read_size((int)(value)) +void grpc_stats_inc_tcp_read_size(int x); +#define GRPC_STATS_INC_TCP_READ_OFFER(value) \ + grpc_stats_inc_tcp_read_offer((int)(value)) +void grpc_stats_inc_tcp_read_offer(int x); +#define GRPC_STATS_INC_TCP_READ_OFFER_IOV_SIZE(value) \ + grpc_stats_inc_tcp_read_offer_iov_size((int)(value)) +void grpc_stats_inc_tcp_read_offer_iov_size(int x); +#define GRPC_STATS_INC_HTTP2_SEND_MESSAGE_SIZE(value) \ + grpc_stats_inc_http2_send_message_size((int)(value)) +void grpc_stats_inc_http2_send_message_size(int x); +#define GRPC_STATS_INC_HTTP2_SEND_INITIAL_METADATA_PER_WRITE(value) \ + grpc_stats_inc_http2_send_initial_metadata_per_write((int)(value)) +void grpc_stats_inc_http2_send_initial_metadata_per_write(int x); +#define GRPC_STATS_INC_HTTP2_SEND_MESSAGE_PER_WRITE(value) \ + grpc_stats_inc_http2_send_message_per_write((int)(value)) +void grpc_stats_inc_http2_send_message_per_write(int x); +#define GRPC_STATS_INC_HTTP2_SEND_TRAILING_METADATA_PER_WRITE(value) \ + grpc_stats_inc_http2_send_trailing_metadata_per_write((int)(value)) +void grpc_stats_inc_http2_send_trailing_metadata_per_write(int x); +#define GRPC_STATS_INC_HTTP2_SEND_FLOWCTL_PER_WRITE(value) \ + grpc_stats_inc_http2_send_flowctl_per_write((int)(value)) +void grpc_stats_inc_http2_send_flowctl_per_write(int x); +#define GRPC_STATS_INC_SERVER_CQS_CHECKED(value) \ + grpc_stats_inc_server_cqs_checked((int)(value)) +void grpc_stats_inc_server_cqs_checked(int x); extern const int grpc_stats_histo_buckets[13]; extern const int grpc_stats_histo_start[13]; extern const int* const grpc_stats_histo_bucket_boundaries[13]; -extern void (*const grpc_stats_inc_histogram[13])(grpc_exec_ctx* exec_ctx, - int x); +extern void (*const grpc_stats_inc_histogram[13])(int x); #endif /* GRPC_CORE_LIB_DEBUG_STATS_DATA_H */ diff --git a/src/core/lib/http/httpcli.cc b/src/core/lib/http/httpcli.cc index 73b484b06d7..ed874c4265c 100644 --- a/src/core/lib/http/httpcli.cc +++ b/src/core/lib/http/httpcli.cc @@ -63,13 +63,11 @@ typedef struct { static grpc_httpcli_get_override g_get_override = nullptr; static grpc_httpcli_post_override g_post_override = nullptr; -static void plaintext_handshake(grpc_exec_ctx* exec_ctx, void* arg, - grpc_endpoint* endpoint, const char* host, - grpc_millis deadline, - void (*on_done)(grpc_exec_ctx* exec_ctx, - void* arg, +static void plaintext_handshake(void* arg, grpc_endpoint* endpoint, + const char* host, grpc_millis deadline, + void (*on_done)(void* arg, grpc_endpoint* endpoint)) { - on_done(exec_ctx, arg, endpoint); + on_done(arg, endpoint); } const grpc_httpcli_handshaker grpc_httpcli_plaintext = {"http", @@ -79,34 +77,31 @@ void grpc_httpcli_context_init(grpc_httpcli_context* context) { context->pollset_set = grpc_pollset_set_create(); } -void grpc_httpcli_context_destroy(grpc_exec_ctx* exec_ctx, - grpc_httpcli_context* context) { - grpc_pollset_set_destroy(exec_ctx, context->pollset_set); +void grpc_httpcli_context_destroy(grpc_httpcli_context* context) { + grpc_pollset_set_destroy(context->pollset_set); } -static void next_address(grpc_exec_ctx* exec_ctx, internal_request* req, - grpc_error* due_to_error); +static void next_address(internal_request* req, grpc_error* due_to_error); -static void finish(grpc_exec_ctx* exec_ctx, internal_request* req, - grpc_error* error) { - grpc_polling_entity_del_from_pollset_set(exec_ctx, req->pollent, +static void finish(internal_request* req, grpc_error* error) { + grpc_polling_entity_del_from_pollset_set(req->pollent, req->context->pollset_set); - GRPC_CLOSURE_SCHED(exec_ctx, req->on_done, error); + GRPC_CLOSURE_SCHED(req->on_done, error); grpc_http_parser_destroy(&req->parser); if (req->addresses != nullptr) { grpc_resolved_addresses_destroy(req->addresses); } if (req->ep != nullptr) { - grpc_endpoint_destroy(exec_ctx, req->ep); + grpc_endpoint_destroy(req->ep); } - grpc_slice_unref_internal(exec_ctx, req->request_text); + grpc_slice_unref_internal(req->request_text); gpr_free(req->host); gpr_free(req->ssl_host_override); grpc_iomgr_unregister_object(&req->iomgr_obj); - grpc_slice_buffer_destroy_internal(exec_ctx, &req->incoming); - grpc_slice_buffer_destroy_internal(exec_ctx, &req->outgoing); + grpc_slice_buffer_destroy_internal(&req->incoming); + grpc_slice_buffer_destroy_internal(&req->outgoing); GRPC_ERROR_UNREF(req->overall_error); - grpc_resource_quota_unref_internal(exec_ctx, req->resource_quota); + grpc_resource_quota_unref_internal(req->resource_quota); gpr_free(req); } @@ -124,12 +119,11 @@ static void append_error(internal_request* req, grpc_error* error) { gpr_free(addr_text); } -static void do_read(grpc_exec_ctx* exec_ctx, internal_request* req) { - grpc_endpoint_read(exec_ctx, req->ep, &req->incoming, &req->on_read); +static void do_read(internal_request* req) { + grpc_endpoint_read(req->ep, &req->incoming, &req->on_read); } -static void on_read(grpc_exec_ctx* exec_ctx, void* user_data, - grpc_error* error) { +static void on_read(void* user_data, grpc_error* error) { internal_request* req = (internal_request*)user_data; size_t i; @@ -139,77 +133,70 @@ static void on_read(grpc_exec_ctx* exec_ctx, void* user_data, grpc_error* err = grpc_http_parser_parse( &req->parser, req->incoming.slices[i], nullptr); if (err != GRPC_ERROR_NONE) { - finish(exec_ctx, req, err); + finish(req, err); return; } } } if (error == GRPC_ERROR_NONE) { - do_read(exec_ctx, req); + do_read(req); } else if (!req->have_read_byte) { - next_address(exec_ctx, req, GRPC_ERROR_REF(error)); + next_address(req, GRPC_ERROR_REF(error)); } else { - finish(exec_ctx, req, grpc_http_parser_eof(&req->parser)); + finish(req, grpc_http_parser_eof(&req->parser)); } } -static void on_written(grpc_exec_ctx* exec_ctx, internal_request* req) { - do_read(exec_ctx, req); -} +static void on_written(internal_request* req) { do_read(req); } -static void done_write(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void done_write(void* arg, grpc_error* error) { internal_request* req = (internal_request*)arg; if (error == GRPC_ERROR_NONE) { - on_written(exec_ctx, req); + on_written(req); } else { - next_address(exec_ctx, req, GRPC_ERROR_REF(error)); + next_address(req, GRPC_ERROR_REF(error)); } } -static void start_write(grpc_exec_ctx* exec_ctx, internal_request* req) { +static void start_write(internal_request* req) { grpc_slice_ref_internal(req->request_text); grpc_slice_buffer_add(&req->outgoing, req->request_text); - grpc_endpoint_write(exec_ctx, req->ep, &req->outgoing, &req->done_write); + grpc_endpoint_write(req->ep, &req->outgoing, &req->done_write); } -static void on_handshake_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_endpoint* ep) { +static void on_handshake_done(void* arg, grpc_endpoint* ep) { internal_request* req = (internal_request*)arg; if (!ep) { - next_address( - exec_ctx, req, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Unexplained handshake failure")); + next_address(req, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Unexplained handshake failure")); return; } req->ep = ep; - start_write(exec_ctx, req); + start_write(req); } -static void on_connected(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_connected(void* arg, grpc_error* error) { internal_request* req = (internal_request*)arg; if (!req->ep) { - next_address(exec_ctx, req, GRPC_ERROR_REF(error)); + next_address(req, GRPC_ERROR_REF(error)); return; } req->handshaker->handshake( - exec_ctx, req, req->ep, - req->ssl_host_override ? req->ssl_host_override : req->host, + req, req->ep, req->ssl_host_override ? req->ssl_host_override : req->host, req->deadline, on_handshake_done); } -static void next_address(grpc_exec_ctx* exec_ctx, internal_request* req, - grpc_error* error) { +static void next_address(internal_request* req, grpc_error* error) { grpc_resolved_address* addr; if (error != GRPC_ERROR_NONE) { append_error(req, error); } if (req->next_address == req->addresses->naddrs) { - finish(exec_ctx, req, + finish(req, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Failed HTTP requests to all targets", &req->overall_error, 1)); return; @@ -221,23 +208,21 @@ static void next_address(grpc_exec_ctx* exec_ctx, internal_request* req, (char*)GRPC_ARG_RESOURCE_QUOTA, req->resource_quota, 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); + grpc_tcp_client_connect(&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) { +static void on_resolved(void* arg, grpc_error* error) { internal_request* req = (internal_request*)arg; if (error != GRPC_ERROR_NONE) { - finish(exec_ctx, req, GRPC_ERROR_REF(error)); + finish(req, GRPC_ERROR_REF(error)); return; } req->next_address = 0; - next_address(exec_ctx, req, GRPC_ERROR_NONE); + next_address(req, GRPC_ERROR_NONE); } -static void internal_request_begin(grpc_exec_ctx* exec_ctx, - grpc_httpcli_context* context, +static void internal_request_begin(grpc_httpcli_context* context, grpc_polling_entity* pollent, grpc_resource_quota* resource_quota, const grpc_httpcli_request* request, @@ -267,33 +252,31 @@ static void internal_request_begin(grpc_exec_ctx* exec_ctx, req->ssl_host_override = gpr_strdup(request->ssl_host_override); GPR_ASSERT(pollent); - grpc_polling_entity_add_to_pollset_set(exec_ctx, req->pollent, + grpc_polling_entity_add_to_pollset_set(req->pollent, req->context->pollset_set); grpc_resolve_address( - exec_ctx, request->host, req->handshaker->default_port, - req->context->pollset_set, + request->host, req->handshaker->default_port, req->context->pollset_set, GRPC_CLOSURE_CREATE(on_resolved, req, grpc_schedule_on_exec_ctx), &req->addresses); } -void grpc_httpcli_get(grpc_exec_ctx* exec_ctx, grpc_httpcli_context* context, +void grpc_httpcli_get(grpc_httpcli_context* context, grpc_polling_entity* pollent, grpc_resource_quota* resource_quota, const grpc_httpcli_request* request, grpc_millis deadline, grpc_closure* on_done, grpc_httpcli_response* response) { char* name; - if (g_get_override && - g_get_override(exec_ctx, request, deadline, on_done, response)) { + if (g_get_override && g_get_override(request, deadline, on_done, response)) { return; } gpr_asprintf(&name, "HTTP:GET:%s:%s", request->host, request->http.path); - internal_request_begin(exec_ctx, context, pollent, resource_quota, request, - deadline, on_done, response, name, + internal_request_begin(context, pollent, resource_quota, request, 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, +void grpc_httpcli_post(grpc_httpcli_context* context, grpc_polling_entity* pollent, grpc_resource_quota* resource_quota, const grpc_httpcli_request* request, @@ -301,16 +284,14 @@ void grpc_httpcli_post(grpc_exec_ctx* exec_ctx, grpc_httpcli_context* context, grpc_millis deadline, grpc_closure* on_done, grpc_httpcli_response* response) { char* name; - if (g_post_override && - g_post_override(exec_ctx, request, body_bytes, body_size, deadline, - on_done, response)) { + if (g_post_override && g_post_override(request, body_bytes, body_size, + deadline, on_done, response)) { return; } gpr_asprintf(&name, "HTTP:POST:%s:%s", request->host, request->http.path); internal_request_begin( - exec_ctx, context, pollent, resource_quota, request, deadline, on_done, - response, name, - grpc_httpcli_format_post_request(request, body_bytes, body_size)); + context, pollent, resource_quota, request, deadline, on_done, response, + name, grpc_httpcli_format_post_request(request, body_bytes, body_size)); gpr_free(name); } diff --git a/src/core/lib/http/httpcli.h b/src/core/lib/http/httpcli.h index 6f675568bd0..72d20cc7a34 100644 --- a/src/core/lib/http/httpcli.h +++ b/src/core/lib/http/httpcli.h @@ -41,10 +41,9 @@ typedef struct grpc_httpcli_context { typedef struct { const char* default_port; - void (*handshake)(grpc_exec_ctx* exec_ctx, void* arg, grpc_endpoint* endpoint, - const char* host, grpc_millis deadline, - void (*on_done)(grpc_exec_ctx* exec_ctx, void* arg, - grpc_endpoint* endpoint)); + void (*handshake)(void* arg, grpc_endpoint* endpoint, const char* host, + grpc_millis deadline, + void (*on_done)(void* arg, grpc_endpoint* endpoint)); } grpc_httpcli_handshaker; extern const grpc_httpcli_handshaker grpc_httpcli_plaintext; @@ -68,8 +67,7 @@ typedef struct grpc_httpcli_request { typedef struct grpc_http_response grpc_httpcli_response; void grpc_httpcli_context_init(grpc_httpcli_context* context); -void grpc_httpcli_context_destroy(grpc_exec_ctx* exec_ctx, - grpc_httpcli_context* context); +void grpc_httpcli_context_destroy(grpc_httpcli_context* context); /* Asynchronously perform a HTTP GET. 'context' specifies the http context under which to do the get @@ -80,7 +78,7 @@ void grpc_httpcli_context_destroy(grpc_exec_ctx* exec_ctx, destroyed once the call returns 'deadline' contains a deadline for the request (or gpr_inf_future) 'on_response' is a callback to report results to */ -void grpc_httpcli_get(grpc_exec_ctx* exec_ctx, grpc_httpcli_context* context, +void grpc_httpcli_get(grpc_httpcli_context* context, grpc_polling_entity* pollent, grpc_resource_quota* resource_quota, const grpc_httpcli_request* request, grpc_millis deadline, @@ -101,7 +99,7 @@ void grpc_httpcli_get(grpc_exec_ctx* exec_ctx, grpc_httpcli_context* context, lifetime of the request 'on_response' is a callback to report results to Does not support ?var1=val1&var2=val2 in the path. */ -void grpc_httpcli_post(grpc_exec_ctx* exec_ctx, grpc_httpcli_context* context, +void grpc_httpcli_post(grpc_httpcli_context* context, grpc_polling_entity* pollent, grpc_resource_quota* resource_quota, const grpc_httpcli_request* request, @@ -110,15 +108,16 @@ void grpc_httpcli_post(grpc_exec_ctx* exec_ctx, grpc_httpcli_context* context, grpc_httpcli_response* response); /* override functions return 1 if they handled the request, 0 otherwise */ -typedef int (*grpc_httpcli_get_override)(grpc_exec_ctx* exec_ctx, - const grpc_httpcli_request* request, +typedef int (*grpc_httpcli_get_override)(const grpc_httpcli_request* request, grpc_millis deadline, grpc_closure* on_complete, grpc_httpcli_response* response); -typedef int (*grpc_httpcli_post_override)( - grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, - const char* body_bytes, size_t body_size, grpc_millis deadline, - grpc_closure* on_complete, grpc_httpcli_response* response); +typedef int (*grpc_httpcli_post_override)(const grpc_httpcli_request* request, + const char* body_bytes, + size_t body_size, + grpc_millis deadline, + grpc_closure* on_complete, + grpc_httpcli_response* response); void grpc_httpcli_set_override(grpc_httpcli_get_override get, grpc_httpcli_post_override post); diff --git a/src/core/lib/http/httpcli_security_connector.cc b/src/core/lib/http/httpcli_security_connector.cc index dfcaee702ba..bfb536a9211 100644 --- a/src/core/lib/http/httpcli_security_connector.cc +++ b/src/core/lib/http/httpcli_security_connector.cc @@ -38,8 +38,7 @@ typedef struct { char* secure_peer_name; } grpc_httpcli_ssl_channel_security_connector; -static void httpcli_ssl_destroy(grpc_exec_ctx* exec_ctx, - grpc_security_connector* sc) { +static void httpcli_ssl_destroy(grpc_security_connector* sc) { grpc_httpcli_ssl_channel_security_connector* c = (grpc_httpcli_ssl_channel_security_connector*)sc; if (c->handshaker_factory != nullptr) { @@ -50,8 +49,7 @@ static void httpcli_ssl_destroy(grpc_exec_ctx* exec_ctx, gpr_free(sc); } -static void httpcli_ssl_add_handshakers(grpc_exec_ctx* exec_ctx, - grpc_channel_security_connector* sc, +static void httpcli_ssl_add_handshakers(grpc_channel_security_connector* sc, grpc_handshake_manager* handshake_mgr) { grpc_httpcli_ssl_channel_security_connector* c = (grpc_httpcli_ssl_channel_security_connector*)sc; @@ -65,13 +63,11 @@ static void httpcli_ssl_add_handshakers(grpc_exec_ctx* exec_ctx, } } grpc_handshake_manager_add( - handshake_mgr, - grpc_security_handshaker_create( - exec_ctx, tsi_create_adapter_handshaker(handshaker), &sc->base)); + handshake_mgr, grpc_security_handshaker_create( + tsi_create_adapter_handshaker(handshaker), &sc->base)); } -static void httpcli_ssl_check_peer(grpc_exec_ctx* exec_ctx, - grpc_security_connector* sc, tsi_peer peer, +static void httpcli_ssl_check_peer(grpc_security_connector* sc, tsi_peer peer, grpc_auth_context** auth_context, grpc_closure* on_peer_checked) { grpc_httpcli_ssl_channel_security_connector* c = @@ -87,7 +83,7 @@ static void httpcli_ssl_check_peer(grpc_exec_ctx* exec_ctx, error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); } - GRPC_CLOSURE_SCHED(exec_ctx, on_peer_checked, error); + GRPC_CLOSURE_SCHED(on_peer_checked, error); tsi_peer_destruct(&peer); } @@ -104,8 +100,8 @@ static grpc_security_connector_vtable httpcli_ssl_vtable = { httpcli_ssl_destroy, httpcli_ssl_check_peer, httpcli_ssl_cmp}; static grpc_security_status httpcli_ssl_channel_security_connector_create( - grpc_exec_ctx* exec_ctx, const char* pem_root_certs, - const char* secure_peer_name, grpc_channel_security_connector** sc) { + const char* pem_root_certs, const char* secure_peer_name, + grpc_channel_security_connector** sc) { tsi_result result = TSI_OK; grpc_httpcli_ssl_channel_security_connector* c; @@ -128,12 +124,12 @@ static grpc_security_status httpcli_ssl_channel_security_connector_create( if (result != TSI_OK) { gpr_log(GPR_ERROR, "Handshaker factory creation failed with %s.", tsi_result_to_string(result)); - httpcli_ssl_destroy(exec_ctx, &c->base.base); + httpcli_ssl_destroy(&c->base.base); *sc = nullptr; return GRPC_SECURITY_ERROR; } // We don't actually need a channel credentials object in this case, - // but we set it to a non-NULL address so that we don't trigger + // but we set it to a non-nullptr address so that we don't trigger // assertions in grpc_channel_security_connector_cmp(). c->base.channel_creds = (grpc_channel_credentials*)1; c->base.add_handshakers = httpcli_ssl_add_handshakers; @@ -144,40 +140,37 @@ static grpc_security_status httpcli_ssl_channel_security_connector_create( /* handshaker */ typedef struct { - void (*func)(grpc_exec_ctx* exec_ctx, void* arg, grpc_endpoint* endpoint); + void (*func)(void* arg, grpc_endpoint* endpoint); void* arg; grpc_handshake_manager* handshake_mgr; } on_done_closure; -static void on_handshake_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_handshake_done(void* arg, grpc_error* error) { grpc_handshaker_args* args = (grpc_handshaker_args*)arg; on_done_closure* c = (on_done_closure*)args->user_data; if (error != GRPC_ERROR_NONE) { const char* msg = grpc_error_string(error); gpr_log(GPR_ERROR, "Secure transport setup failed: %s", msg); - c->func(exec_ctx, c->arg, nullptr); + c->func(c->arg, nullptr); } else { - grpc_channel_args_destroy(exec_ctx, args->args); - grpc_slice_buffer_destroy_internal(exec_ctx, args->read_buffer); + grpc_channel_args_destroy(args->args); + grpc_slice_buffer_destroy_internal(args->read_buffer); gpr_free(args->read_buffer); - c->func(exec_ctx, c->arg, args->endpoint); + c->func(c->arg, args->endpoint); } - grpc_handshake_manager_destroy(exec_ctx, c->handshake_mgr); + grpc_handshake_manager_destroy(c->handshake_mgr); gpr_free(c); } -static void ssl_handshake(grpc_exec_ctx* exec_ctx, void* arg, - grpc_endpoint* tcp, const char* host, +static void ssl_handshake(void* arg, grpc_endpoint* tcp, const char* host, grpc_millis deadline, - void (*on_done)(grpc_exec_ctx* exec_ctx, void* arg, - grpc_endpoint* endpoint)) { + void (*on_done)(void* arg, grpc_endpoint* endpoint)) { on_done_closure* c = (on_done_closure*)gpr_malloc(sizeof(*c)); const char* pem_root_certs = grpc_get_default_ssl_roots(); if (pem_root_certs == nullptr) { gpr_log(GPR_ERROR, "Could not get default pem root certs."); - on_done(exec_ctx, arg, nullptr); + on_done(arg, nullptr); gpr_free(c); return; } @@ -185,16 +178,16 @@ static void ssl_handshake(grpc_exec_ctx* exec_ctx, void* arg, c->arg = arg; grpc_channel_security_connector* sc = nullptr; GPR_ASSERT(httpcli_ssl_channel_security_connector_create( - exec_ctx, pem_root_certs, host, &sc) == GRPC_SECURITY_OK); + pem_root_certs, host, &sc) == GRPC_SECURITY_OK); grpc_arg channel_arg = grpc_security_connector_to_arg(&sc->base); grpc_channel_args args = {1, &channel_arg}; c->handshake_mgr = grpc_handshake_manager_create(); - grpc_handshakers_add(exec_ctx, HANDSHAKER_CLIENT, &args, c->handshake_mgr); + grpc_handshakers_add(HANDSHAKER_CLIENT, &args, c->handshake_mgr); grpc_handshake_manager_do_handshake( - exec_ctx, c->handshake_mgr, nullptr /* interested_parties */, tcp, + c->handshake_mgr, nullptr /* interested_parties */, tcp, nullptr /* channel_args */, deadline, nullptr /* acceptor */, on_handshake_done, c /* user_data */); - GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, &sc->base, "httpcli"); + GRPC_SECURITY_CONNECTOR_UNREF(&sc->base, "httpcli"); } const grpc_httpcli_handshaker grpc_httpcli_ssl = {"https", ssl_handshake}; diff --git a/src/core/lib/iomgr/block_annotate.h b/src/core/lib/iomgr/block_annotate.h index 340ebcb1afa..a57873aabb2 100644 --- a/src/core/lib/iomgr/block_annotate.h +++ b/src/core/lib/iomgr/block_annotate.h @@ -31,26 +31,27 @@ void gpr_thd_end_blocking_region(); do { \ gpr_thd_start_blocking_region(); \ } while (0) +#define GRPC_SCHEDULING_END_BLOCKING_REGION \ + do { \ + gpr_thd_end_blocking_region(); \ + grpc_core::ExecCtx::Get()->InvalidateNow(); \ + } while (0) #define GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX \ do { \ gpr_thd_end_blocking_region(); \ } while (0) -#define GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(ec) \ - do { \ - gpr_thd_end_blocking_region(); \ - grpc_exec_ctx_invalidate_now((ec)); \ - } while (0) + #else #define GRPC_SCHEDULING_START_BLOCKING_REGION \ do { \ } while (0) +#define GRPC_SCHEDULING_END_BLOCKING_REGION \ + do { \ + grpc_core::ExecCtx::Get()->InvalidateNow(); \ + } while (0) #define GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX \ do { \ } while (0) -#define GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(ec) \ - do { \ - grpc_exec_ctx_invalidate_now((ec)); \ - } while (0) #endif #endif /* GRPC_CORE_LIB_IOMGR_BLOCK_ANNOTATE_H */ diff --git a/src/core/lib/iomgr/call_combiner.cc b/src/core/lib/iomgr/call_combiner.cc index b5910b42e42..a9f48fb3c2d 100644 --- a/src/core/lib/iomgr/call_combiner.cc +++ b/src/core/lib/iomgr/call_combiner.cc @@ -56,8 +56,7 @@ void grpc_call_combiner_destroy(grpc_call_combiner* call_combiner) { #define DEBUG_FMT_ARGS #endif -void grpc_call_combiner_start(grpc_exec_ctx* exec_ctx, - grpc_call_combiner* call_combiner, +void grpc_call_combiner_start(grpc_call_combiner* call_combiner, grpc_closure* closure, grpc_error* error DEBUG_ARGS, const char* reason) { @@ -75,15 +74,16 @@ void grpc_call_combiner_start(grpc_exec_ctx* exec_ctx, gpr_log(GPR_DEBUG, " size: %" PRIdPTR " -> %" PRIdPTR, prev_size, prev_size + 1); } - GRPC_STATS_INC_CALL_COMBINER_LOCKS_SCHEDULED_ITEMS(exec_ctx); + GRPC_STATS_INC_CALL_COMBINER_LOCKS_SCHEDULED_ITEMS(); if (prev_size == 0) { - GRPC_STATS_INC_CALL_COMBINER_LOCKS_INITIATED(exec_ctx); + GRPC_STATS_INC_CALL_COMBINER_LOCKS_INITIATED(); + GPR_TIMER_MARK("call_combiner_initiate", 0); if (grpc_call_combiner_trace.enabled()) { gpr_log(GPR_DEBUG, " EXECUTING IMMEDIATELY"); } // Queue was empty, so execute this closure immediately. - GRPC_CLOSURE_SCHED(exec_ctx, closure, error); + GRPC_CLOSURE_SCHED(closure, error); } else { if (grpc_call_combiner_trace.enabled()) { gpr_log(GPR_INFO, " QUEUING"); @@ -95,8 +95,7 @@ void grpc_call_combiner_start(grpc_exec_ctx* exec_ctx, GPR_TIMER_END("call_combiner_start", 0); } -void grpc_call_combiner_stop(grpc_exec_ctx* exec_ctx, - grpc_call_combiner* call_combiner DEBUG_ARGS, +void grpc_call_combiner_stop(grpc_call_combiner* call_combiner DEBUG_ARGS, const char* reason) { GPR_TIMER_BEGIN("call_combiner_stop", 0); if (grpc_call_combiner_trace.enabled()) { @@ -131,7 +130,7 @@ void grpc_call_combiner_stop(grpc_exec_ctx* exec_ctx, gpr_log(GPR_DEBUG, " EXECUTING FROM QUEUE: closure=%p error=%s", closure, grpc_error_string(closure->error_data.error)); } - GRPC_CLOSURE_SCHED(exec_ctx, closure, closure->error_data.error); + GRPC_CLOSURE_SCHED(closure, closure->error_data.error); break; } } else if (grpc_call_combiner_trace.enabled()) { @@ -140,10 +139,9 @@ void grpc_call_combiner_stop(grpc_exec_ctx* exec_ctx, GPR_TIMER_END("call_combiner_stop", 0); } -void grpc_call_combiner_set_notify_on_cancel(grpc_exec_ctx* exec_ctx, - grpc_call_combiner* call_combiner, +void grpc_call_combiner_set_notify_on_cancel(grpc_call_combiner* call_combiner, grpc_closure* closure) { - GRPC_STATS_INC_CALL_COMBINER_SET_NOTIFY_ON_CANCEL(exec_ctx); + GRPC_STATS_INC_CALL_COMBINER_SET_NOTIFY_ON_CANCEL(); while (true) { // Decode original state. gpr_atm original_state = gpr_atm_acq_load(&call_combiner->cancel_state); @@ -157,7 +155,7 @@ void grpc_call_combiner_set_notify_on_cancel(grpc_exec_ctx* exec_ctx, "for pre-existing cancellation", call_combiner, closure); } - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_REF(original_error)); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_REF(original_error)); break; } else { if (gpr_atm_full_cas(&call_combiner->cancel_state, original_state, @@ -176,7 +174,7 @@ void grpc_call_combiner_set_notify_on_cancel(grpc_exec_ctx* exec_ctx, "call_combiner=%p: scheduling old cancel callback=%p", call_combiner, closure); } - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); } break; } @@ -185,10 +183,9 @@ void grpc_call_combiner_set_notify_on_cancel(grpc_exec_ctx* exec_ctx, } } -void grpc_call_combiner_cancel(grpc_exec_ctx* exec_ctx, - grpc_call_combiner* call_combiner, +void grpc_call_combiner_cancel(grpc_call_combiner* call_combiner, grpc_error* error) { - GRPC_STATS_INC_CALL_COMBINER_CANCELLED(exec_ctx); + GRPC_STATS_INC_CALL_COMBINER_CANCELLED(); while (true) { gpr_atm original_state = gpr_atm_acq_load(&call_combiner->cancel_state); grpc_error* original_error = decode_cancel_state_error(original_state); @@ -205,7 +202,7 @@ void grpc_call_combiner_cancel(grpc_exec_ctx* exec_ctx, "call_combiner=%p: scheduling notify_on_cancel callback=%p", call_combiner, notify_on_cancel); } - GRPC_CLOSURE_SCHED(exec_ctx, notify_on_cancel, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(notify_on_cancel, GRPC_ERROR_REF(error)); } break; } diff --git a/src/core/lib/iomgr/call_combiner.h b/src/core/lib/iomgr/call_combiner.h index c07af51c917..9f7e6ce1c94 100644 --- a/src/core/lib/iomgr/call_combiner.h +++ b/src/core/lib/iomgr/call_combiner.h @@ -53,37 +53,29 @@ void grpc_call_combiner_init(grpc_call_combiner* call_combiner); void grpc_call_combiner_destroy(grpc_call_combiner* call_combiner); #ifndef NDEBUG -#define GRPC_CALL_COMBINER_START(exec_ctx, call_combiner, closure, error, \ - reason) \ - grpc_call_combiner_start((exec_ctx), (call_combiner), (closure), (error), \ - __FILE__, __LINE__, (reason)) -#define GRPC_CALL_COMBINER_STOP(exec_ctx, call_combiner, reason) \ - grpc_call_combiner_stop((exec_ctx), (call_combiner), __FILE__, __LINE__, \ - (reason)) +#define GRPC_CALL_COMBINER_START(call_combiner, closure, error, reason) \ + grpc_call_combiner_start((call_combiner), (closure), (error), __FILE__, \ + __LINE__, (reason)) +#define GRPC_CALL_COMBINER_STOP(call_combiner, reason) \ + grpc_call_combiner_stop((call_combiner), __FILE__, __LINE__, (reason)) /// Starts processing \a closure on \a call_combiner. -void grpc_call_combiner_start(grpc_exec_ctx* exec_ctx, - grpc_call_combiner* call_combiner, +void grpc_call_combiner_start(grpc_call_combiner* call_combiner, grpc_closure* closure, grpc_error* error, const char* file, int line, const char* reason); /// Yields the call combiner to the next closure in the queue, if any. -void grpc_call_combiner_stop(grpc_exec_ctx* exec_ctx, - grpc_call_combiner* call_combiner, +void grpc_call_combiner_stop(grpc_call_combiner* call_combiner, const char* file, int line, const char* reason); #else -#define GRPC_CALL_COMBINER_START(exec_ctx, call_combiner, closure, error, \ - reason) \ - grpc_call_combiner_start((exec_ctx), (call_combiner), (closure), (error), \ - (reason)) -#define GRPC_CALL_COMBINER_STOP(exec_ctx, call_combiner, reason) \ - grpc_call_combiner_stop((exec_ctx), (call_combiner), (reason)) +#define GRPC_CALL_COMBINER_START(call_combiner, closure, error, reason) \ + grpc_call_combiner_start((call_combiner), (closure), (error), (reason)) +#define GRPC_CALL_COMBINER_STOP(call_combiner, reason) \ + grpc_call_combiner_stop((call_combiner), (reason)) /// Starts processing \a closure on \a call_combiner. -void grpc_call_combiner_start(grpc_exec_ctx* exec_ctx, - grpc_call_combiner* call_combiner, +void grpc_call_combiner_start(grpc_call_combiner* call_combiner, grpc_closure* closure, grpc_error* error, const char* reason); /// Yields the call combiner to the next closure in the queue, if any. -void grpc_call_combiner_stop(grpc_exec_ctx* exec_ctx, - grpc_call_combiner* call_combiner, +void grpc_call_combiner_stop(grpc_call_combiner* call_combiner, const char* reason); #endif @@ -109,13 +101,11 @@ void grpc_call_combiner_stop(grpc_exec_ctx* exec_ctx, /// cancellation; this effectively unregisters the previously set closure. /// However, most filters will not need to explicitly unregister their /// callbacks, as this is done automatically when the call is destroyed. -void grpc_call_combiner_set_notify_on_cancel(grpc_exec_ctx* exec_ctx, - grpc_call_combiner* call_combiner, +void grpc_call_combiner_set_notify_on_cancel(grpc_call_combiner* call_combiner, grpc_closure* closure); /// Indicates that the call has been cancelled. -void grpc_call_combiner_cancel(grpc_exec_ctx* exec_ctx, - grpc_call_combiner* call_combiner, +void grpc_call_combiner_cancel(grpc_call_combiner* call_combiner, grpc_error* error); #endif /* GRPC_CORE_LIB_IOMGR_CALL_COMBINER_H */ diff --git a/src/core/lib/iomgr/closure.h b/src/core/lib/iomgr/closure.h index 46793dd2c5d..88af76006aa 100644 --- a/src/core/lib/iomgr/closure.h +++ b/src/core/lib/iomgr/closure.h @@ -47,18 +47,15 @@ typedef struct grpc_closure_list { * describing what went wrong. * Error contract: it is not the cb's job to unref this error; * the closure scheduler will do that after the cb returns */ -typedef void (*grpc_iomgr_cb_func)(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error); +typedef void (*grpc_iomgr_cb_func)(void* arg, grpc_error* error); typedef struct grpc_closure_scheduler grpc_closure_scheduler; typedef struct grpc_closure_scheduler_vtable { /* NOTE: for all these functions, closure->scheduler == the scheduler that was used to find this vtable */ - void (*run)(grpc_exec_ctx* exec_ctx, grpc_closure* closure, - grpc_error* error); - void (*sched)(grpc_exec_ctx* exec_ctx, grpc_closure* closure, - grpc_error* error); + void (*run)(grpc_closure* closure, grpc_error* error); + void (*sched)(grpc_closure* closure, grpc_error* error); const char* name; } grpc_closure_scheduler_vtable; @@ -146,13 +143,12 @@ typedef struct { grpc_closure wrapper; } wrapped_closure; -inline void closure_wrapper(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +inline void closure_wrapper(void* arg, grpc_error* error) { wrapped_closure* wc = (wrapped_closure*)arg; grpc_iomgr_cb_func cb = wc->cb; void* cb_arg = wc->cb_arg; gpr_free(wc); - cb(exec_ctx, cb_arg, error); + cb(cb_arg, error); } } // namespace closure_impl @@ -247,12 +243,10 @@ inline bool grpc_closure_list_empty(grpc_closure_list closure_list) { } #ifndef NDEBUG -inline void grpc_closure_run(const char* file, int line, - grpc_exec_ctx* exec_ctx, grpc_closure* c, +inline void grpc_closure_run(const char* file, int line, grpc_closure* c, grpc_error* error) { #else -inline void grpc_closure_run(grpc_exec_ctx* exec_ctx, grpc_closure* c, - grpc_error* error) { +inline void grpc_closure_run(grpc_closure* c, grpc_error* error) { #endif GPR_TIMER_BEGIN("grpc_closure_run", 0); if (c != nullptr) { @@ -262,7 +256,7 @@ inline void grpc_closure_run(grpc_exec_ctx* exec_ctx, grpc_closure* c, c->run = true; #endif assert(c->cb); - c->scheduler->vtable->run(exec_ctx, c, error); + c->scheduler->vtable->run(c, error); } else { GRPC_ERROR_UNREF(error); } @@ -273,20 +267,17 @@ inline void grpc_closure_run(grpc_exec_ctx* exec_ctx, grpc_closure* c, * Note that calling this at the end of a closure callback function itself is * by definition safe. */ #ifndef NDEBUG -#define GRPC_CLOSURE_RUN(exec_ctx, closure, error) \ - grpc_closure_run(__FILE__, __LINE__, exec_ctx, closure, error) +#define GRPC_CLOSURE_RUN(closure, error) \ + grpc_closure_run(__FILE__, __LINE__, closure, error) #else -#define GRPC_CLOSURE_RUN(exec_ctx, closure, error) \ - grpc_closure_run(exec_ctx, closure, error) +#define GRPC_CLOSURE_RUN(closure, error) grpc_closure_run(closure, error) #endif #ifndef NDEBUG -inline void grpc_closure_sched(const char* file, int line, - grpc_exec_ctx* exec_ctx, grpc_closure* c, +inline void grpc_closure_sched(const char* file, int line, grpc_closure* c, grpc_error* error) { #else -inline void grpc_closure_sched(grpc_exec_ctx* exec_ctx, grpc_closure* c, - grpc_error* error) { +inline void grpc_closure_sched(grpc_closure* c, grpc_error* error) { #endif GPR_TIMER_BEGIN("grpc_closure_sched", 0); if (c != nullptr) { @@ -305,7 +296,7 @@ inline void grpc_closure_sched(grpc_exec_ctx* exec_ctx, grpc_closure* c, c->run = false; #endif assert(c->cb); - c->scheduler->vtable->sched(exec_ctx, c, error); + c->scheduler->vtable->sched(c, error); } else { GRPC_ERROR_UNREF(error); } @@ -314,20 +305,17 @@ inline void grpc_closure_sched(grpc_exec_ctx* exec_ctx, grpc_closure* c, /** Schedule a closure to be run. Does not need to be run from a safe point. */ #ifndef NDEBUG -#define GRPC_CLOSURE_SCHED(exec_ctx, closure, error) \ - grpc_closure_sched(__FILE__, __LINE__, exec_ctx, closure, error) +#define GRPC_CLOSURE_SCHED(closure, error) \ + grpc_closure_sched(__FILE__, __LINE__, closure, error) #else -#define GRPC_CLOSURE_SCHED(exec_ctx, closure, error) \ - grpc_closure_sched(exec_ctx, closure, error) +#define GRPC_CLOSURE_SCHED(closure, error) grpc_closure_sched(closure, error) #endif #ifndef NDEBUG inline void grpc_closure_list_sched(const char* file, int line, - grpc_exec_ctx* exec_ctx, grpc_closure_list* list) { #else -inline void grpc_closure_list_sched(grpc_exec_ctx* exec_ctx, - grpc_closure_list* list) { +inline void grpc_closure_list_sched(grpc_closure_list* list) { #endif grpc_closure* c = list->head; while (c != nullptr) { @@ -347,7 +335,7 @@ inline void grpc_closure_list_sched(grpc_exec_ctx* exec_ctx, c->run = false; #endif assert(c->cb); - c->scheduler->vtable->sched(exec_ctx, c, c->error_data.error); + c->scheduler->vtable->sched(c, c->error_data.error); c = next; } list->head = list->tail = nullptr; @@ -356,11 +344,11 @@ inline void grpc_closure_list_sched(grpc_exec_ctx* exec_ctx, /** Schedule all closures in a list to be run. Does not need to be run from a * safe point. */ #ifndef NDEBUG -#define GRPC_CLOSURE_LIST_SCHED(exec_ctx, closure_list) \ - grpc_closure_list_sched(__FILE__, __LINE__, exec_ctx, closure_list) +#define GRPC_CLOSURE_LIST_SCHED(closure_list) \ + grpc_closure_list_sched(__FILE__, __LINE__, closure_list) #else -#define GRPC_CLOSURE_LIST_SCHED(exec_ctx, closure_list) \ - grpc_closure_list_sched(exec_ctx, closure_list) +#define GRPC_CLOSURE_LIST_SCHED(closure_list) \ + grpc_closure_list_sched(closure_list) #endif #endif /* GRPC_CORE_LIB_IOMGR_CLOSURE_H */ diff --git a/src/core/lib/iomgr/combiner.cc b/src/core/lib/iomgr/combiner.cc index 15c009dd779..e4d7a6abd81 100644 --- a/src/core/lib/iomgr/combiner.cc +++ b/src/core/lib/iomgr/combiner.cc @@ -61,17 +61,15 @@ struct grpc_combiner { gpr_refcount refs; }; -static void combiner_exec(grpc_exec_ctx* exec_ctx, grpc_closure* closure, - grpc_error* error); -static void combiner_finally_exec(grpc_exec_ctx* exec_ctx, - grpc_closure* closure, grpc_error* error); +static void combiner_exec(grpc_closure* closure, grpc_error* error); +static void combiner_finally_exec(grpc_closure* closure, grpc_error* error); static const grpc_closure_scheduler_vtable scheduler = { combiner_exec, combiner_exec, "combiner:immediately"}; static const grpc_closure_scheduler_vtable finally_scheduler = { combiner_finally_exec, combiner_finally_exec, "combiner:finally"}; -static void offload(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error); +static void offload(void* arg, grpc_error* error); grpc_combiner* grpc_combiner_create(void) { grpc_combiner* lock = (grpc_combiner*)gpr_zalloc(sizeof(*lock)); @@ -87,19 +85,19 @@ grpc_combiner* grpc_combiner_create(void) { return lock; } -static void really_destroy(grpc_exec_ctx* exec_ctx, grpc_combiner* lock) { +static void really_destroy(grpc_combiner* lock) { GRPC_COMBINER_TRACE(gpr_log(GPR_DEBUG, "C:%p really_destroy", lock)); GPR_ASSERT(gpr_atm_no_barrier_load(&lock->state) == 0); gpr_mpscq_destroy(&lock->queue); gpr_free(lock); } -static void start_destroy(grpc_exec_ctx* exec_ctx, grpc_combiner* lock) { +static void start_destroy(grpc_combiner* lock) { gpr_atm old_state = gpr_atm_full_fetch_add(&lock->state, -STATE_UNORPHANED); GRPC_COMBINER_TRACE(gpr_log( GPR_DEBUG, "C:%p really_destroy old_state=%" PRIdPTR, lock, old_state)); if (old_state == 1) { - really_destroy(exec_ctx, lock); + really_destroy(lock); } } @@ -115,11 +113,10 @@ static void start_destroy(grpc_exec_ctx* exec_ctx, grpc_combiner* lock) { #define GRPC_COMBINER_DEBUG_SPAM(op, delta) #endif -void grpc_combiner_unref(grpc_exec_ctx* exec_ctx, - grpc_combiner* lock GRPC_COMBINER_DEBUG_ARGS) { +void grpc_combiner_unref(grpc_combiner* lock GRPC_COMBINER_DEBUG_ARGS) { GRPC_COMBINER_DEBUG_SPAM("UNREF", -1); if (gpr_unref(&lock->refs)) { - start_destroy(exec_ctx, lock); + start_destroy(lock); } } @@ -129,23 +126,25 @@ grpc_combiner* grpc_combiner_ref(grpc_combiner* lock GRPC_COMBINER_DEBUG_ARGS) { return lock; } -static void push_last_on_exec_ctx(grpc_exec_ctx* exec_ctx, - grpc_combiner* lock) { +static void push_last_on_exec_ctx(grpc_combiner* lock) { lock->next_combiner_on_this_exec_ctx = nullptr; - if (exec_ctx->active_combiner == nullptr) { - exec_ctx->active_combiner = exec_ctx->last_combiner = lock; + if (grpc_core::ExecCtx::Get()->combiner_data()->active_combiner == nullptr) { + grpc_core::ExecCtx::Get()->combiner_data()->active_combiner = + grpc_core::ExecCtx::Get()->combiner_data()->last_combiner = lock; } else { - exec_ctx->last_combiner->next_combiner_on_this_exec_ctx = lock; - exec_ctx->last_combiner = lock; + grpc_core::ExecCtx::Get() + ->combiner_data() + ->last_combiner->next_combiner_on_this_exec_ctx = lock; + grpc_core::ExecCtx::Get()->combiner_data()->last_combiner = lock; } } -static void push_first_on_exec_ctx(grpc_exec_ctx* exec_ctx, - grpc_combiner* lock) { - lock->next_combiner_on_this_exec_ctx = exec_ctx->active_combiner; - exec_ctx->active_combiner = lock; +static void push_first_on_exec_ctx(grpc_combiner* lock) { + lock->next_combiner_on_this_exec_ctx = + grpc_core::ExecCtx::Get()->combiner_data()->active_combiner; + grpc_core::ExecCtx::Get()->combiner_data()->active_combiner = lock; if (lock->next_combiner_on_this_exec_ctx == nullptr) { - exec_ctx->last_combiner = lock; + grpc_core::ExecCtx::Get()->combiner_data()->last_combiner = lock; } } @@ -153,9 +152,8 @@ static void push_first_on_exec_ctx(grpc_exec_ctx* exec_ctx, ((grpc_combiner*)(((char*)((closure)->scheduler)) - \ offsetof(grpc_combiner, scheduler_name))) -static void combiner_exec(grpc_exec_ctx* exec_ctx, grpc_closure* cl, - grpc_error* error) { - GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_ITEMS(exec_ctx); +static void combiner_exec(grpc_closure* cl, grpc_error* error) { + GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_ITEMS(); GPR_TIMER_BEGIN("combiner.execute", 0); grpc_combiner* lock = COMBINER_FROM_CLOSURE_SCHEDULER(cl, scheduler); gpr_atm last = gpr_atm_full_fetch_add(&lock->state, STATE_ELEM_COUNT_LOW_BIT); @@ -163,19 +161,19 @@ static void combiner_exec(grpc_exec_ctx* exec_ctx, grpc_closure* cl, "C:%p grpc_combiner_execute c=%p last=%" PRIdPTR, lock, cl, last)); if (last == 1) { - GRPC_STATS_INC_COMBINER_LOCKS_INITIATED(exec_ctx); + GRPC_STATS_INC_COMBINER_LOCKS_INITIATED(); GPR_TIMER_MARK("combiner.initiated", 0); gpr_atm_no_barrier_store(&lock->initiating_exec_ctx_or_null, - (gpr_atm)exec_ctx); + (gpr_atm)grpc_core::ExecCtx::Get()); // first element on this list: add it to the list of combiner locks // executing within this exec_ctx - push_last_on_exec_ctx(exec_ctx, lock); + push_last_on_exec_ctx(lock); } else { // there may be a race with setting here: if that happens, we may delay // offload for one or two actions, and that's fine gpr_atm initiator = gpr_atm_no_barrier_load(&lock->initiating_exec_ctx_or_null); - if (initiator != 0 && initiator != (gpr_atm)exec_ctx) { + if (initiator != 0 && initiator != (gpr_atm)grpc_core::ExecCtx::Get()) { gpr_atm_no_barrier_store(&lock->initiating_exec_ctx_or_null, 0); } } @@ -186,29 +184,32 @@ static void combiner_exec(grpc_exec_ctx* exec_ctx, grpc_closure* cl, GPR_TIMER_END("combiner.execute", 0); } -static void move_next(grpc_exec_ctx* exec_ctx) { - exec_ctx->active_combiner = - exec_ctx->active_combiner->next_combiner_on_this_exec_ctx; - if (exec_ctx->active_combiner == nullptr) { - exec_ctx->last_combiner = nullptr; +static void move_next() { + grpc_core::ExecCtx::Get()->combiner_data()->active_combiner = + grpc_core::ExecCtx::Get() + ->combiner_data() + ->active_combiner->next_combiner_on_this_exec_ctx; + if (grpc_core::ExecCtx::Get()->combiner_data()->active_combiner == nullptr) { + grpc_core::ExecCtx::Get()->combiner_data()->last_combiner = nullptr; } } -static void offload(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void offload(void* arg, grpc_error* error) { grpc_combiner* lock = (grpc_combiner*)arg; - push_last_on_exec_ctx(exec_ctx, lock); + push_last_on_exec_ctx(lock); } -static void queue_offload(grpc_exec_ctx* exec_ctx, grpc_combiner* lock) { - GRPC_STATS_INC_COMBINER_LOCKS_OFFLOADED(exec_ctx); - move_next(exec_ctx); +static void queue_offload(grpc_combiner* lock) { + GRPC_STATS_INC_COMBINER_LOCKS_OFFLOADED(); + move_next(); GRPC_COMBINER_TRACE(gpr_log(GPR_DEBUG, "C:%p queue_offload", lock)); - GRPC_CLOSURE_SCHED(exec_ctx, &lock->offload, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&lock->offload, GRPC_ERROR_NONE); } -bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx* exec_ctx) { +bool grpc_combiner_continue_exec_ctx() { GPR_TIMER_BEGIN("combiner.continue_exec_ctx", 0); - grpc_combiner* lock = exec_ctx->active_combiner; + grpc_combiner* lock = + grpc_core::ExecCtx::Get()->combiner_data()->active_combiner; if (lock == nullptr) { GPR_TIMER_END("combiner.continue_exec_ctx", 0); return false; @@ -223,15 +224,15 @@ bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx* exec_ctx) { "exec_ctx_ready_to_finish=%d " "time_to_execute_final_list=%d", lock, contended, - grpc_exec_ctx_ready_to_finish(exec_ctx), + grpc_core::ExecCtx::Get()->IsReadyToFinish(), lock->time_to_execute_final_list)); - if (contended && grpc_exec_ctx_ready_to_finish(exec_ctx) && + if (contended && grpc_core::ExecCtx::Get()->IsReadyToFinish() && grpc_executor_is_threaded()) { GPR_TIMER_MARK("offload_from_finished_exec_ctx", 0); // this execution context wants to move on: schedule remaining work to be // picked up on the executor - queue_offload(exec_ctx, lock); + queue_offload(lock); GPR_TIMER_END("combiner.continue_exec_ctx", 0); return true; } @@ -247,7 +248,7 @@ bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx* exec_ctx) { // queue is in an inconsistent state: use this as a cue that we should // go off and do something else for a while (and come back later) GPR_TIMER_MARK("delay_busy", 0); - queue_offload(exec_ctx, lock); + queue_offload(lock); GPR_TIMER_END("combiner.continue_exec_ctx", 0); return true; } @@ -257,7 +258,7 @@ bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx* exec_ctx) { #ifndef NDEBUG cl->scheduled = false; #endif - cl->cb(exec_ctx, cl->cb_arg, cl_err); + cl->cb(cl->cb_arg, cl_err); GRPC_ERROR_UNREF(cl_err); GPR_TIMER_END("combiner.exec1", 0); } else { @@ -274,7 +275,7 @@ bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx* exec_ctx) { #ifndef NDEBUG c->scheduled = false; #endif - c->cb(exec_ctx, c->cb_arg, error); + c->cb(c->cb_arg, error); GRPC_ERROR_UNREF(error); c = next; GPR_TIMER_END("combiner.exec_1final", 0); @@ -282,7 +283,7 @@ bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx* exec_ctx) { } GPR_TIMER_MARK("unref", 0); - move_next(exec_ctx); + move_next(); lock->time_to_execute_final_list = false; gpr_atm old_state = gpr_atm_full_fetch_add(&lock->state, -STATE_ELEM_COUNT_LOW_BIT); @@ -311,7 +312,7 @@ bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx* exec_ctx) { return true; case OLD_STATE_WAS(true, 1): // and one count, one orphaned --> unlocked and orphaned - really_destroy(exec_ctx, lock); + really_destroy(lock); GPR_TIMER_END("combiner.continue_exec_ctx", 0); return true; case OLD_STATE_WAS(false, 0): @@ -321,27 +322,24 @@ bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx* exec_ctx) { GPR_TIMER_END("combiner.continue_exec_ctx", 0); GPR_UNREACHABLE_CODE(return true); } - push_first_on_exec_ctx(exec_ctx, lock); + push_first_on_exec_ctx(lock); GPR_TIMER_END("combiner.continue_exec_ctx", 0); return true; } -static void enqueue_finally(grpc_exec_ctx* exec_ctx, void* closure, - grpc_error* error); +static void enqueue_finally(void* closure, grpc_error* error); -static void combiner_finally_exec(grpc_exec_ctx* exec_ctx, - grpc_closure* closure, grpc_error* error) { - GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS(exec_ctx); +static void combiner_finally_exec(grpc_closure* closure, grpc_error* error) { + GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS(); grpc_combiner* lock = COMBINER_FROM_CLOSURE_SCHEDULER(closure, finally_scheduler); - GRPC_COMBINER_TRACE(gpr_log(GPR_DEBUG, - "C:%p grpc_combiner_execute_finally c=%p; ac=%p", - lock, closure, exec_ctx->active_combiner)); + GRPC_COMBINER_TRACE(gpr_log( + GPR_DEBUG, "C:%p grpc_combiner_execute_finally c=%p; ac=%p", lock, + closure, grpc_core::ExecCtx::Get()->combiner_data()->active_combiner)); GPR_TIMER_BEGIN("combiner.execute_finally", 0); - if (exec_ctx->active_combiner != lock) { + if (grpc_core::ExecCtx::Get()->combiner_data()->active_combiner != lock) { GPR_TIMER_MARK("slowpath", 0); - GRPC_CLOSURE_SCHED(exec_ctx, - GRPC_CLOSURE_CREATE(enqueue_finally, closure, + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(enqueue_finally, closure, grpc_combiner_scheduler(lock)), error); GPR_TIMER_END("combiner.execute_finally", 0); @@ -355,10 +353,8 @@ static void combiner_finally_exec(grpc_exec_ctx* exec_ctx, GPR_TIMER_END("combiner.execute_finally", 0); } -static void enqueue_finally(grpc_exec_ctx* exec_ctx, void* closure, - grpc_error* error) { - combiner_finally_exec(exec_ctx, (grpc_closure*)closure, - GRPC_ERROR_REF(error)); +static void enqueue_finally(void* closure, grpc_error* error) { + combiner_finally_exec((grpc_closure*)closure, GRPC_ERROR_REF(error)); } grpc_closure_scheduler* grpc_combiner_scheduler(grpc_combiner* combiner) { diff --git a/src/core/lib/iomgr/combiner.h b/src/core/lib/iomgr/combiner.h index 0c055113317..46b9ac58be4 100644 --- a/src/core/lib/iomgr/combiner.h +++ b/src/core/lib/iomgr/combiner.h @@ -40,26 +40,24 @@ grpc_combiner* grpc_combiner_create(void); , const char *file, int line, const char *reason #define GRPC_COMBINER_REF(combiner, reason) \ grpc_combiner_ref((combiner), __FILE__, __LINE__, (reason)) -#define GRPC_COMBINER_UNREF(exec_ctx, combiner, reason) \ - grpc_combiner_unref((exec_ctx), (combiner), __FILE__, __LINE__, (reason)) +#define GRPC_COMBINER_UNREF(combiner, reason) \ + grpc_combiner_unref((combiner), __FILE__, __LINE__, (reason)) #else #define GRPC_COMBINER_DEBUG_ARGS #define GRPC_COMBINER_REF(combiner, reason) grpc_combiner_ref((combiner)) -#define GRPC_COMBINER_UNREF(exec_ctx, combiner, reason) \ - grpc_combiner_unref((exec_ctx), (combiner)) +#define GRPC_COMBINER_UNREF(combiner, reason) grpc_combiner_unref((combiner)) #endif // Ref/unref the lock, for when we're sharing the lock ownership // Prefer to use the macros above grpc_combiner* grpc_combiner_ref(grpc_combiner* lock GRPC_COMBINER_DEBUG_ARGS); -void grpc_combiner_unref(grpc_exec_ctx* exec_ctx, - grpc_combiner* lock GRPC_COMBINER_DEBUG_ARGS); +void grpc_combiner_unref(grpc_combiner* lock GRPC_COMBINER_DEBUG_ARGS); // Fetch a scheduler to schedule closures against grpc_closure_scheduler* grpc_combiner_scheduler(grpc_combiner* lock); // Scheduler to execute \a action within the lock just prior to unlocking. grpc_closure_scheduler* grpc_combiner_finally_scheduler(grpc_combiner* lock); -bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx* exec_ctx); +bool grpc_combiner_continue_exec_ctx(); extern grpc_core::TraceFlag grpc_combiner_trace; diff --git a/src/core/lib/iomgr/endpoint.cc b/src/core/lib/iomgr/endpoint.cc index 5eab1d31588..9d4b1028227 100644 --- a/src/core/lib/iomgr/endpoint.cc +++ b/src/core/lib/iomgr/endpoint.cc @@ -18,41 +18,35 @@ #include "src/core/lib/iomgr/endpoint.h" -void grpc_endpoint_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* slices, grpc_closure* cb) { - ep->vtable->read(exec_ctx, ep, slices, cb); +void grpc_endpoint_read(grpc_endpoint* ep, grpc_slice_buffer* slices, + grpc_closure* cb) { + ep->vtable->read(ep, slices, cb); } -void grpc_endpoint_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* slices, grpc_closure* cb) { - ep->vtable->write(exec_ctx, ep, slices, cb); +void grpc_endpoint_write(grpc_endpoint* ep, grpc_slice_buffer* slices, + grpc_closure* cb) { + ep->vtable->write(ep, slices, cb); } -void grpc_endpoint_add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_pollset* pollset) { - ep->vtable->add_to_pollset(exec_ctx, ep, pollset); +void grpc_endpoint_add_to_pollset(grpc_endpoint* ep, grpc_pollset* pollset) { + ep->vtable->add_to_pollset(ep, pollset); } -void grpc_endpoint_add_to_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_endpoint* ep, +void grpc_endpoint_add_to_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset_set) { - ep->vtable->add_to_pollset_set(exec_ctx, ep, pollset_set); + ep->vtable->add_to_pollset_set(ep, pollset_set); } -void grpc_endpoint_delete_from_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_endpoint* ep, +void grpc_endpoint_delete_from_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset_set) { - ep->vtable->delete_from_pollset_set(exec_ctx, ep, pollset_set); + ep->vtable->delete_from_pollset_set(ep, pollset_set); } -void grpc_endpoint_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_error* why) { - ep->vtable->shutdown(exec_ctx, ep, why); +void grpc_endpoint_shutdown(grpc_endpoint* ep, grpc_error* why) { + ep->vtable->shutdown(ep, why); } -void grpc_endpoint_destroy(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep) { - ep->vtable->destroy(exec_ctx, ep); -} +void grpc_endpoint_destroy(grpc_endpoint* ep) { ep->vtable->destroy(ep); } char* grpc_endpoint_get_peer(grpc_endpoint* ep) { return ep->vtable->get_peer(ep); diff --git a/src/core/lib/iomgr/endpoint.h b/src/core/lib/iomgr/endpoint.h index 6ab0a6591cc..cd530993342 100644 --- a/src/core/lib/iomgr/endpoint.h +++ b/src/core/lib/iomgr/endpoint.h @@ -33,18 +33,13 @@ typedef struct grpc_endpoint grpc_endpoint; typedef struct grpc_endpoint_vtable grpc_endpoint_vtable; struct grpc_endpoint_vtable { - void (*read)(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* slices, grpc_closure* cb); - void (*write)(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* slices, grpc_closure* cb); - void (*add_to_pollset)(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_pollset* pollset); - void (*add_to_pollset_set)(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_pollset_set* pollset); - void (*delete_from_pollset_set)(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_pollset_set* pollset); - void (*shutdown)(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, grpc_error* why); - void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep); + void (*read)(grpc_endpoint* ep, grpc_slice_buffer* slices, grpc_closure* cb); + void (*write)(grpc_endpoint* ep, grpc_slice_buffer* slices, grpc_closure* cb); + void (*add_to_pollset)(grpc_endpoint* ep, grpc_pollset* pollset); + void (*add_to_pollset_set)(grpc_endpoint* ep, grpc_pollset_set* pollset); + void (*delete_from_pollset_set)(grpc_endpoint* ep, grpc_pollset_set* pollset); + void (*shutdown)(grpc_endpoint* ep, grpc_error* why); + void (*destroy)(grpc_endpoint* ep); grpc_resource_user* (*get_resource_user)(grpc_endpoint* ep); char* (*get_peer)(grpc_endpoint* ep); int (*get_fd)(grpc_endpoint* ep); @@ -55,8 +50,8 @@ struct grpc_endpoint_vtable { indicates the endpoint is closed. Valid slices may be placed into \a slices even when the callback is invoked with error != GRPC_ERROR_NONE. */ -void grpc_endpoint_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* slices, grpc_closure* cb); +void grpc_endpoint_read(grpc_endpoint* ep, grpc_slice_buffer* slices, + grpc_closure* cb); char* grpc_endpoint_get_peer(grpc_endpoint* ep); @@ -74,26 +69,22 @@ int grpc_endpoint_get_fd(grpc_endpoint* ep); No guarantee is made to the content of slices after a write EXCEPT that it is a valid slice buffer. */ -void grpc_endpoint_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* slices, grpc_closure* cb); +void grpc_endpoint_write(grpc_endpoint* ep, grpc_slice_buffer* slices, + grpc_closure* cb); /* Causes any pending and future read/write callbacks to run immediately with success==0 */ -void grpc_endpoint_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_error* why); -void grpc_endpoint_destroy(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep); +void grpc_endpoint_shutdown(grpc_endpoint* ep, grpc_error* why); +void grpc_endpoint_destroy(grpc_endpoint* ep); /* Add an endpoint to a pollset or pollset_set, so that when the pollset is polled, events from this endpoint are considered */ -void grpc_endpoint_add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_pollset* pollset); -void grpc_endpoint_add_to_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_endpoint* ep, +void grpc_endpoint_add_to_pollset(grpc_endpoint* ep, grpc_pollset* pollset); +void grpc_endpoint_add_to_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset_set); /* Delete an endpoint from a pollset_set */ -void grpc_endpoint_delete_from_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_endpoint* ep, +void grpc_endpoint_delete_from_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset_set); grpc_resource_user* grpc_endpoint_get_resource_user(grpc_endpoint* endpoint); diff --git a/src/core/lib/iomgr/endpoint_pair_posix.cc b/src/core/lib/iomgr/endpoint_pair_posix.cc index f5f59f99173..0b4aefd1b70 100644 --- a/src/core/lib/iomgr/endpoint_pair_posix.cc +++ b/src/core/lib/iomgr/endpoint_pair_posix.cc @@ -54,18 +54,17 @@ grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char* name, char* final_name; create_sockets(sv); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_asprintf(&final_name, "%s:client", name); - p.client = grpc_tcp_create(&exec_ctx, grpc_fd_create(sv[1], final_name), args, + p.client = grpc_tcp_create(grpc_fd_create(sv[1], final_name), args, "socketpair-server"); gpr_free(final_name); gpr_asprintf(&final_name, "%s:server", name); - p.server = grpc_tcp_create(&exec_ctx, grpc_fd_create(sv[0], final_name), args, + p.server = grpc_tcp_create(grpc_fd_create(sv[0], final_name), args, "socketpair-client"); gpr_free(final_name); - grpc_exec_ctx_finish(&exec_ctx); return p; } diff --git a/src/core/lib/iomgr/endpoint_pair_windows.cc b/src/core/lib/iomgr/endpoint_pair_windows.cc index afa995a1c72..cc07ac07081 100644 --- a/src/core/lib/iomgr/endpoint_pair_windows.cc +++ b/src/core/lib/iomgr/endpoint_pair_windows.cc @@ -72,14 +72,12 @@ grpc_endpoint_pair grpc_iomgr_create_endpoint_pair( SOCKET sv[2]; grpc_endpoint_pair p; create_sockets(sv); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - p.client = grpc_tcp_create(&exec_ctx, - grpc_winsocket_create(sv[1], "endpoint:client"), + grpc_core::ExecCtx exec_ctx; + p.client = grpc_tcp_create(grpc_winsocket_create(sv[1], "endpoint:client"), channel_args, "endpoint:server"); - p.server = grpc_tcp_create(&exec_ctx, - grpc_winsocket_create(sv[0], "endpoint:server"), + p.server = grpc_tcp_create(grpc_winsocket_create(sv[0], "endpoint:server"), channel_args, "endpoint:client"); - grpc_exec_ctx_finish(&exec_ctx); + return p; } diff --git a/src/core/lib/iomgr/error.cc b/src/core/lib/iomgr/error.cc index e6d640c106b..42cd7c455df 100644 --- a/src/core/lib/iomgr/error.cc +++ b/src/core/lib/iomgr/error.cc @@ -156,11 +156,7 @@ static void unref_errs(grpc_error* err) { } } -static void unref_slice(grpc_slice slice) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_unref_internal(&exec_ctx, slice); - grpc_exec_ctx_finish(&exec_ctx); -} +static void unref_slice(grpc_slice slice) { grpc_slice_unref_internal(slice); } static void unref_strs(grpc_error* err) { for (size_t which = 0; which < GRPC_ERROR_STR_MAX; ++which) { diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc index 0dda1d924c3..d9e8a30f5e3 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -299,31 +299,29 @@ static int fd_wrapped_fd(grpc_fd* fd) { return fd->fd; } /* if 'releasing_fd' is true, it means that we are going to detach the internal * fd from grpc_fd structure (i.e which means we should not be calling * shutdown() syscall on that fd) */ -static void fd_shutdown_internal(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_error* why, bool releasing_fd) { - if (fd->read_closure->SetShutdown(exec_ctx, GRPC_ERROR_REF(why))) { +static void fd_shutdown_internal(grpc_fd* fd, grpc_error* why, + bool releasing_fd) { + if (fd->read_closure->SetShutdown(GRPC_ERROR_REF(why))) { if (!releasing_fd) { shutdown(fd->fd, SHUT_RDWR); } - fd->write_closure->SetShutdown(exec_ctx, GRPC_ERROR_REF(why)); + fd->write_closure->SetShutdown(GRPC_ERROR_REF(why)); } GRPC_ERROR_UNREF(why); } /* Might be called multiple times */ -static void fd_shutdown(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_error* why) { - fd_shutdown_internal(exec_ctx, fd, why, false); +static void fd_shutdown(grpc_fd* fd, grpc_error* why) { + fd_shutdown_internal(fd, why, false); } -static void fd_orphan(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_closure* on_done, int* release_fd, +static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, bool already_closed, const char* reason) { grpc_error* error = GRPC_ERROR_NONE; bool is_release_fd = (release_fd != nullptr); if (!fd->read_closure->IsShutdown()) { - fd_shutdown_internal(exec_ctx, fd, - GRPC_ERROR_CREATE_FROM_COPIED_STRING(reason), + fd_shutdown_internal(fd, GRPC_ERROR_CREATE_FROM_COPIED_STRING(reason), is_release_fd); } @@ -335,7 +333,7 @@ static void fd_orphan(grpc_exec_ctx* exec_ctx, grpc_fd* fd, close(fd->fd); } - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_REF(error)); grpc_iomgr_unregister_object(&fd->iomgr_object); fd->read_closure->DestroyEvent(); @@ -347,8 +345,7 @@ static void fd_orphan(grpc_exec_ctx* exec_ctx, grpc_fd* fd, gpr_mu_unlock(&fd_freelist_mu); } -static grpc_pollset* fd_get_read_notifier_pollset(grpc_exec_ctx* exec_ctx, - grpc_fd* fd) { +static grpc_pollset* fd_get_read_notifier_pollset(grpc_fd* fd) { gpr_atm notifier = gpr_atm_acq_load(&fd->read_notifier_pollset); return (grpc_pollset*)notifier; } @@ -357,26 +354,21 @@ static bool fd_is_shutdown(grpc_fd* fd) { return fd->read_closure->IsShutdown(); } -static void fd_notify_on_read(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_closure* closure) { - fd->read_closure->NotifyOn(exec_ctx, closure); +static void fd_notify_on_read(grpc_fd* fd, grpc_closure* closure) { + fd->read_closure->NotifyOn(closure); } -static void fd_notify_on_write(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_closure* closure) { - fd->write_closure->NotifyOn(exec_ctx, closure); +static void fd_notify_on_write(grpc_fd* fd, grpc_closure* closure) { + fd->write_closure->NotifyOn(closure); } -static void fd_become_readable(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_pollset* notifier) { - fd->read_closure->SetReady(exec_ctx); +static void fd_become_readable(grpc_fd* fd, grpc_pollset* notifier) { + fd->read_closure->SetReady(); /* Use release store to match with acquire load in fd_get_read_notifier */ gpr_atm_rel_store(&fd->read_notifier_pollset, (gpr_atm)notifier); } -static void fd_become_writable(grpc_exec_ctx* exec_ctx, grpc_fd* fd) { - fd->write_closure->SetReady(exec_ctx); -} +static void fd_become_writable(grpc_fd* fd) { fd->write_closure->SetReady(); } /******************************************************************************* * Pollset Definitions @@ -479,7 +471,7 @@ static void pollset_init(grpc_pollset* pollset, gpr_mu** mu) { pollset->next = pollset->prev = nullptr; } -static void pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset) { +static void pollset_destroy(grpc_pollset* pollset) { gpr_mu_lock(&pollset->mu); if (!pollset->seen_inactive) { pollset_neighborhood* neighborhood = pollset->neighborhood; @@ -507,27 +499,26 @@ static void pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset) { gpr_mu_destroy(&pollset->mu); } -static grpc_error* pollset_kick_all(grpc_exec_ctx* exec_ctx, - grpc_pollset* pollset) { +static grpc_error* pollset_kick_all(grpc_pollset* pollset) { GPR_TIMER_BEGIN("pollset_kick_all", 0); grpc_error* error = GRPC_ERROR_NONE; if (pollset->root_worker != nullptr) { grpc_pollset_worker* worker = pollset->root_worker; do { - GRPC_STATS_INC_POLLSET_KICK(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK(); switch (worker->state) { case KICKED: - GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx); + GRPC_STATS_INC_POLLSET_KICKED_AGAIN(); break; case UNKICKED: SET_KICK_STATE(worker, KICKED); if (worker->initialized_cv) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); gpr_cv_signal(&worker->cv); } break; case DESIGNATED_POLLER: - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(); SET_KICK_STATE(worker, KICKED); append_error(&error, grpc_wakeup_fd_wakeup(&global_wakeup_fd), "pollset_kick_all"); @@ -543,32 +534,29 @@ static grpc_error* pollset_kick_all(grpc_exec_ctx* exec_ctx, return error; } -static void pollset_maybe_finish_shutdown(grpc_exec_ctx* exec_ctx, - grpc_pollset* pollset) { +static void pollset_maybe_finish_shutdown(grpc_pollset* pollset) { if (pollset->shutdown_closure != nullptr && pollset->root_worker == nullptr && pollset->begin_refs == 0) { GPR_TIMER_MARK("pollset_finish_shutdown", 0); - GRPC_CLOSURE_SCHED(exec_ctx, pollset->shutdown_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(pollset->shutdown_closure, GRPC_ERROR_NONE); pollset->shutdown_closure = nullptr; } } -static void pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - grpc_closure* closure) { +static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { GPR_TIMER_BEGIN("pollset_shutdown", 0); GPR_ASSERT(pollset->shutdown_closure == nullptr); GPR_ASSERT(!pollset->shutting_down); pollset->shutdown_closure = closure; pollset->shutting_down = true; - GRPC_LOG_IF_ERROR("pollset_shutdown", pollset_kick_all(exec_ctx, pollset)); - pollset_maybe_finish_shutdown(exec_ctx, pollset); + GRPC_LOG_IF_ERROR("pollset_shutdown", pollset_kick_all(pollset)); + pollset_maybe_finish_shutdown(pollset); GPR_TIMER_END("pollset_shutdown", 0); } -static int poll_deadline_to_millis_timeout(grpc_exec_ctx* exec_ctx, - grpc_millis millis) { +static int poll_deadline_to_millis_timeout(grpc_millis millis) { if (millis == GRPC_MILLIS_INF_FUTURE) return -1; - grpc_millis delta = millis - grpc_exec_ctx_now(exec_ctx); + grpc_millis delta = millis - grpc_core::ExecCtx::Get()->Now(); if (delta > INT_MAX) { return INT_MAX; } else if (delta < 0) { @@ -586,8 +574,7 @@ static int poll_deadline_to_millis_timeout(grpc_exec_ctx* exec_ctx, NOTE ON SYNCRHONIZATION: Similar to do_epoll_wait(), this function is only called by g_active_poller thread. So there is no need for synchronization when accessing fields in g_epoll_set */ -static grpc_error* process_epoll_events(grpc_exec_ctx* exec_ctx, - grpc_pollset* pollset) { +static grpc_error* process_epoll_events(grpc_pollset* pollset) { static const char* err_desc = "process_events"; grpc_error* error = GRPC_ERROR_NONE; @@ -611,11 +598,11 @@ static grpc_error* process_epoll_events(grpc_exec_ctx* exec_ctx, bool write_ev = (ev->events & EPOLLOUT) != 0; if (read_ev || cancel) { - fd_become_readable(exec_ctx, fd, pollset); + fd_become_readable(fd, pollset); } if (write_ev || cancel) { - fd_become_writable(exec_ctx, fd); + fd_become_writable(fd); } } } @@ -631,27 +618,26 @@ static grpc_error* process_epoll_events(grpc_exec_ctx* exec_ctx, NOTE ON SYNCHRONIZATION: At any point of time, only the g_active_poller (i.e the designated poller thread) will be calling this function. So there is no need for any synchronization when accesing fields in g_epoll_set */ -static grpc_error* do_epoll_wait(grpc_exec_ctx* exec_ctx, grpc_pollset* ps, - grpc_millis deadline) { +static grpc_error* do_epoll_wait(grpc_pollset* ps, grpc_millis deadline) { GPR_TIMER_BEGIN("do_epoll_wait", 0); int r; - int timeout = poll_deadline_to_millis_timeout(exec_ctx, deadline); + int timeout = poll_deadline_to_millis_timeout(deadline); if (timeout != 0) { GRPC_SCHEDULING_START_BLOCKING_REGION; } do { - GRPC_STATS_INC_SYSCALL_POLL(exec_ctx); + GRPC_STATS_INC_SYSCALL_POLL(); r = epoll_wait(g_epoll_set.epfd, g_epoll_set.events, MAX_EPOLL_EVENTS, timeout); } while (r < 0 && errno == EINTR); if (timeout != 0) { - GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(exec_ctx); + GRPC_SCHEDULING_END_BLOCKING_REGION; } if (r < 0) return GRPC_OS_ERROR(errno, "epoll_wait"); - GRPC_STATS_INC_POLL_EVENTS_RETURNED(exec_ctx, r); + GRPC_STATS_INC_POLL_EVENTS_RETURNED(r); if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "ps: %p poll got %d events", ps, r); @@ -664,8 +650,7 @@ static grpc_error* do_epoll_wait(grpc_exec_ctx* exec_ctx, grpc_pollset* ps, return GRPC_ERROR_NONE; } -static bool begin_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - grpc_pollset_worker* worker, +static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, grpc_pollset_worker** worker_hdl, grpc_millis deadline) { GPR_TIMER_BEGIN("begin_worker", 0); @@ -760,7 +745,7 @@ static bool begin_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, SET_KICK_STATE(worker, KICKED); } } - grpc_exec_ctx_invalidate_now(exec_ctx); + grpc_core::ExecCtx::Get()->InvalidateNow(); } if (grpc_polling_trace.enabled()) { @@ -791,7 +776,7 @@ static bool begin_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, } static bool check_neighborhood_for_available_poller( - grpc_exec_ctx* exec_ctx, pollset_neighborhood* neighborhood) { + pollset_neighborhood* neighborhood) { GPR_TIMER_BEGIN("check_neighborhood_for_available_poller", 0); bool found_worker = false; do { @@ -815,7 +800,7 @@ static bool check_neighborhood_for_available_poller( SET_KICK_STATE(inspect_worker, DESIGNATED_POLLER); if (inspect_worker->initialized_cv) { GPR_TIMER_MARK("signal worker", 0); - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); gpr_cv_signal(&inspect_worker->cv); } } else { @@ -855,8 +840,7 @@ static bool check_neighborhood_for_available_poller( return found_worker; } -static void end_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - grpc_pollset_worker* worker, +static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, grpc_pollset_worker** worker_hdl) { GPR_TIMER_BEGIN("end_worker", 0); if (grpc_polling_trace.enabled()) { @@ -866,7 +850,7 @@ static void end_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, /* Make sure we appear kicked */ SET_KICK_STATE(worker, KICKED); grpc_closure_list_move(&worker->schedule_on_end_work, - &exec_ctx->closure_list); + grpc_core::ExecCtx::Get()->closure_list()); if (gpr_atm_no_barrier_load(&g_active_poller) == (gpr_atm)worker) { if (worker->next != worker && worker->next->state == UNKICKED) { if (grpc_polling_trace.enabled()) { @@ -875,11 +859,11 @@ static void end_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, GPR_ASSERT(worker->next->initialized_cv); gpr_atm_no_barrier_store(&g_active_poller, (gpr_atm)worker->next); SET_KICK_STATE(worker->next, DESIGNATED_POLLER); - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); gpr_cv_signal(&worker->next->cv); - if (grpc_exec_ctx_has_work(exec_ctx)) { + if (grpc_core::ExecCtx::Get()->HasWork()) { gpr_mu_unlock(&pollset->mu); - grpc_exec_ctx_flush(exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->mu); } } else { @@ -894,8 +878,7 @@ static void end_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, &g_neighborhoods[(poller_neighborhood_idx + i) % g_num_neighborhoods]; if (gpr_mu_trylock(&neighborhood->mu)) { - found_worker = - check_neighborhood_for_available_poller(exec_ctx, neighborhood); + found_worker = check_neighborhood_for_available_poller(neighborhood); gpr_mu_unlock(&neighborhood->mu); scan_state[i] = true; } else { @@ -908,16 +891,15 @@ static void end_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, &g_neighborhoods[(poller_neighborhood_idx + i) % g_num_neighborhoods]; gpr_mu_lock(&neighborhood->mu); - found_worker = - check_neighborhood_for_available_poller(exec_ctx, neighborhood); + found_worker = check_neighborhood_for_available_poller(neighborhood); gpr_mu_unlock(&neighborhood->mu); } - grpc_exec_ctx_flush(exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->mu); } - } else if (grpc_exec_ctx_has_work(exec_ctx)) { + } else if (grpc_core::ExecCtx::Get()->HasWork()) { gpr_mu_unlock(&pollset->mu); - grpc_exec_ctx_flush(exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->mu); } if (worker->initialized_cv) { @@ -927,7 +909,7 @@ static void end_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, gpr_log(GPR_DEBUG, " .. remove worker"); } if (EMPTIED == worker_remove(pollset, worker)) { - pollset_maybe_finish_shutdown(exec_ctx, pollset); + pollset_maybe_finish_shutdown(pollset); } GPR_ASSERT(gpr_atm_no_barrier_load(&g_active_poller) != (gpr_atm)worker); GPR_TIMER_END("end_worker", 0); @@ -937,7 +919,7 @@ static void end_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, The function pollset_work() may temporarily release the lock (pollset->po.mu) during the course of its execution but it will always re-acquire the lock and ensure that it is held by the time the function returns */ -static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* ps, +static grpc_error* pollset_work(grpc_pollset* ps, grpc_pollset_worker** worker_hdl, grpc_millis deadline) { grpc_pollset_worker worker; @@ -950,7 +932,7 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* ps, return GRPC_ERROR_NONE; } - if (begin_worker(exec_ctx, ps, &worker, worker_hdl, deadline)) { + if (begin_worker(ps, &worker, worker_hdl, deadline)) { gpr_tls_set(&g_current_thread_pollset, (intptr_t)ps); gpr_tls_set(&g_current_thread_worker, (intptr_t)&worker); GPR_ASSERT(!ps->shutting_down); @@ -968,14 +950,14 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* ps, process_epoll_events() returns very quickly: It just queues the work on exec_ctx but does not execute it (the actual exectution or more - accurately grpc_exec_ctx_flush() happens in end_worker() AFTER selecting - a designated poller). So we are not waiting long periods without a - designated poller */ + accurately grpc_core::ExecCtx::Get()->Flush() happens in end_worker() + AFTER selecting a designated poller). So we are not waiting long periods + without a designated poller */ if (gpr_atm_acq_load(&g_epoll_set.cursor) == gpr_atm_acq_load(&g_epoll_set.num_events)) { - append_error(&error, do_epoll_wait(exec_ctx, ps, deadline), err_desc); + append_error(&error, do_epoll_wait(ps, deadline), err_desc); } - append_error(&error, process_epoll_events(exec_ctx, ps), err_desc); + append_error(&error, process_epoll_events(ps), err_desc); gpr_mu_lock(&ps->mu); /* lock */ @@ -983,17 +965,17 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* ps, } else { gpr_tls_set(&g_current_thread_pollset, (intptr_t)ps); } - end_worker(exec_ctx, ps, &worker, worker_hdl); + end_worker(ps, &worker, worker_hdl); gpr_tls_set(&g_current_thread_pollset, 0); GPR_TIMER_END("pollset_work", 0); return error; } -static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, +static grpc_error* pollset_kick(grpc_pollset* pollset, grpc_pollset_worker* specific_worker) { GPR_TIMER_BEGIN("pollset_kick", 0); - GRPC_STATS_INC_POLLSET_KICK(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK(); grpc_error* ret_err = GRPC_ERROR_NONE; if (grpc_polling_trace.enabled()) { gpr_strvec log; @@ -1026,7 +1008,7 @@ static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, if (gpr_tls_get(&g_current_thread_pollset) != (intptr_t)pollset) { grpc_pollset_worker* root_worker = pollset->root_worker; if (root_worker == nullptr) { - GRPC_STATS_INC_POLLSET_KICKED_WITHOUT_POLLER(exec_ctx); + GRPC_STATS_INC_POLLSET_KICKED_WITHOUT_POLLER(); pollset->kicked_without_poller = true; if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. kicked_without_poller"); @@ -1035,14 +1017,14 @@ static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, } grpc_pollset_worker* next_worker = root_worker->next; if (root_worker->state == KICKED) { - GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx); + GRPC_STATS_INC_POLLSET_KICKED_AGAIN(); if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. already kicked %p", root_worker); } SET_KICK_STATE(root_worker, KICKED); goto done; } else if (next_worker->state == KICKED) { - GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx); + GRPC_STATS_INC_POLLSET_KICKED_AGAIN(); if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. already kicked %p", next_worker); } @@ -1053,7 +1035,7 @@ static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, // there is no next worker root_worker == (grpc_pollset_worker*)gpr_atm_no_barrier_load( &g_active_poller)) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(); if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. kicked %p", root_worker); } @@ -1061,7 +1043,7 @@ static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, ret_err = grpc_wakeup_fd_wakeup(&global_wakeup_fd); goto done; } else if (next_worker->state == UNKICKED) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. kicked %p", next_worker); } @@ -1079,12 +1061,12 @@ static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, } SET_KICK_STATE(root_worker, KICKED); if (root_worker->initialized_cv) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); gpr_cv_signal(&root_worker->cv); } goto done; } else { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(); if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. non-root poller %p (root=%p)", next_worker, root_worker); @@ -1094,13 +1076,13 @@ static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, goto done; } } else { - GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx); + GRPC_STATS_INC_POLLSET_KICKED_AGAIN(); GPR_ASSERT(next_worker->state == KICKED); SET_KICK_STATE(next_worker, KICKED); goto done; } } else { - GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(); if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. kicked while waking up"); } @@ -1117,7 +1099,7 @@ static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, goto done; } else if (gpr_tls_get(&g_current_thread_worker) == (intptr_t)specific_worker) { - GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(); if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. mark %p kicked", specific_worker); } @@ -1125,7 +1107,7 @@ static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, goto done; } else if (specific_worker == (grpc_pollset_worker*)gpr_atm_no_barrier_load(&g_active_poller)) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(); if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. kick active poller"); } @@ -1133,7 +1115,7 @@ static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, ret_err = grpc_wakeup_fd_wakeup(&global_wakeup_fd); goto done; } else if (specific_worker->initialized_cv) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. kick waiting worker"); } @@ -1141,7 +1123,7 @@ static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, gpr_cv_signal(&specific_worker->cv); goto done; } else { - GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx); + GRPC_STATS_INC_POLLSET_KICKED_AGAIN(); if (grpc_polling_trace.enabled()) { gpr_log(GPR_ERROR, " .. kick non-waiting worker"); } @@ -1153,8 +1135,7 @@ done: return ret_err; } -static void pollset_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - grpc_fd* fd) {} +static void pollset_add_fd(grpc_pollset* pollset, grpc_fd* fd) {} /******************************************************************************* * Pollset-set Definitions @@ -1164,27 +1145,20 @@ static grpc_pollset_set* pollset_set_create(void) { return (grpc_pollset_set*)((intptr_t)0xdeafbeef); } -static void pollset_set_destroy(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pss) {} +static void pollset_set_destroy(grpc_pollset_set* pss) {} -static void pollset_set_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset_set* pss, - grpc_fd* fd) {} +static void pollset_set_add_fd(grpc_pollset_set* pss, grpc_fd* fd) {} -static void pollset_set_del_fd(grpc_exec_ctx* exec_ctx, grpc_pollset_set* pss, - grpc_fd* fd) {} +static void pollset_set_del_fd(grpc_pollset_set* pss, grpc_fd* fd) {} -static void pollset_set_add_pollset(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pss, grpc_pollset* ps) {} +static void pollset_set_add_pollset(grpc_pollset_set* pss, grpc_pollset* ps) {} -static void pollset_set_del_pollset(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pss, grpc_pollset* ps) {} +static void pollset_set_del_pollset(grpc_pollset_set* pss, grpc_pollset* ps) {} -static void pollset_set_add_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, +static void pollset_set_add_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item) {} -static void pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, +static void pollset_set_del_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item) {} /******************************************************************************* @@ -1260,7 +1234,7 @@ const grpc_event_engine_vtable* grpc_init_epoll1_linux(bool explicit_request) { const grpc_event_engine_vtable* grpc_init_epoll1_linux(bool explicit_request) { gpr_log(GPR_ERROR, "Skipping epoll1 becuase GRPC_LINUX_EPOLL is not defined."); - return NULL; + return nullptr; } #endif /* defined(GRPC_POSIX_SOCKET) */ #endif /* !defined(GRPC_LINUX_EPOLL) */ diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc index 62643df697d..b2817156a82 100644 --- a/src/core/lib/iomgr/ev_epollex_linux.cc +++ b/src/core/lib/iomgr/ev_epollex_linux.cc @@ -257,8 +257,7 @@ static gpr_mu fd_freelist_mu; #ifndef NDEBUG #define REF_BY(fd, n, reason) ref_by(fd, n, reason, __FILE__, __LINE__) -#define UNREF_BY(ec, fd, n, reason) \ - unref_by(ec, fd, n, reason, __FILE__, __LINE__) +#define UNREF_BY(fd, n, reason) unref_by(fd, n, reason, __FILE__, __LINE__) static void ref_by(grpc_fd* fd, int n, const char* reason, const char* file, int line) { if (grpc_trace_fd_refcount.enabled()) { @@ -269,13 +268,13 @@ static void ref_by(grpc_fd* fd, int n, const char* reason, const char* file, } #else #define REF_BY(fd, n, reason) ref_by(fd, n) -#define UNREF_BY(ec, fd, n, reason) unref_by(ec, fd, n) +#define UNREF_BY(fd, n, reason) unref_by(fd, n) static void ref_by(grpc_fd* fd, int n) { #endif GPR_ASSERT(gpr_atm_no_barrier_fetch_add(&fd->refst, n) > 0); } -static void fd_destroy(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void fd_destroy(void* arg, grpc_error* error) { grpc_fd* fd = (grpc_fd*)arg; /* Add the fd to the freelist */ grpc_iomgr_unregister_object(&fd->iomgr_object); @@ -293,8 +292,8 @@ static void fd_destroy(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { } #ifndef NDEBUG -static void unref_by(grpc_exec_ctx* exec_ctx, grpc_fd* fd, int n, - const char* reason, const char* file, int line) { +static void unref_by(grpc_fd* fd, int n, const char* reason, const char* file, + int line) { if (grpc_trace_fd_refcount.enabled()) { gpr_log(GPR_DEBUG, "FD %d %p unref %d %" PRIdPTR " -> %" PRIdPTR " [%s; %s:%d]", @@ -302,12 +301,11 @@ static void unref_by(grpc_exec_ctx* exec_ctx, grpc_fd* fd, int n, gpr_atm_no_barrier_load(&fd->refst) - n, reason, file, line); } #else -static void unref_by(grpc_exec_ctx* exec_ctx, grpc_fd* fd, int n) { +static void unref_by(grpc_fd* fd, int n) { #endif gpr_atm old = gpr_atm_full_fetch_add(&fd->refst, -n); if (old == n) { GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_CREATE(fd_destroy, fd, grpc_schedule_on_exec_ctx), GRPC_ERROR_NONE); } else { @@ -373,8 +371,7 @@ static int fd_wrapped_fd(grpc_fd* fd) { return (gpr_atm_acq_load(&fd->refst) & 1) ? ret_fd : -1; } -static void fd_orphan(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_closure* on_done, int* release_fd, +static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, bool already_closed, const char* reason) { bool is_fd_closed = already_closed; @@ -399,15 +396,14 @@ static void fd_orphan(grpc_exec_ctx* exec_ctx, grpc_fd* fd, to be alive (and not added to freelist) until the end of this function */ REF_BY(fd, 1, reason); - GRPC_CLOSURE_SCHED(exec_ctx, fd->on_done_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(fd->on_done_closure, GRPC_ERROR_NONE); gpr_mu_unlock(&fd->orphan_mu); - UNREF_BY(exec_ctx, fd, 2, reason); /* Drop the reference */ + UNREF_BY(fd, 2, reason); /* Drop the reference */ } -static grpc_pollset* fd_get_read_notifier_pollset(grpc_exec_ctx* exec_ctx, - grpc_fd* fd) { +static grpc_pollset* fd_get_read_notifier_pollset(grpc_fd* fd) { gpr_atm notifier = gpr_atm_acq_load(&fd->read_notifier_pollset); return (grpc_pollset*)notifier; } @@ -417,22 +413,20 @@ static bool fd_is_shutdown(grpc_fd* fd) { } /* Might be called multiple times */ -static void fd_shutdown(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_error* why) { - if (fd->read_closure->SetShutdown(exec_ctx, GRPC_ERROR_REF(why))) { +static void fd_shutdown(grpc_fd* fd, grpc_error* why) { + if (fd->read_closure->SetShutdown(GRPC_ERROR_REF(why))) { shutdown(fd->fd, SHUT_RDWR); - fd->write_closure->SetShutdown(exec_ctx, GRPC_ERROR_REF(why)); + fd->write_closure->SetShutdown(GRPC_ERROR_REF(why)); } GRPC_ERROR_UNREF(why); } -static void fd_notify_on_read(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_closure* closure) { - fd->read_closure->NotifyOn(exec_ctx, closure); +static void fd_notify_on_read(grpc_fd* fd, grpc_closure* closure) { + fd->read_closure->NotifyOn(closure); } -static void fd_notify_on_write(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_closure* closure) { - fd->write_closure->NotifyOn(exec_ctx, closure); +static void fd_notify_on_write(grpc_fd* fd, grpc_closure* closure) { + fd->write_closure->NotifyOn(closure); } /******************************************************************************* @@ -556,8 +550,7 @@ static void pollset_global_shutdown(void) { } /* pollset->mu must be held while calling this function */ -static void pollset_maybe_finish_shutdown(grpc_exec_ctx* exec_ctx, - grpc_pollset* pollset) { +static void pollset_maybe_finish_shutdown(grpc_pollset* pollset) { if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PS:%p (pollable:%p) maybe_finish_shutdown sc=%p (target:!NULL) " @@ -567,7 +560,7 @@ static void pollset_maybe_finish_shutdown(grpc_exec_ctx* exec_ctx, } if (pollset->shutdown_closure != nullptr && pollset->root_worker == nullptr && pollset->containing_pollset_set_count == 0) { - GRPC_CLOSURE_SCHED(exec_ctx, pollset->shutdown_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(pollset->shutdown_closure, GRPC_ERROR_NONE); pollset->shutdown_closure = nullptr; } } @@ -575,8 +568,7 @@ static void pollset_maybe_finish_shutdown(grpc_exec_ctx* exec_ctx, /* pollset->mu must be held before calling this function, * pollset->active_pollable->mu & specific_worker->pollable_obj->mu must not be * held */ -static grpc_error* kick_one_worker(grpc_exec_ctx* exec_ctx, - grpc_pollset_worker* specific_worker) { +static grpc_error* kick_one_worker(grpc_pollset_worker* specific_worker) { pollable* p = specific_worker->pollable_obj; grpc_core::mu_guard lock(&p->mu); GPR_ASSERT(specific_worker != nullptr); @@ -584,19 +576,19 @@ static grpc_error* kick_one_worker(grpc_exec_ctx* exec_ctx, if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PS:%p kicked_specific_but_already_kicked", p); } - GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx); + GRPC_STATS_INC_POLLSET_KICKED_AGAIN(); return GRPC_ERROR_NONE; } if (gpr_tls_get(&g_current_thread_worker) == (intptr_t)specific_worker) { if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PS:%p kicked_specific_but_awake", p); } - GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(); specific_worker->kicked = true; return GRPC_ERROR_NONE; } if (specific_worker == p->root_worker) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_FD(); if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PS:%p kicked_specific_via_wakeup_fd", p); } @@ -605,7 +597,7 @@ static grpc_error* kick_one_worker(grpc_exec_ctx* exec_ctx, return error; } if (specific_worker->initialized_cv) { - GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(); if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PS:%p kicked_specific_via_cv", p); } @@ -618,9 +610,9 @@ static grpc_error* kick_one_worker(grpc_exec_ctx* exec_ctx, return GRPC_ERROR_NONE; } -static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, +static grpc_error* pollset_kick(grpc_pollset* pollset, grpc_pollset_worker* specific_worker) { - GRPC_STATS_INC_POLLSET_KICK(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK(); if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PS:%p kick %p tls_pollset=%p tls_worker=%p pollset.root_worker=%p", @@ -634,7 +626,7 @@ static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PS:%p kicked_any_without_poller", pollset); } - GRPC_STATS_INC_POLLSET_KICKED_WITHOUT_POLLER(exec_ctx); + GRPC_STATS_INC_POLLSET_KICKED_WITHOUT_POLLER(); pollset->kicked_without_poller = true; return GRPC_ERROR_NONE; } else { @@ -654,29 +646,28 @@ static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, // so we take our chances and choose the SECOND worker enqueued against // the pollset as a worker that's likely to be in cv_wait return kick_one_worker( - exec_ctx, pollset->root_worker->links[PWLINK_POLLSET].next); + pollset->root_worker->links[PWLINK_POLLSET].next); } } else { if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PS:%p kicked_any_but_awake", pollset); } - GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK_OWN_THREAD(); return GRPC_ERROR_NONE; } } else { - return kick_one_worker(exec_ctx, specific_worker); + return kick_one_worker(specific_worker); } } -static grpc_error* pollset_kick_all(grpc_exec_ctx* exec_ctx, - grpc_pollset* pollset) { +static grpc_error* pollset_kick_all(grpc_pollset* pollset) { grpc_error* error = GRPC_ERROR_NONE; const char* err_desc = "pollset_kick_all"; grpc_pollset_worker* w = pollset->root_worker; if (w != nullptr) { do { - GRPC_STATS_INC_POLLSET_KICK(exec_ctx); - append_error(&error, kick_one_worker(exec_ctx, w), err_desc); + GRPC_STATS_INC_POLLSET_KICK(); + append_error(&error, kick_one_worker(w), err_desc); w = w->links[PWLINK_POLLSET].next; } while (w != pollset->root_worker); } @@ -689,10 +680,9 @@ static void pollset_init(grpc_pollset* pollset, gpr_mu** mu) { *mu = &pollset->mu; } -static int poll_deadline_to_millis_timeout(grpc_exec_ctx* exec_ctx, - grpc_millis millis) { +static int poll_deadline_to_millis_timeout(grpc_millis millis) { if (millis == GRPC_MILLIS_INF_FUTURE) return -1; - grpc_millis delta = millis - grpc_exec_ctx_now(exec_ctx); + grpc_millis delta = millis - grpc_core::ExecCtx::Get()->Now(); if (delta > INT_MAX) return INT_MAX; else if (delta < 0) @@ -701,9 +691,8 @@ static int poll_deadline_to_millis_timeout(grpc_exec_ctx* exec_ctx, return (int)delta; } -static void fd_become_readable(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_pollset* notifier) { - fd->read_closure->SetReady(exec_ctx); +static void fd_become_readable(grpc_fd* fd, grpc_pollset* notifier) { + fd->read_closure->SetReady(); /* Note, it is possible that fd_become_readable might be called twice with different 'notifier's when an fd becomes readable and it is in two epoll @@ -714,9 +703,7 @@ static void fd_become_readable(grpc_exec_ctx* exec_ctx, grpc_fd* fd, gpr_atm_rel_store(&fd->read_notifier_pollset, (gpr_atm)notifier); } -static void fd_become_writable(grpc_exec_ctx* exec_ctx, grpc_fd* fd) { - fd->write_closure->SetReady(exec_ctx); -} +static void fd_become_writable(grpc_fd* fd) { fd->write_closure->SetReady(); } static grpc_error* fd_get_or_become_pollable(grpc_fd* fd, pollable** p) { gpr_mu_lock(&fd->pollable_mu); @@ -745,16 +732,14 @@ static grpc_error* fd_get_or_become_pollable(grpc_fd* fd, pollable** p) { } /* pollset->po.mu lock must be held by the caller before calling this */ -static void pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - grpc_closure* closure) { +static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { GPR_ASSERT(pollset->shutdown_closure == nullptr); pollset->shutdown_closure = closure; - GRPC_LOG_IF_ERROR("pollset_shutdown", pollset_kick_all(exec_ctx, pollset)); - pollset_maybe_finish_shutdown(exec_ctx, pollset); + GRPC_LOG_IF_ERROR("pollset_shutdown", pollset_kick_all(pollset)); + pollset_maybe_finish_shutdown(pollset); } -static grpc_error* pollable_process_events(grpc_exec_ctx* exec_ctx, - grpc_pollset* pollset, +static grpc_error* pollable_process_events(grpc_pollset* pollset, pollable* pollable_obj, bool drain) { static const char* err_desc = "pollset_process_events"; grpc_error* error = GRPC_ERROR_NONE; @@ -784,10 +769,10 @@ static grpc_error* pollable_process_events(grpc_exec_ctx* exec_ctx, pollset, fd, cancel, read_ev, write_ev); } if (read_ev || cancel) { - fd_become_readable(exec_ctx, fd, pollset); + fd_become_readable(fd, pollset); } if (write_ev || cancel) { - fd_become_writable(exec_ctx, fd); + fd_become_writable(fd); } } } @@ -796,14 +781,13 @@ static grpc_error* pollable_process_events(grpc_exec_ctx* exec_ctx, } /* pollset_shutdown is guaranteed to be called before pollset_destroy. */ -static void pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset) { +static void pollset_destroy(grpc_pollset* pollset) { POLLABLE_UNREF(pollset->active_pollable, "pollset"); pollset->active_pollable = nullptr; } -static grpc_error* pollable_epoll(grpc_exec_ctx* exec_ctx, pollable* p, - grpc_millis deadline) { - int timeout = poll_deadline_to_millis_timeout(exec_ctx, deadline); +static grpc_error* pollable_epoll(pollable* p, grpc_millis deadline) { + int timeout = poll_deadline_to_millis_timeout(deadline); if (grpc_polling_trace.enabled()) { char* desc = pollable_desc(p); @@ -816,11 +800,11 @@ static grpc_error* pollable_epoll(grpc_exec_ctx* exec_ctx, pollable* p, } int r; do { - GRPC_STATS_INC_SYSCALL_POLL(exec_ctx); + GRPC_STATS_INC_SYSCALL_POLL(); r = epoll_wait(p->epfd, p->events, MAX_EPOLL_EVENTS, timeout); } while (r < 0 && errno == EINTR); if (timeout != 0) { - GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(exec_ctx); + GRPC_SCHEDULING_END_BLOCKING_REGION; } if (r < 0) return GRPC_OS_ERROR(errno, "epoll_wait"); @@ -875,8 +859,7 @@ static worker_remove_result worker_remove(grpc_pollset_worker** root_worker, } /* Return true if this thread should poll */ -static bool begin_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - grpc_pollset_worker* worker, +static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, grpc_pollset_worker** worker_hdl, grpc_millis deadline) { bool do_poll = (pollset->shutdown_closure == nullptr); @@ -897,7 +880,7 @@ static bool begin_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, worker->pollable_obj->root_worker != worker) { gpr_log(GPR_DEBUG, "PS:%p wait %p w=%p for %dms", pollset, worker->pollable_obj, worker, - poll_deadline_to_millis_timeout(exec_ctx, deadline)); + poll_deadline_to_millis_timeout(deadline)); } while (do_poll && worker->pollable_obj->root_worker != worker) { if (gpr_cv_wait(&worker->cv, &worker->pollable_obj->mu, @@ -919,7 +902,7 @@ static bool begin_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, worker->pollable_obj, worker); } } - grpc_exec_ctx_invalidate_now(exec_ctx); + grpc_core::ExecCtx::Get()->InvalidateNow(); } else { gpr_mu_unlock(&pollset->mu); } @@ -928,8 +911,7 @@ static bool begin_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, return do_poll; } -static void end_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - grpc_pollset_worker* worker, +static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, grpc_pollset_worker** worker_hdl) { gpr_mu_lock(&pollset->mu); gpr_mu_lock(&worker->pollable_obj->mu); @@ -945,7 +927,7 @@ static void end_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, case WRR_EMPTIED: if (pollset->active_pollable != worker->pollable_obj) { // pollable no longer being polled: flush events - pollable_process_events(exec_ctx, pollset, worker->pollable_obj, true); + pollable_process_events(pollset, worker->pollable_obj, true); } break; case WRR_REMOVED: @@ -955,7 +937,7 @@ static void end_worker(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, POLLABLE_UNREF(worker->pollable_obj, "pollset_worker"); if (worker_remove(&pollset->root_worker, worker, PWLINK_POLLSET) == WRR_EMPTIED) { - pollset_maybe_finish_shutdown(exec_ctx, pollset); + pollset_maybe_finish_shutdown(pollset); } if (worker->initialized_cv) { gpr_cv_destroy(&worker->cv); @@ -970,7 +952,7 @@ static long gettid(void) { return syscall(__NR_gettid); } The function pollset_work() may temporarily release the lock (pollset->po.mu) during the course of its execution but it will always re-acquire the lock and ensure that it is held by the time the function returns */ -static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, +static grpc_error* pollset_work(grpc_pollset* pollset, grpc_pollset_worker** worker_hdl, grpc_millis deadline) { #ifdef GRPC_EPOLLEX_CREATE_WORKERS_ON_HEAP @@ -988,7 +970,7 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, gpr_log(GPR_DEBUG, "PS:%p work hdl=%p worker=%p now=%" PRIdPTR " deadline=%" PRIdPTR " kwp=%d pollable=%p", - pollset, worker_hdl, WORKER_PTR, grpc_exec_ctx_now(exec_ctx), + pollset, worker_hdl, WORKER_PTR, grpc_core::ExecCtx::Get()->Now(), deadline, pollset->kicked_without_poller, pollset->active_pollable); } static const char* err_desc = "pollset_work"; @@ -996,25 +978,23 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, if (pollset->kicked_without_poller) { pollset->kicked_without_poller = false; } else { - if (begin_worker(exec_ctx, pollset, WORKER_PTR, worker_hdl, deadline)) { + if (begin_worker(pollset, WORKER_PTR, worker_hdl, deadline)) { gpr_tls_set(&g_current_thread_pollset, (intptr_t)pollset); gpr_tls_set(&g_current_thread_worker, (intptr_t)WORKER_PTR); if (WORKER_PTR->pollable_obj->event_cursor == WORKER_PTR->pollable_obj->event_count) { - append_error( - &error, - pollable_epoll(exec_ctx, WORKER_PTR->pollable_obj, deadline), - err_desc); + append_error(&error, pollable_epoll(WORKER_PTR->pollable_obj, deadline), + err_desc); } - append_error(&error, - pollable_process_events(exec_ctx, pollset, - WORKER_PTR->pollable_obj, false), - err_desc); - grpc_exec_ctx_flush(exec_ctx); + append_error( + &error, + pollable_process_events(pollset, WORKER_PTR->pollable_obj, false), + err_desc); + grpc_core::ExecCtx::Get()->Flush(); gpr_tls_set(&g_current_thread_pollset, 0); gpr_tls_set(&g_current_thread_worker, 0); } - end_worker(exec_ctx, pollset, WORKER_PTR, worker_hdl); + end_worker(pollset, WORKER_PTR, worker_hdl); } #ifdef GRPC_EPOLLEX_CREATE_WORKERS_ON_HEAP gpr_free(worker); @@ -1024,7 +1004,7 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, } static grpc_error* pollset_transition_pollable_from_empty_to_fd_locked( - grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, grpc_fd* fd) { + grpc_pollset* pollset, grpc_fd* fd) { static const char* err_desc = "pollset_transition_pollable_from_empty_to_fd"; grpc_error* error = GRPC_ERROR_NONE; if (grpc_polling_trace.enabled()) { @@ -1032,7 +1012,7 @@ static grpc_error* pollset_transition_pollable_from_empty_to_fd_locked( "PS:%p add fd %p (%d); transition pollable from empty to fd", pollset, fd, fd->fd); } - append_error(&error, pollset_kick_all(exec_ctx, pollset), err_desc); + append_error(&error, pollset_kick_all(pollset), err_desc); POLLABLE_UNREF(pollset->active_pollable, "pollset"); append_error(&error, fd_get_or_become_pollable(fd, &pollset->active_pollable), err_desc); @@ -1040,7 +1020,7 @@ static grpc_error* pollset_transition_pollable_from_empty_to_fd_locked( } static grpc_error* pollset_transition_pollable_from_fd_to_multi_locked( - grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, grpc_fd* and_add_fd) { + grpc_pollset* pollset, grpc_fd* and_add_fd) { static const char* err_desc = "pollset_transition_pollable_from_fd_to_multi"; grpc_error* error = GRPC_ERROR_NONE; if (grpc_polling_trace.enabled()) { @@ -1050,7 +1030,7 @@ static grpc_error* pollset_transition_pollable_from_fd_to_multi_locked( pollset, and_add_fd, and_add_fd ? and_add_fd->fd : -1, pollset->active_pollable->owner_fd); } - append_error(&error, pollset_kick_all(exec_ctx, pollset), err_desc); + append_error(&error, pollset_kick_all(pollset), err_desc); grpc_fd* initial_fd = pollset->active_pollable->owner_fd; POLLABLE_UNREF(pollset->active_pollable, "pollset"); pollset->active_pollable = nullptr; @@ -1068,27 +1048,25 @@ static grpc_error* pollset_transition_pollable_from_fd_to_multi_locked( } /* expects pollsets locked, flag whether fd is locked or not */ -static grpc_error* pollset_add_fd_locked(grpc_exec_ctx* exec_ctx, - grpc_pollset* pollset, grpc_fd* fd) { +static grpc_error* pollset_add_fd_locked(grpc_pollset* pollset, grpc_fd* fd) { grpc_error* error = GRPC_ERROR_NONE; pollable* po_at_start = POLLABLE_REF(pollset->active_pollable, "pollset_add_fd"); switch (pollset->active_pollable->type) { case PO_EMPTY: /* empty pollable --> single fd pollable */ - error = pollset_transition_pollable_from_empty_to_fd_locked(exec_ctx, - pollset, fd); + error = pollset_transition_pollable_from_empty_to_fd_locked(pollset, fd); break; case PO_FD: gpr_mu_lock(&po_at_start->owner_fd->orphan_mu); if ((gpr_atm_no_barrier_load(&pollset->active_pollable->owner_fd->refst) & 1) == 0) { - error = pollset_transition_pollable_from_empty_to_fd_locked( - exec_ctx, pollset, fd); + error = + pollset_transition_pollable_from_empty_to_fd_locked(pollset, fd); } else { /* fd --> multipoller */ - error = pollset_transition_pollable_from_fd_to_multi_locked( - exec_ctx, pollset, fd); + error = + pollset_transition_pollable_from_fd_to_multi_locked(pollset, fd); } gpr_mu_unlock(&po_at_start->owner_fd->orphan_mu); break; @@ -1105,8 +1083,7 @@ static grpc_error* pollset_add_fd_locked(grpc_exec_ctx* exec_ctx, return error; } -static grpc_error* pollset_as_multipollable_locked(grpc_exec_ctx* exec_ctx, - grpc_pollset* pollset, +static grpc_error* pollset_as_multipollable_locked(grpc_pollset* pollset, pollable** pollable_obj) { grpc_error* error = GRPC_ERROR_NONE; pollable* po_at_start = @@ -1123,8 +1100,8 @@ static grpc_error* pollset_as_multipollable_locked(grpc_exec_ctx* exec_ctx, POLLABLE_UNREF(pollset->active_pollable, "pollset"); error = pollable_create(PO_MULTI, &pollset->active_pollable); } else { - error = pollset_transition_pollable_from_fd_to_multi_locked( - exec_ctx, pollset, nullptr); + error = pollset_transition_pollable_from_fd_to_multi_locked(pollset, + nullptr); } gpr_mu_unlock(&po_at_start->owner_fd->orphan_mu); break; @@ -1142,10 +1119,9 @@ static grpc_error* pollset_as_multipollable_locked(grpc_exec_ctx* exec_ctx, return error; } -static void pollset_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - grpc_fd* fd) { +static void pollset_add_fd(grpc_pollset* pollset, grpc_fd* fd) { gpr_mu_lock(&pollset->mu); - grpc_error* error = pollset_add_fd_locked(exec_ctx, pollset, fd); + grpc_error* error = pollset_add_fd_locked(pollset, fd); gpr_mu_unlock(&pollset->mu); GRPC_LOG_IF_ERROR("pollset_add_fd", error); } @@ -1171,28 +1147,27 @@ static grpc_pollset_set* pollset_set_create(void) { return pss; } -static void pollset_set_unref(grpc_exec_ctx* exec_ctx, grpc_pollset_set* pss) { +static void pollset_set_unref(grpc_pollset_set* pss) { if (pss == nullptr) return; if (!gpr_unref(&pss->refs)) return; - pollset_set_unref(exec_ctx, pss->parent); + pollset_set_unref(pss->parent); gpr_mu_destroy(&pss->mu); for (size_t i = 0; i < pss->pollset_count; i++) { gpr_mu_lock(&pss->pollsets[i]->mu); if (0 == --pss->pollsets[i]->containing_pollset_set_count) { - pollset_maybe_finish_shutdown(exec_ctx, pss->pollsets[i]); + pollset_maybe_finish_shutdown(pss->pollsets[i]); } gpr_mu_unlock(&pss->pollsets[i]->mu); } for (size_t i = 0; i < pss->fd_count; i++) { - UNREF_BY(exec_ctx, pss->fds[i], 2, "pollset_set"); + UNREF_BY(pss->fds[i], 2, "pollset_set"); } gpr_free(pss->pollsets); gpr_free(pss->fds); gpr_free(pss); } -static void pollset_set_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset_set* pss, - grpc_fd* fd) { +static void pollset_set_add_fd(grpc_pollset_set* pss, grpc_fd* fd) { if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PSS:%p: add fd %p (%d)", pss, fd, fd->fd); } @@ -1215,8 +1190,7 @@ static void pollset_set_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset_set* pss, GRPC_LOG_IF_ERROR(err_desc, error); } -static void pollset_set_del_fd(grpc_exec_ctx* exec_ctx, grpc_pollset_set* pss, - grpc_fd* fd) { +static void pollset_set_del_fd(grpc_pollset_set* pss, grpc_fd* fd) { if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PSS:%p: del fd %p", pss, fd); } @@ -1224,7 +1198,7 @@ static void pollset_set_del_fd(grpc_exec_ctx* exec_ctx, grpc_pollset_set* pss, size_t i; for (i = 0; i < pss->fd_count; i++) { if (pss->fds[i] == fd) { - UNREF_BY(exec_ctx, fd, 2, "pollset_set"); + UNREF_BY(fd, 2, "pollset_set"); break; } } @@ -1236,8 +1210,7 @@ static void pollset_set_del_fd(grpc_exec_ctx* exec_ctx, grpc_pollset_set* pss, gpr_mu_unlock(&pss->mu); } -static void pollset_set_del_pollset(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pss, grpc_pollset* ps) { +static void pollset_set_del_pollset(grpc_pollset_set* pss, grpc_pollset* ps) { if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PSS:%p: del pollset %p", pss, ps); } @@ -1256,15 +1229,15 @@ static void pollset_set_del_pollset(grpc_exec_ctx* exec_ctx, gpr_mu_unlock(&pss->mu); gpr_mu_lock(&ps->mu); if (0 == --ps->containing_pollset_set_count) { - pollset_maybe_finish_shutdown(exec_ctx, ps); + pollset_maybe_finish_shutdown(ps); } gpr_mu_unlock(&ps->mu); } // add all fds to pollables, and output a new array of unorphaned out_fds // assumes pollsets are multipollable -static grpc_error* add_fds_to_pollsets(grpc_exec_ctx* exec_ctx, grpc_fd** fds, - size_t fd_count, grpc_pollset** pollsets, +static grpc_error* add_fds_to_pollsets(grpc_fd** fds, size_t fd_count, + grpc_pollset** pollsets, size_t pollset_count, const char* err_desc, grpc_fd** out_fds, size_t* out_fd_count) { @@ -1273,7 +1246,7 @@ static grpc_error* add_fds_to_pollsets(grpc_exec_ctx* exec_ctx, grpc_fd** fds, gpr_mu_lock(&fds[i]->orphan_mu); if ((gpr_atm_no_barrier_load(&fds[i]->refst) & 1) == 0) { gpr_mu_unlock(&fds[i]->orphan_mu); - UNREF_BY(exec_ctx, fds[i], 2, "pollset_set"); + UNREF_BY(fds[i], 2, "pollset_set"); } else { for (size_t j = 0; j < pollset_count; j++) { append_error(&error, @@ -1287,8 +1260,7 @@ static grpc_error* add_fds_to_pollsets(grpc_exec_ctx* exec_ctx, grpc_fd** fds, return error; } -static void pollset_set_add_pollset(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pss, grpc_pollset* ps) { +static void pollset_set_add_pollset(grpc_pollset_set* pss, grpc_pollset* ps) { if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PSS:%p: add pollset %p", pss, ps); } @@ -1296,8 +1268,8 @@ static void pollset_set_add_pollset(grpc_exec_ctx* exec_ctx, static const char* err_desc = "pollset_set_add_pollset"; pollable* pollable_obj = nullptr; gpr_mu_lock(&ps->mu); - if (!GRPC_LOG_IF_ERROR(err_desc, pollset_as_multipollable_locked( - exec_ctx, ps, &pollable_obj))) { + if (!GRPC_LOG_IF_ERROR(err_desc, + pollset_as_multipollable_locked(ps, &pollable_obj))) { GPR_ASSERT(pollable_obj == nullptr); gpr_mu_unlock(&ps->mu); return; @@ -1308,8 +1280,8 @@ static void pollset_set_add_pollset(grpc_exec_ctx* exec_ctx, size_t initial_fd_count = pss->fd_count; pss->fd_count = 0; append_error(&error, - add_fds_to_pollsets(exec_ctx, pss->fds, initial_fd_count, &ps, 1, - err_desc, pss->fds, &pss->fd_count), + add_fds_to_pollsets(pss->fds, initial_fd_count, &ps, 1, err_desc, + pss->fds, &pss->fd_count), err_desc); if (pss->pollset_count == pss->pollset_capacity) { pss->pollset_capacity = GPR_MAX(pss->pollset_capacity * 2, 8); @@ -1323,8 +1295,7 @@ static void pollset_set_add_pollset(grpc_exec_ctx* exec_ctx, GRPC_LOG_IF_ERROR(err_desc, error); } -static void pollset_set_add_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* a, +static void pollset_set_add_pollset_set(grpc_pollset_set* a, grpc_pollset_set* b) { if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "PSS: merge (%p, %p)", a, b); @@ -1373,13 +1344,13 @@ static void pollset_set_add_pollset_set(grpc_exec_ctx* exec_ctx, a->fd_count = 0; append_error( &error, - add_fds_to_pollsets(exec_ctx, a->fds, initial_a_fd_count, b->pollsets, + add_fds_to_pollsets(a->fds, initial_a_fd_count, b->pollsets, b->pollset_count, "merge_a2b", a->fds, &a->fd_count), err_desc); append_error( &error, - add_fds_to_pollsets(exec_ctx, b->fds, b->fd_count, a->pollsets, - a->pollset_count, "merge_b2a", a->fds, &a->fd_count), + add_fds_to_pollsets(b->fds, b->fd_count, a->pollsets, a->pollset_count, + "merge_b2a", a->fds, &a->fd_count), err_desc); if (a->pollset_capacity < a->pollset_count + b->pollset_count) { a->pollset_capacity = @@ -1401,8 +1372,7 @@ static void pollset_set_add_pollset_set(grpc_exec_ctx* exec_ctx, gpr_mu_unlock(&b->mu); } -static void pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, +static void pollset_set_del_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item) {} /******************************************************************************* @@ -1481,7 +1451,7 @@ const grpc_event_engine_vtable* grpc_init_epollex_linux( bool explicitly_requested) { gpr_log(GPR_ERROR, "Skipping epollex becuase GRPC_LINUX_EPOLL is not defined."); - return NULL; + return nullptr; } #endif /* defined(GRPC_POSIX_SOCKET) */ diff --git a/src/core/lib/iomgr/ev_epollsig_linux.cc b/src/core/lib/iomgr/ev_epollsig_linux.cc index 12c8483b8ee..7a8962f4a87 100644 --- a/src/core/lib/iomgr/ev_epollsig_linux.cc +++ b/src/core/lib/iomgr/ev_epollsig_linux.cc @@ -165,13 +165,12 @@ static void fd_global_shutdown(void); #ifndef NDEBUG #define PI_ADD_REF(p, r) pi_add_ref_dbg((p), (r), __FILE__, __LINE__) -#define PI_UNREF(exec_ctx, p, r) \ - pi_unref_dbg((exec_ctx), (p), (r), __FILE__, __LINE__) +#define PI_UNREF(p, r) pi_unref_dbg((p), (r), __FILE__, __LINE__) #else #define PI_ADD_REF(p, r) pi_add_ref((p)) -#define PI_UNREF(exec_ctx, p, r) pi_unref((exec_ctx), (p)) +#define PI_UNREF(p, r) pi_unref((p)) #endif @@ -270,7 +269,7 @@ static grpc_wakeup_fd polling_island_wakeup_fd; static __thread polling_island* g_current_thread_polling_island; /* Forward declaration */ -static void polling_island_delete(grpc_exec_ctx* exec_ctx, polling_island* pi); +static void polling_island_delete(polling_island* pi); #ifdef GRPC_TSAN /* Currently TSAN may incorrectly flag data races between epoll_ctl and @@ -284,7 +283,7 @@ gpr_atm g_epoll_sync; #endif /* defined(GRPC_TSAN) */ static void pi_add_ref(polling_island* pi); -static void pi_unref(grpc_exec_ctx* exec_ctx, polling_island* pi); +static void pi_unref(polling_island* pi); #ifndef NDEBUG static void pi_add_ref_dbg(polling_island* pi, const char* reason, @@ -299,8 +298,8 @@ static void pi_add_ref_dbg(polling_island* pi, const char* reason, pi_add_ref(pi); } -static void pi_unref_dbg(grpc_exec_ctx* exec_ctx, polling_island* pi, - const char* reason, const char* file, int line) { +static void pi_unref_dbg(polling_island* pi, const char* reason, + const char* file, int line) { if (grpc_polling_trace.enabled()) { gpr_atm old_cnt = gpr_atm_acq_load(&pi->ref_count); gpr_log(GPR_DEBUG, @@ -308,7 +307,7 @@ static void pi_unref_dbg(grpc_exec_ctx* exec_ctx, polling_island* pi, " (%s) - (%s, %d)", pi, old_cnt, (old_cnt - 1), reason, file, line); } - pi_unref(exec_ctx, pi); + pi_unref(pi); } #endif @@ -316,7 +315,7 @@ static void pi_add_ref(polling_island* pi) { gpr_atm_no_barrier_fetch_add(&pi->ref_count, 1); } -static void pi_unref(grpc_exec_ctx* exec_ctx, polling_island* pi) { +static void pi_unref(polling_island* pi) { /* If ref count went to zero, delete the polling island. Note that this deletion not be done under a lock. Once the ref count goes to zero, we are guaranteed that no one else holds a reference to the @@ -327,9 +326,9 @@ static void pi_unref(grpc_exec_ctx* exec_ctx, polling_island* pi) { */ if (1 == gpr_atm_full_fetch_add(&pi->ref_count, -1)) { polling_island* next = (polling_island*)gpr_atm_acq_load(&pi->merged_to); - polling_island_delete(exec_ctx, pi); + polling_island_delete(pi); if (next != nullptr) { - PI_UNREF(exec_ctx, next, "pi_delete"); /* Recursive call */ + PI_UNREF(next, "pi_delete"); /* Recursive call */ } } } @@ -465,8 +464,7 @@ static void polling_island_remove_fd_locked(polling_island* pi, grpc_fd* fd, } /* Might return NULL in case of an error */ -static polling_island* polling_island_create(grpc_exec_ctx* exec_ctx, - grpc_fd* initial_fd, +static polling_island* polling_island_create(grpc_fd* initial_fd, grpc_error** error) { polling_island* pi = nullptr; const char* err_desc = "polling_island_create"; @@ -482,7 +480,7 @@ static polling_island* polling_island_create(grpc_exec_ctx* exec_ctx, gpr_atm_rel_store(&pi->ref_count, 0); gpr_atm_rel_store(&pi->poller_count, 0); - gpr_atm_rel_store(&pi->merged_to, (gpr_atm)NULL); + gpr_atm_rel_store(&pi->merged_to, (gpr_atm) nullptr); pi->epoll_fd = epoll_create1(EPOLL_CLOEXEC); @@ -497,13 +495,13 @@ static polling_island* polling_island_create(grpc_exec_ctx* exec_ctx, done: if (*error != GRPC_ERROR_NONE) { - polling_island_delete(exec_ctx, pi); + polling_island_delete(pi); pi = nullptr; } return pi; } -static void polling_island_delete(grpc_exec_ctx* exec_ctx, polling_island* pi) { +static void polling_island_delete(polling_island* pi) { GPR_ASSERT(pi->fd_cnt == 0); if (pi->epoll_fd >= 0) { @@ -862,8 +860,7 @@ static int fd_wrapped_fd(grpc_fd* fd) { return ret_fd; } -static void fd_orphan(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_closure* on_done, int* release_fd, +static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, bool already_closed, const char* reason) { grpc_error* error = GRPC_ERROR_NONE; polling_island* unref_pi = nullptr; @@ -902,7 +899,7 @@ static void fd_orphan(grpc_exec_ctx* exec_ctx, grpc_fd* fd, fd->orphaned = true; - GRPC_CLOSURE_SCHED(exec_ctx, fd->on_done_closure, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(fd->on_done_closure, GRPC_ERROR_REF(error)); gpr_mu_unlock(&fd->po.mu); UNREF_BY(fd, 2, reason); /* Drop the reference */ @@ -911,7 +908,7 @@ static void fd_orphan(grpc_exec_ctx* exec_ctx, grpc_fd* fd, The polling island owns a workqueue which owns an fd, and unreffing inside the lock can cause an eventual lock loop that makes TSAN very unhappy. */ - PI_UNREF(exec_ctx, unref_pi, "fd_orphan"); + PI_UNREF(unref_pi, "fd_orphan"); } if (error != GRPC_ERROR_NONE) { const char* msg = grpc_error_string(error); @@ -920,8 +917,7 @@ static void fd_orphan(grpc_exec_ctx* exec_ctx, grpc_fd* fd, GRPC_ERROR_UNREF(error); } -static grpc_pollset* fd_get_read_notifier_pollset(grpc_exec_ctx* exec_ctx, - grpc_fd* fd) { +static grpc_pollset* fd_get_read_notifier_pollset(grpc_fd* fd) { gpr_atm notifier = gpr_atm_acq_load(&fd->read_notifier_pollset); return (grpc_pollset*)notifier; } @@ -931,22 +927,20 @@ static bool fd_is_shutdown(grpc_fd* fd) { } /* Might be called multiple times */ -static void fd_shutdown(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_error* why) { - if (fd->read_closure->SetShutdown(exec_ctx, GRPC_ERROR_REF(why))) { +static void fd_shutdown(grpc_fd* fd, grpc_error* why) { + if (fd->read_closure->SetShutdown(GRPC_ERROR_REF(why))) { shutdown(fd->fd, SHUT_RDWR); - fd->write_closure->SetShutdown(exec_ctx, GRPC_ERROR_REF(why)); + fd->write_closure->SetShutdown(GRPC_ERROR_REF(why)); } GRPC_ERROR_UNREF(why); } -static void fd_notify_on_read(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_closure* closure) { - fd->read_closure->NotifyOn(exec_ctx, closure); +static void fd_notify_on_read(grpc_fd* fd, grpc_closure* closure) { + fd->read_closure->NotifyOn(closure); } -static void fd_notify_on_write(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_closure* closure) { - fd->write_closure->NotifyOn(exec_ctx, closure); +static void fd_notify_on_write(grpc_fd* fd, grpc_closure* closure) { + fd->write_closure->NotifyOn(closure); } /******************************************************************************* @@ -1028,11 +1022,11 @@ static void push_front_worker(grpc_pollset* p, grpc_pollset_worker* worker) { } /* p->mu must be held before calling this function */ -static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* p, +static grpc_error* pollset_kick(grpc_pollset* p, grpc_pollset_worker* specific_worker) { GPR_TIMER_BEGIN("pollset_kick", 0); grpc_error* error = GRPC_ERROR_NONE; - GRPC_STATS_INC_POLLSET_KICK(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK(); const char* err_desc = "Kick Failure"; grpc_pollset_worker* worker = specific_worker; if (worker != nullptr) { @@ -1096,10 +1090,9 @@ static void pollset_init(grpc_pollset* pollset, gpr_mu** mu) { pollset->shutdown_done = nullptr; } -static int poll_deadline_to_millis_timeout(grpc_exec_ctx* exec_ctx, - grpc_millis millis) { +static int poll_deadline_to_millis_timeout(grpc_millis millis) { if (millis == GRPC_MILLIS_INF_FUTURE) return -1; - grpc_millis delta = millis - grpc_exec_ctx_now(exec_ctx); + grpc_millis delta = millis - grpc_core::ExecCtx::Get()->Now(); if (delta > INT_MAX) return INT_MAX; else if (delta < 0) @@ -1108,9 +1101,8 @@ static int poll_deadline_to_millis_timeout(grpc_exec_ctx* exec_ctx, return (int)delta; } -static void fd_become_readable(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_pollset* notifier) { - fd->read_closure->SetReady(exec_ctx); +static void fd_become_readable(grpc_fd* fd, grpc_pollset* notifier) { + fd->read_closure->SetReady(); /* Note, it is possible that fd_become_readable might be called twice with different 'notifier's when an fd becomes readable and it is in two epoll @@ -1121,39 +1113,34 @@ static void fd_become_readable(grpc_exec_ctx* exec_ctx, grpc_fd* fd, gpr_atm_rel_store(&fd->read_notifier_pollset, (gpr_atm)notifier); } -static void fd_become_writable(grpc_exec_ctx* exec_ctx, grpc_fd* fd) { - fd->write_closure->SetReady(exec_ctx); -} +static void fd_become_writable(grpc_fd* fd) { fd->write_closure->SetReady(); } -static void pollset_release_polling_island(grpc_exec_ctx* exec_ctx, - grpc_pollset* ps, +static void pollset_release_polling_island(grpc_pollset* ps, const char* reason) { if (ps->po.pi != nullptr) { - PI_UNREF(exec_ctx, ps->po.pi, reason); + PI_UNREF(ps->po.pi, reason); } ps->po.pi = nullptr; } -static void finish_shutdown_locked(grpc_exec_ctx* exec_ctx, - grpc_pollset* pollset) { +static void finish_shutdown_locked(grpc_pollset* pollset) { /* The pollset cannot have any workers if we are at this stage */ GPR_ASSERT(!pollset_has_workers(pollset)); pollset->finish_shutdown_called = true; /* Release the ref and set pollset->po.pi to NULL */ - pollset_release_polling_island(exec_ctx, pollset, "ps_shutdown"); - GRPC_CLOSURE_SCHED(exec_ctx, pollset->shutdown_done, GRPC_ERROR_NONE); + pollset_release_polling_island(pollset, "ps_shutdown"); + GRPC_CLOSURE_SCHED(pollset->shutdown_done, GRPC_ERROR_NONE); } /* pollset->po.mu lock must be held by the caller before calling this */ -static void pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - grpc_closure* closure) { +static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { GPR_TIMER_BEGIN("pollset_shutdown", 0); GPR_ASSERT(!pollset->shutting_down); pollset->shutting_down = true; pollset->shutdown_done = closure; - pollset_kick(exec_ctx, pollset, GRPC_POLLSET_KICK_BROADCAST); + pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); /* If the pollset has any workers, we cannot call finish_shutdown_locked() because it would release the underlying polling island. In such a case, we @@ -1161,7 +1148,7 @@ static void pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, if (!pollset_has_workers(pollset)) { GPR_ASSERT(!pollset->finish_shutdown_called); GPR_TIMER_MARK("pollset_shutdown.finish_shutdown_locked", 0); - finish_shutdown_locked(exec_ctx, pollset); + finish_shutdown_locked(pollset); } GPR_TIMER_END("pollset_shutdown", 0); } @@ -1169,15 +1156,14 @@ static void pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, /* pollset_shutdown is guaranteed to be called before pollset_destroy. So other * than destroying the mutexes, there is nothing special that needs to be done * here */ -static void pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset) { +static void pollset_destroy(grpc_pollset* pollset) { GPR_ASSERT(!pollset_has_workers(pollset)); gpr_mu_destroy(&pollset->po.mu); } #define GRPC_EPOLL_MAX_EVENTS 100 /* Note: sig_mask contains the signal mask to use *during* epoll_wait() */ -static void pollset_work_and_unlock(grpc_exec_ctx* exec_ctx, - grpc_pollset* pollset, +static void pollset_work_and_unlock(grpc_pollset* pollset, grpc_pollset_worker* worker, int timeout_ms, sigset_t* sig_mask, grpc_error** error) { struct epoll_event ep_ev[GRPC_EPOLL_MAX_EVENTS]; @@ -1199,7 +1185,7 @@ static void pollset_work_and_unlock(grpc_exec_ctx* exec_ctx, this function (i.e pollset_work_and_unlock()) is called */ if (pollset->po.pi == nullptr) { - pollset->po.pi = polling_island_create(exec_ctx, nullptr, error); + pollset->po.pi = polling_island_create(nullptr, error); if (pollset->po.pi == nullptr) { GPR_TIMER_END("pollset_work_and_unlock", 0); return; /* Fatal error. We cannot continue */ @@ -1219,7 +1205,7 @@ static void pollset_work_and_unlock(grpc_exec_ctx* exec_ctx, /* Always do PI_ADD_REF before PI_UNREF because PI_UNREF may cause the polling island to be deleted */ PI_ADD_REF(pi, "ps"); - PI_UNREF(exec_ctx, pollset->po.pi, "ps"); + PI_UNREF(pollset->po.pi, "ps"); pollset->po.pi = pi; } @@ -1233,10 +1219,10 @@ static void pollset_work_and_unlock(grpc_exec_ctx* exec_ctx, g_current_thread_polling_island = pi; GRPC_SCHEDULING_START_BLOCKING_REGION; - GRPC_STATS_INC_SYSCALL_POLL(exec_ctx); + GRPC_STATS_INC_SYSCALL_POLL(); ep_rv = epoll_pwait(epoll_fd, ep_ev, GRPC_EPOLL_MAX_EVENTS, timeout_ms, sig_mask); - GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(exec_ctx); + GRPC_SCHEDULING_END_BLOCKING_REGION; if (ep_rv < 0) { if (errno != EINTR) { gpr_asprintf(&err_msg, @@ -1274,10 +1260,10 @@ static void pollset_work_and_unlock(grpc_exec_ctx* exec_ctx, int read_ev = ep_ev[i].events & (EPOLLIN | EPOLLPRI); int write_ev = ep_ev[i].events & EPOLLOUT; if (read_ev || cancel) { - fd_become_readable(exec_ctx, fd, pollset); + fd_become_readable(fd, pollset); } if (write_ev || cancel) { - fd_become_writable(exec_ctx, fd); + fd_become_writable(fd); } } } @@ -1292,7 +1278,7 @@ static void pollset_work_and_unlock(grpc_exec_ctx* exec_ctx, that we got before releasing the polling island lock). This is because pollset->po.pi pointer might get udpated in other parts of the code when there is an island merge while we are doing epoll_wait() above */ - PI_UNREF(exec_ctx, pi, "ps_work"); + PI_UNREF(pi, "ps_work"); GPR_TIMER_END("pollset_work_and_unlock", 0); } @@ -1301,12 +1287,12 @@ static void pollset_work_and_unlock(grpc_exec_ctx* exec_ctx, The function pollset_work() may temporarily release the lock (pollset->po.mu) during the course of its execution but it will always re-acquire the lock and ensure that it is held by the time the function returns */ -static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, +static grpc_error* pollset_work(grpc_pollset* pollset, grpc_pollset_worker** worker_hdl, grpc_millis deadline) { GPR_TIMER_BEGIN("pollset_work", 0); grpc_error* error = GRPC_ERROR_NONE; - int timeout_ms = poll_deadline_to_millis_timeout(exec_ctx, deadline); + int timeout_ms = poll_deadline_to_millis_timeout(deadline); sigset_t new_mask; @@ -1364,9 +1350,9 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, push_front_worker(pollset, &worker); /* Add worker to pollset */ - pollset_work_and_unlock(exec_ctx, pollset, &worker, timeout_ms, - &g_orig_sigmask, &error); - grpc_exec_ctx_flush(exec_ctx); + pollset_work_and_unlock(pollset, &worker, timeout_ms, &g_orig_sigmask, + &error); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->po.mu); @@ -1386,10 +1372,10 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, if (pollset->shutting_down && !pollset_has_workers(pollset) && !pollset->finish_shutdown_called) { GPR_TIMER_MARK("pollset_work.finish_shutdown_locked", 0); - finish_shutdown_locked(exec_ctx, pollset); + finish_shutdown_locked(pollset); gpr_mu_unlock(&pollset->po.mu); - grpc_exec_ctx_flush(exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->po.mu); } @@ -1404,9 +1390,8 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, return error; } -static void add_poll_object(grpc_exec_ctx* exec_ctx, poll_obj* bag, - poll_obj_type bag_type, poll_obj* item, - poll_obj_type item_type) { +static void add_poll_object(poll_obj* bag, poll_obj_type bag_type, + poll_obj* item, poll_obj_type item_type) { GPR_TIMER_BEGIN("add_poll_object", 0); #ifndef NDEBUG @@ -1456,7 +1441,7 @@ retry: keeping TSAN happy outweigh any performance advantage we might have by keeping the lock held. */ gpr_mu_unlock(&item->mu); - pi_new = polling_island_create(exec_ctx, FD_FROM_PO(item), &error); + pi_new = polling_island_create(FD_FROM_PO(item), &error); gpr_mu_lock(&item->mu); /* Need to reverify any assumptions made between the initial lock and @@ -1475,11 +1460,11 @@ retry: /* 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"); + PI_UNREF(pi_new, "dance_of_destruction"); goto retry; } } else { - pi_new = polling_island_create(exec_ctx, nullptr, &error); + pi_new = polling_island_create(nullptr, &error); } GRPC_POLLING_TRACE( @@ -1533,7 +1518,7 @@ retry: if (item->pi != pi_new) { PI_ADD_REF(pi_new, poll_obj_string(item_type)); if (item->pi != nullptr) { - PI_UNREF(exec_ctx, item->pi, poll_obj_string(item_type)); + PI_UNREF(item->pi, poll_obj_string(item_type)); } item->pi = pi_new; } @@ -1541,7 +1526,7 @@ retry: if (bag->pi != pi_new) { PI_ADD_REF(pi_new, poll_obj_string(bag_type)); if (bag->pi != nullptr) { - PI_UNREF(exec_ctx, bag->pi, poll_obj_string(bag_type)); + PI_UNREF(bag->pi, poll_obj_string(bag_type)); } bag->pi = pi_new; } @@ -1553,10 +1538,8 @@ retry: GPR_TIMER_END("add_poll_object", 0); } -static void pollset_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - grpc_fd* fd) { - add_poll_object(exec_ctx, &pollset->po, POLL_OBJ_POLLSET, &fd->po, - POLL_OBJ_FD); +static void pollset_add_fd(grpc_pollset* pollset, grpc_fd* fd) { + add_poll_object(&pollset->po, POLL_OBJ_POLLSET, &fd->po, POLL_OBJ_FD); } /******************************************************************************* @@ -1573,48 +1556,39 @@ static grpc_pollset_set* pollset_set_create(void) { return pss; } -static void pollset_set_destroy(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pss) { +static void pollset_set_destroy(grpc_pollset_set* pss) { gpr_mu_destroy(&pss->po.mu); if (pss->po.pi != nullptr) { - PI_UNREF(exec_ctx, pss->po.pi, "pss_destroy"); + PI_UNREF(pss->po.pi, "pss_destroy"); } gpr_free(pss); } -static void pollset_set_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset_set* pss, - grpc_fd* fd) { - add_poll_object(exec_ctx, &pss->po, POLL_OBJ_POLLSET_SET, &fd->po, - POLL_OBJ_FD); +static void pollset_set_add_fd(grpc_pollset_set* pss, grpc_fd* fd) { + add_poll_object(&pss->po, POLL_OBJ_POLLSET_SET, &fd->po, POLL_OBJ_FD); } -static void pollset_set_del_fd(grpc_exec_ctx* exec_ctx, grpc_pollset_set* pss, - grpc_fd* fd) { +static void pollset_set_del_fd(grpc_pollset_set* pss, grpc_fd* fd) { /* Nothing to do */ } -static void pollset_set_add_pollset(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pss, grpc_pollset* ps) { - add_poll_object(exec_ctx, &pss->po, POLL_OBJ_POLLSET_SET, &ps->po, - POLL_OBJ_POLLSET); +static void pollset_set_add_pollset(grpc_pollset_set* pss, grpc_pollset* ps) { + add_poll_object(&pss->po, POLL_OBJ_POLLSET_SET, &ps->po, POLL_OBJ_POLLSET); } -static void pollset_set_del_pollset(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pss, grpc_pollset* ps) { +static void pollset_set_del_pollset(grpc_pollset_set* pss, grpc_pollset* ps) { /* Nothing to do */ } -static void pollset_set_add_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, +static void pollset_set_add_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item) { - add_poll_object(exec_ctx, &bag->po, POLL_OBJ_POLLSET_SET, &item->po, + add_poll_object(&bag->po, POLL_OBJ_POLLSET_SET, &item->po, POLL_OBJ_POLLSET_SET); } -static void pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, +static void pollset_set_del_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item) { /* Nothing to do */ } @@ -1760,7 +1734,7 @@ const grpc_event_engine_vtable* grpc_init_epollsig_linux( bool explicit_request) { gpr_log(GPR_ERROR, "Skipping epollsig becuase GRPC_LINUX_EPOLL is not defined."); - return NULL; + return nullptr; } #endif /* defined(GRPC_POSIX_SOCKET) */ diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index e32e1ba42a9..006e3ddd2f3 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -128,8 +128,7 @@ static uint32_t fd_begin_poll(grpc_fd* fd, grpc_pollset* pollset, MUST NOT be called with a pollset lock taken if got_read or got_write are 1, also does the become_{readable,writable} as appropriate. */ -static void fd_end_poll(grpc_exec_ctx* exec_ctx, grpc_fd_watcher* rec, - int got_read, int got_write, +static void fd_end_poll(grpc_fd_watcher* rec, int got_read, int got_write, grpc_pollset* read_notifier_pollset); /* Return 1 if this fd is orphaned, 0 otherwise */ @@ -186,11 +185,9 @@ struct grpc_pollset { }; /* Add an fd to a pollset */ -static void pollset_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - struct grpc_fd* fd); +static void pollset_add_fd(grpc_pollset* pollset, struct grpc_fd* fd); -static void pollset_set_add_fd(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, grpc_fd* fd); +static void pollset_set_add_fd(grpc_pollset_set* pollset_set, grpc_fd* fd); /* Convert a timespec to milliseconds: - very small or negative poll times are clamped to zero to do a @@ -199,8 +196,7 @@ static void pollset_set_add_fd(grpc_exec_ctx* exec_ctx, - longer than a millisecond polls are rounded up to the next nearest millisecond to avoid spinning - infinite timeouts are converted to -1 */ -static int poll_deadline_to_millis_timeout(grpc_exec_ctx* exec_ctx, - grpc_millis deadline); +static int poll_deadline_to_millis_timeout(grpc_millis deadline); /* Allow kick to wakeup the currently polling worker */ #define GRPC_POLLSET_CAN_KICK_SELF 1 @@ -208,7 +204,7 @@ static int poll_deadline_to_millis_timeout(grpc_exec_ctx* exec_ctx, #define GRPC_POLLSET_REEVALUATE_POLLING_ON_WAKEUP 2 /* As per pollset_kick, with an extended set of flags (defined above) -- mostly for fd_posix's use. */ -static grpc_error* pollset_kick_ext(grpc_exec_ctx* exec_ctx, grpc_pollset* p, +static grpc_error* pollset_kick_ext(grpc_pollset* p, grpc_pollset_worker* specific_worker, uint32_t flags) GRPC_MUST_USE_RESULT; @@ -353,8 +349,7 @@ static bool fd_is_orphaned(grpc_fd* fd) { } /* Return the read-notifier pollset */ -static grpc_pollset* fd_get_read_notifier_pollset(grpc_exec_ctx* exec_ctx, - grpc_fd* fd) { +static grpc_pollset* fd_get_read_notifier_pollset(grpc_fd* fd) { grpc_pollset* notifier = nullptr; gpr_mu_lock(&fd->mu); @@ -364,39 +359,36 @@ static grpc_pollset* fd_get_read_notifier_pollset(grpc_exec_ctx* exec_ctx, return notifier; } -static grpc_error* pollset_kick_locked(grpc_exec_ctx* exec_ctx, - grpc_fd_watcher* watcher) { +static grpc_error* pollset_kick_locked(grpc_fd_watcher* watcher) { gpr_mu_lock(&watcher->pollset->mu); GPR_ASSERT(watcher->worker); - grpc_error* err = - pollset_kick_ext(exec_ctx, watcher->pollset, watcher->worker, - GRPC_POLLSET_REEVALUATE_POLLING_ON_WAKEUP); + grpc_error* err = pollset_kick_ext(watcher->pollset, watcher->worker, + GRPC_POLLSET_REEVALUATE_POLLING_ON_WAKEUP); gpr_mu_unlock(&watcher->pollset->mu); return err; } -static void maybe_wake_one_watcher_locked(grpc_exec_ctx* exec_ctx, - grpc_fd* fd) { +static void maybe_wake_one_watcher_locked(grpc_fd* fd) { if (fd->inactive_watcher_root.next != &fd->inactive_watcher_root) { - pollset_kick_locked(exec_ctx, fd->inactive_watcher_root.next); + pollset_kick_locked(fd->inactive_watcher_root.next); } else if (fd->read_watcher) { - pollset_kick_locked(exec_ctx, fd->read_watcher); + pollset_kick_locked(fd->read_watcher); } else if (fd->write_watcher) { - pollset_kick_locked(exec_ctx, fd->write_watcher); + pollset_kick_locked(fd->write_watcher); } } -static void wake_all_watchers_locked(grpc_exec_ctx* exec_ctx, grpc_fd* fd) { +static void wake_all_watchers_locked(grpc_fd* fd) { grpc_fd_watcher* watcher; for (watcher = fd->inactive_watcher_root.next; watcher != &fd->inactive_watcher_root; watcher = watcher->next) { - pollset_kick_locked(exec_ctx, watcher); + pollset_kick_locked(watcher); } if (fd->read_watcher) { - pollset_kick_locked(exec_ctx, fd->read_watcher); + pollset_kick_locked(fd->read_watcher); } if (fd->write_watcher && fd->write_watcher != fd->read_watcher) { - pollset_kick_locked(exec_ctx, fd->write_watcher); + pollset_kick_locked(fd->write_watcher); } } @@ -405,12 +397,12 @@ static int has_watchers(grpc_fd* fd) { fd->inactive_watcher_root.next != &fd->inactive_watcher_root; } -static void close_fd_locked(grpc_exec_ctx* exec_ctx, grpc_fd* fd) { +static void close_fd_locked(grpc_fd* fd) { fd->closed = 1; if (!fd->released) { close(fd->fd); } - GRPC_CLOSURE_SCHED(exec_ctx, fd->on_done_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(fd->on_done_closure, GRPC_ERROR_NONE); } static int fd_wrapped_fd(grpc_fd* fd) { @@ -421,8 +413,7 @@ static int fd_wrapped_fd(grpc_fd* fd) { } } -static void fd_orphan(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_closure* on_done, int* release_fd, +static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, bool already_closed, const char* reason) { fd->on_done_closure = on_done; fd->released = release_fd != nullptr; @@ -435,9 +426,9 @@ static void fd_orphan(grpc_exec_ctx* exec_ctx, grpc_fd* fd, gpr_mu_lock(&fd->mu); REF_BY(fd, 1, reason); /* remove active status, but keep referenced */ if (!has_watchers(fd)) { - close_fd_locked(exec_ctx, fd); + close_fd_locked(fd); } else { - wake_all_watchers_locked(exec_ctx, fd); + wake_all_watchers_locked(fd); } gpr_mu_unlock(&fd->mu); UNREF_BY(fd, 2, reason); /* drop the reference */ @@ -469,10 +460,10 @@ static grpc_error* fd_shutdown_error(grpc_fd* fd) { } } -static void notify_on_locked(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_closure** st, grpc_closure* closure) { +static void notify_on_locked(grpc_fd* fd, grpc_closure** st, + grpc_closure* closure) { if (fd->shutdown) { - GRPC_CLOSURE_SCHED(exec_ctx, closure, + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_CREATE_FROM_STATIC_STRING("FD shutdown")); } else if (*st == CLOSURE_NOT_READY) { /* not ready ==> switch to a waiting state by setting the closure */ @@ -480,8 +471,8 @@ static void notify_on_locked(grpc_exec_ctx* exec_ctx, grpc_fd* fd, } else if (*st == CLOSURE_READY) { /* already ready ==> queue the closure to run immediately */ *st = CLOSURE_NOT_READY; - GRPC_CLOSURE_SCHED(exec_ctx, closure, fd_shutdown_error(fd)); - maybe_wake_one_watcher_locked(exec_ctx, fd); + GRPC_CLOSURE_SCHED(closure, fd_shutdown_error(fd)); + maybe_wake_one_watcher_locked(fd); } else { /* upcallptr was set to a different closure. This is an error! */ gpr_log(GPR_ERROR, @@ -492,8 +483,7 @@ static void notify_on_locked(grpc_exec_ctx* exec_ctx, grpc_fd* fd, } /* returns 1 if state becomes not ready */ -static int set_ready_locked(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_closure** st) { +static int set_ready_locked(grpc_fd* fd, grpc_closure** st) { if (*st == CLOSURE_READY) { /* duplicate ready ==> ignore */ return 0; @@ -503,18 +493,18 @@ static int set_ready_locked(grpc_exec_ctx* exec_ctx, grpc_fd* fd, return 0; } else { /* waiting ==> queue closure */ - GRPC_CLOSURE_SCHED(exec_ctx, *st, fd_shutdown_error(fd)); + GRPC_CLOSURE_SCHED(*st, fd_shutdown_error(fd)); *st = CLOSURE_NOT_READY; return 1; } } static void set_read_notifier_pollset_locked( - grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_pollset* read_notifier_pollset) { + grpc_fd* fd, grpc_pollset* read_notifier_pollset) { fd->read_notifier_pollset = read_notifier_pollset; } -static void fd_shutdown(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_error* why) { +static void fd_shutdown(grpc_fd* fd, grpc_error* why) { gpr_mu_lock(&fd->mu); /* only shutdown once */ if (!fd->shutdown) { @@ -522,8 +512,8 @@ static void fd_shutdown(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_error* why) { fd->shutdown_error = why; /* signal read/write closed to OS so that future operations fail */ shutdown(fd->fd, SHUT_RDWR); - set_ready_locked(exec_ctx, fd, &fd->read_closure); - set_ready_locked(exec_ctx, fd, &fd->write_closure); + set_ready_locked(fd, &fd->read_closure); + set_ready_locked(fd, &fd->write_closure); } else { GRPC_ERROR_UNREF(why); } @@ -537,17 +527,15 @@ static bool fd_is_shutdown(grpc_fd* fd) { return r; } -static void fd_notify_on_read(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_closure* closure) { +static void fd_notify_on_read(grpc_fd* fd, grpc_closure* closure) { gpr_mu_lock(&fd->mu); - notify_on_locked(exec_ctx, fd, &fd->read_closure, closure); + notify_on_locked(fd, &fd->read_closure, closure); gpr_mu_unlock(&fd->mu); } -static void fd_notify_on_write(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_closure* closure) { +static void fd_notify_on_write(grpc_fd* fd, grpc_closure* closure) { gpr_mu_lock(&fd->mu); - notify_on_locked(exec_ctx, fd, &fd->write_closure, closure); + notify_on_locked(fd, &fd->write_closure, closure); gpr_mu_unlock(&fd->mu); } @@ -602,8 +590,7 @@ static uint32_t fd_begin_poll(grpc_fd* fd, grpc_pollset* pollset, return mask; } -static void fd_end_poll(grpc_exec_ctx* exec_ctx, grpc_fd_watcher* watcher, - int got_read, int got_write, +static void fd_end_poll(grpc_fd_watcher* watcher, int got_read, int got_write, grpc_pollset* read_notifier_pollset) { int was_polling = 0; int kick = 0; @@ -637,23 +624,23 @@ static void fd_end_poll(grpc_exec_ctx* exec_ctx, grpc_fd_watcher* watcher, watcher->prev->next = watcher->next; } if (got_read) { - if (set_ready_locked(exec_ctx, fd, &fd->read_closure)) { + if (set_ready_locked(fd, &fd->read_closure)) { kick = 1; } if (read_notifier_pollset != nullptr) { - set_read_notifier_pollset_locked(exec_ctx, fd, read_notifier_pollset); + set_read_notifier_pollset_locked(fd, read_notifier_pollset); } } if (got_write) { - if (set_ready_locked(exec_ctx, fd, &fd->write_closure)) { + if (set_ready_locked(fd, &fd->write_closure)) { kick = 1; } } if (kick) { - maybe_wake_one_watcher_locked(exec_ctx, fd); + maybe_wake_one_watcher_locked(fd); } if (fd_is_orphaned(fd) && !has_watchers(fd) && !fd->closed) { - close_fd_locked(exec_ctx, fd); + close_fd_locked(fd); } gpr_mu_unlock(&fd->mu); @@ -714,12 +701,12 @@ static void kick_append_error(grpc_error** composite, grpc_error* error) { *composite = grpc_error_add_child(*composite, error); } -static grpc_error* pollset_kick_ext(grpc_exec_ctx* exec_ctx, grpc_pollset* p, +static grpc_error* pollset_kick_ext(grpc_pollset* p, grpc_pollset_worker* specific_worker, uint32_t flags) { GPR_TIMER_BEGIN("pollset_kick_ext", 0); grpc_error* error = GRPC_ERROR_NONE; - GRPC_STATS_INC_POLLSET_KICK(exec_ctx); + GRPC_STATS_INC_POLLSET_KICK(); /* pollset->mu already held */ if (specific_worker != nullptr) { @@ -785,9 +772,9 @@ static grpc_error* pollset_kick_ext(grpc_exec_ctx* exec_ctx, grpc_pollset* p, return error; } -static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* p, +static grpc_error* pollset_kick(grpc_pollset* p, grpc_pollset_worker* specific_worker) { - return pollset_kick_ext(exec_ctx, p, specific_worker, 0); + return pollset_kick_ext(p, specific_worker, 0); } /* global state management */ @@ -821,7 +808,7 @@ static void pollset_init(grpc_pollset* pollset, gpr_mu** mu) { pollset->pollset_set_count = 0; } -static void pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset) { +static void pollset_destroy(grpc_pollset* pollset) { GPR_ASSERT(!pollset_has_workers(pollset)); GPR_ASSERT(pollset->idle_jobs.head == pollset->idle_jobs.tail); while (pollset->local_wakeup_cache) { @@ -834,8 +821,7 @@ static void pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset) { gpr_mu_destroy(&pollset->mu); } -static void pollset_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - grpc_fd* fd) { +static void pollset_add_fd(grpc_pollset* pollset, grpc_fd* fd) { gpr_mu_lock(&pollset->mu); size_t i; /* TODO(ctiller): this is O(num_fds^2); maybe switch to a hash set here */ @@ -850,19 +836,19 @@ static void pollset_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, } pollset->fds[pollset->fd_count++] = fd; GRPC_FD_REF(fd, "multipoller"); - pollset_kick(exec_ctx, pollset, nullptr); + pollset_kick(pollset, nullptr); exit: gpr_mu_unlock(&pollset->mu); } -static void finish_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset) { +static void finish_shutdown(grpc_pollset* pollset) { GPR_ASSERT(grpc_closure_list_empty(pollset->idle_jobs)); size_t i; for (i = 0; i < pollset->fd_count; i++) { GRPC_FD_UNREF(pollset->fds[i], "multipoller"); } pollset->fd_count = 0; - GRPC_CLOSURE_SCHED(exec_ctx, pollset->shutdown_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(pollset->shutdown_done, GRPC_ERROR_NONE); } static void work_combine_error(grpc_error** composite, grpc_error* error) { @@ -873,7 +859,7 @@ static void work_combine_error(grpc_error** composite, grpc_error* error) { *composite = grpc_error_add_child(*composite, error); } -static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, +static grpc_error* pollset_work(grpc_pollset* pollset, grpc_pollset_worker** worker_hdl, grpc_millis deadline) { grpc_pollset_worker worker; @@ -912,7 +898,7 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, if (!pollset_has_workers(pollset) && !grpc_closure_list_empty(pollset->idle_jobs)) { GPR_TIMER_MARK("pollset_work.idle_jobs", 0); - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pollset->idle_jobs); + GRPC_CLOSURE_LIST_SCHED(&pollset->idle_jobs); goto done; } /* If we're shutting down then we don't execute any extended work */ @@ -944,7 +930,7 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, grpc_fd_watcher* watchers; struct pollfd* pfds; - timeout = poll_deadline_to_millis_timeout(exec_ctx, deadline); + timeout = poll_deadline_to_millis_timeout(deadline); if (pollset->fd_count + 2 <= inline_elements) { pfds = pollfd_space; @@ -988,9 +974,9 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, /* TODO(vpai): Consider first doing a 0 timeout poll here to avoid even going into the blocking annotation if possible */ GRPC_SCHEDULING_START_BLOCKING_REGION; - GRPC_STATS_INC_SYSCALL_POLL(exec_ctx); + GRPC_STATS_INC_SYSCALL_POLL(); r = grpc_poll_function(pfds, pfd_count, timeout); - GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(exec_ctx); + GRPC_SCHEDULING_END_BLOCKING_REGION; if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "%p poll=%d", pollset, r); @@ -1003,16 +989,16 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, for (i = 1; i < pfd_count; i++) { if (watchers[i].fd == nullptr) { - fd_end_poll(exec_ctx, &watchers[i], 0, 0, nullptr); + fd_end_poll(&watchers[i], 0, 0, nullptr); } else { // Wake up all the file descriptors, if we have an invalid one // we can identify it on the next pollset_work() - fd_end_poll(exec_ctx, &watchers[i], 1, 1, pollset); + fd_end_poll(&watchers[i], 1, 1, pollset); } } } else if (r == 0) { for (i = 1; i < pfd_count; i++) { - fd_end_poll(exec_ctx, &watchers[i], 0, 0, nullptr); + fd_end_poll(&watchers[i], 0, 0, nullptr); } } else { if (pfds[0].revents & POLLIN_CHECK) { @@ -1024,14 +1010,14 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, } for (i = 1; i < pfd_count; i++) { if (watchers[i].fd == nullptr) { - fd_end_poll(exec_ctx, &watchers[i], 0, 0, nullptr); + fd_end_poll(&watchers[i], 0, 0, nullptr); } else { if (grpc_polling_trace.enabled()) { gpr_log(GPR_DEBUG, "%p got_event: %d r:%d w:%d [%d]", pollset, pfds[i].fd, (pfds[i].revents & POLLIN_CHECK) != 0, (pfds[i].revents & POLLOUT_CHECK) != 0, pfds[i].revents); } - fd_end_poll(exec_ctx, &watchers[i], pfds[i].revents & POLLIN_CHECK, + fd_end_poll(&watchers[i], pfds[i].revents & POLLIN_CHECK, pfds[i].revents & POLLOUT_CHECK, pollset); } } @@ -1054,7 +1040,7 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, worker list, which means nobody could ask us to re-evaluate polling). */ done: if (!locked) { - queued_work |= grpc_exec_ctx_flush(exec_ctx); + queued_work |= grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->mu); locked = 1; } @@ -1083,21 +1069,21 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, /* check shutdown conditions */ if (pollset->shutting_down) { if (pollset_has_workers(pollset)) { - pollset_kick(exec_ctx, pollset, nullptr); + pollset_kick(pollset, nullptr); } else if (!pollset->called_shutdown && !pollset_has_observers(pollset)) { pollset->called_shutdown = 1; gpr_mu_unlock(&pollset->mu); - finish_shutdown(exec_ctx, pollset); - grpc_exec_ctx_flush(exec_ctx); + finish_shutdown(pollset); + grpc_core::ExecCtx::Get()->Flush(); /* Continuing to access pollset here is safe -- it is the caller's * responsibility to not destroy when it has outstanding calls to * pollset_work. * TODO(dklempner): Can we refactor the shutdown logic to avoid this? */ gpr_mu_lock(&pollset->mu); } else if (!grpc_closure_list_empty(pollset->idle_jobs)) { - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pollset->idle_jobs); + GRPC_CLOSURE_LIST_SCHED(&pollset->idle_jobs); gpr_mu_unlock(&pollset->mu); - grpc_exec_ctx_flush(exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&pollset->mu); } } @@ -1107,26 +1093,24 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, return error; } -static void pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - grpc_closure* closure) { +static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { GPR_ASSERT(!pollset->shutting_down); pollset->shutting_down = 1; pollset->shutdown_done = closure; - pollset_kick(exec_ctx, pollset, GRPC_POLLSET_KICK_BROADCAST); + pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); if (!pollset_has_workers(pollset)) { - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pollset->idle_jobs); + GRPC_CLOSURE_LIST_SCHED(&pollset->idle_jobs); } if (!pollset->called_shutdown && !pollset_has_observers(pollset)) { pollset->called_shutdown = 1; - finish_shutdown(exec_ctx, pollset); + finish_shutdown(pollset); } } -static int poll_deadline_to_millis_timeout(grpc_exec_ctx* exec_ctx, - grpc_millis deadline) { +static int poll_deadline_to_millis_timeout(grpc_millis deadline) { if (deadline == GRPC_MILLIS_INF_FUTURE) return -1; if (deadline == 0) return 0; - grpc_millis n = deadline - grpc_exec_ctx_now(exec_ctx); + grpc_millis n = deadline - grpc_core::ExecCtx::Get()->Now(); if (n < 0) return 0; if (n > INT_MAX) return -1; return (int)n; @@ -1143,8 +1127,7 @@ static grpc_pollset_set* pollset_set_create(void) { return pollset_set; } -static void pollset_set_destroy(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set) { +static void pollset_set_destroy(grpc_pollset_set* pollset_set) { size_t i; gpr_mu_destroy(&pollset_set->mu); for (i = 0; i < pollset_set->fd_count; i++) { @@ -1159,7 +1142,7 @@ static void pollset_set_destroy(grpc_exec_ctx* exec_ctx, !pollset_has_observers(pollset)) { pollset->called_shutdown = 1; gpr_mu_unlock(&pollset->mu); - finish_shutdown(exec_ctx, pollset); + finish_shutdown(pollset); } else { gpr_mu_unlock(&pollset->mu); } @@ -1170,8 +1153,7 @@ static void pollset_set_destroy(grpc_exec_ctx* exec_ctx, gpr_free(pollset_set); } -static void pollset_set_add_pollset(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, +static void pollset_set_add_pollset(grpc_pollset_set* pollset_set, grpc_pollset* pollset) { size_t i, j; gpr_mu_lock(&pollset->mu); @@ -1190,7 +1172,7 @@ static void pollset_set_add_pollset(grpc_exec_ctx* exec_ctx, if (fd_is_orphaned(pollset_set->fds[i])) { GRPC_FD_UNREF(pollset_set->fds[i], "pollset_set"); } else { - pollset_add_fd(exec_ctx, pollset, pollset_set->fds[i]); + pollset_add_fd(pollset, pollset_set->fds[i]); pollset_set->fds[j++] = pollset_set->fds[i]; } } @@ -1198,8 +1180,7 @@ static void pollset_set_add_pollset(grpc_exec_ctx* exec_ctx, gpr_mu_unlock(&pollset_set->mu); } -static void pollset_set_del_pollset(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, +static void pollset_set_del_pollset(grpc_pollset_set* pollset_set, grpc_pollset* pollset) { size_t i; gpr_mu_lock(&pollset_set->mu); @@ -1219,14 +1200,13 @@ static void pollset_set_del_pollset(grpc_exec_ctx* exec_ctx, !pollset_has_observers(pollset)) { pollset->called_shutdown = 1; gpr_mu_unlock(&pollset->mu); - finish_shutdown(exec_ctx, pollset); + finish_shutdown(pollset); } else { gpr_mu_unlock(&pollset->mu); } } -static void pollset_set_add_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, +static void pollset_set_add_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item) { size_t i, j; gpr_mu_lock(&bag->mu); @@ -1241,7 +1221,7 @@ static void pollset_set_add_pollset_set(grpc_exec_ctx* exec_ctx, if (fd_is_orphaned(bag->fds[i])) { GRPC_FD_UNREF(bag->fds[i], "pollset_set"); } else { - pollset_set_add_fd(exec_ctx, item, bag->fds[i]); + pollset_set_add_fd(item, bag->fds[i]); bag->fds[j++] = bag->fds[i]; } } @@ -1249,8 +1229,7 @@ static void pollset_set_add_pollset_set(grpc_exec_ctx* exec_ctx, gpr_mu_unlock(&bag->mu); } -static void pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, +static void pollset_set_del_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item) { size_t i; gpr_mu_lock(&bag->mu); @@ -1265,8 +1244,7 @@ static void pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx, gpr_mu_unlock(&bag->mu); } -static void pollset_set_add_fd(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, grpc_fd* fd) { +static void pollset_set_add_fd(grpc_pollset_set* pollset_set, grpc_fd* fd) { size_t i; gpr_mu_lock(&pollset_set->mu); if (pollset_set->fd_count == pollset_set->fd_capacity) { @@ -1277,16 +1255,15 @@ static void pollset_set_add_fd(grpc_exec_ctx* exec_ctx, GRPC_FD_REF(fd, "pollset_set"); pollset_set->fds[pollset_set->fd_count++] = fd; for (i = 0; i < pollset_set->pollset_count; i++) { - pollset_add_fd(exec_ctx, pollset_set->pollsets[i], fd); + pollset_add_fd(pollset_set->pollsets[i], fd); } for (i = 0; i < pollset_set->pollset_set_count; i++) { - pollset_set_add_fd(exec_ctx, pollset_set->pollset_sets[i], fd); + pollset_set_add_fd(pollset_set->pollset_sets[i], fd); } gpr_mu_unlock(&pollset_set->mu); } -static void pollset_set_del_fd(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, grpc_fd* fd) { +static void pollset_set_del_fd(grpc_pollset_set* pollset_set, grpc_fd* fd) { size_t i; gpr_mu_lock(&pollset_set->mu); for (i = 0; i < pollset_set->fd_count; i++) { @@ -1299,7 +1276,7 @@ static void pollset_set_del_fd(grpc_exec_ctx* exec_ctx, } } for (i = 0; i < pollset_set->pollset_set_count; i++) { - pollset_set_del_fd(exec_ctx, pollset_set->pollset_sets[i], fd); + pollset_set_del_fd(pollset_set->pollset_sets[i], fd); } gpr_mu_unlock(&pollset_set->mu); } diff --git a/src/core/lib/iomgr/ev_posix.cc b/src/core/lib/iomgr/ev_posix.cc index 031c97564a5..b516f93058a 100644 --- a/src/core/lib/iomgr/ev_posix.cc +++ b/src/core/lib/iomgr/ev_posix.cc @@ -46,7 +46,7 @@ grpc_poll_function_type grpc_poll_function = poll; grpc_wakeup_fd grpc_global_wakeup_fd; -static const grpc_event_engine_vtable* g_event_engine; +static const grpc_event_engine_vtable* g_event_engine = nullptr; static const char* g_poll_strategy_name = nullptr; typedef const grpc_event_engine_vtable* (*event_engine_factory_fn)( @@ -184,28 +184,25 @@ int grpc_fd_wrapped_fd(grpc_fd* fd) { return g_event_engine->fd_wrapped_fd(fd); } -void grpc_fd_orphan(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_closure* on_done, - int* release_fd, bool already_closed, const char* reason) { - g_event_engine->fd_orphan(exec_ctx, fd, on_done, release_fd, already_closed, - reason); +void grpc_fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, + bool already_closed, const char* reason) { + g_event_engine->fd_orphan(fd, on_done, release_fd, already_closed, reason); } -void grpc_fd_shutdown(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_error* why) { - g_event_engine->fd_shutdown(exec_ctx, fd, why); +void grpc_fd_shutdown(grpc_fd* fd, grpc_error* why) { + g_event_engine->fd_shutdown(fd, why); } bool grpc_fd_is_shutdown(grpc_fd* fd) { return g_event_engine->fd_is_shutdown(fd); } -void grpc_fd_notify_on_read(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_closure* closure) { - g_event_engine->fd_notify_on_read(exec_ctx, fd, closure); +void grpc_fd_notify_on_read(grpc_fd* fd, grpc_closure* closure) { + g_event_engine->fd_notify_on_read(fd, closure); } -void grpc_fd_notify_on_write(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_closure* closure) { - g_event_engine->fd_notify_on_write(exec_ctx, fd, closure); +void grpc_fd_notify_on_write(grpc_fd* fd, grpc_closure* closure) { + g_event_engine->fd_notify_on_write(fd, closure); } size_t grpc_pollset_size(void) { return g_event_engine->pollset_size; } @@ -214,72 +211,63 @@ void grpc_pollset_init(grpc_pollset* pollset, gpr_mu** mu) { g_event_engine->pollset_init(pollset, mu); } -void grpc_pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - grpc_closure* closure) { - g_event_engine->pollset_shutdown(exec_ctx, pollset, closure); +void grpc_pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { + g_event_engine->pollset_shutdown(pollset, closure); } -void grpc_pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset) { - g_event_engine->pollset_destroy(exec_ctx, pollset); +void grpc_pollset_destroy(grpc_pollset* pollset) { + g_event_engine->pollset_destroy(pollset); } -grpc_error* grpc_pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, +grpc_error* grpc_pollset_work(grpc_pollset* pollset, grpc_pollset_worker** worker, grpc_millis deadline) { - return g_event_engine->pollset_work(exec_ctx, pollset, worker, deadline); + return g_event_engine->pollset_work(pollset, worker, deadline); } -grpc_error* grpc_pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, +grpc_error* grpc_pollset_kick(grpc_pollset* pollset, grpc_pollset_worker* specific_worker) { - return g_event_engine->pollset_kick(exec_ctx, pollset, specific_worker); + return g_event_engine->pollset_kick(pollset, specific_worker); } -void grpc_pollset_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - struct grpc_fd* fd) { - g_event_engine->pollset_add_fd(exec_ctx, pollset, fd); +void grpc_pollset_add_fd(grpc_pollset* pollset, struct grpc_fd* fd) { + g_event_engine->pollset_add_fd(pollset, fd); } grpc_pollset_set* grpc_pollset_set_create(void) { return g_event_engine->pollset_set_create(); } -void grpc_pollset_set_destroy(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set) { - g_event_engine->pollset_set_destroy(exec_ctx, pollset_set); +void grpc_pollset_set_destroy(grpc_pollset_set* pollset_set) { + g_event_engine->pollset_set_destroy(pollset_set); } -void grpc_pollset_set_add_pollset(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, +void grpc_pollset_set_add_pollset(grpc_pollset_set* pollset_set, grpc_pollset* pollset) { - g_event_engine->pollset_set_add_pollset(exec_ctx, pollset_set, pollset); + g_event_engine->pollset_set_add_pollset(pollset_set, pollset); } -void grpc_pollset_set_del_pollset(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, +void grpc_pollset_set_del_pollset(grpc_pollset_set* pollset_set, grpc_pollset* pollset) { - g_event_engine->pollset_set_del_pollset(exec_ctx, pollset_set, pollset); + g_event_engine->pollset_set_del_pollset(pollset_set, pollset); } -void grpc_pollset_set_add_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, +void grpc_pollset_set_add_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item) { - g_event_engine->pollset_set_add_pollset_set(exec_ctx, bag, item); + g_event_engine->pollset_set_add_pollset_set(bag, item); } -void grpc_pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, +void grpc_pollset_set_del_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item) { - g_event_engine->pollset_set_del_pollset_set(exec_ctx, bag, item); + g_event_engine->pollset_set_del_pollset_set(bag, item); } -void grpc_pollset_set_add_fd(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, grpc_fd* fd) { - g_event_engine->pollset_set_add_fd(exec_ctx, pollset_set, fd); +void grpc_pollset_set_add_fd(grpc_pollset_set* pollset_set, grpc_fd* fd) { + g_event_engine->pollset_set_add_fd(pollset_set, fd); } -void grpc_pollset_set_del_fd(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, grpc_fd* fd) { - g_event_engine->pollset_set_del_fd(exec_ctx, pollset_set, fd); +void grpc_pollset_set_del_fd(grpc_pollset_set* pollset_set, grpc_fd* fd) { + g_event_engine->pollset_set_del_fd(pollset_set, fd); } #endif // GRPC_POSIX_SOCKET diff --git a/src/core/lib/iomgr/ev_posix.h b/src/core/lib/iomgr/ev_posix.h index 16fa10ca568..62f1162a23f 100644 --- a/src/core/lib/iomgr/ev_posix.h +++ b/src/core/lib/iomgr/ev_posix.h @@ -36,48 +36,36 @@ typedef struct grpc_event_engine_vtable { grpc_fd* (*fd_create)(int fd, const char* name); int (*fd_wrapped_fd)(grpc_fd* fd); - void (*fd_orphan)(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_closure* on_done, - int* release_fd, bool already_closed, const char* reason); - void (*fd_shutdown)(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_error* why); - void (*fd_notify_on_read)(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_closure* closure); - void (*fd_notify_on_write)(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_closure* closure); + void (*fd_orphan)(grpc_fd* fd, grpc_closure* on_done, int* release_fd, + bool already_closed, const char* reason); + void (*fd_shutdown)(grpc_fd* fd, grpc_error* why); + void (*fd_notify_on_read)(grpc_fd* fd, grpc_closure* closure); + void (*fd_notify_on_write)(grpc_fd* fd, grpc_closure* closure); bool (*fd_is_shutdown)(grpc_fd* fd); - grpc_pollset* (*fd_get_read_notifier_pollset)(grpc_exec_ctx* exec_ctx, - grpc_fd* fd); + grpc_pollset* (*fd_get_read_notifier_pollset)(grpc_fd* fd); void (*pollset_init)(grpc_pollset* pollset, gpr_mu** mu); - void (*pollset_shutdown)(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - grpc_closure* closure); - void (*pollset_destroy)(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset); - grpc_error* (*pollset_work)(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + void (*pollset_shutdown)(grpc_pollset* pollset, grpc_closure* closure); + void (*pollset_destroy)(grpc_pollset* pollset); + grpc_error* (*pollset_work)(grpc_pollset* pollset, grpc_pollset_worker** worker, grpc_millis deadline); - grpc_error* (*pollset_kick)(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_error* (*pollset_kick)(grpc_pollset* pollset, grpc_pollset_worker* specific_worker); - void (*pollset_add_fd)(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - struct grpc_fd* fd); + void (*pollset_add_fd)(grpc_pollset* pollset, struct grpc_fd* fd); grpc_pollset_set* (*pollset_set_create)(void); - void (*pollset_set_destroy)(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set); - void (*pollset_set_add_pollset)(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, + void (*pollset_set_destroy)(grpc_pollset_set* pollset_set); + void (*pollset_set_add_pollset)(grpc_pollset_set* pollset_set, grpc_pollset* pollset); - void (*pollset_set_del_pollset)(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, + void (*pollset_set_del_pollset)(grpc_pollset_set* pollset_set, grpc_pollset* pollset); - void (*pollset_set_add_pollset_set)(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, + void (*pollset_set_add_pollset_set)(grpc_pollset_set* bag, grpc_pollset_set* item); - void (*pollset_set_del_pollset_set)(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, + void (*pollset_set_del_pollset_set)(grpc_pollset_set* bag, grpc_pollset_set* item); - void (*pollset_set_add_fd)(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, grpc_fd* fd); - void (*pollset_set_del_fd)(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, grpc_fd* fd); + void (*pollset_set_add_fd)(grpc_pollset_set* pollset_set, grpc_fd* fd); + void (*pollset_set_del_fd)(grpc_pollset_set* pollset_set, grpc_fd* fd); void (*shutdown_engine)(void); } grpc_event_engine_vtable; @@ -103,14 +91,14 @@ int grpc_fd_wrapped_fd(grpc_fd* fd); Requires: *fd initialized; no outstanding notify_on_read or notify_on_write. MUST NOT be called with a pollset lock taken */ -void grpc_fd_orphan(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_closure* on_done, - int* release_fd, bool already_closed, const char* reason); +void grpc_fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, + bool already_closed, const char* reason); /* Has grpc_fd_shutdown been called on an fd? */ bool grpc_fd_is_shutdown(grpc_fd* fd); /* Cause any current and future callbacks to fail. */ -void grpc_fd_shutdown(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_error* why); +void grpc_fd_shutdown(grpc_fd* fd, grpc_error* why); /* Register read interest, causing read_cb to be called once when fd becomes readable, on deadline specified by deadline, or on shutdown triggered by @@ -125,29 +113,23 @@ void grpc_fd_shutdown(grpc_exec_ctx* exec_ctx, grpc_fd* fd, grpc_error* why); underlying platform. This means that users must drain fd in read_cb before calling notify_on_read again. Users are also expected to handle spurious events, i.e read_cb is called while nothing can be readable from fd */ -void grpc_fd_notify_on_read(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_closure* closure); +void grpc_fd_notify_on_read(grpc_fd* fd, grpc_closure* closure); /* Exactly the same semantics as above, except based on writable events. */ -void grpc_fd_notify_on_write(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - grpc_closure* closure); +void grpc_fd_notify_on_write(grpc_fd* fd, grpc_closure* closure); /* Return the read notifier pollset from the fd */ -grpc_pollset* grpc_fd_get_read_notifier_pollset(grpc_exec_ctx* exec_ctx, - grpc_fd* fd); +grpc_pollset* grpc_fd_get_read_notifier_pollset(grpc_fd* fd); /* pollset_posix functions */ /* Add an fd to a pollset */ -void grpc_pollset_add_fd(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - struct grpc_fd* fd); +void grpc_pollset_add_fd(grpc_pollset* pollset, struct grpc_fd* fd); /* pollset_set_posix functions */ -void grpc_pollset_set_add_fd(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, grpc_fd* fd); -void grpc_pollset_set_del_fd(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, grpc_fd* fd); +void grpc_pollset_set_add_fd(grpc_pollset_set* pollset_set, grpc_fd* fd); +void grpc_pollset_set_del_fd(grpc_pollset_set* pollset_set, grpc_fd* fd); /* override to allow tests to hook poll() usage */ typedef int (*grpc_poll_function_type)(struct pollfd*, nfds_t, int); diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index 17774563421..e005437e0a8 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -25,39 +25,7 @@ #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/profiling/timers.h" -bool grpc_exec_ctx_ready_to_finish(grpc_exec_ctx* exec_ctx) { - if ((exec_ctx->flags & GRPC_EXEC_CTX_FLAG_IS_FINISHED) == 0) { - if (exec_ctx->check_ready_to_finish(exec_ctx, - exec_ctx->check_ready_to_finish_arg)) { - exec_ctx->flags |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; - return true; - } - return false; - } else { - return true; - } -} - -bool grpc_never_ready_to_finish(grpc_exec_ctx* exec_ctx, void* arg_ignored) { - return false; -} - -bool grpc_always_ready_to_finish(grpc_exec_ctx* exec_ctx, void* arg_ignored) { - return true; -} - -bool grpc_exec_ctx_has_work(grpc_exec_ctx* exec_ctx) { - return exec_ctx->active_combiner != nullptr || - !grpc_closure_list_empty(exec_ctx->closure_list); -} - -void grpc_exec_ctx_finish(grpc_exec_ctx* exec_ctx) { - exec_ctx->flags |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; - grpc_exec_ctx_flush(exec_ctx); -} - -static void exec_ctx_run(grpc_exec_ctx* exec_ctx, grpc_closure* closure, - grpc_error* error) { +static void exec_ctx_run(grpc_closure* closure, grpc_error* error) { #ifndef NDEBUG closure->scheduled = false; if (grpc_trace_closure.enabled()) { @@ -67,7 +35,7 @@ static void exec_ctx_run(grpc_exec_ctx* exec_ctx, grpc_closure* closure, closure->line_initiated); } #endif - closure->cb(exec_ctx, closure->cb_arg, error); + closure->cb(closure->cb_arg, error); #ifndef NDEBUG if (grpc_trace_closure.enabled()) { gpr_log(GPR_DEBUG, "closure %p finished", closure); @@ -76,42 +44,13 @@ static void exec_ctx_run(grpc_exec_ctx* exec_ctx, grpc_closure* closure, GRPC_ERROR_UNREF(error); } -bool grpc_exec_ctx_flush(grpc_exec_ctx* exec_ctx) { - bool did_something = 0; - GPR_TIMER_BEGIN("grpc_exec_ctx_flush", 0); - for (;;) { - if (!grpc_closure_list_empty(exec_ctx->closure_list)) { - grpc_closure* c = exec_ctx->closure_list.head; - exec_ctx->closure_list.head = exec_ctx->closure_list.tail = nullptr; - while (c != nullptr) { - grpc_closure* next = c->next_data.next; - grpc_error* error = c->error_data.error; - did_something = true; - exec_ctx_run(exec_ctx, c, error); - c = next; - } - } else if (!grpc_combiner_continue_exec_ctx(exec_ctx)) { - break; - } - } - GPR_ASSERT(exec_ctx->active_combiner == nullptr); - GPR_TIMER_END("grpc_exec_ctx_flush", 0); - return did_something; -} - -static void exec_ctx_sched(grpc_exec_ctx* exec_ctx, grpc_closure* closure, - grpc_error* error) { - grpc_closure_list_append(&exec_ctx->closure_list, closure, error); +static void exec_ctx_sched(grpc_closure* closure, grpc_error* error) { + grpc_closure_list_append(grpc_core::ExecCtx::Get()->closure_list(), closure, + error); } static gpr_timespec g_start_time; -void grpc_exec_ctx_global_init(void) { - g_start_time = gpr_now(GPR_CLOCK_MONOTONIC); -} - -void grpc_exec_ctx_global_shutdown(void) {} - static gpr_atm timespec_to_atm_round_down(gpr_timespec ts) { ts = gpr_time_sub(ts, g_start_time); double x = @@ -131,18 +70,6 @@ static gpr_atm timespec_to_atm_round_up(gpr_timespec ts) { return (gpr_atm)x; } -grpc_millis grpc_exec_ctx_now(grpc_exec_ctx* exec_ctx) { - if (!exec_ctx->now_is_valid) { - exec_ctx->now = timespec_to_atm_round_down(gpr_now(GPR_CLOCK_MONOTONIC)); - exec_ctx->now_is_valid = true; - } - return exec_ctx->now; -} - -void grpc_exec_ctx_invalidate_now(grpc_exec_ctx* exec_ctx) { - exec_ctx->now_is_valid = false; -} - gpr_timespec grpc_millis_to_timespec(grpc_millis millis, gpr_clock_type clock_type) { // special-case infinities as grpc_millis can be 32bit on some platforms @@ -175,3 +102,44 @@ static const grpc_closure_scheduler_vtable exec_ctx_scheduler_vtable = { exec_ctx_run, exec_ctx_sched, "exec_ctx"}; static grpc_closure_scheduler exec_ctx_scheduler = {&exec_ctx_scheduler_vtable}; grpc_closure_scheduler* grpc_schedule_on_exec_ctx = &exec_ctx_scheduler; + +namespace grpc_core { +GPR_TLS_CLASS_DEF(ExecCtx::exec_ctx_); + +void ExecCtx::GlobalInit(void) { + g_start_time = gpr_now(GPR_CLOCK_MONOTONIC); + gpr_tls_init(&exec_ctx_); +} + +bool ExecCtx::Flush() { + bool did_something = 0; + GPR_TIMER_BEGIN("grpc_exec_ctx_flush", 0); + for (;;) { + if (!grpc_closure_list_empty(closure_list_)) { + grpc_closure* c = closure_list_.head; + closure_list_.head = closure_list_.tail = nullptr; + while (c != nullptr) { + grpc_closure* next = c->next_data.next; + grpc_error* error = c->error_data.error; + did_something = true; + exec_ctx_run(c, error); + c = next; + } + } else if (!grpc_combiner_continue_exec_ctx()) { + break; + } + } + GPR_ASSERT(combiner_data_.active_combiner == nullptr); + GPR_TIMER_END("grpc_exec_ctx_flush", 0); + return did_something; +} + +grpc_millis ExecCtx::Now() { + if (!now_is_valid_) { + now_ = timespec_to_atm_round_down(gpr_now(GPR_CLOCK_MONOTONIC)); + now_is_valid_ = true; + } + return now_; +} + +} // namespace grpc_core diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index b415d2c2556..b0c1740155f 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -21,6 +21,8 @@ #include #include +#include +#include #include "src/core/lib/iomgr/closure.h" @@ -41,6 +43,13 @@ typedef struct grpc_combiner grpc_combiner; should be given to not delete said call/channel from this exec_ctx */ #define GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP 2 +extern grpc_closure_scheduler* grpc_schedule_on_exec_ctx; + +gpr_timespec grpc_millis_to_timespec(grpc_millis millis, gpr_clock_type clock); +grpc_millis grpc_timespec_to_millis_round_down(gpr_timespec timespec); +grpc_millis grpc_timespec_to_millis_round_up(gpr_timespec timespec); + +namespace grpc_core { /** Execution context. * A bag of data that collects information along a callstack. * Generally created at public API entry points, and passed down as @@ -61,63 +70,130 @@ typedef struct grpc_combiner grpc_combiner; * - Instances are always passed as the first argument to a function that * takes it, and always as a pointer (grpc_exec_ctx is never copied). */ -struct grpc_exec_ctx { - grpc_closure_list closure_list; - /** currently active combiner: updated only via combiner.c */ - grpc_combiner* active_combiner; - /** last active combiner in the active combiner list */ - grpc_combiner* last_combiner; - uintptr_t flags; - unsigned starting_cpu; - void* check_ready_to_finish_arg; - bool (*check_ready_to_finish)(grpc_exec_ctx* exec_ctx, void* arg); - - bool now_is_valid; - grpc_millis now; -}; +class ExecCtx { + public: + /** Default Constructor */ + + ExecCtx() : flags_(GRPC_EXEC_CTX_FLAG_IS_FINISHED) { Set(this); } -/* initializer for grpc_exec_ctx: - prefer to use GRPC_EXEC_CTX_INIT whenever possible */ -#define GRPC_EXEC_CTX_INITIALIZER(flags, finish_check, finish_check_arg) \ - { \ - GRPC_CLOSURE_LIST_INIT, NULL, NULL, flags, gpr_cpu_current_cpu(), \ - finish_check_arg, finish_check, false, 0 \ + /** Parameterised Constructor */ + ExecCtx(uintptr_t fl) : flags_(fl) { Set(this); } + + /** Destructor */ + ~ExecCtx() { + flags_ |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; + Flush(); + Set(last_exec_ctx_); } -/* initialize an execution context at the top level of an API call into grpc - (this is safe to use elsewhere, though possibly not as efficient) */ -#define GRPC_EXEC_CTX_INIT \ - GRPC_EXEC_CTX_INITIALIZER(GRPC_EXEC_CTX_FLAG_IS_FINISHED, NULL, NULL) + /** Disallow copy and assignment operators */ + ExecCtx(const ExecCtx&) = delete; + ExecCtx& operator=(const ExecCtx&) = delete; -extern grpc_closure_scheduler* grpc_schedule_on_exec_ctx; + /** Return starting_cpu */ + unsigned starting_cpu() const { return starting_cpu_; } -bool grpc_exec_ctx_has_work(grpc_exec_ctx* exec_ctx); - -/** Flush any work that has been enqueued onto this grpc_exec_ctx. - * Caller must guarantee that no interfering locks are held. - * Returns true if work was performed, false otherwise. */ -bool grpc_exec_ctx_flush(grpc_exec_ctx* exec_ctx); -/** Finish any pending work for a grpc_exec_ctx. Must be called before - * the instance is destroyed, or work may be lost. */ -void grpc_exec_ctx_finish(grpc_exec_ctx* exec_ctx); -/** Returns true if we'd like to leave this execution context as soon as - possible: useful for deciding whether to do something more or not depending - on outside context */ -bool grpc_exec_ctx_ready_to_finish(grpc_exec_ctx* exec_ctx); -/** A finish check that is never ready to finish */ -bool grpc_never_ready_to_finish(grpc_exec_ctx* exec_ctx, void* arg_ignored); -/** A finish check that is always ready to finish */ -bool grpc_always_ready_to_finish(grpc_exec_ctx* exec_ctx, void* arg_ignored); - -void grpc_exec_ctx_global_init(void); - -void grpc_exec_ctx_global_init(void); -void grpc_exec_ctx_global_shutdown(void); - -grpc_millis grpc_exec_ctx_now(grpc_exec_ctx* exec_ctx); -void grpc_exec_ctx_invalidate_now(grpc_exec_ctx* exec_ctx); -gpr_timespec grpc_millis_to_timespec(grpc_millis millis, gpr_clock_type clock); -grpc_millis grpc_timespec_to_millis_round_down(gpr_timespec timespec); -grpc_millis grpc_timespec_to_millis_round_up(gpr_timespec timespec); + struct CombinerData { + /* currently active combiner: updated only via combiner.c */ + grpc_combiner* active_combiner; + /* last active combiner in the active combiner list */ + grpc_combiner* last_combiner; + }; + + /** Only to be used by grpc-combiner code */ + CombinerData* combiner_data() { return &combiner_data_; } + + /** Return pointer to grpc_closure_list */ + grpc_closure_list* closure_list() { return &closure_list_; } + + /** Return flags */ + uintptr_t flags() { return flags_; } + + /** Checks if there is work to be done */ + bool HasWork() { + return combiner_data_.active_combiner != NULL || + !grpc_closure_list_empty(closure_list_); + } + + /** Flush any work that has been enqueued onto this grpc_exec_ctx. + * Caller must guarantee that no interfering locks are held. + * Returns true if work was performed, false otherwise. */ + bool Flush(); + + /** Returns true if we'd like to leave this execution context as soon as +possible: useful for deciding whether to do something more or not depending +on outside context */ + bool IsReadyToFinish() { + if ((flags_ & GRPC_EXEC_CTX_FLAG_IS_FINISHED) == 0) { + if (CheckReadyToFinish()) { + flags_ |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; + return true; + } + return false; + } else { + return true; + } + } + + /** Returns the stored current time relative to start if valid, + * otherwise refreshes the stored time, sets it valid and returns the new + * value */ + grpc_millis Now(); + + /** Invalidates the stored time value. A new time value will be set on calling + * Now() */ + void InvalidateNow() { now_is_valid_ = false; } + + /** To be used only by shutdown code in iomgr */ + void SetNowIomgrShutdown() { + now_ = GRPC_MILLIS_INF_FUTURE; + now_is_valid_ = true; + } + + /** To be used only for testing. + * Sets the now value + */ + void TestOnlySetNow(grpc_millis new_val) { + now_ = new_val; + now_is_valid_ = true; + } + + /** Finish any pending work for a grpc_exec_ctx. Must be called before + * the instance is destroyed, or work may be lost. */ + void Finish(); + + /** Global initialization for ExecCtx. Called by iomgr */ + static void GlobalInit(void); + + /** Global shutdown for ExecCtx. Called by iomgr */ + static void GlobalShutdown(void) { gpr_tls_destroy(&exec_ctx_); } + + /** Gets pointer to current exec_ctx */ + static ExecCtx* Get() { + return reinterpret_cast(gpr_tls_get(&exec_ctx_)); + } + + protected: + /** Check if ready to finish */ + virtual bool CheckReadyToFinish() { return false; } + + private: + /** Set exec_ctx_ to exec_ctx */ + void Set(ExecCtx* exec_ctx) { + gpr_tls_set(&exec_ctx_, reinterpret_cast(exec_ctx)); + } + + grpc_closure_list closure_list_ = GRPC_CLOSURE_LIST_INIT; + CombinerData combiner_data_ = {nullptr, nullptr}; + uintptr_t flags_; + unsigned starting_cpu_ = gpr_cpu_current_cpu(); + + bool now_is_valid_ = false; + grpc_millis now_ = 0; + + GPR_TLS_CLASS_DECL(exec_ctx_); + ExecCtx* last_exec_ctx_ = Get(); +}; +} // namespace grpc_core #endif /* GRPC_CORE_LIB_IOMGR_EXEC_CTX_H */ diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index fabdbdf934f..b45223ce16d 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -55,7 +55,7 @@ grpc_core::TraceFlag executor_trace(false, "executor"); static void executor_thread(void* arg); -static size_t run_closures(grpc_exec_ctx* exec_ctx, grpc_closure_list list) { +static size_t run_closures(grpc_closure_list list) { size_t n = 0; grpc_closure* c = list.head; @@ -73,11 +73,11 @@ static size_t run_closures(grpc_exec_ctx* exec_ctx, grpc_closure_list list) { #ifndef NDEBUG c->scheduled = false; #endif - c->cb(exec_ctx, c->cb_arg, error); + c->cb(c->cb_arg, error); GRPC_ERROR_UNREF(error); c = next; n++; - grpc_exec_ctx_flush(exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); } return n; @@ -87,7 +87,7 @@ bool grpc_executor_is_threaded() { return gpr_atm_no_barrier_load(&g_cur_threads) > 0; } -void grpc_executor_set_threading(grpc_exec_ctx* exec_ctx, bool threading) { +void grpc_executor_set_threading(bool threading) { gpr_atm cur_threads = gpr_atm_no_barrier_load(&g_cur_threads); if (threading) { if (cur_threads > 0) return; @@ -125,28 +125,25 @@ void grpc_executor_set_threading(grpc_exec_ctx* exec_ctx, bool threading) { for (size_t i = 0; i < g_max_threads; i++) { gpr_mu_destroy(&g_thread_state[i].mu); gpr_cv_destroy(&g_thread_state[i].cv); - run_closures(exec_ctx, g_thread_state[i].elems); + run_closures(g_thread_state[i].elems); } gpr_free(g_thread_state); gpr_tls_destroy(&g_this_thread_state); } } -void grpc_executor_init(grpc_exec_ctx* exec_ctx) { +void grpc_executor_init() { gpr_atm_no_barrier_store(&g_cur_threads, 0); - grpc_executor_set_threading(exec_ctx, true); + grpc_executor_set_threading(true); } -void grpc_executor_shutdown(grpc_exec_ctx* exec_ctx) { - grpc_executor_set_threading(exec_ctx, false); -} +void grpc_executor_shutdown() { grpc_executor_set_threading(false); } static void executor_thread(void* arg) { thread_state* ts = (thread_state*)arg; gpr_tls_set(&g_this_thread_state, (intptr_t)ts); - grpc_exec_ctx exec_ctx = - GRPC_EXEC_CTX_INITIALIZER(0, grpc_never_ready_to_finish, nullptr); + grpc_core::ExecCtx exec_ctx(0); size_t subtract_depth = 0; for (;;) { @@ -168,7 +165,7 @@ static void executor_thread(void* arg) { gpr_mu_unlock(&ts->mu); break; } - GRPC_STATS_INC_EXECUTOR_QUEUE_DRAINED(&exec_ctx); + GRPC_STATS_INC_EXECUTOR_QUEUE_DRAINED(); grpc_closure_list exec = ts->elems; ts->elems = GRPC_CLOSURE_LIST_INIT; gpr_mu_unlock(&ts->mu); @@ -176,19 +173,18 @@ static void executor_thread(void* arg) { gpr_log(GPR_DEBUG, "EXECUTOR[%d]: execute", (int)(ts - g_thread_state)); } - grpc_exec_ctx_invalidate_now(&exec_ctx); - subtract_depth = run_closures(&exec_ctx, exec); + grpc_core::ExecCtx::Get()->InvalidateNow(); + subtract_depth = run_closures(exec); } - grpc_exec_ctx_finish(&exec_ctx); } -static void executor_push(grpc_exec_ctx* exec_ctx, grpc_closure* closure, - grpc_error* error, bool is_short) { +static void executor_push(grpc_closure* closure, grpc_error* error, + bool is_short) { bool retry_push; if (is_short) { - GRPC_STATS_INC_EXECUTOR_SCHEDULED_SHORT_ITEMS(exec_ctx); + GRPC_STATS_INC_EXECUTOR_SCHEDULED_SHORT_ITEMS(); } else { - GRPC_STATS_INC_EXECUTOR_SCHEDULED_LONG_ITEMS(exec_ctx); + GRPC_STATS_INC_EXECUTOR_SCHEDULED_LONG_ITEMS(); } do { retry_push = false; @@ -202,14 +198,16 @@ static void executor_push(grpc_exec_ctx* exec_ctx, grpc_closure* closure, gpr_log(GPR_DEBUG, "EXECUTOR: schedule %p inline", closure); #endif } - grpc_closure_list_append(&exec_ctx->closure_list, closure, error); + grpc_closure_list_append(grpc_core::ExecCtx::Get()->closure_list(), + closure, error); return; } thread_state* ts = (thread_state*)gpr_tls_get(&g_this_thread_state); if (ts == nullptr) { - ts = &g_thread_state[GPR_HASH_POINTER(exec_ctx, cur_thread_count)]; + ts = &g_thread_state[GPR_HASH_POINTER(grpc_core::ExecCtx::Get(), + cur_thread_count)]; } else { - GRPC_STATS_INC_EXECUTOR_SCHEDULED_TO_SELF(exec_ctx); + GRPC_STATS_INC_EXECUTOR_SCHEDULED_TO_SELF(); } thread_state* orig_ts = ts; @@ -245,7 +243,7 @@ static void executor_push(grpc_exec_ctx* exec_ctx, grpc_closure* closure, continue; } if (grpc_closure_list_empty(ts->elems)) { - GRPC_STATS_INC_EXECUTOR_WAKEUP_INITIATED(exec_ctx); + GRPC_STATS_INC_EXECUTOR_WAKEUP_INITIATED(); gpr_cv_signal(&ts->cv); } grpc_closure_list_append(&ts->elems, closure, error); @@ -269,19 +267,17 @@ static void executor_push(grpc_exec_ctx* exec_ctx, grpc_closure* closure, gpr_spinlock_unlock(&g_adding_thread_lock); } if (retry_push) { - GRPC_STATS_INC_EXECUTOR_PUSH_RETRIES(exec_ctx); + GRPC_STATS_INC_EXECUTOR_PUSH_RETRIES(); } } while (retry_push); } -static void executor_push_short(grpc_exec_ctx* exec_ctx, grpc_closure* closure, - grpc_error* error) { - executor_push(exec_ctx, closure, error, true); +static void executor_push_short(grpc_closure* closure, grpc_error* error) { + executor_push(closure, error, true); } -static void executor_push_long(grpc_exec_ctx* exec_ctx, grpc_closure* closure, - grpc_error* error) { - executor_push(exec_ctx, closure, error, false); +static void executor_push_long(grpc_closure* closure, grpc_error* error) { + executor_push(closure, error, false); } static const grpc_closure_scheduler_vtable executor_vtable_short = { diff --git a/src/core/lib/iomgr/executor.h b/src/core/lib/iomgr/executor.h index d349083eebe..e16f11aa215 100644 --- a/src/core/lib/iomgr/executor.h +++ b/src/core/lib/iomgr/executor.h @@ -31,18 +31,18 @@ typedef enum { * This mechanism is meant to outsource work (grpc_closure instances) to a * thread, for those cases where blocking isn't an option but there isn't a * non-blocking solution available. */ -void grpc_executor_init(grpc_exec_ctx* exec_ctx); +void grpc_executor_init(); grpc_closure_scheduler* grpc_executor_scheduler(grpc_executor_job_length); /** Shutdown the executor, running all pending work as part of the call */ -void grpc_executor_shutdown(grpc_exec_ctx* exec_ctx); +void grpc_executor_shutdown(); /** Is the executor multi-threaded? */ bool grpc_executor_is_threaded(); /* enable/disable threading - must be called after grpc_executor_init and before grpc_executor_shutdown */ -void grpc_executor_set_threading(grpc_exec_ctx* exec_ctx, bool enable); +void grpc_executor_set_threading(bool enable); #endif /* GRPC_CORE_LIB_IOMGR_EXECUTOR_H */ diff --git a/src/core/lib/iomgr/fork_posix.cc b/src/core/lib/iomgr/fork_posix.cc index f3cfd141b6a..cc131408af7 100644 --- a/src/core/lib/iomgr/fork_posix.cc +++ b/src/core/lib/iomgr/fork_posix.cc @@ -49,10 +49,10 @@ void grpc_prefork() { return; } if (grpc_is_initialized()) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_timer_manager_set_threading(false); - grpc_executor_set_threading(&exec_ctx, false); - grpc_exec_ctx_finish(&exec_ctx); + grpc_executor_set_threading(false); + grpc_core::ExecCtx::Get()->Flush(); if (!gpr_await_threads( gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_seconds(3, GPR_TIMESPAN)))) { @@ -64,18 +64,17 @@ void grpc_prefork() { void grpc_postfork_parent() { if (grpc_is_initialized()) { grpc_timer_manager_set_threading(true); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_executor_set_threading(&exec_ctx, true); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_executor_set_threading(true); } } void grpc_postfork_child() { if (grpc_is_initialized()) { grpc_timer_manager_set_threading(true); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_executor_set_threading(&exec_ctx, true); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_executor_set_threading(true); + grpc_core::ExecCtx::Get()->Flush(); } } diff --git a/src/core/lib/iomgr/iocp_windows.cc b/src/core/lib/iomgr/iocp_windows.cc index 6bbe5669c7c..0b6e6823b3f 100644 --- a/src/core/lib/iomgr/iocp_windows.cc +++ b/src/core/lib/iomgr/iocp_windows.cc @@ -42,20 +42,18 @@ static gpr_atm g_custom_events = 0; static HANDLE g_iocp; -static DWORD deadline_to_millis_timeout(grpc_exec_ctx* exec_ctx, - grpc_millis deadline) { +static DWORD deadline_to_millis_timeout(grpc_millis deadline) { if (deadline == GRPC_MILLIS_INF_FUTURE) { return INFINITE; } - grpc_millis now = grpc_exec_ctx_now(exec_ctx); + grpc_millis now = grpc_core::ExecCtx::Get()->Now(); if (deadline < now) return 0; grpc_millis timeout = deadline - now; if (timeout > std::numeric_limits::max()) return INFINITE; return static_cast(deadline - now); } -grpc_iocp_work_status grpc_iocp_work(grpc_exec_ctx* exec_ctx, - grpc_millis deadline) { +grpc_iocp_work_status grpc_iocp_work(grpc_millis deadline) { BOOL success; DWORD bytes = 0; DWORD flags = 0; @@ -63,11 +61,11 @@ grpc_iocp_work_status grpc_iocp_work(grpc_exec_ctx* exec_ctx, LPOVERLAPPED overlapped; grpc_winsocket* socket; grpc_winsocket_callback_info* info; - GRPC_STATS_INC_SYSCALL_POLL(exec_ctx); + GRPC_STATS_INC_SYSCALL_POLL(); success = GetQueuedCompletionStatus(g_iocp, &bytes, &completion_key, &overlapped, - deadline_to_millis_timeout(exec_ctx, deadline)); - grpc_exec_ctx_invalidate_now(exec_ctx); + deadline_to_millis_timeout(deadline)); + grpc_core::ExecCtx::Get()->InvalidateNow(); if (success == 0 && overlapped == NULL) { return GRPC_IOCP_WORK_TIMEOUT; } @@ -95,7 +93,7 @@ grpc_iocp_work_status grpc_iocp_work(grpc_exec_ctx* exec_ctx, info->bytes_transfered = bytes; info->wsa_error = success ? 0 : WSAGetLastError(); GPR_ASSERT(overlapped == &info->overlapped); - grpc_socket_become_ready(exec_ctx, socket, info); + grpc_socket_become_ready(socket, info); return GRPC_IOCP_WORK_WORK; } @@ -115,22 +113,22 @@ void grpc_iocp_kick(void) { } void grpc_iocp_flush(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_iocp_work_status work_status; do { - work_status = grpc_iocp_work(&exec_ctx, GRPC_MILLIS_INF_PAST); + work_status = grpc_iocp_work(GRPC_MILLIS_INF_PAST); } while (work_status == GRPC_IOCP_WORK_KICK || - grpc_exec_ctx_flush(&exec_ctx)); + grpc_core::ExecCtx::Get()->Flush()); } void grpc_iocp_shutdown(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (gpr_atm_acq_load(&g_custom_events)) { - grpc_iocp_work(&exec_ctx, GRPC_MILLIS_INF_FUTURE); - grpc_exec_ctx_flush(&exec_ctx); + grpc_iocp_work(GRPC_MILLIS_INF_FUTURE); + grpc_core::ExecCtx::Get()->Flush(); } - grpc_exec_ctx_finish(&exec_ctx); + GPR_ASSERT(CloseHandle(g_iocp)); } diff --git a/src/core/lib/iomgr/iocp_windows.h b/src/core/lib/iomgr/iocp_windows.h index 0e9c3481f7e..75b0ff4a922 100644 --- a/src/core/lib/iomgr/iocp_windows.h +++ b/src/core/lib/iomgr/iocp_windows.h @@ -33,8 +33,7 @@ typedef enum { GRPC_IOCP_WORK_KICK } grpc_iocp_work_status; -grpc_iocp_work_status grpc_iocp_work(grpc_exec_ctx* exec_ctx, - grpc_millis deadline); +grpc_iocp_work_status grpc_iocp_work(grpc_millis deadline); void grpc_iocp_init(void); void grpc_iocp_kick(void); void grpc_iocp_flush(void); diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index e077b35014f..dacf08ea9eb 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -45,20 +45,20 @@ static gpr_cv g_rcv; static int g_shutdown; static grpc_iomgr_object g_root_object; -void grpc_iomgr_init(grpc_exec_ctx* exec_ctx) { +void grpc_iomgr_init() { + grpc_core::ExecCtx exec_ctx; g_shutdown = 0; gpr_mu_init(&g_mu); gpr_cv_init(&g_rcv); - grpc_exec_ctx_global_init(); - grpc_executor_init(exec_ctx); - grpc_timer_list_init(exec_ctx); + grpc_executor_init(); + grpc_timer_list_init(); g_root_object.next = g_root_object.prev = &g_root_object; g_root_object.name = (char*)"root"; grpc_network_status_init(); grpc_iomgr_platform_init(); } -void grpc_iomgr_start(grpc_exec_ctx* exec_ctx) { grpc_timer_manager_init(); } +void grpc_iomgr_start() { grpc_timer_manager_init(); } static size_t count_objects(void) { grpc_iomgr_object* obj; @@ -76,75 +76,76 @@ static void dump_objects(const char* kind) { } } -void grpc_iomgr_shutdown(grpc_exec_ctx* exec_ctx) { +void grpc_iomgr_shutdown() { gpr_timespec shutdown_deadline = gpr_time_add( gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_seconds(10, GPR_TIMESPAN)); gpr_timespec last_warning_time = gpr_now(GPR_CLOCK_REALTIME); - grpc_timer_manager_shutdown(); - grpc_iomgr_platform_flush(); - grpc_executor_shutdown(exec_ctx); - - gpr_mu_lock(&g_mu); - g_shutdown = 1; - while (g_root_object.next != &g_root_object) { - if (gpr_time_cmp( - gpr_time_sub(gpr_now(GPR_CLOCK_REALTIME), last_warning_time), - gpr_time_from_seconds(1, GPR_TIMESPAN)) >= 0) { - if (g_root_object.next != &g_root_object) { - gpr_log(GPR_DEBUG, - "Waiting for %" PRIuPTR " iomgr objects to be destroyed", - count_objects()); + { + grpc_timer_manager_shutdown(); + grpc_iomgr_platform_flush(); + grpc_executor_shutdown(); + + gpr_mu_lock(&g_mu); + g_shutdown = 1; + while (g_root_object.next != &g_root_object) { + if (gpr_time_cmp( + gpr_time_sub(gpr_now(GPR_CLOCK_REALTIME), last_warning_time), + gpr_time_from_seconds(1, GPR_TIMESPAN)) >= 0) { + if (g_root_object.next != &g_root_object) { + gpr_log(GPR_DEBUG, + "Waiting for %" PRIuPTR " iomgr objects to be destroyed", + count_objects()); + } + last_warning_time = gpr_now(GPR_CLOCK_REALTIME); } - last_warning_time = gpr_now(GPR_CLOCK_REALTIME); - } - exec_ctx->now_is_valid = true; - exec_ctx->now = GRPC_MILLIS_INF_FUTURE; - if (grpc_timer_check(exec_ctx, nullptr) == GRPC_TIMERS_FIRED) { - gpr_mu_unlock(&g_mu); - grpc_exec_ctx_flush(exec_ctx); - grpc_iomgr_platform_flush(); - gpr_mu_lock(&g_mu); - continue; - } - if (g_root_object.next != &g_root_object) { - if (grpc_iomgr_abort_on_leaks()) { - gpr_log(GPR_DEBUG, - "Failed to free %" PRIuPTR - " iomgr objects before shutdown deadline: " - "memory leaks are likely", - count_objects()); - dump_objects("LEAKED"); - abort(); + grpc_core::ExecCtx::Get()->SetNowIomgrShutdown(); + if (grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED) { + gpr_mu_unlock(&g_mu); + grpc_core::ExecCtx::Get()->Flush(); + grpc_iomgr_platform_flush(); + gpr_mu_lock(&g_mu); + continue; } - gpr_timespec short_deadline = gpr_time_add( - gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_millis(100, GPR_TIMESPAN)); - if (gpr_cv_wait(&g_rcv, &g_mu, short_deadline)) { - if (gpr_time_cmp(gpr_now(GPR_CLOCK_REALTIME), shutdown_deadline) > 0) { - if (g_root_object.next != &g_root_object) { - gpr_log(GPR_DEBUG, - "Failed to free %" PRIuPTR - " iomgr objects before shutdown deadline: " - "memory leaks are likely", - count_objects()); - dump_objects("LEAKED"); + if (g_root_object.next != &g_root_object) { + if (grpc_iomgr_abort_on_leaks()) { + gpr_log(GPR_DEBUG, + "Failed to free %" PRIuPTR + " iomgr objects before shutdown deadline: " + "memory leaks are likely", + count_objects()); + dump_objects("LEAKED"); + abort(); + } + gpr_timespec short_deadline = + gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), + gpr_time_from_millis(100, GPR_TIMESPAN)); + if (gpr_cv_wait(&g_rcv, &g_mu, short_deadline)) { + if (gpr_time_cmp(gpr_now(GPR_CLOCK_REALTIME), shutdown_deadline) > + 0) { + if (g_root_object.next != &g_root_object) { + gpr_log(GPR_DEBUG, + "Failed to free %" PRIuPTR + " iomgr objects before shutdown deadline: " + "memory leaks are likely", + count_objects()); + dump_objects("LEAKED"); + } + break; } - break; } } } + gpr_mu_unlock(&g_mu); + grpc_timer_list_shutdown(); + grpc_core::ExecCtx::Get()->Flush(); } - gpr_mu_unlock(&g_mu); - - grpc_timer_list_shutdown(exec_ctx); - grpc_exec_ctx_flush(exec_ctx); /* ensure all threads have left g_mu */ gpr_mu_lock(&g_mu); gpr_mu_unlock(&g_mu); grpc_iomgr_platform_shutdown(); - grpc_exec_ctx_global_shutdown(); grpc_network_status_shutdown(); gpr_mu_destroy(&g_mu); gpr_cv_destroy(&g_rcv); diff --git a/src/core/lib/iomgr/iomgr.h b/src/core/lib/iomgr/iomgr.h index 2f00c0343de..3f238c660a7 100644 --- a/src/core/lib/iomgr/iomgr.h +++ b/src/core/lib/iomgr/iomgr.h @@ -23,13 +23,13 @@ #include "src/core/lib/iomgr/port.h" /** Initializes the iomgr. */ -void grpc_iomgr_init(grpc_exec_ctx* exec_ctx); +void grpc_iomgr_init(); /** Starts any background threads for iomgr. */ -void grpc_iomgr_start(grpc_exec_ctx* exec_ctx); +void grpc_iomgr_start(); /** Signals the intention to shutdown the iomgr. Expects to be able to flush * exec_ctx. */ -void grpc_iomgr_shutdown(grpc_exec_ctx* exec_ctx); +void grpc_iomgr_shutdown(); #endif /* GRPC_CORE_LIB_IOMGR_IOMGR_H */ diff --git a/src/core/lib/iomgr/iomgr_uv.cc b/src/core/lib/iomgr/iomgr_uv.cc index b8a10f2ae88..9614c2e664a 100644 --- a/src/core/lib/iomgr/iomgr_uv.cc +++ b/src/core/lib/iomgr/iomgr_uv.cc @@ -29,12 +29,11 @@ gpr_thd_id g_init_thread; void grpc_iomgr_platform_init(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_pollset_global_init(); - grpc_executor_set_threading(&exec_ctx, false); + grpc_executor_set_threading(false); g_init_thread = gpr_thd_currentid(); - grpc_exec_ctx_finish(&exec_ctx); } void grpc_iomgr_platform_flush(void) {} void grpc_iomgr_platform_shutdown(void) { grpc_pollset_global_shutdown(); } diff --git a/src/core/lib/iomgr/lockfree_event.cc b/src/core/lib/iomgr/lockfree_event.cc index f0e798e8d8a..7b194e3db5f 100644 --- a/src/core/lib/iomgr/lockfree_event.cc +++ b/src/core/lib/iomgr/lockfree_event.cc @@ -85,7 +85,7 @@ void LockfreeEvent::DestroyEvent() { kShutdownBit /* shutdown, no error */)); } -void LockfreeEvent::NotifyOn(grpc_exec_ctx* exec_ctx, grpc_closure* closure) { +void LockfreeEvent::NotifyOn(grpc_closure* closure) { while (true) { gpr_atm curr = gpr_atm_no_barrier_load(&state_); if (grpc_polling_trace.enabled()) { @@ -118,7 +118,7 @@ void LockfreeEvent::NotifyOn(grpc_exec_ctx* exec_ctx, grpc_closure* closure) { closure when transitioning out of CLOSURE_NO_READY state (i.e there is no other code that needs to 'happen-after' this) */ if (gpr_atm_no_barrier_cas(&state_, kClosureReady, kClosureNotReady)) { - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); return; /* Successful. Return */ } @@ -131,7 +131,7 @@ void LockfreeEvent::NotifyOn(grpc_exec_ctx* exec_ctx, grpc_closure* closure) { schedule the closure with the shutdown error */ if ((curr & kShutdownBit) > 0) { grpc_error* shutdown_err = (grpc_error*)(curr & ~kShutdownBit); - GRPC_CLOSURE_SCHED(exec_ctx, closure, + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "FD Shutdown", &shutdown_err, 1)); return; @@ -149,8 +149,7 @@ void LockfreeEvent::NotifyOn(grpc_exec_ctx* exec_ctx, grpc_closure* closure) { GPR_UNREACHABLE_CODE(return ); } -bool LockfreeEvent::SetShutdown(grpc_exec_ctx* exec_ctx, - grpc_error* shutdown_err) { +bool LockfreeEvent::SetShutdown(grpc_error* shutdown_err) { gpr_atm new_state = (gpr_atm)shutdown_err | kShutdownBit; while (true) { @@ -184,7 +183,7 @@ bool LockfreeEvent::SetShutdown(grpc_exec_ctx* exec_ctx, happens-after on that edge), and a release to pair with anything loading the shutdown state. */ if (gpr_atm_full_cas(&state_, curr, new_state)) { - GRPC_CLOSURE_SCHED(exec_ctx, (grpc_closure*)curr, + GRPC_CLOSURE_SCHED((grpc_closure*)curr, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "FD Shutdown", &shutdown_err, 1)); return true; @@ -200,7 +199,7 @@ bool LockfreeEvent::SetShutdown(grpc_exec_ctx* exec_ctx, GPR_UNREACHABLE_CODE(return false); } -void LockfreeEvent::SetReady(grpc_exec_ctx* exec_ctx) { +void LockfreeEvent::SetReady() { while (true) { gpr_atm curr = gpr_atm_no_barrier_load(&state_); @@ -234,7 +233,7 @@ void LockfreeEvent::SetReady(grpc_exec_ctx* exec_ctx) { spurious set_ready; release pairs with this or the acquire in notify_on (or set_shutdown) */ else if (gpr_atm_full_cas(&state_, curr, kClosureNotReady)) { - GRPC_CLOSURE_SCHED(exec_ctx, (grpc_closure*)curr, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED((grpc_closure*)curr, GRPC_ERROR_NONE); return; } /* else the state changed again (only possible by either a racing diff --git a/src/core/lib/iomgr/lockfree_event.h b/src/core/lib/iomgr/lockfree_event.h index aec67a3399a..3bd3fd72f1a 100644 --- a/src/core/lib/iomgr/lockfree_event.h +++ b/src/core/lib/iomgr/lockfree_event.h @@ -44,9 +44,9 @@ class LockfreeEvent { return (gpr_atm_no_barrier_load(&state_) & kShutdownBit) != 0; } - void NotifyOn(grpc_exec_ctx* exec_ctx, grpc_closure* closure); - bool SetShutdown(grpc_exec_ctx* exec_ctx, grpc_error* error); - void SetReady(grpc_exec_ctx* exec_ctx); + void NotifyOn(grpc_closure* closure); + bool SetShutdown(grpc_error* error); + void SetReady(); private: enum State { kClosureNotReady = 0, kClosureReady = 2, kShutdownBit = 1 }; diff --git a/src/core/lib/iomgr/polling_entity.cc b/src/core/lib/iomgr/polling_entity.cc index 0ee4ea1255b..126f6f45d6e 100644 --- a/src/core/lib/iomgr/polling_entity.cc +++ b/src/core/lib/iomgr/polling_entity.cc @@ -56,32 +56,28 @@ bool grpc_polling_entity_is_empty(const grpc_polling_entity* pollent) { return pollent->tag == GRPC_POLLS_NONE; } -void grpc_polling_entity_add_to_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_polling_entity* pollent, +void grpc_polling_entity_add_to_pollset_set(grpc_polling_entity* pollent, grpc_pollset_set* pss_dst) { if (pollent->tag == GRPC_POLLS_POLLSET) { GPR_ASSERT(pollent->pollent.pollset != nullptr); - grpc_pollset_set_add_pollset(exec_ctx, pss_dst, pollent->pollent.pollset); + grpc_pollset_set_add_pollset(pss_dst, pollent->pollent.pollset); } else if (pollent->tag == GRPC_POLLS_POLLSET_SET) { GPR_ASSERT(pollent->pollent.pollset_set != nullptr); - grpc_pollset_set_add_pollset_set(exec_ctx, pss_dst, - pollent->pollent.pollset_set); + grpc_pollset_set_add_pollset_set(pss_dst, pollent->pollent.pollset_set); } else { gpr_log(GPR_ERROR, "Invalid grpc_polling_entity tag '%d'", pollent->tag); abort(); } } -void grpc_polling_entity_del_from_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_polling_entity* pollent, +void grpc_polling_entity_del_from_pollset_set(grpc_polling_entity* pollent, grpc_pollset_set* pss_dst) { if (pollent->tag == GRPC_POLLS_POLLSET) { GPR_ASSERT(pollent->pollent.pollset != nullptr); - grpc_pollset_set_del_pollset(exec_ctx, pss_dst, pollent->pollent.pollset); + grpc_pollset_set_del_pollset(pss_dst, pollent->pollent.pollset); } else if (pollent->tag == GRPC_POLLS_POLLSET_SET) { GPR_ASSERT(pollent->pollent.pollset_set != nullptr); - grpc_pollset_set_del_pollset_set(exec_ctx, pss_dst, - pollent->pollent.pollset_set); + grpc_pollset_set_del_pollset_set(pss_dst, pollent->pollent.pollset_set); } else { gpr_log(GPR_ERROR, "Invalid grpc_polling_entity tag '%d'", pollent->tag); abort(); diff --git a/src/core/lib/iomgr/polling_entity.h b/src/core/lib/iomgr/polling_entity.h index dbe579e60d9..0102d32c11d 100644 --- a/src/core/lib/iomgr/polling_entity.h +++ b/src/core/lib/iomgr/polling_entity.h @@ -55,14 +55,12 @@ bool grpc_polling_entity_is_empty(const grpc_polling_entity* pollent); /** Add the pollset or pollset_set in \a pollent to the destination pollset_set * \a * pss_dst */ -void grpc_polling_entity_add_to_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_polling_entity* pollent, +void grpc_polling_entity_add_to_pollset_set(grpc_polling_entity* pollent, grpc_pollset_set* pss_dst); /** Delete the pollset or pollset_set in \a pollent from the destination * pollset_set \a * pss_dst */ -void grpc_polling_entity_del_from_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_polling_entity* pollent, +void grpc_polling_entity_del_from_pollset_set(grpc_polling_entity* pollent, grpc_pollset_set* pss_dst); #endif /* GRPC_CORE_LIB_IOMGR_POLLING_ENTITY_H */ diff --git a/src/core/lib/iomgr/pollset.h b/src/core/lib/iomgr/pollset.h index d5d78f3101f..6bb3cd3e0c0 100644 --- a/src/core/lib/iomgr/pollset.h +++ b/src/core/lib/iomgr/pollset.h @@ -42,9 +42,8 @@ size_t grpc_pollset_size(void); void grpc_pollset_init(grpc_pollset* pollset, gpr_mu** mu); /* Begin shutting down the pollset, and call closure when done. * pollset's mutex must be held */ -void grpc_pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - grpc_closure* closure); -void grpc_pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset); +void grpc_pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure); +void grpc_pollset_destroy(grpc_pollset* pollset); /* Do some work on a pollset. May involve invoking asynchronous callbacks, or actually polling file @@ -68,13 +67,13 @@ void grpc_pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset); May call grpc_closure_list_run on grpc_closure_list, without holding the pollset lock */ -grpc_error* grpc_pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, +grpc_error* grpc_pollset_work(grpc_pollset* pollset, grpc_pollset_worker** worker, grpc_millis deadline) GRPC_MUST_USE_RESULT; /* Break one polling thread out of polling work for this pollset. If specific_worker is non-NULL, then kick that worker. */ -grpc_error* grpc_pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, +grpc_error* grpc_pollset_kick(grpc_pollset* pollset, grpc_pollset_worker* specific_worker) GRPC_MUST_USE_RESULT; diff --git a/src/core/lib/iomgr/pollset_set.h b/src/core/lib/iomgr/pollset_set.h index 089c15cc949..a94d0afe757 100644 --- a/src/core/lib/iomgr/pollset_set.h +++ b/src/core/lib/iomgr/pollset_set.h @@ -29,19 +29,14 @@ typedef struct grpc_pollset_set grpc_pollset_set; grpc_pollset_set* grpc_pollset_set_create(void); -void grpc_pollset_set_destroy(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set); -void grpc_pollset_set_add_pollset(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, +void grpc_pollset_set_destroy(grpc_pollset_set* pollset_set); +void grpc_pollset_set_add_pollset(grpc_pollset_set* pollset_set, grpc_pollset* pollset); -void grpc_pollset_set_del_pollset(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, +void grpc_pollset_set_del_pollset(grpc_pollset_set* pollset_set, grpc_pollset* pollset); -void grpc_pollset_set_add_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, +void grpc_pollset_set_add_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item); -void grpc_pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, +void grpc_pollset_set_del_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item); #endif /* GRPC_CORE_LIB_IOMGR_POLLSET_SET_H */ diff --git a/src/core/lib/iomgr/pollset_set_uv.cc b/src/core/lib/iomgr/pollset_set_uv.cc index 90186edbb73..ac5dade8a50 100644 --- a/src/core/lib/iomgr/pollset_set_uv.cc +++ b/src/core/lib/iomgr/pollset_set_uv.cc @@ -26,23 +26,18 @@ grpc_pollset_set* grpc_pollset_set_create(void) { return (grpc_pollset_set*)((intptr_t)0xdeafbeef); } -void grpc_pollset_set_destroy(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set) {} +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, +void grpc_pollset_set_add_pollset(grpc_pollset_set* pollset_set, grpc_pollset* pollset) {} -void grpc_pollset_set_del_pollset(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, +void grpc_pollset_set_del_pollset(grpc_pollset_set* pollset_set, grpc_pollset* pollset) {} -void grpc_pollset_set_add_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, +void grpc_pollset_set_add_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item) {} -void grpc_pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, +void grpc_pollset_set_del_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item) {} #endif /* GRPC_UV */ diff --git a/src/core/lib/iomgr/pollset_set_windows.cc b/src/core/lib/iomgr/pollset_set_windows.cc index 2105a47ad47..85edc9dee12 100644 --- a/src/core/lib/iomgr/pollset_set_windows.cc +++ b/src/core/lib/iomgr/pollset_set_windows.cc @@ -27,23 +27,18 @@ grpc_pollset_set* grpc_pollset_set_create(void) { return (grpc_pollset_set*)((intptr_t)0xdeafbeef); } -void grpc_pollset_set_destroy(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set) {} +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, +void grpc_pollset_set_add_pollset(grpc_pollset_set* pollset_set, grpc_pollset* pollset) {} -void grpc_pollset_set_del_pollset(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* pollset_set, +void grpc_pollset_set_del_pollset(grpc_pollset_set* pollset_set, grpc_pollset* pollset) {} -void grpc_pollset_set_add_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, +void grpc_pollset_set_add_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item) {} -void grpc_pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_pollset_set* bag, +void grpc_pollset_set_del_pollset_set(grpc_pollset_set* bag, grpc_pollset_set* item) {} #endif /* GRPC_WINSOCK_SOCKET */ diff --git a/src/core/lib/iomgr/pollset_uv.cc b/src/core/lib/iomgr/pollset_uv.cc index 16132f3a809..d9e5ad81be4 100644 --- a/src/core/lib/iomgr/pollset_uv.cc +++ b/src/core/lib/iomgr/pollset_uv.cc @@ -88,8 +88,7 @@ void grpc_pollset_init(grpc_pollset* pollset, gpr_mu** mu) { pollset->shutting_down = 0; } -void grpc_pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - grpc_closure* closure) { +void grpc_pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { GPR_ASSERT(!pollset->shutting_down); GRPC_UV_ASSERT_SAME_THREAD(); pollset->shutting_down = 1; @@ -100,10 +99,10 @@ void grpc_pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, // kick the loop once uv_timer_start(dummy_uv_handle, dummy_timer_cb, 0, 0); } - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); } -void grpc_pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset) { +void grpc_pollset_destroy(grpc_pollset* pollset) { GRPC_UV_ASSERT_SAME_THREAD(); uv_close((uv_handle_t*)pollset->timer, timer_close_cb); // timer.data is a boolean indicating that the timer has finished closing @@ -115,14 +114,14 @@ void grpc_pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset) { } } -grpc_error* grpc_pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, +grpc_error* grpc_pollset_work(grpc_pollset* pollset, grpc_pollset_worker** worker_hdl, grpc_millis deadline) { uint64_t timeout; GRPC_UV_ASSERT_SAME_THREAD(); gpr_mu_unlock(&grpc_polling_mu); if (grpc_pollset_work_run_loop) { - grpc_millis now = grpc_exec_ctx_now(exec_ctx); + grpc_millis now = grpc_core::ExecCtx::Get()->Now(); if (deadline >= now) { timeout = deadline - now; } else { @@ -140,14 +139,14 @@ grpc_error* grpc_pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, uv_run(uv_default_loop(), UV_RUN_NOWAIT); } } - if (!grpc_closure_list_empty(exec_ctx->closure_list)) { - grpc_exec_ctx_flush(exec_ctx); + if (!grpc_closure_list_empty(*grpc_core::ExecCtx::Get()->closure_list())) { + grpc_core::ExecCtx::Get()->Flush(); } gpr_mu_lock(&grpc_polling_mu); return GRPC_ERROR_NONE; } -grpc_error* grpc_pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, +grpc_error* grpc_pollset_kick(grpc_pollset* pollset, grpc_pollset_worker* specific_worker) { GRPC_UV_ASSERT_SAME_THREAD(); uv_timer_start(dummy_uv_handle, dummy_timer_cb, 0, 0); diff --git a/src/core/lib/iomgr/pollset_windows.cc b/src/core/lib/iomgr/pollset_windows.cc index 95dd7d7ddda..6ef949aad70 100644 --- a/src/core/lib/iomgr/pollset_windows.cc +++ b/src/core/lib/iomgr/pollset_windows.cc @@ -92,20 +92,19 @@ void grpc_pollset_init(grpc_pollset* pollset, gpr_mu** mu) { &pollset->root_worker; } -void grpc_pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - grpc_closure* closure) { +void grpc_pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { pollset->shutting_down = 1; - grpc_pollset_kick(exec_ctx, pollset, GRPC_POLLSET_KICK_BROADCAST); + grpc_pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); if (!pollset->is_iocp_worker) { - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); } else { pollset->on_shutdown = closure; } } -void grpc_pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset) {} +void grpc_pollset_destroy(grpc_pollset* pollset) {} -grpc_error* grpc_pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, +grpc_error* grpc_pollset_work(grpc_pollset* pollset, grpc_pollset_worker** worker_hdl, grpc_millis deadline) { grpc_pollset_worker worker; @@ -126,8 +125,8 @@ grpc_error* grpc_pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, pollset->is_iocp_worker = 1; g_active_poller = &worker; gpr_mu_unlock(&grpc_polling_mu); - grpc_iocp_work(exec_ctx, deadline); - grpc_exec_ctx_flush(exec_ctx); + grpc_iocp_work(deadline); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&grpc_polling_mu); pollset->is_iocp_worker = 0; g_active_poller = NULL; @@ -145,7 +144,7 @@ grpc_error* grpc_pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, } if (pollset->shutting_down && pollset->on_shutdown != NULL) { - GRPC_CLOSURE_SCHED(exec_ctx, pollset->on_shutdown, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(pollset->on_shutdown, GRPC_ERROR_NONE); pollset->on_shutdown = NULL; } goto done; @@ -158,18 +157,18 @@ grpc_error* grpc_pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, while (!worker.kicked) { if (gpr_cv_wait(&worker.cv, &grpc_polling_mu, grpc_millis_to_timespec(deadline, GPR_CLOCK_REALTIME))) { - grpc_exec_ctx_invalidate_now(exec_ctx); + grpc_core::ExecCtx::Get()->InvalidateNow(); break; } - grpc_exec_ctx_invalidate_now(exec_ctx); + grpc_core::ExecCtx::Get()->InvalidateNow(); } } else { pollset->kicked_without_pollers = 0; } done: - if (!grpc_closure_list_empty(exec_ctx->closure_list)) { + if (!grpc_closure_list_empty(*grpc_core::ExecCtx::Get()->closure_list())) { gpr_mu_unlock(&grpc_polling_mu); - grpc_exec_ctx_flush(exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&grpc_polling_mu); } if (added_worker) { @@ -181,7 +180,7 @@ done: return GRPC_ERROR_NONE; } -grpc_error* grpc_pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* p, +grpc_error* grpc_pollset_kick(grpc_pollset* p, grpc_pollset_worker* specific_worker) { if (specific_worker != NULL) { if (specific_worker == GRPC_POLLSET_KICK_BROADCAST) { @@ -209,7 +208,7 @@ grpc_error* grpc_pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* p, specific_worker = pop_front_worker(&p->root_worker, GRPC_POLLSET_WORKER_LINK_POLLSET); if (specific_worker != NULL) { - grpc_pollset_kick(exec_ctx, p, specific_worker); + grpc_pollset_kick(p, specific_worker); } else if (p->is_iocp_worker) { grpc_iocp_kick(); } else { diff --git a/src/core/lib/iomgr/resolve_address.h b/src/core/lib/iomgr/resolve_address.h index 5105020404b..12fc2ed088f 100644 --- a/src/core/lib/iomgr/resolve_address.h +++ b/src/core/lib/iomgr/resolve_address.h @@ -38,8 +38,7 @@ typedef struct { /* Asynchronously resolve addr. Use default_port if a port isn't designated in addr, otherwise use the port in addr. */ /* TODO(ctiller): add a timeout here */ -extern void (*grpc_resolve_address)(grpc_exec_ctx* exec_ctx, const char* addr, - const char* default_port, +extern void (*grpc_resolve_address)(const char* addr, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addresses); diff --git a/src/core/lib/iomgr/resolve_address_posix.cc b/src/core/lib/iomgr/resolve_address_posix.cc index fb5fa9d4226..cc3d4fd7cfa 100644 --- a/src/core/lib/iomgr/resolve_address_posix.cc +++ b/src/core/lib/iomgr/resolve_address_posix.cc @@ -42,6 +42,7 @@ static grpc_error* blocking_resolve_address_impl( const char* name, const char* default_port, grpc_resolved_addresses** addresses) { + grpc_core::ExecCtx exec_ctx; struct addrinfo hints; struct addrinfo *result = nullptr, *resp; char* host; @@ -81,7 +82,7 @@ static grpc_error* blocking_resolve_address_impl( GRPC_SCHEDULING_START_BLOCKING_REGION; s = getaddrinfo(host, port, &hints, &result); - GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX; + GRPC_SCHEDULING_END_BLOCKING_REGION; if (s != 0) { /* Retry if well-known service name is recognized */ @@ -90,7 +91,7 @@ static grpc_error* blocking_resolve_address_impl( if (strcmp(port, svc[i][0]) == 0) { GRPC_SCHEDULING_START_BLOCKING_REGION; s = getaddrinfo(host, svc[i][1], &hints, &result); - GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX; + GRPC_SCHEDULING_END_BLOCKING_REGION; break; } } @@ -152,12 +153,10 @@ typedef struct { /* Callback to be passed to grpc_executor to asynch-ify * grpc_blocking_resolve_address */ -static void do_request_thread(grpc_exec_ctx* exec_ctx, void* rp, - grpc_error* error) { +static void do_request_thread(void* rp, grpc_error* error) { request* r = (request*)rp; - GRPC_CLOSURE_SCHED( - exec_ctx, r->on_done, - grpc_blocking_resolve_address(r->name, r->default_port, r->addrs_out)); + GRPC_CLOSURE_SCHED(r->on_done, grpc_blocking_resolve_address( + r->name, r->default_port, r->addrs_out)); gpr_free(r->name); gpr_free(r->default_port); gpr_free(r); @@ -170,8 +169,7 @@ void grpc_resolved_addresses_destroy(grpc_resolved_addresses* addrs) { gpr_free(addrs); } -static void resolve_address_impl(grpc_exec_ctx* exec_ctx, const char* name, - const char* default_port, +static void resolve_address_impl(const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addrs) { @@ -182,11 +180,11 @@ static void resolve_address_impl(grpc_exec_ctx* exec_ctx, const char* name, r->default_port = gpr_strdup(default_port); r->on_done = on_done; r->addrs_out = addrs; - GRPC_CLOSURE_SCHED(exec_ctx, &r->request_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&r->request_closure, GRPC_ERROR_NONE); } void (*grpc_resolve_address)( - grpc_exec_ctx* exec_ctx, const char* name, const char* default_port, + const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addrs) = resolve_address_impl; diff --git a/src/core/lib/iomgr/resolve_address_uv.cc b/src/core/lib/iomgr/resolve_address_uv.cc index 6d09fd1d022..3eab04f3de0 100644 --- a/src/core/lib/iomgr/resolve_address_uv.cc +++ b/src/core/lib/iomgr/resolve_address_uv.cc @@ -114,7 +114,7 @@ static grpc_error* handle_addrinfo_result(int status, struct addrinfo* result, 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_core::ExecCtx exec_ctx; grpc_error* error; int retry_status; char* port = r->port; @@ -130,8 +130,8 @@ static void getaddrinfo_callback(uv_getaddrinfo_t* req, int status, /* Either no retry was attempted, or the retry failed. Either way, the original error probably has more interesting information */ error = handle_addrinfo_result(status, res, r->addresses); - GRPC_CLOSURE_SCHED(&exec_ctx, r->on_done, error); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_CLOSURE_SCHED(r->on_done, error); + gpr_free(r->hints); gpr_free(r->host); gpr_free(r->port); @@ -224,8 +224,7 @@ void grpc_resolved_addresses_destroy(grpc_resolved_addresses* addrs) { gpr_free(addrs); } -static void resolve_address_impl(grpc_exec_ctx* exec_ctx, const char* name, - const char* default_port, +static void resolve_address_impl(const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addrs) { @@ -239,7 +238,7 @@ static void resolve_address_impl(grpc_exec_ctx* exec_ctx, const char* name, GRPC_UV_ASSERT_SAME_THREAD(); err = try_split_host_port(name, default_port, &host, &port); if (err != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(exec_ctx, on_done, err); + GRPC_CLOSURE_SCHED(on_done, err); gpr_free(host); gpr_free(port); return; @@ -268,7 +267,7 @@ static void resolve_address_impl(grpc_exec_ctx* exec_ctx, const char* name, err = GRPC_ERROR_CREATE_FROM_STATIC_STRING("getaddrinfo failed"); err = grpc_error_set_str(err, GRPC_ERROR_STR_OS_ERROR, grpc_slice_from_static_string(uv_strerror(s))); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, err); + GRPC_CLOSURE_SCHED(on_done, err); gpr_free(r); gpr_free(req); gpr_free(hints); @@ -278,7 +277,7 @@ static void resolve_address_impl(grpc_exec_ctx* exec_ctx, const char* name, } void (*grpc_resolve_address)( - grpc_exec_ctx* exec_ctx, const char* name, const char* default_port, + const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addrs) = resolve_address_impl; diff --git a/src/core/lib/iomgr/resolve_address_windows.cc b/src/core/lib/iomgr/resolve_address_windows.cc index d9fc17a9f40..ccb1dae689c 100644 --- a/src/core/lib/iomgr/resolve_address_windows.cc +++ b/src/core/lib/iomgr/resolve_address_windows.cc @@ -51,6 +51,7 @@ typedef struct { static grpc_error* blocking_resolve_address_impl( const char* name, const char* default_port, grpc_resolved_addresses** addresses) { + grpc_core::ExecCtx exec_ctx; struct addrinfo hints; struct addrinfo *result = NULL, *resp; char* host; @@ -87,7 +88,7 @@ static grpc_error* blocking_resolve_address_impl( GRPC_SCHEDULING_START_BLOCKING_REGION; s = getaddrinfo(host, port, &hints, &result); - GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX; + GRPC_SCHEDULING_END_BLOCKING_REGION; if (s != 0) { error = GRPC_WSA_ERROR(WSAGetLastError(), "getaddrinfo"); goto done; @@ -132,8 +133,7 @@ grpc_error* (*grpc_blocking_resolve_address)( /* Callback to be passed to grpc_executor to asynch-ify * grpc_blocking_resolve_address */ -static void do_request_thread(grpc_exec_ctx* exec_ctx, void* rp, - grpc_error* error) { +static void do_request_thread(void* rp, grpc_error* error) { request* r = (request*)rp; if (error == GRPC_ERROR_NONE) { error = @@ -141,7 +141,7 @@ static void do_request_thread(grpc_exec_ctx* exec_ctx, void* rp, } else { GRPC_ERROR_REF(error); } - GRPC_CLOSURE_SCHED(exec_ctx, r->on_done, error); + GRPC_CLOSURE_SCHED(r->on_done, error); gpr_free(r->name); gpr_free(r->default_port); gpr_free(r); @@ -154,8 +154,7 @@ void grpc_resolved_addresses_destroy(grpc_resolved_addresses* addrs) { gpr_free(addrs); } -static void resolve_address_impl(grpc_exec_ctx* exec_ctx, const char* name, - const char* default_port, +static void resolve_address_impl(const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addresses) { @@ -166,11 +165,11 @@ static void resolve_address_impl(grpc_exec_ctx* exec_ctx, const char* name, r->default_port = gpr_strdup(default_port); r->on_done = on_done; r->addresses = addresses; - GRPC_CLOSURE_SCHED(exec_ctx, &r->request_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&r->request_closure, GRPC_ERROR_NONE); } void (*grpc_resolve_address)( - grpc_exec_ctx* exec_ctx, const char* name, const char* default_port, + const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addresses) = resolve_address_impl; diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc index ccd8d9f379c..cabe28e4e6d 100644 --- a/src/core/lib/iomgr/resource_quota.cc +++ b/src/core/lib/iomgr/resource_quota.cc @@ -154,8 +154,7 @@ struct grpc_resource_quota { char* name; }; -static void ru_unref_by(grpc_exec_ctx* exec_ctx, - grpc_resource_user* resource_user, gpr_atm amount); +static void ru_unref_by(grpc_resource_user* resource_user, gpr_atm amount); /******************************************************************************* * list management @@ -239,35 +238,31 @@ static void rulist_remove(grpc_resource_user* resource_user, grpc_rulist list) { * resource quota state machine */ -static bool rq_alloc(grpc_exec_ctx* exec_ctx, - grpc_resource_quota* resource_quota); +static bool rq_alloc(grpc_resource_quota* resource_quota); static bool rq_reclaim_from_per_user_free_pool( - grpc_exec_ctx* exec_ctx, grpc_resource_quota* resource_quota); -static bool rq_reclaim(grpc_exec_ctx* exec_ctx, - grpc_resource_quota* resource_quota, bool destructive); + grpc_resource_quota* resource_quota); +static bool rq_reclaim(grpc_resource_quota* resource_quota, bool destructive); -static void rq_step(grpc_exec_ctx* exec_ctx, void* rq, grpc_error* error) { +static void rq_step(void* rq, grpc_error* error) { grpc_resource_quota* resource_quota = (grpc_resource_quota*)rq; resource_quota->step_scheduled = false; do { - if (rq_alloc(exec_ctx, resource_quota)) goto done; - } while (rq_reclaim_from_per_user_free_pool(exec_ctx, resource_quota)); + if (rq_alloc(resource_quota)) goto done; + } while (rq_reclaim_from_per_user_free_pool(resource_quota)); - if (!rq_reclaim(exec_ctx, resource_quota, false)) { - rq_reclaim(exec_ctx, resource_quota, true); + if (!rq_reclaim(resource_quota, false)) { + rq_reclaim(resource_quota, true); } done: - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); } -static void rq_step_sched(grpc_exec_ctx* exec_ctx, - grpc_resource_quota* resource_quota) { +static void rq_step_sched(grpc_resource_quota* resource_quota) { if (resource_quota->step_scheduled) return; resource_quota->step_scheduled = true; grpc_resource_quota_ref_internal(resource_quota); - GRPC_CLOSURE_SCHED(exec_ctx, &resource_quota->rq_step_closure, - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&resource_quota->rq_step_closure, GRPC_ERROR_NONE); } /* update the atomically available resource estimate - use no barriers since @@ -286,8 +281,7 @@ static void rq_update_estimate(grpc_resource_quota* resource_quota) { } /* returns true if all allocations are completed */ -static bool rq_alloc(grpc_exec_ctx* exec_ctx, - grpc_resource_quota* resource_quota) { +static bool rq_alloc(grpc_resource_quota* resource_quota) { grpc_resource_user* resource_user; while ((resource_user = rulist_pop_head(resource_quota, GRPC_RULIST_AWAITING_ALLOCATION))) { @@ -307,9 +301,9 @@ static bool rq_alloc(grpc_exec_ctx* exec_ctx, int64_t aborted_allocations = resource_user->outstanding_allocations; resource_user->outstanding_allocations = 0; resource_user->free_pool += aborted_allocations; - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &resource_user->on_allocated); + GRPC_CLOSURE_LIST_SCHED(&resource_user->on_allocated); gpr_mu_unlock(&resource_user->mu); - ru_unref_by(exec_ctx, resource_user, (gpr_atm)aborted_allocations); + ru_unref_by(resource_user, (gpr_atm)aborted_allocations); continue; } if (resource_user->free_pool < 0 && @@ -333,7 +327,7 @@ static bool rq_alloc(grpc_exec_ctx* exec_ctx, if (resource_user->free_pool >= 0) { resource_user->allocating = false; resource_user->outstanding_allocations = 0; - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &resource_user->on_allocated); + GRPC_CLOSURE_LIST_SCHED(&resource_user->on_allocated); gpr_mu_unlock(&resource_user->mu); } else { rulist_add_head(resource_user, GRPC_RULIST_AWAITING_ALLOCATION); @@ -346,7 +340,7 @@ static bool rq_alloc(grpc_exec_ctx* exec_ctx, /* returns true if any memory could be reclaimed from buffers */ static bool rq_reclaim_from_per_user_free_pool( - grpc_exec_ctx* exec_ctx, grpc_resource_quota* resource_quota) { + grpc_resource_quota* resource_quota) { grpc_resource_user* resource_user; while ((resource_user = rulist_pop_head(resource_quota, GRPC_RULIST_NON_EMPTY_FREE_POOL))) { @@ -373,8 +367,7 @@ static bool rq_reclaim_from_per_user_free_pool( } /* returns true if reclamation is proceeding */ -static bool rq_reclaim(grpc_exec_ctx* exec_ctx, - grpc_resource_quota* resource_quota, bool destructive) { +static bool rq_reclaim(grpc_resource_quota* resource_quota, bool destructive) { if (resource_quota->reclaiming) return true; grpc_rulist list = destructive ? GRPC_RULIST_RECLAIMER_DESTRUCTIVE : GRPC_RULIST_RECLAIMER_BENIGN; @@ -392,7 +385,7 @@ static bool rq_reclaim(grpc_exec_ctx* exec_ctx, resource_quota->debug_only_last_reclaimer_resource_user = resource_user; resource_quota->debug_only_last_initiated_reclaimer = c; resource_user->reclaimers[destructive] = nullptr; - GRPC_CLOSURE_RUN(exec_ctx, c, GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN(c, GRPC_ERROR_NONE); return true; } @@ -412,10 +405,10 @@ static void ru_slice_ref(void* p) { gpr_ref(&rc->refs); } -static void ru_slice_unref(grpc_exec_ctx* exec_ctx, void* p) { +static void ru_slice_unref(void* p) { ru_slice_refcount* rc = (ru_slice_refcount*)p; if (gpr_unref(&rc->refs)) { - grpc_resource_user_free(exec_ctx, rc->resource_user, rc->size); + grpc_resource_user_free(rc->resource_user, rc->size); gpr_free(rc); } } @@ -445,61 +438,57 @@ static grpc_slice ru_slice_create(grpc_resource_user* resource_user, * the combiner */ -static void ru_allocate(grpc_exec_ctx* exec_ctx, void* ru, grpc_error* error) { +static void ru_allocate(void* ru, grpc_error* error) { grpc_resource_user* resource_user = (grpc_resource_user*)ru; if (rulist_empty(resource_user->resource_quota, GRPC_RULIST_AWAITING_ALLOCATION)) { - rq_step_sched(exec_ctx, resource_user->resource_quota); + rq_step_sched(resource_user->resource_quota); } rulist_add_tail(resource_user, GRPC_RULIST_AWAITING_ALLOCATION); } -static void ru_add_to_free_pool(grpc_exec_ctx* exec_ctx, void* ru, - grpc_error* error) { +static void ru_add_to_free_pool(void* ru, grpc_error* error) { grpc_resource_user* resource_user = (grpc_resource_user*)ru; if (!rulist_empty(resource_user->resource_quota, GRPC_RULIST_AWAITING_ALLOCATION) && rulist_empty(resource_user->resource_quota, GRPC_RULIST_NON_EMPTY_FREE_POOL)) { - rq_step_sched(exec_ctx, resource_user->resource_quota); + rq_step_sched(resource_user->resource_quota); } rulist_add_tail(resource_user, GRPC_RULIST_NON_EMPTY_FREE_POOL); } -static bool ru_post_reclaimer(grpc_exec_ctx* exec_ctx, - grpc_resource_user* resource_user, +static bool ru_post_reclaimer(grpc_resource_user* resource_user, bool destructive) { grpc_closure* closure = resource_user->new_reclaimers[destructive]; GPR_ASSERT(closure != nullptr); resource_user->new_reclaimers[destructive] = nullptr; GPR_ASSERT(resource_user->reclaimers[destructive] == nullptr); if (gpr_atm_acq_load(&resource_user->shutdown) > 0) { - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_CANCELLED); return false; } resource_user->reclaimers[destructive] = closure; return true; } -static void ru_post_benign_reclaimer(grpc_exec_ctx* exec_ctx, void* ru, - grpc_error* error) { +static void ru_post_benign_reclaimer(void* ru, grpc_error* error) { grpc_resource_user* resource_user = (grpc_resource_user*)ru; - if (!ru_post_reclaimer(exec_ctx, resource_user, false)) return; + if (!ru_post_reclaimer(resource_user, false)) return; if (!rulist_empty(resource_user->resource_quota, GRPC_RULIST_AWAITING_ALLOCATION) && rulist_empty(resource_user->resource_quota, GRPC_RULIST_NON_EMPTY_FREE_POOL) && rulist_empty(resource_user->resource_quota, GRPC_RULIST_RECLAIMER_BENIGN)) { - rq_step_sched(exec_ctx, resource_user->resource_quota); + rq_step_sched(resource_user->resource_quota); } rulist_add_tail(resource_user, GRPC_RULIST_RECLAIMER_BENIGN); } -static void ru_post_destructive_reclaimer(grpc_exec_ctx* exec_ctx, void* ru, - grpc_error* error) { +static void ru_post_destructive_reclaimer(void* ru, grpc_error* error) { grpc_resource_user* resource_user = (grpc_resource_user*)ru; - if (!ru_post_reclaimer(exec_ctx, resource_user, true)) return; + if (!ru_post_reclaimer(resource_user, true)) return; if (!rulist_empty(resource_user->resource_quota, GRPC_RULIST_AWAITING_ALLOCATION) && rulist_empty(resource_user->resource_quota, @@ -508,51 +497,46 @@ static void ru_post_destructive_reclaimer(grpc_exec_ctx* exec_ctx, void* ru, GRPC_RULIST_RECLAIMER_BENIGN) && rulist_empty(resource_user->resource_quota, GRPC_RULIST_RECLAIMER_DESTRUCTIVE)) { - rq_step_sched(exec_ctx, resource_user->resource_quota); + rq_step_sched(resource_user->resource_quota); } rulist_add_tail(resource_user, GRPC_RULIST_RECLAIMER_DESTRUCTIVE); } -static void ru_shutdown(grpc_exec_ctx* exec_ctx, void* ru, grpc_error* error) { +static void ru_shutdown(void* ru, grpc_error* error) { if (grpc_resource_quota_trace.enabled()) { gpr_log(GPR_DEBUG, "RU shutdown %p", ru); } grpc_resource_user* resource_user = (grpc_resource_user*)ru; - GRPC_CLOSURE_SCHED(exec_ctx, resource_user->reclaimers[0], - GRPC_ERROR_CANCELLED); - GRPC_CLOSURE_SCHED(exec_ctx, resource_user->reclaimers[1], - GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(resource_user->reclaimers[0], GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(resource_user->reclaimers[1], GRPC_ERROR_CANCELLED); resource_user->reclaimers[0] = nullptr; resource_user->reclaimers[1] = nullptr; rulist_remove(resource_user, GRPC_RULIST_RECLAIMER_BENIGN); rulist_remove(resource_user, GRPC_RULIST_RECLAIMER_DESTRUCTIVE); if (resource_user->allocating) { - rq_step_sched(exec_ctx, resource_user->resource_quota); + rq_step_sched(resource_user->resource_quota); } } -static void ru_destroy(grpc_exec_ctx* exec_ctx, void* ru, grpc_error* error) { +static void ru_destroy(void* ru, grpc_error* error) { grpc_resource_user* resource_user = (grpc_resource_user*)ru; GPR_ASSERT(gpr_atm_no_barrier_load(&resource_user->refs) == 0); for (int i = 0; i < GRPC_RULIST_COUNT; i++) { rulist_remove(resource_user, (grpc_rulist)i); } - GRPC_CLOSURE_SCHED(exec_ctx, resource_user->reclaimers[0], - GRPC_ERROR_CANCELLED); - GRPC_CLOSURE_SCHED(exec_ctx, resource_user->reclaimers[1], - GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(resource_user->reclaimers[0], GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(resource_user->reclaimers[1], GRPC_ERROR_CANCELLED); if (resource_user->free_pool != 0) { resource_user->resource_quota->free_pool += resource_user->free_pool; - rq_step_sched(exec_ctx, resource_user->resource_quota); + rq_step_sched(resource_user->resource_quota); } - grpc_resource_quota_unref_internal(exec_ctx, resource_user->resource_quota); + grpc_resource_quota_unref_internal(resource_user->resource_quota); gpr_mu_destroy(&resource_user->mu); gpr_free(resource_user->name); gpr_free(resource_user); } -static void ru_allocated_slices(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void ru_allocated_slices(void* arg, grpc_error* error) { grpc_resource_user_slice_allocator* slice_allocator = (grpc_resource_user_slice_allocator*)arg; if (error == GRPC_ERROR_NONE) { @@ -562,7 +546,7 @@ static void ru_allocated_slices(grpc_exec_ctx* exec_ctx, void* arg, slice_allocator->length)); } } - GRPC_CLOSURE_RUN(exec_ctx, &slice_allocator->on_done, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(&slice_allocator->on_done, GRPC_ERROR_REF(error)); } /******************************************************************************* @@ -576,23 +560,22 @@ typedef struct { grpc_closure closure; } rq_resize_args; -static void rq_resize(grpc_exec_ctx* exec_ctx, void* args, grpc_error* error) { +static void rq_resize(void* args, grpc_error* error) { rq_resize_args* a = (rq_resize_args*)args; int64_t delta = a->size - a->resource_quota->size; a->resource_quota->size += delta; a->resource_quota->free_pool += delta; rq_update_estimate(a->resource_quota); - rq_step_sched(exec_ctx, a->resource_quota); - grpc_resource_quota_unref_internal(exec_ctx, a->resource_quota); + rq_step_sched(a->resource_quota); + grpc_resource_quota_unref_internal(a->resource_quota); gpr_free(a); } -static void rq_reclamation_done(grpc_exec_ctx* exec_ctx, void* rq, - grpc_error* error) { +static void rq_reclamation_done(void* rq, grpc_error* error) { grpc_resource_quota* resource_quota = (grpc_resource_quota*)rq; resource_quota->reclaiming = false; - rq_step_sched(exec_ctx, resource_quota); - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + rq_step_sched(resource_quota); + grpc_resource_quota_unref_internal(resource_quota); } /******************************************************************************* @@ -628,10 +611,9 @@ grpc_resource_quota* grpc_resource_quota_create(const char* name) { return resource_quota; } -void grpc_resource_quota_unref_internal(grpc_exec_ctx* exec_ctx, - grpc_resource_quota* resource_quota) { +void grpc_resource_quota_unref_internal(grpc_resource_quota* resource_quota) { if (gpr_unref(&resource_quota->refs)) { - GRPC_COMBINER_UNREF(exec_ctx, resource_quota->combiner, "resource_quota"); + GRPC_COMBINER_UNREF(resource_quota->combiner, "resource_quota"); gpr_free(resource_quota->name); gpr_free(resource_quota); } @@ -639,9 +621,8 @@ void grpc_resource_quota_unref_internal(grpc_exec_ctx* exec_ctx, /* Public API */ void grpc_resource_quota_unref(grpc_resource_quota* resource_quota) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_quota_unref_internal(resource_quota); } grpc_resource_quota* grpc_resource_quota_ref_internal( @@ -665,15 +646,14 @@ double grpc_resource_quota_get_memory_pressure( /* Public API */ void grpc_resource_quota_resize(grpc_resource_quota* resource_quota, size_t size) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; rq_resize_args* a = (rq_resize_args*)gpr_malloc(sizeof(*a)); a->resource_quota = grpc_resource_quota_ref_internal(resource_quota); a->size = (int64_t)size; gpr_atm_no_barrier_store(&resource_quota->last_size, (gpr_atm)GPR_MIN((size_t)GPR_ATM_MAX, size)); GRPC_CLOSURE_INIT(&a->closure, rq_resize, a, grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(&exec_ctx, &a->closure, GRPC_ERROR_NONE); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_CLOSURE_SCHED(&a->closure, GRPC_ERROR_NONE); } size_t grpc_resource_quota_peek_size(grpc_resource_quota* resource_quota) { @@ -704,8 +684,8 @@ static void* rq_copy(void* rq) { return rq; } -static void rq_destroy(grpc_exec_ctx* exec_ctx, void* rq) { - grpc_resource_quota_unref_internal(exec_ctx, (grpc_resource_quota*)rq); +static void rq_destroy(void* rq) { + grpc_resource_quota_unref_internal((grpc_resource_quota*)rq); } static int rq_cmp(void* a, void* b) { return GPR_ICMP(a, b); } @@ -773,14 +753,12 @@ static void ru_ref_by(grpc_resource_user* resource_user, gpr_atm amount) { GPR_ASSERT(gpr_atm_no_barrier_fetch_add(&resource_user->refs, amount) != 0); } -static void ru_unref_by(grpc_exec_ctx* exec_ctx, - grpc_resource_user* resource_user, gpr_atm amount) { +static void ru_unref_by(grpc_resource_user* resource_user, gpr_atm amount) { GPR_ASSERT(amount > 0); gpr_atm old = gpr_atm_full_fetch_add(&resource_user->refs, -amount); GPR_ASSERT(old >= amount); if (old == amount) { - GRPC_CLOSURE_SCHED(exec_ctx, &resource_user->destroy_closure, - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&resource_user->destroy_closure, GRPC_ERROR_NONE); } } @@ -788,16 +766,13 @@ void grpc_resource_user_ref(grpc_resource_user* resource_user) { ru_ref_by(resource_user, 1); } -void grpc_resource_user_unref(grpc_exec_ctx* exec_ctx, - grpc_resource_user* resource_user) { - ru_unref_by(exec_ctx, resource_user, 1); +void grpc_resource_user_unref(grpc_resource_user* resource_user) { + ru_unref_by(resource_user, 1); } -void grpc_resource_user_shutdown(grpc_exec_ctx* exec_ctx, - grpc_resource_user* resource_user) { +void grpc_resource_user_shutdown(grpc_resource_user* resource_user) { if (gpr_atm_full_fetch_add(&resource_user->shutdown, 1) == 0) { GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_CREATE( ru_shutdown, resource_user, grpc_combiner_scheduler(resource_user->resource_quota->combiner)), @@ -805,8 +780,7 @@ void grpc_resource_user_shutdown(grpc_exec_ctx* exec_ctx, } } -void grpc_resource_user_alloc(grpc_exec_ctx* exec_ctx, - grpc_resource_user* resource_user, size_t size, +void grpc_resource_user_alloc(grpc_resource_user* resource_user, size_t size, grpc_closure* optional_on_done) { gpr_mu_lock(&resource_user->mu); ru_ref_by(resource_user, (gpr_atm)size); @@ -822,18 +796,16 @@ void grpc_resource_user_alloc(grpc_exec_ctx* exec_ctx, GRPC_ERROR_NONE); if (!resource_user->allocating) { resource_user->allocating = true; - GRPC_CLOSURE_SCHED(exec_ctx, &resource_user->allocate_closure, - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&resource_user->allocate_closure, GRPC_ERROR_NONE); } } else { resource_user->outstanding_allocations -= (int64_t)size; - GRPC_CLOSURE_SCHED(exec_ctx, optional_on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(optional_on_done, GRPC_ERROR_NONE); } gpr_mu_unlock(&resource_user->mu); } -void grpc_resource_user_free(grpc_exec_ctx* exec_ctx, - grpc_resource_user* resource_user, size_t size) { +void grpc_resource_user_free(grpc_resource_user* resource_user, size_t size) { gpr_mu_lock(&resource_user->mu); bool was_zero_or_negative = resource_user->free_pool <= 0; resource_user->free_pool += (int64_t)size; @@ -846,32 +818,29 @@ void grpc_resource_user_free(grpc_exec_ctx* exec_ctx, if (is_bigger_than_zero && was_zero_or_negative && !resource_user->added_to_free_pool) { resource_user->added_to_free_pool = true; - GRPC_CLOSURE_SCHED(exec_ctx, &resource_user->add_to_free_pool_closure, + GRPC_CLOSURE_SCHED(&resource_user->add_to_free_pool_closure, GRPC_ERROR_NONE); } gpr_mu_unlock(&resource_user->mu); - ru_unref_by(exec_ctx, resource_user, (gpr_atm)size); + ru_unref_by(resource_user, (gpr_atm)size); } -void grpc_resource_user_post_reclaimer(grpc_exec_ctx* exec_ctx, - grpc_resource_user* resource_user, +void grpc_resource_user_post_reclaimer(grpc_resource_user* resource_user, bool destructive, grpc_closure* closure) { GPR_ASSERT(resource_user->new_reclaimers[destructive] == nullptr); resource_user->new_reclaimers[destructive] = closure; - GRPC_CLOSURE_SCHED(exec_ctx, - &resource_user->post_reclaimer_closure[destructive], + GRPC_CLOSURE_SCHED(&resource_user->post_reclaimer_closure[destructive], GRPC_ERROR_NONE); } -void grpc_resource_user_finish_reclamation(grpc_exec_ctx* exec_ctx, - grpc_resource_user* resource_user) { +void grpc_resource_user_finish_reclamation(grpc_resource_user* resource_user) { if (grpc_resource_quota_trace.enabled()) { gpr_log(GPR_DEBUG, "RQ %s %s: reclamation complete", resource_user->resource_quota->name, resource_user->name); } GRPC_CLOSURE_SCHED( - exec_ctx, &resource_user->resource_quota->rq_reclamation_done_closure, + &resource_user->resource_quota->rq_reclamation_done_closure, GRPC_ERROR_NONE); } @@ -886,12 +855,11 @@ void grpc_resource_user_slice_allocator_init( } void grpc_resource_user_alloc_slices( - grpc_exec_ctx* exec_ctx, grpc_resource_user_slice_allocator* slice_allocator, size_t length, size_t count, grpc_slice_buffer* dest) { slice_allocator->length = length; slice_allocator->count = count; slice_allocator->dest = dest; - grpc_resource_user_alloc(exec_ctx, slice_allocator->resource_user, - count * length, &slice_allocator->on_allocated); + grpc_resource_user_alloc(slice_allocator->resource_user, count * length, + &slice_allocator->on_allocated); } diff --git a/src/core/lib/iomgr/resource_quota.h b/src/core/lib/iomgr/resource_quota.h index 787370307a8..39e3aabf189 100644 --- a/src/core/lib/iomgr/resource_quota.h +++ b/src/core/lib/iomgr/resource_quota.h @@ -65,8 +65,7 @@ extern grpc_core::TraceFlag grpc_resource_quota_trace; grpc_resource_quota* grpc_resource_quota_ref_internal( grpc_resource_quota* resource_quota); -void grpc_resource_quota_unref_internal(grpc_exec_ctx* exec_ctx, - grpc_resource_quota* resource_quota); +void grpc_resource_quota_unref_internal(grpc_resource_quota* resource_quota); grpc_resource_quota* grpc_resource_quota_from_channel_args( const grpc_channel_args* channel_args); @@ -89,32 +88,26 @@ grpc_resource_quota* grpc_resource_user_quota( grpc_resource_user* resource_user); void grpc_resource_user_ref(grpc_resource_user* resource_user); -void grpc_resource_user_unref(grpc_exec_ctx* exec_ctx, - grpc_resource_user* resource_user); -void grpc_resource_user_shutdown(grpc_exec_ctx* exec_ctx, - grpc_resource_user* resource_user); +void grpc_resource_user_unref(grpc_resource_user* resource_user); +void grpc_resource_user_shutdown(grpc_resource_user* resource_user); /* Allocate from the resource user (and its quota). If optional_on_done is NULL, then allocate immediately. This may push the quota over-limit, at which point reclamation will kick in. If optional_on_done is non-NULL, it will be scheduled when the allocation has been granted by the quota. */ -void grpc_resource_user_alloc(grpc_exec_ctx* exec_ctx, - grpc_resource_user* resource_user, size_t size, +void grpc_resource_user_alloc(grpc_resource_user* resource_user, size_t size, grpc_closure* optional_on_done); /* Release memory back to the quota */ -void grpc_resource_user_free(grpc_exec_ctx* exec_ctx, - grpc_resource_user* resource_user, size_t size); +void grpc_resource_user_free(grpc_resource_user* resource_user, size_t size); /* Post a memory reclaimer to the resource user. Only one benign and one destructive reclaimer can be posted at once. When executed, the reclaimer MUST call grpc_resource_user_finish_reclamation before it completes, to return control to the resource quota. */ -void grpc_resource_user_post_reclaimer(grpc_exec_ctx* exec_ctx, - grpc_resource_user* resource_user, +void grpc_resource_user_post_reclaimer(grpc_resource_user* resource_user, bool destructive, grpc_closure* closure); /* Finish a reclamation step */ -void grpc_resource_user_finish_reclamation(grpc_exec_ctx* exec_ctx, - grpc_resource_user* resource_user); +void grpc_resource_user_finish_reclamation(grpc_resource_user* resource_user); /* Helper to allocate slices from a resource user */ typedef struct grpc_resource_user_slice_allocator { @@ -141,13 +134,11 @@ void grpc_resource_user_slice_allocator_init( /* Allocate \a count slices of length \a length into \a dest. Only one request can be outstanding at a time. */ void grpc_resource_user_alloc_slices( - grpc_exec_ctx* exec_ctx, grpc_resource_user_slice_allocator* slice_allocator, size_t length, size_t count, grpc_slice_buffer* dest); /* Allocate one slice of length \a size synchronously. */ -grpc_slice grpc_resource_user_slice_malloc(grpc_exec_ctx* exec_ctx, - grpc_resource_user* resource_user, +grpc_slice grpc_resource_user_slice_malloc(grpc_resource_user* resource_user, size_t size); #endif /* GRPC_CORE_LIB_IOMGR_RESOURCE_QUOTA_H */ diff --git a/src/core/lib/iomgr/socket_factory_posix.cc b/src/core/lib/iomgr/socket_factory_posix.cc index 40bfecd4c25..bc7d0b12f3b 100644 --- a/src/core/lib/iomgr/socket_factory_posix.cc +++ b/src/core/lib/iomgr/socket_factory_posix.cc @@ -72,7 +72,7 @@ static void* socket_factory_arg_copy(void* p) { return grpc_socket_factory_ref((grpc_socket_factory*)p); } -static void socket_factory_arg_destroy(grpc_exec_ctx* exec_ctx, void* p) { +static void socket_factory_arg_destroy(void* p) { grpc_socket_factory_unref((grpc_socket_factory*)p); } diff --git a/src/core/lib/iomgr/socket_mutator.cc b/src/core/lib/iomgr/socket_mutator.cc index ff6c0c70d8d..9d30e46b6bd 100644 --- a/src/core/lib/iomgr/socket_mutator.cc +++ b/src/core/lib/iomgr/socket_mutator.cc @@ -63,7 +63,7 @@ static void* socket_mutator_arg_copy(void* p) { return grpc_socket_mutator_ref((grpc_socket_mutator*)p); } -static void socket_mutator_arg_destroy(grpc_exec_ctx* exec_ctx, void* p) { +static void socket_mutator_arg_destroy(void* p) { grpc_socket_mutator_unref((grpc_socket_mutator*)p); } diff --git a/src/core/lib/iomgr/socket_windows.cc b/src/core/lib/iomgr/socket_windows.cc index aee80f4b4c0..9bb6a75dd8c 100644 --- a/src/core/lib/iomgr/socket_windows.cc +++ b/src/core/lib/iomgr/socket_windows.cc @@ -109,37 +109,34 @@ void grpc_winsocket_destroy(grpc_winsocket* winsocket) { -) The IOCP already completed in the background, and we need to call the callback now. -) The IOCP hasn't completed yet, and we're queuing it for later. */ -static void socket_notify_on_iocp(grpc_exec_ctx* exec_ctx, - grpc_winsocket* socket, grpc_closure* closure, +static void socket_notify_on_iocp(grpc_winsocket* socket, grpc_closure* closure, grpc_winsocket_callback_info* info) { GPR_ASSERT(info->closure == NULL); gpr_mu_lock(&socket->state_mu); if (info->has_pending_iocp) { info->has_pending_iocp = 0; - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); } else { info->closure = closure; } gpr_mu_unlock(&socket->state_mu); } -void grpc_socket_notify_on_write(grpc_exec_ctx* exec_ctx, - grpc_winsocket* socket, +void grpc_socket_notify_on_write(grpc_winsocket* socket, grpc_closure* closure) { - socket_notify_on_iocp(exec_ctx, socket, closure, &socket->write_info); + socket_notify_on_iocp(socket, closure, &socket->write_info); } -void grpc_socket_notify_on_read(grpc_exec_ctx* exec_ctx, grpc_winsocket* socket, - grpc_closure* closure) { - socket_notify_on_iocp(exec_ctx, socket, closure, &socket->read_info); +void grpc_socket_notify_on_read(grpc_winsocket* socket, grpc_closure* closure) { + socket_notify_on_iocp(socket, closure, &socket->read_info); } -void grpc_socket_become_ready(grpc_exec_ctx* exec_ctx, grpc_winsocket* socket, +void grpc_socket_become_ready(grpc_winsocket* socket, grpc_winsocket_callback_info* info) { GPR_ASSERT(!info->has_pending_iocp); gpr_mu_lock(&socket->state_mu); if (info->closure) { - GRPC_CLOSURE_SCHED(exec_ctx, info->closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(info->closure, GRPC_ERROR_NONE); info->closure = NULL; } else { info->has_pending_iocp = 1; diff --git a/src/core/lib/iomgr/socket_windows.h b/src/core/lib/iomgr/socket_windows.h index 04e0a89d703..cb28f2b8df1 100644 --- a/src/core/lib/iomgr/socket_windows.h +++ b/src/core/lib/iomgr/socket_windows.h @@ -98,16 +98,13 @@ void grpc_winsocket_shutdown(grpc_winsocket* socket); /* Destroy a socket. Should only be called if there's no pending operation. */ void grpc_winsocket_destroy(grpc_winsocket* socket); -void grpc_socket_notify_on_write(grpc_exec_ctx* exec_ctx, - grpc_winsocket* winsocket, +void grpc_socket_notify_on_write(grpc_winsocket* winsocket, grpc_closure* closure); -void grpc_socket_notify_on_read(grpc_exec_ctx* exec_ctx, - grpc_winsocket* winsocket, +void grpc_socket_notify_on_read(grpc_winsocket* winsocket, grpc_closure* closure); -void grpc_socket_become_ready(grpc_exec_ctx* exec_ctx, - grpc_winsocket* winsocket, +void grpc_socket_become_ready(grpc_winsocket* winsocket, grpc_winsocket_callback_info* ci); #endif diff --git a/src/core/lib/iomgr/tcp_client.h b/src/core/lib/iomgr/tcp_client.h index 75e2fe0f36c..5f55d309553 100644 --- a/src/core/lib/iomgr/tcp_client.h +++ b/src/core/lib/iomgr/tcp_client.h @@ -30,8 +30,7 @@ NULL on failure). interested_parties points to a set of pollsets that would be interested in this connection being established (in order to continue their work) */ -void grpc_tcp_client_connect(grpc_exec_ctx* exec_ctx, grpc_closure* on_connect, - grpc_endpoint** endpoint, +void grpc_tcp_client_connect(grpc_closure* on_connect, grpc_endpoint** endpoint, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, diff --git a/src/core/lib/iomgr/tcp_client_posix.cc b/src/core/lib/iomgr/tcp_client_posix.cc index 4cb2ac49d5d..15062a52cda 100644 --- a/src/core/lib/iomgr/tcp_client_posix.cc +++ b/src/core/lib/iomgr/tcp_client_posix.cc @@ -96,7 +96,7 @@ done: return err; } -static void tc_on_alarm(grpc_exec_ctx* exec_ctx, void* acp, grpc_error* error) { +static void tc_on_alarm(void* acp, grpc_error* error) { int done; async_connect* ac = (async_connect*)acp; if (grpc_tcp_trace.enabled()) { @@ -107,26 +107,24 @@ static void tc_on_alarm(grpc_exec_ctx* exec_ctx, void* acp, grpc_error* error) { gpr_mu_lock(&ac->mu); if (ac->fd != nullptr) { grpc_fd_shutdown( - exec_ctx, ac->fd, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("connect() timed out")); + ac->fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("connect() timed out")); } done = (--ac->refs == 0); gpr_mu_unlock(&ac->mu); if (done) { gpr_mu_destroy(&ac->mu); gpr_free(ac->addr_str); - grpc_channel_args_destroy(exec_ctx, ac->channel_args); + grpc_channel_args_destroy(ac->channel_args); gpr_free(ac); } } grpc_endpoint* grpc_tcp_client_create_from_fd( - grpc_exec_ctx* exec_ctx, grpc_fd* fd, const grpc_channel_args* channel_args, - const char* addr_str) { - return grpc_tcp_create(exec_ctx, fd, channel_args, addr_str); + grpc_fd* fd, const grpc_channel_args* channel_args, const char* addr_str) { + return grpc_tcp_create(fd, channel_args, addr_str); } -static void on_writable(grpc_exec_ctx* exec_ctx, void* acp, grpc_error* error) { +static void on_writable(void* acp, grpc_error* error) { async_connect* ac = (async_connect*)acp; int so_error = 0; socklen_t so_error_size; @@ -150,7 +148,7 @@ static void on_writable(grpc_exec_ctx* exec_ctx, void* acp, grpc_error* error) { ac->fd = nullptr; gpr_mu_unlock(&ac->mu); - grpc_timer_cancel(exec_ctx, &ac->alarm); + grpc_timer_cancel(&ac->alarm); gpr_mu_lock(&ac->mu); if (error != GRPC_ERROR_NONE) { @@ -172,9 +170,8 @@ static void on_writable(grpc_exec_ctx* exec_ctx, void* acp, grpc_error* error) { switch (so_error) { case 0: - grpc_pollset_set_del_fd(exec_ctx, ac->interested_parties, fd); - *ep = grpc_tcp_client_create_from_fd(exec_ctx, fd, ac->channel_args, - ac->addr_str); + grpc_pollset_set_del_fd(ac->interested_parties, fd); + *ep = grpc_tcp_client_create_from_fd(fd, ac->channel_args, ac->addr_str); fd = nullptr; break; case ENOBUFS: @@ -194,7 +191,7 @@ static void on_writable(grpc_exec_ctx* exec_ctx, void* acp, grpc_error* error) { don't do that! */ gpr_log(GPR_ERROR, "kernel out of buffers"); gpr_mu_unlock(&ac->mu); - grpc_fd_notify_on_write(exec_ctx, fd, &ac->write_closure); + grpc_fd_notify_on_write(fd, &ac->write_closure); return; case ECONNREFUSED: /* This error shouldn't happen for anything other than connect(). */ @@ -209,8 +206,8 @@ static void on_writable(grpc_exec_ctx* exec_ctx, void* acp, grpc_error* error) { finish: if (fd != nullptr) { - grpc_pollset_set_del_fd(exec_ctx, ac->interested_parties, fd); - grpc_fd_orphan(exec_ctx, fd, nullptr, nullptr, false /* already_closed */, + grpc_pollset_set_del_fd(ac->interested_parties, fd); + grpc_fd_orphan(fd, nullptr, nullptr, false /* already_closed */, "tcp_client_orphan"); fd = nullptr; } @@ -233,14 +230,13 @@ finish: if (done) { gpr_mu_destroy(&ac->mu); gpr_free(ac->addr_str); - grpc_channel_args_destroy(exec_ctx, ac->channel_args); + grpc_channel_args_destroy(ac->channel_args); gpr_free(ac); } - GRPC_CLOSURE_SCHED(exec_ctx, closure, error); + GRPC_CLOSURE_SCHED(closure, error); } -static void tcp_client_connect_impl(grpc_exec_ctx* exec_ctx, - grpc_closure* closure, grpc_endpoint** ep, +static void tcp_client_connect_impl(grpc_closure* closure, grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, @@ -265,7 +261,7 @@ static void tcp_client_connect_impl(grpc_exec_ctx* exec_ctx, error = grpc_create_dualstack_socket(addr, SOCK_STREAM, 0, &dsmode, &fd); if (error != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(exec_ctx, closure, error); + GRPC_CLOSURE_SCHED(closure, error); return; } if (dsmode == GRPC_DSMODE_IPV4) { @@ -274,7 +270,7 @@ static void tcp_client_connect_impl(grpc_exec_ctx* exec_ctx, addr = &addr4_copy; } if ((error = prepare_socket(addr, fd, channel_args)) != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(exec_ctx, closure, error); + GRPC_CLOSURE_SCHED(closure, error); return; } @@ -289,20 +285,19 @@ static void tcp_client_connect_impl(grpc_exec_ctx* exec_ctx, fdobj = grpc_fd_create(fd, name); if (err >= 0) { - *ep = - grpc_tcp_client_create_from_fd(exec_ctx, fdobj, channel_args, addr_str); - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); + *ep = grpc_tcp_client_create_from_fd(fdobj, channel_args, addr_str); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); goto done; } if (errno != EWOULDBLOCK && errno != EINPROGRESS) { - grpc_fd_orphan(exec_ctx, fdobj, nullptr, nullptr, - false /* already_closed */, "tcp_client_connect_error"); - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_OS_ERROR(errno, "connect")); + grpc_fd_orphan(fdobj, nullptr, nullptr, false /* already_closed */, + "tcp_client_connect_error"); + GRPC_CLOSURE_SCHED(closure, GRPC_OS_ERROR(errno, "connect")); goto done; } - grpc_pollset_set_add_fd(exec_ctx, interested_parties, fdobj); + grpc_pollset_set_add_fd(interested_parties, fdobj); ac = (async_connect*)gpr_malloc(sizeof(async_connect)); ac->closure = closure; @@ -324,8 +319,8 @@ static void tcp_client_connect_impl(grpc_exec_ctx* exec_ctx, gpr_mu_lock(&ac->mu); GRPC_CLOSURE_INIT(&ac->on_alarm, tc_on_alarm, ac, grpc_schedule_on_exec_ctx); - grpc_timer_init(exec_ctx, &ac->alarm, deadline, &ac->on_alarm); - grpc_fd_notify_on_write(exec_ctx, ac->fd, &ac->write_closure); + grpc_timer_init(&ac->alarm, deadline, &ac->on_alarm); + grpc_fd_notify_on_write(ac->fd, &ac->write_closure); gpr_mu_unlock(&ac->mu); done: @@ -335,19 +330,18 @@ done: // overridden by api_fuzzer.c void (*grpc_tcp_client_connect_impl)( - grpc_exec_ctx* exec_ctx, grpc_closure* closure, grpc_endpoint** ep, + grpc_closure* closure, grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, grpc_millis deadline) = tcp_client_connect_impl; -void grpc_tcp_client_connect(grpc_exec_ctx* exec_ctx, grpc_closure* closure, - grpc_endpoint** ep, +void grpc_tcp_client_connect(grpc_closure* closure, grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, grpc_millis deadline) { - grpc_tcp_client_connect_impl(exec_ctx, closure, ep, interested_parties, - channel_args, addr, deadline); + grpc_tcp_client_connect_impl(closure, ep, interested_parties, channel_args, + addr, deadline); } #endif diff --git a/src/core/lib/iomgr/tcp_client_posix.h b/src/core/lib/iomgr/tcp_client_posix.h index 2b1fe79e902..7d0f133a6b4 100644 --- a/src/core/lib/iomgr/tcp_client_posix.h +++ b/src/core/lib/iomgr/tcp_client_posix.h @@ -24,7 +24,6 @@ #include "src/core/lib/iomgr/tcp_client.h" grpc_endpoint* grpc_tcp_client_create_from_fd( - grpc_exec_ctx* exec_ctx, grpc_fd* fd, const grpc_channel_args* channel_args, - const char* addr_str); + grpc_fd* fd, const grpc_channel_args* channel_args, const char* addr_str); #endif /* GRPC_CORE_LIB_IOMGR_TCP_CLIENT_POSIX_H */ diff --git a/src/core/lib/iomgr/tcp_client_uv.cc b/src/core/lib/iomgr/tcp_client_uv.cc index 5cca0c9936d..4e9c7cc11d9 100644 --- a/src/core/lib/iomgr/tcp_client_uv.cc +++ b/src/core/lib/iomgr/tcp_client_uv.cc @@ -46,17 +46,15 @@ typedef struct grpc_uv_tcp_connect { grpc_resource_quota* resource_quota; } grpc_uv_tcp_connect; -static void uv_tcp_connect_cleanup(grpc_exec_ctx* exec_ctx, - grpc_uv_tcp_connect* connect) { - grpc_resource_quota_unref_internal(exec_ctx, connect->resource_quota); +static void uv_tcp_connect_cleanup(grpc_uv_tcp_connect* connect) { + grpc_resource_quota_unref_internal(connect->resource_quota); gpr_free(connect->addr_name); gpr_free(connect); } static void tcp_close_callback(uv_handle_t* handle) { gpr_free(handle); } -static void uv_tc_on_alarm(grpc_exec_ctx* exec_ctx, void* acp, - grpc_error* error) { +static void uv_tc_on_alarm(void* acp, grpc_error* error) { int done; grpc_uv_tcp_connect* connect = (grpc_uv_tcp_connect*)acp; if (grpc_tcp_trace.enabled()) { @@ -72,17 +70,17 @@ static void uv_tc_on_alarm(grpc_exec_ctx* exec_ctx, void* acp, } done = (--connect->refs == 0); if (done) { - uv_tcp_connect_cleanup(exec_ctx, connect); + uv_tcp_connect_cleanup(connect); } } static void uv_tc_on_connect(uv_connect_t* req, int status) { grpc_uv_tcp_connect* connect = (grpc_uv_tcp_connect*)req->data; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_error* error = GRPC_ERROR_NONE; int done; grpc_closure* closure = connect->closure; - grpc_timer_cancel(&exec_ctx, &connect->alarm); + grpc_timer_cancel(&connect->alarm); if (status == 0) { *connect->endpoint = grpc_tcp_create( connect->tcp_handle, connect->resource_quota, connect->addr_name); @@ -107,15 +105,13 @@ static void uv_tc_on_connect(uv_connect_t* req, int status) { } done = (--connect->refs == 0); if (done) { - grpc_exec_ctx_flush(&exec_ctx); - uv_tcp_connect_cleanup(&exec_ctx, connect); + grpc_core::ExecCtx::Get()->Flush(); + uv_tcp_connect_cleanup(connect); } - GRPC_CLOSURE_SCHED(&exec_ctx, closure, error); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_CLOSURE_SCHED(closure, error); } -static void tcp_client_connect_impl(grpc_exec_ctx* exec_ctx, - grpc_closure* closure, grpc_endpoint** ep, +static void tcp_client_connect_impl(grpc_closure* closure, grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* resolved_addr, @@ -130,7 +126,7 @@ static void tcp_client_connect_impl(grpc_exec_ctx* exec_ctx, if (channel_args != NULL) { for (size_t i = 0; i < channel_args->num_args; i++) { if (0 == strcmp(channel_args->args[i].key, GRPC_ARG_RESOURCE_QUOTA)) { - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); resource_quota = grpc_resource_quota_ref_internal( (grpc_resource_quota*)channel_args->args[i].value.pointer.p); } @@ -157,24 +153,23 @@ static void tcp_client_connect_impl(grpc_exec_ctx* exec_ctx, (const struct sockaddr*)resolved_addr->addr, uv_tc_on_connect); GRPC_CLOSURE_INIT(&connect->on_alarm, uv_tc_on_alarm, connect, grpc_schedule_on_exec_ctx); - grpc_timer_init(exec_ctx, &connect->alarm, deadline, &connect->on_alarm); + grpc_timer_init(&connect->alarm, deadline, &connect->on_alarm); } // overridden by api_fuzzer.c void (*grpc_tcp_client_connect_impl)( - grpc_exec_ctx* exec_ctx, grpc_closure* closure, grpc_endpoint** ep, + grpc_closure* closure, grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, grpc_millis deadline) = tcp_client_connect_impl; -void grpc_tcp_client_connect(grpc_exec_ctx* exec_ctx, grpc_closure* closure, - grpc_endpoint** ep, +void grpc_tcp_client_connect(grpc_closure* closure, grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, grpc_millis deadline) { - grpc_tcp_client_connect_impl(exec_ctx, closure, ep, interested_parties, - channel_args, addr, deadline); + grpc_tcp_client_connect_impl(closure, ep, interested_parties, channel_args, + addr, deadline); } #endif /* GRPC_UV */ diff --git a/src/core/lib/iomgr/tcp_client_windows.cc b/src/core/lib/iomgr/tcp_client_windows.cc index 5e30725e904..5521a0a9aef 100644 --- a/src/core/lib/iomgr/tcp_client_windows.cc +++ b/src/core/lib/iomgr/tcp_client_windows.cc @@ -52,13 +52,12 @@ typedef struct { grpc_channel_args* channel_args; } async_connect; -static void async_connect_unlock_and_cleanup(grpc_exec_ctx* exec_ctx, - async_connect* ac, +static void async_connect_unlock_and_cleanup(async_connect* ac, grpc_winsocket* socket) { int done = (--ac->refs == 0); gpr_mu_unlock(&ac->mu); if (done) { - grpc_channel_args_destroy(exec_ctx, ac->channel_args); + grpc_channel_args_destroy(ac->channel_args); gpr_mu_destroy(&ac->mu); gpr_free(ac->addr_name); gpr_free(ac); @@ -66,7 +65,7 @@ static void async_connect_unlock_and_cleanup(grpc_exec_ctx* exec_ctx, if (socket != NULL) grpc_winsocket_destroy(socket); } -static void on_alarm(grpc_exec_ctx* exec_ctx, void* acp, grpc_error* error) { +static void on_alarm(void* acp, grpc_error* error) { async_connect* ac = (async_connect*)acp; gpr_mu_lock(&ac->mu); grpc_winsocket* socket = ac->socket; @@ -74,10 +73,10 @@ static void on_alarm(grpc_exec_ctx* exec_ctx, void* acp, grpc_error* error) { if (socket != NULL) { grpc_winsocket_shutdown(socket); } - async_connect_unlock_and_cleanup(exec_ctx, ac, socket); + async_connect_unlock_and_cleanup(ac, socket); } -static void on_connect(grpc_exec_ctx* exec_ctx, void* acp, grpc_error* error) { +static void on_connect(void* acp, grpc_error* error) { async_connect* ac = (async_connect*)acp; grpc_endpoint** ep = ac->endpoint; GPR_ASSERT(*ep == NULL); @@ -90,7 +89,7 @@ static void on_connect(grpc_exec_ctx* exec_ctx, void* acp, grpc_error* error) { ac->socket = NULL; gpr_mu_unlock(&ac->mu); - grpc_timer_cancel(exec_ctx, &ac->alarm); + grpc_timer_cancel(&ac->alarm); gpr_mu_lock(&ac->mu); @@ -105,8 +104,7 @@ static void on_connect(grpc_exec_ctx* exec_ctx, void* acp, grpc_error* error) { if (!wsa_success) { error = GRPC_WSA_ERROR(WSAGetLastError(), "ConnectEx"); } else { - *ep = - grpc_tcp_create(exec_ctx, socket, ac->channel_args, ac->addr_name); + *ep = grpc_tcp_create(socket, ac->channel_args, ac->addr_name); socket = NULL; } } else { @@ -114,18 +112,20 @@ static void on_connect(grpc_exec_ctx* exec_ctx, void* acp, grpc_error* error) { } } - async_connect_unlock_and_cleanup(exec_ctx, ac, socket); + async_connect_unlock_and_cleanup(ac, socket); /* If the connection was aborted, the callback was already called when the deadline was met. */ - GRPC_CLOSURE_SCHED(exec_ctx, on_done, error); + GRPC_CLOSURE_SCHED(on_done, error); } /* Tries to issue one async connection, then schedules both an IOCP notification request for the connection, and one timeout alert. */ -static void tcp_client_connect_impl( - grpc_exec_ctx* exec_ctx, grpc_closure* on_done, grpc_endpoint** endpoint, - grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, - const grpc_resolved_address* addr, grpc_millis deadline) { +static void tcp_client_connect_impl(grpc_closure* on_done, + grpc_endpoint** endpoint, + grpc_pollset_set* interested_parties, + const grpc_channel_args* channel_args, + const grpc_resolved_address* addr, + grpc_millis deadline) { SOCKET sock = INVALID_SOCKET; BOOL success; int status; @@ -205,8 +205,8 @@ static void tcp_client_connect_impl( GRPC_CLOSURE_INIT(&ac->on_connect, on_connect, ac, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&ac->on_alarm, on_alarm, ac, grpc_schedule_on_exec_ctx); - grpc_timer_init(exec_ctx, &ac->alarm, deadline, &ac->on_alarm); - grpc_socket_notify_on_write(exec_ctx, socket, &ac->on_connect); + grpc_timer_init(&ac->alarm, deadline, &ac->on_alarm); + grpc_socket_notify_on_write(socket, &ac->on_connect); return; failure: @@ -222,24 +222,23 @@ failure: } else if (sock != INVALID_SOCKET) { closesocket(sock); } - GRPC_CLOSURE_SCHED(exec_ctx, on_done, final_error); + GRPC_CLOSURE_SCHED(on_done, final_error); } // overridden by api_fuzzer.c void (*grpc_tcp_client_connect_impl)( - grpc_exec_ctx* exec_ctx, grpc_closure* closure, grpc_endpoint** ep, + grpc_closure* closure, grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, grpc_millis deadline) = tcp_client_connect_impl; -void grpc_tcp_client_connect(grpc_exec_ctx* exec_ctx, grpc_closure* closure, - grpc_endpoint** ep, +void grpc_tcp_client_connect(grpc_closure* closure, grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, grpc_millis deadline) { - grpc_tcp_client_connect_impl(exec_ctx, closure, ep, interested_parties, - channel_args, addr, deadline); + grpc_tcp_client_connect_impl(closure, ep, interested_parties, channel_args, + addr, deadline); } #endif /* GRPC_WINSOCK_SOCKET */ diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index d09cfca9af4..155329d2e83 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -108,36 +108,31 @@ typedef struct backup_poller { static gpr_atm g_uncovered_notifications_pending; static gpr_atm g_backup_poller; /* backup_poller* */ -static void tcp_handle_read(grpc_exec_ctx* exec_ctx, void* arg /* grpc_tcp */, - grpc_error* error); -static void tcp_handle_write(grpc_exec_ctx* exec_ctx, void* arg /* grpc_tcp */, - grpc_error* error); -static void tcp_drop_uncovered_then_handle_write(grpc_exec_ctx* exec_ctx, - void* arg /* grpc_tcp */, +static void tcp_handle_read(void* arg /* grpc_tcp */, grpc_error* error); +static void tcp_handle_write(void* arg /* grpc_tcp */, grpc_error* error); +static void tcp_drop_uncovered_then_handle_write(void* arg /* grpc_tcp */, grpc_error* error); -static void done_poller(grpc_exec_ctx* exec_ctx, void* bp, - grpc_error* error_ignored) { +static void done_poller(void* bp, grpc_error* error_ignored) { backup_poller* p = (backup_poller*)bp; if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p destroy", p); } - grpc_pollset_destroy(exec_ctx, BACKUP_POLLER_POLLSET(p)); + grpc_pollset_destroy(BACKUP_POLLER_POLLSET(p)); gpr_free(p); } -static void run_poller(grpc_exec_ctx* exec_ctx, void* bp, - grpc_error* error_ignored) { +static void run_poller(void* bp, grpc_error* error_ignored) { backup_poller* p = (backup_poller*)bp; if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p run", p); } gpr_mu_lock(p->pollset_mu); - grpc_millis deadline = grpc_exec_ctx_now(exec_ctx) + 13 * GPR_MS_PER_SEC; - GRPC_STATS_INC_TCP_BACKUP_POLLER_POLLS(exec_ctx); + grpc_millis deadline = grpc_core::ExecCtx::Get()->Now() + 13 * GPR_MS_PER_SEC; + GRPC_STATS_INC_TCP_BACKUP_POLLER_POLLS(); GRPC_LOG_IF_ERROR( "backup_poller:pollset_work", - grpc_pollset_work(exec_ctx, BACKUP_POLLER_POLLSET(p), nullptr, deadline)); + grpc_pollset_work(BACKUP_POLLER_POLLSET(p), nullptr, deadline)); gpr_mu_unlock(p->pollset_mu); /* last "uncovered" notification is the ref that keeps us polling, if we get * there try a cas to release it */ @@ -152,18 +147,18 @@ static void run_poller(grpc_exec_ctx* exec_ctx, void* bp, if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p shutdown", p); } - grpc_pollset_shutdown(exec_ctx, BACKUP_POLLER_POLLSET(p), + grpc_pollset_shutdown(BACKUP_POLLER_POLLSET(p), GRPC_CLOSURE_INIT(&p->run_poller, done_poller, p, grpc_schedule_on_exec_ctx)); } else { if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p reschedule", p); } - GRPC_CLOSURE_SCHED(exec_ctx, &p->run_poller, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&p->run_poller, GRPC_ERROR_NONE); } } -static void drop_uncovered(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { +static void drop_uncovered(grpc_tcp* tcp) { backup_poller* p = (backup_poller*)gpr_atm_acq_load(&g_backup_poller); gpr_atm old_count = gpr_atm_no_barrier_fetch_add(&g_uncovered_notifications_pending, -1); @@ -174,7 +169,7 @@ static void drop_uncovered(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { GPR_ASSERT(old_count != 1); } -static void cover_self(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { +static void cover_self(grpc_tcp* tcp) { backup_poller* p; gpr_atm old_count = gpr_atm_no_barrier_fetch_add(&g_uncovered_notifications_pending, 2); @@ -183,7 +178,7 @@ static void cover_self(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { 2 + (int)old_count); } if (old_count == 0) { - GRPC_STATS_INC_TCP_BACKUP_POLLERS_CREATED(exec_ctx); + GRPC_STATS_INC_TCP_BACKUP_POLLERS_CREATED(); p = (backup_poller*)gpr_zalloc(sizeof(*p) + grpc_pollset_size()); if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p create", p); @@ -191,7 +186,6 @@ static void cover_self(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { grpc_pollset_init(BACKUP_POLLER_POLLSET(p), &p->pollset_mu); gpr_atm_rel_store(&g_backup_poller, (gpr_atm)p); GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_INIT(&p->run_poller, run_poller, p, grpc_executor_scheduler(GRPC_EXECUTOR_LONG)), GRPC_ERROR_NONE); @@ -204,39 +198,38 @@ static void cover_self(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "BACKUP_POLLER:%p add %p", p, tcp); } - grpc_pollset_add_fd(exec_ctx, BACKUP_POLLER_POLLSET(p), tcp->em_fd); + grpc_pollset_add_fd(BACKUP_POLLER_POLLSET(p), tcp->em_fd); if (old_count != 0) { - drop_uncovered(exec_ctx, tcp); + drop_uncovered(tcp); } } -static void notify_on_read(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { +static void notify_on_read(grpc_tcp* tcp) { if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "TCP:%p notify_on_read", tcp); } GRPC_CLOSURE_INIT(&tcp->read_done_closure, tcp_handle_read, tcp, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(exec_ctx, tcp->em_fd, &tcp->read_done_closure); + grpc_fd_notify_on_read(tcp->em_fd, &tcp->read_done_closure); } -static void notify_on_write(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { +static void notify_on_write(grpc_tcp* tcp) { if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "TCP:%p notify_on_write", tcp); } - cover_self(exec_ctx, tcp); + cover_self(tcp); GRPC_CLOSURE_INIT(&tcp->write_done_closure, tcp_drop_uncovered_then_handle_write, tcp, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_write(exec_ctx, tcp->em_fd, &tcp->write_done_closure); + grpc_fd_notify_on_write(tcp->em_fd, &tcp->write_done_closure); } -static void tcp_drop_uncovered_then_handle_write(grpc_exec_ctx* exec_ctx, - void* arg, grpc_error* error) { +static void tcp_drop_uncovered_then_handle_write(void* arg, grpc_error* error) { if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "TCP:%p got_write: %s", arg, grpc_error_string(error)); } - drop_uncovered(exec_ctx, (grpc_tcp*)arg); - tcp_handle_write(exec_ctx, arg, error); + drop_uncovered((grpc_tcp*)arg); + tcp_handle_write(arg, error); } static void add_to_estimate(grpc_tcp* tcp, size_t bytes) { @@ -282,33 +275,29 @@ static grpc_error* tcp_annotate_error(grpc_error* src_error, grpc_tcp* tcp) { grpc_slice_from_copied_string(tcp->peer_string)); } -static void tcp_handle_read(grpc_exec_ctx* exec_ctx, void* arg /* grpc_tcp */, - grpc_error* error); -static void tcp_handle_write(grpc_exec_ctx* exec_ctx, void* arg /* grpc_tcp */, - grpc_error* error); +static void tcp_handle_read(void* arg /* grpc_tcp */, grpc_error* error); +static void tcp_handle_write(void* arg /* grpc_tcp */, grpc_error* error); -static void tcp_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_error* why) { +static void tcp_shutdown(grpc_endpoint* ep, grpc_error* why) { grpc_tcp* tcp = (grpc_tcp*)ep; - grpc_fd_shutdown(exec_ctx, tcp->em_fd, why); - grpc_resource_user_shutdown(exec_ctx, tcp->resource_user); + grpc_fd_shutdown(tcp->em_fd, why); + grpc_resource_user_shutdown(tcp->resource_user); } -static void tcp_free(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { - grpc_fd_orphan(exec_ctx, tcp->em_fd, tcp->release_fd_cb, tcp->release_fd, +static void tcp_free(grpc_tcp* tcp) { + grpc_fd_orphan(tcp->em_fd, tcp->release_fd_cb, tcp->release_fd, false /* already_closed */, "tcp_unref_orphan"); - grpc_slice_buffer_destroy_internal(exec_ctx, &tcp->last_read_buffer); - grpc_resource_user_unref(exec_ctx, tcp->resource_user); + grpc_slice_buffer_destroy_internal(&tcp->last_read_buffer); + grpc_resource_user_unref(tcp->resource_user); gpr_free(tcp->peer_string); gpr_free(tcp); } #ifndef NDEBUG -#define TCP_UNREF(cl, tcp, reason) \ - tcp_unref((cl), (tcp), (reason), __FILE__, __LINE__) +#define TCP_UNREF(tcp, reason) tcp_unref((tcp), (reason), __FILE__, __LINE__) #define TCP_REF(tcp, reason) tcp_ref((tcp), (reason), __FILE__, __LINE__) -static void tcp_unref(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, - const char* reason, const char* file, int line) { +static void tcp_unref(grpc_tcp* tcp, const char* reason, const char* file, + int line) { if (grpc_tcp_trace.enabled()) { gpr_atm val = gpr_atm_no_barrier_load(&tcp->refcount.count); gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, @@ -316,7 +305,7 @@ static void tcp_unref(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, val - 1); } if (gpr_unref(&tcp->refcount)) { - tcp_free(exec_ctx, tcp); + tcp_free(tcp); } } @@ -331,26 +320,25 @@ static void tcp_ref(grpc_tcp* tcp, const char* reason, const char* file, gpr_ref(&tcp->refcount); } #else -#define TCP_UNREF(cl, tcp, reason) tcp_unref((cl), (tcp)) +#define TCP_UNREF(tcp, reason) tcp_unref((tcp)) #define TCP_REF(tcp, reason) tcp_ref((tcp)) -static void tcp_unref(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { +static void tcp_unref(grpc_tcp* tcp) { if (gpr_unref(&tcp->refcount)) { - tcp_free(exec_ctx, tcp); + tcp_free(tcp); } } static void tcp_ref(grpc_tcp* tcp) { gpr_ref(&tcp->refcount); } #endif -static void tcp_destroy(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep) { +static void tcp_destroy(grpc_endpoint* ep) { grpc_network_status_unregister_endpoint(ep); grpc_tcp* tcp = (grpc_tcp*)ep; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &tcp->last_read_buffer); - TCP_UNREF(exec_ctx, tcp, "destroy"); + grpc_slice_buffer_reset_and_unref_internal(&tcp->last_read_buffer); + TCP_UNREF(tcp, "destroy"); } -static void call_read_cb(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, - grpc_error* error) { +static void call_read_cb(grpc_tcp* tcp, grpc_error* error) { grpc_closure* cb = tcp->read_cb; if (grpc_tcp_trace.enabled()) { @@ -369,11 +357,11 @@ static void call_read_cb(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, tcp->read_cb = nullptr; tcp->incoming_buffer = nullptr; - GRPC_CLOSURE_RUN(exec_ctx, cb, error); + GRPC_CLOSURE_RUN(cb, error); } #define MAX_READ_IOVEC 4 -static void tcp_do_read(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { +static void tcp_do_read(grpc_tcp* tcp) { struct msghdr msg; struct iovec iov[MAX_READ_IOVEC]; ssize_t read_bytes; @@ -396,12 +384,12 @@ static void tcp_do_read(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { msg.msg_controllen = 0; msg.msg_flags = 0; - GRPC_STATS_INC_TCP_READ_OFFER(exec_ctx, tcp->incoming_buffer->length); - GRPC_STATS_INC_TCP_READ_OFFER_IOV_SIZE(exec_ctx, tcp->incoming_buffer->count); + GRPC_STATS_INC_TCP_READ_OFFER(tcp->incoming_buffer->length); + GRPC_STATS_INC_TCP_READ_OFFER_IOV_SIZE(tcp->incoming_buffer->count); GPR_TIMER_BEGIN("recvmsg", 0); do { - GRPC_STATS_INC_SYSCALL_READ(exec_ctx); + GRPC_STATS_INC_SYSCALL_READ(); read_bytes = recvmsg(tcp->fd, &msg, 0); } while (read_bytes < 0 && errno == EINTR); GPR_TIMER_END("recvmsg", read_bytes >= 0); @@ -412,24 +400,22 @@ static void tcp_do_read(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { if (errno == EAGAIN) { finish_estimate(tcp); /* We've consumed the edge, request a new one */ - notify_on_read(exec_ctx, tcp); + notify_on_read(tcp); } else { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, - tcp->incoming_buffer); - call_read_cb(exec_ctx, tcp, + grpc_slice_buffer_reset_and_unref_internal(tcp->incoming_buffer); + call_read_cb(tcp, tcp_annotate_error(GRPC_OS_ERROR(errno, "recvmsg"), tcp)); - TCP_UNREF(exec_ctx, tcp, "read"); + TCP_UNREF(tcp, "read"); } } else if (read_bytes == 0) { /* 0 read size ==> end of stream */ - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, tcp->incoming_buffer); + grpc_slice_buffer_reset_and_unref_internal(tcp->incoming_buffer); call_read_cb( - exec_ctx, tcp, - tcp_annotate_error( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Socket closed"), tcp)); - TCP_UNREF(exec_ctx, tcp, "read"); + tcp, tcp_annotate_error( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Socket closed"), tcp)); + TCP_UNREF(tcp, "read"); } else { - GRPC_STATS_INC_TCP_READ_SIZE(exec_ctx, read_bytes); + GRPC_STATS_INC_TCP_READ_SIZE(read_bytes); add_to_estimate(tcp, (size_t)read_bytes); GPR_ASSERT((size_t)read_bytes <= tcp->incoming_buffer->length); if ((size_t)read_bytes < tcp->incoming_buffer->length) { @@ -439,50 +425,47 @@ static void tcp_do_read(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { &tcp->last_read_buffer); } GPR_ASSERT((size_t)read_bytes == tcp->incoming_buffer->length); - call_read_cb(exec_ctx, tcp, GRPC_ERROR_NONE); - TCP_UNREF(exec_ctx, tcp, "read"); + call_read_cb(tcp, GRPC_ERROR_NONE); + TCP_UNREF(tcp, "read"); } GPR_TIMER_END("tcp_continue_read", 0); } -static void tcp_read_allocation_done(grpc_exec_ctx* exec_ctx, void* tcpp, - grpc_error* error) { +static void tcp_read_allocation_done(void* tcpp, grpc_error* error) { grpc_tcp* tcp = (grpc_tcp*)tcpp; if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "TCP:%p read_allocation_done: %s", tcp, grpc_error_string(error)); } if (error != GRPC_ERROR_NONE) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, tcp->incoming_buffer); - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, - &tcp->last_read_buffer); - call_read_cb(exec_ctx, tcp, GRPC_ERROR_REF(error)); - TCP_UNREF(exec_ctx, tcp, "read"); + grpc_slice_buffer_reset_and_unref_internal(tcp->incoming_buffer); + grpc_slice_buffer_reset_and_unref_internal(&tcp->last_read_buffer); + call_read_cb(tcp, GRPC_ERROR_REF(error)); + TCP_UNREF(tcp, "read"); } else { - tcp_do_read(exec_ctx, tcp); + tcp_do_read(tcp); } } -static void tcp_continue_read(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { +static void tcp_continue_read(grpc_tcp* tcp) { size_t target_read_size = get_target_read_size(tcp); if (tcp->incoming_buffer->length < target_read_size && tcp->incoming_buffer->count < MAX_READ_IOVEC) { if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "TCP:%p alloc_slices", tcp); } - grpc_resource_user_alloc_slices(exec_ctx, &tcp->slice_allocator, - target_read_size, 1, tcp->incoming_buffer); + grpc_resource_user_alloc_slices(&tcp->slice_allocator, target_read_size, 1, + tcp->incoming_buffer); } else { if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "TCP:%p do_read", tcp); } - tcp_do_read(exec_ctx, tcp); + tcp_do_read(tcp); } } -static void tcp_handle_read(grpc_exec_ctx* exec_ctx, void* arg /* grpc_tcp */, - grpc_error* error) { +static void tcp_handle_read(void* arg /* grpc_tcp */, grpc_error* error) { grpc_tcp* tcp = (grpc_tcp*)arg; GPR_ASSERT(!tcp->finished_edge); if (grpc_tcp_trace.enabled()) { @@ -490,37 +473,35 @@ static void tcp_handle_read(grpc_exec_ctx* exec_ctx, void* arg /* grpc_tcp */, } if (error != GRPC_ERROR_NONE) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, tcp->incoming_buffer); - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, - &tcp->last_read_buffer); - call_read_cb(exec_ctx, tcp, GRPC_ERROR_REF(error)); - TCP_UNREF(exec_ctx, tcp, "read"); + grpc_slice_buffer_reset_and_unref_internal(tcp->incoming_buffer); + grpc_slice_buffer_reset_and_unref_internal(&tcp->last_read_buffer); + call_read_cb(tcp, GRPC_ERROR_REF(error)); + TCP_UNREF(tcp, "read"); } else { - tcp_continue_read(exec_ctx, tcp); + tcp_continue_read(tcp); } } -static void tcp_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* incoming_buffer, grpc_closure* cb) { +static void tcp_read(grpc_endpoint* ep, grpc_slice_buffer* incoming_buffer, + grpc_closure* cb) { grpc_tcp* tcp = (grpc_tcp*)ep; GPR_ASSERT(tcp->read_cb == nullptr); tcp->read_cb = cb; tcp->incoming_buffer = incoming_buffer; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, incoming_buffer); + grpc_slice_buffer_reset_and_unref_internal(incoming_buffer); grpc_slice_buffer_swap(incoming_buffer, &tcp->last_read_buffer); TCP_REF(tcp, "read"); if (tcp->finished_edge) { tcp->finished_edge = false; - notify_on_read(exec_ctx, tcp); + notify_on_read(tcp); } else { - GRPC_CLOSURE_SCHED(exec_ctx, &tcp->read_done_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&tcp->read_done_closure, GRPC_ERROR_NONE); } } /* returns true if done, false if pending; if returning true, *error is set */ #define MAX_WRITE_IOVEC 1000 -static bool tcp_flush(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, - grpc_error** error) { +static bool tcp_flush(grpc_tcp* tcp, grpc_error** error) { struct msghdr msg; struct iovec iov[MAX_WRITE_IOVEC]; msg_iovlen_type iov_size; @@ -562,13 +543,13 @@ static bool tcp_flush(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, msg.msg_controllen = 0; msg.msg_flags = 0; - GRPC_STATS_INC_TCP_WRITE_SIZE(exec_ctx, sending_length); - GRPC_STATS_INC_TCP_WRITE_IOV_SIZE(exec_ctx, iov_size); + GRPC_STATS_INC_TCP_WRITE_SIZE(sending_length); + GRPC_STATS_INC_TCP_WRITE_IOV_SIZE(iov_size); GPR_TIMER_BEGIN("sendmsg", 1); do { /* TODO(klempner): Cork if this is a partial write */ - GRPC_STATS_INC_SYSCALL_WRITE(exec_ctx); + GRPC_STATS_INC_SYSCALL_WRITE(); sent_length = sendmsg(tcp->fd, &msg, SENDMSG_FLAGS); } while (sent_length < 0 && errno == EINTR); GPR_TIMER_END("sendmsg", 0); @@ -580,20 +561,18 @@ static bool tcp_flush(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, // point for (size_t idx = 0; idx < unwind_slice_idx; ++idx) { grpc_slice_unref_internal( - exec_ctx, grpc_slice_buffer_take_first(tcp->outgoing_buffer)); + grpc_slice_buffer_take_first(tcp->outgoing_buffer)); } return false; } else if (errno == EPIPE) { *error = grpc_error_set_int(GRPC_OS_ERROR(errno, "sendmsg"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE); - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, - tcp->outgoing_buffer); + grpc_slice_buffer_reset_and_unref_internal(tcp->outgoing_buffer); return true; } else { *error = tcp_annotate_error(GRPC_OS_ERROR(errno, "sendmsg"), tcp); - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, - tcp->outgoing_buffer); + grpc_slice_buffer_reset_and_unref_internal(tcp->outgoing_buffer); return true; } } @@ -616,31 +595,29 @@ static bool tcp_flush(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, if (outgoing_slice_idx == tcp->outgoing_buffer->count) { *error = GRPC_ERROR_NONE; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, - tcp->outgoing_buffer); + grpc_slice_buffer_reset_and_unref_internal(tcp->outgoing_buffer); return true; } } } -static void tcp_handle_write(grpc_exec_ctx* exec_ctx, void* arg /* grpc_tcp */, - grpc_error* error) { +static void tcp_handle_write(void* arg /* grpc_tcp */, grpc_error* error) { grpc_tcp* tcp = (grpc_tcp*)arg; grpc_closure* cb; if (error != GRPC_ERROR_NONE) { cb = tcp->write_cb; tcp->write_cb = nullptr; - cb->cb(exec_ctx, cb->cb_arg, error); - TCP_UNREF(exec_ctx, tcp, "write"); + cb->cb(cb->cb_arg, error); + TCP_UNREF(tcp, "write"); return; } - if (!tcp_flush(exec_ctx, tcp, &error)) { + if (!tcp_flush(tcp, &error)) { if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "write: delayed"); } - notify_on_write(exec_ctx, tcp); + notify_on_write(tcp); } else { cb = tcp->write_cb; tcp->write_cb = nullptr; @@ -649,13 +626,13 @@ static void tcp_handle_write(grpc_exec_ctx* exec_ctx, void* arg /* grpc_tcp */, gpr_log(GPR_DEBUG, "write: %s", str); } - GRPC_CLOSURE_RUN(exec_ctx, cb, error); - TCP_UNREF(exec_ctx, tcp, "write"); + GRPC_CLOSURE_RUN(cb, error); + TCP_UNREF(tcp, "write"); } } -static void tcp_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* buf, grpc_closure* cb) { +static void tcp_write(grpc_endpoint* ep, grpc_slice_buffer* buf, + grpc_closure* cb) { grpc_tcp* tcp = (grpc_tcp*)ep; grpc_error* error = GRPC_ERROR_NONE; @@ -676,51 +653,48 @@ static void tcp_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, if (buf->length == 0) { GPR_TIMER_END("tcp_write", 0); GRPC_CLOSURE_SCHED( - exec_ctx, cb, - grpc_fd_is_shutdown(tcp->em_fd) - ? tcp_annotate_error(GRPC_ERROR_CREATE_FROM_STATIC_STRING("EOF"), - tcp) - : GRPC_ERROR_NONE); + cb, grpc_fd_is_shutdown(tcp->em_fd) + ? tcp_annotate_error( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("EOF"), tcp) + : GRPC_ERROR_NONE); return; } tcp->outgoing_buffer = buf; tcp->outgoing_byte_idx = 0; - if (!tcp_flush(exec_ctx, tcp, &error)) { + if (!tcp_flush(tcp, &error)) { TCP_REF(tcp, "write"); tcp->write_cb = cb; if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "write: delayed"); } - notify_on_write(exec_ctx, tcp); + notify_on_write(tcp); } else { if (grpc_tcp_trace.enabled()) { const char* str = grpc_error_string(error); gpr_log(GPR_DEBUG, "write: %s", str); } - GRPC_CLOSURE_SCHED(exec_ctx, cb, error); + GRPC_CLOSURE_SCHED(cb, error); } GPR_TIMER_END("tcp_write", 0); } -static void tcp_add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_pollset* pollset) { +static void tcp_add_to_pollset(grpc_endpoint* ep, grpc_pollset* pollset) { grpc_tcp* tcp = (grpc_tcp*)ep; - grpc_pollset_add_fd(exec_ctx, pollset, tcp->em_fd); + grpc_pollset_add_fd(pollset, tcp->em_fd); } -static void tcp_add_to_pollset_set(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, +static void tcp_add_to_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset_set) { grpc_tcp* tcp = (grpc_tcp*)ep; - grpc_pollset_set_add_fd(exec_ctx, pollset_set, tcp->em_fd); + grpc_pollset_set_add_fd(pollset_set, tcp->em_fd); } -static void tcp_delete_from_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_endpoint* ep, +static void tcp_delete_from_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset_set) { grpc_tcp* tcp = (grpc_tcp*)ep; - grpc_pollset_set_del_fd(exec_ctx, pollset_set, tcp->em_fd); + grpc_pollset_set_del_fd(pollset_set, tcp->em_fd); } static char* tcp_get_peer(grpc_endpoint* ep) { @@ -751,7 +725,7 @@ static const grpc_endpoint_vtable vtable = {tcp_read, #define MAX_CHUNK_SIZE 32 * 1024 * 1024 -grpc_endpoint* grpc_tcp_create(grpc_exec_ctx* exec_ctx, grpc_fd* em_fd, +grpc_endpoint* grpc_tcp_create(grpc_fd* em_fd, const grpc_channel_args* channel_args, const char* peer_string) { int tcp_read_chunk_size = GRPC_TCP_DEFAULT_READ_SLICE_SIZE; @@ -780,7 +754,7 @@ grpc_endpoint* grpc_tcp_create(grpc_exec_ctx* exec_ctx, grpc_fd* em_fd, grpc_channel_arg_get_integer(&channel_args->args[i], options); } else if (0 == strcmp(channel_args->args[i].key, GRPC_ARG_RESOURCE_QUOTA)) { - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); resource_quota = grpc_resource_quota_ref_internal( (grpc_resource_quota*)channel_args->args[i].value.pointer.p); } @@ -817,7 +791,7 @@ grpc_endpoint* grpc_tcp_create(grpc_exec_ctx* exec_ctx, grpc_fd* em_fd, &tcp->slice_allocator, tcp->resource_user, tcp_read_allocation_done, tcp); /* Tell network status tracker about new endpoint */ grpc_network_status_register_endpoint(&tcp->base); - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); return &tcp->base; } @@ -828,15 +802,15 @@ int grpc_tcp_fd(grpc_endpoint* ep) { return grpc_fd_wrapped_fd(tcp->em_fd); } -void grpc_tcp_destroy_and_release_fd(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - int* fd, grpc_closure* done) { +void grpc_tcp_destroy_and_release_fd(grpc_endpoint* ep, int* fd, + grpc_closure* done) { grpc_network_status_unregister_endpoint(ep); grpc_tcp* tcp = (grpc_tcp*)ep; GPR_ASSERT(ep->vtable == &vtable); tcp->release_fd = fd; tcp->release_fd_cb = done; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &tcp->last_read_buffer); - TCP_UNREF(exec_ctx, tcp, "destroy"); + grpc_slice_buffer_reset_and_unref_internal(&tcp->last_read_buffer); + TCP_UNREF(tcp, "destroy"); } #endif diff --git a/src/core/lib/iomgr/tcp_posix.h b/src/core/lib/iomgr/tcp_posix.h index 09051b7ed65..4529c02beb3 100644 --- a/src/core/lib/iomgr/tcp_posix.h +++ b/src/core/lib/iomgr/tcp_posix.h @@ -37,8 +37,7 @@ extern grpc_core::TraceFlag grpc_tcp_trace; /* Create a tcp endpoint given a file desciptor and a read slice size. Takes ownership of fd. */ -grpc_endpoint* grpc_tcp_create(grpc_exec_ctx* exec_ctx, grpc_fd* fd, - const grpc_channel_args* args, +grpc_endpoint* grpc_tcp_create(grpc_fd* fd, const grpc_channel_args* args, const char* peer_string); /* Return the tcp endpoint's fd, or -1 if this is not available. Does not @@ -50,7 +49,7 @@ int grpc_tcp_fd(grpc_endpoint* ep); /* Destroy the tcp endpoint without closing its fd. *fd will be set and done * will be called when the endpoint is destroyed. * Requires: ep must be a tcp endpoint and fd must not be NULL. */ -void grpc_tcp_destroy_and_release_fd(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - int* fd, grpc_closure* done); +void grpc_tcp_destroy_and_release_fd(grpc_endpoint* ep, int* fd, + grpc_closure* done); #endif /* GRPC_CORE_LIB_IOMGR_TCP_POSIX_H */ diff --git a/src/core/lib/iomgr/tcp_server.h b/src/core/lib/iomgr/tcp_server.h index a1757a2b3ee..038c765c6cc 100644 --- a/src/core/lib/iomgr/tcp_server.h +++ b/src/core/lib/iomgr/tcp_server.h @@ -39,22 +39,20 @@ typedef struct grpc_tcp_server_acceptor { /* Called for newly connected TCP connections. Takes ownership of acceptor. */ -typedef void (*grpc_tcp_server_cb)(grpc_exec_ctx* exec_ctx, void* arg, - grpc_endpoint* ep, +typedef void (*grpc_tcp_server_cb)(void* arg, grpc_endpoint* ep, grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor); /* Create a server, initially not bound to any ports. The caller owns one ref. If shutdown_complete is not NULL, it will be used by grpc_tcp_server_unref() when the ref count reaches zero. */ -grpc_error* grpc_tcp_server_create(grpc_exec_ctx* exec_ctx, - grpc_closure* shutdown_complete, +grpc_error* grpc_tcp_server_create(grpc_closure* shutdown_complete, const grpc_channel_args* args, grpc_tcp_server** server); /* Start listening to bound ports */ -void grpc_tcp_server_start(grpc_exec_ctx* exec_ctx, grpc_tcp_server* server, - grpc_pollset** pollsets, size_t pollset_count, +void grpc_tcp_server_start(grpc_tcp_server* server, grpc_pollset** pollsets, + size_t pollset_count, grpc_tcp_server_cb on_accept_cb, void* cb_arg); /* Add a port to the server, returning the newly allocated port on success, or @@ -92,10 +90,9 @@ void grpc_tcp_server_shutdown_starting_add(grpc_tcp_server* s, /* If the refcount drops to zero, enqueue calls on exec_ctx to shutdown_listeners and delete s. */ -void grpc_tcp_server_unref(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s); +void grpc_tcp_server_unref(grpc_tcp_server* s); /* Shutdown the fds of listeners. */ -void grpc_tcp_server_shutdown_listeners(grpc_exec_ctx* exec_ctx, - grpc_tcp_server* s); +void grpc_tcp_server_shutdown_listeners(grpc_tcp_server* s); #endif /* GRPC_CORE_LIB_IOMGR_TCP_SERVER_H */ diff --git a/src/core/lib/iomgr/tcp_server_posix.cc b/src/core/lib/iomgr/tcp_server_posix.cc index 6fed13c6c75..99e1c6cd069 100644 --- a/src/core/lib/iomgr/tcp_server_posix.cc +++ b/src/core/lib/iomgr/tcp_server_posix.cc @@ -68,8 +68,7 @@ static void init(void) { #endif } -grpc_error* grpc_tcp_server_create(grpc_exec_ctx* exec_ctx, - grpc_closure* shutdown_complete, +grpc_error* grpc_tcp_server_create(grpc_closure* shutdown_complete, const grpc_channel_args* args, grpc_tcp_server** server) { gpr_once_init(&check_init, init); @@ -116,12 +115,12 @@ grpc_error* grpc_tcp_server_create(grpc_exec_ctx* exec_ctx, return GRPC_ERROR_NONE; } -static void finish_shutdown(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { +static void finish_shutdown(grpc_tcp_server* s) { gpr_mu_lock(&s->mu); GPR_ASSERT(s->shutdown); gpr_mu_unlock(&s->mu); if (s->shutdown_complete != nullptr) { - GRPC_CLOSURE_SCHED(exec_ctx, s->shutdown_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(s->shutdown_complete, GRPC_ERROR_NONE); } gpr_mu_destroy(&s->mu); @@ -131,19 +130,18 @@ static void finish_shutdown(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { s->head = sp->next; gpr_free(sp); } - grpc_channel_args_destroy(exec_ctx, s->channel_args); + grpc_channel_args_destroy(s->channel_args); gpr_free(s); } -static void destroyed_port(grpc_exec_ctx* exec_ctx, void* server, - grpc_error* error) { +static void destroyed_port(void* server, grpc_error* error) { grpc_tcp_server* s = (grpc_tcp_server*)server; gpr_mu_lock(&s->mu); s->destroyed_ports++; if (s->destroyed_ports == s->nports) { gpr_mu_unlock(&s->mu); - finish_shutdown(exec_ctx, s); + finish_shutdown(s); } else { GPR_ASSERT(s->destroyed_ports < s->nports); gpr_mu_unlock(&s->mu); @@ -153,7 +151,7 @@ static void destroyed_port(grpc_exec_ctx* exec_ctx, void* server, /* called when all listening endpoints have been shutdown, so no further events will be received on them - at this point it's safe to destroy things */ -static void deactivated_all_ports(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { +static void deactivated_all_ports(grpc_tcp_server* s) { /* delete ALL the things */ gpr_mu_lock(&s->mu); @@ -165,17 +163,17 @@ static void deactivated_all_ports(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { grpc_unlink_if_unix_domain_socket(&sp->addr); GRPC_CLOSURE_INIT(&sp->destroyed_closure, destroyed_port, s, grpc_schedule_on_exec_ctx); - grpc_fd_orphan(exec_ctx, sp->emfd, &sp->destroyed_closure, nullptr, + grpc_fd_orphan(sp->emfd, &sp->destroyed_closure, nullptr, false /* already_closed */, "tcp_listener_shutdown"); } gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - finish_shutdown(exec_ctx, s); + finish_shutdown(s); } } -static void tcp_server_destroy(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { +static void tcp_server_destroy(grpc_tcp_server* s) { gpr_mu_lock(&s->mu); GPR_ASSERT(!s->shutdown); @@ -186,18 +184,17 @@ static void tcp_server_destroy(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { grpc_tcp_listener* sp; for (sp = s->head; sp; sp = sp->next) { grpc_fd_shutdown( - exec_ctx, sp->emfd, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server destroyed")); + sp->emfd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server destroyed")); } gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - deactivated_all_ports(exec_ctx, s); + deactivated_all_ports(s); } } /* event manager callback when reads are ready */ -static void on_read(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* err) { +static void on_read(void* arg, grpc_error* err) { grpc_tcp_listener* sp = (grpc_tcp_listener*)arg; grpc_pollset* read_notifier_pollset; if (err != GRPC_ERROR_NONE) { @@ -223,7 +220,7 @@ static void on_read(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* err) { case EINTR: continue; case EAGAIN: - grpc_fd_notify_on_read(exec_ctx, sp->emfd, &sp->read_closure); + grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); return; default: gpr_mu_lock(&sp->server->mu); @@ -249,7 +246,7 @@ static void on_read(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* err) { grpc_fd* fdobj = grpc_fd_create(fd, name); - grpc_pollset_add_fd(exec_ctx, read_notifier_pollset, fdobj); + grpc_pollset_add_fd(read_notifier_pollset, fdobj); // Create acceptor. grpc_tcp_server_acceptor* acceptor = @@ -259,8 +256,8 @@ static void on_read(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* err) { acceptor->fd_index = sp->fd_index; sp->server->on_accept_cb( - exec_ctx, sp->server->on_accept_cb_arg, - grpc_tcp_create(exec_ctx, fdobj, sp->server->channel_args, addr_str), + sp->server->on_accept_cb_arg, + grpc_tcp_create(fdobj, sp->server->channel_args, addr_str), read_notifier_pollset, acceptor); gpr_free(name); @@ -273,7 +270,7 @@ error: gpr_mu_lock(&sp->server->mu); if (0 == --sp->server->active_ports && sp->server->shutdown) { gpr_mu_unlock(&sp->server->mu); - deactivated_all_ports(exec_ctx, sp->server); + deactivated_all_ports(sp->server); } else { gpr_mu_unlock(&sp->server->mu); } @@ -483,8 +480,8 @@ int grpc_tcp_server_port_fd(grpc_tcp_server* s, unsigned port_index, return -1; } -void grpc_tcp_server_start(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s, - grpc_pollset** pollsets, size_t pollset_count, +void grpc_tcp_server_start(grpc_tcp_server* s, grpc_pollset** pollsets, + size_t pollset_count, grpc_tcp_server_cb on_accept_cb, void* on_accept_cb_arg) { size_t i; @@ -504,20 +501,20 @@ void grpc_tcp_server_start(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s, GPR_ASSERT(GRPC_LOG_IF_ERROR( "clone_port", clone_port(sp, (unsigned)(pollset_count - 1)))); for (i = 0; i < pollset_count; i++) { - grpc_pollset_add_fd(exec_ctx, pollsets[i], sp->emfd); + grpc_pollset_add_fd(pollsets[i], sp->emfd); GRPC_CLOSURE_INIT(&sp->read_closure, on_read, sp, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(exec_ctx, sp->emfd, &sp->read_closure); + grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); s->active_ports++; sp = sp->next; } } else { for (i = 0; i < pollset_count; i++) { - grpc_pollset_add_fd(exec_ctx, pollsets[i], sp->emfd); + grpc_pollset_add_fd(pollsets[i], sp->emfd); } GRPC_CLOSURE_INIT(&sp->read_closure, on_read, sp, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(exec_ctx, sp->emfd, &sp->read_closure); + grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); s->active_ports++; sp = sp->next; } @@ -538,25 +535,24 @@ void grpc_tcp_server_shutdown_starting_add(grpc_tcp_server* s, gpr_mu_unlock(&s->mu); } -void grpc_tcp_server_unref(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { +void grpc_tcp_server_unref(grpc_tcp_server* s) { if (gpr_unref(&s->refs)) { - grpc_tcp_server_shutdown_listeners(exec_ctx, s); + grpc_tcp_server_shutdown_listeners(s); gpr_mu_lock(&s->mu); - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &s->shutdown_starting); + GRPC_CLOSURE_LIST_SCHED(&s->shutdown_starting); gpr_mu_unlock(&s->mu); - tcp_server_destroy(exec_ctx, s); + tcp_server_destroy(s); } } -void grpc_tcp_server_shutdown_listeners(grpc_exec_ctx* exec_ctx, - grpc_tcp_server* s) { +void grpc_tcp_server_shutdown_listeners(grpc_tcp_server* s) { gpr_mu_lock(&s->mu); s->shutdown_listeners = true; /* shutdown all fd's */ if (s->active_ports) { grpc_tcp_listener* sp; for (sp = s->head; sp; sp = sp->next) { - grpc_fd_shutdown(exec_ctx, sp->emfd, + grpc_fd_shutdown(sp->emfd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server shutdown")); } } diff --git a/src/core/lib/iomgr/tcp_server_uv.cc b/src/core/lib/iomgr/tcp_server_uv.cc index ffadf0b1abd..1ac49190fb4 100644 --- a/src/core/lib/iomgr/tcp_server_uv.cc +++ b/src/core/lib/iomgr/tcp_server_uv.cc @@ -73,8 +73,7 @@ struct grpc_tcp_server { grpc_resource_quota* resource_quota; }; -grpc_error* grpc_tcp_server_create(grpc_exec_ctx* exec_ctx, - grpc_closure* shutdown_complete, +grpc_error* grpc_tcp_server_create(grpc_closure* shutdown_complete, const grpc_channel_args* args, grpc_tcp_server** server) { grpc_tcp_server* s = (grpc_tcp_server*)gpr_malloc(sizeof(grpc_tcp_server)); @@ -82,11 +81,11 @@ grpc_error* grpc_tcp_server_create(grpc_exec_ctx* exec_ctx, for (size_t i = 0; i < (args == NULL ? 0 : args->num_args); i++) { if (0 == strcmp(GRPC_ARG_RESOURCE_QUOTA, args->args[i].key)) { if (args->args[i].type == GRPC_ARG_POINTER) { - grpc_resource_quota_unref_internal(exec_ctx, s->resource_quota); + grpc_resource_quota_unref_internal(s->resource_quota); s->resource_quota = grpc_resource_quota_ref_internal( (grpc_resource_quota*)args->args[i].value.pointer.p); } else { - grpc_resource_quota_unref_internal(exec_ctx, s->resource_quota); + grpc_resource_quota_unref_internal(s->resource_quota); gpr_free(s); return GRPC_ERROR_CREATE_FROM_STATIC_STRING( GRPC_ARG_RESOURCE_QUOTA " must be a pointer to a buffer pool"); @@ -119,10 +118,10 @@ void grpc_tcp_server_shutdown_starting_add(grpc_tcp_server* s, GRPC_ERROR_NONE); } -static void finish_shutdown(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { +static void finish_shutdown(grpc_tcp_server* s) { GPR_ASSERT(s->shutdown); if (s->shutdown_complete != NULL) { - GRPC_CLOSURE_SCHED(exec_ctx, s->shutdown_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(s->shutdown_complete, GRPC_ERROR_NONE); } while (s->head) { @@ -132,18 +131,17 @@ static void finish_shutdown(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { gpr_free(sp->handle); gpr_free(sp); } - grpc_resource_quota_unref_internal(exec_ctx, s->resource_quota); + grpc_resource_quota_unref_internal(s->resource_quota); gpr_free(s); } static void handle_close_callback(uv_handle_t* handle) { grpc_tcp_listener* sp = (grpc_tcp_listener*)handle->data; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; sp->server->open_ports--; if (sp->server->open_ports == 0 && sp->server->shutdown) { - finish_shutdown(&exec_ctx, sp->server); + finish_shutdown(sp->server); } - grpc_exec_ctx_finish(&exec_ctx); } static void close_listener(grpc_tcp_listener* sp) { @@ -153,7 +151,7 @@ static void close_listener(grpc_tcp_listener* sp) { } } -static void tcp_server_destroy(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { +static void tcp_server_destroy(grpc_tcp_server* s) { int immediately_done = 0; grpc_tcp_listener* sp; @@ -168,28 +166,22 @@ static void tcp_server_destroy(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { } if (immediately_done) { - finish_shutdown(exec_ctx, s); + finish_shutdown(s); } } -void grpc_tcp_server_unref(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { +void grpc_tcp_server_unref(grpc_tcp_server* s) { GRPC_UV_ASSERT_SAME_THREAD(); if (gpr_unref(&s->refs)) { /* Complete shutdown_starting work before destroying. */ - grpc_exec_ctx local_exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_CLOSURE_LIST_SCHED(&local_exec_ctx, &s->shutdown_starting); - if (exec_ctx == NULL) { - grpc_exec_ctx_flush(&local_exec_ctx); - tcp_server_destroy(&local_exec_ctx, s); - grpc_exec_ctx_finish(&local_exec_ctx); - } else { - grpc_exec_ctx_finish(&local_exec_ctx); - tcp_server_destroy(exec_ctx, s); - } + grpc_core::ExecCtx exec_ctx; + GRPC_CLOSURE_LIST_SCHED(&s->shutdown_starting); + grpc_core::ExecCtx::Get()->Flush(); + tcp_server_destroy(s); } } -static void finish_accept(grpc_exec_ctx* exec_ctx, grpc_tcp_listener* sp) { +static void finish_accept(grpc_tcp_listener* sp) { grpc_tcp_server_acceptor* acceptor = (grpc_tcp_server_acceptor*)gpr_malloc(sizeof(*acceptor)); uv_tcp_t* client = NULL; @@ -225,14 +217,13 @@ static void finish_accept(grpc_exec_ctx* exec_ctx, grpc_tcp_listener* sp) { acceptor->from_server = sp->server; acceptor->port_index = sp->port_index; acceptor->fd_index = 0; - sp->server->on_accept_cb(exec_ctx, sp->server->on_accept_cb_arg, ep, NULL, - acceptor); + sp->server->on_accept_cb(sp->server->on_accept_cb_arg, ep, NULL, acceptor); gpr_free(peer_name_string); } static void on_connect(uv_stream_t* server, int status) { grpc_tcp_listener* sp = (grpc_tcp_listener*)server->data; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; if (status < 0) { switch (status) { @@ -253,11 +244,10 @@ static void on_connect(uv_stream_t* server, int status) { // Create acceptor. if (sp->server->on_accept_cb) { - finish_accept(&exec_ctx, sp); + finish_accept(sp); } else { sp->has_pending_connection = true; } - grpc_exec_ctx_finish(&exec_ctx); } static grpc_error* add_addr_to_server(grpc_tcp_server* s, @@ -454,8 +444,8 @@ grpc_error* grpc_tcp_server_add_port(grpc_tcp_server* s, return error; } -void grpc_tcp_server_start(grpc_exec_ctx* exec_ctx, grpc_tcp_server* server, - grpc_pollset** pollsets, size_t pollset_count, +void grpc_tcp_server_start(grpc_tcp_server* server, grpc_pollset** pollsets, + size_t pollset_count, grpc_tcp_server_cb on_accept_cb, void* cb_arg) { grpc_tcp_listener* sp; (void)pollsets; @@ -470,13 +460,12 @@ void grpc_tcp_server_start(grpc_exec_ctx* exec_ctx, grpc_tcp_server* server, server->on_accept_cb_arg = cb_arg; for (sp = server->head; sp; sp = sp->next) { if (sp->has_pending_connection) { - finish_accept(exec_ctx, sp); + finish_accept(sp); sp->has_pending_connection = false; } } } -void grpc_tcp_server_shutdown_listeners(grpc_exec_ctx* exec_ctx, - grpc_tcp_server* s) {} +void grpc_tcp_server_shutdown_listeners(grpc_tcp_server* s) {} #endif /* GRPC_UV */ diff --git a/src/core/lib/iomgr/tcp_server_windows.cc b/src/core/lib/iomgr/tcp_server_windows.cc index f538194895e..8a30dfde433 100644 --- a/src/core/lib/iomgr/tcp_server_windows.cc +++ b/src/core/lib/iomgr/tcp_server_windows.cc @@ -94,8 +94,7 @@ struct grpc_tcp_server { /* Public function. Allocates the proper data structures to hold a grpc_tcp_server. */ -grpc_error* grpc_tcp_server_create(grpc_exec_ctx* exec_ctx, - grpc_closure* shutdown_complete, +grpc_error* grpc_tcp_server_create(grpc_closure* shutdown_complete, const grpc_channel_args* args, grpc_tcp_server** server) { grpc_tcp_server* s = (grpc_tcp_server*)gpr_malloc(sizeof(grpc_tcp_server)); @@ -114,8 +113,7 @@ grpc_error* grpc_tcp_server_create(grpc_exec_ctx* exec_ctx, return GRPC_ERROR_NONE; } -static void destroy_server(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void destroy_server(void* arg, grpc_error* error) { grpc_tcp_server* s = (grpc_tcp_server*)arg; /* Now that the accepts have been aborted, we can destroy the sockets. @@ -128,18 +126,16 @@ static void destroy_server(grpc_exec_ctx* exec_ctx, void* arg, grpc_winsocket_destroy(sp->socket); gpr_free(sp); } - grpc_channel_args_destroy(exec_ctx, s->channel_args); + grpc_channel_args_destroy(s->channel_args); gpr_free(s); } -static void finish_shutdown_locked(grpc_exec_ctx* exec_ctx, - grpc_tcp_server* s) { +static void finish_shutdown_locked(grpc_tcp_server* s) { if (s->shutdown_complete != NULL) { - GRPC_CLOSURE_SCHED(exec_ctx, s->shutdown_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(s->shutdown_complete, GRPC_ERROR_NONE); } GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_CREATE(destroy_server, s, grpc_schedule_on_exec_ctx), GRPC_ERROR_NONE); } @@ -157,14 +153,14 @@ void grpc_tcp_server_shutdown_starting_add(grpc_tcp_server* s, gpr_mu_unlock(&s->mu); } -static void tcp_server_destroy(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { +static void tcp_server_destroy(grpc_tcp_server* s) { grpc_tcp_listener* sp; gpr_mu_lock(&s->mu); /* First, shutdown all fd's. This will queue abortion calls for all of the pending accepts due to the normal operation mechanism. */ if (s->active_ports == 0) { - finish_shutdown_locked(exec_ctx, s); + finish_shutdown_locked(s); } else { for (sp = s->head; sp; sp = sp->next) { sp->shutting_down = 1; @@ -174,13 +170,13 @@ static void tcp_server_destroy(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { gpr_mu_unlock(&s->mu); } -void grpc_tcp_server_unref(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s) { +void grpc_tcp_server_unref(grpc_tcp_server* s) { if (gpr_unref(&s->refs)) { - grpc_tcp_server_shutdown_listeners(exec_ctx, s); + grpc_tcp_server_shutdown_listeners(s); gpr_mu_lock(&s->mu); - GRPC_CLOSURE_LIST_SCHED(exec_ctx, &s->shutdown_starting); + GRPC_CLOSURE_LIST_SCHED(&s->shutdown_starting); gpr_mu_unlock(&s->mu); - tcp_server_destroy(exec_ctx, s); + tcp_server_destroy(s); } } @@ -234,19 +230,17 @@ failure: return error; } -static void decrement_active_ports_and_notify_locked(grpc_exec_ctx* exec_ctx, - grpc_tcp_listener* sp) { +static void decrement_active_ports_and_notify_locked(grpc_tcp_listener* sp) { sp->shutting_down = 0; GPR_ASSERT(sp->server->active_ports > 0); if (0 == --sp->server->active_ports) { - finish_shutdown_locked(exec_ctx, sp->server); + finish_shutdown_locked(sp->server); } } /* In order to do an async accept, we need to create a socket first which will be the one assigned to the new incoming connection. */ -static grpc_error* start_accept_locked(grpc_exec_ctx* exec_ctx, - grpc_tcp_listener* port) { +static grpc_error* start_accept_locked(grpc_tcp_listener* port) { SOCKET sock = INVALID_SOCKET; BOOL success; DWORD addrlen = sizeof(struct sockaddr_in6) + 16; @@ -285,7 +279,7 @@ static grpc_error* start_accept_locked(grpc_exec_ctx* exec_ctx, /* We're ready to do the accept. Calling grpc_socket_notify_on_read may immediately process an accept that happened in the meantime. */ port->new_socket = sock; - grpc_socket_notify_on_read(exec_ctx, port->socket, &port->on_accept); + grpc_socket_notify_on_read(port->socket, &port->on_accept); port->outstanding_calls++; return error; @@ -296,7 +290,7 @@ failure: } /* Event manager callback when reads are ready. */ -static void on_accept(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void on_accept(void* arg, grpc_error* error) { grpc_tcp_listener* sp = (grpc_tcp_listener*)arg; SOCKET sock = sp->new_socket; grpc_winsocket_callback_info* info = &sp->socket->read_info; @@ -357,7 +351,7 @@ static void on_accept(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { gpr_free(utf8_message); } gpr_asprintf(&fd_name, "tcp_server:%s", peer_name_string); - ep = grpc_tcp_create(exec_ctx, grpc_winsocket_create(sock, fd_name), + ep = grpc_tcp_create(grpc_winsocket_create(sock, fd_name), sp->server->channel_args, peer_name_string); gpr_free(fd_name); gpr_free(peer_name_string); @@ -375,17 +369,15 @@ static void on_accept(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { acceptor->from_server = sp->server; acceptor->port_index = sp->port_index; acceptor->fd_index = 0; - sp->server->on_accept_cb(exec_ctx, sp->server->on_accept_cb_arg, ep, NULL, - acceptor); + sp->server->on_accept_cb(sp->server->on_accept_cb_arg, ep, NULL, acceptor); } /* As we were notified from the IOCP of one and exactly one accept, the former socked we created has now either been destroy or assigned to the new connection. We need to create a new one for the next connection. */ - GPR_ASSERT( - GRPC_LOG_IF_ERROR("start_accept", start_accept_locked(exec_ctx, sp))); + GPR_ASSERT(GRPC_LOG_IF_ERROR("start_accept", start_accept_locked(sp))); if (0 == --sp->outstanding_calls) { - decrement_active_ports_and_notify_locked(exec_ctx, sp); + decrement_active_ports_and_notify_locked(sp); } gpr_mu_unlock(&sp->server->mu); } @@ -522,8 +514,8 @@ done: return error; } -void grpc_tcp_server_start(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s, - grpc_pollset** pollset, size_t pollset_count, +void grpc_tcp_server_start(grpc_tcp_server* s, grpc_pollset** pollset, + size_t pollset_count, grpc_tcp_server_cb on_accept_cb, void* on_accept_cb_arg) { grpc_tcp_listener* sp; @@ -534,14 +526,12 @@ void grpc_tcp_server_start(grpc_exec_ctx* exec_ctx, grpc_tcp_server* s, s->on_accept_cb = on_accept_cb; s->on_accept_cb_arg = on_accept_cb_arg; for (sp = s->head; sp; sp = sp->next) { - GPR_ASSERT( - GRPC_LOG_IF_ERROR("start_accept", start_accept_locked(exec_ctx, sp))); + GPR_ASSERT(GRPC_LOG_IF_ERROR("start_accept", start_accept_locked(sp))); s->active_ports++; } gpr_mu_unlock(&s->mu); } -void grpc_tcp_server_shutdown_listeners(grpc_exec_ctx* exec_ctx, - grpc_tcp_server* s) {} +void grpc_tcp_server_shutdown_listeners(grpc_tcp_server* s) {} #endif /* GRPC_WINSOCK_SOCKET */ diff --git a/src/core/lib/iomgr/tcp_uv.cc b/src/core/lib/iomgr/tcp_uv.cc index 40f4006203e..2c26b60511d 100644 --- a/src/core/lib/iomgr/tcp_uv.cc +++ b/src/core/lib/iomgr/tcp_uv.cc @@ -65,19 +65,18 @@ typedef struct { grpc_pollset* pollset; } grpc_tcp; -static void tcp_free(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { - grpc_resource_user_unref(exec_ctx, tcp->resource_user); +static void tcp_free(grpc_tcp* tcp) { + grpc_resource_user_unref(tcp->resource_user); gpr_free(tcp->handle); gpr_free(tcp->peer_string); gpr_free(tcp); } #ifndef NDEBUG -#define TCP_UNREF(exec_ctx, tcp, reason) \ - tcp_unref((exec_ctx), (tcp), (reason), __FILE__, __LINE__) +#define TCP_UNREF(tcp, reason) tcp_unref((tcp), (reason), __FILE__, __LINE__) #define TCP_REF(tcp, reason) tcp_ref((tcp), (reason), __FILE__, __LINE__) -static void tcp_unref(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, - const char* reason, const char* file, int line) { +static void tcp_unref(grpc_tcp* tcp, const char* reason, const char* file, + int line) { if (grpc_tcp_trace.enabled()) { gpr_atm val = gpr_atm_no_barrier_load(&tcp->refcount.count); gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, @@ -85,7 +84,7 @@ static void tcp_unref(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, val - 1); } if (gpr_unref(&tcp->refcount)) { - tcp_free(exec_ctx, tcp); + tcp_free(tcp); } } @@ -100,11 +99,11 @@ static void tcp_ref(grpc_tcp* tcp, const char* reason, const char* file, gpr_ref(&tcp->refcount); } #else -#define TCP_UNREF(exec_ctx, tcp, reason) tcp_unref((exec_ctx), (tcp)) +#define TCP_UNREF(tcp, reason) tcp_unref((tcp)) #define TCP_REF(tcp, reason) tcp_ref((tcp)) -static void tcp_unref(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { +static void tcp_unref(grpc_tcp* tcp) { if (gpr_unref(&tcp->refcount)) { - tcp_free(exec_ctx, tcp); + tcp_free(tcp); } } @@ -112,15 +111,14 @@ static void tcp_ref(grpc_tcp* tcp) { gpr_ref(&tcp->refcount); } #endif static void uv_close_callback(uv_handle_t* handle) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_tcp* tcp = (grpc_tcp*)handle->data; - TCP_UNREF(&exec_ctx, tcp, "destroy"); - grpc_exec_ctx_finish(&exec_ctx); + TCP_UNREF(tcp, "destroy"); } static void alloc_uv_buf(uv_handle_t* handle, size_t suggested_size, uv_buf_t* buf) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_tcp* tcp = (grpc_tcp*)handle->data; (void)suggested_size; /* Before calling uv_read_start, we allocate a buffer with exactly one slice @@ -128,11 +126,9 @@ static void alloc_uv_buf(uv_handle_t* handle, size_t suggested_size, * allocation was successful. So slices[0] should always exist here */ buf->base = (char*)GRPC_SLICE_START_PTR(tcp->read_slices->slices[0]); buf->len = GRPC_SLICE_LENGTH(tcp->read_slices->slices[0]); - grpc_exec_ctx_finish(&exec_ctx); } -static void call_read_cb(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, - grpc_error* error) { +static void call_read_cb(grpc_tcp* tcp, grpc_error* error) { grpc_closure* cb = tcp->read_cb; if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "TCP:%p call_cb %p %p:%p", tcp, cb, cb->cb, cb->cb_arg); @@ -149,25 +145,25 @@ static void call_read_cb(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, } tcp->read_slices = NULL; tcp->read_cb = NULL; - GRPC_CLOSURE_RUN(exec_ctx, cb, error); + GRPC_CLOSURE_RUN(cb, error); } static void read_callback(uv_stream_t* stream, ssize_t nread, const uv_buf_t* buf) { grpc_error* error; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_tcp* tcp = (grpc_tcp*)stream->data; grpc_slice_buffer garbage; if (nread == 0) { // Nothing happened. Wait for the next callback return; } - TCP_UNREF(&exec_ctx, tcp, "read"); + TCP_UNREF(tcp, "read"); // TODO(murgatroid99): figure out what the return value here means uv_read_stop(stream); if (nread == UV_EOF) { error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("EOF"); - grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, tcp->read_slices); + grpc_slice_buffer_reset_and_unref_internal(tcp->read_slices); } else if (nread > 0) { // Successful read error = GRPC_ERROR_NONE; @@ -177,19 +173,17 @@ static void read_callback(uv_stream_t* stream, ssize_t nread, grpc_slice_buffer_init(&garbage); grpc_slice_buffer_trim_end( tcp->read_slices, tcp->read_slices->length - (size_t)nread, &garbage); - grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, &garbage); + grpc_slice_buffer_reset_and_unref_internal(&garbage); } } else { // nread < 0: Error error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("TCP Read failed"); - grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, tcp->read_slices); + grpc_slice_buffer_reset_and_unref_internal(tcp->read_slices); } - call_read_cb(&exec_ctx, tcp, error); - grpc_exec_ctx_finish(&exec_ctx); + call_read_cb(tcp, error); } -static void tcp_read_allocation_done(grpc_exec_ctx* exec_ctx, void* tcpp, - grpc_error* error) { +static void tcp_read_allocation_done(void* tcpp, grpc_error* error) { int status; grpc_tcp* tcp = (grpc_tcp*)tcpp; if (grpc_tcp_trace.enabled()) { @@ -207,9 +201,9 @@ static void tcp_read_allocation_done(grpc_exec_ctx* exec_ctx, void* tcpp, } } if (error != GRPC_ERROR_NONE) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, tcp->read_slices); - call_read_cb(exec_ctx, tcp, GRPC_ERROR_REF(error)); - TCP_UNREF(exec_ctx, tcp, "read"); + grpc_slice_buffer_reset_and_unref_internal(tcp->read_slices); + call_read_cb(tcp, GRPC_ERROR_REF(error)); + TCP_UNREF(tcp, "read"); } if (grpc_tcp_trace.enabled()) { const char* str = grpc_error_string(error); @@ -217,16 +211,16 @@ static void tcp_read_allocation_done(grpc_exec_ctx* exec_ctx, void* tcpp, } } -static void uv_endpoint_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* read_slices, grpc_closure* cb) { +static void uv_endpoint_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, + grpc_closure* cb) { grpc_tcp* tcp = (grpc_tcp*)ep; GRPC_UV_ASSERT_SAME_THREAD(); GPR_ASSERT(tcp->read_cb == NULL); tcp->read_cb = cb; tcp->read_slices = read_slices; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, read_slices); + grpc_slice_buffer_reset_and_unref_internal(read_slices); TCP_REF(tcp, "read"); - grpc_resource_user_alloc_slices(exec_ctx, &tcp->slice_allocator, + grpc_resource_user_alloc_slices(&tcp->slice_allocator, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, 1, tcp->read_slices); } @@ -234,10 +228,10 @@ static void uv_endpoint_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, static void write_callback(uv_write_t* req, int status) { grpc_tcp* tcp = (grpc_tcp*)req->data; grpc_error* error; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_closure* cb = tcp->write_cb; tcp->write_cb = NULL; - TCP_UNREF(&exec_ctx, tcp, "write"); + TCP_UNREF(tcp, "write"); if (status == 0) { error = GRPC_ERROR_NONE; } else { @@ -248,11 +242,10 @@ static void write_callback(uv_write_t* req, int status) { gpr_log(GPR_DEBUG, "write complete on %p: error=%s", tcp, str); } gpr_free(tcp->write_buffers); - GRPC_CLOSURE_SCHED(&exec_ctx, cb, error); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_CLOSURE_SCHED(cb, error); } -static void uv_endpoint_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, +static void uv_endpoint_write(grpc_endpoint* ep, grpc_slice_buffer* write_slices, grpc_closure* cb) { grpc_tcp* tcp = (grpc_tcp*)ep; @@ -275,9 +268,8 @@ static void uv_endpoint_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, } if (tcp->shutting_down) { - GRPC_CLOSURE_SCHED( - exec_ctx, cb, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("TCP socket is shutting down")); + GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "TCP socket is shutting down")); return; } @@ -287,7 +279,7 @@ static void uv_endpoint_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, if (tcp->write_slices->count == 0) { // No slices means we don't have to do anything, // and libuv doesn't like empty writes - GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); return; } @@ -308,37 +300,31 @@ static void uv_endpoint_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, write_callback); } -static void uv_add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_pollset* pollset) { +static void uv_add_to_pollset(grpc_endpoint* ep, grpc_pollset* pollset) { // No-op. We're ignoring pollsets currently - (void)exec_ctx; (void)ep; (void)pollset; grpc_tcp* tcp = (grpc_tcp*)ep; tcp->pollset = pollset; } -static void uv_add_to_pollset_set(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, +static void uv_add_to_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset) { // No-op. We're ignoring pollsets currently - (void)exec_ctx; (void)ep; (void)pollset; } -static void uv_delete_from_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_endpoint* ep, +static void uv_delete_from_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset) { // No-op. We're ignoring pollsets currently - (void)exec_ctx; (void)ep; (void)pollset; } static void shutdown_callback(uv_shutdown_t* req, int status) {} -static void uv_endpoint_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_error* why) { +static void uv_endpoint_shutdown(grpc_endpoint* ep, grpc_error* why) { grpc_tcp* tcp = (grpc_tcp*)ep; if (!tcp->shutting_down) { if (grpc_tcp_trace.enabled()) { @@ -348,12 +334,12 @@ static void uv_endpoint_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, tcp->shutting_down = true; uv_shutdown_t* req = &tcp->shutdown_req; uv_shutdown(req, (uv_stream_t*)tcp->handle, shutdown_callback); - grpc_resource_user_shutdown(exec_ctx, tcp->resource_user); + grpc_resource_user_shutdown(tcp->resource_user); } GRPC_ERROR_UNREF(why); } -static void uv_destroy(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep) { +static void uv_destroy(grpc_endpoint* ep) { grpc_network_status_unregister_endpoint(ep); grpc_tcp* tcp = (grpc_tcp*)ep; uv_close((uv_handle_t*)tcp->handle, uv_close_callback); @@ -386,7 +372,7 @@ grpc_endpoint* grpc_tcp_create(uv_tcp_t* handle, grpc_resource_quota* resource_quota, char* peer_string) { grpc_tcp* tcp = (grpc_tcp*)gpr_malloc(sizeof(grpc_tcp)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "Creating TCP endpoint %p", tcp); @@ -413,7 +399,6 @@ grpc_endpoint* grpc_tcp_create(uv_tcp_t* handle, uv_unref((uv_handle_t*)handle); #endif - grpc_exec_ctx_finish(&exec_ctx); return &tcp->base; } diff --git a/src/core/lib/iomgr/tcp_windows.cc b/src/core/lib/iomgr/tcp_windows.cc index 33868cdc7a7..6d091b77bb2 100644 --- a/src/core/lib/iomgr/tcp_windows.cc +++ b/src/core/lib/iomgr/tcp_windows.cc @@ -109,21 +109,20 @@ typedef struct grpc_tcp { char* peer_string; } grpc_tcp; -static void tcp_free(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { +static void tcp_free(grpc_tcp* tcp) { grpc_winsocket_destroy(tcp->socket); gpr_mu_destroy(&tcp->mu); gpr_free(tcp->peer_string); - grpc_resource_user_unref(exec_ctx, tcp->resource_user); + grpc_resource_user_unref(tcp->resource_user); if (tcp->shutting_down) GRPC_ERROR_UNREF(tcp->shutdown_error); gpr_free(tcp); } #ifndef NDEBUG -#define TCP_UNREF(exec_ctx, tcp, reason) \ - tcp_unref((exec_ctx), (tcp), (reason), __FILE__, __LINE__) +#define TCP_UNREF(tcp, reason) tcp_unref((tcp), (reason), __FILE__, __LINE__) #define TCP_REF(tcp, reason) tcp_ref((tcp), (reason), __FILE__, __LINE__) -static void tcp_unref(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, - const char* reason, const char* file, int line) { +static void tcp_unref(grpc_tcp* tcp, const char* reason, const char* file, + int line) { if (grpc_tcp_trace.enabled()) { gpr_atm val = gpr_atm_no_barrier_load(&tcp->refcount.count); gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, @@ -131,7 +130,7 @@ static void tcp_unref(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp, val - 1); } if (gpr_unref(&tcp->refcount)) { - tcp_free(exec_ctx, tcp); + tcp_free(tcp); } } @@ -146,11 +145,11 @@ static void tcp_ref(grpc_tcp* tcp, const char* reason, const char* file, gpr_ref(&tcp->refcount); } #else -#define TCP_UNREF(exec_ctx, tcp, reason) tcp_unref((exec_ctx), (tcp)) +#define TCP_UNREF(tcp, reason) tcp_unref((tcp)) #define TCP_REF(tcp, reason) tcp_ref((tcp)) -static void tcp_unref(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) { +static void tcp_unref(grpc_tcp* tcp) { if (gpr_unref(&tcp->refcount)) { - tcp_free(exec_ctx, tcp); + tcp_free(tcp); } } @@ -158,7 +157,7 @@ static void tcp_ref(grpc_tcp* tcp) { gpr_ref(&tcp->refcount); } #endif /* Asynchronous callback from the IOCP, or the background thread. */ -static void on_read(grpc_exec_ctx* exec_ctx, void* tcpp, grpc_error* error) { +static void on_read(void* tcpp, grpc_error* error) { grpc_tcp* tcp = (grpc_tcp*)tcpp; grpc_closure* cb = tcp->read_cb; grpc_winsocket* socket = tcp->socket; @@ -172,13 +171,13 @@ static void on_read(grpc_exec_ctx* exec_ctx, void* tcpp, grpc_error* error) { char* utf8_message = gpr_format_message(info->wsa_error); error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(utf8_message); gpr_free(utf8_message); - grpc_slice_unref_internal(exec_ctx, tcp->read_slice); + grpc_slice_unref_internal(tcp->read_slice); } else { if (info->bytes_transfered != 0 && !tcp->shutting_down) { sub = grpc_slice_sub_no_ref(tcp->read_slice, 0, info->bytes_transfered); grpc_slice_buffer_add(tcp->read_slices, sub); } else { - grpc_slice_unref_internal(exec_ctx, tcp->read_slice); + grpc_slice_unref_internal(tcp->read_slice); error = tcp->shutting_down ? GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "TCP stream shutting down", &tcp->shutdown_error, 1) @@ -188,12 +187,12 @@ static void on_read(grpc_exec_ctx* exec_ctx, void* tcpp, grpc_error* error) { } tcp->read_cb = NULL; - TCP_UNREF(exec_ctx, tcp, "read"); - GRPC_CLOSURE_SCHED(exec_ctx, cb, error); + TCP_UNREF(tcp, "read"); + GRPC_CLOSURE_SCHED(cb, error); } -static void win_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* read_slices, grpc_closure* cb) { +static void win_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, + grpc_closure* cb) { grpc_tcp* tcp = (grpc_tcp*)ep; grpc_winsocket* handle = tcp->socket; grpc_winsocket_callback_info* info = &handle->read_info; @@ -204,15 +203,14 @@ static void win_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, if (tcp->shutting_down) { GRPC_CLOSURE_SCHED( - exec_ctx, cb, - GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "TCP socket is shutting down", &tcp->shutdown_error, 1)); + cb, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "TCP socket is shutting down", &tcp->shutdown_error, 1)); return; } tcp->read_cb = cb; tcp->read_slices = read_slices; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, read_slices); + grpc_slice_buffer_reset_and_unref_internal(read_slices); tcp->read_slice = GRPC_SLICE_MALLOC(8192); @@ -230,7 +228,7 @@ static void win_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, /* Did we get data immediately ? Yay. */ if (info->wsa_error != WSAEWOULDBLOCK) { info->bytes_transfered = bytes_read; - GRPC_CLOSURE_SCHED(exec_ctx, &tcp->on_read, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&tcp->on_read, GRPC_ERROR_NONE); return; } @@ -243,17 +241,17 @@ static void win_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, int wsa_error = WSAGetLastError(); if (wsa_error != WSA_IO_PENDING) { info->wsa_error = wsa_error; - GRPC_CLOSURE_SCHED(exec_ctx, &tcp->on_read, + GRPC_CLOSURE_SCHED(&tcp->on_read, GRPC_WSA_ERROR(info->wsa_error, "WSARecv")); return; } } - grpc_socket_notify_on_read(exec_ctx, tcp->socket, &tcp->on_read); + grpc_socket_notify_on_read(tcp->socket, &tcp->on_read); } /* Asynchronous callback from the IOCP, or the background thread. */ -static void on_write(grpc_exec_ctx* exec_ctx, void* tcpp, grpc_error* error) { +static void on_write(void* tcpp, grpc_error* error) { grpc_tcp* tcp = (grpc_tcp*)tcpp; grpc_winsocket* handle = tcp->socket; grpc_winsocket_callback_info* info = &handle->write_info; @@ -274,13 +272,13 @@ static void on_write(grpc_exec_ctx* exec_ctx, void* tcpp, grpc_error* error) { } } - TCP_UNREF(exec_ctx, tcp, "write"); - GRPC_CLOSURE_SCHED(exec_ctx, cb, error); + TCP_UNREF(tcp, "write"); + GRPC_CLOSURE_SCHED(cb, error); } /* Initiates a write. */ -static void win_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* slices, grpc_closure* cb) { +static void win_write(grpc_endpoint* ep, grpc_slice_buffer* slices, + grpc_closure* cb) { grpc_tcp* tcp = (grpc_tcp*)ep; grpc_winsocket* socket = tcp->socket; grpc_winsocket_callback_info* info = &socket->write_info; @@ -294,9 +292,8 @@ static void win_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, if (tcp->shutting_down) { GRPC_CLOSURE_SCHED( - exec_ctx, cb, - GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "TCP socket is shutting down", &tcp->shutdown_error, 1)); + cb, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "TCP socket is shutting down", &tcp->shutdown_error, 1)); return; } @@ -327,7 +324,7 @@ static void win_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, grpc_error* error = status == 0 ? GRPC_ERROR_NONE : GRPC_WSA_ERROR(info->wsa_error, "WSASend"); - GRPC_CLOSURE_SCHED(exec_ctx, cb, error); + GRPC_CLOSURE_SCHED(cb, error); if (allocated) gpr_free(allocated); return; } @@ -344,35 +341,32 @@ static void win_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, if (status != 0) { int wsa_error = WSAGetLastError(); if (wsa_error != WSA_IO_PENDING) { - TCP_UNREF(exec_ctx, tcp, "write"); - GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_WSA_ERROR(wsa_error, "WSASend")); + TCP_UNREF(tcp, "write"); + GRPC_CLOSURE_SCHED(cb, GRPC_WSA_ERROR(wsa_error, "WSASend")); return; } } /* As all is now setup, we can now ask for the IOCP notification. It may trigger the callback immediately however, but no matter. */ - grpc_socket_notify_on_write(exec_ctx, socket, &tcp->on_write); + grpc_socket_notify_on_write(socket, &tcp->on_write); } -static void win_add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_pollset* ps) { +static void win_add_to_pollset(grpc_endpoint* ep, grpc_pollset* ps) { grpc_tcp* tcp; (void)ps; tcp = (grpc_tcp*)ep; grpc_iocp_add_socket(tcp->socket); } -static void win_add_to_pollset_set(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_pollset_set* pss) { +static void win_add_to_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pss) { grpc_tcp* tcp; (void)pss; tcp = (grpc_tcp*)ep; grpc_iocp_add_socket(tcp->socket); } -static void win_delete_from_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_endpoint* ep, +static void win_delete_from_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pss) {} /* Initiates a shutdown of the TCP endpoint. This will queue abort callbacks @@ -381,8 +375,7 @@ static void win_delete_from_pollset_set(grpc_exec_ctx* exec_ctx, we're not going to protect against these. However the IO Completion Port callback will happen from another thread, so we need to protect against concurrent access of the data structure in that regard. */ -static void win_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_error* why) { +static void win_shutdown(grpc_endpoint* ep, grpc_error* why) { grpc_tcp* tcp = (grpc_tcp*)ep; gpr_mu_lock(&tcp->mu); /* At that point, what may happen is that we're already inside the IOCP @@ -395,13 +388,13 @@ static void win_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, } grpc_winsocket_shutdown(tcp->socket); gpr_mu_unlock(&tcp->mu); - grpc_resource_user_shutdown(exec_ctx, tcp->resource_user); + grpc_resource_user_shutdown(tcp->resource_user); } -static void win_destroy(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep) { +static void win_destroy(grpc_endpoint* ep) { grpc_network_status_unregister_endpoint(ep); grpc_tcp* tcp = (grpc_tcp*)ep; - TCP_UNREF(exec_ctx, tcp, "destroy"); + TCP_UNREF(tcp, "destroy"); } static char* win_get_peer(grpc_endpoint* ep) { @@ -427,14 +420,14 @@ static grpc_endpoint_vtable vtable = {win_read, win_get_peer, win_get_fd}; -grpc_endpoint* grpc_tcp_create(grpc_exec_ctx* exec_ctx, grpc_winsocket* socket, +grpc_endpoint* grpc_tcp_create(grpc_winsocket* socket, grpc_channel_args* channel_args, const char* peer_string) { grpc_resource_quota* resource_quota = grpc_resource_quota_create(NULL); if (channel_args != NULL) { for (size_t i = 0; i < channel_args->num_args; i++) { if (0 == strcmp(channel_args->args[i].key, GRPC_ARG_RESOURCE_QUOTA)) { - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); resource_quota = grpc_resource_quota_ref_internal( (grpc_resource_quota*)channel_args->args[i].value.pointer.p); } @@ -452,7 +445,7 @@ grpc_endpoint* grpc_tcp_create(grpc_exec_ctx* exec_ctx, grpc_winsocket* socket, tcp->resource_user = grpc_resource_user_create(resource_quota, peer_string); /* Tell network status tracking code about the new endpoint */ grpc_network_status_register_endpoint(&tcp->base); - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); return &tcp->base; } diff --git a/src/core/lib/iomgr/tcp_windows.h b/src/core/lib/iomgr/tcp_windows.h index 28287e27950..8578a358ea8 100644 --- a/src/core/lib/iomgr/tcp_windows.h +++ b/src/core/lib/iomgr/tcp_windows.h @@ -38,7 +38,7 @@ /* Create a tcp endpoint given a winsock handle. * Takes ownership of the handle. */ -grpc_endpoint* grpc_tcp_create(grpc_exec_ctx* exec_ctx, grpc_winsocket* socket, +grpc_endpoint* grpc_tcp_create(grpc_winsocket* socket, grpc_channel_args* channel_args, const char* peer_string); diff --git a/src/core/lib/iomgr/timer.h b/src/core/lib/iomgr/timer.h index b9acce229ec..82049859c5b 100644 --- a/src/core/lib/iomgr/timer.h +++ b/src/core/lib/iomgr/timer.h @@ -40,8 +40,8 @@ typedef struct grpc_timer grpc_timer; application code should check the error to determine how it was invoked. The application callback is also responsible for maintaining information about when to free up any user-level state. */ -void grpc_timer_init(grpc_exec_ctx* exec_ctx, grpc_timer* timer, - grpc_millis deadline, grpc_closure* closure); +void grpc_timer_init(grpc_timer* timer, grpc_millis deadline, + grpc_closure* closure); /* Initialize *timer without setting it. This can later be passed through the regular init or cancel */ @@ -73,7 +73,7 @@ void grpc_timer_init_unset(grpc_timer* timer); matches this aim. Requires: cancel() must happen after init() on a given timer */ -void grpc_timer_cancel(grpc_exec_ctx* exec_ctx, grpc_timer* timer); +void grpc_timer_cancel(grpc_timer* timer); /* iomgr internal api for dealing with timers */ @@ -90,10 +90,9 @@ typedef enum { *next is never guaranteed to be updated on any given execution; however, with high probability at least one thread in the system will see an update at any time slice. */ -grpc_timer_check_result grpc_timer_check(grpc_exec_ctx* exec_ctx, - grpc_millis* next); -void grpc_timer_list_init(grpc_exec_ctx* exec_ctx); -void grpc_timer_list_shutdown(grpc_exec_ctx* exec_ctx); +grpc_timer_check_result grpc_timer_check(grpc_millis* next); +void grpc_timer_list_init(); +void grpc_timer_list_shutdown(); /* Consume a kick issued by grpc_kick_poller */ void grpc_timer_consume_kick(void); diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index fa95c43dbe3..103144eb3bf 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -225,8 +225,7 @@ static gpr_atm saturating_add(gpr_atm a, gpr_atm b) { return a + b; } -static grpc_timer_check_result run_some_expired_timers(grpc_exec_ctx* exec_ctx, - gpr_atm now, +static grpc_timer_check_result run_some_expired_timers(gpr_atm now, gpr_atm* next, grpc_error* error); @@ -236,7 +235,7 @@ static gpr_atm compute_min_deadline(timer_shard* shard) { : grpc_timer_heap_top(&shard->heap)->deadline; } -void grpc_timer_list_init(grpc_exec_ctx* exec_ctx) { +void grpc_timer_list_init() { uint32_t i; g_num_shards = GPR_MIN(1, 2 * gpr_cpu_num_cores()); @@ -247,7 +246,7 @@ void grpc_timer_list_init(grpc_exec_ctx* exec_ctx) { g_shared_mutables.initialized = true; g_shared_mutables.checker_mu = GPR_SPINLOCK_INITIALIZER; gpr_mu_init(&g_shared_mutables.mu); - g_shared_mutables.min_timer = grpc_exec_ctx_now(exec_ctx); + g_shared_mutables.min_timer = grpc_core::ExecCtx::Get()->Now(); gpr_tls_init(&g_last_seen_min_timer); gpr_tls_set(&g_last_seen_min_timer, 0); @@ -267,10 +266,10 @@ void grpc_timer_list_init(grpc_exec_ctx* exec_ctx) { INIT_TIMER_HASH_TABLE(); } -void grpc_timer_list_shutdown(grpc_exec_ctx* exec_ctx) { +void grpc_timer_list_shutdown() { size_t i; run_some_expired_timers( - exec_ctx, GPR_ATM_MAX, nullptr, + GPR_ATM_MAX, nullptr, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Timer list shutdown")); for (i = 0; i < g_num_shards; i++) { timer_shard* shard = &g_shards[i]; @@ -323,8 +322,8 @@ static void note_deadline_change(timer_shard* shard) { void grpc_timer_init_unset(grpc_timer* timer) { timer->pending = false; } -void grpc_timer_init(grpc_exec_ctx* exec_ctx, grpc_timer* timer, - grpc_millis deadline, grpc_closure* closure) { +void grpc_timer_init(grpc_timer* timer, grpc_millis deadline, + grpc_closure* closure) { int is_first_timer = 0; timer_shard* shard = &g_shards[GPR_HASH_POINTER(timer, g_num_shards)]; timer->closure = closure; @@ -337,12 +336,12 @@ void grpc_timer_init(grpc_exec_ctx* exec_ctx, grpc_timer* timer, if (grpc_timer_trace.enabled()) { gpr_log(GPR_DEBUG, "TIMER %p: SET %" PRIdPTR " now %" PRIdPTR " call %p[%p]", timer, - deadline, grpc_exec_ctx_now(exec_ctx), closure, closure->cb); + deadline, grpc_core::ExecCtx::Get()->Now(), closure, closure->cb); } if (!g_shared_mutables.initialized) { timer->pending = false; - GRPC_CLOSURE_SCHED(exec_ctx, timer->closure, + GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Attempt to create timer before initialization")); return; @@ -350,10 +349,10 @@ void grpc_timer_init(grpc_exec_ctx* exec_ctx, grpc_timer* timer, gpr_mu_lock(&shard->mu); timer->pending = true; - grpc_millis now = grpc_exec_ctx_now(exec_ctx); + grpc_millis now = grpc_core::ExecCtx::Get()->Now(); if (deadline <= now) { timer->pending = false; - GRPC_CLOSURE_SCHED(exec_ctx, timer->closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_NONE); gpr_mu_unlock(&shard->mu); /* early out */ return; @@ -414,7 +413,7 @@ void grpc_timer_consume_kick(void) { gpr_tls_set(&g_last_seen_min_timer, 0); } -void grpc_timer_cancel(grpc_exec_ctx* exec_ctx, grpc_timer* timer) { +void grpc_timer_cancel(grpc_timer* timer) { if (!g_shared_mutables.initialized) { /* must have already been cancelled, also the shard mutex is invalid */ return; @@ -430,7 +429,7 @@ void grpc_timer_cancel(grpc_exec_ctx* exec_ctx, grpc_timer* timer) { if (timer->pending) { REMOVE_FROM_HASH_TABLE(timer); - GRPC_CLOSURE_SCHED(exec_ctx, timer->closure, GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_CANCELLED); timer->pending = false; if (timer->heap_index == INVALID_HEAP_INDEX) { list_remove(timer); @@ -516,15 +515,14 @@ static grpc_timer* pop_one(timer_shard* shard, gpr_atm now) { } /* REQUIRES: shard->mu unlocked */ -static size_t pop_timers(grpc_exec_ctx* exec_ctx, timer_shard* shard, - gpr_atm now, gpr_atm* new_min_deadline, - grpc_error* error) { +static size_t pop_timers(timer_shard* shard, gpr_atm now, + gpr_atm* new_min_deadline, grpc_error* error) { size_t n = 0; grpc_timer* timer; gpr_mu_lock(&shard->mu); while ((timer = pop_one(shard, now))) { REMOVE_FROM_HASH_TABLE(timer); - GRPC_CLOSURE_SCHED(exec_ctx, timer->closure, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_REF(error)); n++; } *new_min_deadline = compute_min_deadline(shard); @@ -536,8 +534,7 @@ static size_t pop_timers(grpc_exec_ctx* exec_ctx, timer_shard* shard, return n; } -static grpc_timer_check_result run_some_expired_timers(grpc_exec_ctx* exec_ctx, - gpr_atm now, +static grpc_timer_check_result run_some_expired_timers(gpr_atm now, gpr_atm* next, grpc_error* error) { grpc_timer_check_result result = GRPC_TIMERS_NOT_CHECKED; @@ -566,8 +563,7 @@ static grpc_timer_check_result run_some_expired_timers(grpc_exec_ctx* exec_ctx, /* For efficiency, we pop as many available timers as we can from the shard. This may violate perfect timer deadline ordering, but that shouldn't be a big deal because we don't make ordering guarantees. */ - if (pop_timers(exec_ctx, g_shard_queue[0], now, &new_min_deadline, - error) > 0) { + if (pop_timers(g_shard_queue[0], now, &new_min_deadline, error) > 0) { result = GRPC_TIMERS_FIRED; } @@ -604,10 +600,9 @@ static grpc_timer_check_result run_some_expired_timers(grpc_exec_ctx* exec_ctx, return result; } -grpc_timer_check_result grpc_timer_check(grpc_exec_ctx* exec_ctx, - grpc_millis* next) { +grpc_timer_check_result grpc_timer_check(grpc_millis* next) { // prelude - grpc_millis now = grpc_exec_ctx_now(exec_ctx); + grpc_millis now = grpc_core::ExecCtx::Get()->Now(); /* fetch from a thread-local first: this avoids contention on a globally mutable cacheline in the common case */ @@ -646,7 +641,7 @@ grpc_timer_check_result grpc_timer_check(grpc_exec_ctx* exec_ctx, } // actual code grpc_timer_check_result r = - run_some_expired_timers(exec_ctx, now, next, shutdown_error); + run_some_expired_timers(now, next, shutdown_error); // tracing if (grpc_timer_check_trace.enabled()) { char* next_str; diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc index 87ed0e05dcd..8ca6a3c23e1 100644 --- a/src/core/lib/iomgr/timer_manager.cc +++ b/src/core/lib/iomgr/timer_manager.cc @@ -98,13 +98,12 @@ static void start_timer_thread_and_unlock(void) { } void grpc_timer_manager_tick() { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_millis next = GRPC_MILLIS_INF_FUTURE; - grpc_timer_check(&exec_ctx, &next); - grpc_exec_ctx_finish(&exec_ctx); + grpc_timer_check(&next); } -static void run_some_timers(grpc_exec_ctx* exec_ctx) { +static void run_some_timers() { // if there's something to execute... gpr_mu_lock(&g_mu); // remove a waiter from the pool, and start another thread if necessary @@ -126,7 +125,7 @@ static void run_some_timers(grpc_exec_ctx* exec_ctx) { if (grpc_timer_check_trace.enabled()) { gpr_log(GPR_DEBUG, "flush exec_ctx"); } - grpc_exec_ctx_flush(exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&g_mu); // garbage collect any threads hanging out that are dead gc_completed_threads(); @@ -138,7 +137,7 @@ static void run_some_timers(grpc_exec_ctx* exec_ctx) { // wait until 'next' (or forever if there is already a timed waiter in the pool) // returns true if the thread should continue executing (false if it should // shutdown) -static bool wait_until(grpc_exec_ctx* exec_ctx, grpc_millis next) { +static bool wait_until(grpc_millis next) { gpr_mu_lock(&g_mu); // if we're not threaded anymore, leave if (!g_threaded) { @@ -179,7 +178,7 @@ static bool wait_until(grpc_exec_ctx* exec_ctx, grpc_millis next) { g_timed_waiter_deadline = next; if (grpc_timer_check_trace.enabled()) { - grpc_millis wait_time = next - grpc_exec_ctx_now(exec_ctx); + grpc_millis wait_time = next - grpc_core::ExecCtx::Get()->Now(); gpr_log(GPR_DEBUG, "sleep for a %" PRIdPTR " milliseconds", wait_time); } @@ -220,15 +219,15 @@ static bool wait_until(grpc_exec_ctx* exec_ctx, grpc_millis next) { return true; } -static void timer_main_loop(grpc_exec_ctx* exec_ctx) { +static void timer_main_loop() { for (;;) { grpc_millis next = GRPC_MILLIS_INF_FUTURE; - grpc_exec_ctx_invalidate_now(exec_ctx); + grpc_core::ExecCtx::Get()->InvalidateNow(); // check timer state, updates next to the next time to run a check - switch (grpc_timer_check(exec_ctx, &next)) { + switch (grpc_timer_check(&next)) { case GRPC_TIMERS_FIRED: - run_some_timers(exec_ctx); + run_some_timers(); break; case GRPC_TIMERS_NOT_CHECKED: /* This case only happens under contention, meaning more than one timer @@ -246,7 +245,7 @@ static void timer_main_loop(grpc_exec_ctx* exec_ctx) { next = GRPC_MILLIS_INF_FUTURE; /* fall through */ case GRPC_TIMERS_CHECKED_AND_EMPTY: - if (!wait_until(exec_ctx, next)) { + if (!wait_until(next)) { return; } break; @@ -274,10 +273,9 @@ static void timer_thread_cleanup(completed_thread* ct) { static void timer_thread(void* completed_thread_ptr) { // this threads exec_ctx: we try to run things through to completion here // since it's easy to spin up new threads - grpc_exec_ctx exec_ctx = - GRPC_EXEC_CTX_INITIALIZER(0, grpc_never_ready_to_finish, nullptr); - timer_main_loop(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx(0); + timer_main_loop(); + timer_thread_cleanup((completed_thread*)completed_thread_ptr); } diff --git a/src/core/lib/iomgr/timer_uv.cc b/src/core/lib/iomgr/timer_uv.cc index fac2026fa93..5d238da0892 100644 --- a/src/core/lib/iomgr/timer_uv.cc +++ b/src/core/lib/iomgr/timer_uv.cc @@ -42,28 +42,27 @@ static void stop_uv_timer(uv_timer_t* handle) { void run_expired_timer(uv_timer_t* handle) { grpc_timer* timer = (grpc_timer*)handle->data; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GRPC_UV_ASSERT_SAME_THREAD(); GPR_ASSERT(timer->pending); timer->pending = 0; - GRPC_CLOSURE_SCHED(&exec_ctx, timer->closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_NONE); stop_uv_timer(handle); - grpc_exec_ctx_finish(&exec_ctx); } -void grpc_timer_init(grpc_exec_ctx* exec_ctx, grpc_timer* timer, - grpc_millis deadline, grpc_closure* closure) { +void grpc_timer_init(grpc_timer* timer, grpc_millis deadline, + grpc_closure* closure) { uint64_t timeout; uv_timer_t* uv_timer; GRPC_UV_ASSERT_SAME_THREAD(); timer->closure = closure; - if (deadline <= grpc_exec_ctx_now(exec_ctx)) { + if (deadline <= grpc_core::ExecCtx::Get()->Now()) { timer->pending = 0; - GRPC_CLOSURE_SCHED(exec_ctx, timer->closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_NONE); return; } timer->pending = 1; - timeout = (uint64_t)(deadline - grpc_exec_ctx_now(exec_ctx)); + timeout = (uint64_t)(deadline - grpc_core::ExecCtx::Get()->Now()); uv_timer = (uv_timer_t*)gpr_malloc(sizeof(uv_timer_t)); uv_timer_init(uv_default_loop(), uv_timer); uv_timer->data = timer; @@ -77,22 +76,21 @@ void grpc_timer_init(grpc_exec_ctx* exec_ctx, grpc_timer* timer, void grpc_timer_init_unset(grpc_timer* timer) { timer->pending = 0; } -void grpc_timer_cancel(grpc_exec_ctx* exec_ctx, grpc_timer* timer) { +void grpc_timer_cancel(grpc_timer* timer) { GRPC_UV_ASSERT_SAME_THREAD(); if (timer->pending) { timer->pending = 0; - GRPC_CLOSURE_SCHED(exec_ctx, timer->closure, GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_CANCELLED); stop_uv_timer((uv_timer_t*)timer->uv_timer); } } -grpc_timer_check_result grpc_timer_check(grpc_exec_ctx* exec_ctx, - grpc_millis* next) { +grpc_timer_check_result grpc_timer_check(grpc_millis* next) { return GRPC_TIMERS_NOT_CHECKED; } -void grpc_timer_list_init(grpc_exec_ctx* exec_ctx) {} -void grpc_timer_list_shutdown(grpc_exec_ctx* exec_ctx) {} +void grpc_timer_list_init() {} +void grpc_timer_list_shutdown() {} void grpc_timer_consume_kick(void) {} diff --git a/src/core/lib/iomgr/udp_server.cc b/src/core/lib/iomgr/udp_server.cc index 7b7d6946b12..55e0b165ec0 100644 --- a/src/core/lib/iomgr/udp_server.cc +++ b/src/core/lib/iomgr/udp_server.cc @@ -150,31 +150,30 @@ grpc_udp_server* grpc_udp_server_create(const grpc_channel_args* args) { return s; } -static void shutdown_fd(grpc_exec_ctx* exec_ctx, void* args, - grpc_error* error) { +static void shutdown_fd(void* args, grpc_error* error) { struct shutdown_fd_args* shutdown_args = (struct shutdown_fd_args*)args; grpc_udp_listener* sp = shutdown_args->sp; gpr_log(GPR_DEBUG, "shutdown fd %d", sp->fd); gpr_mu_lock(shutdown_args->server_mu); - grpc_fd_shutdown(exec_ctx, sp->emfd, GRPC_ERROR_REF(error)); + grpc_fd_shutdown(sp->emfd, GRPC_ERROR_REF(error)); sp->already_shutdown = true; if (!sp->notify_on_write_armed) { // Re-arm write notification to notify listener with error. This is // necessary to decrement active_ports. sp->notify_on_write_armed = true; - grpc_fd_notify_on_write(exec_ctx, sp->emfd, &sp->write_closure); + grpc_fd_notify_on_write(sp->emfd, &sp->write_closure); } gpr_mu_unlock(shutdown_args->server_mu); gpr_free(shutdown_args); } -static void dummy_cb(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void dummy_cb(void* arg, grpc_error* error) { // No-op. } -static void finish_shutdown(grpc_exec_ctx* exec_ctx, grpc_udp_server* s) { +static void finish_shutdown(grpc_udp_server* s) { if (s->shutdown_complete != nullptr) { - GRPC_CLOSURE_SCHED(exec_ctx, s->shutdown_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(s->shutdown_complete, GRPC_ERROR_NONE); } gpr_mu_destroy(&s->mu); @@ -193,14 +192,13 @@ static void finish_shutdown(grpc_exec_ctx* exec_ctx, grpc_udp_server* s) { gpr_free(s); } -static void destroyed_port(grpc_exec_ctx* exec_ctx, void* server, - grpc_error* error) { +static void destroyed_port(void* server, grpc_error* error) { grpc_udp_server* s = (grpc_udp_server*)server; gpr_mu_lock(&s->mu); s->destroyed_ports++; if (s->destroyed_ports == s->nports) { gpr_mu_unlock(&s->mu); - finish_shutdown(exec_ctx, s); + finish_shutdown(s); } else { gpr_mu_unlock(&s->mu); } @@ -209,7 +207,7 @@ static void destroyed_port(grpc_exec_ctx* exec_ctx, void* server, /* called when all listening endpoints have been shutdown, so no further events will be received on them - at this point it's safe to destroy things */ -static void deactivated_all_ports(grpc_exec_ctx* exec_ctx, grpc_udp_server* s) { +static void deactivated_all_ports(grpc_udp_server* s) { /* delete ALL the things */ gpr_mu_lock(&s->mu); @@ -230,21 +228,19 @@ static void deactivated_all_ports(grpc_exec_ctx* exec_ctx, grpc_udp_server* s) { grpc_schedule_on_exec_ctx); GPR_ASSERT(sp->orphan_cb); gpr_log(GPR_DEBUG, "Orphan fd %d", sp->fd); - sp->orphan_cb(exec_ctx, sp->emfd, &sp->orphan_fd_closure, - sp->server->user_data); + sp->orphan_cb(sp->emfd, &sp->orphan_fd_closure, sp->server->user_data); } - grpc_fd_orphan(exec_ctx, sp->emfd, &sp->destroyed_closure, nullptr, + grpc_fd_orphan(sp->emfd, &sp->destroyed_closure, nullptr, false /* already_closed */, "udp_listener_shutdown"); } gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - finish_shutdown(exec_ctx, s); + finish_shutdown(s); } } -void grpc_udp_server_destroy(grpc_exec_ctx* exec_ctx, grpc_udp_server* s, - grpc_closure* on_done) { +void grpc_udp_server_destroy(grpc_udp_server* s, grpc_closure* on_done) { grpc_udp_listener* sp; gpr_mu_lock(&s->mu); @@ -264,14 +260,13 @@ void grpc_udp_server_destroy(grpc_exec_ctx* exec_ctx, grpc_udp_server* s, args->server_mu = &s->mu; GRPC_CLOSURE_INIT(&sp->orphan_fd_closure, shutdown_fd, args, grpc_schedule_on_exec_ctx); - sp->orphan_cb(exec_ctx, sp->emfd, &sp->orphan_fd_closure, - sp->server->user_data); + sp->orphan_cb(sp->emfd, &sp->orphan_fd_closure, sp->server->user_data); sp->orphan_notified = true; } gpr_mu_unlock(&s->mu); } else { gpr_mu_unlock(&s->mu); - deactivated_all_ports(exec_ctx, s); + deactivated_all_ports(s); } } @@ -350,7 +345,7 @@ error: return -1; } -static void do_read(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void do_read(void* arg, grpc_error* error) { grpc_udp_listener* sp = reinterpret_cast(arg); GPR_ASSERT(sp->read_cb && error == GRPC_ERROR_NONE); /* TODO: the reason we hold server->mu here is merely to prevent fd @@ -358,29 +353,28 @@ static void do_read(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { * read lock if available. */ gpr_mu_lock(&sp->server->mu); /* Tell the registered callback that data is available to read. */ - if (!sp->already_shutdown && - sp->read_cb(exec_ctx, sp->emfd, sp->server->user_data)) { + if (!sp->already_shutdown && sp->read_cb(sp->emfd, sp->server->user_data)) { /* There maybe more packets to read. Schedule read_more_cb_ closure to run * after finishing this event loop. */ - GRPC_CLOSURE_SCHED(exec_ctx, &sp->do_read_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&sp->do_read_closure, GRPC_ERROR_NONE); } else { /* Finish reading all the packets, re-arm the notification event so we can * get another chance to read. Or fd already shutdown, re-arm to get a * notification with shutdown error. */ - grpc_fd_notify_on_read(exec_ctx, sp->emfd, &sp->read_closure); + grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); } gpr_mu_unlock(&sp->server->mu); } /* event manager callback when reads are ready */ -static void on_read(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void on_read(void* arg, grpc_error* error) { grpc_udp_listener* sp = (grpc_udp_listener*)arg; gpr_mu_lock(&sp->server->mu); if (error != GRPC_ERROR_NONE) { if (0 == --sp->server->active_ports && sp->server->shutdown) { gpr_mu_unlock(&sp->server->mu); - deactivated_all_ports(exec_ctx, sp->server); + deactivated_all_ports(sp->server); } else { gpr_mu_unlock(&sp->server->mu); } @@ -389,59 +383,57 @@ static void on_read(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { /* Read once. If there is more data to read, off load the work to another * thread to finish. */ GPR_ASSERT(sp->read_cb); - if (sp->read_cb(exec_ctx, sp->emfd, sp->server->user_data)) { + if (sp->read_cb(sp->emfd, sp->server->user_data)) { /* There maybe more packets to read. Schedule read_more_cb_ closure to run * after finishing this event loop. */ GRPC_CLOSURE_INIT(&sp->do_read_closure, do_read, arg, grpc_executor_scheduler(GRPC_EXECUTOR_LONG)); - GRPC_CLOSURE_SCHED(exec_ctx, &sp->do_read_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&sp->do_read_closure, GRPC_ERROR_NONE); } else { /* Finish reading all the packets, re-arm the notification event so we can * get another chance to read. Or fd already shutdown, re-arm to get a * notification with shutdown error. */ - grpc_fd_notify_on_read(exec_ctx, sp->emfd, &sp->read_closure); + grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); } gpr_mu_unlock(&sp->server->mu); } // Wrapper of grpc_fd_notify_on_write() with a grpc_closure callback interface. -void fd_notify_on_write_wrapper(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +void fd_notify_on_write_wrapper(void* arg, grpc_error* error) { grpc_udp_listener* sp = reinterpret_cast(arg); gpr_mu_lock(&sp->server->mu); if (!sp->notify_on_write_armed) { - grpc_fd_notify_on_write(exec_ctx, sp->emfd, &sp->write_closure); + grpc_fd_notify_on_write(sp->emfd, &sp->write_closure); sp->notify_on_write_armed = true; } gpr_mu_unlock(&sp->server->mu); } -static void do_write(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void do_write(void* arg, grpc_error* error) { grpc_udp_listener* sp = reinterpret_cast(arg); gpr_mu_lock(&(sp->server->mu)); if (sp->already_shutdown) { // If fd has been shutdown, don't write any more and re-arm notification. - grpc_fd_notify_on_write(exec_ctx, sp->emfd, &sp->write_closure); + grpc_fd_notify_on_write(sp->emfd, &sp->write_closure); } else { sp->notify_on_write_armed = false; /* Tell the registered callback that the socket is writeable. */ GPR_ASSERT(sp->write_cb && error == GRPC_ERROR_NONE); GRPC_CLOSURE_INIT(&sp->notify_on_write_closure, fd_notify_on_write_wrapper, arg, grpc_schedule_on_exec_ctx); - sp->write_cb(exec_ctx, sp->emfd, sp->server->user_data, - &sp->notify_on_write_closure); + sp->write_cb(sp->emfd, sp->server->user_data, &sp->notify_on_write_closure); } gpr_mu_unlock(&sp->server->mu); } -static void on_write(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void on_write(void* arg, grpc_error* error) { grpc_udp_listener* sp = (grpc_udp_listener*)arg; gpr_mu_lock(&(sp->server->mu)); if (error != GRPC_ERROR_NONE) { if (0 == --sp->server->active_ports && sp->server->shutdown) { gpr_mu_unlock(&sp->server->mu); - deactivated_all_ports(exec_ctx, sp->server); + deactivated_all_ports(sp->server); } else { gpr_mu_unlock(&sp->server->mu); } @@ -452,7 +444,7 @@ static void on_write(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { GRPC_CLOSURE_INIT(&sp->do_write_closure, do_write, arg, grpc_executor_scheduler(GRPC_EXECUTOR_LONG)); - GRPC_CLOSURE_SCHED(exec_ctx, &sp->do_write_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&sp->do_write_closure, GRPC_ERROR_NONE); gpr_mu_unlock(&sp->server->mu); } @@ -593,9 +585,8 @@ int grpc_udp_server_get_fd(grpc_udp_server* s, unsigned port_index) { return sp->fd; } -void grpc_udp_server_start(grpc_exec_ctx* exec_ctx, grpc_udp_server* s, - grpc_pollset** pollsets, size_t pollset_count, - void* user_data) { +void grpc_udp_server_start(grpc_udp_server* s, grpc_pollset** pollsets, + size_t pollset_count, void* user_data) { size_t i; gpr_mu_lock(&s->mu); grpc_udp_listener* sp; @@ -606,16 +597,16 @@ void grpc_udp_server_start(grpc_exec_ctx* exec_ctx, grpc_udp_server* s, sp = s->head; while (sp != nullptr) { for (i = 0; i < pollset_count; i++) { - grpc_pollset_add_fd(exec_ctx, pollsets[i], sp->emfd); + grpc_pollset_add_fd(pollsets[i], sp->emfd); } GRPC_CLOSURE_INIT(&sp->read_closure, on_read, sp, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(exec_ctx, sp->emfd, &sp->read_closure); + grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); GRPC_CLOSURE_INIT(&sp->write_closure, on_write, sp, grpc_schedule_on_exec_ctx); sp->notify_on_write_armed = true; - grpc_fd_notify_on_write(exec_ctx, sp->emfd, &sp->write_closure); + grpc_fd_notify_on_write(sp->emfd, &sp->write_closure); /* Registered for both read and write callbacks: increment active_ports * twice to account for this, and delay free-ing of memory until both diff --git a/src/core/lib/iomgr/udp_server.h b/src/core/lib/iomgr/udp_server.h index 1bd6922de66..02e3acb7f5f 100644 --- a/src/core/lib/iomgr/udp_server.h +++ b/src/core/lib/iomgr/udp_server.h @@ -32,18 +32,15 @@ typedef struct grpc_udp_server grpc_udp_server; /* Called when data is available to read from the socket. * Return true if there is more data to read from fd. */ -typedef bool (*grpc_udp_server_read_cb)(grpc_exec_ctx* exec_ctx, grpc_fd* emfd, - void* user_data); +typedef bool (*grpc_udp_server_read_cb)(grpc_fd* emfd, void* user_data); /* Called when the socket is writeable. The given closure should be scheduled * when the socket becomes blocked next time. */ -typedef void (*grpc_udp_server_write_cb)(grpc_exec_ctx* exec_ctx, grpc_fd* emfd, - void* user_data, +typedef void (*grpc_udp_server_write_cb)(grpc_fd* emfd, void* user_data, grpc_closure* notify_on_write_closure); /* Called when the grpc_fd is about to be orphaned (and the FD closed). */ -typedef void (*grpc_udp_server_orphan_cb)(grpc_exec_ctx* exec_ctx, - grpc_fd* emfd, +typedef void (*grpc_udp_server_orphan_cb)(grpc_fd* emfd, grpc_closure* shutdown_fd_callback, void* user_data); @@ -51,9 +48,8 @@ typedef void (*grpc_udp_server_orphan_cb)(grpc_exec_ctx* exec_ctx, grpc_udp_server* grpc_udp_server_create(const grpc_channel_args* args); /* Start listening to bound ports. user_data is passed to callbacks. */ -void grpc_udp_server_start(grpc_exec_ctx* exec_ctx, grpc_udp_server* udp_server, - grpc_pollset** pollsets, size_t pollset_count, - void* user_data); +void grpc_udp_server_start(grpc_udp_server* udp_server, grpc_pollset** pollsets, + size_t pollset_count, void* user_data); int grpc_udp_server_get_fd(grpc_udp_server* s, unsigned port_index); @@ -73,7 +69,6 @@ int grpc_udp_server_add_port(grpc_udp_server* s, grpc_udp_server_write_cb write_cb, grpc_udp_server_orphan_cb orphan_cb); -void grpc_udp_server_destroy(grpc_exec_ctx* exec_ctx, grpc_udp_server* server, - grpc_closure* on_done); +void grpc_udp_server_destroy(grpc_udp_server* server, grpc_closure* on_done); #endif /* GRPC_CORE_LIB_IOMGR_UDP_SERVER_H */ diff --git a/src/core/lib/security/context/security_context.cc b/src/core/lib/security/context/security_context.cc index 19c6148e434..03710279948 100644 --- a/src/core/lib/security/context/security_context.cc +++ b/src/core/lib/security/context/security_context.cc @@ -36,7 +36,7 @@ grpc_core::DebugOnlyTraceFlag grpc_trace_auth_context_refcount( grpc_call_error grpc_call_set_credentials(grpc_call* call, grpc_call_credentials* creds) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_client_security_context* ctx = nullptr; GRPC_API_TRACE("grpc_call_set_credentials(call=%p, creds=%p)", 2, (call, creds)); @@ -52,10 +52,10 @@ grpc_call_error grpc_call_set_credentials(grpc_call* call, grpc_call_context_set(call, GRPC_CONTEXT_SECURITY, ctx, grpc_client_security_context_destroy); } else { - grpc_call_credentials_unref(&exec_ctx, ctx->creds); + grpc_call_credentials_unref(ctx->creds); ctx->creds = grpc_call_credentials_ref(creds); } - grpc_exec_ctx_finish(&exec_ctx); + return GRPC_CALL_OK; } @@ -85,15 +85,14 @@ grpc_client_security_context* grpc_client_security_context_create(void) { } void grpc_client_security_context_destroy(void* ctx) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_client_security_context* c = (grpc_client_security_context*)ctx; - grpc_call_credentials_unref(&exec_ctx, c->creds); + grpc_call_credentials_unref(c->creds); GRPC_AUTH_CONTEXT_UNREF(c->auth_context, "client_security_context"); if (c->extension.instance != nullptr && c->extension.destroy != nullptr) { c->extension.destroy(c->extension.instance); } gpr_free(ctx); - grpc_exec_ctx_finish(&exec_ctx); } /* --- grpc_server_security_context --- */ @@ -141,7 +140,7 @@ grpc_auth_context* grpc_auth_context_ref(grpc_auth_context* ctx, } #else grpc_auth_context* grpc_auth_context_ref(grpc_auth_context* ctx) { - if (ctx == NULL) return NULL; + if (ctx == nullptr) return nullptr; #endif gpr_ref(&ctx->refcount); return ctx; @@ -159,7 +158,7 @@ void grpc_auth_context_unref(grpc_auth_context* ctx, const char* file, int line, } #else void grpc_auth_context_unref(grpc_auth_context* ctx) { - if (ctx == NULL) return; + if (ctx == nullptr) return; #endif if (gpr_unref(&ctx->refcount)) { size_t i; @@ -303,7 +302,7 @@ void grpc_auth_property_reset(grpc_auth_property* property) { memset(property, 0, sizeof(grpc_auth_property)); } -static void auth_context_pointer_arg_destroy(grpc_exec_ctx* exec_ctx, void* p) { +static void auth_context_pointer_arg_destroy(void* p) { GRPC_AUTH_CONTEXT_UNREF((grpc_auth_context*)p, "auth_context_pointer_arg"); } diff --git a/src/core/lib/security/credentials/composite/composite_credentials.cc b/src/core/lib/security/credentials/composite/composite_credentials.cc index 93dd721240c..e4c1604795f 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.cc +++ b/src/core/lib/security/credentials/composite/composite_credentials.cc @@ -39,17 +39,15 @@ typedef struct { grpc_closure internal_on_request_metadata; } grpc_composite_call_credentials_metadata_context; -static void composite_call_destruct(grpc_exec_ctx* exec_ctx, - grpc_call_credentials* creds) { +static void composite_call_destruct(grpc_call_credentials* creds) { grpc_composite_call_credentials* c = (grpc_composite_call_credentials*)creds; for (size_t i = 0; i < c->inner.num_creds; i++) { - grpc_call_credentials_unref(exec_ctx, c->inner.creds_array[i]); + grpc_call_credentials_unref(c->inner.creds_array[i]); } gpr_free(c->inner.creds_array); } -static void composite_call_metadata_cb(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void composite_call_metadata_cb(void* arg, grpc_error* error) { grpc_composite_call_credentials_metadata_context* ctx = (grpc_composite_call_credentials_metadata_context*)arg; if (error == GRPC_ERROR_NONE) { @@ -58,23 +56,23 @@ static void composite_call_metadata_cb(grpc_exec_ctx* exec_ctx, void* arg, grpc_call_credentials* inner_creds = ctx->composite_creds->inner.creds_array[ctx->creds_index++]; if (grpc_call_credentials_get_request_metadata( - exec_ctx, inner_creds, ctx->pollent, ctx->auth_md_context, - ctx->md_array, &ctx->internal_on_request_metadata, &error)) { + inner_creds, ctx->pollent, ctx->auth_md_context, ctx->md_array, + &ctx->internal_on_request_metadata, &error)) { // Synchronous response, so call ourselves recursively. - composite_call_metadata_cb(exec_ctx, arg, error); + composite_call_metadata_cb(arg, error); GRPC_ERROR_UNREF(error); } return; } // We're done! } - GRPC_CLOSURE_SCHED(exec_ctx, ctx->on_request_metadata, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(ctx->on_request_metadata, GRPC_ERROR_REF(error)); gpr_free(ctx); } static bool composite_call_get_request_metadata( - grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, - grpc_polling_entity* pollent, grpc_auth_metadata_context auth_md_context, + grpc_call_credentials* creds, grpc_polling_entity* pollent, + grpc_auth_metadata_context auth_md_context, grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, grpc_error** error) { grpc_composite_call_credentials* c = (grpc_composite_call_credentials*)creds; @@ -93,8 +91,8 @@ static bool composite_call_get_request_metadata( grpc_call_credentials* inner_creds = ctx->composite_creds->inner.creds_array[ctx->creds_index++]; if (grpc_call_credentials_get_request_metadata( - exec_ctx, inner_creds, ctx->pollent, ctx->auth_md_context, - ctx->md_array, &ctx->internal_on_request_metadata, error)) { + inner_creds, ctx->pollent, ctx->auth_md_context, ctx->md_array, + &ctx->internal_on_request_metadata, error)) { if (*error != GRPC_ERROR_NONE) break; } else { synchronous = false; // Async return. @@ -106,12 +104,12 @@ static bool composite_call_get_request_metadata( } static void composite_call_cancel_get_request_metadata( - grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, - grpc_credentials_mdelem_array* md_array, grpc_error* error) { + grpc_call_credentials* creds, grpc_credentials_mdelem_array* md_array, + grpc_error* error) { grpc_composite_call_credentials* c = (grpc_composite_call_credentials*)creds; for (size_t i = 0; i < c->inner.num_creds; ++i) { grpc_call_credentials_cancel_get_request_metadata( - exec_ctx, c->inner.creds_array[i], md_array, GRPC_ERROR_REF(error)); + c->inner.creds_array[i], md_array, GRPC_ERROR_REF(error)); } GRPC_ERROR_UNREF(error); } @@ -200,19 +198,17 @@ grpc_call_credentials* grpc_credentials_contains_type( /* -- Composite channel credentials. -- */ -static void composite_channel_destruct(grpc_exec_ctx* exec_ctx, - grpc_channel_credentials* creds) { +static void composite_channel_destruct(grpc_channel_credentials* creds) { grpc_composite_channel_credentials* c = (grpc_composite_channel_credentials*)creds; - grpc_channel_credentials_unref(exec_ctx, c->inner_creds); - grpc_call_credentials_unref(exec_ctx, c->call_creds); + grpc_channel_credentials_unref(c->inner_creds); + grpc_call_credentials_unref(c->call_creds); } static grpc_security_status composite_channel_create_security_connector( - grpc_exec_ctx* exec_ctx, grpc_channel_credentials* creds, - grpc_call_credentials* call_creds, const char* target, - const grpc_channel_args* args, grpc_channel_security_connector** sc, - grpc_channel_args** new_args) { + grpc_channel_credentials* creds, grpc_call_credentials* call_creds, + const char* target, const grpc_channel_args* args, + grpc_channel_security_connector** sc, grpc_channel_args** new_args) { grpc_composite_channel_credentials* c = (grpc_composite_channel_credentials*)creds; grpc_security_status status = GRPC_SECURITY_ERROR; @@ -227,12 +223,11 @@ static grpc_security_status composite_channel_create_security_connector( grpc_composite_call_credentials_create(c->call_creds, call_creds, nullptr); status = c->inner_creds->vtable->create_security_connector( - exec_ctx, c->inner_creds, composite_call_creds, target, args, sc, - new_args); - grpc_call_credentials_unref(exec_ctx, composite_call_creds); + c->inner_creds, composite_call_creds, target, args, sc, new_args); + grpc_call_credentials_unref(composite_call_creds); } else { status = c->inner_creds->vtable->create_security_connector( - exec_ctx, c->inner_creds, c->call_creds, target, args, sc, new_args); + c->inner_creds, c->call_creds, target, args, sc, new_args); } return status; } diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index 90576e69b91..48b459e1be9 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -47,8 +47,8 @@ grpc_credentials_metadata_request* grpc_credentials_metadata_request_create( } void grpc_credentials_metadata_request_destroy( - grpc_exec_ctx* exec_ctx, grpc_credentials_metadata_request* r) { - grpc_call_credentials_unref(exec_ctx, r->creds); + grpc_credentials_metadata_request* r) { + grpc_call_credentials_unref(r->creds); grpc_http_response_destroy(&r->response); gpr_free(r); } @@ -60,12 +60,11 @@ grpc_channel_credentials* grpc_channel_credentials_ref( return creds; } -void grpc_channel_credentials_unref(grpc_exec_ctx* exec_ctx, - grpc_channel_credentials* creds) { +void grpc_channel_credentials_unref(grpc_channel_credentials* creds) { if (creds == nullptr) return; if (gpr_unref(&creds->refcount)) { if (creds->vtable->destruct != nullptr) { - creds->vtable->destruct(exec_ctx, creds); + creds->vtable->destruct(creds); } gpr_free(creds); } @@ -73,9 +72,8 @@ void grpc_channel_credentials_unref(grpc_exec_ctx* exec_ctx, void grpc_channel_credentials_release(grpc_channel_credentials* creds) { GRPC_API_TRACE("grpc_channel_credentials_release(creds=%p)", 1, (creds)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_credentials_unref(&exec_ctx, creds); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_credentials_unref(creds); } grpc_call_credentials* grpc_call_credentials_ref(grpc_call_credentials* creds) { @@ -84,12 +82,11 @@ grpc_call_credentials* grpc_call_credentials_ref(grpc_call_credentials* creds) { return creds; } -void grpc_call_credentials_unref(grpc_exec_ctx* exec_ctx, - grpc_call_credentials* creds) { +void grpc_call_credentials_unref(grpc_call_credentials* creds) { if (creds == nullptr) return; if (gpr_unref(&creds->refcount)) { if (creds->vtable->destruct != nullptr) { - creds->vtable->destruct(exec_ctx, creds); + creds->vtable->destruct(creds); } gpr_free(creds); } @@ -97,44 +94,42 @@ void grpc_call_credentials_unref(grpc_exec_ctx* exec_ctx, void grpc_call_credentials_release(grpc_call_credentials* creds) { GRPC_API_TRACE("grpc_call_credentials_release(creds=%p)", 1, (creds)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_call_credentials_unref(&exec_ctx, creds); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_call_credentials_unref(creds); } bool grpc_call_credentials_get_request_metadata( - grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, - grpc_polling_entity* pollent, grpc_auth_metadata_context context, - grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, - grpc_error** error) { + grpc_call_credentials* creds, grpc_polling_entity* pollent, + grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, + grpc_closure* on_request_metadata, grpc_error** error) { if (creds == nullptr || creds->vtable->get_request_metadata == nullptr) { return true; } - return creds->vtable->get_request_metadata( - exec_ctx, creds, pollent, context, md_array, on_request_metadata, error); + return creds->vtable->get_request_metadata(creds, pollent, context, md_array, + on_request_metadata, error); } void grpc_call_credentials_cancel_get_request_metadata( - grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, - grpc_credentials_mdelem_array* md_array, grpc_error* error) { + grpc_call_credentials* creds, grpc_credentials_mdelem_array* md_array, + grpc_error* error) { if (creds == nullptr || creds->vtable->cancel_get_request_metadata == nullptr) { return; } - creds->vtable->cancel_get_request_metadata(exec_ctx, creds, md_array, error); + creds->vtable->cancel_get_request_metadata(creds, md_array, error); } grpc_security_status grpc_channel_credentials_create_security_connector( - grpc_exec_ctx* exec_ctx, grpc_channel_credentials* channel_creds, - const char* target, const grpc_channel_args* args, - grpc_channel_security_connector** sc, grpc_channel_args** new_args) { + grpc_channel_credentials* channel_creds, const char* target, + const grpc_channel_args* args, grpc_channel_security_connector** sc, + grpc_channel_args** new_args) { *new_args = nullptr; if (channel_creds == nullptr) { return GRPC_SECURITY_ERROR; } GPR_ASSERT(channel_creds->vtable->create_security_connector != nullptr); return channel_creds->vtable->create_security_connector( - exec_ctx, channel_creds, nullptr, target, args, sc, new_args); + channel_creds, nullptr, target, args, sc, new_args); } grpc_channel_credentials* @@ -149,8 +144,8 @@ grpc_channel_credentials_duplicate_without_call_credentials( } } -static void credentials_pointer_arg_destroy(grpc_exec_ctx* exec_ctx, void* p) { - grpc_channel_credentials_unref(exec_ctx, (grpc_channel_credentials*)p); +static void credentials_pointer_arg_destroy(void* p) { + grpc_channel_credentials_unref((grpc_channel_credentials*)p); } static void* credentials_pointer_arg_copy(void* p) { @@ -200,12 +195,11 @@ grpc_server_credentials* grpc_server_credentials_ref( return creds; } -void grpc_server_credentials_unref(grpc_exec_ctx* exec_ctx, - grpc_server_credentials* creds) { +void grpc_server_credentials_unref(grpc_server_credentials* creds) { if (creds == nullptr) return; if (gpr_unref(&creds->refcount)) { if (creds->vtable->destruct != nullptr) { - creds->vtable->destruct(exec_ctx, creds); + creds->vtable->destruct(creds); } if (creds->processor.destroy != nullptr && creds->processor.state != nullptr) { @@ -217,19 +211,17 @@ void grpc_server_credentials_unref(grpc_exec_ctx* exec_ctx, void grpc_server_credentials_release(grpc_server_credentials* creds) { GRPC_API_TRACE("grpc_server_credentials_release(creds=%p)", 1, (creds)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_server_credentials_unref(&exec_ctx, creds); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_server_credentials_unref(creds); } grpc_security_status grpc_server_credentials_create_security_connector( - grpc_exec_ctx* exec_ctx, grpc_server_credentials* creds, - grpc_server_security_connector** sc) { + grpc_server_credentials* creds, grpc_server_security_connector** sc) { if (creds == nullptr || creds->vtable->create_security_connector == nullptr) { gpr_log(GPR_ERROR, "Server credentials cannot create security context."); return GRPC_SECURITY_ERROR; } - return creds->vtable->create_security_connector(exec_ctx, creds, sc); + return creds->vtable->create_security_connector(creds, sc); } void grpc_server_credentials_set_auth_metadata_processor( @@ -247,9 +239,8 @@ void grpc_server_credentials_set_auth_metadata_processor( creds->processor = processor; } -static void server_credentials_pointer_arg_destroy(grpc_exec_ctx* exec_ctx, - void* p) { - grpc_server_credentials_unref(exec_ctx, (grpc_server_credentials*)p); +static void server_credentials_pointer_arg_destroy(void* p) { + grpc_server_credentials_unref((grpc_server_credentials*)p); } static void* server_credentials_pointer_arg_copy(void* p) { diff --git a/src/core/lib/security/credentials/credentials.h b/src/core/lib/security/credentials/credentials.h index bc1bd11c77d..4825b657205 100644 --- a/src/core/lib/security/credentials/credentials.h +++ b/src/core/lib/security/credentials/credentials.h @@ -88,13 +88,12 @@ void grpc_override_well_known_credentials_path_getter( #define GRPC_ARG_CHANNEL_CREDENTIALS "grpc.channel_credentials" typedef struct { - void (*destruct)(grpc_exec_ctx* exec_ctx, grpc_channel_credentials* c); + void (*destruct)(grpc_channel_credentials* c); grpc_security_status (*create_security_connector)( - grpc_exec_ctx* exec_ctx, grpc_channel_credentials* c, - grpc_call_credentials* call_creds, const char* target, - const grpc_channel_args* args, grpc_channel_security_connector** sc, - grpc_channel_args** new_args); + grpc_channel_credentials* c, grpc_call_credentials* call_creds, + const char* target, const grpc_channel_args* args, + grpc_channel_security_connector** sc, grpc_channel_args** new_args); grpc_channel_credentials* (*duplicate_without_call_credentials)( grpc_channel_credentials* c); @@ -108,17 +107,16 @@ struct grpc_channel_credentials { grpc_channel_credentials* grpc_channel_credentials_ref( grpc_channel_credentials* creds); -void grpc_channel_credentials_unref(grpc_exec_ctx* exec_ctx, - grpc_channel_credentials* creds); +void grpc_channel_credentials_unref(grpc_channel_credentials* creds); /* Creates a security connector for the channel. May also create new channel args for the channel to be used in place of the passed in const args if returned non NULL. In that case the caller is responsible for destroying new_args after channel creation. */ grpc_security_status grpc_channel_credentials_create_security_connector( - grpc_exec_ctx* exec_ctx, grpc_channel_credentials* creds, - const char* target, const grpc_channel_args* args, - grpc_channel_security_connector** sc, grpc_channel_args** new_args); + grpc_channel_credentials* creds, const char* target, + const grpc_channel_args* args, grpc_channel_security_connector** sc, + grpc_channel_args** new_args); /* Creates a version of the channel credentials without any attached call credentials. This can be used in order to open a channel to a non-trusted @@ -153,22 +151,19 @@ void grpc_credentials_mdelem_array_add(grpc_credentials_mdelem_array* list, void grpc_credentials_mdelem_array_append(grpc_credentials_mdelem_array* dst, grpc_credentials_mdelem_array* src); -void grpc_credentials_mdelem_array_destroy(grpc_exec_ctx* exec_ctx, - grpc_credentials_mdelem_array* list); +void grpc_credentials_mdelem_array_destroy(grpc_credentials_mdelem_array* list); /* --- grpc_call_credentials. --- */ typedef struct { - void (*destruct)(grpc_exec_ctx* exec_ctx, grpc_call_credentials* c); - bool (*get_request_metadata)(grpc_exec_ctx* exec_ctx, - grpc_call_credentials* c, + void (*destruct)(grpc_call_credentials* c); + bool (*get_request_metadata)(grpc_call_credentials* c, grpc_polling_entity* pollent, grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, grpc_error** error); - void (*cancel_get_request_metadata)(grpc_exec_ctx* exec_ctx, - grpc_call_credentials* c, + void (*cancel_get_request_metadata)(grpc_call_credentials* c, grpc_credentials_mdelem_array* md_array, grpc_error* error); } grpc_call_credentials_vtable; @@ -180,39 +175,35 @@ struct grpc_call_credentials { }; grpc_call_credentials* grpc_call_credentials_ref(grpc_call_credentials* creds); -void grpc_call_credentials_unref(grpc_exec_ctx* exec_ctx, - grpc_call_credentials* creds); +void grpc_call_credentials_unref(grpc_call_credentials* creds); /// Returns true if completed synchronously, in which case \a error will /// be set to indicate the result. Otherwise, \a on_request_metadata will /// be invoked asynchronously when complete. \a md_array will be populated /// with the resulting metadata once complete. bool grpc_call_credentials_get_request_metadata( - grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, - grpc_polling_entity* pollent, grpc_auth_metadata_context context, - grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, - grpc_error** error); + grpc_call_credentials* creds, grpc_polling_entity* pollent, + grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, + grpc_closure* on_request_metadata, grpc_error** error); /// Cancels a pending asynchronous operation started by /// grpc_call_credentials_get_request_metadata() with the corresponding /// value of \a md_array. void grpc_call_credentials_cancel_get_request_metadata( - grpc_exec_ctx* exec_ctx, grpc_call_credentials* c, - grpc_credentials_mdelem_array* md_array, grpc_error* error); + grpc_call_credentials* c, grpc_credentials_mdelem_array* md_array, + grpc_error* error); /* Metadata-only credentials with the specified key and value where asynchronicity can be simulated for testing. */ grpc_call_credentials* grpc_md_only_test_credentials_create( - grpc_exec_ctx* exec_ctx, const char* md_key, const char* md_value, - bool is_async); + const char* md_key, const char* md_value, bool is_async); /* --- grpc_server_credentials. --- */ typedef struct { - void (*destruct)(grpc_exec_ctx* exec_ctx, grpc_server_credentials* c); + void (*destruct)(grpc_server_credentials* c); grpc_security_status (*create_security_connector)( - grpc_exec_ctx* exec_ctx, grpc_server_credentials* c, - grpc_server_security_connector** sc); + grpc_server_credentials* c, grpc_server_security_connector** sc); } grpc_server_credentials_vtable; struct grpc_server_credentials { @@ -223,14 +214,12 @@ struct grpc_server_credentials { }; grpc_security_status grpc_server_credentials_create_security_connector( - grpc_exec_ctx* exec_ctx, grpc_server_credentials* creds, - grpc_server_security_connector** sc); + grpc_server_credentials* creds, grpc_server_security_connector** sc); grpc_server_credentials* grpc_server_credentials_ref( grpc_server_credentials* creds); -void grpc_server_credentials_unref(grpc_exec_ctx* exec_ctx, - grpc_server_credentials* creds); +void grpc_server_credentials_unref(grpc_server_credentials* creds); #define GRPC_SERVER_CREDENTIALS_ARG "grpc.server_credentials" @@ -250,6 +239,6 @@ grpc_credentials_metadata_request* grpc_credentials_metadata_request_create( grpc_call_credentials* creds); void grpc_credentials_metadata_request_destroy( - grpc_exec_ctx* exec_ctx, grpc_credentials_metadata_request* r); + grpc_credentials_metadata_request* r); #endif /* GRPC_CORE_LIB_SECURITY_CREDENTIALS_CREDENTIALS_H */ diff --git a/src/core/lib/security/credentials/credentials_metadata.cc b/src/core/lib/security/credentials/credentials_metadata.cc index a3623fa1d68..9ceaf211392 100644 --- a/src/core/lib/security/credentials/credentials_metadata.cc +++ b/src/core/lib/security/credentials/credentials_metadata.cc @@ -52,9 +52,9 @@ void grpc_credentials_mdelem_array_append(grpc_credentials_mdelem_array* dst, } void grpc_credentials_mdelem_array_destroy( - grpc_exec_ctx* exec_ctx, grpc_credentials_mdelem_array* list) { + grpc_credentials_mdelem_array* list) { for (size_t i = 0; i < list->size; ++i) { - GRPC_MDELEM_UNREF(exec_ctx, list->md[i]); + GRPC_MDELEM_UNREF(list->md[i]); } gpr_free(list->md); } diff --git a/src/core/lib/security/credentials/fake/fake_credentials.cc b/src/core/lib/security/credentials/fake/fake_credentials.cc index a535a317eec..99b1214951d 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.cc +++ b/src/core/lib/security/credentials/fake/fake_credentials.cc @@ -34,10 +34,9 @@ "grpc.fake_security.expected_targets" static grpc_security_status fake_transport_security_create_security_connector( - grpc_exec_ctx* exec_ctx, grpc_channel_credentials* c, - grpc_call_credentials* call_creds, const char* target, - const grpc_channel_args* args, grpc_channel_security_connector** sc, - grpc_channel_args** new_args) { + grpc_channel_credentials* c, grpc_call_credentials* call_creds, + const char* target, const grpc_channel_args* args, + grpc_channel_security_connector** sc, grpc_channel_args** new_args) { *sc = grpc_fake_channel_security_connector_create(c, call_creds, target, args); return GRPC_SECURITY_OK; @@ -45,8 +44,7 @@ static grpc_security_status fake_transport_security_create_security_connector( static grpc_security_status fake_transport_security_server_create_security_connector( - grpc_exec_ctx* exec_ctx, grpc_server_credentials* c, - grpc_server_security_connector** sc) { + grpc_server_credentials* c, grpc_server_security_connector** sc) { *sc = grpc_fake_server_security_connector_create(c); return GRPC_SECURITY_OK; } @@ -98,29 +96,27 @@ const char* grpc_fake_transport_get_expected_targets( /* -- Metadata-only test credentials. -- */ -static void md_only_test_destruct(grpc_exec_ctx* exec_ctx, - grpc_call_credentials* creds) { +static void md_only_test_destruct(grpc_call_credentials* creds) { grpc_md_only_test_credentials* c = (grpc_md_only_test_credentials*)creds; - GRPC_MDELEM_UNREF(exec_ctx, c->md); + GRPC_MDELEM_UNREF(c->md); } static bool md_only_test_get_request_metadata( - grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, - grpc_polling_entity* pollent, grpc_auth_metadata_context context, - grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, - grpc_error** error) { + grpc_call_credentials* creds, grpc_polling_entity* pollent, + grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, + grpc_closure* on_request_metadata, grpc_error** error) { grpc_md_only_test_credentials* c = (grpc_md_only_test_credentials*)creds; grpc_credentials_mdelem_array_add(md_array, c->md); if (c->is_async) { - GRPC_CLOSURE_SCHED(exec_ctx, on_request_metadata, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_request_metadata, GRPC_ERROR_NONE); return false; } return true; } static void md_only_test_cancel_get_request_metadata( - grpc_exec_ctx* exec_ctx, grpc_call_credentials* c, - grpc_credentials_mdelem_array* md_array, grpc_error* error) { + grpc_call_credentials* c, grpc_credentials_mdelem_array* md_array, + grpc_error* error) { GRPC_ERROR_UNREF(error); } @@ -129,16 +125,14 @@ static grpc_call_credentials_vtable md_only_test_vtable = { md_only_test_cancel_get_request_metadata}; grpc_call_credentials* grpc_md_only_test_credentials_create( - grpc_exec_ctx* exec_ctx, const char* md_key, const char* md_value, - bool is_async) { + const char* md_key, const char* md_value, bool is_async) { grpc_md_only_test_credentials* c = (grpc_md_only_test_credentials*)gpr_zalloc( sizeof(grpc_md_only_test_credentials)); c->base.type = GRPC_CALL_CREDENTIALS_TYPE_OAUTH2; c->base.vtable = &md_only_test_vtable; gpr_ref_init(&c->base.refcount, 1); - c->md = - grpc_mdelem_from_slices(exec_ctx, grpc_slice_from_copied_string(md_key), - grpc_slice_from_copied_string(md_value)); + c->md = grpc_mdelem_from_slices(grpc_slice_from_copied_string(md_key), + grpc_slice_from_copied_string(md_value)); c->is_async = is_async; return &c->base; } diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc index f586c7b6045..03d52850d90 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc @@ -58,8 +58,7 @@ typedef struct { grpc_http_response response; } compute_engine_detector; -static void on_compute_engine_detection_http_response(grpc_exec_ctx* exec_ctx, - void* user_data, +static void on_compute_engine_detection_http_response(void* user_data, grpc_error* error) { compute_engine_detector* detector = (compute_engine_detector*)user_data; if (error == GRPC_ERROR_NONE && detector->response.status == 200 && @@ -80,16 +79,16 @@ static void on_compute_engine_detection_http_response(grpc_exec_ctx* exec_ctx, detector->is_done = 1; GRPC_LOG_IF_ERROR( "Pollset kick", - grpc_pollset_kick( - exec_ctx, grpc_polling_entity_pollset(&detector->pollent), nullptr)); + grpc_pollset_kick(grpc_polling_entity_pollset(&detector->pollent), + nullptr)); gpr_mu_unlock(g_polling_mu); } -static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, grpc_error* e) { - grpc_pollset_destroy(exec_ctx, (grpc_pollset*)p); +static void destroy_pollset(void* p, grpc_error* e) { + grpc_pollset_destroy((grpc_pollset*)p); } -static int is_stack_running_on_compute_engine(grpc_exec_ctx* exec_ctx) { +static int is_stack_running_on_compute_engine() { compute_engine_detector detector; grpc_httpcli_request request; grpc_httpcli_context context; @@ -115,14 +114,14 @@ static int is_stack_running_on_compute_engine(grpc_exec_ctx* exec_ctx) { grpc_resource_quota* resource_quota = grpc_resource_quota_create("google_default_credentials"); grpc_httpcli_get( - exec_ctx, &context, &detector.pollent, resource_quota, &request, - grpc_exec_ctx_now(exec_ctx) + max_detection_delay, + &context, &detector.pollent, resource_quota, &request, + grpc_core::ExecCtx::Get()->Now() + max_detection_delay, GRPC_CLOSURE_CREATE(on_compute_engine_detection_http_response, &detector, grpc_schedule_on_exec_ctx), &detector.response); - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); - grpc_exec_ctx_flush(exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); /* Block until we get the response. This is not ideal but this should only be called once for the lifetime of the process by the default credentials. */ @@ -131,8 +130,7 @@ static int is_stack_running_on_compute_engine(grpc_exec_ctx* exec_ctx) { grpc_pollset_worker* worker = nullptr; if (!GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(exec_ctx, - grpc_polling_entity_pollset(&detector.pollent), + grpc_pollset_work(grpc_polling_entity_pollset(&detector.pollent), &worker, GRPC_MILLIS_INF_FUTURE))) { detector.is_done = 1; detector.success = 0; @@ -140,15 +138,14 @@ static int is_stack_running_on_compute_engine(grpc_exec_ctx* exec_ctx) { } gpr_mu_unlock(g_polling_mu); - grpc_httpcli_context_destroy(exec_ctx, &context); + grpc_httpcli_context_destroy(&context); GRPC_CLOSURE_INIT(&destroy_closure, destroy_pollset, grpc_polling_entity_pollset(&detector.pollent), grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(exec_ctx, - grpc_polling_entity_pollset(&detector.pollent), + grpc_pollset_shutdown(grpc_polling_entity_pollset(&detector.pollent), &destroy_closure); g_polling_mu = nullptr; - grpc_exec_ctx_flush(exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_free(grpc_polling_entity_pollset(&detector.pollent)); grpc_http_response_destroy(&detector.response); @@ -158,7 +155,7 @@ static int is_stack_running_on_compute_engine(grpc_exec_ctx* exec_ctx) { /* Takes ownership of creds_path if not NULL. */ static grpc_error* create_default_creds_from_path( - grpc_exec_ctx* exec_ctx, char* creds_path, grpc_call_credentials** creds) { + char* creds_path, grpc_call_credentials** creds) { grpc_json* json = nullptr; grpc_auth_json_key key; grpc_auth_refresh_token token; @@ -187,7 +184,7 @@ static grpc_error* create_default_creds_from_path( if (grpc_auth_json_key_is_valid(&key)) { result = grpc_service_account_jwt_access_credentials_create_from_auth_json_key( - exec_ctx, key, grpc_max_auth_token_lifetime()); + key, grpc_max_auth_token_lifetime()); if (result == nullptr) { error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "grpc_service_account_jwt_access_credentials_create_from_auth_json_" @@ -212,7 +209,7 @@ static grpc_error* create_default_creds_from_path( end: GPR_ASSERT((result == nullptr) + (error == GRPC_ERROR_NONE) == 1); if (creds_path != nullptr) gpr_free(creds_path); - grpc_slice_unref_internal(exec_ctx, creds_data); + grpc_slice_unref_internal(creds_data); if (json != nullptr) grpc_json_destroy(json); *creds = result; return error; @@ -224,7 +221,7 @@ grpc_channel_credentials* grpc_google_default_credentials_create(void) { grpc_error* error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Failed to create Google credentials"); grpc_error* err; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE("grpc_google_default_credentials_create(void)", 0, ()); @@ -239,22 +236,20 @@ grpc_channel_credentials* grpc_google_default_credentials_create(void) { /* First, try the environment variable. */ err = create_default_creds_from_path( - &exec_ctx, gpr_getenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR), &call_creds); + gpr_getenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR), &call_creds); if (err == GRPC_ERROR_NONE) goto end; error = grpc_error_add_child(error, err); /* Then the well-known file. */ err = create_default_creds_from_path( - &exec_ctx, grpc_get_well_known_google_credentials_file_path(), - &call_creds); + grpc_get_well_known_google_credentials_file_path(), &call_creds); if (err == GRPC_ERROR_NONE) goto end; error = grpc_error_add_child(error, err); /* At last try to see if we're on compute engine (do the detection only once since it requires a network test). */ if (!compute_engine_detection_done) { - int need_compute_engine_creds = - is_stack_running_on_compute_engine(&exec_ctx); + int need_compute_engine_creds = is_stack_running_on_compute_engine(); compute_engine_detection_done = 1; if (need_compute_engine_creds) { call_creds = grpc_google_compute_engine_credentials_create(nullptr); @@ -278,8 +273,8 @@ end: grpc_composite_channel_credentials_create(ssl_creds, call_creds, nullptr)); GPR_ASSERT(default_credentials != nullptr); - grpc_channel_credentials_unref(&exec_ctx, ssl_creds); - grpc_call_credentials_unref(&exec_ctx, call_creds); + grpc_channel_credentials_unref(ssl_creds); + grpc_call_credentials_unref(call_creds); result = default_credentials; } else { gpr_log(GPR_ERROR, "Could not create google default credentials."); @@ -291,21 +286,20 @@ end: } else { GRPC_ERROR_UNREF(error); } - grpc_exec_ctx_finish(&exec_ctx); + return result; } void grpc_flush_cached_google_default_credentials(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_once_init(&g_once, init_default_credentials); gpr_mu_lock(&g_state_mu); if (default_credentials != nullptr) { - grpc_channel_credentials_unref(&exec_ctx, default_credentials); + grpc_channel_credentials_unref(default_credentials); default_credentials = nullptr; } compute_engine_detection_done = 0; gpr_mu_unlock(&g_state_mu); - grpc_exec_ctx_finish(&exec_ctx); } /* -- Well known credentials path. -- */ diff --git a/src/core/lib/security/credentials/iam/iam_credentials.cc b/src/core/lib/security/credentials/iam/iam_credentials.cc index 1741bf3068c..75acb2a58e6 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.cc +++ b/src/core/lib/security/credentials/iam/iam_credentials.cc @@ -27,14 +27,12 @@ #include #include -static void iam_destruct(grpc_exec_ctx* exec_ctx, - grpc_call_credentials* creds) { +static void iam_destruct(grpc_call_credentials* creds) { grpc_google_iam_credentials* c = (grpc_google_iam_credentials*)creds; - grpc_credentials_mdelem_array_destroy(exec_ctx, &c->md_array); + grpc_credentials_mdelem_array_destroy(&c->md_array); } -static bool iam_get_request_metadata(grpc_exec_ctx* exec_ctx, - grpc_call_credentials* creds, +static bool iam_get_request_metadata(grpc_call_credentials* creds, grpc_polling_entity* pollent, grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, @@ -46,8 +44,8 @@ static bool iam_get_request_metadata(grpc_exec_ctx* exec_ctx, } static void iam_cancel_get_request_metadata( - grpc_exec_ctx* exec_ctx, grpc_call_credentials* c, - grpc_credentials_mdelem_array* md_array, grpc_error* error) { + grpc_call_credentials* c, grpc_credentials_mdelem_array* md_array, + grpc_error* error) { GRPC_ERROR_UNREF(error); } @@ -56,7 +54,7 @@ static grpc_call_credentials_vtable iam_vtable = { grpc_call_credentials* grpc_google_iam_credentials_create( const char* token, const char* authority_selector, void* reserved) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE( "grpc_iam_credentials_create(token=%s, authority_selector=%s, " "reserved=%p)", @@ -70,17 +68,15 @@ grpc_call_credentials* grpc_google_iam_credentials_create( c->base.vtable = &iam_vtable; gpr_ref_init(&c->base.refcount, 1); grpc_mdelem md = grpc_mdelem_from_slices( - &exec_ctx, grpc_slice_from_static_string(GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY), grpc_slice_from_copied_string(token)); grpc_credentials_mdelem_array_add(&c->md_array, md); - GRPC_MDELEM_UNREF(&exec_ctx, md); + GRPC_MDELEM_UNREF(md); md = grpc_mdelem_from_slices( - &exec_ctx, grpc_slice_from_static_string(GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY), grpc_slice_from_copied_string(authority_selector)); grpc_credentials_mdelem_array_add(&c->md_array, md); - GRPC_MDELEM_UNREF(&exec_ctx, md); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(md); + return &c->base; } diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.cc b/src/core/lib/security/credentials/jwt/jwt_credentials.cc index 77163c0cc17..2404e860e42 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.cc +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.cc @@ -30,9 +30,8 @@ #include #include -static void jwt_reset_cache(grpc_exec_ctx* exec_ctx, - grpc_service_account_jwt_access_credentials* c) { - GRPC_MDELEM_UNREF(exec_ctx, c->cached.jwt_md); +static void jwt_reset_cache(grpc_service_account_jwt_access_credentials* c) { + GRPC_MDELEM_UNREF(c->cached.jwt_md); c->cached.jwt_md = GRPC_MDNULL; if (c->cached.service_url != nullptr) { gpr_free(c->cached.service_url); @@ -41,17 +40,15 @@ static void jwt_reset_cache(grpc_exec_ctx* exec_ctx, c->cached.jwt_expiration = gpr_inf_past(GPR_CLOCK_REALTIME); } -static void jwt_destruct(grpc_exec_ctx* exec_ctx, - grpc_call_credentials* creds) { +static void jwt_destruct(grpc_call_credentials* creds) { grpc_service_account_jwt_access_credentials* c = (grpc_service_account_jwt_access_credentials*)creds; grpc_auth_json_key_destruct(&c->key); - jwt_reset_cache(exec_ctx, c); + jwt_reset_cache(c); gpr_mu_destroy(&c->cache_mu); } -static bool jwt_get_request_metadata(grpc_exec_ctx* exec_ctx, - grpc_call_credentials* creds, +static bool jwt_get_request_metadata(grpc_call_credentials* creds, grpc_polling_entity* pollent, grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, @@ -81,7 +78,7 @@ static bool jwt_get_request_metadata(grpc_exec_ctx* exec_ctx, char* jwt = nullptr; /* Generate a new jwt. */ gpr_mu_lock(&c->cache_mu); - jwt_reset_cache(exec_ctx, c); + jwt_reset_cache(c); jwt = grpc_jwt_encode_and_sign(&c->key, context.service_url, c->jwt_lifetime, nullptr); if (jwt != nullptr) { @@ -92,7 +89,6 @@ static bool jwt_get_request_metadata(grpc_exec_ctx* exec_ctx, gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), c->jwt_lifetime); c->cached.service_url = gpr_strdup(context.service_url); c->cached.jwt_md = grpc_mdelem_from_slices( - exec_ctx, grpc_slice_from_static_string(GRPC_AUTHORIZATION_METADATA_KEY), grpc_slice_from_copied_string(md_value)); gpr_free(md_value); @@ -103,7 +99,7 @@ static bool jwt_get_request_metadata(grpc_exec_ctx* exec_ctx, if (!GRPC_MDISNULL(jwt_md)) { grpc_credentials_mdelem_array_add(md_array, jwt_md); - GRPC_MDELEM_UNREF(exec_ctx, jwt_md); + GRPC_MDELEM_UNREF(jwt_md); } else { *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Could not generate JWT."); } @@ -111,8 +107,8 @@ static bool jwt_get_request_metadata(grpc_exec_ctx* exec_ctx, } static void jwt_cancel_get_request_metadata( - grpc_exec_ctx* exec_ctx, grpc_call_credentials* c, - grpc_credentials_mdelem_array* md_array, grpc_error* error) { + grpc_call_credentials* c, grpc_credentials_mdelem_array* md_array, + grpc_error* error) { GRPC_ERROR_UNREF(error); } @@ -121,8 +117,7 @@ static grpc_call_credentials_vtable jwt_vtable = { grpc_call_credentials* grpc_service_account_jwt_access_credentials_create_from_auth_json_key( - grpc_exec_ctx* exec_ctx, grpc_auth_json_key key, - gpr_timespec token_lifetime) { + grpc_auth_json_key key, gpr_timespec token_lifetime) { grpc_service_account_jwt_access_credentials* c; if (!grpc_auth_json_key_is_valid(&key)) { gpr_log(GPR_ERROR, "Invalid input for jwt credentials creation"); @@ -143,7 +138,7 @@ grpc_service_account_jwt_access_credentials_create_from_auth_json_key( } c->jwt_lifetime = token_lifetime; gpr_mu_init(&c->cache_mu); - jwt_reset_cache(exec_ctx, c); + jwt_reset_cache(c); return &c->base; } @@ -186,11 +181,10 @@ grpc_call_credentials* grpc_service_account_jwt_access_credentials_create( gpr_free(clean_json); } GPR_ASSERT(reserved == nullptr); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_call_credentials* creds = grpc_service_account_jwt_access_credentials_create_from_auth_json_key( - &exec_ctx, grpc_auth_json_key_create_from_string(json_key), - token_lifetime); - grpc_exec_ctx_finish(&exec_ctx); + grpc_auth_json_key_create_from_string(json_key), token_lifetime); + return creds; } diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.h b/src/core/lib/security/credentials/jwt/jwt_credentials.h index 85f068aac84..f58a8b67bad 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.h +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.h @@ -42,7 +42,6 @@ typedef struct { // Takes ownership of the key. grpc_call_credentials* grpc_service_account_jwt_access_credentials_create_from_auth_json_key( - grpc_exec_ctx* exec_ctx, grpc_auth_json_key key, - gpr_timespec token_lifetime); + grpc_auth_json_key key, gpr_timespec token_lifetime); #endif /* GRPC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_CREDENTIALS_H */ diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.cc b/src/core/lib/security/credentials/jwt/jwt_verifier.cc index 3709b83c4e8..39339f07d73 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.cc +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.cc @@ -74,12 +74,11 @@ static const EVP_MD* evp_md_from_alg(const char* alg) { } } -static grpc_json* parse_json_part_from_jwt(grpc_exec_ctx* exec_ctx, - const char* str, size_t len, +static grpc_json* parse_json_part_from_jwt(const char* str, size_t len, grpc_slice* buffer) { grpc_json* json; - *buffer = grpc_base64_decode_with_len(exec_ctx, str, len, 1); + *buffer = grpc_base64_decode_with_len(str, len, 1); if (GRPC_SLICE_IS_EMPTY(*buffer)) { gpr_log(GPR_ERROR, "Invalid base64."); return nullptr; @@ -87,7 +86,7 @@ static grpc_json* parse_json_part_from_jwt(grpc_exec_ctx* exec_ctx, json = grpc_json_parse_string_with_len((char*)GRPC_SLICE_START_PTR(*buffer), GRPC_SLICE_LENGTH(*buffer)); if (json == nullptr) { - grpc_slice_unref_internal(exec_ctx, *buffer); + grpc_slice_unref_internal(*buffer); gpr_log(GPR_ERROR, "JSON parsing error."); } return json; @@ -123,14 +122,13 @@ typedef struct { grpc_slice buffer; } jose_header; -static void jose_header_destroy(grpc_exec_ctx* exec_ctx, jose_header* h) { - grpc_slice_unref_internal(exec_ctx, h->buffer); +static void jose_header_destroy(jose_header* h) { + grpc_slice_unref_internal(h->buffer); gpr_free(h); } /* Takes ownership of json and buffer. */ -static jose_header* jose_header_from_json(grpc_exec_ctx* exec_ctx, - grpc_json* json, grpc_slice buffer) { +static jose_header* jose_header_from_json(grpc_json* json, grpc_slice buffer) { grpc_json* cur; jose_header* h = (jose_header*)gpr_zalloc(sizeof(jose_header)); h->buffer = buffer; @@ -164,7 +162,7 @@ static jose_header* jose_header_from_json(grpc_exec_ctx* exec_ctx, error: grpc_json_destroy(json); - jose_header_destroy(exec_ctx, h); + jose_header_destroy(h); return nullptr; } @@ -184,9 +182,9 @@ struct grpc_jwt_claims { grpc_slice buffer; }; -void grpc_jwt_claims_destroy(grpc_exec_ctx* exec_ctx, grpc_jwt_claims* claims) { +void grpc_jwt_claims_destroy(grpc_jwt_claims* claims) { grpc_json_destroy(claims->json); - grpc_slice_unref_internal(exec_ctx, claims->buffer); + grpc_slice_unref_internal(claims->buffer); gpr_free(claims); } @@ -231,8 +229,7 @@ gpr_timespec grpc_jwt_claims_not_before(const grpc_jwt_claims* claims) { } /* Takes ownership of json and buffer even in case of failure. */ -grpc_jwt_claims* grpc_jwt_claims_from_json(grpc_exec_ctx* exec_ctx, - grpc_json* json, grpc_slice buffer) { +grpc_jwt_claims* grpc_jwt_claims_from_json(grpc_json* json, grpc_slice buffer) { grpc_json* cur; grpc_jwt_claims* claims = (grpc_jwt_claims*)gpr_malloc(sizeof(grpc_jwt_claims)); @@ -274,7 +271,7 @@ grpc_jwt_claims* grpc_jwt_claims_from_json(grpc_exec_ctx* exec_ctx, return claims; error: - grpc_jwt_claims_destroy(exec_ctx, claims); + grpc_jwt_claims_destroy(claims); return nullptr; } @@ -350,7 +347,7 @@ static verifier_cb_ctx* verifier_cb_ctx_create( grpc_jwt_claims* claims, const char* audience, grpc_slice signature, const char* signed_jwt, size_t signed_jwt_len, void* user_data, grpc_jwt_verification_done_cb cb) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; verifier_cb_ctx* ctx = (verifier_cb_ctx*)gpr_zalloc(sizeof(verifier_cb_ctx)); ctx->verifier = verifier; ctx->pollent = grpc_polling_entity_create_from_pollset(pollset); @@ -361,16 +358,16 @@ static verifier_cb_ctx* verifier_cb_ctx_create( ctx->signed_data = grpc_slice_from_copied_buffer(signed_jwt, signed_jwt_len); ctx->user_data = user_data; ctx->user_cb = cb; - grpc_exec_ctx_finish(&exec_ctx); + return ctx; } -void verifier_cb_ctx_destroy(grpc_exec_ctx* exec_ctx, verifier_cb_ctx* ctx) { +void verifier_cb_ctx_destroy(verifier_cb_ctx* ctx) { if (ctx->audience != nullptr) gpr_free(ctx->audience); - if (ctx->claims != nullptr) grpc_jwt_claims_destroy(exec_ctx, ctx->claims); - grpc_slice_unref_internal(exec_ctx, ctx->signature); - grpc_slice_unref_internal(exec_ctx, ctx->signed_data); - jose_header_destroy(exec_ctx, ctx->header); + if (ctx->claims != nullptr) grpc_jwt_claims_destroy(ctx->claims); + grpc_slice_unref_internal(ctx->signature); + grpc_slice_unref_internal(ctx->signed_data); + jose_header_destroy(ctx->header); for (size_t i = 0; i < HTTP_RESPONSE_COUNT; i++) { grpc_http_response_destroy(&ctx->responses[i]); } @@ -450,19 +447,19 @@ end: return result; } -static BIGNUM* bignum_from_base64(grpc_exec_ctx* exec_ctx, const char* b64) { +static BIGNUM* bignum_from_base64(const char* b64) { BIGNUM* result = nullptr; grpc_slice bin; if (b64 == nullptr) return nullptr; - bin = grpc_base64_decode(exec_ctx, b64, 1); + bin = grpc_base64_decode(b64, 1); if (GRPC_SLICE_IS_EMPTY(bin)) { gpr_log(GPR_ERROR, "Invalid base64 for big num."); return nullptr; } result = BN_bin2bn(GRPC_SLICE_START_PTR(bin), TSI_SIZE_AS_SIZE(GRPC_SLICE_LENGTH(bin)), nullptr); - grpc_slice_unref_internal(exec_ctx, bin); + grpc_slice_unref_internal(bin); return result; } @@ -495,8 +492,7 @@ static int RSA_set0_key(RSA* r, BIGNUM* n, BIGNUM* e, BIGNUM* d) { } #endif // OPENSSL_VERSION_NUMBER < 0x10100000L -static EVP_PKEY* pkey_from_jwk(grpc_exec_ctx* exec_ctx, const grpc_json* json, - const char* kty) { +static EVP_PKEY* pkey_from_jwk(const grpc_json* json, const char* kty) { const grpc_json* key_prop; RSA* rsa = nullptr; EVP_PKEY* result = nullptr; @@ -515,12 +511,10 @@ static EVP_PKEY* pkey_from_jwk(grpc_exec_ctx* exec_ctx, const grpc_json* json, } for (key_prop = json->child; key_prop != nullptr; key_prop = key_prop->next) { if (strcmp(key_prop->key, "n") == 0) { - tmp_n = - bignum_from_base64(exec_ctx, validate_string_field(key_prop, "n")); + tmp_n = bignum_from_base64(validate_string_field(key_prop, "n")); if (tmp_n == nullptr) goto end; } else if (strcmp(key_prop->key, "e") == 0) { - tmp_e = - bignum_from_base64(exec_ctx, validate_string_field(key_prop, "e")); + tmp_e = bignum_from_base64(validate_string_field(key_prop, "e")); if (tmp_e == nullptr) goto end; } } @@ -545,8 +539,7 @@ end: return result; } -static EVP_PKEY* find_verification_key(grpc_exec_ctx* exec_ctx, - const grpc_json* json, +static EVP_PKEY* find_verification_key(const grpc_json* json, const char* header_alg, const char* header_kid) { const grpc_json* jkey; @@ -591,7 +584,7 @@ static EVP_PKEY* find_verification_key(grpc_exec_ctx* exec_ctx, } if (alg != nullptr && kid != nullptr && kty != nullptr && strcmp(kid, header_kid) == 0 && strcmp(alg, header_alg) == 0) { - return pkey_from_jwk(exec_ctx, jkey, kty); + return pkey_from_jwk(jkey, kty); } } gpr_log(GPR_ERROR, @@ -632,8 +625,7 @@ end: return result; } -static void on_keys_retrieved(grpc_exec_ctx* exec_ctx, void* user_data, - grpc_error* error) { +static void on_keys_retrieved(void* user_data, grpc_error* error) { verifier_cb_ctx* ctx = (verifier_cb_ctx*)user_data; grpc_json* json = json_from_http(&ctx->responses[HTTP_RESPONSE_KEYS]); EVP_PKEY* verification_key = nullptr; @@ -645,7 +637,7 @@ static void on_keys_retrieved(grpc_exec_ctx* exec_ctx, void* user_data, goto end; } verification_key = - find_verification_key(exec_ctx, json, ctx->header->alg, ctx->header->kid); + find_verification_key(json, ctx->header->alg, ctx->header->kid); if (verification_key == nullptr) { gpr_log(GPR_ERROR, "Could not find verification key with kid %s.", ctx->header->kid); @@ -669,12 +661,11 @@ static void on_keys_retrieved(grpc_exec_ctx* exec_ctx, void* user_data, end: if (json != nullptr) grpc_json_destroy(json); EVP_PKEY_free(verification_key); - ctx->user_cb(exec_ctx, ctx->user_data, status, claims); - verifier_cb_ctx_destroy(exec_ctx, ctx); + ctx->user_cb(ctx->user_data, status, claims); + verifier_cb_ctx_destroy(ctx); } -static void on_openid_config_retrieved(grpc_exec_ctx* exec_ctx, void* user_data, - grpc_error* error) { +static void on_openid_config_retrieved(void* user_data, grpc_error* error) { const grpc_json* cur; verifier_cb_ctx* ctx = (verifier_cb_ctx*)user_data; const grpc_http_response* response = &ctx->responses[HTTP_RESPONSE_OPENID]; @@ -711,20 +702,19 @@ static void on_openid_config_retrieved(grpc_exec_ctx* exec_ctx, void* user_data, extreme memory pressure. */ resource_quota = grpc_resource_quota_create("jwt_verifier"); grpc_httpcli_get( - exec_ctx, &ctx->verifier->http_ctx, &ctx->pollent, resource_quota, &req, - grpc_exec_ctx_now(exec_ctx) + grpc_jwt_verifier_max_delay, + &ctx->verifier->http_ctx, &ctx->pollent, resource_quota, &req, + grpc_core::ExecCtx::Get()->Now() + grpc_jwt_verifier_max_delay, GRPC_CLOSURE_CREATE(on_keys_retrieved, ctx, grpc_schedule_on_exec_ctx), &ctx->responses[HTTP_RESPONSE_KEYS]); - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); grpc_json_destroy(json); gpr_free(req.host); return; error: if (json != nullptr) grpc_json_destroy(json); - ctx->user_cb(exec_ctx, ctx->user_data, GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR, - nullptr); - verifier_cb_ctx_destroy(exec_ctx, ctx); + ctx->user_cb(ctx->user_data, GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR, nullptr); + verifier_cb_ctx_destroy(ctx); } static email_key_mapping* verifier_get_mapping(grpc_jwt_verifier* v, @@ -772,8 +762,7 @@ const char* grpc_jwt_issuer_email_domain(const char* issuer) { } /* Takes ownership of ctx. */ -static void retrieve_key_and_verify(grpc_exec_ctx* exec_ctx, - verifier_cb_ctx* ctx) { +static void retrieve_key_and_verify(verifier_cb_ctx* ctx) { const char* email_domain; grpc_closure* http_cb; char* path_prefix = nullptr; @@ -840,23 +829,21 @@ static void retrieve_key_and_verify(grpc_exec_ctx* exec_ctx, channel. This would allow us to cancel an authentication query when under extreme memory pressure. */ resource_quota = grpc_resource_quota_create("jwt_verifier"); - grpc_httpcli_get(exec_ctx, &ctx->verifier->http_ctx, &ctx->pollent, - resource_quota, &req, - grpc_exec_ctx_now(exec_ctx) + grpc_jwt_verifier_max_delay, - http_cb, &ctx->responses[rsp_idx]); - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_httpcli_get( + &ctx->verifier->http_ctx, &ctx->pollent, resource_quota, &req, + grpc_core::ExecCtx::Get()->Now() + grpc_jwt_verifier_max_delay, http_cb, + &ctx->responses[rsp_idx]); + grpc_resource_quota_unref_internal(resource_quota); gpr_free(req.host); gpr_free(req.http.path); return; error: - ctx->user_cb(exec_ctx, ctx->user_data, GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR, - nullptr); - verifier_cb_ctx_destroy(exec_ctx, ctx); + ctx->user_cb(ctx->user_data, GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR, nullptr); + verifier_cb_ctx_destroy(ctx); } -void grpc_jwt_verifier_verify(grpc_exec_ctx* exec_ctx, - grpc_jwt_verifier* verifier, +void grpc_jwt_verifier_verify(grpc_jwt_verifier* verifier, grpc_pollset* pollset, const char* jwt, const char* audience, grpc_jwt_verification_done_cb cb, @@ -875,35 +862,32 @@ void grpc_jwt_verifier_verify(grpc_exec_ctx* exec_ctx, cb != nullptr); dot = strchr(cur, '.'); if (dot == nullptr) goto error; - json = parse_json_part_from_jwt(exec_ctx, cur, (size_t)(dot - cur), - &header_buffer); + json = parse_json_part_from_jwt(cur, (size_t)(dot - cur), &header_buffer); if (json == nullptr) goto error; - header = jose_header_from_json(exec_ctx, json, header_buffer); + header = jose_header_from_json(json, header_buffer); if (header == nullptr) goto error; cur = dot + 1; dot = strchr(cur, '.'); if (dot == nullptr) goto error; - json = parse_json_part_from_jwt(exec_ctx, cur, (size_t)(dot - cur), - &claims_buffer); + json = parse_json_part_from_jwt(cur, (size_t)(dot - cur), &claims_buffer); if (json == nullptr) goto error; - claims = grpc_jwt_claims_from_json(exec_ctx, json, claims_buffer); + claims = grpc_jwt_claims_from_json(json, claims_buffer); if (claims == nullptr) goto error; signed_jwt_len = (size_t)(dot - jwt); cur = dot + 1; - signature = grpc_base64_decode(exec_ctx, cur, 1); + signature = grpc_base64_decode(cur, 1); if (GRPC_SLICE_IS_EMPTY(signature)) goto error; retrieve_key_and_verify( - exec_ctx, verifier_cb_ctx_create(verifier, pollset, header, claims, audience, signature, jwt, signed_jwt_len, user_data, cb)); return; error: - if (header != nullptr) jose_header_destroy(exec_ctx, header); - if (claims != nullptr) grpc_jwt_claims_destroy(exec_ctx, claims); - cb(exec_ctx, user_data, GRPC_JWT_VERIFIER_BAD_FORMAT, nullptr); + if (header != nullptr) jose_header_destroy(header); + if (claims != nullptr) grpc_jwt_claims_destroy(claims); + cb(user_data, GRPC_JWT_VERIFIER_BAD_FORMAT, nullptr); } grpc_jwt_verifier* grpc_jwt_verifier_create( @@ -930,10 +914,10 @@ grpc_jwt_verifier* grpc_jwt_verifier_create( return v; } -void grpc_jwt_verifier_destroy(grpc_exec_ctx* exec_ctx, grpc_jwt_verifier* v) { +void grpc_jwt_verifier_destroy(grpc_jwt_verifier* v) { size_t i; if (v == nullptr) return; - grpc_httpcli_context_destroy(exec_ctx, &v->http_ctx); + grpc_httpcli_context_destroy(&v->http_ctx); if (v->mappings != nullptr) { for (i = 0; i < v->num_mappings; i++) { gpr_free(v->mappings[i].email_domain); diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.h b/src/core/lib/security/credentials/jwt/jwt_verifier.h index 2aacd497c7f..b3805e75cda 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.h +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.h @@ -51,7 +51,7 @@ const char* grpc_jwt_verifier_status_to_string(grpc_jwt_verifier_status status); typedef struct grpc_jwt_claims grpc_jwt_claims; -void grpc_jwt_claims_destroy(grpc_exec_ctx* exec_ctx, grpc_jwt_claims* claims); +void grpc_jwt_claims_destroy(grpc_jwt_claims* claims); /* Returns the whole JSON tree of the claims. */ const grpc_json* grpc_jwt_claims_json(const grpc_jwt_claims* claims); @@ -94,21 +94,18 @@ grpc_jwt_verifier* grpc_jwt_verifier_create( size_t num_mappings); /*The verifier must not be destroyed if there are still outstanding callbacks.*/ -void grpc_jwt_verifier_destroy(grpc_exec_ctx* exec_ctx, - grpc_jwt_verifier* verifier); +void grpc_jwt_verifier_destroy(grpc_jwt_verifier* verifier); /* User provided callback that will be called when the verification of the JWT is done (maybe in another thread). It is the responsibility of the callee to call grpc_jwt_claims_destroy on the claims. */ -typedef void (*grpc_jwt_verification_done_cb)(grpc_exec_ctx* exec_ctx, - void* user_data, +typedef void (*grpc_jwt_verification_done_cb)(void* user_data, grpc_jwt_verifier_status status, grpc_jwt_claims* claims); /* Verifies for the JWT for the given expected audience. */ -void grpc_jwt_verifier_verify(grpc_exec_ctx* exec_ctx, - grpc_jwt_verifier* verifier, +void grpc_jwt_verifier_verify(grpc_jwt_verifier* verifier, grpc_pollset* pollset, const char* jwt, const char* audience, grpc_jwt_verification_done_cb cb, @@ -116,8 +113,7 @@ void grpc_jwt_verifier_verify(grpc_exec_ctx* exec_ctx, /* --- TESTING ONLY exposed functions. --- */ -grpc_jwt_claims* grpc_jwt_claims_from_json(grpc_exec_ctx* exec_ctx, - grpc_json* json, grpc_slice buffer); +grpc_jwt_claims* grpc_jwt_claims_from_json(grpc_json* json, grpc_slice buffer); grpc_jwt_verifier_status grpc_jwt_claims_check(const grpc_jwt_claims* claims, const char* audience); const char* grpc_jwt_issuer_email_domain(const char* issuer); diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index ccefb4db9cf..e243ea52c62 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -103,21 +103,19 @@ void grpc_auth_refresh_token_destruct(grpc_auth_refresh_token* refresh_token) { // Oauth2 Token Fetcher credentials. // -static void oauth2_token_fetcher_destruct(grpc_exec_ctx* exec_ctx, - grpc_call_credentials* creds) { +static void oauth2_token_fetcher_destruct(grpc_call_credentials* creds) { grpc_oauth2_token_fetcher_credentials* c = (grpc_oauth2_token_fetcher_credentials*)creds; - GRPC_MDELEM_UNREF(exec_ctx, c->access_token_md); + GRPC_MDELEM_UNREF(c->access_token_md); gpr_mu_destroy(&c->mu); - grpc_pollset_set_destroy(exec_ctx, - grpc_polling_entity_pollset_set(&c->pollent)); - grpc_httpcli_context_destroy(exec_ctx, &c->httpcli_context); + grpc_pollset_set_destroy(grpc_polling_entity_pollset_set(&c->pollent)); + grpc_httpcli_context_destroy(&c->httpcli_context); } grpc_credentials_status grpc_oauth2_token_fetcher_credentials_parse_server_response( - grpc_exec_ctx* exec_ctx, const grpc_http_response* response, - grpc_mdelem* token_md, grpc_millis* token_lifetime) { + const grpc_http_response* response, grpc_mdelem* token_md, + grpc_millis* token_lifetime) { char* null_terminated_body = nullptr; char* new_access_token = nullptr; grpc_credentials_status status = GRPC_CREDENTIALS_OK; @@ -184,9 +182,8 @@ grpc_oauth2_token_fetcher_credentials_parse_server_response( gpr_asprintf(&new_access_token, "%s %s", token_type->value, access_token->value); *token_lifetime = strtol(expires_in->value, nullptr, 10) * GPR_MS_PER_SEC; - if (!GRPC_MDISNULL(*token_md)) GRPC_MDELEM_UNREF(exec_ctx, *token_md); + if (!GRPC_MDISNULL(*token_md)) GRPC_MDELEM_UNREF(*token_md); *token_md = grpc_mdelem_from_slices( - exec_ctx, grpc_slice_from_static_string(GRPC_AUTHORIZATION_METADATA_KEY), grpc_slice_from_copied_string(new_access_token)); status = GRPC_CREDENTIALS_OK; @@ -194,7 +191,7 @@ grpc_oauth2_token_fetcher_credentials_parse_server_response( end: if (status != GRPC_CREDENTIALS_OK && !GRPC_MDISNULL(*token_md)) { - GRPC_MDELEM_UNREF(exec_ctx, *token_md); + GRPC_MDELEM_UNREF(*token_md); *token_md = GRPC_MDNULL; } if (null_terminated_body != nullptr) gpr_free(null_terminated_body); @@ -203,8 +200,7 @@ end: return status; } -static void on_oauth2_token_fetcher_http_response(grpc_exec_ctx* exec_ctx, - void* user_data, +static void on_oauth2_token_fetcher_http_response(void* user_data, grpc_error* error) { GRPC_LOG_IF_ERROR("oauth_fetch", GRPC_ERROR_REF(error)); grpc_credentials_metadata_request* r = @@ -215,13 +211,13 @@ static void on_oauth2_token_fetcher_http_response(grpc_exec_ctx* exec_ctx, grpc_millis token_lifetime; grpc_credentials_status status = grpc_oauth2_token_fetcher_credentials_parse_server_response( - exec_ctx, &r->response, &access_token_md, &token_lifetime); + &r->response, &access_token_md, &token_lifetime); // Update cache and grab list of pending requests. gpr_mu_lock(&c->mu); c->token_fetch_pending = false; c->access_token_md = GRPC_MDELEM_REF(access_token_md); c->token_expiration = status == GRPC_CREDENTIALS_OK - ? grpc_exec_ctx_now(exec_ctx) + token_lifetime + ? grpc_core::ExecCtx::Get()->Now() + token_lifetime : 0; grpc_oauth2_pending_get_request_metadata* pending_request = c->pending_requests; @@ -236,24 +232,22 @@ static void on_oauth2_token_fetcher_http_response(grpc_exec_ctx* exec_ctx, error = GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Error occured when fetching oauth2 token.", &error, 1); } - GRPC_CLOSURE_SCHED(exec_ctx, pending_request->on_request_metadata, error); + GRPC_CLOSURE_SCHED(pending_request->on_request_metadata, error); grpc_polling_entity_del_from_pollset_set( - exec_ctx, pending_request->pollent, - grpc_polling_entity_pollset_set(&c->pollent)); + pending_request->pollent, grpc_polling_entity_pollset_set(&c->pollent)); grpc_oauth2_pending_get_request_metadata* prev = pending_request; pending_request = pending_request->next; gpr_free(prev); } - GRPC_MDELEM_UNREF(exec_ctx, access_token_md); - grpc_call_credentials_unref(exec_ctx, r->creds); - grpc_credentials_metadata_request_destroy(exec_ctx, r); + GRPC_MDELEM_UNREF(access_token_md); + grpc_call_credentials_unref(r->creds); + grpc_credentials_metadata_request_destroy(r); } static bool oauth2_token_fetcher_get_request_metadata( - grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, - grpc_polling_entity* pollent, grpc_auth_metadata_context context, - grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, - grpc_error** error) { + grpc_call_credentials* creds, grpc_polling_entity* pollent, + grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, + grpc_closure* on_request_metadata, grpc_error** error) { grpc_oauth2_token_fetcher_credentials* c = (grpc_oauth2_token_fetcher_credentials*)creds; // Check if we can use the cached token. @@ -262,13 +256,14 @@ static bool oauth2_token_fetcher_get_request_metadata( grpc_mdelem cached_access_token_md = GRPC_MDNULL; gpr_mu_lock(&c->mu); if (!GRPC_MDISNULL(c->access_token_md) && - (c->token_expiration - grpc_exec_ctx_now(exec_ctx) > refresh_threshold)) { + (c->token_expiration - grpc_core::ExecCtx::Get()->Now() > + refresh_threshold)) { cached_access_token_md = GRPC_MDELEM_REF(c->access_token_md); } if (!GRPC_MDISNULL(cached_access_token_md)) { gpr_mu_unlock(&c->mu); grpc_credentials_mdelem_array_add(md_array, cached_access_token_md); - GRPC_MDELEM_UNREF(exec_ctx, cached_access_token_md); + GRPC_MDELEM_UNREF(cached_access_token_md); return true; } // Couldn't get the token from the cache. @@ -280,7 +275,7 @@ static bool oauth2_token_fetcher_get_request_metadata( pending_request->on_request_metadata = on_request_metadata; pending_request->pollent = pollent; grpc_polling_entity_add_to_pollset_set( - exec_ctx, pollent, grpc_polling_entity_pollset_set(&c->pollent)); + pollent, grpc_polling_entity_pollset_set(&c->pollent)); pending_request->next = c->pending_requests; c->pending_requests = pending_request; bool start_fetch = false; @@ -291,17 +286,17 @@ static bool oauth2_token_fetcher_get_request_metadata( gpr_mu_unlock(&c->mu); if (start_fetch) { grpc_call_credentials_ref(creds); - c->fetch_func(exec_ctx, grpc_credentials_metadata_request_create(creds), + c->fetch_func(grpc_credentials_metadata_request_create(creds), &c->httpcli_context, &c->pollent, on_oauth2_token_fetcher_http_response, - grpc_exec_ctx_now(exec_ctx) + refresh_threshold); + grpc_core::ExecCtx::Get()->Now() + refresh_threshold); } return false; } static void oauth2_token_fetcher_cancel_get_request_metadata( - grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, - grpc_credentials_mdelem_array* md_array, grpc_error* error) { + grpc_call_credentials* creds, grpc_credentials_mdelem_array* md_array, + grpc_error* error) { grpc_oauth2_token_fetcher_credentials* c = (grpc_oauth2_token_fetcher_credentials*)creds; gpr_mu_lock(&c->mu); @@ -317,7 +312,7 @@ static void oauth2_token_fetcher_cancel_get_request_metadata( c->pending_requests = pending_request->next; } // Invoke the callback immediately with an error. - GRPC_CLOSURE_SCHED(exec_ctx, pending_request->on_request_metadata, + GRPC_CLOSURE_SCHED(pending_request->on_request_metadata, GRPC_ERROR_REF(error)); gpr_free(pending_request); break; @@ -351,7 +346,7 @@ static grpc_call_credentials_vtable compute_engine_vtable = { oauth2_token_fetcher_cancel_get_request_metadata}; static void compute_engine_fetch_oauth2( - grpc_exec_ctx* exec_ctx, grpc_credentials_metadata_request* metadata_req, + grpc_credentials_metadata_request* metadata_req, grpc_httpcli_context* httpcli_context, grpc_polling_entity* pollent, grpc_iomgr_cb_func response_cb, grpc_millis deadline) { grpc_http_header header = {(char*)"Metadata-Flavor", (char*)"Google"}; @@ -367,10 +362,10 @@ static void compute_engine_fetch_oauth2( grpc_resource_quota* resource_quota = grpc_resource_quota_create("oauth2_credentials"); grpc_httpcli_get( - exec_ctx, httpcli_context, pollent, resource_quota, &request, deadline, + httpcli_context, pollent, resource_quota, &request, deadline, GRPC_CLOSURE_CREATE(response_cb, metadata_req, grpc_schedule_on_exec_ctx), &metadata_req->response); - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); } grpc_call_credentials* grpc_google_compute_engine_credentials_create( @@ -390,12 +385,11 @@ grpc_call_credentials* grpc_google_compute_engine_credentials_create( // Google Refresh Token credentials. // -static void refresh_token_destruct(grpc_exec_ctx* exec_ctx, - grpc_call_credentials* creds) { +static void refresh_token_destruct(grpc_call_credentials* creds) { grpc_google_refresh_token_credentials* c = (grpc_google_refresh_token_credentials*)creds; grpc_auth_refresh_token_destruct(&c->refresh_token); - oauth2_token_fetcher_destruct(exec_ctx, &c->base.base); + oauth2_token_fetcher_destruct(&c->base.base); } static grpc_call_credentials_vtable refresh_token_vtable = { @@ -403,7 +397,7 @@ static grpc_call_credentials_vtable refresh_token_vtable = { oauth2_token_fetcher_cancel_get_request_metadata}; static void refresh_token_fetch_oauth2( - grpc_exec_ctx* exec_ctx, grpc_credentials_metadata_request* metadata_req, + grpc_credentials_metadata_request* metadata_req, grpc_httpcli_context* httpcli_context, grpc_polling_entity* pollent, grpc_iomgr_cb_func response_cb, grpc_millis deadline) { grpc_google_refresh_token_credentials* c = @@ -427,11 +421,11 @@ static void refresh_token_fetch_oauth2( grpc_resource_quota* resource_quota = grpc_resource_quota_create("oauth2_credentials_refresh"); grpc_httpcli_post( - exec_ctx, httpcli_context, pollent, resource_quota, &request, body, - strlen(body), deadline, + httpcli_context, pollent, resource_quota, &request, body, strlen(body), + deadline, GRPC_CLOSURE_CREATE(response_cb, metadata_req, grpc_schedule_on_exec_ctx), &metadata_req->response); - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); gpr_free(body); } @@ -483,25 +477,23 @@ grpc_call_credentials* grpc_google_refresh_token_credentials_create( // Oauth2 Access Token credentials. // -static void access_token_destruct(grpc_exec_ctx* exec_ctx, - grpc_call_credentials* creds) { +static void access_token_destruct(grpc_call_credentials* creds) { grpc_access_token_credentials* c = (grpc_access_token_credentials*)creds; - GRPC_MDELEM_UNREF(exec_ctx, c->access_token_md); + GRPC_MDELEM_UNREF(c->access_token_md); } static bool access_token_get_request_metadata( - grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, - grpc_polling_entity* pollent, grpc_auth_metadata_context context, - grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, - grpc_error** error) { + grpc_call_credentials* creds, grpc_polling_entity* pollent, + grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, + grpc_closure* on_request_metadata, grpc_error** error) { grpc_access_token_credentials* c = (grpc_access_token_credentials*)creds; grpc_credentials_mdelem_array_add(md_array, c->access_token_md); return true; } static void access_token_cancel_get_request_metadata( - grpc_exec_ctx* exec_ctx, grpc_call_credentials* c, - grpc_credentials_mdelem_array* md_array, grpc_error* error) { + grpc_call_credentials* c, grpc_credentials_mdelem_array* md_array, + grpc_error* error) { GRPC_ERROR_UNREF(error); } @@ -523,11 +515,11 @@ grpc_call_credentials* grpc_access_token_credentials_create( gpr_ref_init(&c->base.refcount, 1); char* token_md_value; gpr_asprintf(&token_md_value, "Bearer %s", access_token); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; c->access_token_md = grpc_mdelem_from_slices( - &exec_ctx, grpc_slice_from_static_string(GRPC_AUTHORIZATION_METADATA_KEY), + grpc_slice_from_static_string(GRPC_AUTHORIZATION_METADATA_KEY), grpc_slice_from_copied_string(token_md_value)); - grpc_exec_ctx_finish(&exec_ctx); + gpr_free(token_md_value); return &c->base; } diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h index 627783d648f..e5b8df8eb94 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h @@ -52,8 +52,7 @@ void grpc_auth_refresh_token_destruct(grpc_auth_refresh_token* refresh_token); // This object is a base for credentials that need to acquire an oauth2 token // from an http service. -typedef void (*grpc_fetch_oauth2_func)(grpc_exec_ctx* exec_ctx, - grpc_credentials_metadata_request* req, +typedef void (*grpc_fetch_oauth2_func)(grpc_credentials_metadata_request* req, grpc_httpcli_context* http_context, grpc_polling_entity* pollent, grpc_iomgr_cb_func cb, @@ -99,7 +98,7 @@ grpc_refresh_token_credentials_create_from_auth_refresh_token( // Exposed for testing only. grpc_credentials_status grpc_oauth2_token_fetcher_credentials_parse_server_response( - grpc_exec_ctx* exec_ctx, const struct grpc_http_response* response, - grpc_mdelem* token_md, grpc_millis* token_lifetime); + const struct grpc_http_response* response, grpc_mdelem* token_md, + grpc_millis* token_lifetime); #endif /* GRPC_CORE_LIB_SECURITY_CREDENTIALS_OAUTH2_OAUTH2_CREDENTIALS_H */ diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.cc b/src/core/lib/security/credentials/plugin/plugin_credentials.cc index 1f1efd078d6..203ba58c671 100644 --- a/src/core/lib/security/credentials/plugin/plugin_credentials.cc +++ b/src/core/lib/security/credentials/plugin/plugin_credentials.cc @@ -33,8 +33,7 @@ grpc_core::TraceFlag grpc_plugin_credentials_trace(false, "plugin_credentials"); -static void plugin_destruct(grpc_exec_ctx* exec_ctx, - grpc_call_credentials* creds) { +static void plugin_destruct(grpc_call_credentials* creds) { grpc_plugin_credentials* c = (grpc_plugin_credentials*)creds; gpr_mu_destroy(&c->mu); if (c->plugin.state != nullptr && c->plugin.destroy != nullptr) { @@ -61,18 +60,17 @@ static void pending_request_remove_locked( // When this returns, r->cancelled indicates whether the request was // cancelled before completion. static void pending_request_complete( - grpc_exec_ctx* exec_ctx, grpc_plugin_credentials_pending_request* r) { + grpc_plugin_credentials_pending_request* r) { gpr_mu_lock(&r->creds->mu); if (!r->cancelled) pending_request_remove_locked(r->creds, r); gpr_mu_unlock(&r->creds->mu); // Ref to credentials not needed anymore. - grpc_call_credentials_unref(exec_ctx, &r->creds->base); + grpc_call_credentials_unref(&r->creds->base); } static grpc_error* process_plugin_result( - grpc_exec_ctx* exec_ctx, grpc_plugin_credentials_pending_request* r, - const grpc_metadata* md, size_t num_md, grpc_status_code status, - const char* error_details) { + grpc_plugin_credentials_pending_request* r, const grpc_metadata* md, + size_t num_md, grpc_status_code status, const char* error_details) { grpc_error* error = GRPC_ERROR_NONE; if (status != GRPC_STATUS_OK) { char* msg; @@ -100,11 +98,11 @@ static grpc_error* process_plugin_result( error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Illegal metadata"); } else { for (size_t i = 0; i < num_md; ++i) { - grpc_mdelem mdelem = grpc_mdelem_from_slices( - exec_ctx, grpc_slice_ref_internal(md[i].key), - grpc_slice_ref_internal(md[i].value)); + grpc_mdelem mdelem = + grpc_mdelem_from_slices(grpc_slice_ref_internal(md[i].key), + grpc_slice_ref_internal(md[i].value)); grpc_credentials_mdelem_array_add(r->md_array, mdelem); - GRPC_MDELEM_UNREF(exec_ctx, mdelem); + GRPC_MDELEM_UNREF(mdelem); } } } @@ -117,9 +115,8 @@ static void plugin_md_request_metadata_ready(void* request, grpc_status_code status, const char* error_details) { /* called from application code */ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INITIALIZER( - GRPC_EXEC_CTX_FLAG_IS_FINISHED | GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP, - nullptr, nullptr); + grpc_core::ExecCtx exec_ctx(GRPC_EXEC_CTX_FLAG_IS_FINISHED | + GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP); grpc_plugin_credentials_pending_request* r = (grpc_plugin_credentials_pending_request*)request; if (grpc_plugin_credentials_trace.enabled()) { @@ -129,12 +126,12 @@ static void plugin_md_request_metadata_ready(void* request, r->creds, r); } // Remove request from pending list if not previously cancelled. - pending_request_complete(&exec_ctx, r); + pending_request_complete(r); // If it has not been cancelled, process it. if (!r->cancelled) { grpc_error* error = - process_plugin_result(&exec_ctx, r, md, num_md, status, error_details); - GRPC_CLOSURE_SCHED(&exec_ctx, r->on_request_metadata, error); + process_plugin_result(r, md, num_md, status, error_details); + GRPC_CLOSURE_SCHED(r->on_request_metadata, error); } else if (grpc_plugin_credentials_trace.enabled()) { gpr_log(GPR_INFO, "plugin_credentials[%p]: request %p: plugin was previously " @@ -142,11 +139,9 @@ static void plugin_md_request_metadata_ready(void* request, r->creds, r); } gpr_free(r); - grpc_exec_ctx_finish(&exec_ctx); } -static bool plugin_get_request_metadata(grpc_exec_ctx* exec_ctx, - grpc_call_credentials* creds, +static bool plugin_get_request_metadata(grpc_call_credentials* creds, grpc_polling_entity* pollent, grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, @@ -194,7 +189,7 @@ static bool plugin_get_request_metadata(grpc_exec_ctx* exec_ctx, } // Returned synchronously. // Remove request from pending list if not previously cancelled. - pending_request_complete(exec_ctx, pending_request); + pending_request_complete(pending_request); // If the request was cancelled, the error will have been returned // asynchronously by plugin_cancel_get_request_metadata(), so return // false. Otherwise, process the result. @@ -213,13 +208,13 @@ static bool plugin_get_request_metadata(grpc_exec_ctx* exec_ctx, "synchronously", c, pending_request); } - *error = process_plugin_result(exec_ctx, pending_request, creds_md, - num_creds_md, status, error_details); + *error = process_plugin_result(pending_request, creds_md, num_creds_md, + status, error_details); } // Clean up. for (size_t i = 0; i < num_creds_md; ++i) { - grpc_slice_unref_internal(exec_ctx, creds_md[i].key); - grpc_slice_unref_internal(exec_ctx, creds_md[i].value); + grpc_slice_unref_internal(creds_md[i].key); + grpc_slice_unref_internal(creds_md[i].value); } gpr_free((void*)error_details); gpr_free(pending_request); @@ -228,8 +223,8 @@ static bool plugin_get_request_metadata(grpc_exec_ctx* exec_ctx, } static void plugin_cancel_get_request_metadata( - grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, - grpc_credentials_mdelem_array* md_array, grpc_error* error) { + grpc_call_credentials* creds, grpc_credentials_mdelem_array* md_array, + grpc_error* error) { grpc_plugin_credentials* c = (grpc_plugin_credentials*)creds; gpr_mu_lock(&c->mu); for (grpc_plugin_credentials_pending_request* pending_request = @@ -241,7 +236,7 @@ static void plugin_cancel_get_request_metadata( pending_request); } pending_request->cancelled = true; - GRPC_CLOSURE_SCHED(exec_ctx, pending_request->on_request_metadata, + GRPC_CLOSURE_SCHED(pending_request->on_request_metadata, GRPC_ERROR_REF(error)); pending_request_remove_locked(c, pending_request); break; diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.cc b/src/core/lib/security/credentials/ssl/ssl_credentials.cc index 39dd38cf889..d8546441c95 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.cc +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.cc @@ -41,18 +41,16 @@ void grpc_tsi_ssl_pem_key_cert_pairs_destroy(tsi_ssl_pem_key_cert_pair* kp, gpr_free(kp); } -static void ssl_destruct(grpc_exec_ctx* exec_ctx, - grpc_channel_credentials* creds) { +static void ssl_destruct(grpc_channel_credentials* creds) { grpc_ssl_credentials* c = (grpc_ssl_credentials*)creds; gpr_free(c->config.pem_root_certs); grpc_tsi_ssl_pem_key_cert_pairs_destroy(c->config.pem_key_cert_pair, 1); } static grpc_security_status ssl_create_security_connector( - grpc_exec_ctx* exec_ctx, grpc_channel_credentials* creds, - grpc_call_credentials* call_creds, const char* target, - const grpc_channel_args* args, grpc_channel_security_connector** sc, - grpc_channel_args** new_args) { + grpc_channel_credentials* creds, grpc_call_credentials* call_creds, + const char* target, const grpc_channel_args* args, + grpc_channel_security_connector** sc, grpc_channel_args** new_args) { grpc_ssl_credentials* c = (grpc_ssl_credentials*)creds; grpc_security_status status = GRPC_SECURITY_OK; const char* overridden_target_name = nullptr; @@ -65,8 +63,7 @@ static grpc_security_status ssl_create_security_connector( } } status = grpc_ssl_channel_security_connector_create( - exec_ctx, creds, call_creds, &c->config, target, overridden_target_name, - sc); + creds, call_creds, &c->config, target, overridden_target_name, sc); if (status != GRPC_SECURITY_OK) { return status; } @@ -125,8 +122,7 @@ struct grpc_ssl_server_credentials_options { grpc_ssl_server_certificate_config_fetcher* certificate_config_fetcher; }; -static void ssl_server_destruct(grpc_exec_ctx* exec_ctx, - grpc_server_credentials* creds) { +static void ssl_server_destruct(grpc_server_credentials* creds) { grpc_ssl_server_credentials* c = (grpc_ssl_server_credentials*)creds; grpc_tsi_ssl_pem_key_cert_pairs_destroy(c->config.pem_key_cert_pairs, c->config.num_key_cert_pairs); @@ -134,9 +130,8 @@ static void ssl_server_destruct(grpc_exec_ctx* exec_ctx, } static grpc_security_status ssl_server_create_security_connector( - grpc_exec_ctx* exec_ctx, grpc_server_credentials* creds, - grpc_server_security_connector** sc) { - return grpc_ssl_server_security_connector_create(exec_ctx, creds, sc); + grpc_server_credentials* creds, grpc_server_security_connector** sc) { + return grpc_ssl_server_security_connector_create(creds, sc); } static grpc_server_credentials_vtable ssl_server_vtable = { diff --git a/src/core/lib/security/transport/client_auth_filter.cc b/src/core/lib/security/transport/client_auth_filter.cc index 326f4d77732..cd3c2e3f19d 100644 --- a/src/core/lib/security/transport/client_auth_filter.cc +++ b/src/core/lib/security/transport/client_auth_filter.cc @@ -90,8 +90,7 @@ static void add_error(grpc_error** combined, grpc_error* error) { *combined = grpc_error_add_child(*combined, error); } -static void on_credentials_metadata(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* input_error) { +static void on_credentials_metadata(void* arg, grpc_error* input_error) { grpc_transport_stream_op_batch* batch = (grpc_transport_stream_op_batch*)arg; grpc_call_element* elem = (grpc_call_element*)batch->handler_private.extra_arg; @@ -105,16 +104,16 @@ static void on_credentials_metadata(grpc_exec_ctx* exec_ctx, void* arg, batch->payload->send_initial_metadata.send_initial_metadata; for (size_t i = 0; i < calld->md_array.size; ++i) { add_error(&error, grpc_metadata_batch_add_tail( - exec_ctx, mdb, &calld->md_links[i], + mdb, &calld->md_links[i], GRPC_MDELEM_REF(calld->md_array.md[i]))); } } if (error == GRPC_ERROR_NONE) { - grpc_call_next_op(exec_ctx, elem, batch); + grpc_call_next_op(elem, batch); } else { error = grpc_error_set_int(error, GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAUTHENTICATED); - grpc_transport_stream_op_batch_finish_with_failure(exec_ctx, batch, error, + grpc_transport_stream_op_batch_finish_with_failure(batch, error, calld->call_combiner); } } @@ -156,20 +155,17 @@ void grpc_auth_metadata_context_build( gpr_free(host_and_port); } -static void cancel_get_request_metadata(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void cancel_get_request_metadata(void* arg, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; if (error != GRPC_ERROR_NONE) { grpc_call_credentials_cancel_get_request_metadata( - exec_ctx, calld->creds, &calld->md_array, GRPC_ERROR_REF(error)); + calld->creds, &calld->md_array, GRPC_ERROR_REF(error)); } - GRPC_CALL_STACK_UNREF(exec_ctx, calld->owning_call, - "cancel_get_request_metadata"); + GRPC_CALL_STACK_UNREF(calld->owning_call, "cancel_get_request_metadata"); } -static void send_security_metadata(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static void send_security_metadata(grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; @@ -183,7 +179,7 @@ static void send_security_metadata(grpc_exec_ctx* exec_ctx, if (channel_call_creds == nullptr && !call_creds_has_md) { /* Skip sending metadata altogether. */ - grpc_call_next_op(exec_ctx, elem, batch); + grpc_call_next_op(elem, batch); return; } @@ -192,7 +188,7 @@ static void send_security_metadata(grpc_exec_ctx* exec_ctx, ctx->creds, nullptr); if (calld->creds == nullptr) { grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, batch, + batch, grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Incompatible credentials set on channel and call."), @@ -215,30 +211,29 @@ static void send_security_metadata(grpc_exec_ctx* exec_ctx, batch, grpc_schedule_on_exec_ctx); grpc_error* error = GRPC_ERROR_NONE; if (grpc_call_credentials_get_request_metadata( - exec_ctx, calld->creds, calld->pollent, calld->auth_md_context, + calld->creds, calld->pollent, calld->auth_md_context, &calld->md_array, &calld->async_result_closure, &error)) { // Synchronous return; invoke on_credentials_metadata() directly. - on_credentials_metadata(exec_ctx, batch, error); + on_credentials_metadata(batch, error); GRPC_ERROR_UNREF(error); } else { // Async return; register cancellation closure with call combiner. GRPC_CALL_STACK_REF(calld->owning_call, "cancel_get_request_metadata"); grpc_call_combiner_set_notify_on_cancel( - exec_ctx, calld->call_combiner, + calld->call_combiner, GRPC_CLOSURE_INIT(&calld->get_request_metadata_cancel_closure, cancel_get_request_metadata, elem, grpc_schedule_on_exec_ctx)); } } -static void on_host_checked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_host_checked(void* arg, grpc_error* error) { grpc_transport_stream_op_batch* batch = (grpc_transport_stream_op_batch*)arg; grpc_call_element* elem = (grpc_call_element*)batch->handler_private.extra_arg; call_data* calld = (call_data*)elem->call_data; if (error == GRPC_ERROR_NONE) { - send_security_metadata(exec_ctx, elem, batch); + send_security_metadata(elem, batch); } else { char* error_msg; char* host = grpc_slice_to_c_string(calld->host); @@ -246,7 +241,7 @@ static void on_host_checked(grpc_exec_ctx* exec_ctx, void* arg, host); gpr_free(host); grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, batch, + batch, grpc_error_set_int(GRPC_ERROR_CREATE_FROM_COPIED_STRING(error_msg), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAUTHENTICATED), @@ -255,22 +250,20 @@ static void on_host_checked(grpc_exec_ctx* exec_ctx, void* arg, } } -static void cancel_check_call_host(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void cancel_check_call_host(void* arg, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; if (error != GRPC_ERROR_NONE) { grpc_channel_security_connector_cancel_check_call_host( - exec_ctx, chand->security_connector, &calld->async_result_closure, + chand->security_connector, &calld->async_result_closure, GRPC_ERROR_REF(error)); } - GRPC_CALL_STACK_UNREF(exec_ctx, calld->owning_call, "cancel_check_call_host"); + GRPC_CALL_STACK_UNREF(calld->owning_call, "cancel_check_call_host"); } static void auth_start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* batch) { + grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { GPR_TIMER_BEGIN("auth_start_transport_stream_op_batch", 0); /* grab pointers to our data from the call element */ @@ -303,13 +296,13 @@ static void auth_start_transport_stream_op_batch( */ if (grpc_slice_eq(GRPC_MDKEY(md), GRPC_MDSTR_AUTHORITY)) { if (calld->have_host) { - grpc_slice_unref_internal(exec_ctx, calld->host); + grpc_slice_unref_internal(calld->host); } calld->host = grpc_slice_ref_internal(GRPC_MDVALUE(md)); calld->have_host = true; } else if (grpc_slice_eq(GRPC_MDKEY(md), GRPC_MDSTR_PATH)) { if (calld->have_method) { - grpc_slice_unref_internal(exec_ctx, calld->method); + grpc_slice_unref_internal(calld->method); } calld->method = grpc_slice_ref_internal(GRPC_MDVALUE(md)); calld->have_method = true; @@ -322,16 +315,16 @@ static void auth_start_transport_stream_op_batch( char* call_host = grpc_slice_to_c_string(calld->host); grpc_error* error = GRPC_ERROR_NONE; if (grpc_channel_security_connector_check_call_host( - exec_ctx, chand->security_connector, call_host, - chand->auth_context, &calld->async_result_closure, &error)) { + chand->security_connector, call_host, chand->auth_context, + &calld->async_result_closure, &error)) { // Synchronous return; invoke on_host_checked() directly. - on_host_checked(exec_ctx, batch, error); + on_host_checked(batch, error); GRPC_ERROR_UNREF(error); } else { // Async return; register cancellation closure with call combiner. GRPC_CALL_STACK_REF(calld->owning_call, "cancel_check_call_host"); grpc_call_combiner_set_notify_on_cancel( - exec_ctx, calld->call_combiner, + calld->call_combiner, GRPC_CLOSURE_INIT(&calld->check_call_host_cancel_closure, cancel_check_call_host, elem, grpc_schedule_on_exec_ctx)); @@ -343,13 +336,12 @@ static void auth_start_transport_stream_op_batch( } /* pass control down the stack */ - grpc_call_next_op(exec_ctx, elem, batch); + grpc_call_next_op(elem, batch); GPR_TIMER_END("auth_start_transport_stream_op_batch", 0); } /* Constructor for call_data */ -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; calld->owning_call = args->call_stack; @@ -357,32 +349,30 @@ static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, return GRPC_ERROR_NONE; } -static void set_pollset_or_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static void set_pollset_or_pollset_set(grpc_call_element* elem, grpc_polling_entity* pollent) { call_data* calld = (call_data*)elem->call_data; calld->pollent = pollent; } /* Destructor for call_data */ -static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { call_data* calld = (call_data*)elem->call_data; - grpc_credentials_mdelem_array_destroy(exec_ctx, &calld->md_array); - grpc_call_credentials_unref(exec_ctx, calld->creds); + grpc_credentials_mdelem_array_destroy(&calld->md_array); + grpc_call_credentials_unref(calld->creds); if (calld->have_host) { - grpc_slice_unref_internal(exec_ctx, calld->host); + grpc_slice_unref_internal(calld->host); } if (calld->have_method) { - grpc_slice_unref_internal(exec_ctx, calld->method); + grpc_slice_unref_internal(calld->method); } grpc_auth_metadata_context_reset(&calld->auth_md_context); } /* Constructor for channel_data */ -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { grpc_security_connector* sc = grpc_security_connector_find_in_args(args->channel_args); @@ -415,13 +405,12 @@ static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) { +static void destroy_channel_elem(grpc_channel_element* elem) { /* grab pointers to our data from the channel element */ channel_data* chand = (channel_data*)elem->channel_data; grpc_channel_security_connector* sc = chand->security_connector; if (sc != nullptr) { - GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, &sc->base, "client_auth_filter"); + GRPC_SECURITY_CONNECTOR_UNREF(&sc->base, "client_auth_filter"); } GRPC_AUTH_CONTEXT_UNREF(chand->auth_context, "client_auth_filter"); } diff --git a/src/core/lib/security/transport/lb_targets_info.cc b/src/core/lib/security/transport/lb_targets_info.cc index c07be358404..183b1ebf356 100644 --- a/src/core/lib/security/transport/lb_targets_info.cc +++ b/src/core/lib/security/transport/lb_targets_info.cc @@ -28,8 +28,8 @@ static void* targets_info_copy(void* p) { return grpc_slice_hash_table_ref((grpc_slice_hash_table*)p); } -static void targets_info_destroy(grpc_exec_ctx* exec_ctx, void* p) { - grpc_slice_hash_table_unref(exec_ctx, (grpc_slice_hash_table*)p); +static void targets_info_destroy(void* p) { + grpc_slice_hash_table_unref((grpc_slice_hash_table*)p); } static int targets_info_cmp(void* a, void* b) { return grpc_slice_hash_table_cmp((const grpc_slice_hash_table*)a, diff --git a/src/core/lib/security/transport/secure_endpoint.cc b/src/core/lib/security/transport/secure_endpoint.cc index 4cd317a06d7..e5c089de9ca 100644 --- a/src/core/lib/security/transport/secure_endpoint.cc +++ b/src/core/lib/security/transport/secure_endpoint.cc @@ -63,28 +63,27 @@ typedef struct { grpc_core::TraceFlag grpc_trace_secure_endpoint(false, "secure_endpoint"); -static void destroy(grpc_exec_ctx* exec_ctx, secure_endpoint* secure_ep) { +static void destroy(secure_endpoint* secure_ep) { secure_endpoint* ep = secure_ep; - grpc_endpoint_destroy(exec_ctx, ep->wrapped_ep); + grpc_endpoint_destroy(ep->wrapped_ep); tsi_frame_protector_destroy(ep->protector); - tsi_zero_copy_grpc_protector_destroy(exec_ctx, ep->zero_copy_protector); - grpc_slice_buffer_destroy_internal(exec_ctx, &ep->leftover_bytes); - grpc_slice_unref_internal(exec_ctx, ep->read_staging_buffer); - grpc_slice_unref_internal(exec_ctx, ep->write_staging_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &ep->output_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &ep->source_buffer); + tsi_zero_copy_grpc_protector_destroy(ep->zero_copy_protector); + grpc_slice_buffer_destroy_internal(&ep->leftover_bytes); + grpc_slice_unref_internal(ep->read_staging_buffer); + grpc_slice_unref_internal(ep->write_staging_buffer); + grpc_slice_buffer_destroy_internal(&ep->output_buffer); + grpc_slice_buffer_destroy_internal(&ep->source_buffer); gpr_mu_destroy(&ep->protector_mu); gpr_free(ep); } #ifndef NDEBUG -#define SECURE_ENDPOINT_UNREF(exec_ctx, ep, reason) \ - secure_endpoint_unref((exec_ctx), (ep), (reason), __FILE__, __LINE__) +#define SECURE_ENDPOINT_UNREF(ep, reason) \ + secure_endpoint_unref((ep), (reason), __FILE__, __LINE__) #define SECURE_ENDPOINT_REF(ep, reason) \ secure_endpoint_ref((ep), (reason), __FILE__, __LINE__) -static void secure_endpoint_unref(grpc_exec_ctx* exec_ctx, secure_endpoint* ep, - const char* reason, const char* file, - int line) { +static void secure_endpoint_unref(secure_endpoint* ep, const char* reason, + const char* file, int line) { if (grpc_trace_secure_endpoint.enabled()) { gpr_atm val = gpr_atm_no_barrier_load(&ep->ref.count); gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, @@ -92,7 +91,7 @@ static void secure_endpoint_unref(grpc_exec_ctx* exec_ctx, secure_endpoint* ep, val - 1); } if (gpr_unref(&ep->ref)) { - destroy(exec_ctx, ep); + destroy(ep); } } @@ -107,13 +106,11 @@ static void secure_endpoint_ref(secure_endpoint* ep, const char* reason, gpr_ref(&ep->ref); } #else -#define SECURE_ENDPOINT_UNREF(exec_ctx, ep, reason) \ - secure_endpoint_unref((exec_ctx), (ep)) +#define SECURE_ENDPOINT_UNREF(ep, reason) secure_endpoint_unref((ep)) #define SECURE_ENDPOINT_REF(ep, reason) secure_endpoint_ref((ep)) -static void secure_endpoint_unref(grpc_exec_ctx* exec_ctx, - secure_endpoint* ep) { +static void secure_endpoint_unref(secure_endpoint* ep) { if (gpr_unref(&ep->ref)) { - destroy(exec_ctx, ep); + destroy(ep); } } @@ -128,8 +125,7 @@ static void flush_read_staging_buffer(secure_endpoint* ep, uint8_t** cur, *end = GRPC_SLICE_END_PTR(ep->read_staging_buffer); } -static void call_read_cb(grpc_exec_ctx* exec_ctx, secure_endpoint* ep, - grpc_error* error) { +static void call_read_cb(secure_endpoint* ep, grpc_error* error) { if (grpc_trace_secure_endpoint.enabled()) { size_t i; for (i = 0; i < ep->read_buffer->count; i++) { @@ -140,12 +136,11 @@ static void call_read_cb(grpc_exec_ctx* exec_ctx, secure_endpoint* ep, } } ep->read_buffer = nullptr; - GRPC_CLOSURE_SCHED(exec_ctx, ep->read_cb, error); - SECURE_ENDPOINT_UNREF(exec_ctx, ep, "read"); + GRPC_CLOSURE_SCHED(ep->read_cb, error); + SECURE_ENDPOINT_UNREF(ep, "read"); } -static void on_read(grpc_exec_ctx* exec_ctx, void* user_data, - grpc_error* error) { +static void on_read(void* user_data, grpc_error* error) { unsigned i; uint8_t keep_looping = 0; tsi_result result = TSI_OK; @@ -154,17 +149,16 @@ static void on_read(grpc_exec_ctx* exec_ctx, void* user_data, uint8_t* end = GRPC_SLICE_END_PTR(ep->read_staging_buffer); if (error != GRPC_ERROR_NONE) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, ep->read_buffer); - call_read_cb(exec_ctx, ep, - GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Secure read failed", &error, 1)); + grpc_slice_buffer_reset_and_unref_internal(ep->read_buffer); + call_read_cb(ep, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Secure read failed", &error, 1)); return; } if (ep->zero_copy_protector != nullptr) { // Use zero-copy grpc protector to unprotect. result = tsi_zero_copy_grpc_protector_unprotect( - exec_ctx, ep->zero_copy_protector, &ep->source_buffer, ep->read_buffer); + ep->zero_copy_protector, &ep->source_buffer, ep->read_buffer); } else { // Use frame protector to unprotect. /* TODO(yangg) check error, maybe bail out early */ @@ -217,37 +211,35 @@ static void on_read(grpc_exec_ctx* exec_ctx, void* user_data, /* TODO(yangg) experiment with moving this block after read_cb to see if it helps latency */ - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &ep->source_buffer); + grpc_slice_buffer_reset_and_unref_internal(&ep->source_buffer); if (result != TSI_OK) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, ep->read_buffer); + grpc_slice_buffer_reset_and_unref_internal(ep->read_buffer); call_read_cb( - exec_ctx, ep, - grpc_set_tsi_error_result( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Unwrap failed"), result)); + ep, grpc_set_tsi_error_result( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Unwrap failed"), result)); return; } - call_read_cb(exec_ctx, ep, GRPC_ERROR_NONE); + call_read_cb(ep, GRPC_ERROR_NONE); } -static void endpoint_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* secure_ep, - grpc_slice_buffer* slices, grpc_closure* cb) { +static void endpoint_read(grpc_endpoint* secure_ep, grpc_slice_buffer* slices, + grpc_closure* cb) { secure_endpoint* ep = (secure_endpoint*)secure_ep; ep->read_cb = cb; ep->read_buffer = slices; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, ep->read_buffer); + grpc_slice_buffer_reset_and_unref_internal(ep->read_buffer); SECURE_ENDPOINT_REF(ep, "read"); if (ep->leftover_bytes.count) { grpc_slice_buffer_swap(&ep->leftover_bytes, &ep->source_buffer); GPR_ASSERT(ep->leftover_bytes.count == 0); - on_read(exec_ctx, ep, GRPC_ERROR_NONE); + on_read(ep, GRPC_ERROR_NONE); return; } - grpc_endpoint_read(exec_ctx, ep->wrapped_ep, &ep->source_buffer, - &ep->on_read); + grpc_endpoint_read(ep->wrapped_ep, &ep->source_buffer, &ep->on_read); } static void flush_write_staging_buffer(secure_endpoint* ep, uint8_t** cur, @@ -258,8 +250,8 @@ static void flush_write_staging_buffer(secure_endpoint* ep, uint8_t** cur, *end = GRPC_SLICE_END_PTR(ep->write_staging_buffer); } -static void endpoint_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* secure_ep, - grpc_slice_buffer* slices, grpc_closure* cb) { +static void endpoint_write(grpc_endpoint* secure_ep, grpc_slice_buffer* slices, + grpc_closure* cb) { GPR_TIMER_BEGIN("secure_endpoint.endpoint_write", 0); unsigned i; @@ -268,7 +260,7 @@ static void endpoint_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* secure_ep, uint8_t* cur = GRPC_SLICE_START_PTR(ep->write_staging_buffer); uint8_t* end = GRPC_SLICE_END_PTR(ep->write_staging_buffer); - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &ep->output_buffer); + grpc_slice_buffer_reset_and_unref_internal(&ep->output_buffer); if (grpc_trace_secure_endpoint.enabled()) { for (i = 0; i < slices->count; i++) { @@ -281,8 +273,8 @@ static void endpoint_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* secure_ep, if (ep->zero_copy_protector != nullptr) { // Use zero-copy grpc protector to protect. - result = tsi_zero_copy_grpc_protector_protect( - exec_ctx, ep->zero_copy_protector, slices, &ep->output_buffer); + result = tsi_zero_copy_grpc_protector_protect(ep->zero_copy_protector, + slices, &ep->output_buffer); } else { // Use frame protector to protect. for (i = 0; i < slices->count; i++) { @@ -340,50 +332,44 @@ static void endpoint_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* secure_ep, if (result != TSI_OK) { /* TODO(yangg) do different things according to the error type? */ - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &ep->output_buffer); + grpc_slice_buffer_reset_and_unref_internal(&ep->output_buffer); GRPC_CLOSURE_SCHED( - exec_ctx, cb, - grpc_set_tsi_error_result( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Wrap failed"), result)); + cb, grpc_set_tsi_error_result( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Wrap failed"), result)); GPR_TIMER_END("secure_endpoint.endpoint_write", 0); return; } - grpc_endpoint_write(exec_ctx, ep->wrapped_ep, &ep->output_buffer, cb); + grpc_endpoint_write(ep->wrapped_ep, &ep->output_buffer, cb); GPR_TIMER_END("secure_endpoint.endpoint_write", 0); } -static void endpoint_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* secure_ep, - grpc_error* why) { +static void endpoint_shutdown(grpc_endpoint* secure_ep, grpc_error* why) { secure_endpoint* ep = (secure_endpoint*)secure_ep; - grpc_endpoint_shutdown(exec_ctx, ep->wrapped_ep, why); + grpc_endpoint_shutdown(ep->wrapped_ep, why); } -static void endpoint_destroy(grpc_exec_ctx* exec_ctx, - grpc_endpoint* secure_ep) { +static void endpoint_destroy(grpc_endpoint* secure_ep) { secure_endpoint* ep = (secure_endpoint*)secure_ep; - SECURE_ENDPOINT_UNREF(exec_ctx, ep, "destroy"); + SECURE_ENDPOINT_UNREF(ep, "destroy"); } -static void endpoint_add_to_pollset(grpc_exec_ctx* exec_ctx, - grpc_endpoint* secure_ep, +static void endpoint_add_to_pollset(grpc_endpoint* secure_ep, grpc_pollset* pollset) { secure_endpoint* ep = (secure_endpoint*)secure_ep; - grpc_endpoint_add_to_pollset(exec_ctx, ep->wrapped_ep, pollset); + grpc_endpoint_add_to_pollset(ep->wrapped_ep, pollset); } -static void endpoint_add_to_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_endpoint* secure_ep, +static void endpoint_add_to_pollset_set(grpc_endpoint* secure_ep, grpc_pollset_set* pollset_set) { secure_endpoint* ep = (secure_endpoint*)secure_ep; - grpc_endpoint_add_to_pollset_set(exec_ctx, ep->wrapped_ep, pollset_set); + grpc_endpoint_add_to_pollset_set(ep->wrapped_ep, pollset_set); } -static void endpoint_delete_from_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_endpoint* secure_ep, +static void endpoint_delete_from_pollset_set(grpc_endpoint* secure_ep, grpc_pollset_set* pollset_set) { secure_endpoint* ep = (secure_endpoint*)secure_ep; - grpc_endpoint_delete_from_pollset_set(exec_ctx, ep->wrapped_ep, pollset_set); + grpc_endpoint_delete_from_pollset_set(ep->wrapped_ep, pollset_set); } static char* endpoint_get_peer(grpc_endpoint* secure_ep) { diff --git a/src/core/lib/security/transport/security_connector.cc b/src/core/lib/security/transport/security_connector.cc index c56e459aebd..fd139714da2 100644 --- a/src/core/lib/security/transport/security_connector.cc +++ b/src/core/lib/security/transport/security_connector.cc @@ -105,33 +105,32 @@ const tsi_peer_property* tsi_peer_get_property_by_name(const tsi_peer* peer, } void grpc_channel_security_connector_add_handshakers( - grpc_exec_ctx* exec_ctx, grpc_channel_security_connector* connector, + grpc_channel_security_connector* connector, grpc_handshake_manager* handshake_mgr) { if (connector != nullptr) { - connector->add_handshakers(exec_ctx, connector, handshake_mgr); + connector->add_handshakers(connector, handshake_mgr); } } void grpc_server_security_connector_add_handshakers( - grpc_exec_ctx* exec_ctx, grpc_server_security_connector* connector, + grpc_server_security_connector* connector, grpc_handshake_manager* handshake_mgr) { if (connector != nullptr) { - connector->add_handshakers(exec_ctx, connector, handshake_mgr); + connector->add_handshakers(connector, handshake_mgr); } } -void grpc_security_connector_check_peer(grpc_exec_ctx* exec_ctx, - grpc_security_connector* sc, +void grpc_security_connector_check_peer(grpc_security_connector* sc, tsi_peer peer, grpc_auth_context** auth_context, grpc_closure* on_peer_checked) { if (sc == nullptr) { - GRPC_CLOSURE_SCHED(exec_ctx, on_peer_checked, + GRPC_CLOSURE_SCHED(on_peer_checked, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "cannot check peer -- no security connector")); tsi_peer_destruct(&peer); } else { - sc->vtable->check_peer(exec_ctx, sc, peer, auth_context, on_peer_checked); + sc->vtable->check_peer(sc, peer, auth_context, on_peer_checked); } } @@ -169,26 +168,26 @@ int grpc_server_security_connector_cmp(grpc_server_security_connector* sc1, } bool grpc_channel_security_connector_check_call_host( - grpc_exec_ctx* exec_ctx, grpc_channel_security_connector* sc, - const char* host, grpc_auth_context* auth_context, - grpc_closure* on_call_host_checked, grpc_error** error) { + grpc_channel_security_connector* sc, const char* host, + grpc_auth_context* auth_context, grpc_closure* on_call_host_checked, + grpc_error** error) { if (sc == nullptr || sc->check_call_host == nullptr) { *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "cannot check call host -- no security connector"); return true; } - return sc->check_call_host(exec_ctx, sc, host, auth_context, - on_call_host_checked, error); + return sc->check_call_host(sc, host, auth_context, on_call_host_checked, + error); } void grpc_channel_security_connector_cancel_check_call_host( - grpc_exec_ctx* exec_ctx, grpc_channel_security_connector* sc, - grpc_closure* on_call_host_checked, grpc_error* error) { + grpc_channel_security_connector* sc, grpc_closure* on_call_host_checked, + grpc_error* error) { if (sc == nullptr || sc->cancel_check_call_host == nullptr) { GRPC_ERROR_UNREF(error); return; } - sc->cancel_check_call_host(exec_ctx, sc, on_call_host_checked, error); + sc->cancel_check_call_host(sc, on_call_host_checked, error); } #ifndef NDEBUG @@ -205,15 +204,14 @@ grpc_security_connector* grpc_security_connector_ref( #else grpc_security_connector* grpc_security_connector_ref( grpc_security_connector* sc) { - if (sc == NULL) return NULL; + if (sc == nullptr) return nullptr; #endif gpr_ref(&sc->refcount); return sc; } #ifndef NDEBUG -void grpc_security_connector_unref(grpc_exec_ctx* exec_ctx, - grpc_security_connector* sc, +void grpc_security_connector_unref(grpc_security_connector* sc, const char* file, int line, const char* reason) { if (sc == nullptr) return; @@ -224,15 +222,14 @@ void grpc_security_connector_unref(grpc_exec_ctx* exec_ctx, val, val - 1, reason); } #else -void grpc_security_connector_unref(grpc_exec_ctx* exec_ctx, - grpc_security_connector* sc) { - if (sc == NULL) return; +void grpc_security_connector_unref(grpc_security_connector* sc) { + if (sc == nullptr) return; #endif - if (gpr_unref(&sc->refcount)) sc->vtable->destroy(exec_ctx, sc); + if (gpr_unref(&sc->refcount)) sc->vtable->destroy(sc); } -static void connector_arg_destroy(grpc_exec_ctx* exec_ctx, void* p) { - GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, (grpc_security_connector*)p, +static void connector_arg_destroy(void* p) { + GRPC_SECURITY_CONNECTOR_UNREF((grpc_security_connector*)p, "connector_arg_destroy"); } @@ -309,20 +306,16 @@ typedef struct { bool is_lb_channel; } grpc_fake_channel_security_connector; -static void fake_channel_destroy(grpc_exec_ctx* exec_ctx, - grpc_security_connector* sc) { +static void fake_channel_destroy(grpc_security_connector* sc) { grpc_fake_channel_security_connector* c = (grpc_fake_channel_security_connector*)sc; - grpc_call_credentials_unref(exec_ctx, c->base.request_metadata_creds); + grpc_call_credentials_unref(c->base.request_metadata_creds); gpr_free(c->target); gpr_free(c->expected_targets); gpr_free(c); } -static void fake_server_destroy(grpc_exec_ctx* exec_ctx, - grpc_security_connector* sc) { - gpr_free(sc); -} +static void fake_server_destroy(grpc_security_connector* sc) { gpr_free(sc); } static bool fake_check_target(const char* target_type, const char* target, const char* set_str) { @@ -386,8 +379,7 @@ done: if (!success) abort(); } -static void fake_check_peer(grpc_exec_ctx* exec_ctx, - grpc_security_connector* sc, tsi_peer peer, +static void fake_check_peer(grpc_security_connector* sc, tsi_peer peer, grpc_auth_context** auth_context, grpc_closure* on_peer_checked) { const char* prop_name; @@ -419,25 +411,23 @@ static void fake_check_peer(grpc_exec_ctx* exec_ctx, *auth_context, GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME, GRPC_FAKE_TRANSPORT_SECURITY_TYPE); end: - GRPC_CLOSURE_SCHED(exec_ctx, on_peer_checked, error); + GRPC_CLOSURE_SCHED(on_peer_checked, error); tsi_peer_destruct(&peer); } -static void fake_channel_check_peer(grpc_exec_ctx* exec_ctx, - grpc_security_connector* sc, tsi_peer peer, +static void fake_channel_check_peer(grpc_security_connector* sc, tsi_peer peer, grpc_auth_context** auth_context, grpc_closure* on_peer_checked) { - fake_check_peer(exec_ctx, sc, peer, auth_context, on_peer_checked); + fake_check_peer(sc, peer, auth_context, on_peer_checked); grpc_fake_channel_security_connector* c = (grpc_fake_channel_security_connector*)sc; fake_secure_name_check(c->target, c->expected_targets, c->is_lb_channel); } -static void fake_server_check_peer(grpc_exec_ctx* exec_ctx, - grpc_security_connector* sc, tsi_peer peer, +static void fake_server_check_peer(grpc_security_connector* sc, tsi_peer peer, grpc_auth_context** auth_context, grpc_closure* on_peer_checked) { - fake_check_peer(exec_ctx, sc, peer, auth_context, on_peer_checked); + fake_check_peer(sc, peer, auth_context, on_peer_checked); } static int fake_channel_cmp(grpc_security_connector* sc1, @@ -466,8 +456,7 @@ static int fake_server_cmp(grpc_security_connector* sc1, (grpc_server_security_connector*)sc2); } -static bool fake_channel_check_call_host(grpc_exec_ctx* exec_ctx, - grpc_channel_security_connector* sc, +static bool fake_channel_check_call_host(grpc_channel_security_connector* sc, const char* host, grpc_auth_context* auth_context, grpc_closure* on_call_host_checked, @@ -476,29 +465,26 @@ static bool fake_channel_check_call_host(grpc_exec_ctx* exec_ctx, } static void fake_channel_cancel_check_call_host( - grpc_exec_ctx* exec_ctx, grpc_channel_security_connector* sc, - grpc_closure* on_call_host_checked, grpc_error* error) { + grpc_channel_security_connector* sc, grpc_closure* on_call_host_checked, + grpc_error* error) { GRPC_ERROR_UNREF(error); } static void fake_channel_add_handshakers( - grpc_exec_ctx* exec_ctx, grpc_channel_security_connector* sc, + grpc_channel_security_connector* sc, grpc_handshake_manager* handshake_mgr) { grpc_handshake_manager_add( handshake_mgr, grpc_security_handshaker_create( - exec_ctx, tsi_create_fake_handshaker(true /* is_client */), - &sc->base)); + tsi_create_fake_handshaker(true /* is_client */), &sc->base)); } -static void fake_server_add_handshakers(grpc_exec_ctx* exec_ctx, - grpc_server_security_connector* sc, +static void fake_server_add_handshakers(grpc_server_security_connector* sc, grpc_handshake_manager* handshake_mgr) { grpc_handshake_manager_add( handshake_mgr, grpc_security_handshaker_create( - exec_ctx, tsi_create_fake_handshaker(false /* is_client */), - &sc->base)); + tsi_create_fake_handshaker(false /* is_client */), &sc->base)); } static grpc_security_connector_vtable fake_channel_vtable = { @@ -565,12 +551,11 @@ static bool server_connector_has_cert_config_fetcher( return server_creds->certificate_config_fetcher.cb != nullptr; } -static void ssl_channel_destroy(grpc_exec_ctx* exec_ctx, - grpc_security_connector* sc) { +static void ssl_channel_destroy(grpc_security_connector* sc) { grpc_ssl_channel_security_connector* c = (grpc_ssl_channel_security_connector*)sc; - grpc_channel_credentials_unref(exec_ctx, c->base.channel_creds); - grpc_call_credentials_unref(exec_ctx, c->base.request_metadata_creds); + grpc_channel_credentials_unref(c->base.channel_creds); + grpc_call_credentials_unref(c->base.request_metadata_creds); tsi_ssl_client_handshaker_factory_unref(c->client_handshaker_factory); c->client_handshaker_factory = nullptr; if (c->target_name != nullptr) gpr_free(c->target_name); @@ -578,18 +563,16 @@ static void ssl_channel_destroy(grpc_exec_ctx* exec_ctx, gpr_free(sc); } -static void ssl_server_destroy(grpc_exec_ctx* exec_ctx, - grpc_security_connector* sc) { +static void ssl_server_destroy(grpc_security_connector* sc) { grpc_ssl_server_security_connector* c = (grpc_ssl_server_security_connector*)sc; - grpc_server_credentials_unref(exec_ctx, c->base.server_creds); + grpc_server_credentials_unref(c->base.server_creds); tsi_ssl_server_handshaker_factory_unref(c->server_handshaker_factory); c->server_handshaker_factory = nullptr; gpr_free(sc); } -static void ssl_channel_add_handshakers(grpc_exec_ctx* exec_ctx, - grpc_channel_security_connector* sc, +static void ssl_channel_add_handshakers(grpc_channel_security_connector* sc, grpc_handshake_manager* handshake_mgr) { grpc_ssl_channel_security_connector* c = (grpc_ssl_channel_security_connector*)sc; @@ -607,9 +590,8 @@ static void ssl_channel_add_handshakers(grpc_exec_ctx* exec_ctx, } // Create handshakers. grpc_handshake_manager_add( - handshake_mgr, - grpc_security_handshaker_create( - exec_ctx, tsi_create_adapter_handshaker(tsi_hs), &sc->base)); + handshake_mgr, grpc_security_handshaker_create( + tsi_create_adapter_handshaker(tsi_hs), &sc->base)); } static const char** fill_alpn_protocol_strings(size_t* num_alpn_protocols) { @@ -701,8 +683,7 @@ static bool try_fetch_ssl_server_credentials( return status; } -static void ssl_server_add_handshakers(grpc_exec_ctx* exec_ctx, - grpc_server_security_connector* sc, +static void ssl_server_add_handshakers(grpc_server_security_connector* sc, grpc_handshake_manager* handshake_mgr) { grpc_ssl_server_security_connector* c = (grpc_ssl_server_security_connector*)sc; @@ -718,9 +699,8 @@ static void ssl_server_add_handshakers(grpc_exec_ctx* exec_ctx, } // Create handshakers. grpc_handshake_manager_add( - handshake_mgr, - grpc_security_handshaker_create( - exec_ctx, tsi_create_adapter_handshaker(tsi_hs), &sc->base)); + handshake_mgr, grpc_security_handshaker_create( + tsi_create_adapter_handshaker(tsi_hs), &sc->base)); } static int ssl_host_matches_name(const tsi_peer* peer, const char* peer_name) { @@ -804,8 +784,7 @@ static grpc_error* ssl_check_peer(grpc_security_connector* sc, return GRPC_ERROR_NONE; } -static void ssl_channel_check_peer(grpc_exec_ctx* exec_ctx, - grpc_security_connector* sc, tsi_peer peer, +static void ssl_channel_check_peer(grpc_security_connector* sc, tsi_peer peer, grpc_auth_context** auth_context, grpc_closure* on_peer_checked) { grpc_ssl_channel_security_connector* c = @@ -815,17 +794,16 @@ static void ssl_channel_check_peer(grpc_exec_ctx* exec_ctx, ? c->overridden_target_name : c->target_name, &peer, auth_context); - GRPC_CLOSURE_SCHED(exec_ctx, on_peer_checked, error); + GRPC_CLOSURE_SCHED(on_peer_checked, error); tsi_peer_destruct(&peer); } -static void ssl_server_check_peer(grpc_exec_ctx* exec_ctx, - grpc_security_connector* sc, tsi_peer peer, +static void ssl_server_check_peer(grpc_security_connector* sc, tsi_peer peer, grpc_auth_context** auth_context, grpc_closure* on_peer_checked) { grpc_error* error = ssl_check_peer(sc, nullptr, &peer, auth_context); tsi_peer_destruct(&peer); - GRPC_CLOSURE_SCHED(exec_ctx, on_peer_checked, error); + GRPC_CLOSURE_SCHED(on_peer_checked, error); } static int ssl_channel_cmp(grpc_security_connector* sc1, @@ -895,8 +873,7 @@ void tsi_shallow_peer_destruct(tsi_peer* peer) { if (peer->properties != nullptr) gpr_free(peer->properties); } -static bool ssl_channel_check_call_host(grpc_exec_ctx* exec_ctx, - grpc_channel_security_connector* sc, +static bool ssl_channel_check_call_host(grpc_channel_security_connector* sc, const char* host, grpc_auth_context* auth_context, grpc_closure* on_call_host_checked, @@ -922,8 +899,8 @@ static bool ssl_channel_check_call_host(grpc_exec_ctx* exec_ctx, } static void ssl_channel_cancel_check_call_host( - grpc_exec_ctx* exec_ctx, grpc_channel_security_connector* sc, - grpc_closure* on_call_host_checked, grpc_error* error) { + grpc_channel_security_connector* sc, grpc_closure* on_call_host_checked, + grpc_error* error) { GRPC_ERROR_UNREF(error); } @@ -990,7 +967,7 @@ const char* grpc_get_default_ssl_roots(void) { } grpc_security_status grpc_ssl_channel_security_connector_create( - grpc_exec_ctx* exec_ctx, grpc_channel_credentials* channel_creds, + grpc_channel_credentials* channel_creds, grpc_call_credentials* request_metadata_creds, const grpc_ssl_config* config, const char* target_name, const char* overridden_target_name, grpc_channel_security_connector** sc) { @@ -1045,7 +1022,7 @@ grpc_security_status grpc_ssl_channel_security_connector_create( if (result != TSI_OK) { gpr_log(GPR_ERROR, "Handshaker factory creation failed with %s.", tsi_result_to_string(result)); - ssl_channel_destroy(exec_ctx, &c->base.base); + ssl_channel_destroy(&c->base.base); *sc = nullptr; goto error; } @@ -1073,8 +1050,7 @@ grpc_ssl_server_security_connector_initialize( } grpc_security_status grpc_ssl_server_security_connector_create( - grpc_exec_ctx* exec_ctx, grpc_server_credentials* gsc, - grpc_server_security_connector** sc) { + grpc_server_credentials* gsc, grpc_server_security_connector** sc) { tsi_result result = TSI_OK; grpc_ssl_server_credentials* server_credentials = (grpc_ssl_server_credentials*)gsc; @@ -1114,7 +1090,7 @@ grpc_security_status grpc_ssl_server_security_connector_create( if (retval == GRPC_SECURITY_OK) { *sc = &c->base; } else { - if (c != nullptr) ssl_server_destroy(exec_ctx, &c->base.base); + if (c != nullptr) ssl_server_destroy(&c->base.base); if (sc != nullptr) *sc = nullptr; } return retval; diff --git a/src/core/lib/security/transport/security_connector.h b/src/core/lib/security/transport/security_connector.h index 03daba3a180..495821d2470 100644 --- a/src/core/lib/security/transport/security_connector.h +++ b/src/core/lib/security/transport/security_connector.h @@ -50,9 +50,9 @@ typedef struct grpc_security_connector grpc_security_connector; #define GRPC_ARG_SECURITY_CONNECTOR "grpc.security_connector" typedef struct { - void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_security_connector* sc); - void (*check_peer)(grpc_exec_ctx* exec_ctx, grpc_security_connector* sc, - tsi_peer peer, grpc_auth_context** auth_context, + void (*destroy)(grpc_security_connector* sc); + void (*check_peer)(grpc_security_connector* sc, tsi_peer peer, + grpc_auth_context** auth_context, grpc_closure* on_peer_checked); int (*cmp)(grpc_security_connector* sc, grpc_security_connector* other); } grpc_security_connector_vtable; @@ -67,29 +67,25 @@ struct grpc_security_connector { #ifndef NDEBUG #define GRPC_SECURITY_CONNECTOR_REF(p, r) \ grpc_security_connector_ref((p), __FILE__, __LINE__, (r)) -#define GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, p, r) \ - grpc_security_connector_unref((exec_ctx), (p), __FILE__, __LINE__, (r)) +#define GRPC_SECURITY_CONNECTOR_UNREF(p, r) \ + grpc_security_connector_unref((p), __FILE__, __LINE__, (r)) grpc_security_connector* grpc_security_connector_ref( grpc_security_connector* policy, const char* file, int line, const char* reason); -void grpc_security_connector_unref(grpc_exec_ctx* exec_ctx, - grpc_security_connector* policy, +void grpc_security_connector_unref(grpc_security_connector* policy, const char* file, int line, const char* reason); #else #define GRPC_SECURITY_CONNECTOR_REF(p, r) grpc_security_connector_ref((p)) -#define GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, p, r) \ - grpc_security_connector_unref((exec_ctx), (p)) +#define GRPC_SECURITY_CONNECTOR_UNREF(p, r) grpc_security_connector_unref((p)) grpc_security_connector* grpc_security_connector_ref( grpc_security_connector* policy); -void grpc_security_connector_unref(grpc_exec_ctx* exec_ctx, - grpc_security_connector* policy); +void grpc_security_connector_unref(grpc_security_connector* policy); #endif /* Check the peer. Callee takes ownership of the peer object. When done, sets *auth_context and invokes on_peer_checked. */ -void grpc_security_connector_check_peer(grpc_exec_ctx* exec_ctx, - grpc_security_connector* sc, +void grpc_security_connector_check_peer(grpc_security_connector* sc, tsi_peer peer, grpc_auth_context** auth_context, grpc_closure* on_peer_checked); @@ -119,17 +115,14 @@ struct grpc_channel_security_connector { grpc_security_connector base; grpc_channel_credentials* channel_creds; grpc_call_credentials* request_metadata_creds; - bool (*check_call_host)(grpc_exec_ctx* exec_ctx, - grpc_channel_security_connector* sc, const char* host, + bool (*check_call_host)(grpc_channel_security_connector* sc, const char* host, grpc_auth_context* auth_context, grpc_closure* on_call_host_checked, grpc_error** error); - void (*cancel_check_call_host)(grpc_exec_ctx* exec_ctx, - grpc_channel_security_connector* sc, + void (*cancel_check_call_host)(grpc_channel_security_connector* sc, grpc_closure* on_call_host_checked, grpc_error* error); - void (*add_handshakers)(grpc_exec_ctx* exec_ctx, - grpc_channel_security_connector* sc, + void (*add_handshakers)(grpc_channel_security_connector* sc, grpc_handshake_manager* handshake_mgr); }; @@ -142,20 +135,20 @@ int grpc_channel_security_connector_cmp(grpc_channel_security_connector* sc1, /// be set to indicate the result. Otherwise, \a on_call_host_checked /// will be invoked when complete. bool grpc_channel_security_connector_check_call_host( - grpc_exec_ctx* exec_ctx, grpc_channel_security_connector* sc, - const char* host, grpc_auth_context* auth_context, - grpc_closure* on_call_host_checked, grpc_error** error); + grpc_channel_security_connector* sc, const char* host, + grpc_auth_context* auth_context, grpc_closure* on_call_host_checked, + grpc_error** error); /// Cancels a pending asychronous call to /// grpc_channel_security_connector_check_call_host() with /// \a on_call_host_checked as its callback. void grpc_channel_security_connector_cancel_check_call_host( - grpc_exec_ctx* exec_ctx, grpc_channel_security_connector* sc, - grpc_closure* on_call_host_checked, grpc_error* error); + grpc_channel_security_connector* sc, grpc_closure* on_call_host_checked, + grpc_error* error); /* Registers handshakers with \a handshake_mgr. */ void grpc_channel_security_connector_add_handshakers( - grpc_exec_ctx* exec_ctx, grpc_channel_security_connector* connector, + grpc_channel_security_connector* connector, grpc_handshake_manager* handshake_mgr); /* --- server_security_connector object. --- @@ -168,8 +161,7 @@ typedef struct grpc_server_security_connector grpc_server_security_connector; struct grpc_server_security_connector { grpc_security_connector base; grpc_server_credentials* server_creds; - void (*add_handshakers)(grpc_exec_ctx* exec_ctx, - grpc_server_security_connector* sc, + void (*add_handshakers)(grpc_server_security_connector* sc, grpc_handshake_manager* handshake_mgr); }; @@ -178,8 +170,7 @@ int grpc_server_security_connector_cmp(grpc_server_security_connector* sc1, grpc_server_security_connector* sc2); void grpc_server_security_connector_add_handshakers( - grpc_exec_ctx* exec_ctx, grpc_server_security_connector* sc, - grpc_handshake_manager* handshake_mgr); + grpc_server_security_connector* sc, grpc_handshake_manager* handshake_mgr); /* --- Creation security connectors. --- */ @@ -216,7 +207,7 @@ typedef struct { specific error code otherwise. */ grpc_security_status grpc_ssl_channel_security_connector_create( - grpc_exec_ctx* exec_ctx, grpc_channel_credentials* channel_creds, + grpc_channel_credentials* channel_creds, grpc_call_credentials* request_metadata_creds, const grpc_ssl_config* config, const char* target_name, const char* overridden_target_name, grpc_channel_security_connector** sc); @@ -242,7 +233,7 @@ typedef struct { specific error code otherwise. */ grpc_security_status grpc_ssl_server_security_connector_create( - grpc_exec_ctx* exec_ctx, grpc_server_credentials* server_credentials, + grpc_server_credentials* server_credentials, grpc_server_security_connector** sc); /* Util. */ diff --git a/src/core/lib/security/transport/security_handshaker.cc b/src/core/lib/security/transport/security_handshaker.cc index 7067b70cb6a..7623fbfd5b3 100644 --- a/src/core/lib/security/transport/security_handshaker.cc +++ b/src/core/lib/security/transport/security_handshaker.cc @@ -65,8 +65,7 @@ typedef struct { tsi_handshaker_result* handshaker_result; } security_handshaker; -static size_t move_read_buffer_into_handshake_buffer(grpc_exec_ctx* exec_ctx, - security_handshaker* h) { +static size_t move_read_buffer_into_handshake_buffer(security_handshaker* h) { size_t bytes_in_read_buffer = h->args->read_buffer->length; if (h->handshake_buffer_size < bytes_in_read_buffer) { h->handshake_buffer = @@ -79,48 +78,45 @@ static size_t move_read_buffer_into_handshake_buffer(grpc_exec_ctx* exec_ctx, memcpy(h->handshake_buffer + offset, GRPC_SLICE_START_PTR(next_slice), GRPC_SLICE_LENGTH(next_slice)); offset += GRPC_SLICE_LENGTH(next_slice); - grpc_slice_unref_internal(exec_ctx, next_slice); + grpc_slice_unref_internal(next_slice); } return bytes_in_read_buffer; } -static void security_handshaker_unref(grpc_exec_ctx* exec_ctx, - security_handshaker* h) { +static void security_handshaker_unref(security_handshaker* h) { if (gpr_unref(&h->refs)) { gpr_mu_destroy(&h->mu); tsi_handshaker_destroy(h->handshaker); tsi_handshaker_result_destroy(h->handshaker_result); if (h->endpoint_to_destroy != nullptr) { - grpc_endpoint_destroy(exec_ctx, h->endpoint_to_destroy); + grpc_endpoint_destroy(h->endpoint_to_destroy); } if (h->read_buffer_to_destroy != nullptr) { - grpc_slice_buffer_destroy_internal(exec_ctx, h->read_buffer_to_destroy); + grpc_slice_buffer_destroy_internal(h->read_buffer_to_destroy); gpr_free(h->read_buffer_to_destroy); } gpr_free(h->handshake_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &h->outgoing); + grpc_slice_buffer_destroy_internal(&h->outgoing); GRPC_AUTH_CONTEXT_UNREF(h->auth_context, "handshake"); - GRPC_SECURITY_CONNECTOR_UNREF(exec_ctx, h->connector, "handshake"); + GRPC_SECURITY_CONNECTOR_UNREF(h->connector, "handshake"); gpr_free(h); } } // Set args fields to NULL, saving the endpoint and read buffer for // later destruction. -static void cleanup_args_for_failure_locked(grpc_exec_ctx* exec_ctx, - security_handshaker* h) { +static void cleanup_args_for_failure_locked(security_handshaker* h) { h->endpoint_to_destroy = h->args->endpoint; h->args->endpoint = nullptr; h->read_buffer_to_destroy = h->args->read_buffer; h->args->read_buffer = nullptr; - grpc_channel_args_destroy(exec_ctx, h->args->args); + grpc_channel_args_destroy(h->args->args); h->args->args = nullptr; } // If the handshake failed or we're shutting down, clean up and invoke the // callback with the error. -static void security_handshake_failed_locked(grpc_exec_ctx* exec_ctx, - security_handshaker* h, +static void security_handshake_failed_locked(security_handshaker* h, grpc_error* error) { if (error == GRPC_ERROR_NONE) { // If we were shut down after the handshake succeeded but before an @@ -135,34 +131,33 @@ static void security_handshake_failed_locked(grpc_exec_ctx* exec_ctx, // before destroying them, even if we know that there are no // pending read/write callbacks. This should be fixed, at which // point this can be removed. - grpc_endpoint_shutdown(exec_ctx, h->args->endpoint, GRPC_ERROR_REF(error)); + grpc_endpoint_shutdown(h->args->endpoint, GRPC_ERROR_REF(error)); // Not shutting down, so the write failed. Clean up before // invoking the callback. - cleanup_args_for_failure_locked(exec_ctx, h); + cleanup_args_for_failure_locked(h); // Set shutdown to true so that subsequent calls to // security_handshaker_shutdown() do nothing. h->shutdown = true; } // Invoke callback. - GRPC_CLOSURE_SCHED(exec_ctx, h->on_handshake_done, error); + GRPC_CLOSURE_SCHED(h->on_handshake_done, error); } -static void on_peer_checked_inner(grpc_exec_ctx* exec_ctx, - security_handshaker* h, grpc_error* error) { +static void on_peer_checked_inner(security_handshaker* h, grpc_error* error) { if (error != GRPC_ERROR_NONE || h->shutdown) { - security_handshake_failed_locked(exec_ctx, h, GRPC_ERROR_REF(error)); + security_handshake_failed_locked(h, GRPC_ERROR_REF(error)); return; } // Create zero-copy frame protector, if implemented. tsi_zero_copy_grpc_protector* zero_copy_protector = nullptr; tsi_result result = tsi_handshaker_result_create_zero_copy_grpc_protector( - exec_ctx, h->handshaker_result, nullptr, &zero_copy_protector); + h->handshaker_result, nullptr, &zero_copy_protector); if (result != TSI_OK && result != TSI_UNIMPLEMENTED) { error = grpc_set_tsi_error_result( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Zero-copy frame protector creation failed"), result); - security_handshake_failed_locked(exec_ctx, h, error); + security_handshake_failed_locked(h, error); return; } // Create frame protector if zero-copy frame protector is NULL. @@ -174,7 +169,7 @@ static void on_peer_checked_inner(grpc_exec_ctx* exec_ctx, error = grpc_set_tsi_error_result(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Frame protector creation failed"), result); - security_handshake_failed_locked(exec_ctx, h, error); + security_handshake_failed_locked(h, error); return; } } @@ -189,7 +184,7 @@ static void on_peer_checked_inner(grpc_exec_ctx* exec_ctx, grpc_slice_from_copied_buffer((char*)unused_bytes, unused_bytes_size); h->args->endpoint = grpc_secure_endpoint_create( protector, zero_copy_protector, h->args->endpoint, &slice, 1); - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); } else { h->args->endpoint = grpc_secure_endpoint_create( protector, zero_copy_protector, h->args->endpoint, nullptr, 0); @@ -201,25 +196,23 @@ static void on_peer_checked_inner(grpc_exec_ctx* exec_ctx, grpc_channel_args* tmp_args = h->args->args; h->args->args = grpc_channel_args_copy_and_add(tmp_args, &auth_context_arg, 1); - grpc_channel_args_destroy(exec_ctx, tmp_args); + grpc_channel_args_destroy(tmp_args); // Invoke callback. - GRPC_CLOSURE_SCHED(exec_ctx, h->on_handshake_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(h->on_handshake_done, GRPC_ERROR_NONE); // Set shutdown to true so that subsequent calls to // security_handshaker_shutdown() do nothing. h->shutdown = true; } -static void on_peer_checked(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_peer_checked(void* arg, grpc_error* error) { security_handshaker* h = (security_handshaker*)arg; gpr_mu_lock(&h->mu); - on_peer_checked_inner(exec_ctx, h, error); + on_peer_checked_inner(h, error); gpr_mu_unlock(&h->mu); - security_handshaker_unref(exec_ctx, h); + security_handshaker_unref(h); } -static grpc_error* check_peer_locked(grpc_exec_ctx* exec_ctx, - security_handshaker* h) { +static grpc_error* check_peer_locked(security_handshaker* h) { tsi_peer peer; tsi_result result = tsi_handshaker_result_extract_peer(h->handshaker_result, &peer); @@ -227,20 +220,20 @@ static grpc_error* check_peer_locked(grpc_exec_ctx* exec_ctx, return grpc_set_tsi_error_result( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Peer extraction failed"), result); } - grpc_security_connector_check_peer(exec_ctx, h->connector, peer, - &h->auth_context, &h->on_peer_checked); + grpc_security_connector_check_peer(h->connector, peer, &h->auth_context, + &h->on_peer_checked); return GRPC_ERROR_NONE; } static grpc_error* on_handshake_next_done_locked( - grpc_exec_ctx* exec_ctx, security_handshaker* h, tsi_result result, + security_handshaker* h, tsi_result result, const unsigned char* bytes_to_send, size_t bytes_to_send_size, tsi_handshaker_result* handshaker_result) { grpc_error* error = GRPC_ERROR_NONE; // Read more if we need to. if (result == TSI_INCOMPLETE_DATA) { GPR_ASSERT(bytes_to_send_size == 0); - grpc_endpoint_read(exec_ctx, h->args->endpoint, h->args->read_buffer, + grpc_endpoint_read(h->args->endpoint, h->args->read_buffer, &h->on_handshake_data_received_from_peer); return error; } @@ -257,17 +250,17 @@ static grpc_error* on_handshake_next_done_locked( // Send data to peer, if needed. grpc_slice to_send = grpc_slice_from_copied_buffer( (const char*)bytes_to_send, bytes_to_send_size); - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &h->outgoing); + grpc_slice_buffer_reset_and_unref_internal(&h->outgoing); grpc_slice_buffer_add(&h->outgoing, to_send); - grpc_endpoint_write(exec_ctx, h->args->endpoint, &h->outgoing, + grpc_endpoint_write(h->args->endpoint, &h->outgoing, &h->on_handshake_data_sent_to_peer); } else if (handshaker_result == nullptr) { // There is nothing to send, but need to read from peer. - grpc_endpoint_read(exec_ctx, h->args->endpoint, h->args->read_buffer, + grpc_endpoint_read(h->args->endpoint, h->args->read_buffer, &h->on_handshake_data_received_from_peer); } else { // Handshake has finished, check peer and so on. - error = check_peer_locked(exec_ctx, h); + error = check_peer_locked(h); } return error; } @@ -278,24 +271,22 @@ static void on_handshake_next_done_grpc_wrapper( security_handshaker* h = (security_handshaker*)user_data; // This callback will be invoked by TSI in a non-grpc thread, so it's // safe to create our own exec_ctx here. - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_mu_lock(&h->mu); - grpc_error* error = - on_handshake_next_done_locked(&exec_ctx, h, result, bytes_to_send, - bytes_to_send_size, handshaker_result); + grpc_error* error = on_handshake_next_done_locked( + h, result, bytes_to_send, bytes_to_send_size, handshaker_result); if (error != GRPC_ERROR_NONE) { - security_handshake_failed_locked(&exec_ctx, h, error); + security_handshake_failed_locked(h, error); gpr_mu_unlock(&h->mu); - security_handshaker_unref(&exec_ctx, h); + security_handshaker_unref(h); } else { gpr_mu_unlock(&h->mu); } - grpc_exec_ctx_finish(&exec_ctx); } static grpc_error* do_handshaker_next_locked( - grpc_exec_ctx* exec_ctx, security_handshaker* h, - const unsigned char* bytes_received, size_t bytes_received_size) { + security_handshaker* h, const unsigned char* bytes_received, + size_t bytes_received_size) { // Invoke TSI handshaker. const unsigned char* bytes_to_send = nullptr; size_t bytes_to_send_size = 0; @@ -311,62 +302,57 @@ static grpc_error* do_handshaker_next_locked( } // Handshaker returned synchronously. Invoke callback directly in // this thread with our existing exec_ctx. - return on_handshake_next_done_locked(exec_ctx, h, result, bytes_to_send, + return on_handshake_next_done_locked(h, result, bytes_to_send, bytes_to_send_size, handshaker_result); } -static void on_handshake_data_received_from_peer(grpc_exec_ctx* exec_ctx, - void* arg, grpc_error* error) { +static void on_handshake_data_received_from_peer(void* arg, grpc_error* error) { security_handshaker* h = (security_handshaker*)arg; gpr_mu_lock(&h->mu); if (error != GRPC_ERROR_NONE || h->shutdown) { security_handshake_failed_locked( - exec_ctx, h, - GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Handshake read failed", &error, 1)); + h, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Handshake read failed", &error, 1)); gpr_mu_unlock(&h->mu); - security_handshaker_unref(exec_ctx, h); + security_handshaker_unref(h); return; } // Copy all slices received. - size_t bytes_received_size = - move_read_buffer_into_handshake_buffer(exec_ctx, h); + size_t bytes_received_size = move_read_buffer_into_handshake_buffer(h); // Call TSI handshaker. - error = do_handshaker_next_locked(exec_ctx, h, h->handshake_buffer, - bytes_received_size); + error = + do_handshaker_next_locked(h, h->handshake_buffer, bytes_received_size); if (error != GRPC_ERROR_NONE) { - security_handshake_failed_locked(exec_ctx, h, error); + security_handshake_failed_locked(h, error); gpr_mu_unlock(&h->mu); - security_handshaker_unref(exec_ctx, h); + security_handshaker_unref(h); } else { gpr_mu_unlock(&h->mu); } } -static void on_handshake_data_sent_to_peer(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_handshake_data_sent_to_peer(void* arg, grpc_error* error) { security_handshaker* h = (security_handshaker*)arg; gpr_mu_lock(&h->mu); if (error != GRPC_ERROR_NONE || h->shutdown) { security_handshake_failed_locked( - exec_ctx, h, - GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Handshake write failed", &error, 1)); + h, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Handshake write failed", &error, 1)); gpr_mu_unlock(&h->mu); - security_handshaker_unref(exec_ctx, h); + security_handshaker_unref(h); return; } // We may be done. if (h->handshaker_result == nullptr) { - grpc_endpoint_read(exec_ctx, h->args->endpoint, h->args->read_buffer, + grpc_endpoint_read(h->args->endpoint, h->args->read_buffer, &h->on_handshake_data_received_from_peer); } else { - error = check_peer_locked(exec_ctx, h); + error = check_peer_locked(h); if (error != GRPC_ERROR_NONE) { - security_handshake_failed_locked(exec_ctx, h, error); + security_handshake_failed_locked(h, error); gpr_mu_unlock(&h->mu); - security_handshaker_unref(exec_ctx, h); + security_handshaker_unref(h); return; } } @@ -377,28 +363,25 @@ static void on_handshake_data_sent_to_peer(grpc_exec_ctx* exec_ctx, void* arg, // public handshaker API // -static void security_handshaker_destroy(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker) { +static void security_handshaker_destroy(grpc_handshaker* handshaker) { security_handshaker* h = (security_handshaker*)handshaker; - security_handshaker_unref(exec_ctx, h); + security_handshaker_unref(h); } -static void security_handshaker_shutdown(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker, +static void security_handshaker_shutdown(grpc_handshaker* handshaker, grpc_error* why) { security_handshaker* h = (security_handshaker*)handshaker; gpr_mu_lock(&h->mu); if (!h->shutdown) { h->shutdown = true; - grpc_endpoint_shutdown(exec_ctx, h->args->endpoint, GRPC_ERROR_REF(why)); - cleanup_args_for_failure_locked(exec_ctx, h); + grpc_endpoint_shutdown(h->args->endpoint, GRPC_ERROR_REF(why)); + cleanup_args_for_failure_locked(h); } gpr_mu_unlock(&h->mu); GRPC_ERROR_UNREF(why); } -static void security_handshaker_do_handshake(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker, +static void security_handshaker_do_handshake(grpc_handshaker* handshaker, grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, grpc_handshaker_args* args) { @@ -407,14 +390,13 @@ static void security_handshaker_do_handshake(grpc_exec_ctx* exec_ctx, h->args = args; h->on_handshake_done = on_handshake_done; gpr_ref(&h->refs); - size_t bytes_received_size = - move_read_buffer_into_handshake_buffer(exec_ctx, h); - grpc_error* error = do_handshaker_next_locked( - exec_ctx, h, h->handshake_buffer, bytes_received_size); + size_t bytes_received_size = move_read_buffer_into_handshake_buffer(h); + grpc_error* error = + do_handshaker_next_locked(h, h->handshake_buffer, bytes_received_size); if (error != GRPC_ERROR_NONE) { - security_handshake_failed_locked(exec_ctx, h, error); + security_handshake_failed_locked(h, error); gpr_mu_unlock(&h->mu); - security_handshaker_unref(exec_ctx, h); + security_handshaker_unref(h); return; } gpr_mu_unlock(&h->mu); @@ -425,8 +407,7 @@ static const grpc_handshaker_vtable security_handshaker_vtable = { security_handshaker_do_handshake}; static grpc_handshaker* security_handshaker_create( - grpc_exec_ctx* exec_ctx, tsi_handshaker* handshaker, - grpc_security_connector* connector) { + tsi_handshaker* handshaker, grpc_security_connector* connector) { security_handshaker* h = (security_handshaker*)gpr_zalloc(sizeof(security_handshaker)); grpc_handshaker_init(&security_handshaker_vtable, &h->base); @@ -452,23 +433,20 @@ static grpc_handshaker* security_handshaker_create( // fail_handshaker // -static void fail_handshaker_destroy(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker) { +static void fail_handshaker_destroy(grpc_handshaker* handshaker) { gpr_free(handshaker); } -static void fail_handshaker_shutdown(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker, +static void fail_handshaker_shutdown(grpc_handshaker* handshaker, grpc_error* why) { GRPC_ERROR_UNREF(why); } -static void fail_handshaker_do_handshake(grpc_exec_ctx* exec_ctx, - grpc_handshaker* handshaker, +static void fail_handshaker_do_handshake(grpc_handshaker* handshaker, grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, grpc_handshaker_args* args) { - GRPC_CLOSURE_SCHED(exec_ctx, on_handshake_done, + GRPC_CLOSURE_SCHED(on_handshake_done, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Failed to create security handshaker")); } @@ -488,27 +466,27 @@ static grpc_handshaker* fail_handshaker_create() { // static void client_handshaker_factory_add_handshakers( - grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* handshaker_factory, - const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr) { + grpc_handshaker_factory* handshaker_factory, const grpc_channel_args* args, + grpc_handshake_manager* handshake_mgr) { grpc_channel_security_connector* security_connector = (grpc_channel_security_connector*)grpc_security_connector_find_in_args( args); - grpc_channel_security_connector_add_handshakers(exec_ctx, security_connector, + grpc_channel_security_connector_add_handshakers(security_connector, handshake_mgr); } static void server_handshaker_factory_add_handshakers( - grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* hf, - const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr) { + grpc_handshaker_factory* hf, const grpc_channel_args* args, + grpc_handshake_manager* handshake_mgr) { grpc_server_security_connector* security_connector = (grpc_server_security_connector*)grpc_security_connector_find_in_args( args); - grpc_server_security_connector_add_handshakers(exec_ctx, security_connector, + grpc_server_security_connector_add_handshakers(security_connector, handshake_mgr); } static void handshaker_factory_destroy( - grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* handshaker_factory) {} + grpc_handshaker_factory* handshaker_factory) {} static const grpc_handshaker_factory_vtable client_handshaker_factory_vtable = { client_handshaker_factory_add_handshakers, handshaker_factory_destroy}; @@ -527,14 +505,13 @@ static grpc_handshaker_factory server_handshaker_factory = { // grpc_handshaker* grpc_security_handshaker_create( - grpc_exec_ctx* exec_ctx, tsi_handshaker* handshaker, - grpc_security_connector* connector) { + tsi_handshaker* handshaker, grpc_security_connector* connector) { // If no TSI handshaker was created, return a handshaker that always fails. // Otherwise, return a real security handshaker. if (handshaker == nullptr) { return fail_handshaker_create(); } else { - return security_handshaker_create(exec_ctx, handshaker, connector); + return security_handshaker_create(handshaker, connector); } } diff --git a/src/core/lib/security/transport/security_handshaker.h b/src/core/lib/security/transport/security_handshaker.h index 6c3a0510cee..6cd6446b5a5 100644 --- a/src/core/lib/security/transport/security_handshaker.h +++ b/src/core/lib/security/transport/security_handshaker.h @@ -25,8 +25,7 @@ /// Creates a security handshaker using \a handshaker. grpc_handshaker* grpc_security_handshaker_create( - grpc_exec_ctx* exec_ctx, tsi_handshaker* handshaker, - grpc_security_connector* connector); + tsi_handshaker* handshaker, grpc_security_connector* connector); /// Registers security handshaker factories. void grpc_security_register_handshaker_factories(); diff --git a/src/core/lib/security/transport/server_auth_filter.cc b/src/core/lib/security/transport/server_auth_filter.cc index 9cf368acd01..73653f2a668 100644 --- a/src/core/lib/security/transport/server_auth_filter.cc +++ b/src/core/lib/security/transport/server_auth_filter.cc @@ -73,8 +73,7 @@ static grpc_metadata_array metadata_batch_to_md_array( return result; } -static grpc_filtered_mdelem remove_consumed_md(grpc_exec_ctx* exec_ctx, - void* user_data, +static grpc_filtered_mdelem remove_consumed_md(void* user_data, grpc_mdelem md) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; @@ -88,8 +87,7 @@ static grpc_filtered_mdelem remove_consumed_md(grpc_exec_ctx* exec_ctx, return GRPC_FILTERED_MDELEM(md); } -static void on_md_processing_done_inner(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static void on_md_processing_done_inner(grpc_call_element* elem, const grpc_metadata* consumed_md, size_t num_consumed_md, const grpc_metadata* response_md, @@ -107,11 +105,10 @@ static void on_md_processing_done_inner(grpc_exec_ctx* exec_ctx, calld->consumed_md = consumed_md; calld->num_consumed_md = num_consumed_md; error = grpc_metadata_batch_filter( - exec_ctx, batch->payload->recv_initial_metadata.recv_initial_metadata, + batch->payload->recv_initial_metadata.recv_initial_metadata, remove_consumed_md, elem, "Response metadata filtering error"); } - GRPC_CLOSURE_SCHED(exec_ctx, calld->original_recv_initial_metadata_ready, - error); + GRPC_CLOSURE_SCHED(calld->original_recv_initial_metadata_ready, error); } // Called from application code. @@ -121,7 +118,7 @@ static void on_md_processing_done( grpc_status_code status, const char* error_details) { grpc_call_element* elem = (grpc_call_element*)user_data; call_data* calld = (call_data*)elem->call_data; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; // If the call was not cancelled while we were in flight, process the result. if (gpr_atm_full_cas(&calld->state, (gpr_atm)STATE_INIT, (gpr_atm)STATE_DONE)) { @@ -134,34 +131,32 @@ static void on_md_processing_done( GRPC_ERROR_CREATE_FROM_COPIED_STRING(error_details), GRPC_ERROR_INT_GRPC_STATUS, status); } - on_md_processing_done_inner(&exec_ctx, elem, consumed_md, num_consumed_md, - response_md, num_response_md, error); + on_md_processing_done_inner(elem, consumed_md, num_consumed_md, response_md, + num_response_md, error); } // Clean up. for (size_t i = 0; i < calld->md.count; i++) { - grpc_slice_unref_internal(&exec_ctx, calld->md.metadata[i].key); - grpc_slice_unref_internal(&exec_ctx, calld->md.metadata[i].value); + grpc_slice_unref_internal(calld->md.metadata[i].key); + grpc_slice_unref_internal(calld->md.metadata[i].value); } grpc_metadata_array_destroy(&calld->md); - GRPC_CALL_STACK_UNREF(&exec_ctx, calld->owning_call, "server_auth_metadata"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_CALL_STACK_UNREF(calld->owning_call, "server_auth_metadata"); } -static void cancel_call(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void cancel_call(void* arg, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; // If the result was not already processed, invoke the callback now. if (error != GRPC_ERROR_NONE && gpr_atm_full_cas(&calld->state, (gpr_atm)STATE_INIT, (gpr_atm)STATE_CANCELLED)) { - on_md_processing_done_inner(exec_ctx, elem, nullptr, 0, nullptr, 0, + on_md_processing_done_inner(elem, nullptr, 0, nullptr, 0, GRPC_ERROR_REF(error)); } - GRPC_CALL_STACK_UNREF(exec_ctx, calld->owning_call, "cancel_call"); + GRPC_CALL_STACK_UNREF(calld->owning_call, "cancel_call"); } -static void recv_initial_metadata_ready(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void recv_initial_metadata_ready(void* arg, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; @@ -173,7 +168,7 @@ static void recv_initial_metadata_ready(grpc_exec_ctx* exec_ctx, void* arg, GRPC_CALL_STACK_REF(calld->owning_call, "cancel_call"); GRPC_CLOSURE_INIT(&calld->cancel_closure, cancel_call, elem, grpc_schedule_on_exec_ctx); - grpc_call_combiner_set_notify_on_cancel(exec_ctx, calld->call_combiner, + grpc_call_combiner_set_notify_on_cancel(calld->call_combiner, &calld->cancel_closure); GRPC_CALL_STACK_REF(calld->owning_call, "server_auth_metadata"); calld->md = metadata_batch_to_md_array( @@ -184,13 +179,12 @@ static void recv_initial_metadata_ready(grpc_exec_ctx* exec_ctx, void* arg, return; } } - GRPC_CLOSURE_RUN(exec_ctx, calld->original_recv_initial_metadata_ready, + GRPC_CLOSURE_RUN(calld->original_recv_initial_metadata_ready, GRPC_ERROR_REF(error)); } static void auth_start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* batch) { + grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { call_data* calld = (call_data*)elem->call_data; if (batch->recv_initial_metadata) { // Inject our callback. @@ -200,12 +194,11 @@ static void auth_start_transport_stream_op_batch( batch->payload->recv_initial_metadata.recv_initial_metadata_ready = &calld->recv_initial_metadata_ready; } - grpc_call_next_op(exec_ctx, elem, batch); + grpc_call_next_op(elem, batch); } /* Constructor for call_data */ -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; @@ -231,13 +224,12 @@ static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, } /* Destructor for call_data */ -static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) {} /* Constructor for channel_data */ -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { GPR_ASSERT(!args->is_last); channel_data* chand = (channel_data*)elem->channel_data; @@ -253,11 +245,10 @@ static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, } /* Destructor for channel data */ -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) { +static void destroy_channel_elem(grpc_channel_element* elem) { channel_data* chand = (channel_data*)elem->channel_data; GRPC_AUTH_CONTEXT_UNREF(chand->auth_context, "server_auth_filter"); - grpc_server_credentials_unref(exec_ctx, chand->creds); + grpc_server_credentials_unref(chand->creds); } const grpc_channel_filter grpc_server_auth_filter = { diff --git a/src/core/lib/slice/b64.cc b/src/core/lib/slice/b64.cc index fe7a86ef842..f36b13ef1b1 100644 --- a/src/core/lib/slice/b64.cc +++ b/src/core/lib/slice/b64.cc @@ -122,9 +122,8 @@ void grpc_base64_encode_core(char* result, const void* vdata, size_t data_size, result[current - result] = '\0'; } -grpc_slice grpc_base64_decode(grpc_exec_ctx* exec_ctx, const char* b64, - int url_safe) { - return grpc_base64_decode_with_len(exec_ctx, b64, strlen(b64), url_safe); +grpc_slice grpc_base64_decode(const char* b64, int url_safe) { + return grpc_base64_decode_with_len(b64, strlen(b64), url_safe); } static void decode_one_char(const unsigned char* codes, unsigned char* result, @@ -185,8 +184,8 @@ static int decode_group(const unsigned char* codes, size_t num_codes, return 1; } -grpc_slice grpc_base64_decode_with_len(grpc_exec_ctx* exec_ctx, const char* b64, - size_t b64_len, int url_safe) { +grpc_slice grpc_base64_decode_with_len(const char* b64, size_t b64_len, + int url_safe) { grpc_slice result = GRPC_SLICE_MALLOC(b64_len); unsigned char* current = GRPC_SLICE_START_PTR(result); size_t result_size = 0; @@ -231,6 +230,6 @@ grpc_slice grpc_base64_decode_with_len(grpc_exec_ctx* exec_ctx, const char* b64, return result; fail: - grpc_slice_unref_internal(exec_ctx, result); + grpc_slice_unref_internal(result); return grpc_empty_slice(); } diff --git a/src/core/lib/slice/b64.h b/src/core/lib/slice/b64.h index f86c1d99010..17e7306303d 100644 --- a/src/core/lib/slice/b64.h +++ b/src/core/lib/slice/b64.h @@ -40,11 +40,10 @@ void grpc_base64_encode_core(char* result, const void* vdata, size_t data_size, /* Decodes data according to the base64 specification. Returns an empty slice in case of failure. */ -grpc_slice grpc_base64_decode(grpc_exec_ctx* exec_ctx, const char* b64, - int url_safe); +grpc_slice grpc_base64_decode(const char* b64, int url_safe); /* Same as above except that the length is provided by the caller. */ -grpc_slice grpc_base64_decode_with_len(grpc_exec_ctx* exec_ctx, const char* b64, - size_t b64_len, int url_safe); +grpc_slice grpc_base64_decode_with_len(const char* b64, size_t b64_len, + int url_safe); #endif /* GRPC_CORE_LIB_SLICE_B64_H */ diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc index bbaf87ba23d..1eb15290eb0 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc @@ -54,9 +54,9 @@ grpc_slice grpc_slice_ref_internal(grpc_slice slice) { return slice; } -void grpc_slice_unref_internal(grpc_exec_ctx* exec_ctx, grpc_slice slice) { +void grpc_slice_unref_internal(grpc_slice slice) { if (slice.refcount) { - slice.refcount->vtable->unref(exec_ctx, slice.refcount); + slice.refcount->vtable->unref(slice.refcount); } } @@ -67,15 +67,14 @@ grpc_slice grpc_slice_ref(grpc_slice slice) { /* Public API */ void grpc_slice_unref(grpc_slice slice) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_unref_internal(&exec_ctx, slice); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_slice_unref_internal(slice); } /* grpc_slice_from_static_string support structure - a refcount that does nothing */ static void noop_ref(void* unused) {} -static void noop_unref(grpc_exec_ctx* exec_ctx, void* unused) {} +static void noop_unref(void* unused) {} static const grpc_slice_refcount_vtable noop_refcount_vtable = { noop_ref, noop_unref, grpc_slice_default_eq_impl, @@ -109,7 +108,7 @@ static void new_slice_ref(void* p) { gpr_ref(&r->refs); } -static void new_slice_unref(grpc_exec_ctx* exec_ctx, void* p) { +static void new_slice_unref(void* p) { new_slice_refcount* r = (new_slice_refcount*)p; if (gpr_unref(&r->refs)) { r->user_destroy(r->user_data); @@ -159,7 +158,7 @@ static void new_with_len_ref(void* p) { gpr_ref(&r->refs); } -static void new_with_len_unref(grpc_exec_ctx* exec_ctx, void* p) { +static void new_with_len_unref(void* p) { new_with_len_slice_refcount* r = (new_with_len_slice_refcount*)p; if (gpr_unref(&r->refs)) { r->user_destroy(r->user_data, r->user_length); @@ -210,7 +209,7 @@ static void malloc_ref(void* p) { gpr_ref(&r->refs); } -static void malloc_unref(grpc_exec_ctx* exec_ctx, void* p) { +static void malloc_unref(void* p) { malloc_refcount* r = (malloc_refcount*)p; if (gpr_unref(&r->refs)) { gpr_free(r); diff --git a/src/core/lib/slice/slice_buffer.cc b/src/core/lib/slice/slice_buffer.cc index 5db54dad91e..33ec2af683c 100644 --- a/src/core/lib/slice/slice_buffer.cc +++ b/src/core/lib/slice/slice_buffer.cc @@ -65,18 +65,16 @@ void grpc_slice_buffer_init(grpc_slice_buffer* sb) { sb->base_slices = sb->slices = sb->inlined; } -void grpc_slice_buffer_destroy_internal(grpc_exec_ctx* exec_ctx, - grpc_slice_buffer* sb) { - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, sb); +void grpc_slice_buffer_destroy_internal(grpc_slice_buffer* sb) { + grpc_slice_buffer_reset_and_unref_internal(sb); if (sb->base_slices != sb->inlined) { gpr_free(sb->base_slices); } } void grpc_slice_buffer_destroy(grpc_slice_buffer* sb) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_buffer_destroy_internal(&exec_ctx, sb); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_slice_buffer_destroy_internal(sb); } uint8_t* grpc_slice_buffer_tiny_add(grpc_slice_buffer* sb, size_t n) { @@ -163,11 +161,10 @@ void grpc_slice_buffer_pop(grpc_slice_buffer* sb) { } } -void grpc_slice_buffer_reset_and_unref_internal(grpc_exec_ctx* exec_ctx, - grpc_slice_buffer* sb) { +void grpc_slice_buffer_reset_and_unref_internal(grpc_slice_buffer* sb) { size_t i; for (i = 0; i < sb->count; i++) { - grpc_slice_unref_internal(exec_ctx, sb->slices[i]); + grpc_slice_unref_internal(sb->slices[i]); } sb->count = 0; @@ -175,9 +172,8 @@ void grpc_slice_buffer_reset_and_unref_internal(grpc_exec_ctx* exec_ctx, } void grpc_slice_buffer_reset_and_unref(grpc_slice_buffer* sb) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, sb); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_slice_buffer_reset_and_unref_internal(sb); } void grpc_slice_buffer_swap(grpc_slice_buffer* a, grpc_slice_buffer* b) { @@ -289,8 +285,7 @@ void grpc_slice_buffer_move_first_no_ref(grpc_slice_buffer* src, size_t n, slice_buffer_move_first_maybe_ref(src, n, dst, false); } -void grpc_slice_buffer_move_first_into_buffer(grpc_exec_ctx* exec_ctx, - grpc_slice_buffer* src, size_t n, +void grpc_slice_buffer_move_first_into_buffer(grpc_slice_buffer* src, size_t n, void* dst) { char* dstp = (char*)dst; GPR_ASSERT(src->length >= n); @@ -305,13 +300,13 @@ void grpc_slice_buffer_move_first_into_buffer(grpc_exec_ctx* exec_ctx, n = 0; } else if (slice_len == n) { memcpy(dstp, GRPC_SLICE_START_PTR(slice), n); - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); n = 0; } else { memcpy(dstp, GRPC_SLICE_START_PTR(slice), slice_len); dstp += slice_len; n -= slice_len; - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(slice); } } } diff --git a/src/core/lib/slice/slice_hash_table.cc b/src/core/lib/slice/slice_hash_table.cc index 8f8e5a6b34a..89340eff846 100644 --- a/src/core/lib/slice/slice_hash_table.cc +++ b/src/core/lib/slice/slice_hash_table.cc @@ -27,7 +27,7 @@ struct grpc_slice_hash_table { gpr_refcount refs; - void (*destroy_value)(grpc_exec_ctx* exec_ctx, void* value); + void (*destroy_value)(void* value); int (*value_cmp)(void* a, void* b); size_t size; size_t max_num_probes; @@ -58,8 +58,7 @@ static void grpc_slice_hash_table_add(grpc_slice_hash_table* table, grpc_slice_hash_table* grpc_slice_hash_table_create( size_t num_entries, grpc_slice_hash_table_entry* entries, - void (*destroy_value)(grpc_exec_ctx* exec_ctx, void* value), - int (*value_cmp)(void* a, void* b)) { + void (*destroy_value)(void* value), int (*value_cmp)(void* a, void* b)) { grpc_slice_hash_table* table = (grpc_slice_hash_table*)gpr_zalloc(sizeof(*table)); gpr_ref_init(&table->refs, 1); @@ -81,14 +80,13 @@ grpc_slice_hash_table* grpc_slice_hash_table_ref(grpc_slice_hash_table* table) { return table; } -void grpc_slice_hash_table_unref(grpc_exec_ctx* exec_ctx, - grpc_slice_hash_table* table) { +void grpc_slice_hash_table_unref(grpc_slice_hash_table* table) { if (table != nullptr && gpr_unref(&table->refs)) { for (size_t i = 0; i < table->size; ++i) { grpc_slice_hash_table_entry* entry = &table->entries[i]; if (!is_empty(entry)) { - grpc_slice_unref_internal(exec_ctx, entry->key); - table->destroy_value(exec_ctx, entry->value); + grpc_slice_unref_internal(entry->key); + table->destroy_value(entry->value); } } gpr_free(table->entries); diff --git a/src/core/lib/slice/slice_hash_table.h b/src/core/lib/slice/slice_hash_table.h index 85102bd67d7..db69da662a0 100644 --- a/src/core/lib/slice/slice_hash_table.h +++ b/src/core/lib/slice/slice_hash_table.h @@ -46,12 +46,10 @@ typedef struct grpc_slice_hash_table_entry { will be used. */ grpc_slice_hash_table* grpc_slice_hash_table_create( size_t num_entries, grpc_slice_hash_table_entry* entries, - void (*destroy_value)(grpc_exec_ctx* exec_ctx, void* value), - int (*value_cmp)(void* a, void* b)); + void (*destroy_value)(void* value), int (*value_cmp)(void* a, void* b)); grpc_slice_hash_table* grpc_slice_hash_table_ref(grpc_slice_hash_table* table); -void grpc_slice_hash_table_unref(grpc_exec_ctx* exec_ctx, - grpc_slice_hash_table* table); +void grpc_slice_hash_table_unref(grpc_slice_hash_table* table); /** Returns the value from \a table associated with \a key. Returns NULL if \a key is not found. */ diff --git a/src/core/lib/slice/slice_intern.cc b/src/core/lib/slice/slice_intern.cc index e8949135c08..c578c6d9de1 100644 --- a/src/core/lib/slice/slice_intern.cc +++ b/src/core/lib/slice/slice_intern.cc @@ -90,7 +90,7 @@ static void interned_slice_destroy(interned_slice_refcount* s) { gpr_mu_unlock(&shard->mu); } -static void interned_slice_unref(grpc_exec_ctx* exec_ctx, void* p) { +static void interned_slice_unref(void* p) { interned_slice_refcount* s = (interned_slice_refcount*)p; if (1 == gpr_atm_full_fetch_add(&s->refcnt, -1)) { interned_slice_destroy(s); @@ -101,9 +101,8 @@ static void interned_slice_sub_ref(void* p) { interned_slice_ref(((char*)p) - offsetof(interned_slice_refcount, sub)); } -static void interned_slice_sub_unref(grpc_exec_ctx* exec_ctx, void* p) { - interned_slice_unref(exec_ctx, - ((char*)p) - offsetof(interned_slice_refcount, sub)); +static void interned_slice_sub_unref(void* p) { + interned_slice_unref(((char*)p) - offsetof(interned_slice_refcount, sub)); } static uint32_t interned_slice_hash(grpc_slice slice) { diff --git a/src/core/lib/slice/slice_internal.h b/src/core/lib/slice/slice_internal.h index ed0070d375c..4e9ab802611 100644 --- a/src/core/lib/slice/slice_internal.h +++ b/src/core/lib/slice/slice_internal.h @@ -25,14 +25,11 @@ #include "src/core/lib/iomgr/exec_ctx.h" grpc_slice grpc_slice_ref_internal(grpc_slice slice); -void grpc_slice_unref_internal(grpc_exec_ctx* exec_ctx, grpc_slice slice); -void grpc_slice_buffer_reset_and_unref_internal(grpc_exec_ctx* exec_ctx, - grpc_slice_buffer* sb); -void grpc_slice_buffer_partial_unref_internal(grpc_exec_ctx* exec_ctx, - grpc_slice_buffer* sb, +void grpc_slice_unref_internal(grpc_slice slice); +void grpc_slice_buffer_reset_and_unref_internal(grpc_slice_buffer* sb); +void grpc_slice_buffer_partial_unref_internal(grpc_slice_buffer* sb, size_t idx); -void grpc_slice_buffer_destroy_internal(grpc_exec_ctx* exec_ctx, - grpc_slice_buffer* sb); +void grpc_slice_buffer_destroy_internal(grpc_slice_buffer* sb); /* Check if a slice is interned */ bool grpc_slice_is_interned(grpc_slice slice); diff --git a/src/core/lib/surface/alarm.cc b/src/core/lib/surface/alarm.cc index b1c9f7b1640..f6ea016c333 100644 --- a/src/core/lib/surface/alarm.cc +++ b/src/core/lib/surface/alarm.cc @@ -45,11 +45,11 @@ static void alarm_ref(grpc_alarm* alarm) { gpr_ref(&alarm->refs); } static void alarm_unref(grpc_alarm* alarm) { if (gpr_unref(&alarm->refs)) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; if (alarm->cq != nullptr) { - GRPC_CQ_INTERNAL_UNREF(&exec_ctx, alarm->cq, "alarm"); + GRPC_CQ_INTERNAL_UNREF(alarm->cq, "alarm"); } - grpc_exec_ctx_finish(&exec_ctx); + gpr_free(alarm); } } @@ -80,20 +80,19 @@ static void alarm_unref_dbg(grpc_alarm* alarm, const char* reason, } #endif -static void alarm_end_completion(grpc_exec_ctx* exec_ctx, void* arg, - grpc_cq_completion* c) { +static void alarm_end_completion(void* arg, grpc_cq_completion* c) { grpc_alarm* alarm = (grpc_alarm*)arg; GRPC_ALARM_UNREF(alarm, "dequeue-end-op"); } -static void alarm_cb(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void alarm_cb(void* arg, grpc_error* error) { grpc_alarm* alarm = (grpc_alarm*)arg; /* We are queuing an op on completion queue. This means, the alarm's structure cannot be destroyed until the op is dequeued. Adding an extra ref here and unref'ing when the op is dequeued will achieve this */ GRPC_ALARM_REF(alarm, "queue-end-op"); - grpc_cq_end_op(exec_ctx, alarm->cq, alarm->tag, error, alarm_end_completion, + grpc_cq_end_op(alarm->cq, alarm->tag, error, alarm_end_completion, (void*)alarm, &alarm->completion); } @@ -116,22 +115,20 @@ grpc_alarm* grpc_alarm_create(void* reserved) { void grpc_alarm_set(grpc_alarm* alarm, grpc_completion_queue* cq, gpr_timespec deadline, void* tag, void* reserved) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GRPC_CQ_INTERNAL_REF(cq, "alarm"); alarm->cq = cq; alarm->tag = tag; GPR_ASSERT(grpc_cq_begin_op(cq, tag)); - grpc_timer_init(&exec_ctx, &alarm->alarm, - grpc_timespec_to_millis_round_up(deadline), &alarm->on_alarm); - grpc_exec_ctx_finish(&exec_ctx); + grpc_timer_init(&alarm->alarm, grpc_timespec_to_millis_round_up(deadline), + &alarm->on_alarm); } void grpc_alarm_cancel(grpc_alarm* alarm, void* reserved) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_timer_cancel(&exec_ctx, &alarm->alarm); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_timer_cancel(&alarm->alarm); } void grpc_alarm_destroy(grpc_alarm* alarm, void* reserved) { diff --git a/src/core/lib/surface/byte_buffer.cc b/src/core/lib/surface/byte_buffer.cc index 9e0636b4cea..e4c2a4a4c22 100644 --- a/src/core/lib/surface/byte_buffer.cc +++ b/src/core/lib/surface/byte_buffer.cc @@ -71,14 +71,13 @@ grpc_byte_buffer* grpc_byte_buffer_copy(grpc_byte_buffer* bb) { void grpc_byte_buffer_destroy(grpc_byte_buffer* bb) { if (!bb) return; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; switch (bb->type) { case GRPC_BB_RAW: - grpc_slice_buffer_destroy_internal(&exec_ctx, &bb->data.raw.slice_buffer); + grpc_slice_buffer_destroy_internal(&bb->data.raw.slice_buffer); break; } gpr_free(bb); - grpc_exec_ctx_finish(&exec_ctx); } size_t grpc_byte_buffer_length(grpc_byte_buffer* bb) { diff --git a/src/core/lib/surface/byte_buffer_reader.cc b/src/core/lib/surface/byte_buffer_reader.cc index 001227a2aa0..81a48e95fcc 100644 --- a/src/core/lib/surface/byte_buffer_reader.cc +++ b/src/core/lib/surface/byte_buffer_reader.cc @@ -42,15 +42,14 @@ static int is_compressed(grpc_byte_buffer* buffer) { int grpc_byte_buffer_reader_init(grpc_byte_buffer_reader* reader, grpc_byte_buffer* buffer) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_slice_buffer decompressed_slices_buffer; reader->buffer_in = buffer; switch (reader->buffer_in->type) { case GRPC_BB_RAW: grpc_slice_buffer_init(&decompressed_slices_buffer); if (is_compressed(reader->buffer_in)) { - if (grpc_msg_decompress(&exec_ctx, - reader->buffer_in->data.raw.compression, + if (grpc_msg_decompress(reader->buffer_in->data.raw.compression, &reader->buffer_in->data.raw.slice_buffer, &decompressed_slices_buffer) == 0) { gpr_log(GPR_ERROR, @@ -64,15 +63,14 @@ int grpc_byte_buffer_reader_init(grpc_byte_buffer_reader* reader, grpc_raw_byte_buffer_create(decompressed_slices_buffer.slices, decompressed_slices_buffer.count); } - grpc_slice_buffer_destroy_internal(&exec_ctx, - &decompressed_slices_buffer); + grpc_slice_buffer_destroy_internal(&decompressed_slices_buffer); } else { /* not compressed, use the input buffer as output */ reader->buffer_out = reader->buffer_in; } reader->current.index = 0; break; } - grpc_exec_ctx_finish(&exec_ctx); + return 1; } @@ -112,14 +110,14 @@ grpc_slice grpc_byte_buffer_reader_readall(grpc_byte_buffer_reader* reader) { grpc_slice out_slice = GRPC_SLICE_MALLOC(input_size); uint8_t* const outbuf = GRPC_SLICE_START_PTR(out_slice); /* just an alias */ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (grpc_byte_buffer_reader_next(reader, &in_slice) != 0) { const size_t slice_length = GRPC_SLICE_LENGTH(in_slice); memcpy(&(outbuf[bytes_read]), GRPC_SLICE_START_PTR(in_slice), slice_length); bytes_read += slice_length; - grpc_slice_unref_internal(&exec_ctx, in_slice); + grpc_slice_unref_internal(in_slice); GPR_ASSERT(bytes_read <= input_size); } - grpc_exec_ctx_finish(&exec_ctx); + return out_slice; } diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index a2eb02bd857..a457aaa7a2f 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -270,30 +270,25 @@ grpc_core::TraceFlag grpc_compression_trace(false, "compression"); #define CALL_FROM_TOP_ELEM(top_elem) \ CALL_FROM_CALL_STACK(grpc_call_stack_from_top_element(top_elem)) -static void execute_batch(grpc_exec_ctx* exec_ctx, grpc_call* call, - grpc_transport_stream_op_batch* op, +static void execute_batch(grpc_call* call, grpc_transport_stream_op_batch* op, grpc_closure* start_batch_closure); -static void cancel_with_status(grpc_exec_ctx* exec_ctx, grpc_call* c, - status_source source, grpc_status_code status, +static void cancel_with_status(grpc_call* c, status_source source, + grpc_status_code status, const char* description); -static void cancel_with_error(grpc_exec_ctx* exec_ctx, grpc_call* c, - status_source source, grpc_error* error); -static void destroy_call(grpc_exec_ctx* exec_ctx, void* call_stack, - grpc_error* error); -static void receiving_slice_ready(grpc_exec_ctx* exec_ctx, void* bctlp, - grpc_error* error); -static void get_final_status(grpc_exec_ctx* exec_ctx, grpc_call* call, - void (*set_value)(grpc_status_code code, - void* user_data), - void* set_value_user_data, grpc_slice* details, - const char** error_string); +static void cancel_with_error(grpc_call* c, status_source source, + grpc_error* error); +static void destroy_call(void* call_stack, grpc_error* error); +static void receiving_slice_ready(void* bctlp, grpc_error* error); +static void get_final_status( + grpc_call* call, void (*set_value)(grpc_status_code code, void* user_data), + void* set_value_user_data, grpc_slice* details, const char** error_string); static void set_status_value_directly(grpc_status_code status, void* dest); -static void set_status_from_error(grpc_exec_ctx* exec_ctx, grpc_call* call, - status_source source, grpc_error* error); -static void process_data_after_md(grpc_exec_ctx* exec_ctx, batch_control* bctl); -static void post_batch_completion(grpc_exec_ctx* exec_ctx, batch_control* bctl); -static void add_batch_error(grpc_exec_ctx* exec_ctx, batch_control* bctl, - grpc_error* error, bool has_cancelled); +static void set_status_from_error(grpc_call* call, status_source source, + grpc_error* error); +static void process_data_after_md(batch_control* bctl); +static void post_batch_completion(batch_control* bctl); +static void add_batch_error(batch_control* bctl, grpc_error* error, + bool has_cancelled); static void add_init_error(grpc_error** composite, grpc_error* new_err) { if (new_err == GRPC_ERROR_NONE) return; @@ -311,7 +306,8 @@ static parent_call* get_or_create_parent_call(grpc_call* call) { if (p == nullptr) { p = (parent_call*)gpr_arena_alloc(call->arena, sizeof(*p)); gpr_mu_init(&p->child_list_mu); - if (!gpr_atm_rel_cas(&call->parent_call_atm, (gpr_atm)NULL, (gpr_atm)p)) { + if (!gpr_atm_rel_cas(&call->parent_call_atm, (gpr_atm) nullptr, + (gpr_atm)p)) { gpr_mu_destroy(&p->child_list_mu); p = (parent_call*)gpr_atm_acq_load(&call->parent_call_atm); } @@ -323,8 +319,7 @@ static parent_call* get_parent_call(grpc_call* call) { return (parent_call*)gpr_atm_acq_load(&call->parent_call_atm); } -grpc_error* grpc_call_create(grpc_exec_ctx* exec_ctx, - const grpc_call_create_args* args, +grpc_error* grpc_call_create(const grpc_call_create_args* args, grpc_call** out_call) { size_t i, j; grpc_error* error = GRPC_ERROR_NONE; @@ -333,7 +328,7 @@ grpc_error* grpc_call_create(grpc_exec_ctx* exec_ctx, grpc_call* call; GPR_TIMER_BEGIN("grpc_call_create", 0); size_t initial_size = grpc_channel_get_call_size_estimate(args->channel); - GRPC_STATS_INC_CALL_INITIAL_SIZE(exec_ctx, initial_size); + GRPC_STATS_INC_CALL_INITIAL_SIZE(initial_size); gpr_arena* arena = gpr_arena_create(initial_size); call = (grpc_call*)gpr_arena_alloc( arena, sizeof(grpc_call) + channel_stack->call_stack_size); @@ -348,9 +343,9 @@ grpc_error* grpc_call_create(grpc_exec_ctx* exec_ctx, GPR_BITSET(&call->encodings_accepted_by_peer, GRPC_COMPRESS_NONE); call->is_client = args->server_transport_data == nullptr; if (call->is_client) { - GRPC_STATS_INC_CLIENT_CALLS_CREATED(exec_ctx); + GRPC_STATS_INC_CLIENT_CALLS_CREATED(); } else { - GRPC_STATS_INC_SERVER_CALLS_CREATED(exec_ctx); + GRPC_STATS_INC_SERVER_CALLS_CREATED(); } call->stream_op_payload.context = call->context; grpc_slice path = grpc_empty_slice(); @@ -445,15 +440,13 @@ grpc_error* grpc_call_create(grpc_exec_ctx* exec_ctx, send_deadline, call->arena, &call->call_combiner}; - add_init_error(&error, grpc_call_stack_init(exec_ctx, channel_stack, 1, - destroy_call, call, &call_args)); + add_init_error(&error, grpc_call_stack_init(channel_stack, 1, destroy_call, + call, &call_args)); if (error != GRPC_ERROR_NONE) { - cancel_with_error(exec_ctx, call, STATUS_FROM_SURFACE, - GRPC_ERROR_REF(error)); + cancel_with_error(call, STATUS_FROM_SURFACE, GRPC_ERROR_REF(error)); } if (immediately_cancel) { - cancel_with_error(exec_ctx, call, STATUS_FROM_API_OVERRIDE, - GRPC_ERROR_CANCELLED); + cancel_with_error(call, STATUS_FROM_API_OVERRIDE, GRPC_ERROR_CANCELLED); } if (args->cq != nullptr) { GPR_ASSERT( @@ -468,17 +461,17 @@ grpc_error* grpc_call_create(grpc_exec_ctx* exec_ctx, args->pollset_set_alternative); } if (!grpc_polling_entity_is_empty(&call->pollent)) { - grpc_call_stack_set_pollset_or_pollset_set( - exec_ctx, CALL_STACK_FROM_CALL(call), &call->pollent); + grpc_call_stack_set_pollset_or_pollset_set(CALL_STACK_FROM_CALL(call), + &call->pollent); } - grpc_slice_unref_internal(exec_ctx, path); + grpc_slice_unref_internal(path); GPR_TIMER_END("grpc_call_create", 0); return error; } -void grpc_call_set_completion_queue(grpc_exec_ctx* exec_ctx, grpc_call* call, +void grpc_call_set_completion_queue(grpc_call* call, grpc_completion_queue* cq) { GPR_ASSERT(cq); @@ -489,8 +482,8 @@ void grpc_call_set_completion_queue(grpc_exec_ctx* exec_ctx, grpc_call* call, call->cq = cq; GRPC_CQ_INTERNAL_REF(cq, "bind"); call->pollent = grpc_polling_entity_create_from_pollset(grpc_cq_pollset(cq)); - grpc_call_stack_set_pollset_or_pollset_set( - exec_ctx, CALL_STACK_FROM_CALL(call), &call->pollent); + grpc_call_stack_set_pollset_or_pollset_set(CALL_STACK_FROM_CALL(call), + &call->pollent); } #ifndef NDEBUG @@ -503,40 +496,38 @@ void grpc_call_set_completion_queue(grpc_exec_ctx* exec_ctx, grpc_call* call, void grpc_call_internal_ref(grpc_call* c REF_ARG) { GRPC_CALL_STACK_REF(CALL_STACK_FROM_CALL(c), REF_REASON); } -void grpc_call_internal_unref(grpc_exec_ctx* exec_ctx, grpc_call* c REF_ARG) { - GRPC_CALL_STACK_UNREF(exec_ctx, CALL_STACK_FROM_CALL(c), REF_REASON); +void grpc_call_internal_unref(grpc_call* c REF_ARG) { + GRPC_CALL_STACK_UNREF(CALL_STACK_FROM_CALL(c), REF_REASON); } -static void release_call(grpc_exec_ctx* exec_ctx, void* call, - grpc_error* error) { +static void release_call(void* call, grpc_error* error) { grpc_call* c = (grpc_call*)call; grpc_channel* channel = c->channel; grpc_call_combiner_destroy(&c->call_combiner); gpr_free((char*)c->peer_string); grpc_channel_update_call_size_estimate(channel, gpr_arena_destroy(c->arena)); - GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, channel, "call"); + GRPC_CHANNEL_INTERNAL_UNREF(channel, "call"); } static void set_status_value_directly(grpc_status_code status, void* dest); -static void destroy_call(grpc_exec_ctx* exec_ctx, void* call, - grpc_error* error) { +static void destroy_call(void* call, grpc_error* error) { size_t i; int ii; grpc_call* c = (grpc_call*)call; GPR_TIMER_BEGIN("destroy_call", 0); for (i = 0; i < 2; i++) { grpc_metadata_batch_destroy( - exec_ctx, &c->metadata_batch[1 /* is_receiving */][i /* is_initial */]); + &c->metadata_batch[1 /* is_receiving */][i /* is_initial */]); } if (c->receiving_stream != nullptr) { - grpc_byte_stream_destroy(exec_ctx, c->receiving_stream); + grpc_byte_stream_destroy(c->receiving_stream); } parent_call* pc = get_parent_call(c); if (pc != nullptr) { gpr_mu_destroy(&pc->child_list_mu); } for (ii = 0; ii < c->send_extra_metadata_count; ii++) { - GRPC_MDELEM_UNREF(exec_ctx, c->send_extra_metadata[ii].md); + GRPC_MDELEM_UNREF(c->send_extra_metadata[ii].md); } for (i = 0; i < GRPC_CONTEXT_COUNT; i++) { if (c->context[i].destroy) { @@ -544,12 +535,11 @@ static void destroy_call(grpc_exec_ctx* exec_ctx, void* call, } } if (c->cq) { - GRPC_CQ_INTERNAL_UNREF(exec_ctx, c->cq, "bind"); + GRPC_CQ_INTERNAL_UNREF(c->cq, "bind"); } - get_final_status(exec_ctx, c, set_status_value_directly, - &c->final_info.final_status, nullptr, - c->final_info.error_string); + get_final_status(c, set_status_value_directly, &c->final_info.final_status, + nullptr, c->final_info.error_string); c->final_info.stats.latency = gpr_time_sub(gpr_now(GPR_CLOCK_MONOTONIC), c->start_time); @@ -558,7 +548,7 @@ static void destroy_call(grpc_exec_ctx* exec_ctx, void* call, unpack_received_status(gpr_atm_acq_load(&c->status[i])).error); } - grpc_call_stack_destroy(exec_ctx, CALL_STACK_FROM_CALL(c), &c->final_info, + grpc_call_stack_destroy(CALL_STACK_FROM_CALL(c), &c->final_info, GRPC_CLOSURE_INIT(&c->release_call, release_call, c, grpc_schedule_on_exec_ctx)); GPR_TIMER_END("destroy_call", 0); @@ -570,7 +560,7 @@ void grpc_call_unref(grpc_call* c) { if (!gpr_unref(&c->ext_ref)) return; child_call* cc = c->child; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GPR_TIMER_BEGIN("grpc_call_unref", 0); GRPC_API_TRACE("grpc_call_unref(c=%p)", 1, (c)); @@ -587,7 +577,7 @@ void grpc_call_unref(grpc_call* c) { cc->sibling_prev->child->sibling_next = cc->sibling_next; cc->sibling_next->child->sibling_prev = cc->sibling_prev; gpr_mu_unlock(&pc->child_list_mu); - GRPC_CALL_INTERNAL_UNREF(&exec_ctx, cc->parent, "child"); + GRPC_CALL_INTERNAL_UNREF(cc->parent, "child"); } GPR_ASSERT(!c->destroy_called); @@ -595,53 +585,49 @@ void grpc_call_unref(grpc_call* c) { bool cancel = gpr_atm_acq_load(&c->any_ops_sent_atm) != 0 && gpr_atm_acq_load(&c->received_final_op_atm) == 0; if (cancel) { - cancel_with_error(&exec_ctx, c, STATUS_FROM_API_OVERRIDE, - GRPC_ERROR_CANCELLED); + cancel_with_error(c, STATUS_FROM_API_OVERRIDE, GRPC_ERROR_CANCELLED); } else { // Unset the call combiner cancellation closure. This has the // effect of scheduling the previously set cancellation closure, if // any, so that it can release any internal references it may be // holding to the call stack. - grpc_call_combiner_set_notify_on_cancel(&exec_ctx, &c->call_combiner, - nullptr); + grpc_call_combiner_set_notify_on_cancel(&c->call_combiner, nullptr); } - GRPC_CALL_INTERNAL_UNREF(&exec_ctx, c, "destroy"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_CALL_INTERNAL_UNREF(c, "destroy"); + GPR_TIMER_END("grpc_call_unref", 0); } grpc_call_error grpc_call_cancel(grpc_call* call, void* reserved) { GRPC_API_TRACE("grpc_call_cancel(call=%p, reserved=%p)", 2, (call, reserved)); GPR_ASSERT(!reserved); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - cancel_with_error(&exec_ctx, call, STATUS_FROM_API_OVERRIDE, - GRPC_ERROR_CANCELLED); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + cancel_with_error(call, STATUS_FROM_API_OVERRIDE, GRPC_ERROR_CANCELLED); + return GRPC_CALL_OK; } // This is called via the call combiner to start sending a batch down // the filter stack. -static void execute_batch_in_call_combiner(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* ignored) { +static void execute_batch_in_call_combiner(void* arg, grpc_error* ignored) { grpc_transport_stream_op_batch* batch = (grpc_transport_stream_op_batch*)arg; grpc_call* call = (grpc_call*)batch->handler_private.extra_arg; GPR_TIMER_BEGIN("execute_batch", 0); grpc_call_element* elem = CALL_ELEM_FROM_CALL(call, 0); GRPC_CALL_LOG_OP(GPR_INFO, elem, batch); - elem->filter->start_transport_stream_op_batch(exec_ctx, elem, batch); + elem->filter->start_transport_stream_op_batch(elem, batch); GPR_TIMER_END("execute_batch", 0); } // start_batch_closure points to a caller-allocated closure to be used // for entering the call combiner. -static void execute_batch(grpc_exec_ctx* exec_ctx, grpc_call* call, +static void execute_batch(grpc_call* call, grpc_transport_stream_op_batch* batch, grpc_closure* start_batch_closure) { batch->handler_private.extra_arg = call; GRPC_CLOSURE_INIT(start_batch_closure, execute_batch_in_call_combiner, batch, grpc_schedule_on_exec_ctx); - GRPC_CALL_COMBINER_START(exec_ctx, &call->call_combiner, start_batch_closure, + GRPC_CALL_COMBINER_START(&call->call_combiner, start_batch_closure, GRPC_ERROR_NONE, "executing batch"); } @@ -665,15 +651,14 @@ grpc_call_error grpc_call_cancel_with_status(grpc_call* c, grpc_status_code status, const char* description, void* reserved) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE( "grpc_call_cancel_with_status(" "c=%p, status=%d, description=%s, reserved=%p)", 4, (c, (int)status, description, reserved)); GPR_ASSERT(reserved == nullptr); - cancel_with_status(&exec_ctx, c, STATUS_FROM_API_OVERRIDE, status, - description); - grpc_exec_ctx_finish(&exec_ctx); + cancel_with_status(c, STATUS_FROM_API_OVERRIDE, status, description); + return GRPC_CALL_OK; } @@ -685,24 +670,23 @@ typedef struct { // The on_complete callback used when sending a cancel_stream batch down // the filter stack. Yields the call combiner when the batch is done. -static void done_termination(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void done_termination(void* arg, grpc_error* error) { cancel_state* state = (cancel_state*)arg; - GRPC_CALL_COMBINER_STOP(exec_ctx, &state->call->call_combiner, + GRPC_CALL_COMBINER_STOP(&state->call->call_combiner, "on_complete for cancel_stream op"); - GRPC_CALL_INTERNAL_UNREF(exec_ctx, state->call, "termination"); + GRPC_CALL_INTERNAL_UNREF(state->call, "termination"); gpr_free(state); } -static void cancel_with_error(grpc_exec_ctx* exec_ctx, grpc_call* c, - status_source source, grpc_error* error) { +static void cancel_with_error(grpc_call* c, status_source source, + grpc_error* error) { GRPC_CALL_INTERNAL_REF(c, "termination"); // Inform the call combiner of the cancellation, so that it can cancel // any in-flight asynchronous actions that may be holding the call // combiner. This ensures that the cancel_stream batch can be sent // down the filter stack in a timely manner. - grpc_call_combiner_cancel(exec_ctx, &c->call_combiner, GRPC_ERROR_REF(error)); - set_status_from_error(exec_ctx, c, source, GRPC_ERROR_REF(error)); + grpc_call_combiner_cancel(&c->call_combiner, GRPC_ERROR_REF(error)); + set_status_from_error(c, source, GRPC_ERROR_REF(error)); cancel_state* state = (cancel_state*)gpr_malloc(sizeof(*state)); state->call = c; GRPC_CLOSURE_INIT(&state->finish_batch, done_termination, state, @@ -711,7 +695,7 @@ static void cancel_with_error(grpc_exec_ctx* exec_ctx, grpc_call* c, grpc_make_transport_stream_op(&state->finish_batch); op->cancel_stream = true; op->payload->cancel_stream.cancel_error = error; - execute_batch(exec_ctx, c, op, &state->start_batch); + execute_batch(c, op, &state->start_batch); } static grpc_error* error_from_status(grpc_status_code status, @@ -725,11 +709,10 @@ static grpc_error* error_from_status(grpc_status_code status, GRPC_ERROR_INT_GRPC_STATUS, status); } -static void cancel_with_status(grpc_exec_ctx* exec_ctx, grpc_call* c, - status_source source, grpc_status_code status, +static void cancel_with_status(grpc_call* c, status_source source, + grpc_status_code status, const char* description) { - cancel_with_error(exec_ctx, c, source, - error_from_status(status, description)); + cancel_with_error(c, source, error_from_status(status, description)); } /******************************************************************************* @@ -737,14 +720,13 @@ static void cancel_with_status(grpc_exec_ctx* exec_ctx, grpc_call* c, */ static bool get_final_status_from( - grpc_exec_ctx* exec_ctx, grpc_call* call, grpc_error* error, - bool allow_ok_status, + grpc_call* call, grpc_error* error, bool allow_ok_status, void (*set_value)(grpc_status_code code, void* user_data), void* set_value_user_data, grpc_slice* details, const char** error_string) { grpc_status_code code; grpc_slice slice = grpc_empty_slice(); - grpc_error_get_status(exec_ctx, error, call->send_deadline, &code, &slice, - nullptr, error_string); + grpc_error_get_status(error, call->send_deadline, &code, &slice, nullptr, + error_string); if (code == GRPC_STATUS_OK && !allow_ok_status) { return false; } @@ -756,11 +738,9 @@ static bool get_final_status_from( return true; } -static void get_final_status(grpc_exec_ctx* exec_ctx, grpc_call* call, - void (*set_value)(grpc_status_code code, - void* user_data), - void* set_value_user_data, grpc_slice* details, - const char** error_string) { +static void get_final_status( + grpc_call* call, void (*set_value)(grpc_status_code code, void* user_data), + void* set_value_user_data, grpc_slice* details, const char** error_string) { int i; received_status status[STATUS_SOURCE_COUNT]; for (i = 0; i < STATUS_SOURCE_COUNT; i++) { @@ -782,9 +762,9 @@ static void get_final_status(grpc_exec_ctx* exec_ctx, grpc_call* call, for (i = 0; i < STATUS_SOURCE_COUNT; i++) { if (status[i].is_set && grpc_error_has_clear_grpc_status(status[i].error)) { - if (get_final_status_from(exec_ctx, call, status[i].error, - allow_ok_status != 0, set_value, - set_value_user_data, details, error_string)) { + if (get_final_status_from(call, status[i].error, allow_ok_status != 0, + set_value, set_value_user_data, details, + error_string)) { return; } } @@ -792,9 +772,9 @@ static void get_final_status(grpc_exec_ctx* exec_ctx, grpc_call* call, /* If no clearly defined status exists, search for 'anything' */ for (i = 0; i < STATUS_SOURCE_COUNT; i++) { if (status[i].is_set) { - if (get_final_status_from(exec_ctx, call, status[i].error, - allow_ok_status != 0, set_value, - set_value_user_data, details, error_string)) { + if (get_final_status_from(call, status[i].error, allow_ok_status != 0, + set_value, set_value_user_data, details, + error_string)) { return; } } @@ -808,8 +788,8 @@ static void get_final_status(grpc_exec_ctx* exec_ctx, grpc_call* call, } } -static void set_status_from_error(grpc_exec_ctx* exec_ctx, grpc_call* call, - status_source source, grpc_error* error) { +static void set_status_from_error(grpc_call* call, status_source source, + grpc_error* error) { if (!gpr_atm_rel_cas(&call->status[source], pack_received_status({false, GRPC_ERROR_NONE}), pack_received_status({true, error}))) { @@ -861,8 +841,7 @@ uint32_t grpc_call_test_only_get_message_flags(grpc_call* call) { static void destroy_encodings_accepted_by_peer(void* p) { return; } -static void set_encodings_accepted_by_peer(grpc_exec_ctx* exec_ctx, - grpc_call* call, grpc_mdelem mdel) { +static void set_encodings_accepted_by_peer(grpc_call* call, grpc_mdelem mdel) { size_t i; grpc_compression_algorithm algorithm; grpc_slice_buffer accept_encoding_parts; @@ -900,15 +879,14 @@ static void set_encodings_accepted_by_peer(grpc_exec_ctx* exec_ctx, } } - grpc_slice_buffer_destroy_internal(exec_ctx, &accept_encoding_parts); + grpc_slice_buffer_destroy_internal(&accept_encoding_parts); grpc_mdelem_set_user_data( mdel, destroy_encodings_accepted_by_peer, (void*)(((uintptr_t)call->encodings_accepted_by_peer) + 1)); } -static void set_stream_encodings_accepted_by_peer(grpc_exec_ctx* exec_ctx, - grpc_call* call, +static void set_stream_encodings_accepted_by_peer(grpc_call* call, grpc_mdelem mdel) { size_t i; grpc_stream_compression_algorithm algorithm; @@ -946,7 +924,7 @@ static void set_stream_encodings_accepted_by_peer(grpc_exec_ctx* exec_ctx, } } - grpc_slice_buffer_destroy_internal(exec_ctx, &accept_encoding_parts); + grpc_slice_buffer_destroy_internal(&accept_encoding_parts); grpc_mdelem_set_user_data( mdel, destroy_encodings_accepted_by_peer, @@ -984,10 +962,12 @@ static grpc_metadata* get_md_elem(grpc_metadata* metadata, return res; } -static int prepare_application_metadata( - grpc_exec_ctx* exec_ctx, grpc_call* call, int count, - grpc_metadata* metadata, int is_trailing, int prepend_extra_metadata, - grpc_metadata* additional_metadata, int additional_metadata_count) { +static int prepare_application_metadata(grpc_call* call, int count, + grpc_metadata* metadata, + int is_trailing, + int prepend_extra_metadata, + grpc_metadata* additional_metadata, + int additional_metadata_count) { int total_count = count + additional_metadata_count; int i; grpc_metadata_batch* batch = @@ -1006,14 +986,14 @@ static int prepare_application_metadata( grpc_validate_header_nonbin_value_is_legal(md->value))) { break; } - l->md = grpc_mdelem_from_grpc_metadata(exec_ctx, (grpc_metadata*)md); + l->md = grpc_mdelem_from_grpc_metadata((grpc_metadata*)md); } if (i != total_count) { for (int j = 0; j < i; j++) { const grpc_metadata* md = get_md_elem(metadata, additional_metadata, j, count); grpc_linked_mdelem* l = linked_from_md(md); - GRPC_MDELEM_UNREF(exec_ctx, l->md); + GRPC_MDELEM_UNREF(l->md); } return 0; } @@ -1024,16 +1004,16 @@ static int prepare_application_metadata( for (i = 0; i < call->send_extra_metadata_count; i++) { GRPC_LOG_IF_ERROR("prepare_application_metadata", grpc_metadata_batch_link_tail( - exec_ctx, batch, &call->send_extra_metadata[i])); + batch, &call->send_extra_metadata[i])); } } } for (i = 0; i < total_count; i++) { grpc_metadata* md = get_md_elem(metadata, additional_metadata, i, count); grpc_linked_mdelem* l = linked_from_md(md); - grpc_error* error = grpc_metadata_batch_link_tail(exec_ctx, batch, l); + grpc_error* error = grpc_metadata_batch_link_tail(batch, l); if (error != GRPC_ERROR_NONE) { - GRPC_MDELEM_UNREF(exec_ctx, l->md); + GRPC_MDELEM_UNREF(l->md); } GRPC_LOG_IF_ERROR("prepare_application_metadata", error); } @@ -1120,46 +1100,43 @@ static void publish_app_metadata(grpc_call* call, grpc_metadata_batch* b, GPR_TIMER_END("publish_app_metadata", 0); } -static void recv_initial_filter(grpc_exec_ctx* exec_ctx, grpc_call* call, - grpc_metadata_batch* b) { +static void recv_initial_filter(grpc_call* call, grpc_metadata_batch* b) { if (b->idx.named.content_encoding != nullptr) { if (b->idx.named.grpc_encoding != nullptr) { gpr_log(GPR_ERROR, "Received both content-encoding and grpc-encoding header. " "Ignoring grpc-encoding."); - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.grpc_encoding); + grpc_metadata_batch_remove(b, b->idx.named.grpc_encoding); } GPR_TIMER_BEGIN("incoming_stream_compression_algorithm", 0); set_incoming_stream_compression_algorithm( call, decode_stream_compression(b->idx.named.content_encoding->md)); GPR_TIMER_END("incoming_stream_compression_algorithm", 0); - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.content_encoding); + grpc_metadata_batch_remove(b, b->idx.named.content_encoding); } else if (b->idx.named.grpc_encoding != nullptr) { GPR_TIMER_BEGIN("incoming_compression_algorithm", 0); set_incoming_compression_algorithm( call, decode_compression(b->idx.named.grpc_encoding->md)); GPR_TIMER_END("incoming_compression_algorithm", 0); - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.grpc_encoding); + grpc_metadata_batch_remove(b, b->idx.named.grpc_encoding); } if (b->idx.named.grpc_accept_encoding != nullptr) { GPR_TIMER_BEGIN("encodings_accepted_by_peer", 0); - set_encodings_accepted_by_peer(exec_ctx, call, - b->idx.named.grpc_accept_encoding->md); - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.grpc_accept_encoding); + set_encodings_accepted_by_peer(call, b->idx.named.grpc_accept_encoding->md); + grpc_metadata_batch_remove(b, b->idx.named.grpc_accept_encoding); GPR_TIMER_END("encodings_accepted_by_peer", 0); } if (b->idx.named.accept_encoding != nullptr) { GPR_TIMER_BEGIN("stream_encodings_accepted_by_peer", 0); - set_stream_encodings_accepted_by_peer(exec_ctx, call, + set_stream_encodings_accepted_by_peer(call, b->idx.named.accept_encoding->md); - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.accept_encoding); + grpc_metadata_batch_remove(b, b->idx.named.accept_encoding); GPR_TIMER_END("stream_encodings_accepted_by_peer", 0); } publish_app_metadata(call, b, false); } -static void recv_trailing_filter(grpc_exec_ctx* exec_ctx, void* args, - grpc_metadata_batch* b) { +static void recv_trailing_filter(void* args, grpc_metadata_batch* b) { grpc_call* call = (grpc_call*)args; if (b->idx.named.grpc_status != nullptr) { uint32_t status_code = decode_status(b->idx.named.grpc_status->md); @@ -1174,13 +1151,13 @@ static void recv_trailing_filter(grpc_exec_ctx* exec_ctx, void* args, error = grpc_error_set_str( error, GRPC_ERROR_STR_GRPC_MESSAGE, grpc_slice_ref_internal(GRPC_MDVALUE(b->idx.named.grpc_message->md))); - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.grpc_message); + grpc_metadata_batch_remove(b, b->idx.named.grpc_message); } else if (error != GRPC_ERROR_NONE) { error = grpc_error_set_str(error, GRPC_ERROR_STR_GRPC_MESSAGE, grpc_empty_slice()); } - set_status_from_error(exec_ctx, call, STATUS_FROM_WIRE, error); - grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.grpc_status); + set_status_from_error(call, STATUS_FROM_WIRE, error); + grpc_metadata_batch_remove(b, b->idx.named.grpc_status); } publish_app_metadata(call, b, true); } @@ -1257,12 +1234,12 @@ static batch_control* allocate_batch_control(grpc_call* call, return bctl; } -static void finish_batch_completion(grpc_exec_ctx* exec_ctx, void* user_data, +static void finish_batch_completion(void* user_data, grpc_cq_completion* storage) { batch_control* bctl = (batch_control*)user_data; grpc_call* call = bctl->call; bctl->call = nullptr; - GRPC_CALL_INTERNAL_UNREF(exec_ctx, call, "completion"); + GRPC_CALL_INTERNAL_UNREF(call, "completion"); } static grpc_error* consolidate_batch_errors(batch_control* bctl) { @@ -1286,15 +1263,13 @@ static grpc_error* consolidate_batch_errors(batch_control* bctl) { } } -static void post_batch_completion(grpc_exec_ctx* exec_ctx, - batch_control* bctl) { +static void post_batch_completion(batch_control* bctl) { grpc_call* next_child_call; grpc_call* call = bctl->call; grpc_error* error = consolidate_batch_errors(bctl); if (bctl->op.send_initial_metadata) { grpc_metadata_batch_destroy( - exec_ctx, &call->metadata_batch[0 /* is_receiving */][0 /* is_trailing */]); } if (bctl->op.send_message) { @@ -1302,13 +1277,12 @@ static void post_batch_completion(grpc_exec_ctx* exec_ctx, } if (bctl->op.send_trailing_metadata) { grpc_metadata_batch_destroy( - exec_ctx, &call->metadata_batch[0 /* is_receiving */][1 /* is_trailing */]); } if (bctl->op.recv_trailing_metadata) { grpc_metadata_batch* md = &call->metadata_batch[1 /* is_receiving */][1 /* is_trailing */]; - recv_trailing_filter(exec_ctx, call, md); + recv_trailing_filter(call, md); /* propagate cancellation to any interested children */ gpr_atm_rel_store(&call->received_final_op_atm, 1); @@ -1322,9 +1296,9 @@ static void post_batch_completion(grpc_exec_ctx* exec_ctx, next_child_call = child->child->sibling_next; if (child->cancellation_is_inherited) { GRPC_CALL_INTERNAL_REF(child, "propagate_cancel"); - cancel_with_error(exec_ctx, child, STATUS_FROM_API_OVERRIDE, + cancel_with_error(child, STATUS_FROM_API_OVERRIDE, GRPC_ERROR_CANCELLED); - GRPC_CALL_INTERNAL_UNREF(exec_ctx, child, "propagate_cancel"); + GRPC_CALL_INTERNAL_UNREF(child, "propagate_cancel"); } child = next_child_call; } while (child != pc->first_child); @@ -1333,12 +1307,12 @@ static void post_batch_completion(grpc_exec_ctx* exec_ctx, } if (call->is_client) { - get_final_status(exec_ctx, call, set_status_value_directly, + get_final_status(call, set_status_value_directly, call->final_op.client.status, call->final_op.client.status_details, call->final_op.client.error_string); } else { - get_final_status(exec_ctx, call, set_cancelled_value, + get_final_status(call, set_cancelled_value, call->final_op.server.cancelled, nullptr, nullptr); } @@ -1354,25 +1328,24 @@ static void post_batch_completion(grpc_exec_ctx* exec_ctx, if (bctl->completion_data.notify_tag.is_closure) { /* unrefs bctl->error */ bctl->call = nullptr; - GRPC_CLOSURE_RUN( - exec_ctx, (grpc_closure*)bctl->completion_data.notify_tag.tag, error); - GRPC_CALL_INTERNAL_UNREF(exec_ctx, call, "completion"); + GRPC_CLOSURE_RUN((grpc_closure*)bctl->completion_data.notify_tag.tag, + error); + GRPC_CALL_INTERNAL_UNREF(call, "completion"); } else { /* unrefs bctl->error */ - grpc_cq_end_op( - exec_ctx, bctl->call->cq, bctl->completion_data.notify_tag.tag, error, - finish_batch_completion, bctl, &bctl->completion_data.cq_completion); + grpc_cq_end_op(bctl->call->cq, bctl->completion_data.notify_tag.tag, error, + finish_batch_completion, bctl, + &bctl->completion_data.cq_completion); } } -static void finish_batch_step(grpc_exec_ctx* exec_ctx, batch_control* bctl) { +static void finish_batch_step(batch_control* bctl) { if (gpr_unref(&bctl->steps_to_complete)) { - post_batch_completion(exec_ctx, bctl); + post_batch_completion(bctl); } } -static void continue_receiving_slices(grpc_exec_ctx* exec_ctx, - batch_control* bctl) { +static void continue_receiving_slices(batch_control* bctl) { grpc_error* error; grpc_call* call = bctl->call; for (;;) { @@ -1380,25 +1353,25 @@ static void continue_receiving_slices(grpc_exec_ctx* exec_ctx, (*call->receiving_buffer)->data.raw.slice_buffer.length; if (remaining == 0) { call->receiving_message = 0; - grpc_byte_stream_destroy(exec_ctx, call->receiving_stream); + grpc_byte_stream_destroy(call->receiving_stream); call->receiving_stream = nullptr; - finish_batch_step(exec_ctx, bctl); + finish_batch_step(bctl); return; } - if (grpc_byte_stream_next(exec_ctx, call->receiving_stream, remaining, + if (grpc_byte_stream_next(call->receiving_stream, remaining, &call->receiving_slice_ready)) { - error = grpc_byte_stream_pull(exec_ctx, call->receiving_stream, - &call->receiving_slice); + error = + grpc_byte_stream_pull(call->receiving_stream, &call->receiving_slice); if (error == GRPC_ERROR_NONE) { grpc_slice_buffer_add(&(*call->receiving_buffer)->data.raw.slice_buffer, call->receiving_slice); } else { - grpc_byte_stream_destroy(exec_ctx, call->receiving_stream); + grpc_byte_stream_destroy(call->receiving_stream); call->receiving_stream = nullptr; grpc_byte_buffer_destroy(*call->receiving_buffer); *call->receiving_buffer = nullptr; call->receiving_message = 0; - finish_batch_step(exec_ctx, bctl); + finish_batch_step(bctl); return; } } else { @@ -1407,8 +1380,7 @@ static void continue_receiving_slices(grpc_exec_ctx* exec_ctx, } } -static void receiving_slice_ready(grpc_exec_ctx* exec_ctx, void* bctlp, - grpc_error* error) { +static void receiving_slice_ready(void* bctlp, grpc_error* error) { batch_control* bctl = (batch_control*)bctlp; grpc_call* call = bctl->call; grpc_byte_stream* bs = call->receiving_stream; @@ -1416,11 +1388,11 @@ static void receiving_slice_ready(grpc_exec_ctx* exec_ctx, void* bctlp, if (error == GRPC_ERROR_NONE) { grpc_slice slice; - error = grpc_byte_stream_pull(exec_ctx, bs, &slice); + error = grpc_byte_stream_pull(bs, &slice); if (error == GRPC_ERROR_NONE) { grpc_slice_buffer_add(&(*call->receiving_buffer)->data.raw.slice_buffer, slice); - continue_receiving_slices(exec_ctx, bctl); + continue_receiving_slices(bctl); } else { /* Error returned by grpc_byte_stream_pull needs to be released manually */ @@ -1432,25 +1404,24 @@ static void receiving_slice_ready(grpc_exec_ctx* exec_ctx, void* bctlp, if (grpc_trace_operation_failures.enabled()) { GRPC_LOG_IF_ERROR("receiving_slice_ready", GRPC_ERROR_REF(error)); } - grpc_byte_stream_destroy(exec_ctx, call->receiving_stream); + grpc_byte_stream_destroy(call->receiving_stream); call->receiving_stream = nullptr; grpc_byte_buffer_destroy(*call->receiving_buffer); *call->receiving_buffer = nullptr; call->receiving_message = 0; - finish_batch_step(exec_ctx, bctl); + finish_batch_step(bctl); if (release_error) { GRPC_ERROR_UNREF(error); } } } -static void process_data_after_md(grpc_exec_ctx* exec_ctx, - batch_control* bctl) { +static void process_data_after_md(batch_control* bctl) { grpc_call* call = bctl->call; if (call->receiving_stream == nullptr) { *call->receiving_buffer = nullptr; call->receiving_message = 0; - finish_batch_step(exec_ctx, bctl); + finish_batch_step(bctl); } else { call->test_only_last_message_flags = call->receiving_stream->flags; if ((call->receiving_stream->flags & GRPC_WRITE_INTERNAL_COMPRESS) && @@ -1462,46 +1433,42 @@ static void process_data_after_md(grpc_exec_ctx* exec_ctx, } GRPC_CLOSURE_INIT(&call->receiving_slice_ready, receiving_slice_ready, bctl, grpc_schedule_on_exec_ctx); - continue_receiving_slices(exec_ctx, bctl); + continue_receiving_slices(bctl); } } -static void receiving_stream_ready(grpc_exec_ctx* exec_ctx, void* bctlp, - grpc_error* error) { +static void receiving_stream_ready(void* bctlp, grpc_error* error) { batch_control* bctl = (batch_control*)bctlp; grpc_call* call = bctl->call; if (error != GRPC_ERROR_NONE) { if (call->receiving_stream != nullptr) { - grpc_byte_stream_destroy(exec_ctx, call->receiving_stream); + grpc_byte_stream_destroy(call->receiving_stream); call->receiving_stream = nullptr; } - add_batch_error(exec_ctx, bctl, GRPC_ERROR_REF(error), true); - cancel_with_error(exec_ctx, call, STATUS_FROM_SURFACE, - GRPC_ERROR_REF(error)); + add_batch_error(bctl, GRPC_ERROR_REF(error), true); + cancel_with_error(call, STATUS_FROM_SURFACE, GRPC_ERROR_REF(error)); } /* If recv_state is RECV_NONE, we will save the batch_control * object with rel_cas, and will not use it after the cas. Its corresponding * acq_load is in receiving_initial_metadata_ready() */ if (error != GRPC_ERROR_NONE || call->receiving_stream == nullptr || !gpr_atm_rel_cas(&call->recv_state, RECV_NONE, (gpr_atm)bctlp)) { - process_data_after_md(exec_ctx, bctl); + process_data_after_md(bctl); } } // The recv_message_ready callback used when sending a batch containing // a recv_message op down the filter stack. Yields the call combiner // before processing the received message. -static void receiving_stream_ready_in_call_combiner(grpc_exec_ctx* exec_ctx, - void* bctlp, +static void receiving_stream_ready_in_call_combiner(void* bctlp, grpc_error* error) { batch_control* bctl = (batch_control*)bctlp; grpc_call* call = bctl->call; - GRPC_CALL_COMBINER_STOP(exec_ctx, &call->call_combiner, "recv_message_ready"); - receiving_stream_ready(exec_ctx, bctlp, error); + GRPC_CALL_COMBINER_STOP(&call->call_combiner, "recv_message_ready"); + receiving_stream_ready(bctlp, error); } -static void validate_filtered_metadata(grpc_exec_ctx* exec_ctx, - batch_control* bctl) { +static void validate_filtered_metadata(batch_control* bctl) { grpc_call* call = bctl->call; /* validate compression algorithms */ if (call->incoming_stream_compression_algorithm != @@ -1515,8 +1482,8 @@ static void validate_filtered_metadata(grpc_exec_ctx* exec_ctx, gpr_asprintf(&error_msg, "Invalid stream compression algorithm value '%d'.", algo); gpr_log(GPR_ERROR, "%s", error_msg); - cancel_with_status(exec_ctx, call, STATUS_FROM_SURFACE, - GRPC_STATUS_UNIMPLEMENTED, error_msg); + cancel_with_status(call, STATUS_FROM_SURFACE, GRPC_STATUS_UNIMPLEMENTED, + error_msg); } else if (grpc_compression_options_is_stream_compression_algorithm_enabled( &compression_options, algo) == 0) { /* check if algorithm is supported by current channel config */ @@ -1525,8 +1492,8 @@ static void validate_filtered_metadata(grpc_exec_ctx* exec_ctx, gpr_asprintf(&error_msg, "Stream compression algorithm '%s' is disabled.", algo_name); gpr_log(GPR_ERROR, "%s", error_msg); - cancel_with_status(exec_ctx, call, STATUS_FROM_SURFACE, - GRPC_STATUS_UNIMPLEMENTED, error_msg); + cancel_with_status(call, STATUS_FROM_SURFACE, GRPC_STATUS_UNIMPLEMENTED, + error_msg); } gpr_free(error_msg); @@ -1556,8 +1523,8 @@ static void validate_filtered_metadata(grpc_exec_ctx* exec_ctx, gpr_asprintf(&error_msg, "Invalid compression algorithm value '%d'.", algo); gpr_log(GPR_ERROR, "%s", error_msg); - cancel_with_status(exec_ctx, call, STATUS_FROM_SURFACE, - GRPC_STATUS_UNIMPLEMENTED, error_msg); + cancel_with_status(call, STATUS_FROM_SURFACE, GRPC_STATUS_UNIMPLEMENTED, + error_msg); } else if (grpc_compression_options_is_algorithm_enabled( &compression_options, algo) == 0) { /* check if algorithm is supported by current channel config */ @@ -1566,8 +1533,8 @@ static void validate_filtered_metadata(grpc_exec_ctx* exec_ctx, gpr_asprintf(&error_msg, "Compression algorithm '%s' is disabled.", algo_name); gpr_log(GPR_ERROR, "%s", error_msg); - cancel_with_status(exec_ctx, call, STATUS_FROM_SURFACE, - GRPC_STATUS_UNIMPLEMENTED, error_msg); + cancel_with_status(call, STATUS_FROM_SURFACE, GRPC_STATUS_UNIMPLEMENTED, + error_msg); } else { call->incoming_compression_algorithm = algo; } @@ -1590,34 +1557,31 @@ static void validate_filtered_metadata(grpc_exec_ctx* exec_ctx, } } -static void add_batch_error(grpc_exec_ctx* exec_ctx, batch_control* bctl, - grpc_error* error, bool has_cancelled) { +static void add_batch_error(batch_control* bctl, grpc_error* error, + bool has_cancelled) { if (error == GRPC_ERROR_NONE) return; int idx = (int)gpr_atm_full_fetch_add(&bctl->num_errors, 1); if (idx == 0 && !has_cancelled) { - cancel_with_error(exec_ctx, bctl->call, STATUS_FROM_CORE, - GRPC_ERROR_REF(error)); + cancel_with_error(bctl->call, STATUS_FROM_CORE, GRPC_ERROR_REF(error)); } bctl->errors[idx] = error; } -static void receiving_initial_metadata_ready(grpc_exec_ctx* exec_ctx, - void* bctlp, grpc_error* error) { +static void receiving_initial_metadata_ready(void* bctlp, grpc_error* error) { batch_control* bctl = (batch_control*)bctlp; grpc_call* call = bctl->call; - GRPC_CALL_COMBINER_STOP(exec_ctx, &call->call_combiner, - "recv_initial_metadata_ready"); + GRPC_CALL_COMBINER_STOP(&call->call_combiner, "recv_initial_metadata_ready"); - add_batch_error(exec_ctx, bctl, GRPC_ERROR_REF(error), false); + add_batch_error(bctl, GRPC_ERROR_REF(error), false); if (error == GRPC_ERROR_NONE) { grpc_metadata_batch* md = &call->metadata_batch[1 /* is_receiving */][0 /* is_trailing */]; - recv_initial_filter(exec_ctx, call, md); + recv_initial_filter(call, md); /* TODO(ctiller): this could be moved into recv_initial_filter now */ GPR_TIMER_BEGIN("validate_filtered_metadata", 0); - validate_filtered_metadata(exec_ctx, bctl); + validate_filtered_metadata(bctl); GPR_TIMER_END("validate_filtered_metadata", 0); if (md->deadline != GRPC_MILLIS_INF_FUTURE && !call->is_client) { @@ -1650,28 +1614,25 @@ static void receiving_initial_metadata_ready(grpc_exec_ctx* exec_ctx, } } if (saved_rsr_closure != nullptr) { - GRPC_CLOSURE_RUN(exec_ctx, saved_rsr_closure, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(saved_rsr_closure, GRPC_ERROR_REF(error)); } - finish_batch_step(exec_ctx, bctl); + finish_batch_step(bctl); } -static void finish_batch(grpc_exec_ctx* exec_ctx, void* bctlp, - grpc_error* error) { +static void finish_batch(void* bctlp, grpc_error* error) { batch_control* bctl = (batch_control*)bctlp; grpc_call* call = bctl->call; - GRPC_CALL_COMBINER_STOP(exec_ctx, &call->call_combiner, "on_complete"); - add_batch_error(exec_ctx, bctl, GRPC_ERROR_REF(error), false); - finish_batch_step(exec_ctx, bctl); + GRPC_CALL_COMBINER_STOP(&call->call_combiner, "on_complete"); + add_batch_error(bctl, GRPC_ERROR_REF(error), false); + finish_batch_step(bctl); } -static void free_no_op_completion(grpc_exec_ctx* exec_ctx, void* p, - grpc_cq_completion* completion) { +static void free_no_op_completion(void* p, grpc_cq_completion* completion) { gpr_free(completion); } -static grpc_call_error call_start_batch(grpc_exec_ctx* exec_ctx, - grpc_call* call, const grpc_op* ops, +static grpc_call_error call_start_batch(grpc_call* call, const grpc_op* ops, size_t nops, void* notify_tag, int is_notify_tag_closure) { size_t i; @@ -1689,11 +1650,10 @@ static grpc_call_error call_start_batch(grpc_exec_ctx* exec_ctx, if (!is_notify_tag_closure) { GPR_ASSERT(grpc_cq_begin_op(call->cq, notify_tag)); grpc_cq_end_op( - exec_ctx, call->cq, notify_tag, GRPC_ERROR_NONE, - free_no_op_completion, nullptr, + call->cq, notify_tag, GRPC_ERROR_NONE, free_no_op_completion, nullptr, (grpc_cq_completion*)gpr_malloc(sizeof(grpc_cq_completion))); } else { - GRPC_CLOSURE_SCHED(exec_ctx, (grpc_closure*)notify_tag, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED((grpc_closure*)notify_tag, GRPC_ERROR_NONE); } error = GRPC_CALL_OK; goto done; @@ -1793,7 +1753,7 @@ static grpc_call_error call_start_batch(grpc_exec_ctx* exec_ctx, stream_op->send_initial_metadata = true; call->sent_initial_metadata = true; if (!prepare_application_metadata( - exec_ctx, call, (int)op->data.send_initial_metadata.count, + call, (int)op->data.send_initial_metadata.count, op->data.send_initial_metadata.metadata, 0, call->is_client, &call->compression_md, (int)additional_metadata_count)) { error = GRPC_CALL_ERROR_INVALID_METADATA; @@ -1887,7 +1847,7 @@ static grpc_call_error call_start_batch(grpc_exec_ctx* exec_ctx, GPR_ASSERT(call->send_extra_metadata_count == 0); call->send_extra_metadata_count = 1; call->send_extra_metadata[0].md = grpc_channel_get_reffed_status_elem( - exec_ctx, call->channel, op->data.send_status_from_server.status); + call->channel, op->data.send_status_from_server.status); { grpc_error* override_error = GRPC_ERROR_NONE; if (op->data.send_status_from_server.status != GRPC_STATUS_OK) { @@ -1896,7 +1856,7 @@ static grpc_call_error call_start_batch(grpc_exec_ctx* exec_ctx, } if (op->data.send_status_from_server.status_details != nullptr) { call->send_extra_metadata[1].md = grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_GRPC_MESSAGE, + GRPC_MDSTR_GRPC_MESSAGE, grpc_slice_ref_internal( *op->data.send_status_from_server.status_details)); call->send_extra_metadata_count++; @@ -1907,16 +1867,15 @@ static grpc_call_error call_start_batch(grpc_exec_ctx* exec_ctx, grpc_slice_from_copied_string(msg)); gpr_free(msg); } - set_status_from_error(exec_ctx, call, STATUS_FROM_API_OVERRIDE, - override_error); + set_status_from_error(call, STATUS_FROM_API_OVERRIDE, override_error); } if (!prepare_application_metadata( - exec_ctx, call, + call, (int)op->data.send_status_from_server.trailing_metadata_count, op->data.send_status_from_server.trailing_metadata, 1, 1, nullptr, 0)) { for (int n = 0; n < call->send_extra_metadata_count; n++) { - GRPC_MDELEM_UNREF(exec_ctx, call->send_extra_metadata[n].md); + GRPC_MDELEM_UNREF(call->send_extra_metadata[n].md); } call->send_extra_metadata_count = 0; error = GRPC_CALL_ERROR_INVALID_METADATA; @@ -2045,7 +2004,7 @@ static grpc_call_error call_start_batch(grpc_exec_ctx* exec_ctx, stream_op->on_complete = &bctl->finish_batch; gpr_atm_rel_store(&call->any_ops_sent_atm, 1); - execute_batch(exec_ctx, call, stream_op, &bctl->start_batch); + execute_batch(call, stream_op, &bctl->start_batch); done: GPR_TIMER_END("grpc_call_start_batch", 0); @@ -2055,15 +2014,15 @@ done_with_error: /* reverse any mutations that occured */ if (stream_op->send_initial_metadata) { call->sent_initial_metadata = false; - grpc_metadata_batch_clear(exec_ctx, &call->metadata_batch[0][0]); + grpc_metadata_batch_clear(&call->metadata_batch[0][0]); } if (stream_op->send_message) { call->sending_message = false; - grpc_byte_stream_destroy(exec_ctx, &call->sending_stream.base); + grpc_byte_stream_destroy(&call->sending_stream.base); } if (stream_op->send_trailing_metadata) { call->sent_final_op = false; - grpc_metadata_batch_clear(exec_ctx, &call->metadata_batch[0][1]); + grpc_metadata_batch_clear(&call->metadata_batch[0][1]); } if (stream_op->recv_initial_metadata) { call->received_initial_metadata = false; @@ -2079,7 +2038,7 @@ done_with_error: grpc_call_error grpc_call_start_batch(grpc_call* call, const grpc_op* ops, size_t nops, void* tag, void* reserved) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_call_error err; GRPC_API_TRACE( @@ -2090,19 +2049,17 @@ grpc_call_error grpc_call_start_batch(grpc_call* call, const grpc_op* ops, if (reserved != nullptr) { err = GRPC_CALL_ERROR; } else { - err = call_start_batch(&exec_ctx, call, ops, nops, tag, 0); + err = call_start_batch(call, ops, nops, tag, 0); } - grpc_exec_ctx_finish(&exec_ctx); return err; } -grpc_call_error grpc_call_start_batch_and_execute(grpc_exec_ctx* exec_ctx, - grpc_call* call, +grpc_call_error grpc_call_start_batch_and_execute(grpc_call* call, const grpc_op* ops, size_t nops, grpc_closure* closure) { - return call_start_batch(exec_ctx, call, ops, nops, closure, 1); + return call_start_batch(call, ops, nops, closure, 1); } void grpc_call_context_set(grpc_call* call, grpc_context_index elem, diff --git a/src/core/lib/surface/call.h b/src/core/lib/surface/call.h index 1d2e266717f..189329ccc40 100644 --- a/src/core/lib/surface/call.h +++ b/src/core/lib/surface/call.h @@ -26,8 +26,7 @@ #include #include -typedef void (*grpc_ioreq_completion_func)(grpc_exec_ctx* exec_ctx, - grpc_call* call, int success, +typedef void (*grpc_ioreq_completion_func)(grpc_call* call, int success, void* user_data); typedef struct grpc_call_create_args { @@ -51,33 +50,28 @@ typedef struct grpc_call_create_args { /* Create a new call based on \a args. Regardless of success or failure, always returns a valid new call into *call */ -grpc_error* grpc_call_create(grpc_exec_ctx* exec_ctx, - const grpc_call_create_args* args, +grpc_error* grpc_call_create(const grpc_call_create_args* args, grpc_call** call); -void grpc_call_set_completion_queue(grpc_exec_ctx* exec_ctx, grpc_call* call, - grpc_completion_queue* cq); +void grpc_call_set_completion_queue(grpc_call* call, grpc_completion_queue* cq); #ifndef NDEBUG void grpc_call_internal_ref(grpc_call* call, const char* reason); -void grpc_call_internal_unref(grpc_exec_ctx* exec_ctx, grpc_call* call, - const char* reason); +void grpc_call_internal_unref(grpc_call* call, const char* reason); #define GRPC_CALL_INTERNAL_REF(call, reason) \ grpc_call_internal_ref(call, reason) -#define GRPC_CALL_INTERNAL_UNREF(exec_ctx, call, reason) \ - grpc_call_internal_unref(exec_ctx, call, reason) +#define GRPC_CALL_INTERNAL_UNREF(call, reason) \ + grpc_call_internal_unref(call, reason) #else void grpc_call_internal_ref(grpc_call* call); -void grpc_call_internal_unref(grpc_exec_ctx* exec_ctx, grpc_call* call); +void grpc_call_internal_unref(grpc_call* call); #define GRPC_CALL_INTERNAL_REF(call, reason) grpc_call_internal_ref(call) -#define GRPC_CALL_INTERNAL_UNREF(exec_ctx, call, reason) \ - grpc_call_internal_unref(exec_ctx, call) +#define GRPC_CALL_INTERNAL_UNREF(call, reason) grpc_call_internal_unref(call) #endif grpc_call_stack* grpc_call_get_call_stack(grpc_call* call); -grpc_call_error grpc_call_start_batch_and_execute(grpc_exec_ctx* exec_ctx, - grpc_call* call, +grpc_call_error grpc_call_start_batch_and_execute(grpc_call* call, const grpc_op* ops, size_t nops, grpc_closure* closure); diff --git a/src/core/lib/surface/call_details.cc b/src/core/lib/surface/call_details.cc index ea9208c7e32..cd0b14586a3 100644 --- a/src/core/lib/surface/call_details.cc +++ b/src/core/lib/surface/call_details.cc @@ -34,8 +34,7 @@ void grpc_call_details_init(grpc_call_details* cd) { void grpc_call_details_destroy(grpc_call_details* cd) { GRPC_API_TRACE("grpc_call_details_destroy(cd=%p)", 1, (cd)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_unref_internal(&exec_ctx, cd->method); - grpc_slice_unref_internal(&exec_ctx, cd->host); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_slice_unref_internal(cd->method); + grpc_slice_unref_internal(cd->host); } diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc index 1be734cdb78..cf5e8c2150d 100644 --- a/src/core/lib/surface/channel.cc +++ b/src/core/lib/surface/channel.cc @@ -69,23 +69,22 @@ struct grpc_channel { #define CHANNEL_FROM_TOP_ELEM(top_elem) \ CHANNEL_FROM_CHANNEL_STACK(grpc_channel_stack_from_top_element(top_elem)) -static void destroy_channel(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error); +static void destroy_channel(void* arg, grpc_error* error); grpc_channel* grpc_channel_create_with_builder( - grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, + grpc_channel_stack_builder* builder, grpc_channel_stack_type channel_stack_type) { char* target = gpr_strdup(grpc_channel_stack_builder_get_target(builder)); grpc_channel_args* args = grpc_channel_args_copy( grpc_channel_stack_builder_get_channel_arguments(builder)); grpc_channel* channel; if (channel_stack_type == GRPC_SERVER_CHANNEL) { - GRPC_STATS_INC_SERVER_CHANNELS_CREATED(exec_ctx); + GRPC_STATS_INC_SERVER_CHANNELS_CREATED(); } else { - GRPC_STATS_INC_CLIENT_CHANNELS_CREATED(exec_ctx); + GRPC_STATS_INC_CLIENT_CHANNELS_CREATED(); } grpc_error* error = grpc_channel_stack_builder_finish( - exec_ctx, builder, sizeof(grpc_channel), 1, destroy_channel, nullptr, + builder, sizeof(grpc_channel), 1, destroy_channel, nullptr, (void**)&channel); if (error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "channel stack builder failed: %s", @@ -114,10 +113,10 @@ grpc_channel* grpc_channel_create_with_builder( } else { if (!GRPC_MDISNULL(channel->default_authority)) { /* setting this takes precedence over anything else */ - GRPC_MDELEM_UNREF(exec_ctx, channel->default_authority); + GRPC_MDELEM_UNREF(channel->default_authority); } channel->default_authority = grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_AUTHORITY, + GRPC_MDSTR_AUTHORITY, grpc_slice_intern( grpc_slice_from_static_string(args->args[i].value.string))); } @@ -134,7 +133,7 @@ grpc_channel* grpc_channel_create_with_builder( GRPC_SSL_TARGET_NAME_OVERRIDE_ARG); } else { channel->default_authority = grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_AUTHORITY, + GRPC_MDSTR_AUTHORITY, grpc_slice_intern( grpc_slice_from_static_string(args->args[i].value.string))); } @@ -191,25 +190,23 @@ grpc_channel* grpc_channel_create_with_builder( } done: - grpc_channel_args_destroy(exec_ctx, args); + grpc_channel_args_destroy(args); return channel; } -grpc_channel* grpc_channel_create(grpc_exec_ctx* exec_ctx, const char* target, +grpc_channel* grpc_channel_create(const char* target, const grpc_channel_args* input_args, grpc_channel_stack_type channel_stack_type, grpc_transport* optional_transport) { grpc_channel_stack_builder* builder = grpc_channel_stack_builder_create(); - grpc_channel_stack_builder_set_channel_arguments(exec_ctx, builder, - input_args); + grpc_channel_stack_builder_set_channel_arguments(builder, input_args); grpc_channel_stack_builder_set_target(builder, target); grpc_channel_stack_builder_set_transport(builder, optional_transport); - if (!grpc_channel_init_create_stack(exec_ctx, builder, channel_stack_type)) { - grpc_channel_stack_builder_destroy(exec_ctx, builder); + if (!grpc_channel_init_create_stack(builder, channel_stack_type)) { + grpc_channel_stack_builder_destroy(builder); return nullptr; } - return grpc_channel_create_with_builder(exec_ctx, builder, - channel_stack_type); + return grpc_channel_create_with_builder(builder, channel_stack_type); } size_t grpc_channel_get_call_size_estimate(grpc_channel* channel) { @@ -251,18 +248,17 @@ char* grpc_channel_get_target(grpc_channel* channel) { void grpc_channel_get_info(grpc_channel* channel, const grpc_channel_info* channel_info) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_channel_element* elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CHANNEL(channel), 0); - elem->filter->get_channel_info(&exec_ctx, elem, channel_info); - grpc_exec_ctx_finish(&exec_ctx); + elem->filter->get_channel_info(elem, channel_info); } static grpc_call* grpc_channel_create_call_internal( - grpc_exec_ctx* exec_ctx, grpc_channel* channel, grpc_call* parent_call, - uint32_t propagation_mask, grpc_completion_queue* cq, - grpc_pollset_set* pollset_set_alternative, grpc_mdelem path_mdelem, - grpc_mdelem authority_mdelem, grpc_millis deadline) { + grpc_channel* channel, grpc_call* parent_call, uint32_t propagation_mask, + grpc_completion_queue* cq, grpc_pollset_set* pollset_set_alternative, + grpc_mdelem path_mdelem, grpc_mdelem authority_mdelem, + grpc_millis deadline) { grpc_mdelem send_metadata[2]; size_t num_metadata = 0; @@ -289,7 +285,7 @@ static grpc_call* grpc_channel_create_call_internal( args.send_deadline = deadline; grpc_call* call; - GRPC_LOG_IF_ERROR("call_create", grpc_call_create(exec_ctx, &args, &call)); + GRPC_LOG_IF_ERROR("call_create", grpc_call_create(&args, &call)); return call; } @@ -300,29 +296,27 @@ grpc_call* grpc_channel_create_call(grpc_channel* channel, grpc_slice method, const grpc_slice* host, gpr_timespec deadline, void* reserved) { GPR_ASSERT(!reserved); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_call* call = grpc_channel_create_call_internal( - &exec_ctx, channel, parent_call, propagation_mask, cq, nullptr, - grpc_mdelem_from_slices(&exec_ctx, GRPC_MDSTR_PATH, - grpc_slice_ref_internal(method)), - host != nullptr ? grpc_mdelem_from_slices(&exec_ctx, GRPC_MDSTR_AUTHORITY, + channel, parent_call, propagation_mask, cq, nullptr, + grpc_mdelem_from_slices(GRPC_MDSTR_PATH, grpc_slice_ref_internal(method)), + host != nullptr ? grpc_mdelem_from_slices(GRPC_MDSTR_AUTHORITY, grpc_slice_ref_internal(*host)) : GRPC_MDNULL, grpc_timespec_to_millis_round_up(deadline)); - grpc_exec_ctx_finish(&exec_ctx); + return call; } grpc_call* grpc_channel_create_pollset_set_call( - grpc_exec_ctx* exec_ctx, grpc_channel* channel, grpc_call* parent_call, - uint32_t propagation_mask, grpc_pollset_set* pollset_set, grpc_slice method, - const grpc_slice* host, grpc_millis deadline, void* reserved) { + grpc_channel* channel, grpc_call* parent_call, uint32_t propagation_mask, + grpc_pollset_set* pollset_set, grpc_slice method, const grpc_slice* host, + grpc_millis deadline, void* reserved) { GPR_ASSERT(!reserved); return grpc_channel_create_call_internal( - exec_ctx, channel, parent_call, propagation_mask, nullptr, pollset_set, - grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_PATH, - grpc_slice_ref_internal(method)), - host != nullptr ? grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_AUTHORITY, + channel, parent_call, propagation_mask, nullptr, pollset_set, + grpc_mdelem_from_slices(GRPC_MDSTR_PATH, grpc_slice_ref_internal(method)), + host != nullptr ? grpc_mdelem_from_slices(GRPC_MDSTR_AUTHORITY, grpc_slice_ref_internal(*host)) : GRPC_MDNULL, deadline); @@ -335,21 +329,21 @@ void* grpc_channel_register_call(grpc_channel* channel, const char* method, "grpc_channel_register_call(channel=%p, method=%s, host=%s, reserved=%p)", 4, (channel, method, host, reserved)); GPR_ASSERT(!reserved); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; rc->path = grpc_mdelem_from_slices( - &exec_ctx, GRPC_MDSTR_PATH, + GRPC_MDSTR_PATH, grpc_slice_intern(grpc_slice_from_static_string(method))); rc->authority = host ? grpc_mdelem_from_slices( - &exec_ctx, GRPC_MDSTR_AUTHORITY, + GRPC_MDSTR_AUTHORITY, grpc_slice_intern(grpc_slice_from_static_string(host))) : GRPC_MDNULL; gpr_mu_lock(&channel->registered_call_mu); rc->next = channel->registered_calls; channel->registered_calls = rc; gpr_mu_unlock(&channel->registered_call_mu); - grpc_exec_ctx_finish(&exec_ctx); + return rc; } @@ -370,12 +364,12 @@ grpc_call* grpc_channel_create_registered_call( registered_call_handle, deadline.tv_sec, deadline.tv_nsec, (int)deadline.clock_type, reserved)); GPR_ASSERT(!reserved); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_call* call = grpc_channel_create_call_internal( - &exec_ctx, channel, parent_call, propagation_mask, completion_queue, - nullptr, GRPC_MDELEM_REF(rc->path), GRPC_MDELEM_REF(rc->authority), + channel, parent_call, propagation_mask, completion_queue, nullptr, + GRPC_MDELEM_REF(rc->path), GRPC_MDELEM_REF(rc->authority), grpc_timespec_to_millis_round_up(deadline)); - grpc_exec_ctx_finish(&exec_ctx); + return call; } @@ -390,23 +384,21 @@ void grpc_channel_internal_ref(grpc_channel* c REF_ARG) { GRPC_CHANNEL_STACK_REF(CHANNEL_STACK_FROM_CHANNEL(c), REF_REASON); } -void grpc_channel_internal_unref(grpc_exec_ctx* exec_ctx, - grpc_channel* c REF_ARG) { - GRPC_CHANNEL_STACK_UNREF(exec_ctx, CHANNEL_STACK_FROM_CHANNEL(c), REF_REASON); +void grpc_channel_internal_unref(grpc_channel* c REF_ARG) { + GRPC_CHANNEL_STACK_UNREF(CHANNEL_STACK_FROM_CHANNEL(c), REF_REASON); } -static void destroy_channel(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void destroy_channel(void* arg, grpc_error* error) { grpc_channel* channel = (grpc_channel*)arg; - grpc_channel_stack_destroy(exec_ctx, CHANNEL_STACK_FROM_CHANNEL(channel)); + grpc_channel_stack_destroy(CHANNEL_STACK_FROM_CHANNEL(channel)); while (channel->registered_calls) { registered_call* rc = channel->registered_calls; channel->registered_calls = rc->next; - GRPC_MDELEM_UNREF(exec_ctx, rc->path); - GRPC_MDELEM_UNREF(exec_ctx, rc->authority); + GRPC_MDELEM_UNREF(rc->path); + GRPC_MDELEM_UNREF(rc->authority); gpr_free(rc); } - GRPC_MDELEM_UNREF(exec_ctx, channel->default_authority); + GRPC_MDELEM_UNREF(channel->default_authority); gpr_mu_destroy(&channel->registered_call_mu); gpr_free(channel->target); gpr_free(channel); @@ -415,16 +407,14 @@ static void destroy_channel(grpc_exec_ctx* exec_ctx, void* arg, void grpc_channel_destroy(grpc_channel* channel) { grpc_transport_op* op = grpc_make_transport_op(nullptr); grpc_channel_element* elem; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE("grpc_channel_destroy(channel=%p)", 1, (channel)); op->disconnect_with_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Channel Destroyed"); elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CHANNEL(channel), 0); - elem->filter->start_transport_op(&exec_ctx, elem, op); - - GRPC_CHANNEL_INTERNAL_UNREF(&exec_ctx, channel, "channel"); + elem->filter->start_transport_op(elem, op); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_CHANNEL_INTERNAL_UNREF(channel, "channel"); } grpc_channel_stack* grpc_channel_get_channel_stack(grpc_channel* channel) { @@ -436,8 +426,7 @@ grpc_compression_options grpc_channel_compression_options( return channel->compression_options; } -grpc_mdelem grpc_channel_get_reffed_status_elem(grpc_exec_ctx* exec_ctx, - grpc_channel* channel, int i) { +grpc_mdelem grpc_channel_get_reffed_status_elem(grpc_channel* channel, int i) { char tmp[GPR_LTOA_MIN_BUFSIZE]; switch (i) { case 0: @@ -448,6 +437,6 @@ grpc_mdelem grpc_channel_get_reffed_status_elem(grpc_exec_ctx* exec_ctx, return GRPC_MDELEM_GRPC_STATUS_2; } gpr_ltoa(i, tmp); - return grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_GRPC_STATUS, + return grpc_mdelem_from_slices(GRPC_MDSTR_GRPC_STATUS, grpc_slice_from_copied_string(tmp)); } diff --git a/src/core/lib/surface/channel.h b/src/core/lib/surface/channel.h index a2e53c777d6..26d8fceb2f8 100644 --- a/src/core/lib/surface/channel.h +++ b/src/core/lib/surface/channel.h @@ -23,13 +23,13 @@ #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/surface/channel_stack_type.h" -grpc_channel* grpc_channel_create(grpc_exec_ctx* exec_ctx, const char* target, +grpc_channel* grpc_channel_create(const char* target, const grpc_channel_args* args, grpc_channel_stack_type channel_stack_type, grpc_transport* optional_transport); grpc_channel* grpc_channel_create_with_builder( - grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, + grpc_channel_stack_builder* builder, grpc_channel_stack_type channel_stack_type); /** Create a call given a grpc_channel, in order to call \a method. @@ -41,9 +41,9 @@ grpc_channel* grpc_channel_create_with_builder( properties from the server call to this new client call, depending on the value of \a propagation_mask (see propagation_bits.h for possible values) */ grpc_call* grpc_channel_create_pollset_set_call( - grpc_exec_ctx* exec_ctx, grpc_channel* channel, grpc_call* parent_call, - uint32_t propagation_mask, grpc_pollset_set* pollset_set, grpc_slice method, - const grpc_slice* host, grpc_millis deadline, void* reserved); + grpc_channel* channel, grpc_call* parent_call, uint32_t propagation_mask, + grpc_pollset_set* pollset_set, grpc_slice method, const grpc_slice* host, + grpc_millis deadline, void* reserved); /** Get a (borrowed) pointer to this channels underlying channel stack */ grpc_channel_stack* grpc_channel_get_channel_stack(grpc_channel* channel); @@ -52,8 +52,7 @@ grpc_channel_stack* grpc_channel_get_channel_stack(grpc_channel* channel); status_code. The returned elem is owned by the caller. */ -grpc_mdelem grpc_channel_get_reffed_status_elem(grpc_exec_ctx* exec_ctx, - grpc_channel* channel, +grpc_mdelem grpc_channel_get_reffed_status_elem(grpc_channel* channel, int status_code); size_t grpc_channel_get_call_size_estimate(grpc_channel* channel); @@ -61,20 +60,18 @@ void grpc_channel_update_call_size_estimate(grpc_channel* channel, size_t size); #ifndef NDEBUG void grpc_channel_internal_ref(grpc_channel* channel, const char* reason); -void grpc_channel_internal_unref(grpc_exec_ctx* exec_ctx, grpc_channel* channel, - const char* reason); +void grpc_channel_internal_unref(grpc_channel* channel, const char* reason); #define GRPC_CHANNEL_INTERNAL_REF(channel, reason) \ grpc_channel_internal_ref(channel, reason) -#define GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, channel, reason) \ - grpc_channel_internal_unref(exec_ctx, channel, reason) +#define GRPC_CHANNEL_INTERNAL_UNREF(channel, reason) \ + grpc_channel_internal_unref(channel, reason) #else void grpc_channel_internal_ref(grpc_channel* channel); -void grpc_channel_internal_unref(grpc_exec_ctx* exec_ctx, - grpc_channel* channel); +void grpc_channel_internal_unref(grpc_channel* channel); #define GRPC_CHANNEL_INTERNAL_REF(channel, reason) \ grpc_channel_internal_ref(channel) -#define GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, channel, reason) \ - grpc_channel_internal_unref(exec_ctx, channel) +#define GRPC_CHANNEL_INTERNAL_UNREF(channel, reason) \ + grpc_channel_internal_unref(channel) #endif /** Return the channel's compression options. */ diff --git a/src/core/lib/surface/channel_init.cc b/src/core/lib/surface/channel_init.cc index b563537f357..95cbbbd037f 100644 --- a/src/core/lib/surface/channel_init.cc +++ b/src/core/lib/surface/channel_init.cc @@ -89,8 +89,7 @@ void grpc_channel_init_shutdown(void) { } } -bool grpc_channel_init_create_stack(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, +bool grpc_channel_init_create_stack(grpc_channel_stack_builder* builder, grpc_channel_stack_type type) { GPR_ASSERT(g_finalized); @@ -99,7 +98,7 @@ bool grpc_channel_init_create_stack(grpc_exec_ctx* exec_ctx, for (size_t i = 0; i < g_slots[type].num_slots; i++) { const stage_slot* slot = &g_slots[type].slots[i]; - if (!slot->fn(exec_ctx, builder, slot->arg)) { + if (!slot->fn(builder, slot->arg)) { return false; } } diff --git a/src/core/lib/surface/channel_init.h b/src/core/lib/surface/channel_init.h index 556ecc4147e..d702f0f325c 100644 --- a/src/core/lib/surface/channel_init.h +++ b/src/core/lib/surface/channel_init.h @@ -32,8 +32,7 @@ /// One stage of mutation: call functions against \a builder to influence the /// finally constructed channel stack -typedef bool (*grpc_channel_init_stage)(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, +typedef bool (*grpc_channel_init_stage)(grpc_channel_stack_builder* builder, void* arg); /// Global initialization of the system @@ -66,8 +65,7 @@ void grpc_channel_init_shutdown(void); /// \a optional_transport is either NULL or a constructed transport object /// Returns a pointer to the base of the memory allocated (the actual channel /// stack object will be prefix_bytes past that pointer) -bool grpc_channel_init_create_stack(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, +bool grpc_channel_init_create_stack(grpc_channel_stack_builder* builder, grpc_channel_stack_type type); #endif /* GRPC_CORE_LIB_SURFACE_CHANNEL_INIT_H */ diff --git a/src/core/lib/surface/channel_ping.cc b/src/core/lib/surface/channel_ping.cc index e8f47f01cf4..616ba9e0ac5 100644 --- a/src/core/lib/surface/channel_ping.cc +++ b/src/core/lib/surface/channel_ping.cc @@ -33,15 +33,14 @@ typedef struct { grpc_cq_completion completion_storage; } ping_result; -static void ping_destroy(grpc_exec_ctx* exec_ctx, void* arg, - grpc_cq_completion* storage) { +static void ping_destroy(void* arg, grpc_cq_completion* storage) { gpr_free(arg); } -static void ping_done(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void ping_done(void* arg, grpc_error* error) { ping_result* pr = (ping_result*)arg; - grpc_cq_end_op(exec_ctx, pr->cq, pr->tag, GRPC_ERROR_REF(error), ping_destroy, - pr, &pr->completion_storage); + grpc_cq_end_op(pr->cq, pr->tag, GRPC_ERROR_REF(error), ping_destroy, pr, + &pr->completion_storage); } void grpc_channel_ping(grpc_channel* channel, grpc_completion_queue* cq, @@ -52,7 +51,7 @@ void grpc_channel_ping(grpc_channel* channel, grpc_completion_queue* cq, ping_result* pr = (ping_result*)gpr_malloc(sizeof(*pr)); grpc_channel_element* top_elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT(reserved == nullptr); pr->tag = tag; pr->cq = cq; @@ -60,6 +59,5 @@ void grpc_channel_ping(grpc_channel* channel, grpc_completion_queue* cq, op->send_ping = &pr->closure; op->bind_pollset = grpc_cq_pollset(cq); GPR_ASSERT(grpc_cq_begin_op(cq, tag)); - top_elem->filter->start_transport_op(&exec_ctx, top_elem, op); - grpc_exec_ctx_finish(&exec_ctx); + top_elem->filter->start_transport_op(top_elem, op); } diff --git a/src/core/lib/surface/completion_queue.cc b/src/core/lib/surface/completion_queue.cc index 98d7e359437..12385b71304 100644 --- a/src/core/lib/surface/completion_queue.cc +++ b/src/core/lib/surface/completion_queue.cc @@ -62,13 +62,12 @@ typedef struct { bool can_listen; size_t (*size)(void); void (*init)(grpc_pollset* pollset, gpr_mu** mu); - grpc_error* (*kick)(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, + grpc_error* (*kick)(grpc_pollset* pollset, grpc_pollset_worker* specific_worker); - grpc_error* (*work)(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - grpc_pollset_worker** worker, grpc_millis deadline); - void (*shutdown)(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - grpc_closure* closure); - void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset); + grpc_error* (*work)(grpc_pollset* pollset, grpc_pollset_worker** worker, + grpc_millis deadline); + void (*shutdown)(grpc_pollset* pollset, grpc_closure* closure); + void (*destroy)(grpc_pollset* pollset); } cq_poller_vtable; typedef struct non_polling_worker { @@ -94,14 +93,12 @@ static void non_polling_poller_init(grpc_pollset* pollset, gpr_mu** mu) { *mu = &npp->mu; } -static void non_polling_poller_destroy(grpc_exec_ctx* exec_ctx, - grpc_pollset* pollset) { +static void non_polling_poller_destroy(grpc_pollset* pollset) { non_polling_poller* npp = (non_polling_poller*)pollset; gpr_mu_destroy(&npp->mu); } -static grpc_error* non_polling_poller_work(grpc_exec_ctx* exec_ctx, - grpc_pollset* pollset, +static grpc_error* non_polling_poller_work(grpc_pollset* pollset, grpc_pollset_worker** worker, grpc_millis deadline) { non_polling_poller* npp = (non_polling_poller*)pollset; @@ -122,12 +119,12 @@ static grpc_error* non_polling_poller_work(grpc_exec_ctx* exec_ctx, while (!npp->shutdown && !w.kicked && !gpr_cv_wait(&w.cv, &npp->mu, deadline_ts)) ; - grpc_exec_ctx_invalidate_now(exec_ctx); + grpc_core::ExecCtx::Get()->InvalidateNow(); if (&w == npp->root) { npp->root = w.next; if (&w == npp->root) { if (npp->shutdown) { - GRPC_CLOSURE_SCHED(exec_ctx, npp->shutdown, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(npp->shutdown, GRPC_ERROR_NONE); } npp->root = nullptr; } @@ -140,8 +137,7 @@ static grpc_error* non_polling_poller_work(grpc_exec_ctx* exec_ctx, } static grpc_error* non_polling_poller_kick( - grpc_exec_ctx* exec_ctx, grpc_pollset* pollset, - grpc_pollset_worker* specific_worker) { + grpc_pollset* pollset, grpc_pollset_worker* specific_worker) { non_polling_poller* p = (non_polling_poller*)pollset; if (specific_worker == nullptr) specific_worker = (grpc_pollset_worker*)p->root; @@ -155,14 +151,13 @@ static grpc_error* non_polling_poller_kick( return GRPC_ERROR_NONE; } -static void non_polling_poller_shutdown(grpc_exec_ctx* exec_ctx, - grpc_pollset* pollset, +static void non_polling_poller_shutdown(grpc_pollset* pollset, grpc_closure* closure) { non_polling_poller* p = (non_polling_poller*)pollset; GPR_ASSERT(closure != nullptr); p->shutdown = closure; if (p->root == nullptr) { - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); } else { non_polling_worker* w = p->root; do { @@ -189,13 +184,11 @@ typedef struct cq_vtable { grpc_cq_completion_type cq_completion_type; size_t data_size; void (*init)(void* data); - void (*shutdown)(grpc_exec_ctx* exec_ctx, grpc_completion_queue* cq); + void (*shutdown)(grpc_completion_queue* cq); void (*destroy)(void* data); bool (*begin_op)(grpc_completion_queue* cq, void* tag); - void (*end_op)(grpc_exec_ctx* exec_ctx, grpc_completion_queue* cq, void* tag, - grpc_error* error, - void (*done)(grpc_exec_ctx* exec_ctx, void* done_arg, - grpc_cq_completion* storage), + void (*end_op)(grpc_completion_queue* cq, void* tag, grpc_error* error, + void (*done)(void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage); grpc_event (*next)(grpc_completion_queue* cq, gpr_timespec deadline, void* reserved); @@ -280,31 +273,23 @@ struct grpc_completion_queue { }; /* Forward declarations */ -static void cq_finish_shutdown_next(grpc_exec_ctx* exec_ctx, - grpc_completion_queue* cq); -static void cq_finish_shutdown_pluck(grpc_exec_ctx* exec_ctx, - grpc_completion_queue* cq); -static void cq_shutdown_next(grpc_exec_ctx* exec_ctx, - grpc_completion_queue* cq); -static void cq_shutdown_pluck(grpc_exec_ctx* exec_ctx, - grpc_completion_queue* cq); +static void cq_finish_shutdown_next(grpc_completion_queue* cq); +static void cq_finish_shutdown_pluck(grpc_completion_queue* cq); +static void cq_shutdown_next(grpc_completion_queue* cq); +static void cq_shutdown_pluck(grpc_completion_queue* cq); static bool cq_begin_op_for_next(grpc_completion_queue* cq, void* tag); static bool cq_begin_op_for_pluck(grpc_completion_queue* cq, void* tag); -static void cq_end_op_for_next(grpc_exec_ctx* exec_ctx, - grpc_completion_queue* cq, void* tag, +static void cq_end_op_for_next(grpc_completion_queue* cq, void* tag, grpc_error* error, - void (*done)(grpc_exec_ctx* exec_ctx, - void* done_arg, + void (*done)(void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage); -static void cq_end_op_for_pluck(grpc_exec_ctx* exec_ctx, - grpc_completion_queue* cq, void* tag, +static void cq_end_op_for_pluck(grpc_completion_queue* cq, void* tag, grpc_error* error, - void (*done)(grpc_exec_ctx* exec_ctx, - void* done_arg, + void (*done)(void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage); @@ -346,8 +331,7 @@ grpc_core::TraceFlag grpc_cq_event_timeout_trace(true, "queue_timeout"); gpr_free(_ev); \ } -static void on_pollset_shutdown_done(grpc_exec_ctx* exec_ctx, void* cq, - grpc_error* error); +static void on_pollset_shutdown_done(void* cq, grpc_error* error); void grpc_cq_global_init() { gpr_tls_init(&g_cached_event); @@ -369,19 +353,18 @@ int grpc_completion_queue_thread_local_cache_flush(grpc_completion_queue* cq, if (storage != nullptr && (grpc_completion_queue*)gpr_tls_get(&g_cached_cq) == cq) { *tag = storage->tag; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; *ok = (storage->next & (uintptr_t)(1)) == 1; - storage->done(&exec_ctx, storage->done_arg, storage); + storage->done(storage->done_arg, storage); ret = 1; cq_next_data* cqd = (cq_next_data*)DATA_FROM_CQ(cq); if (gpr_atm_full_fetch_add(&cqd->pending_events, -1) == 1) { GRPC_CQ_INTERNAL_REF(cq, "shutting_down"); gpr_mu_lock(cq->mu); - cq_finish_shutdown_next(&exec_ctx, cq); + cq_finish_shutdown_next(cq); gpr_mu_unlock(cq->mu); - GRPC_CQ_INTERNAL_UNREF(&exec_ctx, cq, "shutting_down"); + GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down"); } - grpc_exec_ctx_finish(&exec_ctx); } gpr_tls_set(&g_cached_event, (intptr_t)0); gpr_tls_set(&g_cached_cq, (intptr_t)0); @@ -406,24 +389,22 @@ static bool cq_event_queue_push(grpc_cq_event_queue* q, grpc_cq_completion* c) { static grpc_cq_completion* cq_event_queue_pop(grpc_cq_event_queue* q) { grpc_cq_completion* c = nullptr; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; if (gpr_spinlock_trylock(&q->queue_lock)) { - GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_SUCCESSES(&exec_ctx); + GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_SUCCESSES(); bool is_empty = false; c = (grpc_cq_completion*)gpr_mpscq_pop_and_check_end(&q->queue, &is_empty); gpr_spinlock_unlock(&q->queue_lock); if (c == nullptr && !is_empty) { - GRPC_STATS_INC_CQ_EV_QUEUE_TRANSIENT_POP_FAILURES(&exec_ctx); + GRPC_STATS_INC_CQ_EV_QUEUE_TRANSIENT_POP_FAILURES(); } } else { - GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_FAILURES(&exec_ctx); + GRPC_STATS_INC_CQ_EV_QUEUE_TRYLOCK_FAILURES(); } - grpc_exec_ctx_finish(&exec_ctx); - if (c) { gpr_atm_no_barrier_fetch_add(&q->num_queue_items, -1); } @@ -453,9 +434,8 @@ grpc_completion_queue* grpc_completion_queue_create_internal( const cq_poller_vtable* poller_vtable = &g_poller_vtable_by_poller_type[polling_type]; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_STATS_INC_CQS_CREATED(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + GRPC_STATS_INC_CQS_CREATED(); cq = (grpc_completion_queue*)gpr_zalloc(sizeof(grpc_completion_queue) + vtable->data_size + @@ -537,15 +517,14 @@ void grpc_cq_internal_ref(grpc_completion_queue* cq) { gpr_ref(&cq->owning_refs); } -static void on_pollset_shutdown_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_pollset_shutdown_done(void* arg, grpc_error* error) { grpc_completion_queue* cq = (grpc_completion_queue*)arg; - GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "pollset_destroy"); + GRPC_CQ_INTERNAL_UNREF(cq, "pollset_destroy"); } #ifndef NDEBUG -void grpc_cq_internal_unref(grpc_exec_ctx* exec_ctx, grpc_completion_queue* cq, - const char* reason, const char* file, int line) { +void grpc_cq_internal_unref(grpc_completion_queue* cq, const char* reason, + const char* file, int line) { if (grpc_trace_cq_refcount.enabled()) { gpr_atm val = gpr_atm_no_barrier_load(&cq->owning_refs.count); gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, @@ -553,12 +532,11 @@ void grpc_cq_internal_unref(grpc_exec_ctx* exec_ctx, grpc_completion_queue* cq, reason); } #else -void grpc_cq_internal_unref(grpc_exec_ctx* exec_ctx, - grpc_completion_queue* cq) { +void grpc_cq_internal_unref(grpc_completion_queue* cq) { #endif if (gpr_unref(&cq->owning_refs)) { cq->vtable->destroy(DATA_FROM_CQ(cq)); - cq->poller_vtable->destroy(exec_ctx, POLLSET_FROM_CQ(cq)); + cq->poller_vtable->destroy(POLLSET_FROM_CQ(cq)); #ifndef NDEBUG gpr_free(cq->outstanding_tags); #endif @@ -639,11 +617,9 @@ bool grpc_cq_begin_op(grpc_completion_queue* cq, void* tag) { /* Queue a GRPC_OP_COMPLETED operation to a completion queue (with a * completion * type of GRPC_CQ_NEXT) */ -static void cq_end_op_for_next(grpc_exec_ctx* exec_ctx, - grpc_completion_queue* cq, void* tag, +static void cq_end_op_for_next(grpc_completion_queue* cq, void* tag, grpc_error* error, - void (*done)(grpc_exec_ctx* exec_ctx, - void* done_arg, + void (*done)(void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage) { GPR_TIMER_BEGIN("cq_end_op_for_next", 0); @@ -652,9 +628,9 @@ static void cq_end_op_for_next(grpc_exec_ctx* exec_ctx, (grpc_trace_operation_failures.enabled() && error != GRPC_ERROR_NONE)) { const char* errmsg = grpc_error_string(error); GRPC_API_TRACE( - "cq_end_op_for_next(exec_ctx=%p, cq=%p, tag=%p, error=%s, " + "cq_end_op_for_next(cq=%p, tag=%p, error=%s, " "done=%p, done_arg=%p, storage=%p)", - 7, (exec_ctx, cq, tag, errmsg, done, done_arg, storage)); + 6, (cq, tag, errmsg, done, done_arg, storage)); if (grpc_trace_operation_failures.enabled() && error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "Operation failed: tag=%p, error=%s", tag, errmsg); } @@ -689,7 +665,7 @@ static void cq_end_op_for_next(grpc_exec_ctx* exec_ctx, if (is_first) { gpr_mu_lock(cq->mu); grpc_error* kick_error = - cq->poller_vtable->kick(exec_ctx, POLLSET_FROM_CQ(cq), nullptr); + cq->poller_vtable->kick(POLLSET_FROM_CQ(cq), nullptr); gpr_mu_unlock(cq->mu); if (kick_error != GRPC_ERROR_NONE) { @@ -701,17 +677,17 @@ static void cq_end_op_for_next(grpc_exec_ctx* exec_ctx, if (gpr_atm_full_fetch_add(&cqd->pending_events, -1) == 1) { GRPC_CQ_INTERNAL_REF(cq, "shutting_down"); gpr_mu_lock(cq->mu); - cq_finish_shutdown_next(exec_ctx, cq); + cq_finish_shutdown_next(cq); gpr_mu_unlock(cq->mu); - GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "shutting_down"); + GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down"); } } else { GRPC_CQ_INTERNAL_REF(cq, "shutting_down"); gpr_atm_rel_store(&cqd->pending_events, 0); gpr_mu_lock(cq->mu); - cq_finish_shutdown_next(exec_ctx, cq); + cq_finish_shutdown_next(cq); gpr_mu_unlock(cq->mu); - GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "shutting_down"); + GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down"); } } @@ -723,11 +699,9 @@ static void cq_end_op_for_next(grpc_exec_ctx* exec_ctx, /* Queue a GRPC_OP_COMPLETED operation to a completion queue (with a * completion * type of GRPC_CQ_PLUCK) */ -static void cq_end_op_for_pluck(grpc_exec_ctx* exec_ctx, - grpc_completion_queue* cq, void* tag, +static void cq_end_op_for_pluck(grpc_completion_queue* cq, void* tag, grpc_error* error, - void (*done)(grpc_exec_ctx* exec_ctx, - void* done_arg, + void (*done)(void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage) { cq_pluck_data* cqd = (cq_pluck_data*)DATA_FROM_CQ(cq); @@ -739,9 +713,9 @@ static void cq_end_op_for_pluck(grpc_exec_ctx* exec_ctx, (grpc_trace_operation_failures.enabled() && error != GRPC_ERROR_NONE)) { const char* errmsg = grpc_error_string(error); GRPC_API_TRACE( - "cq_end_op_for_pluck(exec_ctx=%p, cq=%p, tag=%p, error=%s, " + "cq_end_op_for_pluck(cq=%p, tag=%p, error=%s, " "done=%p, done_arg=%p, storage=%p)", - 7, (exec_ctx, cq, tag, errmsg, done, done_arg, storage)); + 6, (cq, tag, errmsg, done, done_arg, storage)); if (grpc_trace_operation_failures.enabled() && error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "Operation failed: tag=%p, error=%s", tag, errmsg); } @@ -762,7 +736,7 @@ static void cq_end_op_for_pluck(grpc_exec_ctx* exec_ctx, cqd->completed_tail = storage; if (gpr_atm_full_fetch_add(&cqd->pending_events, -1) == 1) { - cq_finish_shutdown_pluck(exec_ctx, cq); + cq_finish_shutdown_pluck(cq); gpr_mu_unlock(cq->mu); } else { grpc_pollset_worker* pluck_worker = nullptr; @@ -774,7 +748,7 @@ static void cq_end_op_for_pluck(grpc_exec_ctx* exec_ctx, } grpc_error* kick_error = - cq->poller_vtable->kick(exec_ctx, POLLSET_FROM_CQ(cq), pluck_worker); + cq->poller_vtable->kick(POLLSET_FROM_CQ(cq), pluck_worker); gpr_mu_unlock(cq->mu); @@ -791,12 +765,10 @@ static void cq_end_op_for_pluck(grpc_exec_ctx* exec_ctx, GRPC_ERROR_UNREF(error); } -void grpc_cq_end_op(grpc_exec_ctx* exec_ctx, grpc_completion_queue* cq, - void* tag, grpc_error* error, - void (*done)(grpc_exec_ctx* exec_ctx, void* done_arg, - grpc_cq_completion* storage), +void grpc_cq_end_op(grpc_completion_queue* cq, void* tag, grpc_error* error, + void (*done)(void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage) { - cq->vtable->end_op(exec_ctx, cq, tag, error, done, done_arg, storage); + cq->vtable->end_op(cq, tag, error, done, done_arg, storage); } typedef struct { @@ -808,31 +780,40 @@ typedef struct { bool first_loop; } cq_is_finished_arg; -static bool cq_is_next_finished(grpc_exec_ctx* exec_ctx, void* arg) { - cq_is_finished_arg* a = (cq_is_finished_arg*)arg; - grpc_completion_queue* cq = a->cq; - cq_next_data* cqd = (cq_next_data*)DATA_FROM_CQ(cq); - GPR_ASSERT(a->stolen_completion == nullptr); +class ExecCtxNext : public grpc_core::ExecCtx { + public: + ExecCtxNext(void* arg) : ExecCtx(0), check_ready_to_finish_arg_(arg) {} - gpr_atm current_last_seen_things_queued_ever = - gpr_atm_no_barrier_load(&cqd->things_queued_ever); + bool CheckReadyToFinish() override { + cq_is_finished_arg* a = (cq_is_finished_arg*)check_ready_to_finish_arg_; + grpc_completion_queue* cq = a->cq; + cq_next_data* cqd = (cq_next_data*)DATA_FROM_CQ(cq); + GPR_ASSERT(a->stolen_completion == nullptr); - if (current_last_seen_things_queued_ever != a->last_seen_things_queued_ever) { - a->last_seen_things_queued_ever = + gpr_atm current_last_seen_things_queued_ever = gpr_atm_no_barrier_load(&cqd->things_queued_ever); - /* Pop a cq_completion from the queue. Returns NULL if the queue is empty - * might return NULL in some cases even if the queue is not empty; but - * that - * is ok and doesn't affect correctness. Might effect the tail latencies a - * bit) */ - a->stolen_completion = cq_event_queue_pop(&cqd->queue); - if (a->stolen_completion != nullptr) { - return true; + if (current_last_seen_things_queued_ever != + a->last_seen_things_queued_ever) { + a->last_seen_things_queued_ever = + gpr_atm_no_barrier_load(&cqd->things_queued_ever); + + /* Pop a cq_completion from the queue. Returns NULL if the queue is empty + * might return NULL in some cases even if the queue is not empty; but + * that + * is ok and doesn't affect correctness. Might effect the tail latencies a + * bit) */ + a->stolen_completion = cq_event_queue_pop(&cqd->queue); + if (a->stolen_completion != nullptr) { + return true; + } } + return !a->first_loop && a->deadline < grpc_core::ExecCtx::Get()->Now(); } - return !a->first_loop && a->deadline < grpc_exec_ctx_now(exec_ctx); -} + + private: + void* check_ready_to_finish_arg_; +}; #ifndef NDEBUG static void dump_pending_tags(grpc_completion_queue* cq) { @@ -887,8 +868,7 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline, nullptr, nullptr, true}; - grpc_exec_ctx exec_ctx = - GRPC_EXEC_CTX_INITIALIZER(0, cq_is_next_finished, &is_finished_arg); + ExecCtxNext exec_ctx(&is_finished_arg); for (;;) { grpc_millis iteration_deadline = deadline_millis; @@ -898,7 +878,7 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline, ret.type = GRPC_OP_COMPLETE; ret.success = c->next & 1u; ret.tag = c->tag; - c->done(&exec_ctx, c->done_arg, c); + c->done(c->done_arg, c); break; } @@ -908,7 +888,7 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline, ret.type = GRPC_OP_COMPLETE; ret.success = c->next & 1u; ret.tag = c->tag; - c->done(&exec_ctx, c->done_arg, c); + c->done(c->done_arg, c); break; } else { /* If c == NULL it means either the queue is empty OR in an transient @@ -939,7 +919,7 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline, } if (!is_finished_arg.first_loop && - grpc_exec_ctx_now(&exec_ctx) >= deadline_millis) { + grpc_core::ExecCtx::Get()->Now() >= deadline_millis) { memset(&ret, 0, sizeof(ret)); ret.type = GRPC_QUEUE_TIMEOUT; dump_pending_tags(cq); @@ -949,8 +929,8 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline, /* The main polling work happens in grpc_pollset_work */ gpr_mu_lock(cq->mu); cq->num_polls++; - grpc_error* err = cq->poller_vtable->work(&exec_ctx, POLLSET_FROM_CQ(cq), - nullptr, iteration_deadline); + grpc_error* err = cq->poller_vtable->work(POLLSET_FROM_CQ(cq), nullptr, + iteration_deadline); gpr_mu_unlock(cq->mu); if (err != GRPC_ERROR_NONE) { @@ -969,13 +949,13 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline, if (cq_event_queue_num_items(&cqd->queue) > 0 && gpr_atm_acq_load(&cqd->pending_events) > 0) { gpr_mu_lock(cq->mu); - cq->poller_vtable->kick(&exec_ctx, POLLSET_FROM_CQ(cq), nullptr); + cq->poller_vtable->kick(POLLSET_FROM_CQ(cq), nullptr); gpr_mu_unlock(cq->mu); } GRPC_SURFACE_TRACE_RETURNED_EVENT(cq, &ret); - GRPC_CQ_INTERNAL_UNREF(&exec_ctx, cq, "next"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_CQ_INTERNAL_UNREF(cq, "next"); + GPR_ASSERT(is_finished_arg.stolen_completion == nullptr); GPR_TIMER_END("grpc_completion_queue_next", 0); @@ -989,19 +969,16 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline, - Must be called only once in completion queue's lifetime - grpc_completion_queue_shutdown() MUST have been called before calling this function */ -static void cq_finish_shutdown_next(grpc_exec_ctx* exec_ctx, - grpc_completion_queue* cq) { +static void cq_finish_shutdown_next(grpc_completion_queue* cq) { cq_next_data* cqd = (cq_next_data*)DATA_FROM_CQ(cq); GPR_ASSERT(cqd->shutdown_called); GPR_ASSERT(gpr_atm_no_barrier_load(&cqd->pending_events) == 0); - cq->poller_vtable->shutdown(exec_ctx, POLLSET_FROM_CQ(cq), - &cq->pollset_shutdown_done); + cq->poller_vtable->shutdown(POLLSET_FROM_CQ(cq), &cq->pollset_shutdown_done); } -static void cq_shutdown_next(grpc_exec_ctx* exec_ctx, - grpc_completion_queue* cq) { +static void cq_shutdown_next(grpc_completion_queue* cq) { cq_next_data* cqd = (cq_next_data*)DATA_FROM_CQ(cq); /* Need an extra ref for cq here because: @@ -1014,7 +991,7 @@ static void cq_shutdown_next(grpc_exec_ctx* exec_ctx, gpr_mu_lock(cq->mu); if (cqd->shutdown_called) { gpr_mu_unlock(cq->mu); - GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "shutting_down"); + GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down"); return; } cqd->shutdown_called = true; @@ -1022,10 +999,10 @@ static void cq_shutdown_next(grpc_exec_ctx* exec_ctx, * cq_begin_op_for_next and and cq_end_op_for_next functions which read/write * on this counter without necessarily holding a lock on cq */ if (gpr_atm_full_fetch_add(&cqd->pending_events, -1) == 1) { - cq_finish_shutdown_next(exec_ctx, cq); + cq_finish_shutdown_next(cq); } gpr_mu_unlock(cq->mu); - GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "shutting_down"); + GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down"); } grpc_event grpc_completion_queue_next(grpc_completion_queue* cq, @@ -1058,37 +1035,46 @@ static void del_plucker(grpc_completion_queue* cq, void* tag, GPR_UNREACHABLE_CODE(return ); } -static bool cq_is_pluck_finished(grpc_exec_ctx* exec_ctx, void* arg) { - cq_is_finished_arg* a = (cq_is_finished_arg*)arg; - grpc_completion_queue* cq = a->cq; - cq_pluck_data* cqd = (cq_pluck_data*)DATA_FROM_CQ(cq); +class ExecCtxPluck : public grpc_core::ExecCtx { + public: + ExecCtxPluck(void* arg) : ExecCtx(0), check_ready_to_finish_arg_(arg) {} - GPR_ASSERT(a->stolen_completion == nullptr); - gpr_atm current_last_seen_things_queued_ever = - gpr_atm_no_barrier_load(&cqd->things_queued_ever); - if (current_last_seen_things_queued_ever != a->last_seen_things_queued_ever) { - gpr_mu_lock(cq->mu); - a->last_seen_things_queued_ever = + bool CheckReadyToFinish() override { + cq_is_finished_arg* a = (cq_is_finished_arg*)check_ready_to_finish_arg_; + grpc_completion_queue* cq = a->cq; + cq_pluck_data* cqd = (cq_pluck_data*)DATA_FROM_CQ(cq); + + GPR_ASSERT(a->stolen_completion == nullptr); + gpr_atm current_last_seen_things_queued_ever = gpr_atm_no_barrier_load(&cqd->things_queued_ever); - grpc_cq_completion* c; - grpc_cq_completion* prev = &cqd->completed_head; - while ((c = (grpc_cq_completion*)(prev->next & ~(uintptr_t)1)) != - &cqd->completed_head) { - if (c->tag == a->tag) { - prev->next = (prev->next & (uintptr_t)1) | (c->next & ~(uintptr_t)1); - if (c == cqd->completed_tail) { - cqd->completed_tail = prev; + if (current_last_seen_things_queued_ever != + a->last_seen_things_queued_ever) { + gpr_mu_lock(cq->mu); + a->last_seen_things_queued_ever = + gpr_atm_no_barrier_load(&cqd->things_queued_ever); + grpc_cq_completion* c; + grpc_cq_completion* prev = &cqd->completed_head; + while ((c = (grpc_cq_completion*)(prev->next & ~(uintptr_t)1)) != + &cqd->completed_head) { + if (c->tag == a->tag) { + prev->next = (prev->next & (uintptr_t)1) | (c->next & ~(uintptr_t)1); + if (c == cqd->completed_tail) { + cqd->completed_tail = prev; + } + gpr_mu_unlock(cq->mu); + a->stolen_completion = c; + return true; } - gpr_mu_unlock(cq->mu); - a->stolen_completion = c; - return true; + prev = c; } - prev = c; + gpr_mu_unlock(cq->mu); } - gpr_mu_unlock(cq->mu); + return !a->first_loop && a->deadline < grpc_core::ExecCtx::Get()->Now(); } - return !a->first_loop && a->deadline < grpc_exec_ctx_now(exec_ctx); -} + + private: + void* check_ready_to_finish_arg_; +}; static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, gpr_timespec deadline, void* reserved) { @@ -1125,8 +1111,7 @@ static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, nullptr, tag, true}; - grpc_exec_ctx exec_ctx = - GRPC_EXEC_CTX_INITIALIZER(0, cq_is_pluck_finished, &is_finished_arg); + ExecCtxPluck exec_ctx(&is_finished_arg); for (;;) { if (is_finished_arg.stolen_completion != nullptr) { gpr_mu_unlock(cq->mu); @@ -1135,7 +1120,7 @@ static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, ret.type = GRPC_OP_COMPLETE; ret.success = c->next & 1u; ret.tag = c->tag; - c->done(&exec_ctx, c->done_arg, c); + c->done(c->done_arg, c); break; } prev = &cqd->completed_head; @@ -1150,7 +1135,7 @@ static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, ret.type = GRPC_OP_COMPLETE; ret.success = c->next & 1u; ret.tag = c->tag; - c->done(&exec_ctx, c->done_arg, c); + c->done(c->done_arg, c); goto done; } prev = c; @@ -1174,7 +1159,7 @@ static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, break; } if (!is_finished_arg.first_loop && - grpc_exec_ctx_now(&exec_ctx) >= deadline_millis) { + grpc_core::ExecCtx::Get()->Now() >= deadline_millis) { del_plucker(cq, tag, &worker); gpr_mu_unlock(cq->mu); memset(&ret, 0, sizeof(ret)); @@ -1183,8 +1168,8 @@ static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, break; } cq->num_polls++; - grpc_error* err = cq->poller_vtable->work(&exec_ctx, POLLSET_FROM_CQ(cq), - &worker, deadline_millis); + grpc_error* err = + cq->poller_vtable->work(POLLSET_FROM_CQ(cq), &worker, deadline_millis); if (err != GRPC_ERROR_NONE) { del_plucker(cq, tag, &worker); gpr_mu_unlock(cq->mu); @@ -1202,8 +1187,8 @@ static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, } done: GRPC_SURFACE_TRACE_RETURNED_EVENT(cq, &ret); - GRPC_CQ_INTERNAL_UNREF(&exec_ctx, cq, "pluck"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_CQ_INTERNAL_UNREF(cq, "pluck"); + GPR_ASSERT(is_finished_arg.stolen_completion == nullptr); GPR_TIMER_END("grpc_completion_queue_pluck", 0); @@ -1216,22 +1201,19 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue* cq, void* tag, return cq->vtable->pluck(cq, tag, deadline, reserved); } -static void cq_finish_shutdown_pluck(grpc_exec_ctx* exec_ctx, - grpc_completion_queue* cq) { +static void cq_finish_shutdown_pluck(grpc_completion_queue* cq) { cq_pluck_data* cqd = (cq_pluck_data*)DATA_FROM_CQ(cq); GPR_ASSERT(cqd->shutdown_called); GPR_ASSERT(!gpr_atm_no_barrier_load(&cqd->shutdown)); gpr_atm_no_barrier_store(&cqd->shutdown, 1); - cq->poller_vtable->shutdown(exec_ctx, POLLSET_FROM_CQ(cq), - &cq->pollset_shutdown_done); + cq->poller_vtable->shutdown(POLLSET_FROM_CQ(cq), &cq->pollset_shutdown_done); } /* NOTE: This function is almost exactly identical to cq_shutdown_next() but * merging them is a bit tricky and probably not worth it */ -static void cq_shutdown_pluck(grpc_exec_ctx* exec_ctx, - grpc_completion_queue* cq) { +static void cq_shutdown_pluck(grpc_completion_queue* cq) { cq_pluck_data* cqd = (cq_pluck_data*)DATA_FROM_CQ(cq); /* Need an extra ref for cq here because: @@ -1244,25 +1226,25 @@ static void cq_shutdown_pluck(grpc_exec_ctx* exec_ctx, gpr_mu_lock(cq->mu); if (cqd->shutdown_called) { gpr_mu_unlock(cq->mu); - GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "shutting_down (pluck cq)"); + GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down (pluck cq)"); return; } cqd->shutdown_called = true; if (gpr_atm_full_fetch_add(&cqd->pending_events, -1) == 1) { - cq_finish_shutdown_pluck(exec_ctx, cq); + cq_finish_shutdown_pluck(cq); } gpr_mu_unlock(cq->mu); - GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "shutting_down (pluck cq)"); + GRPC_CQ_INTERNAL_UNREF(cq, "shutting_down (pluck cq)"); } /* Shutdown simply drops a ref that we reserved at creation time; if we drop to zero here, then enter shutdown mode and wake up any waiters */ void grpc_completion_queue_shutdown(grpc_completion_queue* cq) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GPR_TIMER_BEGIN("grpc_completion_queue_shutdown", 0); GRPC_API_TRACE("grpc_completion_queue_shutdown(cq=%p)", 1, (cq)); - cq->vtable->shutdown(&exec_ctx, cq); - grpc_exec_ctx_finish(&exec_ctx); + cq->vtable->shutdown(cq); + GPR_TIMER_END("grpc_completion_queue_shutdown", 0); } @@ -1271,9 +1253,9 @@ void grpc_completion_queue_destroy(grpc_completion_queue* cq) { GPR_TIMER_BEGIN("grpc_completion_queue_destroy", 0); grpc_completion_queue_shutdown(cq); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_CQ_INTERNAL_UNREF(&exec_ctx, cq, "destroy"); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + GRPC_CQ_INTERNAL_UNREF(cq, "destroy"); + GPR_TIMER_END("grpc_completion_queue_destroy", 0); } diff --git a/src/core/lib/surface/completion_queue.h b/src/core/lib/surface/completion_queue.h index 13d3e5807df..aea47afaf52 100644 --- a/src/core/lib/surface/completion_queue.h +++ b/src/core/lib/surface/completion_queue.h @@ -40,8 +40,7 @@ typedef struct grpc_cq_completion { void* tag; /** done callback - called when this queue element is no longer needed by the completion queue */ - void (*done)(grpc_exec_ctx* exec_ctx, void* done_arg, - struct grpc_cq_completion* c); + void (*done)(void* done_arg, struct grpc_cq_completion* c); void* done_arg; /** next pointer; low bit is used to indicate success or not */ uintptr_t next; @@ -50,17 +49,17 @@ typedef struct grpc_cq_completion { #ifndef NDEBUG void grpc_cq_internal_ref(grpc_completion_queue* cc, const char* reason, const char* file, int line); -void grpc_cq_internal_unref(grpc_exec_ctx* exec_ctx, grpc_completion_queue* cc, - const char* reason, const char* file, int line); +void grpc_cq_internal_unref(grpc_completion_queue* cc, const char* reason, + const char* file, int line); #define GRPC_CQ_INTERNAL_REF(cc, reason) \ grpc_cq_internal_ref(cc, reason, __FILE__, __LINE__) -#define GRPC_CQ_INTERNAL_UNREF(ec, cc, reason) \ - grpc_cq_internal_unref(ec, cc, reason, __FILE__, __LINE__) +#define GRPC_CQ_INTERNAL_UNREF(cc, reason) \ + grpc_cq_internal_unref(cc, reason, __FILE__, __LINE__) #else void grpc_cq_internal_ref(grpc_completion_queue* cc); -void grpc_cq_internal_unref(grpc_exec_ctx* exec_ctx, grpc_completion_queue* cc); +void grpc_cq_internal_unref(grpc_completion_queue* cc); #define GRPC_CQ_INTERNAL_REF(cc, reason) grpc_cq_internal_ref(cc) -#define GRPC_CQ_INTERNAL_UNREF(ec, cc, reason) grpc_cq_internal_unref(ec, cc) +#define GRPC_CQ_INTERNAL_UNREF(cc, reason) grpc_cq_internal_unref(cc) #endif /* Initializes global variables used by completion queues */ @@ -74,10 +73,8 @@ bool grpc_cq_begin_op(grpc_completion_queue* cc, void* tag); /* Queue a GRPC_OP_COMPLETED operation; tag must correspond to the tag passed to grpc_cq_begin_op */ -void grpc_cq_end_op(grpc_exec_ctx* exec_ctx, grpc_completion_queue* cc, - void* tag, grpc_error* error, - void (*done)(grpc_exec_ctx* exec_ctx, void* done_arg, - grpc_cq_completion* storage), +void grpc_cq_end_op(grpc_completion_queue* cc, void* tag, grpc_error* error, + void (*done)(void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage); grpc_pollset* grpc_cq_pollset(grpc_completion_queue* cc); diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index 8ee1383fb8b..c6ce235da7f 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -73,14 +73,12 @@ static void do_basic_init(void) { grpc_fork_handlers_auto_register(); } -static bool append_filter(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, void* arg) { +static bool append_filter(grpc_channel_stack_builder* builder, void* arg) { return grpc_channel_stack_builder_append_filter( builder, (const grpc_channel_filter*)arg, nullptr, nullptr); } -static bool prepend_filter(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, void* arg) { +static bool prepend_filter(grpc_channel_stack_builder* builder, void* arg) { return grpc_channel_stack_builder_prepend_filter( builder, (const grpc_channel_filter*)arg, nullptr, nullptr); } @@ -123,7 +121,6 @@ void grpc_init(void) { int i; gpr_once_init(&g_basic_init, do_basic_init); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_mu_lock(&g_init_mu); if (++g_initializations == 1) { gpr_time_init(); @@ -133,7 +130,8 @@ void grpc_init(void) { grpc_mdctx_global_init(); grpc_channel_init_init(); grpc_security_pre_init(); - grpc_iomgr_init(&exec_ctx); + grpc_core::ExecCtx::GlobalInit(); + grpc_iomgr_init(); gpr_timers_global_init(); grpc_handshaker_factory_registry_init(); grpc_security_init(); @@ -149,37 +147,44 @@ void grpc_init(void) { grpc_tracer_init("GRPC_TRACE"); /* no more changes to channel init pipelines */ grpc_channel_init_finalize(); - grpc_iomgr_start(&exec_ctx); + grpc_iomgr_start(); } gpr_mu_unlock(&g_init_mu); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_API_TRACE("grpc_init(void)", 0, ()); } void grpc_shutdown(void) { int i; GRPC_API_TRACE("grpc_shutdown(void)", 0, ()); - grpc_exec_ctx exec_ctx = - GRPC_EXEC_CTX_INITIALIZER(0, grpc_never_ready_to_finish, nullptr); + if (grpc_core::ExecCtx::Get()) { + grpc_core::ExecCtx::Get()->Flush(); + } gpr_mu_lock(&g_init_mu); if (--g_initializations == 0) { - grpc_executor_shutdown(&exec_ctx); - grpc_timer_manager_set_threading(false); // shutdown timer_manager thread - for (i = g_number_of_plugins; i >= 0; i--) { - if (g_all_of_the_plugins[i].destroy != nullptr) { - g_all_of_the_plugins[i].destroy(); + { + grpc_core::ExecCtx exec_ctx(0); + { + grpc_executor_shutdown(); + grpc_timer_manager_set_threading( + false); // shutdown timer_manager thread + for (i = g_number_of_plugins; i >= 0; i--) { + if (g_all_of_the_plugins[i].destroy != nullptr) { + g_all_of_the_plugins[i].destroy(); + } + } } + grpc_iomgr_shutdown(); + gpr_timers_global_destroy(); + grpc_tracer_shutdown(); + grpc_mdctx_global_shutdown(); + grpc_handshaker_factory_registry_shutdown(); + grpc_slice_intern_shutdown(); + grpc_stats_shutdown(); } - grpc_iomgr_shutdown(&exec_ctx); - gpr_timers_global_destroy(); - grpc_tracer_shutdown(); - grpc_mdctx_global_shutdown(&exec_ctx); - grpc_handshaker_factory_registry_shutdown(&exec_ctx); - grpc_slice_intern_shutdown(); - grpc_stats_shutdown(); + grpc_core::ExecCtx::GlobalShutdown(); } gpr_mu_unlock(&g_init_mu); - grpc_exec_ctx_finish(&exec_ctx); } int grpc_is_initialized(void) { diff --git a/src/core/lib/surface/init_secure.cc b/src/core/lib/surface/init_secure.cc index 3eee570fc26..75ed9faef06 100644 --- a/src/core/lib/surface/init_secure.cc +++ b/src/core/lib/surface/init_secure.cc @@ -37,7 +37,7 @@ void grpc_security_pre_init(void) {} static bool maybe_prepend_client_auth_filter( - grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, void* arg) { + grpc_channel_stack_builder* builder, void* arg) { const grpc_channel_args* args = grpc_channel_stack_builder_get_channel_arguments(builder); if (args) { @@ -52,7 +52,7 @@ static bool maybe_prepend_client_auth_filter( } static bool maybe_prepend_server_auth_filter( - grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, void* arg) { + grpc_channel_stack_builder* builder, void* arg) { const grpc_channel_args* args = grpc_channel_stack_builder_get_channel_arguments(builder); if (args) { diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index c32c9af50e5..29b4e3f0c70 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/src/core/lib/surface/lame_client.cc @@ -49,8 +49,7 @@ struct ChannelData { const char* error_message; }; -static void fill_metadata(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_metadata_batch* mdb) { +static void fill_metadata(grpc_call_element* elem, grpc_metadata_batch* mdb) { CallData* calld = reinterpret_cast(elem->call_data); bool expected = false; if (!calld->filled_metadata.compare_exchange_strong( @@ -62,9 +61,9 @@ static void fill_metadata(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, char tmp[GPR_LTOA_MIN_BUFSIZE]; gpr_ltoa(chand->error_code, tmp); calld->status.md = grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_GRPC_STATUS, grpc_slice_from_copied_string(tmp)); + GRPC_MDSTR_GRPC_STATUS, grpc_slice_from_copied_string(tmp)); calld->details.md = grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_GRPC_MESSAGE, + GRPC_MDSTR_GRPC_MESSAGE, grpc_slice_from_copied_string(chand->error_message)); calld->status.prev = calld->details.next = nullptr; calld->status.next = &calld->details; @@ -76,69 +75,61 @@ static void fill_metadata(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, } static void lame_start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* op) { + grpc_call_element* elem, grpc_transport_stream_op_batch* op) { CallData* calld = reinterpret_cast(elem->call_data); if (op->recv_initial_metadata) { - fill_metadata(exec_ctx, elem, + fill_metadata(elem, op->payload->recv_initial_metadata.recv_initial_metadata); } else if (op->recv_trailing_metadata) { - fill_metadata(exec_ctx, elem, + fill_metadata(elem, op->payload->recv_trailing_metadata.recv_trailing_metadata); } grpc_transport_stream_op_batch_finish_with_failure( - exec_ctx, op, GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel"), + op, GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel"), calld->call_combiner); } -static void lame_get_channel_info(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static void lame_get_channel_info(grpc_channel_element* elem, const grpc_channel_info* channel_info) {} -static void lame_start_transport_op(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static void lame_start_transport_op(grpc_channel_element* elem, grpc_transport_op* op) { if (op->on_connectivity_state_change) { GPR_ASSERT(*op->connectivity_state != GRPC_CHANNEL_SHUTDOWN); *op->connectivity_state = GRPC_CHANNEL_SHUTDOWN; - GRPC_CLOSURE_SCHED(exec_ctx, op->on_connectivity_state_change, - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(op->on_connectivity_state_change, GRPC_ERROR_NONE); } if (op->send_ping != nullptr) { - GRPC_CLOSURE_SCHED( - exec_ctx, op->send_ping, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel")); + GRPC_CLOSURE_SCHED(op->send_ping, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "lame client channel")); } GRPC_ERROR_UNREF(op->disconnect_with_error); if (op->on_consumed != nullptr) { - GRPC_CLOSURE_SCHED(exec_ctx, op->on_consumed, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(op->on_consumed, GRPC_ERROR_NONE); } } -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { CallData* calld = reinterpret_cast(elem->call_data); calld->call_combiner = args->call_combiner; return GRPC_ERROR_NONE; } -static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_schedule_closure) { - GRPC_CLOSURE_SCHED(exec_ctx, then_schedule_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(then_schedule_closure, GRPC_ERROR_NONE); } -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { GPR_ASSERT(args->is_first); GPR_ASSERT(args->is_last); return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_channel_element* elem) {} } // namespace @@ -163,10 +154,10 @@ const grpc_channel_filter grpc_lame_filter = { grpc_channel* grpc_lame_client_channel_create(const char* target, grpc_status_code error_code, const char* error_message) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_channel_element* elem; - grpc_channel* channel = grpc_channel_create( - &exec_ctx, target, nullptr, GRPC_CLIENT_LAME_CHANNEL, nullptr); + grpc_channel* channel = + grpc_channel_create(target, nullptr, GRPC_CLIENT_LAME_CHANNEL, nullptr); elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); GRPC_API_TRACE( "grpc_lame_client_channel_create(target=%s, error_code=%d, " @@ -176,6 +167,6 @@ grpc_channel* grpc_lame_client_channel_create(const char* target, auto chand = reinterpret_cast(elem->channel_data); chand->error_code = error_code; chand->error_message = error_message; - grpc_exec_ctx_finish(&exec_ctx); + return channel; } diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc index 0f8a057f315..4f071831801 100644 --- a/src/core/lib/surface/server.cc +++ b/src/core/lib/surface/server.cc @@ -46,10 +46,9 @@ typedef struct listener { void* arg; - void (*start)(grpc_exec_ctx* exec_ctx, grpc_server* server, void* arg, - grpc_pollset** pollsets, size_t pollset_count); - void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_server* server, void* arg, - grpc_closure* closure); + void (*start)(grpc_server* server, void* arg, grpc_pollset** pollsets, + size_t pollset_count); + void (*destroy)(grpc_server* server, void* arg, grpc_closure* closure); struct listener* next; grpc_closure destroy_done; } listener; @@ -224,13 +223,12 @@ struct grpc_server { #define SERVER_FROM_CALL_ELEM(elem) \ (((channel_data*)(elem)->channel_data)->server) -static void publish_new_rpc(grpc_exec_ctx* exec_ctx, void* calld, - grpc_error* error); -static void fail_call(grpc_exec_ctx* exec_ctx, grpc_server* server, - size_t cq_idx, requested_call* rc, grpc_error* error); +static void publish_new_rpc(void* calld, grpc_error* error); +static void fail_call(grpc_server* server, size_t cq_idx, requested_call* rc, + grpc_error* error); /* Before calling maybe_finish_shutdown, we must hold mu_global and not hold mu_call */ -static void maybe_finish_shutdown(grpc_exec_ctx* exec_ctx, grpc_server* server); +static void maybe_finish_shutdown(grpc_server* server); /* * channel broadcaster @@ -258,15 +256,14 @@ struct shutdown_cleanup_args { grpc_slice slice; }; -static void shutdown_cleanup(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void shutdown_cleanup(void* arg, grpc_error* error) { struct shutdown_cleanup_args* a = (struct shutdown_cleanup_args*)arg; - grpc_slice_unref_internal(exec_ctx, a->slice); + grpc_slice_unref_internal(a->slice); gpr_free(a); } -static void send_shutdown(grpc_exec_ctx* exec_ctx, grpc_channel* channel, - bool send_goaway, grpc_error* send_disconnect) { +static void send_shutdown(grpc_channel* channel, bool send_goaway, + grpc_error* send_disconnect) { struct shutdown_cleanup_args* sc = (struct shutdown_cleanup_args*)gpr_malloc(sizeof(*sc)); GRPC_CLOSURE_INIT(&sc->closure, shutdown_cleanup, sc, @@ -284,19 +281,18 @@ static void send_shutdown(grpc_exec_ctx* exec_ctx, grpc_channel* channel, op->disconnect_with_error = send_disconnect; elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); - elem->filter->start_transport_op(exec_ctx, elem, op); + elem->filter->start_transport_op(elem, op); } -static void channel_broadcaster_shutdown(grpc_exec_ctx* exec_ctx, - channel_broadcaster* cb, +static void channel_broadcaster_shutdown(channel_broadcaster* cb, bool send_goaway, grpc_error* force_disconnect) { size_t i; for (i = 0; i < cb->num_channels; i++) { - send_shutdown(exec_ctx, cb->channels[i], send_goaway, + send_shutdown(cb->channels[i], send_goaway, GRPC_ERROR_REF(force_disconnect)); - GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, cb->channels[i], "broadcast"); + GRPC_CHANNEL_INTERNAL_UNREF(cb->channels[i], "broadcast"); } gpr_free(cb->channels); GRPC_ERROR_UNREF(force_disconnect); @@ -324,13 +320,11 @@ static void request_matcher_destroy(request_matcher* rm) { gpr_free(rm->requests_per_cq); } -static void kill_zombie(grpc_exec_ctx* exec_ctx, void* elem, - grpc_error* error) { +static void kill_zombie(void* elem, grpc_error* error) { grpc_call_unref(grpc_call_from_top_element((grpc_call_element*)elem)); } -static void request_matcher_zombify_all_pending_calls(grpc_exec_ctx* exec_ctx, - request_matcher* rm) { +static void request_matcher_zombify_all_pending_calls(request_matcher* rm) { while (rm->pending_head) { call_data* calld = rm->pending_head; rm->pending_head = calld->pending_next; @@ -339,19 +333,18 @@ static void request_matcher_zombify_all_pending_calls(grpc_exec_ctx* exec_ctx, &calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0), grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(exec_ctx, &calld->kill_zombie_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&calld->kill_zombie_closure, GRPC_ERROR_NONE); } } -static void request_matcher_kill_requests(grpc_exec_ctx* exec_ctx, - grpc_server* server, +static void request_matcher_kill_requests(grpc_server* server, request_matcher* rm, grpc_error* error) { requested_call* rc; for (size_t i = 0; i < server->cq_count; i++) { while ((rc = (requested_call*)gpr_locked_mpscq_pop( &rm->requests_per_cq[i])) != nullptr) { - fail_call(exec_ctx, server, i, rc, GRPC_ERROR_REF(error)); + fail_call(server, i, rc, GRPC_ERROR_REF(error)); } } GRPC_ERROR_UNREF(error); @@ -365,10 +358,10 @@ static void server_ref(grpc_server* server) { gpr_ref(&server->internal_refcount); } -static void server_delete(grpc_exec_ctx* exec_ctx, grpc_server* server) { +static void server_delete(grpc_server* server) { registered_method* rm; size_t i; - grpc_channel_args_destroy(exec_ctx, server->channel_args); + grpc_channel_args_destroy(server->channel_args); gpr_mu_destroy(&server->mu_global); gpr_mu_destroy(&server->mu_call); gpr_cv_destroy(&server->starting_cv); @@ -385,7 +378,7 @@ static void server_delete(grpc_exec_ctx* exec_ctx, grpc_server* server) { request_matcher_destroy(&server->unregistered_request_matcher); } for (i = 0; i < server->cq_count; i++) { - GRPC_CQ_INTERNAL_UNREF(exec_ctx, server->cqs[i], "server"); + GRPC_CQ_INTERNAL_UNREF(server->cqs[i], "server"); } gpr_free(server->cqs); gpr_free(server->pollsets); @@ -393,9 +386,9 @@ static void server_delete(grpc_exec_ctx* exec_ctx, grpc_server* server) { gpr_free(server); } -static void server_unref(grpc_exec_ctx* exec_ctx, grpc_server* server) { +static void server_unref(grpc_server* server) { if (gpr_unref(&server->internal_refcount)) { - server_delete(exec_ctx, server); + server_delete(server); } } @@ -409,21 +402,19 @@ static void orphan_channel(channel_data* chand) { chand->next = chand->prev = chand; } -static void finish_destroy_channel(grpc_exec_ctx* exec_ctx, void* cd, - grpc_error* error) { +static void finish_destroy_channel(void* cd, grpc_error* error) { channel_data* chand = (channel_data*)cd; grpc_server* server = chand->server; - GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, chand->channel, "server"); - server_unref(exec_ctx, server); + GRPC_CHANNEL_INTERNAL_UNREF(chand->channel, "server"); + server_unref(server); } -static void destroy_channel(grpc_exec_ctx* exec_ctx, channel_data* chand, - grpc_error* error) { +static void destroy_channel(channel_data* chand, grpc_error* error) { if (is_channel_orphaned(chand)) return; GPR_ASSERT(chand->server != nullptr); orphan_channel(chand); server_ref(chand->server); - maybe_finish_shutdown(exec_ctx, chand->server); + maybe_finish_shutdown(chand->server); GRPC_CLOSURE_INIT(&chand->finish_destroy_channel_closure, finish_destroy_channel, chand, grpc_schedule_on_exec_ctx); @@ -436,20 +427,18 @@ static void destroy_channel(grpc_exec_ctx* exec_ctx, channel_data* chand, grpc_transport_op* op = grpc_make_transport_op(&chand->finish_destroy_channel_closure); op->set_accept_stream = true; - grpc_channel_next_op(exec_ctx, - grpc_channel_stack_element( + grpc_channel_next_op(grpc_channel_stack_element( grpc_channel_get_channel_stack(chand->channel), 0), op); } -static void done_request_event(grpc_exec_ctx* exec_ctx, void* req, - grpc_cq_completion* c) { +static void done_request_event(void* req, grpc_cq_completion* c) { gpr_free(req); } -static void publish_call(grpc_exec_ctx* exec_ctx, grpc_server* server, - call_data* calld, size_t cq_idx, requested_call* rc) { - grpc_call_set_completion_queue(exec_ctx, calld->call, rc->cq_bound_to_call); +static void publish_call(grpc_server* server, call_data* calld, size_t cq_idx, + requested_call* rc) { + grpc_call_set_completion_queue(calld->call, rc->cq_bound_to_call); grpc_call* call = calld->call; *rc->call = call; calld->cq_new = server->cqs[cq_idx]; @@ -476,12 +465,11 @@ static void publish_call(grpc_exec_ctx* exec_ctx, grpc_server* server, GPR_UNREACHABLE_CODE(return ); } - grpc_cq_end_op(exec_ctx, calld->cq_new, rc->tag, GRPC_ERROR_NONE, - done_request_event, rc, &rc->completion); + grpc_cq_end_op(calld->cq_new, rc->tag, GRPC_ERROR_NONE, done_request_event, + rc, &rc->completion); } -static void publish_new_rpc(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void publish_new_rpc(void* arg, grpc_error* error) { grpc_call_element* call_elem = (grpc_call_element*)arg; call_data* calld = (call_data*)call_elem->call_data; channel_data* chand = (channel_data*)call_elem->channel_data; @@ -494,8 +482,7 @@ static void publish_new_rpc(grpc_exec_ctx* exec_ctx, void* arg, &calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0), grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(exec_ctx, &calld->kill_zombie_closure, - GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(&calld->kill_zombie_closure, GRPC_ERROR_REF(error)); return; } @@ -506,15 +493,15 @@ static void publish_new_rpc(grpc_exec_ctx* exec_ctx, void* arg, if (rc == nullptr) { continue; } else { - GRPC_STATS_INC_SERVER_CQS_CHECKED(exec_ctx, i); + GRPC_STATS_INC_SERVER_CQS_CHECKED(i); gpr_atm_no_barrier_store(&calld->state, ACTIVATED); - publish_call(exec_ctx, server, calld, cq_idx, rc); + publish_call(server, calld, cq_idx, rc); return; /* early out */ } } /* no cq to take the request found: queue it on the slow list */ - GRPC_STATS_INC_SERVER_SLOWPATH_REQUESTS_QUEUED(exec_ctx); + GRPC_STATS_INC_SERVER_SLOWPATH_REQUESTS_QUEUED(); gpr_mu_lock(&server->mu_call); // We need to ensure that all the queues are empty. We do this under @@ -529,9 +516,9 @@ static void publish_new_rpc(grpc_exec_ctx* exec_ctx, void* arg, continue; } else { gpr_mu_unlock(&server->mu_call); - GRPC_STATS_INC_SERVER_CQS_CHECKED(exec_ctx, i + server->cq_count); + GRPC_STATS_INC_SERVER_CQS_CHECKED(i + server->cq_count); gpr_atm_no_barrier_store(&calld->state, ACTIVATED); - publish_call(exec_ctx, server, calld, cq_idx, rc); + publish_call(server, calld, cq_idx, rc); return; /* early out */ } } @@ -548,8 +535,7 @@ static void publish_new_rpc(grpc_exec_ctx* exec_ctx, void* arg, } static void finish_start_new_rpc( - grpc_exec_ctx* exec_ctx, grpc_server* server, grpc_call_element* elem, - request_matcher* rm, + grpc_server* server, grpc_call_element* elem, request_matcher* rm, grpc_server_register_method_payload_handling payload_handling) { call_data* calld = (call_data*)elem->call_data; @@ -557,7 +543,7 @@ static void finish_start_new_rpc( gpr_atm_no_barrier_store(&calld->state, ZOMBIED); GRPC_CLOSURE_INIT(&calld->kill_zombie_closure, kill_zombie, elem, grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(exec_ctx, &calld->kill_zombie_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&calld->kill_zombie_closure, GRPC_ERROR_NONE); return; } @@ -565,7 +551,7 @@ static void finish_start_new_rpc( switch (payload_handling) { case GRPC_SRM_PAYLOAD_NONE: - publish_new_rpc(exec_ctx, elem, GRPC_ERROR_NONE); + publish_new_rpc(elem, GRPC_ERROR_NONE); break; case GRPC_SRM_PAYLOAD_READ_INITIAL_BYTE_BUFFER: { grpc_op op; @@ -574,14 +560,13 @@ static void finish_start_new_rpc( op.data.recv_message.recv_message = &calld->payload; GRPC_CLOSURE_INIT(&calld->publish, publish_new_rpc, elem, grpc_schedule_on_exec_ctx); - grpc_call_start_batch_and_execute(exec_ctx, calld->call, &op, 1, - &calld->publish); + grpc_call_start_batch_and_execute(calld->call, &op, 1, &calld->publish); break; } } } -static void start_new_rpc(grpc_exec_ctx* exec_ctx, grpc_call_element* elem) { +static void start_new_rpc(grpc_call_element* elem) { channel_data* chand = (channel_data*)elem->channel_data; call_data* calld = (call_data*)elem->call_data; grpc_server* server = chand->server; @@ -606,8 +591,7 @@ static void start_new_rpc(grpc_exec_ctx* exec_ctx, grpc_call_element* elem) { GRPC_INITIAL_METADATA_IDEMPOTENT_REQUEST)) { continue; } - finish_start_new_rpc(exec_ctx, server, elem, - &rm->server_registered_method->matcher, + finish_start_new_rpc(server, elem, &rm->server_registered_method->matcher, rm->server_registered_method->payload_handling); return; } @@ -624,14 +608,12 @@ static void start_new_rpc(grpc_exec_ctx* exec_ctx, grpc_call_element* elem) { GRPC_INITIAL_METADATA_IDEMPOTENT_REQUEST)) { continue; } - finish_start_new_rpc(exec_ctx, server, elem, - &rm->server_registered_method->matcher, + finish_start_new_rpc(server, elem, &rm->server_registered_method->matcher, rm->server_registered_method->payload_handling); return; } } - finish_start_new_rpc(exec_ctx, server, elem, - &server->unregistered_request_matcher, + finish_start_new_rpc(server, elem, &server->unregistered_request_matcher, GRPC_SRM_PAYLOAD_NONE); } @@ -644,9 +626,8 @@ static int num_listeners(grpc_server* server) { return n; } -static void done_shutdown_event(grpc_exec_ctx* exec_ctx, void* server, - grpc_cq_completion* completion) { - server_unref(exec_ctx, (grpc_server*)server); +static void done_shutdown_event(void* server, grpc_cq_completion* completion) { + server_unref((grpc_server*)server); } static int num_channels(grpc_server* server) { @@ -659,34 +640,30 @@ static int num_channels(grpc_server* server) { return n; } -static void kill_pending_work_locked(grpc_exec_ctx* exec_ctx, - grpc_server* server, grpc_error* error) { +static void kill_pending_work_locked(grpc_server* server, grpc_error* error) { if (server->started) { - request_matcher_kill_requests(exec_ctx, server, - &server->unregistered_request_matcher, + request_matcher_kill_requests(server, &server->unregistered_request_matcher, GRPC_ERROR_REF(error)); request_matcher_zombify_all_pending_calls( - exec_ctx, &server->unregistered_request_matcher); + &server->unregistered_request_matcher); for (registered_method* rm = server->registered_methods; rm; rm = rm->next) { - request_matcher_kill_requests(exec_ctx, server, &rm->matcher, + request_matcher_kill_requests(server, &rm->matcher, GRPC_ERROR_REF(error)); - request_matcher_zombify_all_pending_calls(exec_ctx, &rm->matcher); + request_matcher_zombify_all_pending_calls(&rm->matcher); } } GRPC_ERROR_UNREF(error); } -static void maybe_finish_shutdown(grpc_exec_ctx* exec_ctx, - grpc_server* server) { +static void maybe_finish_shutdown(grpc_server* server) { size_t i; if (!gpr_atm_acq_load(&server->shutdown_flag) || server->shutdown_published) { return; } kill_pending_work_locked( - exec_ctx, server, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); + server, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); if (server->root_channel_data.next != &server->root_channel_data || server->listeners_destroyed < num_listeners(server)) { @@ -706,15 +683,13 @@ static void maybe_finish_shutdown(grpc_exec_ctx* exec_ctx, server->shutdown_published = 1; for (i = 0; i < server->num_shutdown_tags; i++) { server_ref(server); - grpc_cq_end_op(exec_ctx, server->shutdown_tags[i].cq, - server->shutdown_tags[i].tag, GRPC_ERROR_NONE, - done_shutdown_event, server, + grpc_cq_end_op(server->shutdown_tags[i].cq, server->shutdown_tags[i].tag, + GRPC_ERROR_NONE, done_shutdown_event, server, &server->shutdown_tags[i].completion); } } -static void server_on_recv_initial_metadata(grpc_exec_ctx* exec_ctx, void* ptr, - grpc_error* error) { +static void server_on_recv_initial_metadata(void* ptr, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)ptr; call_data* calld = (call_data*)elem->call_data; grpc_millis op_deadline; @@ -728,10 +703,10 @@ static void server_on_recv_initial_metadata(grpc_exec_ctx* exec_ctx, void* ptr, GRPC_MDVALUE(calld->recv_initial_metadata->idx.named.authority->md)); calld->path_set = true; calld->host_set = true; - grpc_metadata_batch_remove(exec_ctx, calld->recv_initial_metadata, + grpc_metadata_batch_remove(calld->recv_initial_metadata, calld->recv_initial_metadata->idx.named.path); grpc_metadata_batch_remove( - exec_ctx, calld->recv_initial_metadata, + calld->recv_initial_metadata, calld->recv_initial_metadata->idx.named.authority); } else { GRPC_ERROR_REF(error); @@ -749,7 +724,7 @@ static void server_on_recv_initial_metadata(grpc_exec_ctx* exec_ctx, void* ptr, GRPC_ERROR_UNREF(src_error); } - GRPC_CLOSURE_RUN(exec_ctx, calld->on_done_recv_initial_metadata, error); + GRPC_CLOSURE_RUN(calld->on_done_recv_initial_metadata, error); } static void server_mutate_op(grpc_call_element* elem, @@ -770,24 +745,21 @@ static void server_mutate_op(grpc_call_element* elem, } static void server_start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* op) { + grpc_call_element* elem, grpc_transport_stream_op_batch* op) { server_mutate_op(elem, op); - grpc_call_next_op(exec_ctx, elem, op); + grpc_call_next_op(elem, op); } -static void got_initial_metadata(grpc_exec_ctx* exec_ctx, void* ptr, - grpc_error* error) { +static void got_initial_metadata(void* ptr, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)ptr; call_data* calld = (call_data*)elem->call_data; if (error == GRPC_ERROR_NONE) { - start_new_rpc(exec_ctx, elem); + start_new_rpc(elem); } else { if (gpr_atm_full_cas(&calld->state, NOT_STARTED, ZOMBIED)) { GRPC_CLOSURE_INIT(&calld->kill_zombie_closure, kill_zombie, elem, grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(exec_ctx, &calld->kill_zombie_closure, - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&calld->kill_zombie_closure, GRPC_ERROR_NONE); } else if (gpr_atm_full_cas(&calld->state, PENDING, ZOMBIED)) { /* zombied call will be destroyed when it's removed from the pending queue... later */ @@ -795,8 +767,7 @@ static void got_initial_metadata(grpc_exec_ctx* exec_ctx, void* ptr, } } -static void accept_stream(grpc_exec_ctx* exec_ctx, void* cd, - grpc_transport* transport, +static void accept_stream(void* cd, grpc_transport* transport, const void* transport_server_data) { channel_data* chand = (channel_data*)cd; /* create a call */ @@ -806,11 +777,11 @@ static void accept_stream(grpc_exec_ctx* exec_ctx, void* cd, args.server_transport_data = transport_server_data; args.send_deadline = GRPC_MILLIS_INF_FUTURE; grpc_call* call; - grpc_error* error = grpc_call_create(exec_ctx, &args, &call); + grpc_error* error = grpc_call_create(&args, &call); grpc_call_element* elem = grpc_call_stack_element(grpc_call_get_call_stack(call), 0); if (error != GRPC_ERROR_NONE) { - got_initial_metadata(exec_ctx, elem, error); + got_initial_metadata(elem, error); GRPC_ERROR_UNREF(error); return; } @@ -822,32 +793,28 @@ static void accept_stream(grpc_exec_ctx* exec_ctx, void* cd, &calld->initial_metadata; GRPC_CLOSURE_INIT(&calld->got_initial_metadata, got_initial_metadata, elem, grpc_schedule_on_exec_ctx); - grpc_call_start_batch_and_execute(exec_ctx, call, &op, 1, - &calld->got_initial_metadata); + grpc_call_start_batch_and_execute(call, &op, 1, &calld->got_initial_metadata); } -static void channel_connectivity_changed(grpc_exec_ctx* exec_ctx, void* cd, - grpc_error* error) { +static void channel_connectivity_changed(void* cd, grpc_error* error) { channel_data* chand = (channel_data*)cd; grpc_server* server = chand->server; if (chand->connectivity_state != GRPC_CHANNEL_SHUTDOWN) { grpc_transport_op* op = grpc_make_transport_op(nullptr); op->on_connectivity_state_change = &chand->channel_connectivity_changed; op->connectivity_state = &chand->connectivity_state; - grpc_channel_next_op(exec_ctx, - grpc_channel_stack_element( + grpc_channel_next_op(grpc_channel_stack_element( grpc_channel_get_channel_stack(chand->channel), 0), op); } else { gpr_mu_lock(&server->mu_global); - destroy_channel(exec_ctx, chand, GRPC_ERROR_REF(error)); + destroy_channel(chand, GRPC_ERROR_REF(error)); gpr_mu_unlock(&server->mu_global); - GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, chand->channel, "connectivity"); + GRPC_CHANNEL_INTERNAL_UNREF(chand->channel, "connectivity"); } } -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = (call_data*)elem->call_data; channel_data* chand = (channel_data*)elem->channel_data; @@ -863,7 +830,7 @@ static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, return GRPC_ERROR_NONE; } -static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { channel_data* chand = (channel_data*)elem->channel_data; @@ -872,19 +839,18 @@ static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, GPR_ASSERT(calld->state != PENDING); if (calld->host_set) { - grpc_slice_unref_internal(exec_ctx, calld->host); + grpc_slice_unref_internal(calld->host); } if (calld->path_set) { - grpc_slice_unref_internal(exec_ctx, calld->path); + grpc_slice_unref_internal(calld->path); } grpc_metadata_array_destroy(&calld->initial_metadata); grpc_byte_buffer_destroy(calld->payload); - server_unref(exec_ctx, chand->server); + server_unref(chand->server); } -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { channel_data* chand = (channel_data*)elem->channel_data; GPR_ASSERT(args->is_first); @@ -900,15 +866,14 @@ static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) { +static void destroy_channel_elem(grpc_channel_element* elem) { size_t i; channel_data* chand = (channel_data*)elem->channel_data; if (chand->registered_methods) { for (i = 0; i < chand->registered_method_slots; i++) { - grpc_slice_unref_internal(exec_ctx, chand->registered_methods[i].method); + grpc_slice_unref_internal(chand->registered_methods[i].method); if (chand->registered_methods[i].has_host) { - grpc_slice_unref_internal(exec_ctx, chand->registered_methods[i].host); + grpc_slice_unref_internal(chand->registered_methods[i].host); } } gpr_free(chand->registered_methods); @@ -918,9 +883,9 @@ static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, chand->next->prev = chand->prev; chand->prev->next = chand->next; chand->next = chand->prev = chand; - maybe_finish_shutdown(exec_ctx, chand->server); + maybe_finish_shutdown(chand->server); gpr_mu_unlock(&chand->server->mu_global); - server_unref(exec_ctx, chand->server); + server_unref(chand->server); } } @@ -1034,11 +999,10 @@ void* grpc_server_register_method( return m; } -static void start_listeners(grpc_exec_ctx* exec_ctx, void* s, - grpc_error* error) { +static void start_listeners(void* s, grpc_error* error) { grpc_server* server = (grpc_server*)s; for (listener* l = server->listeners; l; l = l->next) { - l->start(exec_ctx, server, l->arg, server->pollsets, server->pollset_count); + l->start(server, l->arg, server->pollsets, server->pollset_count); } gpr_mu_lock(&server->mu_global); @@ -1046,12 +1010,12 @@ static void start_listeners(grpc_exec_ctx* exec_ctx, void* s, gpr_cv_signal(&server->starting_cv); gpr_mu_unlock(&server->mu_global); - server_unref(exec_ctx, server); + server_unref(server); } void grpc_server_start(grpc_server* server) { size_t i; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE("grpc_server_start(server=%p)", 1, (server)); @@ -1073,12 +1037,9 @@ void grpc_server_start(grpc_server* server) { server_ref(server); server->starting = true; GRPC_CLOSURE_SCHED( - &exec_ctx, GRPC_CLOSURE_CREATE(start_listeners, server, grpc_executor_scheduler(GRPC_EXECUTOR_SHORT)), GRPC_ERROR_NONE); - - grpc_exec_ctx_finish(&exec_ctx); } void grpc_server_get_pollsets(grpc_server* server, grpc_pollset*** pollsets, @@ -1087,8 +1048,7 @@ void grpc_server_get_pollsets(grpc_server* server, grpc_pollset*** pollsets, *pollsets = server->pollsets; } -void grpc_server_setup_transport(grpc_exec_ctx* exec_ctx, grpc_server* s, - grpc_transport* transport, +void grpc_server_setup_transport(grpc_server* s, grpc_transport* transport, grpc_pollset* accepting_pollset, const grpc_channel_args* args) { size_t num_registered_methods; @@ -1103,8 +1063,7 @@ void grpc_server_setup_transport(grpc_exec_ctx* exec_ctx, grpc_server* s, uint32_t max_probes = 0; grpc_transport_op* op = nullptr; - channel = grpc_channel_create(exec_ctx, nullptr, args, GRPC_SERVER_CHANNEL, - transport); + channel = grpc_channel_create(nullptr, args, GRPC_SERVER_CHANNEL, transport); chand = (channel_data*)grpc_channel_stack_element( grpc_channel_get_channel_stack(channel), 0) ->channel_data; @@ -1181,21 +1140,19 @@ void grpc_server_setup_transport(grpc_exec_ctx* exec_ctx, grpc_server* s, op->disconnect_with_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server shutdown"); } - grpc_transport_perform_op(exec_ctx, transport, op); + grpc_transport_perform_op(transport, op); } -void done_published_shutdown(grpc_exec_ctx* exec_ctx, void* done_arg, - grpc_cq_completion* storage) { +void done_published_shutdown(void* done_arg, grpc_cq_completion* storage) { (void)done_arg; gpr_free(storage); } -static void listener_destroy_done(grpc_exec_ctx* exec_ctx, void* s, - grpc_error* error) { +static void listener_destroy_done(void* s, grpc_error* error) { grpc_server* server = (grpc_server*)s; gpr_mu_lock(&server->mu_global); server->listeners_destroyed++; - maybe_finish_shutdown(exec_ctx, server); + maybe_finish_shutdown(server); gpr_mu_unlock(&server->mu_global); } @@ -1204,7 +1161,7 @@ void grpc_server_shutdown_and_notify(grpc_server* server, listener* l; shutdown_tag* sdt; channel_broadcaster broadcaster; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE("grpc_server_shutdown_and_notify(server=%p, cq=%p, tag=%p)", 3, (server, cq, tag)); @@ -1219,11 +1176,10 @@ void grpc_server_shutdown_and_notify(grpc_server* server, /* stay locked, and gather up some stuff to do */ GPR_ASSERT(grpc_cq_begin_op(cq, tag)); if (server->shutdown_published) { - grpc_cq_end_op(&exec_ctx, cq, tag, GRPC_ERROR_NONE, done_published_shutdown, - nullptr, + grpc_cq_end_op(cq, tag, GRPC_ERROR_NONE, done_published_shutdown, nullptr, (grpc_cq_completion*)gpr_malloc(sizeof(grpc_cq_completion))); gpr_mu_unlock(&server->mu_global); - goto done; + return; } server->shutdown_tags = (shutdown_tag*)gpr_realloc( server->shutdown_tags, @@ -1233,7 +1189,7 @@ void grpc_server_shutdown_and_notify(grpc_server* server, sdt->cq = cq; if (gpr_atm_acq_load(&server->shutdown_flag)) { gpr_mu_unlock(&server->mu_global); - goto done; + return; } server->last_shutdown_message_time = gpr_now(GPR_CLOCK_REALTIME); @@ -1245,30 +1201,26 @@ void grpc_server_shutdown_and_notify(grpc_server* server, /* collect all unregistered then registered calls */ gpr_mu_lock(&server->mu_call); kill_pending_work_locked( - &exec_ctx, server, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); + server, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); gpr_mu_unlock(&server->mu_call); - maybe_finish_shutdown(&exec_ctx, server); + maybe_finish_shutdown(server); gpr_mu_unlock(&server->mu_global); /* Shutdown listeners */ for (l = server->listeners; l; l = l->next) { GRPC_CLOSURE_INIT(&l->destroy_done, listener_destroy_done, server, grpc_schedule_on_exec_ctx); - l->destroy(&exec_ctx, server, l->arg, &l->destroy_done); + l->destroy(server, l->arg, &l->destroy_done); } - channel_broadcaster_shutdown(&exec_ctx, &broadcaster, true /* send_goaway */, + channel_broadcaster_shutdown(&broadcaster, true /* send_goaway */, GRPC_ERROR_NONE); - -done: - grpc_exec_ctx_finish(&exec_ctx); } void grpc_server_cancel_all_calls(grpc_server* server) { channel_broadcaster broadcaster; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE("grpc_server_cancel_all_calls(server=%p)", 1, (server)); @@ -1277,14 +1229,13 @@ void grpc_server_cancel_all_calls(grpc_server* server) { gpr_mu_unlock(&server->mu_global); channel_broadcaster_shutdown( - &exec_ctx, &broadcaster, false /* send_goaway */, + &broadcaster, false /* send_goaway */, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Cancelling all calls")); - grpc_exec_ctx_finish(&exec_ctx); } void grpc_server_destroy(grpc_server* server) { listener* l; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE("grpc_server_destroy(server=%p)", 1, (server)); @@ -1300,16 +1251,15 @@ void grpc_server_destroy(grpc_server* server) { gpr_mu_unlock(&server->mu_global); - server_unref(&exec_ctx, server); - grpc_exec_ctx_finish(&exec_ctx); + server_unref(server); } -void grpc_server_add_listener( - grpc_exec_ctx* exec_ctx, grpc_server* server, void* arg, - void (*start)(grpc_exec_ctx* exec_ctx, grpc_server* server, void* arg, - grpc_pollset** pollsets, size_t pollset_count), - void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_server* server, void* arg, - grpc_closure* on_done)) { +void grpc_server_add_listener(grpc_server* server, void* arg, + void (*start)(grpc_server* server, void* arg, + grpc_pollset** pollsets, + size_t pollset_count), + void (*destroy)(grpc_server* server, void* arg, + grpc_closure* on_done)) { listener* l = (listener*)gpr_malloc(sizeof(listener)); l->arg = arg; l->start = start; @@ -1318,13 +1268,12 @@ void grpc_server_add_listener( server->listeners = l; } -static grpc_call_error queue_call_request(grpc_exec_ctx* exec_ctx, - grpc_server* server, size_t cq_idx, +static grpc_call_error queue_call_request(grpc_server* server, size_t cq_idx, requested_call* rc) { call_data* calld = nullptr; request_matcher* rm = nullptr; if (gpr_atm_acq_load(&server->shutdown_flag)) { - fail_call(exec_ctx, server, cq_idx, rc, + fail_call(server, cq_idx, rc, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); return GRPC_CALL_OK; } @@ -1351,10 +1300,9 @@ static grpc_call_error queue_call_request(grpc_exec_ctx* exec_ctx, &calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0), grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(exec_ctx, &calld->kill_zombie_closure, - GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&calld->kill_zombie_closure, GRPC_ERROR_NONE); } else { - publish_call(exec_ctx, server, calld, cq_idx, rc); + publish_call(server, calld, cq_idx, rc); } gpr_mu_lock(&server->mu_call); } @@ -1369,9 +1317,9 @@ grpc_call_error grpc_server_request_call( grpc_completion_queue* cq_bound_to_call, grpc_completion_queue* cq_for_notification, void* tag) { grpc_call_error error; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; requested_call* rc = (requested_call*)gpr_malloc(sizeof(*rc)); - GRPC_STATS_INC_SERVER_REQUESTED_CALLS(&exec_ctx); + GRPC_STATS_INC_SERVER_REQUESTED_CALLS(); GRPC_API_TRACE( "grpc_server_request_call(" "server=%p, call=%p, details=%p, initial_metadata=%p, " @@ -1404,9 +1352,9 @@ grpc_call_error grpc_server_request_call( rc->call = call; rc->data.batch.details = details; rc->initial_metadata = initial_metadata; - error = queue_call_request(&exec_ctx, server, cq_idx, rc); + error = queue_call_request(server, cq_idx, rc); done: - grpc_exec_ctx_finish(&exec_ctx); + return error; } @@ -1416,10 +1364,10 @@ grpc_call_error grpc_server_request_registered_call( grpc_completion_queue* cq_bound_to_call, grpc_completion_queue* cq_for_notification, void* tag) { grpc_call_error error; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; requested_call* rc = (requested_call*)gpr_malloc(sizeof(*rc)); registered_method* rm = (registered_method*)rmp; - GRPC_STATS_INC_SERVER_REQUESTED_CALLS(&exec_ctx); + GRPC_STATS_INC_SERVER_REQUESTED_CALLS(); GRPC_API_TRACE( "grpc_server_request_registered_call(" "server=%p, rmp=%p, call=%p, deadline=%p, initial_metadata=%p, " @@ -1461,20 +1409,20 @@ grpc_call_error grpc_server_request_registered_call( rc->data.registered.deadline = deadline; rc->initial_metadata = initial_metadata; rc->data.registered.optional_payload = optional_payload; - error = queue_call_request(&exec_ctx, server, cq_idx, rc); + error = queue_call_request(server, cq_idx, rc); done: - grpc_exec_ctx_finish(&exec_ctx); + return error; } -static void fail_call(grpc_exec_ctx* exec_ctx, grpc_server* server, - size_t cq_idx, requested_call* rc, grpc_error* error) { +static void fail_call(grpc_server* server, size_t cq_idx, requested_call* rc, + grpc_error* error) { *rc->call = nullptr; rc->initial_metadata->count = 0; GPR_ASSERT(error != GRPC_ERROR_NONE); - grpc_cq_end_op(exec_ctx, server->cqs[cq_idx], rc->tag, error, - done_request_event, rc, &rc->completion); + grpc_cq_end_op(server->cqs[cq_idx], rc->tag, error, done_request_event, rc, + &rc->completion); } const grpc_channel_args* grpc_server_get_channel_args(grpc_server* server) { diff --git a/src/core/lib/surface/server.h b/src/core/lib/surface/server.h index d7ec025d954..63b6dff16b8 100644 --- a/src/core/lib/surface/server.h +++ b/src/core/lib/surface/server.h @@ -31,17 +31,16 @@ extern grpc_core::TraceFlag grpc_server_channel_trace; /* Add a listener to the server: when the server starts, it will call start, and when it shuts down, it will call destroy */ -void grpc_server_add_listener( - grpc_exec_ctx* exec_ctx, grpc_server* server, void* listener, - void (*start)(grpc_exec_ctx* exec_ctx, grpc_server* server, void* arg, - grpc_pollset** pollsets, size_t npollsets), - void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_server* server, void* arg, - grpc_closure* on_done)); +void grpc_server_add_listener(grpc_server* server, void* listener, + void (*start)(grpc_server* server, void* arg, + grpc_pollset** pollsets, + size_t npollsets), + void (*destroy)(grpc_server* server, void* arg, + grpc_closure* on_done)); /* Setup a transport - creates a channel stack, binds the transport to the server */ -void grpc_server_setup_transport(grpc_exec_ctx* exec_ctx, grpc_server* server, - grpc_transport* transport, +void grpc_server_setup_transport(grpc_server* server, grpc_transport* transport, grpc_pollset* accepting_pollset, const grpc_channel_args* args); diff --git a/src/core/lib/transport/bdp_estimator.cc b/src/core/lib/transport/bdp_estimator.cc index bb0e583045a..5fcc62ec432 100644 --- a/src/core/lib/transport/bdp_estimator.cc +++ b/src/core/lib/transport/bdp_estimator.cc @@ -37,7 +37,7 @@ BdpEstimator::BdpEstimator(const char* name) bw_est_(0), name_(name) {} -grpc_millis BdpEstimator::CompletePing(grpc_exec_ctx* exec_ctx) { +grpc_millis BdpEstimator::CompletePing() { gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); gpr_timespec dt_ts = gpr_time_sub(now, ping_start_time_); double dt = (double)dt_ts.tv_sec + 1e-9 * (double)dt_ts.tv_nsec; @@ -78,7 +78,7 @@ grpc_millis BdpEstimator::CompletePing(grpc_exec_ctx* exec_ctx) { } ping_state_ = PingState::UNSCHEDULED; accumulator_ = 0; - return grpc_exec_ctx_now(exec_ctx) + inter_ping_delay_; + return grpc_core::ExecCtx::Get()->Now() + inter_ping_delay_; } } // namespace grpc_core diff --git a/src/core/lib/transport/bdp_estimator.h b/src/core/lib/transport/bdp_estimator.h index df3a86c5f17..e703af121cf 100644 --- a/src/core/lib/transport/bdp_estimator.h +++ b/src/core/lib/transport/bdp_estimator.h @@ -73,7 +73,7 @@ class BdpEstimator { } // Completes a previously started ping, returns when to schedule the next one - grpc_millis CompletePing(grpc_exec_ctx* exec_ctx); + grpc_millis CompletePing(); private: enum class PingState { UNSCHEDULED, SCHEDULED, STARTED }; diff --git a/src/core/lib/transport/byte_stream.cc b/src/core/lib/transport/byte_stream.cc index b8720250e77..8dcb1e0bdb7 100644 --- a/src/core/lib/transport/byte_stream.cc +++ b/src/core/lib/transport/byte_stream.cc @@ -25,34 +25,28 @@ #include "src/core/lib/slice/slice_internal.h" -bool grpc_byte_stream_next(grpc_exec_ctx* exec_ctx, - grpc_byte_stream* byte_stream, size_t max_size_hint, +bool grpc_byte_stream_next(grpc_byte_stream* byte_stream, size_t max_size_hint, grpc_closure* on_complete) { - return byte_stream->vtable->next(exec_ctx, byte_stream, max_size_hint, - on_complete); + return byte_stream->vtable->next(byte_stream, max_size_hint, on_complete); } -grpc_error* grpc_byte_stream_pull(grpc_exec_ctx* exec_ctx, - grpc_byte_stream* byte_stream, +grpc_error* grpc_byte_stream_pull(grpc_byte_stream* byte_stream, grpc_slice* slice) { - return byte_stream->vtable->pull(exec_ctx, byte_stream, slice); + return byte_stream->vtable->pull(byte_stream, slice); } -void grpc_byte_stream_shutdown(grpc_exec_ctx* exec_ctx, - grpc_byte_stream* byte_stream, +void grpc_byte_stream_shutdown(grpc_byte_stream* byte_stream, grpc_error* error) { - byte_stream->vtable->shutdown(exec_ctx, byte_stream, error); + byte_stream->vtable->shutdown(byte_stream, error); } -void grpc_byte_stream_destroy(grpc_exec_ctx* exec_ctx, - grpc_byte_stream* byte_stream) { - byte_stream->vtable->destroy(exec_ctx, byte_stream); +void grpc_byte_stream_destroy(grpc_byte_stream* byte_stream) { + byte_stream->vtable->destroy(byte_stream); } // grpc_slice_buffer_stream -static bool slice_buffer_stream_next(grpc_exec_ctx* exec_ctx, - grpc_byte_stream* byte_stream, +static bool slice_buffer_stream_next(grpc_byte_stream* byte_stream, size_t max_size_hint, grpc_closure* on_complete) { grpc_slice_buffer_stream* stream = (grpc_slice_buffer_stream*)byte_stream; @@ -60,8 +54,7 @@ static bool slice_buffer_stream_next(grpc_exec_ctx* exec_ctx, return true; } -static grpc_error* slice_buffer_stream_pull(grpc_exec_ctx* exec_ctx, - grpc_byte_stream* byte_stream, +static grpc_error* slice_buffer_stream_pull(grpc_byte_stream* byte_stream, grpc_slice* slice) { grpc_slice_buffer_stream* stream = (grpc_slice_buffer_stream*)byte_stream; if (stream->shutdown_error != GRPC_ERROR_NONE) { @@ -74,18 +67,16 @@ static grpc_error* slice_buffer_stream_pull(grpc_exec_ctx* exec_ctx, return GRPC_ERROR_NONE; } -static void slice_buffer_stream_shutdown(grpc_exec_ctx* exec_ctx, - grpc_byte_stream* byte_stream, +static void slice_buffer_stream_shutdown(grpc_byte_stream* byte_stream, grpc_error* error) { grpc_slice_buffer_stream* stream = (grpc_slice_buffer_stream*)byte_stream; GRPC_ERROR_UNREF(stream->shutdown_error); stream->shutdown_error = error; } -static void slice_buffer_stream_destroy(grpc_exec_ctx* exec_ctx, - grpc_byte_stream* byte_stream) { +static void slice_buffer_stream_destroy(grpc_byte_stream* byte_stream) { grpc_slice_buffer_stream* stream = (grpc_slice_buffer_stream*)byte_stream; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, stream->backing_buffer); + grpc_slice_buffer_reset_and_unref_internal(stream->backing_buffer); GRPC_ERROR_UNREF(stream->shutdown_error); } @@ -113,25 +104,22 @@ void grpc_byte_stream_cache_init(grpc_byte_stream_cache* cache, grpc_slice_buffer_init(&cache->cache_buffer); } -void grpc_byte_stream_cache_destroy(grpc_exec_ctx* exec_ctx, - grpc_byte_stream_cache* cache) { - grpc_byte_stream_destroy(exec_ctx, cache->underlying_stream); - grpc_slice_buffer_destroy_internal(exec_ctx, &cache->cache_buffer); +void grpc_byte_stream_cache_destroy(grpc_byte_stream_cache* cache) { + grpc_byte_stream_destroy(cache->underlying_stream); + grpc_slice_buffer_destroy_internal(&cache->cache_buffer); } -static bool caching_byte_stream_next(grpc_exec_ctx* exec_ctx, - grpc_byte_stream* byte_stream, +static bool caching_byte_stream_next(grpc_byte_stream* byte_stream, size_t max_size_hint, grpc_closure* on_complete) { grpc_caching_byte_stream* stream = (grpc_caching_byte_stream*)byte_stream; if (stream->shutdown_error != GRPC_ERROR_NONE) return true; if (stream->cursor < stream->cache->cache_buffer.count) return true; - return grpc_byte_stream_next(exec_ctx, stream->cache->underlying_stream, - max_size_hint, on_complete); + return grpc_byte_stream_next(stream->cache->underlying_stream, max_size_hint, + on_complete); } -static grpc_error* caching_byte_stream_pull(grpc_exec_ctx* exec_ctx, - grpc_byte_stream* byte_stream, +static grpc_error* caching_byte_stream_pull(grpc_byte_stream* byte_stream, grpc_slice* slice) { grpc_caching_byte_stream* stream = (grpc_caching_byte_stream*)byte_stream; if (stream->shutdown_error != GRPC_ERROR_NONE) { @@ -144,7 +132,7 @@ static grpc_error* caching_byte_stream_pull(grpc_exec_ctx* exec_ctx, return GRPC_ERROR_NONE; } grpc_error* error = - grpc_byte_stream_pull(exec_ctx, stream->cache->underlying_stream, slice); + grpc_byte_stream_pull(stream->cache->underlying_stream, slice); if (error == GRPC_ERROR_NONE) { ++stream->cursor; grpc_slice_buffer_add(&stream->cache->cache_buffer, @@ -153,17 +141,15 @@ static grpc_error* caching_byte_stream_pull(grpc_exec_ctx* exec_ctx, return error; } -static void caching_byte_stream_shutdown(grpc_exec_ctx* exec_ctx, - grpc_byte_stream* byte_stream, +static void caching_byte_stream_shutdown(grpc_byte_stream* byte_stream, grpc_error* error) { grpc_caching_byte_stream* stream = (grpc_caching_byte_stream*)byte_stream; GRPC_ERROR_UNREF(stream->shutdown_error); stream->shutdown_error = GRPC_ERROR_REF(error); - grpc_byte_stream_shutdown(exec_ctx, stream->cache->underlying_stream, error); + grpc_byte_stream_shutdown(stream->cache->underlying_stream, error); } -static void caching_byte_stream_destroy(grpc_exec_ctx* exec_ctx, - grpc_byte_stream* byte_stream) { +static void caching_byte_stream_destroy(grpc_byte_stream* byte_stream) { grpc_caching_byte_stream* stream = (grpc_caching_byte_stream*)byte_stream; GRPC_ERROR_UNREF(stream->shutdown_error); } diff --git a/src/core/lib/transport/byte_stream.h b/src/core/lib/transport/byte_stream.h index 6bca154cb57..52c7a07f568 100644 --- a/src/core/lib/transport/byte_stream.h +++ b/src/core/lib/transport/byte_stream.h @@ -31,13 +31,11 @@ typedef struct grpc_byte_stream grpc_byte_stream; typedef struct { - bool (*next)(grpc_exec_ctx* exec_ctx, grpc_byte_stream* byte_stream, - size_t max_size_hint, grpc_closure* on_complete); - grpc_error* (*pull)(grpc_exec_ctx* exec_ctx, grpc_byte_stream* byte_stream, - grpc_slice* slice); - void (*shutdown)(grpc_exec_ctx* exec_ctx, grpc_byte_stream* byte_stream, - grpc_error* error); - void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_byte_stream* byte_stream); + bool (*next)(grpc_byte_stream* byte_stream, size_t max_size_hint, + grpc_closure* on_complete); + grpc_error* (*pull)(grpc_byte_stream* byte_stream, grpc_slice* slice); + void (*shutdown)(grpc_byte_stream* byte_stream, grpc_error* error); + void (*destroy)(grpc_byte_stream* byte_stream); } grpc_byte_stream_vtable; struct grpc_byte_stream { @@ -52,8 +50,7 @@ struct grpc_byte_stream { // // max_size_hint can be set as a hint as to the maximum number // of bytes that would be acceptable to read. -bool grpc_byte_stream_next(grpc_exec_ctx* exec_ctx, - grpc_byte_stream* byte_stream, size_t max_size_hint, +bool grpc_byte_stream_next(grpc_byte_stream* byte_stream, size_t max_size_hint, grpc_closure* on_complete); // Returns the next slice in the byte stream when it is ready (indicated by @@ -61,8 +58,7 @@ bool grpc_byte_stream_next(grpc_exec_ctx* exec_ctx, // grpc_byte_stream_next is called). // // Once a slice is returned into *slice, it is owned by the caller. -grpc_error* grpc_byte_stream_pull(grpc_exec_ctx* exec_ctx, - grpc_byte_stream* byte_stream, +grpc_error* grpc_byte_stream_pull(grpc_byte_stream* byte_stream, grpc_slice* slice); // Shuts down the byte stream. @@ -72,12 +68,10 @@ grpc_error* grpc_byte_stream_pull(grpc_exec_ctx* exec_ctx, // // The next call to grpc_byte_stream_pull() (if any) will return the error // passed to grpc_byte_stream_shutdown(). -void grpc_byte_stream_shutdown(grpc_exec_ctx* exec_ctx, - grpc_byte_stream* byte_stream, +void grpc_byte_stream_shutdown(grpc_byte_stream* byte_stream, grpc_error* error); -void grpc_byte_stream_destroy(grpc_exec_ctx* exec_ctx, - grpc_byte_stream* byte_stream); +void grpc_byte_stream_destroy(grpc_byte_stream* byte_stream); // grpc_slice_buffer_stream // @@ -119,8 +113,7 @@ void grpc_byte_stream_cache_init(grpc_byte_stream_cache* cache, grpc_byte_stream* underlying_stream); // Must not be called while still in use by a grpc_caching_byte_stream. -void grpc_byte_stream_cache_destroy(grpc_exec_ctx* exec_ctx, - grpc_byte_stream_cache* cache); +void grpc_byte_stream_cache_destroy(grpc_byte_stream_cache* cache); typedef struct { grpc_byte_stream base; diff --git a/src/core/lib/transport/connectivity_state.cc b/src/core/lib/transport/connectivity_state.cc index e7e5dbd1f15..c42cc9c8d05 100644 --- a/src/core/lib/transport/connectivity_state.cc +++ b/src/core/lib/transport/connectivity_state.cc @@ -51,8 +51,7 @@ void grpc_connectivity_state_init(grpc_connectivity_state_tracker* tracker, tracker->name = gpr_strdup(name); } -void grpc_connectivity_state_destroy(grpc_exec_ctx* exec_ctx, - grpc_connectivity_state_tracker* tracker) { +void grpc_connectivity_state_destroy(grpc_connectivity_state_tracker* tracker) { grpc_error* error; grpc_connectivity_state_watcher* w; while ((w = tracker->watchers)) { @@ -65,7 +64,7 @@ void grpc_connectivity_state_destroy(grpc_exec_ctx* exec_ctx, error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Shutdown connectivity owner"); } - GRPC_CLOSURE_SCHED(exec_ctx, w->notify, error); + GRPC_CLOSURE_SCHED(w->notify, error); gpr_free(w); } GRPC_ERROR_UNREF(tracker->current_error); @@ -105,8 +104,8 @@ bool grpc_connectivity_state_has_watchers( } bool grpc_connectivity_state_notify_on_state_change( - grpc_exec_ctx* exec_ctx, grpc_connectivity_state_tracker* tracker, - grpc_connectivity_state* current, grpc_closure* notify) { + grpc_connectivity_state_tracker* tracker, grpc_connectivity_state* current, + grpc_closure* notify) { grpc_connectivity_state cur = (grpc_connectivity_state)gpr_atm_no_barrier_load( &tracker->current_state_atm); @@ -123,7 +122,7 @@ bool grpc_connectivity_state_notify_on_state_change( if (current == nullptr) { grpc_connectivity_state_watcher* w = tracker->watchers; if (w != nullptr && w->notify == notify) { - GRPC_CLOSURE_SCHED(exec_ctx, notify, GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(notify, GRPC_ERROR_CANCELLED); tracker->watchers = w->next; gpr_free(w); return false; @@ -131,7 +130,7 @@ bool grpc_connectivity_state_notify_on_state_change( while (w != nullptr) { grpc_connectivity_state_watcher* rm_candidate = w->next; if (rm_candidate != nullptr && rm_candidate->notify == notify) { - GRPC_CLOSURE_SCHED(exec_ctx, notify, GRPC_ERROR_CANCELLED); + GRPC_CLOSURE_SCHED(notify, GRPC_ERROR_CANCELLED); w->next = w->next->next; gpr_free(rm_candidate); return false; @@ -142,8 +141,7 @@ bool grpc_connectivity_state_notify_on_state_change( } else { if (cur != *current) { *current = cur; - GRPC_CLOSURE_SCHED(exec_ctx, notify, - GRPC_ERROR_REF(tracker->current_error)); + GRPC_CLOSURE_SCHED(notify, GRPC_ERROR_REF(tracker->current_error)); } else { grpc_connectivity_state_watcher* w = (grpc_connectivity_state_watcher*)gpr_malloc(sizeof(*w)); @@ -156,8 +154,7 @@ bool grpc_connectivity_state_notify_on_state_change( } } -void grpc_connectivity_state_set(grpc_exec_ctx* exec_ctx, - grpc_connectivity_state_tracker* tracker, +void grpc_connectivity_state_set(grpc_connectivity_state_tracker* tracker, grpc_connectivity_state state, grpc_error* error, const char* reason) { grpc_connectivity_state cur = @@ -195,8 +192,7 @@ void grpc_connectivity_state_set(grpc_exec_ctx* exec_ctx, gpr_log(GPR_DEBUG, "NOTIFY: %p %s: %p", tracker, tracker->name, w->notify); } - GRPC_CLOSURE_SCHED(exec_ctx, w->notify, - GRPC_ERROR_REF(tracker->current_error)); + GRPC_CLOSURE_SCHED(w->notify, GRPC_ERROR_REF(tracker->current_error)); gpr_free(w); } } diff --git a/src/core/lib/transport/connectivity_state.h b/src/core/lib/transport/connectivity_state.h index 653637ebea6..c3a50f3211f 100644 --- a/src/core/lib/transport/connectivity_state.h +++ b/src/core/lib/transport/connectivity_state.h @@ -51,13 +51,11 @@ const char* grpc_connectivity_state_name(grpc_connectivity_state state); void grpc_connectivity_state_init(grpc_connectivity_state_tracker* tracker, grpc_connectivity_state init_state, const char* name); -void grpc_connectivity_state_destroy(grpc_exec_ctx* exec_ctx, - grpc_connectivity_state_tracker* tracker); +void grpc_connectivity_state_destroy(grpc_connectivity_state_tracker* tracker); /** Set connectivity state; not thread safe; access must be serialized with an * external lock */ -void grpc_connectivity_state_set(grpc_exec_ctx* exec_ctx, - grpc_connectivity_state_tracker* tracker, +void grpc_connectivity_state_set(grpc_connectivity_state_tracker* tracker, grpc_connectivity_state state, grpc_error* associated_error, const char* reason); @@ -81,7 +79,7 @@ grpc_connectivity_state grpc_connectivity_state_get( case). Access must be serialized with an external lock. */ bool grpc_connectivity_state_notify_on_state_change( - grpc_exec_ctx* exec_ctx, grpc_connectivity_state_tracker* tracker, - grpc_connectivity_state* current, grpc_closure* notify); + grpc_connectivity_state_tracker* tracker, grpc_connectivity_state* current, + grpc_closure* notify); #endif /* GRPC_CORE_LIB_TRANSPORT_CONNECTIVITY_STATE_H */ diff --git a/src/core/lib/transport/error_utils.cc b/src/core/lib/transport/error_utils.cc index 69c8ae6de36..ffaf327081f 100644 --- a/src/core/lib/transport/error_utils.cc +++ b/src/core/lib/transport/error_utils.cc @@ -40,9 +40,9 @@ static grpc_error* recursively_find_error_with_field(grpc_error* error, return nullptr; } -void grpc_error_get_status(grpc_exec_ctx* exec_ctx, grpc_error* error, - grpc_millis deadline, grpc_status_code* code, - grpc_slice* slice, grpc_http2_error_code* http_error, +void grpc_error_get_status(grpc_error* error, grpc_millis deadline, + grpc_status_code* code, grpc_slice* slice, + grpc_http2_error_code* http_error, const char** error_string) { // Start with the parent error and recurse through the tree of children // until we find the first one that has a status code. @@ -65,8 +65,8 @@ void grpc_error_get_status(grpc_exec_ctx* exec_ctx, grpc_error* error, status = (grpc_status_code)integer; } else if (grpc_error_get_int(found_error, GRPC_ERROR_INT_HTTP2_ERROR, &integer)) { - status = grpc_http2_error_to_grpc_status( - exec_ctx, (grpc_http2_error_code)integer, deadline); + status = grpc_http2_error_to_grpc_status((grpc_http2_error_code)integer, + deadline); } if (code != nullptr) *code = status; diff --git a/src/core/lib/transport/error_utils.h b/src/core/lib/transport/error_utils.h index 8b006ae9921..4100f65d6d1 100644 --- a/src/core/lib/transport/error_utils.h +++ b/src/core/lib/transport/error_utils.h @@ -30,9 +30,8 @@ /// be populated with the entire error string. If any of the attributes (code, /// msg, http_status, error_string) are unneeded, they can be passed as /// NULL. -void grpc_error_get_status(grpc_exec_ctx* exec_ctx, grpc_error* error, - grpc_millis deadline, grpc_status_code* code, - grpc_slice* slice, +void grpc_error_get_status(grpc_error* error, grpc_millis deadline, + grpc_status_code* code, grpc_slice* slice, grpc_http2_error_code* http_status, const char** error_string); diff --git a/src/core/lib/transport/metadata.cc b/src/core/lib/transport/metadata.cc index 0f30c7533db..5f0673e0142 100644 --- a/src/core/lib/transport/metadata.cc +++ b/src/core/lib/transport/metadata.cc @@ -108,7 +108,7 @@ typedef struct mdtab_shard { static mdtab_shard g_shards[SHARD_COUNT]; -static void gc_mdtab(grpc_exec_ctx* exec_ctx, mdtab_shard* shard); +static void gc_mdtab(mdtab_shard* shard); void grpc_mdctx_global_init(void) { /* initialize shards */ @@ -123,11 +123,11 @@ void grpc_mdctx_global_init(void) { } } -void grpc_mdctx_global_shutdown(grpc_exec_ctx* exec_ctx) { +void grpc_mdctx_global_shutdown() { for (size_t i = 0; i < SHARD_COUNT; i++) { mdtab_shard* shard = &g_shards[i]; gpr_mu_destroy(&shard->mu); - gc_mdtab(exec_ctx, shard); + gc_mdtab(shard); /* TODO(ctiller): GPR_ASSERT(shard->count == 0); */ if (shard->count != 0) { gpr_log(GPR_DEBUG, "WARNING: %" PRIuPTR " metadata elements were leaked", @@ -165,7 +165,7 @@ static void ref_md_locked(mdtab_shard* shard, } } -static void gc_mdtab(grpc_exec_ctx* exec_ctx, mdtab_shard* shard) { +static void gc_mdtab(mdtab_shard* shard) { size_t i; interned_metadata** prev_next; interned_metadata *md, *next; @@ -178,8 +178,8 @@ static void gc_mdtab(grpc_exec_ctx* exec_ctx, mdtab_shard* shard) { void* user_data = (void*)gpr_atm_no_barrier_load(&md->user_data); next = md->bucket_next; if (gpr_atm_acq_load(&md->refcnt) == 0) { - grpc_slice_unref_internal(exec_ctx, md->key); - grpc_slice_unref_internal(exec_ctx, md->value); + grpc_slice_unref_internal(md->key); + grpc_slice_unref_internal(md->value); if (md->user_data) { ((destroy_user_data_func)gpr_atm_no_barrier_load( &md->destroy_user_data))(user_data); @@ -228,17 +228,17 @@ static void grow_mdtab(mdtab_shard* shard) { GPR_TIMER_END("grow_mdtab", 0); } -static void rehash_mdtab(grpc_exec_ctx* exec_ctx, mdtab_shard* shard) { +static void rehash_mdtab(mdtab_shard* shard) { if (gpr_atm_no_barrier_load(&shard->free_estimate) > (gpr_atm)(shard->capacity / 4)) { - gc_mdtab(exec_ctx, shard); + gc_mdtab(shard); } else { grow_mdtab(shard); } } grpc_mdelem grpc_mdelem_create( - grpc_exec_ctx* exec_ctx, grpc_slice key, grpc_slice value, + grpc_slice key, grpc_slice value, grpc_mdelem_data* compatible_external_backing_store) { if (!grpc_slice_is_interned(key) || !grpc_slice_is_interned(value)) { if (compatible_external_backing_store != nullptr) { @@ -318,7 +318,7 @@ grpc_mdelem grpc_mdelem_create( shard->count++; if (shard->count > shard->capacity * 2) { - rehash_mdtab(exec_ctx, shard); + rehash_mdtab(shard); } gpr_mu_unlock(&shard->mu); @@ -328,22 +328,20 @@ grpc_mdelem grpc_mdelem_create( return GRPC_MAKE_MDELEM(md, GRPC_MDELEM_STORAGE_INTERNED); } -grpc_mdelem grpc_mdelem_from_slices(grpc_exec_ctx* exec_ctx, grpc_slice key, - grpc_slice value) { - grpc_mdelem out = grpc_mdelem_create(exec_ctx, key, value, nullptr); - grpc_slice_unref_internal(exec_ctx, key); - grpc_slice_unref_internal(exec_ctx, value); +grpc_mdelem grpc_mdelem_from_slices(grpc_slice key, grpc_slice value) { + grpc_mdelem out = grpc_mdelem_create(key, value, nullptr); + grpc_slice_unref_internal(key); + grpc_slice_unref_internal(value); return out; } -grpc_mdelem grpc_mdelem_from_grpc_metadata(grpc_exec_ctx* exec_ctx, - grpc_metadata* metadata) { +grpc_mdelem grpc_mdelem_from_grpc_metadata(grpc_metadata* metadata) { bool changed = false; grpc_slice key_slice = grpc_slice_maybe_static_intern(metadata->key, &changed); grpc_slice value_slice = grpc_slice_maybe_static_intern(metadata->value, &changed); - return grpc_mdelem_create(exec_ctx, key_slice, value_slice, + return grpc_mdelem_create(key_slice, value_slice, changed ? nullptr : (grpc_mdelem_data*)metadata); } @@ -417,7 +415,7 @@ grpc_mdelem grpc_mdelem_ref(grpc_mdelem gmd DEBUG_ARGS) { return gmd; } -void grpc_mdelem_unref(grpc_exec_ctx* exec_ctx, grpc_mdelem gmd DEBUG_ARGS) { +void grpc_mdelem_unref(grpc_mdelem gmd DEBUG_ARGS) { switch (GRPC_MDELEM_STORAGE(gmd)) { case GRPC_MDELEM_STORAGE_EXTERNAL: case GRPC_MDELEM_STORAGE_STATIC: @@ -465,8 +463,8 @@ void grpc_mdelem_unref(grpc_exec_ctx* exec_ctx, grpc_mdelem gmd DEBUG_ARGS) { const gpr_atm prev_refcount = gpr_atm_full_fetch_add(&md->refcnt, -1); GPR_ASSERT(prev_refcount >= 1); if (1 == prev_refcount) { - grpc_slice_unref_internal(exec_ctx, md->key); - grpc_slice_unref_internal(exec_ctx, md->value); + grpc_slice_unref_internal(md->key); + grpc_slice_unref_internal(md->value); gpr_free(md); } break; diff --git a/src/core/lib/transport/metadata.h b/src/core/lib/transport/metadata.h index 8d4868d0316..78e6beff9bf 100644 --- a/src/core/lib/transport/metadata.h +++ b/src/core/lib/transport/metadata.h @@ -107,20 +107,18 @@ struct grpc_mdelem { (uintptr_t)GRPC_MDELEM_STORAGE_INTERNED_BIT)) /* Unrefs the slices. */ -grpc_mdelem grpc_mdelem_from_slices(grpc_exec_ctx* exec_ctx, grpc_slice key, - grpc_slice value); +grpc_mdelem grpc_mdelem_from_slices(grpc_slice key, grpc_slice value); /* Cheaply convert a grpc_metadata to a grpc_mdelem; may use the grpc_metadata object as backing storage (so lifetimes should align) */ -grpc_mdelem grpc_mdelem_from_grpc_metadata(grpc_exec_ctx* exec_ctx, - grpc_metadata* metadata); +grpc_mdelem grpc_mdelem_from_grpc_metadata(grpc_metadata* metadata); /* Does not unref the slices; if a new non-interned mdelem is needed, allocates one if compatible_external_backing_store is NULL, or uses compatible_external_backing_store if it is non-NULL (in which case it's the users responsibility to ensure that it outlives usage) */ grpc_mdelem grpc_mdelem_create( - grpc_exec_ctx* exec_ctx, grpc_slice key, grpc_slice value, + grpc_slice key, grpc_slice value, grpc_mdelem_data* compatible_external_backing_store); bool grpc_mdelem_eq(grpc_mdelem a, grpc_mdelem b); @@ -136,16 +134,14 @@ void* grpc_mdelem_set_user_data(grpc_mdelem md, void (*destroy_func)(void*), #ifndef NDEBUG #define GRPC_MDELEM_REF(s) grpc_mdelem_ref((s), __FILE__, __LINE__) -#define GRPC_MDELEM_UNREF(exec_ctx, s) \ - grpc_mdelem_unref((exec_ctx), (s), __FILE__, __LINE__) +#define GRPC_MDELEM_UNREF(s) grpc_mdelem_unref((s), __FILE__, __LINE__) grpc_mdelem grpc_mdelem_ref(grpc_mdelem md, const char* file, int line); -void grpc_mdelem_unref(grpc_exec_ctx* exec_ctx, grpc_mdelem md, - const char* file, int line); +void grpc_mdelem_unref(grpc_mdelem md, const char* file, int line); #else #define GRPC_MDELEM_REF(s) grpc_mdelem_ref((s)) -#define GRPC_MDELEM_UNREF(exec_ctx, s) grpc_mdelem_unref((exec_ctx), (s)) +#define GRPC_MDELEM_UNREF(s) grpc_mdelem_unref((s)) grpc_mdelem grpc_mdelem_ref(grpc_mdelem md); -void grpc_mdelem_unref(grpc_exec_ctx* exec_ctx, grpc_mdelem md); +void grpc_mdelem_unref(grpc_mdelem md); #endif #define GRPC_MDKEY(md) (GRPC_MDELEM_DATA(md)->key) @@ -162,6 +158,6 @@ void grpc_mdelem_unref(grpc_exec_ctx* exec_ctx, grpc_mdelem md); #define GRPC_MDSTR_KV_HASH(k_hash, v_hash) (GPR_ROTL((k_hash), 2) ^ (v_hash)) void grpc_mdctx_global_init(void); -void grpc_mdctx_global_shutdown(grpc_exec_ctx* exec_ctx); +void grpc_mdctx_global_shutdown(); #endif /* GRPC_CORE_LIB_TRANSPORT_METADATA_H */ diff --git a/src/core/lib/transport/metadata_batch.cc b/src/core/lib/transport/metadata_batch.cc index 5817765aa39..9c95339ba06 100644 --- a/src/core/lib/transport/metadata_batch.cc +++ b/src/core/lib/transport/metadata_batch.cc @@ -51,8 +51,7 @@ static void assert_valid_list(grpc_mdelem_list* list) { #endif /* NDEBUG */ } -static void assert_valid_callouts(grpc_exec_ctx* exec_ctx, - grpc_metadata_batch* batch) { +static void assert_valid_callouts(grpc_metadata_batch* batch) { #ifndef NDEBUG for (grpc_linked_mdelem* l = batch->list.head; l != nullptr; l = l->next) { grpc_slice key_interned = grpc_slice_intern(GRPC_MDKEY(l->md)); @@ -61,7 +60,7 @@ static void assert_valid_callouts(grpc_exec_ctx* exec_ctx, if (callout_idx != GRPC_BATCH_CALLOUTS_COUNT) { GPR_ASSERT(batch->idx.array[callout_idx] == l); } - grpc_slice_unref_internal(exec_ctx, key_interned); + grpc_slice_unref_internal(key_interned); } #endif } @@ -77,11 +76,10 @@ void grpc_metadata_batch_init(grpc_metadata_batch* batch) { batch->deadline = GRPC_MILLIS_INF_FUTURE; } -void grpc_metadata_batch_destroy(grpc_exec_ctx* exec_ctx, - grpc_metadata_batch* batch) { +void grpc_metadata_batch_destroy(grpc_metadata_batch* batch) { grpc_linked_mdelem* l; for (l = batch->list.head; l; l = l->next) { - GRPC_MDELEM_UNREF(exec_ctx, l->md); + GRPC_MDELEM_UNREF(l->md); } } @@ -126,13 +124,12 @@ static void maybe_unlink_callout(grpc_metadata_batch* batch, batch->idx.array[idx] = nullptr; } -grpc_error* grpc_metadata_batch_add_head(grpc_exec_ctx* exec_ctx, - grpc_metadata_batch* batch, +grpc_error* grpc_metadata_batch_add_head(grpc_metadata_batch* batch, grpc_linked_mdelem* storage, grpc_mdelem elem_to_add) { GPR_ASSERT(!GRPC_MDISNULL(elem_to_add)); storage->md = elem_to_add; - return grpc_metadata_batch_link_head(exec_ctx, batch, storage); + return grpc_metadata_batch_link_head(batch, storage); } static void link_head(grpc_mdelem_list* list, grpc_linked_mdelem* storage) { @@ -150,27 +147,25 @@ static void link_head(grpc_mdelem_list* list, grpc_linked_mdelem* storage) { assert_valid_list(list); } -grpc_error* grpc_metadata_batch_link_head(grpc_exec_ctx* exec_ctx, - grpc_metadata_batch* batch, +grpc_error* grpc_metadata_batch_link_head(grpc_metadata_batch* batch, grpc_linked_mdelem* storage) { - assert_valid_callouts(exec_ctx, batch); + assert_valid_callouts(batch); grpc_error* err = maybe_link_callout(batch, storage); if (err != GRPC_ERROR_NONE) { - assert_valid_callouts(exec_ctx, batch); + assert_valid_callouts(batch); return err; } link_head(&batch->list, storage); - assert_valid_callouts(exec_ctx, batch); + assert_valid_callouts(batch); return GRPC_ERROR_NONE; } -grpc_error* grpc_metadata_batch_add_tail(grpc_exec_ctx* exec_ctx, - grpc_metadata_batch* batch, +grpc_error* grpc_metadata_batch_add_tail(grpc_metadata_batch* batch, grpc_linked_mdelem* storage, grpc_mdelem elem_to_add) { GPR_ASSERT(!GRPC_MDISNULL(elem_to_add)); storage->md = elem_to_add; - return grpc_metadata_batch_link_tail(exec_ctx, batch, storage); + return grpc_metadata_batch_link_tail(batch, storage); } static void link_tail(grpc_mdelem_list* list, grpc_linked_mdelem* storage) { @@ -189,17 +184,16 @@ static void link_tail(grpc_mdelem_list* list, grpc_linked_mdelem* storage) { assert_valid_list(list); } -grpc_error* grpc_metadata_batch_link_tail(grpc_exec_ctx* exec_ctx, - grpc_metadata_batch* batch, +grpc_error* grpc_metadata_batch_link_tail(grpc_metadata_batch* batch, grpc_linked_mdelem* storage) { - assert_valid_callouts(exec_ctx, batch); + assert_valid_callouts(batch); grpc_error* err = maybe_link_callout(batch, storage); if (err != GRPC_ERROR_NONE) { - assert_valid_callouts(exec_ctx, batch); + assert_valid_callouts(batch); return err; } link_tail(&batch->list, storage); - assert_valid_callouts(exec_ctx, batch); + assert_valid_callouts(batch); return GRPC_ERROR_NONE; } @@ -220,31 +214,28 @@ static void unlink_storage(grpc_mdelem_list* list, assert_valid_list(list); } -void grpc_metadata_batch_remove(grpc_exec_ctx* exec_ctx, - grpc_metadata_batch* batch, +void grpc_metadata_batch_remove(grpc_metadata_batch* batch, grpc_linked_mdelem* storage) { - assert_valid_callouts(exec_ctx, batch); + assert_valid_callouts(batch); maybe_unlink_callout(batch, storage); unlink_storage(&batch->list, storage); - GRPC_MDELEM_UNREF(exec_ctx, storage->md); - assert_valid_callouts(exec_ctx, batch); + GRPC_MDELEM_UNREF(storage->md); + assert_valid_callouts(batch); } -void grpc_metadata_batch_set_value(grpc_exec_ctx* exec_ctx, - grpc_linked_mdelem* storage, +void grpc_metadata_batch_set_value(grpc_linked_mdelem* storage, grpc_slice value) { grpc_mdelem old_mdelem = storage->md; grpc_mdelem new_mdelem = grpc_mdelem_from_slices( - exec_ctx, grpc_slice_ref_internal(GRPC_MDKEY(old_mdelem)), value); + grpc_slice_ref_internal(GRPC_MDKEY(old_mdelem)), value); storage->md = new_mdelem; - GRPC_MDELEM_UNREF(exec_ctx, old_mdelem); + GRPC_MDELEM_UNREF(old_mdelem); } -grpc_error* grpc_metadata_batch_substitute(grpc_exec_ctx* exec_ctx, - grpc_metadata_batch* batch, +grpc_error* grpc_metadata_batch_substitute(grpc_metadata_batch* batch, grpc_linked_mdelem* storage, grpc_mdelem new_mdelem) { - assert_valid_callouts(exec_ctx, batch); + assert_valid_callouts(batch); grpc_error* error = GRPC_ERROR_NONE; grpc_mdelem old_mdelem = storage->md; if (!grpc_slice_eq(GRPC_MDKEY(new_mdelem), GRPC_MDKEY(old_mdelem))) { @@ -253,19 +244,18 @@ grpc_error* grpc_metadata_batch_substitute(grpc_exec_ctx* exec_ctx, error = maybe_link_callout(batch, storage); if (error != GRPC_ERROR_NONE) { unlink_storage(&batch->list, storage); - GRPC_MDELEM_UNREF(exec_ctx, storage->md); + GRPC_MDELEM_UNREF(storage->md); } } else { storage->md = new_mdelem; } - GRPC_MDELEM_UNREF(exec_ctx, old_mdelem); - assert_valid_callouts(exec_ctx, batch); + GRPC_MDELEM_UNREF(old_mdelem); + assert_valid_callouts(batch); return error; } -void grpc_metadata_batch_clear(grpc_exec_ctx* exec_ctx, - grpc_metadata_batch* batch) { - grpc_metadata_batch_destroy(exec_ctx, batch); +void grpc_metadata_batch_clear(grpc_metadata_batch* batch) { + grpc_metadata_batch_destroy(batch); grpc_metadata_batch_init(batch); } @@ -292,8 +282,7 @@ static void add_error(grpc_error** composite, grpc_error* error, *composite = grpc_error_add_child(*composite, error); } -grpc_error* grpc_metadata_batch_filter(grpc_exec_ctx* exec_ctx, - grpc_metadata_batch* batch, +grpc_error* grpc_metadata_batch_filter(grpc_metadata_batch* batch, grpc_metadata_batch_filter_func func, void* user_data, const char* composite_error_string) { @@ -301,12 +290,12 @@ grpc_error* grpc_metadata_batch_filter(grpc_exec_ctx* exec_ctx, grpc_error* error = GRPC_ERROR_NONE; while (l) { grpc_linked_mdelem* next = l->next; - grpc_filtered_mdelem new_mdelem = func(exec_ctx, user_data, l->md); + grpc_filtered_mdelem new_mdelem = func(user_data, l->md); add_error(&error, new_mdelem.error, composite_error_string); if (GRPC_MDISNULL(new_mdelem.md)) { - grpc_metadata_batch_remove(exec_ctx, batch, l); + grpc_metadata_batch_remove(batch, l); } else if (new_mdelem.md.payload != l->md.payload) { - grpc_metadata_batch_substitute(exec_ctx, batch, l, new_mdelem.md); + grpc_metadata_batch_substitute(batch, l, new_mdelem.md); } l = next; } diff --git a/src/core/lib/transport/metadata_batch.h b/src/core/lib/transport/metadata_batch.h index adfb2d80694..8353a426f83 100644 --- a/src/core/lib/transport/metadata_batch.h +++ b/src/core/lib/transport/metadata_batch.h @@ -53,28 +53,23 @@ typedef struct grpc_metadata_batch { } grpc_metadata_batch; void grpc_metadata_batch_init(grpc_metadata_batch* batch); -void grpc_metadata_batch_destroy(grpc_exec_ctx* exec_ctx, - grpc_metadata_batch* batch); -void grpc_metadata_batch_clear(grpc_exec_ctx* exec_ctx, - grpc_metadata_batch* batch); +void grpc_metadata_batch_destroy(grpc_metadata_batch* batch); +void grpc_metadata_batch_clear(grpc_metadata_batch* batch); bool grpc_metadata_batch_is_empty(grpc_metadata_batch* batch); /* Returns the transport size of the batch. */ size_t grpc_metadata_batch_size(grpc_metadata_batch* batch); /** Remove \a storage from the batch, unreffing the mdelem contained */ -void grpc_metadata_batch_remove(grpc_exec_ctx* exec_ctx, - grpc_metadata_batch* batch, +void grpc_metadata_batch_remove(grpc_metadata_batch* batch, grpc_linked_mdelem* storage); /** Substitute a new mdelem for an old value */ -grpc_error* grpc_metadata_batch_substitute(grpc_exec_ctx* exec_ctx, - grpc_metadata_batch* batch, +grpc_error* grpc_metadata_batch_substitute(grpc_metadata_batch* batch, grpc_linked_mdelem* storage, grpc_mdelem new_value); -void grpc_metadata_batch_set_value(grpc_exec_ctx* exec_ctx, - grpc_linked_mdelem* storage, +void grpc_metadata_batch_set_value(grpc_linked_mdelem* storage, grpc_slice value); /** Add \a storage to the beginning of \a batch. storage->md is @@ -82,17 +77,17 @@ void grpc_metadata_batch_set_value(grpc_exec_ctx* exec_ctx, \a storage is owned by the caller and must survive for the lifetime of batch. This usually means it should be around for the lifetime of the call. */ -grpc_error* grpc_metadata_batch_link_head( - grpc_exec_ctx* exec_ctx, grpc_metadata_batch* batch, - grpc_linked_mdelem* storage) GRPC_MUST_USE_RESULT; +grpc_error* grpc_metadata_batch_link_head(grpc_metadata_batch* batch, + grpc_linked_mdelem* storage) + GRPC_MUST_USE_RESULT; /** Add \a storage to the end of \a batch. storage->md is assumed to be valid. \a storage is owned by the caller and must survive for the lifetime of batch. This usually means it should be around for the lifetime of the call. */ -grpc_error* grpc_metadata_batch_link_tail( - grpc_exec_ctx* exec_ctx, grpc_metadata_batch* batch, - grpc_linked_mdelem* storage) GRPC_MUST_USE_RESULT; +grpc_error* grpc_metadata_batch_link_tail(grpc_metadata_batch* batch, + grpc_linked_mdelem* storage) + GRPC_MUST_USE_RESULT; /** Add \a elem_to_add as the first element in \a batch, using \a storage as backing storage for the linked list element. @@ -101,8 +96,8 @@ grpc_error* grpc_metadata_batch_link_tail( for the lifetime of the call. Takes ownership of \a elem_to_add */ grpc_error* grpc_metadata_batch_add_head( - grpc_exec_ctx* exec_ctx, grpc_metadata_batch* batch, - grpc_linked_mdelem* storage, grpc_mdelem elem_to_add) GRPC_MUST_USE_RESULT; + grpc_metadata_batch* batch, grpc_linked_mdelem* storage, + grpc_mdelem elem_to_add) GRPC_MUST_USE_RESULT; /** Add \a elem_to_add as the last element in \a batch, using \a storage as backing storage for the linked list element. \a storage is owned by the caller and must survive for the @@ -110,8 +105,8 @@ grpc_error* grpc_metadata_batch_add_head( for the lifetime of the call. Takes ownership of \a elem_to_add */ grpc_error* grpc_metadata_batch_add_tail( - grpc_exec_ctx* exec_ctx, grpc_metadata_batch* batch, - grpc_linked_mdelem* storage, grpc_mdelem elem_to_add) GRPC_MUST_USE_RESULT; + grpc_metadata_batch* batch, grpc_linked_mdelem* storage, + grpc_mdelem elem_to_add) GRPC_MUST_USE_RESULT; grpc_error* grpc_attach_md_to_error(grpc_error* src, grpc_mdelem md); @@ -128,11 +123,10 @@ typedef struct { { GRPC_ERROR_NONE, GRPC_MDNULL } typedef grpc_filtered_mdelem (*grpc_metadata_batch_filter_func)( - grpc_exec_ctx* exec_ctx, void* user_data, grpc_mdelem elem); + void* user_data, grpc_mdelem elem); grpc_error* grpc_metadata_batch_filter( - grpc_exec_ctx* exec_ctx, grpc_metadata_batch* batch, - grpc_metadata_batch_filter_func func, void* user_data, - const char* composite_error_string) GRPC_MUST_USE_RESULT; + grpc_metadata_batch* batch, grpc_metadata_batch_filter_func func, + void* user_data, const char* composite_error_string) GRPC_MUST_USE_RESULT; #ifndef NDEBUG void grpc_metadata_batch_assert_ok(grpc_metadata_batch* comd); diff --git a/src/core/lib/transport/service_config.cc b/src/core/lib/transport/service_config.cc index adcec8c4448..cbafc338404 100644 --- a/src/core/lib/transport/service_config.cc +++ b/src/core/lib/transport/service_config.cc @@ -152,10 +152,8 @@ static char* parse_json_method_name(grpc_json* json) { // each name found, incrementing \a idx for each entry added. // Returns false on error. static bool parse_json_method_config( - grpc_exec_ctx* exec_ctx, grpc_json* json, - void* (*create_value)(const grpc_json* method_config_json), - void* (*ref_value)(void* value), - void (*unref_value)(grpc_exec_ctx* exec_ctx, void* value), + grpc_json* json, void* (*create_value)(const grpc_json* method_config_json), + void* (*ref_value)(void* value), void (*unref_value)(void* value), grpc_slice_hash_table_entry* entries, size_t* idx) { // Construct value. void* method_config = create_value(json); @@ -184,16 +182,15 @@ static bool parse_json_method_config( } success = true; done: - unref_value(exec_ctx, method_config); + unref_value(method_config); gpr_strvec_destroy(&paths); return success; } grpc_slice_hash_table* grpc_service_config_create_method_config_table( - grpc_exec_ctx* exec_ctx, const grpc_service_config* service_config, + const grpc_service_config* service_config, void* (*create_value)(const grpc_json* method_config_json), - void* (*ref_value)(void* value), - void (*unref_value)(grpc_exec_ctx* exec_ctx, void* value)) { + void* (*ref_value)(void* value), void (*unref_value)(void* value)) { const grpc_json* json = service_config->json_tree; // Traverse parsed JSON tree. if (json->type != GRPC_JSON_OBJECT || json->key != nullptr) return nullptr; @@ -217,11 +214,11 @@ grpc_slice_hash_table* grpc_service_config_create_method_config_table( size_t idx = 0; for (grpc_json* method = field->child; method != nullptr; method = method->next) { - if (!parse_json_method_config(exec_ctx, method, create_value, ref_value, + if (!parse_json_method_config(method, create_value, ref_value, unref_value, entries, &idx)) { for (size_t i = 0; i < idx; ++i) { - grpc_slice_unref_internal(exec_ctx, entries[i].key); - unref_value(exec_ctx, entries[i].value); + grpc_slice_unref_internal(entries[i].key); + unref_value(entries[i].value); } gpr_free(entries); return nullptr; @@ -240,8 +237,7 @@ grpc_slice_hash_table* grpc_service_config_create_method_config_table( return method_config_table; } -void* grpc_method_config_table_get(grpc_exec_ctx* exec_ctx, - const grpc_slice_hash_table* table, +void* grpc_method_config_table_get(const grpc_slice_hash_table* table, grpc_slice path) { void* value = grpc_slice_hash_table_get(table, path); // If we didn't find a match for the path, try looking for a wildcard @@ -257,7 +253,7 @@ void* grpc_method_config_table_get(grpc_exec_ctx* exec_ctx, grpc_slice wildcard_path = grpc_slice_from_copied_string(buf); gpr_free(buf); value = grpc_slice_hash_table_get(table, wildcard_path); - grpc_slice_unref_internal(exec_ctx, wildcard_path); + grpc_slice_unref_internal(wildcard_path); gpr_free(path_str); } return value; diff --git a/src/core/lib/transport/service_config.h b/src/core/lib/transport/service_config.h index 75a290bfd80..98554b9f0fc 100644 --- a/src/core/lib/transport/service_config.h +++ b/src/core/lib/transport/service_config.h @@ -45,10 +45,9 @@ const char* grpc_service_config_get_lb_policy_name( /// \a ref_value() and \a unref_value() are used to ref and unref values. /// Returns NULL on error. grpc_slice_hash_table* grpc_service_config_create_method_config_table( - grpc_exec_ctx* exec_ctx, const grpc_service_config* service_config, + const grpc_service_config* service_config, void* (*create_value)(const grpc_json* method_config_json), - void* (*ref_value)(void* value), - void (*unref_value)(grpc_exec_ctx* exec_ctx, void* value)); + void* (*ref_value)(void* value), void (*unref_value)(void* value)); /// A helper function for looking up values in the table returned by /// \a grpc_service_config_create_method_config_table(). @@ -56,8 +55,7 @@ grpc_slice_hash_table* grpc_service_config_create_method_config_table( /// the form "/service/method". /// Returns NULL if the method has no config. /// Caller does NOT own a reference to the result. -void* grpc_method_config_table_get(grpc_exec_ctx* exec_ctx, - const grpc_slice_hash_table* table, +void* grpc_method_config_table_get(const grpc_slice_hash_table* table, grpc_slice path); #endif /* GRPC_CORE_LIB_TRANSPORT_SERVICE_CONFIG_H */ diff --git a/src/core/lib/transport/static_metadata.cc b/src/core/lib/transport/static_metadata.cc index 844724cbeb5..2213b30f564 100644 --- a/src/core/lib/transport/static_metadata.cc +++ b/src/core/lib/transport/static_metadata.cc @@ -104,7 +104,7 @@ static uint8_t g_bytes[] = { 101, 44, 103, 122, 105, 112}; static void static_ref(void* unused) {} -static void static_unref(grpc_exec_ctx* exec_ctx, void* unused) {} +static void static_unref(void* unused) {} static const grpc_slice_refcount_vtable static_sub_vtable = { static_ref, static_unref, grpc_slice_default_eq_impl, grpc_slice_default_hash_impl}; diff --git a/src/core/lib/transport/status_conversion.cc b/src/core/lib/transport/status_conversion.cc index a0a5f1ba4bf..46cba4292b4 100644 --- a/src/core/lib/transport/status_conversion.cc +++ b/src/core/lib/transport/status_conversion.cc @@ -37,8 +37,7 @@ grpc_http2_error_code grpc_status_to_http2_error(grpc_status_code status) { } } -grpc_status_code grpc_http2_error_to_grpc_status(grpc_exec_ctx* exec_ctx, - grpc_http2_error_code error, +grpc_status_code grpc_http2_error_to_grpc_status(grpc_http2_error_code error, grpc_millis deadline) { switch (error) { case GRPC_HTTP2_NO_ERROR: @@ -47,7 +46,7 @@ grpc_status_code grpc_http2_error_to_grpc_status(grpc_exec_ctx* exec_ctx, case GRPC_HTTP2_CANCEL: /* http2 cancel translates to STATUS_CANCELLED iff deadline hasn't been * exceeded */ - return grpc_exec_ctx_now(exec_ctx) > deadline + return grpc_core::ExecCtx::Get()->Now() > deadline ? GRPC_STATUS_DEADLINE_EXCEEDED : GRPC_STATUS_CANCELLED; case GRPC_HTTP2_ENHANCE_YOUR_CALM: diff --git a/src/core/lib/transport/status_conversion.h b/src/core/lib/transport/status_conversion.h index 3637b828019..107eb92a53d 100644 --- a/src/core/lib/transport/status_conversion.h +++ b/src/core/lib/transport/status_conversion.h @@ -25,8 +25,7 @@ /* Conversion of grpc status codes to http2 error codes (for RST_STREAM) */ grpc_http2_error_code grpc_status_to_http2_error(grpc_status_code status); -grpc_status_code grpc_http2_error_to_grpc_status(grpc_exec_ctx* exec_ctx, - grpc_http2_error_code error, +grpc_status_code grpc_http2_error_to_grpc_status(grpc_http2_error_code error, grpc_millis deadline); /* Conversion of HTTP status codes (:status) to grpc status codes */ diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc index 5bda1541a6d..08aee04ac94 100644 --- a/src/core/lib/transport/transport.cc +++ b/src/core/lib/transport/transport.cc @@ -49,8 +49,7 @@ void grpc_stream_ref(grpc_stream_refcount* refcount) { } #ifndef NDEBUG -void grpc_stream_unref(grpc_exec_ctx* exec_ctx, grpc_stream_refcount* refcount, - const char* reason) { +void grpc_stream_unref(grpc_stream_refcount* refcount, const char* reason) { if (grpc_trace_stream_refcount.enabled()) { gpr_atm val = gpr_atm_no_barrier_load(&refcount->refs.count); gpr_log(GPR_DEBUG, "%s %p:%p UNREF %" PRIdPTR "->%" PRIdPTR " %s", @@ -58,11 +57,11 @@ void grpc_stream_unref(grpc_exec_ctx* exec_ctx, grpc_stream_refcount* refcount, val - 1, reason); } #else -void grpc_stream_unref(grpc_exec_ctx* exec_ctx, - grpc_stream_refcount* refcount) { +void grpc_stream_unref(grpc_stream_refcount* refcount) { #endif if (gpr_unref(&refcount->refs)) { - if (exec_ctx->flags & GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP) { + if (grpc_core::ExecCtx::Get()->flags() & + GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP) { /* Ick. The thread we're running on MAY be owned (indirectly) by a call-stack. If that's the case, destroying the call-stack MAY try to destroy the @@ -73,7 +72,7 @@ void grpc_stream_unref(grpc_exec_ctx* exec_ctx, refcount->destroy.scheduler = grpc_executor_scheduler(GRPC_EXECUTOR_SHORT); } - GRPC_CLOSURE_SCHED(exec_ctx, &refcount->destroy, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&refcount->destroy, GRPC_ERROR_NONE); } } @@ -89,11 +88,11 @@ static void slice_stream_ref(void* p) { #endif } -static void slice_stream_unref(grpc_exec_ctx* exec_ctx, void* p) { +static void slice_stream_unref(void* p) { #ifndef NDEBUG - grpc_stream_unref(exec_ctx, STREAM_REF_FROM_SLICE_REF(p), "slice"); + grpc_stream_unref(STREAM_REF_FROM_SLICE_REF(p), "slice"); #else - grpc_stream_unref(exec_ctx, STREAM_REF_FROM_SLICE_REF(p)); + grpc_stream_unref(STREAM_REF_FROM_SLICE_REF(p)); #endif } @@ -151,59 +150,50 @@ size_t grpc_transport_stream_size(grpc_transport* transport) { return transport->vtable->sizeof_stream; } -void grpc_transport_destroy(grpc_exec_ctx* exec_ctx, - grpc_transport* transport) { - transport->vtable->destroy(exec_ctx, transport); +void grpc_transport_destroy(grpc_transport* transport) { + transport->vtable->destroy(transport); } -int grpc_transport_init_stream(grpc_exec_ctx* exec_ctx, - grpc_transport* transport, grpc_stream* stream, +int grpc_transport_init_stream(grpc_transport* transport, grpc_stream* stream, grpc_stream_refcount* refcount, const void* server_data, gpr_arena* arena) { - return transport->vtable->init_stream(exec_ctx, transport, stream, refcount, + return transport->vtable->init_stream(transport, stream, refcount, server_data, arena); } -void grpc_transport_perform_stream_op(grpc_exec_ctx* exec_ctx, - grpc_transport* transport, +void grpc_transport_perform_stream_op(grpc_transport* transport, grpc_stream* stream, grpc_transport_stream_op_batch* op) { - transport->vtable->perform_stream_op(exec_ctx, transport, stream, op); + transport->vtable->perform_stream_op(transport, stream, op); } -void grpc_transport_perform_op(grpc_exec_ctx* exec_ctx, - grpc_transport* transport, +void grpc_transport_perform_op(grpc_transport* transport, grpc_transport_op* op) { - transport->vtable->perform_op(exec_ctx, transport, op); + transport->vtable->perform_op(transport, op); } -void grpc_transport_set_pops(grpc_exec_ctx* exec_ctx, grpc_transport* transport, - grpc_stream* stream, +void grpc_transport_set_pops(grpc_transport* transport, grpc_stream* stream, grpc_polling_entity* pollent) { grpc_pollset* pollset; grpc_pollset_set* pollset_set; if ((pollset = grpc_polling_entity_pollset(pollent)) != nullptr) { - transport->vtable->set_pollset(exec_ctx, transport, stream, pollset); + transport->vtable->set_pollset(transport, stream, pollset); } else if ((pollset_set = grpc_polling_entity_pollset_set(pollent)) != nullptr) { - transport->vtable->set_pollset_set(exec_ctx, transport, stream, - pollset_set); + transport->vtable->set_pollset_set(transport, stream, pollset_set); } else { abort(); } } -void grpc_transport_destroy_stream(grpc_exec_ctx* exec_ctx, - grpc_transport* transport, +void grpc_transport_destroy_stream(grpc_transport* transport, grpc_stream* stream, grpc_closure* then_schedule_closure) { - transport->vtable->destroy_stream(exec_ctx, transport, stream, - then_schedule_closure); + transport->vtable->destroy_stream(transport, stream, then_schedule_closure); } -grpc_endpoint* grpc_transport_get_endpoint(grpc_exec_ctx* exec_ctx, - grpc_transport* transport) { - return transport->vtable->get_endpoint(exec_ctx, transport); +grpc_endpoint* grpc_transport_get_endpoint(grpc_transport* transport) { + return transport->vtable->get_endpoint(transport); } // This comment should be sung to the tune of @@ -214,25 +204,23 @@ grpc_endpoint* grpc_transport_get_endpoint(grpc_exec_ctx* exec_ctx, // though it lives in lib, it handles transport stream ops sure // it's grpc_transport_stream_op_batch_finish_with_failure void grpc_transport_stream_op_batch_finish_with_failure( - grpc_exec_ctx* exec_ctx, grpc_transport_stream_op_batch* batch, - grpc_error* error, grpc_call_combiner* call_combiner) { + grpc_transport_stream_op_batch* batch, grpc_error* error, + grpc_call_combiner* call_combiner) { if (batch->send_message) { - grpc_byte_stream_destroy(exec_ctx, - batch->payload->send_message.send_message); + grpc_byte_stream_destroy(batch->payload->send_message.send_message); } if (batch->recv_message) { - GRPC_CALL_COMBINER_START(exec_ctx, call_combiner, - batch->payload->recv_message.recv_message_ready, - GRPC_ERROR_REF(error), - "failing recv_message_ready"); + GRPC_CALL_COMBINER_START( + call_combiner, batch->payload->recv_message.recv_message_ready, + GRPC_ERROR_REF(error), "failing recv_message_ready"); } if (batch->recv_initial_metadata) { GRPC_CALL_COMBINER_START( - exec_ctx, call_combiner, + call_combiner, batch->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_REF(error), "failing recv_initial_metadata_ready"); } - GRPC_CLOSURE_SCHED(exec_ctx, batch->on_complete, error); + GRPC_CLOSURE_SCHED(batch->on_complete, error); if (batch->cancel_stream) { GRPC_ERROR_UNREF(batch->payload->cancel_stream.cancel_error); } @@ -244,10 +232,9 @@ typedef struct { grpc_transport_op op; } made_transport_op; -static void destroy_made_transport_op(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void destroy_made_transport_op(void* arg, grpc_error* error) { made_transport_op* op = (made_transport_op*)arg; - GRPC_CLOSURE_SCHED(exec_ctx, op->inner_on_complete, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(op->inner_on_complete, GRPC_ERROR_REF(error)); gpr_free(op); } @@ -268,12 +255,11 @@ typedef struct { grpc_transport_stream_op_batch_payload payload; } made_transport_stream_op; -static void destroy_made_transport_stream_op(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void destroy_made_transport_stream_op(void* arg, grpc_error* error) { made_transport_stream_op* op = (made_transport_stream_op*)arg; grpc_closure* c = op->inner_on_complete; gpr_free(op); - GRPC_CLOSURE_RUN(exec_ctx, c, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(c, GRPC_ERROR_REF(error)); } grpc_transport_stream_op_batch* grpc_make_transport_stream_op( diff --git a/src/core/lib/transport/transport.h b/src/core/lib/transport/transport.h index b3cf04c22da..b03c0218dc8 100644 --- a/src/core/lib/transport/transport.h +++ b/src/core/lib/transport/transport.h @@ -55,15 +55,14 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount, int initial_refs, grpc_iomgr_cb_func cb, void* cb_arg, const char* object_type); void grpc_stream_ref(grpc_stream_refcount* refcount, const char* reason); -void grpc_stream_unref(grpc_exec_ctx* exec_ctx, grpc_stream_refcount* refcount, - const char* reason); +void grpc_stream_unref(grpc_stream_refcount* refcount, const char* reason); #define GRPC_STREAM_REF_INIT(rc, ir, cb, cb_arg, objtype) \ grpc_stream_ref_init(rc, ir, cb, cb_arg, objtype) #else void grpc_stream_ref_init(grpc_stream_refcount* refcount, int initial_refs, grpc_iomgr_cb_func cb, void* cb_arg); void grpc_stream_ref(grpc_stream_refcount* refcount); -void grpc_stream_unref(grpc_exec_ctx* exec_ctx, grpc_stream_refcount* refcount); +void grpc_stream_unref(grpc_stream_refcount* refcount); #define GRPC_STREAM_REF_INIT(rc, ir, cb, cb_arg, objtype) \ grpc_stream_ref_init(rc, ir, cb, cb_arg) #endif @@ -237,8 +236,7 @@ typedef struct grpc_transport_op { If true, the callback is set to set_accept_stream_fn, with its user_data argument set to set_accept_stream_user_data */ bool set_accept_stream; - void (*set_accept_stream_fn)(grpc_exec_ctx* exec_ctx, void* user_data, - grpc_transport* transport, + void (*set_accept_stream_fn)(void* user_data, grpc_transport* transport, const void* server_data); void* set_accept_stream_user_data; /** add this transport to a pollset */ @@ -269,13 +267,12 @@ size_t grpc_transport_stream_size(grpc_transport* transport); stream - a pointer to uninitialized memory to initialize server_data - either NULL for a client initiated stream, or a pointer supplied from the accept_stream callback function */ -int grpc_transport_init_stream(grpc_exec_ctx* exec_ctx, - grpc_transport* transport, grpc_stream* stream, +int grpc_transport_init_stream(grpc_transport* transport, grpc_stream* stream, grpc_stream_refcount* refcount, const void* server_data, gpr_arena* arena); -void grpc_transport_set_pops(grpc_exec_ctx* exec_ctx, grpc_transport* transport, - grpc_stream* stream, grpc_polling_entity* pollent); +void grpc_transport_set_pops(grpc_transport* transport, grpc_stream* stream, + grpc_polling_entity* pollent); /* Destroy transport data for a stream. @@ -287,14 +284,13 @@ void grpc_transport_set_pops(grpc_exec_ctx* exec_ctx, grpc_transport* transport, transport - the transport on which to create this stream stream - the grpc_stream to destroy (memory is still owned by the caller, but any child memory must be cleaned up) */ -void grpc_transport_destroy_stream(grpc_exec_ctx* exec_ctx, - grpc_transport* transport, +void grpc_transport_destroy_stream(grpc_transport* transport, grpc_stream* stream, grpc_closure* then_schedule_closure); void grpc_transport_stream_op_batch_finish_with_failure( - grpc_exec_ctx* exec_ctx, grpc_transport_stream_op_batch* op, - grpc_error* error, grpc_call_combiner* call_combiner); + grpc_transport_stream_op_batch* op, grpc_error* error, + grpc_call_combiner* call_combiner); char* grpc_transport_stream_op_batch_string(grpc_transport_stream_op_batch* op); char* grpc_transport_op_string(grpc_transport_op* op); @@ -309,13 +305,11 @@ char* grpc_transport_op_string(grpc_transport_op* op); non-NULL and previously initialized by the same transport. op - a grpc_transport_stream_op_batch specifying the op to perform */ -void grpc_transport_perform_stream_op(grpc_exec_ctx* exec_ctx, - grpc_transport* transport, +void grpc_transport_perform_stream_op(grpc_transport* transport, grpc_stream* stream, grpc_transport_stream_op_batch* op); -void grpc_transport_perform_op(grpc_exec_ctx* exec_ctx, - grpc_transport* transport, +void grpc_transport_perform_op(grpc_transport* transport, grpc_transport_op* op); /* Send a ping on a transport @@ -328,11 +322,10 @@ void grpc_transport_goaway(grpc_transport* transport, grpc_status_code status, grpc_slice debug_data); /* Destroy the transport */ -void grpc_transport_destroy(grpc_exec_ctx* exec_ctx, grpc_transport* transport); +void grpc_transport_destroy(grpc_transport* transport); /* Get the endpoint used by \a transport */ -grpc_endpoint* grpc_transport_get_endpoint(grpc_exec_ctx* exec_ctx, - grpc_transport* transport); +grpc_endpoint* grpc_transport_get_endpoint(grpc_transport* transport); /* Allocate a grpc_transport_op, and preconfigure the on_consumed closure to \a on_consumed and then delete the returned transport op */ diff --git a/src/core/lib/transport/transport_impl.h b/src/core/lib/transport/transport_impl.h index 46be61427e5..50b8a5f9b7f 100644 --- a/src/core/lib/transport/transport_impl.h +++ b/src/core/lib/transport/transport_impl.h @@ -30,37 +30,34 @@ typedef struct grpc_transport_vtable { const char* name; /* implementation of grpc_transport_init_stream */ - int (*init_stream)(grpc_exec_ctx* exec_ctx, grpc_transport* self, - grpc_stream* stream, grpc_stream_refcount* refcount, - const void* server_data, gpr_arena* arena); + int (*init_stream)(grpc_transport* self, grpc_stream* stream, + grpc_stream_refcount* refcount, const void* server_data, + gpr_arena* arena); /* implementation of grpc_transport_set_pollset */ - void (*set_pollset)(grpc_exec_ctx* exec_ctx, grpc_transport* self, - grpc_stream* stream, grpc_pollset* pollset); + void (*set_pollset)(grpc_transport* self, grpc_stream* stream, + grpc_pollset* pollset); /* implementation of grpc_transport_set_pollset */ - void (*set_pollset_set)(grpc_exec_ctx* exec_ctx, grpc_transport* self, - grpc_stream* stream, grpc_pollset_set* pollset_set); + void (*set_pollset_set)(grpc_transport* self, grpc_stream* stream, + grpc_pollset_set* pollset_set); /* implementation of grpc_transport_perform_stream_op */ - void (*perform_stream_op)(grpc_exec_ctx* exec_ctx, grpc_transport* self, - grpc_stream* stream, + void (*perform_stream_op)(grpc_transport* self, grpc_stream* stream, grpc_transport_stream_op_batch* op); /* implementation of grpc_transport_perform_op */ - void (*perform_op)(grpc_exec_ctx* exec_ctx, grpc_transport* self, - grpc_transport_op* op); + void (*perform_op)(grpc_transport* self, grpc_transport_op* op); /* implementation of grpc_transport_destroy_stream */ - void (*destroy_stream)(grpc_exec_ctx* exec_ctx, grpc_transport* self, - grpc_stream* stream, + void (*destroy_stream)(grpc_transport* self, grpc_stream* stream, grpc_closure* then_schedule_closure); /* implementation of grpc_transport_destroy */ - void (*destroy)(grpc_exec_ctx* exec_ctx, grpc_transport* self); + void (*destroy)(grpc_transport* self); /* implementation of grpc_transport_get_endpoint */ - grpc_endpoint* (*get_endpoint)(grpc_exec_ctx* exec_ctx, grpc_transport* self); + grpc_endpoint* (*get_endpoint)(grpc_transport* self); } grpc_transport_vtable; /* an instance of a grpc transport */ diff --git a/src/core/tsi/fake_transport_security.cc b/src/core/tsi/fake_transport_security.cc index f2f365fc0fe..b907636f9d5 100644 --- a/src/core/tsi/fake_transport_security.cc +++ b/src/core/tsi/fake_transport_security.cc @@ -399,8 +399,7 @@ static const tsi_frame_protector_vtable frame_protector_vtable = { /* --- tsi_zero_copy_grpc_protector methods implementation. ---*/ static tsi_result fake_zero_copy_grpc_protector_protect( - grpc_exec_ctx* exec_ctx, tsi_zero_copy_grpc_protector* self, - grpc_slice_buffer* unprotected_slices, + tsi_zero_copy_grpc_protector* self, grpc_slice_buffer* unprotected_slices, grpc_slice_buffer* protected_slices) { if (self == nullptr || unprotected_slices == nullptr || protected_slices == nullptr) { @@ -424,8 +423,7 @@ static tsi_result fake_zero_copy_grpc_protector_protect( } static tsi_result fake_zero_copy_grpc_protector_unprotect( - grpc_exec_ctx* exec_ctx, tsi_zero_copy_grpc_protector* self, - grpc_slice_buffer* protected_slices, + tsi_zero_copy_grpc_protector* self, grpc_slice_buffer* protected_slices, grpc_slice_buffer* unprotected_slices) { if (self == nullptr || unprotected_slices == nullptr || protected_slices == nullptr) { @@ -454,18 +452,18 @@ static tsi_result fake_zero_copy_grpc_protector_unprotect( impl->parsed_frame_size - TSI_FAKE_FRAME_HEADER_SIZE, unprotected_slices); impl->parsed_frame_size = 0; - grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &impl->header_sb); + grpc_slice_buffer_reset_and_unref_internal(&impl->header_sb); } return TSI_OK; } static void fake_zero_copy_grpc_protector_destroy( - grpc_exec_ctx* exec_ctx, tsi_zero_copy_grpc_protector* self) { + tsi_zero_copy_grpc_protector* self) { if (self == nullptr) return; tsi_fake_zero_copy_grpc_protector* impl = (tsi_fake_zero_copy_grpc_protector*)self; - grpc_slice_buffer_destroy_internal(exec_ctx, &impl->header_sb); - grpc_slice_buffer_destroy_internal(exec_ctx, &impl->protected_sb); + grpc_slice_buffer_destroy_internal(&impl->header_sb); + grpc_slice_buffer_destroy_internal(&impl->protected_sb); gpr_free(impl); } @@ -497,8 +495,7 @@ static tsi_result fake_handshaker_result_extract_peer( } static tsi_result fake_handshaker_result_create_zero_copy_grpc_protector( - void* exec_ctx, const tsi_handshaker_result* self, - size_t* max_output_protected_frame_size, + const tsi_handshaker_result* self, size_t* max_output_protected_frame_size, tsi_zero_copy_grpc_protector** protector) { *protector = tsi_create_fake_zero_copy_grpc_protector(max_output_protected_frame_size); diff --git a/src/core/tsi/transport_security.h b/src/core/tsi/transport_security.h index bf3a776b112..ed662d48af5 100644 --- a/src/core/tsi/transport_security.h +++ b/src/core/tsi/transport_security.h @@ -90,7 +90,7 @@ struct tsi_handshaker { typedef struct { tsi_result (*extract_peer)(const tsi_handshaker_result* self, tsi_peer* peer); tsi_result (*create_zero_copy_grpc_protector)( - void* exec_ctx, const tsi_handshaker_result* self, + const tsi_handshaker_result* self, size_t* max_output_protected_frame_size, tsi_zero_copy_grpc_protector** protector); tsi_result (*create_frame_protector)(const tsi_handshaker_result* self, diff --git a/src/core/tsi/transport_security_grpc.cc b/src/core/tsi/transport_security_grpc.cc index 875d3672182..76f7ae782f2 100644 --- a/src/core/tsi/transport_security_grpc.cc +++ b/src/core/tsi/transport_security_grpc.cc @@ -20,18 +20,16 @@ /* This method creates a tsi_zero_copy_grpc_protector object. */ tsi_result tsi_handshaker_result_create_zero_copy_grpc_protector( - grpc_exec_ctx* exec_ctx, const tsi_handshaker_result* self, - size_t* max_output_protected_frame_size, + const tsi_handshaker_result* self, size_t* max_output_protected_frame_size, tsi_zero_copy_grpc_protector** protector) { - if (exec_ctx == nullptr || self == nullptr || self->vtable == nullptr || - protector == nullptr) { + if (self == nullptr || self->vtable == nullptr || protector == nullptr) { return TSI_INVALID_ARGUMENT; } if (self->vtable->create_zero_copy_grpc_protector == nullptr) { return TSI_UNIMPLEMENTED; } return self->vtable->create_zero_copy_grpc_protector( - exec_ctx, self, max_output_protected_frame_size, protector); + self, max_output_protected_frame_size, protector); } /* --- tsi_zero_copy_grpc_protector common implementation. --- @@ -39,33 +37,28 @@ tsi_result tsi_handshaker_result_create_zero_copy_grpc_protector( Calls specific implementation after state/input validation. */ tsi_result tsi_zero_copy_grpc_protector_protect( - grpc_exec_ctx* exec_ctx, tsi_zero_copy_grpc_protector* self, - grpc_slice_buffer* unprotected_slices, + tsi_zero_copy_grpc_protector* self, grpc_slice_buffer* unprotected_slices, grpc_slice_buffer* protected_slices) { - if (exec_ctx == nullptr || self == nullptr || self->vtable == nullptr || + if (self == nullptr || self->vtable == nullptr || unprotected_slices == nullptr || protected_slices == nullptr) { return TSI_INVALID_ARGUMENT; } if (self->vtable->protect == nullptr) return TSI_UNIMPLEMENTED; - return self->vtable->protect(exec_ctx, self, unprotected_slices, - protected_slices); + return self->vtable->protect(self, unprotected_slices, protected_slices); } tsi_result tsi_zero_copy_grpc_protector_unprotect( - grpc_exec_ctx* exec_ctx, tsi_zero_copy_grpc_protector* self, - grpc_slice_buffer* protected_slices, + tsi_zero_copy_grpc_protector* self, grpc_slice_buffer* protected_slices, grpc_slice_buffer* unprotected_slices) { - if (exec_ctx == nullptr || self == nullptr || self->vtable == nullptr || + if (self == nullptr || self->vtable == nullptr || protected_slices == nullptr || unprotected_slices == nullptr) { return TSI_INVALID_ARGUMENT; } if (self->vtable->unprotect == nullptr) return TSI_UNIMPLEMENTED; - return self->vtable->unprotect(exec_ctx, self, protected_slices, - unprotected_slices); + return self->vtable->unprotect(self, protected_slices, unprotected_slices); } -void tsi_zero_copy_grpc_protector_destroy(grpc_exec_ctx* exec_ctx, - tsi_zero_copy_grpc_protector* self) { +void tsi_zero_copy_grpc_protector_destroy(tsi_zero_copy_grpc_protector* self) { if (self == nullptr) return; - self->vtable->destroy(exec_ctx, self); + self->vtable->destroy(self); } diff --git a/src/core/tsi/transport_security_grpc.h b/src/core/tsi/transport_security_grpc.h index 9fccfd79dd7..0156ff1c68a 100644 --- a/src/core/tsi/transport_security_grpc.h +++ b/src/core/tsi/transport_security_grpc.h @@ -26,8 +26,7 @@ assuming there is no fatal error. The caller is responsible for destroying the protector. */ tsi_result tsi_handshaker_result_create_zero_copy_grpc_protector( - grpc_exec_ctx* exec_ctx, const tsi_handshaker_result* self, - size_t* max_output_protected_frame_size, + const tsi_handshaker_result* self, size_t* max_output_protected_frame_size, tsi_zero_copy_grpc_protector** protector); /* -- tsi_zero_copy_grpc_protector object -- */ @@ -39,8 +38,8 @@ tsi_result tsi_handshaker_result_create_zero_copy_grpc_protector( - This method returns TSI_OK in case of success or a specific error code in case of failure. */ tsi_result tsi_zero_copy_grpc_protector_protect( - grpc_exec_ctx* exec_ctx, tsi_zero_copy_grpc_protector* self, - grpc_slice_buffer* unprotected_slices, grpc_slice_buffer* protected_slices); + tsi_zero_copy_grpc_protector* self, grpc_slice_buffer* unprotected_slices, + grpc_slice_buffer* protected_slices); /* Outputs unprotected bytes. - protected_slices is the bytes of protected frames. @@ -49,24 +48,21 @@ tsi_result tsi_zero_copy_grpc_protector_protect( there is not enough data to output in which case unprotected_slices has 0 bytes. */ tsi_result tsi_zero_copy_grpc_protector_unprotect( - grpc_exec_ctx* exec_ctx, tsi_zero_copy_grpc_protector* self, - grpc_slice_buffer* protected_slices, grpc_slice_buffer* unprotected_slices); + tsi_zero_copy_grpc_protector* self, grpc_slice_buffer* protected_slices, + grpc_slice_buffer* unprotected_slices); /* Destroys the tsi_zero_copy_grpc_protector object. */ -void tsi_zero_copy_grpc_protector_destroy(grpc_exec_ctx* exec_ctx, - tsi_zero_copy_grpc_protector* self); +void tsi_zero_copy_grpc_protector_destroy(tsi_zero_copy_grpc_protector* self); /* Base for tsi_zero_copy_grpc_protector implementations. */ typedef struct { - tsi_result (*protect)(grpc_exec_ctx* exec_ctx, - tsi_zero_copy_grpc_protector* self, + tsi_result (*protect)(tsi_zero_copy_grpc_protector* self, grpc_slice_buffer* unprotected_slices, grpc_slice_buffer* protected_slices); - tsi_result (*unprotect)(grpc_exec_ctx* exec_ctx, - tsi_zero_copy_grpc_protector* self, + tsi_result (*unprotect)(tsi_zero_copy_grpc_protector* self, grpc_slice_buffer* protected_slices, grpc_slice_buffer* unprotected_slices); - void (*destroy)(grpc_exec_ctx* exec_ctx, tsi_zero_copy_grpc_protector* self); + void (*destroy)(tsi_zero_copy_grpc_protector* self); } tsi_zero_copy_grpc_protector_vtable; struct tsi_zero_copy_grpc_protector { diff --git a/src/cpp/common/channel_arguments.cc b/src/cpp/common/channel_arguments.cc index cae9ef953ad..b6967742439 100644 --- a/src/cpp/common/channel_arguments.cc +++ b/src/cpp/common/channel_arguments.cc @@ -66,13 +66,12 @@ ChannelArguments::ChannelArguments(const ChannelArguments& other) } ChannelArguments::~ChannelArguments() { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; for (auto it = args_.begin(); it != args_.end(); ++it) { if (it->type == GRPC_ARG_POINTER) { - it->value.pointer.vtable->destroy(&exec_ctx, it->value.pointer.p); + it->value.pointer.vtable->destroy(it->value.pointer.p); } } - grpc_exec_ctx_finish(&exec_ctx); } void ChannelArguments::Swap(ChannelArguments& other) { @@ -95,17 +94,17 @@ void ChannelArguments::SetSocketMutator(grpc_socket_mutator* mutator) { } grpc_arg mutator_arg = grpc_socket_mutator_to_arg(mutator); bool replaced = false; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; for (auto it = args_.begin(); it != args_.end(); ++it) { if (it->type == mutator_arg.type && grpc::string(it->key) == grpc::string(mutator_arg.key)) { GPR_ASSERT(!replaced); - it->value.pointer.vtable->destroy(&exec_ctx, it->value.pointer.p); + it->value.pointer.vtable->destroy(it->value.pointer.p); it->value.pointer = mutator_arg.value.pointer; replaced = true; } } - grpc_exec_ctx_finish(&exec_ctx); + if (!replaced) { args_.push_back(mutator_arg); } diff --git a/src/cpp/common/channel_filter.cc b/src/cpp/common/channel_filter.cc index 274079f8dd1..cbe2a209f5e 100644 --- a/src/cpp/common/channel_filter.cc +++ b/src/cpp/common/channel_filter.cc @@ -27,43 +27,39 @@ namespace grpc { // MetadataBatch -grpc_linked_mdelem* MetadataBatch::AddMetadata(grpc_exec_ctx* exec_ctx, - const string& key, +grpc_linked_mdelem* MetadataBatch::AddMetadata(const string& key, const string& value) { grpc_linked_mdelem* storage = new grpc_linked_mdelem; memset(storage, 0, sizeof(grpc_linked_mdelem)); - storage->md = grpc_mdelem_from_slices(exec_ctx, SliceFromCopiedString(key), + storage->md = grpc_mdelem_from_slices(SliceFromCopiedString(key), SliceFromCopiedString(value)); GRPC_LOG_IF_ERROR("MetadataBatch::AddMetadata", - grpc_metadata_batch_link_head(exec_ctx, batch_, storage)); + grpc_metadata_batch_link_head(batch_, storage)); return storage; } // ChannelData -void ChannelData::StartTransportOp(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +void ChannelData::StartTransportOp(grpc_channel_element* elem, TransportOp* op) { - grpc_channel_next_op(exec_ctx, elem, op->op()); + grpc_channel_next_op(elem, op->op()); } -void ChannelData::GetInfo(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, +void ChannelData::GetInfo(grpc_channel_element* elem, const grpc_channel_info* channel_info) { - grpc_channel_next_get_info(exec_ctx, elem, channel_info); + grpc_channel_next_get_info(elem, channel_info); } // CallData -void CallData::StartTransportStreamOpBatch(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +void CallData::StartTransportStreamOpBatch(grpc_call_element* elem, TransportStreamOpBatch* op) { - grpc_call_next_op(exec_ctx, elem, op->op()); + grpc_call_next_op(elem, op->op()); } -void CallData::SetPollsetOrPollsetSet(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +void CallData::SetPollsetOrPollsetSet(grpc_call_element* elem, grpc_polling_entity* pollent) { - grpc_call_stack_ignore_set_pollset_or_pollset_set(exec_ctx, elem, pollent); + grpc_call_stack_ignore_set_pollset_or_pollset_set(elem, pollent); } // internal code used by RegisterChannelFilter() @@ -75,8 +71,7 @@ std::vector* channel_filters; namespace { -bool MaybeAddFilter(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, void* arg) { +bool MaybeAddFilter(grpc_channel_stack_builder* builder, void* arg) { const FilterRecord& filter = *(FilterRecord*)arg; if (filter.include_filter) { const grpc_channel_args* args = diff --git a/src/cpp/common/channel_filter.h b/src/cpp/common/channel_filter.h index 9fe9cf0aea4..a1f42c0b323 100644 --- a/src/cpp/common/channel_filter.h +++ b/src/cpp/common/channel_filter.h @@ -54,8 +54,7 @@ class MetadataBatch { /// Adds metadata and returns the newly allocated storage. /// The caller takes ownership of the result, which must exist for the /// lifetime of the gRPC call. - grpc_linked_mdelem* AddMetadata(grpc_exec_ctx* exec_ctx, const string& key, - const string& value); + grpc_linked_mdelem* AddMetadata(const string& key, const string& value); class const_iterator : public std::iterator { @@ -222,18 +221,17 @@ class ChannelData { // TODO(roth): Come up with a more C++-like API for the channel element. /// Initializes the channel data. - virtual grpc_error* Init(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, + virtual grpc_error* Init(grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } // Called before destruction. - virtual void Destroy(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem) {} + virtual void Destroy(grpc_channel_element* elem) {} - virtual void StartTransportOp(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, TransportOp* op); + virtual void StartTransportOp(grpc_channel_element* elem, TransportOp* op); - virtual void GetInfo(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, + virtual void GetInfo(grpc_channel_element* elem, const grpc_channel_info* channel_info); }; @@ -246,24 +244,22 @@ class CallData { // TODO(roth): Come up with a more C++-like API for the call element. /// Initializes the call data. - virtual grpc_error* Init(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + virtual grpc_error* Init(grpc_call_element* elem, const grpc_call_element_args* args) { return GRPC_ERROR_NONE; } // Called before destruction. - virtual void Destroy(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + virtual void Destroy(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_call_closure) {} /// Starts a new stream operation. - virtual void StartTransportStreamOpBatch(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, + virtual void StartTransportStreamOpBatch(grpc_call_element* elem, TransportStreamOpBatch* op); /// Sets a pollset or pollset set. - virtual void SetPollsetOrPollsetSet(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, + virtual void SetPollsetOrPollsetSet(grpc_call_element* elem, grpc_polling_entity* pollent); }; @@ -277,71 +273,63 @@ class ChannelFilter final { public: static const size_t channel_data_size = sizeof(ChannelDataType); - static grpc_error* InitChannelElement(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, + static grpc_error* InitChannelElement(grpc_channel_element* elem, grpc_channel_element_args* args) { // Construct the object in the already-allocated memory. ChannelDataType* channel_data = new (elem->channel_data) ChannelDataType(); - return channel_data->Init(exec_ctx, elem, args); + return channel_data->Init(elem, args); } - static void DestroyChannelElement(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) { + static void DestroyChannelElement(grpc_channel_element* elem) { ChannelDataType* channel_data = reinterpret_cast(elem->channel_data); - channel_data->Destroy(exec_ctx, elem); + channel_data->Destroy(elem); channel_data->~ChannelDataType(); } - static void StartTransportOp(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, + static void StartTransportOp(grpc_channel_element* elem, grpc_transport_op* op) { ChannelDataType* channel_data = reinterpret_cast(elem->channel_data); TransportOp op_wrapper(op); - channel_data->StartTransportOp(exec_ctx, elem, &op_wrapper); + channel_data->StartTransportOp(elem, &op_wrapper); } - static void GetChannelInfo(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, + static void GetChannelInfo(grpc_channel_element* elem, const grpc_channel_info* channel_info) { ChannelDataType* channel_data = reinterpret_cast(elem->channel_data); - channel_data->GetInfo(exec_ctx, elem, channel_info); + channel_data->GetInfo(elem, channel_info); } static const size_t call_data_size = sizeof(CallDataType); - static grpc_error* InitCallElement(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, + static grpc_error* InitCallElement(grpc_call_element* elem, const grpc_call_element_args* args) { // Construct the object in the already-allocated memory. CallDataType* call_data = new (elem->call_data) CallDataType(); - return call_data->Init(exec_ctx, elem, args); + return call_data->Init(elem, args); } - static void DestroyCallElement(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, + static void DestroyCallElement(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_call_closure) { CallDataType* call_data = reinterpret_cast(elem->call_data); - call_data->Destroy(exec_ctx, elem, final_info, then_call_closure); + call_data->Destroy(elem, final_info, then_call_closure); call_data->~CallDataType(); } - static void StartTransportStreamOpBatch(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, + static void StartTransportStreamOpBatch(grpc_call_element* elem, grpc_transport_stream_op_batch* op) { CallDataType* call_data = reinterpret_cast(elem->call_data); TransportStreamOpBatch op_wrapper(op); - call_data->StartTransportStreamOpBatch(exec_ctx, elem, &op_wrapper); + call_data->StartTransportStreamOpBatch(elem, &op_wrapper); } - static void SetPollsetOrPollsetSet(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, + static void SetPollsetOrPollsetSet(grpc_call_element* elem, grpc_polling_entity* pollent) { CallDataType* call_data = reinterpret_cast(elem->call_data); - call_data->SetPollsetOrPollsetSet(exec_ctx, elem, pollent); + call_data->SetPollsetOrPollsetSet(elem, pollent); } }; diff --git a/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm b/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm index d5e668a858a..d1309713644 100644 --- a/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm +++ b/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.mm @@ -110,13 +110,12 @@ static void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { static void cronet_init_client_simple_ssl_secure_fullstack( grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { - grpc_exec_ctx ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; stream_engine *cronetEngine = [Cronet getGlobalEngine]; grpc_channel_args *new_client_args = grpc_channel_args_copy(client_args); cronet_init_client_secure_fullstack(f, new_client_args, cronetEngine); - grpc_channel_args_destroy(&ctx, new_client_args); - grpc_exec_ctx_finish(&ctx); + grpc_channel_args_destroy(new_client_args); } static int fail_server_auth_check(grpc_channel_args *server_args) { diff --git a/src/ruby/ext/grpc/rb_grpc_imports.generated.h b/src/ruby/ext/grpc/rb_grpc_imports.generated.h index fae77843f03..6377008a3b6 100644 --- a/src/ruby/ext/grpc/rb_grpc_imports.generated.h +++ b/src/ruby/ext/grpc/rb_grpc_imports.generated.h @@ -558,7 +558,7 @@ extern grpc_slice_buffer_move_first_type grpc_slice_buffer_move_first_import; typedef void(*grpc_slice_buffer_move_first_no_ref_type)(grpc_slice_buffer* src, size_t n, grpc_slice_buffer* dst); extern grpc_slice_buffer_move_first_no_ref_type grpc_slice_buffer_move_first_no_ref_import; #define grpc_slice_buffer_move_first_no_ref grpc_slice_buffer_move_first_no_ref_import -typedef void(*grpc_slice_buffer_move_first_into_buffer_type)(grpc_exec_ctx* exec_ctx, grpc_slice_buffer* src, size_t n, void* dst); +typedef void(*grpc_slice_buffer_move_first_into_buffer_type)(grpc_slice_buffer* src, size_t n, void* dst); extern grpc_slice_buffer_move_first_into_buffer_type grpc_slice_buffer_move_first_into_buffer_import; #define grpc_slice_buffer_move_first_into_buffer grpc_slice_buffer_move_first_into_buffer_import typedef grpc_slice(*grpc_slice_buffer_take_first_type)(grpc_slice_buffer* src); diff --git a/test/core/backoff/backoff_test.cc b/test/core/backoff/backoff_test.cc index ef2de8d6388..d3115fe1ddc 100644 --- a/test/core/backoff/backoff_test.cc +++ b/test/core/backoff/backoff_test.cc @@ -18,6 +18,7 @@ #include "src/core/lib/backoff/backoff.h" +#include #include #include @@ -32,23 +33,24 @@ static void test_constant_backoff(void) { const grpc_millis max_backoff = 1000; grpc_backoff_init(&backoff, initial_backoff, multiplier, jitter, min_connect_timeout, max_backoff); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_backoff_result next_deadlines = grpc_backoff_begin(&exec_ctx, &backoff); - GPR_ASSERT(next_deadlines.current_deadline - grpc_exec_ctx_now(&exec_ctx) == + grpc_core::ExecCtx exec_ctx; + grpc_backoff_result next_deadlines = grpc_backoff_begin(&backoff); + GPR_ASSERT(next_deadlines.current_deadline - + grpc_core::ExecCtx::Get()->Now() == initial_backoff); GPR_ASSERT(next_deadlines.next_attempt_start_time - - grpc_exec_ctx_now(&exec_ctx) == + grpc_core::ExecCtx::Get()->Now() == initial_backoff); for (int i = 0; i < 10000; i++) { - next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); - GPR_ASSERT(next_deadlines.current_deadline - grpc_exec_ctx_now(&exec_ctx) == + next_deadlines = grpc_backoff_step(&backoff); + GPR_ASSERT(next_deadlines.current_deadline - + grpc_core::ExecCtx::Get()->Now() == initial_backoff); GPR_ASSERT(next_deadlines.next_attempt_start_time - - grpc_exec_ctx_now(&exec_ctx) == + grpc_core::ExecCtx::Get()->Now() == initial_backoff); - exec_ctx.now = next_deadlines.current_deadline; + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); } - grpc_exec_ctx_finish(&exec_ctx); } static void test_min_connect(void) { @@ -60,17 +62,16 @@ static void test_min_connect(void) { const grpc_millis max_backoff = 1000; grpc_backoff_init(&backoff, initial_backoff, multiplier, jitter, min_connect_timeout, max_backoff); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_backoff_result next = grpc_backoff_begin(&exec_ctx, &backoff); + grpc_core::ExecCtx exec_ctx; + grpc_backoff_result next = grpc_backoff_begin(&backoff); // Because the min_connect_timeout > initial_backoff, current_deadline is used // as the deadline for the current attempt. - GPR_ASSERT(next.current_deadline - grpc_exec_ctx_now(&exec_ctx) == + GPR_ASSERT(next.current_deadline - grpc_core::ExecCtx::Get()->Now() == min_connect_timeout); // ... while, if the current attempt fails, the next one will happen after // initial_backoff. - GPR_ASSERT(next.next_attempt_start_time - grpc_exec_ctx_now(&exec_ctx) == + GPR_ASSERT(next.next_attempt_start_time - grpc_core::ExecCtx::Get()->Now() == initial_backoff); - grpc_exec_ctx_finish(&exec_ctx); } static void test_no_jitter_backoff(void) { @@ -84,49 +85,47 @@ static void test_no_jitter_backoff(void) { min_connect_timeout, max_backoff); // x_1 = 2 // x_n = 2**i + x_{i-1} ( = 2**(n+1) - 2 ) - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - exec_ctx.now = 0; - exec_ctx.now_is_valid = true; - grpc_backoff_result next_deadlines = grpc_backoff_begin(&exec_ctx, &backoff); + grpc_core::ExecCtx exec_ctx; + grpc_core::ExecCtx::Get()->TestOnlySetNow(0); + grpc_backoff_result next_deadlines = grpc_backoff_begin(&backoff); GPR_ASSERT(next_deadlines.current_deadline == next_deadlines.next_attempt_start_time); GPR_ASSERT(next_deadlines.current_deadline == 2); - exec_ctx.now = next_deadlines.current_deadline; - next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); + next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 6); - exec_ctx.now = next_deadlines.current_deadline; - next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); + next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 14); - exec_ctx.now = next_deadlines.current_deadline; - next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); + next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 30); - exec_ctx.now = next_deadlines.current_deadline; - next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); + next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 62); - exec_ctx.now = next_deadlines.current_deadline; - next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); + next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 126); - exec_ctx.now = next_deadlines.current_deadline; - next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); + next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 254); - exec_ctx.now = next_deadlines.current_deadline; - next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); + next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 510); - exec_ctx.now = next_deadlines.current_deadline; - next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); + next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 1022); - exec_ctx.now = next_deadlines.current_deadline; - next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); + next_deadlines = grpc_backoff_step(&backoff); // Hit the maximum timeout. From this point onwards, retries will increase // only by max timeout. GPR_ASSERT(next_deadlines.current_deadline == 1535); - exec_ctx.now = next_deadlines.current_deadline; - next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); + next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 2048); - exec_ctx.now = next_deadlines.current_deadline; - next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); + next_deadlines = grpc_backoff_step(&backoff); GPR_ASSERT(next_deadlines.current_deadline == 2561); - grpc_exec_ctx_finish(&exec_ctx); } static void test_jitter_backoff(void) { @@ -142,12 +141,13 @@ static void test_jitter_backoff(void) { backoff.rng_state = 0; // force consistent PRNG - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_backoff_result next_deadlines = grpc_backoff_begin(&exec_ctx, &backoff); - GPR_ASSERT(next_deadlines.current_deadline - grpc_exec_ctx_now(&exec_ctx) == + grpc_core::ExecCtx exec_ctx; + grpc_backoff_result next_deadlines = grpc_backoff_begin(&backoff); + GPR_ASSERT(next_deadlines.current_deadline - + grpc_core::ExecCtx::Get()->Now() == initial_backoff); GPR_ASSERT(next_deadlines.next_attempt_start_time - - grpc_exec_ctx_now(&exec_ctx) == + grpc_core::ExecCtx::Get()->Now() == initial_backoff); grpc_millis expected_next_lower_bound = @@ -156,11 +156,11 @@ static void test_jitter_backoff(void) { (grpc_millis)((double)current_backoff * (1 + jitter)); for (int i = 0; i < 10000; i++) { - next_deadlines = grpc_backoff_step(&exec_ctx, &backoff); + next_deadlines = grpc_backoff_step(&backoff); // next-now must be within (jitter*100)% of the current backoff (which // increases by * multiplier up to max_backoff). const grpc_millis timeout_millis = - next_deadlines.current_deadline - grpc_exec_ctx_now(&exec_ctx); + next_deadlines.current_deadline - grpc_core::ExecCtx::Get()->Now(); GPR_ASSERT(timeout_millis >= expected_next_lower_bound); GPR_ASSERT(timeout_millis <= expected_next_upper_bound); current_backoff = GPR_MIN( @@ -169,13 +169,13 @@ static void test_jitter_backoff(void) { (grpc_millis)((double)current_backoff * (1 - jitter)); expected_next_upper_bound = (grpc_millis)((double)current_backoff * (1 + jitter)); - exec_ctx.now = next_deadlines.current_deadline; + grpc_core::ExecCtx::Get()->TestOnlySetNow(next_deadlines.current_deadline); } - grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); gpr_time_init(); test_constant_backoff(); @@ -183,5 +183,6 @@ int main(int argc, char** argv) { test_no_jitter_backoff(); test_jitter_backoff(); + grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/bad_client.cc b/test/core/bad_client/bad_client.cc index d8bb092e14f..4c1642aa5d4 100644 --- a/test/core/bad_client/bad_client.cc +++ b/test/core/bad_client/bad_client.cc @@ -50,20 +50,19 @@ static void thd_func(void* arg) { gpr_event_set(&a->done_thd, (void*)1); } -static void done_write(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void done_write(void* arg, grpc_error* error) { thd_args* a = (thd_args*)arg; gpr_event_set(&a->done_write, (void*)1); } static void server_setup_transport(void* ts, grpc_transport* transport) { thd_args* a = (thd_args*)ts; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_server_setup_transport(&exec_ctx, a->server, transport, nullptr, + grpc_core::ExecCtx exec_ctx; + grpc_server_setup_transport(a->server, transport, nullptr, grpc_server_get_channel_args(a->server)); - grpc_exec_ctx_finish(&exec_ctx); } -static void read_done(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void read_done(void* arg, grpc_error* error) { gpr_event* read_done = (gpr_event*)arg; gpr_event_set(read_done, (void*)1); } @@ -81,7 +80,7 @@ void grpc_run_bad_client_test( grpc_slice_from_copied_buffer(client_payload, client_payload_length); grpc_slice_buffer outgoing; grpc_closure done_write_closure; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_completion_queue* shutdown_cq; if (client_payload_length < 4 * 1024) { @@ -115,15 +114,13 @@ void grpc_run_bad_client_test( GRPC_BAD_CLIENT_REGISTERED_HOST, GRPC_SRM_PAYLOAD_READ_INITIAL_BYTE_BUFFER, 0); grpc_server_start(a.server); - transport = - grpc_create_chttp2_transport(&exec_ctx, nullptr, sfd.server, false); + transport = grpc_create_chttp2_transport(nullptr, sfd.server, false); server_setup_transport(&a, transport); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); /* Bind everything into the same pollset */ - grpc_endpoint_add_to_pollset(&exec_ctx, sfd.client, grpc_cq_pollset(a.cq)); - grpc_endpoint_add_to_pollset(&exec_ctx, sfd.server, grpc_cq_pollset(a.cq)); + grpc_endpoint_add_to_pollset(sfd.client, grpc_cq_pollset(a.cq)); + grpc_endpoint_add_to_pollset(sfd.server, grpc_cq_pollset(a.cq)); /* Check a ground truth */ GPR_ASSERT(grpc_server_has_open_connections(a.server)); @@ -137,8 +134,8 @@ void grpc_run_bad_client_test( grpc_schedule_on_exec_ctx); /* Write data */ - grpc_endpoint_write(&exec_ctx, sfd.client, &outgoing, &done_write_closure); - grpc_exec_ctx_finish(&exec_ctx); + grpc_endpoint_write(sfd.client, &outgoing, &done_write_closure); + grpc_core::ExecCtx::Get()->Flush(); /* Await completion, unless the request is large and write may not finish * before the peer shuts down. */ @@ -149,10 +146,9 @@ void grpc_run_bad_client_test( if (flags & GRPC_BAD_CLIENT_DISCONNECT) { grpc_endpoint_shutdown( - &exec_ctx, sfd.client, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Forced Disconnect")); - grpc_endpoint_destroy(&exec_ctx, sfd.client); - grpc_exec_ctx_finish(&exec_ctx); + sfd.client, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Forced Disconnect")); + grpc_endpoint_destroy(sfd.client); + grpc_core::ExecCtx::Get()->Flush(); sfd.client = nullptr; } @@ -171,9 +167,8 @@ void grpc_run_bad_client_test( grpc_closure read_done_closure; GRPC_CLOSURE_INIT(&read_done_closure, read_done, &read_done_event, grpc_schedule_on_exec_ctx); - grpc_endpoint_read(&exec_ctx, sfd.client, &incoming, - &read_done_closure); - grpc_exec_ctx_finish(&exec_ctx); + grpc_endpoint_read(sfd.client, &incoming, &read_done_closure); + grpc_core::ExecCtx::Get()->Flush(); do { GPR_ASSERT(gpr_time_cmp(deadline, gpr_now(deadline.clock_type)) > 0); GPR_ASSERT( @@ -186,14 +181,13 @@ void grpc_run_bad_client_test( "client validator failed; trying additional read " "in case we didn't get all the data"); } - grpc_slice_buffer_destroy_internal(&exec_ctx, &incoming); + grpc_slice_buffer_destroy_internal(&incoming); } // Shutdown. grpc_endpoint_shutdown( - &exec_ctx, sfd.client, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); - grpc_endpoint_destroy(&exec_ctx, sfd.client); - grpc_exec_ctx_finish(&exec_ctx); + sfd.client, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); + grpc_endpoint_destroy(sfd.client); + grpc_core::ExecCtx::Get()->Flush(); } GPR_ASSERT( @@ -207,8 +201,7 @@ void grpc_run_bad_client_test( grpc_completion_queue_destroy(shutdown_cq); grpc_server_destroy(a.server); grpc_completion_queue_destroy(a.cq); - grpc_slice_buffer_destroy_internal(&exec_ctx, &outgoing); + grpc_slice_buffer_destroy_internal(&outgoing); - grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); } diff --git a/test/core/bad_client/tests/badreq.cc b/test/core/bad_client/tests/badreq.cc index c30244e0cdd..eeaf4c99748 100644 --- a/test/core/bad_client/tests/badreq.cc +++ b/test/core/bad_client/tests/badreq.cc @@ -20,6 +20,8 @@ #include +#include + #include "src/core/lib/surface/server.h" #include "test/core/end2end/cq_verifier.h" @@ -38,6 +40,7 @@ static void verifier(grpc_server* server, grpc_completion_queue* cq, int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); /* invalid content type */ GRPC_RUN_BAD_CLIENT_TEST( @@ -126,5 +129,6 @@ int main(int argc, char** argv) { "\x10\x0auser-agent\"bad-client grpc-c/0.12.0.0 (linux)", GRPC_BAD_CLIENT_DISCONNECT); + grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/connection_prefix.cc b/test/core/bad_client/tests/connection_prefix.cc index 47252f9f105..4aab234d3e5 100644 --- a/test/core/bad_client/tests/connection_prefix.cc +++ b/test/core/bad_client/tests/connection_prefix.cc @@ -30,6 +30,7 @@ static void verifier(grpc_server* server, grpc_completion_queue* cq, int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, "X", 0); GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, "PX", 0); @@ -57,5 +58,7 @@ int main(int argc, char** argv) { 0); GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, "PRI * HTTP/2.0\r\n\r\nSM\r\n\rX", 0); + + grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/head_of_line_blocking.cc b/test/core/bad_client/tests/head_of_line_blocking.cc index bbc56119914..f56c4d71dd6 100644 --- a/test/core/bad_client/tests/head_of_line_blocking.cc +++ b/test/core/bad_client/tests/head_of_line_blocking.cc @@ -20,6 +20,7 @@ #include +#include #include #include "src/core/lib/surface/server.h" @@ -109,6 +110,7 @@ static void addbuf(const void* data, size_t len) { int main(int argc, char** argv) { int i; grpc_test_init(argc, argv); + grpc_init(); #define NUM_FRAMES 10 #define FRAME_SIZE 1000 @@ -131,6 +133,7 @@ int main(int argc, char** argv) { } grpc_run_bad_client_test(verifier, nullptr, g_buffer, g_count, 0); gpr_free(g_buffer); + grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/headers.cc b/test/core/bad_client/tests/headers.cc index 50bb72c493a..2aa1b280cee 100644 --- a/test/core/bad_client/tests/headers.cc +++ b/test/core/bad_client/tests/headers.cc @@ -34,6 +34,7 @@ static void verifier(grpc_server* server, grpc_completion_queue* cq, int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); /* partial http2 header prefixes */ GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, PFX_STR "\x00", @@ -335,5 +336,6 @@ int main(int argc, char** argv) { "15 seconds", GRPC_BAD_CLIENT_DISCONNECT); + grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/initial_settings_frame.cc b/test/core/bad_client/tests/initial_settings_frame.cc index edc52f503e5..0220000ecea 100644 --- a/test/core/bad_client/tests/initial_settings_frame.cc +++ b/test/core/bad_client/tests/initial_settings_frame.cc @@ -33,6 +33,7 @@ static void verifier(grpc_server* server, grpc_completion_queue* cq, int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); /* various partial prefixes */ GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, PFX_STR "\x00", @@ -106,5 +107,6 @@ int main(int argc, char** argv) { PFX_STR ONE_SETTING_HDR "\x00\x99\x00\x00\x00\x00", GRPC_BAD_CLIENT_DISCONNECT); + grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/server_registered_method.cc b/test/core/bad_client/tests/server_registered_method.cc index 6613c94b419..c2dc9c66af1 100644 --- a/test/core/bad_client/tests/server_registered_method.cc +++ b/test/core/bad_client/tests/server_registered_method.cc @@ -77,6 +77,7 @@ static void verifier_fails(grpc_server* server, grpc_completion_queue* cq, int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); /* body generated with * tools/codegen/core/gen_server_registered_method_bad_client_test_body.py */ @@ -123,5 +124,6 @@ int main(int argc, char** argv) { "\x00\x00\x07\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\x02\x00\x00", 0); + grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/simple_request.cc b/test/core/bad_client/tests/simple_request.cc index 9f4a03e69b3..c80fc5cb4af 100644 --- a/test/core/bad_client/tests/simple_request.cc +++ b/test/core/bad_client/tests/simple_request.cc @@ -20,6 +20,8 @@ #include +#include + #include "src/core/lib/surface/server.h" #include "test/core/end2end/cq_verifier.h" @@ -122,6 +124,7 @@ static void failure_verifier(grpc_server* server, grpc_completion_queue* cq, int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); /* basic request: check that things are working */ GRPC_RUN_BAD_CLIENT_TEST(verifier, nullptr, PFX_STR, 0); @@ -164,5 +167,6 @@ int main(int argc, char** argv) { GRPC_RUN_BAD_CLIENT_TEST(failure_verifier, nullptr, PFX_STR "\x00\x00\x00\x03\x10\x00\x00\x00\x01", 0); + grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/unknown_frame.cc b/test/core/bad_client/tests/unknown_frame.cc index d962a4244d0..b1b618a43f3 100644 --- a/test/core/bad_client/tests/unknown_frame.cc +++ b/test/core/bad_client/tests/unknown_frame.cc @@ -33,6 +33,7 @@ static void verifier(grpc_server* server, grpc_completion_queue* cq, } int main(int argc, char** argv) { + grpc_init(); grpc_test_init(argc, argv); /* test adding prioritization data */ @@ -40,5 +41,6 @@ int main(int argc, char** argv) { PFX_STR "\x00\x00\x00\x88\x00\x00\x00\x00\x01", GRPC_BAD_CLIENT_DISCONNECT); + grpc_shutdown(); return 0; } diff --git a/test/core/bad_client/tests/window_overflow.cc b/test/core/bad_client/tests/window_overflow.cc index f4bd81828be..ed8279c9519 100644 --- a/test/core/bad_client/tests/window_overflow.cc +++ b/test/core/bad_client/tests/window_overflow.cc @@ -20,6 +20,7 @@ #include +#include #include #include "src/core/lib/surface/server.h" @@ -72,6 +73,7 @@ int main(int argc, char** argv) { #define SEND_SIZE (6 * 1024 * 1024) #define NUM_FRAMES (SEND_SIZE / FRAME_SIZE + 1) grpc_test_init(argc, argv); + grpc_init(); addbuf(PFX_STR, sizeof(PFX_STR) - 1); for (i = 0; i < NUM_FRAMES; i++) { @@ -93,6 +95,7 @@ int main(int argc, char** argv) { grpc_run_bad_client_test(verifier, nullptr, g_buffer, g_count, GRPC_BAD_CLIENT_LARGE_REQUEST); gpr_free(g_buffer); + grpc_shutdown(); return 0; } diff --git a/test/core/channel/channel_args_test.cc b/test/core/channel/channel_args_test.cc index e8b33341851..4a8195e984e 100644 --- a/test/core/channel/channel_args_test.cc +++ b/test/core/channel/channel_args_test.cc @@ -26,7 +26,7 @@ #include "test/core/util/test_config.h" static void test_create(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_arg arg_int; grpc_arg arg_string; @@ -55,12 +55,11 @@ static void test_create(void) { GPR_ASSERT(strcmp(ch_args->args[1].value.string, arg_string.value.string) == 0); - grpc_channel_args_destroy(&exec_ctx, ch_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_channel_args_destroy(ch_args); } static void test_set_compression_algorithm(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_channel_args* ch_args; ch_args = @@ -70,12 +69,11 @@ static void test_set_compression_algorithm(void) { GRPC_COMPRESSION_CHANNEL_DEFAULT_ALGORITHM) == 0); GPR_ASSERT(ch_args->args[0].type == GRPC_ARG_INTEGER); - grpc_channel_args_destroy(&exec_ctx, ch_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_channel_args_destroy(ch_args); } static void test_compression_algorithm_states(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_channel_args *ch_args, *ch_args_wo_gzip, *ch_args_wo_gzip_deflate; unsigned states_bitset; size_t i; @@ -91,10 +89,10 @@ static void test_compression_algorithm_states(void) { /* disable gzip and deflate */ ch_args_wo_gzip = grpc_channel_args_compression_algorithm_set_state( - &exec_ctx, &ch_args, GRPC_COMPRESS_GZIP, 0); + &ch_args, GRPC_COMPRESS_GZIP, 0); GPR_ASSERT(ch_args == ch_args_wo_gzip); ch_args_wo_gzip_deflate = grpc_channel_args_compression_algorithm_set_state( - &exec_ctx, &ch_args_wo_gzip, GRPC_COMPRESS_DEFLATE, 0); + &ch_args_wo_gzip, GRPC_COMPRESS_DEFLATE, 0); GPR_ASSERT(ch_args_wo_gzip == ch_args_wo_gzip_deflate); states_bitset = (unsigned)grpc_channel_args_compression_algorithm_get_states( @@ -109,7 +107,7 @@ static void test_compression_algorithm_states(void) { /* re-enabled gzip only */ ch_args_wo_gzip = grpc_channel_args_compression_algorithm_set_state( - &exec_ctx, &ch_args_wo_gzip_deflate, GRPC_COMPRESS_GZIP, 1); + &ch_args_wo_gzip_deflate, GRPC_COMPRESS_GZIP, 1); GPR_ASSERT(ch_args_wo_gzip == ch_args_wo_gzip_deflate); states_bitset = (unsigned)grpc_channel_args_compression_algorithm_get_states( @@ -122,8 +120,7 @@ static void test_compression_algorithm_states(void) { } } - grpc_channel_args_destroy(&exec_ctx, ch_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_channel_args_destroy(ch_args); } static void test_set_socket_mutator(void) { @@ -137,9 +134,8 @@ static void test_set_socket_mutator(void) { GPR_ASSERT(ch_args->args[0].type == GRPC_ARG_POINTER); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, ch_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(ch_args); } } diff --git a/test/core/channel/channel_stack_builder_test.cc b/test/core/channel/channel_stack_builder_test.cc index a67f0efafeb..ef6db81b0b4 100644 --- a/test/core/channel/channel_stack_builder_test.cc +++ b/test/core/channel/channel_stack_builder_test.cc @@ -29,34 +29,30 @@ #include "src/core/lib/surface/channel_init.h" #include "test/core/util/test_config.h" -static grpc_error* channel_init_func(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* channel_init_func(grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } -static grpc_error* call_init_func(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* call_init_func(grpc_call_element* elem, const grpc_call_element_args* args) { return GRPC_ERROR_NONE; } -static void channel_destroy_func(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) {} +static void channel_destroy_func(grpc_channel_element* elem) {} -static void call_destroy_func(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void call_destroy_func(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) {} -static void call_func(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void call_func(grpc_call_element* elem, grpc_transport_stream_op_batch* op) {} -static void channel_func(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, - grpc_transport_op* op) { +static void channel_func(grpc_channel_element* elem, grpc_transport_op* op) { if (op->disconnect_with_error != GRPC_ERROR_NONE) { GRPC_ERROR_UNREF(op->disconnect_with_error); } - GRPC_CLOSURE_SCHED(exec_ctx, op->on_consumed, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(op->on_consumed, GRPC_ERROR_NONE); } bool g_replacement_fn_called = false; @@ -106,8 +102,7 @@ const grpc_channel_filter original_filter = { grpc_channel_next_get_info, "filter_name"}; -static bool add_replacement_filter(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, +static bool add_replacement_filter(grpc_channel_stack_builder* builder, void* arg) { const grpc_channel_filter* filter = static_cast(arg); @@ -118,8 +113,7 @@ static bool add_replacement_filter(grpc_exec_ctx* exec_ctx, builder, filter, set_arg_once_fn, &g_replacement_fn_called); } -static bool add_original_filter(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, +static bool add_original_filter(grpc_channel_stack_builder* builder, void* arg) { return grpc_channel_stack_builder_prepend_filter( builder, (const grpc_channel_filter*)arg, set_arg_once_fn, diff --git a/test/core/channel/channel_stack_test.cc b/test/core/channel/channel_stack_test.cc index 988ea9bac9d..ef43facd6ed 100644 --- a/test/core/channel/channel_stack_test.cc +++ b/test/core/channel/channel_stack_test.cc @@ -27,8 +27,7 @@ #include "src/core/lib/slice/slice_internal.h" #include "test/core/util/test_config.h" -static grpc_error* channel_init_func(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* channel_init_func(grpc_channel_element* elem, grpc_channel_element_args* args) { GPR_ASSERT(args->channel_args->num_args == 1); GPR_ASSERT(args->channel_args->args[0].type == GRPC_ARG_INTEGER); @@ -40,42 +39,37 @@ static grpc_error* channel_init_func(grpc_exec_ctx* exec_ctx, return GRPC_ERROR_NONE; } -static grpc_error* call_init_func(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* call_init_func(grpc_call_element* elem, const grpc_call_element_args* args) { ++*(int*)(elem->channel_data); *(int*)(elem->call_data) = 0; return GRPC_ERROR_NONE; } -static void channel_destroy_func(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) {} +static void channel_destroy_func(grpc_channel_element* elem) {} -static void call_destroy_func(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void call_destroy_func(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { ++*(int*)(elem->channel_data); } -static void call_func(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void call_func(grpc_call_element* elem, grpc_transport_stream_op_batch* op) { ++*(int*)(elem->call_data); } -static void channel_func(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, - grpc_transport_op* op) { +static void channel_func(grpc_channel_element* elem, grpc_transport_op* op) { ++*(int*)(elem->channel_data); } -static void free_channel(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { - grpc_channel_stack_destroy(exec_ctx, static_cast(arg)); +static void free_channel(void* arg, grpc_error* error) { + grpc_channel_stack_destroy(static_cast(arg)); gpr_free(arg); } -static void free_call(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { - grpc_call_stack_destroy(exec_ctx, static_cast(arg), nullptr, - nullptr); +static void free_call(void* arg, grpc_error* error) { + grpc_call_stack_destroy(static_cast(arg), nullptr, nullptr); gpr_free(arg); } @@ -101,7 +95,7 @@ static void test_create_channel_stack(void) { grpc_channel_args chan_args; int* channel_data; int* call_data; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_slice path = grpc_slice_from_static_string("/service/method"); arg.type = GRPC_ARG_INTEGER; @@ -113,8 +107,8 @@ static void test_create_channel_stack(void) { channel_stack = static_cast( gpr_malloc(grpc_channel_stack_size(&filters, 1))); - grpc_channel_stack_init(&exec_ctx, 1, free_channel, channel_stack, &filters, - 1, &chan_args, nullptr, "test", channel_stack); + grpc_channel_stack_init(1, free_channel, channel_stack, &filters, 1, + &chan_args, nullptr, "test", channel_stack); GPR_ASSERT(channel_stack->count == 1); channel_elem = grpc_channel_stack_element(channel_stack, 0); channel_data = (int*)channel_elem->channel_data; @@ -132,8 +126,8 @@ static void test_create_channel_stack(void) { nullptr, /* arena */ nullptr /* call_combiner */ }; - grpc_error* error = grpc_call_stack_init(&exec_ctx, channel_stack, 1, - free_call, call_stack, &args); + grpc_error* error = + grpc_call_stack_init(channel_stack, 1, free_call, call_stack, &args); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(call_stack->count == 1); call_elem = grpc_call_stack_element(call_stack, 0); @@ -143,14 +137,13 @@ static void test_create_channel_stack(void) { GPR_ASSERT(*call_data == 0); GPR_ASSERT(*channel_data == 1); - GRPC_CALL_STACK_UNREF(&exec_ctx, call_stack, "done"); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CALL_STACK_UNREF(call_stack, "done"); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(*channel_data == 2); - GRPC_CHANNEL_STACK_UNREF(&exec_ctx, channel_stack, "done"); + GRPC_CHANNEL_STACK_UNREF(channel_stack, "done"); - grpc_slice_unref_internal(&exec_ctx, path); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref_internal(path); } int main(int argc, char** argv) { diff --git a/test/core/channel/minimal_stack_is_minimal_test.cc b/test/core/channel/minimal_stack_is_minimal_test.cc index e0cffa39a87..3495f603e4f 100644 --- a/test/core/channel/minimal_stack_is_minimal_test.cc +++ b/test/core/channel/minimal_stack_is_minimal_test.cc @@ -125,12 +125,10 @@ static int check_stack(const char* file, int line, const char* transport_name, grpc_channel_stack_builder_set_transport(builder, &fake_transport); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_stack_builder_set_channel_arguments(&exec_ctx, builder, - channel_args); + grpc_core::ExecCtx exec_ctx; + grpc_channel_stack_builder_set_channel_arguments(builder, channel_args); GPR_ASSERT(grpc_channel_init_create_stack( - &exec_ctx, builder, (grpc_channel_stack_type)channel_stack_type)); - grpc_exec_ctx_finish(&exec_ctx); + builder, (grpc_channel_stack_type)channel_stack_type)); } // build up our expectation list @@ -212,10 +210,9 @@ static int check_stack(const char* file, int line, const char* transport_name, gpr_free(expect); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_stack_builder_destroy(&exec_ctx, builder); - grpc_channel_args_destroy(&exec_ctx, channel_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_stack_builder_destroy(builder); + grpc_channel_args_destroy(channel_args); } return result; diff --git a/test/core/client_channel/lb_policies_test.cc b/test/core/client_channel/lb_policies_test.cc index 5f8d3b84ccb..847ea0066ba 100644 --- a/test/core/client_channel/lb_policies_test.cc +++ b/test/core/client_channel/lb_policies_test.cc @@ -651,9 +651,8 @@ static void test_get_channel_info() { grpc_channel_args* args = grpc_channel_args_copy_and_add(nullptr, &arg, 1); channel = grpc_insecure_channel_create("ipv4:127.0.0.1:1234", args, nullptr); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(args); } // Ensures that resolver returns. grpc_channel_check_connectivity_state(channel, true /* try_to_connect */); @@ -959,7 +958,7 @@ static void verify_rebirth_round_robin(const servers_fixture* f, } int main(int argc, char** argv) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; test_spec* spec; size_t i; const size_t NUM_ITERS = 10; @@ -969,9 +968,9 @@ int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_tracer_set_enabled("round_robin", 1); - GPR_ASSERT(grpc_lb_policy_create(&exec_ctx, "this-lb-policy-does-not-exist", - nullptr) == nullptr); - GPR_ASSERT(grpc_lb_policy_create(&exec_ctx, nullptr, nullptr) == nullptr); + GPR_ASSERT(grpc_lb_policy_create("this-lb-policy-does-not-exist", nullptr) == + nullptr); + GPR_ASSERT(grpc_lb_policy_create(nullptr, nullptr) == nullptr); spec = test_spec_create(NUM_ITERS, NUM_SERVERS); /* everything is fine, all servers stay up the whole time and life's peachy @@ -1025,7 +1024,6 @@ int main(int argc, char** argv) { test_ping(); test_get_channel_info(); - grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); return 0; } diff --git a/test/core/client_channel/parse_address_test.cc b/test/core/client_channel/parse_address_test.cc index 94f76da920a..6d56961d84a 100644 --- a/test/core/client_channel/parse_address_test.cc +++ b/test/core/client_channel/parse_address_test.cc @@ -24,6 +24,7 @@ #include #endif +#include #include #include "src/core/lib/iomgr/exec_ctx.h" @@ -33,8 +34,8 @@ #ifdef GRPC_HAVE_UNIX_SOCKET static void test_grpc_parse_unix(const char* uri_text, const char* pathname) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri* uri = grpc_uri_parse(&exec_ctx, uri_text, 0); + grpc_core::ExecCtx exec_ctx; + grpc_uri* uri = grpc_uri_parse(uri_text, 0); grpc_resolved_address addr; GPR_ASSERT(1 == grpc_parse_unix(uri, &addr)); @@ -43,7 +44,6 @@ static void test_grpc_parse_unix(const char* uri_text, const char* pathname) { GPR_ASSERT(0 == strcmp(addr_un->sun_path, pathname)); grpc_uri_destroy(uri); - grpc_exec_ctx_finish(&exec_ctx); } #else /* GRPC_HAVE_UNIX_SOCKET */ @@ -54,8 +54,8 @@ static void test_grpc_parse_unix(const char* uri_text, const char* pathname) {} static void test_grpc_parse_ipv4(const char* uri_text, const char* host, unsigned short port) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri* uri = grpc_uri_parse(&exec_ctx, uri_text, 0); + grpc_core::ExecCtx exec_ctx; + grpc_uri* uri = grpc_uri_parse(uri_text, 0); grpc_resolved_address addr; char ntop_buf[INET_ADDRSTRLEN]; @@ -68,13 +68,12 @@ static void test_grpc_parse_ipv4(const char* uri_text, const char* host, GPR_ASSERT(ntohs(addr_in->sin_port) == port); grpc_uri_destroy(uri); - grpc_exec_ctx_finish(&exec_ctx); } static void test_grpc_parse_ipv6(const char* uri_text, const char* host, unsigned short port, uint32_t scope_id) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri* uri = grpc_uri_parse(&exec_ctx, uri_text, 0); + grpc_core::ExecCtx exec_ctx; + grpc_uri* uri = grpc_uri_parse(uri_text, 0); grpc_resolved_address addr; char ntop_buf[INET6_ADDRSTRLEN]; @@ -88,14 +87,16 @@ static void test_grpc_parse_ipv6(const char* uri_text, const char* host, GPR_ASSERT(addr_in6->sin6_scope_id == scope_id); grpc_uri_destroy(uri); - grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); test_grpc_parse_unix("unix:/path/name", "/path/name"); test_grpc_parse_ipv4("ipv4:192.0.2.1:12345", "192.0.2.1", 12345); test_grpc_parse_ipv6("ipv6:[2001:db8::1]:12345", "2001:db8::1", 12345, 0); test_grpc_parse_ipv6("ipv6:[2001:db8::1%252]:12345", "2001:db8::1", 12345, 2); + + grpc_shutdown(); } diff --git a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc index dcf315eba5a..18a795fbcb2 100644 --- a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc @@ -35,8 +35,7 @@ static gpr_mu g_mu; static bool g_fail_resolution = true; static grpc_combiner* g_combiner; -static void my_resolve_address(grpc_exec_ctx* exec_ctx, const char* addr, - const char* default_port, +static void my_resolve_address(const char* addr, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addrs) { @@ -55,13 +54,13 @@ static void my_resolve_address(grpc_exec_ctx* exec_ctx, const char* addr, gpr_malloc(sizeof(*(*addrs)->addrs))); (*addrs)->addrs[0].len = 123; } - GRPC_CLOSURE_SCHED(exec_ctx, on_done, error); + GRPC_CLOSURE_SCHED(on_done, error); } static grpc_ares_request* my_dns_lookup_ares( - grpc_exec_ctx* exec_ctx, const char* dns_server, const char* addr, - const char* default_port, grpc_pollset_set* interested_parties, - grpc_closure* on_done, grpc_lb_addresses** lb_addrs, bool check_grpclb, + const char* dns_server, const char* addr, const char* default_port, + grpc_pollset_set* interested_parties, grpc_closure* on_done, + grpc_lb_addresses** lb_addrs, bool check_grpclb, char** service_config_json) { gpr_mu_lock(&g_mu); GPR_ASSERT(0 == strcmp("test", addr)); @@ -76,27 +75,26 @@ static grpc_ares_request* my_dns_lookup_ares( grpc_lb_addresses_set_address(*lb_addrs, 0, nullptr, 0, false, nullptr, nullptr); } - GRPC_CLOSURE_SCHED(exec_ctx, on_done, error); + GRPC_CLOSURE_SCHED(on_done, error); return nullptr; } -static grpc_resolver* create_resolver(grpc_exec_ctx* exec_ctx, - const char* name) { +static grpc_resolver* create_resolver(const char* name) { grpc_resolver_factory* factory = grpc_resolver_factory_lookup("dns"); - grpc_uri* uri = grpc_uri_parse(exec_ctx, name, 0); + grpc_uri* uri = grpc_uri_parse(name, 0); GPR_ASSERT(uri); grpc_resolver_args args; memset(&args, 0, sizeof(args)); args.uri = uri; args.combiner = g_combiner; grpc_resolver* resolver = - grpc_resolver_factory_create_resolver(exec_ctx, factory, &args); + grpc_resolver_factory_create_resolver(factory, &args); grpc_resolver_factory_unref(factory); grpc_uri_destroy(uri); return resolver; } -static void on_done(grpc_exec_ctx* exec_ctx, void* ev, grpc_error* error) { +static void on_done(void* ev, grpc_error* error) { gpr_event_set((gpr_event*)ev, (void*)1); } @@ -107,9 +105,8 @@ static bool wait_loop(int deadline_seconds, gpr_event* ev) { if (gpr_event_wait(ev, grpc_timeout_seconds_to_deadline(1))) return true; deadline_seconds--; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_timer_check(&exec_ctx, nullptr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_timer_check(nullptr); } return false; } @@ -120,16 +117,14 @@ typedef struct next_args { grpc_closure* on_complete; } next_args; -static void call_resolver_next_now_lock_taken(grpc_exec_ctx* exec_ctx, - void* arg, +static void call_resolver_next_now_lock_taken(void* arg, grpc_error* error_unused) { next_args* a = static_cast(arg); - grpc_resolver_next_locked(exec_ctx, a->resolver, a->result, a->on_complete); + grpc_resolver_next_locked(a->resolver, a->result, a->on_complete); gpr_free(a); } -static void call_resolver_next_after_locking(grpc_exec_ctx* exec_ctx, - grpc_resolver* resolver, +static void call_resolver_next_after_locking(grpc_resolver* resolver, grpc_channel_args** result, grpc_closure* on_complete) { next_args* a = static_cast(gpr_malloc(sizeof(*a))); @@ -137,7 +132,6 @@ static void call_resolver_next_after_locking(grpc_exec_ctx* exec_ctx, a->result = result; a->on_complete = on_complete; GRPC_CLOSURE_SCHED( - exec_ctx, GRPC_CLOSURE_CREATE(call_resolver_next_now_lock_taken, a, grpc_combiner_scheduler(resolver->combiner)), GRPC_ERROR_NONE); @@ -153,30 +147,31 @@ int main(int argc, char** argv) { grpc_dns_lookup_ares = my_dns_lookup_ares; grpc_channel_args* result = (grpc_channel_args*)1; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resolver* resolver = create_resolver(&exec_ctx, "dns:test"); - gpr_event ev1; - gpr_event_init(&ev1); - call_resolver_next_after_locking( - &exec_ctx, resolver, &result, - GRPC_CLOSURE_CREATE(on_done, &ev1, grpc_schedule_on_exec_ctx)); - grpc_exec_ctx_flush(&exec_ctx); - GPR_ASSERT(wait_loop(5, &ev1)); - GPR_ASSERT(result == nullptr); - - gpr_event ev2; - gpr_event_init(&ev2); - call_resolver_next_after_locking( - &exec_ctx, resolver, &result, - GRPC_CLOSURE_CREATE(on_done, &ev2, grpc_schedule_on_exec_ctx)); - grpc_exec_ctx_flush(&exec_ctx); - GPR_ASSERT(wait_loop(30, &ev2)); - GPR_ASSERT(result != nullptr); - - grpc_channel_args_destroy(&exec_ctx, result); - GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "test"); - GRPC_COMBINER_UNREF(&exec_ctx, g_combiner, "test"); - grpc_exec_ctx_finish(&exec_ctx); + { + grpc_core::ExecCtx exec_ctx; + grpc_resolver* resolver = create_resolver("dns:test"); + gpr_event ev1; + gpr_event_init(&ev1); + call_resolver_next_after_locking( + resolver, &result, + GRPC_CLOSURE_CREATE(on_done, &ev1, grpc_schedule_on_exec_ctx)); + grpc_core::ExecCtx::Get()->Flush(); + GPR_ASSERT(wait_loop(5, &ev1)); + GPR_ASSERT(result == nullptr); + + gpr_event ev2; + gpr_event_init(&ev2); + call_resolver_next_after_locking( + resolver, &result, + GRPC_CLOSURE_CREATE(on_done, &ev2, grpc_schedule_on_exec_ctx)); + grpc_core::ExecCtx::Get()->Flush(); + GPR_ASSERT(wait_loop(30, &ev2)); + GPR_ASSERT(result != nullptr); + + grpc_channel_args_destroy(result); + GRPC_RESOLVER_UNREF(resolver, "test"); + GRPC_COMBINER_UNREF(g_combiner, "test"); + } grpc_shutdown(); gpr_mu_destroy(&g_mu); diff --git a/test/core/client_channel/resolvers/dns_resolver_test.cc b/test/core/client_channel/resolvers/dns_resolver_test.cc index 4c040caeb92..80667908ef2 100644 --- a/test/core/client_channel/resolvers/dns_resolver_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_test.cc @@ -28,8 +28,8 @@ static grpc_combiner* g_combiner; static void test_succeeds(grpc_resolver_factory* factory, const char* string) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri* uri = grpc_uri_parse(&exec_ctx, string, 0); + grpc_core::ExecCtx exec_ctx; + grpc_uri* uri = grpc_uri_parse(string, 0); grpc_resolver_args args; grpc_resolver* resolver; gpr_log(GPR_DEBUG, "test: '%s' should be valid for '%s'", string, @@ -38,16 +38,15 @@ static void test_succeeds(grpc_resolver_factory* factory, const char* string) { memset(&args, 0, sizeof(args)); args.uri = uri; args.combiner = g_combiner; - resolver = grpc_resolver_factory_create_resolver(&exec_ctx, factory, &args); + resolver = grpc_resolver_factory_create_resolver(factory, &args); GPR_ASSERT(resolver != nullptr); - GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "test_succeeds"); + GRPC_RESOLVER_UNREF(resolver, "test_succeeds"); grpc_uri_destroy(uri); - grpc_exec_ctx_finish(&exec_ctx); } static void test_fails(grpc_resolver_factory* factory, const char* string) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri* uri = grpc_uri_parse(&exec_ctx, string, 0); + grpc_core::ExecCtx exec_ctx; + grpc_uri* uri = grpc_uri_parse(string, 0); grpc_resolver_args args; grpc_resolver* resolver; gpr_log(GPR_DEBUG, "test: '%s' should be invalid for '%s'", string, @@ -56,10 +55,9 @@ static void test_fails(grpc_resolver_factory* factory, const char* string) { memset(&args, 0, sizeof(args)); args.uri = uri; args.combiner = g_combiner; - resolver = grpc_resolver_factory_create_resolver(&exec_ctx, factory, &args); + resolver = grpc_resolver_factory_create_resolver(factory, &args); GPR_ASSERT(resolver == nullptr); grpc_uri_destroy(uri); - grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { @@ -82,9 +80,8 @@ int main(int argc, char** argv) { grpc_resolver_factory_unref(dns); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_COMBINER_UNREF(&exec_ctx, g_combiner, "test"); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + GRPC_COMBINER_UNREF(g_combiner, "test"); } grpc_shutdown(); diff --git a/test/core/client_channel/resolvers/fake_resolver_test.cc b/test/core/client_channel/resolvers/fake_resolver_test.cc index d5538e96217..d85cbb1d036 100644 --- a/test/core/client_channel/resolvers/fake_resolver_test.cc +++ b/test/core/client_channel/resolvers/fake_resolver_test.cc @@ -33,7 +33,7 @@ #include "test/core/util/test_config.h" static grpc_resolver* build_fake_resolver( - grpc_exec_ctx* exec_ctx, grpc_combiner* combiner, + grpc_combiner* combiner, grpc_fake_resolver_response_generator* response_generator) { grpc_resolver_factory* factory = grpc_resolver_factory_lookup("fake"); grpc_arg generator_arg = @@ -44,7 +44,7 @@ static grpc_resolver* build_fake_resolver( args.args = &channel_args; args.combiner = combiner; grpc_resolver* resolver = - grpc_resolver_factory_create_resolver(exec_ctx, factory, &args); + grpc_resolver_factory_create_resolver(factory, &args); grpc_resolver_factory_unref(factory); return resolver; } @@ -55,7 +55,7 @@ typedef struct on_resolution_arg { gpr_event ev; } on_resolution_arg; -void on_resolution_cb(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +void on_resolution_cb(void* arg, grpc_error* error) { on_resolution_arg* res = static_cast(arg); // We only check the addresses channel arg because that's the only one // explicitly set by the test via @@ -66,24 +66,23 @@ void on_resolution_cb(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { grpc_lb_addresses_find_channel_arg(res->expected_resolver_result); GPR_ASSERT( grpc_lb_addresses_cmp(actual_lb_addresses, expected_lb_addresses) == 0); - grpc_channel_args_destroy(exec_ctx, res->resolver_result); - grpc_channel_args_destroy(exec_ctx, res->expected_resolver_result); + grpc_channel_args_destroy(res->resolver_result); + grpc_channel_args_destroy(res->expected_resolver_result); gpr_event_set(&res->ev, (void*)1); } static void test_fake_resolver() { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_combiner* combiner = grpc_combiner_create(); // Create resolver. grpc_fake_resolver_response_generator* response_generator = grpc_fake_resolver_response_generator_create(); - grpc_resolver* resolver = - build_fake_resolver(&exec_ctx, combiner, response_generator); + grpc_resolver* resolver = build_fake_resolver(combiner, response_generator); GPR_ASSERT(resolver != nullptr); // Setup expectations. - grpc_uri* uris[] = {grpc_uri_parse(&exec_ctx, "ipv4:10.2.1.1:1234", true), - grpc_uri_parse(&exec_ctx, "ipv4:127.0.0.1:4321", true)}; + grpc_uri* uris[] = {grpc_uri_parse("ipv4:10.2.1.1:1234", true), + grpc_uri_parse("ipv4:127.0.0.1:4321", true)}; const char* balancer_names[] = {"name1", "name2"}; const bool is_balancer[] = {true, false}; grpc_lb_addresses* addresses = grpc_lb_addresses_create(3, nullptr); @@ -96,7 +95,7 @@ static void test_fake_resolver() { grpc_lb_addresses_create_channel_arg(addresses); grpc_channel_args* results = grpc_channel_args_copy_and_add(nullptr, &addresses_arg, 1); - grpc_lb_addresses_destroy(&exec_ctx, addresses); + grpc_lb_addresses_destroy(addresses); on_resolution_arg on_res_arg; memset(&on_res_arg, 0, sizeof(on_res_arg)); on_res_arg.expected_resolver_result = results; @@ -106,17 +105,16 @@ static void test_fake_resolver() { // Set resolver results and trigger first resolution. on_resolution_cb // performs the checks. - grpc_fake_resolver_response_generator_set_response( - &exec_ctx, response_generator, results); - grpc_resolver_next_locked(&exec_ctx, resolver, &on_res_arg.resolver_result, + grpc_fake_resolver_response_generator_set_response(response_generator, + results); + grpc_resolver_next_locked(resolver, &on_res_arg.resolver_result, on_resolution); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&on_res_arg.ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); // Setup update. - grpc_uri* uris_update[] = { - grpc_uri_parse(&exec_ctx, "ipv4:192.168.1.0:31416", true)}; + grpc_uri* uris_update[] = {grpc_uri_parse("ipv4:192.168.1.0:31416", true)}; const char* balancer_names_update[] = {"name3"}; const bool is_balancer_update[] = {false}; grpc_lb_addresses* addresses_update = grpc_lb_addresses_create(1, nullptr); @@ -131,7 +129,7 @@ static void test_fake_resolver() { grpc_lb_addresses_create_channel_arg(addresses_update); grpc_channel_args* results_update = grpc_channel_args_copy_and_add(nullptr, &addresses_update_arg, 1); - grpc_lb_addresses_destroy(&exec_ctx, addresses_update); + grpc_lb_addresses_destroy(addresses_update); // Setup expectations for the update. on_resolution_arg on_res_arg_update; @@ -142,27 +140,27 @@ static void test_fake_resolver() { grpc_combiner_scheduler(combiner)); // Set updated resolver results and trigger a second resolution. - grpc_fake_resolver_response_generator_set_response( - &exec_ctx, response_generator, results_update); - grpc_resolver_next_locked(&exec_ctx, resolver, - &on_res_arg_update.resolver_result, on_resolution); - grpc_exec_ctx_flush(&exec_ctx); + grpc_fake_resolver_response_generator_set_response(response_generator, + results_update); + grpc_resolver_next_locked(resolver, &on_res_arg_update.resolver_result, + on_resolution); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&on_res_arg_update.ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); // Requesting a new resolution without re-senting the response shouldn't // trigger the resolution callback. memset(&on_res_arg, 0, sizeof(on_res_arg)); - grpc_resolver_next_locked(&exec_ctx, resolver, &on_res_arg.resolver_result, + grpc_resolver_next_locked(resolver, &on_res_arg.resolver_result, on_resolution); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&on_res_arg.ev, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); - GRPC_COMBINER_UNREF(&exec_ctx, combiner, "test_fake_resolver"); - GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "test_fake_resolver"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(combiner, "test_fake_resolver"); + GRPC_RESOLVER_UNREF(resolver, "test_fake_resolver"); + grpc_fake_resolver_response_generator_unref(response_generator); } diff --git a/test/core/client_channel/resolvers/sockaddr_resolver_test.cc b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc index dfa2d12b5e8..4d16a779245 100644 --- a/test/core/client_channel/resolvers/sockaddr_resolver_test.cc +++ b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc @@ -35,14 +35,14 @@ typedef struct on_resolution_arg { grpc_channel_args* resolver_result; } on_resolution_arg; -void on_resolution_cb(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +void on_resolution_cb(void* arg, grpc_error* error) { on_resolution_arg* res = static_cast(arg); - grpc_channel_args_destroy(exec_ctx, res->resolver_result); + grpc_channel_args_destroy(res->resolver_result); } static void test_succeeds(grpc_resolver_factory* factory, const char* string) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri* uri = grpc_uri_parse(&exec_ctx, string, 0); + grpc_core::ExecCtx exec_ctx; + grpc_uri* uri = grpc_uri_parse(string, 0); grpc_resolver_args args; grpc_resolver* resolver; gpr_log(GPR_DEBUG, "test: '%s' should be valid for '%s'", string, @@ -51,7 +51,7 @@ static void test_succeeds(grpc_resolver_factory* factory, const char* string) { memset(&args, 0, sizeof(args)); args.uri = uri; args.combiner = g_combiner; - resolver = grpc_resolver_factory_create_resolver(&exec_ctx, factory, &args); + resolver = grpc_resolver_factory_create_resolver(factory, &args); GPR_ASSERT(resolver != nullptr); on_resolution_arg on_res_arg; @@ -60,16 +60,16 @@ static void test_succeeds(grpc_resolver_factory* factory, const char* string) { grpc_closure* on_resolution = GRPC_CLOSURE_CREATE( on_resolution_cb, &on_res_arg, grpc_schedule_on_exec_ctx); - grpc_resolver_next_locked(&exec_ctx, resolver, &on_res_arg.resolver_result, + grpc_resolver_next_locked(resolver, &on_res_arg.resolver_result, on_resolution); - GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "test_succeeds"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_RESOLVER_UNREF(resolver, "test_succeeds"); + grpc_uri_destroy(uri); } static void test_fails(grpc_resolver_factory* factory, const char* string) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri* uri = grpc_uri_parse(&exec_ctx, string, 0); + grpc_core::ExecCtx exec_ctx; + grpc_uri* uri = grpc_uri_parse(string, 0); grpc_resolver_args args; grpc_resolver* resolver; gpr_log(GPR_DEBUG, "test: '%s' should be invalid for '%s'", string, @@ -78,10 +78,9 @@ static void test_fails(grpc_resolver_factory* factory, const char* string) { memset(&args, 0, sizeof(args)); args.uri = uri; args.combiner = g_combiner; - resolver = grpc_resolver_factory_create_resolver(&exec_ctx, factory, &args); + resolver = grpc_resolver_factory_create_resolver(factory, &args); GPR_ASSERT(resolver == nullptr); grpc_uri_destroy(uri); - grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { @@ -112,9 +111,8 @@ int main(int argc, char** argv) { grpc_resolver_factory_unref(ipv6); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_COMBINER_UNREF(&exec_ctx, g_combiner, "test"); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + GRPC_COMBINER_UNREF(g_combiner, "test"); } grpc_shutdown(); diff --git a/test/core/client_channel/uri_fuzzer_test.cc b/test/core/client_channel/uri_fuzzer_test.cc index ba31793ff3b..ee384531661 100644 --- a/test/core/client_channel/uri_fuzzer_test.cc +++ b/test/core/client_channel/uri_fuzzer_test.cc @@ -20,6 +20,7 @@ #include #include +#include #include #include "src/core/ext/filters/client_channel/uri_parser.h" @@ -33,12 +34,18 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { memcpy(s, data, size); s[size] = 0; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri* x; - if ((x = grpc_uri_parse(&exec_ctx, s, 1))) { - grpc_uri_destroy(x); + grpc_init(); + + { + grpc_core::ExecCtx exec_ctx; + grpc_uri* x; + if ((x = grpc_uri_parse(s, 1))) { + grpc_uri_destroy(x); + } + + gpr_free(s); } - grpc_exec_ctx_finish(&exec_ctx); - gpr_free(s); + + grpc_shutdown(); return 0; } diff --git a/test/core/client_channel/uri_parser_test.cc b/test/core/client_channel/uri_parser_test.cc index 30183f9f578..254bfddfb3c 100644 --- a/test/core/client_channel/uri_parser_test.cc +++ b/test/core/client_channel/uri_parser_test.cc @@ -20,6 +20,7 @@ #include +#include #include #include "src/core/lib/iomgr/exec_ctx.h" @@ -28,29 +29,28 @@ static void test_succeeds(const char* uri_text, const char* scheme, const char* authority, const char* path, const char* query, const char* fragment) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri* uri = grpc_uri_parse(&exec_ctx, uri_text, 0); + grpc_core::ExecCtx exec_ctx; + grpc_uri* uri = grpc_uri_parse(uri_text, 0); GPR_ASSERT(uri); GPR_ASSERT(0 == strcmp(scheme, uri->scheme)); GPR_ASSERT(0 == strcmp(authority, uri->authority)); GPR_ASSERT(0 == strcmp(path, uri->path)); GPR_ASSERT(0 == strcmp(query, uri->query)); GPR_ASSERT(0 == strcmp(fragment, uri->fragment)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_uri_destroy(uri); } static void test_fails(const char* uri_text) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT(nullptr == grpc_uri_parse(&exec_ctx, uri_text, 0)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + GPR_ASSERT(nullptr == grpc_uri_parse(uri_text, 0)); } static void test_query_parts() { { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; const char* uri_text = "http://foo/path?a&b=B&c=&#frag"; - grpc_uri* uri = grpc_uri_parse(&exec_ctx, uri_text, 0); + grpc_uri* uri = grpc_uri_parse(uri_text, 0); GPR_ASSERT(uri); GPR_ASSERT(0 == strcmp("http", uri->scheme)); @@ -77,14 +77,14 @@ static void test_query_parts() { GPR_ASSERT(nullptr == grpc_uri_get_query_arg(uri, "")); GPR_ASSERT(0 == strcmp("frag", uri->fragment)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_uri_destroy(uri); } { /* test the current behavior of multiple query part values */ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; const char* uri_text = "http://auth/path?foo=bar=baz&foobar=="; - grpc_uri* uri = grpc_uri_parse(&exec_ctx, uri_text, 0); + grpc_uri* uri = grpc_uri_parse(uri_text, 0); GPR_ASSERT(uri); GPR_ASSERT(0 == strcmp("http", uri->scheme)); @@ -96,14 +96,13 @@ static void test_query_parts() { GPR_ASSERT(0 == strcmp("bar", grpc_uri_get_query_arg(uri, "foo"))); GPR_ASSERT(0 == strcmp("", grpc_uri_get_query_arg(uri, "foobar"))); - grpc_exec_ctx_finish(&exec_ctx); grpc_uri_destroy(uri); } { /* empty query */ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; const char* uri_text = "http://foo/path"; - grpc_uri* uri = grpc_uri_parse(&exec_ctx, uri_text, 0); + grpc_uri* uri = grpc_uri_parse(uri_text, 0); GPR_ASSERT(uri); GPR_ASSERT(0 == strcmp("http", uri->scheme)); @@ -114,13 +113,14 @@ static void test_query_parts() { GPR_ASSERT(nullptr == uri->query_parts); GPR_ASSERT(nullptr == uri->query_parts_values); GPR_ASSERT(0 == strcmp("", uri->fragment)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_uri_destroy(uri); } } int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); test_succeeds("http://www.google.com", "http", "www.google.com", "", "", ""); test_succeeds("dns:///foo", "dns", "", "/foo", "", ""); test_succeeds("http://www.google.com:90", "http", "www.google.com:90", "", "", @@ -148,5 +148,6 @@ int main(int argc, char** argv) { test_fails("http://foo?bar#lol#"); test_query_parts(); + grpc_shutdown(); return 0; } diff --git a/test/core/compression/algorithm_test.cc b/test/core/compression/algorithm_test.cc index 2f1d8bc8ebb..9e811e9af19 100644 --- a/test/core/compression/algorithm_test.cc +++ b/test/core/compression/algorithm_test.cc @@ -39,7 +39,7 @@ static void test_algorithm_mesh(void) { grpc_compression_algorithm parsed; grpc_slice mdstr; grpc_mdelem mdelem; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT( grpc_compression_algorithm_name((grpc_compression_algorithm)i, &name)); GPR_ASSERT(grpc_compression_algorithm_parse( @@ -51,9 +51,8 @@ static void test_algorithm_mesh(void) { mdelem = grpc_compression_encoding_mdelem(parsed); GPR_ASSERT(grpc_slice_eq(GRPC_MDVALUE(mdelem), mdstr)); GPR_ASSERT(grpc_slice_eq(GRPC_MDKEY(mdelem), GRPC_MDSTR_GRPC_ENCODING)); - grpc_slice_unref_internal(&exec_ctx, mdstr); - GRPC_MDELEM_UNREF(&exec_ctx, mdelem); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref_internal(mdstr); + GRPC_MDELEM_UNREF(mdelem); } /* test failure */ @@ -62,7 +61,7 @@ static void test_algorithm_mesh(void) { } static void test_algorithm_failure(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_slice mdstr; gpr_log(GPR_DEBUG, "test_algorithm_failure"); @@ -83,8 +82,7 @@ static void test_algorithm_failure(void) { grpc_compression_algorithm_slice(static_cast( static_cast(GRPC_COMPRESS_ALGORITHMS_COUNT) + 1)), grpc_empty_slice())); - grpc_slice_unref_internal(&exec_ctx, mdstr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref_internal(mdstr); } int main(int argc, char** argv) { diff --git a/test/core/compression/message_compress_test.cc b/test/core/compression/message_compress_test.cc index 676415ba9d9..6ca07b70c4f 100644 --- a/test/core/compression/message_compress_test.cc +++ b/test/core/compression/message_compress_test.cc @@ -70,10 +70,8 @@ static void assert_passthrough(grpc_slice value, grpc_split_slices_to_buffer(uncompressed_split_mode, &value, 1, &input); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - was_compressed = - grpc_msg_compress(&exec_ctx, algorithm, &input, &compressed_raw); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + was_compressed = grpc_msg_compress(algorithm, &input, &compressed_raw); } GPR_ASSERT(input.count > 0); @@ -92,11 +90,9 @@ static void assert_passthrough(grpc_slice value, grpc_split_slice_buffer(compressed_split_mode, &compressed_raw, &compressed); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT(grpc_msg_decompress( - &exec_ctx, was_compressed ? algorithm : GRPC_COMPRESS_NONE, &compressed, - &output)); - grpc_exec_ctx_finish(&exec_ctx); + was_compressed ? algorithm : GRPC_COMPRESS_NONE, &compressed, &output)); } final = grpc_slice_merge(output.slices, output.count); @@ -156,11 +152,11 @@ static void test_tiny_data_compress(void) { for (int i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { if (i == GRPC_COMPRESS_NONE) continue; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT(0 == grpc_msg_compress( - &exec_ctx, static_cast(i), - &input, &output)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + GPR_ASSERT(0 == + grpc_msg_compress(static_cast(i), + &input, &output)); + GPR_ASSERT(1 == output.count); } @@ -180,9 +176,9 @@ static void test_bad_decompression_data_crc(void) { grpc_slice_buffer_init(&output); grpc_slice_buffer_add(&input, create_test_value(ONE_MB_A)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; /* compress it */ - grpc_msg_compress(&exec_ctx, GRPC_COMPRESS_GZIP, &input, &corrupted); + grpc_msg_compress(GRPC_COMPRESS_GZIP, &input, &corrupted); /* corrupt the output by smashing the CRC */ GPR_ASSERT(corrupted.count > 1); GPR_ASSERT(GRPC_SLICE_LENGTH(corrupted.slices[1]) > 8); @@ -190,9 +186,7 @@ static void test_bad_decompression_data_crc(void) { memcpy(GRPC_SLICE_START_PTR(corrupted.slices[1]) + idx, &bad, 4); /* try (and fail) to decompress the corrupted compresed buffer */ - GPR_ASSERT(0 == grpc_msg_decompress(&exec_ctx, GRPC_COMPRESS_GZIP, &corrupted, - &output)); - grpc_exec_ctx_finish(&exec_ctx); + GPR_ASSERT(0 == grpc_msg_decompress(GRPC_COMPRESS_GZIP, &corrupted, &output)); grpc_slice_buffer_destroy(&input); grpc_slice_buffer_destroy(&corrupted); @@ -211,10 +205,8 @@ static void test_bad_decompression_data_trailing_garbage(void) { "\x78\xda\x63\x60\x60\x60\x00\x00\x00\x04\x00\x01\x99", 13)); /* try (and fail) to decompress the invalid compresed buffer */ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT(0 == grpc_msg_decompress(&exec_ctx, GRPC_COMPRESS_DEFLATE, &input, - &output)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + GPR_ASSERT(0 == grpc_msg_decompress(GRPC_COMPRESS_DEFLATE, &input, &output)); grpc_slice_buffer_destroy(&input); grpc_slice_buffer_destroy(&output); @@ -230,10 +222,8 @@ static void test_bad_decompression_data_stream(void) { grpc_slice_from_copied_buffer("\x78\xda\xff\xff", 4)); /* try (and fail) to decompress the invalid compresed buffer */ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT(0 == grpc_msg_decompress(&exec_ctx, GRPC_COMPRESS_DEFLATE, &input, - &output)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + GPR_ASSERT(0 == grpc_msg_decompress(GRPC_COMPRESS_DEFLATE, &input, &output)); grpc_slice_buffer_destroy(&input); grpc_slice_buffer_destroy(&output); @@ -249,17 +239,15 @@ static void test_bad_compression_algorithm(void) { grpc_slice_buffer_add( &input, grpc_slice_from_copied_string("Never gonna give you up")); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - was_compressed = grpc_msg_compress(&exec_ctx, GRPC_COMPRESS_ALGORITHMS_COUNT, - &input, &output); + grpc_core::ExecCtx exec_ctx; + was_compressed = + grpc_msg_compress(GRPC_COMPRESS_ALGORITHMS_COUNT, &input, &output); GPR_ASSERT(0 == was_compressed); - was_compressed = grpc_msg_compress(&exec_ctx, - static_cast( + was_compressed = grpc_msg_compress(static_cast( GRPC_COMPRESS_ALGORITHMS_COUNT + 123), &input, &output); GPR_ASSERT(0 == was_compressed); - grpc_exec_ctx_finish(&exec_ctx); grpc_slice_buffer_destroy(&input); grpc_slice_buffer_destroy(&output); @@ -275,18 +263,16 @@ static void test_bad_decompression_algorithm(void) { grpc_slice_buffer_add(&input, grpc_slice_from_copied_string( "I'm not really compressed but it doesn't matter")); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - was_decompressed = grpc_msg_decompress( - &exec_ctx, GRPC_COMPRESS_ALGORITHMS_COUNT, &input, &output); + grpc_core::ExecCtx exec_ctx; + was_decompressed = + grpc_msg_decompress(GRPC_COMPRESS_ALGORITHMS_COUNT, &input, &output); GPR_ASSERT(0 == was_decompressed); was_decompressed = - grpc_msg_decompress(&exec_ctx, - static_cast( + grpc_msg_decompress(static_cast( GRPC_COMPRESS_ALGORITHMS_COUNT + 123), &input, &output); GPR_ASSERT(0 == was_decompressed); - grpc_exec_ctx_finish(&exec_ctx); grpc_slice_buffer_destroy(&input); grpc_slice_buffer_destroy(&output); diff --git a/test/core/debug/stats_test.cc b/test/core/debug/stats_test.cc index 5fae61f8f67..e60e54b2fdc 100644 --- a/test/core/debug/stats_test.cc +++ b/test/core/debug/stats_test.cc @@ -49,9 +49,8 @@ TEST(StatsTest, IncCounters) { for (int i = 0; i < GRPC_STATS_COUNTER_COUNT; i++) { Snapshot snapshot; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_STATS_INC_COUNTER(&exec_ctx, (grpc_stats_counters)i); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + GRPC_STATS_INC_COUNTER((grpc_stats_counters)i); EXPECT_EQ(snapshot.delta().counters[i], 1); } @@ -60,9 +59,8 @@ TEST(StatsTest, IncCounters) { TEST(StatsTest, IncSpecificCounter) { Snapshot snapshot; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_STATS_INC_SYSCALL_POLL(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + GRPC_STATS_INC_SYSCALL_POLL(); EXPECT_EQ(snapshot.delta().counters[GRPC_STATS_COUNTER_SYSCALL_POLL], 1); } @@ -94,9 +92,8 @@ TEST_P(HistogramTest, IncHistogram) { for (auto j : test_values) { Snapshot snapshot; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_stats_inc_histogram[kHistogram](&exec_ctx, j); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_stats_inc_histogram[kHistogram](j); auto delta = snapshot.delta(); diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc index 0fdb637eadd..93809ac37a6 100644 --- a/test/core/end2end/bad_server_response_test.cc +++ b/test/core/end2end/bad_server_response_test.cc @@ -91,22 +91,22 @@ static grpc_closure on_write; static void* tag(intptr_t t) { return (void*)t; } -static void done_write(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void done_write(void* arg, grpc_error* error) { GPR_ASSERT(error == GRPC_ERROR_NONE); gpr_atm_rel_store(&state.done_atm, 1); } -static void handle_write(grpc_exec_ctx* exec_ctx) { +static void handle_write() { grpc_slice slice = grpc_slice_from_copied_buffer( state.response_payload, state.response_payload_length); grpc_slice_buffer_reset_and_unref(&state.outgoing_buffer); grpc_slice_buffer_add(&state.outgoing_buffer, slice); - grpc_endpoint_write(exec_ctx, state.tcp, &state.outgoing_buffer, &on_write); + grpc_endpoint_write(state.tcp, &state.outgoing_buffer, &on_write); } -static void handle_read(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void handle_read(void* arg, grpc_error* error) { GPR_ASSERT(error == GRPC_ERROR_NONE); state.incoming_data_length += state.temp_incoming_buffer.length; @@ -123,14 +123,13 @@ static void handle_read(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { SERVER_INCOMING_DATA_LENGTH_LOWER_THRESHOLD); if (state.incoming_data_length >= SERVER_INCOMING_DATA_LENGTH_LOWER_THRESHOLD) { - handle_write(exec_ctx); + handle_write(); } else { - grpc_endpoint_read(exec_ctx, state.tcp, &state.temp_incoming_buffer, - &on_read); + grpc_endpoint_read(state.tcp, &state.temp_incoming_buffer, &on_read); } } -static void on_connect(grpc_exec_ctx* exec_ctx, void* arg, grpc_endpoint* tcp, +static void on_connect(void* arg, grpc_endpoint* tcp, grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor) { gpr_free(acceptor); @@ -141,8 +140,8 @@ static void on_connect(grpc_exec_ctx* exec_ctx, void* arg, grpc_endpoint* tcp, grpc_slice_buffer_init(&state.outgoing_buffer); state.tcp = tcp; state.incoming_data_length = 0; - grpc_endpoint_add_to_pollset(exec_ctx, tcp, server->pollset); - grpc_endpoint_read(exec_ctx, tcp, &state.temp_incoming_buffer, &on_read); + grpc_endpoint_add_to_pollset(tcp, server->pollset); + grpc_endpoint_read(tcp, &state.temp_incoming_buffer, &on_read); } static gpr_timespec n_sec_deadline(int seconds) { @@ -217,10 +216,10 @@ static void start_rpc(int target_port, grpc_status_code expected_status, cq_verifier_destroy(cqv); } -static void cleanup_rpc(grpc_exec_ctx* exec_ctx) { +static void cleanup_rpc() { grpc_event ev; - grpc_slice_buffer_destroy_internal(exec_ctx, &state.temp_incoming_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &state.outgoing_buffer); + grpc_slice_buffer_destroy_internal(&state.temp_incoming_buffer); + grpc_slice_buffer_destroy_internal(&state.outgoing_buffer); grpc_call_unref(state.call); grpc_completion_queue_shutdown(state.cq); do { @@ -270,7 +269,7 @@ static void run_test(const char* response_payload, grpc_status_code expected_status, const char* expected_detail) { test_tcp_server test_server; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_event ev; grpc_init(); @@ -287,11 +286,11 @@ static void run_test(const char* response_payload, gpr_event_wait(&ev, gpr_inf_future(GPR_CLOCK_REALTIME)); /* clean up */ - grpc_endpoint_shutdown(&exec_ctx, state.tcp, + grpc_endpoint_shutdown(state.tcp, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); - grpc_endpoint_destroy(&exec_ctx, state.tcp); - cleanup_rpc(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + grpc_endpoint_destroy(state.tcp); + cleanup_rpc(); + grpc_core::ExecCtx::Get()->Flush(); test_tcp_server_destroy(&test_server); grpc_shutdown(); @@ -299,6 +298,7 @@ static void run_test(const char* response_payload, int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); /* status defined in hpack static table */ run_test(HTTP2_RESP(204), sizeof(HTTP2_RESP(204)) - 1, GRPC_STATUS_CANCELLED, @@ -337,5 +337,6 @@ int main(int argc, char** argv) { run_test(HTTP1_RESP, sizeof(HTTP1_RESP) - 1, GRPC_STATUS_UNAVAILABLE, HTTP1_DETAIL_MSG); + grpc_shutdown(); return 0; } diff --git a/test/core/end2end/connection_refused_test.cc b/test/core/end2end/connection_refused_test.cc index f3f2dda91df..ca6d17e7c89 100644 --- a/test/core/end2end/connection_refused_test.cc +++ b/test/core/end2end/connection_refused_test.cc @@ -133,9 +133,8 @@ static void run_test(bool wait_for_ready, bool use_service_config) { grpc_metadata_array_destroy(&trailing_metadata_recv); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - if (args != nullptr) grpc_channel_args_destroy(&exec_ctx, args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + if (args != nullptr) grpc_channel_args_destroy(args); } grpc_shutdown(); diff --git a/test/core/end2end/fixtures/h2_census.cc b/test/core/end2end/fixtures/h2_census.cc index fed8ead5c8a..75c80aa1ffd 100644 --- a/test/core/end2end/fixtures/h2_census.cc +++ b/test/core/end2end/fixtures/h2_census.cc @@ -75,9 +75,8 @@ void chttp2_init_client_fullstack(grpc_end2end_test_fixture* f, grpc_insecure_channel_create(ffd->localaddr, client_args, nullptr); GPR_ASSERT(f->client); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, client_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(client_args); } } @@ -92,9 +91,8 @@ void chttp2_init_server_fullstack(grpc_end2end_test_fixture* f, server_args = grpc_channel_args_copy_and_add(server_args, &arg, 1); f->server = grpc_server_create(server_args, nullptr); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(server_args); } grpc_server_register_completion_queue(f->server, f->cq, nullptr); GPR_ASSERT(grpc_server_add_insecure_http2_port(f->server, ffd->localaddr)); diff --git a/test/core/end2end/fixtures/h2_compress.cc b/test/core/end2end/fixtures/h2_compress.cc index ea8990fd0a6..5b9181586cb 100644 --- a/test/core/end2end/fixtures/h2_compress.cc +++ b/test/core/end2end/fixtures/h2_compress.cc @@ -66,9 +66,8 @@ void chttp2_init_client_fullstack_compression(grpc_end2end_test_fixture* f, fullstack_compression_fixture_data* ffd = static_cast(f->fixture_data); if (ffd->client_args_compression != nullptr) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, ffd->client_args_compression); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(ffd->client_args_compression); } ffd->client_args_compression = grpc_channel_args_set_compression_algorithm( client_args, GRPC_COMPRESS_GZIP); @@ -81,9 +80,8 @@ void chttp2_init_server_fullstack_compression(grpc_end2end_test_fixture* f, fullstack_compression_fixture_data* ffd = static_cast(f->fixture_data); if (ffd->server_args_compression != nullptr) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, ffd->server_args_compression); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(ffd->server_args_compression); } ffd->server_args_compression = grpc_channel_args_set_compression_algorithm( server_args, GRPC_COMPRESS_GZIP); @@ -97,14 +95,13 @@ void chttp2_init_server_fullstack_compression(grpc_end2end_test_fixture* f, } void chttp2_tear_down_fullstack_compression(grpc_end2end_test_fixture* f) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; fullstack_compression_fixture_data* ffd = static_cast(f->fixture_data); - grpc_channel_args_destroy(&exec_ctx, ffd->client_args_compression); - grpc_channel_args_destroy(&exec_ctx, ffd->server_args_compression); + grpc_channel_args_destroy(ffd->client_args_compression); + grpc_channel_args_destroy(ffd->server_args_compression); gpr_free(ffd->localaddr); gpr_free(ffd); - grpc_exec_ctx_finish(&exec_ctx); } /* All test configurations */ diff --git a/test/core/end2end/fixtures/h2_fd.cc b/test/core/end2end/fixtures/h2_fd.cc index 97f4b71bf01..9157ab04d0d 100644 --- a/test/core/end2end/fixtures/h2_fd.cc +++ b/test/core/end2end/fixtures/h2_fd.cc @@ -68,20 +68,18 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* client_args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; sp_fixture_data* sfd = static_cast(f->fixture_data); GPR_ASSERT(!f->client); f->client = grpc_insecure_channel_create_from_fd( "fixture_client", sfd->fd_pair[0], client_args); GPR_ASSERT(f->client); - - grpc_exec_ctx_finish(&exec_ctx); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* server_args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; sp_fixture_data* sfd = static_cast(f->fixture_data); GPR_ASSERT(!f->server); f->server = grpc_server_create(server_args, nullptr); @@ -90,8 +88,6 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, grpc_server_start(f->server); grpc_server_add_insecure_channel_from_fd(f->server, nullptr, sfd->fd_pair[1]); - - grpc_exec_ctx_finish(&exec_ctx); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture* f) { diff --git a/test/core/end2end/fixtures/h2_full+workarounds.cc b/test/core/end2end/fixtures/h2_full+workarounds.cc index 71a497d796d..237841d1854 100644 --- a/test/core/end2end/fixtures/h2_full+workarounds.cc +++ b/test/core/end2end/fixtures/h2_full+workarounds.cc @@ -72,7 +72,7 @@ void chttp2_init_client_fullstack(grpc_end2end_test_fixture* f, void chttp2_init_server_fullstack(grpc_end2end_test_fixture* f, grpc_channel_args* server_args) { int i; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; fullstack_fixture_data* ffd = static_cast(f->fixture_data); grpc_arg args[GRPC_MAX_WORKAROUND_ID]; @@ -90,8 +90,7 @@ void chttp2_init_server_fullstack(grpc_end2end_test_fixture* f, grpc_server_register_completion_queue(f->server, f->cq, nullptr); GPR_ASSERT(grpc_server_add_insecure_http2_port(f->server, ffd->localaddr)); grpc_server_start(f->server); - grpc_channel_args_destroy(&exec_ctx, server_args_new); - grpc_exec_ctx_finish(&exec_ctx); + grpc_channel_args_destroy(server_args_new); } void chttp2_tear_down_fullstack(grpc_end2end_test_fixture* f) { diff --git a/test/core/end2end/fixtures/h2_load_reporting.cc b/test/core/end2end/fixtures/h2_load_reporting.cc index 7486b6af781..fda5f4b052b 100644 --- a/test/core/end2end/fixtures/h2_load_reporting.cc +++ b/test/core/end2end/fixtures/h2_load_reporting.cc @@ -78,9 +78,8 @@ void chttp2_init_server_load_reporting(grpc_end2end_test_fixture* f, server_args = grpc_channel_args_copy_and_add(server_args, &arg, 1); f->server = grpc_server_create(server_args, nullptr); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(server_args); } grpc_server_register_completion_queue(f->server, f->cq, nullptr); GPR_ASSERT(grpc_server_add_insecure_http2_port(f->server, ffd->localaddr)); diff --git a/test/core/end2end/fixtures/h2_oauth2.cc b/test/core/end2end/fixtures/h2_oauth2.cc index 1642cb0db97..5fed4434dec 100644 --- a/test/core/end2end/fixtures/h2_oauth2.cc +++ b/test/core/end2end/fixtures/h2_oauth2.cc @@ -143,11 +143,11 @@ void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture* f) { static void chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack( grpc_end2end_test_fixture* f, grpc_channel_args* client_args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_channel_credentials* ssl_creds = grpc_ssl_credentials_create(test_root_cert, nullptr, nullptr); grpc_call_credentials* oauth2_creds = grpc_md_only_test_credentials_create( - &exec_ctx, "authorization", oauth2_md, true /* is_async */); + "authorization", oauth2_md, true /* is_async */); grpc_channel_credentials* ssl_oauth2_creds = grpc_composite_channel_credentials_create(ssl_creds, oauth2_creds, nullptr); @@ -158,10 +158,9 @@ static void chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack( grpc_channel_args* new_client_args = grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); chttp2_init_client_secure_fullstack(f, new_client_args, ssl_oauth2_creds); - grpc_channel_args_destroy(&exec_ctx, new_client_args); + grpc_channel_args_destroy(new_client_args); grpc_channel_credentials_release(ssl_creds); grpc_call_credentials_release(oauth2_creds); - grpc_exec_ctx_finish(&exec_ctx); } static int fail_server_auth_check(grpc_channel_args* server_args) { diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.cc b/test/core/end2end/fixtures/h2_sockpair+trace.cc index 9319c401dcb..9807e929af6 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.cc +++ b/test/core/end2end/fixtures/h2_sockpair+trace.cc @@ -50,12 +50,11 @@ static void server_setup_transport(void* ts, grpc_transport* transport) { grpc_end2end_test_fixture* f = static_cast(ts); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); - grpc_endpoint_add_to_pollset(&exec_ctx, sfd->server, grpc_cq_pollset(f->cq)); - grpc_server_setup_transport(&exec_ctx, f->server, transport, nullptr, + grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq)); + grpc_server_setup_transport(f->server, transport, nullptr, grpc_server_get_channel_args(f->server)); - grpc_exec_ctx_finish(&exec_ctx); } typedef struct { @@ -63,13 +62,11 @@ typedef struct { grpc_channel_args* client_args; } sp_client_setup; -static void client_setup_transport(grpc_exec_ctx* exec_ctx, void* ts, - grpc_transport* transport) { +static void client_setup_transport(void* ts, grpc_transport* transport) { sp_client_setup* cs = static_cast(ts); - cs->f->client = - grpc_channel_create(exec_ctx, "socketpair-target", cs->client_args, - GRPC_CLIENT_DIRECT_CHANNEL, transport); + cs->f->client = grpc_channel_create("socketpair-target", cs->client_args, + GRPC_CLIENT_DIRECT_CHANNEL, transport); } static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( @@ -90,34 +87,30 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* client_args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = - grpc_create_chttp2_transport(&exec_ctx, client_args, sfd->client, true); - client_setup_transport(&exec_ctx, &cs, transport); + transport = grpc_create_chttp2_transport(client_args, sfd->client, true); + client_setup_transport(&cs, transport); GPR_ASSERT(f->client); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* server_args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; GPR_ASSERT(!f->server); f->server = grpc_server_create(server_args, nullptr); grpc_server_register_completion_queue(f->server, f->cq, nullptr); grpc_server_start(f->server); - transport = - grpc_create_chttp2_transport(&exec_ctx, server_args, sfd->server, false); + transport = grpc_create_chttp2_transport(server_args, sfd->server, false); server_setup_transport(f, transport); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture* f) { @@ -133,7 +126,6 @@ static grpc_end2end_test_config configs[] = { int main(int argc, char** argv) { size_t i; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; /* force tracing on, with a value to force many code paths in trace.c to be taken */ @@ -147,7 +139,6 @@ int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_end2end_tests_pre_init(); grpc_init(); - grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(0 == grpc_tracer_set_enabled("also-doesnt-exist", 0)); GPR_ASSERT(1 == grpc_tracer_set_enabled("http", 1)); diff --git a/test/core/end2end/fixtures/h2_sockpair.cc b/test/core/end2end/fixtures/h2_sockpair.cc index 03566aada2b..b68279fd715 100644 --- a/test/core/end2end/fixtures/h2_sockpair.cc +++ b/test/core/end2end/fixtures/h2_sockpair.cc @@ -44,12 +44,11 @@ static void server_setup_transport(void* ts, grpc_transport* transport) { grpc_end2end_test_fixture* f = static_cast(ts); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); - grpc_endpoint_add_to_pollset(&exec_ctx, sfd->server, grpc_cq_pollset(f->cq)); - grpc_server_setup_transport(&exec_ctx, f->server, transport, nullptr, + grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq)); + grpc_server_setup_transport(f->server, transport, nullptr, grpc_server_get_channel_args(f->server)); - grpc_exec_ctx_finish(&exec_ctx); } typedef struct { @@ -57,13 +56,11 @@ typedef struct { grpc_channel_args* client_args; } sp_client_setup; -static void client_setup_transport(grpc_exec_ctx* exec_ctx, void* ts, - grpc_transport* transport) { +static void client_setup_transport(void* ts, grpc_transport* transport) { sp_client_setup* cs = static_cast(ts); - cs->f->client = - grpc_channel_create(exec_ctx, "socketpair-target", cs->client_args, - GRPC_CLIENT_DIRECT_CHANNEL, transport); + cs->f->client = grpc_channel_create("socketpair-target", cs->client_args, + GRPC_CLIENT_DIRECT_CHANNEL, transport); } static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( @@ -84,34 +81,30 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* client_args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = - grpc_create_chttp2_transport(&exec_ctx, client_args, sfd->client, true); - client_setup_transport(&exec_ctx, &cs, transport); + transport = grpc_create_chttp2_transport(client_args, sfd->client, true); + client_setup_transport(&cs, transport); GPR_ASSERT(f->client); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* server_args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; GPR_ASSERT(!f->server); f->server = grpc_server_create(server_args, nullptr); grpc_server_register_completion_queue(f->server, f->cq, nullptr); grpc_server_start(f->server); - transport = - grpc_create_chttp2_transport(&exec_ctx, server_args, sfd->server, false); + transport = grpc_create_chttp2_transport(server_args, sfd->server, false); server_setup_transport(f, transport); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture* f) { diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.cc b/test/core/end2end/fixtures/h2_sockpair_1byte.cc index 9adba002045..350be138ca8 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.cc +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.cc @@ -44,12 +44,11 @@ static void server_setup_transport(void* ts, grpc_transport* transport) { grpc_end2end_test_fixture* f = static_cast(ts); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); - grpc_endpoint_add_to_pollset(&exec_ctx, sfd->server, grpc_cq_pollset(f->cq)); - grpc_server_setup_transport(&exec_ctx, f->server, transport, nullptr, + grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq)); + grpc_server_setup_transport(f->server, transport, nullptr, grpc_server_get_channel_args(f->server)); - grpc_exec_ctx_finish(&exec_ctx); } typedef struct { @@ -57,13 +56,11 @@ typedef struct { grpc_channel_args* client_args; } sp_client_setup; -static void client_setup_transport(grpc_exec_ctx* exec_ctx, void* ts, - grpc_transport* transport) { +static void client_setup_transport(void* ts, grpc_transport* transport) { sp_client_setup* cs = static_cast(ts); - cs->f->client = - grpc_channel_create(exec_ctx, "socketpair-target", cs->client_args, - GRPC_CLIENT_DIRECT_CHANNEL, transport); + cs->f->client = grpc_channel_create("socketpair-target", cs->client_args, + GRPC_CLIENT_DIRECT_CHANNEL, transport); } static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( @@ -95,34 +92,30 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* client_args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; sp_client_setup cs; cs.client_args = client_args; cs.f = f; - transport = - grpc_create_chttp2_transport(&exec_ctx, client_args, sfd->client, true); - client_setup_transport(&exec_ctx, &cs, transport); + transport = grpc_create_chttp2_transport(client_args, sfd->client, true); + client_setup_transport(&cs, transport); GPR_ASSERT(f->client); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f, grpc_channel_args* server_args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_pair* sfd = static_cast(f->fixture_data); grpc_transport* transport; GPR_ASSERT(!f->server); f->server = grpc_server_create(server_args, nullptr); grpc_server_register_completion_queue(f->server, f->cq, nullptr); grpc_server_start(f->server); - transport = - grpc_create_chttp2_transport(&exec_ctx, server_args, sfd->server, false); + transport = grpc_create_chttp2_transport(server_args, sfd->server, false); server_setup_transport(f, transport); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture* f) { diff --git a/test/core/end2end/fixtures/h2_ssl.cc b/test/core/end2end/fixtures/h2_ssl.cc index 3d7e2e327ea..9a0680c40ef 100644 --- a/test/core/end2end/fixtures/h2_ssl.cc +++ b/test/core/end2end/fixtures/h2_ssl.cc @@ -110,9 +110,8 @@ static void chttp2_init_client_simple_ssl_secure_fullstack( grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); chttp2_init_client_secure_fullstack(f, new_client_args, ssl_creds); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, new_client_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(new_client_args); } } diff --git a/test/core/end2end/fixtures/h2_ssl_proxy.cc b/test/core/end2end/fixtures/h2_ssl_proxy.cc index f8d5a699e4a..5ddbdefc8c3 100644 --- a/test/core/end2end/fixtures/h2_ssl_proxy.cc +++ b/test/core/end2end/fixtures/h2_ssl_proxy.cc @@ -66,9 +66,8 @@ static grpc_channel* create_proxy_client(const char* target, grpc_secure_channel_create(ssl_creds, target, new_client_args, nullptr); grpc_channel_credentials_release(ssl_creds); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, new_client_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(new_client_args); } return channel; } @@ -148,9 +147,8 @@ static void chttp2_init_client_simple_ssl_secure_fullstack( grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); chttp2_init_client_secure_fullstack(f, new_client_args, ssl_creds); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, new_client_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(new_client_args); } } diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc index 39048870268..137f7c9fa37 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.cc +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -116,24 +116,21 @@ static void proxy_connection_ref(proxy_connection* conn, const char* reason) { } // Helper function to destroy the proxy connection. -static void proxy_connection_unref(grpc_exec_ctx* exec_ctx, - proxy_connection* conn, const char* reason) { +static void proxy_connection_unref(proxy_connection* conn, const char* reason) { if (gpr_unref(&conn->refcount)) { gpr_log(GPR_DEBUG, "endpoints: %p %p", conn->client_endpoint, conn->server_endpoint); - grpc_endpoint_destroy(exec_ctx, conn->client_endpoint); + grpc_endpoint_destroy(conn->client_endpoint); if (conn->server_endpoint != nullptr) { - grpc_endpoint_destroy(exec_ctx, conn->server_endpoint); + grpc_endpoint_destroy(conn->server_endpoint); } - grpc_pollset_set_destroy(exec_ctx, conn->pollset_set); - grpc_slice_buffer_destroy_internal(exec_ctx, &conn->client_read_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, - &conn->client_deferred_write_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &conn->client_write_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &conn->server_read_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, - &conn->server_deferred_write_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &conn->server_write_buffer); + grpc_pollset_set_destroy(conn->pollset_set); + grpc_slice_buffer_destroy_internal(&conn->client_read_buffer); + grpc_slice_buffer_destroy_internal(&conn->client_deferred_write_buffer); + grpc_slice_buffer_destroy_internal(&conn->client_write_buffer); + grpc_slice_buffer_destroy_internal(&conn->server_read_buffer); + grpc_slice_buffer_destroy_internal(&conn->server_deferred_write_buffer); + grpc_slice_buffer_destroy_internal(&conn->server_write_buffer); grpc_http_parser_destroy(&conn->http_parser); grpc_http_request_destroy(&conn->http_request); gpr_unref(&conn->proxy->users); @@ -150,8 +147,7 @@ enum failure_type { }; // Helper function to shut down the proxy connection. -static void proxy_connection_failed(grpc_exec_ctx* exec_ctx, - proxy_connection* conn, +static void proxy_connection_failed(proxy_connection* conn, failure_type failure, const char* prefix, grpc_error* error) { gpr_log(GPR_INFO, "%s: %s", prefix, grpc_error_string(error)); @@ -175,28 +171,25 @@ static void proxy_connection_failed(grpc_exec_ctx* exec_ctx, } // If we decided to shut down either one and have not yet done so, do so. if (shutdown_client && !conn->client_shutdown) { - grpc_endpoint_shutdown(exec_ctx, conn->client_endpoint, - GRPC_ERROR_REF(error)); + grpc_endpoint_shutdown(conn->client_endpoint, GRPC_ERROR_REF(error)); conn->client_shutdown = true; } if (shutdown_server && !conn->server_shutdown && (conn->server_endpoint != nullptr)) { - grpc_endpoint_shutdown(exec_ctx, conn->server_endpoint, - GRPC_ERROR_REF(error)); + grpc_endpoint_shutdown(conn->server_endpoint, GRPC_ERROR_REF(error)); conn->server_shutdown = true; } // Unref the connection. - proxy_connection_unref(exec_ctx, conn, "conn_failed"); + proxy_connection_unref(conn, "conn_failed"); GRPC_ERROR_UNREF(error); } // Callback for writing proxy data to the client. -static void on_client_write_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_client_write_done(void* arg, grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; conn->client_is_writing = false; if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(exec_ctx, conn, CLIENT_WRITE_FAILED, + proxy_connection_failed(conn, CLIENT_WRITE_FAILED, "HTTP proxy client write", GRPC_ERROR_REF(error)); return; } @@ -208,22 +201,20 @@ static void on_client_write_done(grpc_exec_ctx* exec_ctx, void* arg, grpc_slice_buffer_move_into(&conn->client_deferred_write_buffer, &conn->client_write_buffer); conn->client_is_writing = true; - grpc_endpoint_write(exec_ctx, conn->client_endpoint, - &conn->client_write_buffer, + grpc_endpoint_write(conn->client_endpoint, &conn->client_write_buffer, &conn->on_client_write_done); } else { // No more writes. Unref the connection. - proxy_connection_unref(exec_ctx, conn, "write_done"); + proxy_connection_unref(conn, "write_done"); } } // Callback for writing proxy data to the backend server. -static void on_server_write_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_server_write_done(void* arg, grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; conn->server_is_writing = false; if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(exec_ctx, conn, SERVER_WRITE_FAILED, + proxy_connection_failed(conn, SERVER_WRITE_FAILED, "HTTP proxy server write", GRPC_ERROR_REF(error)); return; } @@ -235,23 +226,21 @@ static void on_server_write_done(grpc_exec_ctx* exec_ctx, void* arg, grpc_slice_buffer_move_into(&conn->server_deferred_write_buffer, &conn->server_write_buffer); conn->server_is_writing = true; - grpc_endpoint_write(exec_ctx, conn->server_endpoint, - &conn->server_write_buffer, + grpc_endpoint_write(conn->server_endpoint, &conn->server_write_buffer, &conn->on_server_write_done); } else { // No more writes. Unref the connection. - proxy_connection_unref(exec_ctx, conn, "server_write"); + proxy_connection_unref(conn, "server_write"); } } // Callback for reading data from the client, which will be proxied to // the backend server. -static void on_client_read_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_client_read_done(void* arg, grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(exec_ctx, conn, CLIENT_READ_FAILED, - "HTTP proxy client read", GRPC_ERROR_REF(error)); + proxy_connection_failed(conn, CLIENT_READ_FAILED, "HTTP proxy client read", + GRPC_ERROR_REF(error)); return; } // If there is already a pending write (i.e., server_write_buffer is @@ -268,23 +257,21 @@ static void on_client_read_done(grpc_exec_ctx* exec_ctx, void* arg, &conn->server_write_buffer); proxy_connection_ref(conn, "client_read"); conn->server_is_writing = true; - grpc_endpoint_write(exec_ctx, conn->server_endpoint, - &conn->server_write_buffer, + grpc_endpoint_write(conn->server_endpoint, &conn->server_write_buffer, &conn->on_server_write_done); } // Read more data. - grpc_endpoint_read(exec_ctx, conn->client_endpoint, &conn->client_read_buffer, + grpc_endpoint_read(conn->client_endpoint, &conn->client_read_buffer, &conn->on_client_read_done); } // Callback for reading data from the backend server, which will be // proxied to the client. -static void on_server_read_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_server_read_done(void* arg, grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(exec_ctx, conn, SERVER_READ_FAILED, - "HTTP proxy server read", GRPC_ERROR_REF(error)); + proxy_connection_failed(conn, SERVER_READ_FAILED, "HTTP proxy server read", + GRPC_ERROR_REF(error)); return; } // If there is already a pending write (i.e., client_write_buffer is @@ -301,23 +288,21 @@ static void on_server_read_done(grpc_exec_ctx* exec_ctx, void* arg, &conn->client_write_buffer); proxy_connection_ref(conn, "server_read"); conn->client_is_writing = true; - grpc_endpoint_write(exec_ctx, conn->client_endpoint, - &conn->client_write_buffer, + grpc_endpoint_write(conn->client_endpoint, &conn->client_write_buffer, &conn->on_client_write_done); } // Read more data. - grpc_endpoint_read(exec_ctx, conn->server_endpoint, &conn->server_read_buffer, + grpc_endpoint_read(conn->server_endpoint, &conn->server_read_buffer, &conn->on_server_read_done); } // Callback to write the HTTP response for the CONNECT request. -static void on_write_response_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_write_response_done(void* arg, grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; conn->client_is_writing = false; if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(exec_ctx, conn, SETUP_FAILED, - "HTTP proxy write response", GRPC_ERROR_REF(error)); + proxy_connection_failed(conn, SETUP_FAILED, "HTTP proxy write response", + GRPC_ERROR_REF(error)); return; } // Clear write buffer. @@ -327,17 +312,16 @@ static void on_write_response_done(grpc_exec_ctx* exec_ctx, void* arg, // for the other one. proxy_connection_ref(conn, "client_read"); proxy_connection_ref(conn, "server_read"); - proxy_connection_unref(exec_ctx, conn, "write_response"); - grpc_endpoint_read(exec_ctx, conn->client_endpoint, &conn->client_read_buffer, + proxy_connection_unref(conn, "write_response"); + grpc_endpoint_read(conn->client_endpoint, &conn->client_read_buffer, &conn->on_client_read_done); - grpc_endpoint_read(exec_ctx, conn->server_endpoint, &conn->server_read_buffer, + grpc_endpoint_read(conn->server_endpoint, &conn->server_read_buffer, &conn->on_server_read_done); } // Callback to connect to the backend server specified by the HTTP // CONNECT request. -static void on_server_connect_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_server_connect_done(void* arg, grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; if (error != GRPC_ERROR_NONE) { // TODO(roth): Technically, in this case, we should handle the error @@ -345,8 +329,8 @@ static void on_server_connect_done(grpc_exec_ctx* exec_ctx, void* arg, // connection failed. However, for the purposes of this test code, // it's fine to pretend this is a client-side error, which will // cause the client connection to be dropped. - proxy_connection_failed(exec_ctx, conn, SETUP_FAILED, - "HTTP proxy server connect", GRPC_ERROR_REF(error)); + proxy_connection_failed(conn, SETUP_FAILED, "HTTP proxy server connect", + GRPC_ERROR_REF(error)); return; } // We've established a connection, so send back a 200 response code to @@ -356,8 +340,7 @@ static void on_server_connect_done(grpc_exec_ctx* exec_ctx, void* arg, grpc_slice_from_copied_string("HTTP/1.0 200 connected\r\n\r\n"); grpc_slice_buffer_add(&conn->client_write_buffer, slice); conn->client_is_writing = true; - grpc_endpoint_write(exec_ctx, conn->client_endpoint, - &conn->client_write_buffer, + grpc_endpoint_write(conn->client_endpoint, &conn->client_write_buffer, &conn->on_write_response_done); } @@ -366,8 +349,7 @@ static void on_server_connect_done(grpc_exec_ctx* exec_ctx, void* arg, * Basic * Returns true if it matches, false otherwise */ -static bool proxy_auth_header_matches(grpc_exec_ctx* exec_ctx, - char* proxy_auth_header_val, +static bool proxy_auth_header_matches(char* proxy_auth_header_val, char* expected_cred) { GPR_ASSERT(proxy_auth_header_val != nullptr); GPR_ASSERT(expected_cred != nullptr); @@ -375,11 +357,10 @@ static bool proxy_auth_header_matches(grpc_exec_ctx* exec_ctx, return false; } proxy_auth_header_val += 6; - grpc_slice decoded_slice = - grpc_base64_decode(exec_ctx, proxy_auth_header_val, 0); + grpc_slice decoded_slice = grpc_base64_decode(proxy_auth_header_val, 0); const bool header_matches = grpc_slice_str_cmp(decoded_slice, expected_cred) == 0; - grpc_slice_unref_internal(exec_ctx, decoded_slice); + grpc_slice_unref_internal(decoded_slice); return header_matches; } @@ -389,14 +370,13 @@ static bool proxy_auth_header_matches(grpc_exec_ctx* exec_ctx, // the client indicating that the request failed. However, for the purposes // of this test code, it's fine to pretend this is a client-side error, // which will cause the client connection to be dropped. -static void on_read_request_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_read_request_done(void* arg, grpc_error* error) { proxy_connection* conn = (proxy_connection*)arg; gpr_log(GPR_DEBUG, "on_read_request_done: %p %s", conn, grpc_error_string(error)); if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(exec_ctx, conn, SETUP_FAILED, - "HTTP proxy read request", GRPC_ERROR_REF(error)); + proxy_connection_failed(conn, SETUP_FAILED, "HTTP proxy read request", + GRPC_ERROR_REF(error)); return; } // Read request and feed it to the parser. @@ -405,8 +385,7 @@ static void on_read_request_done(grpc_exec_ctx* exec_ctx, void* arg, error = grpc_http_parser_parse( &conn->http_parser, conn->client_read_buffer.slices[i], nullptr); if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(exec_ctx, conn, SETUP_FAILED, - "HTTP proxy request parse", + proxy_connection_failed(conn, SETUP_FAILED, "HTTP proxy request parse", GRPC_ERROR_REF(error)); GRPC_ERROR_UNREF(error); return; @@ -416,8 +395,8 @@ static void on_read_request_done(grpc_exec_ctx* exec_ctx, void* arg, grpc_slice_buffer_reset_and_unref(&conn->client_read_buffer); // If we're not done reading the request, read more data. if (conn->http_parser.state != GRPC_HTTP_BODY) { - grpc_endpoint_read(exec_ctx, conn->client_endpoint, - &conn->client_read_buffer, &conn->on_read_request_done); + grpc_endpoint_read(conn->client_endpoint, &conn->client_read_buffer, + &conn->on_read_request_done); return; } // Make sure we got a CONNECT request. @@ -427,8 +406,8 @@ static void on_read_request_done(grpc_exec_ctx* exec_ctx, void* arg, conn->http_request.method); error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); - proxy_connection_failed(exec_ctx, conn, SETUP_FAILED, - "HTTP proxy read request", GRPC_ERROR_REF(error)); + proxy_connection_failed(conn, SETUP_FAILED, "HTTP proxy read request", + GRPC_ERROR_REF(error)); GRPC_ERROR_UNREF(error); return; } @@ -440,16 +419,15 @@ static void on_read_request_done(grpc_exec_ctx* exec_ctx, void* arg, for (size_t i = 0; i < conn->http_request.hdr_count; i++) { if (strcmp(conn->http_request.hdrs[i].key, "Proxy-Authorization") == 0) { client_authenticated = proxy_auth_header_matches( - exec_ctx, conn->http_request.hdrs[i].value, - proxy_auth_arg->value.string); + conn->http_request.hdrs[i].value, proxy_auth_arg->value.string); break; } } if (!client_authenticated) { const char* msg = "HTTP Connect could not verify authentication"; error = GRPC_ERROR_CREATE_FROM_STATIC_STRING(msg); - proxy_connection_failed(exec_ctx, conn, SETUP_FAILED, - "HTTP proxy read request", GRPC_ERROR_REF(error)); + proxy_connection_failed(conn, SETUP_FAILED, "HTTP proxy read request", + GRPC_ERROR_REF(error)); GRPC_ERROR_UNREF(error); return; } @@ -459,8 +437,8 @@ static void on_read_request_done(grpc_exec_ctx* exec_ctx, void* arg, error = grpc_blocking_resolve_address(conn->http_request.path, "80", &resolved_addresses); if (error != GRPC_ERROR_NONE) { - proxy_connection_failed(exec_ctx, conn, SETUP_FAILED, - "HTTP proxy DNS lookup", GRPC_ERROR_REF(error)); + proxy_connection_failed(conn, SETUP_FAILED, "HTTP proxy DNS lookup", + GRPC_ERROR_REF(error)); GRPC_ERROR_UNREF(error); return; } @@ -468,15 +446,15 @@ static void on_read_request_done(grpc_exec_ctx* exec_ctx, void* arg, // Connect to requested address. // The connection callback inherits our reference to conn. const grpc_millis deadline = - grpc_exec_ctx_now(exec_ctx) + 10 * GPR_MS_PER_SEC; - grpc_tcp_client_connect(exec_ctx, &conn->on_server_connect_done, - &conn->server_endpoint, conn->pollset_set, nullptr, + grpc_core::ExecCtx::Get()->Now() + 10 * GPR_MS_PER_SEC; + grpc_tcp_client_connect(&conn->on_server_connect_done, &conn->server_endpoint, + conn->pollset_set, nullptr, &resolved_addresses->addrs[0], deadline); grpc_resolved_addresses_destroy(resolved_addresses); } -static void on_accept(grpc_exec_ctx* exec_ctx, void* arg, - grpc_endpoint* endpoint, grpc_pollset* accepting_pollset, +static void on_accept(void* arg, grpc_endpoint* endpoint, + grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor) { gpr_free(acceptor); grpc_end2end_http_proxy* proxy = (grpc_end2end_http_proxy*)arg; @@ -487,8 +465,8 @@ static void on_accept(grpc_exec_ctx* exec_ctx, void* arg, conn->proxy = proxy; gpr_ref_init(&conn->refcount, 1); conn->pollset_set = grpc_pollset_set_create(); - grpc_pollset_set_add_pollset(exec_ctx, conn->pollset_set, proxy->pollset); - grpc_endpoint_add_to_pollset_set(exec_ctx, endpoint, conn->pollset_set); + grpc_pollset_set_add_pollset(conn->pollset_set, proxy->pollset); + grpc_endpoint_add_to_pollset_set(endpoint, conn->pollset_set); GRPC_CLOSURE_INIT(&conn->on_read_request_done, on_read_request_done, conn, grpc_combiner_scheduler(conn->proxy->combiner)); GRPC_CLOSURE_INIT(&conn->on_server_connect_done, on_server_connect_done, conn, @@ -513,7 +491,7 @@ static void on_accept(grpc_exec_ctx* exec_ctx, void* arg, grpc_slice_buffer_init(&conn->server_write_buffer); grpc_http_parser_init(&conn->http_parser, GRPC_HTTP_REQUEST, &conn->http_request); - grpc_endpoint_read(exec_ctx, conn->client_endpoint, &conn->client_read_buffer, + grpc_endpoint_read(conn->client_endpoint, &conn->client_read_buffer, &conn->on_read_request_done); } @@ -523,24 +501,23 @@ static void on_accept(grpc_exec_ctx* exec_ctx, void* arg, static void thread_main(void* arg) { grpc_end2end_http_proxy* proxy = (grpc_end2end_http_proxy*)arg; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; do { gpr_ref(&proxy->users); grpc_pollset_worker* worker = nullptr; gpr_mu_lock(proxy->mu); GRPC_LOG_IF_ERROR( "grpc_pollset_work", - grpc_pollset_work(&exec_ctx, proxy->pollset, &worker, - grpc_exec_ctx_now(&exec_ctx) + GPR_MS_PER_SEC)); + grpc_pollset_work(proxy->pollset, &worker, + grpc_core::ExecCtx::Get()->Now() + GPR_MS_PER_SEC)); gpr_mu_unlock(proxy->mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); } while (!gpr_unref(&proxy->users)); - grpc_exec_ctx_finish(&exec_ctx); } grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( grpc_channel_args* args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_end2end_http_proxy* proxy = (grpc_end2end_http_proxy*)gpr_malloc(sizeof(*proxy)); memset(proxy, 0, sizeof(*proxy)); @@ -552,8 +529,8 @@ grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( gpr_log(GPR_INFO, "Proxy address: %s", proxy->proxy_name); // Create TCP server. proxy->channel_args = grpc_channel_args_copy(args); - grpc_error* error = grpc_tcp_server_create( - &exec_ctx, nullptr, proxy->channel_args, &proxy->server); + grpc_error* error = + grpc_tcp_server_create(nullptr, proxy->channel_args, &proxy->server); GPR_ASSERT(error == GRPC_ERROR_NONE); // Bind to port. grpc_resolved_address resolved_addr; @@ -568,9 +545,8 @@ grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( // Start server. proxy->pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); grpc_pollset_init(proxy->pollset, &proxy->mu); - grpc_tcp_server_start(&exec_ctx, proxy->server, &proxy->pollset, 1, on_accept, - proxy); - grpc_exec_ctx_finish(&exec_ctx); + grpc_tcp_server_start(proxy->server, &proxy->pollset, 1, on_accept, proxy); + // Start proxy thread. gpr_thd_options opt = gpr_thd_options_default(); gpr_thd_options_set_joinable(&opt); @@ -579,27 +555,25 @@ grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( return proxy; } -static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void destroy_pollset(void* arg, grpc_error* error) { grpc_pollset* pollset = (grpc_pollset*)arg; - grpc_pollset_destroy(exec_ctx, pollset); + grpc_pollset_destroy(pollset); gpr_free(pollset); } void grpc_end2end_http_proxy_destroy(grpc_end2end_http_proxy* proxy) { gpr_unref(&proxy->users); // Signal proxy thread to shutdown. - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_thd_join(proxy->thd); - grpc_tcp_server_shutdown_listeners(&exec_ctx, proxy->server); - grpc_tcp_server_unref(&exec_ctx, proxy->server); + grpc_tcp_server_shutdown_listeners(proxy->server); + grpc_tcp_server_unref(proxy->server); gpr_free(proxy->proxy_name); - grpc_channel_args_destroy(&exec_ctx, proxy->channel_args); - grpc_pollset_shutdown(&exec_ctx, proxy->pollset, + grpc_channel_args_destroy(proxy->channel_args); + grpc_pollset_shutdown(proxy->pollset, GRPC_CLOSURE_CREATE(destroy_pollset, proxy->pollset, grpc_schedule_on_exec_ctx)); - GRPC_COMBINER_UNREF(&exec_ctx, proxy->combiner, "test"); + GRPC_COMBINER_UNREF(proxy->combiner, "test"); gpr_free(proxy); - grpc_exec_ctx_finish(&exec_ctx); } const char* grpc_end2end_http_proxy_get_proxy_name( diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index 75117218e48..967a6d560f3 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -376,8 +376,7 @@ typedef struct addr_req { grpc_lb_addresses** lb_addrs; } addr_req; -static void finish_resolve(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void finish_resolve(void* arg, grpc_error* error) { addr_req* r = static_cast(arg); if (error == GRPC_ERROR_NONE && 0 == strcmp(r->addr, "server")) { @@ -395,9 +394,9 @@ static void finish_resolve(grpc_exec_ctx* exec_ctx, void* arg, nullptr); *r->lb_addrs = lb_addrs; } - GRPC_CLOSURE_SCHED(exec_ctx, r->on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(r->on_done, GRPC_ERROR_NONE); } else { - GRPC_CLOSURE_SCHED(exec_ctx, r->on_done, + GRPC_CLOSURE_SCHED(r->on_done, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Resolution failed", &error, 1)); } @@ -406,8 +405,7 @@ static void finish_resolve(grpc_exec_ctx* exec_ctx, void* arg, gpr_free(r); } -void my_resolve_address(grpc_exec_ctx* exec_ctx, const char* addr, - const char* default_port, +void my_resolve_address(const char* addr, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addresses) { @@ -417,22 +415,24 @@ void my_resolve_address(grpc_exec_ctx* exec_ctx, const char* addr, r->addrs = addresses; r->lb_addrs = nullptr; grpc_timer_init( - exec_ctx, &r->timer, GPR_MS_PER_SEC + grpc_exec_ctx_now(exec_ctx), + &r->timer, GPR_MS_PER_SEC + grpc_core::ExecCtx::Get()->Now(), GRPC_CLOSURE_CREATE(finish_resolve, r, grpc_schedule_on_exec_ctx)); } -grpc_ares_request* my_dns_lookup_ares( - grpc_exec_ctx* exec_ctx, const char* dns_server, const char* addr, - const char* default_port, grpc_pollset_set* interested_parties, - grpc_closure* on_done, grpc_lb_addresses** lb_addrs, bool check_grpclb, - char** service_config_json) { +grpc_ares_request* my_dns_lookup_ares(const char* dns_server, const char* addr, + const char* default_port, + grpc_pollset_set* interested_parties, + grpc_closure* on_done, + grpc_lb_addresses** lb_addrs, + bool check_grpclb, + char** service_config_json) { addr_req* r = static_cast(gpr_malloc(sizeof(*r))); r->addr = gpr_strdup(addr); r->on_done = on_done; r->addrs = nullptr; r->lb_addrs = lb_addrs; grpc_timer_init( - exec_ctx, &r->timer, GPR_MS_PER_SEC + grpc_exec_ctx_now(exec_ctx), + &r->timer, GPR_MS_PER_SEC + grpc_core::ExecCtx::Get()->Now(), GRPC_CLOSURE_CREATE(finish_resolve, r, grpc_schedule_on_exec_ctx)); return nullptr; } @@ -442,12 +442,12 @@ grpc_ares_request* my_dns_lookup_ares( // defined in tcp_client_posix.c extern void (*grpc_tcp_client_connect_impl)( - grpc_exec_ctx* exec_ctx, grpc_closure* closure, grpc_endpoint** ep, + grpc_closure* closure, grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, grpc_millis deadline); -static void sched_connect(grpc_exec_ctx* exec_ctx, grpc_closure* closure, - grpc_endpoint** ep, gpr_timespec deadline); +static void sched_connect(grpc_closure* closure, grpc_endpoint** ep, + gpr_timespec deadline); typedef struct { grpc_timer timer; @@ -456,11 +456,11 @@ typedef struct { gpr_timespec deadline; } future_connect; -static void do_connect(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void do_connect(void* arg, grpc_error* error) { future_connect* fc = static_cast(arg); if (error != GRPC_ERROR_NONE) { *fc->ep = nullptr; - GRPC_CLOSURE_SCHED(exec_ctx, fc->closure, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_SCHED(fc->closure, GRPC_ERROR_REF(error)); } else if (g_server != nullptr) { grpc_endpoint* client; grpc_endpoint* server; @@ -468,25 +468,23 @@ static void do_connect(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { *fc->ep = client; grpc_transport* transport = - grpc_create_chttp2_transport(exec_ctx, nullptr, server, false); - grpc_server_setup_transport(exec_ctx, g_server, transport, nullptr, - nullptr); - grpc_chttp2_transport_start_reading(exec_ctx, transport, nullptr, nullptr); + grpc_create_chttp2_transport(nullptr, server, false); + grpc_server_setup_transport(g_server, transport, nullptr, nullptr); + grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); - GRPC_CLOSURE_SCHED(exec_ctx, fc->closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(fc->closure, GRPC_ERROR_NONE); } else { - sched_connect(exec_ctx, fc->closure, fc->ep, fc->deadline); + sched_connect(fc->closure, fc->ep, fc->deadline); } gpr_free(fc); } -static void sched_connect(grpc_exec_ctx* exec_ctx, grpc_closure* closure, - grpc_endpoint** ep, gpr_timespec deadline) { +static void sched_connect(grpc_closure* closure, grpc_endpoint** ep, + gpr_timespec deadline) { if (gpr_time_cmp(deadline, gpr_now(deadline.clock_type)) < 0) { *ep = nullptr; - GRPC_CLOSURE_SCHED( - exec_ctx, closure, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Connect deadline exceeded")); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Connect deadline exceeded")); return; } @@ -495,17 +493,16 @@ static void sched_connect(grpc_exec_ctx* exec_ctx, grpc_closure* closure, fc->ep = ep; fc->deadline = deadline; grpc_timer_init( - exec_ctx, &fc->timer, GPR_MS_PER_SEC + grpc_exec_ctx_now(exec_ctx), + &fc->timer, GPR_MS_PER_SEC + grpc_core::ExecCtx::Get()->Now(), GRPC_CLOSURE_CREATE(do_connect, fc, grpc_schedule_on_exec_ctx)); } -static void my_tcp_client_connect(grpc_exec_ctx* exec_ctx, - grpc_closure* closure, grpc_endpoint** ep, +static void my_tcp_client_connect(grpc_closure* closure, grpc_endpoint** ep, grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args, const grpc_resolved_address* addr, grpc_millis deadline) { - sched_connect(exec_ctx, closure, ep, + sched_connect(closure, ep, grpc_millis_to_timespec(deadline, GPR_CLOCK_MONOTONIC)); } @@ -751,9 +748,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_init(); grpc_timer_manager_set_threading(false); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_executor_set_threading(&exec_ctx, false); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_executor_set_threading(false); } grpc_resolve_address = my_resolve_address; grpc_dns_lookup_ares = my_dns_lookup_ares; @@ -846,9 +842,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { g_channel = grpc_insecure_channel_create(target_uri, args, nullptr); GPR_ASSERT(g_channel != nullptr); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(args); } gpr_free(target_uri); gpr_free(target); @@ -874,9 +869,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { g_server = grpc_server_create(args, nullptr); GPR_ASSERT(g_server != nullptr); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(args); } grpc_server_register_completion_queue(g_server, cq, nullptr); grpc_server_start(g_server); @@ -1205,9 +1199,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_secure_channel_create(creds, target_uri, args, nullptr); GPR_ASSERT(g_channel != nullptr); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(args); } gpr_free(target_uri); gpr_free(target); diff --git a/test/core/end2end/fuzzers/client_fuzzer.cc b/test/core/end2end/fuzzers/client_fuzzer.cc index 5871f0f43ef..c17d581d8b7 100644 --- a/test/core/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/end2end/fuzzers/client_fuzzer.cc @@ -43,112 +43,114 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (squelch) gpr_set_log_function(dont_log); if (leak_check) grpc_memory_counters_init(); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_executor_set_threading(&exec_ctx, false); - - grpc_resource_quota* resource_quota = - grpc_resource_quota_create("client_fuzzer"); - grpc_endpoint* mock_endpoint = - grpc_mock_endpoint_create(discard_write, resource_quota); - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); - - grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr); - grpc_transport* transport = - grpc_create_chttp2_transport(&exec_ctx, nullptr, mock_endpoint, true); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); - - grpc_channel* channel = grpc_channel_create( - &exec_ctx, "test-target", nullptr, GRPC_CLIENT_DIRECT_CHANNEL, transport); - grpc_slice host = grpc_slice_from_static_string("localhost"); - grpc_call* call = grpc_channel_create_call( - channel, nullptr, 0, cq, grpc_slice_from_static_string("/foo"), &host, - gpr_inf_future(GPR_CLOCK_REALTIME), nullptr); - - grpc_metadata_array initial_metadata_recv; - grpc_metadata_array_init(&initial_metadata_recv); - grpc_byte_buffer* response_payload_recv = nullptr; - grpc_metadata_array trailing_metadata_recv; - grpc_metadata_array_init(&trailing_metadata_recv); - grpc_status_code status; - grpc_slice details = grpc_empty_slice(); - - grpc_op ops[6]; - memset(ops, 0, sizeof(ops)); - grpc_op* op = ops; - op->op = GRPC_OP_SEND_INITIAL_METADATA; - op->data.send_initial_metadata.count = 0; - op->flags = 0; - op->reserved = nullptr; - op++; - op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT; - op->flags = 0; - op->reserved = nullptr; - op++; - op->op = GRPC_OP_RECV_INITIAL_METADATA; - op->data.recv_initial_metadata.recv_initial_metadata = &initial_metadata_recv; - op->flags = 0; - op->reserved = nullptr; - op++; - op->op = GRPC_OP_RECV_MESSAGE; - op->data.recv_message.recv_message = &response_payload_recv; - op->flags = 0; - op->reserved = nullptr; - op++; - op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; - op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv; - op->data.recv_status_on_client.status = &status; - op->data.recv_status_on_client.status_details = &details; - op->flags = 0; - op->reserved = nullptr; - op++; - grpc_call_error error = - grpc_call_start_batch(call, ops, (size_t)(op - ops), tag(1), nullptr); - int requested_calls = 1; - GPR_ASSERT(GRPC_CALL_OK == error); - - grpc_mock_endpoint_put_read( - &exec_ctx, mock_endpoint, - grpc_slice_from_copied_buffer((const char*)data, size)); - - grpc_event ev; - while (1) { - grpc_exec_ctx_flush(&exec_ctx); - ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), - nullptr); - switch (ev.type) { - case GRPC_QUEUE_TIMEOUT: - goto done; - case GRPC_QUEUE_SHUTDOWN: - break; - case GRPC_OP_COMPLETE: - requested_calls--; - break; + { + grpc_core::ExecCtx exec_ctx; + grpc_executor_set_threading(false); + + grpc_resource_quota* resource_quota = + grpc_resource_quota_create("client_fuzzer"); + grpc_endpoint* mock_endpoint = + grpc_mock_endpoint_create(discard_write, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); + + grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr); + grpc_transport* transport = + grpc_create_chttp2_transport(nullptr, mock_endpoint, true); + grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); + + grpc_channel* channel = grpc_channel_create( + "test-target", nullptr, GRPC_CLIENT_DIRECT_CHANNEL, transport); + grpc_slice host = grpc_slice_from_static_string("localhost"); + grpc_call* call = grpc_channel_create_call( + channel, nullptr, 0, cq, grpc_slice_from_static_string("/foo"), &host, + gpr_inf_future(GPR_CLOCK_REALTIME), nullptr); + + grpc_metadata_array initial_metadata_recv; + grpc_metadata_array_init(&initial_metadata_recv); + grpc_byte_buffer* response_payload_recv = nullptr; + grpc_metadata_array trailing_metadata_recv; + grpc_metadata_array_init(&trailing_metadata_recv); + grpc_status_code status; + grpc_slice details = grpc_empty_slice(); + + grpc_op ops[6]; + memset(ops, 0, sizeof(ops)); + grpc_op* op = ops; + op->op = GRPC_OP_SEND_INITIAL_METADATA; + op->data.send_initial_metadata.count = 0; + op->flags = 0; + op->reserved = nullptr; + op++; + op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT; + op->flags = 0; + op->reserved = nullptr; + op++; + op->op = GRPC_OP_RECV_INITIAL_METADATA; + op->data.recv_initial_metadata.recv_initial_metadata = + &initial_metadata_recv; + op->flags = 0; + op->reserved = nullptr; + op++; + op->op = GRPC_OP_RECV_MESSAGE; + op->data.recv_message.recv_message = &response_payload_recv; + op->flags = 0; + op->reserved = nullptr; + op++; + op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; + op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv; + op->data.recv_status_on_client.status = &status; + op->data.recv_status_on_client.status_details = &details; + op->flags = 0; + op->reserved = nullptr; + op++; + grpc_call_error error = + grpc_call_start_batch(call, ops, (size_t)(op - ops), tag(1), nullptr); + int requested_calls = 1; + GPR_ASSERT(GRPC_CALL_OK == error); + + grpc_mock_endpoint_put_read( + mock_endpoint, grpc_slice_from_copied_buffer((const char*)data, size)); + + grpc_event ev; + while (1) { + grpc_core::ExecCtx::Get()->Flush(); + ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), + nullptr); + switch (ev.type) { + case GRPC_QUEUE_TIMEOUT: + goto done; + case GRPC_QUEUE_SHUTDOWN: + break; + case GRPC_OP_COMPLETE: + requested_calls--; + break; + } } - } -done: - if (requested_calls) { - grpc_call_cancel(call, nullptr); - } - for (int i = 0; i < requested_calls; i++) { - ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), - nullptr); - GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); - } - grpc_completion_queue_shutdown(cq); - for (int i = 0; i < requested_calls; i++) { - ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), - nullptr); - GPR_ASSERT(ev.type == GRPC_QUEUE_SHUTDOWN); - } - grpc_call_unref(call); - grpc_completion_queue_destroy(cq); - grpc_metadata_array_destroy(&initial_metadata_recv); - grpc_metadata_array_destroy(&trailing_metadata_recv); - grpc_slice_unref(details); - grpc_channel_destroy(channel); - if (response_payload_recv != nullptr) { - grpc_byte_buffer_destroy(response_payload_recv); + done: + if (requested_calls) { + grpc_call_cancel(call, nullptr); + } + for (int i = 0; i < requested_calls; i++) { + ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), + nullptr); + GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); + } + grpc_completion_queue_shutdown(cq); + for (int i = 0; i < requested_calls; i++) { + ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), + nullptr); + GPR_ASSERT(ev.type == GRPC_QUEUE_SHUTDOWN); + } + grpc_call_unref(call); + grpc_completion_queue_destroy(cq); + grpc_metadata_array_destroy(&initial_metadata_recv); + grpc_metadata_array_destroy(&trailing_metadata_recv); + grpc_slice_unref(details); + grpc_channel_destroy(channel); + if (response_payload_recv != nullptr) { + grpc_byte_buffer_destroy(response_payload_recv); + } } grpc_shutdown(); if (leak_check) { diff --git a/test/core/end2end/fuzzers/server_fuzzer.cc b/test/core/end2end/fuzzers/server_fuzzer.cc index 67caf4e720c..61c55e0afde 100644 --- a/test/core/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/end2end/fuzzers/server_fuzzer.cc @@ -41,81 +41,82 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (squelch) gpr_set_log_function(dont_log); if (leak_check) grpc_memory_counters_init(); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_executor_set_threading(&exec_ctx, false); + { + grpc_core::ExecCtx exec_ctx; + grpc_executor_set_threading(false); - grpc_resource_quota* resource_quota = - grpc_resource_quota_create("server_fuzzer"); - grpc_endpoint* mock_endpoint = - grpc_mock_endpoint_create(discard_write, resource_quota); - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); - grpc_mock_endpoint_put_read( - &exec_ctx, mock_endpoint, - grpc_slice_from_copied_buffer((const char*)data, size)); + grpc_resource_quota* resource_quota = + grpc_resource_quota_create("server_fuzzer"); + grpc_endpoint* mock_endpoint = + grpc_mock_endpoint_create(discard_write, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); + grpc_mock_endpoint_put_read( + mock_endpoint, grpc_slice_from_copied_buffer((const char*)data, size)); - grpc_server* server = grpc_server_create(nullptr, nullptr); - grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr); - grpc_server_register_completion_queue(server, cq, nullptr); - // TODO(ctiller): add registered methods (one for POST, one for PUT) - // void *registered_method = - // grpc_server_register_method(server, "/reg", NULL, 0); - grpc_server_start(server); - grpc_transport* transport = - grpc_create_chttp2_transport(&exec_ctx, nullptr, mock_endpoint, false); - grpc_server_setup_transport(&exec_ctx, server, transport, nullptr, nullptr); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, nullptr); + grpc_server* server = grpc_server_create(nullptr, nullptr); + grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr); + grpc_server_register_completion_queue(server, cq, nullptr); + // TODO(ctiller): add registered methods (one for POST, one for PUT) + // void *registered_method = + // grpc_server_register_method(server, "/reg", NULL, 0); + grpc_server_start(server); + grpc_transport* transport = + grpc_create_chttp2_transport(nullptr, mock_endpoint, false); + grpc_server_setup_transport(server, transport, nullptr, nullptr); + grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); - grpc_call* call1 = nullptr; - grpc_call_details call_details1; - grpc_metadata_array request_metadata1; - grpc_call_details_init(&call_details1); - grpc_metadata_array_init(&request_metadata1); - int requested_calls = 0; + grpc_call* call1 = nullptr; + grpc_call_details call_details1; + grpc_metadata_array request_metadata1; + grpc_call_details_init(&call_details1); + grpc_metadata_array_init(&request_metadata1); + int requested_calls = 0; - GPR_ASSERT(GRPC_CALL_OK == - grpc_server_request_call(server, &call1, &call_details1, - &request_metadata1, cq, cq, tag(1))); - requested_calls++; + GPR_ASSERT(GRPC_CALL_OK == + grpc_server_request_call(server, &call1, &call_details1, + &request_metadata1, cq, cq, tag(1))); + requested_calls++; - grpc_event ev; - while (1) { - grpc_exec_ctx_flush(&exec_ctx); - ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), - nullptr); - switch (ev.type) { - case GRPC_QUEUE_TIMEOUT: - goto done; - case GRPC_QUEUE_SHUTDOWN: - break; - case GRPC_OP_COMPLETE: - switch (detag(ev.tag)) { - case 1: - requested_calls--; - // TODO(ctiller): keep reading that call! - break; - } + grpc_event ev; + while (1) { + grpc_core::ExecCtx::Get()->Flush(); + ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), + nullptr); + switch (ev.type) { + case GRPC_QUEUE_TIMEOUT: + goto done; + case GRPC_QUEUE_SHUTDOWN: + break; + case GRPC_OP_COMPLETE: + switch (detag(ev.tag)) { + case 1: + requested_calls--; + // TODO(ctiller): keep reading that call! + break; + } + } } - } -done: - if (call1 != nullptr) grpc_call_unref(call1); - grpc_call_details_destroy(&call_details1); - grpc_metadata_array_destroy(&request_metadata1); - grpc_server_shutdown_and_notify(server, cq, tag(0xdead)); - grpc_server_cancel_all_calls(server); - for (int i = 0; i <= requested_calls; i++) { - ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), - nullptr); - GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); - } - grpc_completion_queue_shutdown(cq); - for (int i = 0; i <= requested_calls; i++) { - ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), - nullptr); - GPR_ASSERT(ev.type == GRPC_QUEUE_SHUTDOWN); + done: + if (call1 != nullptr) grpc_call_unref(call1); + grpc_call_details_destroy(&call_details1); + grpc_metadata_array_destroy(&request_metadata1); + grpc_server_shutdown_and_notify(server, cq, tag(0xdead)); + grpc_server_cancel_all_calls(server); + for (int i = 0; i <= requested_calls; i++) { + ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), + nullptr); + GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); + } + grpc_completion_queue_shutdown(cq); + for (int i = 0; i <= requested_calls; i++) { + ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), + nullptr); + GPR_ASSERT(ev.type == GRPC_QUEUE_SHUTDOWN); + } + grpc_server_destroy(server); + grpc_completion_queue_destroy(cq); } - grpc_server_destroy(server); - grpc_completion_queue_destroy(cq); grpc_shutdown(); if (leak_check) { counters = grpc_memory_counters_snapshot(); diff --git a/test/core/end2end/goaway_server_test.cc b/test/core/end2end/goaway_server_test.cc index 2d0db967c31..94cfbdda7ee 100644 --- a/test/core/end2end/goaway_server_test.cc +++ b/test/core/end2end/goaway_server_test.cc @@ -39,16 +39,15 @@ static void* tag(intptr_t i) { return (void*)i; } static gpr_mu g_mu; static int g_resolve_port = -1; -static void (*iomgr_resolve_address)(grpc_exec_ctx* exec_ctx, const char* addr, - const char* default_port, +static void (*iomgr_resolve_address)(const char* addr, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addresses); static grpc_ares_request* (*iomgr_dns_lookup_ares)( - grpc_exec_ctx* exec_ctx, const char* dns_server, const char* addr, - const char* default_port, grpc_pollset_set* interested_parties, - grpc_closure* on_done, grpc_lb_addresses** addresses, bool check_grpclb, + const char* dns_server, const char* addr, const char* default_port, + grpc_pollset_set* interested_parties, grpc_closure* on_done, + grpc_lb_addresses** addresses, bool check_grpclb, char** service_config_json); static void set_resolve_port(int port) { @@ -57,14 +56,13 @@ static void set_resolve_port(int port) { gpr_mu_unlock(&g_mu); } -static void my_resolve_address(grpc_exec_ctx* exec_ctx, const char* addr, - const char* default_port, +static void my_resolve_address(const char* addr, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addrs) { if (0 != strcmp(addr, "test")) { - iomgr_resolve_address(exec_ctx, addr, default_port, interested_parties, - on_done, addrs); + iomgr_resolve_address(addr, default_port, interested_parties, on_done, + addrs); return; } @@ -86,16 +84,16 @@ static void my_resolve_address(grpc_exec_ctx* exec_ctx, const char* addr, (*addrs)->addrs[0].len = sizeof(*sa); gpr_mu_unlock(&g_mu); } - GRPC_CLOSURE_SCHED(exec_ctx, on_done, error); + GRPC_CLOSURE_SCHED(on_done, error); } static grpc_ares_request* my_dns_lookup_ares( - grpc_exec_ctx* exec_ctx, const char* dns_server, const char* addr, - const char* default_port, grpc_pollset_set* interested_parties, - grpc_closure* on_done, grpc_lb_addresses** lb_addrs, bool check_grpclb, + const char* dns_server, const char* addr, const char* default_port, + grpc_pollset_set* interested_parties, grpc_closure* on_done, + grpc_lb_addresses** lb_addrs, bool check_grpclb, char** service_config_json) { if (0 != strcmp(addr, "test")) { - return iomgr_dns_lookup_ares(exec_ctx, dns_server, addr, default_port, + return iomgr_dns_lookup_ares(dns_server, addr, default_port, interested_parties, on_done, lb_addrs, check_grpclb, service_config_json); } @@ -117,7 +115,7 @@ static grpc_ares_request* my_dns_lookup_ares( gpr_free(sa); gpr_mu_unlock(&g_mu); } - GRPC_CLOSURE_SCHED(exec_ctx, on_done, error); + GRPC_CLOSURE_SCHED(on_done, error); return nullptr; } diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc index 9a98c071585..d50d1f4d81e 100644 --- a/test/core/end2end/h2_ssl_cert_test.cc +++ b/test/core/end2end/h2_ssl_cert_test.cc @@ -181,9 +181,8 @@ typedef enum { NONE, SELF_SIGNED, SIGNED, BAD_CERT_PAIR } certtype; grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); \ chttp2_init_client_secure_fullstack(f, new_client_args, ssl_creds); \ { \ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; \ - grpc_channel_args_destroy(&exec_ctx, new_client_args); \ - grpc_exec_ctx_finish(&exec_ctx); \ + grpc_core::ExecCtx exec_ctx; \ + grpc_channel_args_destroy(new_client_args); \ } \ } diff --git a/test/core/end2end/tests/cancel_after_accept.cc b/test/core/end2end/tests/cancel_after_accept.cc index 83439d71d22..f59caf7e35a 100644 --- a/test/core/end2end/tests/cancel_after_accept.cc +++ b/test/core/end2end/tests/cancel_after_accept.cc @@ -245,9 +245,8 @@ static void test_cancel_after_accept(grpc_end2end_test_config config, grpc_call_unref(s); if (args != nullptr) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(args); } cq_verifier_destroy(cqv); diff --git a/test/core/end2end/tests/cancel_after_round_trip.cc b/test/core/end2end/tests/cancel_after_round_trip.cc index ddcec67de5a..b10b93978d1 100644 --- a/test/core/end2end/tests/cancel_after_round_trip.cc +++ b/test/core/end2end/tests/cancel_after_round_trip.cc @@ -278,9 +278,8 @@ static void test_cancel_after_round_trip(grpc_end2end_test_config config, grpc_call_unref(s); if (args != nullptr) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(args); } cq_verifier_destroy(cqv); diff --git a/test/core/end2end/tests/compressed_payload.cc b/test/core/end2end/tests/compressed_payload.cc index a8ea0ff2e0c..944edc7a70f 100644 --- a/test/core/end2end/tests/compressed_payload.cc +++ b/test/core/end2end/tests/compressed_payload.cc @@ -129,10 +129,9 @@ static void request_for_disabled_algorithm( server_args = grpc_channel_args_set_compression_algorithm(nullptr, GRPC_COMPRESS_NONE); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; server_args = grpc_channel_args_compression_algorithm_set_state( - &exec_ctx, &server_args, algorithm_to_disable, false); - grpc_exec_ctx_finish(&exec_ctx); + &server_args, algorithm_to_disable, false); } f = begin_test(config, test_name, client_args, server_args); @@ -257,10 +256,9 @@ static void request_for_disabled_algorithm( grpc_byte_buffer_destroy(request_payload_recv); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, client_args); - grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(client_args); + grpc_channel_args_destroy(server_args); } end_test(&f); @@ -539,10 +537,9 @@ static void request_with_payload_template( cq_verifier_destroy(cqv); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, client_args); - grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(client_args); + grpc_channel_args_destroy(server_args); } end_test(&f); diff --git a/test/core/end2end/tests/filter_call_init_fails.cc b/test/core/end2end/tests/filter_call_init_fails.cc index 6eed68a2f9f..8f46f0bb913 100644 --- a/test/core/end2end/tests/filter_call_init_fails.cc +++ b/test/core/end2end/tests/filter_call_init_fails.cc @@ -399,26 +399,23 @@ static void test_client_subchannel_filter(grpc_end2end_test_config config) { * Test filter - always fails to initialize a call */ -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { return grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("access denied"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_PERMISSION_DENIED); } -static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) {} -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_channel_element* elem) {} static const grpc_channel_filter test_filter = { grpc_call_next_op, @@ -437,8 +434,7 @@ static const grpc_channel_filter test_filter = { * Registration */ -static bool maybe_add_server_channel_filter(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, +static bool maybe_add_server_channel_filter(grpc_channel_stack_builder* builder, void* arg) { if (g_enable_server_channel_filter) { // Want to add the filter as close to the end as possible, to make @@ -457,8 +453,7 @@ static bool maybe_add_server_channel_filter(grpc_exec_ctx* exec_ctx, } } -static bool maybe_add_client_channel_filter(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, +static bool maybe_add_client_channel_filter(grpc_channel_stack_builder* builder, void* arg) { if (g_enable_client_channel_filter) { // Want to add the filter as close to the end as possible, to make @@ -478,7 +473,7 @@ static bool maybe_add_client_channel_filter(grpc_exec_ctx* exec_ctx, } static bool maybe_add_client_subchannel_filter( - grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, void* arg) { + grpc_channel_stack_builder* builder, void* arg) { if (g_enable_client_subchannel_filter) { // Want to add the filter as close to the end as possible, to make // sure that all of the filters work well together. However, we diff --git a/test/core/end2end/tests/filter_causes_close.cc b/test/core/end2end/tests/filter_causes_close.cc index 793f5906866..ec8f9dbe009 100644 --- a/test/core/end2end/tests/filter_causes_close.cc +++ b/test/core/end2end/tests/filter_causes_close.cc @@ -197,12 +197,11 @@ typedef struct { uint8_t unused; } channel_data; -static void recv_im_ready(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void recv_im_ready(void* arg, grpc_error* error) { grpc_call_element* elem = (grpc_call_element*)arg; call_data* calld = (call_data*)elem->call_data; GRPC_CLOSURE_RUN( - exec_ctx, calld->recv_im_ready, + calld->recv_im_ready, grpc_error_set_int(GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Failure that's not preventable.", &error, 1), GRPC_ERROR_INT_GRPC_STATUS, @@ -210,8 +209,7 @@ static void recv_im_ready(grpc_exec_ctx* exec_ctx, void* arg, } static void start_transport_stream_op_batch( - grpc_exec_ctx* exec_ctx, grpc_call_element* elem, - grpc_transport_stream_op_batch* op) { + grpc_call_element* elem, grpc_transport_stream_op_batch* op) { call_data* calld = (call_data*)elem->call_data; if (op->recv_initial_metadata) { calld->recv_im_ready = @@ -219,27 +217,24 @@ static void start_transport_stream_op_batch( op->payload->recv_initial_metadata.recv_initial_metadata_ready = GRPC_CLOSURE_CREATE(recv_im_ready, elem, grpc_schedule_on_exec_ctx); } - grpc_call_next_op(exec_ctx, elem, op); + grpc_call_next_op(elem, op); } -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { return GRPC_ERROR_NONE; } -static void destroy_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) {} -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_channel_element* elem) {} static const grpc_channel_filter test_filter = { start_transport_stream_op_batch, @@ -258,8 +253,7 @@ static const grpc_channel_filter test_filter = { * Registration */ -static bool maybe_add_filter(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, void* arg) { +static bool maybe_add_filter(grpc_channel_stack_builder* builder, void* arg) { if (g_enable_filter) { return grpc_channel_stack_builder_prepend_filter(builder, &test_filter, nullptr, nullptr); diff --git a/test/core/end2end/tests/filter_latency.cc b/test/core/end2end/tests/filter_latency.cc index c4d96ebfe21..845cbc01cfa 100644 --- a/test/core/end2end/tests/filter_latency.cc +++ b/test/core/end2end/tests/filter_latency.cc @@ -247,14 +247,12 @@ static void test_request(grpc_end2end_test_config config) { * Test latency filter */ -static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* init_call_elem(grpc_call_element* elem, const grpc_call_element_args* args) { return GRPC_ERROR_NONE; } -static void client_destroy_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static void client_destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { gpr_mu_lock(&g_mu); @@ -262,8 +260,7 @@ static void client_destroy_call_elem(grpc_exec_ctx* exec_ctx, gpr_mu_unlock(&g_mu); } -static void server_destroy_call_elem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static void server_destroy_call_elem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* ignored) { gpr_mu_lock(&g_mu); @@ -271,14 +268,12 @@ static void server_destroy_call_elem(grpc_exec_ctx* exec_ctx, gpr_mu_unlock(&g_mu); } -static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static grpc_error* init_channel_elem(grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_channel_element* elem) {} static const grpc_channel_filter test_client_filter = { grpc_call_next_op, @@ -310,8 +305,7 @@ static const grpc_channel_filter test_server_filter = { * Registration */ -static bool maybe_add_filter(grpc_exec_ctx* exec_ctx, - grpc_channel_stack_builder* builder, void* arg) { +static bool maybe_add_filter(grpc_channel_stack_builder* builder, void* arg) { grpc_channel_filter* filter = (grpc_channel_filter*)arg; if (g_enable_filter) { // Want to add the filter as close to the end as possible, to make diff --git a/test/core/end2end/tests/load_reporting_hook.cc b/test/core/end2end/tests/load_reporting_hook.cc index faabec34cb6..e056bd547b8 100644 --- a/test/core/end2end/tests/load_reporting_hook.cc +++ b/test/core/end2end/tests/load_reporting_hook.cc @@ -300,9 +300,8 @@ static void test_load_reporting_hook(grpc_end2end_test_config config) { &trailing_lr_metadata); end_test(&f); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, lr_server_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(lr_server_args); } config.tear_down_data(&f); } diff --git a/test/core/end2end/tests/max_message_length.cc b/test/core/end2end/tests/max_message_length.cc index f1ac27fa7c1..e581f1fc20e 100644 --- a/test/core/end2end/tests/max_message_length.cc +++ b/test/core/end2end/tests/max_message_length.cc @@ -173,12 +173,9 @@ static void test_max_message_length_on_request(grpc_end2end_test_config config, f = begin_test(config, "test_max_request_message_length", client_args, server_args); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - if (client_args != nullptr) - grpc_channel_args_destroy(&exec_ctx, client_args); - if (server_args != nullptr) - grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + if (client_args != nullptr) grpc_channel_args_destroy(client_args); + if (server_args != nullptr) grpc_channel_args_destroy(server_args); } cqv = cq_verifier_create(f.cq); @@ -366,12 +363,9 @@ static void test_max_message_length_on_response(grpc_end2end_test_config config, f = begin_test(config, "test_max_response_message_length", client_args, server_args); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - if (client_args != nullptr) - grpc_channel_args_destroy(&exec_ctx, client_args); - if (server_args != nullptr) - grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + if (client_args != nullptr) grpc_channel_args_destroy(client_args); + if (server_args != nullptr) grpc_channel_args_destroy(server_args); } cqv = cq_verifier_create(f.cq); diff --git a/test/core/end2end/tests/stream_compression_compressed_payload.cc b/test/core/end2end/tests/stream_compression_compressed_payload.cc index d73346468a4..ec3050ad45f 100644 --- a/test/core/end2end/tests/stream_compression_compressed_payload.cc +++ b/test/core/end2end/tests/stream_compression_compressed_payload.cc @@ -129,10 +129,9 @@ static void request_for_disabled_algorithm( server_args = grpc_channel_args_set_stream_compression_algorithm( nullptr, GRPC_STREAM_COMPRESS_NONE); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; server_args = grpc_channel_args_stream_compression_algorithm_set_state( - &exec_ctx, &server_args, algorithm_to_disable, false); - grpc_exec_ctx_finish(&exec_ctx); + &server_args, algorithm_to_disable, false); } f = begin_test(config, test_name, client_args, server_args); @@ -258,10 +257,9 @@ static void request_for_disabled_algorithm( grpc_byte_buffer_destroy(request_payload_recv); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, client_args); - grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(client_args); + grpc_channel_args_destroy(server_args); } end_test(&f); @@ -547,10 +545,9 @@ static void request_with_payload_template( cq_verifier_destroy(cqv); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, client_args); - grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(client_args); + grpc_channel_args_destroy(server_args); } end_test(&f); diff --git a/test/core/end2end/tests/stream_compression_payload.cc b/test/core/end2end/tests/stream_compression_payload.cc index 924961ea551..b95e6528cde 100644 --- a/test/core/end2end/tests/stream_compression_payload.cc +++ b/test/core/end2end/tests/stream_compression_payload.cc @@ -277,10 +277,9 @@ static void test_invoke_request_response_with_payload( end_test(&f); config.tear_down_data(&f); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, client_args); - grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(client_args); + grpc_channel_args_destroy(server_args); } } diff --git a/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc b/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc index d3b526f04ed..2a8799ee67b 100644 --- a/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc +++ b/test/core/end2end/tests/stream_compression_ping_pong_streaming.cc @@ -275,10 +275,9 @@ static void test_pingpong_streaming(grpc_end2end_test_config config, end_test(&f); config.tear_down_data(&f); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, client_args); - grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(client_args); + grpc_channel_args_destroy(server_args); } } diff --git a/test/core/end2end/tests/workaround_cronet_compression.cc b/test/core/end2end/tests/workaround_cronet_compression.cc index bc4d5079d83..d4decce0aa1 100644 --- a/test/core/end2end/tests/workaround_cronet_compression.cc +++ b/test/core/end2end/tests/workaround_cronet_compression.cc @@ -142,15 +142,14 @@ static void request_with_payload_template( nullptr, default_server_channel_compression_algorithm); if (user_agent_override) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_channel_args* client_args_old = client_args; grpc_arg arg; arg.key = const_cast(GRPC_ARG_PRIMARY_USER_AGENT_STRING); arg.type = GRPC_ARG_STRING; arg.value.string = user_agent_override; client_args = grpc_channel_args_copy_and_add(client_args_old, &arg, 1); - grpc_channel_args_destroy(&exec_ctx, client_args_old); - grpc_exec_ctx_finish(&exec_ctx); + grpc_channel_args_destroy(client_args_old); } f = begin_test(config, test_name, client_args, server_args); @@ -351,10 +350,9 @@ static void request_with_payload_template( cq_verifier_destroy(cqv); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, client_args); - grpc_channel_args_destroy(&exec_ctx, server_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(client_args); + grpc_channel_args_destroy(server_args); } end_test(&f); diff --git a/test/core/handshake/readahead_handshaker_server_ssl.cc b/test/core/handshake/readahead_handshaker_server_ssl.cc index 2810082837b..599e0e16e2d 100644 --- a/test/core/handshake/readahead_handshaker_server_ssl.cc +++ b/test/core/handshake/readahead_handshaker_server_ssl.cc @@ -49,41 +49,37 @@ * to the security_handshaker). This test is meant to protect code relying on * this functionality that lives outside of this repo. */ -static void readahead_handshaker_destroy(grpc_exec_ctx* ctx, - grpc_handshaker* handshaker) { +static void readahead_handshaker_destroy(grpc_handshaker* handshaker) { gpr_free(handshaker); } -static void readahead_handshaker_shutdown(grpc_exec_ctx* ctx, - grpc_handshaker* handshaker, +static void readahead_handshaker_shutdown(grpc_handshaker* handshaker, grpc_error* error) {} static void readahead_handshaker_do_handshake( - grpc_exec_ctx* ctx, grpc_handshaker* handshaker, - grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, - grpc_handshaker_args* args) { - grpc_endpoint_read(ctx, args->endpoint, args->read_buffer, on_handshake_done); + grpc_handshaker* handshaker, grpc_tcp_server_acceptor* acceptor, + grpc_closure* on_handshake_done, grpc_handshaker_args* args) { + grpc_endpoint_read(args->endpoint, args->read_buffer, on_handshake_done); } const grpc_handshaker_vtable readahead_handshaker_vtable = { readahead_handshaker_destroy, readahead_handshaker_shutdown, readahead_handshaker_do_handshake}; -static grpc_handshaker* readahead_handshaker_create(grpc_exec_ctx* ctx) { +static grpc_handshaker* readahead_handshaker_create() { grpc_handshaker* h = (grpc_handshaker*)gpr_zalloc(sizeof(grpc_handshaker)); grpc_handshaker_init(&readahead_handshaker_vtable, h); return h; } static void readahead_handshaker_factory_add_handshakers( - grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* hf, - const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr) { - grpc_handshake_manager_add(handshake_mgr, - readahead_handshaker_create(exec_ctx)); + grpc_handshaker_factory* hf, const grpc_channel_args* args, + grpc_handshake_manager* handshake_mgr) { + grpc_handshake_manager_add(handshake_mgr, readahead_handshaker_create()); } static void readahead_handshaker_factory_destroy( - grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* handshaker_factory) {} + grpc_handshaker_factory* handshaker_factory) {} static const grpc_handshaker_factory_vtable readahead_handshaker_factory_vtable = { diff --git a/test/core/http/format_request_test.cc b/test/core/http/format_request_test.cc index 684738a9973..353e138b2a1 100644 --- a/test/core/http/format_request_test.cc +++ b/test/core/http/format_request_test.cc @@ -139,11 +139,13 @@ static void test_format_post_request_content_type_override(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); test_format_get_request(); test_format_post_request(); test_format_post_request_no_body(); test_format_post_request_content_type_override(); + grpc_shutdown(); return 0; } diff --git a/test/core/http/httpcli_test.cc b/test/core/http/httpcli_test.cc index 81e9374819d..259e3aa463e 100644 --- a/test/core/http/httpcli_test.cc +++ b/test/core/http/httpcli_test.cc @@ -40,7 +40,7 @@ static grpc_millis n_seconds_time(int seconds) { grpc_timeout_seconds_to_deadline(seconds)); } -static void on_finish(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void on_finish(void* arg, grpc_error* error) { const char* expect = "Hello world!" "

    This is a test

    "; @@ -53,15 +53,14 @@ static void on_finish(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { g_done = 1; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&g_pops), - nullptr))); + grpc_pollset_kick(grpc_polling_entity_pollset(&g_pops), nullptr))); gpr_mu_unlock(g_mu); } static void test_get(int port) { grpc_httpcli_request req; char* host; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; g_done = 0; gpr_log(GPR_INFO, "test_get"); @@ -78,19 +77,18 @@ static void test_get(int port) { memset(&response, 0, sizeof(response)); grpc_resource_quota* resource_quota = grpc_resource_quota_create("test_get"); grpc_httpcli_get( - &exec_ctx, &g_context, &g_pops, resource_quota, &req, n_seconds_time(15), + &g_context, &g_pops, resource_quota, &req, n_seconds_time(15), GRPC_CLOSURE_CREATE(on_finish, &response, grpc_schedule_on_exec_ctx), &response); - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); gpr_mu_lock(g_mu); while (!g_done) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), - &worker, n_seconds_time(1)))); + "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&g_pops), + &worker, n_seconds_time(1)))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -101,7 +99,7 @@ static void test_get(int port) { static void test_post(int port) { grpc_httpcli_request req; char* host; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; g_done = 0; gpr_log(GPR_INFO, "test_post"); @@ -118,20 +116,18 @@ static void test_post(int port) { memset(&response, 0, sizeof(response)); grpc_resource_quota* resource_quota = grpc_resource_quota_create("test_post"); grpc_httpcli_post( - &exec_ctx, &g_context, &g_pops, resource_quota, &req, "hello", 5, - n_seconds_time(15), + &g_context, &g_pops, resource_quota, &req, "hello", 5, n_seconds_time(15), GRPC_CLOSURE_CREATE(on_finish, &response, grpc_schedule_on_exec_ctx), &response); - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); gpr_mu_lock(g_mu); while (!g_done) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), - &worker, n_seconds_time(1)))); + "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&g_pops), + &worker, n_seconds_time(1)))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -139,69 +135,69 @@ static void test_post(int port) { grpc_http_response_destroy(&response); } -static void destroy_pops(grpc_exec_ctx* exec_ctx, void* p, grpc_error* error) { - grpc_pollset_destroy(exec_ctx, grpc_polling_entity_pollset( - static_cast(p))); +static void destroy_pops(void* p, grpc_error* error) { + grpc_pollset_destroy( + grpc_polling_entity_pollset(static_cast(p))); } int main(int argc, char** argv) { - grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_subprocess* server; - char* me = argv[0]; - char* lslash = strrchr(me, '/'); - char* args[4]; - int port = grpc_pick_unused_port_or_die(); - int arg_shift = 0; - /* figure out where we are */ - char* root; - if (lslash) { - root = static_cast(gpr_malloc((size_t)(lslash - me + 1))); - memcpy(root, me, (size_t)(lslash - me)); - root[lslash - me] = 0; - } else { - root = gpr_strdup("."); - } - - GPR_ASSERT(argc <= 2); - if (argc == 2) { - args[0] = gpr_strdup(argv[1]); - } else { - arg_shift = 1; - gpr_asprintf(&args[0], "%s/../../tools/distrib/python_wrapper.sh", root); - gpr_asprintf(&args[1], "%s/../../test/core/http/test_server.py", root); - } - - /* start the server */ - args[1 + arg_shift] = const_cast("--port"); - gpr_asprintf(&args[2 + arg_shift], "%d", port); - server = gpr_subprocess_create(3 + arg_shift, (const char**)args); - GPR_ASSERT(server); - gpr_free(args[0]); - if (arg_shift) gpr_free(args[1]); - gpr_free(args[2 + arg_shift]); - gpr_free(root); - - gpr_sleep_until(gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), - gpr_time_from_seconds(5, GPR_TIMESPAN))); - grpc_test_init(argc, argv); grpc_init(); - grpc_httpcli_context_init(&g_context); - grpc_pollset* pollset = - static_cast(gpr_zalloc(grpc_pollset_size())); - grpc_pollset_init(pollset, &g_mu); - g_pops = grpc_polling_entity_create_from_pollset(pollset); - - test_get(port); - test_post(port); - - grpc_httpcli_context_destroy(&exec_ctx, &g_context); - GRPC_CLOSURE_INIT(&destroyed, destroy_pops, &g_pops, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&g_pops), - &destroyed); - grpc_exec_ctx_finish(&exec_ctx); + { + grpc_closure destroyed; + grpc_core::ExecCtx exec_ctx; + char* me = argv[0]; + char* lslash = strrchr(me, '/'); + char* args[4]; + int port = grpc_pick_unused_port_or_die(); + int arg_shift = 0; + /* figure out where we are */ + char* root; + if (lslash) { + root = static_cast(gpr_malloc((size_t)(lslash - me + 1))); + memcpy(root, me, (size_t)(lslash - me)); + root[lslash - me] = 0; + } else { + root = gpr_strdup("."); + } + + GPR_ASSERT(argc <= 2); + if (argc == 2) { + args[0] = gpr_strdup(argv[1]); + } else { + arg_shift = 1; + gpr_asprintf(&args[0], "%s/../../tools/distrib/python_wrapper.sh", root); + gpr_asprintf(&args[1], "%s/../../test/core/http/test_server.py", root); + } + + /* start the server */ + args[1 + arg_shift] = const_cast("--port"); + gpr_asprintf(&args[2 + arg_shift], "%d", port); + server = gpr_subprocess_create(3 + arg_shift, (const char**)args); + GPR_ASSERT(server); + gpr_free(args[0]); + if (arg_shift) gpr_free(args[1]); + gpr_free(args[2 + arg_shift]); + gpr_free(root); + + gpr_sleep_until(gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), + gpr_time_from_seconds(5, GPR_TIMESPAN))); + + grpc_httpcli_context_init(&g_context); + grpc_pollset* pollset = + static_cast(gpr_zalloc(grpc_pollset_size())); + grpc_pollset_init(pollset, &g_mu); + g_pops = grpc_polling_entity_create_from_pollset(pollset); + + test_get(port); + test_post(port); + + grpc_httpcli_context_destroy(&g_context); + GRPC_CLOSURE_INIT(&destroyed, destroy_pops, &g_pops, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(grpc_polling_entity_pollset(&g_pops), &destroyed); + } grpc_shutdown(); gpr_free(grpc_polling_entity_pollset(&g_pops)); diff --git a/test/core/http/httpscli_test.cc b/test/core/http/httpscli_test.cc index da8405c0492..adf69f1b16f 100644 --- a/test/core/http/httpscli_test.cc +++ b/test/core/http/httpscli_test.cc @@ -40,7 +40,7 @@ static grpc_millis n_seconds_time(int seconds) { grpc_timeout_seconds_to_deadline(seconds)); } -static void on_finish(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void on_finish(void* arg, grpc_error* error) { const char* expect = "Hello world!" "

    This is a test

    "; @@ -53,15 +53,14 @@ static void on_finish(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { g_done = 1; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&g_pops), - nullptr))); + grpc_pollset_kick(grpc_polling_entity_pollset(&g_pops), nullptr))); gpr_mu_unlock(g_mu); } static void test_get(int port) { grpc_httpcli_request req; char* host; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; g_done = 0; gpr_log(GPR_INFO, "test_get"); @@ -79,19 +78,18 @@ static void test_get(int port) { memset(&response, 0, sizeof(response)); grpc_resource_quota* resource_quota = grpc_resource_quota_create("test_get"); grpc_httpcli_get( - &exec_ctx, &g_context, &g_pops, resource_quota, &req, n_seconds_time(15), + &g_context, &g_pops, resource_quota, &req, n_seconds_time(15), GRPC_CLOSURE_CREATE(on_finish, &response, grpc_schedule_on_exec_ctx), &response); - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); gpr_mu_lock(g_mu); while (!g_done) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), - &worker, n_seconds_time(1)))); + "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&g_pops), + &worker, n_seconds_time(1)))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -102,7 +100,7 @@ static void test_get(int port) { static void test_post(int port) { grpc_httpcli_request req; char* host; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; g_done = 0; gpr_log(GPR_INFO, "test_post"); @@ -120,20 +118,18 @@ static void test_post(int port) { memset(&response, 0, sizeof(response)); grpc_resource_quota* resource_quota = grpc_resource_quota_create("test_post"); grpc_httpcli_post( - &exec_ctx, &g_context, &g_pops, resource_quota, &req, "hello", 5, - n_seconds_time(15), + &g_context, &g_pops, resource_quota, &req, "hello", 5, n_seconds_time(15), GRPC_CLOSURE_CREATE(on_finish, &response, grpc_schedule_on_exec_ctx), &response); - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); gpr_mu_lock(g_mu); while (!g_done) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), - &worker, n_seconds_time(1)))); + "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&g_pops), + &worker, n_seconds_time(1)))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -141,14 +137,13 @@ static void test_post(int port) { grpc_http_response_destroy(&response); } -static void destroy_pops(grpc_exec_ctx* exec_ctx, void* p, grpc_error* error) { - grpc_pollset_destroy(exec_ctx, grpc_polling_entity_pollset( - static_cast(p))); +static void destroy_pops(void* p, grpc_error* error) { + grpc_pollset_destroy( + grpc_polling_entity_pollset(static_cast(p))); } int main(int argc, char** argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_subprocess* server; char* me = argv[0]; char* lslash = strrchr(me, '/'); @@ -199,12 +194,13 @@ int main(int argc, char** argv) { test_get(port); test_post(port); - grpc_httpcli_context_destroy(&exec_ctx, &g_context); - GRPC_CLOSURE_INIT(&destroyed, destroy_pops, &g_pops, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&g_pops), - &destroyed); - grpc_exec_ctx_finish(&exec_ctx); + { + grpc_core::ExecCtx exec_ctx; + grpc_httpcli_context_destroy(&g_context); + GRPC_CLOSURE_INIT(&destroyed, destroy_pops, &g_pops, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(grpc_polling_entity_pollset(&g_pops), &destroyed); + } grpc_shutdown(); gpr_free(grpc_polling_entity_pollset(&g_pops)); diff --git a/test/core/http/parser_test.cc b/test/core/http/parser_test.cc index 0b60e369b79..18f19856bd9 100644 --- a/test/core/http/parser_test.cc +++ b/test/core/http/parser_test.cc @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -217,6 +218,7 @@ int main(int argc, char** argv) { char *tmp1, *tmp2; grpc_test_init(argc, argv); + grpc_init(); for (i = 0; i < GPR_ARRAY_SIZE(split_modes); i++) { test_succeeds(split_modes[i], @@ -300,5 +302,6 @@ int main(int argc, char** argv) { gpr_free(tmp2); } + grpc_shutdown(); return 0; } diff --git a/test/core/http/request_fuzzer.cc b/test/core/http/request_fuzzer.cc index 368ac1b49db..9798cfb33c7 100644 --- a/test/core/http/request_fuzzer.cc +++ b/test/core/http/request_fuzzer.cc @@ -20,6 +20,7 @@ #include #include +#include #include #include "src/core/lib/http/parser.h" @@ -30,6 +31,7 @@ bool leak_check = true; extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_http_parser parser; grpc_http_request request; + grpc_init(); memset(&request, 0, sizeof(request)); grpc_http_parser_init(&parser, GRPC_HTTP_REQUEST, &request); grpc_slice slice = grpc_slice_from_copied_buffer((const char*)data, size); @@ -38,5 +40,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_slice_unref(slice); grpc_http_parser_destroy(&parser); grpc_http_request_destroy(&request); + grpc_shutdown(); return 0; } diff --git a/test/core/http/response_fuzzer.cc b/test/core/http/response_fuzzer.cc index 2a793fddd4b..fc0904b1db7 100644 --- a/test/core/http/response_fuzzer.cc +++ b/test/core/http/response_fuzzer.cc @@ -19,6 +19,7 @@ #include #include +#include #include #include "src/core/lib/http/parser.h" @@ -29,6 +30,7 @@ bool leak_check = true; extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_http_parser parser; grpc_http_response response; + grpc_init(); memset(&response, 0, sizeof(response)); grpc_http_parser_init(&parser, GRPC_HTTP_RESPONSE, &response); grpc_slice slice = grpc_slice_from_copied_buffer((const char*)data, size); @@ -37,5 +39,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_slice_unref(slice); grpc_http_parser_destroy(&parser); grpc_http_response_destroy(&response); + grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/combiner_test.cc b/test/core/iomgr/combiner_test.cc index 33d892fa06a..891008c7741 100644 --- a/test/core/iomgr/combiner_test.cc +++ b/test/core/iomgr/combiner_test.cc @@ -28,13 +28,11 @@ static void test_no_op(void) { gpr_log(GPR_DEBUG, "test_no_op"); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_COMBINER_UNREF(&exec_ctx, grpc_combiner_create(), "test_no_op"); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + GRPC_COMBINER_UNREF(grpc_combiner_create(), "test_no_op"); } -static void set_event_to_true(grpc_exec_ctx* exec_ctx, void* value, - grpc_error* error) { +static void set_event_to_true(void* value, grpc_error* error) { gpr_event_set(static_cast(value), (void*)1); } @@ -44,16 +42,14 @@ static void test_execute_one(void) { grpc_combiner* lock = grpc_combiner_create(); gpr_event done; gpr_event_init(&done); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_CLOSURE_SCHED(&exec_ctx, - GRPC_CLOSURE_CREATE(set_event_to_true, &done, + grpc_core::ExecCtx exec_ctx; + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(set_event_to_true, &done, grpc_combiner_scheduler(lock)), GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&done, grpc_timeout_seconds_to_deadline(5)) != nullptr); - GRPC_COMBINER_UNREF(&exec_ctx, lock, "test_execute_one"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(lock, "test_execute_one"); } typedef struct { @@ -67,7 +63,7 @@ typedef struct { size_t value; } ex_args; -static void check_one(grpc_exec_ctx* exec_ctx, void* a, grpc_error* error) { +static void check_one(void* a, grpc_error* error) { ex_args* args = static_cast(a); GPR_ASSERT(*args->ctr == args->value - 1); *args->ctr = args->value; @@ -76,28 +72,25 @@ static void check_one(grpc_exec_ctx* exec_ctx, void* a, grpc_error* error) { static void execute_many_loop(void* a) { thd_args* args = static_cast(a); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; size_t n = 1; for (size_t i = 0; i < 10; i++) { for (size_t j = 0; j < 10000; j++) { ex_args* c = static_cast(gpr_malloc(sizeof(*c))); c->ctr = &args->ctr; c->value = n++; - GRPC_CLOSURE_SCHED(&exec_ctx, - GRPC_CLOSURE_CREATE( + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE( check_one, c, grpc_combiner_scheduler(args->lock)), GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); } // sleep for a little bit, to test a combiner draining and another thread // picking it up gpr_sleep_until(grpc_timeout_milliseconds_to_deadline(100)); } - GRPC_CLOSURE_SCHED(&exec_ctx, - GRPC_CLOSURE_CREATE(set_event_to_true, &args->done, + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(set_event_to_true, &args->done, grpc_combiner_scheduler(args->lock)), GRPC_ERROR_NONE); - grpc_exec_ctx_finish(&exec_ctx); } static void test_execute_many(void) { @@ -120,20 +113,18 @@ static void test_execute_many(void) { gpr_inf_future(GPR_CLOCK_REALTIME)) != nullptr); gpr_thd_join(thds[i]); } - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_COMBINER_UNREF(&exec_ctx, lock, "test_execute_many"); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + GRPC_COMBINER_UNREF(lock, "test_execute_many"); } static gpr_event got_in_finally; -static void in_finally(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void in_finally(void* arg, grpc_error* error) { gpr_event_set(&got_in_finally, (void*)1); } -static void add_finally(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { - GRPC_CLOSURE_SCHED(exec_ctx, - GRPC_CLOSURE_CREATE(in_finally, arg, +static void add_finally(void* arg, grpc_error* error) { + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(in_finally, arg, grpc_combiner_finally_scheduler( static_cast(arg))), GRPC_ERROR_NONE); @@ -143,17 +134,15 @@ static void test_execute_finally(void) { gpr_log(GPR_DEBUG, "test_execute_finally"); grpc_combiner* lock = grpc_combiner_create(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_event_init(&got_in_finally); GRPC_CLOSURE_SCHED( - &exec_ctx, GRPC_CLOSURE_CREATE(add_finally, lock, grpc_combiner_scheduler(lock)), GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&got_in_finally, grpc_timeout_seconds_to_deadline(5)) != nullptr); - GRPC_COMBINER_UNREF(&exec_ctx, lock, "test_execute_finally"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(lock, "test_execute_finally"); } int main(int argc, char** argv) { diff --git a/test/core/iomgr/endpoint_pair_test.cc b/test/core/iomgr/endpoint_pair_test.cc index 30a0cb5924a..90dd40d9c48 100644 --- a/test/core/iomgr/endpoint_pair_test.cc +++ b/test/core/iomgr/endpoint_pair_test.cc @@ -32,7 +32,7 @@ static void clean_up(void) {} static grpc_endpoint_test_fixture create_fixture_endpoint_pair( size_t slice_size) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_endpoint_test_fixture f; grpc_arg a[1]; a[0].key = const_cast(GRPC_ARG_TCP_READ_CHUNK_SIZE); @@ -43,9 +43,8 @@ static grpc_endpoint_test_fixture create_fixture_endpoint_pair( f.client_ep = p.client; f.server_ep = p.server; - grpc_endpoint_add_to_pollset(&exec_ctx, f.client_ep, g_pollset); - grpc_endpoint_add_to_pollset(&exec_ctx, f.server_ep, g_pollset); - grpc_exec_ctx_finish(&exec_ctx); + grpc_endpoint_add_to_pollset(f.client_ep, g_pollset); + grpc_endpoint_add_to_pollset(f.server_ep, g_pollset); return f; } @@ -54,23 +53,23 @@ static grpc_endpoint_test_config configs[] = { {"tcp/tcp_socketpair", create_fixture_endpoint_pair, clean_up}, }; -static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, - grpc_error* error) { - grpc_pollset_destroy(exec_ctx, static_cast(p)); +static void destroy_pollset(void* p, grpc_error* error) { + grpc_pollset_destroy(static_cast(p)); } int main(int argc, char** argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); - g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); - grpc_pollset_init(g_pollset, &g_mu); - grpc_endpoint_tests(configs[0], g_pollset, g_mu); - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); - grpc_exec_ctx_finish(&exec_ctx); + { + grpc_core::ExecCtx exec_ctx; + g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); + grpc_pollset_init(g_pollset, &g_mu); + grpc_endpoint_tests(configs[0], g_pollset, g_mu); + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + } grpc_shutdown(); gpr_free(g_pollset); diff --git a/test/core/iomgr/endpoint_tests.cc b/test/core/iomgr/endpoint_tests.cc index 026e34105d8..8ccae520670 100644 --- a/test/core/iomgr/endpoint_tests.cc +++ b/test/core/iomgr/endpoint_tests.cc @@ -115,8 +115,7 @@ struct read_and_write_test_state { grpc_closure done_write; }; -static void read_and_write_test_read_handler(grpc_exec_ctx* exec_ctx, - void* data, grpc_error* error) { +static void read_and_write_test_read_handler(void* data, grpc_error* error) { struct read_and_write_test_state* state = (struct read_and_write_test_state*)data; @@ -126,17 +125,14 @@ static void read_and_write_test_read_handler(grpc_exec_ctx* exec_ctx, gpr_log(GPR_INFO, "Read handler done"); gpr_mu_lock(g_mu); state->read_done = 1 + (error == GRPC_ERROR_NONE); - GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, g_pollset, nullptr)); + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr)); gpr_mu_unlock(g_mu); } else if (error == GRPC_ERROR_NONE) { - grpc_endpoint_read(exec_ctx, state->read_ep, &state->incoming, - &state->done_read); + grpc_endpoint_read(state->read_ep, &state->incoming, &state->done_read); } } -static void read_and_write_test_write_handler(grpc_exec_ctx* exec_ctx, - void* data, grpc_error* error) { +static void read_and_write_test_write_handler(void* data, grpc_error* error) { struct read_and_write_test_state* state = (struct read_and_write_test_state*)data; grpc_slice* slices = nullptr; @@ -153,7 +149,7 @@ static void read_and_write_test_write_handler(grpc_exec_ctx* exec_ctx, &state->current_write_data); grpc_slice_buffer_reset_and_unref(&state->outgoing); grpc_slice_buffer_addn(&state->outgoing, slices, nslices); - grpc_endpoint_write(exec_ctx, state->write_ep, &state->outgoing, + grpc_endpoint_write(state->write_ep, &state->outgoing, &state->done_write); gpr_free(slices); return; @@ -163,8 +159,7 @@ static void read_and_write_test_write_handler(grpc_exec_ctx* exec_ctx, gpr_log(GPR_INFO, "Write handler done"); gpr_mu_lock(g_mu); state->write_done = 1 + (error == GRPC_ERROR_NONE); - GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, g_pollset, nullptr)); + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr)); gpr_mu_unlock(g_mu); } @@ -178,7 +173,7 @@ static void read_and_write_test(grpc_endpoint_test_config config, struct read_and_write_test_state state; grpc_endpoint_test_fixture f = begin_test(config, "read_and_write_test", slice_size); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); gpr_log(GPR_DEBUG, @@ -217,66 +212,57 @@ static void read_and_write_test(grpc_endpoint_test_config config, for the first iteration as for later iterations. It does the right thing even when bytes_written is unsigned. */ state.bytes_written -= state.current_write_size; - read_and_write_test_write_handler(&exec_ctx, &state, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + read_and_write_test_write_handler(&state, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Get()->Flush(); - grpc_endpoint_read(&exec_ctx, state.read_ep, &state.incoming, - &state.done_read); + grpc_endpoint_read(state.read_ep, &state.incoming, &state.done_read); if (shutdown) { gpr_log(GPR_DEBUG, "shutdown read"); grpc_endpoint_shutdown( - &exec_ctx, state.read_ep, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); + state.read_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); gpr_log(GPR_DEBUG, "shutdown write"); grpc_endpoint_shutdown( - &exec_ctx, state.write_ep, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); + state.write_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); } - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); while (!state.read_done || !state.write_done) { grpc_pollset_worker* worker = nullptr; - GPR_ASSERT(grpc_exec_ctx_now(&exec_ctx) < deadline); + GPR_ASSERT(grpc_core::ExecCtx::Get()->Now() < deadline); GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); + "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); } gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); end_test(config); - grpc_slice_buffer_destroy_internal(&exec_ctx, &state.outgoing); - grpc_slice_buffer_destroy_internal(&exec_ctx, &state.incoming); - grpc_endpoint_destroy(&exec_ctx, state.read_ep); - grpc_endpoint_destroy(&exec_ctx, state.write_ep); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_buffer_destroy_internal(&state.outgoing); + grpc_slice_buffer_destroy_internal(&state.incoming); + grpc_endpoint_destroy(state.read_ep); + grpc_endpoint_destroy(state.write_ep); } -static void inc_on_failure(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void inc_on_failure(void* arg, grpc_error* error) { gpr_mu_lock(g_mu); *(int*)arg += (error != GRPC_ERROR_NONE); - GPR_ASSERT(GRPC_LOG_IF_ERROR( - "kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); + GPR_ASSERT(GRPC_LOG_IF_ERROR("kick", grpc_pollset_kick(g_pollset, nullptr))); gpr_mu_unlock(g_mu); } -static void wait_for_fail_count(grpc_exec_ctx* exec_ctx, int* fail_count, - int want_fail_count) { - grpc_exec_ctx_flush(exec_ctx); +static void wait_for_fail_count(int* fail_count, int want_fail_count) { + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(10)); - while (grpc_exec_ctx_now(exec_ctx) < deadline && + while (grpc_core::ExecCtx::Get()->Now() < deadline && *fail_count < want_fail_count) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(exec_ctx, g_pollset, &worker, deadline))); + "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } GPR_ASSERT(*fail_count == want_fail_count); @@ -291,33 +277,32 @@ static void multiple_shutdown_test(grpc_endpoint_test_config config) { grpc_slice_buffer slice_buffer; grpc_slice_buffer_init(&slice_buffer); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_endpoint_add_to_pollset(&exec_ctx, f.client_ep, g_pollset); - grpc_endpoint_read(&exec_ctx, f.client_ep, &slice_buffer, + grpc_core::ExecCtx exec_ctx; + grpc_endpoint_add_to_pollset(f.client_ep, g_pollset); + grpc_endpoint_read(f.client_ep, &slice_buffer, GRPC_CLOSURE_CREATE(inc_on_failure, &fail_count, grpc_schedule_on_exec_ctx)); - wait_for_fail_count(&exec_ctx, &fail_count, 0); - grpc_endpoint_shutdown(&exec_ctx, f.client_ep, + wait_for_fail_count(&fail_count, 0); + grpc_endpoint_shutdown(f.client_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); - wait_for_fail_count(&exec_ctx, &fail_count, 1); - grpc_endpoint_read(&exec_ctx, f.client_ep, &slice_buffer, + wait_for_fail_count(&fail_count, 1); + grpc_endpoint_read(f.client_ep, &slice_buffer, GRPC_CLOSURE_CREATE(inc_on_failure, &fail_count, grpc_schedule_on_exec_ctx)); - wait_for_fail_count(&exec_ctx, &fail_count, 2); + wait_for_fail_count(&fail_count, 2); grpc_slice_buffer_add(&slice_buffer, grpc_slice_from_copied_string("a")); - grpc_endpoint_write(&exec_ctx, f.client_ep, &slice_buffer, + grpc_endpoint_write(f.client_ep, &slice_buffer, GRPC_CLOSURE_CREATE(inc_on_failure, &fail_count, grpc_schedule_on_exec_ctx)); - wait_for_fail_count(&exec_ctx, &fail_count, 3); - grpc_endpoint_shutdown(&exec_ctx, f.client_ep, + wait_for_fail_count(&fail_count, 3); + grpc_endpoint_shutdown(f.client_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown")); - wait_for_fail_count(&exec_ctx, &fail_count, 3); + wait_for_fail_count(&fail_count, 3); - grpc_slice_buffer_destroy_internal(&exec_ctx, &slice_buffer); + grpc_slice_buffer_destroy_internal(&slice_buffer); - grpc_endpoint_destroy(&exec_ctx, f.client_ep); - grpc_endpoint_destroy(&exec_ctx, f.server_ep); - grpc_exec_ctx_finish(&exec_ctx); + grpc_endpoint_destroy(f.client_ep); + grpc_endpoint_destroy(f.server_ep); } void grpc_endpoint_tests(grpc_endpoint_test_config config, diff --git a/test/core/iomgr/ev_epollsig_linux_test.cc b/test/core/iomgr/ev_epollsig_linux_test.cc index 94f387164a8..e767e01f219 100644 --- a/test/core/iomgr/ev_epollsig_linux_test.cc +++ b/test/core/iomgr/ev_epollsig_linux_test.cc @@ -70,19 +70,18 @@ static void test_fd_init(test_fd* tfds, int* fds, int num_fds) { } } -static void test_fd_cleanup(grpc_exec_ctx* exec_ctx, test_fd* tfds, - int num_fds) { +static void test_fd_cleanup(test_fd* tfds, int num_fds) { int release_fd; int i; for (i = 0; i < num_fds; i++) { - grpc_fd_shutdown(exec_ctx, tfds[i].fd, + grpc_fd_shutdown(tfds[i].fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("test_fd_cleanup")); - grpc_exec_ctx_flush(exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); - grpc_fd_orphan(exec_ctx, tfds[i].fd, nullptr, &release_fd, - false /* already_closed */, "test_fd_cleanup"); - grpc_exec_ctx_flush(exec_ctx); + grpc_fd_orphan(tfds[i].fd, nullptr, &release_fd, false /* already_closed */, + "test_fd_cleanup"); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(release_fd == tfds[i].inner_fd); close(tfds[i].inner_fd); @@ -98,22 +97,20 @@ static void test_pollset_init(test_pollset* pollsets, int num_pollsets) { } } -static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, - grpc_error* error) { - grpc_pollset_destroy(exec_ctx, (grpc_pollset*)p); +static void destroy_pollset(void* p, grpc_error* error) { + grpc_pollset_destroy((grpc_pollset*)p); } -static void test_pollset_cleanup(grpc_exec_ctx* exec_ctx, - test_pollset* pollsets, int num_pollsets) { +static void test_pollset_cleanup(test_pollset* pollsets, int num_pollsets) { grpc_closure destroyed; int i; for (i = 0; i < num_pollsets; i++) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, pollsets[i].pollset, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(exec_ctx, pollsets[i].pollset, &destroyed); + grpc_pollset_shutdown(pollsets[i].pollset, &destroyed); - grpc_exec_ctx_flush(exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_free(pollsets[i].pollset); } } @@ -133,7 +130,7 @@ static void test_pollset_cleanup(grpc_exec_ctx* exec_ctx, #define NUM_POLLSETS 4 static void test_add_fd_to_pollset() { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; test_fd tfds[NUM_FDS]; int fds[NUM_FDS]; test_pollset pollsets[NUM_POLLSETS]; @@ -170,33 +167,33 @@ static void test_add_fd_to_pollset() { /* == Step 1 == */ for (i = 0; i <= 2; i++) { - grpc_pollset_add_fd(&exec_ctx, pollsets[0].pollset, tfds[i].fd); - grpc_exec_ctx_flush(&exec_ctx); + grpc_pollset_add_fd(pollsets[0].pollset, tfds[i].fd); + grpc_core::ExecCtx::Get()->Flush(); } for (i = 3; i <= 4; i++) { - grpc_pollset_add_fd(&exec_ctx, pollsets[1].pollset, tfds[i].fd); - grpc_exec_ctx_flush(&exec_ctx); + grpc_pollset_add_fd(pollsets[1].pollset, tfds[i].fd); + grpc_core::ExecCtx::Get()->Flush(); } for (i = 5; i <= 7; i++) { - grpc_pollset_add_fd(&exec_ctx, pollsets[2].pollset, tfds[i].fd); - grpc_exec_ctx_flush(&exec_ctx); + grpc_pollset_add_fd(pollsets[2].pollset, tfds[i].fd); + grpc_core::ExecCtx::Get()->Flush(); } /* == Step 2 == */ for (i = 0; i <= 1; i++) { - grpc_pollset_add_fd(&exec_ctx, pollsets[3].pollset, tfds[i].fd); - grpc_exec_ctx_flush(&exec_ctx); + grpc_pollset_add_fd(pollsets[3].pollset, tfds[i].fd); + grpc_core::ExecCtx::Get()->Flush(); } /* == Step 3 == */ - grpc_pollset_add_fd(&exec_ctx, pollsets[1].pollset, tfds[0].fd); - grpc_exec_ctx_flush(&exec_ctx); + grpc_pollset_add_fd(pollsets[1].pollset, tfds[0].fd); + grpc_core::ExecCtx::Get()->Flush(); /* == Step 4 == */ - grpc_pollset_add_fd(&exec_ctx, pollsets[2].pollset, tfds[3].fd); - grpc_exec_ctx_flush(&exec_ctx); + grpc_pollset_add_fd(pollsets[2].pollset, tfds[3].fd); + grpc_core::ExecCtx::Get()->Flush(); /* All polling islands are merged at this point */ @@ -213,9 +210,8 @@ static void test_add_fd_to_pollset() { expected_pi, grpc_pollset_get_polling_island(pollsets[i].pollset))); } - test_fd_cleanup(&exec_ctx, tfds, NUM_FDS); - test_pollset_cleanup(&exec_ctx, pollsets, NUM_POLLSETS); - grpc_exec_ctx_finish(&exec_ctx); + test_fd_cleanup(tfds, NUM_FDS); + test_pollset_cleanup(pollsets, NUM_POLLSETS); } #undef NUM_FDS @@ -235,26 +231,24 @@ static __thread int thread_wakeups = 0; static void test_threading_loop(void* arg) { threading_shared* shared = static_cast(arg); while (thread_wakeups < 1000000) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_pollset_worker* worker; gpr_mu_lock(shared->mu); GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(&exec_ctx, shared->pollset, &worker, - GRPC_MILLIS_INF_FUTURE))); + "pollset_work", + grpc_pollset_work(shared->pollset, &worker, GRPC_MILLIS_INF_FUTURE))); gpr_mu_unlock(shared->mu); - grpc_exec_ctx_finish(&exec_ctx); } } -static void test_threading_wakeup(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void test_threading_wakeup(void* arg, grpc_error* error) { threading_shared* shared = static_cast(arg); ++shared->wakeups; ++thread_wakeups; if (error == GRPC_ERROR_NONE) { GPR_ASSERT(GRPC_LOG_IF_ERROR( "consume_wakeup", grpc_wakeup_fd_consume_wakeup(shared->wakeup_fd))); - grpc_fd_notify_on_read(exec_ctx, shared->wakeup_desc, &shared->on_wakeup); + grpc_fd_notify_on_read(shared->wakeup_desc, &shared->on_wakeup); GPR_ASSERT(GRPC_LOG_IF_ERROR("wakeup_next", grpc_wakeup_fd_wakeup(shared->wakeup_fd))); } @@ -277,13 +271,12 @@ static void test_threading(void) { shared.wakeup_desc = grpc_fd_create(fd.read_fd, "wakeup"); shared.wakeups = 0; { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_pollset_add_fd(&exec_ctx, shared.pollset, shared.wakeup_desc); + grpc_core::ExecCtx exec_ctx; + grpc_pollset_add_fd(shared.pollset, shared.wakeup_desc); grpc_fd_notify_on_read( - &exec_ctx, shared.wakeup_desc, + shared.wakeup_desc, GRPC_CLOSURE_INIT(&shared.on_wakeup, test_threading_wakeup, &shared, grpc_schedule_on_exec_ctx)); - grpc_exec_ctx_finish(&exec_ctx); } GPR_ASSERT(GRPC_LOG_IF_ERROR("wakeup_first", grpc_wakeup_fd_wakeup(shared.wakeup_fd))); @@ -293,14 +286,13 @@ static void test_threading(void) { fd.read_fd = 0; grpc_wakeup_fd_destroy(&fd); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_fd_shutdown(&exec_ctx, shared.wakeup_desc, GRPC_ERROR_CANCELLED); - grpc_fd_orphan(&exec_ctx, shared.wakeup_desc, nullptr, nullptr, + grpc_core::ExecCtx exec_ctx; + grpc_fd_shutdown(shared.wakeup_desc, GRPC_ERROR_CANCELLED); + grpc_fd_orphan(shared.wakeup_desc, nullptr, nullptr, false /* already_closed */, "done"); - grpc_pollset_shutdown(&exec_ctx, shared.pollset, + grpc_pollset_shutdown(shared.pollset, GRPC_CLOSURE_CREATE(destroy_pollset, shared.pollset, grpc_schedule_on_exec_ctx)); - grpc_exec_ctx_finish(&exec_ctx); } gpr_free(shared.pollset); } @@ -309,20 +301,21 @@ int main(int argc, char** argv) { const char* poll_strategy = nullptr; grpc_test_init(argc, argv); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - - poll_strategy = grpc_get_poll_strategy_name(); - if (poll_strategy != nullptr && strcmp(poll_strategy, "epollsig") == 0) { - test_add_fd_to_pollset(); - test_threading(); - } else { - gpr_log(GPR_INFO, - "Skipping the test. The test is only relevant for 'epollsig' " - "strategy. and the current strategy is: '%s'", - poll_strategy); + { + grpc_core::ExecCtx exec_ctx; + + poll_strategy = grpc_get_poll_strategy_name(); + if (poll_strategy != nullptr && strcmp(poll_strategy, "epollsig") == 0) { + test_add_fd_to_pollset(); + test_threading(); + } else { + gpr_log(GPR_INFO, + "Skipping the test. The test is only relevant for 'epollsig' " + "strategy. and the current strategy is: '%s'", + poll_strategy); + } } - grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/fd_conservation_posix_test.cc b/test/core/iomgr/fd_conservation_posix_test.cc index f46430c6116..aaa14010f8d 100644 --- a/test/core/iomgr/fd_conservation_posix_test.cc +++ b/test/core/iomgr/fd_conservation_posix_test.cc @@ -31,26 +31,27 @@ int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - - /* set max # of file descriptors to a low value, and - verify we can create and destroy many more than this number - of descriptors */ - rlim.rlim_cur = rlim.rlim_max = 10; - GPR_ASSERT(0 == setrlimit(RLIMIT_NOFILE, &rlim)); - grpc_resource_quota* resource_quota = - grpc_resource_quota_create("fd_conservation_posix_test"); - - for (i = 0; i < 100; i++) { - p = grpc_iomgr_create_endpoint_pair("test", nullptr); - grpc_endpoint_destroy(&exec_ctx, p.client); - grpc_endpoint_destroy(&exec_ctx, p.server); - grpc_exec_ctx_flush(&exec_ctx); + { + grpc_core::ExecCtx exec_ctx; + + /* set max # of file descriptors to a low value, and + verify we can create and destroy many more than this number + of descriptors */ + rlim.rlim_cur = rlim.rlim_max = 10; + GPR_ASSERT(0 == setrlimit(RLIMIT_NOFILE, &rlim)); + grpc_resource_quota* resource_quota = + grpc_resource_quota_create("fd_conservation_posix_test"); + + for (i = 0; i < 100; i++) { + p = grpc_iomgr_create_endpoint_pair("test", NULL); + grpc_endpoint_destroy(p.client); + grpc_endpoint_destroy(p.server); + grpc_core::ExecCtx::Get()->Flush(); + } + + grpc_resource_quota_unref(resource_quota); } - grpc_resource_quota_unref(resource_quota); - - grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/fd_posix_test.cc b/test/core/iomgr/fd_posix_test.cc index a03d841ecd2..cf75517538a 100644 --- a/test/core/iomgr/fd_posix_test.cc +++ b/test/core/iomgr/fd_posix_test.cc @@ -111,20 +111,19 @@ typedef struct { /* Called when an upload session can be safely shutdown. Close session FD and start to shutdown listen FD. */ -static void session_shutdown_cb(grpc_exec_ctx* exec_ctx, void* arg, /*session */ +static void session_shutdown_cb(void* arg, /*session */ bool success) { session* se = static_cast(arg); server* sv = se->sv; - grpc_fd_orphan(exec_ctx, se->em_fd, nullptr, nullptr, - false /* already_closed */, "a"); + grpc_fd_orphan(se->em_fd, nullptr, nullptr, false /* already_closed */, "a"); gpr_free(se); /* Start to shutdown listen fd. */ - grpc_fd_shutdown(exec_ctx, sv->em_fd, + grpc_fd_shutdown(sv->em_fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("session_shutdown_cb")); } /* Called when data become readable in a session. */ -static void session_read_cb(grpc_exec_ctx* exec_ctx, void* arg, /*session */ +static void session_read_cb(void* arg, /*session */ grpc_error* error) { session* se = static_cast(arg); int fd = grpc_fd_wrapped_fd(se->em_fd); @@ -133,7 +132,7 @@ static void session_read_cb(grpc_exec_ctx* exec_ctx, void* arg, /*session */ ssize_t read_total = 0; if (error != GRPC_ERROR_NONE) { - session_shutdown_cb(exec_ctx, arg, 1); + session_shutdown_cb(arg, 1); return; } @@ -148,7 +147,7 @@ static void session_read_cb(grpc_exec_ctx* exec_ctx, void* arg, /*session */ It is possible to read nothing due to spurious edge event or data has been drained, In such a case, read() returns -1 and set errno to EAGAIN. */ if (read_once == 0) { - session_shutdown_cb(exec_ctx, arg, 1); + session_shutdown_cb(arg, 1); } else if (read_once == -1) { if (errno == EAGAIN) { /* An edge triggered event is cached in the kernel until next poll. @@ -159,7 +158,7 @@ static void session_read_cb(grpc_exec_ctx* exec_ctx, void* arg, /*session */ TODO(chenw): in multi-threaded version, callback and polling can be run in different threads. polling may catch a persist read edge event before notify_on_read is called. */ - grpc_fd_notify_on_read(exec_ctx, se->em_fd, &se->session_read_closure); + grpc_fd_notify_on_read(se->em_fd, &se->session_read_closure); } else { gpr_log(GPR_ERROR, "Unhandled read error %s", strerror(errno)); abort(); @@ -169,22 +168,20 @@ static void session_read_cb(grpc_exec_ctx* exec_ctx, void* arg, /*session */ /* Called when the listen FD can be safely shutdown. Close listen FD and signal that server can be shutdown. */ -static void listen_shutdown_cb(grpc_exec_ctx* exec_ctx, void* arg /*server */, - int success) { +static void listen_shutdown_cb(void* arg /*server */, int success) { server* sv = static_cast(arg); - grpc_fd_orphan(exec_ctx, sv->em_fd, nullptr, nullptr, - false /* already_closed */, "b"); + grpc_fd_orphan(sv->em_fd, nullptr, nullptr, false /* already_closed */, "b"); gpr_mu_lock(g_mu); sv->done = 1; - GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); gpr_mu_unlock(g_mu); } /* Called when a new TCP connection request arrives in the listening port. */ -static void listen_cb(grpc_exec_ctx* exec_ctx, void* arg, /*=sv_arg*/ +static void listen_cb(void* arg, /*=sv_arg*/ grpc_error* error) { server* sv = static_cast(arg); int fd; @@ -195,7 +192,7 @@ static void listen_cb(grpc_exec_ctx* exec_ctx, void* arg, /*=sv_arg*/ grpc_fd* listen_em_fd = sv->em_fd; if (error != GRPC_ERROR_NONE) { - listen_shutdown_cb(exec_ctx, arg, 1); + listen_shutdown_cb(arg, 1); return; } @@ -207,12 +204,12 @@ static void listen_cb(grpc_exec_ctx* exec_ctx, void* arg, /*=sv_arg*/ se = static_cast(gpr_malloc(sizeof(*se))); se->sv = sv; se->em_fd = grpc_fd_create(fd, "listener"); - grpc_pollset_add_fd(exec_ctx, g_pollset, se->em_fd); + grpc_pollset_add_fd(g_pollset, se->em_fd); GRPC_CLOSURE_INIT(&se->session_read_closure, session_read_cb, se, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(exec_ctx, se->em_fd, &se->session_read_closure); + grpc_fd_notify_on_read(se->em_fd, &se->session_read_closure); - grpc_fd_notify_on_read(exec_ctx, listen_em_fd, &sv->listen_closure); + grpc_fd_notify_on_read(listen_em_fd, &sv->listen_closure); } /* Max number of connections pending to be accepted by listen(). */ @@ -222,7 +219,7 @@ static void listen_cb(grpc_exec_ctx* exec_ctx, void* arg, /*=sv_arg*/ listen_cb() is registered to be interested in reading from listen_fd. When connection request arrives, listen_cb() is called to accept the connection request. */ -static int server_start(grpc_exec_ctx* exec_ctx, server* sv) { +static int server_start(server* sv) { int port = 0; int fd; struct sockaddr_in sin; @@ -236,11 +233,11 @@ static int server_start(grpc_exec_ctx* exec_ctx, server* sv) { GPR_ASSERT(listen(fd, MAX_NUM_FD) == 0); sv->em_fd = grpc_fd_create(fd, "server"); - grpc_pollset_add_fd(exec_ctx, g_pollset, sv->em_fd); + grpc_pollset_add_fd(g_pollset, sv->em_fd); /* Register to be interested in reading from listen_fd. */ GRPC_CLOSURE_INIT(&sv->listen_closure, listen_cb, sv, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(exec_ctx, sv->em_fd, &sv->listen_closure); + grpc_fd_notify_on_read(sv->em_fd, &sv->listen_closure); return port; } @@ -249,13 +246,13 @@ static int server_start(grpc_exec_ctx* exec_ctx, server* sv) { static void server_wait_and_shutdown(server* sv) { gpr_mu_lock(g_mu); while (!sv->done) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(&exec_ctx, g_pollset, &worker, - GRPC_MILLIS_INF_FUTURE))); + "pollset_work", + grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -289,18 +286,16 @@ static void client_init(client* cl) { } /* Called when a client upload session is ready to shutdown. */ -static void client_session_shutdown_cb(grpc_exec_ctx* exec_ctx, - void* arg /*client */, int success) { +static void client_session_shutdown_cb(void* arg /*client */, int success) { client* cl = static_cast(arg); - grpc_fd_orphan(exec_ctx, cl->em_fd, nullptr, nullptr, - false /* already_closed */, "c"); + grpc_fd_orphan(cl->em_fd, nullptr, nullptr, false /* already_closed */, "c"); cl->done = 1; - GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); } /* Write as much as possible, then register notify_on_write. */ -static void client_session_write(grpc_exec_ctx* exec_ctx, void* arg, /*client */ +static void client_session_write(void* arg, /*client */ grpc_error* error) { client* cl = static_cast(arg); int fd = grpc_fd_wrapped_fd(cl->em_fd); @@ -308,7 +303,7 @@ static void client_session_write(grpc_exec_ctx* exec_ctx, void* arg, /*client */ if (error != GRPC_ERROR_NONE) { gpr_mu_lock(g_mu); - client_session_shutdown_cb(exec_ctx, arg, 1); + client_session_shutdown_cb(arg, 1); gpr_mu_unlock(g_mu); return; } @@ -323,10 +318,10 @@ static void client_session_write(grpc_exec_ctx* exec_ctx, void* arg, /*client */ if (cl->client_write_cnt < CLIENT_TOTAL_WRITE_CNT) { GRPC_CLOSURE_INIT(&cl->write_closure, client_session_write, cl, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_write(exec_ctx, cl->em_fd, &cl->write_closure); + grpc_fd_notify_on_write(cl->em_fd, &cl->write_closure); cl->client_write_cnt++; } else { - client_session_shutdown_cb(exec_ctx, arg, 1); + client_session_shutdown_cb(arg, 1); } gpr_mu_unlock(g_mu); } else { @@ -336,7 +331,7 @@ static void client_session_write(grpc_exec_ctx* exec_ctx, void* arg, /*client */ } /* Start a client to send a stream of bytes. */ -static void client_start(grpc_exec_ctx* exec_ctx, client* cl, int port) { +static void client_start(client* cl, int port) { int fd; struct sockaddr_in sin; create_test_socket(port, &fd, &sin); @@ -357,9 +352,9 @@ static void client_start(grpc_exec_ctx* exec_ctx, client* cl, int port) { } cl->em_fd = grpc_fd_create(fd, "client"); - grpc_pollset_add_fd(exec_ctx, g_pollset, cl->em_fd); + grpc_pollset_add_fd(g_pollset, cl->em_fd); - client_session_write(exec_ctx, cl, GRPC_ERROR_NONE); + client_session_write(cl, GRPC_ERROR_NONE); } /* Wait for the signal to shutdown a client. */ @@ -367,12 +362,12 @@ static void client_wait_and_shutdown(client* cl) { gpr_mu_lock(g_mu); while (!cl->done) { grpc_pollset_worker* worker = nullptr; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(&exec_ctx, g_pollset, &worker, - GRPC_MILLIS_INF_FUTURE))); + "pollset_work", + grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); @@ -385,13 +380,13 @@ static void test_grpc_fd(void) { server sv; client cl; int port; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; server_init(&sv); - port = server_start(&exec_ctx, &sv); + port = server_start(&sv); client_init(&cl); - client_start(&exec_ctx, &cl, port); - grpc_exec_ctx_finish(&exec_ctx); + client_start(&cl, port); + client_wait_and_shutdown(&cl); server_wait_and_shutdown(&sv); GPR_ASSERT(sv.read_bytes_total == cl.write_bytes_total); @@ -406,27 +401,25 @@ void init_change_data(fd_change_data* fdc) { fdc->cb_that_ran = nullptr; } void destroy_change_data(fd_change_data* fdc) {} -static void first_read_callback(grpc_exec_ctx* exec_ctx, - void* arg /* fd_change_data */, +static void first_read_callback(void* arg /* fd_change_data */, grpc_error* error) { fd_change_data* fdc = static_cast(arg); gpr_mu_lock(g_mu); fdc->cb_that_ran = first_read_callback; - GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); gpr_mu_unlock(g_mu); } -static void second_read_callback(grpc_exec_ctx* exec_ctx, - void* arg /* fd_change_data */, +static void second_read_callback(void* arg /* fd_change_data */, grpc_error* error) { fd_change_data* fdc = static_cast(arg); gpr_mu_lock(g_mu); fdc->cb_that_ran = second_read_callback; - GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); gpr_mu_unlock(g_mu); } @@ -443,7 +436,7 @@ static void test_grpc_fd_change(void) { ssize_t result; grpc_closure first_closure; grpc_closure second_closure; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GRPC_CLOSURE_INIT(&first_closure, first_read_callback, &a, grpc_schedule_on_exec_ctx); @@ -460,10 +453,10 @@ static void test_grpc_fd_change(void) { GPR_ASSERT(fcntl(sv[1], F_SETFL, flags | O_NONBLOCK) == 0); em_fd = grpc_fd_create(sv[0], "test_grpc_fd_change"); - grpc_pollset_add_fd(&exec_ctx, g_pollset, em_fd); + grpc_pollset_add_fd(g_pollset, em_fd); /* Register the first callback, then make its FD readable */ - grpc_fd_notify_on_read(&exec_ctx, em_fd, &first_closure); + grpc_fd_notify_on_read(em_fd, &first_closure); data = 0; result = write(sv[1], &data, 1); GPR_ASSERT(result == 1); @@ -473,10 +466,10 @@ static void test_grpc_fd_change(void) { while (a.cb_that_ran == nullptr) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(&exec_ctx, g_pollset, &worker, - GRPC_MILLIS_INF_FUTURE))); + "pollset_work", + grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(g_mu); } GPR_ASSERT(a.cb_that_ran == first_read_callback); @@ -488,7 +481,7 @@ static void test_grpc_fd_change(void) { /* Now register a second callback with distinct change data, and do the same thing again. */ - grpc_fd_notify_on_read(&exec_ctx, em_fd, &second_closure); + grpc_fd_notify_on_read(em_fd, &second_closure); data = 0; result = write(sv[1], &data, 1); GPR_ASSERT(result == 1); @@ -497,44 +490,43 @@ static void test_grpc_fd_change(void) { while (b.cb_that_ran == nullptr) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(&exec_ctx, g_pollset, &worker, - GRPC_MILLIS_INF_FUTURE))); + "pollset_work", + grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(g_mu); } /* Except now we verify that second_read_callback ran instead */ GPR_ASSERT(b.cb_that_ran == second_read_callback); gpr_mu_unlock(g_mu); - grpc_fd_orphan(&exec_ctx, em_fd, nullptr, nullptr, false /* already_closed */, - "d"); - grpc_exec_ctx_finish(&exec_ctx); + grpc_fd_orphan(em_fd, nullptr, nullptr, false /* already_closed */, "d"); + destroy_change_data(&a); destroy_change_data(&b); close(sv[1]); } -static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, - grpc_error* error) { - grpc_pollset_destroy(exec_ctx, static_cast(p)); +static void destroy_pollset(void* p, grpc_error* error) { + grpc_pollset_destroy(static_cast(p)); } int main(int argc, char** argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); - g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); - grpc_pollset_init(g_pollset, &g_mu); - test_grpc_fd(); - test_grpc_fd_change(); - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); - grpc_exec_ctx_flush(&exec_ctx); - gpr_free(g_pollset); - grpc_exec_ctx_finish(&exec_ctx); + { + grpc_core::ExecCtx exec_ctx; + g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); + grpc_pollset_init(g_pollset, &g_mu); + test_grpc_fd(); + test_grpc_fd_change(); + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + grpc_core::ExecCtx::Get()->Flush(); + gpr_free(g_pollset); + } grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/load_file_test.cc b/test/core/iomgr/load_file_test.cc index 9f360badcc3..797d0ef1a4d 100644 --- a/test/core/iomgr/load_file_test.cc +++ b/test/core/iomgr/load_file_test.cc @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -152,9 +153,11 @@ static void test_load_big_file(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); test_load_empty_file(); test_load_failure(); test_load_small_file(); test_load_big_file(); + grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/pollset_set_test.cc b/test/core/iomgr/pollset_set_test.cc index 719eab91fef..f27079134b8 100644 --- a/test/core/iomgr/pollset_set_test.cc +++ b/test/core/iomgr/pollset_set_test.cc @@ -47,11 +47,10 @@ void init_test_pollset_sets(test_pollset_set* pollset_sets, const int num_pss) { } } -void cleanup_test_pollset_sets(grpc_exec_ctx* exec_ctx, - test_pollset_set* pollset_sets, +void cleanup_test_pollset_sets(test_pollset_set* pollset_sets, const int num_pss) { for (int i = 0; i < num_pss; i++) { - grpc_pollset_set_destroy(exec_ctx, pollset_sets[i].pss); + grpc_pollset_set_destroy(pollset_sets[i].pss); pollset_sets[i].pss = nullptr; } } @@ -73,21 +72,19 @@ static void init_test_pollsets(test_pollset* pollsets, const int num_pollsets) { } } -static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, - grpc_error* error) { - grpc_pollset_destroy(exec_ctx, static_cast(p)); +static void destroy_pollset(void* p, grpc_error* error) { + grpc_pollset_destroy(static_cast(p)); } -static void cleanup_test_pollsets(grpc_exec_ctx* exec_ctx, - test_pollset* pollsets, +static void cleanup_test_pollsets(test_pollset* pollsets, const int num_pollsets) { grpc_closure destroyed; for (int i = 0; i < num_pollsets; i++) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, pollsets[i].ps, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(exec_ctx, pollsets[i].ps, &destroyed); + grpc_pollset_shutdown(pollsets[i].ps, &destroyed); - grpc_exec_ctx_flush(exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_free(pollsets[i].ps); pollsets[i].ps = nullptr; } @@ -105,45 +102,43 @@ typedef struct test_fd { grpc_closure on_readable; /* Closure to call when this fd is readable */ } test_fd; -void on_readable(grpc_exec_ctx* exec_ctx, void* tfd, grpc_error* error) { +void on_readable(void* tfd, grpc_error* error) { ((test_fd*)tfd)->is_on_readable_called = true; } -static void reset_test_fd(grpc_exec_ctx* exec_ctx, test_fd* tfd) { +static void reset_test_fd(test_fd* tfd) { tfd->is_on_readable_called = false; GRPC_CLOSURE_INIT(&tfd->on_readable, on_readable, tfd, grpc_schedule_on_exec_ctx); - grpc_fd_notify_on_read(exec_ctx, tfd->fd, &tfd->on_readable); + grpc_fd_notify_on_read(tfd->fd, &tfd->on_readable); } -static void init_test_fds(grpc_exec_ctx* exec_ctx, test_fd* tfds, - const int num_fds) { +static void init_test_fds(test_fd* tfds, const int num_fds) { for (int i = 0; i < num_fds; i++) { GPR_ASSERT(GRPC_ERROR_NONE == grpc_wakeup_fd_init(&tfds[i].wakeup_fd)); tfds[i].fd = grpc_fd_create(GRPC_WAKEUP_FD_GET_READ_FD(&tfds[i].wakeup_fd), "test_fd"); - reset_test_fd(exec_ctx, &tfds[i]); + reset_test_fd(&tfds[i]); } } -static void cleanup_test_fds(grpc_exec_ctx* exec_ctx, test_fd* tfds, - const int num_fds) { +static void cleanup_test_fds(test_fd* tfds, const int num_fds) { int release_fd; for (int i = 0; i < num_fds; i++) { - grpc_fd_shutdown(exec_ctx, tfds[i].fd, + grpc_fd_shutdown(tfds[i].fd, GRPC_ERROR_CREATE_FROM_STATIC_STRING("fd cleanup")); - grpc_exec_ctx_flush(exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); /* grpc_fd_orphan frees the memory allocated for grpc_fd. Normally it also * calls close() on the underlying fd. In our case, we are using * grpc_wakeup_fd and we would like to destroy it ourselves (by calling * grpc_wakeup_fd_destroy). To prevent grpc_fd from calling close() on the * underlying fd, call it with a non-NULL 'release_fd' parameter */ - grpc_fd_orphan(exec_ctx, tfds[i].fd, nullptr, &release_fd, - false /* already_closed */, "test_fd_cleanup"); - grpc_exec_ctx_flush(exec_ctx); + grpc_fd_orphan(tfds[i].fd, nullptr, &release_fd, false /* already_closed */, + "test_fd_cleanup"); + grpc_core::ExecCtx::Get()->Flush(); grpc_wakeup_fd_destroy(&tfds[i].wakeup_fd); } @@ -155,8 +150,7 @@ static void make_test_fds_readable(test_fd* tfds, const int num_fds) { } } -static void verify_readable_and_reset(grpc_exec_ctx* exec_ctx, test_fd* tfds, - const int num_fds) { +static void verify_readable_and_reset(test_fd* tfds, const int num_fds) { for (int i = 0; i < num_fds; i++) { /* Verify that the on_readable callback was called */ GPR_ASSERT(tfds[i].is_on_readable_called); @@ -164,7 +158,7 @@ static void verify_readable_and_reset(grpc_exec_ctx* exec_ctx, test_fd* tfds, /* Reset the tfd[i] structure */ GPR_ASSERT(GRPC_ERROR_NONE == grpc_wakeup_fd_consume_wakeup(&tfds[i].wakeup_fd)); - reset_test_fd(exec_ctx, &tfds[i]); + reset_test_fd(&tfds[i]); } } @@ -205,7 +199,7 @@ static void pollset_set_test_basic() { * | * +---> FD9 (Added after PS2 is added to PSS0) */ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_pollset_worker* worker; grpc_millis deadline; @@ -216,34 +210,33 @@ static void pollset_set_test_basic() { const int num_ps = GPR_ARRAY_SIZE(pollsets); const int num_pss = GPR_ARRAY_SIZE(pollset_sets); - init_test_fds(&exec_ctx, tfds, num_fds); + init_test_fds(tfds, num_fds); init_test_pollsets(pollsets, num_ps); init_test_pollset_sets(pollset_sets, num_pss); /* Construct the pollset_set/pollset/fd tree (see diagram above) */ - grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[0].pss, tfds[0].fd); - grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[1].pss, tfds[1].fd); + grpc_pollset_set_add_fd(pollset_sets[0].pss, tfds[0].fd); + grpc_pollset_set_add_fd(pollset_sets[1].pss, tfds[1].fd); - grpc_pollset_add_fd(&exec_ctx, pollsets[0].ps, tfds[2].fd); - grpc_pollset_add_fd(&exec_ctx, pollsets[1].ps, tfds[3].fd); - grpc_pollset_add_fd(&exec_ctx, pollsets[2].ps, tfds[4].fd); + grpc_pollset_add_fd(pollsets[0].ps, tfds[2].fd); + grpc_pollset_add_fd(pollsets[1].ps, tfds[3].fd); + grpc_pollset_add_fd(pollsets[2].ps, tfds[4].fd); - grpc_pollset_set_add_pollset_set(&exec_ctx, pollset_sets[0].pss, - pollset_sets[1].pss); + grpc_pollset_set_add_pollset_set(pollset_sets[0].pss, pollset_sets[1].pss); - grpc_pollset_set_add_pollset(&exec_ctx, pollset_sets[1].pss, pollsets[0].ps); - grpc_pollset_set_add_pollset(&exec_ctx, pollset_sets[0].pss, pollsets[1].ps); - grpc_pollset_set_add_pollset(&exec_ctx, pollset_sets[0].pss, pollsets[2].ps); + grpc_pollset_set_add_pollset(pollset_sets[1].pss, pollsets[0].ps); + grpc_pollset_set_add_pollset(pollset_sets[0].pss, pollsets[1].ps); + grpc_pollset_set_add_pollset(pollset_sets[0].pss, pollsets[2].ps); - grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[0].pss, tfds[5].fd); - grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[1].pss, tfds[6].fd); + grpc_pollset_set_add_fd(pollset_sets[0].pss, tfds[5].fd); + grpc_pollset_set_add_fd(pollset_sets[1].pss, tfds[6].fd); - grpc_pollset_add_fd(&exec_ctx, pollsets[0].ps, tfds[7].fd); - grpc_pollset_add_fd(&exec_ctx, pollsets[1].ps, tfds[8].fd); - grpc_pollset_add_fd(&exec_ctx, pollsets[2].ps, tfds[9].fd); + grpc_pollset_add_fd(pollsets[0].ps, tfds[7].fd); + grpc_pollset_add_fd(pollsets[1].ps, tfds[8].fd); + grpc_pollset_add_fd(pollsets[2].ps, tfds[9].fd); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); /* Test that if any FD in the above structure is readable, it is observable by * doing grpc_pollset_work on any pollset @@ -263,34 +256,32 @@ static void pollset_set_test_basic() { deadline = grpc_timespec_to_millis_round_up( grpc_timeout_milliseconds_to_deadline(2)); GPR_ASSERT(GRPC_ERROR_NONE == - grpc_pollset_work(&exec_ctx, pollsets[i].ps, &worker, deadline)); + grpc_pollset_work(pollsets[i].ps, &worker, deadline)); gpr_mu_unlock(pollsets[i].mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); - verify_readable_and_reset(&exec_ctx, tfds, num_fds); - grpc_exec_ctx_flush(&exec_ctx); + verify_readable_and_reset(tfds, num_fds); + grpc_core::ExecCtx::Get()->Flush(); } /* Test tear down */ - grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[0].pss, tfds[0].fd); - grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[0].pss, tfds[5].fd); - grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[1].pss, tfds[1].fd); - grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[1].pss, tfds[6].fd); - grpc_exec_ctx_flush(&exec_ctx); - - grpc_pollset_set_del_pollset(&exec_ctx, pollset_sets[1].pss, pollsets[0].ps); - grpc_pollset_set_del_pollset(&exec_ctx, pollset_sets[0].pss, pollsets[1].ps); - grpc_pollset_set_del_pollset(&exec_ctx, pollset_sets[0].pss, pollsets[2].ps); - - grpc_pollset_set_del_pollset_set(&exec_ctx, pollset_sets[0].pss, - pollset_sets[1].pss); - grpc_exec_ctx_flush(&exec_ctx); - - cleanup_test_fds(&exec_ctx, tfds, num_fds); - cleanup_test_pollsets(&exec_ctx, pollsets, num_ps); - cleanup_test_pollset_sets(&exec_ctx, pollset_sets, num_pss); - grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_set_del_fd(pollset_sets[0].pss, tfds[0].fd); + grpc_pollset_set_del_fd(pollset_sets[0].pss, tfds[5].fd); + grpc_pollset_set_del_fd(pollset_sets[1].pss, tfds[1].fd); + grpc_pollset_set_del_fd(pollset_sets[1].pss, tfds[6].fd); + grpc_core::ExecCtx::Get()->Flush(); + + grpc_pollset_set_del_pollset(pollset_sets[1].pss, pollsets[0].ps); + grpc_pollset_set_del_pollset(pollset_sets[0].pss, pollsets[1].ps); + grpc_pollset_set_del_pollset(pollset_sets[0].pss, pollsets[2].ps); + + grpc_pollset_set_del_pollset_set(pollset_sets[0].pss, pollset_sets[1].pss); + grpc_core::ExecCtx::Get()->Flush(); + + cleanup_test_fds(tfds, num_fds); + cleanup_test_pollsets(pollsets, num_ps); + cleanup_test_pollset_sets(pollset_sets, num_pss); } /* Same FD added multiple times to the pollset_set tree */ @@ -310,7 +301,7 @@ void pollset_set_test_dup_fds() { * | +--> FD2 * +---> FD1 */ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_pollset_worker* worker; grpc_millis deadline; @@ -321,21 +312,20 @@ void pollset_set_test_dup_fds() { const int num_ps = 1; const int num_pss = GPR_ARRAY_SIZE(pollset_sets); - init_test_fds(&exec_ctx, tfds, num_fds); + init_test_fds(tfds, num_fds); init_test_pollsets(&pollset, num_ps); init_test_pollset_sets(pollset_sets, num_pss); /* Construct the structure */ - grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[0].pss, tfds[0].fd); - grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[1].pss, tfds[0].fd); - grpc_pollset_set_add_fd(&exec_ctx, pollset_sets[1].pss, tfds[1].fd); + grpc_pollset_set_add_fd(pollset_sets[0].pss, tfds[0].fd); + grpc_pollset_set_add_fd(pollset_sets[1].pss, tfds[0].fd); + grpc_pollset_set_add_fd(pollset_sets[1].pss, tfds[1].fd); - grpc_pollset_add_fd(&exec_ctx, pollset.ps, tfds[1].fd); - grpc_pollset_add_fd(&exec_ctx, pollset.ps, tfds[2].fd); + grpc_pollset_add_fd(pollset.ps, tfds[1].fd); + grpc_pollset_add_fd(pollset.ps, tfds[2].fd); - grpc_pollset_set_add_pollset(&exec_ctx, pollset_sets[1].pss, pollset.ps); - grpc_pollset_set_add_pollset_set(&exec_ctx, pollset_sets[0].pss, - pollset_sets[1].pss); + grpc_pollset_set_add_pollset(pollset_sets[1].pss, pollset.ps); + grpc_pollset_set_add_pollset_set(pollset_sets[0].pss, pollset_sets[1].pss); /* Test. Make all FDs readable and make sure that can be observed by doing a * grpc_pollset_work on the pollset 'PS' */ @@ -345,27 +335,25 @@ void pollset_set_test_dup_fds() { deadline = grpc_timespec_to_millis_round_up( grpc_timeout_milliseconds_to_deadline(2)); GPR_ASSERT(GRPC_ERROR_NONE == - grpc_pollset_work(&exec_ctx, pollset.ps, &worker, deadline)); + grpc_pollset_work(pollset.ps, &worker, deadline)); gpr_mu_unlock(pollset.mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); - verify_readable_and_reset(&exec_ctx, tfds, num_fds); - grpc_exec_ctx_flush(&exec_ctx); + verify_readable_and_reset(tfds, num_fds); + grpc_core::ExecCtx::Get()->Flush(); /* Tear down */ - grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[0].pss, tfds[0].fd); - grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[1].pss, tfds[0].fd); - grpc_pollset_set_del_fd(&exec_ctx, pollset_sets[1].pss, tfds[1].fd); - - grpc_pollset_set_del_pollset(&exec_ctx, pollset_sets[1].pss, pollset.ps); - grpc_pollset_set_del_pollset_set(&exec_ctx, pollset_sets[0].pss, - pollset_sets[1].pss); - grpc_exec_ctx_flush(&exec_ctx); - - cleanup_test_fds(&exec_ctx, tfds, num_fds); - cleanup_test_pollsets(&exec_ctx, &pollset, num_ps); - cleanup_test_pollset_sets(&exec_ctx, pollset_sets, num_pss); - grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_set_del_fd(pollset_sets[0].pss, tfds[0].fd); + grpc_pollset_set_del_fd(pollset_sets[1].pss, tfds[0].fd); + grpc_pollset_set_del_fd(pollset_sets[1].pss, tfds[1].fd); + + grpc_pollset_set_del_pollset(pollset_sets[1].pss, pollset.ps); + grpc_pollset_set_del_pollset_set(pollset_sets[0].pss, pollset_sets[1].pss); + grpc_core::ExecCtx::Get()->Flush(); + + cleanup_test_fds(tfds, num_fds); + cleanup_test_pollsets(&pollset, num_ps); + cleanup_test_pollset_sets(pollset_sets, num_pss); } /* Pollset_set with an empty pollset */ @@ -383,7 +371,7 @@ void pollset_set_test_empty_pollset() { * | * +---> FD2 */ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_pollset_worker* worker; grpc_millis deadline; @@ -394,17 +382,17 @@ void pollset_set_test_empty_pollset() { const int num_ps = GPR_ARRAY_SIZE(pollsets); const int num_pss = 1; - init_test_fds(&exec_ctx, tfds, num_fds); + init_test_fds(tfds, num_fds); init_test_pollsets(pollsets, num_ps); init_test_pollset_sets(&pollset_set, num_pss); /* Construct the structure */ - grpc_pollset_set_add_fd(&exec_ctx, pollset_set.pss, tfds[0].fd); - grpc_pollset_add_fd(&exec_ctx, pollsets[1].ps, tfds[1].fd); - grpc_pollset_add_fd(&exec_ctx, pollsets[1].ps, tfds[2].fd); + grpc_pollset_set_add_fd(pollset_set.pss, tfds[0].fd); + grpc_pollset_add_fd(pollsets[1].ps, tfds[1].fd); + grpc_pollset_add_fd(pollsets[1].ps, tfds[2].fd); - grpc_pollset_set_add_pollset(&exec_ctx, pollset_set.pss, pollsets[0].ps); - grpc_pollset_set_add_pollset(&exec_ctx, pollset_set.pss, pollsets[1].ps); + grpc_pollset_set_add_pollset(pollset_set.pss, pollsets[0].ps); + grpc_pollset_set_add_pollset(pollset_set.pss, pollsets[1].ps); /* Test. Make all FDs readable and make sure that can be observed by doing * grpc_pollset_work on the empty pollset 'PS0' */ @@ -414,45 +402,44 @@ void pollset_set_test_empty_pollset() { deadline = grpc_timespec_to_millis_round_up( grpc_timeout_milliseconds_to_deadline(2)); GPR_ASSERT(GRPC_ERROR_NONE == - grpc_pollset_work(&exec_ctx, pollsets[0].ps, &worker, deadline)); + grpc_pollset_work(pollsets[0].ps, &worker, deadline)); gpr_mu_unlock(pollsets[0].mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); - verify_readable_and_reset(&exec_ctx, tfds, num_fds); - grpc_exec_ctx_flush(&exec_ctx); + verify_readable_and_reset(tfds, num_fds); + grpc_core::ExecCtx::Get()->Flush(); /* Tear down */ - grpc_pollset_set_del_fd(&exec_ctx, pollset_set.pss, tfds[0].fd); - grpc_pollset_set_del_pollset(&exec_ctx, pollset_set.pss, pollsets[0].ps); - grpc_pollset_set_del_pollset(&exec_ctx, pollset_set.pss, pollsets[1].ps); - grpc_exec_ctx_flush(&exec_ctx); - - cleanup_test_fds(&exec_ctx, tfds, num_fds); - cleanup_test_pollsets(&exec_ctx, pollsets, num_ps); - cleanup_test_pollset_sets(&exec_ctx, &pollset_set, num_pss); - grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_set_del_fd(pollset_set.pss, tfds[0].fd); + grpc_pollset_set_del_pollset(pollset_set.pss, pollsets[0].ps); + grpc_pollset_set_del_pollset(pollset_set.pss, pollsets[1].ps); + grpc_core::ExecCtx::Get()->Flush(); + + cleanup_test_fds(tfds, num_fds); + cleanup_test_pollsets(pollsets, num_ps); + cleanup_test_pollset_sets(&pollset_set, num_pss); } int main(int argc, char** argv) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); - const char* poll_strategy = grpc_get_poll_strategy_name(); - - if (poll_strategy != nullptr && - (strcmp(poll_strategy, "epollsig") == 0 || - strcmp(poll_strategy, "epoll-threadpool") == 0)) { - pollset_set_test_basic(); - pollset_set_test_dup_fds(); - pollset_set_test_empty_pollset(); - } else { - gpr_log(GPR_INFO, - "Skipping the test. The test is only relevant for 'epoll' " - "strategy. and the current strategy is: '%s'", - poll_strategy); + { + grpc_core::ExecCtx exec_ctx; + const char* poll_strategy = grpc_get_poll_strategy_name(); + + if (poll_strategy != nullptr && + (strcmp(poll_strategy, "epollsig") == 0 || + strcmp(poll_strategy, "epoll-threadpool") == 0)) { + pollset_set_test_basic(); + pollset_set_test_dup_fds(); + pollset_set_test_empty_pollset(); + } else { + gpr_log(GPR_INFO, + "Skipping the test. The test is only relevant for 'epoll' " + "strategy. and the current strategy is: '%s'", + poll_strategy); + } } - - grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index 836de423bd8..e36315333c8 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -46,29 +46,29 @@ typedef struct args_struct { grpc_pollset_set* pollset_set; } args_struct; -static void do_nothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} +static void do_nothing(void* arg, grpc_error* error) {} -void args_init(grpc_exec_ctx* exec_ctx, args_struct* args) { +void args_init(args_struct* args) { gpr_event_init(&args->ev); args->pollset = static_cast(gpr_zalloc(grpc_pollset_size())); grpc_pollset_init(args->pollset, &args->mu); args->pollset_set = grpc_pollset_set_create(); - grpc_pollset_set_add_pollset(exec_ctx, args->pollset_set, args->pollset); + grpc_pollset_set_add_pollset(args->pollset_set, args->pollset); args->addrs = nullptr; } -void args_finish(grpc_exec_ctx* exec_ctx, args_struct* args) { +void args_finish(args_struct* args) { GPR_ASSERT(gpr_event_wait(&args->ev, test_deadline())); grpc_resolved_addresses_destroy(args->addrs); - grpc_pollset_set_del_pollset(exec_ctx, args->pollset_set, args->pollset); - grpc_pollset_set_destroy(exec_ctx, args->pollset_set); + grpc_pollset_set_del_pollset(args->pollset_set, args->pollset); + grpc_pollset_set_destroy(args->pollset_set); grpc_closure do_nothing_cb; GRPC_CLOSURE_INIT(&do_nothing_cb, do_nothing, nullptr, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(exec_ctx, args->pollset, &do_nothing_cb); + grpc_pollset_shutdown(args->pollset, &do_nothing_cb); // exec_ctx needs to be flushed before calling grpc_pollset_destroy() - grpc_exec_ctx_flush(exec_ctx); - grpc_pollset_destroy(exec_ctx, args->pollset); + grpc_core::ExecCtx::Get()->Flush(); + grpc_pollset_destroy(args->pollset); gpr_free(args->pollset); } @@ -79,26 +79,24 @@ static grpc_millis n_sec_deadline(int seconds) { static void actually_poll(void* argsp) { args_struct* args = static_cast(argsp); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_millis deadline = n_sec_deadline(10); while (true) { + grpc_core::ExecCtx exec_ctx; bool done = gpr_atm_acq_load(&args->done_atm) != 0; if (done) { break; } - grpc_millis time_left = deadline - grpc_exec_ctx_now(&exec_ctx); + grpc_millis time_left = deadline - grpc_core::ExecCtx::Get()->Now(); gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRIdPTR, done, time_left); GPR_ASSERT(time_left >= 0); grpc_pollset_worker* worker = nullptr; gpr_mu_lock(args->mu); - GRPC_LOG_IF_ERROR("pollset_work", - grpc_pollset_work(&exec_ctx, args->pollset, &worker, - n_sec_deadline(1))); + GRPC_LOG_IF_ERROR("pollset_work", grpc_pollset_work(args->pollset, &worker, + n_sec_deadline(1))); gpr_mu_unlock(args->mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); } gpr_event_set(&args->ev, (void*)1); - grpc_exec_ctx_finish(&exec_ctx); } static void poll_pollset_until_request_done(args_struct* args) { @@ -107,8 +105,7 @@ static void poll_pollset_until_request_done(args_struct* args) { gpr_thd_new(&id, "grpc_poll_pollset", actually_poll, args, nullptr); } -static void must_succeed(grpc_exec_ctx* exec_ctx, void* argsp, - grpc_error* err) { +static void must_succeed(void* argsp, grpc_error* err) { args_struct* args = static_cast(argsp); GPR_ASSERT(err == GRPC_ERROR_NONE); GPR_ASSERT(args->addrs != nullptr); @@ -116,29 +113,28 @@ static void must_succeed(grpc_exec_ctx* exec_ctx, void* argsp, gpr_atm_rel_store(&args->done_atm, 1); } -static void must_fail(grpc_exec_ctx* exec_ctx, void* argsp, grpc_error* err) { +static void must_fail(void* argsp, grpc_error* err) { args_struct* args = static_cast(argsp); GPR_ASSERT(err != GRPC_ERROR_NONE); gpr_atm_rel_store(&args->done_atm, 1); } static void test_unix_socket(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; args_struct args; - args_init(&exec_ctx, &args); + args_init(&args); poll_pollset_until_request_done(&args); grpc_resolve_address( - &exec_ctx, "unix:/path/name", nullptr, args.pollset_set, + "unix:/path/name", nullptr, args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - args_finish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + args_finish(&args); } static void test_unix_socket_path_name_too_long(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; args_struct args; - args_init(&exec_ctx, &args); + args_init(&args); const char prefix[] = "unix:/path/name"; size_t path_name_length = GPR_ARRAY_SIZE(((struct sockaddr_un*)nullptr)->sun_path) + 6; @@ -150,22 +146,23 @@ static void test_unix_socket_path_name_too_long(void) { poll_pollset_until_request_done(&args); grpc_resolve_address( - &exec_ctx, path_name, nullptr, args.pollset_set, + path_name, nullptr, args.pollset_set, GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx), &args.addrs); gpr_free(path_name); - args_finish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + args_finish(&args); } int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - test_unix_socket(); - test_unix_socket_path_name_too_long(); - grpc_executor_shutdown(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + + { + grpc_core::ExecCtx exec_ctx; + test_unix_socket(); + test_unix_socket_path_name_too_long(); + } + grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc index 1c5aa38a95d..a0dc484f3e4 100644 --- a/test/core/iomgr/resolve_address_test.cc +++ b/test/core/iomgr/resolve_address_test.cc @@ -39,32 +39,32 @@ typedef struct args_struct { grpc_pollset_set* pollset_set; } args_struct; -static void do_nothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} +static void do_nothing(void* arg, grpc_error* error) {} -void args_init(grpc_exec_ctx* exec_ctx, args_struct* args) { +void args_init(args_struct* args) { gpr_event_init(&args->ev); args->pollset = static_cast(gpr_zalloc(grpc_pollset_size())); grpc_pollset_init(args->pollset, &args->mu); args->pollset_set = grpc_pollset_set_create(); - grpc_pollset_set_add_pollset(exec_ctx, args->pollset_set, args->pollset); + grpc_pollset_set_add_pollset(args->pollset_set, args->pollset); args->addrs = nullptr; gpr_atm_rel_store(&args->done_atm, 0); } -void args_finish(grpc_exec_ctx* exec_ctx, args_struct* args) { +void args_finish(args_struct* args) { GPR_ASSERT(gpr_event_wait(&args->ev, test_deadline())); grpc_resolved_addresses_destroy(args->addrs); - grpc_pollset_set_del_pollset(exec_ctx, args->pollset_set, args->pollset); - grpc_pollset_set_destroy(exec_ctx, args->pollset_set); + grpc_pollset_set_del_pollset(args->pollset_set, args->pollset); + grpc_pollset_set_destroy(args->pollset_set); grpc_closure do_nothing_cb; GRPC_CLOSURE_INIT(&do_nothing_cb, do_nothing, nullptr, grpc_schedule_on_exec_ctx); gpr_mu_lock(args->mu); - grpc_pollset_shutdown(exec_ctx, args->pollset, &do_nothing_cb); + grpc_pollset_shutdown(args->pollset, &do_nothing_cb); gpr_mu_unlock(args->mu); // exec_ctx needs to be flushed before calling grpc_pollset_destroy() - grpc_exec_ctx_flush(exec_ctx); - grpc_pollset_destroy(exec_ctx, args->pollset); + grpc_core::ExecCtx::Get()->Flush(); + grpc_pollset_destroy(args->pollset); gpr_free(args->pollset); } @@ -74,119 +74,109 @@ static grpc_millis n_sec_deadline(int seconds) { } static void poll_pollset_until_request_done(args_struct* args) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_millis deadline = n_sec_deadline(10); while (true) { bool done = gpr_atm_acq_load(&args->done_atm) != 0; if (done) { break; } - grpc_millis time_left = deadline - grpc_exec_ctx_now(&exec_ctx); + grpc_millis time_left = deadline - grpc_core::ExecCtx::Get()->Now(); gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRIdPTR, done, time_left); GPR_ASSERT(time_left >= 0); grpc_pollset_worker* worker = nullptr; gpr_mu_lock(args->mu); - GRPC_LOG_IF_ERROR("pollset_work", - grpc_pollset_work(&exec_ctx, args->pollset, &worker, - n_sec_deadline(1))); + GRPC_LOG_IF_ERROR("pollset_work", grpc_pollset_work(args->pollset, &worker, + n_sec_deadline(1))); gpr_mu_unlock(args->mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); } gpr_event_set(&args->ev, (void*)1); - grpc_exec_ctx_finish(&exec_ctx); } -static void must_succeed(grpc_exec_ctx* exec_ctx, void* argsp, - grpc_error* err) { +static void must_succeed(void* argsp, grpc_error* err) { args_struct* args = static_cast(argsp); GPR_ASSERT(err == GRPC_ERROR_NONE); GPR_ASSERT(args->addrs != nullptr); GPR_ASSERT(args->addrs->naddrs > 0); gpr_atm_rel_store(&args->done_atm, 1); gpr_mu_lock(args->mu); - GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, args->pollset, nullptr)); + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(args->pollset, nullptr)); gpr_mu_unlock(args->mu); } -static void must_fail(grpc_exec_ctx* exec_ctx, void* argsp, grpc_error* err) { +static void must_fail(void* argsp, grpc_error* err) { args_struct* args = static_cast(argsp); GPR_ASSERT(err != GRPC_ERROR_NONE); gpr_atm_rel_store(&args->done_atm, 1); gpr_mu_lock(args->mu); - GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, args->pollset, nullptr)); + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(args->pollset, nullptr)); gpr_mu_unlock(args->mu); } static void test_localhost(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; args_struct args; - args_init(&exec_ctx, &args); + args_init(&args); grpc_resolve_address( - &exec_ctx, "localhost:1", nullptr, args.pollset_set, + "localhost:1", nullptr, args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); - args_finish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + args_finish(&args); } static void test_default_port(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; args_struct args; - args_init(&exec_ctx, &args); + args_init(&args); grpc_resolve_address( - &exec_ctx, "localhost", "1", args.pollset_set, + "localhost", "1", args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); - args_finish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + args_finish(&args); } static void test_non_numeric_default_port(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; args_struct args; - args_init(&exec_ctx, &args); + args_init(&args); grpc_resolve_address( - &exec_ctx, "localhost", "https", args.pollset_set, + "localhost", "https", args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); - args_finish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + args_finish(&args); } static void test_missing_default_port(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; args_struct args; - args_init(&exec_ctx, &args); + args_init(&args); grpc_resolve_address( - &exec_ctx, "localhost", nullptr, args.pollset_set, + "localhost", nullptr, args.pollset_set, GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); - args_finish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + args_finish(&args); } static void test_ipv6_with_port(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; args_struct args; - args_init(&exec_ctx, &args); + args_init(&args); grpc_resolve_address( - &exec_ctx, "[2001:db8::1]:1", nullptr, args.pollset_set, + "[2001:db8::1]:1", nullptr, args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); - args_finish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + args_finish(&args); } static void test_ipv6_without_port(void) { @@ -197,17 +187,16 @@ static void test_ipv6_without_port(void) { }; unsigned i; for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; args_struct args; - args_init(&exec_ctx, &args); + args_init(&args); grpc_resolve_address( - &exec_ctx, kCases[i], "80", args.pollset_set, + kCases[i], "80", args.pollset_set, GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); - args_finish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + args_finish(&args); } } @@ -218,17 +207,16 @@ static void test_invalid_ip_addresses(void) { }; unsigned i; for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; args_struct args; - args_init(&exec_ctx, &args); + args_init(&args); grpc_resolve_address( - &exec_ctx, kCases[i], nullptr, args.pollset_set, + kCases[i], nullptr, args.pollset_set, GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); - args_finish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + args_finish(&args); } } @@ -238,34 +226,35 @@ static void test_unparseable_hostports(void) { }; unsigned i; for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; args_struct args; - args_init(&exec_ctx, &args); + args_init(&args); grpc_resolve_address( - &exec_ctx, kCases[i], "1", args.pollset_set, + kCases[i], "1", args.pollset_set, GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx), &args.addrs); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); poll_pollset_until_request_done(&args); - args_finish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + args_finish(&args); } } int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - test_localhost(); - test_default_port(); - test_non_numeric_default_port(); - test_missing_default_port(); - test_ipv6_with_port(); - test_ipv6_without_port(); - test_invalid_ip_addresses(); - test_unparseable_hostports(); - grpc_executor_shutdown(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + { + grpc_core::ExecCtx exec_ctx; + test_localhost(); + test_default_port(); + test_non_numeric_default_port(); + test_missing_default_port(); + test_ipv6_with_port(); + test_ipv6_without_port(); + test_invalid_ip_addresses(); + test_unparseable_hostports(); + grpc_executor_shutdown(); + } + grpc_shutdown(); return 0; } diff --git a/test/core/iomgr/resource_quota_test.cc b/test/core/iomgr/resource_quota_test.cc index 6851702e678..ae26f72701b 100644 --- a/test/core/iomgr/resource_quota_test.cc +++ b/test/core/iomgr/resource_quota_test.cc @@ -27,7 +27,7 @@ gpr_mu g_mu; gpr_cv g_cv; -static void inc_int_cb(grpc_exec_ctx* exec_ctx, void* a, grpc_error* error) { +static void inc_int_cb(void* a, grpc_error* error) { gpr_mu_lock(&g_mu); ++*(int*)a; gpr_cv_signal(&g_cv); @@ -43,7 +43,7 @@ static void assert_counter_becomes(int* ctr, int value) { gpr_mu_unlock(&g_mu); } -static void set_event_cb(grpc_exec_ctx* exec_ctx, void* a, grpc_error* error) { +static void set_event_cb(void* a, grpc_error* error) { gpr_event_set((gpr_event*)a, (void*)1); } grpc_closure* set_event(gpr_event* ev) { @@ -56,13 +56,12 @@ typedef struct { grpc_closure* then; } reclaimer_args; -static void reclaimer_cb(grpc_exec_ctx* exec_ctx, void* args, - grpc_error* error) { +static void reclaimer_cb(void* args, grpc_error* error) { GPR_ASSERT(error == GRPC_ERROR_NONE); reclaimer_args* a = static_cast(args); - grpc_resource_user_free(exec_ctx, a->resource_user, a->size); - grpc_resource_user_finish_reclamation(exec_ctx, a->resource_user); - GRPC_CLOSURE_RUN(exec_ctx, a->then, GRPC_ERROR_NONE); + grpc_resource_user_free(a->resource_user, a->size); + grpc_resource_user_finish_reclamation(a->resource_user); + GRPC_CLOSURE_RUN(a->then, GRPC_ERROR_NONE); gpr_free(a); } @@ -75,10 +74,9 @@ grpc_closure* make_reclaimer(grpc_resource_user* resource_user, size_t size, return GRPC_CLOSURE_CREATE(reclaimer_cb, a, grpc_schedule_on_exec_ctx); } -static void unused_reclaimer_cb(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void unused_reclaimer_cb(void* arg, grpc_error* error) { GPR_ASSERT(error == GRPC_ERROR_CANCELLED); - GRPC_CLOSURE_RUN(exec_ctx, static_cast(arg), GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN(static_cast(arg), GRPC_ERROR_NONE); } grpc_closure* make_unused_reclaimer(grpc_closure* then) { return GRPC_CLOSURE_CREATE(unused_reclaimer_cb, then, @@ -86,9 +84,8 @@ grpc_closure* make_unused_reclaimer(grpc_closure* then) { } static void destroy_user(grpc_resource_user* usr) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_unref(&exec_ctx, usr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_unref(usr); } static void test_no_op(void) { @@ -120,14 +117,12 @@ static void test_instant_alloc_then_free(void) { grpc_resource_quota_resize(q, 1024 * 1024); grpc_resource_user* usr = grpc_resource_user_create(q, "usr"); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, nullptr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr, 1024, NULL); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -140,10 +135,9 @@ static void test_instant_alloc_free_pair(void) { grpc_resource_quota_resize(q, 1024 * 1024); grpc_resource_user* usr = grpc_resource_user_create(q, "usr"); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, nullptr); - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr, 1024, NULL); + grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -158,16 +152,15 @@ static void test_simple_async_alloc(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr, 1024, set_event(&ev)); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -182,9 +175,9 @@ static void test_async_alloc_blocked_by_size(void) { gpr_event ev; gpr_event_init(&ev); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr, 1024, set_event(&ev)); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait( &ev, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); } @@ -193,9 +186,8 @@ static void test_async_alloc_blocked_by_size(void) { nullptr); ; { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -210,32 +202,30 @@ static void test_scavenge(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr1, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr1, 1024); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_free(usr1, 1024); } { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr2, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr2, 1024); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_free(usr2, 1024); } grpc_resource_quota_unref(q); destroy_user(usr1); @@ -251,33 +241,32 @@ static void test_scavenge_blocked(void) { gpr_event ev; { gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr1, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; } { gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr2, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait( &ev, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr1, 1024); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_free(usr1, 1024); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr2, 1024); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_free(usr2, 1024); } grpc_resource_quota_unref(q); destroy_user(usr1); @@ -293,9 +282,9 @@ static void test_blocked_until_scheduled_reclaim(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr, 1024, set_event(&ev)); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; @@ -303,18 +292,16 @@ static void test_blocked_until_scheduled_reclaim(void) { gpr_event reclaim_done; gpr_event_init(&reclaim_done); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_post_reclaimer( - &exec_ctx, usr, false, - make_reclaimer(usr, 1024, set_event(&reclaim_done))); - grpc_exec_ctx_finish(&exec_ctx); + usr, false, make_reclaimer(usr, 1024, set_event(&reclaim_done))); } { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr, 1024, set_event(&ev)); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&reclaim_done, grpc_timeout_seconds_to_deadline(5)) != nullptr); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -322,9 +309,8 @@ static void test_blocked_until_scheduled_reclaim(void) { ; } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -340,9 +326,9 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr1, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr1, 1024, set_event(&ev)); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; @@ -350,18 +336,16 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) { gpr_event reclaim_done; gpr_event_init(&reclaim_done); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_post_reclaimer( - &exec_ctx, usr1, false, - make_reclaimer(usr1, 1024, set_event(&reclaim_done))); - grpc_exec_ctx_finish(&exec_ctx); + usr1, false, make_reclaimer(usr1, 1024, set_event(&reclaim_done))); } { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr2, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr2, 1024, set_event(&ev)); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&reclaim_done, grpc_timeout_seconds_to_deadline(5)) != nullptr); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -369,9 +353,8 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) { ; } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr2, 1024); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_free(usr2, 1024); } grpc_resource_quota_unref(q); destroy_user(usr1); @@ -387,9 +370,9 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr, 1024, set_event(&ev)); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; @@ -397,18 +380,16 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) { gpr_event reclaim_done; gpr_event_init(&reclaim_done); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_post_reclaimer( - &exec_ctx, usr, true, - make_reclaimer(usr, 1024, set_event(&reclaim_done))); - grpc_exec_ctx_finish(&exec_ctx); + usr, true, make_reclaimer(usr, 1024, set_event(&reclaim_done))); } { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr, 1024, set_event(&ev)); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&reclaim_done, grpc_timeout_seconds_to_deadline(5)) != nullptr); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != @@ -416,9 +397,8 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) { ; } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -435,13 +415,12 @@ static void test_unused_reclaim_is_cancelled(void) { gpr_event destructive_done; gpr_event_init(&destructive_done); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_post_reclaimer( - &exec_ctx, usr, false, make_unused_reclaimer(set_event(&benign_done))); + usr, false, make_unused_reclaimer(set_event(&benign_done))); grpc_resource_user_post_reclaimer( - &exec_ctx, usr, true, - make_unused_reclaimer(set_event(&destructive_done))); - grpc_exec_ctx_finish(&exec_ctx); + usr, true, make_unused_reclaimer(set_event(&destructive_done))); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); @@ -470,22 +449,20 @@ static void test_benign_reclaim_is_preferred(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr, 1024, set_event(&ev)); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_post_reclaimer( - &exec_ctx, usr, false, - make_reclaimer(usr, 1024, set_event(&benign_done))); + usr, false, make_reclaimer(usr, 1024, set_event(&benign_done))); grpc_resource_user_post_reclaimer( - &exec_ctx, usr, true, - make_unused_reclaimer(set_event(&destructive_done))); - grpc_exec_ctx_finish(&exec_ctx); + usr, true, make_unused_reclaimer(set_event(&destructive_done))); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); @@ -496,9 +473,9 @@ static void test_benign_reclaim_is_preferred(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr, 1024, set_event(&ev)); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_seconds_to_deadline(5)) != nullptr); GPR_ASSERT(gpr_event_wait(&destructive_done, @@ -508,9 +485,8 @@ static void test_benign_reclaim_is_preferred(void) { nullptr); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -533,22 +509,20 @@ static void test_multiple_reclaims_can_be_triggered(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr, 1024, set_event(&ev)); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) != nullptr); ; } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_post_reclaimer( - &exec_ctx, usr, false, - make_reclaimer(usr, 512, set_event(&benign_done))); + usr, false, make_reclaimer(usr, 512, set_event(&benign_done))); grpc_resource_user_post_reclaimer( - &exec_ctx, usr, true, - make_reclaimer(usr, 512, set_event(&destructive_done))); - grpc_exec_ctx_finish(&exec_ctx); + usr, true, make_reclaimer(usr, 512, set_event(&destructive_done))); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); @@ -559,9 +533,9 @@ static void test_multiple_reclaims_can_be_triggered(void) { { gpr_event ev; gpr_event_init(&ev); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&ev)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr, 1024, set_event(&ev)); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&benign_done, grpc_timeout_seconds_to_deadline(5)) != nullptr); GPR_ASSERT(gpr_event_wait(&destructive_done, @@ -571,9 +545,8 @@ static void test_multiple_reclaims_can_be_triggered(void) { ; } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_free(usr, 1024); } grpc_resource_quota_unref(q); destroy_user(usr); @@ -591,20 +564,17 @@ static void test_resource_user_stays_allocated_until_memory_released(void) { grpc_resource_quota_resize(q, 1024 * 1024); grpc_resource_user* usr = grpc_resource_user_create(q, "usr"); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, nullptr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr, 1024, NULL); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resource_quota_unref(q); - grpc_resource_user_unref(&exec_ctx, usr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_resource_user_unref(usr); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_free(usr, 1024); } } @@ -624,11 +594,10 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( gpr_event reclaimer_cancelled; gpr_event_init(&reclaimer_cancelled); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_post_reclaimer( - &exec_ctx, usr, false, - make_unused_reclaimer(set_event(&reclaimer_cancelled))); - grpc_exec_ctx_finish(&exec_ctx); + usr, false, make_unused_reclaimer(set_event(&reclaimer_cancelled))); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); @@ -636,27 +605,27 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released( { gpr_event allocated; gpr_event_init(&allocated); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&allocated)); - grpc_exec_ctx_finish(&exec_ctx); - GPR_ASSERT(gpr_event_wait(&allocated, grpc_timeout_seconds_to_deadline( - 5)) != nullptr); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); + grpc_core::ExecCtx::Get()->Flush(); + GPR_ASSERT(gpr_event_wait(&allocated, + grpc_timeout_seconds_to_deadline(5)) != NULL); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_unref(&exec_ctx, usr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_unref(usr); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_free(usr, 1024); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled, grpc_timeout_seconds_to_deadline(5)) != nullptr); @@ -674,9 +643,9 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { { gpr_event allocated; gpr_event_init(&allocated); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&allocated)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&allocated, grpc_timeout_seconds_to_deadline(5)) != nullptr); } @@ -684,11 +653,10 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { gpr_event reclaimer_done; gpr_event_init(&reclaimer_done); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resource_user_post_reclaimer( - &exec_ctx, usr, false, - make_reclaimer(usr, 1024, set_event(&reclaimer_done))); - grpc_exec_ctx_finish(&exec_ctx); + usr, false, make_reclaimer(usr, 1024, set_event(&reclaimer_done))); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(gpr_event_wait(&reclaimer_done, grpc_timeout_milliseconds_to_deadline(100)) == nullptr); @@ -696,20 +664,19 @@ static void test_reclaimers_can_be_posted_repeatedly(void) { { gpr_event allocated; gpr_event_init(&allocated); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc(&exec_ctx, usr, 1024, set_event(&allocated)); - grpc_exec_ctx_finish(&exec_ctx); - GPR_ASSERT(gpr_event_wait(&allocated, grpc_timeout_seconds_to_deadline( - 5)) != nullptr); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc(usr, 1024, set_event(&allocated)); + grpc_core::ExecCtx::Get()->Flush(); + GPR_ASSERT(gpr_event_wait(&allocated, + grpc_timeout_seconds_to_deadline(5)) != NULL); GPR_ASSERT(gpr_event_wait(&reclaimer_done, grpc_timeout_seconds_to_deadline(5)) != nullptr); } } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_free(&exec_ctx, usr, 1024); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_free(usr, 1024); } destroy_user(usr); grpc_resource_quota_unref(q); @@ -732,16 +699,15 @@ static void test_one_slice(void) { { const int start_allocs = num_allocs; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc_slices(&exec_ctx, &alloc, 1024, 1, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); + grpc_core::ExecCtx::Get()->Flush(); assert_counter_becomes(&num_allocs, start_allocs + 1); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_slice_buffer_destroy_internal(&buffer); } destroy_user(usr); grpc_resource_quota_unref(q); @@ -765,23 +731,21 @@ static void test_one_slice_deleted_late(void) { { const int start_allocs = num_allocs; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc_slices(&exec_ctx, &alloc, 1024, 1, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); + grpc_core::ExecCtx::Get()->Flush(); assert_counter_becomes(&num_allocs, start_allocs + 1); } { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_unref(&exec_ctx, usr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_unref(usr); } grpc_resource_quota_unref(q); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_slice_buffer_destroy_internal(&buffer); } } @@ -809,9 +773,9 @@ static void test_negative_rq_free_pool(void) { { const int start_allocs = num_allocs; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_alloc_slices(&exec_ctx, &alloc, 1024, 1, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer); + grpc_core::ExecCtx::Get()->Flush(); assert_counter_becomes(&num_allocs, start_allocs + 1); } @@ -822,16 +786,14 @@ static void test_negative_rq_free_pool(void) { GPR_ASSERT(grpc_resource_quota_get_memory_pressure(q) > 1 - eps); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resource_user_unref(&exec_ctx, usr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_resource_user_unref(usr); } grpc_resource_quota_unref(q); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_slice_buffer_destroy_internal(&buffer); } } diff --git a/test/core/iomgr/tcp_client_posix_test.cc b/test/core/iomgr/tcp_client_posix_test.cc index 9fb1a2d770b..40a050ed9f6 100644 --- a/test/core/iomgr/tcp_client_posix_test.cc +++ b/test/core/iomgr/tcp_client_posix_test.cc @@ -53,26 +53,24 @@ static grpc_millis test_deadline(void) { static void finish_connection() { gpr_mu_lock(g_mu); g_connections_complete++; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_kick", grpc_pollset_kick(&exec_ctx, g_pollset, nullptr))); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); + gpr_mu_unlock(g_mu); } -static void must_succeed(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void must_succeed(void* arg, grpc_error* error) { GPR_ASSERT(g_connecting != nullptr); GPR_ASSERT(error == GRPC_ERROR_NONE); - grpc_endpoint_shutdown( - exec_ctx, g_connecting, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("must_succeed called")); - grpc_endpoint_destroy(exec_ctx, g_connecting); + grpc_endpoint_shutdown(g_connecting, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "must_succeed called")); + grpc_endpoint_destroy(g_connecting); g_connecting = nullptr; finish_connection(); } -static void must_fail(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void must_fail(void* arg, grpc_error* error) { GPR_ASSERT(g_connecting == nullptr); GPR_ASSERT(error != GRPC_ERROR_NONE); finish_connection(); @@ -85,7 +83,7 @@ void test_succeeds(void) { int r; int connections_complete_before; grpc_closure done; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_DEBUG, "test_succeeds"); @@ -108,8 +106,8 @@ void test_succeeds(void) { GPR_ASSERT(getsockname(svr_fd, (struct sockaddr*)addr, (socklen_t*)&resolved_addr.len) == 0); GRPC_CLOSURE_INIT(&done, must_succeed, nullptr, grpc_schedule_on_exec_ctx); - grpc_tcp_client_connect(&exec_ctx, &done, &g_connecting, g_pollset_set, - nullptr, &resolved_addr, GRPC_MILLIS_INF_FUTURE); + grpc_tcp_client_connect(&done, &g_connecting, g_pollset_set, nullptr, + &resolved_addr, GRPC_MILLIS_INF_FUTURE); /* await the connection */ do { @@ -125,17 +123,15 @@ void test_succeeds(void) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(&exec_ctx, g_pollset, &worker, + grpc_pollset_work(g_pollset, &worker, grpc_timespec_to_millis_round_up( grpc_timeout_seconds_to_deadline(5))))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); - - grpc_exec_ctx_finish(&exec_ctx); } void test_fails(void) { @@ -143,7 +139,7 @@ void test_fails(void) { struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; int connections_complete_before; grpc_closure done; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_DEBUG, "test_fails"); @@ -157,8 +153,8 @@ void test_fails(void) { /* connect to a broken address */ GRPC_CLOSURE_INIT(&done, must_fail, nullptr, grpc_schedule_on_exec_ctx); - grpc_tcp_client_connect(&exec_ctx, &done, &g_connecting, g_pollset_set, - nullptr, &resolved_addr, GRPC_MILLIS_INF_FUTURE); + grpc_tcp_client_connect(&done, &g_connecting, g_pollset_set, nullptr, + &resolved_addr, GRPC_MILLIS_INF_FUTURE); gpr_mu_lock(g_mu); @@ -166,7 +162,7 @@ void test_fails(void) { while (g_connections_complete == connections_complete_before) { grpc_pollset_worker* worker = nullptr; grpc_millis polling_deadline = test_deadline(); - switch (grpc_timer_check(&exec_ctx, &polling_deadline)) { + switch (grpc_timer_check(&polling_deadline)) { case GRPC_TIMERS_FIRED: break; case GRPC_TIMERS_NOT_CHECKED: @@ -174,42 +170,43 @@ void test_fails(void) { /* fall through */ case GRPC_TIMERS_CHECKED_AND_EMPTY: GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(&exec_ctx, g_pollset, &worker, - polling_deadline))); + "pollset_work", + grpc_pollset_work(g_pollset, &worker, polling_deadline))); break; } gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); } -static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, - grpc_error* error) { - grpc_pollset_destroy(exec_ctx, static_cast(p)); +static void destroy_pollset(void* p, grpc_error* error) { + grpc_pollset_destroy(static_cast(p)); } int main(int argc, char** argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); - g_pollset_set = grpc_pollset_set_create(); - g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); - grpc_pollset_init(g_pollset, &g_mu); - grpc_pollset_set_add_pollset(&exec_ctx, g_pollset_set, g_pollset); - grpc_exec_ctx_finish(&exec_ctx); - test_succeeds(); - gpr_log(GPR_ERROR, "End of first test"); - test_fails(); - grpc_pollset_set_destroy(&exec_ctx, g_pollset_set); - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); - grpc_exec_ctx_finish(&exec_ctx); + + { + grpc_core::ExecCtx exec_ctx; + g_pollset_set = grpc_pollset_set_create(); + g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); + grpc_pollset_init(g_pollset, &g_mu); + grpc_pollset_set_add_pollset(g_pollset_set, g_pollset); + + test_succeeds(); + gpr_log(GPR_ERROR, "End of first test"); + test_fails(); + grpc_pollset_set_destroy(g_pollset_set); + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + } + grpc_shutdown(); gpr_free(g_pollset); return 0; diff --git a/test/core/iomgr/tcp_client_uv_test.cc b/test/core/iomgr/tcp_client_uv_test.cc index 101d7bf6b5c..0c6250ed7f5 100644 --- a/test/core/iomgr/tcp_client_uv_test.cc +++ b/test/core/iomgr/tcp_client_uv_test.cc @@ -46,30 +46,28 @@ static grpc_millis test_deadline(void) { return grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(10)); } -static void finish_connection(grpc_exec_ctx* exec_ctx) { +static void finish_connection() { gpr_mu_lock(g_mu); g_connections_complete++; - GPR_ASSERT(GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, g_pollset, NULL))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); gpr_mu_unlock(g_mu); } -static void must_succeed(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void must_succeed(void* arg, grpc_error* error) { GPR_ASSERT(g_connecting != NULL); GPR_ASSERT(error == GRPC_ERROR_NONE); - grpc_endpoint_shutdown( - exec_ctx, g_connecting, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("must_succeed called")); - grpc_endpoint_destroy(exec_ctx, g_connecting); + grpc_endpoint_shutdown(g_connecting, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "must_succeed called")); + grpc_endpoint_destroy(g_connecting); g_connecting = NULL; - finish_connection(exec_ctx); + finish_connection(); } -static void must_fail(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void must_fail(void* arg, grpc_error* error) { GPR_ASSERT(g_connecting == NULL); GPR_ASSERT(error != GRPC_ERROR_NONE); - finish_connection(exec_ctx); + finish_connection(); } static void close_cb(uv_handle_t* handle) { gpr_free(handle); } @@ -89,7 +87,7 @@ void test_succeeds(void) { uv_tcp_t* svr_handle = static_cast(gpr_malloc(sizeof(uv_tcp_t))); int connections_complete_before; grpc_closure done; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_DEBUG, "test_succeeds"); @@ -110,8 +108,8 @@ void test_succeeds(void) { GPR_ASSERT(uv_tcp_getsockname(svr_handle, (struct sockaddr*)addr, (int*)&resolved_addr.len) == 0); GRPC_CLOSURE_INIT(&done, must_succeed, NULL, grpc_schedule_on_exec_ctx); - grpc_tcp_client_connect(&exec_ctx, &done, &g_connecting, NULL, NULL, - &resolved_addr, GRPC_MILLIS_INF_FUTURE); + grpc_tcp_client_connect(&done, &g_connecting, NULL, NULL, &resolved_addr, + GRPC_MILLIS_INF_FUTURE); gpr_mu_lock(g_mu); @@ -119,11 +117,11 @@ void test_succeeds(void) { grpc_pollset_worker* worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(&exec_ctx, g_pollset, &worker, + grpc_pollset_work(g_pollset, &worker, grpc_timespec_to_millis_round_up( grpc_timeout_seconds_to_deadline(5))))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } @@ -131,8 +129,6 @@ void test_succeeds(void) { uv_close((uv_handle_t*)svr_handle, close_cb); gpr_mu_unlock(g_mu); - - grpc_exec_ctx_finish(&exec_ctx); } void test_fails(void) { @@ -140,7 +136,7 @@ void test_fails(void) { struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; int connections_complete_before; grpc_closure done; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_DEBUG, "test_fails"); @@ -154,8 +150,8 @@ void test_fails(void) { /* connect to a broken address */ GRPC_CLOSURE_INIT(&done, must_fail, NULL, grpc_schedule_on_exec_ctx); - grpc_tcp_client_connect(&exec_ctx, &done, &g_connecting, NULL, NULL, - &resolved_addr, GRPC_MILLIS_INF_FUTURE); + grpc_tcp_client_connect(&done, &g_connecting, NULL, NULL, &resolved_addr, + GRPC_MILLIS_INF_FUTURE); gpr_mu_lock(g_mu); @@ -164,7 +160,7 @@ void test_fails(void) { grpc_pollset_worker* worker = NULL; gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); grpc_millis polling_deadline = test_deadline(); - switch (grpc_timer_check(&exec_ctx, &polling_deadline)) { + switch (grpc_timer_check(&polling_deadline)) { case GRPC_TIMERS_FIRED: break; case GRPC_TIMERS_NOT_CHECKED: @@ -172,39 +168,37 @@ void test_fails(void) { /* fall through */ case GRPC_TIMERS_CHECKED_AND_EMPTY: GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(&exec_ctx, g_pollset, &worker, - polling_deadline))); + "pollset_work", + grpc_pollset_work(g_pollset, &worker, polling_deadline))); break; } gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); } -static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, - grpc_error* error) { - grpc_pollset_destroy(exec_ctx, static_cast(p)); +static void destroy_pollset(void* p, grpc_error* error) { + grpc_pollset_destroy(static_cast(p)); } int main(int argc, char** argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_test_init(argc, argv); grpc_init(); g_pollset = static_cast(gpr_malloc(grpc_pollset_size())); grpc_pollset_init(g_pollset, &g_mu); - grpc_exec_ctx_finish(&exec_ctx); + test_succeeds(); gpr_log(GPR_ERROR, "End of first test"); test_fails(); GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); - grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + grpc_shutdown(); gpr_free(g_pollset); return 0; diff --git a/test/core/iomgr/tcp_posix_test.cc b/test/core/iomgr/tcp_posix_test.cc index 7986dc2b198..f4acba83025 100644 --- a/test/core/iomgr/tcp_posix_test.cc +++ b/test/core/iomgr/tcp_posix_test.cc @@ -131,8 +131,7 @@ static size_t count_slices(grpc_slice* slices, size_t nslices, return num_bytes; } -static void read_cb(grpc_exec_ctx* exec_ctx, void* user_data, - grpc_error* error) { +static void read_cb(void* user_data, grpc_error* error) { struct read_socket_state* state = (struct read_socket_state*)user_data; size_t read_bytes; int current_data; @@ -147,11 +146,11 @@ static void read_cb(grpc_exec_ctx* exec_ctx, void* user_data, gpr_log(GPR_INFO, "Read %" PRIuPTR " bytes of %" PRIuPTR, read_bytes, state->target_read_bytes); if (state->read_bytes >= state->target_read_bytes) { - GPR_ASSERT(GRPC_LOG_IF_ERROR( - "kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("kick", grpc_pollset_kick(g_pollset, nullptr))); gpr_mu_unlock(g_mu); } else { - grpc_endpoint_read(exec_ctx, state->ep, &state->incoming, &state->read_cb); + grpc_endpoint_read(state->ep, &state->incoming, &state->read_cb); gpr_mu_unlock(g_mu); } } @@ -164,7 +163,7 @@ static void read_test(size_t num_bytes, size_t slice_size) { size_t written_bytes; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_INFO, "Read test of size %" PRIuPTR ", slice size %" PRIuPTR, num_bytes, slice_size); @@ -175,9 +174,8 @@ static void read_test(size_t num_bytes, size_t slice_size) { a[0].key = const_cast(GRPC_ARG_TCP_READ_CHUNK_SIZE); a[0].type = GRPC_ARG_INTEGER, a[0].value.integer = (int)slice_size; grpc_channel_args args = {GPR_ARRAY_SIZE(a), a}; - ep = grpc_tcp_create(&exec_ctx, grpc_fd_create(sv[1], "read_test"), &args, - "test"); - grpc_endpoint_add_to_pollset(&exec_ctx, ep, g_pollset); + ep = grpc_tcp_create(grpc_fd_create(sv[1], "read_test"), &args, "test"); + grpc_endpoint_add_to_pollset(ep, g_pollset); written_bytes = fill_socket_partial(sv[0], num_bytes); gpr_log(GPR_INFO, "Wrote %" PRIuPTR " bytes", written_bytes); @@ -188,24 +186,22 @@ static void read_test(size_t num_bytes, size_t slice_size) { grpc_slice_buffer_init(&state.incoming); GRPC_CLOSURE_INIT(&state.read_cb, read_cb, &state, grpc_schedule_on_exec_ctx); - grpc_endpoint_read(&exec_ctx, ep, &state.incoming, &state.read_cb); + grpc_endpoint_read(ep, &state.incoming, &state.read_cb); gpr_mu_lock(g_mu); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); + "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(g_mu); } GPR_ASSERT(state.read_bytes == state.target_read_bytes); gpr_mu_unlock(g_mu); - grpc_slice_buffer_destroy_internal(&exec_ctx, &state.incoming); - grpc_endpoint_destroy(&exec_ctx, ep); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_buffer_destroy_internal(&state.incoming); + grpc_endpoint_destroy(ep); } /* Write to a socket until it fills up, then read from it using the grpc_tcp @@ -217,7 +213,7 @@ static void large_read_test(size_t slice_size) { ssize_t written_bytes; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_INFO, "Start large read test, slice size %" PRIuPTR, slice_size); @@ -228,9 +224,8 @@ static void large_read_test(size_t slice_size) { a[0].type = GRPC_ARG_INTEGER; a[0].value.integer = (int)slice_size; grpc_channel_args args = {GPR_ARRAY_SIZE(a), a}; - ep = grpc_tcp_create(&exec_ctx, grpc_fd_create(sv[1], "large_read_test"), - &args, "test"); - grpc_endpoint_add_to_pollset(&exec_ctx, ep, g_pollset); + ep = grpc_tcp_create(grpc_fd_create(sv[1], "large_read_test"), &args, "test"); + grpc_endpoint_add_to_pollset(ep, g_pollset); written_bytes = fill_socket(sv[0]); gpr_log(GPR_INFO, "Wrote %" PRIuPTR " bytes", written_bytes); @@ -241,24 +236,22 @@ static void large_read_test(size_t slice_size) { grpc_slice_buffer_init(&state.incoming); GRPC_CLOSURE_INIT(&state.read_cb, read_cb, &state, grpc_schedule_on_exec_ctx); - grpc_endpoint_read(&exec_ctx, ep, &state.incoming, &state.read_cb); + grpc_endpoint_read(ep, &state.incoming, &state.read_cb); gpr_mu_lock(g_mu); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); + "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(g_mu); } GPR_ASSERT(state.read_bytes == state.target_read_bytes); gpr_mu_unlock(g_mu); - grpc_slice_buffer_destroy_internal(&exec_ctx, &state.incoming); - grpc_endpoint_destroy(&exec_ctx, ep); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_buffer_destroy_internal(&state.incoming); + grpc_endpoint_destroy(ep); } struct write_socket_state { @@ -289,16 +282,15 @@ static grpc_slice* allocate_blocks(size_t num_bytes, size_t slice_size, return slices; } -static void write_done(grpc_exec_ctx* exec_ctx, - void* user_data /* write_socket_state */, +static void write_done(void* user_data /* write_socket_state */, grpc_error* error) { struct write_socket_state* state = (struct write_socket_state*)user_data; gpr_log(GPR_INFO, "Write done callback called"); gpr_mu_lock(g_mu); gpr_log(GPR_INFO, "Signalling write done"); state->write_done = 1; - GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); gpr_mu_unlock(g_mu); } @@ -309,7 +301,7 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { int flags; int current = 0; int i; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; flags = fcntl(fd, F_GETFL, 0); GPR_ASSERT(fcntl(fd, F_SETFL, flags & ~O_NONBLOCK) == 0); @@ -319,11 +311,11 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { gpr_mu_lock(g_mu); GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(&exec_ctx, g_pollset, &worker, + grpc_pollset_work(g_pollset, &worker, grpc_timespec_to_millis_round_up( grpc_timeout_milliseconds_to_deadline(10))))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + do { bytes_read = read(fd, buf, bytes_left > read_size ? read_size : bytes_left); @@ -356,7 +348,7 @@ static void write_test(size_t num_bytes, size_t slice_size) { grpc_closure write_done_closure; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_INFO, "Start write test with %" PRIuPTR " bytes, slice size %" PRIuPTR, @@ -368,9 +360,8 @@ static void write_test(size_t num_bytes, size_t slice_size) { a[0].key = const_cast(GRPC_ARG_TCP_READ_CHUNK_SIZE); a[0].type = GRPC_ARG_INTEGER, a[0].value.integer = (int)slice_size; grpc_channel_args args = {GPR_ARRAY_SIZE(a), a}; - ep = grpc_tcp_create(&exec_ctx, grpc_fd_create(sv[1], "write_test"), &args, - "test"); - grpc_endpoint_add_to_pollset(&exec_ctx, ep, g_pollset); + ep = grpc_tcp_create(grpc_fd_create(sv[1], "write_test"), &args, "test"); + grpc_endpoint_add_to_pollset(ep, g_pollset); state.ep = ep; state.write_done = 0; @@ -382,7 +373,7 @@ static void write_test(size_t num_bytes, size_t slice_size) { GRPC_CLOSURE_INIT(&write_done_closure, write_done, &state, grpc_schedule_on_exec_ctx); - grpc_endpoint_write(&exec_ctx, ep, &outgoing, &write_done_closure); + grpc_endpoint_write(ep, &outgoing, &write_done_closure); drain_socket_blocking(sv[0], num_bytes, num_bytes); gpr_mu_lock(g_mu); for (;;) { @@ -391,25 +382,23 @@ static void write_test(size_t num_bytes, size_t slice_size) { break; } GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); + "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(g_mu); } gpr_mu_unlock(g_mu); - grpc_slice_buffer_destroy_internal(&exec_ctx, &outgoing); - grpc_endpoint_destroy(&exec_ctx, ep); + grpc_slice_buffer_destroy_internal(&outgoing); + grpc_endpoint_destroy(ep); gpr_free(slices); - grpc_exec_ctx_finish(&exec_ctx); } -void on_fd_released(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* errors) { +void on_fd_released(void* arg, grpc_error* errors) { int* done = (int*)arg; *done = 1; - GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); } /* Do a read_test, then release fd and try to read/write again. Verify that @@ -422,7 +411,7 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { int fd; grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(20)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_closure fd_released_cb; int fd_released_done = 0; GRPC_CLOSURE_INIT(&fd_released_cb, &on_fd_released, &fd_released_done, @@ -439,10 +428,9 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { a[0].type = GRPC_ARG_INTEGER; a[0].value.integer = (int)slice_size; grpc_channel_args args = {GPR_ARRAY_SIZE(a), a}; - ep = grpc_tcp_create(&exec_ctx, grpc_fd_create(sv[1], "read_test"), &args, - "test"); + ep = grpc_tcp_create(grpc_fd_create(sv[1], "read_test"), &args, "test"); GPR_ASSERT(grpc_tcp_fd(ep) == sv[1] && sv[1] >= 0); - grpc_endpoint_add_to_pollset(&exec_ctx, ep, g_pollset); + grpc_endpoint_add_to_pollset(ep, g_pollset); written_bytes = fill_socket_partial(sv[0], num_bytes); gpr_log(GPR_INFO, "Wrote %" PRIuPTR " bytes", written_bytes); @@ -453,38 +441,35 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { grpc_slice_buffer_init(&state.incoming); GRPC_CLOSURE_INIT(&state.read_cb, read_cb, &state, grpc_schedule_on_exec_ctx); - grpc_endpoint_read(&exec_ctx, ep, &state.incoming, &state.read_cb); + grpc_endpoint_read(ep, &state.incoming, &state.read_cb); gpr_mu_lock(g_mu); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); + "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_log(GPR_DEBUG, "wakeup: read=%" PRIdPTR " target=%" PRIdPTR, state.read_bytes, state.target_read_bytes); gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } GPR_ASSERT(state.read_bytes == state.target_read_bytes); gpr_mu_unlock(g_mu); - grpc_slice_buffer_destroy_internal(&exec_ctx, &state.incoming); - grpc_tcp_destroy_and_release_fd(&exec_ctx, ep, &fd, &fd_released_cb); - grpc_exec_ctx_flush(&exec_ctx); + grpc_slice_buffer_destroy_internal(&state.incoming); + grpc_tcp_destroy_and_release_fd(ep, &fd, &fd_released_cb); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); while (!fd_released_done) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); + "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_log(GPR_DEBUG, "wakeup: fd_released_done=%d", fd_released_done); } gpr_mu_unlock(g_mu); GPR_ASSERT(fd_released_done == 1); GPR_ASSERT(fd == sv[1]); - grpc_exec_ctx_finish(&exec_ctx); written_bytes = fill_socket_partial(sv[0], num_bytes); drain_socket_blocking(fd, written_bytes, written_bytes); @@ -522,7 +507,7 @@ static grpc_endpoint_test_fixture create_fixture_tcp_socketpair( size_t slice_size) { int sv[2]; grpc_endpoint_test_fixture f; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; create_sockets(sv); grpc_resource_quota* resource_quota = @@ -532,15 +517,13 @@ static grpc_endpoint_test_fixture create_fixture_tcp_socketpair( a[0].type = GRPC_ARG_INTEGER; a[0].value.integer = (int)slice_size; grpc_channel_args args = {GPR_ARRAY_SIZE(a), a}; - f.client_ep = grpc_tcp_create( - &exec_ctx, grpc_fd_create(sv[0], "fixture:client"), &args, "test"); - f.server_ep = grpc_tcp_create( - &exec_ctx, grpc_fd_create(sv[1], "fixture:server"), &args, "test"); - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); - grpc_endpoint_add_to_pollset(&exec_ctx, f.client_ep, g_pollset); - grpc_endpoint_add_to_pollset(&exec_ctx, f.server_ep, g_pollset); - - grpc_exec_ctx_finish(&exec_ctx); + f.client_ep = + grpc_tcp_create(grpc_fd_create(sv[0], "fixture:client"), &args, "test"); + f.server_ep = + grpc_tcp_create(grpc_fd_create(sv[1], "fixture:server"), &args, "test"); + grpc_resource_quota_unref_internal(resource_quota); + grpc_endpoint_add_to_pollset(f.client_ep, g_pollset); + grpc_endpoint_add_to_pollset(f.server_ep, g_pollset); return f; } @@ -549,24 +532,26 @@ static grpc_endpoint_test_config configs[] = { {"tcp/tcp_socketpair", create_fixture_tcp_socketpair, clean_up}, }; -static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, - grpc_error* error) { - grpc_pollset_destroy(exec_ctx, (grpc_pollset*)p); +static void destroy_pollset(void* p, grpc_error* error) { + grpc_pollset_destroy((grpc_pollset*)p); } int main(int argc, char** argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); - g_pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); - grpc_pollset_init(g_pollset, &g_mu); - grpc_endpoint_tests(configs[0], g_pollset, g_mu); - run_tests(); - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); - grpc_exec_ctx_finish(&exec_ctx); + { + grpc_core::ExecCtx exec_ctx; + g_pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); + grpc_pollset_init(g_pollset, &g_mu); + grpc_endpoint_tests(configs[0], g_pollset, g_mu); + run_tests(); + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + + grpc_core::ExecCtx::Get()->Flush(); + } grpc_shutdown(); gpr_free(g_pollset); diff --git a/test/core/iomgr/tcp_server_posix_test.cc b/test/core/iomgr/tcp_server_posix_test.cc index 48d8d425a59..3c9ca2109ec 100644 --- a/test/core/iomgr/tcp_server_posix_test.cc +++ b/test/core/iomgr/tcp_server_posix_test.cc @@ -110,8 +110,7 @@ static void on_connect_result_set(on_connect_result* result, result->server, acceptor->port_index, acceptor->fd_index); } -static void server_weak_ref_shutdown(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void server_weak_ref_shutdown(void* arg, grpc_error* error) { server_weak_ref* weak_ref = static_cast(arg); weak_ref->server = nullptr; } @@ -145,12 +144,11 @@ static void test_addr_init_str(test_addr* addr) { } } -static void on_connect(grpc_exec_ctx* exec_ctx, void* arg, grpc_endpoint* tcp, - grpc_pollset* pollset, +static void on_connect(void* arg, grpc_endpoint* tcp, grpc_pollset* pollset, grpc_tcp_server_acceptor* acceptor) { - grpc_endpoint_shutdown(exec_ctx, tcp, + grpc_endpoint_shutdown(tcp, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Connected")); - grpc_endpoint_destroy(exec_ctx, tcp); + grpc_endpoint_destroy(tcp); on_connect_result temp_result; on_connect_result_set(&temp_result, acceptor); @@ -159,38 +157,33 @@ static void on_connect(grpc_exec_ctx* exec_ctx, void* arg, grpc_endpoint* tcp, gpr_mu_lock(g_mu); g_result = temp_result; g_nconnects++; - GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); gpr_mu_unlock(g_mu); } static void test_no_op(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_tcp_server* s; - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(&exec_ctx, nullptr, nullptr, &s)); - grpc_tcp_server_unref(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(nullptr, nullptr, &s)); + grpc_tcp_server_unref(s); } static void test_no_op_with_start(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_tcp_server* s; - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(&exec_ctx, nullptr, nullptr, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(nullptr, nullptr, &s)); LOG_TEST("test_no_op_with_start"); - grpc_tcp_server_start(&exec_ctx, s, nullptr, 0, on_connect, nullptr); - grpc_tcp_server_unref(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + grpc_tcp_server_start(s, nullptr, 0, on_connect, nullptr); + grpc_tcp_server_unref(s); } static void test_no_op_with_port(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_tcp_server* s; - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(&exec_ctx, nullptr, nullptr, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(nullptr, nullptr, &s)); LOG_TEST("test_no_op_with_port"); memset(&resolved_addr, 0, sizeof(resolved_addr)); @@ -201,17 +194,15 @@ static void test_no_op_with_port(void) { GRPC_ERROR_NONE && port > 0); - grpc_tcp_server_unref(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + grpc_tcp_server_unref(s); } static void test_no_op_with_port_and_start(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_tcp_server* s; - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(&exec_ctx, nullptr, nullptr, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(nullptr, nullptr, &s)); LOG_TEST("test_no_op_with_port_and_start"); int port = -1; @@ -222,13 +213,12 @@ static void test_no_op_with_port_and_start(void) { GRPC_ERROR_NONE && port > 0); - grpc_tcp_server_start(&exec_ctx, s, nullptr, 0, on_connect, nullptr); + grpc_tcp_server_start(s, nullptr, 0, on_connect, nullptr); - grpc_tcp_server_unref(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + grpc_tcp_server_unref(s); } -static grpc_error* tcp_connect(grpc_exec_ctx* exec_ctx, const test_addr* remote, +static grpc_error* tcp_connect(const test_addr* remote, on_connect_result* result) { grpc_millis deadline = grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(10)); @@ -254,17 +244,17 @@ static grpc_error* tcp_connect(grpc_exec_ctx* exec_ctx, const test_addr* remote, } gpr_log(GPR_DEBUG, "wait"); while (g_nconnects == nconnects_before && - deadline > grpc_exec_ctx_now(exec_ctx)) { + deadline > grpc_core::ExecCtx::Get()->Now()) { grpc_pollset_worker* worker = nullptr; grpc_error* err; - if ((err = grpc_pollset_work(exec_ctx, g_pollset, &worker, deadline)) != + if ((err = grpc_pollset_work(g_pollset, &worker, deadline)) != GRPC_ERROR_NONE) { gpr_mu_unlock(g_mu); close(clifd); return err; } gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(exec_ctx); + gpr_mu_lock(g_mu); } gpr_log(GPR_DEBUG, "wait done"); @@ -279,7 +269,7 @@ static grpc_error* tcp_connect(grpc_exec_ctx* exec_ctx, const test_addr* remote, gpr_mu_unlock(g_mu); gpr_log(GPR_INFO, "Result (%d, %d) fd %d", result->port_index, result->fd_index, result->server_fd); - grpc_tcp_server_unref(exec_ctx, result->server); + grpc_tcp_server_unref(result->server); return GRPC_ERROR_NONE; } @@ -292,7 +282,7 @@ static grpc_error* tcp_connect(grpc_exec_ctx* exec_ctx, const test_addr* remote, static void test_connect(size_t num_connects, const grpc_channel_args* channel_args, test_addrs* dst_addrs, bool test_dst_addrs) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; grpc_resolved_address resolved_addr1; struct sockaddr_storage* const addr = @@ -307,7 +297,7 @@ static void test_connect(size_t num_connects, grpc_tcp_server* s; const unsigned num_ports = 2; GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(&exec_ctx, nullptr, channel_args, &s)); + grpc_tcp_server_create(nullptr, channel_args, &s)); unsigned port_num; server_weak_ref weak_ref; server_weak_ref_init(&weak_ref); @@ -352,7 +342,7 @@ static void test_connect(size_t num_connects, svr1_fd_count = grpc_tcp_server_port_fd_count(s, 1); GPR_ASSERT(svr1_fd_count >= 1); - grpc_tcp_server_start(&exec_ctx, s, &g_pollset, 1, on_connect, nullptr); + grpc_tcp_server_start(s, &g_pollset, 1, on_connect, nullptr); if (dst_addrs != nullptr) { int ports[] = {svr_port, svr1_port}; @@ -372,7 +362,7 @@ static void test_connect(size_t num_connects, test_addr_init_str(&dst); ++num_tested; on_connect_result_init(&result); - if ((err = tcp_connect(&exec_ctx, &dst, &result)) == GRPC_ERROR_NONE && + if ((err = tcp_connect(&dst, &result)) == GRPC_ERROR_NONE && result.server_fd >= 0 && result.server == s) { continue; } @@ -403,8 +393,8 @@ static void test_connect(size_t num_connects, for (connect_num = 0; connect_num < num_connects; ++connect_num) { on_connect_result result; on_connect_result_init(&result); - GPR_ASSERT(GRPC_LOG_IF_ERROR("tcp_connect", - tcp_connect(&exec_ctx, &dst, &result))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("tcp_connect", tcp_connect(&dst, &result))); GPR_ASSERT(result.server_fd == fd); GPR_ASSERT(result.port_index == port_num); GPR_ASSERT(result.fd_index == fd_num); @@ -420,21 +410,19 @@ static void test_connect(size_t num_connects, GPR_ASSERT(weak_ref.server != nullptr); GPR_ASSERT(grpc_tcp_server_port_fd(s, 0, 0) >= 0); - grpc_tcp_server_unref(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + grpc_tcp_server_unref(s); + grpc_core::ExecCtx::Get()->Flush(); /* Weak ref lost. */ GPR_ASSERT(weak_ref.server == nullptr); } -static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, - grpc_error* error) { - grpc_pollset_destroy(exec_ctx, static_cast(p)); +static void destroy_pollset(void* p, grpc_error* error) { + grpc_pollset_destroy(static_cast(p)); } int main(int argc, char** argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_arg chan_args[1]; chan_args[0].type = GRPC_ARG_INTEGER; chan_args[0].key = const_cast(GRPC_ARG_EXPAND_WILDCARD_ADDRS); @@ -447,58 +435,61 @@ int main(int argc, char** argv) { static_cast(gpr_zalloc(sizeof(*dst_addrs))); grpc_test_init(argc, argv); grpc_init(); - g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); - grpc_pollset_init(g_pollset, &g_mu); + { + grpc_core::ExecCtx exec_ctx; + g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); + grpc_pollset_init(g_pollset, &g_mu); + + test_no_op(); + test_no_op_with_start(); + test_no_op_with_port(); + test_no_op_with_port_and_start(); + + if (getifaddrs(&ifa) != 0 || ifa == nullptr) { + gpr_log(GPR_ERROR, "getifaddrs: %s", strerror(errno)); + return EXIT_FAILURE; + } + dst_addrs->naddrs = 0; + for (ifa_it = ifa; ifa_it != nullptr && dst_addrs->naddrs < MAX_ADDRS; + ifa_it = ifa_it->ifa_next) { + if (ifa_it->ifa_addr == nullptr) { + continue; + } else if (ifa_it->ifa_addr->sa_family == AF_INET) { + dst_addrs->addrs[dst_addrs->naddrs].addr.len = + sizeof(struct sockaddr_in); + } else if (ifa_it->ifa_addr->sa_family == AF_INET6) { + dst_addrs->addrs[dst_addrs->naddrs].addr.len = + sizeof(struct sockaddr_in6); + } else { + continue; + } + memcpy(dst_addrs->addrs[dst_addrs->naddrs].addr.addr, ifa_it->ifa_addr, + dst_addrs->addrs[dst_addrs->naddrs].addr.len); + GPR_ASSERT( + grpc_sockaddr_set_port(&dst_addrs->addrs[dst_addrs->naddrs].addr, 0)); + test_addr_init_str(&dst_addrs->addrs[dst_addrs->naddrs]); + ++dst_addrs->naddrs; + } + freeifaddrs(ifa); + ifa = nullptr; - test_no_op(); - test_no_op_with_start(); - test_no_op_with_port(); - test_no_op_with_port_and_start(); + /* Connect to same addresses as listeners. */ + test_connect(1, nullptr, nullptr, false); + test_connect(10, nullptr, nullptr, false); - if (getifaddrs(&ifa) != 0 || ifa == nullptr) { - gpr_log(GPR_ERROR, "getifaddrs: %s", strerror(errno)); - return EXIT_FAILURE; - } - dst_addrs->naddrs = 0; - for (ifa_it = ifa; ifa_it != nullptr && dst_addrs->naddrs < MAX_ADDRS; - ifa_it = ifa_it->ifa_next) { - if (ifa_it->ifa_addr == nullptr) { - continue; - } else if (ifa_it->ifa_addr->sa_family == AF_INET) { - dst_addrs->addrs[dst_addrs->naddrs].addr.len = sizeof(struct sockaddr_in); - } else if (ifa_it->ifa_addr->sa_family == AF_INET6) { - dst_addrs->addrs[dst_addrs->naddrs].addr.len = - sizeof(struct sockaddr_in6); - } else { - continue; - } - memcpy(dst_addrs->addrs[dst_addrs->naddrs].addr.addr, ifa_it->ifa_addr, - dst_addrs->addrs[dst_addrs->naddrs].addr.len); - GPR_ASSERT( - grpc_sockaddr_set_port(&dst_addrs->addrs[dst_addrs->naddrs].addr, 0)); - test_addr_init_str(&dst_addrs->addrs[dst_addrs->naddrs]); - ++dst_addrs->naddrs; + /* Set dst_addrs->addrs[i].len=0 for dst_addrs that are unreachable with a + "::" listener. */ + test_connect(1, nullptr, dst_addrs, true); + + /* Test connect(2) with dst_addrs. */ + test_connect(1, &channel_args, dst_addrs, false); + /* Test connect(2) with dst_addrs. */ + test_connect(10, &channel_args, dst_addrs, false); + + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); } - freeifaddrs(ifa); - ifa = nullptr; - - /* Connect to same addresses as listeners. */ - test_connect(1, nullptr, nullptr, false); - test_connect(10, nullptr, nullptr, false); - - /* Set dst_addrs->addrs[i].len=0 for dst_addrs that are unreachable with a - "::" listener. */ - test_connect(1, nullptr, dst_addrs, true); - - /* Test connect(2) with dst_addrs. */ - test_connect(1, &channel_args, dst_addrs, false); - /* Test connect(2) with dst_addrs. */ - test_connect(10, &channel_args, dst_addrs, false); - - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); - grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); gpr_free(dst_addrs); gpr_free(g_pollset); diff --git a/test/core/iomgr/tcp_server_uv_test.cc b/test/core/iomgr/tcp_server_uv_test.cc index dd047a04983..35d62b51b76 100644 --- a/test/core/iomgr/tcp_server_uv_test.cc +++ b/test/core/iomgr/tcp_server_uv_test.cc @@ -74,8 +74,7 @@ static void on_connect_result_set(on_connect_result* result, result->fd_index = acceptor->fd_index; } -static void server_weak_ref_shutdown(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void server_weak_ref_shutdown(void* arg, grpc_error* error) { server_weak_ref* weak_ref = static_cast(arg); weak_ref->server = NULL; } @@ -97,12 +96,11 @@ static void server_weak_ref_set(server_weak_ref* weak_ref, weak_ref->server = server; } -static void on_connect(grpc_exec_ctx* exec_ctx, void* arg, grpc_endpoint* tcp, - grpc_pollset* pollset, +static void on_connect(void* arg, grpc_endpoint* tcp, grpc_pollset* pollset, grpc_tcp_server_acceptor* acceptor) { - grpc_endpoint_shutdown(exec_ctx, tcp, + grpc_endpoint_shutdown(tcp, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Connected")); - grpc_endpoint_destroy(exec_ctx, tcp); + grpc_endpoint_destroy(tcp); on_connect_result temp_result; on_connect_result_set(&temp_result, acceptor); @@ -111,38 +109,33 @@ static void on_connect(grpc_exec_ctx* exec_ctx, void* arg, grpc_endpoint* tcp, gpr_mu_lock(g_mu); g_result = temp_result; g_nconnects++; - GPR_ASSERT(GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, g_pollset, NULL))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); gpr_mu_unlock(g_mu); } static void test_no_op(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_tcp_server* s; - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(&exec_ctx, NULL, NULL, &s)); - grpc_tcp_server_unref(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); + grpc_tcp_server_unref(s); } static void test_no_op_with_start(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_tcp_server* s; - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(&exec_ctx, NULL, NULL, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); LOG_TEST("test_no_op_with_start"); - grpc_tcp_server_start(&exec_ctx, s, NULL, 0, on_connect, NULL); - grpc_tcp_server_unref(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + grpc_tcp_server_start(s, NULL, 0, on_connect, NULL); + grpc_tcp_server_unref(s); } static void test_no_op_with_port(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_tcp_server* s; - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(&exec_ctx, NULL, NULL, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); LOG_TEST("test_no_op_with_port"); memset(&resolved_addr, 0, sizeof(resolved_addr)); @@ -153,17 +146,15 @@ static void test_no_op_with_port(void) { GRPC_ERROR_NONE && port > 0); - grpc_tcp_server_unref(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + grpc_tcp_server_unref(s); } static void test_no_op_with_port_and_start(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_tcp_server* s; - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(&exec_ctx, NULL, NULL, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); LOG_TEST("test_no_op_with_port_and_start"); int port; @@ -174,10 +165,9 @@ static void test_no_op_with_port_and_start(void) { GRPC_ERROR_NONE && port > 0); - grpc_tcp_server_start(&exec_ctx, s, NULL, 0, on_connect, NULL); + grpc_tcp_server_start(s, NULL, 0, on_connect, NULL); - grpc_tcp_server_unref(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + grpc_tcp_server_unref(s); } static void connect_cb(uv_connect_t* req, int status) { @@ -187,8 +177,8 @@ static void connect_cb(uv_connect_t* req, int status) { static void close_cb(uv_handle_t* handle) { gpr_free(handle); } -static void tcp_connect(grpc_exec_ctx* exec_ctx, const struct sockaddr* remote, - socklen_t remote_len, on_connect_result* result) { +static void tcp_connect(const struct sockaddr* remote, socklen_t remote_len, + on_connect_result* result) { gpr_timespec deadline = grpc_timeout_seconds_to_deadline(10); uv_tcp_t* client_handle = static_cast(gpr_malloc(sizeof(uv_tcp_t))); @@ -208,10 +198,10 @@ static void tcp_connect(grpc_exec_ctx* exec_ctx, const struct sockaddr* remote, grpc_pollset_worker* worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(exec_ctx, g_pollset, &worker, + grpc_pollset_work(g_pollset, &worker, grpc_timespec_to_millis_round_up(deadline)))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_finish(exec_ctx); + gpr_mu_lock(g_mu); } gpr_log(GPR_DEBUG, "wait done"); @@ -224,7 +214,7 @@ static void tcp_connect(grpc_exec_ctx* exec_ctx, const struct sockaddr* remote, /* Tests a tcp server with multiple ports. */ static void test_connect(unsigned n) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; grpc_resolved_address resolved_addr1; struct sockaddr_storage* addr = (struct sockaddr_storage*)resolved_addr.addr; @@ -233,8 +223,7 @@ static void test_connect(unsigned n) { int svr_port; int svr1_port; grpc_tcp_server* s; - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(&exec_ctx, NULL, NULL, &s)); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s)); unsigned i; server_weak_ref weak_ref; server_weak_ref_init(&weak_ref); @@ -257,48 +246,45 @@ static void test_connect(unsigned n) { GRPC_ERROR_NONE && svr_port == svr1_port); - grpc_tcp_server_start(&exec_ctx, s, &g_pollset, 1, on_connect, NULL); + grpc_tcp_server_start(s, &g_pollset, 1, on_connect, NULL); GPR_ASSERT(uv_ip6_addr("::", svr_port, (struct sockaddr_in6*)addr1) == 0); for (i = 0; i < n; i++) { on_connect_result result; on_connect_result_init(&result); - tcp_connect(&exec_ctx, (struct sockaddr*)addr, (socklen_t)resolved_addr.len, - &result); + tcp_connect((struct sockaddr*)addr, (socklen_t)resolved_addr.len, &result); GPR_ASSERT(result.port_index == 0); GPR_ASSERT(result.server == s); if (weak_ref.server == NULL) { server_weak_ref_set(&weak_ref, result.server); } - grpc_tcp_server_unref(&exec_ctx, result.server); + grpc_tcp_server_unref(result.server); on_connect_result_init(&result); - tcp_connect(&exec_ctx, (struct sockaddr*)addr1, - (socklen_t)resolved_addr1.len, &result); + tcp_connect((struct sockaddr*)addr1, (socklen_t)resolved_addr1.len, + &result); GPR_ASSERT(result.port_index == 1); GPR_ASSERT(result.server == s); - grpc_tcp_server_unref(&exec_ctx, result.server); + grpc_tcp_server_unref(result.server); } /* Weak ref to server valid until final unref. */ GPR_ASSERT(weak_ref.server != NULL); - grpc_tcp_server_unref(&exec_ctx, s); - grpc_exec_ctx_finish(&exec_ctx); + grpc_tcp_server_unref(s); /* Weak ref lost. */ GPR_ASSERT(weak_ref.server == NULL); } -static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, - grpc_error* error) { - grpc_pollset_destroy(exec_ctx, static_cast(p)); +static void destroy_pollset(void* p, grpc_error* error) { + grpc_pollset_destroy(static_cast(p)); } int main(int argc, char** argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_test_init(argc, argv); grpc_init(); g_pollset = static_cast(gpr_malloc(grpc_pollset_size())); @@ -313,8 +299,8 @@ int main(int argc, char** argv) { GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); - grpc_exec_ctx_finish(&exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + grpc_shutdown(); gpr_free(g_pollset); return 0; diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc index d74ea4fc96d..deb8c4d87e9 100644 --- a/test/core/iomgr/timer_list_test.cc +++ b/test/core/iomgr/timer_list_test.cc @@ -25,6 +25,7 @@ #include +#include #include #include "src/core/lib/debug/trace.h" #include "test/core/util/test_config.h" @@ -37,127 +38,125 @@ extern grpc_core::TraceFlag grpc_timer_check_trace; static int cb_called[MAX_CB][2]; -static void cb(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void cb(void* arg, grpc_error* error) { cb_called[(intptr_t)arg][error == GRPC_ERROR_NONE]++; } static void add_test(void) { int i; grpc_timer timers[20]; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_INFO, "add_test"); - grpc_timer_list_init(&exec_ctx); + grpc_timer_list_init(); grpc_core::testing::grpc_tracer_enable_flag(&grpc_timer_trace); grpc_core::testing::grpc_tracer_enable_flag(&grpc_timer_check_trace); memset(cb_called, 0, sizeof(cb_called)); - grpc_millis start = grpc_exec_ctx_now(&exec_ctx); + grpc_millis start = grpc_core::ExecCtx::Get()->Now(); /* 10 ms timers. will expire in the current epoch */ for (i = 0; i < 10; i++) { grpc_timer_init( - &exec_ctx, &timers[i], start + 10, + &timers[i], start + 10, GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)i, grpc_schedule_on_exec_ctx)); } /* 1010 ms timers. will expire in the next epoch */ for (i = 10; i < 20; i++) { grpc_timer_init( - &exec_ctx, &timers[i], start + 1010, + &timers[i], start + 1010, GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)i, grpc_schedule_on_exec_ctx)); } /* collect timers. Only the first batch should be ready. */ - exec_ctx.now = start + 500; - GPR_ASSERT(grpc_timer_check(&exec_ctx, nullptr) == GRPC_TIMERS_FIRED); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx::Get()->TestOnlySetNow(start + 500); + GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); + grpc_core::ExecCtx::Get()->Flush(); for (i = 0; i < 20; i++) { GPR_ASSERT(cb_called[i][1] == (i < 10)); GPR_ASSERT(cb_called[i][0] == 0); } - exec_ctx.now = start + 600; - GPR_ASSERT(grpc_timer_check(&exec_ctx, nullptr) == - GRPC_TIMERS_CHECKED_AND_EMPTY); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx::Get()->TestOnlySetNow(start + 600); + GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_CHECKED_AND_EMPTY); + grpc_core::ExecCtx::Get()->Flush(); for (i = 0; i < 30; i++) { GPR_ASSERT(cb_called[i][1] == (i < 10)); GPR_ASSERT(cb_called[i][0] == 0); } /* collect the rest of the timers */ - exec_ctx.now = start + 1500; - GPR_ASSERT(grpc_timer_check(&exec_ctx, nullptr) == GRPC_TIMERS_FIRED); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx::Get()->TestOnlySetNow(start + 1500); + GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); + grpc_core::ExecCtx::Get()->Flush(); for (i = 0; i < 30; i++) { GPR_ASSERT(cb_called[i][1] == (i < 20)); GPR_ASSERT(cb_called[i][0] == 0); } - exec_ctx.now = start + 1600; - GPR_ASSERT(grpc_timer_check(&exec_ctx, nullptr) == - GRPC_TIMERS_CHECKED_AND_EMPTY); + grpc_core::ExecCtx::Get()->TestOnlySetNow(start + 1600); + GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_CHECKED_AND_EMPTY); for (i = 0; i < 30; i++) { GPR_ASSERT(cb_called[i][1] == (i < 20)); GPR_ASSERT(cb_called[i][0] == 0); } - grpc_timer_list_shutdown(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + grpc_timer_list_shutdown(); } /* Cleaning up a list with pending timers. */ void destruction_test(void) { grpc_timer timers[5]; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_INFO, "destruction_test"); - exec_ctx.now_is_valid = true; - exec_ctx.now = 0; - grpc_timer_list_init(&exec_ctx); + grpc_core::ExecCtx::Get()->TestOnlySetNow(0); + grpc_timer_list_init(); grpc_core::testing::grpc_tracer_enable_flag(&grpc_timer_trace); grpc_core::testing::grpc_tracer_enable_flag(&grpc_timer_check_trace); memset(cb_called, 0, sizeof(cb_called)); grpc_timer_init( - &exec_ctx, &timers[0], 100, + &timers[0], 100, GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)0, grpc_schedule_on_exec_ctx)); grpc_timer_init( - &exec_ctx, &timers[1], 3, + &timers[1], 3, GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)1, grpc_schedule_on_exec_ctx)); grpc_timer_init( - &exec_ctx, &timers[2], 100, + &timers[2], 100, GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)2, grpc_schedule_on_exec_ctx)); grpc_timer_init( - &exec_ctx, &timers[3], 3, + &timers[3], 3, GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)3, grpc_schedule_on_exec_ctx)); grpc_timer_init( - &exec_ctx, &timers[4], 1, + &timers[4], 1, GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)4, grpc_schedule_on_exec_ctx)); - exec_ctx.now = 2; - GPR_ASSERT(grpc_timer_check(&exec_ctx, nullptr) == GRPC_TIMERS_FIRED); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx::Get()->TestOnlySetNow(2); + GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(1 == cb_called[4][1]); - grpc_timer_cancel(&exec_ctx, &timers[0]); - grpc_timer_cancel(&exec_ctx, &timers[3]); - grpc_exec_ctx_finish(&exec_ctx); + grpc_timer_cancel(&timers[0]); + grpc_timer_cancel(&timers[3]); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(1 == cb_called[0][0]); GPR_ASSERT(1 == cb_called[3][0]); - grpc_timer_list_shutdown(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + grpc_timer_list_shutdown(); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(1 == cb_called[1][0]); GPR_ASSERT(1 == cb_called[2][0]); } int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_core::ExecCtx::GlobalInit(); gpr_set_log_verbosity(GPR_LOG_SEVERITY_DEBUG); add_test(); destruction_test(); + grpc_core::ExecCtx::GlobalShutdown(); return 0; } diff --git a/test/core/iomgr/udp_server_test.cc b/test/core/iomgr/udp_server_test.cc index 6e17be9cd6d..0deb534abd0 100644 --- a/test/core/iomgr/udp_server_test.cc +++ b/test/core/iomgr/udp_server_test.cc @@ -50,7 +50,7 @@ static int g_number_of_writes = 0; static int g_number_of_bytes_read = 0; static int g_number_of_orphan_calls = 0; -static bool on_read(grpc_exec_ctx* exec_ctx, grpc_fd* emfd, void* user_data) { +static bool on_read(grpc_fd* emfd, void* user_data) { char read_buffer[512]; ssize_t byte_count; @@ -61,27 +61,27 @@ static bool on_read(grpc_exec_ctx* exec_ctx, grpc_fd* emfd, void* user_data) { g_number_of_reads++; g_number_of_bytes_read += (int)byte_count; - GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); gpr_mu_unlock(g_mu); return false; } -static void on_write(grpc_exec_ctx* exec_ctx, grpc_fd* emfd, void* user_data, +static void on_write(grpc_fd* emfd, void* user_data, grpc_closure* notify_on_write_closure) { gpr_mu_lock(g_mu); g_number_of_writes++; - GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_kick", grpc_pollset_kick(exec_ctx, g_pollset, nullptr))); + GPR_ASSERT( + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); gpr_mu_unlock(g_mu); } -static void on_fd_orphaned(grpc_exec_ctx* exec_ctx, grpc_fd* emfd, - grpc_closure* closure, void* user_data) { +static void on_fd_orphaned(grpc_fd* emfd, grpc_closure* closure, + void* user_data) { gpr_log(GPR_INFO, "gRPC FD about to be orphaned: %d", grpc_fd_wrapped_fd(emfd)); - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); g_number_of_orphan_calls++; } @@ -130,24 +130,22 @@ static test_socket_factory* test_socket_factory_create(void) { } static void test_no_op(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_udp_server* s = grpc_udp_server_create(nullptr); - grpc_udp_server_destroy(&exec_ctx, s, nullptr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_udp_server_destroy(s, nullptr); } static void test_no_op_with_start(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_udp_server* s = grpc_udp_server_create(nullptr); LOG_TEST("test_no_op_with_start"); - grpc_udp_server_start(&exec_ctx, s, nullptr, 0, nullptr); - grpc_udp_server_destroy(&exec_ctx, s, nullptr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_udp_server_start(s, nullptr, 0, nullptr); + grpc_udp_server_destroy(s, nullptr); } static void test_no_op_with_port(void) { g_number_of_orphan_calls = 0; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_udp_server* s = grpc_udp_server_create(nullptr); @@ -159,8 +157,7 @@ static void test_no_op_with_port(void) { GPR_ASSERT(grpc_udp_server_add_port(s, &resolved_addr, on_read, on_write, on_fd_orphaned)); - grpc_udp_server_destroy(&exec_ctx, s, nullptr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_udp_server_destroy(s, nullptr); /* The server had a single FD, which should have been orphaned. */ GPR_ASSERT(g_number_of_orphan_calls == 1); @@ -168,7 +165,7 @@ static void test_no_op_with_port(void) { static void test_no_op_with_port_and_socket_factory(void) { g_number_of_orphan_calls = 0; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; @@ -178,7 +175,7 @@ static void test_no_op_with_port_and_socket_factory(void) { grpc_channel_args* channel_args = grpc_channel_args_copy_and_add(nullptr, &socket_factory_arg, 1); grpc_udp_server* s = grpc_udp_server_create(channel_args); - grpc_channel_args_destroy(&exec_ctx, channel_args); + grpc_channel_args_destroy(channel_args); LOG_TEST("test_no_op_with_port_and_socket_factory"); @@ -190,8 +187,8 @@ static void test_no_op_with_port_and_socket_factory(void) { GPR_ASSERT(socket_factory->number_of_socket_calls == 1); GPR_ASSERT(socket_factory->number_of_bind_calls == 1); - grpc_udp_server_destroy(&exec_ctx, s, nullptr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_udp_server_destroy(s, nullptr); + grpc_socket_factory_unref(&socket_factory->base); /* The server had a single FD, which should have been orphaned. */ @@ -200,7 +197,7 @@ static void test_no_op_with_port_and_socket_factory(void) { static void test_no_op_with_port_and_start(void) { g_number_of_orphan_calls = 0; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; grpc_udp_server* s = grpc_udp_server_create(nullptr); @@ -212,10 +209,9 @@ static void test_no_op_with_port_and_start(void) { GPR_ASSERT(grpc_udp_server_add_port(s, &resolved_addr, on_read, on_write, on_fd_orphaned)); - grpc_udp_server_start(&exec_ctx, s, nullptr, 0, nullptr); + grpc_udp_server_start(s, nullptr, 0, nullptr); - grpc_udp_server_destroy(&exec_ctx, s, nullptr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_udp_server_destroy(s, nullptr); /* The server had a single FD, which is orphaned exactly once in * * grpc_udp_server_destroy. */ @@ -223,7 +219,7 @@ static void test_no_op_with_port_and_start(void) { } static void test_receive(int number_of_clients) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_storage* addr = (struct sockaddr_storage*)resolved_addr.addr; int clifd, svrfd; @@ -250,7 +246,7 @@ static void test_receive(int number_of_clients) { GPR_ASSERT(resolved_addr.len <= sizeof(struct sockaddr_storage)); pollsets[0] = g_pollset; - grpc_udp_server_start(&exec_ctx, s, pollsets, 1, nullptr); + grpc_udp_server_start(s, pollsets, 1, nullptr); gpr_mu_lock(g_mu); @@ -266,13 +262,12 @@ static void test_receive(int number_of_clients) { (socklen_t)resolved_addr.len) == 0); GPR_ASSERT(5 == write(clifd, "hello", 5)); while (g_number_of_bytes_read < (number_of_bytes_read_before + 5) && - deadline > grpc_exec_ctx_now(&exec_ctx)) { + deadline > grpc_core::ExecCtx::Get()->Now()) { grpc_pollset_worker* worker = nullptr; GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, g_pollset, &worker, deadline))); + "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } close(clifd); @@ -281,40 +276,40 @@ static void test_receive(int number_of_clients) { gpr_mu_unlock(g_mu); - grpc_udp_server_destroy(&exec_ctx, s, nullptr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_udp_server_destroy(s, nullptr); /* The server had a single FD, which is orphaned exactly once in * * grpc_udp_server_destroy. */ GPR_ASSERT(g_number_of_orphan_calls == 1); } -static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, - grpc_error* error) { - grpc_pollset_destroy(exec_ctx, static_cast(p)); +static void destroy_pollset(void* p, grpc_error* error) { + grpc_pollset_destroy(static_cast(p)); } int main(int argc, char** argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); grpc_init(); - g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); - grpc_pollset_init(g_pollset, &g_mu); - - test_no_op(); - test_no_op_with_start(); - test_no_op_with_port(); - test_no_op_with_port_and_socket_factory(); - test_no_op_with_port_and_start(); - test_receive(1); - test_receive(10); - - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); - grpc_exec_ctx_finish(&exec_ctx); - gpr_free(g_pollset); + { + grpc_core::ExecCtx exec_ctx; + g_pollset = static_cast(gpr_zalloc(grpc_pollset_size())); + grpc_pollset_init(g_pollset, &g_mu); + + test_no_op(); + test_no_op_with_start(); + test_no_op_with_port(); + test_no_op_with_port_and_socket_factory(); + test_no_op_with_port_and_start(); + test_receive(1); + test_receive(10); + + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + grpc_core::ExecCtx::Get()->Flush(); + gpr_free(g_pollset); + } grpc_shutdown(); return 0; } diff --git a/test/core/nanopb/fuzzer_response.cc b/test/core/nanopb/fuzzer_response.cc index 7039c801cb9..3a70dea5e98 100644 --- a/test/core/nanopb/fuzzer_response.cc +++ b/test/core/nanopb/fuzzer_response.cc @@ -19,6 +19,7 @@ #include #include +#include #include #include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" @@ -29,6 +30,7 @@ bool leak_check = true; static void dont_log(gpr_log_func_args* args) {} extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { + grpc_init(); if (squelch) gpr_set_log_function(dont_log); grpc_slice slice = grpc_slice_from_copied_buffer((const char*)data, size); grpc_grpclb_initial_response* response; @@ -36,5 +38,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_grpclb_initial_response_destroy(response); } grpc_slice_unref(slice); + grpc_shutdown(); return 0; } diff --git a/test/core/nanopb/fuzzer_serverlist.cc b/test/core/nanopb/fuzzer_serverlist.cc index 0a6b1767a1a..d0af117ef96 100644 --- a/test/core/nanopb/fuzzer_serverlist.cc +++ b/test/core/nanopb/fuzzer_serverlist.cc @@ -19,6 +19,7 @@ #include #include +#include #include #include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" @@ -29,6 +30,7 @@ bool leak_check = true; static void dont_log(gpr_log_func_args* args) {} extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { + grpc_init(); if (squelch) gpr_set_log_function(dont_log); grpc_slice slice = grpc_slice_from_copied_buffer((const char*)data, size); grpc_grpclb_serverlist* serverlist; @@ -36,5 +38,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_grpclb_destroy_serverlist(serverlist); } grpc_slice_unref(slice); + grpc_shutdown(); return 0; } diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc index 64d383ad0a4..ecc61928f59 100644 --- a/test/core/security/credentials_test.cc +++ b/test/core/security/credentials_test.cc @@ -148,41 +148,37 @@ static grpc_httpcli_response http_response(int status, const char* body) { /* -- Tests. -- */ static void test_empty_md_array(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_credentials_mdelem_array md_array; memset(&md_array, 0, sizeof(md_array)); GPR_ASSERT(md_array.md == nullptr); GPR_ASSERT(md_array.size == 0); - grpc_credentials_mdelem_array_destroy(&exec_ctx, &md_array); - grpc_exec_ctx_finish(&exec_ctx); + grpc_credentials_mdelem_array_destroy(&md_array); } static void test_add_to_empty_md_array(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_credentials_mdelem_array md_array; memset(&md_array, 0, sizeof(md_array)); const char* key = "hello"; const char* value = "there blah blah blah blah blah blah blah"; - grpc_mdelem md = - grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_copied_string(key), - grpc_slice_from_copied_string(value)); + grpc_mdelem md = grpc_mdelem_from_slices( + grpc_slice_from_copied_string(key), grpc_slice_from_copied_string(value)); grpc_credentials_mdelem_array_add(&md_array, md); GPR_ASSERT(md_array.size == 1); GPR_ASSERT(grpc_mdelem_eq(md, md_array.md[0])); - GRPC_MDELEM_UNREF(&exec_ctx, md); - grpc_credentials_mdelem_array_destroy(&exec_ctx, &md_array); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(md); + grpc_credentials_mdelem_array_destroy(&md_array); } static void test_add_abunch_to_md_array(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_credentials_mdelem_array md_array; memset(&md_array, 0, sizeof(md_array)); const char* key = "hello"; const char* value = "there blah blah blah blah blah blah blah"; - grpc_mdelem md = - grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_copied_string(key), - grpc_slice_from_copied_string(value)); + grpc_mdelem md = grpc_mdelem_from_slices( + grpc_slice_from_copied_string(key), grpc_slice_from_copied_string(value)); size_t num_entries = 1000; for (size_t i = 0; i < num_entries; ++i) { grpc_credentials_mdelem_array_add(&md_array, md); @@ -190,57 +186,52 @@ static void test_add_abunch_to_md_array(void) { for (size_t i = 0; i < num_entries; ++i) { GPR_ASSERT(grpc_mdelem_eq(md_array.md[i], md)); } - GRPC_MDELEM_UNREF(&exec_ctx, md); - grpc_credentials_mdelem_array_destroy(&exec_ctx, &md_array); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(md); + grpc_credentials_mdelem_array_destroy(&md_array); } static void test_oauth2_token_fetcher_creds_parsing_ok(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = http_response(200, valid_oauth2_json_response); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &exec_ctx, &response, &token_md, &token_lifetime) == - GRPC_CREDENTIALS_OK); + &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_OK); GPR_ASSERT(token_lifetime == 3599 * GPR_MS_PER_SEC); GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDKEY(token_md), "authorization") == 0); GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDVALUE(token_md), "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_") == 0); - GRPC_MDELEM_UNREF(&exec_ctx, token_md); + GRPC_MDELEM_UNREF(token_md); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(&exec_ctx); } static void test_oauth2_token_fetcher_creds_parsing_bad_http_status(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = http_response(401, valid_oauth2_json_response); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &exec_ctx, &response, &token_md, &token_lifetime) == + &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(&exec_ctx); } static void test_oauth2_token_fetcher_creds_parsing_empty_http_body(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = http_response(200, ""); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &exec_ctx, &response, &token_md, &token_lifetime) == + &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(&exec_ctx); } static void test_oauth2_token_fetcher_creds_parsing_invalid_json(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = @@ -249,14 +240,13 @@ static void test_oauth2_token_fetcher_creds_parsing_invalid_json(void) { " \"expires_in\":3599, " " \"token_type\":\"Bearer\""); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &exec_ctx, &response, &token_md, &token_lifetime) == + &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(&exec_ctx); } static void test_oauth2_token_fetcher_creds_parsing_missing_token(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = http_response(200, @@ -264,14 +254,13 @@ static void test_oauth2_token_fetcher_creds_parsing_missing_token(void) { " \"expires_in\":3599, " " \"token_type\":\"Bearer\"}"); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &exec_ctx, &response, &token_md, &token_lifetime) == + &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(&exec_ctx); } static void test_oauth2_token_fetcher_creds_parsing_missing_token_type(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = @@ -280,15 +269,14 @@ static void test_oauth2_token_fetcher_creds_parsing_missing_token_type(void) { " \"expires_in\":3599, " "}"); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &exec_ctx, &response, &token_md, &token_lifetime) == + &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(&exec_ctx); } static void test_oauth2_token_fetcher_creds_parsing_missing_token_lifetime( void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_mdelem token_md = GRPC_MDNULL; grpc_millis token_lifetime; grpc_httpcli_response response = @@ -296,10 +284,9 @@ static void test_oauth2_token_fetcher_creds_parsing_missing_token_lifetime( "{\"access_token\":\"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_\"," " \"token_type\":\"Bearer\"}"); GPR_ASSERT(grpc_oauth2_token_fetcher_credentials_parse_server_response( - &exec_ctx, &response, &token_md, &token_lifetime) == + &response, &token_md, &token_lifetime) == GRPC_CREDENTIALS_ERROR); grpc_http_response_destroy(&response); - grpc_exec_ctx_finish(&exec_ctx); } typedef struct { @@ -336,8 +323,7 @@ static void check_metadata(const expected_md* expected, } } -static void check_request_metadata(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void check_request_metadata(void* arg, grpc_error* error) { request_metadata_state* state = (request_metadata_state*)arg; gpr_log(GPR_INFO, "expected_error: %s", grpc_error_string(state->expected_error)); @@ -358,9 +344,8 @@ static void check_request_metadata(grpc_exec_ctx* exec_ctx, void* arg, state->expected_size, state->md_array.size); GPR_ASSERT(state->md_array.size == state->expected_size); check_metadata(state->expected, &state->md_array); - grpc_credentials_mdelem_array_destroy(exec_ctx, &state->md_array); - grpc_pollset_set_destroy(exec_ctx, - grpc_polling_entity_pollset_set(&state->pollent)); + grpc_credentials_mdelem_array_destroy(&state->md_array); + grpc_pollset_set_destroy(grpc_polling_entity_pollset_set(&state->pollent)); gpr_free(state); } @@ -379,22 +364,21 @@ static request_metadata_state* make_request_metadata_state( return state; } -static void run_request_metadata_test(grpc_exec_ctx* exec_ctx, - grpc_call_credentials* creds, +static void run_request_metadata_test(grpc_call_credentials* creds, grpc_auth_metadata_context auth_md_ctx, request_metadata_state* state) { grpc_error* error = GRPC_ERROR_NONE; if (grpc_call_credentials_get_request_metadata( - exec_ctx, creds, &state->pollent, auth_md_ctx, &state->md_array, + creds, &state->pollent, auth_md_ctx, &state->md_array, &state->on_request_metadata, &error)) { // Synchronous result. Invoke the callback directly. - check_request_metadata(exec_ctx, state, error); + check_request_metadata(state, error); GRPC_ERROR_UNREF(error); } } static void test_google_iam_creds(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; expected_md emd[] = {{GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, test_google_iam_authorization_token}, {GRPC_IAM_AUTHORITY_SELECTOR_METADATA_KEY, @@ -406,13 +390,12 @@ static void test_google_iam_creds(void) { nullptr); grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, nullptr, nullptr}; - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_call_credentials_unref(&exec_ctx, creds); - grpc_exec_ctx_finish(&exec_ctx); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_call_credentials_unref(creds); } static void test_access_token_creds(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; expected_md emd[] = {{GRPC_AUTHORIZATION_METADATA_KEY, "Bearer blah"}}; request_metadata_state* state = make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); @@ -421,16 +404,14 @@ static void test_access_token_creds(void) { grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, nullptr, nullptr}; GPR_ASSERT(strcmp(creds->type, GRPC_CALL_CREDENTIALS_TYPE_OAUTH2) == 0); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_call_credentials_unref(&exec_ctx, creds); - grpc_exec_ctx_finish(&exec_ctx); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_call_credentials_unref(creds); } static grpc_security_status check_channel_oauth2_create_security_connector( - grpc_exec_ctx* exec_ctx, grpc_channel_credentials* c, - grpc_call_credentials* call_creds, const char* target, - const grpc_channel_args* args, grpc_channel_security_connector** sc, - grpc_channel_args** new_args) { + grpc_channel_credentials* c, grpc_call_credentials* call_creds, + const char* target, const grpc_channel_args* args, + grpc_channel_security_connector** sc, grpc_channel_args** new_args) { GPR_ASSERT(strcmp(c->type, "mock") == 0); GPR_ASSERT(call_creds != nullptr); GPR_ASSERT(strcmp(call_creds->type, GRPC_CALL_CREDENTIALS_TYPE_OAUTH2) == 0); @@ -438,7 +419,7 @@ static grpc_security_status check_channel_oauth2_create_security_connector( } static void test_channel_oauth2_composite_creds(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_channel_args* new_args; grpc_channel_credentials_vtable vtable = { nullptr, check_channel_oauth2_create_security_connector, nullptr}; @@ -452,14 +433,13 @@ static void test_channel_oauth2_composite_creds(void) { grpc_channel_credentials_release(channel_creds); grpc_call_credentials_release(oauth2_creds); GPR_ASSERT(grpc_channel_credentials_create_security_connector( - &exec_ctx, channel_oauth2_creds, nullptr, nullptr, nullptr, - &new_args) == GRPC_SECURITY_OK); + channel_oauth2_creds, nullptr, nullptr, nullptr, &new_args) == + GRPC_SECURITY_OK); grpc_channel_credentials_release(channel_oauth2_creds); - grpc_exec_ctx_finish(&exec_ctx); } static void test_oauth2_google_iam_composite_creds(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; expected_md emd[] = { {GRPC_AUTHORIZATION_METADATA_KEY, test_oauth2_bearer_token}, {GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, @@ -471,15 +451,15 @@ static void test_oauth2_google_iam_composite_creds(void) { grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, nullptr, nullptr}; grpc_call_credentials* oauth2_creds = grpc_md_only_test_credentials_create( - &exec_ctx, "authorization", test_oauth2_bearer_token, 0); + "authorization", test_oauth2_bearer_token, 0); grpc_call_credentials* google_iam_creds = grpc_google_iam_credentials_create( test_google_iam_authorization_token, test_google_iam_authority_selector, nullptr); grpc_call_credentials* composite_creds = grpc_composite_call_credentials_create(oauth2_creds, google_iam_creds, nullptr); - grpc_call_credentials_unref(&exec_ctx, oauth2_creds); - grpc_call_credentials_unref(&exec_ctx, google_iam_creds); + grpc_call_credentials_unref(oauth2_creds); + grpc_call_credentials_unref(google_iam_creds); GPR_ASSERT( strcmp(composite_creds->type, GRPC_CALL_CREDENTIALS_TYPE_COMPOSITE) == 0); const grpc_call_credentials_array* creds_array = @@ -489,17 +469,15 @@ static void test_oauth2_google_iam_composite_creds(void) { GRPC_CALL_CREDENTIALS_TYPE_OAUTH2) == 0); GPR_ASSERT(strcmp(creds_array->creds_array[1]->type, GRPC_CALL_CREDENTIALS_TYPE_IAM) == 0); - run_request_metadata_test(&exec_ctx, composite_creds, auth_md_ctx, state); - grpc_call_credentials_unref(&exec_ctx, composite_creds); - grpc_exec_ctx_finish(&exec_ctx); + run_request_metadata_test(composite_creds, auth_md_ctx, state); + grpc_call_credentials_unref(composite_creds); } static grpc_security_status check_channel_oauth2_google_iam_create_security_connector( - grpc_exec_ctx* exec_ctx, grpc_channel_credentials* c, - grpc_call_credentials* call_creds, const char* target, - const grpc_channel_args* args, grpc_channel_security_connector** sc, - grpc_channel_args** new_args) { + grpc_channel_credentials* c, grpc_call_credentials* call_creds, + const char* target, const grpc_channel_args* args, + grpc_channel_security_connector** sc, grpc_channel_args** new_args) { const grpc_call_credentials_array* creds_array; GPR_ASSERT(strcmp(c->type, "mock") == 0); GPR_ASSERT(call_creds != nullptr); @@ -514,7 +492,7 @@ check_channel_oauth2_google_iam_create_security_connector( } static void test_channel_oauth2_google_iam_composite_creds(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_channel_args* new_args; grpc_channel_credentials_vtable vtable = { nullptr, check_channel_oauth2_google_iam_create_security_connector, @@ -538,11 +516,10 @@ static void test_channel_oauth2_google_iam_composite_creds(void) { grpc_call_credentials_release(google_iam_creds); GPR_ASSERT(grpc_channel_credentials_create_security_connector( - &exec_ctx, channel_oauth2_iam_creds, nullptr, nullptr, nullptr, + channel_oauth2_iam_creds, nullptr, nullptr, nullptr, &new_args) == GRPC_SECURITY_OK); grpc_channel_credentials_release(channel_oauth2_iam_creds); - grpc_exec_ctx_finish(&exec_ctx); } static void validate_compute_engine_http_request( @@ -559,35 +536,32 @@ static void validate_compute_engine_http_request( } static int compute_engine_httpcli_get_success_override( - grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, - grpc_millis deadline, grpc_closure* on_done, - grpc_httpcli_response* response) { + const grpc_httpcli_request* request, grpc_millis deadline, + grpc_closure* on_done, grpc_httpcli_response* response) { validate_compute_engine_http_request(request); *response = http_response(200, valid_oauth2_json_response); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } static int compute_engine_httpcli_get_failure_override( - grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, - grpc_millis deadline, grpc_closure* on_done, - grpc_httpcli_response* response) { + const grpc_httpcli_request* request, grpc_millis deadline, + grpc_closure* on_done, grpc_httpcli_response* response) { validate_compute_engine_http_request(request); *response = http_response(403, "Not Authorized."); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } static int httpcli_post_should_not_be_called( - grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, - const char* body_bytes, size_t body_size, grpc_millis deadline, - grpc_closure* on_done, grpc_httpcli_response* response) { + const grpc_httpcli_request* request, const char* body_bytes, + size_t body_size, grpc_millis deadline, grpc_closure* on_done, + grpc_httpcli_response* response) { GPR_ASSERT("HTTP POST should not be called" == nullptr); return 1; } -static int httpcli_get_should_not_be_called(grpc_exec_ctx* exec_ctx, - const grpc_httpcli_request* request, +static int httpcli_get_should_not_be_called(const grpc_httpcli_request* request, grpc_millis deadline, grpc_closure* on_done, grpc_httpcli_response* response) { @@ -596,7 +570,7 @@ static int httpcli_get_should_not_be_called(grpc_exec_ctx* exec_ctx, } static void test_compute_engine_creds_success(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; expected_md emd[] = { {"authorization", "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_"}}; grpc_call_credentials* creds = @@ -609,24 +583,23 @@ static void test_compute_engine_creds_success(void) { make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); grpc_httpcli_set_override(compute_engine_httpcli_get_success_override, httpcli_post_should_not_be_called); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_exec_ctx_flush(&exec_ctx); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_core::ExecCtx::Get()->Flush(); /* Second request: the cached token should be served directly. */ state = make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_exec_ctx_flush(&exec_ctx); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_core::ExecCtx::Get()->Flush(); - grpc_call_credentials_unref(&exec_ctx, creds); + grpc_call_credentials_unref(creds); grpc_httpcli_set_override(nullptr, nullptr); - grpc_exec_ctx_finish(&exec_ctx); } static void test_compute_engine_creds_failure(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; request_metadata_state* state = make_request_metadata_state( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Error occured when fetching oauth2 token."), @@ -637,10 +610,9 @@ static void test_compute_engine_creds_failure(void) { grpc_google_compute_engine_credentials_create(nullptr); grpc_httpcli_set_override(compute_engine_httpcli_get_failure_override, httpcli_post_should_not_be_called); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_call_credentials_unref(&exec_ctx, creds); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_call_credentials_unref(creds); grpc_httpcli_set_override(nullptr, nullptr); - grpc_exec_ctx_finish(&exec_ctx); } static void validate_refresh_token_http_request( @@ -667,27 +639,27 @@ static void validate_refresh_token_http_request( } static int refresh_token_httpcli_post_success( - grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, - const char* body, size_t body_size, grpc_millis deadline, - grpc_closure* on_done, grpc_httpcli_response* response) { + const grpc_httpcli_request* request, const char* body, size_t body_size, + grpc_millis deadline, grpc_closure* on_done, + grpc_httpcli_response* response) { validate_refresh_token_http_request(request, body, body_size); *response = http_response(200, valid_oauth2_json_response); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } static int refresh_token_httpcli_post_failure( - grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, - const char* body, size_t body_size, grpc_millis deadline, - grpc_closure* on_done, grpc_httpcli_response* response) { + const grpc_httpcli_request* request, const char* body, size_t body_size, + grpc_millis deadline, grpc_closure* on_done, + grpc_httpcli_response* response) { validate_refresh_token_http_request(request, body, body_size); *response = http_response(403, "Not Authorized."); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } static void test_refresh_token_creds_success(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; expected_md emd[] = { {"authorization", "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_"}}; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, @@ -700,24 +672,23 @@ static void test_refresh_token_creds_success(void) { make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); grpc_httpcli_set_override(httpcli_get_should_not_be_called, refresh_token_httpcli_post_success); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_exec_ctx_flush(&exec_ctx); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_core::ExecCtx::Get()->Flush(); /* Second request: the cached token should be served directly. */ state = make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_exec_ctx_flush(&exec_ctx); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_core::ExecCtx::Get()->Flush(); - grpc_call_credentials_unref(&exec_ctx, creds); + grpc_call_credentials_unref(creds); grpc_httpcli_set_override(nullptr, nullptr); - grpc_exec_ctx_finish(&exec_ctx); } static void test_refresh_token_creds_failure(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; request_metadata_state* state = make_request_metadata_state( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Error occured when fetching oauth2 token."), @@ -728,10 +699,9 @@ static void test_refresh_token_creds_failure(void) { test_refresh_token_str, nullptr); grpc_httpcli_set_override(httpcli_get_should_not_be_called, refresh_token_httpcli_post_failure); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_call_credentials_unref(&exec_ctx, creds); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_call_credentials_unref(creds); grpc_httpcli_set_override(nullptr, nullptr); - grpc_exec_ctx_finish(&exec_ctx); } static void validate_jwt_encode_and_sign_params( @@ -821,7 +791,7 @@ static void test_jwt_creds_lifetime(void) { static void test_jwt_creds_success(void) { char* json_key_string = test_json_key_str(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, nullptr, nullptr}; char* expected_md_value; @@ -835,16 +805,16 @@ static void test_jwt_creds_success(void) { request_metadata_state* state = make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_success); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_exec_ctx_flush(&exec_ctx); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_core::ExecCtx::Get()->Flush(); /* Second request: the cached token should be served directly. */ state = make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); grpc_jwt_encode_and_sign_set_override( encode_and_sign_jwt_should_not_be_called); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_exec_ctx_flush(&exec_ctx); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_core::ExecCtx::Get()->Flush(); /* Third request: Different service url so jwt_encode_and_sign should be called again (no caching). */ @@ -852,19 +822,18 @@ static void test_jwt_creds_success(void) { make_request_metadata_state(GRPC_ERROR_NONE, emd, GPR_ARRAY_SIZE(emd)); auth_md_ctx.service_url = other_test_service_url; grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_success); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); - grpc_exec_ctx_flush(&exec_ctx); + run_request_metadata_test(creds, auth_md_ctx, state); + grpc_core::ExecCtx::Get()->Flush(); - grpc_call_credentials_unref(&exec_ctx, creds); + grpc_call_credentials_unref(creds); gpr_free(json_key_string); gpr_free(expected_md_value); grpc_jwt_encode_and_sign_set_override(nullptr); - grpc_exec_ctx_finish(&exec_ctx); } static void test_jwt_creds_signing_failure(void) { char* json_key_string = test_json_key_str(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, nullptr, nullptr}; request_metadata_state* state = make_request_metadata_state( @@ -875,12 +844,11 @@ static void test_jwt_creds_signing_failure(void) { json_key_string, grpc_max_auth_token_lifetime(), nullptr); grpc_jwt_encode_and_sign_set_override(encode_and_sign_jwt_failure); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, state); + run_request_metadata_test(creds, auth_md_ctx, state); gpr_free(json_key_string); - grpc_call_credentials_unref(&exec_ctx, creds); + grpc_call_credentials_unref(creds); grpc_jwt_encode_and_sign_set_override(nullptr); - grpc_exec_ctx_finish(&exec_ctx); } static void set_google_default_creds_env_var_with_file_contents( @@ -897,7 +865,7 @@ static void set_google_default_creds_env_var_with_file_contents( } static void test_google_default_creds_auth_key(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_service_account_jwt_access_credentials* jwt; grpc_composite_channel_credentials* creds; char* json_key = test_json_key_str(); @@ -913,13 +881,12 @@ static void test_google_default_creds_auth_key(void) { strcmp(jwt->key.client_id, "777-abaslkan11hlb6nmim3bpspl31ud.apps.googleusercontent.com") == 0); - grpc_channel_credentials_unref(&exec_ctx, &creds->base); + grpc_channel_credentials_unref(&creds->base); gpr_setenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR, ""); /* Reset. */ - grpc_exec_ctx_finish(&exec_ctx); } static void test_google_default_creds_refresh_token(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_google_refresh_token_credentials* refresh; grpc_composite_channel_credentials* creds; grpc_flush_cached_google_default_credentials(); @@ -931,15 +898,13 @@ static void test_google_default_creds_refresh_token(void) { refresh = (grpc_google_refresh_token_credentials*)creds->call_creds; GPR_ASSERT(strcmp(refresh->refresh_token.client_id, "32555999999.apps.googleusercontent.com") == 0); - grpc_channel_credentials_unref(&exec_ctx, &creds->base); + grpc_channel_credentials_unref(&creds->base); gpr_setenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR, ""); /* Reset. */ - grpc_exec_ctx_finish(&exec_ctx); } static int default_creds_gce_detection_httpcli_get_success_override( - grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, - grpc_millis deadline, grpc_closure* on_done, - grpc_httpcli_response* response) { + const grpc_httpcli_request* request, grpc_millis deadline, + grpc_closure* on_done, grpc_httpcli_response* response) { *response = http_response(200, ""); grpc_http_header* headers = static_cast(gpr_malloc(sizeof(*headers) * 1)); @@ -949,14 +914,14 @@ static int default_creds_gce_detection_httpcli_get_success_override( response->hdrs = headers; GPR_ASSERT(strcmp(request->http.path, "/") == 0); GPR_ASSERT(strcmp(request->host, "metadata.google.internal") == 0); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } static char* null_well_known_creds_path_getter(void) { return nullptr; } static void test_google_default_creds_gce(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; expected_md emd[] = { {"authorization", "Bearer ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_"}}; request_metadata_state* state = @@ -981,8 +946,8 @@ static void test_google_default_creds_gce(void) { GPR_ASSERT(creds->call_creds != nullptr); grpc_httpcli_set_override(compute_engine_httpcli_get_success_override, httpcli_post_should_not_be_called); - run_request_metadata_test(&exec_ctx, creds->call_creds, auth_md_ctx, state); - grpc_exec_ctx_flush(&exec_ctx); + run_request_metadata_test(creds->call_creds, auth_md_ctx, state); + grpc_core::ExecCtx::Get()->Flush(); /* Check that we get a cached creds if we call grpc_google_default_credentials_create again. @@ -994,22 +959,20 @@ static void test_google_default_creds_gce(void) { GPR_ASSERT(cached_creds == &creds->base); /* Cleanup. */ - grpc_channel_credentials_unref(&exec_ctx, cached_creds); - grpc_channel_credentials_unref(&exec_ctx, &creds->base); + grpc_channel_credentials_unref(cached_creds); + grpc_channel_credentials_unref(&creds->base); grpc_httpcli_set_override(nullptr, nullptr); grpc_override_well_known_credentials_path_getter(nullptr); - grpc_exec_ctx_finish(&exec_ctx); } static int default_creds_gce_detection_httpcli_get_failure_override( - grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, - grpc_millis deadline, grpc_closure* on_done, - grpc_httpcli_response* response) { + const grpc_httpcli_request* request, grpc_millis deadline, + grpc_closure* on_done, grpc_httpcli_response* response) { /* No magic header. */ GPR_ASSERT(strcmp(request->http.path, "/") == 0); GPR_ASSERT(strcmp(request->host, "metadata.google.internal") == 0); *response = http_response(200, ""); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } @@ -1093,7 +1056,7 @@ static void plugin_destroy(void* state) { static void test_metadata_plugin_success(void) { plugin_state state = PLUGIN_INITIAL_STATE; grpc_metadata_credentials_plugin plugin; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, nullptr, nullptr}; request_metadata_state* md_state = make_request_metadata_state( @@ -1106,17 +1069,17 @@ static void test_metadata_plugin_success(void) { grpc_call_credentials* creds = grpc_metadata_credentials_create_from_plugin(plugin, nullptr); GPR_ASSERT(state == PLUGIN_INITIAL_STATE); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, md_state); + run_request_metadata_test(creds, auth_md_ctx, md_state); GPR_ASSERT(state == PLUGIN_GET_METADATA_CALLED_STATE); - grpc_call_credentials_unref(&exec_ctx, creds); - grpc_exec_ctx_finish(&exec_ctx); + grpc_call_credentials_unref(creds); + GPR_ASSERT(state == PLUGIN_DESTROY_CALLED_STATE); } static void test_metadata_plugin_failure(void) { plugin_state state = PLUGIN_INITIAL_STATE; grpc_metadata_credentials_plugin plugin; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_auth_metadata_context auth_md_ctx = {test_service_url, test_method, nullptr, nullptr}; char* expected_error; @@ -1134,10 +1097,10 @@ static void test_metadata_plugin_failure(void) { grpc_call_credentials* creds = grpc_metadata_credentials_create_from_plugin(plugin, nullptr); GPR_ASSERT(state == PLUGIN_INITIAL_STATE); - run_request_metadata_test(&exec_ctx, creds, auth_md_ctx, md_state); + run_request_metadata_test(creds, auth_md_ctx, md_state); GPR_ASSERT(state == PLUGIN_GET_METADATA_CALLED_STATE); - grpc_call_credentials_unref(&exec_ctx, creds); - grpc_exec_ctx_finish(&exec_ctx); + grpc_call_credentials_unref(creds); + GPR_ASSERT(state == PLUGIN_DESTROY_CALLED_STATE); } @@ -1158,7 +1121,7 @@ static void test_get_well_known_google_credentials_file_path(void) { } static void test_channel_creds_duplicate_without_call_creds(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_channel_credentials* channel_creds = grpc_fake_transport_security_credentials_create(); @@ -1167,23 +1130,21 @@ static void test_channel_creds_duplicate_without_call_creds(void) { grpc_channel_credentials_duplicate_without_call_credentials( channel_creds); GPR_ASSERT(dup == channel_creds); - grpc_channel_credentials_unref(&exec_ctx, dup); + grpc_channel_credentials_unref(dup); grpc_call_credentials* call_creds = grpc_access_token_credentials_create("blah", nullptr); grpc_channel_credentials* composite_creds = grpc_composite_channel_credentials_create(channel_creds, call_creds, nullptr); - grpc_call_credentials_unref(&exec_ctx, call_creds); + grpc_call_credentials_unref(call_creds); dup = grpc_channel_credentials_duplicate_without_call_credentials( composite_creds); GPR_ASSERT(dup == channel_creds); - grpc_channel_credentials_unref(&exec_ctx, dup); - - grpc_channel_credentials_unref(&exec_ctx, channel_creds); - grpc_channel_credentials_unref(&exec_ctx, composite_creds); + grpc_channel_credentials_unref(dup); - grpc_exec_ctx_finish(&exec_ctx); + grpc_channel_credentials_unref(channel_creds); + grpc_channel_credentials_unref(composite_creds); } typedef struct { diff --git a/test/core/security/json_token_test.cc b/test/core/security/json_token_test.cc index 0b6ccd5e37d..aac9cc00297 100644 --- a/test/core/security/json_token_test.cc +++ b/test/core/security/json_token_test.cc @@ -207,7 +207,7 @@ static void test_parse_json_key_failure_no_private_key(void) { static grpc_json* parse_json_part_from_jwt(const char* str, size_t len, char** scratchpad) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; char* b64; char* decoded; grpc_json* json; @@ -215,7 +215,7 @@ static grpc_json* parse_json_part_from_jwt(const char* str, size_t len, b64 = static_cast(gpr_malloc(len + 1)); strncpy(b64, str, len); b64[len] = '\0'; - slice = grpc_base64_decode(&exec_ctx, b64, 1); + slice = grpc_base64_decode(b64, 1); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(slice)); decoded = static_cast(gpr_malloc(GRPC_SLICE_LENGTH(slice) + 1)); strncpy(decoded, (const char*)GRPC_SLICE_START_PTR(slice), @@ -225,7 +225,7 @@ static grpc_json* parse_json_part_from_jwt(const char* str, size_t len, gpr_free(b64); *scratchpad = decoded; grpc_slice_unref(slice); - grpc_exec_ctx_finish(&exec_ctx); + return json; } @@ -327,12 +327,12 @@ static void check_jwt_claim(grpc_json* claim, const char* expected_audience, static void check_jwt_signature(const char* b64_signature, RSA* rsa_key, const char* signed_data, size_t signed_data_size) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; EVP_MD_CTX* md_ctx = EVP_MD_CTX_create(); EVP_PKEY* key = EVP_PKEY_new(); - grpc_slice sig = grpc_base64_decode(&exec_ctx, b64_signature, 1); + grpc_slice sig = grpc_base64_decode(b64_signature, 1); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(sig)); GPR_ASSERT(GRPC_SLICE_LENGTH(sig) == 128); @@ -347,11 +347,9 @@ static void check_jwt_signature(const char* b64_signature, RSA* rsa_key, GPR_ASSERT(EVP_DigestVerifyFinal(md_ctx, GRPC_SLICE_START_PTR(sig), GRPC_SLICE_LENGTH(sig)) == 1); - grpc_slice_unref_internal(&exec_ctx, sig); + grpc_slice_unref_internal(sig); if (key != nullptr) EVP_PKEY_free(key); if (md_ctx != nullptr) EVP_MD_CTX_destroy(md_ctx); - - grpc_exec_ctx_finish(&exec_ctx); } static char* service_account_creds_jwt_encode_and_sign( @@ -485,6 +483,7 @@ static void test_parse_refresh_token_failure_no_refresh_token(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); test_parse_json_key_success(); test_parse_json_key_failure_bad_json(); test_parse_json_key_failure_no_type(); @@ -499,5 +498,6 @@ int main(int argc, char** argv) { test_parse_refresh_token_failure_no_client_id(); test_parse_refresh_token_failure_no_client_secret(); test_parse_refresh_token_failure_no_refresh_token(); + grpc_shutdown(); return 0; } diff --git a/test/core/security/jwt_verifier_test.cc b/test/core/security/jwt_verifier_test.cc index df0ebe56077..e219260b1d2 100644 --- a/test/core/security/jwt_verifier_test.cc +++ b/test/core/security/jwt_verifier_test.cc @@ -209,8 +209,8 @@ static void test_claims_success(void) { grpc_json* json = grpc_json_parse_string_with_len( (char*)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); GPR_ASSERT(json != nullptr); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - claims = grpc_jwt_claims_from_json(&exec_ctx, json, s); + grpc_core::ExecCtx exec_ctx; + claims = grpc_jwt_claims_from_json(json, s); GPR_ASSERT(claims != nullptr); GPR_ASSERT(grpc_jwt_claims_json(claims) == json); GPR_ASSERT(strcmp(grpc_jwt_claims_audience(claims), "https://foo.com") == 0); @@ -219,8 +219,7 @@ static void test_claims_success(void) { GPR_ASSERT(strcmp(grpc_jwt_claims_id(claims), "jwtuniqueid") == 0); GPR_ASSERT(grpc_jwt_claims_check(claims, "https://foo.com") == GRPC_JWT_VERIFIER_OK); - grpc_jwt_claims_destroy(&exec_ctx, claims); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_claims_destroy(claims); } static void test_expired_claims_failure(void) { @@ -232,8 +231,8 @@ static void test_expired_claims_failure(void) { gpr_timespec exp_exp = {120, 0, GPR_CLOCK_REALTIME}; gpr_timespec exp_nbf = {60, 0, GPR_CLOCK_REALTIME}; GPR_ASSERT(json != nullptr); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - claims = grpc_jwt_claims_from_json(&exec_ctx, json, s); + grpc_core::ExecCtx exec_ctx; + claims = grpc_jwt_claims_from_json(json, s); GPR_ASSERT(claims != nullptr); GPR_ASSERT(grpc_jwt_claims_json(claims) == json); GPR_ASSERT(strcmp(grpc_jwt_claims_audience(claims), "https://foo.com") == 0); @@ -246,17 +245,15 @@ static void test_expired_claims_failure(void) { GPR_ASSERT(grpc_jwt_claims_check(claims, "https://foo.com") == GRPC_JWT_VERIFIER_TIME_CONSTRAINT_FAILURE); - grpc_jwt_claims_destroy(&exec_ctx, claims); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_claims_destroy(claims); } static void test_invalid_claims_failure(void) { grpc_slice s = grpc_slice_from_copied_string(invalid_claims); grpc_json* json = grpc_json_parse_string_with_len( (char*)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT(grpc_jwt_claims_from_json(&exec_ctx, json, s) == nullptr); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + GPR_ASSERT(grpc_jwt_claims_from_json(json, s) == nullptr); } static void test_bad_audience_claims_failure(void) { @@ -265,13 +262,12 @@ static void test_bad_audience_claims_failure(void) { grpc_json* json = grpc_json_parse_string_with_len( (char*)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); GPR_ASSERT(json != nullptr); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - claims = grpc_jwt_claims_from_json(&exec_ctx, json, s); + grpc_core::ExecCtx exec_ctx; + claims = grpc_jwt_claims_from_json(json, s); GPR_ASSERT(claims != nullptr); GPR_ASSERT(grpc_jwt_claims_check(claims, "https://bar.com") == GRPC_JWT_VERIFIER_BAD_AUDIENCE); - grpc_jwt_claims_destroy(&exec_ctx, claims); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_claims_destroy(claims); } static void test_bad_subject_claims_failure(void) { @@ -280,13 +276,12 @@ static void test_bad_subject_claims_failure(void) { grpc_json* json = grpc_json_parse_string_with_len( (char*)GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s)); GPR_ASSERT(json != nullptr); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - claims = grpc_jwt_claims_from_json(&exec_ctx, json, s); + grpc_core::ExecCtx exec_ctx; + claims = grpc_jwt_claims_from_json(json, s); GPR_ASSERT(claims != nullptr); GPR_ASSERT(grpc_jwt_claims_check(claims, "https://foo.com") == GRPC_JWT_VERIFIER_BAD_SUBJECT); - grpc_jwt_claims_destroy(&exec_ctx, claims); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_claims_destroy(claims); } static char* json_key_str(const char* last_part) { @@ -323,17 +318,16 @@ static grpc_httpcli_response http_response(int status, char* body) { } static int httpcli_post_should_not_be_called( - grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, - const char* body_bytes, size_t body_size, grpc_millis deadline, - grpc_closure* on_done, grpc_httpcli_response* response) { + const grpc_httpcli_request* request, const char* body_bytes, + size_t body_size, grpc_millis deadline, grpc_closure* on_done, + grpc_httpcli_response* response) { GPR_ASSERT("HTTP POST should not be called" == nullptr); return 1; } static int httpcli_get_google_keys_for_email( - grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, - grpc_millis deadline, grpc_closure* on_done, - grpc_httpcli_response* response) { + const grpc_httpcli_request* request, grpc_millis deadline, + grpc_closure* on_done, grpc_httpcli_response* response) { *response = http_response(200, good_google_email_keys()); GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); GPR_ASSERT(strcmp(request->host, "www.googleapis.com") == 0); @@ -341,22 +335,22 @@ static int httpcli_get_google_keys_for_email( "/robot/v1/metadata/x509/" "777-abaslkan11hlb6nmim3bpspl31ud@developer." "gserviceaccount.com") == 0); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } -static void on_verification_success(grpc_exec_ctx* exec_ctx, void* user_data, +static void on_verification_success(void* user_data, grpc_jwt_verifier_status status, grpc_jwt_claims* claims) { GPR_ASSERT(status == GRPC_JWT_VERIFIER_OK); GPR_ASSERT(claims != nullptr); GPR_ASSERT(user_data == (void*)expected_user_data); GPR_ASSERT(strcmp(grpc_jwt_claims_audience(claims), expected_audience) == 0); - grpc_jwt_claims_destroy(exec_ctx, claims); + grpc_jwt_claims_destroy(claims); } static void test_jwt_verifier_google_email_issuer_success(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(nullptr, 0); char* jwt = nullptr; char* key_str = json_key_str(json_key_str_part3_for_google_email_issuer); @@ -369,28 +363,27 @@ static void test_jwt_verifier_google_email_issuer_success(void) { nullptr); grpc_auth_json_key_destruct(&key); GPR_ASSERT(jwt != nullptr); - grpc_jwt_verifier_verify(&exec_ctx, verifier, nullptr, jwt, expected_audience, + grpc_jwt_verifier_verify(verifier, nullptr, jwt, expected_audience, on_verification_success, (void*)expected_user_data); - grpc_jwt_verifier_destroy(&exec_ctx, verifier); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_verifier_destroy(verifier); + grpc_core::ExecCtx::Get()->Flush(); gpr_free(jwt); grpc_httpcli_set_override(nullptr, nullptr); } static int httpcli_get_custom_keys_for_email( - grpc_exec_ctx* exec_ctx, const grpc_httpcli_request* request, - grpc_millis deadline, grpc_closure* on_done, - grpc_httpcli_response* response) { + const grpc_httpcli_request* request, grpc_millis deadline, + grpc_closure* on_done, grpc_httpcli_response* response) { *response = http_response(200, gpr_strdup(good_jwk_set)); GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); GPR_ASSERT(strcmp(request->host, "keys.bar.com") == 0); GPR_ASSERT(strcmp(request->http.path, "/jwk/foo@bar.com") == 0); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } static void test_jwt_verifier_custom_email_issuer_success(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(&custom_mapping, 1); char* jwt = nullptr; char* key_str = json_key_str(json_key_str_part3_for_custom_email_issuer); @@ -403,28 +396,26 @@ static void test_jwt_verifier_custom_email_issuer_success(void) { nullptr); grpc_auth_json_key_destruct(&key); GPR_ASSERT(jwt != nullptr); - grpc_jwt_verifier_verify(&exec_ctx, verifier, nullptr, jwt, expected_audience, + grpc_jwt_verifier_verify(verifier, nullptr, jwt, expected_audience, on_verification_success, (void*)expected_user_data); - grpc_jwt_verifier_destroy(&exec_ctx, verifier); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_verifier_destroy(verifier); + grpc_core::ExecCtx::Get()->Flush(); gpr_free(jwt); grpc_httpcli_set_override(nullptr, nullptr); } -static int httpcli_get_jwk_set(grpc_exec_ctx* exec_ctx, - const grpc_httpcli_request* request, +static int httpcli_get_jwk_set(const grpc_httpcli_request* request, grpc_millis deadline, grpc_closure* on_done, grpc_httpcli_response* response) { *response = http_response(200, gpr_strdup(good_jwk_set)); GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); GPR_ASSERT(strcmp(request->host, "www.googleapis.com") == 0); GPR_ASSERT(strcmp(request->http.path, "/oauth2/v3/certs") == 0); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } -static int httpcli_get_openid_config(grpc_exec_ctx* exec_ctx, - const grpc_httpcli_request* request, +static int httpcli_get_openid_config(const grpc_httpcli_request* request, grpc_millis deadline, grpc_closure* on_done, grpc_httpcli_response* response) { @@ -434,12 +425,12 @@ static int httpcli_get_openid_config(grpc_exec_ctx* exec_ctx, GPR_ASSERT(strcmp(request->http.path, GRPC_OPENID_CONFIG_URL_SUFFIX) == 0); grpc_httpcli_set_override(httpcli_get_jwk_set, httpcli_post_should_not_be_called); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } static void test_jwt_verifier_url_issuer_success(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(nullptr, 0); char* jwt = nullptr; char* key_str = json_key_str(json_key_str_part3_for_url_issuer); @@ -452,16 +443,15 @@ static void test_jwt_verifier_url_issuer_success(void) { nullptr); grpc_auth_json_key_destruct(&key); GPR_ASSERT(jwt != nullptr); - grpc_jwt_verifier_verify(&exec_ctx, verifier, nullptr, jwt, expected_audience, + grpc_jwt_verifier_verify(verifier, nullptr, jwt, expected_audience, on_verification_success, (void*)expected_user_data); - grpc_jwt_verifier_destroy(&exec_ctx, verifier); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_verifier_destroy(verifier); + grpc_core::ExecCtx::Get()->Flush(); gpr_free(jwt); grpc_httpcli_set_override(nullptr, nullptr); } -static void on_verification_key_retrieval_error(grpc_exec_ctx* exec_ctx, - void* user_data, +static void on_verification_key_retrieval_error(void* user_data, grpc_jwt_verifier_status status, grpc_jwt_claims* claims) { GPR_ASSERT(status == GRPC_JWT_VERIFIER_KEY_RETRIEVAL_ERROR); @@ -469,18 +459,17 @@ static void on_verification_key_retrieval_error(grpc_exec_ctx* exec_ctx, GPR_ASSERT(user_data == (void*)expected_user_data); } -static int httpcli_get_bad_json(grpc_exec_ctx* exec_ctx, - const grpc_httpcli_request* request, +static int httpcli_get_bad_json(const grpc_httpcli_request* request, grpc_millis deadline, grpc_closure* on_done, grpc_httpcli_response* response) { *response = http_response(200, gpr_strdup("{\"bad\": \"stuff\"}")); GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); - GRPC_CLOSURE_SCHED(exec_ctx, on_done, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); return 1; } static void test_jwt_verifier_url_issuer_bad_config(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(nullptr, 0); char* jwt = nullptr; char* key_str = json_key_str(json_key_str_part3_for_url_issuer); @@ -493,17 +482,17 @@ static void test_jwt_verifier_url_issuer_bad_config(void) { nullptr); grpc_auth_json_key_destruct(&key); GPR_ASSERT(jwt != nullptr); - grpc_jwt_verifier_verify(&exec_ctx, verifier, nullptr, jwt, expected_audience, + grpc_jwt_verifier_verify(verifier, nullptr, jwt, expected_audience, on_verification_key_retrieval_error, (void*)expected_user_data); - grpc_jwt_verifier_destroy(&exec_ctx, verifier); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_verifier_destroy(verifier); + grpc_core::ExecCtx::Get()->Flush(); gpr_free(jwt); grpc_httpcli_set_override(nullptr, nullptr); } static void test_jwt_verifier_bad_json_key(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(nullptr, 0); char* jwt = nullptr; char* key_str = json_key_str(json_key_str_part3_for_google_email_issuer); @@ -516,11 +505,11 @@ static void test_jwt_verifier_bad_json_key(void) { nullptr); grpc_auth_json_key_destruct(&key); GPR_ASSERT(jwt != nullptr); - grpc_jwt_verifier_verify(&exec_ctx, verifier, nullptr, jwt, expected_audience, + grpc_jwt_verifier_verify(verifier, nullptr, jwt, expected_audience, on_verification_key_retrieval_error, (void*)expected_user_data); - grpc_jwt_verifier_destroy(&exec_ctx, verifier); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_verifier_destroy(verifier); + grpc_core::ExecCtx::Get()->Flush(); gpr_free(jwt); grpc_httpcli_set_override(nullptr, nullptr); } @@ -532,9 +521,8 @@ static void corrupt_jwt_sig(char* jwt) { char* last_dot = strrchr(jwt, '.'); GPR_ASSERT(last_dot != nullptr); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - sig = grpc_base64_decode(&exec_ctx, last_dot + 1, 1); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + sig = grpc_base64_decode(last_dot + 1, 1); } GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(sig)); sig_bytes = GRPC_SLICE_START_PTR(sig); @@ -546,8 +534,7 @@ static void corrupt_jwt_sig(char* jwt) { grpc_slice_unref(sig); } -static void on_verification_bad_signature(grpc_exec_ctx* exec_ctx, - void* user_data, +static void on_verification_bad_signature(void* user_data, grpc_jwt_verifier_status status, grpc_jwt_claims* claims) { GPR_ASSERT(status == GRPC_JWT_VERIFIER_BAD_SIGNATURE); @@ -556,7 +543,7 @@ static void on_verification_bad_signature(grpc_exec_ctx* exec_ctx, } static void test_jwt_verifier_bad_signature(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(nullptr, 0); char* jwt = nullptr; char* key_str = json_key_str(json_key_str_part3_for_url_issuer); @@ -570,17 +557,16 @@ static void test_jwt_verifier_bad_signature(void) { grpc_auth_json_key_destruct(&key); corrupt_jwt_sig(jwt); GPR_ASSERT(jwt != nullptr); - grpc_jwt_verifier_verify(&exec_ctx, verifier, nullptr, jwt, expected_audience, + grpc_jwt_verifier_verify(verifier, nullptr, jwt, expected_audience, on_verification_bad_signature, (void*)expected_user_data); gpr_free(jwt); - grpc_jwt_verifier_destroy(&exec_ctx, verifier); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_verifier_destroy(verifier); + grpc_core::ExecCtx::Get()->Flush(); grpc_httpcli_set_override(nullptr, nullptr); } -static int httpcli_get_should_not_be_called(grpc_exec_ctx* exec_ctx, - const grpc_httpcli_request* request, +static int httpcli_get_should_not_be_called(const grpc_httpcli_request* request, grpc_millis deadline, grpc_closure* on_done, grpc_httpcli_response* response) { @@ -588,7 +574,7 @@ static int httpcli_get_should_not_be_called(grpc_exec_ctx* exec_ctx, return 1; } -static void on_verification_bad_format(grpc_exec_ctx* exec_ctx, void* user_data, +static void on_verification_bad_format(void* user_data, grpc_jwt_verifier_status status, grpc_jwt_claims* claims) { GPR_ASSERT(status == GRPC_JWT_VERIFIER_BAD_FORMAT); @@ -597,15 +583,15 @@ static void on_verification_bad_format(grpc_exec_ctx* exec_ctx, void* user_data, } static void test_jwt_verifier_bad_format(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_jwt_verifier* verifier = grpc_jwt_verifier_create(nullptr, 0); grpc_httpcli_set_override(httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); - grpc_jwt_verifier_verify(&exec_ctx, verifier, nullptr, "bad jwt", - expected_audience, on_verification_bad_format, + grpc_jwt_verifier_verify(verifier, nullptr, "bad jwt", expected_audience, + on_verification_bad_format, (void*)expected_user_data); - grpc_jwt_verifier_destroy(&exec_ctx, verifier); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_verifier_destroy(verifier); + grpc_core::ExecCtx::Get()->Flush(); grpc_httpcli_set_override(nullptr, nullptr); } diff --git a/test/core/security/oauth2_utils.cc b/test/core/security/oauth2_utils.cc index 602041eecc3..0d3a1279af3 100644 --- a/test/core/security/oauth2_utils.cc +++ b/test/core/security/oauth2_utils.cc @@ -39,8 +39,7 @@ typedef struct { grpc_closure closure; } oauth2_request; -static void on_oauth2_response(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_oauth2_response(void* arg, grpc_error* error) { oauth2_request* request = (oauth2_request*)arg; char* token = nullptr; grpc_slice token_slice; @@ -54,25 +53,23 @@ static void on_oauth2_response(grpc_exec_ctx* exec_ctx, void* arg, GRPC_SLICE_LENGTH(token_slice)); token[GRPC_SLICE_LENGTH(token_slice)] = '\0'; } - grpc_credentials_mdelem_array_destroy(exec_ctx, &request->md_array); + grpc_credentials_mdelem_array_destroy(&request->md_array); gpr_mu_lock(request->mu); request->is_done = true; request->token = token; GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&request->pops), - nullptr)); + grpc_pollset_kick(grpc_polling_entity_pollset(&request->pops), nullptr)); gpr_mu_unlock(request->mu); } -static void do_nothing(grpc_exec_ctx* exec_ctx, void* unused, - grpc_error* error) {} +static void do_nothing(void* unused, grpc_error* error) {} char* grpc_test_fetch_oauth2_token_with_credentials( grpc_call_credentials* creds) { oauth2_request request; memset(&request, 0, sizeof(request)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_closure do_nothing_closure; grpc_auth_metadata_context null_ctx = {"", "", nullptr, nullptr}; @@ -88,31 +85,30 @@ char* grpc_test_fetch_oauth2_token_with_credentials( grpc_schedule_on_exec_ctx); grpc_error* error = GRPC_ERROR_NONE; - if (grpc_call_credentials_get_request_metadata( - &exec_ctx, creds, &request.pops, null_ctx, &request.md_array, - &request.closure, &error)) { + if (grpc_call_credentials_get_request_metadata(creds, &request.pops, null_ctx, + &request.md_array, + &request.closure, &error)) { // Synchronous result; invoke callback directly. - on_oauth2_response(&exec_ctx, &request, error); + on_oauth2_response(&request, error); GRPC_ERROR_UNREF(error); } - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(request.mu); while (!request.is_done) { grpc_pollset_worker* worker = nullptr; if (!GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(&exec_ctx, - grpc_polling_entity_pollset(&request.pops), + grpc_pollset_work(grpc_polling_entity_pollset(&request.pops), &worker, GRPC_MILLIS_INF_FUTURE))) { request.is_done = true; } } gpr_mu_unlock(request.mu); - grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&request.pops), + grpc_pollset_shutdown(grpc_polling_entity_pollset(&request.pops), &do_nothing_closure); - grpc_exec_ctx_finish(&exec_ctx); + gpr_free(grpc_polling_entity_pollset(&request.pops)); return request.token; } diff --git a/test/core/security/print_google_default_creds_token.cc b/test/core/security/print_google_default_creds_token.cc index f4acf023bd0..b3742f58a89 100644 --- a/test/core/security/print_google_default_creds_token.cc +++ b/test/core/security/print_google_default_creds_token.cc @@ -41,8 +41,7 @@ typedef struct { grpc_closure on_request_metadata; } synchronizer; -static void on_metadata_response(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_metadata_response(void* arg, grpc_error* error) { synchronizer* sync = static_cast(arg); if (error != GRPC_ERROR_NONE) { fprintf(stderr, "Fetching token failed: %s\n", grpc_error_string(error)); @@ -57,14 +56,13 @@ static void on_metadata_response(grpc_exec_ctx* exec_ctx, void* arg, sync->is_done = true; GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&sync->pops), - nullptr)); + grpc_pollset_kick(grpc_polling_entity_pollset(&sync->pops), nullptr)); gpr_mu_unlock(sync->mu); } int main(int argc, char** argv) { int result = 0; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; synchronizer sync; grpc_channel_credentials* creds = nullptr; const char* service_url = "https://test.foo.google.com/Foo"; @@ -97,11 +95,10 @@ int main(int argc, char** argv) { error = GRPC_ERROR_NONE; if (grpc_call_credentials_get_request_metadata( - &exec_ctx, ((grpc_composite_channel_credentials*)creds)->call_creds, - &sync.pops, context, &sync.md_array, &sync.on_request_metadata, - &error)) { + ((grpc_composite_channel_credentials*)creds)->call_creds, &sync.pops, + context, &sync.md_array, &sync.on_request_metadata, &error)) { // Synchronous response. Invoke callback directly. - on_metadata_response(&exec_ctx, &sync, error); + on_metadata_response(&sync, error); GRPC_ERROR_UNREF(error); } @@ -110,18 +107,15 @@ int main(int argc, char** argv) { grpc_pollset_worker* worker = nullptr; if (!GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(&exec_ctx, - grpc_polling_entity_pollset(&sync.pops), &worker, + grpc_pollset_work(grpc_polling_entity_pollset(&sync.pops), &worker, GRPC_MILLIS_INF_FUTURE))) sync.is_done = true; gpr_mu_unlock(sync.mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(sync.mu); } gpr_mu_unlock(sync.mu); - grpc_exec_ctx_finish(&exec_ctx); - grpc_channel_credentials_release(creds); gpr_free(grpc_polling_entity_pollset(&sync.pops)); diff --git a/test/core/security/secure_endpoint_test.cc b/test/core/security/secure_endpoint_test.cc index a12af024798..38c78fed423 100644 --- a/test/core/security/secure_endpoint_test.cc +++ b/test/core/security/secure_endpoint_test.cc @@ -38,7 +38,7 @@ static grpc_pollset* g_pollset; static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( size_t slice_size, grpc_slice* leftover_slices, size_t leftover_nslices, bool use_zero_copy_protector) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; tsi_frame_protector* fake_read_protector = tsi_create_fake_frame_protector(nullptr); tsi_frame_protector* fake_write_protector = @@ -60,8 +60,8 @@ static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( a[0].value.integer = (int)slice_size; grpc_channel_args args = {GPR_ARRAY_SIZE(a), a}; tcp = grpc_iomgr_create_endpoint_pair("fixture", &args); - grpc_endpoint_add_to_pollset(&exec_ctx, tcp.client, g_pollset); - grpc_endpoint_add_to_pollset(&exec_ctx, tcp.server, g_pollset); + grpc_endpoint_add_to_pollset(tcp.client, g_pollset); + grpc_endpoint_add_to_pollset(tcp.server, g_pollset); if (leftover_nslices == 0) { f.client_ep = grpc_secure_endpoint_create(fake_read_protector, @@ -117,7 +117,7 @@ static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( f.server_ep = grpc_secure_endpoint_create(fake_write_protector, fake_write_zero_copy_protector, tcp.server, nullptr, 0); - grpc_exec_ctx_finish(&exec_ctx); + return f; } @@ -165,65 +165,62 @@ static grpc_endpoint_test_config configs[] = { clean_up}, }; -static void inc_call_ctr(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { - ++*(int*)arg; -} +static void inc_call_ctr(void* arg, grpc_error* error) { ++*(int*)arg; } static void test_leftover(grpc_endpoint_test_config config, size_t slice_size) { grpc_endpoint_test_fixture f = config.create_fixture(slice_size); grpc_slice_buffer incoming; grpc_slice s = grpc_slice_from_copied_string("hello world 12345678900987654321"); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; int n = 0; grpc_closure done_closure; gpr_log(GPR_INFO, "Start test left over"); grpc_slice_buffer_init(&incoming); GRPC_CLOSURE_INIT(&done_closure, inc_call_ctr, &n, grpc_schedule_on_exec_ctx); - grpc_endpoint_read(&exec_ctx, f.client_ep, &incoming, &done_closure); - grpc_exec_ctx_finish(&exec_ctx); + grpc_endpoint_read(f.client_ep, &incoming, &done_closure); + + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(n == 1); GPR_ASSERT(incoming.count == 1); GPR_ASSERT(grpc_slice_eq(s, incoming.slices[0])); grpc_endpoint_shutdown( - &exec_ctx, f.client_ep, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("test_leftover end")); + f.client_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("test_leftover end")); grpc_endpoint_shutdown( - &exec_ctx, f.server_ep, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("test_leftover end")); - grpc_endpoint_destroy(&exec_ctx, f.client_ep); - grpc_endpoint_destroy(&exec_ctx, f.server_ep); - grpc_exec_ctx_finish(&exec_ctx); - grpc_slice_unref_internal(&exec_ctx, s); - grpc_slice_buffer_destroy_internal(&exec_ctx, &incoming); + f.server_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("test_leftover end")); + grpc_endpoint_destroy(f.client_ep); + grpc_endpoint_destroy(f.server_ep); + + grpc_slice_unref_internal(s); + grpc_slice_buffer_destroy_internal(&incoming); clean_up(); } -static void destroy_pollset(grpc_exec_ctx* exec_ctx, void* p, - grpc_error* error) { - grpc_pollset_destroy(exec_ctx, (grpc_pollset*)p); +static void destroy_pollset(void* p, grpc_error* error) { + grpc_pollset_destroy((grpc_pollset*)p); } int main(int argc, char** argv) { grpc_closure destroyed; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_test_init(argc, argv); - grpc_init(); - g_pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); - grpc_pollset_init(g_pollset, &g_mu); - grpc_endpoint_tests(configs[0], g_pollset, g_mu); - grpc_endpoint_tests(configs[1], g_pollset, g_mu); - test_leftover(configs[2], 1); - test_leftover(configs[3], 1); - GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, - grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed); - grpc_exec_ctx_finish(&exec_ctx); + + { + grpc_core::ExecCtx exec_ctx; + g_pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); + grpc_pollset_init(g_pollset, &g_mu); + grpc_endpoint_tests(configs[0], g_pollset, g_mu); + grpc_endpoint_tests(configs[1], g_pollset, g_mu); + test_leftover(configs[2], 1); + test_leftover(configs[3], 1); + GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset, + grpc_schedule_on_exec_ctx); + grpc_pollset_shutdown(g_pollset, &destroyed); + } + grpc_shutdown(); gpr_free(g_pollset); diff --git a/test/core/security/ssl_server_fuzzer.cc b/test/core/security/ssl_server_fuzzer.cc index d83ebb18d21..6e306985623 100644 --- a/test/core/security/ssl_server_fuzzer.cc +++ b/test/core/security/ssl_server_fuzzer.cc @@ -40,8 +40,7 @@ struct handshake_state { bool done_callback_called; }; -static void on_handshake_done(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void on_handshake_done(void* arg, grpc_error* error) { grpc_handshaker_args* args = static_cast(arg); struct handshake_state* state = static_cast(args->user_data); @@ -56,67 +55,70 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (squelch) gpr_set_log_function(dont_log); if (leak_check) grpc_memory_counters_init(); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - - grpc_resource_quota* resource_quota = - grpc_resource_quota_create("ssl_server_fuzzer"); - grpc_endpoint* mock_endpoint = - grpc_mock_endpoint_create(discard_write, resource_quota); - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); - - grpc_mock_endpoint_put_read( - &exec_ctx, mock_endpoint, - grpc_slice_from_copied_buffer((const char*)data, size)); - - // Load key pair and establish server SSL credentials. - grpc_ssl_pem_key_cert_pair pem_key_cert_pair; - grpc_slice ca_slice, cert_slice, key_slice; - ca_slice = grpc_slice_from_static_string(test_root_cert); - cert_slice = grpc_slice_from_static_string(test_server1_cert); - key_slice = grpc_slice_from_static_string(test_server1_key); - const char* ca_cert = (const char*)GRPC_SLICE_START_PTR(ca_slice); - pem_key_cert_pair.private_key = (const char*)GRPC_SLICE_START_PTR(key_slice); - pem_key_cert_pair.cert_chain = (const char*)GRPC_SLICE_START_PTR(cert_slice); - grpc_server_credentials* creds = grpc_ssl_server_credentials_create( - ca_cert, &pem_key_cert_pair, 1, 0, nullptr); - - // Create security connector - grpc_server_security_connector* sc = nullptr; - grpc_security_status status = - grpc_server_credentials_create_security_connector(&exec_ctx, creds, &sc); - GPR_ASSERT(status == GRPC_SECURITY_OK); - grpc_millis deadline = GPR_MS_PER_SEC + grpc_exec_ctx_now(&exec_ctx); - - struct handshake_state state; - state.done_callback_called = false; - grpc_handshake_manager* handshake_mgr = grpc_handshake_manager_create(); - grpc_server_security_connector_add_handshakers(&exec_ctx, sc, handshake_mgr); - grpc_handshake_manager_do_handshake( - &exec_ctx, handshake_mgr, nullptr /* interested_parties */, mock_endpoint, - nullptr /* channel_args */, deadline, nullptr /* acceptor */, - on_handshake_done, &state); - grpc_exec_ctx_flush(&exec_ctx); - - // If the given string happens to be part of the correct client hello, the - // server will wait for more data. Explicitly fail the server by shutting down - // the endpoint. - if (!state.done_callback_called) { - grpc_endpoint_shutdown( - &exec_ctx, mock_endpoint, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Explicit close")); - grpc_exec_ctx_flush(&exec_ctx); + { + grpc_core::ExecCtx exec_ctx; + + grpc_resource_quota* resource_quota = + grpc_resource_quota_create("ssl_server_fuzzer"); + grpc_endpoint* mock_endpoint = + grpc_mock_endpoint_create(discard_write, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); + + grpc_mock_endpoint_put_read( + mock_endpoint, grpc_slice_from_copied_buffer((const char*)data, size)); + + // Load key pair and establish server SSL credentials. + grpc_ssl_pem_key_cert_pair pem_key_cert_pair; + grpc_slice ca_slice, cert_slice, key_slice; + ca_slice = grpc_slice_from_static_string(test_root_cert); + cert_slice = grpc_slice_from_static_string(test_server1_cert); + key_slice = grpc_slice_from_static_string(test_server1_key); + const char* ca_cert = (const char*)GRPC_SLICE_START_PTR(ca_slice); + pem_key_cert_pair.private_key = + (const char*)GRPC_SLICE_START_PTR(key_slice); + pem_key_cert_pair.cert_chain = + (const char*)GRPC_SLICE_START_PTR(cert_slice); + grpc_server_credentials* creds = grpc_ssl_server_credentials_create( + ca_cert, &pem_key_cert_pair, 1, 0, nullptr); + + // Create security connector + grpc_server_security_connector* sc = nullptr; + grpc_security_status status = + grpc_server_credentials_create_security_connector(creds, &sc); + GPR_ASSERT(status == GRPC_SECURITY_OK); + grpc_millis deadline = GPR_MS_PER_SEC + grpc_core::ExecCtx::Get()->Now(); + + struct handshake_state state; + state.done_callback_called = false; + grpc_handshake_manager* handshake_mgr = grpc_handshake_manager_create(); + grpc_server_security_connector_add_handshakers(sc, handshake_mgr); + grpc_handshake_manager_do_handshake( + handshake_mgr, nullptr /* interested_parties */, mock_endpoint, + nullptr /* channel_args */, deadline, nullptr /* acceptor */, + on_handshake_done, &state); + grpc_core::ExecCtx::Get()->Flush(); + + // If the given string happens to be part of the correct client hello, the + // server will wait for more data. Explicitly fail the server by shutting + // down the endpoint. + if (!state.done_callback_called) { + grpc_endpoint_shutdown( + mock_endpoint, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Explicit close")); + grpc_core::ExecCtx::Get()->Flush(); + } + + GPR_ASSERT(state.done_callback_called); + + grpc_handshake_manager_destroy(handshake_mgr); + GRPC_SECURITY_CONNECTOR_UNREF(&sc->base, "test"); + grpc_server_credentials_release(creds); + grpc_slice_unref(cert_slice); + grpc_slice_unref(key_slice); + grpc_slice_unref(ca_slice); + grpc_core::ExecCtx::Get()->Flush(); } - GPR_ASSERT(state.done_callback_called); - - grpc_handshake_manager_destroy(&exec_ctx, handshake_mgr); - GRPC_SECURITY_CONNECTOR_UNREF(&exec_ctx, &sc->base, "test"); - grpc_server_credentials_release(creds); - grpc_slice_unref(cert_slice); - grpc_slice_unref(key_slice); - grpc_slice_unref(ca_slice); - grpc_exec_ctx_flush(&exec_ctx); - grpc_shutdown(); if (leak_check) { counters = grpc_memory_counters_snapshot(); diff --git a/test/core/security/verify_jwt.cc b/test/core/security/verify_jwt.cc index 787d58bc377..e039970c671 100644 --- a/test/core/security/verify_jwt.cc +++ b/test/core/security/verify_jwt.cc @@ -44,7 +44,7 @@ static void print_usage_and_exit(gpr_cmdline* cl, const char* argv0) { exit(1); } -static void on_jwt_verification_done(grpc_exec_ctx* exec_ctx, void* user_data, +static void on_jwt_verification_done(void* user_data, grpc_jwt_verifier_status status, grpc_jwt_claims* claims) { synchronizer* sync = static_cast(user_data); @@ -57,7 +57,7 @@ static void on_jwt_verification_done(grpc_exec_ctx* exec_ctx, void* user_data, grpc_json_dump_to_string((grpc_json*)grpc_jwt_claims_json(claims), 2); printf("Claims: \n\n%s\n", claims_str); gpr_free(claims_str); - grpc_jwt_claims_destroy(exec_ctx, claims); + grpc_jwt_claims_destroy(claims); } else { GPR_ASSERT(claims == nullptr); fprintf(stderr, "Verification failed with error %s\n", @@ -66,8 +66,7 @@ static void on_jwt_verification_done(grpc_exec_ctx* exec_ctx, void* user_data, gpr_mu_lock(sync->mu); sync->is_done = 1; - GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, sync->pollset, nullptr)); + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(sync->pollset, nullptr)); gpr_mu_unlock(sync->mu); } @@ -77,7 +76,7 @@ int main(int argc, char** argv) { gpr_cmdline* cl; const char* jwt = nullptr; const char* aud = nullptr; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_init(); cl = gpr_cmdline_create("JWT verifier tool"); @@ -96,26 +95,26 @@ int main(int argc, char** argv) { grpc_pollset_init(sync.pollset, &sync.mu); sync.is_done = 0; - grpc_jwt_verifier_verify(&exec_ctx, verifier, sync.pollset, jwt, aud, + grpc_jwt_verifier_verify(verifier, sync.pollset, jwt, aud, on_jwt_verification_done, &sync); gpr_mu_lock(sync.mu); while (!sync.is_done) { grpc_pollset_worker* worker = nullptr; - if (!GRPC_LOG_IF_ERROR("pollset_work", - grpc_pollset_work(&exec_ctx, sync.pollset, &worker, - GRPC_MILLIS_INF_FUTURE))) + if (!GRPC_LOG_IF_ERROR( + "pollset_work", + grpc_pollset_work(sync.pollset, &worker, GRPC_MILLIS_INF_FUTURE))) sync.is_done = true; gpr_mu_unlock(sync.mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(sync.mu); } gpr_mu_unlock(sync.mu); gpr_free(sync.pollset); - grpc_jwt_verifier_destroy(&exec_ctx, verifier); - grpc_exec_ctx_finish(&exec_ctx); + grpc_jwt_verifier_destroy(verifier); + gpr_cmdline_destroy(cl); grpc_shutdown(); return !sync.success; diff --git a/test/core/slice/b64_test.cc b/test/core/slice/b64_test.cc index 479198f9f9e..94785fd1e28 100644 --- a/test/core/slice/b64_test.cc +++ b/test/core/slice/b64_test.cc @@ -20,6 +20,7 @@ #include +#include #include #include #include @@ -44,14 +45,14 @@ static void test_simple_encode_decode_b64(int url_safe, int multiline) { const char* hello = "hello"; char* hello_b64 = grpc_base64_encode(hello, strlen(hello), url_safe, multiline); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice hello_slice = grpc_base64_decode(&exec_ctx, hello_b64, url_safe); + grpc_core::ExecCtx exec_ctx; + grpc_slice hello_slice = grpc_base64_decode(hello_b64, url_safe); GPR_ASSERT(GRPC_SLICE_LENGTH(hello_slice) == strlen(hello)); GPR_ASSERT(strncmp((const char*)GRPC_SLICE_START_PTR(hello_slice), hello, GRPC_SLICE_LENGTH(hello_slice)) == 0); - grpc_slice_unref_internal(&exec_ctx, hello_slice); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref_internal(hello_slice); + gpr_free(hello_b64); } @@ -64,15 +65,14 @@ static void test_full_range_encode_decode_b64(int url_safe, int multiline) { /* Try all the different paddings. */ for (i = 0; i < 3; i++) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; b64 = grpc_base64_encode(orig, sizeof(orig) - i, url_safe, multiline); - orig_decoded = grpc_base64_decode(&exec_ctx, b64, url_safe); + orig_decoded = grpc_base64_decode(b64, url_safe); GPR_ASSERT(GRPC_SLICE_LENGTH(orig_decoded) == (sizeof(orig) - i)); GPR_ASSERT(buffers_are_equal(orig, GRPC_SLICE_START_PTR(orig_decoded), sizeof(orig) - i)); - grpc_slice_unref_internal(&exec_ctx, orig_decoded); + grpc_slice_unref_internal(orig_decoded); gpr_free(b64); - grpc_exec_ctx_finish(&exec_ctx); } } @@ -116,19 +116,18 @@ static void test_url_safe_unsafe_mismatch_failure(void) { int url_safe = 1; for (i = 0; i < sizeof(orig); i++) orig[i] = (uint8_t)i; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; b64 = grpc_base64_encode(orig, sizeof(orig), url_safe, 0); - orig_decoded = grpc_base64_decode(&exec_ctx, b64, !url_safe); + orig_decoded = grpc_base64_decode(b64, !url_safe); GPR_ASSERT(GRPC_SLICE_IS_EMPTY(orig_decoded)); gpr_free(b64); - grpc_slice_unref_internal(&exec_ctx, orig_decoded); + grpc_slice_unref_internal(orig_decoded); b64 = grpc_base64_encode(orig, sizeof(orig), !url_safe, 0); - orig_decoded = grpc_base64_decode(&exec_ctx, b64, url_safe); + orig_decoded = grpc_base64_decode(b64, url_safe); GPR_ASSERT(GRPC_SLICE_IS_EMPTY(orig_decoded)); gpr_free(b64); - grpc_slice_unref_internal(&exec_ctx, orig_decoded); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref_internal(orig_decoded); } static void test_rfc4648_test_vectors(void) { @@ -166,44 +165,44 @@ static void test_rfc4648_test_vectors(void) { static void test_unpadded_decode(void) { grpc_slice decoded; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - decoded = grpc_base64_decode(&exec_ctx, "Zm9vYmFy", 0); + grpc_core::ExecCtx exec_ctx; + decoded = grpc_base64_decode("Zm9vYmFy", 0); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(decoded)); GPR_ASSERT(grpc_slice_str_cmp(decoded, "foobar") == 0); grpc_slice_unref(decoded); - decoded = grpc_base64_decode(&exec_ctx, "Zm9vYmE", 0); + decoded = grpc_base64_decode("Zm9vYmE", 0); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(decoded)); GPR_ASSERT(grpc_slice_str_cmp(decoded, "fooba") == 0); grpc_slice_unref(decoded); - decoded = grpc_base64_decode(&exec_ctx, "Zm9vYg", 0); + decoded = grpc_base64_decode("Zm9vYg", 0); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(decoded)); GPR_ASSERT(grpc_slice_str_cmp(decoded, "foob") == 0); grpc_slice_unref(decoded); - decoded = grpc_base64_decode(&exec_ctx, "Zm9v", 0); + decoded = grpc_base64_decode("Zm9v", 0); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(decoded)); GPR_ASSERT(grpc_slice_str_cmp(decoded, "foo") == 0); grpc_slice_unref(decoded); - decoded = grpc_base64_decode(&exec_ctx, "Zm8", 0); + decoded = grpc_base64_decode("Zm8", 0); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(decoded)); GPR_ASSERT(grpc_slice_str_cmp(decoded, "fo") == 0); grpc_slice_unref(decoded); - decoded = grpc_base64_decode(&exec_ctx, "Zg", 0); + decoded = grpc_base64_decode("Zg", 0); GPR_ASSERT(!GRPC_SLICE_IS_EMPTY(decoded)); GPR_ASSERT(grpc_slice_str_cmp(decoded, "f") == 0); grpc_slice_unref(decoded); - decoded = grpc_base64_decode(&exec_ctx, "", 0); + decoded = grpc_base64_decode("", 0); GPR_ASSERT(GRPC_SLICE_IS_EMPTY(decoded)); - grpc_exec_ctx_finish(&exec_ctx); } int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); test_simple_encode_decode_b64_no_multiline(); test_simple_encode_decode_b64_multiline(); test_simple_encode_decode_b64_urlsafe_no_multiline(); @@ -215,5 +214,6 @@ int main(int argc, char** argv) { test_url_safe_unsafe_mismatch_failure(); test_rfc4648_test_vectors(); test_unpadded_decode(); + grpc_shutdown(); return 0; } diff --git a/test/core/slice/percent_decode_fuzzer.cc b/test/core/slice/percent_decode_fuzzer.cc index 3603177c47f..81eb031014f 100644 --- a/test/core/slice/percent_decode_fuzzer.cc +++ b/test/core/slice/percent_decode_fuzzer.cc @@ -20,6 +20,7 @@ #include #include +#include #include #include @@ -31,6 +32,7 @@ bool leak_check = true; extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { struct grpc_memory_counters counters; + grpc_init(); grpc_memory_counters_init(); grpc_slice input = grpc_slice_from_copied_buffer((const char*)data, size); grpc_slice output; @@ -46,6 +48,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_slice_unref(input); counters = grpc_memory_counters_snapshot(); grpc_memory_counters_destroy(); + grpc_shutdown(); GPR_ASSERT(counters.total_size_relative == 0); return 0; } diff --git a/test/core/slice/percent_encode_fuzzer.cc b/test/core/slice/percent_encode_fuzzer.cc index c8e3849fc8e..201ae2790eb 100644 --- a/test/core/slice/percent_encode_fuzzer.cc +++ b/test/core/slice/percent_encode_fuzzer.cc @@ -20,6 +20,7 @@ #include #include +#include #include #include @@ -31,6 +32,7 @@ bool leak_check = true; static void test(const uint8_t* data, size_t size, const uint8_t* dict) { struct grpc_memory_counters counters; + grpc_init(); grpc_memory_counters_init(); grpc_slice input = grpc_slice_from_copied_buffer((const char*)data, size); grpc_slice output = grpc_percent_encode_slice(input, dict); @@ -48,6 +50,7 @@ static void test(const uint8_t* data, size_t size, const uint8_t* dict) { grpc_slice_unref(permissive_decoded_output); counters = grpc_memory_counters_snapshot(); grpc_memory_counters_destroy(); + grpc_shutdown(); GPR_ASSERT(counters.total_size_relative == 0); } diff --git a/test/core/slice/percent_encoding_test.cc b/test/core/slice/percent_encoding_test.cc index 253240faad4..11f3995f98e 100644 --- a/test/core/slice/percent_encoding_test.cc +++ b/test/core/slice/percent_encoding_test.cc @@ -18,6 +18,7 @@ #include "src/core/lib/slice/percent_encoding.h" +#include #include #include @@ -118,6 +119,7 @@ static void test_nonconformant_vector(const char* encoded, int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); TEST_VECTOR( "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.~", "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.~", @@ -140,5 +142,6 @@ int main(int argc, char** argv) { grpc_url_percent_encoding_unreserved_bytes); TEST_NONCONFORMANT_VECTOR("\0", "\0", grpc_url_percent_encoding_unreserved_bytes); + grpc_shutdown(); return 0; } diff --git a/test/core/slice/slice_buffer_test.cc b/test/core/slice/slice_buffer_test.cc index 338e8079dc8..e59986730b8 100644 --- a/test/core/slice/slice_buffer_test.cc +++ b/test/core/slice/slice_buffer_test.cc @@ -16,6 +16,7 @@ * */ +#include #include #include #include "test/core/util/test_config.h" @@ -106,9 +107,11 @@ void test_slice_buffer_move_first() { int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); test_slice_buffer_add(); test_slice_buffer_move_first(); + grpc_shutdown(); return 0; } diff --git a/test/core/slice/slice_hash_table_test.cc b/test/core/slice/slice_hash_table_test.cc index 0ee4e8617d2..9fad9a614ea 100644 --- a/test/core/slice/slice_hash_table_test.cc +++ b/test/core/slice/slice_hash_table_test.cc @@ -59,9 +59,7 @@ static void check_non_existent_value(const char* key_string, grpc_slice_unref(key); } -static void destroy_string(grpc_exec_ctx* exec_ctx, void* value) { - gpr_free(value); -} +static void destroy_string(void* value) { gpr_free(value); } static grpc_slice_hash_table* create_table_from_entries( const test_entry* test_entries, size_t num_test_entries, @@ -121,9 +119,8 @@ static void test_slice_hash_table() { check_values(test_entries, num_entries, table); check_non_existent_value("XX", table); // Clean up. - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_hash_table_unref(&exec_ctx, table); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_slice_hash_table_unref(table); } static int value_cmp_fn(void* a, void* b) { @@ -149,10 +146,9 @@ static void test_slice_hash_table_eq() { create_table_from_entries(test_entries_b, num_entries_b, value_cmp_fn); GPR_ASSERT(grpc_slice_hash_table_cmp(table_a, table_b) == 0); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_hash_table_unref(&exec_ctx, table_a); - grpc_slice_hash_table_unref(&exec_ctx, table_b); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_slice_hash_table_unref(table_a); + grpc_slice_hash_table_unref(table_b); } static void test_slice_hash_table_not_eq() { @@ -221,23 +217,24 @@ static void test_slice_hash_table_not_eq() { create_table_from_entries(test_entries_h, num_entries_h, pointer_cmp_fn); GPR_ASSERT(grpc_slice_hash_table_cmp(table_g, table_h) != 0); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice_hash_table_unref(&exec_ctx, table_a); - grpc_slice_hash_table_unref(&exec_ctx, table_b_larger); - grpc_slice_hash_table_unref(&exec_ctx, table_b_smaller); - grpc_slice_hash_table_unref(&exec_ctx, table_c); - grpc_slice_hash_table_unref(&exec_ctx, table_d); - grpc_slice_hash_table_unref(&exec_ctx, table_e); - grpc_slice_hash_table_unref(&exec_ctx, table_f); - grpc_slice_hash_table_unref(&exec_ctx, table_g); - grpc_slice_hash_table_unref(&exec_ctx, table_h); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_slice_hash_table_unref(table_a); + grpc_slice_hash_table_unref(table_b_larger); + grpc_slice_hash_table_unref(table_b_smaller); + grpc_slice_hash_table_unref(table_c); + grpc_slice_hash_table_unref(table_d); + grpc_slice_hash_table_unref(table_e); + grpc_slice_hash_table_unref(table_f); + grpc_slice_hash_table_unref(table_g); + grpc_slice_hash_table_unref(table_h); } int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_core::ExecCtx::GlobalInit(); test_slice_hash_table(); test_slice_hash_table_eq(); test_slice_hash_table_not_eq(); + grpc_core::ExecCtx::GlobalShutdown(); return 0; } diff --git a/test/core/slice/slice_string_helpers_test.cc b/test/core/slice/slice_string_helpers_test.cc index 260f8c80d5d..f1d470461a4 100644 --- a/test/core/slice/slice_string_helpers_test.cc +++ b/test/core/slice/slice_string_helpers_test.cc @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -130,7 +131,9 @@ static void test_strsplit(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); test_dump_slice(); test_strsplit(); + grpc_shutdown(); return 0; } diff --git a/test/core/slice/slice_test.cc b/test/core/slice/slice_test.cc index 02f6b1ea79c..e40154dd0ee 100644 --- a/test/core/slice/slice_test.cc +++ b/test/core/slice/slice_test.cc @@ -292,6 +292,7 @@ static void test_static_slice_copy_interning(void) { int main(int argc, char** argv) { unsigned length; grpc_test_init(argc, argv); + grpc_init(); test_slice_malloc_returns_something_sensible(); test_slice_new_returns_something_sensible(); test_slice_new_with_user_data(); @@ -305,5 +306,6 @@ int main(int argc, char** argv) { test_slice_interning(); test_static_slice_interning(); test_static_slice_copy_interning(); + grpc_shutdown(); return 0; } diff --git a/test/core/surface/byte_buffer_reader_test.cc b/test/core/surface/byte_buffer_reader_test.cc index e5d2d7c78dd..94a8615b3cd 100644 --- a/test/core/surface/byte_buffer_reader_test.cc +++ b/test/core/surface/byte_buffer_reader_test.cc @@ -132,10 +132,8 @@ static void read_compressed_slice(grpc_compression_algorithm algorithm, memset(GRPC_SLICE_START_PTR(input_slice), 'a', input_size); grpc_slice_buffer_add(&sliceb_in, input_slice); /* takes ownership */ { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT( - grpc_msg_compress(&exec_ctx, algorithm, &sliceb_in, &sliceb_out)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + GPR_ASSERT(grpc_msg_compress(algorithm, &sliceb_in, &sliceb_out)); } buffer = grpc_raw_compressed_byte_buffer_create(sliceb_out.slices, @@ -267,6 +265,7 @@ static void test_byte_buffer_copy(void) { int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); test_read_one_slice(); test_read_one_slice_malloc(); test_read_none_compressed_slice(); @@ -276,5 +275,6 @@ int main(int argc, char** argv) { test_byte_buffer_from_reader(); test_byte_buffer_copy(); test_readall(); + grpc_shutdown(); return 0; } diff --git a/test/core/surface/channel_create_test.cc b/test/core/surface/channel_create_test.cc index f358b0fc8d4..37247f89d01 100644 --- a/test/core/surface/channel_create_test.cc +++ b/test/core/surface/channel_create_test.cc @@ -35,11 +35,10 @@ void test_unknown_scheme_target(void) { chan = grpc_insecure_channel_create("blah://blah", nullptr, nullptr); GPR_ASSERT(chan != nullptr); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_channel_element* elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); - grpc_exec_ctx_finish(&exec_ctx); grpc_channel_destroy(chan); } diff --git a/test/core/surface/completion_queue_test.cc b/test/core/surface/completion_queue_test.cc index c6e13d23860..fefbb3c1854 100644 --- a/test/core/surface/completion_queue_test.cc +++ b/test/core/surface/completion_queue_test.cc @@ -121,8 +121,7 @@ static void test_wait_empty(void) { } } -static void do_nothing_end_completion(grpc_exec_ctx* exec_ctx, void* arg, - grpc_cq_completion* c) {} +static void do_nothing_end_completion(void* arg, grpc_cq_completion* c) {} static void test_cq_end_op(void) { grpc_event ev; @@ -131,8 +130,6 @@ static void test_cq_end_op(void) { grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; grpc_completion_queue_attributes attr; - grpc_exec_ctx init_exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_exec_ctx exec_ctx; void* tag = create_test_tag(); LOG_TEST("test_cq_end_op"); @@ -140,14 +137,14 @@ static void test_cq_end_op(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_NEXT; for (size_t i = 0; i < GPR_ARRAY_SIZE(polling_types); i++) { - exec_ctx = init_exec_ctx; // Reset exec_ctx + grpc_core::ExecCtx exec_ctx; attr.cq_polling_type = polling_types[i]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, nullptr); GPR_ASSERT(grpc_cq_begin_op(cc, tag)); - grpc_cq_end_op(&exec_ctx, cc, tag, GRPC_ERROR_NONE, - do_nothing_end_completion, nullptr, &completion); + grpc_cq_end_op(cc, tag, GRPC_ERROR_NONE, do_nothing_end_completion, nullptr, + &completion); ev = grpc_completion_queue_next(cc, gpr_inf_past(GPR_CLOCK_REALTIME), nullptr); @@ -156,7 +153,6 @@ static void test_cq_end_op(void) { GPR_ASSERT(ev.success); shutdown_and_destroy(cc); - grpc_exec_ctx_finish(&exec_ctx); } } @@ -167,8 +163,6 @@ static void test_cq_tls_cache_full(void) { grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; grpc_completion_queue_attributes attr; - grpc_exec_ctx init_exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_exec_ctx exec_ctx; void* tag = create_test_tag(); void* res_tag; int ok; @@ -178,15 +172,15 @@ static void test_cq_tls_cache_full(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_NEXT; for (size_t i = 0; i < GPR_ARRAY_SIZE(polling_types); i++) { - exec_ctx = init_exec_ctx; // Reset exec_ctx + grpc_core::ExecCtx exec_ctx; // Reset exec_ctx attr.cq_polling_type = polling_types[i]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, nullptr); grpc_completion_queue_thread_local_cache_init(cc); GPR_ASSERT(grpc_cq_begin_op(cc, tag)); - grpc_cq_end_op(&exec_ctx, cc, tag, GRPC_ERROR_NONE, - do_nothing_end_completion, nullptr, &completion); + grpc_cq_end_op(cc, tag, GRPC_ERROR_NONE, do_nothing_end_completion, nullptr, + &completion); ev = grpc_completion_queue_next(cc, gpr_inf_past(GPR_CLOCK_REALTIME), nullptr); @@ -202,7 +196,6 @@ static void test_cq_tls_cache_full(void) { GPR_ASSERT(ev.type == GRPC_QUEUE_TIMEOUT); shutdown_and_destroy(cc); - grpc_exec_ctx_finish(&exec_ctx); } } @@ -211,8 +204,6 @@ static void test_cq_tls_cache_empty(void) { grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; grpc_completion_queue_attributes attr; - grpc_exec_ctx init_exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_exec_ctx exec_ctx; void* res_tag; int ok; @@ -221,7 +212,7 @@ static void test_cq_tls_cache_empty(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_NEXT; for (size_t i = 0; i < GPR_ARRAY_SIZE(polling_types); i++) { - exec_ctx = init_exec_ctx; // Reset exec_ctx + grpc_core::ExecCtx exec_ctx; // Reset exec_ctx attr.cq_polling_type = polling_types[i]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, nullptr); @@ -232,7 +223,6 @@ static void test_cq_tls_cache_empty(void) { GPR_ASSERT( grpc_completion_queue_thread_local_cache_flush(cc, &res_tag, &ok) == 0); shutdown_and_destroy(cc); - grpc_exec_ctx_finish(&exec_ctx); } } @@ -289,8 +279,6 @@ static void test_pluck(void) { grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; grpc_completion_queue_attributes attr; - grpc_exec_ctx init_exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_exec_ctx exec_ctx; unsigned i, j; LOG_TEST("test_pluck"); @@ -305,15 +293,15 @@ static void test_pluck(void) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_PLUCK; for (size_t pidx = 0; pidx < GPR_ARRAY_SIZE(polling_types); pidx++) { - exec_ctx = init_exec_ctx; // reset exec_ctx + grpc_core::ExecCtx exec_ctx; // reset exec_ctx attr.cq_polling_type = polling_types[pidx]; cc = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, nullptr); for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { GPR_ASSERT(grpc_cq_begin_op(cc, tags[i])); - grpc_cq_end_op(&exec_ctx, cc, tags[i], GRPC_ERROR_NONE, - do_nothing_end_completion, nullptr, &completions[i]); + grpc_cq_end_op(cc, tags[i], GRPC_ERROR_NONE, do_nothing_end_completion, + nullptr, &completions[i]); } for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { @@ -324,8 +312,8 @@ static void test_pluck(void) { for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { GPR_ASSERT(grpc_cq_begin_op(cc, tags[i])); - grpc_cq_end_op(&exec_ctx, cc, tags[i], GRPC_ERROR_NONE, - do_nothing_end_completion, nullptr, &completions[i]); + grpc_cq_end_op(cc, tags[i], GRPC_ERROR_NONE, do_nothing_end_completion, + nullptr, &completions[i]); } for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { @@ -336,7 +324,6 @@ static void test_pluck(void) { } shutdown_and_destroy(cc); - grpc_exec_ctx_finish(&exec_ctx); } } diff --git a/test/core/surface/completion_queue_threading_test.cc b/test/core/surface/completion_queue_threading_test.cc index 126d363f839..4a9e818b45d 100644 --- a/test/core/surface/completion_queue_threading_test.cc +++ b/test/core/surface/completion_queue_threading_test.cc @@ -59,8 +59,7 @@ static void shutdown_and_destroy(grpc_completion_queue* cc) { grpc_completion_queue_destroy(cc); } -static void do_nothing_end_completion(grpc_exec_ctx* exec_ctx, void* arg, - grpc_cq_completion* c) {} +static void do_nothing_end_completion(void* arg, grpc_cq_completion* c) {} struct thread_state { grpc_completion_queue* cc; @@ -81,7 +80,7 @@ static void test_too_many_plucks(void) { gpr_thd_id thread_ids[GPR_ARRAY_SIZE(tags)]; struct thread_state thread_states[GPR_ARRAY_SIZE(tags)]; gpr_thd_options thread_options = gpr_thd_options_default(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; unsigned i, j; LOG_TEST("test_too_many_plucks"); @@ -109,8 +108,8 @@ static void test_too_many_plucks(void) { for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { GPR_ASSERT(grpc_cq_begin_op(cc, tags[i])); - grpc_cq_end_op(&exec_ctx, cc, tags[i], GRPC_ERROR_NONE, - do_nothing_end_completion, nullptr, &completions[i]); + grpc_cq_end_op(cc, tags[i], GRPC_ERROR_NONE, do_nothing_end_completion, + nullptr, &completions[i]); } for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { @@ -118,7 +117,6 @@ static void test_too_many_plucks(void) { } shutdown_and_destroy(cc); - grpc_exec_ctx_finish(&exec_ctx); } #define TEST_THREAD_EVENTS 10000 @@ -138,15 +136,13 @@ gpr_timespec ten_seconds_time(void) { return grpc_timeout_seconds_to_deadline(10); } -static void free_completion(grpc_exec_ctx* exec_ctx, void* arg, - grpc_cq_completion* completion) { +static void free_completion(void* arg, grpc_cq_completion* completion) { gpr_free(completion); } static void producer_thread(void* arg) { test_thread_options* opt = static_cast(arg); int i; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_log(GPR_INFO, "producer %d started", opt->id); gpr_event_set(&opt->on_started, (void*)(intptr_t)1); @@ -163,17 +159,16 @@ static void producer_thread(void* arg) { gpr_log(GPR_INFO, "producer %d phase 2", opt->id); for (i = 0; i < TEST_THREAD_EVENTS; i++) { - grpc_cq_end_op(&exec_ctx, opt->cc, (void*)(intptr_t)1, GRPC_ERROR_NONE, + grpc_core::ExecCtx exec_ctx; + grpc_cq_end_op(opt->cc, (void*)(intptr_t)1, GRPC_ERROR_NONE, free_completion, nullptr, static_cast( gpr_malloc(sizeof(grpc_cq_completion)))); opt->events_triggered++; - grpc_exec_ctx_finish(&exec_ctx); } gpr_log(GPR_INFO, "producer %d phase 2 done", opt->id); gpr_event_set(&opt->on_finished, (void*)(intptr_t)1); - grpc_exec_ctx_finish(&exec_ctx); } static void consumer_thread(void* arg) { diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index 2ff1ca3d799..235d1363763 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -103,29 +103,28 @@ void server_thread(void* vargs) { GPR_ASSERT(detag(ev.tag) == 0xd1e); } -static void on_connect(grpc_exec_ctx* exec_ctx, void* vargs, grpc_endpoint* tcp, +static void on_connect(void* vargs, grpc_endpoint* tcp, grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor) { gpr_free(acceptor); struct server_thread_args* args = (struct server_thread_args*)vargs; - grpc_endpoint_shutdown(exec_ctx, tcp, + grpc_endpoint_shutdown(tcp, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Connected")); - grpc_endpoint_destroy(exec_ctx, tcp); + grpc_endpoint_destroy(tcp); gpr_mu_lock(args->mu); - GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, args->pollset, nullptr)); + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(args->pollset, nullptr)); gpr_mu_unlock(args->mu); } void bad_server_thread(void* vargs) { struct server_thread_args* args = (struct server_thread_args*)vargs; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resolved_address resolved_addr; struct sockaddr_storage* addr = (struct sockaddr_storage*)resolved_addr.addr; int port; grpc_tcp_server* s; - grpc_error* error = grpc_tcp_server_create(&exec_ctx, nullptr, nullptr, &s); + grpc_error* error = grpc_tcp_server_create(nullptr, nullptr, &s); GPR_ASSERT(error == GRPC_ERROR_NONE); memset(&resolved_addr, 0, sizeof(resolved_addr)); addr->ss_family = AF_INET; @@ -134,35 +133,32 @@ void bad_server_thread(void* vargs) { GPR_ASSERT(port > 0); gpr_asprintf(&args->addr, "localhost:%d", port); - grpc_tcp_server_start(&exec_ctx, s, &args->pollset, 1, on_connect, args); + grpc_tcp_server_start(s, &args->pollset, 1, on_connect, args); gpr_event_set(&args->ready, (void*)1); gpr_mu_lock(args->mu); while (gpr_atm_acq_load(&args->stop) == 0) { - grpc_millis deadline = grpc_exec_ctx_now(&exec_ctx) + 100; + grpc_millis deadline = grpc_core::ExecCtx::Get()->Now() + 100; grpc_pollset_worker* worker = nullptr; if (!GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(&exec_ctx, args->pollset, &worker, deadline))) { + grpc_pollset_work(args->pollset, &worker, deadline))) { gpr_atm_rel_store(&args->stop, 1); } gpr_mu_unlock(args->mu); - grpc_exec_ctx_finish(&exec_ctx); + gpr_mu_lock(args->mu); } gpr_mu_unlock(args->mu); - grpc_tcp_server_unref(&exec_ctx, s); - - grpc_exec_ctx_finish(&exec_ctx); + grpc_tcp_server_unref(s); gpr_free(args->addr); } -static void done_pollset_shutdown(grpc_exec_ctx* exec_ctx, void* pollset, - grpc_error* error) { - grpc_pollset_destroy(exec_ctx, static_cast(pollset)); +static void done_pollset_shutdown(void* pollset, grpc_error* error) { + grpc_pollset_destroy(static_cast(pollset)); gpr_free(pollset); } @@ -234,11 +230,12 @@ int run_concurrent_connectivity_test() { gpr_atm_rel_store(&args.stop, 1); gpr_thd_join(server); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_pollset_shutdown(&exec_ctx, args.pollset, - GRPC_CLOSURE_CREATE(done_pollset_shutdown, args.pollset, - grpc_schedule_on_exec_ctx)); - grpc_exec_ctx_finish(&exec_ctx); + { + grpc_core::ExecCtx exec_ctx; + grpc_pollset_shutdown( + args.pollset, GRPC_CLOSURE_CREATE(done_pollset_shutdown, args.pollset, + grpc_schedule_on_exec_ctx)); + } grpc_shutdown(); return 0; diff --git a/test/core/surface/lame_client_test.cc b/test/core/surface/lame_client_test.cc index f3df7f35a73..4bf40569e64 100644 --- a/test/core/surface/lame_client_test.cc +++ b/test/core/surface/lame_client_test.cc @@ -32,20 +32,19 @@ grpc_closure transport_op_cb; static void* tag(intptr_t x) { return (void*)x; } -void verify_connectivity(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +void verify_connectivity(void* arg, grpc_error* error) { grpc_connectivity_state* state = static_cast(arg); GPR_ASSERT(GRPC_CHANNEL_SHUTDOWN == *state); GPR_ASSERT(error == GRPC_ERROR_NONE); } -void do_nothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} +void do_nothing(void* arg, grpc_error* error) {} void test_transport_op(grpc_channel* channel) { grpc_transport_op* op; grpc_channel_element* elem; grpc_connectivity_state state = GRPC_CHANNEL_IDLE; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GRPC_CLOSURE_INIT(&transport_op_cb, verify_connectivity, &state, grpc_schedule_on_exec_ctx); @@ -54,14 +53,12 @@ void test_transport_op(grpc_channel* channel) { op->on_connectivity_state_change = &transport_op_cb; op->connectivity_state = &state; elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); - elem->filter->start_transport_op(&exec_ctx, elem, op); - grpc_exec_ctx_finish(&exec_ctx); + elem->filter->start_transport_op(elem, op); GRPC_CLOSURE_INIT(&transport_op_cb, do_nothing, nullptr, grpc_schedule_on_exec_ctx); op = grpc_make_transport_op(&transport_op_cb); - elem->filter->start_transport_op(&exec_ctx, elem, op); - grpc_exec_ctx_finish(&exec_ctx); + elem->filter->start_transport_op(elem, op); } int main(int argc, char** argv) { diff --git a/test/core/surface/num_external_connectivity_watchers_test.cc b/test/core/surface/num_external_connectivity_watchers_test.cc index f78d3336734..9cdd299ae3b 100644 --- a/test/core/surface/num_external_connectivity_watchers_test.cc +++ b/test/core/surface/num_external_connectivity_watchers_test.cc @@ -178,9 +178,8 @@ static grpc_channel* secure_test_create_channel(const char* addr) { grpc_channel* channel = grpc_secure_channel_create(ssl_creds, addr, new_client_args, nullptr); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, new_client_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(new_client_args); } grpc_channel_credentials_release(ssl_creds); return channel; diff --git a/test/core/surface/secure_channel_create_test.cc b/test/core/surface/secure_channel_create_test.cc index c31c61430cd..fa22cd68731 100644 --- a/test/core/surface/secure_channel_create_test.cc +++ b/test/core/surface/secure_channel_create_test.cc @@ -37,10 +37,9 @@ void test_unknown_scheme_target(void) { grpc_channel_element* elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_CHANNEL_INTERNAL_UNREF(&exec_ctx, chan, "test"); - grpc_channel_credentials_unref(&exec_ctx, creds); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + GRPC_CHANNEL_INTERNAL_UNREF(chan, "test"); + grpc_channel_credentials_unref(creds); } void test_security_connector_already_in_arg(void) { @@ -56,9 +55,8 @@ void test_security_connector_already_in_arg(void) { grpc_channel_element* elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_CHANNEL_INTERNAL_UNREF(&exec_ctx, chan, "test"); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + GRPC_CHANNEL_INTERNAL_UNREF(chan, "test"); } void test_null_creds(void) { @@ -67,9 +65,8 @@ void test_null_creds(void) { grpc_channel_element* elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(chan), 0); GPR_ASSERT(0 == strcmp(elem->filter->name, "lame-client")); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GRPC_CHANNEL_INTERNAL_UNREF(&exec_ctx, chan, "test"); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + GRPC_CHANNEL_INTERNAL_UNREF(chan, "test"); } int main(int argc, char** argv) { diff --git a/test/core/surface/sequential_connectivity_test.cc b/test/core/surface/sequential_connectivity_test.cc index 11d0aa705d9..ac49bd98233 100644 --- a/test/core/surface/sequential_connectivity_test.cc +++ b/test/core/surface/sequential_connectivity_test.cc @@ -156,9 +156,8 @@ static grpc_channel* secure_test_create_channel(const char* addr) { grpc_channel* channel = grpc_secure_channel_create(ssl_creds, addr, new_client_args, nullptr); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_channel_args_destroy(&exec_ctx, new_client_args); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_channel_args_destroy(new_client_args); } grpc_channel_credentials_release(ssl_creds); return channel; diff --git a/test/core/transport/bdp_estimator_test.cc b/test/core/transport/bdp_estimator_test.cc index d1272607f2a..445823b628b 100644 --- a/test/core/transport/bdp_estimator_test.cc +++ b/test/core/transport/bdp_estimator_test.cc @@ -58,7 +58,7 @@ namespace { void AddSamples(BdpEstimator* estimator, int64_t* samples, size_t n) { estimator->AddIncomingBytes(1234567); inc_time(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; estimator->SchedulePing(); estimator->StartPing(); for (size_t i = 0; i < n; i++) { @@ -66,9 +66,8 @@ void AddSamples(BdpEstimator* estimator, int64_t* samples, size_t n) { } gpr_sleep_until(gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_millis(1, GPR_TIMESPAN))); - grpc_exec_ctx_invalidate_now(&exec_ctx); - estimator->CompletePing(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx::Get()->InvalidateNow(); + estimator->CompletePing(); } void AddSample(BdpEstimator* estimator, int64_t sample) { diff --git a/test/core/transport/byte_stream_test.cc b/test/core/transport/byte_stream_test.cc index 0e34fd7651d..2aab6e92628 100644 --- a/test/core/transport/byte_stream_test.cc +++ b/test/core/transport/byte_stream_test.cc @@ -18,6 +18,7 @@ #include "src/core/lib/transport/byte_stream.h" +#include #include #include #include @@ -30,14 +31,13 @@ // grpc_slice_buffer_stream tests // -static void not_called_closure(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void not_called_closure(void* arg, grpc_error* error) { GPR_ASSERT(false); } static void test_slice_buffer_stream_basic(void) { gpr_log(GPR_DEBUG, "test_slice_buffer_stream_basic"); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; // Create and populate slice buffer. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -57,23 +57,21 @@ static void test_slice_buffer_stream_basic(void) { grpc_schedule_on_exec_ctx); // Read each slice. Note that next() always returns synchronously. for (size_t i = 0; i < GPR_ARRAY_SIZE(input); ++i) { - GPR_ASSERT( - grpc_byte_stream_next(&exec_ctx, &stream.base, ~(size_t)0, &closure)); + GPR_ASSERT(grpc_byte_stream_next(&stream.base, ~(size_t)0, &closure)); grpc_slice output; - grpc_error* error = grpc_byte_stream_pull(&exec_ctx, &stream.base, &output); + grpc_error* error = grpc_byte_stream_pull(&stream.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[i], output)); - grpc_slice_unref_internal(&exec_ctx, output); + grpc_slice_unref_internal(output); } // Clean up. - grpc_byte_stream_destroy(&exec_ctx, &stream.base); - grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + grpc_byte_stream_destroy(&stream.base); + grpc_slice_buffer_destroy_internal(&buffer); } static void test_slice_buffer_stream_shutdown(void) { gpr_log(GPR_DEBUG, "test_slice_buffer_stream_shutdown"); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; // Create and populate slice buffer. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -92,29 +90,25 @@ static void test_slice_buffer_stream_shutdown(void) { GRPC_CLOSURE_INIT(&closure, not_called_closure, nullptr, grpc_schedule_on_exec_ctx); // Read the first slice. - GPR_ASSERT( - grpc_byte_stream_next(&exec_ctx, &stream.base, ~(size_t)0, &closure)); + GPR_ASSERT(grpc_byte_stream_next(&stream.base, ~(size_t)0, &closure)); grpc_slice output; - grpc_error* error = grpc_byte_stream_pull(&exec_ctx, &stream.base, &output); + grpc_error* error = grpc_byte_stream_pull(&stream.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[0], output)); - grpc_slice_unref_internal(&exec_ctx, output); + grpc_slice_unref_internal(output); // Now shutdown. grpc_error* shutdown_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("shutdown error"); - grpc_byte_stream_shutdown(&exec_ctx, &stream.base, - GRPC_ERROR_REF(shutdown_error)); + grpc_byte_stream_shutdown(&stream.base, GRPC_ERROR_REF(shutdown_error)); // After shutdown, the next pull() should return the error. - GPR_ASSERT( - grpc_byte_stream_next(&exec_ctx, &stream.base, ~(size_t)0, &closure)); - error = grpc_byte_stream_pull(&exec_ctx, &stream.base, &output); + GPR_ASSERT(grpc_byte_stream_next(&stream.base, ~(size_t)0, &closure)); + error = grpc_byte_stream_pull(&stream.base, &output); GPR_ASSERT(error == shutdown_error); GRPC_ERROR_UNREF(error); GRPC_ERROR_UNREF(shutdown_error); // Clean up. - grpc_byte_stream_destroy(&exec_ctx, &stream.base); - grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + grpc_byte_stream_destroy(&stream.base); + grpc_slice_buffer_destroy_internal(&buffer); } // @@ -123,7 +117,7 @@ static void test_slice_buffer_stream_shutdown(void) { static void test_caching_byte_stream_basic(void) { gpr_log(GPR_DEBUG, "test_caching_byte_stream_basic"); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; // Create and populate slice buffer byte stream. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -147,24 +141,22 @@ static void test_caching_byte_stream_basic(void) { // Read each slice. Note that next() always returns synchronously, // because the underlying byte stream always does. for (size_t i = 0; i < GPR_ARRAY_SIZE(input); ++i) { - GPR_ASSERT( - grpc_byte_stream_next(&exec_ctx, &stream.base, ~(size_t)0, &closure)); + GPR_ASSERT(grpc_byte_stream_next(&stream.base, ~(size_t)0, &closure)); grpc_slice output; - grpc_error* error = grpc_byte_stream_pull(&exec_ctx, &stream.base, &output); + grpc_error* error = grpc_byte_stream_pull(&stream.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[i], output)); - grpc_slice_unref_internal(&exec_ctx, output); + grpc_slice_unref_internal(output); } // Clean up. - grpc_byte_stream_destroy(&exec_ctx, &stream.base); - grpc_byte_stream_cache_destroy(&exec_ctx, &cache); - grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + grpc_byte_stream_destroy(&stream.base); + grpc_byte_stream_cache_destroy(&cache); + grpc_slice_buffer_destroy_internal(&buffer); } static void test_caching_byte_stream_reset(void) { gpr_log(GPR_DEBUG, "test_caching_byte_stream_reset"); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; // Create and populate slice buffer byte stream. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -186,34 +178,31 @@ static void test_caching_byte_stream_reset(void) { GRPC_CLOSURE_INIT(&closure, not_called_closure, nullptr, grpc_schedule_on_exec_ctx); // Read one slice. - GPR_ASSERT( - grpc_byte_stream_next(&exec_ctx, &stream.base, ~(size_t)0, &closure)); + GPR_ASSERT(grpc_byte_stream_next(&stream.base, ~(size_t)0, &closure)); grpc_slice output; - grpc_error* error = grpc_byte_stream_pull(&exec_ctx, &stream.base, &output); + grpc_error* error = grpc_byte_stream_pull(&stream.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[0], output)); - grpc_slice_unref_internal(&exec_ctx, output); + grpc_slice_unref_internal(output); // Reset the caching stream. The reads should start over from the // first slice. grpc_caching_byte_stream_reset(&stream); for (size_t i = 0; i < GPR_ARRAY_SIZE(input); ++i) { - GPR_ASSERT( - grpc_byte_stream_next(&exec_ctx, &stream.base, ~(size_t)0, &closure)); - error = grpc_byte_stream_pull(&exec_ctx, &stream.base, &output); + GPR_ASSERT(grpc_byte_stream_next(&stream.base, ~(size_t)0, &closure)); + error = grpc_byte_stream_pull(&stream.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[i], output)); - grpc_slice_unref_internal(&exec_ctx, output); + grpc_slice_unref_internal(output); } // Clean up. - grpc_byte_stream_destroy(&exec_ctx, &stream.base); - grpc_byte_stream_cache_destroy(&exec_ctx, &cache); - grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + grpc_byte_stream_destroy(&stream.base); + grpc_byte_stream_cache_destroy(&cache); + grpc_slice_buffer_destroy_internal(&buffer); } static void test_caching_byte_stream_shared_cache(void) { gpr_log(GPR_DEBUG, "test_caching_byte_stream_shared_cache"); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; // Create and populate slice buffer byte stream. grpc_slice_buffer buffer; grpc_slice_buffer_init(&buffer); @@ -237,43 +226,41 @@ static void test_caching_byte_stream_shared_cache(void) { GRPC_CLOSURE_INIT(&closure, not_called_closure, nullptr, grpc_schedule_on_exec_ctx); // Read one slice from stream1. - GPR_ASSERT( - grpc_byte_stream_next(&exec_ctx, &stream1.base, ~(size_t)0, &closure)); + GPR_ASSERT(grpc_byte_stream_next(&stream1.base, ~(size_t)0, &closure)); grpc_slice output; - grpc_error* error = grpc_byte_stream_pull(&exec_ctx, &stream1.base, &output); + grpc_error* error = grpc_byte_stream_pull(&stream1.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[0], output)); - grpc_slice_unref_internal(&exec_ctx, output); + grpc_slice_unref_internal(output); // Read all slices from stream2. for (size_t i = 0; i < GPR_ARRAY_SIZE(input); ++i) { - GPR_ASSERT( - grpc_byte_stream_next(&exec_ctx, &stream2.base, ~(size_t)0, &closure)); - error = grpc_byte_stream_pull(&exec_ctx, &stream2.base, &output); + GPR_ASSERT(grpc_byte_stream_next(&stream2.base, ~(size_t)0, &closure)); + error = grpc_byte_stream_pull(&stream2.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[i], output)); - grpc_slice_unref_internal(&exec_ctx, output); + grpc_slice_unref_internal(output); } // Now read the second slice from stream1. - GPR_ASSERT( - grpc_byte_stream_next(&exec_ctx, &stream1.base, ~(size_t)0, &closure)); - error = grpc_byte_stream_pull(&exec_ctx, &stream1.base, &output); + GPR_ASSERT(grpc_byte_stream_next(&stream1.base, ~(size_t)0, &closure)); + error = grpc_byte_stream_pull(&stream1.base, &output); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(grpc_slice_eq(input[1], output)); - grpc_slice_unref_internal(&exec_ctx, output); + grpc_slice_unref_internal(output); // Clean up. - grpc_byte_stream_destroy(&exec_ctx, &stream1.base); - grpc_byte_stream_destroy(&exec_ctx, &stream2.base); - grpc_byte_stream_cache_destroy(&exec_ctx, &cache); - grpc_slice_buffer_destroy_internal(&exec_ctx, &buffer); - grpc_exec_ctx_finish(&exec_ctx); + grpc_byte_stream_destroy(&stream1.base); + grpc_byte_stream_destroy(&stream2.base); + grpc_byte_stream_cache_destroy(&cache); + grpc_slice_buffer_destroy_internal(&buffer); } int main(int argc, char** argv) { + grpc_init(); grpc_test_init(argc, argv); test_slice_buffer_stream_basic(); test_slice_buffer_stream_shutdown(); test_caching_byte_stream_basic(); test_caching_byte_stream_reset(); test_caching_byte_stream_shared_cache(); + grpc_shutdown(); return 0; } diff --git a/test/core/transport/chttp2/bin_decoder_test.cc b/test/core/transport/chttp2/bin_decoder_test.cc index a29ec8a13fe..6d70a4261b0 100644 --- a/test/core/transport/chttp2/bin_decoder_test.cc +++ b/test/core/transport/chttp2/bin_decoder_test.cc @@ -20,6 +20,7 @@ #include +#include #include #include #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" @@ -29,8 +30,8 @@ static int all_ok = 1; -static void expect_slice_eq(grpc_exec_ctx* exec_ctx, grpc_slice expected, - grpc_slice slice, const char* debug, int line) { +static void expect_slice_eq(grpc_slice expected, grpc_slice slice, + const char* debug, int line) { if (!grpc_slice_eq(slice, expected)) { char* hs = grpc_dump_slice(slice, GPR_DUMP_HEX | GPR_DUMP_ASCII); char* he = grpc_dump_slice(expected, GPR_DUMP_HEX | GPR_DUMP_ASCII); @@ -40,104 +41,97 @@ static void expect_slice_eq(grpc_exec_ctx* exec_ctx, grpc_slice expected, gpr_free(he); all_ok = 0; } - grpc_slice_unref_internal(exec_ctx, expected); - grpc_slice_unref_internal(exec_ctx, slice); + grpc_slice_unref_internal(expected); + grpc_slice_unref_internal(slice); } -static grpc_slice base64_encode(grpc_exec_ctx* exec_ctx, const char* s) { +static grpc_slice base64_encode(const char* s) { grpc_slice ss = grpc_slice_from_copied_string(s); grpc_slice out = grpc_chttp2_base64_encode(ss); - grpc_slice_unref_internal(exec_ctx, ss); + grpc_slice_unref_internal(ss); return out; } -static grpc_slice base64_decode(grpc_exec_ctx* exec_ctx, const char* s) { +static grpc_slice base64_decode(const char* s) { grpc_slice ss = grpc_slice_from_copied_string(s); - grpc_slice out = grpc_chttp2_base64_decode(exec_ctx, ss); - grpc_slice_unref_internal(exec_ctx, ss); + grpc_slice out = grpc_chttp2_base64_decode(ss); + grpc_slice_unref_internal(ss); return out; } -static grpc_slice base64_decode_with_length(grpc_exec_ctx* exec_ctx, - const char* s, +static grpc_slice base64_decode_with_length(const char* s, size_t output_length) { grpc_slice ss = grpc_slice_from_copied_string(s); - grpc_slice out = - grpc_chttp2_base64_decode_with_length(exec_ctx, ss, output_length); - grpc_slice_unref_internal(exec_ctx, ss); + grpc_slice out = grpc_chttp2_base64_decode_with_length(ss, output_length); + grpc_slice_unref_internal(ss); return out; } -#define EXPECT_SLICE_EQ(exec_ctx, expected, slice) \ - expect_slice_eq( \ - exec_ctx, grpc_slice_from_copied_buffer(expected, sizeof(expected) - 1), \ - slice, #slice, __LINE__); +#define EXPECT_SLICE_EQ(expected, slice) \ + expect_slice_eq( \ + grpc_slice_from_copied_buffer(expected, sizeof(expected) - 1), slice, \ + #slice, __LINE__); -#define ENCODE_AND_DECODE(exec_ctx, s) \ - EXPECT_SLICE_EQ(exec_ctx, s, \ - grpc_chttp2_base64_decode_with_length( \ - exec_ctx, base64_encode(exec_ctx, s), strlen(s))); +#define ENCODE_AND_DECODE(s) \ + EXPECT_SLICE_EQ( \ + s, grpc_chttp2_base64_decode_with_length(base64_encode(s), strlen(s))); int main(int argc, char** argv) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - - /* ENCODE_AND_DECODE tests grpc_chttp2_base64_decode_with_length(), which - takes encoded base64 strings without pad chars, but output length is - required. */ - /* Base64 test vectors from RFC 4648 */ - ENCODE_AND_DECODE(&exec_ctx, ""); - ENCODE_AND_DECODE(&exec_ctx, "f"); - ENCODE_AND_DECODE(&exec_ctx, "foo"); - ENCODE_AND_DECODE(&exec_ctx, "fo"); - ENCODE_AND_DECODE(&exec_ctx, "foob"); - ENCODE_AND_DECODE(&exec_ctx, "fooba"); - ENCODE_AND_DECODE(&exec_ctx, "foobar"); - - ENCODE_AND_DECODE(&exec_ctx, "\xc0\xc1\xc2\xc3\xc4\xc5"); - - /* Base64 test vectors from RFC 4648, with pad chars */ - /* BASE64("") = "" */ - EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode(&exec_ctx, "")); - /* BASE64("f") = "Zg==" */ - EXPECT_SLICE_EQ(&exec_ctx, "f", base64_decode(&exec_ctx, "Zg==")); - /* BASE64("fo") = "Zm8=" */ - EXPECT_SLICE_EQ(&exec_ctx, "fo", base64_decode(&exec_ctx, "Zm8=")); - /* BASE64("foo") = "Zm9v" */ - EXPECT_SLICE_EQ(&exec_ctx, "foo", base64_decode(&exec_ctx, "Zm9v")); - /* BASE64("foob") = "Zm9vYg==" */ - EXPECT_SLICE_EQ(&exec_ctx, "foob", base64_decode(&exec_ctx, "Zm9vYg==")); - /* BASE64("fooba") = "Zm9vYmE=" */ - EXPECT_SLICE_EQ(&exec_ctx, "fooba", base64_decode(&exec_ctx, "Zm9vYmE=")); - /* BASE64("foobar") = "Zm9vYmFy" */ - EXPECT_SLICE_EQ(&exec_ctx, "foobar", base64_decode(&exec_ctx, "Zm9vYmFy")); - - EXPECT_SLICE_EQ(&exec_ctx, "\xc0\xc1\xc2\xc3\xc4\xc5", - base64_decode(&exec_ctx, "wMHCw8TF")); - - // Test illegal input length in grpc_chttp2_base64_decode - EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode(&exec_ctx, "a")); - EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode(&exec_ctx, "ab")); - EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode(&exec_ctx, "abc")); - - // Test illegal charactors in grpc_chttp2_base64_decode - EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode(&exec_ctx, "Zm:v")); - EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode(&exec_ctx, "Zm=v")); - - // Test output_length longer than max possible output length in - // grpc_chttp2_base64_decode_with_length - EXPECT_SLICE_EQ(&exec_ctx, "", base64_decode_with_length(&exec_ctx, "Zg", 2)); - EXPECT_SLICE_EQ(&exec_ctx, "", - base64_decode_with_length(&exec_ctx, "Zm8", 3)); - EXPECT_SLICE_EQ(&exec_ctx, "", - base64_decode_with_length(&exec_ctx, "Zm9v", 4)); - - // Test illegal charactors in grpc_chttp2_base64_decode_with_length - EXPECT_SLICE_EQ(&exec_ctx, "", - base64_decode_with_length(&exec_ctx, "Zm:v", 3)); - EXPECT_SLICE_EQ(&exec_ctx, "", - base64_decode_with_length(&exec_ctx, "Zm=v", 3)); - - grpc_exec_ctx_finish(&exec_ctx); - + grpc_init(); + { + grpc_core::ExecCtx exec_ctx; + + /* ENCODE_AND_DECODE tests grpc_chttp2_base64_decode_with_length(), which + takes encoded base64 strings without pad chars, but output length is + required. */ + /* Base64 test vectors from RFC 4648 */ + ENCODE_AND_DECODE(""); + ENCODE_AND_DECODE("f"); + ENCODE_AND_DECODE("foo"); + ENCODE_AND_DECODE("fo"); + ENCODE_AND_DECODE("foob"); + ENCODE_AND_DECODE("fooba"); + ENCODE_AND_DECODE("foobar"); + + ENCODE_AND_DECODE("\xc0\xc1\xc2\xc3\xc4\xc5"); + + /* Base64 test vectors from RFC 4648, with pad chars */ + /* BASE64("") = "" */ + EXPECT_SLICE_EQ("", base64_decode("")); + /* BASE64("f") = "Zg==" */ + EXPECT_SLICE_EQ("f", base64_decode("Zg==")); + /* BASE64("fo") = "Zm8=" */ + EXPECT_SLICE_EQ("fo", base64_decode("Zm8=")); + /* BASE64("foo") = "Zm9v" */ + EXPECT_SLICE_EQ("foo", base64_decode("Zm9v")); + /* BASE64("foob") = "Zm9vYg==" */ + EXPECT_SLICE_EQ("foob", base64_decode("Zm9vYg==")); + /* BASE64("fooba") = "Zm9vYmE=" */ + EXPECT_SLICE_EQ("fooba", base64_decode("Zm9vYmE=")); + /* BASE64("foobar") = "Zm9vYmFy" */ + EXPECT_SLICE_EQ("foobar", base64_decode("Zm9vYmFy")); + + EXPECT_SLICE_EQ("\xc0\xc1\xc2\xc3\xc4\xc5", base64_decode("wMHCw8TF")); + + // Test illegal input length in grpc_chttp2_base64_decode + EXPECT_SLICE_EQ("", base64_decode("a")); + EXPECT_SLICE_EQ("", base64_decode("ab")); + EXPECT_SLICE_EQ("", base64_decode("abc")); + + // Test illegal charactors in grpc_chttp2_base64_decode + EXPECT_SLICE_EQ("", base64_decode("Zm:v")); + EXPECT_SLICE_EQ("", base64_decode("Zm=v")); + + // Test output_length longer than max possible output length in + // grpc_chttp2_base64_decode_with_length + EXPECT_SLICE_EQ("", base64_decode_with_length("Zg", 2)); + EXPECT_SLICE_EQ("", base64_decode_with_length("Zm8", 3)); + EXPECT_SLICE_EQ("", base64_decode_with_length("Zm9v", 4)); + + // Test illegal charactors in grpc_chttp2_base64_decode_with_length + EXPECT_SLICE_EQ("", base64_decode_with_length("Zm:v", 3)); + EXPECT_SLICE_EQ("", base64_decode_with_length("Zm=v", 3)); + } + grpc_shutdown(); return all_ok ? 0 : 1; } diff --git a/test/core/transport/chttp2/bin_encoder_test.cc b/test/core/transport/chttp2/bin_encoder_test.cc index 78b8808c413..44f5de8a50d 100644 --- a/test/core/transport/chttp2/bin_encoder_test.cc +++ b/test/core/transport/chttp2/bin_encoder_test.cc @@ -99,6 +99,8 @@ static void expect_binary_header(const char* hdr, int binary) { } int main(int argc, char** argv) { + grpc_init(); + /* Base64 test vectors from RFC 4648, with padding removed */ /* BASE64("") = "" */ EXPECT_SLICE_EQ("", B64("")); @@ -169,5 +171,6 @@ int main(int argc, char** argv) { expect_binary_header("foo-bar", 0); expect_binary_header("-bin", 0); + grpc_shutdown(); return all_ok ? 0 : 1; } diff --git a/test/core/transport/chttp2/hpack_encoder_test.cc b/test/core/transport/chttp2/hpack_encoder_test.cc index 2d18b725042..d2dbd4a7986 100644 --- a/test/core/transport/chttp2/hpack_encoder_test.cc +++ b/test/core/transport/chttp2/hpack_encoder_test.cc @@ -51,8 +51,8 @@ typedef struct { /* verify that the output generated by encoding the stream matches the hexstring passed in */ -static void verify(grpc_exec_ctx* exec_ctx, const verify_params params, - const char* expected, size_t nheaders, ...) { +static void verify(const verify_params params, const char* expected, + size_t nheaders, ...) { grpc_slice_buffer output; grpc_slice merged; grpc_slice expect = parse_hexstring(expected); @@ -77,8 +77,7 @@ static void verify(grpc_exec_ctx* exec_ctx, const verify_params params, value_slice = grpc_slice_intern(value_slice); } e[i].md = grpc_mdelem_from_slices( - exec_ctx, grpc_slice_intern(grpc_slice_from_static_string(key)), - value_slice); + grpc_slice_intern(grpc_slice_from_static_string(key)), value_slice); } e[0].prev = nullptr; e[nheaders - 1].next = nullptr; @@ -106,11 +105,10 @@ static void verify(grpc_exec_ctx* exec_ctx, const verify_params params, 16384, /* max_frame_size */ &stats /* stats */ }; - grpc_chttp2_encode_header(exec_ctx, &g_compressor, nullptr, 0, &b, &hopt, - &output); + grpc_chttp2_encode_header(&g_compressor, nullptr, 0, &b, &hopt, &output); merged = grpc_slice_merge(output.slices, output.count); - grpc_slice_buffer_destroy_internal(exec_ctx, &output); - grpc_metadata_batch_destroy(exec_ctx, &b); + grpc_slice_buffer_destroy_internal(&output); + grpc_metadata_batch_destroy(&b); if (!grpc_slice_eq(merged, expect)) { char* expect_str = grpc_dump_slice(expect, GPR_DUMP_HEX | GPR_DUMP_ASCII); @@ -123,11 +121,11 @@ static void verify(grpc_exec_ctx* exec_ctx, const verify_params params, g_failure = 1; } - grpc_slice_unref_internal(exec_ctx, merged); - grpc_slice_unref_internal(exec_ctx, expect); + grpc_slice_unref_internal(merged); + grpc_slice_unref_internal(expect); } -static void test_basic_headers(grpc_exec_ctx* exec_ctx) { +static void test_basic_headers() { int i; verify_params params = { @@ -135,24 +133,22 @@ static void test_basic_headers(grpc_exec_ctx* exec_ctx) { false, false, }; - verify(exec_ctx, params, "000005 0104 deadbeef 40 0161 0161", 1, "a", "a"); - verify(exec_ctx, params, "000001 0104 deadbeef be", 1, "a", "a"); - verify(exec_ctx, params, "000001 0104 deadbeef be", 1, "a", "a"); - verify(exec_ctx, params, "000006 0104 deadbeef be 40 0162 0163", 2, "a", "a", - "b", "c"); - verify(exec_ctx, params, "000002 0104 deadbeef bf be", 2, "a", "a", "b", "c"); - verify(exec_ctx, params, "000004 0104 deadbeef 7f 00 0164", 1, "a", "d"); + verify(params, "000005 0104 deadbeef 40 0161 0161", 1, "a", "a"); + verify(params, "000001 0104 deadbeef be", 1, "a", "a"); + verify(params, "000001 0104 deadbeef be", 1, "a", "a"); + verify(params, "000006 0104 deadbeef be 40 0162 0163", 2, "a", "a", "b", "c"); + verify(params, "000002 0104 deadbeef bf be", 2, "a", "a", "b", "c"); + verify(params, "000004 0104 deadbeef 7f 00 0164", 1, "a", "d"); /* flush out what's there to make a few values look very popular */ for (i = 0; i < 350; i++) { - verify(exec_ctx, params, "000003 0104 deadbeef c0 bf be", 3, "a", "a", "b", - "c", "a", "d"); + verify(params, "000003 0104 deadbeef c0 bf be", 3, "a", "a", "b", "c", "a", + "d"); } - verify(exec_ctx, params, "000006 0104 deadbeef c0 00 016b 0176", 2, "a", "a", - "k", "v"); + verify(params, "000006 0104 deadbeef c0 00 016b 0176", 2, "a", "a", "k", "v"); /* this could be 000004 0104 deadbeef 0f 30 0176 also */ - verify(exec_ctx, params, "000004 0104 deadbeef 0f 2f 0176", 1, "a", "v"); + verify(params, "000004 0104 deadbeef 0f 2f 0176", 1, "a", "v"); } static void encode_int_to_str(int i, char* p) { @@ -163,7 +159,7 @@ static void encode_int_to_str(int i, char* p) { p[2] = 0; } -static void test_decode_table_overflow(grpc_exec_ctx* exec_ctx) { +static void test_decode_table_overflow() { int i; char key[3], value[3]; char* expect; @@ -192,26 +188,24 @@ static void test_decode_table_overflow(grpc_exec_ctx* exec_ctx) { } if (i > 0) { - verify(exec_ctx, params, expect, 2, "aa", "ba", key, value); + verify(params, expect, 2, "aa", "ba", key, value); } else { - verify(exec_ctx, params, expect, 1, key, value); + verify(params, expect, 1, key, value); } gpr_free(expect); } /* if the above passes, then we must have just knocked this pair out of the decoder stack, and so we'll be forced to re-encode it */ - verify(exec_ctx, params, "000007 0104 deadbeef 40 026161 026261", 1, "aa", - "ba"); + verify(params, "000007 0104 deadbeef 40 026161 026261", 1, "aa", "ba"); } -static void verify_table_size_change_match_elem_size(grpc_exec_ctx* exec_ctx, - const char* key, +static void verify_table_size_change_match_elem_size(const char* key, const char* value, bool use_true_binary) { grpc_slice_buffer output; grpc_mdelem elem = grpc_mdelem_from_slices( - exec_ctx, grpc_slice_intern(grpc_slice_from_static_string(key)), + grpc_slice_intern(grpc_slice_from_static_string(key)), grpc_slice_intern(grpc_slice_from_static_string(value))); size_t elem_size = grpc_mdelem_get_size_in_hpack_table(elem, use_true_binary); size_t initial_table_size = g_compressor.table_size; @@ -235,41 +229,38 @@ static void verify_table_size_change_match_elem_size(grpc_exec_ctx* exec_ctx, use_true_binary, /* use_true_binary_metadata */ 16384, /* max_frame_size */ &stats /* stats */}; - grpc_chttp2_encode_header(exec_ctx, &g_compressor, nullptr, 0, &b, &hopt, - &output); - grpc_slice_buffer_destroy_internal(exec_ctx, &output); - grpc_metadata_batch_destroy(exec_ctx, &b); + grpc_chttp2_encode_header(&g_compressor, nullptr, 0, &b, &hopt, &output); + grpc_slice_buffer_destroy_internal(&output); + grpc_metadata_batch_destroy(&b); GPR_ASSERT(g_compressor.table_size == elem_size + initial_table_size); gpr_free(e); } -static void test_encode_header_size(grpc_exec_ctx* exec_ctx) { - verify_table_size_change_match_elem_size(exec_ctx, "hello", "world", false); - verify_table_size_change_match_elem_size(exec_ctx, "hello-bin", "world", - false); - verify_table_size_change_match_elem_size(exec_ctx, "true-binary-bin", +static void test_encode_header_size() { + verify_table_size_change_match_elem_size("hello", "world", false); + verify_table_size_change_match_elem_size("hello-bin", "world", false); + verify_table_size_change_match_elem_size("true-binary-bin", "I_am_true_binary_value", true); } -static void test_interned_key_indexed(grpc_exec_ctx* exec_ctx) { +static void test_interned_key_indexed() { int i; verify_params params = {false, false, true}; - verify(exec_ctx, params, "000009 0104 deadbeef 40 0161 0162 0f2f 0163", 2, - "a", "b", "a", "c"); + verify(params, "000009 0104 deadbeef 40 0161 0162 0f2f 0163", 2, "a", "b", + "a", "c"); for (i = 0; i < 10; i++) { - verify(exec_ctx, params, "000008 0104 deadbeef 0f2f 0162 0f2f 0163", 2, "a", - "b", "a", "c"); + verify(params, "000008 0104 deadbeef 0f2f 0162 0f2f 0163", 2, "a", "b", "a", + "c"); } } -static void run_test(void (*test)(grpc_exec_ctx* exec_ctx), const char* name) { +static void run_test(void (*test)(), const char* name) { gpr_log(GPR_INFO, "RUN TEST: %s", name); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_chttp2_hpack_compressor_init(&g_compressor); - test(&exec_ctx); - grpc_chttp2_hpack_compressor_destroy(&exec_ctx, &g_compressor); - grpc_exec_ctx_finish(&exec_ctx); + test(); + grpc_chttp2_hpack_compressor_destroy(&g_compressor); } int main(int argc, char** argv) { diff --git a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc index 942f25e0b75..9a195daee0a 100644 --- a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc +++ b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc @@ -29,9 +29,7 @@ bool squelch = true; bool leak_check = true; -static void onhdr(grpc_exec_ctx* exec_ctx, void* ud, grpc_mdelem md) { - GRPC_MDELEM_UNREF(exec_ctx, md); -} +static void onhdr(void* ud, grpc_mdelem md) { GRPC_MDELEM_UNREF(md); } static void dont_log(gpr_log_func_args* args) {} extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { @@ -39,13 +37,14 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (squelch) gpr_set_log_function(dont_log); grpc_init(); grpc_chttp2_hpack_parser parser; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_chttp2_hpack_parser_init(&exec_ctx, &parser); - parser.on_header = onhdr; - GRPC_ERROR_UNREF(grpc_chttp2_hpack_parser_parse( - &exec_ctx, &parser, grpc_slice_from_static_buffer(data, size))); - grpc_chttp2_hpack_parser_destroy(&exec_ctx, &parser); - grpc_exec_ctx_finish(&exec_ctx); + { + grpc_core::ExecCtx exec_ctx; + grpc_chttp2_hpack_parser_init(&parser); + parser.on_header = onhdr; + GRPC_ERROR_UNREF(grpc_chttp2_hpack_parser_parse( + &parser, grpc_slice_from_static_buffer(data, size))); + grpc_chttp2_hpack_parser_destroy(&parser); + } grpc_shutdown(); return 0; } diff --git a/test/core/transport/chttp2/hpack_parser_test.cc b/test/core/transport/chttp2/hpack_parser_test.cc index 82fb20aced6..9d3456a873a 100644 --- a/test/core/transport/chttp2/hpack_parser_test.cc +++ b/test/core/transport/chttp2/hpack_parser_test.cc @@ -32,7 +32,7 @@ typedef struct { va_list args; } test_checker; -static void onhdr(grpc_exec_ctx* exec_ctx, void* ud, grpc_mdelem md) { +static void onhdr(void* ud, grpc_mdelem md) { const char *ekey, *evalue; test_checker* chk = static_cast(ud); ekey = va_arg(chk->args, char*); @@ -41,7 +41,7 @@ static void onhdr(grpc_exec_ctx* exec_ctx, void* ud, grpc_mdelem md) { GPR_ASSERT(evalue); GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDKEY(md), ekey) == 0); GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDVALUE(md), evalue) == 0); - GRPC_MDELEM_UNREF(exec_ctx, md); + GRPC_MDELEM_UNREF(md); } static void test_vector(grpc_chttp2_hpack_parser* parser, @@ -62,10 +62,9 @@ static void test_vector(grpc_chttp2_hpack_parser* parser, grpc_slice_unref(input); for (i = 0; i < nslices; i++) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT(grpc_chttp2_hpack_parser_parse(&exec_ctx, parser, slices[i]) == + grpc_core::ExecCtx exec_ctx; + GPR_ASSERT(grpc_chttp2_hpack_parser_parse(parser, slices[i]) == GRPC_ERROR_NONE); - grpc_exec_ctx_finish(&exec_ctx); } for (i = 0; i < nslices; i++) { @@ -80,9 +79,9 @@ static void test_vector(grpc_chttp2_hpack_parser* parser, static void test_vectors(grpc_slice_split_mode mode) { grpc_chttp2_hpack_parser parser; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; - grpc_chttp2_hpack_parser_init(&exec_ctx, &parser); + grpc_chttp2_hpack_parser_init(&parser); /* D.2.1 */ test_vector(&parser, mode, "400a 6375 7374 6f6d 2d6b 6579 0d63 7573" @@ -98,9 +97,9 @@ static void test_vectors(grpc_slice_split_mode mode) { "password", "secret", NULL); /* D.2.4 */ test_vector(&parser, mode, "82", ":method", "GET", NULL); - grpc_chttp2_hpack_parser_destroy(&exec_ctx, &parser); + grpc_chttp2_hpack_parser_destroy(&parser); - grpc_chttp2_hpack_parser_init(&exec_ctx, &parser); + grpc_chttp2_hpack_parser_init(&parser); /* D.3.1 */ test_vector(&parser, mode, "8286 8441 0f77 7777 2e65 7861 6d70 6c65" @@ -118,9 +117,9 @@ static void test_vectors(grpc_slice_split_mode mode) { ":method", "GET", ":scheme", "https", ":path", "/index.html", ":authority", "www.example.com", "custom-key", "custom-value", NULL); - grpc_chttp2_hpack_parser_destroy(&exec_ctx, &parser); + grpc_chttp2_hpack_parser_destroy(&parser); - grpc_chttp2_hpack_parser_init(&exec_ctx, &parser); + grpc_chttp2_hpack_parser_init(&parser); /* D.4.1 */ test_vector(&parser, mode, "8286 8441 8cf1 e3c2 e5f2 3a6b a0ab 90f4" @@ -138,11 +137,11 @@ static void test_vectors(grpc_slice_split_mode mode) { ":method", "GET", ":scheme", "https", ":path", "/index.html", ":authority", "www.example.com", "custom-key", "custom-value", NULL); - grpc_chttp2_hpack_parser_destroy(&exec_ctx, &parser); + grpc_chttp2_hpack_parser_destroy(&parser); - grpc_chttp2_hpack_parser_init(&exec_ctx, &parser); - grpc_chttp2_hptbl_set_max_bytes(&exec_ctx, &parser.table, 256); - grpc_chttp2_hptbl_set_current_table_size(&exec_ctx, &parser.table, 256); + grpc_chttp2_hpack_parser_init(&parser); + grpc_chttp2_hptbl_set_max_bytes(&parser.table, 256); + grpc_chttp2_hptbl_set_current_table_size(&parser.table, 256); /* D.5.1 */ test_vector(&parser, mode, "4803 3330 3258 0770 7269 7661 7465 611d" @@ -172,11 +171,11 @@ static void test_vectors(grpc_slice_split_mode mode) { "https://www.example.com", "content-encoding", "gzip", "set-cookie", "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1", NULL); - grpc_chttp2_hpack_parser_destroy(&exec_ctx, &parser); + grpc_chttp2_hpack_parser_destroy(&parser); - grpc_chttp2_hpack_parser_init(&exec_ctx, &parser); - grpc_chttp2_hptbl_set_max_bytes(&exec_ctx, &parser.table, 256); - grpc_chttp2_hptbl_set_current_table_size(&exec_ctx, &parser.table, 256); + grpc_chttp2_hpack_parser_init(&parser); + grpc_chttp2_hptbl_set_max_bytes(&parser.table, 256); + grpc_chttp2_hptbl_set_current_table_size(&parser.table, 256); /* D.6.1 */ test_vector(&parser, mode, "4882 6402 5885 aec3 771a 4b61 96d0 7abe" @@ -203,9 +202,7 @@ static void test_vectors(grpc_slice_split_mode mode) { "https://www.example.com", "content-encoding", "gzip", "set-cookie", "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1", NULL); - grpc_chttp2_hpack_parser_destroy(&exec_ctx, &parser); - - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_hpack_parser_destroy(&parser); } int main(int argc, char** argv) { diff --git a/test/core/transport/chttp2/hpack_table_test.cc b/test/core/transport/chttp2/hpack_table_test.cc index ff7c2de5380..3f3cb2ee9db 100644 --- a/test/core/transport/chttp2/hpack_table_test.cc +++ b/test/core/transport/chttp2/hpack_table_test.cc @@ -44,10 +44,10 @@ static void assert_index(const grpc_chttp2_hptbl* tbl, uint32_t idx, } static void test_static_lookup(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_chttp2_hptbl tbl; - grpc_chttp2_hptbl_init(&exec_ctx, &tbl); + grpc_chttp2_hptbl_init(&tbl); LOG_TEST("test_static_lookup"); assert_index(&tbl, 1, ":authority", ""); @@ -112,8 +112,7 @@ static void test_static_lookup(void) { assert_index(&tbl, 60, "via", ""); assert_index(&tbl, 61, "www-authenticate", ""); - grpc_chttp2_hptbl_destroy(&exec_ctx, &tbl); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_hptbl_destroy(&tbl); } static void test_many_additions(void) { @@ -124,18 +123,17 @@ static void test_many_additions(void) { LOG_TEST("test_many_additions"); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_chttp2_hptbl_init(&exec_ctx, &tbl); + grpc_core::ExecCtx exec_ctx; + grpc_chttp2_hptbl_init(&tbl); for (i = 0; i < 100000; i++) { grpc_mdelem elem; gpr_asprintf(&key, "K:%d", i); gpr_asprintf(&value, "VALUE:%d", i); - elem = - grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_copied_string(key), - grpc_slice_from_copied_string(value)); - GPR_ASSERT(grpc_chttp2_hptbl_add(&exec_ctx, &tbl, elem) == GRPC_ERROR_NONE); - GRPC_MDELEM_UNREF(&exec_ctx, elem); + elem = grpc_mdelem_from_slices(grpc_slice_from_copied_string(key), + grpc_slice_from_copied_string(value)); + GPR_ASSERT(grpc_chttp2_hptbl_add(&tbl, elem) == GRPC_ERROR_NONE); + GRPC_MDELEM_UNREF(elem); assert_index(&tbl, 1 + GRPC_CHTTP2_LAST_STATIC_ENTRY, key, value); gpr_free(key); gpr_free(value); @@ -148,25 +146,23 @@ static void test_many_additions(void) { } } - grpc_chttp2_hptbl_destroy(&exec_ctx, &tbl); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_hptbl_destroy(&tbl); } static grpc_chttp2_hptbl_find_result find_simple(grpc_chttp2_hptbl* tbl, const char* key, const char* value) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_mdelem md = - grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_copied_string(key), - grpc_slice_from_copied_string(value)); + grpc_core::ExecCtx exec_ctx; + grpc_mdelem md = grpc_mdelem_from_slices( + grpc_slice_from_copied_string(key), grpc_slice_from_copied_string(value)); grpc_chttp2_hptbl_find_result r = grpc_chttp2_hptbl_find(tbl, md); - GRPC_MDELEM_UNREF(&exec_ctx, md); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(md); + return r; } static void test_find(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_chttp2_hptbl tbl; uint32_t i; char buffer[32]; @@ -175,21 +171,19 @@ static void test_find(void) { LOG_TEST("test_find"); - grpc_chttp2_hptbl_init(&exec_ctx, &tbl); - elem = - grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_static_string("abc"), - grpc_slice_from_static_string("xyz")); - GPR_ASSERT(grpc_chttp2_hptbl_add(&exec_ctx, &tbl, elem) == GRPC_ERROR_NONE); - GRPC_MDELEM_UNREF(&exec_ctx, elem); - elem = - grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_static_string("abc"), - grpc_slice_from_static_string("123")); - GPR_ASSERT(grpc_chttp2_hptbl_add(&exec_ctx, &tbl, elem) == GRPC_ERROR_NONE); - GRPC_MDELEM_UNREF(&exec_ctx, elem); - elem = grpc_mdelem_from_slices(&exec_ctx, grpc_slice_from_static_string("x"), + grpc_chttp2_hptbl_init(&tbl); + elem = grpc_mdelem_from_slices(grpc_slice_from_static_string("abc"), + grpc_slice_from_static_string("xyz")); + GPR_ASSERT(grpc_chttp2_hptbl_add(&tbl, elem) == GRPC_ERROR_NONE); + GRPC_MDELEM_UNREF(elem); + elem = grpc_mdelem_from_slices(grpc_slice_from_static_string("abc"), + grpc_slice_from_static_string("123")); + GPR_ASSERT(grpc_chttp2_hptbl_add(&tbl, elem) == GRPC_ERROR_NONE); + GRPC_MDELEM_UNREF(elem); + elem = grpc_mdelem_from_slices(grpc_slice_from_static_string("x"), grpc_slice_from_static_string("1")); - GPR_ASSERT(grpc_chttp2_hptbl_add(&exec_ctx, &tbl, elem) == GRPC_ERROR_NONE); - GRPC_MDELEM_UNREF(&exec_ctx, elem); + GPR_ASSERT(grpc_chttp2_hptbl_add(&tbl, elem) == GRPC_ERROR_NONE); + GRPC_MDELEM_UNREF(elem); r = find_simple(&tbl, "abc", "123"); GPR_ASSERT(r.index == 2 + GRPC_CHTTP2_LAST_STATIC_ENTRY); @@ -238,11 +232,10 @@ static void test_find(void) { /* overflow the string buffer, check find still works */ for (i = 0; i < 10000; i++) { int64_ttoa(i, buffer); - elem = grpc_mdelem_from_slices(&exec_ctx, - grpc_slice_from_static_string("test"), + elem = grpc_mdelem_from_slices(grpc_slice_from_static_string("test"), grpc_slice_from_copied_string(buffer)); - GPR_ASSERT(grpc_chttp2_hptbl_add(&exec_ctx, &tbl, elem) == GRPC_ERROR_NONE); - GRPC_MDELEM_UNREF(&exec_ctx, elem); + GPR_ASSERT(grpc_chttp2_hptbl_add(&tbl, elem) == GRPC_ERROR_NONE); + GRPC_MDELEM_UNREF(elem); } r = find_simple(&tbl, "abc", "123"); @@ -270,8 +263,7 @@ static void test_find(void) { GPR_ASSERT(r.index != 0); GPR_ASSERT(r.has_value == 0); - grpc_chttp2_hptbl_destroy(&exec_ctx, &tbl); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_hptbl_destroy(&tbl); } int main(int argc, char** argv) { diff --git a/test/core/transport/chttp2/settings_timeout_test.cc b/test/core/transport/chttp2/settings_timeout_test.cc index 670eae1f792..08473c72b68 100644 --- a/test/core/transport/chttp2/settings_timeout_test.cc +++ b/test/core/transport/chttp2/settings_timeout_test.cc @@ -97,7 +97,7 @@ class Client { : server_address_(server_address) {} void Connect() { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_resolved_addresses* server_addresses = nullptr; grpc_error* error = grpc_blocking_resolve_address(server_address_, "80", &server_addresses); @@ -106,56 +106,53 @@ class Client { pollset_ = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); grpc_pollset_init(pollset_, &mu_); grpc_pollset_set* pollset_set = grpc_pollset_set_create(); - grpc_pollset_set_add_pollset(&exec_ctx, pollset_set, pollset_); + grpc_pollset_set_add_pollset(pollset_set, pollset_); EventState state; - grpc_tcp_client_connect(&exec_ctx, state.closure(), &endpoint_, pollset_set, + grpc_tcp_client_connect(state.closure(), &endpoint_, pollset_set, nullptr /* channel_args */, server_addresses->addrs, 1000); ASSERT_TRUE(PollUntilDone( - &exec_ctx, &state, + &state, grpc_timespec_to_millis_round_up(gpr_inf_future(GPR_CLOCK_MONOTONIC)))); ASSERT_EQ(GRPC_ERROR_NONE, state.error()); - grpc_pollset_set_destroy(&exec_ctx, pollset_set); - grpc_endpoint_add_to_pollset(&exec_ctx, endpoint_, pollset_); + grpc_pollset_set_destroy(pollset_set); + grpc_endpoint_add_to_pollset(endpoint_, pollset_); grpc_resolved_addresses_destroy(server_addresses); - grpc_exec_ctx_finish(&exec_ctx); } // Reads until an error is returned. // Returns true if an error was encountered before the deadline. bool ReadUntilError() { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_slice_buffer read_buffer; grpc_slice_buffer_init(&read_buffer); bool retval = true; // Use a deadline of 3 seconds, which is a lot more than we should // need for a 1-second timeout, but this helps avoid flakes. - grpc_millis deadline = grpc_exec_ctx_now(&exec_ctx) + 3000; + grpc_millis deadline = grpc_core::ExecCtx::Get()->Now() + 3000; while (true) { EventState state; - grpc_endpoint_read(&exec_ctx, endpoint_, &read_buffer, state.closure()); - if (!PollUntilDone(&exec_ctx, &state, deadline)) { + grpc_endpoint_read(endpoint_, &read_buffer, state.closure()); + if (!PollUntilDone(&state, deadline)) { retval = false; break; } if (state.error() != GRPC_ERROR_NONE) break; gpr_log(GPR_INFO, "client read %" PRIuPTR " bytes", read_buffer.length); - grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, &read_buffer); + grpc_slice_buffer_reset_and_unref_internal(&read_buffer); } - grpc_endpoint_shutdown(&exec_ctx, endpoint_, + grpc_endpoint_shutdown(endpoint_, GRPC_ERROR_CREATE_FROM_STATIC_STRING("shutdown")); - grpc_slice_buffer_destroy_internal(&exec_ctx, &read_buffer); - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_buffer_destroy_internal(&read_buffer); return retval; } void Shutdown() { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_endpoint_destroy(&exec_ctx, endpoint_); - grpc_pollset_shutdown(&exec_ctx, pollset_, + grpc_core::ExecCtx exec_ctx; + grpc_endpoint_destroy(endpoint_); + grpc_pollset_shutdown(pollset_, GRPC_CLOSURE_CREATE(&Client::PollsetDestroy, pollset_, grpc_schedule_on_exec_ctx)); - grpc_exec_ctx_finish(&exec_ctx); } private: @@ -177,8 +174,7 @@ class Client { grpc_error* error() const { return error_; } private: - static void OnEventDone(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { + static void OnEventDone(void* arg, grpc_error* error) { gpr_log(GPR_INFO, "OnEventDone(): %s", grpc_error_string(error)); EventState* state = (EventState*)arg; state->error_ = GRPC_ERROR_REF(error); @@ -191,24 +187,23 @@ class Client { }; // Returns true if done, or false if deadline exceeded. - bool PollUntilDone(grpc_exec_ctx* exec_ctx, EventState* state, - grpc_millis deadline) { + bool PollUntilDone(EventState* state, grpc_millis deadline) { while (true) { grpc_pollset_worker* worker = nullptr; gpr_mu_lock(mu_); - GRPC_LOG_IF_ERROR("grpc_pollset_work", - grpc_pollset_work(exec_ctx, pollset_, &worker, - grpc_exec_ctx_now(exec_ctx) + 1000)); + GRPC_LOG_IF_ERROR( + "grpc_pollset_work", + grpc_pollset_work(pollset_, &worker, + grpc_core::ExecCtx::Get()->Now() + 1000)); gpr_mu_unlock(mu_); if (state != nullptr && state->done()) return true; - if (grpc_exec_ctx_now(exec_ctx) >= deadline) return false; + if (grpc_core::ExecCtx::Get()->Now() >= deadline) return false; } } - static void PollsetDestroy(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { + static void PollsetDestroy(void* arg, grpc_error* error) { grpc_pollset* pollset = (grpc_pollset*)arg; - grpc_pollset_destroy(exec_ctx, pollset); + grpc_pollset_destroy(pollset); gpr_free(pollset); } diff --git a/test/core/transport/chttp2/varint_test.cc b/test/core/transport/chttp2/varint_test.cc index 413b461b3af..36760d0c723 100644 --- a/test/core/transport/chttp2/varint_test.cc +++ b/test/core/transport/chttp2/varint_test.cc @@ -18,6 +18,7 @@ #include "src/core/ext/transport/chttp2/transport/varint.h" +#include #include #include @@ -44,11 +45,13 @@ static void test_varint(uint32_t value, uint32_t prefix_bits, uint8_t prefix_or, int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); TEST_VARINT(0, 1, 0, "\x00"); TEST_VARINT(128, 1, 0, "\x7f\x01"); TEST_VARINT(16384, 1, 0, "\x7f\x81\x7f"); TEST_VARINT(2097152, 1, 0, "\x7f\x81\xff\x7f"); TEST_VARINT(268435456, 1, 0, "\x7f\x81\xff\xff\x7f"); TEST_VARINT(0xffffffff, 1, 0, "\x7f\x80\xff\xff\xff\x0f"); + grpc_shutdown(); return 0; } diff --git a/test/core/transport/connectivity_state_test.cc b/test/core/transport/connectivity_state_test.cc index 11046e126e9..f5894599e52 100644 --- a/test/core/transport/connectivity_state_test.cc +++ b/test/core/transport/connectivity_state_test.cc @@ -29,14 +29,13 @@ int g_counter; -static void must_succeed(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void must_succeed(void* arg, grpc_error* error) { GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(arg == THE_ARG); g_counter++; } -static void must_fail(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { +static void must_fail(void* arg, grpc_error* error) { GPR_ASSERT(error != GRPC_ERROR_NONE); GPR_ASSERT(arg == THE_ARG); g_counter++; @@ -59,7 +58,7 @@ static void test_connectivity_state_name(void) { static void test_check(void) { grpc_connectivity_state_tracker tracker; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_error* error; gpr_log(GPR_DEBUG, "test_check"); grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx"); @@ -67,8 +66,7 @@ static void test_check(void) { GRPC_CHANNEL_IDLE); GPR_ASSERT(grpc_connectivity_state_check(&tracker) == GRPC_CHANNEL_IDLE); GPR_ASSERT(error == GRPC_ERROR_NONE); - grpc_connectivity_state_destroy(&exec_ctx, &tracker); - grpc_exec_ctx_finish(&exec_ctx); + grpc_connectivity_state_destroy(&tracker); } static void test_subscribe_then_unsubscribe(void) { @@ -76,23 +74,21 @@ static void test_subscribe_then_unsubscribe(void) { grpc_closure* closure = GRPC_CLOSURE_CREATE(must_fail, THE_ARG, grpc_schedule_on_exec_ctx); grpc_connectivity_state state = GRPC_CHANNEL_IDLE; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_DEBUG, "test_subscribe_then_unsubscribe"); g_counter = 0; grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx"); - GPR_ASSERT(grpc_connectivity_state_notify_on_state_change(&exec_ctx, &tracker, - &state, closure)); - grpc_exec_ctx_flush(&exec_ctx); + GPR_ASSERT(grpc_connectivity_state_notify_on_state_change(&tracker, &state, + closure)); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(state == GRPC_CHANNEL_IDLE); GPR_ASSERT(g_counter == 0); - grpc_connectivity_state_notify_on_state_change(&exec_ctx, &tracker, nullptr, - closure); - grpc_exec_ctx_flush(&exec_ctx); + grpc_connectivity_state_notify_on_state_change(&tracker, nullptr, closure); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(state == GRPC_CHANNEL_IDLE); GPR_ASSERT(g_counter == 1); - grpc_connectivity_state_destroy(&exec_ctx, &tracker); - grpc_exec_ctx_finish(&exec_ctx); + grpc_connectivity_state_destroy(&tracker); } static void test_subscribe_then_destroy(void) { @@ -100,17 +96,18 @@ static void test_subscribe_then_destroy(void) { grpc_closure* closure = GRPC_CLOSURE_CREATE(must_succeed, THE_ARG, grpc_schedule_on_exec_ctx); grpc_connectivity_state state = GRPC_CHANNEL_IDLE; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_DEBUG, "test_subscribe_then_destroy"); g_counter = 0; grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx"); - GPR_ASSERT(grpc_connectivity_state_notify_on_state_change(&exec_ctx, &tracker, - &state, closure)); - grpc_exec_ctx_flush(&exec_ctx); + GPR_ASSERT(grpc_connectivity_state_notify_on_state_change(&tracker, &state, + closure)); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(state == GRPC_CHANNEL_IDLE); GPR_ASSERT(g_counter == 0); - grpc_connectivity_state_destroy(&exec_ctx, &tracker); - grpc_exec_ctx_finish(&exec_ctx); + grpc_connectivity_state_destroy(&tracker); + + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(state == GRPC_CHANNEL_SHUTDOWN); GPR_ASSERT(g_counter == 1); } @@ -120,28 +117,30 @@ static void test_subscribe_with_failure_then_destroy(void) { grpc_closure* closure = GRPC_CLOSURE_CREATE(must_fail, THE_ARG, grpc_schedule_on_exec_ctx); grpc_connectivity_state state = GRPC_CHANNEL_SHUTDOWN; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_log(GPR_DEBUG, "test_subscribe_with_failure_then_destroy"); g_counter = 0; grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_SHUTDOWN, "xxx"); GPR_ASSERT(0 == grpc_connectivity_state_notify_on_state_change( - &exec_ctx, &tracker, &state, closure)); - grpc_exec_ctx_flush(&exec_ctx); + &tracker, &state, closure)); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(state == GRPC_CHANNEL_SHUTDOWN); GPR_ASSERT(g_counter == 0); - grpc_connectivity_state_destroy(&exec_ctx, &tracker); - grpc_exec_ctx_finish(&exec_ctx); + grpc_connectivity_state_destroy(&tracker); + grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(state == GRPC_CHANNEL_SHUTDOWN); GPR_ASSERT(g_counter == 1); } int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); grpc_core::testing::grpc_tracer_enable_flag(&grpc_connectivity_state_trace); test_connectivity_state_name(); test_check(); test_subscribe_then_unsubscribe(); test_subscribe_then_destroy(); test_subscribe_with_failure_then_destroy(); + grpc_shutdown(); return 0; } diff --git a/test/core/transport/metadata_test.cc b/test/core/transport/metadata_test.cc index b60a9619fb4..5c52ae8d5f5 100644 --- a/test/core/transport/metadata_test.cc +++ b/test/core/transport/metadata_test.cc @@ -60,15 +60,15 @@ static void test_create_metadata(bool intern_keys, bool intern_values) { intern_keys, intern_values); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; m1 = grpc_mdelem_from_slices( - &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values)); m2 = grpc_mdelem_from_slices( - &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values)); m3 = grpc_mdelem_from_slices( - &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("c"), intern_values)); GPR_ASSERT(grpc_mdelem_eq(m1, m2)); GPR_ASSERT(!grpc_mdelem_eq(m3, m1)); @@ -77,10 +77,10 @@ static void test_create_metadata(bool intern_keys, bool intern_values) { GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDKEY(m1), "a") == 0); GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDVALUE(m1), "b") == 0); GPR_ASSERT(grpc_slice_str_cmp(GRPC_MDVALUE(m3), "c") == 0); - GRPC_MDELEM_UNREF(&exec_ctx, m1); - GRPC_MDELEM_UNREF(&exec_ctx, m2); - GRPC_MDELEM_UNREF(&exec_ctx, m3); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(m1); + GRPC_MDELEM_UNREF(m2); + GRPC_MDELEM_UNREF(m3); + grpc_shutdown(); } @@ -95,19 +95,15 @@ static void test_create_many_ephemeral_metadata(bool intern_keys, intern_keys, intern_values); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; /* add, and immediately delete a bunch of different elements */ for (i = 0; i < MANY; i++) { gpr_ltoa(i, buffer); - GRPC_MDELEM_UNREF( - &exec_ctx, - grpc_mdelem_from_slices( - &exec_ctx, - maybe_intern(grpc_slice_from_static_string("a"), intern_keys), - maybe_intern(grpc_slice_from_copied_string(buffer), - intern_values))); + GRPC_MDELEM_UNREF(grpc_mdelem_from_slices( + maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + maybe_intern(grpc_slice_from_copied_string(buffer), intern_values))); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_shutdown(); } @@ -121,28 +117,28 @@ static void test_create_many_persistant_metadata(void) { gpr_log(GPR_INFO, "test_create_many_persistant_metadata"); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; /* add phase */ for (i = 0; i < MANY; i++) { gpr_ltoa(i, buffer); created[i] = grpc_mdelem_from_slices( - &exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("a")), + grpc_slice_intern(grpc_slice_from_static_string("a")), grpc_slice_intern(grpc_slice_from_static_string(buffer))); } /* verify phase */ for (i = 0; i < MANY; i++) { gpr_ltoa(i, buffer); md = grpc_mdelem_from_slices( - &exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("a")), + grpc_slice_intern(grpc_slice_from_static_string("a")), grpc_slice_intern(grpc_slice_from_static_string(buffer))); GPR_ASSERT(grpc_mdelem_eq(md, created[i])); - GRPC_MDELEM_UNREF(&exec_ctx, md); + GRPC_MDELEM_UNREF(md); } /* cleanup phase */ for (i = 0; i < MANY; i++) { - GRPC_MDELEM_UNREF(&exec_ctx, created[i]); + GRPC_MDELEM_UNREF(created[i]); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_shutdown(); gpr_free(created); @@ -155,31 +151,25 @@ static void test_spin_creating_the_same_thing(bool intern_keys, intern_keys, intern_values); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_mdelem a, b, c; GRPC_MDELEM_UNREF( - &exec_ctx, a = grpc_mdelem_from_slices( - &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values))); GRPC_MDELEM_UNREF( - &exec_ctx, b = grpc_mdelem_from_slices( - &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values))); GRPC_MDELEM_UNREF( - &exec_ctx, c = grpc_mdelem_from_slices( - &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values))); if (intern_keys && intern_values) { GPR_ASSERT(a.payload == b.payload); GPR_ASSERT(a.payload == c.payload); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_shutdown(); } @@ -188,16 +178,16 @@ static void test_identity_laws(bool intern_keys, bool intern_values) { intern_keys, intern_values); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_mdelem a, b, c; a = grpc_mdelem_from_slices( - &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values)); b = grpc_mdelem_from_slices( - &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values)); c = grpc_mdelem_from_slices( - &exec_ctx, maybe_intern(grpc_slice_from_static_string("a"), intern_keys), + maybe_intern(grpc_slice_from_static_string("a"), intern_keys), maybe_intern(grpc_slice_from_static_string("b"), intern_values)); GPR_ASSERT(grpc_mdelem_eq(a, a)); GPR_ASSERT(grpc_mdelem_eq(b, b)); @@ -216,10 +206,10 @@ static void test_identity_laws(bool intern_keys, bool intern_values) { GPR_ASSERT(a.payload != c.payload); GPR_ASSERT(b.payload != c.payload); } - GRPC_MDELEM_UNREF(&exec_ctx, a); - GRPC_MDELEM_UNREF(&exec_ctx, b); - GRPC_MDELEM_UNREF(&exec_ctx, c); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(a); + GRPC_MDELEM_UNREF(b); + GRPC_MDELEM_UNREF(c); + grpc_shutdown(); } @@ -235,7 +225,7 @@ static void test_things_stick_around(void) { gpr_log(GPR_INFO, "test_things_stick_around"); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; for (i = 0; i < nstrs; i++) { gpr_asprintf(&buffer, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx%" PRIuPTR "x", i); @@ -246,7 +236,7 @@ static void test_things_stick_around(void) { for (i = 0; i < nstrs; i++) { grpc_slice_ref_internal(strs[i]); - grpc_slice_unref_internal(&exec_ctx, strs[i]); + grpc_slice_unref_internal(strs[i]); } for (i = 0; i < nstrs; i++) { @@ -258,18 +248,17 @@ static void test_things_stick_around(void) { } for (i = 0; i < nstrs; i++) { - grpc_slice_unref_internal(&exec_ctx, strs[shuf[i]]); + grpc_slice_unref_internal(strs[shuf[i]]); for (j = i + 1; j < nstrs; j++) { gpr_asprintf(&buffer, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx%" PRIuPTR "x", shuf[j]); test = grpc_slice_intern(grpc_slice_from_static_string(buffer)); GPR_ASSERT(grpc_slice_is_equivalent(test, strs[shuf[j]])); - grpc_slice_unref_internal(&exec_ctx, test); + grpc_slice_unref_internal(test); gpr_free(buffer); } } - grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); gpr_free(strs); gpr_free(shuf); @@ -282,39 +271,38 @@ static void test_user_data_works(void) { gpr_log(GPR_INFO, "test_user_data_works"); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; ud1 = static_cast(gpr_malloc(sizeof(int))); *ud1 = 1; ud2 = static_cast(gpr_malloc(sizeof(int))); *ud2 = 2; md = grpc_mdelem_from_slices( - &exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("abc")), + grpc_slice_intern(grpc_slice_from_static_string("abc")), grpc_slice_intern(grpc_slice_from_static_string("123"))); grpc_mdelem_set_user_data(md, gpr_free, ud1); grpc_mdelem_set_user_data(md, gpr_free, ud2); GPR_ASSERT(grpc_mdelem_get_user_data(md, gpr_free) == ud1); - GRPC_MDELEM_UNREF(&exec_ctx, md); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(md); + grpc_shutdown(); } -static void verify_ascii_header_size(grpc_exec_ctx* exec_ctx, const char* key, - const char* value, bool intern_key, - bool intern_value) { +static void verify_ascii_header_size(const char* key, const char* value, + bool intern_key, bool intern_value) { grpc_mdelem elem = grpc_mdelem_from_slices( - exec_ctx, maybe_intern(grpc_slice_from_static_string(key), intern_key), + maybe_intern(grpc_slice_from_static_string(key), intern_key), maybe_intern(grpc_slice_from_static_string(value), intern_value)); size_t elem_size = grpc_mdelem_get_size_in_hpack_table(elem, false); size_t expected_size = 32 + strlen(key) + strlen(value); GPR_ASSERT(expected_size == elem_size); - GRPC_MDELEM_UNREF(exec_ctx, elem); + GRPC_MDELEM_UNREF(elem); } -static void verify_binary_header_size(grpc_exec_ctx* exec_ctx, const char* key, - const uint8_t* value, size_t value_len, - bool intern_key, bool intern_value) { +static void verify_binary_header_size(const char* key, const uint8_t* value, + size_t value_len, bool intern_key, + bool intern_value) { grpc_mdelem elem = grpc_mdelem_from_slices( - exec_ctx, maybe_intern(grpc_slice_from_static_string(key), intern_key), + maybe_intern(grpc_slice_from_static_string(key), intern_key), maybe_intern(grpc_slice_from_static_buffer(value, value_len), intern_value)); GPR_ASSERT(grpc_is_binary_header(GRPC_MDKEY(elem))); @@ -324,9 +312,9 @@ static void verify_binary_header_size(grpc_exec_ctx* exec_ctx, const char* key, grpc_slice base64_encoded = grpc_chttp2_base64_encode(value_slice); size_t expected_size = 32 + strlen(key) + GRPC_SLICE_LENGTH(base64_encoded); GPR_ASSERT(expected_size == elem_size); - grpc_slice_unref_internal(exec_ctx, value_slice); - grpc_slice_unref_internal(exec_ctx, base64_encoded); - GRPC_MDELEM_UNREF(exec_ctx, elem); + grpc_slice_unref_internal(value_slice); + grpc_slice_unref_internal(base64_encoded); + GRPC_MDELEM_UNREF(elem); } #define BUFFER_SIZE 64 @@ -334,27 +322,23 @@ static void test_mdelem_sizes_in_hpack(bool intern_key, bool intern_value) { gpr_log(GPR_INFO, "test_mdelem_size: intern_key=%d intern_value=%d", intern_key, intern_value); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; uint8_t binary_value[BUFFER_SIZE] = {0}; for (uint8_t i = 0; i < BUFFER_SIZE; i++) { binary_value[i] = i; } - verify_ascii_header_size(&exec_ctx, "hello", "world", intern_key, - intern_value); - verify_ascii_header_size(&exec_ctx, "hello", - "worldxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", intern_key, - intern_value); - verify_ascii_header_size(&exec_ctx, ":scheme", "http", intern_key, - intern_value); + verify_ascii_header_size("hello", "world", intern_key, intern_value); + verify_ascii_header_size("hello", "worldxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + intern_key, intern_value); + verify_ascii_header_size(":scheme", "http", intern_key, intern_value); for (uint8_t i = 0; i < BUFFER_SIZE; i++) { - verify_binary_header_size(&exec_ctx, "hello-bin", binary_value, i, - intern_key, intern_value); + verify_binary_header_size("hello-bin", binary_value, i, intern_key, + intern_value); } - grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); } @@ -362,13 +346,13 @@ static void test_copied_static_metadata(bool dup_key, bool dup_value) { gpr_log(GPR_INFO, "test_static_metadata: dup_key=%d dup_value=%d", dup_key, dup_value); grpc_init(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; for (size_t i = 0; i < GRPC_STATIC_MDELEM_COUNT; i++) { grpc_mdelem p = GRPC_MAKE_MDELEM(&grpc_static_mdelem_table[i], GRPC_MDELEM_STORAGE_STATIC); grpc_mdelem q = - grpc_mdelem_from_slices(&exec_ctx, maybe_dup(GRPC_MDKEY(p), dup_key), + grpc_mdelem_from_slices(maybe_dup(GRPC_MDKEY(p), dup_key), maybe_dup(GRPC_MDVALUE(p), dup_value)); GPR_ASSERT(grpc_mdelem_eq(p, q)); if (dup_key || dup_value) { @@ -376,16 +360,16 @@ static void test_copied_static_metadata(bool dup_key, bool dup_value) { } else { GPR_ASSERT(p.payload == q.payload); } - GRPC_MDELEM_UNREF(&exec_ctx, p); - GRPC_MDELEM_UNREF(&exec_ctx, q); + GRPC_MDELEM_UNREF(p); + GRPC_MDELEM_UNREF(q); } - grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); } int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); test_no_op(); for (int k = 0; k <= 1; k++) { for (int v = 0; v <= 1; v++) { @@ -400,5 +384,6 @@ int main(int argc, char** argv) { test_create_many_persistant_metadata(); test_things_stick_around(); test_user_data_works(); + grpc_shutdown(); return 0; } diff --git a/test/core/transport/status_conversion_test.cc b/test/core/transport/status_conversion_test.cc index 7af5d12cb7b..1ed6ccfba62 100644 --- a/test/core/transport/status_conversion_test.cc +++ b/test/core/transport/status_conversion_test.cc @@ -22,12 +22,11 @@ #define GRPC_STATUS_TO_HTTP2_ERROR(a, b) \ GPR_ASSERT(grpc_status_to_http2_error(a) == (b)) -#define HTTP2_ERROR_TO_GRPC_STATUS(a, deadline, b) \ - do { \ - grpc_exec_ctx my_exec_ctx = GRPC_EXEC_CTX_INIT; \ - GPR_ASSERT(grpc_http2_error_to_grpc_status(&my_exec_ctx, a, deadline) == \ - (b)); \ - grpc_exec_ctx_finish(&my_exec_ctx); \ +#define HTTP2_ERROR_TO_GRPC_STATUS(a, deadline, b) \ + do { \ + grpc_core::ExecCtx exec_ctx; \ + GPR_ASSERT(grpc_http2_error_to_grpc_status(a, deadline) == (b)); \ + \ } while (0) #define GRPC_STATUS_TO_HTTP2_STATUS(a, b) \ GPR_ASSERT(grpc_status_to_http2_status(a) == (b)) diff --git a/test/core/transport/stream_owned_slice_test.cc b/test/core/transport/stream_owned_slice_test.cc index e82df2117df..7831f67a048 100644 --- a/test/core/transport/stream_owned_slice_test.cc +++ b/test/core/transport/stream_owned_slice_test.cc @@ -20,12 +20,14 @@ #include "test/core/util/test_config.h" +#include #include -static void do_nothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} +static void do_nothing(void* arg, grpc_error* error) {} int main(int argc, char** argv) { grpc_test_init(argc, argv); + grpc_init(); uint8_t buffer[] = "abc123"; grpc_stream_refcount r; @@ -39,5 +41,6 @@ int main(int argc, char** argv) { grpc_slice_unref(slice); GPR_ASSERT(r.refs.count == 1); + grpc_shutdown(); return 0; } diff --git a/test/core/util/mock_endpoint.cc b/test/core/util/mock_endpoint.cc index d9545efa499..4b35a581b10 100644 --- a/test/core/util/mock_endpoint.cc +++ b/test/core/util/mock_endpoint.cc @@ -40,13 +40,13 @@ typedef struct grpc_mock_endpoint { grpc_resource_user* resource_user; } grpc_mock_endpoint; -static void me_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* slices, grpc_closure* cb) { +static void me_read(grpc_endpoint* ep, grpc_slice_buffer* slices, + grpc_closure* cb) { grpc_mock_endpoint* m = (grpc_mock_endpoint*)ep; gpr_mu_lock(&m->mu); if (m->read_buffer.count > 0) { grpc_slice_buffer_swap(&m->read_buffer, slices); - GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); } else { m->on_read = cb; m->on_read_out = slices; @@ -54,44 +54,41 @@ static void me_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, gpr_mu_unlock(&m->mu); } -static void me_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* slices, grpc_closure* cb) { +static void me_write(grpc_endpoint* ep, grpc_slice_buffer* slices, + grpc_closure* cb) { grpc_mock_endpoint* m = (grpc_mock_endpoint*)ep; for (size_t i = 0; i < slices->count; i++) { m->on_write(slices->slices[i]); } - GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); } -static void me_add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_pollset* pollset) {} +static void me_add_to_pollset(grpc_endpoint* ep, grpc_pollset* pollset) {} -static void me_add_to_pollset_set(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, +static void me_add_to_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset) {} -static void me_delete_from_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_endpoint* ep, +static void me_delete_from_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset) {} -static void me_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_error* why) { +static void me_shutdown(grpc_endpoint* ep, grpc_error* why) { grpc_mock_endpoint* m = (grpc_mock_endpoint*)ep; gpr_mu_lock(&m->mu); if (m->on_read) { - GRPC_CLOSURE_SCHED(exec_ctx, m->on_read, + GRPC_CLOSURE_SCHED(m->on_read, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Endpoint Shutdown", &why, 1)); m->on_read = nullptr; } gpr_mu_unlock(&m->mu); - grpc_resource_user_shutdown(exec_ctx, m->resource_user); + grpc_resource_user_shutdown(m->resource_user); GRPC_ERROR_UNREF(why); } -static void me_destroy(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep) { +static void me_destroy(grpc_endpoint* ep) { grpc_mock_endpoint* m = (grpc_mock_endpoint*)ep; grpc_slice_buffer_destroy(&m->read_buffer); - grpc_resource_user_unref(exec_ctx, m->resource_user); + grpc_resource_user_unref(m->resource_user); gpr_free(m); } @@ -134,13 +131,12 @@ grpc_endpoint* grpc_mock_endpoint_create(void (*on_write)(grpc_slice slice), return &m->base; } -void grpc_mock_endpoint_put_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice slice) { +void grpc_mock_endpoint_put_read(grpc_endpoint* ep, grpc_slice slice) { grpc_mock_endpoint* m = (grpc_mock_endpoint*)ep; gpr_mu_lock(&m->mu); if (m->on_read != nullptr) { grpc_slice_buffer_add(m->on_read_out, slice); - GRPC_CLOSURE_SCHED(exec_ctx, m->on_read, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(m->on_read, GRPC_ERROR_NONE); m->on_read = nullptr; } else { grpc_slice_buffer_add(&m->read_buffer, slice); diff --git a/test/core/util/mock_endpoint.h b/test/core/util/mock_endpoint.h index ccabaf7c3b0..6521d3e8e81 100644 --- a/test/core/util/mock_endpoint.h +++ b/test/core/util/mock_endpoint.h @@ -23,8 +23,7 @@ grpc_endpoint* grpc_mock_endpoint_create(void (*on_write)(grpc_slice slice), grpc_resource_quota* resource_quota); -void grpc_mock_endpoint_put_read(grpc_exec_ctx* exec_ctx, - grpc_endpoint* mock_endpoint, +void grpc_mock_endpoint_put_read(grpc_endpoint* mock_endpoint, grpc_slice slice); #endif diff --git a/test/core/util/one_corpus_entry_fuzzer.cc b/test/core/util/one_corpus_entry_fuzzer.cc index c0b67da1e26..c745eb5dc65 100644 --- a/test/core/util/one_corpus_entry_fuzzer.cc +++ b/test/core/util/one_corpus_entry_fuzzer.cc @@ -18,7 +18,10 @@ #include +#include + #include +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/load_file.h" extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size); @@ -30,10 +33,15 @@ int main(int argc, char** argv) { grpc_slice buffer; squelch = false; leak_check = false; + /* TODO(yashkt) Calling grpc_init breaks tests. Fix the tests and replace + * grpc_core::ExecCtx::GlobalInit with grpc_init and GlobalShutdown with + * grpc_shutdown */ GPR_ASSERT( GRPC_LOG_IF_ERROR("load_file", grpc_load_file(argv[1], 0, &buffer))); LLVMFuzzerTestOneInput(GRPC_SLICE_START_PTR(buffer), GRPC_SLICE_LENGTH(buffer)); + grpc_core::ExecCtx::GlobalInit(); grpc_slice_unref(buffer); + grpc_core::ExecCtx::GlobalShutdown(); return 0; } diff --git a/test/core/util/passthru_endpoint.cc b/test/core/util/passthru_endpoint.cc index a9efe22b696..5f127cb960f 100644 --- a/test/core/util/passthru_endpoint.cc +++ b/test/core/util/passthru_endpoint.cc @@ -49,22 +49,22 @@ struct passthru_endpoint { int halves; grpc_passthru_endpoint_stats* stats; grpc_passthru_endpoint_stats - dummy_stats; // used if constructor stats == NULL + dummy_stats; // used if constructor stats == nullptr bool shutdown; half client; half server; }; -static void me_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* slices, grpc_closure* cb) { +static void me_read(grpc_endpoint* ep, grpc_slice_buffer* slices, + grpc_closure* cb) { half* m = (half*)ep; gpr_mu_lock(&m->parent->mu); if (m->parent->shutdown) { GRPC_CLOSURE_SCHED( - exec_ctx, cb, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Already shutdown")); + cb, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Already shutdown")); } else if (m->read_buffer.count > 0) { grpc_slice_buffer_swap(&m->read_buffer, slices); - GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); } else { m->on_read = cb; m->on_read_out = slices; @@ -77,8 +77,8 @@ static half* other_half(half* h) { return &h->parent->client; } -static void me_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* slices, grpc_closure* cb) { +static void me_write(grpc_endpoint* ep, grpc_slice_buffer* slices, + grpc_closure* cb) { half* m = other_half((half*)ep); gpr_mu_lock(&m->parent->mu); grpc_error* error = GRPC_ERROR_NONE; @@ -89,7 +89,7 @@ static void me_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, for (size_t i = 0; i < slices->count; i++) { grpc_slice_buffer_add(m->on_read_out, grpc_slice_copy(slices->slices[i])); } - GRPC_CLOSURE_SCHED(exec_ctx, m->on_read, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(m->on_read, GRPC_ERROR_NONE); m->on_read = nullptr; } else { for (size_t i = 0; i < slices->count; i++) { @@ -98,52 +98,49 @@ static void me_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, } } gpr_mu_unlock(&m->parent->mu); - GRPC_CLOSURE_SCHED(exec_ctx, cb, error); + GRPC_CLOSURE_SCHED(cb, error); } -static void me_add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_pollset* pollset) {} +static void me_add_to_pollset(grpc_endpoint* ep, grpc_pollset* pollset) {} -static void me_add_to_pollset_set(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, +static void me_add_to_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset) {} -static void me_delete_from_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_endpoint* ep, +static void me_delete_from_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset) {} -static void me_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_error* why) { +static void me_shutdown(grpc_endpoint* ep, grpc_error* why) { half* m = (half*)ep; gpr_mu_lock(&m->parent->mu); m->parent->shutdown = true; if (m->on_read) { GRPC_CLOSURE_SCHED( - exec_ctx, m->on_read, + m->on_read, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING("Shutdown", &why, 1)); m->on_read = nullptr; } m = other_half(m); if (m->on_read) { GRPC_CLOSURE_SCHED( - exec_ctx, m->on_read, + m->on_read, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING("Shutdown", &why, 1)); m->on_read = nullptr; } gpr_mu_unlock(&m->parent->mu); - grpc_resource_user_shutdown(exec_ctx, m->resource_user); + grpc_resource_user_shutdown(m->resource_user); GRPC_ERROR_UNREF(why); } -static void me_destroy(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep) { +static void me_destroy(grpc_endpoint* ep) { passthru_endpoint* p = ((half*)ep)->parent; gpr_mu_lock(&p->mu); if (0 == --p->halves) { gpr_mu_unlock(&p->mu); gpr_mu_destroy(&p->mu); - grpc_slice_buffer_destroy_internal(exec_ctx, &p->client.read_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &p->server.read_buffer); - grpc_resource_user_unref(exec_ctx, p->client.resource_user); - grpc_resource_user_unref(exec_ctx, p->server.resource_user); + grpc_slice_buffer_destroy_internal(&p->client.read_buffer); + grpc_slice_buffer_destroy_internal(&p->server.read_buffer); + grpc_resource_user_unref(p->client.resource_user); + grpc_resource_user_unref(p->server.resource_user); gpr_free(p); } else { gpr_mu_unlock(&p->mu); diff --git a/test/core/util/port_server_client.cc b/test/core/util/port_server_client.cc index edec50b4240..7e76c8063f9 100644 --- a/test/core/util/port_server_client.cc +++ b/test/core/util/port_server_client.cc @@ -40,22 +40,19 @@ typedef struct freereq { int done; } freereq; -static void destroy_pops_and_shutdown(grpc_exec_ctx* exec_ctx, void* p, - grpc_error* error) { +static void destroy_pops_and_shutdown(void* p, grpc_error* error) { grpc_pollset* pollset = grpc_polling_entity_pollset((grpc_polling_entity*)p); - grpc_pollset_destroy(exec_ctx, pollset); + grpc_pollset_destroy(pollset); gpr_free(pollset); } -static void freed_port_from_server(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void freed_port_from_server(void* arg, grpc_error* error) { freereq* pr = (freereq*)arg; gpr_mu_lock(pr->mu); pr->done = 1; GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&pr->pops), - nullptr)); + grpc_pollset_kick(grpc_polling_entity_pollset(&pr->pops), nullptr)); gpr_mu_unlock(pr->mu); } @@ -65,7 +62,7 @@ void grpc_free_port_using_server(int port) { grpc_httpcli_response rsp; freereq pr; char* path; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_closure* shutdown_closure; grpc_init(); @@ -87,30 +84,30 @@ void grpc_free_port_using_server(int port) { grpc_httpcli_context_init(&context); grpc_resource_quota* resource_quota = grpc_resource_quota_create("port_server_client/free"); - grpc_httpcli_get(&exec_ctx, &context, &pr.pops, resource_quota, &req, - grpc_exec_ctx_now(&exec_ctx) + 30 * GPR_MS_PER_SEC, + grpc_httpcli_get(&context, &pr.pops, resource_quota, &req, + grpc_core::ExecCtx::Get()->Now() + 30 * GPR_MS_PER_SEC, GRPC_CLOSURE_CREATE(freed_port_from_server, &pr, grpc_schedule_on_exec_ctx), &rsp); - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); - grpc_exec_ctx_flush(&exec_ctx); + grpc_resource_quota_unref_internal(resource_quota); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(pr.mu); while (!pr.done) { grpc_pollset_worker* worker = nullptr; if (!GRPC_LOG_IF_ERROR( "pollset_work", - grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&pr.pops), - &worker, - grpc_exec_ctx_now(&exec_ctx) + GPR_MS_PER_SEC))) { + grpc_pollset_work( + grpc_polling_entity_pollset(&pr.pops), &worker, + grpc_core::ExecCtx::Get()->Now() + GPR_MS_PER_SEC))) { pr.done = 1; } } gpr_mu_unlock(pr.mu); - grpc_httpcli_context_destroy(&exec_ctx, &context); - grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&pr.pops), + grpc_httpcli_context_destroy(&context); + grpc_pollset_shutdown(grpc_polling_entity_pollset(&pr.pops), shutdown_closure); - grpc_exec_ctx_finish(&exec_ctx); + gpr_free(path); grpc_http_response_destroy(&rsp); @@ -127,8 +124,7 @@ typedef struct portreq { grpc_httpcli_response response; } portreq; -static void got_port_from_server(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void got_port_from_server(void* arg, grpc_error* error) { size_t i; int port = 0; portreq* pr = (portreq*)arg; @@ -154,8 +150,7 @@ static void got_port_from_server(grpc_exec_ctx* exec_ctx, void* arg, pr->port = 0; GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&pr->pops), - nullptr)); + grpc_pollset_kick(grpc_polling_entity_pollset(&pr->pops), nullptr)); gpr_mu_unlock(pr->mu); return; } @@ -172,12 +167,12 @@ static void got_port_from_server(grpc_exec_ctx* exec_ctx, void* arg, memset(&pr->response, 0, sizeof(pr->response)); grpc_resource_quota* resource_quota = grpc_resource_quota_create("port_server_client/pick_retry"); - grpc_httpcli_get(exec_ctx, pr->ctx, &pr->pops, resource_quota, &req, - grpc_exec_ctx_now(exec_ctx) + 30 * GPR_MS_PER_SEC, + grpc_httpcli_get(pr->ctx, &pr->pops, resource_quota, &req, + grpc_core::ExecCtx::Get()->Now() + 30 * GPR_MS_PER_SEC, GRPC_CLOSURE_CREATE(got_port_from_server, pr, grpc_schedule_on_exec_ctx), &pr->response); - grpc_resource_quota_unref_internal(exec_ctx, resource_quota); + grpc_resource_quota_unref_internal(resource_quota); return; } GPR_ASSERT(response); @@ -191,8 +186,7 @@ static void got_port_from_server(grpc_exec_ctx* exec_ctx, void* arg, pr->port = port; GRPC_LOG_IF_ERROR( "pollset_kick", - grpc_pollset_kick(exec_ctx, grpc_polling_entity_pollset(&pr->pops), - nullptr)); + grpc_pollset_kick(grpc_polling_entity_pollset(&pr->pops), nullptr)); gpr_mu_unlock(pr->mu); } @@ -200,53 +194,55 @@ int grpc_pick_port_using_server(void) { grpc_httpcli_context context; grpc_httpcli_request req; portreq pr; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_closure* shutdown_closure; grpc_init(); + { + grpc_core::ExecCtx exec_ctx; + memset(&pr, 0, sizeof(pr)); + memset(&req, 0, sizeof(req)); + grpc_pollset* pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); + grpc_pollset_init(pollset, &pr.mu); + pr.pops = grpc_polling_entity_create_from_pollset(pollset); + shutdown_closure = GRPC_CLOSURE_CREATE(destroy_pops_and_shutdown, &pr.pops, + grpc_schedule_on_exec_ctx); + pr.port = -1; + pr.server = const_cast(GRPC_PORT_SERVER_ADDRESS); + pr.ctx = &context; + + req.host = const_cast(GRPC_PORT_SERVER_ADDRESS); + req.http.path = const_cast("/get"); - memset(&pr, 0, sizeof(pr)); - memset(&req, 0, sizeof(req)); - grpc_pollset* pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); - grpc_pollset_init(pollset, &pr.mu); - pr.pops = grpc_polling_entity_create_from_pollset(pollset); - shutdown_closure = GRPC_CLOSURE_CREATE(destroy_pops_and_shutdown, &pr.pops, - grpc_schedule_on_exec_ctx); - pr.port = -1; - pr.server = const_cast(GRPC_PORT_SERVER_ADDRESS); - pr.ctx = &context; + grpc_httpcli_context_init(&context); + grpc_resource_quota* resource_quota = + grpc_resource_quota_create("port_server_client/pick"); + grpc_httpcli_get(&context, &pr.pops, resource_quota, &req, + grpc_core::ExecCtx::Get()->Now() + 30 * GPR_MS_PER_SEC, + GRPC_CLOSURE_CREATE(got_port_from_server, &pr, + grpc_schedule_on_exec_ctx), + &pr.response); + grpc_resource_quota_unref_internal(resource_quota); + grpc_core::ExecCtx::Get()->Flush(); + gpr_mu_lock(pr.mu); + while (pr.port == -1) { + grpc_pollset_worker* worker = nullptr; + if (!GRPC_LOG_IF_ERROR( + "pollset_work", + grpc_pollset_work( + grpc_polling_entity_pollset(&pr.pops), &worker, + grpc_core::ExecCtx::Get()->Now() + GPR_MS_PER_SEC))) { + pr.port = 0; + } + } + gpr_mu_unlock(pr.mu); - req.host = const_cast(GRPC_PORT_SERVER_ADDRESS); - req.http.path = const_cast("/get"); + grpc_http_response_destroy(&pr.response); + grpc_httpcli_context_destroy(&context); + grpc_pollset_shutdown(grpc_polling_entity_pollset(&pr.pops), + shutdown_closure); - grpc_httpcli_context_init(&context); - grpc_resource_quota* resource_quota = - grpc_resource_quota_create("port_server_client/pick"); - grpc_httpcli_get( - &exec_ctx, &context, &pr.pops, resource_quota, &req, - grpc_exec_ctx_now(&exec_ctx) + 30 * GPR_MS_PER_SEC, - GRPC_CLOSURE_CREATE(got_port_from_server, &pr, grpc_schedule_on_exec_ctx), - &pr.response); - grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); - grpc_exec_ctx_flush(&exec_ctx); - gpr_mu_lock(pr.mu); - while (pr.port == -1) { - grpc_pollset_worker* worker = nullptr; - if (!GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&pr.pops), - &worker, - grpc_exec_ctx_now(&exec_ctx) + GPR_MS_PER_SEC))) { - pr.port = 0; - } + grpc_core::ExecCtx::Get()->Flush(); } - gpr_mu_unlock(pr.mu); - - grpc_http_response_destroy(&pr.response); - grpc_httpcli_context_destroy(&exec_ctx, &context); - grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&pr.pops), - shutdown_closure); - grpc_exec_ctx_finish(&exec_ctx); grpc_shutdown(); return pr.port; diff --git a/test/core/util/reconnect_server.cc b/test/core/util/reconnect_server.cc index 4775b074eb5..bcafc4e898e 100644 --- a/test/core/util/reconnect_server.cc +++ b/test/core/util/reconnect_server.cc @@ -55,7 +55,7 @@ static void pretty_print_backoffs(reconnect_server* server) { } } -static void on_connect(grpc_exec_ctx* exec_ctx, void* arg, grpc_endpoint* tcp, +static void on_connect(void* arg, grpc_endpoint* tcp, grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor) { gpr_free(acceptor); @@ -65,9 +65,9 @@ static void on_connect(grpc_exec_ctx* exec_ctx, void* arg, grpc_endpoint* tcp, gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); timestamp_list* new_tail; peer = grpc_endpoint_get_peer(tcp); - grpc_endpoint_shutdown(exec_ctx, tcp, + grpc_endpoint_shutdown(tcp, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Connected")); - grpc_endpoint_destroy(exec_ctx, tcp); + grpc_endpoint_destroy(tcp); if (peer) { last_colon = strrchr(peer, ':'); if (server->peer == nullptr) { diff --git a/test/core/util/test_tcp_server.cc b/test/core/util/test_tcp_server.cc index da34da6fd00..5f6af4e7070 100644 --- a/test/core/util/test_tcp_server.cc +++ b/test/core/util/test_tcp_server.cc @@ -33,8 +33,7 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -static void on_server_destroyed(grpc_exec_ctx* exec_ctx, void* data, - grpc_error* error) { +static void on_server_destroyed(void* data, grpc_error* error) { test_tcp_server* server = static_cast(data); server->shutdown = 1; } @@ -56,51 +55,46 @@ void test_tcp_server_start(test_tcp_server* server, int port) { grpc_resolved_address resolved_addr; struct sockaddr_in* addr = (struct sockaddr_in*)resolved_addr.addr; int port_added; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; addr->sin_family = AF_INET; addr->sin_port = htons((uint16_t)port); memset(&addr->sin_addr, 0, sizeof(addr->sin_addr)); - grpc_error* error = grpc_tcp_server_create( - &exec_ctx, &server->shutdown_complete, nullptr, &server->tcp_server); + grpc_error* error = grpc_tcp_server_create(&server->shutdown_complete, + nullptr, &server->tcp_server); GPR_ASSERT(error == GRPC_ERROR_NONE); error = grpc_tcp_server_add_port(server->tcp_server, &resolved_addr, &port_added); GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(port_added == port); - grpc_tcp_server_start(&exec_ctx, server->tcp_server, &server->pollset, 1, + grpc_tcp_server_start(server->tcp_server, &server->pollset, 1, server->on_connect, server->cb_data); gpr_log(GPR_INFO, "test tcp server listening on 0.0.0.0:%d", port); - - grpc_exec_ctx_finish(&exec_ctx); } void test_tcp_server_poll(test_tcp_server* server, int seconds) { grpc_pollset_worker* worker = nullptr; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_millis deadline = grpc_timespec_to_millis_round_up( grpc_timeout_seconds_to_deadline(seconds)); gpr_mu_lock(server->mu); - GRPC_LOG_IF_ERROR( - "pollset_work", - grpc_pollset_work(&exec_ctx, server->pollset, &worker, deadline)); + GRPC_LOG_IF_ERROR("pollset_work", + grpc_pollset_work(server->pollset, &worker, deadline)); gpr_mu_unlock(server->mu); - grpc_exec_ctx_finish(&exec_ctx); } -static void do_nothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} -static void finish_pollset(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { - grpc_pollset_destroy(exec_ctx, static_cast(arg)); +static void do_nothing(void* arg, grpc_error* error) {} +static void finish_pollset(void* arg, grpc_error* error) { + grpc_pollset_destroy(static_cast(arg)); } void test_tcp_server_destroy(test_tcp_server* server) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_timespec shutdown_deadline; grpc_closure do_nothing_cb; - grpc_tcp_server_unref(&exec_ctx, server->tcp_server); + grpc_tcp_server_unref(server->tcp_server); GRPC_CLOSURE_INIT(&do_nothing_cb, do_nothing, nullptr, grpc_schedule_on_exec_ctx); shutdown_deadline = gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), @@ -109,10 +103,10 @@ void test_tcp_server_destroy(test_tcp_server* server) { gpr_time_cmp(gpr_now(GPR_CLOCK_MONOTONIC), shutdown_deadline) < 0) { test_tcp_server_poll(server, 1); } - grpc_pollset_shutdown(&exec_ctx, server->pollset, + grpc_pollset_shutdown(server->pollset, GRPC_CLOSURE_CREATE(finish_pollset, server->pollset, grpc_schedule_on_exec_ctx)); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_free(server->pollset); grpc_shutdown(); } diff --git a/test/core/util/trickle_endpoint.cc b/test/core/util/trickle_endpoint.cc index 4544fb7f49b..f95ed624632 100644 --- a/test/core/util/trickle_endpoint.cc +++ b/test/core/util/trickle_endpoint.cc @@ -45,24 +45,23 @@ typedef struct { grpc_closure* write_cb; } trickle_endpoint; -static void te_read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* slices, grpc_closure* cb) { +static void te_read(grpc_endpoint* ep, grpc_slice_buffer* slices, + grpc_closure* cb) { trickle_endpoint* te = (trickle_endpoint*)ep; - grpc_endpoint_read(exec_ctx, te->wrapped, slices, cb); + grpc_endpoint_read(te->wrapped, slices, cb); } -static void maybe_call_write_cb_locked(grpc_exec_ctx* exec_ctx, - trickle_endpoint* te) { +static void maybe_call_write_cb_locked(trickle_endpoint* te) { if (te->write_cb != nullptr && (te->error != GRPC_ERROR_NONE || te->write_buffer.length <= WRITE_BUFFER_SIZE)) { - GRPC_CLOSURE_SCHED(exec_ctx, te->write_cb, GRPC_ERROR_REF(te->error)); + GRPC_CLOSURE_SCHED(te->write_cb, GRPC_ERROR_REF(te->error)); te->write_cb = nullptr; } } -static void te_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* slices, grpc_closure* cb) { +static void te_write(grpc_endpoint* ep, grpc_slice_buffer* slices, + grpc_closure* cb) { trickle_endpoint* te = (trickle_endpoint*)ep; gpr_mu_lock(&te->mu); GPR_ASSERT(te->write_cb == nullptr); @@ -74,47 +73,44 @@ static void te_write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, grpc_slice_copy(slices->slices[i])); } te->write_cb = cb; - maybe_call_write_cb_locked(exec_ctx, te); + maybe_call_write_cb_locked(te); gpr_mu_unlock(&te->mu); } -static void te_add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_pollset* pollset) { +static void te_add_to_pollset(grpc_endpoint* ep, grpc_pollset* pollset) { trickle_endpoint* te = (trickle_endpoint*)ep; - grpc_endpoint_add_to_pollset(exec_ctx, te->wrapped, pollset); + grpc_endpoint_add_to_pollset(te->wrapped, pollset); } -static void te_add_to_pollset_set(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, +static void te_add_to_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset_set) { trickle_endpoint* te = (trickle_endpoint*)ep; - grpc_endpoint_add_to_pollset_set(exec_ctx, te->wrapped, pollset_set); + grpc_endpoint_add_to_pollset_set(te->wrapped, pollset_set); } -static void te_delete_from_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_endpoint* ep, +static void te_delete_from_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset_set) { trickle_endpoint* te = (trickle_endpoint*)ep; - grpc_endpoint_delete_from_pollset_set(exec_ctx, te->wrapped, pollset_set); + grpc_endpoint_delete_from_pollset_set(te->wrapped, pollset_set); } -static void te_shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_error* why) { +static void te_shutdown(grpc_endpoint* ep, grpc_error* why) { trickle_endpoint* te = (trickle_endpoint*)ep; gpr_mu_lock(&te->mu); if (te->error == GRPC_ERROR_NONE) { te->error = GRPC_ERROR_REF(why); } - maybe_call_write_cb_locked(exec_ctx, te); + maybe_call_write_cb_locked(te); gpr_mu_unlock(&te->mu); - grpc_endpoint_shutdown(exec_ctx, te->wrapped, why); + grpc_endpoint_shutdown(te->wrapped, why); } -static void te_destroy(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep) { +static void te_destroy(grpc_endpoint* ep) { trickle_endpoint* te = (trickle_endpoint*)ep; - grpc_endpoint_destroy(exec_ctx, te->wrapped); + grpc_endpoint_destroy(te->wrapped); gpr_mu_destroy(&te->mu); - grpc_slice_buffer_destroy_internal(exec_ctx, &te->write_buffer); - grpc_slice_buffer_destroy_internal(exec_ctx, &te->writing_buffer); + grpc_slice_buffer_destroy_internal(&te->write_buffer); + grpc_slice_buffer_destroy_internal(&te->writing_buffer); GRPC_ERROR_UNREF(te->error); gpr_free(te); } @@ -134,8 +130,7 @@ static int te_get_fd(grpc_endpoint* ep) { return grpc_endpoint_get_fd(te->wrapped); } -static void te_finish_write(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { +static void te_finish_write(void* arg, grpc_error* error) { trickle_endpoint* te = (trickle_endpoint*)arg; gpr_mu_lock(&te->mu); te->writing = false; @@ -173,8 +168,7 @@ static double ts2dbl(gpr_timespec s) { return (double)s.tv_sec + 1e-9 * (double)s.tv_nsec; } -size_t grpc_trickle_endpoint_trickle(grpc_exec_ctx* exec_ctx, - grpc_endpoint* ep) { +size_t grpc_trickle_endpoint_trickle(grpc_endpoint* ep) { trickle_endpoint* te = (trickle_endpoint*)ep; gpr_mu_lock(&te->mu); if (!te->writing && te->write_buffer.length > 0) { @@ -189,9 +183,9 @@ size_t grpc_trickle_endpoint_trickle(grpc_exec_ctx* exec_ctx, te->writing = true; te->last_write = now; grpc_endpoint_write( - exec_ctx, te->wrapped, &te->writing_buffer, + te->wrapped, &te->writing_buffer, GRPC_CLOSURE_CREATE(te_finish_write, te, grpc_schedule_on_exec_ctx)); - maybe_call_write_cb_locked(exec_ctx, te); + maybe_call_write_cb_locked(te); } } size_t backlog = te->write_buffer.length; diff --git a/test/core/util/trickle_endpoint.h b/test/core/util/trickle_endpoint.h index 11c113bda82..cd07de905a7 100644 --- a/test/core/util/trickle_endpoint.h +++ b/test/core/util/trickle_endpoint.h @@ -25,8 +25,7 @@ grpc_endpoint* grpc_trickle_endpoint_create(grpc_endpoint* wrap, double bytes_per_second); /* Allow up to \a bytes through the endpoint. Returns the new backlog. */ -size_t grpc_trickle_endpoint_trickle(grpc_exec_ctx* exec_ctx, - grpc_endpoint* endpoint); +size_t grpc_trickle_endpoint_trickle(grpc_endpoint* endpoint); size_t grpc_trickle_get_backlog(grpc_endpoint* endpoint); diff --git a/test/cpp/client/client_channel_stress_test.cc b/test/cpp/client/client_channel_stress_test.cc index 0954b28df01..e829d5278bd 100644 --- a/test/cpp/client/client_channel_stress_test.cc +++ b/test/cpp/client/client_channel_stress_test.cc @@ -212,13 +212,13 @@ class ClientChannelStressTest { }; void SetNextResolution(const std::vector& address_data) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_lb_addresses* addresses = grpc_lb_addresses_create(address_data.size(), nullptr); for (size_t i = 0; i < address_data.size(); ++i) { char* lb_uri_str; gpr_asprintf(&lb_uri_str, "ipv4:127.0.0.1:%d", address_data[i].port); - grpc_uri* lb_uri = grpc_uri_parse(&exec_ctx, lb_uri_str, true); + grpc_uri* lb_uri = grpc_uri_parse(lb_uri_str, true); GPR_ASSERT(lb_uri != nullptr); grpc_lb_addresses_set_address_from_uri( addresses, i, lb_uri, address_data[i].is_balancer, @@ -228,10 +228,9 @@ class ClientChannelStressTest { } grpc_arg fake_addresses = grpc_lb_addresses_create_channel_arg(addresses); grpc_channel_args fake_result = {1, &fake_addresses}; - grpc_fake_resolver_response_generator_set_response( - &exec_ctx, response_generator_, &fake_result); - grpc_lb_addresses_destroy(&exec_ctx, addresses); - grpc_exec_ctx_finish(&exec_ctx); + grpc_fake_resolver_response_generator_set_response(response_generator_, + &fake_result); + grpc_lb_addresses_destroy(addresses); } void KeepSendingRequests() { diff --git a/test/cpp/common/channel_arguments_test.cc b/test/cpp/common/channel_arguments_test.cc index d6ed2e5aa24..f330c01281e 100644 --- a/test/cpp/common/channel_arguments_test.cc +++ b/test/cpp/common/channel_arguments_test.cc @@ -249,5 +249,8 @@ TEST_F(ChannelArgumentsTest, SetUserAgentPrefix) { int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); + grpc_init(); + int ret = RUN_ALL_TESTS(); + grpc_shutdown(); + return ret; } diff --git a/test/cpp/common/channel_filter_test.cc b/test/cpp/common/channel_filter_test.cc index 638518107bb..7bdd53f9e7a 100644 --- a/test/cpp/common/channel_filter_test.cc +++ b/test/cpp/common/channel_filter_test.cc @@ -28,7 +28,7 @@ class MyChannelData : public ChannelData { public: MyChannelData() {} - grpc_error* Init(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, + grpc_error* Init(grpc_channel_element* elem, grpc_channel_element_args* args) override { (void)args->channel_args; // Make sure field is available. return GRPC_ERROR_NONE; @@ -39,7 +39,7 @@ class MyCallData : public CallData { public: MyCallData() {} - grpc_error* Init(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, + grpc_error* Init(grpc_call_element* elem, const grpc_call_element_args* args) override { (void)args->path; // Make sure field is available. return GRPC_ERROR_NONE; diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index f8bb12fde1b..e6e6e71f422 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -112,13 +112,13 @@ class ClientLbEnd2endTest : public ::testing::Test { } void SetNextResolution(const std::vector& ports) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_lb_addresses* addresses = grpc_lb_addresses_create(ports.size(), nullptr); for (size_t i = 0; i < ports.size(); ++i) { char* lb_uri_str; gpr_asprintf(&lb_uri_str, "ipv4:127.0.0.1:%d", ports[i]); - grpc_uri* lb_uri = grpc_uri_parse(&exec_ctx, lb_uri_str, true); + grpc_uri* lb_uri = grpc_uri_parse(lb_uri_str, true); GPR_ASSERT(lb_uri != nullptr); grpc_lb_addresses_set_address_from_uri(addresses, i, lb_uri, false /* is balancer */, @@ -130,11 +130,10 @@ class ClientLbEnd2endTest : public ::testing::Test { grpc_lb_addresses_create_channel_arg(addresses); grpc_channel_args* fake_result = grpc_channel_args_copy_and_add(nullptr, &fake_addresses, 1); - grpc_fake_resolver_response_generator_set_response( - &exec_ctx, response_generator_, fake_result); - grpc_channel_args_destroy(&exec_ctx, fake_result); - grpc_lb_addresses_destroy(&exec_ctx, addresses); - grpc_exec_ctx_finish(&exec_ctx); + grpc_fake_resolver_response_generator_set_response(response_generator_, + fake_result); + grpc_channel_args_destroy(fake_result); + grpc_lb_addresses_destroy(addresses); } void ResetStub(const grpc::string& lb_policy_name = "") { diff --git a/test/cpp/end2end/filter_end2end_test.cc b/test/cpp/end2end/filter_end2end_test.cc index f260ea0016d..c4430379dbf 100644 --- a/test/cpp/end2end/filter_end2end_test.cc +++ b/test/cpp/end2end/filter_end2end_test.cc @@ -100,7 +100,7 @@ int GetCallCounterValue() { class ChannelDataImpl : public ChannelData { public: - grpc_error* Init(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, + grpc_error* Init(grpc_channel_element* elem, grpc_channel_element_args* args) { IncrementConnectionCounter(); return GRPC_ERROR_NONE; @@ -109,13 +109,12 @@ class ChannelDataImpl : public ChannelData { class CallDataImpl : public CallData { public: - void StartTransportStreamOpBatch(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, + void StartTransportStreamOpBatch(grpc_call_element* elem, TransportStreamOpBatch* op) override { // Incrementing the counter could be done from Init(), but we want // to test that the individual methods are actually called correctly. if (op->recv_initial_metadata() != nullptr) IncrementCallCounter(); - grpc_call_next_op(exec_ctx, elem, op->op()); + grpc_call_next_op(elem, op->op()); } }; diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index bbf3da4663a..d4ee6b429f2 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -454,13 +454,13 @@ class GrpclbEnd2endTest : public ::testing::Test { }; void SetNextResolution(const std::vector& address_data) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_lb_addresses* addresses = grpc_lb_addresses_create(address_data.size(), nullptr); for (size_t i = 0; i < address_data.size(); ++i) { char* lb_uri_str; gpr_asprintf(&lb_uri_str, "ipv4:127.0.0.1:%d", address_data[i].port); - grpc_uri* lb_uri = grpc_uri_parse(&exec_ctx, lb_uri_str, true); + grpc_uri* lb_uri = grpc_uri_parse(lb_uri_str, true); GPR_ASSERT(lb_uri != nullptr); grpc_lb_addresses_set_address_from_uri( addresses, i, lb_uri, address_data[i].is_balancer, @@ -470,10 +470,9 @@ class GrpclbEnd2endTest : public ::testing::Test { } grpc_arg fake_addresses = grpc_lb_addresses_create_channel_arg(addresses); grpc_channel_args fake_result = {1, &fake_addresses}; - grpc_fake_resolver_response_generator_set_response( - &exec_ctx, response_generator_, &fake_result); - grpc_lb_addresses_destroy(&exec_ctx, addresses); - grpc_exec_ctx_finish(&exec_ctx); + grpc_fake_resolver_response_generator_set_response(response_generator_, + &fake_result); + grpc_lb_addresses_destroy(addresses); } const std::vector GetBackendPorts(const size_t start_index = 0) const { diff --git a/test/cpp/grpclb/grpclb_api_test.cc b/test/cpp/grpclb/grpclb_api_test.cc index 7b62080b497..a494d6f5195 100644 --- a/test/cpp/grpclb/grpclb_api_test.cc +++ b/test/cpp/grpclb/grpclb_api_test.cc @@ -17,6 +17,7 @@ */ #include +#include #include #include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" @@ -135,5 +136,8 @@ TEST_F(GrpclbTest, ParseResponseServerList) { int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); + grpc_init(); + int ret = RUN_ALL_TESTS(); + grpc_shutdown(); + return ret; } diff --git a/test/cpp/grpclb/grpclb_test.cc b/test/cpp/grpclb/grpclb_test.cc index a469fbb7e3b..64c53b14423 100644 --- a/test/cpp/grpclb/grpclb_test.cc +++ b/test/cpp/grpclb/grpclb_test.cc @@ -562,7 +562,7 @@ static void perform_request(client_fixture* cf) { #define BALANCERS_NAME "lb.name" static void setup_client(const server_fixture* lb_server, const server_fixture* backends, client_fixture* cf) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; char* expected_target_names = nullptr; const char* backends_name = lb_server->servers_hostport; @@ -574,7 +574,7 @@ static void setup_client(const server_fixture* lb_server, grpc_lb_addresses* addresses = grpc_lb_addresses_create(1, nullptr); char* lb_uri_str; gpr_asprintf(&lb_uri_str, "ipv4:%s", lb_server->servers_hostport); - grpc_uri* lb_uri = grpc_uri_parse(&exec_ctx, lb_uri_str, true); + grpc_uri* lb_uri = grpc_uri_parse(lb_uri_str, true); GPR_ASSERT(lb_uri != nullptr); grpc_lb_addresses_set_address_from_uri(addresses, 0, lb_uri, true, lb_server->balancer_name, nullptr); @@ -586,7 +586,7 @@ static void setup_client(const server_fixture* lb_server, grpc_lb_addresses_create_channel_arg(addresses); grpc_channel_args* fake_result = grpc_channel_args_copy_and_add(nullptr, &fake_addresses, 1); - grpc_lb_addresses_destroy(&exec_ctx, addresses); + grpc_lb_addresses_destroy(addresses); const grpc_arg new_args[] = { grpc_fake_transport_expected_targets_arg(expected_target_names), @@ -601,13 +601,12 @@ static void setup_client(const server_fixture* lb_server, grpc_fake_transport_security_credentials_create(); cf->client = grpc_secure_channel_create(fake_creds, cf->server_uri, args, nullptr); - grpc_fake_resolver_response_generator_set_response( - &exec_ctx, response_generator, fake_result); - grpc_channel_args_destroy(&exec_ctx, fake_result); - grpc_channel_credentials_unref(&exec_ctx, fake_creds); - grpc_channel_args_destroy(&exec_ctx, args); + grpc_fake_resolver_response_generator_set_response(response_generator, + fake_result); + grpc_channel_args_destroy(fake_result); + grpc_channel_credentials_unref(fake_creds); + grpc_channel_args_destroy(args); grpc_fake_resolver_response_generator_unref(response_generator); - grpc_exec_ctx_finish(&exec_ctx); } static void teardown_client(client_fixture* cf) { diff --git a/test/cpp/microbenchmarks/bm_call_create.cc b/test/cpp/microbenchmarks/bm_call_create.cc index a45c577320d..5c2c38c27dc 100644 --- a/test/cpp/microbenchmarks/bm_call_create.cc +++ b/test/cpp/microbenchmarks/bm_call_create.cc @@ -311,12 +311,9 @@ static void BM_LameChannelCallCreateCoreSeparateBatch(benchmark::State& state) { } BENCHMARK(BM_LameChannelCallCreateCoreSeparateBatch); -static void FilterDestroy(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { - gpr_free(arg); -} +static void FilterDestroy(void* arg, grpc_error* error) { gpr_free(arg); } -static void DoNothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} +static void DoNothing(void* arg, grpc_error* error) {} class FakeClientChannelFactory : public grpc_client_channel_factory { public: @@ -324,15 +321,12 @@ class FakeClientChannelFactory : public grpc_client_channel_factory { private: static void NoRef(grpc_client_channel_factory* factory) {} - static void NoUnref(grpc_exec_ctx* exec_ctx, - grpc_client_channel_factory* factory) {} - static grpc_subchannel* CreateSubchannel(grpc_exec_ctx* exec_ctx, - grpc_client_channel_factory* factory, + static void NoUnref(grpc_client_channel_factory* factory) {} + static grpc_subchannel* CreateSubchannel(grpc_client_channel_factory* factory, const grpc_subchannel_args* args) { return nullptr; } - static grpc_channel* CreateClientChannel(grpc_exec_ctx* exec_ctx, - grpc_client_channel_factory* factory, + static grpc_channel* CreateClientChannel(grpc_client_channel_factory* factory, const char* target, grpc_client_channel_type type, const grpc_channel_args* args) { @@ -366,36 +360,32 @@ struct Fixture { namespace dummy_filter { -static void StartTransportStreamOp(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static void StartTransportStreamOp(grpc_call_element* elem, grpc_transport_stream_op_batch* op) {} -static void StartTransportOp(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static void StartTransportOp(grpc_channel_element* elem, grpc_transport_op* op) {} -static grpc_error* InitCallElem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* InitCallElem(grpc_call_element* elem, const grpc_call_element_args* args) { return GRPC_ERROR_NONE; } -static void SetPollsetOrPollsetSet(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static void SetPollsetOrPollsetSet(grpc_call_element* elem, grpc_polling_entity* pollent) {} -static void DestroyCallElem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void DestroyCallElem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_sched_closure) {} -grpc_error* InitChannelElem(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, +grpc_error* InitChannelElem(grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } -void DestroyChannelElem(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem) {} +void DestroyChannelElem(grpc_channel_element* elem) {} -void GetChannelInfo(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, +void GetChannelInfo(grpc_channel_element* elem, const grpc_channel_info* channel_info) {} static const grpc_channel_filter dummy_filter = {StartTransportStreamOp, @@ -422,41 +412,38 @@ size_t sizeof_stream; /* = sizeof(transport stream) */ const char* name; /* implementation of grpc_transport_init_stream */ -int InitStream(grpc_exec_ctx* exec_ctx, grpc_transport* self, - grpc_stream* stream, grpc_stream_refcount* refcount, - const void* server_data, gpr_arena* arena) { +int InitStream(grpc_transport* self, grpc_stream* stream, + grpc_stream_refcount* refcount, const void* server_data, + gpr_arena* arena) { return 0; } /* implementation of grpc_transport_set_pollset */ -void SetPollset(grpc_exec_ctx* exec_ctx, grpc_transport* self, - grpc_stream* stream, grpc_pollset* pollset) {} +void SetPollset(grpc_transport* self, grpc_stream* stream, + grpc_pollset* pollset) {} /* implementation of grpc_transport_set_pollset */ -void SetPollsetSet(grpc_exec_ctx* exec_ctx, grpc_transport* self, - grpc_stream* stream, grpc_pollset_set* pollset_set) {} +void SetPollsetSet(grpc_transport* self, grpc_stream* stream, + grpc_pollset_set* pollset_set) {} /* implementation of grpc_transport_perform_stream_op */ -void PerformStreamOp(grpc_exec_ctx* exec_ctx, grpc_transport* self, - grpc_stream* stream, grpc_transport_stream_op_batch* op) { - GRPC_CLOSURE_SCHED(exec_ctx, op->on_complete, GRPC_ERROR_NONE); +void PerformStreamOp(grpc_transport* self, grpc_stream* stream, + grpc_transport_stream_op_batch* op) { + GRPC_CLOSURE_SCHED(op->on_complete, GRPC_ERROR_NONE); } /* implementation of grpc_transport_perform_op */ -void PerformOp(grpc_exec_ctx* exec_ctx, grpc_transport* self, - grpc_transport_op* op) {} +void PerformOp(grpc_transport* self, grpc_transport_op* op) {} /* implementation of grpc_transport_destroy_stream */ -void DestroyStream(grpc_exec_ctx* exec_ctx, grpc_transport* self, - grpc_stream* stream, grpc_closure* then_sched_closure) {} +void DestroyStream(grpc_transport* self, grpc_stream* stream, + grpc_closure* then_sched_closure) {} /* implementation of grpc_transport_destroy */ -void Destroy(grpc_exec_ctx* exec_ctx, grpc_transport* self) {} +void Destroy(grpc_transport* self) {} /* implementation of grpc_transport_get_endpoint */ -grpc_endpoint* GetEndpoint(grpc_exec_ctx* exec_ctx, grpc_transport* self) { - return nullptr; -} +grpc_endpoint* GetEndpoint(grpc_transport* self) { return nullptr; } static const grpc_transport_vtable dummy_transport_vtable = { 0, "dummy_http2", InitStream, @@ -472,8 +459,8 @@ class NoOp { public: class Op { public: - Op(grpc_exec_ctx* exec_ctx, NoOp* p, grpc_call_stack* s) {} - void Finish(grpc_exec_ctx* exec_ctx) {} + Op(NoOp* p, grpc_call_stack* s) {} + void Finish() {} }; }; @@ -489,13 +476,11 @@ class SendEmptyMetadata { class Op { public: - Op(grpc_exec_ctx* exec_ctx, SendEmptyMetadata* p, grpc_call_stack* s) { + Op(SendEmptyMetadata* p, grpc_call_stack* s) { grpc_metadata_batch_init(&batch_); p->op_payload_.send_initial_metadata.send_initial_metadata = &batch_; } - void Finish(grpc_exec_ctx* exec_ctx) { - grpc_metadata_batch_destroy(exec_ctx, &batch_); - } + void Finish() { grpc_metadata_batch_destroy(&batch_); } private: grpc_metadata_batch batch_; @@ -536,20 +521,20 @@ static void BM_IsolatedFilter(benchmark::State& state) { label << " #has_dummy_filter"; } - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; size_t channel_size = grpc_channel_stack_size( filters.size() == 0 ? nullptr : &filters[0], filters.size()); grpc_channel_stack* channel_stack = static_cast(gpr_zalloc(channel_size)); GPR_ASSERT(GRPC_LOG_IF_ERROR( "channel_stack_init", - grpc_channel_stack_init(&exec_ctx, 1, FilterDestroy, channel_stack, - &filters[0], filters.size(), &channel_args, + grpc_channel_stack_init(1, FilterDestroy, channel_stack, &filters[0], + filters.size(), &channel_args, fixture.flags & REQUIRES_TRANSPORT ? &dummy_transport::dummy_transport : nullptr, "CHANNEL", channel_stack))); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); grpc_call_stack* call_stack = static_cast(gpr_zalloc(channel_stack->call_stack_size)); grpc_millis deadline = GRPC_MILLIS_INF_FUTURE; @@ -568,12 +553,12 @@ static void BM_IsolatedFilter(benchmark::State& state) { call_args.arena = gpr_arena_create(kArenaSize); while (state.KeepRunning()) { GPR_TIMER_SCOPE("BenchmarkCycle", 0); - GRPC_ERROR_UNREF(grpc_call_stack_init(&exec_ctx, channel_stack, 1, - DoNothing, nullptr, &call_args)); - typename TestOp::Op op(&exec_ctx, &test_op_data, call_stack); - grpc_call_stack_destroy(&exec_ctx, call_stack, &final_info, nullptr); - op.Finish(&exec_ctx); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_ERROR_UNREF( + grpc_call_stack_init(channel_stack, 1, DoNothing, nullptr, &call_args)); + typename TestOp::Op op(&test_op_data, call_stack); + grpc_call_stack_destroy(call_stack, &final_info, nullptr); + op.Finish(); + grpc_core::ExecCtx::Get()->Flush(); // recreate arena every 64k iterations to avoid oom if (0 == (state.iterations() & 0xffff)) { gpr_arena_destroy(call_args.arena); @@ -581,8 +566,8 @@ static void BM_IsolatedFilter(benchmark::State& state) { } } gpr_arena_destroy(call_args.arena); - grpc_channel_stack_destroy(&exec_ctx, channel_stack); - grpc_exec_ctx_finish(&exec_ctx); + grpc_channel_stack_destroy(channel_stack); + gpr_free(channel_stack); gpr_free(call_stack); @@ -632,59 +617,55 @@ typedef struct { grpc_call_combiner* call_combiner; } call_data; -static void StartTransportStreamOp(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static void StartTransportStreamOp(grpc_call_element* elem, grpc_transport_stream_op_batch* op) { call_data* calld = static_cast(elem->call_data); if (op->recv_initial_metadata) { GRPC_CALL_COMBINER_START( - exec_ctx, calld->call_combiner, + calld->call_combiner, op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_NONE, "recv_initial_metadata"); } if (op->recv_message) { - GRPC_CALL_COMBINER_START(exec_ctx, calld->call_combiner, + GRPC_CALL_COMBINER_START(calld->call_combiner, op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE, "recv_message"); } - GRPC_CLOSURE_SCHED(exec_ctx, op->on_complete, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(op->on_complete, GRPC_ERROR_NONE); } -static void StartTransportOp(grpc_exec_ctx* exec_ctx, - grpc_channel_element* elem, +static void StartTransportOp(grpc_channel_element* elem, grpc_transport_op* op) { if (op->disconnect_with_error != GRPC_ERROR_NONE) { GRPC_ERROR_UNREF(op->disconnect_with_error); } - GRPC_CLOSURE_SCHED(exec_ctx, op->on_consumed, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(op->on_consumed, GRPC_ERROR_NONE); } -static grpc_error* InitCallElem(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static grpc_error* InitCallElem(grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = static_cast(elem->call_data); calld->call_combiner = args->call_combiner; return GRPC_ERROR_NONE; } -static void SetPollsetOrPollsetSet(grpc_exec_ctx* exec_ctx, - grpc_call_element* elem, +static void SetPollsetOrPollsetSet(grpc_call_element* elem, grpc_polling_entity* pollent) {} -static void DestroyCallElem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, +static void DestroyCallElem(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_sched_closure) { - GRPC_CLOSURE_SCHED(exec_ctx, then_sched_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(then_sched_closure, GRPC_ERROR_NONE); } -grpc_error* InitChannelElem(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, +grpc_error* InitChannelElem(grpc_channel_element* elem, grpc_channel_element_args* args) { return GRPC_ERROR_NONE; } -void DestroyChannelElem(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem) {} +void DestroyChannelElem(grpc_channel_element* elem) {} -void GetChannelInfo(grpc_exec_ctx* exec_ctx, grpc_channel_element* elem, +void GetChannelInfo(grpc_channel_element* elem, const grpc_channel_info* channel_info) {} static const grpc_channel_filter isolated_call_filter = { @@ -711,10 +692,8 @@ class IsolatedCallFixture : public TrackCounters { builder, &isolated_call_filter::isolated_call_filter, nullptr, nullptr)); { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - channel_ = grpc_channel_create_with_builder(&exec_ctx, builder, - GRPC_CLIENT_CHANNEL); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + channel_ = grpc_channel_create_with_builder(builder, GRPC_CLIENT_CHANNEL); } cq_ = grpc_completion_queue_create_for_next(nullptr); } diff --git a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc index 3fff8b02d61..4b7310389c4 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc @@ -50,22 +50,22 @@ static grpc_slice MakeSlice(std::vector bytes) { static void BM_HpackEncoderInitDestroy(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_chttp2_hpack_compressor c; while (state.KeepRunning()) { grpc_chttp2_hpack_compressor_init(&c); - grpc_chttp2_hpack_compressor_destroy(&exec_ctx, &c); - grpc_exec_ctx_flush(&exec_ctx); + grpc_chttp2_hpack_compressor_destroy(&c); + grpc_core::ExecCtx::Get()->Flush(); } - grpc_exec_ctx_finish(&exec_ctx); + track_counters.Finish(state); } BENCHMARK(BM_HpackEncoderInitDestroy); static void BM_HpackEncoderEncodeDeadline(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_millis saved_now = grpc_exec_ctx_now(&exec_ctx); + grpc_core::ExecCtx exec_ctx; + grpc_millis saved_now = grpc_core::ExecCtx::Get()->Now(); grpc_metadata_batch b; grpc_metadata_batch_init(&b); @@ -85,14 +85,13 @@ static void BM_HpackEncoderEncodeDeadline(benchmark::State& state) { (size_t)1024, &stats, }; - grpc_chttp2_encode_header(&exec_ctx, &c, nullptr, 0, &b, &hopt, &outbuf); - grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, &outbuf); - grpc_exec_ctx_flush(&exec_ctx); + grpc_chttp2_encode_header(&c, nullptr, 0, &b, &hopt, &outbuf); + grpc_slice_buffer_reset_and_unref_internal(&outbuf); + grpc_core::ExecCtx::Get()->Flush(); } - grpc_metadata_batch_destroy(&exec_ctx, &b); - grpc_chttp2_hpack_compressor_destroy(&exec_ctx, &c); - grpc_slice_buffer_destroy_internal(&exec_ctx, &outbuf); - grpc_exec_ctx_finish(&exec_ctx); + grpc_metadata_batch_destroy(&b); + grpc_chttp2_hpack_compressor_destroy(&c); + grpc_slice_buffer_destroy_internal(&outbuf); std::ostringstream label; label << "framing_bytes/iter:" @@ -109,17 +108,16 @@ BENCHMARK(BM_HpackEncoderEncodeDeadline); template static void BM_HpackEncoderEncodeHeader(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; static bool logged_representative_output = false; grpc_metadata_batch b; grpc_metadata_batch_init(&b); - std::vector elems = Fixture::GetElems(&exec_ctx); + std::vector elems = Fixture::GetElems(); std::vector storage(elems.size()); for (size_t i = 0; i < elems.size(); i++) { GPR_ASSERT(GRPC_LOG_IF_ERROR( - "addmd", - grpc_metadata_batch_add_tail(&exec_ctx, &b, &storage[i], elems[i]))); + "addmd", grpc_metadata_batch_add_tail(&b, &storage[i], elems[i]))); } grpc_chttp2_hpack_compressor c; @@ -136,7 +134,7 @@ static void BM_HpackEncoderEncodeHeader(benchmark::State& state) { (size_t)state.range(1), &stats, }; - grpc_chttp2_encode_header(&exec_ctx, &c, nullptr, 0, &b, &hopt, &outbuf); + grpc_chttp2_encode_header(&c, nullptr, 0, &b, &hopt, &outbuf); if (!logged_representative_output && state.iterations() > 3) { logged_representative_output = true; for (size_t i = 0; i < outbuf.count; i++) { @@ -145,13 +143,12 @@ static void BM_HpackEncoderEncodeHeader(benchmark::State& state) { gpr_free(s); } } - grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, &outbuf); - grpc_exec_ctx_flush(&exec_ctx); + grpc_slice_buffer_reset_and_unref_internal(&outbuf); + grpc_core::ExecCtx::Get()->Flush(); } - grpc_metadata_batch_destroy(&exec_ctx, &b); - grpc_chttp2_hpack_compressor_destroy(&exec_ctx, &c); - grpc_slice_buffer_destroy_internal(&exec_ctx, &outbuf); - grpc_exec_ctx_finish(&exec_ctx); + grpc_metadata_batch_destroy(&b); + grpc_chttp2_hpack_compressor_destroy(&c); + grpc_slice_buffer_destroy_internal(&outbuf); std::ostringstream label; label << "framing_bytes/iter:" @@ -169,15 +166,13 @@ namespace hpack_encoder_fixtures { class EmptyBatch { public: static constexpr bool kEnableTrueBinary = false; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { - return {}; - } + static std::vector GetElems() { return {}; } }; class SingleStaticElem { public: static constexpr bool kEnableTrueBinary = false; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + static std::vector GetElems() { return {GRPC_MDELEM_GRPC_ACCEPT_ENCODING_IDENTITY_COMMA_DEFLATE}; } }; @@ -185,9 +180,9 @@ class SingleStaticElem { class SingleInternedElem { public: static constexpr bool kEnableTrueBinary = false; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + static std::vector GetElems() { return {grpc_mdelem_from_slices( - exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("abc")), + grpc_slice_intern(grpc_slice_from_static_string("abc")), grpc_slice_intern(grpc_slice_from_static_string("def")))}; } }; @@ -196,10 +191,10 @@ template class SingleInternedBinaryElem { public: static constexpr bool kEnableTrueBinary = kTrueBinary; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + static std::vector GetElems() { grpc_slice bytes = MakeBytes(); std::vector out = {grpc_mdelem_from_slices( - exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("abc-bin")), + grpc_slice_intern(grpc_slice_from_static_string("abc-bin")), grpc_slice_intern(bytes))}; grpc_slice_unref(bytes); return out; @@ -218,9 +213,9 @@ class SingleInternedBinaryElem { class SingleInternedKeyElem { public: static constexpr bool kEnableTrueBinary = false; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + static std::vector GetElems() { return {grpc_mdelem_from_slices( - exec_ctx, grpc_slice_intern(grpc_slice_from_static_string("abc")), + grpc_slice_intern(grpc_slice_from_static_string("abc")), grpc_slice_from_static_string("def"))}; } }; @@ -228,9 +223,8 @@ class SingleInternedKeyElem { class SingleNonInternedElem { public: static constexpr bool kEnableTrueBinary = false; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { - return {grpc_mdelem_from_slices(exec_ctx, - grpc_slice_from_static_string("abc"), + static std::vector GetElems() { + return {grpc_mdelem_from_slices(grpc_slice_from_static_string("abc"), grpc_slice_from_static_string("def"))}; } }; @@ -239,9 +233,9 @@ template class SingleNonInternedBinaryElem { public: static constexpr bool kEnableTrueBinary = kTrueBinary; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { - return {grpc_mdelem_from_slices( - exec_ctx, grpc_slice_from_static_string("abc-bin"), MakeBytes())}; + static std::vector GetElems() { + return {grpc_mdelem_from_slices(grpc_slice_from_static_string("abc-bin"), + MakeBytes())}; } private: @@ -257,21 +251,21 @@ class SingleNonInternedBinaryElem { class RepresentativeClientInitialMetadata { public: static constexpr bool kEnableTrueBinary = true; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + static std::vector GetElems() { return { GRPC_MDELEM_SCHEME_HTTP, GRPC_MDELEM_METHOD_POST, grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_PATH, + GRPC_MDSTR_PATH, grpc_slice_intern(grpc_slice_from_static_string("/foo/bar"))), - grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_AUTHORITY, + grpc_mdelem_from_slices(GRPC_MDSTR_AUTHORITY, grpc_slice_intern(grpc_slice_from_static_string( "foo.test.google.fr:1234"))), GRPC_MDELEM_GRPC_ACCEPT_ENCODING_IDENTITY_COMMA_DEFLATE_COMMA_GZIP, GRPC_MDELEM_TE_TRAILERS, GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC, grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_USER_AGENT, + GRPC_MDSTR_USER_AGENT, grpc_slice_intern(grpc_slice_from_static_string( "grpc-c/3.0.0-dev (linux; chttp2; green)")))}; } @@ -283,18 +277,18 @@ class RepresentativeClientInitialMetadata { class MoreRepresentativeClientInitialMetadata { public: static constexpr bool kEnableTrueBinary = true; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + static std::vector GetElems() { return { GRPC_MDELEM_SCHEME_HTTP, GRPC_MDELEM_METHOD_POST, - grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_PATH, + grpc_mdelem_from_slices(GRPC_MDSTR_PATH, grpc_slice_intern(grpc_slice_from_static_string( "/grpc.test.FooService/BarMethod"))), - grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_AUTHORITY, + grpc_mdelem_from_slices(GRPC_MDSTR_AUTHORITY, grpc_slice_intern(grpc_slice_from_static_string( "foo.test.google.fr:1234"))), grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_GRPC_TRACE_BIN, + GRPC_MDSTR_GRPC_TRACE_BIN, grpc_slice_from_static_string("\x00\x01\x02\x03\x04\x05\x06\x07\x08" "\x09\x0a\x0b\x0c\x0d\x0e\x0f" "\x10\x11\x12\x13\x14\x15\x16\x17\x18" @@ -303,7 +297,7 @@ class MoreRepresentativeClientInitialMetadata { "\x29\x2a\x2b\x2c\x2d\x2e\x2f" "\x30")), grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_GRPC_TAGS_BIN, + GRPC_MDSTR_GRPC_TAGS_BIN, grpc_slice_from_static_string("\x00\x01\x02\x03\x04\x05\x06\x07\x08" "\x09\x0a\x0b\x0c\x0d\x0e\x0f" "\x10\x11\x12\x13")), @@ -311,7 +305,7 @@ class MoreRepresentativeClientInitialMetadata { GRPC_MDELEM_TE_TRAILERS, GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC, grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_USER_AGENT, + GRPC_MDSTR_USER_AGENT, grpc_slice_intern(grpc_slice_from_static_string( "grpc-c/3.0.0-dev (linux; chttp2; green)")))}; } @@ -320,7 +314,7 @@ class MoreRepresentativeClientInitialMetadata { class RepresentativeServerInitialMetadata { public: static constexpr bool kEnableTrueBinary = true; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + static std::vector GetElems() { return {GRPC_MDELEM_STATUS_200, GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC, GRPC_MDELEM_GRPC_ACCEPT_ENCODING_IDENTITY_COMMA_DEFLATE_COMMA_GZIP}; @@ -330,7 +324,7 @@ class RepresentativeServerInitialMetadata { class RepresentativeServerTrailingMetadata { public: static constexpr bool kEnableTrueBinary = true; - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + static std::vector GetElems() { return {GRPC_MDELEM_GRPC_STATUS_0}; } }; @@ -431,48 +425,45 @@ BENCHMARK_TEMPLATE(BM_HpackEncoderEncodeHeader, static void BM_HpackParserInitDestroy(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_chttp2_hpack_parser p; while (state.KeepRunning()) { - grpc_chttp2_hpack_parser_init(&exec_ctx, &p); - grpc_chttp2_hpack_parser_destroy(&exec_ctx, &p); - grpc_exec_ctx_flush(&exec_ctx); + grpc_chttp2_hpack_parser_init(&p); + grpc_chttp2_hpack_parser_destroy(&p); + grpc_core::ExecCtx::Get()->Flush(); } - grpc_exec_ctx_finish(&exec_ctx); + track_counters.Finish(state); } BENCHMARK(BM_HpackParserInitDestroy); -static void UnrefHeader(grpc_exec_ctx* exec_ctx, void* user_data, - grpc_mdelem md) { - GRPC_MDELEM_UNREF(exec_ctx, md); +static void UnrefHeader(void* user_data, grpc_mdelem md) { + GRPC_MDELEM_UNREF(md); } -template +template static void BM_HpackParserParseHeader(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; std::vector init_slices = Fixture::GetInitSlices(); std::vector benchmark_slices = Fixture::GetBenchmarkSlices(); grpc_chttp2_hpack_parser p; - grpc_chttp2_hpack_parser_init(&exec_ctx, &p); + grpc_chttp2_hpack_parser_init(&p); p.on_header = OnHeader; p.on_header_user_data = nullptr; for (auto slice : init_slices) { - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_chttp2_hpack_parser_parse(&exec_ctx, &p, slice)); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_chttp2_hpack_parser_parse(&p, slice)); } while (state.KeepRunning()) { for (auto slice : benchmark_slices) { - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_chttp2_hpack_parser_parse(&exec_ctx, &p, slice)); + GPR_ASSERT(GRPC_ERROR_NONE == grpc_chttp2_hpack_parser_parse(&p, slice)); } - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); } for (auto slice : init_slices) grpc_slice_unref(slice); for (auto slice : benchmark_slices) grpc_slice_unref(slice); - grpc_chttp2_hpack_parser_destroy(&exec_ctx, &p); - grpc_exec_ctx_finish(&exec_ctx); + grpc_chttp2_hpack_parser_destroy(&p); + track_counters.Finish(state); } @@ -769,8 +760,7 @@ class RepresentativeServerTrailingMetadata { static void free_timeout(void* p) { gpr_free(p); } // New implementation. -static void OnHeaderNew(grpc_exec_ctx* exec_ctx, void* user_data, - grpc_mdelem md) { +static void OnHeaderNew(void* user_data, grpc_mdelem md) { if (grpc_slice_eq(GRPC_MDKEY(md), GRPC_MDSTR_GRPC_TIMEOUT)) { grpc_millis* cached_timeout = static_cast(grpc_mdelem_get_user_data(md, free_timeout)); @@ -793,7 +783,7 @@ static void OnHeaderNew(grpc_exec_ctx* exec_ctx, void* user_data, } } benchmark::DoNotOptimize(timeout); - GRPC_MDELEM_UNREF(exec_ctx, md); + GRPC_MDELEM_UNREF(md); } else { GPR_ASSERT(0); } diff --git a/test/cpp/microbenchmarks/bm_chttp2_transport.cc b/test/cpp/microbenchmarks/bm_chttp2_transport.cc index be4da4d0bd7..fcb1677d09f 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_transport.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_transport.cc @@ -58,7 +58,7 @@ class DummyEndpoint : public grpc_endpoint { ru_ = grpc_resource_user_create(Library::get().rq(), "dummy_endpoint"); } - void PushInput(grpc_exec_ctx* exec_ctx, grpc_slice slice) { + void PushInput(grpc_slice slice) { if (read_cb_ == nullptr) { GPR_ASSERT(!have_slice_); buffered_slice_ = slice; @@ -66,7 +66,7 @@ class DummyEndpoint : public grpc_endpoint { return; } grpc_slice_buffer_add(slices_, slice); - GRPC_CLOSURE_SCHED(exec_ctx, read_cb_, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(read_cb_, GRPC_ERROR_NONE); read_cb_ = nullptr; } @@ -77,50 +77,45 @@ class DummyEndpoint : public grpc_endpoint { bool have_slice_ = false; grpc_slice buffered_slice_; - void QueueRead(grpc_exec_ctx* exec_ctx, grpc_slice_buffer* slices, - grpc_closure* cb) { + void QueueRead(grpc_slice_buffer* slices, grpc_closure* cb) { GPR_ASSERT(read_cb_ == nullptr); if (have_slice_) { have_slice_ = false; grpc_slice_buffer_add(slices, buffered_slice_); - GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); return; } read_cb_ = cb; slices_ = slices; } - static void read(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* slices, grpc_closure* cb) { - static_cast(ep)->QueueRead(exec_ctx, slices, cb); + static void read(grpc_endpoint* ep, grpc_slice_buffer* slices, + grpc_closure* cb) { + static_cast(ep)->QueueRead(slices, cb); } - static void write(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_slice_buffer* slices, grpc_closure* cb) { - GRPC_CLOSURE_SCHED(exec_ctx, cb, GRPC_ERROR_NONE); + static void write(grpc_endpoint* ep, grpc_slice_buffer* slices, + grpc_closure* cb) { + GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); } static grpc_workqueue* get_workqueue(grpc_endpoint* ep) { return nullptr; } - static void add_to_pollset(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_pollset* pollset) {} + static void add_to_pollset(grpc_endpoint* ep, grpc_pollset* pollset) {} - static void add_to_pollset_set(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_pollset_set* pollset) {} + static void add_to_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset) { + } - static void delete_from_pollset_set(grpc_exec_ctx* exec_ctx, - grpc_endpoint* ep, + static void delete_from_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset) {} - static void shutdown(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep, - grpc_error* why) { - grpc_resource_user_shutdown(exec_ctx, static_cast(ep)->ru_); - GRPC_CLOSURE_SCHED(exec_ctx, static_cast(ep)->read_cb_, - why); + static void shutdown(grpc_endpoint* ep, grpc_error* why) { + grpc_resource_user_shutdown(static_cast(ep)->ru_); + GRPC_CLOSURE_SCHED(static_cast(ep)->read_cb_, why); } - static void destroy(grpc_exec_ctx* exec_ctx, grpc_endpoint* ep) { - grpc_resource_user_unref(exec_ctx, static_cast(ep)->ru_); + static void destroy(grpc_endpoint* ep) { + grpc_resource_user_unref(static_cast(ep)->ru_); delete static_cast(ep); } @@ -136,29 +131,24 @@ class Fixture { Fixture(const grpc::ChannelArguments& args, bool client) { grpc_channel_args c_args = args.c_channel_args(); ep_ = new DummyEndpoint; - t_ = grpc_create_chttp2_transport(exec_ctx(), &c_args, ep_, client); - grpc_chttp2_transport_start_reading(exec_ctx(), t_, nullptr, nullptr); + t_ = grpc_create_chttp2_transport(&c_args, ep_, client); + grpc_chttp2_transport_start_reading(t_, nullptr, nullptr); FlushExecCtx(); } - void FlushExecCtx() { grpc_exec_ctx_flush(&exec_ctx_); } + void FlushExecCtx() { grpc_core::ExecCtx::Get()->Flush(); } - ~Fixture() { - grpc_transport_destroy(&exec_ctx_, t_); - grpc_exec_ctx_finish(&exec_ctx_); - } + ~Fixture() { grpc_transport_destroy(t_); } grpc_chttp2_transport* chttp2_transport() { return reinterpret_cast(t_); } grpc_transport* transport() { return t_; } - grpc_exec_ctx* exec_ctx() { return &exec_ctx_; } - void PushInput(grpc_slice slice) { ep_->PushInput(exec_ctx(), slice); } + void PushInput(grpc_slice slice) { ep_->PushInput(slice); } private: DummyEndpoint* ep_; - grpc_exec_ctx exec_ctx_ = GRPC_EXEC_CTX_INIT; grpc_transport* t_; }; @@ -175,8 +165,8 @@ std::unique_ptr MakeClosure( GRPC_CLOSURE_INIT(this, Execute, this, sched); } F f_; - static void Execute(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { - static_cast(arg)->f_(exec_ctx, error); + static void Execute(void* arg, grpc_error* error) { + static_cast(arg)->f_(error); } }; return std::unique_ptr(new C(f, sched)); @@ -188,8 +178,8 @@ grpc_closure* MakeOnceClosure( struct C : public grpc_closure { C(const F& f) : f_(f) {} F f_; - static void Execute(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { - static_cast(arg)->f_(exec_ctx, error); + static void Execute(void* arg, grpc_error* error) { + static_cast(arg)->f_(error); delete static_cast(arg); } }; @@ -220,22 +210,22 @@ class Stream { gpr_arena_destroy(arena_); arena_ = gpr_arena_create(4096); } - grpc_transport_init_stream(f_->exec_ctx(), f_->transport(), + grpc_transport_init_stream(f_->transport(), static_cast(stream_), &refcount_, nullptr, arena_); } - void DestroyThen(grpc_exec_ctx* exec_ctx, grpc_closure* closure) { + void DestroyThen(grpc_closure* closure) { destroy_closure_ = closure; #ifndef NDEBUG - grpc_stream_unref(exec_ctx, &refcount_, "DestroyThen"); + grpc_stream_unref(&refcount_, "DestroyThen"); #else - grpc_stream_unref(exec_ctx, &refcount_); + grpc_stream_unref(&refcount_); #endif } - void Op(grpc_exec_ctx* exec_ctx, grpc_transport_stream_op_batch* op) { - grpc_transport_perform_stream_op(exec_ctx, f_->transport(), + void Op(grpc_transport_stream_op_batch* op) { + grpc_transport_perform_stream_op(f_->transport(), static_cast(stream_), op); } @@ -244,10 +234,9 @@ class Stream { } private: - static void FinishDestroy(grpc_exec_ctx* exec_ctx, void* arg, - grpc_error* error) { + static void FinishDestroy(void* arg, grpc_error* error) { auto stream = static_cast(arg); - grpc_transport_destroy_stream(exec_ctx, stream->f_->transport(), + grpc_transport_destroy_stream(stream->f_->transport(), static_cast(stream->stream_), stream->destroy_closure_); gpr_event_set(&stream->done_, (void*)1); @@ -268,6 +257,7 @@ class Stream { static void BM_StreamCreateDestroy(benchmark::State& state) { TrackCounters track_counters; + grpc_core::ExecCtx exec_ctx; Fixture f(grpc::ChannelArguments(), true); Stream s(&f); grpc_transport_stream_op_batch op; @@ -276,14 +266,13 @@ static void BM_StreamCreateDestroy(benchmark::State& state) { op.cancel_stream = true; op.payload = &op_payload; op_payload.cancel_stream.cancel_error = GRPC_ERROR_CANCELLED; - std::unique_ptr next = - MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { - if (!state.KeepRunning()) return; - s.Init(state); - s.Op(exec_ctx, &op); - s.DestroyThen(exec_ctx, next.get()); - }); - GRPC_CLOSURE_RUN(f.exec_ctx(), next.get(), GRPC_ERROR_NONE); + std::unique_ptr next = MakeClosure([&](grpc_error* error) { + if (!state.KeepRunning()) return; + s.Init(state); + s.Op(&op); + s.DestroyThen(next.get()); + }); + GRPC_CLOSURE_RUN(next.get(), GRPC_ERROR_NONE); f.FlushExecCtx(); track_counters.Finish(state); } @@ -291,21 +280,21 @@ BENCHMARK(BM_StreamCreateDestroy); class RepresentativeClientInitialMetadata { public: - static std::vector GetElems(grpc_exec_ctx* exec_ctx) { + static std::vector GetElems() { return { GRPC_MDELEM_SCHEME_HTTP, GRPC_MDELEM_METHOD_POST, grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_PATH, + GRPC_MDSTR_PATH, grpc_slice_intern(grpc_slice_from_static_string("/foo/bar"))), - grpc_mdelem_from_slices(exec_ctx, GRPC_MDSTR_AUTHORITY, + grpc_mdelem_from_slices(GRPC_MDSTR_AUTHORITY, grpc_slice_intern(grpc_slice_from_static_string( "foo.test.google.fr:1234"))), GRPC_MDELEM_GRPC_ACCEPT_ENCODING_IDENTITY_COMMA_DEFLATE_COMMA_GZIP, GRPC_MDELEM_TE_TRAILERS, GRPC_MDELEM_CONTENT_TYPE_APPLICATION_SLASH_GRPC, grpc_mdelem_from_slices( - exec_ctx, GRPC_MDSTR_USER_AGENT, + GRPC_MDSTR_USER_AGENT, grpc_slice_intern(grpc_slice_from_static_string( "grpc-c/3.0.0-dev (linux; chttp2; green)")))}; } @@ -314,6 +303,7 @@ class RepresentativeClientInitialMetadata { template static void BM_StreamCreateSendInitialMetadataDestroy(benchmark::State& state) { TrackCounters track_counters; + grpc_core::ExecCtx exec_ctx; Fixture f(grpc::ChannelArguments(), true); Stream s(&f); grpc_transport_stream_op_batch op; @@ -330,34 +320,33 @@ static void BM_StreamCreateSendInitialMetadataDestroy(benchmark::State& state) { grpc_metadata_batch b; grpc_metadata_batch_init(&b); b.deadline = GRPC_MILLIS_INF_FUTURE; - std::vector elems = Metadata::GetElems(f.exec_ctx()); + std::vector elems = Metadata::GetElems(); std::vector storage(elems.size()); for (size_t i = 0; i < elems.size(); i++) { GPR_ASSERT(GRPC_LOG_IF_ERROR( - "addmd", - grpc_metadata_batch_add_tail(f.exec_ctx(), &b, &storage[i], elems[i]))); + "addmd", grpc_metadata_batch_add_tail(&b, &storage[i], elems[i]))); } f.FlushExecCtx(); - start = MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { + start = MakeClosure([&](grpc_error* error) { if (!state.KeepRunning()) return; s.Init(state); reset_op(); op.on_complete = done.get(); op.send_initial_metadata = true; op.payload->send_initial_metadata.send_initial_metadata = &b; - s.Op(exec_ctx, &op); + s.Op(&op); }); - done = MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { + done = MakeClosure([&](grpc_error* error) { reset_op(); op.cancel_stream = true; op.payload->cancel_stream.cancel_error = GRPC_ERROR_CANCELLED; - s.Op(exec_ctx, &op); - s.DestroyThen(exec_ctx, start.get()); + s.Op(&op); + s.DestroyThen(start.get()); }); - GRPC_CLOSURE_SCHED(f.exec_ctx(), start.get(), GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(start.get(), GRPC_ERROR_NONE); f.FlushExecCtx(); - grpc_metadata_batch_destroy(f.exec_ctx(), &b); + grpc_metadata_batch_destroy(&b); track_counters.Finish(state); } BENCHMARK_TEMPLATE(BM_StreamCreateSendInitialMetadataDestroy, @@ -365,6 +354,7 @@ BENCHMARK_TEMPLATE(BM_StreamCreateSendInitialMetadataDestroy, static void BM_TransportEmptyOp(benchmark::State& state) { TrackCounters track_counters; + grpc_core::ExecCtx exec_ctx; Fixture f(grpc::ChannelArguments(), true); Stream s(&f); s.Init(state); @@ -375,21 +365,19 @@ static void BM_TransportEmptyOp(benchmark::State& state) { memset(&op, 0, sizeof(op)); op.payload = &op_payload; }; - std::unique_ptr c = - MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { - if (!state.KeepRunning()) return; - reset_op(); - op.on_complete = c.get(); - s.Op(exec_ctx, &op); - }); - GRPC_CLOSURE_SCHED(f.exec_ctx(), c.get(), GRPC_ERROR_NONE); + std::unique_ptr c = MakeClosure([&](grpc_error* error) { + if (!state.KeepRunning()) return; + reset_op(); + op.on_complete = c.get(); + s.Op(&op); + }); + GRPC_CLOSURE_SCHED(c.get(), GRPC_ERROR_NONE); f.FlushExecCtx(); reset_op(); op.cancel_stream = true; op_payload.cancel_stream.cancel_error = GRPC_ERROR_CANCELLED; - s.Op(f.exec_ctx(), &op); - s.DestroyThen(f.exec_ctx(), MakeOnceClosure([](grpc_exec_ctx* exec_ctx, - grpc_error* error) {})); + s.Op(&op); + s.DestroyThen(MakeOnceClosure([](grpc_error* error) {})); f.FlushExecCtx(); track_counters.Finish(state); } @@ -399,6 +387,7 @@ std::vector> done_events; static void BM_TransportStreamSend(benchmark::State& state) { TrackCounters track_counters; + grpc_core::ExecCtx exec_ctx; Fixture f(grpc::ChannelArguments(), true); auto s = std::unique_ptr(new Stream(&f)); s->Init(state); @@ -420,39 +409,37 @@ static void BM_TransportStreamSend(benchmark::State& state) { grpc_metadata_batch_init(&b); b.deadline = GRPC_MILLIS_INF_FUTURE; std::vector elems = - RepresentativeClientInitialMetadata::GetElems(f.exec_ctx()); + RepresentativeClientInitialMetadata::GetElems(); std::vector storage(elems.size()); for (size_t i = 0; i < elems.size(); i++) { GPR_ASSERT(GRPC_LOG_IF_ERROR( - "addmd", - grpc_metadata_batch_add_tail(f.exec_ctx(), &b, &storage[i], elems[i]))); + "addmd", grpc_metadata_batch_add_tail(&b, &storage[i], elems[i]))); } gpr_event* bm_done = new gpr_event; gpr_event_init(bm_done); - std::unique_ptr c = - MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { - if (!state.KeepRunning()) { - gpr_event_set(bm_done, (void*)1); - return; - } - // force outgoing window to be yuge - s->chttp2_stream()->flow_control->TestOnlyForceHugeWindow(); - f.chttp2_transport()->flow_control->TestOnlyForceHugeWindow(); - grpc_slice_buffer_stream_init(&send_stream, &send_buffer, 0); - reset_op(); - op.on_complete = c.get(); - op.send_message = true; - op.payload->send_message.send_message = &send_stream.base; - s->Op(exec_ctx, &op); - }); + std::unique_ptr c = MakeClosure([&](grpc_error* error) { + if (!state.KeepRunning()) { + gpr_event_set(bm_done, (void*)1); + return; + } + // force outgoing window to be yuge + s->chttp2_stream()->flow_control->TestOnlyForceHugeWindow(); + f.chttp2_transport()->flow_control->TestOnlyForceHugeWindow(); + grpc_slice_buffer_stream_init(&send_stream, &send_buffer, 0); + reset_op(); + op.on_complete = c.get(); + op.send_message = true; + op.payload->send_message.send_message = &send_stream.base; + s->Op(&op); + }); reset_op(); op.send_initial_metadata = true; op.payload->send_initial_metadata.send_initial_metadata = &b; op.on_complete = c.get(); - s->Op(f.exec_ctx(), &op); + s->Op(&op); f.FlushExecCtx(); gpr_event_wait(bm_done, gpr_inf_future(GPR_CLOCK_REALTIME)); @@ -461,13 +448,12 @@ static void BM_TransportStreamSend(benchmark::State& state) { reset_op(); op.cancel_stream = true; op.payload->cancel_stream.cancel_error = GRPC_ERROR_CANCELLED; - s->Op(f.exec_ctx(), &op); - s->DestroyThen(f.exec_ctx(), MakeOnceClosure([](grpc_exec_ctx* exec_ctx, - grpc_error* error) {})); + s->Op(&op); + s->DestroyThen(MakeOnceClosure([](grpc_error* error) {})); f.FlushExecCtx(); s.reset(); track_counters.Finish(state); - grpc_metadata_batch_destroy(f.exec_ctx(), &b); + grpc_metadata_batch_destroy(&b); grpc_slice_buffer_destroy(&send_buffer); } BENCHMARK(BM_TransportStreamSend)->Range(0, 128 * 1024 * 1024); @@ -531,6 +517,7 @@ static grpc_slice CreateIncomingDataSlice(size_t length, size_t frame_size) { static void BM_TransportStreamRecv(benchmark::State& state) { TrackCounters track_counters; + grpc_core::ExecCtx exec_ctx; Fixture f(grpc::ChannelArguments(), true); Stream s(&f); s.Init(state); @@ -551,16 +538,14 @@ static void BM_TransportStreamRecv(benchmark::State& state) { grpc_metadata_batch_init(&b_recv); b.deadline = GRPC_MILLIS_INF_FUTURE; std::vector elems = - RepresentativeClientInitialMetadata::GetElems(f.exec_ctx()); + RepresentativeClientInitialMetadata::GetElems(); std::vector storage(elems.size()); for (size_t i = 0; i < elems.size(); i++) { GPR_ASSERT(GRPC_LOG_IF_ERROR( - "addmd", - grpc_metadata_batch_add_tail(f.exec_ctx(), &b, &storage[i], elems[i]))); + "addmd", grpc_metadata_batch_add_tail(&b, &storage[i], elems[i]))); } - std::unique_ptr do_nothing = - MakeClosure([](grpc_exec_ctx* exec_ctx, grpc_error* error) {}); + std::unique_ptr do_nothing = MakeClosure([](grpc_error* error) {}); uint32_t received; @@ -569,51 +554,49 @@ static void BM_TransportStreamRecv(benchmark::State& state) { std::unique_ptr drain_continue; grpc_slice recv_slice; - std::unique_ptr c = - MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { - if (!state.KeepRunning()) return; - // force outgoing window to be yuge - s.chttp2_stream()->flow_control->TestOnlyForceHugeWindow(); - f.chttp2_transport()->flow_control->TestOnlyForceHugeWindow(); - received = 0; - reset_op(); - op.on_complete = do_nothing.get(); - op.recv_message = true; - op.payload->recv_message.recv_message = &recv_stream; - op.payload->recv_message.recv_message_ready = drain_start.get(); - s.Op(exec_ctx, &op); - f.PushInput(grpc_slice_ref(incoming_data)); - }); - - drain_start = MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { + std::unique_ptr c = MakeClosure([&](grpc_error* error) { + if (!state.KeepRunning()) return; + // force outgoing window to be yuge + s.chttp2_stream()->flow_control->TestOnlyForceHugeWindow(); + f.chttp2_transport()->flow_control->TestOnlyForceHugeWindow(); + received = 0; + reset_op(); + op.on_complete = do_nothing.get(); + op.recv_message = true; + op.payload->recv_message.recv_message = &recv_stream; + op.payload->recv_message.recv_message_ready = drain_start.get(); + s.Op(&op); + f.PushInput(grpc_slice_ref(incoming_data)); + }); + + drain_start = MakeClosure([&](grpc_error* error) { if (recv_stream == nullptr) { GPR_ASSERT(!state.KeepRunning()); return; } - GRPC_CLOSURE_RUN(exec_ctx, drain.get(), GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN(drain.get(), GRPC_ERROR_NONE); }); - drain = MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { + drain = MakeClosure([&](grpc_error* error) { do { if (received == recv_stream->length) { - grpc_byte_stream_destroy(exec_ctx, recv_stream); - GRPC_CLOSURE_SCHED(exec_ctx, c.get(), GRPC_ERROR_NONE); + grpc_byte_stream_destroy(recv_stream); + GRPC_CLOSURE_SCHED(c.get(), GRPC_ERROR_NONE); return; } - } while (grpc_byte_stream_next(exec_ctx, recv_stream, - recv_stream->length - received, + } while (grpc_byte_stream_next(recv_stream, recv_stream->length - received, drain_continue.get()) && GRPC_ERROR_NONE == - grpc_byte_stream_pull(exec_ctx, recv_stream, &recv_slice) && + grpc_byte_stream_pull(recv_stream, &recv_slice) && (received += GRPC_SLICE_LENGTH(recv_slice), - grpc_slice_unref_internal(exec_ctx, recv_slice), true)); + grpc_slice_unref_internal(recv_slice), true)); }); - drain_continue = MakeClosure([&](grpc_exec_ctx* exec_ctx, grpc_error* error) { - grpc_byte_stream_pull(exec_ctx, recv_stream, &recv_slice); + drain_continue = MakeClosure([&](grpc_error* error) { + grpc_byte_stream_pull(recv_stream, &recv_slice); received += GRPC_SLICE_LENGTH(recv_slice); - grpc_slice_unref_internal(exec_ctx, recv_slice); - GRPC_CLOSURE_RUN(exec_ctx, drain.get(), GRPC_ERROR_NONE); + grpc_slice_unref_internal(recv_slice); + GRPC_CLOSURE_RUN(drain.get(), GRPC_ERROR_NONE); }); reset_op(); @@ -624,7 +607,7 @@ static void BM_TransportStreamRecv(benchmark::State& state) { op.payload->recv_initial_metadata.recv_initial_metadata_ready = do_nothing.get(); op.on_complete = c.get(); - s.Op(f.exec_ctx(), &op); + s.Op(&op); f.PushInput(SLICE_FROM_BUFFER( "\x00\x00\x00\x04\x00\x00\x00\x00\x00" // Generated using: @@ -642,13 +625,12 @@ static void BM_TransportStreamRecv(benchmark::State& state) { reset_op(); op.cancel_stream = true; op.payload->cancel_stream.cancel_error = GRPC_ERROR_CANCELLED; - s.Op(f.exec_ctx(), &op); - s.DestroyThen(f.exec_ctx(), MakeOnceClosure([](grpc_exec_ctx* exec_ctx, - grpc_error* error) {})); + s.Op(&op); + s.DestroyThen(MakeOnceClosure([](grpc_error* error) {})); f.FlushExecCtx(); track_counters.Finish(state); - grpc_metadata_batch_destroy(f.exec_ctx(), &b); - grpc_metadata_batch_destroy(f.exec_ctx(), &b_recv); + grpc_metadata_batch_destroy(&b); + grpc_metadata_batch_destroy(&b_recv); grpc_slice_unref(incoming_data); } BENCHMARK(BM_TransportStreamRecv)->Range(0, 128 * 1024 * 1024); diff --git a/test/cpp/microbenchmarks/bm_closure.cc b/test/cpp/microbenchmarks/bm_closure.cc index 2434d4e84ed..4d5a82c3f67 100644 --- a/test/cpp/microbenchmarks/bm_closure.cc +++ b/test/cpp/microbenchmarks/bm_closure.cc @@ -34,8 +34,7 @@ auto& force_library_initialization = Library::get(); static void BM_NoOpExecCtx(benchmark::State& state) { TrackCounters track_counters; while (state.KeepRunning()) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx exec_ctx; } track_counters.Finish(state); } @@ -43,16 +42,16 @@ BENCHMARK(BM_NoOpExecCtx); static void BM_WellFlushed(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); } - grpc_exec_ctx_finish(&exec_ctx); + track_counters.Finish(state); } BENCHMARK(BM_WellFlushed); -static void DoNothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} +static void DoNothing(void* arg, grpc_error* error) {} static void BM_ClosureInitAgainstExecCtx(benchmark::State& state) { TrackCounters track_counters; @@ -69,13 +68,13 @@ static void BM_ClosureInitAgainstCombiner(benchmark::State& state) { TrackCounters track_counters; grpc_combiner* combiner = grpc_combiner_create(); grpc_closure c; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { benchmark::DoNotOptimize(GRPC_CLOSURE_INIT( &c, DoNothing, nullptr, grpc_combiner_scheduler(combiner))); } - GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(combiner, "finished"); + track_counters.Finish(state); } BENCHMARK(BM_ClosureInitAgainstCombiner); @@ -84,41 +83,39 @@ static void BM_ClosureRunOnExecCtx(benchmark::State& state) { TrackCounters track_counters; grpc_closure c; GRPC_CLOSURE_INIT(&c, DoNothing, nullptr, grpc_schedule_on_exec_ctx); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_RUN(&exec_ctx, &c, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_RUN(&c, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Get()->Flush(); } - grpc_exec_ctx_finish(&exec_ctx); + track_counters.Finish(state); } BENCHMARK(BM_ClosureRunOnExecCtx); static void BM_ClosureCreateAndRun(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { GRPC_CLOSURE_RUN( - &exec_ctx, GRPC_CLOSURE_CREATE(DoNothing, nullptr, grpc_schedule_on_exec_ctx), GRPC_ERROR_NONE); } - grpc_exec_ctx_finish(&exec_ctx); + track_counters.Finish(state); } BENCHMARK(BM_ClosureCreateAndRun); static void BM_ClosureInitAndRun(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_closure c; while (state.KeepRunning()) { GRPC_CLOSURE_RUN( - &exec_ctx, GRPC_CLOSURE_INIT(&c, DoNothing, nullptr, grpc_schedule_on_exec_ctx), GRPC_ERROR_NONE); } - grpc_exec_ctx_finish(&exec_ctx); + track_counters.Finish(state); } BENCHMARK(BM_ClosureInitAndRun); @@ -127,12 +124,12 @@ static void BM_ClosureSchedOnExecCtx(benchmark::State& state) { TrackCounters track_counters; grpc_closure c; GRPC_CLOSURE_INIT(&c, DoNothing, nullptr, grpc_schedule_on_exec_ctx); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Get()->Flush(); } - grpc_exec_ctx_finish(&exec_ctx); + track_counters.Finish(state); } BENCHMARK(BM_ClosureSchedOnExecCtx); @@ -143,13 +140,13 @@ static void BM_ClosureSched2OnExecCtx(benchmark::State& state) { grpc_closure c2; GRPC_CLOSURE_INIT(&c1, DoNothing, nullptr, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&c2, DoNothing, nullptr, grpc_schedule_on_exec_ctx); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Get()->Flush(); } - grpc_exec_ctx_finish(&exec_ctx); + track_counters.Finish(state); } BENCHMARK(BM_ClosureSched2OnExecCtx); @@ -162,14 +159,14 @@ static void BM_ClosureSched3OnExecCtx(benchmark::State& state) { GRPC_CLOSURE_INIT(&c1, DoNothing, nullptr, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&c2, DoNothing, nullptr, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&c3, DoNothing, nullptr, grpc_schedule_on_exec_ctx); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c3, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Get()->Flush(); } - grpc_exec_ctx_finish(&exec_ctx); + track_counters.Finish(state); } BENCHMARK(BM_ClosureSched3OnExecCtx); @@ -179,13 +176,13 @@ static void BM_AcquireMutex(benchmark::State& state) { // for comparison with the combiner stuff below gpr_mu mu; gpr_mu_init(&mu); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { gpr_mu_lock(&mu); - DoNothing(&exec_ctx, nullptr, GRPC_ERROR_NONE); + DoNothing(nullptr, GRPC_ERROR_NONE); gpr_mu_unlock(&mu); } - grpc_exec_ctx_finish(&exec_ctx); + track_counters.Finish(state); } BENCHMARK(BM_AcquireMutex); @@ -195,16 +192,16 @@ static void BM_TryAcquireMutex(benchmark::State& state) { // for comparison with the combiner stuff below gpr_mu mu; gpr_mu_init(&mu); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { if (gpr_mu_trylock(&mu)) { - DoNothing(&exec_ctx, nullptr, GRPC_ERROR_NONE); + DoNothing(nullptr, GRPC_ERROR_NONE); gpr_mu_unlock(&mu); } else { abort(); } } - grpc_exec_ctx_finish(&exec_ctx); + track_counters.Finish(state); } BENCHMARK(BM_TryAcquireMutex); @@ -213,13 +210,13 @@ static void BM_AcquireSpinlock(benchmark::State& state) { TrackCounters track_counters; // for comparison with the combiner stuff below gpr_spinlock mu = GPR_SPINLOCK_INITIALIZER; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { gpr_spinlock_lock(&mu); - DoNothing(&exec_ctx, nullptr, GRPC_ERROR_NONE); + DoNothing(nullptr, GRPC_ERROR_NONE); gpr_spinlock_unlock(&mu); } - grpc_exec_ctx_finish(&exec_ctx); + track_counters.Finish(state); } BENCHMARK(BM_AcquireSpinlock); @@ -228,16 +225,16 @@ static void BM_TryAcquireSpinlock(benchmark::State& state) { TrackCounters track_counters; // for comparison with the combiner stuff below gpr_spinlock mu = GPR_SPINLOCK_INITIALIZER; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { if (gpr_spinlock_trylock(&mu)) { - DoNothing(&exec_ctx, nullptr, GRPC_ERROR_NONE); + DoNothing(nullptr, GRPC_ERROR_NONE); gpr_spinlock_unlock(&mu); } else { abort(); } } - grpc_exec_ctx_finish(&exec_ctx); + track_counters.Finish(state); } BENCHMARK(BM_TryAcquireSpinlock); @@ -247,13 +244,13 @@ static void BM_ClosureSchedOnCombiner(benchmark::State& state) { grpc_combiner* combiner = grpc_combiner_create(); grpc_closure c; GRPC_CLOSURE_INIT(&c, DoNothing, nullptr, grpc_combiner_scheduler(combiner)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Get()->Flush(); } - GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(combiner, "finished"); + track_counters.Finish(state); } BENCHMARK(BM_ClosureSchedOnCombiner); @@ -265,14 +262,14 @@ static void BM_ClosureSched2OnCombiner(benchmark::State& state) { grpc_closure c2; GRPC_CLOSURE_INIT(&c1, DoNothing, nullptr, grpc_combiner_scheduler(combiner)); GRPC_CLOSURE_INIT(&c2, DoNothing, nullptr, grpc_combiner_scheduler(combiner)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Get()->Flush(); } - GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(combiner, "finished"); + track_counters.Finish(state); } BENCHMARK(BM_ClosureSched2OnCombiner); @@ -286,15 +283,15 @@ static void BM_ClosureSched3OnCombiner(benchmark::State& state) { GRPC_CLOSURE_INIT(&c1, DoNothing, nullptr, grpc_combiner_scheduler(combiner)); GRPC_CLOSURE_INIT(&c2, DoNothing, nullptr, grpc_combiner_scheduler(combiner)); GRPC_CLOSURE_INIT(&c3, DoNothing, nullptr, grpc_combiner_scheduler(combiner)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c3, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Get()->Flush(); } - GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(combiner, "finished"); + track_counters.Finish(state); } BENCHMARK(BM_ClosureSched3OnCombiner); @@ -309,15 +306,15 @@ static void BM_ClosureSched2OnTwoCombiners(benchmark::State& state) { grpc_combiner_scheduler(combiner1)); GRPC_CLOSURE_INIT(&c2, DoNothing, nullptr, grpc_combiner_scheduler(combiner2)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Get()->Flush(); } - GRPC_COMBINER_UNREF(&exec_ctx, combiner1, "finished"); - GRPC_COMBINER_UNREF(&exec_ctx, combiner2, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(combiner1, "finished"); + GRPC_COMBINER_UNREF(combiner2, "finished"); + track_counters.Finish(state); } BENCHMARK(BM_ClosureSched2OnTwoCombiners); @@ -338,17 +335,17 @@ static void BM_ClosureSched4OnTwoCombiners(benchmark::State& state) { grpc_combiner_scheduler(combiner1)); GRPC_CLOSURE_INIT(&c4, DoNothing, nullptr, grpc_combiner_scheduler(combiner2)); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { - GRPC_CLOSURE_SCHED(&exec_ctx, &c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c2, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c3, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&exec_ctx, &c4, GRPC_ERROR_NONE); - grpc_exec_ctx_flush(&exec_ctx); + GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&c4, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Get()->Flush(); } - GRPC_COMBINER_UNREF(&exec_ctx, combiner1, "finished"); - GRPC_COMBINER_UNREF(&exec_ctx, combiner2, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_COMBINER_UNREF(combiner1, "finished"); + GRPC_COMBINER_UNREF(combiner2, "finished"); + track_counters.Finish(state); } BENCHMARK(BM_ClosureSched4OnTwoCombiners); @@ -362,13 +359,11 @@ class Rescheduler { GRPC_CLOSURE_INIT(&closure_, Step, this, scheduler); } - void ScheduleFirst(grpc_exec_ctx* exec_ctx) { - GRPC_CLOSURE_SCHED(exec_ctx, &closure_, GRPC_ERROR_NONE); - } + void ScheduleFirst() { GRPC_CLOSURE_SCHED(&closure_, GRPC_ERROR_NONE); } void ScheduleFirstAgainstDifferentScheduler( - grpc_exec_ctx* exec_ctx, grpc_closure_scheduler* scheduler) { - GRPC_CLOSURE_SCHED(exec_ctx, GRPC_CLOSURE_CREATE(Step, this, scheduler), + grpc_closure_scheduler* scheduler) { + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(Step, this, scheduler), GRPC_ERROR_NONE); } @@ -376,47 +371,46 @@ class Rescheduler { benchmark::State& state_; grpc_closure closure_; - static void Step(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { + static void Step(void* arg, grpc_error* error) { Rescheduler* self = static_cast(arg); if (self->state_.KeepRunning()) { - GRPC_CLOSURE_SCHED(exec_ctx, &self->closure_, GRPC_ERROR_NONE); + GRPC_CLOSURE_SCHED(&self->closure_, GRPC_ERROR_NONE); } } }; static void BM_ClosureReschedOnExecCtx(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; Rescheduler r(state, grpc_schedule_on_exec_ctx); - r.ScheduleFirst(&exec_ctx); - grpc_exec_ctx_finish(&exec_ctx); + r.ScheduleFirst(); + track_counters.Finish(state); } BENCHMARK(BM_ClosureReschedOnExecCtx); static void BM_ClosureReschedOnCombiner(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_combiner* combiner = grpc_combiner_create(); Rescheduler r(state, grpc_combiner_scheduler(combiner)); - r.ScheduleFirst(&exec_ctx); - grpc_exec_ctx_flush(&exec_ctx); - GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + r.ScheduleFirst(); + grpc_core::ExecCtx::Get()->Flush(); + GRPC_COMBINER_UNREF(combiner, "finished"); + track_counters.Finish(state); } BENCHMARK(BM_ClosureReschedOnCombiner); static void BM_ClosureReschedOnCombinerFinally(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_combiner* combiner = grpc_combiner_create(); Rescheduler r(state, grpc_combiner_finally_scheduler(combiner)); - r.ScheduleFirstAgainstDifferentScheduler(&exec_ctx, - grpc_combiner_scheduler(combiner)); - grpc_exec_ctx_flush(&exec_ctx); - GRPC_COMBINER_UNREF(&exec_ctx, combiner, "finished"); - grpc_exec_ctx_finish(&exec_ctx); + r.ScheduleFirstAgainstDifferentScheduler(grpc_combiner_scheduler(combiner)); + grpc_core::ExecCtx::Get()->Flush(); + GRPC_COMBINER_UNREF(combiner, "finished"); + track_counters.Finish(state); } BENCHMARK(BM_ClosureReschedOnCombinerFinally); diff --git a/test/cpp/microbenchmarks/bm_cq.cc b/test/cpp/microbenchmarks/bm_cq.cc index f0dede73331..97242598f19 100644 --- a/test/cpp/microbenchmarks/bm_cq.cc +++ b/test/cpp/microbenchmarks/bm_cq.cc @@ -66,7 +66,7 @@ static void BM_CreateDestroyCore(benchmark::State& state) { } BENCHMARK(BM_CreateDestroyCore); -static void DoneWithCompletionOnStack(grpc_exec_ctx* exec_ctx, void* arg, +static void DoneWithCompletionOnStack(void* arg, grpc_cq_completion* completion) {} class DummyTag final : public internal::CompletionQueueTag { @@ -81,11 +81,11 @@ static void BM_Pass1Cpp(benchmark::State& state) { while (state.KeepRunning()) { grpc_cq_completion completion; DummyTag dummy_tag; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT(grpc_cq_begin_op(c_cq, &dummy_tag)); - grpc_cq_end_op(&exec_ctx, c_cq, &dummy_tag, GRPC_ERROR_NONE, - DoneWithCompletionOnStack, nullptr, &completion); - grpc_exec_ctx_finish(&exec_ctx); + grpc_cq_end_op(c_cq, &dummy_tag, GRPC_ERROR_NONE, DoneWithCompletionOnStack, + nullptr, &completion); + void* tag; bool ok; cq.Next(&tag, &ok); @@ -101,11 +101,11 @@ static void BM_Pass1Core(benchmark::State& state) { gpr_timespec deadline = gpr_inf_future(GPR_CLOCK_MONOTONIC); while (state.KeepRunning()) { grpc_cq_completion completion; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT(grpc_cq_begin_op(cq, nullptr)); - grpc_cq_end_op(&exec_ctx, cq, nullptr, GRPC_ERROR_NONE, - DoneWithCompletionOnStack, nullptr, &completion); - grpc_exec_ctx_finish(&exec_ctx); + grpc_cq_end_op(cq, nullptr, GRPC_ERROR_NONE, DoneWithCompletionOnStack, + nullptr, &completion); + grpc_completion_queue_next(cq, deadline, nullptr); } grpc_completion_queue_destroy(cq); @@ -120,11 +120,11 @@ static void BM_Pluck1Core(benchmark::State& state) { gpr_timespec deadline = gpr_inf_future(GPR_CLOCK_MONOTONIC); while (state.KeepRunning()) { grpc_cq_completion completion; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; GPR_ASSERT(grpc_cq_begin_op(cq, nullptr)); - grpc_cq_end_op(&exec_ctx, cq, nullptr, GRPC_ERROR_NONE, - DoneWithCompletionOnStack, nullptr, &completion); - grpc_exec_ctx_finish(&exec_ctx); + grpc_cq_end_op(cq, nullptr, GRPC_ERROR_NONE, DoneWithCompletionOnStack, + nullptr, &completion); + grpc_completion_queue_pluck(cq, nullptr, deadline, nullptr); } grpc_completion_queue_destroy(cq); diff --git a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc index 7ccebb55ee0..874c8349311 100644 --- a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc +++ b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc @@ -43,9 +43,8 @@ static grpc_completion_queue* g_cq; static grpc_event_engine_vtable g_vtable; static const grpc_event_engine_vtable* g_old_vtable; -static void pollset_shutdown(grpc_exec_ctx* exec_ctx, grpc_pollset* ps, - grpc_closure* closure) { - GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_ERROR_NONE); +static void pollset_shutdown(grpc_pollset* ps, grpc_closure* closure) { + GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); } static void pollset_init(grpc_pollset* ps, gpr_mu** mu) { @@ -53,25 +52,20 @@ static void pollset_init(grpc_pollset* ps, gpr_mu** mu) { *mu = &ps->mu; } -static void pollset_destroy(grpc_exec_ctx* exec_ctx, grpc_pollset* ps) { - gpr_mu_destroy(&ps->mu); -} +static void pollset_destroy(grpc_pollset* ps) { gpr_mu_destroy(&ps->mu); } -static grpc_error* pollset_kick(grpc_exec_ctx* exec_ctx, grpc_pollset* p, - grpc_pollset_worker* worker) { +static grpc_error* pollset_kick(grpc_pollset* p, grpc_pollset_worker* worker) { return GRPC_ERROR_NONE; } /* Callback when the tag is dequeued from the completion queue. Does nothing */ -static void cq_done_cb(grpc_exec_ctx* exec_ctx, void* done_arg, - grpc_cq_completion* cq_completion) { +static void cq_done_cb(void* done_arg, grpc_cq_completion* cq_completion) { gpr_free(cq_completion); } /* Queues a completion tag if deadline is > 0. * Does nothing if deadline is 0 (i.e gpr_time_0(GPR_CLOCK_MONOTONIC)) */ -static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* ps, - grpc_pollset_worker** worker, +static grpc_error* pollset_work(grpc_pollset* ps, grpc_pollset_worker** worker, grpc_millis deadline) { if (deadline == 0) { gpr_log(GPR_DEBUG, "no-op"); @@ -80,9 +74,9 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* ps, gpr_mu_unlock(&ps->mu); GPR_ASSERT(grpc_cq_begin_op(g_cq, g_tag)); - grpc_cq_end_op(exec_ctx, g_cq, g_tag, GRPC_ERROR_NONE, cq_done_cb, nullptr, + grpc_cq_end_op(g_cq, g_tag, GRPC_ERROR_NONE, cq_done_cb, nullptr, (grpc_cq_completion*)gpr_malloc(sizeof(grpc_cq_completion))); - grpc_exec_ctx_flush(exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&ps->mu); return GRPC_ERROR_NONE; } diff --git a/test/cpp/microbenchmarks/bm_error.cc b/test/cpp/microbenchmarks/bm_error.cc index bbd8b3c339f..d12f475a493 100644 --- a/test/cpp/microbenchmarks/bm_error.cc +++ b/test/cpp/microbenchmarks/bm_error.cc @@ -246,14 +246,14 @@ template static void BM_ErrorGetStatus(benchmark::State& state) { TrackCounters track_counters; Fixture fixture; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { grpc_status_code status; grpc_slice slice; - grpc_error_get_status(&exec_ctx, fixture.error(), fixture.deadline(), - &status, &slice, nullptr, nullptr); + grpc_error_get_status(fixture.error(), fixture.deadline(), &status, &slice, + nullptr, nullptr); } - grpc_exec_ctx_finish(&exec_ctx); + track_counters.Finish(state); } @@ -261,13 +261,13 @@ template static void BM_ErrorGetStatusCode(benchmark::State& state) { TrackCounters track_counters; Fixture fixture; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { grpc_status_code status; - grpc_error_get_status(&exec_ctx, fixture.error(), fixture.deadline(), - &status, nullptr, nullptr, nullptr); + grpc_error_get_status(fixture.error(), fixture.deadline(), &status, nullptr, + nullptr, nullptr); } - grpc_exec_ctx_finish(&exec_ctx); + track_counters.Finish(state); } @@ -275,13 +275,13 @@ template static void BM_ErrorHttpError(benchmark::State& state) { TrackCounters track_counters; Fixture fixture; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { grpc_http2_error_code error; - grpc_error_get_status(&exec_ctx, fixture.error(), fixture.deadline(), - nullptr, nullptr, &error, nullptr); + grpc_error_get_status(fixture.error(), fixture.deadline(), nullptr, nullptr, + &error, nullptr); } - grpc_exec_ctx_finish(&exec_ctx); + track_counters.Finish(state); } diff --git a/test/cpp/microbenchmarks/bm_fullstack_trickle.cc b/test/cpp/microbenchmarks/bm_fullstack_trickle.cc index 5e72213823c..d6d7d41e5e3 100644 --- a/test/cpp/microbenchmarks/bm_fullstack_trickle.cc +++ b/test/cpp/microbenchmarks/bm_fullstack_trickle.cc @@ -177,13 +177,13 @@ class TrickledCHTTP2 : public EndpointPairFixture { } void Step(bool update_stats) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; inc_time(); size_t client_backlog = - grpc_trickle_endpoint_trickle(&exec_ctx, endpoint_pair_.client); + grpc_trickle_endpoint_trickle(endpoint_pair_.client); size_t server_backlog = - grpc_trickle_endpoint_trickle(&exec_ctx, endpoint_pair_.server); - grpc_exec_ctx_finish(&exec_ctx); + grpc_trickle_endpoint_trickle(endpoint_pair_.server); + if (update_stats) { UpdateStats((grpc_chttp2_transport*)client_transport_, &client_stats_, client_backlog); diff --git a/test/cpp/microbenchmarks/bm_metadata.cc b/test/cpp/microbenchmarks/bm_metadata.cc index 73bce084668..f1e7890fc03 100644 --- a/test/cpp/microbenchmarks/bm_metadata.cc +++ b/test/cpp/microbenchmarks/bm_metadata.cc @@ -90,11 +90,11 @@ static void BM_MetadataFromNonInternedSlices(benchmark::State& state) { TrackCounters track_counters; gpr_slice k = grpc_slice_from_static_string("key"); gpr_slice v = grpc_slice_from_static_string("value"); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, nullptr)); + GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, nullptr)); } - grpc_exec_ctx_finish(&exec_ctx); + track_counters.Finish(state); } BENCHMARK(BM_MetadataFromNonInternedSlices); @@ -103,11 +103,11 @@ static void BM_MetadataFromInternedSlices(benchmark::State& state) { TrackCounters track_counters; gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, nullptr)); + GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, nullptr)); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref(k); grpc_slice_unref(v); track_counters.Finish(state); @@ -119,13 +119,13 @@ static void BM_MetadataFromInternedSlicesAlreadyInIndex( TrackCounters track_counters; gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_mdelem seed = grpc_mdelem_create(&exec_ctx, k, v, nullptr); + grpc_core::ExecCtx exec_ctx; + grpc_mdelem seed = grpc_mdelem_create(k, v, nullptr); while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, nullptr)); + GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, nullptr)); } - GRPC_MDELEM_UNREF(&exec_ctx, seed); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(seed); + grpc_slice_unref(k); grpc_slice_unref(v); track_counters.Finish(state); @@ -136,11 +136,11 @@ static void BM_MetadataFromInternedKey(benchmark::State& state) { TrackCounters track_counters; gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_from_static_string("value"); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, nullptr)); + GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, nullptr)); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref(k); track_counters.Finish(state); } @@ -152,14 +152,12 @@ static void BM_MetadataFromNonInternedSlicesWithBackingStore( gpr_slice k = grpc_slice_from_static_string("key"); gpr_slice v = grpc_slice_from_static_string("value"); char backing_store[sizeof(grpc_mdelem_data)]; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF( - &exec_ctx, - grpc_mdelem_create(&exec_ctx, k, v, - reinterpret_cast(backing_store))); + GRPC_MDELEM_UNREF(grpc_mdelem_create( + k, v, reinterpret_cast(backing_store))); } - grpc_exec_ctx_finish(&exec_ctx); + track_counters.Finish(state); } BENCHMARK(BM_MetadataFromNonInternedSlicesWithBackingStore); @@ -170,14 +168,12 @@ static void BM_MetadataFromInternedSlicesWithBackingStore( gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); char backing_store[sizeof(grpc_mdelem_data)]; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF( - &exec_ctx, - grpc_mdelem_create(&exec_ctx, k, v, - reinterpret_cast(backing_store))); + GRPC_MDELEM_UNREF(grpc_mdelem_create( + k, v, reinterpret_cast(backing_store))); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref(k); grpc_slice_unref(v); track_counters.Finish(state); @@ -190,14 +186,12 @@ static void BM_MetadataFromInternedKeyWithBackingStore( gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_from_static_string("value"); char backing_store[sizeof(grpc_mdelem_data)]; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF( - &exec_ctx, - grpc_mdelem_create(&exec_ctx, k, v, - reinterpret_cast(backing_store))); + GRPC_MDELEM_UNREF(grpc_mdelem_create( + k, v, reinterpret_cast(backing_store))); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref(k); track_counters.Finish(state); } @@ -207,11 +201,11 @@ static void BM_MetadataFromStaticMetadataStrings(benchmark::State& state) { TrackCounters track_counters; gpr_slice k = GRPC_MDSTR_STATUS; gpr_slice v = GRPC_MDSTR_200; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, nullptr)); + GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, nullptr)); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref(k); track_counters.Finish(state); } @@ -222,11 +216,11 @@ static void BM_MetadataFromStaticMetadataStringsNotIndexed( TrackCounters track_counters; gpr_slice k = GRPC_MDSTR_STATUS; gpr_slice v = GRPC_MDSTR_GZIP; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, grpc_mdelem_create(&exec_ctx, k, v, nullptr)); + GRPC_MDELEM_UNREF(grpc_mdelem_create(k, v, nullptr)); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_slice_unref(k); track_counters.Finish(state); } @@ -235,16 +229,15 @@ BENCHMARK(BM_MetadataFromStaticMetadataStringsNotIndexed); static void BM_MetadataRefUnrefExternal(benchmark::State& state) { TrackCounters track_counters; char backing_store[sizeof(grpc_mdelem_data)]; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_mdelem el = - grpc_mdelem_create(&exec_ctx, grpc_slice_from_static_string("a"), - grpc_slice_from_static_string("b"), - reinterpret_cast(backing_store)); + grpc_core::ExecCtx exec_ctx; + grpc_mdelem el = grpc_mdelem_create( + grpc_slice_from_static_string("a"), grpc_slice_from_static_string("b"), + reinterpret_cast(backing_store)); while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, GRPC_MDELEM_REF(el)); + GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); } - GRPC_MDELEM_UNREF(&exec_ctx, el); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(el); + track_counters.Finish(state); } BENCHMARK(BM_MetadataRefUnrefExternal); @@ -252,47 +245,47 @@ BENCHMARK(BM_MetadataRefUnrefExternal); static void BM_MetadataRefUnrefInterned(benchmark::State& state) { TrackCounters track_counters; char backing_store[sizeof(grpc_mdelem_data)]; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_slice k = grpc_slice_intern(grpc_slice_from_static_string("key")); gpr_slice v = grpc_slice_intern(grpc_slice_from_static_string("value")); grpc_mdelem el = grpc_mdelem_create( - &exec_ctx, k, v, reinterpret_cast(backing_store)); + k, v, reinterpret_cast(backing_store)); grpc_slice_unref(k); grpc_slice_unref(v); while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, GRPC_MDELEM_REF(el)); + GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); } - GRPC_MDELEM_UNREF(&exec_ctx, el); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(el); + track_counters.Finish(state); } BENCHMARK(BM_MetadataRefUnrefInterned); static void BM_MetadataRefUnrefAllocated(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_mdelem el = - grpc_mdelem_create(&exec_ctx, grpc_slice_from_static_string("a"), + grpc_mdelem_create(grpc_slice_from_static_string("a"), grpc_slice_from_static_string("b"), nullptr); while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, GRPC_MDELEM_REF(el)); + GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); } - GRPC_MDELEM_UNREF(&exec_ctx, el); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(el); + track_counters.Finish(state); } BENCHMARK(BM_MetadataRefUnrefAllocated); static void BM_MetadataRefUnrefStatic(benchmark::State& state) { TrackCounters track_counters; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_mdelem el = - grpc_mdelem_create(&exec_ctx, GRPC_MDSTR_STATUS, GRPC_MDSTR_200, nullptr); + grpc_mdelem_create(GRPC_MDSTR_STATUS, GRPC_MDSTR_200, nullptr); while (state.KeepRunning()) { - GRPC_MDELEM_UNREF(&exec_ctx, GRPC_MDELEM_REF(el)); + GRPC_MDELEM_UNREF(GRPC_MDELEM_REF(el)); } - GRPC_MDELEM_UNREF(&exec_ctx, el); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_MDELEM_UNREF(el); + track_counters.Finish(state); } BENCHMARK(BM_MetadataRefUnrefStatic); diff --git a/test/cpp/microbenchmarks/bm_pollset.cc b/test/cpp/microbenchmarks/bm_pollset.cc index 4da79693f1a..d9d5164cce5 100644 --- a/test/cpp/microbenchmarks/bm_pollset.cc +++ b/test/cpp/microbenchmarks/bm_pollset.cc @@ -41,8 +41,8 @@ auto& force_library_initialization = Library::get(); -static void shutdown_ps(grpc_exec_ctx* exec_ctx, void* ps, grpc_error* error) { - grpc_pollset_destroy(exec_ctx, static_cast(ps)); +static void shutdown_ps(void* ps, grpc_error* error) { + grpc_pollset_destroy(static_cast(ps)); } static void BM_CreateDestroyPollset(benchmark::State& state) { @@ -50,7 +50,7 @@ static void BM_CreateDestroyPollset(benchmark::State& state) { size_t ps_sz = grpc_pollset_size(); grpc_pollset* ps = static_cast(gpr_malloc(ps_sz)); gpr_mu* mu; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_closure shutdown_ps_closure; GRPC_CLOSURE_INIT(&shutdown_ps_closure, shutdown_ps, ps, grpc_schedule_on_exec_ctx); @@ -58,11 +58,11 @@ static void BM_CreateDestroyPollset(benchmark::State& state) { memset(ps, 0, ps_sz); grpc_pollset_init(ps, &mu); gpr_mu_lock(mu); - grpc_pollset_shutdown(&exec_ctx, ps, &shutdown_ps_closure); + grpc_pollset_shutdown(ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); } - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_free(ps); track_counters.Finish(state); } @@ -114,17 +114,17 @@ static void BM_PollEmptyPollset(benchmark::State& state) { grpc_pollset* ps = static_cast(gpr_zalloc(ps_sz)); gpr_mu* mu; grpc_pollset_init(ps, &mu); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_mu_lock(mu); while (state.KeepRunning()) { - GRPC_ERROR_UNREF(grpc_pollset_work(&exec_ctx, ps, nullptr, 0)); + GRPC_ERROR_UNREF(grpc_pollset_work(ps, nullptr, 0)); } grpc_closure shutdown_ps_closure; GRPC_CLOSURE_INIT(&shutdown_ps_closure, shutdown_ps, ps, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, ps, &shutdown_ps_closure); + grpc_pollset_shutdown(ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_free(ps); track_counters.Finish(state); } @@ -136,24 +136,23 @@ static void BM_PollAddFd(benchmark::State& state) { grpc_pollset* ps = static_cast(gpr_zalloc(ps_sz)); gpr_mu* mu; grpc_pollset_init(ps, &mu); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_wakeup_fd wakeup_fd; GPR_ASSERT( GRPC_LOG_IF_ERROR("wakeup_fd_init", grpc_wakeup_fd_init(&wakeup_fd))); grpc_fd* fd = grpc_fd_create(wakeup_fd.read_fd, "xxx"); while (state.KeepRunning()) { - grpc_pollset_add_fd(&exec_ctx, ps, fd); - grpc_exec_ctx_flush(&exec_ctx); + grpc_pollset_add_fd(ps, fd); + grpc_core::ExecCtx::Get()->Flush(); } - grpc_fd_orphan(&exec_ctx, fd, nullptr, nullptr, false /* already_closed */, - "xxx"); + grpc_fd_orphan(fd, nullptr, nullptr, false /* already_closed */, "xxx"); grpc_closure shutdown_ps_closure; GRPC_CLOSURE_INIT(&shutdown_ps_closure, shutdown_ps, ps, grpc_schedule_on_exec_ctx); gpr_mu_lock(mu); - grpc_pollset_shutdown(&exec_ctx, ps, &shutdown_ps_closure); + grpc_pollset_shutdown(ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); gpr_free(ps); track_counters.Finish(state); } @@ -170,7 +169,7 @@ Closure* MakeClosure(F f, grpc_closure_scheduler* scheduler) { C(F f, grpc_closure_scheduler* scheduler) : f_(f) { GRPC_CLOSURE_INIT(this, C::cbfn, this, scheduler); } - static void cbfn(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { + static void cbfn(void* arg, grpc_error* error) { C* p = static_cast(arg); p->f_(); } @@ -219,11 +218,11 @@ static void BM_SingleThreadPollOneFd(benchmark::State& state) { grpc_pollset* ps = static_cast(gpr_zalloc(ps_sz)); gpr_mu* mu; grpc_pollset_init(ps, &mu); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; grpc_wakeup_fd wakeup_fd; GRPC_ERROR_UNREF(grpc_wakeup_fd_init(&wakeup_fd)); grpc_fd* wakeup = grpc_fd_create(wakeup_fd.read_fd, "wakeup_read"); - grpc_pollset_add_fd(&exec_ctx, ps, wakeup); + grpc_pollset_add_fd(ps, wakeup); bool done = false; Closure* continue_closure = MakeClosure( [&]() { @@ -233,25 +232,23 @@ static void BM_SingleThreadPollOneFd(benchmark::State& state) { return; } GRPC_ERROR_UNREF(grpc_wakeup_fd_wakeup(&wakeup_fd)); - grpc_fd_notify_on_read(&exec_ctx, wakeup, continue_closure); + grpc_fd_notify_on_read(wakeup, continue_closure); }, grpc_schedule_on_exec_ctx); GRPC_ERROR_UNREF(grpc_wakeup_fd_wakeup(&wakeup_fd)); - grpc_fd_notify_on_read(&exec_ctx, wakeup, continue_closure); + grpc_fd_notify_on_read(wakeup, continue_closure); gpr_mu_lock(mu); while (!done) { - GRPC_ERROR_UNREF( - grpc_pollset_work(&exec_ctx, ps, nullptr, GRPC_MILLIS_INF_FUTURE)); + GRPC_ERROR_UNREF(grpc_pollset_work(ps, nullptr, GRPC_MILLIS_INF_FUTURE)); } - grpc_fd_orphan(&exec_ctx, wakeup, nullptr, nullptr, - false /* already_closed */, "done"); + grpc_fd_orphan(wakeup, nullptr, nullptr, false /* already_closed */, "done"); wakeup_fd.read_fd = 0; grpc_closure shutdown_ps_closure; GRPC_CLOSURE_INIT(&shutdown_ps_closure, shutdown_ps, ps, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(&exec_ctx, ps, &shutdown_ps_closure); + grpc_pollset_shutdown(ps, &shutdown_ps_closure); gpr_mu_unlock(mu); - grpc_exec_ctx_finish(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); grpc_wakeup_fd_destroy(&wakeup_fd); gpr_free(ps); track_counters.Finish(state); diff --git a/test/cpp/microbenchmarks/fullstack_fixtures.h b/test/cpp/microbenchmarks/fullstack_fixtures.h index 7e20843875b..d1ede755a58 100644 --- a/test/cpp/microbenchmarks/fullstack_fixtures.h +++ b/test/cpp/microbenchmarks/fullstack_fixtures.h @@ -166,7 +166,7 @@ class EndpointPairFixture : public BaseFixture { fixture_configuration.ApplyCommonServerBuilderConfig(&b); server_ = b.BuildAndStart(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; /* add server endpoint to server_ * */ @@ -174,20 +174,19 @@ class EndpointPairFixture : public BaseFixture { const grpc_channel_args* server_args = grpc_server_get_channel_args(server_->c_server()); server_transport_ = grpc_create_chttp2_transport( - &exec_ctx, server_args, endpoints.server, false /* is_client */); + server_args, endpoints.server, false /* is_client */); grpc_pollset** pollsets; size_t num_pollsets = 0; grpc_server_get_pollsets(server_->c_server(), &pollsets, &num_pollsets); for (size_t i = 0; i < num_pollsets; i++) { - grpc_endpoint_add_to_pollset(&exec_ctx, endpoints.server, pollsets[i]); + grpc_endpoint_add_to_pollset(endpoints.server, pollsets[i]); } - grpc_server_setup_transport(&exec_ctx, server_->c_server(), - server_transport_, nullptr, server_args); - grpc_chttp2_transport_start_reading(&exec_ctx, server_transport_, nullptr, - nullptr); + grpc_server_setup_transport(server_->c_server(), server_transport_, + nullptr, server_args); + grpc_chttp2_transport_start_reading(server_transport_, nullptr, nullptr); } /* create channel */ @@ -197,19 +196,15 @@ class EndpointPairFixture : public BaseFixture { fixture_configuration.ApplyCommonChannelArguments(&args); grpc_channel_args c_args = args.c_channel_args(); - client_transport_ = grpc_create_chttp2_transport(&exec_ctx, &c_args, - endpoints.client, true); + client_transport_ = + grpc_create_chttp2_transport(&c_args, endpoints.client, true); GPR_ASSERT(client_transport_); - grpc_channel* channel = - grpc_channel_create(&exec_ctx, "target", &c_args, - GRPC_CLIENT_DIRECT_CHANNEL, client_transport_); - grpc_chttp2_transport_start_reading(&exec_ctx, client_transport_, nullptr, - nullptr); + grpc_channel* channel = grpc_channel_create( + "target", &c_args, GRPC_CLIENT_DIRECT_CHANNEL, client_transport_); + grpc_chttp2_transport_start_reading(client_transport_, nullptr, nullptr); channel_ = CreateChannelInternal("", channel); } - - grpc_exec_ctx_finish(&exec_ctx); } virtual ~EndpointPairFixture() { diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc index 6f1f0c44b90..3481d9d1aaf 100644 --- a/test/cpp/naming/resolver_component_test.cc +++ b/test/cpp/naming/resolver_component_test.cc @@ -149,33 +149,33 @@ struct ArgsStruct { std::string expected_lb_policy; }; -void ArgsInit(grpc_exec_ctx* exec_ctx, ArgsStruct* args) { +void ArgsInit(ArgsStruct* args) { gpr_event_init(&args->ev); args->pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size()); grpc_pollset_init(args->pollset, &args->mu); args->pollset_set = grpc_pollset_set_create(); - grpc_pollset_set_add_pollset(exec_ctx, args->pollset_set, args->pollset); + grpc_pollset_set_add_pollset(args->pollset_set, args->pollset); args->lock = grpc_combiner_create(); gpr_atm_rel_store(&args->done_atm, 0); args->channel_args = nullptr; } -void DoNothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {} +void DoNothing(void* arg, grpc_error* error) {} -void ArgsFinish(grpc_exec_ctx* exec_ctx, ArgsStruct* args) { +void ArgsFinish(ArgsStruct* args) { GPR_ASSERT(gpr_event_wait(&args->ev, TestDeadline())); - grpc_pollset_set_del_pollset(exec_ctx, args->pollset_set, args->pollset); - grpc_pollset_set_destroy(exec_ctx, args->pollset_set); + grpc_pollset_set_del_pollset(args->pollset_set, args->pollset); + grpc_pollset_set_destroy(args->pollset_set); grpc_closure DoNothing_cb; GRPC_CLOSURE_INIT(&DoNothing_cb, DoNothing, nullptr, grpc_schedule_on_exec_ctx); - grpc_pollset_shutdown(exec_ctx, args->pollset, &DoNothing_cb); + grpc_pollset_shutdown(args->pollset, &DoNothing_cb); // exec_ctx needs to be flushed before calling grpc_pollset_destroy() - grpc_channel_args_destroy(exec_ctx, args->channel_args); - grpc_exec_ctx_flush(exec_ctx); - grpc_pollset_destroy(exec_ctx, args->pollset); + grpc_channel_args_destroy(args->channel_args); + grpc_core::ExecCtx::Get()->Flush(); + grpc_pollset_destroy(args->pollset); gpr_free(args->pollset); - GRPC_COMBINER_UNREF(exec_ctx, args->lock, NULL); + GRPC_COMBINER_UNREF(args->lock, nullptr); } gpr_timespec NSecondDeadline(int seconds) { @@ -196,14 +196,13 @@ void PollPollsetUntilRequestDone(ArgsStruct* args) { time_left.tv_sec, time_left.tv_nsec); GPR_ASSERT(gpr_time_cmp(time_left, gpr_time_0(GPR_TIMESPAN)) >= 0); grpc_pollset_worker* worker = nullptr; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_mu_lock(args->mu); GRPC_LOG_IF_ERROR("pollset_work", - grpc_pollset_work(&exec_ctx, args->pollset, &worker, + grpc_pollset_work(args->pollset, &worker, grpc_timespec_to_millis_round_up( NSecondDeadline(1)))); gpr_mu_unlock(args->mu); - grpc_exec_ctx_finish(&exec_ctx); } gpr_event_set(&args->ev, (void*)1); } @@ -235,8 +234,7 @@ void CheckLBPolicyResultLocked(grpc_channel_args* channel_args, } } -void CheckResolverResultLocked(grpc_exec_ctx* exec_ctx, void* argsp, - grpc_error* err) { +void CheckResolverResultLocked(void* argsp, grpc_error* err) { ArgsStruct* args = (ArgsStruct*)argsp; grpc_channel_args* channel_args = args->channel_args; const grpc_arg* channel_arg = @@ -272,15 +270,14 @@ void CheckResolverResultLocked(grpc_exec_ctx* exec_ctx, void* argsp, } gpr_atm_rel_store(&args->done_atm, 1); gpr_mu_lock(args->mu); - GRPC_LOG_IF_ERROR("pollset_kick", - grpc_pollset_kick(exec_ctx, args->pollset, nullptr)); + GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(args->pollset, nullptr)); gpr_mu_unlock(args->mu); } TEST(ResolverComponentTest, TestResolvesRelevantRecords) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; ArgsStruct args; - ArgsInit(&exec_ctx, &args); + ArgsInit(&args); args.expected_addrs = ParseExpectedAddrs(FLAGS_expected_addrs); args.expected_service_config_string = FLAGS_expected_chosen_service_config; args.expected_lb_policy = FLAGS_expected_lb_policy; @@ -290,19 +287,18 @@ TEST(ResolverComponentTest, TestResolvesRelevantRecords) { FLAGS_local_dns_server_address.c_str(), FLAGS_target_name.c_str())); // create resolver and resolve - grpc_resolver* resolver = grpc_resolver_create(&exec_ctx, whole_uri, nullptr, - args.pollset_set, args.lock); + grpc_resolver* resolver = + grpc_resolver_create(whole_uri, nullptr, args.pollset_set, args.lock); gpr_free(whole_uri); grpc_closure on_resolver_result_changed; GRPC_CLOSURE_INIT(&on_resolver_result_changed, CheckResolverResultLocked, (void*)&args, grpc_combiner_scheduler(args.lock)); - grpc_resolver_next_locked(&exec_ctx, resolver, &args.channel_args, + grpc_resolver_next_locked(resolver, &args.channel_args, &on_resolver_result_changed); - grpc_exec_ctx_flush(&exec_ctx); + grpc_core::ExecCtx::Get()->Flush(); PollPollsetUntilRequestDone(&args); - GRPC_RESOLVER_UNREF(&exec_ctx, resolver, NULL); - ArgsFinish(&exec_ctx, &args); - grpc_exec_ctx_finish(&exec_ctx); + GRPC_RESOLVER_UNREF(resolver, nullptr); + ArgsFinish(&args); } } // namespace diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc index 1c6f44dd7d0..0b9dc83f2b1 100644 --- a/test/cpp/performance/writes_per_rpc_test.cc +++ b/test/cpp/performance/writes_per_rpc_test.cc @@ -82,27 +82,26 @@ class EndpointPairFixture { ApplyCommonServerBuilderConfig(&b); server_ = b.BuildAndStart(); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; /* add server endpoint to server_ */ { const grpc_channel_args* server_args = grpc_server_get_channel_args(server_->c_server()); grpc_transport* transport = grpc_create_chttp2_transport( - &exec_ctx, server_args, endpoints.server, false /* is_client */); + server_args, endpoints.server, false /* is_client */); grpc_pollset** pollsets; size_t num_pollsets = 0; grpc_server_get_pollsets(server_->c_server(), &pollsets, &num_pollsets); for (size_t i = 0; i < num_pollsets; i++) { - grpc_endpoint_add_to_pollset(&exec_ctx, endpoints.server, pollsets[i]); + grpc_endpoint_add_to_pollset(endpoints.server, pollsets[i]); } - grpc_server_setup_transport(&exec_ctx, server_->c_server(), transport, - nullptr, server_args); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, - nullptr); + grpc_server_setup_transport(server_->c_server(), transport, nullptr, + server_args); + grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); } /* create channel */ @@ -112,18 +111,15 @@ class EndpointPairFixture { ApplyCommonChannelArguments(&args); grpc_channel_args c_args = args.c_channel_args(); - grpc_transport* transport = grpc_create_chttp2_transport( - &exec_ctx, &c_args, endpoints.client, true); + grpc_transport* transport = + grpc_create_chttp2_transport(&c_args, endpoints.client, true); GPR_ASSERT(transport); grpc_channel* channel = grpc_channel_create( - &exec_ctx, "target", &c_args, GRPC_CLIENT_DIRECT_CHANNEL, transport); - grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr, - nullptr); + "target", &c_args, GRPC_CLIENT_DIRECT_CHANNEL, transport); + grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); channel_ = CreateChannelInternal("", channel); } - - grpc_exec_ctx_finish(&exec_ctx); } virtual ~EndpointPairFixture() { diff --git a/test/cpp/server/server_builder_test.cc b/test/cpp/server/server_builder_test.cc index d18459cec9d..694ce549c06 100644 --- a/test/cpp/server/server_builder_test.cc +++ b/test/cpp/server/server_builder_test.cc @@ -22,6 +22,8 @@ #include #include +#include + #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" @@ -77,5 +79,8 @@ TEST(ServerBuilderTest, CreateServerRepeatedPortWithDisallowedReusePort) { int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); + grpc_init(); + int ret = RUN_ALL_TESTS(); + grpc_shutdown(); + return ret; } diff --git a/test/cpp/util/byte_buffer_test.cc b/test/cpp/util/byte_buffer_test.cc index 8fb51bc6635..d603b289c88 100644 --- a/test/cpp/util/byte_buffer_test.cc +++ b/test/cpp/util/byte_buffer_test.cc @@ -22,6 +22,7 @@ #include #include +#include #include #include @@ -109,5 +110,8 @@ TEST_F(ByteBufferTest, SerializationMakesCopy) { int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); + grpc_init(); + int ret = RUN_ALL_TESTS(); + grpc_shutdown(); + return ret; } diff --git a/test/cpp/util/slice_test.cc b/test/cpp/util/slice_test.cc index 8a8962d7ee0..c2e55f3374f 100644 --- a/test/cpp/util/slice_test.cc +++ b/test/cpp/util/slice_test.cc @@ -18,6 +18,7 @@ #include +#include #include #include @@ -127,5 +128,8 @@ TEST_F(SliceTest, Cslice) { int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); + grpc_init(); + int ret = RUN_ALL_TESTS(); + grpc_shutdown(); + return ret; } diff --git a/tools/codegen/core/gen_static_metadata.py b/tools/codegen/core/gen_static_metadata.py index 355f3f4e232..7847b8ed1de 100755 --- a/tools/codegen/core/gen_static_metadata.py +++ b/tools/codegen/core/gen_static_metadata.py @@ -395,7 +395,7 @@ print >> C, 'static uint8_t g_bytes[] = {%s};' % ( ','.join('%d' % ord(c) for c in ''.join(all_strs))) print >> C print >> C, 'static void static_ref(void *unused) {}' -print >> C, 'static void static_unref(grpc_exec_ctx *exec_ctx, void *unused) {}' +print >> C, 'static void static_unref(void *unused) {}' print >> C, ('static const grpc_slice_refcount_vtable static_sub_vtable = ' '{static_ref, static_unref, grpc_slice_default_eq_impl, ' 'grpc_slice_default_hash_impl};') diff --git a/tools/codegen/core/gen_stats_data.py b/tools/codegen/core/gen_stats_data.py index 072a6776152..d439d99a8c6 100755 --- a/tools/codegen/core/gen_stats_data.py +++ b/tools/codegen/core/gen_stats_data.py @@ -150,11 +150,11 @@ def gen_bucket_code(histogram): code = 'value = GPR_CLAMP(value, 0, %d);\n' % histogram.max map_table = gen_map_table(code_bounds[first_nontrivial:], shift_data) if first_nontrivial is None: - code += ('GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_%s, value);\n' + code += ('GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_%s, value);\n' % histogram.name.upper()) else: code += 'if (value < %d) {\n' % first_nontrivial - code += ('GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_%s, value);\n' + code += ('GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_%s, value);\n' % histogram.name.upper()) code += 'return;\n' code += '}' @@ -168,11 +168,11 @@ def gen_bucket_code(histogram): code += 'grpc_stats_table_%d[((_val.uint - %dull) >> %d)] + %d;\n' % (map_table_idx, first_nontrivial_code, shift_data[0], first_nontrivial) code += '_bkt.dbl = grpc_stats_table_%d[bucket];\n' % bounds_idx code += 'bucket -= (_val.uint < _bkt.uint);\n' - code += 'GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_%s, bucket);\n' % histogram.name.upper() + code += 'GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_%s, bucket);\n' % histogram.name.upper() code += 'return;\n' code += '}\n' - code += 'GRPC_STATS_INC_HISTOGRAM((exec_ctx), GRPC_STATS_HISTOGRAM_%s, '% histogram.name.upper() - code += 'grpc_stats_histo_find_bucket_slow((exec_ctx), value, grpc_stats_table_%d, %d));\n' % (bounds_idx, histogram.buckets) + code += 'GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_%s, '% histogram.name.upper() + code += 'grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_%d, %d));\n' % (bounds_idx, histogram.buckets) return (code, bounds_idx) # utility: print a big comment block into a set of files @@ -240,13 +240,13 @@ with open('src/core/lib/debug/stats_data.h', 'w') as H: print >>H, "} grpc_stats_histogram_constants;" for ctr in inst_map['Counter']: - print >>H, ("#define GRPC_STATS_INC_%s(exec_ctx) " + - "GRPC_STATS_INC_COUNTER((exec_ctx), GRPC_STATS_COUNTER_%s)") % ( + print >>H, ("#define GRPC_STATS_INC_%s() " + + "GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_%s)") % ( ctr.name.upper(), ctr.name.upper()) for histogram in inst_map['Histogram']: - print >>H, "#define GRPC_STATS_INC_%s(exec_ctx, value) grpc_stats_inc_%s((exec_ctx), (int)(value))" % ( + print >>H, "#define GRPC_STATS_INC_%s(value) grpc_stats_inc_%s( (int)(value))" % ( histogram.name.upper(), histogram.name.lower()) - print >>H, "void grpc_stats_inc_%s(grpc_exec_ctx *exec_ctx, int x);" % histogram.name.lower() + print >>H, "void grpc_stats_inc_%s(int x);" % histogram.name.lower() for i, tbl in enumerate(static_tables): print >>H, "extern const %s grpc_stats_table_%d[%d];" % (tbl[0], i, len(tbl[1])) @@ -254,7 +254,7 @@ with open('src/core/lib/debug/stats_data.h', 'w') as H: print >>H, "extern const int grpc_stats_histo_buckets[%d];" % len(inst_map['Histogram']) print >>H, "extern const int grpc_stats_histo_start[%d];" % len(inst_map['Histogram']) print >>H, "extern const int *const grpc_stats_histo_bucket_boundaries[%d];" % len(inst_map['Histogram']) - print >>H, "extern void (*const grpc_stats_inc_histogram[%d])(grpc_exec_ctx *exec_ctx, int x);" % len(inst_map['Histogram']) + print >>H, "extern void (*const grpc_stats_inc_histogram[%d])(int x);" % len(inst_map['Histogram']) print >>H print >>H, "#ifdef __cplusplus" @@ -309,7 +309,7 @@ with open('src/core/lib/debug/stats_data.cc', 'w') as C: tbl[0], i, len(tbl[1]), ','.join('%s' % x for x in tbl[1])) for histogram, code in zip(inst_map['Histogram'], histo_code): - print >>C, ("void grpc_stats_inc_%s(grpc_exec_ctx *exec_ctx, int value) {%s}") % ( + print >>C, ("void grpc_stats_inc_%s(int value) {%s}") % ( histogram.name.lower(), code) @@ -319,7 +319,7 @@ with open('src/core/lib/debug/stats_data.cc', 'w') as C: len(inst_map['Histogram']), ','.join('%s' % x for x in histo_start)) print >>C, "const int *const grpc_stats_histo_bucket_boundaries[%d] = {%s};" % ( len(inst_map['Histogram']), ','.join('grpc_stats_table_%d' % x for x in histo_bucket_boundaries)) - print >>C, "void (*const grpc_stats_inc_histogram[%d])(grpc_exec_ctx *exec_ctx, int x) = {%s};" % ( + print >>C, "void (*const grpc_stats_inc_histogram[%d])(int x) = {%s};" % ( len(inst_map['Histogram']), ','.join('grpc_stats_inc_%s' % histogram.name.lower() for histogram in inst_map['Histogram'])) # patch qps_test bigquery schema From da320606e192c09cb74bc74401ed4671cf1a6753 Mon Sep 17 00:00:00 2001 From: Juanli Shen Date: Wed, 6 Dec 2017 11:47:41 -0800 Subject: [PATCH 057/127] Remove unreachable code in RR --- .../lb_policy/round_robin/round_robin.cc | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc index 31a26bc2cee..c05557ba6f7 100644 --- a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +++ b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc @@ -368,17 +368,13 @@ static void update_lb_connectivity_status_locked(grpc_exec_ctx* exec_ctx, * 4) RULE: ALL subchannels are SHUTDOWN or TRANSIENT_FAILURE => policy is * TRANSIENT_FAILURE. * CHECK: subchannel_list->num_shutdown + - subchannel_list->num_transient_failures == - subchannel_list->num_subchannels. - * - * 5) RULE: ALL subchannels are IDLE => policy is IDLE. - * CHECK: subchannel_list->num_idle == subchannel_list->num_subchannels. - * (Note that all the subchannels will transition from IDLE to CONNECTING - * in batch when we start trying to connect.) + * subchannel_list->num_transient_failures == + * subchannel_list->num_subchannels. */ // TODO(juanlishen): For rule 4, we may want to re-resolve instead. grpc_lb_subchannel_list* subchannel_list = sd->subchannel_list; round_robin_lb_policy* p = (round_robin_lb_policy*)subchannel_list->policy; + GPR_ASSERT(sd->curr_connectivity_state != GRPC_CHANNEL_IDLE); if (subchannel_list->num_ready > 0) { /* 1) READY */ grpc_connectivity_state_set(exec_ctx, &p->state_tracker, GRPC_CHANNEL_READY, @@ -404,10 +400,6 @@ static void update_lb_connectivity_status_locked(grpc_exec_ctx* exec_ctx, grpc_connectivity_state_set(exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, GRPC_ERROR_REF(error), "rr_transient_failure"); - } else if (subchannel_list->num_idle == subchannel_list->num_subchannels) { - /* 5) IDLE */ - grpc_connectivity_state_set(exec_ctx, &p->state_tracker, GRPC_CHANNEL_IDLE, - GRPC_ERROR_NONE, "rr_idle"); } GRPC_ERROR_UNREF(error); } From d5ca876b6de1588a4387a2ef84740d8bae79cfbe Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Wed, 6 Dec 2017 12:40:41 -0800 Subject: [PATCH 058/127] Fixed ClientLbEnd2endTest.RoundRobinReresolve flakiness --- test/cpp/end2end/client_lb_end2end_test.cc | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index f8bb12fde1b..c09a324bf10 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -573,15 +573,28 @@ TEST_F(ClientLbEnd2endTest, RoundRobinReresolve) { CheckRpcSendOk(); } // Kill all servers + gpr_log(GPR_INFO, "****** ABOUT TO KILL SERVERS *******"); for (size_t i = 0; i < servers_.size(); ++i) { servers_[i]->Shutdown(false); } - // Client request should fail. - CheckRpcSendFailure(); + gpr_log(GPR_INFO, "****** SERVERS KILLED *******"); + gpr_log(GPR_INFO, "****** SENDING DOOMED REQUESTS *******"); + // Client requests should fail. Send enough to tickle all subchannels. + for (size_t i = 0; i < servers_.size(); ++i) CheckRpcSendFailure(); + gpr_log(GPR_INFO, "****** DOOMED REQUESTS SENT *******"); // Bring servers back up on the same port (we aren't recreating the channel). + gpr_log(GPR_INFO, "****** RESTARTING SERVERS *******"); StartServers(kNumServers, ports); - // Client request should succeed. - CheckRpcSendOk(); + gpr_log(GPR_INFO, "****** SERVERS RESTARTED *******"); + gpr_log(GPR_INFO, "****** SENDING REQUEST TO SUCCEED *******"); + // Client request should eventually (but still fairly soon) succeed. + bool call_succeeded = false; + for (gpr_timespec deadline = grpc_timeout_seconds_to_deadline(5); + gpr_time_cmp(deadline, gpr_now(GPR_CLOCK_MONOTONIC)) > 0;) { + call_succeeded = SendRpc().ok(); + if (call_succeeded) break; + } + GPR_ASSERT(call_succeeded); } } // namespace From 625a5c05456a3001ecd4519b133aecd61e5b333b Mon Sep 17 00:00:00 2001 From: Yuchen Zeng Date: Wed, 6 Dec 2017 13:24:27 -0800 Subject: [PATCH 059/127] Fix pending pings in grpclb --- .../client_channel/lb_policy/grpclb/grpclb.cc | 49 ++++++++++++++++--- 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index a6972b850f0..704cbd8a3b6 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -276,15 +276,28 @@ typedef struct pending_ping { struct pending_ping* next; /* args for sending the ping */ - grpc_closure* on_initiate; - grpc_closure* on_ack; + wrapped_rr_closure_arg* on_initiate; + wrapped_rr_closure_arg* on_ack; } pending_ping; static void add_pending_ping(pending_ping** root, grpc_closure* on_initiate, grpc_closure* on_ack) { pending_ping* pping = (pending_ping*)gpr_zalloc(sizeof(*pping)); - pping->on_initiate = on_initiate; - pping->on_ack = on_ack; + if (on_initiate != nullptr) { + pping->on_initiate = + (wrapped_rr_closure_arg*)gpr_zalloc(sizeof(*pping->on_initiate)); + pping->on_initiate->wrapped_closure = on_initiate; + pping->on_initiate->free_when_done = pping->on_initiate; + GRPC_CLOSURE_INIT(&pping->on_initiate->wrapper_closure, wrapped_rr_closure, + &pping->on_initiate, grpc_schedule_on_exec_ctx); + } + if (on_ack != nullptr) { + pping->on_ack = (wrapped_rr_closure_arg*)gpr_zalloc(sizeof(*pping->on_ack)); + pping->on_ack->wrapped_closure = on_ack; + pping->on_ack->free_when_done = pping->on_ack; + GRPC_CLOSURE_INIT(&pping->on_ack->wrapper_closure, wrapped_rr_closure, + &pping->on_ack, grpc_schedule_on_exec_ctx); + } pping->next = *root; *root = pping; } @@ -821,12 +834,24 @@ static void create_rr_locked(grpc_exec_ctx* exec_ctx, glb_lb_policy* glb_policy, pending_ping* pping; while ((pping = glb_policy->pending_pings)) { glb_policy->pending_pings = pping->next; + grpc_closure* on_initiate = nullptr; + grpc_closure* on_ack = nullptr; + if (pping->on_initiate != nullptr) { + GRPC_LB_POLICY_REF(glb_policy->rr_policy, "rr_handover_pending_ping"); + pping->on_initiate->rr_policy = glb_policy->rr_policy; + on_initiate = &pping->on_initiate->wrapper_closure; + } + if (pping->on_ack != nullptr) { + GRPC_LB_POLICY_REF(glb_policy->rr_policy, "rr_handover_pending_ping"); + pping->on_ack->rr_policy = glb_policy->rr_policy; + on_ack = &pping->on_ack->wrapper_closure; + } if (grpc_lb_glb_trace.enabled()) { gpr_log(GPR_INFO, "[grpclb %p] Pending ping about to PING from RR %p", glb_policy, glb_policy->rr_policy); } - grpc_lb_policy_ping_one_locked(exec_ctx, glb_policy->rr_policy, - pping->on_initiate, pping->on_ack); + grpc_lb_policy_ping_one_locked(exec_ctx, glb_policy->rr_policy, on_initiate, + on_ack); gpr_free(pping); } } @@ -1050,8 +1075,16 @@ static void glb_shutdown_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol) { while (pping != nullptr) { pending_ping* next = pping->next; - GRPC_CLOSURE_SCHED(exec_ctx, pping->on_initiate, GRPC_ERROR_REF(error)); - GRPC_CLOSURE_SCHED(exec_ctx, pping->on_ack, GRPC_ERROR_REF(error)); + if (pping->on_initiate != nullptr) { + GRPC_CLOSURE_SCHED(exec_ctx, &pping->on_initiate->wrapper_closure, + GRPC_ERROR_REF(error)); + gpr_free(pping->on_initiate); + } + if (pping->on_ack != nullptr) { + GRPC_CLOSURE_SCHED(exec_ctx, &pping->on_ack->wrapper_closure, + GRPC_ERROR_REF(error)); + gpr_free(pping->on_ack); + } gpr_free(pping); pping = next; } From 8426329120a4a0abaf46c68abf35e53515149995 Mon Sep 17 00:00:00 2001 From: Alex Polcyn Date: Wed, 15 Nov 2017 00:32:50 +0000 Subject: [PATCH 060/127] Apply patches to ruby 101 docker image during upload script, for compatibility tests. --- tools/interop_matrix/client_matrix.py | 139 ++++++++++-------- tools/interop_matrix/create_matrix_images.py | 39 ++++- tools/interop_matrix/patches/README.md | 38 +++++ .../patches/ruby_v1.0.1/git_repo.patch | 34 +++++ .../run_interop_matrix_tests.py | 6 +- tools/interop_matrix/testcases/ruby__v1.0.1 | 20 +++ 6 files changed, 207 insertions(+), 69 deletions(-) create mode 100644 tools/interop_matrix/patches/README.md create mode 100644 tools/interop_matrix/patches/ruby_v1.0.1/git_repo.patch create mode 100755 tools/interop_matrix/testcases/ruby__v1.0.1 diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py index c9a4996029a..7b02f51725c 100644 --- a/tools/interop_matrix/client_matrix.py +++ b/tools/interop_matrix/client_matrix.py @@ -23,6 +23,18 @@ def get_github_repo(lang): # all other languages use the grpc.git repo. }.get(lang, 'git@github.com:grpc/grpc.git') +def get_release_tags(lang): + return map(lambda r: get_release_tag_name(r), LANG_RELEASE_MATRIX[lang]) + +def get_release_tag_name(release_info): + assert len(release_info.keys()) == 1 + return release_info.keys()[0] + +def should_build_docker_interop_image_from_release_tag(lang): + if lang in ['go', 'java', 'node']: + return False + return True + # Dictionary of runtimes per language LANG_RUNTIME_MATRIX = { 'cxx': ['cxx'], # This is actually debian8. @@ -39,81 +51,84 @@ LANG_RUNTIME_MATRIX = { # a release tag pointing to the latest build of the branch. LANG_RELEASE_MATRIX = { 'cxx': [ - 'v1.0.1', - 'v1.1.4', - 'v1.2.5', - 'v1.3.9', - 'v1.4.2', - 'v1.6.6', - 'v1.7.2', + {'v1.0.1': None}, + {'v1.1.4': None}, + {'v1.2.5': None}, + {'v1.3.9': None}, + {'v1.4.2': None}, + {'v1.6.6': None}, + {'v1.7.2': None}, ], 'go': [ - 'v1.0.5', - 'v1.2.1', - 'v1.3.0', - 'v1.4.2', - 'v1.5.2', - 'v1.6.0', - 'v1.7.0', - 'v1.7.1', - 'v1.7.2', - 'v1.7.3', - 'v1.8.0', + {'v1.0.5': None}, + {'v1.2.1': None}, + {'v1.3.0': None}, + {'v1.4.2': None}, + {'v1.5.2': None}, + {'v1.6.0': None}, + {'v1.7.0': None}, + {'v1.7.1': None}, + {'v1.7.2': None}, + {'v1.7.3': None}, + {'v1.8.0': None}, ], 'java': [ - 'v1.0.3', - 'v1.1.2', - 'v1.2.0', - 'v1.3.1', - 'v1.4.0', - 'v1.5.0', - 'v1.6.1', - 'v1.7.0', - 'v1.8.0', + {'v1.0.3': None}, + {'v1.1.2': None}, + {'v1.2.0': None}, + {'v1.3.1': None}, + {'v1.4.0': None}, + {'v1.5.0': None}, + {'v1.6.1': None}, + {'v1.7.0': None}, + {'v1.8.0': None}, ], 'python': [ - 'v1.0.x', - 'v1.1.4', - 'v1.2.5', - 'v1.3.9', - 'v1.4.2', - 'v1.6.6', - 'v1.7.2', + {'v1.0.x': None}, + {'v1.1.4': None}, + {'v1.2.5': None}, + {'v1.3.9': None}, + {'v1.4.2': None}, + {'v1.6.6': None}, + {'v1.7.2': None}, ], 'node': [ - 'v1.0.1', - 'v1.1.4', - 'v1.2.5', - 'v1.3.9', - 'v1.4.2', - 'v1.6.6', - #'v1.7.1', Failing tests. + {'v1.0.1': None}, + {'v1.1.4': None}, + {'v1.2.5': None}, + {'v1.3.9': None}, + {'v1.4.2': None}, + {'v1.6.6': None}, + #{'v1.7.1': None}, Failing tests ], 'ruby': [ - # Ruby v1.0.x doesn't have the fix #8914, therefore not supported. - 'v1.1.4', - 'v1.2.5', - 'v1.3.9', - 'v1.4.2', - 'v1.6.6', - 'v1.7.2', + {'v1.0.1': {'patch': [ + 'tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile', + 'tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh', + ]}}, + {'v1.1.4': None}, + {'v1.2.5': None}, + {'v1.3.9': None}, + {'v1.4.2': None}, + {'v1.6.6': None}, + {'v1.7.2': None}, ], 'php': [ - 'v1.0.1', - 'v1.1.4', - 'v1.2.5', - 'v1.3.9', - 'v1.4.2', - 'v1.6.6', - 'v1.7.2', + {'v1.0.1': None}, + {'v1.1.4': None}, + {'v1.2.5': None}, + {'v1.3.9': None}, + {'v1.4.2': None}, + {'v1.6.6': None}, + {'v1.7.2': None}, ], 'csharp': [ - #'v1.0.1', - 'v1.1.4', - 'v1.2.5', - 'v1.3.9', - 'v1.4.2', - 'v1.6.6', - 'v1.7.2', + #{'v1.0.1': None}, + {'v1.1.4': None}, + {'v1.2.5': None}, + {'v1.3.9': None}, + {'v1.4.2': None}, + {'v1.6.6': None}, + {'v1.7.2': None}, ], } diff --git a/tools/interop_matrix/create_matrix_images.py b/tools/interop_matrix/create_matrix_images.py index 493a7d53647..a2923681319 100755 --- a/tools/interop_matrix/create_matrix_images.py +++ b/tools/interop_matrix/create_matrix_images.py @@ -39,7 +39,7 @@ _IMAGE_BUILDER = 'tools/run_tests/dockerize/build_interop_image.sh' _LANGUAGES = client_matrix.LANG_RUNTIME_MATRIX.keys() # All gRPC release tags, flattened, deduped and sorted. _RELEASES = sorted(list(set( - i for l in client_matrix.LANG_RELEASE_MATRIX.values() for i in l))) + client_matrix.get_release_tag_name(info) for lang in client_matrix.LANG_RELEASE_MATRIX.values() for info in lang))) # Destination directory inside docker image to keep extra info from build time. _BUILD_INFO = '/var/local/build_info' @@ -141,8 +141,11 @@ def build_image_jobspec(runtime, env, gcr_tag, stack_base): 'TTY_FLAG': '-t' } build_env.update(env) + image_builder_path = _IMAGE_BUILDER + if client_matrix.should_build_docker_interop_image_from_release_tag(lang): + image_builder_path = os.path.join(stack_base, _IMAGE_BUILDER) build_job = jobset.JobSpec( - cmdline=[_IMAGE_BUILDER], + cmdline=[image_builder_path], environ=build_env, shortname='build_docker_%s' % runtime, timeout_seconds=30*60) @@ -157,10 +160,10 @@ def build_all_images_for_lang(lang): releases = ['master'] else: if args.release == 'all': - releases = client_matrix.LANG_RELEASE_MATRIX[lang] + releases = client_matrix.get_release_tags(lang) else: # Build a particular release. - if args.release not in ['master'] + client_matrix.LANG_RELEASE_MATRIX[lang]: + if args.release not in ['master'] + client_matrix.get_release_tags(lang): jobset.message('SKIPPED', '%s for %s is not defined' % (args.release, lang), do_newline=True) @@ -223,6 +226,33 @@ def cleanup(): docker_images_cleanup = [] atexit.register(cleanup) +def maybe_apply_patches_on_git_tag(stack_base, lang, release): + files_to_patch = [] + for release_info in client_matrix.LANG_RELEASE_MATRIX[lang]: + if client_matrix.get_release_tag_name(release_info) == release: + files_to_patch = release_info[release].get('patch') + break + if not files_to_patch: + return + patch_file_relative_path = 'patches/%s_%s/git_repo.patch' % (lang, release) + patch_file = os.path.abspath(os.path.join(os.path.dirname(__file__), + patch_file_relative_path)) + if not os.path.exists(patch_file): + jobset.message('FAILED', 'expected patch file |%s| to exist' % patch_file) + sys.exit(1) + subprocess.check_output( + ['git', 'apply', patch_file], cwd=stack_base, stderr=subprocess.STDOUT) + for repo_relative_path in files_to_patch: + subprocess.check_output( + ['git', 'add', repo_relative_path], + cwd=stack_base, + stderr=subprocess.STDOUT) + subprocess.check_output( + ['git', 'commit', '-m', ('Hack performed on top of %s git ' + 'tag in order to build and run the %s ' + 'interop tests on that tag.' % (lang, release))], + cwd=stack_base, stderr=subprocess.STDOUT) + def checkout_grpc_stack(lang, release): """Invokes 'git check' for the lang/release and returns directory created.""" assert args.git_checkout and args.git_checkout_root @@ -252,6 +282,7 @@ def checkout_grpc_stack(lang, release): assert not os.path.dirname(__file__).startswith(stack_base) output = subprocess.check_output( ['git', 'checkout', release], cwd=stack_base, stderr=subprocess.STDOUT) + maybe_apply_patches_on_git_tag(stack_base, lang, release) commit_log = subprocess.check_output(['git', 'log', '-1'], cwd=stack_base) jobset.message('SUCCESS', 'git checkout', '%s: %s' % (str(output), commit_log), diff --git a/tools/interop_matrix/patches/README.md b/tools/interop_matrix/patches/README.md new file mode 100644 index 00000000000..0c0893f6f20 --- /dev/null +++ b/tools/interop_matrix/patches/README.md @@ -0,0 +1,38 @@ +# Patches to grpc repo tags for the backwards compatibility interop tests + +This directory has patch files that can be applied to different tags +of the grpc git repo in order to run the interop tests for a specific +language based on that tag. + +For example, because the ruby interop tests do not run on the v1.0.1 tag out +of the box, but we still want to test compatibility of the 1.0.1 ruby release +with other versions, we can apply a patch to the v1.0.1 tag from this directory +that makes the necessary changes that are needed to run the ruby interop tests +from that tag. We can then use that patch to build the docker image for the +ruby v1.0.1 interop tests. + +## How to add a new patch to this directory + +Patch files in this directory are meant to be applied to a git tag +with a `git apply` command. + +1. Under the `patches` directory, create a new subdirectory +titled `_` for the git tag being modified. + +2. `git checkout ` + +3. Make necessary modifications to the git repo at that tag. + +4. + +``` +git diff > ~/git_repo.patch +git checkout +cp ~/git_repo.patch tools/interop_matrix/patches/_/ +``` + +5. Edit the `LANGUAGE_RELEASE_MATRIX` in `client_matrix.py` for your language/tag +and add a `'patch': [,....]` entry to it's `dictionary`. + +After doing this, the interop image creation script can apply that patch to the +tag with `git apply` before uploading to the test image repo. diff --git a/tools/interop_matrix/patches/ruby_v1.0.1/git_repo.patch b/tools/interop_matrix/patches/ruby_v1.0.1/git_repo.patch new file mode 100644 index 00000000000..0cd92d691de --- /dev/null +++ b/tools/interop_matrix/patches/ruby_v1.0.1/git_repo.patch @@ -0,0 +1,34 @@ +diff --git a/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile +index 88b5130..7ae9f7d 100644 +--- a/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile ++++ b/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile +@@ -70,12 +70,12 @@ RUN apt-get update && apt-get install -y time && apt-get clean + RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 + RUN \curl -sSL https://get.rvm.io | bash -s stable + +-# Install Ruby 2.1 +-RUN /bin/bash -l -c "rvm install ruby-2.1" +-RUN /bin/bash -l -c "rvm use --default ruby-2.1" ++# Install Ruby 2.1.8 ++RUN /bin/bash -l -c "rvm install ruby-2.1.8" ++RUN /bin/bash -l -c "rvm use --default ruby-2.1.8" + RUN /bin/bash -l -c "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc" + RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc" +-RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.1' >> ~/.bashrc" ++RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.1.8' >> ~/.bashrc" + RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc" + + # Prepare ccache +diff --git a/tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh +index 97b3860..cec046d 100755 +--- a/tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh ++++ b/tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh +@@ -38,7 +38,7 @@ git clone --recursive /var/local/jenkins/grpc /var/local/git/grpc + cp -r /var/local/jenkins/service_account $HOME || true + + cd /var/local/git/grpc +-rvm --default use ruby-2.1 ++rvm --default use ruby-2.1.8 + + # build Ruby interop client and server + (cd src/ruby && gem update bundler && bundle && rake compile) diff --git a/tools/interop_matrix/run_interop_matrix_tests.py b/tools/interop_matrix/run_interop_matrix_tests.py index 4265bc5355a..1bc35d9e022 100755 --- a/tools/interop_matrix/run_interop_matrix_tests.py +++ b/tools/interop_matrix/run_interop_matrix_tests.py @@ -41,7 +41,7 @@ import upload_test_results _LANGUAGES = client_matrix.LANG_RUNTIME_MATRIX.keys() # All gRPC release tags, flattened, deduped and sorted. _RELEASES = sorted(list(set( - i for l in client_matrix.LANG_RELEASE_MATRIX.values() for i in l))) + client_matrix.get_release_tag_name(info) for lang in client_matrix.LANG_RELEASE_MATRIX.values() for info in lang))) _TEST_TIMEOUT = 30 argp = argparse.ArgumentParser(description='Run interop tests.') @@ -93,10 +93,10 @@ def find_all_images_for_lang(lang): """ # Find all defined releases. if args.release == 'all': - releases = ['master'] + client_matrix.LANG_RELEASE_MATRIX[lang] + releases = ['master'] + client_matrix.get_release_tags(lang) else: # Look for a particular release. - if args.release not in ['master'] + client_matrix.LANG_RELEASE_MATRIX[lang]: + if args.release not in ['master'] + client_matrix.get_release_tags(lang): jobset.message('SKIPPED', '%s for %s is not defined' % (args.release, lang), do_newline=True) diff --git a/tools/interop_matrix/testcases/ruby__v1.0.1 b/tools/interop_matrix/testcases/ruby__v1.0.1 new file mode 100755 index 00000000000..effbef1d18b --- /dev/null +++ b/tools/interop_matrix/testcases/ruby__v1.0.1 @@ -0,0 +1,20 @@ +#!/bin/bash +echo "Testing ${docker_image:=grpc_interop_ruby:6bd1f0eb-51a4-4ad8-861c-1cbd7a929f33}" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "source /usr/local/rvm/scripts/rvm && ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=large_unary" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "source /usr/local/rvm/scripts/rvm && ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_unary" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "source /usr/local/rvm/scripts/rvm && ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=ping_pong" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "source /usr/local/rvm/scripts/rvm && ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_stream" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "source /usr/local/rvm/scripts/rvm && ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=client_streaming" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "source /usr/local/rvm/scripts/rvm && ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=server_streaming" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "source /usr/local/rvm/scripts/rvm && ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_begin" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "source /usr/local/rvm/scripts/rvm && ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_first_response" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "source /usr/local/rvm/scripts/rvm && ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=timeout_on_sleeping_server" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "source /usr/local/rvm/scripts/rvm && ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=large_unary" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "source /usr/local/rvm/scripts/rvm && ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_unary" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "source /usr/local/rvm/scripts/rvm && ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=ping_pong" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "source /usr/local/rvm/scripts/rvm && ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_stream" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "source /usr/local/rvm/scripts/rvm && ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=client_streaming" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "source /usr/local/rvm/scripts/rvm && ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=server_streaming" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "source /usr/local/rvm/scripts/rvm && ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_begin" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "source /usr/local/rvm/scripts/rvm && ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_first_response" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "source /usr/local/rvm/scripts/rvm && ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=timeout_on_sleeping_server" From 11d91abf76a4647ba413754fd8c7ec93f5eecfe4 Mon Sep 17 00:00:00 2001 From: Adele Zhou Date: Wed, 6 Dec 2017 16:22:04 -0800 Subject: [PATCH 061/127] Add dbg mode --- ...oundry.sh => grpc_bazel_on_foundry_dbg.sh} | 1 + .../linux/grpc_bazel_on_foundry_opt.sh | 56 +++++++++++++++++++ 2 files changed, 57 insertions(+) rename tools/internal_ci/linux/{grpc_bazel_on_foundry.sh => grpc_bazel_on_foundry_dbg.sh} (99%) create mode 100644 tools/internal_ci/linux/grpc_bazel_on_foundry_opt.sh diff --git a/tools/internal_ci/linux/grpc_bazel_on_foundry.sh b/tools/internal_ci/linux/grpc_bazel_on_foundry_dbg.sh similarity index 99% rename from tools/internal_ci/linux/grpc_bazel_on_foundry.sh rename to tools/internal_ci/linux/grpc_bazel_on_foundry_dbg.sh index e328be8aaba..c43ac0e708f 100644 --- a/tools/internal_ci/linux/grpc_bazel_on_foundry.sh +++ b/tools/internal_ci/linux/grpc_bazel_on_foundry_dbg.sh @@ -52,4 +52,5 @@ source tools/internal_ci/helper_scripts/prepare_build_linux_rc --experimental_remote_platform_override='properties:{name:"container-image" value:"docker://gcr.io/asci-toolchain/nosla-debian8-clang-fl@sha256:aa20628a902f06a11a015caa94b0432eb60690de2d2525bd046b9eea046f5d8a" }' \ --crosstool_top=@bazel_toolchains//configs/debian8_clang/0.2.0/bazel_0.7.0:toolchain \ --define GRPC_PORT_ISOLATED_RUNTIME=1 \ + -c dbg \ -- //test/... diff --git a/tools/internal_ci/linux/grpc_bazel_on_foundry_opt.sh b/tools/internal_ci/linux/grpc_bazel_on_foundry_opt.sh new file mode 100644 index 00000000000..b106b71a855 --- /dev/null +++ b/tools/internal_ci/linux/grpc_bazel_on_foundry_opt.sh @@ -0,0 +1,56 @@ +#!/usr/bin/env bash +# Copyright 2017 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -ex + +# A temporary solution to give Kokoro credentials. +# The file name 4321_grpc-testing-service needs to match auth_credential in +# the build config. +mkdir -p ${KOKORO_KEYSTORE_DIR} +cp ${KOKORO_GFILE_DIR}/GrpcTesting-d0eeee2db331.json ${KOKORO_KEYSTORE_DIR}/4321_grpc-testing-service + +mkdir -p /tmpfs/tmp/bazel-canary +ln -f "${KOKORO_GFILE_DIR}/bazel-canary" /tmpfs/tmp/bazel-canary/bazel +chmod 755 "${KOKORO_GFILE_DIR}/bazel-canary" +export PATH="/tmpfs/tmp/bazel-canary:${PATH}" +# This should show /tmpfs/tmp/bazel-canary/bazel +which bazel +chmod +x "${KOKORO_GFILE_DIR}/bazel_wrapper.py" + +# change to grpc repo root +cd $(dirname $0)/../../.. + +source tools/internal_ci/helper_scripts/prepare_build_linux_rc + +"${KOKORO_GFILE_DIR}/bazel_wrapper.py" \ + --host_jvm_args=-Dbazel.DigestFunction=SHA1 \ + test --jobs="50" \ + --test_timeout="300,450,1200,3600" \ + --test_output=errors \ + --verbose_failures=true \ + --keep_going \ + --remote_accept_cached=true \ + --spawn_strategy=remote \ + --remote_local_fallback=false \ + --remote_timeout=3600 \ + --strategy=Javac=remote \ + --strategy=Closure=remote \ + --genrule_strategy=remote \ + --experimental_strict_action_env=true \ + --experimental_remote_platform_override='properties:{name:"container-image" value:"docker://gcr.io/asci-toolchain/nosla-debian8-clang-fl@sha256:aa20628a902f06a11a015caa94b0432eb60690de2d2525bd046b9eea046f5d8a" }' \ + --crosstool_top=@bazel_toolchains//configs/debian8_clang/0.2.0/bazel_0.7.0:toolchain \ + --define GRPC_PORT_ISOLATED_RUNTIME=1 \ + -c opt \ + -- //test/... From 230338201f3693e6a6905733b16319043e288afe Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Wed, 6 Dec 2017 16:25:52 -0800 Subject: [PATCH 062/127] regenerated proto with lastest version of protobuf --- .../proto/grpc/lb/v1/load_balancer.pb.c | 30 ++++--------------- .../proto/grpc/lb/v1/load_balancer.pb.h | 16 ++++------ 2 files changed, 10 insertions(+), 36 deletions(-) diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c b/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c index f5f09a18f06..4e6c5cc8329 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c @@ -62,9 +62,9 @@ const pb_field_t grpc_lb_v1_InitialLoadBalanceResponse_fields[3] = { }; const pb_field_t grpc_lb_v1_ServerList_fields[2] = { - PB_FIELD(1, MESSAGE, REPEATED, CALLBACK, FIRST, grpc_lb_v1_ServerList, - servers, servers, &grpc_lb_v1_Server_fields), - PB_LAST_FIELD}; + PB_FIELD( 1, MESSAGE , REPEATED, CALLBACK, FIRST, grpc_lb_v1_ServerList, servers, servers, &grpc_lb_v1_Server_fields), + PB_LAST_FIELD +}; const pb_field_t grpc_lb_v1_Server_fields[5] = { PB_FIELD( 1, BYTES , OPTIONAL, STATIC , FIRST, grpc_lb_v1_Server, ip_address, ip_address, 0), @@ -84,17 +84,7 @@ const pb_field_t grpc_lb_v1_Server_fields[5] = { * numbers or field sizes that are larger than what can fit in 8 or 16 bit * field descriptors. */ -PB_STATIC_ASSERT( - (pb_membersize(grpc_lb_v1_LoadBalanceRequest, initial_request) < 65536 && - pb_membersize(grpc_lb_v1_LoadBalanceRequest, client_stats) < 65536 && - pb_membersize(grpc_lb_v1_ClientStats, timestamp) < 65536 && - pb_membersize(grpc_lb_v1_ClientStats, calls_finished_with_drop) < 65536 && - pb_membersize(grpc_lb_v1_LoadBalanceResponse, initial_response) < 65536 && - pb_membersize(grpc_lb_v1_LoadBalanceResponse, server_list) < 65536 && - pb_membersize(grpc_lb_v1_InitialLoadBalanceResponse, - client_stats_report_interval) < 65536 && - pb_membersize(grpc_lb_v1_ServerList, servers) < 65536), - YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_grpc_lb_v1_Duration_grpc_lb_v1_Timestamp_grpc_lb_v1_LoadBalanceRequest_grpc_lb_v1_InitialLoadBalanceRequest_grpc_lb_v1_ClientStatsPerToken_grpc_lb_v1_ClientStats_grpc_lb_v1_LoadBalanceResponse_grpc_lb_v1_InitialLoadBalanceResponse_grpc_lb_v1_ServerList_grpc_lb_v1_Server) +PB_STATIC_ASSERT((pb_membersize(grpc_lb_v1_LoadBalanceRequest, initial_request) < 65536 && pb_membersize(grpc_lb_v1_LoadBalanceRequest, client_stats) < 65536 && pb_membersize(grpc_lb_v1_ClientStats, timestamp) < 65536 && pb_membersize(grpc_lb_v1_ClientStats, calls_finished_with_drop) < 65536 && pb_membersize(grpc_lb_v1_LoadBalanceResponse, initial_response) < 65536 && pb_membersize(grpc_lb_v1_LoadBalanceResponse, server_list) < 65536 && pb_membersize(grpc_lb_v1_InitialLoadBalanceResponse, client_stats_report_interval) < 65536 && pb_membersize(grpc_lb_v1_ServerList, servers) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_grpc_lb_v1_Duration_grpc_lb_v1_Timestamp_grpc_lb_v1_LoadBalanceRequest_grpc_lb_v1_InitialLoadBalanceRequest_grpc_lb_v1_ClientStatsPerToken_grpc_lb_v1_ClientStats_grpc_lb_v1_LoadBalanceResponse_grpc_lb_v1_InitialLoadBalanceResponse_grpc_lb_v1_ServerList_grpc_lb_v1_Server) #endif #if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT) @@ -105,17 +95,7 @@ PB_STATIC_ASSERT( * numbers or field sizes that are larger than what can fit in the default * 8 bit descriptors. */ -PB_STATIC_ASSERT( - (pb_membersize(grpc_lb_v1_LoadBalanceRequest, initial_request) < 256 && - pb_membersize(grpc_lb_v1_LoadBalanceRequest, client_stats) < 256 && - pb_membersize(grpc_lb_v1_ClientStats, timestamp) < 256 && - pb_membersize(grpc_lb_v1_ClientStats, calls_finished_with_drop) < 256 && - pb_membersize(grpc_lb_v1_LoadBalanceResponse, initial_response) < 256 && - pb_membersize(grpc_lb_v1_LoadBalanceResponse, server_list) < 256 && - pb_membersize(grpc_lb_v1_InitialLoadBalanceResponse, - client_stats_report_interval) < 256 && - pb_membersize(grpc_lb_v1_ServerList, servers) < 256), - YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_grpc_lb_v1_Duration_grpc_lb_v1_Timestamp_grpc_lb_v1_LoadBalanceRequest_grpc_lb_v1_InitialLoadBalanceRequest_grpc_lb_v1_ClientStatsPerToken_grpc_lb_v1_ClientStats_grpc_lb_v1_LoadBalanceResponse_grpc_lb_v1_InitialLoadBalanceResponse_grpc_lb_v1_ServerList_grpc_lb_v1_Server) +PB_STATIC_ASSERT((pb_membersize(grpc_lb_v1_LoadBalanceRequest, initial_request) < 256 && pb_membersize(grpc_lb_v1_LoadBalanceRequest, client_stats) < 256 && pb_membersize(grpc_lb_v1_ClientStats, timestamp) < 256 && pb_membersize(grpc_lb_v1_ClientStats, calls_finished_with_drop) < 256 && pb_membersize(grpc_lb_v1_LoadBalanceResponse, initial_response) < 256 && pb_membersize(grpc_lb_v1_LoadBalanceResponse, server_list) < 256 && pb_membersize(grpc_lb_v1_InitialLoadBalanceResponse, client_stats_report_interval) < 256 && pb_membersize(grpc_lb_v1_ServerList, servers) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_grpc_lb_v1_Duration_grpc_lb_v1_Timestamp_grpc_lb_v1_LoadBalanceRequest_grpc_lb_v1_InitialLoadBalanceRequest_grpc_lb_v1_ClientStatsPerToken_grpc_lb_v1_ClientStats_grpc_lb_v1_LoadBalanceResponse_grpc_lb_v1_InitialLoadBalanceResponse_grpc_lb_v1_ServerList_grpc_lb_v1_Server) #endif diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h b/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h index cd9a798f5e2..066c0762026 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h @@ -15,8 +15,8 @@ extern "C" { /* Struct definitions */ typedef struct _grpc_lb_v1_ServerList { - pb_callback_t servers; - /* @@protoc_insertion_point(struct:grpc_lb_v1_ServerList) */ + pb_callback_t servers; +/* @@protoc_insertion_point(struct:grpc_lb_v1_ServerList) */ } grpc_lb_v1_ServerList; typedef struct _grpc_lb_v1_ClientStatsPerToken { @@ -111,10 +111,7 @@ typedef struct _grpc_lb_v1_LoadBalanceResponse { #define grpc_lb_v1_ClientStats_init_default {false, grpc_lb_v1_Timestamp_init_default, false, 0, false, 0, false, 0, false, 0, {{NULL}, NULL}} #define grpc_lb_v1_LoadBalanceResponse_init_default {false, grpc_lb_v1_InitialLoadBalanceResponse_init_default, false, grpc_lb_v1_ServerList_init_default} #define grpc_lb_v1_InitialLoadBalanceResponse_init_default {false, "", false, grpc_lb_v1_Duration_init_default} -#define grpc_lb_v1_ServerList_init_default \ - { \ - { {NULL}, NULL } \ - } +#define grpc_lb_v1_ServerList_init_default {{{NULL}, NULL}} #define grpc_lb_v1_Server_init_default {false, {0, {0}}, false, 0, false, "", false, 0} #define grpc_lb_v1_Duration_init_zero {false, 0, false, 0} #define grpc_lb_v1_Timestamp_init_zero {false, 0, false, 0} @@ -124,14 +121,11 @@ typedef struct _grpc_lb_v1_LoadBalanceResponse { #define grpc_lb_v1_ClientStats_init_zero {false, grpc_lb_v1_Timestamp_init_zero, false, 0, false, 0, false, 0, false, 0, {{NULL}, NULL}} #define grpc_lb_v1_LoadBalanceResponse_init_zero {false, grpc_lb_v1_InitialLoadBalanceResponse_init_zero, false, grpc_lb_v1_ServerList_init_zero} #define grpc_lb_v1_InitialLoadBalanceResponse_init_zero {false, "", false, grpc_lb_v1_Duration_init_zero} -#define grpc_lb_v1_ServerList_init_zero \ - { \ - { {NULL}, NULL } \ - } +#define grpc_lb_v1_ServerList_init_zero {{{NULL}, NULL}} #define grpc_lb_v1_Server_init_zero {false, {0, {0}}, false, 0, false, "", false, 0} /* Field tags (for use in manual encoding/decoding) */ -#define grpc_lb_v1_ServerList_servers_tag 1 +#define grpc_lb_v1_ServerList_servers_tag 1 #define grpc_lb_v1_ClientStatsPerToken_load_balance_token_tag 1 #define grpc_lb_v1_ClientStatsPerToken_num_calls_tag 2 #define grpc_lb_v1_Duration_seconds_tag 1 From 4d9f7f6cf9600e09d5d6aad920d94204a3a3ef6a Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Wed, 6 Dec 2017 16:45:49 -0800 Subject: [PATCH 063/127] PR comments --- test/cpp/end2end/client_lb_end2end_test.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index c09a324bf10..c25f65d37a6 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -588,13 +588,13 @@ TEST_F(ClientLbEnd2endTest, RoundRobinReresolve) { gpr_log(GPR_INFO, "****** SERVERS RESTARTED *******"); gpr_log(GPR_INFO, "****** SENDING REQUEST TO SUCCEED *******"); // Client request should eventually (but still fairly soon) succeed. - bool call_succeeded = false; - for (gpr_timespec deadline = grpc_timeout_seconds_to_deadline(5); - gpr_time_cmp(deadline, gpr_now(GPR_CLOCK_MONOTONIC)) > 0;) { - call_succeeded = SendRpc().ok(); - if (call_succeeded) break; + const gpr_timespec deadline = grpc_timeout_seconds_to_deadline(5); + gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); + while (gpr_time_cmp(deadline, now) > 0) { + if (SendRpc().ok()) break; + now = gpr_now(GPR_CLOCK_MONOTONIC); } - GPR_ASSERT(call_succeeded); + GPR_ASSERT(gpr_time_cmp(deadline, now) > 0); } } // namespace From 05455715db5917762cb4d55970f0cadc87f02385 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 6 Dec 2017 19:40:49 +0100 Subject: [PATCH 064/127] split out channel connectivity test --- .../ChannelConnectivityTest.cs | 86 +++++++++++++++++++ .../Grpc.Core.Tests/ClientServerTest.cs | 29 ------- src/csharp/tests.json | 1 + 3 files changed, 87 insertions(+), 29 deletions(-) create mode 100644 src/csharp/Grpc.Core.Tests/ChannelConnectivityTest.cs diff --git a/src/csharp/Grpc.Core.Tests/ChannelConnectivityTest.cs b/src/csharp/Grpc.Core.Tests/ChannelConnectivityTest.cs new file mode 100644 index 00000000000..a43040f01a3 --- /dev/null +++ b/src/csharp/Grpc.Core.Tests/ChannelConnectivityTest.cs @@ -0,0 +1,86 @@ +#region Copyright notice and license + +// Copyright 2017 gRPC authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#endregion + +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using Grpc.Core; +using Grpc.Core.Internal; +using Grpc.Core.Profiling; +using Grpc.Core.Utils; +using NUnit.Framework; + +namespace Grpc.Core.Tests +{ + public class ChannelConnectivityTest + { + const string Host = "127.0.0.1"; + + MockServiceHelper helper; + Server server; + Channel channel; + + [SetUp] + public void Init() + { + helper = new MockServiceHelper(Host); + server = helper.GetServer(); + server.Start(); + channel = helper.GetChannel(); + } + + [TearDown] + public void Cleanup() + { + channel.ShutdownAsync().Wait(); + server.ShutdownAsync().Wait(); + } + + [Test] + public async Task Channel_WaitForStateChangedAsync() + { + helper.UnaryHandler = new UnaryServerMethod((request, context) => + { + return Task.FromResult(request); + }); + + Assert.ThrowsAsync(typeof(TaskCanceledException), + async () => await channel.WaitForStateChangedAsync(channel.State, DateTime.UtcNow.AddMilliseconds(10))); + + var stateChangedTask = channel.WaitForStateChangedAsync(channel.State); + + await Calls.AsyncUnaryCall(helper.CreateUnaryCall(), "abc"); + + await stateChangedTask; + Assert.AreEqual(ChannelState.Ready, channel.State); + } + + [Test] + public async Task Channel_ConnectAsync() + { + await channel.ConnectAsync(); + Assert.AreEqual(ChannelState.Ready, channel.State); + + await channel.ConnectAsync(DateTime.UtcNow.AddMilliseconds(1000)); + Assert.AreEqual(ChannelState.Ready, channel.State); + } + } +} diff --git a/src/csharp/Grpc.Core.Tests/ClientServerTest.cs b/src/csharp/Grpc.Core.Tests/ClientServerTest.cs index 90dd365b07e..331c3321e14 100644 --- a/src/csharp/Grpc.Core.Tests/ClientServerTest.cs +++ b/src/csharp/Grpc.Core.Tests/ClientServerTest.cs @@ -373,34 +373,5 @@ namespace Grpc.Core.Tests }); Assert.AreEqual("PASS", Calls.BlockingUnaryCall(helper.CreateUnaryCall(), "abc")); } - - [Test] - public async Task Channel_WaitForStateChangedAsync() - { - helper.UnaryHandler = new UnaryServerMethod((request, context) => - { - return Task.FromResult(request); - }); - - Assert.ThrowsAsync(typeof(TaskCanceledException), - async () => await channel.WaitForStateChangedAsync(channel.State, DateTime.UtcNow.AddMilliseconds(10))); - - var stateChangedTask = channel.WaitForStateChangedAsync(channel.State); - - await Calls.AsyncUnaryCall(helper.CreateUnaryCall(), "abc"); - - await stateChangedTask; - Assert.AreEqual(ChannelState.Ready, channel.State); - } - - [Test] - public async Task Channel_ConnectAsync() - { - await channel.ConnectAsync(); - Assert.AreEqual(ChannelState.Ready, channel.State); - - await channel.ConnectAsync(DateTime.UtcNow.AddMilliseconds(1000)); - Assert.AreEqual(ChannelState.Ready, channel.State); - } } } diff --git a/src/csharp/tests.json b/src/csharp/tests.json index 82573edecb8..469328af1a0 100644 --- a/src/csharp/tests.json +++ b/src/csharp/tests.json @@ -14,6 +14,7 @@ "Grpc.Core.Tests.CallCancellationTest", "Grpc.Core.Tests.CallCredentialsTest", "Grpc.Core.Tests.CallOptionsTest", + "Grpc.Core.Tests.ChannelConnectivityTest", "Grpc.Core.Tests.ChannelCredentialsTest", "Grpc.Core.Tests.ChannelOptionsTest", "Grpc.Core.Tests.ChannelTest", From 737f6e7ea67b402ed7eae1d8be0088ba3de239b7 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 7 Dec 2017 18:07:35 +0100 Subject: [PATCH 065/127] synchronize access to native channel methods --- src/csharp/Grpc.Core/Channel.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/csharp/Grpc.Core/Channel.cs b/src/csharp/Grpc.Core/Channel.cs index f9925a8a766..e39da9c1c2f 100644 --- a/src/csharp/Grpc.Core/Channel.cs +++ b/src/csharp/Grpc.Core/Channel.cs @@ -152,8 +152,11 @@ namespace Grpc.Core "Shutdown is a terminal state. No further state changes can occur."); var tcs = new TaskCompletionSource(); var deadlineTimespec = deadline.HasValue ? Timespec.FromDateTime(deadline.Value) : Timespec.InfFuture; - // pass "tcs" as "state" for WatchConnectivityStateHandler. - handle.WatchConnectivityState(lastObservedState, deadlineTimespec, completionQueue, WatchConnectivityStateHandler, tcs); + lock (myLock) + { + // pass "tcs" as "state" for WatchConnectivityStateHandler. + handle.WatchConnectivityState(lastObservedState, deadlineTimespec, completionQueue, WatchConnectivityStateHandler, tcs); + } return tcs.Task; } @@ -236,7 +239,10 @@ namespace Grpc.Core Logger.Warning("Channel shutdown was called but there are still {0} active calls for that channel.", activeCallCount); } - handle.Dispose(); + lock (myLock) + { + handle.Dispose(); + } await Task.WhenAll(GrpcEnvironment.ReleaseAsync(), connectivityWatcherTask).ConfigureAwait(false); } @@ -285,7 +291,10 @@ namespace Grpc.Core { try { - return handle.CheckConnectivityState(tryToConnect); + lock (myLock) + { + return handle.CheckConnectivityState(tryToConnect); + } } catch (ObjectDisposedException) { From f7a869fdbed6051b64a25d5bfc7228a7f4711219 Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Wed, 6 Dec 2017 18:57:44 -0800 Subject: [PATCH 066/127] Unref global backup poller under its lock --- .../filters/client_channel/backup_poller.cc | 4 +++- ...multiple_killed_watching_threads_driver.rb | 23 ++++++++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/core/ext/filters/client_channel/backup_poller.cc b/src/core/ext/filters/client_channel/backup_poller.cc index ed437d255c9..5b86e8631f9 100644 --- a/src/core/ext/filters/client_channel/backup_poller.cc +++ b/src/core/ext/filters/client_channel/backup_poller.cc @@ -83,8 +83,8 @@ static void done_poller(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { } static void g_poller_unref(grpc_exec_ctx* exec_ctx) { + gpr_mu_lock(&g_poller_mu); if (gpr_unref(&g_poller->refs)) { - gpr_mu_lock(&g_poller_mu); backup_poller* p = g_poller; g_poller = nullptr; gpr_mu_unlock(&g_poller_mu); @@ -95,6 +95,8 @@ static void g_poller_unref(grpc_exec_ctx* exec_ctx) { p, grpc_schedule_on_exec_ctx)); gpr_mu_unlock(p->pollset_mu); grpc_timer_cancel(exec_ctx, &p->polling_timer); + } else { + gpr_mu_unlock(&g_poller_mu); } } diff --git a/src/ruby/end2end/multiple_killed_watching_threads_driver.rb b/src/ruby/end2end/multiple_killed_watching_threads_driver.rb index 59f6f275e46..8f078cfbed7 100755 --- a/src/ruby/end2end/multiple_killed_watching_threads_driver.rb +++ b/src/ruby/end2end/multiple_killed_watching_threads_driver.rb @@ -20,7 +20,7 @@ Thread.abort_on_exception = true include GRPC::Core::ConnectivityStates -def watch_state(ch) +def watch_state(ch, sleep_time) thd = Thread.new do state = ch.connectivity_state(false) fail "non-idle state: #{state}" unless state == IDLE @@ -28,23 +28,34 @@ def watch_state(ch) end # sleep to get the thread into the middle of a # "watch connectivity state" call - sleep 0.1 + sleep sleep_time thd.kill end -def main +def run_multiple_killed_watches(num_threads, sleep_time) channels = [] - 10.times do + num_threads.times do ch = GRPC::Core::Channel.new('dummy_host', nil, :this_channel_is_insecure) - watch_state(ch) + watch_state(ch, sleep_time) channels << ch end # checking state should still be safe to call channels.each do |c| - fail unless c.connectivity_state(false) == FATAL_FAILURE + connectivity_state = c.connectivity_state(false) + # The state should be FATAL_FAILURE in the case that it was interrupted + # while watching connectivity state, and IDLE if it we never started + # watching the channel's connectivity state + unless [FATAL_FAILURE, IDLE].include?(connectivity_state) + fail "unexpected connectivity state: #{connectivity_state}" + end end end +def main + run_multiple_killed_watches(10, 0.1) + run_multiple_killed_watches(1000, 0.001) +end + main From 8873975a3028daa46e0b79c7505169501133c4d0 Mon Sep 17 00:00:00 2001 From: Ken Payson Date: Thu, 7 Dec 2017 10:24:25 -0800 Subject: [PATCH 067/127] Fix Async QPS Test --- test/cpp/qps/client_async.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/test/cpp/qps/client_async.cc b/test/cpp/qps/client_async.cc index 07888214e70..7cf9d3ea7e1 100644 --- a/test/cpp/qps/client_async.cc +++ b/test/cpp/qps/client_async.cc @@ -280,6 +280,7 @@ class AsyncClient : public ClientImpl { }, &got_tag, &ok, gpr_inf_future(GPR_CLOCK_REALTIME))) { t->UpdateHistogram(entry_ptr); + entry = HistogramEntry(); shutdown_mu->lock(); ctx = ProcessTag(thread_idx, got_tag); if (ctx == nullptr) { From cc6601e213f3818f8bf1bbb6ddeac27a8d3a20ed Mon Sep 17 00:00:00 2001 From: Sree Kuchibhotla Date: Thu, 7 Dec 2017 11:23:40 -0800 Subject: [PATCH 068/127] Tweak the RpcDeadline test to reduce flakes --- test/cpp/end2end/end2end_test.cc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index c71034bbe8e..2b0673529be 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -1300,12 +1300,19 @@ TEST_P(ProxyEnd2endTest, RpcDeadlineExpires) { EchoResponse response; request.set_message("Hello"); request.mutable_param()->set_skip_cancelled_check(true); - // Let server sleep for 2 ms first to guarantee expiry - request.mutable_param()->set_server_sleep_us(2 * 1000); + // Let server sleep for 40 ms first to guarantee expiry. + // 40 ms might seem a bit extreme but the timer manager would have been just + // initialized (when ResetStub() was called) and there are some warmup costs + // i.e the timer thread many not have even started. There might also be other + // delays in the timer manager thread (in acquiring locks, timer data + // structure manipulations, starting backup timer threads) that add to the + // delays. 40ms is still not enough in some cases but this significantly + // reduces the test flakes + request.mutable_param()->set_server_sleep_us(40 * 1000); ClientContext context; std::chrono::system_clock::time_point deadline = - std::chrono::system_clock::now() + std::chrono::microseconds(10); + std::chrono::system_clock::now() + std::chrono::milliseconds(1); context.set_deadline(deadline); Status s = stub_->Echo(&context, request, &response); EXPECT_EQ(StatusCode::DEADLINE_EXCEEDED, s.error_code()); From e55fb8aaa88651cda047f138963fa96d4fcd5460 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 7 Dec 2017 11:40:18 -0800 Subject: [PATCH 069/127] Allow running tests directly (default poller, foundry wont see them) --- bazel/grpc_build_system.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl index 2ef85445023..bab66ac90ba 100644 --- a/bazel/grpc_build_system.bzl +++ b/bazel/grpc_build_system.bzl @@ -87,7 +87,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data 'linkopts': ["-pthread"], } if uses_polling: - native.cc_binary(testonly=True, **args) + native.cc_test(testonly=True, tags=['manual'], **args) for poller in POLLERS: native.sh_test( name = name + '@poller=' + poller, From 1aee9d9880cf2d10fc14b884f0bc94a37b0a1162 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 7 Dec 2017 12:58:08 -0800 Subject: [PATCH 070/127] address comments --- src/csharp/Grpc.Microbenchmarks/CompletionRegistryBenchmark.cs | 2 +- src/csharp/Grpc.Microbenchmarks/SendMessageBenchmark.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/csharp/Grpc.Microbenchmarks/CompletionRegistryBenchmark.cs b/src/csharp/Grpc.Microbenchmarks/CompletionRegistryBenchmark.cs index c84473830c6..bb57a6968fa 100644 --- a/src/csharp/Grpc.Microbenchmarks/CompletionRegistryBenchmark.cs +++ b/src/csharp/Grpc.Microbenchmarks/CompletionRegistryBenchmark.cs @@ -51,7 +51,7 @@ namespace Grpc.Microbenchmarks private void ThreadBody(int iterations, CompletionRegistry optionalSharedRegistry) { - var completionRegistry = optionalSharedRegistry ?? new CompletionRegistry(environment, () => BatchContextSafeHandle.Create(), () => RequestCallContextSafeHandle.Create()); + var completionRegistry = optionalSharedRegistry ?? new CompletionRegistry(environment, () => throw new NotImplementedException(), () => throw new NotImplementedException()); var ctx = BatchContextSafeHandle.Create(); var stopwatch = Stopwatch.StartNew(); diff --git a/src/csharp/Grpc.Microbenchmarks/SendMessageBenchmark.cs b/src/csharp/Grpc.Microbenchmarks/SendMessageBenchmark.cs index f16113539a1..390c062298d 100644 --- a/src/csharp/Grpc.Microbenchmarks/SendMessageBenchmark.cs +++ b/src/csharp/Grpc.Microbenchmarks/SendMessageBenchmark.cs @@ -52,7 +52,7 @@ namespace Grpc.Microbenchmarks private void ThreadBody(int iterations, int payloadSize) { - var completionRegistry = new CompletionRegistry(environment, () => environment.BatchContextPool.Lease(), () => RequestCallContextSafeHandle.Create()); + var completionRegistry = new CompletionRegistry(environment, () => environment.BatchContextPool.Lease(), () => throw new NotImplementedException()); var cq = CompletionQueueSafeHandle.CreateAsync(completionRegistry); var call = CreateFakeCall(cq); From 9702566b98e297fcdc4f0a5f6722ebd7e57fdd21 Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Thu, 7 Dec 2017 13:01:59 -0800 Subject: [PATCH 071/127] Make it possible to ignore result of SendRPC() in test --- test/cpp/end2end/client_lb_end2end_test.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index c25f65d37a6..2696826ed87 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -156,7 +156,7 @@ class ClientLbEnd2endTest : public ::testing::Test { stub_ = grpc::testing::EchoTestService::NewStub(channel_); } - Status SendRpc(EchoResponse* response = nullptr) { + bool SendRpc(EchoResponse* response = nullptr) { const bool local_response = (response == nullptr); if (local_response) response = new EchoResponse; EchoRequest request; @@ -164,19 +164,19 @@ class ClientLbEnd2endTest : public ::testing::Test { ClientContext context; Status status = stub_->Echo(&context, request, response); if (local_response) delete response; - return status; + return status.ok(); } void CheckRpcSendOk() { EchoResponse response; - const Status status = SendRpc(&response); - EXPECT_TRUE(status.ok()); + const bool success = SendRpc(&response); + EXPECT_TRUE(success); EXPECT_EQ(response.message(), kRequestMessage_); } void CheckRpcSendFailure() { - const Status status = SendRpc(); - EXPECT_FALSE(status.ok()); + const bool success = SendRpc(); + EXPECT_FALSE(success); } struct ServerData { @@ -591,7 +591,7 @@ TEST_F(ClientLbEnd2endTest, RoundRobinReresolve) { const gpr_timespec deadline = grpc_timeout_seconds_to_deadline(5); gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); while (gpr_time_cmp(deadline, now) > 0) { - if (SendRpc().ok()) break; + if (SendRpc()) break; now = gpr_now(GPR_CLOCK_MONOTONIC); } GPR_ASSERT(gpr_time_cmp(deadline, now) > 0); From cd62e7d04cd13cbe4a2670fcb64ba57594c787b3 Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Thu, 7 Dec 2017 10:47:51 -0800 Subject: [PATCH 072/127] Exclude cronet restricted ports from port server pool --- tools/run_tests/python_utils/port_server.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/run_tests/python_utils/port_server.py b/tools/run_tests/python_utils/port_server.py index 4fb5ca0e94b..e8ac71af8d7 100755 --- a/tools/run_tests/python_utils/port_server.py +++ b/tools/run_tests/python_utils/port_server.py @@ -57,6 +57,17 @@ pool = [] in_use = {} mu = threading.Lock() +# Cronet restricts the following ports to be used (see +# https://cs.chromium.org/chromium/src/net/base/port_util.cc). When one of these +# ports is used in a Cronet test, the test would fail (see issue #12149). These +# ports must be excluded from pool. +cronet_restricted_ports = [1, 7, 9, 11, 13, 15, 17, 19, 20, 21, 22, 23, 25, 37, + 42, 43, 53, 77, 79, 87, 95, 101, 102, 103, 104, 109, + 110, 111, 113, 115, 117, 119, 123, 135, 139, 143, + 179, 389, 465, 512, 513, 514, 515, 526, 530, 531, + 532, 540, 556, 563, 587, 601, 636, 993, 995, 2049, + 3659, 4045, 6000, 6665, 6666, 6667, 6668, 6669, 6697] + def can_connect(port): # this test is only really useful on unices where SO_REUSE_PORT is available # so on Windows, where this test is expensive, skip it @@ -84,7 +95,7 @@ def can_bind(port, proto): def refill_pool(max_timeout, req): """Scan for ports not marked for being in use""" - chk = list(range(1025, 32766)) + chk = [port for port in list(range(1025, 32766)) if port not in cronet_restricted_ports] random.shuffle(chk) for i in chk: if len(pool) > 100: break From f7b8fa1753bca8697b468b72014630991c507bff Mon Sep 17 00:00:00 2001 From: Menghan Li Date: Mon, 4 Dec 2017 14:37:48 -0800 Subject: [PATCH 073/127] Add go release versions to client_matrix.py --- tools/interop_matrix/client_matrix.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py index 7b02f51725c..72813073638 100644 --- a/tools/interop_matrix/client_matrix.py +++ b/tools/interop_matrix/client_matrix.py @@ -66,11 +66,8 @@ LANG_RELEASE_MATRIX = { {'v1.4.2': None}, {'v1.5.2': None}, {'v1.6.0': None}, - {'v1.7.0': None}, - {'v1.7.1': None}, - {'v1.7.2': None}, - {'v1.7.3': None}, - {'v1.8.0': None}, + {'v1.7.4': None}, + {'v1.8.1': None}, ], 'java': [ {'v1.0.3': None}, From ae74a320dc96ae55a8c0b9ae3357e1c73010053a Mon Sep 17 00:00:00 2001 From: Nathaniel Manista Date: Fri, 8 Dec 2017 03:02:32 +0000 Subject: [PATCH 074/127] Fix Beta API metadata looseness --- .../grpcio/grpc/beta/_client_adaptations.py | 21 ++++---- src/python/grpcio/grpc/beta/_metadata.py | 49 +++++++++++++++++++ .../grpcio/grpc/beta/_server_adaptations.py | 10 ++-- .../grpcio/grpc/beta/implementations.py | 14 +++++- 4 files changed, 79 insertions(+), 15 deletions(-) create mode 100644 src/python/grpcio/grpc/beta/_metadata.py diff --git a/src/python/grpcio/grpc/beta/_client_adaptations.py b/src/python/grpcio/grpc/beta/_client_adaptations.py index 73ce22fa981..dcaa0eeaa29 100644 --- a/src/python/grpcio/grpc/beta/_client_adaptations.py +++ b/src/python/grpcio/grpc/beta/_client_adaptations.py @@ -15,6 +15,7 @@ import grpc from grpc import _common +from grpc.beta import _metadata from grpc.beta import interfaces from grpc.framework.common import cardinality from grpc.framework.foundation import future @@ -157,10 +158,10 @@ class _Rendezvous(future.Future, face.Call): return _InvocationProtocolContext() def initial_metadata(self): - return self._call.initial_metadata() + return _metadata.beta(self._call.initial_metadata()) def terminal_metadata(self): - return self._call.terminal_metadata() + return _metadata.beta(self._call.terminal_metadata()) def code(self): return self._call.code() @@ -182,14 +183,14 @@ def _blocking_unary_unary(channel, group, method, timeout, with_call, response, call = multi_callable.with_call( request, timeout=timeout, - metadata=effective_metadata, + metadata=_metadata.unbeta(effective_metadata), credentials=_credentials(protocol_options)) return response, _Rendezvous(None, None, call) else: return multi_callable( request, timeout=timeout, - metadata=effective_metadata, + metadata=_metadata.unbeta(effective_metadata), credentials=_credentials(protocol_options)) except grpc.RpcError as rpc_error_call: raise _abortion_error(rpc_error_call) @@ -206,7 +207,7 @@ def _future_unary_unary(channel, group, method, timeout, protocol_options, response_future = multi_callable.future( request, timeout=timeout, - metadata=effective_metadata, + metadata=_metadata.unbeta(effective_metadata), credentials=_credentials(protocol_options)) return _Rendezvous(response_future, None, response_future) @@ -222,7 +223,7 @@ def _unary_stream(channel, group, method, timeout, protocol_options, metadata, response_iterator = multi_callable( request, timeout=timeout, - metadata=effective_metadata, + metadata=_metadata.unbeta(effective_metadata), credentials=_credentials(protocol_options)) return _Rendezvous(None, response_iterator, response_iterator) @@ -241,14 +242,14 @@ def _blocking_stream_unary(channel, group, method, timeout, with_call, response, call = multi_callable.with_call( request_iterator, timeout=timeout, - metadata=effective_metadata, + metadata=_metadata.unbeta(effective_metadata), credentials=_credentials(protocol_options)) return response, _Rendezvous(None, None, call) else: return multi_callable( request_iterator, timeout=timeout, - metadata=effective_metadata, + metadata=_metadata.unbeta(effective_metadata), credentials=_credentials(protocol_options)) except grpc.RpcError as rpc_error_call: raise _abortion_error(rpc_error_call) @@ -265,7 +266,7 @@ def _future_stream_unary(channel, group, method, timeout, protocol_options, response_future = multi_callable.future( request_iterator, timeout=timeout, - metadata=effective_metadata, + metadata=_metadata.unbeta(effective_metadata), credentials=_credentials(protocol_options)) return _Rendezvous(response_future, None, response_future) @@ -281,7 +282,7 @@ def _stream_stream(channel, group, method, timeout, protocol_options, metadata, response_iterator = multi_callable( request_iterator, timeout=timeout, - metadata=effective_metadata, + metadata=_metadata.unbeta(effective_metadata), credentials=_credentials(protocol_options)) return _Rendezvous(None, response_iterator, response_iterator) diff --git a/src/python/grpcio/grpc/beta/_metadata.py b/src/python/grpcio/grpc/beta/_metadata.py new file mode 100644 index 00000000000..e135f4dff4f --- /dev/null +++ b/src/python/grpcio/grpc/beta/_metadata.py @@ -0,0 +1,49 @@ +# Copyright 2017 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"""API metadata conversion utilities.""" + +import collections + +_Metadatum = collections.namedtuple('_Metadatum', ('key', 'value',)) + + +def _beta_metadatum(key, value): + beta_key = key if isinstance(key, (bytes,)) else key.encode('ascii') + beta_value = value if isinstance(value, (bytes,)) else value.encode('ascii') + return _Metadatum(beta_key, beta_value) + + +def _metadatum(beta_key, beta_value): + key = beta_key if isinstance(beta_key, (str,)) else beta_key.decode('utf8') + if isinstance(beta_value, (str,)) or key[-4:] == '-bin': + value = beta_value + else: + value = beta_value.decode('utf8') + return _Metadatum(key, value) + + +def beta(metadata): + if metadata is None: + return () + else: + return tuple(_beta_metadatum(key, value) for key, value in metadata) + + +def unbeta(beta_metadata): + if beta_metadata is None: + return () + else: + return tuple( + _metadatum(beta_key, beta_value) + for beta_key, beta_value in beta_metadata) diff --git a/src/python/grpcio/grpc/beta/_server_adaptations.py b/src/python/grpcio/grpc/beta/_server_adaptations.py index ec363e9bc93..1c22dbe3bbe 100644 --- a/src/python/grpcio/grpc/beta/_server_adaptations.py +++ b/src/python/grpcio/grpc/beta/_server_adaptations.py @@ -18,6 +18,7 @@ import threading import grpc from grpc import _common +from grpc.beta import _metadata from grpc.beta import interfaces from grpc.framework.common import cardinality from grpc.framework.common import style @@ -65,14 +66,15 @@ class _FaceServicerContext(face.ServicerContext): return _ServerProtocolContext(self._servicer_context) def invocation_metadata(self): - return _common.to_cygrpc_metadata( - self._servicer_context.invocation_metadata()) + return _metadata.beta(self._servicer_context.invocation_metadata()) def initial_metadata(self, initial_metadata): - self._servicer_context.send_initial_metadata(initial_metadata) + self._servicer_context.send_initial_metadata( + _metadata.unbeta(initial_metadata)) def terminal_metadata(self, terminal_metadata): - self._servicer_context.set_terminal_metadata(terminal_metadata) + self._servicer_context.set_terminal_metadata( + _metadata.unbeta(terminal_metadata)) def code(self, code): self._servicer_context.set_code(code) diff --git a/src/python/grpcio/grpc/beta/implementations.py b/src/python/grpcio/grpc/beta/implementations.py index e52ce764b5a..312daf033e3 100644 --- a/src/python/grpcio/grpc/beta/implementations.py +++ b/src/python/grpcio/grpc/beta/implementations.py @@ -21,6 +21,7 @@ import threading # pylint: disable=unused-import import grpc from grpc import _auth from grpc.beta import _client_adaptations +from grpc.beta import _metadata from grpc.beta import _server_adaptations from grpc.beta import interfaces # pylint: disable=unused-import from grpc.framework.common import cardinality # pylint: disable=unused-import @@ -31,7 +32,18 @@ from grpc.framework.interfaces.face import face # pylint: disable=unused-import ChannelCredentials = grpc.ChannelCredentials ssl_channel_credentials = grpc.ssl_channel_credentials CallCredentials = grpc.CallCredentials -metadata_call_credentials = grpc.metadata_call_credentials + + +def metadata_call_credentials(metadata_plugin, name=None): + + def plugin(context, callback): + + def wrapped_callback(beta_metadata, error): + callback(_metadata.unbeta(beta_metadata), error) + + metadata_plugin(context, wrapped_callback) + + return grpc.metadata_call_credentials(plugin, name=name) def google_call_credentials(credentials): From caaf416eba1390b1acc2f1735448277f69ee50b6 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Thu, 7 Dec 2017 21:09:11 -0800 Subject: [PATCH 075/127] virtual destructor in exec_ctx, remove unneeded flush in grpc_shutdown and remove grpc_exec_ctx from .pxi files in python --- src/core/ext/filters/client_channel/lb_policy.cc | 2 +- src/core/lib/iomgr/exec_ctx.h | 2 +- src/core/lib/surface/init.cc | 3 --- src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi | 11 ++--------- .../grpcio/grpc/_cython/_cygrpc/records.pyx.pxi | 4 ++-- 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/core/ext/filters/client_channel/lb_policy.cc b/src/core/ext/filters/client_channel/lb_policy.cc index 0a097e58846..7a5a8dec34b 100644 --- a/src/core/ext/filters/client_channel/lb_policy.cc +++ b/src/core/ext/filters/client_channel/lb_policy.cc @@ -130,7 +130,7 @@ void grpc_lb_policy_exit_idle_locked(grpc_lb_policy* policy) { void grpc_lb_policy_ping_one_locked(grpc_lb_policy* policy, grpc_closure* on_initiate, grpc_closure* on_ack) { - policy->vtable->ping_one_locked(exec_ctx, policy, on_initiate, on_ack); + policy->vtable->ping_one_locked(policy, on_initiate, on_ack); } void grpc_lb_policy_notify_on_state_change_locked( diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index b0c1740155f..dbb76af1ebd 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -80,7 +80,7 @@ class ExecCtx { ExecCtx(uintptr_t fl) : flags_(fl) { Set(this); } /** Destructor */ - ~ExecCtx() { + virtual ~ExecCtx() { flags_ |= GRPC_EXEC_CTX_FLAG_IS_FINISHED; Flush(); Set(last_exec_ctx_); diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index c6ce235da7f..0f40965f16c 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -157,9 +157,6 @@ void grpc_init(void) { void grpc_shutdown(void) { int i; GRPC_API_TRACE("grpc_shutdown(void)", 0, ()); - if (grpc_core::ExecCtx::Get()) { - grpc_core::ExecCtx::Get()->Flush(); - } gpr_mu_lock(&g_init_mu); if (--g_initializations == 0) { { diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi index 660263fc09d..6a72bbf6930 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi @@ -36,13 +36,6 @@ cdef extern from "grpc/byte_buffer_reader.h": pass -cdef extern from "grpc/impl/codegen/exec_ctx_fwd.h": - - struct grpc_exec_ctx: - # We don't care about the internals - pass - - cdef extern from "grpc/grpc.h": ctypedef struct grpc_slice: @@ -169,7 +162,7 @@ cdef extern from "grpc/grpc.h": ctypedef struct grpc_arg_pointer_vtable: void *(*copy)(void *) - void (*destroy)(grpc_exec_ctx *, void *) + void (*destroy)(void *) int (*cmp)(void *, void *) ctypedef struct grpc_arg_value_pointer: @@ -524,7 +517,7 @@ cdef extern from "grpc/grpc_security.h": grpc_auth_property_iterator grpc_auth_context_property_iterator( const grpc_auth_context *ctx) - + grpc_auth_property_iterator grpc_auth_context_peer_identity( const grpc_auth_context *ctx) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi index 4f87261e173..03fb2261901 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi @@ -320,7 +320,7 @@ cdef void* copy_ptr(void* ptr): return ptr -cdef void destroy_ptr(grpc_exec_ctx* ctx, void* ptr): +cdef void destroy_ptr(void* ptr): pass @@ -348,7 +348,7 @@ cdef class ChannelArg: elif hasattr(value, '__int__'): # Pointer objects must override __int__() to return # the underlying C address (Python ints are word size). The - # lifecycle of the pointer is fixed to the lifecycle of the + # lifecycle of the pointer is fixed to the lifecycle of the # python object wrapping it. self.ptr_vtable.copy = ©_ptr self.ptr_vtable.destroy = &destroy_ptr From 9e5dc246eebdc3b7c7dc4d75f35d3697bee90d9a Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Fri, 8 Dec 2017 00:07:31 -0800 Subject: [PATCH 076/127] Disallow delete on ExecCtx --- src/core/lib/iomgr/exec_ctx.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index dbb76af1ebd..8f8d518def7 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -177,6 +177,9 @@ on outside context */ /** Check if ready to finish */ virtual bool CheckReadyToFinish() { return false; } + /** Disallow delete on ExecCtx */ + static void operator delete(void* p) { abort(); } + private: /** Set exec_ctx_ to exec_ctx */ void Set(ExecCtx* exec_ctx) { From 80516e884a8cd03daaa1f4a40d2bb284d5cc1be6 Mon Sep 17 00:00:00 2001 From: Nathaniel Manista Date: Fri, 8 Dec 2017 03:04:15 +0000 Subject: [PATCH 077/127] Streamline metadata in gRPC Python --- src/python/grpcio/grpc/_channel.py | 27 +-- src/python/grpcio/grpc/_common.py | 17 -- .../_cython/_cygrpc/completion_queue.pyx.pxi | 5 +- .../grpc/_cython/_cygrpc/credentials.pyx.pxi | 8 +- .../grpc/_cython/_cygrpc/grpc_string.pyx.pxi | 24 +++ .../grpc/_cython/_cygrpc/metadata.pxd.pxi | 26 +++ .../grpc/_cython/_cygrpc/metadata.pyx.pxi | 62 +++++++ .../grpc/_cython/_cygrpc/records.pxd.pxi | 25 +-- .../grpc/_cython/_cygrpc/records.pyx.pxi | 171 +++--------------- .../grpc/_cython/_cygrpc/server.pyx.pxi | 17 +- src/python/grpcio/grpc/_cython/cygrpc.pxd | 1 + src/python/grpcio/grpc/_cython/cygrpc.pyx | 1 + src/python/grpcio/grpc/_plugin_wrapping.py | 4 +- src/python/grpcio/grpc/_server.py | 37 ++-- .../unit/_cython/_cancel_many_calls_test.py | 2 +- .../tests/unit/_cython/_common.py | 15 +- .../_read_some_but_not_all_responses_test.py | 6 +- .../tests/unit/_cython/cygrpc_test.py | 67 ++----- 18 files changed, 212 insertions(+), 303 deletions(-) create mode 100644 src/python/grpcio/grpc/_cython/_cygrpc/metadata.pxd.pxi create mode 100644 src/python/grpcio/grpc/_cython/_cygrpc/metadata.pyx.pxi diff --git a/src/python/grpcio/grpc/_channel.py b/src/python/grpcio/grpc/_channel.py index cf4ce0941ba..dad32dea903 100644 --- a/src/python/grpcio/grpc/_channel.py +++ b/src/python/grpcio/grpc/_channel.py @@ -122,8 +122,8 @@ def _abort(state, code, details): state.code = code state.details = details if state.initial_metadata is None: - state.initial_metadata = _common.EMPTY_METADATA - state.trailing_metadata = _common.EMPTY_METADATA + state.initial_metadata = () + state.trailing_metadata = () def _handle_event(event, state, response_deserializer): @@ -372,14 +372,13 @@ class _Rendezvous(grpc.RpcError, grpc.Future, grpc.Call): with self._state.condition: while self._state.initial_metadata is None: self._state.condition.wait() - return _common.to_application_metadata(self._state.initial_metadata) + return self._state.initial_metadata def trailing_metadata(self): with self._state.condition: while self._state.trailing_metadata is None: self._state.condition.wait() - return _common.to_application_metadata( - self._state.trailing_metadata) + return self._state.trailing_metadata def code(self): with self._state.condition: @@ -420,8 +419,7 @@ def _start_unary_request(request, timeout, request_serializer): deadline, deadline_timespec = _deadline(timeout) serialized_request = _common.serialize(request, request_serializer) if serialized_request is None: - state = _RPCState((), _common.EMPTY_METADATA, _common.EMPTY_METADATA, - grpc.StatusCode.INTERNAL, + state = _RPCState((), (), (), grpc.StatusCode.INTERNAL, 'Exception serializing request!') rendezvous = _Rendezvous(state, None, None, deadline) return deadline, deadline_timespec, None, rendezvous @@ -458,8 +456,7 @@ class _UnaryUnaryMultiCallable(grpc.UnaryUnaryMultiCallable): else: state = _RPCState(_UNARY_UNARY_INITIAL_DUE, None, None, None, None) operations = ( - cygrpc.operation_send_initial_metadata( - _common.to_cygrpc_metadata(metadata), _EMPTY_FLAGS), + cygrpc.operation_send_initial_metadata(metadata, _EMPTY_FLAGS), cygrpc.operation_send_message(serialized_request, _EMPTY_FLAGS), cygrpc.operation_send_close_from_client(_EMPTY_FLAGS), cygrpc.operation_receive_initial_metadata(_EMPTY_FLAGS), @@ -549,8 +546,7 @@ class _UnaryStreamMultiCallable(grpc.UnaryStreamMultiCallable): )), event_handler) operations = ( cygrpc.operation_send_initial_metadata( - _common.to_cygrpc_metadata(metadata), - _EMPTY_FLAGS), cygrpc.operation_send_message( + metadata, _EMPTY_FLAGS), cygrpc.operation_send_message( serialized_request, _EMPTY_FLAGS), cygrpc.operation_send_close_from_client(_EMPTY_FLAGS), cygrpc.operation_receive_status_on_client(_EMPTY_FLAGS),) @@ -588,8 +584,7 @@ class _StreamUnaryMultiCallable(grpc.StreamUnaryMultiCallable): (cygrpc.operation_receive_initial_metadata(_EMPTY_FLAGS),)), None) operations = ( - cygrpc.operation_send_initial_metadata( - _common.to_cygrpc_metadata(metadata), _EMPTY_FLAGS), + cygrpc.operation_send_initial_metadata(metadata, _EMPTY_FLAGS), cygrpc.operation_receive_message(_EMPTY_FLAGS), cygrpc.operation_receive_status_on_client(_EMPTY_FLAGS),) call_error = call.start_client_batch( @@ -642,8 +637,7 @@ class _StreamUnaryMultiCallable(grpc.StreamUnaryMultiCallable): (cygrpc.operation_receive_initial_metadata(_EMPTY_FLAGS),)), event_handler) operations = ( - cygrpc.operation_send_initial_metadata( - _common.to_cygrpc_metadata(metadata), _EMPTY_FLAGS), + cygrpc.operation_send_initial_metadata(metadata, _EMPTY_FLAGS), cygrpc.operation_receive_message(_EMPTY_FLAGS), cygrpc.operation_receive_status_on_client(_EMPTY_FLAGS),) call_error = call.start_client_batch( @@ -685,8 +679,7 @@ class _StreamStreamMultiCallable(grpc.StreamStreamMultiCallable): (cygrpc.operation_receive_initial_metadata(_EMPTY_FLAGS),)), event_handler) operations = ( - cygrpc.operation_send_initial_metadata( - _common.to_cygrpc_metadata(metadata), _EMPTY_FLAGS), + cygrpc.operation_send_initial_metadata(metadata, _EMPTY_FLAGS), cygrpc.operation_receive_status_on_client(_EMPTY_FLAGS),) call_error = call.start_client_batch( cygrpc.Operations(operations), event_handler) diff --git a/src/python/grpcio/grpc/_common.py b/src/python/grpcio/grpc/_common.py index 740d4639dba..130fc426305 100644 --- a/src/python/grpcio/grpc/_common.py +++ b/src/python/grpcio/grpc/_common.py @@ -22,8 +22,6 @@ import six import grpc from grpc._cython import cygrpc -EMPTY_METADATA = cygrpc.Metadata(()) - CYGRPC_CONNECTIVITY_STATE_TO_CHANNEL_CONNECTIVITY = { cygrpc.ConnectivityState.idle: grpc.ChannelConnectivity.IDLE, @@ -91,21 +89,6 @@ def channel_args(options): return cygrpc.ChannelArgs(cygrpc_args) -def to_cygrpc_metadata(application_metadata): - return EMPTY_METADATA if application_metadata is None else cygrpc.Metadata( - cygrpc.Metadatum(encode(key), encode(value)) - for key, value in application_metadata) - - -def to_application_metadata(cygrpc_metadata): - if cygrpc_metadata is None: - return () - else: - return tuple((decode(key), value - if key[-4:] == b'-bin' else decode(value)) - for key, value in cygrpc_metadata) - - def _transform(message, transformer, exception_message): if transformer is None: return message diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/completion_queue.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/completion_queue.pyx.pxi index 237f4307990..af31a27fcec 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/completion_queue.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/completion_queue.pyx.pxi @@ -61,8 +61,9 @@ cdef class CompletionQueue: user_tag = tag.user_tag operation_call = tag.operation_call request_call_details = tag.request_call_details - if tag.request_metadata is not None: - request_metadata = tuple(tag.request_metadata) + if tag.is_new_request: + request_metadata = _metadata(&tag._c_request_metadata) + grpc_metadata_array_destroy(&tag._c_request_metadata) batch_operations = tag.batch_operations if tag.is_new_request: # Stuff in the tag not explicitly handled by us needs to live through diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi index 246a2718934..500086f6cb5 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi @@ -30,9 +30,13 @@ cdef int _get_metadata( grpc_metadata creds_md[GRPC_METADATA_CREDENTIALS_PLUGIN_SYNC_MAX], size_t *num_creds_md, grpc_status_code *status, const char **error_details) with gil: - def callback(Metadata metadata, grpc_status_code status, bytes error_details): + cdef size_t metadata_count + cdef grpc_metadata *c_metadata + def callback(metadata, grpc_status_code status, bytes error_details): if status is StatusCode.ok: - cb(user_data, metadata.c_metadata, metadata.c_count, status, NULL) + _store_c_metadata(metadata, &c_metadata, &metadata_count) + cb(user_data, c_metadata, metadata_count, status, NULL) + _release_c_metadata(c_metadata, metadata_count) else: cb(user_data, NULL, 0, status, error_details) args = context.service_url, context.method_name, callback, diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/grpc_string.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/grpc_string.pyx.pxi index c8f11f8e196..e3cad9acb3b 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/grpc_string.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/grpc_string.pyx.pxi @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +import logging + # This function will ascii encode unicode string inputs if neccesary. # In Python3, unicode strings are the default str type. @@ -22,3 +24,25 @@ cdef bytes str_to_bytes(object s): return s.encode('ascii') else: raise TypeError('Expected bytes, str, or unicode, not {}'.format(type(s))) + + +cdef bytes _encode(str native_string_or_none): + if native_string_or_none is None: + return b'' + elif isinstance(native_string_or_none, (bytes,)): + return native_string_or_none + elif isinstance(native_string_or_none, (unicode,)): + return native_string_or_none.encode('ascii') + else: + raise TypeError('Expected str, not {}'.format(type(native_string_or_none))) + + +cdef str _decode(bytes bytestring): + if isinstance(bytestring, (str,)): + return bytestring + else: + try: + return bytestring.decode('utf8') + except UnicodeDecodeError: + logging.exception('Invalid encoding on %s', bytestring) + return bytestring.decode('latin1') diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/metadata.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/metadata.pxd.pxi new file mode 100644 index 00000000000..a18c3658077 --- /dev/null +++ b/src/python/grpcio/grpc/_cython/_cygrpc/metadata.pxd.pxi @@ -0,0 +1,26 @@ +# Copyright 2017 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +cdef void _store_c_metadata( + metadata, grpc_metadata **c_metadata, size_t *c_count) + + +cdef void _release_c_metadata(grpc_metadata *c_metadata, int count) + + +cdef tuple _metadatum(grpc_slice key_slice, grpc_slice value_slice) + + +cdef tuple _metadata(grpc_metadata_array *c_metadata_array) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/metadata.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/metadata.pyx.pxi new file mode 100644 index 00000000000..c39fef08fa4 --- /dev/null +++ b/src/python/grpcio/grpc/_cython/_cygrpc/metadata.pyx.pxi @@ -0,0 +1,62 @@ +# Copyright 2017 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import collections + + +_Metadatum = collections.namedtuple('_Metadatum', ('key', 'value',)) + + +cdef void _store_c_metadata( + metadata, grpc_metadata **c_metadata, size_t *c_count): + if metadata is None: + c_count[0] = 0 + c_metadata[0] = NULL + else: + metadatum_count = len(metadata) + if metadatum_count == 0: + c_count[0] = 0 + c_metadata[0] = NULL + else: + c_count[0] = metadatum_count + c_metadata[0] = gpr_malloc( + metadatum_count * sizeof(grpc_metadata)) + for index, (key, value) in enumerate(metadata): + encoded_key = _encode(key) + encoded_value = value if encoded_key[-4:] == b'-bin' else _encode(value) + c_metadata[0][index].key = _slice_from_bytes(encoded_key) + c_metadata[0][index].value = _slice_from_bytes(encoded_value) + + +cdef void _release_c_metadata(grpc_metadata *c_metadata, int count): + if 0 < count: + for index in range(count): + grpc_slice_unref(c_metadata[index].key) + grpc_slice_unref(c_metadata[index].value) + gpr_free(c_metadata) + + +cdef tuple _metadatum(grpc_slice key_slice, grpc_slice value_slice): + cdef bytes key = _slice_bytes(key_slice) + cdef bytes value = _slice_bytes(value_slice) + return _Metadatum( + _decode(key), value if key[-4:] == b'-bin' else _decode(value)) + + +cdef tuple _metadata(grpc_metadata_array *c_metadata_array): + return tuple( + _metadatum( + c_metadata_array.metadata[index].key, + c_metadata_array.metadata[index].value) + for index in range(c_metadata_array.count)) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/records.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/records.pxd.pxi index 9c40ebf0c28..738769ff409 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/records.pxd.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/records.pxd.pxi @@ -37,7 +37,7 @@ cdef class OperationTag: cdef Server shutting_down_server cdef Call operation_call cdef CallDetails request_call_details - cdef MetadataArray request_metadata + cdef grpc_metadata_array _c_request_metadata cdef Operations batch_operations cdef bint is_new_request @@ -84,28 +84,15 @@ cdef class ChannelArgs: cdef list args -cdef class Metadatum: - - cdef grpc_metadata c_metadata - cdef void _copy_metadatum(self, grpc_metadata *destination) nogil - - -cdef class Metadata: - - cdef grpc_metadata *c_metadata - cdef readonly size_t c_count - - -cdef class MetadataArray: - - cdef grpc_metadata_array c_metadata_array - - cdef class Operation: cdef grpc_op c_op + cdef bint _c_metadata_needs_release + cdef size_t _c_metadata_count + cdef grpc_metadata *_c_metadata cdef ByteBuffer _received_message - cdef MetadataArray _received_metadata + cdef bint _c_metadata_array_needs_destruction + cdef grpc_metadata_array _c_metadata_array cdef grpc_status_code _received_status_code cdef grpc_slice _status_details cdef int _received_cancelled diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi index 4f87261e173..8577c157c30 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi @@ -390,140 +390,13 @@ cdef class ChannelArgs: return self.args[i] -cdef class Metadatum: - - def __cinit__(self, bytes key, bytes value): - self.c_metadata.key = _slice_from_bytes(key) - self.c_metadata.value = _slice_from_bytes(value) - - cdef void _copy_metadatum(self, grpc_metadata *destination) nogil: - destination[0].key = _copy_slice(self.c_metadata.key) - destination[0].value = _copy_slice(self.c_metadata.value) - - @property - def key(self): - return _slice_bytes(self.c_metadata.key) - - @property - def value(self): - return _slice_bytes(self.c_metadata.value) - - def __len__(self): - return 2 - - def __getitem__(self, size_t i): - if i == 0: - return self.key - elif i == 1: - return self.value - else: - raise IndexError("index must be 0 (key) or 1 (value)") - - def __iter__(self): - return iter((self.key, self.value)) - - def __dealloc__(self): - grpc_slice_unref(self.c_metadata.key) - grpc_slice_unref(self.c_metadata.value) - -cdef class _MetadataIterator: - - cdef size_t i - cdef size_t _length - cdef object _metadatum_indexable - - def __cinit__(self, length, metadatum_indexable): - self._length = length - self._metadatum_indexable = metadatum_indexable - self.i = 0 - - def __iter__(self): - return self - - def __next__(self): - if self.i < self._length: - result = self._metadatum_indexable[self.i] - self.i = self.i + 1 - return result - else: - raise StopIteration() - - -# TODO(https://github.com/grpc/grpc/issues/7950): Eliminate this; just use an -# ordinary sequence of pairs of bytestrings all the way down to the -# grpc_call_start_batch call. -cdef class Metadata: - """Metadata being passed from application to core.""" - - def __cinit__(self, metadata_iterable): - metadata_sequence = tuple(metadata_iterable) - cdef size_t count = len(metadata_sequence) - with nogil: - grpc_init() - self.c_metadata = gpr_malloc( - count * sizeof(grpc_metadata)) - self.c_count = count - for index, metadatum in enumerate(metadata_sequence): - self.c_metadata[index].key = grpc_slice_copy( - (metadatum).c_metadata.key) - self.c_metadata[index].value = grpc_slice_copy( - (metadatum).c_metadata.value) - - def __dealloc__(self): - with nogil: - for index in range(self.c_count): - grpc_slice_unref(self.c_metadata[index].key) - grpc_slice_unref(self.c_metadata[index].value) - gpr_free(self.c_metadata) - grpc_shutdown() - - def __len__(self): - return self.c_count - - def __getitem__(self, size_t index): - if index < self.c_count: - key = _slice_bytes(self.c_metadata[index].key) - value = _slice_bytes(self.c_metadata[index].value) - return Metadatum(key, value) - else: - raise IndexError() - - def __iter__(self): - return _MetadataIterator(self.c_count, self) - - -cdef class MetadataArray: - """Metadata being passed from core to application.""" - - def __cinit__(self): - with nogil: - grpc_init() - grpc_metadata_array_init(&self.c_metadata_array) - - def __dealloc__(self): - with nogil: - grpc_metadata_array_destroy(&self.c_metadata_array) - grpc_shutdown() - - def __len__(self): - return self.c_metadata_array.count - - def __getitem__(self, size_t i): - if i >= self.c_metadata_array.count: - raise IndexError() - key = _slice_bytes(self.c_metadata_array.metadata[i].key) - value = _slice_bytes(self.c_metadata_array.metadata[i].value) - return Metadatum(key=key, value=value) - - def __iter__(self): - return _MetadataIterator(self.c_metadata_array.count, self) - - cdef class Operation: def __cinit__(self): grpc_init() self.references = [] + self._c_metadata_needs_release = False + self._c_metadata_array_needs_destruction = False self._status_details = grpc_empty_slice() self.is_valid = False @@ -556,13 +429,7 @@ cdef class Operation: if (self.c_op.type != GRPC_OP_RECV_INITIAL_METADATA and self.c_op.type != GRPC_OP_RECV_STATUS_ON_CLIENT): raise TypeError("self must be an operation receiving metadata") - # TODO(https://github.com/grpc/grpc/issues/7950): Drop the "all Cython - # objects must be legitimate for use from Python at any time" policy in - # place today, shift the policy toward "Operation objects are only usable - # while their calls are active", and move this making-a-copy-because-this- - # data-needs-to-live-much-longer-than-the-call-from-which-it-arose to the - # lowest Python layer. - return tuple(self._received_metadata) + return _metadata(&self._c_metadata_array) @property def received_status_code(self): @@ -602,16 +469,21 @@ cdef class Operation: return False if self._received_cancelled == 0 else True def __dealloc__(self): + if self._c_metadata_needs_release: + _release_c_metadata(self._c_metadata, self._c_metadata_count) + if self._c_metadata_array_needs_destruction: + grpc_metadata_array_destroy(&self._c_metadata_array) grpc_slice_unref(self._status_details) grpc_shutdown() -def operation_send_initial_metadata(Metadata metadata, int flags): +def operation_send_initial_metadata(metadata, int flags): cdef Operation op = Operation() op.c_op.type = GRPC_OP_SEND_INITIAL_METADATA op.c_op.flags = flags - op.c_op.data.send_initial_metadata.count = metadata.c_count - op.c_op.data.send_initial_metadata.metadata = metadata.c_metadata - op.references.append(metadata) + _store_c_metadata(metadata, &op._c_metadata, &op._c_metadata_count) + op._c_metadata_needs_release = True + op.c_op.data.send_initial_metadata.count = op._c_metadata_count + op.c_op.data.send_initial_metadata.metadata = op._c_metadata op.is_valid = True return op @@ -633,18 +505,19 @@ def operation_send_close_from_client(int flags): return op def operation_send_status_from_server( - Metadata metadata, grpc_status_code code, bytes details, int flags): + metadata, grpc_status_code code, bytes details, int flags): cdef Operation op = Operation() op.c_op.type = GRPC_OP_SEND_STATUS_FROM_SERVER op.c_op.flags = flags + _store_c_metadata(metadata, &op._c_metadata, &op._c_metadata_count) + op._c_metadata_needs_release = True op.c_op.data.send_status_from_server.trailing_metadata_count = ( - metadata.c_count) - op.c_op.data.send_status_from_server.trailing_metadata = metadata.c_metadata + op._c_metadata_count) + op.c_op.data.send_status_from_server.trailing_metadata = op._c_metadata op.c_op.data.send_status_from_server.status = code grpc_slice_unref(op._status_details) op._status_details = _slice_from_bytes(details) op.c_op.data.send_status_from_server.status_details = &op._status_details - op.references.append(metadata) op.is_valid = True return op @@ -652,9 +525,10 @@ def operation_receive_initial_metadata(int flags): cdef Operation op = Operation() op.c_op.type = GRPC_OP_RECV_INITIAL_METADATA op.c_op.flags = flags - op._received_metadata = MetadataArray() + grpc_metadata_array_init(&op._c_metadata_array) op.c_op.data.receive_initial_metadata.receive_initial_metadata = ( - &op._received_metadata.c_metadata_array) + &op._c_metadata_array) + op._c_metadata_array_needs_destruction = True op.is_valid = True return op @@ -675,9 +549,10 @@ def operation_receive_status_on_client(int flags): cdef Operation op = Operation() op.c_op.type = GRPC_OP_RECV_STATUS_ON_CLIENT op.c_op.flags = flags - op._received_metadata = MetadataArray() + grpc_metadata_array_init(&op._c_metadata_array) op.c_op.data.receive_status_on_client.trailing_metadata = ( - &op._received_metadata.c_metadata_array) + &op._c_metadata_array) + op._c_metadata_array_needs_destruction = True op.c_op.data.receive_status_on_client.status = ( &op._received_status_code) op.c_op.data.receive_status_on_client.status_details = ( diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/server.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/server.pyx.pxi index 5f3405936c6..9d912acedf2 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/server.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/server.pyx.pxi @@ -78,23 +78,20 @@ cdef class Server: raise ValueError("server must be started and not shutting down") if server_queue not in self.registered_completion_queues: raise ValueError("server_queue must be a registered completion queue") - cdef grpc_call_error result cdef OperationTag operation_tag = OperationTag(tag) operation_tag.operation_call = Call() operation_tag.request_call_details = CallDetails() - operation_tag.request_metadata = MetadataArray() + grpc_metadata_array_init(&operation_tag._c_request_metadata) operation_tag.references.extend([self, call_queue, server_queue]) operation_tag.is_new_request = True operation_tag.batch_operations = Operations([]) cpython.Py_INCREF(operation_tag) - with nogil: - result = grpc_server_request_call( - self.c_server, &operation_tag.operation_call.c_call, - &operation_tag.request_call_details.c_details, - &operation_tag.request_metadata.c_metadata_array, - call_queue.c_completion_queue, server_queue.c_completion_queue, - operation_tag) - return result + return grpc_server_request_call( + self.c_server, &operation_tag.operation_call.c_call, + &operation_tag.request_call_details.c_details, + &operation_tag._c_request_metadata, + call_queue.c_completion_queue, server_queue.c_completion_queue, + operation_tag) def register_completion_queue( self, CompletionQueue queue not None): diff --git a/src/python/grpcio/grpc/_cython/cygrpc.pxd b/src/python/grpcio/grpc/_cython/cygrpc.pxd index fc6cc5fb9f5..6fc5638d5d8 100644 --- a/src/python/grpcio/grpc/_cython/cygrpc.pxd +++ b/src/python/grpcio/grpc/_cython/cygrpc.pxd @@ -18,6 +18,7 @@ include "_cygrpc/call.pxd.pxi" include "_cygrpc/channel.pxd.pxi" include "_cygrpc/credentials.pxd.pxi" include "_cygrpc/completion_queue.pxd.pxi" +include "_cygrpc/metadata.pxd.pxi" include "_cygrpc/records.pxd.pxi" include "_cygrpc/security.pxd.pxi" include "_cygrpc/server.pxd.pxi" diff --git a/src/python/grpcio/grpc/_cython/cygrpc.pyx b/src/python/grpcio/grpc/_cython/cygrpc.pyx index 57165d5f5a0..d6052298221 100644 --- a/src/python/grpcio/grpc/_cython/cygrpc.pyx +++ b/src/python/grpcio/grpc/_cython/cygrpc.pyx @@ -25,6 +25,7 @@ include "_cygrpc/call.pyx.pxi" include "_cygrpc/channel.pyx.pxi" include "_cygrpc/credentials.pyx.pxi" include "_cygrpc/completion_queue.pyx.pxi" +include "_cygrpc/metadata.pyx.pxi" include "_cygrpc/records.pyx.pxi" include "_cygrpc/security.pyx.pxi" include "_cygrpc/server.pyx.pxi" diff --git a/src/python/grpcio/grpc/_plugin_wrapping.py b/src/python/grpcio/grpc/_plugin_wrapping.py index cd17f4a0493..f7287956dcc 100644 --- a/src/python/grpcio/grpc/_plugin_wrapping.py +++ b/src/python/grpcio/grpc/_plugin_wrapping.py @@ -54,9 +54,7 @@ class _AuthMetadataPluginCallback(grpc.AuthMetadataPluginCallback): 'AuthMetadataPluginCallback raised exception "{}"!'.format( self._state.exception)) if error is None: - self._callback( - _common.to_cygrpc_metadata(metadata), cygrpc.StatusCode.ok, - None) + self._callback(metadata, cygrpc.StatusCode.ok, None) else: self._callback(None, cygrpc.StatusCode.internal, _common.encode(str(error))) diff --git a/src/python/grpcio/grpc/_server.py b/src/python/grpcio/grpc/_server.py index cd59b07c04c..0771c2499eb 100644 --- a/src/python/grpcio/grpc/_server.py +++ b/src/python/grpcio/grpc/_server.py @@ -129,15 +129,14 @@ def _abort(state, call, code, details): effective_details = details if state.details is None else state.details if state.initial_metadata_allowed: operations = (cygrpc.operation_send_initial_metadata( - _common.EMPTY_METADATA, - _EMPTY_FLAGS), cygrpc.operation_send_status_from_server( - _common.to_cygrpc_metadata(state.trailing_metadata), - effective_code, effective_details, _EMPTY_FLAGS),) + (), _EMPTY_FLAGS), cygrpc.operation_send_status_from_server( + state.trailing_metadata, effective_code, effective_details, + _EMPTY_FLAGS),) token = _SEND_INITIAL_METADATA_AND_SEND_STATUS_FROM_SERVER_TOKEN else: operations = (cygrpc.operation_send_status_from_server( - _common.to_cygrpc_metadata(state.trailing_metadata), - effective_code, effective_details, _EMPTY_FLAGS),) + state.trailing_metadata, effective_code, effective_details, + _EMPTY_FLAGS),) token = _SEND_STATUS_FROM_SERVER_TOKEN call.start_server_batch( cygrpc.Operations(operations), @@ -237,7 +236,7 @@ class _Context(grpc.ServicerContext): self._state.disable_next_compression = True def invocation_metadata(self): - return _common.to_application_metadata(self._rpc_event.request_metadata) + return self._rpc_event.request_metadata def peer(self): return _common.decode(self._rpc_event.operation_call.peer()) @@ -263,8 +262,7 @@ class _Context(grpc.ServicerContext): else: if self._state.initial_metadata_allowed: operation = cygrpc.operation_send_initial_metadata( - _common.to_cygrpc_metadata(initial_metadata), - _EMPTY_FLAGS) + initial_metadata, _EMPTY_FLAGS) self._rpc_event.operation_call.start_server_batch( cygrpc.Operations((operation,)), _send_initial_metadata(self._state)) @@ -275,8 +273,7 @@ class _Context(grpc.ServicerContext): def set_trailing_metadata(self, trailing_metadata): with self._state.condition: - self._state.trailing_metadata = _common.to_cygrpc_metadata( - trailing_metadata) + self._state.trailing_metadata = trailing_metadata def set_code(self, code): with self._state.condition: @@ -417,9 +414,8 @@ def _send_response(rpc_event, state, serialized_response): else: if state.initial_metadata_allowed: operations = (cygrpc.operation_send_initial_metadata( - _common.EMPTY_METADATA, _EMPTY_FLAGS), - cygrpc.operation_send_message(serialized_response, - _EMPTY_FLAGS),) + (), _EMPTY_FLAGS), cygrpc.operation_send_message( + serialized_response, _EMPTY_FLAGS),) state.initial_metadata_allowed = False token = _SEND_INITIAL_METADATA_AND_SEND_MESSAGE_TOKEN else: @@ -438,8 +434,7 @@ def _send_response(rpc_event, state, serialized_response): def _status(rpc_event, state, serialized_response): with state.condition: if state.client is not _CANCELLED: - trailing_metadata = _common.to_cygrpc_metadata( - state.trailing_metadata) + trailing_metadata = state.trailing_metadata code = _completion_code(state) details = _details(state) operations = [ @@ -448,8 +443,7 @@ def _status(rpc_event, state, serialized_response): ] if state.initial_metadata_allowed: operations.append( - cygrpc.operation_send_initial_metadata( - _common.EMPTY_METADATA, _EMPTY_FLAGS)) + cygrpc.operation_send_initial_metadata((), _EMPTY_FLAGS)) if serialized_response is not None: operations.append( cygrpc.operation_send_message(serialized_response, @@ -551,11 +545,10 @@ def _find_method_handler(rpc_event, generic_handlers): def _reject_rpc(rpc_event, status, details): - operations = (cygrpc.operation_send_initial_metadata(_common.EMPTY_METADATA, - _EMPTY_FLAGS), + operations = (cygrpc.operation_send_initial_metadata((), _EMPTY_FLAGS), cygrpc.operation_receive_close_on_server(_EMPTY_FLAGS), - cygrpc.operation_send_status_from_server( - _common.EMPTY_METADATA, status, details, _EMPTY_FLAGS),) + cygrpc.operation_send_status_from_server((), status, details, + _EMPTY_FLAGS),) rpc_state = _RPCState() rpc_event.operation_call.start_server_batch( operations, lambda ignored_event: (rpc_state, (),)) diff --git a/src/python/grpcio_tests/tests/unit/_cython/_cancel_many_calls_test.py b/src/python/grpcio_tests/tests/unit/_cython/_cancel_many_calls_test.py index 5b97b7b5422..3793bba50d7 100644 --- a/src/python/grpcio_tests/tests/unit/_cython/_cancel_many_calls_test.py +++ b/src/python/grpcio_tests/tests/unit/_cython/_cancel_many_calls_test.py @@ -22,7 +22,7 @@ from tests.unit.framework.common import test_constants _INFINITE_FUTURE = cygrpc.Timespec(float('+inf')) _EMPTY_FLAGS = 0 -_EMPTY_METADATA = cygrpc.Metadata(()) +_EMPTY_METADATA = () _SERVER_SHUTDOWN_TAG = 'server_shutdown' _REQUEST_CALL_TAG = 'request_call' diff --git a/src/python/grpcio_tests/tests/unit/_cython/_common.py b/src/python/grpcio_tests/tests/unit/_cython/_common.py index ac66d1db3d8..96f0f1589bf 100644 --- a/src/python/grpcio_tests/tests/unit/_cython/_common.py +++ b/src/python/grpcio_tests/tests/unit/_cython/_common.py @@ -23,17 +23,14 @@ RPC_COUNT = 4000 INFINITE_FUTURE = cygrpc.Timespec(float('+inf')) EMPTY_FLAGS = 0 -INVOCATION_METADATA = cygrpc.Metadata( - (cygrpc.Metadatum(b'client-md-key', b'client-md-key'), - cygrpc.Metadatum(b'client-md-key-bin', b'\x00\x01' * 3000),)) +INVOCATION_METADATA = (('client-md-key', 'client-md-key'), + ('client-md-key-bin', b'\x00\x01' * 3000),) -INITIAL_METADATA = cygrpc.Metadata( - (cygrpc.Metadatum(b'server-initial-md-key', b'server-initial-md-value'), - cygrpc.Metadatum(b'server-initial-md-key-bin', b'\x00\x02' * 3000),)) +INITIAL_METADATA = (('server-initial-md-key', 'server-initial-md-value'), + ('server-initial-md-key-bin', b'\x00\x02' * 3000),) -TRAILING_METADATA = cygrpc.Metadata( - (cygrpc.Metadatum(b'server-trailing-md-key', b'server-trailing-md-value'), - cygrpc.Metadatum(b'server-trailing-md-key-bin', b'\x00\x03' * 3000),)) +TRAILING_METADATA = (('server-trailing-md-key', 'server-trailing-md-value'), + ('server-trailing-md-key-bin', b'\x00\x03' * 3000),) class QueueDriver(object): diff --git a/src/python/grpcio_tests/tests/unit/_cython/_read_some_but_not_all_responses_test.py b/src/python/grpcio_tests/tests/unit/_cython/_read_some_but_not_all_responses_test.py index 0105612b479..d49eb9e7e5e 100644 --- a/src/python/grpcio_tests/tests/unit/_cython/_read_some_but_not_all_responses_test.py +++ b/src/python/grpcio_tests/tests/unit/_cython/_read_some_but_not_all_responses_test.py @@ -20,7 +20,7 @@ from grpc._cython import cygrpc _INFINITE_FUTURE = cygrpc.Timespec(float('+inf')) _EMPTY_FLAGS = 0 -_EMPTY_METADATA = cygrpc.Metadata(()) +_EMPTY_METADATA = () class _ServerDriver(object): @@ -197,8 +197,8 @@ class ReadSomeButNotAllResponsesTest(unittest.TestCase): server_rpc_event.operation_call.start_server_batch([ cygrpc.operation_receive_close_on_server(_EMPTY_FLAGS), cygrpc.operation_send_status_from_server( - cygrpc.Metadata(()), cygrpc.StatusCode.ok, - b'test details', _EMPTY_FLAGS), + (), cygrpc.StatusCode.ok, b'test details', + _EMPTY_FLAGS), ], server_complete_rpc_tag)) server_send_second_message_event = server_call_driver.event_with_tag( server_send_second_message_tag) diff --git a/src/python/grpcio_tests/tests/unit/_cython/cygrpc_test.py b/src/python/grpcio_tests/tests/unit/_cython/cygrpc_test.py index da94cf80286..017f10b222d 100644 --- a/src/python/grpcio_tests/tests/unit/_cython/cygrpc_test.py +++ b/src/python/grpcio_tests/tests/unit/_cython/cygrpc_test.py @@ -29,39 +29,12 @@ _EMPTY_FLAGS = 0 def _metadata_plugin(context, callback): - callback( - cygrpc.Metadata([ - cygrpc.Metadatum(_CALL_CREDENTIALS_METADATA_KEY, - _CALL_CREDENTIALS_METADATA_VALUE) - ]), cygrpc.StatusCode.ok, b'') + callback(((_CALL_CREDENTIALS_METADATA_KEY, + _CALL_CREDENTIALS_METADATA_VALUE,),), cygrpc.StatusCode.ok, b'') class TypeSmokeTest(unittest.TestCase): - def testStringsInUtilitiesUpDown(self): - self.assertEqual(0, cygrpc.StatusCode.ok) - metadatum = cygrpc.Metadatum(b'a', b'b') - self.assertEqual(b'a', metadatum.key) - self.assertEqual(b'b', metadatum.value) - metadata = cygrpc.Metadata([metadatum]) - self.assertEqual(1, len(metadata)) - self.assertEqual(metadatum.key, metadata[0].key) - - def testMetadataIteration(self): - metadata = cygrpc.Metadata( - [cygrpc.Metadatum(b'a', b'b'), cygrpc.Metadatum(b'c', b'd')]) - iterator = iter(metadata) - metadatum = next(iterator) - self.assertIsInstance(metadatum, cygrpc.Metadatum) - self.assertEqual(metadatum.key, b'a') - self.assertEqual(metadatum.value, b'b') - metadatum = next(iterator) - self.assertIsInstance(metadatum, cygrpc.Metadatum) - self.assertEqual(metadatum.key, b'c') - self.assertEqual(metadatum.value, b'd') - with self.assertRaises(StopIteration): - next(iterator) - def testOperationsIteration(self): operations = cygrpc.Operations( [cygrpc.operation_send_message(b'asdf', _EMPTY_FLAGS)]) @@ -200,14 +173,14 @@ class ServerClientMixin(object): def test_echo(self): DEADLINE = time.time() + 5 DEADLINE_TOLERANCE = 0.25 - CLIENT_METADATA_ASCII_KEY = b'key' - CLIENT_METADATA_ASCII_VALUE = b'val' - CLIENT_METADATA_BIN_KEY = b'key-bin' + CLIENT_METADATA_ASCII_KEY = 'key' + CLIENT_METADATA_ASCII_VALUE = 'val' + CLIENT_METADATA_BIN_KEY = 'key-bin' CLIENT_METADATA_BIN_VALUE = b'\0' * 1000 - SERVER_INITIAL_METADATA_KEY = b'init_me_me_me' - SERVER_INITIAL_METADATA_VALUE = b'whodawha?' - SERVER_TRAILING_METADATA_KEY = b'california_is_in_a_drought' - SERVER_TRAILING_METADATA_VALUE = b'zomg it is' + SERVER_INITIAL_METADATA_KEY = 'init_me_me_me' + SERVER_INITIAL_METADATA_VALUE = 'whodawha?' + SERVER_TRAILING_METADATA_KEY = 'california_is_in_a_drought' + SERVER_TRAILING_METADATA_VALUE = 'zomg it is' SERVER_STATUS_CODE = cygrpc.StatusCode.ok SERVER_STATUS_DETAILS = b'our work is never over' REQUEST = b'in death a member of project mayhem has a name' @@ -227,11 +200,9 @@ class ServerClientMixin(object): client_call = self.client_channel.create_call( None, 0, self.client_completion_queue, METHOD, self.host_argument, cygrpc_deadline) - client_initial_metadata = cygrpc.Metadata([ - cygrpc.Metadatum(CLIENT_METADATA_ASCII_KEY, - CLIENT_METADATA_ASCII_VALUE), - cygrpc.Metadatum(CLIENT_METADATA_BIN_KEY, CLIENT_METADATA_BIN_VALUE) - ]) + client_initial_metadata = ( + (CLIENT_METADATA_ASCII_KEY, CLIENT_METADATA_ASCII_VALUE,), + (CLIENT_METADATA_BIN_KEY, CLIENT_METADATA_BIN_VALUE,),) client_start_batch_result = client_call.start_client_batch([ cygrpc.operation_send_initial_metadata(client_initial_metadata, _EMPTY_FLAGS), @@ -263,14 +234,10 @@ class ServerClientMixin(object): server_call_tag = object() server_call = request_event.operation_call - server_initial_metadata = cygrpc.Metadata([ - cygrpc.Metadatum(SERVER_INITIAL_METADATA_KEY, - SERVER_INITIAL_METADATA_VALUE) - ]) - server_trailing_metadata = cygrpc.Metadata([ - cygrpc.Metadatum(SERVER_TRAILING_METADATA_KEY, - SERVER_TRAILING_METADATA_VALUE) - ]) + server_initial_metadata = ( + (SERVER_INITIAL_METADATA_KEY, SERVER_INITIAL_METADATA_VALUE,),) + server_trailing_metadata = ( + (SERVER_TRAILING_METADATA_KEY, SERVER_TRAILING_METADATA_VALUE,),) server_start_batch_result = server_call.start_server_batch([ cygrpc.operation_send_initial_metadata( server_initial_metadata, @@ -347,7 +314,7 @@ class ServerClientMixin(object): METHOD = b'twinkies' cygrpc_deadline = cygrpc.Timespec(DEADLINE) - empty_metadata = cygrpc.Metadata([]) + empty_metadata = () server_request_tag = object() self.server.request_call(self.server_completion_queue, From 6193c63dabf37023bd9a985f2db807f0551dd1ef Mon Sep 17 00:00:00 2001 From: ncteisen Date: Fri, 8 Dec 2017 10:49:31 -0800 Subject: [PATCH 078/127] Reviewer feedback --- include/grpc++/impl/codegen/call.h | 3 +-- include/grpc++/impl/codegen/client_context.h | 2 +- test/cpp/end2end/end2end_test.cc | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/grpc++/impl/codegen/call.h b/include/grpc++/impl/codegen/call.h index 73773f366a7..e581049e7f3 100644 --- a/include/grpc++/impl/codegen/call.h +++ b/include/grpc++/impl/codegen/call.h @@ -595,8 +595,7 @@ class CallOpClientRecvStatus { GRPC_SLICE_END_PTR(error_message_)), binary_error_details); client_context_->set_debug_error_string( - debug_error_string_ != nullptr ? grpc::string(debug_error_string_) - : ""); + debug_error_string_ != nullptr ? debug_error_string_ : ""); g_core_codegen_interface->grpc_slice_unref(error_message_); if (debug_error_string_ != nullptr) { g_core_codegen_interface->gpr_free((void*)debug_error_string_); diff --git a/include/grpc++/impl/codegen/client_context.h b/include/grpc++/impl/codegen/client_context.h index b06b1fa44fe..61d97ce8180 100644 --- a/include/grpc++/impl/codegen/client_context.h +++ b/include/grpc++/impl/codegen/client_context.h @@ -382,7 +382,7 @@ class ClientContext { friend class ::grpc::internal::BlockingUnaryCallImpl; // Used by friend class CallOpClientRecvStatus - void set_debug_error_string(grpc::string debug_error_string) { + void set_debug_error_string(const grpc::string& debug_error_string) { debug_error_string_ = debug_error_string; } diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index 1608b00fb0d..1d63f395dc6 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -741,7 +741,7 @@ TEST_P(End2endTest, RequestStreamOneRequest) { Status s = stream->Finish(); EXPECT_EQ(response.message(), request.message()); EXPECT_TRUE(s.ok()); - EXPECT_TRUE(context.debug_error_string() == ""); + EXPECT_TRUE(context.debug_error_string().empty()); } TEST_P(End2endTest, RequestStreamOneRequestWithCoalescingApi) { From c5c1216a65af531e67e0cfa2896fba38a12242f0 Mon Sep 17 00:00:00 2001 From: Nathaniel Manista Date: Fri, 8 Dec 2017 20:55:15 +0000 Subject: [PATCH 079/127] Elide cygrpc.Operations --- src/python/grpcio/grpc/_channel.py | 41 ++++------ .../grpcio/grpc/_cython/_cygrpc/call.pyx.pxi | 12 +-- .../grpc/_cython/_cygrpc/channel.pyx.pxi | 2 +- .../_cython/_cygrpc/completion_queue.pyx.pxi | 4 +- .../grpc/_cython/_cygrpc/records.pxd.pxi | 16 ++-- .../grpc/_cython/_cygrpc/records.pyx.pxi | 74 +++++-------------- .../grpc/_cython/_cygrpc/server.pyx.pxi | 5 +- src/python/grpcio/grpc/_server.py | 41 +++++----- .../unit/_cython/_cancel_many_calls_test.py | 13 ++-- ...s_server_completion_queue_per_call_test.py | 13 ++-- ...ges_single_server_completion_queue_test.py | 13 ++-- .../_read_some_but_not_all_responses_test.py | 27 +++---- .../tests/unit/_cython/cygrpc_test.py | 14 +--- 13 files changed, 100 insertions(+), 175 deletions(-) diff --git a/src/python/grpcio/grpc/_channel.py b/src/python/grpcio/grpc/_channel.py index dad32dea903..d7456a3dd16 100644 --- a/src/python/grpcio/grpc/_channel.py +++ b/src/python/grpcio/grpc/_channel.py @@ -202,8 +202,7 @@ def _consume_request_iterator(request_iterator, state, call, else: operations = (cygrpc.operation_send_message( serialized_request, _EMPTY_FLAGS),) - call.start_client_batch( - cygrpc.Operations(operations), event_handler) + call.start_client_batch(operations, event_handler) state.due.add(cygrpc.OperationType.send_message) while True: state.condition.wait() @@ -218,8 +217,7 @@ def _consume_request_iterator(request_iterator, state, call, if state.code is None: operations = ( cygrpc.operation_send_close_from_client(_EMPTY_FLAGS),) - call.start_client_batch( - cygrpc.Operations(operations), event_handler) + call.start_client_batch(operations, event_handler) state.due.add(cygrpc.OperationType.send_close_from_client) def stop_consumption_thread(timeout): # pylint: disable=unused-argument @@ -321,8 +319,7 @@ class _Rendezvous(grpc.RpcError, grpc.Future, grpc.Call): event_handler = _event_handler(self._state, self._call, self._response_deserializer) self._call.start_client_batch( - cygrpc.Operations( - (cygrpc.operation_receive_message(_EMPTY_FLAGS),)), + (cygrpc.operation_receive_message(_EMPTY_FLAGS),), event_handler) self._state.due.add(cygrpc.OperationType.receive_message) elif self._state.code is grpc.StatusCode.OK: @@ -476,8 +473,7 @@ class _UnaryUnaryMultiCallable(grpc.UnaryUnaryMultiCallable): deadline_timespec) if credentials is not None: call.set_credentials(credentials._credentials) - call_error = call.start_client_batch( - cygrpc.Operations(operations), None) + call_error = call.start_client_batch(operations, None) _check_call_error(call_error, metadata) _handle_event(completion_queue.poll(), state, self._response_deserializer) @@ -506,8 +502,7 @@ class _UnaryUnaryMultiCallable(grpc.UnaryUnaryMultiCallable): event_handler = _event_handler(state, call, self._response_deserializer) with state.condition: - call_error = call.start_client_batch( - cygrpc.Operations(operations), event_handler) + call_error = call.start_client_batch(operations, event_handler) if call_error != cygrpc.CallError.ok: _call_error_set_RPCstate(state, call_error, metadata) return _Rendezvous(state, None, None, deadline) @@ -541,17 +536,15 @@ class _UnaryStreamMultiCallable(grpc.UnaryStreamMultiCallable): self._response_deserializer) with state.condition: call.start_client_batch( - cygrpc.Operations(( - cygrpc.operation_receive_initial_metadata(_EMPTY_FLAGS), - )), event_handler) + (cygrpc.operation_receive_initial_metadata(_EMPTY_FLAGS),), + event_handler) operations = ( cygrpc.operation_send_initial_metadata( metadata, _EMPTY_FLAGS), cygrpc.operation_send_message( serialized_request, _EMPTY_FLAGS), cygrpc.operation_send_close_from_client(_EMPTY_FLAGS), cygrpc.operation_receive_status_on_client(_EMPTY_FLAGS),) - call_error = call.start_client_batch( - cygrpc.Operations(operations), event_handler) + call_error = call.start_client_batch(operations, event_handler) if call_error != cygrpc.CallError.ok: _call_error_set_RPCstate(state, call_error, metadata) return _Rendezvous(state, None, None, deadline) @@ -580,15 +573,13 @@ class _StreamUnaryMultiCallable(grpc.StreamUnaryMultiCallable): call.set_credentials(credentials._credentials) with state.condition: call.start_client_batch( - cygrpc.Operations( - (cygrpc.operation_receive_initial_metadata(_EMPTY_FLAGS),)), + (cygrpc.operation_receive_initial_metadata(_EMPTY_FLAGS),), None) operations = ( cygrpc.operation_send_initial_metadata(metadata, _EMPTY_FLAGS), cygrpc.operation_receive_message(_EMPTY_FLAGS), cygrpc.operation_receive_status_on_client(_EMPTY_FLAGS),) - call_error = call.start_client_batch( - cygrpc.Operations(operations), None) + call_error = call.start_client_batch(operations, None) _check_call_error(call_error, metadata) _consume_request_iterator(request_iterator, state, call, self._request_serializer) @@ -633,15 +624,13 @@ class _StreamUnaryMultiCallable(grpc.StreamUnaryMultiCallable): event_handler = _event_handler(state, call, self._response_deserializer) with state.condition: call.start_client_batch( - cygrpc.Operations( - (cygrpc.operation_receive_initial_metadata(_EMPTY_FLAGS),)), + (cygrpc.operation_receive_initial_metadata(_EMPTY_FLAGS),), event_handler) operations = ( cygrpc.operation_send_initial_metadata(metadata, _EMPTY_FLAGS), cygrpc.operation_receive_message(_EMPTY_FLAGS), cygrpc.operation_receive_status_on_client(_EMPTY_FLAGS),) - call_error = call.start_client_batch( - cygrpc.Operations(operations), event_handler) + call_error = call.start_client_batch(operations, event_handler) if call_error != cygrpc.CallError.ok: _call_error_set_RPCstate(state, call_error, metadata) return _Rendezvous(state, None, None, deadline) @@ -675,14 +664,12 @@ class _StreamStreamMultiCallable(grpc.StreamStreamMultiCallable): event_handler = _event_handler(state, call, self._response_deserializer) with state.condition: call.start_client_batch( - cygrpc.Operations( - (cygrpc.operation_receive_initial_metadata(_EMPTY_FLAGS),)), + (cygrpc.operation_receive_initial_metadata(_EMPTY_FLAGS),), event_handler) operations = ( cygrpc.operation_send_initial_metadata(metadata, _EMPTY_FLAGS), cygrpc.operation_receive_status_on_client(_EMPTY_FLAGS),) - call_error = call.start_client_batch( - cygrpc.Operations(operations), event_handler) + call_error = call.start_client_batch(operations, event_handler) if call_error != cygrpc.CallError.ok: _call_error_set_RPCstate(state, call_error, metadata) return _Rendezvous(state, None, None, deadline) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/call.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/call.pyx.pxi index 6b3a276097f..6361669757e 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/call.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/call.pyx.pxi @@ -26,20 +26,16 @@ cdef class Call: def _start_batch(self, operations, tag, retain_self): if not self.is_valid: raise ValueError("invalid call object cannot be used from Python") - cdef grpc_call_error result - cdef Operations cy_operations = Operations(operations) - cdef OperationTag operation_tag = OperationTag(tag) + cdef OperationTag operation_tag = OperationTag(tag, operations) if retain_self: operation_tag.operation_call = self else: operation_tag.operation_call = None - operation_tag.batch_operations = cy_operations + operation_tag.store_ops() cpython.Py_INCREF(operation_tag) - with nogil: - result = grpc_call_start_batch( - self.c_call, cy_operations.c_ops, cy_operations.c_nops, + return grpc_call_start_batch( + self.c_call, operation_tag.c_ops, operation_tag.c_nops, operation_tag, NULL) - return result def start_client_batch(self, operations, tag): # We don't reference this call in the operations tag because diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/channel.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/channel.pyx.pxi index 4c397f8f644..644df674cc7 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/channel.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/channel.pyx.pxi @@ -76,7 +76,7 @@ cdef class Channel: def watch_connectivity_state( self, grpc_connectivity_state last_observed_state, Timespec deadline not None, CompletionQueue queue not None, tag): - cdef OperationTag operation_tag = OperationTag(tag) + cdef OperationTag operation_tag = OperationTag(tag, None) cpython.Py_INCREF(operation_tag) with nogil: grpc_channel_watch_connectivity_state( diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/completion_queue.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/completion_queue.pyx.pxi index af31a27fcec..140fc357b9f 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/completion_queue.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/completion_queue.pyx.pxi @@ -42,7 +42,7 @@ cdef class CompletionQueue: cdef Call operation_call = None cdef CallDetails request_call_details = None cdef object request_metadata = None - cdef Operations batch_operations = None + cdef object batch_operations = None if event.type == GRPC_QUEUE_TIMEOUT: return Event( event.type, False, None, None, None, None, False, None) @@ -64,7 +64,7 @@ cdef class CompletionQueue: if tag.is_new_request: request_metadata = _metadata(&tag._c_request_metadata) grpc_metadata_array_destroy(&tag._c_request_metadata) - batch_operations = tag.batch_operations + batch_operations = tag.release_ops() if tag.is_new_request: # Stuff in the tag not explicitly handled by us needs to live through # the life of the call diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/records.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/records.pxd.pxi index 738769ff409..594fdb1a8b2 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/records.pxd.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/records.pxd.pxi @@ -38,9 +38,14 @@ cdef class OperationTag: cdef Call operation_call cdef CallDetails request_call_details cdef grpc_metadata_array _c_request_metadata - cdef Operations batch_operations + cdef grpc_op *c_ops + cdef size_t c_nops + cdef readonly object _operations cdef bint is_new_request + cdef void store_ops(self) + cdef object release_ops(self) + cdef class Event: @@ -57,7 +62,7 @@ cdef class Event: cdef readonly Call operation_call # For Call.start_batch - cdef readonly Operations batch_operations + cdef readonly object batch_operations cdef class ByteBuffer: @@ -100,13 +105,6 @@ cdef class Operation: cdef object references -cdef class Operations: - - cdef grpc_op *c_ops - cdef size_t c_nops - cdef list operations - - cdef class CompressionOptions: cdef grpc_compression_options c_options diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi index 8577c157c30..5877591f786 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/records.pyx.pxi @@ -220,9 +220,26 @@ cdef class CallDetails: cdef class OperationTag: - def __cinit__(self, user_tag): + def __cinit__(self, user_tag, operations): self.user_tag = user_tag self.references = [] + self._operations = operations + + cdef void store_ops(self): + self.c_nops = 0 if self._operations is None else len(self._operations) + if 0 < self.c_nops: + self.c_ops = gpr_malloc(sizeof(grpc_op) * self.c_nops) + for index in range(self.c_nops): + self.c_ops[index] = ((self._operations[index])).c_op + + cdef object release_ops(self): + if 0 < self.c_nops: + for index, operation in enumerate(self._operations): + (operation).c_op = self.c_ops[index] + gpr_free(self.c_ops) + return self._operations + else: + return () cdef class Event: @@ -232,7 +249,7 @@ cdef class Event: CallDetails request_call_details, object request_metadata, bint is_new_request, - Operations batch_operations): + object batch_operations): self.type = type self.success = success self.tag = tag @@ -569,59 +586,6 @@ def operation_receive_close_on_server(int flags): return op -cdef class _OperationsIterator: - - cdef size_t i - cdef Operations operations - - def __cinit__(self, Operations operations not None): - self.i = 0 - self.operations = operations - - def __iter__(self): - return self - - def __next__(self): - if self.i < len(self.operations): - result = self.operations[self.i] - self.i = self.i + 1 - return result - else: - raise StopIteration() - - -cdef class Operations: - - def __cinit__(self, operations): - grpc_init() - self.operations = list(operations) # normalize iterable - self.c_ops = NULL - self.c_nops = 0 - for operation in self.operations: - if not isinstance(operation, Operation): - raise TypeError("expected operations to be iterable of Operation") - self.c_nops = len(self.operations) - with nogil: - self.c_ops = gpr_malloc(sizeof(grpc_op)*self.c_nops) - for i in range(self.c_nops): - self.c_ops[i] = ((self.operations[i])).c_op - - def __len__(self): - return self.c_nops - - def __getitem__(self, size_t i): - # self.operations is never stale; it's only updated from this file - return self.operations[i] - - def __dealloc__(self): - with nogil: - gpr_free(self.c_ops) - grpc_shutdown() - - def __iter__(self): - return _OperationsIterator(self) - - cdef class CompressionOptions: def __cinit__(self): diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/server.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/server.pyx.pxi index 9d912acedf2..f8d78928580 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/server.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/server.pyx.pxi @@ -78,13 +78,12 @@ cdef class Server: raise ValueError("server must be started and not shutting down") if server_queue not in self.registered_completion_queues: raise ValueError("server_queue must be a registered completion queue") - cdef OperationTag operation_tag = OperationTag(tag) + cdef OperationTag operation_tag = OperationTag(tag, None) operation_tag.operation_call = Call() operation_tag.request_call_details = CallDetails() grpc_metadata_array_init(&operation_tag._c_request_metadata) operation_tag.references.extend([self, call_queue, server_queue]) operation_tag.is_new_request = True - operation_tag.batch_operations = Operations([]) cpython.Py_INCREF(operation_tag) return grpc_server_request_call( self.c_server, &operation_tag.operation_call.c_call, @@ -132,7 +131,7 @@ cdef class Server: cdef _c_shutdown(self, CompletionQueue queue, tag): self.is_shutting_down = True - operation_tag = OperationTag(tag) + operation_tag = OperationTag(tag, None) operation_tag.shutting_down_server = self cpython.Py_INCREF(operation_tag) with nogil: diff --git a/src/python/grpcio/grpc/_server.py b/src/python/grpcio/grpc/_server.py index 0771c2499eb..308b7535cc3 100644 --- a/src/python/grpcio/grpc/_server.py +++ b/src/python/grpcio/grpc/_server.py @@ -138,9 +138,8 @@ def _abort(state, call, code, details): state.trailing_metadata, effective_code, effective_details, _EMPTY_FLAGS),) token = _SEND_STATUS_FROM_SERVER_TOKEN - call.start_server_batch( - cygrpc.Operations(operations), - _send_status_from_server(state, token)) + call.start_server_batch(operations, + _send_status_from_server(state, token)) state.statused = True state.due.add(token) @@ -264,8 +263,7 @@ class _Context(grpc.ServicerContext): operation = cygrpc.operation_send_initial_metadata( initial_metadata, _EMPTY_FLAGS) self._rpc_event.operation_call.start_server_batch( - cygrpc.Operations((operation,)), - _send_initial_metadata(self._state)) + (operation,), _send_initial_metadata(self._state)) self._state.initial_metadata_allowed = False self._state.due.add(_SEND_INITIAL_METADATA_TOKEN) else: @@ -298,8 +296,7 @@ class _RequestIterator(object): raise StopIteration() else: self._call.start_server_batch( - cygrpc.Operations( - (cygrpc.operation_receive_message(_EMPTY_FLAGS),)), + (cygrpc.operation_receive_message(_EMPTY_FLAGS),), _receive_message(self._state, self._call, self._request_deserializer)) self._state.due.add(_RECEIVE_MESSAGE_TOKEN) @@ -342,8 +339,7 @@ def _unary_request(rpc_event, state, request_deserializer): return None else: rpc_event.operation_call.start_server_batch( - cygrpc.Operations( - (cygrpc.operation_receive_message(_EMPTY_FLAGS),)), + (cygrpc.operation_receive_message(_EMPTY_FLAGS),), _receive_message(state, rpc_event.operation_call, request_deserializer)) state.due.add(_RECEIVE_MESSAGE_TOKEN) @@ -371,10 +367,10 @@ def _call_behavior(rpc_event, state, behavior, argument, request_deserializer): context = _Context(rpc_event, state, request_deserializer) try: return behavior(argument, context), True - except Exception as e: # pylint: disable=broad-except + except Exception as exception: # pylint: disable=broad-except with state.condition: - if e not in state.rpc_errors: - details = 'Exception calling application: {}'.format(e) + if exception not in state.rpc_errors: + details = 'Exception calling application: {}'.format(exception) logging.exception(details) _abort(state, rpc_event.operation_call, cygrpc.StatusCode.unknown, _common.encode(details)) @@ -386,10 +382,10 @@ def _take_response_from_response_iterator(rpc_event, state, response_iterator): return next(response_iterator), True except StopIteration: return None, True - except Exception as e: # pylint: disable=broad-except + except Exception as exception: # pylint: disable=broad-except with state.condition: - if e not in state.rpc_errors: - details = 'Exception iterating responses: {}'.format(e) + if exception not in state.rpc_errors: + details = 'Exception iterating responses: {}'.format(exception) logging.exception(details) _abort(state, rpc_event.operation_call, cygrpc.StatusCode.unknown, _common.encode(details)) @@ -423,7 +419,7 @@ def _send_response(rpc_event, state, serialized_response): _EMPTY_FLAGS),) token = _SEND_MESSAGE_TOKEN rpc_event.operation_call.start_server_batch( - cygrpc.Operations(operations), _send_message(state, token)) + operations, _send_message(state, token)) state.due.add(token) while True: state.condition.wait() @@ -449,7 +445,7 @@ def _status(rpc_event, state, serialized_response): cygrpc.operation_send_message(serialized_response, _EMPTY_FLAGS)) rpc_event.operation_call.start_server_batch( - cygrpc.Operations(operations), + operations, _send_status_from_server(state, _SEND_STATUS_FROM_SERVER_TOKEN)) state.statused = True state.due.add(_SEND_STATUS_FROM_SERVER_TOKEN) @@ -559,8 +555,7 @@ def _handle_with_method_handler(rpc_event, method_handler, thread_pool): state = _RPCState() with state.condition: rpc_event.operation_call.start_server_batch( - cygrpc.Operations( - (cygrpc.operation_receive_close_on_server(_EMPTY_FLAGS),)), + (cygrpc.operation_receive_close_on_server(_EMPTY_FLAGS),), _receive_close_on_server(state)) state.due.add(_RECEIVE_CLOSE_ON_SERVER_TOKEN) if method_handler.request_streaming: @@ -584,7 +579,13 @@ def _handle_call(rpc_event, generic_handlers, thread_pool, if not rpc_event.success: return None, None if rpc_event.request_call_details.method is not None: - method_handler = _find_method_handler(rpc_event, generic_handlers) + try: + method_handler = _find_method_handler(rpc_event, generic_handlers) + except Exception as exception: # pylint: disable=broad-except + details = 'Exception servicing handler: {}'.format(exception) + logging.exception(details) + return _reject_rpc(rpc_event, cygrpc.StatusCode.unknown, + b'Error in service handler!'), None if method_handler is None: return _reject_rpc(rpc_event, cygrpc.StatusCode.unimplemented, b'Method not found!'), None diff --git a/src/python/grpcio_tests/tests/unit/_cython/_cancel_many_calls_test.py b/src/python/grpcio_tests/tests/unit/_cython/_cancel_many_calls_test.py index 3793bba50d7..a8a7175cc71 100644 --- a/src/python/grpcio_tests/tests/unit/_cython/_cancel_many_calls_test.py +++ b/src/python/grpcio_tests/tests/unit/_cython/_cancel_many_calls_test.py @@ -65,12 +65,10 @@ class _Handler(object): with self._lock: self._call.start_server_batch( - cygrpc.Operations( - (cygrpc.operation_receive_close_on_server(_EMPTY_FLAGS),)), + (cygrpc.operation_receive_close_on_server(_EMPTY_FLAGS),), _RECEIVE_CLOSE_ON_SERVER_TAG) self._call.start_server_batch( - cygrpc.Operations( - (cygrpc.operation_receive_message(_EMPTY_FLAGS),)), + (cygrpc.operation_receive_message(_EMPTY_FLAGS),), _RECEIVE_MESSAGE_TAG) first_event = self._completion_queue.poll() if _is_cancellation_event(first_event): @@ -84,8 +82,8 @@ class _Handler(object): cygrpc.operation_send_status_from_server( _EMPTY_METADATA, cygrpc.StatusCode.ok, b'test details!', _EMPTY_FLAGS),) - self._call.start_server_batch( - cygrpc.Operations(operations), _SERVER_COMPLETE_CALL_TAG) + self._call.start_server_batch(operations, + _SERVER_COMPLETE_CALL_TAG) self._completion_queue.poll() self._completion_queue.poll() @@ -179,8 +177,7 @@ class CancelManyCallsTest(unittest.TestCase): cygrpc.operation_receive_message(_EMPTY_FLAGS), cygrpc.operation_receive_status_on_client(_EMPTY_FLAGS),) tag = 'client_complete_call_{0:04d}_tag'.format(index) - client_call.start_client_batch( - cygrpc.Operations(operations), tag) + client_call.start_client_batch(operations, tag) client_due.add(tag) client_calls.append(client_call) diff --git a/src/python/grpcio_tests/tests/unit/_cython/_no_messages_server_completion_queue_per_call_test.py b/src/python/grpcio_tests/tests/unit/_cython/_no_messages_server_completion_queue_per_call_test.py index 14cc66675c3..d08003af444 100644 --- a/src/python/grpcio_tests/tests/unit/_cython/_no_messages_server_completion_queue_per_call_test.py +++ b/src/python/grpcio_tests/tests/unit/_cython/_no_messages_server_completion_queue_per_call_test.py @@ -48,20 +48,19 @@ class Test(_common.RpcTest, unittest.TestCase): client_complete_rpc_tag = 'client_complete_rpc_tag' with self.client_condition: client_receive_initial_metadata_start_batch_result = ( - client_call.start_client_batch( - cygrpc.Operations([ - cygrpc.operation_receive_initial_metadata( - _common.EMPTY_FLAGS), - ]), client_receive_initial_metadata_tag)) + client_call.start_client_batch([ + cygrpc.operation_receive_initial_metadata( + _common.EMPTY_FLAGS), + ], client_receive_initial_metadata_tag)) client_complete_rpc_start_batch_result = client_call.start_client_batch( - cygrpc.Operations([ + [ cygrpc.operation_send_initial_metadata( _common.INVOCATION_METADATA, _common.EMPTY_FLAGS), cygrpc.operation_send_close_from_client( _common.EMPTY_FLAGS), cygrpc.operation_receive_status_on_client( _common.EMPTY_FLAGS), - ]), client_complete_rpc_tag) + ], client_complete_rpc_tag) self.client_driver.add_due({ client_receive_initial_metadata_tag, client_complete_rpc_tag, diff --git a/src/python/grpcio_tests/tests/unit/_cython/_no_messages_single_server_completion_queue_test.py b/src/python/grpcio_tests/tests/unit/_cython/_no_messages_single_server_completion_queue_test.py index 1e44bcc4dc6..d0166a2b29f 100644 --- a/src/python/grpcio_tests/tests/unit/_cython/_no_messages_single_server_completion_queue_test.py +++ b/src/python/grpcio_tests/tests/unit/_cython/_no_messages_single_server_completion_queue_test.py @@ -43,20 +43,19 @@ class Test(_common.RpcTest, unittest.TestCase): client_complete_rpc_tag = 'client_complete_rpc_tag' with self.client_condition: client_receive_initial_metadata_start_batch_result = ( - client_call.start_client_batch( - cygrpc.Operations([ - cygrpc.operation_receive_initial_metadata( - _common.EMPTY_FLAGS), - ]), client_receive_initial_metadata_tag)) + client_call.start_client_batch([ + cygrpc.operation_receive_initial_metadata( + _common.EMPTY_FLAGS), + ], client_receive_initial_metadata_tag)) client_complete_rpc_start_batch_result = client_call.start_client_batch( - cygrpc.Operations([ + [ cygrpc.operation_send_initial_metadata( _common.INVOCATION_METADATA, _common.EMPTY_FLAGS), cygrpc.operation_send_close_from_client( _common.EMPTY_FLAGS), cygrpc.operation_receive_status_on_client( _common.EMPTY_FLAGS), - ]), client_complete_rpc_tag) + ], client_complete_rpc_tag) self.client_driver.add_due({ client_receive_initial_metadata_tag, client_complete_rpc_tag, diff --git a/src/python/grpcio_tests/tests/unit/_cython/_read_some_but_not_all_responses_test.py b/src/python/grpcio_tests/tests/unit/_cython/_read_some_but_not_all_responses_test.py index d49eb9e7e5e..1deb15ba032 100644 --- a/src/python/grpcio_tests/tests/unit/_cython/_read_some_but_not_all_responses_test.py +++ b/src/python/grpcio_tests/tests/unit/_cython/_read_some_but_not_all_responses_test.py @@ -157,19 +157,17 @@ class ReadSomeButNotAllResponsesTest(unittest.TestCase): client_complete_rpc_tag = 'client_complete_rpc_tag' with client_condition: client_receive_initial_metadata_start_batch_result = ( - client_call.start_client_batch( - cygrpc.Operations([ - cygrpc.operation_receive_initial_metadata(_EMPTY_FLAGS), - ]), client_receive_initial_metadata_tag)) + client_call.start_client_batch([ + cygrpc.operation_receive_initial_metadata(_EMPTY_FLAGS), + ], client_receive_initial_metadata_tag)) client_due.add(client_receive_initial_metadata_tag) client_complete_rpc_start_batch_result = ( - client_call.start_client_batch( - cygrpc.Operations([ - cygrpc.operation_send_initial_metadata(_EMPTY_METADATA, - _EMPTY_FLAGS), - cygrpc.operation_send_close_from_client(_EMPTY_FLAGS), - cygrpc.operation_receive_status_on_client(_EMPTY_FLAGS), - ]), client_complete_rpc_tag)) + client_call.start_client_batch([ + cygrpc.operation_send_initial_metadata(_EMPTY_METADATA, + _EMPTY_FLAGS), + cygrpc.operation_send_close_from_client(_EMPTY_FLAGS), + cygrpc.operation_receive_status_on_client(_EMPTY_FLAGS), + ], client_complete_rpc_tag)) client_due.add(client_complete_rpc_tag) server_rpc_event = server_driver.first_event() @@ -209,10 +207,9 @@ class ReadSomeButNotAllResponsesTest(unittest.TestCase): with client_condition: client_receive_first_message_tag = 'client_receive_first_message_tag' client_receive_first_message_start_batch_result = ( - client_call.start_client_batch( - cygrpc.Operations([ - cygrpc.operation_receive_message(_EMPTY_FLAGS), - ]), client_receive_first_message_tag)) + client_call.start_client_batch([ + cygrpc.operation_receive_message(_EMPTY_FLAGS), + ], client_receive_first_message_tag)) client_due.add(client_receive_first_message_tag) client_receive_first_message_event = client_driver.event_with_tag( client_receive_first_message_tag) diff --git a/src/python/grpcio_tests/tests/unit/_cython/cygrpc_test.py b/src/python/grpcio_tests/tests/unit/_cython/cygrpc_test.py index 017f10b222d..4eda6854865 100644 --- a/src/python/grpcio_tests/tests/unit/_cython/cygrpc_test.py +++ b/src/python/grpcio_tests/tests/unit/_cython/cygrpc_test.py @@ -35,17 +35,6 @@ def _metadata_plugin(context, callback): class TypeSmokeTest(unittest.TestCase): - def testOperationsIteration(self): - operations = cygrpc.Operations( - [cygrpc.operation_send_message(b'asdf', _EMPTY_FLAGS)]) - iterator = iter(operations) - operation = next(iterator) - self.assertIsInstance(operation, cygrpc.Operation) - # `Operation`s are write-only structures; can't directly debug anything out - # of them. Just check that we stop iterating. - with self.assertRaises(StopIteration): - next(iterator) - def testOperationFlags(self): operation = cygrpc.operation_send_message(b'asdf', cygrpc.WriteFlag.no_compress) @@ -155,8 +144,7 @@ class ServerClientMixin(object): def performer(): tag = object() try: - call_result = call.start_client_batch( - cygrpc.Operations(operations), tag) + call_result = call.start_client_batch(operations, tag) self.assertEqual(cygrpc.CallError.ok, call_result) event = queue.poll(deadline) self.assertEqual(cygrpc.CompletionType.operation_complete, From ebcc6b398d52cd084c60754f26c2d8f9de62818a Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Fri, 8 Dec 2017 15:39:53 -0800 Subject: [PATCH 080/127] Update extconf.rb for c++ conversion, move CFLAGS to CPPFLAGS when compiling core. --- src/ruby/ext/grpc/extconf.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ruby/ext/grpc/extconf.rb b/src/ruby/ext/grpc/extconf.rb index e5ab02b9fc0..b0f3cc62a2c 100644 --- a/src/ruby/ext/grpc/extconf.rb +++ b/src/ruby/ext/grpc/extconf.rb @@ -60,7 +60,7 @@ ENV['EMBED_ZLIB'] = 'true' ENV['EMBED_CARES'] = 'true' ENV['ARCH_FLAGS'] = RbConfig::CONFIG['ARCH_FLAG'] ENV['ARCH_FLAGS'] = '-arch i386 -arch x86_64' if RUBY_PLATFORM =~ /darwin/ -ENV['CFLAGS'] = '-DGPR_BACKWARDS_COMPATIBILITY_MODE' +ENV['CPPFLAGS'] = '-DGPR_BACKWARDS_COMPATIBILITY_MODE' output_dir = File.expand_path(RbConfig::CONFIG['topdir']) grpc_lib_dir = File.join(output_dir, 'libs', grpc_config) From 38466bc00ebbe1c7ed3bfb119fd53e476f904440 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Sat, 9 Dec 2017 09:13:47 -0800 Subject: [PATCH 081/127] precompute transitive closure for speed --- .../sanity/check_sources_and_headers.py | 42 ++++++++++++++++--- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/tools/run_tests/sanity/check_sources_and_headers.py b/tools/run_tests/sanity/check_sources_and_headers.py index cae175cfc34..986b626b496 100755 --- a/tools/run_tests/sanity/check_sources_and_headers.py +++ b/tools/run_tests/sanity/check_sources_and_headers.py @@ -29,28 +29,58 @@ assert re_inc1.match('#include "foo"').group(1) == 'foo' re_inc2 = re.compile(r'^#\s*include\s*<((grpc|grpc\+\+)/[^"]*)>') assert re_inc2.match('#include ').group(1) == 'grpc++/foo' + def get_target(name): for target in js: if target['name'] == name: return target assert False, 'no target %s' % name + +def get_headers_transitive(): + """Computes set of headers transitively provided by each target""" + target_headers_transitive = {} + for target in js: + target_name = target['name'] + assert not target_headers_transitive.has_key(target_name) + target_headers_transitive[target_name] = set(target['headers']) + + # Make sure each target's transitive headers contain those + # of their dependencies. If not, add them and continue doing + # so until we get a full pass over all targets without any updates. + closure_changed = True + while closure_changed: + closure_changed = False + for target in js: + target_name = target['name'] + for dep in target['deps']: + headers = target_headers_transitive[target_name] + old_count = len(headers) + headers.update(target_headers_transitive[dep]) + if old_count != len(headers): + closure_changed=True + return target_headers_transitive + + +# precompute transitive closure of headers provided by each target +target_headers_transitive = get_headers_transitive() + + def target_has_header(target, name): - if name.startswith('absl/'): return True - # print target['name'], name - if name in target['headers']: + if name in target_headers_transitive[target['name']]: + return True + if name.startswith('absl/'): return True - for dep in target['deps']: - if target_has_header(get_target(dep), name): - return True if name in ['src/core/lib/profiling/stap_probes.h', 'src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h']: return True return False + def produces_object(name): return os.path.splitext(name)[1] in ['.c', '.cc'] + c_ish = {} obj_producer_to_source = {'c': c_ish, 'c++': c_ish, 'csharp': {}} From 9bc44e38296fe5c8001929b61851d0a1ba326a15 Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Sun, 10 Dec 2017 18:25:25 -0800 Subject: [PATCH 082/127] Introduce ServicerContext.abort to abort an RPC gRPC Python required RPCs terminating with non-OK status code to still return a valid response value after calling set_code, even though the response value was not supposed to be communicated to the client, and returning None is considered a programming error. This commit introduces an alternative mechanism to terminate RPCs by calling the `abort` method on `ServicerContext` passed to the handler, which raises an exception and signals to the gRPC runtime to abort the RPC with the specified status code and details. --- src/python/grpcio/grpc/__init__.py | 40 ++++++++++++++----- src/python/grpcio/grpc/_server.py | 21 ++++++++-- .../grpc_testing/_server/_servicer_context.py | 3 ++ 3 files changed, 50 insertions(+), 14 deletions(-) diff --git a/src/python/grpcio/grpc/__init__.py b/src/python/grpcio/grpc/__init__.py index 564772527e8..0f6bdfc1c2d 100644 --- a/src/python/grpcio/grpc/__init__.py +++ b/src/python/grpcio/grpc/__init__.py @@ -834,28 +834,48 @@ class ServicerContext(six.with_metaclass(abc.ABCMeta, RpcContext)): """ raise NotImplementedError() + @abc.abstractmethod + def abort(self, code, details): + """Raises an exception to terminate the RPC with a non-OK status. + + The code and details passed as arguments will supercede any existing + ones. + + Args: + code: A StatusCode object to be sent to the client. + It must not be StatusCode.OK. + details: An ASCII-encodable string to be sent to the client upon + termination of the RPC. + + Raises: + Exception: An exception is always raised to signal the abortion the + RPC to the gRPC runtime. + """ + raise NotImplementedError() + @abc.abstractmethod def set_code(self, code): """Sets the value to be used as status code upon RPC completion. - This method need not be called by method implementations if they wish the - gRPC runtime to determine the status code of the RPC. + This method need not be called by method implementations if they wish + the gRPC runtime to determine the status code of the RPC. - Args: - code: A StatusCode object to be sent to the client. - """ + Args: + code: A StatusCode object to be sent to the client. + """ raise NotImplementedError() @abc.abstractmethod def set_details(self, details): """Sets the value to be used as detail string upon RPC completion. - This method need not be called by method implementations if they have no - details to transmit. + This method need not be called by method implementations if they have + no details to transmit. - Args: - details: An arbitrary string to be sent to the client upon completion. - """ + Args: + details: An ASCII-encodable string to be sent to the client upon + termination of the RPC. + """ raise NotImplementedError() diff --git a/src/python/grpcio/grpc/_server.py b/src/python/grpcio/grpc/_server.py index 308b7535cc3..7b78a8be736 100644 --- a/src/python/grpcio/grpc/_server.py +++ b/src/python/grpcio/grpc/_server.py @@ -96,6 +96,7 @@ class _RPCState(object): self.statused = False self.rpc_errors = [] self.callbacks = [] + self.abortion = None def _raise_rpc_error(state): @@ -273,6 +274,13 @@ class _Context(grpc.ServicerContext): with self._state.condition: self._state.trailing_metadata = trailing_metadata + def abort(self, code, details): + with self._state.condition: + self._state.code = code + self._state.details = _common.encode(details) + self._state.abortion = Exception() + raise self._state.abortion + def set_code(self, code): with self._state.condition: self._state.code = code @@ -369,7 +377,10 @@ def _call_behavior(rpc_event, state, behavior, argument, request_deserializer): return behavior(argument, context), True except Exception as exception: # pylint: disable=broad-except with state.condition: - if exception not in state.rpc_errors: + if exception is state.abortion: + _abort(state, rpc_event.operation_call, + cygrpc.StatusCode.unknown, b'RPC Aborted') + elif exception not in state.rpc_errors: details = 'Exception calling application: {}'.format(exception) logging.exception(details) _abort(state, rpc_event.operation_call, @@ -384,7 +395,10 @@ def _take_response_from_response_iterator(rpc_event, state, response_iterator): return None, True except Exception as exception: # pylint: disable=broad-except with state.condition: - if exception not in state.rpc_errors: + if exception is state.abortion: + _abort(state, rpc_event.operation_call, + cygrpc.StatusCode.unknown, b'RPC Aborted') + elif exception not in state.rpc_errors: details = 'Exception iterating responses: {}'.format(exception) logging.exception(details) _abort(state, rpc_event.operation_call, @@ -430,12 +444,11 @@ def _send_response(rpc_event, state, serialized_response): def _status(rpc_event, state, serialized_response): with state.condition: if state.client is not _CANCELLED: - trailing_metadata = state.trailing_metadata code = _completion_code(state) details = _details(state) operations = [ cygrpc.operation_send_status_from_server( - trailing_metadata, code, details, _EMPTY_FLAGS), + state.trailing_metadata, code, details, _EMPTY_FLAGS), ] if state.initial_metadata_allowed: operations.append( diff --git a/src/python/grpcio_testing/grpc_testing/_server/_servicer_context.py b/src/python/grpcio_testing/grpc_testing/_server/_servicer_context.py index 496689ded0d..90eeb130d30 100644 --- a/src/python/grpcio_testing/grpc_testing/_server/_servicer_context.py +++ b/src/python/grpcio_testing/grpc_testing/_server/_servicer_context.py @@ -67,6 +67,9 @@ class ServicerContext(grpc.ServicerContext): self._rpc.set_trailing_metadata( _common.fuss_with_metadata(trailing_metadata)) + def abort(self, code, details): + raise NotImplementedError() + def set_code(self, code): self._rpc.set_code(code) From 90ab995cb0f3ef29c1f284a4c361a9c2750ef2dd Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Sun, 10 Dec 2017 18:27:21 -0800 Subject: [PATCH 083/127] Tests for ServicerContext.abort --- .../tests/unit/_metadata_code_details_test.py | 166 ++++++++++++++---- 1 file changed, 134 insertions(+), 32 deletions(-) diff --git a/src/python/grpcio_tests/tests/unit/_metadata_code_details_test.py b/src/python/grpcio_tests/tests/unit/_metadata_code_details_test.py index 6faab94be64..68df6643e75 100644 --- a/src/python/grpcio_tests/tests/unit/_metadata_code_details_test.py +++ b/src/python/grpcio_tests/tests/unit/_metadata_code_details_test.py @@ -56,6 +56,7 @@ class _Servicer(object): def __init__(self): self._lock = threading.Lock() + self._abort_call = False self._code = None self._details = None self._exception = False @@ -67,10 +68,13 @@ class _Servicer(object): self._received_client_metadata = context.invocation_metadata() context.send_initial_metadata(_SERVER_INITIAL_METADATA) context.set_trailing_metadata(_SERVER_TRAILING_METADATA) - if self._code is not None: - context.set_code(self._code) - if self._details is not None: - context.set_details(self._details) + if self._abort_call: + context.abort(self._code, self._details) + else: + if self._code is not None: + context.set_code(self._code) + if self._details is not None: + context.set_details(self._details) if self._exception: raise test_control.Defect() else: @@ -81,10 +85,13 @@ class _Servicer(object): self._received_client_metadata = context.invocation_metadata() context.send_initial_metadata(_SERVER_INITIAL_METADATA) context.set_trailing_metadata(_SERVER_TRAILING_METADATA) - if self._code is not None: - context.set_code(self._code) - if self._details is not None: - context.set_details(self._details) + if self._abort_call: + context.abort(self._code, self._details) + else: + if self._code is not None: + context.set_code(self._code) + if self._details is not None: + context.set_details(self._details) for _ in range(test_constants.STREAM_LENGTH // 2): yield _SERIALIZED_RESPONSE if self._exception: @@ -95,14 +102,16 @@ class _Servicer(object): self._received_client_metadata = context.invocation_metadata() context.send_initial_metadata(_SERVER_INITIAL_METADATA) context.set_trailing_metadata(_SERVER_TRAILING_METADATA) - if self._code is not None: - context.set_code(self._code) - if self._details is not None: - context.set_details(self._details) # TODO(https://github.com/grpc/grpc/issues/6891): just ignore the # request iterator. - for ignored_request in request_iterator: - pass + list(request_iterator) + if self._abort_call: + context.abort(self._code, self._details) + else: + if self._code is not None: + context.set_code(self._code) + if self._details is not None: + context.set_details(self._details) if self._exception: raise test_control.Defect() else: @@ -113,19 +122,25 @@ class _Servicer(object): self._received_client_metadata = context.invocation_metadata() context.send_initial_metadata(_SERVER_INITIAL_METADATA) context.set_trailing_metadata(_SERVER_TRAILING_METADATA) - if self._code is not None: - context.set_code(self._code) - if self._details is not None: - context.set_details(self._details) # TODO(https://github.com/grpc/grpc/issues/6891): just ignore the # request iterator. - for ignored_request in request_iterator: - pass + list(request_iterator) + if self._abort_call: + context.abort(self._code, self._details) + else: + if self._code is not None: + context.set_code(self._code) + if self._details is not None: + context.set_details(self._details) for _ in range(test_constants.STREAM_LENGTH // 3): yield object() if self._exception: raise test_control.Defect() + def set_abort_call(self): + with self._lock: + self._abort_call = True + def set_code(self, code): with self._lock: self._code = code @@ -215,8 +230,7 @@ class MetadataCodeDetailsTest(unittest.TestCase): call = self._unary_stream( _SERIALIZED_REQUEST, metadata=_CLIENT_METADATA) received_initial_metadata = call.initial_metadata() - for _ in call: - pass + list(call) self.assertTrue( test_common.metadata_transmitted( @@ -256,8 +270,7 @@ class MetadataCodeDetailsTest(unittest.TestCase): iter([object()] * test_constants.STREAM_LENGTH), metadata=_CLIENT_METADATA) received_initial_metadata = call.initial_metadata() - for _ in call: - pass + list(call) self.assertTrue( test_common.metadata_transmitted( @@ -271,6 +284,99 @@ class MetadataCodeDetailsTest(unittest.TestCase): self.assertIs(grpc.StatusCode.OK, call.code()) self.assertEqual(_DETAILS, call.details()) + def testAbortedUnaryUnary(self): + self._servicer.set_code(_NON_OK_CODE) + self._servicer.set_details(_DETAILS) + self._servicer.set_abort_call() + + with self.assertRaises(grpc.RpcError) as exception_context: + self._unary_unary.with_call(object(), metadata=_CLIENT_METADATA) + + self.assertTrue( + test_common.metadata_transmitted( + _CLIENT_METADATA, self._servicer.received_client_metadata())) + self.assertTrue( + test_common.metadata_transmitted( + _SERVER_INITIAL_METADATA, + exception_context.exception.initial_metadata())) + self.assertTrue( + test_common.metadata_transmitted( + _SERVER_TRAILING_METADATA, + exception_context.exception.trailing_metadata())) + self.assertIs(_NON_OK_CODE, exception_context.exception.code()) + self.assertEqual(_DETAILS, exception_context.exception.details()) + + def testAbortedUnaryStream(self): + self._servicer.set_code(_NON_OK_CODE) + self._servicer.set_details(_DETAILS) + self._servicer.set_abort_call() + + call = self._unary_stream( + _SERIALIZED_REQUEST, metadata=_CLIENT_METADATA) + received_initial_metadata = call.initial_metadata() + with self.assertRaises(grpc.RpcError): + self.assertEqual(len(list(call)), 0) + + self.assertTrue( + test_common.metadata_transmitted( + _CLIENT_METADATA, self._servicer.received_client_metadata())) + self.assertTrue( + test_common.metadata_transmitted(_SERVER_INITIAL_METADATA, + received_initial_metadata)) + self.assertTrue( + test_common.metadata_transmitted(_SERVER_TRAILING_METADATA, + call.trailing_metadata())) + self.assertIs(_NON_OK_CODE, call.code()) + self.assertEqual(_DETAILS, call.details()) + + def testAbortedStreamUnary(self): + self._servicer.set_code(_NON_OK_CODE) + self._servicer.set_details(_DETAILS) + self._servicer.set_abort_call() + + with self.assertRaises(grpc.RpcError) as exception_context: + self._stream_unary.with_call( + iter([_SERIALIZED_REQUEST] * test_constants.STREAM_LENGTH), + metadata=_CLIENT_METADATA) + + self.assertTrue( + test_common.metadata_transmitted( + _CLIENT_METADATA, self._servicer.received_client_metadata())) + self.assertTrue( + test_common.metadata_transmitted( + _SERVER_INITIAL_METADATA, + exception_context.exception.initial_metadata())) + self.assertTrue( + test_common.metadata_transmitted( + _SERVER_TRAILING_METADATA, + exception_context.exception.trailing_metadata())) + self.assertIs(_NON_OK_CODE, exception_context.exception.code()) + self.assertEqual(_DETAILS, exception_context.exception.details()) + + def testAbortedStreamStream(self): + self._servicer.set_code(_NON_OK_CODE) + self._servicer.set_details(_DETAILS) + self._servicer.set_abort_call() + + call = self._stream_stream( + iter([object()] * test_constants.STREAM_LENGTH), + metadata=_CLIENT_METADATA) + received_initial_metadata = call.initial_metadata() + with self.assertRaises(grpc.RpcError): + self.assertEqual(len(list(call)), 0) + + self.assertTrue( + test_common.metadata_transmitted( + _CLIENT_METADATA, self._servicer.received_client_metadata())) + self.assertTrue( + test_common.metadata_transmitted(_SERVER_INITIAL_METADATA, + received_initial_metadata)) + self.assertTrue( + test_common.metadata_transmitted(_SERVER_TRAILING_METADATA, + call.trailing_metadata())) + self.assertIs(_NON_OK_CODE, call.code()) + self.assertEqual(_DETAILS, call.details()) + def testCustomCodeUnaryUnary(self): self._servicer.set_code(_NON_OK_CODE) self._servicer.set_details(_DETAILS) @@ -300,8 +406,7 @@ class MetadataCodeDetailsTest(unittest.TestCase): _SERIALIZED_REQUEST, metadata=_CLIENT_METADATA) received_initial_metadata = call.initial_metadata() with self.assertRaises(grpc.RpcError): - for _ in call: - pass + list(call) self.assertTrue( test_common.metadata_transmitted( @@ -347,8 +452,7 @@ class MetadataCodeDetailsTest(unittest.TestCase): metadata=_CLIENT_METADATA) received_initial_metadata = call.initial_metadata() with self.assertRaises(grpc.RpcError) as exception_context: - for _ in call: - pass + list(call) self.assertTrue( test_common.metadata_transmitted( @@ -394,8 +498,7 @@ class MetadataCodeDetailsTest(unittest.TestCase): _SERIALIZED_REQUEST, metadata=_CLIENT_METADATA) received_initial_metadata = call.initial_metadata() with self.assertRaises(grpc.RpcError): - for _ in call: - pass + list(call) self.assertTrue( test_common.metadata_transmitted( @@ -443,8 +546,7 @@ class MetadataCodeDetailsTest(unittest.TestCase): metadata=_CLIENT_METADATA) received_initial_metadata = call.initial_metadata() with self.assertRaises(grpc.RpcError): - for _ in call: - pass + list(call) self.assertTrue( test_common.metadata_transmitted( From b0afa016cb29d1ca1b55300275aeb54c28e74a62 Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Sun, 10 Dec 2017 06:31:00 -0800 Subject: [PATCH 084/127] Refactor: Rename call to response_iterator_call Rename call to response_iterator_call file-wide for response-streaming tests. --- .../tests/unit/_metadata_code_details_test.py | 111 ++++++++++-------- 1 file changed, 59 insertions(+), 52 deletions(-) diff --git a/src/python/grpcio_tests/tests/unit/_metadata_code_details_test.py b/src/python/grpcio_tests/tests/unit/_metadata_code_details_test.py index 68df6643e75..cb59cd37698 100644 --- a/src/python/grpcio_tests/tests/unit/_metadata_code_details_test.py +++ b/src/python/grpcio_tests/tests/unit/_metadata_code_details_test.py @@ -227,10 +227,10 @@ class MetadataCodeDetailsTest(unittest.TestCase): def testSuccessfulUnaryStream(self): self._servicer.set_details(_DETAILS) - call = self._unary_stream( + response_iterator_call = self._unary_stream( _SERIALIZED_REQUEST, metadata=_CLIENT_METADATA) - received_initial_metadata = call.initial_metadata() - list(call) + received_initial_metadata = response_iterator_call.initial_metadata() + list(response_iterator_call) self.assertTrue( test_common.metadata_transmitted( @@ -239,10 +239,11 @@ class MetadataCodeDetailsTest(unittest.TestCase): test_common.metadata_transmitted(_SERVER_INITIAL_METADATA, received_initial_metadata)) self.assertTrue( - test_common.metadata_transmitted(_SERVER_TRAILING_METADATA, - call.trailing_metadata())) - self.assertIs(grpc.StatusCode.OK, call.code()) - self.assertEqual(_DETAILS, call.details()) + test_common.metadata_transmitted( + _SERVER_TRAILING_METADATA, + response_iterator_call.trailing_metadata())) + self.assertIs(grpc.StatusCode.OK, response_iterator_call.code()) + self.assertEqual(_DETAILS, response_iterator_call.details()) def testSuccessfulStreamUnary(self): self._servicer.set_details(_DETAILS) @@ -266,11 +267,11 @@ class MetadataCodeDetailsTest(unittest.TestCase): def testSuccessfulStreamStream(self): self._servicer.set_details(_DETAILS) - call = self._stream_stream( + response_iterator_call = self._stream_stream( iter([object()] * test_constants.STREAM_LENGTH), metadata=_CLIENT_METADATA) - received_initial_metadata = call.initial_metadata() - list(call) + received_initial_metadata = response_iterator_call.initial_metadata() + list(response_iterator_call) self.assertTrue( test_common.metadata_transmitted( @@ -279,10 +280,11 @@ class MetadataCodeDetailsTest(unittest.TestCase): test_common.metadata_transmitted(_SERVER_INITIAL_METADATA, received_initial_metadata)) self.assertTrue( - test_common.metadata_transmitted(_SERVER_TRAILING_METADATA, - call.trailing_metadata())) - self.assertIs(grpc.StatusCode.OK, call.code()) - self.assertEqual(_DETAILS, call.details()) + test_common.metadata_transmitted( + _SERVER_TRAILING_METADATA, + response_iterator_call.trailing_metadata())) + self.assertIs(grpc.StatusCode.OK, response_iterator_call.code()) + self.assertEqual(_DETAILS, response_iterator_call.details()) def testAbortedUnaryUnary(self): self._servicer.set_code(_NON_OK_CODE) @@ -311,11 +313,11 @@ class MetadataCodeDetailsTest(unittest.TestCase): self._servicer.set_details(_DETAILS) self._servicer.set_abort_call() - call = self._unary_stream( + response_iterator_call = self._unary_stream( _SERIALIZED_REQUEST, metadata=_CLIENT_METADATA) - received_initial_metadata = call.initial_metadata() + received_initial_metadata = response_iterator_call.initial_metadata() with self.assertRaises(grpc.RpcError): - self.assertEqual(len(list(call)), 0) + self.assertEqual(len(list(response_iterator_call)), 0) self.assertTrue( test_common.metadata_transmitted( @@ -324,10 +326,11 @@ class MetadataCodeDetailsTest(unittest.TestCase): test_common.metadata_transmitted(_SERVER_INITIAL_METADATA, received_initial_metadata)) self.assertTrue( - test_common.metadata_transmitted(_SERVER_TRAILING_METADATA, - call.trailing_metadata())) - self.assertIs(_NON_OK_CODE, call.code()) - self.assertEqual(_DETAILS, call.details()) + test_common.metadata_transmitted( + _SERVER_TRAILING_METADATA, + response_iterator_call.trailing_metadata())) + self.assertIs(_NON_OK_CODE, response_iterator_call.code()) + self.assertEqual(_DETAILS, response_iterator_call.details()) def testAbortedStreamUnary(self): self._servicer.set_code(_NON_OK_CODE) @@ -358,12 +361,12 @@ class MetadataCodeDetailsTest(unittest.TestCase): self._servicer.set_details(_DETAILS) self._servicer.set_abort_call() - call = self._stream_stream( + response_iterator_call = self._stream_stream( iter([object()] * test_constants.STREAM_LENGTH), metadata=_CLIENT_METADATA) - received_initial_metadata = call.initial_metadata() + received_initial_metadata = response_iterator_call.initial_metadata() with self.assertRaises(grpc.RpcError): - self.assertEqual(len(list(call)), 0) + self.assertEqual(len(list(response_iterator_call)), 0) self.assertTrue( test_common.metadata_transmitted( @@ -372,10 +375,11 @@ class MetadataCodeDetailsTest(unittest.TestCase): test_common.metadata_transmitted(_SERVER_INITIAL_METADATA, received_initial_metadata)) self.assertTrue( - test_common.metadata_transmitted(_SERVER_TRAILING_METADATA, - call.trailing_metadata())) - self.assertIs(_NON_OK_CODE, call.code()) - self.assertEqual(_DETAILS, call.details()) + test_common.metadata_transmitted( + _SERVER_TRAILING_METADATA, + response_iterator_call.trailing_metadata())) + self.assertIs(_NON_OK_CODE, response_iterator_call.code()) + self.assertEqual(_DETAILS, response_iterator_call.details()) def testCustomCodeUnaryUnary(self): self._servicer.set_code(_NON_OK_CODE) @@ -402,11 +406,11 @@ class MetadataCodeDetailsTest(unittest.TestCase): self._servicer.set_code(_NON_OK_CODE) self._servicer.set_details(_DETAILS) - call = self._unary_stream( + response_iterator_call = self._unary_stream( _SERIALIZED_REQUEST, metadata=_CLIENT_METADATA) - received_initial_metadata = call.initial_metadata() + received_initial_metadata = response_iterator_call.initial_metadata() with self.assertRaises(grpc.RpcError): - list(call) + list(response_iterator_call) self.assertTrue( test_common.metadata_transmitted( @@ -415,10 +419,11 @@ class MetadataCodeDetailsTest(unittest.TestCase): test_common.metadata_transmitted(_SERVER_INITIAL_METADATA, received_initial_metadata)) self.assertTrue( - test_common.metadata_transmitted(_SERVER_TRAILING_METADATA, - call.trailing_metadata())) - self.assertIs(_NON_OK_CODE, call.code()) - self.assertEqual(_DETAILS, call.details()) + test_common.metadata_transmitted( + _SERVER_TRAILING_METADATA, + response_iterator_call.trailing_metadata())) + self.assertIs(_NON_OK_CODE, response_iterator_call.code()) + self.assertEqual(_DETAILS, response_iterator_call.details()) def testCustomCodeStreamUnary(self): self._servicer.set_code(_NON_OK_CODE) @@ -447,12 +452,12 @@ class MetadataCodeDetailsTest(unittest.TestCase): self._servicer.set_code(_NON_OK_CODE) self._servicer.set_details(_DETAILS) - call = self._stream_stream( + response_iterator_call = self._stream_stream( iter([object()] * test_constants.STREAM_LENGTH), metadata=_CLIENT_METADATA) - received_initial_metadata = call.initial_metadata() + received_initial_metadata = response_iterator_call.initial_metadata() with self.assertRaises(grpc.RpcError) as exception_context: - list(call) + list(response_iterator_call) self.assertTrue( test_common.metadata_transmitted( @@ -494,11 +499,11 @@ class MetadataCodeDetailsTest(unittest.TestCase): self._servicer.set_details(_DETAILS) self._servicer.set_exception() - call = self._unary_stream( + response_iterator_call = self._unary_stream( _SERIALIZED_REQUEST, metadata=_CLIENT_METADATA) - received_initial_metadata = call.initial_metadata() + received_initial_metadata = response_iterator_call.initial_metadata() with self.assertRaises(grpc.RpcError): - list(call) + list(response_iterator_call) self.assertTrue( test_common.metadata_transmitted( @@ -507,10 +512,11 @@ class MetadataCodeDetailsTest(unittest.TestCase): test_common.metadata_transmitted(_SERVER_INITIAL_METADATA, received_initial_metadata)) self.assertTrue( - test_common.metadata_transmitted(_SERVER_TRAILING_METADATA, - call.trailing_metadata())) - self.assertIs(_NON_OK_CODE, call.code()) - self.assertEqual(_DETAILS, call.details()) + test_common.metadata_transmitted( + _SERVER_TRAILING_METADATA, + response_iterator_call.trailing_metadata())) + self.assertIs(_NON_OK_CODE, response_iterator_call.code()) + self.assertEqual(_DETAILS, response_iterator_call.details()) def testCustomCodeExceptionStreamUnary(self): self._servicer.set_code(_NON_OK_CODE) @@ -541,12 +547,12 @@ class MetadataCodeDetailsTest(unittest.TestCase): self._servicer.set_details(_DETAILS) self._servicer.set_exception() - call = self._stream_stream( + response_iterator_call = self._stream_stream( iter([object()] * test_constants.STREAM_LENGTH), metadata=_CLIENT_METADATA) - received_initial_metadata = call.initial_metadata() + received_initial_metadata = response_iterator_call.initial_metadata() with self.assertRaises(grpc.RpcError): - list(call) + list(response_iterator_call) self.assertTrue( test_common.metadata_transmitted( @@ -555,10 +561,11 @@ class MetadataCodeDetailsTest(unittest.TestCase): test_common.metadata_transmitted(_SERVER_INITIAL_METADATA, received_initial_metadata)) self.assertTrue( - test_common.metadata_transmitted(_SERVER_TRAILING_METADATA, - call.trailing_metadata())) - self.assertIs(_NON_OK_CODE, call.code()) - self.assertEqual(_DETAILS, call.details()) + test_common.metadata_transmitted( + _SERVER_TRAILING_METADATA, + response_iterator_call.trailing_metadata())) + self.assertIs(_NON_OK_CODE, response_iterator_call.code()) + self.assertEqual(_DETAILS, response_iterator_call.details()) def testCustomCodeReturnNoneUnaryUnary(self): self._servicer.set_code(_NON_OK_CODE) From 2b57a10db419186b7f8155ca64be1a0a4916788f Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Mon, 11 Dec 2017 11:19:08 -0800 Subject: [PATCH 085/127] pre-boot xcode sim in objc-tests --- src/objective-c/tests/run_tests.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/objective-c/tests/run_tests.sh b/src/objective-c/tests/run_tests.sh index 62c4e10b993..a9a97aad2cc 100755 --- a/src/objective-c/tests/run_tests.sh +++ b/src/objective-c/tests/run_tests.sh @@ -34,6 +34,18 @@ $BINDIR/interop_server --port=5051 --max_send_message_size=8388608 --use_tls & # Kill them when this script exits. trap 'kill -9 `jobs -p` ; echo "EXIT TIME: $(date)"' EXIT +# Boot Xcode first with several retries since Xcode might fail due to a bug: +# http://www.openradar.me/29785686 +xcrun simctl list | egrep 'iPhone 6 \(' +udid=`xcrun simctl list | egrep 'iPhone 6 \(.*\) \(.*\)' | sed -E 's/ *iPhone 6 \(([^\)]*)\).*/\1/g' | head -n 1` +retries=0 +while [ $retries -lt 3 ] && ! open -a Simulator --args -CurrentDeviceUDID $udid ; do +retries=$(($retries+1)) +done +if [ $retries == 3 ]; then + exit 1 +fi + # xcodebuild is very verbose. We filter its output and tell Bash to fail if any # element of the pipe fails. # TODO(jcanizales): Use xctool instead? Issue #2540. From 68e1978e9e972314ea91b0fe3a333117736ace2e Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Sun, 10 Dec 2017 23:20:06 -0800 Subject: [PATCH 086/127] Add gRPC Python service-side interceptor machinery --- src/python/grpcio/grpc/__init__.py | 101 ++++++++++++------ src/python/grpcio/grpc/_interceptor.py | 38 +++++++ src/python/grpcio/grpc/_server.py | 46 +++++--- .../grpcio_tests/tests/unit/_api_test.py | 4 +- 4 files changed, 137 insertions(+), 52 deletions(-) create mode 100644 src/python/grpcio/grpc/_interceptor.py diff --git a/src/python/grpcio/grpc/__init__.py b/src/python/grpcio/grpc/__init__.py index 0f6bdfc1c2d..30ed6d05778 100644 --- a/src/python/grpcio/grpc/__init__.py +++ b/src/python/grpcio/grpc/__init__.py @@ -962,6 +962,34 @@ class ServiceRpcHandler(six.with_metaclass(abc.ABCMeta, GenericRpcHandler)): raise NotImplementedError() +#################### Service-Side Interceptor Interfaces ##################### + + +class ServerInterceptor(six.with_metaclass(abc.ABCMeta)): + """Affords intercepting incoming RPCs on the service-side. + + This is an EXPERIMENTAL API. + """ + + @abc.abstractmethod + def intercept_service(self, continuation, handler_call_details): + """Intercepts incoming RPCs before handing them over to a handler. + + Args: + continuation: A function that takes a HandlerCallDetails and + proceeds to invoke the next interceptor in the chain, if any, + or the RPC handler lookup logic, with the call details passed + as an argument, and returns an RpcMethodHandler instance if + the RPC is considered serviced, or None otherwise. + handler_call_details: A HandlerCallDetails describing the RPC. + + Returns: + An RpcMethodHandler with which the RPC may be serviced if the + interceptor chooses to service this RPC, or None otherwise. + """ + raise NotImplementedError() + + ############################# Server Interface ############################### @@ -1378,51 +1406,56 @@ def secure_channel(target, credentials, options=None): def server(thread_pool, handlers=None, + interceptors=None, options=None, maximum_concurrent_rpcs=None): """Creates a Server with which RPCs can be serviced. - Args: - thread_pool: A futures.ThreadPoolExecutor to be used by the Server - to execute RPC handlers. - handlers: An optional list of GenericRpcHandlers used for executing RPCs. - More handlers may be added by calling add_generic_rpc_handlers any time - before the server is started. - options: An optional list of key-value pairs (channel args in gRPC runtime) - to configure the channel. - maximum_concurrent_rpcs: The maximum number of concurrent RPCs this server - will service before returning RESOURCE_EXHAUSTED status, or None to - indicate no limit. + Args: + thread_pool: A futures.ThreadPoolExecutor to be used by the Server + to execute RPC handlers. + handlers: An optional list of GenericRpcHandlers used for executing RPCs. + More handlers may be added by calling add_generic_rpc_handlers any time + before the server is started. + interceptors: An optional list of ServerInterceptor objects that observe + and optionally manipulate the incoming RPCs before handing them over to + handlers. The interceptors are given control in the order they are + specified. This is an EXPERIMENTAL API. + options: An optional list of key-value pairs (channel args in gRPC runtime) + to configure the channel. + maximum_concurrent_rpcs: The maximum number of concurrent RPCs this server + will service before returning RESOURCE_EXHAUSTED status, or None to + indicate no limit. - Returns: - A Server object. - """ + Returns: + A Server object. + """ from grpc import _server # pylint: disable=cyclic-import return _server.Server(thread_pool, () if handlers is None else handlers, () - if options is None else options, - maximum_concurrent_rpcs) + if interceptors is None else interceptors, () if + options is None else options, maximum_concurrent_rpcs) ################################### __all__ ################################# -__all__ = ('FutureTimeoutError', 'FutureCancelledError', 'Future', - 'ChannelConnectivity', 'StatusCode', 'RpcError', 'RpcContext', - 'Call', 'ChannelCredentials', 'CallCredentials', - 'AuthMetadataContext', 'AuthMetadataPluginCallback', - 'AuthMetadataPlugin', 'ServerCertificateConfiguration', - 'ServerCredentials', 'UnaryUnaryMultiCallable', - 'UnaryStreamMultiCallable', 'StreamUnaryMultiCallable', - 'StreamStreamMultiCallable', 'Channel', 'ServicerContext', - 'RpcMethodHandler', 'HandlerCallDetails', 'GenericRpcHandler', - 'ServiceRpcHandler', 'Server', 'unary_unary_rpc_method_handler', - 'unary_stream_rpc_method_handler', 'stream_unary_rpc_method_handler', - 'stream_stream_rpc_method_handler', - 'method_handlers_generic_handler', 'ssl_channel_credentials', - 'metadata_call_credentials', 'access_token_call_credentials', - 'composite_call_credentials', 'composite_channel_credentials', - 'ssl_server_credentials', 'ssl_server_certificate_configuration', - 'dynamic_ssl_server_credentials', 'channel_ready_future', - 'insecure_channel', 'secure_channel', 'server',) +__all__ = ( + 'FutureTimeoutError', 'FutureCancelledError', 'Future', + 'ChannelConnectivity', 'StatusCode', 'RpcError', 'RpcContext', 'Call', + 'ChannelCredentials', 'CallCredentials', 'AuthMetadataContext', + 'AuthMetadataPluginCallback', 'AuthMetadataPlugin', + 'ServerCertificateConfiguration', 'ServerCredentials', + 'UnaryUnaryMultiCallable', 'UnaryStreamMultiCallable', + 'StreamUnaryMultiCallable', 'StreamStreamMultiCallable', 'Channel', + 'ServicerContext', 'RpcMethodHandler', 'HandlerCallDetails', + 'GenericRpcHandler', 'ServiceRpcHandler', 'Server', 'ServerInterceptor', + 'unary_unary_rpc_method_handler', 'unary_stream_rpc_method_handler', + 'stream_unary_rpc_method_handler', 'stream_stream_rpc_method_handler', + 'method_handlers_generic_handler', 'ssl_channel_credentials', + 'metadata_call_credentials', 'access_token_call_credentials', + 'composite_call_credentials', 'composite_channel_credentials', + 'ssl_server_credentials', 'ssl_server_certificate_configuration', + 'dynamic_ssl_server_credentials', 'channel_ready_future', + 'insecure_channel', 'secure_channel', 'server',) ############################### Extension Shims ################################ diff --git a/src/python/grpcio/grpc/_interceptor.py b/src/python/grpcio/grpc/_interceptor.py new file mode 100644 index 00000000000..7aa2c7ec222 --- /dev/null +++ b/src/python/grpcio/grpc/_interceptor.py @@ -0,0 +1,38 @@ +# Copyright 2017 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"""Implementation of gRPC Python interceptors.""" + + +class _ServicePipeline(object): + + def __init__(self, interceptors): + self.interceptors = tuple(interceptors) + + def _continuation(self, thunk, index): + return lambda context: self._intercept_at(thunk, index, context) + + def _intercept_at(self, thunk, index, context): + if index < len(self.interceptors): + interceptor = self.interceptors[index] + thunk = self._continuation(thunk, index + 1) + return interceptor.intercept_service(thunk, context) + else: + return thunk(context) + + def execute(self, thunk, context): + return self._intercept_at(thunk, 0, context) + + +def service_pipeline(interceptors): + return _ServicePipeline(interceptors) if interceptors else None diff --git a/src/python/grpcio/grpc/_server.py b/src/python/grpcio/grpc/_server.py index 7b78a8be736..8857bd3eb54 100644 --- a/src/python/grpcio/grpc/_server.py +++ b/src/python/grpcio/grpc/_server.py @@ -23,6 +23,7 @@ import six import grpc from grpc import _common +from grpc import _interceptor from grpc._cython import cygrpc from grpc.framework.foundation import callable_util @@ -541,17 +542,25 @@ def _handle_stream_stream(rpc_event, state, method_handler, thread_pool): method_handler.request_deserializer, method_handler.response_serializer) -def _find_method_handler(rpc_event, generic_handlers): - for generic_handler in generic_handlers: - method_handler = generic_handler.service( - _HandlerCallDetails( - _common.decode(rpc_event.request_call_details.method), - rpc_event.request_metadata)) - if method_handler is not None: - return method_handler - else: +def _find_method_handler(rpc_event, generic_handlers, interceptor_pipeline): + + def query_handlers(handler_call_details): + for generic_handler in generic_handlers: + method_handler = generic_handler.service(handler_call_details) + if method_handler is not None: + return method_handler return None + handler_call_details = _HandlerCallDetails( + _common.decode(rpc_event.request_call_details.method), + rpc_event.request_metadata) + + if interceptor_pipeline is not None: + return interceptor_pipeline.execute(query_handlers, + handler_call_details) + else: + return query_handlers(handler_call_details) + def _reject_rpc(rpc_event, status, details): operations = (cygrpc.operation_send_initial_metadata((), _EMPTY_FLAGS), @@ -587,13 +596,14 @@ def _handle_with_method_handler(rpc_event, method_handler, thread_pool): method_handler, thread_pool) -def _handle_call(rpc_event, generic_handlers, thread_pool, +def _handle_call(rpc_event, generic_handlers, interceptor_pipeline, thread_pool, concurrency_exceeded): if not rpc_event.success: return None, None if rpc_event.request_call_details.method is not None: try: - method_handler = _find_method_handler(rpc_event, generic_handlers) + method_handler = _find_method_handler(rpc_event, generic_handlers, + interceptor_pipeline) except Exception as exception: # pylint: disable=broad-except details = 'Exception servicing handler: {}'.format(exception) logging.exception(details) @@ -621,12 +631,14 @@ class _ServerStage(enum.Enum): class _ServerState(object): - def __init__(self, completion_queue, server, generic_handlers, thread_pool, - maximum_concurrent_rpcs): + # pylint: disable=too-many-arguments + def __init__(self, completion_queue, server, generic_handlers, + interceptor_pipeline, thread_pool, maximum_concurrent_rpcs): self.lock = threading.Lock() self.completion_queue = completion_queue self.server = server self.generic_handlers = list(generic_handlers) + self.interceptor_pipeline = interceptor_pipeline self.thread_pool = thread_pool self.stage = _ServerStage.STOPPED self.shutdown_events = None @@ -691,8 +703,8 @@ def _serve(state): state.maximum_concurrent_rpcs is not None and state.active_rpc_count >= state.maximum_concurrent_rpcs) rpc_state, rpc_future = _handle_call( - event, state.generic_handlers, state.thread_pool, - concurrency_exceeded) + event, state.generic_handlers, state.interceptor_pipeline, + state.thread_pool, concurrency_exceeded) if rpc_state is not None: state.rpc_states.add(rpc_state) if rpc_future is not None: @@ -780,12 +792,14 @@ def _start(state): class Server(grpc.Server): - def __init__(self, thread_pool, generic_handlers, options, + # pylint: disable=too-many-arguments + def __init__(self, thread_pool, generic_handlers, interceptors, options, maximum_concurrent_rpcs): completion_queue = cygrpc.CompletionQueue() server = cygrpc.Server(_common.channel_args(options)) server.register_completion_queue(completion_queue) self._state = _ServerState(completion_queue, server, generic_handlers, + _interceptor.service_pipeline(interceptors), thread_pool, maximum_concurrent_rpcs) def add_generic_rpc_handlers(self, generic_rpc_handlers): diff --git a/src/python/grpcio_tests/tests/unit/_api_test.py b/src/python/grpcio_tests/tests/unit/_api_test.py index b14e8d5c753..49f9b9aa7b9 100644 --- a/src/python/grpcio_tests/tests/unit/_api_test.py +++ b/src/python/grpcio_tests/tests/unit/_api_test.py @@ -35,8 +35,8 @@ class AllTest(unittest.TestCase): 'UnaryStreamMultiCallable', 'StreamUnaryMultiCallable', 'StreamStreamMultiCallable', 'Channel', 'ServicerContext', 'RpcMethodHandler', 'HandlerCallDetails', 'GenericRpcHandler', - 'ServiceRpcHandler', 'Server', 'unary_unary_rpc_method_handler', - 'unary_stream_rpc_method_handler', + 'ServiceRpcHandler', 'Server', 'ServerInterceptor', + 'unary_unary_rpc_method_handler', 'unary_stream_rpc_method_handler', 'stream_unary_rpc_method_handler', 'stream_stream_rpc_method_handler', 'method_handlers_generic_handler', 'ssl_channel_credentials', From 108500f194693f0bf1cf4eebcd7ef292fa611287 Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Tue, 12 Dec 2017 11:56:10 -0800 Subject: [PATCH 087/127] Add gRPC Python client-side interceptor machinery --- src/python/grpcio/grpc/__init__.py | 200 ++++++++++++- src/python/grpcio/grpc/_interceptor.py | 280 ++++++++++++++++++ .../grpcio_tests/tests/unit/_api_test.py | 9 +- 3 files changed, 483 insertions(+), 6 deletions(-) diff --git a/src/python/grpcio/grpc/__init__.py b/src/python/grpcio/grpc/__init__.py index 30ed6d05778..8b913ac9495 100644 --- a/src/python/grpcio/grpc/__init__.py +++ b/src/python/grpcio/grpc/__init__.py @@ -342,6 +342,170 @@ class Call(six.with_metaclass(abc.ABCMeta, RpcContext)): raise NotImplementedError() +############## Invocation-Side Interceptor Interfaces & Classes ############## + + +class ClientCallDetails(six.with_metaclass(abc.ABCMeta)): + """Describes an RPC to be invoked. + + This is an EXPERIMENTAL API. + + Attributes: + method: The method name of the RPC. + timeout: An optional duration of time in seconds to allow for the RPC. + metadata: Optional :term:`metadata` to be transmitted to + the service-side of the RPC. + credentials: An optional CallCredentials for the RPC. + """ + + +class UnaryUnaryClientInterceptor(six.with_metaclass(abc.ABCMeta)): + """Affords intercepting unary-unary invocations. + + This is an EXPERIMENTAL API. + """ + + @abc.abstractmethod + def intercept_unary_unary(self, continuation, client_call_details, request): + """Intercepts a unary-unary invocation asynchronously. + + Args: + continuation: A function that proceeds with the invocation by + executing the next interceptor in chain or invoking the + actual RPC on the underlying Channel. It is the interceptor's + responsibility to call it if it decides to move the RPC forward. + The interceptor can use + `response_future = continuation(client_call_details, request)` + to continue with the RPC. `continuation` returns an object that is + both a Call for the RPC and a Future. In the event of RPC + completion, the return Call-Future's result value will be + the response message of the RPC. Should the event terminate + with non-OK status, the returned Call-Future's exception value + will be an RpcError. + client_call_details: A ClientCallDetails object describing the + outgoing RPC. + request: The request value for the RPC. + + Returns: + An object that is both a Call for the RPC and a Future. + In the event of RPC completion, the return Call-Future's + result value will be the response message of the RPC. + Should the event terminate with non-OK status, the returned + Call-Future's exception value will be an RpcError. + """ + raise NotImplementedError() + + +class UnaryStreamClientInterceptor(six.with_metaclass(abc.ABCMeta)): + """Affords intercepting unary-stream invocations. + + This is an EXPERIMENTAL API. + """ + + @abc.abstractmethod + def intercept_unary_stream(self, continuation, client_call_details, + request): + """Intercepts a unary-stream invocation. + + Args: + continuation: A function that proceeds with the invocation by + executing the next interceptor in chain or invoking the + actual RPC on the underlying Channel. It is the interceptor's + responsibility to call it if it decides to move the RPC forward. + The interceptor can use + `response_iterator = continuation(client_call_details, request)` + to continue with the RPC. `continuation` returns an object that is + both a Call for the RPC and an iterator for response values. + Drawing response values from the returned Call-iterator may + raise RpcError indicating termination of the RPC with non-OK + status. + client_call_details: A ClientCallDetails object describing the + outgoing RPC. + request: The request value for the RPC. + + Returns: + An object that is both a Call for the RPC and an iterator of + response values. Drawing response values from the returned + Call-iterator may raise RpcError indicating termination of + the RPC with non-OK status. + """ + raise NotImplementedError() + + +class StreamUnaryClientInterceptor(six.with_metaclass(abc.ABCMeta)): + """Affords intercepting stream-unary invocations. + + This is an EXPERIMENTAL API. + """ + + @abc.abstractmethod + def intercept_stream_unary(self, continuation, client_call_details, + request_iterator): + """Intercepts a stream-unary invocation asynchronously. + + Args: + continuation: A function that proceeds with the invocation by + executing the next interceptor in chain or invoking the + actual RPC on the underlying Channel. It is the interceptor's + responsibility to call it if it decides to move the RPC forward. + The interceptor can use + `response_future = continuation(client_call_details, + request_iterator)` + to continue with the RPC. `continuation` returns an object that is + both a Call for the RPC and a Future. In the event of RPC completion, + the return Call-Future's result value will be the response message + of the RPC. Should the event terminate with non-OK status, the + returned Call-Future's exception value will be an RpcError. + client_call_details: A ClientCallDetails object describing the + outgoing RPC. + request_iterator: An iterator that yields request values for the RPC. + + Returns: + An object that is both a Call for the RPC and a Future. + In the event of RPC completion, the return Call-Future's + result value will be the response message of the RPC. + Should the event terminate with non-OK status, the returned + Call-Future's exception value will be an RpcError. + """ + raise NotImplementedError() + + +class StreamStreamClientInterceptor(six.with_metaclass(abc.ABCMeta)): + """Affords intercepting stream-stream invocations. + + This is an EXPERIMENTAL API. + """ + + @abc.abstractmethod + def intercept_stream_stream(self, continuation, client_call_details, + request_iterator): + """Intercepts a stream-stream invocation. + + continuation: A function that proceeds with the invocation by + executing the next interceptor in chain or invoking the + actual RPC on the underlying Channel. It is the interceptor's + responsibility to call it if it decides to move the RPC forward. + The interceptor can use + `response_iterator = continuation(client_call_details, + request_iterator)` + to continue with the RPC. `continuation` returns an object that is + both a Call for the RPC and an iterator for response values. + Drawing response values from the returned Call-iterator may + raise RpcError indicating termination of the RPC with non-OK + status. + client_call_details: A ClientCallDetails object describing the + outgoing RPC. + request_iterator: An iterator that yields request values for the RPC. + + Returns: + An object that is both a Call for the RPC and an iterator of + response values. Drawing response values from the returned + Call-iterator may raise RpcError indicating termination of + the RPC with non-OK status. + """ + raise NotImplementedError() + + ############ Authentication & Authorization Interfaces & Classes ############# @@ -1404,6 +1568,34 @@ def secure_channel(target, credentials, options=None): credentials._credentials) +def intercept_channel(channel, *interceptors): + """Intercepts a channel through a set of interceptors. + + This is an EXPERIMENTAL API. + + Args: + channel: A Channel. + interceptors: Zero or more objects of type + UnaryUnaryClientInterceptor, + UnaryStreamClientInterceptor, + StreamUnaryClientInterceptor, or + StreamStreamClientInterceptor. + Interceptors are given control in the order they are listed. + + Returns: + A Channel that intercepts each invocation via the provided interceptors. + + Raises: + TypeError: If interceptor does not derive from any of + UnaryUnaryClientInterceptor, + UnaryStreamClientInterceptor, + StreamUnaryClientInterceptor, or + StreamStreamClientInterceptor. + """ + from grpc import _interceptor # pylint: disable=cyclic-import + return _interceptor.intercept_channel(channel, *interceptors) + + def server(thread_pool, handlers=None, interceptors=None, @@ -1442,10 +1634,12 @@ __all__ = ( 'FutureTimeoutError', 'FutureCancelledError', 'Future', 'ChannelConnectivity', 'StatusCode', 'RpcError', 'RpcContext', 'Call', 'ChannelCredentials', 'CallCredentials', 'AuthMetadataContext', - 'AuthMetadataPluginCallback', 'AuthMetadataPlugin', + 'AuthMetadataPluginCallback', 'AuthMetadataPlugin', 'ClientCallDetails', 'ServerCertificateConfiguration', 'ServerCredentials', 'UnaryUnaryMultiCallable', 'UnaryStreamMultiCallable', - 'StreamUnaryMultiCallable', 'StreamStreamMultiCallable', 'Channel', + 'StreamUnaryMultiCallable', 'StreamStreamMultiCallable', + 'UnaryUnaryClientInterceptor', 'UnaryStreamClientInterceptor', + 'StreamUnaryClientInterceptor', 'StreamStreamClientInterceptor', 'Channel', 'ServicerContext', 'RpcMethodHandler', 'HandlerCallDetails', 'GenericRpcHandler', 'ServiceRpcHandler', 'Server', 'ServerInterceptor', 'unary_unary_rpc_method_handler', 'unary_stream_rpc_method_handler', @@ -1455,7 +1649,7 @@ __all__ = ( 'composite_call_credentials', 'composite_channel_credentials', 'ssl_server_credentials', 'ssl_server_certificate_configuration', 'dynamic_ssl_server_credentials', 'channel_ready_future', - 'insecure_channel', 'secure_channel', 'server',) + 'insecure_channel', 'secure_channel', 'intercept_channel', 'server',) ############################### Extension Shims ################################ diff --git a/src/python/grpcio/grpc/_interceptor.py b/src/python/grpcio/grpc/_interceptor.py index 7aa2c7ec222..fffb2698455 100644 --- a/src/python/grpcio/grpc/_interceptor.py +++ b/src/python/grpcio/grpc/_interceptor.py @@ -13,6 +13,11 @@ # limitations under the License. """Implementation of gRPC Python interceptors.""" +import collections +import sys + +import grpc + class _ServicePipeline(object): @@ -36,3 +41,278 @@ class _ServicePipeline(object): def service_pipeline(interceptors): return _ServicePipeline(interceptors) if interceptors else None + + +class _ClientCallDetails( + collections.namedtuple('_ClientCallDetails', + ('method', 'timeout', 'metadata', + 'credentials')), grpc.ClientCallDetails): + pass + + +class _LocalFailure(grpc.RpcError, grpc.Future, grpc.Call): + + def __init__(self, exception, traceback): + super(_LocalFailure, self).__init__() + self._exception = exception + self._traceback = traceback + + def initial_metadata(self): + return None + + def trailing_metadata(self): + return None + + def code(self): + return grpc.StatusCode.INTERNAL + + def details(self): + return 'Exception raised while intercepting the RPC' + + def cancel(self): + return False + + def cancelled(self): + return False + + def running(self): + return False + + def done(self): + return True + + def result(self, ignored_timeout=None): + raise self._exception + + def exception(self, ignored_timeout=None): + return self._exception + + def traceback(self, ignored_timeout=None): + return self._traceback + + def add_done_callback(self, fn): + fn(self) + + def __iter__(self): + return self + + def next(self): + raise self._exception + + +class _UnaryUnaryMultiCallable(grpc.UnaryUnaryMultiCallable): + + def __init__(self, thunk, method, interceptor): + self._thunk = thunk + self._method = method + self._interceptor = interceptor + + def __call__(self, request, timeout=None, metadata=None, credentials=None): + call_future = self.future( + request, + timeout=timeout, + metadata=metadata, + credentials=credentials) + return call_future.result() + + def with_call(self, request, timeout=None, metadata=None, credentials=None): + call_future = self.future( + request, + timeout=timeout, + metadata=metadata, + credentials=credentials) + return call_future.result(), call_future + + def future(self, request, timeout=None, metadata=None, credentials=None): + + def continuation(client_call_details, request): + return self._thunk(client_call_details.method).future( + request, + timeout=client_call_details.timeout, + metadata=client_call_details.metadata, + credentials=client_call_details.credentials) + + client_call_details = _ClientCallDetails(self._method, timeout, + metadata, credentials) + try: + return self._interceptor.intercept_unary_unary( + continuation, client_call_details, request) + except Exception as exception: # pylint:disable=broad-except + return _LocalFailure(exception, sys.exc_info()[2]) + + +class _UnaryStreamMultiCallable(grpc.UnaryStreamMultiCallable): + + def __init__(self, thunk, method, interceptor): + self._thunk = thunk + self._method = method + self._interceptor = interceptor + + def __call__(self, request, timeout=None, metadata=None, credentials=None): + + def continuation(client_call_details, request): + return self._thunk(client_call_details.method)( + request, + timeout=client_call_details.timeout, + metadata=client_call_details.metadata, + credentials=client_call_details.credentials) + + client_call_details = _ClientCallDetails(self._method, timeout, + metadata, credentials) + try: + return self._interceptor.intercept_unary_stream( + continuation, client_call_details, request) + except Exception as exception: # pylint:disable=broad-except + return _LocalFailure(exception, sys.exc_info()[2]) + + +class _StreamUnaryMultiCallable(grpc.StreamUnaryMultiCallable): + + def __init__(self, thunk, method, interceptor): + self._thunk = thunk + self._method = method + self._interceptor = interceptor + + def __call__(self, + request_iterator, + timeout=None, + metadata=None, + credentials=None): + call_future = self.future( + request_iterator, + timeout=timeout, + metadata=metadata, + credentials=credentials) + return call_future.result() + + def with_call(self, + request_iterator, + timeout=None, + metadata=None, + credentials=None): + call_future = self.future( + request_iterator, + timeout=timeout, + metadata=metadata, + credentials=credentials) + return call_future.result(), call_future + + def future(self, + request_iterator, + timeout=None, + metadata=None, + credentials=None): + + def continuation(client_call_details, request_iterator): + return self._thunk(client_call_details.method).future( + request_iterator, + timeout=client_call_details.timeout, + metadata=client_call_details.metadata, + credentials=client_call_details.credentials) + + client_call_details = _ClientCallDetails(self._method, timeout, + metadata, credentials) + + try: + return self._interceptor.intercept_stream_unary( + continuation, client_call_details, request_iterator) + except Exception as exception: # pylint:disable=broad-except + return _LocalFailure(exception, sys.exc_info()[2]) + + +class _StreamStreamMultiCallable(grpc.StreamStreamMultiCallable): + + def __init__(self, thunk, method, interceptor): + self._thunk = thunk + self._method = method + self._interceptor = interceptor + + def __call__(self, + request_iterator, + timeout=None, + metadata=None, + credentials=None): + + def continuation(client_call_details, request_iterator): + return self._thunk(client_call_details.method)( + request_iterator, + timeout=client_call_details.timeout, + metadata=client_call_details.metadata, + credentials=client_call_details.credentials) + + client_call_details = _ClientCallDetails(self._method, timeout, + metadata, credentials) + + try: + return self._interceptor.intercept_stream_stream( + continuation, client_call_details, request_iterator) + except Exception as exception: # pylint:disable=broad-except + return _LocalFailure(exception, sys.exc_info()[2]) + + +class _Channel(grpc.Channel): + + def __init__(self, channel, interceptor): + self._channel = channel + self._interceptor = interceptor + + def subscribe(self, *args, **kwargs): + self._channel.subscribe(*args, **kwargs) + + def unsubscribe(self, *args, **kwargs): + self._channel.unsubscribe(*args, **kwargs) + + def unary_unary(self, + method, + request_serializer=None, + response_deserializer=None): + thunk = lambda m: self._channel.unary_unary(m, request_serializer, response_deserializer) + if isinstance(self._interceptor, grpc.UnaryUnaryClientInterceptor): + return _UnaryUnaryMultiCallable(thunk, method, self._interceptor) + else: + return thunk(method) + + def unary_stream(self, + method, + request_serializer=None, + response_deserializer=None): + thunk = lambda m: self._channel.unary_stream(m, request_serializer, response_deserializer) + if isinstance(self._interceptor, grpc.UnaryStreamClientInterceptor): + return _UnaryStreamMultiCallable(thunk, method, self._interceptor) + else: + return thunk(method) + + def stream_unary(self, + method, + request_serializer=None, + response_deserializer=None): + thunk = lambda m: self._channel.stream_unary(m, request_serializer, response_deserializer) + if isinstance(self._interceptor, grpc.StreamUnaryClientInterceptor): + return _StreamUnaryMultiCallable(thunk, method, self._interceptor) + else: + return thunk(method) + + def stream_stream(self, + method, + request_serializer=None, + response_deserializer=None): + thunk = lambda m: self._channel.stream_stream(m, request_serializer, response_deserializer) + if isinstance(self._interceptor, grpc.StreamStreamClientInterceptor): + return _StreamStreamMultiCallable(thunk, method, self._interceptor) + else: + return thunk(method) + + +def intercept_channel(channel, *interceptors): + for interceptor in reversed(list(interceptors)): + if not isinstance(interceptor, grpc.UnaryUnaryClientInterceptor) and \ + not isinstance(interceptor, grpc.UnaryStreamClientInterceptor) and \ + not isinstance(interceptor, grpc.StreamUnaryClientInterceptor) and \ + not isinstance(interceptor, grpc.StreamStreamClientInterceptor): + raise TypeError('interceptor must be ' + 'grpc.UnaryUnaryClientInterceptor or ' + 'grpc.UnaryStreamClientInterceptor or ' + 'grpc.StreamUnaryClientInterceptor or ' + 'grpc.StreamStreamClientInterceptor or ') + channel = _Channel(channel, interceptor) + return channel diff --git a/src/python/grpcio_tests/tests/unit/_api_test.py b/src/python/grpcio_tests/tests/unit/_api_test.py index 49f9b9aa7b9..d6f44475324 100644 --- a/src/python/grpcio_tests/tests/unit/_api_test.py +++ b/src/python/grpcio_tests/tests/unit/_api_test.py @@ -33,18 +33,21 @@ class AllTest(unittest.TestCase): 'AuthMetadataPlugin', 'ServerCertificateConfiguration', 'ServerCredentials', 'UnaryUnaryMultiCallable', 'UnaryStreamMultiCallable', 'StreamUnaryMultiCallable', - 'StreamStreamMultiCallable', 'Channel', 'ServicerContext', + 'StreamStreamMultiCallable', 'UnaryUnaryClientInterceptor', + 'UnaryStreamClientInterceptor', 'StreamUnaryClientInterceptor', + 'StreamStreamClientInterceptor', 'Channel', 'ServicerContext', 'RpcMethodHandler', 'HandlerCallDetails', 'GenericRpcHandler', 'ServiceRpcHandler', 'Server', 'ServerInterceptor', 'unary_unary_rpc_method_handler', 'unary_stream_rpc_method_handler', - 'stream_unary_rpc_method_handler', + 'stream_unary_rpc_method_handler', 'ClientCallDetails', 'stream_stream_rpc_method_handler', 'method_handlers_generic_handler', 'ssl_channel_credentials', 'metadata_call_credentials', 'access_token_call_credentials', 'composite_call_credentials', 'composite_channel_credentials', 'ssl_server_credentials', 'ssl_server_certificate_configuration', 'dynamic_ssl_server_credentials', 'channel_ready_future', - 'insecure_channel', 'secure_channel', 'server',) + 'insecure_channel', 'secure_channel', 'intercept_channel', + 'server',) six.assertCountEqual(self, expected_grpc_code_elements, _from_grpc_import_star.GRPC_ELEMENTS) From fdfaf1b12eb718268bd8186a00429019eb230d12 Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Mon, 11 Dec 2017 07:14:21 -0800 Subject: [PATCH 088/127] Add tests for gRPC Python interceptor machinery --- src/python/grpcio_tests/tests/tests.json | 1 + .../tests/unit/_interceptor_test.py | 571 ++++++++++++++++++ 2 files changed, 572 insertions(+) create mode 100644 src/python/grpcio_tests/tests/unit/_interceptor_test.py diff --git a/src/python/grpcio_tests/tests/tests.json b/src/python/grpcio_tests/tests/tests.json index 34cbade92c3..3bf53087495 100644 --- a/src/python/grpcio_tests/tests/tests.json +++ b/src/python/grpcio_tests/tests/tests.json @@ -39,6 +39,7 @@ "unit._cython.cygrpc_test.TypeSmokeTest", "unit._empty_message_test.EmptyMessageTest", "unit._exit_test.ExitTest", + "unit._interceptor_test.InterceptorTest", "unit._invalid_metadata_test.InvalidMetadataTest", "unit._invocation_defects_test.InvocationDefectsTest", "unit._metadata_code_details_test.MetadataCodeDetailsTest", diff --git a/src/python/grpcio_tests/tests/unit/_interceptor_test.py b/src/python/grpcio_tests/tests/unit/_interceptor_test.py new file mode 100644 index 00000000000..cf875ed7da4 --- /dev/null +++ b/src/python/grpcio_tests/tests/unit/_interceptor_test.py @@ -0,0 +1,571 @@ +# Copyright 2017 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"""Test of gRPC Python interceptors.""" + +import collections +import itertools +import threading +import unittest +from concurrent import futures + +import grpc +from grpc.framework.foundation import logging_pool + +from tests.unit.framework.common import test_constants +from tests.unit.framework.common import test_control + +_SERIALIZE_REQUEST = lambda bytestring: bytestring * 2 +_DESERIALIZE_REQUEST = lambda bytestring: bytestring[len(bytestring) // 2:] +_SERIALIZE_RESPONSE = lambda bytestring: bytestring * 3 +_DESERIALIZE_RESPONSE = lambda bytestring: bytestring[:len(bytestring) // 3] + +_UNARY_UNARY = '/test/UnaryUnary' +_UNARY_STREAM = '/test/UnaryStream' +_STREAM_UNARY = '/test/StreamUnary' +_STREAM_STREAM = '/test/StreamStream' + + +class _Callback(object): + + def __init__(self): + self._condition = threading.Condition() + self._value = None + self._called = False + + def __call__(self, value): + with self._condition: + self._value = value + self._called = True + self._condition.notify_all() + + def value(self): + with self._condition: + while not self._called: + self._condition.wait() + return self._value + + +class _Handler(object): + + def __init__(self, control): + self._control = control + + def handle_unary_unary(self, request, servicer_context): + self._control.control() + if servicer_context is not None: + servicer_context.set_trailing_metadata((('testkey', 'testvalue',),)) + return request + + def handle_unary_stream(self, request, servicer_context): + for _ in range(test_constants.STREAM_LENGTH): + self._control.control() + yield request + self._control.control() + if servicer_context is not None: + servicer_context.set_trailing_metadata((('testkey', 'testvalue',),)) + + def handle_stream_unary(self, request_iterator, servicer_context): + if servicer_context is not None: + servicer_context.invocation_metadata() + self._control.control() + response_elements = [] + for request in request_iterator: + self._control.control() + response_elements.append(request) + self._control.control() + if servicer_context is not None: + servicer_context.set_trailing_metadata((('testkey', 'testvalue',),)) + return b''.join(response_elements) + + def handle_stream_stream(self, request_iterator, servicer_context): + self._control.control() + if servicer_context is not None: + servicer_context.set_trailing_metadata((('testkey', 'testvalue',),)) + for request in request_iterator: + self._control.control() + yield request + self._control.control() + + +class _MethodHandler(grpc.RpcMethodHandler): + + def __init__(self, request_streaming, response_streaming, + request_deserializer, response_serializer, unary_unary, + unary_stream, stream_unary, stream_stream): + self.request_streaming = request_streaming + self.response_streaming = response_streaming + self.request_deserializer = request_deserializer + self.response_serializer = response_serializer + self.unary_unary = unary_unary + self.unary_stream = unary_stream + self.stream_unary = stream_unary + self.stream_stream = stream_stream + + +class _GenericHandler(grpc.GenericRpcHandler): + + def __init__(self, handler): + self._handler = handler + + def service(self, handler_call_details): + if handler_call_details.method == _UNARY_UNARY: + return _MethodHandler(False, False, None, None, + self._handler.handle_unary_unary, None, None, + None) + elif handler_call_details.method == _UNARY_STREAM: + return _MethodHandler(False, True, _DESERIALIZE_REQUEST, + _SERIALIZE_RESPONSE, None, + self._handler.handle_unary_stream, None, None) + elif handler_call_details.method == _STREAM_UNARY: + return _MethodHandler(True, False, _DESERIALIZE_REQUEST, + _SERIALIZE_RESPONSE, None, None, + self._handler.handle_stream_unary, None) + elif handler_call_details.method == _STREAM_STREAM: + return _MethodHandler(True, True, None, None, None, None, None, + self._handler.handle_stream_stream) + else: + return None + + +def _unary_unary_multi_callable(channel): + return channel.unary_unary(_UNARY_UNARY) + + +def _unary_stream_multi_callable(channel): + return channel.unary_stream( + _UNARY_STREAM, + request_serializer=_SERIALIZE_REQUEST, + response_deserializer=_DESERIALIZE_RESPONSE) + + +def _stream_unary_multi_callable(channel): + return channel.stream_unary( + _STREAM_UNARY, + request_serializer=_SERIALIZE_REQUEST, + response_deserializer=_DESERIALIZE_RESPONSE) + + +def _stream_stream_multi_callable(channel): + return channel.stream_stream(_STREAM_STREAM) + + +class _ClientCallDetails( + collections.namedtuple('_ClientCallDetails', + ('method', 'timeout', 'metadata', + 'credentials')), grpc.ClientCallDetails): + pass + + +class _GenericClientInterceptor( + grpc.UnaryUnaryClientInterceptor, grpc.UnaryStreamClientInterceptor, + grpc.StreamUnaryClientInterceptor, grpc.StreamStreamClientInterceptor): + + def __init__(self, interceptor_function): + self._fn = interceptor_function + + def intercept_unary_unary(self, continuation, client_call_details, request): + new_details, new_request_iterator, postprocess = self._fn( + client_call_details, iter((request,)), False, False) + response = continuation(new_details, next(new_request_iterator)) + return postprocess(response) if postprocess else response + + def intercept_unary_stream(self, continuation, client_call_details, + request): + new_details, new_request_iterator, postprocess = self._fn( + client_call_details, iter((request,)), False, True) + response_it = continuation(new_details, new_request_iterator) + return postprocess(response_it) if postprocess else response_it + + def intercept_stream_unary(self, continuation, client_call_details, + request_iterator): + new_details, new_request_iterator, postprocess = self._fn( + client_call_details, request_iterator, True, False) + response = continuation(new_details, next(new_request_iterator)) + return postprocess(response) if postprocess else response + + def intercept_stream_stream(self, continuation, client_call_details, + request_iterator): + new_details, new_request_iterator, postprocess = self._fn( + client_call_details, request_iterator, True, True) + response_it = continuation(new_details, new_request_iterator) + return postprocess(response_it) if postprocess else response_it + + +class _LoggingInterceptor( + grpc.ServerInterceptor, grpc.UnaryUnaryClientInterceptor, + grpc.UnaryStreamClientInterceptor, grpc.StreamUnaryClientInterceptor, + grpc.StreamStreamClientInterceptor): + + def __init__(self, tag, record): + self.tag = tag + self.record = record + + def intercept_service(self, continuation, handler_call_details): + self.record.append(self.tag + ':intercept_service') + return continuation(handler_call_details) + + def intercept_unary_unary(self, continuation, client_call_details, request): + self.record.append(self.tag + ':intercept_unary_unary') + return continuation(client_call_details, request) + + def intercept_unary_stream(self, continuation, client_call_details, + request): + self.record.append(self.tag + ':intercept_unary_stream') + return continuation(client_call_details, request) + + def intercept_stream_unary(self, continuation, client_call_details, + request_iterator): + self.record.append(self.tag + ':intercept_stream_unary') + return continuation(client_call_details, request_iterator) + + def intercept_stream_stream(self, continuation, client_call_details, + request_iterator): + self.record.append(self.tag + ':intercept_stream_stream') + return continuation(client_call_details, request_iterator) + + +class _DefectiveClientInterceptor(grpc.UnaryUnaryClientInterceptor): + + def intercept_unary_unary(self, ignored_continuation, + ignored_client_call_details, ignored_request): + raise test_control.Defect() + + +def _wrap_request_iterator_stream_interceptor(wrapper): + + def intercept_call(client_call_details, request_iterator, request_streaming, + ignored_response_streaming): + if request_streaming: + return client_call_details, wrapper(request_iterator), None + else: + return client_call_details, request_iterator, None + + return _GenericClientInterceptor(intercept_call) + + +def _append_request_header_interceptor(header, value): + + def intercept_call(client_call_details, request_iterator, + ignored_request_streaming, ignored_response_streaming): + metadata = [] + if client_call_details.metadata: + metadata = list(client_call_details.metadata) + metadata.append((header, value,)) + client_call_details = _ClientCallDetails( + client_call_details.method, client_call_details.timeout, metadata, + client_call_details.credentials) + return client_call_details, request_iterator, None + + return _GenericClientInterceptor(intercept_call) + + +class _GenericServerInterceptor(grpc.ServerInterceptor): + + def __init__(self, fn): + self._fn = fn + + def intercept_service(self, continuation, handler_call_details): + return self._fn(continuation, handler_call_details) + + +def _filter_server_interceptor(condition, interceptor): + + def intercept_service(continuation, handler_call_details): + if condition(handler_call_details): + return interceptor.intercept_service(continuation, + handler_call_details) + return continuation(handler_call_details) + + return _GenericServerInterceptor(intercept_service) + + +class InterceptorTest(unittest.TestCase): + + def setUp(self): + self._control = test_control.PauseFailControl() + self._handler = _Handler(self._control) + self._server_pool = logging_pool.pool(test_constants.THREAD_CONCURRENCY) + + self._record = [] + conditional_interceptor = _filter_server_interceptor( + lambda x: ('secret', '42') in x.invocation_metadata, + _LoggingInterceptor('s3', self._record)) + + self._server = grpc.server( + self._server_pool, + interceptors=(_LoggingInterceptor('s1', self._record), + conditional_interceptor, + _LoggingInterceptor('s2', self._record),)) + port = self._server.add_insecure_port('[::]:0') + self._server.add_generic_rpc_handlers((_GenericHandler(self._handler),)) + self._server.start() + + self._channel = grpc.insecure_channel('localhost:%d' % port) + + def tearDown(self): + self._server.stop(None) + self._server_pool.shutdown(wait=True) + + def testTripleRequestMessagesClientInterceptor(self): + + def triple(request_iterator): + while True: + try: + item = next(request_iterator) + yield item + yield item + yield item + except StopIteration: + break + + interceptor = _wrap_request_iterator_stream_interceptor(triple) + channel = grpc.intercept_channel(self._channel, interceptor) + requests = tuple(b'\x07\x08' + for _ in range(test_constants.STREAM_LENGTH)) + + multi_callable = _stream_stream_multi_callable(channel) + response_iterator = multi_callable( + iter(requests), + metadata=( + ('test', + 'InterceptedStreamRequestBlockingUnaryResponseWithCall'),)) + + responses = tuple(response_iterator) + self.assertEqual(len(responses), 3 * test_constants.STREAM_LENGTH) + + multi_callable = _stream_stream_multi_callable(self._channel) + response_iterator = multi_callable( + iter(requests), + metadata=( + ('test', + 'InterceptedStreamRequestBlockingUnaryResponseWithCall'),)) + + responses = tuple(response_iterator) + self.assertEqual(len(responses), test_constants.STREAM_LENGTH) + + def testDefectiveClientInterceptor(self): + interceptor = _DefectiveClientInterceptor() + defective_channel = grpc.intercept_channel(self._channel, interceptor) + + request = b'\x07\x08' + + multi_callable = _unary_unary_multi_callable(defective_channel) + call_future = multi_callable.future( + request, + metadata=( + ('test', 'InterceptedUnaryRequestBlockingUnaryResponse'),)) + + self.assertIsNotNone(call_future.exception()) + self.assertEqual(call_future.code(), grpc.StatusCode.INTERNAL) + + def testInterceptedHeaderManipulationWithServerSideVerification(self): + request = b'\x07\x08' + + channel = grpc.intercept_channel( + self._channel, _append_request_header_interceptor('secret', '42')) + channel = grpc.intercept_channel( + channel, + _LoggingInterceptor('c1', self._record), + _LoggingInterceptor('c2', self._record)) + + self._record[:] = [] + + multi_callable = _unary_unary_multi_callable(channel) + multi_callable.with_call( + request, + metadata=( + ('test', + 'InterceptedUnaryRequestBlockingUnaryResponseWithCall'),)) + + self.assertSequenceEqual(self._record, [ + 'c1:intercept_unary_unary', 'c2:intercept_unary_unary', + 's1:intercept_service', 's3:intercept_service', + 's2:intercept_service' + ]) + + def testInterceptedUnaryRequestBlockingUnaryResponse(self): + request = b'\x07\x08' + + self._record[:] = [] + + channel = grpc.intercept_channel( + self._channel, + _LoggingInterceptor('c1', self._record), + _LoggingInterceptor('c2', self._record)) + + multi_callable = _unary_unary_multi_callable(channel) + multi_callable( + request, + metadata=( + ('test', 'InterceptedUnaryRequestBlockingUnaryResponse'),)) + + self.assertSequenceEqual(self._record, [ + 'c1:intercept_unary_unary', 'c2:intercept_unary_unary', + 's1:intercept_service', 's2:intercept_service' + ]) + + def testInterceptedUnaryRequestBlockingUnaryResponseWithCall(self): + request = b'\x07\x08' + + channel = grpc.intercept_channel( + self._channel, + _LoggingInterceptor('c1', self._record), + _LoggingInterceptor('c2', self._record)) + + self._record[:] = [] + + multi_callable = _unary_unary_multi_callable(channel) + multi_callable.with_call( + request, + metadata=( + ('test', + 'InterceptedUnaryRequestBlockingUnaryResponseWithCall'),)) + + self.assertSequenceEqual(self._record, [ + 'c1:intercept_unary_unary', 'c2:intercept_unary_unary', + 's1:intercept_service', 's2:intercept_service' + ]) + + def testInterceptedUnaryRequestFutureUnaryResponse(self): + request = b'\x07\x08' + + self._record[:] = [] + channel = grpc.intercept_channel( + self._channel, + _LoggingInterceptor('c1', self._record), + _LoggingInterceptor('c2', self._record)) + + multi_callable = _unary_unary_multi_callable(channel) + response_future = multi_callable.future( + request, + metadata=(('test', 'InterceptedUnaryRequestFutureUnaryResponse'),)) + response_future.result() + + self.assertSequenceEqual(self._record, [ + 'c1:intercept_unary_unary', 'c2:intercept_unary_unary', + 's1:intercept_service', 's2:intercept_service' + ]) + + def testInterceptedUnaryRequestStreamResponse(self): + request = b'\x37\x58' + + self._record[:] = [] + channel = grpc.intercept_channel( + self._channel, + _LoggingInterceptor('c1', self._record), + _LoggingInterceptor('c2', self._record)) + + multi_callable = _unary_stream_multi_callable(channel) + response_iterator = multi_callable( + request, + metadata=(('test', 'InterceptedUnaryRequestStreamResponse'),)) + tuple(response_iterator) + + self.assertSequenceEqual(self._record, [ + 'c1:intercept_unary_stream', 'c2:intercept_unary_stream', + 's1:intercept_service', 's2:intercept_service' + ]) + + def testInterceptedStreamRequestBlockingUnaryResponse(self): + requests = tuple(b'\x07\x08' + for _ in range(test_constants.STREAM_LENGTH)) + request_iterator = iter(requests) + + self._record[:] = [] + channel = grpc.intercept_channel( + self._channel, + _LoggingInterceptor('c1', self._record), + _LoggingInterceptor('c2', self._record)) + + multi_callable = _stream_unary_multi_callable(channel) + multi_callable( + request_iterator, + metadata=( + ('test', 'InterceptedStreamRequestBlockingUnaryResponse'),)) + + self.assertSequenceEqual(self._record, [ + 'c1:intercept_stream_unary', 'c2:intercept_stream_unary', + 's1:intercept_service', 's2:intercept_service' + ]) + + def testInterceptedStreamRequestBlockingUnaryResponseWithCall(self): + requests = tuple(b'\x07\x08' + for _ in range(test_constants.STREAM_LENGTH)) + request_iterator = iter(requests) + + self._record[:] = [] + channel = grpc.intercept_channel( + self._channel, + _LoggingInterceptor('c1', self._record), + _LoggingInterceptor('c2', self._record)) + + multi_callable = _stream_unary_multi_callable(channel) + multi_callable.with_call( + request_iterator, + metadata=( + ('test', + 'InterceptedStreamRequestBlockingUnaryResponseWithCall'),)) + + self.assertSequenceEqual(self._record, [ + 'c1:intercept_stream_unary', 'c2:intercept_stream_unary', + 's1:intercept_service', 's2:intercept_service' + ]) + + def testInterceptedStreamRequestFutureUnaryResponse(self): + requests = tuple(b'\x07\x08' + for _ in range(test_constants.STREAM_LENGTH)) + request_iterator = iter(requests) + + self._record[:] = [] + channel = grpc.intercept_channel( + self._channel, + _LoggingInterceptor('c1', self._record), + _LoggingInterceptor('c2', self._record)) + + multi_callable = _stream_unary_multi_callable(channel) + response_future = multi_callable.future( + request_iterator, + metadata=(('test', 'InterceptedStreamRequestFutureUnaryResponse'),)) + response_future.result() + + self.assertSequenceEqual(self._record, [ + 'c1:intercept_stream_unary', 'c2:intercept_stream_unary', + 's1:intercept_service', 's2:intercept_service' + ]) + + def testInterceptedStreamRequestStreamResponse(self): + requests = tuple(b'\x77\x58' + for _ in range(test_constants.STREAM_LENGTH)) + request_iterator = iter(requests) + + self._record[:] = [] + channel = grpc.intercept_channel( + self._channel, + _LoggingInterceptor('c1', self._record), + _LoggingInterceptor('c2', self._record)) + + multi_callable = _stream_stream_multi_callable(channel) + response_iterator = multi_callable( + request_iterator, + metadata=(('test', 'InterceptedStreamRequestStreamResponse'),)) + tuple(response_iterator) + + self.assertSequenceEqual(self._record, [ + 'c1:intercept_stream_stream', 'c2:intercept_stream_stream', + 's1:intercept_service', 's2:intercept_service' + ]) + + +if __name__ == '__main__': + unittest.main(verbosity=2) From 6146151a4fe1e28921c12d1ae5635e113a24b9d7 Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Mon, 11 Dec 2017 15:09:35 -0800 Subject: [PATCH 089/127] Examples for gRPC Python interceptor facility --- .../default_value_client_interceptor.py | 68 +++++++++ .../default_value/greeter_client.py | 38 +++++ .../default_value/helloworld_pb2.py | 134 ++++++++++++++++++ .../default_value/helloworld_pb2_grpc.py | 46 ++++++ .../headers/generic_client_interceptor.py | 55 +++++++ .../interceptors/headers/greeter_client.py | 36 +++++ .../interceptors/headers/greeter_server.py | 52 +++++++ .../header_manipulator_client_interceptor.py | 42 ++++++ .../interceptors/headers/helloworld_pb2.py | 134 ++++++++++++++++++ .../headers/helloworld_pb2_grpc.py | 46 ++++++ .../request_header_validator_interceptor.py | 39 +++++ 11 files changed, 690 insertions(+) create mode 100644 examples/python/interceptors/default_value/default_value_client_interceptor.py create mode 100644 examples/python/interceptors/default_value/greeter_client.py create mode 100644 examples/python/interceptors/default_value/helloworld_pb2.py create mode 100644 examples/python/interceptors/default_value/helloworld_pb2_grpc.py create mode 100644 examples/python/interceptors/headers/generic_client_interceptor.py create mode 100644 examples/python/interceptors/headers/greeter_client.py create mode 100644 examples/python/interceptors/headers/greeter_server.py create mode 100644 examples/python/interceptors/headers/header_manipulator_client_interceptor.py create mode 100644 examples/python/interceptors/headers/helloworld_pb2.py create mode 100644 examples/python/interceptors/headers/helloworld_pb2_grpc.py create mode 100644 examples/python/interceptors/headers/request_header_validator_interceptor.py diff --git a/examples/python/interceptors/default_value/default_value_client_interceptor.py b/examples/python/interceptors/default_value/default_value_client_interceptor.py new file mode 100644 index 00000000000..c549f2b8613 --- /dev/null +++ b/examples/python/interceptors/default_value/default_value_client_interceptor.py @@ -0,0 +1,68 @@ +# Copyright 2017 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"""Interceptor that adds headers to outgoing requests.""" + +import collections + +import grpc + + +class _ConcreteValue(grpc.Future): + + def __init__(self, result): + self._result = result + + def cancel(self): + return False + + def cancelled(self): + return False + + def running(self): + return False + + def done(self): + return True + + def result(self, timeout=None): + return self._result + + def exception(self, timeout=None): + return None + + def traceback(self, timeout=None): + return None + + def add_done_callback(self, fn): + fn(self._result) + + +class DefaultValueClientInterceptor(grpc.UnaryUnaryClientInterceptor, + grpc.StreamUnaryClientInterceptor): + + def __init__(self, value): + self._default = _ConcreteValue(value) + + def _intercept_call(self, continuation, client_call_details, + request_or_iterator): + response = continuation(client_call_details, request_or_iterator) + return self._default if response.exception() else response + + def intercept_unary_unary(self, continuation, client_call_details, request): + return self._intercept_call(continuation, client_call_details, request) + + def intercept_stream_unary(self, continuation, client_call_details, + request_iterator): + return self._intercept_call(continuation, client_call_details, + request_iterator) diff --git a/examples/python/interceptors/default_value/greeter_client.py b/examples/python/interceptors/default_value/greeter_client.py new file mode 100644 index 00000000000..aba7571d831 --- /dev/null +++ b/examples/python/interceptors/default_value/greeter_client.py @@ -0,0 +1,38 @@ +# Copyright 2017 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"""The Python implementation of the gRPC helloworld.Greeter client.""" + +from __future__ import print_function + +import grpc + +import helloworld_pb2 +import helloworld_pb2_grpc +import default_value_client_interceptor + + +def run(): + default_value = helloworld_pb2.HelloReply( + message='Hello from your local interceptor!') + default_value_interceptor = default_value_client_interceptor.DefaultValueClientInterceptor( + default_value) + channel = grpc.insecure_channel('localhost:50051') + channel = grpc.intercept_channel(channel, default_value_interceptor) + stub = helloworld_pb2_grpc.GreeterStub(channel) + response = stub.SayHello(helloworld_pb2.HelloRequest(name='you')) + print("Greeter client received: " + response.message) + + +if __name__ == '__main__': + run() diff --git a/examples/python/interceptors/default_value/helloworld_pb2.py b/examples/python/interceptors/default_value/helloworld_pb2.py new file mode 100644 index 00000000000..e18ab9acc7a --- /dev/null +++ b/examples/python/interceptors/default_value/helloworld_pb2.py @@ -0,0 +1,134 @@ +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: helloworld.proto + +import sys +_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +from google.protobuf import descriptor as _descriptor +from google.protobuf import message as _message +from google.protobuf import reflection as _reflection +from google.protobuf import symbol_database as _symbol_database +from google.protobuf import descriptor_pb2 +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + + + +DESCRIPTOR = _descriptor.FileDescriptor( + name='helloworld.proto', + package='helloworld', + syntax='proto3', + serialized_pb=_b('\n\x10helloworld.proto\x12\nhelloworld\"\x1c\n\x0cHelloRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x1d\n\nHelloReply\x12\x0f\n\x07message\x18\x01 \x01(\t2I\n\x07Greeter\x12>\n\x08SayHello\x12\x18.helloworld.HelloRequest\x1a\x16.helloworld.HelloReply\"\x00\x42\x36\n\x1bio.grpc.examples.helloworldB\x0fHelloWorldProtoP\x01\xa2\x02\x03HLWb\x06proto3') +) + + + + +_HELLOREQUEST = _descriptor.Descriptor( + name='HelloRequest', + full_name='helloworld.HelloRequest', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='name', full_name='helloworld.HelloRequest.name', index=0, + number=1, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=_b("").decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=32, + serialized_end=60, +) + + +_HELLOREPLY = _descriptor.Descriptor( + name='HelloReply', + full_name='helloworld.HelloReply', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='message', full_name='helloworld.HelloReply.message', index=0, + number=1, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=_b("").decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=62, + serialized_end=91, +) + +DESCRIPTOR.message_types_by_name['HelloRequest'] = _HELLOREQUEST +DESCRIPTOR.message_types_by_name['HelloReply'] = _HELLOREPLY +_sym_db.RegisterFileDescriptor(DESCRIPTOR) + +HelloRequest = _reflection.GeneratedProtocolMessageType('HelloRequest', (_message.Message,), dict( + DESCRIPTOR = _HELLOREQUEST, + __module__ = 'helloworld_pb2' + # @@protoc_insertion_point(class_scope:helloworld.HelloRequest) + )) +_sym_db.RegisterMessage(HelloRequest) + +HelloReply = _reflection.GeneratedProtocolMessageType('HelloReply', (_message.Message,), dict( + DESCRIPTOR = _HELLOREPLY, + __module__ = 'helloworld_pb2' + # @@protoc_insertion_point(class_scope:helloworld.HelloReply) + )) +_sym_db.RegisterMessage(HelloReply) + + +DESCRIPTOR.has_options = True +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\033io.grpc.examples.helloworldB\017HelloWorldProtoP\001\242\002\003HLW')) + +_GREETER = _descriptor.ServiceDescriptor( + name='Greeter', + full_name='helloworld.Greeter', + file=DESCRIPTOR, + index=0, + options=None, + serialized_start=93, + serialized_end=166, + methods=[ + _descriptor.MethodDescriptor( + name='SayHello', + full_name='helloworld.Greeter.SayHello', + index=0, + containing_service=None, + input_type=_HELLOREQUEST, + output_type=_HELLOREPLY, + options=None, + ), +]) +_sym_db.RegisterServiceDescriptor(_GREETER) + +DESCRIPTOR.services_by_name['Greeter'] = _GREETER + +# @@protoc_insertion_point(module_scope) diff --git a/examples/python/interceptors/default_value/helloworld_pb2_grpc.py b/examples/python/interceptors/default_value/helloworld_pb2_grpc.py new file mode 100644 index 00000000000..18e07d16797 --- /dev/null +++ b/examples/python/interceptors/default_value/helloworld_pb2_grpc.py @@ -0,0 +1,46 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! +import grpc + +import helloworld_pb2 as helloworld__pb2 + + +class GreeterStub(object): + """The greeting service definition. + """ + + def __init__(self, channel): + """Constructor. + + Args: + channel: A grpc.Channel. + """ + self.SayHello = channel.unary_unary( + '/helloworld.Greeter/SayHello', + request_serializer=helloworld__pb2.HelloRequest.SerializeToString, + response_deserializer=helloworld__pb2.HelloReply.FromString, + ) + + +class GreeterServicer(object): + """The greeting service definition. + """ + + def SayHello(self, request, context): + """Sends a greeting + """ + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + + +def add_GreeterServicer_to_server(servicer, server): + rpc_method_handlers = { + 'SayHello': grpc.unary_unary_rpc_method_handler( + servicer.SayHello, + request_deserializer=helloworld__pb2.HelloRequest.FromString, + response_serializer=helloworld__pb2.HelloReply.SerializeToString, + ), + } + generic_handler = grpc.method_handlers_generic_handler( + 'helloworld.Greeter', rpc_method_handlers) + server.add_generic_rpc_handlers((generic_handler,)) diff --git a/examples/python/interceptors/headers/generic_client_interceptor.py b/examples/python/interceptors/headers/generic_client_interceptor.py new file mode 100644 index 00000000000..30b0755aaf9 --- /dev/null +++ b/examples/python/interceptors/headers/generic_client_interceptor.py @@ -0,0 +1,55 @@ +# Copyright 2017 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"""Base class for interceptors that operate on all RPC types.""" + +import grpc + + +class _GenericClientInterceptor( + grpc.UnaryUnaryClientInterceptor, grpc.UnaryStreamClientInterceptor, + grpc.StreamUnaryClientInterceptor, grpc.StreamStreamClientInterceptor): + + def __init__(self, interceptor_function): + self._fn = interceptor_function + + def intercept_unary_unary(self, continuation, client_call_details, request): + new_details, new_request_iterator, postprocess = self._fn( + client_call_details, iter((request,)), False, False) + response = continuation(new_details, next(new_request_iterator)) + return postprocess(response) if postprocess else response + + def intercept_unary_stream(self, continuation, client_call_details, + request): + new_details, new_request_iterator, postprocess = self._fn( + client_call_details, iter((request,)), False, True) + response_it = continuation(new_details, new_request_iterator) + return postprocess(response_it) if postprocess else response_it + + def intercept_stream_unary(self, continuation, client_call_details, + request_iterator): + new_details, new_request_iterator, postprocess = self._fn( + client_call_details, request_iterator, True, False) + response = continuation(new_details, next(new_request_iterator)) + return postprocess(response) if postprocess else response + + def intercept_stream_stream(self, continuation, client_call_details, + request_iterator): + new_details, new_request_iterator, postprocess = self._fn( + client_call_details, request_iterator, True, True) + response_it = continuation(new_details, new_request_iterator) + return postprocess(response_it) if postprocess else response_it + + +def create(intercept_call): + return _GenericClientInterceptor(intercept_call) diff --git a/examples/python/interceptors/headers/greeter_client.py b/examples/python/interceptors/headers/greeter_client.py new file mode 100644 index 00000000000..2b0dd3e1778 --- /dev/null +++ b/examples/python/interceptors/headers/greeter_client.py @@ -0,0 +1,36 @@ +# Copyright 2017 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"""The Python implementation of the GRPC helloworld.Greeter client.""" + +from __future__ import print_function + +import grpc + +import helloworld_pb2 +import helloworld_pb2_grpc +import header_manipulator_client_interceptor + + +def run(): + header_adder_interceptor = header_manipulator_client_interceptor.header_adder_interceptor( + 'one-time-password', '42') + channel = grpc.insecure_channel('localhost:50051') + channel = grpc.intercept_channel(channel, header_adder_interceptor) + stub = helloworld_pb2_grpc.GreeterStub(channel) + response = stub.SayHello(helloworld_pb2.HelloRequest(name='you')) + print("Greeter client received: " + response.message) + + +if __name__ == '__main__': + run() diff --git a/examples/python/interceptors/headers/greeter_server.py b/examples/python/interceptors/headers/greeter_server.py new file mode 100644 index 00000000000..01968609b53 --- /dev/null +++ b/examples/python/interceptors/headers/greeter_server.py @@ -0,0 +1,52 @@ +# Copyright 2017 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"""The Python implementation of the GRPC helloworld.Greeter server.""" + +from concurrent import futures +import time + +import grpc + +import helloworld_pb2 +import helloworld_pb2_grpc +from request_header_validator_interceptor import RequestHeaderValidatorInterceptor + +_ONE_DAY_IN_SECONDS = 60 * 60 * 24 + + +class Greeter(helloworld_pb2_grpc.GreeterServicer): + + def SayHello(self, request, context): + return helloworld_pb2.HelloReply(message='Hello, %s!' % request.name) + + +def serve(): + header_validator = RequestHeaderValidatorInterceptor( + 'one-time-password', '42', grpc.StatusCode.UNAUTHENTICATED, + 'Access denied!') + server = grpc.server( + futures.ThreadPoolExecutor(max_workers=10), + interceptors=(header_validator,)) + helloworld_pb2_grpc.add_GreeterServicer_to_server(Greeter(), server) + server.add_insecure_port('[::]:50051') + server.start() + try: + while True: + time.sleep(_ONE_DAY_IN_SECONDS) + except KeyboardInterrupt: + server.stop(0) + + +if __name__ == '__main__': + serve() diff --git a/examples/python/interceptors/headers/header_manipulator_client_interceptor.py b/examples/python/interceptors/headers/header_manipulator_client_interceptor.py new file mode 100644 index 00000000000..ac7c605144f --- /dev/null +++ b/examples/python/interceptors/headers/header_manipulator_client_interceptor.py @@ -0,0 +1,42 @@ +# Copyright 2017 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"""Interceptor that adds headers to outgoing requests.""" + +import collections + +import grpc +import generic_client_interceptor + + +class _ClientCallDetails( + collections.namedtuple('_ClientCallDetails', + ('method', 'timeout', 'metadata', + 'credentials')), grpc.ClientCallDetails): + pass + + +def header_adder_interceptor(header, value): + + def intercept_call(client_call_details, request_iterator, request_streaming, + response_streaming): + metadata = [] + if client_call_details.metadata is not None: + metadata = list(client_call_details.metadata) + metadata.append((header, value,)) + client_call_details = _ClientCallDetails( + client_call_details.method, client_call_details.timeout, metadata, + client_call_details.credentials) + return client_call_details, request_iterator, None + + return generic_client_interceptor.create(intercept_call) diff --git a/examples/python/interceptors/headers/helloworld_pb2.py b/examples/python/interceptors/headers/helloworld_pb2.py new file mode 100644 index 00000000000..e18ab9acc7a --- /dev/null +++ b/examples/python/interceptors/headers/helloworld_pb2.py @@ -0,0 +1,134 @@ +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: helloworld.proto + +import sys +_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +from google.protobuf import descriptor as _descriptor +from google.protobuf import message as _message +from google.protobuf import reflection as _reflection +from google.protobuf import symbol_database as _symbol_database +from google.protobuf import descriptor_pb2 +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + + + +DESCRIPTOR = _descriptor.FileDescriptor( + name='helloworld.proto', + package='helloworld', + syntax='proto3', + serialized_pb=_b('\n\x10helloworld.proto\x12\nhelloworld\"\x1c\n\x0cHelloRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x1d\n\nHelloReply\x12\x0f\n\x07message\x18\x01 \x01(\t2I\n\x07Greeter\x12>\n\x08SayHello\x12\x18.helloworld.HelloRequest\x1a\x16.helloworld.HelloReply\"\x00\x42\x36\n\x1bio.grpc.examples.helloworldB\x0fHelloWorldProtoP\x01\xa2\x02\x03HLWb\x06proto3') +) + + + + +_HELLOREQUEST = _descriptor.Descriptor( + name='HelloRequest', + full_name='helloworld.HelloRequest', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='name', full_name='helloworld.HelloRequest.name', index=0, + number=1, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=_b("").decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=32, + serialized_end=60, +) + + +_HELLOREPLY = _descriptor.Descriptor( + name='HelloReply', + full_name='helloworld.HelloReply', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='message', full_name='helloworld.HelloReply.message', index=0, + number=1, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=_b("").decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=62, + serialized_end=91, +) + +DESCRIPTOR.message_types_by_name['HelloRequest'] = _HELLOREQUEST +DESCRIPTOR.message_types_by_name['HelloReply'] = _HELLOREPLY +_sym_db.RegisterFileDescriptor(DESCRIPTOR) + +HelloRequest = _reflection.GeneratedProtocolMessageType('HelloRequest', (_message.Message,), dict( + DESCRIPTOR = _HELLOREQUEST, + __module__ = 'helloworld_pb2' + # @@protoc_insertion_point(class_scope:helloworld.HelloRequest) + )) +_sym_db.RegisterMessage(HelloRequest) + +HelloReply = _reflection.GeneratedProtocolMessageType('HelloReply', (_message.Message,), dict( + DESCRIPTOR = _HELLOREPLY, + __module__ = 'helloworld_pb2' + # @@protoc_insertion_point(class_scope:helloworld.HelloReply) + )) +_sym_db.RegisterMessage(HelloReply) + + +DESCRIPTOR.has_options = True +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\033io.grpc.examples.helloworldB\017HelloWorldProtoP\001\242\002\003HLW')) + +_GREETER = _descriptor.ServiceDescriptor( + name='Greeter', + full_name='helloworld.Greeter', + file=DESCRIPTOR, + index=0, + options=None, + serialized_start=93, + serialized_end=166, + methods=[ + _descriptor.MethodDescriptor( + name='SayHello', + full_name='helloworld.Greeter.SayHello', + index=0, + containing_service=None, + input_type=_HELLOREQUEST, + output_type=_HELLOREPLY, + options=None, + ), +]) +_sym_db.RegisterServiceDescriptor(_GREETER) + +DESCRIPTOR.services_by_name['Greeter'] = _GREETER + +# @@protoc_insertion_point(module_scope) diff --git a/examples/python/interceptors/headers/helloworld_pb2_grpc.py b/examples/python/interceptors/headers/helloworld_pb2_grpc.py new file mode 100644 index 00000000000..18e07d16797 --- /dev/null +++ b/examples/python/interceptors/headers/helloworld_pb2_grpc.py @@ -0,0 +1,46 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! +import grpc + +import helloworld_pb2 as helloworld__pb2 + + +class GreeterStub(object): + """The greeting service definition. + """ + + def __init__(self, channel): + """Constructor. + + Args: + channel: A grpc.Channel. + """ + self.SayHello = channel.unary_unary( + '/helloworld.Greeter/SayHello', + request_serializer=helloworld__pb2.HelloRequest.SerializeToString, + response_deserializer=helloworld__pb2.HelloReply.FromString, + ) + + +class GreeterServicer(object): + """The greeting service definition. + """ + + def SayHello(self, request, context): + """Sends a greeting + """ + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + + +def add_GreeterServicer_to_server(servicer, server): + rpc_method_handlers = { + 'SayHello': grpc.unary_unary_rpc_method_handler( + servicer.SayHello, + request_deserializer=helloworld__pb2.HelloRequest.FromString, + response_serializer=helloworld__pb2.HelloReply.SerializeToString, + ), + } + generic_handler = grpc.method_handlers_generic_handler( + 'helloworld.Greeter', rpc_method_handlers) + server.add_generic_rpc_handlers((generic_handler,)) diff --git a/examples/python/interceptors/headers/request_header_validator_interceptor.py b/examples/python/interceptors/headers/request_header_validator_interceptor.py new file mode 100644 index 00000000000..95af4177baf --- /dev/null +++ b/examples/python/interceptors/headers/request_header_validator_interceptor.py @@ -0,0 +1,39 @@ +# Copyright 2017 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"""Interceptor that ensures a specific header is present.""" + +import grpc + + +def _unary_unary_rpc_terminator(code, details): + + def terminate(ignored_request, context): + context.abort(code, details) + + return grpc.unary_unary_rpc_method_handler(terminate) + + +class RequestHeaderValidatorInterceptor(grpc.ServerInterceptor): + + def __init__(self, header, value, code, details): + self._header = header + self._value = value + self._terminator = _unary_unary_rpc_terminator(code, details) + + def intercept_service(self, continuation, handler_call_details): + if (self._header, + self._value) in handler_call_details.invocation_metadata: + return continuation(handler_call_details) + else: + return self._terminator From 0ba96edc41d6f229c6657b345dab15b4f6a393a5 Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Tue, 12 Dec 2017 13:44:41 -0800 Subject: [PATCH 090/127] v1.8.0-pre2 is now v1.8.0 --- BUILD | 4 ++-- CMakeLists.txt | 2 +- Makefile | 6 +++--- build.yaml | 4 ++-- gRPC-Core.podspec | 2 +- gRPC-ProtoRPC.podspec | 2 +- gRPC-RxLibrary.podspec | 2 +- gRPC.podspec | 2 +- package.xml | 4 ++-- src/core/lib/surface/version.cc | 2 +- src/cpp/common/version_cc.cc | 2 +- src/csharp/Grpc.Core/Version.csproj.include | 2 +- src/csharp/Grpc.Core/VersionInfo.cs | 2 +- src/csharp/build_packages_dotnetcli.bat | 2 +- src/csharp/build_packages_dotnetcli.sh | 4 ++-- src/objective-c/!ProtoCompiler-gRPCPlugin.podspec | 2 +- src/objective-c/GRPCClient/private/version.h | 2 +- src/objective-c/tests/version.h | 4 ++-- src/php/ext/grpc/version.h | 2 +- src/python/grpcio/grpc/_grpcio_metadata.py | 2 +- src/python/grpcio/grpc_version.py | 2 +- src/python/grpcio_health_checking/grpc_version.py | 2 +- src/python/grpcio_reflection/grpc_version.py | 2 +- src/python/grpcio_testing/grpc_version.py | 2 +- src/python/grpcio_tests/grpc_version.py | 2 +- src/ruby/lib/grpc/version.rb | 2 +- src/ruby/tools/version.rb | 2 +- tools/distrib/python/grpcio_tools/grpc_version.py | 2 +- tools/doxygen/Doxyfile.c++ | 2 +- tools/doxygen/Doxyfile.c++.internal | 2 +- tools/doxygen/Doxyfile.core | 2 +- tools/doxygen/Doxyfile.core.internal | 2 +- 32 files changed, 39 insertions(+), 39 deletions(-) diff --git a/BUILD b/BUILD index df334cd322f..a7cf0a86fb2 100644 --- a/BUILD +++ b/BUILD @@ -41,9 +41,9 @@ config_setting( # This should be updated along with build.yaml g_stands_for = "generous" -core_version = "5.0.0-dev" +core_version = "5.0.0" -version = "1.8.0-dev" +version = "1.8.0" GPR_PUBLIC_HDRS = [ "include/grpc/support/alloc.h", diff --git a/CMakeLists.txt b/CMakeLists.txt index d12d573b3bf..1a43763a695 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ cmake_minimum_required(VERSION 2.8) set(PACKAGE_NAME "grpc") -set(PACKAGE_VERSION "1.8.0-pre2") +set(PACKAGE_VERSION "1.8.0") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/") diff --git a/Makefile b/Makefile index d7e7012276e..5c86ce684bb 100644 --- a/Makefile +++ b/Makefile @@ -411,9 +411,9 @@ E = @echo Q = @ endif -CORE_VERSION = 5.0.0-pre2 -CPP_VERSION = 1.8.0-pre2 -CSHARP_VERSION = 1.8.0-pre2 +CORE_VERSION = 5.0.0 +CPP_VERSION = 1.8.0 +CSHARP_VERSION = 1.8.0 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) diff --git a/build.yaml b/build.yaml index 8723af6e559..f1c3947f2fe 100644 --- a/build.yaml +++ b/build.yaml @@ -12,9 +12,9 @@ settings: '#08': Use "-preN" suffixes to identify pre-release versions '#09': Per-language overrides are possible with (eg) ruby_version tag here '#10': See the expand_version.py for all the quirks here - core_version: 5.0.0-pre2 + core_version: 5.0.0 g_stands_for: generous - version: 1.8.0-pre2 + version: 1.8.0 filegroups: - name: census public_headers: diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 83ad46f6eaf..da58500b016 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-Core' - version = '1.8.0-pre2' + version = '1.8.0' s.version = version s.summary = 'Core cross-platform gRPC library, written in C' s.homepage = 'https://grpc.io' diff --git a/gRPC-ProtoRPC.podspec b/gRPC-ProtoRPC.podspec index a73cd66fe33..0eee127732c 100644 --- a/gRPC-ProtoRPC.podspec +++ b/gRPC-ProtoRPC.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-ProtoRPC' - version = '1.8.0-pre2' + version = '1.8.0' s.version = version s.summary = 'RPC library for Protocol Buffers, based on gRPC' s.homepage = 'https://grpc.io' diff --git a/gRPC-RxLibrary.podspec b/gRPC-RxLibrary.podspec index b788e4e464f..e292575228e 100644 --- a/gRPC-RxLibrary.podspec +++ b/gRPC-RxLibrary.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-RxLibrary' - version = '1.8.0-pre2' + version = '1.8.0' s.version = version s.summary = 'Reactive Extensions library for iOS/OSX.' s.homepage = 'https://grpc.io' diff --git a/gRPC.podspec b/gRPC.podspec index 9adcb4d9552..ac3c2d56416 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -20,7 +20,7 @@ Pod::Spec.new do |s| s.name = 'gRPC' - version = '1.8.0-pre2' + version = '1.8.0' s.version = version s.summary = 'gRPC client library for iOS/OSX' s.homepage = 'https://grpc.io' diff --git a/package.xml b/package.xml index c1c8a87bfd0..16c33325e03 100644 --- a/package.xml +++ b/package.xml @@ -13,8 +13,8 @@ 2017-08-24 - 1.8.0RC2 - 1.8.0RC2 + 1.8.0 + 1.8.0 beta diff --git a/src/core/lib/surface/version.cc b/src/core/lib/surface/version.cc index a9cbe6274a2..5e4f620dd19 100644 --- a/src/core/lib/surface/version.cc +++ b/src/core/lib/surface/version.cc @@ -21,6 +21,6 @@ #include -const char* grpc_version_string(void) { return "5.0.0-pre2"; } +const char* grpc_version_string(void) { return "5.0.0"; } const char* grpc_g_stands_for(void) { return "generous"; } diff --git a/src/cpp/common/version_cc.cc b/src/cpp/common/version_cc.cc index 43c9ef65c3a..f63abcb1127 100644 --- a/src/cpp/common/version_cc.cc +++ b/src/cpp/common/version_cc.cc @@ -22,5 +22,5 @@ #include namespace grpc { -grpc::string Version() { return "1.8.0-pre2"; } +grpc::string Version() { return "1.8.0"; } } // namespace grpc diff --git a/src/csharp/Grpc.Core/Version.csproj.include b/src/csharp/Grpc.Core/Version.csproj.include index 778f02da771..a5a2010ea4c 100755 --- a/src/csharp/Grpc.Core/Version.csproj.include +++ b/src/csharp/Grpc.Core/Version.csproj.include @@ -1,7 +1,7 @@ - 1.8.0-pre2 + 1.8.0 3.3.0 diff --git a/src/csharp/Grpc.Core/VersionInfo.cs b/src/csharp/Grpc.Core/VersionInfo.cs index da9ad8b23c5..09af10dba39 100644 --- a/src/csharp/Grpc.Core/VersionInfo.cs +++ b/src/csharp/Grpc.Core/VersionInfo.cs @@ -38,6 +38,6 @@ namespace Grpc.Core /// /// Current version of gRPC C# /// - public const string CurrentVersion = "1.8.0-pre2"; + public const string CurrentVersion = "1.8.0"; } } diff --git a/src/csharp/build_packages_dotnetcli.bat b/src/csharp/build_packages_dotnetcli.bat index 25b603642b8..60ddd85a6fe 100755 --- a/src/csharp/build_packages_dotnetcli.bat +++ b/src/csharp/build_packages_dotnetcli.bat @@ -13,7 +13,7 @@ @rem limitations under the License. @rem Current package versions -set VERSION=1.8.0-pre2 +set VERSION=1.8.0 @rem Adjust the location of nuget.exe set NUGET=C:\nuget\nuget.exe diff --git a/src/csharp/build_packages_dotnetcli.sh b/src/csharp/build_packages_dotnetcli.sh index a655f120cce..df9f8e99d75 100755 --- a/src/csharp/build_packages_dotnetcli.sh +++ b/src/csharp/build_packages_dotnetcli.sh @@ -39,7 +39,7 @@ dotnet pack --configuration Release Grpc.Auth --output ../../../artifacts dotnet pack --configuration Release Grpc.HealthCheck --output ../../../artifacts dotnet pack --configuration Release Grpc.Reflection --output ../../../artifacts -nuget pack Grpc.nuspec -Version "1.8.0-pre2" -OutputDirectory ../../artifacts -nuget pack Grpc.Tools.nuspec -Version "1.8.0-pre2" -OutputDirectory ../../artifacts +nuget pack Grpc.nuspec -Version "1.8.0" -OutputDirectory ../../artifacts +nuget pack Grpc.Tools.nuspec -Version "1.8.0" -OutputDirectory ../../artifacts (cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg) diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec index 4c3d6561a69..dab0525ab42 100644 --- a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec +++ b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec @@ -42,7 +42,7 @@ Pod::Spec.new do |s| # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed # before them. s.name = '!ProtoCompiler-gRPCPlugin' - v = '1.8.0-pre2' + v = '1.8.0' s.version = v s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.' s.description = <<-DESC diff --git a/src/objective-c/GRPCClient/private/version.h b/src/objective-c/GRPCClient/private/version.h index 5854a7cf709..2eb9061d79e 100644 --- a/src/objective-c/GRPCClient/private/version.h +++ b/src/objective-c/GRPCClient/private/version.h @@ -23,4 +23,4 @@ // `tools/buildgen/generate_projects.sh`. -#define GRPC_OBJC_VERSION_STRING @"1.8.0-pre2" +#define GRPC_OBJC_VERSION_STRING @"1.8.0" diff --git a/src/objective-c/tests/version.h b/src/objective-c/tests/version.h index 31a9b642e34..e1a92745a2e 100644 --- a/src/objective-c/tests/version.h +++ b/src/objective-c/tests/version.h @@ -23,5 +23,5 @@ // `tools/buildgen/generate_projects.sh`. -#define GRPC_OBJC_VERSION_STRING @"1.8.0-pre2" -#define GRPC_C_VERSION_STRING @"5.0.0-pre2" +#define GRPC_OBJC_VERSION_STRING @"1.8.0" +#define GRPC_C_VERSION_STRING @"5.0.0" diff --git a/src/php/ext/grpc/version.h b/src/php/ext/grpc/version.h index deb69778afd..368d19b7b6f 100644 --- a/src/php/ext/grpc/version.h +++ b/src/php/ext/grpc/version.h @@ -20,6 +20,6 @@ #ifndef VERSION_H #define VERSION_H -#define PHP_GRPC_VERSION "1.8.0RC2" +#define PHP_GRPC_VERSION "1.8.0" #endif /* VERSION_H */ diff --git a/src/python/grpcio/grpc/_grpcio_metadata.py b/src/python/grpcio/grpc/_grpcio_metadata.py index 8ebefbf70ac..d43d4cc500d 100644 --- a/src/python/grpcio/grpc/_grpcio_metadata.py +++ b/src/python/grpcio/grpc/_grpcio_metadata.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc/_grpcio_metadata.py.template`!!! -__version__ = """1.8.0rc2""" +__version__ = """1.8.0""" diff --git a/src/python/grpcio/grpc_version.py b/src/python/grpcio/grpc_version.py index d65b63ec9c4..3d8885323e3 100644 --- a/src/python/grpcio/grpc_version.py +++ b/src/python/grpcio/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!! -VERSION='1.8.0rc2' +VERSION='1.8.0' diff --git a/src/python/grpcio_health_checking/grpc_version.py b/src/python/grpcio_health_checking/grpc_version.py index 7399e3a491f..56aee53b48e 100644 --- a/src/python/grpcio_health_checking/grpc_version.py +++ b/src/python/grpcio_health_checking/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!! -VERSION='1.8.0rc2' +VERSION='1.8.0' diff --git a/src/python/grpcio_reflection/grpc_version.py b/src/python/grpcio_reflection/grpc_version.py index 68d281c0595..537fe580501 100644 --- a/src/python/grpcio_reflection/grpc_version.py +++ b/src/python/grpcio_reflection/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!! -VERSION='1.8.0rc2' +VERSION='1.8.0' diff --git a/src/python/grpcio_testing/grpc_version.py b/src/python/grpcio_testing/grpc_version.py index 7c60bbfd892..19a1bf1875f 100644 --- a/src/python/grpcio_testing/grpc_version.py +++ b/src/python/grpcio_testing/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_testing/grpc_version.py.template`!!! -VERSION='1.8.0rc2' +VERSION='1.8.0' diff --git a/src/python/grpcio_tests/grpc_version.py b/src/python/grpcio_tests/grpc_version.py index 6c8fb623572..b45b4f5ca4b 100644 --- a/src/python/grpcio_tests/grpc_version.py +++ b/src/python/grpcio_tests/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!! -VERSION='1.8.0rc2' +VERSION='1.8.0' diff --git a/src/ruby/lib/grpc/version.rb b/src/ruby/lib/grpc/version.rb index f1bb325b23a..6d79ec01905 100644 --- a/src/ruby/lib/grpc/version.rb +++ b/src/ruby/lib/grpc/version.rb @@ -14,5 +14,5 @@ # GRPC contains the General RPC module. module GRPC - VERSION = '1.8.0.pre2' + VERSION = '1.8.0' end diff --git a/src/ruby/tools/version.rb b/src/ruby/tools/version.rb index 6b4dbf65c5d..aa63c101de6 100644 --- a/src/ruby/tools/version.rb +++ b/src/ruby/tools/version.rb @@ -14,6 +14,6 @@ module GRPC module Tools - VERSION = '1.8.0.pre2' + VERSION = '1.8.0' end end diff --git a/tools/distrib/python/grpcio_tools/grpc_version.py b/tools/distrib/python/grpcio_tools/grpc_version.py index 2995f6cd85c..c1472403423 100644 --- a/tools/distrib/python/grpcio_tools/grpc_version.py +++ b/tools/distrib/python/grpcio_tools/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! -VERSION='1.8.0rc2' +VERSION='1.8.0' diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++ index 026ec9f6cb1..f1716c7d9fc 100644 --- a/tools/doxygen/Doxyfile.c++ +++ b/tools/doxygen/Doxyfile.c++ @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC C++" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.8.0-pre2 +PROJECT_NUMBER = 1.8.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index cba20b31908..d29254b6ead 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC C++" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.8.0-pre2 +PROJECT_NUMBER = 1.8.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/tools/doxygen/Doxyfile.core b/tools/doxygen/Doxyfile.core index f6fc7488f8a..3c1abad55f6 100644 --- a/tools/doxygen/Doxyfile.core +++ b/tools/doxygen/Doxyfile.core @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Core" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 5.0.0-pre2 +PROJECT_NUMBER = 5.0.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 009cf031ab2..f7d8ba3340d 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Core" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 5.0.0-pre2 +PROJECT_NUMBER = 5.0.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a From 5add606a07c4149a57c1eca5d701ee27beb63a87 Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Tue, 12 Dec 2017 17:47:43 -0800 Subject: [PATCH 091/127] Update README version to 1.8 --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 048614a2057..1550bb52f47 100644 --- a/README.md +++ b/README.md @@ -27,13 +27,13 @@ Libraries in different languages may be in different states of development. We a | Language | Source | Status | |-------------------------|-------------------------------------|---------| -| Shared C [core library] | [src/core](src/core) | 1.6 | -| C++ | [src/cpp](src/cpp) | 1.6 | -| Ruby | [src/ruby](src/ruby) | 1.6 | -| Python | [src/python](src/python) | 1.6 | -| PHP | [src/php](src/php) | 1.6 | -| C# | [src/csharp](src/csharp) | 1.6 | -| Objective-C | [src/objective-c](src/objective-c) | 1.6 | +| Shared C [core library] | [src/core](src/core) | 1.8 | +| C++ | [src/cpp](src/cpp) | 1.8 | +| Ruby | [src/ruby](src/ruby) | 1.8 | +| Python | [src/python](src/python) | 1.8 | +| PHP | [src/php](src/php) | 1.8 | +| C# | [src/csharp](src/csharp) | 1.8 | +| Objective-C | [src/objective-c](src/objective-c) | 1.8 | Java source code is in the [grpc-java](http://github.com/grpc/grpc-java) repository. Go source code is in the From 36b42ecb50d9d29ead5e11a14d1565a50a364aea Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Mon, 11 Dec 2017 12:31:59 -0800 Subject: [PATCH 092/127] Remove version column on README.md It provides unclear benefits and often goes stale. Let's kill it. --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 1550bb52f47..53078e60784 100644 --- a/README.md +++ b/README.md @@ -25,15 +25,15 @@ This repository contains source code for gRPC libraries for multiple languages w Libraries in different languages may be in different states of development. We are seeking contributions for all of these libraries. -| Language | Source | Status | -|-------------------------|-------------------------------------|---------| -| Shared C [core library] | [src/core](src/core) | 1.8 | -| C++ | [src/cpp](src/cpp) | 1.8 | -| Ruby | [src/ruby](src/ruby) | 1.8 | -| Python | [src/python](src/python) | 1.8 | -| PHP | [src/php](src/php) | 1.8 | -| C# | [src/csharp](src/csharp) | 1.8 | -| Objective-C | [src/objective-c](src/objective-c) | 1.8 | +| Language | Source | +|-------------------------|-------------------------------------| +| Shared C [core library] | [src/core](src/core) | +| C++ | [src/cpp](src/cpp) | +| Ruby | [src/ruby](src/ruby) | +| Python | [src/python](src/python) | +| PHP | [src/php](src/php) | +| C# | [src/csharp](src/csharp) | +| Objective-C | [src/objective-c](src/objective-c) | Java source code is in the [grpc-java](http://github.com/grpc/grpc-java) repository. Go source code is in the From 98e075a616102188c9ef4d6bef2cf60489124f92 Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Mon, 11 Dec 2017 13:56:05 -0800 Subject: [PATCH 093/127] Add a comment when Xcode simulator fails to start. --- src/objective-c/tests/run_tests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/objective-c/tests/run_tests.sh b/src/objective-c/tests/run_tests.sh index a9a97aad2cc..cf0b07e8c0d 100755 --- a/src/objective-c/tests/run_tests.sh +++ b/src/objective-c/tests/run_tests.sh @@ -43,6 +43,7 @@ while [ $retries -lt 3 ] && ! open -a Simulator --args -CurrentDeviceUDID $udid retries=$(($retries+1)) done if [ $retries == 3 ]; then + echo "Xcode simulator failed to start after 3 retries." exit 1 fi From 3c42425cd1c3a1ca37f6079ca85e6dd0fa7e2f80 Mon Sep 17 00:00:00 2001 From: yang-g Date: Mon, 11 Dec 2017 15:08:51 -0800 Subject: [PATCH 094/127] Use the correct env var name --- .../security/credentials/google_default/credentials_generic.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/lib/security/credentials/google_default/credentials_generic.cc b/src/core/lib/security/credentials/google_default/credentials_generic.cc index 58ee080cf3d..af103f5dc56 100644 --- a/src/core/lib/security/credentials/google_default/credentials_generic.cc +++ b/src/core/lib/security/credentials/google_default/credentials_generic.cc @@ -29,7 +29,7 @@ char* grpc_get_well_known_google_credentials_file_path_impl(void) { char* result = nullptr; char* base = gpr_getenv(GRPC_GOOGLE_CREDENTIALS_PATH_ENV_VAR); if (base == nullptr) { - gpr_log(GPR_ERROR, "Could not get " GRPC_GOOGLE_CREDENTIALS_ENV_VAR + gpr_log(GPR_ERROR, "Could not get " GRPC_GOOGLE_CREDENTIALS_PATH_ENV_VAR " environment variable."); return nullptr; } From 69aec175625b131ae2305280589cfc87644f9fae Mon Sep 17 00:00:00 2001 From: yang-g Date: Mon, 11 Dec 2017 15:52:50 -0800 Subject: [PATCH 095/127] Add dummy operator delete to make VS2015 not complain. --- include/grpc++/impl/codegen/async_unary_call.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/grpc++/impl/codegen/async_unary_call.h b/include/grpc++/impl/codegen/async_unary_call.h index b9ea5fd19c2..2bbbb875032 100644 --- a/include/grpc++/impl/codegen/async_unary_call.h +++ b/include/grpc++/impl/codegen/async_unary_call.h @@ -103,6 +103,13 @@ class ClientAsyncResponseReader final assert(size == sizeof(ClientAsyncResponseReader)); } + // This operator should never be called as the memory should be freed as part + // of the arena destruction. It only exists to provide a matching operator + // delete to the operator new so that some compilers will not complain (see + // Issue# 11301). Note at the time of adding this there is no tests catching + // the compiler warning. + static void operator delete(void*, void*) {} + void StartCall() override { assert(!started_); started_ = true; From b94346f54103f3dcdfd02eed016b2a75aa3e6668 Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Mon, 11 Dec 2017 16:03:40 -0800 Subject: [PATCH 096/127] pass intended invocation args to bazel tests under poller script --- bazel/grpc_build_system.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl index 2ef85445023..0f9260870c5 100644 --- a/bazel/grpc_build_system.bzl +++ b/bazel/grpc_build_system.bzl @@ -98,7 +98,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data args = [ poller, '$(location %s)' % name - ], + ] + args['args'], ) else: native.cc_test(**args) From 128366374f8fdd07bb458a6775c86293f6592105 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 11 Dec 2017 16:14:24 -0800 Subject: [PATCH 097/127] Yapf-ize grpcio/grpc_.py --- src/python/grpcio/grpc_core_dependencies.py | 1326 ++++++++--------- src/python/grpcio/grpc_version.py | 2 +- .../grpcio/grpc_core_dependencies.py.template | 2 +- .../python/grpcio/grpc_version.py.template | 2 +- tools/distrib/yapf_code.sh | 1 - 5 files changed, 666 insertions(+), 667 deletions(-) diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index d2a68f0902f..aea0786890b 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -15,667 +15,667 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_core_dependencies.py.template`!!! CORE_SOURCE_FILES = [ - 'src/core/lib/profiling/basic_timers.cc', - 'src/core/lib/profiling/stap_timers.cc', - 'src/core/lib/support/alloc.cc', - 'src/core/lib/support/arena.cc', - 'src/core/lib/support/atm.cc', - 'src/core/lib/support/avl.cc', - 'src/core/lib/support/cmdline.cc', - 'src/core/lib/support/cpu_iphone.cc', - 'src/core/lib/support/cpu_linux.cc', - 'src/core/lib/support/cpu_posix.cc', - 'src/core/lib/support/cpu_windows.cc', - 'src/core/lib/support/env_linux.cc', - 'src/core/lib/support/env_posix.cc', - 'src/core/lib/support/env_windows.cc', - 'src/core/lib/support/fork.cc', - 'src/core/lib/support/host_port.cc', - 'src/core/lib/support/log.cc', - 'src/core/lib/support/log_android.cc', - 'src/core/lib/support/log_linux.cc', - 'src/core/lib/support/log_posix.cc', - 'src/core/lib/support/log_windows.cc', - 'src/core/lib/support/mpscq.cc', - 'src/core/lib/support/murmur_hash.cc', - 'src/core/lib/support/string.cc', - 'src/core/lib/support/string_posix.cc', - 'src/core/lib/support/string_util_windows.cc', - 'src/core/lib/support/string_windows.cc', - 'src/core/lib/support/subprocess_posix.cc', - 'src/core/lib/support/subprocess_windows.cc', - 'src/core/lib/support/sync.cc', - 'src/core/lib/support/sync_posix.cc', - 'src/core/lib/support/sync_windows.cc', - 'src/core/lib/support/thd.cc', - 'src/core/lib/support/thd_posix.cc', - 'src/core/lib/support/thd_windows.cc', - 'src/core/lib/support/time.cc', - 'src/core/lib/support/time_posix.cc', - 'src/core/lib/support/time_precise.cc', - 'src/core/lib/support/time_windows.cc', - 'src/core/lib/support/tls_pthread.cc', - 'src/core/lib/support/tmpfile_msys.cc', - 'src/core/lib/support/tmpfile_posix.cc', - 'src/core/lib/support/tmpfile_windows.cc', - 'src/core/lib/support/wrap_memcpy.cc', - 'src/core/lib/surface/init.cc', - 'src/core/lib/backoff/backoff.cc', - 'src/core/lib/channel/channel_args.cc', - 'src/core/lib/channel/channel_stack.cc', - 'src/core/lib/channel/channel_stack_builder.cc', - 'src/core/lib/channel/connected_channel.cc', - 'src/core/lib/channel/handshaker.cc', - 'src/core/lib/channel/handshaker_factory.cc', - 'src/core/lib/channel/handshaker_registry.cc', - 'src/core/lib/compression/compression.cc', - 'src/core/lib/compression/message_compress.cc', - 'src/core/lib/compression/stream_compression.cc', - 'src/core/lib/compression/stream_compression_gzip.cc', - 'src/core/lib/compression/stream_compression_identity.cc', - 'src/core/lib/debug/stats.cc', - 'src/core/lib/debug/stats_data.cc', - 'src/core/lib/http/format_request.cc', - 'src/core/lib/http/httpcli.cc', - 'src/core/lib/http/parser.cc', - 'src/core/lib/iomgr/call_combiner.cc', - 'src/core/lib/iomgr/combiner.cc', - 'src/core/lib/iomgr/endpoint.cc', - 'src/core/lib/iomgr/endpoint_pair_posix.cc', - 'src/core/lib/iomgr/endpoint_pair_uv.cc', - 'src/core/lib/iomgr/endpoint_pair_windows.cc', - 'src/core/lib/iomgr/error.cc', - 'src/core/lib/iomgr/ev_epoll1_linux.cc', - 'src/core/lib/iomgr/ev_epollex_linux.cc', - 'src/core/lib/iomgr/ev_epollsig_linux.cc', - 'src/core/lib/iomgr/ev_poll_posix.cc', - 'src/core/lib/iomgr/ev_posix.cc', - 'src/core/lib/iomgr/ev_windows.cc', - 'src/core/lib/iomgr/exec_ctx.cc', - 'src/core/lib/iomgr/executor.cc', - 'src/core/lib/iomgr/fork_posix.cc', - 'src/core/lib/iomgr/fork_windows.cc', - 'src/core/lib/iomgr/gethostname_fallback.cc', - 'src/core/lib/iomgr/gethostname_host_name_max.cc', - 'src/core/lib/iomgr/gethostname_sysconf.cc', - 'src/core/lib/iomgr/iocp_windows.cc', - 'src/core/lib/iomgr/iomgr.cc', - 'src/core/lib/iomgr/iomgr_posix.cc', - 'src/core/lib/iomgr/iomgr_uv.cc', - 'src/core/lib/iomgr/iomgr_windows.cc', - 'src/core/lib/iomgr/is_epollexclusive_available.cc', - 'src/core/lib/iomgr/load_file.cc', - 'src/core/lib/iomgr/lockfree_event.cc', - 'src/core/lib/iomgr/network_status_tracker.cc', - 'src/core/lib/iomgr/polling_entity.cc', - 'src/core/lib/iomgr/pollset_set_uv.cc', - 'src/core/lib/iomgr/pollset_set_windows.cc', - 'src/core/lib/iomgr/pollset_uv.cc', - 'src/core/lib/iomgr/pollset_windows.cc', - 'src/core/lib/iomgr/resolve_address_posix.cc', - 'src/core/lib/iomgr/resolve_address_uv.cc', - 'src/core/lib/iomgr/resolve_address_windows.cc', - 'src/core/lib/iomgr/resource_quota.cc', - 'src/core/lib/iomgr/sockaddr_utils.cc', - 'src/core/lib/iomgr/socket_factory_posix.cc', - 'src/core/lib/iomgr/socket_mutator.cc', - 'src/core/lib/iomgr/socket_utils_common_posix.cc', - 'src/core/lib/iomgr/socket_utils_linux.cc', - 'src/core/lib/iomgr/socket_utils_posix.cc', - 'src/core/lib/iomgr/socket_utils_uv.cc', - 'src/core/lib/iomgr/socket_utils_windows.cc', - 'src/core/lib/iomgr/socket_windows.cc', - 'src/core/lib/iomgr/tcp_client_posix.cc', - 'src/core/lib/iomgr/tcp_client_uv.cc', - 'src/core/lib/iomgr/tcp_client_windows.cc', - 'src/core/lib/iomgr/tcp_posix.cc', - 'src/core/lib/iomgr/tcp_server_posix.cc', - 'src/core/lib/iomgr/tcp_server_utils_posix_common.cc', - 'src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc', - 'src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc', - 'src/core/lib/iomgr/tcp_server_uv.cc', - 'src/core/lib/iomgr/tcp_server_windows.cc', - 'src/core/lib/iomgr/tcp_uv.cc', - 'src/core/lib/iomgr/tcp_windows.cc', - 'src/core/lib/iomgr/time_averaged_stats.cc', - 'src/core/lib/iomgr/timer_generic.cc', - 'src/core/lib/iomgr/timer_heap.cc', - 'src/core/lib/iomgr/timer_manager.cc', - 'src/core/lib/iomgr/timer_uv.cc', - 'src/core/lib/iomgr/udp_server.cc', - 'src/core/lib/iomgr/unix_sockets_posix.cc', - 'src/core/lib/iomgr/unix_sockets_posix_noop.cc', - 'src/core/lib/iomgr/wakeup_fd_cv.cc', - 'src/core/lib/iomgr/wakeup_fd_eventfd.cc', - 'src/core/lib/iomgr/wakeup_fd_nospecial.cc', - 'src/core/lib/iomgr/wakeup_fd_pipe.cc', - 'src/core/lib/iomgr/wakeup_fd_posix.cc', - 'src/core/lib/json/json.cc', - 'src/core/lib/json/json_reader.cc', - 'src/core/lib/json/json_string.cc', - 'src/core/lib/json/json_writer.cc', - 'src/core/lib/slice/b64.cc', - 'src/core/lib/slice/percent_encoding.cc', - 'src/core/lib/slice/slice.cc', - 'src/core/lib/slice/slice_buffer.cc', - 'src/core/lib/slice/slice_hash_table.cc', - 'src/core/lib/slice/slice_intern.cc', - 'src/core/lib/slice/slice_string_helpers.cc', - 'src/core/lib/surface/alarm.cc', - 'src/core/lib/surface/api_trace.cc', - 'src/core/lib/surface/byte_buffer.cc', - 'src/core/lib/surface/byte_buffer_reader.cc', - 'src/core/lib/surface/call.cc', - 'src/core/lib/surface/call_details.cc', - 'src/core/lib/surface/call_log_batch.cc', - 'src/core/lib/surface/channel.cc', - 'src/core/lib/surface/channel_init.cc', - 'src/core/lib/surface/channel_ping.cc', - 'src/core/lib/surface/channel_stack_type.cc', - 'src/core/lib/surface/completion_queue.cc', - 'src/core/lib/surface/completion_queue_factory.cc', - 'src/core/lib/surface/event_string.cc', - 'src/core/lib/surface/lame_client.cc', - 'src/core/lib/surface/metadata_array.cc', - 'src/core/lib/surface/server.cc', - 'src/core/lib/surface/validate_metadata.cc', - 'src/core/lib/surface/version.cc', - 'src/core/lib/transport/bdp_estimator.cc', - 'src/core/lib/transport/byte_stream.cc', - 'src/core/lib/transport/connectivity_state.cc', - 'src/core/lib/transport/error_utils.cc', - 'src/core/lib/transport/metadata.cc', - 'src/core/lib/transport/metadata_batch.cc', - 'src/core/lib/transport/pid_controller.cc', - 'src/core/lib/transport/service_config.cc', - 'src/core/lib/transport/static_metadata.cc', - 'src/core/lib/transport/status_conversion.cc', - 'src/core/lib/transport/timeout_encoding.cc', - 'src/core/lib/transport/transport.cc', - 'src/core/lib/transport/transport_op_string.cc', - 'src/core/lib/debug/trace.cc', - 'src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc', - 'src/core/ext/transport/chttp2/transport/bin_decoder.cc', - 'src/core/ext/transport/chttp2/transport/bin_encoder.cc', - 'src/core/ext/transport/chttp2/transport/chttp2_plugin.cc', - 'src/core/ext/transport/chttp2/transport/chttp2_transport.cc', - 'src/core/ext/transport/chttp2/transport/flow_control.cc', - 'src/core/ext/transport/chttp2/transport/frame_data.cc', - 'src/core/ext/transport/chttp2/transport/frame_goaway.cc', - 'src/core/ext/transport/chttp2/transport/frame_ping.cc', - 'src/core/ext/transport/chttp2/transport/frame_rst_stream.cc', - 'src/core/ext/transport/chttp2/transport/frame_settings.cc', - 'src/core/ext/transport/chttp2/transport/frame_window_update.cc', - 'src/core/ext/transport/chttp2/transport/hpack_encoder.cc', - 'src/core/ext/transport/chttp2/transport/hpack_parser.cc', - 'src/core/ext/transport/chttp2/transport/hpack_table.cc', - 'src/core/ext/transport/chttp2/transport/http2_settings.cc', - 'src/core/ext/transport/chttp2/transport/huffsyms.cc', - 'src/core/ext/transport/chttp2/transport/incoming_metadata.cc', - 'src/core/ext/transport/chttp2/transport/parsing.cc', - 'src/core/ext/transport/chttp2/transport/stream_lists.cc', - 'src/core/ext/transport/chttp2/transport/stream_map.cc', - 'src/core/ext/transport/chttp2/transport/varint.cc', - 'src/core/ext/transport/chttp2/transport/writing.cc', - 'src/core/ext/transport/chttp2/alpn/alpn.cc', - 'src/core/ext/filters/http/client/http_client_filter.cc', - 'src/core/ext/filters/http/http_filters_plugin.cc', - 'src/core/ext/filters/http/message_compress/message_compress_filter.cc', - 'src/core/ext/filters/http/server/http_server_filter.cc', - 'src/core/lib/http/httpcli_security_connector.cc', - 'src/core/lib/security/context/security_context.cc', - 'src/core/lib/security/credentials/composite/composite_credentials.cc', - 'src/core/lib/security/credentials/credentials.cc', - 'src/core/lib/security/credentials/credentials_metadata.cc', - 'src/core/lib/security/credentials/fake/fake_credentials.cc', - 'src/core/lib/security/credentials/google_default/credentials_generic.cc', - 'src/core/lib/security/credentials/google_default/google_default_credentials.cc', - 'src/core/lib/security/credentials/iam/iam_credentials.cc', - 'src/core/lib/security/credentials/jwt/json_token.cc', - 'src/core/lib/security/credentials/jwt/jwt_credentials.cc', - 'src/core/lib/security/credentials/jwt/jwt_verifier.cc', - 'src/core/lib/security/credentials/oauth2/oauth2_credentials.cc', - 'src/core/lib/security/credentials/plugin/plugin_credentials.cc', - 'src/core/lib/security/credentials/ssl/ssl_credentials.cc', - 'src/core/lib/security/transport/client_auth_filter.cc', - 'src/core/lib/security/transport/lb_targets_info.cc', - 'src/core/lib/security/transport/secure_endpoint.cc', - 'src/core/lib/security/transport/security_connector.cc', - 'src/core/lib/security/transport/security_handshaker.cc', - 'src/core/lib/security/transport/server_auth_filter.cc', - 'src/core/lib/security/transport/tsi_error.cc', - 'src/core/lib/security/util/json_util.cc', - 'src/core/lib/surface/init_secure.cc', - 'src/core/tsi/fake_transport_security.cc', - 'src/core/tsi/gts_transport_security.cc', - 'src/core/tsi/ssl_transport_security.cc', - 'src/core/tsi/transport_security_grpc.cc', - 'src/core/tsi/transport_security.cc', - 'src/core/tsi/transport_security_adapter.cc', - 'src/core/ext/transport/chttp2/server/chttp2_server.cc', - 'src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc', - 'src/core/ext/filters/client_channel/backup_poller.cc', - 'src/core/ext/filters/client_channel/channel_connectivity.cc', - 'src/core/ext/filters/client_channel/client_channel.cc', - 'src/core/ext/filters/client_channel/client_channel_factory.cc', - 'src/core/ext/filters/client_channel/client_channel_plugin.cc', - 'src/core/ext/filters/client_channel/connector.cc', - 'src/core/ext/filters/client_channel/http_connect_handshaker.cc', - 'src/core/ext/filters/client_channel/http_proxy.cc', - 'src/core/ext/filters/client_channel/lb_policy.cc', - 'src/core/ext/filters/client_channel/lb_policy_factory.cc', - 'src/core/ext/filters/client_channel/lb_policy_registry.cc', - 'src/core/ext/filters/client_channel/parse_address.cc', - 'src/core/ext/filters/client_channel/proxy_mapper.cc', - 'src/core/ext/filters/client_channel/proxy_mapper_registry.cc', - 'src/core/ext/filters/client_channel/resolver.cc', - 'src/core/ext/filters/client_channel/resolver_factory.cc', - 'src/core/ext/filters/client_channel/resolver_registry.cc', - 'src/core/ext/filters/client_channel/retry_throttle.cc', - 'src/core/ext/filters/client_channel/subchannel.cc', - 'src/core/ext/filters/client_channel/subchannel_index.cc', - 'src/core/ext/filters/client_channel/uri_parser.cc', - 'src/core/ext/filters/deadline/deadline_filter.cc', - 'src/core/ext/transport/chttp2/client/chttp2_connector.cc', - 'src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc', - 'src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc', - 'src/core/ext/transport/chttp2/client/insecure/channel_create.cc', - 'src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc', - 'src/core/ext/transport/inproc/inproc_plugin.cc', - 'src/core/ext/transport/inproc/inproc_transport.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c', - 'third_party/nanopb/pb_common.c', - 'third_party/nanopb/pb_decode.c', - 'third_party/nanopb/pb_encode.c', - 'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc', - 'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc', - 'src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc', - 'src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc', - 'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc', - 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc', - 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc', - 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc', - 'src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc', - 'src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc', - 'src/core/ext/filters/load_reporting/server_load_reporting_filter.cc', - 'src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc', - 'src/core/ext/census/grpc_context.cc', - 'src/core/ext/filters/max_age/max_age_filter.cc', - 'src/core/ext/filters/message_size/message_size_filter.cc', - 'src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc', - 'src/core/ext/filters/workarounds/workaround_utils.cc', - 'src/core/plugin_registry/grpc_plugin_registry.cc', - 'src/boringssl/err_data.c', - 'third_party/boringssl/crypto/aes/aes.c', - 'third_party/boringssl/crypto/aes/key_wrap.c', - 'third_party/boringssl/crypto/aes/mode_wrappers.c', - 'third_party/boringssl/crypto/asn1/a_bitstr.c', - 'third_party/boringssl/crypto/asn1/a_bool.c', - 'third_party/boringssl/crypto/asn1/a_d2i_fp.c', - 'third_party/boringssl/crypto/asn1/a_dup.c', - 'third_party/boringssl/crypto/asn1/a_enum.c', - 'third_party/boringssl/crypto/asn1/a_gentm.c', - 'third_party/boringssl/crypto/asn1/a_i2d_fp.c', - 'third_party/boringssl/crypto/asn1/a_int.c', - 'third_party/boringssl/crypto/asn1/a_mbstr.c', - 'third_party/boringssl/crypto/asn1/a_object.c', - 'third_party/boringssl/crypto/asn1/a_octet.c', - 'third_party/boringssl/crypto/asn1/a_print.c', - 'third_party/boringssl/crypto/asn1/a_strnid.c', - 'third_party/boringssl/crypto/asn1/a_time.c', - 'third_party/boringssl/crypto/asn1/a_type.c', - 'third_party/boringssl/crypto/asn1/a_utctm.c', - 'third_party/boringssl/crypto/asn1/a_utf8.c', - 'third_party/boringssl/crypto/asn1/asn1_lib.c', - 'third_party/boringssl/crypto/asn1/asn1_par.c', - 'third_party/boringssl/crypto/asn1/asn_pack.c', - 'third_party/boringssl/crypto/asn1/f_enum.c', - 'third_party/boringssl/crypto/asn1/f_int.c', - 'third_party/boringssl/crypto/asn1/f_string.c', - 'third_party/boringssl/crypto/asn1/t_bitst.c', - 'third_party/boringssl/crypto/asn1/tasn_dec.c', - 'third_party/boringssl/crypto/asn1/tasn_enc.c', - 'third_party/boringssl/crypto/asn1/tasn_fre.c', - 'third_party/boringssl/crypto/asn1/tasn_new.c', - 'third_party/boringssl/crypto/asn1/tasn_typ.c', - 'third_party/boringssl/crypto/asn1/tasn_utl.c', - 'third_party/boringssl/crypto/asn1/time_support.c', - 'third_party/boringssl/crypto/asn1/x_bignum.c', - 'third_party/boringssl/crypto/asn1/x_long.c', - 'third_party/boringssl/crypto/base64/base64.c', - 'third_party/boringssl/crypto/bio/bio.c', - 'third_party/boringssl/crypto/bio/bio_mem.c', - 'third_party/boringssl/crypto/bio/connect.c', - 'third_party/boringssl/crypto/bio/fd.c', - 'third_party/boringssl/crypto/bio/file.c', - 'third_party/boringssl/crypto/bio/hexdump.c', - 'third_party/boringssl/crypto/bio/pair.c', - 'third_party/boringssl/crypto/bio/printf.c', - 'third_party/boringssl/crypto/bio/socket.c', - 'third_party/boringssl/crypto/bio/socket_helper.c', - 'third_party/boringssl/crypto/bn/add.c', - 'third_party/boringssl/crypto/bn/asm/x86_64-gcc.c', - 'third_party/boringssl/crypto/bn/bn.c', - 'third_party/boringssl/crypto/bn/bn_asn1.c', - 'third_party/boringssl/crypto/bn/cmp.c', - 'third_party/boringssl/crypto/bn/convert.c', - 'third_party/boringssl/crypto/bn/ctx.c', - 'third_party/boringssl/crypto/bn/div.c', - 'third_party/boringssl/crypto/bn/exponentiation.c', - 'third_party/boringssl/crypto/bn/gcd.c', - 'third_party/boringssl/crypto/bn/generic.c', - 'third_party/boringssl/crypto/bn/kronecker.c', - 'third_party/boringssl/crypto/bn/montgomery.c', - 'third_party/boringssl/crypto/bn/montgomery_inv.c', - 'third_party/boringssl/crypto/bn/mul.c', - 'third_party/boringssl/crypto/bn/prime.c', - 'third_party/boringssl/crypto/bn/random.c', - 'third_party/boringssl/crypto/bn/rsaz_exp.c', - 'third_party/boringssl/crypto/bn/shift.c', - 'third_party/boringssl/crypto/bn/sqrt.c', - 'third_party/boringssl/crypto/buf/buf.c', - 'third_party/boringssl/crypto/bytestring/asn1_compat.c', - 'third_party/boringssl/crypto/bytestring/ber.c', - 'third_party/boringssl/crypto/bytestring/cbb.c', - 'third_party/boringssl/crypto/bytestring/cbs.c', - 'third_party/boringssl/crypto/chacha/chacha.c', - 'third_party/boringssl/crypto/cipher/aead.c', - 'third_party/boringssl/crypto/cipher/cipher.c', - 'third_party/boringssl/crypto/cipher/derive_key.c', - 'third_party/boringssl/crypto/cipher/e_aes.c', - 'third_party/boringssl/crypto/cipher/e_chacha20poly1305.c', - 'third_party/boringssl/crypto/cipher/e_des.c', - 'third_party/boringssl/crypto/cipher/e_null.c', - 'third_party/boringssl/crypto/cipher/e_rc2.c', - 'third_party/boringssl/crypto/cipher/e_rc4.c', - 'third_party/boringssl/crypto/cipher/e_ssl3.c', - 'third_party/boringssl/crypto/cipher/e_tls.c', - 'third_party/boringssl/crypto/cipher/tls_cbc.c', - 'third_party/boringssl/crypto/cmac/cmac.c', - 'third_party/boringssl/crypto/conf/conf.c', - 'third_party/boringssl/crypto/cpu-aarch64-linux.c', - 'third_party/boringssl/crypto/cpu-arm-linux.c', - 'third_party/boringssl/crypto/cpu-arm.c', - 'third_party/boringssl/crypto/cpu-intel.c', - 'third_party/boringssl/crypto/cpu-ppc64le.c', - 'third_party/boringssl/crypto/crypto.c', - 'third_party/boringssl/crypto/curve25519/curve25519.c', - 'third_party/boringssl/crypto/curve25519/spake25519.c', - 'third_party/boringssl/crypto/curve25519/x25519-x86_64.c', - 'third_party/boringssl/crypto/des/des.c', - 'third_party/boringssl/crypto/dh/check.c', - 'third_party/boringssl/crypto/dh/dh.c', - 'third_party/boringssl/crypto/dh/dh_asn1.c', - 'third_party/boringssl/crypto/dh/params.c', - 'third_party/boringssl/crypto/digest/digest.c', - 'third_party/boringssl/crypto/digest/digests.c', - 'third_party/boringssl/crypto/dsa/dsa.c', - 'third_party/boringssl/crypto/dsa/dsa_asn1.c', - 'third_party/boringssl/crypto/ec/ec.c', - 'third_party/boringssl/crypto/ec/ec_asn1.c', - 'third_party/boringssl/crypto/ec/ec_key.c', - 'third_party/boringssl/crypto/ec/ec_montgomery.c', - 'third_party/boringssl/crypto/ec/oct.c', - 'third_party/boringssl/crypto/ec/p224-64.c', - 'third_party/boringssl/crypto/ec/p256-64.c', - 'third_party/boringssl/crypto/ec/p256-x86_64.c', - 'third_party/boringssl/crypto/ec/simple.c', - 'third_party/boringssl/crypto/ec/util-64.c', - 'third_party/boringssl/crypto/ec/wnaf.c', - 'third_party/boringssl/crypto/ecdh/ecdh.c', - 'third_party/boringssl/crypto/ecdsa/ecdsa.c', - 'third_party/boringssl/crypto/ecdsa/ecdsa_asn1.c', - 'third_party/boringssl/crypto/engine/engine.c', - 'third_party/boringssl/crypto/err/err.c', - 'third_party/boringssl/crypto/evp/digestsign.c', - 'third_party/boringssl/crypto/evp/evp.c', - 'third_party/boringssl/crypto/evp/evp_asn1.c', - 'third_party/boringssl/crypto/evp/evp_ctx.c', - 'third_party/boringssl/crypto/evp/p_dsa_asn1.c', - 'third_party/boringssl/crypto/evp/p_ec.c', - 'third_party/boringssl/crypto/evp/p_ec_asn1.c', - 'third_party/boringssl/crypto/evp/p_rsa.c', - 'third_party/boringssl/crypto/evp/p_rsa_asn1.c', - 'third_party/boringssl/crypto/evp/pbkdf.c', - 'third_party/boringssl/crypto/evp/print.c', - 'third_party/boringssl/crypto/evp/sign.c', - 'third_party/boringssl/crypto/ex_data.c', - 'third_party/boringssl/crypto/hkdf/hkdf.c', - 'third_party/boringssl/crypto/hmac/hmac.c', - 'third_party/boringssl/crypto/lhash/lhash.c', - 'third_party/boringssl/crypto/md4/md4.c', - 'third_party/boringssl/crypto/md5/md5.c', - 'third_party/boringssl/crypto/mem.c', - 'third_party/boringssl/crypto/modes/cbc.c', - 'third_party/boringssl/crypto/modes/cfb.c', - 'third_party/boringssl/crypto/modes/ctr.c', - 'third_party/boringssl/crypto/modes/gcm.c', - 'third_party/boringssl/crypto/modes/ofb.c', - 'third_party/boringssl/crypto/modes/polyval.c', - 'third_party/boringssl/crypto/obj/obj.c', - 'third_party/boringssl/crypto/obj/obj_xref.c', - 'third_party/boringssl/crypto/pem/pem_all.c', - 'third_party/boringssl/crypto/pem/pem_info.c', - 'third_party/boringssl/crypto/pem/pem_lib.c', - 'third_party/boringssl/crypto/pem/pem_oth.c', - 'third_party/boringssl/crypto/pem/pem_pk8.c', - 'third_party/boringssl/crypto/pem/pem_pkey.c', - 'third_party/boringssl/crypto/pem/pem_x509.c', - 'third_party/boringssl/crypto/pem/pem_xaux.c', - 'third_party/boringssl/crypto/pkcs8/p5_pbev2.c', - 'third_party/boringssl/crypto/pkcs8/p8_pkey.c', - 'third_party/boringssl/crypto/pkcs8/pkcs8.c', - 'third_party/boringssl/crypto/poly1305/poly1305.c', - 'third_party/boringssl/crypto/poly1305/poly1305_arm.c', - 'third_party/boringssl/crypto/poly1305/poly1305_vec.c', - 'third_party/boringssl/crypto/pool/pool.c', - 'third_party/boringssl/crypto/rand/deterministic.c', - 'third_party/boringssl/crypto/rand/fuchsia.c', - 'third_party/boringssl/crypto/rand/rand.c', - 'third_party/boringssl/crypto/rand/urandom.c', - 'third_party/boringssl/crypto/rand/windows.c', - 'third_party/boringssl/crypto/rc4/rc4.c', - 'third_party/boringssl/crypto/refcount_c11.c', - 'third_party/boringssl/crypto/refcount_lock.c', - 'third_party/boringssl/crypto/rsa/blinding.c', - 'third_party/boringssl/crypto/rsa/padding.c', - 'third_party/boringssl/crypto/rsa/rsa.c', - 'third_party/boringssl/crypto/rsa/rsa_asn1.c', - 'third_party/boringssl/crypto/rsa/rsa_impl.c', - 'third_party/boringssl/crypto/sha/sha1-altivec.c', - 'third_party/boringssl/crypto/sha/sha1.c', - 'third_party/boringssl/crypto/sha/sha256.c', - 'third_party/boringssl/crypto/sha/sha512.c', - 'third_party/boringssl/crypto/stack/stack.c', - 'third_party/boringssl/crypto/thread.c', - 'third_party/boringssl/crypto/thread_none.c', - 'third_party/boringssl/crypto/thread_pthread.c', - 'third_party/boringssl/crypto/thread_win.c', - 'third_party/boringssl/crypto/x509/a_digest.c', - 'third_party/boringssl/crypto/x509/a_sign.c', - 'third_party/boringssl/crypto/x509/a_strex.c', - 'third_party/boringssl/crypto/x509/a_verify.c', - 'third_party/boringssl/crypto/x509/algorithm.c', - 'third_party/boringssl/crypto/x509/asn1_gen.c', - 'third_party/boringssl/crypto/x509/by_dir.c', - 'third_party/boringssl/crypto/x509/by_file.c', - 'third_party/boringssl/crypto/x509/i2d_pr.c', - 'third_party/boringssl/crypto/x509/pkcs7.c', - 'third_party/boringssl/crypto/x509/rsa_pss.c', - 'third_party/boringssl/crypto/x509/t_crl.c', - 'third_party/boringssl/crypto/x509/t_req.c', - 'third_party/boringssl/crypto/x509/t_x509.c', - 'third_party/boringssl/crypto/x509/t_x509a.c', - 'third_party/boringssl/crypto/x509/x509.c', - 'third_party/boringssl/crypto/x509/x509_att.c', - 'third_party/boringssl/crypto/x509/x509_cmp.c', - 'third_party/boringssl/crypto/x509/x509_d2.c', - 'third_party/boringssl/crypto/x509/x509_def.c', - 'third_party/boringssl/crypto/x509/x509_ext.c', - 'third_party/boringssl/crypto/x509/x509_lu.c', - 'third_party/boringssl/crypto/x509/x509_obj.c', - 'third_party/boringssl/crypto/x509/x509_r2x.c', - 'third_party/boringssl/crypto/x509/x509_req.c', - 'third_party/boringssl/crypto/x509/x509_set.c', - 'third_party/boringssl/crypto/x509/x509_trs.c', - 'third_party/boringssl/crypto/x509/x509_txt.c', - 'third_party/boringssl/crypto/x509/x509_v3.c', - 'third_party/boringssl/crypto/x509/x509_vfy.c', - 'third_party/boringssl/crypto/x509/x509_vpm.c', - 'third_party/boringssl/crypto/x509/x509cset.c', - 'third_party/boringssl/crypto/x509/x509name.c', - 'third_party/boringssl/crypto/x509/x509rset.c', - 'third_party/boringssl/crypto/x509/x509spki.c', - 'third_party/boringssl/crypto/x509/x509type.c', - 'third_party/boringssl/crypto/x509/x_algor.c', - 'third_party/boringssl/crypto/x509/x_all.c', - 'third_party/boringssl/crypto/x509/x_attrib.c', - 'third_party/boringssl/crypto/x509/x_crl.c', - 'third_party/boringssl/crypto/x509/x_exten.c', - 'third_party/boringssl/crypto/x509/x_info.c', - 'third_party/boringssl/crypto/x509/x_name.c', - 'third_party/boringssl/crypto/x509/x_pkey.c', - 'third_party/boringssl/crypto/x509/x_pubkey.c', - 'third_party/boringssl/crypto/x509/x_req.c', - 'third_party/boringssl/crypto/x509/x_sig.c', - 'third_party/boringssl/crypto/x509/x_spki.c', - 'third_party/boringssl/crypto/x509/x_val.c', - 'third_party/boringssl/crypto/x509/x_x509.c', - 'third_party/boringssl/crypto/x509/x_x509a.c', - 'third_party/boringssl/crypto/x509v3/pcy_cache.c', - 'third_party/boringssl/crypto/x509v3/pcy_data.c', - 'third_party/boringssl/crypto/x509v3/pcy_lib.c', - 'third_party/boringssl/crypto/x509v3/pcy_map.c', - 'third_party/boringssl/crypto/x509v3/pcy_node.c', - 'third_party/boringssl/crypto/x509v3/pcy_tree.c', - 'third_party/boringssl/crypto/x509v3/v3_akey.c', - 'third_party/boringssl/crypto/x509v3/v3_akeya.c', - 'third_party/boringssl/crypto/x509v3/v3_alt.c', - 'third_party/boringssl/crypto/x509v3/v3_bcons.c', - 'third_party/boringssl/crypto/x509v3/v3_bitst.c', - 'third_party/boringssl/crypto/x509v3/v3_conf.c', - 'third_party/boringssl/crypto/x509v3/v3_cpols.c', - 'third_party/boringssl/crypto/x509v3/v3_crld.c', - 'third_party/boringssl/crypto/x509v3/v3_enum.c', - 'third_party/boringssl/crypto/x509v3/v3_extku.c', - 'third_party/boringssl/crypto/x509v3/v3_genn.c', - 'third_party/boringssl/crypto/x509v3/v3_ia5.c', - 'third_party/boringssl/crypto/x509v3/v3_info.c', - 'third_party/boringssl/crypto/x509v3/v3_int.c', - 'third_party/boringssl/crypto/x509v3/v3_lib.c', - 'third_party/boringssl/crypto/x509v3/v3_ncons.c', - 'third_party/boringssl/crypto/x509v3/v3_pci.c', - 'third_party/boringssl/crypto/x509v3/v3_pcia.c', - 'third_party/boringssl/crypto/x509v3/v3_pcons.c', - 'third_party/boringssl/crypto/x509v3/v3_pku.c', - 'third_party/boringssl/crypto/x509v3/v3_pmaps.c', - 'third_party/boringssl/crypto/x509v3/v3_prn.c', - 'third_party/boringssl/crypto/x509v3/v3_purp.c', - 'third_party/boringssl/crypto/x509v3/v3_skey.c', - 'third_party/boringssl/crypto/x509v3/v3_sxnet.c', - 'third_party/boringssl/crypto/x509v3/v3_utl.c', - 'third_party/boringssl/ssl/bio_ssl.c', - 'third_party/boringssl/ssl/custom_extensions.c', - 'third_party/boringssl/ssl/d1_both.c', - 'third_party/boringssl/ssl/d1_lib.c', - 'third_party/boringssl/ssl/d1_pkt.c', - 'third_party/boringssl/ssl/d1_srtp.c', - 'third_party/boringssl/ssl/dtls_method.c', - 'third_party/boringssl/ssl/dtls_record.c', - 'third_party/boringssl/ssl/handshake_client.c', - 'third_party/boringssl/ssl/handshake_server.c', - 'third_party/boringssl/ssl/s3_both.c', - 'third_party/boringssl/ssl/s3_lib.c', - 'third_party/boringssl/ssl/s3_pkt.c', - 'third_party/boringssl/ssl/ssl_aead_ctx.c', - 'third_party/boringssl/ssl/ssl_asn1.c', - 'third_party/boringssl/ssl/ssl_buffer.c', - 'third_party/boringssl/ssl/ssl_cert.c', - 'third_party/boringssl/ssl/ssl_cipher.c', - 'third_party/boringssl/ssl/ssl_ecdh.c', - 'third_party/boringssl/ssl/ssl_file.c', - 'third_party/boringssl/ssl/ssl_lib.c', - 'third_party/boringssl/ssl/ssl_privkey.c', - 'third_party/boringssl/ssl/ssl_privkey_cc.cc', - 'third_party/boringssl/ssl/ssl_session.c', - 'third_party/boringssl/ssl/ssl_stat.c', - 'third_party/boringssl/ssl/ssl_transcript.c', - 'third_party/boringssl/ssl/ssl_x509.c', - 'third_party/boringssl/ssl/t1_enc.c', - 'third_party/boringssl/ssl/t1_lib.c', - 'third_party/boringssl/ssl/tls13_both.c', - 'third_party/boringssl/ssl/tls13_client.c', - 'third_party/boringssl/ssl/tls13_enc.c', - 'third_party/boringssl/ssl/tls13_server.c', - 'third_party/boringssl/ssl/tls_method.c', - 'third_party/boringssl/ssl/tls_record.c', - 'third_party/zlib/adler32.c', - 'third_party/zlib/compress.c', - 'third_party/zlib/crc32.c', - 'third_party/zlib/deflate.c', - 'third_party/zlib/gzclose.c', - 'third_party/zlib/gzlib.c', - 'third_party/zlib/gzread.c', - 'third_party/zlib/gzwrite.c', - 'third_party/zlib/infback.c', - 'third_party/zlib/inffast.c', - 'third_party/zlib/inflate.c', - 'third_party/zlib/inftrees.c', - 'third_party/zlib/trees.c', - 'third_party/zlib/uncompr.c', - 'third_party/zlib/zutil.c', - 'third_party/cares/cares/ares__close_sockets.c', - 'third_party/cares/cares/ares__get_hostent.c', - 'third_party/cares/cares/ares__read_line.c', - 'third_party/cares/cares/ares__timeval.c', - 'third_party/cares/cares/ares_cancel.c', - 'third_party/cares/cares/ares_create_query.c', - 'third_party/cares/cares/ares_data.c', - 'third_party/cares/cares/ares_destroy.c', - 'third_party/cares/cares/ares_expand_name.c', - 'third_party/cares/cares/ares_expand_string.c', - 'third_party/cares/cares/ares_fds.c', - 'third_party/cares/cares/ares_free_hostent.c', - 'third_party/cares/cares/ares_free_string.c', - 'third_party/cares/cares/ares_getenv.c', - 'third_party/cares/cares/ares_gethostbyaddr.c', - 'third_party/cares/cares/ares_gethostbyname.c', - 'third_party/cares/cares/ares_getnameinfo.c', - 'third_party/cares/cares/ares_getopt.c', - 'third_party/cares/cares/ares_getsock.c', - 'third_party/cares/cares/ares_init.c', - 'third_party/cares/cares/ares_library_init.c', - 'third_party/cares/cares/ares_llist.c', - 'third_party/cares/cares/ares_mkquery.c', - 'third_party/cares/cares/ares_nowarn.c', - 'third_party/cares/cares/ares_options.c', - 'third_party/cares/cares/ares_parse_a_reply.c', - 'third_party/cares/cares/ares_parse_aaaa_reply.c', - 'third_party/cares/cares/ares_parse_mx_reply.c', - 'third_party/cares/cares/ares_parse_naptr_reply.c', - 'third_party/cares/cares/ares_parse_ns_reply.c', - 'third_party/cares/cares/ares_parse_ptr_reply.c', - 'third_party/cares/cares/ares_parse_soa_reply.c', - 'third_party/cares/cares/ares_parse_srv_reply.c', - 'third_party/cares/cares/ares_parse_txt_reply.c', - 'third_party/cares/cares/ares_platform.c', - 'third_party/cares/cares/ares_process.c', - 'third_party/cares/cares/ares_query.c', - 'third_party/cares/cares/ares_search.c', - 'third_party/cares/cares/ares_send.c', - 'third_party/cares/cares/ares_strcasecmp.c', - 'third_party/cares/cares/ares_strdup.c', - 'third_party/cares/cares/ares_strerror.c', - 'third_party/cares/cares/ares_timeout.c', - 'third_party/cares/cares/ares_version.c', - 'third_party/cares/cares/ares_writev.c', - 'third_party/cares/cares/bitncmp.c', - 'third_party/cares/cares/inet_net_pton.c', - 'third_party/cares/cares/inet_ntop.c', - 'third_party/cares/cares/windows_port.c', + 'src/core/lib/profiling/basic_timers.cc', + 'src/core/lib/profiling/stap_timers.cc', + 'src/core/lib/support/alloc.cc', + 'src/core/lib/support/arena.cc', + 'src/core/lib/support/atm.cc', + 'src/core/lib/support/avl.cc', + 'src/core/lib/support/cmdline.cc', + 'src/core/lib/support/cpu_iphone.cc', + 'src/core/lib/support/cpu_linux.cc', + 'src/core/lib/support/cpu_posix.cc', + 'src/core/lib/support/cpu_windows.cc', + 'src/core/lib/support/env_linux.cc', + 'src/core/lib/support/env_posix.cc', + 'src/core/lib/support/env_windows.cc', + 'src/core/lib/support/fork.cc', + 'src/core/lib/support/host_port.cc', + 'src/core/lib/support/log.cc', + 'src/core/lib/support/log_android.cc', + 'src/core/lib/support/log_linux.cc', + 'src/core/lib/support/log_posix.cc', + 'src/core/lib/support/log_windows.cc', + 'src/core/lib/support/mpscq.cc', + 'src/core/lib/support/murmur_hash.cc', + 'src/core/lib/support/string.cc', + 'src/core/lib/support/string_posix.cc', + 'src/core/lib/support/string_util_windows.cc', + 'src/core/lib/support/string_windows.cc', + 'src/core/lib/support/subprocess_posix.cc', + 'src/core/lib/support/subprocess_windows.cc', + 'src/core/lib/support/sync.cc', + 'src/core/lib/support/sync_posix.cc', + 'src/core/lib/support/sync_windows.cc', + 'src/core/lib/support/thd.cc', + 'src/core/lib/support/thd_posix.cc', + 'src/core/lib/support/thd_windows.cc', + 'src/core/lib/support/time.cc', + 'src/core/lib/support/time_posix.cc', + 'src/core/lib/support/time_precise.cc', + 'src/core/lib/support/time_windows.cc', + 'src/core/lib/support/tls_pthread.cc', + 'src/core/lib/support/tmpfile_msys.cc', + 'src/core/lib/support/tmpfile_posix.cc', + 'src/core/lib/support/tmpfile_windows.cc', + 'src/core/lib/support/wrap_memcpy.cc', + 'src/core/lib/surface/init.cc', + 'src/core/lib/backoff/backoff.cc', + 'src/core/lib/channel/channel_args.cc', + 'src/core/lib/channel/channel_stack.cc', + 'src/core/lib/channel/channel_stack_builder.cc', + 'src/core/lib/channel/connected_channel.cc', + 'src/core/lib/channel/handshaker.cc', + 'src/core/lib/channel/handshaker_factory.cc', + 'src/core/lib/channel/handshaker_registry.cc', + 'src/core/lib/compression/compression.cc', + 'src/core/lib/compression/message_compress.cc', + 'src/core/lib/compression/stream_compression.cc', + 'src/core/lib/compression/stream_compression_gzip.cc', + 'src/core/lib/compression/stream_compression_identity.cc', + 'src/core/lib/debug/stats.cc', + 'src/core/lib/debug/stats_data.cc', + 'src/core/lib/http/format_request.cc', + 'src/core/lib/http/httpcli.cc', + 'src/core/lib/http/parser.cc', + 'src/core/lib/iomgr/call_combiner.cc', + 'src/core/lib/iomgr/combiner.cc', + 'src/core/lib/iomgr/endpoint.cc', + 'src/core/lib/iomgr/endpoint_pair_posix.cc', + 'src/core/lib/iomgr/endpoint_pair_uv.cc', + 'src/core/lib/iomgr/endpoint_pair_windows.cc', + 'src/core/lib/iomgr/error.cc', + 'src/core/lib/iomgr/ev_epoll1_linux.cc', + 'src/core/lib/iomgr/ev_epollex_linux.cc', + 'src/core/lib/iomgr/ev_epollsig_linux.cc', + 'src/core/lib/iomgr/ev_poll_posix.cc', + 'src/core/lib/iomgr/ev_posix.cc', + 'src/core/lib/iomgr/ev_windows.cc', + 'src/core/lib/iomgr/exec_ctx.cc', + 'src/core/lib/iomgr/executor.cc', + 'src/core/lib/iomgr/fork_posix.cc', + 'src/core/lib/iomgr/fork_windows.cc', + 'src/core/lib/iomgr/gethostname_fallback.cc', + 'src/core/lib/iomgr/gethostname_host_name_max.cc', + 'src/core/lib/iomgr/gethostname_sysconf.cc', + 'src/core/lib/iomgr/iocp_windows.cc', + 'src/core/lib/iomgr/iomgr.cc', + 'src/core/lib/iomgr/iomgr_posix.cc', + 'src/core/lib/iomgr/iomgr_uv.cc', + 'src/core/lib/iomgr/iomgr_windows.cc', + 'src/core/lib/iomgr/is_epollexclusive_available.cc', + 'src/core/lib/iomgr/load_file.cc', + 'src/core/lib/iomgr/lockfree_event.cc', + 'src/core/lib/iomgr/network_status_tracker.cc', + 'src/core/lib/iomgr/polling_entity.cc', + 'src/core/lib/iomgr/pollset_set_uv.cc', + 'src/core/lib/iomgr/pollset_set_windows.cc', + 'src/core/lib/iomgr/pollset_uv.cc', + 'src/core/lib/iomgr/pollset_windows.cc', + 'src/core/lib/iomgr/resolve_address_posix.cc', + 'src/core/lib/iomgr/resolve_address_uv.cc', + 'src/core/lib/iomgr/resolve_address_windows.cc', + 'src/core/lib/iomgr/resource_quota.cc', + 'src/core/lib/iomgr/sockaddr_utils.cc', + 'src/core/lib/iomgr/socket_factory_posix.cc', + 'src/core/lib/iomgr/socket_mutator.cc', + 'src/core/lib/iomgr/socket_utils_common_posix.cc', + 'src/core/lib/iomgr/socket_utils_linux.cc', + 'src/core/lib/iomgr/socket_utils_posix.cc', + 'src/core/lib/iomgr/socket_utils_uv.cc', + 'src/core/lib/iomgr/socket_utils_windows.cc', + 'src/core/lib/iomgr/socket_windows.cc', + 'src/core/lib/iomgr/tcp_client_posix.cc', + 'src/core/lib/iomgr/tcp_client_uv.cc', + 'src/core/lib/iomgr/tcp_client_windows.cc', + 'src/core/lib/iomgr/tcp_posix.cc', + 'src/core/lib/iomgr/tcp_server_posix.cc', + 'src/core/lib/iomgr/tcp_server_utils_posix_common.cc', + 'src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc', + 'src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc', + 'src/core/lib/iomgr/tcp_server_uv.cc', + 'src/core/lib/iomgr/tcp_server_windows.cc', + 'src/core/lib/iomgr/tcp_uv.cc', + 'src/core/lib/iomgr/tcp_windows.cc', + 'src/core/lib/iomgr/time_averaged_stats.cc', + 'src/core/lib/iomgr/timer_generic.cc', + 'src/core/lib/iomgr/timer_heap.cc', + 'src/core/lib/iomgr/timer_manager.cc', + 'src/core/lib/iomgr/timer_uv.cc', + 'src/core/lib/iomgr/udp_server.cc', + 'src/core/lib/iomgr/unix_sockets_posix.cc', + 'src/core/lib/iomgr/unix_sockets_posix_noop.cc', + 'src/core/lib/iomgr/wakeup_fd_cv.cc', + 'src/core/lib/iomgr/wakeup_fd_eventfd.cc', + 'src/core/lib/iomgr/wakeup_fd_nospecial.cc', + 'src/core/lib/iomgr/wakeup_fd_pipe.cc', + 'src/core/lib/iomgr/wakeup_fd_posix.cc', + 'src/core/lib/json/json.cc', + 'src/core/lib/json/json_reader.cc', + 'src/core/lib/json/json_string.cc', + 'src/core/lib/json/json_writer.cc', + 'src/core/lib/slice/b64.cc', + 'src/core/lib/slice/percent_encoding.cc', + 'src/core/lib/slice/slice.cc', + 'src/core/lib/slice/slice_buffer.cc', + 'src/core/lib/slice/slice_hash_table.cc', + 'src/core/lib/slice/slice_intern.cc', + 'src/core/lib/slice/slice_string_helpers.cc', + 'src/core/lib/surface/alarm.cc', + 'src/core/lib/surface/api_trace.cc', + 'src/core/lib/surface/byte_buffer.cc', + 'src/core/lib/surface/byte_buffer_reader.cc', + 'src/core/lib/surface/call.cc', + 'src/core/lib/surface/call_details.cc', + 'src/core/lib/surface/call_log_batch.cc', + 'src/core/lib/surface/channel.cc', + 'src/core/lib/surface/channel_init.cc', + 'src/core/lib/surface/channel_ping.cc', + 'src/core/lib/surface/channel_stack_type.cc', + 'src/core/lib/surface/completion_queue.cc', + 'src/core/lib/surface/completion_queue_factory.cc', + 'src/core/lib/surface/event_string.cc', + 'src/core/lib/surface/lame_client.cc', + 'src/core/lib/surface/metadata_array.cc', + 'src/core/lib/surface/server.cc', + 'src/core/lib/surface/validate_metadata.cc', + 'src/core/lib/surface/version.cc', + 'src/core/lib/transport/bdp_estimator.cc', + 'src/core/lib/transport/byte_stream.cc', + 'src/core/lib/transport/connectivity_state.cc', + 'src/core/lib/transport/error_utils.cc', + 'src/core/lib/transport/metadata.cc', + 'src/core/lib/transport/metadata_batch.cc', + 'src/core/lib/transport/pid_controller.cc', + 'src/core/lib/transport/service_config.cc', + 'src/core/lib/transport/static_metadata.cc', + 'src/core/lib/transport/status_conversion.cc', + 'src/core/lib/transport/timeout_encoding.cc', + 'src/core/lib/transport/transport.cc', + 'src/core/lib/transport/transport_op_string.cc', + 'src/core/lib/debug/trace.cc', + 'src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc', + 'src/core/ext/transport/chttp2/transport/bin_decoder.cc', + 'src/core/ext/transport/chttp2/transport/bin_encoder.cc', + 'src/core/ext/transport/chttp2/transport/chttp2_plugin.cc', + 'src/core/ext/transport/chttp2/transport/chttp2_transport.cc', + 'src/core/ext/transport/chttp2/transport/flow_control.cc', + 'src/core/ext/transport/chttp2/transport/frame_data.cc', + 'src/core/ext/transport/chttp2/transport/frame_goaway.cc', + 'src/core/ext/transport/chttp2/transport/frame_ping.cc', + 'src/core/ext/transport/chttp2/transport/frame_rst_stream.cc', + 'src/core/ext/transport/chttp2/transport/frame_settings.cc', + 'src/core/ext/transport/chttp2/transport/frame_window_update.cc', + 'src/core/ext/transport/chttp2/transport/hpack_encoder.cc', + 'src/core/ext/transport/chttp2/transport/hpack_parser.cc', + 'src/core/ext/transport/chttp2/transport/hpack_table.cc', + 'src/core/ext/transport/chttp2/transport/http2_settings.cc', + 'src/core/ext/transport/chttp2/transport/huffsyms.cc', + 'src/core/ext/transport/chttp2/transport/incoming_metadata.cc', + 'src/core/ext/transport/chttp2/transport/parsing.cc', + 'src/core/ext/transport/chttp2/transport/stream_lists.cc', + 'src/core/ext/transport/chttp2/transport/stream_map.cc', + 'src/core/ext/transport/chttp2/transport/varint.cc', + 'src/core/ext/transport/chttp2/transport/writing.cc', + 'src/core/ext/transport/chttp2/alpn/alpn.cc', + 'src/core/ext/filters/http/client/http_client_filter.cc', + 'src/core/ext/filters/http/http_filters_plugin.cc', + 'src/core/ext/filters/http/message_compress/message_compress_filter.cc', + 'src/core/ext/filters/http/server/http_server_filter.cc', + 'src/core/lib/http/httpcli_security_connector.cc', + 'src/core/lib/security/context/security_context.cc', + 'src/core/lib/security/credentials/composite/composite_credentials.cc', + 'src/core/lib/security/credentials/credentials.cc', + 'src/core/lib/security/credentials/credentials_metadata.cc', + 'src/core/lib/security/credentials/fake/fake_credentials.cc', + 'src/core/lib/security/credentials/google_default/credentials_generic.cc', + 'src/core/lib/security/credentials/google_default/google_default_credentials.cc', + 'src/core/lib/security/credentials/iam/iam_credentials.cc', + 'src/core/lib/security/credentials/jwt/json_token.cc', + 'src/core/lib/security/credentials/jwt/jwt_credentials.cc', + 'src/core/lib/security/credentials/jwt/jwt_verifier.cc', + 'src/core/lib/security/credentials/oauth2/oauth2_credentials.cc', + 'src/core/lib/security/credentials/plugin/plugin_credentials.cc', + 'src/core/lib/security/credentials/ssl/ssl_credentials.cc', + 'src/core/lib/security/transport/client_auth_filter.cc', + 'src/core/lib/security/transport/lb_targets_info.cc', + 'src/core/lib/security/transport/secure_endpoint.cc', + 'src/core/lib/security/transport/security_connector.cc', + 'src/core/lib/security/transport/security_handshaker.cc', + 'src/core/lib/security/transport/server_auth_filter.cc', + 'src/core/lib/security/transport/tsi_error.cc', + 'src/core/lib/security/util/json_util.cc', + 'src/core/lib/surface/init_secure.cc', + 'src/core/tsi/fake_transport_security.cc', + 'src/core/tsi/gts_transport_security.cc', + 'src/core/tsi/ssl_transport_security.cc', + 'src/core/tsi/transport_security_grpc.cc', + 'src/core/tsi/transport_security.cc', + 'src/core/tsi/transport_security_adapter.cc', + 'src/core/ext/transport/chttp2/server/chttp2_server.cc', + 'src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc', + 'src/core/ext/filters/client_channel/backup_poller.cc', + 'src/core/ext/filters/client_channel/channel_connectivity.cc', + 'src/core/ext/filters/client_channel/client_channel.cc', + 'src/core/ext/filters/client_channel/client_channel_factory.cc', + 'src/core/ext/filters/client_channel/client_channel_plugin.cc', + 'src/core/ext/filters/client_channel/connector.cc', + 'src/core/ext/filters/client_channel/http_connect_handshaker.cc', + 'src/core/ext/filters/client_channel/http_proxy.cc', + 'src/core/ext/filters/client_channel/lb_policy.cc', + 'src/core/ext/filters/client_channel/lb_policy_factory.cc', + 'src/core/ext/filters/client_channel/lb_policy_registry.cc', + 'src/core/ext/filters/client_channel/parse_address.cc', + 'src/core/ext/filters/client_channel/proxy_mapper.cc', + 'src/core/ext/filters/client_channel/proxy_mapper_registry.cc', + 'src/core/ext/filters/client_channel/resolver.cc', + 'src/core/ext/filters/client_channel/resolver_factory.cc', + 'src/core/ext/filters/client_channel/resolver_registry.cc', + 'src/core/ext/filters/client_channel/retry_throttle.cc', + 'src/core/ext/filters/client_channel/subchannel.cc', + 'src/core/ext/filters/client_channel/subchannel_index.cc', + 'src/core/ext/filters/client_channel/uri_parser.cc', + 'src/core/ext/filters/deadline/deadline_filter.cc', + 'src/core/ext/transport/chttp2/client/chttp2_connector.cc', + 'src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc', + 'src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc', + 'src/core/ext/transport/chttp2/client/insecure/channel_create.cc', + 'src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc', + 'src/core/ext/transport/inproc/inproc_plugin.cc', + 'src/core/ext/transport/inproc/inproc_transport.cc', + 'src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc', + 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc', + 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc', + 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc', + 'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc', + 'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c', + 'third_party/nanopb/pb_common.c', + 'third_party/nanopb/pb_decode.c', + 'third_party/nanopb/pb_encode.c', + 'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc', + 'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc', + 'src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc', + 'src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc', + 'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc', + 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc', + 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc', + 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc', + 'src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc', + 'src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc', + 'src/core/ext/filters/load_reporting/server_load_reporting_filter.cc', + 'src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc', + 'src/core/ext/census/grpc_context.cc', + 'src/core/ext/filters/max_age/max_age_filter.cc', + 'src/core/ext/filters/message_size/message_size_filter.cc', + 'src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc', + 'src/core/ext/filters/workarounds/workaround_utils.cc', + 'src/core/plugin_registry/grpc_plugin_registry.cc', + 'src/boringssl/err_data.c', + 'third_party/boringssl/crypto/aes/aes.c', + 'third_party/boringssl/crypto/aes/key_wrap.c', + 'third_party/boringssl/crypto/aes/mode_wrappers.c', + 'third_party/boringssl/crypto/asn1/a_bitstr.c', + 'third_party/boringssl/crypto/asn1/a_bool.c', + 'third_party/boringssl/crypto/asn1/a_d2i_fp.c', + 'third_party/boringssl/crypto/asn1/a_dup.c', + 'third_party/boringssl/crypto/asn1/a_enum.c', + 'third_party/boringssl/crypto/asn1/a_gentm.c', + 'third_party/boringssl/crypto/asn1/a_i2d_fp.c', + 'third_party/boringssl/crypto/asn1/a_int.c', + 'third_party/boringssl/crypto/asn1/a_mbstr.c', + 'third_party/boringssl/crypto/asn1/a_object.c', + 'third_party/boringssl/crypto/asn1/a_octet.c', + 'third_party/boringssl/crypto/asn1/a_print.c', + 'third_party/boringssl/crypto/asn1/a_strnid.c', + 'third_party/boringssl/crypto/asn1/a_time.c', + 'third_party/boringssl/crypto/asn1/a_type.c', + 'third_party/boringssl/crypto/asn1/a_utctm.c', + 'third_party/boringssl/crypto/asn1/a_utf8.c', + 'third_party/boringssl/crypto/asn1/asn1_lib.c', + 'third_party/boringssl/crypto/asn1/asn1_par.c', + 'third_party/boringssl/crypto/asn1/asn_pack.c', + 'third_party/boringssl/crypto/asn1/f_enum.c', + 'third_party/boringssl/crypto/asn1/f_int.c', + 'third_party/boringssl/crypto/asn1/f_string.c', + 'third_party/boringssl/crypto/asn1/t_bitst.c', + 'third_party/boringssl/crypto/asn1/tasn_dec.c', + 'third_party/boringssl/crypto/asn1/tasn_enc.c', + 'third_party/boringssl/crypto/asn1/tasn_fre.c', + 'third_party/boringssl/crypto/asn1/tasn_new.c', + 'third_party/boringssl/crypto/asn1/tasn_typ.c', + 'third_party/boringssl/crypto/asn1/tasn_utl.c', + 'third_party/boringssl/crypto/asn1/time_support.c', + 'third_party/boringssl/crypto/asn1/x_bignum.c', + 'third_party/boringssl/crypto/asn1/x_long.c', + 'third_party/boringssl/crypto/base64/base64.c', + 'third_party/boringssl/crypto/bio/bio.c', + 'third_party/boringssl/crypto/bio/bio_mem.c', + 'third_party/boringssl/crypto/bio/connect.c', + 'third_party/boringssl/crypto/bio/fd.c', + 'third_party/boringssl/crypto/bio/file.c', + 'third_party/boringssl/crypto/bio/hexdump.c', + 'third_party/boringssl/crypto/bio/pair.c', + 'third_party/boringssl/crypto/bio/printf.c', + 'third_party/boringssl/crypto/bio/socket.c', + 'third_party/boringssl/crypto/bio/socket_helper.c', + 'third_party/boringssl/crypto/bn/add.c', + 'third_party/boringssl/crypto/bn/asm/x86_64-gcc.c', + 'third_party/boringssl/crypto/bn/bn.c', + 'third_party/boringssl/crypto/bn/bn_asn1.c', + 'third_party/boringssl/crypto/bn/cmp.c', + 'third_party/boringssl/crypto/bn/convert.c', + 'third_party/boringssl/crypto/bn/ctx.c', + 'third_party/boringssl/crypto/bn/div.c', + 'third_party/boringssl/crypto/bn/exponentiation.c', + 'third_party/boringssl/crypto/bn/gcd.c', + 'third_party/boringssl/crypto/bn/generic.c', + 'third_party/boringssl/crypto/bn/kronecker.c', + 'third_party/boringssl/crypto/bn/montgomery.c', + 'third_party/boringssl/crypto/bn/montgomery_inv.c', + 'third_party/boringssl/crypto/bn/mul.c', + 'third_party/boringssl/crypto/bn/prime.c', + 'third_party/boringssl/crypto/bn/random.c', + 'third_party/boringssl/crypto/bn/rsaz_exp.c', + 'third_party/boringssl/crypto/bn/shift.c', + 'third_party/boringssl/crypto/bn/sqrt.c', + 'third_party/boringssl/crypto/buf/buf.c', + 'third_party/boringssl/crypto/bytestring/asn1_compat.c', + 'third_party/boringssl/crypto/bytestring/ber.c', + 'third_party/boringssl/crypto/bytestring/cbb.c', + 'third_party/boringssl/crypto/bytestring/cbs.c', + 'third_party/boringssl/crypto/chacha/chacha.c', + 'third_party/boringssl/crypto/cipher/aead.c', + 'third_party/boringssl/crypto/cipher/cipher.c', + 'third_party/boringssl/crypto/cipher/derive_key.c', + 'third_party/boringssl/crypto/cipher/e_aes.c', + 'third_party/boringssl/crypto/cipher/e_chacha20poly1305.c', + 'third_party/boringssl/crypto/cipher/e_des.c', + 'third_party/boringssl/crypto/cipher/e_null.c', + 'third_party/boringssl/crypto/cipher/e_rc2.c', + 'third_party/boringssl/crypto/cipher/e_rc4.c', + 'third_party/boringssl/crypto/cipher/e_ssl3.c', + 'third_party/boringssl/crypto/cipher/e_tls.c', + 'third_party/boringssl/crypto/cipher/tls_cbc.c', + 'third_party/boringssl/crypto/cmac/cmac.c', + 'third_party/boringssl/crypto/conf/conf.c', + 'third_party/boringssl/crypto/cpu-aarch64-linux.c', + 'third_party/boringssl/crypto/cpu-arm-linux.c', + 'third_party/boringssl/crypto/cpu-arm.c', + 'third_party/boringssl/crypto/cpu-intel.c', + 'third_party/boringssl/crypto/cpu-ppc64le.c', + 'third_party/boringssl/crypto/crypto.c', + 'third_party/boringssl/crypto/curve25519/curve25519.c', + 'third_party/boringssl/crypto/curve25519/spake25519.c', + 'third_party/boringssl/crypto/curve25519/x25519-x86_64.c', + 'third_party/boringssl/crypto/des/des.c', + 'third_party/boringssl/crypto/dh/check.c', + 'third_party/boringssl/crypto/dh/dh.c', + 'third_party/boringssl/crypto/dh/dh_asn1.c', + 'third_party/boringssl/crypto/dh/params.c', + 'third_party/boringssl/crypto/digest/digest.c', + 'third_party/boringssl/crypto/digest/digests.c', + 'third_party/boringssl/crypto/dsa/dsa.c', + 'third_party/boringssl/crypto/dsa/dsa_asn1.c', + 'third_party/boringssl/crypto/ec/ec.c', + 'third_party/boringssl/crypto/ec/ec_asn1.c', + 'third_party/boringssl/crypto/ec/ec_key.c', + 'third_party/boringssl/crypto/ec/ec_montgomery.c', + 'third_party/boringssl/crypto/ec/oct.c', + 'third_party/boringssl/crypto/ec/p224-64.c', + 'third_party/boringssl/crypto/ec/p256-64.c', + 'third_party/boringssl/crypto/ec/p256-x86_64.c', + 'third_party/boringssl/crypto/ec/simple.c', + 'third_party/boringssl/crypto/ec/util-64.c', + 'third_party/boringssl/crypto/ec/wnaf.c', + 'third_party/boringssl/crypto/ecdh/ecdh.c', + 'third_party/boringssl/crypto/ecdsa/ecdsa.c', + 'third_party/boringssl/crypto/ecdsa/ecdsa_asn1.c', + 'third_party/boringssl/crypto/engine/engine.c', + 'third_party/boringssl/crypto/err/err.c', + 'third_party/boringssl/crypto/evp/digestsign.c', + 'third_party/boringssl/crypto/evp/evp.c', + 'third_party/boringssl/crypto/evp/evp_asn1.c', + 'third_party/boringssl/crypto/evp/evp_ctx.c', + 'third_party/boringssl/crypto/evp/p_dsa_asn1.c', + 'third_party/boringssl/crypto/evp/p_ec.c', + 'third_party/boringssl/crypto/evp/p_ec_asn1.c', + 'third_party/boringssl/crypto/evp/p_rsa.c', + 'third_party/boringssl/crypto/evp/p_rsa_asn1.c', + 'third_party/boringssl/crypto/evp/pbkdf.c', + 'third_party/boringssl/crypto/evp/print.c', + 'third_party/boringssl/crypto/evp/sign.c', + 'third_party/boringssl/crypto/ex_data.c', + 'third_party/boringssl/crypto/hkdf/hkdf.c', + 'third_party/boringssl/crypto/hmac/hmac.c', + 'third_party/boringssl/crypto/lhash/lhash.c', + 'third_party/boringssl/crypto/md4/md4.c', + 'third_party/boringssl/crypto/md5/md5.c', + 'third_party/boringssl/crypto/mem.c', + 'third_party/boringssl/crypto/modes/cbc.c', + 'third_party/boringssl/crypto/modes/cfb.c', + 'third_party/boringssl/crypto/modes/ctr.c', + 'third_party/boringssl/crypto/modes/gcm.c', + 'third_party/boringssl/crypto/modes/ofb.c', + 'third_party/boringssl/crypto/modes/polyval.c', + 'third_party/boringssl/crypto/obj/obj.c', + 'third_party/boringssl/crypto/obj/obj_xref.c', + 'third_party/boringssl/crypto/pem/pem_all.c', + 'third_party/boringssl/crypto/pem/pem_info.c', + 'third_party/boringssl/crypto/pem/pem_lib.c', + 'third_party/boringssl/crypto/pem/pem_oth.c', + 'third_party/boringssl/crypto/pem/pem_pk8.c', + 'third_party/boringssl/crypto/pem/pem_pkey.c', + 'third_party/boringssl/crypto/pem/pem_x509.c', + 'third_party/boringssl/crypto/pem/pem_xaux.c', + 'third_party/boringssl/crypto/pkcs8/p5_pbev2.c', + 'third_party/boringssl/crypto/pkcs8/p8_pkey.c', + 'third_party/boringssl/crypto/pkcs8/pkcs8.c', + 'third_party/boringssl/crypto/poly1305/poly1305.c', + 'third_party/boringssl/crypto/poly1305/poly1305_arm.c', + 'third_party/boringssl/crypto/poly1305/poly1305_vec.c', + 'third_party/boringssl/crypto/pool/pool.c', + 'third_party/boringssl/crypto/rand/deterministic.c', + 'third_party/boringssl/crypto/rand/fuchsia.c', + 'third_party/boringssl/crypto/rand/rand.c', + 'third_party/boringssl/crypto/rand/urandom.c', + 'third_party/boringssl/crypto/rand/windows.c', + 'third_party/boringssl/crypto/rc4/rc4.c', + 'third_party/boringssl/crypto/refcount_c11.c', + 'third_party/boringssl/crypto/refcount_lock.c', + 'third_party/boringssl/crypto/rsa/blinding.c', + 'third_party/boringssl/crypto/rsa/padding.c', + 'third_party/boringssl/crypto/rsa/rsa.c', + 'third_party/boringssl/crypto/rsa/rsa_asn1.c', + 'third_party/boringssl/crypto/rsa/rsa_impl.c', + 'third_party/boringssl/crypto/sha/sha1-altivec.c', + 'third_party/boringssl/crypto/sha/sha1.c', + 'third_party/boringssl/crypto/sha/sha256.c', + 'third_party/boringssl/crypto/sha/sha512.c', + 'third_party/boringssl/crypto/stack/stack.c', + 'third_party/boringssl/crypto/thread.c', + 'third_party/boringssl/crypto/thread_none.c', + 'third_party/boringssl/crypto/thread_pthread.c', + 'third_party/boringssl/crypto/thread_win.c', + 'third_party/boringssl/crypto/x509/a_digest.c', + 'third_party/boringssl/crypto/x509/a_sign.c', + 'third_party/boringssl/crypto/x509/a_strex.c', + 'third_party/boringssl/crypto/x509/a_verify.c', + 'third_party/boringssl/crypto/x509/algorithm.c', + 'third_party/boringssl/crypto/x509/asn1_gen.c', + 'third_party/boringssl/crypto/x509/by_dir.c', + 'third_party/boringssl/crypto/x509/by_file.c', + 'third_party/boringssl/crypto/x509/i2d_pr.c', + 'third_party/boringssl/crypto/x509/pkcs7.c', + 'third_party/boringssl/crypto/x509/rsa_pss.c', + 'third_party/boringssl/crypto/x509/t_crl.c', + 'third_party/boringssl/crypto/x509/t_req.c', + 'third_party/boringssl/crypto/x509/t_x509.c', + 'third_party/boringssl/crypto/x509/t_x509a.c', + 'third_party/boringssl/crypto/x509/x509.c', + 'third_party/boringssl/crypto/x509/x509_att.c', + 'third_party/boringssl/crypto/x509/x509_cmp.c', + 'third_party/boringssl/crypto/x509/x509_d2.c', + 'third_party/boringssl/crypto/x509/x509_def.c', + 'third_party/boringssl/crypto/x509/x509_ext.c', + 'third_party/boringssl/crypto/x509/x509_lu.c', + 'third_party/boringssl/crypto/x509/x509_obj.c', + 'third_party/boringssl/crypto/x509/x509_r2x.c', + 'third_party/boringssl/crypto/x509/x509_req.c', + 'third_party/boringssl/crypto/x509/x509_set.c', + 'third_party/boringssl/crypto/x509/x509_trs.c', + 'third_party/boringssl/crypto/x509/x509_txt.c', + 'third_party/boringssl/crypto/x509/x509_v3.c', + 'third_party/boringssl/crypto/x509/x509_vfy.c', + 'third_party/boringssl/crypto/x509/x509_vpm.c', + 'third_party/boringssl/crypto/x509/x509cset.c', + 'third_party/boringssl/crypto/x509/x509name.c', + 'third_party/boringssl/crypto/x509/x509rset.c', + 'third_party/boringssl/crypto/x509/x509spki.c', + 'third_party/boringssl/crypto/x509/x509type.c', + 'third_party/boringssl/crypto/x509/x_algor.c', + 'third_party/boringssl/crypto/x509/x_all.c', + 'third_party/boringssl/crypto/x509/x_attrib.c', + 'third_party/boringssl/crypto/x509/x_crl.c', + 'third_party/boringssl/crypto/x509/x_exten.c', + 'third_party/boringssl/crypto/x509/x_info.c', + 'third_party/boringssl/crypto/x509/x_name.c', + 'third_party/boringssl/crypto/x509/x_pkey.c', + 'third_party/boringssl/crypto/x509/x_pubkey.c', + 'third_party/boringssl/crypto/x509/x_req.c', + 'third_party/boringssl/crypto/x509/x_sig.c', + 'third_party/boringssl/crypto/x509/x_spki.c', + 'third_party/boringssl/crypto/x509/x_val.c', + 'third_party/boringssl/crypto/x509/x_x509.c', + 'third_party/boringssl/crypto/x509/x_x509a.c', + 'third_party/boringssl/crypto/x509v3/pcy_cache.c', + 'third_party/boringssl/crypto/x509v3/pcy_data.c', + 'third_party/boringssl/crypto/x509v3/pcy_lib.c', + 'third_party/boringssl/crypto/x509v3/pcy_map.c', + 'third_party/boringssl/crypto/x509v3/pcy_node.c', + 'third_party/boringssl/crypto/x509v3/pcy_tree.c', + 'third_party/boringssl/crypto/x509v3/v3_akey.c', + 'third_party/boringssl/crypto/x509v3/v3_akeya.c', + 'third_party/boringssl/crypto/x509v3/v3_alt.c', + 'third_party/boringssl/crypto/x509v3/v3_bcons.c', + 'third_party/boringssl/crypto/x509v3/v3_bitst.c', + 'third_party/boringssl/crypto/x509v3/v3_conf.c', + 'third_party/boringssl/crypto/x509v3/v3_cpols.c', + 'third_party/boringssl/crypto/x509v3/v3_crld.c', + 'third_party/boringssl/crypto/x509v3/v3_enum.c', + 'third_party/boringssl/crypto/x509v3/v3_extku.c', + 'third_party/boringssl/crypto/x509v3/v3_genn.c', + 'third_party/boringssl/crypto/x509v3/v3_ia5.c', + 'third_party/boringssl/crypto/x509v3/v3_info.c', + 'third_party/boringssl/crypto/x509v3/v3_int.c', + 'third_party/boringssl/crypto/x509v3/v3_lib.c', + 'third_party/boringssl/crypto/x509v3/v3_ncons.c', + 'third_party/boringssl/crypto/x509v3/v3_pci.c', + 'third_party/boringssl/crypto/x509v3/v3_pcia.c', + 'third_party/boringssl/crypto/x509v3/v3_pcons.c', + 'third_party/boringssl/crypto/x509v3/v3_pku.c', + 'third_party/boringssl/crypto/x509v3/v3_pmaps.c', + 'third_party/boringssl/crypto/x509v3/v3_prn.c', + 'third_party/boringssl/crypto/x509v3/v3_purp.c', + 'third_party/boringssl/crypto/x509v3/v3_skey.c', + 'third_party/boringssl/crypto/x509v3/v3_sxnet.c', + 'third_party/boringssl/crypto/x509v3/v3_utl.c', + 'third_party/boringssl/ssl/bio_ssl.c', + 'third_party/boringssl/ssl/custom_extensions.c', + 'third_party/boringssl/ssl/d1_both.c', + 'third_party/boringssl/ssl/d1_lib.c', + 'third_party/boringssl/ssl/d1_pkt.c', + 'third_party/boringssl/ssl/d1_srtp.c', + 'third_party/boringssl/ssl/dtls_method.c', + 'third_party/boringssl/ssl/dtls_record.c', + 'third_party/boringssl/ssl/handshake_client.c', + 'third_party/boringssl/ssl/handshake_server.c', + 'third_party/boringssl/ssl/s3_both.c', + 'third_party/boringssl/ssl/s3_lib.c', + 'third_party/boringssl/ssl/s3_pkt.c', + 'third_party/boringssl/ssl/ssl_aead_ctx.c', + 'third_party/boringssl/ssl/ssl_asn1.c', + 'third_party/boringssl/ssl/ssl_buffer.c', + 'third_party/boringssl/ssl/ssl_cert.c', + 'third_party/boringssl/ssl/ssl_cipher.c', + 'third_party/boringssl/ssl/ssl_ecdh.c', + 'third_party/boringssl/ssl/ssl_file.c', + 'third_party/boringssl/ssl/ssl_lib.c', + 'third_party/boringssl/ssl/ssl_privkey.c', + 'third_party/boringssl/ssl/ssl_privkey_cc.cc', + 'third_party/boringssl/ssl/ssl_session.c', + 'third_party/boringssl/ssl/ssl_stat.c', + 'third_party/boringssl/ssl/ssl_transcript.c', + 'third_party/boringssl/ssl/ssl_x509.c', + 'third_party/boringssl/ssl/t1_enc.c', + 'third_party/boringssl/ssl/t1_lib.c', + 'third_party/boringssl/ssl/tls13_both.c', + 'third_party/boringssl/ssl/tls13_client.c', + 'third_party/boringssl/ssl/tls13_enc.c', + 'third_party/boringssl/ssl/tls13_server.c', + 'third_party/boringssl/ssl/tls_method.c', + 'third_party/boringssl/ssl/tls_record.c', + 'third_party/zlib/adler32.c', + 'third_party/zlib/compress.c', + 'third_party/zlib/crc32.c', + 'third_party/zlib/deflate.c', + 'third_party/zlib/gzclose.c', + 'third_party/zlib/gzlib.c', + 'third_party/zlib/gzread.c', + 'third_party/zlib/gzwrite.c', + 'third_party/zlib/infback.c', + 'third_party/zlib/inffast.c', + 'third_party/zlib/inflate.c', + 'third_party/zlib/inftrees.c', + 'third_party/zlib/trees.c', + 'third_party/zlib/uncompr.c', + 'third_party/zlib/zutil.c', + 'third_party/cares/cares/ares__close_sockets.c', + 'third_party/cares/cares/ares__get_hostent.c', + 'third_party/cares/cares/ares__read_line.c', + 'third_party/cares/cares/ares__timeval.c', + 'third_party/cares/cares/ares_cancel.c', + 'third_party/cares/cares/ares_create_query.c', + 'third_party/cares/cares/ares_data.c', + 'third_party/cares/cares/ares_destroy.c', + 'third_party/cares/cares/ares_expand_name.c', + 'third_party/cares/cares/ares_expand_string.c', + 'third_party/cares/cares/ares_fds.c', + 'third_party/cares/cares/ares_free_hostent.c', + 'third_party/cares/cares/ares_free_string.c', + 'third_party/cares/cares/ares_getenv.c', + 'third_party/cares/cares/ares_gethostbyaddr.c', + 'third_party/cares/cares/ares_gethostbyname.c', + 'third_party/cares/cares/ares_getnameinfo.c', + 'third_party/cares/cares/ares_getopt.c', + 'third_party/cares/cares/ares_getsock.c', + 'third_party/cares/cares/ares_init.c', + 'third_party/cares/cares/ares_library_init.c', + 'third_party/cares/cares/ares_llist.c', + 'third_party/cares/cares/ares_mkquery.c', + 'third_party/cares/cares/ares_nowarn.c', + 'third_party/cares/cares/ares_options.c', + 'third_party/cares/cares/ares_parse_a_reply.c', + 'third_party/cares/cares/ares_parse_aaaa_reply.c', + 'third_party/cares/cares/ares_parse_mx_reply.c', + 'third_party/cares/cares/ares_parse_naptr_reply.c', + 'third_party/cares/cares/ares_parse_ns_reply.c', + 'third_party/cares/cares/ares_parse_ptr_reply.c', + 'third_party/cares/cares/ares_parse_soa_reply.c', + 'third_party/cares/cares/ares_parse_srv_reply.c', + 'third_party/cares/cares/ares_parse_txt_reply.c', + 'third_party/cares/cares/ares_platform.c', + 'third_party/cares/cares/ares_process.c', + 'third_party/cares/cares/ares_query.c', + 'third_party/cares/cares/ares_search.c', + 'third_party/cares/cares/ares_send.c', + 'third_party/cares/cares/ares_strcasecmp.c', + 'third_party/cares/cares/ares_strdup.c', + 'third_party/cares/cares/ares_strerror.c', + 'third_party/cares/cares/ares_timeout.c', + 'third_party/cares/cares/ares_version.c', + 'third_party/cares/cares/ares_writev.c', + 'third_party/cares/cares/bitncmp.c', + 'third_party/cares/cares/inet_net_pton.c', + 'third_party/cares/cares/inet_ntop.c', + 'third_party/cares/cares/windows_port.c', ] diff --git a/src/python/grpcio/grpc_version.py b/src/python/grpcio/grpc_version.py index 8f07f3b30b2..1fac57b03a4 100644 --- a/src/python/grpcio/grpc_version.py +++ b/src/python/grpcio/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!! -VERSION='1.9.0.dev0' +VERSION = '1.9.0.dev0' diff --git a/templates/src/python/grpcio/grpc_core_dependencies.py.template b/templates/src/python/grpcio/grpc_core_dependencies.py.template index 02e066cf8f8..6295ed3081e 100644 --- a/templates/src/python/grpcio/grpc_core_dependencies.py.template +++ b/templates/src/python/grpcio/grpc_core_dependencies.py.template @@ -20,7 +20,7 @@ % for lib in libs: % if lib.name in python_dependencies.transitive_deps: % for src in lib.src: - '${src}', + '${src}', % endfor % endif % endfor diff --git a/templates/src/python/grpcio/grpc_version.py.template b/templates/src/python/grpcio/grpc_version.py.template index 38ae54d6194..5e5d22126e0 100644 --- a/templates/src/python/grpcio/grpc_version.py.template +++ b/templates/src/python/grpcio/grpc_version.py.template @@ -16,4 +16,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!! - VERSION='${settings.python_version.pep440()}' + VERSION = '${settings.python_version.pep440()}' diff --git a/tools/distrib/yapf_code.sh b/tools/distrib/yapf_code.sh index e5beb70117a..87c45b50c9b 100755 --- a/tools/distrib/yapf_code.sh +++ b/tools/distrib/yapf_code.sh @@ -22,7 +22,6 @@ DIRS=( 'src/python' ) EXCLUSIONS=( - 'grpcio/grpc_*.py' 'grpcio_health_checking/grpc_*.py' 'grpcio_reflection/grpc_*.py' 'grpcio_testing/grpc_*.py' From d258430bc3f296d92a4b4d723852e608f4c2d644 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 11 Dec 2017 16:16:20 -0800 Subject: [PATCH 098/127] yapf-ize grpcio_health_checking --- src/python/grpcio_health_checking/grpc_version.py | 2 +- .../src/python/grpcio_health_checking/grpc_version.py.template | 2 +- tools/distrib/yapf_code.sh | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/python/grpcio_health_checking/grpc_version.py b/src/python/grpcio_health_checking/grpc_version.py index 0987d57261d..5b7e5859bc5 100644 --- a/src/python/grpcio_health_checking/grpc_version.py +++ b/src/python/grpcio_health_checking/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!! -VERSION='1.9.0.dev0' +VERSION = '1.9.0.dev0' diff --git a/templates/src/python/grpcio_health_checking/grpc_version.py.template b/templates/src/python/grpcio_health_checking/grpc_version.py.template index 558b2d152be..ffb81acc89b 100644 --- a/templates/src/python/grpcio_health_checking/grpc_version.py.template +++ b/templates/src/python/grpcio_health_checking/grpc_version.py.template @@ -16,4 +16,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!! - VERSION='${settings.python_version.pep440()}' + VERSION = '${settings.python_version.pep440()}' diff --git a/tools/distrib/yapf_code.sh b/tools/distrib/yapf_code.sh index 87c45b50c9b..b027d3ffd6b 100755 --- a/tools/distrib/yapf_code.sh +++ b/tools/distrib/yapf_code.sh @@ -22,7 +22,6 @@ DIRS=( 'src/python' ) EXCLUSIONS=( - 'grpcio_health_checking/grpc_*.py' 'grpcio_reflection/grpc_*.py' 'grpcio_testing/grpc_*.py' 'grpcio_tests/grpc_*.py' From 0f6c518e3c241ee5bea529f4499e5bf35872e9e3 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 11 Dec 2017 16:22:30 -0800 Subject: [PATCH 099/127] yapf-ize grpcio_reflection --- .../grpc_reflection/v1alpha/reflection.py | 14 +++++++++----- src/python/grpcio_reflection/grpc_version.py | 2 +- .../grpcio_reflection/grpc_version.py.template | 2 +- tools/distrib/yapf_code.sh | 1 - 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/python/grpcio_reflection/grpc_reflection/v1alpha/reflection.py b/src/python/grpcio_reflection/grpc_reflection/v1alpha/reflection.py index c598ea96df0..26a7ba8685f 100644 --- a/src/python/grpcio_reflection/grpc_reflection/v1alpha/reflection.py +++ b/src/python/grpcio_reflection/grpc_reflection/v1alpha/reflection.py @@ -70,7 +70,8 @@ class ReflectionServicer(reflection_pb2_grpc.ServerReflectionServicer): def _file_containing_extension(self, containing_type, extension_number): try: - message_descriptor = self._pool.FindMessageTypeByName(containing_type) + message_descriptor = self._pool.FindMessageTypeByName( + containing_type) extension_descriptor = self._pool.FindExtensionByNumber( message_descriptor, extension_number) descriptor = self._pool.FindFileContainingSymbol( @@ -82,10 +83,13 @@ class ReflectionServicer(reflection_pb2_grpc.ServerReflectionServicer): def _all_extension_numbers_of_type(self, containing_type): try: - message_descriptor = self._pool.FindMessageTypeByName(containing_type) - extension_numbers = tuple(sorted( - extension.number - for extension in self._pool.FindAllExtensions(message_descriptor))) + message_descriptor = self._pool.FindMessageTypeByName( + containing_type) + extension_numbers = tuple( + sorted( + extension.number + for extension in self._pool.FindAllExtensions( + message_descriptor))) except KeyError: return _not_found_error() else: diff --git a/src/python/grpcio_reflection/grpc_version.py b/src/python/grpcio_reflection/grpc_version.py index 95d2ff143ad..0ad96211541 100644 --- a/src/python/grpcio_reflection/grpc_version.py +++ b/src/python/grpcio_reflection/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!! -VERSION='1.9.0.dev0' +VERSION = '1.9.0.dev0' diff --git a/templates/src/python/grpcio_reflection/grpc_version.py.template b/templates/src/python/grpcio_reflection/grpc_version.py.template index 8fb42a4859e..cc99533a439 100644 --- a/templates/src/python/grpcio_reflection/grpc_version.py.template +++ b/templates/src/python/grpcio_reflection/grpc_version.py.template @@ -16,4 +16,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!! - VERSION='${settings.python_version.pep440()}' + VERSION = '${settings.python_version.pep440()}' diff --git a/tools/distrib/yapf_code.sh b/tools/distrib/yapf_code.sh index b027d3ffd6b..061a3031894 100755 --- a/tools/distrib/yapf_code.sh +++ b/tools/distrib/yapf_code.sh @@ -22,7 +22,6 @@ DIRS=( 'src/python' ) EXCLUSIONS=( - 'grpcio_reflection/grpc_*.py' 'grpcio_testing/grpc_*.py' 'grpcio_tests/grpc_*.py' ) From e2097f0cc9bf15dba3a3af9301284860770de274 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 11 Dec 2017 16:27:29 -0800 Subject: [PATCH 100/127] yapf-ize grpc_testing --- .../grpcio_testing/grpc_testing/__init__.py | 16 ++--- .../grpc_testing/_channel/__init__.py | 2 + .../grpc_testing/_channel/_channel.py | 26 ++++--- .../grpc_testing/_channel/_channel_rpc.py | 8 +-- .../grpc_testing/_channel/_channel_state.py | 9 ++- .../grpc_testing/_channel/_multi_callable.py | 15 ++-- .../grpc_testing/_channel/_rpc_state.py | 21 +++--- .../grpcio_testing/grpc_testing/_common.py | 35 ++++------ .../grpc_testing/_server/__init__.py | 4 +- .../grpc_testing/_server/_handler.py | 6 +- .../grpc_testing/_server/_rpc.py | 5 +- .../grpc_testing/_server/_server.py | 68 ++++++++++--------- src/python/grpcio_testing/grpc_version.py | 2 +- .../grpcio_testing/grpc_version.py.template | 2 +- tools/distrib/yapf_code.sh | 1 - 15 files changed, 114 insertions(+), 106 deletions(-) diff --git a/src/python/grpcio_testing/grpc_testing/__init__.py b/src/python/grpcio_testing/grpc_testing/__init__.py index 994274500c7..e87d0ffc963 100644 --- a/src/python/grpcio_testing/grpc_testing/__init__.py +++ b/src/python/grpcio_testing/grpc_testing/__init__.py @@ -495,8 +495,8 @@ class Server(six.with_metaclass(abc.ABCMeta)): """A server with which to test a system that services RPCs.""" @abc.abstractmethod - def invoke_unary_unary( - self, method_descriptor, invocation_metadata, request, timeout): + def invoke_unary_unary(self, method_descriptor, invocation_metadata, + request, timeout): """Invokes an RPC to be serviced by the system under test. Args: @@ -513,8 +513,8 @@ class Server(six.with_metaclass(abc.ABCMeta)): raise NotImplementedError() @abc.abstractmethod - def invoke_unary_stream( - self, method_descriptor, invocation_metadata, request, timeout): + def invoke_unary_stream(self, method_descriptor, invocation_metadata, + request, timeout): """Invokes an RPC to be serviced by the system under test. Args: @@ -531,8 +531,8 @@ class Server(six.with_metaclass(abc.ABCMeta)): raise NotImplementedError() @abc.abstractmethod - def invoke_stream_unary( - self, method_descriptor, invocation_metadata, timeout): + def invoke_stream_unary(self, method_descriptor, invocation_metadata, + timeout): """Invokes an RPC to be serviced by the system under test. Args: @@ -548,8 +548,8 @@ class Server(six.with_metaclass(abc.ABCMeta)): raise NotImplementedError() @abc.abstractmethod - def invoke_stream_stream( - self, method_descriptor, invocation_metadata, timeout): + def invoke_stream_stream(self, method_descriptor, invocation_metadata, + timeout): """Invokes an RPC to be serviced by the system under test. Args: diff --git a/src/python/grpcio_testing/grpc_testing/_channel/__init__.py b/src/python/grpcio_testing/grpc_testing/_channel/__init__.py index 8011975d0aa..7a64cda889a 100644 --- a/src/python/grpcio_testing/grpc_testing/_channel/__init__.py +++ b/src/python/grpcio_testing/grpc_testing/_channel/__init__.py @@ -20,4 +20,6 @@ from grpc_testing._channel import _channel_state # pylint: disable=unused-argument def testing_channel(descriptors, time): return _channel.TestingChannel(time, _channel_state.State()) + + # pylint: enable=unused-argument diff --git a/src/python/grpcio_testing/grpc_testing/_channel/_channel.py b/src/python/grpcio_testing/grpc_testing/_channel/_channel.py index fbd064db885..b015b8d7388 100644 --- a/src/python/grpcio_testing/grpc_testing/_channel/_channel.py +++ b/src/python/grpcio_testing/grpc_testing/_channel/_channel.py @@ -32,20 +32,28 @@ class TestingChannel(grpc_testing.Channel): def unsubscribe(self, callback): raise NotImplementedError() - def unary_unary( - self, method, request_serializer=None, response_deserializer=None): + def unary_unary(self, + method, + request_serializer=None, + response_deserializer=None): return _multi_callable.UnaryUnary(method, self._state) - def unary_stream( - self, method, request_serializer=None, response_deserializer=None): + def unary_stream(self, + method, + request_serializer=None, + response_deserializer=None): return _multi_callable.UnaryStream(method, self._state) - def stream_unary( - self, method, request_serializer=None, response_deserializer=None): + def stream_unary(self, + method, + request_serializer=None, + response_deserializer=None): return _multi_callable.StreamUnary(method, self._state) - def stream_stream( - self, method, request_serializer=None, response_deserializer=None): + def stream_stream(self, + method, + request_serializer=None, + response_deserializer=None): return _multi_callable.StreamStream(method, self._state) def take_unary_unary(self, method_descriptor): @@ -59,4 +67,6 @@ class TestingChannel(grpc_testing.Channel): def take_stream_stream(self, method_descriptor): return _channel_rpc.stream_stream(self._state, method_descriptor) + + # pylint: enable=unused-argument diff --git a/src/python/grpcio_testing/grpc_testing/_channel/_channel_rpc.py b/src/python/grpcio_testing/grpc_testing/_channel/_channel_rpc.py index 762b6a035bf..54499b3b55f 100644 --- a/src/python/grpcio_testing/grpc_testing/_channel/_channel_rpc.py +++ b/src/python/grpcio_testing/grpc_testing/_channel/_channel_rpc.py @@ -27,8 +27,8 @@ class _UnaryUnary(grpc_testing.UnaryUnaryChannelRpc): self._rpc_state.cancelled() def terminate(self, response, trailing_metadata, code, details): - self._rpc_state.terminate_with_response( - response, trailing_metadata, code, details) + self._rpc_state.terminate_with_response(response, trailing_metadata, + code, details) class _UnaryStream(grpc_testing.UnaryStreamChannelRpc): @@ -67,8 +67,8 @@ class _StreamUnary(grpc_testing.StreamUnaryChannelRpc): self._rpc_state.cancelled() def terminate(self, response, trailing_metadata, code, details): - self._rpc_state.terminate_with_response( - response, trailing_metadata, code, details) + self._rpc_state.terminate_with_response(response, trailing_metadata, + code, details) class _StreamStream(grpc_testing.StreamStreamChannelRpc): diff --git a/src/python/grpcio_testing/grpc_testing/_channel/_channel_state.py b/src/python/grpcio_testing/grpc_testing/_channel/_channel_state.py index 569c41d79d7..779d59e59ad 100644 --- a/src/python/grpcio_testing/grpc_testing/_channel/_channel_state.py +++ b/src/python/grpcio_testing/grpc_testing/_channel/_channel_state.py @@ -25,11 +25,10 @@ class State(_common.ChannelHandler): self._condition = threading.Condition() self._rpc_states = collections.defaultdict(list) - def invoke_rpc( - self, method_full_rpc_name, invocation_metadata, requests, - requests_closed, timeout): - rpc_state = _rpc_state.State( - invocation_metadata, requests, requests_closed) + def invoke_rpc(self, method_full_rpc_name, invocation_metadata, requests, + requests_closed, timeout): + rpc_state = _rpc_state.State(invocation_metadata, requests, + requests_closed) with self._condition: self._rpc_states[method_full_rpc_name].append(rpc_state) self._condition.notify_all() diff --git a/src/python/grpcio_testing/grpc_testing/_channel/_multi_callable.py b/src/python/grpcio_testing/grpc_testing/_channel/_multi_callable.py index fe69257f5be..32b2f361d34 100644 --- a/src/python/grpcio_testing/grpc_testing/_channel/_multi_callable.py +++ b/src/python/grpcio_testing/grpc_testing/_channel/_multi_callable.py @@ -16,6 +16,7 @@ import grpc from grpc_testing import _common from grpc_testing._channel import _invocation + # All per-call credentials parameters are unused by this test infrastructure. # pylint: disable=unused-argument class UnaryUnary(grpc.UnaryUnaryMultiCallable): @@ -26,20 +27,20 @@ class UnaryUnary(grpc.UnaryUnaryMultiCallable): def __call__(self, request, timeout=None, metadata=None, credentials=None): rpc_handler = self._channel_handler.invoke_rpc( - self._method_full_rpc_name, _common.fuss_with_metadata(metadata), - [request], True, timeout) + self._method_full_rpc_name, + _common.fuss_with_metadata(metadata), [request], True, timeout) return _invocation.blocking_unary_response(rpc_handler) def with_call(self, request, timeout=None, metadata=None, credentials=None): rpc_handler = self._channel_handler.invoke_rpc( - self._method_full_rpc_name, _common.fuss_with_metadata(metadata), - [request], True, timeout) + self._method_full_rpc_name, + _common.fuss_with_metadata(metadata), [request], True, timeout) return _invocation.blocking_unary_response_with_call(rpc_handler) def future(self, request, timeout=None, metadata=None, credentials=None): rpc_handler = self._channel_handler.invoke_rpc( - self._method_full_rpc_name, _common.fuss_with_metadata(metadata), - [request], True, timeout) + self._method_full_rpc_name, + _common.fuss_with_metadata(metadata), [request], True, timeout) return _invocation.future_call(rpc_handler) @@ -112,4 +113,6 @@ class StreamStream(grpc.StreamStreamMultiCallable): _common.fuss_with_metadata(metadata), [], False, timeout) _invocation.consume_requests(request_iterator, rpc_handler) return _invocation.ResponseIteratorCall(rpc_handler) + + # pylint: enable=unused-argument diff --git a/src/python/grpcio_testing/grpc_testing/_channel/_rpc_state.py b/src/python/grpcio_testing/grpc_testing/_channel/_rpc_state.py index e1fa49a2a80..ee0233002dc 100644 --- a/src/python/grpcio_testing/grpc_testing/_channel/_rpc_state.py +++ b/src/python/grpcio_testing/grpc_testing/_channel/_rpc_state.py @@ -63,23 +63,22 @@ class State(_common.ChannelRpcHandler): if self._code is grpc.StatusCode.OK: if self._responses: response = self._responses.pop(0) - return _common.ChannelRpcRead( - response, None, None, None) + return _common.ChannelRpcRead(response, None, None, + None) else: return _common.ChannelRpcRead( - None, self._trailing_metadata, - grpc.StatusCode.OK, self._details) + None, self._trailing_metadata, grpc.StatusCode.OK, + self._details) elif self._code is None: if self._responses: response = self._responses.pop(0) - return _common.ChannelRpcRead( - response, None, None, None) + return _common.ChannelRpcRead(response, None, None, + None) else: self._condition.wait() else: - return _common.ChannelRpcRead( - None, self._trailing_metadata, self._code, - self._details) + return _common.ChannelRpcRead(None, self._trailing_metadata, + self._code, self._details) def termination(self): with self._condition: @@ -150,8 +149,8 @@ class State(_common.ChannelRpcHandler): self._responses.append(response) self._condition.notify_all() - def terminate_with_response( - self, response, trailing_metadata, code, details): + def terminate_with_response(self, response, trailing_metadata, code, + details): with self._condition: if self._initial_metadata is None: self._initial_metadata = _common.FUSSED_EMPTY_METADATA diff --git a/src/python/grpcio_testing/grpc_testing/_common.py b/src/python/grpcio_testing/grpc_testing/_common.py index 1517434ca70..05327b0ac2e 100644 --- a/src/python/grpcio_testing/grpc_testing/_common.py +++ b/src/python/grpcio_testing/grpc_testing/_common.py @@ -21,11 +21,9 @@ import six def _fuss(tuplified_metadata): return tuplified_metadata + ( - ( - 'grpc.metadata_added_by_runtime', - 'gRPC is allowed to add metadata in transmission and does so.', - ), - ) + ('grpc.metadata_added_by_runtime', + 'gRPC is allowed to add metadata in transmission and does so.',),) + FUSSED_EMPTY_METADATA = _fuss(()) @@ -41,8 +39,8 @@ def rpc_names(service_descriptors): rpc_names_to_descriptors = {} for service_descriptor in service_descriptors: for method_descriptor in service_descriptor.methods_by_name.values(): - rpc_name = '/{}/{}'.format( - service_descriptor.full_name, method_descriptor.name) + rpc_name = '/{}/{}'.format(service_descriptor.full_name, + method_descriptor.name) rpc_names_to_descriptors[rpc_name] = method_descriptor return rpc_names_to_descriptors @@ -96,9 +94,8 @@ class ChannelRpcHandler(six.with_metaclass(abc.ABCMeta)): class ChannelHandler(six.with_metaclass(abc.ABCMeta)): @abc.abstractmethod - def invoke_rpc( - self, method_full_rpc_name, invocation_metadata, requests, - requests_closed, timeout): + def invoke_rpc(self, method_full_rpc_name, invocation_metadata, requests, + requests_closed, timeout): raise NotImplementedError() @@ -138,23 +135,21 @@ class ServerRpcHandler(six.with_metaclass(abc.ABCMeta)): class Serverish(six.with_metaclass(abc.ABCMeta)): @abc.abstractmethod - def invoke_unary_unary( - self, method_descriptor, handler, invocation_metadata, request, - deadline): + def invoke_unary_unary(self, method_descriptor, handler, + invocation_metadata, request, deadline): raise NotImplementedError() @abc.abstractmethod - def invoke_unary_stream( - self, method_descriptor, handler, invocation_metadata, request, - deadline): + def invoke_unary_stream(self, method_descriptor, handler, + invocation_metadata, request, deadline): raise NotImplementedError() @abc.abstractmethod - def invoke_stream_unary( - self, method_descriptor, handler, invocation_metadata, deadline): + def invoke_stream_unary(self, method_descriptor, handler, + invocation_metadata, deadline): raise NotImplementedError() @abc.abstractmethod - def invoke_stream_stream( - self, method_descriptor, handler, invocation_metadata, deadline): + def invoke_stream_stream(self, method_descriptor, handler, + invocation_metadata, deadline): raise NotImplementedError() diff --git a/src/python/grpcio_testing/grpc_testing/_server/__init__.py b/src/python/grpcio_testing/grpc_testing/_server/__init__.py index 759512949a5..5f035a91cab 100644 --- a/src/python/grpcio_testing/grpc_testing/_server/__init__.py +++ b/src/python/grpcio_testing/grpc_testing/_server/__init__.py @@ -16,5 +16,5 @@ from grpc_testing._server import _server def server_from_dictionary(descriptors_to_servicers, time): - return _server.server_from_descriptor_to_servicers( - descriptors_to_servicers, time) + return _server.server_from_descriptor_to_servicers(descriptors_to_servicers, + time) diff --git a/src/python/grpcio_testing/grpc_testing/_server/_handler.py b/src/python/grpcio_testing/grpc_testing/_server/_handler.py index b47e04c7186..5e4730e0871 100644 --- a/src/python/grpcio_testing/grpc_testing/_server/_handler.py +++ b/src/python/grpcio_testing/grpc_testing/_server/_handler.py @@ -170,10 +170,8 @@ class _Handler(Handler): if self._unary_response is None: if self._responses: self._unary_response = self._responses.pop(0) - return ( - self._unary_response, self._trailing_metadata, - self._code, self._details,) - + return (self._unary_response, self._trailing_metadata, + self._code, self._details,) def stream_response_termination(self): with self._condition: diff --git a/src/python/grpcio_testing/grpc_testing/_server/_rpc.py b/src/python/grpcio_testing/grpc_testing/_server/_rpc.py index f81876f4b20..2060e8daff5 100644 --- a/src/python/grpcio_testing/grpc_testing/_server/_rpc.py +++ b/src/python/grpcio_testing/grpc_testing/_server/_rpc.py @@ -80,9 +80,8 @@ class Rpc(object): def application_cancel(self): with self._condition: - self._abort( - grpc.StatusCode.CANCELLED, - 'Cancelled by server-side application!') + self._abort(grpc.StatusCode.CANCELLED, + 'Cancelled by server-side application!') def application_exception_abort(self, exception): with self._condition: diff --git a/src/python/grpcio_testing/grpc_testing/_server/_server.py b/src/python/grpcio_testing/grpc_testing/_server/_server.py index 66bcfc13c0f..3e358e50a91 100644 --- a/src/python/grpcio_testing/grpc_testing/_server/_server.py +++ b/src/python/grpcio_testing/grpc_testing/_server/_server.py @@ -29,28 +29,34 @@ def _implementation(descriptors_to_servicers, method_descriptor): def _unary_unary_service(request): + def service(implementation, rpc, servicer_context): - _service.unary_unary( - implementation, rpc, request, servicer_context) + _service.unary_unary(implementation, rpc, request, servicer_context) + return service def _unary_stream_service(request): + def service(implementation, rpc, servicer_context): - _service.unary_stream( - implementation, rpc, request, servicer_context) + _service.unary_stream(implementation, rpc, request, servicer_context) + return service def _stream_unary_service(handler): + def service(implementation, rpc, servicer_context): _service.stream_unary(implementation, rpc, handler, servicer_context) + return service def _stream_stream_service(handler): + def service(implementation, rpc, servicer_context): _service.stream_stream(implementation, rpc, handler, servicer_context) + return service @@ -60,11 +66,10 @@ class _Serverish(_common.Serverish): self._descriptors_to_servicers = descriptors_to_servicers self._time = time - def _invoke( - self, service_behavior, method_descriptor, handler, - invocation_metadata, deadline): - implementation = _implementation( - self._descriptors_to_servicers, method_descriptor) + def _invoke(self, service_behavior, method_descriptor, handler, + invocation_metadata, deadline): + implementation = _implementation(self._descriptors_to_servicers, + method_descriptor) rpc = _rpc.Rpc(handler, invocation_metadata) if handler.add_termination_callback(rpc.extrinsic_abort): servicer_context = _servicer_context.ServicerContext( @@ -74,28 +79,26 @@ class _Serverish(_common.Serverish): args=(implementation, rpc, servicer_context,)) service_thread.start() - def invoke_unary_unary( - self, method_descriptor, handler, invocation_metadata, request, - deadline): + def invoke_unary_unary(self, method_descriptor, handler, + invocation_metadata, request, deadline): self._invoke( _unary_unary_service(request), method_descriptor, handler, invocation_metadata, deadline) - def invoke_unary_stream( - self, method_descriptor, handler, invocation_metadata, request, - deadline): + def invoke_unary_stream(self, method_descriptor, handler, + invocation_metadata, request, deadline): self._invoke( _unary_stream_service(request), method_descriptor, handler, invocation_metadata, deadline) - def invoke_stream_unary( - self, method_descriptor, handler, invocation_metadata, deadline): + def invoke_stream_unary(self, method_descriptor, handler, + invocation_metadata, deadline): self._invoke( _stream_unary_service(handler), method_descriptor, handler, invocation_metadata, deadline) - def invoke_stream_stream( - self, method_descriptor, handler, invocation_metadata, deadline): + def invoke_stream_stream(self, method_descriptor, handler, + invocation_metadata, deadline): self._invoke( _stream_stream_service(handler), method_descriptor, handler, invocation_metadata, deadline) @@ -106,7 +109,8 @@ def _deadline_and_handler(requests_closed, time, timeout): return None, _handler.handler_without_deadline(requests_closed) else: deadline = time.time() + timeout - handler = _handler.handler_with_deadline(requests_closed, time, deadline) + handler = _handler.handler_with_deadline(requests_closed, time, + deadline) return deadline, handler @@ -116,32 +120,32 @@ class _Server(grpc_testing.Server): self._serverish = serverish self._time = time - def invoke_unary_unary( - self, method_descriptor, invocation_metadata, request, timeout): + def invoke_unary_unary(self, method_descriptor, invocation_metadata, + request, timeout): deadline, handler = _deadline_and_handler(True, self._time, timeout) self._serverish.invoke_unary_unary( method_descriptor, handler, invocation_metadata, request, deadline) return _server_rpc.UnaryUnaryServerRpc(handler) - def invoke_unary_stream( - self, method_descriptor, invocation_metadata, request, timeout): + def invoke_unary_stream(self, method_descriptor, invocation_metadata, + request, timeout): deadline, handler = _deadline_and_handler(True, self._time, timeout) self._serverish.invoke_unary_stream( method_descriptor, handler, invocation_metadata, request, deadline) return _server_rpc.UnaryStreamServerRpc(handler) - def invoke_stream_unary( - self, method_descriptor, invocation_metadata, timeout): + def invoke_stream_unary(self, method_descriptor, invocation_metadata, + timeout): deadline, handler = _deadline_and_handler(False, self._time, timeout) - self._serverish.invoke_stream_unary( - method_descriptor, handler, invocation_metadata, deadline) + self._serverish.invoke_stream_unary(method_descriptor, handler, + invocation_metadata, deadline) return _server_rpc.StreamUnaryServerRpc(handler) - def invoke_stream_stream( - self, method_descriptor, invocation_metadata, timeout): + def invoke_stream_stream(self, method_descriptor, invocation_metadata, + timeout): deadline, handler = _deadline_and_handler(False, self._time, timeout) - self._serverish.invoke_stream_stream( - method_descriptor, handler, invocation_metadata, deadline) + self._serverish.invoke_stream_stream(method_descriptor, handler, + invocation_metadata, deadline) return _server_rpc.StreamStreamServerRpc(handler) diff --git a/src/python/grpcio_testing/grpc_version.py b/src/python/grpcio_testing/grpc_version.py index afc6dd83f29..0eb5fbf94d2 100644 --- a/src/python/grpcio_testing/grpc_version.py +++ b/src/python/grpcio_testing/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_testing/grpc_version.py.template`!!! -VERSION='1.9.0.dev0' +VERSION = '1.9.0.dev0' diff --git a/templates/src/python/grpcio_testing/grpc_version.py.template b/templates/src/python/grpcio_testing/grpc_version.py.template index 74db811d60e..a49392e5b17 100644 --- a/templates/src/python/grpcio_testing/grpc_version.py.template +++ b/templates/src/python/grpcio_testing/grpc_version.py.template @@ -16,4 +16,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_testing/grpc_version.py.template`!!! - VERSION='${settings.python_version.pep440()}' + VERSION = '${settings.python_version.pep440()}' diff --git a/tools/distrib/yapf_code.sh b/tools/distrib/yapf_code.sh index 061a3031894..b0df51f5ed9 100755 --- a/tools/distrib/yapf_code.sh +++ b/tools/distrib/yapf_code.sh @@ -22,7 +22,6 @@ DIRS=( 'src/python' ) EXCLUSIONS=( - 'grpcio_testing/grpc_*.py' 'grpcio_tests/grpc_*.py' ) From 138ee78529df864ea188dfe8bb927d40b90dc968 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 11 Dec 2017 16:32:31 -0800 Subject: [PATCH 101/127] yapf grpcio_tests --- src/python/grpcio_tests/grpc_version.py | 2 +- templates/src/python/grpcio_tests/grpc_version.py.template | 2 +- tools/distrib/yapf_code.sh | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/python/grpcio_tests/grpc_version.py b/src/python/grpcio_tests/grpc_version.py index 99ca3fd82dd..b1b4d7e0c21 100644 --- a/src/python/grpcio_tests/grpc_version.py +++ b/src/python/grpcio_tests/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!! -VERSION='1.9.0.dev0' +VERSION = '1.9.0.dev0' diff --git a/templates/src/python/grpcio_tests/grpc_version.py.template b/templates/src/python/grpcio_tests/grpc_version.py.template index 16fc92e536f..851fb7bce1a 100644 --- a/templates/src/python/grpcio_tests/grpc_version.py.template +++ b/templates/src/python/grpcio_tests/grpc_version.py.template @@ -16,4 +16,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!! - VERSION='${settings.python_version.pep440()}' + VERSION = '${settings.python_version.pep440()}' diff --git a/tools/distrib/yapf_code.sh b/tools/distrib/yapf_code.sh index b0df51f5ed9..51d1799a21d 100755 --- a/tools/distrib/yapf_code.sh +++ b/tools/distrib/yapf_code.sh @@ -22,7 +22,6 @@ DIRS=( 'src/python' ) EXCLUSIONS=( - 'grpcio_tests/grpc_*.py' ) VIRTUALENV=yapf_virtual_environment From 26d70b1653f2910d02ff91f31bc846b6ed25f8dc Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 11 Dec 2017 16:40:56 -0800 Subject: [PATCH 102/127] yapf tools/buildgen --- tools/buildgen/build-cleaner.py | 100 +++---- tools/buildgen/bunch.py | 53 ++-- tools/buildgen/generate_projects.py | 77 ++--- tools/buildgen/mako_renderer.py | 278 +++++++++--------- tools/buildgen/plugins/expand_bin_attrs.py | 37 ++- tools/buildgen/plugins/expand_filegroups.py | 222 +++++++------- tools/buildgen/plugins/expand_version.py | 133 +++++---- tools/buildgen/plugins/generate_vsprojects.py | 104 +++---- tools/buildgen/plugins/list_api.py | 55 ++-- tools/buildgen/plugins/list_protos.py | 36 ++- tools/buildgen/plugins/make_fuzzer_tests.py | 54 ++-- .../plugins/transitive_dependencies.py | 46 +-- tools/distrib/yapf_code.sh | 1 + 13 files changed, 610 insertions(+), 586 deletions(-) diff --git a/tools/buildgen/build-cleaner.py b/tools/buildgen/build-cleaner.py index 7b42844f751..a6b86fb2423 100755 --- a/tools/buildgen/build-cleaner.py +++ b/tools/buildgen/build-cleaner.py @@ -22,65 +22,65 @@ import yaml TEST = (os.environ.get('TEST', 'false') == 'true') -_TOP_LEVEL_KEYS = ['settings', 'proto_deps', 'filegroups', 'libs', 'targets', 'vspackages'] +_TOP_LEVEL_KEYS = [ + 'settings', 'proto_deps', 'filegroups', 'libs', 'targets', 'vspackages' +] _ELEM_KEYS = [ - 'name', - 'gtest', - 'cpu_cost', - 'flaky', - 'build', - 'run', - 'language', - 'public_headers', - 'headers', - 'src', - 'deps'] + 'name', 'gtest', 'cpu_cost', 'flaky', 'build', 'run', 'language', + 'public_headers', 'headers', 'src', 'deps' +] + def repr_ordered_dict(dumper, odict): - return dumper.represent_mapping(u'tag:yaml.org,2002:map', odict.items()) + return dumper.represent_mapping(u'tag:yaml.org,2002:map', odict.items()) + yaml.add_representer(collections.OrderedDict, repr_ordered_dict) + def rebuild_as_ordered_dict(indict, special_keys): - outdict = collections.OrderedDict() - for key in sorted(indict.keys()): - if '#' in key: - outdict[key] = indict[key] - for key in special_keys: - if key in indict: - outdict[key] = indict[key] - for key in sorted(indict.keys()): - if key in special_keys: continue - if '#' in key: continue - outdict[key] = indict[key] - return outdict + outdict = collections.OrderedDict() + for key in sorted(indict.keys()): + if '#' in key: + outdict[key] = indict[key] + for key in special_keys: + if key in indict: + outdict[key] = indict[key] + for key in sorted(indict.keys()): + if key in special_keys: continue + if '#' in key: continue + outdict[key] = indict[key] + return outdict + def clean_elem(indict): - for name in ['public_headers', 'headers', 'src']: - if name not in indict: continue - inlist = indict[name] - protos = list(x for x in inlist if os.path.splitext(x)[1] == '.proto') - others = set(x for x in inlist if x not in protos) - indict[name] = protos + sorted(others) - return rebuild_as_ordered_dict(indict, _ELEM_KEYS) + for name in ['public_headers', 'headers', 'src']: + if name not in indict: continue + inlist = indict[name] + protos = list(x for x in inlist if os.path.splitext(x)[1] == '.proto') + others = set(x for x in inlist if x not in protos) + indict[name] = protos + sorted(others) + return rebuild_as_ordered_dict(indict, _ELEM_KEYS) + for filename in sys.argv[1:]: - with open(filename) as f: - js = yaml.load(f) - js = rebuild_as_ordered_dict(js, _TOP_LEVEL_KEYS) - for grp in ['filegroups', 'libs', 'targets']: - if grp not in js: continue - js[grp] = sorted([clean_elem(x) for x in js[grp]], - key=lambda x: (x.get('language', '_'), x['name'])) - output = yaml.dump(js, indent=2, width=80, default_flow_style=False) - # massage out trailing whitespace - lines = [] - for line in output.splitlines(): - lines.append(line.rstrip() + '\n') - output = ''.join(lines) - if TEST: with open(filename) as f: - assert f.read() == output - else: - with open(filename, 'w') as f: - f.write(output) + js = yaml.load(f) + js = rebuild_as_ordered_dict(js, _TOP_LEVEL_KEYS) + for grp in ['filegroups', 'libs', 'targets']: + if grp not in js: continue + js[grp] = sorted( + [clean_elem(x) for x in js[grp]], + key=lambda x: (x.get('language', '_'), x['name'])) + output = yaml.dump(js, indent=2, width=80, default_flow_style=False) + # massage out trailing whitespace + lines = [] + for line in output.splitlines(): + lines.append(line.rstrip() + '\n') + output = ''.join(lines) + if TEST: + with open(filename) as f: + assert f.read() == output + else: + with open(filename, 'w') as f: + f.write(output) diff --git a/tools/buildgen/bunch.py b/tools/buildgen/bunch.py index 813051ad604..0ce9a6b233a 100755 --- a/tools/buildgen/bunch.py +++ b/tools/buildgen/bunch.py @@ -11,43 +11,42 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Allows dot-accessible dictionaries.""" class Bunch(dict): - def __init__(self, d): - dict.__init__(self, d) - self.__dict__.update(d) + def __init__(self, d): + dict.__init__(self, d) + self.__dict__.update(d) # Converts any kind of variable to a Bunch def to_bunch(var): - if isinstance(var, list): - return [to_bunch(i) for i in var] - if isinstance(var, dict): - ret = {} - for k, v in var.items(): - if isinstance(v, (list, dict)): - v = to_bunch(v) - ret[k] = v - return Bunch(ret) - else: - return var + if isinstance(var, list): + return [to_bunch(i) for i in var] + if isinstance(var, dict): + ret = {} + for k, v in var.items(): + if isinstance(v, (list, dict)): + v = to_bunch(v) + ret[k] = v + return Bunch(ret) + else: + return var # Merges JSON 'add' into JSON 'dst' def merge_json(dst, add): - if isinstance(dst, dict) and isinstance(add, dict): - for k, v in add.items(): - if k in dst: - if k == '#': continue - merge_json(dst[k], v) - else: - dst[k] = v - elif isinstance(dst, list) and isinstance(add, list): - dst.extend(add) - else: - raise Exception('Tried to merge incompatible objects %s %s\n\n%r\n\n%r' % (type(dst).__name__, type(add).__name__, dst, add)) - + if isinstance(dst, dict) and isinstance(add, dict): + for k, v in add.items(): + if k in dst: + if k == '#': continue + merge_json(dst[k], v) + else: + dst[k] = v + elif isinstance(dst, list) and isinstance(add, list): + dst.extend(add) + else: + raise Exception('Tried to merge incompatible objects %s %s\n\n%r\n\n%r' + % (type(dst).__name__, type(add).__name__, dst, add)) diff --git a/tools/buildgen/generate_projects.py b/tools/buildgen/generate_projects.py index d29cd02152f..bb5de9c42b1 100755 --- a/tools/buildgen/generate_projects.py +++ b/tools/buildgen/generate_projects.py @@ -21,7 +21,9 @@ import shutil import sys import tempfile import multiprocessing -sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '..', 'run_tests', 'python_utils')) +sys.path.append( + os.path.join( + os.path.dirname(sys.argv[0]), '..', 'run_tests', 'python_utils')) assert sys.argv[1:], 'run generate_projects.sh instead of this directly' @@ -45,57 +47,58 @@ plugins = sorted(glob.glob('tools/buildgen/plugins/*.py')) templates = args.templates if not templates: - for root, dirs, files in os.walk('templates'): - for f in files: - templates.append(os.path.join(root, f)) + for root, dirs, files in os.walk('templates'): + for f in files: + templates.append(os.path.join(root, f)) pre_jobs = [] base_cmd = ['python2.7', 'tools/buildgen/mako_renderer.py'] cmd = base_cmd[:] for plugin in plugins: - cmd.append('-p') - cmd.append(plugin) + cmd.append('-p') + cmd.append(plugin) for js in json: - cmd.append('-d') - cmd.append(js) + cmd.append('-d') + cmd.append(js) cmd.append('-w') preprocessed_build = '.preprocessed_build' cmd.append(preprocessed_build) if args.output_merged is not None: - cmd.append('-M') - cmd.append(args.output_merged) -pre_jobs.append(jobset.JobSpec(cmd, shortname='preprocess', timeout_seconds=None)) + cmd.append('-M') + cmd.append(args.output_merged) +pre_jobs.append( + jobset.JobSpec(cmd, shortname='preprocess', timeout_seconds=None)) jobs = [] for template in reversed(sorted(templates)): - root, f = os.path.split(template) - if os.path.splitext(f)[1] == '.template': - out_dir = args.base + root[len('templates'):] - out = out_dir + '/' + os.path.splitext(f)[0] - if not os.path.exists(out_dir): - os.makedirs(out_dir) - cmd = base_cmd[:] - cmd.append('-P') - cmd.append(preprocessed_build) - cmd.append('-o') - if test is None: - cmd.append(out) - else: - tf = tempfile.mkstemp() - test[out] = tf[1] - os.close(tf[0]) - cmd.append(test[out]) - cmd.append(args.base + '/' + root + '/' + f) - jobs.append(jobset.JobSpec(cmd, shortname=out, timeout_seconds=None)) + root, f = os.path.split(template) + if os.path.splitext(f)[1] == '.template': + out_dir = args.base + root[len('templates'):] + out = out_dir + '/' + os.path.splitext(f)[0] + if not os.path.exists(out_dir): + os.makedirs(out_dir) + cmd = base_cmd[:] + cmd.append('-P') + cmd.append(preprocessed_build) + cmd.append('-o') + if test is None: + cmd.append(out) + else: + tf = tempfile.mkstemp() + test[out] = tf[1] + os.close(tf[0]) + cmd.append(test[out]) + cmd.append(args.base + '/' + root + '/' + f) + jobs.append(jobset.JobSpec(cmd, shortname=out, timeout_seconds=None)) jobset.run(pre_jobs, maxjobs=args.jobs) jobset.run(jobs, maxjobs=args.jobs) if test is not None: - for s, g in test.iteritems(): - if os.path.isfile(g): - assert 0 == os.system('diff %s %s' % (s, g)), s - os.unlink(g) - else: - assert 0 == os.system('diff -r %s %s' % (s, g)), s - shutil.rmtree(g, ignore_errors=True) + for s, g in test.iteritems(): + if os.path.isfile(g): + assert 0 == os.system('diff %s %s' % (s, g)), s + os.unlink(g) + else: + assert 0 == os.system('diff -r %s %s' % (s, g)), s + shutil.rmtree(g, ignore_errors=True) diff --git a/tools/buildgen/mako_renderer.py b/tools/buildgen/mako_renderer.py index 77380530031..0569fa14d27 100755 --- a/tools/buildgen/mako_renderer.py +++ b/tools/buildgen/mako_renderer.py @@ -12,8 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - - """Simple Mako renderer. Just a wrapper around the mako rendering library. @@ -27,7 +25,6 @@ import cPickle as pickle import shutil import sys - from mako.lookup import TemplateLookup from mako.runtime import Context from mako.template import Template @@ -37,151 +34,158 @@ import yaml # Imports a plugin def import_plugin(name): - _, base_ex = os.path.split(name) - base, _ = os.path.splitext(base_ex) + _, base_ex = os.path.split(name) + base, _ = os.path.splitext(base_ex) - with open(name, 'r') as plugin_file: - plugin_code = plugin_file.read() - plugin_module = imp.new_module(base) - exec plugin_code in plugin_module.__dict__ - return plugin_module + with open(name, 'r') as plugin_file: + plugin_code = plugin_file.read() + plugin_module = imp.new_module(base) + exec plugin_code in plugin_module.__dict__ + return plugin_module def out(msg): - print >> sys.stderr, msg + print >> sys.stderr, msg def showhelp(): - out('mako-renderer.py [-o out] [-m cache] [-P preprocessed_input] [-d dict] [-d dict...]' - ' [-t template] [-w preprocessed_output]') + out('mako-renderer.py [-o out] [-m cache] [-P preprocessed_input] [-d dict] [-d dict...]' + ' [-t template] [-w preprocessed_output]') def main(argv): - got_input = False - module_directory = None - preprocessed_output = None - dictionary = {} - json_dict = {} - got_output = False - plugins = [] - output_name = None - got_preprocessed_input = False - output_merged = None - - try: - opts, args = getopt.getopt(argv, 'hM:m:d:o:p:t:P:w:') - except getopt.GetoptError: - out('Unknown option') - showhelp() - sys.exit(2) - - for opt, arg in opts: - if opt == '-h': - out('Displaying showhelp') - showhelp() - sys.exit() - elif opt == '-o': - if got_output: - out('Got more than one output') + got_input = False + module_directory = None + preprocessed_output = None + dictionary = {} + json_dict = {} + got_output = False + plugins = [] + output_name = None + got_preprocessed_input = False + output_merged = None + + try: + opts, args = getopt.getopt(argv, 'hM:m:d:o:p:t:P:w:') + except getopt.GetoptError: + out('Unknown option') showhelp() - sys.exit(3) - got_output = True - output_name = arg - elif opt == '-m': - if module_directory is not None: - out('Got more than one cache directory') + sys.exit(2) + + for opt, arg in opts: + if opt == '-h': + out('Displaying showhelp') + showhelp() + sys.exit() + elif opt == '-o': + if got_output: + out('Got more than one output') + showhelp() + sys.exit(3) + got_output = True + output_name = arg + elif opt == '-m': + if module_directory is not None: + out('Got more than one cache directory') + showhelp() + sys.exit(4) + module_directory = arg + elif opt == '-M': + if output_merged is not None: + out('Got more than one output merged path') + showhelp() + sys.exit(5) + output_merged = arg + elif opt == '-P': + assert not got_preprocessed_input + assert json_dict == {} + sys.path.insert( + 0, + os.path.abspath( + os.path.join(os.path.dirname(sys.argv[0]), 'plugins'))) + with open(arg, 'r') as dict_file: + dictionary = pickle.load(dict_file) + got_preprocessed_input = True + elif opt == '-d': + assert not got_preprocessed_input + with open(arg, 'r') as dict_file: + bunch.merge_json(json_dict, yaml.load(dict_file.read())) + elif opt == '-p': + plugins.append(import_plugin(arg)) + elif opt == '-w': + preprocessed_output = arg + + if not got_preprocessed_input: + for plugin in plugins: + plugin.mako_plugin(json_dict) + if output_merged: + with open(output_merged, 'w') as yaml_file: + yaml_file.write(yaml.dump(json_dict)) + for k, v in json_dict.items(): + dictionary[k] = bunch.to_bunch(v) + + if preprocessed_output: + with open(preprocessed_output, 'w') as dict_file: + pickle.dump(dictionary, dict_file) + + cleared_dir = False + for arg in args: + got_input = True + with open(arg) as f: + srcs = list(yaml.load_all(f.read())) + for src in srcs: + if isinstance(src, basestring): + assert len(srcs) == 1 + template = Template( + src, + filename=arg, + module_directory=module_directory, + lookup=TemplateLookup(directories=['.'])) + with open(output_name, 'w') as output_file: + template.render_context(Context(output_file, **dictionary)) + else: + # we have optional control data: this template represents + # a directory + if not cleared_dir: + if not os.path.exists(output_name): + pass + elif os.path.isfile(output_name): + os.unlink(output_name) + else: + shutil.rmtree(output_name, ignore_errors=True) + cleared_dir = True + items = [] + if 'foreach' in src: + for el in dictionary[src['foreach']]: + if 'cond' in src: + args = dict(dictionary) + args['selected'] = el + if not eval(src['cond'], {}, args): + continue + items.append(el) + assert items + else: + items = [None] + for item in items: + args = dict(dictionary) + args['selected'] = item + item_output_name = os.path.join( + output_name, + Template(src['output_name']).render(**args)) + if not os.path.exists(os.path.dirname(item_output_name)): + os.makedirs(os.path.dirname(item_output_name)) + template = Template( + src['template'], + filename=arg, + module_directory=module_directory, + lookup=TemplateLookup(directories=['.'])) + with open(item_output_name, 'w') as output_file: + template.render_context(Context(output_file, **args)) + + if not got_input and not preprocessed_output: + out('Got nothing to do') showhelp() - sys.exit(4) - module_directory = arg - elif opt == '-M': - if output_merged is not None: - out('Got more than one output merged path') - showhelp() - sys.exit(5) - output_merged = arg - elif opt == '-P': - assert not got_preprocessed_input - assert json_dict == {} - sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), 'plugins'))) - with open(arg, 'r') as dict_file: - dictionary = pickle.load(dict_file) - got_preprocessed_input = True - elif opt == '-d': - assert not got_preprocessed_input - with open(arg, 'r') as dict_file: - bunch.merge_json(json_dict, yaml.load(dict_file.read())) - elif opt == '-p': - plugins.append(import_plugin(arg)) - elif opt == '-w': - preprocessed_output = arg - - if not got_preprocessed_input: - for plugin in plugins: - plugin.mako_plugin(json_dict) - if output_merged: - with open(output_merged, 'w') as yaml_file: - yaml_file.write(yaml.dump(json_dict)) - for k, v in json_dict.items(): - dictionary[k] = bunch.to_bunch(v) - - if preprocessed_output: - with open(preprocessed_output, 'w') as dict_file: - pickle.dump(dictionary, dict_file) - - cleared_dir = False - for arg in args: - got_input = True - with open(arg) as f: - srcs = list(yaml.load_all(f.read())) - for src in srcs: - if isinstance(src, basestring): - assert len(srcs) == 1 - template = Template(src, - filename=arg, - module_directory=module_directory, - lookup=TemplateLookup(directories=['.'])) - with open(output_name, 'w') as output_file: - template.render_context(Context(output_file, **dictionary)) - else: - # we have optional control data: this template represents - # a directory - if not cleared_dir: - if not os.path.exists(output_name): - pass - elif os.path.isfile(output_name): - os.unlink(output_name) - else: - shutil.rmtree(output_name, ignore_errors=True) - cleared_dir = True - items = [] - if 'foreach' in src: - for el in dictionary[src['foreach']]: - if 'cond' in src: - args = dict(dictionary) - args['selected'] = el - if not eval(src['cond'], {}, args): - continue - items.append(el) - assert items - else: - items = [None] - for item in items: - args = dict(dictionary) - args['selected'] = item - item_output_name = os.path.join( - output_name, Template(src['output_name']).render(**args)) - if not os.path.exists(os.path.dirname(item_output_name)): - os.makedirs(os.path.dirname(item_output_name)) - template = Template(src['template'], - filename=arg, - module_directory=module_directory, - lookup=TemplateLookup(directories=['.'])) - with open(item_output_name, 'w') as output_file: - template.render_context(Context(output_file, **args)) - - if not got_input and not preprocessed_output: - out('Got nothing to do') - showhelp() + if __name__ == '__main__': - main(sys.argv[1:]) + main(sys.argv[1:]) diff --git a/tools/buildgen/plugins/expand_bin_attrs.py b/tools/buildgen/plugins/expand_bin_attrs.py index 6ad6e9cb3d4..d5acd8d06c8 100755 --- a/tools/buildgen/plugins/expand_bin_attrs.py +++ b/tools/buildgen/plugins/expand_bin_attrs.py @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Buildgen expand binary attributes plugin. This fills in any optional attributes. @@ -20,7 +19,7 @@ This fills in any optional attributes. def mako_plugin(dictionary): - """The exported plugin code for expand_filegroups. + """The exported plugin code for expand_filegroups. The list of libs in the build.yaml file can contain "filegroups" tags. These refer to the filegroups in the root object. We will expand and @@ -28,20 +27,20 @@ def mako_plugin(dictionary): """ - targets = dictionary.get('targets') - default_platforms = ['windows', 'posix', 'linux', 'mac'] - - for tgt in targets: - tgt['flaky'] = tgt.get('flaky', False) - tgt['platforms'] = sorted(tgt.get('platforms', default_platforms)) - tgt['ci_platforms'] = sorted(tgt.get('ci_platforms', tgt['platforms'])) - tgt['boringssl'] = tgt.get('boringssl', False) - tgt['zlib'] = tgt.get('zlib', False) - tgt['ares'] = tgt.get('ares', False) - tgt['gtest'] = tgt.get('gtest', False) - - libs = dictionary.get('libs') - for lib in libs: - lib['boringssl'] = lib.get('boringssl', False) - lib['zlib'] = lib.get('zlib', False) - lib['ares'] = lib.get('ares', False) + targets = dictionary.get('targets') + default_platforms = ['windows', 'posix', 'linux', 'mac'] + + for tgt in targets: + tgt['flaky'] = tgt.get('flaky', False) + tgt['platforms'] = sorted(tgt.get('platforms', default_platforms)) + tgt['ci_platforms'] = sorted(tgt.get('ci_platforms', tgt['platforms'])) + tgt['boringssl'] = tgt.get('boringssl', False) + tgt['zlib'] = tgt.get('zlib', False) + tgt['ares'] = tgt.get('ares', False) + tgt['gtest'] = tgt.get('gtest', False) + + libs = dictionary.get('libs') + for lib in libs: + lib['boringssl'] = lib.get('boringssl', False) + lib['zlib'] = lib.get('zlib', False) + lib['ares'] = lib.get('ares', False) diff --git a/tools/buildgen/plugins/expand_filegroups.py b/tools/buildgen/plugins/expand_filegroups.py index 669704063eb..886a59cdbbc 100755 --- a/tools/buildgen/plugins/expand_filegroups.py +++ b/tools/buildgen/plugins/expand_filegroups.py @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Buildgen expand filegroups plugin. This takes the list of libs from our yaml dictionary, @@ -21,132 +20,135 @@ and expands any and all filegroup. def excluded(filename, exclude_res): - for r in exclude_res: - if r.search(filename): - return True - return False + for r in exclude_res: + if r.search(filename): + return True + return False def uniquify(lst): - out = [] - for el in lst: - if el not in out: - out.append(el) - return out + out = [] + for el in lst: + if el not in out: + out.append(el) + return out FILEGROUP_LISTS = ['src', 'headers', 'public_headers', 'deps'] - FILEGROUP_DEFAULTS = { - 'language': 'c', - 'boringssl': False, - 'zlib': False, - 'ares': False, + 'language': 'c', + 'boringssl': False, + 'zlib': False, + 'ares': False, } def mako_plugin(dictionary): - """The exported plugin code for expand_filegroups. + """The exported plugin code for expand_filegroups. The list of libs in the build.yaml file can contain "filegroups" tags. These refer to the filegroups in the root object. We will expand and merge filegroups on the src, headers and public_headers properties. """ - libs = dictionary.get('libs') - targets = dictionary.get('targets') - filegroups_list = dictionary.get('filegroups') - filegroups = {} - - for fg in filegroups_list: - for lst in FILEGROUP_LISTS: - fg[lst] = fg.get(lst, []) - fg['own_%s' % lst] = list(fg[lst]) - for attr, val in FILEGROUP_DEFAULTS.iteritems(): - if attr not in fg: - fg[attr] = val - - todo = list(filegroups_list) - skips = 0 - - while todo: - assert skips != len(todo), "infinite loop in filegroup uses clauses: %r" % [t['name'] for t in todo] - # take the first element of the todo list - cur = todo[0] - todo = todo[1:] - # check all uses filegroups are present (if no, skip and come back later) - skip = False - for uses in cur.get('uses', []): - if uses not in filegroups: - skip = True - if skip: - skips += 1 - todo.append(cur) - else: - skips = 0 - assert 'plugins' not in cur - plugins = [] - for uses in cur.get('uses', []): - for plugin in filegroups[uses]['plugins']: - if plugin not in plugins: - plugins.append(plugin) + libs = dictionary.get('libs') + targets = dictionary.get('targets') + filegroups_list = dictionary.get('filegroups') + filegroups = {} + + for fg in filegroups_list: for lst in FILEGROUP_LISTS: - vals = cur.get(lst, []) - vals.extend(filegroups[uses].get(lst, [])) - cur[lst] = vals - cur_plugin_name = cur.get('plugin') - if cur_plugin_name: - plugins.append(cur_plugin_name) - cur['plugins'] = plugins - filegroups[cur['name']] = cur - - # build reverse dependency map - things = {} - for thing in dictionary['libs'] + dictionary['targets'] + dictionary['filegroups']: - things[thing['name']] = thing - thing['used_by'] = [] - thing_deps = lambda t: t.get('uses', []) + t.get('filegroups', []) + t.get('deps', []) - for thing in things.itervalues(): - done = set() - todo = thing_deps(thing) + fg[lst] = fg.get(lst, []) + fg['own_%s' % lst] = list(fg[lst]) + for attr, val in FILEGROUP_DEFAULTS.iteritems(): + if attr not in fg: + fg[attr] = val + + todo = list(filegroups_list) + skips = 0 + while todo: - cur = todo[0] - todo = todo[1:] - if cur in done: continue - things[cur]['used_by'].append(thing['name']) - todo.extend(thing_deps(things[cur])) - done.add(cur) - - # the above expansion can introduce duplicate filenames: contract them here - for fg in filegroups.itervalues(): - for lst in FILEGROUP_LISTS: - fg[lst] = uniquify(fg.get(lst, [])) - - for tgt in dictionary['targets']: - for lst in FILEGROUP_LISTS: - tgt[lst] = tgt.get(lst, []) - tgt['own_%s' % lst] = list(tgt[lst]) - - for lib in libs + targets: - assert 'plugins' not in lib - plugins = [] - for lst in FILEGROUP_LISTS: - vals = lib.get(lst, []) - lib[lst] = list(vals) - lib['own_%s' % lst] = list(vals) - for fg_name in lib.get('filegroups', []): - fg = filegroups[fg_name] - for plugin in fg['plugins']: - if plugin not in plugins: - plugins.append(plugin) - for lst in FILEGROUP_LISTS: - vals = lib.get(lst, []) - vals.extend(fg.get(lst, [])) - lib[lst] = vals - lib['plugins'] = plugins - if lib.get('generate_plugin_registry', False): - lib['src'].append('src/core/plugin_registry/%s_plugin_registry.cc' % - lib['name']) - for lst in FILEGROUP_LISTS: - lib[lst] = uniquify(lib.get(lst, [])) + assert skips != len( + todo), "infinite loop in filegroup uses clauses: %r" % [ + t['name'] for t in todo + ] + # take the first element of the todo list + cur = todo[0] + todo = todo[1:] + # check all uses filegroups are present (if no, skip and come back later) + skip = False + for uses in cur.get('uses', []): + if uses not in filegroups: + skip = True + if skip: + skips += 1 + todo.append(cur) + else: + skips = 0 + assert 'plugins' not in cur + plugins = [] + for uses in cur.get('uses', []): + for plugin in filegroups[uses]['plugins']: + if plugin not in plugins: + plugins.append(plugin) + for lst in FILEGROUP_LISTS: + vals = cur.get(lst, []) + vals.extend(filegroups[uses].get(lst, [])) + cur[lst] = vals + cur_plugin_name = cur.get('plugin') + if cur_plugin_name: + plugins.append(cur_plugin_name) + cur['plugins'] = plugins + filegroups[cur['name']] = cur + + # build reverse dependency map + things = {} + for thing in dictionary['libs'] + dictionary['targets'] + dictionary[ + 'filegroups']: + things[thing['name']] = thing + thing['used_by'] = [] + thing_deps = lambda t: t.get('uses', []) + t.get('filegroups', []) + t.get('deps', []) + for thing in things.itervalues(): + done = set() + todo = thing_deps(thing) + while todo: + cur = todo[0] + todo = todo[1:] + if cur in done: continue + things[cur]['used_by'].append(thing['name']) + todo.extend(thing_deps(things[cur])) + done.add(cur) + + # the above expansion can introduce duplicate filenames: contract them here + for fg in filegroups.itervalues(): + for lst in FILEGROUP_LISTS: + fg[lst] = uniquify(fg.get(lst, [])) + + for tgt in dictionary['targets']: + for lst in FILEGROUP_LISTS: + tgt[lst] = tgt.get(lst, []) + tgt['own_%s' % lst] = list(tgt[lst]) + + for lib in libs + targets: + assert 'plugins' not in lib + plugins = [] + for lst in FILEGROUP_LISTS: + vals = lib.get(lst, []) + lib[lst] = list(vals) + lib['own_%s' % lst] = list(vals) + for fg_name in lib.get('filegroups', []): + fg = filegroups[fg_name] + for plugin in fg['plugins']: + if plugin not in plugins: + plugins.append(plugin) + for lst in FILEGROUP_LISTS: + vals = lib.get(lst, []) + vals.extend(fg.get(lst, [])) + lib[lst] = vals + lib['plugins'] = plugins + if lib.get('generate_plugin_registry', False): + lib['src'].append('src/core/plugin_registry/%s_plugin_registry.cc' % + lib['name']) + for lst in FILEGROUP_LISTS: + lib[lst] = uniquify(lib.get(lst, [])) diff --git a/tools/buildgen/plugins/expand_version.py b/tools/buildgen/plugins/expand_version.py index d8a3600b7ce..8f56ce8fc97 100755 --- a/tools/buildgen/plugins/expand_version.py +++ b/tools/buildgen/plugins/expand_version.py @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Buildgen package version plugin This parses the list of targets from the yaml build file, and creates @@ -19,84 +18,90 @@ a custom version string for each language's package. """ - import re LANGUAGES = [ - 'core', - 'cpp', - 'csharp', - 'objc', - 'php', - 'python', - 'ruby', - ] + 'core', + 'cpp', + 'csharp', + 'objc', + 'php', + 'python', + 'ruby', +] + class Version: - def __init__(self, s): - self.tag = None - if '-' in s: - s, self.tag = s.split('-') - self.major, self.minor, self.patch = [int(x) for x in s.split('.')] + def __init__(self, s): + self.tag = None + if '-' in s: + s, self.tag = s.split('-') + self.major, self.minor, self.patch = [int(x) for x in s.split('.')] + + def __str__(self): + """Version string in a somewhat idiomatic style for most languages""" + s = '%d.%d.%d' % (self.major, self.minor, self.patch) + if self.tag: + s += '-%s' % self.tag + return s - def __str__(self): - """Version string in a somewhat idiomatic style for most languages""" - s = '%d.%d.%d' % (self.major, self.minor, self.patch) - if self.tag: - s += '-%s' % self.tag - return s + def pep440(self): + """Version string in Python PEP440 style""" + s = '%d.%d.%d' % (self.major, self.minor, self.patch) + if self.tag: + # we need to translate from grpc version tags to pep440 version + # tags; this code is likely to be a little ad-hoc + if self.tag == 'dev': + s += '.dev0' + elif len(self.tag) >= 3 and self.tag[0:3] == 'pre': + s += 'rc%d' % int(self.tag[3:]) + else: + raise Exception( + 'Don\'t know how to translate version tag "%s" to pep440' % + self.tag) + return s - def pep440(self): - """Version string in Python PEP440 style""" - s = '%d.%d.%d' % (self.major, self.minor, self.patch) - if self.tag: - # we need to translate from grpc version tags to pep440 version - # tags; this code is likely to be a little ad-hoc - if self.tag == 'dev': - s += '.dev0' - elif len(self.tag) >= 3 and self.tag[0:3] == 'pre': - s += 'rc%d' % int(self.tag[3:]) - else: - raise Exception('Don\'t know how to translate version tag "%s" to pep440' % self.tag) - return s + def ruby(self): + """Version string in Ruby style""" + if self.tag: + return '%d.%d.%d.%s' % (self.major, self.minor, self.patch, + self.tag) + else: + return '%d.%d.%d' % (self.major, self.minor, self.patch) - def ruby(self): - """Version string in Ruby style""" - if self.tag: - return '%d.%d.%d.%s' % (self.major, self.minor, self.patch, self.tag) - else: - return '%d.%d.%d' % (self.major, self.minor, self.patch) + def php(self): + """Version string for PHP PECL package""" + s = '%d.%d.%d' % (self.major, self.minor, self.patch) + if self.tag: + if self.tag == 'dev': + s += 'dev' + elif len(self.tag) >= 3 and self.tag[0:3] == 'pre': + s += 'RC%d' % int(self.tag[3:]) + else: + raise Exception( + 'Don\'t know how to translate version tag "%s" to PECL version' + % self.tag) + return s - def php(self): - """Version string for PHP PECL package""" - s = '%d.%d.%d' % (self.major, self.minor, self.patch) - if self.tag: - if self.tag == 'dev': - s += 'dev' - elif len(self.tag) >= 3 and self.tag[0:3] == 'pre': - s += 'RC%d' % int(self.tag[3:]) - else: - raise Exception('Don\'t know how to translate version tag "%s" to PECL version' % self.tag) - return s + def php_composer(self): + """Version string for PHP Composer package""" + return '%d.%d.%d' % (self.major, self.minor, self.patch) - def php_composer(self): - """Version string for PHP Composer package""" - return '%d.%d.%d' % (self.major, self.minor, self.patch) def mako_plugin(dictionary): - """Expand version numbers: + """Expand version numbers: - for each language, ensure there's a language_version tag in settings (defaulting to the master version tag) - expand version strings to major, minor, patch, and tag """ - settings = dictionary['settings'] - master_version = Version(settings['version']) - settings['version'] = master_version - for language in LANGUAGES: - version_tag = '%s_version' % language - if version_tag in settings: - settings[version_tag] = Version(settings[version_tag]) - else: - settings[version_tag] = master_version + settings = dictionary['settings'] + master_version = Version(settings['version']) + settings['version'] = master_version + for language in LANGUAGES: + version_tag = '%s_version' % language + if version_tag in settings: + settings[version_tag] = Version(settings[version_tag]) + else: + settings[version_tag] = master_version diff --git a/tools/buildgen/plugins/generate_vsprojects.py b/tools/buildgen/plugins/generate_vsprojects.py index 06755f62f55..f6251d46771 100755 --- a/tools/buildgen/plugins/generate_vsprojects.py +++ b/tools/buildgen/plugins/generate_vsprojects.py @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Buildgen vsprojects plugin. This parses the list of libraries, and generates globals "vsprojects" @@ -19,62 +18,67 @@ and "vsproject_dict", to be used by the visual studio generators. """ - import hashlib import re def mako_plugin(dictionary): - """The exported plugin code for generate_vsprojeccts + """The exported plugin code for generate_vsprojeccts We want to help the work of the visual studio generators. """ - libs = dictionary.get('libs', []) - targets = dictionary.get('targets', []) - - for lib in libs: - lib['is_library'] = True - for target in targets: - target['is_library'] = False - - projects = [] - projects.extend(libs) - projects.extend(targets) - for target in projects: - if 'build' in target and target['build'] == 'test': - default_test_dir = 'test' - else: - default_test_dir = '.' - if 'vs_config_type' not in target: - if 'build' in target and target['build'] == 'test': - target['vs_config_type'] = 'Application' - else: - target['vs_config_type'] = 'StaticLibrary' - if 'vs_packages' not in target: - target['vs_packages'] = [] - if 'vs_props' not in target: - target['vs_props'] = [] - target['vs_proj_dir'] = target.get('vs_proj_dir', default_test_dir) - if target.get('vs_project_guid', None) is None and 'windows' in target.get('platforms', ['windows']): - name = target['name'] - guid = re.sub('(........)(....)(....)(....)(.*)', - r'{\1-\2-\3-\4-\5}', - hashlib.md5(name).hexdigest()) - target['vs_project_guid'] = guid.upper() - # Exclude projects without a visual project guid, such as the tests. - projects = [project for project in projects - if project.get('vs_project_guid', None)] - - projects = [project for project in projects - if project['language'] != 'c++' or project['build'] == 'all' or project['build'] == 'protoc' or (project['language'] == 'c++' and (project['build'] == 'test' or project['build'] == 'private'))] - - project_dict = dict([(p['name'], p) for p in projects]) - - packages = dictionary.get('vspackages', []) - packages_dict = dict([(p['name'], p) for p in packages]) - - dictionary['vsprojects'] = projects - dictionary['vsproject_dict'] = project_dict - dictionary['vspackages_dict'] = packages_dict + libs = dictionary.get('libs', []) + targets = dictionary.get('targets', []) + + for lib in libs: + lib['is_library'] = True + for target in targets: + target['is_library'] = False + + projects = [] + projects.extend(libs) + projects.extend(targets) + for target in projects: + if 'build' in target and target['build'] == 'test': + default_test_dir = 'test' + else: + default_test_dir = '.' + if 'vs_config_type' not in target: + if 'build' in target and target['build'] == 'test': + target['vs_config_type'] = 'Application' + else: + target['vs_config_type'] = 'StaticLibrary' + if 'vs_packages' not in target: + target['vs_packages'] = [] + if 'vs_props' not in target: + target['vs_props'] = [] + target['vs_proj_dir'] = target.get('vs_proj_dir', default_test_dir) + if target.get('vs_project_guid', + None) is None and 'windows' in target.get('platforms', + ['windows']): + name = target['name'] + guid = re.sub('(........)(....)(....)(....)(.*)', + r'{\1-\2-\3-\4-\5}', hashlib.md5(name).hexdigest()) + target['vs_project_guid'] = guid.upper() + # Exclude projects without a visual project guid, such as the tests. + projects = [ + project for project in projects if project.get('vs_project_guid', None) + ] + + projects = [ + project for project in projects + if project['language'] != 'c++' or project['build'] == 'all' or project[ + 'build'] == 'protoc' or (project['language'] == 'c++' and (project[ + 'build'] == 'test' or project['build'] == 'private')) + ] + + project_dict = dict([(p['name'], p) for p in projects]) + + packages = dictionary.get('vspackages', []) + packages_dict = dict([(p['name'], p) for p in packages]) + + dictionary['vsprojects'] = projects + dictionary['vsproject_dict'] = project_dict + dictionary['vspackages_dict'] = packages_dict diff --git a/tools/buildgen/plugins/list_api.py b/tools/buildgen/plugins/list_api.py index bed98dafe34..f7ecb97666b 100755 --- a/tools/buildgen/plugins/list_api.py +++ b/tools/buildgen/plugins/list_api.py @@ -21,44 +21,47 @@ import re import sys import yaml - _RE_API = r'(?:GPRAPI|GRPCAPI|CENSUSAPI)([^;]*);' def list_c_apis(filenames): - for filename in filenames: - with open(filename, 'r') as f: - text = f.read() - for m in re.finditer(_RE_API, text): - api_declaration = re.sub('[ \r\n\t]+', ' ', m.group(1)) - type_and_name, args_and_close = api_declaration.split('(', 1) - args = args_and_close[:args_and_close.rfind(')')].strip() - last_space = type_and_name.rfind(' ') - last_star = type_and_name.rfind('*') - type_end = max(last_space, last_star) - return_type = type_and_name[0:type_end+1].strip() - name = type_and_name[type_end+1:].strip() - yield {'return_type': return_type, 'name': name, 'arguments': args, 'header': filename} + for filename in filenames: + with open(filename, 'r') as f: + text = f.read() + for m in re.finditer(_RE_API, text): + api_declaration = re.sub('[ \r\n\t]+', ' ', m.group(1)) + type_and_name, args_and_close = api_declaration.split('(', 1) + args = args_and_close[:args_and_close.rfind(')')].strip() + last_space = type_and_name.rfind(' ') + last_star = type_and_name.rfind('*') + type_end = max(last_space, last_star) + return_type = type_and_name[0:type_end + 1].strip() + name = type_and_name[type_end + 1:].strip() + yield { + 'return_type': return_type, + 'name': name, + 'arguments': args, + 'header': filename + } def headers_under(directory): - for root, dirnames, filenames in os.walk(directory): - for filename in fnmatch.filter(filenames, '*.h'): - yield os.path.join(root, filename) + for root, dirnames, filenames in os.walk(directory): + for filename in fnmatch.filter(filenames, '*.h'): + yield os.path.join(root, filename) def mako_plugin(dictionary): - apis = [] - headers = [] + apis = [] + headers = [] - for lib in dictionary['libs']: - if lib['name'] in ['grpc', 'gpr']: - headers.extend(lib['public_headers']) + for lib in dictionary['libs']: + if lib['name'] in ['grpc', 'gpr']: + headers.extend(lib['public_headers']) - apis.extend(list_c_apis(sorted(set(headers)))) - dictionary['c_apis'] = apis + apis.extend(list_c_apis(sorted(set(headers)))) + dictionary['c_apis'] = apis if __name__ == '__main__': - print yaml.dump([api for api in list_c_apis(headers_under('include/grpc'))]) - + print yaml.dump([api for api in list_c_apis(headers_under('include/grpc'))]) diff --git a/tools/buildgen/plugins/list_protos.py b/tools/buildgen/plugins/list_protos.py index 07a860c8afa..0aa5fe55d29 100755 --- a/tools/buildgen/plugins/list_protos.py +++ b/tools/buildgen/plugins/list_protos.py @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Buildgen .proto files list plugin. This parses the list of targets from the yaml build file, and creates @@ -19,12 +18,11 @@ a list called "protos" that contains all of the proto file names. """ - import re def mako_plugin(dictionary): - """The exported plugin code for list_protos. + """The exported plugin code for list_protos. Some projects generators may want to get the full list of unique .proto files that are being included in a project. This code extracts all files referenced @@ -33,23 +31,23 @@ def mako_plugin(dictionary): """ - libs = dictionary.get('libs', []) - targets = dictionary.get('targets', []) + libs = dictionary.get('libs', []) + targets = dictionary.get('targets', []) - proto_re = re.compile('(.*)\\.proto') + proto_re = re.compile('(.*)\\.proto') - protos = set() - for lib in libs: - for src in lib.get('src', []): - m = proto_re.match(src) - if m: - protos.add(m.group(1)) - for tgt in targets: - for src in tgt.get('src', []): - m = proto_re.match(src) - if m: - protos.add(m.group(1)) + protos = set() + for lib in libs: + for src in lib.get('src', []): + m = proto_re.match(src) + if m: + protos.add(m.group(1)) + for tgt in targets: + for src in tgt.get('src', []): + m = proto_re.match(src) + if m: + protos.add(m.group(1)) - protos = sorted(protos) + protos = sorted(protos) - dictionary['protos'] = protos + dictionary['protos'] = protos diff --git a/tools/buildgen/plugins/make_fuzzer_tests.py b/tools/buildgen/plugins/make_fuzzer_tests.py index 56dad2d5610..f644a7c272e 100644 --- a/tools/buildgen/plugins/make_fuzzer_tests.py +++ b/tools/buildgen/plugins/make_fuzzer_tests.py @@ -11,35 +11,37 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Create tests for each fuzzer""" import copy import glob + def mako_plugin(dictionary): - targets = dictionary['targets'] - tests = dictionary['tests'] - for tgt in targets: - if tgt['build'] == 'fuzzer': - new_target = copy.deepcopy(tgt) - new_target['build'] = 'test' - new_target['name'] += '_one_entry' - new_target['run'] = False - new_target['src'].append('test/core/util/one_corpus_entry_fuzzer.cc') - new_target['own_src'].append('test/core/util/one_corpus_entry_fuzzer.cc') - targets.append(new_target) - for corpus in new_target['corpus_dirs']: - for fn in sorted(glob.glob('%s/*' % corpus)): - tests.append({ - 'name': new_target['name'], - 'args': [fn], - 'exclude_iomgrs': ['uv'], - 'exclude_configs': ['tsan'], - 'uses_polling': False, - 'platforms': ['mac', 'linux'], - 'ci_platforms': ['linux'], - 'flaky': False, - 'language': 'c', - 'cpu_cost': 0.1, - }) + targets = dictionary['targets'] + tests = dictionary['tests'] + for tgt in targets: + if tgt['build'] == 'fuzzer': + new_target = copy.deepcopy(tgt) + new_target['build'] = 'test' + new_target['name'] += '_one_entry' + new_target['run'] = False + new_target['src'].append( + 'test/core/util/one_corpus_entry_fuzzer.cc') + new_target['own_src'].append( + 'test/core/util/one_corpus_entry_fuzzer.cc') + targets.append(new_target) + for corpus in new_target['corpus_dirs']: + for fn in sorted(glob.glob('%s/*' % corpus)): + tests.append({ + 'name': new_target['name'], + 'args': [fn], + 'exclude_iomgrs': ['uv'], + 'exclude_configs': ['tsan'], + 'uses_polling': False, + 'platforms': ['mac', 'linux'], + 'ci_platforms': ['linux'], + 'flaky': False, + 'language': 'c', + 'cpu_cost': 0.1, + }) diff --git a/tools/buildgen/plugins/transitive_dependencies.py b/tools/buildgen/plugins/transitive_dependencies.py index bf5263e6857..5373bca2d1a 100644 --- a/tools/buildgen/plugins/transitive_dependencies.py +++ b/tools/buildgen/plugins/transitive_dependencies.py @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Buildgen transitive dependencies This takes the list of libs, node_modules, and targets from our @@ -20,35 +19,40 @@ of the list of dependencies. """ + def get_lib(libs, name): - try: - return next(lib for lib in libs if lib['name']==name) - except StopIteration: - return None + try: + return next(lib for lib in libs if lib['name'] == name) + except StopIteration: + return None + def transitive_deps(lib, libs): - if lib is not None and 'deps' in lib: - # Recursively call transitive_deps on each dependency, and take the union - return set.union(set(lib['deps']), - *[set(transitive_deps(get_lib(libs, dep), libs)) - for dep in lib['deps']]) - else: - return set() + if lib is not None and 'deps' in lib: + # Recursively call transitive_deps on each dependency, and take the union + return set.union( + set(lib['deps']), *[ + set(transitive_deps(get_lib(libs, dep), libs)) + for dep in lib['deps'] + ]) + else: + return set() + def mako_plugin(dictionary): - """The exported plugin code for transitive_dependencies. + """The exported plugin code for transitive_dependencies. Iterate over each list and check each item for a deps list. We add a transitive_deps property to each with the transitive closure of those dependency lists. """ - libs = dictionary.get('libs') + libs = dictionary.get('libs') - for target_name, target_list in dictionary.items(): - for target in target_list: - if isinstance(target, dict) and 'deps' in target: - target['transitive_deps'] = transitive_deps(target, libs) + for target_name, target_list in dictionary.items(): + for target in target_list: + if isinstance(target, dict) and 'deps' in target: + target['transitive_deps'] = transitive_deps(target, libs) - python_dependencies = dictionary.get('python_dependencies') - python_dependencies['transitive_deps'] = ( - transitive_deps(python_dependencies, libs)) + python_dependencies = dictionary.get('python_dependencies') + python_dependencies['transitive_deps'] = ( + transitive_deps(python_dependencies, libs)) diff --git a/tools/distrib/yapf_code.sh b/tools/distrib/yapf_code.sh index e5beb70117a..7024168b2d8 100755 --- a/tools/distrib/yapf_code.sh +++ b/tools/distrib/yapf_code.sh @@ -20,6 +20,7 @@ cd "$(dirname "${0}")/../.." DIRS=( 'src/python' + 'tools/buildgen' ) EXCLUSIONS=( 'grpcio/grpc_*.py' From 5898847ddf64c8e14322aac57b10b8a3b23e4290 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 11 Dec 2017 16:43:54 -0800 Subject: [PATCH 103/127] yapf tools/codegen --- tools/codegen/core/gen_header_frame.py | 154 ++-- ..._registered_method_bad_client_test_body.py | 74 +- tools/codegen/core/gen_settings_ids.py | 189 ++--- tools/codegen/core/gen_static_metadata.py | 374 +++++----- tools/codegen/core/gen_stats_data.py | 705 +++++++++--------- tools/distrib/yapf_code.sh | 1 + 6 files changed, 777 insertions(+), 720 deletions(-) diff --git a/tools/codegen/core/gen_header_frame.py b/tools/codegen/core/gen_header_frame.py index 5375c14fd6b..7219d4dd866 100755 --- a/tools/codegen/core/gen_header_frame.py +++ b/tools/codegen/core/gen_header_frame.py @@ -13,7 +13,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Read from stdin a set of colon separated http headers: :path: /foo/bar content-type: application/grpc @@ -24,109 +23,118 @@ import json import sys import argparse + def append_never_indexed(payload_line, n, count, key, value): - payload_line.append(0x10) - assert(len(key) <= 126) - payload_line.append(len(key)) - payload_line.extend(ord(c) for c in key) - assert(len(value) <= 126) - payload_line.append(len(value)) - payload_line.extend(ord(c) for c in value) + payload_line.append(0x10) + assert (len(key) <= 126) + payload_line.append(len(key)) + payload_line.extend(ord(c) for c in key) + assert (len(value) <= 126) + payload_line.append(len(value)) + payload_line.extend(ord(c) for c in value) + def append_inc_indexed(payload_line, n, count, key, value): - payload_line.append(0x40) - assert(len(key) <= 126) - payload_line.append(len(key)) - payload_line.extend(ord(c) for c in key) - assert(len(value) <= 126) - payload_line.append(len(value)) - payload_line.extend(ord(c) for c in value) + payload_line.append(0x40) + assert (len(key) <= 126) + payload_line.append(len(key)) + payload_line.extend(ord(c) for c in key) + assert (len(value) <= 126) + payload_line.append(len(value)) + payload_line.extend(ord(c) for c in value) + def append_pre_indexed(payload_line, n, count, key, value): - payload_line.append(0x80 + 61 + count - n) + payload_line.append(0x80 + 61 + count - n) + _COMPRESSORS = { - 'never': append_never_indexed, - 'inc': append_inc_indexed, - 'pre': append_pre_indexed, + 'never': append_never_indexed, + 'inc': append_inc_indexed, + 'pre': append_pre_indexed, } argp = argparse.ArgumentParser('Generate header frames') -argp.add_argument('--set_end_stream', default=False, action='store_const', const=True) -argp.add_argument('--no_framing', default=False, action='store_const', const=True) -argp.add_argument('--compression', choices=sorted(_COMPRESSORS.keys()), default='never') +argp.add_argument( + '--set_end_stream', default=False, action='store_const', const=True) +argp.add_argument( + '--no_framing', default=False, action='store_const', const=True) +argp.add_argument( + '--compression', choices=sorted(_COMPRESSORS.keys()), default='never') argp.add_argument('--hex', default=False, action='store_const', const=True) args = argp.parse_args() # parse input, fill in vals vals = [] for line in sys.stdin: - line = line.strip() - if line == '': continue - if line[0] == '#': continue - key_tail, value = line[1:].split(':') - key = (line[0] + key_tail).strip() - value = value.strip() - vals.append((key, value)) + line = line.strip() + if line == '': continue + if line[0] == '#': continue + key_tail, value = line[1:].split(':') + key = (line[0] + key_tail).strip() + value = value.strip() + vals.append((key, value)) # generate frame payload binary data payload_bytes = [] if not args.no_framing: - payload_bytes.append([]) # reserve space for header + payload_bytes.append([]) # reserve space for header payload_len = 0 n = 0 for key, value in vals: - payload_line = [] - _COMPRESSORS[args.compression](payload_line, n, len(vals), key, value) - n += 1 - payload_len += len(payload_line) - payload_bytes.append(payload_line) + payload_line = [] + _COMPRESSORS[args.compression](payload_line, n, len(vals), key, value) + n += 1 + payload_len += len(payload_line) + payload_bytes.append(payload_line) # fill in header if not args.no_framing: - flags = 0x04 # END_HEADERS - if args.set_end_stream: - flags |= 0x01 # END_STREAM - payload_bytes[0].extend([ - (payload_len >> 16) & 0xff, - (payload_len >> 8) & 0xff, - (payload_len) & 0xff, - # header frame - 0x01, - # flags - flags, - # stream id - 0x00, - 0x00, - 0x00, - 0x01 - ]) + flags = 0x04 # END_HEADERS + if args.set_end_stream: + flags |= 0x01 # END_STREAM + payload_bytes[0].extend([ + (payload_len >> 16) & 0xff, + (payload_len >> 8) & 0xff, + (payload_len) & 0xff, + # header frame + 0x01, + # flags + flags, + # stream id + 0x00, + 0x00, + 0x00, + 0x01 + ]) hex_bytes = [ord(c) for c in "abcdefABCDEF0123456789"] + def esc_c(line): - out = "\"" - last_was_hex = False - for c in line: - if 32 <= c < 127: - if c in hex_bytes and last_was_hex: - out += "\"\"" - if c != ord('"'): - out += chr(c) - else: - out += "\\\"" - last_was_hex = False - else: - out += "\\x%02x" % c - last_was_hex = True - return out + "\"" + out = "\"" + last_was_hex = False + for c in line: + if 32 <= c < 127: + if c in hex_bytes and last_was_hex: + out += "\"\"" + if c != ord('"'): + out += chr(c) + else: + out += "\\\"" + last_was_hex = False + else: + out += "\\x%02x" % c + last_was_hex = True + return out + "\"" + # dump bytes if args.hex: - all_bytes = [] - for line in payload_bytes: - all_bytes.extend(line) - print '{%s}' % ', '.join('0x%02x' % c for c in all_bytes) + all_bytes = [] + for line in payload_bytes: + all_bytes.extend(line) + print '{%s}' % ', '.join('0x%02x' % c for c in all_bytes) else: - for line in payload_bytes: - print esc_c(line) + for line in payload_bytes: + print esc_c(line) diff --git a/tools/codegen/core/gen_server_registered_method_bad_client_test_body.py b/tools/codegen/core/gen_server_registered_method_bad_client_test_body.py index 8b5b618e8ea..fa87c974f97 100755 --- a/tools/codegen/core/gen_server_registered_method_bad_client_test_body.py +++ b/tools/codegen/core/gen_server_registered_method_bad_client_test_body.py @@ -14,48 +14,42 @@ # See the License for the specific language governing permissions and # limitations under the License. + def esc_c(line): - out = "\"" - last_was_hex = False - for c in line: - if 32 <= c < 127: - if c in hex_bytes and last_was_hex: - out += "\"\"" - if c != ord('"'): - out += chr(c) - else: - out += "\\\"" - last_was_hex = False - else: - out += "\\x%02x" % c - last_was_hex = True - return out + "\"" + out = "\"" + last_was_hex = False + for c in line: + if 32 <= c < 127: + if c in hex_bytes and last_was_hex: + out += "\"\"" + if c != ord('"'): + out += chr(c) + else: + out += "\\\"" + last_was_hex = False + else: + out += "\\x%02x" % c + last_was_hex = True + return out + "\"" + done = set() for message_length in range(0, 3): - for send_message_length in range(0, message_length + 1): - payload = [ - 0, - (message_length >> 24) & 0xff, - (message_length >> 16) & 0xff, - (message_length >> 8) & 0xff, - (message_length) & 0xff - ] + send_message_length * [0] - for frame_length in range(0, len(payload) + 1): - is_end = frame_length == len(payload) and send_message_length == message_length - frame = [ - (frame_length >> 16) & 0xff, - (frame_length >> 8) & 0xff, - (frame_length) & 0xff, - 0, - 1 if is_end else 0, - 0, 0, 0, 1 - ] + payload[0:frame_length] - text = esc_c(frame) - if text not in done: - print 'GRPC_RUN_BAD_CLIENT_TEST(verifier_%s, PFX_STR %s, %s);' % ( - 'succeeds' if is_end else 'fails', - text, - '0' if is_end else 'GRPC_BAD_CLIENT_DISCONNECT') - done.add(text) + for send_message_length in range(0, message_length + 1): + payload = [ + 0, (message_length >> 24) & 0xff, (message_length >> 16) & 0xff, + (message_length >> 8) & 0xff, (message_length) & 0xff + ] + send_message_length * [0] + for frame_length in range(0, len(payload) + 1): + is_end = frame_length == len( + payload) and send_message_length == message_length + frame = [(frame_length >> 16) & 0xff, (frame_length >> 8) & 0xff, + (frame_length) & 0xff, 0, 1 + if is_end else 0, 0, 0, 0, 1] + payload[0:frame_length] + text = esc_c(frame) + if text not in done: + print 'GRPC_RUN_BAD_CLIENT_TEST(verifier_%s, PFX_STR %s, %s);' % ( + 'succeeds' if is_end else 'fails', text, '0' + if is_end else 'GRPC_BAD_CLIENT_DISCONNECT') + done.add(text) diff --git a/tools/codegen/core/gen_settings_ids.py b/tools/codegen/core/gen_settings_ids.py index 481c4216a31..bc4380605a6 100755 --- a/tools/codegen/core/gen_settings_ids.py +++ b/tools/codegen/core/gen_settings_ids.py @@ -24,92 +24,114 @@ Setting = collections.namedtuple('Setting', 'id default min max on_error') OnError = collections.namedtuple('OnError', 'behavior code') clamp_invalid_value = OnError('CLAMP_INVALID_VALUE', 'PROTOCOL_ERROR') disconnect_on_invalid_value = lambda e: OnError('DISCONNECT_ON_INVALID_VALUE', e) -DecoratedSetting = collections.namedtuple('DecoratedSetting', 'enum name setting') +DecoratedSetting = collections.namedtuple('DecoratedSetting', + 'enum name setting') _SETTINGS = { - 'HEADER_TABLE_SIZE': Setting(1, 4096, 0, 0xffffffff, clamp_invalid_value), - 'ENABLE_PUSH': Setting(2, 1, 0, 1, disconnect_on_invalid_value('PROTOCOL_ERROR')), - 'MAX_CONCURRENT_STREAMS': Setting(3, 0xffffffff, 0, 0xffffffff, disconnect_on_invalid_value('PROTOCOL_ERROR')), - 'INITIAL_WINDOW_SIZE': Setting(4, 65535, 0, 0x7fffffff, disconnect_on_invalid_value('FLOW_CONTROL_ERROR')), - 'MAX_FRAME_SIZE': Setting(5, 16384, 16384, 16777215, disconnect_on_invalid_value('PROTOCOL_ERROR')), - 'MAX_HEADER_LIST_SIZE': Setting(6, _MAX_HEADER_LIST_SIZE, 0, _MAX_HEADER_LIST_SIZE, clamp_invalid_value), - 'GRPC_ALLOW_TRUE_BINARY_METADATA': Setting(0xfe03, 0, 0, 1, clamp_invalid_value), + 'HEADER_TABLE_SIZE': + Setting(1, 4096, 0, 0xffffffff, clamp_invalid_value), + 'ENABLE_PUSH': + Setting(2, 1, 0, 1, disconnect_on_invalid_value('PROTOCOL_ERROR')), + 'MAX_CONCURRENT_STREAMS': + Setting(3, 0xffffffff, 0, 0xffffffff, + disconnect_on_invalid_value('PROTOCOL_ERROR')), + 'INITIAL_WINDOW_SIZE': + Setting(4, 65535, 0, 0x7fffffff, + disconnect_on_invalid_value('FLOW_CONTROL_ERROR')), + 'MAX_FRAME_SIZE': + Setting(5, 16384, 16384, 16777215, + disconnect_on_invalid_value('PROTOCOL_ERROR')), + 'MAX_HEADER_LIST_SIZE': + Setting(6, _MAX_HEADER_LIST_SIZE, 0, _MAX_HEADER_LIST_SIZE, + clamp_invalid_value), + 'GRPC_ALLOW_TRUE_BINARY_METADATA': + Setting(0xfe03, 0, 0, 1, clamp_invalid_value), } H = open('src/core/ext/transport/chttp2/transport/http2_settings.h', 'w') C = open('src/core/ext/transport/chttp2/transport/http2_settings.c', 'w') + # utility: print a big comment block into a set of files def put_banner(files, banner): - for f in files: - print >>f, '/*' - for line in banner: - print >>f, ' * %s' % line - print >>f, ' */' - print >>f + for f in files: + print >> f, '/*' + for line in banner: + print >> f, ' * %s' % line + print >> f, ' */' + print >> f + # copy-paste copyright notice from this file with open(sys.argv[0]) as my_source: - copyright = [] - for line in my_source: - if line[0] != '#': break - for line in my_source: - if line[0] == '#': - copyright.append(line) - break - for line in my_source: - if line[0] != '#': - break - copyright.append(line) - put_banner([H,C], [line[2:].rstrip() for line in copyright]) - -put_banner([H,C], ["Automatically generated by tools/codegen/core/gen_settings_ids.py"]) - -print >>H, "#ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HTTP2_SETTINGS_H" -print >>H, "#define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HTTP2_SETTINGS_H" -print >>H -print >>H, "#include " -print >>H, "#include " -print >>H - -print >>C, "#include \"src/core/ext/transport/chttp2/transport/http2_settings.h\"" -print >>C -print >>C, "#include " -print >>C, "#include \"src/core/lib/transport/http2_errors.h\"" -print >>C + copyright = [] + for line in my_source: + if line[0] != '#': break + for line in my_source: + if line[0] == '#': + copyright.append(line) + break + for line in my_source: + if line[0] != '#': + break + copyright.append(line) + put_banner([H, C], [line[2:].rstrip() for line in copyright]) + +put_banner( + [H, C], + ["Automatically generated by tools/codegen/core/gen_settings_ids.py"]) + +print >> H, "#ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HTTP2_SETTINGS_H" +print >> H, "#define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HTTP2_SETTINGS_H" +print >> H +print >> H, "#include " +print >> H, "#include " +print >> H + +print >> C, "#include \"src/core/ext/transport/chttp2/transport/http2_settings.h\"" +print >> C +print >> C, "#include " +print >> C, "#include \"src/core/lib/transport/http2_errors.h\"" +print >> C p = perfection.hash_parameters(sorted(x.id for x in _SETTINGS.values())) print p + def hash(i): - i += p.offset - x = i % p.t - y = i / p.t - return x + p.r[y] + i += p.offset + x = i % p.t + y = i / p.t + return x + p.r[y] + -decorated_settings = [DecoratedSetting(hash(setting.id), name, setting) - for name, setting in _SETTINGS.iteritems()] +decorated_settings = [ + DecoratedSetting(hash(setting.id), name, setting) + for name, setting in _SETTINGS.iteritems() +] -print >>H, 'typedef enum {' +print >> H, 'typedef enum {' for decorated_setting in sorted(decorated_settings): - print >>H, ' GRPC_CHTTP2_SETTINGS_%s = %d, /* wire id %d */' % ( - decorated_setting.name, decorated_setting.enum, decorated_setting.setting.id) -print >>H, '} grpc_chttp2_setting_id;' -print >>H -print >>H, '#define GRPC_CHTTP2_NUM_SETTINGS %d' % (max(x.enum for x in decorated_settings) + 1) - -print >>H, 'extern const uint16_t grpc_setting_id_to_wire_id[];' -print >>C, 'const uint16_t grpc_setting_id_to_wire_id[] = {%s};' % ','.join( + print >> H, ' GRPC_CHTTP2_SETTINGS_%s = %d, /* wire id %d */' % ( + decorated_setting.name, decorated_setting.enum, + decorated_setting.setting.id) +print >> H, '} grpc_chttp2_setting_id;' +print >> H +print >> H, '#define GRPC_CHTTP2_NUM_SETTINGS %d' % ( + max(x.enum for x in decorated_settings) + 1) + +print >> H, 'extern const uint16_t grpc_setting_id_to_wire_id[];' +print >> C, 'const uint16_t grpc_setting_id_to_wire_id[] = {%s};' % ','.join( '%d' % s for s in p.slots) -print >>H -print >>H, "bool grpc_wire_id_to_setting_id(uint32_t wire_id, grpc_chttp2_setting_id *out);" +print >> H +print >> H, "bool grpc_wire_id_to_setting_id(uint32_t wire_id, grpc_chttp2_setting_id *out);" cgargs = { - 'r': ','.join('%d' % (r if r is not None else 0) for r in p.r), - 't': p.t, - 'offset': abs(p.offset), - 'offset_sign': '+' if p.offset > 0 else '-' - } -print >>C, """ + 'r': ','.join('%d' % (r if r is not None else 0) for r in p.r), + 't': p.t, + 'offset': abs(p.offset), + 'offset_sign': '+' if p.offset > 0 else '-' +} +print >> C, """ bool grpc_wire_id_to_setting_id(uint32_t wire_id, grpc_chttp2_setting_id *out) { uint32_t i = wire_id %(offset_sign)s %(offset)d; uint32_t x = i %% %(t)d; @@ -118,17 +140,17 @@ bool grpc_wire_id_to_setting_id(uint32_t wire_id, grpc_chttp2_setting_id *out) { switch (y) { """ % cgargs for i, r in enumerate(p.r): - if not r: continue - if r < 0: print >>C, 'case %d: h -= %d; break;' % (i, -r) - else: print >>C, 'case %d: h += %d; break;' % (i, r) -print >>C, """ + if not r: continue + if r < 0: print >> C, 'case %d: h -= %d; break;' % (i, -r) + else: print >> C, 'case %d: h += %d; break;' % (i, r) +print >> C, """ } *out = (grpc_chttp2_setting_id)h; return h < GPR_ARRAY_SIZE(grpc_setting_id_to_wire_id) && grpc_setting_id_to_wire_id[h] == wire_id; } """ % cgargs -print >>H, """ +print >> H, """ typedef enum { GRPC_CHTTP2_CLAMP_INVALID_VALUE, GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE @@ -145,25 +167,22 @@ typedef struct { extern const grpc_chttp2_setting_parameters grpc_chttp2_settings_parameters[GRPC_CHTTP2_NUM_SETTINGS]; """ -print >>C, "const grpc_chttp2_setting_parameters grpc_chttp2_settings_parameters[GRPC_CHTTP2_NUM_SETTINGS] = {" +print >> C, "const grpc_chttp2_setting_parameters grpc_chttp2_settings_parameters[GRPC_CHTTP2_NUM_SETTINGS] = {" i = 0 for decorated_setting in sorted(decorated_settings): - while i < decorated_setting.enum: - print >>C, "{NULL, 0, 0, 0, GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE, GRPC_HTTP2_PROTOCOL_ERROR}," + while i < decorated_setting.enum: + print >> C, "{NULL, 0, 0, 0, GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE, GRPC_HTTP2_PROTOCOL_ERROR}," + i += 1 + print >> C, "{\"%s\", %du, %du, %du, GRPC_CHTTP2_%s, GRPC_HTTP2_%s}," % ( + decorated_setting.name, decorated_setting.setting.default, + decorated_setting.setting.min, decorated_setting.setting.max, + decorated_setting.setting.on_error.behavior, + decorated_setting.setting.on_error.code,) i += 1 - print >>C, "{\"%s\", %du, %du, %du, GRPC_CHTTP2_%s, GRPC_HTTP2_%s}," % ( - decorated_setting.name, - decorated_setting.setting.default, - decorated_setting.setting.min, - decorated_setting.setting.max, - decorated_setting.setting.on_error.behavior, - decorated_setting.setting.on_error.code, - ) - i += 1 -print >>C, "};" - -print >>H -print >>H, "#endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HTTP2_SETTINGS_H */" +print >> C, "};" + +print >> H +print >> H, "#endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HTTP2_SETTINGS_H */" H.close() C.close() diff --git a/tools/codegen/core/gen_static_metadata.py b/tools/codegen/core/gen_static_metadata.py index 7847b8ed1de..c73cdc08161 100755 --- a/tools/codegen/core/gen_static_metadata.py +++ b/tools/codegen/core/gen_static_metadata.py @@ -172,65 +172,66 @@ STREAM_COMPRESSION_ALGORITHMS = [ 'gzip', ] + # utility: mangle the name of a config def mangle(elem, name=None): - xl = { - '-': '_', - ':': '', - '/': 'slash', - '.': 'dot', - ',': 'comma', - ' ': '_', - } + xl = { + '-': '_', + ':': '', + '/': 'slash', + '.': 'dot', + ',': 'comma', + ' ': '_', + } - def m0(x): - if not x: - return 'empty' - r = '' - for c in x: - put = xl.get(c, c.lower()) - if not put: - continue - last_is_underscore = r[-1] == '_' if r else True - if last_is_underscore and put == '_': - continue - elif len(put) > 1: - if not last_is_underscore: - r += '_' - r += put - r += '_' - else: - r += put - if r[-1] == '_': - r = r[:-1] - return r - - def n(default, name=name): - if name is None: - return 'grpc_%s_' % default - if name == '': - return '' - return 'grpc_%s_' % name - - if isinstance(elem, tuple): - return '%s%s_%s' % (n('mdelem'), m0(elem[0]), m0(elem[1])) - else: - return '%s%s' % (n('mdstr'), m0(elem)) + def m0(x): + if not x: + return 'empty' + r = '' + for c in x: + put = xl.get(c, c.lower()) + if not put: + continue + last_is_underscore = r[-1] == '_' if r else True + if last_is_underscore and put == '_': + continue + elif len(put) > 1: + if not last_is_underscore: + r += '_' + r += put + r += '_' + else: + r += put + if r[-1] == '_': + r = r[:-1] + return r + + def n(default, name=name): + if name is None: + return 'grpc_%s_' % default + if name == '': + return '' + return 'grpc_%s_' % name + + if isinstance(elem, tuple): + return '%s%s_%s' % (n('mdelem'), m0(elem[0]), m0(elem[1])) + else: + return '%s%s' % (n('mdstr'), m0(elem)) # utility: generate some hash value for a string def fake_hash(elem): - return hashlib.md5(elem).hexdigest()[0:8] + return hashlib.md5(elem).hexdigest()[0:8] # utility: print a big comment block into a set of files def put_banner(files, banner): - for f in files: - print >> f, '/*' - for line in banner: - print >> f, ' * %s' % line - print >> f, ' */' - print >> f + for f in files: + print >> f, '/*' + for line in banner: + print >> f, ' * %s' % line + print >> f, ' */' + print >> f # build a list of all the strings we need @@ -240,43 +241,43 @@ static_userdata = {} # put metadata batch callouts first, to make the check of if a static metadata # string is a callout trivial for elem, _ in METADATA_BATCH_CALLOUTS: - if elem not in all_strs: - all_strs.append(elem) -for elem in CONFIG: - if isinstance(elem, tuple): - if elem[0] not in all_strs: - all_strs.append(elem[0]) - if elem[1] not in all_strs: - all_strs.append(elem[1]) - if elem not in all_elems: - all_elems.append(elem) - else: if elem not in all_strs: - all_strs.append(elem) + all_strs.append(elem) +for elem in CONFIG: + if isinstance(elem, tuple): + if elem[0] not in all_strs: + all_strs.append(elem[0]) + if elem[1] not in all_strs: + all_strs.append(elem[1]) + if elem not in all_elems: + all_elems.append(elem) + else: + if elem not in all_strs: + all_strs.append(elem) compression_elems = [] for mask in range(1, 1 << len(COMPRESSION_ALGORITHMS)): - val = ','.join(COMPRESSION_ALGORITHMS[alg] - for alg in range(0, len(COMPRESSION_ALGORITHMS)) - if (1 << alg) & mask) - elem = ('grpc-accept-encoding', val) - if val not in all_strs: - all_strs.append(val) - if elem not in all_elems: - all_elems.append(elem) - compression_elems.append(elem) - static_userdata[elem] = 1 + (mask | 1) + val = ','.join(COMPRESSION_ALGORITHMS[alg] + for alg in range(0, len(COMPRESSION_ALGORITHMS)) + if (1 << alg) & mask) + elem = ('grpc-accept-encoding', val) + if val not in all_strs: + all_strs.append(val) + if elem not in all_elems: + all_elems.append(elem) + compression_elems.append(elem) + static_userdata[elem] = 1 + (mask | 1) stream_compression_elems = [] for mask in range(1, 1 << len(STREAM_COMPRESSION_ALGORITHMS)): - val = ','.join(STREAM_COMPRESSION_ALGORITHMS[alg] - for alg in range(0, len(STREAM_COMPRESSION_ALGORITHMS)) - if (1 << alg) & mask) - elem = ('accept-encoding', val) - if val not in all_strs: - all_strs.append(val) - if elem not in all_elems: - all_elems.append(elem) - stream_compression_elems.append(elem) - static_userdata[elem] = 1 + (mask | 1) + val = ','.join(STREAM_COMPRESSION_ALGORITHMS[alg] + for alg in range(0, len(STREAM_COMPRESSION_ALGORITHMS)) + if (1 << alg) & mask) + elem = ('accept-encoding', val) + if val not in all_strs: + all_strs.append(val) + if elem not in all_elems: + all_elems.append(elem) + stream_compression_elems.append(elem) + static_userdata[elem] = 1 + (mask | 1) # output configuration args = sys.argv[1:] @@ -284,62 +285,62 @@ H = None C = None D = None if args: - if 'header' in args: - H = sys.stdout - else: - H = open('/dev/null', 'w') - if 'source' in args: - C = sys.stdout - else: - C = open('/dev/null', 'w') - if 'dictionary' in args: - D = sys.stdout - else: - D = open('/dev/null', 'w') + if 'header' in args: + H = sys.stdout + else: + H = open('/dev/null', 'w') + if 'source' in args: + C = sys.stdout + else: + C = open('/dev/null', 'w') + if 'dictionary' in args: + D = sys.stdout + else: + D = open('/dev/null', 'w') else: - H = open( - os.path.join( - os.path.dirname(sys.argv[0]), - '../../../src/core/lib/transport/static_metadata.h'), 'w') - C = open( - os.path.join( - os.path.dirname(sys.argv[0]), - '../../../src/core/lib/transport/static_metadata.cc'), 'w') - D = open( - os.path.join( - os.path.dirname(sys.argv[0]), - '../../../test/core/end2end/fuzzers/hpack.dictionary'), 'w') + H = open( + os.path.join( + os.path.dirname(sys.argv[0]), + '../../../src/core/lib/transport/static_metadata.h'), 'w') + C = open( + os.path.join( + os.path.dirname(sys.argv[0]), + '../../../src/core/lib/transport/static_metadata.cc'), 'w') + D = open( + os.path.join( + os.path.dirname(sys.argv[0]), + '../../../test/core/end2end/fuzzers/hpack.dictionary'), 'w') # copy-paste copyright notice from this file with open(sys.argv[0]) as my_source: - copyright = [] - for line in my_source: - if line[0] != '#': - break - for line in my_source: - if line[0] == '#': - copyright.append(line) - break - for line in my_source: - if line[0] != '#': - break - copyright.append(line) - put_banner([H, C], [line[2:].rstrip() for line in copyright]) + copyright = [] + for line in my_source: + if line[0] != '#': + break + for line in my_source: + if line[0] == '#': + copyright.append(line) + break + for line in my_source: + if line[0] != '#': + break + copyright.append(line) + put_banner([H, C], [line[2:].rstrip() for line in copyright]) hex_bytes = [ord(c) for c in 'abcdefABCDEF0123456789'] def esc_dict(line): - out = "\"" - for c in line: - if 32 <= c < 127: - if c != ord('"'): - out += chr(c) - else: - out += "\\\"" - else: - out += '\\x%02X' % c - return out + "\"" + out = "\"" + for c in line: + if 32 <= c < 127: + if c != ord('"'): + out += chr(c) + else: + out += "\\\"" + else: + out += '\\x%02X' % c + return out + "\"" put_banner([H, C], """WARNING: Auto-generated code. @@ -369,27 +370,26 @@ print >> C str_ofs = 0 id2strofs = {} for i, elem in enumerate(all_strs): - id2strofs[i] = str_ofs - str_ofs += len(elem) + id2strofs[i] = str_ofs + str_ofs += len(elem) def slice_def(i): - return ('{&grpc_static_metadata_refcounts[%d],' - ' {{g_bytes+%d, %d}}}') % ( - i, id2strofs[i], len(all_strs[i])) + return ('{&grpc_static_metadata_refcounts[%d],' + ' {{g_bytes+%d, %d}}}') % (i, id2strofs[i], len(all_strs[i])) # validate configuration for elem, _ in METADATA_BATCH_CALLOUTS: - assert elem in all_strs + assert elem in all_strs print >> H, '#define GRPC_STATIC_MDSTR_COUNT %d' % len(all_strs) print >> H, ('extern const grpc_slice ' 'grpc_static_slice_table[GRPC_STATIC_MDSTR_COUNT];') for i, elem in enumerate(all_strs): - print >> H, '/* "%s" */' % elem - print >> H, '#define %s (grpc_static_slice_table[%d])' % ( - mangle(elem).upper(), i) + print >> H, '/* "%s" */' % elem + print >> H, '#define %s (grpc_static_slice_table[%d])' % ( + mangle(elem).upper(), i) print >> H print >> C, 'static uint8_t g_bytes[] = {%s};' % ( ','.join('%d' % ord(c) for c in ''.join(all_strs))) @@ -411,7 +411,7 @@ print >> H, ('extern grpc_slice_refcount ' print >> C, ('grpc_slice_refcount ' 'grpc_static_metadata_refcounts[GRPC_STATIC_MDSTR_COUNT] = {') for i, elem in enumerate(all_strs): - print >> C, ' {&grpc_static_metadata_vtable, &static_sub_refcnt},' + print >> C, ' {&grpc_static_metadata_vtable, &static_sub_refcnt},' print >> C, '};' print >> C print >> H, '#define GRPC_IS_STATIC_METADATA_STRING(slice) \\' @@ -421,7 +421,7 @@ print >> H print >> C, ('const grpc_slice grpc_static_slice_table[GRPC_STATIC_MDSTR_COUNT]' ' = {') for i, elem in enumerate(all_strs): - print >> C, slice_def(i) + ',' + print >> C, slice_def(i) + ',' print >> C, '};' print >> C print >> H, '#define GRPC_STATIC_METADATA_INDEX(static_slice) \\' @@ -431,10 +431,10 @@ print >> H print >> D, '# hpack fuzzing dictionary' for i, elem in enumerate(all_strs): - print >> D, '%s' % (esc_dict([len(elem)] + [ord(c) for c in elem])) + print >> D, '%s' % (esc_dict([len(elem)] + [ord(c) for c in elem])) for i, elem in enumerate(all_elems): - print >> D, '%s' % (esc_dict([0, len(elem[0])] + [ord(c) for c in elem[0]] + - [len(elem[1])] + [ord(c) for c in elem[1]])) + print >> D, '%s' % (esc_dict([0, len(elem[0])] + [ord(c) for c in elem[0]] + + [len(elem[1])] + [ord(c) for c in elem[1]])) print >> H, '#define GRPC_STATIC_MDELEM_COUNT %d' % len(all_elems) print >> H, ('extern grpc_mdelem_data ' @@ -442,10 +442,9 @@ print >> H, ('extern grpc_mdelem_data ' print >> H, ('extern uintptr_t ' 'grpc_static_mdelem_user_data[GRPC_STATIC_MDELEM_COUNT];') for i, elem in enumerate(all_elems): - print >> H, '/* "%s": "%s" */' % elem - print >> H, ('#define %s (GRPC_MAKE_MDELEM(&grpc_static_mdelem_table[%d], ' - 'GRPC_MDELEM_STORAGE_STATIC))') % ( - mangle(elem).upper(), i) + print >> H, '/* "%s": "%s" */' % elem + print >> H, ('#define %s (GRPC_MAKE_MDELEM(&grpc_static_mdelem_table[%d], ' + 'GRPC_MDELEM_STORAGE_STATIC))') % (mangle(elem).upper(), i) print >> H print >> C, ('uintptr_t grpc_static_mdelem_user_data[GRPC_STATIC_MDELEM_COUNT] ' '= {') @@ -456,42 +455,38 @@ print >> C def str_idx(s): - for i, s2 in enumerate(all_strs): - if s == s2: - return i + for i, s2 in enumerate(all_strs): + if s == s2: + return i def md_idx(m): - for i, m2 in enumerate(all_elems): - if m == m2: - return i + for i, m2 in enumerate(all_elems): + if m == m2: + return i def offset_trials(mink): - yield 0 - for i in range(1, 100): - for mul in [-1, 1]: - yield mul * i + yield 0 + for i in range(1, 100): + for mul in [-1, 1]: + yield mul * i def perfect_hash(keys, name): - p = perfection.hash_parameters(keys) - - def f(i, p=p): - i += p.offset - x = i % p.t - y = i / p.t - return x + p.r[y] - - return { - 'PHASHRANGE': - p.t - 1 + max(p.r), - 'PHASHNKEYS': - len(p.slots), - 'pyfunc': - f, - 'code': - """ + p = perfection.hash_parameters(keys) + + def f(i, p=p): + i += p.offset + x = i % p.t + y = i / p.t + return x + p.r[y] + + return { + 'PHASHRANGE': p.t - 1 + max(p.r), + 'PHASHNKEYS': len(p.slots), + 'pyfunc': f, + 'code': """ static const int8_t %(name)s_r[] = {%(r)s}; static uint32_t %(name)s_phash(uint32_t i) { i %(offset_sign)s= %(offset)d; @@ -505,13 +500,13 @@ static uint32_t %(name)s_phash(uint32_t i) { return h; } """ % { - 'name': name, - 'r': ','.join('%d' % (r if r is not None else 0) for r in p.r), - 't': p.t, - 'offset': abs(p.offset), - 'offset_sign': '+' if p.offset > 0 else '-' + 'name': name, + 'r': ','.join('%d' % (r if r is not None else 0) for r in p.r), + 't': p.t, + 'offset': abs(p.offset), + 'offset_sign': '+' if p.offset > 0 else '-' + } } - } elem_keys = [ @@ -523,14 +518,14 @@ print >> C, elem_hash['code'] keys = [0] * int(elem_hash['PHASHRANGE']) idxs = [255] * int(elem_hash['PHASHNKEYS']) for i, k in enumerate(elem_keys): - h = elem_hash['pyfunc'](k) - assert keys[h] == 0 - keys[h] = k - idxs[h] = i + h = elem_hash['pyfunc'](k) + assert keys[h] == 0 + keys[h] = k + idxs[h] = i print >> C, 'static const uint16_t elem_keys[] = {%s};' % ','.join( '%d' % k for k in keys) -print >> C, 'static const uint8_t elem_idxs[] = {%s};' % ','.join( - '%d' % i for i in idxs) +print >> C, 'static const uint8_t elem_idxs[] = {%s};' % ','.join('%d' % i + for i in idxs) print >> C print >> H, 'grpc_mdelem grpc_static_mdelem_for_static_strings(int a, int b);' @@ -544,12 +539,12 @@ print >> C print >> C, 'grpc_mdelem_data grpc_static_mdelem_table[GRPC_STATIC_MDELEM_COUNT] = {' for a, b in all_elems: - print >> C, '{%s,%s},' % (slice_def(str_idx(a)), slice_def(str_idx(b))) + print >> C, '{%s,%s},' % (slice_def(str_idx(a)), slice_def(str_idx(b))) print >> C, '};' print >> H, 'typedef enum {' for elem, _ in METADATA_BATCH_CALLOUTS: - print >> H, ' %s,' % mangle(elem, 'batch').upper() + print >> H, ' %s,' % mangle(elem, 'batch').upper() print >> H, ' GRPC_BATCH_CALLOUTS_COUNT' print >> H, '} grpc_metadata_batch_callouts_index;' print >> H @@ -557,7 +552,7 @@ print >> H, 'typedef union {' print >> H, ' struct grpc_linked_mdelem *array[GRPC_BATCH_CALLOUTS_COUNT];' print >> H, ' struct {' for elem, _ in METADATA_BATCH_CALLOUTS: - print >> H, ' struct grpc_linked_mdelem *%s;' % mangle(elem, '').lower() + print >> H, ' struct grpc_linked_mdelem *%s;' % mangle(elem, '').lower() print >> H, ' } named;' print >> H, '} grpc_metadata_batch_callouts;' print >> H @@ -569,7 +564,7 @@ print >> H, ('extern bool grpc_static_callout_is_default[' print >> H print >> C, 'bool grpc_static_callout_is_default[GRPC_BATCH_CALLOUTS_COUNT] = {' for elem, is_default in METADATA_BATCH_CALLOUTS: - print >> C, ' %s, // %s' % (str(is_default).lower(), elem) + print >> C, ' %s, // %s' % (str(is_default).lower(), elem) print >> C, '};' print >> C @@ -588,7 +583,8 @@ print >> H, 'extern const uint8_t grpc_static_accept_stream_encoding_metadata[%d 1 << len(STREAM_COMPRESSION_ALGORITHMS)) print >> C, 'const uint8_t grpc_static_accept_stream_encoding_metadata[%d] = {' % ( 1 << len(STREAM_COMPRESSION_ALGORITHMS)) -print >> C, '0,%s' % ','.join('%d' % md_idx(elem) for elem in stream_compression_elems) +print >> C, '0,%s' % ','.join('%d' % md_idx(elem) + for elem in stream_compression_elems) print >> C, '};' print >> H, '#define GRPC_MDELEM_ACCEPT_STREAM_ENCODING_FOR_ALGORITHMS(algs) (GRPC_MAKE_MDELEM(&grpc_static_mdelem_table[grpc_static_accept_stream_encoding_metadata[(algs)]], GRPC_MDELEM_STORAGE_STATIC))' diff --git a/tools/codegen/core/gen_stats_data.py b/tools/codegen/core/gen_stats_data.py index d439d99a8c6..4fd9fa437e3 100755 --- a/tools/codegen/core/gen_stats_data.py +++ b/tools/codegen/core/gen_stats_data.py @@ -22,397 +22,436 @@ import yaml import json with open('src/core/lib/debug/stats_data.yaml') as f: - attrs = yaml.load(f.read()) + attrs = yaml.load(f.read()) REQUIRED_FIELDS = ['name', 'doc'] + def make_type(name, fields): - return (collections.namedtuple(name, ' '.join(list(set(REQUIRED_FIELDS + fields)))), []) + return (collections.namedtuple( + name, ' '.join(list(set(REQUIRED_FIELDS + fields)))), []) + def c_str(s, encoding='ascii'): - if isinstance(s, unicode): - s = s.encode(encoding) - result = '' - for c in s: - if not (32 <= ord(c) < 127) or c in ('\\', '"'): - result += '\\%03o' % ord(c) - else: - result += c - return '"' + result + '"' - -types = ( - make_type('Counter', []), - make_type('Histogram', ['max', 'buckets']), -) + if isinstance(s, unicode): + s = s.encode(encoding) + result = '' + for c in s: + if not (32 <= ord(c) < 127) or c in ('\\', '"'): + result += '\\%03o' % ord(c) + else: + result += c + return '"' + result + '"' + + +types = (make_type('Counter', []), make_type('Histogram', ['max', 'buckets']),) inst_map = dict((t[0].__name__, t[1]) for t in types) stats = [] for attr in attrs: - found = False - for t, lst in types: - t_name = t.__name__.lower() - if t_name in attr: - name = attr[t_name] - del attr[t_name] - lst.append(t(name=name, **attr)) - found = True - break - assert found, "Bad decl: %s" % attr + found = False + for t, lst in types: + t_name = t.__name__.lower() + if t_name in attr: + name = attr[t_name] + del attr[t_name] + lst.append(t(name=name, **attr)) + found = True + break + assert found, "Bad decl: %s" % attr + def dbl2u64(d): - return ctypes.c_ulonglong.from_buffer(ctypes.c_double(d)).value + return ctypes.c_ulonglong.from_buffer(ctypes.c_double(d)).value + def shift_works_until(mapped_bounds, shift_bits): - for i, ab in enumerate(zip(mapped_bounds, mapped_bounds[1:])): - a, b = ab - if (a >> shift_bits) == (b >> shift_bits): - return i - return len(mapped_bounds) + for i, ab in enumerate(zip(mapped_bounds, mapped_bounds[1:])): + a, b = ab + if (a >> shift_bits) == (b >> shift_bits): + return i + return len(mapped_bounds) + def find_ideal_shift(mapped_bounds, max_size): - best = None - for shift_bits in reversed(range(0,64)): - n = shift_works_until(mapped_bounds, shift_bits) - if n == 0: continue - table_size = mapped_bounds[n-1] >> shift_bits - if table_size > max_size: continue - if table_size > 65535: continue - if best is None: - best = (shift_bits, n, table_size) - elif best[1] < n: - best = (shift_bits, n, table_size) - print best - return best + best = None + for shift_bits in reversed(range(0, 64)): + n = shift_works_until(mapped_bounds, shift_bits) + if n == 0: continue + table_size = mapped_bounds[n - 1] >> shift_bits + if table_size > max_size: continue + if table_size > 65535: continue + if best is None: + best = (shift_bits, n, table_size) + elif best[1] < n: + best = (shift_bits, n, table_size) + print best + return best + def gen_map_table(mapped_bounds, shift_data): - tbl = [] - cur = 0 - print mapped_bounds - mapped_bounds = [x >> shift_data[0] for x in mapped_bounds] - print mapped_bounds - for i in range(0, mapped_bounds[shift_data[1]-1]): - while i > mapped_bounds[cur]: - cur += 1 - tbl.append(cur) - return tbl + tbl = [] + cur = 0 + print mapped_bounds + mapped_bounds = [x >> shift_data[0] for x in mapped_bounds] + print mapped_bounds + for i in range(0, mapped_bounds[shift_data[1] - 1]): + while i > mapped_bounds[cur]: + cur += 1 + tbl.append(cur) + return tbl + static_tables = [] + def decl_static_table(values, type): - global static_tables - v = (type, values) - for i, vp in enumerate(static_tables): - if v == vp: return i - print "ADD TABLE: %s %r" % (type, values) - r = len(static_tables) - static_tables.append(v) - return r + global static_tables + v = (type, values) + for i, vp in enumerate(static_tables): + if v == vp: return i + print "ADD TABLE: %s %r" % (type, values) + r = len(static_tables) + static_tables.append(v) + return r + def type_for_uint_table(table): - mv = max(table) - if mv < 2**8: - return 'uint8_t' - elif mv < 2**16: - return 'uint16_t' - elif mv < 2**32: - return 'uint32_t' - else: - return 'uint64_t' + mv = max(table) + if mv < 2**8: + return 'uint8_t' + elif mv < 2**16: + return 'uint16_t' + elif mv < 2**32: + return 'uint32_t' + else: + return 'uint64_t' + def gen_bucket_code(histogram): - bounds = [0, 1] - done_trivial = False - done_unmapped = False - first_nontrivial = None - first_unmapped = None - while len(bounds) < histogram.buckets + 1: - if len(bounds) == histogram.buckets: - nextb = int(histogram.max) + bounds = [0, 1] + done_trivial = False + done_unmapped = False + first_nontrivial = None + first_unmapped = None + while len(bounds) < histogram.buckets + 1: + if len(bounds) == histogram.buckets: + nextb = int(histogram.max) + else: + mul = math.pow( + float(histogram.max) / bounds[-1], + 1.0 / (histogram.buckets + 1 - len(bounds))) + nextb = int(math.ceil(bounds[-1] * mul)) + if nextb <= bounds[-1] + 1: + nextb = bounds[-1] + 1 + elif not done_trivial: + done_trivial = True + first_nontrivial = len(bounds) + bounds.append(nextb) + bounds_idx = decl_static_table(bounds, 'int') + if done_trivial: + first_nontrivial_code = dbl2u64(first_nontrivial) + code_bounds = [dbl2u64(x) - first_nontrivial_code for x in bounds] + shift_data = find_ideal_shift(code_bounds[first_nontrivial:], 256 * + histogram.buckets) + #print first_nontrivial, shift_data, bounds + #if shift_data is not None: print [hex(x >> shift_data[0]) for x in code_bounds[first_nontrivial:]] + code = 'value = GPR_CLAMP(value, 0, %d);\n' % histogram.max + map_table = gen_map_table(code_bounds[first_nontrivial:], shift_data) + if first_nontrivial is None: + code += ('GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_%s, value);\n' % + histogram.name.upper()) else: - mul = math.pow(float(histogram.max) / bounds[-1], - 1.0 / (histogram.buckets + 1 - len(bounds))) - nextb = int(math.ceil(bounds[-1] * mul)) - if nextb <= bounds[-1] + 1: - nextb = bounds[-1] + 1 - elif not done_trivial: - done_trivial = True - first_nontrivial = len(bounds) - bounds.append(nextb) - bounds_idx = decl_static_table(bounds, 'int') - if done_trivial: - first_nontrivial_code = dbl2u64(first_nontrivial) - code_bounds = [dbl2u64(x) - first_nontrivial_code for x in bounds] - shift_data = find_ideal_shift(code_bounds[first_nontrivial:], 256 * histogram.buckets) - #print first_nontrivial, shift_data, bounds - #if shift_data is not None: print [hex(x >> shift_data[0]) for x in code_bounds[first_nontrivial:]] - code = 'value = GPR_CLAMP(value, 0, %d);\n' % histogram.max - map_table = gen_map_table(code_bounds[first_nontrivial:], shift_data) - if first_nontrivial is None: - code += ('GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_%s, value);\n' - % histogram.name.upper()) - else: - code += 'if (value < %d) {\n' % first_nontrivial - code += ('GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_%s, value);\n' - % histogram.name.upper()) - code += 'return;\n' - code += '}' - first_nontrivial_code = dbl2u64(first_nontrivial) - if shift_data is not None: - map_table_idx = decl_static_table(map_table, type_for_uint_table(map_table)) - code += 'union { double dbl; uint64_t uint; } _val, _bkt;\n' - code += '_val.dbl = value;\n' - code += 'if (_val.uint < %dull) {\n' % ((map_table[-1] << shift_data[0]) + first_nontrivial_code) - code += 'int bucket = ' - code += 'grpc_stats_table_%d[((_val.uint - %dull) >> %d)] + %d;\n' % (map_table_idx, first_nontrivial_code, shift_data[0], first_nontrivial) - code += '_bkt.dbl = grpc_stats_table_%d[bucket];\n' % bounds_idx - code += 'bucket -= (_val.uint < _bkt.uint);\n' - code += 'GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_%s, bucket);\n' % histogram.name.upper() - code += 'return;\n' - code += '}\n' - code += 'GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_%s, '% histogram.name.upper() - code += 'grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_%d, %d));\n' % (bounds_idx, histogram.buckets) - return (code, bounds_idx) + code += 'if (value < %d) {\n' % first_nontrivial + code += ('GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_%s, value);\n' % + histogram.name.upper()) + code += 'return;\n' + code += '}' + first_nontrivial_code = dbl2u64(first_nontrivial) + if shift_data is not None: + map_table_idx = decl_static_table(map_table, + type_for_uint_table(map_table)) + code += 'union { double dbl; uint64_t uint; } _val, _bkt;\n' + code += '_val.dbl = value;\n' + code += 'if (_val.uint < %dull) {\n' % ( + (map_table[-1] << shift_data[0]) + first_nontrivial_code) + code += 'int bucket = ' + code += 'grpc_stats_table_%d[((_val.uint - %dull) >> %d)] + %d;\n' % ( + map_table_idx, first_nontrivial_code, shift_data[0], + first_nontrivial) + code += '_bkt.dbl = grpc_stats_table_%d[bucket];\n' % bounds_idx + code += 'bucket -= (_val.uint < _bkt.uint);\n' + code += 'GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_%s, bucket);\n' % histogram.name.upper( + ) + code += 'return;\n' + code += '}\n' + code += 'GRPC_STATS_INC_HISTOGRAM(GRPC_STATS_HISTOGRAM_%s, ' % histogram.name.upper( + ) + code += 'grpc_stats_histo_find_bucket_slow(value, grpc_stats_table_%d, %d));\n' % ( + bounds_idx, histogram.buckets) + return (code, bounds_idx) + # utility: print a big comment block into a set of files def put_banner(files, banner): - for f in files: - print >>f, '/*' - for line in banner: - print >>f, ' * %s' % line - print >>f, ' */' - print >>f + for f in files: + print >> f, '/*' + for line in banner: + print >> f, ' * %s' % line + print >> f, ' */' + print >> f + with open('src/core/lib/debug/stats_data.h', 'w') as H: - # copy-paste copyright notice from this file - with open(sys.argv[0]) as my_source: - copyright = [] - for line in my_source: - if line[0] != '#': break - for line in my_source: - if line[0] == '#': - copyright.append(line) - break - for line in my_source: - if line[0] != '#': - break - copyright.append(line) - put_banner([H], [line[2:].rstrip() for line in copyright]) - - put_banner([H], ["Automatically generated by tools/codegen/core/gen_stats_data.py"]) - - print >>H, "#ifndef GRPC_CORE_LIB_DEBUG_STATS_DATA_H" - print >>H, "#define GRPC_CORE_LIB_DEBUG_STATS_DATA_H" - print >>H - print >>H, "#include " - print >>H, "#include \"src/core/lib/iomgr/exec_ctx.h\"" - print >>H - print >>H, "#ifdef __cplusplus" - print >>H, "extern \"C\" {" - print >>H, "#endif" - print >>H - - for typename, instances in sorted(inst_map.items()): - print >>H, "typedef enum {" - for inst in instances: - print >>H, " GRPC_STATS_%s_%s," % (typename.upper(), inst.name.upper()) - print >>H, " GRPC_STATS_%s_COUNT" % (typename.upper()) - print >>H, "} grpc_stats_%ss;" % (typename.lower()) - print >>H, "extern const char *grpc_stats_%s_name[GRPC_STATS_%s_COUNT];" % ( - typename.lower(), typename.upper()) - print >>H, "extern const char *grpc_stats_%s_doc[GRPC_STATS_%s_COUNT];" % ( - typename.lower(), typename.upper()) - - histo_start = [] - histo_buckets = [] - histo_bucket_boundaries = [] - - print >>H, "typedef enum {" - first_slot = 0 - for histogram in inst_map['Histogram']: - histo_start.append(first_slot) - histo_buckets.append(histogram.buckets) - print >>H, " GRPC_STATS_HISTOGRAM_%s_FIRST_SLOT = %d," % (histogram.name.upper(), first_slot) - print >>H, " GRPC_STATS_HISTOGRAM_%s_BUCKETS = %d," % (histogram.name.upper(), histogram.buckets) - first_slot += histogram.buckets - print >>H, " GRPC_STATS_HISTOGRAM_BUCKETS = %d" % first_slot - print >>H, "} grpc_stats_histogram_constants;" - - for ctr in inst_map['Counter']: - print >>H, ("#define GRPC_STATS_INC_%s() " + - "GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_%s)") % ( - ctr.name.upper(), ctr.name.upper()) - for histogram in inst_map['Histogram']: - print >>H, "#define GRPC_STATS_INC_%s(value) grpc_stats_inc_%s( (int)(value))" % ( - histogram.name.upper(), histogram.name.lower()) - print >>H, "void grpc_stats_inc_%s(int x);" % histogram.name.lower() - - for i, tbl in enumerate(static_tables): - print >>H, "extern const %s grpc_stats_table_%d[%d];" % (tbl[0], i, len(tbl[1])) - - print >>H, "extern const int grpc_stats_histo_buckets[%d];" % len(inst_map['Histogram']) - print >>H, "extern const int grpc_stats_histo_start[%d];" % len(inst_map['Histogram']) - print >>H, "extern const int *const grpc_stats_histo_bucket_boundaries[%d];" % len(inst_map['Histogram']) - print >>H, "extern void (*const grpc_stats_inc_histogram[%d])(int x);" % len(inst_map['Histogram']) - - print >>H - print >>H, "#ifdef __cplusplus" - print >>H, "}" - print >>H, "#endif" - print >>H - print >>H, "#endif /* GRPC_CORE_LIB_DEBUG_STATS_DATA_H */" + # copy-paste copyright notice from this file + with open(sys.argv[0]) as my_source: + copyright = [] + for line in my_source: + if line[0] != '#': break + for line in my_source: + if line[0] == '#': + copyright.append(line) + break + for line in my_source: + if line[0] != '#': + break + copyright.append(line) + put_banner([H], [line[2:].rstrip() for line in copyright]) + + put_banner( + [H], + ["Automatically generated by tools/codegen/core/gen_stats_data.py"]) + + print >> H, "#ifndef GRPC_CORE_LIB_DEBUG_STATS_DATA_H" + print >> H, "#define GRPC_CORE_LIB_DEBUG_STATS_DATA_H" + print >> H + print >> H, "#include " + print >> H, "#include \"src/core/lib/iomgr/exec_ctx.h\"" + print >> H + print >> H, "#ifdef __cplusplus" + print >> H, "extern \"C\" {" + print >> H, "#endif" + print >> H + + for typename, instances in sorted(inst_map.items()): + print >> H, "typedef enum {" + for inst in instances: + print >> H, " GRPC_STATS_%s_%s," % (typename.upper(), + inst.name.upper()) + print >> H, " GRPC_STATS_%s_COUNT" % (typename.upper()) + print >> H, "} grpc_stats_%ss;" % (typename.lower()) + print >> H, "extern const char *grpc_stats_%s_name[GRPC_STATS_%s_COUNT];" % ( + typename.lower(), typename.upper()) + print >> H, "extern const char *grpc_stats_%s_doc[GRPC_STATS_%s_COUNT];" % ( + typename.lower(), typename.upper()) + + histo_start = [] + histo_buckets = [] + histo_bucket_boundaries = [] + + print >> H, "typedef enum {" + first_slot = 0 + for histogram in inst_map['Histogram']: + histo_start.append(first_slot) + histo_buckets.append(histogram.buckets) + print >> H, " GRPC_STATS_HISTOGRAM_%s_FIRST_SLOT = %d," % ( + histogram.name.upper(), first_slot) + print >> H, " GRPC_STATS_HISTOGRAM_%s_BUCKETS = %d," % ( + histogram.name.upper(), histogram.buckets) + first_slot += histogram.buckets + print >> H, " GRPC_STATS_HISTOGRAM_BUCKETS = %d" % first_slot + print >> H, "} grpc_stats_histogram_constants;" + + for ctr in inst_map['Counter']: + print >> H, ("#define GRPC_STATS_INC_%s() " + + "GRPC_STATS_INC_COUNTER(GRPC_STATS_COUNTER_%s)") % ( + ctr.name.upper(), ctr.name.upper()) + for histogram in inst_map['Histogram']: + print >> H, "#define GRPC_STATS_INC_%s(value) grpc_stats_inc_%s( (int)(value))" % ( + histogram.name.upper(), histogram.name.lower()) + print >> H, "void grpc_stats_inc_%s(int x);" % histogram.name.lower() + + for i, tbl in enumerate(static_tables): + print >> H, "extern const %s grpc_stats_table_%d[%d];" % (tbl[0], i, + len(tbl[1])) + + print >> H, "extern const int grpc_stats_histo_buckets[%d];" % len( + inst_map['Histogram']) + print >> H, "extern const int grpc_stats_histo_start[%d];" % len( + inst_map['Histogram']) + print >> H, "extern const int *const grpc_stats_histo_bucket_boundaries[%d];" % len( + inst_map['Histogram']) + print >> H, "extern void (*const grpc_stats_inc_histogram[%d])(int x);" % len( + inst_map['Histogram']) + + print >> H + print >> H, "#ifdef __cplusplus" + print >> H, "}" + print >> H, "#endif" + print >> H + print >> H, "#endif /* GRPC_CORE_LIB_DEBUG_STATS_DATA_H */" with open('src/core/lib/debug/stats_data.cc', 'w') as C: - # copy-paste copyright notice from this file - with open(sys.argv[0]) as my_source: - copyright = [] - for line in my_source: - if line[0] != '#': break - for line in my_source: - if line[0] == '#': - copyright.append(line) - break - for line in my_source: - if line[0] != '#': - break - copyright.append(line) - put_banner([C], [line[2:].rstrip() for line in copyright]) - - put_banner([C], ["Automatically generated by tools/codegen/core/gen_stats_data.py"]) - - print >>C, "#include \"src/core/lib/debug/stats_data.h\"" - print >>C, "#include \"src/core/lib/debug/stats.h\"" - print >>C, "#include \"src/core/lib/iomgr/exec_ctx.h\"" - print >>C, "#include " - - histo_code = [] - for histogram in inst_map['Histogram']: - code, bounds_idx = gen_bucket_code(histogram) - histo_bucket_boundaries.append(bounds_idx) - histo_code.append(code) - - for typename, instances in sorted(inst_map.items()): - print >>C, "const char *grpc_stats_%s_name[GRPC_STATS_%s_COUNT] = {" % ( - typename.lower(), typename.upper()) - for inst in instances: - print >>C, " %s," % c_str(inst.name) - print >>C, "};" - print >>C, "const char *grpc_stats_%s_doc[GRPC_STATS_%s_COUNT] = {" % ( - typename.lower(), typename.upper()) - for inst in instances: - print >>C, " %s," % c_str(inst.doc) - print >>C, "};" - - for i, tbl in enumerate(static_tables): - print >>C, "const %s grpc_stats_table_%d[%d] = {%s};" % ( - tbl[0], i, len(tbl[1]), ','.join('%s' % x for x in tbl[1])) - - for histogram, code in zip(inst_map['Histogram'], histo_code): - print >>C, ("void grpc_stats_inc_%s(int value) {%s}") % ( - histogram.name.lower(), - code) - - print >>C, "const int grpc_stats_histo_buckets[%d] = {%s};" % ( - len(inst_map['Histogram']), ','.join('%s' % x for x in histo_buckets)) - print >>C, "const int grpc_stats_histo_start[%d] = {%s};" % ( - len(inst_map['Histogram']), ','.join('%s' % x for x in histo_start)) - print >>C, "const int *const grpc_stats_histo_bucket_boundaries[%d] = {%s};" % ( - len(inst_map['Histogram']), ','.join('grpc_stats_table_%d' % x for x in histo_bucket_boundaries)) - print >>C, "void (*const grpc_stats_inc_histogram[%d])(int x) = {%s};" % ( - len(inst_map['Histogram']), ','.join('grpc_stats_inc_%s' % histogram.name.lower() for histogram in inst_map['Histogram'])) + # copy-paste copyright notice from this file + with open(sys.argv[0]) as my_source: + copyright = [] + for line in my_source: + if line[0] != '#': break + for line in my_source: + if line[0] == '#': + copyright.append(line) + break + for line in my_source: + if line[0] != '#': + break + copyright.append(line) + put_banner([C], [line[2:].rstrip() for line in copyright]) + + put_banner( + [C], + ["Automatically generated by tools/codegen/core/gen_stats_data.py"]) + + print >> C, "#include \"src/core/lib/debug/stats_data.h\"" + print >> C, "#include \"src/core/lib/debug/stats.h\"" + print >> C, "#include \"src/core/lib/iomgr/exec_ctx.h\"" + print >> C, "#include " + + histo_code = [] + for histogram in inst_map['Histogram']: + code, bounds_idx = gen_bucket_code(histogram) + histo_bucket_boundaries.append(bounds_idx) + histo_code.append(code) + + for typename, instances in sorted(inst_map.items()): + print >> C, "const char *grpc_stats_%s_name[GRPC_STATS_%s_COUNT] = {" % ( + typename.lower(), typename.upper()) + for inst in instances: + print >> C, " %s," % c_str(inst.name) + print >> C, "};" + print >> C, "const char *grpc_stats_%s_doc[GRPC_STATS_%s_COUNT] = {" % ( + typename.lower(), typename.upper()) + for inst in instances: + print >> C, " %s," % c_str(inst.doc) + print >> C, "};" + + for i, tbl in enumerate(static_tables): + print >> C, "const %s grpc_stats_table_%d[%d] = {%s};" % ( + tbl[0], i, len(tbl[1]), ','.join('%s' % x for x in tbl[1])) + + for histogram, code in zip(inst_map['Histogram'], histo_code): + print >> C, ("void grpc_stats_inc_%s(int value) {%s}") % ( + histogram.name.lower(), code) + + print >> C, "const int grpc_stats_histo_buckets[%d] = {%s};" % ( + len(inst_map['Histogram']), ','.join('%s' % x for x in histo_buckets)) + print >> C, "const int grpc_stats_histo_start[%d] = {%s};" % ( + len(inst_map['Histogram']), ','.join('%s' % x for x in histo_start)) + print >> C, "const int *const grpc_stats_histo_bucket_boundaries[%d] = {%s};" % ( + len(inst_map['Histogram']), ','.join('grpc_stats_table_%d' % x + for x in histo_bucket_boundaries)) + print >> C, "void (*const grpc_stats_inc_histogram[%d])(int x) = {%s};" % ( + len(inst_map['Histogram']), + ','.join('grpc_stats_inc_%s' % histogram.name.lower() + for histogram in inst_map['Histogram'])) # patch qps_test bigquery schema RECORD_EXPLICIT_PERCENTILES = [50, 95, 99] with open('tools/run_tests/performance/scenario_result_schema.json', 'r') as f: - qps_schema = json.loads(f.read()) + qps_schema = json.loads(f.read()) + def FindNamed(js, name): - for el in js: - if el['name'] == name: - return el + for el in js: + if el['name'] == name: + return el + def RemoveCoreFields(js): - new_fields = [] - for field in js['fields']: - if not field['name'].startswith('core_'): - new_fields.append(field) - js['fields'] = new_fields + new_fields = [] + for field in js['fields']: + if not field['name'].startswith('core_'): + new_fields.append(field) + js['fields'] = new_fields + RemoveCoreFields(FindNamed(qps_schema, 'clientStats')) RemoveCoreFields(FindNamed(qps_schema, 'serverStats')) + def AddCoreFields(js): - for counter in inst_map['Counter']: - js['fields'].append({ - 'name': 'core_%s' % counter.name, - 'type': 'INTEGER', - 'mode': 'NULLABLE' - }) - for histogram in inst_map['Histogram']: - js['fields'].append({ - 'name': 'core_%s' % histogram.name, - 'type': 'STRING', - 'mode': 'NULLABLE' - }) - js['fields'].append({ - 'name': 'core_%s_bkts' % histogram.name, - 'type': 'STRING', - 'mode': 'NULLABLE' - }) - for pctl in RECORD_EXPLICIT_PERCENTILES: - js['fields'].append({ - 'name': 'core_%s_%dp' % (histogram.name, pctl), - 'type': 'FLOAT', - 'mode': 'NULLABLE' - }) + for counter in inst_map['Counter']: + js['fields'].append({ + 'name': 'core_%s' % counter.name, + 'type': 'INTEGER', + 'mode': 'NULLABLE' + }) + for histogram in inst_map['Histogram']: + js['fields'].append({ + 'name': 'core_%s' % histogram.name, + 'type': 'STRING', + 'mode': 'NULLABLE' + }) + js['fields'].append({ + 'name': 'core_%s_bkts' % histogram.name, + 'type': 'STRING', + 'mode': 'NULLABLE' + }) + for pctl in RECORD_EXPLICIT_PERCENTILES: + js['fields'].append({ + 'name': 'core_%s_%dp' % (histogram.name, pctl), + 'type': 'FLOAT', + 'mode': 'NULLABLE' + }) + AddCoreFields(FindNamed(qps_schema, 'clientStats')) AddCoreFields(FindNamed(qps_schema, 'serverStats')) with open('tools/run_tests/performance/scenario_result_schema.json', 'w') as f: - f.write(json.dumps(qps_schema, indent=2, sort_keys=True)) + f.write(json.dumps(qps_schema, indent=2, sort_keys=True)) # and generate a helper script to massage scenario results into the format we'd # like to query with open('tools/run_tests/performance/massage_qps_stats.py', 'w') as P: - with open(sys.argv[0]) as my_source: - for line in my_source: - if line[0] != '#': break - for line in my_source: - if line[0] == '#': - print >>P, line.rstrip() - break - for line in my_source: - if line[0] != '#': - break - print >>P, line.rstrip() - - print >>P - print >>P, '# Autogenerated by tools/codegen/core/gen_stats_data.py' - print >>P - - print >>P, 'import massage_qps_stats_helpers' - - print >>P, 'def massage_qps_stats(scenario_result):' - print >>P, ' for stats in scenario_result["serverStats"] + scenario_result["clientStats"]:' - print >>P, ' if "coreStats" not in stats: return' - print >>P, ' core_stats = stats["coreStats"]' - print >>P, ' del stats["coreStats"]' - for counter in inst_map['Counter']: - print >>P, ' stats["core_%s"] = massage_qps_stats_helpers.counter(core_stats, "%s")' % (counter.name, counter.name) - for i, histogram in enumerate(inst_map['Histogram']): - print >>P, ' h = massage_qps_stats_helpers.histogram(core_stats, "%s")' % histogram.name - print >>P, ' stats["core_%s"] = ",".join("%%f" %% x for x in h.buckets)' % histogram.name - print >>P, ' stats["core_%s_bkts"] = ",".join("%%f" %% x for x in h.boundaries)' % histogram.name - for pctl in RECORD_EXPLICIT_PERCENTILES: - print >>P, ' stats["core_%s_%dp"] = massage_qps_stats_helpers.percentile(h.buckets, %d, h.boundaries)' % ( - histogram.name, pctl, pctl) + with open(sys.argv[0]) as my_source: + for line in my_source: + if line[0] != '#': break + for line in my_source: + if line[0] == '#': + print >> P, line.rstrip() + break + for line in my_source: + if line[0] != '#': + break + print >> P, line.rstrip() + + print >> P + print >> P, '# Autogenerated by tools/codegen/core/gen_stats_data.py' + print >> P + + print >> P, 'import massage_qps_stats_helpers' + + print >> P, 'def massage_qps_stats(scenario_result):' + print >> P, ' for stats in scenario_result["serverStats"] + scenario_result["clientStats"]:' + print >> P, ' if "coreStats" not in stats: return' + print >> P, ' core_stats = stats["coreStats"]' + print >> P, ' del stats["coreStats"]' + for counter in inst_map['Counter']: + print >> P, ' stats["core_%s"] = massage_qps_stats_helpers.counter(core_stats, "%s")' % ( + counter.name, counter.name) + for i, histogram in enumerate(inst_map['Histogram']): + print >> P, ' h = massage_qps_stats_helpers.histogram(core_stats, "%s")' % histogram.name + print >> P, ' stats["core_%s"] = ",".join("%%f" %% x for x in h.buckets)' % histogram.name + print >> P, ' stats["core_%s_bkts"] = ",".join("%%f" %% x for x in h.boundaries)' % histogram.name + for pctl in RECORD_EXPLICIT_PERCENTILES: + print >> P, ' stats["core_%s_%dp"] = massage_qps_stats_helpers.percentile(h.buckets, %d, h.boundaries)' % ( + histogram.name, pctl, pctl) with open('src/core/lib/debug/stats_data_bq_schema.sql', 'w') as S: - columns = [] - for counter in inst_map['Counter']: - columns.append(('%s_per_iteration' % counter.name, 'FLOAT')) - print >>S, ',\n'.join('%s:%s' % x for x in columns) - + columns = [] + for counter in inst_map['Counter']: + columns.append(('%s_per_iteration' % counter.name, 'FLOAT')) + print >> S, ',\n'.join('%s:%s' % x for x in columns) diff --git a/tools/distrib/yapf_code.sh b/tools/distrib/yapf_code.sh index 7024168b2d8..b784f60e4dd 100755 --- a/tools/distrib/yapf_code.sh +++ b/tools/distrib/yapf_code.sh @@ -21,6 +21,7 @@ cd "$(dirname "${0}")/../.." DIRS=( 'src/python' 'tools/buildgen' + 'tools/codegen' ) EXCLUSIONS=( 'grpcio/grpc_*.py' From 7a2be20a8af600f9653c030164ba58fc5f23d76d Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 11 Dec 2017 16:49:19 -0800 Subject: [PATCH 104/127] yapf tools/distrib --- .../grpcio_tools/grpc_version.py.template | 2 +- tools/codegen/core/gen_stats_data.py | 10 +- tools/distrib/c-ish/check_documentation.py | 61 ++--- tools/distrib/check_copyright.py | 194 +++++++------- tools/distrib/check_include_guards.py | 245 +++++++++-------- tools/distrib/python/check_grpcio_tools.py | 11 +- tools/distrib/python/docgen.py | 135 ++++++---- .../grpcio_tools/grpc_tools/__init__.py | 1 - .../python/grpcio_tools/grpc_tools/command.py | 63 ++--- .../python/grpcio_tools/grpc_tools/protoc.py | 12 +- .../python/grpcio_tools/grpc_version.py | 2 +- .../python/grpcio_tools/protoc_lib_deps.py | 170 +++++++++++- tools/distrib/python/grpcio_tools/setup.py | 251 +++++++++--------- tools/distrib/python/make_grpcio_tools.py | 149 ++++++----- tools/distrib/python/submit.py | 67 +++-- tools/distrib/run_clang_tidy.py | 44 +-- tools/distrib/yapf_code.sh | 1 + 17 files changed, 801 insertions(+), 617 deletions(-) diff --git a/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template b/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template index aacb3ecc8f3..e25791dd0e5 100644 --- a/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template +++ b/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template @@ -16,4 +16,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! - VERSION='${settings.python_version.pep440()}' + VERSION = '${settings.python_version.pep440()}' diff --git a/tools/codegen/core/gen_stats_data.py b/tools/codegen/core/gen_stats_data.py index 4fd9fa437e3..93f2035c458 100755 --- a/tools/codegen/core/gen_stats_data.py +++ b/tools/codegen/core/gen_stats_data.py @@ -154,8 +154,8 @@ def gen_bucket_code(histogram): if done_trivial: first_nontrivial_code = dbl2u64(first_nontrivial) code_bounds = [dbl2u64(x) - first_nontrivial_code for x in bounds] - shift_data = find_ideal_shift(code_bounds[first_nontrivial:], 256 * - histogram.buckets) + shift_data = find_ideal_shift(code_bounds[first_nontrivial:], + 256 * histogram.buckets) #print first_nontrivial, shift_data, bounds #if shift_data is not None: print [hex(x >> shift_data[0]) for x in code_bounds[first_nontrivial:]] code = 'value = GPR_CLAMP(value, 0, %d);\n' % histogram.max @@ -352,9 +352,9 @@ with open('src/core/lib/debug/stats_data.cc', 'w') as C: len(inst_map['Histogram']), ','.join('grpc_stats_table_%d' % x for x in histo_bucket_boundaries)) print >> C, "void (*const grpc_stats_inc_histogram[%d])(int x) = {%s};" % ( - len(inst_map['Histogram']), - ','.join('grpc_stats_inc_%s' % histogram.name.lower() - for histogram in inst_map['Histogram'])) + len(inst_map['Histogram']), ','.join( + 'grpc_stats_inc_%s' % histogram.name.lower() + for histogram in inst_map['Histogram'])) # patch qps_test bigquery schema RECORD_EXPLICIT_PERCENTILES = [50, 95, 99] diff --git a/tools/distrib/c-ish/check_documentation.py b/tools/distrib/c-ish/check_documentation.py index 24da0051ada..fef8f4ee5d8 100755 --- a/tools/distrib/c-ish/check_documentation.py +++ b/tools/distrib/c-ish/check_documentation.py @@ -22,24 +22,15 @@ import sys # where do we run _TARGET_DIRS = [ - 'include/grpc', - 'include/grpc++', - 'src/core', - 'src/cpp', - 'test/core', - 'test/cpp' + 'include/grpc', 'include/grpc++', 'src/core', 'src/cpp', 'test/core', + 'test/cpp' ] # which file extensions do we care about -_INTERESTING_EXTENSIONS = [ - '.c', - '.h', - '.cc' -] +_INTERESTING_EXTENSIONS = ['.c', '.h', '.cc'] # find our home -_ROOT = os.path.abspath( - os.path.join(os.path.dirname(sys.argv[0]), '../../..')) +_ROOT = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '../../..')) os.chdir(_ROOT) errors = 0 @@ -47,30 +38,30 @@ errors = 0 # walk directories, find things printed_banner = False for target_dir in _TARGET_DIRS: - for root, dirs, filenames in os.walk(target_dir): - if 'README.md' not in filenames: - if not printed_banner: - print 'Missing README.md' - print '=================' - printed_banner = True - print root - errors += 1 + for root, dirs, filenames in os.walk(target_dir): + if 'README.md' not in filenames: + if not printed_banner: + print 'Missing README.md' + print '=================' + printed_banner = True + print root + errors += 1 if printed_banner: print printed_banner = False for target_dir in _TARGET_DIRS: - for root, dirs, filenames in os.walk(target_dir): - for filename in filenames: - if os.path.splitext(filename)[1] not in _INTERESTING_EXTENSIONS: - continue - path = os.path.join(root, filename) - with open(path) as f: - contents = f.read() - if '\\file' not in contents: - if not printed_banner: - print 'Missing \\file comment' - print '======================' - printed_banner = True - print path - errors += 1 + for root, dirs, filenames in os.walk(target_dir): + for filename in filenames: + if os.path.splitext(filename)[1] not in _INTERESTING_EXTENSIONS: + continue + path = os.path.join(root, filename) + with open(path) as f: + contents = f.read() + if '\\file' not in contents: + if not printed_banner: + print 'Missing \\file comment' + print '======================' + printed_banner = True + print path + errors += 1 assert errors == 0, 'error count = %d' % errors diff --git a/tools/distrib/check_copyright.py b/tools/distrib/check_copyright.py index 6ecacede71a..f6e73624a78 100755 --- a/tools/distrib/check_copyright.py +++ b/tools/distrib/check_copyright.py @@ -22,149 +22,135 @@ import sys import subprocess # find our home -ROOT = os.path.abspath( - os.path.join(os.path.dirname(sys.argv[0]), '../..')) +ROOT = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '../..')) os.chdir(ROOT) # parse command line argp = argparse.ArgumentParser(description='copyright checker') -argp.add_argument('-o', '--output', - default='details', - choices=['list', 'details']) -argp.add_argument('-s', '--skips', - default=0, - action='store_const', - const=1) -argp.add_argument('-a', '--ancient', - default=0, - action='store_const', - const=1) -argp.add_argument('--precommit', - default=False, - action='store_true') +argp.add_argument( + '-o', '--output', default='details', choices=['list', 'details']) +argp.add_argument('-s', '--skips', default=0, action='store_const', const=1) +argp.add_argument('-a', '--ancient', default=0, action='store_const', const=1) +argp.add_argument('--precommit', default=False, action='store_true') args = argp.parse_args() # open the license text with open('NOTICE.txt') as f: - LICENSE_NOTICE = f.read().splitlines() - + LICENSE_NOTICE = f.read().splitlines() # license format by file extension # key is the file extension, value is a format string # that given a line of license text, returns what should # be in the file LICENSE_PREFIX = { - '.bat': r'@rem\s*', - '.c': r'\s*(?://|\*)\s*', - '.cc': r'\s*(?://|\*)\s*', - '.h': r'\s*(?://|\*)\s*', - '.m': r'\s*\*\s*', - '.php': r'\s*\*\s*', - '.js': r'\s*\*\s*', - '.py': r'#\s*', - '.pyx': r'#\s*', - '.pxd': r'#\s*', - '.pxi': r'#\s*', - '.rb': r'#\s*', - '.sh': r'#\s*', - '.proto': r'//\s*', - '.cs': r'//\s*', - '.mak': r'#\s*', - 'Makefile': r'#\s*', - 'Dockerfile': r'#\s*', - 'BUILD': r'#\s*', + '.bat': r'@rem\s*', + '.c': r'\s*(?://|\*)\s*', + '.cc': r'\s*(?://|\*)\s*', + '.h': r'\s*(?://|\*)\s*', + '.m': r'\s*\*\s*', + '.php': r'\s*\*\s*', + '.js': r'\s*\*\s*', + '.py': r'#\s*', + '.pyx': r'#\s*', + '.pxd': r'#\s*', + '.pxi': r'#\s*', + '.rb': r'#\s*', + '.sh': r'#\s*', + '.proto': r'//\s*', + '.cs': r'//\s*', + '.mak': r'#\s*', + 'Makefile': r'#\s*', + 'Dockerfile': r'#\s*', + 'BUILD': r'#\s*', } _EXEMPT = frozenset(( - # Generated protocol compiler output. - 'examples/python/helloworld/helloworld_pb2.py', - 'examples/python/helloworld/helloworld_pb2_grpc.py', - 'examples/python/multiplex/helloworld_pb2.py', - 'examples/python/multiplex/helloworld_pb2_grpc.py', - 'examples/python/multiplex/route_guide_pb2.py', - 'examples/python/multiplex/route_guide_pb2_grpc.py', - 'examples/python/route_guide/route_guide_pb2.py', - 'examples/python/route_guide/route_guide_pb2_grpc.py', - - 'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c', - 'src/cpp/server/health/health.pb.h', - 'src/cpp/server/health/health.pb.c', - - # An older file originally from outside gRPC. - 'src/php/tests/bootstrap.php', - # census.proto copied from github - 'tools/grpcz/census.proto', - # status.proto copied from googleapis - 'src/proto/grpc/status/status.proto', -)) - + # Generated protocol compiler output. + 'examples/python/helloworld/helloworld_pb2.py', + 'examples/python/helloworld/helloworld_pb2_grpc.py', + 'examples/python/multiplex/helloworld_pb2.py', + 'examples/python/multiplex/helloworld_pb2_grpc.py', + 'examples/python/multiplex/route_guide_pb2.py', + 'examples/python/multiplex/route_guide_pb2_grpc.py', + 'examples/python/route_guide/route_guide_pb2.py', + 'examples/python/route_guide/route_guide_pb2_grpc.py', + 'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h', + 'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c', + 'src/cpp/server/health/health.pb.h', + 'src/cpp/server/health/health.pb.c', + + # An older file originally from outside gRPC. + 'src/php/tests/bootstrap.php', + # census.proto copied from github + 'tools/grpcz/census.proto', + # status.proto copied from googleapis + 'src/proto/grpc/status/status.proto',)) RE_YEAR = r'Copyright (?P[0-9]+\-)?(?P[0-9]+) gRPC authors.' -RE_LICENSE = dict( - (k, r'\n'.join( - LICENSE_PREFIX[k] + - (RE_YEAR if re.search(RE_YEAR, line) else re.escape(line)) - for line in LICENSE_NOTICE)) - for k, v in LICENSE_PREFIX.iteritems()) +RE_LICENSE = dict((k, r'\n'.join( + LICENSE_PREFIX[k] + (RE_YEAR + if re.search(RE_YEAR, line) else re.escape(line)) + for line in LICENSE_NOTICE)) for k, v in LICENSE_PREFIX.iteritems()) if args.precommit: - FILE_LIST_COMMAND = 'git status -z | grep -Poz \'(?<=^[MARC][MARCD ] )[^\s]+\'' + FILE_LIST_COMMAND = 'git status -z | grep -Poz \'(?<=^[MARC][MARCD ] )[^\s]+\'' else: - FILE_LIST_COMMAND = 'git ls-tree -r --name-only -r HEAD | ' \ - 'grep -v ^third_party/ |' \ - 'grep -v "\(ares_config.h\|ares_build.h\)"' + FILE_LIST_COMMAND = 'git ls-tree -r --name-only -r HEAD | ' \ + 'grep -v ^third_party/ |' \ + 'grep -v "\(ares_config.h\|ares_build.h\)"' + def load(name): - with open(name) as f: - return f.read() + with open(name) as f: + return f.read() + def save(name, text): - with open(name, 'w') as f: - f.write(text) + with open(name, 'w') as f: + f.write(text) -assert(re.search(RE_LICENSE['Makefile'], load('Makefile'))) +assert (re.search(RE_LICENSE['Makefile'], load('Makefile'))) def log(cond, why, filename): - if not cond: return - if args.output == 'details': - print '%s: %s' % (why, filename) - else: - print filename + if not cond: return + if args.output == 'details': + print '%s: %s' % (why, filename) + else: + print filename # scan files, validate the text ok = True filename_list = [] try: - filename_list = subprocess.check_output(FILE_LIST_COMMAND, - shell=True).splitlines() + filename_list = subprocess.check_output( + FILE_LIST_COMMAND, shell=True).splitlines() except subprocess.CalledProcessError: - sys.exit(0) + sys.exit(0) for filename in filename_list: - if filename in _EXEMPT: - continue - ext = os.path.splitext(filename)[1] - base = os.path.basename(filename) - if ext in RE_LICENSE: - re_license = RE_LICENSE[ext] - elif base in RE_LICENSE: - re_license = RE_LICENSE[base] - else: - log(args.skips, 'skip', filename) - continue - try: - text = load(filename) - except: - continue - m = re.search(re_license, text) - if m: - pass - elif 'DO NOT EDIT' not in text and filename != 'src/boringssl/err_data.c': - log(1, 'copyright missing', filename) - ok = False + if filename in _EXEMPT: + continue + ext = os.path.splitext(filename)[1] + base = os.path.basename(filename) + if ext in RE_LICENSE: + re_license = RE_LICENSE[ext] + elif base in RE_LICENSE: + re_license = RE_LICENSE[base] + else: + log(args.skips, 'skip', filename) + continue + try: + text = load(filename) + except: + continue + m = re.search(re_license, text) + if m: + pass + elif 'DO NOT EDIT' not in text and filename != 'src/boringssl/err_data.c': + log(1, 'copyright missing', filename) + ok = False sys.exit(0 if ok else 1) diff --git a/tools/distrib/check_include_guards.py b/tools/distrib/check_include_guards.py index e46f1c9f4c1..24e076afda7 100755 --- a/tools/distrib/check_include_guards.py +++ b/tools/distrib/check_include_guards.py @@ -23,136 +23,136 @@ import subprocess def build_valid_guard(fpath): - prefix = 'GRPC_' if not fpath.startswith('include/') else '' - return prefix + '_'.join(fpath.replace('++', 'XX').replace('.', '_').upper().split('/')[1:]) + prefix = 'GRPC_' if not fpath.startswith('include/') else '' + return prefix + '_'.join( + fpath.replace('++', 'XX').replace('.', '_').upper().split('/')[1:]) def load(fpath): - with open(fpath, 'r') as f: - return f.read() + with open(fpath, 'r') as f: + return f.read() def save(fpath, contents): - with open(fpath, 'w') as f: - f.write(contents) + with open(fpath, 'w') as f: + f.write(contents) class GuardValidator(object): - def __init__(self): - self.ifndef_re = re.compile(r'#ifndef ([A-Z][A-Z_1-9]*)') - self.define_re = re.compile(r'#define ([A-Z][A-Z_1-9]*)') - self.endif_c_re = re.compile(r'#endif /\* ([A-Z][A-Z_1-9]*) (?:\\ *\n *)?\*/') - self.endif_cpp_re = re.compile(r'#endif // ([A-Z][A-Z_1-9]*)') - self.failed = False - - def fail(self, fpath, regexp, fcontents, match_txt, correct, fix): - cpp_header = 'grpc++' in fpath - self.failed = True - invalid_guards_msg_template = ( - '{0}: Missing preprocessor guards (RE {1}). ' - 'Please wrap your code around the following guards:\n' - '#ifndef {2}\n' - '#define {2}\n' - '...\n' - '... epic code ...\n' - '...\n') + ('#endif // {2}' if cpp_header else '#endif /* {2} */') - if not match_txt: - print invalid_guards_msg_template.format(fpath, regexp.pattern, - build_valid_guard(fpath)) - return fcontents - - print ('{}: Wrong preprocessor guards (RE {}):' - '\n\tFound {}, expected {}').format( - fpath, regexp.pattern, match_txt, correct) - if fix: - print 'Fixing {}...\n'.format(fpath) - fixed_fcontents = re.sub(match_txt, correct, fcontents) - if fixed_fcontents: + + def __init__(self): + self.ifndef_re = re.compile(r'#ifndef ([A-Z][A-Z_1-9]*)') + self.define_re = re.compile(r'#define ([A-Z][A-Z_1-9]*)') + self.endif_c_re = re.compile( + r'#endif /\* ([A-Z][A-Z_1-9]*) (?:\\ *\n *)?\*/') + self.endif_cpp_re = re.compile(r'#endif // ([A-Z][A-Z_1-9]*)') self.failed = False - return fixed_fcontents - else: - print - return fcontents - - def check(self, fpath, fix): - cpp_header = 'grpc++' in fpath - valid_guard = build_valid_guard(fpath) - - fcontents = load(fpath) - - match = self.ifndef_re.search(fcontents) - if not match: - print 'something drastically wrong with: %s' % fpath - return False # failed - if match.lastindex is None: - # No ifndef. Request manual addition with hints - self.fail(fpath, match.re, match.string, '', '', False) - return False # failed - - # Does the guard end with a '_H'? - running_guard = match.group(1) - if not running_guard.endswith('_H'): - fcontents = self.fail(fpath, match.re, match.string, match.group(1), - valid_guard, fix) - if fix: save(fpath, fcontents) - - # Is it the expected one based on the file path? - if running_guard != valid_guard: - fcontents = self.fail(fpath, match.re, match.string, match.group(1), - valid_guard, fix) - if fix: save(fpath, fcontents) - - # Is there a #define? Is it the same as the #ifndef one? - match = self.define_re.search(fcontents) - if match.lastindex is None: - # No define. Request manual addition with hints - self.fail(fpath, match.re, match.string, '', '', False) - return False # failed - - # Is the #define guard the same as the #ifndef guard? - if match.group(1) != running_guard: - fcontents = self.fail(fpath, match.re, match.string, match.group(1), - valid_guard, fix) - if fix: save(fpath, fcontents) - - # Is there a properly commented #endif? - endif_re = self.endif_cpp_re if cpp_header else self.endif_c_re - flines = fcontents.rstrip().splitlines() - match = endif_re.search('\n'.join(flines[-2:])) - if not match: - # No endif. Check if we have the last line as just '#endif' and if so - # replace it with a properly commented one. - if flines[-1] == '#endif': - flines[-1] = ('#endif' + - (' // {}\n'.format(valid_guard) if cpp_header - else ' /* {} */\n'.format(valid_guard))) + + def fail(self, fpath, regexp, fcontents, match_txt, correct, fix): + cpp_header = 'grpc++' in fpath + self.failed = True + invalid_guards_msg_template = ( + '{0}: Missing preprocessor guards (RE {1}). ' + 'Please wrap your code around the following guards:\n' + '#ifndef {2}\n' + '#define {2}\n' + '...\n' + '... epic code ...\n' + '...\n') + ('#endif // {2}' if cpp_header else '#endif /* {2} */') + if not match_txt: + print invalid_guards_msg_template.format(fpath, regexp.pattern, + build_valid_guard(fpath)) + return fcontents + + print('{}: Wrong preprocessor guards (RE {}):' + '\n\tFound {}, expected {}').format(fpath, regexp.pattern, + match_txt, correct) if fix: - fcontents = '\n'.join(flines) - save(fpath, fcontents) - else: - # something else is wrong, bail out - self.fail(fpath, endif_re, flines[-1], '', '', False) - elif match.group(1) != running_guard: - # Is the #endif guard the same as the #ifndef and #define guards? - fcontents = self.fail(fpath, endif_re, fcontents, match.group(1), - valid_guard, fix) - if fix: save(fpath, fcontents) - - return not self.failed # Did the check succeed? (ie, not failed) + print 'Fixing {}...\n'.format(fpath) + fixed_fcontents = re.sub(match_txt, correct, fcontents) + if fixed_fcontents: + self.failed = False + return fixed_fcontents + else: + print + return fcontents + + def check(self, fpath, fix): + cpp_header = 'grpc++' in fpath + valid_guard = build_valid_guard(fpath) + + fcontents = load(fpath) + + match = self.ifndef_re.search(fcontents) + if not match: + print 'something drastically wrong with: %s' % fpath + return False # failed + if match.lastindex is None: + # No ifndef. Request manual addition with hints + self.fail(fpath, match.re, match.string, '', '', False) + return False # failed + + # Does the guard end with a '_H'? + running_guard = match.group(1) + if not running_guard.endswith('_H'): + fcontents = self.fail(fpath, match.re, match.string, + match.group(1), valid_guard, fix) + if fix: save(fpath, fcontents) + + # Is it the expected one based on the file path? + if running_guard != valid_guard: + fcontents = self.fail(fpath, match.re, match.string, + match.group(1), valid_guard, fix) + if fix: save(fpath, fcontents) + + # Is there a #define? Is it the same as the #ifndef one? + match = self.define_re.search(fcontents) + if match.lastindex is None: + # No define. Request manual addition with hints + self.fail(fpath, match.re, match.string, '', '', False) + return False # failed + + # Is the #define guard the same as the #ifndef guard? + if match.group(1) != running_guard: + fcontents = self.fail(fpath, match.re, match.string, + match.group(1), valid_guard, fix) + if fix: save(fpath, fcontents) + + # Is there a properly commented #endif? + endif_re = self.endif_cpp_re if cpp_header else self.endif_c_re + flines = fcontents.rstrip().splitlines() + match = endif_re.search('\n'.join(flines[-2:])) + if not match: + # No endif. Check if we have the last line as just '#endif' and if so + # replace it with a properly commented one. + if flines[-1] == '#endif': + flines[-1] = ( + '#endif' + + (' // {}\n'.format(valid_guard) + if cpp_header else ' /* {} */\n'.format(valid_guard))) + if fix: + fcontents = '\n'.join(flines) + save(fpath, fcontents) + else: + # something else is wrong, bail out + self.fail(fpath, endif_re, flines[-1], '', '', False) + elif match.group(1) != running_guard: + # Is the #endif guard the same as the #ifndef and #define guards? + fcontents = self.fail(fpath, endif_re, fcontents, + match.group(1), valid_guard, fix) + if fix: save(fpath, fcontents) + + return not self.failed # Did the check succeed? (ie, not failed) + # find our home -ROOT = os.path.abspath( - os.path.join(os.path.dirname(sys.argv[0]), '../..')) +ROOT = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '../..')) os.chdir(ROOT) # parse command line argp = argparse.ArgumentParser(description='include guard checker') -argp.add_argument('-f', '--fix', - default=False, - action='store_true'); -argp.add_argument('--precommit', - default=False, - action='store_true') +argp.add_argument('-f', '--fix', default=False, action='store_true') +argp.add_argument('--precommit', default=False, action='store_true') args = argp.parse_args() KNOWN_BAD = set([ @@ -161,12 +161,11 @@ KNOWN_BAD = set([ 'include/grpc++/ext/reflection.pb.h', ]) - grep_filter = r"grep -E '^(include|src/core)/.*\.h$'" if args.precommit: - git_command = 'git diff --name-only HEAD' + git_command = 'git diff --name-only HEAD' else: - git_command = 'git ls-tree -r --name-only -r HEAD' + git_command = 'git ls-tree -r --name-only -r HEAD' FILE_LIST_COMMAND = ' | '.join((git_command, grep_filter)) @@ -174,17 +173,17 @@ FILE_LIST_COMMAND = ' | '.join((git_command, grep_filter)) ok = True filename_list = [] try: - filename_list = subprocess.check_output(FILE_LIST_COMMAND, - shell=True).splitlines() - # Filter out non-existent files (ie, file removed or renamed) - filename_list = (f for f in filename_list if os.path.isfile(f)) + filename_list = subprocess.check_output( + FILE_LIST_COMMAND, shell=True).splitlines() + # Filter out non-existent files (ie, file removed or renamed) + filename_list = (f for f in filename_list if os.path.isfile(f)) except subprocess.CalledProcessError: - sys.exit(0) + sys.exit(0) validator = GuardValidator() for filename in filename_list: - if filename in KNOWN_BAD: continue - ok = ok and validator.check(filename, args.fix) + if filename in KNOWN_BAD: continue + ok = ok and validator.check(filename, args.fix) sys.exit(0 if ok else 1) diff --git a/tools/distrib/python/check_grpcio_tools.py b/tools/distrib/python/check_grpcio_tools.py index b56ccaea7af..2363017113b 100755 --- a/tools/distrib/python/check_grpcio_tools.py +++ b/tools/distrib/python/check_grpcio_tools.py @@ -23,12 +23,11 @@ Have you called tools/distrib/python/make_grpcio_tools.py since upgrading protob submodule_commit_hash = _make.protobuf_submodule_commit_hash() with open(_make.GRPC_PYTHON_PROTOC_LIB_DEPS, 'r') as _protoc_lib_deps_file: - content = _protoc_lib_deps_file.read().splitlines() + content = _protoc_lib_deps_file.read().splitlines() -testString = (_make.COMMIT_HASH_PREFIX + - submodule_commit_hash + - _make.COMMIT_HASH_SUFFIX) +testString = ( + _make.COMMIT_HASH_PREFIX + submodule_commit_hash + _make.COMMIT_HASH_SUFFIX) if testString not in content: - print(OUT_OF_DATE_MESSAGE.format(_make.GRPC_PYTHON_PROTOC_LIB_DEPS)) - raise SystemExit(1) + print(OUT_OF_DATE_MESSAGE.format(_make.GRPC_PYTHON_PROTOC_LIB_DEPS)) + raise SystemExit(1) diff --git a/tools/distrib/python/docgen.py b/tools/distrib/python/docgen.py index 1822e51d095..4d6fcb5d65d 100755 --- a/tools/distrib/python/docgen.py +++ b/tools/distrib/python/docgen.py @@ -24,14 +24,20 @@ import sys import tempfile parser = argparse.ArgumentParser() -parser.add_argument('--config', metavar='c', type=str, nargs=1, - help='GRPC/GPR libraries build configuration', - default='opt') +parser.add_argument( + '--config', + metavar='c', + type=str, + nargs=1, + help='GRPC/GPR libraries build configuration', + default='opt') parser.add_argument('--submit', action='store_true') parser.add_argument('--gh-user', type=str, help='GitHub user to push as.') -parser.add_argument('--gh-repo-owner', type=str, - help=('Owner of the GitHub repository to be pushed; ' - 'defaults to --gh-user.')) +parser.add_argument( + '--gh-repo-owner', + type=str, + help=('Owner of the GitHub repository to be pushed; ' + 'defaults to --gh-user.')) parser.add_argument('--doc-branch', type=str) args = parser.parse_args() @@ -59,60 +65,75 @@ environment.update({ }) subprocess_arguments_list = [ - {'args': ['virtualenv', VIRTUALENV_DIR], 'env': environment}, - {'args': [VIRTUALENV_PIP_PATH, 'install', '--upgrade', 'pip==9.0.1'], - 'env': environment}, - {'args': [VIRTUALENV_PIP_PATH, 'install', '-r', REQUIREMENTS_PATH], - 'env': environment}, - {'args': [VIRTUALENV_PYTHON_PATH, SETUP_PATH, 'build'], 'env': environment}, - {'args': [VIRTUALENV_PYTHON_PATH, SETUP_PATH, 'doc'], 'env': environment}, + { + 'args': ['virtualenv', VIRTUALENV_DIR], + 'env': environment + }, + { + 'args': [VIRTUALENV_PIP_PATH, 'install', '--upgrade', 'pip==9.0.1'], + 'env': environment + }, + { + 'args': [VIRTUALENV_PIP_PATH, 'install', '-r', REQUIREMENTS_PATH], + 'env': environment + }, + { + 'args': [VIRTUALENV_PYTHON_PATH, SETUP_PATH, 'build'], + 'env': environment + }, + { + 'args': [VIRTUALENV_PYTHON_PATH, SETUP_PATH, 'doc'], + 'env': environment + }, ] for subprocess_arguments in subprocess_arguments_list: - print('Running command: {}'.format(subprocess_arguments['args'])) - subprocess.check_call(**subprocess_arguments) + print('Running command: {}'.format(subprocess_arguments['args'])) + subprocess.check_call(**subprocess_arguments) if args.submit: - assert args.gh_user - assert args.doc_branch - github_user = args.gh_user - github_repository_owner = ( - args.gh_repo_owner if args.gh_repo_owner else args.gh_user) - # Create a temporary directory out of tree, checkout gh-pages from the - # specified repository, edit it, and push it. It's up to the user to then go - # onto GitHub and make a PR against grpc/grpc:gh-pages. - repo_parent_dir = tempfile.mkdtemp() - print('Documentation parent directory: {}'.format(repo_parent_dir)) - repo_dir = os.path.join(repo_parent_dir, 'grpc') - python_doc_dir = os.path.join(repo_dir, 'python') - doc_branch = args.doc_branch + assert args.gh_user + assert args.doc_branch + github_user = args.gh_user + github_repository_owner = (args.gh_repo_owner + if args.gh_repo_owner else args.gh_user) + # Create a temporary directory out of tree, checkout gh-pages from the + # specified repository, edit it, and push it. It's up to the user to then go + # onto GitHub and make a PR against grpc/grpc:gh-pages. + repo_parent_dir = tempfile.mkdtemp() + print('Documentation parent directory: {}'.format(repo_parent_dir)) + repo_dir = os.path.join(repo_parent_dir, 'grpc') + python_doc_dir = os.path.join(repo_dir, 'python') + doc_branch = args.doc_branch - print('Cloning your repository...') - subprocess.check_call([ - 'git', 'clone', 'https://{}@github.com/{}/grpc'.format( - github_user, github_repository_owner) - ], cwd=repo_parent_dir) - subprocess.check_call([ - 'git', 'remote', 'add', 'upstream', 'https://github.com/grpc/grpc' - ], cwd=repo_dir) - subprocess.check_call(['git', 'fetch', 'upstream'], cwd=repo_dir) - subprocess.check_call([ - 'git', 'checkout', 'upstream/gh-pages', '-b', doc_branch - ], cwd=repo_dir) - print('Updating documentation...') - shutil.rmtree(python_doc_dir, ignore_errors=True) - shutil.copytree(DOC_PATH, python_doc_dir) - print('Attempting to push documentation...') - try: - subprocess.check_call(['git', 'add', '--all'], cwd=repo_dir) - subprocess.check_call([ - 'git', 'commit', '-m', 'Auto-update Python documentation' - ], cwd=repo_dir) - subprocess.check_call([ - 'git', 'push', '--set-upstream', 'origin', doc_branch - ], cwd=repo_dir) - except subprocess.CalledProcessError: - print('Failed to push documentation. Examine this directory and push ' - 'manually: {}'.format(repo_parent_dir)) - sys.exit(1) - shutil.rmtree(repo_parent_dir) + print('Cloning your repository...') + subprocess.check_call( + [ + 'git', 'clone', 'https://{}@github.com/{}/grpc'.format( + github_user, github_repository_owner) + ], + cwd=repo_parent_dir) + subprocess.check_call( + ['git', 'remote', 'add', 'upstream', 'https://github.com/grpc/grpc'], + cwd=repo_dir) + subprocess.check_call(['git', 'fetch', 'upstream'], cwd=repo_dir) + subprocess.check_call( + ['git', 'checkout', 'upstream/gh-pages', '-b', doc_branch], + cwd=repo_dir) + print('Updating documentation...') + shutil.rmtree(python_doc_dir, ignore_errors=True) + shutil.copytree(DOC_PATH, python_doc_dir) + print('Attempting to push documentation...') + try: + subprocess.check_call(['git', 'add', '--all'], cwd=repo_dir) + subprocess.check_call( + ['git', 'commit', '-m', 'Auto-update Python documentation'], + cwd=repo_dir) + subprocess.check_call( + ['git', 'push', '--set-upstream', 'origin', doc_branch], + cwd=repo_dir) + except subprocess.CalledProcessError: + print('Failed to push documentation. Examine this directory and push ' + 'manually: {}'.format(repo_parent_dir)) + sys.exit(1) + shutil.rmtree(repo_parent_dir) diff --git a/tools/distrib/python/grpcio_tools/grpc_tools/__init__.py b/tools/distrib/python/grpcio_tools/grpc_tools/__init__.py index 1454b678e12..5772620b602 100644 --- a/tools/distrib/python/grpcio_tools/grpc_tools/__init__.py +++ b/tools/distrib/python/grpcio_tools/grpc_tools/__init__.py @@ -11,4 +11,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - diff --git a/tools/distrib/python/grpcio_tools/grpc_tools/command.py b/tools/distrib/python/grpcio_tools/grpc_tools/command.py index 28be1370459..c0f9d93b0aa 100644 --- a/tools/distrib/python/grpcio_tools/grpc_tools/command.py +++ b/tools/distrib/python/grpcio_tools/grpc_tools/command.py @@ -22,43 +22,44 @@ from grpc_tools import protoc def build_package_protos(package_root): - proto_files = [] - inclusion_root = os.path.abspath(package_root) - for root, _, files in os.walk(inclusion_root): - for filename in files: - if filename.endswith('.proto'): - proto_files.append(os.path.abspath(os.path.join(root, filename))) + proto_files = [] + inclusion_root = os.path.abspath(package_root) + for root, _, files in os.walk(inclusion_root): + for filename in files: + if filename.endswith('.proto'): + proto_files.append( + os.path.abspath(os.path.join(root, filename))) - well_known_protos_include = pkg_resources.resource_filename( - 'grpc_tools', '_proto') + well_known_protos_include = pkg_resources.resource_filename('grpc_tools', + '_proto') - for proto_file in proto_files: - command = [ - 'grpc_tools.protoc', - '--proto_path={}'.format(inclusion_root), - '--proto_path={}'.format(well_known_protos_include), - '--python_out={}'.format(inclusion_root), - '--grpc_python_out={}'.format(inclusion_root), - ] + [proto_file] - if protoc.main(command) != 0: - sys.stderr.write('warning: {} failed'.format(command)) + for proto_file in proto_files: + command = [ + 'grpc_tools.protoc', + '--proto_path={}'.format(inclusion_root), + '--proto_path={}'.format(well_known_protos_include), + '--python_out={}'.format(inclusion_root), + '--grpc_python_out={}'.format(inclusion_root), + ] + [proto_file] + if protoc.main(command) != 0: + sys.stderr.write('warning: {} failed'.format(command)) class BuildPackageProtos(setuptools.Command): - """Command to generate project *_pb2.py modules from proto files.""" + """Command to generate project *_pb2.py modules from proto files.""" - description = 'build grpc protobuf modules' - user_options = [] + description = 'build grpc protobuf modules' + user_options = [] - def initialize_options(self): - pass + def initialize_options(self): + pass - def finalize_options(self): - pass + def finalize_options(self): + pass - def run(self): - # due to limitations of the proto generator, we require that only *one* - # directory is provided as an 'include' directory. We assume it's the '' key - # to `self.distribution.package_dir` (and get a key error if it's not - # there). - build_package_protos(self.distribution.package_dir['']) + def run(self): + # due to limitations of the proto generator, we require that only *one* + # directory is provided as an 'include' directory. We assume it's the '' key + # to `self.distribution.package_dir` (and get a key error if it's not + # there). + build_package_protos(self.distribution.package_dir['']) diff --git a/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py b/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py index efad51e07b7..582cba0e396 100644 --- a/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py +++ b/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py @@ -19,16 +19,18 @@ import sys from grpc_tools import _protoc_compiler + def main(command_arguments): - """Run the protocol buffer compiler with the given command-line arguments. + """Run the protocol buffer compiler with the given command-line arguments. Args: command_arguments: a list of strings representing command line arguments to `protoc`. """ - command_arguments = [argument.encode() for argument in command_arguments] - return _protoc_compiler.run_main(command_arguments) + command_arguments = [argument.encode() for argument in command_arguments] + return _protoc_compiler.run_main(command_arguments) + if __name__ == '__main__': - proto_include = pkg_resources.resource_filename('grpc_tools', '_proto') - sys.exit(main(sys.argv + ['-I{}'.format(proto_include)])) + proto_include = pkg_resources.resource_filename('grpc_tools', '_proto') + sys.exit(main(sys.argv + ['-I{}'.format(proto_include)])) diff --git a/tools/distrib/python/grpcio_tools/grpc_version.py b/tools/distrib/python/grpcio_tools/grpc_version.py index f613025be39..c4ed0661223 100644 --- a/tools/distrib/python/grpcio_tools/grpc_version.py +++ b/tools/distrib/python/grpcio_tools/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! -VERSION='1.9.0.dev0' +VERSION = '1.9.0.dev0' diff --git a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py index 2c65fca628e..a900fb89ec5 100644 --- a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py +++ b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py @@ -1,4 +1,3 @@ - # Copyright 2017 gRPC authors. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,10 +13,169 @@ # limitations under the License. # AUTO-GENERATED BY make_grpcio_tools.py! -CC_FILES=['google/protobuf/compiler/zip_writer.cc', 'google/protobuf/compiler/subprocess.cc', 'google/protobuf/compiler/ruby/ruby_generator.cc', 'google/protobuf/compiler/python/python_generator.cc', 'google/protobuf/compiler/plugin.pb.cc', 'google/protobuf/compiler/plugin.cc', 'google/protobuf/compiler/php/php_generator.cc', 'google/protobuf/compiler/objectivec/objectivec_primitive_field.cc', 'google/protobuf/compiler/objectivec/objectivec_oneof.cc', 'google/protobuf/compiler/objectivec/objectivec_message_field.cc', 'google/protobuf/compiler/objectivec/objectivec_message.cc', 'google/protobuf/compiler/objectivec/objectivec_map_field.cc', 'google/protobuf/compiler/objectivec/objectivec_helpers.cc', 'google/protobuf/compiler/objectivec/objectivec_generator.cc', 'google/protobuf/compiler/objectivec/objectivec_file.cc', 'google/protobuf/compiler/objectivec/objectivec_field.cc', 'google/protobuf/compiler/objectivec/objectivec_extension.cc', 'google/protobuf/compiler/objectivec/objectivec_enum_field.cc', 'google/protobuf/compiler/objectivec/objectivec_enum.cc', 'google/protobuf/compiler/js/well_known_types_embed.cc', 'google/protobuf/compiler/js/js_generator.cc', 'google/protobuf/compiler/javanano/javanano_primitive_field.cc', 'google/protobuf/compiler/javanano/javanano_message_field.cc', 'google/protobuf/compiler/javanano/javanano_message.cc', 'google/protobuf/compiler/javanano/javanano_map_field.cc', 'google/protobuf/compiler/javanano/javanano_helpers.cc', 'google/protobuf/compiler/javanano/javanano_generator.cc', 'google/protobuf/compiler/javanano/javanano_file.cc', 'google/protobuf/compiler/javanano/javanano_field.cc', 'google/protobuf/compiler/javanano/javanano_extension.cc', 'google/protobuf/compiler/javanano/javanano_enum_field.cc', 'google/protobuf/compiler/javanano/javanano_enum.cc', 'google/protobuf/compiler/java/java_string_field_lite.cc', 'google/protobuf/compiler/java/java_string_field.cc', 'google/protobuf/compiler/java/java_shared_code_generator.cc', 'google/protobuf/compiler/java/java_service.cc', 'google/protobuf/compiler/java/java_primitive_field_lite.cc', 'google/protobuf/compiler/java/java_primitive_field.cc', 'google/protobuf/compiler/java/java_name_resolver.cc', 'google/protobuf/compiler/java/java_message_lite.cc', 'google/protobuf/compiler/java/java_message_field_lite.cc', 'google/protobuf/compiler/java/java_message_field.cc', 'google/protobuf/compiler/java/java_message_builder_lite.cc', 'google/protobuf/compiler/java/java_message_builder.cc', 'google/protobuf/compiler/java/java_message.cc', 'google/protobuf/compiler/java/java_map_field_lite.cc', 'google/protobuf/compiler/java/java_map_field.cc', 'google/protobuf/compiler/java/java_lazy_message_field_lite.cc', 'google/protobuf/compiler/java/java_lazy_message_field.cc', 'google/protobuf/compiler/java/java_helpers.cc', 'google/protobuf/compiler/java/java_generator_factory.cc', 'google/protobuf/compiler/java/java_generator.cc', 'google/protobuf/compiler/java/java_file.cc', 'google/protobuf/compiler/java/java_field.cc', 'google/protobuf/compiler/java/java_extension_lite.cc', 'google/protobuf/compiler/java/java_extension.cc', 'google/protobuf/compiler/java/java_enum_lite.cc', 'google/protobuf/compiler/java/java_enum_field_lite.cc', 'google/protobuf/compiler/java/java_enum_field.cc', 'google/protobuf/compiler/java/java_enum.cc', 'google/protobuf/compiler/java/java_doc_comment.cc', 'google/protobuf/compiler/java/java_context.cc', 'google/protobuf/compiler/csharp/csharp_wrapper_field.cc', 'google/protobuf/compiler/csharp/csharp_source_generator_base.cc', 'google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc', 'google/protobuf/compiler/csharp/csharp_repeated_message_field.cc', 'google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc', 'google/protobuf/compiler/csharp/csharp_reflection_class.cc', 'google/protobuf/compiler/csharp/csharp_primitive_field.cc', 'google/protobuf/compiler/csharp/csharp_message_field.cc', 'google/protobuf/compiler/csharp/csharp_message.cc', 'google/protobuf/compiler/csharp/csharp_map_field.cc', 'google/protobuf/compiler/csharp/csharp_helpers.cc', 'google/protobuf/compiler/csharp/csharp_generator.cc', 'google/protobuf/compiler/csharp/csharp_field_base.cc', 'google/protobuf/compiler/csharp/csharp_enum_field.cc', 'google/protobuf/compiler/csharp/csharp_enum.cc', 'google/protobuf/compiler/csharp/csharp_doc_comment.cc', 'google/protobuf/compiler/cpp/cpp_string_field.cc', 'google/protobuf/compiler/cpp/cpp_service.cc', 'google/protobuf/compiler/cpp/cpp_primitive_field.cc', 'google/protobuf/compiler/cpp/cpp_padding_optimizer.cc', 'google/protobuf/compiler/cpp/cpp_message_field.cc', 'google/protobuf/compiler/cpp/cpp_message.cc', 'google/protobuf/compiler/cpp/cpp_map_field.cc', 'google/protobuf/compiler/cpp/cpp_helpers.cc', 'google/protobuf/compiler/cpp/cpp_generator.cc', 'google/protobuf/compiler/cpp/cpp_file.cc', 'google/protobuf/compiler/cpp/cpp_field.cc', 'google/protobuf/compiler/cpp/cpp_extension.cc', 'google/protobuf/compiler/cpp/cpp_enum_field.cc', 'google/protobuf/compiler/cpp/cpp_enum.cc', 'google/protobuf/compiler/command_line_interface.cc', 'google/protobuf/compiler/code_generator.cc', 'google/protobuf/wrappers.pb.cc', 'google/protobuf/wire_format.cc', 'google/protobuf/util/type_resolver_util.cc', 'google/protobuf/util/time_util.cc', 'google/protobuf/util/message_differencer.cc', 'google/protobuf/util/json_util.cc', 'google/protobuf/util/internal/utility.cc', 'google/protobuf/util/internal/type_info_test_helper.cc', 'google/protobuf/util/internal/type_info.cc', 'google/protobuf/util/internal/protostream_objectwriter.cc', 'google/protobuf/util/internal/protostream_objectsource.cc', 'google/protobuf/util/internal/proto_writer.cc', 'google/protobuf/util/internal/object_writer.cc', 'google/protobuf/util/internal/json_stream_parser.cc', 'google/protobuf/util/internal/json_objectwriter.cc', 'google/protobuf/util/internal/json_escaping.cc', 'google/protobuf/util/internal/field_mask_utility.cc', 'google/protobuf/util/internal/error_listener.cc', 'google/protobuf/util/internal/default_value_objectwriter.cc', 'google/protobuf/util/internal/datapiece.cc', 'google/protobuf/util/field_mask_util.cc', 'google/protobuf/util/field_comparator.cc', 'google/protobuf/util/delimited_message_util.cc', 'google/protobuf/unknown_field_set.cc', 'google/protobuf/type.pb.cc', 'google/protobuf/timestamp.pb.cc', 'google/protobuf/text_format.cc', 'google/protobuf/stubs/substitute.cc', 'google/protobuf/stubs/mathlimits.cc', 'google/protobuf/struct.pb.cc', 'google/protobuf/source_context.pb.cc', 'google/protobuf/service.cc', 'google/protobuf/reflection_ops.cc', 'google/protobuf/message.cc', 'google/protobuf/map_field.cc', 'google/protobuf/io/zero_copy_stream_impl.cc', 'google/protobuf/io/tokenizer.cc', 'google/protobuf/io/strtod.cc', 'google/protobuf/io/printer.cc', 'google/protobuf/io/gzip_stream.cc', 'google/protobuf/generated_message_table_driven.cc', 'google/protobuf/generated_message_reflection.cc', 'google/protobuf/field_mask.pb.cc', 'google/protobuf/extension_set_heavy.cc', 'google/protobuf/empty.pb.cc', 'google/protobuf/dynamic_message.cc', 'google/protobuf/duration.pb.cc', 'google/protobuf/descriptor_database.cc', 'google/protobuf/descriptor.pb.cc', 'google/protobuf/descriptor.cc', 'google/protobuf/compiler/parser.cc', 'google/protobuf/compiler/importer.cc', 'google/protobuf/api.pb.cc', 'google/protobuf/any.pb.cc', 'google/protobuf/any.cc', 'google/protobuf/wire_format_lite.cc', 'google/protobuf/stubs/time.cc', 'google/protobuf/stubs/strutil.cc', 'google/protobuf/stubs/structurally_valid.cc', 'google/protobuf/stubs/stringprintf.cc', 'google/protobuf/stubs/stringpiece.cc', 'google/protobuf/stubs/statusor.cc', 'google/protobuf/stubs/status.cc', 'google/protobuf/stubs/once.cc', 'google/protobuf/stubs/io_win32.cc', 'google/protobuf/stubs/int128.cc', 'google/protobuf/stubs/common.cc', 'google/protobuf/stubs/bytestream.cc', 'google/protobuf/stubs/atomicops_internals_x86_msvc.cc', 'google/protobuf/stubs/atomicops_internals_x86_gcc.cc', 'google/protobuf/repeated_field.cc', 'google/protobuf/message_lite.cc', 'google/protobuf/io/zero_copy_stream_impl_lite.cc', 'google/protobuf/io/zero_copy_stream.cc', 'google/protobuf/io/coded_stream.cc', 'google/protobuf/generated_message_util.cc', 'google/protobuf/generated_message_table_driven_lite.cc', 'google/protobuf/extension_set.cc', 'google/protobuf/arenastring.cc', 'google/protobuf/arena.cc', 'google/protobuf/compiler/js/embed.cc'] -PROTO_FILES=['google/protobuf/wrappers.proto', 'google/protobuf/type.proto', 'google/protobuf/timestamp.proto', 'google/protobuf/struct.proto', 'google/protobuf/source_context.proto', 'google/protobuf/field_mask.proto', 'google/protobuf/empty.proto', 'google/protobuf/duration.proto', 'google/protobuf/descriptor.proto', 'google/protobuf/compiler/plugin.proto', 'google/protobuf/api.proto', 'google/protobuf/any.proto'] +CC_FILES = [ + 'google/protobuf/compiler/zip_writer.cc', + 'google/protobuf/compiler/subprocess.cc', + 'google/protobuf/compiler/ruby/ruby_generator.cc', + 'google/protobuf/compiler/python/python_generator.cc', + 'google/protobuf/compiler/plugin.pb.cc', + 'google/protobuf/compiler/plugin.cc', + 'google/protobuf/compiler/php/php_generator.cc', + 'google/protobuf/compiler/objectivec/objectivec_primitive_field.cc', + 'google/protobuf/compiler/objectivec/objectivec_oneof.cc', + 'google/protobuf/compiler/objectivec/objectivec_message_field.cc', + 'google/protobuf/compiler/objectivec/objectivec_message.cc', + 'google/protobuf/compiler/objectivec/objectivec_map_field.cc', + 'google/protobuf/compiler/objectivec/objectivec_helpers.cc', + 'google/protobuf/compiler/objectivec/objectivec_generator.cc', + 'google/protobuf/compiler/objectivec/objectivec_file.cc', + 'google/protobuf/compiler/objectivec/objectivec_field.cc', + 'google/protobuf/compiler/objectivec/objectivec_extension.cc', + 'google/protobuf/compiler/objectivec/objectivec_enum_field.cc', + 'google/protobuf/compiler/objectivec/objectivec_enum.cc', + 'google/protobuf/compiler/js/well_known_types_embed.cc', + 'google/protobuf/compiler/js/js_generator.cc', + 'google/protobuf/compiler/javanano/javanano_primitive_field.cc', + 'google/protobuf/compiler/javanano/javanano_message_field.cc', + 'google/protobuf/compiler/javanano/javanano_message.cc', + 'google/protobuf/compiler/javanano/javanano_map_field.cc', + 'google/protobuf/compiler/javanano/javanano_helpers.cc', + 'google/protobuf/compiler/javanano/javanano_generator.cc', + 'google/protobuf/compiler/javanano/javanano_file.cc', + 'google/protobuf/compiler/javanano/javanano_field.cc', + 'google/protobuf/compiler/javanano/javanano_extension.cc', + 'google/protobuf/compiler/javanano/javanano_enum_field.cc', + 'google/protobuf/compiler/javanano/javanano_enum.cc', + 'google/protobuf/compiler/java/java_string_field_lite.cc', + 'google/protobuf/compiler/java/java_string_field.cc', + 'google/protobuf/compiler/java/java_shared_code_generator.cc', + 'google/protobuf/compiler/java/java_service.cc', + 'google/protobuf/compiler/java/java_primitive_field_lite.cc', + 'google/protobuf/compiler/java/java_primitive_field.cc', + 'google/protobuf/compiler/java/java_name_resolver.cc', + 'google/protobuf/compiler/java/java_message_lite.cc', + 'google/protobuf/compiler/java/java_message_field_lite.cc', + 'google/protobuf/compiler/java/java_message_field.cc', + 'google/protobuf/compiler/java/java_message_builder_lite.cc', + 'google/protobuf/compiler/java/java_message_builder.cc', + 'google/protobuf/compiler/java/java_message.cc', + 'google/protobuf/compiler/java/java_map_field_lite.cc', + 'google/protobuf/compiler/java/java_map_field.cc', + 'google/protobuf/compiler/java/java_lazy_message_field_lite.cc', + 'google/protobuf/compiler/java/java_lazy_message_field.cc', + 'google/protobuf/compiler/java/java_helpers.cc', + 'google/protobuf/compiler/java/java_generator_factory.cc', + 'google/protobuf/compiler/java/java_generator.cc', + 'google/protobuf/compiler/java/java_file.cc', + 'google/protobuf/compiler/java/java_field.cc', + 'google/protobuf/compiler/java/java_extension_lite.cc', + 'google/protobuf/compiler/java/java_extension.cc', + 'google/protobuf/compiler/java/java_enum_lite.cc', + 'google/protobuf/compiler/java/java_enum_field_lite.cc', + 'google/protobuf/compiler/java/java_enum_field.cc', + 'google/protobuf/compiler/java/java_enum.cc', + 'google/protobuf/compiler/java/java_doc_comment.cc', + 'google/protobuf/compiler/java/java_context.cc', + 'google/protobuf/compiler/csharp/csharp_wrapper_field.cc', + 'google/protobuf/compiler/csharp/csharp_source_generator_base.cc', + 'google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc', + 'google/protobuf/compiler/csharp/csharp_repeated_message_field.cc', + 'google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc', + 'google/protobuf/compiler/csharp/csharp_reflection_class.cc', + 'google/protobuf/compiler/csharp/csharp_primitive_field.cc', + 'google/protobuf/compiler/csharp/csharp_message_field.cc', + 'google/protobuf/compiler/csharp/csharp_message.cc', + 'google/protobuf/compiler/csharp/csharp_map_field.cc', + 'google/protobuf/compiler/csharp/csharp_helpers.cc', + 'google/protobuf/compiler/csharp/csharp_generator.cc', + 'google/protobuf/compiler/csharp/csharp_field_base.cc', + 'google/protobuf/compiler/csharp/csharp_enum_field.cc', + 'google/protobuf/compiler/csharp/csharp_enum.cc', + 'google/protobuf/compiler/csharp/csharp_doc_comment.cc', + 'google/protobuf/compiler/cpp/cpp_string_field.cc', + 'google/protobuf/compiler/cpp/cpp_service.cc', + 'google/protobuf/compiler/cpp/cpp_primitive_field.cc', + 'google/protobuf/compiler/cpp/cpp_padding_optimizer.cc', + 'google/protobuf/compiler/cpp/cpp_message_field.cc', + 'google/protobuf/compiler/cpp/cpp_message.cc', + 'google/protobuf/compiler/cpp/cpp_map_field.cc', + 'google/protobuf/compiler/cpp/cpp_helpers.cc', + 'google/protobuf/compiler/cpp/cpp_generator.cc', + 'google/protobuf/compiler/cpp/cpp_file.cc', + 'google/protobuf/compiler/cpp/cpp_field.cc', + 'google/protobuf/compiler/cpp/cpp_extension.cc', + 'google/protobuf/compiler/cpp/cpp_enum_field.cc', + 'google/protobuf/compiler/cpp/cpp_enum.cc', + 'google/protobuf/compiler/command_line_interface.cc', + 'google/protobuf/compiler/code_generator.cc', + 'google/protobuf/wrappers.pb.cc', 'google/protobuf/wire_format.cc', + 'google/protobuf/util/type_resolver_util.cc', + 'google/protobuf/util/time_util.cc', + 'google/protobuf/util/message_differencer.cc', + 'google/protobuf/util/json_util.cc', + 'google/protobuf/util/internal/utility.cc', + 'google/protobuf/util/internal/type_info_test_helper.cc', + 'google/protobuf/util/internal/type_info.cc', + 'google/protobuf/util/internal/protostream_objectwriter.cc', + 'google/protobuf/util/internal/protostream_objectsource.cc', + 'google/protobuf/util/internal/proto_writer.cc', + 'google/protobuf/util/internal/object_writer.cc', + 'google/protobuf/util/internal/json_stream_parser.cc', + 'google/protobuf/util/internal/json_objectwriter.cc', + 'google/protobuf/util/internal/json_escaping.cc', + 'google/protobuf/util/internal/field_mask_utility.cc', + 'google/protobuf/util/internal/error_listener.cc', + 'google/protobuf/util/internal/default_value_objectwriter.cc', + 'google/protobuf/util/internal/datapiece.cc', + 'google/protobuf/util/field_mask_util.cc', + 'google/protobuf/util/field_comparator.cc', + 'google/protobuf/util/delimited_message_util.cc', + 'google/protobuf/unknown_field_set.cc', 'google/protobuf/type.pb.cc', + 'google/protobuf/timestamp.pb.cc', 'google/protobuf/text_format.cc', + 'google/protobuf/stubs/substitute.cc', 'google/protobuf/stubs/mathlimits.cc', + 'google/protobuf/struct.pb.cc', 'google/protobuf/source_context.pb.cc', + 'google/protobuf/service.cc', 'google/protobuf/reflection_ops.cc', + 'google/protobuf/message.cc', 'google/protobuf/map_field.cc', + 'google/protobuf/io/zero_copy_stream_impl.cc', + 'google/protobuf/io/tokenizer.cc', 'google/protobuf/io/strtod.cc', + 'google/protobuf/io/printer.cc', 'google/protobuf/io/gzip_stream.cc', + 'google/protobuf/generated_message_table_driven.cc', + 'google/protobuf/generated_message_reflection.cc', + 'google/protobuf/field_mask.pb.cc', 'google/protobuf/extension_set_heavy.cc', + 'google/protobuf/empty.pb.cc', 'google/protobuf/dynamic_message.cc', + 'google/protobuf/duration.pb.cc', 'google/protobuf/descriptor_database.cc', + 'google/protobuf/descriptor.pb.cc', 'google/protobuf/descriptor.cc', + 'google/protobuf/compiler/parser.cc', 'google/protobuf/compiler/importer.cc', + 'google/protobuf/api.pb.cc', 'google/protobuf/any.pb.cc', + 'google/protobuf/any.cc', 'google/protobuf/wire_format_lite.cc', + 'google/protobuf/stubs/time.cc', 'google/protobuf/stubs/strutil.cc', + 'google/protobuf/stubs/structurally_valid.cc', + 'google/protobuf/stubs/stringprintf.cc', + 'google/protobuf/stubs/stringpiece.cc', 'google/protobuf/stubs/statusor.cc', + 'google/protobuf/stubs/status.cc', 'google/protobuf/stubs/once.cc', + 'google/protobuf/stubs/io_win32.cc', 'google/protobuf/stubs/int128.cc', + 'google/protobuf/stubs/common.cc', 'google/protobuf/stubs/bytestream.cc', + 'google/protobuf/stubs/atomicops_internals_x86_msvc.cc', + 'google/protobuf/stubs/atomicops_internals_x86_gcc.cc', + 'google/protobuf/repeated_field.cc', 'google/protobuf/message_lite.cc', + 'google/protobuf/io/zero_copy_stream_impl_lite.cc', + 'google/protobuf/io/zero_copy_stream.cc', + 'google/protobuf/io/coded_stream.cc', + 'google/protobuf/generated_message_util.cc', + 'google/protobuf/generated_message_table_driven_lite.cc', + 'google/protobuf/extension_set.cc', 'google/protobuf/arenastring.cc', + 'google/protobuf/arena.cc', 'google/protobuf/compiler/js/embed.cc' +] +PROTO_FILES = [ + 'google/protobuf/wrappers.proto', 'google/protobuf/type.proto', + 'google/protobuf/timestamp.proto', 'google/protobuf/struct.proto', + 'google/protobuf/source_context.proto', 'google/protobuf/field_mask.proto', + 'google/protobuf/empty.proto', 'google/protobuf/duration.proto', + 'google/protobuf/descriptor.proto', 'google/protobuf/compiler/plugin.proto', + 'google/protobuf/api.proto', 'google/protobuf/any.proto' +] -CC_INCLUDE='third_party/protobuf/src' -PROTO_INCLUDE='third_party/protobuf/src' +CC_INCLUDE = 'third_party/protobuf/src' +PROTO_INCLUDE = 'third_party/protobuf/src' -PROTOBUF_SUBMODULE_VERSION="2761122b810fe8861004ae785cc3ab39f384d342" +PROTOBUF_SUBMODULE_VERSION = "2761122b810fe8861004ae785cc3ab39f384d342" diff --git a/tools/distrib/python/grpcio_tools/setup.py b/tools/distrib/python/grpcio_tools/setup.py index 8d95cb5a287..342a220d5ed 100644 --- a/tools/distrib/python/grpcio_tools/setup.py +++ b/tools/distrib/python/grpcio_tools/setup.py @@ -66,42 +66,42 @@ BUILD_WITH_CYTHON = os.environ.get('GRPC_PYTHON_BUILD_WITH_CYTHON', False) EXTRA_ENV_COMPILE_ARGS = os.environ.get('GRPC_PYTHON_CFLAGS', None) EXTRA_ENV_LINK_ARGS = os.environ.get('GRPC_PYTHON_LDFLAGS', None) if EXTRA_ENV_COMPILE_ARGS is None: - EXTRA_ENV_COMPILE_ARGS = '-std=c++11' - if 'win32' in sys.platform: - if sys.version_info < (3, 5): - # We use define flags here and don't directly add to DEFINE_MACROS below to - # ensure that the expert user/builder has a way of turning it off (via the - # envvars) without adding yet more GRPC-specific envvars. - # See https://sourceforge.net/p/mingw-w64/bugs/363/ - if '32' in platform.architecture()[0]: - EXTRA_ENV_COMPILE_ARGS += ' -D_ftime=_ftime32 -D_timeb=__timeb32 -D_ftime_s=_ftime32_s -D_hypot=hypot' - else: - EXTRA_ENV_COMPILE_ARGS += ' -D_ftime=_ftime64 -D_timeb=__timeb64 -D_hypot=hypot' - else: - # We need to statically link the C++ Runtime, only the C runtime is - # available dynamically - EXTRA_ENV_COMPILE_ARGS += ' /MT' - elif "linux" in sys.platform or "darwin" in sys.platform: - EXTRA_ENV_COMPILE_ARGS += ' -fno-wrapv -frtti' + EXTRA_ENV_COMPILE_ARGS = '-std=c++11' + if 'win32' in sys.platform: + if sys.version_info < (3, 5): + # We use define flags here and don't directly add to DEFINE_MACROS below to + # ensure that the expert user/builder has a way of turning it off (via the + # envvars) without adding yet more GRPC-specific envvars. + # See https://sourceforge.net/p/mingw-w64/bugs/363/ + if '32' in platform.architecture()[0]: + EXTRA_ENV_COMPILE_ARGS += ' -D_ftime=_ftime32 -D_timeb=__timeb32 -D_ftime_s=_ftime32_s -D_hypot=hypot' + else: + EXTRA_ENV_COMPILE_ARGS += ' -D_ftime=_ftime64 -D_timeb=__timeb64 -D_hypot=hypot' + else: + # We need to statically link the C++ Runtime, only the C runtime is + # available dynamically + EXTRA_ENV_COMPILE_ARGS += ' /MT' + elif "linux" in sys.platform or "darwin" in sys.platform: + EXTRA_ENV_COMPILE_ARGS += ' -fno-wrapv -frtti' if EXTRA_ENV_LINK_ARGS is None: - EXTRA_ENV_LINK_ARGS = '' - if "linux" in sys.platform or "darwin" in sys.platform: - EXTRA_ENV_LINK_ARGS += ' -lpthread' - elif "win32" in sys.platform and sys.version_info < (3, 5): - msvcr = cygwinccompiler.get_msvcr()[0] - # TODO(atash) sift through the GCC specs to see if libstdc++ can have any - # influence on the linkage outcome on MinGW for non-C++ programs. - EXTRA_ENV_LINK_ARGS += ( - ' -static-libgcc -static-libstdc++ -mcrtdll={msvcr} ' - '-static'.format(msvcr=msvcr)) + EXTRA_ENV_LINK_ARGS = '' + if "linux" in sys.platform or "darwin" in sys.platform: + EXTRA_ENV_LINK_ARGS += ' -lpthread' + elif "win32" in sys.platform and sys.version_info < (3, 5): + msvcr = cygwinccompiler.get_msvcr()[0] + # TODO(atash) sift through the GCC specs to see if libstdc++ can have any + # influence on the linkage outcome on MinGW for non-C++ programs. + EXTRA_ENV_LINK_ARGS += ( + ' -static-libgcc -static-libstdc++ -mcrtdll={msvcr} ' + '-static'.format(msvcr=msvcr)) EXTRA_COMPILE_ARGS = shlex.split(EXTRA_ENV_COMPILE_ARGS) EXTRA_LINK_ARGS = shlex.split(EXTRA_ENV_LINK_ARGS) -CC_FILES = [ - os.path.normpath(cc_file) for cc_file in protoc_lib_deps.CC_FILES] +CC_FILES = [os.path.normpath(cc_file) for cc_file in protoc_lib_deps.CC_FILES] PROTO_FILES = [ - os.path.normpath(proto_file) for proto_file in protoc_lib_deps.PROTO_FILES] + os.path.normpath(proto_file) for proto_file in protoc_lib_deps.PROTO_FILES +] CC_INCLUDE = os.path.normpath(protoc_lib_deps.CC_INCLUDE) PROTO_INCLUDE = os.path.normpath(protoc_lib_deps.PROTO_INCLUDE) @@ -110,107 +110,114 @@ GRPC_PYTHON_PROTO_RESOURCES_NAME = '_proto' DEFINE_MACROS = () if "win32" in sys.platform: - DEFINE_MACROS += (('WIN32_LEAN_AND_MEAN', 1),) - if '64bit' in platform.architecture()[0]: - DEFINE_MACROS += (('MS_WIN64', 1),) + DEFINE_MACROS += (('WIN32_LEAN_AND_MEAN', 1),) + if '64bit' in platform.architecture()[0]: + DEFINE_MACROS += (('MS_WIN64', 1),) elif "linux" in sys.platform or "darwin" in sys.platform: - DEFINE_MACROS += (('HAVE_PTHREAD', 1),) + DEFINE_MACROS += (('HAVE_PTHREAD', 1),) # By default, Python3 distutils enforces compatibility of # c plugins (.so files) with the OSX version Python3 was built with. # For Python3.4, this is OSX 10.6, but we need Thread Local Support (__thread) if 'darwin' in sys.platform and PY3: - mac_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET') - if mac_target and (pkg_resources.parse_version(mac_target) < - pkg_resources.parse_version('10.9.0')): - os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.9' - os.environ['_PYTHON_HOST_PLATFORM'] = re.sub( - r'macosx-[0-9]+\.[0-9]+-(.+)', - r'macosx-10.9-\1', - util.get_platform()) + mac_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET') + if mac_target and (pkg_resources.parse_version(mac_target) < + pkg_resources.parse_version('10.9.0')): + os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.9' + os.environ['_PYTHON_HOST_PLATFORM'] = re.sub( + r'macosx-[0-9]+\.[0-9]+-(.+)', r'macosx-10.9-\1', + util.get_platform()) + def package_data(): - tools_path = GRPC_PYTHON_TOOLS_PACKAGE.replace('.', os.path.sep) - proto_resources_path = os.path.join(tools_path, - GRPC_PYTHON_PROTO_RESOURCES_NAME) - proto_files = [] - for proto_file in PROTO_FILES: - source = os.path.join(PROTO_INCLUDE, proto_file) - target = os.path.join(proto_resources_path, proto_file) - relative_target = os.path.join(GRPC_PYTHON_PROTO_RESOURCES_NAME, proto_file) - try: - os.makedirs(os.path.dirname(target)) - except OSError as error: - if error.errno == errno.EEXIST: - pass - else: - raise - shutil.copy(source, target) - proto_files.append(relative_target) - return {GRPC_PYTHON_TOOLS_PACKAGE: proto_files} + tools_path = GRPC_PYTHON_TOOLS_PACKAGE.replace('.', os.path.sep) + proto_resources_path = os.path.join(tools_path, + GRPC_PYTHON_PROTO_RESOURCES_NAME) + proto_files = [] + for proto_file in PROTO_FILES: + source = os.path.join(PROTO_INCLUDE, proto_file) + target = os.path.join(proto_resources_path, proto_file) + relative_target = os.path.join(GRPC_PYTHON_PROTO_RESOURCES_NAME, + proto_file) + try: + os.makedirs(os.path.dirname(target)) + except OSError as error: + if error.errno == errno.EEXIST: + pass + else: + raise + shutil.copy(source, target) + proto_files.append(relative_target) + return {GRPC_PYTHON_TOOLS_PACKAGE: proto_files} + def extension_modules(): - if BUILD_WITH_CYTHON: - plugin_sources = [os.path.join('grpc_tools', '_protoc_compiler.pyx')] - else: - plugin_sources = [os.path.join('grpc_tools', '_protoc_compiler.cpp')] - - plugin_sources += [ - os.path.join('grpc_tools', 'main.cc'), - os.path.join('grpc_root', 'src', 'compiler', 'python_generator.cc')] - - #HACK: Substitute the embed.cc, which is a JS to C++ - # preprocessor with the generated code. - # The generated code should not be material - # to the parts of protoc we use (it affects - # the JavaScript code generator, supposedly), - # but we need to be cautious about it. - cc_files_clone = list(CC_FILES) - embed_cc_file = os.path.normpath('google/protobuf/compiler/js/embed.cc') - well_known_types_file = os.path.normpath( - 'google/protobuf/compiler/js/well_known_types_embed.cc') - if embed_cc_file in cc_files_clone: - cc_files_clone.remove(embed_cc_file) - if well_known_types_file in cc_files_clone: - cc_files_clone.remove(well_known_types_file) - plugin_sources += [os.path.join('grpc_tools', 'protobuf_generated_well_known_types_embed.cc')] - plugin_sources += [os.path.join(CC_INCLUDE, cc_file) for cc_file in cc_files_clone] - - plugin_ext = extension.Extension( - name='grpc_tools._protoc_compiler', - sources=plugin_sources, - include_dirs=[ - '.', - 'grpc_root', - os.path.join('grpc_root', 'include'), - CC_INCLUDE, - ], - language='c++', - define_macros=list(DEFINE_MACROS), - extra_compile_args=list(EXTRA_COMPILE_ARGS), - extra_link_args=list(EXTRA_LINK_ARGS), - ) - extensions = [plugin_ext] - if BUILD_WITH_CYTHON: - from Cython import Build - return Build.cythonize(extensions) - else: - return extensions + if BUILD_WITH_CYTHON: + plugin_sources = [os.path.join('grpc_tools', '_protoc_compiler.pyx')] + else: + plugin_sources = [os.path.join('grpc_tools', '_protoc_compiler.cpp')] + + plugin_sources += [ + os.path.join('grpc_tools', 'main.cc'), + os.path.join('grpc_root', 'src', 'compiler', 'python_generator.cc') + ] + + #HACK: Substitute the embed.cc, which is a JS to C++ + # preprocessor with the generated code. + # The generated code should not be material + # to the parts of protoc we use (it affects + # the JavaScript code generator, supposedly), + # but we need to be cautious about it. + cc_files_clone = list(CC_FILES) + embed_cc_file = os.path.normpath('google/protobuf/compiler/js/embed.cc') + well_known_types_file = os.path.normpath( + 'google/protobuf/compiler/js/well_known_types_embed.cc') + if embed_cc_file in cc_files_clone: + cc_files_clone.remove(embed_cc_file) + if well_known_types_file in cc_files_clone: + cc_files_clone.remove(well_known_types_file) + plugin_sources += [ + os.path.join('grpc_tools', + 'protobuf_generated_well_known_types_embed.cc') + ] + plugin_sources += [ + os.path.join(CC_INCLUDE, cc_file) for cc_file in cc_files_clone + ] + + plugin_ext = extension.Extension( + name='grpc_tools._protoc_compiler', + sources=plugin_sources, + include_dirs=[ + '.', + 'grpc_root', + os.path.join('grpc_root', 'include'), + CC_INCLUDE, + ], + language='c++', + define_macros=list(DEFINE_MACROS), + extra_compile_args=list(EXTRA_COMPILE_ARGS), + extra_link_args=list(EXTRA_LINK_ARGS),) + extensions = [plugin_ext] + if BUILD_WITH_CYTHON: + from Cython import Build + return Build.cythonize(extensions) + else: + return extensions + setuptools.setup( - name='grpcio-tools', - version=grpc_version.VERSION, - description='Protobuf code generator for gRPC', - author='The gRPC Authors', - author_email='grpc-io@googlegroups.com', - url='https://grpc.io', - license='Apache License 2.0', - classifiers=CLASSIFIERS, - ext_modules=extension_modules(), - packages=setuptools.find_packages('.'), - install_requires=[ - 'protobuf>=3.5.0.post1', - 'grpcio>={version}'.format(version=grpc_version.VERSION), - ], - package_data=package_data(), -) + name='grpcio-tools', + version=grpc_version.VERSION, + description='Protobuf code generator for gRPC', + author='The gRPC Authors', + author_email='grpc-io@googlegroups.com', + url='https://grpc.io', + license='Apache License 2.0', + classifiers=CLASSIFIERS, + ext_modules=extension_modules(), + packages=setuptools.find_packages('.'), + install_requires=[ + 'protobuf>=3.5.0.post1', + 'grpcio>={version}'.format(version=grpc_version.VERSION), + ], + package_data=package_data(),) diff --git a/tools/distrib/python/make_grpcio_tools.py b/tools/distrib/python/make_grpcio_tools.py index c865f0bcc03..216492a2f34 100755 --- a/tools/distrib/python/make_grpcio_tools.py +++ b/tools/distrib/python/make_grpcio_tools.py @@ -27,7 +27,7 @@ import sys import traceback import uuid -DEPS_FILE_CONTENT=""" +DEPS_FILE_CONTENT = """ # Copyright 2017 gRPC authors. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -60,15 +60,16 @@ PROTOBUF_CC_PREFIX = '//:src/' PROTOBUF_PROTO_PREFIX = '//:src/' GRPC_ROOT = os.path.abspath( - os.path.join(os.path.dirname(os.path.abspath(__file__)), - '..', '..', '..')) + os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..')) -GRPC_PYTHON_ROOT = os.path.join(GRPC_ROOT, 'tools', 'distrib', - 'python', 'grpcio_tools') +GRPC_PYTHON_ROOT = os.path.join(GRPC_ROOT, 'tools', 'distrib', 'python', + 'grpcio_tools') -GRPC_PYTHON_PROTOBUF_RELATIVE_ROOT = os.path.join('third_party', 'protobuf', 'src') +GRPC_PYTHON_PROTOBUF_RELATIVE_ROOT = os.path.join('third_party', 'protobuf', + 'src') GRPC_PROTOBUF = os.path.join(GRPC_ROOT, GRPC_PYTHON_PROTOBUF_RELATIVE_ROOT) -GRPC_PROTOBUF_SUBMODULE_ROOT = os.path.join(GRPC_ROOT, 'third_party', 'protobuf') +GRPC_PROTOBUF_SUBMODULE_ROOT = os.path.join(GRPC_ROOT, 'third_party', + 'protobuf') GRPC_PROTOC_PLUGINS = os.path.join(GRPC_ROOT, 'src', 'compiler') GRPC_PYTHON_PROTOBUF = os.path.join(GRPC_PYTHON_ROOT, 'third_party', 'protobuf', 'src') @@ -80,81 +81,91 @@ GRPC_PYTHON_PROTOC_LIB_DEPS = os.path.join(GRPC_PYTHON_ROOT, GRPC_INCLUDE = os.path.join(GRPC_ROOT, 'include') GRPC_PYTHON_INCLUDE = os.path.join(GRPC_PYTHON_ROOT, 'grpc_root', 'include') -BAZEL_DEPS = os.path.join(GRPC_ROOT, 'tools', 'distrib', 'python', 'bazel_deps.sh') +BAZEL_DEPS = os.path.join(GRPC_ROOT, 'tools', 'distrib', 'python', + 'bazel_deps.sh') BAZEL_DEPS_PROTOC_LIB_QUERY = '//:protoc_lib' BAZEL_DEPS_COMMON_PROTOS_QUERY = '//:well_known_protos' + def protobuf_submodule_commit_hash(): - """Gets the commit hash for the HEAD of the protobuf submodule currently + """Gets the commit hash for the HEAD of the protobuf submodule currently checked out.""" - cwd = os.getcwd() - os.chdir(GRPC_PROTOBUF_SUBMODULE_ROOT) - output = subprocess.check_output(['git', 'rev-parse', 'HEAD']) - os.chdir(cwd) - return output.splitlines()[0].strip() + cwd = os.getcwd() + os.chdir(GRPC_PROTOBUF_SUBMODULE_ROOT) + output = subprocess.check_output(['git', 'rev-parse', 'HEAD']) + os.chdir(cwd) + return output.splitlines()[0].strip() + def bazel_query(query): - output = subprocess.check_output([BAZEL_DEPS, query]) - return output.splitlines() + output = subprocess.check_output([BAZEL_DEPS, query]) + return output.splitlines() + def get_deps(): - """Write the result of the bazel query `query` against protobuf to + """Write the result of the bazel query `query` against protobuf to `out_file`.""" - cc_files_output = bazel_query(BAZEL_DEPS_PROTOC_LIB_QUERY) - cc_files = [ - name[len(PROTOBUF_CC_PREFIX):] for name in cc_files_output - if name.endswith('.cc') and name.startswith(PROTOBUF_CC_PREFIX)] - proto_files_output = bazel_query(BAZEL_DEPS_COMMON_PROTOS_QUERY) - proto_files = [ - name[len(PROTOBUF_PROTO_PREFIX):] for name in proto_files_output - if name.endswith('.proto') and name.startswith(PROTOBUF_PROTO_PREFIX)] - commit_hash = protobuf_submodule_commit_hash() - deps_file_content = DEPS_FILE_CONTENT.format( - cc_files=cc_files, - proto_files=proto_files, - cc_include=repr(GRPC_PYTHON_PROTOBUF_RELATIVE_ROOT), - proto_include=repr(GRPC_PYTHON_PROTOBUF_RELATIVE_ROOT), - commit_hash=COMMIT_HASH_PREFIX + commit_hash + COMMIT_HASH_SUFFIX) - return deps_file_content + cc_files_output = bazel_query(BAZEL_DEPS_PROTOC_LIB_QUERY) + cc_files = [ + name[len(PROTOBUF_CC_PREFIX):] for name in cc_files_output + if name.endswith('.cc') and name.startswith(PROTOBUF_CC_PREFIX) + ] + proto_files_output = bazel_query(BAZEL_DEPS_COMMON_PROTOS_QUERY) + proto_files = [ + name[len(PROTOBUF_PROTO_PREFIX):] for name in proto_files_output + if name.endswith('.proto') and name.startswith(PROTOBUF_PROTO_PREFIX) + ] + commit_hash = protobuf_submodule_commit_hash() + deps_file_content = DEPS_FILE_CONTENT.format( + cc_files=cc_files, + proto_files=proto_files, + cc_include=repr(GRPC_PYTHON_PROTOBUF_RELATIVE_ROOT), + proto_include=repr(GRPC_PYTHON_PROTOBUF_RELATIVE_ROOT), + commit_hash=COMMIT_HASH_PREFIX + commit_hash + COMMIT_HASH_SUFFIX) + return deps_file_content + def long_path(path): - if os.name == 'nt': - return '\\\\?\\' + path - else: - return path + if os.name == 'nt': + return '\\\\?\\' + path + else: + return path + def main(): - os.chdir(GRPC_ROOT) - - for source, target in [ - (GRPC_PROTOBUF, GRPC_PYTHON_PROTOBUF), - (GRPC_PROTOC_PLUGINS, GRPC_PYTHON_PROTOC_PLUGINS), - (GRPC_INCLUDE, GRPC_PYTHON_INCLUDE)]: - for source_dir, _, files in os.walk(source): - target_dir = os.path.abspath(os.path.join(target, os.path.relpath(source_dir, source))) - try: - os.makedirs(target_dir) - except OSError as error: - if error.errno != errno.EEXIST: - raise - for relative_file in files: - source_file = os.path.abspath(os.path.join(source_dir, relative_file)) - target_file = os.path.abspath(os.path.join(target_dir, relative_file)) - shutil.copyfile(source_file, target_file) - - try: - protoc_lib_deps_content = get_deps() - except Exception as error: - # We allow this script to succeed even if we couldn't get the dependencies, - # as then we can assume that even without a successful bazel run the - # dependencies currently in source control are 'good enough'. - sys.stderr.write("Got non-fatal error:\n") - traceback.print_exc(file=sys.stderr) - return - # If we successfully got the dependencies, truncate and rewrite the deps file. - with open(GRPC_PYTHON_PROTOC_LIB_DEPS, 'w') as deps_file: - deps_file.write(protoc_lib_deps_content) + os.chdir(GRPC_ROOT) + + for source, target in [(GRPC_PROTOBUF, GRPC_PYTHON_PROTOBUF), + (GRPC_PROTOC_PLUGINS, GRPC_PYTHON_PROTOC_PLUGINS), + (GRPC_INCLUDE, GRPC_PYTHON_INCLUDE)]: + for source_dir, _, files in os.walk(source): + target_dir = os.path.abspath( + os.path.join(target, os.path.relpath(source_dir, source))) + try: + os.makedirs(target_dir) + except OSError as error: + if error.errno != errno.EEXIST: + raise + for relative_file in files: + source_file = os.path.abspath( + os.path.join(source_dir, relative_file)) + target_file = os.path.abspath( + os.path.join(target_dir, relative_file)) + shutil.copyfile(source_file, target_file) + + try: + protoc_lib_deps_content = get_deps() + except Exception as error: + # We allow this script to succeed even if we couldn't get the dependencies, + # as then we can assume that even without a successful bazel run the + # dependencies currently in source control are 'good enough'. + sys.stderr.write("Got non-fatal error:\n") + traceback.print_exc(file=sys.stderr) + return + # If we successfully got the dependencies, truncate and rewrite the deps file. + with open(GRPC_PYTHON_PROTOC_LIB_DEPS, 'w') as deps_file: + deps_file.write(protoc_lib_deps_content) -if __name__ == '__main__': - main() +if __name__ == '__main__': + main() diff --git a/tools/distrib/python/submit.py b/tools/distrib/python/submit.py index 92eab5ad659..aff71b5eb1d 100755 --- a/tools/distrib/python/submit.py +++ b/tools/distrib/python/submit.py @@ -21,43 +21,52 @@ import subprocess parser = argparse.ArgumentParser( description='Submit the package to a PyPI repository.') parser.add_argument( - '--repository', '-r', metavar='r', type=str, default='pypi', + '--repository', + '-r', + metavar='r', + type=str, + default='pypi', help='The repository to push the package to. ' - 'Ensure the value appears in your .pypirc file. ' - 'Defaults to "pypi".' -) + 'Ensure the value appears in your .pypirc file. ' + 'Defaults to "pypi".') parser.add_argument( - '--identity', '-i', metavar='i', type=str, - help='GPG identity to sign the files with.' -) + '--identity', + '-i', + metavar='i', + type=str, + help='GPG identity to sign the files with.') parser.add_argument( - '--username', '-u', metavar='u', type=str, + '--username', + '-u', + metavar='u', + type=str, help='Username to authenticate with the repository. Not needed if you have ' - 'configured your .pypirc to include your username.' -) + 'configured your .pypirc to include your username.') parser.add_argument( - '--password', '-p', metavar='p', type=str, + '--password', + '-p', + metavar='p', + type=str, help='Password to authenticate with the repository. Not needed if you have ' - 'configured your .pypirc to include your password.' -) + 'configured your .pypirc to include your password.') parser.add_argument( - '--bdist', '-b', action='store_true', - help='Generate a binary distribution (wheel) for the current OS.' -) + '--bdist', + '-b', + action='store_true', + help='Generate a binary distribution (wheel) for the current OS.') parser.add_argument( - '--dist-args', type=str, - help='Additional arguments to pass to the *dist setup.py command.' -) + '--dist-args', + type=str, + help='Additional arguments to pass to the *dist setup.py command.') args = parser.parse_args() # Move to the root directory of Python GRPC. -pkgdir = os.path.join(os.path.dirname(os.path.abspath(__file__)), - '../../../') +pkgdir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '../../../') # Remove previous distributions; they somehow confuse twine. try: - shutil.rmtree(os.path.join(pkgdir, 'dist/')) + shutil.rmtree(os.path.join(pkgdir, 'dist/')) except: - pass + pass # Build the Cython C files build_env = os.environ.copy() @@ -67,20 +76,20 @@ subprocess.call(cmd, cwd=pkgdir, env=build_env) # Make the push. if args.bdist: - cmd = ['python', 'setup.py', 'bdist_wheel'] + cmd = ['python', 'setup.py', 'bdist_wheel'] else: - cmd = ['python', 'setup.py', 'sdist'] + cmd = ['python', 'setup.py', 'sdist'] if args.dist_args: - cmd += args.dist_args.split() + cmd += args.dist_args.split() subprocess.call(cmd, cwd=pkgdir) cmd = ['twine', 'upload', '-r', args.repository] if args.identity is not None: - cmd.extend(['-i', args.identity]) + cmd.extend(['-i', args.identity]) if args.username is not None: - cmd.extend(['-u', args.username]) + cmd.extend(['-u', args.username]) if args.password is not None: - cmd.extend(['-p', args.password]) + cmd.extend(['-p', args.password]) cmd.append('dist/*') subprocess.call(cmd, cwd=pkgdir) diff --git a/tools/distrib/run_clang_tidy.py b/tools/distrib/run_clang_tidy.py index d002a04de9f..3ac712ea9e0 100755 --- a/tools/distrib/run_clang_tidy.py +++ b/tools/distrib/run_clang_tidy.py @@ -20,51 +20,51 @@ import argparse import multiprocessing sys.path.append( - os.path.join( - os.path.dirname(sys.argv[0]), '..', 'run_tests', 'python_utils')) + os.path.join( + os.path.dirname(sys.argv[0]), '..', 'run_tests', 'python_utils')) import jobset GRPC_CHECKS = [ - 'modernize-use-nullptr', + 'modernize-use-nullptr', ] extra_args = [ - '-x', - 'c++', - '-std=c++11', + '-x', + 'c++', + '-std=c++11', ] with open('.clang_complete') as f: - for line in f: - line = line.strip() - if line.startswith('-I'): - extra_args.append(line) + for line in f: + line = line.strip() + if line.startswith('-I'): + extra_args.append(line) clang_tidy = os.environ.get('CLANG_TIDY', 'clang-tidy') argp = argparse.ArgumentParser(description='Run clang-tidy against core') argp.add_argument('files', nargs='+', help='Files to tidy') argp.add_argument('--fix', dest='fix', action='store_true') -argp.add_argument('-j', '--jobs', type=int, default=multiprocessing.cpu_count(), - help='Number of CPUs to use') +argp.add_argument( + '-j', + '--jobs', + type=int, + default=multiprocessing.cpu_count(), + help='Number of CPUs to use') argp.set_defaults(fix=False) args = argp.parse_args() cmdline = [ - clang_tidy, - '--checks=-*,%s' % ','.join(GRPC_CHECKS), + clang_tidy, '--checks=-*,%s' % ','.join(GRPC_CHECKS), '--warnings-as-errors=%s' % ','.join(GRPC_CHECKS) -] + [ - '--extra-arg-before=%s' % arg - for arg in extra_args -] +] + ['--extra-arg-before=%s' % arg for arg in extra_args] if args.fix: - cmdline.append('--fix') + cmdline.append('--fix') jobs = [] for filename in args.files: - jobs.append(jobset.JobSpec(cmdline + [filename], - shortname=filename, - ))#verbose_success=True)) + jobs.append(jobset.JobSpec( + cmdline + [filename], + shortname=filename,)) #verbose_success=True)) jobset.run(jobs, maxjobs=args.jobs) diff --git a/tools/distrib/yapf_code.sh b/tools/distrib/yapf_code.sh index b784f60e4dd..dafb857abd1 100755 --- a/tools/distrib/yapf_code.sh +++ b/tools/distrib/yapf_code.sh @@ -22,6 +22,7 @@ DIRS=( 'src/python' 'tools/buildgen' 'tools/codegen' + 'tools/distrib' ) EXCLUSIONS=( 'grpcio/grpc_*.py' From e4bef08a8ce5c9615e43a8b245984a3aa4e1b904 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 11 Dec 2017 16:51:34 -0800 Subject: [PATCH 105/127] yapf tools/interop_matrix --- tools/distrib/yapf_code.sh | 1 + tools/interop_matrix/client_matrix.py | 269 +++++++--- tools/interop_matrix/create_matrix_images.py | 484 ++++++++++-------- .../run_interop_matrix_tests.py | 320 ++++++------ 4 files changed, 628 insertions(+), 446 deletions(-) diff --git a/tools/distrib/yapf_code.sh b/tools/distrib/yapf_code.sh index dafb857abd1..52bd3a2cf34 100755 --- a/tools/distrib/yapf_code.sh +++ b/tools/distrib/yapf_code.sh @@ -23,6 +23,7 @@ DIRS=( 'tools/buildgen' 'tools/codegen' 'tools/distrib' + 'tools/interop_matrix' ) EXCLUSIONS=( 'grpcio/grpc_*.py' diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py index 72813073638..f32bdf8b150 100644 --- a/tools/interop_matrix/client_matrix.py +++ b/tools/interop_matrix/client_matrix.py @@ -15,29 +15,34 @@ # Dictionaries used for client matrix testing. + def get_github_repo(lang): - return { - 'go': 'git@github.com:grpc/grpc-go.git', - 'java': 'git@github.com:grpc/grpc-java.git', - 'node': 'git@github.com:grpc/grpc-node.git', - # all other languages use the grpc.git repo. - }.get(lang, 'git@github.com:grpc/grpc.git') + return { + 'go': 'git@github.com:grpc/grpc-go.git', + 'java': 'git@github.com:grpc/grpc-java.git', + 'node': 'git@github.com:grpc/grpc-node.git', + # all other languages use the grpc.git repo. + }.get(lang, 'git@github.com:grpc/grpc.git') + def get_release_tags(lang): - return map(lambda r: get_release_tag_name(r), LANG_RELEASE_MATRIX[lang]) + return map(lambda r: get_release_tag_name(r), LANG_RELEASE_MATRIX[lang]) + def get_release_tag_name(release_info): - assert len(release_info.keys()) == 1 - return release_info.keys()[0] + assert len(release_info.keys()) == 1 + return release_info.keys()[0] + def should_build_docker_interop_image_from_release_tag(lang): - if lang in ['go', 'java', 'node']: - return False - return True + if lang in ['go', 'java', 'node']: + return False + return True + # Dictionary of runtimes per language LANG_RUNTIME_MATRIX = { - 'cxx': ['cxx'], # This is actually debian8. + 'cxx': ['cxx'], # This is actually debian8. 'go': ['go1.7', 'go1.8'], 'java': ['java_oracle8'], 'python': ['python'], @@ -51,81 +56,197 @@ LANG_RUNTIME_MATRIX = { # a release tag pointing to the latest build of the branch. LANG_RELEASE_MATRIX = { 'cxx': [ - {'v1.0.1': None}, - {'v1.1.4': None}, - {'v1.2.5': None}, - {'v1.3.9': None}, - {'v1.4.2': None}, - {'v1.6.6': None}, - {'v1.7.2': None}, + { + 'v1.0.1': None + }, + { + 'v1.1.4': None + }, + { + 'v1.2.5': None + }, + { + 'v1.3.9': None + }, + { + 'v1.4.2': None + }, + { + 'v1.6.6': None + }, + { + 'v1.7.2': None + }, ], 'go': [ - {'v1.0.5': None}, - {'v1.2.1': None}, - {'v1.3.0': None}, - {'v1.4.2': None}, - {'v1.5.2': None}, - {'v1.6.0': None}, - {'v1.7.4': None}, - {'v1.8.1': None}, + { + 'v1.0.5': None + }, + { + 'v1.2.1': None + }, + { + 'v1.3.0': None + }, + { + 'v1.4.2': None + }, + { + 'v1.5.2': None + }, + { + 'v1.6.0': None + }, + { + 'v1.7.4': None + }, + { + 'v1.8.1': None + }, ], 'java': [ - {'v1.0.3': None}, - {'v1.1.2': None}, - {'v1.2.0': None}, - {'v1.3.1': None}, - {'v1.4.0': None}, - {'v1.5.0': None}, - {'v1.6.1': None}, - {'v1.7.0': None}, - {'v1.8.0': None}, + { + 'v1.0.3': None + }, + { + 'v1.1.2': None + }, + { + 'v1.2.0': None + }, + { + 'v1.3.1': None + }, + { + 'v1.4.0': None + }, + { + 'v1.5.0': None + }, + { + 'v1.6.1': None + }, + { + 'v1.7.0': None + }, + { + 'v1.8.0': None + }, ], 'python': [ - {'v1.0.x': None}, - {'v1.1.4': None}, - {'v1.2.5': None}, - {'v1.3.9': None}, - {'v1.4.2': None}, - {'v1.6.6': None}, - {'v1.7.2': None}, + { + 'v1.0.x': None + }, + { + 'v1.1.4': None + }, + { + 'v1.2.5': None + }, + { + 'v1.3.9': None + }, + { + 'v1.4.2': None + }, + { + 'v1.6.6': None + }, + { + 'v1.7.2': None + }, ], 'node': [ - {'v1.0.1': None}, - {'v1.1.4': None}, - {'v1.2.5': None}, - {'v1.3.9': None}, - {'v1.4.2': None}, - {'v1.6.6': None}, + { + 'v1.0.1': None + }, + { + 'v1.1.4': None + }, + { + 'v1.2.5': None + }, + { + 'v1.3.9': None + }, + { + 'v1.4.2': None + }, + { + 'v1.6.6': None + }, #{'v1.7.1': None}, Failing tests ], 'ruby': [ - {'v1.0.1': {'patch': [ - 'tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile', - 'tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh', - ]}}, - {'v1.1.4': None}, - {'v1.2.5': None}, - {'v1.3.9': None}, - {'v1.4.2': None}, - {'v1.6.6': None}, - {'v1.7.2': None}, + { + 'v1.0.1': { + 'patch': [ + 'tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile', + 'tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh', + ] + } + }, + { + 'v1.1.4': None + }, + { + 'v1.2.5': None + }, + { + 'v1.3.9': None + }, + { + 'v1.4.2': None + }, + { + 'v1.6.6': None + }, + { + 'v1.7.2': None + }, ], 'php': [ - {'v1.0.1': None}, - {'v1.1.4': None}, - {'v1.2.5': None}, - {'v1.3.9': None}, - {'v1.4.2': None}, - {'v1.6.6': None}, - {'v1.7.2': None}, + { + 'v1.0.1': None + }, + { + 'v1.1.4': None + }, + { + 'v1.2.5': None + }, + { + 'v1.3.9': None + }, + { + 'v1.4.2': None + }, + { + 'v1.6.6': None + }, + { + 'v1.7.2': None + }, ], - 'csharp': [ + 'csharp': [ #{'v1.0.1': None}, - {'v1.1.4': None}, - {'v1.2.5': None}, - {'v1.3.9': None}, - {'v1.4.2': None}, - {'v1.6.6': None}, - {'v1.7.2': None}, + { + 'v1.1.4': None + }, + { + 'v1.2.5': None + }, + { + 'v1.3.9': None + }, + { + 'v1.4.2': None + }, + { + 'v1.6.6': None + }, + { + 'v1.7.2': None + }, ], } diff --git a/tools/interop_matrix/create_matrix_images.py b/tools/interop_matrix/create_matrix_images.py index a2923681319..05af3a56321 100755 --- a/tools/interop_matrix/create_matrix_images.py +++ b/tools/interop_matrix/create_matrix_images.py @@ -12,7 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Build and upload docker images to Google Container Registry per matrix.""" from __future__ import print_function @@ -29,8 +28,8 @@ import tempfile # Langauage Runtime Matrix import client_matrix -python_util_dir = os.path.abspath(os.path.join( - os.path.dirname(__file__), '../run_tests/python_utils')) +python_util_dir = os.path.abspath( + os.path.join(os.path.dirname(__file__), '../run_tests/python_utils')) sys.path.append(python_util_dir) import dockerjob import jobset @@ -38,267 +37,304 @@ import jobset _IMAGE_BUILDER = 'tools/run_tests/dockerize/build_interop_image.sh' _LANGUAGES = client_matrix.LANG_RUNTIME_MATRIX.keys() # All gRPC release tags, flattened, deduped and sorted. -_RELEASES = sorted(list(set( - client_matrix.get_release_tag_name(info) for lang in client_matrix.LANG_RELEASE_MATRIX.values() for info in lang))) +_RELEASES = sorted( + list( + set( + client_matrix.get_release_tag_name(info) + for lang in client_matrix.LANG_RELEASE_MATRIX.values() + for info in lang))) # Destination directory inside docker image to keep extra info from build time. _BUILD_INFO = '/var/local/build_info' argp = argparse.ArgumentParser(description='Run interop tests.') -argp.add_argument('--gcr_path', - default='gcr.io/grpc-testing', - help='Path of docker images in Google Container Registry') - -argp.add_argument('--release', - default='master', - choices=['all', 'master'] + _RELEASES, - help='github commit tag to checkout. When building all ' - 'releases defined in client_matrix.py, use "all". Valid only ' - 'with --git_checkout.') - -argp.add_argument('-l', '--language', - choices=['all'] + sorted(_LANGUAGES), - nargs='+', - default=['all'], - help='Test languages to build docker images for.') - -argp.add_argument('--git_checkout', - action='store_true', - help='Use a separate git clone tree for building grpc stack. ' - 'Required when using --release flag. By default, current' - 'tree and the sibling will be used for building grpc stack.') - -argp.add_argument('--git_checkout_root', - default='/export/hda3/tmp/grpc_matrix', - help='Directory under which grpc-go/java/main repo will be ' - 'cloned. Valid only with --git_checkout.') - -argp.add_argument('--keep', - action='store_true', - help='keep the created local images after uploading to GCR') - -argp.add_argument('--reuse_git_root', - default=False, - action='store_const', - const=True, - help='reuse the repo dir. If False, the existing git root ' - 'directory will removed before a clean checkout, because ' - 'reusing the repo can cause git checkout error if you switch ' - 'between releases.') - +argp.add_argument( + '--gcr_path', + default='gcr.io/grpc-testing', + help='Path of docker images in Google Container Registry') + +argp.add_argument( + '--release', + default='master', + choices=['all', 'master'] + _RELEASES, + help='github commit tag to checkout. When building all ' + 'releases defined in client_matrix.py, use "all". Valid only ' + 'with --git_checkout.') + +argp.add_argument( + '-l', + '--language', + choices=['all'] + sorted(_LANGUAGES), + nargs='+', + default=['all'], + help='Test languages to build docker images for.') + +argp.add_argument( + '--git_checkout', + action='store_true', + help='Use a separate git clone tree for building grpc stack. ' + 'Required when using --release flag. By default, current' + 'tree and the sibling will be used for building grpc stack.') + +argp.add_argument( + '--git_checkout_root', + default='/export/hda3/tmp/grpc_matrix', + help='Directory under which grpc-go/java/main repo will be ' + 'cloned. Valid only with --git_checkout.') + +argp.add_argument( + '--keep', + action='store_true', + help='keep the created local images after uploading to GCR') + +argp.add_argument( + '--reuse_git_root', + default=False, + action='store_const', + const=True, + help='reuse the repo dir. If False, the existing git root ' + 'directory will removed before a clean checkout, because ' + 'reusing the repo can cause git checkout error if you switch ' + 'between releases.') args = argp.parse_args() + def add_files_to_image(image, with_files, label=None): - """Add files to a docker image. + """Add files to a docker image. image: docker image name, i.e. grpc_interop_java:26328ad8 with_files: additional files to include in the docker image. label: label string to attach to the image. """ - tag_idx = image.find(':') - if tag_idx == -1: - jobset.message('FAILED', 'invalid docker image %s' % image, do_newline=True) - sys.exit(1) - orig_tag = '%s_' % image - subprocess.check_output(['docker', 'tag', image, orig_tag]) - - lines = ['FROM ' + orig_tag] - if label: - lines.append('LABEL %s' % label) - - temp_dir = tempfile.mkdtemp() - atexit.register(lambda: subprocess.call(['rm', '-rf', temp_dir])) - - # Copy with_files inside the tmp directory, which will be the docker build - # context. - for f in with_files: - shutil.copy(f, temp_dir) - lines.append('COPY %s %s/' % (os.path.basename(f), _BUILD_INFO)) - - # Create a Dockerfile. - with open(os.path.join(temp_dir, 'Dockerfile'), 'w') as f: - f.write('\n'.join(lines)) - - jobset.message('START', 'Repackaging %s' % image, do_newline=True) - build_cmd = ['docker', 'build', '--rm', '--tag', image, temp_dir] - subprocess.check_output(build_cmd) - dockerjob.remove_image(orig_tag, skip_nonexistent=True) + tag_idx = image.find(':') + if tag_idx == -1: + jobset.message( + 'FAILED', 'invalid docker image %s' % image, do_newline=True) + sys.exit(1) + orig_tag = '%s_' % image + subprocess.check_output(['docker', 'tag', image, orig_tag]) + + lines = ['FROM ' + orig_tag] + if label: + lines.append('LABEL %s' % label) + + temp_dir = tempfile.mkdtemp() + atexit.register(lambda: subprocess.call(['rm', '-rf', temp_dir])) + + # Copy with_files inside the tmp directory, which will be the docker build + # context. + for f in with_files: + shutil.copy(f, temp_dir) + lines.append('COPY %s %s/' % (os.path.basename(f), _BUILD_INFO)) + + # Create a Dockerfile. + with open(os.path.join(temp_dir, 'Dockerfile'), 'w') as f: + f.write('\n'.join(lines)) + + jobset.message('START', 'Repackaging %s' % image, do_newline=True) + build_cmd = ['docker', 'build', '--rm', '--tag', image, temp_dir] + subprocess.check_output(build_cmd) + dockerjob.remove_image(orig_tag, skip_nonexistent=True) + def build_image_jobspec(runtime, env, gcr_tag, stack_base): - """Build interop docker image for a language with runtime. + """Build interop docker image for a language with runtime. runtime: a string, for example go1.8. env: dictionary of env to passed to the build script. gcr_tag: the tag for the docker image (i.e. v1.3.0). stack_base: the local gRPC repo path. """ - basename = 'grpc_interop_%s' % runtime - tag = '%s/%s:%s' % (args.gcr_path, basename, gcr_tag) - build_env = { - 'INTEROP_IMAGE': tag, - 'BASE_NAME': basename, - 'TTY_FLAG': '-t' - } - build_env.update(env) - image_builder_path = _IMAGE_BUILDER - if client_matrix.should_build_docker_interop_image_from_release_tag(lang): - image_builder_path = os.path.join(stack_base, _IMAGE_BUILDER) - build_job = jobset.JobSpec( - cmdline=[image_builder_path], - environ=build_env, - shortname='build_docker_%s' % runtime, - timeout_seconds=30*60) - build_job.tag = tag - return build_job + basename = 'grpc_interop_%s' % runtime + tag = '%s/%s:%s' % (args.gcr_path, basename, gcr_tag) + build_env = {'INTEROP_IMAGE': tag, 'BASE_NAME': basename, 'TTY_FLAG': '-t'} + build_env.update(env) + image_builder_path = _IMAGE_BUILDER + if client_matrix.should_build_docker_interop_image_from_release_tag(lang): + image_builder_path = os.path.join(stack_base, _IMAGE_BUILDER) + build_job = jobset.JobSpec( + cmdline=[image_builder_path], + environ=build_env, + shortname='build_docker_%s' % runtime, + timeout_seconds=30 * 60) + build_job.tag = tag + return build_job + def build_all_images_for_lang(lang): - """Build all docker images for a language across releases and runtimes.""" - if not args.git_checkout: - if args.release != 'master': - print('WARNING: --release is set but will be ignored\n') - releases = ['master'] - else: - if args.release == 'all': - releases = client_matrix.get_release_tags(lang) + """Build all docker images for a language across releases and runtimes.""" + if not args.git_checkout: + if args.release != 'master': + print('WARNING: --release is set but will be ignored\n') + releases = ['master'] else: - # Build a particular release. - if args.release not in ['master'] + client_matrix.get_release_tags(lang): - jobset.message('SKIPPED', - '%s for %s is not defined' % (args.release, lang), - do_newline=True) - return [] - releases = [args.release] - - images = [] - for release in releases: - images += build_all_images_for_release(lang, release) - jobset.message('SUCCESS', - 'All docker images built for %s at %s.' % (lang, releases), - do_newline=True) - return images + if args.release == 'all': + releases = client_matrix.get_release_tags(lang) + else: + # Build a particular release. + if args.release not in ['master'] + client_matrix.get_release_tags( + lang): + jobset.message( + 'SKIPPED', + '%s for %s is not defined' % (args.release, lang), + do_newline=True) + return [] + releases = [args.release] + + images = [] + for release in releases: + images += build_all_images_for_release(lang, release) + jobset.message( + 'SUCCESS', + 'All docker images built for %s at %s.' % (lang, releases), + do_newline=True) + return images + def build_all_images_for_release(lang, release): - """Build all docker images for a release across all runtimes.""" - docker_images = [] - build_jobs = [] - - env = {} - # If we not using current tree or the sibling for grpc stack, do checkout. - stack_base = '' - if args.git_checkout: - stack_base = checkout_grpc_stack(lang, release) - var ={'go': 'GRPC_GO_ROOT', 'java': 'GRPC_JAVA_ROOT', 'node': 'GRPC_NODE_ROOT'}.get(lang, 'GRPC_ROOT') - env[var] = stack_base - - for runtime in client_matrix.LANG_RUNTIME_MATRIX[lang]: - job = build_image_jobspec(runtime, env, release, stack_base) - docker_images.append(job.tag) - build_jobs.append(job) - - jobset.message('START', 'Building interop docker images.', do_newline=True) - print('Jobs to run: \n%s\n' % '\n'.join(str(j) for j in build_jobs)) - - num_failures, _ = jobset.run( - build_jobs, newline_on_success=True, maxjobs=multiprocessing.cpu_count()) - if num_failures: - jobset.message('FAILED', 'Failed to build interop docker images.', - do_newline=True) - docker_images_cleanup.extend(docker_images) - sys.exit(1) - - jobset.message('SUCCESS', - 'All docker images built for %s at %s.' % (lang, release), - do_newline=True) - - if release != 'master': - commit_log = os.path.join(stack_base, 'commit_log') - if os.path.exists(commit_log): - for image in docker_images: - add_files_to_image(image, [commit_log], 'release=%s' % release) - return docker_images + """Build all docker images for a release across all runtimes.""" + docker_images = [] + build_jobs = [] + + env = {} + # If we not using current tree or the sibling for grpc stack, do checkout. + stack_base = '' + if args.git_checkout: + stack_base = checkout_grpc_stack(lang, release) + var = { + 'go': 'GRPC_GO_ROOT', + 'java': 'GRPC_JAVA_ROOT', + 'node': 'GRPC_NODE_ROOT' + }.get(lang, 'GRPC_ROOT') + env[var] = stack_base + + for runtime in client_matrix.LANG_RUNTIME_MATRIX[lang]: + job = build_image_jobspec(runtime, env, release, stack_base) + docker_images.append(job.tag) + build_jobs.append(job) + + jobset.message('START', 'Building interop docker images.', do_newline=True) + print('Jobs to run: \n%s\n' % '\n'.join(str(j) for j in build_jobs)) + + num_failures, _ = jobset.run( + build_jobs, + newline_on_success=True, + maxjobs=multiprocessing.cpu_count()) + if num_failures: + jobset.message( + 'FAILED', 'Failed to build interop docker images.', do_newline=True) + docker_images_cleanup.extend(docker_images) + sys.exit(1) + + jobset.message( + 'SUCCESS', + 'All docker images built for %s at %s.' % (lang, release), + do_newline=True) + + if release != 'master': + commit_log = os.path.join(stack_base, 'commit_log') + if os.path.exists(commit_log): + for image in docker_images: + add_files_to_image(image, [commit_log], 'release=%s' % release) + return docker_images + def cleanup(): - if not args.keep: - for image in docker_images_cleanup: - dockerjob.remove_image(image, skip_nonexistent=True) + if not args.keep: + for image in docker_images_cleanup: + dockerjob.remove_image(image, skip_nonexistent=True) + docker_images_cleanup = [] atexit.register(cleanup) + def maybe_apply_patches_on_git_tag(stack_base, lang, release): - files_to_patch = [] - for release_info in client_matrix.LANG_RELEASE_MATRIX[lang]: - if client_matrix.get_release_tag_name(release_info) == release: - files_to_patch = release_info[release].get('patch') - break - if not files_to_patch: - return - patch_file_relative_path = 'patches/%s_%s/git_repo.patch' % (lang, release) - patch_file = os.path.abspath(os.path.join(os.path.dirname(__file__), - patch_file_relative_path)) - if not os.path.exists(patch_file): - jobset.message('FAILED', 'expected patch file |%s| to exist' % patch_file) - sys.exit(1) - subprocess.check_output( - ['git', 'apply', patch_file], cwd=stack_base, stderr=subprocess.STDOUT) - for repo_relative_path in files_to_patch: + files_to_patch = [] + for release_info in client_matrix.LANG_RELEASE_MATRIX[lang]: + if client_matrix.get_release_tag_name(release_info) == release: + files_to_patch = release_info[release].get('patch') + break + if not files_to_patch: + return + patch_file_relative_path = 'patches/%s_%s/git_repo.patch' % (lang, release) + patch_file = os.path.abspath( + os.path.join(os.path.dirname(__file__), patch_file_relative_path)) + if not os.path.exists(patch_file): + jobset.message('FAILED', 'expected patch file |%s| to exist' % + patch_file) + sys.exit(1) + subprocess.check_output( + ['git', 'apply', patch_file], cwd=stack_base, stderr=subprocess.STDOUT) + for repo_relative_path in files_to_patch: + subprocess.check_output( + ['git', 'add', repo_relative_path], + cwd=stack_base, + stderr=subprocess.STDOUT) subprocess.check_output( - ['git', 'add', repo_relative_path], + [ + 'git', 'commit', '-m', + ('Hack performed on top of %s git ' + 'tag in order to build and run the %s ' + 'interop tests on that tag.' % (lang, release)) + ], cwd=stack_base, stderr=subprocess.STDOUT) - subprocess.check_output( - ['git', 'commit', '-m', ('Hack performed on top of %s git ' - 'tag in order to build and run the %s ' - 'interop tests on that tag.' % (lang, release))], - cwd=stack_base, stderr=subprocess.STDOUT) + def checkout_grpc_stack(lang, release): - """Invokes 'git check' for the lang/release and returns directory created.""" - assert args.git_checkout and args.git_checkout_root - - if not os.path.exists(args.git_checkout_root): - os.makedirs(args.git_checkout_root) - - repo = client_matrix.get_github_repo(lang) - # Get the subdir name part of repo - # For example, 'git@github.com:grpc/grpc-go.git' should use 'grpc-go'. - repo_dir = os.path.splitext(os.path.basename(repo))[0] - stack_base = os.path.join(args.git_checkout_root, repo_dir) - - # Clean up leftover repo dir if necessary. - if not args.reuse_git_root and os.path.exists(stack_base): - jobset.message('START', 'Removing git checkout root.', do_newline=True) - shutil.rmtree(stack_base) - - if not os.path.exists(stack_base): - subprocess.check_call(['git', 'clone', '--recursive', repo], - cwd=os.path.dirname(stack_base)) - - # git checkout. - jobset.message('START', 'git checkout %s from %s' % (release, stack_base), - do_newline=True) - # We should NEVER do checkout on current tree !!! - assert not os.path.dirname(__file__).startswith(stack_base) - output = subprocess.check_output( - ['git', 'checkout', release], cwd=stack_base, stderr=subprocess.STDOUT) - maybe_apply_patches_on_git_tag(stack_base, lang, release) - commit_log = subprocess.check_output(['git', 'log', '-1'], cwd=stack_base) - jobset.message('SUCCESS', 'git checkout', - '%s: %s' % (str(output), commit_log), - do_newline=True) - - # Write git log to commit_log so it can be packaged with the docker image. - with open(os.path.join(stack_base, 'commit_log'), 'w') as f: - f.write(commit_log) - return stack_base + """Invokes 'git check' for the lang/release and returns directory created.""" + assert args.git_checkout and args.git_checkout_root + + if not os.path.exists(args.git_checkout_root): + os.makedirs(args.git_checkout_root) + + repo = client_matrix.get_github_repo(lang) + # Get the subdir name part of repo + # For example, 'git@github.com:grpc/grpc-go.git' should use 'grpc-go'. + repo_dir = os.path.splitext(os.path.basename(repo))[0] + stack_base = os.path.join(args.git_checkout_root, repo_dir) + + # Clean up leftover repo dir if necessary. + if not args.reuse_git_root and os.path.exists(stack_base): + jobset.message('START', 'Removing git checkout root.', do_newline=True) + shutil.rmtree(stack_base) + + if not os.path.exists(stack_base): + subprocess.check_call( + ['git', 'clone', '--recursive', repo], + cwd=os.path.dirname(stack_base)) + + # git checkout. + jobset.message( + 'START', + 'git checkout %s from %s' % (release, stack_base), + do_newline=True) + # We should NEVER do checkout on current tree !!! + assert not os.path.dirname(__file__).startswith(stack_base) + output = subprocess.check_output( + ['git', 'checkout', release], cwd=stack_base, stderr=subprocess.STDOUT) + maybe_apply_patches_on_git_tag(stack_base, lang, release) + commit_log = subprocess.check_output(['git', 'log', '-1'], cwd=stack_base) + jobset.message( + 'SUCCESS', + 'git checkout', + '%s: %s' % (str(output), commit_log), + do_newline=True) + + # Write git log to commit_log so it can be packaged with the docker image. + with open(os.path.join(stack_base, 'commit_log'), 'w') as f: + f.write(commit_log) + return stack_base + languages = args.language if args.language != ['all'] else _LANGUAGES for lang in languages: - docker_images = build_all_images_for_lang(lang) - for image in docker_images: - jobset.message('START', 'Uploading %s' % image, do_newline=True) - # docker image name must be in the format /: - assert image.startswith(args.gcr_path) and image.find(':') != -1 + docker_images = build_all_images_for_lang(lang) + for image in docker_images: + jobset.message('START', 'Uploading %s' % image, do_newline=True) + # docker image name must be in the format /: + assert image.startswith(args.gcr_path) and image.find(':') != -1 - subprocess.call(['gcloud', 'docker', '--', 'push', image]) + subprocess.call(['gcloud', 'docker', '--', 'push', image]) diff --git a/tools/interop_matrix/run_interop_matrix_tests.py b/tools/interop_matrix/run_interop_matrix_tests.py index 1bc35d9e022..ff42bd77b0c 100755 --- a/tools/interop_matrix/run_interop_matrix_tests.py +++ b/tools/interop_matrix/run_interop_matrix_tests.py @@ -12,7 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Run tests using docker images in Google Container Registry per matrix.""" from __future__ import print_function @@ -30,8 +29,8 @@ import uuid # Langauage Runtime Matrix import client_matrix -python_util_dir = os.path.abspath(os.path.join( - os.path.dirname(__file__), '../run_tests/python_utils')) +python_util_dir = os.path.abspath( + os.path.join(os.path.dirname(__file__), '../run_tests/python_utils')) sys.path.append(python_util_dir) import dockerjob import jobset @@ -40,46 +39,56 @@ import upload_test_results _LANGUAGES = client_matrix.LANG_RUNTIME_MATRIX.keys() # All gRPC release tags, flattened, deduped and sorted. -_RELEASES = sorted(list(set( - client_matrix.get_release_tag_name(info) for lang in client_matrix.LANG_RELEASE_MATRIX.values() for info in lang))) +_RELEASES = sorted( + list( + set( + client_matrix.get_release_tag_name(info) + for lang in client_matrix.LANG_RELEASE_MATRIX.values() + for info in lang))) _TEST_TIMEOUT = 30 argp = argparse.ArgumentParser(description='Run interop tests.') argp.add_argument('-j', '--jobs', default=multiprocessing.cpu_count(), type=int) -argp.add_argument('--gcr_path', - default='gcr.io/grpc-testing', - help='Path of docker images in Google Container Registry') -argp.add_argument('--release', - default='all', - choices=['all', 'master'] + _RELEASES, - help='Release tags to test. When testing all ' - 'releases defined in client_matrix.py, use "all".') - -argp.add_argument('-l', '--language', - choices=['all'] + sorted(_LANGUAGES), - nargs='+', - default=['all'], - help='Languages to test') - -argp.add_argument('--keep', - action='store_true', - help='keep the created local images after finishing the tests.') - -argp.add_argument('--report_file', - default='report.xml', - help='The result file to create.') - -argp.add_argument('--allow_flakes', - default=False, - action='store_const', - const=True, - help=('Allow flaky tests to show as passing (re-runs failed ' - 'tests up to five times)')) -argp.add_argument('--bq_result_table', - default='', - type=str, - nargs='?', - help='Upload test results to a specified BQ table.') +argp.add_argument( + '--gcr_path', + default='gcr.io/grpc-testing', + help='Path of docker images in Google Container Registry') +argp.add_argument( + '--release', + default='all', + choices=['all', 'master'] + _RELEASES, + help='Release tags to test. When testing all ' + 'releases defined in client_matrix.py, use "all".') + +argp.add_argument( + '-l', + '--language', + choices=['all'] + sorted(_LANGUAGES), + nargs='+', + default=['all'], + help='Languages to test') + +argp.add_argument( + '--keep', + action='store_true', + help='keep the created local images after finishing the tests.') + +argp.add_argument( + '--report_file', default='report.xml', help='The result file to create.') + +argp.add_argument( + '--allow_flakes', + default=False, + action='store_const', + const=True, + help=('Allow flaky tests to show as passing (re-runs failed ' + 'tests up to five times)')) +argp.add_argument( + '--bq_result_table', + default='', + type=str, + nargs='?', + help='Upload test results to a specified BQ table.') args = argp.parse_args() @@ -87,138 +96,153 @@ print(str(args)) def find_all_images_for_lang(lang): - """Find docker images for a language across releases and runtimes. + """Find docker images for a language across releases and runtimes. Returns dictionary of list of (, ) keyed by runtime. """ - # Find all defined releases. - if args.release == 'all': - releases = ['master'] + client_matrix.get_release_tags(lang) - else: - # Look for a particular release. - if args.release not in ['master'] + client_matrix.get_release_tags(lang): - jobset.message('SKIPPED', - '%s for %s is not defined' % (args.release, lang), - do_newline=True) - return {} - releases = [args.release] - - # Images tuples keyed by runtime. - images = {} - for runtime in client_matrix.LANG_RUNTIME_MATRIX[lang]: - image_path = '%s/grpc_interop_%s' % (args.gcr_path, runtime) - output = subprocess.check_output(['gcloud', 'beta', 'container', 'images', - 'list-tags', '--format=json', image_path]) - docker_image_list = json.loads(output) - # All images should have a single tag or no tag. - # TODO(adelez): Remove tagless images. - tags = [i['tags'][0] for i in docker_image_list if i['tags']] - jobset.message('START', 'Found images for %s: %s' % (image_path, tags), - do_newline=True) - skipped = len(docker_image_list) - len(tags) - jobset.message('SKIPPED', 'Skipped images (no-tag/unknown-tag): %d' % skipped, - do_newline=True) - # Filter tags based on the releases. - images[runtime] = [(tag,'%s:%s' % (image_path,tag)) for tag in tags if - tag in releases] - return images + # Find all defined releases. + if args.release == 'all': + releases = ['master'] + client_matrix.get_release_tags(lang) + else: + # Look for a particular release. + if args.release not in ['master'] + client_matrix.get_release_tags( + lang): + jobset.message( + 'SKIPPED', + '%s for %s is not defined' % (args.release, lang), + do_newline=True) + return {} + releases = [args.release] + + # Images tuples keyed by runtime. + images = {} + for runtime in client_matrix.LANG_RUNTIME_MATRIX[lang]: + image_path = '%s/grpc_interop_%s' % (args.gcr_path, runtime) + output = subprocess.check_output([ + 'gcloud', 'beta', 'container', 'images', 'list-tags', + '--format=json', image_path + ]) + docker_image_list = json.loads(output) + # All images should have a single tag or no tag. + # TODO(adelez): Remove tagless images. + tags = [i['tags'][0] for i in docker_image_list if i['tags']] + jobset.message( + 'START', + 'Found images for %s: %s' % (image_path, tags), + do_newline=True) + skipped = len(docker_image_list) - len(tags) + jobset.message( + 'SKIPPED', + 'Skipped images (no-tag/unknown-tag): %d' % skipped, + do_newline=True) + # Filter tags based on the releases. + images[runtime] = [(tag, '%s:%s' % (image_path, tag)) for tag in tags + if tag in releases] + return images + # caches test cases (list of JobSpec) loaded from file. Keyed by lang and runtime. def find_test_cases(lang, runtime, release, suite_name): - """Returns the list of test cases from testcase files per lang/release.""" - file_tmpl = os.path.join(os.path.dirname(__file__), 'testcases/%s__%s') - testcase_release = release - filename_prefix = lang - if lang == 'csharp': - filename_prefix = runtime - if not os.path.exists(file_tmpl % (filename_prefix, release)): - testcase_release = 'master' - testcases = file_tmpl % (filename_prefix, testcase_release) - - job_spec_list=[] - try: - with open(testcases) as f: - # Only line start with 'docker run' are test cases. - for line in f.readlines(): - if line.startswith('docker run'): - m = re.search('--test_case=(.*)"', line) - shortname = m.group(1) if m else 'unknown_test' - m = re.search('--server_host_override=(.*).sandbox.googleapis.com', + """Returns the list of test cases from testcase files per lang/release.""" + file_tmpl = os.path.join(os.path.dirname(__file__), 'testcases/%s__%s') + testcase_release = release + filename_prefix = lang + if lang == 'csharp': + filename_prefix = runtime + if not os.path.exists(file_tmpl % (filename_prefix, release)): + testcase_release = 'master' + testcases = file_tmpl % (filename_prefix, testcase_release) + + job_spec_list = [] + try: + with open(testcases) as f: + # Only line start with 'docker run' are test cases. + for line in f.readlines(): + if line.startswith('docker run'): + m = re.search('--test_case=(.*)"', line) + shortname = m.group(1) if m else 'unknown_test' + m = re.search( + '--server_host_override=(.*).sandbox.googleapis.com', line) - server = m.group(1) if m else 'unknown_server' - spec = jobset.JobSpec(cmdline=line, - shortname='%s:%s:%s:%s' % (suite_name, lang, - server, shortname), - timeout_seconds=_TEST_TIMEOUT, - shell=True, - flake_retries=5 if args.allow_flakes else 0) - job_spec_list.append(spec) - jobset.message('START', - 'Loaded %s tests from %s' % (len(job_spec_list), testcases), - do_newline=True) - except IOError as err: - jobset.message('FAILED', err, do_newline=True) - return job_spec_list + server = m.group(1) if m else 'unknown_server' + spec = jobset.JobSpec( + cmdline=line, + shortname='%s:%s:%s:%s' % (suite_name, lang, server, + shortname), + timeout_seconds=_TEST_TIMEOUT, + shell=True, + flake_retries=5 if args.allow_flakes else 0) + job_spec_list.append(spec) + jobset.message( + 'START', + 'Loaded %s tests from %s' % (len(job_spec_list), testcases), + do_newline=True) + except IOError as err: + jobset.message('FAILED', err, do_newline=True) + return job_spec_list + _xml_report_tree = report_utils.new_junit_xml_tree() + + def run_tests_for_lang(lang, runtime, images): - """Find and run all test cases for a language. + """Find and run all test cases for a language. images is a list of (, ) tuple. """ - total_num_failures = 0 - for image_tuple in images: - release, image = image_tuple - jobset.message('START', 'Testing %s' % image, do_newline=True) - # Download the docker image before running each test case. - subprocess.check_call(['gcloud', 'docker', '--', 'pull', image]) - suite_name = '%s__%s_%s' % (lang, runtime, release) - job_spec_list = find_test_cases(lang, runtime, release, suite_name) - - if not job_spec_list: - jobset.message('FAILED', 'No test cases were found.', do_newline=True) - return 1 - - num_failures, resultset = jobset.run(job_spec_list, - newline_on_success=True, - add_env={'docker_image':image}, - maxjobs=args.jobs) - if args.bq_result_table and resultset: - upload_test_results.upload_interop_results_to_bq( - resultset, args.bq_result_table, args) - if num_failures: - jobset.message('FAILED', 'Some tests failed', do_newline=True) - total_num_failures += num_failures - else: - jobset.message('SUCCESS', 'All tests passed', do_newline=True) - - report_utils.append_junit_xml_results( - _xml_report_tree, - resultset, - 'grpc_interop_matrix', - suite_name, - str(uuid.uuid4())) - - if not args.keep: - cleanup(image) - - return total_num_failures + total_num_failures = 0 + for image_tuple in images: + release, image = image_tuple + jobset.message('START', 'Testing %s' % image, do_newline=True) + # Download the docker image before running each test case. + subprocess.check_call(['gcloud', 'docker', '--', 'pull', image]) + suite_name = '%s__%s_%s' % (lang, runtime, release) + job_spec_list = find_test_cases(lang, runtime, release, suite_name) + + if not job_spec_list: + jobset.message( + 'FAILED', 'No test cases were found.', do_newline=True) + return 1 + + num_failures, resultset = jobset.run( + job_spec_list, + newline_on_success=True, + add_env={'docker_image': image}, + maxjobs=args.jobs) + if args.bq_result_table and resultset: + upload_test_results.upload_interop_results_to_bq( + resultset, args.bq_result_table, args) + if num_failures: + jobset.message('FAILED', 'Some tests failed', do_newline=True) + total_num_failures += num_failures + else: + jobset.message('SUCCESS', 'All tests passed', do_newline=True) + + report_utils.append_junit_xml_results(_xml_report_tree, resultset, + 'grpc_interop_matrix', suite_name, + str(uuid.uuid4())) + + if not args.keep: + cleanup(image) + + return total_num_failures def cleanup(image): - jobset.message('START', 'Cleanup docker image %s' % image, do_newline=True) - dockerjob.remove_image(image, skip_nonexistent=True) + jobset.message('START', 'Cleanup docker image %s' % image, do_newline=True) + dockerjob.remove_image(image, skip_nonexistent=True) languages = args.language if args.language != ['all'] else _LANGUAGES total_num_failures = 0 for lang in languages: - docker_images = find_all_images_for_lang(lang) - for runtime in sorted(docker_images.keys()): - total_num_failures += run_tests_for_lang(lang, runtime, docker_images[runtime]) + docker_images = find_all_images_for_lang(lang) + for runtime in sorted(docker_images.keys()): + total_num_failures += run_tests_for_lang(lang, runtime, + docker_images[runtime]) report_utils.create_xml_report_file(_xml_report_tree, args.report_file) if total_num_failures: - sys.exit(1) + sys.exit(1) sys.exit(0) From 173c477bd077e9081505e44af17bc2d442ae11b0 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 11 Dec 2017 16:52:44 -0800 Subject: [PATCH 106/127] tools/profiling --- tools/distrib/yapf_code.sh | 1 + tools/interop_matrix/create_matrix_images.py | 4 +- tools/profiling/bloat/bloat_diff.py | 76 ++-- .../latency_profile/profile_analyzer.py | 345 +++++++++-------- tools/profiling/microbenchmarks/bm2bq.py | 43 ++- .../microbenchmarks/bm_diff/bm_build.py | 87 +++-- .../microbenchmarks/bm_diff/bm_constants.py | 22 +- .../microbenchmarks/bm_diff/bm_diff.py | 335 ++++++++-------- .../microbenchmarks/bm_diff/bm_main.py | 218 +++++------ .../microbenchmarks/bm_diff/bm_run.py | 158 ++++---- .../microbenchmarks/bm_diff/bm_speedup.py | 61 +-- tools/profiling/microbenchmarks/bm_json.py | 365 +++++++++--------- tools/profiling/qps/qps_diff.py | 208 +++++----- tools/profiling/qps/qps_scenarios.py | 6 +- 14 files changed, 978 insertions(+), 951 deletions(-) diff --git a/tools/distrib/yapf_code.sh b/tools/distrib/yapf_code.sh index 52bd3a2cf34..0db4cf35765 100755 --- a/tools/distrib/yapf_code.sh +++ b/tools/distrib/yapf_code.sh @@ -24,6 +24,7 @@ DIRS=( 'tools/codegen' 'tools/distrib' 'tools/interop_matrix' + 'tools/profiling' ) EXCLUSIONS=( 'grpcio/grpc_*.py' diff --git a/tools/interop_matrix/create_matrix_images.py b/tools/interop_matrix/create_matrix_images.py index 05af3a56321..67dfce9c9a5 100755 --- a/tools/interop_matrix/create_matrix_images.py +++ b/tools/interop_matrix/create_matrix_images.py @@ -262,8 +262,8 @@ def maybe_apply_patches_on_git_tag(stack_base, lang, release): patch_file = os.path.abspath( os.path.join(os.path.dirname(__file__), patch_file_relative_path)) if not os.path.exists(patch_file): - jobset.message('FAILED', 'expected patch file |%s| to exist' % - patch_file) + jobset.message('FAILED', + 'expected patch file |%s| to exist' % patch_file) sys.exit(1) subprocess.check_output( ['git', 'apply', patch_file], cwd=stack_base, stderr=subprocess.STDOUT) diff --git a/tools/profiling/bloat/bloat_diff.py b/tools/profiling/bloat/bloat_diff.py index 9b40685e909..91611c2ca4a 100755 --- a/tools/profiling/bloat/bloat_diff.py +++ b/tools/profiling/bloat/bloat_diff.py @@ -23,12 +23,11 @@ import subprocess import sys sys.path.append( - os.path.join( - os.path.dirname(sys.argv[0]), '..', '..', 'run_tests', 'python_utils')) + os.path.join( + os.path.dirname(sys.argv[0]), '..', '..', 'run_tests', 'python_utils')) import comment_on_pr -argp = argparse.ArgumentParser( - description='Perform diff on microbenchmarks') +argp = argparse.ArgumentParser(description='Perform diff on microbenchmarks') argp.add_argument( '-d', @@ -36,64 +35,59 @@ argp.add_argument( type=str, help='Commit or branch to compare the current one to') -argp.add_argument( - '-j', - '--jobs', - type=int, - default=multiprocessing.cpu_count()) +argp.add_argument('-j', '--jobs', type=int, default=multiprocessing.cpu_count()) args = argp.parse_args() LIBS = [ - 'libgrpc.so', - 'libgrpc++.so', + 'libgrpc.so', + 'libgrpc++.so', ] + def build(where): - subprocess.check_call('make -j%d' % args.jobs, - shell=True, cwd='.') - shutil.rmtree('bloat_diff_%s' % where, ignore_errors=True) - os.rename('libs', 'bloat_diff_%s' % where) + subprocess.check_call('make -j%d' % args.jobs, shell=True, cwd='.') + shutil.rmtree('bloat_diff_%s' % where, ignore_errors=True) + os.rename('libs', 'bloat_diff_%s' % where) + build('new') if args.diff_base: old = 'old' where_am_i = subprocess.check_output( - ['git', 'rev-parse', '--abbrev-ref', 'HEAD']).strip() + ['git', 'rev-parse', '--abbrev-ref', 'HEAD']).strip() subprocess.check_call(['git', 'checkout', args.diff_base]) subprocess.check_call(['git', 'submodule', 'update']) try: - try: - build('old') - except subprocess.CalledProcessError, e: - subprocess.check_call(['make', 'clean']) - build('old') + try: + build('old') + except subprocess.CalledProcessError, e: + subprocess.check_call(['make', 'clean']) + build('old') finally: - subprocess.check_call(['git', 'checkout', where_am_i]) - subprocess.check_call(['git', 'submodule', 'update']) + subprocess.check_call(['git', 'checkout', where_am_i]) + subprocess.check_call(['git', 'submodule', 'update']) -subprocess.check_call('make -j%d' % args.jobs, - shell=True, cwd='third_party/bloaty') +subprocess.check_call( + 'make -j%d' % args.jobs, shell=True, cwd='third_party/bloaty') text = '' for lib in LIBS: - text += '****************************************************************\n\n' - text += lib + '\n\n' - old_version = glob.glob('bloat_diff_old/opt/%s' % lib) - new_version = glob.glob('bloat_diff_new/opt/%s' % lib) - assert len(new_version) == 1 - cmd = 'third_party/bloaty/bloaty -d compileunits,symbols' - if old_version: - assert len(old_version) == 1 - text += subprocess.check_output('%s %s -- %s' % - (cmd, new_version[0], old_version[0]), - shell=True) - else: - text += subprocess.check_output('%s %s' % - (cmd, new_version[0]), - shell=True) - text += '\n\n' + text += '****************************************************************\n\n' + text += lib + '\n\n' + old_version = glob.glob('bloat_diff_old/opt/%s' % lib) + new_version = glob.glob('bloat_diff_new/opt/%s' % lib) + assert len(new_version) == 1 + cmd = 'third_party/bloaty/bloaty -d compileunits,symbols' + if old_version: + assert len(old_version) == 1 + text += subprocess.check_output( + '%s %s -- %s' % (cmd, new_version[0], old_version[0]), shell=True) + else: + text += subprocess.check_output( + '%s %s' % (cmd, new_version[0]), shell=True) + text += '\n\n' print text comment_on_pr.comment_on_pr('```\n%s\n```' % text) diff --git a/tools/profiling/latency_profile/profile_analyzer.py b/tools/profiling/latency_profile/profile_analyzer.py index 8a19afb7612..e3d33574c2f 100755 --- a/tools/profiling/latency_profile/profile_analyzer.py +++ b/tools/profiling/latency_profile/profile_analyzer.py @@ -23,7 +23,6 @@ import sys import tabulate import time - SELF_TIME = object() TIME_FROM_SCOPE_START = object() TIME_TO_SCOPE_END = object() @@ -31,124 +30,129 @@ TIME_FROM_STACK_START = object() TIME_TO_STACK_END = object() TIME_FROM_LAST_IMPORTANT = object() - -argp = argparse.ArgumentParser(description='Process output of basic_prof builds') +argp = argparse.ArgumentParser( + description='Process output of basic_prof builds') argp.add_argument('--source', default='latency_trace.txt', type=str) argp.add_argument('--fmt', choices=tabulate.tabulate_formats, default='simple') argp.add_argument('--out', default='-', type=str) args = argp.parse_args() + class LineItem(object): - def __init__(self, line, indent): - self.tag = line['tag'] - self.indent = indent - self.start_time = line['t'] - self.end_time = None - self.important = line['imp'] - self.filename = line['file'] - self.fileline = line['line'] - self.times = {} + def __init__(self, line, indent): + self.tag = line['tag'] + self.indent = indent + self.start_time = line['t'] + self.end_time = None + self.important = line['imp'] + self.filename = line['file'] + self.fileline = line['line'] + self.times = {} class ScopeBuilder(object): - def __init__(self, call_stack_builder, line): - self.call_stack_builder = call_stack_builder - self.indent = len(call_stack_builder.stk) - self.top_line = LineItem(line, self.indent) - call_stack_builder.lines.append(self.top_line) - self.first_child_pos = len(call_stack_builder.lines) - - def mark(self, line): - line_item = LineItem(line, self.indent + 1) - line_item.end_time = line_item.start_time - self.call_stack_builder.lines.append(line_item) - - def finish(self, line): - assert line['tag'] == self.top_line.tag, ( - 'expected %s, got %s; thread=%s; t0=%f t1=%f' % - (self.top_line.tag, line['tag'], line['thd'], self.top_line.start_time, - line['t'])) - final_time_stamp = line['t'] - assert self.top_line.end_time is None - self.top_line.end_time = final_time_stamp - self.top_line.important = self.top_line.important or line['imp'] - assert SELF_TIME not in self.top_line.times - self.top_line.times[SELF_TIME] = final_time_stamp - self.top_line.start_time - for line in self.call_stack_builder.lines[self.first_child_pos:]: - if TIME_FROM_SCOPE_START not in line.times: - line.times[TIME_FROM_SCOPE_START] = line.start_time - self.top_line.start_time - line.times[TIME_TO_SCOPE_END] = final_time_stamp - line.end_time + def __init__(self, call_stack_builder, line): + self.call_stack_builder = call_stack_builder + self.indent = len(call_stack_builder.stk) + self.top_line = LineItem(line, self.indent) + call_stack_builder.lines.append(self.top_line) + self.first_child_pos = len(call_stack_builder.lines) + + def mark(self, line): + line_item = LineItem(line, self.indent + 1) + line_item.end_time = line_item.start_time + self.call_stack_builder.lines.append(line_item) + + def finish(self, line): + assert line['tag'] == self.top_line.tag, ( + 'expected %s, got %s; thread=%s; t0=%f t1=%f' % + (self.top_line.tag, line['tag'], line['thd'], + self.top_line.start_time, line['t'])) + final_time_stamp = line['t'] + assert self.top_line.end_time is None + self.top_line.end_time = final_time_stamp + self.top_line.important = self.top_line.important or line['imp'] + assert SELF_TIME not in self.top_line.times + self.top_line.times[ + SELF_TIME] = final_time_stamp - self.top_line.start_time + for line in self.call_stack_builder.lines[self.first_child_pos:]: + if TIME_FROM_SCOPE_START not in line.times: + line.times[ + TIME_FROM_SCOPE_START] = line.start_time - self.top_line.start_time + line.times[TIME_TO_SCOPE_END] = final_time_stamp - line.end_time class CallStackBuilder(object): - def __init__(self): - self.stk = [] - self.signature = hashlib.md5() - self.lines = [] - - def finish(self): - start_time = self.lines[0].start_time - end_time = self.lines[0].end_time - self.signature = self.signature.hexdigest() - last_important = start_time - for line in self.lines: - line.times[TIME_FROM_STACK_START] = line.start_time - start_time - line.times[TIME_TO_STACK_END] = end_time - line.end_time - line.times[TIME_FROM_LAST_IMPORTANT] = line.start_time - last_important - if line.important: - last_important = line.end_time - last_important = end_time - - def add(self, line): - line_type = line['type'] - self.signature.update(line_type) - self.signature.update(line['tag']) - if line_type == '{': - self.stk.append(ScopeBuilder(self, line)) - return False - elif line_type == '}': - assert self.stk, ( - 'expected non-empty stack for closing %s; thread=%s; t=%f' % - (line['tag'], line['thd'], line['t'])) - self.stk.pop().finish(line) - if not self.stk: - self.finish() - return True - return False - elif line_type == '.' or line_type == '!': - self.stk[-1].mark(line) - return False - else: - raise Exception('Unknown line type: \'%s\'' % line_type) + def __init__(self): + self.stk = [] + self.signature = hashlib.md5() + self.lines = [] + + def finish(self): + start_time = self.lines[0].start_time + end_time = self.lines[0].end_time + self.signature = self.signature.hexdigest() + last_important = start_time + for line in self.lines: + line.times[TIME_FROM_STACK_START] = line.start_time - start_time + line.times[TIME_TO_STACK_END] = end_time - line.end_time + line.times[ + TIME_FROM_LAST_IMPORTANT] = line.start_time - last_important + if line.important: + last_important = line.end_time + last_important = end_time + + def add(self, line): + line_type = line['type'] + self.signature.update(line_type) + self.signature.update(line['tag']) + if line_type == '{': + self.stk.append(ScopeBuilder(self, line)) + return False + elif line_type == '}': + assert self.stk, ( + 'expected non-empty stack for closing %s; thread=%s; t=%f' % + (line['tag'], line['thd'], line['t'])) + self.stk.pop().finish(line) + if not self.stk: + self.finish() + return True + return False + elif line_type == '.' or line_type == '!': + self.stk[-1].mark(line) + return False + else: + raise Exception('Unknown line type: \'%s\'' % line_type) class CallStack(object): - def __init__(self, initial_call_stack_builder): - self.count = 1 - self.signature = initial_call_stack_builder.signature - self.lines = initial_call_stack_builder.lines - for line in self.lines: - for key, val in line.times.items(): - line.times[key] = [val] - - def add(self, call_stack_builder): - assert self.signature == call_stack_builder.signature - self.count += 1 - assert len(self.lines) == len(call_stack_builder.lines) - for lsum, line in itertools.izip(self.lines, call_stack_builder.lines): - assert lsum.tag == line.tag - assert lsum.times.keys() == line.times.keys() - for k, lst in lsum.times.iteritems(): - lst.append(line.times[k]) - - def finish(self): - for line in self.lines: - for lst in line.times.itervalues(): - lst.sort() + def __init__(self, initial_call_stack_builder): + self.count = 1 + self.signature = initial_call_stack_builder.signature + self.lines = initial_call_stack_builder.lines + for line in self.lines: + for key, val in line.times.items(): + line.times[key] = [val] + + def add(self, call_stack_builder): + assert self.signature == call_stack_builder.signature + self.count += 1 + assert len(self.lines) == len(call_stack_builder.lines) + for lsum, line in itertools.izip(self.lines, call_stack_builder.lines): + assert lsum.tag == line.tag + assert lsum.times.keys() == line.times.keys() + for k, lst in lsum.times.iteritems(): + lst.append(line.times[k]) + + def finish(self): + for line in self.lines: + for lst in line.times.itervalues(): + lst.sort() + builder = collections.defaultdict(CallStackBuilder) call_stacks = collections.defaultdict(CallStack) @@ -156,26 +160,28 @@ call_stacks = collections.defaultdict(CallStack) lines = 0 start = time.time() with open(args.source) as f: - for line in f: - lines += 1 - inf = json.loads(line) - thd = inf['thd'] - cs = builder[thd] - if cs.add(inf): - if cs.signature in call_stacks: - call_stacks[cs.signature].add(cs) - else: - call_stacks[cs.signature] = CallStack(cs) - del builder[thd] + for line in f: + lines += 1 + inf = json.loads(line) + thd = inf['thd'] + cs = builder[thd] + if cs.add(inf): + if cs.signature in call_stacks: + call_stacks[cs.signature].add(cs) + else: + call_stacks[cs.signature] = CallStack(cs) + del builder[thd] time_taken = time.time() - start -call_stacks = sorted(call_stacks.values(), key=lambda cs: cs.count, reverse=True) +call_stacks = sorted( + call_stacks.values(), key=lambda cs: cs.count, reverse=True) total_stacks = 0 for cs in call_stacks: - total_stacks += cs.count - cs.finish() + total_stacks += cs.count + cs.finish() + -def percentile(N, percent, key=lambda x:x): +def percentile(N, percent, key=lambda x: x): """ Find the percentile of a list of values. @@ -187,80 +193,83 @@ def percentile(N, percent, key=lambda x:x): """ if not N: return None - k = (len(N)-1) * percent + k = (len(N) - 1) * percent f = math.floor(k) c = math.ceil(k) if f == c: return key(N[int(k)]) - d0 = key(N[int(f)]) * (c-k) - d1 = key(N[int(c)]) * (k-f) - return d0+d1 + d0 = key(N[int(f)]) * (c - k) + d1 = key(N[int(c)]) * (k - f) + return d0 + d1 + def tidy_tag(tag): - if tag[0:10] == 'GRPC_PTAG_': - return tag[10:] - return tag + if tag[0:10] == 'GRPC_PTAG_': + return tag[10:] + return tag + def time_string(values): - num_values = len(values) - return '%.1f/%.1f/%.1f' % ( - 1e6 * percentile(values, 0.5), - 1e6 * percentile(values, 0.9), - 1e6 * percentile(values, 0.99)) + num_values = len(values) + return '%.1f/%.1f/%.1f' % (1e6 * percentile(values, 0.5), + 1e6 * percentile(values, 0.9), + 1e6 * percentile(values, 0.99)) + def time_format(idx): - def ent(line, idx=idx): - if idx in line.times: - return time_string(line.times[idx]) - return '' - return ent -BANNER = { - 'simple': 'Count: %(count)d', - 'html': '

    Count: %(count)d

    ' -} + def ent(line, idx=idx): + if idx in line.times: + return time_string(line.times[idx]) + return '' + + return ent + + +BANNER = {'simple': 'Count: %(count)d', 'html': '

    Count: %(count)d

    '} FORMAT = [ - ('TAG', lambda line: '..'*line.indent + tidy_tag(line.tag)), - ('LOC', lambda line: '%s:%d' % (line.filename[line.filename.rfind('/')+1:], line.fileline)), - ('IMP', lambda line: '*' if line.important else ''), - ('FROM_IMP', time_format(TIME_FROM_LAST_IMPORTANT)), - ('FROM_STACK_START', time_format(TIME_FROM_STACK_START)), - ('SELF', time_format(SELF_TIME)), - ('TO_STACK_END', time_format(TIME_TO_STACK_END)), - ('FROM_SCOPE_START', time_format(TIME_FROM_SCOPE_START)), - ('SELF', time_format(SELF_TIME)), - ('TO_SCOPE_END', time_format(TIME_TO_SCOPE_END)), + ('TAG', lambda line: '..' * line.indent + tidy_tag(line.tag)), + ('LOC', + lambda line: '%s:%d' % (line.filename[line.filename.rfind('/') + 1:], line.fileline) + ), + ('IMP', lambda line: '*' if line.important else ''), + ('FROM_IMP', time_format(TIME_FROM_LAST_IMPORTANT)), + ('FROM_STACK_START', time_format(TIME_FROM_STACK_START)), + ('SELF', time_format(SELF_TIME)), + ('TO_STACK_END', time_format(TIME_TO_STACK_END)), + ('FROM_SCOPE_START', time_format(TIME_FROM_SCOPE_START)), + ('SELF', time_format(SELF_TIME)), + ('TO_SCOPE_END', time_format(TIME_TO_SCOPE_END)), ] out = sys.stdout if args.out != '-': - out = open(args.out, 'w') + out = open(args.out, 'w') if args.fmt == 'html': - print >>out, '' - print >>out, '' - print >>out, 'Profile Report' - print >>out, '' + print >> out, '' + print >> out, '' + print >> out, 'Profile Report' + print >> out, '' accounted_for = 0 for cs in call_stacks: - if args.fmt in BANNER: - print >>out, BANNER[args.fmt] % { - 'count': cs.count, - } - header, _ = zip(*FORMAT) - table = [] - for line in cs.lines: - fields = [] - for _, fn in FORMAT: - fields.append(fn(line)) - table.append(fields) - print >>out, tabulate.tabulate(table, header, tablefmt=args.fmt) - accounted_for += cs.count - if accounted_for > .99 * total_stacks: - break + if args.fmt in BANNER: + print >> out, BANNER[args.fmt] % { + 'count': cs.count, + } + header, _ = zip(*FORMAT) + table = [] + for line in cs.lines: + fields = [] + for _, fn in FORMAT: + fields.append(fn(line)) + table.append(fields) + print >> out, tabulate.tabulate(table, header, tablefmt=args.fmt) + accounted_for += cs.count + if accounted_for > .99 * total_stacks: + break if args.fmt == 'html': - print '' - + print '' diff --git a/tools/profiling/microbenchmarks/bm2bq.py b/tools/profiling/microbenchmarks/bm2bq.py index 9f9b672f759..746b643b439 100755 --- a/tools/profiling/microbenchmarks/bm2bq.py +++ b/tools/profiling/microbenchmarks/bm2bq.py @@ -28,37 +28,38 @@ import subprocess columns = [] for row in json.loads( - subprocess.check_output([ - 'bq','--format=json','show','microbenchmarks.microbenchmarks']))['schema']['fields']: - columns.append((row['name'], row['type'].lower())) + subprocess.check_output([ + 'bq', '--format=json', 'show', 'microbenchmarks.microbenchmarks' + ]))['schema']['fields']: + columns.append((row['name'], row['type'].lower())) SANITIZE = { - 'integer': int, - 'float': float, - 'boolean': bool, - 'string': str, - 'timestamp': str, + 'integer': int, + 'float': float, + 'boolean': bool, + 'string': str, + 'timestamp': str, } if sys.argv[1] == '--schema': - print ',\n'.join('%s:%s' % (k, t.upper()) for k, t in columns) - sys.exit(0) + print ',\n'.join('%s:%s' % (k, t.upper()) for k, t in columns) + sys.exit(0) with open(sys.argv[1]) as f: - js = json.loads(f.read()) + js = json.loads(f.read()) if len(sys.argv) > 2: - with open(sys.argv[2]) as f: - js2 = json.loads(f.read()) + with open(sys.argv[2]) as f: + js2 = json.loads(f.read()) else: - js2 = None + js2 = None -writer = csv.DictWriter(sys.stdout, [c for c,t in columns]) +writer = csv.DictWriter(sys.stdout, [c for c, t in columns]) for row in bm_json.expand_json(js, js2): - sane_row = {} - for name, sql_type in columns: - if name in row: - if row[name] == '': continue - sane_row[name] = SANITIZE[sql_type](row[name]) - writer.writerow(sane_row) + sane_row = {} + for name, sql_type in columns: + if name in row: + if row[name] == '': continue + sane_row[name] = SANITIZE[sql_type](row[name]) + writer.writerow(sane_row) diff --git a/tools/profiling/microbenchmarks/bm_diff/bm_build.py b/tools/profiling/microbenchmarks/bm_diff/bm_build.py index ce62c09d72f..a4cd61707d3 100755 --- a/tools/profiling/microbenchmarks/bm_diff/bm_build.py +++ b/tools/profiling/microbenchmarks/bm_diff/bm_build.py @@ -13,7 +13,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """ Python utility to build opt and counters benchmarks """ import bm_constants @@ -26,55 +25,55 @@ import shutil def _args(): - argp = argparse.ArgumentParser(description='Builds microbenchmarks') - argp.add_argument( - '-b', - '--benchmarks', - nargs='+', - choices=bm_constants._AVAILABLE_BENCHMARK_TESTS, - default=bm_constants._AVAILABLE_BENCHMARK_TESTS, - help='Which benchmarks to build') - argp.add_argument( - '-j', - '--jobs', - type=int, - default=multiprocessing.cpu_count(), - help='How many CPUs to dedicate to this task') - argp.add_argument( - '-n', - '--name', - type=str, - help='Unique name of this build. To be used as a handle to pass to the other bm* scripts' - ) - argp.add_argument('--counters', dest='counters', action='store_true') - argp.add_argument('--no-counters', dest='counters', action='store_false') - argp.set_defaults(counters=True) - args = argp.parse_args() - assert args.name - return args + argp = argparse.ArgumentParser(description='Builds microbenchmarks') + argp.add_argument( + '-b', + '--benchmarks', + nargs='+', + choices=bm_constants._AVAILABLE_BENCHMARK_TESTS, + default=bm_constants._AVAILABLE_BENCHMARK_TESTS, + help='Which benchmarks to build') + argp.add_argument( + '-j', + '--jobs', + type=int, + default=multiprocessing.cpu_count(), + help='How many CPUs to dedicate to this task') + argp.add_argument( + '-n', + '--name', + type=str, + help='Unique name of this build. To be used as a handle to pass to the other bm* scripts' + ) + argp.add_argument('--counters', dest='counters', action='store_true') + argp.add_argument('--no-counters', dest='counters', action='store_false') + argp.set_defaults(counters=True) + args = argp.parse_args() + assert args.name + return args def _make_cmd(cfg, benchmarks, jobs): - return ['make'] + benchmarks + ['CONFIG=%s' % cfg, '-j', '%d' % jobs] + return ['make'] + benchmarks + ['CONFIG=%s' % cfg, '-j', '%d' % jobs] def build(name, benchmarks, jobs, counters): - shutil.rmtree('bm_diff_%s' % name, ignore_errors=True) - subprocess.check_call(['git', 'submodule', 'update']) - try: - subprocess.check_call(_make_cmd('opt', benchmarks, jobs)) - if counters: - subprocess.check_call(_make_cmd('counters', benchmarks, jobs)) - except subprocess.CalledProcessError, e: - subprocess.check_call(['make', 'clean']) - subprocess.check_call(_make_cmd('opt', benchmarks, jobs)) - if counters: - subprocess.check_call(_make_cmd('counters', benchmarks, jobs)) - os.rename( - 'bins', - 'bm_diff_%s' % name,) + shutil.rmtree('bm_diff_%s' % name, ignore_errors=True) + subprocess.check_call(['git', 'submodule', 'update']) + try: + subprocess.check_call(_make_cmd('opt', benchmarks, jobs)) + if counters: + subprocess.check_call(_make_cmd('counters', benchmarks, jobs)) + except subprocess.CalledProcessError, e: + subprocess.check_call(['make', 'clean']) + subprocess.check_call(_make_cmd('opt', benchmarks, jobs)) + if counters: + subprocess.check_call(_make_cmd('counters', benchmarks, jobs)) + os.rename( + 'bins', + 'bm_diff_%s' % name,) if __name__ == '__main__': - args = _args() - build(args.name, args.benchmarks, args.jobs, args.counters) + args = _args() + build(args.name, args.benchmarks, args.jobs, args.counters) diff --git a/tools/profiling/microbenchmarks/bm_diff/bm_constants.py b/tools/profiling/microbenchmarks/bm_diff/bm_constants.py index 0ec17fa17e2..cff29dbe08e 100644 --- a/tools/profiling/microbenchmarks/bm_diff/bm_constants.py +++ b/tools/profiling/microbenchmarks/bm_diff/bm_constants.py @@ -13,19 +13,19 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """ Configurable constants for the bm_*.py family """ _AVAILABLE_BENCHMARK_TESTS = [ - 'bm_fullstack_unary_ping_pong', 'bm_fullstack_streaming_ping_pong', - 'bm_fullstack_streaming_pump', 'bm_closure', 'bm_cq', 'bm_call_create', - 'bm_error', 'bm_chttp2_hpack', 'bm_chttp2_transport', 'bm_pollset', - 'bm_metadata', 'bm_fullstack_trickle' + 'bm_fullstack_unary_ping_pong', 'bm_fullstack_streaming_ping_pong', + 'bm_fullstack_streaming_pump', 'bm_closure', 'bm_cq', 'bm_call_create', + 'bm_error', 'bm_chttp2_hpack', 'bm_chttp2_transport', 'bm_pollset', + 'bm_metadata', 'bm_fullstack_trickle' ] -_INTERESTING = ('cpu_time', 'real_time', 'call_initial_size-median', 'locks_per_iteration', - 'allocs_per_iteration', 'writes_per_iteration', - 'atm_cas_per_iteration', 'atm_add_per_iteration', - 'nows_per_iteration', 'cli_transport_stalls_per_iteration', - 'cli_stream_stalls_per_iteration', 'svr_transport_stalls_per_iteration', - 'svr_stream_stalls_per_iteration', 'http2_pings_sent_per_iteration') +_INTERESTING = ( + 'cpu_time', 'real_time', 'call_initial_size-median', 'locks_per_iteration', + 'allocs_per_iteration', 'writes_per_iteration', 'atm_cas_per_iteration', + 'atm_add_per_iteration', 'nows_per_iteration', + 'cli_transport_stalls_per_iteration', 'cli_stream_stalls_per_iteration', + 'svr_transport_stalls_per_iteration', 'svr_stream_stalls_per_iteration', + 'http2_pings_sent_per_iteration') diff --git a/tools/profiling/microbenchmarks/bm_diff/bm_diff.py b/tools/profiling/microbenchmarks/bm_diff/bm_diff.py index a41d0f0552f..b8a3b22861b 100755 --- a/tools/profiling/microbenchmarks/bm_diff/bm_diff.py +++ b/tools/profiling/microbenchmarks/bm_diff/bm_diff.py @@ -34,190 +34,195 @@ verbose = False def _median(ary): - assert (len(ary)) - ary = sorted(ary) - n = len(ary) - if n % 2 == 0: - return (ary[(n - 1) / 2] + ary[(n - 1) / 2 + 1]) / 2.0 - else: - return ary[n / 2] + assert (len(ary)) + ary = sorted(ary) + n = len(ary) + if n % 2 == 0: + return (ary[(n - 1) / 2] + ary[(n - 1) / 2 + 1]) / 2.0 + else: + return ary[n / 2] def _args(): - argp = argparse.ArgumentParser( - description='Perform diff on microbenchmarks') - argp.add_argument( - '-t', - '--track', - choices=sorted(bm_constants._INTERESTING), - nargs='+', - default=sorted(bm_constants._INTERESTING), - help='Which metrics to track') - argp.add_argument( - '-b', - '--benchmarks', - nargs='+', - choices=bm_constants._AVAILABLE_BENCHMARK_TESTS, - default=bm_constants._AVAILABLE_BENCHMARK_TESTS, - help='Which benchmarks to run') - argp.add_argument( - '-l', - '--loops', - type=int, - default=20, - help='Number of times to loops the benchmarks. Must match what was passed to bm_run.py' - ) - argp.add_argument( - '-r', - '--regex', - type=str, - default="", - help='Regex to filter benchmarks run') - argp.add_argument('--counters', dest='counters', action='store_true') - argp.add_argument('--no-counters', dest='counters', action='store_false') - argp.set_defaults(counters=True) - argp.add_argument('-n', '--new', type=str, help='New benchmark name') - argp.add_argument('-o', '--old', type=str, help='Old benchmark name') - argp.add_argument( - '-v', '--verbose', type=bool, help='Print details of before/after') - args = argp.parse_args() - global verbose - if args.verbose: verbose = True - assert args.new - assert args.old - return args + argp = argparse.ArgumentParser( + description='Perform diff on microbenchmarks') + argp.add_argument( + '-t', + '--track', + choices=sorted(bm_constants._INTERESTING), + nargs='+', + default=sorted(bm_constants._INTERESTING), + help='Which metrics to track') + argp.add_argument( + '-b', + '--benchmarks', + nargs='+', + choices=bm_constants._AVAILABLE_BENCHMARK_TESTS, + default=bm_constants._AVAILABLE_BENCHMARK_TESTS, + help='Which benchmarks to run') + argp.add_argument( + '-l', + '--loops', + type=int, + default=20, + help='Number of times to loops the benchmarks. Must match what was passed to bm_run.py' + ) + argp.add_argument( + '-r', + '--regex', + type=str, + default="", + help='Regex to filter benchmarks run') + argp.add_argument('--counters', dest='counters', action='store_true') + argp.add_argument('--no-counters', dest='counters', action='store_false') + argp.set_defaults(counters=True) + argp.add_argument('-n', '--new', type=str, help='New benchmark name') + argp.add_argument('-o', '--old', type=str, help='Old benchmark name') + argp.add_argument( + '-v', '--verbose', type=bool, help='Print details of before/after') + args = argp.parse_args() + global verbose + if args.verbose: verbose = True + assert args.new + assert args.old + return args def _maybe_print(str): - if verbose: print str + if verbose: print str class Benchmark: - def __init__(self): - self.samples = { - True: collections.defaultdict(list), - False: collections.defaultdict(list) - } - self.final = {} - - def add_sample(self, track, data, new): - for f in track: - if f in data: - self.samples[new][f].append(float(data[f])) - - def process(self, track, new_name, old_name): - for f in sorted(track): - new = self.samples[True][f] - old = self.samples[False][f] - if not new or not old: continue - mdn_diff = abs(_median(new) - _median(old)) - _maybe_print('%s: %s=%r %s=%r mdn_diff=%r' % - (f, new_name, new, old_name, old, mdn_diff)) - s = bm_speedup.speedup(new, old, 1e-5) - if abs(s) > 3: - if mdn_diff > 0.5 or 'trickle' in f: - self.final[f] = '%+d%%' % s - return self.final.keys() - - def skip(self): - return not self.final - - def row(self, flds): - return [self.final[f] if f in self.final else '' for f in flds] + def __init__(self): + self.samples = { + True: collections.defaultdict(list), + False: collections.defaultdict(list) + } + self.final = {} + + def add_sample(self, track, data, new): + for f in track: + if f in data: + self.samples[new][f].append(float(data[f])) + + def process(self, track, new_name, old_name): + for f in sorted(track): + new = self.samples[True][f] + old = self.samples[False][f] + if not new or not old: continue + mdn_diff = abs(_median(new) - _median(old)) + _maybe_print('%s: %s=%r %s=%r mdn_diff=%r' % + (f, new_name, new, old_name, old, mdn_diff)) + s = bm_speedup.speedup(new, old, 1e-5) + if abs(s) > 3: + if mdn_diff > 0.5 or 'trickle' in f: + self.final[f] = '%+d%%' % s + return self.final.keys() + + def skip(self): + return not self.final + + def row(self, flds): + return [self.final[f] if f in self.final else '' for f in flds] def _read_json(filename, badjson_files, nonexistant_files): - stripped = ".".join(filename.split(".")[:-2]) - try: - with open(filename) as f: - r = f.read(); - return json.loads(r) - except IOError, e: - if stripped in nonexistant_files: - nonexistant_files[stripped] += 1 - else: - nonexistant_files[stripped] = 1 - return None - except ValueError, e: - print r - if stripped in badjson_files: - badjson_files[stripped] += 1 - else: - badjson_files[stripped] = 1 - return None + stripped = ".".join(filename.split(".")[:-2]) + try: + with open(filename) as f: + r = f.read() + return json.loads(r) + except IOError, e: + if stripped in nonexistant_files: + nonexistant_files[stripped] += 1 + else: + nonexistant_files[stripped] = 1 + return None + except ValueError, e: + print r + if stripped in badjson_files: + badjson_files[stripped] += 1 + else: + badjson_files[stripped] = 1 + return None + def fmt_dict(d): - return ''.join([" " + k + ": " + str(d[k]) + "\n" for k in d]) + return ''.join([" " + k + ": " + str(d[k]) + "\n" for k in d]) + def diff(bms, loops, regex, track, old, new, counters): - benchmarks = collections.defaultdict(Benchmark) - - badjson_files = {} - nonexistant_files = {} - for bm in bms: - for loop in range(0, loops): - for line in subprocess.check_output( - ['bm_diff_%s/opt/%s' % (old, bm), - '--benchmark_list_tests', - '--benchmark_filter=%s' % regex]).splitlines(): - stripped_line = line.strip().replace("/", "_").replace( - "<", "_").replace(">", "_").replace(", ", "_") - js_new_opt = _read_json('%s.%s.opt.%s.%d.json' % - (bm, stripped_line, new, loop), - badjson_files, nonexistant_files) - js_old_opt = _read_json('%s.%s.opt.%s.%d.json' % - (bm, stripped_line, old, loop), - badjson_files, nonexistant_files) - if counters: - js_new_ctr = _read_json('%s.%s.counters.%s.%d.json' % - (bm, stripped_line, new, loop), - badjson_files, nonexistant_files) - js_old_ctr = _read_json('%s.%s.counters.%s.%d.json' % - (bm, stripped_line, old, loop), - badjson_files, nonexistant_files) + benchmarks = collections.defaultdict(Benchmark) + + badjson_files = {} + nonexistant_files = {} + for bm in bms: + for loop in range(0, loops): + for line in subprocess.check_output([ + 'bm_diff_%s/opt/%s' % (old, bm), '--benchmark_list_tests', + '--benchmark_filter=%s' % regex + ]).splitlines(): + stripped_line = line.strip().replace("/", "_").replace( + "<", "_").replace(">", "_").replace(", ", "_") + js_new_opt = _read_json('%s.%s.opt.%s.%d.json' % + (bm, stripped_line, new, loop), + badjson_files, nonexistant_files) + js_old_opt = _read_json('%s.%s.opt.%s.%d.json' % + (bm, stripped_line, old, loop), + badjson_files, nonexistant_files) + if counters: + js_new_ctr = _read_json('%s.%s.counters.%s.%d.json' % + (bm, stripped_line, new, loop), + badjson_files, nonexistant_files) + js_old_ctr = _read_json('%s.%s.counters.%s.%d.json' % + (bm, stripped_line, old, loop), + badjson_files, nonexistant_files) + else: + js_new_ctr = None + js_old_ctr = None + + for row in bm_json.expand_json(js_new_ctr, js_new_opt): + name = row['cpp_name'] + if name.endswith('_mean') or name.endswith('_stddev'): + continue + benchmarks[name].add_sample(track, row, True) + for row in bm_json.expand_json(js_old_ctr, js_old_opt): + name = row['cpp_name'] + if name.endswith('_mean') or name.endswith('_stddev'): + continue + benchmarks[name].add_sample(track, row, False) + + really_interesting = set() + for name, bm in benchmarks.items(): + _maybe_print(name) + really_interesting.update(bm.process(track, new, old)) + fields = [f for f in track if f in really_interesting] + + headers = ['Benchmark'] + fields + rows = [] + for name in sorted(benchmarks.keys()): + if benchmarks[name].skip(): continue + rows.append([name] + benchmarks[name].row(fields)) + note = None + if len(badjson_files): + note = 'Corrupt JSON data (indicates timeout or crash): \n%s' % fmt_dict( + badjson_files) + if len(nonexistant_files): + if note: + note += '\n\nMissing files (indicates new benchmark): \n%s' % fmt_dict( + nonexistant_files) else: - js_new_ctr = None - js_old_ctr = None - - for row in bm_json.expand_json(js_new_ctr, js_new_opt): - name = row['cpp_name'] - if name.endswith('_mean') or name.endswith('_stddev'): - continue - benchmarks[name].add_sample(track, row, True) - for row in bm_json.expand_json(js_old_ctr, js_old_opt): - name = row['cpp_name'] - if name.endswith('_mean') or name.endswith('_stddev'): - continue - benchmarks[name].add_sample(track, row, False) - - really_interesting = set() - for name, bm in benchmarks.items(): - _maybe_print(name) - really_interesting.update(bm.process(track, new, old)) - fields = [f for f in track if f in really_interesting] - - headers = ['Benchmark'] + fields - rows = [] - for name in sorted(benchmarks.keys()): - if benchmarks[name].skip(): continue - rows.append([name] + benchmarks[name].row(fields)) - note = None - if len(badjson_files): - note = 'Corrupt JSON data (indicates timeout or crash): \n%s' % fmt_dict(badjson_files) - if len(nonexistant_files): - if note: - note += '\n\nMissing files (indicates new benchmark): \n%s' % fmt_dict(nonexistant_files) + note = '\n\nMissing files (indicates new benchmark): \n%s' % fmt_dict( + nonexistant_files) + if rows: + return tabulate.tabulate(rows, headers=headers, floatfmt='+.2f'), note else: - note = '\n\nMissing files (indicates new benchmark): \n%s' % fmt_dict(nonexistant_files) - if rows: - return tabulate.tabulate(rows, headers=headers, floatfmt='+.2f'), note - else: - return None, note + return None, note if __name__ == '__main__': - args = _args() - diff, note = diff(args.benchmarks, args.loops, args.regex, args.track, args.old, - args.new, args.counters) - print('%s\n%s' % (note, diff if diff else "No performance differences")) + args = _args() + diff, note = diff(args.benchmarks, args.loops, args.regex, args.track, + args.old, args.new, args.counters) + print('%s\n%s' % (note, diff if diff else "No performance differences")) diff --git a/tools/profiling/microbenchmarks/bm_diff/bm_main.py b/tools/profiling/microbenchmarks/bm_diff/bm_main.py index 74b7174f5d2..137c22bf8e4 100755 --- a/tools/profiling/microbenchmarks/bm_diff/bm_main.py +++ b/tools/profiling/microbenchmarks/bm_diff/bm_main.py @@ -13,7 +13,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """ Runs the entire bm_*.py pipeline, and possible comments on the PR """ import bm_constants @@ -29,129 +28,132 @@ import multiprocessing import subprocess sys.path.append( - os.path.join( - os.path.dirname(sys.argv[0]), '..', '..', 'run_tests', 'python_utils')) + os.path.join( + os.path.dirname(sys.argv[0]), '..', '..', 'run_tests', 'python_utils')) import comment_on_pr sys.path.append( - os.path.join( - os.path.dirname(sys.argv[0]), '..', '..', '..', 'run_tests', - 'python_utils')) + os.path.join( + os.path.dirname(sys.argv[0]), '..', '..', '..', 'run_tests', + 'python_utils')) import jobset def _args(): - argp = argparse.ArgumentParser( - description='Perform diff on microbenchmarks') - argp.add_argument( - '-t', - '--track', - choices=sorted(bm_constants._INTERESTING), - nargs='+', - default=sorted(bm_constants._INTERESTING), - help='Which metrics to track') - argp.add_argument( - '-b', - '--benchmarks', - nargs='+', - choices=bm_constants._AVAILABLE_BENCHMARK_TESTS, - default=bm_constants._AVAILABLE_BENCHMARK_TESTS, - help='Which benchmarks to run') - argp.add_argument( - '-d', - '--diff_base', - type=str, - help='Commit or branch to compare the current one to') - argp.add_argument( - '-o', - '--old', - default='old', - type=str, - help='Name of baseline run to compare to. Ususally just called "old"') - argp.add_argument( - '-r', - '--regex', - type=str, - default="", - help='Regex to filter benchmarks run') - argp.add_argument( - '-l', - '--loops', - type=int, - default=10, - help='Number of times to loops the benchmarks. More loops cuts down on noise' - ) - argp.add_argument( - '-j', - '--jobs', - type=int, - default=multiprocessing.cpu_count(), - help='Number of CPUs to use') - argp.add_argument( - '--pr_comment_name', - type=str, - default="microbenchmarks", - help='Name that Jenkins will use to commen on the PR') - argp.add_argument('--counters', dest='counters', action='store_true') - argp.add_argument('--no-counters', dest='counters', action='store_false') - argp.set_defaults(counters=True) - args = argp.parse_args() - assert args.diff_base or args.old, "One of diff_base or old must be set!" - if args.loops < 3: - print "WARNING: This run will likely be noisy. Increase loops." - return args + argp = argparse.ArgumentParser( + description='Perform diff on microbenchmarks') + argp.add_argument( + '-t', + '--track', + choices=sorted(bm_constants._INTERESTING), + nargs='+', + default=sorted(bm_constants._INTERESTING), + help='Which metrics to track') + argp.add_argument( + '-b', + '--benchmarks', + nargs='+', + choices=bm_constants._AVAILABLE_BENCHMARK_TESTS, + default=bm_constants._AVAILABLE_BENCHMARK_TESTS, + help='Which benchmarks to run') + argp.add_argument( + '-d', + '--diff_base', + type=str, + help='Commit or branch to compare the current one to') + argp.add_argument( + '-o', + '--old', + default='old', + type=str, + help='Name of baseline run to compare to. Ususally just called "old"') + argp.add_argument( + '-r', + '--regex', + type=str, + default="", + help='Regex to filter benchmarks run') + argp.add_argument( + '-l', + '--loops', + type=int, + default=10, + help='Number of times to loops the benchmarks. More loops cuts down on noise' + ) + argp.add_argument( + '-j', + '--jobs', + type=int, + default=multiprocessing.cpu_count(), + help='Number of CPUs to use') + argp.add_argument( + '--pr_comment_name', + type=str, + default="microbenchmarks", + help='Name that Jenkins will use to commen on the PR') + argp.add_argument('--counters', dest='counters', action='store_true') + argp.add_argument('--no-counters', dest='counters', action='store_false') + argp.set_defaults(counters=True) + args = argp.parse_args() + assert args.diff_base or args.old, "One of diff_base or old must be set!" + if args.loops < 3: + print "WARNING: This run will likely be noisy. Increase loops." + return args def eintr_be_gone(fn): - """Run fn until it doesn't stop because of EINTR""" + """Run fn until it doesn't stop because of EINTR""" - def inner(*args): - while True: - try: - return fn(*args) - except IOError, e: - if e.errno != errno.EINTR: - raise + def inner(*args): + while True: + try: + return fn(*args) + except IOError, e: + if e.errno != errno.EINTR: + raise - return inner + return inner def main(args): - bm_build.build('new', args.benchmarks, args.jobs, args.counters) - - old = args.old - if args.diff_base: - old = 'old' - where_am_i = subprocess.check_output( - ['git', 'rev-parse', '--abbrev-ref', 'HEAD']).strip() - subprocess.check_call(['git', 'checkout', args.diff_base]) - try: - bm_build.build(old, args.benchmarks, args.jobs, args.counters) - finally: - subprocess.check_call(['git', 'checkout', where_am_i]) - subprocess.check_call(['git', 'submodule', 'update']) - - jobs_list = [] - jobs_list += bm_run.create_jobs('new', args.benchmarks, args.loops, args.regex, args.counters) - jobs_list += bm_run.create_jobs(old, args.benchmarks, args.loops, args.regex, args.counters) - - # shuffle all jobs to eliminate noise from GCE CPU drift - random.shuffle(jobs_list, random.SystemRandom().random) - jobset.run(jobs_list, maxjobs=args.jobs) - - diff, note = bm_diff.diff(args.benchmarks, args.loops, args.regex, args.track, old, - 'new', args.counters) - if diff: - text = '[%s] Performance differences noted:\n%s' % (args.pr_comment_name, diff) - else: - text = '[%s] No significant performance differences' % args.pr_comment_name - if note: - text = note + '\n\n' + text - print('%s' % text) - comment_on_pr.comment_on_pr('```\n%s\n```' % text) + bm_build.build('new', args.benchmarks, args.jobs, args.counters) + + old = args.old + if args.diff_base: + old = 'old' + where_am_i = subprocess.check_output( + ['git', 'rev-parse', '--abbrev-ref', 'HEAD']).strip() + subprocess.check_call(['git', 'checkout', args.diff_base]) + try: + bm_build.build(old, args.benchmarks, args.jobs, args.counters) + finally: + subprocess.check_call(['git', 'checkout', where_am_i]) + subprocess.check_call(['git', 'submodule', 'update']) + + jobs_list = [] + jobs_list += bm_run.create_jobs('new', args.benchmarks, args.loops, + args.regex, args.counters) + jobs_list += bm_run.create_jobs(old, args.benchmarks, args.loops, + args.regex, args.counters) + + # shuffle all jobs to eliminate noise from GCE CPU drift + random.shuffle(jobs_list, random.SystemRandom().random) + jobset.run(jobs_list, maxjobs=args.jobs) + + diff, note = bm_diff.diff(args.benchmarks, args.loops, args.regex, + args.track, old, 'new', args.counters) + if diff: + text = '[%s] Performance differences noted:\n%s' % ( + args.pr_comment_name, diff) + else: + text = '[%s] No significant performance differences' % args.pr_comment_name + if note: + text = note + '\n\n' + text + print('%s' % text) + comment_on_pr.comment_on_pr('```\n%s\n```' % text) if __name__ == '__main__': - args = _args() - main(args) + args = _args() + main(args) diff --git a/tools/profiling/microbenchmarks/bm_diff/bm_run.py b/tools/profiling/microbenchmarks/bm_diff/bm_run.py index 81db5a226a2..08894bbe4d3 100755 --- a/tools/profiling/microbenchmarks/bm_diff/bm_run.py +++ b/tools/profiling/microbenchmarks/bm_diff/bm_run.py @@ -13,7 +13,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """ Python utility to run opt and counters benchmarks and save json output """ import bm_constants @@ -27,93 +26,96 @@ import sys import os sys.path.append( - os.path.join( - os.path.dirname(sys.argv[0]), '..', '..', '..', 'run_tests', - 'python_utils')) + os.path.join( + os.path.dirname(sys.argv[0]), '..', '..', '..', 'run_tests', + 'python_utils')) import jobset def _args(): - argp = argparse.ArgumentParser(description='Runs microbenchmarks') - argp.add_argument( - '-b', - '--benchmarks', - nargs='+', - choices=bm_constants._AVAILABLE_BENCHMARK_TESTS, - default=bm_constants._AVAILABLE_BENCHMARK_TESTS, - help='Benchmarks to run') - argp.add_argument( - '-j', - '--jobs', - type=int, - default=multiprocessing.cpu_count(), - help='Number of CPUs to use') - argp.add_argument( - '-n', - '--name', - type=str, - help='Unique name of the build to run. Needs to match the handle passed to bm_build.py' - ) - argp.add_argument( - '-r', - '--regex', - type=str, - default="", - help='Regex to filter benchmarks run') - argp.add_argument( - '-l', - '--loops', - type=int, - default=20, - help='Number of times to loops the benchmarks. More loops cuts down on noise' - ) - argp.add_argument('--counters', dest='counters', action='store_true') - argp.add_argument('--no-counters', dest='counters', action='store_false') - argp.set_defaults(counters=True) - args = argp.parse_args() - assert args.name - if args.loops < 3: - print "WARNING: This run will likely be noisy. Increase loops to at least 3." - return args + argp = argparse.ArgumentParser(description='Runs microbenchmarks') + argp.add_argument( + '-b', + '--benchmarks', + nargs='+', + choices=bm_constants._AVAILABLE_BENCHMARK_TESTS, + default=bm_constants._AVAILABLE_BENCHMARK_TESTS, + help='Benchmarks to run') + argp.add_argument( + '-j', + '--jobs', + type=int, + default=multiprocessing.cpu_count(), + help='Number of CPUs to use') + argp.add_argument( + '-n', + '--name', + type=str, + help='Unique name of the build to run. Needs to match the handle passed to bm_build.py' + ) + argp.add_argument( + '-r', + '--regex', + type=str, + default="", + help='Regex to filter benchmarks run') + argp.add_argument( + '-l', + '--loops', + type=int, + default=20, + help='Number of times to loops the benchmarks. More loops cuts down on noise' + ) + argp.add_argument('--counters', dest='counters', action='store_true') + argp.add_argument('--no-counters', dest='counters', action='store_false') + argp.set_defaults(counters=True) + args = argp.parse_args() + assert args.name + if args.loops < 3: + print "WARNING: This run will likely be noisy. Increase loops to at least 3." + return args def _collect_bm_data(bm, cfg, name, regex, idx, loops): - jobs_list = [] - for line in subprocess.check_output( - ['bm_diff_%s/%s/%s' % (name, cfg, bm), - '--benchmark_list_tests', '--benchmark_filter=%s' % regex]).splitlines(): - stripped_line = line.strip().replace("/", "_").replace( - "<", "_").replace(">", "_").replace(", ", "_") - cmd = [ - 'bm_diff_%s/%s/%s' % (name, cfg, bm), '--benchmark_filter=^%s$' % - line, '--benchmark_out=%s.%s.%s.%s.%d.json' % - (bm, stripped_line, cfg, name, idx), '--benchmark_out_format=json', - ] - jobs_list.append( - jobset.JobSpec( - cmd, - shortname='%s %s %s %s %d/%d' % (bm, line, cfg, name, idx + 1, - loops), - verbose_success=True, - cpu_cost=2, - timeout_seconds=60 * 60)) # one hour - return jobs_list + jobs_list = [] + for line in subprocess.check_output([ + 'bm_diff_%s/%s/%s' % (name, cfg, bm), '--benchmark_list_tests', + '--benchmark_filter=%s' % regex + ]).splitlines(): + stripped_line = line.strip().replace("/", "_").replace( + "<", "_").replace(">", "_").replace(", ", "_") + cmd = [ + 'bm_diff_%s/%s/%s' % (name, cfg, bm), + '--benchmark_filter=^%s$' % line, + '--benchmark_out=%s.%s.%s.%s.%d.json' % + (bm, stripped_line, cfg, name, idx), + '--benchmark_out_format=json', + ] + jobs_list.append( + jobset.JobSpec( + cmd, + shortname='%s %s %s %s %d/%d' % (bm, line, cfg, name, idx + 1, + loops), + verbose_success=True, + cpu_cost=2, + timeout_seconds=60 * 60)) # one hour + return jobs_list def create_jobs(name, benchmarks, loops, regex, counters): - jobs_list = [] - for loop in range(0, loops): - for bm in benchmarks: - jobs_list += _collect_bm_data(bm, 'opt', name, regex, loop, loops) - if counters: - jobs_list += _collect_bm_data(bm, 'counters', name, regex, loop, - loops) - random.shuffle(jobs_list, random.SystemRandom().random) - return jobs_list + jobs_list = [] + for loop in range(0, loops): + for bm in benchmarks: + jobs_list += _collect_bm_data(bm, 'opt', name, regex, loop, loops) + if counters: + jobs_list += _collect_bm_data(bm, 'counters', name, regex, loop, + loops) + random.shuffle(jobs_list, random.SystemRandom().random) + return jobs_list if __name__ == '__main__': - args = _args() - jobs_list = create_jobs(args.name, args.benchmarks, args.loops, - args.regex, args.counters) - jobset.run(jobs_list, maxjobs=args.jobs) + args = _args() + jobs_list = create_jobs(args.name, args.benchmarks, args.loops, args.regex, + args.counters) + jobset.run(jobs_list, maxjobs=args.jobs) diff --git a/tools/profiling/microbenchmarks/bm_diff/bm_speedup.py b/tools/profiling/microbenchmarks/bm_diff/bm_speedup.py index 63e691af02f..2a770403604 100755 --- a/tools/profiling/microbenchmarks/bm_diff/bm_speedup.py +++ b/tools/profiling/microbenchmarks/bm_diff/bm_speedup.py @@ -19,40 +19,41 @@ import math _DEFAULT_THRESHOLD = 1e-10 + def scale(a, mul): - return [x * mul for x in a] + return [x * mul for x in a] def cmp(a, b): - return stats.ttest_ind(a, b) - - -def speedup(new, old, threshold = _DEFAULT_THRESHOLD): - if (len(set(new))) == 1 and new == old: return 0 - s0, p0 = cmp(new, old) - if math.isnan(p0): return 0 - if s0 == 0: return 0 - if p0 > threshold: return 0 - if s0 < 0: - pct = 1 - while pct < 100: - sp, pp = cmp(new, scale(old, 1 - pct / 100.0)) - if sp > 0: break - if pp > threshold: break - pct += 1 - return -(pct - 1) - else: - pct = 1 - while pct < 10000: - sp, pp = cmp(new, scale(old, 1 + pct / 100.0)) - if sp < 0: break - if pp > threshold: break - pct += 1 - return pct - 1 + return stats.ttest_ind(a, b) + + +def speedup(new, old, threshold=_DEFAULT_THRESHOLD): + if (len(set(new))) == 1 and new == old: return 0 + s0, p0 = cmp(new, old) + if math.isnan(p0): return 0 + if s0 == 0: return 0 + if p0 > threshold: return 0 + if s0 < 0: + pct = 1 + while pct < 100: + sp, pp = cmp(new, scale(old, 1 - pct / 100.0)) + if sp > 0: break + if pp > threshold: break + pct += 1 + return -(pct - 1) + else: + pct = 1 + while pct < 10000: + sp, pp = cmp(new, scale(old, 1 + pct / 100.0)) + if sp < 0: break + if pp > threshold: break + pct += 1 + return pct - 1 if __name__ == "__main__": - new = [0.0, 0.0, 0.0, 0.0] - old = [2.96608e-06, 3.35076e-06, 3.45384e-06, 3.34407e-06] - print speedup(new, old, 1e-5) - print speedup(old, new, 1e-5) + new = [0.0, 0.0, 0.0, 0.0] + old = [2.96608e-06, 3.35076e-06, 3.45384e-06, 3.34407e-06] + print speedup(new, old, 1e-5) + print speedup(old, new, 1e-5) diff --git a/tools/profiling/microbenchmarks/bm_json.py b/tools/profiling/microbenchmarks/bm_json.py index eb450ee6ada..1dd9f65dbfa 100644 --- a/tools/profiling/microbenchmarks/bm_json.py +++ b/tools/profiling/microbenchmarks/bm_json.py @@ -15,187 +15,196 @@ import os _BM_SPECS = { - 'BM_UnaryPingPong': { - 'tpl': ['fixture', 'client_mutator', 'server_mutator'], - 'dyn': ['request_size', 'response_size'], - }, - 'BM_PumpStreamClientToServer': { - 'tpl': ['fixture'], - 'dyn': ['request_size'], - }, - 'BM_PumpStreamServerToClient': { - 'tpl': ['fixture'], - 'dyn': ['request_size'], - }, - 'BM_StreamingPingPong': { - 'tpl': ['fixture', 'client_mutator', 'server_mutator'], - 'dyn': ['request_size', 'request_count'], - }, - 'BM_StreamingPingPongMsgs': { - 'tpl': ['fixture', 'client_mutator', 'server_mutator'], - 'dyn': ['request_size'], - }, - 'BM_PumpStreamServerToClient_Trickle': { - 'tpl': [], - 'dyn': ['request_size', 'bandwidth_kilobits'], - }, - 'BM_PumpUnbalancedUnary_Trickle': { - 'tpl': [], - 'dyn': ['cli_req_size', 'svr_req_size', 'bandwidth_kilobits'], - }, - 'BM_ErrorStringOnNewError': { - 'tpl': ['fixture'], - 'dyn': [], - }, - 'BM_ErrorStringRepeatedly': { - 'tpl': ['fixture'], - 'dyn': [], - }, - 'BM_ErrorGetStatus': { - 'tpl': ['fixture'], - 'dyn': [], - }, - 'BM_ErrorGetStatusCode': { - 'tpl': ['fixture'], - 'dyn': [], - }, - 'BM_ErrorHttpError': { - 'tpl': ['fixture'], - 'dyn': [], - }, - 'BM_HasClearGrpcStatus': { - 'tpl': ['fixture'], - 'dyn': [], - }, - 'BM_IsolatedFilter': { - 'tpl': ['fixture', 'client_mutator'], - 'dyn': [], - }, - 'BM_HpackEncoderEncodeHeader': { - 'tpl': ['fixture'], - 'dyn': ['end_of_stream', 'request_size'], - }, - 'BM_HpackParserParseHeader': { - 'tpl': ['fixture', 'on_header'], - 'dyn': [], - }, - 'BM_CallCreateDestroy': { - 'tpl': ['fixture'], - 'dyn': [], - }, - 'BM_Zalloc': { - 'tpl': [], - 'dyn': ['request_size'], - }, - 'BM_PollEmptyPollset_SpeedOfLight': { - 'tpl': [], - 'dyn': ['request_size', 'request_count'], - }, - 'BM_StreamCreateSendInitialMetadataDestroy': { - 'tpl': ['fixture'], - 'dyn': [], - }, - 'BM_TransportStreamSend': { - 'tpl': [], - 'dyn': ['request_size'], - }, - 'BM_TransportStreamRecv': { - 'tpl': [], - 'dyn': ['request_size'], - }, - 'BM_StreamingPingPongWithCoalescingApi': { - 'tpl': ['fixture', 'client_mutator', 'server_mutator'], - 'dyn': ['request_size', 'request_count', 'end_of_stream'], - }, - 'BM_Base16SomeStuff': { - 'tpl': [], - 'dyn': ['request_size'], - } + 'BM_UnaryPingPong': { + 'tpl': ['fixture', 'client_mutator', 'server_mutator'], + 'dyn': ['request_size', 'response_size'], + }, + 'BM_PumpStreamClientToServer': { + 'tpl': ['fixture'], + 'dyn': ['request_size'], + }, + 'BM_PumpStreamServerToClient': { + 'tpl': ['fixture'], + 'dyn': ['request_size'], + }, + 'BM_StreamingPingPong': { + 'tpl': ['fixture', 'client_mutator', 'server_mutator'], + 'dyn': ['request_size', 'request_count'], + }, + 'BM_StreamingPingPongMsgs': { + 'tpl': ['fixture', 'client_mutator', 'server_mutator'], + 'dyn': ['request_size'], + }, + 'BM_PumpStreamServerToClient_Trickle': { + 'tpl': [], + 'dyn': ['request_size', 'bandwidth_kilobits'], + }, + 'BM_PumpUnbalancedUnary_Trickle': { + 'tpl': [], + 'dyn': ['cli_req_size', 'svr_req_size', 'bandwidth_kilobits'], + }, + 'BM_ErrorStringOnNewError': { + 'tpl': ['fixture'], + 'dyn': [], + }, + 'BM_ErrorStringRepeatedly': { + 'tpl': ['fixture'], + 'dyn': [], + }, + 'BM_ErrorGetStatus': { + 'tpl': ['fixture'], + 'dyn': [], + }, + 'BM_ErrorGetStatusCode': { + 'tpl': ['fixture'], + 'dyn': [], + }, + 'BM_ErrorHttpError': { + 'tpl': ['fixture'], + 'dyn': [], + }, + 'BM_HasClearGrpcStatus': { + 'tpl': ['fixture'], + 'dyn': [], + }, + 'BM_IsolatedFilter': { + 'tpl': ['fixture', 'client_mutator'], + 'dyn': [], + }, + 'BM_HpackEncoderEncodeHeader': { + 'tpl': ['fixture'], + 'dyn': ['end_of_stream', 'request_size'], + }, + 'BM_HpackParserParseHeader': { + 'tpl': ['fixture', 'on_header'], + 'dyn': [], + }, + 'BM_CallCreateDestroy': { + 'tpl': ['fixture'], + 'dyn': [], + }, + 'BM_Zalloc': { + 'tpl': [], + 'dyn': ['request_size'], + }, + 'BM_PollEmptyPollset_SpeedOfLight': { + 'tpl': [], + 'dyn': ['request_size', 'request_count'], + }, + 'BM_StreamCreateSendInitialMetadataDestroy': { + 'tpl': ['fixture'], + 'dyn': [], + }, + 'BM_TransportStreamSend': { + 'tpl': [], + 'dyn': ['request_size'], + }, + 'BM_TransportStreamRecv': { + 'tpl': [], + 'dyn': ['request_size'], + }, + 'BM_StreamingPingPongWithCoalescingApi': { + 'tpl': ['fixture', 'client_mutator', 'server_mutator'], + 'dyn': ['request_size', 'request_count', 'end_of_stream'], + }, + 'BM_Base16SomeStuff': { + 'tpl': [], + 'dyn': ['request_size'], + } } + def numericalize(s): - if not s: return '' - if s[-1] == 'k': - return float(s[:-1]) * 1024 - if s[-1] == 'M': - return float(s[:-1]) * 1024 * 1024 - if 0 <= (ord(s[-1]) - ord('0')) <= 9: - return float(s) - assert 'not a number: %s' % s + if not s: return '' + if s[-1] == 'k': + return float(s[:-1]) * 1024 + if s[-1] == 'M': + return float(s[:-1]) * 1024 * 1024 + if 0 <= (ord(s[-1]) - ord('0')) <= 9: + return float(s) + assert 'not a number: %s' % s + def parse_name(name): - cpp_name = name - if '<' not in name and '/' not in name and name not in _BM_SPECS: - return {'name': name, 'cpp_name': name} - rest = name - out = {} - tpl_args = [] - dyn_args = [] - if '<' in rest: - tpl_bit = rest[rest.find('<') + 1 : rest.rfind('>')] - arg = '' - nesting = 0 - for c in tpl_bit: - if c == '<': - nesting += 1 - arg += c - elif c == '>': - nesting -= 1 - arg += c - elif c == ',': - if nesting == 0: - tpl_args.append(arg.strip()) - arg = '' - else: - arg += c - else: - arg += c - tpl_args.append(arg.strip()) - rest = rest[:rest.find('<')] + rest[rest.rfind('>') + 1:] - if '/' in rest: - s = rest.split('/') - rest = s[0] - dyn_args = s[1:] - name = rest - print (name) - print (dyn_args, _BM_SPECS[name]['dyn']) - print (tpl_args, _BM_SPECS[name]['tpl']) - assert name in _BM_SPECS, '_BM_SPECS needs to be expanded for %s' % name - assert len(dyn_args) == len(_BM_SPECS[name]['dyn']) - assert len(tpl_args) == len(_BM_SPECS[name]['tpl']) - out['name'] = name - out['cpp_name'] = cpp_name - out.update(dict((k, numericalize(v)) for k, v in zip(_BM_SPECS[name]['dyn'], dyn_args))) - out.update(dict(zip(_BM_SPECS[name]['tpl'], tpl_args))) - return out + cpp_name = name + if '<' not in name and '/' not in name and name not in _BM_SPECS: + return {'name': name, 'cpp_name': name} + rest = name + out = {} + tpl_args = [] + dyn_args = [] + if '<' in rest: + tpl_bit = rest[rest.find('<') + 1:rest.rfind('>')] + arg = '' + nesting = 0 + for c in tpl_bit: + if c == '<': + nesting += 1 + arg += c + elif c == '>': + nesting -= 1 + arg += c + elif c == ',': + if nesting == 0: + tpl_args.append(arg.strip()) + arg = '' + else: + arg += c + else: + arg += c + tpl_args.append(arg.strip()) + rest = rest[:rest.find('<')] + rest[rest.rfind('>') + 1:] + if '/' in rest: + s = rest.split('/') + rest = s[0] + dyn_args = s[1:] + name = rest + print(name) + print(dyn_args, _BM_SPECS[name]['dyn']) + print(tpl_args, _BM_SPECS[name]['tpl']) + assert name in _BM_SPECS, '_BM_SPECS needs to be expanded for %s' % name + assert len(dyn_args) == len(_BM_SPECS[name]['dyn']) + assert len(tpl_args) == len(_BM_SPECS[name]['tpl']) + out['name'] = name + out['cpp_name'] = cpp_name + out.update( + dict((k, numericalize(v)) + for k, v in zip(_BM_SPECS[name]['dyn'], dyn_args))) + out.update(dict(zip(_BM_SPECS[name]['tpl'], tpl_args))) + return out -def expand_json(js, js2 = None): - if not js and not js2: raise StopIteration() - if not js: js = js2 - for bm in js['benchmarks']: - if bm['name'].endswith('_stddev') or bm['name'].endswith('_mean'): continue - context = js['context'] - if 'label' in bm: - labels_list = [s.split(':') for s in bm['label'].strip().split(' ') if len(s) and s[0] != '#'] - for el in labels_list: - el[0] = el[0].replace('/iter', '_per_iteration') - labels = dict(labels_list) - else: - labels = {} - row = { - 'jenkins_build': os.environ.get('BUILD_NUMBER', ''), - 'jenkins_job': os.environ.get('JOB_NAME', ''), - } - row.update(context) - row.update(bm) - row.update(parse_name(row['name'])) - row.update(labels) - if js2: - for bm2 in js2['benchmarks']: - if bm['name'] == bm2['name'] and 'already_used' not in bm2: - row['cpu_time'] = bm2['cpu_time'] - row['real_time'] = bm2['real_time'] - row['iterations'] = bm2['iterations'] - bm2['already_used'] = True - break - yield row + +def expand_json(js, js2=None): + if not js and not js2: raise StopIteration() + if not js: js = js2 + for bm in js['benchmarks']: + if bm['name'].endswith('_stddev') or bm['name'].endswith('_mean'): + continue + context = js['context'] + if 'label' in bm: + labels_list = [ + s.split(':') for s in bm['label'].strip().split(' ') + if len(s) and s[0] != '#' + ] + for el in labels_list: + el[0] = el[0].replace('/iter', '_per_iteration') + labels = dict(labels_list) + else: + labels = {} + row = { + 'jenkins_build': os.environ.get('BUILD_NUMBER', ''), + 'jenkins_job': os.environ.get('JOB_NAME', ''), + } + row.update(context) + row.update(bm) + row.update(parse_name(row['name'])) + row.update(labels) + if js2: + for bm2 in js2['benchmarks']: + if bm['name'] == bm2['name'] and 'already_used' not in bm2: + row['cpu_time'] = bm2['cpu_time'] + row['real_time'] = bm2['real_time'] + row['iterations'] = bm2['iterations'] + bm2['already_used'] = True + break + yield row diff --git a/tools/profiling/qps/qps_diff.py b/tools/profiling/qps/qps_diff.py index 0654f45666f..55a81f034d3 100755 --- a/tools/profiling/qps/qps_diff.py +++ b/tools/profiling/qps/qps_diff.py @@ -26,144 +26,146 @@ import sys import tabulate sys.path.append( - os.path.join( - os.path.dirname(sys.argv[0]), '..', 'microbenchmarks', 'bm_diff')) + os.path.join( + os.path.dirname(sys.argv[0]), '..', 'microbenchmarks', 'bm_diff')) import bm_speedup sys.path.append( - os.path.join( - os.path.dirname(sys.argv[0]), '..', '..', 'run_tests', 'python_utils')) + os.path.join( + os.path.dirname(sys.argv[0]), '..', '..', 'run_tests', 'python_utils')) import comment_on_pr def _args(): - argp = argparse.ArgumentParser( - description='Perform diff on QPS Driver') - argp.add_argument( - '-d', - '--diff_base', - type=str, - help='Commit or branch to compare the current one to') - argp.add_argument( - '-l', - '--loops', - type=int, - default=4, - help='Number of loops for each benchmark. More loops cuts down on noise' - ) - argp.add_argument( - '-j', - '--jobs', - type=int, - default=multiprocessing.cpu_count(), - help='Number of CPUs to use') - args = argp.parse_args() - assert args.diff_base, "diff_base must be set" - return args + argp = argparse.ArgumentParser(description='Perform diff on QPS Driver') + argp.add_argument( + '-d', + '--diff_base', + type=str, + help='Commit or branch to compare the current one to') + argp.add_argument( + '-l', + '--loops', + type=int, + default=4, + help='Number of loops for each benchmark. More loops cuts down on noise') + argp.add_argument( + '-j', + '--jobs', + type=int, + default=multiprocessing.cpu_count(), + help='Number of CPUs to use') + args = argp.parse_args() + assert args.diff_base, "diff_base must be set" + return args def _make_cmd(jobs): - return ['make', '-j', '%d' % jobs, 'qps_json_driver', 'qps_worker'] + return ['make', '-j', '%d' % jobs, 'qps_json_driver', 'qps_worker'] def build(name, jobs): - shutil.rmtree('qps_diff_%s' % name, ignore_errors=True) - subprocess.check_call(['git', 'submodule', 'update']) - try: - subprocess.check_call(_make_cmd(jobs)) - except subprocess.CalledProcessError, e: - subprocess.check_call(['make', 'clean']) - subprocess.check_call(_make_cmd(jobs)) - os.rename('bins', 'qps_diff_%s' % name) + shutil.rmtree('qps_diff_%s' % name, ignore_errors=True) + subprocess.check_call(['git', 'submodule', 'update']) + try: + subprocess.check_call(_make_cmd(jobs)) + except subprocess.CalledProcessError, e: + subprocess.check_call(['make', 'clean']) + subprocess.check_call(_make_cmd(jobs)) + os.rename('bins', 'qps_diff_%s' % name) def _run_cmd(name, scenario, fname): - return ['qps_diff_%s/opt/qps_json_driver' % name, '--scenarios_json', scenario, '--json_file_out', fname] + return [ + 'qps_diff_%s/opt/qps_json_driver' % name, '--scenarios_json', scenario, + '--json_file_out', fname + ] def run(name, scenarios, loops): - for sn in scenarios: - for i in range(0, loops): - fname = "%s.%s.%d.json" % (sn, name, i) - subprocess.check_call(_run_cmd(name, scenarios[sn], fname)) + for sn in scenarios: + for i in range(0, loops): + fname = "%s.%s.%d.json" % (sn, name, i) + subprocess.check_call(_run_cmd(name, scenarios[sn], fname)) def _load_qps(fname): - try: - with open(fname) as f: - return json.loads(f.read())['qps'] - except IOError, e: - print("IOError occurred reading file: %s" % fname) - return None - except ValueError, e: - print("ValueError occurred reading file: %s" % fname) - return None + try: + with open(fname) as f: + return json.loads(f.read())['qps'] + except IOError, e: + print("IOError occurred reading file: %s" % fname) + return None + except ValueError, e: + print("ValueError occurred reading file: %s" % fname) + return None def _median(ary): - assert (len(ary)) - ary = sorted(ary) - n = len(ary) - if n % 2 == 0: - return (ary[(n - 1) / 2] + ary[(n - 1) / 2 + 1]) / 2.0 - else: - return ary[n / 2] + assert (len(ary)) + ary = sorted(ary) + n = len(ary) + if n % 2 == 0: + return (ary[(n - 1) / 2] + ary[(n - 1) / 2 + 1]) / 2.0 + else: + return ary[n / 2] def diff(scenarios, loops, old, new): - old_data = {} - new_data = {} - - # collect data - for sn in scenarios: - old_data[sn] = [] - new_data[sn] = [] - for i in range(loops): - old_data[sn].append(_load_qps("%s.%s.%d.json" % (sn, old, i))) - new_data[sn].append(_load_qps("%s.%s.%d.json" % (sn, new, i))) - - # crunch data - headers = ['Benchmark', 'qps'] - rows = [] - for sn in scenarios: - mdn_diff = abs(_median(new_data[sn]) - _median(old_data[sn])) - print('%s: %s=%r %s=%r mdn_diff=%r' % (sn, new, new_data[sn], old, old_data[sn], mdn_diff)) - s = bm_speedup.speedup(new_data[sn], old_data[sn], 10e-5) - if abs(s) > 3 and mdn_diff > 0.5: - rows.append([sn, '%+d%%' % s]) - - if rows: - return tabulate.tabulate(rows, headers=headers, floatfmt='+.2f') - else: - return None + old_data = {} + new_data = {} + + # collect data + for sn in scenarios: + old_data[sn] = [] + new_data[sn] = [] + for i in range(loops): + old_data[sn].append(_load_qps("%s.%s.%d.json" % (sn, old, i))) + new_data[sn].append(_load_qps("%s.%s.%d.json" % (sn, new, i))) + + # crunch data + headers = ['Benchmark', 'qps'] + rows = [] + for sn in scenarios: + mdn_diff = abs(_median(new_data[sn]) - _median(old_data[sn])) + print('%s: %s=%r %s=%r mdn_diff=%r' % + (sn, new, new_data[sn], old, old_data[sn], mdn_diff)) + s = bm_speedup.speedup(new_data[sn], old_data[sn], 10e-5) + if abs(s) > 3 and mdn_diff > 0.5: + rows.append([sn, '%+d%%' % s]) + + if rows: + return tabulate.tabulate(rows, headers=headers, floatfmt='+.2f') + else: + return None def main(args): - build('new', args.jobs) + build('new', args.jobs) - if args.diff_base: - where_am_i = subprocess.check_output( - ['git', 'rev-parse', '--abbrev-ref', 'HEAD']).strip() - subprocess.check_call(['git', 'checkout', args.diff_base]) - try: - build('old', args.jobs) - finally: - subprocess.check_call(['git', 'checkout', where_am_i]) - subprocess.check_call(['git', 'submodule', 'update']) + if args.diff_base: + where_am_i = subprocess.check_output( + ['git', 'rev-parse', '--abbrev-ref', 'HEAD']).strip() + subprocess.check_call(['git', 'checkout', args.diff_base]) + try: + build('old', args.jobs) + finally: + subprocess.check_call(['git', 'checkout', where_am_i]) + subprocess.check_call(['git', 'submodule', 'update']) - run('new', qps_scenarios._SCENARIOS, args.loops) - run('old', qps_scenarios._SCENARIOS, args.loops) + run('new', qps_scenarios._SCENARIOS, args.loops) + run('old', qps_scenarios._SCENARIOS, args.loops) - diff_output = diff(qps_scenarios._SCENARIOS, args.loops, 'old', 'new') + diff_output = diff(qps_scenarios._SCENARIOS, args.loops, 'old', 'new') - if diff_output: - text = '[qps] Performance differences noted:\n%s' % diff_output - else: - text = '[qps] No significant performance differences' - print('%s' % text) - comment_on_pr.comment_on_pr('```\n%s\n```' % text) + if diff_output: + text = '[qps] Performance differences noted:\n%s' % diff_output + else: + text = '[qps] No significant performance differences' + print('%s' % text) + comment_on_pr.comment_on_pr('```\n%s\n```' % text) if __name__ == '__main__': - args = _args() - main(args) + args = _args() + main(args) diff --git a/tools/profiling/qps/qps_scenarios.py b/tools/profiling/qps/qps_scenarios.py index 4fbbdefc4db..532acc915ca 100644 --- a/tools/profiling/qps/qps_scenarios.py +++ b/tools/profiling/qps/qps_scenarios.py @@ -14,6 +14,8 @@ """ QPS Scenarios to run """ _SCENARIOS = { - 'large-message-throughput': '{"scenarios":[{"name":"large-message-throughput", "spawn_local_worker_count": -2, "warmup_seconds": 30, "benchmark_seconds": 270, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": null, "server_type": "ASYNC_SERVER"}, "num_clients": 1, "client_config": {"client_type": "ASYNC_CLIENT", "security_params": null, "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"max_possible": 60000000000.0, "resolution": 0.01}}}]}', - 'multi-channel-64-KiB': '{"scenarios":[{"name":"multi-channel-64-KiB", "spawn_local_worker_count": -3, "warmup_seconds": 30, "benchmark_seconds": 270, "num_servers": 1, "server_config": {"async_server_threads": 31, "security_params": null, "server_type": "ASYNC_SERVER"}, "num_clients": 2, "client_config": {"client_type": "ASYNC_CLIENT", "security_params": null, "payload_config": {"simple_params": {"resp_size": 65536, "req_size": 65536}}, "client_channels": 32, "async_client_threads": 31, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"max_possible": 60000000000.0, "resolution": 0.01}}}]}' + 'large-message-throughput': + '{"scenarios":[{"name":"large-message-throughput", "spawn_local_worker_count": -2, "warmup_seconds": 30, "benchmark_seconds": 270, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": null, "server_type": "ASYNC_SERVER"}, "num_clients": 1, "client_config": {"client_type": "ASYNC_CLIENT", "security_params": null, "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"max_possible": 60000000000.0, "resolution": 0.01}}}]}', + 'multi-channel-64-KiB': + '{"scenarios":[{"name":"multi-channel-64-KiB", "spawn_local_worker_count": -3, "warmup_seconds": 30, "benchmark_seconds": 270, "num_servers": 1, "server_config": {"async_server_threads": 31, "security_params": null, "server_type": "ASYNC_SERVER"}, "num_clients": 2, "client_config": {"client_type": "ASYNC_CLIENT", "security_params": null, "payload_config": {"simple_params": {"resp_size": 65536, "req_size": 65536}}, "client_channels": 32, "async_client_threads": 31, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"max_possible": 60000000000.0, "resolution": 0.01}}}]}' } From 05687c3da9848ab79f08417793965de9bbbb52b0 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 11 Dec 2017 16:54:47 -0800 Subject: [PATCH 107/127] yapf tools/run_tests/python_utils --- tools/distrib/yapf_code.sh | 1 + tools/run_tests/python_utils/antagonist.py | 3 +- tools/run_tests/python_utils/comment_on_pr.py | 33 +- tools/run_tests/python_utils/dockerjob.py | 162 ++-- .../python_utils/filter_pull_request_tests.py | 200 +++-- tools/run_tests/python_utils/jobset.py | 826 +++++++++--------- tools/run_tests/python_utils/port_server.py | 253 +++--- tools/run_tests/python_utils/report_utils.py | 219 ++--- .../python_utils/start_port_server.py | 11 +- .../python_utils/upload_test_results.py | 231 ++--- tools/run_tests/python_utils/watch_dirs.py | 79 +- 11 files changed, 1057 insertions(+), 961 deletions(-) diff --git a/tools/distrib/yapf_code.sh b/tools/distrib/yapf_code.sh index 0db4cf35765..9f8fb13572b 100755 --- a/tools/distrib/yapf_code.sh +++ b/tools/distrib/yapf_code.sh @@ -25,6 +25,7 @@ DIRS=( 'tools/distrib' 'tools/interop_matrix' 'tools/profiling' + 'tools/run_tests/python_utils' ) EXCLUSIONS=( 'grpcio/grpc_*.py' diff --git a/tools/run_tests/python_utils/antagonist.py b/tools/run_tests/python_utils/antagonist.py index 0d79ce09868..a928a4cb007 100755 --- a/tools/run_tests/python_utils/antagonist.py +++ b/tools/run_tests/python_utils/antagonist.py @@ -12,8 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """This is used by run_tests.py to create cpu load on a machine""" while True: - pass + pass diff --git a/tools/run_tests/python_utils/comment_on_pr.py b/tools/run_tests/python_utils/comment_on_pr.py index 21b9bb70859..399c996d4db 100644 --- a/tools/run_tests/python_utils/comment_on_pr.py +++ b/tools/run_tests/python_utils/comment_on_pr.py @@ -16,19 +16,22 @@ import os import json import urllib2 + def comment_on_pr(text): - if 'JENKINS_OAUTH_TOKEN' not in os.environ: - print 'Missing JENKINS_OAUTH_TOKEN env var: not commenting' - return - if 'ghprbPullId' not in os.environ: - print 'Missing ghprbPullId env var: not commenting' - return - req = urllib2.Request( - url = 'https://api.github.com/repos/grpc/grpc/issues/%s/comments' % - os.environ['ghprbPullId'], - data = json.dumps({'body': text}), - headers = { - 'Authorization': 'token %s' % os.environ['JENKINS_OAUTH_TOKEN'], - 'Content-Type': 'application/json', - }) - print urllib2.urlopen(req).read() + if 'JENKINS_OAUTH_TOKEN' not in os.environ: + print 'Missing JENKINS_OAUTH_TOKEN env var: not commenting' + return + if 'ghprbPullId' not in os.environ: + print 'Missing ghprbPullId env var: not commenting' + return + req = urllib2.Request( + url='https://api.github.com/repos/grpc/grpc/issues/%s/comments' % + os.environ['ghprbPullId'], + data=json.dumps({ + 'body': text + }), + headers={ + 'Authorization': 'token %s' % os.environ['JENKINS_OAUTH_TOKEN'], + 'Content-Type': 'application/json', + }) + print urllib2.urlopen(req).read() diff --git a/tools/run_tests/python_utils/dockerjob.py b/tools/run_tests/python_utils/dockerjob.py index 2f5285b26c9..d2941c08118 100755 --- a/tools/run_tests/python_utils/dockerjob.py +++ b/tools/run_tests/python_utils/dockerjob.py @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Helpers to run docker instances as jobs.""" from __future__ import print_function @@ -28,102 +27,109 @@ _DEVNULL = open(os.devnull, 'w') def random_name(base_name): - """Randomizes given base name.""" - return '%s_%s' % (base_name, uuid.uuid4()) + """Randomizes given base name.""" + return '%s_%s' % (base_name, uuid.uuid4()) def docker_kill(cid): - """Kills a docker container. Returns True if successful.""" - return subprocess.call(['docker','kill', str(cid)], - stdin=subprocess.PIPE, - stdout=_DEVNULL, - stderr=subprocess.STDOUT) == 0 + """Kills a docker container. Returns True if successful.""" + return subprocess.call( + ['docker', 'kill', str(cid)], + stdin=subprocess.PIPE, + stdout=_DEVNULL, + stderr=subprocess.STDOUT) == 0 def docker_mapped_port(cid, port, timeout_seconds=15): - """Get port mapped to internal given internal port for given container.""" - started = time.time() - while time.time() - started < timeout_seconds: - try: - output = subprocess.check_output('docker port %s %s' % (cid, port), - stderr=_DEVNULL, - shell=True) - return int(output.split(':', 2)[1]) - except subprocess.CalledProcessError as e: - pass - raise Exception('Failed to get exposed port %s for container %s.' % - (port, cid)) + """Get port mapped to internal given internal port for given container.""" + started = time.time() + while time.time() - started < timeout_seconds: + try: + output = subprocess.check_output( + 'docker port %s %s' % (cid, port), stderr=_DEVNULL, shell=True) + return int(output.split(':', 2)[1]) + except subprocess.CalledProcessError as e: + pass + raise Exception('Failed to get exposed port %s for container %s.' % + (port, cid)) def wait_for_healthy(cid, shortname, timeout_seconds): - """Wait timeout_seconds for the container to become healthy""" - started = time.time() - while time.time() - started < timeout_seconds: - try: - output = subprocess.check_output( - ['docker', 'inspect', '--format="{{.State.Health.Status}}"', cid], - stderr=_DEVNULL) - if output.strip('\n') == 'healthy': - return - except subprocess.CalledProcessError as e: - pass - time.sleep(1) - raise Exception('Timed out waiting for %s (%s) to pass health check' % - (shortname, cid)) + """Wait timeout_seconds for the container to become healthy""" + started = time.time() + while time.time() - started < timeout_seconds: + try: + output = subprocess.check_output( + [ + 'docker', 'inspect', '--format="{{.State.Health.Status}}"', + cid + ], + stderr=_DEVNULL) + if output.strip('\n') == 'healthy': + return + except subprocess.CalledProcessError as e: + pass + time.sleep(1) + raise Exception('Timed out waiting for %s (%s) to pass health check' % + (shortname, cid)) def finish_jobs(jobs): - """Kills given docker containers and waits for corresponding jobs to finish""" - for job in jobs: - job.kill(suppress_failure=True) + """Kills given docker containers and waits for corresponding jobs to finish""" + for job in jobs: + job.kill(suppress_failure=True) - while any(job.is_running() for job in jobs): - time.sleep(1) + while any(job.is_running() for job in jobs): + time.sleep(1) def image_exists(image): - """Returns True if given docker image exists.""" - return subprocess.call(['docker','inspect', image], - stdin=subprocess.PIPE, - stdout=_DEVNULL, - stderr=subprocess.STDOUT) == 0 + """Returns True if given docker image exists.""" + return subprocess.call( + ['docker', 'inspect', image], + stdin=subprocess.PIPE, + stdout=_DEVNULL, + stderr=subprocess.STDOUT) == 0 def remove_image(image, skip_nonexistent=False, max_retries=10): - """Attempts to remove docker image with retries.""" - if skip_nonexistent and not image_exists(image): - return True - for attempt in range(0, max_retries): - if subprocess.call(['docker','rmi', '-f', image], - stdin=subprocess.PIPE, - stdout=_DEVNULL, - stderr=subprocess.STDOUT) == 0: - return True - time.sleep(2) - print('Failed to remove docker image %s' % image) - return False + """Attempts to remove docker image with retries.""" + if skip_nonexistent and not image_exists(image): + return True + for attempt in range(0, max_retries): + if subprocess.call( + ['docker', 'rmi', '-f', image], + stdin=subprocess.PIPE, + stdout=_DEVNULL, + stderr=subprocess.STDOUT) == 0: + return True + time.sleep(2) + print('Failed to remove docker image %s' % image) + return False class DockerJob: - """Encapsulates a job""" - - def __init__(self, spec): - self._spec = spec - self._job = jobset.Job(spec, newline_on_success=True, travis=True, add_env={}) - self._container_name = spec.container_name - - def mapped_port(self, port): - return docker_mapped_port(self._container_name, port) - - def wait_for_healthy(self, timeout_seconds): - wait_for_healthy(self._container_name, self._spec.shortname, timeout_seconds) - - def kill(self, suppress_failure=False): - """Sends kill signal to the container.""" - if suppress_failure: - self._job.suppress_failure_message() - return docker_kill(self._container_name) - - def is_running(self): - """Polls a job and returns True if given job is still running.""" - return self._job.state() == jobset._RUNNING + """Encapsulates a job""" + + def __init__(self, spec): + self._spec = spec + self._job = jobset.Job( + spec, newline_on_success=True, travis=True, add_env={}) + self._container_name = spec.container_name + + def mapped_port(self, port): + return docker_mapped_port(self._container_name, port) + + def wait_for_healthy(self, timeout_seconds): + wait_for_healthy(self._container_name, self._spec.shortname, + timeout_seconds) + + def kill(self, suppress_failure=False): + """Sends kill signal to the container.""" + if suppress_failure: + self._job.suppress_failure_message() + return docker_kill(self._container_name) + + def is_running(self): + """Polls a job and returns True if given job is still running.""" + return self._job.state() == jobset._RUNNING diff --git a/tools/run_tests/python_utils/filter_pull_request_tests.py b/tools/run_tests/python_utils/filter_pull_request_tests.py index e880734651e..8e0dc708dd7 100644 --- a/tools/run_tests/python_utils/filter_pull_request_tests.py +++ b/tools/run_tests/python_utils/filter_pull_request_tests.py @@ -12,7 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Filter out tests based on file differences compared to merge target branch""" from __future__ import print_function @@ -23,24 +22,25 @@ from subprocess import check_output class TestSuite: - """ + """ Contains label to identify job as belonging to this test suite and triggers to identify if changed files are relevant """ - def __init__(self, labels): - """ + + def __init__(self, labels): + """ Build TestSuite to group tests based on labeling :param label: strings that should match a jobs's platform, config, language, or test group """ - self.triggers = [] - self.labels = labels + self.triggers = [] + self.labels = labels - def add_trigger(self, trigger): - """ + def add_trigger(self, trigger): + """ Add a regex to list of triggers that determine if a changed file should run tests :param trigger: regex matching file relevant to tests """ - self.triggers.append(trigger) + self.triggers.append(trigger) # Create test suites @@ -55,10 +55,11 @@ _RUBY_TEST_SUITE = TestSuite(['ruby']) _LINUX_TEST_SUITE = TestSuite(['linux']) _WINDOWS_TEST_SUITE = TestSuite(['windows']) _MACOS_TEST_SUITE = TestSuite(['macos']) -_ALL_TEST_SUITES = [_CORE_TEST_SUITE, _CPP_TEST_SUITE, _CSHARP_TEST_SUITE, - _NODE_TEST_SUITE, _OBJC_TEST_SUITE, _PHP_TEST_SUITE, - _PYTHON_TEST_SUITE, _RUBY_TEST_SUITE, _LINUX_TEST_SUITE, - _WINDOWS_TEST_SUITE, _MACOS_TEST_SUITE] +_ALL_TEST_SUITES = [ + _CORE_TEST_SUITE, _CPP_TEST_SUITE, _CSHARP_TEST_SUITE, _NODE_TEST_SUITE, + _OBJC_TEST_SUITE, _PHP_TEST_SUITE, _PYTHON_TEST_SUITE, _RUBY_TEST_SUITE, + _LINUX_TEST_SUITE, _WINDOWS_TEST_SUITE, _MACOS_TEST_SUITE +] # Dictionary of whitelistable files where the key is a regex matching changed files # and the value is a list of tests that should be run. An empty list means that @@ -66,46 +67,46 @@ _ALL_TEST_SUITES = [_CORE_TEST_SUITE, _CPP_TEST_SUITE, _CSHARP_TEST_SUITE, # match any of these regexes will trigger all tests # DO NOT CHANGE THIS UNLESS YOU KNOW WHAT YOU ARE DOING (be careful even if you do) _WHITELIST_DICT = { - '^doc/': [], - '^examples/': [], - '^include/grpc\+\+/': [_CPP_TEST_SUITE], - '^summerofcode/': [], - '^src/cpp/': [_CPP_TEST_SUITE], - '^src/csharp/': [_CSHARP_TEST_SUITE], - '^src/objective\-c/': [_OBJC_TEST_SUITE], - '^src/php/': [_PHP_TEST_SUITE], - '^src/python/': [_PYTHON_TEST_SUITE], - '^src/ruby/': [_RUBY_TEST_SUITE], - '^templates/': [], - '^test/core/': [_CORE_TEST_SUITE, _CPP_TEST_SUITE], - '^test/cpp/': [_CPP_TEST_SUITE], - '^test/distrib/cpp/': [_CPP_TEST_SUITE], - '^test/distrib/csharp/': [_CSHARP_TEST_SUITE], - '^test/distrib/php/': [_PHP_TEST_SUITE], - '^test/distrib/python/': [_PYTHON_TEST_SUITE], - '^test/distrib/ruby/': [_RUBY_TEST_SUITE], - '^vsprojects/': [_WINDOWS_TEST_SUITE], - 'composer\.json$': [_PHP_TEST_SUITE], - 'config\.m4$': [_PHP_TEST_SUITE], - 'CONTRIBUTING\.md$': [], - 'Gemfile$': [_RUBY_TEST_SUITE], - 'grpc\.def$': [_WINDOWS_TEST_SUITE], - 'grpc\.gemspec$': [_RUBY_TEST_SUITE], - 'gRPC\.podspec$': [_OBJC_TEST_SUITE], - 'gRPC\-Core\.podspec$': [_OBJC_TEST_SUITE], - 'gRPC\-ProtoRPC\.podspec$': [_OBJC_TEST_SUITE], - 'gRPC\-RxLibrary\.podspec$': [_OBJC_TEST_SUITE], - 'INSTALL\.md$': [], - 'LICENSE$': [], - 'MANIFEST\.md$': [], - 'package\.json$': [_PHP_TEST_SUITE], - 'package\.xml$': [_PHP_TEST_SUITE], - 'PATENTS$': [], - 'PYTHON\-MANIFEST\.in$': [_PYTHON_TEST_SUITE], - 'README\.md$': [], - 'requirements\.txt$': [_PYTHON_TEST_SUITE], - 'setup\.cfg$': [_PYTHON_TEST_SUITE], - 'setup\.py$': [_PYTHON_TEST_SUITE] + '^doc/': [], + '^examples/': [], + '^include/grpc\+\+/': [_CPP_TEST_SUITE], + '^summerofcode/': [], + '^src/cpp/': [_CPP_TEST_SUITE], + '^src/csharp/': [_CSHARP_TEST_SUITE], + '^src/objective\-c/': [_OBJC_TEST_SUITE], + '^src/php/': [_PHP_TEST_SUITE], + '^src/python/': [_PYTHON_TEST_SUITE], + '^src/ruby/': [_RUBY_TEST_SUITE], + '^templates/': [], + '^test/core/': [_CORE_TEST_SUITE, _CPP_TEST_SUITE], + '^test/cpp/': [_CPP_TEST_SUITE], + '^test/distrib/cpp/': [_CPP_TEST_SUITE], + '^test/distrib/csharp/': [_CSHARP_TEST_SUITE], + '^test/distrib/php/': [_PHP_TEST_SUITE], + '^test/distrib/python/': [_PYTHON_TEST_SUITE], + '^test/distrib/ruby/': [_RUBY_TEST_SUITE], + '^vsprojects/': [_WINDOWS_TEST_SUITE], + 'composer\.json$': [_PHP_TEST_SUITE], + 'config\.m4$': [_PHP_TEST_SUITE], + 'CONTRIBUTING\.md$': [], + 'Gemfile$': [_RUBY_TEST_SUITE], + 'grpc\.def$': [_WINDOWS_TEST_SUITE], + 'grpc\.gemspec$': [_RUBY_TEST_SUITE], + 'gRPC\.podspec$': [_OBJC_TEST_SUITE], + 'gRPC\-Core\.podspec$': [_OBJC_TEST_SUITE], + 'gRPC\-ProtoRPC\.podspec$': [_OBJC_TEST_SUITE], + 'gRPC\-RxLibrary\.podspec$': [_OBJC_TEST_SUITE], + 'INSTALL\.md$': [], + 'LICENSE$': [], + 'MANIFEST\.md$': [], + 'package\.json$': [_PHP_TEST_SUITE], + 'package\.xml$': [_PHP_TEST_SUITE], + 'PATENTS$': [], + 'PYTHON\-MANIFEST\.in$': [_PYTHON_TEST_SUITE], + 'README\.md$': [], + 'requirements\.txt$': [_PYTHON_TEST_SUITE], + 'setup\.cfg$': [_PYTHON_TEST_SUITE], + 'setup\.py$': [_PYTHON_TEST_SUITE] } # Regex that combines all keys in _WHITELIST_DICT @@ -113,83 +114,88 @@ _ALL_TRIGGERS = "(" + ")|(".join(_WHITELIST_DICT.keys()) + ")" # Add all triggers to their respective test suites for trigger, test_suites in six.iteritems(_WHITELIST_DICT): - for test_suite in test_suites: - test_suite.add_trigger(trigger) + for test_suite in test_suites: + test_suite.add_trigger(trigger) def _get_changed_files(base_branch): - """ + """ Get list of changed files between current branch and base of target merge branch """ - # Get file changes between branch and merge-base of specified branch - # Not combined to be Windows friendly - base_commit = check_output(["git", "merge-base", base_branch, "HEAD"]).rstrip() - return check_output(["git", "diff", base_commit, "--name-only", "HEAD"]).splitlines() + # Get file changes between branch and merge-base of specified branch + # Not combined to be Windows friendly + base_commit = check_output( + ["git", "merge-base", base_branch, "HEAD"]).rstrip() + return check_output( + ["git", "diff", base_commit, "--name-only", "HEAD"]).splitlines() def _can_skip_tests(file_names, triggers): - """ + """ Determines if tests are skippable based on if all files do not match list of regexes :param file_names: list of changed files generated by _get_changed_files() :param triggers: list of regexes matching file name that indicates tests should be run :return: safe to skip tests """ - for file_name in file_names: - if any(re.match(trigger, file_name) for trigger in triggers): - return False - return True + for file_name in file_names: + if any(re.match(trigger, file_name) for trigger in triggers): + return False + return True def _remove_irrelevant_tests(tests, skippable_labels): - """ + """ Filters out tests by config or language - will not remove sanitizer tests :param tests: list of all tests generated by run_tests_matrix.py :param skippable_labels: list of languages and platforms with skippable tests :return: list of relevant tests """ - # test.labels[0] is platform and test.labels[2] is language - # We skip a test if both are considered safe to skip - return [test for test in tests if test.labels[0] not in skippable_labels or \ - test.labels[2] not in skippable_labels] + # test.labels[0] is platform and test.labels[2] is language + # We skip a test if both are considered safe to skip + return [test for test in tests if test.labels[0] not in skippable_labels or \ + test.labels[2] not in skippable_labels] def affects_c_cpp(base_branch): - """ + """ Determines if a pull request's changes affect C/C++. This function exists because there are pull request tests that only test C/C++ code :param base_branch: branch that a pull request is requesting to merge into :return: boolean indicating whether C/C++ changes are made in pull request """ - changed_files = _get_changed_files(base_branch) - # Run all tests if any changed file is not in the whitelist dictionary - for changed_file in changed_files: - if not re.match(_ALL_TRIGGERS, changed_file): - return True - return not _can_skip_tests(changed_files, _CPP_TEST_SUITE.triggers + _CORE_TEST_SUITE.triggers) + changed_files = _get_changed_files(base_branch) + # Run all tests if any changed file is not in the whitelist dictionary + for changed_file in changed_files: + if not re.match(_ALL_TRIGGERS, changed_file): + return True + return not _can_skip_tests( + changed_files, _CPP_TEST_SUITE.triggers + _CORE_TEST_SUITE.triggers) def filter_tests(tests, base_branch): - """ + """ Filters out tests that are safe to ignore :param tests: list of all tests generated by run_tests_matrix.py :return: list of relevant tests """ - print('Finding file differences between gRPC %s branch and pull request...\n' % base_branch) - changed_files = _get_changed_files(base_branch) - for changed_file in changed_files: - print(' %s' % changed_file) - print('') - - # Run all tests if any changed file is not in the whitelist dictionary - for changed_file in changed_files: - if not re.match(_ALL_TRIGGERS, changed_file): - return(tests) - # Figure out which language and platform tests to run - skippable_labels = [] - for test_suite in _ALL_TEST_SUITES: - if _can_skip_tests(changed_files, test_suite.triggers): - for label in test_suite.labels: - print(' %s tests safe to skip' % label) - skippable_labels.append(label) - tests = _remove_irrelevant_tests(tests, skippable_labels) - return tests + print( + 'Finding file differences between gRPC %s branch and pull request...\n' + % base_branch) + changed_files = _get_changed_files(base_branch) + for changed_file in changed_files: + print(' %s' % changed_file) + print('') + + # Run all tests if any changed file is not in the whitelist dictionary + for changed_file in changed_files: + if not re.match(_ALL_TRIGGERS, changed_file): + return (tests) + # Figure out which language and platform tests to run + skippable_labels = [] + for test_suite in _ALL_TEST_SUITES: + if _can_skip_tests(changed_files, test_suite.triggers): + for label in test_suite.labels: + print(' %s tests safe to skip' % label) + skippable_labels.append(label) + tests = _remove_irrelevant_tests(tests, skippable_labels) + return tests diff --git a/tools/run_tests/python_utils/jobset.py b/tools/run_tests/python_utils/jobset.py index 85eef444ef8..424b4404a8d 100755 --- a/tools/run_tests/python_utils/jobset.py +++ b/tools/run_tests/python_utils/jobset.py @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Run a group of subprocesses and then finish.""" from __future__ import print_function @@ -28,11 +27,9 @@ import tempfile import time import errno - # cpu cost measurement measure_cpu_costs = False - _DEFAULT_MAX_JOBS = 16 * multiprocessing.cpu_count() _MAX_RESULT_SIZE = 8192 @@ -42,63 +39,60 @@ _MAX_RESULT_SIZE = 8192 # characters to the PR description, which leak into the environment here # and cause failures. def strip_non_ascii_chars(s): - return ''.join(c for c in s if ord(c) < 128) + return ''.join(c for c in s if ord(c) < 128) def sanitized_environment(env): - sanitized = {} - for key, value in env.items(): - sanitized[strip_non_ascii_chars(key)] = strip_non_ascii_chars(value) - return sanitized + sanitized = {} + for key, value in env.items(): + sanitized[strip_non_ascii_chars(key)] = strip_non_ascii_chars(value) + return sanitized def platform_string(): - if platform.system() == 'Windows': - return 'windows' - elif platform.system()[:7] == 'MSYS_NT': - return 'windows' - elif platform.system() == 'Darwin': - return 'mac' - elif platform.system() == 'Linux': - return 'linux' - else: - return 'posix' + if platform.system() == 'Windows': + return 'windows' + elif platform.system()[:7] == 'MSYS_NT': + return 'windows' + elif platform.system() == 'Darwin': + return 'mac' + elif platform.system() == 'Linux': + return 'linux' + else: + return 'posix' # setup a signal handler so that signal.pause registers 'something' # when a child finishes # not using futures and threading to avoid a dependency on subprocess32 if platform_string() == 'windows': - pass -else: - def alarm_handler(unused_signum, unused_frame): pass +else: - signal.signal(signal.SIGCHLD, lambda unused_signum, unused_frame: None) - signal.signal(signal.SIGALRM, alarm_handler) + def alarm_handler(unused_signum, unused_frame): + pass + signal.signal(signal.SIGCHLD, lambda unused_signum, unused_frame: None) + signal.signal(signal.SIGALRM, alarm_handler) _SUCCESS = object() _FAILURE = object() _RUNNING = object() _KILLED = object() - _COLORS = { - 'red': [ 31, 0 ], - 'green': [ 32, 0 ], - 'yellow': [ 33, 0 ], - 'lightgray': [ 37, 0], - 'gray': [ 30, 1 ], - 'purple': [ 35, 0 ], - 'cyan': [ 36, 0 ] - } - + 'red': [31, 0], + 'green': [32, 0], + 'yellow': [33, 0], + 'lightgray': [37, 0], + 'gray': [30, 1], + 'purple': [35, 0], + 'cyan': [36, 0] +} _BEGINNING_OF_LINE = '\x1b[0G' _CLEAR_LINE = '\x1b[2K' - _TAG_COLOR = { 'FAILED': 'red', 'FLAKE': 'purple', @@ -111,392 +105,436 @@ _TAG_COLOR = { 'SUCCESS': 'green', 'IDLE': 'gray', 'SKIPPED': 'cyan' - } +} _FORMAT = '%(asctime)-15s %(message)s' logging.basicConfig(level=logging.INFO, format=_FORMAT) def eintr_be_gone(fn): - """Run fn until it doesn't stop because of EINTR""" - while True: - try: - return fn() - except IOError, e: - if e.errno != errno.EINTR: - raise - + """Run fn until it doesn't stop because of EINTR""" + while True: + try: + return fn() + except IOError, e: + if e.errno != errno.EINTR: + raise def message(tag, msg, explanatory_text=None, do_newline=False): - if message.old_tag == tag and message.old_msg == msg and not explanatory_text: - return - message.old_tag = tag - message.old_msg = msg - while True: - try: - if platform_string() == 'windows' or not sys.stdout.isatty(): - if explanatory_text: - logging.info(explanatory_text) - logging.info('%s: %s', tag, msg) - else: - sys.stdout.write('%s%s%s\x1b[%d;%dm%s\x1b[0m: %s%s' % ( - _BEGINNING_OF_LINE, - _CLEAR_LINE, - '\n%s' % explanatory_text if explanatory_text is not None else '', - _COLORS[_TAG_COLOR[tag]][1], - _COLORS[_TAG_COLOR[tag]][0], - tag, - msg, - '\n' if do_newline or explanatory_text is not None else '')) - sys.stdout.flush() - return - except IOError, e: - if e.errno != errno.EINTR: - raise + if message.old_tag == tag and message.old_msg == msg and not explanatory_text: + return + message.old_tag = tag + message.old_msg = msg + while True: + try: + if platform_string() == 'windows' or not sys.stdout.isatty(): + if explanatory_text: + logging.info(explanatory_text) + logging.info('%s: %s', tag, msg) + else: + sys.stdout.write('%s%s%s\x1b[%d;%dm%s\x1b[0m: %s%s' % ( + _BEGINNING_OF_LINE, _CLEAR_LINE, '\n%s' % explanatory_text + if explanatory_text is not None else '', + _COLORS[_TAG_COLOR[tag]][1], _COLORS[_TAG_COLOR[tag]][0], + tag, msg, '\n' + if do_newline or explanatory_text is not None else '')) + sys.stdout.flush() + return + except IOError, e: + if e.errno != errno.EINTR: + raise + message.old_tag = '' message.old_msg = '' + def which(filename): - if '/' in filename: - return filename - for path in os.environ['PATH'].split(os.pathsep): - if os.path.exists(os.path.join(path, filename)): - return os.path.join(path, filename) - raise Exception('%s not found' % filename) + if '/' in filename: + return filename + for path in os.environ['PATH'].split(os.pathsep): + if os.path.exists(os.path.join(path, filename)): + return os.path.join(path, filename) + raise Exception('%s not found' % filename) class JobSpec(object): - """Specifies what to run for a job.""" - - def __init__(self, cmdline, shortname=None, environ=None, - cwd=None, shell=False, timeout_seconds=5*60, flake_retries=0, - timeout_retries=0, kill_handler=None, cpu_cost=1.0, - verbose_success=False): - """ + """Specifies what to run for a job.""" + + def __init__(self, + cmdline, + shortname=None, + environ=None, + cwd=None, + shell=False, + timeout_seconds=5 * 60, + flake_retries=0, + timeout_retries=0, + kill_handler=None, + cpu_cost=1.0, + verbose_success=False): + """ Arguments: cmdline: a list of arguments to pass as the command line environ: a dictionary of environment variables to set in the child process kill_handler: a handler that will be called whenever job.kill() is invoked cpu_cost: number of cores per second this job needs """ - if environ is None: - environ = {} - self.cmdline = cmdline - self.environ = environ - self.shortname = cmdline[0] if shortname is None else shortname - self.cwd = cwd - self.shell = shell - self.timeout_seconds = timeout_seconds - self.flake_retries = flake_retries - self.timeout_retries = timeout_retries - self.kill_handler = kill_handler - self.cpu_cost = cpu_cost - self.verbose_success = verbose_success - - def identity(self): - return '%r %r' % (self.cmdline, self.environ) - - def __hash__(self): - return hash(self.identity()) - - def __cmp__(self, other): - return self.identity() == other.identity() - - def __repr__(self): - return 'JobSpec(shortname=%s, cmdline=%s)' % (self.shortname, self.cmdline) - - def __str__(self): - return '%s: %s %s' % (self.shortname, - ' '.join('%s=%s' % kv for kv in self.environ.items()), - ' '.join(self.cmdline)) + if environ is None: + environ = {} + self.cmdline = cmdline + self.environ = environ + self.shortname = cmdline[0] if shortname is None else shortname + self.cwd = cwd + self.shell = shell + self.timeout_seconds = timeout_seconds + self.flake_retries = flake_retries + self.timeout_retries = timeout_retries + self.kill_handler = kill_handler + self.cpu_cost = cpu_cost + self.verbose_success = verbose_success + + def identity(self): + return '%r %r' % (self.cmdline, self.environ) + + def __hash__(self): + return hash(self.identity()) + + def __cmp__(self, other): + return self.identity() == other.identity() + + def __repr__(self): + return 'JobSpec(shortname=%s, cmdline=%s)' % (self.shortname, + self.cmdline) + + def __str__(self): + return '%s: %s %s' % (self.shortname, + ' '.join('%s=%s' % kv + for kv in self.environ.items()), + ' '.join(self.cmdline)) class JobResult(object): - def __init__(self): - self.state = 'UNKNOWN' - self.returncode = -1 - self.elapsed_time = 0 - self.num_failures = 0 - self.retries = 0 - self.message = '' - self.cpu_estimated = 1 - self.cpu_measured = 1 + + def __init__(self): + self.state = 'UNKNOWN' + self.returncode = -1 + self.elapsed_time = 0 + self.num_failures = 0 + self.retries = 0 + self.message = '' + self.cpu_estimated = 1 + self.cpu_measured = 1 def read_from_start(f): - f.seek(0) - return f.read() + f.seek(0) + return f.read() class Job(object): - """Manages one job.""" - - def __init__(self, spec, newline_on_success, travis, add_env, - quiet_success=False): - self._spec = spec - self._newline_on_success = newline_on_success - self._travis = travis - self._add_env = add_env.copy() - self._retries = 0 - self._timeout_retries = 0 - self._suppress_failure_message = False - self._quiet_success = quiet_success - if not self._quiet_success: - message('START', spec.shortname, do_newline=self._travis) - self.result = JobResult() - self.start() - - def GetSpec(self): - return self._spec - - def start(self): - self._tempfile = tempfile.TemporaryFile() - env = dict(os.environ) - env.update(self._spec.environ) - env.update(self._add_env) - env = sanitized_environment(env) - self._start = time.time() - cmdline = self._spec.cmdline - # The Unix time command is finicky when used with MSBuild, so we don't use it - # with jobs that run MSBuild. - global measure_cpu_costs - if measure_cpu_costs and not 'vsprojects\\build' in cmdline[0]: - cmdline = ['time', '-p'] + cmdline - else: - measure_cpu_costs = False - try_start = lambda: subprocess.Popen(args=cmdline, - stderr=subprocess.STDOUT, - stdout=self._tempfile, - cwd=self._spec.cwd, - shell=self._spec.shell, - env=env) - delay = 0.3 - for i in range(0, 4): - try: - self._process = try_start() - break - except OSError: - message('WARNING', 'Failed to start %s, retrying in %f seconds' % (self._spec.shortname, delay)) - time.sleep(delay) - delay *= 2 - else: - self._process = try_start() - self._state = _RUNNING - - def state(self): - """Poll current state of the job. Prints messages at completion.""" - def stdout(self=self): - stdout = read_from_start(self._tempfile) - self.result.message = stdout[-_MAX_RESULT_SIZE:] - return stdout - if self._state == _RUNNING and self._process.poll() is not None: - elapsed = time.time() - self._start - self.result.elapsed_time = elapsed - if self._process.returncode != 0: - if self._retries < self._spec.flake_retries: - message('FLAKE', '%s [ret=%d, pid=%d]' % ( - self._spec.shortname, self._process.returncode, self._process.pid), - stdout(), do_newline=True) - self._retries += 1 - self.result.num_failures += 1 - self.result.retries = self._timeout_retries + self._retries - # NOTE: job is restarted regardless of jobset's max_time setting - self.start() - else: - self._state = _FAILURE - if not self._suppress_failure_message: - message('FAILED', '%s [ret=%d, pid=%d, time=%.1fsec]' % ( - self._spec.shortname, self._process.returncode, self._process.pid, elapsed), - stdout(), do_newline=True) - self.result.state = 'FAILED' - self.result.num_failures += 1 - self.result.returncode = self._process.returncode - else: - self._state = _SUCCESS - measurement = '' - if measure_cpu_costs: - m = re.search(r'real\s+([0-9.]+)\nuser\s+([0-9.]+)\nsys\s+([0-9.]+)', stdout()) - real = float(m.group(1)) - user = float(m.group(2)) - sys = float(m.group(3)) - if real > 0.5: - cores = (user + sys) / real - self.result.cpu_measured = float('%.01f' % cores) - self.result.cpu_estimated = float('%.01f' % self._spec.cpu_cost) - measurement = '; cpu_cost=%.01f; estimated=%.01f' % (self.result.cpu_measured, self.result.cpu_estimated) + """Manages one job.""" + + def __init__(self, + spec, + newline_on_success, + travis, + add_env, + quiet_success=False): + self._spec = spec + self._newline_on_success = newline_on_success + self._travis = travis + self._add_env = add_env.copy() + self._retries = 0 + self._timeout_retries = 0 + self._suppress_failure_message = False + self._quiet_success = quiet_success if not self._quiet_success: - message('PASSED', '%s [time=%.1fsec, retries=%d:%d%s]' % ( - self._spec.shortname, elapsed, self._retries, self._timeout_retries, measurement), - stdout() if self._spec.verbose_success else None, - do_newline=self._newline_on_success or self._travis) - self.result.state = 'PASSED' - elif (self._state == _RUNNING and - self._spec.timeout_seconds is not None and - time.time() - self._start > self._spec.timeout_seconds): - elapsed = time.time() - self._start - self.result.elapsed_time = elapsed - if self._timeout_retries < self._spec.timeout_retries: - message('TIMEOUT_FLAKE', '%s [pid=%d]' % (self._spec.shortname, self._process.pid), stdout(), do_newline=True) - self._timeout_retries += 1 - self.result.num_failures += 1 - self.result.retries = self._timeout_retries + self._retries - if self._spec.kill_handler: - self._spec.kill_handler(self) - self._process.terminate() - # NOTE: job is restarted regardless of jobset's max_time setting + message('START', spec.shortname, do_newline=self._travis) + self.result = JobResult() self.start() - else: - message('TIMEOUT', '%s [pid=%d, time=%.1fsec]' % (self._spec.shortname, self._process.pid, elapsed), stdout(), do_newline=True) - self.kill() - self.result.state = 'TIMEOUT' - self.result.num_failures += 1 - return self._state - def kill(self): - if self._state == _RUNNING: - self._state = _KILLED - if self._spec.kill_handler: - self._spec.kill_handler(self) - self._process.terminate() - - def suppress_failure_message(self): - self._suppress_failure_message = True + def GetSpec(self): + return self._spec + + def start(self): + self._tempfile = tempfile.TemporaryFile() + env = dict(os.environ) + env.update(self._spec.environ) + env.update(self._add_env) + env = sanitized_environment(env) + self._start = time.time() + cmdline = self._spec.cmdline + # The Unix time command is finicky when used with MSBuild, so we don't use it + # with jobs that run MSBuild. + global measure_cpu_costs + if measure_cpu_costs and not 'vsprojects\\build' in cmdline[0]: + cmdline = ['time', '-p'] + cmdline + else: + measure_cpu_costs = False + try_start = lambda: subprocess.Popen(args=cmdline, + stderr=subprocess.STDOUT, + stdout=self._tempfile, + cwd=self._spec.cwd, + shell=self._spec.shell, + env=env) + delay = 0.3 + for i in range(0, 4): + try: + self._process = try_start() + break + except OSError: + message('WARNING', 'Failed to start %s, retrying in %f seconds' + % (self._spec.shortname, delay)) + time.sleep(delay) + delay *= 2 + else: + self._process = try_start() + self._state = _RUNNING + + def state(self): + """Poll current state of the job. Prints messages at completion.""" + + def stdout(self=self): + stdout = read_from_start(self._tempfile) + self.result.message = stdout[-_MAX_RESULT_SIZE:] + return stdout + + if self._state == _RUNNING and self._process.poll() is not None: + elapsed = time.time() - self._start + self.result.elapsed_time = elapsed + if self._process.returncode != 0: + if self._retries < self._spec.flake_retries: + message( + 'FLAKE', + '%s [ret=%d, pid=%d]' % + (self._spec.shortname, self._process.returncode, + self._process.pid), + stdout(), + do_newline=True) + self._retries += 1 + self.result.num_failures += 1 + self.result.retries = self._timeout_retries + self._retries + # NOTE: job is restarted regardless of jobset's max_time setting + self.start() + else: + self._state = _FAILURE + if not self._suppress_failure_message: + message( + 'FAILED', + '%s [ret=%d, pid=%d, time=%.1fsec]' % + (self._spec.shortname, self._process.returncode, + self._process.pid, elapsed), + stdout(), + do_newline=True) + self.result.state = 'FAILED' + self.result.num_failures += 1 + self.result.returncode = self._process.returncode + else: + self._state = _SUCCESS + measurement = '' + if measure_cpu_costs: + m = re.search( + r'real\s+([0-9.]+)\nuser\s+([0-9.]+)\nsys\s+([0-9.]+)', + stdout()) + real = float(m.group(1)) + user = float(m.group(2)) + sys = float(m.group(3)) + if real > 0.5: + cores = (user + sys) / real + self.result.cpu_measured = float('%.01f' % cores) + self.result.cpu_estimated = float('%.01f' % + self._spec.cpu_cost) + measurement = '; cpu_cost=%.01f; estimated=%.01f' % ( + self.result.cpu_measured, self.result.cpu_estimated) + if not self._quiet_success: + message( + 'PASSED', + '%s [time=%.1fsec, retries=%d:%d%s]' % + (self._spec.shortname, elapsed, self._retries, + self._timeout_retries, measurement), + stdout() if self._spec.verbose_success else None, + do_newline=self._newline_on_success or self._travis) + self.result.state = 'PASSED' + elif (self._state == _RUNNING and + self._spec.timeout_seconds is not None and + time.time() - self._start > self._spec.timeout_seconds): + elapsed = time.time() - self._start + self.result.elapsed_time = elapsed + if self._timeout_retries < self._spec.timeout_retries: + message( + 'TIMEOUT_FLAKE', + '%s [pid=%d]' % (self._spec.shortname, self._process.pid), + stdout(), + do_newline=True) + self._timeout_retries += 1 + self.result.num_failures += 1 + self.result.retries = self._timeout_retries + self._retries + if self._spec.kill_handler: + self._spec.kill_handler(self) + self._process.terminate() + # NOTE: job is restarted regardless of jobset's max_time setting + self.start() + else: + message( + 'TIMEOUT', + '%s [pid=%d, time=%.1fsec]' % + (self._spec.shortname, self._process.pid, elapsed), + stdout(), + do_newline=True) + self.kill() + self.result.state = 'TIMEOUT' + self.result.num_failures += 1 + return self._state + + def kill(self): + if self._state == _RUNNING: + self._state = _KILLED + if self._spec.kill_handler: + self._spec.kill_handler(self) + self._process.terminate() + + def suppress_failure_message(self): + self._suppress_failure_message = True class Jobset(object): - """Manages one run of jobs.""" - - def __init__(self, check_cancelled, maxjobs, maxjobs_cpu_agnostic, newline_on_success, travis, - stop_on_failure, add_env, quiet_success, max_time): - self._running = set() - self._check_cancelled = check_cancelled - self._cancelled = False - self._failures = 0 - self._completed = 0 - self._maxjobs = maxjobs - self._maxjobs_cpu_agnostic = maxjobs_cpu_agnostic - self._newline_on_success = newline_on_success - self._travis = travis - self._stop_on_failure = stop_on_failure - self._add_env = add_env - self._quiet_success = quiet_success - self._max_time = max_time - self.resultset = {} - self._remaining = None - self._start_time = time.time() - - def set_remaining(self, remaining): - self._remaining = remaining - - def get_num_failures(self): - return self._failures - - def cpu_cost(self): - c = 0 - for job in self._running: - c += job._spec.cpu_cost - return c - - def start(self, spec): - """Start a job. Return True on success, False on failure.""" - while True: - if self._max_time > 0 and time.time() - self._start_time > self._max_time: - skipped_job_result = JobResult() - skipped_job_result.state = 'SKIPPED' - message('SKIPPED', spec.shortname, do_newline=True) - self.resultset[spec.shortname] = [skipped_job_result] + """Manages one run of jobs.""" + + def __init__(self, check_cancelled, maxjobs, maxjobs_cpu_agnostic, + newline_on_success, travis, stop_on_failure, add_env, + quiet_success, max_time): + self._running = set() + self._check_cancelled = check_cancelled + self._cancelled = False + self._failures = 0 + self._completed = 0 + self._maxjobs = maxjobs + self._maxjobs_cpu_agnostic = maxjobs_cpu_agnostic + self._newline_on_success = newline_on_success + self._travis = travis + self._stop_on_failure = stop_on_failure + self._add_env = add_env + self._quiet_success = quiet_success + self._max_time = max_time + self.resultset = {} + self._remaining = None + self._start_time = time.time() + + def set_remaining(self, remaining): + self._remaining = remaining + + def get_num_failures(self): + return self._failures + + def cpu_cost(self): + c = 0 + for job in self._running: + c += job._spec.cpu_cost + return c + + def start(self, spec): + """Start a job. Return True on success, False on failure.""" + while True: + if self._max_time > 0 and time.time( + ) - self._start_time > self._max_time: + skipped_job_result = JobResult() + skipped_job_result.state = 'SKIPPED' + message('SKIPPED', spec.shortname, do_newline=True) + self.resultset[spec.shortname] = [skipped_job_result] + return True + if self.cancelled(): return False + current_cpu_cost = self.cpu_cost() + if current_cpu_cost == 0: break + if current_cpu_cost + spec.cpu_cost <= self._maxjobs: + if len(self._running) < self._maxjobs_cpu_agnostic: + break + self.reap(spec.shortname, spec.cpu_cost) + if self.cancelled(): return False + job = Job(spec, self._newline_on_success, self._travis, self._add_env, + self._quiet_success) + self._running.add(job) + if job.GetSpec().shortname not in self.resultset: + self.resultset[job.GetSpec().shortname] = [] return True - if self.cancelled(): return False - current_cpu_cost = self.cpu_cost() - if current_cpu_cost == 0: break - if current_cpu_cost + spec.cpu_cost <= self._maxjobs: - if len(self._running) < self._maxjobs_cpu_agnostic: - break - self.reap(spec.shortname, spec.cpu_cost) - if self.cancelled(): return False - job = Job(spec, - self._newline_on_success, - self._travis, - self._add_env, - self._quiet_success) - self._running.add(job) - if job.GetSpec().shortname not in self.resultset: - self.resultset[job.GetSpec().shortname] = [] - return True - - def reap(self, waiting_for=None, waiting_for_cost=None): - """Collect the dead jobs.""" - while self._running: - dead = set() - for job in self._running: - st = eintr_be_gone(lambda: job.state()) - if st == _RUNNING: continue - if st == _FAILURE or st == _KILLED: - self._failures += 1 - if self._stop_on_failure: - self._cancelled = True + + def reap(self, waiting_for=None, waiting_for_cost=None): + """Collect the dead jobs.""" + while self._running: + dead = set() for job in self._running: - job.kill() - dead.add(job) - break - for job in dead: - self._completed += 1 - if not self._quiet_success or job.result.state != 'PASSED': - self.resultset[job.GetSpec().shortname].append(job.result) - self._running.remove(job) - if dead: return - if not self._travis and platform_string() != 'windows': - rstr = '' if self._remaining is None else '%d queued, ' % self._remaining - if self._remaining is not None and self._completed > 0: - now = time.time() - sofar = now - self._start_time - remaining = sofar / self._completed * (self._remaining + len(self._running)) - rstr = 'ETA %.1f sec; %s' % (remaining, rstr) - if waiting_for is not None: - wstr = ' next: %s @ %.2f cpu' % (waiting_for, waiting_for_cost) - else: - wstr = '' - message('WAITING', '%s%d jobs running, %d complete, %d failed (load %.2f)%s' % ( - rstr, len(self._running), self._completed, self._failures, self.cpu_cost(), wstr)) - if platform_string() == 'windows': - time.sleep(0.1) - else: - signal.alarm(10) - signal.pause() - - def cancelled(self): - """Poll for cancellation.""" - if self._cancelled: return True - if not self._check_cancelled(): return False - for job in self._running: - job.kill() - self._cancelled = True - return True - - def finish(self): - while self._running: - if self.cancelled(): pass # poll cancellation - self.reap() - if platform_string() != 'windows': - signal.alarm(0) - return not self.cancelled() and self._failures == 0 + st = eintr_be_gone(lambda: job.state()) + if st == _RUNNING: continue + if st == _FAILURE or st == _KILLED: + self._failures += 1 + if self._stop_on_failure: + self._cancelled = True + for job in self._running: + job.kill() + dead.add(job) + break + for job in dead: + self._completed += 1 + if not self._quiet_success or job.result.state != 'PASSED': + self.resultset[job.GetSpec().shortname].append(job.result) + self._running.remove(job) + if dead: return + if not self._travis and platform_string() != 'windows': + rstr = '' if self._remaining is None else '%d queued, ' % self._remaining + if self._remaining is not None and self._completed > 0: + now = time.time() + sofar = now - self._start_time + remaining = sofar / self._completed * ( + self._remaining + len(self._running)) + rstr = 'ETA %.1f sec; %s' % (remaining, rstr) + if waiting_for is not None: + wstr = ' next: %s @ %.2f cpu' % (waiting_for, + waiting_for_cost) + else: + wstr = '' + message( + 'WAITING', + '%s%d jobs running, %d complete, %d failed (load %.2f)%s' % + (rstr, len(self._running), self._completed, self._failures, + self.cpu_cost(), wstr)) + if platform_string() == 'windows': + time.sleep(0.1) + else: + signal.alarm(10) + signal.pause() + + def cancelled(self): + """Poll for cancellation.""" + if self._cancelled: return True + if not self._check_cancelled(): return False + for job in self._running: + job.kill() + self._cancelled = True + return True + + def finish(self): + while self._running: + if self.cancelled(): pass # poll cancellation + self.reap() + if platform_string() != 'windows': + signal.alarm(0) + return not self.cancelled() and self._failures == 0 def _never_cancelled(): - return False + return False def tag_remaining(xs): - staging = [] - for x in xs: - staging.append(x) - if len(staging) > 5000: - yield (staging.pop(0), None) - n = len(staging) - for i, x in enumerate(staging): - yield (x, n - i - 1) + staging = [] + for x in xs: + staging.append(x) + if len(staging) > 5000: + yield (staging.pop(0), None) + n = len(staging) + for i, x in enumerate(staging): + yield (x, n - i - 1) def run(cmdlines, @@ -511,23 +549,23 @@ def run(cmdlines, skip_jobs=False, quiet_success=False, max_time=-1): - if skip_jobs: - resultset = {} - skipped_job_result = JobResult() - skipped_job_result.state = 'SKIPPED' - for job in cmdlines: - message('SKIPPED', job.shortname, do_newline=True) - resultset[job.shortname] = [skipped_job_result] - return 0, resultset - js = Jobset(check_cancelled, - maxjobs if maxjobs is not None else _DEFAULT_MAX_JOBS, - maxjobs_cpu_agnostic if maxjobs_cpu_agnostic is not None else _DEFAULT_MAX_JOBS, - newline_on_success, travis, stop_on_failure, add_env, - quiet_success, max_time) - for cmdline, remaining in tag_remaining(cmdlines): - if not js.start(cmdline): - break - if remaining is not None: - js.set_remaining(remaining) - js.finish() - return js.get_num_failures(), js.resultset + if skip_jobs: + resultset = {} + skipped_job_result = JobResult() + skipped_job_result.state = 'SKIPPED' + for job in cmdlines: + message('SKIPPED', job.shortname, do_newline=True) + resultset[job.shortname] = [skipped_job_result] + return 0, resultset + js = Jobset(check_cancelled, maxjobs if maxjobs is not None else + _DEFAULT_MAX_JOBS, maxjobs_cpu_agnostic + if maxjobs_cpu_agnostic is not None else _DEFAULT_MAX_JOBS, + newline_on_success, travis, stop_on_failure, add_env, + quiet_success, max_time) + for cmdline, remaining in tag_remaining(cmdlines): + if not js.start(cmdline): + break + if remaining is not None: + js.set_remaining(remaining) + js.finish() + return js.get_num_failures(), js.resultset diff --git a/tools/run_tests/python_utils/port_server.py b/tools/run_tests/python_utils/port_server.py index e8ac71af8d7..15f55f46dd8 100755 --- a/tools/run_tests/python_utils/port_server.py +++ b/tools/run_tests/python_utils/port_server.py @@ -12,7 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Manage TCP ports for unit tests; started by run_tests.py""" import argparse @@ -27,17 +26,14 @@ from SocketServer import ThreadingMixIn import threading import platform - # increment this number whenever making a change to ensure that # the changes are picked up by running CI servers # note that all changes must be backwards compatible _MY_VERSION = 20 - if len(sys.argv) == 2 and sys.argv[1] == 'dump_version': - print _MY_VERSION - sys.exit(0) - + print _MY_VERSION + sys.exit(0) argp = argparse.ArgumentParser(description='Server for httpcli_test') argp.add_argument('-p', '--port', default=12345, type=int) @@ -45,11 +41,11 @@ argp.add_argument('-l', '--logfile', default=None, type=str) args = argp.parse_args() if args.logfile is not None: - sys.stdin.close() - sys.stderr.close() - sys.stdout.close() - sys.stderr = open(args.logfile, 'w') - sys.stdout = sys.stderr + sys.stdin.close() + sys.stderr.close() + sys.stdout.close() + sys.stderr = open(args.logfile, 'w') + sys.stdout = sys.stderr print 'port server running on port %d' % args.port @@ -61,74 +57,81 @@ mu = threading.Lock() # https://cs.chromium.org/chromium/src/net/base/port_util.cc). When one of these # ports is used in a Cronet test, the test would fail (see issue #12149). These # ports must be excluded from pool. -cronet_restricted_ports = [1, 7, 9, 11, 13, 15, 17, 19, 20, 21, 22, 23, 25, 37, - 42, 43, 53, 77, 79, 87, 95, 101, 102, 103, 104, 109, - 110, 111, 113, 115, 117, 119, 123, 135, 139, 143, - 179, 389, 465, 512, 513, 514, 515, 526, 530, 531, - 532, 540, 556, 563, 587, 601, 636, 993, 995, 2049, - 3659, 4045, 6000, 6665, 6666, 6667, 6668, 6669, 6697] +cronet_restricted_ports = [ + 1, 7, 9, 11, 13, 15, 17, 19, 20, 21, 22, 23, 25, 37, 42, 43, 53, 77, 79, 87, + 95, 101, 102, 103, 104, 109, 110, 111, 113, 115, 117, 119, 123, 135, 139, + 143, 179, 389, 465, 512, 513, 514, 515, 526, 530, 531, 532, 540, 556, 563, + 587, 601, 636, 993, 995, 2049, 3659, 4045, 6000, 6665, 6666, 6667, 6668, + 6669, 6697 +] + def can_connect(port): - # this test is only really useful on unices where SO_REUSE_PORT is available - # so on Windows, where this test is expensive, skip it - if platform.system() == 'Windows': return False - s = socket.socket() - try: - s.connect(('localhost', port)) - return True - except socket.error, e: - return False - finally: - s.close() + # this test is only really useful on unices where SO_REUSE_PORT is available + # so on Windows, where this test is expensive, skip it + if platform.system() == 'Windows': return False + s = socket.socket() + try: + s.connect(('localhost', port)) + return True + except socket.error, e: + return False + finally: + s.close() + def can_bind(port, proto): - s = socket.socket(proto, socket.SOCK_STREAM) - s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - try: - s.bind(('localhost', port)) - return True - except socket.error, e: - return False - finally: - s.close() + s = socket.socket(proto, socket.SOCK_STREAM) + s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + try: + s.bind(('localhost', port)) + return True + except socket.error, e: + return False + finally: + s.close() def refill_pool(max_timeout, req): - """Scan for ports not marked for being in use""" - chk = [port for port in list(range(1025, 32766)) if port not in cronet_restricted_ports] - random.shuffle(chk) - for i in chk: - if len(pool) > 100: break - if i in in_use: - age = time.time() - in_use[i] - if age < max_timeout: - continue - req.log_message("kill old request %d" % i) - del in_use[i] - if can_bind(i, socket.AF_INET) and can_bind(i, socket.AF_INET6) and not can_connect(i): - req.log_message("found available port %d" % i) - pool.append(i) + """Scan for ports not marked for being in use""" + chk = [ + port for port in list(range(1025, 32766)) + if port not in cronet_restricted_ports + ] + random.shuffle(chk) + for i in chk: + if len(pool) > 100: break + if i in in_use: + age = time.time() - in_use[i] + if age < max_timeout: + continue + req.log_message("kill old request %d" % i) + del in_use[i] + if can_bind(i, socket.AF_INET) and can_bind( + i, socket.AF_INET6) and not can_connect(i): + req.log_message("found available port %d" % i) + pool.append(i) def allocate_port(req): - global pool - global in_use - global mu - mu.acquire() - max_timeout = 600 - while not pool: - refill_pool(max_timeout, req) - if not pool: - req.log_message("failed to find ports: retrying soon") - mu.release() - time.sleep(1) - mu.acquire() - max_timeout /= 2 - port = pool[0] - pool = pool[1:] - in_use[port] = time.time() - mu.release() - return port + global pool + global in_use + global mu + mu.acquire() + max_timeout = 600 + while not pool: + refill_pool(max_timeout, req) + if not pool: + req.log_message("failed to find ports: retrying soon") + mu.release() + time.sleep(1) + mu.acquire() + max_timeout /= 2 + port = pool[0] + pool = pool[1:] + in_use[port] = time.time() + mu.release() + return port keep_running = True @@ -136,61 +139,67 @@ keep_running = True class Handler(BaseHTTPRequestHandler): - def setup(self): - # If the client is unreachable for 5 seconds, close the connection - self.timeout = 5 - BaseHTTPRequestHandler.setup(self) + def setup(self): + # If the client is unreachable for 5 seconds, close the connection + self.timeout = 5 + BaseHTTPRequestHandler.setup(self) + + def do_GET(self): + global keep_running + global mu + if self.path == '/get': + # allocate a new port, it will stay bound for ten minutes and until + # it's unused + self.send_response(200) + self.send_header('Content-Type', 'text/plain') + self.end_headers() + p = allocate_port(self) + self.log_message('allocated port %d' % p) + self.wfile.write('%d' % p) + elif self.path[0:6] == '/drop/': + self.send_response(200) + self.send_header('Content-Type', 'text/plain') + self.end_headers() + p = int(self.path[6:]) + mu.acquire() + if p in in_use: + del in_use[p] + pool.append(p) + k = 'known' + else: + k = 'unknown' + mu.release() + self.log_message('drop %s port %d' % (k, p)) + elif self.path == '/version_number': + # fetch a version string and the current process pid + self.send_response(200) + self.send_header('Content-Type', 'text/plain') + self.end_headers() + self.wfile.write(_MY_VERSION) + elif self.path == '/dump': + # yaml module is not installed on Macs and Windows machines by default + # so we import it lazily (/dump action is only used for debugging) + import yaml + self.send_response(200) + self.send_header('Content-Type', 'text/plain') + self.end_headers() + mu.acquire() + now = time.time() + out = yaml.dump( + { + 'pool': pool, + 'in_use': dict((k, now - v) for k, v in in_use.items()) + }) + mu.release() + self.wfile.write(out) + elif self.path == '/quitquitquit': + self.send_response(200) + self.end_headers() + self.server.shutdown() - def do_GET(self): - global keep_running - global mu - if self.path == '/get': - # allocate a new port, it will stay bound for ten minutes and until - # it's unused - self.send_response(200) - self.send_header('Content-Type', 'text/plain') - self.end_headers() - p = allocate_port(self) - self.log_message('allocated port %d' % p) - self.wfile.write('%d' % p) - elif self.path[0:6] == '/drop/': - self.send_response(200) - self.send_header('Content-Type', 'text/plain') - self.end_headers() - p = int(self.path[6:]) - mu.acquire() - if p in in_use: - del in_use[p] - pool.append(p) - k = 'known' - else: - k = 'unknown' - mu.release() - self.log_message('drop %s port %d' % (k, p)) - elif self.path == '/version_number': - # fetch a version string and the current process pid - self.send_response(200) - self.send_header('Content-Type', 'text/plain') - self.end_headers() - self.wfile.write(_MY_VERSION) - elif self.path == '/dump': - # yaml module is not installed on Macs and Windows machines by default - # so we import it lazily (/dump action is only used for debugging) - import yaml - self.send_response(200) - self.send_header('Content-Type', 'text/plain') - self.end_headers() - mu.acquire() - now = time.time() - out = yaml.dump({'pool': pool, 'in_use': dict((k, now - v) for k, v in in_use.items())}) - mu.release() - self.wfile.write(out) - elif self.path == '/quitquitquit': - self.send_response(200) - self.end_headers() - self.server.shutdown() class ThreadedHTTPServer(ThreadingMixIn, HTTPServer): - """Handle requests in a separate thread""" + """Handle requests in a separate thread""" + ThreadedHTTPServer(('', args.port), Handler).serve_forever() diff --git a/tools/run_tests/python_utils/report_utils.py b/tools/run_tests/python_utils/report_utils.py index a3867808b54..e4fddb8a7da 100644 --- a/tools/run_tests/python_utils/report_utils.py +++ b/tools/run_tests/python_utils/report_utils.py @@ -11,17 +11,16 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Generate XML and HTML test reports.""" from __future__ import print_function try: - from mako.runtime import Context - from mako.template import Template - from mako import exceptions + from mako.runtime import Context + from mako.template import Template + from mako import exceptions except (ImportError): - pass # Mako not installed but it is ok. + pass # Mako not installed but it is ok. import datetime import os import string @@ -30,111 +29,127 @@ import six def _filter_msg(msg, output_format): - """Filters out nonprintable and illegal characters from the message.""" - if output_format in ['XML', 'HTML']: - # keep whitespaces but remove formfeed and vertical tab characters - # that make XML report unparseable. - filtered_msg = filter( - lambda x: x in string.printable and x != '\f' and x != '\v', - msg.decode('UTF-8', 'ignore')) - if output_format == 'HTML': - filtered_msg = filtered_msg.replace('"', '"') - return filtered_msg - else: - return msg + """Filters out nonprintable and illegal characters from the message.""" + if output_format in ['XML', 'HTML']: + # keep whitespaces but remove formfeed and vertical tab characters + # that make XML report unparseable. + filtered_msg = filter( + lambda x: x in string.printable and x != '\f' and x != '\v', + msg.decode('UTF-8', 'ignore')) + if output_format == 'HTML': + filtered_msg = filtered_msg.replace('"', '"') + return filtered_msg + else: + return msg def new_junit_xml_tree(): - return ET.ElementTree(ET.Element('testsuites')) + return ET.ElementTree(ET.Element('testsuites')) + -def render_junit_xml_report(resultset, report_file, suite_package='grpc', +def render_junit_xml_report(resultset, + report_file, + suite_package='grpc', suite_name='tests'): - """Generate JUnit-like XML report.""" - tree = new_junit_xml_tree() - append_junit_xml_results(tree, resultset, suite_package, suite_name, '1') - create_xml_report_file(tree, report_file) + """Generate JUnit-like XML report.""" + tree = new_junit_xml_tree() + append_junit_xml_results(tree, resultset, suite_package, suite_name, '1') + create_xml_report_file(tree, report_file) + def create_xml_report_file(tree, report_file): - """Generate JUnit-like report file from xml tree .""" - # ensure the report directory exists - report_dir = os.path.dirname(os.path.abspath(report_file)) - if not os.path.exists(report_dir): - os.makedirs(report_dir) - tree.write(report_file, encoding='UTF-8') + """Generate JUnit-like report file from xml tree .""" + # ensure the report directory exists + report_dir = os.path.dirname(os.path.abspath(report_file)) + if not os.path.exists(report_dir): + os.makedirs(report_dir) + tree.write(report_file, encoding='UTF-8') + def append_junit_xml_results(tree, resultset, suite_package, suite_name, id): - """Append a JUnit-like XML report tree with test results as a new suite.""" - testsuite = ET.SubElement(tree.getroot(), 'testsuite', - id=id, package=suite_package, name=suite_name, - timestamp=datetime.datetime.now().isoformat()) - failure_count = 0 - error_count = 0 - for shortname, results in six.iteritems(resultset): - for result in results: - xml_test = ET.SubElement(testsuite, 'testcase', name=shortname) - if result.elapsed_time: - xml_test.set('time', str(result.elapsed_time)) - filtered_msg = _filter_msg(result.message, 'XML') - if result.state == 'FAILED': - ET.SubElement(xml_test, 'failure', message='Failure').text = filtered_msg - failure_count += 1 - elif result.state == 'TIMEOUT': - ET.SubElement(xml_test, 'error', message='Timeout').text = filtered_msg - error_count += 1 - elif result.state == 'SKIPPED': - ET.SubElement(xml_test, 'skipped', message='Skipped') - testsuite.set('failures', str(failure_count)) - testsuite.set('errors', str(error_count)) - -def render_interop_html_report( - client_langs, server_langs, test_cases, auth_test_cases, http2_cases, - http2_server_cases, resultset, - num_failures, cloud_to_prod, prod_servers, http2_interop): - """Generate HTML report for interop tests.""" - template_file = 'tools/run_tests/interop/interop_html_report.template' - try: - mytemplate = Template(filename=template_file, format_exceptions=True) - except NameError: - print('Mako template is not installed. Skipping HTML report generation.') - return - except IOError as e: - print('Failed to find the template %s: %s' % (template_file, e)) - return - - sorted_test_cases = sorted(test_cases) - sorted_auth_test_cases = sorted(auth_test_cases) - sorted_http2_cases = sorted(http2_cases) - sorted_http2_server_cases = sorted(http2_server_cases) - sorted_client_langs = sorted(client_langs) - sorted_server_langs = sorted(server_langs) - sorted_prod_servers = sorted(prod_servers) - - args = {'client_langs': sorted_client_langs, - 'server_langs': sorted_server_langs, - 'test_cases': sorted_test_cases, - 'auth_test_cases': sorted_auth_test_cases, - 'http2_cases': sorted_http2_cases, - 'http2_server_cases': sorted_http2_server_cases, - 'resultset': resultset, - 'num_failures': num_failures, - 'cloud_to_prod': cloud_to_prod, - 'prod_servers': sorted_prod_servers, - 'http2_interop': http2_interop} - - html_report_out_dir = 'reports' - if not os.path.exists(html_report_out_dir): - os.mkdir(html_report_out_dir) - html_file_path = os.path.join(html_report_out_dir, 'index.html') - try: - with open(html_file_path, 'w') as output_file: - mytemplate.render_context(Context(output_file, **args)) - except: - print(exceptions.text_error_template().render()) - raise + """Append a JUnit-like XML report tree with test results as a new suite.""" + testsuite = ET.SubElement( + tree.getroot(), + 'testsuite', + id=id, + package=suite_package, + name=suite_name, + timestamp=datetime.datetime.now().isoformat()) + failure_count = 0 + error_count = 0 + for shortname, results in six.iteritems(resultset): + for result in results: + xml_test = ET.SubElement(testsuite, 'testcase', name=shortname) + if result.elapsed_time: + xml_test.set('time', str(result.elapsed_time)) + filtered_msg = _filter_msg(result.message, 'XML') + if result.state == 'FAILED': + ET.SubElement( + xml_test, 'failure', message='Failure').text = filtered_msg + failure_count += 1 + elif result.state == 'TIMEOUT': + ET.SubElement( + xml_test, 'error', message='Timeout').text = filtered_msg + error_count += 1 + elif result.state == 'SKIPPED': + ET.SubElement(xml_test, 'skipped', message='Skipped') + testsuite.set('failures', str(failure_count)) + testsuite.set('errors', str(error_count)) + + +def render_interop_html_report(client_langs, server_langs, test_cases, + auth_test_cases, http2_cases, http2_server_cases, + resultset, num_failures, cloud_to_prod, + prod_servers, http2_interop): + """Generate HTML report for interop tests.""" + template_file = 'tools/run_tests/interop/interop_html_report.template' + try: + mytemplate = Template(filename=template_file, format_exceptions=True) + except NameError: + print( + 'Mako template is not installed. Skipping HTML report generation.') + return + except IOError as e: + print('Failed to find the template %s: %s' % (template_file, e)) + return + + sorted_test_cases = sorted(test_cases) + sorted_auth_test_cases = sorted(auth_test_cases) + sorted_http2_cases = sorted(http2_cases) + sorted_http2_server_cases = sorted(http2_server_cases) + sorted_client_langs = sorted(client_langs) + sorted_server_langs = sorted(server_langs) + sorted_prod_servers = sorted(prod_servers) + + args = { + 'client_langs': sorted_client_langs, + 'server_langs': sorted_server_langs, + 'test_cases': sorted_test_cases, + 'auth_test_cases': sorted_auth_test_cases, + 'http2_cases': sorted_http2_cases, + 'http2_server_cases': sorted_http2_server_cases, + 'resultset': resultset, + 'num_failures': num_failures, + 'cloud_to_prod': cloud_to_prod, + 'prod_servers': sorted_prod_servers, + 'http2_interop': http2_interop + } + + html_report_out_dir = 'reports' + if not os.path.exists(html_report_out_dir): + os.mkdir(html_report_out_dir) + html_file_path = os.path.join(html_report_out_dir, 'index.html') + try: + with open(html_file_path, 'w') as output_file: + mytemplate.render_context(Context(output_file, **args)) + except: + print(exceptions.text_error_template().render()) + raise + def render_perf_profiling_results(output_filepath, profile_names): - with open(output_filepath, 'w') as output_file: - output_file.write('
      \n') - for name in profile_names: - output_file.write('
    • %s
      • \n' % (name, name)) - output_file.write('
    \n') + with open(output_filepath, 'w') as output_file: + output_file.write('
      \n') + for name in profile_names: + output_file.write('
    • %s
      • \n' % (name, name)) + output_file.write('
    \n') diff --git a/tools/run_tests/python_utils/start_port_server.py b/tools/run_tests/python_utils/start_port_server.py index 786103ccdfa..5572cdcfe7c 100644 --- a/tools/run_tests/python_utils/start_port_server.py +++ b/tools/run_tests/python_utils/start_port_server.py @@ -22,10 +22,10 @@ import sys import tempfile import time - # must be synchronized with test/core/utils/port_server_client.h _PORT_SERVER_PORT = 32766 + def start_port_server(): # check if a compatible port server is running # if incompatible (version mismatch) ==> start a new one @@ -33,9 +33,8 @@ def start_port_server(): # otherwise, leave it up try: version = int( - urllib.urlopen( - 'http://localhost:%d/version_number' % - _PORT_SERVER_PORT).read()) + urllib.urlopen('http://localhost:%d/version_number' % + _PORT_SERVER_PORT).read()) logging.info('detected port server running version %d', version) running = True except Exception as e: @@ -92,8 +91,8 @@ def start_port_server(): # try one final time: maybe another build managed to start one time.sleep(1) try: - urllib.urlopen( - 'http://localhost:%d/get' % _PORT_SERVER_PORT).read() + urllib.urlopen('http://localhost:%d/get' % + _PORT_SERVER_PORT).read() logging.info( 'last ditch attempt to contact port server succeeded') break diff --git a/tools/run_tests/python_utils/upload_test_results.py b/tools/run_tests/python_utils/upload_test_results.py index ea97bc0aec1..9eb8e2a8620 100644 --- a/tools/run_tests/python_utils/upload_test_results.py +++ b/tools/run_tests/python_utils/upload_test_results.py @@ -12,7 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Helper to upload Jenkins test results to BQ""" from __future__ import print_function @@ -23,8 +22,8 @@ import sys import time import uuid -gcp_utils_dir = os.path.abspath(os.path.join( - os.path.dirname(__file__), '../../gcp/utils')) +gcp_utils_dir = os.path.abspath( + os.path.join(os.path.dirname(__file__), '../../gcp/utils')) sys.path.append(gcp_utils_dir) import big_query_utils @@ -35,55 +34,57 @@ _EXPIRATION_MS = 90 * 24 * 60 * 60 * 1000 _PARTITION_TYPE = 'DAY' _PROJECT_ID = 'grpc-testing' _RESULTS_SCHEMA = [ - ('job_name', 'STRING', 'Name of Jenkins job'), - ('build_id', 'INTEGER', 'Build ID of Jenkins job'), - ('build_url', 'STRING', 'URL of Jenkins job'), - ('test_name', 'STRING', 'Individual test name'), - ('language', 'STRING', 'Language of test'), - ('platform', 'STRING', 'Platform used for test'), - ('config', 'STRING', 'Config used for test'), - ('compiler', 'STRING', 'Compiler used for test'), - ('iomgr_platform', 'STRING', 'Iomgr used for test'), - ('result', 'STRING', 'Test result: PASSED, TIMEOUT, FAILED, or SKIPPED'), - ('timestamp', 'TIMESTAMP', 'Timestamp of test run'), - ('elapsed_time', 'FLOAT', 'How long test took to run'), - ('cpu_estimated', 'FLOAT', 'Estimated CPU usage of test'), - ('cpu_measured', 'FLOAT', 'Actual CPU usage of test'), - ('return_code', 'INTEGER', 'Exit code of test'), + ('job_name', 'STRING', 'Name of Jenkins job'), + ('build_id', 'INTEGER', 'Build ID of Jenkins job'), + ('build_url', 'STRING', 'URL of Jenkins job'), + ('test_name', 'STRING', 'Individual test name'), + ('language', 'STRING', 'Language of test'), + ('platform', 'STRING', 'Platform used for test'), + ('config', 'STRING', 'Config used for test'), + ('compiler', 'STRING', 'Compiler used for test'), + ('iomgr_platform', 'STRING', 'Iomgr used for test'), + ('result', 'STRING', 'Test result: PASSED, TIMEOUT, FAILED, or SKIPPED'), + ('timestamp', 'TIMESTAMP', 'Timestamp of test run'), + ('elapsed_time', 'FLOAT', 'How long test took to run'), + ('cpu_estimated', 'FLOAT', 'Estimated CPU usage of test'), + ('cpu_measured', 'FLOAT', 'Actual CPU usage of test'), + ('return_code', 'INTEGER', 'Exit code of test'), ] _INTEROP_RESULTS_SCHEMA = [ - ('job_name', 'STRING', 'Name of Jenkins/Kokoro job'), - ('build_id', 'INTEGER', 'Build ID of Jenkins/Kokoro job'), - ('build_url', 'STRING', 'URL of Jenkins/Kokoro job'), - ('test_name', 'STRING', 'Unique test name combining client, server, and test_name'), - ('suite', 'STRING', 'Test suite: cloud_to_cloud, cloud_to_prod, or cloud_to_prod_auth'), - ('client', 'STRING', 'Client language'), - ('server', 'STRING', 'Server host name'), - ('test_case', 'STRING', 'Name of test case'), - ('result', 'STRING', 'Test result: PASSED, TIMEOUT, FAILED, or SKIPPED'), - ('timestamp', 'TIMESTAMP', 'Timestamp of test run'), - ('elapsed_time', 'FLOAT', 'How long test took to run'), + ('job_name', 'STRING', 'Name of Jenkins/Kokoro job'), + ('build_id', 'INTEGER', 'Build ID of Jenkins/Kokoro job'), + ('build_url', 'STRING', 'URL of Jenkins/Kokoro job'), + ('test_name', 'STRING', + 'Unique test name combining client, server, and test_name'), + ('suite', 'STRING', + 'Test suite: cloud_to_cloud, cloud_to_prod, or cloud_to_prod_auth'), + ('client', 'STRING', 'Client language'), + ('server', 'STRING', 'Server host name'), + ('test_case', 'STRING', 'Name of test case'), + ('result', 'STRING', 'Test result: PASSED, TIMEOUT, FAILED, or SKIPPED'), + ('timestamp', 'TIMESTAMP', 'Timestamp of test run'), + ('elapsed_time', 'FLOAT', 'How long test took to run'), ] def _get_build_metadata(test_results): - """Add Jenkins/Kokoro build metadata to test_results based on environment + """Add Jenkins/Kokoro build metadata to test_results based on environment variables set by Jenkins/Kokoro. """ - build_id = os.getenv('BUILD_ID') or os.getenv('KOKORO_BUILD_NUMBER') - build_url = os.getenv('BUILD_URL') or os.getenv('KOKORO_BUILD_URL') - job_name = os.getenv('JOB_BASE_NAME') or os.getenv('KOKORO_JOB_NAME') + build_id = os.getenv('BUILD_ID') or os.getenv('KOKORO_BUILD_NUMBER') + build_url = os.getenv('BUILD_URL') or os.getenv('KOKORO_BUILD_URL') + job_name = os.getenv('JOB_BASE_NAME') or os.getenv('KOKORO_JOB_NAME') - if build_id: - test_results['build_id'] = build_id - if build_url: - test_results['build_url'] = build_url - if job_name: - test_results['job_name'] = job_name + if build_id: + test_results['build_id'] = build_id + if build_url: + test_results['build_url'] = build_url + if job_name: + test_results['job_name'] = job_name def upload_results_to_bq(resultset, bq_table, args, platform): - """Upload test results to a BQ table. + """Upload test results to a BQ table. Args: resultset: dictionary generated by jobset.run @@ -91,77 +92,97 @@ def upload_results_to_bq(resultset, bq_table, args, platform): args: args in run_tests.py, generated by argparse platform: string name of platform tests were run on """ - bq = big_query_utils.create_big_query() - big_query_utils.create_partitioned_table(bq, _PROJECT_ID, _DATASET_ID, bq_table, _RESULTS_SCHEMA, _DESCRIPTION, - partition_type=_PARTITION_TYPE, expiration_ms= _EXPIRATION_MS) - - for shortname, results in six.iteritems(resultset): - for result in results: - test_results = {} - _get_build_metadata(test_results) - test_results['compiler'] = args.compiler - test_results['config'] = args.config - test_results['cpu_estimated'] = result.cpu_estimated - test_results['cpu_measured'] = result.cpu_measured - test_results['elapsed_time'] = '%.2f' % result.elapsed_time - test_results['iomgr_platform'] = args.iomgr_platform - # args.language is a list, but will always have one element in the contexts - # this function is used. - test_results['language'] = args.language[0] - test_results['platform'] = platform - test_results['result'] = result.state - test_results['return_code'] = result.returncode - test_results['test_name'] = shortname - test_results['timestamp'] = time.strftime('%Y-%m-%d %H:%M:%S') - - row = big_query_utils.make_row(str(uuid.uuid4()), test_results) - - # TODO(jtattermusch): rows are inserted one by one, very inefficient - max_retries = 3 - for attempt in range(max_retries): - if big_query_utils.insert_rows(bq, _PROJECT_ID, _DATASET_ID, bq_table, [row]): - break - else: - if attempt < max_retries - 1: - print('Error uploading result to bigquery, will retry.') - else: - print('Error uploading result to bigquery, all attempts failed.') - sys.exit(1) + bq = big_query_utils.create_big_query() + big_query_utils.create_partitioned_table( + bq, + _PROJECT_ID, + _DATASET_ID, + bq_table, + _RESULTS_SCHEMA, + _DESCRIPTION, + partition_type=_PARTITION_TYPE, + expiration_ms=_EXPIRATION_MS) + + for shortname, results in six.iteritems(resultset): + for result in results: + test_results = {} + _get_build_metadata(test_results) + test_results['compiler'] = args.compiler + test_results['config'] = args.config + test_results['cpu_estimated'] = result.cpu_estimated + test_results['cpu_measured'] = result.cpu_measured + test_results['elapsed_time'] = '%.2f' % result.elapsed_time + test_results['iomgr_platform'] = args.iomgr_platform + # args.language is a list, but will always have one element in the contexts + # this function is used. + test_results['language'] = args.language[0] + test_results['platform'] = platform + test_results['result'] = result.state + test_results['return_code'] = result.returncode + test_results['test_name'] = shortname + test_results['timestamp'] = time.strftime('%Y-%m-%d %H:%M:%S') + + row = big_query_utils.make_row(str(uuid.uuid4()), test_results) + + # TODO(jtattermusch): rows are inserted one by one, very inefficient + max_retries = 3 + for attempt in range(max_retries): + if big_query_utils.insert_rows(bq, _PROJECT_ID, _DATASET_ID, + bq_table, [row]): + break + else: + if attempt < max_retries - 1: + print('Error uploading result to bigquery, will retry.') + else: + print( + 'Error uploading result to bigquery, all attempts failed.' + ) + sys.exit(1) def upload_interop_results_to_bq(resultset, bq_table, args): - """Upload interop test results to a BQ table. + """Upload interop test results to a BQ table. Args: resultset: dictionary generated by jobset.run bq_table: string name of table to create/upload results to in BQ args: args in run_interop_tests.py, generated by argparse """ - bq = big_query_utils.create_big_query() - big_query_utils.create_partitioned_table(bq, _PROJECT_ID, _DATASET_ID, bq_table, _INTEROP_RESULTS_SCHEMA, _DESCRIPTION, - partition_type=_PARTITION_TYPE, expiration_ms= _EXPIRATION_MS) - - for shortname, results in six.iteritems(resultset): - for result in results: - test_results = {} - _get_build_metadata(test_results) - test_results['elapsed_time'] = '%.2f' % result.elapsed_time - test_results['result'] = result.state - test_results['test_name'] = shortname - test_results['suite'] = shortname.split(':')[0] - test_results['client'] = shortname.split(':')[1] - test_results['server'] = shortname.split(':')[2] - test_results['test_case'] = shortname.split(':')[3] - test_results['timestamp'] = time.strftime('%Y-%m-%d %H:%M:%S') - row = big_query_utils.make_row(str(uuid.uuid4()), test_results) - # TODO(jtattermusch): rows are inserted one by one, very inefficient - max_retries = 3 - for attempt in range(max_retries): - if big_query_utils.insert_rows(bq, _PROJECT_ID, _DATASET_ID, bq_table, [row]): - break - else: - if attempt < max_retries - 1: - print('Error uploading result to bigquery, will retry.') - else: - print('Error uploading result to bigquery, all attempts failed.') - sys.exit(1) + bq = big_query_utils.create_big_query() + big_query_utils.create_partitioned_table( + bq, + _PROJECT_ID, + _DATASET_ID, + bq_table, + _INTEROP_RESULTS_SCHEMA, + _DESCRIPTION, + partition_type=_PARTITION_TYPE, + expiration_ms=_EXPIRATION_MS) + + for shortname, results in six.iteritems(resultset): + for result in results: + test_results = {} + _get_build_metadata(test_results) + test_results['elapsed_time'] = '%.2f' % result.elapsed_time + test_results['result'] = result.state + test_results['test_name'] = shortname + test_results['suite'] = shortname.split(':')[0] + test_results['client'] = shortname.split(':')[1] + test_results['server'] = shortname.split(':')[2] + test_results['test_case'] = shortname.split(':')[3] + test_results['timestamp'] = time.strftime('%Y-%m-%d %H:%M:%S') + row = big_query_utils.make_row(str(uuid.uuid4()), test_results) + # TODO(jtattermusch): rows are inserted one by one, very inefficient + max_retries = 3 + for attempt in range(max_retries): + if big_query_utils.insert_rows(bq, _PROJECT_ID, _DATASET_ID, + bq_table, [row]): + break + else: + if attempt < max_retries - 1: + print('Error uploading result to bigquery, will retry.') + else: + print( + 'Error uploading result to bigquery, all attempts failed.' + ) + sys.exit(1) diff --git a/tools/run_tests/python_utils/watch_dirs.py b/tools/run_tests/python_utils/watch_dirs.py index 7bd085efaf4..d2ad303a07b 100755 --- a/tools/run_tests/python_utils/watch_dirs.py +++ b/tools/run_tests/python_utils/watch_dirs.py @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Helper to watch a (set) of directories for modifications.""" import os @@ -19,42 +18,42 @@ import time class DirWatcher(object): - """Helper to watch a (set) of directories for modifications.""" - - def __init__(self, paths): - if isinstance(paths, basestring): - paths = [paths] - self._done = False - self.paths = list(paths) - self.lastrun = time.time() - self._cache = self._calculate() - - def _calculate(self): - """Walk over all subscribed paths, check most recent mtime.""" - most_recent_change = None - for path in self.paths: - if not os.path.exists(path): - continue - if not os.path.isdir(path): - continue - for root, _, files in os.walk(path): - for f in files: - if f and f[0] == '.': continue - try: - st = os.stat(os.path.join(root, f)) - except OSError as e: - if e.errno == os.errno.ENOENT: - continue - raise - if most_recent_change is None: - most_recent_change = st.st_mtime - else: - most_recent_change = max(most_recent_change, st.st_mtime) - return most_recent_change - - def most_recent_change(self): - if time.time() - self.lastrun > 1: - self._cache = self._calculate() - self.lastrun = time.time() - return self._cache - + """Helper to watch a (set) of directories for modifications.""" + + def __init__(self, paths): + if isinstance(paths, basestring): + paths = [paths] + self._done = False + self.paths = list(paths) + self.lastrun = time.time() + self._cache = self._calculate() + + def _calculate(self): + """Walk over all subscribed paths, check most recent mtime.""" + most_recent_change = None + for path in self.paths: + if not os.path.exists(path): + continue + if not os.path.isdir(path): + continue + for root, _, files in os.walk(path): + for f in files: + if f and f[0] == '.': continue + try: + st = os.stat(os.path.join(root, f)) + except OSError as e: + if e.errno == os.errno.ENOENT: + continue + raise + if most_recent_change is None: + most_recent_change = st.st_mtime + else: + most_recent_change = max(most_recent_change, + st.st_mtime) + return most_recent_change + + def most_recent_change(self): + if time.time() - self.lastrun > 1: + self._cache = self._calculate() + self.lastrun = time.time() + return self._cache From 0cd6cfefa0a21ccf8dc28d623c03f3425e9ed72b Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 11 Dec 2017 16:56:44 -0800 Subject: [PATCH 108/127] yapf tools/run_tests/sanity --- tools/distrib/yapf_code.sh | 1 + tools/run_tests/python_utils/jobset.py | 7 +- tools/run_tests/python_utils/port_server.py | 11 +- .../run_tests/sanity/check_bazel_workspace.py | 30 ++- .../sanity/check_sources_and_headers.py | 107 +++++---- .../run_tests/sanity/check_test_filtering.py | 217 ++++++++++-------- tools/run_tests/sanity/check_tracer_sanity.py | 21 +- tools/run_tests/sanity/check_version.py | 76 +++--- .../run_tests/sanity/core_banned_functions.py | 36 +-- 9 files changed, 281 insertions(+), 225 deletions(-) diff --git a/tools/distrib/yapf_code.sh b/tools/distrib/yapf_code.sh index 9f8fb13572b..a26ba68e8e2 100755 --- a/tools/distrib/yapf_code.sh +++ b/tools/distrib/yapf_code.sh @@ -26,6 +26,7 @@ DIRS=( 'tools/interop_matrix' 'tools/profiling' 'tools/run_tests/python_utils' + 'tools/run_tests/sanity' ) EXCLUSIONS=( 'grpcio/grpc_*.py' diff --git a/tools/run_tests/python_utils/jobset.py b/tools/run_tests/python_utils/jobset.py index 424b4404a8d..454d09bf0d9 100755 --- a/tools/run_tests/python_utils/jobset.py +++ b/tools/run_tests/python_utils/jobset.py @@ -209,10 +209,9 @@ class JobSpec(object): self.cmdline) def __str__(self): - return '%s: %s %s' % (self.shortname, - ' '.join('%s=%s' % kv - for kv in self.environ.items()), - ' '.join(self.cmdline)) + return '%s: %s %s' % (self.shortname, ' '.join( + '%s=%s' % kv + for kv in self.environ.items()), ' '.join(self.cmdline)) class JobResult(object): diff --git a/tools/run_tests/python_utils/port_server.py b/tools/run_tests/python_utils/port_server.py index 15f55f46dd8..83e09c09d0f 100755 --- a/tools/run_tests/python_utils/port_server.py +++ b/tools/run_tests/python_utils/port_server.py @@ -185,11 +185,12 @@ class Handler(BaseHTTPRequestHandler): self.end_headers() mu.acquire() now = time.time() - out = yaml.dump( - { - 'pool': pool, - 'in_use': dict((k, now - v) for k, v in in_use.items()) - }) + out = yaml.dump({ + 'pool': + pool, + 'in_use': + dict((k, now - v) for k, v in in_use.items()) + }) mu.release() self.wfile.write(out) elif self.path == '/quitquitquit': diff --git a/tools/run_tests/sanity/check_bazel_workspace.py b/tools/run_tests/sanity/check_bazel_workspace.py index 776c78b03f2..b5a77f4479d 100755 --- a/tools/run_tests/sanity/check_bazel_workspace.py +++ b/tools/run_tests/sanity/check_bazel_workspace.py @@ -27,23 +27,37 @@ os.chdir(os.path.join(os.path.dirname(sys.argv[0]), '../../..')) git_hash_pattern = re.compile('[0-9a-f]{40}') # Parse git hashes from submodules -git_submodules = subprocess.check_output('git submodule', shell=True).strip().split('\n') -git_submodule_hashes = {re.search(git_hash_pattern, s).group() for s in git_submodules} +git_submodules = subprocess.check_output( + 'git submodule', shell=True).strip().split('\n') +git_submodule_hashes = { + re.search(git_hash_pattern, s).group() + for s in git_submodules +} # Parse git hashes from Bazel WORKSPACE {new_}http_archive rules with open('WORKSPACE', 'r') as f: - workspace_rules = [expr.value for expr in ast.parse(f.read()).body] - -http_archive_rules = [rule for rule in workspace_rules if rule.func.id.endswith('http_archive')] -archive_urls = [kw.value.s for rule in http_archive_rules for kw in rule.keywords if kw.arg == 'url'] -workspace_git_hashes = {re.search(git_hash_pattern, url).group() for url in archive_urls} + workspace_rules = [expr.value for expr in ast.parse(f.read()).body] + +http_archive_rules = [ + rule for rule in workspace_rules if rule.func.id.endswith('http_archive') +] +archive_urls = [ + kw.value.s for rule in http_archive_rules for kw in rule.keywords + if kw.arg == 'url' +] +workspace_git_hashes = { + re.search(git_hash_pattern, url).group() + for url in archive_urls +} # Validate the equivalence of the git submodules and Bazel git dependencies. The # condition we impose is that there is a git submodule for every dependency in # the workspace, but not necessarily conversely. E.g. Bloaty is a dependency # not used by any of the targets built by Bazel. if len(workspace_git_hashes - git_submodule_hashes) > 0: - print("Found discrepancies between git submodules and Bazel WORKSPACE dependencies") + print( + "Found discrepancies between git submodules and Bazel WORKSPACE dependencies" + ) sys.exit(1) sys.exit(0) diff --git a/tools/run_tests/sanity/check_sources_and_headers.py b/tools/run_tests/sanity/check_sources_and_headers.py index cae175cfc34..7e2465af6de 100755 --- a/tools/run_tests/sanity/check_sources_and_headers.py +++ b/tools/run_tests/sanity/check_sources_and_headers.py @@ -21,71 +21,80 @@ import re import sys root = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '../../..')) -with open(os.path.join(root, 'tools', 'run_tests', 'generated', 'sources_and_headers.json')) as f: - js = json.loads(f.read()) +with open( + os.path.join(root, 'tools', 'run_tests', 'generated', + 'sources_and_headers.json')) as f: + js = json.loads(f.read()) re_inc1 = re.compile(r'^#\s*include\s*"([^"]*)"') assert re_inc1.match('#include "foo"').group(1) == 'foo' re_inc2 = re.compile(r'^#\s*include\s*<((grpc|grpc\+\+)/[^"]*)>') assert re_inc2.match('#include ').group(1) == 'grpc++/foo' + def get_target(name): - for target in js: - if target['name'] == name: - return target - assert False, 'no target %s' % name + for target in js: + if target['name'] == name: + return target + assert False, 'no target %s' % name + def target_has_header(target, name): - if name.startswith('absl/'): return True - # print target['name'], name - if name in target['headers']: - return True - for dep in target['deps']: - if target_has_header(get_target(dep), name): - return True - if name in ['src/core/lib/profiling/stap_probes.h', - 'src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h']: - return True - return False + if name.startswith('absl/'): return True + # print target['name'], name + if name in target['headers']: + return True + for dep in target['deps']: + if target_has_header(get_target(dep), name): + return True + if name in [ + 'src/core/lib/profiling/stap_probes.h', + 'src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h' + ]: + return True + return False + def produces_object(name): - return os.path.splitext(name)[1] in ['.c', '.cc'] + return os.path.splitext(name)[1] in ['.c', '.cc'] + c_ish = {} obj_producer_to_source = {'c': c_ish, 'c++': c_ish, 'csharp': {}} errors = 0 for target in js: - if not target['third_party']: - for fn in target['src']: - with open(os.path.join(root, fn)) as f: - src = f.read().splitlines() - for line in src: - m = re_inc1.match(line) - if m: - if not target_has_header(target, m.group(1)): - print ( - 'target %s (%s) does not name header %s as a dependency' % ( - target['name'], fn, m.group(1))) - errors += 1 - m = re_inc2.match(line) - if m: - if not target_has_header(target, 'include/' + m.group(1)): - print ( - 'target %s (%s) does not name header %s as a dependency' % ( - target['name'], fn, m.group(1))) - errors += 1 - if target['type'] in ['lib', 'filegroup']: - for fn in target['src']: - language = target['language'] - if produces_object(fn): - obj_base = os.path.splitext(os.path.basename(fn))[0] - if obj_base in obj_producer_to_source[language]: - if obj_producer_to_source[language][obj_base] != fn: - print ( - 'target %s (%s) produces an aliased object file with %s' % ( - target['name'], fn, obj_producer_to_source[language][obj_base])) - else: - obj_producer_to_source[language][obj_base] = fn + if not target['third_party']: + for fn in target['src']: + with open(os.path.join(root, fn)) as f: + src = f.read().splitlines() + for line in src: + m = re_inc1.match(line) + if m: + if not target_has_header(target, m.group(1)): + print( + 'target %s (%s) does not name header %s as a dependency' + % (target['name'], fn, m.group(1))) + errors += 1 + m = re_inc2.match(line) + if m: + if not target_has_header(target, 'include/' + m.group(1)): + print( + 'target %s (%s) does not name header %s as a dependency' + % (target['name'], fn, m.group(1))) + errors += 1 + if target['type'] in ['lib', 'filegroup']: + for fn in target['src']: + language = target['language'] + if produces_object(fn): + obj_base = os.path.splitext(os.path.basename(fn))[0] + if obj_base in obj_producer_to_source[language]: + if obj_producer_to_source[language][obj_base] != fn: + print( + 'target %s (%s) produces an aliased object file with %s' + % (target['name'], fn, + obj_producer_to_source[language][obj_base])) + else: + obj_producer_to_source[language][obj_base] = fn assert errors == 0 diff --git a/tools/run_tests/sanity/check_test_filtering.py b/tools/run_tests/sanity/check_test_filtering.py index ff4ecba8abd..c2a6399ae8e 100755 --- a/tools/run_tests/sanity/check_test_filtering.py +++ b/tools/run_tests/sanity/check_test_filtering.py @@ -14,7 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. - import os import sys import unittest @@ -25,108 +24,138 @@ sys.path.insert(0, os.path.abspath('tools/run_tests/')) from run_tests_matrix import _create_test_jobs, _create_portability_test_jobs import python_utils.filter_pull_request_tests as filter_pull_request_tests -_LIST_OF_LANGUAGE_LABELS = ['c', 'c++', 'csharp', 'grpc-node', 'objc', 'php', 'php7', 'python', 'ruby'] +_LIST_OF_LANGUAGE_LABELS = [ + 'c', 'c++', 'csharp', 'grpc-node', 'objc', 'php', 'php7', 'python', 'ruby' +] _LIST_OF_PLATFORM_LABELS = ['linux', 'macos', 'windows'] + class TestFilteringTest(unittest.TestCase): - def generate_all_tests(self): - all_jobs = _create_test_jobs() + _create_portability_test_jobs() - self.assertIsNotNone(all_jobs) - return all_jobs + def generate_all_tests(self): + all_jobs = _create_test_jobs() + _create_portability_test_jobs() + self.assertIsNotNone(all_jobs) + return all_jobs - def test_filtering(self, changed_files=[], labels=_LIST_OF_LANGUAGE_LABELS): - """ + def test_filtering(self, changed_files=[], labels=_LIST_OF_LANGUAGE_LABELS): + """ Default args should filter no tests because changed_files is empty and default labels should be able to match all jobs :param changed_files: mock list of changed_files from pull request :param labels: list of job labels that should be skipped """ - all_jobs = self.generate_all_tests() - # Replacing _get_changed_files function to allow specifying changed files in filter_tests function - def _get_changed_files(foo): - return changed_files - filter_pull_request_tests._get_changed_files = _get_changed_files - print() - filtered_jobs = filter_pull_request_tests.filter_tests(all_jobs, "test") - - # Make sure sanity tests aren't being filtered out - sanity_tests_in_all_jobs = 0 - sanity_tests_in_filtered_jobs = 0 - for job in all_jobs: - if "sanity" in job.labels: - sanity_tests_in_all_jobs += 1 - all_jobs = [job for job in all_jobs if "sanity" not in job.labels] - for job in filtered_jobs: - if "sanity" in job.labels: - sanity_tests_in_filtered_jobs += 1 - filtered_jobs = [job for job in filtered_jobs if "sanity" not in job.labels] - self.assertEquals(sanity_tests_in_all_jobs, sanity_tests_in_filtered_jobs) - - for label in labels: - for job in filtered_jobs: - self.assertNotIn(label, job.labels) - - jobs_matching_labels = 0 - for label in labels: - for job in all_jobs: - if (label in job.labels): - jobs_matching_labels += 1 - self.assertEquals(len(filtered_jobs), len(all_jobs) - jobs_matching_labels) - - def test_individual_language_filters(self): - # Changing unlisted file should trigger all languages - self.test_filtering(['ffffoo/bar.baz'], [_LIST_OF_LANGUAGE_LABELS]) - # Changing core should trigger all tests - self.test_filtering(['src/core/foo.bar'], [_LIST_OF_LANGUAGE_LABELS]) - # Testing individual languages - self.test_filtering(['test/core/foo.bar'], [label for label in _LIST_OF_LANGUAGE_LABELS if label not in - filter_pull_request_tests._CORE_TEST_SUITE.labels + - filter_pull_request_tests._CPP_TEST_SUITE.labels]) - self.test_filtering(['src/cpp/foo.bar'], [label for label in _LIST_OF_LANGUAGE_LABELS if label not in - filter_pull_request_tests._CPP_TEST_SUITE.labels]) - self.test_filtering(['src/csharp/foo.bar'], [label for label in _LIST_OF_LANGUAGE_LABELS if label not in - filter_pull_request_tests._CSHARP_TEST_SUITE.labels]) - self.test_filtering(['src/objective-c/foo.bar'], [label for label in _LIST_OF_LANGUAGE_LABELS if label not in - filter_pull_request_tests._OBJC_TEST_SUITE.labels]) - self.test_filtering(['src/php/foo.bar'], [label for label in _LIST_OF_LANGUAGE_LABELS if label not in - filter_pull_request_tests._PHP_TEST_SUITE.labels]) - self.test_filtering(['src/python/foo.bar'], [label for label in _LIST_OF_LANGUAGE_LABELS if label not in - filter_pull_request_tests._PYTHON_TEST_SUITE.labels]) - self.test_filtering(['src/ruby/foo.bar'], [label for label in _LIST_OF_LANGUAGE_LABELS if label not in - filter_pull_request_tests._RUBY_TEST_SUITE.labels]) - - def test_combined_language_filters(self): - self.test_filtering(['src/cpp/foo.bar', 'test/core/foo.bar'], - [label for label in _LIST_OF_LANGUAGE_LABELS if label not in - filter_pull_request_tests._CPP_TEST_SUITE.labels and label not in - filter_pull_request_tests._CORE_TEST_SUITE.labels]) - self.test_filtering(['src/cpp/foo.bar', "src/csharp/foo.bar"], - [label for label in _LIST_OF_LANGUAGE_LABELS if label not in - filter_pull_request_tests._CPP_TEST_SUITE.labels and label not in - filter_pull_request_tests._CSHARP_TEST_SUITE.labels]) - self.test_filtering(['src/objective-c/foo.bar', 'src/php/foo.bar', "src/python/foo.bar", "src/ruby/foo.bar"], - [label for label in _LIST_OF_LANGUAGE_LABELS if label not in - filter_pull_request_tests._OBJC_TEST_SUITE.labels and label not in - filter_pull_request_tests._PHP_TEST_SUITE.labels and label not in - filter_pull_request_tests._PYTHON_TEST_SUITE.labels and label not in - filter_pull_request_tests._RUBY_TEST_SUITE.labels]) - - def test_platform_filter(self): - self.test_filtering(['vsprojects/foo.bar'], [label for label in _LIST_OF_PLATFORM_LABELS if label not in - filter_pull_request_tests._WINDOWS_TEST_SUITE.labels]) - - def test_whitelist(self): - whitelist = filter_pull_request_tests._WHITELIST_DICT - files_that_should_trigger_all_tests = ['src/core/foo.bar', - 'some_file_not_on_the_white_list', - 'BUILD', - 'etc/roots.pem', - 'Makefile', - 'tools/foo'] - for key in whitelist.keys(): - for file_name in files_that_should_trigger_all_tests: - self.assertFalse(re.match(key, file_name)) + all_jobs = self.generate_all_tests() + + # Replacing _get_changed_files function to allow specifying changed files in filter_tests function + def _get_changed_files(foo): + return changed_files + + filter_pull_request_tests._get_changed_files = _get_changed_files + print() + filtered_jobs = filter_pull_request_tests.filter_tests(all_jobs, "test") + + # Make sure sanity tests aren't being filtered out + sanity_tests_in_all_jobs = 0 + sanity_tests_in_filtered_jobs = 0 + for job in all_jobs: + if "sanity" in job.labels: + sanity_tests_in_all_jobs += 1 + all_jobs = [job for job in all_jobs if "sanity" not in job.labels] + for job in filtered_jobs: + if "sanity" in job.labels: + sanity_tests_in_filtered_jobs += 1 + filtered_jobs = [ + job for job in filtered_jobs if "sanity" not in job.labels + ] + self.assertEquals(sanity_tests_in_all_jobs, + sanity_tests_in_filtered_jobs) + + for label in labels: + for job in filtered_jobs: + self.assertNotIn(label, job.labels) + + jobs_matching_labels = 0 + for label in labels: + for job in all_jobs: + if (label in job.labels): + jobs_matching_labels += 1 + self.assertEquals( + len(filtered_jobs), len(all_jobs) - jobs_matching_labels) + + def test_individual_language_filters(self): + # Changing unlisted file should trigger all languages + self.test_filtering(['ffffoo/bar.baz'], [_LIST_OF_LANGUAGE_LABELS]) + # Changing core should trigger all tests + self.test_filtering(['src/core/foo.bar'], [_LIST_OF_LANGUAGE_LABELS]) + # Testing individual languages + self.test_filtering(['test/core/foo.bar'], [ + label for label in _LIST_OF_LANGUAGE_LABELS + if label not in filter_pull_request_tests._CORE_TEST_SUITE.labels + + filter_pull_request_tests._CPP_TEST_SUITE.labels + ]) + self.test_filtering(['src/cpp/foo.bar'], [ + label for label in _LIST_OF_LANGUAGE_LABELS + if label not in filter_pull_request_tests._CPP_TEST_SUITE.labels + ]) + self.test_filtering(['src/csharp/foo.bar'], [ + label for label in _LIST_OF_LANGUAGE_LABELS + if label not in filter_pull_request_tests._CSHARP_TEST_SUITE.labels + ]) + self.test_filtering(['src/objective-c/foo.bar'], [ + label for label in _LIST_OF_LANGUAGE_LABELS + if label not in filter_pull_request_tests._OBJC_TEST_SUITE.labels + ]) + self.test_filtering(['src/php/foo.bar'], [ + label for label in _LIST_OF_LANGUAGE_LABELS + if label not in filter_pull_request_tests._PHP_TEST_SUITE.labels + ]) + self.test_filtering(['src/python/foo.bar'], [ + label for label in _LIST_OF_LANGUAGE_LABELS + if label not in filter_pull_request_tests._PYTHON_TEST_SUITE.labels + ]) + self.test_filtering(['src/ruby/foo.bar'], [ + label for label in _LIST_OF_LANGUAGE_LABELS + if label not in filter_pull_request_tests._RUBY_TEST_SUITE.labels + ]) + + def test_combined_language_filters(self): + self.test_filtering(['src/cpp/foo.bar', 'test/core/foo.bar'], [ + label for label in _LIST_OF_LANGUAGE_LABELS + if label not in filter_pull_request_tests._CPP_TEST_SUITE.labels and + label not in filter_pull_request_tests._CORE_TEST_SUITE.labels + ]) + self.test_filtering(['src/cpp/foo.bar', "src/csharp/foo.bar"], [ + label for label in _LIST_OF_LANGUAGE_LABELS + if label not in filter_pull_request_tests._CPP_TEST_SUITE.labels and + label not in filter_pull_request_tests._CSHARP_TEST_SUITE.labels + ]) + self.test_filtering([ + 'src/objective-c/foo.bar', 'src/php/foo.bar', "src/python/foo.bar", + "src/ruby/foo.bar" + ], [ + label for label in _LIST_OF_LANGUAGE_LABELS + if label not in filter_pull_request_tests._OBJC_TEST_SUITE.labels + and label not in filter_pull_request_tests._PHP_TEST_SUITE.labels + and label not in filter_pull_request_tests._PYTHON_TEST_SUITE.labels + and label not in filter_pull_request_tests._RUBY_TEST_SUITE.labels + ]) + + def test_platform_filter(self): + self.test_filtering(['vsprojects/foo.bar'], [ + label for label in _LIST_OF_PLATFORM_LABELS + if label not in filter_pull_request_tests._WINDOWS_TEST_SUITE.labels + ]) + + def test_whitelist(self): + whitelist = filter_pull_request_tests._WHITELIST_DICT + files_that_should_trigger_all_tests = [ + 'src/core/foo.bar', 'some_file_not_on_the_white_list', 'BUILD', + 'etc/roots.pem', 'Makefile', 'tools/foo' + ] + for key in whitelist.keys(): + for file_name in files_that_should_trigger_all_tests: + self.assertFalse(re.match(key, file_name)) + if __name__ == '__main__': - unittest.main(verbosity=2) + unittest.main(verbosity=2) diff --git a/tools/run_tests/sanity/check_tracer_sanity.py b/tools/run_tests/sanity/check_tracer_sanity.py index 997ec79d020..c4c76530ded 100755 --- a/tools/run_tests/sanity/check_tracer_sanity.py +++ b/tools/run_tests/sanity/check_tracer_sanity.py @@ -26,21 +26,22 @@ errors = 0 tracers = [] pattern = re.compile("GRPC_TRACER_INITIALIZER\((true|false), \"(.*)\"\)") for root, dirs, files in os.walk('src/core'): - for filename in files: - path = os.path.join(root, filename) - if os.path.splitext(path)[1] != '.c': continue - with open(path) as f: - text = f.read() - for o in pattern.findall(text): - tracers.append(o[1]) + for filename in files: + path = os.path.join(root, filename) + if os.path.splitext(path)[1] != '.c': continue + with open(path) as f: + text = f.read() + for o in pattern.findall(text): + tracers.append(o[1]) with open('doc/environment_variables.md') as f: - text = f.read() + text = f.read() for t in tracers: if t not in text: - print("ERROR: tracer \"%s\" is not mentioned in doc/environment_variables.md" % t) + print( + "ERROR: tracer \"%s\" is not mentioned in doc/environment_variables.md" + % t) errors += 1 - assert errors == 0 diff --git a/tools/run_tests/sanity/check_version.py b/tools/run_tests/sanity/check_version.py index b9b6bab26d9..6154b2603ea 100755 --- a/tools/run_tests/sanity/check_version.py +++ b/tools/run_tests/sanity/check_version.py @@ -31,56 +31,56 @@ sys.path.insert(0, os.path.abspath('tools/buildgen/plugins')) from expand_version import Version try: - branch_name = subprocess.check_output( - 'git rev-parse --abbrev-ref HEAD', - shell=True) + branch_name = subprocess.check_output( + 'git rev-parse --abbrev-ref HEAD', shell=True) except: - print('WARNING: not a git repository') - branch_name = None + print('WARNING: not a git repository') + branch_name = None if branch_name is not None: - m = re.match(r'^release-([0-9]+)_([0-9]+)$', branch_name) - if m: - print('RELEASE branch') - # version number should align with the branched version - check_version = lambda version: ( - version.major == int(m.group(1)) and - version.minor == int(m.group(2))) - warning = 'Version key "%%s" value "%%s" should have a major version %s and minor version %s' % (m.group(1), m.group(2)) - elif re.match(r'^debian/.*$', branch_name): - # no additional version checks for debian branches - check_version = lambda version: True - else: - # all other branches should have a -dev tag - check_version = lambda version: version.tag == 'dev' - warning = 'Version key "%s" value "%s" should have a -dev tag' + m = re.match(r'^release-([0-9]+)_([0-9]+)$', branch_name) + if m: + print('RELEASE branch') + # version number should align with the branched version + check_version = lambda version: ( + version.major == int(m.group(1)) and + version.minor == int(m.group(2))) + warning = 'Version key "%%s" value "%%s" should have a major version %s and minor version %s' % ( + m.group(1), m.group(2)) + elif re.match(r'^debian/.*$', branch_name): + # no additional version checks for debian branches + check_version = lambda version: True + else: + # all other branches should have a -dev tag + check_version = lambda version: version.tag == 'dev' + warning = 'Version key "%s" value "%s" should have a -dev tag' else: - check_version = lambda version: True + check_version = lambda version: True with open('build.yaml', 'r') as f: - build_yaml = yaml.load(f.read()) + build_yaml = yaml.load(f.read()) settings = build_yaml['settings'] top_version = Version(settings['version']) if not check_version(top_version): - errors += 1 - print(warning % ('version', top_version)) + errors += 1 + print(warning % ('version', top_version)) for tag, value in settings.iteritems(): - if re.match(r'^[a-z]+_version$', tag): - value = Version(value) - if tag != 'core_version': - if value.major != top_version.major: - errors += 1 - print('major version mismatch on %s: %d vs %d' % (tag, value.major, - top_version.major)) - if value.minor != top_version.minor: - errors += 1 - print('minor version mismatch on %s: %d vs %d' % (tag, value.minor, - top_version.minor)) - if not check_version(value): - errors += 1 - print(warning % (tag, value)) + if re.match(r'^[a-z]+_version$', tag): + value = Version(value) + if tag != 'core_version': + if value.major != top_version.major: + errors += 1 + print('major version mismatch on %s: %d vs %d' % + (tag, value.major, top_version.major)) + if value.minor != top_version.minor: + errors += 1 + print('minor version mismatch on %s: %d vs %d' % + (tag, value.minor, top_version.minor)) + if not check_version(value): + errors += 1 + print(warning % (tag, value)) sys.exit(errors) diff --git a/tools/run_tests/sanity/core_banned_functions.py b/tools/run_tests/sanity/core_banned_functions.py index 1f139054847..9ee28964a5a 100755 --- a/tools/run_tests/sanity/core_banned_functions.py +++ b/tools/run_tests/sanity/core_banned_functions.py @@ -36,26 +36,28 @@ BANNED_EXCEPT = { 'grpc_wsa_error(': ['src/core/lib/iomgr/error.c'], 'grpc_log_if_error(': ['src/core/lib/iomgr/error.c'], 'grpc_slice_malloc(': ['src/core/lib/slice/slice.c'], - 'grpc_closure_create(' : ['src/core/lib/iomgr/closure.c'], - 'grpc_closure_init(' : ['src/core/lib/iomgr/closure.c'], - 'grpc_closure_sched(' : ['src/core/lib/iomgr/closure.c'], - 'grpc_closure_run(' : ['src/core/lib/iomgr/closure.c'], - 'grpc_closure_list_sched(' : ['src/core/lib/iomgr/closure.c'], - 'gpr_getenv_silent(' : ['src/core/lib/support/log.c', 'src/core/lib/support/env_linux.c', - 'src/core/lib/support/env_posix.c', 'src/core/lib/support/env_windows.c'], + 'grpc_closure_create(': ['src/core/lib/iomgr/closure.c'], + 'grpc_closure_init(': ['src/core/lib/iomgr/closure.c'], + 'grpc_closure_sched(': ['src/core/lib/iomgr/closure.c'], + 'grpc_closure_run(': ['src/core/lib/iomgr/closure.c'], + 'grpc_closure_list_sched(': ['src/core/lib/iomgr/closure.c'], + 'gpr_getenv_silent(': [ + 'src/core/lib/support/log.c', 'src/core/lib/support/env_linux.c', + 'src/core/lib/support/env_posix.c', 'src/core/lib/support/env_windows.c' + ], } errors = 0 for root, dirs, files in os.walk('src/core'): - for filename in files: - path = os.path.join(root, filename) - if os.path.splitext(path)[1] != '.c': continue - with open(path) as f: - text = f.read() - for banned, exceptions in BANNED_EXCEPT.items(): - if path in exceptions: continue - if banned in text: - print('Illegal use of "%s" in %s' % (banned, path)) - errors += 1 + for filename in files: + path = os.path.join(root, filename) + if os.path.splitext(path)[1] != '.c': continue + with open(path) as f: + text = f.read() + for banned, exceptions in BANNED_EXCEPT.items(): + if path in exceptions: continue + if banned in text: + print('Illegal use of "%s" in %s' % (banned, path)) + errors += 1 assert errors == 0 From 9c5d8267cd17c16306e83b678b6fe4cf50aa7125 Mon Sep 17 00:00:00 2001 From: yang-g Date: Mon, 11 Dec 2017 16:51:06 -0800 Subject: [PATCH 109/127] resolve comments --- include/grpc++/impl/codegen/async_unary_call.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/grpc++/impl/codegen/async_unary_call.h b/include/grpc++/impl/codegen/async_unary_call.h index 2bbbb875032..fb573004cbc 100644 --- a/include/grpc++/impl/codegen/async_unary_call.h +++ b/include/grpc++/impl/codegen/async_unary_call.h @@ -106,9 +106,9 @@ class ClientAsyncResponseReader final // This operator should never be called as the memory should be freed as part // of the arena destruction. It only exists to provide a matching operator // delete to the operator new so that some compilers will not complain (see - // Issue# 11301). Note at the time of adding this there is no tests catching - // the compiler warning. - static void operator delete(void*, void*) {} + // https://github.com/grpc/grpc/issues/11301) Note at the time of adding this + // there are no tests catching the compiler warning. + static void operator delete(void*, void*) { assert(0); } void StartCall() override { assert(!started_); From eb1281529a5f1539bf03b1fa8f2f1311177a054c Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 11 Dec 2017 17:48:24 -0800 Subject: [PATCH 110/127] yapf tools/run_tests/performance --- tools/distrib/yapf_code.sh | 1 + .../run_tests/performance/bq_upload_result.py | 219 +- .../performance/massage_qps_stats.py | 630 ++++-- .../performance/massage_qps_stats_helpers.py | 71 +- .../patch_scenario_results_schema.py | 35 +- .../run_tests/performance/scenario_config.py | 1852 +++++++++-------- 6 files changed, 1658 insertions(+), 1150 deletions(-) diff --git a/tools/distrib/yapf_code.sh b/tools/distrib/yapf_code.sh index a26ba68e8e2..8f34e55245d 100755 --- a/tools/distrib/yapf_code.sh +++ b/tools/distrib/yapf_code.sh @@ -27,6 +27,7 @@ DIRS=( 'tools/profiling' 'tools/run_tests/python_utils' 'tools/run_tests/sanity' + 'tools/run_tests/performance' ) EXCLUSIONS=( 'grpcio/grpc_*.py' diff --git a/tools/run_tests/performance/bq_upload_result.py b/tools/run_tests/performance/bq_upload_result.py index 31819d6159c..67025875578 100755 --- a/tools/run_tests/performance/bq_upload_result.py +++ b/tools/run_tests/performance/bq_upload_result.py @@ -26,146 +26,161 @@ import time import uuid import massage_qps_stats - -gcp_utils_dir = os.path.abspath(os.path.join( - os.path.dirname(__file__), '../../gcp/utils')) +gcp_utils_dir = os.path.abspath( + os.path.join(os.path.dirname(__file__), '../../gcp/utils')) sys.path.append(gcp_utils_dir) import big_query_utils - -_PROJECT_ID='grpc-testing' +_PROJECT_ID = 'grpc-testing' def _upload_netperf_latency_csv_to_bigquery(dataset_id, table_id, result_file): - with open(result_file, 'r') as f: - (col1, col2, col3) = f.read().split(',') - latency50 = float(col1.strip()) * 1000 - latency90 = float(col2.strip()) * 1000 - latency99 = float(col3.strip()) * 1000 - - scenario_result = { - 'scenario': { - 'name': 'netperf_tcp_rr' - }, - 'summary': { - 'latency50': latency50, - 'latency90': latency90, - 'latency99': latency99 + with open(result_file, 'r') as f: + (col1, col2, col3) = f.read().split(',') + latency50 = float(col1.strip()) * 1000 + latency90 = float(col2.strip()) * 1000 + latency99 = float(col3.strip()) * 1000 + + scenario_result = { + 'scenario': { + 'name': 'netperf_tcp_rr' + }, + 'summary': { + 'latency50': latency50, + 'latency90': latency90, + 'latency99': latency99 + } } - } - bq = big_query_utils.create_big_query() - _create_results_table(bq, dataset_id, table_id) + bq = big_query_utils.create_big_query() + _create_results_table(bq, dataset_id, table_id) - if not _insert_result(bq, dataset_id, table_id, scenario_result, flatten=False): - print('Error uploading result to bigquery.') - sys.exit(1) + if not _insert_result( + bq, dataset_id, table_id, scenario_result, flatten=False): + print('Error uploading result to bigquery.') + sys.exit(1) def _upload_scenario_result_to_bigquery(dataset_id, table_id, result_file): - with open(result_file, 'r') as f: - scenario_result = json.loads(f.read()) + with open(result_file, 'r') as f: + scenario_result = json.loads(f.read()) - bq = big_query_utils.create_big_query() - _create_results_table(bq, dataset_id, table_id) + bq = big_query_utils.create_big_query() + _create_results_table(bq, dataset_id, table_id) - if not _insert_result(bq, dataset_id, table_id, scenario_result): - print('Error uploading result to bigquery.') - sys.exit(1) + if not _insert_result(bq, dataset_id, table_id, scenario_result): + print('Error uploading result to bigquery.') + sys.exit(1) def _insert_result(bq, dataset_id, table_id, scenario_result, flatten=True): - if flatten: - _flatten_result_inplace(scenario_result) - _populate_metadata_inplace(scenario_result) - row = big_query_utils.make_row(str(uuid.uuid4()), scenario_result) - return big_query_utils.insert_rows(bq, - _PROJECT_ID, - dataset_id, - table_id, - [row]) + if flatten: + _flatten_result_inplace(scenario_result) + _populate_metadata_inplace(scenario_result) + row = big_query_utils.make_row(str(uuid.uuid4()), scenario_result) + return big_query_utils.insert_rows(bq, _PROJECT_ID, dataset_id, table_id, + [row]) def _create_results_table(bq, dataset_id, table_id): - with open(os.path.dirname(__file__) + '/scenario_result_schema.json', 'r') as f: - table_schema = json.loads(f.read()) - desc = 'Results of performance benchmarks.' - return big_query_utils.create_table2(bq, _PROJECT_ID, dataset_id, - table_id, table_schema, desc) + with open(os.path.dirname(__file__) + '/scenario_result_schema.json', + 'r') as f: + table_schema = json.loads(f.read()) + desc = 'Results of performance benchmarks.' + return big_query_utils.create_table2(bq, _PROJECT_ID, dataset_id, table_id, + table_schema, desc) def _flatten_result_inplace(scenario_result): - """Bigquery is not really great for handling deeply nested data + """Bigquery is not really great for handling deeply nested data and repeated fields. To maintain values of some fields while keeping the schema relatively simple, we artificially leave some of the fields as JSON strings. """ - scenario_result['scenario']['clientConfig'] = json.dumps(scenario_result['scenario']['clientConfig']) - scenario_result['scenario']['serverConfig'] = json.dumps(scenario_result['scenario']['serverConfig']) - scenario_result['latencies'] = json.dumps(scenario_result['latencies']) - scenario_result['serverCpuStats'] = [] - for stats in scenario_result['serverStats']: - scenario_result['serverCpuStats'].append(dict()) - scenario_result['serverCpuStats'][-1]['totalCpuTime'] = stats.pop('totalCpuTime', None) - scenario_result['serverCpuStats'][-1]['idleCpuTime'] = stats.pop('idleCpuTime', None) - for stats in scenario_result['clientStats']: - stats['latencies'] = json.dumps(stats['latencies']) - stats.pop('requestResults', None) - scenario_result['serverCores'] = json.dumps(scenario_result['serverCores']) - scenario_result['clientSuccess'] = json.dumps(scenario_result['clientSuccess']) - scenario_result['serverSuccess'] = json.dumps(scenario_result['serverSuccess']) - scenario_result['requestResults'] = json.dumps(scenario_result.get('requestResults', [])) - scenario_result['serverCpuUsage'] = scenario_result['summary'].pop('serverCpuUsage', None) - scenario_result['summary'].pop('successfulRequestsPerSecond', None) - scenario_result['summary'].pop('failedRequestsPerSecond', None) - massage_qps_stats.massage_qps_stats(scenario_result) + scenario_result['scenario']['clientConfig'] = json.dumps( + scenario_result['scenario']['clientConfig']) + scenario_result['scenario']['serverConfig'] = json.dumps( + scenario_result['scenario']['serverConfig']) + scenario_result['latencies'] = json.dumps(scenario_result['latencies']) + scenario_result['serverCpuStats'] = [] + for stats in scenario_result['serverStats']: + scenario_result['serverCpuStats'].append(dict()) + scenario_result['serverCpuStats'][-1]['totalCpuTime'] = stats.pop( + 'totalCpuTime', None) + scenario_result['serverCpuStats'][-1]['idleCpuTime'] = stats.pop( + 'idleCpuTime', None) + for stats in scenario_result['clientStats']: + stats['latencies'] = json.dumps(stats['latencies']) + stats.pop('requestResults', None) + scenario_result['serverCores'] = json.dumps(scenario_result['serverCores']) + scenario_result['clientSuccess'] = json.dumps( + scenario_result['clientSuccess']) + scenario_result['serverSuccess'] = json.dumps( + scenario_result['serverSuccess']) + scenario_result['requestResults'] = json.dumps( + scenario_result.get('requestResults', [])) + scenario_result['serverCpuUsage'] = scenario_result['summary'].pop( + 'serverCpuUsage', None) + scenario_result['summary'].pop('successfulRequestsPerSecond', None) + scenario_result['summary'].pop('failedRequestsPerSecond', None) + massage_qps_stats.massage_qps_stats(scenario_result) def _populate_metadata_inplace(scenario_result): - """Populates metadata based on environment variables set by Jenkins.""" - # NOTE: Grabbing the Jenkins environment variables will only work if the - # driver is running locally on the same machine where Jenkins has started - # the job. For our setup, this is currently the case, so just assume that. - build_number = os.getenv('BUILD_NUMBER') - build_url = os.getenv('BUILD_URL') - job_name = os.getenv('JOB_NAME') - git_commit = os.getenv('GIT_COMMIT') - # actual commit is the actual head of PR that is getting tested - git_actual_commit = os.getenv('ghprbActualCommit') - - utc_timestamp = str(calendar.timegm(time.gmtime())) - metadata = {'created': utc_timestamp} - - if build_number: - metadata['buildNumber'] = build_number - if build_url: - metadata['buildUrl'] = build_url - if job_name: - metadata['jobName'] = job_name - if git_commit: - metadata['gitCommit'] = git_commit - if git_actual_commit: - metadata['gitActualCommit'] = git_actual_commit - - scenario_result['metadata'] = metadata + """Populates metadata based on environment variables set by Jenkins.""" + # NOTE: Grabbing the Jenkins environment variables will only work if the + # driver is running locally on the same machine where Jenkins has started + # the job. For our setup, this is currently the case, so just assume that. + build_number = os.getenv('BUILD_NUMBER') + build_url = os.getenv('BUILD_URL') + job_name = os.getenv('JOB_NAME') + git_commit = os.getenv('GIT_COMMIT') + # actual commit is the actual head of PR that is getting tested + git_actual_commit = os.getenv('ghprbActualCommit') + + utc_timestamp = str(calendar.timegm(time.gmtime())) + metadata = {'created': utc_timestamp} + + if build_number: + metadata['buildNumber'] = build_number + if build_url: + metadata['buildUrl'] = build_url + if job_name: + metadata['jobName'] = job_name + if git_commit: + metadata['gitCommit'] = git_commit + if git_actual_commit: + metadata['gitActualCommit'] = git_actual_commit + + scenario_result['metadata'] = metadata argp = argparse.ArgumentParser(description='Upload result to big query.') -argp.add_argument('--bq_result_table', required=True, default=None, type=str, - help='Bigquery "dataset.table" to upload results to.') -argp.add_argument('--file_to_upload', default='scenario_result.json', type=str, - help='Report file to upload.') -argp.add_argument('--file_format', - choices=['scenario_result','netperf_latency_csv'], - default='scenario_result', - help='Format of the file to upload.') +argp.add_argument( + '--bq_result_table', + required=True, + default=None, + type=str, + help='Bigquery "dataset.table" to upload results to.') +argp.add_argument( + '--file_to_upload', + default='scenario_result.json', + type=str, + help='Report file to upload.') +argp.add_argument( + '--file_format', + choices=['scenario_result', 'netperf_latency_csv'], + default='scenario_result', + help='Format of the file to upload.') args = argp.parse_args() dataset_id, table_id = args.bq_result_table.split('.', 2) if args.file_format == 'netperf_latency_csv': - _upload_netperf_latency_csv_to_bigquery(dataset_id, table_id, args.file_to_upload) + _upload_netperf_latency_csv_to_bigquery(dataset_id, table_id, + args.file_to_upload) else: - _upload_scenario_result_to_bigquery(dataset_id, table_id, args.file_to_upload) + _upload_scenario_result_to_bigquery(dataset_id, table_id, + args.file_to_upload) print('Successfully uploaded %s to BigQuery.\n' % args.file_to_upload) diff --git a/tools/run_tests/performance/massage_qps_stats.py b/tools/run_tests/performance/massage_qps_stats.py index 48c57581a52..37f6e7aae08 100644 --- a/tools/run_tests/performance/massage_qps_stats.py +++ b/tools/run_tests/performance/massage_qps_stats.py @@ -15,182 +15,456 @@ # Autogenerated by tools/codegen/core/gen_stats_data.py import massage_qps_stats_helpers + + def massage_qps_stats(scenario_result): - for stats in scenario_result["serverStats"] + scenario_result["clientStats"]: - if "coreStats" not in stats: return - core_stats = stats["coreStats"] - del stats["coreStats"] - stats["core_client_calls_created"] = massage_qps_stats_helpers.counter(core_stats, "client_calls_created") - stats["core_server_calls_created"] = massage_qps_stats_helpers.counter(core_stats, "server_calls_created") - stats["core_cqs_created"] = massage_qps_stats_helpers.counter(core_stats, "cqs_created") - stats["core_client_channels_created"] = massage_qps_stats_helpers.counter(core_stats, "client_channels_created") - stats["core_client_subchannels_created"] = massage_qps_stats_helpers.counter(core_stats, "client_subchannels_created") - stats["core_server_channels_created"] = massage_qps_stats_helpers.counter(core_stats, "server_channels_created") - stats["core_syscall_poll"] = massage_qps_stats_helpers.counter(core_stats, "syscall_poll") - stats["core_syscall_wait"] = massage_qps_stats_helpers.counter(core_stats, "syscall_wait") - stats["core_pollset_kick"] = massage_qps_stats_helpers.counter(core_stats, "pollset_kick") - stats["core_pollset_kicked_without_poller"] = massage_qps_stats_helpers.counter(core_stats, "pollset_kicked_without_poller") - stats["core_pollset_kicked_again"] = massage_qps_stats_helpers.counter(core_stats, "pollset_kicked_again") - stats["core_pollset_kick_wakeup_fd"] = massage_qps_stats_helpers.counter(core_stats, "pollset_kick_wakeup_fd") - stats["core_pollset_kick_wakeup_cv"] = massage_qps_stats_helpers.counter(core_stats, "pollset_kick_wakeup_cv") - stats["core_pollset_kick_own_thread"] = massage_qps_stats_helpers.counter(core_stats, "pollset_kick_own_thread") - stats["core_histogram_slow_lookups"] = massage_qps_stats_helpers.counter(core_stats, "histogram_slow_lookups") - stats["core_syscall_write"] = massage_qps_stats_helpers.counter(core_stats, "syscall_write") - stats["core_syscall_read"] = massage_qps_stats_helpers.counter(core_stats, "syscall_read") - stats["core_tcp_backup_pollers_created"] = massage_qps_stats_helpers.counter(core_stats, "tcp_backup_pollers_created") - stats["core_tcp_backup_poller_polls"] = massage_qps_stats_helpers.counter(core_stats, "tcp_backup_poller_polls") - stats["core_http2_op_batches"] = massage_qps_stats_helpers.counter(core_stats, "http2_op_batches") - stats["core_http2_op_cancel"] = massage_qps_stats_helpers.counter(core_stats, "http2_op_cancel") - stats["core_http2_op_send_initial_metadata"] = massage_qps_stats_helpers.counter(core_stats, "http2_op_send_initial_metadata") - stats["core_http2_op_send_message"] = massage_qps_stats_helpers.counter(core_stats, "http2_op_send_message") - stats["core_http2_op_send_trailing_metadata"] = massage_qps_stats_helpers.counter(core_stats, "http2_op_send_trailing_metadata") - stats["core_http2_op_recv_initial_metadata"] = massage_qps_stats_helpers.counter(core_stats, "http2_op_recv_initial_metadata") - stats["core_http2_op_recv_message"] = massage_qps_stats_helpers.counter(core_stats, "http2_op_recv_message") - stats["core_http2_op_recv_trailing_metadata"] = massage_qps_stats_helpers.counter(core_stats, "http2_op_recv_trailing_metadata") - stats["core_http2_settings_writes"] = massage_qps_stats_helpers.counter(core_stats, "http2_settings_writes") - stats["core_http2_pings_sent"] = massage_qps_stats_helpers.counter(core_stats, "http2_pings_sent") - stats["core_http2_writes_begun"] = massage_qps_stats_helpers.counter(core_stats, "http2_writes_begun") - stats["core_http2_writes_offloaded"] = massage_qps_stats_helpers.counter(core_stats, "http2_writes_offloaded") - stats["core_http2_writes_continued"] = massage_qps_stats_helpers.counter(core_stats, "http2_writes_continued") - stats["core_http2_partial_writes"] = massage_qps_stats_helpers.counter(core_stats, "http2_partial_writes") - stats["core_http2_initiate_write_due_to_initial_write"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_initial_write") - stats["core_http2_initiate_write_due_to_start_new_stream"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_start_new_stream") - stats["core_http2_initiate_write_due_to_send_message"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_send_message") - stats["core_http2_initiate_write_due_to_send_initial_metadata"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_send_initial_metadata") - stats["core_http2_initiate_write_due_to_send_trailing_metadata"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_send_trailing_metadata") - stats["core_http2_initiate_write_due_to_retry_send_ping"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_retry_send_ping") - stats["core_http2_initiate_write_due_to_continue_pings"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_continue_pings") - stats["core_http2_initiate_write_due_to_goaway_sent"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_goaway_sent") - stats["core_http2_initiate_write_due_to_rst_stream"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_rst_stream") - stats["core_http2_initiate_write_due_to_close_from_api"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_close_from_api") - stats["core_http2_initiate_write_due_to_stream_flow_control"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_stream_flow_control") - stats["core_http2_initiate_write_due_to_transport_flow_control"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_transport_flow_control") - stats["core_http2_initiate_write_due_to_send_settings"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_send_settings") - stats["core_http2_initiate_write_due_to_bdp_estimator_ping"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_bdp_estimator_ping") - stats["core_http2_initiate_write_due_to_flow_control_unstalled_by_setting"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_flow_control_unstalled_by_setting") - stats["core_http2_initiate_write_due_to_flow_control_unstalled_by_update"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_flow_control_unstalled_by_update") - stats["core_http2_initiate_write_due_to_application_ping"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_application_ping") - stats["core_http2_initiate_write_due_to_keepalive_ping"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_keepalive_ping") - stats["core_http2_initiate_write_due_to_transport_flow_control_unstalled"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_transport_flow_control_unstalled") - stats["core_http2_initiate_write_due_to_ping_response"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_ping_response") - stats["core_http2_initiate_write_due_to_force_rst_stream"] = massage_qps_stats_helpers.counter(core_stats, "http2_initiate_write_due_to_force_rst_stream") - stats["core_http2_spurious_writes_begun"] = massage_qps_stats_helpers.counter(core_stats, "http2_spurious_writes_begun") - stats["core_hpack_recv_indexed"] = massage_qps_stats_helpers.counter(core_stats, "hpack_recv_indexed") - stats["core_hpack_recv_lithdr_incidx"] = massage_qps_stats_helpers.counter(core_stats, "hpack_recv_lithdr_incidx") - stats["core_hpack_recv_lithdr_incidx_v"] = massage_qps_stats_helpers.counter(core_stats, "hpack_recv_lithdr_incidx_v") - stats["core_hpack_recv_lithdr_notidx"] = massage_qps_stats_helpers.counter(core_stats, "hpack_recv_lithdr_notidx") - stats["core_hpack_recv_lithdr_notidx_v"] = massage_qps_stats_helpers.counter(core_stats, "hpack_recv_lithdr_notidx_v") - stats["core_hpack_recv_lithdr_nvridx"] = massage_qps_stats_helpers.counter(core_stats, "hpack_recv_lithdr_nvridx") - stats["core_hpack_recv_lithdr_nvridx_v"] = massage_qps_stats_helpers.counter(core_stats, "hpack_recv_lithdr_nvridx_v") - stats["core_hpack_recv_uncompressed"] = massage_qps_stats_helpers.counter(core_stats, "hpack_recv_uncompressed") - stats["core_hpack_recv_huffman"] = massage_qps_stats_helpers.counter(core_stats, "hpack_recv_huffman") - stats["core_hpack_recv_binary"] = massage_qps_stats_helpers.counter(core_stats, "hpack_recv_binary") - stats["core_hpack_recv_binary_base64"] = massage_qps_stats_helpers.counter(core_stats, "hpack_recv_binary_base64") - stats["core_hpack_send_indexed"] = massage_qps_stats_helpers.counter(core_stats, "hpack_send_indexed") - stats["core_hpack_send_lithdr_incidx"] = massage_qps_stats_helpers.counter(core_stats, "hpack_send_lithdr_incidx") - stats["core_hpack_send_lithdr_incidx_v"] = massage_qps_stats_helpers.counter(core_stats, "hpack_send_lithdr_incidx_v") - stats["core_hpack_send_lithdr_notidx"] = massage_qps_stats_helpers.counter(core_stats, "hpack_send_lithdr_notidx") - stats["core_hpack_send_lithdr_notidx_v"] = massage_qps_stats_helpers.counter(core_stats, "hpack_send_lithdr_notidx_v") - stats["core_hpack_send_lithdr_nvridx"] = massage_qps_stats_helpers.counter(core_stats, "hpack_send_lithdr_nvridx") - stats["core_hpack_send_lithdr_nvridx_v"] = massage_qps_stats_helpers.counter(core_stats, "hpack_send_lithdr_nvridx_v") - stats["core_hpack_send_uncompressed"] = massage_qps_stats_helpers.counter(core_stats, "hpack_send_uncompressed") - stats["core_hpack_send_huffman"] = massage_qps_stats_helpers.counter(core_stats, "hpack_send_huffman") - stats["core_hpack_send_binary"] = massage_qps_stats_helpers.counter(core_stats, "hpack_send_binary") - stats["core_hpack_send_binary_base64"] = massage_qps_stats_helpers.counter(core_stats, "hpack_send_binary_base64") - stats["core_combiner_locks_initiated"] = massage_qps_stats_helpers.counter(core_stats, "combiner_locks_initiated") - stats["core_combiner_locks_scheduled_items"] = massage_qps_stats_helpers.counter(core_stats, "combiner_locks_scheduled_items") - stats["core_combiner_locks_scheduled_final_items"] = massage_qps_stats_helpers.counter(core_stats, "combiner_locks_scheduled_final_items") - stats["core_combiner_locks_offloaded"] = massage_qps_stats_helpers.counter(core_stats, "combiner_locks_offloaded") - stats["core_call_combiner_locks_initiated"] = massage_qps_stats_helpers.counter(core_stats, "call_combiner_locks_initiated") - stats["core_call_combiner_locks_scheduled_items"] = massage_qps_stats_helpers.counter(core_stats, "call_combiner_locks_scheduled_items") - stats["core_call_combiner_set_notify_on_cancel"] = massage_qps_stats_helpers.counter(core_stats, "call_combiner_set_notify_on_cancel") - stats["core_call_combiner_cancelled"] = massage_qps_stats_helpers.counter(core_stats, "call_combiner_cancelled") - stats["core_executor_scheduled_short_items"] = massage_qps_stats_helpers.counter(core_stats, "executor_scheduled_short_items") - stats["core_executor_scheduled_long_items"] = massage_qps_stats_helpers.counter(core_stats, "executor_scheduled_long_items") - stats["core_executor_scheduled_to_self"] = massage_qps_stats_helpers.counter(core_stats, "executor_scheduled_to_self") - stats["core_executor_wakeup_initiated"] = massage_qps_stats_helpers.counter(core_stats, "executor_wakeup_initiated") - stats["core_executor_queue_drained"] = massage_qps_stats_helpers.counter(core_stats, "executor_queue_drained") - stats["core_executor_push_retries"] = massage_qps_stats_helpers.counter(core_stats, "executor_push_retries") - stats["core_server_requested_calls"] = massage_qps_stats_helpers.counter(core_stats, "server_requested_calls") - stats["core_server_slowpath_requests_queued"] = massage_qps_stats_helpers.counter(core_stats, "server_slowpath_requests_queued") - stats["core_cq_ev_queue_trylock_failures"] = massage_qps_stats_helpers.counter(core_stats, "cq_ev_queue_trylock_failures") - stats["core_cq_ev_queue_trylock_successes"] = massage_qps_stats_helpers.counter(core_stats, "cq_ev_queue_trylock_successes") - stats["core_cq_ev_queue_transient_pop_failures"] = massage_qps_stats_helpers.counter(core_stats, "cq_ev_queue_transient_pop_failures") - h = massage_qps_stats_helpers.histogram(core_stats, "call_initial_size") - stats["core_call_initial_size"] = ",".join("%f" % x for x in h.buckets) - stats["core_call_initial_size_bkts"] = ",".join("%f" % x for x in h.boundaries) - stats["core_call_initial_size_50p"] = massage_qps_stats_helpers.percentile(h.buckets, 50, h.boundaries) - stats["core_call_initial_size_95p"] = massage_qps_stats_helpers.percentile(h.buckets, 95, h.boundaries) - stats["core_call_initial_size_99p"] = massage_qps_stats_helpers.percentile(h.buckets, 99, h.boundaries) - h = massage_qps_stats_helpers.histogram(core_stats, "poll_events_returned") - stats["core_poll_events_returned"] = ",".join("%f" % x for x in h.buckets) - stats["core_poll_events_returned_bkts"] = ",".join("%f" % x for x in h.boundaries) - stats["core_poll_events_returned_50p"] = massage_qps_stats_helpers.percentile(h.buckets, 50, h.boundaries) - stats["core_poll_events_returned_95p"] = massage_qps_stats_helpers.percentile(h.buckets, 95, h.boundaries) - stats["core_poll_events_returned_99p"] = massage_qps_stats_helpers.percentile(h.buckets, 99, h.boundaries) - h = massage_qps_stats_helpers.histogram(core_stats, "tcp_write_size") - stats["core_tcp_write_size"] = ",".join("%f" % x for x in h.buckets) - stats["core_tcp_write_size_bkts"] = ",".join("%f" % x for x in h.boundaries) - stats["core_tcp_write_size_50p"] = massage_qps_stats_helpers.percentile(h.buckets, 50, h.boundaries) - stats["core_tcp_write_size_95p"] = massage_qps_stats_helpers.percentile(h.buckets, 95, h.boundaries) - stats["core_tcp_write_size_99p"] = massage_qps_stats_helpers.percentile(h.buckets, 99, h.boundaries) - h = massage_qps_stats_helpers.histogram(core_stats, "tcp_write_iov_size") - stats["core_tcp_write_iov_size"] = ",".join("%f" % x for x in h.buckets) - stats["core_tcp_write_iov_size_bkts"] = ",".join("%f" % x for x in h.boundaries) - stats["core_tcp_write_iov_size_50p"] = massage_qps_stats_helpers.percentile(h.buckets, 50, h.boundaries) - stats["core_tcp_write_iov_size_95p"] = massage_qps_stats_helpers.percentile(h.buckets, 95, h.boundaries) - stats["core_tcp_write_iov_size_99p"] = massage_qps_stats_helpers.percentile(h.buckets, 99, h.boundaries) - h = massage_qps_stats_helpers.histogram(core_stats, "tcp_read_size") - stats["core_tcp_read_size"] = ",".join("%f" % x for x in h.buckets) - stats["core_tcp_read_size_bkts"] = ",".join("%f" % x for x in h.boundaries) - stats["core_tcp_read_size_50p"] = massage_qps_stats_helpers.percentile(h.buckets, 50, h.boundaries) - stats["core_tcp_read_size_95p"] = massage_qps_stats_helpers.percentile(h.buckets, 95, h.boundaries) - stats["core_tcp_read_size_99p"] = massage_qps_stats_helpers.percentile(h.buckets, 99, h.boundaries) - h = massage_qps_stats_helpers.histogram(core_stats, "tcp_read_offer") - stats["core_tcp_read_offer"] = ",".join("%f" % x for x in h.buckets) - stats["core_tcp_read_offer_bkts"] = ",".join("%f" % x for x in h.boundaries) - stats["core_tcp_read_offer_50p"] = massage_qps_stats_helpers.percentile(h.buckets, 50, h.boundaries) - stats["core_tcp_read_offer_95p"] = massage_qps_stats_helpers.percentile(h.buckets, 95, h.boundaries) - stats["core_tcp_read_offer_99p"] = massage_qps_stats_helpers.percentile(h.buckets, 99, h.boundaries) - h = massage_qps_stats_helpers.histogram(core_stats, "tcp_read_offer_iov_size") - stats["core_tcp_read_offer_iov_size"] = ",".join("%f" % x for x in h.buckets) - stats["core_tcp_read_offer_iov_size_bkts"] = ",".join("%f" % x for x in h.boundaries) - stats["core_tcp_read_offer_iov_size_50p"] = massage_qps_stats_helpers.percentile(h.buckets, 50, h.boundaries) - stats["core_tcp_read_offer_iov_size_95p"] = massage_qps_stats_helpers.percentile(h.buckets, 95, h.boundaries) - stats["core_tcp_read_offer_iov_size_99p"] = massage_qps_stats_helpers.percentile(h.buckets, 99, h.boundaries) - h = massage_qps_stats_helpers.histogram(core_stats, "http2_send_message_size") - stats["core_http2_send_message_size"] = ",".join("%f" % x for x in h.buckets) - stats["core_http2_send_message_size_bkts"] = ",".join("%f" % x for x in h.boundaries) - stats["core_http2_send_message_size_50p"] = massage_qps_stats_helpers.percentile(h.buckets, 50, h.boundaries) - stats["core_http2_send_message_size_95p"] = massage_qps_stats_helpers.percentile(h.buckets, 95, h.boundaries) - stats["core_http2_send_message_size_99p"] = massage_qps_stats_helpers.percentile(h.buckets, 99, h.boundaries) - h = massage_qps_stats_helpers.histogram(core_stats, "http2_send_initial_metadata_per_write") - stats["core_http2_send_initial_metadata_per_write"] = ",".join("%f" % x for x in h.buckets) - stats["core_http2_send_initial_metadata_per_write_bkts"] = ",".join("%f" % x for x in h.boundaries) - stats["core_http2_send_initial_metadata_per_write_50p"] = massage_qps_stats_helpers.percentile(h.buckets, 50, h.boundaries) - stats["core_http2_send_initial_metadata_per_write_95p"] = massage_qps_stats_helpers.percentile(h.buckets, 95, h.boundaries) - stats["core_http2_send_initial_metadata_per_write_99p"] = massage_qps_stats_helpers.percentile(h.buckets, 99, h.boundaries) - h = massage_qps_stats_helpers.histogram(core_stats, "http2_send_message_per_write") - stats["core_http2_send_message_per_write"] = ",".join("%f" % x for x in h.buckets) - stats["core_http2_send_message_per_write_bkts"] = ",".join("%f" % x for x in h.boundaries) - stats["core_http2_send_message_per_write_50p"] = massage_qps_stats_helpers.percentile(h.buckets, 50, h.boundaries) - stats["core_http2_send_message_per_write_95p"] = massage_qps_stats_helpers.percentile(h.buckets, 95, h.boundaries) - stats["core_http2_send_message_per_write_99p"] = massage_qps_stats_helpers.percentile(h.buckets, 99, h.boundaries) - h = massage_qps_stats_helpers.histogram(core_stats, "http2_send_trailing_metadata_per_write") - stats["core_http2_send_trailing_metadata_per_write"] = ",".join("%f" % x for x in h.buckets) - stats["core_http2_send_trailing_metadata_per_write_bkts"] = ",".join("%f" % x for x in h.boundaries) - stats["core_http2_send_trailing_metadata_per_write_50p"] = massage_qps_stats_helpers.percentile(h.buckets, 50, h.boundaries) - stats["core_http2_send_trailing_metadata_per_write_95p"] = massage_qps_stats_helpers.percentile(h.buckets, 95, h.boundaries) - stats["core_http2_send_trailing_metadata_per_write_99p"] = massage_qps_stats_helpers.percentile(h.buckets, 99, h.boundaries) - h = massage_qps_stats_helpers.histogram(core_stats, "http2_send_flowctl_per_write") - stats["core_http2_send_flowctl_per_write"] = ",".join("%f" % x for x in h.buckets) - stats["core_http2_send_flowctl_per_write_bkts"] = ",".join("%f" % x for x in h.boundaries) - stats["core_http2_send_flowctl_per_write_50p"] = massage_qps_stats_helpers.percentile(h.buckets, 50, h.boundaries) - stats["core_http2_send_flowctl_per_write_95p"] = massage_qps_stats_helpers.percentile(h.buckets, 95, h.boundaries) - stats["core_http2_send_flowctl_per_write_99p"] = massage_qps_stats_helpers.percentile(h.buckets, 99, h.boundaries) - h = massage_qps_stats_helpers.histogram(core_stats, "server_cqs_checked") - stats["core_server_cqs_checked"] = ",".join("%f" % x for x in h.buckets) - stats["core_server_cqs_checked_bkts"] = ",".join("%f" % x for x in h.boundaries) - stats["core_server_cqs_checked_50p"] = massage_qps_stats_helpers.percentile(h.buckets, 50, h.boundaries) - stats["core_server_cqs_checked_95p"] = massage_qps_stats_helpers.percentile(h.buckets, 95, h.boundaries) - stats["core_server_cqs_checked_99p"] = massage_qps_stats_helpers.percentile(h.buckets, 99, h.boundaries) + for stats in scenario_result["serverStats"] + scenario_result[ + "clientStats"]: + if "coreStats" not in stats: return + core_stats = stats["coreStats"] + del stats["coreStats"] + stats["core_client_calls_created"] = massage_qps_stats_helpers.counter( + core_stats, "client_calls_created") + stats["core_server_calls_created"] = massage_qps_stats_helpers.counter( + core_stats, "server_calls_created") + stats["core_cqs_created"] = massage_qps_stats_helpers.counter( + core_stats, "cqs_created") + stats[ + "core_client_channels_created"] = massage_qps_stats_helpers.counter( + core_stats, "client_channels_created") + stats[ + "core_client_subchannels_created"] = massage_qps_stats_helpers.counter( + core_stats, "client_subchannels_created") + stats[ + "core_server_channels_created"] = massage_qps_stats_helpers.counter( + core_stats, "server_channels_created") + stats["core_syscall_poll"] = massage_qps_stats_helpers.counter( + core_stats, "syscall_poll") + stats["core_syscall_wait"] = massage_qps_stats_helpers.counter( + core_stats, "syscall_wait") + stats["core_pollset_kick"] = massage_qps_stats_helpers.counter( + core_stats, "pollset_kick") + stats[ + "core_pollset_kicked_without_poller"] = massage_qps_stats_helpers.counter( + core_stats, "pollset_kicked_without_poller") + stats["core_pollset_kicked_again"] = massage_qps_stats_helpers.counter( + core_stats, "pollset_kicked_again") + stats[ + "core_pollset_kick_wakeup_fd"] = massage_qps_stats_helpers.counter( + core_stats, "pollset_kick_wakeup_fd") + stats[ + "core_pollset_kick_wakeup_cv"] = massage_qps_stats_helpers.counter( + core_stats, "pollset_kick_wakeup_cv") + stats[ + "core_pollset_kick_own_thread"] = massage_qps_stats_helpers.counter( + core_stats, "pollset_kick_own_thread") + stats[ + "core_histogram_slow_lookups"] = massage_qps_stats_helpers.counter( + core_stats, "histogram_slow_lookups") + stats["core_syscall_write"] = massage_qps_stats_helpers.counter( + core_stats, "syscall_write") + stats["core_syscall_read"] = massage_qps_stats_helpers.counter( + core_stats, "syscall_read") + stats[ + "core_tcp_backup_pollers_created"] = massage_qps_stats_helpers.counter( + core_stats, "tcp_backup_pollers_created") + stats[ + "core_tcp_backup_poller_polls"] = massage_qps_stats_helpers.counter( + core_stats, "tcp_backup_poller_polls") + stats["core_http2_op_batches"] = massage_qps_stats_helpers.counter( + core_stats, "http2_op_batches") + stats["core_http2_op_cancel"] = massage_qps_stats_helpers.counter( + core_stats, "http2_op_cancel") + stats[ + "core_http2_op_send_initial_metadata"] = massage_qps_stats_helpers.counter( + core_stats, "http2_op_send_initial_metadata") + stats["core_http2_op_send_message"] = massage_qps_stats_helpers.counter( + core_stats, "http2_op_send_message") + stats[ + "core_http2_op_send_trailing_metadata"] = massage_qps_stats_helpers.counter( + core_stats, "http2_op_send_trailing_metadata") + stats[ + "core_http2_op_recv_initial_metadata"] = massage_qps_stats_helpers.counter( + core_stats, "http2_op_recv_initial_metadata") + stats["core_http2_op_recv_message"] = massage_qps_stats_helpers.counter( + core_stats, "http2_op_recv_message") + stats[ + "core_http2_op_recv_trailing_metadata"] = massage_qps_stats_helpers.counter( + core_stats, "http2_op_recv_trailing_metadata") + stats["core_http2_settings_writes"] = massage_qps_stats_helpers.counter( + core_stats, "http2_settings_writes") + stats["core_http2_pings_sent"] = massage_qps_stats_helpers.counter( + core_stats, "http2_pings_sent") + stats["core_http2_writes_begun"] = massage_qps_stats_helpers.counter( + core_stats, "http2_writes_begun") + stats[ + "core_http2_writes_offloaded"] = massage_qps_stats_helpers.counter( + core_stats, "http2_writes_offloaded") + stats[ + "core_http2_writes_continued"] = massage_qps_stats_helpers.counter( + core_stats, "http2_writes_continued") + stats["core_http2_partial_writes"] = massage_qps_stats_helpers.counter( + core_stats, "http2_partial_writes") + stats[ + "core_http2_initiate_write_due_to_initial_write"] = massage_qps_stats_helpers.counter( + core_stats, "http2_initiate_write_due_to_initial_write") + stats[ + "core_http2_initiate_write_due_to_start_new_stream"] = massage_qps_stats_helpers.counter( + core_stats, "http2_initiate_write_due_to_start_new_stream") + stats[ + "core_http2_initiate_write_due_to_send_message"] = massage_qps_stats_helpers.counter( + core_stats, "http2_initiate_write_due_to_send_message") + stats[ + "core_http2_initiate_write_due_to_send_initial_metadata"] = massage_qps_stats_helpers.counter( + core_stats, "http2_initiate_write_due_to_send_initial_metadata") + stats[ + "core_http2_initiate_write_due_to_send_trailing_metadata"] = massage_qps_stats_helpers.counter( + core_stats, + "http2_initiate_write_due_to_send_trailing_metadata") + stats[ + "core_http2_initiate_write_due_to_retry_send_ping"] = massage_qps_stats_helpers.counter( + core_stats, "http2_initiate_write_due_to_retry_send_ping") + stats[ + "core_http2_initiate_write_due_to_continue_pings"] = massage_qps_stats_helpers.counter( + core_stats, "http2_initiate_write_due_to_continue_pings") + stats[ + "core_http2_initiate_write_due_to_goaway_sent"] = massage_qps_stats_helpers.counter( + core_stats, "http2_initiate_write_due_to_goaway_sent") + stats[ + "core_http2_initiate_write_due_to_rst_stream"] = massage_qps_stats_helpers.counter( + core_stats, "http2_initiate_write_due_to_rst_stream") + stats[ + "core_http2_initiate_write_due_to_close_from_api"] = massage_qps_stats_helpers.counter( + core_stats, "http2_initiate_write_due_to_close_from_api") + stats[ + "core_http2_initiate_write_due_to_stream_flow_control"] = massage_qps_stats_helpers.counter( + core_stats, "http2_initiate_write_due_to_stream_flow_control") + stats[ + "core_http2_initiate_write_due_to_transport_flow_control"] = massage_qps_stats_helpers.counter( + core_stats, + "http2_initiate_write_due_to_transport_flow_control") + stats[ + "core_http2_initiate_write_due_to_send_settings"] = massage_qps_stats_helpers.counter( + core_stats, "http2_initiate_write_due_to_send_settings") + stats[ + "core_http2_initiate_write_due_to_bdp_estimator_ping"] = massage_qps_stats_helpers.counter( + core_stats, "http2_initiate_write_due_to_bdp_estimator_ping") + stats[ + "core_http2_initiate_write_due_to_flow_control_unstalled_by_setting"] = massage_qps_stats_helpers.counter( + core_stats, + "http2_initiate_write_due_to_flow_control_unstalled_by_setting") + stats[ + "core_http2_initiate_write_due_to_flow_control_unstalled_by_update"] = massage_qps_stats_helpers.counter( + core_stats, + "http2_initiate_write_due_to_flow_control_unstalled_by_update") + stats[ + "core_http2_initiate_write_due_to_application_ping"] = massage_qps_stats_helpers.counter( + core_stats, "http2_initiate_write_due_to_application_ping") + stats[ + "core_http2_initiate_write_due_to_keepalive_ping"] = massage_qps_stats_helpers.counter( + core_stats, "http2_initiate_write_due_to_keepalive_ping") + stats[ + "core_http2_initiate_write_due_to_transport_flow_control_unstalled"] = massage_qps_stats_helpers.counter( + core_stats, + "http2_initiate_write_due_to_transport_flow_control_unstalled") + stats[ + "core_http2_initiate_write_due_to_ping_response"] = massage_qps_stats_helpers.counter( + core_stats, "http2_initiate_write_due_to_ping_response") + stats[ + "core_http2_initiate_write_due_to_force_rst_stream"] = massage_qps_stats_helpers.counter( + core_stats, "http2_initiate_write_due_to_force_rst_stream") + stats[ + "core_http2_spurious_writes_begun"] = massage_qps_stats_helpers.counter( + core_stats, "http2_spurious_writes_begun") + stats["core_hpack_recv_indexed"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_recv_indexed") + stats[ + "core_hpack_recv_lithdr_incidx"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_recv_lithdr_incidx") + stats[ + "core_hpack_recv_lithdr_incidx_v"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_recv_lithdr_incidx_v") + stats[ + "core_hpack_recv_lithdr_notidx"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_recv_lithdr_notidx") + stats[ + "core_hpack_recv_lithdr_notidx_v"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_recv_lithdr_notidx_v") + stats[ + "core_hpack_recv_lithdr_nvridx"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_recv_lithdr_nvridx") + stats[ + "core_hpack_recv_lithdr_nvridx_v"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_recv_lithdr_nvridx_v") + stats[ + "core_hpack_recv_uncompressed"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_recv_uncompressed") + stats["core_hpack_recv_huffman"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_recv_huffman") + stats["core_hpack_recv_binary"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_recv_binary") + stats[ + "core_hpack_recv_binary_base64"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_recv_binary_base64") + stats["core_hpack_send_indexed"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_send_indexed") + stats[ + "core_hpack_send_lithdr_incidx"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_send_lithdr_incidx") + stats[ + "core_hpack_send_lithdr_incidx_v"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_send_lithdr_incidx_v") + stats[ + "core_hpack_send_lithdr_notidx"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_send_lithdr_notidx") + stats[ + "core_hpack_send_lithdr_notidx_v"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_send_lithdr_notidx_v") + stats[ + "core_hpack_send_lithdr_nvridx"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_send_lithdr_nvridx") + stats[ + "core_hpack_send_lithdr_nvridx_v"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_send_lithdr_nvridx_v") + stats[ + "core_hpack_send_uncompressed"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_send_uncompressed") + stats["core_hpack_send_huffman"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_send_huffman") + stats["core_hpack_send_binary"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_send_binary") + stats[ + "core_hpack_send_binary_base64"] = massage_qps_stats_helpers.counter( + core_stats, "hpack_send_binary_base64") + stats[ + "core_combiner_locks_initiated"] = massage_qps_stats_helpers.counter( + core_stats, "combiner_locks_initiated") + stats[ + "core_combiner_locks_scheduled_items"] = massage_qps_stats_helpers.counter( + core_stats, "combiner_locks_scheduled_items") + stats[ + "core_combiner_locks_scheduled_final_items"] = massage_qps_stats_helpers.counter( + core_stats, "combiner_locks_scheduled_final_items") + stats[ + "core_combiner_locks_offloaded"] = massage_qps_stats_helpers.counter( + core_stats, "combiner_locks_offloaded") + stats[ + "core_call_combiner_locks_initiated"] = massage_qps_stats_helpers.counter( + core_stats, "call_combiner_locks_initiated") + stats[ + "core_call_combiner_locks_scheduled_items"] = massage_qps_stats_helpers.counter( + core_stats, "call_combiner_locks_scheduled_items") + stats[ + "core_call_combiner_set_notify_on_cancel"] = massage_qps_stats_helpers.counter( + core_stats, "call_combiner_set_notify_on_cancel") + stats[ + "core_call_combiner_cancelled"] = massage_qps_stats_helpers.counter( + core_stats, "call_combiner_cancelled") + stats[ + "core_executor_scheduled_short_items"] = massage_qps_stats_helpers.counter( + core_stats, "executor_scheduled_short_items") + stats[ + "core_executor_scheduled_long_items"] = massage_qps_stats_helpers.counter( + core_stats, "executor_scheduled_long_items") + stats[ + "core_executor_scheduled_to_self"] = massage_qps_stats_helpers.counter( + core_stats, "executor_scheduled_to_self") + stats[ + "core_executor_wakeup_initiated"] = massage_qps_stats_helpers.counter( + core_stats, "executor_wakeup_initiated") + stats[ + "core_executor_queue_drained"] = massage_qps_stats_helpers.counter( + core_stats, "executor_queue_drained") + stats["core_executor_push_retries"] = massage_qps_stats_helpers.counter( + core_stats, "executor_push_retries") + stats[ + "core_server_requested_calls"] = massage_qps_stats_helpers.counter( + core_stats, "server_requested_calls") + stats[ + "core_server_slowpath_requests_queued"] = massage_qps_stats_helpers.counter( + core_stats, "server_slowpath_requests_queued") + stats[ + "core_cq_ev_queue_trylock_failures"] = massage_qps_stats_helpers.counter( + core_stats, "cq_ev_queue_trylock_failures") + stats[ + "core_cq_ev_queue_trylock_successes"] = massage_qps_stats_helpers.counter( + core_stats, "cq_ev_queue_trylock_successes") + stats[ + "core_cq_ev_queue_transient_pop_failures"] = massage_qps_stats_helpers.counter( + core_stats, "cq_ev_queue_transient_pop_failures") + h = massage_qps_stats_helpers.histogram(core_stats, "call_initial_size") + stats["core_call_initial_size"] = ",".join("%f" % x for x in h.buckets) + stats["core_call_initial_size_bkts"] = ",".join("%f" % x + for x in h.boundaries) + stats[ + "core_call_initial_size_50p"] = massage_qps_stats_helpers.percentile( + h.buckets, 50, h.boundaries) + stats[ + "core_call_initial_size_95p"] = massage_qps_stats_helpers.percentile( + h.buckets, 95, h.boundaries) + stats[ + "core_call_initial_size_99p"] = massage_qps_stats_helpers.percentile( + h.buckets, 99, h.boundaries) + h = massage_qps_stats_helpers.histogram(core_stats, + "poll_events_returned") + stats["core_poll_events_returned"] = ",".join("%f" % x + for x in h.buckets) + stats["core_poll_events_returned_bkts"] = ",".join( + "%f" % x for x in h.boundaries) + stats[ + "core_poll_events_returned_50p"] = massage_qps_stats_helpers.percentile( + h.buckets, 50, h.boundaries) + stats[ + "core_poll_events_returned_95p"] = massage_qps_stats_helpers.percentile( + h.buckets, 95, h.boundaries) + stats[ + "core_poll_events_returned_99p"] = massage_qps_stats_helpers.percentile( + h.buckets, 99, h.boundaries) + h = massage_qps_stats_helpers.histogram(core_stats, "tcp_write_size") + stats["core_tcp_write_size"] = ",".join("%f" % x for x in h.buckets) + stats["core_tcp_write_size_bkts"] = ",".join("%f" % x + for x in h.boundaries) + stats["core_tcp_write_size_50p"] = massage_qps_stats_helpers.percentile( + h.buckets, 50, h.boundaries) + stats["core_tcp_write_size_95p"] = massage_qps_stats_helpers.percentile( + h.buckets, 95, h.boundaries) + stats["core_tcp_write_size_99p"] = massage_qps_stats_helpers.percentile( + h.buckets, 99, h.boundaries) + h = massage_qps_stats_helpers.histogram(core_stats, + "tcp_write_iov_size") + stats["core_tcp_write_iov_size"] = ",".join("%f" % x for x in h.buckets) + stats["core_tcp_write_iov_size_bkts"] = ",".join("%f" % x + for x in h.boundaries) + stats[ + "core_tcp_write_iov_size_50p"] = massage_qps_stats_helpers.percentile( + h.buckets, 50, h.boundaries) + stats[ + "core_tcp_write_iov_size_95p"] = massage_qps_stats_helpers.percentile( + h.buckets, 95, h.boundaries) + stats[ + "core_tcp_write_iov_size_99p"] = massage_qps_stats_helpers.percentile( + h.buckets, 99, h.boundaries) + h = massage_qps_stats_helpers.histogram(core_stats, "tcp_read_size") + stats["core_tcp_read_size"] = ",".join("%f" % x for x in h.buckets) + stats["core_tcp_read_size_bkts"] = ",".join("%f" % x + for x in h.boundaries) + stats["core_tcp_read_size_50p"] = massage_qps_stats_helpers.percentile( + h.buckets, 50, h.boundaries) + stats["core_tcp_read_size_95p"] = massage_qps_stats_helpers.percentile( + h.buckets, 95, h.boundaries) + stats["core_tcp_read_size_99p"] = massage_qps_stats_helpers.percentile( + h.buckets, 99, h.boundaries) + h = massage_qps_stats_helpers.histogram(core_stats, "tcp_read_offer") + stats["core_tcp_read_offer"] = ",".join("%f" % x for x in h.buckets) + stats["core_tcp_read_offer_bkts"] = ",".join("%f" % x + for x in h.boundaries) + stats["core_tcp_read_offer_50p"] = massage_qps_stats_helpers.percentile( + h.buckets, 50, h.boundaries) + stats["core_tcp_read_offer_95p"] = massage_qps_stats_helpers.percentile( + h.buckets, 95, h.boundaries) + stats["core_tcp_read_offer_99p"] = massage_qps_stats_helpers.percentile( + h.buckets, 99, h.boundaries) + h = massage_qps_stats_helpers.histogram(core_stats, + "tcp_read_offer_iov_size") + stats["core_tcp_read_offer_iov_size"] = ",".join("%f" % x + for x in h.buckets) + stats["core_tcp_read_offer_iov_size_bkts"] = ",".join( + "%f" % x for x in h.boundaries) + stats[ + "core_tcp_read_offer_iov_size_50p"] = massage_qps_stats_helpers.percentile( + h.buckets, 50, h.boundaries) + stats[ + "core_tcp_read_offer_iov_size_95p"] = massage_qps_stats_helpers.percentile( + h.buckets, 95, h.boundaries) + stats[ + "core_tcp_read_offer_iov_size_99p"] = massage_qps_stats_helpers.percentile( + h.buckets, 99, h.boundaries) + h = massage_qps_stats_helpers.histogram(core_stats, + "http2_send_message_size") + stats["core_http2_send_message_size"] = ",".join("%f" % x + for x in h.buckets) + stats["core_http2_send_message_size_bkts"] = ",".join( + "%f" % x for x in h.boundaries) + stats[ + "core_http2_send_message_size_50p"] = massage_qps_stats_helpers.percentile( + h.buckets, 50, h.boundaries) + stats[ + "core_http2_send_message_size_95p"] = massage_qps_stats_helpers.percentile( + h.buckets, 95, h.boundaries) + stats[ + "core_http2_send_message_size_99p"] = massage_qps_stats_helpers.percentile( + h.buckets, 99, h.boundaries) + h = massage_qps_stats_helpers.histogram( + core_stats, "http2_send_initial_metadata_per_write") + stats["core_http2_send_initial_metadata_per_write"] = ",".join( + "%f" % x for x in h.buckets) + stats["core_http2_send_initial_metadata_per_write_bkts"] = ",".join( + "%f" % x for x in h.boundaries) + stats[ + "core_http2_send_initial_metadata_per_write_50p"] = massage_qps_stats_helpers.percentile( + h.buckets, 50, h.boundaries) + stats[ + "core_http2_send_initial_metadata_per_write_95p"] = massage_qps_stats_helpers.percentile( + h.buckets, 95, h.boundaries) + stats[ + "core_http2_send_initial_metadata_per_write_99p"] = massage_qps_stats_helpers.percentile( + h.buckets, 99, h.boundaries) + h = massage_qps_stats_helpers.histogram(core_stats, + "http2_send_message_per_write") + stats["core_http2_send_message_per_write"] = ",".join( + "%f" % x for x in h.buckets) + stats["core_http2_send_message_per_write_bkts"] = ",".join( + "%f" % x for x in h.boundaries) + stats[ + "core_http2_send_message_per_write_50p"] = massage_qps_stats_helpers.percentile( + h.buckets, 50, h.boundaries) + stats[ + "core_http2_send_message_per_write_95p"] = massage_qps_stats_helpers.percentile( + h.buckets, 95, h.boundaries) + stats[ + "core_http2_send_message_per_write_99p"] = massage_qps_stats_helpers.percentile( + h.buckets, 99, h.boundaries) + h = massage_qps_stats_helpers.histogram( + core_stats, "http2_send_trailing_metadata_per_write") + stats["core_http2_send_trailing_metadata_per_write"] = ",".join( + "%f" % x for x in h.buckets) + stats["core_http2_send_trailing_metadata_per_write_bkts"] = ",".join( + "%f" % x for x in h.boundaries) + stats[ + "core_http2_send_trailing_metadata_per_write_50p"] = massage_qps_stats_helpers.percentile( + h.buckets, 50, h.boundaries) + stats[ + "core_http2_send_trailing_metadata_per_write_95p"] = massage_qps_stats_helpers.percentile( + h.buckets, 95, h.boundaries) + stats[ + "core_http2_send_trailing_metadata_per_write_99p"] = massage_qps_stats_helpers.percentile( + h.buckets, 99, h.boundaries) + h = massage_qps_stats_helpers.histogram(core_stats, + "http2_send_flowctl_per_write") + stats["core_http2_send_flowctl_per_write"] = ",".join( + "%f" % x for x in h.buckets) + stats["core_http2_send_flowctl_per_write_bkts"] = ",".join( + "%f" % x for x in h.boundaries) + stats[ + "core_http2_send_flowctl_per_write_50p"] = massage_qps_stats_helpers.percentile( + h.buckets, 50, h.boundaries) + stats[ + "core_http2_send_flowctl_per_write_95p"] = massage_qps_stats_helpers.percentile( + h.buckets, 95, h.boundaries) + stats[ + "core_http2_send_flowctl_per_write_99p"] = massage_qps_stats_helpers.percentile( + h.buckets, 99, h.boundaries) + h = massage_qps_stats_helpers.histogram(core_stats, + "server_cqs_checked") + stats["core_server_cqs_checked"] = ",".join("%f" % x for x in h.buckets) + stats["core_server_cqs_checked_bkts"] = ",".join("%f" % x + for x in h.boundaries) + stats[ + "core_server_cqs_checked_50p"] = massage_qps_stats_helpers.percentile( + h.buckets, 50, h.boundaries) + stats[ + "core_server_cqs_checked_95p"] = massage_qps_stats_helpers.percentile( + h.buckets, 95, h.boundaries) + stats[ + "core_server_cqs_checked_99p"] = massage_qps_stats_helpers.percentile( + h.buckets, 99, h.boundaries) diff --git a/tools/run_tests/performance/massage_qps_stats_helpers.py b/tools/run_tests/performance/massage_qps_stats_helpers.py index a2fe4ae6c34..108451cd552 100644 --- a/tools/run_tests/performance/massage_qps_stats_helpers.py +++ b/tools/run_tests/performance/massage_qps_stats_helpers.py @@ -14,44 +14,49 @@ import collections + def _threshold_for_count_below(buckets, boundaries, count_below): - count_so_far = 0 - for lower_idx in range(0, len(buckets)): - count_so_far += buckets[lower_idx] - if count_so_far >= count_below: - break - if count_so_far == count_below: - # this bucket hits the threshold exactly... we should be midway through - # any run of zero values following the bucket - for upper_idx in range(lower_idx + 1, len(buckets)): - if buckets[upper_idx] != 0: - break - return (boundaries[lower_idx] + boundaries[upper_idx]) / 2.0 - else: - # treat values as uniform throughout the bucket, and find where this value - # should lie - lower_bound = boundaries[lower_idx] - upper_bound = boundaries[lower_idx + 1] - return (upper_bound - - (upper_bound - lower_bound) * (count_so_far - count_below) / - float(buckets[lower_idx])) + count_so_far = 0 + for lower_idx in range(0, len(buckets)): + count_so_far += buckets[lower_idx] + if count_so_far >= count_below: + break + if count_so_far == count_below: + # this bucket hits the threshold exactly... we should be midway through + # any run of zero values following the bucket + for upper_idx in range(lower_idx + 1, len(buckets)): + if buckets[upper_idx] != 0: + break + return (boundaries[lower_idx] + boundaries[upper_idx]) / 2.0 + else: + # treat values as uniform throughout the bucket, and find where this value + # should lie + lower_bound = boundaries[lower_idx] + upper_bound = boundaries[lower_idx + 1] + return (upper_bound - (upper_bound - lower_bound) * + (count_so_far - count_below) / float(buckets[lower_idx])) + def percentile(buckets, pctl, boundaries): - return _threshold_for_count_below( - buckets, boundaries, sum(buckets) * pctl / 100.0) + return _threshold_for_count_below(buckets, boundaries, + sum(buckets) * pctl / 100.0) + def counter(core_stats, name): - for stat in core_stats['metrics']: - if stat['name'] == name: - return int(stat.get('count', 0)) + for stat in core_stats['metrics']: + if stat['name'] == name: + return int(stat.get('count', 0)) + Histogram = collections.namedtuple('Histogram', 'buckets boundaries') + + def histogram(core_stats, name): - for stat in core_stats['metrics']: - if stat['name'] == name: - buckets = [] - boundaries = [] - for b in stat['histogram']['buckets']: - buckets.append(int(b.get('count', 0))) - boundaries.append(int(b.get('start', 0))) - return Histogram(buckets=buckets, boundaries=boundaries) + for stat in core_stats['metrics']: + if stat['name'] == name: + buckets = [] + boundaries = [] + for b in stat['histogram']['buckets']: + buckets.append(int(b.get('count', 0))) + boundaries.append(int(b.get('start', 0))) + return Histogram(buckets=buckets, boundaries=boundaries) diff --git a/tools/run_tests/performance/patch_scenario_results_schema.py b/tools/run_tests/performance/patch_scenario_results_schema.py index 81ba5381b3e..2a2aadc242b 100755 --- a/tools/run_tests/performance/patch_scenario_results_schema.py +++ b/tools/run_tests/performance/patch_scenario_results_schema.py @@ -25,27 +25,32 @@ import sys import time import uuid - -gcp_utils_dir = os.path.abspath(os.path.join( - os.path.dirname(__file__), '../../gcp/utils')) +gcp_utils_dir = os.path.abspath( + os.path.join(os.path.dirname(__file__), '../../gcp/utils')) sys.path.append(gcp_utils_dir) import big_query_utils +_PROJECT_ID = 'grpc-testing' -_PROJECT_ID='grpc-testing' def _patch_results_table(dataset_id, table_id): - bq = big_query_utils.create_big_query() - with open(os.path.dirname(__file__) + '/scenario_result_schema.json', 'r') as f: - table_schema = json.loads(f.read()) - desc = 'Results of performance benchmarks.' - return big_query_utils.patch_table(bq, _PROJECT_ID, dataset_id, - table_id, table_schema) - - -argp = argparse.ArgumentParser(description='Patch schema of scenario results table.') -argp.add_argument('--bq_result_table', required=True, default=None, type=str, - help='Bigquery "dataset.table" to patch.') + bq = big_query_utils.create_big_query() + with open(os.path.dirname(__file__) + '/scenario_result_schema.json', + 'r') as f: + table_schema = json.loads(f.read()) + desc = 'Results of performance benchmarks.' + return big_query_utils.patch_table(bq, _PROJECT_ID, dataset_id, table_id, + table_schema) + + +argp = argparse.ArgumentParser( + description='Patch schema of scenario results table.') +argp.add_argument( + '--bq_result_table', + required=True, + default=None, + type=str, + help='Bigquery "dataset.table" to patch.') args = argp.parse_args() diff --git a/tools/run_tests/performance/scenario_config.py b/tools/run_tests/performance/scenario_config.py index cafac3dfad0..e92de5898c5 100644 --- a/tools/run_tests/performance/scenario_config.py +++ b/tools/run_tests/performance/scenario_config.py @@ -16,66 +16,64 @@ import math -WARMUP_SECONDS=5 -JAVA_WARMUP_SECONDS=15 # Java needs more warmup time for JIT to kick in. -BENCHMARK_SECONDS=30 - -SMOKETEST='smoketest' -SCALABLE='scalable' -INPROC='inproc' -SWEEP='sweep' -DEFAULT_CATEGORIES=[SCALABLE, SMOKETEST] - -SECURE_SECARGS = {'use_test_ca': True, - 'server_host_override': 'foo.test.google.fr'} +WARMUP_SECONDS = 5 +JAVA_WARMUP_SECONDS = 15 # Java needs more warmup time for JIT to kick in. +BENCHMARK_SECONDS = 30 + +SMOKETEST = 'smoketest' +SCALABLE = 'scalable' +INPROC = 'inproc' +SWEEP = 'sweep' +DEFAULT_CATEGORIES = [SCALABLE, SMOKETEST] + +SECURE_SECARGS = { + 'use_test_ca': True, + 'server_host_override': 'foo.test.google.fr' +} HISTOGRAM_PARAMS = { - 'resolution': 0.01, - 'max_possible': 60e9, + 'resolution': 0.01, + 'max_possible': 60e9, } # target number of RPCs outstanding on across all client channels in # non-ping-pong tests (since we can only specify per-channel numbers, the # actual target will be slightly higher) -OUTSTANDING_REQUESTS={ - 'async': 6400, - 'async-limited': 800, - 'sync': 1000 -} +OUTSTANDING_REQUESTS = {'async': 6400, 'async-limited': 800, 'sync': 1000} # wide is the number of client channels in multi-channel tests (1 otherwise) -WIDE=64 +WIDE = 64 def _get_secargs(is_secure): - if is_secure: - return SECURE_SECARGS - else: - return None + if is_secure: + return SECURE_SECARGS + else: + return None def remove_nonproto_fields(scenario): - """Remove special-purpose that contains some extra info about the scenario + """Remove special-purpose that contains some extra info about the scenario but don't belong to the ScenarioConfig protobuf message""" - scenario.pop('CATEGORIES', None) - scenario.pop('CLIENT_LANGUAGE', None) - scenario.pop('SERVER_LANGUAGE', None) - scenario.pop('EXCLUDED_POLL_ENGINES', None) - return scenario + scenario.pop('CATEGORIES', None) + scenario.pop('CLIENT_LANGUAGE', None) + scenario.pop('SERVER_LANGUAGE', None) + scenario.pop('EXCLUDED_POLL_ENGINES', None) + return scenario def geometric_progression(start, stop, step): - n = start - while n < stop: - yield int(round(n)) - n *= step + n = start + while n < stop: + yield int(round(n)) + n *= step def _payload_type(use_generic_payload, req_size, resp_size): r = {} sizes = { - 'req_size': req_size, - 'resp_size': resp_size, + 'req_size': req_size, + 'resp_size': resp_size, } if use_generic_payload: r['bytebuf_params'] = sizes @@ -83,6 +81,7 @@ def _payload_type(use_generic_payload, req_size, resp_size): r['simple_params'] = sizes return r + def _load_params(offered_load): r = {} if offered_load is None: @@ -93,21 +92,25 @@ def _load_params(offered_load): r['poisson'] = load return r + def _add_channel_arg(config, key, value): - if 'channel_args' in config: - channel_args = config['channel_args'] - else: - channel_args = [] - config['channel_args'] = channel_args - arg = {'name': key} - if isinstance(value, int): - arg['int_value'] = value - else: - arg['str_value'] = value - channel_args.append(arg) - -def _ping_pong_scenario(name, rpc_type, - client_type, server_type, + if 'channel_args' in config: + channel_args = config['channel_args'] + else: + channel_args = [] + config['channel_args'] = channel_args + arg = {'name': key} + if isinstance(value, int): + arg['int_value'] = value + else: + arg['str_value'] = value + channel_args.append(arg) + + +def _ping_pong_scenario(name, + rpc_type, + client_type, + server_type, secure=True, use_generic_payload=False, req_size=0, @@ -128,824 +131,1029 @@ def _ping_pong_scenario(name, rpc_type, excluded_poll_engines=[], minimal_stack=False, offered_load=None): - """Creates a basic ping pong scenario.""" - scenario = { - 'name': name, - 'num_servers': 1, - 'num_clients': 1, - 'client_config': { - 'client_type': client_type, - 'security_params': _get_secargs(secure), - 'outstanding_rpcs_per_channel': 1, - 'client_channels': 1, - 'async_client_threads': 1, - 'threads_per_cq': client_threads_per_cq, - 'rpc_type': rpc_type, - 'histogram_params': HISTOGRAM_PARAMS, - 'channel_args': [], - }, - 'server_config': { - 'server_type': server_type, - 'security_params': _get_secargs(secure), - 'async_server_threads': async_server_threads, - 'threads_per_cq': server_threads_per_cq, - 'channel_args': [], - }, - 'warmup_seconds': warmup_seconds, - 'benchmark_seconds': BENCHMARK_SECONDS - } - if resource_quota_size: - scenario['server_config']['resource_quota_size'] = resource_quota_size - if use_generic_payload: - if server_type != 'ASYNC_GENERIC_SERVER': - raise Exception('Use ASYNC_GENERIC_SERVER for generic payload.') - scenario['server_config']['payload_config'] = _payload_type(use_generic_payload, req_size, resp_size) - - scenario['client_config']['payload_config'] = _payload_type(use_generic_payload, req_size, resp_size) - - # Optimization target of 'throughput' does not work well with epoll1 polling - # engine. Use the default value of 'blend' - optimization_target = 'throughput' - - if unconstrained_client: - outstanding_calls = outstanding if outstanding is not None else OUTSTANDING_REQUESTS[unconstrained_client] - # clamp buffer usage to something reasonable (16 gig for now) - MAX_MEMORY_USE = 16 * 1024 * 1024 * 1024 - if outstanding_calls * max(req_size, resp_size) > MAX_MEMORY_USE: - outstanding_calls = max(1, MAX_MEMORY_USE / max(req_size, resp_size)) - wide = channels if channels is not None else WIDE - deep = int(math.ceil(1.0 * outstanding_calls / wide)) - - scenario['num_clients'] = num_clients if num_clients is not None else 0 # use as many clients as available. - scenario['client_config']['outstanding_rpcs_per_channel'] = deep - scenario['client_config']['client_channels'] = wide - scenario['client_config']['async_client_threads'] = 0 - if offered_load is not None: + """Creates a basic ping pong scenario.""" + scenario = { + 'name': name, + 'num_servers': 1, + 'num_clients': 1, + 'client_config': { + 'client_type': client_type, + 'security_params': _get_secargs(secure), + 'outstanding_rpcs_per_channel': 1, + 'client_channels': 1, + 'async_client_threads': 1, + 'threads_per_cq': client_threads_per_cq, + 'rpc_type': rpc_type, + 'histogram_params': HISTOGRAM_PARAMS, + 'channel_args': [], + }, + 'server_config': { + 'server_type': server_type, + 'security_params': _get_secargs(secure), + 'async_server_threads': async_server_threads, + 'threads_per_cq': server_threads_per_cq, + 'channel_args': [], + }, + 'warmup_seconds': warmup_seconds, + 'benchmark_seconds': BENCHMARK_SECONDS + } + if resource_quota_size: + scenario['server_config']['resource_quota_size'] = resource_quota_size + if use_generic_payload: + if server_type != 'ASYNC_GENERIC_SERVER': + raise Exception('Use ASYNC_GENERIC_SERVER for generic payload.') + scenario['server_config']['payload_config'] = _payload_type( + use_generic_payload, req_size, resp_size) + + scenario['client_config']['payload_config'] = _payload_type( + use_generic_payload, req_size, resp_size) + + # Optimization target of 'throughput' does not work well with epoll1 polling + # engine. Use the default value of 'blend' + optimization_target = 'throughput' + + if unconstrained_client: + outstanding_calls = outstanding if outstanding is not None else OUTSTANDING_REQUESTS[ + unconstrained_client] + # clamp buffer usage to something reasonable (16 gig for now) + MAX_MEMORY_USE = 16 * 1024 * 1024 * 1024 + if outstanding_calls * max(req_size, resp_size) > MAX_MEMORY_USE: + outstanding_calls = max(1, MAX_MEMORY_USE / max(req_size, + resp_size)) + wide = channels if channels is not None else WIDE + deep = int(math.ceil(1.0 * outstanding_calls / wide)) + + scenario[ + 'num_clients'] = num_clients if num_clients is not None else 0 # use as many clients as available. + scenario['client_config']['outstanding_rpcs_per_channel'] = deep + scenario['client_config']['client_channels'] = wide + scenario['client_config']['async_client_threads'] = 0 + if offered_load is not None: + optimization_target = 'latency' + else: + scenario['client_config']['outstanding_rpcs_per_channel'] = 1 + scenario['client_config']['client_channels'] = 1 + scenario['client_config']['async_client_threads'] = 1 optimization_target = 'latency' - else: - scenario['client_config']['outstanding_rpcs_per_channel'] = 1 - scenario['client_config']['client_channels'] = 1 - scenario['client_config']['async_client_threads'] = 1 - optimization_target = 'latency' - - scenario['client_config']['load_params'] = _load_params(offered_load) - - optimization_channel_arg = { - 'name': 'grpc.optimization_target', - 'str_value': optimization_target - } - scenario['client_config']['channel_args'].append(optimization_channel_arg) - scenario['server_config']['channel_args'].append(optimization_channel_arg) - - if minimal_stack: - _add_channel_arg(scenario['client_config'], 'grpc.minimal_stack', 1) - _add_channel_arg(scenario['server_config'], 'grpc.minimal_stack', 1) - - if messages_per_stream: - scenario['client_config']['messages_per_stream'] = messages_per_stream - if client_language: - # the CLIENT_LANGUAGE field is recognized by run_performance_tests.py - scenario['CLIENT_LANGUAGE'] = client_language - if server_language: - # the SERVER_LANGUAGE field is recognized by run_performance_tests.py - scenario['SERVER_LANGUAGE'] = server_language - if categories: - scenario['CATEGORIES'] = categories - if len(excluded_poll_engines): - # The polling engines for which this scenario is excluded - scenario['EXCLUDED_POLL_ENGINES'] = excluded_poll_engines - return scenario + + scenario['client_config']['load_params'] = _load_params(offered_load) + + optimization_channel_arg = { + 'name': 'grpc.optimization_target', + 'str_value': optimization_target + } + scenario['client_config']['channel_args'].append(optimization_channel_arg) + scenario['server_config']['channel_args'].append(optimization_channel_arg) + + if minimal_stack: + _add_channel_arg(scenario['client_config'], 'grpc.minimal_stack', 1) + _add_channel_arg(scenario['server_config'], 'grpc.minimal_stack', 1) + + if messages_per_stream: + scenario['client_config']['messages_per_stream'] = messages_per_stream + if client_language: + # the CLIENT_LANGUAGE field is recognized by run_performance_tests.py + scenario['CLIENT_LANGUAGE'] = client_language + if server_language: + # the SERVER_LANGUAGE field is recognized by run_performance_tests.py + scenario['SERVER_LANGUAGE'] = server_language + if categories: + scenario['CATEGORIES'] = categories + if len(excluded_poll_engines): + # The polling engines for which this scenario is excluded + scenario['EXCLUDED_POLL_ENGINES'] = excluded_poll_engines + return scenario class CXXLanguage: - def __init__(self): - self.safename = 'cxx' - - def worker_cmdline(self): - return ['bins/opt/qps_worker'] - - def worker_port_offset(self): - return 0 - - def scenarios(self): - # TODO(ctiller): add 70% load latency test - yield _ping_pong_scenario( - 'cpp_protobuf_async_unary_1channel_100rpcs_1MB', rpc_type='UNARY', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - req_size=1024*1024, resp_size=1024*1024, - unconstrained_client='async', outstanding=100, channels=1, - num_clients=1, - secure=False, - categories=[SMOKETEST] + [INPROC] + [SCALABLE]) - - yield _ping_pong_scenario( - 'cpp_protobuf_async_streaming_from_client_1channel_1MB', rpc_type='STREAMING_FROM_CLIENT', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - req_size=1024*1024, resp_size=1024*1024, - unconstrained_client='async', outstanding=1, channels=1, - num_clients=1, - secure=False, - categories=[SMOKETEST] + [INPROC] + [SCALABLE]) - - yield _ping_pong_scenario( - 'cpp_protobuf_async_unary_75Kqps_600channel_60Krpcs_300Breq_50Bresp', - rpc_type='UNARY', client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - req_size=300, resp_size=50, - unconstrained_client='async', outstanding=30000, channels=300, - offered_load=37500, secure=False, - async_server_threads=16, server_threads_per_cq=1, - categories=[SMOKETEST] + [SCALABLE]) - - for secure in [True, False]: - secstr = 'secure' if secure else 'insecure' - smoketest_categories = ([SMOKETEST] if secure else [INPROC]) + [SCALABLE] - - yield _ping_pong_scenario( - 'cpp_generic_async_streaming_ping_pong_%s' % secstr, - rpc_type='STREAMING', - client_type='ASYNC_CLIENT', - server_type='ASYNC_GENERIC_SERVER', - use_generic_payload=True, async_server_threads=1, - secure=secure, - categories=smoketest_categories) - - yield _ping_pong_scenario( - 'cpp_generic_async_streaming_qps_unconstrained_%s' % secstr, - rpc_type='STREAMING', - client_type='ASYNC_CLIENT', - server_type='ASYNC_GENERIC_SERVER', - unconstrained_client='async', use_generic_payload=True, - secure=secure, - minimal_stack=not secure, - categories=smoketest_categories+[SCALABLE]) - - for mps in geometric_progression(1, 20, 10): - yield _ping_pong_scenario( - 'cpp_generic_async_streaming_qps_unconstrained_%smps_%s' % (mps, secstr), - rpc_type='STREAMING', + def __init__(self): + self.safename = 'cxx' + + def worker_cmdline(self): + return ['bins/opt/qps_worker'] + + def worker_port_offset(self): + return 0 + + def scenarios(self): + # TODO(ctiller): add 70% load latency test + yield _ping_pong_scenario( + 'cpp_protobuf_async_unary_1channel_100rpcs_1MB', + rpc_type='UNARY', client_type='ASYNC_CLIENT', - server_type='ASYNC_GENERIC_SERVER', - unconstrained_client='async', use_generic_payload=True, - secure=secure, messages_per_stream=mps, - minimal_stack=not secure, - categories=smoketest_categories+[SCALABLE]) + server_type='ASYNC_SERVER', + req_size=1024 * 1024, + resp_size=1024 * 1024, + unconstrained_client='async', + outstanding=100, + channels=1, + num_clients=1, + secure=False, + categories=[SMOKETEST] + [INPROC] + [SCALABLE]) - for mps in geometric_progression(1, 200, math.sqrt(10)): yield _ping_pong_scenario( - 'cpp_generic_async_streaming_qps_unconstrained_%smps_%s' % (mps, secstr), - rpc_type='STREAMING', + 'cpp_protobuf_async_streaming_from_client_1channel_1MB', + rpc_type='STREAMING_FROM_CLIENT', client_type='ASYNC_CLIENT', - server_type='ASYNC_GENERIC_SERVER', - unconstrained_client='async', use_generic_payload=True, - secure=secure, messages_per_stream=mps, - minimal_stack=not secure, - categories=[SWEEP]) - - yield _ping_pong_scenario( - 'cpp_generic_async_streaming_qps_1channel_1MBmsg_%s' % secstr, - rpc_type='STREAMING', - req_size=1024*1024, - resp_size=1024*1024, - client_type='ASYNC_CLIENT', - server_type='ASYNC_GENERIC_SERVER', - unconstrained_client='async', use_generic_payload=True, - secure=secure, - minimal_stack=not secure, - categories=smoketest_categories+[SCALABLE], - channels=1, outstanding=100) - - yield _ping_pong_scenario( - 'cpp_generic_async_streaming_qps_unconstrained_64KBmsg_%s' % secstr, - rpc_type='STREAMING', - req_size=64*1024, - resp_size=64*1024, - client_type='ASYNC_CLIENT', - server_type='ASYNC_GENERIC_SERVER', - unconstrained_client='async', use_generic_payload=True, - secure=secure, - minimal_stack=not secure, - categories=smoketest_categories+[SCALABLE]) - - # TODO(https://github.com/grpc/grpc/issues/11500) Re-enable this test - #yield _ping_pong_scenario( - # 'cpp_generic_async_streaming_qps_unconstrained_1cq_%s' % secstr, - # rpc_type='STREAMING', - # client_type='ASYNC_CLIENT', - # server_type='ASYNC_GENERIC_SERVER', - # unconstrained_client='async-limited', use_generic_payload=True, - # secure=secure, - # client_threads_per_cq=1000000, server_threads_per_cq=1000000, - # categories=smoketest_categories+[SCALABLE]) - - yield _ping_pong_scenario( - 'cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_%s' % secstr, - rpc_type='STREAMING', - client_type='ASYNC_CLIENT', - server_type='ASYNC_GENERIC_SERVER', - unconstrained_client='async', use_generic_payload=True, - secure=secure, - client_threads_per_cq=2, server_threads_per_cq=2, - categories=smoketest_categories+[SCALABLE]) - - #yield _ping_pong_scenario( - # 'cpp_protobuf_async_streaming_qps_unconstrained_1cq_%s' % secstr, - # rpc_type='STREAMING', - # client_type='ASYNC_CLIENT', - # server_type='ASYNC_SERVER', - # unconstrained_client='async-limited', - # secure=secure, - # client_threads_per_cq=1000000, server_threads_per_cq=1000000, - # categories=smoketest_categories+[SCALABLE]) - - yield _ping_pong_scenario( - 'cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_%s' % secstr, - rpc_type='STREAMING', - client_type='ASYNC_CLIENT', - server_type='ASYNC_SERVER', - unconstrained_client='async', - secure=secure, - client_threads_per_cq=2, server_threads_per_cq=2, - categories=smoketest_categories+[SCALABLE]) - - #yield _ping_pong_scenario( - # 'cpp_protobuf_async_unary_qps_unconstrained_1cq_%s' % secstr, - # rpc_type='UNARY', - # client_type='ASYNC_CLIENT', - # server_type='ASYNC_SERVER', - # unconstrained_client='async-limited', - # secure=secure, - # client_threads_per_cq=1000000, server_threads_per_cq=1000000, - # categories=smoketest_categories+[SCALABLE]) - - yield _ping_pong_scenario( - 'cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_%s' % secstr, - rpc_type='UNARY', - client_type='ASYNC_CLIENT', - server_type='ASYNC_SERVER', - unconstrained_client='async', - secure=secure, - client_threads_per_cq=2, server_threads_per_cq=2, - categories=smoketest_categories+[SCALABLE]) - - yield _ping_pong_scenario( - 'cpp_generic_async_streaming_qps_one_server_core_%s' % secstr, - rpc_type='STREAMING', - client_type='ASYNC_CLIENT', - server_type='ASYNC_GENERIC_SERVER', - unconstrained_client='async-limited', use_generic_payload=True, - async_server_threads=1, - minimal_stack=not secure, - secure=secure) - - yield _ping_pong_scenario( - 'cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_%s' % - (secstr), - rpc_type='UNARY', - client_type='ASYNC_CLIENT', - server_type='SYNC_SERVER', - unconstrained_client='async', - secure=secure, - minimal_stack=not secure, - categories=smoketest_categories + [SCALABLE], - excluded_poll_engines = ['poll-cv']) - - yield _ping_pong_scenario( - 'cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_%s' % - (secstr), - rpc_type='UNARY', - client_type='ASYNC_CLIENT', - server_type='ASYNC_SERVER', - channels=1, - outstanding=64, - req_size=128, - resp_size=8*1024*1024, - secure=secure, - minimal_stack=not secure, - categories=smoketest_categories + [SCALABLE]) - - yield _ping_pong_scenario( - 'cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_%s' % secstr, - rpc_type='STREAMING', - client_type='ASYNC_CLIENT', - server_type='SYNC_SERVER', - unconstrained_client='async', - secure=secure, - minimal_stack=not secure, - categories=smoketest_categories+[SCALABLE], - excluded_poll_engines = ['poll-cv']) - - yield _ping_pong_scenario( - 'cpp_protobuf_async_unary_ping_pong_%s_1MB' % secstr, rpc_type='UNARY', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - req_size=1024*1024, resp_size=1024*1024, - secure=secure, - minimal_stack=not secure, - categories=smoketest_categories + [SCALABLE]) - - for rpc_type in ['unary', 'streaming', 'streaming_from_client', 'streaming_from_server']: - for synchronicity in ['sync', 'async']: - yield _ping_pong_scenario( - 'cpp_protobuf_%s_%s_ping_pong_%s' % (synchronicity, rpc_type, secstr), - rpc_type=rpc_type.upper(), - client_type='%s_CLIENT' % synchronicity.upper(), - server_type='%s_SERVER' % synchronicity.upper(), - async_server_threads=1, - minimal_stack=not secure, - secure=secure) - - for size in geometric_progression(1, 1024*1024*1024+1, 8): - yield _ping_pong_scenario( - 'cpp_protobuf_%s_%s_qps_unconstrained_%s_%db' % (synchronicity, rpc_type, secstr, size), - rpc_type=rpc_type.upper(), - req_size=size, - resp_size=size, - client_type='%s_CLIENT' % synchronicity.upper(), - server_type='%s_SERVER' % synchronicity.upper(), - unconstrained_client=synchronicity, - secure=secure, - minimal_stack=not secure, - categories=[SWEEP]) - - yield _ping_pong_scenario( - 'cpp_protobuf_%s_%s_qps_unconstrained_%s' % (synchronicity, rpc_type, secstr), - rpc_type=rpc_type.upper(), - client_type='%s_CLIENT' % synchronicity.upper(), - server_type='%s_SERVER' % synchronicity.upper(), - unconstrained_client=synchronicity, - secure=secure, - minimal_stack=not secure, - server_threads_per_cq=3, - client_threads_per_cq=3, - categories=smoketest_categories+[SCALABLE]) - - # TODO(vjpai): Re-enable this test. It has a lot of timeouts - # and hasn't yet been conclusively identified as a test failure - # or race in the library - # yield _ping_pong_scenario( - # 'cpp_protobuf_%s_%s_qps_unconstrained_%s_500kib_resource_quota' % (synchronicity, rpc_type, secstr), - # rpc_type=rpc_type.upper(), - # client_type='%s_CLIENT' % synchronicity.upper(), - # server_type='%s_SERVER' % synchronicity.upper(), - # unconstrained_client=synchronicity, - # secure=secure, - # categories=smoketest_categories+[SCALABLE], - # resource_quota_size=500*1024) - - if rpc_type == 'streaming': + server_type='ASYNC_SERVER', + req_size=1024 * 1024, + resp_size=1024 * 1024, + unconstrained_client='async', + outstanding=1, + channels=1, + num_clients=1, + secure=False, + categories=[SMOKETEST] + [INPROC] + [SCALABLE]) + + yield _ping_pong_scenario( + 'cpp_protobuf_async_unary_75Kqps_600channel_60Krpcs_300Breq_50Bresp', + rpc_type='UNARY', + client_type='ASYNC_CLIENT', + server_type='ASYNC_SERVER', + req_size=300, + resp_size=50, + unconstrained_client='async', + outstanding=30000, + channels=300, + offered_load=37500, + secure=False, + async_server_threads=16, + server_threads_per_cq=1, + categories=[SMOKETEST] + [SCALABLE]) + + for secure in [True, False]: + secstr = 'secure' if secure else 'insecure' + smoketest_categories = ([SMOKETEST] + if secure else [INPROC]) + [SCALABLE] + + yield _ping_pong_scenario( + 'cpp_generic_async_streaming_ping_pong_%s' % secstr, + rpc_type='STREAMING', + client_type='ASYNC_CLIENT', + server_type='ASYNC_GENERIC_SERVER', + use_generic_payload=True, + async_server_threads=1, + secure=secure, + categories=smoketest_categories) + + yield _ping_pong_scenario( + 'cpp_generic_async_streaming_qps_unconstrained_%s' % secstr, + rpc_type='STREAMING', + client_type='ASYNC_CLIENT', + server_type='ASYNC_GENERIC_SERVER', + unconstrained_client='async', + use_generic_payload=True, + secure=secure, + minimal_stack=not secure, + categories=smoketest_categories + [SCALABLE]) + for mps in geometric_progression(1, 20, 10): - yield _ping_pong_scenario( - 'cpp_protobuf_%s_%s_qps_unconstrained_%smps_%s' % (synchronicity, rpc_type, mps, secstr), - rpc_type=rpc_type.upper(), - client_type='%s_CLIENT' % synchronicity.upper(), - server_type='%s_SERVER' % synchronicity.upper(), - unconstrained_client=synchronicity, - secure=secure, messages_per_stream=mps, - minimal_stack=not secure, - categories=smoketest_categories+[SCALABLE]) + yield _ping_pong_scenario( + 'cpp_generic_async_streaming_qps_unconstrained_%smps_%s' % + (mps, secstr), + rpc_type='STREAMING', + client_type='ASYNC_CLIENT', + server_type='ASYNC_GENERIC_SERVER', + unconstrained_client='async', + use_generic_payload=True, + secure=secure, + messages_per_stream=mps, + minimal_stack=not secure, + categories=smoketest_categories + [SCALABLE]) for mps in geometric_progression(1, 200, math.sqrt(10)): - yield _ping_pong_scenario( - 'cpp_protobuf_%s_%s_qps_unconstrained_%smps_%s' % (synchronicity, rpc_type, mps, secstr), - rpc_type=rpc_type.upper(), - client_type='%s_CLIENT' % synchronicity.upper(), - server_type='%s_SERVER' % synchronicity.upper(), - unconstrained_client=synchronicity, - secure=secure, messages_per_stream=mps, - minimal_stack=not secure, - categories=[SWEEP]) - - for channels in geometric_progression(1, 20000, math.sqrt(10)): - for outstanding in geometric_progression(1, 200000, math.sqrt(10)): - if synchronicity == 'sync' and outstanding > 1200: continue - if outstanding < channels: continue yield _ping_pong_scenario( - 'cpp_protobuf_%s_%s_qps_unconstrained_%s_%d_channels_%d_outstanding' % (synchronicity, rpc_type, secstr, channels, outstanding), - rpc_type=rpc_type.upper(), - client_type='%s_CLIENT' % synchronicity.upper(), - server_type='%s_SERVER' % synchronicity.upper(), - unconstrained_client=synchronicity, secure=secure, + 'cpp_generic_async_streaming_qps_unconstrained_%smps_%s' % + (mps, secstr), + rpc_type='STREAMING', + client_type='ASYNC_CLIENT', + server_type='ASYNC_GENERIC_SERVER', + unconstrained_client='async', + use_generic_payload=True, + secure=secure, + messages_per_stream=mps, minimal_stack=not secure, - categories=[SWEEP], channels=channels, outstanding=outstanding) - - def __str__(self): - return 'c++' + categories=[SWEEP]) + + yield _ping_pong_scenario( + 'cpp_generic_async_streaming_qps_1channel_1MBmsg_%s' % secstr, + rpc_type='STREAMING', + req_size=1024 * 1024, + resp_size=1024 * 1024, + client_type='ASYNC_CLIENT', + server_type='ASYNC_GENERIC_SERVER', + unconstrained_client='async', + use_generic_payload=True, + secure=secure, + minimal_stack=not secure, + categories=smoketest_categories + [SCALABLE], + channels=1, + outstanding=100) + + yield _ping_pong_scenario( + 'cpp_generic_async_streaming_qps_unconstrained_64KBmsg_%s' % + secstr, + rpc_type='STREAMING', + req_size=64 * 1024, + resp_size=64 * 1024, + client_type='ASYNC_CLIENT', + server_type='ASYNC_GENERIC_SERVER', + unconstrained_client='async', + use_generic_payload=True, + secure=secure, + minimal_stack=not secure, + categories=smoketest_categories + [SCALABLE]) + + # TODO(https://github.com/grpc/grpc/issues/11500) Re-enable this test + #yield _ping_pong_scenario( + # 'cpp_generic_async_streaming_qps_unconstrained_1cq_%s' % secstr, + # rpc_type='STREAMING', + # client_type='ASYNC_CLIENT', + # server_type='ASYNC_GENERIC_SERVER', + # unconstrained_client='async-limited', use_generic_payload=True, + # secure=secure, + # client_threads_per_cq=1000000, server_threads_per_cq=1000000, + # categories=smoketest_categories+[SCALABLE]) + + yield _ping_pong_scenario( + 'cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_%s' + % secstr, + rpc_type='STREAMING', + client_type='ASYNC_CLIENT', + server_type='ASYNC_GENERIC_SERVER', + unconstrained_client='async', + use_generic_payload=True, + secure=secure, + client_threads_per_cq=2, + server_threads_per_cq=2, + categories=smoketest_categories + [SCALABLE]) + + #yield _ping_pong_scenario( + # 'cpp_protobuf_async_streaming_qps_unconstrained_1cq_%s' % secstr, + # rpc_type='STREAMING', + # client_type='ASYNC_CLIENT', + # server_type='ASYNC_SERVER', + # unconstrained_client='async-limited', + # secure=secure, + # client_threads_per_cq=1000000, server_threads_per_cq=1000000, + # categories=smoketest_categories+[SCALABLE]) + + yield _ping_pong_scenario( + 'cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_%s' + % secstr, + rpc_type='STREAMING', + client_type='ASYNC_CLIENT', + server_type='ASYNC_SERVER', + unconstrained_client='async', + secure=secure, + client_threads_per_cq=2, + server_threads_per_cq=2, + categories=smoketest_categories + [SCALABLE]) + + #yield _ping_pong_scenario( + # 'cpp_protobuf_async_unary_qps_unconstrained_1cq_%s' % secstr, + # rpc_type='UNARY', + # client_type='ASYNC_CLIENT', + # server_type='ASYNC_SERVER', + # unconstrained_client='async-limited', + # secure=secure, + # client_threads_per_cq=1000000, server_threads_per_cq=1000000, + # categories=smoketest_categories+[SCALABLE]) + + yield _ping_pong_scenario( + 'cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_%s' % + secstr, + rpc_type='UNARY', + client_type='ASYNC_CLIENT', + server_type='ASYNC_SERVER', + unconstrained_client='async', + secure=secure, + client_threads_per_cq=2, + server_threads_per_cq=2, + categories=smoketest_categories + [SCALABLE]) + + yield _ping_pong_scenario( + 'cpp_generic_async_streaming_qps_one_server_core_%s' % secstr, + rpc_type='STREAMING', + client_type='ASYNC_CLIENT', + server_type='ASYNC_GENERIC_SERVER', + unconstrained_client='async-limited', + use_generic_payload=True, + async_server_threads=1, + minimal_stack=not secure, + secure=secure) + + yield _ping_pong_scenario( + 'cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_%s' + % (secstr), + rpc_type='UNARY', + client_type='ASYNC_CLIENT', + server_type='SYNC_SERVER', + unconstrained_client='async', + secure=secure, + minimal_stack=not secure, + categories=smoketest_categories + [SCALABLE], + excluded_poll_engines=['poll-cv']) + + yield _ping_pong_scenario( + 'cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_%s' + % (secstr), + rpc_type='UNARY', + client_type='ASYNC_CLIENT', + server_type='ASYNC_SERVER', + channels=1, + outstanding=64, + req_size=128, + resp_size=8 * 1024 * 1024, + secure=secure, + minimal_stack=not secure, + categories=smoketest_categories + [SCALABLE]) + + yield _ping_pong_scenario( + 'cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_%s' + % secstr, + rpc_type='STREAMING', + client_type='ASYNC_CLIENT', + server_type='SYNC_SERVER', + unconstrained_client='async', + secure=secure, + minimal_stack=not secure, + categories=smoketest_categories + [SCALABLE], + excluded_poll_engines=['poll-cv']) + + yield _ping_pong_scenario( + 'cpp_protobuf_async_unary_ping_pong_%s_1MB' % secstr, + rpc_type='UNARY', + client_type='ASYNC_CLIENT', + server_type='ASYNC_SERVER', + req_size=1024 * 1024, + resp_size=1024 * 1024, + secure=secure, + minimal_stack=not secure, + categories=smoketest_categories + [SCALABLE]) + + for rpc_type in [ + 'unary', 'streaming', 'streaming_from_client', + 'streaming_from_server' + ]: + for synchronicity in ['sync', 'async']: + yield _ping_pong_scenario( + 'cpp_protobuf_%s_%s_ping_pong_%s' % + (synchronicity, rpc_type, secstr), + rpc_type=rpc_type.upper(), + client_type='%s_CLIENT' % synchronicity.upper(), + server_type='%s_SERVER' % synchronicity.upper(), + async_server_threads=1, + minimal_stack=not secure, + secure=secure) + + for size in geometric_progression(1, 1024 * 1024 * 1024 + 1, + 8): + yield _ping_pong_scenario( + 'cpp_protobuf_%s_%s_qps_unconstrained_%s_%db' % + (synchronicity, rpc_type, secstr, size), + rpc_type=rpc_type.upper(), + req_size=size, + resp_size=size, + client_type='%s_CLIENT' % synchronicity.upper(), + server_type='%s_SERVER' % synchronicity.upper(), + unconstrained_client=synchronicity, + secure=secure, + minimal_stack=not secure, + categories=[SWEEP]) + + yield _ping_pong_scenario( + 'cpp_protobuf_%s_%s_qps_unconstrained_%s' % + (synchronicity, rpc_type, secstr), + rpc_type=rpc_type.upper(), + client_type='%s_CLIENT' % synchronicity.upper(), + server_type='%s_SERVER' % synchronicity.upper(), + unconstrained_client=synchronicity, + secure=secure, + minimal_stack=not secure, + server_threads_per_cq=3, + client_threads_per_cq=3, + categories=smoketest_categories + [SCALABLE]) + + # TODO(vjpai): Re-enable this test. It has a lot of timeouts + # and hasn't yet been conclusively identified as a test failure + # or race in the library + # yield _ping_pong_scenario( + # 'cpp_protobuf_%s_%s_qps_unconstrained_%s_500kib_resource_quota' % (synchronicity, rpc_type, secstr), + # rpc_type=rpc_type.upper(), + # client_type='%s_CLIENT' % synchronicity.upper(), + # server_type='%s_SERVER' % synchronicity.upper(), + # unconstrained_client=synchronicity, + # secure=secure, + # categories=smoketest_categories+[SCALABLE], + # resource_quota_size=500*1024) + + if rpc_type == 'streaming': + for mps in geometric_progression(1, 20, 10): + yield _ping_pong_scenario( + 'cpp_protobuf_%s_%s_qps_unconstrained_%smps_%s' + % (synchronicity, rpc_type, mps, secstr), + rpc_type=rpc_type.upper(), + client_type='%s_CLIENT' % synchronicity.upper(), + server_type='%s_SERVER' % synchronicity.upper(), + unconstrained_client=synchronicity, + secure=secure, + messages_per_stream=mps, + minimal_stack=not secure, + categories=smoketest_categories + [SCALABLE]) + + for mps in geometric_progression(1, 200, math.sqrt(10)): + yield _ping_pong_scenario( + 'cpp_protobuf_%s_%s_qps_unconstrained_%smps_%s' + % (synchronicity, rpc_type, mps, secstr), + rpc_type=rpc_type.upper(), + client_type='%s_CLIENT' % synchronicity.upper(), + server_type='%s_SERVER' % synchronicity.upper(), + unconstrained_client=synchronicity, + secure=secure, + messages_per_stream=mps, + minimal_stack=not secure, + categories=[SWEEP]) + + for channels in geometric_progression(1, 20000, + math.sqrt(10)): + for outstanding in geometric_progression(1, 200000, + math.sqrt(10)): + if synchronicity == 'sync' and outstanding > 1200: + continue + if outstanding < channels: continue + yield _ping_pong_scenario( + 'cpp_protobuf_%s_%s_qps_unconstrained_%s_%d_channels_%d_outstanding' + % (synchronicity, rpc_type, secstr, channels, + outstanding), + rpc_type=rpc_type.upper(), + client_type='%s_CLIENT' % synchronicity.upper(), + server_type='%s_SERVER' % synchronicity.upper(), + unconstrained_client=synchronicity, + secure=secure, + minimal_stack=not secure, + categories=[SWEEP], + channels=channels, + outstanding=outstanding) + + def __str__(self): + return 'c++' class CSharpLanguage: - def __init__(self): - self.safename = str(self) - - def worker_cmdline(self): - return ['tools/run_tests/performance/run_worker_csharp.sh'] - - def worker_port_offset(self): - return 100 - - def scenarios(self): - yield _ping_pong_scenario( - 'csharp_generic_async_streaming_ping_pong', rpc_type='STREAMING', - client_type='ASYNC_CLIENT', server_type='ASYNC_GENERIC_SERVER', - use_generic_payload=True, - categories=[SMOKETEST, SCALABLE]) - - yield _ping_pong_scenario( - 'csharp_generic_async_streaming_ping_pong_insecure_1MB', rpc_type='STREAMING', - client_type='ASYNC_CLIENT', server_type='ASYNC_GENERIC_SERVER', - req_size=1024*1024, resp_size=1024*1024, - use_generic_payload=True, - secure=False, - categories=[SMOKETEST, SCALABLE]) - - yield _ping_pong_scenario( - 'csharp_generic_async_streaming_qps_unconstrained_insecure', rpc_type='STREAMING', - client_type='ASYNC_CLIENT', server_type='ASYNC_GENERIC_SERVER', - unconstrained_client='async', use_generic_payload=True, - secure=False, - categories=[SMOKETEST, SCALABLE]) - - yield _ping_pong_scenario( - 'csharp_protobuf_async_streaming_ping_pong', rpc_type='STREAMING', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER') - - yield _ping_pong_scenario( - 'csharp_protobuf_async_unary_ping_pong', rpc_type='UNARY', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - categories=[SMOKETEST, SCALABLE]) - - yield _ping_pong_scenario( - 'csharp_protobuf_sync_to_async_unary_ping_pong', rpc_type='UNARY', - client_type='SYNC_CLIENT', server_type='ASYNC_SERVER') - - yield _ping_pong_scenario( - 'csharp_protobuf_async_unary_qps_unconstrained', rpc_type='UNARY', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - unconstrained_client='async', - categories=[SMOKETEST,SCALABLE]) - - yield _ping_pong_scenario( - 'csharp_protobuf_async_streaming_qps_unconstrained', rpc_type='STREAMING', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - unconstrained_client='async', - categories=[SCALABLE]) - - yield _ping_pong_scenario( - 'csharp_to_cpp_protobuf_sync_unary_ping_pong', rpc_type='UNARY', - client_type='SYNC_CLIENT', server_type='SYNC_SERVER', - server_language='c++', async_server_threads=1, - categories=[SMOKETEST, SCALABLE]) - - yield _ping_pong_scenario( - 'csharp_to_cpp_protobuf_async_streaming_ping_pong', rpc_type='STREAMING', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - server_language='c++', async_server_threads=1) - - yield _ping_pong_scenario( - 'csharp_to_cpp_protobuf_async_unary_qps_unconstrained', rpc_type='UNARY', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - unconstrained_client='async', server_language='c++', - categories=[SCALABLE]) - - yield _ping_pong_scenario( - 'csharp_to_cpp_protobuf_sync_to_async_unary_qps_unconstrained', rpc_type='UNARY', - client_type='SYNC_CLIENT', server_type='ASYNC_SERVER', - unconstrained_client='sync', server_language='c++', - categories=[SCALABLE]) - - yield _ping_pong_scenario( - 'cpp_to_csharp_protobuf_async_unary_qps_unconstrained', rpc_type='UNARY', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - unconstrained_client='async', client_language='c++', - categories=[SCALABLE]) - - yield _ping_pong_scenario( - 'csharp_protobuf_async_unary_ping_pong_1MB', rpc_type='UNARY', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - req_size=1024*1024, resp_size=1024*1024, - categories=[SMOKETEST, SCALABLE]) - - def __str__(self): - return 'csharp' + def __init__(self): + self.safename = str(self) + + def worker_cmdline(self): + return ['tools/run_tests/performance/run_worker_csharp.sh'] + + def worker_port_offset(self): + return 100 + + def scenarios(self): + yield _ping_pong_scenario( + 'csharp_generic_async_streaming_ping_pong', + rpc_type='STREAMING', + client_type='ASYNC_CLIENT', + server_type='ASYNC_GENERIC_SERVER', + use_generic_payload=True, + categories=[SMOKETEST, SCALABLE]) + + yield _ping_pong_scenario( + 'csharp_generic_async_streaming_ping_pong_insecure_1MB', + rpc_type='STREAMING', + client_type='ASYNC_CLIENT', + server_type='ASYNC_GENERIC_SERVER', + req_size=1024 * 1024, + resp_size=1024 * 1024, + use_generic_payload=True, + secure=False, + categories=[SMOKETEST, SCALABLE]) + + yield _ping_pong_scenario( + 'csharp_generic_async_streaming_qps_unconstrained_insecure', + rpc_type='STREAMING', + client_type='ASYNC_CLIENT', + server_type='ASYNC_GENERIC_SERVER', + unconstrained_client='async', + use_generic_payload=True, + secure=False, + categories=[SMOKETEST, SCALABLE]) + + yield _ping_pong_scenario( + 'csharp_protobuf_async_streaming_ping_pong', + rpc_type='STREAMING', + client_type='ASYNC_CLIENT', + server_type='ASYNC_SERVER') + + yield _ping_pong_scenario( + 'csharp_protobuf_async_unary_ping_pong', + rpc_type='UNARY', + client_type='ASYNC_CLIENT', + server_type='ASYNC_SERVER', + categories=[SMOKETEST, SCALABLE]) + + yield _ping_pong_scenario( + 'csharp_protobuf_sync_to_async_unary_ping_pong', + rpc_type='UNARY', + client_type='SYNC_CLIENT', + server_type='ASYNC_SERVER') + + yield _ping_pong_scenario( + 'csharp_protobuf_async_unary_qps_unconstrained', + rpc_type='UNARY', + client_type='ASYNC_CLIENT', + server_type='ASYNC_SERVER', + unconstrained_client='async', + categories=[SMOKETEST, SCALABLE]) + + yield _ping_pong_scenario( + 'csharp_protobuf_async_streaming_qps_unconstrained', + rpc_type='STREAMING', + client_type='ASYNC_CLIENT', + server_type='ASYNC_SERVER', + unconstrained_client='async', + categories=[SCALABLE]) + + yield _ping_pong_scenario( + 'csharp_to_cpp_protobuf_sync_unary_ping_pong', + rpc_type='UNARY', + client_type='SYNC_CLIENT', + server_type='SYNC_SERVER', + server_language='c++', + async_server_threads=1, + categories=[SMOKETEST, SCALABLE]) + + yield _ping_pong_scenario( + 'csharp_to_cpp_protobuf_async_streaming_ping_pong', + rpc_type='STREAMING', + client_type='ASYNC_CLIENT', + server_type='ASYNC_SERVER', + server_language='c++', + async_server_threads=1) + + yield _ping_pong_scenario( + 'csharp_to_cpp_protobuf_async_unary_qps_unconstrained', + rpc_type='UNARY', + client_type='ASYNC_CLIENT', + server_type='ASYNC_SERVER', + unconstrained_client='async', + server_language='c++', + categories=[SCALABLE]) + + yield _ping_pong_scenario( + 'csharp_to_cpp_protobuf_sync_to_async_unary_qps_unconstrained', + rpc_type='UNARY', + client_type='SYNC_CLIENT', + server_type='ASYNC_SERVER', + unconstrained_client='sync', + server_language='c++', + categories=[SCALABLE]) + + yield _ping_pong_scenario( + 'cpp_to_csharp_protobuf_async_unary_qps_unconstrained', + rpc_type='UNARY', + client_type='ASYNC_CLIENT', + server_type='ASYNC_SERVER', + unconstrained_client='async', + client_language='c++', + categories=[SCALABLE]) + + yield _ping_pong_scenario( + 'csharp_protobuf_async_unary_ping_pong_1MB', + rpc_type='UNARY', + client_type='ASYNC_CLIENT', + server_type='ASYNC_SERVER', + req_size=1024 * 1024, + resp_size=1024 * 1024, + categories=[SMOKETEST, SCALABLE]) + + def __str__(self): + return 'csharp' + class PythonLanguage: - def __init__(self): - self.safename = 'python' - - def worker_cmdline(self): - return ['tools/run_tests/performance/run_worker_python.sh'] - - def worker_port_offset(self): - return 500 - - def scenarios(self): - yield _ping_pong_scenario( - 'python_generic_sync_streaming_ping_pong', rpc_type='STREAMING', - client_type='SYNC_CLIENT', server_type='ASYNC_GENERIC_SERVER', - use_generic_payload=True, - categories=[SMOKETEST, SCALABLE]) - - yield _ping_pong_scenario( - 'python_protobuf_sync_streaming_ping_pong', rpc_type='STREAMING', - client_type='SYNC_CLIENT', server_type='ASYNC_SERVER') - - yield _ping_pong_scenario( - 'python_protobuf_async_unary_ping_pong', rpc_type='UNARY', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER') - - yield _ping_pong_scenario( - 'python_protobuf_sync_unary_ping_pong', rpc_type='UNARY', - client_type='SYNC_CLIENT', server_type='ASYNC_SERVER', - categories=[SMOKETEST, SCALABLE]) - - yield _ping_pong_scenario( - 'python_protobuf_sync_unary_qps_unconstrained', rpc_type='UNARY', - client_type='SYNC_CLIENT', server_type='ASYNC_SERVER', - unconstrained_client='sync') - - yield _ping_pong_scenario( - 'python_protobuf_sync_streaming_qps_unconstrained', rpc_type='STREAMING', - client_type='SYNC_CLIENT', server_type='ASYNC_SERVER', - unconstrained_client='sync') - - yield _ping_pong_scenario( - 'python_to_cpp_protobuf_sync_unary_ping_pong', rpc_type='UNARY', - client_type='SYNC_CLIENT', server_type='ASYNC_SERVER', - server_language='c++', async_server_threads=1, - categories=[SMOKETEST, SCALABLE]) - - yield _ping_pong_scenario( - 'python_to_cpp_protobuf_sync_streaming_ping_pong', rpc_type='STREAMING', - client_type='SYNC_CLIENT', server_type='ASYNC_SERVER', - server_language='c++', async_server_threads=1) - - yield _ping_pong_scenario( - 'python_protobuf_sync_unary_ping_pong_1MB', rpc_type='UNARY', - client_type='SYNC_CLIENT', server_type='ASYNC_SERVER', - req_size=1024*1024, resp_size=1024*1024, - categories=[SMOKETEST, SCALABLE]) - - def __str__(self): - return 'python' + def __init__(self): + self.safename = 'python' + + def worker_cmdline(self): + return ['tools/run_tests/performance/run_worker_python.sh'] + + def worker_port_offset(self): + return 500 + + def scenarios(self): + yield _ping_pong_scenario( + 'python_generic_sync_streaming_ping_pong', + rpc_type='STREAMING', + client_type='SYNC_CLIENT', + server_type='ASYNC_GENERIC_SERVER', + use_generic_payload=True, + categories=[SMOKETEST, SCALABLE]) + + yield _ping_pong_scenario( + 'python_protobuf_sync_streaming_ping_pong', + rpc_type='STREAMING', + client_type='SYNC_CLIENT', + server_type='ASYNC_SERVER') + + yield _ping_pong_scenario( + 'python_protobuf_async_unary_ping_pong', + rpc_type='UNARY', + client_type='ASYNC_CLIENT', + server_type='ASYNC_SERVER') + + yield _ping_pong_scenario( + 'python_protobuf_sync_unary_ping_pong', + rpc_type='UNARY', + client_type='SYNC_CLIENT', + server_type='ASYNC_SERVER', + categories=[SMOKETEST, SCALABLE]) + + yield _ping_pong_scenario( + 'python_protobuf_sync_unary_qps_unconstrained', + rpc_type='UNARY', + client_type='SYNC_CLIENT', + server_type='ASYNC_SERVER', + unconstrained_client='sync') + + yield _ping_pong_scenario( + 'python_protobuf_sync_streaming_qps_unconstrained', + rpc_type='STREAMING', + client_type='SYNC_CLIENT', + server_type='ASYNC_SERVER', + unconstrained_client='sync') + + yield _ping_pong_scenario( + 'python_to_cpp_protobuf_sync_unary_ping_pong', + rpc_type='UNARY', + client_type='SYNC_CLIENT', + server_type='ASYNC_SERVER', + server_language='c++', + async_server_threads=1, + categories=[SMOKETEST, SCALABLE]) + + yield _ping_pong_scenario( + 'python_to_cpp_protobuf_sync_streaming_ping_pong', + rpc_type='STREAMING', + client_type='SYNC_CLIENT', + server_type='ASYNC_SERVER', + server_language='c++', + async_server_threads=1) + + yield _ping_pong_scenario( + 'python_protobuf_sync_unary_ping_pong_1MB', + rpc_type='UNARY', + client_type='SYNC_CLIENT', + server_type='ASYNC_SERVER', + req_size=1024 * 1024, + resp_size=1024 * 1024, + categories=[SMOKETEST, SCALABLE]) + + def __str__(self): + return 'python' + class RubyLanguage: - def __init__(self): - pass - self.safename = str(self) + def __init__(self): + pass + self.safename = str(self) - def worker_cmdline(self): - return ['tools/run_tests/performance/run_worker_ruby.sh'] + def worker_cmdline(self): + return ['tools/run_tests/performance/run_worker_ruby.sh'] - def worker_port_offset(self): - return 300 + def worker_port_offset(self): + return 300 - def scenarios(self): - yield _ping_pong_scenario( - 'ruby_protobuf_sync_streaming_ping_pong', rpc_type='STREAMING', - client_type='SYNC_CLIENT', server_type='SYNC_SERVER', - categories=[SMOKETEST, SCALABLE]) + def scenarios(self): + yield _ping_pong_scenario( + 'ruby_protobuf_sync_streaming_ping_pong', + rpc_type='STREAMING', + client_type='SYNC_CLIENT', + server_type='SYNC_SERVER', + categories=[SMOKETEST, SCALABLE]) - yield _ping_pong_scenario( - 'ruby_protobuf_unary_ping_pong', rpc_type='UNARY', - client_type='SYNC_CLIENT', server_type='SYNC_SERVER', - categories=[SMOKETEST, SCALABLE]) + yield _ping_pong_scenario( + 'ruby_protobuf_unary_ping_pong', + rpc_type='UNARY', + client_type='SYNC_CLIENT', + server_type='SYNC_SERVER', + categories=[SMOKETEST, SCALABLE]) - yield _ping_pong_scenario( - 'ruby_protobuf_sync_unary_qps_unconstrained', rpc_type='UNARY', - client_type='SYNC_CLIENT', server_type='SYNC_SERVER', - unconstrained_client='sync') + yield _ping_pong_scenario( + 'ruby_protobuf_sync_unary_qps_unconstrained', + rpc_type='UNARY', + client_type='SYNC_CLIENT', + server_type='SYNC_SERVER', + unconstrained_client='sync') - yield _ping_pong_scenario( - 'ruby_protobuf_sync_streaming_qps_unconstrained', rpc_type='STREAMING', - client_type='SYNC_CLIENT', server_type='SYNC_SERVER', - unconstrained_client='sync') + yield _ping_pong_scenario( + 'ruby_protobuf_sync_streaming_qps_unconstrained', + rpc_type='STREAMING', + client_type='SYNC_CLIENT', + server_type='SYNC_SERVER', + unconstrained_client='sync') - yield _ping_pong_scenario( - 'ruby_to_cpp_protobuf_sync_unary_ping_pong', rpc_type='UNARY', - client_type='SYNC_CLIENT', server_type='SYNC_SERVER', - server_language='c++', async_server_threads=1) + yield _ping_pong_scenario( + 'ruby_to_cpp_protobuf_sync_unary_ping_pong', + rpc_type='UNARY', + client_type='SYNC_CLIENT', + server_type='SYNC_SERVER', + server_language='c++', + async_server_threads=1) - yield _ping_pong_scenario( - 'ruby_to_cpp_protobuf_sync_streaming_ping_pong', rpc_type='STREAMING', - client_type='SYNC_CLIENT', server_type='SYNC_SERVER', - server_language='c++', async_server_threads=1) + yield _ping_pong_scenario( + 'ruby_to_cpp_protobuf_sync_streaming_ping_pong', + rpc_type='STREAMING', + client_type='SYNC_CLIENT', + server_type='SYNC_SERVER', + server_language='c++', + async_server_threads=1) - yield _ping_pong_scenario( - 'ruby_protobuf_unary_ping_pong_1MB', rpc_type='UNARY', - client_type='SYNC_CLIENT', server_type='SYNC_SERVER', - req_size=1024*1024, resp_size=1024*1024, - categories=[SMOKETEST, SCALABLE]) + yield _ping_pong_scenario( + 'ruby_protobuf_unary_ping_pong_1MB', + rpc_type='UNARY', + client_type='SYNC_CLIENT', + server_type='SYNC_SERVER', + req_size=1024 * 1024, + resp_size=1024 * 1024, + categories=[SMOKETEST, SCALABLE]) - def __str__(self): - return 'ruby' + def __str__(self): + return 'ruby' class Php7Language: - def __init__(self, php7_protobuf_c=False): - pass - self.php7_protobuf_c=php7_protobuf_c - self.safename = str(self) - - def worker_cmdline(self): - if self.php7_protobuf_c: - return ['tools/run_tests/performance/run_worker_php.sh', '--use_protobuf_c_extension'] - return ['tools/run_tests/performance/run_worker_php.sh'] - - def worker_port_offset(self): - if self.php7_protobuf_c: - return 900 - return 800 - - def scenarios(self): - php7_extension_mode='php7_protobuf_php_extension' - if self.php7_protobuf_c: - php7_extension_mode='php7_protobuf_c_extension' - - yield _ping_pong_scenario( - '%s_to_cpp_protobuf_sync_unary_ping_pong' % php7_extension_mode, - rpc_type='UNARY', client_type='SYNC_CLIENT', server_type='SYNC_SERVER', - server_language='c++', async_server_threads=1) - - yield _ping_pong_scenario( - '%s_to_cpp_protobuf_sync_streaming_ping_pong' % php7_extension_mode, - rpc_type='STREAMING', client_type='SYNC_CLIENT', server_type='SYNC_SERVER', - server_language='c++', async_server_threads=1) - - # TODO(ddyihai): Investigate why when async_server_threads=1/CPU usage 340%, the QPS performs - # better than async_server_threads=0/CPU usage 490%. - yield _ping_pong_scenario( - '%s_to_cpp_protobuf_sync_unary_qps_unconstrained' % php7_extension_mode, - rpc_type='UNARY', client_type='SYNC_CLIENT', server_type='ASYNC_SERVER', - server_language='c++', outstanding=1, async_server_threads=1, unconstrained_client='sync') - - yield _ping_pong_scenario( - '%s_to_cpp_protobuf_sync_streaming_qps_unconstrained' % php7_extension_mode, - rpc_type='STREAMING', client_type='SYNC_CLIENT', server_type='ASYNC_SERVER', - server_language='c++', outstanding=1, async_server_threads=1, unconstrained_client='sync') - - def __str__(self): - if self.php7_protobuf_c: - return 'php7_protobuf_c' - return 'php7' + def __init__(self, php7_protobuf_c=False): + pass + self.php7_protobuf_c = php7_protobuf_c + self.safename = str(self) + + def worker_cmdline(self): + if self.php7_protobuf_c: + return [ + 'tools/run_tests/performance/run_worker_php.sh', + '--use_protobuf_c_extension' + ] + return ['tools/run_tests/performance/run_worker_php.sh'] + + def worker_port_offset(self): + if self.php7_protobuf_c: + return 900 + return 800 + + def scenarios(self): + php7_extension_mode = 'php7_protobuf_php_extension' + if self.php7_protobuf_c: + php7_extension_mode = 'php7_protobuf_c_extension' + + yield _ping_pong_scenario( + '%s_to_cpp_protobuf_sync_unary_ping_pong' % php7_extension_mode, + rpc_type='UNARY', + client_type='SYNC_CLIENT', + server_type='SYNC_SERVER', + server_language='c++', + async_server_threads=1) + + yield _ping_pong_scenario( + '%s_to_cpp_protobuf_sync_streaming_ping_pong' % php7_extension_mode, + rpc_type='STREAMING', + client_type='SYNC_CLIENT', + server_type='SYNC_SERVER', + server_language='c++', + async_server_threads=1) + + # TODO(ddyihai): Investigate why when async_server_threads=1/CPU usage 340%, the QPS performs + # better than async_server_threads=0/CPU usage 490%. + yield _ping_pong_scenario( + '%s_to_cpp_protobuf_sync_unary_qps_unconstrained' % + php7_extension_mode, + rpc_type='UNARY', + client_type='SYNC_CLIENT', + server_type='ASYNC_SERVER', + server_language='c++', + outstanding=1, + async_server_threads=1, + unconstrained_client='sync') + + yield _ping_pong_scenario( + '%s_to_cpp_protobuf_sync_streaming_qps_unconstrained' % + php7_extension_mode, + rpc_type='STREAMING', + client_type='SYNC_CLIENT', + server_type='ASYNC_SERVER', + server_language='c++', + outstanding=1, + async_server_threads=1, + unconstrained_client='sync') + + def __str__(self): + if self.php7_protobuf_c: + return 'php7_protobuf_c' + return 'php7' + class JavaLanguage: - def __init__(self): - pass - self.safename = str(self) - - def worker_cmdline(self): - return ['tools/run_tests/performance/run_worker_java.sh'] - - def worker_port_offset(self): - return 400 - - def scenarios(self): - for secure in [True, False]: - secstr = 'secure' if secure else 'insecure' - smoketest_categories = ([SMOKETEST] if secure else []) + [SCALABLE] - - yield _ping_pong_scenario( - 'java_generic_async_streaming_ping_pong_%s' % secstr, rpc_type='STREAMING', - client_type='ASYNC_CLIENT', server_type='ASYNC_GENERIC_SERVER', - use_generic_payload=True, async_server_threads=1, - secure=secure, warmup_seconds=JAVA_WARMUP_SECONDS, - categories=smoketest_categories) - - yield _ping_pong_scenario( - 'java_protobuf_async_streaming_ping_pong_%s' % secstr, rpc_type='STREAMING', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - async_server_threads=1, - secure=secure, warmup_seconds=JAVA_WARMUP_SECONDS) - - yield _ping_pong_scenario( - 'java_protobuf_async_unary_ping_pong_%s' % secstr, rpc_type='UNARY', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - async_server_threads=1, - secure=secure, warmup_seconds=JAVA_WARMUP_SECONDS, - categories=smoketest_categories) - - yield _ping_pong_scenario( - 'java_protobuf_unary_ping_pong_%s' % secstr, rpc_type='UNARY', - client_type='SYNC_CLIENT', server_type='SYNC_SERVER', - async_server_threads=1, - secure=secure, warmup_seconds=JAVA_WARMUP_SECONDS) - - yield _ping_pong_scenario( - 'java_protobuf_async_unary_qps_unconstrained_%s' % secstr, rpc_type='UNARY', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - unconstrained_client='async', - secure=secure, warmup_seconds=JAVA_WARMUP_SECONDS, - categories=smoketest_categories+[SCALABLE]) - - yield _ping_pong_scenario( - 'java_protobuf_async_streaming_qps_unconstrained_%s' % secstr, rpc_type='STREAMING', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - unconstrained_client='async', - secure=secure, warmup_seconds=JAVA_WARMUP_SECONDS, - categories=[SCALABLE]) - - yield _ping_pong_scenario( - 'java_generic_async_streaming_qps_unconstrained_%s' % secstr, rpc_type='STREAMING', - client_type='ASYNC_CLIENT', server_type='ASYNC_GENERIC_SERVER', - unconstrained_client='async', use_generic_payload=True, - secure=secure, warmup_seconds=JAVA_WARMUP_SECONDS, - categories=[SCALABLE]) - - yield _ping_pong_scenario( - 'java_generic_async_streaming_qps_one_server_core_%s' % secstr, rpc_type='STREAMING', - client_type='ASYNC_CLIENT', server_type='ASYNC_GENERIC_SERVER', - unconstrained_client='async-limited', use_generic_payload=True, - async_server_threads=1, - secure=secure, warmup_seconds=JAVA_WARMUP_SECONDS) - - # TODO(jtattermusch): add scenarios java vs C++ - - def __str__(self): - return 'java' + def __init__(self): + pass + self.safename = str(self) + + def worker_cmdline(self): + return ['tools/run_tests/performance/run_worker_java.sh'] + + def worker_port_offset(self): + return 400 + + def scenarios(self): + for secure in [True, False]: + secstr = 'secure' if secure else 'insecure' + smoketest_categories = ([SMOKETEST] if secure else []) + [SCALABLE] + + yield _ping_pong_scenario( + 'java_generic_async_streaming_ping_pong_%s' % secstr, + rpc_type='STREAMING', + client_type='ASYNC_CLIENT', + server_type='ASYNC_GENERIC_SERVER', + use_generic_payload=True, + async_server_threads=1, + secure=secure, + warmup_seconds=JAVA_WARMUP_SECONDS, + categories=smoketest_categories) + + yield _ping_pong_scenario( + 'java_protobuf_async_streaming_ping_pong_%s' % secstr, + rpc_type='STREAMING', + client_type='ASYNC_CLIENT', + server_type='ASYNC_SERVER', + async_server_threads=1, + secure=secure, + warmup_seconds=JAVA_WARMUP_SECONDS) + + yield _ping_pong_scenario( + 'java_protobuf_async_unary_ping_pong_%s' % secstr, + rpc_type='UNARY', + client_type='ASYNC_CLIENT', + server_type='ASYNC_SERVER', + async_server_threads=1, + secure=secure, + warmup_seconds=JAVA_WARMUP_SECONDS, + categories=smoketest_categories) + + yield _ping_pong_scenario( + 'java_protobuf_unary_ping_pong_%s' % secstr, + rpc_type='UNARY', + client_type='SYNC_CLIENT', + server_type='SYNC_SERVER', + async_server_threads=1, + secure=secure, + warmup_seconds=JAVA_WARMUP_SECONDS) + + yield _ping_pong_scenario( + 'java_protobuf_async_unary_qps_unconstrained_%s' % secstr, + rpc_type='UNARY', + client_type='ASYNC_CLIENT', + server_type='ASYNC_SERVER', + unconstrained_client='async', + secure=secure, + warmup_seconds=JAVA_WARMUP_SECONDS, + categories=smoketest_categories + [SCALABLE]) + + yield _ping_pong_scenario( + 'java_protobuf_async_streaming_qps_unconstrained_%s' % secstr, + rpc_type='STREAMING', + client_type='ASYNC_CLIENT', + server_type='ASYNC_SERVER', + unconstrained_client='async', + secure=secure, + warmup_seconds=JAVA_WARMUP_SECONDS, + categories=[SCALABLE]) + + yield _ping_pong_scenario( + 'java_generic_async_streaming_qps_unconstrained_%s' % secstr, + rpc_type='STREAMING', + client_type='ASYNC_CLIENT', + server_type='ASYNC_GENERIC_SERVER', + unconstrained_client='async', + use_generic_payload=True, + secure=secure, + warmup_seconds=JAVA_WARMUP_SECONDS, + categories=[SCALABLE]) + + yield _ping_pong_scenario( + 'java_generic_async_streaming_qps_one_server_core_%s' % secstr, + rpc_type='STREAMING', + client_type='ASYNC_CLIENT', + server_type='ASYNC_GENERIC_SERVER', + unconstrained_client='async-limited', + use_generic_payload=True, + async_server_threads=1, + secure=secure, + warmup_seconds=JAVA_WARMUP_SECONDS) + + # TODO(jtattermusch): add scenarios java vs C++ + + def __str__(self): + return 'java' class GoLanguage: - def __init__(self): - pass - self.safename = str(self) - - def worker_cmdline(self): - return ['tools/run_tests/performance/run_worker_go.sh'] - - def worker_port_offset(self): - return 600 - - def scenarios(self): - for secure in [True, False]: - secstr = 'secure' if secure else 'insecure' - smoketest_categories = ([SMOKETEST] if secure else []) + [SCALABLE] - - # ASYNC_GENERIC_SERVER for Go actually uses a sync streaming server, - # but that's mostly because of lack of better name of the enum value. - yield _ping_pong_scenario( - 'go_generic_sync_streaming_ping_pong_%s' % secstr, rpc_type='STREAMING', - client_type='SYNC_CLIENT', server_type='ASYNC_GENERIC_SERVER', - use_generic_payload=True, async_server_threads=1, - secure=secure, - categories=smoketest_categories) - - yield _ping_pong_scenario( - 'go_protobuf_sync_streaming_ping_pong_%s' % secstr, rpc_type='STREAMING', - client_type='SYNC_CLIENT', server_type='SYNC_SERVER', - async_server_threads=1, - secure=secure) - - yield _ping_pong_scenario( - 'go_protobuf_sync_unary_ping_pong_%s' % secstr, rpc_type='UNARY', - client_type='SYNC_CLIENT', server_type='SYNC_SERVER', - async_server_threads=1, - secure=secure, - categories=smoketest_categories) - - # unconstrained_client='async' is intended (client uses goroutines) - yield _ping_pong_scenario( - 'go_protobuf_sync_unary_qps_unconstrained_%s' % secstr, rpc_type='UNARY', - client_type='SYNC_CLIENT', server_type='SYNC_SERVER', - unconstrained_client='async', - secure=secure, - categories=smoketest_categories+[SCALABLE]) - - # unconstrained_client='async' is intended (client uses goroutines) - yield _ping_pong_scenario( - 'go_protobuf_sync_streaming_qps_unconstrained_%s' % secstr, rpc_type='STREAMING', - client_type='SYNC_CLIENT', server_type='SYNC_SERVER', - unconstrained_client='async', - secure=secure, - categories=[SCALABLE]) - - # unconstrained_client='async' is intended (client uses goroutines) - # ASYNC_GENERIC_SERVER for Go actually uses a sync streaming server, - # but that's mostly because of lack of better name of the enum value. - yield _ping_pong_scenario( - 'go_generic_sync_streaming_qps_unconstrained_%s' % secstr, rpc_type='STREAMING', - client_type='SYNC_CLIENT', server_type='ASYNC_GENERIC_SERVER', - unconstrained_client='async', use_generic_payload=True, - secure=secure, - categories=[SCALABLE]) - - # TODO(jtattermusch): add scenarios go vs C++ - - def __str__(self): - return 'go' + def __init__(self): + pass + self.safename = str(self) + + def worker_cmdline(self): + return ['tools/run_tests/performance/run_worker_go.sh'] + + def worker_port_offset(self): + return 600 + + def scenarios(self): + for secure in [True, False]: + secstr = 'secure' if secure else 'insecure' + smoketest_categories = ([SMOKETEST] if secure else []) + [SCALABLE] + + # ASYNC_GENERIC_SERVER for Go actually uses a sync streaming server, + # but that's mostly because of lack of better name of the enum value. + yield _ping_pong_scenario( + 'go_generic_sync_streaming_ping_pong_%s' % secstr, + rpc_type='STREAMING', + client_type='SYNC_CLIENT', + server_type='ASYNC_GENERIC_SERVER', + use_generic_payload=True, + async_server_threads=1, + secure=secure, + categories=smoketest_categories) + + yield _ping_pong_scenario( + 'go_protobuf_sync_streaming_ping_pong_%s' % secstr, + rpc_type='STREAMING', + client_type='SYNC_CLIENT', + server_type='SYNC_SERVER', + async_server_threads=1, + secure=secure) + + yield _ping_pong_scenario( + 'go_protobuf_sync_unary_ping_pong_%s' % secstr, + rpc_type='UNARY', + client_type='SYNC_CLIENT', + server_type='SYNC_SERVER', + async_server_threads=1, + secure=secure, + categories=smoketest_categories) + + # unconstrained_client='async' is intended (client uses goroutines) + yield _ping_pong_scenario( + 'go_protobuf_sync_unary_qps_unconstrained_%s' % secstr, + rpc_type='UNARY', + client_type='SYNC_CLIENT', + server_type='SYNC_SERVER', + unconstrained_client='async', + secure=secure, + categories=smoketest_categories + [SCALABLE]) + + # unconstrained_client='async' is intended (client uses goroutines) + yield _ping_pong_scenario( + 'go_protobuf_sync_streaming_qps_unconstrained_%s' % secstr, + rpc_type='STREAMING', + client_type='SYNC_CLIENT', + server_type='SYNC_SERVER', + unconstrained_client='async', + secure=secure, + categories=[SCALABLE]) + + # unconstrained_client='async' is intended (client uses goroutines) + # ASYNC_GENERIC_SERVER for Go actually uses a sync streaming server, + # but that's mostly because of lack of better name of the enum value. + yield _ping_pong_scenario( + 'go_generic_sync_streaming_qps_unconstrained_%s' % secstr, + rpc_type='STREAMING', + client_type='SYNC_CLIENT', + server_type='ASYNC_GENERIC_SERVER', + unconstrained_client='async', + use_generic_payload=True, + secure=secure, + categories=[SCALABLE]) + + # TODO(jtattermusch): add scenarios go vs C++ + + def __str__(self): + return 'go' LANGUAGES = { - 'c++' : CXXLanguage(), - 'csharp' : CSharpLanguage(), - 'ruby' : RubyLanguage(), - 'php7' : Php7Language(), - 'php7_protobuf_c' : Php7Language(php7_protobuf_c=True), - 'java' : JavaLanguage(), - 'python' : PythonLanguage(), - 'go' : GoLanguage(), + 'c++': CXXLanguage(), + 'csharp': CSharpLanguage(), + 'ruby': RubyLanguage(), + 'php7': Php7Language(), + 'php7_protobuf_c': Php7Language(php7_protobuf_c=True), + 'java': JavaLanguage(), + 'python': PythonLanguage(), + 'go': GoLanguage(), } From a69c6901f9c4e375ad543cb4ee6ce747d953bf18 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 11 Dec 2017 17:51:23 -0800 Subject: [PATCH 111/127] yapf tools/run_tests/artifacts --- tools/distrib/yapf_code.sh | 1 + tools/run_tests/artifacts/artifact_targets.py | 611 +++++++++--------- .../artifacts/distribtest_targets.py | 525 ++++++++------- tools/run_tests/artifacts/package_targets.py | 214 +++--- 4 files changed, 709 insertions(+), 642 deletions(-) diff --git a/tools/distrib/yapf_code.sh b/tools/distrib/yapf_code.sh index 8f34e55245d..6d2759ddd12 100755 --- a/tools/distrib/yapf_code.sh +++ b/tools/distrib/yapf_code.sh @@ -28,6 +28,7 @@ DIRS=( 'tools/run_tests/python_utils' 'tools/run_tests/sanity' 'tools/run_tests/performance' + 'tools/run_tests/artifacts' ) EXCLUSIONS=( 'grpcio/grpc_*.py' diff --git a/tools/run_tests/artifacts/artifact_targets.py b/tools/run_tests/artifacts/artifact_targets.py index ea202edb300..dc0803b3c7e 100644 --- a/tools/run_tests/artifacts/artifact_targets.py +++ b/tools/run_tests/artifacts/artifact_targets.py @@ -12,7 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Definition of targets to build artifacts.""" import os.path @@ -24,316 +23,350 @@ sys.path.insert(0, os.path.abspath('..')) import python_utils.jobset as jobset -def create_docker_jobspec(name, dockerfile_dir, shell_command, environ={}, - flake_retries=0, timeout_retries=0, timeout_seconds=30*60, - docker_base_image=None, extra_docker_args=None): - """Creates jobspec for a task running under docker.""" - environ = environ.copy() - environ['RUN_COMMAND'] = shell_command - environ['ARTIFACTS_OUT'] = 'artifacts/%s' % name - - docker_args=[] - for k,v in environ.items(): - docker_args += ['-e', '%s=%s' % (k, v)] - docker_env = {'DOCKERFILE_DIR': dockerfile_dir, - 'DOCKER_RUN_SCRIPT': 'tools/run_tests/dockerize/docker_run.sh', - 'OUTPUT_DIR': 'artifacts'} - - if docker_base_image is not None: - docker_env['DOCKER_BASE_IMAGE'] = docker_base_image - if extra_docker_args is not None: - docker_env['EXTRA_DOCKER_ARGS'] = extra_docker_args - jobspec = jobset.JobSpec( - cmdline=['tools/run_tests/dockerize/build_and_run_docker.sh'] + docker_args, - environ=docker_env, - shortname='build_artifact.%s' % (name), - timeout_seconds=timeout_seconds, - flake_retries=flake_retries, - timeout_retries=timeout_retries) - return jobspec - - -def create_jobspec(name, cmdline, environ={}, shell=False, - flake_retries=0, timeout_retries=0, timeout_seconds=30*60, +def create_docker_jobspec(name, + dockerfile_dir, + shell_command, + environ={}, + flake_retries=0, + timeout_retries=0, + timeout_seconds=30 * 60, + docker_base_image=None, + extra_docker_args=None): + """Creates jobspec for a task running under docker.""" + environ = environ.copy() + environ['RUN_COMMAND'] = shell_command + environ['ARTIFACTS_OUT'] = 'artifacts/%s' % name + + docker_args = [] + for k, v in environ.items(): + docker_args += ['-e', '%s=%s' % (k, v)] + docker_env = { + 'DOCKERFILE_DIR': dockerfile_dir, + 'DOCKER_RUN_SCRIPT': 'tools/run_tests/dockerize/docker_run.sh', + 'OUTPUT_DIR': 'artifacts' + } + + if docker_base_image is not None: + docker_env['DOCKER_BASE_IMAGE'] = docker_base_image + if extra_docker_args is not None: + docker_env['EXTRA_DOCKER_ARGS'] = extra_docker_args + jobspec = jobset.JobSpec( + cmdline=['tools/run_tests/dockerize/build_and_run_docker.sh'] + + docker_args, + environ=docker_env, + shortname='build_artifact.%s' % (name), + timeout_seconds=timeout_seconds, + flake_retries=flake_retries, + timeout_retries=timeout_retries) + return jobspec + + +def create_jobspec(name, + cmdline, + environ={}, + shell=False, + flake_retries=0, + timeout_retries=0, + timeout_seconds=30 * 60, use_workspace=False, cpu_cost=1.0): - """Creates jobspec.""" - environ = environ.copy() - if use_workspace: - environ['WORKSPACE_NAME'] = 'workspace_%s' % name - environ['ARTIFACTS_OUT'] = os.path.join('..', 'artifacts', name) - cmdline = ['bash', - 'tools/run_tests/artifacts/run_in_workspace.sh'] + cmdline - else: - environ['ARTIFACTS_OUT'] = os.path.join('artifacts', name) - - jobspec = jobset.JobSpec( - cmdline=cmdline, - environ=environ, - shortname='build_artifact.%s' % (name), - timeout_seconds=timeout_seconds, - flake_retries=flake_retries, - timeout_retries=timeout_retries, - shell=shell, - cpu_cost=cpu_cost) - return jobspec + """Creates jobspec.""" + environ = environ.copy() + if use_workspace: + environ['WORKSPACE_NAME'] = 'workspace_%s' % name + environ['ARTIFACTS_OUT'] = os.path.join('..', 'artifacts', name) + cmdline = ['bash', 'tools/run_tests/artifacts/run_in_workspace.sh' + ] + cmdline + else: + environ['ARTIFACTS_OUT'] = os.path.join('artifacts', name) + + jobspec = jobset.JobSpec( + cmdline=cmdline, + environ=environ, + shortname='build_artifact.%s' % (name), + timeout_seconds=timeout_seconds, + flake_retries=flake_retries, + timeout_retries=timeout_retries, + shell=shell, + cpu_cost=cpu_cost) + return jobspec _MACOS_COMPAT_FLAG = '-mmacosx-version-min=10.7' -_ARCH_FLAG_MAP = { - 'x86': '-m32', - 'x64': '-m64' -} +_ARCH_FLAG_MAP = {'x86': '-m32', 'x64': '-m64'} class PythonArtifact: - """Builds Python artifacts.""" - - def __init__(self, platform, arch, py_version): - self.name = 'python_%s_%s_%s' % (platform, arch, py_version) - self.platform = platform - self.arch = arch - self.labels = ['artifact', 'python', platform, arch, py_version] - self.py_version = py_version - - def pre_build_jobspecs(self): - return [] - - def build_jobspec(self): - environ = {} - if self.platform == 'linux_extra': - # Raspberry Pi build - environ['PYTHON'] = '/usr/local/bin/python{}'.format(self.py_version) - environ['PIP'] = '/usr/local/bin/pip{}'.format(self.py_version) - # https://github.com/resin-io-projects/armv7hf-debian-qemu/issues/9 - # A QEMU bug causes submodule update to hang, so we copy directly - environ['RELATIVE_COPY_PATH'] = '.' - extra_args = ' --entrypoint=/usr/bin/qemu-arm-static ' - return create_docker_jobspec(self.name, - 'tools/dockerfile/grpc_artifact_linux_{}'.format(self.arch), - 'tools/run_tests/artifacts/build_artifact_python.sh', - environ=environ, - timeout_seconds=60*60*5, - docker_base_image='quay.io/grpc/raspbian_{}'.format(self.arch), - extra_docker_args=extra_args) - elif self.platform == 'linux': - if self.arch == 'x86': - environ['SETARCH_CMD'] = 'linux32' - # Inside the manylinux container, the python installations are located in - # special places... - environ['PYTHON'] = '/opt/python/{}/bin/python'.format(self.py_version) - environ['PIP'] = '/opt/python/{}/bin/pip'.format(self.py_version) - # Platform autodetection for the manylinux1 image breaks so we set the - # defines ourselves. - # TODO(atash) get better platform-detection support in core so we don't - # need to do this manually... - environ['CFLAGS'] = '-DGPR_MANYLINUX1=1' - environ['GRPC_BUILD_GRPCIO_TOOLS_DEPENDENTS'] = 'TRUE' - environ['GRPC_BUILD_MANYLINUX_WHEEL'] = 'TRUE' - return create_docker_jobspec(self.name, - 'tools/dockerfile/grpc_artifact_python_manylinux_%s' % self.arch, - 'tools/run_tests/artifacts/build_artifact_python.sh', - environ=environ, - timeout_seconds=60*60, - docker_base_image='quay.io/pypa/manylinux1_i686' if self.arch == 'x86' else 'quay.io/pypa/manylinux1_x86_64') - elif self.platform == 'windows': - if 'Python27' in self.py_version or 'Python34' in self.py_version: - environ['EXT_COMPILER'] = 'mingw32' - else: - environ['EXT_COMPILER'] = 'msvc' - # For some reason, the batch script %random% always runs with the same - # seed. We create a random temp-dir here - dir = ''.join(random.choice(string.ascii_uppercase) for _ in range(10)) - return create_jobspec(self.name, - ['tools\\run_tests\\artifacts\\build_artifact_python.bat', - self.py_version, - '32' if self.arch == 'x86' else '64'], - environ=environ, - timeout_seconds=45*60, - use_workspace=True) - else: - environ['PYTHON'] = self.py_version - environ['SKIP_PIP_INSTALL'] = 'TRUE' - return create_jobspec(self.name, - ['tools/run_tests/artifacts/build_artifact_python.sh'], - environ=environ, - timeout_seconds=60*60, - use_workspace=True) - - def __str__(self): - return self.name + """Builds Python artifacts.""" + + def __init__(self, platform, arch, py_version): + self.name = 'python_%s_%s_%s' % (platform, arch, py_version) + self.platform = platform + self.arch = arch + self.labels = ['artifact', 'python', platform, arch, py_version] + self.py_version = py_version + + def pre_build_jobspecs(self): + return [] + + def build_jobspec(self): + environ = {} + if self.platform == 'linux_extra': + # Raspberry Pi build + environ['PYTHON'] = '/usr/local/bin/python{}'.format( + self.py_version) + environ['PIP'] = '/usr/local/bin/pip{}'.format(self.py_version) + # https://github.com/resin-io-projects/armv7hf-debian-qemu/issues/9 + # A QEMU bug causes submodule update to hang, so we copy directly + environ['RELATIVE_COPY_PATH'] = '.' + extra_args = ' --entrypoint=/usr/bin/qemu-arm-static ' + return create_docker_jobspec( + self.name, + 'tools/dockerfile/grpc_artifact_linux_{}'.format(self.arch), + 'tools/run_tests/artifacts/build_artifact_python.sh', + environ=environ, + timeout_seconds=60 * 60 * 5, + docker_base_image='quay.io/grpc/raspbian_{}'.format(self.arch), + extra_docker_args=extra_args) + elif self.platform == 'linux': + if self.arch == 'x86': + environ['SETARCH_CMD'] = 'linux32' + # Inside the manylinux container, the python installations are located in + # special places... + environ['PYTHON'] = '/opt/python/{}/bin/python'.format( + self.py_version) + environ['PIP'] = '/opt/python/{}/bin/pip'.format(self.py_version) + # Platform autodetection for the manylinux1 image breaks so we set the + # defines ourselves. + # TODO(atash) get better platform-detection support in core so we don't + # need to do this manually... + environ['CFLAGS'] = '-DGPR_MANYLINUX1=1' + environ['GRPC_BUILD_GRPCIO_TOOLS_DEPENDENTS'] = 'TRUE' + environ['GRPC_BUILD_MANYLINUX_WHEEL'] = 'TRUE' + return create_docker_jobspec( + self.name, + 'tools/dockerfile/grpc_artifact_python_manylinux_%s' % + self.arch, + 'tools/run_tests/artifacts/build_artifact_python.sh', + environ=environ, + timeout_seconds=60 * 60, + docker_base_image='quay.io/pypa/manylinux1_i686' + if self.arch == 'x86' else 'quay.io/pypa/manylinux1_x86_64') + elif self.platform == 'windows': + if 'Python27' in self.py_version or 'Python34' in self.py_version: + environ['EXT_COMPILER'] = 'mingw32' + else: + environ['EXT_COMPILER'] = 'msvc' + # For some reason, the batch script %random% always runs with the same + # seed. We create a random temp-dir here + dir = ''.join( + random.choice(string.ascii_uppercase) for _ in range(10)) + return create_jobspec( + self.name, [ + 'tools\\run_tests\\artifacts\\build_artifact_python.bat', + self.py_version, '32' if self.arch == 'x86' else '64' + ], + environ=environ, + timeout_seconds=45 * 60, + use_workspace=True) + else: + environ['PYTHON'] = self.py_version + environ['SKIP_PIP_INSTALL'] = 'TRUE' + return create_jobspec( + self.name, + ['tools/run_tests/artifacts/build_artifact_python.sh'], + environ=environ, + timeout_seconds=60 * 60, + use_workspace=True) + + def __str__(self): + return self.name class RubyArtifact: - """Builds ruby native gem.""" + """Builds ruby native gem.""" - def __init__(self, platform, arch): - self.name = 'ruby_native_gem_%s_%s' % (platform, arch) - self.platform = platform - self.arch = arch - self.labels = ['artifact', 'ruby', platform, arch] + def __init__(self, platform, arch): + self.name = 'ruby_native_gem_%s_%s' % (platform, arch) + self.platform = platform + self.arch = arch + self.labels = ['artifact', 'ruby', platform, arch] - def pre_build_jobspecs(self): - return [] + def pre_build_jobspecs(self): + return [] - def build_jobspec(self): - # Ruby build uses docker internally and docker cannot be nested. - # We are using a custom workspace instead. - return create_jobspec(self.name, - ['tools/run_tests/artifacts/build_artifact_ruby.sh'], - use_workspace=True, - timeout_seconds=45*60) + def build_jobspec(self): + # Ruby build uses docker internally and docker cannot be nested. + # We are using a custom workspace instead. + return create_jobspec( + self.name, ['tools/run_tests/artifacts/build_artifact_ruby.sh'], + use_workspace=True, + timeout_seconds=45 * 60) class CSharpExtArtifact: - """Builds C# native extension library""" - - def __init__(self, platform, arch): - self.name = 'csharp_ext_%s_%s' % (platform, arch) - self.platform = platform - self.arch = arch - self.labels = ['artifact', 'csharp', platform, arch] - - def pre_build_jobspecs(self): - return [] - - def build_jobspec(self): - if self.platform == 'windows': - cmake_arch_option = 'Win32' if self.arch == 'x86' else self.arch - return create_jobspec(self.name, - ['tools\\run_tests\\artifacts\\build_artifact_csharp.bat', - cmake_arch_option], - use_workspace=True) - else: - environ = {'CONFIG': 'opt', - 'EMBED_OPENSSL': 'true', - 'EMBED_ZLIB': 'true', - 'CFLAGS': '-DGPR_BACKWARDS_COMPATIBILITY_MODE', - 'CXXFLAGS': '-DGPR_BACKWARDS_COMPATIBILITY_MODE', - 'LDFLAGS': ''} - if self.platform == 'linux': - return create_docker_jobspec(self.name, - 'tools/dockerfile/grpc_artifact_linux_%s' % self.arch, - 'tools/run_tests/artifacts/build_artifact_csharp.sh', - environ=environ) - else: - archflag = _ARCH_FLAG_MAP[self.arch] - environ['CFLAGS'] += ' %s %s' % (archflag, _MACOS_COMPAT_FLAG) - environ['CXXFLAGS'] += ' %s %s' % (archflag, _MACOS_COMPAT_FLAG) - environ['LDFLAGS'] += ' %s' % archflag - return create_jobspec(self.name, - ['tools/run_tests/artifacts/build_artifact_csharp.sh'], - environ=environ, - use_workspace=True) - - def __str__(self): - return self.name + """Builds C# native extension library""" + + def __init__(self, platform, arch): + self.name = 'csharp_ext_%s_%s' % (platform, arch) + self.platform = platform + self.arch = arch + self.labels = ['artifact', 'csharp', platform, arch] + + def pre_build_jobspecs(self): + return [] + + def build_jobspec(self): + if self.platform == 'windows': + cmake_arch_option = 'Win32' if self.arch == 'x86' else self.arch + return create_jobspec( + self.name, [ + 'tools\\run_tests\\artifacts\\build_artifact_csharp.bat', + cmake_arch_option + ], + use_workspace=True) + else: + environ = { + 'CONFIG': 'opt', + 'EMBED_OPENSSL': 'true', + 'EMBED_ZLIB': 'true', + 'CFLAGS': '-DGPR_BACKWARDS_COMPATIBILITY_MODE', + 'CXXFLAGS': '-DGPR_BACKWARDS_COMPATIBILITY_MODE', + 'LDFLAGS': '' + } + if self.platform == 'linux': + return create_docker_jobspec( + self.name, + 'tools/dockerfile/grpc_artifact_linux_%s' % self.arch, + 'tools/run_tests/artifacts/build_artifact_csharp.sh', + environ=environ) + else: + archflag = _ARCH_FLAG_MAP[self.arch] + environ['CFLAGS'] += ' %s %s' % (archflag, _MACOS_COMPAT_FLAG) + environ['CXXFLAGS'] += ' %s %s' % (archflag, _MACOS_COMPAT_FLAG) + environ['LDFLAGS'] += ' %s' % archflag + return create_jobspec( + self.name, + ['tools/run_tests/artifacts/build_artifact_csharp.sh'], + environ=environ, + use_workspace=True) + + def __str__(self): + return self.name + class PHPArtifact: - """Builds PHP PECL package""" - - def __init__(self, platform, arch): - self.name = 'php_pecl_package_{0}_{1}'.format(platform, arch) - self.platform = platform - self.arch = arch - self.labels = ['artifact', 'php', platform, arch] - - def pre_build_jobspecs(self): - return [] - - def build_jobspec(self): - if self.platform == 'linux': - return create_docker_jobspec( - self.name, - 'tools/dockerfile/grpc_artifact_linux_{}'.format(self.arch), - 'tools/run_tests/artifacts/build_artifact_php.sh') - else: - return create_jobspec(self.name, - ['tools/run_tests/artifacts/build_artifact_php.sh'], - use_workspace=True) + """Builds PHP PECL package""" -class ProtocArtifact: - """Builds protoc and protoc-plugin artifacts""" - - def __init__(self, platform, arch): - self.name = 'protoc_%s_%s' % (platform, arch) - self.platform = platform - self.arch = arch - self.labels = ['artifact', 'protoc', platform, arch] - - def pre_build_jobspecs(self): - return [] - - def build_jobspec(self): - if self.platform != 'windows': - cxxflags = '-DNDEBUG %s' % _ARCH_FLAG_MAP[self.arch] - ldflags = '%s' % _ARCH_FLAG_MAP[self.arch] - if self.platform != 'macos': - ldflags += ' -static-libgcc -static-libstdc++ -s' - environ={'CONFIG': 'opt', - 'CXXFLAGS': cxxflags, - 'LDFLAGS': ldflags, - 'PROTOBUF_LDFLAGS_EXTRA': ldflags} - if self.platform == 'linux': - return create_docker_jobspec(self.name, - 'tools/dockerfile/grpc_artifact_protoc', - 'tools/run_tests/artifacts/build_artifact_protoc.sh', - environ=environ) - else: - environ['CXXFLAGS'] += ' -std=c++11 -stdlib=libc++ %s' % _MACOS_COMPAT_FLAG - return create_jobspec(self.name, - ['tools/run_tests/artifacts/build_artifact_protoc.sh'], - environ=environ, - use_workspace=True) - else: - generator = 'Visual Studio 14 2015 Win64' if self.arch == 'x64' else 'Visual Studio 14 2015' - return create_jobspec(self.name, - ['tools\\run_tests\\artifacts\\build_artifact_protoc.bat'], - environ={'generator': generator}, - use_workspace=True) + def __init__(self, platform, arch): + self.name = 'php_pecl_package_{0}_{1}'.format(platform, arch) + self.platform = platform + self.arch = arch + self.labels = ['artifact', 'php', platform, arch] + + def pre_build_jobspecs(self): + return [] - def __str__(self): - return self.name + def build_jobspec(self): + if self.platform == 'linux': + return create_docker_jobspec( + self.name, + 'tools/dockerfile/grpc_artifact_linux_{}'.format(self.arch), + 'tools/run_tests/artifacts/build_artifact_php.sh') + else: + return create_jobspec( + self.name, ['tools/run_tests/artifacts/build_artifact_php.sh'], + use_workspace=True) + + +class ProtocArtifact: + """Builds protoc and protoc-plugin artifacts""" + + def __init__(self, platform, arch): + self.name = 'protoc_%s_%s' % (platform, arch) + self.platform = platform + self.arch = arch + self.labels = ['artifact', 'protoc', platform, arch] + + def pre_build_jobspecs(self): + return [] + + def build_jobspec(self): + if self.platform != 'windows': + cxxflags = '-DNDEBUG %s' % _ARCH_FLAG_MAP[self.arch] + ldflags = '%s' % _ARCH_FLAG_MAP[self.arch] + if self.platform != 'macos': + ldflags += ' -static-libgcc -static-libstdc++ -s' + environ = { + 'CONFIG': 'opt', + 'CXXFLAGS': cxxflags, + 'LDFLAGS': ldflags, + 'PROTOBUF_LDFLAGS_EXTRA': ldflags + } + if self.platform == 'linux': + return create_docker_jobspec( + self.name, + 'tools/dockerfile/grpc_artifact_protoc', + 'tools/run_tests/artifacts/build_artifact_protoc.sh', + environ=environ) + else: + environ[ + 'CXXFLAGS'] += ' -std=c++11 -stdlib=libc++ %s' % _MACOS_COMPAT_FLAG + return create_jobspec( + self.name, + ['tools/run_tests/artifacts/build_artifact_protoc.sh'], + environ=environ, + use_workspace=True) + else: + generator = 'Visual Studio 14 2015 Win64' if self.arch == 'x64' else 'Visual Studio 14 2015' + return create_jobspec( + self.name, + ['tools\\run_tests\\artifacts\\build_artifact_protoc.bat'], + environ={'generator': generator}, + use_workspace=True) + + def __str__(self): + return self.name def targets(): - """Gets list of supported targets""" - return ([Cls(platform, arch) - for Cls in (CSharpExtArtifact, ProtocArtifact) - for platform in ('linux', 'macos', 'windows') - for arch in ('x86', 'x64')] + - [PythonArtifact('linux', 'x86', 'cp27-cp27m'), - PythonArtifact('linux', 'x86', 'cp27-cp27mu'), - PythonArtifact('linux', 'x86', 'cp34-cp34m'), - PythonArtifact('linux', 'x86', 'cp35-cp35m'), - PythonArtifact('linux', 'x86', 'cp36-cp36m'), - PythonArtifact('linux_extra', 'armv7', '2.7'), - PythonArtifact('linux_extra', 'armv7', '3.4'), - PythonArtifact('linux_extra', 'armv7', '3.5'), - PythonArtifact('linux_extra', 'armv7', '3.6'), - PythonArtifact('linux_extra', 'armv6', '2.7'), - PythonArtifact('linux_extra', 'armv6', '3.4'), - PythonArtifact('linux_extra', 'armv6', '3.5'), - PythonArtifact('linux_extra', 'armv6', '3.6'), - PythonArtifact('linux', 'x64', 'cp27-cp27m'), - PythonArtifact('linux', 'x64', 'cp27-cp27mu'), - PythonArtifact('linux', 'x64', 'cp34-cp34m'), - PythonArtifact('linux', 'x64', 'cp35-cp35m'), - PythonArtifact('linux', 'x64', 'cp36-cp36m'), - PythonArtifact('macos', 'x64', 'python2.7'), - PythonArtifact('macos', 'x64', 'python3.4'), - PythonArtifact('macos', 'x64', 'python3.5'), - PythonArtifact('macos', 'x64', 'python3.6'), - PythonArtifact('windows', 'x86', 'Python27_32bits'), - PythonArtifact('windows', 'x86', 'Python34_32bits'), - PythonArtifact('windows', 'x86', 'Python35_32bits'), - PythonArtifact('windows', 'x86', 'Python36_32bits'), - PythonArtifact('windows', 'x64', 'Python27'), - PythonArtifact('windows', 'x64', 'Python34'), - PythonArtifact('windows', 'x64', 'Python35'), - PythonArtifact('windows', 'x64', 'Python36'), - RubyArtifact('linux', 'x64'), - RubyArtifact('macos', 'x64'), - PHPArtifact('linux', 'x64'), - PHPArtifact('macos', 'x64')]) + """Gets list of supported targets""" + return ([ + Cls(platform, arch) + for Cls in (CSharpExtArtifact, ProtocArtifact) + for platform in ('linux', 'macos', 'windows') for arch in ('x86', 'x64') + ] + [ + PythonArtifact('linux', 'x86', 'cp27-cp27m'), PythonArtifact( + 'linux', 'x86', 'cp27-cp27mu'), PythonArtifact( + 'linux', 'x86', 'cp34-cp34m'), PythonArtifact( + 'linux', 'x86', 'cp35-cp35m'), PythonArtifact( + 'linux', 'x86', 'cp36-cp36m'), PythonArtifact( + 'linux_extra', 'armv7', '2.7'), PythonArtifact( + 'linux_extra', 'armv7', '3.4'), PythonArtifact( + 'linux_extra', 'armv7', '3.5'), + PythonArtifact('linux_extra', 'armv7', '3.6'), PythonArtifact( + 'linux_extra', 'armv6', '2.7'), PythonArtifact( + 'linux_extra', 'armv6', '3.4'), PythonArtifact( + 'linux_extra', 'armv6', '3.5'), PythonArtifact( + 'linux_extra', 'armv6', '3.6'), PythonArtifact( + 'linux', 'x64', 'cp27-cp27m'), PythonArtifact( + 'linux', 'x64', 'cp27-cp27mu'), PythonArtifact( + 'linux', 'x64', 'cp34-cp34m'), + PythonArtifact('linux', 'x64', 'cp35-cp35m'), PythonArtifact( + 'linux', 'x64', 'cp36-cp36m'), PythonArtifact( + 'macos', 'x64', 'python2.7'), PythonArtifact( + 'macos', 'x64', 'python3.4'), PythonArtifact('macos', 'x64', + 'python3.5'), + PythonArtifact('macos', 'x64', 'python3.6'), PythonArtifact( + 'windows', 'x86', 'Python27_32bits'), PythonArtifact( + 'windows', 'x86', 'Python34_32bits'), PythonArtifact( + 'windows', 'x86', 'Python35_32bits'), PythonArtifact( + 'windows', 'x86', 'Python36_32bits'), PythonArtifact( + 'windows', 'x64', 'Python27'), + PythonArtifact('windows', 'x64', 'Python34'), PythonArtifact( + 'windows', 'x64', 'Python35'), PythonArtifact( + 'windows', 'x64', 'Python36'), RubyArtifact( + 'linux', 'x64'), RubyArtifact('macos', 'x64'), PHPArtifact( + 'linux', 'x64'), PHPArtifact('macos', 'x64') + ]) diff --git a/tools/run_tests/artifacts/distribtest_targets.py b/tools/run_tests/artifacts/distribtest_targets.py index 7ba0e0ebc90..83f656b4338 100644 --- a/tools/run_tests/artifacts/distribtest_targets.py +++ b/tools/run_tests/artifacts/distribtest_targets.py @@ -12,7 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Definition of targets run distribution package tests.""" import os.path @@ -22,280 +21,306 @@ sys.path.insert(0, os.path.abspath('..')) import python_utils.jobset as jobset -def create_docker_jobspec(name, dockerfile_dir, shell_command, environ={}, - flake_retries=0, timeout_retries=0, - copy_rel_path=None): - """Creates jobspec for a task running under docker.""" - environ = environ.copy() - environ['RUN_COMMAND'] = shell_command - # the entire repo will be cloned if copy_rel_path is not set. - if copy_rel_path: - environ['RELATIVE_COPY_PATH'] = copy_rel_path - - docker_args=[] - for k,v in environ.items(): - docker_args += ['-e', '%s=%s' % (k, v)] - docker_env = {'DOCKERFILE_DIR': dockerfile_dir, - 'DOCKER_RUN_SCRIPT': 'tools/run_tests/dockerize/docker_run.sh'} - jobspec = jobset.JobSpec( - cmdline=['tools/run_tests/dockerize/build_and_run_docker.sh'] + docker_args, - environ=docker_env, - shortname='distribtest.%s' % (name), - timeout_seconds=30*60, - flake_retries=flake_retries, - timeout_retries=timeout_retries) - return jobspec - - -def create_jobspec(name, cmdline, environ=None, shell=False, - flake_retries=0, timeout_retries=0, +def create_docker_jobspec(name, + dockerfile_dir, + shell_command, + environ={}, + flake_retries=0, + timeout_retries=0, + copy_rel_path=None): + """Creates jobspec for a task running under docker.""" + environ = environ.copy() + environ['RUN_COMMAND'] = shell_command + # the entire repo will be cloned if copy_rel_path is not set. + if copy_rel_path: + environ['RELATIVE_COPY_PATH'] = copy_rel_path + + docker_args = [] + for k, v in environ.items(): + docker_args += ['-e', '%s=%s' % (k, v)] + docker_env = { + 'DOCKERFILE_DIR': dockerfile_dir, + 'DOCKER_RUN_SCRIPT': 'tools/run_tests/dockerize/docker_run.sh' + } + jobspec = jobset.JobSpec( + cmdline=['tools/run_tests/dockerize/build_and_run_docker.sh'] + + docker_args, + environ=docker_env, + shortname='distribtest.%s' % (name), + timeout_seconds=30 * 60, + flake_retries=flake_retries, + timeout_retries=timeout_retries) + return jobspec + + +def create_jobspec(name, + cmdline, + environ=None, + shell=False, + flake_retries=0, + timeout_retries=0, use_workspace=False, - timeout_seconds=10*60): - """Creates jobspec.""" - environ = environ.copy() - if use_workspace: - environ['WORKSPACE_NAME'] = 'workspace_%s' % name - cmdline = ['bash', - 'tools/run_tests/artifacts/run_in_workspace.sh'] + cmdline - jobspec = jobset.JobSpec( - cmdline=cmdline, - environ=environ, - shortname='distribtest.%s' % (name), - timeout_seconds=timeout_seconds, - flake_retries=flake_retries, - timeout_retries=timeout_retries, - shell=shell) - return jobspec + timeout_seconds=10 * 60): + """Creates jobspec.""" + environ = environ.copy() + if use_workspace: + environ['WORKSPACE_NAME'] = 'workspace_%s' % name + cmdline = ['bash', 'tools/run_tests/artifacts/run_in_workspace.sh' + ] + cmdline + jobspec = jobset.JobSpec( + cmdline=cmdline, + environ=environ, + shortname='distribtest.%s' % (name), + timeout_seconds=timeout_seconds, + flake_retries=flake_retries, + timeout_retries=timeout_retries, + shell=shell) + return jobspec class CSharpDistribTest(object): - """Tests C# NuGet package""" - - def __init__(self, platform, arch, docker_suffix=None, use_dotnet_cli=False): - self.name = 'csharp_%s_%s' % (platform, arch) - self.platform = platform - self.arch = arch - self.docker_suffix = docker_suffix - self.labels = ['distribtest', 'csharp', platform, arch] - self.script_suffix = '' - if docker_suffix: - self.name += '_%s' % docker_suffix - self.labels.append(docker_suffix) - if use_dotnet_cli: - self.name += '_dotnetcli' - self.script_suffix = '_dotnetcli' - self.labels.append('dotnetcli') - else: - self.labels.append('olddotnet') - - def pre_build_jobspecs(self): - return [] - - def build_jobspec(self): - if self.platform == 'linux': - return create_docker_jobspec(self.name, - 'tools/dockerfile/distribtest/csharp_%s_%s' % ( - self.docker_suffix, - self.arch), - 'test/distrib/csharp/run_distrib_test%s.sh' % self.script_suffix, - copy_rel_path='test/distrib') - elif self.platform == 'macos': - return create_jobspec(self.name, - ['test/distrib/csharp/run_distrib_test%s.sh' % self.script_suffix], - environ={'EXTERNAL_GIT_ROOT': '../../../..'}, - use_workspace=True) - elif self.platform == 'windows': - if self.arch == 'x64': - # Use double leading / as the first occurence gets removed by msys bash - # when invoking the .bat file (side-effect of posix path conversion) - environ={'MSBUILD_EXTRA_ARGS': '//p:Platform=x64', - 'DISTRIBTEST_OUTPATH': 'DistribTest\\bin\\x64\\Debug'} - else: - environ={'DISTRIBTEST_OUTPATH': 'DistribTest\\bin\\Debug'} - return create_jobspec(self.name, - ['test\\distrib\\csharp\\run_distrib_test%s.bat' % self.script_suffix], - environ=environ, - use_workspace=True) - else: - raise Exception("Not supported yet.") - - def __str__(self): - return self.name + """Tests C# NuGet package""" + + def __init__(self, platform, arch, docker_suffix=None, + use_dotnet_cli=False): + self.name = 'csharp_%s_%s' % (platform, arch) + self.platform = platform + self.arch = arch + self.docker_suffix = docker_suffix + self.labels = ['distribtest', 'csharp', platform, arch] + self.script_suffix = '' + if docker_suffix: + self.name += '_%s' % docker_suffix + self.labels.append(docker_suffix) + if use_dotnet_cli: + self.name += '_dotnetcli' + self.script_suffix = '_dotnetcli' + self.labels.append('dotnetcli') + else: + self.labels.append('olddotnet') + + def pre_build_jobspecs(self): + return [] + + def build_jobspec(self): + if self.platform == 'linux': + return create_docker_jobspec( + self.name, + 'tools/dockerfile/distribtest/csharp_%s_%s' % ( + self.docker_suffix, self.arch), + 'test/distrib/csharp/run_distrib_test%s.sh' % + self.script_suffix, + copy_rel_path='test/distrib') + elif self.platform == 'macos': + return create_jobspec( + self.name, [ + 'test/distrib/csharp/run_distrib_test%s.sh' % + self.script_suffix + ], + environ={'EXTERNAL_GIT_ROOT': '../../../..'}, + use_workspace=True) + elif self.platform == 'windows': + if self.arch == 'x64': + # Use double leading / as the first occurence gets removed by msys bash + # when invoking the .bat file (side-effect of posix path conversion) + environ = { + 'MSBUILD_EXTRA_ARGS': '//p:Platform=x64', + 'DISTRIBTEST_OUTPATH': 'DistribTest\\bin\\x64\\Debug' + } + else: + environ = {'DISTRIBTEST_OUTPATH': 'DistribTest\\bin\\Debug'} + return create_jobspec( + self.name, [ + 'test\\distrib\\csharp\\run_distrib_test%s.bat' % + self.script_suffix + ], + environ=environ, + use_workspace=True) + else: + raise Exception("Not supported yet.") + + def __str__(self): + return self.name + class PythonDistribTest(object): - """Tests Python package""" + """Tests Python package""" - def __init__(self, platform, arch, docker_suffix): - self.name = 'python_%s_%s_%s' % (platform, arch, docker_suffix) - self.platform = platform - self.arch = arch - self.docker_suffix = docker_suffix - self.labels = ['distribtest', 'python', platform, arch, docker_suffix] + def __init__(self, platform, arch, docker_suffix): + self.name = 'python_%s_%s_%s' % (platform, arch, docker_suffix) + self.platform = platform + self.arch = arch + self.docker_suffix = docker_suffix + self.labels = ['distribtest', 'python', platform, arch, docker_suffix] - def pre_build_jobspecs(self): - return [] + def pre_build_jobspecs(self): + return [] - def build_jobspec(self): - if not self.platform == 'linux': - raise Exception("Not supported yet.") + def build_jobspec(self): + if not self.platform == 'linux': + raise Exception("Not supported yet.") - return create_docker_jobspec(self.name, - 'tools/dockerfile/distribtest/python_%s_%s' % ( - self.docker_suffix, - self.arch), - 'test/distrib/python/run_distrib_test.sh', - copy_rel_path='test/distrib') + return create_docker_jobspec( + self.name, + 'tools/dockerfile/distribtest/python_%s_%s' % (self.docker_suffix, + self.arch), + 'test/distrib/python/run_distrib_test.sh', + copy_rel_path='test/distrib') - def __str__(self): - return self.name + def __str__(self): + return self.name class RubyDistribTest(object): - """Tests Ruby package""" + """Tests Ruby package""" - def __init__(self, platform, arch, docker_suffix): - self.name = 'ruby_%s_%s_%s' % (platform, arch, docker_suffix) - self.platform = platform - self.arch = arch - self.docker_suffix = docker_suffix - self.labels = ['distribtest', 'ruby', platform, arch, docker_suffix] + def __init__(self, platform, arch, docker_suffix): + self.name = 'ruby_%s_%s_%s' % (platform, arch, docker_suffix) + self.platform = platform + self.arch = arch + self.docker_suffix = docker_suffix + self.labels = ['distribtest', 'ruby', platform, arch, docker_suffix] - def pre_build_jobspecs(self): - return [] + def pre_build_jobspecs(self): + return [] - def build_jobspec(self): - if not self.platform == 'linux': - raise Exception("Not supported yet.") + def build_jobspec(self): + if not self.platform == 'linux': + raise Exception("Not supported yet.") - return create_docker_jobspec(self.name, - 'tools/dockerfile/distribtest/ruby_%s_%s' % ( - self.docker_suffix, - self.arch), - 'test/distrib/ruby/run_distrib_test.sh', - copy_rel_path='test/distrib') + return create_docker_jobspec( + self.name, + 'tools/dockerfile/distribtest/ruby_%s_%s' % (self.docker_suffix, + self.arch), + 'test/distrib/ruby/run_distrib_test.sh', + copy_rel_path='test/distrib') - def __str__(self): - return self.name + def __str__(self): + return self.name class PHPDistribTest(object): - """Tests PHP package""" - - def __init__(self, platform, arch, docker_suffix=None): - self.name = 'php_%s_%s_%s' % (platform, arch, docker_suffix) - self.platform = platform - self.arch = arch - self.docker_suffix = docker_suffix - self.labels = ['distribtest', 'php', platform, arch, docker_suffix] - - def pre_build_jobspecs(self): - return [] - - def build_jobspec(self): - if self.platform == 'linux': - return create_docker_jobspec(self.name, - 'tools/dockerfile/distribtest/php_%s_%s' % ( - self.docker_suffix, - self.arch), - 'test/distrib/php/run_distrib_test.sh', - copy_rel_path='test/distrib') - elif self.platform == 'macos': - return create_jobspec(self.name, - ['test/distrib/php/run_distrib_test.sh'], - environ={'EXTERNAL_GIT_ROOT': '../../../..'}, - use_workspace=True) - else: - raise Exception("Not supported yet.") - - def __str__(self): - return self.name + """Tests PHP package""" + + def __init__(self, platform, arch, docker_suffix=None): + self.name = 'php_%s_%s_%s' % (platform, arch, docker_suffix) + self.platform = platform + self.arch = arch + self.docker_suffix = docker_suffix + self.labels = ['distribtest', 'php', platform, arch, docker_suffix] + + def pre_build_jobspecs(self): + return [] + + def build_jobspec(self): + if self.platform == 'linux': + return create_docker_jobspec( + self.name, + 'tools/dockerfile/distribtest/php_%s_%s' % (self.docker_suffix, + self.arch), + 'test/distrib/php/run_distrib_test.sh', + copy_rel_path='test/distrib') + elif self.platform == 'macos': + return create_jobspec( + self.name, ['test/distrib/php/run_distrib_test.sh'], + environ={'EXTERNAL_GIT_ROOT': '../../../..'}, + use_workspace=True) + else: + raise Exception("Not supported yet.") + + def __str__(self): + return self.name class CppDistribTest(object): - """Tests Cpp make intall by building examples.""" - - def __init__(self, platform, arch, docker_suffix=None, testcase=None): - if platform == 'linux': - self.name = 'cpp_%s_%s_%s_%s' % (platform, arch, docker_suffix, testcase) - else: - self.name = 'cpp_%s_%s_%s' % (platform, arch, testcase) - self.platform = platform - self.arch = arch - self.docker_suffix = docker_suffix - self.testcase = testcase - self.labels = ['distribtest', 'cpp', platform, arch, docker_suffix, testcase] - - def pre_build_jobspecs(self): - return [] - - def build_jobspec(self): - if self.platform == 'linux': - return create_docker_jobspec(self.name, - 'tools/dockerfile/distribtest/cpp_%s_%s' % ( - self.docker_suffix, - self.arch), - 'test/distrib/cpp/run_distrib_test_%s.sh' % self.testcase) - elif self.platform == 'windows': - return create_jobspec(self.name, - ['test\\distrib\\cpp\\run_distrib_test_%s.bat' % self.testcase], - environ={}, - timeout_seconds=30*60, - use_workspace=True) - else: - raise Exception("Not supported yet.") - - def __str__(self): - return self.name + """Tests Cpp make intall by building examples.""" + + def __init__(self, platform, arch, docker_suffix=None, testcase=None): + if platform == 'linux': + self.name = 'cpp_%s_%s_%s_%s' % (platform, arch, docker_suffix, + testcase) + else: + self.name = 'cpp_%s_%s_%s' % (platform, arch, testcase) + self.platform = platform + self.arch = arch + self.docker_suffix = docker_suffix + self.testcase = testcase + self.labels = [ + 'distribtest', 'cpp', platform, arch, docker_suffix, testcase + ] + + def pre_build_jobspecs(self): + return [] + + def build_jobspec(self): + if self.platform == 'linux': + return create_docker_jobspec( + self.name, 'tools/dockerfile/distribtest/cpp_%s_%s' % ( + self.docker_suffix, self.arch), + 'test/distrib/cpp/run_distrib_test_%s.sh' % self.testcase) + elif self.platform == 'windows': + return create_jobspec( + self.name, + ['test\\distrib\\cpp\\run_distrib_test_%s.bat' % self.testcase], + environ={}, + timeout_seconds=30 * 60, + use_workspace=True) + else: + raise Exception("Not supported yet.") + + def __str__(self): + return self.name def targets(): - """Gets list of supported targets""" - return [CppDistribTest('linux', 'x64', 'jessie', 'routeguide'), - CppDistribTest('linux', 'x64', 'jessie', 'cmake'), - CppDistribTest('windows', 'x86', testcase='cmake'), - CSharpDistribTest('linux', 'x64', 'wheezy'), - CSharpDistribTest('linux', 'x64', 'jessie'), - CSharpDistribTest('linux', 'x86', 'jessie'), - CSharpDistribTest('linux', 'x64', 'centos7'), - CSharpDistribTest('linux', 'x64', 'ubuntu1404'), - CSharpDistribTest('linux', 'x64', 'ubuntu1504'), - CSharpDistribTest('linux', 'x64', 'ubuntu1510'), - CSharpDistribTest('linux', 'x64', 'ubuntu1604'), - CSharpDistribTest('linux', 'x64', 'ubuntu1404', use_dotnet_cli=True), - CSharpDistribTest('macos', 'x86'), - CSharpDistribTest('windows', 'x86'), - CSharpDistribTest('windows', 'x64'), - PythonDistribTest('linux', 'x64', 'wheezy'), - PythonDistribTest('linux', 'x64', 'jessie'), - PythonDistribTest('linux', 'x86', 'jessie'), - PythonDistribTest('linux', 'x64', 'centos6'), - PythonDistribTest('linux', 'x64', 'centos7'), - PythonDistribTest('linux', 'x64', 'fedora20'), - PythonDistribTest('linux', 'x64', 'fedora21'), - PythonDistribTest('linux', 'x64', 'fedora22'), - PythonDistribTest('linux', 'x64', 'fedora23'), - PythonDistribTest('linux', 'x64', 'opensuse'), - PythonDistribTest('linux', 'x64', 'arch'), - PythonDistribTest('linux', 'x64', 'ubuntu1204'), - PythonDistribTest('linux', 'x64', 'ubuntu1404'), - PythonDistribTest('linux', 'x64', 'ubuntu1504'), - PythonDistribTest('linux', 'x64', 'ubuntu1510'), - PythonDistribTest('linux', 'x64', 'ubuntu1604'), - RubyDistribTest('linux', 'x64', 'wheezy'), - RubyDistribTest('linux', 'x64', 'jessie'), - RubyDistribTest('linux', 'x86', 'jessie'), - RubyDistribTest('linux', 'x64', 'centos6'), - RubyDistribTest('linux', 'x64', 'centos7'), - RubyDistribTest('linux', 'x64', 'fedora20'), - RubyDistribTest('linux', 'x64', 'fedora21'), - RubyDistribTest('linux', 'x64', 'fedora22'), - RubyDistribTest('linux', 'x64', 'fedora23'), - RubyDistribTest('linux', 'x64', 'opensuse'), - RubyDistribTest('linux', 'x64', 'ubuntu1204'), - RubyDistribTest('linux', 'x64', 'ubuntu1404'), - RubyDistribTest('linux', 'x64', 'ubuntu1504'), - RubyDistribTest('linux', 'x64', 'ubuntu1510'), - RubyDistribTest('linux', 'x64', 'ubuntu1604'), - PHPDistribTest('linux', 'x64', 'jessie'), - PHPDistribTest('macos', 'x64'), - ] + """Gets list of supported targets""" + return [ + CppDistribTest('linux', 'x64', 'jessie', 'routeguide'), + CppDistribTest('linux', 'x64', 'jessie', 'cmake'), + CppDistribTest('windows', 'x86', testcase='cmake'), + CSharpDistribTest('linux', 'x64', 'wheezy'), + CSharpDistribTest('linux', 'x64', 'jessie'), + CSharpDistribTest('linux', 'x86', 'jessie'), + CSharpDistribTest('linux', 'x64', 'centos7'), + CSharpDistribTest('linux', 'x64', 'ubuntu1404'), + CSharpDistribTest('linux', 'x64', 'ubuntu1504'), + CSharpDistribTest('linux', 'x64', 'ubuntu1510'), + CSharpDistribTest('linux', 'x64', 'ubuntu1604'), + CSharpDistribTest('linux', 'x64', 'ubuntu1404', use_dotnet_cli=True), + CSharpDistribTest('macos', 'x86'), + CSharpDistribTest('windows', 'x86'), + CSharpDistribTest('windows', 'x64'), + PythonDistribTest('linux', 'x64', 'wheezy'), + PythonDistribTest('linux', 'x64', 'jessie'), + PythonDistribTest('linux', 'x86', 'jessie'), + PythonDistribTest('linux', 'x64', 'centos6'), + PythonDistribTest('linux', 'x64', 'centos7'), + PythonDistribTest('linux', 'x64', 'fedora20'), + PythonDistribTest('linux', 'x64', 'fedora21'), + PythonDistribTest('linux', 'x64', 'fedora22'), + PythonDistribTest('linux', 'x64', 'fedora23'), + PythonDistribTest('linux', 'x64', 'opensuse'), + PythonDistribTest('linux', 'x64', 'arch'), + PythonDistribTest('linux', 'x64', 'ubuntu1204'), + PythonDistribTest('linux', 'x64', 'ubuntu1404'), + PythonDistribTest('linux', 'x64', 'ubuntu1504'), + PythonDistribTest('linux', 'x64', 'ubuntu1510'), + PythonDistribTest('linux', 'x64', 'ubuntu1604'), + RubyDistribTest('linux', 'x64', 'wheezy'), + RubyDistribTest('linux', 'x64', 'jessie'), + RubyDistribTest('linux', 'x86', 'jessie'), + RubyDistribTest('linux', 'x64', 'centos6'), + RubyDistribTest('linux', 'x64', 'centos7'), + RubyDistribTest('linux', 'x64', 'fedora20'), + RubyDistribTest('linux', 'x64', 'fedora21'), + RubyDistribTest('linux', 'x64', 'fedora22'), + RubyDistribTest('linux', 'x64', 'fedora23'), + RubyDistribTest('linux', 'x64', 'opensuse'), + RubyDistribTest('linux', 'x64', 'ubuntu1204'), + RubyDistribTest('linux', 'x64', 'ubuntu1404'), + RubyDistribTest('linux', 'x64', 'ubuntu1504'), + RubyDistribTest('linux', 'x64', 'ubuntu1510'), + RubyDistribTest('linux', 'x64', 'ubuntu1604'), + PHPDistribTest('linux', 'x64', 'jessie'), + PHPDistribTest('macos', 'x64'), + ] diff --git a/tools/run_tests/artifacts/package_targets.py b/tools/run_tests/artifacts/package_targets.py index ff93bb30e8e..52908454f2d 100644 --- a/tools/run_tests/artifacts/package_targets.py +++ b/tools/run_tests/artifacts/package_targets.py @@ -12,7 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Definition of targets to build distribution packages.""" import os.path @@ -22,128 +21,137 @@ sys.path.insert(0, os.path.abspath('..')) import python_utils.jobset as jobset -def create_docker_jobspec(name, dockerfile_dir, shell_command, environ={}, - flake_retries=0, timeout_retries=0): - """Creates jobspec for a task running under docker.""" - environ = environ.copy() - environ['RUN_COMMAND'] = shell_command - - docker_args=[] - for k,v in environ.items(): - docker_args += ['-e', '%s=%s' % (k, v)] - docker_env = {'DOCKERFILE_DIR': dockerfile_dir, - 'DOCKER_RUN_SCRIPT': 'tools/run_tests/dockerize/docker_run.sh', - 'OUTPUT_DIR': 'artifacts'} - jobspec = jobset.JobSpec( - cmdline=['tools/run_tests/dockerize/build_and_run_docker.sh'] + docker_args, - environ=docker_env, - shortname='build_package.%s' % (name), - timeout_seconds=30*60, - flake_retries=flake_retries, - timeout_retries=timeout_retries) - return jobspec - -def create_jobspec(name, cmdline, environ=None, cwd=None, shell=False, - flake_retries=0, timeout_retries=0): - """Creates jobspec.""" - jobspec = jobset.JobSpec( - cmdline=cmdline, - environ=environ, - cwd=cwd, - shortname='build_package.%s' % (name), - timeout_seconds=10*60, - flake_retries=flake_retries, - timeout_retries=timeout_retries, - shell=shell) - return jobspec +def create_docker_jobspec(name, + dockerfile_dir, + shell_command, + environ={}, + flake_retries=0, + timeout_retries=0): + """Creates jobspec for a task running under docker.""" + environ = environ.copy() + environ['RUN_COMMAND'] = shell_command + + docker_args = [] + for k, v in environ.items(): + docker_args += ['-e', '%s=%s' % (k, v)] + docker_env = { + 'DOCKERFILE_DIR': dockerfile_dir, + 'DOCKER_RUN_SCRIPT': 'tools/run_tests/dockerize/docker_run.sh', + 'OUTPUT_DIR': 'artifacts' + } + jobspec = jobset.JobSpec( + cmdline=['tools/run_tests/dockerize/build_and_run_docker.sh'] + + docker_args, + environ=docker_env, + shortname='build_package.%s' % (name), + timeout_seconds=30 * 60, + flake_retries=flake_retries, + timeout_retries=timeout_retries) + return jobspec + + +def create_jobspec(name, + cmdline, + environ=None, + cwd=None, + shell=False, + flake_retries=0, + timeout_retries=0): + """Creates jobspec.""" + jobspec = jobset.JobSpec( + cmdline=cmdline, + environ=environ, + cwd=cwd, + shortname='build_package.%s' % (name), + timeout_seconds=10 * 60, + flake_retries=flake_retries, + timeout_retries=timeout_retries, + shell=shell) + return jobspec class CSharpPackage: - """Builds C# nuget packages.""" - - def __init__(self, linux=False): - self.linux = linux - self.labels = ['package', 'csharp'] - if linux: - self.name = 'csharp_package_dotnetcli_linux' - self.labels += ['linux'] - else: - self.name = 'csharp_package_dotnetcli_windows' - self.labels += ['windows'] - - def pre_build_jobspecs(self): - return [] - - def build_jobspec(self): - if self.linux: - return create_docker_jobspec( - self.name, - 'tools/dockerfile/test/csharp_jessie_x64', - 'src/csharp/build_packages_dotnetcli.sh') - else: - return create_jobspec(self.name, - ['build_packages_dotnetcli.bat'], - cwd='src\\csharp', - shell=True) - - def __str__(self): - return self.name + """Builds C# nuget packages.""" + + def __init__(self, linux=False): + self.linux = linux + self.labels = ['package', 'csharp'] + if linux: + self.name = 'csharp_package_dotnetcli_linux' + self.labels += ['linux'] + else: + self.name = 'csharp_package_dotnetcli_windows' + self.labels += ['windows'] + + def pre_build_jobspecs(self): + return [] + + def build_jobspec(self): + if self.linux: + return create_docker_jobspec( + self.name, 'tools/dockerfile/test/csharp_jessie_x64', + 'src/csharp/build_packages_dotnetcli.sh') + else: + return create_jobspec( + self.name, ['build_packages_dotnetcli.bat'], + cwd='src\\csharp', + shell=True) + + def __str__(self): + return self.name + class RubyPackage: - """Collects ruby gems created in the artifact phase""" + """Collects ruby gems created in the artifact phase""" - def __init__(self): - self.name = 'ruby_package' - self.labels = ['package', 'ruby', 'linux'] + def __init__(self): + self.name = 'ruby_package' + self.labels = ['package', 'ruby', 'linux'] - def pre_build_jobspecs(self): - return [] + def pre_build_jobspecs(self): + return [] - def build_jobspec(self): - return create_docker_jobspec( - self.name, - 'tools/dockerfile/grpc_artifact_linux_x64', - 'tools/run_tests/artifacts/build_package_ruby.sh') + def build_jobspec(self): + return create_docker_jobspec( + self.name, 'tools/dockerfile/grpc_artifact_linux_x64', + 'tools/run_tests/artifacts/build_package_ruby.sh') class PythonPackage: - """Collects python eggs and wheels created in the artifact phase""" + """Collects python eggs and wheels created in the artifact phase""" - def __init__(self): - self.name = 'python_package' - self.labels = ['package', 'python', 'linux'] + def __init__(self): + self.name = 'python_package' + self.labels = ['package', 'python', 'linux'] - def pre_build_jobspecs(self): - return [] + def pre_build_jobspecs(self): + return [] - def build_jobspec(self): - return create_docker_jobspec( - self.name, - 'tools/dockerfile/grpc_artifact_linux_x64', - 'tools/run_tests/artifacts/build_package_python.sh') + def build_jobspec(self): + return create_docker_jobspec( + self.name, 'tools/dockerfile/grpc_artifact_linux_x64', + 'tools/run_tests/artifacts/build_package_python.sh') class PHPPackage: - """Copy PHP PECL package artifact""" + """Copy PHP PECL package artifact""" - def __init__(self): - self.name = 'php_package' - self.labels = ['package', 'php', 'linux'] + def __init__(self): + self.name = 'php_package' + self.labels = ['package', 'php', 'linux'] - def pre_build_jobspecs(self): - return [] + def pre_build_jobspecs(self): + return [] - def build_jobspec(self): - return create_docker_jobspec( - self.name, - 'tools/dockerfile/grpc_artifact_linux_x64', - 'tools/run_tests/artifacts/build_package_php.sh') + def build_jobspec(self): + return create_docker_jobspec( + self.name, 'tools/dockerfile/grpc_artifact_linux_x64', + 'tools/run_tests/artifacts/build_package_php.sh') def targets(): - """Gets list of supported targets""" - return [CSharpPackage(), - CSharpPackage(linux=True), - RubyPackage(), - PythonPackage(), - PHPPackage()] + """Gets list of supported targets""" + return [ + CSharpPackage(), CSharpPackage(linux=True), RubyPackage(), + PythonPackage(), PHPPackage() + ] From 888093c6ed0d24eed699173b5fb35235fe7a6069 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 11 Dec 2017 18:00:40 -0800 Subject: [PATCH 112/127] yapf run_tests --- tools/distrib/yapf_code.sh | 5 +- tools/run_tests/run_build_statistics.py | 302 +-- tools/run_tests/run_interop_tests.py | 1988 ++++++++-------- tools/run_tests/run_microbenchmark.py | 346 +-- tools/run_tests/run_performance_tests.py | 1143 ++++----- tools/run_tests/run_tests.py | 2668 ++++++++++++---------- tools/run_tests/run_tests_matrix.py | 922 ++++---- tools/run_tests/start_port_server.py | 1 - tools/run_tests/task_runner.py | 100 +- 9 files changed, 4005 insertions(+), 3470 deletions(-) diff --git a/tools/distrib/yapf_code.sh b/tools/distrib/yapf_code.sh index 6d2759ddd12..698c341d888 100755 --- a/tools/distrib/yapf_code.sh +++ b/tools/distrib/yapf_code.sh @@ -25,10 +25,7 @@ DIRS=( 'tools/distrib' 'tools/interop_matrix' 'tools/profiling' - 'tools/run_tests/python_utils' - 'tools/run_tests/sanity' - 'tools/run_tests/performance' - 'tools/run_tests/artifacts' + 'tools/run_tests' ) EXCLUSIONS=( 'grpcio/grpc_*.py' diff --git a/tools/run_tests/run_build_statistics.py b/tools/run_tests/run_build_statistics.py index 1e957b66774..4af00a47a67 100755 --- a/tools/run_tests/run_build_statistics.py +++ b/tools/run_tests/run_build_statistics.py @@ -12,7 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Tool to get build statistics from Jenkins and upload to BigQuery.""" from __future__ import print_function @@ -27,39 +26,38 @@ import re import sys import urllib - -gcp_utils_dir = os.path.abspath(os.path.join( - os.path.dirname(__file__), '../gcp/utils')) +gcp_utils_dir = os.path.abspath( + os.path.join(os.path.dirname(__file__), '../gcp/utils')) sys.path.append(gcp_utils_dir) import big_query_utils - _PROJECT_ID = 'grpc-testing' _HAS_MATRIX = True -_BUILDS = {'gRPC_interop_master': not _HAS_MATRIX, - 'gRPC_master_linux': not _HAS_MATRIX, - 'gRPC_master_macos': not _HAS_MATRIX, - 'gRPC_master_windows': not _HAS_MATRIX, - 'gRPC_performance_master': not _HAS_MATRIX, - 'gRPC_portability_master_linux': not _HAS_MATRIX, - 'gRPC_portability_master_windows': not _HAS_MATRIX, - 'gRPC_master_asanitizer_c': not _HAS_MATRIX, - 'gRPC_master_asanitizer_cpp': not _HAS_MATRIX, - 'gRPC_master_msan_c': not _HAS_MATRIX, - 'gRPC_master_tsanitizer_c': not _HAS_MATRIX, - 'gRPC_master_tsan_cpp': not _HAS_MATRIX, - 'gRPC_interop_pull_requests': not _HAS_MATRIX, - 'gRPC_performance_pull_requests': not _HAS_MATRIX, - 'gRPC_portability_pull_requests_linux': not _HAS_MATRIX, - 'gRPC_portability_pr_win': not _HAS_MATRIX, - 'gRPC_pull_requests_linux': not _HAS_MATRIX, - 'gRPC_pull_requests_macos': not _HAS_MATRIX, - 'gRPC_pr_win': not _HAS_MATRIX, - 'gRPC_pull_requests_asan_c': not _HAS_MATRIX, - 'gRPC_pull_requests_asan_cpp': not _HAS_MATRIX, - 'gRPC_pull_requests_msan_c': not _HAS_MATRIX, - 'gRPC_pull_requests_tsan_c': not _HAS_MATRIX, - 'gRPC_pull_requests_tsan_cpp': not _HAS_MATRIX, +_BUILDS = { + 'gRPC_interop_master': not _HAS_MATRIX, + 'gRPC_master_linux': not _HAS_MATRIX, + 'gRPC_master_macos': not _HAS_MATRIX, + 'gRPC_master_windows': not _HAS_MATRIX, + 'gRPC_performance_master': not _HAS_MATRIX, + 'gRPC_portability_master_linux': not _HAS_MATRIX, + 'gRPC_portability_master_windows': not _HAS_MATRIX, + 'gRPC_master_asanitizer_c': not _HAS_MATRIX, + 'gRPC_master_asanitizer_cpp': not _HAS_MATRIX, + 'gRPC_master_msan_c': not _HAS_MATRIX, + 'gRPC_master_tsanitizer_c': not _HAS_MATRIX, + 'gRPC_master_tsan_cpp': not _HAS_MATRIX, + 'gRPC_interop_pull_requests': not _HAS_MATRIX, + 'gRPC_performance_pull_requests': not _HAS_MATRIX, + 'gRPC_portability_pull_requests_linux': not _HAS_MATRIX, + 'gRPC_portability_pr_win': not _HAS_MATRIX, + 'gRPC_pull_requests_linux': not _HAS_MATRIX, + 'gRPC_pull_requests_macos': not _HAS_MATRIX, + 'gRPC_pr_win': not _HAS_MATRIX, + 'gRPC_pull_requests_asan_c': not _HAS_MATRIX, + 'gRPC_pull_requests_asan_cpp': not _HAS_MATRIX, + 'gRPC_pull_requests_msan_c': not _HAS_MATRIX, + 'gRPC_pull_requests_tsan_c': not _HAS_MATRIX, + 'gRPC_pull_requests_tsan_cpp': not _HAS_MATRIX, } _URL_BASE = 'https://grpc-testing.appspot.com/job' @@ -99,147 +97,155 @@ _DATASET_ID = 'build_statistics' def _scrape_for_known_errors(html): - error_list = [] - for known_error in _KNOWN_ERRORS: - errors = re.findall(known_error, html) - this_error_count = len(errors) - if this_error_count > 0: - error_list.append({'description': known_error, - 'count': this_error_count}) - print('====> %d failures due to %s' % (this_error_count, known_error)) - return error_list + error_list = [] + for known_error in _KNOWN_ERRORS: + errors = re.findall(known_error, html) + this_error_count = len(errors) + if this_error_count > 0: + error_list.append({ + 'description': known_error, + 'count': this_error_count + }) + print('====> %d failures due to %s' % + (this_error_count, known_error)) + return error_list def _no_report_files_found(html): - return _NO_REPORT_FILES_FOUND_ERROR in html + return _NO_REPORT_FILES_FOUND_ERROR in html def _get_last_processed_buildnumber(build_name): - query = 'SELECT max(build_number) FROM [%s:%s.%s];' % ( - _PROJECT_ID, _DATASET_ID, build_name) - query_job = big_query_utils.sync_query_job(bq, _PROJECT_ID, query) - page = bq.jobs().getQueryResults( - pageToken=None, - **query_job['jobReference']).execute(num_retries=3) - if page['rows'][0]['f'][0]['v']: - return int(page['rows'][0]['f'][0]['v']) - return 0 + query = 'SELECT max(build_number) FROM [%s:%s.%s];' % ( + _PROJECT_ID, _DATASET_ID, build_name) + query_job = big_query_utils.sync_query_job(bq, _PROJECT_ID, query) + page = bq.jobs().getQueryResults( + pageToken=None, **query_job['jobReference']).execute(num_retries=3) + if page['rows'][0]['f'][0]['v']: + return int(page['rows'][0]['f'][0]['v']) + return 0 def _process_matrix(build, url_base): - matrix_list = [] - for matrix in build.get_matrix_runs(): - matrix_str = re.match('.*\\xc2\\xbb ((?:[^,]+,?)+) #.*', - matrix.name).groups()[0] - matrix_tuple = matrix_str.split(',') - json_url = '%s/config=%s,language=%s,platform=%s/testReport/api/json' % ( - url_base, matrix_tuple[0], matrix_tuple[1], matrix_tuple[2]) - console_url = '%s/config=%s,language=%s,platform=%s/consoleFull' % ( - url_base, matrix_tuple[0], matrix_tuple[1], matrix_tuple[2]) - matrix_dict = {'name': matrix_str, - 'duration': matrix.get_duration().total_seconds()} - matrix_dict.update(_process_build(json_url, console_url)) - matrix_list.append(matrix_dict) - - return matrix_list + matrix_list = [] + for matrix in build.get_matrix_runs(): + matrix_str = re.match('.*\\xc2\\xbb ((?:[^,]+,?)+) #.*', + matrix.name).groups()[0] + matrix_tuple = matrix_str.split(',') + json_url = '%s/config=%s,language=%s,platform=%s/testReport/api/json' % ( + url_base, matrix_tuple[0], matrix_tuple[1], matrix_tuple[2]) + console_url = '%s/config=%s,language=%s,platform=%s/consoleFull' % ( + url_base, matrix_tuple[0], matrix_tuple[1], matrix_tuple[2]) + matrix_dict = { + 'name': matrix_str, + 'duration': matrix.get_duration().total_seconds() + } + matrix_dict.update(_process_build(json_url, console_url)) + matrix_list.append(matrix_dict) + + return matrix_list def _process_build(json_url, console_url): - build_result = {} - error_list = [] - try: - html = urllib.urlopen(json_url).read() - test_result = json.loads(html) - print('====> Parsing result from %s' % json_url) - failure_count = test_result['failCount'] - build_result['pass_count'] = test_result['passCount'] - build_result['failure_count'] = failure_count - # This means Jenkins failure occurred. - build_result['no_report_files_found'] = _no_report_files_found(html) - # Only check errors if Jenkins failure occurred. - if build_result['no_report_files_found']: - error_list = _scrape_for_known_errors(html) - except Exception as e: - print('====> Got exception for %s: %s.' % (json_url, str(e))) - print('====> Parsing errors from %s.' % console_url) - html = urllib.urlopen(console_url).read() - build_result['pass_count'] = 0 - build_result['failure_count'] = 1 - # In this case, the string doesn't exist in the result html but the fact - # that we fail to parse the result html indicates Jenkins failure and hence - # no report files were generated. - build_result['no_report_files_found'] = True - error_list = _scrape_for_known_errors(html) - - if error_list: - build_result['error'] = error_list - elif build_result['no_report_files_found']: - build_result['error'] = [{'description': _UNKNOWN_ERROR, 'count': 1}] - else: - build_result['error'] = [{'description': '', 'count': 0}] - - return build_result + build_result = {} + error_list = [] + try: + html = urllib.urlopen(json_url).read() + test_result = json.loads(html) + print('====> Parsing result from %s' % json_url) + failure_count = test_result['failCount'] + build_result['pass_count'] = test_result['passCount'] + build_result['failure_count'] = failure_count + # This means Jenkins failure occurred. + build_result['no_report_files_found'] = _no_report_files_found(html) + # Only check errors if Jenkins failure occurred. + if build_result['no_report_files_found']: + error_list = _scrape_for_known_errors(html) + except Exception as e: + print('====> Got exception for %s: %s.' % (json_url, str(e))) + print('====> Parsing errors from %s.' % console_url) + html = urllib.urlopen(console_url).read() + build_result['pass_count'] = 0 + build_result['failure_count'] = 1 + # In this case, the string doesn't exist in the result html but the fact + # that we fail to parse the result html indicates Jenkins failure and hence + # no report files were generated. + build_result['no_report_files_found'] = True + error_list = _scrape_for_known_errors(html) + + if error_list: + build_result['error'] = error_list + elif build_result['no_report_files_found']: + build_result['error'] = [{'description': _UNKNOWN_ERROR, 'count': 1}] + else: + build_result['error'] = [{'description': '', 'count': 0}] + + return build_result # parse command line argp = argparse.ArgumentParser(description='Get build statistics.') argp.add_argument('-u', '--username', default='jenkins') -argp.add_argument('-b', '--builds', - choices=['all'] + sorted(_BUILDS.keys()), - nargs='+', - default=['all']) +argp.add_argument( + '-b', + '--builds', + choices=['all'] + sorted(_BUILDS.keys()), + nargs='+', + default=['all']) args = argp.parse_args() J = Jenkins('https://grpc-testing.appspot.com', args.username, 'apiToken') bq = big_query_utils.create_big_query() for build_name in _BUILDS.keys() if 'all' in args.builds else args.builds: - print('====> Build: %s' % build_name) - # Since get_last_completed_build() always fails due to malformatted string - # error, we use get_build_metadata() instead. - job = None - try: - job = J[build_name] - except Exception as e: - print('====> Failed to get build %s: %s.' % (build_name, str(e))) - continue - last_processed_build_number = _get_last_processed_buildnumber(build_name) - last_complete_build_number = job.get_last_completed_buildnumber() - # To avoid processing all builds for a project never looked at. In this case, - # only examine 10 latest builds. - starting_build_number = max(last_processed_build_number+1, - last_complete_build_number-9) - for build_number in xrange(starting_build_number, - last_complete_build_number+1): - print('====> Processing %s build %d.' % (build_name, build_number)) - build = None + print('====> Build: %s' % build_name) + # Since get_last_completed_build() always fails due to malformatted string + # error, we use get_build_metadata() instead. + job = None try: - build = job.get_build_metadata(build_number) - print('====> Build status: %s.' % build.get_status()) - if build.get_status() == 'ABORTED': + job = J[build_name] + except Exception as e: + print('====> Failed to get build %s: %s.' % (build_name, str(e))) continue - # If any build is still running, stop processing this job. Next time, we - # start from where it was left so that all builds are processed - # sequentially. - if build.is_running(): - print('====> Build %d is still running.' % build_number) - break - except KeyError: - print('====> Build %s is missing. Skip.' % build_number) - continue - build_result = {'build_number': build_number, - 'timestamp': str(build.get_timestamp())} - url_base = json_url = '%s/%s/%d' % (_URL_BASE, build_name, build_number) - if _BUILDS[build_name]: # The build has matrix, such as gRPC_master. - build_result['matrix'] = _process_matrix(build, url_base) - else: - json_url = '%s/testReport/api/json' % url_base - console_url = '%s/consoleFull' % url_base - build_result['duration'] = build.get_duration().total_seconds() - build_stat = _process_build(json_url, console_url) - build_result.update(build_stat) - rows = [big_query_utils.make_row(build_number, build_result)] - if not big_query_utils.insert_rows(bq, _PROJECT_ID, _DATASET_ID, build_name, - rows): - print('====> Error uploading result to bigquery.') - sys.exit(1) + last_processed_build_number = _get_last_processed_buildnumber(build_name) + last_complete_build_number = job.get_last_completed_buildnumber() + # To avoid processing all builds for a project never looked at. In this case, + # only examine 10 latest builds. + starting_build_number = max(last_processed_build_number + 1, + last_complete_build_number - 9) + for build_number in xrange(starting_build_number, + last_complete_build_number + 1): + print('====> Processing %s build %d.' % (build_name, build_number)) + build = None + try: + build = job.get_build_metadata(build_number) + print('====> Build status: %s.' % build.get_status()) + if build.get_status() == 'ABORTED': + continue + # If any build is still running, stop processing this job. Next time, we + # start from where it was left so that all builds are processed + # sequentially. + if build.is_running(): + print('====> Build %d is still running.' % build_number) + break + except KeyError: + print('====> Build %s is missing. Skip.' % build_number) + continue + build_result = { + 'build_number': build_number, + 'timestamp': str(build.get_timestamp()) + } + url_base = json_url = '%s/%s/%d' % (_URL_BASE, build_name, build_number) + if _BUILDS[build_name]: # The build has matrix, such as gRPC_master. + build_result['matrix'] = _process_matrix(build, url_base) + else: + json_url = '%s/testReport/api/json' % url_base + console_url = '%s/consoleFull' % url_base + build_result['duration'] = build.get_duration().total_seconds() + build_stat = _process_build(json_url, console_url) + build_result.update(build_stat) + rows = [big_query_utils.make_row(build_number, build_result)] + if not big_query_utils.insert_rows(bq, _PROJECT_ID, _DATASET_ID, + build_name, rows): + print('====> Error uploading result to bigquery.') + sys.exit(1) diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index 8f46ea99fd8..99f42988137 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -12,7 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Run interop (cross-language) tests in parallel.""" from __future__ import print_function @@ -37,9 +36,9 @@ import python_utils.jobset as jobset import python_utils.report_utils as report_utils # It's ok to not import because this is only necessary to upload results to BQ. try: - from python_utils.upload_test_results import upload_interop_results_to_bq + from python_utils.upload_test_results import upload_interop_results_to_bq except ImportError as e: - print(e) + print(e) # Docker doesn't clean up after itself, so we do it on exit. atexit.register(lambda: subprocess.call(['stty', 'echo'])) @@ -47,22 +46,24 @@ atexit.register(lambda: subprocess.call(['stty', 'echo'])) ROOT = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '../..')) os.chdir(ROOT) -_DEFAULT_SERVER_PORT=8080 +_DEFAULT_SERVER_PORT = 8080 -_SKIP_CLIENT_COMPRESSION = ['client_compressed_unary', - 'client_compressed_streaming'] +_SKIP_CLIENT_COMPRESSION = [ + 'client_compressed_unary', 'client_compressed_streaming' +] -_SKIP_SERVER_COMPRESSION = ['server_compressed_unary', - 'server_compressed_streaming'] +_SKIP_SERVER_COMPRESSION = [ + 'server_compressed_unary', 'server_compressed_streaming' +] _SKIP_COMPRESSION = _SKIP_CLIENT_COMPRESSION + _SKIP_SERVER_COMPRESSION -_SKIP_ADVANCED = ['status_code_and_message', - 'custom_metadata', - 'unimplemented_method', - 'unimplemented_service'] +_SKIP_ADVANCED = [ + 'status_code_and_message', 'custom_metadata', 'unimplemented_method', + 'unimplemented_service' +] -_TEST_TIMEOUT = 3*60 +_TEST_TIMEOUT = 3 * 60 # disable this test on core-based languages, # see https://github.com/grpc/grpc/issues/9779 @@ -77,977 +78,1054 @@ _XML_REPORT = 'report.xml' class CXXLanguage: - def __init__(self): - self.client_cwd = None - self.server_cwd = None - self.http2_cwd = None - self.safename = 'cxx' + def __init__(self): + self.client_cwd = None + self.server_cwd = None + self.http2_cwd = None + self.safename = 'cxx' - def client_cmd(self, args): - return ['bins/opt/interop_client'] + args + def client_cmd(self, args): + return ['bins/opt/interop_client'] + args - def client_cmd_http2interop(self, args): - return ['bins/opt/http2_client'] + args + def client_cmd_http2interop(self, args): + return ['bins/opt/http2_client'] + args - def cloud_to_prod_env(self): - return {} + def cloud_to_prod_env(self): + return {} - def server_cmd(self, args): - return ['bins/opt/interop_server'] + args + def server_cmd(self, args): + return ['bins/opt/interop_server'] + args - def global_env(self): - return {} + def global_env(self): + return {} - def unimplemented_test_cases(self): - return _SKIP_DATA_FRAME_PADDING + def unimplemented_test_cases(self): + return _SKIP_DATA_FRAME_PADDING - def unimplemented_test_cases_server(self): - return [] + def unimplemented_test_cases_server(self): + return [] - def __str__(self): - return 'c++' + def __str__(self): + return 'c++' class CSharpLanguage: - def __init__(self): - self.client_cwd = 'src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/net45' - self.server_cwd = 'src/csharp/Grpc.IntegrationTesting.Server/bin/Debug/net45' - self.safename = str(self) + def __init__(self): + self.client_cwd = 'src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/net45' + self.server_cwd = 'src/csharp/Grpc.IntegrationTesting.Server/bin/Debug/net45' + self.safename = str(self) - def client_cmd(self, args): - return ['mono', 'Grpc.IntegrationTesting.Client.exe'] + args + def client_cmd(self, args): + return ['mono', 'Grpc.IntegrationTesting.Client.exe'] + args - def cloud_to_prod_env(self): - return {} + def cloud_to_prod_env(self): + return {} - def server_cmd(self, args): - return ['mono', 'Grpc.IntegrationTesting.Server.exe'] + args + def server_cmd(self, args): + return ['mono', 'Grpc.IntegrationTesting.Server.exe'] + args - def global_env(self): - return {} + def global_env(self): + return {} - def unimplemented_test_cases(self): - return _SKIP_SERVER_COMPRESSION + _SKIP_DATA_FRAME_PADDING + def unimplemented_test_cases(self): + return _SKIP_SERVER_COMPRESSION + _SKIP_DATA_FRAME_PADDING - def unimplemented_test_cases_server(self): - return _SKIP_COMPRESSION + def unimplemented_test_cases_server(self): + return _SKIP_COMPRESSION - def __str__(self): - return 'csharp' + def __str__(self): + return 'csharp' class CSharpCoreCLRLanguage: - def __init__(self): - self.client_cwd = 'src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.0' - self.server_cwd = 'src/csharp/Grpc.IntegrationTesting.Server/bin/Debug/netcoreapp1.0' - self.safename = str(self) + def __init__(self): + self.client_cwd = 'src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.0' + self.server_cwd = 'src/csharp/Grpc.IntegrationTesting.Server/bin/Debug/netcoreapp1.0' + self.safename = str(self) - def client_cmd(self, args): - return ['dotnet', 'exec', 'Grpc.IntegrationTesting.Client.dll'] + args + def client_cmd(self, args): + return ['dotnet', 'exec', 'Grpc.IntegrationTesting.Client.dll'] + args - def cloud_to_prod_env(self): - return {} + def cloud_to_prod_env(self): + return {} - def server_cmd(self, args): - return ['dotnet', 'exec', 'Grpc.IntegrationTesting.Server.dll'] + args + def server_cmd(self, args): + return ['dotnet', 'exec', 'Grpc.IntegrationTesting.Server.dll'] + args - def global_env(self): - return {} + def global_env(self): + return {} - def unimplemented_test_cases(self): - return _SKIP_SERVER_COMPRESSION + _SKIP_DATA_FRAME_PADDING + def unimplemented_test_cases(self): + return _SKIP_SERVER_COMPRESSION + _SKIP_DATA_FRAME_PADDING - def unimplemented_test_cases_server(self): - return _SKIP_COMPRESSION + def unimplemented_test_cases_server(self): + return _SKIP_COMPRESSION - def __str__(self): - return 'csharpcoreclr' + def __str__(self): + return 'csharpcoreclr' class JavaLanguage: - def __init__(self): - self.client_cwd = '../grpc-java' - self.server_cwd = '../grpc-java' - self.http2_cwd = '../grpc-java' - self.safename = str(self) + def __init__(self): + self.client_cwd = '../grpc-java' + self.server_cwd = '../grpc-java' + self.http2_cwd = '../grpc-java' + self.safename = str(self) - def client_cmd(self, args): - return ['./run-test-client.sh'] + args + def client_cmd(self, args): + return ['./run-test-client.sh'] + args - def client_cmd_http2interop(self, args): - return ['./interop-testing/build/install/grpc-interop-testing/bin/http2-client'] + args + def client_cmd_http2interop(self, args): + return [ + './interop-testing/build/install/grpc-interop-testing/bin/http2-client' + ] + args - def cloud_to_prod_env(self): - return {} + def cloud_to_prod_env(self): + return {} - def server_cmd(self, args): - return ['./run-test-server.sh'] + args + def server_cmd(self, args): + return ['./run-test-server.sh'] + args - def global_env(self): - return {} + def global_env(self): + return {} - def unimplemented_test_cases(self): - return [] + def unimplemented_test_cases(self): + return [] - def unimplemented_test_cases_server(self): - return _SKIP_COMPRESSION + def unimplemented_test_cases_server(self): + return _SKIP_COMPRESSION - def __str__(self): - return 'java' + def __str__(self): + return 'java' class JavaOkHttpClient: - def __init__(self): - self.client_cwd = '../grpc-java' - self.safename = 'java' + def __init__(self): + self.client_cwd = '../grpc-java' + self.safename = 'java' - def client_cmd(self, args): - return ['./run-test-client.sh', '--use_okhttp=true'] + args + def client_cmd(self, args): + return ['./run-test-client.sh', '--use_okhttp=true'] + args - def cloud_to_prod_env(self): - return {} + def cloud_to_prod_env(self): + return {} - def global_env(self): - return {} + def global_env(self): + return {} - def unimplemented_test_cases(self): - return _SKIP_DATA_FRAME_PADDING + def unimplemented_test_cases(self): + return _SKIP_DATA_FRAME_PADDING - def __str__(self): - return 'javaokhttp' + def __str__(self): + return 'javaokhttp' class GoLanguage: - def __init__(self): - # TODO: this relies on running inside docker - self.client_cwd = '/go/src/google.golang.org/grpc/interop/client' - self.server_cwd = '/go/src/google.golang.org/grpc/interop/server' - self.http2_cwd = '/go/src/google.golang.org/grpc/interop/http2' - self.safename = str(self) + def __init__(self): + # TODO: this relies on running inside docker + self.client_cwd = '/go/src/google.golang.org/grpc/interop/client' + self.server_cwd = '/go/src/google.golang.org/grpc/interop/server' + self.http2_cwd = '/go/src/google.golang.org/grpc/interop/http2' + self.safename = str(self) + + def client_cmd(self, args): + return ['go', 'run', 'client.go'] + args - def client_cmd(self, args): - return ['go', 'run', 'client.go'] + args + def client_cmd_http2interop(self, args): + return ['go', 'run', 'negative_http2_client.go'] + args - def client_cmd_http2interop(self, args): - return ['go', 'run', 'negative_http2_client.go'] + args + def cloud_to_prod_env(self): + return {} - def cloud_to_prod_env(self): - return {} + def server_cmd(self, args): + return ['go', 'run', 'server.go'] + args - def server_cmd(self, args): - return ['go', 'run', 'server.go'] + args + def global_env(self): + return {} - def global_env(self): - return {} + def unimplemented_test_cases(self): + return _SKIP_COMPRESSION - def unimplemented_test_cases(self): - return _SKIP_COMPRESSION + def unimplemented_test_cases_server(self): + return _SKIP_COMPRESSION - def unimplemented_test_cases_server(self): - return _SKIP_COMPRESSION + def __str__(self): + return 'go' - def __str__(self): - return 'go' class Http2Server: - """Represents the HTTP/2 Interop Test server + """Represents the HTTP/2 Interop Test server This pretends to be a language in order to be built and run, but really it isn't. """ - def __init__(self): - self.server_cwd = None - self.safename = str(self) - def server_cmd(self, args): - return ['python test/http2_test/http2_test_server.py'] + def __init__(self): + self.server_cwd = None + self.safename = str(self) + + def server_cmd(self, args): + return ['python test/http2_test/http2_test_server.py'] + + def cloud_to_prod_env(self): + return {} - def cloud_to_prod_env(self): - return {} + def global_env(self): + return {} - def global_env(self): - return {} + def unimplemented_test_cases(self): + return _TEST_CASES + _SKIP_DATA_FRAME_PADDING - def unimplemented_test_cases(self): - return _TEST_CASES + _SKIP_DATA_FRAME_PADDING + def unimplemented_test_cases_server(self): + return _TEST_CASES - def unimplemented_test_cases_server(self): - return _TEST_CASES + def __str__(self): + return 'http2' - def __str__(self): - return 'http2' class Http2Client: - """Represents the HTTP/2 Interop Test + """Represents the HTTP/2 Interop Test This pretends to be a language in order to be built and run, but really it isn't. """ - def __init__(self): - self.client_cwd = None - self.safename = str(self) - def client_cmd(self, args): - return ['tools/http2_interop/http2_interop.test', '-test.v'] + args + def __init__(self): + self.client_cwd = None + self.safename = str(self) - def cloud_to_prod_env(self): - return {} + def client_cmd(self, args): + return ['tools/http2_interop/http2_interop.test', '-test.v'] + args - def global_env(self): - return {} + def cloud_to_prod_env(self): + return {} - def unimplemented_test_cases(self): - return _TEST_CASES + def global_env(self): + return {} - def unimplemented_test_cases_server(self): - return _TEST_CASES + def unimplemented_test_cases(self): + return _TEST_CASES + + def unimplemented_test_cases_server(self): + return _TEST_CASES + + def __str__(self): + return 'http2' - def __str__(self): - return 'http2' class NodeLanguage: - def __init__(self): - self.client_cwd = '../grpc-node' - self.server_cwd = '../grpc-node' - self.safename = str(self) + def __init__(self): + self.client_cwd = '../grpc-node' + self.server_cwd = '../grpc-node' + self.safename = str(self) - def client_cmd(self, args): - return ['packages/grpc-native-core/deps/grpc/tools/run_tests/interop/with_nvm.sh', + def client_cmd(self, args): + return [ + 'packages/grpc-native-core/deps/grpc/tools/run_tests/interop/with_nvm.sh', 'node', '--require', './test/fixtures/native_native', - 'test/interop/interop_client.js'] + args + 'test/interop/interop_client.js' + ] + args - def cloud_to_prod_env(self): - return {} + def cloud_to_prod_env(self): + return {} - def server_cmd(self, args): - return ['packages/grpc-native-core/deps/grpc/tools/run_tests/interop/with_nvm.sh', + def server_cmd(self, args): + return [ + 'packages/grpc-native-core/deps/grpc/tools/run_tests/interop/with_nvm.sh', 'node', '--require', './test/fixtures/native_native', - 'test/interop/interop_server.js'] + args + 'test/interop/interop_server.js' + ] + args - def global_env(self): - return {} + def global_env(self): + return {} - def unimplemented_test_cases(self): - return _SKIP_COMPRESSION + _SKIP_DATA_FRAME_PADDING + def unimplemented_test_cases(self): + return _SKIP_COMPRESSION + _SKIP_DATA_FRAME_PADDING - def unimplemented_test_cases_server(self): - return _SKIP_COMPRESSION + def unimplemented_test_cases_server(self): + return _SKIP_COMPRESSION - def __str__(self): - return 'node' + def __str__(self): + return 'node' class PHPLanguage: - def __init__(self): - self.client_cwd = None - self.safename = str(self) + def __init__(self): + self.client_cwd = None + self.safename = str(self) - def client_cmd(self, args): - return ['src/php/bin/interop_client.sh'] + args + def client_cmd(self, args): + return ['src/php/bin/interop_client.sh'] + args - def cloud_to_prod_env(self): - return {} + def cloud_to_prod_env(self): + return {} - def global_env(self): - return {} + def global_env(self): + return {} - def unimplemented_test_cases(self): - return _SKIP_COMPRESSION + _SKIP_DATA_FRAME_PADDING + def unimplemented_test_cases(self): + return _SKIP_COMPRESSION + _SKIP_DATA_FRAME_PADDING - def unimplemented_test_cases_server(self): - return [] + def unimplemented_test_cases_server(self): + return [] - def __str__(self): - return 'php' + def __str__(self): + return 'php' class PHP7Language: - def __init__(self): - self.client_cwd = None - self.safename = str(self) + def __init__(self): + self.client_cwd = None + self.safename = str(self) - def client_cmd(self, args): - return ['src/php/bin/interop_client.sh'] + args + def client_cmd(self, args): + return ['src/php/bin/interop_client.sh'] + args - def cloud_to_prod_env(self): - return {} + def cloud_to_prod_env(self): + return {} - def global_env(self): - return {} + def global_env(self): + return {} - def unimplemented_test_cases(self): - return _SKIP_COMPRESSION + _SKIP_DATA_FRAME_PADDING + def unimplemented_test_cases(self): + return _SKIP_COMPRESSION + _SKIP_DATA_FRAME_PADDING - def unimplemented_test_cases_server(self): - return [] + def unimplemented_test_cases_server(self): + return [] + + def __str__(self): + return 'php7' - def __str__(self): - return 'php7' class ObjcLanguage: - def __init__(self): - self.client_cwd = 'src/objective-c/tests' - self.safename = str(self) + def __init__(self): + self.client_cwd = 'src/objective-c/tests' + self.safename = str(self) + + def client_cmd(self, args): + # from args, extract the server port and craft xcodebuild command out of it + for arg in args: + port = re.search('--server_port=(\d+)', arg) + if port: + portnum = port.group(1) + cmdline = 'pod install && xcodebuild -workspace Tests.xcworkspace -scheme InteropTestsLocalSSL -destination name="iPhone 6" HOST_PORT_LOCALSSL=localhost:%s test' % portnum + return [cmdline] - def client_cmd(self, args): - # from args, extract the server port and craft xcodebuild command out of it - for arg in args: - port = re.search('--server_port=(\d+)', arg) - if port: - portnum = port.group(1) - cmdline = 'pod install && xcodebuild -workspace Tests.xcworkspace -scheme InteropTestsLocalSSL -destination name="iPhone 6" HOST_PORT_LOCALSSL=localhost:%s test'%portnum - return [cmdline] + def cloud_to_prod_env(self): + return {} - def cloud_to_prod_env(self): - return {} + def global_env(self): + return {} - def global_env(self): - return {} + def unimplemented_test_cases(self): + # ObjC test runs all cases with the same command. It ignores the testcase + # cmdline argument. Here we return all but one test cases as unimplemented, + # and depend upon ObjC test's behavior that it runs all cases even when + # we tell it to run just one. + return _TEST_CASES[1:] + _SKIP_COMPRESSION + _SKIP_DATA_FRAME_PADDING - def unimplemented_test_cases(self): - # ObjC test runs all cases with the same command. It ignores the testcase - # cmdline argument. Here we return all but one test cases as unimplemented, - # and depend upon ObjC test's behavior that it runs all cases even when - # we tell it to run just one. - return _TEST_CASES[1:] + _SKIP_COMPRESSION + _SKIP_DATA_FRAME_PADDING + def unimplemented_test_cases_server(self): + return _SKIP_COMPRESSION - def unimplemented_test_cases_server(self): - return _SKIP_COMPRESSION + def __str__(self): + return 'objc' - def __str__(self): - return 'objc' class RubyLanguage: - def __init__(self): - self.client_cwd = None - self.server_cwd = None - self.safename = str(self) + def __init__(self): + self.client_cwd = None + self.server_cwd = None + self.safename = str(self) - def client_cmd(self, args): - return ['tools/run_tests/interop/with_rvm.sh', - 'ruby', 'src/ruby/pb/test/client.rb'] + args + def client_cmd(self, args): + return [ + 'tools/run_tests/interop/with_rvm.sh', 'ruby', + 'src/ruby/pb/test/client.rb' + ] + args - def cloud_to_prod_env(self): - return {} + def cloud_to_prod_env(self): + return {} - def server_cmd(self, args): - return ['tools/run_tests/interop/with_rvm.sh', - 'ruby', 'src/ruby/pb/test/server.rb'] + args + def server_cmd(self, args): + return [ + 'tools/run_tests/interop/with_rvm.sh', 'ruby', + 'src/ruby/pb/test/server.rb' + ] + args - def global_env(self): - return {} + def global_env(self): + return {} - def unimplemented_test_cases(self): - return _SKIP_SERVER_COMPRESSION + _SKIP_DATA_FRAME_PADDING + def unimplemented_test_cases(self): + return _SKIP_SERVER_COMPRESSION + _SKIP_DATA_FRAME_PADDING - def unimplemented_test_cases_server(self): - return _SKIP_COMPRESSION + def unimplemented_test_cases_server(self): + return _SKIP_COMPRESSION + + def __str__(self): + return 'ruby' - def __str__(self): - return 'ruby' class PythonLanguage: - def __init__(self): - self.client_cwd = None - self.server_cwd = None - self.http2_cwd = None - self.safename = str(self) - - def client_cmd(self, args): - return [ - 'py27/bin/python', - 'src/python/grpcio_tests/setup.py', - 'run_interop', - '--client', - '--args="{}"'.format(' '.join(args)) - ] + def __init__(self): + self.client_cwd = None + self.server_cwd = None + self.http2_cwd = None + self.safename = str(self) - def client_cmd_http2interop(self, args): - return [ 'py27/bin/python', - 'src/python/grpcio_tests/tests/http2/negative_http2_client.py', - ] + args - - def cloud_to_prod_env(self): - return {} - - def server_cmd(self, args): - return [ - 'py27/bin/python', - 'src/python/grpcio_tests/setup.py', - 'run_interop', - '--server', - '--args="{}"'.format(' '.join(args)) - ] + def client_cmd(self, args): + return [ + 'py27/bin/python', 'src/python/grpcio_tests/setup.py', + 'run_interop', '--client', '--args="{}"'.format(' '.join(args)) + ] + + def client_cmd_http2interop(self, args): + return [ + 'py27/bin/python', + 'src/python/grpcio_tests/tests/http2/negative_http2_client.py', + ] + args - def global_env(self): - return {'LD_LIBRARY_PATH': '{}/libs/opt'.format(DOCKER_WORKDIR_ROOT), - 'PYTHONPATH': '{}/src/python/gens'.format(DOCKER_WORKDIR_ROOT)} + def cloud_to_prod_env(self): + return {} - def unimplemented_test_cases(self): - return _SKIP_COMPRESSION + _SKIP_DATA_FRAME_PADDING + def server_cmd(self, args): + return [ + 'py27/bin/python', 'src/python/grpcio_tests/setup.py', + 'run_interop', '--server', '--args="{}"'.format(' '.join(args)) + ] - def unimplemented_test_cases_server(self): - return _SKIP_COMPRESSION + def global_env(self): + return { + 'LD_LIBRARY_PATH': '{}/libs/opt'.format(DOCKER_WORKDIR_ROOT), + 'PYTHONPATH': '{}/src/python/gens'.format(DOCKER_WORKDIR_ROOT) + } - def __str__(self): - return 'python' + def unimplemented_test_cases(self): + return _SKIP_COMPRESSION + _SKIP_DATA_FRAME_PADDING + + def unimplemented_test_cases_server(self): + return _SKIP_COMPRESSION + + def __str__(self): + return 'python' _LANGUAGES = { - 'c++' : CXXLanguage(), - 'csharp' : CSharpLanguage(), - 'csharpcoreclr' : CSharpCoreCLRLanguage(), - 'go' : GoLanguage(), - 'java' : JavaLanguage(), - 'javaokhttp' : JavaOkHttpClient(), - 'node' : NodeLanguage(), - 'php' : PHPLanguage(), - 'php7' : PHP7Language(), - 'objc' : ObjcLanguage(), - 'ruby' : RubyLanguage(), - 'python' : PythonLanguage(), + 'c++': CXXLanguage(), + 'csharp': CSharpLanguage(), + 'csharpcoreclr': CSharpCoreCLRLanguage(), + 'go': GoLanguage(), + 'java': JavaLanguage(), + 'javaokhttp': JavaOkHttpClient(), + 'node': NodeLanguage(), + 'php': PHPLanguage(), + 'php7': PHP7Language(), + 'objc': ObjcLanguage(), + 'ruby': RubyLanguage(), + 'python': PythonLanguage(), } # languages supported as cloud_to_cloud servers -_SERVERS = ['c++', 'node', 'csharp', 'csharpcoreclr', 'java', 'go', 'ruby', 'python'] - -_TEST_CASES = ['large_unary', 'empty_unary', 'ping_pong', - 'empty_stream', 'client_streaming', 'server_streaming', - 'cancel_after_begin', 'cancel_after_first_response', - 'timeout_on_sleeping_server', 'custom_metadata', - 'status_code_and_message', 'unimplemented_method', - 'client_compressed_unary', 'server_compressed_unary', - 'client_compressed_streaming', 'server_compressed_streaming', - 'unimplemented_service'] - -_AUTH_TEST_CASES = ['compute_engine_creds', 'jwt_token_creds', - 'oauth2_auth_token', 'per_rpc_creds'] +_SERVERS = [ + 'c++', 'node', 'csharp', 'csharpcoreclr', 'java', 'go', 'ruby', 'python' +] + +_TEST_CASES = [ + 'large_unary', 'empty_unary', 'ping_pong', 'empty_stream', + 'client_streaming', 'server_streaming', 'cancel_after_begin', + 'cancel_after_first_response', 'timeout_on_sleeping_server', + 'custom_metadata', 'status_code_and_message', 'unimplemented_method', + 'client_compressed_unary', 'server_compressed_unary', + 'client_compressed_streaming', 'server_compressed_streaming', + 'unimplemented_service' +] + +_AUTH_TEST_CASES = [ + 'compute_engine_creds', 'jwt_token_creds', 'oauth2_auth_token', + 'per_rpc_creds' +] _HTTP2_TEST_CASES = ['tls', 'framing'] -_HTTP2_SERVER_TEST_CASES = ['rst_after_header', 'rst_after_data', 'rst_during_data', - 'goaway', 'ping', 'max_streams', 'data_frame_padding', 'no_df_padding_sanity_test'] +_HTTP2_SERVER_TEST_CASES = [ + 'rst_after_header', 'rst_after_data', 'rst_during_data', 'goaway', 'ping', + 'max_streams', 'data_frame_padding', 'no_df_padding_sanity_test' +] -_GRPC_CLIENT_TEST_CASES_FOR_HTTP2_SERVER_TEST_CASES = { 'data_frame_padding': 'large_unary', 'no_df_padding_sanity_test': 'large_unary' } +_GRPC_CLIENT_TEST_CASES_FOR_HTTP2_SERVER_TEST_CASES = { + 'data_frame_padding': 'large_unary', + 'no_df_padding_sanity_test': 'large_unary' +} -_HTTP2_SERVER_TEST_CASES_THAT_USE_GRPC_CLIENTS = _GRPC_CLIENT_TEST_CASES_FOR_HTTP2_SERVER_TEST_CASES.keys() +_HTTP2_SERVER_TEST_CASES_THAT_USE_GRPC_CLIENTS = _GRPC_CLIENT_TEST_CASES_FOR_HTTP2_SERVER_TEST_CASES.keys( +) -_LANGUAGES_WITH_HTTP2_CLIENTS_FOR_HTTP2_SERVER_TEST_CASES = ['java', 'go', 'python', 'c++'] +_LANGUAGES_WITH_HTTP2_CLIENTS_FOR_HTTP2_SERVER_TEST_CASES = [ + 'java', 'go', 'python', 'c++' +] DOCKER_WORKDIR_ROOT = '/var/local/git/grpc' + def docker_run_cmdline(cmdline, image, docker_args=[], cwd=None, environ=None): - """Wraps given cmdline array to create 'docker run' cmdline from it.""" - docker_cmdline = ['docker', 'run', '-i', '--rm=true'] + """Wraps given cmdline array to create 'docker run' cmdline from it.""" + docker_cmdline = ['docker', 'run', '-i', '--rm=true'] - # turn environ into -e docker args - if environ: - for k,v in environ.items(): - docker_cmdline += ['-e', '%s=%s' % (k,v)] + # turn environ into -e docker args + if environ: + for k, v in environ.items(): + docker_cmdline += ['-e', '%s=%s' % (k, v)] - # set working directory - workdir = DOCKER_WORKDIR_ROOT - if cwd: - workdir = os.path.join(workdir, cwd) - docker_cmdline += ['-w', workdir] + # set working directory + workdir = DOCKER_WORKDIR_ROOT + if cwd: + workdir = os.path.join(workdir, cwd) + docker_cmdline += ['-w', workdir] - docker_cmdline += docker_args + [image] + cmdline - return docker_cmdline + docker_cmdline += docker_args + [image] + cmdline + return docker_cmdline def manual_cmdline(docker_cmdline, docker_image): - """Returns docker cmdline adjusted for manual invocation.""" - print_cmdline = [] - for item in docker_cmdline: - if item.startswith('--name='): - continue - if item == docker_image: - item = "$docker_image" - item = item.replace('"', '\\"') - # add quotes when necessary - if any(character.isspace() for character in item): - item = "\"%s\"" % item - print_cmdline.append(item) - return ' '.join(print_cmdline) + """Returns docker cmdline adjusted for manual invocation.""" + print_cmdline = [] + for item in docker_cmdline: + if item.startswith('--name='): + continue + if item == docker_image: + item = "$docker_image" + item = item.replace('"', '\\"') + # add quotes when necessary + if any(character.isspace() for character in item): + item = "\"%s\"" % item + print_cmdline.append(item) + return ' '.join(print_cmdline) def write_cmdlog_maybe(cmdlog, filename): - """Returns docker cmdline adjusted for manual invocation.""" - if cmdlog: - with open(filename, 'w') as logfile: - logfile.write('#!/bin/bash\n') - logfile.writelines("%s\n" % line for line in cmdlog) - print('Command log written to file %s' % filename) + """Returns docker cmdline adjusted for manual invocation.""" + if cmdlog: + with open(filename, 'w') as logfile: + logfile.write('#!/bin/bash\n') + logfile.writelines("%s\n" % line for line in cmdlog) + print('Command log written to file %s' % filename) def bash_cmdline(cmdline): - """Creates bash -c cmdline from args list.""" - # Use login shell: - # * makes error messages clearer if executables are missing - return ['bash', '-c', ' '.join(cmdline)] + """Creates bash -c cmdline from args list.""" + # Use login shell: + # * makes error messages clearer if executables are missing + return ['bash', '-c', ' '.join(cmdline)] def auth_options(language, test_case): - """Returns (cmdline, env) tuple with cloud_to_prod_auth test options.""" + """Returns (cmdline, env) tuple with cloud_to_prod_auth test options.""" - language = str(language) - cmdargs = [] - env = {} + language = str(language) + cmdargs = [] + env = {} - # TODO(jtattermusch): this file path only works inside docker - key_filepath = '/root/service_account/GrpcTesting-726eb1347f15.json' - oauth_scope_arg = '--oauth_scope=https://www.googleapis.com/auth/xapi.zoo' - key_file_arg = '--service_account_key_file=%s' % key_filepath - default_account_arg = '--default_service_account=830293263384-compute@developer.gserviceaccount.com' + # TODO(jtattermusch): this file path only works inside docker + key_filepath = '/root/service_account/GrpcTesting-726eb1347f15.json' + oauth_scope_arg = '--oauth_scope=https://www.googleapis.com/auth/xapi.zoo' + key_file_arg = '--service_account_key_file=%s' % key_filepath + default_account_arg = '--default_service_account=830293263384-compute@developer.gserviceaccount.com' - if test_case in ['jwt_token_creds', 'per_rpc_creds', 'oauth2_auth_token']: - if language in ['csharp', 'csharpcoreclr', 'node', 'php', 'php7', 'python', 'ruby']: - env['GOOGLE_APPLICATION_CREDENTIALS'] = key_filepath - else: - cmdargs += [key_file_arg] + if test_case in ['jwt_token_creds', 'per_rpc_creds', 'oauth2_auth_token']: + if language in [ + 'csharp', 'csharpcoreclr', 'node', 'php', 'php7', 'python', + 'ruby' + ]: + env['GOOGLE_APPLICATION_CREDENTIALS'] = key_filepath + else: + cmdargs += [key_file_arg] - if test_case in ['per_rpc_creds', 'oauth2_auth_token']: - cmdargs += [oauth_scope_arg] + if test_case in ['per_rpc_creds', 'oauth2_auth_token']: + cmdargs += [oauth_scope_arg] - if test_case == 'oauth2_auth_token' and language == 'c++': - # C++ oauth2 test uses GCE creds and thus needs to know the default account - cmdargs += [default_account_arg] + if test_case == 'oauth2_auth_token' and language == 'c++': + # C++ oauth2 test uses GCE creds and thus needs to know the default account + cmdargs += [default_account_arg] - if test_case == 'compute_engine_creds': - cmdargs += [oauth_scope_arg, default_account_arg] + if test_case == 'compute_engine_creds': + cmdargs += [oauth_scope_arg, default_account_arg] - return (cmdargs, env) + return (cmdargs, env) def _job_kill_handler(job): - if job._spec.container_name: - dockerjob.docker_kill(job._spec.container_name) - # When the job times out and we decide to kill it, - # we need to wait a before restarting the job - # to prevent "container name already in use" error. - # TODO(jtattermusch): figure out a cleaner way to to this. - time.sleep(2) - - -def cloud_to_prod_jobspec(language, test_case, server_host_name, - server_host_detail, docker_image=None, auth=False, + if job._spec.container_name: + dockerjob.docker_kill(job._spec.container_name) + # When the job times out and we decide to kill it, + # we need to wait a before restarting the job + # to prevent "container name already in use" error. + # TODO(jtattermusch): figure out a cleaner way to to this. + time.sleep(2) + + +def cloud_to_prod_jobspec(language, + test_case, + server_host_name, + server_host_detail, + docker_image=None, + auth=False, manual_cmd_log=None): - """Creates jobspec for cloud-to-prod interop test""" - container_name = None - cmdargs = [ - '--server_host=%s' % server_host_detail[0], - '--server_host_override=%s' % server_host_detail[1], - '--server_port=443', - '--use_tls=true', - '--test_case=%s' % test_case] - environ = dict(language.cloud_to_prod_env(), **language.global_env()) - if auth: - auth_cmdargs, auth_env = auth_options(language, test_case) - cmdargs += auth_cmdargs - environ.update(auth_env) - cmdline = bash_cmdline(language.client_cmd(cmdargs)) - cwd = language.client_cwd - - if docker_image: - container_name = dockerjob.random_name('interop_client_%s' % - language.safename) - cmdline = docker_run_cmdline(cmdline, - image=docker_image, - cwd=cwd, - environ=environ, - docker_args=['--net=host', - '--name=%s' % container_name]) - if manual_cmd_log is not None: - if manual_cmd_log == []: - manual_cmd_log.append('echo "Testing ${docker_image:=%s}"' % docker_image) - manual_cmd_log.append(manual_cmdline(cmdline, docker_image)) - cwd = None - environ = None - - suite_name='cloud_to_prod_auth' if auth else 'cloud_to_prod' - test_job = jobset.JobSpec( - cmdline=cmdline, - cwd=cwd, - environ=environ, - shortname='%s:%s:%s:%s' % (suite_name, language, server_host_name, - test_case), - timeout_seconds=_TEST_TIMEOUT, - flake_retries=4 if args.allow_flakes else 0, - timeout_retries=2 if args.allow_flakes else 0, - kill_handler=_job_kill_handler) - if docker_image: - test_job.container_name = container_name - return test_job - - -def cloud_to_cloud_jobspec(language, test_case, server_name, server_host, - server_port, docker_image=None, insecure=False, - manual_cmd_log=None): - """Creates jobspec for cloud-to-cloud interop test""" - interop_only_options = [ - '--server_host_override=foo.test.google.fr', - '--use_tls=%s' % ('false' if insecure else 'true'), - '--use_test_ca=true', - ] - - client_test_case = test_case - if test_case in _HTTP2_SERVER_TEST_CASES_THAT_USE_GRPC_CLIENTS: - client_test_case = _GRPC_CLIENT_TEST_CASES_FOR_HTTP2_SERVER_TEST_CASES[test_case] - if client_test_case in language.unimplemented_test_cases(): - print('asking client %s to run unimplemented test case %s' % (repr(language), client_test_case)) - sys.exit(1) + """Creates jobspec for cloud-to-prod interop test""" + container_name = None + cmdargs = [ + '--server_host=%s' % server_host_detail[0], + '--server_host_override=%s' % server_host_detail[1], + '--server_port=443', '--use_tls=true', '--test_case=%s' % test_case + ] + environ = dict(language.cloud_to_prod_env(), **language.global_env()) + if auth: + auth_cmdargs, auth_env = auth_options(language, test_case) + cmdargs += auth_cmdargs + environ.update(auth_env) + cmdline = bash_cmdline(language.client_cmd(cmdargs)) + cwd = language.client_cwd - common_options = [ - '--test_case=%s' % client_test_case, - '--server_host=%s' % server_host, - '--server_port=%s' % server_port, - ] + if docker_image: + container_name = dockerjob.random_name('interop_client_%s' % + language.safename) + cmdline = docker_run_cmdline( + cmdline, + image=docker_image, + cwd=cwd, + environ=environ, + docker_args=['--net=host', '--name=%s' % container_name]) + if manual_cmd_log is not None: + if manual_cmd_log == []: + manual_cmd_log.append('echo "Testing ${docker_image:=%s}"' % + docker_image) + manual_cmd_log.append(manual_cmdline(cmdline, docker_image)) + cwd = None + environ = None + + suite_name = 'cloud_to_prod_auth' if auth else 'cloud_to_prod' + test_job = jobset.JobSpec( + cmdline=cmdline, + cwd=cwd, + environ=environ, + shortname='%s:%s:%s:%s' % (suite_name, language, server_host_name, + test_case), + timeout_seconds=_TEST_TIMEOUT, + flake_retries=4 if args.allow_flakes else 0, + timeout_retries=2 if args.allow_flakes else 0, + kill_handler=_job_kill_handler) + if docker_image: + test_job.container_name = container_name + return test_job + + +def cloud_to_cloud_jobspec(language, + test_case, + server_name, + server_host, + server_port, + docker_image=None, + insecure=False, + manual_cmd_log=None): + """Creates jobspec for cloud-to-cloud interop test""" + interop_only_options = [ + '--server_host_override=foo.test.google.fr', + '--use_tls=%s' % ('false' if insecure else 'true'), + '--use_test_ca=true', + ] - if test_case in _HTTP2_SERVER_TEST_CASES: + client_test_case = test_case if test_case in _HTTP2_SERVER_TEST_CASES_THAT_USE_GRPC_CLIENTS: - client_options = interop_only_options + common_options - cmdline = bash_cmdline(language.client_cmd(client_options)) - cwd = language.client_cwd - else: - cmdline = bash_cmdline(language.client_cmd_http2interop(common_options)) - cwd = language.http2_cwd - else: - cmdline = bash_cmdline(language.client_cmd(common_options+interop_only_options)) - cwd = language.client_cwd + client_test_case = _GRPC_CLIENT_TEST_CASES_FOR_HTTP2_SERVER_TEST_CASES[ + test_case] + if client_test_case in language.unimplemented_test_cases(): + print('asking client %s to run unimplemented test case %s' % + (repr(language), client_test_case)) + sys.exit(1) + + common_options = [ + '--test_case=%s' % client_test_case, + '--server_host=%s' % server_host, + '--server_port=%s' % server_port, + ] - environ = language.global_env() - if docker_image and language.safename != 'objc': - # we can't run client in docker for objc. - container_name = dockerjob.random_name('interop_client_%s' % language.safename) - cmdline = docker_run_cmdline(cmdline, - image=docker_image, - environ=environ, - cwd=cwd, - docker_args=['--net=host', - '--name=%s' % container_name]) - if manual_cmd_log is not None: - if manual_cmd_log == []: - manual_cmd_log.append('echo "Testing ${docker_image:=%s}"' % docker_image) - manual_cmd_log.append(manual_cmdline(cmdline, docker_image)) - cwd = None - - test_job = jobset.JobSpec( - cmdline=cmdline, - cwd=cwd, - environ=environ, - shortname='cloud_to_cloud:%s:%s_server:%s' % (language, server_name, - test_case), - timeout_seconds=_TEST_TIMEOUT, - flake_retries=4 if args.allow_flakes else 0, - timeout_retries=2 if args.allow_flakes else 0, - kill_handler=_job_kill_handler) - if docker_image: - test_job.container_name = container_name - return test_job + if test_case in _HTTP2_SERVER_TEST_CASES: + if test_case in _HTTP2_SERVER_TEST_CASES_THAT_USE_GRPC_CLIENTS: + client_options = interop_only_options + common_options + cmdline = bash_cmdline(language.client_cmd(client_options)) + cwd = language.client_cwd + else: + cmdline = bash_cmdline( + language.client_cmd_http2interop(common_options)) + cwd = language.http2_cwd + else: + cmdline = bash_cmdline( + language.client_cmd(common_options + interop_only_options)) + cwd = language.client_cwd + + environ = language.global_env() + if docker_image and language.safename != 'objc': + # we can't run client in docker for objc. + container_name = dockerjob.random_name('interop_client_%s' % + language.safename) + cmdline = docker_run_cmdline( + cmdline, + image=docker_image, + environ=environ, + cwd=cwd, + docker_args=['--net=host', '--name=%s' % container_name]) + if manual_cmd_log is not None: + if manual_cmd_log == []: + manual_cmd_log.append('echo "Testing ${docker_image:=%s}"' % + docker_image) + manual_cmd_log.append(manual_cmdline(cmdline, docker_image)) + cwd = None + + test_job = jobset.JobSpec( + cmdline=cmdline, + cwd=cwd, + environ=environ, + shortname='cloud_to_cloud:%s:%s_server:%s' % (language, server_name, + test_case), + timeout_seconds=_TEST_TIMEOUT, + flake_retries=4 if args.allow_flakes else 0, + timeout_retries=2 if args.allow_flakes else 0, + kill_handler=_job_kill_handler) + if docker_image: + test_job.container_name = container_name + return test_job def server_jobspec(language, docker_image, insecure=False, manual_cmd_log=None): - """Create jobspec for running a server""" - container_name = dockerjob.random_name('interop_server_%s' % language.safename) - cmdline = bash_cmdline( - language.server_cmd(['--port=%s' % _DEFAULT_SERVER_PORT, - '--use_tls=%s' % ('false' if insecure else 'true')])) - environ = language.global_env() - docker_args = ['--name=%s' % container_name] - if language.safename == 'http2': - # we are running the http2 interop server. Open next N ports beginning - # with the server port. These ports are used for http2 interop test - # (one test case per port). - docker_args += list( - itertools.chain.from_iterable(('-p', str(_DEFAULT_SERVER_PORT + i)) - for i in range( - len(_HTTP2_SERVER_TEST_CASES)))) - # Enable docker's healthcheck mechanism. - # This runs a Python script inside the container every second. The script - # pings the http2 server to verify it is ready. The 'health-retries' flag - # specifies the number of consecutive failures before docker will report - # the container's status as 'unhealthy'. Prior to the first 'health_retries' - # failures or the first success, the status will be 'starting'. 'docker ps' - # or 'docker inspect' can be used to see the health of the container on the - # command line. - docker_args += [ - '--health-cmd=python test/http2_test/http2_server_health_check.py ' - '--server_host=%s --server_port=%d' - % ('localhost', _DEFAULT_SERVER_PORT), - '--health-interval=1s', - '--health-retries=5', - '--health-timeout=10s', - ] + """Create jobspec for running a server""" + container_name = dockerjob.random_name('interop_server_%s' % + language.safename) + cmdline = bash_cmdline( + language.server_cmd([ + '--port=%s' % _DEFAULT_SERVER_PORT, '--use_tls=%s' % ( + 'false' if insecure else 'true') + ])) + environ = language.global_env() + docker_args = ['--name=%s' % container_name] + if language.safename == 'http2': + # we are running the http2 interop server. Open next N ports beginning + # with the server port. These ports are used for http2 interop test + # (one test case per port). + docker_args += list( + itertools.chain.from_iterable(('-p', str(_DEFAULT_SERVER_PORT + i)) + for i in range( + len(_HTTP2_SERVER_TEST_CASES)))) + # Enable docker's healthcheck mechanism. + # This runs a Python script inside the container every second. The script + # pings the http2 server to verify it is ready. The 'health-retries' flag + # specifies the number of consecutive failures before docker will report + # the container's status as 'unhealthy'. Prior to the first 'health_retries' + # failures or the first success, the status will be 'starting'. 'docker ps' + # or 'docker inspect' can be used to see the health of the container on the + # command line. + docker_args += [ + '--health-cmd=python test/http2_test/http2_server_health_check.py ' + '--server_host=%s --server_port=%d' % + ('localhost', _DEFAULT_SERVER_PORT), + '--health-interval=1s', + '--health-retries=5', + '--health-timeout=10s', + ] - else: - docker_args += ['-p', str(_DEFAULT_SERVER_PORT)] - - docker_cmdline = docker_run_cmdline(cmdline, - image=docker_image, - cwd=language.server_cwd, - environ=environ, - docker_args=docker_args) - if manual_cmd_log is not None: - if manual_cmd_log == []: - manual_cmd_log.append('echo "Testing ${docker_image:=%s}"' % docker_image) - manual_cmd_log.append(manual_cmdline(docker_cmdline, docker_image)) - server_job = jobset.JobSpec( - cmdline=docker_cmdline, - environ=environ, - shortname='interop_server_%s' % language, - timeout_seconds=30*60) - server_job.container_name = container_name - return server_job + else: + docker_args += ['-p', str(_DEFAULT_SERVER_PORT)] + + docker_cmdline = docker_run_cmdline( + cmdline, + image=docker_image, + cwd=language.server_cwd, + environ=environ, + docker_args=docker_args) + if manual_cmd_log is not None: + if manual_cmd_log == []: + manual_cmd_log.append('echo "Testing ${docker_image:=%s}"' % + docker_image) + manual_cmd_log.append(manual_cmdline(docker_cmdline, docker_image)) + server_job = jobset.JobSpec( + cmdline=docker_cmdline, + environ=environ, + shortname='interop_server_%s' % language, + timeout_seconds=30 * 60) + server_job.container_name = container_name + return server_job def build_interop_image_jobspec(language, tag=None): - """Creates jobspec for building interop docker image for a language""" - if not tag: - tag = 'grpc_interop_%s:%s' % (language.safename, uuid.uuid4()) - env = {'INTEROP_IMAGE': tag, - 'BASE_NAME': 'grpc_interop_%s' % language.safename} - if not args.travis: - env['TTY_FLAG'] = '-t' - # This env variable is used to get around the github rate limit - # error when running the PHP `composer install` command - host_file = '%s/.composer/auth.json' % os.environ['HOME'] - if language.safename == 'php' and os.path.exists(host_file): - env['BUILD_INTEROP_DOCKER_EXTRA_ARGS'] = \ - '-v %s:/root/.composer/auth.json:ro' % host_file - build_job = jobset.JobSpec( - cmdline=['tools/run_tests/dockerize/build_interop_image.sh'], - environ=env, - shortname='build_docker_%s' % (language), - timeout_seconds=30*60) - build_job.tag = tag - return build_job + """Creates jobspec for building interop docker image for a language""" + if not tag: + tag = 'grpc_interop_%s:%s' % (language.safename, uuid.uuid4()) + env = { + 'INTEROP_IMAGE': tag, + 'BASE_NAME': 'grpc_interop_%s' % language.safename + } + if not args.travis: + env['TTY_FLAG'] = '-t' + # This env variable is used to get around the github rate limit + # error when running the PHP `composer install` command + host_file = '%s/.composer/auth.json' % os.environ['HOME'] + if language.safename == 'php' and os.path.exists(host_file): + env['BUILD_INTEROP_DOCKER_EXTRA_ARGS'] = \ + '-v %s:/root/.composer/auth.json:ro' % host_file + build_job = jobset.JobSpec( + cmdline=['tools/run_tests/dockerize/build_interop_image.sh'], + environ=env, + shortname='build_docker_%s' % (language), + timeout_seconds=30 * 60) + build_job.tag = tag + return build_job def aggregate_http2_results(stdout): - match = re.search(r'\{"cases[^\]]*\]\}', stdout) - if not match: - return None - - results = json.loads(match.group(0)) - skipped = 0 - passed = 0 - failed = 0 - failed_cases = [] - for case in results['cases']: - if case.get('skipped', False): - skipped += 1 - else: - if case.get('passed', False): - passed += 1 - else: - failed += 1 - failed_cases.append(case.get('name', "NONAME")) - return { - 'passed': passed, - 'failed': failed, - 'skipped': skipped, - 'failed_cases': ', '.join(failed_cases), - 'percent': 1.0 * passed / (passed + failed) - } + match = re.search(r'\{"cases[^\]]*\]\}', stdout) + if not match: + return None + + results = json.loads(match.group(0)) + skipped = 0 + passed = 0 + failed = 0 + failed_cases = [] + for case in results['cases']: + if case.get('skipped', False): + skipped += 1 + else: + if case.get('passed', False): + passed += 1 + else: + failed += 1 + failed_cases.append(case.get('name', "NONAME")) + return { + 'passed': passed, + 'failed': failed, + 'skipped': skipped, + 'failed_cases': ', '.join(failed_cases), + 'percent': 1.0 * passed / (passed + failed) + } + # A dictionary of prod servers to test. # Format: server_name: (server_host, server_host_override, errors_allowed) # TODO(adelez): implement logic for errors_allowed where if the indicated tests # fail, they don't impact the overall test result. prod_servers = { - 'default': ('216.239.32.254', - 'grpc-test.sandbox.googleapis.com', False), - 'gateway_v2': ('216.239.32.254', - 'grpc-test2.sandbox.googleapis.com', True), + 'default': ('216.239.32.254', 'grpc-test.sandbox.googleapis.com', False), + 'gateway_v2': ('216.239.32.254', 'grpc-test2.sandbox.googleapis.com', True), 'cloud_gateway': ('216.239.32.255', 'grpc-test.sandbox.googleapis.com', False), 'cloud_gateway_v2': ('216.239.32.255', 'grpc-test2.sandbox.googleapis.com', True), - 'gateway_v4': ('216.239.32.254', - 'grpc-test4.sandbox.googleapis.com', True), + 'gateway_v4': ('216.239.32.254', 'grpc-test4.sandbox.googleapis.com', True), 'cloud_gateway_v4': ('216.239.32.255', 'grpc-test4.sandbox.googleapis.com', True), } argp = argparse.ArgumentParser(description='Run interop tests.') -argp.add_argument('-l', '--language', - choices=['all'] + sorted(_LANGUAGES), - nargs='+', - default=['all'], - help='Clients to run. Objc client can be only run on OSX.') +argp.add_argument( + '-l', + '--language', + choices=['all'] + sorted(_LANGUAGES), + nargs='+', + default=['all'], + help='Clients to run. Objc client can be only run on OSX.') argp.add_argument('-j', '--jobs', default=multiprocessing.cpu_count(), type=int) -argp.add_argument('--cloud_to_prod', - default=False, - action='store_const', - const=True, - help='Run cloud_to_prod tests.') -argp.add_argument('--cloud_to_prod_auth', - default=False, - action='store_const', - const=True, - help='Run cloud_to_prod_auth tests.') -argp.add_argument('--prod_servers', - choices=prod_servers.keys(), - default=['default'], - nargs='+', - help=('The servers to run cloud_to_prod and ' - 'cloud_to_prod_auth tests against.')) -argp.add_argument('-s', '--server', - choices=['all'] + sorted(_SERVERS), - nargs='+', - help='Run cloud_to_cloud servers in a separate docker ' + - 'image. Servers can only be started automatically if ' + - '--use_docker option is enabled.', - default=[]) -argp.add_argument('--override_server', - action='append', - type=lambda kv: kv.split('='), - help='Use servername=HOST:PORT to explicitly specify a server. E.g. csharp=localhost:50000', - default=[]) -argp.add_argument('-t', '--travis', - default=False, - action='store_const', - const=True) -argp.add_argument('-v', '--verbose', - default=False, - action='store_const', - const=True) -argp.add_argument('--use_docker', - default=False, - action='store_const', - const=True, - help='Run all the interop tests under docker. That provides ' + - 'additional isolation and prevents the need to install ' + - 'language specific prerequisites. Only available on Linux.') -argp.add_argument('--allow_flakes', - default=False, - action='store_const', - const=True, - help='Allow flaky tests to show as passing (re-runs failed tests up to five times)') -argp.add_argument('--manual_run', - default=False, - action='store_const', - const=True, - help='Prepare things for running interop tests manually. ' + - 'Preserve docker images after building them and skip ' - 'actually running the tests. Only print commands to run by ' + - 'hand.') -argp.add_argument('--http2_interop', - default=False, - action='store_const', - const=True, - help='Enable HTTP/2 client edge case testing. (Bad client, good server)') -argp.add_argument('--http2_server_interop', - default=False, - action='store_const', - const=True, - help='Enable HTTP/2 server edge case testing. (Includes positive and negative tests') -argp.add_argument('--insecure', - default=False, - action='store_const', - const=True, - help='Whether to use secure channel.') -argp.add_argument('--internal_ci', - default=False, - action='store_const', - const=True, - help=('Put reports into subdirectories to improve ' - 'presentation of results by Internal CI.')) -argp.add_argument('--bq_result_table', - default='', - type=str, - nargs='?', - help='Upload test results to a specified BQ table.') +argp.add_argument( + '--cloud_to_prod', + default=False, + action='store_const', + const=True, + help='Run cloud_to_prod tests.') +argp.add_argument( + '--cloud_to_prod_auth', + default=False, + action='store_const', + const=True, + help='Run cloud_to_prod_auth tests.') +argp.add_argument( + '--prod_servers', + choices=prod_servers.keys(), + default=['default'], + nargs='+', + help=('The servers to run cloud_to_prod and ' + 'cloud_to_prod_auth tests against.')) +argp.add_argument( + '-s', + '--server', + choices=['all'] + sorted(_SERVERS), + nargs='+', + help='Run cloud_to_cloud servers in a separate docker ' + + 'image. Servers can only be started automatically if ' + + '--use_docker option is enabled.', + default=[]) +argp.add_argument( + '--override_server', + action='append', + type=lambda kv: kv.split('='), + help='Use servername=HOST:PORT to explicitly specify a server. E.g. csharp=localhost:50000', + default=[]) +argp.add_argument( + '-t', '--travis', default=False, action='store_const', const=True) +argp.add_argument( + '-v', '--verbose', default=False, action='store_const', const=True) +argp.add_argument( + '--use_docker', + default=False, + action='store_const', + const=True, + help='Run all the interop tests under docker. That provides ' + + 'additional isolation and prevents the need to install ' + + 'language specific prerequisites. Only available on Linux.') +argp.add_argument( + '--allow_flakes', + default=False, + action='store_const', + const=True, + help='Allow flaky tests to show as passing (re-runs failed tests up to five times)' +) +argp.add_argument( + '--manual_run', + default=False, + action='store_const', + const=True, + help='Prepare things for running interop tests manually. ' + + 'Preserve docker images after building them and skip ' + 'actually running the tests. Only print commands to run by ' + 'hand.') +argp.add_argument( + '--http2_interop', + default=False, + action='store_const', + const=True, + help='Enable HTTP/2 client edge case testing. (Bad client, good server)') +argp.add_argument( + '--http2_server_interop', + default=False, + action='store_const', + const=True, + help='Enable HTTP/2 server edge case testing. (Includes positive and negative tests' +) +argp.add_argument( + '--insecure', + default=False, + action='store_const', + const=True, + help='Whether to use secure channel.') +argp.add_argument( + '--internal_ci', + default=False, + action='store_const', + const=True, + help=('Put reports into subdirectories to improve ' + 'presentation of results by Internal CI.')) +argp.add_argument( + '--bq_result_table', + default='', + type=str, + nargs='?', + help='Upload test results to a specified BQ table.') args = argp.parse_args() -servers = set(s for s in itertools.chain.from_iterable(_SERVERS - if x == 'all' else [x] - for x in args.server)) +servers = set( + s + for s in itertools.chain.from_iterable(_SERVERS if x == 'all' else [x] + for x in args.server)) if args.use_docker: - if not args.travis: - print('Seen --use_docker flag, will run interop tests under docker.') - print('') - print('IMPORTANT: The changes you are testing need to be locally committed') - print('because only the committed changes in the current branch will be') - print('copied to the docker environment.') - time.sleep(5) + if not args.travis: + print('Seen --use_docker flag, will run interop tests under docker.') + print('') + print( + 'IMPORTANT: The changes you are testing need to be locally committed' + ) + print( + 'because only the committed changes in the current branch will be') + print('copied to the docker environment.') + time.sleep(5) if args.manual_run and not args.use_docker: - print('--manual_run is only supported with --use_docker option enabled.') - sys.exit(1) + print('--manual_run is only supported with --use_docker option enabled.') + sys.exit(1) if not args.use_docker and servers: - print('Running interop servers is only supported with --use_docker option enabled.') - sys.exit(1) - + print( + 'Running interop servers is only supported with --use_docker option enabled.' + ) + sys.exit(1) # we want to include everything but objc in 'all' # because objc won't run on non-mac platforms all_but_objc = set(six.iterkeys(_LANGUAGES)) - set(['objc']) -languages = set(_LANGUAGES[l] - for l in itertools.chain.from_iterable( - all_but_objc if x == 'all' else [x] - for x in args.language)) +languages = set( + _LANGUAGES[l] + for l in itertools.chain.from_iterable(all_but_objc if x == 'all' else [x] + for x in args.language)) languages_http2_clients_for_http2_server_interop = set() if args.http2_server_interop: - languages_http2_clients_for_http2_server_interop = set( - _LANGUAGES[l] for l in _LANGUAGES_WITH_HTTP2_CLIENTS_FOR_HTTP2_SERVER_TEST_CASES - if 'all' in args.language or l in args.language) + languages_http2_clients_for_http2_server_interop = set( + _LANGUAGES[l] + for l in _LANGUAGES_WITH_HTTP2_CLIENTS_FOR_HTTP2_SERVER_TEST_CASES + if 'all' in args.language or l in args.language) http2Interop = Http2Client() if args.http2_interop else None http2InteropServer = Http2Server() if args.http2_server_interop else None -docker_images={} +docker_images = {} if args.use_docker: - # languages for which to build docker images - languages_to_build = set( - _LANGUAGES[k] for k in set([str(l) for l in languages] + [s for s in servers])) - languages_to_build = languages_to_build | languages_http2_clients_for_http2_server_interop - - if args.http2_interop: - languages_to_build.add(http2Interop) - - if args.http2_server_interop: - languages_to_build.add(http2InteropServer) - - build_jobs = [] - for l in languages_to_build: - if str(l) == 'objc': - # we don't need to build a docker image for objc - continue - job = build_interop_image_jobspec(l) - docker_images[str(l)] = job.tag - build_jobs.append(job) - - if build_jobs: - jobset.message('START', 'Building interop docker images.', do_newline=True) - if args.verbose: - print('Jobs to run: \n%s\n' % '\n'.join(str(j) for j in build_jobs)) + # languages for which to build docker images + languages_to_build = set( + _LANGUAGES[k] + for k in set([str(l) for l in languages] + [s for s in servers])) + languages_to_build = languages_to_build | languages_http2_clients_for_http2_server_interop - num_failures, _ = jobset.run( - build_jobs, newline_on_success=True, maxjobs=args.jobs) - if num_failures == 0: - jobset.message('SUCCESS', 'All docker images built successfully.', - do_newline=True) - else: - jobset.message('FAILED', 'Failed to build interop docker images.', - do_newline=True) - for image in six.itervalues(docker_images): - dockerjob.remove_image(image, skip_nonexistent=True) - sys.exit(1) + if args.http2_interop: + languages_to_build.add(http2Interop) + + if args.http2_server_interop: + languages_to_build.add(http2InteropServer) + + build_jobs = [] + for l in languages_to_build: + if str(l) == 'objc': + # we don't need to build a docker image for objc + continue + job = build_interop_image_jobspec(l) + docker_images[str(l)] = job.tag + build_jobs.append(job) + + if build_jobs: + jobset.message( + 'START', 'Building interop docker images.', do_newline=True) + if args.verbose: + print('Jobs to run: \n%s\n' % '\n'.join(str(j) for j in build_jobs)) + + num_failures, _ = jobset.run( + build_jobs, newline_on_success=True, maxjobs=args.jobs) + if num_failures == 0: + jobset.message( + 'SUCCESS', + 'All docker images built successfully.', + do_newline=True) + else: + jobset.message( + 'FAILED', + 'Failed to build interop docker images.', + do_newline=True) + for image in six.itervalues(docker_images): + dockerjob.remove_image(image, skip_nonexistent=True) + sys.exit(1) server_manual_cmd_log = [] if args.manual_run else None client_manual_cmd_log = [] if args.manual_run else None @@ -1056,214 +1134,236 @@ client_manual_cmd_log = [] if args.manual_run else None server_jobs = {} server_addresses = {} try: - for s in servers: - lang = str(s) - spec = server_jobspec(_LANGUAGES[lang], docker_images.get(lang), - args.insecure, manual_cmd_log=server_manual_cmd_log) - if not args.manual_run: - job = dockerjob.DockerJob(spec) - server_jobs[lang] = job - server_addresses[lang] = ('localhost', job.mapped_port(_DEFAULT_SERVER_PORT)) - else: - # don't run the server, set server port to a placeholder value - server_addresses[lang] = ('localhost', '${SERVER_PORT}') - - http2_server_job = None - if args.http2_server_interop: - # launch a HTTP2 server emulator that creates edge cases - lang = str(http2InteropServer) - spec = server_jobspec(http2InteropServer, docker_images.get(lang), - manual_cmd_log=server_manual_cmd_log) - if not args.manual_run: - http2_server_job = dockerjob.DockerJob(spec) - server_jobs[lang] = http2_server_job - else: - # don't run the server, set server port to a placeholder value - server_addresses[lang] = ('localhost', '${SERVER_PORT}') - - jobs = [] - if args.cloud_to_prod: - if args.insecure: - print('TLS is always enabled for cloud_to_prod scenarios.') - for server_host_name in args.prod_servers: - for language in languages: - for test_case in _TEST_CASES: - if not test_case in language.unimplemented_test_cases(): - if not test_case in _SKIP_ADVANCED + _SKIP_COMPRESSION: - test_job = cloud_to_prod_jobspec( - language, test_case, server_host_name, - prod_servers[server_host_name], - docker_image=docker_images.get(str(language)), - manual_cmd_log=client_manual_cmd_log) - jobs.append(test_job) - - if args.http2_interop: - for test_case in _HTTP2_TEST_CASES: - test_job = cloud_to_prod_jobspec( - http2Interop, test_case, server_host_name, - prod_servers[server_host_name], - docker_image=docker_images.get(str(http2Interop)), - manual_cmd_log=client_manual_cmd_log) - jobs.append(test_job) - - if args.cloud_to_prod_auth: - if args.insecure: - print('TLS is always enabled for cloud_to_prod scenarios.') - for server_host_name in args.prod_servers: - for language in languages: - for test_case in _AUTH_TEST_CASES: - if not test_case in language.unimplemented_test_cases(): - test_job = cloud_to_prod_jobspec( - language, test_case, server_host_name, - prod_servers[server_host_name], - docker_image=docker_images.get(str(language)), auth=True, - manual_cmd_log=client_manual_cmd_log) - jobs.append(test_job) - - for server in args.override_server: - server_name = server[0] - (server_host, server_port) = server[1].split(':') - server_addresses[server_name] = (server_host, server_port) - - for server_name, server_address in server_addresses.items(): - (server_host, server_port) = server_address - server_language = _LANGUAGES.get(server_name, None) - skip_server = [] # test cases unimplemented by server - if server_language: - skip_server = server_language.unimplemented_test_cases_server() - for language in languages: - for test_case in _TEST_CASES: - if not test_case in language.unimplemented_test_cases(): - if not test_case in skip_server: - test_job = cloud_to_cloud_jobspec(language, - test_case, - server_name, - server_host, - server_port, - docker_image=docker_images.get(str(language)), - insecure=args.insecure, - manual_cmd_log=client_manual_cmd_log) - jobs.append(test_job) - - if args.http2_interop: - for test_case in _HTTP2_TEST_CASES: - if server_name == "go": - # TODO(carl-mastrangelo): Reenable after https://github.com/grpc/grpc-go/issues/434 - continue - test_job = cloud_to_cloud_jobspec(http2Interop, - test_case, - server_name, - server_host, - server_port, - docker_image=docker_images.get(str(http2Interop)), - insecure=args.insecure, - manual_cmd_log=client_manual_cmd_log) - jobs.append(test_job) - - if args.http2_server_interop: - if not args.manual_run: - http2_server_job.wait_for_healthy(timeout_seconds=600) - for language in languages_http2_clients_for_http2_server_interop: - for test_case in set(_HTTP2_SERVER_TEST_CASES) - set(_HTTP2_SERVER_TEST_CASES_THAT_USE_GRPC_CLIENTS): - offset = sorted(_HTTP2_SERVER_TEST_CASES).index(test_case) - server_port = _DEFAULT_SERVER_PORT+offset + for s in servers: + lang = str(s) + spec = server_jobspec( + _LANGUAGES[lang], + docker_images.get(lang), + args.insecure, + manual_cmd_log=server_manual_cmd_log) if not args.manual_run: - server_port = http2_server_job.mapped_port(server_port) - test_job = cloud_to_cloud_jobspec(language, - test_case, - str(http2InteropServer), - 'localhost', - server_port, - docker_image=docker_images.get(str(language)), - manual_cmd_log=client_manual_cmd_log) - jobs.append(test_job) - for language in languages: - # HTTP2_SERVER_TEST_CASES_THAT_USE_GRPC_CLIENTS is a subset of - # HTTP_SERVER_TEST_CASES, in which clients use their gRPC interop clients rather - # than specialized http2 clients, reusing existing test implementations. - # For example, in the "data_frame_padding" test, use language's gRPC - # interop clients and make them think that theyre running "large_unary" - # test case. This avoids implementing a new test case in each language. - for test_case in _HTTP2_SERVER_TEST_CASES_THAT_USE_GRPC_CLIENTS: - if test_case not in language.unimplemented_test_cases(): - offset = sorted(_HTTP2_SERVER_TEST_CASES).index(test_case) - server_port = _DEFAULT_SERVER_PORT+offset - if not args.manual_run: - server_port = http2_server_job.mapped_port(server_port) - if not args.insecure: - print(('Creating grpc cient to http2 server test case with insecure connection, even though' - ' args.insecure is False. Http2 test server only supports insecure connections.')) - test_job = cloud_to_cloud_jobspec(language, - test_case, - str(http2InteropServer), - 'localhost', - server_port, - docker_image=docker_images.get(str(language)), - insecure=True, - manual_cmd_log=client_manual_cmd_log) - jobs.append(test_job) - - if not jobs: - print('No jobs to run.') - for image in six.itervalues(docker_images): - dockerjob.remove_image(image, skip_nonexistent=True) - sys.exit(1) - - if args.manual_run: - print('All tests will skipped --manual_run option is active.') - - if args.verbose: - print('Jobs to run: \n%s\n' % '\n'.join(str(job) for job in jobs)) + job = dockerjob.DockerJob(spec) + server_jobs[lang] = job + server_addresses[lang] = ('localhost', + job.mapped_port(_DEFAULT_SERVER_PORT)) + else: + # don't run the server, set server port to a placeholder value + server_addresses[lang] = ('localhost', '${SERVER_PORT}') + + http2_server_job = None + if args.http2_server_interop: + # launch a HTTP2 server emulator that creates edge cases + lang = str(http2InteropServer) + spec = server_jobspec( + http2InteropServer, + docker_images.get(lang), + manual_cmd_log=server_manual_cmd_log) + if not args.manual_run: + http2_server_job = dockerjob.DockerJob(spec) + server_jobs[lang] = http2_server_job + else: + # don't run the server, set server port to a placeholder value + server_addresses[lang] = ('localhost', '${SERVER_PORT}') + + jobs = [] + if args.cloud_to_prod: + if args.insecure: + print('TLS is always enabled for cloud_to_prod scenarios.') + for server_host_name in args.prod_servers: + for language in languages: + for test_case in _TEST_CASES: + if not test_case in language.unimplemented_test_cases(): + if not test_case in _SKIP_ADVANCED + _SKIP_COMPRESSION: + test_job = cloud_to_prod_jobspec( + language, + test_case, + server_host_name, + prod_servers[server_host_name], + docker_image=docker_images.get(str(language)), + manual_cmd_log=client_manual_cmd_log) + jobs.append(test_job) + + if args.http2_interop: + for test_case in _HTTP2_TEST_CASES: + test_job = cloud_to_prod_jobspec( + http2Interop, + test_case, + server_host_name, + prod_servers[server_host_name], + docker_image=docker_images.get(str(http2Interop)), + manual_cmd_log=client_manual_cmd_log) + jobs.append(test_job) + + if args.cloud_to_prod_auth: + if args.insecure: + print('TLS is always enabled for cloud_to_prod scenarios.') + for server_host_name in args.prod_servers: + for language in languages: + for test_case in _AUTH_TEST_CASES: + if not test_case in language.unimplemented_test_cases(): + test_job = cloud_to_prod_jobspec( + language, + test_case, + server_host_name, + prod_servers[server_host_name], + docker_image=docker_images.get(str(language)), + auth=True, + manual_cmd_log=client_manual_cmd_log) + jobs.append(test_job) + + for server in args.override_server: + server_name = server[0] + (server_host, server_port) = server[1].split(':') + server_addresses[server_name] = (server_host, server_port) + + for server_name, server_address in server_addresses.items(): + (server_host, server_port) = server_address + server_language = _LANGUAGES.get(server_name, None) + skip_server = [] # test cases unimplemented by server + if server_language: + skip_server = server_language.unimplemented_test_cases_server() + for language in languages: + for test_case in _TEST_CASES: + if not test_case in language.unimplemented_test_cases(): + if not test_case in skip_server: + test_job = cloud_to_cloud_jobspec( + language, + test_case, + server_name, + server_host, + server_port, + docker_image=docker_images.get(str(language)), + insecure=args.insecure, + manual_cmd_log=client_manual_cmd_log) + jobs.append(test_job) + + if args.http2_interop: + for test_case in _HTTP2_TEST_CASES: + if server_name == "go": + # TODO(carl-mastrangelo): Reenable after https://github.com/grpc/grpc-go/issues/434 + continue + test_job = cloud_to_cloud_jobspec( + http2Interop, + test_case, + server_name, + server_host, + server_port, + docker_image=docker_images.get(str(http2Interop)), + insecure=args.insecure, + manual_cmd_log=client_manual_cmd_log) + jobs.append(test_job) + + if args.http2_server_interop: + if not args.manual_run: + http2_server_job.wait_for_healthy(timeout_seconds=600) + for language in languages_http2_clients_for_http2_server_interop: + for test_case in set(_HTTP2_SERVER_TEST_CASES) - set( + _HTTP2_SERVER_TEST_CASES_THAT_USE_GRPC_CLIENTS): + offset = sorted(_HTTP2_SERVER_TEST_CASES).index(test_case) + server_port = _DEFAULT_SERVER_PORT + offset + if not args.manual_run: + server_port = http2_server_job.mapped_port(server_port) + test_job = cloud_to_cloud_jobspec( + language, + test_case, + str(http2InteropServer), + 'localhost', + server_port, + docker_image=docker_images.get(str(language)), + manual_cmd_log=client_manual_cmd_log) + jobs.append(test_job) + for language in languages: + # HTTP2_SERVER_TEST_CASES_THAT_USE_GRPC_CLIENTS is a subset of + # HTTP_SERVER_TEST_CASES, in which clients use their gRPC interop clients rather + # than specialized http2 clients, reusing existing test implementations. + # For example, in the "data_frame_padding" test, use language's gRPC + # interop clients and make them think that theyre running "large_unary" + # test case. This avoids implementing a new test case in each language. + for test_case in _HTTP2_SERVER_TEST_CASES_THAT_USE_GRPC_CLIENTS: + if test_case not in language.unimplemented_test_cases(): + offset = sorted(_HTTP2_SERVER_TEST_CASES).index(test_case) + server_port = _DEFAULT_SERVER_PORT + offset + if not args.manual_run: + server_port = http2_server_job.mapped_port(server_port) + if not args.insecure: + print(( + 'Creating grpc cient to http2 server test case with insecure connection, even though' + ' args.insecure is False. Http2 test server only supports insecure connections.' + )) + test_job = cloud_to_cloud_jobspec( + language, + test_case, + str(http2InteropServer), + 'localhost', + server_port, + docker_image=docker_images.get(str(language)), + insecure=True, + manual_cmd_log=client_manual_cmd_log) + jobs.append(test_job) + + if not jobs: + print('No jobs to run.') + for image in six.itervalues(docker_images): + dockerjob.remove_image(image, skip_nonexistent=True) + sys.exit(1) + + if args.manual_run: + print('All tests will skipped --manual_run option is active.') - num_failures, resultset = jobset.run(jobs, newline_on_success=True, - maxjobs=args.jobs, - skip_jobs=args.manual_run) - if args.bq_result_table and resultset: - upload_interop_results_to_bq(resultset, args.bq_result_table, args) - if num_failures: - jobset.message('FAILED', 'Some tests failed', do_newline=True) - else: - jobset.message('SUCCESS', 'All tests passed', do_newline=True) + if args.verbose: + print('Jobs to run: \n%s\n' % '\n'.join(str(job) for job in jobs)) + + num_failures, resultset = jobset.run( + jobs, + newline_on_success=True, + maxjobs=args.jobs, + skip_jobs=args.manual_run) + if args.bq_result_table and resultset: + upload_interop_results_to_bq(resultset, args.bq_result_table, args) + if num_failures: + jobset.message('FAILED', 'Some tests failed', do_newline=True) + else: + jobset.message('SUCCESS', 'All tests passed', do_newline=True) - write_cmdlog_maybe(server_manual_cmd_log, 'interop_server_cmds.sh') - write_cmdlog_maybe(client_manual_cmd_log, 'interop_client_cmds.sh') + write_cmdlog_maybe(server_manual_cmd_log, 'interop_server_cmds.sh') + write_cmdlog_maybe(client_manual_cmd_log, 'interop_client_cmds.sh') - xml_report_name = _XML_REPORT - if args.internal_ci: - xml_report_name = _INTERNAL_CL_XML_REPORT - report_utils.render_junit_xml_report(resultset, xml_report_name) + xml_report_name = _XML_REPORT + if args.internal_ci: + xml_report_name = _INTERNAL_CL_XML_REPORT + report_utils.render_junit_xml_report(resultset, xml_report_name) - for name, job in resultset.items(): - if "http2" in name: - job[0].http2results = aggregate_http2_results(job[0].message) + for name, job in resultset.items(): + if "http2" in name: + job[0].http2results = aggregate_http2_results(job[0].message) - http2_server_test_cases = ( - _HTTP2_SERVER_TEST_CASES if args.http2_server_interop else []) + http2_server_test_cases = (_HTTP2_SERVER_TEST_CASES + if args.http2_server_interop else []) - report_utils.render_interop_html_report( - set([str(l) for l in languages]), servers, _TEST_CASES, _AUTH_TEST_CASES, - _HTTP2_TEST_CASES, http2_server_test_cases, resultset, num_failures, - args.cloud_to_prod_auth or args.cloud_to_prod, args.prod_servers, - args.http2_interop) + report_utils.render_interop_html_report( + set([str(l) for l in languages]), servers, _TEST_CASES, + _AUTH_TEST_CASES, _HTTP2_TEST_CASES, http2_server_test_cases, resultset, + num_failures, args.cloud_to_prod_auth or args.cloud_to_prod, + args.prod_servers, args.http2_interop) - if num_failures: - sys.exit(1) - else: - sys.exit(0) + if num_failures: + sys.exit(1) + else: + sys.exit(0) except Exception as e: - print('exception occurred:') - traceback.print_exc(file=sys.stdout) + print('exception occurred:') + traceback.print_exc(file=sys.stdout) finally: - # Check if servers are still running. - for server, job in server_jobs.items(): - if not job.is_running(): - print('Server "%s" has exited prematurely.' % server) + # Check if servers are still running. + for server, job in server_jobs.items(): + if not job.is_running(): + print('Server "%s" has exited prematurely.' % server) - dockerjob.finish_jobs([j for j in six.itervalues(server_jobs)]) + dockerjob.finish_jobs([j for j in six.itervalues(server_jobs)]) - for image in six.itervalues(docker_images): - if not args.manual_run: - print('Removing docker image %s' % image) - dockerjob.remove_image(image) - else: - print('Preserving docker image: %s' % image) + for image in six.itervalues(docker_images): + if not args.manual_run: + print('Removing docker image %s' % image) + dockerjob.remove_image(image) + else: + print('Preserving docker image: %s' % image) diff --git a/tools/run_tests/run_microbenchmark.py b/tools/run_tests/run_microbenchmark.py index c136af58cb8..561217ceb1f 100755 --- a/tools/run_tests/run_microbenchmark.py +++ b/tools/run_tests/run_microbenchmark.py @@ -23,26 +23,31 @@ import argparse import python_utils.jobset as jobset import python_utils.start_port_server as start_port_server -sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '..', 'profiling', 'microbenchmarks', 'bm_diff')) +sys.path.append( + os.path.join( + os.path.dirname(sys.argv[0]), '..', 'profiling', 'microbenchmarks', + 'bm_diff')) import bm_constants flamegraph_dir = os.path.join(os.path.expanduser('~'), 'FlameGraph') os.chdir(os.path.join(os.path.dirname(sys.argv[0]), '../..')) if not os.path.exists('reports'): - os.makedirs('reports') + os.makedirs('reports') start_port_server.start_port_server() + def fnize(s): - out = '' - for c in s: - if c in '<>, /': - if len(out) and out[-1] == '_': continue - out += '_' - else: - out += c - return out + out = '' + for c in s: + if c in '<>, /': + if len(out) and out[-1] == '_': continue + out += '_' + else: + out += c + return out + # index html index_html = """ @@ -53,169 +58,202 @@ index_html = """ """ + def heading(name): - global index_html - index_html += "

    %s

    \n" % name + global index_html + index_html += "

    %s

    \n" % name + def link(txt, tgt): - global index_html - index_html += "

    %s

    \n" % ( - cgi.escape(tgt, quote=True), cgi.escape(txt)) + global index_html + index_html += "

    %s

    \n" % ( + cgi.escape(tgt, quote=True), cgi.escape(txt)) + def text(txt): - global index_html - index_html += "

    %s

    \n" % cgi.escape(txt) + global index_html + index_html += "

    %s

    \n" % cgi.escape(txt) + def collect_latency(bm_name, args): - """generate latency profiles""" - benchmarks = [] - profile_analysis = [] - cleanup = [] - - heading('Latency Profiles: %s' % bm_name) - subprocess.check_call( - ['make', bm_name, - 'CONFIG=basicprof', '-j', '%d' % multiprocessing.cpu_count()]) - for line in subprocess.check_output(['bins/basicprof/%s' % bm_name, - '--benchmark_list_tests']).splitlines(): - link(line, '%s.txt' % fnize(line)) - benchmarks.append( - jobset.JobSpec(['bins/basicprof/%s' % bm_name, - '--benchmark_filter=^%s$' % line, - '--benchmark_min_time=0.05'], - environ={'LATENCY_TRACE': '%s.trace' % fnize(line)}, - shortname='profile-%s' % fnize(line))) - profile_analysis.append( - jobset.JobSpec([sys.executable, - 'tools/profiling/latency_profile/profile_analyzer.py', - '--source', '%s.trace' % fnize(line), '--fmt', 'simple', - '--out', 'reports/%s.txt' % fnize(line)], timeout_seconds=20*60, - shortname='analyze-%s' % fnize(line))) - cleanup.append(jobset.JobSpec(['rm', '%s.trace' % fnize(line)])) - # periodically flush out the list of jobs: profile_analysis jobs at least - # consume upwards of five gigabytes of ram in some cases, and so analysing - # hundreds of them at once is impractical -- but we want at least some - # concurrency or the work takes too long - if len(benchmarks) >= min(16, multiprocessing.cpu_count()): - # run up to half the cpu count: each benchmark can use up to two cores - # (one for the microbenchmark, one for the data flush) - jobset.run(benchmarks, maxjobs=max(1, multiprocessing.cpu_count()/2)) - jobset.run(profile_analysis, maxjobs=multiprocessing.cpu_count()) - jobset.run(cleanup, maxjobs=multiprocessing.cpu_count()) - benchmarks = [] - profile_analysis = [] - cleanup = [] - # run the remaining benchmarks that weren't flushed - if len(benchmarks): - jobset.run(benchmarks, maxjobs=max(1, multiprocessing.cpu_count()/2)) - jobset.run(profile_analysis, maxjobs=multiprocessing.cpu_count()) - jobset.run(cleanup, maxjobs=multiprocessing.cpu_count()) + """generate latency profiles""" + benchmarks = [] + profile_analysis = [] + cleanup = [] + + heading('Latency Profiles: %s' % bm_name) + subprocess.check_call([ + 'make', bm_name, 'CONFIG=basicprof', '-j', + '%d' % multiprocessing.cpu_count() + ]) + for line in subprocess.check_output( + ['bins/basicprof/%s' % bm_name, '--benchmark_list_tests']).splitlines(): + link(line, '%s.txt' % fnize(line)) + benchmarks.append( + jobset.JobSpec( + [ + 'bins/basicprof/%s' % bm_name, '--benchmark_filter=^%s$' % + line, '--benchmark_min_time=0.05' + ], + environ={'LATENCY_TRACE': '%s.trace' % fnize(line)}, + shortname='profile-%s' % fnize(line))) + profile_analysis.append( + jobset.JobSpec( + [ + sys.executable, + 'tools/profiling/latency_profile/profile_analyzer.py', + '--source', '%s.trace' % fnize(line), '--fmt', 'simple', + '--out', 'reports/%s.txt' % fnize(line) + ], + timeout_seconds=20 * 60, + shortname='analyze-%s' % fnize(line))) + cleanup.append(jobset.JobSpec(['rm', '%s.trace' % fnize(line)])) + # periodically flush out the list of jobs: profile_analysis jobs at least + # consume upwards of five gigabytes of ram in some cases, and so analysing + # hundreds of them at once is impractical -- but we want at least some + # concurrency or the work takes too long + if len(benchmarks) >= min(16, multiprocessing.cpu_count()): + # run up to half the cpu count: each benchmark can use up to two cores + # (one for the microbenchmark, one for the data flush) + jobset.run( + benchmarks, maxjobs=max(1, multiprocessing.cpu_count() / 2)) + jobset.run(profile_analysis, maxjobs=multiprocessing.cpu_count()) + jobset.run(cleanup, maxjobs=multiprocessing.cpu_count()) + benchmarks = [] + profile_analysis = [] + cleanup = [] + # run the remaining benchmarks that weren't flushed + if len(benchmarks): + jobset.run(benchmarks, maxjobs=max(1, multiprocessing.cpu_count() / 2)) + jobset.run(profile_analysis, maxjobs=multiprocessing.cpu_count()) + jobset.run(cleanup, maxjobs=multiprocessing.cpu_count()) + def collect_perf(bm_name, args): - """generate flamegraphs""" - heading('Flamegraphs: %s' % bm_name) - subprocess.check_call( - ['make', bm_name, - 'CONFIG=mutrace', '-j', '%d' % multiprocessing.cpu_count()]) - benchmarks = [] - profile_analysis = [] - cleanup = [] - for line in subprocess.check_output(['bins/mutrace/%s' % bm_name, - '--benchmark_list_tests']).splitlines(): - link(line, '%s.svg' % fnize(line)) - benchmarks.append( - jobset.JobSpec(['perf', 'record', '-o', '%s-perf.data' % fnize(line), - '-g', '-F', '997', - 'bins/mutrace/%s' % bm_name, - '--benchmark_filter=^%s$' % line, - '--benchmark_min_time=10'], - shortname='perf-%s' % fnize(line))) - profile_analysis.append( - jobset.JobSpec(['tools/run_tests/performance/process_local_perf_flamegraphs.sh'], - environ = { - 'PERF_BASE_NAME': fnize(line), - 'OUTPUT_DIR': 'reports', - 'OUTPUT_FILENAME': fnize(line), - }, - shortname='flame-%s' % fnize(line))) - cleanup.append(jobset.JobSpec(['rm', '%s-perf.data' % fnize(line)])) - cleanup.append(jobset.JobSpec(['rm', '%s-out.perf' % fnize(line)])) - # periodically flush out the list of jobs: temporary space required for this - # processing is large - if len(benchmarks) >= 20: - # run up to half the cpu count: each benchmark can use up to two cores - # (one for the microbenchmark, one for the data flush) - jobset.run(benchmarks, maxjobs=1) - jobset.run(profile_analysis, maxjobs=multiprocessing.cpu_count()) - jobset.run(cleanup, maxjobs=multiprocessing.cpu_count()) - benchmarks = [] - profile_analysis = [] - cleanup = [] - # run the remaining benchmarks that weren't flushed - if len(benchmarks): - jobset.run(benchmarks, maxjobs=1) - jobset.run(profile_analysis, maxjobs=multiprocessing.cpu_count()) - jobset.run(cleanup, maxjobs=multiprocessing.cpu_count()) + """generate flamegraphs""" + heading('Flamegraphs: %s' % bm_name) + subprocess.check_call([ + 'make', bm_name, 'CONFIG=mutrace', '-j', + '%d' % multiprocessing.cpu_count() + ]) + benchmarks = [] + profile_analysis = [] + cleanup = [] + for line in subprocess.check_output( + ['bins/mutrace/%s' % bm_name, '--benchmark_list_tests']).splitlines(): + link(line, '%s.svg' % fnize(line)) + benchmarks.append( + jobset.JobSpec( + [ + 'perf', 'record', '-o', '%s-perf.data' % fnize( + line), '-g', '-F', '997', 'bins/mutrace/%s' % bm_name, + '--benchmark_filter=^%s$' % line, '--benchmark_min_time=10' + ], + shortname='perf-%s' % fnize(line))) + profile_analysis.append( + jobset.JobSpec( + [ + 'tools/run_tests/performance/process_local_perf_flamegraphs.sh' + ], + environ={ + 'PERF_BASE_NAME': fnize(line), + 'OUTPUT_DIR': 'reports', + 'OUTPUT_FILENAME': fnize(line), + }, + shortname='flame-%s' % fnize(line))) + cleanup.append(jobset.JobSpec(['rm', '%s-perf.data' % fnize(line)])) + cleanup.append(jobset.JobSpec(['rm', '%s-out.perf' % fnize(line)])) + # periodically flush out the list of jobs: temporary space required for this + # processing is large + if len(benchmarks) >= 20: + # run up to half the cpu count: each benchmark can use up to two cores + # (one for the microbenchmark, one for the data flush) + jobset.run(benchmarks, maxjobs=1) + jobset.run(profile_analysis, maxjobs=multiprocessing.cpu_count()) + jobset.run(cleanup, maxjobs=multiprocessing.cpu_count()) + benchmarks = [] + profile_analysis = [] + cleanup = [] + # run the remaining benchmarks that weren't flushed + if len(benchmarks): + jobset.run(benchmarks, maxjobs=1) + jobset.run(profile_analysis, maxjobs=multiprocessing.cpu_count()) + jobset.run(cleanup, maxjobs=multiprocessing.cpu_count()) + def run_summary(bm_name, cfg, base_json_name): - subprocess.check_call( - ['make', bm_name, - 'CONFIG=%s' % cfg, '-j', '%d' % multiprocessing.cpu_count()]) - cmd = ['bins/%s/%s' % (cfg, bm_name), - '--benchmark_out=%s.%s.json' % (base_json_name, cfg), - '--benchmark_out_format=json'] - if args.summary_time is not None: - cmd += ['--benchmark_min_time=%d' % args.summary_time] - return subprocess.check_output(cmd) + subprocess.check_call([ + 'make', bm_name, 'CONFIG=%s' % cfg, '-j', + '%d' % multiprocessing.cpu_count() + ]) + cmd = [ + 'bins/%s/%s' % (cfg, bm_name), '--benchmark_out=%s.%s.json' % + (base_json_name, cfg), '--benchmark_out_format=json' + ] + if args.summary_time is not None: + cmd += ['--benchmark_min_time=%d' % args.summary_time] + return subprocess.check_output(cmd) + def collect_summary(bm_name, args): - heading('Summary: %s [no counters]' % bm_name) - text(run_summary(bm_name, 'opt', bm_name)) - heading('Summary: %s [with counters]' % bm_name) - text(run_summary(bm_name, 'counters', bm_name)) - if args.bigquery_upload: - with open('%s.csv' % bm_name, 'w') as f: - f.write(subprocess.check_output(['tools/profiling/microbenchmarks/bm2bq.py', - '%s.counters.json' % bm_name, - '%s.opt.json' % bm_name])) - subprocess.check_call(['bq', 'load', 'microbenchmarks.microbenchmarks', '%s.csv' % bm_name]) + heading('Summary: %s [no counters]' % bm_name) + text(run_summary(bm_name, 'opt', bm_name)) + heading('Summary: %s [with counters]' % bm_name) + text(run_summary(bm_name, 'counters', bm_name)) + if args.bigquery_upload: + with open('%s.csv' % bm_name, 'w') as f: + f.write( + subprocess.check_output([ + 'tools/profiling/microbenchmarks/bm2bq.py', + '%s.counters.json' % bm_name, '%s.opt.json' % bm_name + ])) + subprocess.check_call([ + 'bq', 'load', 'microbenchmarks.microbenchmarks', '%s.csv' % bm_name + ]) + collectors = { - 'latency': collect_latency, - 'perf': collect_perf, - 'summary': collect_summary, + 'latency': collect_latency, + 'perf': collect_perf, + 'summary': collect_summary, } argp = argparse.ArgumentParser(description='Collect data from microbenchmarks') -argp.add_argument('-c', '--collect', - choices=sorted(collectors.keys()), - nargs='*', - default=sorted(collectors.keys()), - help='Which collectors should be run against each benchmark') -argp.add_argument('-b', '--benchmarks', - choices=bm_constants._AVAILABLE_BENCHMARK_TESTS, - default=bm_constants._AVAILABLE_BENCHMARK_TESTS, - nargs='+', - type=str, - help='Which microbenchmarks should be run') -argp.add_argument('--bigquery_upload', - default=False, - action='store_const', - const=True, - help='Upload results from summary collection to bigquery') -argp.add_argument('--summary_time', - default=None, - type=int, - help='Minimum time to run benchmarks for the summary collection') +argp.add_argument( + '-c', + '--collect', + choices=sorted(collectors.keys()), + nargs='*', + default=sorted(collectors.keys()), + help='Which collectors should be run against each benchmark') +argp.add_argument( + '-b', + '--benchmarks', + choices=bm_constants._AVAILABLE_BENCHMARK_TESTS, + default=bm_constants._AVAILABLE_BENCHMARK_TESTS, + nargs='+', + type=str, + help='Which microbenchmarks should be run') +argp.add_argument( + '--bigquery_upload', + default=False, + action='store_const', + const=True, + help='Upload results from summary collection to bigquery') +argp.add_argument( + '--summary_time', + default=None, + type=int, + help='Minimum time to run benchmarks for the summary collection') args = argp.parse_args() try: - for collect in args.collect: - for bm_name in args.benchmarks: - collectors[collect](bm_name, args) + for collect in args.collect: + for bm_name in args.benchmarks: + collectors[collect](bm_name, args) finally: - if not os.path.exists('reports'): - os.makedirs('reports') - index_html += "\n\n" - with open('reports/index.html', 'w') as f: - f.write(index_html) + if not os.path.exists('reports'): + os.makedirs('reports') + index_html += "\n\n" + with open('reports/index.html', 'w') as f: + f.write(index_html) diff --git a/tools/run_tests/run_performance_tests.py b/tools/run_tests/run_performance_tests.py index aa305be4660..03b684b318c 100755 --- a/tools/run_tests/run_performance_tests.py +++ b/tools/run_tests/run_performance_tests.py @@ -12,7 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Run performance tests locally or remotely.""" from __future__ import print_function @@ -37,566 +36,666 @@ import performance.scenario_config as scenario_config import python_utils.jobset as jobset import python_utils.report_utils as report_utils - _ROOT = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '../..')) os.chdir(_ROOT) - _REMOTE_HOST_USERNAME = 'jenkins' class QpsWorkerJob: - """Encapsulates a qps worker server job.""" - - def __init__(self, spec, language, host_and_port, perf_file_base_name=None): - self._spec = spec - self.language = language - self.host_and_port = host_and_port - self._job = None - self.perf_file_base_name = perf_file_base_name - - def start(self): - self._job = jobset.Job(self._spec, newline_on_success=True, travis=True, add_env={}) - - def is_running(self): - """Polls a job and returns True if given job is still running.""" - return self._job and self._job.state() == jobset._RUNNING - - def kill(self): - if self._job: - self._job.kill() - self._job = None - - -def create_qpsworker_job(language, shortname=None, port=10000, remote_host=None, perf_cmd=None): - cmdline = (language.worker_cmdline() + ['--driver_port=%s' % port]) - - if remote_host: - host_and_port='%s:%s' % (remote_host, port) - else: - host_and_port='localhost:%s' % port - - perf_file_base_name = None - if perf_cmd: - perf_file_base_name = '%s-%s' % (host_and_port, shortname) - # specify -o output file so perf.data gets collected when worker stopped - cmdline = perf_cmd + ['-o', '%s-perf.data' % perf_file_base_name] + cmdline - - worker_timeout = 3 * 60 - if remote_host: - user_at_host = '%s@%s' % (_REMOTE_HOST_USERNAME, remote_host) - ssh_cmd = ['ssh'] - cmdline = ['timeout', '%s' % (worker_timeout + 30)] + cmdline - ssh_cmd.extend([str(user_at_host), 'cd ~/performance_workspace/grpc/ && python tools/run_tests/start_port_server.py && %s' % ' '.join(cmdline)]) - cmdline = ssh_cmd - - jobspec = jobset.JobSpec( - cmdline=cmdline, - shortname=shortname, - timeout_seconds=worker_timeout, # workers get restarted after each scenario - verbose_success=True) - return QpsWorkerJob(jobspec, language, host_and_port, perf_file_base_name) - - -def create_scenario_jobspec(scenario_json, workers, remote_host=None, - bq_result_table=None, server_cpu_load=0): - """Runs one scenario using QPS driver.""" - # setting QPS_WORKERS env variable here makes sure it works with SSH too. - cmd = 'QPS_WORKERS="%s" ' % ','.join(workers) - if bq_result_table: - cmd += 'BQ_RESULT_TABLE="%s" ' % bq_result_table - cmd += 'tools/run_tests/performance/run_qps_driver.sh ' - cmd += '--scenarios_json=%s ' % pipes.quote(json.dumps({'scenarios': [scenario_json]})) - cmd += '--scenario_result_file=scenario_result.json ' - if server_cpu_load != 0: - cmd += '--search_param=offered_load --initial_search_value=1000 --targeted_cpu_load=%d --stride=500 --error_tolerance=0.01' % server_cpu_load - if remote_host: - user_at_host = '%s@%s' % (_REMOTE_HOST_USERNAME, remote_host) - cmd = 'ssh %s "cd ~/performance_workspace/grpc/ && "%s' % (user_at_host, pipes.quote(cmd)) - - return jobset.JobSpec( - cmdline=[cmd], - shortname='qps_json_driver.%s' % scenario_json['name'], - timeout_seconds=12*60, - shell=True, - verbose_success=True) + """Encapsulates a qps worker server job.""" + + def __init__(self, spec, language, host_and_port, perf_file_base_name=None): + self._spec = spec + self.language = language + self.host_and_port = host_and_port + self._job = None + self.perf_file_base_name = perf_file_base_name + + def start(self): + self._job = jobset.Job( + self._spec, newline_on_success=True, travis=True, add_env={}) + + def is_running(self): + """Polls a job and returns True if given job is still running.""" + return self._job and self._job.state() == jobset._RUNNING + + def kill(self): + if self._job: + self._job.kill() + self._job = None + + +def create_qpsworker_job(language, + shortname=None, + port=10000, + remote_host=None, + perf_cmd=None): + cmdline = (language.worker_cmdline() + ['--driver_port=%s' % port]) + + if remote_host: + host_and_port = '%s:%s' % (remote_host, port) + else: + host_and_port = 'localhost:%s' % port + + perf_file_base_name = None + if perf_cmd: + perf_file_base_name = '%s-%s' % (host_and_port, shortname) + # specify -o output file so perf.data gets collected when worker stopped + cmdline = perf_cmd + ['-o', '%s-perf.data' % perf_file_base_name + ] + cmdline + + worker_timeout = 3 * 60 + if remote_host: + user_at_host = '%s@%s' % (_REMOTE_HOST_USERNAME, remote_host) + ssh_cmd = ['ssh'] + cmdline = ['timeout', '%s' % (worker_timeout + 30)] + cmdline + ssh_cmd.extend([ + str(user_at_host), + 'cd ~/performance_workspace/grpc/ && python tools/run_tests/start_port_server.py && %s' + % ' '.join(cmdline) + ]) + cmdline = ssh_cmd + + jobspec = jobset.JobSpec( + cmdline=cmdline, + shortname=shortname, + timeout_seconds=worker_timeout, # workers get restarted after each scenario + verbose_success=True) + return QpsWorkerJob(jobspec, language, host_and_port, perf_file_base_name) + + +def create_scenario_jobspec(scenario_json, + workers, + remote_host=None, + bq_result_table=None, + server_cpu_load=0): + """Runs one scenario using QPS driver.""" + # setting QPS_WORKERS env variable here makes sure it works with SSH too. + cmd = 'QPS_WORKERS="%s" ' % ','.join(workers) + if bq_result_table: + cmd += 'BQ_RESULT_TABLE="%s" ' % bq_result_table + cmd += 'tools/run_tests/performance/run_qps_driver.sh ' + cmd += '--scenarios_json=%s ' % pipes.quote( + json.dumps({ + 'scenarios': [scenario_json] + })) + cmd += '--scenario_result_file=scenario_result.json ' + if server_cpu_load != 0: + cmd += '--search_param=offered_load --initial_search_value=1000 --targeted_cpu_load=%d --stride=500 --error_tolerance=0.01' % server_cpu_load + if remote_host: + user_at_host = '%s@%s' % (_REMOTE_HOST_USERNAME, remote_host) + cmd = 'ssh %s "cd ~/performance_workspace/grpc/ && "%s' % ( + user_at_host, pipes.quote(cmd)) + + return jobset.JobSpec( + cmdline=[cmd], + shortname='qps_json_driver.%s' % scenario_json['name'], + timeout_seconds=12 * 60, + shell=True, + verbose_success=True) def create_quit_jobspec(workers, remote_host=None): - """Runs quit using QPS driver.""" - # setting QPS_WORKERS env variable here makes sure it works with SSH too. - cmd = 'QPS_WORKERS="%s" bins/opt/qps_json_driver --quit' % ','.join(w.host_and_port for w in workers) - if remote_host: - user_at_host = '%s@%s' % (_REMOTE_HOST_USERNAME, remote_host) - cmd = 'ssh %s "cd ~/performance_workspace/grpc/ && "%s' % (user_at_host, pipes.quote(cmd)) - - return jobset.JobSpec( - cmdline=[cmd], - shortname='qps_json_driver.quit', - timeout_seconds=3*60, - shell=True, - verbose_success=True) - - -def create_netperf_jobspec(server_host='localhost', client_host=None, + """Runs quit using QPS driver.""" + # setting QPS_WORKERS env variable here makes sure it works with SSH too. + cmd = 'QPS_WORKERS="%s" bins/opt/qps_json_driver --quit' % ','.join( + w.host_and_port for w in workers) + if remote_host: + user_at_host = '%s@%s' % (_REMOTE_HOST_USERNAME, remote_host) + cmd = 'ssh %s "cd ~/performance_workspace/grpc/ && "%s' % ( + user_at_host, pipes.quote(cmd)) + + return jobset.JobSpec( + cmdline=[cmd], + shortname='qps_json_driver.quit', + timeout_seconds=3 * 60, + shell=True, + verbose_success=True) + + +def create_netperf_jobspec(server_host='localhost', + client_host=None, bq_result_table=None): - """Runs netperf benchmark.""" - cmd = 'NETPERF_SERVER_HOST="%s" ' % server_host - if bq_result_table: - cmd += 'BQ_RESULT_TABLE="%s" ' % bq_result_table - if client_host: - # If netperf is running remotely, the env variables populated by Jenkins - # won't be available on the client, but we need them for uploading results - # to BigQuery. - jenkins_job_name = os.getenv('JOB_NAME') - if jenkins_job_name: - cmd += 'JOB_NAME="%s" ' % jenkins_job_name - jenkins_build_number = os.getenv('BUILD_NUMBER') - if jenkins_build_number: - cmd += 'BUILD_NUMBER="%s" ' % jenkins_build_number - - cmd += 'tools/run_tests/performance/run_netperf.sh' - if client_host: - user_at_host = '%s@%s' % (_REMOTE_HOST_USERNAME, client_host) - cmd = 'ssh %s "cd ~/performance_workspace/grpc/ && "%s' % (user_at_host, pipes.quote(cmd)) - - return jobset.JobSpec( - cmdline=[cmd], - shortname='netperf', - timeout_seconds=60, - shell=True, - verbose_success=True) + """Runs netperf benchmark.""" + cmd = 'NETPERF_SERVER_HOST="%s" ' % server_host + if bq_result_table: + cmd += 'BQ_RESULT_TABLE="%s" ' % bq_result_table + if client_host: + # If netperf is running remotely, the env variables populated by Jenkins + # won't be available on the client, but we need them for uploading results + # to BigQuery. + jenkins_job_name = os.getenv('JOB_NAME') + if jenkins_job_name: + cmd += 'JOB_NAME="%s" ' % jenkins_job_name + jenkins_build_number = os.getenv('BUILD_NUMBER') + if jenkins_build_number: + cmd += 'BUILD_NUMBER="%s" ' % jenkins_build_number + + cmd += 'tools/run_tests/performance/run_netperf.sh' + if client_host: + user_at_host = '%s@%s' % (_REMOTE_HOST_USERNAME, client_host) + cmd = 'ssh %s "cd ~/performance_workspace/grpc/ && "%s' % ( + user_at_host, pipes.quote(cmd)) + + return jobset.JobSpec( + cmdline=[cmd], + shortname='netperf', + timeout_seconds=60, + shell=True, + verbose_success=True) def archive_repo(languages): - """Archives local version of repo including submodules.""" - cmdline=['tar', '-cf', '../grpc.tar', '../grpc/'] - if 'java' in languages: - cmdline.append('../grpc-java') - if 'go' in languages: - cmdline.append('../grpc-go') - - archive_job = jobset.JobSpec( - cmdline=cmdline, - shortname='archive_repo', - timeout_seconds=3*60) - - jobset.message('START', 'Archiving local repository.', do_newline=True) - num_failures, _ = jobset.run( - [archive_job], newline_on_success=True, maxjobs=1) - if num_failures == 0: - jobset.message('SUCCESS', - 'Archive with local repository created successfully.', - do_newline=True) - else: - jobset.message('FAILED', 'Failed to archive local repository.', - do_newline=True) - sys.exit(1) + """Archives local version of repo including submodules.""" + cmdline = ['tar', '-cf', '../grpc.tar', '../grpc/'] + if 'java' in languages: + cmdline.append('../grpc-java') + if 'go' in languages: + cmdline.append('../grpc-go') + + archive_job = jobset.JobSpec( + cmdline=cmdline, shortname='archive_repo', timeout_seconds=3 * 60) + + jobset.message('START', 'Archiving local repository.', do_newline=True) + num_failures, _ = jobset.run( + [archive_job], newline_on_success=True, maxjobs=1) + if num_failures == 0: + jobset.message( + 'SUCCESS', + 'Archive with local repository created successfully.', + do_newline=True) + else: + jobset.message( + 'FAILED', 'Failed to archive local repository.', do_newline=True) + sys.exit(1) def prepare_remote_hosts(hosts, prepare_local=False): - """Prepares remote hosts (and maybe prepare localhost as well).""" - prepare_timeout = 10*60 - prepare_jobs = [] - for host in hosts: - user_at_host = '%s@%s' % (_REMOTE_HOST_USERNAME, host) - prepare_jobs.append( - jobset.JobSpec( - cmdline=['tools/run_tests/performance/remote_host_prepare.sh'], - shortname='remote_host_prepare.%s' % host, - environ = {'USER_AT_HOST': user_at_host}, - timeout_seconds=prepare_timeout)) - if prepare_local: - # Prepare localhost as well - prepare_jobs.append( - jobset.JobSpec( - cmdline=['tools/run_tests/performance/kill_workers.sh'], - shortname='local_prepare', - timeout_seconds=prepare_timeout)) - jobset.message('START', 'Preparing hosts.', do_newline=True) - num_failures, _ = jobset.run( - prepare_jobs, newline_on_success=True, maxjobs=10) - if num_failures == 0: - jobset.message('SUCCESS', - 'Prepare step completed successfully.', - do_newline=True) - else: - jobset.message('FAILED', 'Failed to prepare remote hosts.', - do_newline=True) - sys.exit(1) - - -def build_on_remote_hosts(hosts, languages=scenario_config.LANGUAGES.keys(), build_local=False): - """Builds performance worker on remote hosts (and maybe also locally).""" - build_timeout = 15*60 - # Kokoro VMs (which are local only) do not have caching, so they need more time to build - local_build_timeout = 30*60 - build_jobs = [] - for host in hosts: - user_at_host = '%s@%s' % (_REMOTE_HOST_USERNAME, host) - build_jobs.append( - jobset.JobSpec( - cmdline=['tools/run_tests/performance/remote_host_build.sh'] + languages, - shortname='remote_host_build.%s' % host, - environ = {'USER_AT_HOST': user_at_host, 'CONFIG': 'opt'}, - timeout_seconds=build_timeout)) - if build_local: - # Build locally as well - build_jobs.append( - jobset.JobSpec( - cmdline=['tools/run_tests/performance/build_performance.sh'] + languages, - shortname='local_build', - environ = {'CONFIG': 'opt'}, - timeout_seconds=local_build_timeout)) - jobset.message('START', 'Building.', do_newline=True) - num_failures, _ = jobset.run( - build_jobs, newline_on_success=True, maxjobs=10) - if num_failures == 0: - jobset.message('SUCCESS', - 'Built successfully.', - do_newline=True) - else: - jobset.message('FAILED', 'Build failed.', - do_newline=True) - sys.exit(1) + """Prepares remote hosts (and maybe prepare localhost as well).""" + prepare_timeout = 10 * 60 + prepare_jobs = [] + for host in hosts: + user_at_host = '%s@%s' % (_REMOTE_HOST_USERNAME, host) + prepare_jobs.append( + jobset.JobSpec( + cmdline=['tools/run_tests/performance/remote_host_prepare.sh'], + shortname='remote_host_prepare.%s' % host, + environ={'USER_AT_HOST': user_at_host}, + timeout_seconds=prepare_timeout)) + if prepare_local: + # Prepare localhost as well + prepare_jobs.append( + jobset.JobSpec( + cmdline=['tools/run_tests/performance/kill_workers.sh'], + shortname='local_prepare', + timeout_seconds=prepare_timeout)) + jobset.message('START', 'Preparing hosts.', do_newline=True) + num_failures, _ = jobset.run( + prepare_jobs, newline_on_success=True, maxjobs=10) + if num_failures == 0: + jobset.message( + 'SUCCESS', 'Prepare step completed successfully.', do_newline=True) + else: + jobset.message( + 'FAILED', 'Failed to prepare remote hosts.', do_newline=True) + sys.exit(1) + + +def build_on_remote_hosts(hosts, + languages=scenario_config.LANGUAGES.keys(), + build_local=False): + """Builds performance worker on remote hosts (and maybe also locally).""" + build_timeout = 15 * 60 + # Kokoro VMs (which are local only) do not have caching, so they need more time to build + local_build_timeout = 30 * 60 + build_jobs = [] + for host in hosts: + user_at_host = '%s@%s' % (_REMOTE_HOST_USERNAME, host) + build_jobs.append( + jobset.JobSpec( + cmdline=['tools/run_tests/performance/remote_host_build.sh'] + + languages, + shortname='remote_host_build.%s' % host, + environ={'USER_AT_HOST': user_at_host, + 'CONFIG': 'opt'}, + timeout_seconds=build_timeout)) + if build_local: + # Build locally as well + build_jobs.append( + jobset.JobSpec( + cmdline=['tools/run_tests/performance/build_performance.sh'] + + languages, + shortname='local_build', + environ={'CONFIG': 'opt'}, + timeout_seconds=local_build_timeout)) + jobset.message('START', 'Building.', do_newline=True) + num_failures, _ = jobset.run( + build_jobs, newline_on_success=True, maxjobs=10) + if num_failures == 0: + jobset.message('SUCCESS', 'Built successfully.', do_newline=True) + else: + jobset.message('FAILED', 'Build failed.', do_newline=True) + sys.exit(1) def create_qpsworkers(languages, worker_hosts, perf_cmd=None): - """Creates QPS workers (but does not start them).""" - if not worker_hosts: - # run two workers locally (for each language) - workers=[(None, 10000), (None, 10010)] - elif len(worker_hosts) == 1: - # run two workers on the remote host (for each language) - workers=[(worker_hosts[0], 10000), (worker_hosts[0], 10010)] - else: - # run one worker per each remote host (for each language) - workers=[(worker_host, 10000) for worker_host in worker_hosts] - - return [create_qpsworker_job(language, - shortname= 'qps_worker_%s_%s' % (language, - worker_idx), - port=worker[1] + language.worker_port_offset(), - remote_host=worker[0], - perf_cmd=perf_cmd) - for language in languages - for worker_idx, worker in enumerate(workers)] - - -def perf_report_processor_job(worker_host, perf_base_name, output_filename, flame_graph_reports): - print('Creating perf report collection job for %s' % worker_host) - cmd = '' - if worker_host != 'localhost': - user_at_host = "%s@%s" % (_REMOTE_HOST_USERNAME, worker_host) - cmd = "USER_AT_HOST=%s OUTPUT_FILENAME=%s OUTPUT_DIR=%s PERF_BASE_NAME=%s\ - tools/run_tests/performance/process_remote_perf_flamegraphs.sh" \ - % (user_at_host, output_filename, flame_graph_reports, perf_base_name) - else: - cmd = "OUTPUT_FILENAME=%s OUTPUT_DIR=%s PERF_BASE_NAME=%s\ - tools/run_tests/performance/process_local_perf_flamegraphs.sh" \ - % (output_filename, flame_graph_reports, perf_base_name) - - return jobset.JobSpec(cmdline=cmd, - timeout_seconds=3*60, - shell=True, - verbose_success=True, - shortname='process perf report') + """Creates QPS workers (but does not start them).""" + if not worker_hosts: + # run two workers locally (for each language) + workers = [(None, 10000), (None, 10010)] + elif len(worker_hosts) == 1: + # run two workers on the remote host (for each language) + workers = [(worker_hosts[0], 10000), (worker_hosts[0], 10010)] + else: + # run one worker per each remote host (for each language) + workers = [(worker_host, 10000) for worker_host in worker_hosts] + + return [ + create_qpsworker_job( + language, + shortname='qps_worker_%s_%s' % (language, worker_idx), + port=worker[1] + language.worker_port_offset(), + remote_host=worker[0], + perf_cmd=perf_cmd) + for language in languages for worker_idx, worker in enumerate(workers) + ] + + +def perf_report_processor_job(worker_host, perf_base_name, output_filename, + flame_graph_reports): + print('Creating perf report collection job for %s' % worker_host) + cmd = '' + if worker_host != 'localhost': + user_at_host = "%s@%s" % (_REMOTE_HOST_USERNAME, worker_host) + cmd = "USER_AT_HOST=%s OUTPUT_FILENAME=%s OUTPUT_DIR=%s PERF_BASE_NAME=%stools/run_tests/performance/process_remote_perf_flamegraphs.sh" % ( + user_at_host, output_filename, flame_graph_reports, perf_base_name) + else: + cmd = "OUTPUT_FILENAME=%s OUTPUT_DIR=%s PERF_BASE_NAME=%stools/run_tests/performance/process_local_perf_flamegraphs.sh" % ( + output_filename, flame_graph_reports, perf_base_name) + + return jobset.JobSpec( + cmdline=cmd, + timeout_seconds=3 * 60, + shell=True, + verbose_success=True, + shortname='process perf report') Scenario = collections.namedtuple('Scenario', 'jobspec workers name') -def create_scenarios(languages, workers_by_lang, remote_host=None, regex='.*', - category='all', bq_result_table=None, - netperf=False, netperf_hosts=[], server_cpu_load=0): - """Create jobspecs for scenarios to run.""" - all_workers = [worker - for workers in workers_by_lang.values() - for worker in workers] - scenarios = [] - _NO_WORKERS = [] - - if netperf: - if not netperf_hosts: - netperf_server='localhost' - netperf_client=None - elif len(netperf_hosts) == 1: - netperf_server=netperf_hosts[0] - netperf_client=netperf_hosts[0] - else: - netperf_server=netperf_hosts[0] - netperf_client=netperf_hosts[1] - scenarios.append(Scenario( - create_netperf_jobspec(server_host=netperf_server, - client_host=netperf_client, - bq_result_table=bq_result_table), - _NO_WORKERS, 'netperf')) - - for language in languages: - for scenario_json in language.scenarios(): - if re.search(regex, scenario_json['name']): - categories = scenario_json.get('CATEGORIES', ['scalable', 'smoketest']) - if category in categories or category == 'all': - workers = workers_by_lang[str(language)][:] - # 'SERVER_LANGUAGE' is an indicator for this script to pick - # a server in different language. - custom_server_lang = scenario_json.get('SERVER_LANGUAGE', None) - custom_client_lang = scenario_json.get('CLIENT_LANGUAGE', None) - scenario_json = scenario_config.remove_nonproto_fields(scenario_json) - if custom_server_lang and custom_client_lang: - raise Exception('Cannot set both custom CLIENT_LANGUAGE and SERVER_LANGUAGE' +def create_scenarios(languages, + workers_by_lang, + remote_host=None, + regex='.*', + category='all', + bq_result_table=None, + netperf=False, + netperf_hosts=[], + server_cpu_load=0): + """Create jobspecs for scenarios to run.""" + all_workers = [ + worker for workers in workers_by_lang.values() for worker in workers + ] + scenarios = [] + _NO_WORKERS = [] + + if netperf: + if not netperf_hosts: + netperf_server = 'localhost' + netperf_client = None + elif len(netperf_hosts) == 1: + netperf_server = netperf_hosts[0] + netperf_client = netperf_hosts[0] + else: + netperf_server = netperf_hosts[0] + netperf_client = netperf_hosts[1] + scenarios.append( + Scenario( + create_netperf_jobspec( + server_host=netperf_server, + client_host=netperf_client, + bq_result_table=bq_result_table), _NO_WORKERS, 'netperf')) + + for language in languages: + for scenario_json in language.scenarios(): + if re.search(regex, scenario_json['name']): + categories = scenario_json.get('CATEGORIES', + ['scalable', 'smoketest']) + if category in categories or category == 'all': + workers = workers_by_lang[str(language)][:] + # 'SERVER_LANGUAGE' is an indicator for this script to pick + # a server in different language. + custom_server_lang = scenario_json.get('SERVER_LANGUAGE', + None) + custom_client_lang = scenario_json.get('CLIENT_LANGUAGE', + None) + scenario_json = scenario_config.remove_nonproto_fields( + scenario_json) + if custom_server_lang and custom_client_lang: + raise Exception( + 'Cannot set both custom CLIENT_LANGUAGE and SERVER_LANGUAGE' 'in the same scenario') - if custom_server_lang: - if not workers_by_lang.get(custom_server_lang, []): - print('Warning: Skipping scenario %s as' % scenario_json['name']) - print('SERVER_LANGUAGE is set to %s yet the language has ' - 'not been selected with -l' % custom_server_lang) - continue - for idx in range(0, scenario_json['num_servers']): - # replace first X workers by workers of a different language - workers[idx] = workers_by_lang[custom_server_lang][idx] - if custom_client_lang: - if not workers_by_lang.get(custom_client_lang, []): - print('Warning: Skipping scenario %s as' % scenario_json['name']) - print('CLIENT_LANGUAGE is set to %s yet the language has ' - 'not been selected with -l' % custom_client_lang) - continue - for idx in range(scenario_json['num_servers'], len(workers)): - # replace all client workers by workers of a different language, - # leave num_server workers as they are server workers. - workers[idx] = workers_by_lang[custom_client_lang][idx] - scenario = Scenario( - create_scenario_jobspec(scenario_json, - [w.host_and_port for w in workers], - remote_host=remote_host, - bq_result_table=bq_result_table, - server_cpu_load=server_cpu_load), - workers, - scenario_json['name']) - scenarios.append(scenario) - - return scenarios + if custom_server_lang: + if not workers_by_lang.get(custom_server_lang, []): + print('Warning: Skipping scenario %s as' % + scenario_json['name']) + print( + 'SERVER_LANGUAGE is set to %s yet the language has ' + 'not been selected with -l' % + custom_server_lang) + continue + for idx in range(0, scenario_json['num_servers']): + # replace first X workers by workers of a different language + workers[idx] = workers_by_lang[custom_server_lang][ + idx] + if custom_client_lang: + if not workers_by_lang.get(custom_client_lang, []): + print('Warning: Skipping scenario %s as' % + scenario_json['name']) + print( + 'CLIENT_LANGUAGE is set to %s yet the language has ' + 'not been selected with -l' % + custom_client_lang) + continue + for idx in range(scenario_json['num_servers'], + len(workers)): + # replace all client workers by workers of a different language, + # leave num_server workers as they are server workers. + workers[idx] = workers_by_lang[custom_client_lang][ + idx] + scenario = Scenario( + create_scenario_jobspec( + scenario_json, [w.host_and_port for w in workers], + remote_host=remote_host, + bq_result_table=bq_result_table, + server_cpu_load=server_cpu_load), workers, + scenario_json['name']) + scenarios.append(scenario) + + return scenarios def finish_qps_workers(jobs, qpsworker_jobs): - """Waits for given jobs to finish and eventually kills them.""" - retries = 0 - num_killed = 0 - while any(job.is_running() for job in jobs): - for job in qpsworker_jobs: - if job.is_running(): - print('QPS worker "%s" is still running.' % job.host_and_port) - if retries > 10: - print('Killing all QPS workers.') - for job in jobs: - job.kill() - num_killed += 1 - retries += 1 - time.sleep(3) - print('All QPS workers finished.') - return num_killed + """Waits for given jobs to finish and eventually kills them.""" + retries = 0 + num_killed = 0 + while any(job.is_running() for job in jobs): + for job in qpsworker_jobs: + if job.is_running(): + print('QPS worker "%s" is still running.' % job.host_and_port) + if retries > 10: + print('Killing all QPS workers.') + for job in jobs: + job.kill() + num_killed += 1 + retries += 1 + time.sleep(3) + print('All QPS workers finished.') + return num_killed + profile_output_files = [] + # Collect perf text reports and flamegraphs if perf_cmd was used # Note the base names of perf text reports are used when creating and processing # perf data. The scenario name uniqifies the output name in the final # perf reports directory. # Alos, the perf profiles need to be fetched and processed after each scenario # in order to avoid clobbering the output files. -def run_collect_perf_profile_jobs(hosts_and_base_names, scenario_name, flame_graph_reports): - perf_report_jobs = [] - global profile_output_files - for host_and_port in hosts_and_base_names: - perf_base_name = hosts_and_base_names[host_and_port] - output_filename = '%s-%s' % (scenario_name, perf_base_name) - # from the base filename, create .svg output filename - host = host_and_port.split(':')[0] - profile_output_files.append('%s.svg' % output_filename) - perf_report_jobs.append(perf_report_processor_job(host, perf_base_name, output_filename, flame_graph_reports)) - - jobset.message('START', 'Collecting perf reports from qps workers', do_newline=True) - failures, _ = jobset.run(perf_report_jobs, newline_on_success=True, maxjobs=1) - jobset.message('END', 'Collecting perf reports from qps workers', do_newline=True) - return failures +def run_collect_perf_profile_jobs(hosts_and_base_names, scenario_name, + flame_graph_reports): + perf_report_jobs = [] + global profile_output_files + for host_and_port in hosts_and_base_names: + perf_base_name = hosts_and_base_names[host_and_port] + output_filename = '%s-%s' % (scenario_name, perf_base_name) + # from the base filename, create .svg output filename + host = host_and_port.split(':')[0] + profile_output_files.append('%s.svg' % output_filename) + perf_report_jobs.append( + perf_report_processor_job(host, perf_base_name, output_filename, + flame_graph_reports)) + + jobset.message( + 'START', 'Collecting perf reports from qps workers', do_newline=True) + failures, _ = jobset.run( + perf_report_jobs, newline_on_success=True, maxjobs=1) + jobset.message( + 'END', 'Collecting perf reports from qps workers', do_newline=True) + return failures + def main(): - argp = argparse.ArgumentParser(description='Run performance tests.') - argp.add_argument('-l', '--language', - choices=['all'] + sorted(scenario_config.LANGUAGES.keys()), - nargs='+', - required=True, - help='Languages to benchmark.') - argp.add_argument('--remote_driver_host', - default=None, - help='Run QPS driver on given host. By default, QPS driver is run locally.') - argp.add_argument('--remote_worker_host', - nargs='+', - default=[], - help='Worker hosts where to start QPS workers.') - argp.add_argument('--dry_run', - default=False, - action='store_const', - const=True, - help='Just list scenarios to be run, but don\'t run them.') - argp.add_argument('-r', '--regex', default='.*', type=str, - help='Regex to select scenarios to run.') - argp.add_argument('--bq_result_table', default=None, type=str, - help='Bigquery "dataset.table" to upload results to.') - argp.add_argument('--category', - choices=['smoketest','all','scalable','sweep'], - default='all', - help='Select a category of tests to run.') - argp.add_argument('--netperf', - default=False, - action='store_const', - const=True, - help='Run netperf benchmark as one of the scenarios.') - argp.add_argument('--server_cpu_load', - default=0, type=int, - help='Select a targeted server cpu load to run. 0 means ignore this flag') - argp.add_argument('-x', '--xml_report', default='report.xml', type=str, - help='Name of XML report file to generate.') - argp.add_argument('--perf_args', - help=('Example usage: "--perf_args=record -F 99 -g". ' - 'Wrap QPS workers in a perf command ' - 'with the arguments to perf specified here. ' - '".svg" flame graph profiles will be ' - 'created for each Qps Worker on each scenario. ' - 'Files will output to "/" ' - 'directory. Output files from running the worker ' - 'under perf are saved in the repo root where its ran. ' - 'Note that the perf "-g" flag is necessary for ' - 'flame graphs generation to work (assuming the binary ' - 'being profiled uses frame pointers, check out ' - '"--call-graph dwarf" option using libunwind otherwise.) ' - 'Also note that the entire "--perf_args=" must ' - 'be wrapped in quotes as in the example usage. ' - 'If the "--perg_args" is unspecified, "perf" will ' - 'not be used at all. ' - 'See http://www.brendangregg.com/perf.html ' - 'for more general perf examples.')) - argp.add_argument('--skip_generate_flamegraphs', - default=False, - action='store_const', - const=True, - help=('Turn flame graph generation off. ' - 'May be useful if "perf_args" arguments do not make sense for ' - 'generating flamegraphs (e.g., "--perf_args=stat ...")')) - argp.add_argument('-f', '--flame_graph_reports', default='perf_reports', type=str, - help='Name of directory to output flame graph profiles to, if any are created.') - argp.add_argument('-u', '--remote_host_username', default='', type=str, - help='Use a username that isn\'t "Jenkins" to SSH into remote workers.') - - args = argp.parse_args() - - global _REMOTE_HOST_USERNAME - if args.remote_host_username: - _REMOTE_HOST_USERNAME = args.remote_host_username - - languages = set(scenario_config.LANGUAGES[l] - for l in itertools.chain.from_iterable( - six.iterkeys(scenario_config.LANGUAGES) if x == 'all' - else [x] for x in args.language)) - - - # Put together set of remote hosts where to run and build - remote_hosts = set() - if args.remote_worker_host: - for host in args.remote_worker_host: - remote_hosts.add(host) - if args.remote_driver_host: - remote_hosts.add(args.remote_driver_host) - - if not args.dry_run: - if remote_hosts: - archive_repo(languages=[str(l) for l in languages]) - prepare_remote_hosts(remote_hosts, prepare_local=True) - else: - prepare_remote_hosts([], prepare_local=True) - - build_local = False - if not args.remote_driver_host: - build_local = True - if not args.dry_run: - build_on_remote_hosts(remote_hosts, languages=[str(l) for l in languages], build_local=build_local) - - perf_cmd = None - if args.perf_args: - print('Running workers under perf profiler') - # Expect /usr/bin/perf to be installed here, as is usual - perf_cmd = ['/usr/bin/perf'] - perf_cmd.extend(re.split('\s+', args.perf_args)) - - qpsworker_jobs = create_qpsworkers(languages, args.remote_worker_host, perf_cmd=perf_cmd) - - # get list of worker addresses for each language. - workers_by_lang = dict([(str(language), []) for language in languages]) - for job in qpsworker_jobs: - workers_by_lang[str(job.language)].append(job) - - scenarios = create_scenarios(languages, - workers_by_lang=workers_by_lang, - remote_host=args.remote_driver_host, - regex=args.regex, - category=args.category, - bq_result_table=args.bq_result_table, - netperf=args.netperf, - netperf_hosts=args.remote_worker_host, - server_cpu_load=args.server_cpu_load) - - if not scenarios: - raise Exception('No scenarios to run') - - total_scenario_failures = 0 - qps_workers_killed = 0 - merged_resultset = {} - perf_report_failures = 0 - - for scenario in scenarios: - if args.dry_run: - print(scenario.name) - else: - scenario_failures = 0 - try: - for worker in scenario.workers: - worker.start() - jobs = [scenario.jobspec] - if scenario.workers: - jobs.append(create_quit_jobspec(scenario.workers, remote_host=args.remote_driver_host)) - scenario_failures, resultset = jobset.run(jobs, newline_on_success=True, maxjobs=1) - total_scenario_failures += scenario_failures - merged_resultset = dict(itertools.chain(six.iteritems(merged_resultset), - six.iteritems(resultset))) - finally: - # Consider qps workers that need to be killed as failures - qps_workers_killed += finish_qps_workers(scenario.workers, qpsworker_jobs) - - if perf_cmd and scenario_failures == 0 and not args.skip_generate_flamegraphs: - workers_and_base_names = {} - for worker in scenario.workers: - if not worker.perf_file_base_name: - raise Exception('using perf buf perf report filename is unspecified') - workers_and_base_names[worker.host_and_port] = worker.perf_file_base_name - perf_report_failures += run_collect_perf_profile_jobs(workers_and_base_names, scenario.name, args.flame_graph_reports) - - - # Still write the index.html even if some scenarios failed. - # 'profile_output_files' will only have names for scenarios that passed - if perf_cmd and not args.skip_generate_flamegraphs: - # write the index fil to the output dir, with all profiles from all scenarios/workers - report_utils.render_perf_profiling_results('%s/index.html' % args.flame_graph_reports, profile_output_files) - - report_utils.render_junit_xml_report(merged_resultset, args.xml_report, - suite_name='benchmarks') - - if total_scenario_failures > 0 or qps_workers_killed > 0: - print('%s scenarios failed and %s qps worker jobs killed' % (total_scenario_failures, qps_workers_killed)) - sys.exit(1) - - if perf_report_failures > 0: - print('%s perf profile collection jobs failed' % perf_report_failures) - sys.exit(1) + argp = argparse.ArgumentParser(description='Run performance tests.') + argp.add_argument( + '-l', + '--language', + choices=['all'] + sorted(scenario_config.LANGUAGES.keys()), + nargs='+', + required=True, + help='Languages to benchmark.') + argp.add_argument( + '--remote_driver_host', + default=None, + help='Run QPS driver on given host. By default, QPS driver is run locally.' + ) + argp.add_argument( + '--remote_worker_host', + nargs='+', + default=[], + help='Worker hosts where to start QPS workers.') + argp.add_argument( + '--dry_run', + default=False, + action='store_const', + const=True, + help='Just list scenarios to be run, but don\'t run them.') + argp.add_argument( + '-r', + '--regex', + default='.*', + type=str, + help='Regex to select scenarios to run.') + argp.add_argument( + '--bq_result_table', + default=None, + type=str, + help='Bigquery "dataset.table" to upload results to.') + argp.add_argument( + '--category', + choices=['smoketest', 'all', 'scalable', 'sweep'], + default='all', + help='Select a category of tests to run.') + argp.add_argument( + '--netperf', + default=False, + action='store_const', + const=True, + help='Run netperf benchmark as one of the scenarios.') + argp.add_argument( + '--server_cpu_load', + default=0, + type=int, + help='Select a targeted server cpu load to run. 0 means ignore this flag' + ) + argp.add_argument( + '-x', + '--xml_report', + default='report.xml', + type=str, + help='Name of XML report file to generate.') + argp.add_argument( + '--perf_args', + help=('Example usage: "--perf_args=record -F 99 -g". ' + 'Wrap QPS workers in a perf command ' + 'with the arguments to perf specified here. ' + '".svg" flame graph profiles will be ' + 'created for each Qps Worker on each scenario. ' + 'Files will output to "/" ' + 'directory. Output files from running the worker ' + 'under perf are saved in the repo root where its ran. ' + 'Note that the perf "-g" flag is necessary for ' + 'flame graphs generation to work (assuming the binary ' + 'being profiled uses frame pointers, check out ' + '"--call-graph dwarf" option using libunwind otherwise.) ' + 'Also note that the entire "--perf_args=" must ' + 'be wrapped in quotes as in the example usage. ' + 'If the "--perg_args" is unspecified, "perf" will ' + 'not be used at all. ' + 'See http://www.brendangregg.com/perf.html ' + 'for more general perf examples.')) + argp.add_argument( + '--skip_generate_flamegraphs', + default=False, + action='store_const', + const=True, + help=('Turn flame graph generation off. ' + 'May be useful if "perf_args" arguments do not make sense for ' + 'generating flamegraphs (e.g., "--perf_args=stat ...")')) + argp.add_argument( + '-f', + '--flame_graph_reports', + default='perf_reports', + type=str, + help='Name of directory to output flame graph profiles to, if any are created.' + ) + argp.add_argument( + '-u', + '--remote_host_username', + default='', + type=str, + help='Use a username that isn\'t "Jenkins" to SSH into remote workers.') + + args = argp.parse_args() + + global _REMOTE_HOST_USERNAME + if args.remote_host_username: + _REMOTE_HOST_USERNAME = args.remote_host_username + + languages = set( + scenario_config.LANGUAGES[l] + for l in itertools.chain.from_iterable( + six.iterkeys(scenario_config.LANGUAGES) if x == 'all' else [x] + for x in args.language)) + + # Put together set of remote hosts where to run and build + remote_hosts = set() + if args.remote_worker_host: + for host in args.remote_worker_host: + remote_hosts.add(host) + if args.remote_driver_host: + remote_hosts.add(args.remote_driver_host) + + if not args.dry_run: + if remote_hosts: + archive_repo(languages=[str(l) for l in languages]) + prepare_remote_hosts(remote_hosts, prepare_local=True) + else: + prepare_remote_hosts([], prepare_local=True) + + build_local = False + if not args.remote_driver_host: + build_local = True + if not args.dry_run: + build_on_remote_hosts( + remote_hosts, + languages=[str(l) for l in languages], + build_local=build_local) + + perf_cmd = None + if args.perf_args: + print('Running workers under perf profiler') + # Expect /usr/bin/perf to be installed here, as is usual + perf_cmd = ['/usr/bin/perf'] + perf_cmd.extend(re.split('\s+', args.perf_args)) + + qpsworker_jobs = create_qpsworkers( + languages, args.remote_worker_host, perf_cmd=perf_cmd) + + # get list of worker addresses for each language. + workers_by_lang = dict([(str(language), []) for language in languages]) + for job in qpsworker_jobs: + workers_by_lang[str(job.language)].append(job) + + scenarios = create_scenarios( + languages, + workers_by_lang=workers_by_lang, + remote_host=args.remote_driver_host, + regex=args.regex, + category=args.category, + bq_result_table=args.bq_result_table, + netperf=args.netperf, + netperf_hosts=args.remote_worker_host, + server_cpu_load=args.server_cpu_load) + + if not scenarios: + raise Exception('No scenarios to run') + + total_scenario_failures = 0 + qps_workers_killed = 0 + merged_resultset = {} + perf_report_failures = 0 + + for scenario in scenarios: + if args.dry_run: + print(scenario.name) + else: + scenario_failures = 0 + try: + for worker in scenario.workers: + worker.start() + jobs = [scenario.jobspec] + if scenario.workers: + jobs.append( + create_quit_jobspec( + scenario.workers, + remote_host=args.remote_driver_host)) + scenario_failures, resultset = jobset.run( + jobs, newline_on_success=True, maxjobs=1) + total_scenario_failures += scenario_failures + merged_resultset = dict( + itertools.chain( + six.iteritems(merged_resultset), + six.iteritems(resultset))) + finally: + # Consider qps workers that need to be killed as failures + qps_workers_killed += finish_qps_workers(scenario.workers, + qpsworker_jobs) + + if perf_cmd and scenario_failures == 0 and not args.skip_generate_flamegraphs: + workers_and_base_names = {} + for worker in scenario.workers: + if not worker.perf_file_base_name: + raise Exception( + 'using perf buf perf report filename is unspecified') + workers_and_base_names[ + worker.host_and_port] = worker.perf_file_base_name + perf_report_failures += run_collect_perf_profile_jobs( + workers_and_base_names, scenario.name, + args.flame_graph_reports) + + # Still write the index.html even if some scenarios failed. + # 'profile_output_files' will only have names for scenarios that passed + if perf_cmd and not args.skip_generate_flamegraphs: + # write the index fil to the output dir, with all profiles from all scenarios/workers + report_utils.render_perf_profiling_results( + '%s/index.html' % args.flame_graph_reports, profile_output_files) + + report_utils.render_junit_xml_report( + merged_resultset, args.xml_report, suite_name='benchmarks') + + if total_scenario_failures > 0 or qps_workers_killed > 0: + print('%s scenarios failed and %s qps worker jobs killed' % + (total_scenario_failures, qps_workers_killed)) + sys.exit(1) + + if perf_report_failures > 0: + print('%s perf profile collection jobs failed' % perf_report_failures) + sys.exit(1) + if __name__ == "__main__": - main() + main() diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 471f5d99e7b..bd5b8644b39 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -12,7 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Run tests in parallel.""" from __future__ import print_function @@ -46,36 +45,34 @@ import python_utils.report_utils as report_utils import python_utils.watch_dirs as watch_dirs import python_utils.start_port_server as start_port_server try: - from python_utils.upload_test_results import upload_results_to_bq + from python_utils.upload_test_results import upload_results_to_bq except (ImportError): - pass # It's ok to not import because this is only necessary to upload results to BQ. + pass # It's ok to not import because this is only necessary to upload results to BQ. -gcp_utils_dir = os.path.abspath(os.path.join( - os.path.dirname(__file__), '../gcp/utils')) +gcp_utils_dir = os.path.abspath( + os.path.join(os.path.dirname(__file__), '../gcp/utils')) sys.path.append(gcp_utils_dir) _ROOT = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '../..')) os.chdir(_ROOT) - _FORCE_ENVIRON_FOR_WRAPPERS = { - 'GRPC_VERBOSITY': 'DEBUG', + 'GRPC_VERBOSITY': 'DEBUG', } _POLLING_STRATEGIES = { - 'linux': ['epollex', 'epollsig', 'epoll1', 'poll', 'poll-cv'], - 'mac': ['poll'], + 'linux': ['epollex', 'epollsig', 'epoll1', 'poll', 'poll-cv'], + 'mac': ['poll'], } - BigQueryTestData = collections.namedtuple('BigQueryTestData', 'name flaky cpu') def get_bqtest_data(limit=None): - import big_query_utils + import big_query_utils - bq = big_query_utils.create_big_query() - query = """ + bq = big_query_utils.create_big_query() + query = """ SELECT filtered_test_name, SUM(result != 'PASSED' AND result != 'SKIPPED') > 0 as flaky, @@ -88,941 +85,1068 @@ SELECT [grpc-testing:jenkins_test_results.aggregate_results] WHERE timestamp >= DATE_ADD(CURRENT_DATE(), -1, "WEEK") - AND platform = '"""+platform_string()+"""' + AND platform = '""" + platform_string() + """' AND NOT REGEXP_MATCH(job_name, '.*portability.*') ) GROUP BY filtered_test_name""" - if limit: - query += " limit {}".format(limit) - query_job = big_query_utils.sync_query_job(bq, 'grpc-testing', query) - page = bq.jobs().getQueryResults( - pageToken=None, - **query_job['jobReference']).execute(num_retries=3) - test_data = [BigQueryTestData(row['f'][0]['v'], row['f'][1]['v'] == 'true', float(row['f'][2]['v'])) for row in page['rows']] - return test_data + if limit: + query += " limit {}".format(limit) + query_job = big_query_utils.sync_query_job(bq, 'grpc-testing', query) + page = bq.jobs().getQueryResults( + pageToken=None, **query_job['jobReference']).execute(num_retries=3) + test_data = [ + BigQueryTestData(row['f'][0]['v'], row['f'][1]['v'] == 'true', + float(row['f'][2]['v'])) for row in page['rows'] + ] + return test_data def platform_string(): - return jobset.platform_string() + return jobset.platform_string() _DEFAULT_TIMEOUT_SECONDS = 5 * 60 + def run_shell_command(cmd, env=None, cwd=None): - try: - subprocess.check_output(cmd, shell=True, env=env, cwd=cwd) - except subprocess.CalledProcessError as e: - logging.exception("Error while running command '%s'. Exit status %d. Output:\n%s", - e.cmd, e.returncode, e.output) - raise + try: + subprocess.check_output(cmd, shell=True, env=env, cwd=cwd) + except subprocess.CalledProcessError as e: + logging.exception( + "Error while running command '%s'. Exit status %d. Output:\n%s", + e.cmd, e.returncode, e.output) + raise + def max_parallel_tests_for_current_platform(): - # Too much test parallelization has only been seen to be a problem - # so far on windows. - if jobset.platform_string() == 'windows': - return 64 - return 1024 + # Too much test parallelization has only been seen to be a problem + # so far on windows. + if jobset.platform_string() == 'windows': + return 64 + return 1024 + # SimpleConfig: just compile with CONFIG=config, and run the binary to test class Config(object): - def __init__(self, config, environ=None, timeout_multiplier=1, tool_prefix=[], iomgr_platform='native'): - if environ is None: - environ = {} - self.build_config = config - self.environ = environ - self.environ['CONFIG'] = config - self.tool_prefix = tool_prefix - self.timeout_multiplier = timeout_multiplier - self.iomgr_platform = iomgr_platform - - def job_spec(self, cmdline, timeout_seconds=_DEFAULT_TIMEOUT_SECONDS, - shortname=None, environ={}, cpu_cost=1.0, flaky=False): - """Construct a jobset.JobSpec for a test under this config + def __init__(self, + config, + environ=None, + timeout_multiplier=1, + tool_prefix=[], + iomgr_platform='native'): + if environ is None: + environ = {} + self.build_config = config + self.environ = environ + self.environ['CONFIG'] = config + self.tool_prefix = tool_prefix + self.timeout_multiplier = timeout_multiplier + self.iomgr_platform = iomgr_platform + + def job_spec(self, + cmdline, + timeout_seconds=_DEFAULT_TIMEOUT_SECONDS, + shortname=None, + environ={}, + cpu_cost=1.0, + flaky=False): + """Construct a jobset.JobSpec for a test under this config Args: cmdline: a list of strings specifying the command line the test would like to run """ - actual_environ = self.environ.copy() - for k, v in environ.items(): - actual_environ[k] = v - if not flaky and shortname and shortname in flaky_tests: - flaky = True - if shortname in shortname_to_cpu: - cpu_cost = shortname_to_cpu[shortname] - return jobset.JobSpec(cmdline=self.tool_prefix + cmdline, - shortname=shortname, - environ=actual_environ, - cpu_cost=cpu_cost, - timeout_seconds=(self.timeout_multiplier * timeout_seconds if timeout_seconds else None), - flake_retries=4 if flaky or args.allow_flakes else 0, - timeout_retries=1 if flaky or args.allow_flakes else 0) - - -def get_c_tests(travis, test_lang) : - out = [] - platforms_str = 'ci_platforms' if travis else 'platforms' - with open('tools/run_tests/generated/tests.json') as f: - js = json.load(f) - return [tgt - for tgt in js - if tgt['language'] == test_lang and - platform_string() in tgt[platforms_str] and - not (travis and tgt['flaky'])] + actual_environ = self.environ.copy() + for k, v in environ.items(): + actual_environ[k] = v + if not flaky and shortname and shortname in flaky_tests: + flaky = True + if shortname in shortname_to_cpu: + cpu_cost = shortname_to_cpu[shortname] + return jobset.JobSpec( + cmdline=self.tool_prefix + cmdline, + shortname=shortname, + environ=actual_environ, + cpu_cost=cpu_cost, + timeout_seconds=(self.timeout_multiplier * timeout_seconds + if timeout_seconds else None), + flake_retries=4 if flaky or args.allow_flakes else 0, + timeout_retries=1 if flaky or args.allow_flakes else 0) + + +def get_c_tests(travis, test_lang): + out = [] + platforms_str = 'ci_platforms' if travis else 'platforms' + with open('tools/run_tests/generated/tests.json') as f: + js = json.load(f) + return [ + tgt for tgt in js + if tgt['language'] == test_lang and platform_string() in tgt[ + platforms_str] and not (travis and tgt['flaky']) + ] def _check_compiler(compiler, supported_compilers): - if compiler not in supported_compilers: - raise Exception('Compiler %s not supported (on this platform).' % compiler) + if compiler not in supported_compilers: + raise Exception('Compiler %s not supported (on this platform).' % + compiler) def _check_arch(arch, supported_archs): - if arch not in supported_archs: - raise Exception('Architecture %s not supported.' % arch) + if arch not in supported_archs: + raise Exception('Architecture %s not supported.' % arch) def _is_use_docker_child(): - """Returns True if running running as a --use_docker child.""" - return True if os.getenv('RUN_TESTS_COMMAND') else False + """Returns True if running running as a --use_docker child.""" + return True if os.getenv('RUN_TESTS_COMMAND') else False -_PythonConfigVars = collections.namedtuple( - '_ConfigVars', ['shell', 'builder', 'builder_prefix_arguments', - 'venv_relative_python', 'toolchain', 'runner']) +_PythonConfigVars = collections.namedtuple('_ConfigVars', [ + 'shell', 'builder', 'builder_prefix_arguments', 'venv_relative_python', + 'toolchain', 'runner' +]) def _python_config_generator(name, major, minor, bits, config_vars): - return PythonConfig( - name, - config_vars.shell + config_vars.builder + config_vars.builder_prefix_arguments + [ - _python_pattern_function(major=major, minor=minor, bits=bits)] + [ - name] + config_vars.venv_relative_python + config_vars.toolchain, - config_vars.shell + config_vars.runner + [ - os.path.join(name, config_vars.venv_relative_python[0])]) + return PythonConfig( + name, config_vars.shell + config_vars.builder + + config_vars.builder_prefix_arguments + [ + _python_pattern_function(major=major, minor=minor, bits=bits) + ] + [name] + config_vars.venv_relative_python + config_vars.toolchain, + config_vars.shell + config_vars.runner + + [os.path.join(name, config_vars.venv_relative_python[0])]) def _pypy_config_generator(name, major, config_vars): - return PythonConfig( - name, - config_vars.shell + config_vars.builder + config_vars.builder_prefix_arguments + [ - _pypy_pattern_function(major=major)] + [ - name] + config_vars.venv_relative_python + config_vars.toolchain, - config_vars.shell + config_vars.runner + [ - os.path.join(name, config_vars.venv_relative_python[0])]) + return PythonConfig( + name, + config_vars.shell + config_vars.builder + + config_vars.builder_prefix_arguments + [ + _pypy_pattern_function(major=major) + ] + [name] + config_vars.venv_relative_python + config_vars.toolchain, + config_vars.shell + config_vars.runner + + [os.path.join(name, config_vars.venv_relative_python[0])]) def _python_pattern_function(major, minor, bits): - # Bit-ness is handled by the test machine's environment - if os.name == "nt": - if bits == "64": - return '/c/Python{major}{minor}/python.exe'.format( - major=major, minor=minor, bits=bits) + # Bit-ness is handled by the test machine's environment + if os.name == "nt": + if bits == "64": + return '/c/Python{major}{minor}/python.exe'.format( + major=major, minor=minor, bits=bits) + else: + return '/c/Python{major}{minor}_{bits}bits/python.exe'.format( + major=major, minor=minor, bits=bits) else: - return '/c/Python{major}{minor}_{bits}bits/python.exe'.format( - major=major, minor=minor, bits=bits) - else: - return 'python{major}.{minor}'.format(major=major, minor=minor) + return 'python{major}.{minor}'.format(major=major, minor=minor) def _pypy_pattern_function(major): - if major == '2': - return 'pypy' - elif major == '3': - return 'pypy3' - else: - raise ValueError("Unknown PyPy major version") + if major == '2': + return 'pypy' + elif major == '3': + return 'pypy3' + else: + raise ValueError("Unknown PyPy major version") class CLanguage(object): - def __init__(self, make_target, test_lang): - self.make_target = make_target - self.platform = platform_string() - self.test_lang = test_lang - - def configure(self, config, args): - self.config = config - self.args = args - if self.platform == 'windows': - _check_compiler(self.args.compiler, ['default', 'cmake', 'cmake_vs2015', - 'cmake_vs2017']) - _check_arch(self.args.arch, ['default', 'x64', 'x86']) - self._cmake_generator_option = 'Visual Studio 15 2017' if self.args.compiler == 'cmake_vs2017' else 'Visual Studio 14 2015' - self._cmake_arch_option = 'x64' if self.args.arch == 'x64' else 'Win32' - self._use_cmake = True - self._make_options = [] - elif self.args.compiler == 'cmake': - _check_arch(self.args.arch, ['default']) - self._use_cmake = True - self._docker_distro = 'jessie' - self._make_options = [] - else: - self._use_cmake = False - self._docker_distro, self._make_options = self._compiler_options(self.args.use_docker, - self.args.compiler) - if args.iomgr_platform == "uv": - cflags = '-DGRPC_UV -DGRPC_UV_THREAD_CHECK' - try: - cflags += subprocess.check_output(['pkg-config', '--cflags', 'libuv']).strip() + ' ' - except (subprocess.CalledProcessError, OSError): - pass - try: - ldflags = subprocess.check_output(['pkg-config', '--libs', 'libuv']).strip() + ' ' - except (subprocess.CalledProcessError, OSError): - ldflags = '-luv ' - self._make_options += ['EXTRA_CPPFLAGS={}'.format(cflags), - 'EXTRA_LDLIBS={}'.format(ldflags)] - - def test_specs(self): - out = [] - binaries = get_c_tests(self.args.travis, self.test_lang) - for target in binaries: - if self._use_cmake and target.get('boringssl', False): - # cmake doesn't build boringssl tests - continue - auto_timeout_scaling = target.get('auto_timeout_scaling', True) - polling_strategies = (_POLLING_STRATEGIES.get(self.platform, ['all']) - if target.get('uses_polling', True) - else ['none']) - if self.args.iomgr_platform == 'uv': - polling_strategies = ['all'] - for polling_strategy in polling_strategies: - env={'GRPC_DEFAULT_SSL_ROOTS_FILE_PATH': - _ROOT + '/src/core/tsi/test_creds/ca.pem', - 'GRPC_POLL_STRATEGY': polling_strategy, - 'GRPC_VERBOSITY': 'DEBUG'} - resolver = os.environ.get('GRPC_DNS_RESOLVER', None); - if resolver: - env['GRPC_DNS_RESOLVER'] = resolver - shortname_ext = '' if polling_strategy=='all' else ' GRPC_POLL_STRATEGY=%s' % polling_strategy - if polling_strategy in target.get('excluded_poll_engines', []): - continue - - timeout_scaling = 1 - if auto_timeout_scaling: - config = self.args.config - if ('asan' in config - or config == 'msan' - or config == 'tsan' - or config == 'ubsan' - or config == 'helgrind' - or config == 'memcheck'): - # Scale overall test timeout if running under various sanitizers. - # scaling value is based on historical data analysis - timeout_scaling *= 3 - elif polling_strategy == 'poll-cv': - # scale test timeout if running with poll-cv - # sanitizer and poll-cv scaling is not cumulative to ensure - # reasonable timeout values. - # TODO(jtattermusch): based on historical data and 5min default - # test timeout poll-cv scaling is currently not useful. - # Leaving here so it can be reintroduced if the default test timeout - # is decreased in the future. - timeout_scaling *= 1 - - if self.config.build_config in target['exclude_configs']: - continue - if self.args.iomgr_platform in target.get('exclude_iomgrs', []): - continue + def __init__(self, make_target, test_lang): + self.make_target = make_target + self.platform = platform_string() + self.test_lang = test_lang + + def configure(self, config, args): + self.config = config + self.args = args if self.platform == 'windows': - binary = 'cmake/build/%s/%s.exe' % (_MSBUILD_CONFIG[self.config.build_config], target['name']) + _check_compiler(self.args.compiler, [ + 'default', 'cmake', 'cmake_vs2015', 'cmake_vs2017' + ]) + _check_arch(self.args.arch, ['default', 'x64', 'x86']) + self._cmake_generator_option = 'Visual Studio 15 2017' if self.args.compiler == 'cmake_vs2017' else 'Visual Studio 14 2015' + self._cmake_arch_option = 'x64' if self.args.arch == 'x64' else 'Win32' + self._use_cmake = True + self._make_options = [] + elif self.args.compiler == 'cmake': + _check_arch(self.args.arch, ['default']) + self._use_cmake = True + self._docker_distro = 'jessie' + self._make_options = [] else: - if self._use_cmake: - binary = 'cmake/build/%s' % target['name'] - else: - binary = 'bins/%s/%s' % (self.config.build_config, target['name']) - cpu_cost = target['cpu_cost'] - if cpu_cost == 'capacity': - cpu_cost = multiprocessing.cpu_count() - if os.path.isfile(binary): - list_test_command = None - filter_test_command = None - - # these are the flag defined by gtest and benchmark framework to list - # and filter test runs. We use them to split each individual test - # into its own JobSpec, and thus into its own process. - if 'benchmark' in target and target['benchmark']: - with open(os.devnull, 'w') as fnull: - tests = subprocess.check_output([binary, '--benchmark_list_tests'], - stderr=fnull) - for line in tests.split('\n'): - test = line.strip() - if not test: continue - cmdline = [binary, '--benchmark_filter=%s$' % test] + target['args'] - out.append(self.config.job_spec(cmdline, - shortname='%s %s' % (' '.join(cmdline), shortname_ext), - cpu_cost=cpu_cost, - timeout_seconds=_DEFAULT_TIMEOUT_SECONDS * timeout_scaling, - environ=env)) - elif 'gtest' in target and target['gtest']: - # here we parse the output of --gtest_list_tests to build up a complete - # list of the tests contained in a binary for each test, we then - # add a job to run, filtering for just that test. - with open(os.devnull, 'w') as fnull: - tests = subprocess.check_output([binary, '--gtest_list_tests'], - stderr=fnull) - base = None - for line in tests.split('\n'): - i = line.find('#') - if i >= 0: line = line[:i] - if not line: continue - if line[0] != ' ': - base = line.strip() - else: - assert base is not None - assert line[1] == ' ' - test = base + line.strip() - cmdline = [binary, '--gtest_filter=%s' % test] + target['args'] - out.append(self.config.job_spec(cmdline, - shortname='%s %s' % (' '.join(cmdline), shortname_ext), - cpu_cost=cpu_cost, - timeout_seconds=target.get('timeout_seconds', _DEFAULT_TIMEOUT_SECONDS) * timeout_scaling, - environ=env)) - else: - cmdline = [binary] + target['args'] - shortname = target.get('shortname', ' '.join( - pipes.quote(arg) - for arg in cmdline)) - shortname += shortname_ext - out.append(self.config.job_spec(cmdline, - shortname=shortname, - cpu_cost=cpu_cost, - flaky=target.get('flaky', False), - timeout_seconds=target.get('timeout_seconds', _DEFAULT_TIMEOUT_SECONDS) * timeout_scaling, - environ=env)) - elif self.args.regex == '.*' or self.platform == 'windows': - print('\nWARNING: binary not found, skipping', binary) - return sorted(out) - - def make_targets(self): - if self.platform == 'windows': - # don't build tools on windows just yet - return ['buildtests_%s' % self.make_target] - return ['buildtests_%s' % self.make_target, 'tools_%s' % self.make_target, - 'check_epollexclusive'] - - def make_options(self): - return self._make_options - - def pre_build_steps(self): - if self.platform == 'windows': - return [['tools\\run_tests\\helper_scripts\\pre_build_cmake.bat', - self._cmake_generator_option, - self._cmake_arch_option]] - elif self._use_cmake: - return [['tools/run_tests/helper_scripts/pre_build_cmake.sh']] - else: - return [] + self._use_cmake = False + self._docker_distro, self._make_options = self._compiler_options( + self.args.use_docker, self.args.compiler) + if args.iomgr_platform == "uv": + cflags = '-DGRPC_UV -DGRPC_UV_THREAD_CHECK' + try: + cflags += subprocess.check_output( + ['pkg-config', '--cflags', 'libuv']).strip() + ' ' + except (subprocess.CalledProcessError, OSError): + pass + try: + ldflags = subprocess.check_output( + ['pkg-config', '--libs', 'libuv']).strip() + ' ' + except (subprocess.CalledProcessError, OSError): + ldflags = '-luv ' + self._make_options += [ + 'EXTRA_CPPFLAGS={}'.format(cflags), + 'EXTRA_LDLIBS={}'.format(ldflags) + ] + + def test_specs(self): + out = [] + binaries = get_c_tests(self.args.travis, self.test_lang) + for target in binaries: + if self._use_cmake and target.get('boringssl', False): + # cmake doesn't build boringssl tests + continue + auto_timeout_scaling = target.get('auto_timeout_scaling', True) + polling_strategies = ( + _POLLING_STRATEGIES.get(self.platform, ['all']) + if target.get('uses_polling', True) else ['none']) + if self.args.iomgr_platform == 'uv': + polling_strategies = ['all'] + for polling_strategy in polling_strategies: + env = { + 'GRPC_DEFAULT_SSL_ROOTS_FILE_PATH': + _ROOT + '/src/core/tsi/test_creds/ca.pem', + 'GRPC_POLL_STRATEGY': + polling_strategy, + 'GRPC_VERBOSITY': + 'DEBUG' + } + resolver = os.environ.get('GRPC_DNS_RESOLVER', None) + if resolver: + env['GRPC_DNS_RESOLVER'] = resolver + shortname_ext = '' if polling_strategy == 'all' else ' GRPC_POLL_STRATEGY=%s' % polling_strategy + if polling_strategy in target.get('excluded_poll_engines', []): + continue + + timeout_scaling = 1 + if auto_timeout_scaling: + config = self.args.config + if ('asan' in config or config == 'msan' or + config == 'tsan' or config == 'ubsan' or + config == 'helgrind' or config == 'memcheck'): + # Scale overall test timeout if running under various sanitizers. + # scaling value is based on historical data analysis + timeout_scaling *= 3 + elif polling_strategy == 'poll-cv': + # scale test timeout if running with poll-cv + # sanitizer and poll-cv scaling is not cumulative to ensure + # reasonable timeout values. + # TODO(jtattermusch): based on historical data and 5min default + # test timeout poll-cv scaling is currently not useful. + # Leaving here so it can be reintroduced if the default test timeout + # is decreased in the future. + timeout_scaling *= 1 + + if self.config.build_config in target['exclude_configs']: + continue + if self.args.iomgr_platform in target.get('exclude_iomgrs', []): + continue + if self.platform == 'windows': + binary = 'cmake/build/%s/%s.exe' % ( + _MSBUILD_CONFIG[self.config.build_config], + target['name']) + else: + if self._use_cmake: + binary = 'cmake/build/%s' % target['name'] + else: + binary = 'bins/%s/%s' % (self.config.build_config, + target['name']) + cpu_cost = target['cpu_cost'] + if cpu_cost == 'capacity': + cpu_cost = multiprocessing.cpu_count() + if os.path.isfile(binary): + list_test_command = None + filter_test_command = None + + # these are the flag defined by gtest and benchmark framework to list + # and filter test runs. We use them to split each individual test + # into its own JobSpec, and thus into its own process. + if 'benchmark' in target and target['benchmark']: + with open(os.devnull, 'w') as fnull: + tests = subprocess.check_output( + [binary, '--benchmark_list_tests'], + stderr=fnull) + for line in tests.split('\n'): + test = line.strip() + if not test: continue + cmdline = [binary, '--benchmark_filter=%s$' % test + ] + target['args'] + out.append( + self.config.job_spec( + cmdline, + shortname='%s %s' % (' '.join(cmdline), + shortname_ext), + cpu_cost=cpu_cost, + timeout_seconds=_DEFAULT_TIMEOUT_SECONDS * + timeout_scaling, + environ=env)) + elif 'gtest' in target and target['gtest']: + # here we parse the output of --gtest_list_tests to build up a complete + # list of the tests contained in a binary for each test, we then + # add a job to run, filtering for just that test. + with open(os.devnull, 'w') as fnull: + tests = subprocess.check_output( + [binary, '--gtest_list_tests'], stderr=fnull) + base = None + for line in tests.split('\n'): + i = line.find('#') + if i >= 0: line = line[:i] + if not line: continue + if line[0] != ' ': + base = line.strip() + else: + assert base is not None + assert line[1] == ' ' + test = base + line.strip() + cmdline = [binary, '--gtest_filter=%s' % test + ] + target['args'] + out.append( + self.config.job_spec( + cmdline, + shortname='%s %s' % (' '.join(cmdline), + shortname_ext), + cpu_cost=cpu_cost, + timeout_seconds=target.get( + 'timeout_seconds', + _DEFAULT_TIMEOUT_SECONDS) * + timeout_scaling, + environ=env)) + else: + cmdline = [binary] + target['args'] + shortname = target.get('shortname', ' '.join( + pipes.quote(arg) for arg in cmdline)) + shortname += shortname_ext + out.append( + self.config.job_spec( + cmdline, + shortname=shortname, + cpu_cost=cpu_cost, + flaky=target.get('flaky', False), + timeout_seconds=target.get( + 'timeout_seconds', _DEFAULT_TIMEOUT_SECONDS) + * timeout_scaling, + environ=env)) + elif self.args.regex == '.*' or self.platform == 'windows': + print('\nWARNING: binary not found, skipping', binary) + return sorted(out) + + def make_targets(self): + if self.platform == 'windows': + # don't build tools on windows just yet + return ['buildtests_%s' % self.make_target] + return [ + 'buildtests_%s' % self.make_target, 'tools_%s' % self.make_target, + 'check_epollexclusive' + ] - def build_steps(self): - return [] + def make_options(self): + return self._make_options - def post_tests_steps(self): - if self.platform == 'windows': - return [] - else: - return [['tools/run_tests/helper_scripts/post_tests_c.sh']] + def pre_build_steps(self): + if self.platform == 'windows': + return [[ + 'tools\\run_tests\\helper_scripts\\pre_build_cmake.bat', + self._cmake_generator_option, self._cmake_arch_option + ]] + elif self._use_cmake: + return [['tools/run_tests/helper_scripts/pre_build_cmake.sh']] + else: + return [] - def makefile_name(self): - if self._use_cmake: - return 'cmake/build/Makefile' - else: - return 'Makefile' - - def _clang_make_options(self, version_suffix=''): - return ['CC=clang%s' % version_suffix, - 'CXX=clang++%s' % version_suffix, - 'LD=clang%s' % version_suffix, - 'LDXX=clang++%s' % version_suffix] - - def _gcc_make_options(self, version_suffix): - return ['CC=gcc%s' % version_suffix, - 'CXX=g++%s' % version_suffix, - 'LD=gcc%s' % version_suffix, - 'LDXX=g++%s' % version_suffix] - - def _compiler_options(self, use_docker, compiler): - """Returns docker distro and make options to use for given compiler.""" - if not use_docker and not _is_use_docker_child(): - _check_compiler(compiler, ['default']) - - if compiler == 'gcc4.9' or compiler == 'default': - return ('jessie', []) - elif compiler == 'gcc4.8': - return ('jessie', self._gcc_make_options(version_suffix='-4.8')) - elif compiler == 'gcc5.3': - return ('ubuntu1604', []) - elif compiler == 'gcc_musl': - return ('alpine', []) - elif compiler == 'clang3.4': - # on ubuntu1404, clang-3.4 alias doesn't exist, just use 'clang' - return ('ubuntu1404', self._clang_make_options()) - elif compiler == 'clang3.5': - return ('jessie', self._clang_make_options(version_suffix='-3.5')) - elif compiler == 'clang3.6': - return ('ubuntu1604', self._clang_make_options(version_suffix='-3.6')) - elif compiler == 'clang3.7': - return ('ubuntu1604', self._clang_make_options(version_suffix='-3.7')) - else: - raise Exception('Compiler %s not supported.' % compiler) + def build_steps(self): + return [] - def dockerfile_dir(self): - return 'tools/dockerfile/test/cxx_%s_%s' % (self._docker_distro, - _docker_arch_suffix(self.args.arch)) + def post_tests_steps(self): + if self.platform == 'windows': + return [] + else: + return [['tools/run_tests/helper_scripts/post_tests_c.sh']] + + def makefile_name(self): + if self._use_cmake: + return 'cmake/build/Makefile' + else: + return 'Makefile' + + def _clang_make_options(self, version_suffix=''): + return [ + 'CC=clang%s' % version_suffix, 'CXX=clang++%s' % version_suffix, + 'LD=clang%s' % version_suffix, 'LDXX=clang++%s' % version_suffix + ] + + def _gcc_make_options(self, version_suffix): + return [ + 'CC=gcc%s' % version_suffix, 'CXX=g++%s' % version_suffix, + 'LD=gcc%s' % version_suffix, 'LDXX=g++%s' % version_suffix + ] + + def _compiler_options(self, use_docker, compiler): + """Returns docker distro and make options to use for given compiler.""" + if not use_docker and not _is_use_docker_child(): + _check_compiler(compiler, ['default']) + + if compiler == 'gcc4.9' or compiler == 'default': + return ('jessie', []) + elif compiler == 'gcc4.8': + return ('jessie', self._gcc_make_options(version_suffix='-4.8')) + elif compiler == 'gcc5.3': + return ('ubuntu1604', []) + elif compiler == 'gcc_musl': + return ('alpine', []) + elif compiler == 'clang3.4': + # on ubuntu1404, clang-3.4 alias doesn't exist, just use 'clang' + return ('ubuntu1404', self._clang_make_options()) + elif compiler == 'clang3.5': + return ('jessie', self._clang_make_options(version_suffix='-3.5')) + elif compiler == 'clang3.6': + return ('ubuntu1604', + self._clang_make_options(version_suffix='-3.6')) + elif compiler == 'clang3.7': + return ('ubuntu1604', + self._clang_make_options(version_suffix='-3.7')) + else: + raise Exception('Compiler %s not supported.' % compiler) - def __str__(self): - return self.make_target + def dockerfile_dir(self): + return 'tools/dockerfile/test/cxx_%s_%s' % ( + self._docker_distro, _docker_arch_suffix(self.args.arch)) + + def __str__(self): + return self.make_target # This tests Node on grpc/grpc-node and will become the standard for Node testing class RemoteNodeLanguage(object): - def __init__(self): - self.platform = platform_string() - - def configure(self, config, args): - self.config = config - self.args = args - # Note: electron ABI only depends on major and minor version, so that's all - # we should specify in the compiler argument - _check_compiler(self.args.compiler, ['default', 'node0.12', - 'node4', 'node5', 'node6', - 'node7', 'node8', - 'electron1.3', 'electron1.6']) - if self.args.compiler == 'default': - self.runtime = 'node' - self.node_version = '8' - else: - if self.args.compiler.startswith('electron'): - self.runtime = 'electron' - self.node_version = self.args.compiler[8:] - else: - self.runtime = 'node' - # Take off the word "node" - self.node_version = self.args.compiler[4:] - - # TODO: update with Windows/electron scripts when available for grpc/grpc-node - def test_specs(self): - if self.platform == 'windows': - return [self.config.job_spec(['tools\\run_tests\\helper_scripts\\run_node.bat'])] - else: - return [self.config.job_spec(['tools/run_tests/helper_scripts/run_grpc-node.sh'], - None, - environ=_FORCE_ENVIRON_FOR_WRAPPERS)] + def __init__(self): + self.platform = platform_string() + + def configure(self, config, args): + self.config = config + self.args = args + # Note: electron ABI only depends on major and minor version, so that's all + # we should specify in the compiler argument + _check_compiler(self.args.compiler, [ + 'default', 'node0.12', 'node4', 'node5', 'node6', 'node7', 'node8', + 'electron1.3', 'electron1.6' + ]) + if self.args.compiler == 'default': + self.runtime = 'node' + self.node_version = '8' + else: + if self.args.compiler.startswith('electron'): + self.runtime = 'electron' + self.node_version = self.args.compiler[8:] + else: + self.runtime = 'node' + # Take off the word "node" + self.node_version = self.args.compiler[4:] + + # TODO: update with Windows/electron scripts when available for grpc/grpc-node + def test_specs(self): + if self.platform == 'windows': + return [ + self.config.job_spec( + ['tools\\run_tests\\helper_scripts\\run_node.bat']) + ] + else: + return [ + self.config.job_spec( + ['tools/run_tests/helper_scripts/run_grpc-node.sh'], + None, + environ=_FORCE_ENVIRON_FOR_WRAPPERS) + ] - def pre_build_steps(self): - return [] + def pre_build_steps(self): + return [] - def make_targets(self): - return [] + def make_targets(self): + return [] - def make_options(self): - return [] + def make_options(self): + return [] - def build_steps(self): - return [] + def build_steps(self): + return [] - def post_tests_steps(self): - return [] + def post_tests_steps(self): + return [] - def makefile_name(self): - return 'Makefile' + def makefile_name(self): + return 'Makefile' - def dockerfile_dir(self): - return 'tools/dockerfile/test/node_jessie_%s' % _docker_arch_suffix(self.args.arch) + def dockerfile_dir(self): + return 'tools/dockerfile/test/node_jessie_%s' % _docker_arch_suffix( + self.args.arch) - def __str__(self): - return 'grpc-node' + def __str__(self): + return 'grpc-node' class PhpLanguage(object): - def configure(self, config, args): - self.config = config - self.args = args - _check_compiler(self.args.compiler, ['default']) - self._make_options = ['EMBED_OPENSSL=true', 'EMBED_ZLIB=true'] + def configure(self, config, args): + self.config = config + self.args = args + _check_compiler(self.args.compiler, ['default']) + self._make_options = ['EMBED_OPENSSL=true', 'EMBED_ZLIB=true'] - def test_specs(self): - return [self.config.job_spec(['src/php/bin/run_tests.sh'], - environ=_FORCE_ENVIRON_FOR_WRAPPERS)] + def test_specs(self): + return [ + self.config.job_spec( + ['src/php/bin/run_tests.sh'], + environ=_FORCE_ENVIRON_FOR_WRAPPERS) + ] - def pre_build_steps(self): - return [] + def pre_build_steps(self): + return [] - def make_targets(self): - return ['static_c', 'shared_c'] + def make_targets(self): + return ['static_c', 'shared_c'] - def make_options(self): - return self._make_options; + def make_options(self): + return self._make_options - def build_steps(self): - return [['tools/run_tests/helper_scripts/build_php.sh']] + def build_steps(self): + return [['tools/run_tests/helper_scripts/build_php.sh']] - def post_tests_steps(self): - return [['tools/run_tests/helper_scripts/post_tests_php.sh']] + def post_tests_steps(self): + return [['tools/run_tests/helper_scripts/post_tests_php.sh']] - def makefile_name(self): - return 'Makefile' + def makefile_name(self): + return 'Makefile' - def dockerfile_dir(self): - return 'tools/dockerfile/test/php_jessie_%s' % _docker_arch_suffix(self.args.arch) + def dockerfile_dir(self): + return 'tools/dockerfile/test/php_jessie_%s' % _docker_arch_suffix( + self.args.arch) - def __str__(self): - return 'php' + def __str__(self): + return 'php' class Php7Language(object): - def configure(self, config, args): - self.config = config - self.args = args - _check_compiler(self.args.compiler, ['default']) - self._make_options = ['EMBED_OPENSSL=true', 'EMBED_ZLIB=true'] + def configure(self, config, args): + self.config = config + self.args = args + _check_compiler(self.args.compiler, ['default']) + self._make_options = ['EMBED_OPENSSL=true', 'EMBED_ZLIB=true'] + + def test_specs(self): + return [ + self.config.job_spec( + ['src/php/bin/run_tests.sh'], + environ=_FORCE_ENVIRON_FOR_WRAPPERS) + ] - def test_specs(self): - return [self.config.job_spec(['src/php/bin/run_tests.sh'], - environ=_FORCE_ENVIRON_FOR_WRAPPERS)] + def pre_build_steps(self): + return [] - def pre_build_steps(self): - return [] + def make_targets(self): + return ['static_c', 'shared_c'] - def make_targets(self): - return ['static_c', 'shared_c'] + def make_options(self): + return self._make_options - def make_options(self): - return self._make_options; + def build_steps(self): + return [['tools/run_tests/helper_scripts/build_php.sh']] - def build_steps(self): - return [['tools/run_tests/helper_scripts/build_php.sh']] + def post_tests_steps(self): + return [['tools/run_tests/helper_scripts/post_tests_php.sh']] - def post_tests_steps(self): - return [['tools/run_tests/helper_scripts/post_tests_php.sh']] + def makefile_name(self): + return 'Makefile' - def makefile_name(self): - return 'Makefile' + def dockerfile_dir(self): + return 'tools/dockerfile/test/php7_jessie_%s' % _docker_arch_suffix( + self.args.arch) - def dockerfile_dir(self): - return 'tools/dockerfile/test/php7_jessie_%s' % _docker_arch_suffix(self.args.arch) + def __str__(self): + return 'php7' - def __str__(self): - return 'php7' +class PythonConfig( + collections.namedtuple('PythonConfig', ['name', 'build', 'run'])): + """Tuple of commands (named s.t. 'what it says on the tin' applies)""" -class PythonConfig(collections.namedtuple('PythonConfig', [ - 'name', 'build', 'run'])): - """Tuple of commands (named s.t. 'what it says on the tin' applies)""" class PythonLanguage(object): - def configure(self, config, args): - self.config = config - self.args = args - self.pythons = self._get_pythons(self.args) - - def test_specs(self): - # load list of known test suites - with open('src/python/grpcio_tests/tests/tests.json') as tests_json_file: - tests_json = json.load(tests_json_file) - environment = dict(_FORCE_ENVIRON_FOR_WRAPPERS) - return [self.config.job_spec( - config.run, - timeout_seconds=5*60, - environ=dict(list(environment.items()) + - [('GRPC_PYTHON_TESTRUNNER_FILTER', str(suite_name))]), - shortname='%s.test.%s' % (config.name, suite_name),) - for suite_name in tests_json - for config in self.pythons] - - def pre_build_steps(self): - return [] - - def make_targets(self): - return [] - - def make_options(self): - return [] - - def build_steps(self): - return [config.build for config in self.pythons] - - def post_tests_steps(self): - if self.config.build_config != 'gcov': - return [] - else: - return [['tools/run_tests/helper_scripts/post_tests_python.sh']] + def configure(self, config, args): + self.config = config + self.args = args + self.pythons = self._get_pythons(self.args) + + def test_specs(self): + # load list of known test suites + with open( + 'src/python/grpcio_tests/tests/tests.json') as tests_json_file: + tests_json = json.load(tests_json_file) + environment = dict(_FORCE_ENVIRON_FOR_WRAPPERS) + return [ + self.config.job_spec( + config.run, + timeout_seconds=5 * 60, + environ=dict( + list(environment.items()) + [( + 'GRPC_PYTHON_TESTRUNNER_FILTER', str(suite_name))]), + shortname='%s.test.%s' % (config.name, suite_name),) + for suite_name in tests_json for config in self.pythons + ] + + def pre_build_steps(self): + return [] + + def make_targets(self): + return [] + + def make_options(self): + return [] + + def build_steps(self): + return [config.build for config in self.pythons] + + def post_tests_steps(self): + if self.config.build_config != 'gcov': + return [] + else: + return [['tools/run_tests/helper_scripts/post_tests_python.sh']] - def makefile_name(self): - return 'Makefile' + def makefile_name(self): + return 'Makefile' - def dockerfile_dir(self): - return 'tools/dockerfile/test/python_%s_%s' % (self.python_manager_name(), _docker_arch_suffix(self.args.arch)) + def dockerfile_dir(self): + return 'tools/dockerfile/test/python_%s_%s' % ( + self.python_manager_name(), _docker_arch_suffix(self.args.arch)) - def python_manager_name(self): - if self.args.compiler in ['python3.5', 'python3.6']: - return 'pyenv' - elif self.args.compiler == 'python_alpine': - return 'alpine' - else: - return 'jessie' + def python_manager_name(self): + if self.args.compiler in ['python3.5', 'python3.6']: + return 'pyenv' + elif self.args.compiler == 'python_alpine': + return 'alpine' + else: + return 'jessie' - def _get_pythons(self, args): - if args.arch == 'x86': - bits = '32' - else: - bits = '64' - - if os.name == 'nt': - shell = ['bash'] - builder = [os.path.abspath('tools/run_tests/helper_scripts/build_python_msys2.sh')] - builder_prefix_arguments = ['MINGW{}'.format(bits)] - venv_relative_python = ['Scripts/python.exe'] - toolchain = ['mingw32'] - else: - shell = [] - builder = [os.path.abspath('tools/run_tests/helper_scripts/build_python.sh')] - builder_prefix_arguments = [] - venv_relative_python = ['bin/python'] - toolchain = ['unix'] - - runner = [os.path.abspath('tools/run_tests/helper_scripts/run_python.sh')] - config_vars = _PythonConfigVars(shell, builder, builder_prefix_arguments, - venv_relative_python, toolchain, runner) - python27_config = _python_config_generator(name='py27', major='2', - minor='7', bits=bits, - config_vars=config_vars) - python34_config = _python_config_generator(name='py34', major='3', - minor='4', bits=bits, - config_vars=config_vars) - python35_config = _python_config_generator(name='py35', major='3', - minor='5', bits=bits, - config_vars=config_vars) - python36_config = _python_config_generator(name='py36', major='3', - minor='6', bits=bits, - config_vars=config_vars) - pypy27_config = _pypy_config_generator(name='pypy', major='2', - config_vars=config_vars) - pypy32_config = _pypy_config_generator(name='pypy3', major='3', - config_vars=config_vars) - - if args.compiler == 'default': - if os.name == 'nt': - return (python35_config,) - else: - return (python27_config, python34_config,) - elif args.compiler == 'python2.7': - return (python27_config,) - elif args.compiler == 'python3.4': - return (python34_config,) - elif args.compiler == 'python3.5': - return (python35_config,) - elif args.compiler == 'python3.6': - return (python36_config,) - elif args.compiler == 'pypy': - return (pypy27_config,) - elif args.compiler == 'pypy3': - return (pypy32_config,) - elif args.compiler == 'python_alpine': - return (python27_config,) - elif args.compiler == 'all_the_cpythons': - return (python27_config, python34_config, python35_config, - python36_config,) - else: - raise Exception('Compiler %s not supported.' % args.compiler) + def _get_pythons(self, args): + if args.arch == 'x86': + bits = '32' + else: + bits = '64' + + if os.name == 'nt': + shell = ['bash'] + builder = [ + os.path.abspath( + 'tools/run_tests/helper_scripts/build_python_msys2.sh') + ] + builder_prefix_arguments = ['MINGW{}'.format(bits)] + venv_relative_python = ['Scripts/python.exe'] + toolchain = ['mingw32'] + else: + shell = [] + builder = [ + os.path.abspath( + 'tools/run_tests/helper_scripts/build_python.sh') + ] + builder_prefix_arguments = [] + venv_relative_python = ['bin/python'] + toolchain = ['unix'] + + runner = [ + os.path.abspath('tools/run_tests/helper_scripts/run_python.sh') + ] + config_vars = _PythonConfigVars(shell, builder, + builder_prefix_arguments, + venv_relative_python, toolchain, runner) + python27_config = _python_config_generator( + name='py27', + major='2', + minor='7', + bits=bits, + config_vars=config_vars) + python34_config = _python_config_generator( + name='py34', + major='3', + minor='4', + bits=bits, + config_vars=config_vars) + python35_config = _python_config_generator( + name='py35', + major='3', + minor='5', + bits=bits, + config_vars=config_vars) + python36_config = _python_config_generator( + name='py36', + major='3', + minor='6', + bits=bits, + config_vars=config_vars) + pypy27_config = _pypy_config_generator( + name='pypy', major='2', config_vars=config_vars) + pypy32_config = _pypy_config_generator( + name='pypy3', major='3', config_vars=config_vars) + + if args.compiler == 'default': + if os.name == 'nt': + return (python35_config,) + else: + return (python27_config, python34_config,) + elif args.compiler == 'python2.7': + return (python27_config,) + elif args.compiler == 'python3.4': + return (python34_config,) + elif args.compiler == 'python3.5': + return (python35_config,) + elif args.compiler == 'python3.6': + return (python36_config,) + elif args.compiler == 'pypy': + return (pypy27_config,) + elif args.compiler == 'pypy3': + return (pypy32_config,) + elif args.compiler == 'python_alpine': + return (python27_config,) + elif args.compiler == 'all_the_cpythons': + return (python27_config, python34_config, python35_config, + python36_config,) + else: + raise Exception('Compiler %s not supported.' % args.compiler) - def __str__(self): - return 'python' + def __str__(self): + return 'python' class RubyLanguage(object): - def configure(self, config, args): - self.config = config - self.args = args - _check_compiler(self.args.compiler, ['default']) + def configure(self, config, args): + self.config = config + self.args = args + _check_compiler(self.args.compiler, ['default']) - def test_specs(self): - tests = [self.config.job_spec(['tools/run_tests/helper_scripts/run_ruby.sh'], - timeout_seconds=10*60, - environ=_FORCE_ENVIRON_FOR_WRAPPERS)] - tests.append(self.config.job_spec(['tools/run_tests/helper_scripts/run_ruby_end2end_tests.sh'], - timeout_seconds=10*60, - environ=_FORCE_ENVIRON_FOR_WRAPPERS)) - return tests + def test_specs(self): + tests = [ + self.config.job_spec( + ['tools/run_tests/helper_scripts/run_ruby.sh'], + timeout_seconds=10 * 60, + environ=_FORCE_ENVIRON_FOR_WRAPPERS) + ] + tests.append( + self.config.job_spec( + ['tools/run_tests/helper_scripts/run_ruby_end2end_tests.sh'], + timeout_seconds=10 * 60, + environ=_FORCE_ENVIRON_FOR_WRAPPERS)) + return tests - def pre_build_steps(self): - return [['tools/run_tests/helper_scripts/pre_build_ruby.sh']] + def pre_build_steps(self): + return [['tools/run_tests/helper_scripts/pre_build_ruby.sh']] - def make_targets(self): - return [] + def make_targets(self): + return [] - def make_options(self): - return [] + def make_options(self): + return [] - def build_steps(self): - return [['tools/run_tests/helper_scripts/build_ruby.sh']] + def build_steps(self): + return [['tools/run_tests/helper_scripts/build_ruby.sh']] - def post_tests_steps(self): - return [['tools/run_tests/helper_scripts/post_tests_ruby.sh']] + def post_tests_steps(self): + return [['tools/run_tests/helper_scripts/post_tests_ruby.sh']] - def makefile_name(self): - return 'Makefile' + def makefile_name(self): + return 'Makefile' - def dockerfile_dir(self): - return 'tools/dockerfile/test/ruby_jessie_%s' % _docker_arch_suffix(self.args.arch) + def dockerfile_dir(self): + return 'tools/dockerfile/test/ruby_jessie_%s' % _docker_arch_suffix( + self.args.arch) - def __str__(self): - return 'ruby' + def __str__(self): + return 'ruby' class CSharpLanguage(object): - def __init__(self): - self.platform = platform_string() - - def configure(self, config, args): - self.config = config - self.args = args - if self.platform == 'windows': - _check_compiler(self.args.compiler, ['coreclr', 'default']) - _check_arch(self.args.arch, ['default']) - self._cmake_arch_option = 'x64' - self._make_options = [] - else: - _check_compiler(self.args.compiler, ['default', 'coreclr']) - self._docker_distro = 'jessie' - - if self.platform == 'mac': - # TODO(jtattermusch): EMBED_ZLIB=true currently breaks the mac build - self._make_options = ['EMBED_OPENSSL=true'] - if self.args.compiler != 'coreclr': - # On Mac, official distribution of mono is 32bit. - self._make_options += ['ARCH_FLAGS=-m32', 'LDFLAGS=-m32'] - else: - self._make_options = ['EMBED_OPENSSL=true', 'EMBED_ZLIB=true'] + def __init__(self): + self.platform = platform_string() - def test_specs(self): - with open('src/csharp/tests.json') as f: - tests_by_assembly = json.load(f) - - msbuild_config = _MSBUILD_CONFIG[self.config.build_config] - nunit_args = ['--labels=All', '--noresult', '--workers=1'] - assembly_subdir = 'bin/%s' % msbuild_config - assembly_extension = '.exe' - - if self.args.compiler == 'coreclr': - assembly_subdir += '/netcoreapp1.0' - runtime_cmd = ['dotnet', 'exec'] - assembly_extension = '.dll' - else: - assembly_subdir += '/net45' - if self.platform == 'windows': - runtime_cmd = [] - else: - runtime_cmd = ['mono'] - - specs = [] - for assembly in six.iterkeys(tests_by_assembly): - assembly_file = 'src/csharp/%s/%s/%s%s' % (assembly, - assembly_subdir, - assembly, - assembly_extension) - if self.config.build_config != 'gcov' or self.platform != 'windows': - # normally, run each test as a separate process - for test in tests_by_assembly[assembly]: - cmdline = runtime_cmd + [assembly_file, '--test=%s' % test] + nunit_args - specs.append(self.config.job_spec(cmdline, - shortname='csharp.%s' % test, - environ=_FORCE_ENVIRON_FOR_WRAPPERS)) - else: - # For C# test coverage, run all tests from the same assembly at once - # using OpenCover.Console (only works on Windows). - cmdline = ['src\\csharp\\packages\\OpenCover.4.6.519\\tools\\OpenCover.Console.exe', - '-target:%s' % assembly_file, - '-targetdir:src\\csharp', - '-targetargs:%s' % ' '.join(nunit_args), - '-filter:+[Grpc.Core]*', - '-register:user', - '-output:src\\csharp\\coverage_csharp_%s.xml' % assembly] - - # set really high cpu_cost to make sure instances of OpenCover.Console run exclusively - # to prevent problems with registering the profiler. - run_exclusive = 1000000 - specs.append(self.config.job_spec(cmdline, - shortname='csharp.coverage.%s' % assembly, - cpu_cost=run_exclusive, - environ=_FORCE_ENVIRON_FOR_WRAPPERS)) - return specs - - def pre_build_steps(self): - if self.platform == 'windows': - return [['tools\\run_tests\\helper_scripts\\pre_build_csharp.bat', self._cmake_arch_option]] - else: - return [['tools/run_tests/helper_scripts/pre_build_csharp.sh']] + def configure(self, config, args): + self.config = config + self.args = args + if self.platform == 'windows': + _check_compiler(self.args.compiler, ['coreclr', 'default']) + _check_arch(self.args.arch, ['default']) + self._cmake_arch_option = 'x64' + self._make_options = [] + else: + _check_compiler(self.args.compiler, ['default', 'coreclr']) + self._docker_distro = 'jessie' + + if self.platform == 'mac': + # TODO(jtattermusch): EMBED_ZLIB=true currently breaks the mac build + self._make_options = ['EMBED_OPENSSL=true'] + if self.args.compiler != 'coreclr': + # On Mac, official distribution of mono is 32bit. + self._make_options += ['ARCH_FLAGS=-m32', 'LDFLAGS=-m32'] + else: + self._make_options = ['EMBED_OPENSSL=true', 'EMBED_ZLIB=true'] + + def test_specs(self): + with open('src/csharp/tests.json') as f: + tests_by_assembly = json.load(f) + + msbuild_config = _MSBUILD_CONFIG[self.config.build_config] + nunit_args = ['--labels=All', '--noresult', '--workers=1'] + assembly_subdir = 'bin/%s' % msbuild_config + assembly_extension = '.exe' + + if self.args.compiler == 'coreclr': + assembly_subdir += '/netcoreapp1.0' + runtime_cmd = ['dotnet', 'exec'] + assembly_extension = '.dll' + else: + assembly_subdir += '/net45' + if self.platform == 'windows': + runtime_cmd = [] + else: + runtime_cmd = ['mono'] + + specs = [] + for assembly in six.iterkeys(tests_by_assembly): + assembly_file = 'src/csharp/%s/%s/%s%s' % ( + assembly, assembly_subdir, assembly, assembly_extension) + if self.config.build_config != 'gcov' or self.platform != 'windows': + # normally, run each test as a separate process + for test in tests_by_assembly[assembly]: + cmdline = runtime_cmd + [assembly_file, '--test=%s' % test + ] + nunit_args + specs.append( + self.config.job_spec( + cmdline, + shortname='csharp.%s' % test, + environ=_FORCE_ENVIRON_FOR_WRAPPERS)) + else: + # For C# test coverage, run all tests from the same assembly at once + # using OpenCover.Console (only works on Windows). + cmdline = [ + 'src\\csharp\\packages\\OpenCover.4.6.519\\tools\\OpenCover.Console.exe', + '-target:%s' % assembly_file, '-targetdir:src\\csharp', + '-targetargs:%s' % ' '.join(nunit_args), + '-filter:+[Grpc.Core]*', '-register:user', + '-output:src\\csharp\\coverage_csharp_%s.xml' % assembly + ] + + # set really high cpu_cost to make sure instances of OpenCover.Console run exclusively + # to prevent problems with registering the profiler. + run_exclusive = 1000000 + specs.append( + self.config.job_spec( + cmdline, + shortname='csharp.coverage.%s' % assembly, + cpu_cost=run_exclusive, + environ=_FORCE_ENVIRON_FOR_WRAPPERS)) + return specs + + def pre_build_steps(self): + if self.platform == 'windows': + return [[ + 'tools\\run_tests\\helper_scripts\\pre_build_csharp.bat', + self._cmake_arch_option + ]] + else: + return [['tools/run_tests/helper_scripts/pre_build_csharp.sh']] - def make_targets(self): - return ['grpc_csharp_ext'] + def make_targets(self): + return ['grpc_csharp_ext'] - def make_options(self): - return self._make_options; + def make_options(self): + return self._make_options - def build_steps(self): - if self.platform == 'windows': - return [['tools\\run_tests\\helper_scripts\\build_csharp.bat']] - else: - return [['tools/run_tests/helper_scripts/build_csharp.sh']] + def build_steps(self): + if self.platform == 'windows': + return [['tools\\run_tests\\helper_scripts\\build_csharp.bat']] + else: + return [['tools/run_tests/helper_scripts/build_csharp.sh']] - def post_tests_steps(self): - if self.platform == 'windows': - return [['tools\\run_tests\\helper_scripts\\post_tests_csharp.bat']] - else: - return [['tools/run_tests/helper_scripts/post_tests_csharp.sh']] + def post_tests_steps(self): + if self.platform == 'windows': + return [['tools\\run_tests\\helper_scripts\\post_tests_csharp.bat']] + else: + return [['tools/run_tests/helper_scripts/post_tests_csharp.sh']] - def makefile_name(self): - if self.platform == 'windows': - return 'cmake/build/%s/Makefile' % self._cmake_arch_option - else: - return 'Makefile' + def makefile_name(self): + if self.platform == 'windows': + return 'cmake/build/%s/Makefile' % self._cmake_arch_option + else: + return 'Makefile' - def dockerfile_dir(self): - return 'tools/dockerfile/test/csharp_%s_%s' % (self._docker_distro, - _docker_arch_suffix(self.args.arch)) + def dockerfile_dir(self): + return 'tools/dockerfile/test/csharp_%s_%s' % ( + self._docker_distro, _docker_arch_suffix(self.args.arch)) - def __str__(self): - return 'csharp' + def __str__(self): + return 'csharp' class ObjCLanguage(object): - def configure(self, config, args): - self.config = config - self.args = args - _check_compiler(self.args.compiler, ['default']) - - def test_specs(self): - return [ - self.config.job_spec(['src/objective-c/tests/run_tests.sh'], - timeout_seconds=60*60, - shortname='objc-tests', - cpu_cost=1e6, - environ=_FORCE_ENVIRON_FOR_WRAPPERS), - self.config.job_spec(['src/objective-c/tests/run_plugin_tests.sh'], - timeout_seconds=60*60, - shortname='objc-plugin-tests', - cpu_cost=1e6, - environ=_FORCE_ENVIRON_FOR_WRAPPERS), - self.config.job_spec(['src/objective-c/tests/build_one_example.sh'], - timeout_seconds=10*60, - shortname='objc-build-example-helloworld', - cpu_cost=1e6, - environ={'SCHEME': 'HelloWorld', - 'EXAMPLE_PATH': 'examples/objective-c/helloworld'}), - self.config.job_spec(['src/objective-c/tests/build_one_example.sh'], - timeout_seconds=10*60, - shortname='objc-build-example-routeguide', - cpu_cost=1e6, - environ={'SCHEME': 'RouteGuideClient', - 'EXAMPLE_PATH': 'examples/objective-c/route_guide'}), - self.config.job_spec(['src/objective-c/tests/build_one_example.sh'], - timeout_seconds=10*60, - shortname='objc-build-example-authsample', - cpu_cost=1e6, - environ={'SCHEME': 'AuthSample', - 'EXAMPLE_PATH': 'examples/objective-c/auth_sample'}), - self.config.job_spec(['src/objective-c/tests/build_one_example.sh'], - timeout_seconds=10*60, - shortname='objc-build-example-sample', - cpu_cost=1e6, - environ={'SCHEME': 'Sample', - 'EXAMPLE_PATH': 'src/objective-c/examples/Sample'}), - self.config.job_spec(['src/objective-c/tests/build_one_example.sh'], - timeout_seconds=10*60, - shortname='objc-build-example-sample-frameworks', - cpu_cost=1e6, - environ={'SCHEME': 'Sample', - 'EXAMPLE_PATH': 'src/objective-c/examples/Sample', - 'FRAMEWORKS': 'YES'}), - self.config.job_spec(['src/objective-c/tests/build_one_example.sh'], - timeout_seconds=10*60, - shortname='objc-build-example-switftsample', - cpu_cost=1e6, - environ={'SCHEME': 'SwiftSample', - 'EXAMPLE_PATH': 'src/objective-c/examples/SwiftSample'}), - ] - - def pre_build_steps(self): - return [] - - def make_targets(self): - return ['interop_server'] - - def make_options(self): - return [] - - def build_steps(self): - return [['src/objective-c/tests/build_tests.sh']] - - def post_tests_steps(self): - return [] - - def makefile_name(self): - return 'Makefile' - - def dockerfile_dir(self): - return None - - def __str__(self): - return 'objc' + def configure(self, config, args): + self.config = config + self.args = args + _check_compiler(self.args.compiler, ['default']) + + def test_specs(self): + return [ + self.config.job_spec( + ['src/objective-c/tests/run_tests.sh'], + timeout_seconds=60 * 60, + shortname='objc-tests', + cpu_cost=1e6, + environ=_FORCE_ENVIRON_FOR_WRAPPERS), + self.config.job_spec( + ['src/objective-c/tests/run_plugin_tests.sh'], + timeout_seconds=60 * 60, + shortname='objc-plugin-tests', + cpu_cost=1e6, + environ=_FORCE_ENVIRON_FOR_WRAPPERS), + self.config.job_spec( + ['src/objective-c/tests/build_one_example.sh'], + timeout_seconds=10 * 60, + shortname='objc-build-example-helloworld', + cpu_cost=1e6, + environ={ + 'SCHEME': 'HelloWorld', + 'EXAMPLE_PATH': 'examples/objective-c/helloworld' + }), + self.config.job_spec( + ['src/objective-c/tests/build_one_example.sh'], + timeout_seconds=10 * 60, + shortname='objc-build-example-routeguide', + cpu_cost=1e6, + environ={ + 'SCHEME': 'RouteGuideClient', + 'EXAMPLE_PATH': 'examples/objective-c/route_guide' + }), + self.config.job_spec( + ['src/objective-c/tests/build_one_example.sh'], + timeout_seconds=10 * 60, + shortname='objc-build-example-authsample', + cpu_cost=1e6, + environ={ + 'SCHEME': 'AuthSample', + 'EXAMPLE_PATH': 'examples/objective-c/auth_sample' + }), + self.config.job_spec( + ['src/objective-c/tests/build_one_example.sh'], + timeout_seconds=10 * 60, + shortname='objc-build-example-sample', + cpu_cost=1e6, + environ={ + 'SCHEME': 'Sample', + 'EXAMPLE_PATH': 'src/objective-c/examples/Sample' + }), + self.config.job_spec( + ['src/objective-c/tests/build_one_example.sh'], + timeout_seconds=10 * 60, + shortname='objc-build-example-sample-frameworks', + cpu_cost=1e6, + environ={ + 'SCHEME': 'Sample', + 'EXAMPLE_PATH': 'src/objective-c/examples/Sample', + 'FRAMEWORKS': 'YES' + }), + self.config.job_spec( + ['src/objective-c/tests/build_one_example.sh'], + timeout_seconds=10 * 60, + shortname='objc-build-example-switftsample', + cpu_cost=1e6, + environ={ + 'SCHEME': 'SwiftSample', + 'EXAMPLE_PATH': 'src/objective-c/examples/SwiftSample' + }), + ] + + def pre_build_steps(self): + return [] + + def make_targets(self): + return ['interop_server'] + + def make_options(self): + return [] + + def build_steps(self): + return [['src/objective-c/tests/build_tests.sh']] + + def post_tests_steps(self): + return [] + + def makefile_name(self): + return 'Makefile' + + def dockerfile_dir(self): + return None + + def __str__(self): + return 'objc' class Sanity(object): - def configure(self, config, args): - self.config = config - self.args = args - _check_compiler(self.args.compiler, ['default']) + def configure(self, config, args): + self.config = config + self.args = args + _check_compiler(self.args.compiler, ['default']) - def test_specs(self): - import yaml - with open('tools/run_tests/sanity/sanity_tests.yaml', 'r') as f: - environ={'TEST': 'true'} - if _is_use_docker_child(): - environ['CLANG_FORMAT_SKIP_DOCKER'] = 'true' - return [self.config.job_spec(cmd['script'].split(), - timeout_seconds=30*60, - environ=environ, - cpu_cost=cmd.get('cpu_cost', 1)) - for cmd in yaml.load(f)] + def test_specs(self): + import yaml + with open('tools/run_tests/sanity/sanity_tests.yaml', 'r') as f: + environ = {'TEST': 'true'} + if _is_use_docker_child(): + environ['CLANG_FORMAT_SKIP_DOCKER'] = 'true' + return [ + self.config.job_spec( + cmd['script'].split(), + timeout_seconds=30 * 60, + environ=environ, + cpu_cost=cmd.get('cpu_cost', 1)) for cmd in yaml.load(f) + ] - def pre_build_steps(self): - return [] + def pre_build_steps(self): + return [] - def make_targets(self): - return ['run_dep_checks'] + def make_targets(self): + return ['run_dep_checks'] - def make_options(self): - return [] + def make_options(self): + return [] - def build_steps(self): - return [] + def build_steps(self): + return [] - def post_tests_steps(self): - return [] + def post_tests_steps(self): + return [] - def makefile_name(self): - return 'Makefile' + def makefile_name(self): + return 'Makefile' - def dockerfile_dir(self): - return 'tools/dockerfile/test/sanity' + def dockerfile_dir(self): + return 'tools/dockerfile/test/sanity' + + def __str__(self): + return 'sanity' - def __str__(self): - return 'sanity' # different configurations we can run under with open('tools/run_tests/generated/configs.json') as f: - _CONFIGS = dict((cfg['config'], Config(**cfg)) for cfg in ast.literal_eval(f.read())) - + _CONFIGS = dict((cfg['config'], Config(**cfg)) + for cfg in ast.literal_eval(f.read())) _LANGUAGES = { 'c++': CLanguage('cxx', 'c++'), @@ -1033,60 +1157,61 @@ _LANGUAGES = { 'python': PythonLanguage(), 'ruby': RubyLanguage(), 'csharp': CSharpLanguage(), - 'objc' : ObjCLanguage(), + 'objc': ObjCLanguage(), 'sanity': Sanity() - } - +} _MSBUILD_CONFIG = { 'dbg': 'Debug', 'opt': 'Release', 'gcov': 'Debug', - } +} def _windows_arch_option(arch): - """Returns msbuild cmdline option for selected architecture.""" - if arch == 'default' or arch == 'x86': - return '/p:Platform=Win32' - elif arch == 'x64': - return '/p:Platform=x64' - else: - print('Architecture %s not supported.' % arch) - sys.exit(1) + """Returns msbuild cmdline option for selected architecture.""" + if arch == 'default' or arch == 'x86': + return '/p:Platform=Win32' + elif arch == 'x64': + return '/p:Platform=x64' + else: + print('Architecture %s not supported.' % arch) + sys.exit(1) def _check_arch_option(arch): - """Checks that architecture option is valid.""" - if platform_string() == 'windows': - _windows_arch_option(arch) - elif platform_string() == 'linux': - # On linux, we need to be running under docker with the right architecture. - runtime_arch = platform.architecture()[0] - if arch == 'default': - return - elif runtime_arch == '64bit' and arch == 'x64': - return - elif runtime_arch == '32bit' and arch == 'x86': - return + """Checks that architecture option is valid.""" + if platform_string() == 'windows': + _windows_arch_option(arch) + elif platform_string() == 'linux': + # On linux, we need to be running under docker with the right architecture. + runtime_arch = platform.architecture()[0] + if arch == 'default': + return + elif runtime_arch == '64bit' and arch == 'x64': + return + elif runtime_arch == '32bit' and arch == 'x86': + return + else: + print('Architecture %s does not match current runtime architecture.' + % arch) + sys.exit(1) else: - print('Architecture %s does not match current runtime architecture.' % arch) - sys.exit(1) - else: - if args.arch != 'default': - print('Architecture %s not supported on current platform.' % args.arch) - sys.exit(1) + if args.arch != 'default': + print('Architecture %s not supported on current platform.' % + args.arch) + sys.exit(1) def _docker_arch_suffix(arch): - """Returns suffix to dockerfile dir to use.""" - if arch == 'default' or arch == 'x64': - return 'x64' - elif arch == 'x86': - return 'x86' - else: - print('Architecture %s not supported with current settings.' % arch) - sys.exit(1) + """Returns suffix to dockerfile dir to use.""" + if arch == 'default' or arch == 'x64': + return 'x64' + elif arch == 'x86': + return 'x86' + else: + print('Architecture %s not supported with current settings.' % arch) + sys.exit(1) def runs_per_test_type(arg_str): @@ -1111,478 +1236,581 @@ def runs_per_test_type(arg_str): def percent_type(arg_str): - pct = float(arg_str) - if pct > 100 or pct < 0: - raise argparse.ArgumentTypeError( - "'%f' is not a valid percentage in the [0, 100] range" % pct) - return pct + pct = float(arg_str) + if pct > 100 or pct < 0: + raise argparse.ArgumentTypeError( + "'%f' is not a valid percentage in the [0, 100] range" % pct) + return pct + # This is math.isclose in python >= 3.5 def isclose(a, b, rel_tol=1e-09, abs_tol=0.0): - return abs(a-b) <= max(rel_tol * max(abs(a), abs(b)), abs_tol) + return abs(a - b) <= max(rel_tol * max(abs(a), abs(b)), abs_tol) # parse command line argp = argparse.ArgumentParser(description='Run grpc tests.') -argp.add_argument('-c', '--config', - choices=sorted(_CONFIGS.keys()), - default='opt') -argp.add_argument('-n', '--runs_per_test', default=1, type=runs_per_test_type, - help='A positive integer or "inf". If "inf", all tests will run in an ' - 'infinite loop. Especially useful in combination with "-f"') +argp.add_argument( + '-c', '--config', choices=sorted(_CONFIGS.keys()), default='opt') +argp.add_argument( + '-n', + '--runs_per_test', + default=1, + type=runs_per_test_type, + help='A positive integer or "inf". If "inf", all tests will run in an ' + 'infinite loop. Especially useful in combination with "-f"') argp.add_argument('-r', '--regex', default='.*', type=str) argp.add_argument('--regex_exclude', default='', type=str) argp.add_argument('-j', '--jobs', default=multiprocessing.cpu_count(), type=int) argp.add_argument('-s', '--slowdown', default=1.0, type=float) -argp.add_argument('-p', '--sample_percent', default=100.0, type=percent_type, - help='Run a random sample with that percentage of tests') -argp.add_argument('-f', '--forever', - default=False, - action='store_const', - const=True) -argp.add_argument('-t', '--travis', - default=False, - action='store_const', - const=True) -argp.add_argument('--newline_on_success', - default=False, - action='store_const', - const=True) -argp.add_argument('-l', '--language', - choices=['all'] + sorted(_LANGUAGES.keys()), - nargs='+', - default=['all']) -argp.add_argument('-S', '--stop_on_failure', - default=False, - action='store_const', - const=True) -argp.add_argument('--use_docker', - default=False, - action='store_const', - const=True, - help='Run all the tests under docker. That provides ' + - 'additional isolation and prevents the need to install ' + - 'language specific prerequisites. Only available on Linux.') -argp.add_argument('--allow_flakes', - default=False, - action='store_const', - const=True, - help='Allow flaky tests to show as passing (re-runs failed tests up to five times)') -argp.add_argument('--arch', - choices=['default', 'x86', 'x64'], - default='default', - help='Selects architecture to target. For some platforms "default" is the only supported choice.') -argp.add_argument('--compiler', - choices=['default', - 'gcc4.4', 'gcc4.6', 'gcc4.8', 'gcc4.9', 'gcc5.3', 'gcc_musl', - 'clang3.4', 'clang3.5', 'clang3.6', 'clang3.7', - 'python2.7', 'python3.4', 'python3.5', 'python3.6', 'pypy', 'pypy3', 'python_alpine', 'all_the_cpythons', - 'electron1.3', 'electron1.6', - 'coreclr', - 'cmake', 'cmake_vs2015', 'cmake_vs2017'], - default='default', - help='Selects compiler to use. Allowed values depend on the platform and language.') -argp.add_argument('--iomgr_platform', - choices=['native', 'uv'], - default='native', - help='Selects iomgr platform to build on') -argp.add_argument('--build_only', - default=False, - action='store_const', - const=True, - help='Perform all the build steps but don\'t run any tests.') -argp.add_argument('--measure_cpu_costs', default=False, action='store_const', const=True, - help='Measure the cpu costs of tests') -argp.add_argument('--update_submodules', default=[], nargs='*', - help='Update some submodules before building. If any are updated, also run generate_projects. ' + - 'Submodules are specified as SUBMODULE_NAME:BRANCH; if BRANCH is omitted, master is assumed.') +argp.add_argument( + '-p', + '--sample_percent', + default=100.0, + type=percent_type, + help='Run a random sample with that percentage of tests') +argp.add_argument( + '-f', '--forever', default=False, action='store_const', const=True) +argp.add_argument( + '-t', '--travis', default=False, action='store_const', const=True) +argp.add_argument( + '--newline_on_success', default=False, action='store_const', const=True) +argp.add_argument( + '-l', + '--language', + choices=['all'] + sorted(_LANGUAGES.keys()), + nargs='+', + default=['all']) +argp.add_argument( + '-S', '--stop_on_failure', default=False, action='store_const', const=True) +argp.add_argument( + '--use_docker', + default=False, + action='store_const', + const=True, + help='Run all the tests under docker. That provides ' + + 'additional isolation and prevents the need to install ' + + 'language specific prerequisites. Only available on Linux.') +argp.add_argument( + '--allow_flakes', + default=False, + action='store_const', + const=True, + help='Allow flaky tests to show as passing (re-runs failed tests up to five times)' +) +argp.add_argument( + '--arch', + choices=['default', 'x86', 'x64'], + default='default', + help='Selects architecture to target. For some platforms "default" is the only supported choice.' +) +argp.add_argument( + '--compiler', + choices=[ + 'default', 'gcc4.4', 'gcc4.6', 'gcc4.8', 'gcc4.9', 'gcc5.3', 'gcc_musl', + 'clang3.4', 'clang3.5', 'clang3.6', 'clang3.7', 'python2.7', + 'python3.4', 'python3.5', 'python3.6', 'pypy', 'pypy3', 'python_alpine', + 'all_the_cpythons', 'electron1.3', 'electron1.6', 'coreclr', 'cmake', + 'cmake_vs2015', 'cmake_vs2017' + ], + default='default', + help='Selects compiler to use. Allowed values depend on the platform and language.' +) +argp.add_argument( + '--iomgr_platform', + choices=['native', 'uv'], + default='native', + help='Selects iomgr platform to build on') +argp.add_argument( + '--build_only', + default=False, + action='store_const', + const=True, + help='Perform all the build steps but don\'t run any tests.') +argp.add_argument( + '--measure_cpu_costs', + default=False, + action='store_const', + const=True, + help='Measure the cpu costs of tests') +argp.add_argument( + '--update_submodules', + default=[], + nargs='*', + help='Update some submodules before building. If any are updated, also run generate_projects. ' + + + 'Submodules are specified as SUBMODULE_NAME:BRANCH; if BRANCH is omitted, master is assumed.' +) argp.add_argument('-a', '--antagonists', default=0, type=int) -argp.add_argument('-x', '--xml_report', default=None, type=str, - help='Generates a JUnit-compatible XML report') -argp.add_argument('--report_suite_name', default='tests', type=str, - help='Test suite name to use in generated JUnit XML report') -argp.add_argument('--quiet_success', - default=False, - action='store_const', - const=True, - help='Don\'t print anything when a test passes. Passing tests also will not be reported in XML report. ' + - 'Useful when running many iterations of each test (argument -n).') -argp.add_argument('--force_default_poller', default=False, action='store_const', const=True, - help='Don\'t try to iterate over many polling strategies when they exist') -argp.add_argument('--force_use_pollers', default=None, type=str, - help='Only use the specified comma-delimited list of polling engines. ' - 'Example: --force_use_pollers epollsig,poll ' - ' (This flag has no effect if --force_default_poller flag is also used)') -argp.add_argument('--max_time', default=-1, type=int, help='Maximum test runtime in seconds') -argp.add_argument('--bq_result_table', - default='', - type=str, - nargs='?', - help='Upload test results to a specified BQ table.') -argp.add_argument('--disable_auto_set_flakes', default=False, const=True, action='store_const', - help='Disable rerunning historically flaky tests') +argp.add_argument( + '-x', + '--xml_report', + default=None, + type=str, + help='Generates a JUnit-compatible XML report') +argp.add_argument( + '--report_suite_name', + default='tests', + type=str, + help='Test suite name to use in generated JUnit XML report') +argp.add_argument( + '--quiet_success', + default=False, + action='store_const', + const=True, + help='Don\'t print anything when a test passes. Passing tests also will not be reported in XML report. ' + + 'Useful when running many iterations of each test (argument -n).') +argp.add_argument( + '--force_default_poller', + default=False, + action='store_const', + const=True, + help='Don\'t try to iterate over many polling strategies when they exist') +argp.add_argument( + '--force_use_pollers', + default=None, + type=str, + help='Only use the specified comma-delimited list of polling engines. ' + 'Example: --force_use_pollers epollsig,poll ' + ' (This flag has no effect if --force_default_poller flag is also used)') +argp.add_argument( + '--max_time', default=-1, type=int, help='Maximum test runtime in seconds') +argp.add_argument( + '--bq_result_table', + default='', + type=str, + nargs='?', + help='Upload test results to a specified BQ table.') +argp.add_argument( + '--disable_auto_set_flakes', + default=False, + const=True, + action='store_const', + help='Disable rerunning historically flaky tests') args = argp.parse_args() flaky_tests = set() shortname_to_cpu = {} if not args.disable_auto_set_flakes: - try: - for test in get_bqtest_data(): - if test.flaky: flaky_tests.add(test.name) - if test.cpu > 0: shortname_to_cpu[test.name] = test.cpu - except: - print("Unexpected error getting flaky tests: %s" % traceback.format_exc()) + try: + for test in get_bqtest_data(): + if test.flaky: flaky_tests.add(test.name) + if test.cpu > 0: shortname_to_cpu[test.name] = test.cpu + except: + print("Unexpected error getting flaky tests: %s" % + traceback.format_exc()) if args.force_default_poller: - _POLLING_STRATEGIES = {} + _POLLING_STRATEGIES = {} elif args.force_use_pollers: - _POLLING_STRATEGIES[platform_string()] = args.force_use_pollers.split(',') + _POLLING_STRATEGIES[platform_string()] = args.force_use_pollers.split(',') jobset.measure_cpu_costs = args.measure_cpu_costs # update submodules if necessary need_to_regenerate_projects = False for spec in args.update_submodules: - spec = spec.split(':', 1) - if len(spec) == 1: - submodule = spec[0] - branch = 'master' - elif len(spec) == 2: - submodule = spec[0] - branch = spec[1] - cwd = 'third_party/%s' % submodule - def git(cmd, cwd=cwd): - print('in %s: git %s' % (cwd, cmd)) - run_shell_command('git %s' % cmd, cwd=cwd) - git('fetch') - git('checkout %s' % branch) - git('pull origin %s' % branch) - if os.path.exists('src/%s/gen_build_yaml.py' % submodule): - need_to_regenerate_projects = True + spec = spec.split(':', 1) + if len(spec) == 1: + submodule = spec[0] + branch = 'master' + elif len(spec) == 2: + submodule = spec[0] + branch = spec[1] + cwd = 'third_party/%s' % submodule + + def git(cmd, cwd=cwd): + print('in %s: git %s' % (cwd, cmd)) + run_shell_command('git %s' % cmd, cwd=cwd) + + git('fetch') + git('checkout %s' % branch) + git('pull origin %s' % branch) + if os.path.exists('src/%s/gen_build_yaml.py' % submodule): + need_to_regenerate_projects = True if need_to_regenerate_projects: - if jobset.platform_string() == 'linux': - run_shell_command('tools/buildgen/generate_projects.sh') - else: - print('WARNING: may need to regenerate projects, but since we are not on') - print(' Linux this step is being skipped. Compilation MAY fail.') - + if jobset.platform_string() == 'linux': + run_shell_command('tools/buildgen/generate_projects.sh') + else: + print( + 'WARNING: may need to regenerate projects, but since we are not on') + print( + ' Linux this step is being skipped. Compilation MAY fail.') # grab config run_config = _CONFIGS[args.config] build_config = run_config.build_config if args.travis: - _FORCE_ENVIRON_FOR_WRAPPERS = {'GRPC_TRACE': 'api'} + _FORCE_ENVIRON_FOR_WRAPPERS = {'GRPC_TRACE': 'api'} if 'all' in args.language: - lang_list = _LANGUAGES.keys() + lang_list = _LANGUAGES.keys() else: - lang_list = args.language + lang_list = args.language # We don't support code coverage on some languages if 'gcov' in args.config: - for bad in ['objc', 'sanity']: - if bad in lang_list: - lang_list.remove(bad) + for bad in ['objc', 'sanity']: + if bad in lang_list: + lang_list.remove(bad) languages = set(_LANGUAGES[l] for l in lang_list) for l in languages: - l.configure(run_config, args) + l.configure(run_config, args) -language_make_options=[] +language_make_options = [] if any(language.make_options() for language in languages): - if not 'gcov' in args.config and len(languages) != 1: - print('languages with custom make options cannot be built simultaneously with other languages') - sys.exit(1) - else: - # Combining make options is not clean and just happens to work. It allows C/C++ and C# to build - # together, and is only used under gcov. All other configs should build languages individually. - language_make_options = list(set([make_option for lang in languages for make_option in lang.make_options()])) + if not 'gcov' in args.config and len(languages) != 1: + print( + 'languages with custom make options cannot be built simultaneously with other languages' + ) + sys.exit(1) + else: + # Combining make options is not clean and just happens to work. It allows C/C++ and C# to build + # together, and is only used under gcov. All other configs should build languages individually. + language_make_options = list( + set([ + make_option + for lang in languages for make_option in lang.make_options() + ])) if args.use_docker: - if not args.travis: - print('Seen --use_docker flag, will run tests under docker.') - print('') - print('IMPORTANT: The changes you are testing need to be locally committed') - print('because only the committed changes in the current branch will be') - print('copied to the docker environment.') - time.sleep(5) - - dockerfile_dirs = set([l.dockerfile_dir() for l in languages]) - if len(dockerfile_dirs) > 1: - if 'gcov' in args.config: - dockerfile_dir = 'tools/dockerfile/test/multilang_jessie_x64' - print ('Using multilang_jessie_x64 docker image for code coverage for ' - 'all languages.') + if not args.travis: + print('Seen --use_docker flag, will run tests under docker.') + print('') + print( + 'IMPORTANT: The changes you are testing need to be locally committed' + ) + print( + 'because only the committed changes in the current branch will be') + print('copied to the docker environment.') + time.sleep(5) + + dockerfile_dirs = set([l.dockerfile_dir() for l in languages]) + if len(dockerfile_dirs) > 1: + if 'gcov' in args.config: + dockerfile_dir = 'tools/dockerfile/test/multilang_jessie_x64' + print( + 'Using multilang_jessie_x64 docker image for code coverage for ' + 'all languages.') + else: + print( + 'Languages to be tested require running under different docker ' + 'images.') + sys.exit(1) else: - print ('Languages to be tested require running under different docker ' - 'images.') - sys.exit(1) - else: - dockerfile_dir = next(iter(dockerfile_dirs)) - - child_argv = [ arg for arg in sys.argv if not arg == '--use_docker' ] - run_tests_cmd = 'python tools/run_tests/run_tests.py %s' % ' '.join(child_argv[1:]) - - env = os.environ.copy() - env['RUN_TESTS_COMMAND'] = run_tests_cmd - env['DOCKERFILE_DIR'] = dockerfile_dir - env['DOCKER_RUN_SCRIPT'] = 'tools/run_tests/dockerize/docker_run_tests.sh' - if args.xml_report: - env['XML_REPORT'] = args.xml_report - if not args.travis: - env['TTY_FLAG'] = '-t' # enables Ctrl-C when not on Jenkins. - - subprocess.check_call('tools/run_tests/dockerize/build_docker_and_run_tests.sh', - shell=True, - env=env) - sys.exit(0) + dockerfile_dir = next(iter(dockerfile_dirs)) + + child_argv = [arg for arg in sys.argv if not arg == '--use_docker'] + run_tests_cmd = 'python tools/run_tests/run_tests.py %s' % ' '.join( + child_argv[1:]) + + env = os.environ.copy() + env['RUN_TESTS_COMMAND'] = run_tests_cmd + env['DOCKERFILE_DIR'] = dockerfile_dir + env['DOCKER_RUN_SCRIPT'] = 'tools/run_tests/dockerize/docker_run_tests.sh' + if args.xml_report: + env['XML_REPORT'] = args.xml_report + if not args.travis: + env['TTY_FLAG'] = '-t' # enables Ctrl-C when not on Jenkins. + + subprocess.check_call( + 'tools/run_tests/dockerize/build_docker_and_run_tests.sh', + shell=True, + env=env) + sys.exit(0) _check_arch_option(args.arch) + def make_jobspec(cfg, targets, makefile='Makefile'): - if platform_string() == 'windows': - return [jobset.JobSpec(['cmake', '--build', '.', - '--target', '%s' % target, - '--config', _MSBUILD_CONFIG[cfg]], - cwd=os.path.dirname(makefile), - timeout_seconds=None) for target in targets] - else: - if targets and makefile.startswith('cmake/build/'): - # With cmake, we've passed all the build configuration in the pre-build step already - return [jobset.JobSpec([os.getenv('MAKE', 'make'), - '-j', '%d' % args.jobs] + - targets, - cwd='cmake/build', - timeout_seconds=None)] - if targets: - return [jobset.JobSpec([os.getenv('MAKE', 'make'), - '-f', makefile, - '-j', '%d' % args.jobs, - 'EXTRA_DEFINES=GRPC_TEST_SLOWDOWN_MACHINE_FACTOR=%f' % args.slowdown, - 'CONFIG=%s' % cfg, - 'Q='] + - language_make_options + - ([] if not args.travis else ['JENKINS_BUILD=1']) + - targets, - timeout_seconds=None)] + if platform_string() == 'windows': + return [ + jobset.JobSpec( + [ + 'cmake', '--build', '.', '--target', '%s' % target, + '--config', _MSBUILD_CONFIG[cfg] + ], + cwd=os.path.dirname(makefile), + timeout_seconds=None) for target in targets + ] else: - return [] + if targets and makefile.startswith('cmake/build/'): + # With cmake, we've passed all the build configuration in the pre-build step already + return [ + jobset.JobSpec( + [os.getenv('MAKE', 'make'), '-j', '%d' % args.jobs] + + targets, + cwd='cmake/build', + timeout_seconds=None) + ] + if targets: + return [ + jobset.JobSpec( + [ + os.getenv('MAKE', 'make'), '-f', makefile, '-j', '%d' % + args.jobs, + 'EXTRA_DEFINES=GRPC_TEST_SLOWDOWN_MACHINE_FACTOR=%f' % + args.slowdown, 'CONFIG=%s' % cfg, 'Q=' + ] + language_make_options + + ([] if not args.travis else ['JENKINS_BUILD=1']) + targets, + timeout_seconds=None) + ] + else: + return [] + make_targets = {} for l in languages: - makefile = l.makefile_name() - make_targets[makefile] = make_targets.get(makefile, set()).union( - set(l.make_targets())) + makefile = l.makefile_name() + make_targets[makefile] = make_targets.get( + makefile, set()).union(set(l.make_targets())) + def build_step_environ(cfg): - environ = {'CONFIG': cfg} - msbuild_cfg = _MSBUILD_CONFIG.get(cfg) - if msbuild_cfg: - environ['MSBUILD_CONFIG'] = msbuild_cfg - return environ - -build_steps = list(set( - jobset.JobSpec(cmdline, environ=build_step_environ(build_config), flake_retries=2) - for l in languages - for cmdline in l.pre_build_steps())) + environ = {'CONFIG': cfg} + msbuild_cfg = _MSBUILD_CONFIG.get(cfg) + if msbuild_cfg: + environ['MSBUILD_CONFIG'] = msbuild_cfg + return environ + + +build_steps = list( + set( + jobset.JobSpec( + cmdline, environ=build_step_environ(build_config), flake_retries=2) + for l in languages for cmdline in l.pre_build_steps())) if make_targets: - make_commands = itertools.chain.from_iterable(make_jobspec(build_config, list(targets), makefile) for (makefile, targets) in make_targets.items()) - build_steps.extend(set(make_commands)) -build_steps.extend(set( - jobset.JobSpec(cmdline, environ=build_step_environ(build_config), timeout_seconds=None) - for l in languages - for cmdline in l.build_steps())) - -post_tests_steps = list(set( - jobset.JobSpec(cmdline, environ=build_step_environ(build_config)) - for l in languages - for cmdline in l.post_tests_steps())) + make_commands = itertools.chain.from_iterable( + make_jobspec(build_config, list(targets), makefile) + for (makefile, targets) in make_targets.items()) + build_steps.extend(set(make_commands)) +build_steps.extend( + set( + jobset.JobSpec( + cmdline, + environ=build_step_environ(build_config), + timeout_seconds=None) + for l in languages for cmdline in l.build_steps())) + +post_tests_steps = list( + set( + jobset.JobSpec(cmdline, environ=build_step_environ(build_config)) + for l in languages for cmdline in l.post_tests_steps())) runs_per_test = args.runs_per_test forever = args.forever def _shut_down_legacy_server(legacy_server_port): - try: - version = int(urllib.request.urlopen( - 'http://localhost:%d/version_number' % legacy_server_port, - timeout=10).read()) - except: - pass - else: - urllib.request.urlopen( - 'http://localhost:%d/quitquitquit' % legacy_server_port).read() + try: + version = int( + urllib.request.urlopen( + 'http://localhost:%d/version_number' % legacy_server_port, + timeout=10).read()) + except: + pass + else: + urllib.request.urlopen('http://localhost:%d/quitquitquit' % + legacy_server_port).read() def _calculate_num_runs_failures(list_of_results): - """Caculate number of runs and failures for a particular test. + """Caculate number of runs and failures for a particular test. Args: list_of_results: (List) of JobResult object. Returns: A tuple of total number of runs and failures. """ - num_runs = len(list_of_results) # By default, there is 1 run per JobResult. - num_failures = 0 - for jobresult in list_of_results: - if jobresult.retries > 0: - num_runs += jobresult.retries - if jobresult.num_failures > 0: - num_failures += jobresult.num_failures - return num_runs, num_failures + num_runs = len(list_of_results) # By default, there is 1 run per JobResult. + num_failures = 0 + for jobresult in list_of_results: + if jobresult.retries > 0: + num_runs += jobresult.retries + if jobresult.num_failures > 0: + num_failures += jobresult.num_failures + return num_runs, num_failures # _build_and_run results class BuildAndRunError(object): - BUILD = object() - TEST = object() - POST_TEST = object() + BUILD = object() + TEST = object() + POST_TEST = object() def _has_epollexclusive(): - binary = 'bins/%s/check_epollexclusive' % args.config - if not os.path.exists(binary): - return False - try: - subprocess.check_call(binary) - return True - except subprocess.CalledProcessError, e: - return False - except OSError, e: - # For languages other than C and Windows the binary won't exist - return False + binary = 'bins/%s/check_epollexclusive' % args.config + if not os.path.exists(binary): + return False + try: + subprocess.check_call(binary) + return True + except subprocess.CalledProcessError, e: + return False + except OSError, e: + # For languages other than C and Windows the binary won't exist + return False # returns a list of things that failed (or an empty list on success) -def _build_and_run( - check_cancelled, newline_on_success, xml_report=None, build_only=False): - """Do one pass of building & running tests.""" - # build latest sequentially - num_failures, resultset = jobset.run( - build_steps, maxjobs=1, stop_on_failure=True, - newline_on_success=newline_on_success, travis=args.travis) - if num_failures: - return [BuildAndRunError.BUILD] - - if build_only: - if xml_report: - report_utils.render_junit_xml_report(resultset, xml_report, - suite_name=args.report_suite_name) - return [] - - if not args.travis and not _has_epollexclusive() and platform_string() in _POLLING_STRATEGIES and 'epollex' in _POLLING_STRATEGIES[platform_string()]: - print('\n\nOmitting EPOLLEXCLUSIVE tests\n\n') - _POLLING_STRATEGIES[platform_string()].remove('epollex') - - # start antagonists - antagonists = [subprocess.Popen(['tools/run_tests/python_utils/antagonist.py']) - for _ in range(0, args.antagonists)] - start_port_server.start_port_server() - resultset = None - num_test_failures = 0 - try: - infinite_runs = runs_per_test == 0 - one_run = set( - spec - for language in languages - for spec in language.test_specs() - if (re.search(args.regex, spec.shortname) and - (args.regex_exclude == '' or - not re.search(args.regex_exclude, spec.shortname)))) - # When running on travis, we want out test runs to be as similar as possible - # for reproducibility purposes. - if args.travis and args.max_time <= 0: - massaged_one_run = sorted(one_run, key=lambda x: x.cpu_cost) - else: - # whereas otherwise, we want to shuffle things up to give all tests a - # chance to run. - massaged_one_run = list(one_run) # random.sample needs an indexable seq. - num_jobs = len(massaged_one_run) - # for a random sample, get as many as indicated by the 'sample_percent' - # argument. By default this arg is 100, resulting in a shuffle of all - # jobs. - sample_size = int(num_jobs * args.sample_percent/100.0) - massaged_one_run = random.sample(massaged_one_run, sample_size) - if not isclose(args.sample_percent, 100.0): - assert args.runs_per_test == 1, "Can't do sampling (-p) over multiple runs (-n)." - print("Running %d tests out of %d (~%d%%)" % - (sample_size, num_jobs, args.sample_percent)) - if infinite_runs: - assert len(massaged_one_run) > 0, 'Must have at least one test for a -n inf run' - runs_sequence = (itertools.repeat(massaged_one_run) if infinite_runs - else itertools.repeat(massaged_one_run, runs_per_test)) - all_runs = itertools.chain.from_iterable(runs_sequence) - - if args.quiet_success: - jobset.message('START', 'Running tests quietly, only failing tests will be reported', do_newline=True) - num_test_failures, resultset = jobset.run( - all_runs, check_cancelled, newline_on_success=newline_on_success, - travis=args.travis, maxjobs=args.jobs, maxjobs_cpu_agnostic=max_parallel_tests_for_current_platform(), - stop_on_failure=args.stop_on_failure, - quiet_success=args.quiet_success, max_time=args.max_time) - if resultset: - for k, v in sorted(resultset.items()): - num_runs, num_failures = _calculate_num_runs_failures(v) - if num_failures > 0: - if num_failures == num_runs: # what about infinite_runs??? - jobset.message('FAILED', k, do_newline=True) - else: +def _build_and_run(check_cancelled, + newline_on_success, + xml_report=None, + build_only=False): + """Do one pass of building & running tests.""" + # build latest sequentially + num_failures, resultset = jobset.run( + build_steps, + maxjobs=1, + stop_on_failure=True, + newline_on_success=newline_on_success, + travis=args.travis) + if num_failures: + return [BuildAndRunError.BUILD] + + if build_only: + if xml_report: + report_utils.render_junit_xml_report( + resultset, xml_report, suite_name=args.report_suite_name) + return [] + + if not args.travis and not _has_epollexclusive() and platform_string( + ) in _POLLING_STRATEGIES and 'epollex' in _POLLING_STRATEGIES[ + platform_string()]: + print('\n\nOmitting EPOLLEXCLUSIVE tests\n\n') + _POLLING_STRATEGIES[platform_string()].remove('epollex') + + # start antagonists + antagonists = [ + subprocess.Popen(['tools/run_tests/python_utils/antagonist.py']) + for _ in range(0, args.antagonists) + ] + start_port_server.start_port_server() + resultset = None + num_test_failures = 0 + try: + infinite_runs = runs_per_test == 0 + one_run = set(spec + for language in languages + for spec in language.test_specs() + if (re.search(args.regex, spec.shortname) and ( + args.regex_exclude == '' or not re.search( + args.regex_exclude, spec.shortname)))) + # When running on travis, we want out test runs to be as similar as possible + # for reproducibility purposes. + if args.travis and args.max_time <= 0: + massaged_one_run = sorted(one_run, key=lambda x: x.cpu_cost) + else: + # whereas otherwise, we want to shuffle things up to give all tests a + # chance to run. + massaged_one_run = list( + one_run) # random.sample needs an indexable seq. + num_jobs = len(massaged_one_run) + # for a random sample, get as many as indicated by the 'sample_percent' + # argument. By default this arg is 100, resulting in a shuffle of all + # jobs. + sample_size = int(num_jobs * args.sample_percent / 100.0) + massaged_one_run = random.sample(massaged_one_run, sample_size) + if not isclose(args.sample_percent, 100.0): + assert args.runs_per_test == 1, "Can't do sampling (-p) over multiple runs (-n)." + print("Running %d tests out of %d (~%d%%)" % + (sample_size, num_jobs, args.sample_percent)) + if infinite_runs: + assert len(massaged_one_run + ) > 0, 'Must have at least one test for a -n inf run' + runs_sequence = (itertools.repeat(massaged_one_run) if infinite_runs + else itertools.repeat(massaged_one_run, runs_per_test)) + all_runs = itertools.chain.from_iterable(runs_sequence) + + if args.quiet_success: jobset.message( - 'FLAKE', '%s [%d/%d runs flaked]' % (k, num_failures, num_runs), + 'START', + 'Running tests quietly, only failing tests will be reported', do_newline=True) - finally: - for antagonist in antagonists: - antagonist.kill() - if args.bq_result_table and resultset: - upload_results_to_bq(resultset, args.bq_result_table, args, platform_string()) - if xml_report and resultset: - report_utils.render_junit_xml_report(resultset, xml_report, - suite_name=args.report_suite_name) - - number_failures, _ = jobset.run( - post_tests_steps, maxjobs=1, stop_on_failure=False, - newline_on_success=newline_on_success, travis=args.travis) + num_test_failures, resultset = jobset.run( + all_runs, + check_cancelled, + newline_on_success=newline_on_success, + travis=args.travis, + maxjobs=args.jobs, + maxjobs_cpu_agnostic=max_parallel_tests_for_current_platform(), + stop_on_failure=args.stop_on_failure, + quiet_success=args.quiet_success, + max_time=args.max_time) + if resultset: + for k, v in sorted(resultset.items()): + num_runs, num_failures = _calculate_num_runs_failures(v) + if num_failures > 0: + if num_failures == num_runs: # what about infinite_runs??? + jobset.message('FAILED', k, do_newline=True) + else: + jobset.message( + 'FLAKE', + '%s [%d/%d runs flaked]' % + (k, num_failures, num_runs), + do_newline=True) + finally: + for antagonist in antagonists: + antagonist.kill() + if args.bq_result_table and resultset: + upload_results_to_bq(resultset, args.bq_result_table, args, + platform_string()) + if xml_report and resultset: + report_utils.render_junit_xml_report( + resultset, xml_report, suite_name=args.report_suite_name) + + number_failures, _ = jobset.run( + post_tests_steps, + maxjobs=1, + stop_on_failure=False, + newline_on_success=newline_on_success, + travis=args.travis) - out = [] - if number_failures: - out.append(BuildAndRunError.POST_TEST) - if num_test_failures: - out.append(BuildAndRunError.TEST) + out = [] + if number_failures: + out.append(BuildAndRunError.POST_TEST) + if num_test_failures: + out.append(BuildAndRunError.TEST) - return out + return out if forever: - success = True - while True: - dw = watch_dirs.DirWatcher(['src', 'include', 'test', 'examples']) - initial_time = dw.most_recent_change() - have_files_changed = lambda: dw.most_recent_change() != initial_time - previous_success = success - errors = _build_and_run(check_cancelled=have_files_changed, - newline_on_success=False, - build_only=args.build_only) == 0 - if not previous_success and not errors: - jobset.message('SUCCESS', - 'All tests are now passing properly', - do_newline=True) - jobset.message('IDLE', 'No change detected') - while not have_files_changed(): - time.sleep(1) + success = True + while True: + dw = watch_dirs.DirWatcher(['src', 'include', 'test', 'examples']) + initial_time = dw.most_recent_change() + have_files_changed = lambda: dw.most_recent_change() != initial_time + previous_success = success + errors = _build_and_run( + check_cancelled=have_files_changed, + newline_on_success=False, + build_only=args.build_only) == 0 + if not previous_success and not errors: + jobset.message( + 'SUCCESS', + 'All tests are now passing properly', + do_newline=True) + jobset.message('IDLE', 'No change detected') + while not have_files_changed(): + time.sleep(1) else: - errors = _build_and_run(check_cancelled=lambda: False, - newline_on_success=args.newline_on_success, - xml_report=args.xml_report, - build_only=args.build_only) - if not errors: - jobset.message('SUCCESS', 'All tests passed', do_newline=True) - else: - jobset.message('FAILED', 'Some tests failed', do_newline=True) - exit_code = 0 - if BuildAndRunError.BUILD in errors: - exit_code |= 1 - if BuildAndRunError.TEST in errors: - exit_code |= 2 - if BuildAndRunError.POST_TEST in errors: - exit_code |= 4 - sys.exit(exit_code) + errors = _build_and_run( + check_cancelled=lambda: False, + newline_on_success=args.newline_on_success, + xml_report=args.xml_report, + build_only=args.build_only) + if not errors: + jobset.message('SUCCESS', 'All tests passed', do_newline=True) + else: + jobset.message('FAILED', 'Some tests failed', do_newline=True) + exit_code = 0 + if BuildAndRunError.BUILD in errors: + exit_code |= 1 + if BuildAndRunError.TEST in errors: + exit_code |= 2 + if BuildAndRunError.POST_TEST in errors: + exit_code |= 4 + sys.exit(exit_code) diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py index 7c58d8efb14..49be8f1d7e4 100755 --- a/tools/run_tests/run_tests_matrix.py +++ b/tools/run_tests/run_tests_matrix.py @@ -12,7 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Run test matrix.""" from __future__ import print_function @@ -29,14 +28,14 @@ from python_utils.filter_pull_request_tests import filter_tests _ROOT = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '../..')) os.chdir(_ROOT) -_DEFAULT_RUNTESTS_TIMEOUT = 1*60*60 +_DEFAULT_RUNTESTS_TIMEOUT = 1 * 60 * 60 # Set the timeout high to allow enough time for sanitizers and pre-building # clang docker. -_CPP_RUNTESTS_TIMEOUT = 4*60*60 +_CPP_RUNTESTS_TIMEOUT = 4 * 60 * 60 # C++ TSAN takes longer than other sanitizers -_CPP_TSAN_RUNTESTS_TIMEOUT = 8*60*60 +_CPP_TSAN_RUNTESTS_TIMEOUT = 8 * 60 * 60 # Number of jobs assigned to each run_tests.py instance _DEFAULT_INNER_JOBS = 2 @@ -46,448 +45,517 @@ _REPORT_SUFFIX = 'sponge_log.xml' def _report_filename(name): - """Generates report file name""" - return 'report_%s_%s' % (name, _REPORT_SUFFIX) + """Generates report file name""" + return 'report_%s_%s' % (name, _REPORT_SUFFIX) def _report_filename_internal_ci(name): - """Generates report file name that leads to better presentation by internal CI""" - return '%s/%s' % (name, _REPORT_SUFFIX) + """Generates report file name that leads to better presentation by internal CI""" + return '%s/%s' % (name, _REPORT_SUFFIX) -def _docker_jobspec(name, runtests_args=[], runtests_envs={}, +def _docker_jobspec(name, + runtests_args=[], + runtests_envs={}, inner_jobs=_DEFAULT_INNER_JOBS, timeout_seconds=None): - """Run a single instance of run_tests.py in a docker container""" - if not timeout_seconds: - timeout_seconds = _DEFAULT_RUNTESTS_TIMEOUT - test_job = jobset.JobSpec( - cmdline=['python', 'tools/run_tests/run_tests.py', - '--use_docker', - '-t', - '-j', str(inner_jobs), - '-x', _report_filename(name), - '--report_suite_name', '%s' % name] + runtests_args, - environ=runtests_envs, - shortname='run_tests_%s' % name, - timeout_seconds=timeout_seconds) - return test_job - - -def _workspace_jobspec(name, runtests_args=[], workspace_name=None, - runtests_envs={}, inner_jobs=_DEFAULT_INNER_JOBS, + """Run a single instance of run_tests.py in a docker container""" + if not timeout_seconds: + timeout_seconds = _DEFAULT_RUNTESTS_TIMEOUT + test_job = jobset.JobSpec( + cmdline=[ + 'python', 'tools/run_tests/run_tests.py', '--use_docker', '-t', + '-j', str(inner_jobs), '-x', _report_filename(name), + '--report_suite_name', '%s' % name + ] + runtests_args, + environ=runtests_envs, + shortname='run_tests_%s' % name, + timeout_seconds=timeout_seconds) + return test_job + + +def _workspace_jobspec(name, + runtests_args=[], + workspace_name=None, + runtests_envs={}, + inner_jobs=_DEFAULT_INNER_JOBS, timeout_seconds=None): - """Run a single instance of run_tests.py in a separate workspace""" - if not workspace_name: - workspace_name = 'workspace_%s' % name - if not timeout_seconds: - timeout_seconds = _DEFAULT_RUNTESTS_TIMEOUT - env = {'WORKSPACE_NAME': workspace_name} - env.update(runtests_envs) - test_job = jobset.JobSpec( - cmdline=['bash', - 'tools/run_tests/helper_scripts/run_tests_in_workspace.sh', - '-t', - '-j', str(inner_jobs), - '-x', '../%s' % _report_filename(name), - '--report_suite_name', '%s' % name] + runtests_args, - environ=env, - shortname='run_tests_%s' % name, - timeout_seconds=timeout_seconds) - return test_job - - -def _generate_jobs(languages, configs, platforms, iomgr_platform = 'native', - arch=None, compiler=None, - labels=[], extra_args=[], extra_envs={}, - inner_jobs=_DEFAULT_INNER_JOBS, - timeout_seconds=None): - result = [] - for language in languages: - for platform in platforms: - for config in configs: - name = '%s_%s_%s_%s' % (language, platform, config, iomgr_platform) - runtests_args = ['-l', language, - '-c', config, - '--iomgr_platform', iomgr_platform] - if arch or compiler: - name += '_%s_%s' % (arch, compiler) - runtests_args += ['--arch', arch, - '--compiler', compiler] - if '--build_only' in extra_args: - name += '_buildonly' - for extra_env in extra_envs: - name += '_%s_%s' % (extra_env, extra_envs[extra_env]) - - runtests_args += extra_args - if platform == 'linux': - job = _docker_jobspec(name=name, runtests_args=runtests_args, - runtests_envs=extra_envs, inner_jobs=inner_jobs, - timeout_seconds=timeout_seconds) - else: - job = _workspace_jobspec(name=name, runtests_args=runtests_args, - runtests_envs=extra_envs, inner_jobs=inner_jobs, - timeout_seconds=timeout_seconds) - - job.labels = [platform, config, language, iomgr_platform] + labels - result.append(job) - return result + """Run a single instance of run_tests.py in a separate workspace""" + if not workspace_name: + workspace_name = 'workspace_%s' % name + if not timeout_seconds: + timeout_seconds = _DEFAULT_RUNTESTS_TIMEOUT + env = {'WORKSPACE_NAME': workspace_name} + env.update(runtests_envs) + test_job = jobset.JobSpec( + cmdline=[ + 'bash', 'tools/run_tests/helper_scripts/run_tests_in_workspace.sh', + '-t', '-j', str(inner_jobs), '-x', '../%s' % _report_filename(name), + '--report_suite_name', '%s' % name + ] + runtests_args, + environ=env, + shortname='run_tests_%s' % name, + timeout_seconds=timeout_seconds) + return test_job + + +def _generate_jobs(languages, + configs, + platforms, + iomgr_platform='native', + arch=None, + compiler=None, + labels=[], + extra_args=[], + extra_envs={}, + inner_jobs=_DEFAULT_INNER_JOBS, + timeout_seconds=None): + result = [] + for language in languages: + for platform in platforms: + for config in configs: + name = '%s_%s_%s_%s' % (language, platform, config, + iomgr_platform) + runtests_args = [ + '-l', language, '-c', config, '--iomgr_platform', + iomgr_platform + ] + if arch or compiler: + name += '_%s_%s' % (arch, compiler) + runtests_args += ['--arch', arch, '--compiler', compiler] + if '--build_only' in extra_args: + name += '_buildonly' + for extra_env in extra_envs: + name += '_%s_%s' % (extra_env, extra_envs[extra_env]) + + runtests_args += extra_args + if platform == 'linux': + job = _docker_jobspec( + name=name, + runtests_args=runtests_args, + runtests_envs=extra_envs, + inner_jobs=inner_jobs, + timeout_seconds=timeout_seconds) + else: + job = _workspace_jobspec( + name=name, + runtests_args=runtests_args, + runtests_envs=extra_envs, + inner_jobs=inner_jobs, + timeout_seconds=timeout_seconds) + + job.labels = [platform, config, language, iomgr_platform + ] + labels + result.append(job) + return result def _create_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS): - test_jobs = [] - # supported on linux only - test_jobs += _generate_jobs(languages=['sanity', 'php7'], - configs=['dbg', 'opt'], - platforms=['linux'], - labels=['basictests', 'multilang'], - extra_args=extra_args, - inner_jobs=inner_jobs) - - # supported on all platforms. - test_jobs += _generate_jobs(languages=['c'], - configs=['dbg', 'opt'], - platforms=['linux', 'macos', 'windows'], - labels=['basictests', 'corelang'], - extra_args=extra_args, - inner_jobs=inner_jobs, - timeout_seconds=_CPP_RUNTESTS_TIMEOUT) - - test_jobs += _generate_jobs(languages=['csharp', 'python'], - configs=['dbg', 'opt'], - platforms=['linux', 'macos', 'windows'], - labels=['basictests', 'multilang'], - extra_args=extra_args, - inner_jobs=inner_jobs) - - # supported on linux and mac. - test_jobs += _generate_jobs(languages=['c++'], - configs=['dbg', 'opt'], - platforms=['linux', 'macos'], - labels=['basictests', 'corelang'], - extra_args=extra_args, - inner_jobs=inner_jobs, - timeout_seconds=_CPP_RUNTESTS_TIMEOUT) - - test_jobs += _generate_jobs(languages=['grpc-node', 'ruby', 'php'], - configs=['dbg', 'opt'], - platforms=['linux', 'macos'], - labels=['basictests', 'multilang'], - extra_args=extra_args, - inner_jobs=inner_jobs) - - # supported on mac only. - test_jobs += _generate_jobs(languages=['objc'], - configs=['dbg', 'opt'], - platforms=['macos'], - labels=['basictests', 'multilang'], - extra_args=extra_args, - inner_jobs=inner_jobs) - - # sanitizers - test_jobs += _generate_jobs(languages=['c'], - configs=['msan', 'asan', 'tsan', 'ubsan'], - platforms=['linux'], - labels=['sanitizers', 'corelang'], - extra_args=extra_args, - inner_jobs=inner_jobs, - timeout_seconds=_CPP_RUNTESTS_TIMEOUT) - test_jobs += _generate_jobs(languages=['c++'], - configs=['asan'], - platforms=['linux'], - labels=['sanitizers', 'corelang'], - extra_args=extra_args, - inner_jobs=inner_jobs, - timeout_seconds=_CPP_RUNTESTS_TIMEOUT) - test_jobs += _generate_jobs(languages=['c++'], - configs=['tsan'], - platforms=['linux'], - labels=['sanitizers', 'corelang'], - extra_args=extra_args, - inner_jobs=inner_jobs, - timeout_seconds=_CPP_TSAN_RUNTESTS_TIMEOUT) - - return test_jobs - - -def _create_portability_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS): - test_jobs = [] - # portability C x86 - test_jobs += _generate_jobs(languages=['c'], - configs=['dbg'], - platforms=['linux'], - arch='x86', - compiler='default', - labels=['portability', 'corelang'], - extra_args=extra_args, - inner_jobs=inner_jobs) - - # portability C and C++ on x64 - for compiler in ['gcc4.8', 'gcc5.3', 'gcc_musl', - 'clang3.5', 'clang3.6', 'clang3.7']: - test_jobs += _generate_jobs(languages=['c', 'c++'], - configs=['dbg'], - platforms=['linux'], - arch='x64', - compiler=compiler, - labels=['portability', 'corelang'], - extra_args=extra_args, - inner_jobs=inner_jobs, - timeout_seconds=_CPP_RUNTESTS_TIMEOUT) - - # portability C on Windows 64-bit (x86 is the default) - test_jobs += _generate_jobs(languages=['c'], - configs=['dbg'], - platforms=['windows'], - arch='x64', - compiler='default', - labels=['portability', 'corelang'], - extra_args=extra_args, - inner_jobs=inner_jobs) - - # portability C++ on Windows - # TODO(jtattermusch): some of the tests are failing, so we force --build_only - test_jobs += _generate_jobs(languages=['c++'], - configs=['dbg'], - platforms=['windows'], - arch='default', - compiler='default', - labels=['portability', 'corelang'], - extra_args=extra_args + ['--build_only'], - inner_jobs=inner_jobs) - - # portability C and C++ on Windows using VS2017 (build only) - # TODO(jtattermusch): some of the tests are failing, so we force --build_only - test_jobs += _generate_jobs(languages=['c', 'c++'], - configs=['dbg'], - platforms=['windows'], - arch='x64', - compiler='cmake_vs2017', - labels=['portability', 'corelang'], - extra_args=extra_args + ['--build_only'], - inner_jobs=inner_jobs) - - # C and C++ with the c-ares DNS resolver on Linux - test_jobs += _generate_jobs(languages=['c', 'c++'], - configs=['dbg'], platforms=['linux'], - labels=['portability', 'corelang'], - extra_args=extra_args, - extra_envs={'GRPC_DNS_RESOLVER': 'ares'}, - timeout_seconds=_CPP_RUNTESTS_TIMEOUT) - - # TODO(zyc): Turn on this test after adding c-ares support on windows. - # C with the c-ares DNS resolver on Windows - # test_jobs += _generate_jobs(languages=['c'], - # configs=['dbg'], platforms=['windows'], - # labels=['portability', 'corelang'], - # extra_args=extra_args, - # extra_envs={'GRPC_DNS_RESOLVER': 'ares'}) - - # C and C++ build with cmake on Linux - # TODO(jtattermusch): some of the tests are failing, so we force --build_only - # to make sure it's buildable at least. - test_jobs += _generate_jobs(languages=['c', 'c++'], - configs=['dbg'], - platforms=['linux'], - arch='default', - compiler='cmake', - labels=['portability', 'corelang'], - extra_args=extra_args + ['--build_only'], - inner_jobs=inner_jobs) - - test_jobs += _generate_jobs(languages=['python'], - configs=['dbg'], - platforms=['linux'], - arch='default', - compiler='python_alpine', - labels=['portability', 'multilang'], - extra_args=extra_args, - inner_jobs=inner_jobs) - - test_jobs += _generate_jobs(languages=['csharp'], - configs=['dbg'], - platforms=['linux'], - arch='default', - compiler='coreclr', - labels=['portability', 'multilang'], - extra_args=extra_args, - inner_jobs=inner_jobs) - - test_jobs += _generate_jobs(languages=['c'], - configs=['dbg'], - platforms=['linux'], - iomgr_platform='uv', - labels=['portability', 'corelang'], - extra_args=extra_args, - inner_jobs=inner_jobs, - timeout_seconds=_CPP_RUNTESTS_TIMEOUT) - - return test_jobs + test_jobs = [] + # supported on linux only + test_jobs += _generate_jobs( + languages=['sanity', 'php7'], + configs=['dbg', 'opt'], + platforms=['linux'], + labels=['basictests', 'multilang'], + extra_args=extra_args, + inner_jobs=inner_jobs) + + # supported on all platforms. + test_jobs += _generate_jobs( + languages=['c'], + configs=['dbg', 'opt'], + platforms=['linux', 'macos', 'windows'], + labels=['basictests', 'corelang'], + extra_args=extra_args, + inner_jobs=inner_jobs, + timeout_seconds=_CPP_RUNTESTS_TIMEOUT) + + test_jobs += _generate_jobs( + languages=['csharp', 'python'], + configs=['dbg', 'opt'], + platforms=['linux', 'macos', 'windows'], + labels=['basictests', 'multilang'], + extra_args=extra_args, + inner_jobs=inner_jobs) + + # supported on linux and mac. + test_jobs += _generate_jobs( + languages=['c++'], + configs=['dbg', 'opt'], + platforms=['linux', 'macos'], + labels=['basictests', 'corelang'], + extra_args=extra_args, + inner_jobs=inner_jobs, + timeout_seconds=_CPP_RUNTESTS_TIMEOUT) + + test_jobs += _generate_jobs( + languages=['grpc-node', 'ruby', 'php'], + configs=['dbg', 'opt'], + platforms=['linux', 'macos'], + labels=['basictests', 'multilang'], + extra_args=extra_args, + inner_jobs=inner_jobs) + + # supported on mac only. + test_jobs += _generate_jobs( + languages=['objc'], + configs=['dbg', 'opt'], + platforms=['macos'], + labels=['basictests', 'multilang'], + extra_args=extra_args, + inner_jobs=inner_jobs) + + # sanitizers + test_jobs += _generate_jobs( + languages=['c'], + configs=['msan', 'asan', 'tsan', 'ubsan'], + platforms=['linux'], + labels=['sanitizers', 'corelang'], + extra_args=extra_args, + inner_jobs=inner_jobs, + timeout_seconds=_CPP_RUNTESTS_TIMEOUT) + test_jobs += _generate_jobs( + languages=['c++'], + configs=['asan'], + platforms=['linux'], + labels=['sanitizers', 'corelang'], + extra_args=extra_args, + inner_jobs=inner_jobs, + timeout_seconds=_CPP_RUNTESTS_TIMEOUT) + test_jobs += _generate_jobs( + languages=['c++'], + configs=['tsan'], + platforms=['linux'], + labels=['sanitizers', 'corelang'], + extra_args=extra_args, + inner_jobs=inner_jobs, + timeout_seconds=_CPP_TSAN_RUNTESTS_TIMEOUT) + + return test_jobs + + +def _create_portability_test_jobs(extra_args=[], + inner_jobs=_DEFAULT_INNER_JOBS): + test_jobs = [] + # portability C x86 + test_jobs += _generate_jobs( + languages=['c'], + configs=['dbg'], + platforms=['linux'], + arch='x86', + compiler='default', + labels=['portability', 'corelang'], + extra_args=extra_args, + inner_jobs=inner_jobs) + + # portability C and C++ on x64 + for compiler in [ + 'gcc4.8', 'gcc5.3', 'gcc_musl', 'clang3.5', 'clang3.6', 'clang3.7' + ]: + test_jobs += _generate_jobs( + languages=['c', 'c++'], + configs=['dbg'], + platforms=['linux'], + arch='x64', + compiler=compiler, + labels=['portability', 'corelang'], + extra_args=extra_args, + inner_jobs=inner_jobs, + timeout_seconds=_CPP_RUNTESTS_TIMEOUT) + + # portability C on Windows 64-bit (x86 is the default) + test_jobs += _generate_jobs( + languages=['c'], + configs=['dbg'], + platforms=['windows'], + arch='x64', + compiler='default', + labels=['portability', 'corelang'], + extra_args=extra_args, + inner_jobs=inner_jobs) + + # portability C++ on Windows + # TODO(jtattermusch): some of the tests are failing, so we force --build_only + test_jobs += _generate_jobs( + languages=['c++'], + configs=['dbg'], + platforms=['windows'], + arch='default', + compiler='default', + labels=['portability', 'corelang'], + extra_args=extra_args + ['--build_only'], + inner_jobs=inner_jobs) + + # portability C and C++ on Windows using VS2017 (build only) + # TODO(jtattermusch): some of the tests are failing, so we force --build_only + test_jobs += _generate_jobs( + languages=['c', 'c++'], + configs=['dbg'], + platforms=['windows'], + arch='x64', + compiler='cmake_vs2017', + labels=['portability', 'corelang'], + extra_args=extra_args + ['--build_only'], + inner_jobs=inner_jobs) + + # C and C++ with the c-ares DNS resolver on Linux + test_jobs += _generate_jobs( + languages=['c', 'c++'], + configs=['dbg'], + platforms=['linux'], + labels=['portability', 'corelang'], + extra_args=extra_args, + extra_envs={'GRPC_DNS_RESOLVER': 'ares'}, + timeout_seconds=_CPP_RUNTESTS_TIMEOUT) + + # TODO(zyc): Turn on this test after adding c-ares support on windows. + # C with the c-ares DNS resolver on Windows + # test_jobs += _generate_jobs(languages=['c'], + # configs=['dbg'], platforms=['windows'], + # labels=['portability', 'corelang'], + # extra_args=extra_args, + # extra_envs={'GRPC_DNS_RESOLVER': 'ares'}) + + # C and C++ build with cmake on Linux + # TODO(jtattermusch): some of the tests are failing, so we force --build_only + # to make sure it's buildable at least. + test_jobs += _generate_jobs( + languages=['c', 'c++'], + configs=['dbg'], + platforms=['linux'], + arch='default', + compiler='cmake', + labels=['portability', 'corelang'], + extra_args=extra_args + ['--build_only'], + inner_jobs=inner_jobs) + + test_jobs += _generate_jobs( + languages=['python'], + configs=['dbg'], + platforms=['linux'], + arch='default', + compiler='python_alpine', + labels=['portability', 'multilang'], + extra_args=extra_args, + inner_jobs=inner_jobs) + + test_jobs += _generate_jobs( + languages=['csharp'], + configs=['dbg'], + platforms=['linux'], + arch='default', + compiler='coreclr', + labels=['portability', 'multilang'], + extra_args=extra_args, + inner_jobs=inner_jobs) + + test_jobs += _generate_jobs( + languages=['c'], + configs=['dbg'], + platforms=['linux'], + iomgr_platform='uv', + labels=['portability', 'corelang'], + extra_args=extra_args, + inner_jobs=inner_jobs, + timeout_seconds=_CPP_RUNTESTS_TIMEOUT) + + return test_jobs def _allowed_labels(): - """Returns a list of existing job labels.""" - all_labels = set() - for job in _create_test_jobs() + _create_portability_test_jobs(): - for label in job.labels: - all_labels.add(label) - return sorted(all_labels) + """Returns a list of existing job labels.""" + all_labels = set() + for job in _create_test_jobs() + _create_portability_test_jobs(): + for label in job.labels: + all_labels.add(label) + return sorted(all_labels) def _runs_per_test_type(arg_str): - """Auxiliary function to parse the "runs_per_test" flag.""" - try: - n = int(arg_str) - if n <= 0: raise ValueError - return n - except: - msg = '\'{}\' is not a positive integer'.format(arg_str) - raise argparse.ArgumentTypeError(msg) + """Auxiliary function to parse the "runs_per_test" flag.""" + try: + n = int(arg_str) + if n <= 0: raise ValueError + return n + except: + msg = '\'{}\' is not a positive integer'.format(arg_str) + raise argparse.ArgumentTypeError(msg) if __name__ == "__main__": - argp = argparse.ArgumentParser(description='Run a matrix of run_tests.py tests.') - argp.add_argument('-j', '--jobs', - default=multiprocessing.cpu_count()/_DEFAULT_INNER_JOBS, - type=int, - help='Number of concurrent run_tests.py instances.') - argp.add_argument('-f', '--filter', - choices=_allowed_labels(), - nargs='+', - default=[], - help='Filter targets to run by label with AND semantics.') - argp.add_argument('--exclude', - choices=_allowed_labels(), - nargs='+', - default=[], - help='Exclude targets with any of given labels.') - argp.add_argument('--build_only', - default=False, - action='store_const', - const=True, - help='Pass --build_only flag to run_tests.py instances.') - argp.add_argument('--force_default_poller', default=False, action='store_const', const=True, - help='Pass --force_default_poller to run_tests.py instances.') - argp.add_argument('--dry_run', - default=False, - action='store_const', - const=True, - help='Only print what would be run.') - argp.add_argument('--filter_pr_tests', - default=False, - action='store_const', - const=True, - help='Filters out tests irrelevant to pull request changes.') - argp.add_argument('--base_branch', - default='origin/master', - type=str, - help='Branch that pull request is requesting to merge into') - argp.add_argument('--inner_jobs', - default=_DEFAULT_INNER_JOBS, - type=int, - help='Number of jobs in each run_tests.py instance') - argp.add_argument('-n', '--runs_per_test', default=1, type=_runs_per_test_type, - help='How many times to run each tests. >1 runs implies ' + - 'omitting passing test from the output & reports.') - argp.add_argument('--max_time', default=-1, type=int, - help='Maximum amount of time to run tests for' + - '(other tests will be skipped)') - argp.add_argument('--internal_ci', - default=False, - action='store_const', - const=True, - help='Put reports into subdirectories to improve presentation of ' - 'results by Internal CI.') - argp.add_argument('--bq_result_table', - default='', - type=str, - nargs='?', - help='Upload test results to a specified BQ table.') - args = argp.parse_args() - - if args.internal_ci: - _report_filename = _report_filename_internal_ci # override the function - - extra_args = [] - if args.build_only: - extra_args.append('--build_only') - if args.force_default_poller: - extra_args.append('--force_default_poller') - if args.runs_per_test > 1: - extra_args.append('-n') - extra_args.append('%s' % args.runs_per_test) - extra_args.append('--quiet_success') - if args.max_time > 0: - extra_args.extend(('--max_time', '%d' % args.max_time)) - if args.bq_result_table: - extra_args.append('--bq_result_table') - extra_args.append('%s' % args.bq_result_table) - extra_args.append('--measure_cpu_costs') - extra_args.append('--disable_auto_set_flakes') - - all_jobs = _create_test_jobs(extra_args=extra_args, inner_jobs=args.inner_jobs) + \ - _create_portability_test_jobs(extra_args=extra_args, inner_jobs=args.inner_jobs) - - jobs = [] - for job in all_jobs: - if not args.filter or all(filter in job.labels for filter in args.filter): - if not any(exclude_label in job.labels for exclude_label in args.exclude): - jobs.append(job) - - if not jobs: - jobset.message('FAILED', 'No test suites match given criteria.', - do_newline=True) - sys.exit(1) - - print('IMPORTANT: The changes you are testing need to be locally committed') - print('because only the committed changes in the current branch will be') - print('copied to the docker environment or into subworkspaces.') - - skipped_jobs = [] - - if args.filter_pr_tests: - print('Looking for irrelevant tests to skip...') - relevant_jobs = filter_tests(jobs, args.base_branch) - if len(relevant_jobs) == len(jobs): - print('No tests will be skipped.') - else: - print('These tests will be skipped:') - skipped_jobs = list(set(jobs) - set(relevant_jobs)) - # Sort by shortnames to make printing of skipped tests consistent - skipped_jobs.sort(key=lambda job: job.shortname) - for job in list(skipped_jobs): - print(' %s' % job.shortname) - jobs = relevant_jobs - - print('Will run these tests:') - for job in jobs: + argp = argparse.ArgumentParser( + description='Run a matrix of run_tests.py tests.') + argp.add_argument( + '-j', + '--jobs', + default=multiprocessing.cpu_count() / _DEFAULT_INNER_JOBS, + type=int, + help='Number of concurrent run_tests.py instances.') + argp.add_argument( + '-f', + '--filter', + choices=_allowed_labels(), + nargs='+', + default=[], + help='Filter targets to run by label with AND semantics.') + argp.add_argument( + '--exclude', + choices=_allowed_labels(), + nargs='+', + default=[], + help='Exclude targets with any of given labels.') + argp.add_argument( + '--build_only', + default=False, + action='store_const', + const=True, + help='Pass --build_only flag to run_tests.py instances.') + argp.add_argument( + '--force_default_poller', + default=False, + action='store_const', + const=True, + help='Pass --force_default_poller to run_tests.py instances.') + argp.add_argument( + '--dry_run', + default=False, + action='store_const', + const=True, + help='Only print what would be run.') + argp.add_argument( + '--filter_pr_tests', + default=False, + action='store_const', + const=True, + help='Filters out tests irrelevant to pull request changes.') + argp.add_argument( + '--base_branch', + default='origin/master', + type=str, + help='Branch that pull request is requesting to merge into') + argp.add_argument( + '--inner_jobs', + default=_DEFAULT_INNER_JOBS, + type=int, + help='Number of jobs in each run_tests.py instance') + argp.add_argument( + '-n', + '--runs_per_test', + default=1, + type=_runs_per_test_type, + help='How many times to run each tests. >1 runs implies ' + + 'omitting passing test from the output & reports.') + argp.add_argument( + '--max_time', + default=-1, + type=int, + help='Maximum amount of time to run tests for' + + '(other tests will be skipped)') + argp.add_argument( + '--internal_ci', + default=False, + action='store_const', + const=True, + help='Put reports into subdirectories to improve presentation of ' + 'results by Internal CI.') + argp.add_argument( + '--bq_result_table', + default='', + type=str, + nargs='?', + help='Upload test results to a specified BQ table.') + args = argp.parse_args() + + if args.internal_ci: + _report_filename = _report_filename_internal_ci # override the function + + extra_args = [] + if args.build_only: + extra_args.append('--build_only') + if args.force_default_poller: + extra_args.append('--force_default_poller') + if args.runs_per_test > 1: + extra_args.append('-n') + extra_args.append('%s' % args.runs_per_test) + extra_args.append('--quiet_success') + if args.max_time > 0: + extra_args.extend(('--max_time', '%d' % args.max_time)) + if args.bq_result_table: + extra_args.append('--bq_result_table') + extra_args.append('%s' % args.bq_result_table) + extra_args.append('--measure_cpu_costs') + extra_args.append('--disable_auto_set_flakes') + + all_jobs = _create_test_jobs(extra_args=extra_args, inner_jobs=args.inner_jobs) + \ + _create_portability_test_jobs(extra_args=extra_args, inner_jobs=args.inner_jobs) + + jobs = [] + for job in all_jobs: + if not args.filter or all(filter in job.labels + for filter in args.filter): + if not any(exclude_label in job.labels + for exclude_label in args.exclude): + jobs.append(job) + + if not jobs: + jobset.message( + 'FAILED', 'No test suites match given criteria.', do_newline=True) + sys.exit(1) + + print('IMPORTANT: The changes you are testing need to be locally committed') + print('because only the committed changes in the current branch will be') + print('copied to the docker environment or into subworkspaces.') + + skipped_jobs = [] + + if args.filter_pr_tests: + print('Looking for irrelevant tests to skip...') + relevant_jobs = filter_tests(jobs, args.base_branch) + if len(relevant_jobs) == len(jobs): + print('No tests will be skipped.') + else: + print('These tests will be skipped:') + skipped_jobs = list(set(jobs) - set(relevant_jobs)) + # Sort by shortnames to make printing of skipped tests consistent + skipped_jobs.sort(key=lambda job: job.shortname) + for job in list(skipped_jobs): + print(' %s' % job.shortname) + jobs = relevant_jobs + + print('Will run these tests:') + for job in jobs: + if args.dry_run: + print(' %s: "%s"' % (job.shortname, ' '.join(job.cmdline))) + else: + print(' %s' % job.shortname) + print + if args.dry_run: - print(' %s: "%s"' % (job.shortname, ' '.join(job.cmdline))) + print('--dry_run was used, exiting') + sys.exit(1) + + jobset.message('START', 'Running test matrix.', do_newline=True) + num_failures, resultset = jobset.run( + jobs, newline_on_success=True, travis=True, maxjobs=args.jobs) + # Merge skipped tests into results to show skipped tests on report.xml + if skipped_jobs: + ignored_num_skipped_failures, skipped_results = jobset.run( + skipped_jobs, skip_jobs=True) + resultset.update(skipped_results) + report_utils.render_junit_xml_report( + resultset, + _report_filename('aggregate_tests'), + suite_name='aggregate_tests') + + if num_failures == 0: + jobset.message( + 'SUCCESS', + 'All run_tests.py instance finished successfully.', + do_newline=True) else: - print(' %s' % job.shortname) - print - - if args.dry_run: - print('--dry_run was used, exiting') - sys.exit(1) - - jobset.message('START', 'Running test matrix.', do_newline=True) - num_failures, resultset = jobset.run(jobs, - newline_on_success=True, - travis=True, - maxjobs=args.jobs) - # Merge skipped tests into results to show skipped tests on report.xml - if skipped_jobs: - ignored_num_skipped_failures, skipped_results = jobset.run( - skipped_jobs, skip_jobs=True) - resultset.update(skipped_results) - report_utils.render_junit_xml_report(resultset, _report_filename('aggregate_tests'), - suite_name='aggregate_tests') - - if num_failures == 0: - jobset.message('SUCCESS', 'All run_tests.py instance finished successfully.', - do_newline=True) - else: - jobset.message('FAILED', 'Some run_tests.py instance have failed.', - do_newline=True) - sys.exit(1) + jobset.message( + 'FAILED', + 'Some run_tests.py instance have failed.', + do_newline=True) + sys.exit(1) diff --git a/tools/run_tests/start_port_server.py b/tools/run_tests/start_port_server.py index 362875036f4..0eeceb4ce95 100755 --- a/tools/run_tests/start_port_server.py +++ b/tools/run_tests/start_port_server.py @@ -13,7 +13,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """ Wrapper around port server starting code. diff --git a/tools/run_tests/task_runner.py b/tools/run_tests/task_runner.py index a065bb84cbe..794db6e1be0 100755 --- a/tools/run_tests/task_runner.py +++ b/tools/run_tests/task_runner.py @@ -12,7 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Runs selected gRPC test/build tasks.""" from __future__ import print_function @@ -32,52 +31,54 @@ _TARGETS += artifact_targets.targets() _TARGETS += distribtest_targets.targets() _TARGETS += package_targets.targets() + def _create_build_map(): - """Maps task names and labels to list of tasks to be built.""" - target_build_map = dict([(target.name, [target]) - for target in _TARGETS]) - if len(_TARGETS) > len(target_build_map.keys()): - raise Exception('Target names need to be unique') - - label_build_map = {} - label_build_map['all'] = [t for t in _TARGETS] # to build all targets - for target in _TARGETS: - for label in target.labels: - if label in label_build_map: - label_build_map[label].append(target) - else: - label_build_map[label] = [target] - - if set(target_build_map.keys()).intersection(label_build_map.keys()): - raise Exception('Target names need to be distinct from label names') - return dict( target_build_map.items() + label_build_map.items()) + """Maps task names and labels to list of tasks to be built.""" + target_build_map = dict([(target.name, [target]) for target in _TARGETS]) + if len(_TARGETS) > len(target_build_map.keys()): + raise Exception('Target names need to be unique') + + label_build_map = {} + label_build_map['all'] = [t for t in _TARGETS] # to build all targets + for target in _TARGETS: + for label in target.labels: + if label in label_build_map: + label_build_map[label].append(target) + else: + label_build_map[label] = [target] + + if set(target_build_map.keys()).intersection(label_build_map.keys()): + raise Exception('Target names need to be distinct from label names') + return dict(target_build_map.items() + label_build_map.items()) _BUILD_MAP = _create_build_map() argp = argparse.ArgumentParser(description='Runs build/test targets.') -argp.add_argument('-b', '--build', - choices=sorted(_BUILD_MAP.keys()), - nargs='+', - default=['all'], - help='Target name or target label to build.') -argp.add_argument('-f', '--filter', - choices=sorted(_BUILD_MAP.keys()), - nargs='+', - default=[], - help='Filter targets to build with AND semantics.') +argp.add_argument( + '-b', + '--build', + choices=sorted(_BUILD_MAP.keys()), + nargs='+', + default=['all'], + help='Target name or target label to build.') +argp.add_argument( + '-f', + '--filter', + choices=sorted(_BUILD_MAP.keys()), + nargs='+', + default=[], + help='Filter targets to build with AND semantics.') argp.add_argument('-j', '--jobs', default=multiprocessing.cpu_count(), type=int) -argp.add_argument('-t', '--travis', - default=False, - action='store_const', - const=True) +argp.add_argument( + '-t', '--travis', default=False, action='store_const', const=True) args = argp.parse_args() # Figure out which targets to build targets = [] for label in args.build: - targets += _BUILD_MAP[label] + targets += _BUILD_MAP[label] # Among targets selected by -b, filter out those that don't match the filter targets = [t for t in targets if all(f in t.labels for f in args.filter)] @@ -86,30 +87,29 @@ targets = sorted(set(targets)) # Execute pre-build phase prebuild_jobs = [] for target in targets: - prebuild_jobs += target.pre_build_jobspecs() + prebuild_jobs += target.pre_build_jobspecs() if prebuild_jobs: - num_failures, _ = jobset.run( - prebuild_jobs, newline_on_success=True, maxjobs=args.jobs) - if num_failures != 0: - jobset.message('FAILED', 'Pre-build phase failed.', do_newline=True) - sys.exit(1) + num_failures, _ = jobset.run( + prebuild_jobs, newline_on_success=True, maxjobs=args.jobs) + if num_failures != 0: + jobset.message('FAILED', 'Pre-build phase failed.', do_newline=True) + sys.exit(1) build_jobs = [] for target in targets: - build_jobs.append(target.build_jobspec()) + build_jobs.append(target.build_jobspec()) if not build_jobs: - print('Nothing to build.') - sys.exit(1) + print('Nothing to build.') + sys.exit(1) jobset.message('START', 'Building targets.', do_newline=True) num_failures, resultset = jobset.run( build_jobs, newline_on_success=True, maxjobs=args.jobs) -report_utils.render_junit_xml_report(resultset, 'report_taskrunner_sponge_log.xml', - suite_name='tasks') +report_utils.render_junit_xml_report( + resultset, 'report_taskrunner_sponge_log.xml', suite_name='tasks') if num_failures == 0: - jobset.message('SUCCESS', 'All targets built successfully.', - do_newline=True) + jobset.message( + 'SUCCESS', 'All targets built successfully.', do_newline=True) else: - jobset.message('FAILED', 'Failed to build targets.', - do_newline=True) - sys.exit(1) + jobset.message('FAILED', 'Failed to build targets.', do_newline=True) + sys.exit(1) From 5f8bf79bbf4915b928f75c83c66592b1fa97657e Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 11 Dec 2017 18:09:31 -0800 Subject: [PATCH 113/127] yapf tools --- tools/debug/core/chttp2_ref_leak.py | 22 +- tools/debug/core/error_ref_leak.py | 34 +-- tools/distrib/yapf_code.sh | 7 +- tools/flakes/detect_flakes.py | 88 ++++---- tools/gcp/utils/big_query_utils.py | 276 ++++++++++++----------- tools/github/pr_latency.py | 211 ++++++++++------- tools/line_count/collect-history.py | 25 ++- tools/line_count/summarize-history.py | 17 +- tools/line_count/yaml2csv.py | 25 ++- tools/mkowners/mkowners.py | 312 +++++++++++++------------- 10 files changed, 548 insertions(+), 469 deletions(-) diff --git a/tools/debug/core/chttp2_ref_leak.py b/tools/debug/core/chttp2_ref_leak.py index d693dd9e540..a6a54487750 100755 --- a/tools/debug/core/chttp2_ref_leak.py +++ b/tools/debug/core/chttp2_ref_leak.py @@ -20,8 +20,10 @@ import collections import sys import re + def new_obj(): - return ['destroy'] + return ['destroy'] + outstanding = collections.defaultdict(new_obj) @@ -29,14 +31,14 @@ outstanding = collections.defaultdict(new_obj) # chttp2:unref:0x629000005200 2->1 destroy [src/core/ext/transport/chttp2/transport/chttp2_transport.c:599] for line in sys.stdin: - m = re.search(r'chttp2:( ref|unref):0x([a-fA-F0-9]+) [^ ]+ ([^[]+) \[(.*)\]', line) - if m: - if m.group(1) == ' ref': - outstanding[m.group(2)].append(m.group(3)) - else: - outstanding[m.group(2)].remove(m.group(3)) + m = re.search( + r'chttp2:( ref|unref):0x([a-fA-F0-9]+) [^ ]+ ([^[]+) \[(.*)\]', line) + if m: + if m.group(1) == ' ref': + outstanding[m.group(2)].append(m.group(3)) + else: + outstanding[m.group(2)].remove(m.group(3)) for obj, remaining in outstanding.items(): - if remaining: - print 'LEAKED: %s %r' % (obj, remaining) - + if remaining: + print 'LEAKED: %s %r' % (obj, remaining) diff --git a/tools/debug/core/error_ref_leak.py b/tools/debug/core/error_ref_leak.py index 6582328a5b8..78063386836 100644 --- a/tools/debug/core/error_ref_leak.py +++ b/tools/debug/core/error_ref_leak.py @@ -26,22 +26,22 @@ data = sys.stdin.readlines() errs = [] for line in data: - # if we care about the line - if re.search(r'error.cc', line): - # str manip to cut off left part of log line - line = line.partition('error.cc:')[-1] - line = re.sub(r'\d+] ', r'', line) - line = line.strip().split() - err = line[0].strip(":") - if line[1] == "create": - assert(err not in errs) - errs.append(err) - elif line[0] == "realloc": - errs.remove(line[1]) - errs.append(line[3]) - # explicitly look for the last dereference - elif line[1] == "1" and line[3] == "0": - assert(err in errs) - errs.remove(err) + # if we care about the line + if re.search(r'error.cc', line): + # str manip to cut off left part of log line + line = line.partition('error.cc:')[-1] + line = re.sub(r'\d+] ', r'', line) + line = line.strip().split() + err = line[0].strip(":") + if line[1] == "create": + assert (err not in errs) + errs.append(err) + elif line[0] == "realloc": + errs.remove(line[1]) + errs.append(line[3]) + # explicitly look for the last dereference + elif line[1] == "1" and line[3] == "0": + assert (err in errs) + errs.remove(err) print "leaked:", errs diff --git a/tools/distrib/yapf_code.sh b/tools/distrib/yapf_code.sh index 698c341d888..85a45b6a11c 100755 --- a/tools/distrib/yapf_code.sh +++ b/tools/distrib/yapf_code.sh @@ -20,12 +20,7 @@ cd "$(dirname "${0}")/../.." DIRS=( 'src/python' - 'tools/buildgen' - 'tools/codegen' - 'tools/distrib' - 'tools/interop_matrix' - 'tools/profiling' - 'tools/run_tests' + 'tools' ) EXCLUSIONS=( 'grpcio/grpc_*.py' diff --git a/tools/flakes/detect_flakes.py b/tools/flakes/detect_flakes.py index c5c7f61771d..b066ee61393 100644 --- a/tools/flakes/detect_flakes.py +++ b/tools/flakes/detect_flakes.py @@ -12,7 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Detect new flakes introduced in the last 24h hours with respect to the previous six days""" @@ -32,26 +31,29 @@ sys.path.append(gcp_utils_dir) import big_query_utils + def print_table(table): kokoro_base_url = 'https://kokoro.corp.google.com/job/' for k, v in table.items(): - job_name = v[0] - build_id = v[1] - ts = int(float(v[2])) - # TODO(dgq): timezone handling is wrong. We need to determine the timezone - # of the computer running this script. - human_ts = datetime.datetime.utcfromtimestamp(ts).strftime('%Y-%m-%d %H:%M:%S PDT') - job_path = '{}/{}'.format('/job/'.join(job_name.split('/')), build_id) - full_kokoro_url = kokoro_base_url + job_path - print("Test: {}, Timestamp: {}, url: {}\n".format(k, human_ts, full_kokoro_url)) + job_name = v[0] + build_id = v[1] + ts = int(float(v[2])) + # TODO(dgq): timezone handling is wrong. We need to determine the timezone + # of the computer running this script. + human_ts = datetime.datetime.utcfromtimestamp(ts).strftime( + '%Y-%m-%d %H:%M:%S PDT') + job_path = '{}/{}'.format('/job/'.join(job_name.split('/')), build_id) + full_kokoro_url = kokoro_base_url + job_path + print("Test: {}, Timestamp: {}, url: {}\n".format(k, human_ts, + full_kokoro_url)) def get_flaky_tests(days_lower_bound, days_upper_bound, limit=None): - """ period is one of "WEEK", "DAY", etc. + """ period is one of "WEEK", "DAY", etc. (see https://cloud.google.com/bigquery/docs/reference/standard-sql/functions-and-operators#date_add). """ - bq = big_query_utils.create_big_query() - query = """ + bq = big_query_utils.create_big_query() + query = """ SELECT REGEXP_REPLACE(test_name, r'/\d+', '') AS filtered_test_name, job_name, @@ -65,41 +67,45 @@ WHERE AND NOT REGEXP_MATCH(job_name, '.*portability.*') AND result != 'PASSED' AND result != 'SKIPPED' ORDER BY timestamp desc -""".format(days_lower_bound=days_lower_bound, days_upper_bound=days_upper_bound) - if limit: - query += '\n LIMIT {}'.format(limit) - query_job = big_query_utils.sync_query_job(bq, 'grpc-testing', query) - page = bq.jobs().getQueryResults( - pageToken=None, **query_job['jobReference']).execute(num_retries=3) - rows = page.get('rows') - if rows: - return {row['f'][0]['v']: +""".format( + days_lower_bound=days_lower_bound, days_upper_bound=days_upper_bound) + if limit: + query += '\n LIMIT {}'.format(limit) + query_job = big_query_utils.sync_query_job(bq, 'grpc-testing', query) + page = bq.jobs().getQueryResults( + pageToken=None, **query_job['jobReference']).execute(num_retries=3) + rows = page.get('rows') + if rows: + return { + row['f'][0]['v']: (row['f'][1]['v'], row['f'][2]['v'], row['f'][3]['v']) - for row in rows} - else: - return {} + for row in rows + } + else: + return {} def get_new_flakes(): - last_week_sans_yesterday = get_flaky_tests(-14, -1) - last_24 = get_flaky_tests(0, +1) - last_week_sans_yesterday_names = set(last_week_sans_yesterday.keys()) - last_24_names = set(last_24.keys()) - logging.debug('|last_week_sans_yesterday| =', len(last_week_sans_yesterday_names)) - logging.debug('|last_24_names| =', len(last_24_names)) - new_flakes = last_24_names - last_week_sans_yesterday_names - logging.debug('|new_flakes| = ', len(new_flakes)) - return {k: last_24[k] for k in new_flakes} + last_week_sans_yesterday = get_flaky_tests(-14, -1) + last_24 = get_flaky_tests(0, +1) + last_week_sans_yesterday_names = set(last_week_sans_yesterday.keys()) + last_24_names = set(last_24.keys()) + logging.debug('|last_week_sans_yesterday| =', + len(last_week_sans_yesterday_names)) + logging.debug('|last_24_names| =', len(last_24_names)) + new_flakes = last_24_names - last_week_sans_yesterday_names + logging.debug('|new_flakes| = ', len(new_flakes)) + return {k: last_24[k] for k in new_flakes} def main(): - new_flakes = get_new_flakes() - if new_flakes: - print("Found {} new flakes:".format(len(new_flakes))) - print_table(new_flakes) - else: - print("No new flakes found!") + new_flakes = get_new_flakes() + if new_flakes: + print("Found {} new flakes:".format(len(new_flakes))) + print_table(new_flakes) + else: + print("No new flakes found!") if __name__ == '__main__': - main() + main() diff --git a/tools/gcp/utils/big_query_utils.py b/tools/gcp/utils/big_query_utils.py index 77a5f5691e9..3e811ca2bfb 100755 --- a/tools/gcp/utils/big_query_utils.py +++ b/tools/gcp/utils/big_query_utils.py @@ -28,154 +28,174 @@ NUM_RETRIES = 3 def create_big_query(): - """Authenticates with cloud platform and gets a BiqQuery service object + """Authenticates with cloud platform and gets a BiqQuery service object """ - creds = GoogleCredentials.get_application_default() - return discovery.build('bigquery', 'v2', credentials=creds, cache_discovery=False) + creds = GoogleCredentials.get_application_default() + return discovery.build( + 'bigquery', 'v2', credentials=creds, cache_discovery=False) def create_dataset(biq_query, project_id, dataset_id): - is_success = True - body = { - 'datasetReference': { - 'projectId': project_id, - 'datasetId': dataset_id - } - } - - try: - dataset_req = biq_query.datasets().insert(projectId=project_id, body=body) - dataset_req.execute(num_retries=NUM_RETRIES) - except HttpError as http_error: - if http_error.resp.status == 409: - print 'Warning: The dataset %s already exists' % dataset_id - else: - # Note: For more debugging info, print "http_error.content" - print 'Error in creating dataset: %s. Err: %s' % (dataset_id, http_error) - is_success = False - return is_success + is_success = True + body = { + 'datasetReference': { + 'projectId': project_id, + 'datasetId': dataset_id + } + } + + try: + dataset_req = biq_query.datasets().insert( + projectId=project_id, body=body) + dataset_req.execute(num_retries=NUM_RETRIES) + except HttpError as http_error: + if http_error.resp.status == 409: + print 'Warning: The dataset %s already exists' % dataset_id + else: + # Note: For more debugging info, print "http_error.content" + print 'Error in creating dataset: %s. Err: %s' % (dataset_id, + http_error) + is_success = False + return is_success def create_table(big_query, project_id, dataset_id, table_id, table_schema, description): - fields = [{'name': field_name, - 'type': field_type, - 'description': field_description - } for (field_name, field_type, field_description) in table_schema] - return create_table2(big_query, project_id, dataset_id, table_id, - fields, description) - - -def create_partitioned_table(big_query, project_id, dataset_id, table_id, table_schema, - description, partition_type='DAY', expiration_ms=_EXPIRATION_MS): - """Creates a partitioned table. By default, a date-paritioned table is created with + fields = [{ + 'name': field_name, + 'type': field_type, + 'description': field_description + } for (field_name, field_type, field_description) in table_schema] + return create_table2(big_query, project_id, dataset_id, table_id, fields, + description) + + +def create_partitioned_table(big_query, + project_id, + dataset_id, + table_id, + table_schema, + description, + partition_type='DAY', + expiration_ms=_EXPIRATION_MS): + """Creates a partitioned table. By default, a date-paritioned table is created with each partition lasting 30 days after it was last modified. """ - fields = [{'name': field_name, - 'type': field_type, - 'description': field_description - } for (field_name, field_type, field_description) in table_schema] - return create_table2(big_query, project_id, dataset_id, table_id, - fields, description, partition_type, expiration_ms) - - -def create_table2(big_query, project_id, dataset_id, table_id, fields_schema, - description, partition_type=None, expiration_ms=None): - is_success = True - - body = { - 'description': description, - 'schema': { - 'fields': fields_schema - }, - 'tableReference': { - 'datasetId': dataset_id, - 'projectId': project_id, - 'tableId': table_id - } - } - - if partition_type and expiration_ms: - body["timePartitioning"] = { - "type": partition_type, - "expirationMs": expiration_ms + fields = [{ + 'name': field_name, + 'type': field_type, + 'description': field_description + } for (field_name, field_type, field_description) in table_schema] + return create_table2(big_query, project_id, dataset_id, table_id, fields, + description, partition_type, expiration_ms) + + +def create_table2(big_query, + project_id, + dataset_id, + table_id, + fields_schema, + description, + partition_type=None, + expiration_ms=None): + is_success = True + + body = { + 'description': description, + 'schema': { + 'fields': fields_schema + }, + 'tableReference': { + 'datasetId': dataset_id, + 'projectId': project_id, + 'tableId': table_id + } } - try: - table_req = big_query.tables().insert(projectId=project_id, - datasetId=dataset_id, - body=body) - res = table_req.execute(num_retries=NUM_RETRIES) - print 'Successfully created %s "%s"' % (res['kind'], res['id']) - except HttpError as http_error: - if http_error.resp.status == 409: - print 'Warning: Table %s already exists' % table_id - else: - print 'Error in creating table: %s. Err: %s' % (table_id, http_error) - is_success = False - return is_success + if partition_type and expiration_ms: + body["timePartitioning"] = { + "type": partition_type, + "expirationMs": expiration_ms + } + + try: + table_req = big_query.tables().insert( + projectId=project_id, datasetId=dataset_id, body=body) + res = table_req.execute(num_retries=NUM_RETRIES) + print 'Successfully created %s "%s"' % (res['kind'], res['id']) + except HttpError as http_error: + if http_error.resp.status == 409: + print 'Warning: Table %s already exists' % table_id + else: + print 'Error in creating table: %s. Err: %s' % (table_id, + http_error) + is_success = False + return is_success def patch_table(big_query, project_id, dataset_id, table_id, fields_schema): - is_success = True - - body = { - 'schema': { - 'fields': fields_schema - }, - 'tableReference': { - 'datasetId': dataset_id, - 'projectId': project_id, - 'tableId': table_id - } - } - - try: - table_req = big_query.tables().patch(projectId=project_id, - datasetId=dataset_id, - tableId=table_id, - body=body) - res = table_req.execute(num_retries=NUM_RETRIES) - print 'Successfully patched %s "%s"' % (res['kind'], res['id']) - except HttpError as http_error: - print 'Error in creating table: %s. Err: %s' % (table_id, http_error) - is_success = False - return is_success + is_success = True + + body = { + 'schema': { + 'fields': fields_schema + }, + 'tableReference': { + 'datasetId': dataset_id, + 'projectId': project_id, + 'tableId': table_id + } + } + + try: + table_req = big_query.tables().patch( + projectId=project_id, + datasetId=dataset_id, + tableId=table_id, + body=body) + res = table_req.execute(num_retries=NUM_RETRIES) + print 'Successfully patched %s "%s"' % (res['kind'], res['id']) + except HttpError as http_error: + print 'Error in creating table: %s. Err: %s' % (table_id, http_error) + is_success = False + return is_success def insert_rows(big_query, project_id, dataset_id, table_id, rows_list): - is_success = True - body = {'rows': rows_list} - try: - insert_req = big_query.tabledata().insertAll(projectId=project_id, - datasetId=dataset_id, - tableId=table_id, - body=body) - res = insert_req.execute(num_retries=NUM_RETRIES) - if res.get('insertErrors', None): - print 'Error inserting rows! Response: %s' % res - is_success = False - except HttpError as http_error: - print 'Error inserting rows to the table %s' % table_id - is_success = False - - return is_success + is_success = True + body = {'rows': rows_list} + try: + insert_req = big_query.tabledata().insertAll( + projectId=project_id, + datasetId=dataset_id, + tableId=table_id, + body=body) + res = insert_req.execute(num_retries=NUM_RETRIES) + if res.get('insertErrors', None): + print 'Error inserting rows! Response: %s' % res + is_success = False + except HttpError as http_error: + print 'Error inserting rows to the table %s' % table_id + is_success = False + + return is_success def sync_query_job(big_query, project_id, query, timeout=5000): - query_data = {'query': query, 'timeoutMs': timeout} - query_job = None - try: - query_job = big_query.jobs().query( - projectId=project_id, - body=query_data).execute(num_retries=NUM_RETRIES) - except HttpError as http_error: - print 'Query execute job failed with error: %s' % http_error - print http_error.content - return query_job - - # List of (column name, column type, description) tuples + query_data = {'query': query, 'timeoutMs': timeout} + query_job = None + try: + query_job = big_query.jobs().query( + projectId=project_id, + body=query_data).execute(num_retries=NUM_RETRIES) + except HttpError as http_error: + print 'Query execute job failed with error: %s' % http_error + print http_error.content + return query_job + + + # List of (column name, column type, description) tuples def make_row(unique_row_id, row_values_dict): - """row_values_dict is a dictionary of column name and column value. + """row_values_dict is a dictionary of column name and column value. """ - return {'insertId': unique_row_id, 'json': row_values_dict} + return {'insertId': unique_row_id, 'json': row_values_dict} diff --git a/tools/github/pr_latency.py b/tools/github/pr_latency.py index 5d635835e54..0131e60bbc2 100644 --- a/tools/github/pr_latency.py +++ b/tools/github/pr_latency.py @@ -12,7 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Measure the time between PR creation and completion of all tests. You'll need a github API token to avoid being rate-limited. See @@ -46,118 +45,156 @@ COMMITS = 'https://api.github.com/repos/grpc/grpc/pulls/{pr_number}/commits' def gh(url): - request = urllib2.Request(url) - if TOKEN: - request.add_header('Authorization', 'token {}'.format(TOKEN)) - response = urllib2.urlopen(request) - return response.read() + request = urllib2.Request(url) + if TOKEN: + request.add_header('Authorization', 'token {}'.format(TOKEN)) + response = urllib2.urlopen(request) + return response.read() def print_csv_header(): - print('pr,base_time,test_time,latency_seconds,successes,failures,errors') - - -def output(pr, base_time, test_time, diff_time, successes, failures, errors, mode='human'): - if mode == 'human': - print("PR #{} base time: {} UTC, Tests completed at: {} UTC. Latency: {}." - "\n\tSuccesses: {}, Failures: {}, Errors: {}".format( - pr, base_time, test_time, diff_time, successes, failures, errors)) - elif mode == 'csv': - print(','.join([str(pr), str(base_time), - str(test_time), str(int((test_time-base_time).total_seconds())), - str(successes), str(failures), str(errors)])) + print('pr,base_time,test_time,latency_seconds,successes,failures,errors') + + +def output(pr, + base_time, + test_time, + diff_time, + successes, + failures, + errors, + mode='human'): + if mode == 'human': + print( + "PR #{} base time: {} UTC, Tests completed at: {} UTC. Latency: {}." + "\n\tSuccesses: {}, Failures: {}, Errors: {}".format( + pr, base_time, test_time, diff_time, successes, failures, + errors)) + elif mode == 'csv': + print(','.join([ + str(pr), str(base_time), str(test_time), str( + int((test_time - base_time).total_seconds())), str(successes), + str(failures), str(errors) + ])) def parse_timestamp(datetime_str): - return datetime.strptime(datetime_str, '%Y-%m-%dT%H:%M:%SZ') + return datetime.strptime(datetime_str, '%Y-%m-%dT%H:%M:%SZ') def to_posix_timestamp(dt): - return str((dt - datetime(1970, 1, 1)).total_seconds()) + return str((dt - datetime(1970, 1, 1)).total_seconds()) def get_pr_data(): - latest_prs = json.loads(gh(PRS)) - res = [{'number': pr['number'], - 'created_at': parse_timestamp(pr['created_at']), - 'updated_at': parse_timestamp(pr['updated_at']), - 'statuses_url': pr['statuses_url']} - for pr in latest_prs] - return res + latest_prs = json.loads(gh(PRS)) + res = [{ + 'number': pr['number'], + 'created_at': parse_timestamp(pr['created_at']), + 'updated_at': parse_timestamp(pr['updated_at']), + 'statuses_url': pr['statuses_url'] + } for pr in latest_prs] + return res def get_commits_data(pr_number): - commits = json.loads(gh(COMMITS.format(pr_number=pr_number))) - return {'num_commits': len(commits), - 'most_recent_date': parse_timestamp(commits[-1]['commit']['author']['date'])} + commits = json.loads(gh(COMMITS.format(pr_number=pr_number))) + return { + 'num_commits': len(commits), + 'most_recent_date': + parse_timestamp(commits[-1]['commit']['author']['date']) + } def get_status_data(statuses_url, system): - status_url = statuses_url.replace('statuses', 'status') - statuses = json.loads(gh(status_url + '?per_page=100')) - successes = 0 - failures = 0 - errors = 0 - latest_datetime = None - if not statuses: return None - if system == 'kokoro': string_in_target_url = 'kokoro' - elif system == 'jenkins': string_in_target_url = 'grpc-testing' - for status in statuses['statuses']: - if not status['target_url'] or string_in_target_url not in status['target_url']: continue # Ignore jenkins - if status['state'] == 'pending': return None - elif status['state'] == 'success': successes += 1 - elif status['state'] == 'failure': failures += 1 - elif status['state'] == 'error': errors += 1 - if not latest_datetime: - latest_datetime = parse_timestamp(status['updated_at']) - else: - latest_datetime = max(latest_datetime, parse_timestamp(status['updated_at'])) - # First status is the most recent one. - if any([successes, failures, errors]) and sum([successes, failures, errors]) > 15: - return {'latest_datetime': latest_datetime, + status_url = statuses_url.replace('statuses', 'status') + statuses = json.loads(gh(status_url + '?per_page=100')) + successes = 0 + failures = 0 + errors = 0 + latest_datetime = None + if not statuses: return None + if system == 'kokoro': string_in_target_url = 'kokoro' + elif system == 'jenkins': string_in_target_url = 'grpc-testing' + for status in statuses['statuses']: + if not status['target_url'] or string_in_target_url not in status[ + 'target_url']: + continue # Ignore jenkins + if status['state'] == 'pending': return None + elif status['state'] == 'success': successes += 1 + elif status['state'] == 'failure': failures += 1 + elif status['state'] == 'error': errors += 1 + if not latest_datetime: + latest_datetime = parse_timestamp(status['updated_at']) + else: + latest_datetime = max(latest_datetime, + parse_timestamp(status['updated_at'])) + # First status is the most recent one. + if any([successes, failures, errors]) and sum( + [successes, failures, errors]) > 15: + return { + 'latest_datetime': latest_datetime, 'successes': successes, 'failures': failures, - 'errors': errors} - else: return None + 'errors': errors + } + else: + return None def build_args_parser(): - import argparse - parser = argparse.ArgumentParser() - parser.add_argument('--format', type=str, choices=['human', 'csv'], - default='human', - help='Output format: are you a human or a machine?') - parser.add_argument('--system', type=str, choices=['jenkins', 'kokoro'], - required=True, help='Consider only the given CI system') - parser.add_argument('--token', type=str, default='', - help='GitHub token to use its API with a higher rate limit') - return parser + import argparse + parser = argparse.ArgumentParser() + parser.add_argument( + '--format', + type=str, + choices=['human', 'csv'], + default='human', + help='Output format: are you a human or a machine?') + parser.add_argument( + '--system', + type=str, + choices=['jenkins', 'kokoro'], + required=True, + help='Consider only the given CI system') + parser.add_argument( + '--token', + type=str, + default='', + help='GitHub token to use its API with a higher rate limit') + return parser def main(): - import sys - global TOKEN - args_parser = build_args_parser() - args = args_parser.parse_args() - TOKEN = args.token - if args.format == 'csv': print_csv_header() - for pr_data in get_pr_data(): - commit_data = get_commits_data(pr_data['number']) - # PR with a single commit -> use the PRs creation time. - # else -> use the latest commit's date. - base_timestamp = pr_data['updated_at'] - if commit_data['num_commits'] > 1: - base_timestamp = commit_data['most_recent_date'] - else: - base_timestamp = pr_data['created_at'] - last_status = get_status_data(pr_data['statuses_url'], args.system) - if last_status: - diff = last_status['latest_datetime'] - base_timestamp - if diff < timedelta(hours=5): - output(pr_data['number'], base_timestamp, last_status['latest_datetime'], - diff, last_status['successes'], last_status['failures'], - last_status['errors'], mode=args.format) + import sys + global TOKEN + args_parser = build_args_parser() + args = args_parser.parse_args() + TOKEN = args.token + if args.format == 'csv': print_csv_header() + for pr_data in get_pr_data(): + commit_data = get_commits_data(pr_data['number']) + # PR with a single commit -> use the PRs creation time. + # else -> use the latest commit's date. + base_timestamp = pr_data['updated_at'] + if commit_data['num_commits'] > 1: + base_timestamp = commit_data['most_recent_date'] + else: + base_timestamp = pr_data['created_at'] + last_status = get_status_data(pr_data['statuses_url'], args.system) + if last_status: + diff = last_status['latest_datetime'] - base_timestamp + if diff < timedelta(hours=5): + output( + pr_data['number'], + base_timestamp, + last_status['latest_datetime'], + diff, + last_status['successes'], + last_status['failures'], + last_status['errors'], + mode=args.format) if __name__ == '__main__': - main() + main() diff --git a/tools/line_count/collect-history.py b/tools/line_count/collect-history.py index 3f030fbb8fe..d2d5c95705d 100755 --- a/tools/line_count/collect-history.py +++ b/tools/line_count/collect-history.py @@ -19,20 +19,23 @@ import datetime # this script is only of historical interest: it's the script that was used to # bootstrap the dataset + def daterange(start, end): - for n in range(int((end - start).days)): - yield start + datetime.timedelta(n) + for n in range(int((end - start).days)): + yield start + datetime.timedelta(n) + start_date = datetime.date(2017, 3, 26) end_date = datetime.date(2017, 3, 29) for dt in daterange(start_date, end_date): - dmy = dt.strftime('%Y-%m-%d') - sha1 = subprocess.check_output(['git', 'rev-list', '-n', '1', - '--before=%s' % dmy, - 'master']).strip() - subprocess.check_call(['git', 'checkout', sha1]) - subprocess.check_call(['git', 'submodule', 'update']) - subprocess.check_call(['git', 'clean', '-f', '-x', '-d']) - subprocess.check_call(['cloc', '--vcs=git', '--by-file', '--yaml', '--out=../count/%s.yaml' % dmy, '.']) - + dmy = dt.strftime('%Y-%m-%d') + sha1 = subprocess.check_output( + ['git', 'rev-list', '-n', '1', '--before=%s' % dmy, 'master']).strip() + subprocess.check_call(['git', 'checkout', sha1]) + subprocess.check_call(['git', 'submodule', 'update']) + subprocess.check_call(['git', 'clean', '-f', '-x', '-d']) + subprocess.check_call([ + 'cloc', '--vcs=git', '--by-file', '--yaml', + '--out=../count/%s.yaml' % dmy, '.' + ]) diff --git a/tools/line_count/summarize-history.py b/tools/line_count/summarize-history.py index d2ef7ec3248..80b0ed7a7e8 100755 --- a/tools/line_count/summarize-history.py +++ b/tools/line_count/summarize-history.py @@ -13,22 +13,25 @@ # See the License for the specific language governing permissions and # limitations under the License. - import subprocess import datetime # this script is only of historical interest: it's the script that was used to # bootstrap the dataset + def daterange(start, end): - for n in range(int((end - start).days)): - yield start + datetime.timedelta(n) + for n in range(int((end - start).days)): + yield start + datetime.timedelta(n) + start_date = datetime.date(2017, 3, 26) end_date = datetime.date(2017, 3, 29) for dt in daterange(start_date, end_date): - dmy = dt.strftime('%Y-%m-%d') - print dmy - subprocess.check_call(['tools/line_count/yaml2csv.py', '-i', '../count/%s.yaml' % dmy, '-d', dmy, '-o', '../count/%s.csv' % dmy]) - + dmy = dt.strftime('%Y-%m-%d') + print dmy + subprocess.check_call([ + 'tools/line_count/yaml2csv.py', '-i', '../count/%s.yaml' % dmy, '-d', + dmy, '-o', '../count/%s.csv' % dmy + ]) diff --git a/tools/line_count/yaml2csv.py b/tools/line_count/yaml2csv.py index 2a38a12c809..dd2e92b360a 100755 --- a/tools/line_count/yaml2csv.py +++ b/tools/line_count/yaml2csv.py @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. - import yaml import argparse import datetime @@ -21,18 +20,22 @@ import csv argp = argparse.ArgumentParser(description='Convert cloc yaml to bigquery csv') argp.add_argument('-i', '--input', type=str) -argp.add_argument('-d', '--date', type=str, default=datetime.date.today().strftime('%Y-%m-%d')) +argp.add_argument( + '-d', + '--date', + type=str, + default=datetime.date.today().strftime('%Y-%m-%d')) argp.add_argument('-o', '--output', type=str, default='out.csv') args = argp.parse_args() data = yaml.load(open(args.input).read()) with open(args.output, 'w') as outf: - writer = csv.DictWriter(outf, ['date', 'name', 'language', 'code', 'comment', 'blank']) - for key, value in data.iteritems(): - if key == 'header': continue - if key == 'SUM': continue - if key.startswith('third_party/'): continue - row = {'name': key, 'date': args.date} - row.update(value) - writer.writerow(row) - + writer = csv.DictWriter( + outf, ['date', 'name', 'language', 'code', 'comment', 'blank']) + for key, value in data.iteritems(): + if key == 'header': continue + if key == 'SUM': continue + if key.startswith('third_party/'): continue + row = {'name': key, 'date': args.date} + row.update(value) + writer.writerow(row) diff --git a/tools/mkowners/mkowners.py b/tools/mkowners/mkowners.py index e0ad998bdc7..d8b3d3c3326 100755 --- a/tools/mkowners/mkowners.py +++ b/tools/mkowners/mkowners.py @@ -24,10 +24,8 @@ import subprocess # Find the root of the git tree # -git_root = (subprocess - .check_output(['git', 'rev-parse', '--show-toplevel']) - .decode('utf-8') - .strip()) +git_root = (subprocess.check_output(['git', 'rev-parse', '--show-toplevel']) + .decode('utf-8').strip()) # # Parse command line arguments @@ -36,19 +34,22 @@ git_root = (subprocess default_out = os.path.join(git_root, '.github', 'CODEOWNERS') argp = argparse.ArgumentParser('Generate .github/CODEOWNERS file') -argp.add_argument('--out', '-o', - type=str, - default=default_out, - help='Output file (default %s)' % default_out) +argp.add_argument( + '--out', + '-o', + type=str, + default=default_out, + help='Output file (default %s)' % default_out) args = argp.parse_args() # # Walk git tree to locate all OWNERS files # -owners_files = [os.path.join(root, 'OWNERS') - for root, dirs, files in os.walk(git_root) - if 'OWNERS' in files] +owners_files = [ + os.path.join(root, 'OWNERS') for root, dirs, files in os.walk(git_root) + if 'OWNERS' in files +] # # Parse owners files @@ -57,39 +58,40 @@ owners_files = [os.path.join(root, 'OWNERS') Owners = collections.namedtuple('Owners', 'parent directives dir') Directive = collections.namedtuple('Directive', 'who globs') + def parse_owners(filename): - with open(filename) as f: - src = f.read().splitlines() - parent = True - directives = [] - for line in src: - line = line.strip() - # line := directive | comment - if not line: continue - if line[0] == '#': continue - # it's a directive - directive = None - if line == 'set noparent': - parent = False - elif line == '*': - directive = Directive(who='*', globs=[]) - elif ' ' in line: - (who, globs) = line.split(' ', 1) - globs_list = [glob - for glob in globs.split(' ') - if glob] - directive = Directive(who=who, globs=globs_list) - else: - directive = Directive(who=line, globs=[]) - if directive: - directives.append(directive) - return Owners(parent=parent, - directives=directives, - dir=os.path.relpath(os.path.dirname(filename), git_root)) - -owners_data = sorted([parse_owners(filename) - for filename in owners_files], - key=operator.attrgetter('dir')) + with open(filename) as f: + src = f.read().splitlines() + parent = True + directives = [] + for line in src: + line = line.strip() + # line := directive | comment + if not line: continue + if line[0] == '#': continue + # it's a directive + directive = None + if line == 'set noparent': + parent = False + elif line == '*': + directive = Directive(who='*', globs=[]) + elif ' ' in line: + (who, globs) = line.split(' ', 1) + globs_list = [glob for glob in globs.split(' ') if glob] + directive = Directive(who=who, globs=globs_list) + else: + directive = Directive(who=line, globs=[]) + if directive: + directives.append(directive) + return Owners( + parent=parent, + directives=directives, + dir=os.path.relpath(os.path.dirname(filename), git_root)) + + +owners_data = sorted( + [parse_owners(filename) for filename in owners_files], + key=operator.attrgetter('dir')) # # Modify owners so that parented OWNERS files point to the actual @@ -98,24 +100,24 @@ owners_data = sorted([parse_owners(filename) new_owners_data = [] for owners in owners_data: - if owners.parent == True: - best_parent = None - best_parent_score = None - for possible_parent in owners_data: - if possible_parent is owners: continue - rel = os.path.relpath(owners.dir, possible_parent.dir) - # '..' ==> we had to walk up from possible_parent to get to owners - # ==> not a parent - if '..' in rel: continue - depth = len(rel.split(os.sep)) - if not best_parent or depth < best_parent_score: - best_parent = possible_parent - best_parent_score = depth - if best_parent: - owners = owners._replace(parent = best_parent.dir) - else: - owners = owners._replace(parent = None) - new_owners_data.append(owners) + if owners.parent == True: + best_parent = None + best_parent_score = None + for possible_parent in owners_data: + if possible_parent is owners: continue + rel = os.path.relpath(owners.dir, possible_parent.dir) + # '..' ==> we had to walk up from possible_parent to get to owners + # ==> not a parent + if '..' in rel: continue + depth = len(rel.split(os.sep)) + if not best_parent or depth < best_parent_score: + best_parent = possible_parent + best_parent_score = depth + if best_parent: + owners = owners._replace(parent=best_parent.dir) + else: + owners = owners._replace(parent=None) + new_owners_data.append(owners) owners_data = new_owners_data # @@ -123,106 +125,114 @@ owners_data = new_owners_data # a CODEOWNERS file for GitHub # + def full_dir(rules_dir, sub_path): - return os.path.join(rules_dir, sub_path) if rules_dir != '.' else sub_path + return os.path.join(rules_dir, sub_path) if rules_dir != '.' else sub_path + # glob using git gg_cache = {} + + def git_glob(glob): - global gg_cache - if glob in gg_cache: return gg_cache[glob] - r = set(subprocess - .check_output(['git', 'ls-files', os.path.join(git_root, glob)]) - .decode('utf-8') - .strip() - .splitlines()) - gg_cache[glob] = r - return r + global gg_cache + if glob in gg_cache: return gg_cache[glob] + r = set( + subprocess.check_output( + ['git', 'ls-files', os.path.join(git_root, glob)]).decode('utf-8') + .strip().splitlines()) + gg_cache[glob] = r + return r + def expand_directives(root, directives): - globs = collections.OrderedDict() - # build a table of glob --> owners - for directive in directives: - for glob in directive.globs or ['**']: - if glob not in globs: - globs[glob] = [] - if directive.who not in globs[glob]: - globs[glob].append(directive.who) - # expand owners for intersecting globs - sorted_globs = sorted(globs.keys(), - key=lambda g: len(git_glob(full_dir(root, g))), - reverse=True) - out_globs = collections.OrderedDict() - for glob_add in sorted_globs: - who_add = globs[glob_add] - pre_items = [i for i in out_globs.items()] - out_globs[glob_add] = who_add.copy() - for glob_have, who_have in pre_items: - files_add = git_glob(full_dir(root, glob_add)) - files_have = git_glob(full_dir(root, glob_have)) - intersect = files_have.intersection(files_add) - if intersect: - for f in sorted(files_add): # sorted to ensure merge stability - if f not in intersect: - out_globs[os.path.relpath(f, start=root)] = who_add - for who in who_have: - if who not in out_globs[glob_add]: - out_globs[glob_add].append(who) - return out_globs + globs = collections.OrderedDict() + # build a table of glob --> owners + for directive in directives: + for glob in directive.globs or ['**']: + if glob not in globs: + globs[glob] = [] + if directive.who not in globs[glob]: + globs[glob].append(directive.who) + # expand owners for intersecting globs + sorted_globs = sorted( + globs.keys(), + key=lambda g: len(git_glob(full_dir(root, g))), + reverse=True) + out_globs = collections.OrderedDict() + for glob_add in sorted_globs: + who_add = globs[glob_add] + pre_items = [i for i in out_globs.items()] + out_globs[glob_add] = who_add.copy() + for glob_have, who_have in pre_items: + files_add = git_glob(full_dir(root, glob_add)) + files_have = git_glob(full_dir(root, glob_have)) + intersect = files_have.intersection(files_add) + if intersect: + for f in sorted(files_add): # sorted to ensure merge stability + if f not in intersect: + out_globs[os.path.relpath(f, start=root)] = who_add + for who in who_have: + if who not in out_globs[glob_add]: + out_globs[glob_add].append(who) + return out_globs + def add_parent_to_globs(parent, globs, globs_dir): - if not parent: return - for owners in owners_data: - if owners.dir == parent: - owners_globs = expand_directives(owners.dir, owners.directives) - for oglob, oglob_who in owners_globs.items(): - for gglob, gglob_who in globs.items(): - files_parent = git_glob(full_dir(owners.dir, oglob)) - files_child = git_glob(full_dir(globs_dir, gglob)) - intersect = files_parent.intersection(files_child) - gglob_who_orig = gglob_who.copy() - if intersect: - for f in sorted(files_child): # sorted to ensure merge stability - if f not in intersect: - who = gglob_who_orig.copy() - globs[os.path.relpath(f, start=globs_dir)] = who - for who in oglob_who: - if who not in gglob_who: - gglob_who.append(who) - add_parent_to_globs(owners.parent, globs, globs_dir) - return - assert(False) + if not parent: return + for owners in owners_data: + if owners.dir == parent: + owners_globs = expand_directives(owners.dir, owners.directives) + for oglob, oglob_who in owners_globs.items(): + for gglob, gglob_who in globs.items(): + files_parent = git_glob(full_dir(owners.dir, oglob)) + files_child = git_glob(full_dir(globs_dir, gglob)) + intersect = files_parent.intersection(files_child) + gglob_who_orig = gglob_who.copy() + if intersect: + for f in sorted(files_child + ): # sorted to ensure merge stability + if f not in intersect: + who = gglob_who_orig.copy() + globs[os.path.relpath(f, start=globs_dir)] = who + for who in oglob_who: + if who not in gglob_who: + gglob_who.append(who) + add_parent_to_globs(owners.parent, globs, globs_dir) + return + assert (False) + todo = owners_data.copy() done = set() with open(args.out, 'w') as out: - out.write('# Auto-generated by the tools/mkowners/mkowners.py tool\n') - out.write('# Uses OWNERS files in different modules throughout the\n') - out.write('# repository as the source of truth for module ownership.\n') - written_globs = [] - while todo: - head, *todo = todo - if head.parent and not head.parent in done: - todo.append(head) - continue - globs = expand_directives(head.dir, head.directives) - add_parent_to_globs(head.parent, globs, head.dir) - for glob, owners in globs.items(): - skip = False - for glob1, owners1, dir1 in reversed(written_globs): - files = git_glob(full_dir(head.dir, glob)) - files1 = git_glob(full_dir(dir1, glob1)) - intersect = files.intersection(files1) - if files == intersect: - if sorted(owners) == sorted(owners1): - skip = True # nothing new in this rule - break - elif intersect: - # continuing would cause a semantic change since some files are - # affected differently by this rule and CODEOWNERS is order dependent - break - if not skip: - out.write('/%s %s\n' % ( - full_dir(head.dir, glob), ' '.join(owners))) - written_globs.append((glob, owners, head.dir)) - done.add(head.dir) + out.write('# Auto-generated by the tools/mkowners/mkowners.py tool\n') + out.write('# Uses OWNERS files in different modules throughout the\n') + out.write('# repository as the source of truth for module ownership.\n') + written_globs = [] + while todo: + head, *todo = todo + if head.parent and not head.parent in done: + todo.append(head) + continue + globs = expand_directives(head.dir, head.directives) + add_parent_to_globs(head.parent, globs, head.dir) + for glob, owners in globs.items(): + skip = False + for glob1, owners1, dir1 in reversed(written_globs): + files = git_glob(full_dir(head.dir, glob)) + files1 = git_glob(full_dir(dir1, glob1)) + intersect = files.intersection(files1) + if files == intersect: + if sorted(owners) == sorted(owners1): + skip = True # nothing new in this rule + break + elif intersect: + # continuing would cause a semantic change since some files are + # affected differently by this rule and CODEOWNERS is order dependent + break + if not skip: + out.write('/%s %s\n' % (full_dir(head.dir, glob), + ' '.join(owners))) + written_globs.append((glob, owners, head.dir)) + done.add(head.dir) From 19889d79e457b1a09ba7404fdae9829dbb499362 Mon Sep 17 00:00:00 2001 From: Yuchen Zeng Date: Mon, 11 Dec 2017 20:58:12 -0800 Subject: [PATCH 114/127] Add escape sequences for the grpc_cli metadata flag --- test/cpp/util/grpc_tool.cc | 33 +++++++++++---- test/cpp/util/grpc_tool_test.cc | 71 +++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 7 deletions(-) diff --git a/test/cpp/util/grpc_tool.cc b/test/cpp/util/grpc_tool.cc index a6d08cd83c4..30c43b206f7 100644 --- a/test/cpp/util/grpc_tool.cc +++ b/test/cpp/util/grpc_tool.cc @@ -124,13 +124,32 @@ void ParseMetadataFlag( return; } std::vector fields; - const char* delim = ":"; - size_t cur, next = -1; - do { - cur = next + 1; - next = FLAGS_metadata.find_first_of(delim, cur); - fields.push_back(FLAGS_metadata.substr(cur, next - cur)); - } while (next != grpc::string::npos); + const char delim = ':'; + const char escape = '\\'; + size_t cur = -1; + std::stringstream ss; + while (++cur < FLAGS_metadata.length()) { + switch (FLAGS_metadata.at(cur)) { + case escape: + if (cur < FLAGS_metadata.length() - 1) { + char c = FLAGS_metadata.at(++cur); + if (c == delim || c == escape) { + ss << c; + continue; + } + } + fprintf(stderr, "Failed to parse metadata flag.\n"); + exit(1); + case delim: + fields.push_back(ss.str()); + ss.str(""); + ss.clear(); + break; + default: + ss << FLAGS_metadata.at(cur); + } + } + fields.push_back(ss.str()); if (fields.size() % 2) { fprintf(stderr, "Failed to parse metadata flag.\n"); exit(1); diff --git a/test/cpp/util/grpc_tool_test.cc b/test/cpp/util/grpc_tool_test.cc index 1c07b2a8ef9..d3656db1509 100644 --- a/test/cpp/util/grpc_tool_test.cc +++ b/test/cpp/util/grpc_tool_test.cc @@ -85,6 +85,7 @@ DECLARE_bool(binary_input); DECLARE_bool(binary_output); DECLARE_bool(l); DECLARE_bool(batch); +DECLARE_string(metadata); namespace { @@ -618,6 +619,8 @@ TEST_F(GrpcToolTest, ParseCommand) { // Expected output: ECHO_RESPONSE_MESSAGE EXPECT_TRUE(0 == strcmp(output_stream.str().c_str(), ECHO_RESPONSE_MESSAGE)); + FLAGS_binary_input = false; + FLAGS_binary_output = false; ShutdownServer(); } @@ -652,6 +655,74 @@ TEST_F(GrpcToolTest, TooManyArguments) { EXPECT_TRUE(0 == output_stream.tellp()); } +TEST_F(GrpcToolTest, CallCommandWithMetadata) { + // Test input "grpc_cli call localhost: Echo "message: 'Hello'" + const grpc::string server_address = SetUpServer(); + const char* argv[] = {"grpc_cli", "call", server_address.c_str(), "Echo", + "message: 'Hello'"}; + + { + std::stringstream output_stream; + FLAGS_metadata = "key0:val0:key1:valq:key2:val2"; + EXPECT_TRUE(0 == GrpcToolMainLib(ArraySize(argv), argv, + TestCliCredentials(), + std::bind(PrintStream, &output_stream, + std::placeholders::_1))); + // Expected output: "message: \"Hello\"" + EXPECT_TRUE(nullptr != + strstr(output_stream.str().c_str(), "message: \"Hello\"")); + } + + { + std::stringstream output_stream; + FLAGS_metadata = "key:val\\:val"; + EXPECT_TRUE(0 == GrpcToolMainLib(ArraySize(argv), argv, + TestCliCredentials(), + std::bind(PrintStream, &output_stream, + std::placeholders::_1))); + // Expected output: "message: \"Hello\"" + EXPECT_TRUE(nullptr != + strstr(output_stream.str().c_str(), "message: \"Hello\"")); + } + + { + std::stringstream output_stream; + FLAGS_metadata = "key:val\\\\val"; + EXPECT_TRUE(0 == GrpcToolMainLib(ArraySize(argv), argv, + TestCliCredentials(), + std::bind(PrintStream, &output_stream, + std::placeholders::_1))); + // Expected output: "message: \"Hello\"" + EXPECT_TRUE(nullptr != + strstr(output_stream.str().c_str(), "message: \"Hello\"")); + } + + { + std::stringstream output_stream; + FLAGS_metadata = "key0:val0:key1"; + // Exit with 1 + EXPECT_EXIT( + GrpcToolMainLib( + ArraySize(argv), argv, TestCliCredentials(), + std::bind(PrintStream, &output_stream, std::placeholders::_1)), + ::testing::ExitedWithCode(1), ".*Failed to parse metadata flag.*"); + } + + { + std::stringstream output_stream; + FLAGS_metadata = "key:val\\val"; + // Exit with 1 + EXPECT_EXIT( + GrpcToolMainLib( + ArraySize(argv), argv, TestCliCredentials(), + std::bind(PrintStream, &output_stream, std::placeholders::_1)), + ::testing::ExitedWithCode(1), ".*Failed to parse metadata flag.*"); + } + + FLAGS_metadata = ""; + ShutdownServer(); +} + } // namespace testing } // namespace grpc From acbf06591e03d2e5e1df5b4c77a43a15d76b72f8 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Tue, 12 Dec 2017 10:58:19 -0800 Subject: [PATCH 115/127] un yapf protoc_lib_deps --- .../python/grpcio_tools/protoc_lib_deps.py | 170 +----------------- tools/distrib/yapf_code.sh | 1 + 2 files changed, 7 insertions(+), 164 deletions(-) diff --git a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py index a900fb89ec5..2c65fca628e 100644 --- a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py +++ b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py @@ -1,3 +1,4 @@ + # Copyright 2017 gRPC authors. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,169 +14,10 @@ # limitations under the License. # AUTO-GENERATED BY make_grpcio_tools.py! -CC_FILES = [ - 'google/protobuf/compiler/zip_writer.cc', - 'google/protobuf/compiler/subprocess.cc', - 'google/protobuf/compiler/ruby/ruby_generator.cc', - 'google/protobuf/compiler/python/python_generator.cc', - 'google/protobuf/compiler/plugin.pb.cc', - 'google/protobuf/compiler/plugin.cc', - 'google/protobuf/compiler/php/php_generator.cc', - 'google/protobuf/compiler/objectivec/objectivec_primitive_field.cc', - 'google/protobuf/compiler/objectivec/objectivec_oneof.cc', - 'google/protobuf/compiler/objectivec/objectivec_message_field.cc', - 'google/protobuf/compiler/objectivec/objectivec_message.cc', - 'google/protobuf/compiler/objectivec/objectivec_map_field.cc', - 'google/protobuf/compiler/objectivec/objectivec_helpers.cc', - 'google/protobuf/compiler/objectivec/objectivec_generator.cc', - 'google/protobuf/compiler/objectivec/objectivec_file.cc', - 'google/protobuf/compiler/objectivec/objectivec_field.cc', - 'google/protobuf/compiler/objectivec/objectivec_extension.cc', - 'google/protobuf/compiler/objectivec/objectivec_enum_field.cc', - 'google/protobuf/compiler/objectivec/objectivec_enum.cc', - 'google/protobuf/compiler/js/well_known_types_embed.cc', - 'google/protobuf/compiler/js/js_generator.cc', - 'google/protobuf/compiler/javanano/javanano_primitive_field.cc', - 'google/protobuf/compiler/javanano/javanano_message_field.cc', - 'google/protobuf/compiler/javanano/javanano_message.cc', - 'google/protobuf/compiler/javanano/javanano_map_field.cc', - 'google/protobuf/compiler/javanano/javanano_helpers.cc', - 'google/protobuf/compiler/javanano/javanano_generator.cc', - 'google/protobuf/compiler/javanano/javanano_file.cc', - 'google/protobuf/compiler/javanano/javanano_field.cc', - 'google/protobuf/compiler/javanano/javanano_extension.cc', - 'google/protobuf/compiler/javanano/javanano_enum_field.cc', - 'google/protobuf/compiler/javanano/javanano_enum.cc', - 'google/protobuf/compiler/java/java_string_field_lite.cc', - 'google/protobuf/compiler/java/java_string_field.cc', - 'google/protobuf/compiler/java/java_shared_code_generator.cc', - 'google/protobuf/compiler/java/java_service.cc', - 'google/protobuf/compiler/java/java_primitive_field_lite.cc', - 'google/protobuf/compiler/java/java_primitive_field.cc', - 'google/protobuf/compiler/java/java_name_resolver.cc', - 'google/protobuf/compiler/java/java_message_lite.cc', - 'google/protobuf/compiler/java/java_message_field_lite.cc', - 'google/protobuf/compiler/java/java_message_field.cc', - 'google/protobuf/compiler/java/java_message_builder_lite.cc', - 'google/protobuf/compiler/java/java_message_builder.cc', - 'google/protobuf/compiler/java/java_message.cc', - 'google/protobuf/compiler/java/java_map_field_lite.cc', - 'google/protobuf/compiler/java/java_map_field.cc', - 'google/protobuf/compiler/java/java_lazy_message_field_lite.cc', - 'google/protobuf/compiler/java/java_lazy_message_field.cc', - 'google/protobuf/compiler/java/java_helpers.cc', - 'google/protobuf/compiler/java/java_generator_factory.cc', - 'google/protobuf/compiler/java/java_generator.cc', - 'google/protobuf/compiler/java/java_file.cc', - 'google/protobuf/compiler/java/java_field.cc', - 'google/protobuf/compiler/java/java_extension_lite.cc', - 'google/protobuf/compiler/java/java_extension.cc', - 'google/protobuf/compiler/java/java_enum_lite.cc', - 'google/protobuf/compiler/java/java_enum_field_lite.cc', - 'google/protobuf/compiler/java/java_enum_field.cc', - 'google/protobuf/compiler/java/java_enum.cc', - 'google/protobuf/compiler/java/java_doc_comment.cc', - 'google/protobuf/compiler/java/java_context.cc', - 'google/protobuf/compiler/csharp/csharp_wrapper_field.cc', - 'google/protobuf/compiler/csharp/csharp_source_generator_base.cc', - 'google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc', - 'google/protobuf/compiler/csharp/csharp_repeated_message_field.cc', - 'google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc', - 'google/protobuf/compiler/csharp/csharp_reflection_class.cc', - 'google/protobuf/compiler/csharp/csharp_primitive_field.cc', - 'google/protobuf/compiler/csharp/csharp_message_field.cc', - 'google/protobuf/compiler/csharp/csharp_message.cc', - 'google/protobuf/compiler/csharp/csharp_map_field.cc', - 'google/protobuf/compiler/csharp/csharp_helpers.cc', - 'google/protobuf/compiler/csharp/csharp_generator.cc', - 'google/protobuf/compiler/csharp/csharp_field_base.cc', - 'google/protobuf/compiler/csharp/csharp_enum_field.cc', - 'google/protobuf/compiler/csharp/csharp_enum.cc', - 'google/protobuf/compiler/csharp/csharp_doc_comment.cc', - 'google/protobuf/compiler/cpp/cpp_string_field.cc', - 'google/protobuf/compiler/cpp/cpp_service.cc', - 'google/protobuf/compiler/cpp/cpp_primitive_field.cc', - 'google/protobuf/compiler/cpp/cpp_padding_optimizer.cc', - 'google/protobuf/compiler/cpp/cpp_message_field.cc', - 'google/protobuf/compiler/cpp/cpp_message.cc', - 'google/protobuf/compiler/cpp/cpp_map_field.cc', - 'google/protobuf/compiler/cpp/cpp_helpers.cc', - 'google/protobuf/compiler/cpp/cpp_generator.cc', - 'google/protobuf/compiler/cpp/cpp_file.cc', - 'google/protobuf/compiler/cpp/cpp_field.cc', - 'google/protobuf/compiler/cpp/cpp_extension.cc', - 'google/protobuf/compiler/cpp/cpp_enum_field.cc', - 'google/protobuf/compiler/cpp/cpp_enum.cc', - 'google/protobuf/compiler/command_line_interface.cc', - 'google/protobuf/compiler/code_generator.cc', - 'google/protobuf/wrappers.pb.cc', 'google/protobuf/wire_format.cc', - 'google/protobuf/util/type_resolver_util.cc', - 'google/protobuf/util/time_util.cc', - 'google/protobuf/util/message_differencer.cc', - 'google/protobuf/util/json_util.cc', - 'google/protobuf/util/internal/utility.cc', - 'google/protobuf/util/internal/type_info_test_helper.cc', - 'google/protobuf/util/internal/type_info.cc', - 'google/protobuf/util/internal/protostream_objectwriter.cc', - 'google/protobuf/util/internal/protostream_objectsource.cc', - 'google/protobuf/util/internal/proto_writer.cc', - 'google/protobuf/util/internal/object_writer.cc', - 'google/protobuf/util/internal/json_stream_parser.cc', - 'google/protobuf/util/internal/json_objectwriter.cc', - 'google/protobuf/util/internal/json_escaping.cc', - 'google/protobuf/util/internal/field_mask_utility.cc', - 'google/protobuf/util/internal/error_listener.cc', - 'google/protobuf/util/internal/default_value_objectwriter.cc', - 'google/protobuf/util/internal/datapiece.cc', - 'google/protobuf/util/field_mask_util.cc', - 'google/protobuf/util/field_comparator.cc', - 'google/protobuf/util/delimited_message_util.cc', - 'google/protobuf/unknown_field_set.cc', 'google/protobuf/type.pb.cc', - 'google/protobuf/timestamp.pb.cc', 'google/protobuf/text_format.cc', - 'google/protobuf/stubs/substitute.cc', 'google/protobuf/stubs/mathlimits.cc', - 'google/protobuf/struct.pb.cc', 'google/protobuf/source_context.pb.cc', - 'google/protobuf/service.cc', 'google/protobuf/reflection_ops.cc', - 'google/protobuf/message.cc', 'google/protobuf/map_field.cc', - 'google/protobuf/io/zero_copy_stream_impl.cc', - 'google/protobuf/io/tokenizer.cc', 'google/protobuf/io/strtod.cc', - 'google/protobuf/io/printer.cc', 'google/protobuf/io/gzip_stream.cc', - 'google/protobuf/generated_message_table_driven.cc', - 'google/protobuf/generated_message_reflection.cc', - 'google/protobuf/field_mask.pb.cc', 'google/protobuf/extension_set_heavy.cc', - 'google/protobuf/empty.pb.cc', 'google/protobuf/dynamic_message.cc', - 'google/protobuf/duration.pb.cc', 'google/protobuf/descriptor_database.cc', - 'google/protobuf/descriptor.pb.cc', 'google/protobuf/descriptor.cc', - 'google/protobuf/compiler/parser.cc', 'google/protobuf/compiler/importer.cc', - 'google/protobuf/api.pb.cc', 'google/protobuf/any.pb.cc', - 'google/protobuf/any.cc', 'google/protobuf/wire_format_lite.cc', - 'google/protobuf/stubs/time.cc', 'google/protobuf/stubs/strutil.cc', - 'google/protobuf/stubs/structurally_valid.cc', - 'google/protobuf/stubs/stringprintf.cc', - 'google/protobuf/stubs/stringpiece.cc', 'google/protobuf/stubs/statusor.cc', - 'google/protobuf/stubs/status.cc', 'google/protobuf/stubs/once.cc', - 'google/protobuf/stubs/io_win32.cc', 'google/protobuf/stubs/int128.cc', - 'google/protobuf/stubs/common.cc', 'google/protobuf/stubs/bytestream.cc', - 'google/protobuf/stubs/atomicops_internals_x86_msvc.cc', - 'google/protobuf/stubs/atomicops_internals_x86_gcc.cc', - 'google/protobuf/repeated_field.cc', 'google/protobuf/message_lite.cc', - 'google/protobuf/io/zero_copy_stream_impl_lite.cc', - 'google/protobuf/io/zero_copy_stream.cc', - 'google/protobuf/io/coded_stream.cc', - 'google/protobuf/generated_message_util.cc', - 'google/protobuf/generated_message_table_driven_lite.cc', - 'google/protobuf/extension_set.cc', 'google/protobuf/arenastring.cc', - 'google/protobuf/arena.cc', 'google/protobuf/compiler/js/embed.cc' -] -PROTO_FILES = [ - 'google/protobuf/wrappers.proto', 'google/protobuf/type.proto', - 'google/protobuf/timestamp.proto', 'google/protobuf/struct.proto', - 'google/protobuf/source_context.proto', 'google/protobuf/field_mask.proto', - 'google/protobuf/empty.proto', 'google/protobuf/duration.proto', - 'google/protobuf/descriptor.proto', 'google/protobuf/compiler/plugin.proto', - 'google/protobuf/api.proto', 'google/protobuf/any.proto' -] +CC_FILES=['google/protobuf/compiler/zip_writer.cc', 'google/protobuf/compiler/subprocess.cc', 'google/protobuf/compiler/ruby/ruby_generator.cc', 'google/protobuf/compiler/python/python_generator.cc', 'google/protobuf/compiler/plugin.pb.cc', 'google/protobuf/compiler/plugin.cc', 'google/protobuf/compiler/php/php_generator.cc', 'google/protobuf/compiler/objectivec/objectivec_primitive_field.cc', 'google/protobuf/compiler/objectivec/objectivec_oneof.cc', 'google/protobuf/compiler/objectivec/objectivec_message_field.cc', 'google/protobuf/compiler/objectivec/objectivec_message.cc', 'google/protobuf/compiler/objectivec/objectivec_map_field.cc', 'google/protobuf/compiler/objectivec/objectivec_helpers.cc', 'google/protobuf/compiler/objectivec/objectivec_generator.cc', 'google/protobuf/compiler/objectivec/objectivec_file.cc', 'google/protobuf/compiler/objectivec/objectivec_field.cc', 'google/protobuf/compiler/objectivec/objectivec_extension.cc', 'google/protobuf/compiler/objectivec/objectivec_enum_field.cc', 'google/protobuf/compiler/objectivec/objectivec_enum.cc', 'google/protobuf/compiler/js/well_known_types_embed.cc', 'google/protobuf/compiler/js/js_generator.cc', 'google/protobuf/compiler/javanano/javanano_primitive_field.cc', 'google/protobuf/compiler/javanano/javanano_message_field.cc', 'google/protobuf/compiler/javanano/javanano_message.cc', 'google/protobuf/compiler/javanano/javanano_map_field.cc', 'google/protobuf/compiler/javanano/javanano_helpers.cc', 'google/protobuf/compiler/javanano/javanano_generator.cc', 'google/protobuf/compiler/javanano/javanano_file.cc', 'google/protobuf/compiler/javanano/javanano_field.cc', 'google/protobuf/compiler/javanano/javanano_extension.cc', 'google/protobuf/compiler/javanano/javanano_enum_field.cc', 'google/protobuf/compiler/javanano/javanano_enum.cc', 'google/protobuf/compiler/java/java_string_field_lite.cc', 'google/protobuf/compiler/java/java_string_field.cc', 'google/protobuf/compiler/java/java_shared_code_generator.cc', 'google/protobuf/compiler/java/java_service.cc', 'google/protobuf/compiler/java/java_primitive_field_lite.cc', 'google/protobuf/compiler/java/java_primitive_field.cc', 'google/protobuf/compiler/java/java_name_resolver.cc', 'google/protobuf/compiler/java/java_message_lite.cc', 'google/protobuf/compiler/java/java_message_field_lite.cc', 'google/protobuf/compiler/java/java_message_field.cc', 'google/protobuf/compiler/java/java_message_builder_lite.cc', 'google/protobuf/compiler/java/java_message_builder.cc', 'google/protobuf/compiler/java/java_message.cc', 'google/protobuf/compiler/java/java_map_field_lite.cc', 'google/protobuf/compiler/java/java_map_field.cc', 'google/protobuf/compiler/java/java_lazy_message_field_lite.cc', 'google/protobuf/compiler/java/java_lazy_message_field.cc', 'google/protobuf/compiler/java/java_helpers.cc', 'google/protobuf/compiler/java/java_generator_factory.cc', 'google/protobuf/compiler/java/java_generator.cc', 'google/protobuf/compiler/java/java_file.cc', 'google/protobuf/compiler/java/java_field.cc', 'google/protobuf/compiler/java/java_extension_lite.cc', 'google/protobuf/compiler/java/java_extension.cc', 'google/protobuf/compiler/java/java_enum_lite.cc', 'google/protobuf/compiler/java/java_enum_field_lite.cc', 'google/protobuf/compiler/java/java_enum_field.cc', 'google/protobuf/compiler/java/java_enum.cc', 'google/protobuf/compiler/java/java_doc_comment.cc', 'google/protobuf/compiler/java/java_context.cc', 'google/protobuf/compiler/csharp/csharp_wrapper_field.cc', 'google/protobuf/compiler/csharp/csharp_source_generator_base.cc', 'google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc', 'google/protobuf/compiler/csharp/csharp_repeated_message_field.cc', 'google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc', 'google/protobuf/compiler/csharp/csharp_reflection_class.cc', 'google/protobuf/compiler/csharp/csharp_primitive_field.cc', 'google/protobuf/compiler/csharp/csharp_message_field.cc', 'google/protobuf/compiler/csharp/csharp_message.cc', 'google/protobuf/compiler/csharp/csharp_map_field.cc', 'google/protobuf/compiler/csharp/csharp_helpers.cc', 'google/protobuf/compiler/csharp/csharp_generator.cc', 'google/protobuf/compiler/csharp/csharp_field_base.cc', 'google/protobuf/compiler/csharp/csharp_enum_field.cc', 'google/protobuf/compiler/csharp/csharp_enum.cc', 'google/protobuf/compiler/csharp/csharp_doc_comment.cc', 'google/protobuf/compiler/cpp/cpp_string_field.cc', 'google/protobuf/compiler/cpp/cpp_service.cc', 'google/protobuf/compiler/cpp/cpp_primitive_field.cc', 'google/protobuf/compiler/cpp/cpp_padding_optimizer.cc', 'google/protobuf/compiler/cpp/cpp_message_field.cc', 'google/protobuf/compiler/cpp/cpp_message.cc', 'google/protobuf/compiler/cpp/cpp_map_field.cc', 'google/protobuf/compiler/cpp/cpp_helpers.cc', 'google/protobuf/compiler/cpp/cpp_generator.cc', 'google/protobuf/compiler/cpp/cpp_file.cc', 'google/protobuf/compiler/cpp/cpp_field.cc', 'google/protobuf/compiler/cpp/cpp_extension.cc', 'google/protobuf/compiler/cpp/cpp_enum_field.cc', 'google/protobuf/compiler/cpp/cpp_enum.cc', 'google/protobuf/compiler/command_line_interface.cc', 'google/protobuf/compiler/code_generator.cc', 'google/protobuf/wrappers.pb.cc', 'google/protobuf/wire_format.cc', 'google/protobuf/util/type_resolver_util.cc', 'google/protobuf/util/time_util.cc', 'google/protobuf/util/message_differencer.cc', 'google/protobuf/util/json_util.cc', 'google/protobuf/util/internal/utility.cc', 'google/protobuf/util/internal/type_info_test_helper.cc', 'google/protobuf/util/internal/type_info.cc', 'google/protobuf/util/internal/protostream_objectwriter.cc', 'google/protobuf/util/internal/protostream_objectsource.cc', 'google/protobuf/util/internal/proto_writer.cc', 'google/protobuf/util/internal/object_writer.cc', 'google/protobuf/util/internal/json_stream_parser.cc', 'google/protobuf/util/internal/json_objectwriter.cc', 'google/protobuf/util/internal/json_escaping.cc', 'google/protobuf/util/internal/field_mask_utility.cc', 'google/protobuf/util/internal/error_listener.cc', 'google/protobuf/util/internal/default_value_objectwriter.cc', 'google/protobuf/util/internal/datapiece.cc', 'google/protobuf/util/field_mask_util.cc', 'google/protobuf/util/field_comparator.cc', 'google/protobuf/util/delimited_message_util.cc', 'google/protobuf/unknown_field_set.cc', 'google/protobuf/type.pb.cc', 'google/protobuf/timestamp.pb.cc', 'google/protobuf/text_format.cc', 'google/protobuf/stubs/substitute.cc', 'google/protobuf/stubs/mathlimits.cc', 'google/protobuf/struct.pb.cc', 'google/protobuf/source_context.pb.cc', 'google/protobuf/service.cc', 'google/protobuf/reflection_ops.cc', 'google/protobuf/message.cc', 'google/protobuf/map_field.cc', 'google/protobuf/io/zero_copy_stream_impl.cc', 'google/protobuf/io/tokenizer.cc', 'google/protobuf/io/strtod.cc', 'google/protobuf/io/printer.cc', 'google/protobuf/io/gzip_stream.cc', 'google/protobuf/generated_message_table_driven.cc', 'google/protobuf/generated_message_reflection.cc', 'google/protobuf/field_mask.pb.cc', 'google/protobuf/extension_set_heavy.cc', 'google/protobuf/empty.pb.cc', 'google/protobuf/dynamic_message.cc', 'google/protobuf/duration.pb.cc', 'google/protobuf/descriptor_database.cc', 'google/protobuf/descriptor.pb.cc', 'google/protobuf/descriptor.cc', 'google/protobuf/compiler/parser.cc', 'google/protobuf/compiler/importer.cc', 'google/protobuf/api.pb.cc', 'google/protobuf/any.pb.cc', 'google/protobuf/any.cc', 'google/protobuf/wire_format_lite.cc', 'google/protobuf/stubs/time.cc', 'google/protobuf/stubs/strutil.cc', 'google/protobuf/stubs/structurally_valid.cc', 'google/protobuf/stubs/stringprintf.cc', 'google/protobuf/stubs/stringpiece.cc', 'google/protobuf/stubs/statusor.cc', 'google/protobuf/stubs/status.cc', 'google/protobuf/stubs/once.cc', 'google/protobuf/stubs/io_win32.cc', 'google/protobuf/stubs/int128.cc', 'google/protobuf/stubs/common.cc', 'google/protobuf/stubs/bytestream.cc', 'google/protobuf/stubs/atomicops_internals_x86_msvc.cc', 'google/protobuf/stubs/atomicops_internals_x86_gcc.cc', 'google/protobuf/repeated_field.cc', 'google/protobuf/message_lite.cc', 'google/protobuf/io/zero_copy_stream_impl_lite.cc', 'google/protobuf/io/zero_copy_stream.cc', 'google/protobuf/io/coded_stream.cc', 'google/protobuf/generated_message_util.cc', 'google/protobuf/generated_message_table_driven_lite.cc', 'google/protobuf/extension_set.cc', 'google/protobuf/arenastring.cc', 'google/protobuf/arena.cc', 'google/protobuf/compiler/js/embed.cc'] +PROTO_FILES=['google/protobuf/wrappers.proto', 'google/protobuf/type.proto', 'google/protobuf/timestamp.proto', 'google/protobuf/struct.proto', 'google/protobuf/source_context.proto', 'google/protobuf/field_mask.proto', 'google/protobuf/empty.proto', 'google/protobuf/duration.proto', 'google/protobuf/descriptor.proto', 'google/protobuf/compiler/plugin.proto', 'google/protobuf/api.proto', 'google/protobuf/any.proto'] -CC_INCLUDE = 'third_party/protobuf/src' -PROTO_INCLUDE = 'third_party/protobuf/src' +CC_INCLUDE='third_party/protobuf/src' +PROTO_INCLUDE='third_party/protobuf/src' -PROTOBUF_SUBMODULE_VERSION = "2761122b810fe8861004ae785cc3ab39f384d342" +PROTOBUF_SUBMODULE_VERSION="2761122b810fe8861004ae785cc3ab39f384d342" diff --git a/tools/distrib/yapf_code.sh b/tools/distrib/yapf_code.sh index 8196773990b..f0968686608 100755 --- a/tools/distrib/yapf_code.sh +++ b/tools/distrib/yapf_code.sh @@ -23,6 +23,7 @@ DIRS=( 'tools' ) EXCLUSIONS=( + '*protoc_lib_deps.py' # this file is auto-generated ) VIRTUALENV=yapf_virtual_environment From 848a749f7afb19c79188c328e44f53fc2f7695e2 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Tue, 12 Dec 2017 10:31:47 -0800 Subject: [PATCH 116/127] yapf examples/python --- examples/python/helloworld/greeter_client.py | 11 +- examples/python/helloworld/greeter_server.py | 26 +-- examples/python/multiplex/multiplex_client.py | 130 ++++++------- examples/python/multiplex/multiplex_server.py | 181 +++++++++--------- .../python/multiplex/route_guide_resources.py | 23 ++- examples/python/multiplex/run_codegen.py | 23 +-- .../python/route_guide/route_guide_client.py | 113 +++++------ .../route_guide/route_guide_resources.py | 23 ++- .../python/route_guide/route_guide_server.py | 175 ++++++++--------- examples/python/route_guide/run_codegen.py | 12 +- tools/distrib/yapf_code.sh | 2 + 11 files changed, 351 insertions(+), 368 deletions(-) diff --git a/examples/python/helloworld/greeter_client.py b/examples/python/helloworld/greeter_client.py index d9b2bdfd079..a0aeb47bd72 100644 --- a/examples/python/helloworld/greeter_client.py +++ b/examples/python/helloworld/greeter_client.py @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """The Python implementation of the GRPC helloworld.Greeter client.""" from __future__ import print_function @@ -23,11 +22,11 @@ import helloworld_pb2_grpc def run(): - channel = grpc.insecure_channel('localhost:50051') - stub = helloworld_pb2_grpc.GreeterStub(channel) - response = stub.SayHello(helloworld_pb2.HelloRequest(name='you')) - print("Greeter client received: " + response.message) + channel = grpc.insecure_channel('localhost:50051') + stub = helloworld_pb2_grpc.GreeterStub(channel) + response = stub.SayHello(helloworld_pb2.HelloRequest(name='you')) + print("Greeter client received: " + response.message) if __name__ == '__main__': - run() + run() diff --git a/examples/python/helloworld/greeter_server.py b/examples/python/helloworld/greeter_server.py index be61695616b..c355662ef86 100644 --- a/examples/python/helloworld/greeter_server.py +++ b/examples/python/helloworld/greeter_server.py @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """The Python implementation of the GRPC helloworld.Greeter server.""" from concurrent import futures @@ -27,20 +26,21 @@ _ONE_DAY_IN_SECONDS = 60 * 60 * 24 class Greeter(helloworld_pb2_grpc.GreeterServicer): - def SayHello(self, request, context): - return helloworld_pb2.HelloReply(message='Hello, %s!' % request.name) + def SayHello(self, request, context): + return helloworld_pb2.HelloReply(message='Hello, %s!' % request.name) def serve(): - server = grpc.server(futures.ThreadPoolExecutor(max_workers=10)) - helloworld_pb2_grpc.add_GreeterServicer_to_server(Greeter(), server) - server.add_insecure_port('[::]:50051') - server.start() - try: - while True: - time.sleep(_ONE_DAY_IN_SECONDS) - except KeyboardInterrupt: - server.stop(0) + server = grpc.server(futures.ThreadPoolExecutor(max_workers=10)) + helloworld_pb2_grpc.add_GreeterServicer_to_server(Greeter(), server) + server.add_insecure_port('[::]:50051') + server.start() + try: + while True: + time.sleep(_ONE_DAY_IN_SECONDS) + except KeyboardInterrupt: + server.stop(0) + if __name__ == '__main__': - serve() + serve() diff --git a/examples/python/multiplex/multiplex_client.py b/examples/python/multiplex/multiplex_client.py index c8c700afcd7..49713f35b7e 100644 --- a/examples/python/multiplex/multiplex_client.py +++ b/examples/python/multiplex/multiplex_client.py @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """A client that makes both Greeter and RouteGuide RPCs.""" from __future__ import print_function @@ -29,98 +28,99 @@ import route_guide_resources def make_route_note(message, latitude, longitude): - return route_guide_pb2.RouteNote( - message=message, - location=route_guide_pb2.Point(latitude=latitude, longitude=longitude)) + return route_guide_pb2.RouteNote( + message=message, + location=route_guide_pb2.Point(latitude=latitude, longitude=longitude)) def guide_get_one_feature(route_guide_stub, point): - feature = route_guide_stub.GetFeature(point) - if not feature.location: - print("Server returned incomplete feature") - return + feature = route_guide_stub.GetFeature(point) + if not feature.location: + print("Server returned incomplete feature") + return - if feature.name: - print("Feature called %s at %s" % (feature.name, feature.location)) - else: - print("Found no feature at %s" % feature.location) + if feature.name: + print("Feature called %s at %s" % (feature.name, feature.location)) + else: + print("Found no feature at %s" % feature.location) def guide_get_feature(route_guide_stub): - guide_get_one_feature( - route_guide_stub, - route_guide_pb2.Point(latitude=409146138, longitude=-746188906)) - guide_get_one_feature( - route_guide_stub, route_guide_pb2.Point(latitude=0, longitude=0)) + guide_get_one_feature( + route_guide_stub, + route_guide_pb2.Point(latitude=409146138, longitude=-746188906)) + guide_get_one_feature(route_guide_stub, + route_guide_pb2.Point(latitude=0, longitude=0)) def guide_list_features(route_guide_stub): - rectangle = route_guide_pb2.Rectangle( - lo=route_guide_pb2.Point(latitude=400000000, longitude=-750000000), - hi=route_guide_pb2.Point(latitude=420000000, longitude=-730000000)) - print("Looking for features between 40, -75 and 42, -73") + rectangle = route_guide_pb2.Rectangle( + lo=route_guide_pb2.Point(latitude=400000000, longitude=-750000000), + hi=route_guide_pb2.Point(latitude=420000000, longitude=-730000000)) + print("Looking for features between 40, -75 and 42, -73") - features = route_guide_stub.ListFeatures(rectangle) + features = route_guide_stub.ListFeatures(rectangle) - for feature in features: - print("Feature called %s at %s" % (feature.name, feature.location)) + for feature in features: + print("Feature called %s at %s" % (feature.name, feature.location)) def generate_route(feature_list): - for _ in range(0, 10): - random_feature = feature_list[random.randint(0, len(feature_list) - 1)] - print("Visiting point %s" % random_feature.location) - yield random_feature.location - time.sleep(random.uniform(0.5, 1.5)) + for _ in range(0, 10): + random_feature = feature_list[random.randint(0, len(feature_list) - 1)] + print("Visiting point %s" % random_feature.location) + yield random_feature.location + time.sleep(random.uniform(0.5, 1.5)) def guide_record_route(route_guide_stub): - feature_list = route_guide_resources.read_route_guide_database() + feature_list = route_guide_resources.read_route_guide_database() - route_iterator = generate_route(feature_list) - route_summary = route_guide_stub.RecordRoute(route_iterator) - print("Finished trip with %s points " % route_summary.point_count) - print("Passed %s features " % route_summary.feature_count) - print("Travelled %s meters " % route_summary.distance) - print("It took %s seconds " % route_summary.elapsed_time) + route_iterator = generate_route(feature_list) + route_summary = route_guide_stub.RecordRoute(route_iterator) + print("Finished trip with %s points " % route_summary.point_count) + print("Passed %s features " % route_summary.feature_count) + print("Travelled %s meters " % route_summary.distance) + print("It took %s seconds " % route_summary.elapsed_time) def generate_messages(): - messages = [ - make_route_note("First message", 0, 0), - make_route_note("Second message", 0, 1), - make_route_note("Third message", 1, 0), - make_route_note("Fourth message", 0, 0), - make_route_note("Fifth message", 1, 0), - ] - for msg in messages: - print("Sending %s at %s" % (msg.message, msg.location)) - yield msg - time.sleep(random.uniform(0.5, 1.0)) + messages = [ + make_route_note("First message", 0, 0), + make_route_note("Second message", 0, 1), + make_route_note("Third message", 1, 0), + make_route_note("Fourth message", 0, 0), + make_route_note("Fifth message", 1, 0), + ] + for msg in messages: + print("Sending %s at %s" % (msg.message, msg.location)) + yield msg + time.sleep(random.uniform(0.5, 1.0)) def guide_route_chat(route_guide_stub): - responses = route_guide_stub.RouteChat(generate_messages()) - for response in responses: - print("Received message %s at %s" % (response.message, response.location)) + responses = route_guide_stub.RouteChat(generate_messages()) + for response in responses: + print("Received message %s at %s" % + (response.message, response.location)) def run(): - channel = grpc.insecure_channel('localhost:50051') - greeter_stub = helloworld_pb2_grpc.GreeterStub(channel) - route_guide_stub = route_guide_pb2_grpc.RouteGuideStub(channel) - greeter_response = greeter_stub.SayHello( - helloworld_pb2.HelloRequest(name='you')) - print("Greeter client received: " + greeter_response.message) - print("-------------- GetFeature --------------") - guide_get_feature(route_guide_stub) - print("-------------- ListFeatures --------------") - guide_list_features(route_guide_stub) - print("-------------- RecordRoute --------------") - guide_record_route(route_guide_stub) - print("-------------- RouteChat --------------") - guide_route_chat(route_guide_stub) + channel = grpc.insecure_channel('localhost:50051') + greeter_stub = helloworld_pb2_grpc.GreeterStub(channel) + route_guide_stub = route_guide_pb2_grpc.RouteGuideStub(channel) + greeter_response = greeter_stub.SayHello( + helloworld_pb2.HelloRequest(name='you')) + print("Greeter client received: " + greeter_response.message) + print("-------------- GetFeature --------------") + guide_get_feature(route_guide_stub) + print("-------------- ListFeatures --------------") + guide_list_features(route_guide_stub) + print("-------------- RecordRoute --------------") + guide_record_route(route_guide_stub) + print("-------------- RouteChat --------------") + guide_route_chat(route_guide_stub) if __name__ == '__main__': - run() + run() diff --git a/examples/python/multiplex/multiplex_server.py b/examples/python/multiplex/multiplex_server.py index 9a6e835bedc..e2ff671f972 100644 --- a/examples/python/multiplex/multiplex_server.py +++ b/examples/python/multiplex/multiplex_server.py @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """A gRPC server servicing both Greeter and RouteGuide RPCs.""" from concurrent import futures @@ -30,107 +29,111 @@ _ONE_DAY_IN_SECONDS = 60 * 60 * 24 def _get_feature(feature_db, point): - """Returns Feature at given location or None.""" - for feature in feature_db: - if feature.location == point: - return feature - return None + """Returns Feature at given location or None.""" + for feature in feature_db: + if feature.location == point: + return feature + return None def _get_distance(start, end): - """Distance between two points.""" - coord_factor = 10000000.0 - lat_1 = start.latitude / coord_factor - lat_2 = end.latitude / coord_factor - lon_1 = start.longitude / coord_factor - lon_2 = end.longitude / coord_factor - lat_rad_1 = math.radians(lat_1) - lat_rad_2 = math.radians(lat_2) - delta_lat_rad = math.radians(lat_2 - lat_1) - delta_lon_rad = math.radians(lon_2 - lon_1) - - a = (pow(math.sin(delta_lat_rad / 2), 2) + - (math.cos(lat_rad_1) * math.cos(lat_rad_2) * - pow(math.sin(delta_lon_rad / 2), 2))) - c = 2 * math.atan2(math.sqrt(a), math.sqrt(1 - a)) - R = 6371000; # metres - return R * c; + """Distance between two points.""" + coord_factor = 10000000.0 + lat_1 = start.latitude / coord_factor + lat_2 = end.latitude / coord_factor + lon_1 = start.longitude / coord_factor + lon_2 = end.longitude / coord_factor + lat_rad_1 = math.radians(lat_1) + lat_rad_2 = math.radians(lat_2) + delta_lat_rad = math.radians(lat_2 - lat_1) + delta_lon_rad = math.radians(lon_2 - lon_1) + + a = (pow(math.sin(delta_lat_rad / 2), 2) + + (math.cos(lat_rad_1) * math.cos(lat_rad_2) * pow( + math.sin(delta_lon_rad / 2), 2))) + c = 2 * math.atan2(math.sqrt(a), math.sqrt(1 - a)) + R = 6371000 + # metres + return R * c class _GreeterServicer(helloworld_pb2_grpc.GreeterServicer): - def SayHello(self, request, context): - return helloworld_pb2.HelloReply(message='Hello, {}!'.format(request.name)) + def SayHello(self, request, context): + return helloworld_pb2.HelloReply( + message='Hello, {}!'.format(request.name)) class _RouteGuideServicer(route_guide_pb2_grpc.RouteGuideServicer): - """Provides methods that implement functionality of route guide server.""" - - def __init__(self): - self.db = route_guide_resources.read_route_guide_database() - - def GetFeature(self, request, context): - feature = _get_feature(self.db, request) - if feature is None: - return route_guide_pb2.Feature(name="", location=request) - else: - return feature - - def ListFeatures(self, request, context): - left = min(request.lo.longitude, request.hi.longitude) - right = max(request.lo.longitude, request.hi.longitude) - top = max(request.lo.latitude, request.hi.latitude) - bottom = min(request.lo.latitude, request.hi.latitude) - for feature in self.db: - if (feature.location.longitude >= left and - feature.location.longitude <= right and - feature.location.latitude >= bottom and - feature.location.latitude <= top): - yield feature - - def RecordRoute(self, request_iterator, context): - point_count = 0 - feature_count = 0 - distance = 0.0 - prev_point = None - - start_time = time.time() - for point in request_iterator: - point_count += 1 - if _get_feature(self.db, point): - feature_count += 1 - if prev_point: - distance += _get_distance(prev_point, point) - prev_point = point - - elapsed_time = time.time() - start_time - return route_guide_pb2.RouteSummary(point_count=point_count, - feature_count=feature_count, - distance=int(distance), - elapsed_time=int(elapsed_time)) - - def RouteChat(self, request_iterator, context): - prev_notes = [] - for new_note in request_iterator: - for prev_note in prev_notes: - if prev_note.location == new_note.location: - yield prev_note - prev_notes.append(new_note) + """Provides methods that implement functionality of route guide server.""" + + def __init__(self): + self.db = route_guide_resources.read_route_guide_database() + + def GetFeature(self, request, context): + feature = _get_feature(self.db, request) + if feature is None: + return route_guide_pb2.Feature(name="", location=request) + else: + return feature + + def ListFeatures(self, request, context): + left = min(request.lo.longitude, request.hi.longitude) + right = max(request.lo.longitude, request.hi.longitude) + top = max(request.lo.latitude, request.hi.latitude) + bottom = min(request.lo.latitude, request.hi.latitude) + for feature in self.db: + if (feature.location.longitude >= left and + feature.location.longitude <= right and + feature.location.latitude >= bottom and + feature.location.latitude <= top): + yield feature + + def RecordRoute(self, request_iterator, context): + point_count = 0 + feature_count = 0 + distance = 0.0 + prev_point = None + + start_time = time.time() + for point in request_iterator: + point_count += 1 + if _get_feature(self.db, point): + feature_count += 1 + if prev_point: + distance += _get_distance(prev_point, point) + prev_point = point + + elapsed_time = time.time() - start_time + return route_guide_pb2.RouteSummary( + point_count=point_count, + feature_count=feature_count, + distance=int(distance), + elapsed_time=int(elapsed_time)) + + def RouteChat(self, request_iterator, context): + prev_notes = [] + for new_note in request_iterator: + for prev_note in prev_notes: + if prev_note.location == new_note.location: + yield prev_note + prev_notes.append(new_note) def serve(): - server = grpc.server(futures.ThreadPoolExecutor(max_workers=10)) - helloworld_pb2_grpc.add_GreeterServicer_to_server(_GreeterServicer(), server) - route_guide_pb2_grpc.add_RouteGuideServicer_to_server( - _RouteGuideServicer(), server) - server.add_insecure_port('[::]:50051') - server.start() - try: - while True: - time.sleep(_ONE_DAY_IN_SECONDS) - except KeyboardInterrupt: - server.stop(0) + server = grpc.server(futures.ThreadPoolExecutor(max_workers=10)) + helloworld_pb2_grpc.add_GreeterServicer_to_server(_GreeterServicer(), + server) + route_guide_pb2_grpc.add_RouteGuideServicer_to_server(_RouteGuideServicer(), + server) + server.add_insecure_port('[::]:50051') + server.start() + try: + while True: + time.sleep(_ONE_DAY_IN_SECONDS) + except KeyboardInterrupt: + server.stop(0) if __name__ == '__main__': - serve() + serve() diff --git a/examples/python/multiplex/route_guide_resources.py b/examples/python/multiplex/route_guide_resources.py index 08878636606..ace85d6f9d4 100644 --- a/examples/python/multiplex/route_guide_resources.py +++ b/examples/python/multiplex/route_guide_resources.py @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Common resources used in the gRPC route guide example.""" import json @@ -20,19 +19,19 @@ import route_guide_pb2 def read_route_guide_database(): - """Reads the route guide database. + """Reads the route guide database. Returns: The full contents of the route guide database as a sequence of route_guide_pb2.Features. """ - feature_list = [] - with open("route_guide_db.json") as route_guide_db_file: - for item in json.load(route_guide_db_file): - feature = route_guide_pb2.Feature( - name=item["name"], - location=route_guide_pb2.Point( - latitude=item["location"]["latitude"], - longitude=item["location"]["longitude"])) - feature_list.append(feature) - return feature_list + feature_list = [] + with open("route_guide_db.json") as route_guide_db_file: + for item in json.load(route_guide_db_file): + feature = route_guide_pb2.Feature( + name=item["name"], + location=route_guide_pb2.Point( + latitude=item["location"]["latitude"], + longitude=item["location"]["longitude"])) + feature_list.append(feature) + return feature_list diff --git a/examples/python/multiplex/run_codegen.py b/examples/python/multiplex/run_codegen.py index f38d86cf43e..d960c3cf161 100644 --- a/examples/python/multiplex/run_codegen.py +++ b/examples/python/multiplex/run_codegen.py @@ -11,26 +11,11 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Generates protocol messages and gRPC stubs.""" from grpc_tools import protoc -protoc.main( - ( - '', - '-I../../protos', - '--python_out=.', - '--grpc_python_out=.', - '../../protos/helloworld.proto', - ) -) -protoc.main( - ( - '', - '-I../../protos', - '--python_out=.', - '--grpc_python_out=.', - '../../protos/route_guide.proto', - ) -) +protoc.main(('', '-I../../protos', '--python_out=.', '--grpc_python_out=.', + '../../protos/helloworld.proto',)) +protoc.main(('', '-I../../protos', '--python_out=.', '--grpc_python_out=.', + '../../protos/route_guide.proto',)) diff --git a/examples/python/route_guide/route_guide_client.py b/examples/python/route_guide/route_guide_client.py index a0e32fb6f53..c9d0e96ad69 100644 --- a/examples/python/route_guide/route_guide_client.py +++ b/examples/python/route_guide/route_guide_client.py @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """The Python implementation of the gRPC route guide client.""" from __future__ import print_function @@ -26,89 +25,91 @@ import route_guide_resources def make_route_note(message, latitude, longitude): - return route_guide_pb2.RouteNote( - message=message, - location=route_guide_pb2.Point(latitude=latitude, longitude=longitude)) + return route_guide_pb2.RouteNote( + message=message, + location=route_guide_pb2.Point(latitude=latitude, longitude=longitude)) def guide_get_one_feature(stub, point): - feature = stub.GetFeature(point) - if not feature.location: - print("Server returned incomplete feature") - return + feature = stub.GetFeature(point) + if not feature.location: + print("Server returned incomplete feature") + return - if feature.name: - print("Feature called %s at %s" % (feature.name, feature.location)) - else: - print("Found no feature at %s" % feature.location) + if feature.name: + print("Feature called %s at %s" % (feature.name, feature.location)) + else: + print("Found no feature at %s" % feature.location) def guide_get_feature(stub): - guide_get_one_feature(stub, route_guide_pb2.Point(latitude=409146138, longitude=-746188906)) - guide_get_one_feature(stub, route_guide_pb2.Point(latitude=0, longitude=0)) + guide_get_one_feature( + stub, route_guide_pb2.Point(latitude=409146138, longitude=-746188906)) + guide_get_one_feature(stub, route_guide_pb2.Point(latitude=0, longitude=0)) def guide_list_features(stub): - rectangle = route_guide_pb2.Rectangle( - lo=route_guide_pb2.Point(latitude=400000000, longitude=-750000000), - hi=route_guide_pb2.Point(latitude=420000000, longitude=-730000000)) - print("Looking for features between 40, -75 and 42, -73") + rectangle = route_guide_pb2.Rectangle( + lo=route_guide_pb2.Point(latitude=400000000, longitude=-750000000), + hi=route_guide_pb2.Point(latitude=420000000, longitude=-730000000)) + print("Looking for features between 40, -75 and 42, -73") - features = stub.ListFeatures(rectangle) + features = stub.ListFeatures(rectangle) - for feature in features: - print("Feature called %s at %s" % (feature.name, feature.location)) + for feature in features: + print("Feature called %s at %s" % (feature.name, feature.location)) def generate_route(feature_list): - for _ in range(0, 10): - random_feature = feature_list[random.randint(0, len(feature_list) - 1)] - print("Visiting point %s" % random_feature.location) - yield random_feature.location + for _ in range(0, 10): + random_feature = feature_list[random.randint(0, len(feature_list) - 1)] + print("Visiting point %s" % random_feature.location) + yield random_feature.location def guide_record_route(stub): - feature_list = route_guide_resources.read_route_guide_database() + feature_list = route_guide_resources.read_route_guide_database() - route_iterator = generate_route(feature_list) - route_summary = stub.RecordRoute(route_iterator) - print("Finished trip with %s points " % route_summary.point_count) - print("Passed %s features " % route_summary.feature_count) - print("Travelled %s meters " % route_summary.distance) - print("It took %s seconds " % route_summary.elapsed_time) + route_iterator = generate_route(feature_list) + route_summary = stub.RecordRoute(route_iterator) + print("Finished trip with %s points " % route_summary.point_count) + print("Passed %s features " % route_summary.feature_count) + print("Travelled %s meters " % route_summary.distance) + print("It took %s seconds " % route_summary.elapsed_time) def generate_messages(): - messages = [ - make_route_note("First message", 0, 0), - make_route_note("Second message", 0, 1), - make_route_note("Third message", 1, 0), - make_route_note("Fourth message", 0, 0), - make_route_note("Fifth message", 1, 0), - ] - for msg in messages: - print("Sending %s at %s" % (msg.message, msg.location)) - yield msg + messages = [ + make_route_note("First message", 0, 0), + make_route_note("Second message", 0, 1), + make_route_note("Third message", 1, 0), + make_route_note("Fourth message", 0, 0), + make_route_note("Fifth message", 1, 0), + ] + for msg in messages: + print("Sending %s at %s" % (msg.message, msg.location)) + yield msg def guide_route_chat(stub): - responses = stub.RouteChat(generate_messages()) - for response in responses: - print("Received message %s at %s" % (response.message, response.location)) + responses = stub.RouteChat(generate_messages()) + for response in responses: + print("Received message %s at %s" % + (response.message, response.location)) def run(): - channel = grpc.insecure_channel('localhost:50051') - stub = route_guide_pb2_grpc.RouteGuideStub(channel) - print("-------------- GetFeature --------------") - guide_get_feature(stub) - print("-------------- ListFeatures --------------") - guide_list_features(stub) - print("-------------- RecordRoute --------------") - guide_record_route(stub) - print("-------------- RouteChat --------------") - guide_route_chat(stub) + channel = grpc.insecure_channel('localhost:50051') + stub = route_guide_pb2_grpc.RouteGuideStub(channel) + print("-------------- GetFeature --------------") + guide_get_feature(stub) + print("-------------- ListFeatures --------------") + guide_list_features(stub) + print("-------------- RecordRoute --------------") + guide_record_route(stub) + print("-------------- RouteChat --------------") + guide_route_chat(stub) if __name__ == '__main__': - run() + run() diff --git a/examples/python/route_guide/route_guide_resources.py b/examples/python/route_guide/route_guide_resources.py index 08878636606..ace85d6f9d4 100644 --- a/examples/python/route_guide/route_guide_resources.py +++ b/examples/python/route_guide/route_guide_resources.py @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Common resources used in the gRPC route guide example.""" import json @@ -20,19 +19,19 @@ import route_guide_pb2 def read_route_guide_database(): - """Reads the route guide database. + """Reads the route guide database. Returns: The full contents of the route guide database as a sequence of route_guide_pb2.Features. """ - feature_list = [] - with open("route_guide_db.json") as route_guide_db_file: - for item in json.load(route_guide_db_file): - feature = route_guide_pb2.Feature( - name=item["name"], - location=route_guide_pb2.Point( - latitude=item["location"]["latitude"], - longitude=item["location"]["longitude"])) - feature_list.append(feature) - return feature_list + feature_list = [] + with open("route_guide_db.json") as route_guide_db_file: + for item in json.load(route_guide_db_file): + feature = route_guide_pb2.Feature( + name=item["name"], + location=route_guide_pb2.Point( + latitude=item["location"]["latitude"], + longitude=item["location"]["longitude"])) + feature_list.append(feature) + return feature_list diff --git a/examples/python/route_guide/route_guide_server.py b/examples/python/route_guide/route_guide_server.py index a0aa5fdb838..46f3322a39b 100644 --- a/examples/python/route_guide/route_guide_server.py +++ b/examples/python/route_guide/route_guide_server.py @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """The Python implementation of the gRPC route guide server.""" from concurrent import futures @@ -28,98 +27,102 @@ _ONE_DAY_IN_SECONDS = 60 * 60 * 24 def get_feature(feature_db, point): - """Returns Feature at given location or None.""" - for feature in feature_db: - if feature.location == point: - return feature - return None + """Returns Feature at given location or None.""" + for feature in feature_db: + if feature.location == point: + return feature + return None def get_distance(start, end): - """Distance between two points.""" - coord_factor = 10000000.0 - lat_1 = start.latitude / coord_factor - lat_2 = end.latitude / coord_factor - lon_1 = start.longitude / coord_factor - lon_2 = end.longitude / coord_factor - lat_rad_1 = math.radians(lat_1) - lat_rad_2 = math.radians(lat_2) - delta_lat_rad = math.radians(lat_2 - lat_1) - delta_lon_rad = math.radians(lon_2 - lon_1) - - a = (pow(math.sin(delta_lat_rad / 2), 2) + - (math.cos(lat_rad_1) * math.cos(lat_rad_2) * - pow(math.sin(delta_lon_rad / 2), 2))) - c = 2 * math.atan2(math.sqrt(a), math.sqrt(1 - a)) - R = 6371000; # metres - return R * c; + """Distance between two points.""" + coord_factor = 10000000.0 + lat_1 = start.latitude / coord_factor + lat_2 = end.latitude / coord_factor + lon_1 = start.longitude / coord_factor + lon_2 = end.longitude / coord_factor + lat_rad_1 = math.radians(lat_1) + lat_rad_2 = math.radians(lat_2) + delta_lat_rad = math.radians(lat_2 - lat_1) + delta_lon_rad = math.radians(lon_2 - lon_1) + + a = (pow(math.sin(delta_lat_rad / 2), 2) + + (math.cos(lat_rad_1) * math.cos(lat_rad_2) * pow( + math.sin(delta_lon_rad / 2), 2))) + c = 2 * math.atan2(math.sqrt(a), math.sqrt(1 - a)) + R = 6371000 + # metres + return R * c + class RouteGuideServicer(route_guide_pb2_grpc.RouteGuideServicer): - """Provides methods that implement functionality of route guide server.""" - - def __init__(self): - self.db = route_guide_resources.read_route_guide_database() - - def GetFeature(self, request, context): - feature = get_feature(self.db, request) - if feature is None: - return route_guide_pb2.Feature(name="", location=request) - else: - return feature - - def ListFeatures(self, request, context): - left = min(request.lo.longitude, request.hi.longitude) - right = max(request.lo.longitude, request.hi.longitude) - top = max(request.lo.latitude, request.hi.latitude) - bottom = min(request.lo.latitude, request.hi.latitude) - for feature in self.db: - if (feature.location.longitude >= left and - feature.location.longitude <= right and - feature.location.latitude >= bottom and - feature.location.latitude <= top): - yield feature - - def RecordRoute(self, request_iterator, context): - point_count = 0 - feature_count = 0 - distance = 0.0 - prev_point = None - - start_time = time.time() - for point in request_iterator: - point_count += 1 - if get_feature(self.db, point): - feature_count += 1 - if prev_point: - distance += get_distance(prev_point, point) - prev_point = point - - elapsed_time = time.time() - start_time - return route_guide_pb2.RouteSummary(point_count=point_count, - feature_count=feature_count, - distance=int(distance), - elapsed_time=int(elapsed_time)) - - def RouteChat(self, request_iterator, context): - prev_notes = [] - for new_note in request_iterator: - for prev_note in prev_notes: - if prev_note.location == new_note.location: - yield prev_note - prev_notes.append(new_note) + """Provides methods that implement functionality of route guide server.""" + + def __init__(self): + self.db = route_guide_resources.read_route_guide_database() + + def GetFeature(self, request, context): + feature = get_feature(self.db, request) + if feature is None: + return route_guide_pb2.Feature(name="", location=request) + else: + return feature + + def ListFeatures(self, request, context): + left = min(request.lo.longitude, request.hi.longitude) + right = max(request.lo.longitude, request.hi.longitude) + top = max(request.lo.latitude, request.hi.latitude) + bottom = min(request.lo.latitude, request.hi.latitude) + for feature in self.db: + if (feature.location.longitude >= left and + feature.location.longitude <= right and + feature.location.latitude >= bottom and + feature.location.latitude <= top): + yield feature + + def RecordRoute(self, request_iterator, context): + point_count = 0 + feature_count = 0 + distance = 0.0 + prev_point = None + + start_time = time.time() + for point in request_iterator: + point_count += 1 + if get_feature(self.db, point): + feature_count += 1 + if prev_point: + distance += get_distance(prev_point, point) + prev_point = point + + elapsed_time = time.time() - start_time + return route_guide_pb2.RouteSummary( + point_count=point_count, + feature_count=feature_count, + distance=int(distance), + elapsed_time=int(elapsed_time)) + + def RouteChat(self, request_iterator, context): + prev_notes = [] + for new_note in request_iterator: + for prev_note in prev_notes: + if prev_note.location == new_note.location: + yield prev_note + prev_notes.append(new_note) def serve(): - server = grpc.server(futures.ThreadPoolExecutor(max_workers=10)) - route_guide_pb2_grpc.add_RouteGuideServicer_to_server( - RouteGuideServicer(), server) - server.add_insecure_port('[::]:50051') - server.start() - try: - while True: - time.sleep(_ONE_DAY_IN_SECONDS) - except KeyboardInterrupt: - server.stop(0) + server = grpc.server(futures.ThreadPoolExecutor(max_workers=10)) + route_guide_pb2_grpc.add_RouteGuideServicer_to_server(RouteGuideServicer(), + server) + server.add_insecure_port('[::]:50051') + server.start() + try: + while True: + time.sleep(_ONE_DAY_IN_SECONDS) + except KeyboardInterrupt: + server.stop(0) + if __name__ == '__main__': - serve() + serve() diff --git a/examples/python/route_guide/run_codegen.py b/examples/python/route_guide/run_codegen.py index 4b61cf4faa9..1ec7fcd51fc 100644 --- a/examples/python/route_guide/run_codegen.py +++ b/examples/python/route_guide/run_codegen.py @@ -11,17 +11,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - """Runs protoc with the gRPC plugin to generate messages and gRPC stubs.""" from grpc_tools import protoc -protoc.main( - ( - '', - '-I../../protos', - '--python_out=.', - '--grpc_python_out=.', - '../../protos/route_guide.proto', - ) -) +protoc.main(('', '-I../../protos', '--python_out=.', '--grpc_python_out=.', + '../../protos/route_guide.proto',)) diff --git a/tools/distrib/yapf_code.sh b/tools/distrib/yapf_code.sh index 51d1799a21d..5921bef8405 100755 --- a/tools/distrib/yapf_code.sh +++ b/tools/distrib/yapf_code.sh @@ -19,9 +19,11 @@ set -ex cd "$(dirname "${0}")/../.." DIRS=( + 'examples/python' 'src/python' ) EXCLUSIONS=( + '*_pb2*.py' ) VIRTUALENV=yapf_virtual_environment From bdf63919b8e7e5fde7ce63b9bf2acbd85cc712e2 Mon Sep 17 00:00:00 2001 From: Dan Born Date: Fri, 17 Nov 2017 14:31:00 -0800 Subject: [PATCH 117/127] Refactor POSIX TCP client connect. --- src/core/lib/iomgr/tcp_client_posix.cc | 101 ++++++++++++--------- src/core/lib/iomgr/tcp_client_posix.h | 37 ++++++++ test/core/end2end/dualstack_socket_test.cc | 21 +++++ 3 files changed, 117 insertions(+), 42 deletions(-) diff --git a/src/core/lib/iomgr/tcp_client_posix.cc b/src/core/lib/iomgr/tcp_client_posix.cc index 15062a52cda..24ccab14b2f 100644 --- a/src/core/lib/iomgr/tcp_client_posix.cc +++ b/src/core/lib/iomgr/tcp_client_posix.cc @@ -236,65 +236,68 @@ finish: GRPC_CLOSURE_SCHED(closure, error); } -static void tcp_client_connect_impl(grpc_closure* closure, grpc_endpoint** ep, - grpc_pollset_set* interested_parties, - const grpc_channel_args* channel_args, - const grpc_resolved_address* addr, - grpc_millis deadline) { - int fd; +grpc_error* grpc_tcp_client_prepare_fd(const grpc_channel_args* channel_args, + const grpc_resolved_address* addr, + grpc_resolved_address* mapped_addr, + grpc_fd** fdobj) { grpc_dualstack_mode dsmode; - int err; - async_connect* ac; - grpc_resolved_address addr6_v4mapped; - grpc_resolved_address addr4_copy; - grpc_fd* fdobj; + int fd; + grpc_error* error; char* name; char* addr_str; - grpc_error* error; - - *ep = nullptr; - - /* Use dualstack sockets where available. */ - if (grpc_sockaddr_to_v4mapped(addr, &addr6_v4mapped)) { - addr = &addr6_v4mapped; + *fdobj = nullptr; + /* Use dualstack sockets where available. Set mapped to v6 or v4 mapped to + v6. */ + if (!grpc_sockaddr_to_v4mapped(addr, mapped_addr)) { + /* addr is v4 mapped to v6 or v6. */ + memcpy(mapped_addr, addr, sizeof(*mapped_addr)); } - - error = grpc_create_dualstack_socket(addr, SOCK_STREAM, 0, &dsmode, &fd); + error = + grpc_create_dualstack_socket(mapped_addr, SOCK_STREAM, 0, &dsmode, &fd); if (error != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(closure, error); - return; + return error; } if (dsmode == GRPC_DSMODE_IPV4) { - /* If we got an AF_INET socket, map the address back to IPv4. */ - GPR_ASSERT(grpc_sockaddr_is_v4mapped(addr, &addr4_copy)); - addr = &addr4_copy; + /* Original addr is either v4 or v4 mapped to v6. Set mapped_addr to v4. */ + if (!grpc_sockaddr_is_v4mapped(addr, mapped_addr)) { + memcpy(mapped_addr, addr, sizeof(*mapped_addr)); + } } - if ((error = prepare_socket(addr, fd, channel_args)) != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(closure, error); - return; + if ((error = prepare_socket(mapped_addr, fd, channel_args)) != + GRPC_ERROR_NONE) { + return error; } + addr_str = grpc_sockaddr_to_uri(mapped_addr); + gpr_asprintf(&name, "tcp-client:%s", addr_str); + *fdobj = grpc_fd_create(fd, name); + gpr_free(name); + gpr_free(addr_str); + return GRPC_ERROR_NONE; +} +void grpc_tcp_client_create_from_prepared_fd( + grpc_pollset_set* interested_parties, grpc_closure* closure, grpc_fd* fdobj, + const grpc_channel_args* channel_args, const grpc_resolved_address* addr, + grpc_millis deadline, grpc_endpoint** ep) { + const int fd = grpc_fd_wrapped_fd(fdobj); + int err; + async_connect* ac; do { GPR_ASSERT(addr->len < ~(socklen_t)0); err = connect(fd, (const struct sockaddr*)addr->addr, (socklen_t)addr->len); } while (err < 0 && errno == EINTR); - - addr_str = grpc_sockaddr_to_uri(addr); - gpr_asprintf(&name, "tcp-client:%s", addr_str); - - fdobj = grpc_fd_create(fd, name); - if (err >= 0) { + char* addr_str = grpc_sockaddr_to_uri(addr); *ep = grpc_tcp_client_create_from_fd(fdobj, channel_args, addr_str); + gpr_free(addr_str); GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); - goto done; + return; } - if (errno != EWOULDBLOCK && errno != EINPROGRESS) { grpc_fd_orphan(fdobj, nullptr, nullptr, false /* already_closed */, "tcp_client_connect_error"); GRPC_CLOSURE_SCHED(closure, GRPC_OS_ERROR(errno, "connect")); - goto done; + return; } grpc_pollset_set_add_fd(interested_parties, fdobj); @@ -304,8 +307,7 @@ static void tcp_client_connect_impl(grpc_closure* closure, grpc_endpoint** ep, ac->ep = ep; ac->fd = fdobj; ac->interested_parties = interested_parties; - ac->addr_str = addr_str; - addr_str = nullptr; + ac->addr_str = grpc_sockaddr_to_uri(addr); gpr_mu_init(&ac->mu); ac->refs = 2; GRPC_CLOSURE_INIT(&ac->write_closure, on_writable, ac, @@ -322,10 +324,25 @@ static void tcp_client_connect_impl(grpc_closure* closure, grpc_endpoint** ep, grpc_timer_init(&ac->alarm, deadline, &ac->on_alarm); grpc_fd_notify_on_write(ac->fd, &ac->write_closure); gpr_mu_unlock(&ac->mu); +} -done: - gpr_free(name); - gpr_free(addr_str); +static void tcp_client_connect_impl(grpc_closure* closure, grpc_endpoint** ep, + grpc_pollset_set* interested_parties, + const grpc_channel_args* channel_args, + const grpc_resolved_address* addr, + grpc_millis deadline) { + grpc_resolved_address mapped_addr; + grpc_fd* fdobj = nullptr; + grpc_error* error; + *ep = nullptr; + if ((error = grpc_tcp_client_prepare_fd(channel_args, addr, &mapped_addr, + &fdobj)) != GRPC_ERROR_NONE) { + GRPC_CLOSURE_SCHED(closure, error); + return; + } + grpc_tcp_client_create_from_prepared_fd(interested_parties, closure, fdobj, + channel_args, &mapped_addr, deadline, + ep); } // overridden by api_fuzzer.c diff --git a/src/core/lib/iomgr/tcp_client_posix.h b/src/core/lib/iomgr/tcp_client_posix.h index 7d0f133a6b4..57e50a67d23 100644 --- a/src/core/lib/iomgr/tcp_client_posix.h +++ b/src/core/lib/iomgr/tcp_client_posix.h @@ -23,7 +23,44 @@ #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/tcp_client.h" +/* Create an endpoint from a connected grpc_fd. + + fd: a connected FD. Ownership is taken. + channel_args: may contain custom settings for the endpoint + addr_str: destination address in printable format + Returns: a new endpoint +*/ grpc_endpoint* grpc_tcp_client_create_from_fd( grpc_fd* fd, const grpc_channel_args* channel_args, const char* addr_str); +/* Return a configured, unbound, unconnected TCP client grpc_fd. + + channel_args: may contain custom settings for the fd + addr: the destination address + mapped_addr: out parameter. addr mapped to an address appropriate to the + type of socket FD created. For example, if addr is IPv4 and dual stack + sockets are available, mapped_addr will be an IPv4-mapped IPv6 address + fdobj: out parameter. The new FD + Returns: error, if any. Out parameters are not set on error +*/ +grpc_error* grpc_tcp_client_prepare_fd(const grpc_channel_args* channel_args, + const grpc_resolved_address* addr, + grpc_resolved_address* mapped_addr, + grpc_fd** fdobj); + +/* Connect a configured TCP client grpc_fd. + + interested_parties: a set of pollsets that would be interested in this + connection being established (in order to continue their work + closure: called when complete. On success, *ep will be set. + fdobj: an FD returned from grpc_tcp_client_prepare_fd(). Ownership is taken + channel_args: may contain custom settings for the endpoint + deadline: connection deadline + ep: out parameter. Set before closure is called if successful +*/ +void grpc_tcp_client_create_from_prepared_fd( + grpc_pollset_set* interested_parties, grpc_closure* closure, grpc_fd* fdobj, + const grpc_channel_args* channel_args, const grpc_resolved_address* addr, + grpc_millis deadline, grpc_endpoint** ep); + #endif /* GRPC_CORE_LIB_IOMGR_TCP_CLIENT_POSIX_H */ diff --git a/test/core/end2end/dualstack_socket_test.cc b/test/core/end2end/dualstack_socket_test.cc index ad2b24fdb0b..2ba1c17c2cd 100644 --- a/test/core/end2end/dualstack_socket_test.cc +++ b/test/core/end2end/dualstack_socket_test.cc @@ -29,7 +29,9 @@ #include #include +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/support/string.h" @@ -54,6 +56,21 @@ static void drain_cq(grpc_completion_queue* cq) { static void do_nothing(void* ignored) {} +static void log_resolved_addrs(const char* label, const char* hostname) { + grpc_resolved_addresses* res = nullptr; + grpc_error* error = grpc_blocking_resolve_address(hostname, "80", &res); + if (error != GRPC_ERROR_NONE || res == nullptr) { + GRPC_LOG_IF_ERROR(hostname, error); + return; + } + for (size_t i = 0; i < res->naddrs; ++i) { + char* addr_str = grpc_sockaddr_to_uri(&res->addrs[i]); + gpr_log(GPR_INFO, "%s: %s", label, addr_str); + gpr_free(addr_str); + } + grpc_resolved_addresses_destroy(res); +} + void test_connect(const char* server_host, const char* client_host, int port, int expect_ok) { char* client_hostport; @@ -140,6 +157,8 @@ void test_connect(const char* server_host, const char* client_host, int port, gpr_log(GPR_INFO, "Testing with server=%s client=%s (expecting %s)", server_hostport, client_hostport, expect_ok ? "success" : "failure"); + log_resolved_addrs("server resolved addr", server_host); + log_resolved_addrs("client resolved addr", client_host); gpr_free(client_hostport); gpr_free(server_hostport); @@ -236,6 +255,8 @@ void test_connect(const char* server_host, const char* client_host, int port, CQ_EXPECT_COMPLETION(cqv, tag(1), 1); cq_verify(cqv); + gpr_log(GPR_INFO, "status: %d (expected: %d)", status, + GRPC_STATUS_UNAVAILABLE); GPR_ASSERT(status == GRPC_STATUS_UNAVAILABLE); } From 2455b3d33df9f3d4f33d8b30c5b456e1d0ea13fc Mon Sep 17 00:00:00 2001 From: Yuchen Zeng Date: Tue, 12 Dec 2017 11:09:39 -0800 Subject: [PATCH 118/127] Fix tsan issue --- test/cpp/util/grpc_tool_test.cc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/test/cpp/util/grpc_tool_test.cc b/test/cpp/util/grpc_tool_test.cc index d3656db1509..0b599f4eeb1 100644 --- a/test/cpp/util/grpc_tool_test.cc +++ b/test/cpp/util/grpc_tool_test.cc @@ -86,6 +86,7 @@ DECLARE_bool(binary_output); DECLARE_bool(l); DECLARE_bool(batch); DECLARE_string(metadata); +DECLARE_string(protofiles); namespace { @@ -697,6 +698,16 @@ TEST_F(GrpcToolTest, CallCommandWithMetadata) { strstr(output_stream.str().c_str(), "message: \"Hello\"")); } + FLAGS_metadata = ""; + ShutdownServer(); +} + +TEST_F(GrpcToolTest, CallCommandWithBadMetadata) { + // Test input "grpc_cli call localhost:10000 Echo "message: 'Hello'" + const char* argv[] = {"grpc_cli", "call", "localhost:10000", "Echo", + "message: 'Hello'"}; + FLAGS_protofiles = "src/proto/grpc/testing/echo.proto"; + { std::stringstream output_stream; FLAGS_metadata = "key0:val0:key1"; @@ -720,7 +731,7 @@ TEST_F(GrpcToolTest, CallCommandWithMetadata) { } FLAGS_metadata = ""; - ShutdownServer(); + FLAGS_protofiles = ""; } } // namespace testing From e1a00b34572e9ce6cbc10f39669c4a32ad254419 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Tue, 12 Dec 2017 11:18:01 -0800 Subject: [PATCH 119/127] Add OWNERS to protect scenario_result_schema.json --- .github/CODEOWNERS | 1 + tools/run_tests/performance/OWNERS | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 tools/run_tests/performance/OWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 094e43e4705..cb322814fe6 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -4,3 +4,4 @@ /**/OWNERS @markdroth @nicolasnoble @ctiller /bazel/** @nicolasnoble @dgquintas @ctiller /src/core/ext/filters/client_channel/** @markdroth @dgquintas @ctiller +/tools/run_tests/performance/** @ncteisen @matt-kwong @ctiller diff --git a/tools/run_tests/performance/OWNERS b/tools/run_tests/performance/OWNERS new file mode 100644 index 00000000000..98c81529f38 --- /dev/null +++ b/tools/run_tests/performance/OWNERS @@ -0,0 +1,9 @@ +set noparent + +# These owners are in place to ensure that scenario_result_schema.json is not +# modified without also running tools/run_tests/performance/patch_scenario_results_schema.py +# to update the BigQuery schema + +@ncteisen +@matt-kwong +@ctiller From 30ced5d09f01ca8a92e517f189b3bbcba40ee688 Mon Sep 17 00:00:00 2001 From: yang-g Date: Tue, 12 Dec 2017 11:45:32 -0800 Subject: [PATCH 120/127] Add comments for AsyncGenericService --- include/grpc++/generic/async_generic_service.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/grpc++/generic/async_generic_service.h b/include/grpc++/generic/async_generic_service.h index cd9a65e3cb0..b1ea4f39092 100644 --- a/include/grpc++/generic/async_generic_service.h +++ b/include/grpc++/generic/async_generic_service.h @@ -42,6 +42,23 @@ class GenericServerContext final : public ServerContext { grpc::string host_; }; +// A generic service at the server side accepts all RPC methods and hosts. It is +// typically used in proxies. The generic service can be registered to a server +// which also has other services. +// Sample usage: +// ServerBuilder builder; +// auto cq = builder.AddCompletionQueue(); +// AsyncGenericService generic_service; +// builder.RegisterAsyncGeneicService(&generic_service); +// auto server = builder.BuildAndStart(); +// +// // request a new call +// GenericServerContext context; +// GenericAsyncReaderWriter stream; +// generic_service.RequestCall(&context, &stream, cq.get(), cq.get(), tag); +// +// When tag is retrieved from cq->Next(), context.method() can be used to look +// at the method and the RPC can be handled accordingly. class AsyncGenericService final { public: AsyncGenericService() : server_(nullptr) {} From 51d79c83a64a99005373a37ffc7a3eb7cc869672 Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Tue, 12 Dec 2017 14:10:54 -0800 Subject: [PATCH 121/127] Bump BUILD version to 1.9.x-dev on master --- BUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILD b/BUILD index 13843195ea7..dba6592f172 100644 --- a/BUILD +++ b/BUILD @@ -44,11 +44,11 @@ config_setting( ) # This should be updated along with build.yaml -g_stands_for = "generous" +g_stands_for = "glossy" core_version = "5.0.0-dev" -version = "1.8.0-dev" +version = "1.9.0-dev" GPR_PUBLIC_HDRS = [ "include/grpc/support/alloc.h", From dbd9d99fd73bd625cba443f9b5fd3d502fe58f4b Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 12 Dec 2017 15:23:16 -0800 Subject: [PATCH 122/127] Merge changes from grpc.io's version wire.md --- doc/PROTOCOL-HTTP2.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/PROTOCOL-HTTP2.md b/doc/PROTOCOL-HTTP2.md index 29d3cc2e767..580c2be2a0c 100644 --- a/doc/PROTOCOL-HTTP2.md +++ b/doc/PROTOCOL-HTTP2.md @@ -1,7 +1,7 @@ # gRPC over HTTP2 ## Introduction -This document serves as a detailed description for an implementation of gRPC carried over HTTP2 draft 17 framing. It assumes familiarity with the HTTP2 specification. +This document serves as a detailed description for an implementation of gRPC carried over HTTP2 framing. It assumes familiarity with the HTTP2 specification. ## Protocol Production rules are using ABNF syntax. @@ -24,7 +24,7 @@ Request-Headers are delivered as HTTP2 headers in HEADERS + CONTINUATION frames. * **Call-Definition** → Method Scheme Path TE [Authority] [Timeout] Content-Type [Message-Type] [Message-Encoding] [Message-Accept-Encoding] [User-Agent] * **Method** → ":method POST" * **Scheme** → ":scheme " ("http" / "https") -* **Path** → ":path" "/" Service-Name "/" {_method name_} +* **Path** → ":path" "/" Service-Name "/" {_method name_} # But see note below. * **Service-Name** → {_IDL-specific service name_} * **Authority** → ":authority" {_virtual host name of authority_} * **TE** → "te" "trailers" # Used to detect incompatible proxies @@ -170,6 +170,7 @@ HEADERS (flags = END_STREAM, END_HEADERS) grpc-status = 0 # OK trace-proto-bin = jher831yy13JHy3hc ``` + #### User Agents While the protocol does not require a user-agent to function it is recommended that clients provide a structured user-agent string that provides a basic description of the calling library, version & platform to facilitate issue diagnosis in heterogeneous environments. The following structure is recommended to library developers @@ -197,7 +198,7 @@ Unless explicitly defined to be, gRPC Calls are not assumed to be idempotent. S #### HTTP2 Transport Mapping ##### Stream Identification -All GRPC calls need to specify an internal ID. We will use HTTP2 stream-ids as call identifiers in this scheme. NOTE: These id’s are contextual to an open HTTP2 session and will not be unique within a given process that is handling more than one HTTP2 session nor can they be used as GUIDs. +All GRPC calls need to specify an internal ID. We will use HTTP2 stream-ids as call identifiers in this scheme. NOTE: These ids are contextual to an open HTTP2 session and will not be unique within a given process that is handling more than one HTTP2 session nor can they be used as GUIDs. ##### Data Frames DATA frame boundaries have no relation to **Length-Prefixed-Message** boundaries and implementations should make no assumptions about their alignment. @@ -232,6 +233,7 @@ INADEQUATE_SECURITY| PERMISSION_DENIED … with additional detail indicating tha The HTTP2 specification mandates the use of TLS 1.2 or higher when TLS is used with HTTP2. It also places some additional constraints on the allowed ciphers in deployments to avoid known-problems as well as requiring SNI support. It is also expected that HTTP2 will be used in conjunction with proprietary transport security mechanisms about which the specification can make no meaningful recommendations. ##### Connection Management + ###### GOAWAY Frame Sent by servers to clients to indicate that they will no longer accept any new streams on the associated connections. This frame includes the id of the last successfully accepted stream by the server. Clients should consider any stream initiated after the last successfully accepted stream as UNAVAILABLE and retry the call elsewhere. Clients are free to continue working with the already accepted streams until they complete or the connection is terminated. From e7136643b835a4fae12c6e8f36b5b5d6f3ec87a5 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 12 Dec 2017 15:55:13 -0800 Subject: [PATCH 123/127] remove space --- doc/PROTOCOL-HTTP2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/PROTOCOL-HTTP2.md b/doc/PROTOCOL-HTTP2.md index 580c2be2a0c..107a8e88242 100644 --- a/doc/PROTOCOL-HTTP2.md +++ b/doc/PROTOCOL-HTTP2.md @@ -1,7 +1,7 @@ # gRPC over HTTP2 ## Introduction -This document serves as a detailed description for an implementation of gRPC carried over HTTP2 framing. It assumes familiarity with the HTTP2 specification. +This document serves as a detailed description for an implementation of gRPC carried over HTTP2 framing. It assumes familiarity with the HTTP2 specification. ## Protocol Production rules are using ABNF syntax. From 96d5eb5eb4aef3a74862bb4ddd9bf2e2b730ad59 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 13 Dec 2017 02:30:13 +0100 Subject: [PATCH 124/127] use auto-generated header for C# plugin --- src/compiler/csharp_generator.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/compiler/csharp_generator.cc b/src/compiler/csharp_generator.cc index 40fe0b054a5..7c97056402e 100644 --- a/src/compiler/csharp_generator.cc +++ b/src/compiler/csharp_generator.cc @@ -659,8 +659,11 @@ grpc::string GetServices(const FileDescriptor* file, bool generate_client, } // Write out a file header. - out.Print("// Generated by the protocol buffer compiler. DO NOT EDIT!\n"); - out.Print("// source: $filename$\n", "filename", file->name()); + out.Print("// \n"); + out.Print( + "// Generated by the protocol buffer compiler. DO NOT EDIT!\n"); + out.Print("// source: $filename$\n", "filename", file->name()); + out.Print("// \n"); // use C++ style as there are no file-level XML comments in .NET grpc::string leading_comments = GetCsharpComments(file, true); From 386bbdf1656d567e3636c4e60fec474749b1c8d1 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 13 Dec 2017 02:42:22 +0100 Subject: [PATCH 125/127] regenerate --- src/csharp/Grpc.Examples/MathGrpc.cs | 6 +- src/csharp/Grpc.HealthCheck/HealthGrpc.cs | 6 +- src/csharp/Grpc.IntegrationTesting/Control.cs | 30 +- .../CoreStats/Stats.cs | 623 ++++++++++++++++++ .../Grpc.IntegrationTesting/EchoMessages.cs | 48 +- .../Grpc.IntegrationTesting/MetricsGrpc.cs | 6 +- .../Grpc.IntegrationTesting/Payloads.cs | 15 +- .../Grpc.IntegrationTesting/Services.cs | 41 +- .../Grpc.IntegrationTesting/ServicesGrpc.cs | 6 +- src/csharp/Grpc.IntegrationTesting/Stats.cs | 110 +++- .../Grpc.IntegrationTesting/TestGrpc.cs | 6 +- src/csharp/Grpc.Reflection/Reflection.cs | 25 +- src/csharp/Grpc.Reflection/ReflectionGrpc.cs | 6 +- 13 files changed, 856 insertions(+), 72 deletions(-) create mode 100644 src/csharp/Grpc.IntegrationTesting/CoreStats/Stats.cs diff --git a/src/csharp/Grpc.Examples/MathGrpc.cs b/src/csharp/Grpc.Examples/MathGrpc.cs index 4ed414400dc..e29b1087e45 100644 --- a/src/csharp/Grpc.Examples/MathGrpc.cs +++ b/src/csharp/Grpc.Examples/MathGrpc.cs @@ -1,5 +1,7 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: math/math.proto +// +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: math/math.proto +// // Original file comments: // Copyright 2015 gRPC authors. // diff --git a/src/csharp/Grpc.HealthCheck/HealthGrpc.cs b/src/csharp/Grpc.HealthCheck/HealthGrpc.cs index 3e8eb346895..24a72599798 100644 --- a/src/csharp/Grpc.HealthCheck/HealthGrpc.cs +++ b/src/csharp/Grpc.HealthCheck/HealthGrpc.cs @@ -1,5 +1,7 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: grpc/health/v1/health.proto +// +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: grpc/health/v1/health.proto +// // Original file comments: // Copyright 2015 gRPC authors. // diff --git a/src/csharp/Grpc.IntegrationTesting/Control.cs b/src/csharp/Grpc.IntegrationTesting/Control.cs index b15da8b8e51..8e5da7b9f21 100644 --- a/src/csharp/Grpc.IntegrationTesting/Control.cs +++ b/src/csharp/Grpc.IntegrationTesting/Control.cs @@ -522,10 +522,16 @@ namespace Grpc.Testing { } switch (other.LoadCase) { case LoadOneofCase.ClosedLoop: - ClosedLoop = other.ClosedLoop; + if (ClosedLoop == null) { + ClosedLoop = new global::Grpc.Testing.ClosedLoopParams(); + } + ClosedLoop.MergeFrom(other.ClosedLoop); break; case LoadOneofCase.Poisson: - Poisson = other.Poisson; + if (Poisson == null) { + Poisson = new global::Grpc.Testing.PoissonParams(); + } + Poisson.MergeFrom(other.Poisson); break; } @@ -1901,10 +1907,16 @@ namespace Grpc.Testing { } switch (other.ArgtypeCase) { case ArgtypeOneofCase.Setup: - Setup = other.Setup; + if (Setup == null) { + Setup = new global::Grpc.Testing.ClientConfig(); + } + Setup.MergeFrom(other.Setup); break; case ArgtypeOneofCase.Mark: - Mark = other.Mark; + if (Mark == null) { + Mark = new global::Grpc.Testing.Mark(); + } + Mark.MergeFrom(other.Mark); break; } @@ -2508,10 +2520,16 @@ namespace Grpc.Testing { } switch (other.ArgtypeCase) { case ArgtypeOneofCase.Setup: - Setup = other.Setup; + if (Setup == null) { + Setup = new global::Grpc.Testing.ServerConfig(); + } + Setup.MergeFrom(other.Setup); break; case ArgtypeOneofCase.Mark: - Mark = other.Mark; + if (Mark == null) { + Mark = new global::Grpc.Testing.Mark(); + } + Mark.MergeFrom(other.Mark); break; } diff --git a/src/csharp/Grpc.IntegrationTesting/CoreStats/Stats.cs b/src/csharp/Grpc.IntegrationTesting/CoreStats/Stats.cs new file mode 100644 index 00000000000..380294e3358 --- /dev/null +++ b/src/csharp/Grpc.IntegrationTesting/CoreStats/Stats.cs @@ -0,0 +1,623 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: grpc/core/stats.proto +#pragma warning disable 1591, 0612, 3021 +#region Designer generated code + +using pb = global::Google.Protobuf; +using pbc = global::Google.Protobuf.Collections; +using pbr = global::Google.Protobuf.Reflection; +using scg = global::System.Collections.Generic; +namespace Grpc.Core { + + /// Holder for reflection information generated from grpc/core/stats.proto + public static partial class StatsReflection { + + #region Descriptor + /// File descriptor for grpc/core/stats.proto + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static StatsReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChVncnBjL2NvcmUvc3RhdHMucHJvdG8SCWdycGMuY29yZSImCgZCdWNrZXQS", + "DQoFc3RhcnQYASABKAESDQoFY291bnQYAiABKAQiLwoJSGlzdG9ncmFtEiIK", + "B2J1Y2tldHMYASADKAsyES5ncnBjLmNvcmUuQnVja2V0IlsKBk1ldHJpYxIM", + "CgRuYW1lGAEgASgJEg8KBWNvdW50GAogASgESAASKQoJaGlzdG9ncmFtGAsg", + "ASgLMhQuZ3JwYy5jb3JlLkhpc3RvZ3JhbUgAQgcKBXZhbHVlIisKBVN0YXRz", + "EiIKB21ldHJpY3MYASADKAsyES5ncnBjLmNvcmUuTWV0cmljYgZwcm90bzM=")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Core.Bucket), global::Grpc.Core.Bucket.Parser, new[]{ "Start", "Count" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Core.Histogram), global::Grpc.Core.Histogram.Parser, new[]{ "Buckets" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Core.Metric), global::Grpc.Core.Metric.Parser, new[]{ "Name", "Count", "Histogram" }, new[]{ "Value" }, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Core.Stats), global::Grpc.Core.Stats.Parser, new[]{ "Metrics" }, null, null, null) + })); + } + #endregion + + } + #region Messages + public sealed partial class Bucket : pb::IMessage { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new Bucket()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Grpc.Core.StatsReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Bucket() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Bucket(Bucket other) : this() { + start_ = other.start_; + count_ = other.count_; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Bucket Clone() { + return new Bucket(this); + } + + /// Field number for the "start" field. + public const int StartFieldNumber = 1; + private double start_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Start { + get { return start_; } + set { + start_ = value; + } + } + + /// Field number for the "count" field. + public const int CountFieldNumber = 2; + private ulong count_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public ulong Count { + get { return count_; } + set { + count_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as Bucket); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(Bucket other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (Start != other.Start) return false; + if (Count != other.Count) return false; + return true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (Start != 0D) hash ^= Start.GetHashCode(); + if (Count != 0UL) hash ^= Count.GetHashCode(); + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + if (Start != 0D) { + output.WriteRawTag(9); + output.WriteDouble(Start); + } + if (Count != 0UL) { + output.WriteRawTag(16); + output.WriteUInt64(Count); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (Start != 0D) { + size += 1 + 8; + } + if (Count != 0UL) { + size += 1 + pb::CodedOutputStream.ComputeUInt64Size(Count); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(Bucket other) { + if (other == null) { + return; + } + if (other.Start != 0D) { + Start = other.Start; + } + if (other.Count != 0UL) { + Count = other.Count; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + input.SkipLastField(); + break; + case 9: { + Start = input.ReadDouble(); + break; + } + case 16: { + Count = input.ReadUInt64(); + break; + } + } + } + } + + } + + public sealed partial class Histogram : pb::IMessage { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new Histogram()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Grpc.Core.StatsReflection.Descriptor.MessageTypes[1]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Histogram() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Histogram(Histogram other) : this() { + buckets_ = other.buckets_.Clone(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Histogram Clone() { + return new Histogram(this); + } + + /// Field number for the "buckets" field. + public const int BucketsFieldNumber = 1; + private static readonly pb::FieldCodec _repeated_buckets_codec + = pb::FieldCodec.ForMessage(10, global::Grpc.Core.Bucket.Parser); + private readonly pbc::RepeatedField buckets_ = new pbc::RepeatedField(); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField Buckets { + get { return buckets_; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as Histogram); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(Histogram other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if(!buckets_.Equals(other.buckets_)) return false; + return true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + hash ^= buckets_.GetHashCode(); + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + buckets_.WriteTo(output, _repeated_buckets_codec); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + size += buckets_.CalculateSize(_repeated_buckets_codec); + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(Histogram other) { + if (other == null) { + return; + } + buckets_.Add(other.buckets_); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + input.SkipLastField(); + break; + case 10: { + buckets_.AddEntriesFrom(input, _repeated_buckets_codec); + break; + } + } + } + } + + } + + public sealed partial class Metric : pb::IMessage { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new Metric()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Grpc.Core.StatsReflection.Descriptor.MessageTypes[2]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Metric() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Metric(Metric other) : this() { + name_ = other.name_; + switch (other.ValueCase) { + case ValueOneofCase.Count: + Count = other.Count; + break; + case ValueOneofCase.Histogram: + Histogram = other.Histogram.Clone(); + break; + } + + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Metric Clone() { + return new Metric(this); + } + + /// Field number for the "name" field. + public const int NameFieldNumber = 1; + private string name_ = ""; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public string Name { + get { return name_; } + set { + name_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "count" field. + public const int CountFieldNumber = 10; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public ulong Count { + get { return valueCase_ == ValueOneofCase.Count ? (ulong) value_ : 0UL; } + set { + value_ = value; + valueCase_ = ValueOneofCase.Count; + } + } + + /// Field number for the "histogram" field. + public const int HistogramFieldNumber = 11; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public global::Grpc.Core.Histogram Histogram { + get { return valueCase_ == ValueOneofCase.Histogram ? (global::Grpc.Core.Histogram) value_ : null; } + set { + value_ = value; + valueCase_ = value == null ? ValueOneofCase.None : ValueOneofCase.Histogram; + } + } + + private object value_; + /// Enum of possible cases for the "value" oneof. + public enum ValueOneofCase { + None = 0, + Count = 10, + Histogram = 11, + } + private ValueOneofCase valueCase_ = ValueOneofCase.None; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public ValueOneofCase ValueCase { + get { return valueCase_; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void ClearValue() { + valueCase_ = ValueOneofCase.None; + value_ = null; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as Metric); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(Metric other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (Name != other.Name) return false; + if (Count != other.Count) return false; + if (!object.Equals(Histogram, other.Histogram)) return false; + if (ValueCase != other.ValueCase) return false; + return true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (Name.Length != 0) hash ^= Name.GetHashCode(); + if (valueCase_ == ValueOneofCase.Count) hash ^= Count.GetHashCode(); + if (valueCase_ == ValueOneofCase.Histogram) hash ^= Histogram.GetHashCode(); + hash ^= (int) valueCase_; + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + if (Name.Length != 0) { + output.WriteRawTag(10); + output.WriteString(Name); + } + if (valueCase_ == ValueOneofCase.Count) { + output.WriteRawTag(80); + output.WriteUInt64(Count); + } + if (valueCase_ == ValueOneofCase.Histogram) { + output.WriteRawTag(90); + output.WriteMessage(Histogram); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (Name.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(Name); + } + if (valueCase_ == ValueOneofCase.Count) { + size += 1 + pb::CodedOutputStream.ComputeUInt64Size(Count); + } + if (valueCase_ == ValueOneofCase.Histogram) { + size += 1 + pb::CodedOutputStream.ComputeMessageSize(Histogram); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(Metric other) { + if (other == null) { + return; + } + if (other.Name.Length != 0) { + Name = other.Name; + } + switch (other.ValueCase) { + case ValueOneofCase.Count: + Count = other.Count; + break; + case ValueOneofCase.Histogram: + if (Histogram == null) { + Histogram = new global::Grpc.Core.Histogram(); + } + Histogram.MergeFrom(other.Histogram); + break; + } + + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + input.SkipLastField(); + break; + case 10: { + Name = input.ReadString(); + break; + } + case 80: { + Count = input.ReadUInt64(); + break; + } + case 90: { + global::Grpc.Core.Histogram subBuilder = new global::Grpc.Core.Histogram(); + if (valueCase_ == ValueOneofCase.Histogram) { + subBuilder.MergeFrom(Histogram); + } + input.ReadMessage(subBuilder); + Histogram = subBuilder; + break; + } + } + } + } + + } + + public sealed partial class Stats : pb::IMessage { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new Stats()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Grpc.Core.StatsReflection.Descriptor.MessageTypes[3]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Stats() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Stats(Stats other) : this() { + metrics_ = other.metrics_.Clone(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Stats Clone() { + return new Stats(this); + } + + /// Field number for the "metrics" field. + public const int MetricsFieldNumber = 1; + private static readonly pb::FieldCodec _repeated_metrics_codec + = pb::FieldCodec.ForMessage(10, global::Grpc.Core.Metric.Parser); + private readonly pbc::RepeatedField metrics_ = new pbc::RepeatedField(); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField Metrics { + get { return metrics_; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as Stats); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(Stats other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if(!metrics_.Equals(other.metrics_)) return false; + return true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + hash ^= metrics_.GetHashCode(); + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + metrics_.WriteTo(output, _repeated_metrics_codec); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + size += metrics_.CalculateSize(_repeated_metrics_codec); + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(Stats other) { + if (other == null) { + return; + } + metrics_.Add(other.metrics_); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + input.SkipLastField(); + break; + case 10: { + metrics_.AddEntriesFrom(input, _repeated_metrics_codec); + break; + } + } + } + } + + } + + #endregion + +} + +#endregion Designer generated code diff --git a/src/csharp/Grpc.IntegrationTesting/EchoMessages.cs b/src/csharp/Grpc.IntegrationTesting/EchoMessages.cs index b2fe73acdf4..9581aded582 100644 --- a/src/csharp/Grpc.IntegrationTesting/EchoMessages.cs +++ b/src/csharp/Grpc.IntegrationTesting/EchoMessages.cs @@ -26,7 +26,7 @@ namespace Grpc.Testing { "DGdycGMudGVzdGluZyIyCglEZWJ1Z0luZm8SFQoNc3RhY2tfZW50cmllcxgB", "IAMoCRIOCgZkZXRhaWwYAiABKAkiUAoLRXJyb3JTdGF0dXMSDAoEY29kZRgB", "IAEoBRIVCg1lcnJvcl9tZXNzYWdlGAIgASgJEhwKFGJpbmFyeV9lcnJvcl9k", - "ZXRhaWxzGAMgASgJIskDCg1SZXF1ZXN0UGFyYW1zEhUKDWVjaG9fZGVhZGxp", + "ZXRhaWxzGAMgASgJIuIDCg1SZXF1ZXN0UGFyYW1zEhUKDWVjaG9fZGVhZGxp", "bmUYASABKAgSHgoWY2xpZW50X2NhbmNlbF9hZnRlcl91cxgCIAEoBRIeChZz", "ZXJ2ZXJfY2FuY2VsX2FmdGVyX3VzGAMgASgFEhUKDWVjaG9fbWV0YWRhdGEY", "BCABKAgSGgoSY2hlY2tfYXV0aF9jb250ZXh0GAUgASgIEh8KF3Jlc3BvbnNl", @@ -36,18 +36,19 @@ namespace Grpc.Testing { "X3R5cGUYCiABKAkSKwoKZGVidWdfaW5mbxgLIAEoCzIXLmdycGMudGVzdGlu", "Zy5EZWJ1Z0luZm8SEgoKc2VydmVyX2RpZRgMIAEoCBIcChRiaW5hcnlfZXJy", "b3JfZGV0YWlscxgNIAEoCRIxCg5leHBlY3RlZF9lcnJvchgOIAEoCzIZLmdy", - "cGMudGVzdGluZy5FcnJvclN0YXR1cyJKCgtFY2hvUmVxdWVzdBIPCgdtZXNz", - "YWdlGAEgASgJEioKBXBhcmFtGAIgASgLMhsuZ3JwYy50ZXN0aW5nLlJlcXVl", - "c3RQYXJhbXMiRgoOUmVzcG9uc2VQYXJhbXMSGAoQcmVxdWVzdF9kZWFkbGlu", - "ZRgBIAEoAxIMCgRob3N0GAIgASgJEgwKBHBlZXIYAyABKAkiTAoMRWNob1Jl", - "c3BvbnNlEg8KB21lc3NhZ2UYASABKAkSKwoFcGFyYW0YAiABKAsyHC5ncnBj", - "LnRlc3RpbmcuUmVzcG9uc2VQYXJhbXNiBnByb3RvMw==")); + "cGMudGVzdGluZy5FcnJvclN0YXR1cxIXCg9zZXJ2ZXJfc2xlZXBfdXMYDyAB", + "KAUiSgoLRWNob1JlcXVlc3QSDwoHbWVzc2FnZRgBIAEoCRIqCgVwYXJhbRgC", + "IAEoCzIbLmdycGMudGVzdGluZy5SZXF1ZXN0UGFyYW1zIkYKDlJlc3BvbnNl", + "UGFyYW1zEhgKEHJlcXVlc3RfZGVhZGxpbmUYASABKAMSDAoEaG9zdBgCIAEo", + "CRIMCgRwZWVyGAMgASgJIkwKDEVjaG9SZXNwb25zZRIPCgdtZXNzYWdlGAEg", + "ASgJEisKBXBhcmFtGAIgASgLMhwuZ3JwYy50ZXN0aW5nLlJlc3BvbnNlUGFy", + "YW1zYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.DebugInfo), global::Grpc.Testing.DebugInfo.Parser, new[]{ "StackEntries", "Detail" }, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.ErrorStatus), global::Grpc.Testing.ErrorStatus.Parser, new[]{ "Code", "ErrorMessage", "BinaryErrorDetails" }, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.RequestParams), global::Grpc.Testing.RequestParams.Parser, new[]{ "EchoDeadline", "ClientCancelAfterUs", "ServerCancelAfterUs", "EchoMetadata", "CheckAuthContext", "ResponseMessageLength", "EchoPeer", "ExpectedClientIdentity", "SkipCancelledCheck", "ExpectedTransportSecurityType", "DebugInfo", "ServerDie", "BinaryErrorDetails", "ExpectedError" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.RequestParams), global::Grpc.Testing.RequestParams.Parser, new[]{ "EchoDeadline", "ClientCancelAfterUs", "ServerCancelAfterUs", "EchoMetadata", "CheckAuthContext", "ResponseMessageLength", "EchoPeer", "ExpectedClientIdentity", "SkipCancelledCheck", "ExpectedTransportSecurityType", "DebugInfo", "ServerDie", "BinaryErrorDetails", "ExpectedError", "ServerSleepUs" }, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.EchoRequest), global::Grpc.Testing.EchoRequest.Parser, new[]{ "Message", "Param" }, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.ResponseParams), global::Grpc.Testing.ResponseParams.Parser, new[]{ "RequestDeadline", "Host", "Peer" }, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.EchoResponse), global::Grpc.Testing.EchoResponse.Parser, new[]{ "Message", "Param" }, null, null, null) @@ -411,6 +412,7 @@ namespace Grpc.Testing { serverDie_ = other.serverDie_; binaryErrorDetails_ = other.binaryErrorDetails_; ExpectedError = other.expectedError_ != null ? other.ExpectedError.Clone() : null; + serverSleepUs_ = other.serverSleepUs_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -578,6 +580,20 @@ namespace Grpc.Testing { } } + /// Field number for the "server_sleep_us" field. + public const int ServerSleepUsFieldNumber = 15; + private int serverSleepUs_; + /// + /// Amount to sleep when invoking server + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int ServerSleepUs { + get { return serverSleepUs_; } + set { + serverSleepUs_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as RequestParams); @@ -605,6 +621,7 @@ namespace Grpc.Testing { if (ServerDie != other.ServerDie) return false; if (BinaryErrorDetails != other.BinaryErrorDetails) return false; if (!object.Equals(ExpectedError, other.ExpectedError)) return false; + if (ServerSleepUs != other.ServerSleepUs) return false; return true; } @@ -625,6 +642,7 @@ namespace Grpc.Testing { if (ServerDie != false) hash ^= ServerDie.GetHashCode(); if (BinaryErrorDetails.Length != 0) hash ^= BinaryErrorDetails.GetHashCode(); if (expectedError_ != null) hash ^= ExpectedError.GetHashCode(); + if (ServerSleepUs != 0) hash ^= ServerSleepUs.GetHashCode(); return hash; } @@ -691,6 +709,10 @@ namespace Grpc.Testing { output.WriteRawTag(114); output.WriteMessage(ExpectedError); } + if (ServerSleepUs != 0) { + output.WriteRawTag(120); + output.WriteInt32(ServerSleepUs); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -738,6 +760,9 @@ namespace Grpc.Testing { if (expectedError_ != null) { size += 1 + pb::CodedOutputStream.ComputeMessageSize(ExpectedError); } + if (ServerSleepUs != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(ServerSleepUs); + } return size; } @@ -794,6 +819,9 @@ namespace Grpc.Testing { } ExpectedError.MergeFrom(other.ExpectedError); } + if (other.ServerSleepUs != 0) { + ServerSleepUs = other.ServerSleepUs; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -866,6 +894,10 @@ namespace Grpc.Testing { input.ReadMessage(expectedError_); break; } + case 120: { + ServerSleepUs = input.ReadInt32(); + break; + } } } } diff --git a/src/csharp/Grpc.IntegrationTesting/MetricsGrpc.cs b/src/csharp/Grpc.IntegrationTesting/MetricsGrpc.cs index 9a664f35397..f71d6d197d2 100644 --- a/src/csharp/Grpc.IntegrationTesting/MetricsGrpc.cs +++ b/src/csharp/Grpc.IntegrationTesting/MetricsGrpc.cs @@ -1,5 +1,7 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: src/proto/grpc/testing/metrics.proto +// +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: src/proto/grpc/testing/metrics.proto +// // Original file comments: // Copyright 2015-2016 gRPC authors. // diff --git a/src/csharp/Grpc.IntegrationTesting/Payloads.cs b/src/csharp/Grpc.IntegrationTesting/Payloads.cs index f918b9576bd..fca8cda6f6c 100644 --- a/src/csharp/Grpc.IntegrationTesting/Payloads.cs +++ b/src/csharp/Grpc.IntegrationTesting/Payloads.cs @@ -596,13 +596,22 @@ namespace Grpc.Testing { } switch (other.PayloadCase) { case PayloadOneofCase.BytebufParams: - BytebufParams = other.BytebufParams; + if (BytebufParams == null) { + BytebufParams = new global::Grpc.Testing.ByteBufferParams(); + } + BytebufParams.MergeFrom(other.BytebufParams); break; case PayloadOneofCase.SimpleParams: - SimpleParams = other.SimpleParams; + if (SimpleParams == null) { + SimpleParams = new global::Grpc.Testing.SimpleProtoParams(); + } + SimpleParams.MergeFrom(other.SimpleParams); break; case PayloadOneofCase.ComplexParams: - ComplexParams = other.ComplexParams; + if (ComplexParams == null) { + ComplexParams = new global::Grpc.Testing.ComplexProtoParams(); + } + ComplexParams.MergeFrom(other.ComplexParams); break; } diff --git a/src/csharp/Grpc.IntegrationTesting/Services.cs b/src/csharp/Grpc.IntegrationTesting/Services.cs index 7a0845dffb0..4b761706ed7 100644 --- a/src/csharp/Grpc.IntegrationTesting/Services.cs +++ b/src/csharp/Grpc.IntegrationTesting/Services.cs @@ -24,28 +24,27 @@ namespace Grpc.Testing { string.Concat( "CiVzcmMvcHJvdG8vZ3JwYy90ZXN0aW5nL3NlcnZpY2VzLnByb3RvEgxncnBj", "LnRlc3RpbmcaJXNyYy9wcm90by9ncnBjL3Rlc3RpbmcvbWVzc2FnZXMucHJv", - "dG8aJHNyYy9wcm90by9ncnBjL3Rlc3RpbmcvY29udHJvbC5wcm90bxoic3Jj", - "L3Byb3RvL2dycGMvdGVzdGluZy9zdGF0cy5wcm90bzKmAwoQQmVuY2htYXJr", - "U2VydmljZRJGCglVbmFyeUNhbGwSGy5ncnBjLnRlc3RpbmcuU2ltcGxlUmVx", - "dWVzdBocLmdycGMudGVzdGluZy5TaW1wbGVSZXNwb25zZRJOCg1TdHJlYW1p", - "bmdDYWxsEhsuZ3JwYy50ZXN0aW5nLlNpbXBsZVJlcXVlc3QaHC5ncnBjLnRl", - "c3RpbmcuU2ltcGxlUmVzcG9uc2UoATABElIKE1N0cmVhbWluZ0Zyb21DbGll", - "bnQSGy5ncnBjLnRlc3RpbmcuU2ltcGxlUmVxdWVzdBocLmdycGMudGVzdGlu", - "Zy5TaW1wbGVSZXNwb25zZSgBElIKE1N0cmVhbWluZ0Zyb21TZXJ2ZXISGy5n", - "cnBjLnRlc3RpbmcuU2ltcGxlUmVxdWVzdBocLmdycGMudGVzdGluZy5TaW1w", - "bGVSZXNwb25zZTABElIKEVN0cmVhbWluZ0JvdGhXYXlzEhsuZ3JwYy50ZXN0", - "aW5nLlNpbXBsZVJlcXVlc3QaHC5ncnBjLnRlc3RpbmcuU2ltcGxlUmVzcG9u", - "c2UoATABMpcCCg1Xb3JrZXJTZXJ2aWNlEkUKCVJ1blNlcnZlchIYLmdycGMu", - "dGVzdGluZy5TZXJ2ZXJBcmdzGhouZ3JwYy50ZXN0aW5nLlNlcnZlclN0YXR1", - "cygBMAESRQoJUnVuQ2xpZW50EhguZ3JwYy50ZXN0aW5nLkNsaWVudEFyZ3Ma", - "Gi5ncnBjLnRlc3RpbmcuQ2xpZW50U3RhdHVzKAEwARJCCglDb3JlQ291bnQS", - "GS5ncnBjLnRlc3RpbmcuQ29yZVJlcXVlc3QaGi5ncnBjLnRlc3RpbmcuQ29y", - "ZVJlc3BvbnNlEjQKClF1aXRXb3JrZXISEi5ncnBjLnRlc3RpbmcuVm9pZBoS", - "LmdycGMudGVzdGluZy5Wb2lkMl4KGFJlcG9ydFFwc1NjZW5hcmlvU2Vydmlj", - "ZRJCCg5SZXBvcnRTY2VuYXJpbxIcLmdycGMudGVzdGluZy5TY2VuYXJpb1Jl", - "c3VsdBoSLmdycGMudGVzdGluZy5Wb2lkYgZwcm90bzM=")); + "dG8aJHNyYy9wcm90by9ncnBjL3Rlc3RpbmcvY29udHJvbC5wcm90bzKmAwoQ", + "QmVuY2htYXJrU2VydmljZRJGCglVbmFyeUNhbGwSGy5ncnBjLnRlc3Rpbmcu", + "U2ltcGxlUmVxdWVzdBocLmdycGMudGVzdGluZy5TaW1wbGVSZXNwb25zZRJO", + "Cg1TdHJlYW1pbmdDYWxsEhsuZ3JwYy50ZXN0aW5nLlNpbXBsZVJlcXVlc3Qa", + "HC5ncnBjLnRlc3RpbmcuU2ltcGxlUmVzcG9uc2UoATABElIKE1N0cmVhbWlu", + "Z0Zyb21DbGllbnQSGy5ncnBjLnRlc3RpbmcuU2ltcGxlUmVxdWVzdBocLmdy", + "cGMudGVzdGluZy5TaW1wbGVSZXNwb25zZSgBElIKE1N0cmVhbWluZ0Zyb21T", + "ZXJ2ZXISGy5ncnBjLnRlc3RpbmcuU2ltcGxlUmVxdWVzdBocLmdycGMudGVz", + "dGluZy5TaW1wbGVSZXNwb25zZTABElIKEVN0cmVhbWluZ0JvdGhXYXlzEhsu", + "Z3JwYy50ZXN0aW5nLlNpbXBsZVJlcXVlc3QaHC5ncnBjLnRlc3RpbmcuU2lt", + "cGxlUmVzcG9uc2UoATABMpcCCg1Xb3JrZXJTZXJ2aWNlEkUKCVJ1blNlcnZl", + "chIYLmdycGMudGVzdGluZy5TZXJ2ZXJBcmdzGhouZ3JwYy50ZXN0aW5nLlNl", + "cnZlclN0YXR1cygBMAESRQoJUnVuQ2xpZW50EhguZ3JwYy50ZXN0aW5nLkNs", + "aWVudEFyZ3MaGi5ncnBjLnRlc3RpbmcuQ2xpZW50U3RhdHVzKAEwARJCCglD", + "b3JlQ291bnQSGS5ncnBjLnRlc3RpbmcuQ29yZVJlcXVlc3QaGi5ncnBjLnRl", + "c3RpbmcuQ29yZVJlc3BvbnNlEjQKClF1aXRXb3JrZXISEi5ncnBjLnRlc3Rp", + "bmcuVm9pZBoSLmdycGMudGVzdGluZy5Wb2lkMl4KGFJlcG9ydFFwc1NjZW5h", + "cmlvU2VydmljZRJCCg5SZXBvcnRTY2VuYXJpbxIcLmdycGMudGVzdGluZy5T", + "Y2VuYXJpb1Jlc3VsdBoSLmdycGMudGVzdGluZy5Wb2lkYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::Grpc.Testing.MessagesReflection.Descriptor, global::Grpc.Testing.ControlReflection.Descriptor, global::Grpc.Testing.StatsReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::Grpc.Testing.MessagesReflection.Descriptor, global::Grpc.Testing.ControlReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null)); } #endregion diff --git a/src/csharp/Grpc.IntegrationTesting/ServicesGrpc.cs b/src/csharp/Grpc.IntegrationTesting/ServicesGrpc.cs index bfae4ee6ace..d2e4f2e4a5b 100644 --- a/src/csharp/Grpc.IntegrationTesting/ServicesGrpc.cs +++ b/src/csharp/Grpc.IntegrationTesting/ServicesGrpc.cs @@ -1,5 +1,7 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: src/proto/grpc/testing/services.proto +// +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: src/proto/grpc/testing/services.proto +// // Original file comments: // Copyright 2015 gRPC authors. // diff --git a/src/csharp/Grpc.IntegrationTesting/Stats.cs b/src/csharp/Grpc.IntegrationTesting/Stats.cs index 23b56df6bdb..e082ae7719a 100644 --- a/src/csharp/Grpc.IntegrationTesting/Stats.cs +++ b/src/csharp/Grpc.IntegrationTesting/Stats.cs @@ -23,28 +23,30 @@ namespace Grpc.Testing { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "CiJzcmMvcHJvdG8vZ3JwYy90ZXN0aW5nL3N0YXRzLnByb3RvEgxncnBjLnRl", - "c3RpbmcikQEKC1NlcnZlclN0YXRzEhQKDHRpbWVfZWxhcHNlZBgBIAEoARIR", - "Cgl0aW1lX3VzZXIYAiABKAESEwoLdGltZV9zeXN0ZW0YAyABKAESFgoOdG90", - "YWxfY3B1X3RpbWUYBCABKAQSFQoNaWRsZV9jcHVfdGltZRgFIAEoBBIVCg1j", - "cV9wb2xsX2NvdW50GAYgASgEIjsKD0hpc3RvZ3JhbVBhcmFtcxISCgpyZXNv", - "bHV0aW9uGAEgASgBEhQKDG1heF9wb3NzaWJsZRgCIAEoASJ3Cg1IaXN0b2dy", - "YW1EYXRhEg4KBmJ1Y2tldBgBIAMoDRIQCghtaW5fc2VlbhgCIAEoARIQCght", - "YXhfc2VlbhgDIAEoARILCgNzdW0YBCABKAESFgoOc3VtX29mX3NxdWFyZXMY", - "BSABKAESDQoFY291bnQYBiABKAEiOAoSUmVxdWVzdFJlc3VsdENvdW50EhMK", - "C3N0YXR1c19jb2RlGAEgASgFEg0KBWNvdW50GAIgASgDIs0BCgtDbGllbnRT", - "dGF0cxIuCglsYXRlbmNpZXMYASABKAsyGy5ncnBjLnRlc3RpbmcuSGlzdG9n", - "cmFtRGF0YRIUCgx0aW1lX2VsYXBzZWQYAiABKAESEQoJdGltZV91c2VyGAMg", - "ASgBEhMKC3RpbWVfc3lzdGVtGAQgASgBEjkKD3JlcXVlc3RfcmVzdWx0cxgF", - "IAMoCzIgLmdycGMudGVzdGluZy5SZXF1ZXN0UmVzdWx0Q291bnQSFQoNY3Ff", - "cG9sbF9jb3VudBgGIAEoBGIGcHJvdG8z")); + "c3RpbmcaH3NyYy9wcm90by9ncnBjL2NvcmUvc3RhdHMucHJvdG8itwEKC1Nl", + "cnZlclN0YXRzEhQKDHRpbWVfZWxhcHNlZBgBIAEoARIRCgl0aW1lX3VzZXIY", + "AiABKAESEwoLdGltZV9zeXN0ZW0YAyABKAESFgoOdG90YWxfY3B1X3RpbWUY", + "BCABKAQSFQoNaWRsZV9jcHVfdGltZRgFIAEoBBIVCg1jcV9wb2xsX2NvdW50", + "GAYgASgEEiQKCmNvcmVfc3RhdHMYByABKAsyEC5ncnBjLmNvcmUuU3RhdHMi", + "OwoPSGlzdG9ncmFtUGFyYW1zEhIKCnJlc29sdXRpb24YASABKAESFAoMbWF4", + "X3Bvc3NpYmxlGAIgASgBIncKDUhpc3RvZ3JhbURhdGESDgoGYnVja2V0GAEg", + "AygNEhAKCG1pbl9zZWVuGAIgASgBEhAKCG1heF9zZWVuGAMgASgBEgsKA3N1", + "bRgEIAEoARIWCg5zdW1fb2Zfc3F1YXJlcxgFIAEoARINCgVjb3VudBgGIAEo", + "ASI4ChJSZXF1ZXN0UmVzdWx0Q291bnQSEwoLc3RhdHVzX2NvZGUYASABKAUS", + "DQoFY291bnQYAiABKAMi8wEKC0NsaWVudFN0YXRzEi4KCWxhdGVuY2llcxgB", + "IAEoCzIbLmdycGMudGVzdGluZy5IaXN0b2dyYW1EYXRhEhQKDHRpbWVfZWxh", + "cHNlZBgCIAEoARIRCgl0aW1lX3VzZXIYAyABKAESEwoLdGltZV9zeXN0ZW0Y", + "BCABKAESOQoPcmVxdWVzdF9yZXN1bHRzGAUgAygLMiAuZ3JwYy50ZXN0aW5n", + "LlJlcXVlc3RSZXN1bHRDb3VudBIVCg1jcV9wb2xsX2NvdW50GAYgASgEEiQK", + "CmNvcmVfc3RhdHMYByABKAsyEC5ncnBjLmNvcmUuU3RhdHNiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, + new pbr::FileDescriptor[] { global::Grpc.Core.StatsReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.ServerStats), global::Grpc.Testing.ServerStats.Parser, new[]{ "TimeElapsed", "TimeUser", "TimeSystem", "TotalCpuTime", "IdleCpuTime", "CqPollCount" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.ServerStats), global::Grpc.Testing.ServerStats.Parser, new[]{ "TimeElapsed", "TimeUser", "TimeSystem", "TotalCpuTime", "IdleCpuTime", "CqPollCount", "CoreStats" }, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.HistogramParams), global::Grpc.Testing.HistogramParams.Parser, new[]{ "Resolution", "MaxPossible" }, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.HistogramData), global::Grpc.Testing.HistogramData.Parser, new[]{ "Bucket", "MinSeen", "MaxSeen", "Sum", "SumOfSquares", "Count" }, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.RequestResultCount), global::Grpc.Testing.RequestResultCount.Parser, new[]{ "StatusCode", "Count" }, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.ClientStats), global::Grpc.Testing.ClientStats.Parser, new[]{ "Latencies", "TimeElapsed", "TimeUser", "TimeSystem", "RequestResults", "CqPollCount" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.ClientStats), global::Grpc.Testing.ClientStats.Parser, new[]{ "Latencies", "TimeElapsed", "TimeUser", "TimeSystem", "RequestResults", "CqPollCount", "CoreStats" }, null, null, null) })); } #endregion @@ -81,6 +83,7 @@ namespace Grpc.Testing { totalCpuTime_ = other.totalCpuTime_; idleCpuTime_ = other.idleCpuTime_; cqPollCount_ = other.cqPollCount_; + CoreStats = other.coreStats_ != null ? other.CoreStats.Clone() : null; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -173,6 +176,20 @@ namespace Grpc.Testing { } } + /// Field number for the "core_stats" field. + public const int CoreStatsFieldNumber = 7; + private global::Grpc.Core.Stats coreStats_; + /// + /// Core library stats + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public global::Grpc.Core.Stats CoreStats { + get { return coreStats_; } + set { + coreStats_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as ServerStats); @@ -192,6 +209,7 @@ namespace Grpc.Testing { if (TotalCpuTime != other.TotalCpuTime) return false; if (IdleCpuTime != other.IdleCpuTime) return false; if (CqPollCount != other.CqPollCount) return false; + if (!object.Equals(CoreStats, other.CoreStats)) return false; return true; } @@ -204,6 +222,7 @@ namespace Grpc.Testing { if (TotalCpuTime != 0UL) hash ^= TotalCpuTime.GetHashCode(); if (IdleCpuTime != 0UL) hash ^= IdleCpuTime.GetHashCode(); if (CqPollCount != 0UL) hash ^= CqPollCount.GetHashCode(); + if (coreStats_ != null) hash ^= CoreStats.GetHashCode(); return hash; } @@ -238,6 +257,10 @@ namespace Grpc.Testing { output.WriteRawTag(48); output.WriteUInt64(CqPollCount); } + if (coreStats_ != null) { + output.WriteRawTag(58); + output.WriteMessage(CoreStats); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -261,6 +284,9 @@ namespace Grpc.Testing { if (CqPollCount != 0UL) { size += 1 + pb::CodedOutputStream.ComputeUInt64Size(CqPollCount); } + if (coreStats_ != null) { + size += 1 + pb::CodedOutputStream.ComputeMessageSize(CoreStats); + } return size; } @@ -287,6 +313,12 @@ namespace Grpc.Testing { if (other.CqPollCount != 0UL) { CqPollCount = other.CqPollCount; } + if (other.coreStats_ != null) { + if (coreStats_ == null) { + coreStats_ = new global::Grpc.Core.Stats(); + } + CoreStats.MergeFrom(other.CoreStats); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -321,6 +353,13 @@ namespace Grpc.Testing { CqPollCount = input.ReadUInt64(); break; } + case 58: { + if (coreStats_ == null) { + coreStats_ = new global::Grpc.Core.Stats(); + } + input.ReadMessage(coreStats_); + break; + } } } } @@ -909,6 +948,7 @@ namespace Grpc.Testing { timeSystem_ = other.timeSystem_; requestResults_ = other.requestResults_.Clone(); cqPollCount_ = other.cqPollCount_; + CoreStats = other.coreStats_ != null ? other.CoreStats.Clone() : null; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -993,6 +1033,20 @@ namespace Grpc.Testing { } } + /// Field number for the "core_stats" field. + public const int CoreStatsFieldNumber = 7; + private global::Grpc.Core.Stats coreStats_; + /// + /// Core library stats + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public global::Grpc.Core.Stats CoreStats { + get { return coreStats_; } + set { + coreStats_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as ClientStats); @@ -1012,6 +1066,7 @@ namespace Grpc.Testing { if (TimeSystem != other.TimeSystem) return false; if(!requestResults_.Equals(other.requestResults_)) return false; if (CqPollCount != other.CqPollCount) return false; + if (!object.Equals(CoreStats, other.CoreStats)) return false; return true; } @@ -1024,6 +1079,7 @@ namespace Grpc.Testing { if (TimeSystem != 0D) hash ^= TimeSystem.GetHashCode(); hash ^= requestResults_.GetHashCode(); if (CqPollCount != 0UL) hash ^= CqPollCount.GetHashCode(); + if (coreStats_ != null) hash ^= CoreStats.GetHashCode(); return hash; } @@ -1055,6 +1111,10 @@ namespace Grpc.Testing { output.WriteRawTag(48); output.WriteUInt64(CqPollCount); } + if (coreStats_ != null) { + output.WriteRawTag(58); + output.WriteMessage(CoreStats); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1076,6 +1136,9 @@ namespace Grpc.Testing { if (CqPollCount != 0UL) { size += 1 + pb::CodedOutputStream.ComputeUInt64Size(CqPollCount); } + if (coreStats_ != null) { + size += 1 + pb::CodedOutputStream.ComputeMessageSize(CoreStats); + } return size; } @@ -1103,6 +1166,12 @@ namespace Grpc.Testing { if (other.CqPollCount != 0UL) { CqPollCount = other.CqPollCount; } + if (other.coreStats_ != null) { + if (coreStats_ == null) { + coreStats_ = new global::Grpc.Core.Stats(); + } + CoreStats.MergeFrom(other.CoreStats); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1140,6 +1209,13 @@ namespace Grpc.Testing { CqPollCount = input.ReadUInt64(); break; } + case 58: { + if (coreStats_ == null) { + coreStats_ = new global::Grpc.Core.Stats(); + } + input.ReadMessage(coreStats_); + break; + } } } } diff --git a/src/csharp/Grpc.IntegrationTesting/TestGrpc.cs b/src/csharp/Grpc.IntegrationTesting/TestGrpc.cs index b419dd17026..c0d147c1507 100644 --- a/src/csharp/Grpc.IntegrationTesting/TestGrpc.cs +++ b/src/csharp/Grpc.IntegrationTesting/TestGrpc.cs @@ -1,5 +1,7 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: src/proto/grpc/testing/test.proto +// +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: src/proto/grpc/testing/test.proto +// // Original file comments: // Copyright 2015-2016 gRPC authors. // diff --git a/src/csharp/Grpc.Reflection/Reflection.cs b/src/csharp/Grpc.Reflection/Reflection.cs index 86e9aace8c8..60090e53649 100644 --- a/src/csharp/Grpc.Reflection/Reflection.cs +++ b/src/csharp/Grpc.Reflection/Reflection.cs @@ -345,7 +345,10 @@ namespace Grpc.Reflection.V1Alpha { FileContainingSymbol = other.FileContainingSymbol; break; case MessageRequestOneofCase.FileContainingExtension: - FileContainingExtension = other.FileContainingExtension; + if (FileContainingExtension == null) { + FileContainingExtension = new global::Grpc.Reflection.V1Alpha.ExtensionRequest(); + } + FileContainingExtension.MergeFrom(other.FileContainingExtension); break; case MessageRequestOneofCase.AllExtensionNumbersOfType: AllExtensionNumbersOfType = other.AllExtensionNumbersOfType; @@ -816,16 +819,28 @@ namespace Grpc.Reflection.V1Alpha { } switch (other.MessageResponseCase) { case MessageResponseOneofCase.FileDescriptorResponse: - FileDescriptorResponse = other.FileDescriptorResponse; + if (FileDescriptorResponse == null) { + FileDescriptorResponse = new global::Grpc.Reflection.V1Alpha.FileDescriptorResponse(); + } + FileDescriptorResponse.MergeFrom(other.FileDescriptorResponse); break; case MessageResponseOneofCase.AllExtensionNumbersResponse: - AllExtensionNumbersResponse = other.AllExtensionNumbersResponse; + if (AllExtensionNumbersResponse == null) { + AllExtensionNumbersResponse = new global::Grpc.Reflection.V1Alpha.ExtensionNumberResponse(); + } + AllExtensionNumbersResponse.MergeFrom(other.AllExtensionNumbersResponse); break; case MessageResponseOneofCase.ListServicesResponse: - ListServicesResponse = other.ListServicesResponse; + if (ListServicesResponse == null) { + ListServicesResponse = new global::Grpc.Reflection.V1Alpha.ListServiceResponse(); + } + ListServicesResponse.MergeFrom(other.ListServicesResponse); break; case MessageResponseOneofCase.ErrorResponse: - ErrorResponse = other.ErrorResponse; + if (ErrorResponse == null) { + ErrorResponse = new global::Grpc.Reflection.V1Alpha.ErrorResponse(); + } + ErrorResponse.MergeFrom(other.ErrorResponse); break; } diff --git a/src/csharp/Grpc.Reflection/ReflectionGrpc.cs b/src/csharp/Grpc.Reflection/ReflectionGrpc.cs index 58439577e30..0195186eba9 100644 --- a/src/csharp/Grpc.Reflection/ReflectionGrpc.cs +++ b/src/csharp/Grpc.Reflection/ReflectionGrpc.cs @@ -1,5 +1,7 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: grpc/reflection/v1alpha/reflection.proto +// +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: grpc/reflection/v1alpha/reflection.proto +// // Original file comments: // Copyright 2016 gRPC authors. // From 934a3cebc4c32bd7e4e98964e21976f9cfc4921e Mon Sep 17 00:00:00 2001 From: ncteisen Date: Wed, 13 Dec 2017 09:25:59 -0800 Subject: [PATCH 126/127] Allow forward declaration of log args --- include/grpc/support/log.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/grpc/support/log.h b/include/grpc/support/log.h index 9cce4b1ae79..a8371cbd48d 100644 --- a/include/grpc/support/log.h +++ b/include/grpc/support/log.h @@ -73,12 +73,14 @@ GPRAPI void gpr_log_verbosity_init(void); /** Log overrides: applications can use this API to intercept logging calls and use their own implementations */ -typedef struct { +struct gpr_log_func_args { const char* file; int line; gpr_log_severity severity; const char* message; -} gpr_log_func_args; +}; + +typedef struct gpr_log_func_args gpr_log_func_args; typedef void (*gpr_log_func)(gpr_log_func_args* args); GPRAPI void gpr_set_log_function(gpr_log_func func); From cf1d28b473d4b735add0be405dc40676bd625da0 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 4 Dec 2017 12:44:28 -0800 Subject: [PATCH 127/127] Fix windows compile --- CMakeLists.txt | 202 +++++++++--------- Makefile | 200 ++++++++--------- build.yaml | 44 ++-- ...gen_hpack_tables.c => gen_hpack_tables.cc} | 2 +- ...ers.c => gen_legal_metadata_characters.cc} | 2 +- ...ables.c => gen_percent_encoding_tables.cc} | 2 +- tools/codegen/core/gen_static_metadata.py | 10 +- .../generated/sources_and_headers.json | 78 +++---- 8 files changed, 266 insertions(+), 274 deletions(-) rename tools/codegen/core/{gen_hpack_tables.c => gen_hpack_tables.cc} (99%) rename tools/codegen/core/{gen_legal_metadata_characters.c => gen_legal_metadata_characters.cc} (97%) rename tools/codegen/core/{gen_percent_encoding_tables.c => gen_percent_encoding_tables.cc} (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 22a1ab79af1..fd7dbce2e5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -358,12 +358,12 @@ add_custom_target(plugins add_custom_target(tools_c DEPENDS check_epollexclusive - gen_hpack_tables - gen_legal_metadata_characters - gen_percent_encoding_tables grpc_create_jwt grpc_print_google_default_creds_token grpc_verify_jwt + gen_hpack_tables + gen_legal_metadata_characters + gen_percent_encoding_tables ) add_custom_target(tools_cxx @@ -6021,104 +6021,6 @@ target_link_libraries(fling_test endif() endif (gRPC_BUILD_TESTS) - -add_executable(gen_hpack_tables - tools/codegen/core/gen_hpack_tables.c -) - - -target_include_directories(gen_hpack_tables - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${BORINGSSL_ROOT_DIR}/include - PRIVATE ${PROTOBUF_ROOT_DIR}/src - PRIVATE ${BENCHMARK_ROOT_DIR}/include - PRIVATE ${ZLIB_ROOT_DIR} - PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/zlib - PRIVATE ${CARES_INCLUDE_DIR} - PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/cares/cares - PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags/include -) - -target_link_libraries(gen_hpack_tables - ${_gRPC_ALLTARGETS_LIBRARIES} - gpr - grpc -) - - -if (gRPC_INSTALL) - install(TARGETS gen_hpack_tables EXPORT gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} - ) -endif() - - -add_executable(gen_legal_metadata_characters - tools/codegen/core/gen_legal_metadata_characters.c -) - - -target_include_directories(gen_legal_metadata_characters - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${BORINGSSL_ROOT_DIR}/include - PRIVATE ${PROTOBUF_ROOT_DIR}/src - PRIVATE ${BENCHMARK_ROOT_DIR}/include - PRIVATE ${ZLIB_ROOT_DIR} - PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/zlib - PRIVATE ${CARES_INCLUDE_DIR} - PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/cares/cares - PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags/include -) - -target_link_libraries(gen_legal_metadata_characters - ${_gRPC_ALLTARGETS_LIBRARIES} -) - - -if (gRPC_INSTALL) - install(TARGETS gen_legal_metadata_characters EXPORT gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} - ) -endif() - - -add_executable(gen_percent_encoding_tables - tools/codegen/core/gen_percent_encoding_tables.c -) - - -target_include_directories(gen_percent_encoding_tables - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${BORINGSSL_ROOT_DIR}/include - PRIVATE ${PROTOBUF_ROOT_DIR}/src - PRIVATE ${BENCHMARK_ROOT_DIR}/include - PRIVATE ${ZLIB_ROOT_DIR} - PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/zlib - PRIVATE ${CARES_INCLUDE_DIR} - PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/cares/cares - PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags/include -) - -target_link_libraries(gen_percent_encoding_tables - ${_gRPC_ALLTARGETS_LIBRARIES} -) - - -if (gRPC_INSTALL) - install(TARGETS gen_percent_encoding_tables EXPORT gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} - ) -endif() - if (gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) @@ -12908,6 +12810,104 @@ target_link_libraries(public_headers_must_be_c89 ) endif (gRPC_BUILD_TESTS) + +add_executable(gen_hpack_tables + tools/codegen/core/gen_hpack_tables.cc +) + + +target_include_directories(gen_hpack_tables + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include + PRIVATE ${BORINGSSL_ROOT_DIR}/include + PRIVATE ${PROTOBUF_ROOT_DIR}/src + PRIVATE ${BENCHMARK_ROOT_DIR}/include + PRIVATE ${ZLIB_ROOT_DIR} + PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/zlib + PRIVATE ${CARES_INCLUDE_DIR} + PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/cares/cares + PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags/include +) + +target_link_libraries(gen_hpack_tables + ${_gRPC_ALLTARGETS_LIBRARIES} + gpr + grpc +) + + +if (gRPC_INSTALL) + install(TARGETS gen_hpack_tables EXPORT gRPCTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} + ) +endif() + + +add_executable(gen_legal_metadata_characters + tools/codegen/core/gen_legal_metadata_characters.cc +) + + +target_include_directories(gen_legal_metadata_characters + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include + PRIVATE ${BORINGSSL_ROOT_DIR}/include + PRIVATE ${PROTOBUF_ROOT_DIR}/src + PRIVATE ${BENCHMARK_ROOT_DIR}/include + PRIVATE ${ZLIB_ROOT_DIR} + PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/zlib + PRIVATE ${CARES_INCLUDE_DIR} + PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/cares/cares + PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags/include +) + +target_link_libraries(gen_legal_metadata_characters + ${_gRPC_ALLTARGETS_LIBRARIES} +) + + +if (gRPC_INSTALL) + install(TARGETS gen_legal_metadata_characters EXPORT gRPCTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} + ) +endif() + + +add_executable(gen_percent_encoding_tables + tools/codegen/core/gen_percent_encoding_tables.cc +) + + +target_include_directories(gen_percent_encoding_tables + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include + PRIVATE ${BORINGSSL_ROOT_DIR}/include + PRIVATE ${PROTOBUF_ROOT_DIR}/src + PRIVATE ${BENCHMARK_ROOT_DIR}/include + PRIVATE ${ZLIB_ROOT_DIR} + PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/zlib + PRIVATE ${CARES_INCLUDE_DIR} + PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/cares/cares + PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags/include +) + +target_link_libraries(gen_percent_encoding_tables + ${_gRPC_ALLTARGETS_LIBRARIES} +) + + +if (gRPC_INSTALL) + install(TARGETS gen_percent_encoding_tables EXPORT gRPCTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} + ) +endif() + if (gRPC_BUILD_TESTS) add_executable(badreq_bad_client_test diff --git a/Makefile b/Makefile index 9dfd2a8ae2c..aabe135bd6e 100644 --- a/Makefile +++ b/Makefile @@ -980,9 +980,6 @@ fling_client: $(BINDIR)/$(CONFIG)/fling_client fling_server: $(BINDIR)/$(CONFIG)/fling_server fling_stream_test: $(BINDIR)/$(CONFIG)/fling_stream_test fling_test: $(BINDIR)/$(CONFIG)/fling_test -gen_hpack_tables: $(BINDIR)/$(CONFIG)/gen_hpack_tables -gen_legal_metadata_characters: $(BINDIR)/$(CONFIG)/gen_legal_metadata_characters -gen_percent_encoding_tables: $(BINDIR)/$(CONFIG)/gen_percent_encoding_tables goaway_server_test: $(BINDIR)/$(CONFIG)/goaway_server_test gpr_avl_test: $(BINDIR)/$(CONFIG)/gpr_avl_test gpr_cmdline_test: $(BINDIR)/$(CONFIG)/gpr_cmdline_test @@ -1185,6 +1182,9 @@ thread_stress_test: $(BINDIR)/$(CONFIG)/thread_stress_test transport_pid_controller_test: $(BINDIR)/$(CONFIG)/transport_pid_controller_test writes_per_rpc_test: $(BINDIR)/$(CONFIG)/writes_per_rpc_test public_headers_must_be_c89: $(BINDIR)/$(CONFIG)/public_headers_must_be_c89 +gen_hpack_tables: $(BINDIR)/$(CONFIG)/gen_hpack_tables +gen_legal_metadata_characters: $(BINDIR)/$(CONFIG)/gen_legal_metadata_characters +gen_percent_encoding_tables: $(BINDIR)/$(CONFIG)/gen_percent_encoding_tables boringssl_aes_test: $(BINDIR)/$(CONFIG)/boringssl_aes_test boringssl_asn1_test: $(BINDIR)/$(CONFIG)/boringssl_asn1_test boringssl_base64_test: $(BINDIR)/$(CONFIG)/boringssl_base64_test @@ -2187,7 +2187,7 @@ test_python: static_c tools: tools_c tools_cxx -tools_c: privatelibs_c $(BINDIR)/$(CONFIG)/check_epollexclusive $(BINDIR)/$(CONFIG)/gen_hpack_tables $(BINDIR)/$(CONFIG)/gen_legal_metadata_characters $(BINDIR)/$(CONFIG)/gen_percent_encoding_tables $(BINDIR)/$(CONFIG)/grpc_create_jwt $(BINDIR)/$(CONFIG)/grpc_print_google_default_creds_token $(BINDIR)/$(CONFIG)/grpc_verify_jwt +tools_c: privatelibs_c $(BINDIR)/$(CONFIG)/check_epollexclusive $(BINDIR)/$(CONFIG)/grpc_create_jwt $(BINDIR)/$(CONFIG)/grpc_print_google_default_creds_token $(BINDIR)/$(CONFIG)/grpc_verify_jwt $(BINDIR)/$(CONFIG)/gen_hpack_tables $(BINDIR)/$(CONFIG)/gen_legal_metadata_characters $(BINDIR)/$(CONFIG)/gen_percent_encoding_tables tools_cxx: privatelibs_cxx @@ -9843,102 +9843,6 @@ endif endif -GEN_HPACK_TABLES_SRC = \ - tools/codegen/core/gen_hpack_tables.c \ - -GEN_HPACK_TABLES_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GEN_HPACK_TABLES_SRC)))) -ifeq ($(NO_SECURE),true) - -# You can't build secure targets if you don't have OpenSSL. - -$(BINDIR)/$(CONFIG)/gen_hpack_tables: openssl_dep_error - -else - - - -$(BINDIR)/$(CONFIG)/gen_hpack_tables: $(GEN_HPACK_TABLES_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a - $(E) "[LD] Linking $@" - $(Q) mkdir -p `dirname $@` - $(Q) $(LD) $(LDFLAGS) $(GEN_HPACK_TABLES_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gen_hpack_tables - -endif - -$(OBJDIR)/$(CONFIG)/tools/codegen/core/gen_hpack_tables.o: $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a - -deps_gen_hpack_tables: $(GEN_HPACK_TABLES_OBJS:.o=.dep) - -ifneq ($(NO_SECURE),true) -ifneq ($(NO_DEPS),true) --include $(GEN_HPACK_TABLES_OBJS:.o=.dep) -endif -endif - - -GEN_LEGAL_METADATA_CHARACTERS_SRC = \ - tools/codegen/core/gen_legal_metadata_characters.c \ - -GEN_LEGAL_METADATA_CHARACTERS_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GEN_LEGAL_METADATA_CHARACTERS_SRC)))) -ifeq ($(NO_SECURE),true) - -# You can't build secure targets if you don't have OpenSSL. - -$(BINDIR)/$(CONFIG)/gen_legal_metadata_characters: openssl_dep_error - -else - - - -$(BINDIR)/$(CONFIG)/gen_legal_metadata_characters: $(GEN_LEGAL_METADATA_CHARACTERS_OBJS) - $(E) "[LD] Linking $@" - $(Q) mkdir -p `dirname $@` - $(Q) $(LD) $(LDFLAGS) $(GEN_LEGAL_METADATA_CHARACTERS_OBJS) $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gen_legal_metadata_characters - -endif - -$(OBJDIR)/$(CONFIG)/tools/codegen/core/gen_legal_metadata_characters.o: - -deps_gen_legal_metadata_characters: $(GEN_LEGAL_METADATA_CHARACTERS_OBJS:.o=.dep) - -ifneq ($(NO_SECURE),true) -ifneq ($(NO_DEPS),true) --include $(GEN_LEGAL_METADATA_CHARACTERS_OBJS:.o=.dep) -endif -endif - - -GEN_PERCENT_ENCODING_TABLES_SRC = \ - tools/codegen/core/gen_percent_encoding_tables.c \ - -GEN_PERCENT_ENCODING_TABLES_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GEN_PERCENT_ENCODING_TABLES_SRC)))) -ifeq ($(NO_SECURE),true) - -# You can't build secure targets if you don't have OpenSSL. - -$(BINDIR)/$(CONFIG)/gen_percent_encoding_tables: openssl_dep_error - -else - - - -$(BINDIR)/$(CONFIG)/gen_percent_encoding_tables: $(GEN_PERCENT_ENCODING_TABLES_OBJS) - $(E) "[LD] Linking $@" - $(Q) mkdir -p `dirname $@` - $(Q) $(LD) $(LDFLAGS) $(GEN_PERCENT_ENCODING_TABLES_OBJS) $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gen_percent_encoding_tables - -endif - -$(OBJDIR)/$(CONFIG)/tools/codegen/core/gen_percent_encoding_tables.o: - -deps_gen_percent_encoding_tables: $(GEN_PERCENT_ENCODING_TABLES_OBJS:.o=.dep) - -ifneq ($(NO_SECURE),true) -ifneq ($(NO_DEPS),true) --include $(GEN_PERCENT_ENCODING_TABLES_OBJS:.o=.dep) -endif -endif - - GOAWAY_SERVER_TEST_SRC = \ test/core/end2end/goaway_server_test.cc \ @@ -17431,6 +17335,102 @@ endif endif +GEN_HPACK_TABLES_SRC = \ + tools/codegen/core/gen_hpack_tables.cc \ + +GEN_HPACK_TABLES_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GEN_HPACK_TABLES_SRC)))) +ifeq ($(NO_SECURE),true) + +# You can't build secure targets if you don't have OpenSSL. + +$(BINDIR)/$(CONFIG)/gen_hpack_tables: openssl_dep_error + +else + + + +$(BINDIR)/$(CONFIG)/gen_hpack_tables: $(GEN_HPACK_TABLES_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` + $(Q) $(LD) $(LDFLAGS) $(GEN_HPACK_TABLES_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gen_hpack_tables + +endif + +$(OBJDIR)/$(CONFIG)/tools/codegen/core/gen_hpack_tables.o: $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a + +deps_gen_hpack_tables: $(GEN_HPACK_TABLES_OBJS:.o=.dep) + +ifneq ($(NO_SECURE),true) +ifneq ($(NO_DEPS),true) +-include $(GEN_HPACK_TABLES_OBJS:.o=.dep) +endif +endif + + +GEN_LEGAL_METADATA_CHARACTERS_SRC = \ + tools/codegen/core/gen_legal_metadata_characters.cc \ + +GEN_LEGAL_METADATA_CHARACTERS_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GEN_LEGAL_METADATA_CHARACTERS_SRC)))) +ifeq ($(NO_SECURE),true) + +# You can't build secure targets if you don't have OpenSSL. + +$(BINDIR)/$(CONFIG)/gen_legal_metadata_characters: openssl_dep_error + +else + + + +$(BINDIR)/$(CONFIG)/gen_legal_metadata_characters: $(GEN_LEGAL_METADATA_CHARACTERS_OBJS) + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` + $(Q) $(LD) $(LDFLAGS) $(GEN_LEGAL_METADATA_CHARACTERS_OBJS) $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gen_legal_metadata_characters + +endif + +$(OBJDIR)/$(CONFIG)/tools/codegen/core/gen_legal_metadata_characters.o: + +deps_gen_legal_metadata_characters: $(GEN_LEGAL_METADATA_CHARACTERS_OBJS:.o=.dep) + +ifneq ($(NO_SECURE),true) +ifneq ($(NO_DEPS),true) +-include $(GEN_LEGAL_METADATA_CHARACTERS_OBJS:.o=.dep) +endif +endif + + +GEN_PERCENT_ENCODING_TABLES_SRC = \ + tools/codegen/core/gen_percent_encoding_tables.cc \ + +GEN_PERCENT_ENCODING_TABLES_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GEN_PERCENT_ENCODING_TABLES_SRC)))) +ifeq ($(NO_SECURE),true) + +# You can't build secure targets if you don't have OpenSSL. + +$(BINDIR)/$(CONFIG)/gen_percent_encoding_tables: openssl_dep_error + +else + + + +$(BINDIR)/$(CONFIG)/gen_percent_encoding_tables: $(GEN_PERCENT_ENCODING_TABLES_OBJS) + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` + $(Q) $(LD) $(LDFLAGS) $(GEN_PERCENT_ENCODING_TABLES_OBJS) $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gen_percent_encoding_tables + +endif + +$(OBJDIR)/$(CONFIG)/tools/codegen/core/gen_percent_encoding_tables.o: + +deps_gen_percent_encoding_tables: $(GEN_PERCENT_ENCODING_TABLES_OBJS:.o=.dep) + +ifneq ($(NO_SECURE),true) +ifneq ($(NO_DEPS),true) +-include $(GEN_PERCENT_ENCODING_TABLES_OBJS:.o=.dep) +endif +endif + + # boringssl needs an override to ensure that it does not include # system openssl headers regardless of other configuration diff --git a/build.yaml b/build.yaml index 6158b466ea7..4f74c575333 100644 --- a/build.yaml +++ b/build.yaml @@ -2121,28 +2121,6 @@ targets: - mac - linux - posix -- name: gen_hpack_tables - build: tool - language: c - src: - - tools/codegen/core/gen_hpack_tables.c - deps: - - gpr - - grpc - uses_polling: false -- name: gen_legal_metadata_characters - build: tool - language: c - src: - - tools/codegen/core/gen_legal_metadata_characters.c - deps: [] -- name: gen_percent_encoding_tables - build: tool - language: c - src: - - tools/codegen/core/gen_percent_encoding_tables.c - deps: [] - uses_polling: false - name: goaway_server_test cpu_cost: 0.1 build: test @@ -4846,6 +4824,28 @@ targets: deps: - grpc - gpr +- name: gen_hpack_tables + build: tool + language: cc + src: + - tools/codegen/core/gen_hpack_tables.cc + deps: + - gpr + - grpc + uses_polling: false +- name: gen_legal_metadata_characters + build: tool + language: cc + src: + - tools/codegen/core/gen_legal_metadata_characters.cc + deps: [] +- name: gen_percent_encoding_tables + build: tool + language: cc + src: + - tools/codegen/core/gen_percent_encoding_tables.cc + deps: [] + uses_polling: false vspackages: - linkage: static name: grpc.dependencies.zlib diff --git a/tools/codegen/core/gen_hpack_tables.c b/tools/codegen/core/gen_hpack_tables.cc similarity index 99% rename from tools/codegen/core/gen_hpack_tables.c rename to tools/codegen/core/gen_hpack_tables.cc index 73dfa9fbd6a..0e7a7b80d80 100644 --- a/tools/codegen/core/gen_hpack_tables.c +++ b/tools/codegen/core/gen_hpack_tables.cc @@ -16,7 +16,7 @@ * */ -/* generates constant tables for hpack.c */ +/* generates constant tables for hpack.cc */ #include #include diff --git a/tools/codegen/core/gen_legal_metadata_characters.c b/tools/codegen/core/gen_legal_metadata_characters.cc similarity index 97% rename from tools/codegen/core/gen_legal_metadata_characters.c rename to tools/codegen/core/gen_legal_metadata_characters.cc index 5e292abb3b8..fbabd2464f6 100644 --- a/tools/codegen/core/gen_legal_metadata_characters.c +++ b/tools/codegen/core/gen_legal_metadata_characters.cc @@ -16,7 +16,7 @@ * */ -/* generates constant table for metadata.c */ +/* generates constant table for metadata.cc */ #include #include diff --git a/tools/codegen/core/gen_percent_encoding_tables.c b/tools/codegen/core/gen_percent_encoding_tables.cc similarity index 97% rename from tools/codegen/core/gen_percent_encoding_tables.c rename to tools/codegen/core/gen_percent_encoding_tables.cc index 49ea5ea53b4..a99024e5ed3 100644 --- a/tools/codegen/core/gen_percent_encoding_tables.c +++ b/tools/codegen/core/gen_percent_encoding_tables.cc @@ -16,7 +16,7 @@ * */ -/* generates constant table for metadata.c */ +/* generates constant table for metadata.cc */ #include #include diff --git a/tools/codegen/core/gen_static_metadata.py b/tools/codegen/core/gen_static_metadata.py index c73cdc08161..9d99bbf096f 100755 --- a/tools/codegen/core/gen_static_metadata.py +++ b/tools/codegen/core/gen_static_metadata.py @@ -348,17 +348,13 @@ put_banner([H, C], """WARNING: Auto-generated code. To make changes to this file, change tools/codegen/core/gen_static_metadata.py, and then re-run it. -See metadata.h for an explanation of the interface here, and metadata.c for +See metadata.h for an explanation of the interface here, and metadata.cc for an explanation of what's going on. """.splitlines()) print >> H, '#ifndef GRPC_CORE_LIB_TRANSPORT_STATIC_METADATA_H' print >> H, '#define GRPC_CORE_LIB_TRANSPORT_STATIC_METADATA_H' print >> H -print >> H, '#ifdef __cplusplus' -print >> H, 'extern "C" {' -print >> H, '#endif' -print >> H print >> H, '#include "src/core/lib/transport/metadata.h"' print >> H @@ -589,10 +585,6 @@ print >> C, '};' print >> H, '#define GRPC_MDELEM_ACCEPT_STREAM_ENCODING_FOR_ALGORITHMS(algs) (GRPC_MAKE_MDELEM(&grpc_static_mdelem_table[grpc_static_accept_stream_encoding_metadata[(algs)]], GRPC_MDELEM_STORAGE_STATIC))' -print >> H, '#ifdef __cplusplus' -print >> H, '}' -print >> H, '#endif' - print >> H, '#endif /* GRPC_CORE_LIB_TRANSPORT_STATIC_METADATA_H */' H.close() diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index 3958d8e9e4b..19f54948a88 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -587,45 +587,6 @@ "third_party": false, "type": "target" }, - { - "deps": [ - "gpr", - "grpc" - ], - "headers": [], - "is_filegroup": false, - "language": "c", - "name": "gen_hpack_tables", - "src": [ - "tools/codegen/core/gen_hpack_tables.c" - ], - "third_party": false, - "type": "target" - }, - { - "deps": [], - "headers": [], - "is_filegroup": false, - "language": "c", - "name": "gen_legal_metadata_characters", - "src": [ - "tools/codegen/core/gen_legal_metadata_characters.c" - ], - "third_party": false, - "type": "target" - }, - { - "deps": [], - "headers": [], - "is_filegroup": false, - "language": "c", - "name": "gen_percent_encoding_tables", - "src": [ - "tools/codegen/core/gen_percent_encoding_tables.c" - ], - "third_party": false, - "type": "target" - }, { "deps": [ "gpr", @@ -4335,6 +4296,45 @@ "third_party": false, "type": "target" }, + { + "deps": [ + "gpr", + "grpc" + ], + "headers": [], + "is_filegroup": false, + "language": "cc", + "name": "gen_hpack_tables", + "src": [ + "tools/codegen/core/gen_hpack_tables.cc" + ], + "third_party": false, + "type": "target" + }, + { + "deps": [], + "headers": [], + "is_filegroup": false, + "language": "cc", + "name": "gen_legal_metadata_characters", + "src": [ + "tools/codegen/core/gen_legal_metadata_characters.cc" + ], + "third_party": false, + "type": "target" + }, + { + "deps": [], + "headers": [], + "is_filegroup": false, + "language": "cc", + "name": "gen_percent_encoding_tables", + "src": [ + "tools/codegen/core/gen_percent_encoding_tables.cc" + ], + "third_party": false, + "type": "target" + }, { "deps": [ "boringssl",

    • N1kuOpymUf&CR?_^Z|g4c%Q9i@0ky+3 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

    • N1kuOpymUf&CR?_^Z|g4c%Q9i@0ky+3 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